diff --git a/ChangeLog b/ChangeLog
index a1c472b8d5..ea4d544f9c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -94,6 +94,8 @@ phpMyAdmin - ChangeLog
 - issue #11367 Export after search, missing WHERE clause
 - issue #11380 Incomplete message after import
 - issue        Incorrect scalar type declaration (reported under PHP 7)
+- issue #11389 ReCaptcha produces deprecated messages under PHP 7
+- issue #11387 phpseclib < 2.0 produces deprecated messages on PHP 7
 
 4.4.13.1 (2015-08-08)
 - issue #11368 SQL error when importing phpMyAdmin dump file
diff --git a/libraries/phpseclib/Crypt/AES.php b/libraries/phpseclib/Crypt/AES.php
index 26b1ae8f24..2696e0abb7 100644
--- a/libraries/phpseclib/Crypt/AES.php
+++ b/libraries/phpseclib/Crypt/AES.php
@@ -5,23 +5,27 @@
  *
  * Uses mcrypt, if available/possible, and an internal implementation, otherwise.
  *
- * PHP versions 4 and 5
+ * PHP version 5
  *
- * If {@link Crypt_AES::setKeyLength() setKeyLength()} isn't called, it'll be calculated from
- * {@link Crypt_AES::setKey() setKey()}.  ie. if the key is 128-bits, the key length will be 128-bits.  If it's 136-bits
- * it'll be null-padded to 192-bits and 192 bits will be the key length until {@link Crypt_AES::setKey() setKey()}
+ * NOTE: Since AES.php is (for compatibility and phpseclib-historical reasons) virtually
+ * just a wrapper to Rijndael.php you may consider using Rijndael.php instead of
+ * to save one include_once().
+ *
+ * If {@link \phpseclib\Crypt\AES::setKeyLength() setKeyLength()} isn't called, it'll be calculated from
+ * {@link \phpseclib\Crypt\AES::setKey() setKey()}.  ie. if the key is 128-bits, the key length will be 128-bits.  If it's 136-bits
+ * it'll be null-padded to 192-bits and 192 bits will be the key length until {@link \phpseclib\Crypt\AES::setKey() setKey()}
  * is called, again, at which point, it'll be recalculated.
  *
- * Since Crypt_AES extends Crypt_Rijndael, some functions are available to be called that, in the context of AES, don't
- * make a whole lot of sense.  {@link Crypt_AES::setBlockLength() setBlockLength()}, for instance.  Calling that function,
+ * Since \phpseclib\Crypt\AES extends \phpseclib\Crypt\Rijndael, some functions are available to be called that, in the context of AES, don't
+ * make a whole lot of sense.  {@link \phpseclib\Crypt\AES::setBlockLength() setBlockLength()}, for instance.  Calling that function,
  * however possible, won't do anything (AES has a fixed block length whereas Rijndael has a variable one).
  *
  * Here's a short example of how to use this library:
  * <code>
  * <?php
- *    include 'Crypt/AES.php';
+ *    include 'vendor/autoload.php';
  *
- *    $aes = new Crypt_AES();
+ *    $aes = new \phpseclib\Crypt\AES();
  *
  *    $aes->setKey('abcdefghijklmnop');
  *
@@ -35,145 +39,33 @@
  * ?>
  * </code>
  *
- * LICENSE: Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
  * @category  Crypt
- * @package   Crypt_AES
+ * @package   AES
  * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright MMVIII Jim Wigginton
+ * @copyright 2008 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
  * @link      http://phpseclib.sourceforge.net
  */
 
-/**
- * Include Crypt_Rijndael
- */
-if (!class_exists('Crypt_Rijndael')) {
-    include_once 'Rijndael.php';
-}
+namespace phpseclib\Crypt;
 
-/**#@+
- * @access public
- * @see Crypt_AES::encrypt()
- * @see Crypt_AES::decrypt()
- */
-/**
- * Encrypt / decrypt using the Counter mode.
- *
- * Set to -1 since that's what Crypt/Random.php uses to index the CTR mode.
- *
- * @link http://en.wikipedia.org/wiki/Block_cipher_modes_of_operation#Counter_.28CTR.29
- */
-define('CRYPT_AES_MODE_CTR', CRYPT_MODE_CTR);
-/**
- * Encrypt / decrypt using the Electronic Code Book mode.
- *
- * @link http://en.wikipedia.org/wiki/Block_cipher_modes_of_operation#Electronic_codebook_.28ECB.29
- */
-define('CRYPT_AES_MODE_ECB', CRYPT_MODE_ECB);
-/**
- * Encrypt / decrypt using the Code Book Chaining mode.
- *
- * @link http://en.wikipedia.org/wiki/Block_cipher_modes_of_operation#Cipher-block_chaining_.28CBC.29
- */
-define('CRYPT_AES_MODE_CBC', CRYPT_MODE_CBC);
-/**
- * Encrypt / decrypt using the Cipher Feedback mode.
- *
- * @link http://en.wikipedia.org/wiki/Block_cipher_modes_of_operation#Cipher_feedback_.28CFB.29
- */
-define('CRYPT_AES_MODE_CFB', CRYPT_MODE_CFB);
-/**
- * Encrypt / decrypt using the Cipher Feedback mode.
- *
- * @link http://en.wikipedia.org/wiki/Block_cipher_modes_of_operation#Output_feedback_.28OFB.29
- */
-define('CRYPT_AES_MODE_OFB', CRYPT_MODE_OFB);
-/**#@-*/
-
-/**#@+
- * @access private
- * @see Crypt_AES::Crypt_AES()
- */
-/**
- * Toggles the internal implementation
- */
-define('CRYPT_AES_MODE_INTERNAL', CRYPT_MODE_INTERNAL);
-/**
- * Toggles the mcrypt implementation
- */
-define('CRYPT_AES_MODE_MCRYPT', CRYPT_MODE_MCRYPT);
-/**#@-*/
+use phpseclib\Crypt\Rijndael;
 
 /**
  * Pure-PHP implementation of AES.
  *
- * @package Crypt_AES
+ * @package AES
  * @author  Jim Wigginton <terrafrost@php.net>
  * @access  public
  */
-class Crypt_AES extends Crypt_Rijndael
+class AES extends Rijndael
 {
-    /**
-     * The namespace used by the cipher for its constants.
-     *
-     * @see Crypt_Base::const_namespace
-     * @var String
-     * @access private
-     */
-    var $const_namespace = 'AES';
-
-    /**
-     * Default Constructor.
-     *
-     * Determines whether or not the mcrypt extension should be used.
-     *
-     * $mode could be:
-     *
-     * - CRYPT_AES_MODE_ECB
-     *
-     * - CRYPT_AES_MODE_CBC
-     *
-     * - CRYPT_AES_MODE_CTR
-     *
-     * - CRYPT_AES_MODE_CFB
-     *
-     * - CRYPT_AES_MODE_OFB
-     *
-     * If not explicitly set, CRYPT_AES_MODE_CBC will be used.
-     *
-     * @see Crypt_Rijndael::Crypt_Rijndael()
-     * @see Crypt_Base::Crypt_Base()
-     * @param optional Integer $mode
-     * @access public
-     */
-    function Crypt_AES($mode = CRYPT_AES_MODE_CBC)
-    {
-        parent::Crypt_Rijndael($mode);
-    }
-
     /**
      * Dummy function
      *
-     * Since Crypt_AES extends Crypt_Rijndael, this function is, technically, available, but it doesn't do anything.
+     * Since \phpseclib\Crypt\AES extends \phpseclib\Crypt\Rijndael, this function is, technically, available, but it doesn't do anything.
      *
-     * @see Crypt_Rijndael::setBlockLength()
+     * @see \phpseclib\Crypt\Rijndael::setBlockLength()
      * @access public
      * @param Integer $length
      */
@@ -181,4 +73,56 @@ class Crypt_AES extends Crypt_Rijndael
     {
         return;
     }
+
+    /**
+     * Sets the key length
+     *
+     * Valid key lengths are 128, 192, and 256.  If the length is less than 128, it will be rounded up to
+     * 128.  If the length is greater than 128 and invalid, it will be rounded down to the closest valid amount.
+     *
+     * @see \phpseclib\Crypt\Rijndael:setKeyLength()
+     * @access public
+     * @param Integer $length
+     */
+    function setKeyLength($length)
+    {
+        switch ($length) {
+            case 160:
+                $length = 192;
+                break;
+            case 224:
+                $length = 256;
+        }
+        parent::setKeyLength($length);
+    }
+
+    /**
+     * Sets the key.
+     *
+     * Rijndael supports five different key lengths, AES only supports three.
+     *
+     * @see \phpseclib\Crypt\Rijndael:setKey()
+     * @see setKeyLength()
+     * @access public
+     * @param String $key
+     */
+    function setKey($key)
+    {
+        parent::setKey($key);
+
+        if (!$this->explicit_key_length) {
+            $length = strlen($key);
+            switch (true) {
+                case $length <= 16:
+                    $this->key_size = 16;
+                    break;
+                case $length <= 24:
+                    $this->key_size = 24;
+                    break;
+                default:
+                    $this->key_size = 32;
+            }
+            $this->_setEngine();
+        }
+    }
 }
diff --git a/libraries/phpseclib/Crypt/Base.php b/libraries/phpseclib/Crypt/Base.php
index 83f46e3e56..715ab2a5da 100644
--- a/libraries/phpseclib/Crypt/Base.php
+++ b/libraries/phpseclib/Crypt/Base.php
@@ -1,14 +1,14 @@
 <?php
 
 /**
- * Base Class for all Crypt_* cipher classes
+ * Base Class for all \phpseclib\Crypt\* cipher classes
  *
- * PHP versions 4 and 5
+ * PHP version 5
  *
  * Internally for phpseclib developers:
  *  If you plan to add a new cipher class, please note following rules:
  *
- *  - The new Crypt_* cipher class should extend Crypt_Base
+ *  - The new \phpseclib\Crypt\* cipher class should extend \phpseclib\Crypt\Base
  *
  *  - Following methods are then required to be overridden/overloaded:
  *
@@ -20,110 +20,107 @@
  *
  *  - All other methods are optional to be overridden/overloaded
  *
- *  - Look at the source code of the current ciphers how they extend Crypt_Base
+ *  - Look at the source code of the current ciphers how they extend \phpseclib\Crypt\Base
  *    and take one of them as a start up for the new cipher class.
  *
  *  - Please read all the other comments/notes/hints here also for each class var/method
  *
- * LICENSE: Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
  * @category  Crypt
- * @package   Crypt_Base
+ * @package   Base
  * @author    Jim Wigginton <terrafrost@php.net>
  * @author    Hans-Juergen Petrich <petrich@tronic-media.com>
- * @copyright MMVII Jim Wigginton
+ * @copyright 2007 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
  * @link      http://phpseclib.sourceforge.net
  */
 
-/**#@+
- * @access public
- * @see Crypt_Base::encrypt()
- * @see Crypt_Base::decrypt()
- */
-/**
- * Encrypt / decrypt using the Counter mode.
- *
- * Set to -1 since that's what Crypt/Random.php uses to index the CTR mode.
- *
- * @link http://en.wikipedia.org/wiki/Block_cipher_modes_of_operation#Counter_.28CTR.29
- */
-define('CRYPT_MODE_CTR', -1);
-/**
- * Encrypt / decrypt using the Electronic Code Book mode.
- *
- * @link http://en.wikipedia.org/wiki/Block_cipher_modes_of_operation#Electronic_codebook_.28ECB.29
- */
-define('CRYPT_MODE_ECB', 1);
-/**
- * Encrypt / decrypt using the Code Book Chaining mode.
- *
- * @link http://en.wikipedia.org/wiki/Block_cipher_modes_of_operation#Cipher-block_chaining_.28CBC.29
- */
-define('CRYPT_MODE_CBC', 2);
-/**
- * Encrypt / decrypt using the Cipher Feedback mode.
- *
- * @link http://en.wikipedia.org/wiki/Block_cipher_modes_of_operation#Cipher_feedback_.28CFB.29
- */
-define('CRYPT_MODE_CFB', 3);
-/**
- * Encrypt / decrypt using the Output Feedback mode.
- *
- * @link http://en.wikipedia.org/wiki/Block_cipher_modes_of_operation#Output_feedback_.28OFB.29
- */
-define('CRYPT_MODE_OFB', 4);
-/**
- * Encrypt / decrypt using streaming mode.
- *
- */
-define('CRYPT_MODE_STREAM', 5);
-/**#@-*/
+namespace phpseclib\Crypt;
 
-/**#@+
- * @access private
- * @see Crypt_Base::Crypt_Base()
- */
-/**
- * Base value for the internal implementation $engine switch
- */
-define('CRYPT_MODE_INTERNAL', 1);
-/**
- * Base value for the mcrypt implementation $engine switch
- */
-define('CRYPT_MODE_MCRYPT', 2);
-/**#@-*/
+use phpseclib\Crypt\Hash;
 
 /**
- * Base Class for all Crypt_* cipher classes
+ * Base Class for all \phpseclib\Crypt\* cipher classes
  *
- * @package Crypt_Base
+ * @package Base
  * @author  Jim Wigginton <terrafrost@php.net>
  * @author  Hans-Juergen Petrich <petrich@tronic-media.com>
- * @access  public
  */
-class Crypt_Base
+abstract class Base
 {
+    /**#@+
+     * @access public
+     * @see \phpseclib\Crypt\Base::encrypt()
+     * @see \phpseclib\Crypt\Base::decrypt()
+     */
+    /**
+     * Encrypt / decrypt using the Counter mode.
+     *
+     * Set to -1 since that's what Crypt/Random.php uses to index the CTR mode.
+     *
+     * @link http://en.wikipedia.org/wiki/Block_cipher_modes_of_operation#Counter_.28CTR.29
+     */
+    const MODE_CTR = -1;
+    /**
+     * Encrypt / decrypt using the Electronic Code Book mode.
+     *
+     * @link http://en.wikipedia.org/wiki/Block_cipher_modes_of_operation#Electronic_codebook_.28ECB.29
+     */
+    const MODE_ECB = 1;
+    /**
+     * Encrypt / decrypt using the Code Book Chaining mode.
+     *
+     * @link http://en.wikipedia.org/wiki/Block_cipher_modes_of_operation#Cipher-block_chaining_.28CBC.29
+     */
+    const MODE_CBC = 2;
+    /**
+     * Encrypt / decrypt using the Cipher Feedback mode.
+     *
+     * @link http://en.wikipedia.org/wiki/Block_cipher_modes_of_operation#Cipher_feedback_.28CFB.29
+     */
+    const MODE_CFB = 3;
+    /**
+     * Encrypt / decrypt using the Output Feedback mode.
+     *
+     * @link http://en.wikipedia.org/wiki/Block_cipher_modes_of_operation#Output_feedback_.28OFB.29
+     */
+    const MODE_OFB = 4;
+    /**
+     * Encrypt / decrypt using streaming mode.
+     */
+    const MODE_STREAM = 5;
+    /**#@-*/
+
+    /**
+     * Whirlpool available flag
+     *
+     * @see \phpseclib\Crypt\Base::_hashInlineCryptFunction()
+     * @var Boolean
+     * @access private
+     */
+    static $WHIRLPOOL_AVAILABLE;
+
+    /**#@+
+     * @access private
+     * @see \phpseclib\Crypt\Base::__construct()
+     */
+    /**
+     * Base value for the internal implementation $engine switch
+     */
+    const ENGINE_INTERNAL = 1;
+    /**
+     * Base value for the mcrypt implementation $engine switch
+     */
+    const ENGINE_MCRYPT = 2;
+    /**
+     * Base value for the mcrypt implementation $engine switch
+     */
+    const ENGINE_OPENSSL = 3;
+    /**#@-*/
+
     /**
      * The Encryption Mode
      *
-     * @see Crypt_Base::Crypt_Base()
+     * @see \phpseclib\Crypt\Base::__construct()
      * @var Integer
      * @access private
      */
@@ -140,7 +137,7 @@ class Crypt_Base
     /**
      * The Key
      *
-     * @see Crypt_Base::setKey()
+     * @see \phpseclib\Crypt\Base::setKey()
      * @var String
      * @access private
      */
@@ -149,7 +146,7 @@ class Crypt_Base
     /**
      * The Initialization Vector
      *
-     * @see Crypt_Base::setIV()
+     * @see \phpseclib\Crypt\Base::setIV()
      * @var String
      * @access private
      */
@@ -158,8 +155,8 @@ class Crypt_Base
     /**
      * A "sliding" Initialization Vector
      *
-     * @see Crypt_Base::enableContinuousBuffer()
-     * @see Crypt_Base::_clearBuffers()
+     * @see \phpseclib\Crypt\Base::enableContinuousBuffer()
+     * @see \phpseclib\Crypt\Base::_clearBuffers()
      * @var String
      * @access private
      */
@@ -168,8 +165,8 @@ class Crypt_Base
     /**
      * A "sliding" Initialization Vector
      *
-     * @see Crypt_Base::enableContinuousBuffer()
-     * @see Crypt_Base::_clearBuffers()
+     * @see \phpseclib\Crypt\Base::enableContinuousBuffer()
+     * @see \phpseclib\Crypt\Base::_clearBuffers()
      * @var String
      * @access private
      */
@@ -178,7 +175,7 @@ class Crypt_Base
     /**
      * Continuous Buffer status
      *
-     * @see Crypt_Base::enableContinuousBuffer()
+     * @see \phpseclib\Crypt\Base::enableContinuousBuffer()
      * @var Boolean
      * @access private
      */
@@ -187,8 +184,8 @@ class Crypt_Base
     /**
      * Encryption buffer for CTR, OFB and CFB modes
      *
-     * @see Crypt_Base::encrypt()
-     * @see Crypt_Base::_clearBuffers()
+     * @see \phpseclib\Crypt\Base::encrypt()
+     * @see \phpseclib\Crypt\Base::_clearBuffers()
      * @var Array
      * @access private
      */
@@ -197,8 +194,8 @@ class Crypt_Base
     /**
      * Decryption buffer for CTR, OFB and CFB modes
      *
-     * @see Crypt_Base::decrypt()
-     * @see Crypt_Base::_clearBuffers()
+     * @see \phpseclib\Crypt\Base::decrypt()
+     * @see \phpseclib\Crypt\Base::_clearBuffers()
      * @var Array
      * @access private
      */
@@ -210,7 +207,7 @@ class Crypt_Base
      * The mcrypt resource can be recreated every time something needs to be created or it can be created just once.
      * Since mcrypt operates in continuous mode, by default, it'll need to be recreated when in non-continuous mode.
      *
-     * @see Crypt_Base::encrypt()
+     * @see \phpseclib\Crypt\Base::encrypt()
      * @var Resource
      * @access private
      */
@@ -222,7 +219,7 @@ class Crypt_Base
      * The mcrypt resource can be recreated every time something needs to be created or it can be created just once.
      * Since mcrypt operates in continuous mode, by default, it'll need to be recreated when in non-continuous mode.
      *
-     * @see Crypt_Base::decrypt()
+     * @see \phpseclib\Crypt\Base::decrypt()
      * @var Resource
      * @access private
      */
@@ -231,8 +228,8 @@ class Crypt_Base
     /**
      * Does the enmcrypt resource need to be (re)initialized?
      *
-     * @see Crypt_Twofish::setKey()
-     * @see Crypt_Twofish::setIV()
+     * @see \phpseclib\Crypt\Twofish::setKey()
+     * @see \phpseclib\Crypt\Twofish::setIV()
      * @var Boolean
      * @access private
      */
@@ -241,8 +238,8 @@ class Crypt_Base
     /**
      * Does the demcrypt resource need to be (re)initialized?
      *
-     * @see Crypt_Twofish::setKey()
-     * @see Crypt_Twofish::setIV()
+     * @see \phpseclib\Crypt\Twofish::setKey()
+     * @see \phpseclib\Crypt\Twofish::setIV()
      * @var Boolean
      * @access private
      */
@@ -259,9 +256,9 @@ class Crypt_Base
      * use a separate ECB-mode mcrypt resource.
      *
      * @link http://phpseclib.sourceforge.net/cfb-demo.phps
-     * @see Crypt_Base::encrypt()
-     * @see Crypt_Base::decrypt()
-     * @see Crypt_Base::_setupMcrypt()
+     * @see \phpseclib\Crypt\Base::encrypt()
+     * @see \phpseclib\Crypt\Base::decrypt()
+     * @see \phpseclib\Crypt\Base::_setupMcrypt()
      * @var Resource
      * @access private
      */
@@ -271,7 +268,7 @@ class Crypt_Base
      * Optimizing value while CFB-encrypting
      *
      * Only relevant if $continuousBuffer enabled
-     * and $engine == CRYPT_MODE_MCRYPT
+     * and $engine == self::ENGINE_MCRYPT
      *
      * It's faster to re-init $enmcrypt if
      * $buffer bytes > $cfb_init_len than
@@ -283,7 +280,7 @@ class Crypt_Base
      * which, typically, depends on the complexity
      * on its internaly Key-expanding algorithm.
      *
-     * @see Crypt_Base::encrypt()
+     * @see \phpseclib\Crypt\Base::encrypt()
      * @var Integer
      * @access private
      */
@@ -303,7 +300,7 @@ class Crypt_Base
     /**
      * Padding status
      *
-     * @see Crypt_Base::enablePadding()
+     * @see \phpseclib\Crypt\Base::enablePadding()
      * @var Boolean
      * @access private
      */
@@ -312,7 +309,7 @@ class Crypt_Base
     /**
      * Is the mode one that is paddable?
      *
-     * @see Crypt_Base::Crypt_Base()
+     * @see \phpseclib\Crypt\Base::__construct()
      * @var Boolean
      * @access private
      */
@@ -323,39 +320,68 @@ class Crypt_Base
      * which will be determined automatically on __construct()
      *
      * Currently available $engines are:
-     * - CRYPT_MODE_MCRYPT   (fast, php-extension: mcrypt, extension_loaded('mcrypt') required)
-     * - CRYPT_MODE_INTERNAL (slower, pure php-engine, no php-extension required)
+     * - self::ENGINE_OPENSSL  (very fast, php-extension: openssl, extension_loaded('openssl') required)
+     * - self::ENGINE_MCRYPT   (fast, php-extension: mcrypt, extension_loaded('mcrypt') required)
+     * - self::ENGINE_INTERNAL (slower, pure php-engine, no php-extension required)
      *
-     * In the pipeline... maybe. But currently not available:
-     * - CRYPT_MODE_OPENSSL  (very fast, php-extension: openssl, extension_loaded('openssl') required)
-     *
-     * If possible, CRYPT_MODE_MCRYPT will be used for each cipher.
-     * Otherwise CRYPT_MODE_INTERNAL
-     *
-     * @see Crypt_Base::encrypt()
-     * @see Crypt_Base::decrypt()
+     * @see \phpseclib\Crypt\Base::_setEngine()
+     * @see \phpseclib\Crypt\Base::encrypt()
+     * @see \phpseclib\Crypt\Base::decrypt()
      * @var Integer
      * @access private
      */
     var $engine;
 
+    /**
+     * Holds the preferred crypt engine
+     *
+     * @see \phpseclib\Crypt\Base::_setEngine()
+     * @see \phpseclib\Crypt\Base::setPreferredEngine()
+     * @var Integer
+     * @access private
+     */
+    var $preferredEngine;
+
     /**
      * The mcrypt specific name of the cipher
      *
-     * Only used if $engine == CRYPT_MODE_MCRYPT
+     * Only used if $engine == self::ENGINE_MCRYPT
      *
      * @link http://www.php.net/mcrypt_module_open
      * @link http://www.php.net/mcrypt_list_algorithms
-     * @see Crypt_Base::_setupMcrypt()
+     * @see \phpseclib\Crypt\Base::_setupMcrypt()
      * @var String
      * @access private
      */
     var $cipher_name_mcrypt;
 
+    /**
+     * The openssl specific name of the cipher
+     *
+     * Only used if $engine == CRYPT_ENGINE_OPENSSL
+     *
+     * @link http://www.php.net/openssl-get-cipher-methods
+     * @var String
+     * @access private
+     */
+    var $cipher_name_openssl;
+
+    /**
+     * The openssl specific name of the cipher in ECB mode
+     *
+     * If OpenSSL does not support the mode we're trying to use (CTR)
+     * it can still be emulated with ECB mode.
+     *
+     * @link http://www.php.net/openssl-get-cipher-methods
+     * @var String
+     * @access private
+     */
+    var $cipher_name_openssl_ecb;
+
     /**
      * The default password key_size used by setPassword()
      *
-     * @see Crypt_Base::setPassword()
+     * @see \phpseclib\Crypt\Base::setPassword()
      * @var Integer
      * @access private
      */
@@ -364,45 +390,22 @@ class Crypt_Base
     /**
      * The default salt used by setPassword()
      *
-     * @see Crypt_Base::setPassword()
+     * @see \phpseclib\Crypt\Base::setPassword()
      * @var String
      * @access private
      */
     var $password_default_salt = 'phpseclib/salt';
 
-    /**
-     * The namespace used by the cipher for its constants.
-     *
-     * ie: AES.php is using CRYPT_AES_MODE_* for its constants
-     *     so $const_namespace is AES
-     *
-     *     DES.php is using CRYPT_DES_MODE_* for its constants
-     *     so $const_namespace is DES... and so on
-     *
-     * All CRYPT_<$const_namespace>_MODE_* are aliases of
-     * the generic CRYPT_MODE_* constants, so both could be used
-     * for each cipher.
-     *
-     * Example:
-     * $aes = new Crypt_AES(CRYPT_AES_MODE_CFB); // $aes will operate in cfb mode
-     * $aes = new Crypt_AES(CRYPT_MODE_CFB);     // identical
-     *
-     * @see Crypt_Base::Crypt_Base()
-     * @var String
-     * @access private
-     */
-    var $const_namespace;
-
     /**
      * The name of the performance-optimized callback function
      *
      * Used by encrypt() / decrypt()
-     * only if $engine == CRYPT_MODE_INTERNAL
+     * only if $engine == self::ENGINE_INTERNAL
      *
-     * @see Crypt_Base::encrypt()
-     * @see Crypt_Base::decrypt()
-     * @see Crypt_Base::_setupInlineCrypt()
-     * @see Crypt_Base::$use_inline_crypt
+     * @see \phpseclib\Crypt\Base::encrypt()
+     * @see \phpseclib\Crypt\Base::decrypt()
+     * @see \phpseclib\Crypt\Base::_setupInlineCrypt()
+     * @see \phpseclib\Crypt\Base::$use_inline_crypt
      * @var Callback
      * @access private
      */
@@ -411,14 +414,32 @@ class Crypt_Base
     /**
      * Holds whether performance-optimized $inline_crypt() can/should be used.
      *
-     * @see Crypt_Base::encrypt()
-     * @see Crypt_Base::decrypt()
-     * @see Crypt_Base::inline_crypt
+     * @see \phpseclib\Crypt\Base::encrypt()
+     * @see \phpseclib\Crypt\Base::decrypt()
+     * @see \phpseclib\Crypt\Base::inline_crypt
      * @var mixed
      * @access private
      */
     var $use_inline_crypt;
 
+    /**
+     * If OpenSSL can be used in ECB but not in CTR we can emulate CTR
+     *
+     * @see \phpseclib\Crypt\Base::_openssl_ctr_process()
+     * @var Boolean
+     * @access private
+     */
+    var $openssl_emulate_ctr = false;
+
+    /**
+     * Determines what options are passed to openssl_encrypt/decrypt
+     *
+     * @see \phpseclib\Crypt\Base::isValidEngine()
+     * @var mixed
+     * @access private
+     */
+    var $openssl_options;
+
     /**
      * Default Constructor.
      *
@@ -426,69 +447,45 @@ class Crypt_Base
      *
      * $mode could be:
      *
-     * - CRYPT_MODE_ECB
+     * - self::MODE_ECB
      *
-     * - CRYPT_MODE_CBC
+     * - self::MODE_CBC
      *
-     * - CRYPT_MODE_CTR
+     * - self::MODE_CTR
      *
-     * - CRYPT_MODE_CFB
+     * - self::MODE_CFB
      *
-     * - CRYPT_MODE_OFB
+     * - self::MODE_OFB
      *
      * (or the alias constants of the chosen cipher, for example for AES: CRYPT_AES_MODE_ECB or CRYPT_AES_MODE_CBC ...)
      *
-     * If not explicitly set, CRYPT_MODE_CBC will be used.
+     * If not explicitly set, self::MODE_CBC will be used.
      *
      * @param optional Integer $mode
      * @access public
      */
-    function Crypt_Base($mode = CRYPT_MODE_CBC)
+    function __construct($mode = self::MODE_CBC)
     {
-        $const_crypt_mode = 'CRYPT_' . $this->const_namespace . '_MODE';
-
-        // Determining the availibility of mcrypt support for the cipher
-        if (!defined($const_crypt_mode)) {
-            switch (true) {
-                case extension_loaded('mcrypt') && in_array($this->cipher_name_mcrypt, mcrypt_list_algorithms()):
-                    define($const_crypt_mode, CRYPT_MODE_MCRYPT);
-                    break;
-                default:
-                    define($const_crypt_mode, CRYPT_MODE_INTERNAL);
-            }
-        }
-
-        // Determining which internal $engine should be used.
-        // The fastes possible first.
-        switch (true) {
-            case empty($this->cipher_name_mcrypt): // The cipher module has no mcrypt-engine support at all so we force CRYPT_MODE_INTERNAL
-                $this->engine = CRYPT_MODE_INTERNAL;
-                break;
-            case constant($const_crypt_mode) == CRYPT_MODE_MCRYPT:
-                $this->engine = CRYPT_MODE_MCRYPT;
-                break;
-            default:
-                $this->engine = CRYPT_MODE_INTERNAL;
-        }
-
         // $mode dependent settings
         switch ($mode) {
-            case CRYPT_MODE_ECB:
+            case self::MODE_ECB:
                 $this->paddable = true;
+                $this->mode = self::MODE_ECB;
+                break;
+            case self::MODE_CTR:
+            case self::MODE_CFB:
+            case self::MODE_OFB:
+            case self::MODE_STREAM:
                 $this->mode = $mode;
                 break;
-            case CRYPT_MODE_CTR:
-            case CRYPT_MODE_CFB:
-            case CRYPT_MODE_OFB:
-            case CRYPT_MODE_STREAM:
-                $this->mode = $mode;
-                break;
-            case CRYPT_MODE_CBC:
+            case self::MODE_CBC:
             default:
                 $this->paddable = true;
-                $this->mode = CRYPT_MODE_CBC;
+                $this->mode = self::MODE_CBC;
         }
 
+        $this->_setEngine();
+
         // Determining whether inline crypting can be used by the cipher
         if ($this->use_inline_crypt !== false && function_exists('create_function')) {
             $this->use_inline_crypt = true;
@@ -498,17 +495,16 @@ class Crypt_Base
     /**
      * Sets the initialization vector. (optional)
      *
-     * SetIV is not required when CRYPT_MODE_ECB (or ie for AES: CRYPT_AES_MODE_ECB) is being used.  If not explicitly set, it'll be assumed
+     * SetIV is not required when self::MODE_ECB (or ie for AES: \phpseclib\Crypt\AES::MODE_ECB) is being used.  If not explicitly set, it'll be assumed
      * to be all zero's.
      *
-     * Note: Could, but not must, extend by the child Crypt_* class
-     *
      * @access public
      * @param String $iv
+     * @internal Can be overwritten by a sub class, but does not have to be
      */
     function setIV($iv)
     {
-        if ($this->mode == CRYPT_MODE_ECB) {
+        if ($this->mode == self::MODE_ECB) {
             return;
         }
 
@@ -526,39 +522,39 @@ class Crypt_Base
      *
      * If the key is not explicitly set, it'll be assumed to be all null bytes.
      *
-     * Note: Could, but not must, extend by the child Crypt_* class
-     *
      * @access public
      * @param String $key
+     * @internal Could, but not must, extend by the child Crypt_* class
      */
     function setKey($key)
     {
         $this->key = $key;
         $this->changed = true;
+        $this->_setEngine();
     }
 
     /**
      * Sets the password.
      *
      * Depending on what $method is set to, setPassword()'s (optional) parameters are as follows:
-     *     {@link http://en.wikipedia.org/wiki/PBKDF2 pbkdf2}:
+     *     {@link http://en.wikipedia.org/wiki/PBKDF2 pbkdf2} or pbkdf1:
      *         $hash, $salt, $count, $dkLen
      *
      *         Where $hash (default = sha1) currently supports the following hashes: see: Crypt/Hash.php
      *
-     * Note: Could, but not must, extend by the child Crypt_* class
-     *
      * @see Crypt/Hash.php
      * @param String $password
      * @param optional String $method
+     * @return Boolean
      * @access public
+     * @internal Could, but not must, extend by the child Crypt_* class
      */
     function setPassword($password, $method = 'pbkdf2')
     {
         $key = '';
 
         switch ($method) {
-            default: // 'pbkdf2'
+            default: // 'pbkdf2' or 'pbkdf1'
                 $func_args = func_get_args();
 
                 // Hash function
@@ -572,19 +568,37 @@ class Crypt_Base
                 $count = isset($func_args[4]) ? $func_args[4] : 1000;
 
                 // Keylength
-                $dkLen = isset($func_args[5]) ? $func_args[5] : $this->password_key_size;
+                if (isset($func_args[5])) {
+                    $dkLen = $func_args[5];
+                } else {
+                    $dkLen = $method == 'pbkdf1' ? 2 * $this->password_key_size : $this->password_key_size;
+                }
 
-                // Determining if php[>=5.5.0]'s hash_pbkdf2() function avail- and useable
                 switch (true) {
+                    case $method == 'pbkdf1':
+                        $hashObj = new Hash();
+                        $hashObj->setHash($hash);
+                        if ($dkLen > $hashObj->getLength()) {
+                            user_error('Derived key too long');
+                            return false;
+                        }
+                        $t = $password . $salt;
+                        for ($i = 0; $i < $count; ++$i) {
+                            $t = $hashObj->hash($t);
+                        }
+                        $key = substr($t, 0, $dkLen);
+
+                        $this->setKey(substr($key, 0, $dkLen >> 1));
+                        $this->setIV(substr($key, $dkLen >> 1));
+
+                        return true;
+                    // Determining if php[>=5.5.0]'s hash_pbkdf2() function avail- and useable
                     case !function_exists('hash_pbkdf2'):
                     case !function_exists('hash_algos'):
                     case !in_array($hash, hash_algos()):
-                        if (!class_exists('Crypt_Hash')) {
-                            include_once 'Crypt/Hash.php';
-                        }
                         $i = 1;
                         while (strlen($key) < $dkLen) {
-                            $hmac = new Crypt_Hash();
+                            $hmac = new Hash();
                             $hmac->setHash($hash);
                             $hmac->setKey($password);
                             $f = $u = $hmac->hash($salt . pack('N', $i++));
@@ -602,6 +616,8 @@ class Crypt_Base
         }
 
         $this->setKey($key);
+
+        return true;
     }
 
     /**
@@ -618,16 +634,91 @@ class Crypt_Base
      * strlen($plaintext) will still need to be a multiple of the block size, however, arbitrary values can be added to make it that
      * length.
      *
-     * Note: Could, but not must, extend by the child Crypt_* class
-     *
-     * @see Crypt_Base::decrypt()
+     * @see \phpseclib\Crypt\Base::decrypt()
      * @access public
      * @param String $plaintext
-     * @return String $cipertext
+     * @return String $ciphertext
+     * @internal Could, but not must, extend by the child Crypt_* class
      */
     function encrypt($plaintext)
     {
-        if ($this->engine == CRYPT_MODE_MCRYPT) {
+        if ($this->paddable) {
+            $plaintext = $this->_pad($plaintext);
+        }
+
+        if ($this->engine === self::ENGINE_OPENSSL) {
+            if ($this->changed) {
+                $this->_clearBuffers();
+                $this->changed = false;
+            }
+            switch ($this->mode) {
+                case self::MODE_STREAM:
+                    return openssl_encrypt($plaintext, $this->cipher_name_openssl, $this->key, $this->openssl_options);
+                case self::MODE_ECB:
+                    $result = openssl_encrypt($plaintext, $this->cipher_name_openssl, $this->key, $this->openssl_options);
+                    return !defined('OPENSSL_RAW_DATA') ? substr($result, 0, -$this->block_size) : $result;
+                case self::MODE_CBC:
+                    $result = openssl_encrypt($plaintext, $this->cipher_name_openssl, $this->key, $this->openssl_options, $this->encryptIV);
+                    if ($this->continuousBuffer) {
+                        $this->encryptIV = substr($result, -$this->block_size);
+                    }
+                    return !defined('OPENSSL_RAW_DATA') ? substr($result, 0, -$this->block_size) : $result;
+                case self::MODE_CTR:
+                    return $this->_openssl_ctr_process($plaintext, $this->encryptIV, $this->enbuffer);
+                case self::MODE_CFB:
+                    // cfb loosely routines inspired by openssl's:
+                    // {@link http://cvs.openssl.org/fileview?f=openssl/crypto/modes/cfb128.c&v=1.3.2.2.2.1}
+                    $ciphertext = '';
+                    if ($this->continuousBuffer) {
+                        $iv = &$this->encryptIV;
+                        $pos = &$this->enbuffer['pos'];
+                    } else {
+                        $iv = $this->encryptIV;
+                        $pos = 0;
+                    }
+                    $len = strlen($plaintext);
+                    $i = 0;
+                    if ($pos) {
+                        $orig_pos = $pos;
+                        $max = $this->block_size - $pos;
+                        if ($len >= $max) {
+                            $i = $max;
+                            $len-= $max;
+                            $pos = 0;
+                        } else {
+                            $i = $len;
+                            $pos+= $len;
+                            $len = 0;
+                        }
+                        // ie. $i = min($max, $len), $len-= $i, $pos+= $i, $pos%= $blocksize
+                        $ciphertext = substr($iv, $orig_pos) ^ $plaintext;
+                        $iv = substr_replace($iv, $ciphertext, $orig_pos, $i);
+                        $plaintext = substr($plaintext, $i);
+                    }
+
+                    $overflow = $len % $this->block_size;
+
+                    if ($overflow) {
+                        $ciphertext.= openssl_encrypt(substr($plaintext, 0, -$overflow) . str_repeat("\0", $this->block_size), $this->cipher_name_openssl, $this->key, $this->openssl_options, $iv);
+                        $iv = $this->_string_pop($ciphertext, $this->block_size);
+
+                        $size = $len - $overflow;
+                        $block = $iv ^ substr($plaintext, -$overflow);
+                        $iv = substr_replace($iv, $block, 0, $overflow);
+                        $ciphertext.= $block;
+                        $pos = $overflow;
+                    } elseif ($len) {
+                        $ciphertext = openssl_encrypt($plaintext, $this->cipher_name_openssl, $this->key, $this->openssl_options, $iv);
+                        $iv = substr($ciphertext, -$this->block_size);
+                    }
+
+                    return $ciphertext;
+                case self::MODE_OFB:
+                    return $this->_openssl_ofb_process($plaintext, $this->encryptIV, $this->enbuffer);
+            }
+        }
+
+        if ($this->engine === self::ENGINE_MCRYPT) {
             if ($this->changed) {
                 $this->_setupMcrypt();
                 $this->changed = false;
@@ -640,7 +731,7 @@ class Crypt_Base
             // re: {@link http://phpseclib.sourceforge.net/cfb-demo.phps}
             // using mcrypt's default handing of CFB the above would output two different things.  using phpseclib's
             // rewritten CFB implementation the above outputs the same thing twice.
-            if ($this->mode == CRYPT_MODE_CFB && $this->continuousBuffer) {
+            if ($this->mode == self::MODE_CFB && $this->continuousBuffer) {
                 $block_size = $this->block_size;
                 $iv = &$this->encryptIV;
                 $pos = &$this->enbuffer['pos'];
@@ -693,10 +784,6 @@ class Crypt_Base
                 return $ciphertext;
             }
 
-            if ($this->paddable) {
-                $plaintext = $this->_pad($plaintext);
-            }
-
             $ciphertext = mcrypt_generic($this->enmcrypt, $plaintext);
 
             if (!$this->continuousBuffer) {
@@ -714,20 +801,17 @@ class Crypt_Base
             $inline = $this->inline_crypt;
             return $inline('encrypt', $this, $plaintext);
         }
-        if ($this->paddable) {
-            $plaintext = $this->_pad($plaintext);
-        }
 
         $buffer = &$this->enbuffer;
         $block_size = $this->block_size;
         $ciphertext = '';
         switch ($this->mode) {
-            case CRYPT_MODE_ECB:
+            case self::MODE_ECB:
                 for ($i = 0; $i < strlen($plaintext); $i+=$block_size) {
                     $ciphertext.= $this->_encryptBlock(substr($plaintext, $i, $block_size));
                 }
                 break;
-            case CRYPT_MODE_CBC:
+            case self::MODE_CBC:
                 $xor = $this->encryptIV;
                 for ($i = 0; $i < strlen($plaintext); $i+=$block_size) {
                     $block = substr($plaintext, $i, $block_size);
@@ -739,32 +823,34 @@ class Crypt_Base
                     $this->encryptIV = $xor;
                 }
                 break;
-            case CRYPT_MODE_CTR:
+            case self::MODE_CTR:
                 $xor = $this->encryptIV;
-                if (strlen($buffer['encrypted'])) {
+                if (strlen($buffer['ciphertext'])) {
                     for ($i = 0; $i < strlen($plaintext); $i+=$block_size) {
                         $block = substr($plaintext, $i, $block_size);
-                        if (strlen($block) > strlen($buffer['encrypted'])) {
-                            $buffer['encrypted'].= $this->_encryptBlock($this->_generateXor($xor, $block_size));
+                        if (strlen($block) > strlen($buffer['ciphertext'])) {
+                            $buffer['ciphertext'].= $this->_encryptBlock($xor);
                         }
-                        $key = $this->_stringShift($buffer['encrypted'], $block_size);
+                        $this->_increment_str($xor);
+                        $key = $this->_string_shift($buffer['ciphertext'], $block_size);
                         $ciphertext.= $block ^ $key;
                     }
                 } else {
                     for ($i = 0; $i < strlen($plaintext); $i+=$block_size) {
                         $block = substr($plaintext, $i, $block_size);
-                        $key = $this->_encryptBlock($this->_generateXor($xor, $block_size));
+                        $key = $this->_encryptBlock($xor);
+                        $this->_increment_str($xor);
                         $ciphertext.= $block ^ $key;
                     }
                 }
                 if ($this->continuousBuffer) {
                     $this->encryptIV = $xor;
                     if ($start = strlen($plaintext) % $block_size) {
-                        $buffer['encrypted'] = substr($key, $start) . $buffer['encrypted'];
+                        $buffer['ciphertext'] = substr($key, $start) . $buffer['ciphertext'];
                     }
                 }
                 break;
-            case CRYPT_MODE_CFB:
+            case self::MODE_CFB:
                 // cfb loosely routines inspired by openssl's:
                 // {@link http://cvs.openssl.org/fileview?f=openssl/crypto/modes/cfb128.c&v=1.3.2.2.2.1}
                 if ($this->continuousBuffer) {
@@ -806,7 +892,7 @@ class Crypt_Base
                     $pos = $len;
                 }
                 break;
-            case CRYPT_MODE_OFB:
+            case self::MODE_OFB:
                 $xor = $this->encryptIV;
                 if (strlen($buffer['xor'])) {
                     for ($i = 0; $i < strlen($plaintext); $i+=$block_size) {
@@ -815,7 +901,7 @@ class Crypt_Base
                             $xor = $this->_encryptBlock($xor);
                             $buffer['xor'].= $xor;
                         }
-                        $key = $this->_stringShift($buffer['xor'], $block_size);
+                        $key = $this->_string_shift($buffer['xor'], $block_size);
                         $ciphertext.= $block ^ $key;
                     }
                 } else {
@@ -832,7 +918,7 @@ class Crypt_Base
                     }
                 }
                 break;
-            case CRYPT_MODE_STREAM:
+            case self::MODE_STREAM:
                 $ciphertext = $this->_encryptBlock($plaintext);
                 break;
         }
@@ -846,16 +932,101 @@ class Crypt_Base
      * If strlen($ciphertext) is not a multiple of the block size, null bytes will be added to the end of the string until
      * it is.
      *
-     * Note: Could, but not must, extend by the child Crypt_* class
-     *
-     * @see Crypt_Base::encrypt()
+     * @see \phpseclib\Crypt\Base::encrypt()
      * @access public
      * @param String $ciphertext
      * @return String $plaintext
+     * @internal Could, but not must, extend by the child Crypt_* class
      */
     function decrypt($ciphertext)
     {
-        if ($this->engine == CRYPT_MODE_MCRYPT) {
+        if ($this->paddable) {
+            // we pad with chr(0) since that's what mcrypt_generic does.  to quote from {@link http://www.php.net/function.mcrypt-generic}:
+            // "The data is padded with "\0" to make sure the length of the data is n * blocksize."
+            $ciphertext = str_pad($ciphertext, strlen($ciphertext) + ($this->block_size - strlen($ciphertext) % $this->block_size) % $this->block_size, chr(0));
+        }
+
+        if ($this->engine === self::ENGINE_OPENSSL) {
+            if ($this->changed) {
+                $this->_clearBuffers();
+                $this->changed = false;
+            }
+            switch ($this->mode) {
+                case self::MODE_STREAM:
+                    $plaintext = openssl_decrypt($ciphertext, $this->cipher_name_openssl, $this->key, $this->openssl_options);
+                    break;
+                case self::MODE_ECB:
+                    if (!defined('OPENSSL_RAW_DATA')) {
+                        $ciphetext.= openssl_encrypt('', $this->cipher_name_openssl_ecb, $this->key, true);
+                    }
+                    $plaintext = openssl_decrypt($ciphertext, $this->cipher_name_openssl, $this->key, $this->openssl_options);
+                    break;
+                case self::MODE_CBC:
+                    if (!defined('OPENSSL_RAW_DATA')) {
+                        $padding = str_repeat(chr($this->block_size), $this->block_size) ^ substr($ciphertext, -$this->block_size);
+                        $ciphertext.= substr(openssl_encrypt($padding, $this->cipher_name_openssl_ecb, $this->key, true), 0, $this->block_size);
+                    }
+                    $plaintext = openssl_decrypt($ciphertext, $this->cipher_name_openssl, $this->key, $this->openssl_options, $this->decryptIV);
+                    if ($this->continuousBuffer) {
+                        $this->decryptIV = substr($ciphertext, -$this->block_size);
+                    }
+                    break;
+                case self::MODE_CTR:
+                    $plaintext = $this->_openssl_ctr_process($ciphertext, $this->decryptIV, $this->debuffer);
+                    break;
+                case self::MODE_CFB:
+                    // cfb loosely routines inspired by openssl's:
+                    // {@link http://cvs.openssl.org/fileview?f=openssl/crypto/modes/cfb128.c&v=1.3.2.2.2.1}
+                    $plaintext = '';
+                    if ($this->continuousBuffer) {
+                        $iv = &$this->decryptIV;
+                        $pos = &$this->buffer['pos'];
+                    } else {
+                        $iv = $this->decryptIV;
+                        $pos = 0;
+                    }
+                    $len = strlen($ciphertext);
+                    $i = 0;
+                    if ($pos) {
+                        $orig_pos = $pos;
+                        $max = $this->block_size - $pos;
+                        if ($len >= $max) {
+                            $i = $max;
+                            $len-= $max;
+                            $pos = 0;
+                        } else {
+                            $i = $len;
+                            $pos+= $len;
+                            $len = 0;
+                        }
+                        // ie. $i = min($max, $len), $len-= $i, $pos+= $i, $pos%= $this->blocksize
+                        $plaintext = substr($iv, $orig_pos) ^ $ciphertext;
+                        $iv = substr_replace($iv, substr($ciphertext, 0, $i), $orig_pos, $i);
+                        $ciphertext = substr($ciphertext, $i);
+                    }
+                    $overflow = $len % $this->block_size;
+                    if ($overflow) {
+                        $plaintext.= openssl_decrypt(substr($ciphertext, 0, -$overflow), $this->cipher_name_openssl, $this->key, $this->openssl_options, $iv);
+                        if ($len - $overflow) {
+                            $iv = substr($ciphertext, -$overflow - $this->block_size, -$overflow);
+                        }
+                        $iv = openssl_encrypt(str_repeat("\0", $this->block_size), $this->cipher_name_openssl, $this->key, $this->openssl_options, $iv);
+                        $plaintext.= $iv ^ substr($ciphertext, -$overflow);
+                        $iv = substr_replace($iv, substr($ciphertext, -$overflow), 0, $overflow);
+                        $pos = $overflow;
+                    } elseif ($len) {
+                        $plaintext.= openssl_decrypt($ciphertext, $this->cipher_name_openssl, $this->key, $this->openssl_options, $iv);
+                        $iv = substr($ciphertext, -$this->block_size);
+                    }
+                    break;
+                case self::MODE_OFB:
+                    $plaintext = $this->_openssl_ofb_process($ciphertext, $this->decryptIV, $this->debuffer);
+            }
+
+            return $this->paddable ? $this->_unpad($plaintext) : $plaintext;
+        }
+
+        if ($this->engine === self::ENGINE_MCRYPT) {
             $block_size = $this->block_size;
             if ($this->changed) {
                 $this->_setupMcrypt();
@@ -866,7 +1037,7 @@ class Crypt_Base
                 $this->dechanged = false;
             }
 
-            if ($this->mode == CRYPT_MODE_CFB && $this->continuousBuffer) {
+            if ($this->mode == self::MODE_CFB && $this->continuousBuffer) {
                 $iv = &$this->decryptIV;
                 $pos = &$this->debuffer['pos'];
                 $len = strlen($ciphertext);
@@ -904,12 +1075,6 @@ class Crypt_Base
                 return $plaintext;
             }
 
-            if ($this->paddable) {
-                // we pad with chr(0) since that's what mcrypt_generic does.  to quote from {@link http://www.php.net/function.mcrypt-generic}:
-                // "The data is padded with "\0" to make sure the length of the data is n * blocksize."
-                $ciphertext = str_pad($ciphertext, strlen($ciphertext) + ($block_size - strlen($ciphertext) % $block_size) % $block_size, chr(0));
-            }
-
             $plaintext = mdecrypt_generic($this->demcrypt, $ciphertext);
 
             if (!$this->continuousBuffer) {
@@ -929,20 +1094,16 @@ class Crypt_Base
         }
 
         $block_size = $this->block_size;
-        if ($this->paddable) {
-            // we pad with chr(0) since that's what mcrypt_generic does [...]
-            $ciphertext = str_pad($ciphertext, strlen($ciphertext) + ($block_size - strlen($ciphertext) % $block_size) % $block_size, chr(0));
-        }
 
         $buffer = &$this->debuffer;
         $plaintext = '';
         switch ($this->mode) {
-            case CRYPT_MODE_ECB:
+            case self::MODE_ECB:
                 for ($i = 0; $i < strlen($ciphertext); $i+=$block_size) {
                     $plaintext.= $this->_decryptBlock(substr($ciphertext, $i, $block_size));
                 }
                 break;
-            case CRYPT_MODE_CBC:
+            case self::MODE_CBC:
                 $xor = $this->decryptIV;
                 for ($i = 0; $i < strlen($ciphertext); $i+=$block_size) {
                     $block = substr($ciphertext, $i, $block_size);
@@ -953,21 +1114,23 @@ class Crypt_Base
                     $this->decryptIV = $xor;
                 }
                 break;
-            case CRYPT_MODE_CTR:
+            case self::MODE_CTR:
                 $xor = $this->decryptIV;
                 if (strlen($buffer['ciphertext'])) {
                     for ($i = 0; $i < strlen($ciphertext); $i+=$block_size) {
                         $block = substr($ciphertext, $i, $block_size);
                         if (strlen($block) > strlen($buffer['ciphertext'])) {
-                            $buffer['ciphertext'].= $this->_encryptBlock($this->_generateXor($xor, $block_size));
+                            $buffer['ciphertext'].= $this->_encryptBlock($xor);
+                            $this->_increment_str($xor);
                         }
-                        $key = $this->_stringShift($buffer['ciphertext'], $block_size);
+                        $key = $this->_string_shift($buffer['ciphertext'], $block_size);
                         $plaintext.= $block ^ $key;
                     }
                 } else {
                     for ($i = 0; $i < strlen($ciphertext); $i+=$block_size) {
                         $block = substr($ciphertext, $i, $block_size);
-                        $key = $this->_encryptBlock($this->_generateXor($xor, $block_size));
+                        $key = $this->_encryptBlock($xor);
+                        $this->_increment_str($xor);
                         $plaintext.= $block ^ $key;
                     }
                 }
@@ -978,7 +1141,7 @@ class Crypt_Base
                     }
                 }
                 break;
-            case CRYPT_MODE_CFB:
+            case self::MODE_CFB:
                 if ($this->continuousBuffer) {
                     $iv = &$this->decryptIV;
                     $pos = &$buffer['pos'];
@@ -1019,7 +1182,7 @@ class Crypt_Base
                     $pos = $len;
                 }
                 break;
-            case CRYPT_MODE_OFB:
+            case self::MODE_OFB:
                 $xor = $this->decryptIV;
                 if (strlen($buffer['xor'])) {
                     for ($i = 0; $i < strlen($ciphertext); $i+=$block_size) {
@@ -1028,7 +1191,7 @@ class Crypt_Base
                             $xor = $this->_encryptBlock($xor);
                             $buffer['xor'].= $xor;
                         }
-                        $key = $this->_stringShift($buffer['xor'], $block_size);
+                        $key = $this->_string_shift($buffer['xor'], $block_size);
                         $plaintext.= $block ^ $key;
                     }
                 } else {
@@ -1045,13 +1208,185 @@ class Crypt_Base
                     }
                 }
                 break;
-            case CRYPT_MODE_STREAM:
+            case self::MODE_STREAM:
                 $plaintext = $this->_decryptBlock($ciphertext);
                 break;
         }
         return $this->paddable ? $this->_unpad($plaintext) : $plaintext;
     }
 
+    /**
+     * OpenSSL CTR Processor
+     *
+     * PHP's OpenSSL bindings do not operate in continuous mode so we'll wrap around it. Since the keystream
+     * for CTR is the same for both encrypting and decrypting this function is re-used by both Crypt_Base::encrypt()
+     * and Crypt_Base::decrypt(). Also, OpenSSL doesn't implement CTR for all of it's symmetric ciphers so this
+     * function will emulate CTR with ECB when necesary.
+     *
+     * @see Crypt_Base::encrypt()
+     * @see Crypt_Base::decrypt()
+     * @param String $plaintext
+     * @param String $encryptIV
+     * @param Array $buffer
+     * @return String
+     * @access private
+     */
+    function _openssl_ctr_process($plaintext, &$encryptIV, &$buffer)
+    {
+        $ciphertext = '';
+
+        $block_size = $this->block_size;
+        $key = $this->key;
+
+        if ($this->openssl_emulate_ctr) {
+            $xor = $encryptIV;
+            if (strlen($buffer['ciphertext'])) {
+                for ($i = 0; $i < strlen($plaintext); $i+=$block_size) {
+                    $block = substr($plaintext, $i, $block_size);
+                    if (strlen($block) > strlen($buffer['ciphertext'])) {
+                        $result = openssl_encrypt($xor, $this->cipher_name_openssl_ecb, $key, $this->openssl_options);
+                        $result = !defined('OPENSSL_RAW_DATA') ? substr($result, 0, -$this->block_size) : $result;
+                        $buffer['ciphertext'].= $result;
+                    }
+                    $this->_increment_str($xor);
+                    $otp = $this->_string_shift($buffer['ciphertext'], $block_size);
+                    $ciphertext.= $block ^ $otp;
+                }
+            } else {
+                for ($i = 0; $i < strlen($plaintext); $i+=$block_size) {
+                    $block = substr($plaintext, $i, $block_size);
+                    $otp = openssl_encrypt($xor, $this->cipher_name_openssl_ecb, $key, $this->openssl_options);
+                    $otp = !defined('OPENSSL_RAW_DATA') ? substr($otp, 0, -$this->block_size) : $otp;
+                    $this->_increment_str($xor);
+                    $ciphertext.= $block ^ $otp;
+                }
+            }
+            if ($this->continuousBuffer) {
+                $encryptIV = $xor;
+                if ($start = strlen($plaintext) % $block_size) {
+                    $buffer['ciphertext'] = substr($key, $start) . $buffer['ciphertext'];
+                }
+            }
+
+            return $ciphertext;
+        }
+
+        if (strlen($buffer['ciphertext'])) {
+            $ciphertext = $plaintext ^ $this->_string_shift($buffer['ciphertext'], strlen($plaintext));
+            $plaintext = substr($plaintext, strlen($ciphertext));
+
+            if (!strlen($plaintext)) {
+                return $ciphertext;
+            }
+        }
+
+        $overflow = strlen($plaintext) % $block_size;
+        if ($overflow) {
+            $plaintext2 = $this->_string_pop($plaintext, $overflow); // ie. trim $plaintext to a multiple of $block_size and put rest of $plaintext in $plaintext2
+            $encrypted = openssl_encrypt($plaintext . str_repeat("\0", $block_size), $this->cipher_name_openssl, $key, $this->openssl_options, $encryptIV);
+            $temp = $this->_string_pop($encrypted, $block_size);
+            $ciphertext.= $encrypted . ($plaintext2 ^ $temp);
+            if ($this->continuousBuffer) {
+                $buffer['ciphertext'] = substr($temp, $overflow);
+                $encryptIV = $temp;
+            }
+        } elseif (!strlen($buffer['ciphertext'])) {
+            $ciphertext.= openssl_encrypt($plaintext . str_repeat("\0", $block_size), $this->cipher_name_openssl, $key, $this->openssl_options, $encryptIV);
+            $temp = $this->_string_pop($ciphertext, $block_size);
+            if ($this->continuousBuffer) {
+                $encryptIV = $temp;
+            }
+        }
+        if ($this->continuousBuffer) {
+            if (!defined('OPENSSL_RAW_DATA')) {
+                $encryptIV.= openssl_encrypt('', $this->cipher_name_openssl_ecb, $key, $this->openssl_options);
+            }
+            $encryptIV = openssl_decrypt($encryptIV, $this->cipher_name_openssl_ecb, $key, $this->openssl_options);
+            if ($overflow) {
+                $this->_increment_str($encryptIV);
+            }
+        }
+
+        return $ciphertext;
+    }
+
+    /**
+     * OpenSSL OFB Processor
+     *
+     * PHP's OpenSSL bindings do not operate in continuous mode so we'll wrap around it. Since the keystream
+     * for OFB is the same for both encrypting and decrypting this function is re-used by both Crypt_Base::encrypt()
+     * and Crypt_Base::decrypt().
+     *
+     * @see Crypt_Base::encrypt()
+     * @see Crypt_Base::decrypt()
+     * @param String $plaintext
+     * @param String $encryptIV
+     * @param Array $buffer
+     * @return String
+     * @access private
+     */
+    function _openssl_ofb_process($plaintext, &$encryptIV, &$buffer)
+    {
+        if (strlen($buffer['xor'])) {
+            $ciphertext = $plaintext ^ $buffer['xor'];
+            $buffer['xor'] = substr($buffer['xor'], strlen($ciphertext));
+            $plaintext = substr($plaintext, strlen($ciphertext));
+        } else {
+            $ciphertext = '';
+        }
+
+        $block_size = $this->block_size;
+
+        $len = strlen($plaintext);
+        $key = $this->key;
+        $overflow = $len % $block_size;
+
+        if (strlen($plaintext)) {
+            if ($overflow) {
+                $ciphertext.= openssl_encrypt(substr($plaintext, 0, -$overflow) . str_repeat("\0", $block_size), $this->cipher_name_openssl, $key, $this->openssl_options, $encryptIV);
+                $xor = $this->_string_pop($ciphertext, $block_size);
+                if ($this->continuousBuffer) {
+                    $encryptIV = $xor;
+                }
+                $ciphertext.= $this->_string_shift($xor, $overflow) ^ substr($plaintext, -$overflow);
+                if ($this->continuousBuffer) {
+                    $buffer['xor'] = $xor;
+                }
+            } else {
+                $ciphertext = openssl_encrypt($plaintext, $this->cipher_name_openssl, $key, $this->openssl_options, $encryptIV);
+                if ($this->continuousBuffer) {
+                    $encryptIV = substr($ciphertext, -$block_size) ^ substr($plaintext, -$block_size);
+                }
+            }
+        }
+
+        return $ciphertext;
+    }
+
+    /**
+     * phpseclib <-> OpenSSL Mode Mapper
+     *
+     * May need to be overwritten by classes extending this one in some cases
+     *
+     * @return Integer
+     * @access private
+     */
+    function _openssl_translate_mode()
+    {
+        switch ($this->mode) {
+            case self::MODE_ECB:
+                return 'ecb';
+            case self::MODE_CBC:
+                return 'cbc';
+            case self::MODE_CTR:
+                return 'ctr';
+            case self::MODE_CFB:
+                return 'cfb';
+            case self::MODE_OFB:
+                return 'ofb';
+        }
+    }
+
     /**
      * Pad "packets".
      *
@@ -1064,7 +1399,7 @@ class Crypt_Base
      * away characters that shouldn't be stripped away. (SSH knows how many bytes are added because the length is
      * transmitted separately)
      *
-     * @see Crypt_Base::disablePadding()
+     * @see \phpseclib\Crypt\Base::disablePadding()
      * @access public
      */
     function enablePadding()
@@ -1075,7 +1410,7 @@ class Crypt_Base
     /**
      * Do not pad packets.
      *
-     * @see Crypt_Base::enablePadding()
+     * @see \phpseclib\Crypt\Base::enablePadding()
      * @access public
      */
     function disablePadding()
@@ -1112,23 +1447,24 @@ class Crypt_Base
      * outputs.  The reason is due to the fact that the initialization vector's change after every encryption /
      * decryption round when the continuous buffer is enabled.  When it's disabled, they remain constant.
      *
-     * Put another way, when the continuous buffer is enabled, the state of the Crypt_*() object changes after each
+     * Put another way, when the continuous buffer is enabled, the state of the \phpseclib\Crypt\*() object changes after each
      * encryption / decryption round, whereas otherwise, it'd remain constant.  For this reason, it's recommended that
      * continuous buffers not be used.  They do offer better security and are, in fact, sometimes required (SSH uses them),
      * however, they are also less intuitive and more likely to cause you problems.
      *
-     * Note: Could, but not must, extend by the child Crypt_* class
-     *
-     * @see Crypt_Base::disableContinuousBuffer()
+     * @see \phpseclib\Crypt\Base::disableContinuousBuffer()
      * @access public
+     * @internal Could, but not must, extend by the child Crypt_* class
      */
     function enableContinuousBuffer()
     {
-        if ($this->mode == CRYPT_MODE_ECB) {
+        if ($this->mode == self::MODE_ECB) {
             return;
         }
 
         $this->continuousBuffer = true;
+
+        $this->_setEngine();
     }
 
     /**
@@ -1136,14 +1472,13 @@ class Crypt_Base
      *
      * The default behavior.
      *
-     * Note: Could, but not must, extend by the child Crypt_* class
-     *
-     * @see Crypt_Base::enableContinuousBuffer()
+     * @see \phpseclib\Crypt\Base::enableContinuousBuffer()
      * @access public
+     * @internal Could, but not must, extend by the child Crypt_* class
      */
     function disableContinuousBuffer()
     {
-        if ($this->mode == CRYPT_MODE_ECB) {
+        if ($this->mode == self::MODE_ECB) {
             return;
         }
         if (!$this->continuousBuffer) {
@@ -1152,56 +1487,191 @@ class Crypt_Base
 
         $this->continuousBuffer = false;
         $this->changed = true;
+
+        $this->_setEngine();
+    }
+
+    /**
+     * Test for engine validity
+     *
+     * @see \phpseclib\Crypt\Base::Crypt_Base()
+     * @param Integer $engine
+     * @access public
+     * @return Boolean
+     */
+    function isValidEngine($engine)
+    {
+        switch ($engine) {
+            case self::ENGINE_OPENSSL:
+                if ($this->mode == self::MODE_STREAM && $this->continuousBuffer) {
+                    return false;
+                }
+                $this->openssl_emulate_ctr = false;
+                $result = $this->cipher_name_openssl &&
+                          extension_loaded('openssl') &&
+                          // PHP 5.3.0 - 5.3.2 did not let you set IV's
+                          version_compare(PHP_VERSION, '5.3.3', '>=');
+                if (!$result) {
+                    return false;
+                }
+
+                // prior to PHP 5.4.0 OPENSSL_RAW_DATA and OPENSSL_ZERO_PADDING were not defined. instead of expecting an integer
+                // $options openssl_encrypt expected a boolean $raw_data.
+                if (!defined('OPENSSL_RAW_DATA')) {
+                    $this->openssl_options = true;
+                } else {
+                    $this->openssl_options = OPENSSL_RAW_DATA | OPENSSL_ZERO_PADDING;
+                }
+
+                $methods = openssl_get_cipher_methods();
+                if (in_array($this->cipher_name_openssl, $methods)) {
+                    return true;
+                }
+                // not all of openssl's symmetric cipher's support ctr. for those
+                // that don't we'll emulate it
+                switch ($this->mode) {
+                    case self::MODE_CTR:
+                        if (in_array($this->cipher_name_openssl_ecb, $methods)) {
+                            $this->openssl_emulate_ctr = true;
+                            return true;
+                        }
+                }
+                return false;
+            case self::ENGINE_MCRYPT:
+                return $this->cipher_name_mcrypt &&
+                       extension_loaded('mcrypt') &&
+                       in_array($this->cipher_name_mcrypt, mcrypt_list_algorithms());
+            case self::ENGINE_INTERNAL:
+                return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Sets the preferred crypt engine
+     *
+     * Currently, $engine could be:
+     *
+     * - \phpseclib\Crypt\Base::ENGINE_OPENSSL  [very fast]
+     *
+     * - \phpseclib\Crypt\Base::ENGINE_MCRYPT   [fast]
+     *
+     * - \phpseclib\Crypt\Base::ENGINE_INTERNAL [slow]
+     *
+     * If the preferred crypt engine is not available the fastest available one will be used
+     *
+     * @see \phpseclib\Crypt\Base::Crypt_Base()
+     * @param Integer $engine
+     * @access public
+     */
+    function setPreferredEngine($engine)
+    {
+        switch ($engine) {
+            //case self::ENGINE_OPENSSL;
+            case self::ENGINE_MCRYPT:
+            case self::ENGINE_INTERNAL:
+                $this->preferredEngine = $engine;
+                break;
+            default:
+                $this->preferredEngine = self::ENGINE_OPENSSL;
+        }
+
+        $this->_setEngine();
+    }
+
+    /**
+     * Returns the engine currently being utilized
+     *
+     * @see \phpseclib\Crypt\Base::_setEngine()
+     * @access public
+     */
+    function getEngine()
+    {
+        return $this->engine;
+    }
+
+    /**
+     * Sets the engine as appropriate
+     *
+     * @see \phpseclib\Crypt\Base::Crypt_Base()
+     * @access private
+     */
+    function _setEngine()
+    {
+        $this->engine = null;
+
+        $candidateEngines = array(
+            $this->preferredEngine,
+            self::ENGINE_OPENSSL,
+            self::ENGINE_MCRYPT
+        );
+        foreach ($candidateEngines as $engine) {
+            if ($this->isValidEngine($engine)) {
+                $this->engine = $engine;
+                break;
+            }
+        }
+        if (!$this->engine) {
+            $this->engine = self::ENGINE_INTERNAL;
+        }
+
+        if ($this->engine != self::ENGINE_MCRYPT && $this->enmcrypt) {
+            // Closing the current mcrypt resource(s). _mcryptSetup() will, if needed,
+            // (re)open them with the module named in $this->cipher_name_mcrypt
+            mcrypt_module_close($this->enmcrypt);
+            mcrypt_module_close($this->demcrypt);
+            $this->enmcrypt = null;
+            $this->demcrypt = null;
+
+            if ($this->ecb) {
+                mcrypt_module_close($this->ecb);
+                $this->ecb = null;
+            }
+        }
+
+        $this->changed = true;
     }
 
     /**
      * Encrypts a block
      *
-     * Note: Must extend by the child Crypt_* class
+     * Note: Must be extended by the child \phpseclib\Crypt\* class
      *
      * @access private
      * @param String $in
      * @return String
      */
-    function _encryptBlock($in)
-    {
-        user_error((version_compare(PHP_VERSION, '5.0.0', '>=')  ? __METHOD__ : __FUNCTION__)  . '() must extend by class ' . get_class($this), E_USER_ERROR);
-    }
+    abstract function _encryptBlock($in);
 
     /**
      * Decrypts a block
      *
-     * Note: Must extend by the child Crypt_* class
+     * Note: Must be extended by the child \phpseclib\Crypt\* class
      *
      * @access private
      * @param String $in
      * @return String
      */
-    function _decryptBlock($in)
-    {
-        user_error((version_compare(PHP_VERSION, '5.0.0', '>=')  ? __METHOD__ : __FUNCTION__)  . '() must extend by class ' . get_class($this), E_USER_ERROR);
-    }
+    abstract function _decryptBlock($in);
 
     /**
      * Setup the key (expansion)
      *
-     * Only used if $engine == CRYPT_MODE_INTERNAL
+     * Only used if $engine == self::ENGINE_INTERNAL
      *
-     * Note: Must extend by the child Crypt_* class
+     * Note: Must extend by the child \phpseclib\Crypt\* class
      *
-     * @see Crypt_Base::_setup()
+     * @see \phpseclib\Crypt\Base::_setup()
      * @access private
      */
-    function _setupKey()
-    {
-        user_error((version_compare(PHP_VERSION, '5.0.0', '>=')  ? __METHOD__ : __FUNCTION__)  . '() must extend by class ' . get_class($this), E_USER_ERROR);
-    }
+    abstract function _setupKey();
 
     /**
-     * Setup the CRYPT_MODE_INTERNAL $engine
+     * Setup the self::ENGINE_INTERNAL $engine
      *
      * (re)init, if necessary, the internal cipher $engine and flush all $buffers
-     * Used (only) if $engine == CRYPT_MODE_INTERNAL
+     * Used (only) if $engine == self::ENGINE_INTERNAL
      *
      * _setup() will be called each time if $changed === true
      * typically this happens when using one or more of following public methods:
@@ -1214,14 +1684,12 @@ class Crypt_Base
      *
      * - First run of encrypt() / decrypt() with no init-settings
      *
-     * Internally: _setup() is called always before(!) en/decryption.
-     *
-     * Note: Could, but not must, extend by the child Crypt_* class
-     *
      * @see setKey()
      * @see setIV()
      * @see disableContinuousBuffer()
      * @access private
+     * @internal _setup() is always called before en/decryption.
+     * @internal Could, but not must, extend by the child Crypt_* class
      */
     function _setup()
     {
@@ -1234,10 +1702,10 @@ class Crypt_Base
     }
 
     /**
-     * Setup the CRYPT_MODE_MCRYPT $engine
+     * Setup the self::ENGINE_MCRYPT $engine
      *
      * (re)init, if necessary, the (ext)mcrypt resources and flush all $buffers
-     * Used (only) if $engine = CRYPT_MODE_MCRYPT
+     * Used (only) if $engine = self::ENGINE_MCRYPT
      *
      * _setupMcrypt() will be called each time if $changed === true
      * typically this happens when using one or more of following public methods:
@@ -1250,13 +1718,11 @@ class Crypt_Base
      *
      * - First run of encrypt() / decrypt()
      *
-     *
-     * Note: Could, but not must, extend by the child Crypt_* class
-     *
      * @see setKey()
      * @see setIV()
      * @see disableContinuousBuffer()
      * @access private
+     * @internal Could, but not must, extend by the child Crypt_* class
      */
     function _setupMcrypt()
     {
@@ -1265,12 +1731,12 @@ class Crypt_Base
 
         if (!isset($this->enmcrypt)) {
             static $mcrypt_modes = array(
-                CRYPT_MODE_CTR    => 'ctr',
-                CRYPT_MODE_ECB    => MCRYPT_MODE_ECB,
-                CRYPT_MODE_CBC    => MCRYPT_MODE_CBC,
-                CRYPT_MODE_CFB    => 'ncfb',
-                CRYPT_MODE_OFB    => MCRYPT_MODE_NOFB,
-                CRYPT_MODE_STREAM => MCRYPT_MODE_STREAM,
+                self::MODE_CTR    => 'ctr',
+                self::MODE_ECB    => MCRYPT_MODE_ECB,
+                self::MODE_CBC    => MCRYPT_MODE_CBC,
+                self::MODE_CFB    => 'ncfb',
+                self::MODE_OFB    => MCRYPT_MODE_NOFB,
+                self::MODE_STREAM => MCRYPT_MODE_STREAM,
             );
 
             $this->demcrypt = mcrypt_module_open($this->cipher_name_mcrypt, '', $mcrypt_modes[$this->mode], '');
@@ -1279,13 +1745,13 @@ class Crypt_Base
             // we need the $ecb mcrypt resource (only) in MODE_CFB with enableContinuousBuffer()
             // to workaround mcrypt's broken ncfb implementation in buffered mode
             // see: {@link http://phpseclib.sourceforge.net/cfb-demo.phps}
-            if ($this->mode == CRYPT_MODE_CFB) {
+            if ($this->mode == self::MODE_CFB) {
                 $this->ecb = mcrypt_module_open($this->cipher_name_mcrypt, '', MCRYPT_MODE_ECB, '');
             }
 
         } // else should mcrypt_generic_deinit be called?
 
-        if ($this->mode == CRYPT_MODE_CFB) {
+        if ($this->mode == self::MODE_CFB) {
             mcrypt_generic_init($this->ecb, $this->key, str_repeat("\0", $this->block_size));
         }
     }
@@ -1300,7 +1766,7 @@ class Crypt_Base
      * If padding is disabled and $text is not a multiple of the blocksize, the string will be padded regardless
      * and padding will, hence forth, be enabled.
      *
-     * @see Crypt_Base::_unpad()
+     * @see \phpseclib\Crypt\Base::_unpad()
      * @param String $text
      * @access private
      * @return String
@@ -1329,7 +1795,7 @@ class Crypt_Base
      * If padding is enabled and the reported padding length is invalid the encryption key will be assumed to be wrong
      * and false will be returned.
      *
-     * @see Crypt_Base::_pad()
+     * @see \phpseclib\Crypt\Base::_pad()
      * @param String $text
      * @access private
      * @return String
@@ -1356,14 +1822,12 @@ class Crypt_Base
      * after disableContinuousBuffer() or on cipher $engine (re)init
      * ie after setKey() or setIV()
      *
-     * Note: Could, but not must, extend by the child Crypt_* class
-     *
      * @access public
+     * @internal Could, but not must, extend by the child Crypt_* class
      */
     function _clearBuffers()
     {
-        $this->enbuffer = array('encrypted'  => '', 'xor' => '', 'pos' => 0, 'enmcrypt_init' => true);
-        $this->debuffer = array('ciphertext' => '', 'xor' => '', 'pos' => 0, 'demcrypt_init' => true);
+        $this->enbuffer = $this->debuffer = array('ciphertext' => '', 'xor' => '', 'pos' => 0, 'enmcrypt_init' => true);
 
         // mcrypt's handling of invalid's $iv:
         // $this->encryptIV = $this->decryptIV = strlen($this->iv) == $this->block_size ? $this->iv : str_repeat("\0", $this->block_size);
@@ -1380,7 +1844,7 @@ class Crypt_Base
      * @access private
      * @return String
      */
-    function _stringShift(&$string, $index = 1)
+    function _string_shift(&$string, $index = 1)
     {
         $substr = substr($string, 0, $index);
         $string = substr($string, $index);
@@ -1388,43 +1852,57 @@ class Crypt_Base
     }
 
     /**
-     * Generate CTR XOR encryption key
+     * String Pop
      *
-     * Encrypt the output of this and XOR it against the ciphertext / plaintext to get the
-     * plaintext / ciphertext in CTR mode.
+     * Inspired by array_pop
      *
-     * @see Crypt_Base::decrypt()
-     * @see Crypt_Base::encrypt()
-     * @param String $iv
-     * @param Integer $length
+     * @param String $string
+     * @param optional Integer $index
      * @access private
-     * @return String $xor
+     * @return String
      */
-    function _generateXor(&$iv, $length)
+    function _string_pop(&$string, $index = 1)
     {
-        $xor = '';
-        $block_size = $this->block_size;
-        $num_blocks = floor(($length + ($block_size - 1)) / $block_size);
-        for ($i = 0; $i < $num_blocks; $i++) {
-            $xor.= $iv;
-            for ($j = 4; $j <= $block_size; $j+= 4) {
-                $temp = substr($iv, -$j, 4);
-                switch ($temp) {
-                    case "\xFF\xFF\xFF\xFF":
-                        $iv = substr_replace($iv, "\x00\x00\x00\x00", -$j, 4);
-                        break;
-                    case "\x7F\xFF\xFF\xFF":
-                        $iv = substr_replace($iv, "\x80\x00\x00\x00", -$j, 4);
-                        break 2;
-                    default:
-                        extract(unpack('Ncount', $temp));
-                        $iv = substr_replace($iv, pack('N', $count + 1), -$j, 4);
-                        break 2;
-                }
+        $substr = substr($string, -$index);
+        $string = substr($string, 0, -$index);
+        return $substr;
+    }
+
+    /**
+     * Increment the current string
+     *
+     * @see \phpseclib\Crypt\Base::decrypt()
+     * @see \phpseclib\Crypt\Base::encrypt()
+     * @param String $var
+     * @access private
+     */
+    function _increment_str(&$var)
+    {
+        for ($i = 4; $i <= strlen($var); $i+= 4) {
+            $temp = substr($var, -$i, 4);
+            switch ($temp) {
+                case "\xFF\xFF\xFF\xFF":
+                    $var = substr_replace($var, "\x00\x00\x00\x00", -$i, 4);
+                    break;
+                case "\x7F\xFF\xFF\xFF":
+                    $var = substr_replace($var, "\x80\x00\x00\x00", -$i, 4);
+                    return;
+                default:
+                    $temp = unpack('Nnum', $temp);
+                    $var = substr_replace($var, pack('N', $temp['num'] + 1), -$i, 4);
+                    return;
             }
         }
 
-        return $xor;
+        $remainder = strlen($var) % 4;
+
+        if ($remainder == 0) {
+            return;
+        }
+
+        $temp = unpack('Nnum', str_pad(substr($var, 0, $remainder), 4, "\0", STR_PAD_LEFT));
+        $temp = substr(pack('N', $temp['num'] + 1), -$remainder);
+        $var = substr_replace($var, $temp, 0, $remainder);
     }
 
     /**
@@ -1437,7 +1915,7 @@ class Crypt_Base
      *
      *     _setupInlineCrypt() would be called only if:
      *
-     *     - $engine == CRYPT_MODE_INTERNAL and
+     *     - $engine == self::ENGINE_INTERNAL and
      *
      *     - $use_inline_crypt === true
      *
@@ -1472,7 +1950,7 @@ class Crypt_Base
      *       - short (as good as possible)
      *
      * Note: - _setupInlineCrypt() is using _createInlineCryptFunction() to create the full callback function code.
-     *       - In case of using inline crypting, _setupInlineCrypt() must extend by the child Crypt_* class.
+     *       - In case of using inline crypting, _setupInlineCrypt() must extend by the child \phpseclib\Crypt\* class.
      *       - The following variable names are reserved:
      *         - $_*  (all variable names prefixed with an underscore)
      *         - $self (object reference to it self. Do not use $this, but $self instead)
@@ -1480,19 +1958,18 @@ class Crypt_Base
      *       - The callback function should not use the 'return' statement, but en/decrypt'ing the content of $in only
      *
      *
-     * @see Crypt_Base::_setup()
-     * @see Crypt_Base::_createInlineCryptFunction()
-     * @see Crypt_Base::encrypt()
-     * @see Crypt_Base::decrypt()
+     * @see \phpseclib\Crypt\Base::_setup()
+     * @see \phpseclib\Crypt\Base::_createInlineCryptFunction()
+     * @see \phpseclib\Crypt\Base::encrypt()
+     * @see \phpseclib\Crypt\Base::decrypt()
      * @access private
+     * @internal If a Crypt_* class providing inline crypting it must extend _setupInlineCrypt()
      */
     function _setupInlineCrypt()
     {
-        // If a Crypt_* class providing inline crypting it must extend _setupInlineCrypt()
-
-        // If, for any reason, an extending Crypt_Base() Crypt_* class
+        // If, for any reason, an extending \phpseclib\Crypt\Base() \phpseclib\Crypt\* class
         // not using inline crypting then it must be ensured that: $this->use_inline_crypt = false
-        // ie in the class var declaration of $use_inline_crypt in general for the Crypt_* class,
+        // ie in the class var declaration of $use_inline_crypt in general for the \phpseclib\Crypt\* class,
         // in the constructor at object instance-time
         // or, if it's runtime-specific, at runtime
 
@@ -1589,7 +2066,7 @@ class Crypt_Base
      *    +----------------------------------------------------------------------------------------------+
      *    </code>
      *
-     *    See also the Crypt_*::_setupInlineCrypt()'s for
+     *    See also the \phpseclib\Crypt\*::_setupInlineCrypt()'s for
      *    productive inline $cipher_code's how they works.
      *
      *    Structure of:
@@ -1603,9 +2080,9 @@ class Crypt_Base
      *    );
      *    </code>
      *
-     * @see Crypt_Base::_setupInlineCrypt()
-     * @see Crypt_Base::encrypt()
-     * @see Crypt_Base::decrypt()
+     * @see \phpseclib\Crypt\Base::_setupInlineCrypt()
+     * @see \phpseclib\Crypt\Base::encrypt()
+     * @see \phpseclib\Crypt\Base::decrypt()
      * @param Array $cipher_code
      * @access private
      * @return String (the name of the created callback function)
@@ -1626,10 +2103,9 @@ class Crypt_Base
         // merged with the $cipher_code algorithm
         // for encrypt- and decryption.
         switch ($this->mode) {
-            case CRYPT_MODE_ECB:
+            case self::MODE_ECB:
                 $encrypt = $init_encrypt . '
                     $_ciphertext = "";
-                    $_text = $self->_pad($_text);
                     $_plaintext_len = strlen($_text);
 
                     for ($_i = 0; $_i < $_plaintext_len; $_i+= '.$block_size.') {
@@ -1655,29 +2131,30 @@ class Crypt_Base
                     return $self->_unpad($_plaintext);
                     ';
                 break;
-            case CRYPT_MODE_CTR:
+            case self::MODE_CTR:
                 $encrypt = $init_encrypt . '
                     $_ciphertext = "";
                     $_plaintext_len = strlen($_text);
                     $_xor = $self->encryptIV;
                     $_buffer = &$self->enbuffer;
-
-                    if (strlen($_buffer["encrypted"])) {
+                    if (strlen($_buffer["ciphertext"])) {
                         for ($_i = 0; $_i < $_plaintext_len; $_i+= '.$block_size.') {
                             $_block = substr($_text, $_i, '.$block_size.');
-                            if (strlen($_block) > strlen($_buffer["encrypted"])) {
-                                $in = $self->_generateXor($_xor, '.$block_size.');
+                            if (strlen($_block) > strlen($_buffer["ciphertext"])) {
+                                $in = $_xor;
                                 '.$encrypt_block.'
-                                $_buffer["encrypted"].= $in;
+                                $self->_increment_str($_xor);
+                                $_buffer["ciphertext"].= $in;
                             }
-                            $_key = $self->_stringShift($_buffer["encrypted"], '.$block_size.');
+                            $_key = $self->_string_shift($_buffer["ciphertext"], '.$block_size.');
                             $_ciphertext.= $_block ^ $_key;
                         }
                     } else {
                         for ($_i = 0; $_i < $_plaintext_len; $_i+= '.$block_size.') {
                             $_block = substr($_text, $_i, '.$block_size.');
-                            $in = $self->_generateXor($_xor, '.$block_size.');
+                            $in = $_xor;
                             '.$encrypt_block.'
+                            $self->_increment_str($_xor);
                             $_key = $in;
                             $_ciphertext.= $_block ^ $_key;
                         }
@@ -1685,7 +2162,7 @@ class Crypt_Base
                     if ($self->continuousBuffer) {
                         $self->encryptIV = $_xor;
                         if ($_start = $_plaintext_len % '.$block_size.') {
-                            $_buffer["encrypted"] = substr($_key, $_start) . $_buffer["encrypted"];
+                            $_buffer["ciphertext"] = substr($_key, $_start) . $_buffer["ciphertext"];
                         }
                     }
 
@@ -1702,18 +2179,20 @@ class Crypt_Base
                         for ($_i = 0; $_i < $_ciphertext_len; $_i+= '.$block_size.') {
                             $_block = substr($_text, $_i, '.$block_size.');
                             if (strlen($_block) > strlen($_buffer["ciphertext"])) {
-                                $in = $self->_generateXor($_xor, '.$block_size.');
+                                $in = $_xor;
                                 '.$encrypt_block.'
+                                $self->_increment_str($_xor);
                                 $_buffer["ciphertext"].= $in;
                             }
-                            $_key = $self->_stringShift($_buffer["ciphertext"], '.$block_size.');
+                            $_key = $self->_string_shift($_buffer["ciphertext"], '.$block_size.');
                             $_plaintext.= $_block ^ $_key;
                         }
                     } else {
                         for ($_i = 0; $_i < $_ciphertext_len; $_i+= '.$block_size.') {
                             $_block = substr($_text, $_i, '.$block_size.');
-                            $in = $self->_generateXor($_xor, '.$block_size.');
+                            $in = $_xor;
                             '.$encrypt_block.'
+                            $self->_increment_str($_xor);
                             $_key = $in;
                             $_plaintext.= $_block ^ $_key;
                         }
@@ -1728,7 +2207,7 @@ class Crypt_Base
                     return $_plaintext;
                     ';
                 break;
-            case CRYPT_MODE_CFB:
+            case self::MODE_CFB:
                 $encrypt = $init_encrypt . '
                     $_ciphertext = "";
                     $_buffer = &$self->enbuffer;
@@ -1827,7 +2306,7 @@ class Crypt_Base
                     return $_plaintext;
                     ';
                 break;
-            case CRYPT_MODE_OFB:
+            case self::MODE_OFB:
                 $encrypt = $init_encrypt . '
                     $_ciphertext = "";
                     $_plaintext_len = strlen($_text);
@@ -1843,7 +2322,7 @@ class Crypt_Base
                                 $_xor = $in;
                                 $_buffer["xor"].= $_xor;
                             }
-                            $_key = $self->_stringShift($_buffer["xor"], '.$block_size.');
+                            $_key = $self->_string_shift($_buffer["xor"], '.$block_size.');
                             $_ciphertext.= $_block ^ $_key;
                         }
                     } else {
@@ -1879,7 +2358,7 @@ class Crypt_Base
                                 $_xor = $in;
                                 $_buffer["xor"].= $_xor;
                             }
-                            $_key = $self->_stringShift($_buffer["xor"], '.$block_size.');
+                            $_key = $self->_string_shift($_buffer["xor"], '.$block_size.');
                             $_plaintext.= $_block ^ $_key;
                         }
                     } else {
@@ -1900,7 +2379,7 @@ class Crypt_Base
                     return $_plaintext;
                     ';
                 break;
-            case CRYPT_MODE_STREAM:
+            case self::MODE_STREAM:
                 $encrypt = $init_encrypt . '
                     $_ciphertext = "";
                     '.$encrypt_block.'
@@ -1912,11 +2391,10 @@ class Crypt_Base
                     return $_plaintext;
                     ';
                 break;
-            // case CRYPT_MODE_CBC:
+            // case self::MODE_CBC:
             default:
                 $encrypt = $init_encrypt . '
                     $_ciphertext = "";
-                    $_text = $self->_pad($_text);
                     $_plaintext_len = strlen($_text);
 
                     $in = $self->encryptIV;
@@ -1974,11 +2452,46 @@ class Crypt_Base
      * for which $mode the lambda function was created.
      *
      * @access private
-     * @return &Array
+     * @return Array &$functions
      */
     function &_getLambdaFunctions()
     {
         static $functions = array();
         return $functions;
     }
+
+    /**
+     * Generates a digest from $bytes
+     *
+     * @see _setupInlineCrypt()
+     * @access private
+     * @param $bytes
+     * @return String
+     */
+    function _hashInlineCryptFunction($bytes)
+    {
+        if (!isset(self::$WHIRLPOOL_AVAILABLE)) {
+            self::$WHIRLPOOL_AVAILABLE = extension_loaded('hash') && in_array('whirlpool', hash_algos());
+        }
+
+        $result = '';
+        $hash = $bytes;
+
+        switch (true) {
+            case self::$WHIRLPOOL_AVAILABLE:
+                foreach (str_split($bytes, 64) as $t) {
+                    $hash = hash('whirlpool', $hash, true);
+                    $result .= $t ^ $hash;
+                }
+                return $result . hash('whirlpool', $hash, true);
+            default:
+                $len = strlen($bytes);
+                for ($i = 0; $i < $len; $i+=20) {
+                    $t = substr($bytes, $i, 20);
+                    $hash = pack('H*', sha1($hash));
+                    $result .= $t ^ $hash;
+                }
+                return $result . pack('H*', sha1($hash));
+        }
+    }
 }
diff --git a/libraries/phpseclib/Crypt/Random.php b/libraries/phpseclib/Crypt/Random.php
index 0277393131..9fb1d15bb5 100644
--- a/libraries/phpseclib/Crypt/Random.php
+++ b/libraries/phpseclib/Crypt/Random.php
@@ -3,54 +3,44 @@
 /**
  * Random Number Generator
  *
- * PHP versions 4 and 5
+ * PHP version 5
  *
  * Here's a short example of how to use this library:
  * <code>
  * <?php
- *    include 'Crypt/Random.php';
+ *    include 'vendor/autoload.php';
  *
- *    echo bin2hex(crypt_random_string(8));
+ *    echo bin2hex(\phpseclib\Crypt\Random::string(8));
  * ?>
  * </code>
  *
- * LICENSE: Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
  * @category  Crypt
- * @package   Crypt_Random
+ * @package   Random
  * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright MMVII Jim Wigginton
+ * @copyright 2007 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
  * @link      http://phpseclib.sourceforge.net
  */
 
-// laravel is a PHP framework that utilizes phpseclib. laravel workbenches may, independently,
-// have phpseclib as a requirement as well. if you're developing such a program you may encounter
-// a "Cannot redeclare crypt_random_string()" error.
-if (!function_exists('crypt_random_string')) {
-    /**
-     * "Is Windows" test
-     *
-     * @access private
-     */
-    define('CRYPT_RANDOM_IS_WINDOWS', strtoupper(substr(PHP_OS, 0, 3)) === 'WIN');
+namespace phpseclib\Crypt;
 
+use phpseclib\Crypt\AES;
+use phpseclib\Crypt\Base;
+use phpseclib\Crypt\Blowfish;
+use phpseclib\Crypt\DES;
+use phpseclib\Crypt\RC4;
+use phpseclib\Crypt\TripleDES;
+use phpseclib\Crypt\Twofish;
+
+/**
+ * Pure-PHP Random Number Generator
+ *
+ * @package Random
+ * @author  Jim Wigginton <terrafrost@php.net>
+ * @access  public
+ */
+class Random
+{
     /**
      * Generate a random string.
      *
@@ -60,11 +50,10 @@ if (!function_exists('crypt_random_string')) {
      *
      * @param Integer $length
      * @return String
-     * @access public
      */
-    function crypt_random_string($length)
+    public static function string($length)
     {
-        if (CRYPT_RANDOM_IS_WINDOWS) {
+        if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
             // method 1. prior to PHP 5.3 this would call rand() on windows hence the function_exists('class_alias') call.
             // ie. class_alias is a function that was introduced in PHP 5.3
             if (function_exists('mcrypt_create_iv') && function_exists('class_alias')) {
@@ -120,7 +109,7 @@ if (!function_exists('crypt_random_string')) {
         // easy to guess at. linux uses mouse clicks, keyboard timings, etc, as entropy sources, but
         // PHP isn't low level to be able to use those as sources and on a web server there's not likely
         // going to be a ton of keyboard or mouse action. web servers do have one thing that we can use
-        // however. a ton of people visiting the website. obviously you don't want to base your seeding
+        // however, a ton of people visiting the website. obviously you don't want to base your seeding
         // soley on parameters a potential attacker sends but (1) not everything in $_SERVER is controlled
         // by the user and (2) this isn't just looking at the data sent by the current user - it's based
         // on the data sent by all users. one user requests the page and a hash of their info is saved.
@@ -168,9 +157,9 @@ if (!function_exists('crypt_random_string')) {
                 ini_set('session.use_cookies', $old_use_cookies);
                 session_cache_limiter($old_session_cache_limiter);
             } else {
-               if ($_OLD_SESSION !== false) {
-                   $_SESSION = $_OLD_SESSION;
-                   unset($_OLD_SESSION);
+                if ($_OLD_SESSION !== false) {
+                    $_SESSION = $_OLD_SESSION;
+                    unset($_OLD_SESSION);
                 } else {
                     unset($_SESSION);
                 }
@@ -191,21 +180,27 @@ if (!function_exists('crypt_random_string')) {
             //
             // http://en.wikipedia.org/wiki/Cryptographically_secure_pseudorandom_number_generator#Designs_based_on_cryptographic_primitives
             switch (true) {
-                case class_exists('Crypt_AES'):
-                    $crypto = new Crypt_AES(CRYPT_AES_MODE_CTR);
+                case class_exists('\phpseclib\Crypt\AES'):
+                    $crypto = new AES(Base::MODE_CTR);
                     break;
-                case class_exists('Crypt_TripleDES'):
-                    $crypto = new Crypt_TripleDES(CRYPT_DES_MODE_CTR);
+                case class_exists('\phpseclib\Crypt\Twofish'):
+                    $crypto = new Twofish(Base::MODE_CTR);
                     break;
-                case class_exists('Crypt_DES'):
-                    $crypto = new Crypt_DES(CRYPT_DES_MODE_CTR);
+                case class_exists('\phpseclib\Crypt\Blowfish'):
+                    $crypto = new Blowfish(Base::MODE_CTR);
                     break;
-                case class_exists('Crypt_RC4'):
-                    $crypto = new Crypt_RC4();
+                case class_exists('\phpseclib\Crypt\TripleDES'):
+                    $crypto = new TripleDES(Base::MODE_CTR);
+                    break;
+                case class_exists('\phpseclib\Crypt\DES'):
+                    $crypto = new DES(Base::MODE_CTR);
+                    break;
+                case class_exists('\phpseclib\Crypt\RC4'):
+                    $crypto = new RC4();
                     break;
                 default:
-                    $crypto = $seed;
-                    return crypt_random_string($length);
+                    user_error(__CLASS__ . ' requires at least one symmetric cipher be loaded');
+                    return false;
             }
 
             $crypto->setKey($key);
@@ -213,37 +208,21 @@ if (!function_exists('crypt_random_string')) {
             $crypto->enableContinuousBuffer();
         }
 
-        if (is_string($crypto)) {
-            // the following is based off of ANSI X9.31:
-            //
-            // http://csrc.nist.gov/groups/STM/cavp/documents/rng/931rngext.pdf
-            //
-            // OpenSSL uses that same standard for it's random numbers:
-            //
-            // http://www.opensource.apple.com/source/OpenSSL/OpenSSL-38/openssl/fips-1.0/rand/fips_rand.c
-            // (do a search for "ANS X9.31 A.2.4")
-            //
-            // ANSI X9.31 recommends ciphers be used and phpseclib does use them if they're available (see
-            // later on in the code) but if they're not we'll use sha1
-            $result = '';
-            while (strlen($result) < $length) { // each loop adds 20 bytes
-                // microtime() isn't packed as "densely" as it could be but then neither is that the idea.
-                // the idea is simply to ensure that each "block" has a unique element to it.
-                $i = pack('H*', sha1(microtime()));
-                $r = pack('H*', sha1($i ^ $v));
-                $v = pack('H*', sha1($r ^ $i));
-                $result.= $r;
-            }
-            return substr($result, 0, $length);
-        }
-
         //return $crypto->encrypt(str_repeat("\0", $length));
 
+        // the following is based off of ANSI X9.31:
+        //
+        // http://csrc.nist.gov/groups/STM/cavp/documents/rng/931rngext.pdf
+        //
+        // OpenSSL uses that same standard for it's random numbers:
+        //
+        // http://www.opensource.apple.com/source/OpenSSL/OpenSSL-38/openssl/fips-1.0/rand/fips_rand.c
+        // (do a search for "ANS X9.31 A.2.4")
         $result = '';
         while (strlen($result) < $length) {
-            $i = $crypto->encrypt(microtime());
-            $r = $crypto->encrypt($i ^ $v);
-            $v = $crypto->encrypt($r ^ $i);
+            $i = $crypto->encrypt(microtime()); // strlen(microtime()) == 21
+            $r = $crypto->encrypt($i ^ $v); // strlen($v) == 20
+            $v = $crypto->encrypt($r ^ $i); // strlen($r) == 20
             $result.= $r;
         }
         return substr($result, 0, $length);
diff --git a/libraries/phpseclib/Crypt/Rijndael.php b/libraries/phpseclib/Crypt/Rijndael.php
index 821547df9b..90c75d8365 100644
--- a/libraries/phpseclib/Crypt/Rijndael.php
+++ b/libraries/phpseclib/Crypt/Rijndael.php
@@ -5,13 +5,13 @@
  *
  * Uses mcrypt, if available/possible, and an internal implementation, otherwise.
  *
- * PHP versions 4 and 5
+ * PHP version 5
  *
- * If {@link Crypt_Rijndael::setBlockLength() setBlockLength()} isn't called, it'll be assumed to be 128 bits.  If
- * {@link Crypt_Rijndael::setKeyLength() setKeyLength()} isn't called, it'll be calculated from
- * {@link Crypt_Rijndael::setKey() setKey()}.  ie. if the key is 128-bits, the key length will be 128-bits.  If it's
+ * If {@link \phpseclib\Crypt\Rijndael::setBlockLength() setBlockLength()} isn't called, it'll be assumed to be 128 bits.  If
+ * {@link \phpseclib\Crypt\Rijndael::setKeyLength() setKeyLength()} isn't called, it'll be calculated from
+ * {@link \phpseclib\Crypt\Rijndael::setKey() setKey()}.  ie. if the key is 128-bits, the key length will be 128-bits.  If it's
  * 136-bits it'll be null-padded to 192-bits and 192 bits will be the key length until
- * {@link Crypt_Rijndael::setKey() setKey()} is called, again, at which point, it'll be recalculated.
+ * {@link \phpseclib\Crypt\Rijndael::setKey() setKey()} is called, again, at which point, it'll be recalculated.
  *
  * Not all Rijndael implementations may support 160-bits or 224-bits as the block length / key length.  mcrypt, for example,
  * does not.  AES, itself, only supports block lengths of 128 and key lengths of 128, 192, and 256.
@@ -28,9 +28,9 @@
  * Here's a short example of how to use this library:
  * <code>
  * <?php
- *    include 'Crypt/Rijndael.php';
+ *    include 'vendor/autoload.php';
  *
- *    $rijndael = new Crypt_Rijndael();
+ *    $rijndael = new \phpseclib\Crypt\Rijndael();
  *
  *    $rijndael->setKey('abcdefghijklmnop');
  *
@@ -44,133 +44,48 @@
  * ?>
  * </code>
  *
- * LICENSE: Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- *
  * @category  Crypt
- * @package   Crypt_Rijndael
+ * @package   Rijndael
  * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright MMVIII Jim Wigginton
+ * @copyright 2008 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
  * @link      http://phpseclib.sourceforge.net
  */
 
-/**
- * Include Crypt_Base
- *
- * Base cipher class
- */
-if (!class_exists('Crypt_Base')) {
-    include_once 'Base.php';
-}
+namespace phpseclib\Crypt;
 
-/**#@+
- * @access public
- * @see Crypt_Rijndael::encrypt()
- * @see Crypt_Rijndael::decrypt()
- */
-/**
- * Encrypt / decrypt using the Counter mode.
- *
- * Set to -1 since that's what Crypt/Random.php uses to index the CTR mode.
- *
- * @link http://en.wikipedia.org/wiki/Block_cipher_modes_of_operation#Counter_.28CTR.29
- */
-define('CRYPT_RIJNDAEL_MODE_CTR', CRYPT_MODE_CTR);
-/**
- * Encrypt / decrypt using the Electronic Code Book mode.
- *
- * @link http://en.wikipedia.org/wiki/Block_cipher_modes_of_operation#Electronic_codebook_.28ECB.29
- */
-define('CRYPT_RIJNDAEL_MODE_ECB', CRYPT_MODE_ECB);
-/**
- * Encrypt / decrypt using the Code Book Chaining mode.
- *
- * @link http://en.wikipedia.org/wiki/Block_cipher_modes_of_operation#Cipher-block_chaining_.28CBC.29
- */
-define('CRYPT_RIJNDAEL_MODE_CBC', CRYPT_MODE_CBC);
-/**
- * Encrypt / decrypt using the Cipher Feedback mode.
- *
- * @link http://en.wikipedia.org/wiki/Block_cipher_modes_of_operation#Cipher_feedback_.28CFB.29
- */
-define('CRYPT_RIJNDAEL_MODE_CFB', CRYPT_MODE_CFB);
-/**
- * Encrypt / decrypt using the Cipher Feedback mode.
- *
- * @link http://en.wikipedia.org/wiki/Block_cipher_modes_of_operation#Output_feedback_.28OFB.29
- */
-define('CRYPT_RIJNDAEL_MODE_OFB', CRYPT_MODE_OFB);
-/**#@-*/
-
-/**#@+
- * @access private
- * @see Crypt_Rijndael::Crypt_Rijndael()
- */
-/**
- * Toggles the internal implementation
- */
-define('CRYPT_RIJNDAEL_MODE_INTERNAL', CRYPT_MODE_INTERNAL);
-/**
- * Toggles the mcrypt implementation
- */
-define('CRYPT_RIJNDAEL_MODE_MCRYPT', CRYPT_MODE_MCRYPT);
-/**#@-*/
+use phpseclib\Crypt\Base;
 
 /**
  * Pure-PHP implementation of Rijndael.
  *
- * @package Crypt_Rijndael
+ * @package Rijndael
  * @author  Jim Wigginton <terrafrost@php.net>
  * @access  public
  */
-class Crypt_Rijndael extends Crypt_Base
+class Rijndael extends Base
 {
     /**
      * The default password key_size used by setPassword()
      *
-     * @see Crypt_Base::password_key_size
-     * @see Crypt_Base::setPassword()
+     * @see \phpseclib\Crypt\Base::password_key_size
+     * @see \phpseclib\Crypt\Base::setPassword()
      * @var Integer
      * @access private
      */
     var $password_key_size = 16;
 
-    /**
-     * The namespace used by the cipher for its constants.
-     *
-     * @see Crypt_Base::const_namespace
-     * @var String
-     * @access private
-     */
-    var $const_namespace = 'RIJNDAEL';
-
     /**
      * The mcrypt specific name of the cipher
      *
      * Mcrypt is useable for 128/192/256-bit $block_size/$key_size. For 160/224 not.
-     * Crypt_Rijndael determines automatically whether mcrypt is useable
+     * \phpseclib\Crypt\Rijndael determines automatically whether mcrypt is useable
      * or not for the current $block_size/$key_size.
      * In case of, $cipher_name_mcrypt will be set dynamically at run time accordingly.
      *
-     * @see Crypt_Base::cipher_name_mcrypt
-     * @see Crypt_Base::engine
-     * @see _setupEngine()
+     * @see \phpseclib\Crypt\Base::cipher_name_mcrypt
+     * @see \phpseclib\Crypt\Base::engine
+     * @see isValidEngine()
      * @var String
      * @access private
      */
@@ -179,8 +94,8 @@ class Crypt_Rijndael extends Crypt_Base
     /**
      * The default salt used by setPassword()
      *
-     * @see Crypt_Base::password_default_salt
-     * @see Crypt_Base::setPassword()
+     * @see \phpseclib\Crypt\Base::password_default_salt
+     * @see \phpseclib\Crypt\Base::setPassword()
      * @var String
      * @access private
      */
@@ -223,7 +138,6 @@ class Crypt_Rijndael extends Crypt_Base
      *    because the encryption / decryption / key schedule creation requires this number and not $block_size.  We could
      *    derive this from $block_size or vice versa, but that'd mean we'd have to do multiple shift operations, so in lieu
      *    of that, we'll just precompute it once.
-     *
      */
     var $Nb = 4;
 
@@ -275,406 +189,6 @@ class Crypt_Rijndael extends Crypt_Base
      */
     var $kl;
 
-    /**
-     * Precomputed mixColumns table
-     *
-     * According to <http://csrc.nist.gov/archive/aes/rijndael/Rijndael-ammended.pdf#page=19> (section 5.2.1),
-     * precomputed tables can be used in the mixColumns phase.  in that example, they're assigned t0...t3, so
-     * those are the names we'll use.
-     *
-     * @see Crypt_Rijndael:_encryptBlock()
-     * @see Crypt_Rijndael:_decryptBlock()
-     * @var Array
-     * @access private
-     */
-    var $t0 = array(
-        0xC66363A5, 0xF87C7C84, 0xEE777799, 0xF67B7B8D, 0xFFF2F20D, 0xD66B6BBD, 0xDE6F6FB1, 0x91C5C554,
-        0x60303050, 0x02010103, 0xCE6767A9, 0x562B2B7D, 0xE7FEFE19, 0xB5D7D762, 0x4DABABE6, 0xEC76769A,
-        0x8FCACA45, 0x1F82829D, 0x89C9C940, 0xFA7D7D87, 0xEFFAFA15, 0xB25959EB, 0x8E4747C9, 0xFBF0F00B,
-        0x41ADADEC, 0xB3D4D467, 0x5FA2A2FD, 0x45AFAFEA, 0x239C9CBF, 0x53A4A4F7, 0xE4727296, 0x9BC0C05B,
-        0x75B7B7C2, 0xE1FDFD1C, 0x3D9393AE, 0x4C26266A, 0x6C36365A, 0x7E3F3F41, 0xF5F7F702, 0x83CCCC4F,
-        0x6834345C, 0x51A5A5F4, 0xD1E5E534, 0xF9F1F108, 0xE2717193, 0xABD8D873, 0x62313153, 0x2A15153F,
-        0x0804040C, 0x95C7C752, 0x46232365, 0x9DC3C35E, 0x30181828, 0x379696A1, 0x0A05050F, 0x2F9A9AB5,
-        0x0E070709, 0x24121236, 0x1B80809B, 0xDFE2E23D, 0xCDEBEB26, 0x4E272769, 0x7FB2B2CD, 0xEA75759F,
-        0x1209091B, 0x1D83839E, 0x582C2C74, 0x341A1A2E, 0x361B1B2D, 0xDC6E6EB2, 0xB45A5AEE, 0x5BA0A0FB,
-        0xA45252F6, 0x763B3B4D, 0xB7D6D661, 0x7DB3B3CE, 0x5229297B, 0xDDE3E33E, 0x5E2F2F71, 0x13848497,
-        0xA65353F5, 0xB9D1D168, 0x00000000, 0xC1EDED2C, 0x40202060, 0xE3FCFC1F, 0x79B1B1C8, 0xB65B5BED,
-        0xD46A6ABE, 0x8DCBCB46, 0x67BEBED9, 0x7239394B, 0x944A4ADE, 0x984C4CD4, 0xB05858E8, 0x85CFCF4A,
-        0xBBD0D06B, 0xC5EFEF2A, 0x4FAAAAE5, 0xEDFBFB16, 0x864343C5, 0x9A4D4DD7, 0x66333355, 0x11858594,
-        0x8A4545CF, 0xE9F9F910, 0x04020206, 0xFE7F7F81, 0xA05050F0, 0x783C3C44, 0x259F9FBA, 0x4BA8A8E3,
-        0xA25151F3, 0x5DA3A3FE, 0x804040C0, 0x058F8F8A, 0x3F9292AD, 0x219D9DBC, 0x70383848, 0xF1F5F504,
-        0x63BCBCDF, 0x77B6B6C1, 0xAFDADA75, 0x42212163, 0x20101030, 0xE5FFFF1A, 0xFDF3F30E, 0xBFD2D26D,
-        0x81CDCD4C, 0x180C0C14, 0x26131335, 0xC3ECEC2F, 0xBE5F5FE1, 0x359797A2, 0x884444CC, 0x2E171739,
-        0x93C4C457, 0x55A7A7F2, 0xFC7E7E82, 0x7A3D3D47, 0xC86464AC, 0xBA5D5DE7, 0x3219192B, 0xE6737395,
-        0xC06060A0, 0x19818198, 0x9E4F4FD1, 0xA3DCDC7F, 0x44222266, 0x542A2A7E, 0x3B9090AB, 0x0B888883,
-        0x8C4646CA, 0xC7EEEE29, 0x6BB8B8D3, 0x2814143C, 0xA7DEDE79, 0xBC5E5EE2, 0x160B0B1D, 0xADDBDB76,
-        0xDBE0E03B, 0x64323256, 0x743A3A4E, 0x140A0A1E, 0x924949DB, 0x0C06060A, 0x4824246C, 0xB85C5CE4,
-        0x9FC2C25D, 0xBDD3D36E, 0x43ACACEF, 0xC46262A6, 0x399191A8, 0x319595A4, 0xD3E4E437, 0xF279798B,
-        0xD5E7E732, 0x8BC8C843, 0x6E373759, 0xDA6D6DB7, 0x018D8D8C, 0xB1D5D564, 0x9C4E4ED2, 0x49A9A9E0,
-        0xD86C6CB4, 0xAC5656FA, 0xF3F4F407, 0xCFEAEA25, 0xCA6565AF, 0xF47A7A8E, 0x47AEAEE9, 0x10080818,
-        0x6FBABAD5, 0xF0787888, 0x4A25256F, 0x5C2E2E72, 0x381C1C24, 0x57A6A6F1, 0x73B4B4C7, 0x97C6C651,
-        0xCBE8E823, 0xA1DDDD7C, 0xE874749C, 0x3E1F1F21, 0x964B4BDD, 0x61BDBDDC, 0x0D8B8B86, 0x0F8A8A85,
-        0xE0707090, 0x7C3E3E42, 0x71B5B5C4, 0xCC6666AA, 0x904848D8, 0x06030305, 0xF7F6F601, 0x1C0E0E12,
-        0xC26161A3, 0x6A35355F, 0xAE5757F9, 0x69B9B9D0, 0x17868691, 0x99C1C158, 0x3A1D1D27, 0x279E9EB9,
-        0xD9E1E138, 0xEBF8F813, 0x2B9898B3, 0x22111133, 0xD26969BB, 0xA9D9D970, 0x078E8E89, 0x339494A7,
-        0x2D9B9BB6, 0x3C1E1E22, 0x15878792, 0xC9E9E920, 0x87CECE49, 0xAA5555FF, 0x50282878, 0xA5DFDF7A,
-        0x038C8C8F, 0x59A1A1F8, 0x09898980, 0x1A0D0D17, 0x65BFBFDA, 0xD7E6E631, 0x844242C6, 0xD06868B8,
-        0x824141C3, 0x299999B0, 0x5A2D2D77, 0x1E0F0F11, 0x7BB0B0CB, 0xA85454FC, 0x6DBBBBD6, 0x2C16163A
-    );
-
-    /**
-     * Precomputed mixColumns table
-     *
-     * @see Crypt_Rijndael:_encryptBlock()
-     * @see Crypt_Rijndael:_decryptBlock()
-     * @var Array
-     * @access private
-     */
-    var $t1 = array(
-        0xA5C66363, 0x84F87C7C, 0x99EE7777, 0x8DF67B7B, 0x0DFFF2F2, 0xBDD66B6B, 0xB1DE6F6F, 0x5491C5C5,
-        0x50603030, 0x03020101, 0xA9CE6767, 0x7D562B2B, 0x19E7FEFE, 0x62B5D7D7, 0xE64DABAB, 0x9AEC7676,
-        0x458FCACA, 0x9D1F8282, 0x4089C9C9, 0x87FA7D7D, 0x15EFFAFA, 0xEBB25959, 0xC98E4747, 0x0BFBF0F0,
-        0xEC41ADAD, 0x67B3D4D4, 0xFD5FA2A2, 0xEA45AFAF, 0xBF239C9C, 0xF753A4A4, 0x96E47272, 0x5B9BC0C0,
-        0xC275B7B7, 0x1CE1FDFD, 0xAE3D9393, 0x6A4C2626, 0x5A6C3636, 0x417E3F3F, 0x02F5F7F7, 0x4F83CCCC,
-        0x5C683434, 0xF451A5A5, 0x34D1E5E5, 0x08F9F1F1, 0x93E27171, 0x73ABD8D8, 0x53623131, 0x3F2A1515,
-        0x0C080404, 0x5295C7C7, 0x65462323, 0x5E9DC3C3, 0x28301818, 0xA1379696, 0x0F0A0505, 0xB52F9A9A,
-        0x090E0707, 0x36241212, 0x9B1B8080, 0x3DDFE2E2, 0x26CDEBEB, 0x694E2727, 0xCD7FB2B2, 0x9FEA7575,
-        0x1B120909, 0x9E1D8383, 0x74582C2C, 0x2E341A1A, 0x2D361B1B, 0xB2DC6E6E, 0xEEB45A5A, 0xFB5BA0A0,
-        0xF6A45252, 0x4D763B3B, 0x61B7D6D6, 0xCE7DB3B3, 0x7B522929, 0x3EDDE3E3, 0x715E2F2F, 0x97138484,
-        0xF5A65353, 0x68B9D1D1, 0x00000000, 0x2CC1EDED, 0x60402020, 0x1FE3FCFC, 0xC879B1B1, 0xEDB65B5B,
-        0xBED46A6A, 0x468DCBCB, 0xD967BEBE, 0x4B723939, 0xDE944A4A, 0xD4984C4C, 0xE8B05858, 0x4A85CFCF,
-        0x6BBBD0D0, 0x2AC5EFEF, 0xE54FAAAA, 0x16EDFBFB, 0xC5864343, 0xD79A4D4D, 0x55663333, 0x94118585,
-        0xCF8A4545, 0x10E9F9F9, 0x06040202, 0x81FE7F7F, 0xF0A05050, 0x44783C3C, 0xBA259F9F, 0xE34BA8A8,
-        0xF3A25151, 0xFE5DA3A3, 0xC0804040, 0x8A058F8F, 0xAD3F9292, 0xBC219D9D, 0x48703838, 0x04F1F5F5,
-        0xDF63BCBC, 0xC177B6B6, 0x75AFDADA, 0x63422121, 0x30201010, 0x1AE5FFFF, 0x0EFDF3F3, 0x6DBFD2D2,
-        0x4C81CDCD, 0x14180C0C, 0x35261313, 0x2FC3ECEC, 0xE1BE5F5F, 0xA2359797, 0xCC884444, 0x392E1717,
-        0x5793C4C4, 0xF255A7A7, 0x82FC7E7E, 0x477A3D3D, 0xACC86464, 0xE7BA5D5D, 0x2B321919, 0x95E67373,
-        0xA0C06060, 0x98198181, 0xD19E4F4F, 0x7FA3DCDC, 0x66442222, 0x7E542A2A, 0xAB3B9090, 0x830B8888,
-        0xCA8C4646, 0x29C7EEEE, 0xD36BB8B8, 0x3C281414, 0x79A7DEDE, 0xE2BC5E5E, 0x1D160B0B, 0x76ADDBDB,
-        0x3BDBE0E0, 0x56643232, 0x4E743A3A, 0x1E140A0A, 0xDB924949, 0x0A0C0606, 0x6C482424, 0xE4B85C5C,
-        0x5D9FC2C2, 0x6EBDD3D3, 0xEF43ACAC, 0xA6C46262, 0xA8399191, 0xA4319595, 0x37D3E4E4, 0x8BF27979,
-        0x32D5E7E7, 0x438BC8C8, 0x596E3737, 0xB7DA6D6D, 0x8C018D8D, 0x64B1D5D5, 0xD29C4E4E, 0xE049A9A9,
-        0xB4D86C6C, 0xFAAC5656, 0x07F3F4F4, 0x25CFEAEA, 0xAFCA6565, 0x8EF47A7A, 0xE947AEAE, 0x18100808,
-        0xD56FBABA, 0x88F07878, 0x6F4A2525, 0x725C2E2E, 0x24381C1C, 0xF157A6A6, 0xC773B4B4, 0x5197C6C6,
-        0x23CBE8E8, 0x7CA1DDDD, 0x9CE87474, 0x213E1F1F, 0xDD964B4B, 0xDC61BDBD, 0x860D8B8B, 0x850F8A8A,
-        0x90E07070, 0x427C3E3E, 0xC471B5B5, 0xAACC6666, 0xD8904848, 0x05060303, 0x01F7F6F6, 0x121C0E0E,
-        0xA3C26161, 0x5F6A3535, 0xF9AE5757, 0xD069B9B9, 0x91178686, 0x5899C1C1, 0x273A1D1D, 0xB9279E9E,
-        0x38D9E1E1, 0x13EBF8F8, 0xB32B9898, 0x33221111, 0xBBD26969, 0x70A9D9D9, 0x89078E8E, 0xA7339494,
-        0xB62D9B9B, 0x223C1E1E, 0x92158787, 0x20C9E9E9, 0x4987CECE, 0xFFAA5555, 0x78502828, 0x7AA5DFDF,
-        0x8F038C8C, 0xF859A1A1, 0x80098989, 0x171A0D0D, 0xDA65BFBF, 0x31D7E6E6, 0xC6844242, 0xB8D06868,
-        0xC3824141, 0xB0299999, 0x775A2D2D, 0x111E0F0F, 0xCB7BB0B0, 0xFCA85454, 0xD66DBBBB, 0x3A2C1616
-    );
-
-    /**
-     * Precomputed mixColumns table
-     *
-     * @see Crypt_Rijndael:_encryptBlock()
-     * @see Crypt_Rijndael:_decryptBlock()
-     * @var Array
-     * @access private
-     */
-    var $t2 = array(
-        0x63A5C663, 0x7C84F87C, 0x7799EE77, 0x7B8DF67B, 0xF20DFFF2, 0x6BBDD66B, 0x6FB1DE6F, 0xC55491C5,
-        0x30506030, 0x01030201, 0x67A9CE67, 0x2B7D562B, 0xFE19E7FE, 0xD762B5D7, 0xABE64DAB, 0x769AEC76,
-        0xCA458FCA, 0x829D1F82, 0xC94089C9, 0x7D87FA7D, 0xFA15EFFA, 0x59EBB259, 0x47C98E47, 0xF00BFBF0,
-        0xADEC41AD, 0xD467B3D4, 0xA2FD5FA2, 0xAFEA45AF, 0x9CBF239C, 0xA4F753A4, 0x7296E472, 0xC05B9BC0,
-        0xB7C275B7, 0xFD1CE1FD, 0x93AE3D93, 0x266A4C26, 0x365A6C36, 0x3F417E3F, 0xF702F5F7, 0xCC4F83CC,
-        0x345C6834, 0xA5F451A5, 0xE534D1E5, 0xF108F9F1, 0x7193E271, 0xD873ABD8, 0x31536231, 0x153F2A15,
-        0x040C0804, 0xC75295C7, 0x23654623, 0xC35E9DC3, 0x18283018, 0x96A13796, 0x050F0A05, 0x9AB52F9A,
-        0x07090E07, 0x12362412, 0x809B1B80, 0xE23DDFE2, 0xEB26CDEB, 0x27694E27, 0xB2CD7FB2, 0x759FEA75,
-        0x091B1209, 0x839E1D83, 0x2C74582C, 0x1A2E341A, 0x1B2D361B, 0x6EB2DC6E, 0x5AEEB45A, 0xA0FB5BA0,
-        0x52F6A452, 0x3B4D763B, 0xD661B7D6, 0xB3CE7DB3, 0x297B5229, 0xE33EDDE3, 0x2F715E2F, 0x84971384,
-        0x53F5A653, 0xD168B9D1, 0x00000000, 0xED2CC1ED, 0x20604020, 0xFC1FE3FC, 0xB1C879B1, 0x5BEDB65B,
-        0x6ABED46A, 0xCB468DCB, 0xBED967BE, 0x394B7239, 0x4ADE944A, 0x4CD4984C, 0x58E8B058, 0xCF4A85CF,
-        0xD06BBBD0, 0xEF2AC5EF, 0xAAE54FAA, 0xFB16EDFB, 0x43C58643, 0x4DD79A4D, 0x33556633, 0x85941185,
-        0x45CF8A45, 0xF910E9F9, 0x02060402, 0x7F81FE7F, 0x50F0A050, 0x3C44783C, 0x9FBA259F, 0xA8E34BA8,
-        0x51F3A251, 0xA3FE5DA3, 0x40C08040, 0x8F8A058F, 0x92AD3F92, 0x9DBC219D, 0x38487038, 0xF504F1F5,
-        0xBCDF63BC, 0xB6C177B6, 0xDA75AFDA, 0x21634221, 0x10302010, 0xFF1AE5FF, 0xF30EFDF3, 0xD26DBFD2,
-        0xCD4C81CD, 0x0C14180C, 0x13352613, 0xEC2FC3EC, 0x5FE1BE5F, 0x97A23597, 0x44CC8844, 0x17392E17,
-        0xC45793C4, 0xA7F255A7, 0x7E82FC7E, 0x3D477A3D, 0x64ACC864, 0x5DE7BA5D, 0x192B3219, 0x7395E673,
-        0x60A0C060, 0x81981981, 0x4FD19E4F, 0xDC7FA3DC, 0x22664422, 0x2A7E542A, 0x90AB3B90, 0x88830B88,
-        0x46CA8C46, 0xEE29C7EE, 0xB8D36BB8, 0x143C2814, 0xDE79A7DE, 0x5EE2BC5E, 0x0B1D160B, 0xDB76ADDB,
-        0xE03BDBE0, 0x32566432, 0x3A4E743A, 0x0A1E140A, 0x49DB9249, 0x060A0C06, 0x246C4824, 0x5CE4B85C,
-        0xC25D9FC2, 0xD36EBDD3, 0xACEF43AC, 0x62A6C462, 0x91A83991, 0x95A43195, 0xE437D3E4, 0x798BF279,
-        0xE732D5E7, 0xC8438BC8, 0x37596E37, 0x6DB7DA6D, 0x8D8C018D, 0xD564B1D5, 0x4ED29C4E, 0xA9E049A9,
-        0x6CB4D86C, 0x56FAAC56, 0xF407F3F4, 0xEA25CFEA, 0x65AFCA65, 0x7A8EF47A, 0xAEE947AE, 0x08181008,
-        0xBAD56FBA, 0x7888F078, 0x256F4A25, 0x2E725C2E, 0x1C24381C, 0xA6F157A6, 0xB4C773B4, 0xC65197C6,
-        0xE823CBE8, 0xDD7CA1DD, 0x749CE874, 0x1F213E1F, 0x4BDD964B, 0xBDDC61BD, 0x8B860D8B, 0x8A850F8A,
-        0x7090E070, 0x3E427C3E, 0xB5C471B5, 0x66AACC66, 0x48D89048, 0x03050603, 0xF601F7F6, 0x0E121C0E,
-        0x61A3C261, 0x355F6A35, 0x57F9AE57, 0xB9D069B9, 0x86911786, 0xC15899C1, 0x1D273A1D, 0x9EB9279E,
-        0xE138D9E1, 0xF813EBF8, 0x98B32B98, 0x11332211, 0x69BBD269, 0xD970A9D9, 0x8E89078E, 0x94A73394,
-        0x9BB62D9B, 0x1E223C1E, 0x87921587, 0xE920C9E9, 0xCE4987CE, 0x55FFAA55, 0x28785028, 0xDF7AA5DF,
-        0x8C8F038C, 0xA1F859A1, 0x89800989, 0x0D171A0D, 0xBFDA65BF, 0xE631D7E6, 0x42C68442, 0x68B8D068,
-        0x41C38241, 0x99B02999, 0x2D775A2D, 0x0F111E0F, 0xB0CB7BB0, 0x54FCA854, 0xBBD66DBB, 0x163A2C16
-    );
-
-    /**
-     * Precomputed mixColumns table
-     *
-     * @see Crypt_Rijndael:_encryptBlock()
-     * @see Crypt_Rijndael:_decryptBlock()
-     * @var Array
-     * @access private
-     */
-    var $t3 = array(
-        0x6363A5C6, 0x7C7C84F8, 0x777799EE, 0x7B7B8DF6, 0xF2F20DFF, 0x6B6BBDD6, 0x6F6FB1DE, 0xC5C55491,
-        0x30305060, 0x01010302, 0x6767A9CE, 0x2B2B7D56, 0xFEFE19E7, 0xD7D762B5, 0xABABE64D, 0x76769AEC,
-        0xCACA458F, 0x82829D1F, 0xC9C94089, 0x7D7D87FA, 0xFAFA15EF, 0x5959EBB2, 0x4747C98E, 0xF0F00BFB,
-        0xADADEC41, 0xD4D467B3, 0xA2A2FD5F, 0xAFAFEA45, 0x9C9CBF23, 0xA4A4F753, 0x727296E4, 0xC0C05B9B,
-        0xB7B7C275, 0xFDFD1CE1, 0x9393AE3D, 0x26266A4C, 0x36365A6C, 0x3F3F417E, 0xF7F702F5, 0xCCCC4F83,
-        0x34345C68, 0xA5A5F451, 0xE5E534D1, 0xF1F108F9, 0x717193E2, 0xD8D873AB, 0x31315362, 0x15153F2A,
-        0x04040C08, 0xC7C75295, 0x23236546, 0xC3C35E9D, 0x18182830, 0x9696A137, 0x05050F0A, 0x9A9AB52F,
-        0x0707090E, 0x12123624, 0x80809B1B, 0xE2E23DDF, 0xEBEB26CD, 0x2727694E, 0xB2B2CD7F, 0x75759FEA,
-        0x09091B12, 0x83839E1D, 0x2C2C7458, 0x1A1A2E34, 0x1B1B2D36, 0x6E6EB2DC, 0x5A5AEEB4, 0xA0A0FB5B,
-        0x5252F6A4, 0x3B3B4D76, 0xD6D661B7, 0xB3B3CE7D, 0x29297B52, 0xE3E33EDD, 0x2F2F715E, 0x84849713,
-        0x5353F5A6, 0xD1D168B9, 0x00000000, 0xEDED2CC1, 0x20206040, 0xFCFC1FE3, 0xB1B1C879, 0x5B5BEDB6,
-        0x6A6ABED4, 0xCBCB468D, 0xBEBED967, 0x39394B72, 0x4A4ADE94, 0x4C4CD498, 0x5858E8B0, 0xCFCF4A85,
-        0xD0D06BBB, 0xEFEF2AC5, 0xAAAAE54F, 0xFBFB16ED, 0x4343C586, 0x4D4DD79A, 0x33335566, 0x85859411,
-        0x4545CF8A, 0xF9F910E9, 0x02020604, 0x7F7F81FE, 0x5050F0A0, 0x3C3C4478, 0x9F9FBA25, 0xA8A8E34B,
-        0x5151F3A2, 0xA3A3FE5D, 0x4040C080, 0x8F8F8A05, 0x9292AD3F, 0x9D9DBC21, 0x38384870, 0xF5F504F1,
-        0xBCBCDF63, 0xB6B6C177, 0xDADA75AF, 0x21216342, 0x10103020, 0xFFFF1AE5, 0xF3F30EFD, 0xD2D26DBF,
-        0xCDCD4C81, 0x0C0C1418, 0x13133526, 0xECEC2FC3, 0x5F5FE1BE, 0x9797A235, 0x4444CC88, 0x1717392E,
-        0xC4C45793, 0xA7A7F255, 0x7E7E82FC, 0x3D3D477A, 0x6464ACC8, 0x5D5DE7BA, 0x19192B32, 0x737395E6,
-        0x6060A0C0, 0x81819819, 0x4F4FD19E, 0xDCDC7FA3, 0x22226644, 0x2A2A7E54, 0x9090AB3B, 0x8888830B,
-        0x4646CA8C, 0xEEEE29C7, 0xB8B8D36B, 0x14143C28, 0xDEDE79A7, 0x5E5EE2BC, 0x0B0B1D16, 0xDBDB76AD,
-        0xE0E03BDB, 0x32325664, 0x3A3A4E74, 0x0A0A1E14, 0x4949DB92, 0x06060A0C, 0x24246C48, 0x5C5CE4B8,
-        0xC2C25D9F, 0xD3D36EBD, 0xACACEF43, 0x6262A6C4, 0x9191A839, 0x9595A431, 0xE4E437D3, 0x79798BF2,
-        0xE7E732D5, 0xC8C8438B, 0x3737596E, 0x6D6DB7DA, 0x8D8D8C01, 0xD5D564B1, 0x4E4ED29C, 0xA9A9E049,
-        0x6C6CB4D8, 0x5656FAAC, 0xF4F407F3, 0xEAEA25CF, 0x6565AFCA, 0x7A7A8EF4, 0xAEAEE947, 0x08081810,
-        0xBABAD56F, 0x787888F0, 0x25256F4A, 0x2E2E725C, 0x1C1C2438, 0xA6A6F157, 0xB4B4C773, 0xC6C65197,
-        0xE8E823CB, 0xDDDD7CA1, 0x74749CE8, 0x1F1F213E, 0x4B4BDD96, 0xBDBDDC61, 0x8B8B860D, 0x8A8A850F,
-        0x707090E0, 0x3E3E427C, 0xB5B5C471, 0x6666AACC, 0x4848D890, 0x03030506, 0xF6F601F7, 0x0E0E121C,
-        0x6161A3C2, 0x35355F6A, 0x5757F9AE, 0xB9B9D069, 0x86869117, 0xC1C15899, 0x1D1D273A, 0x9E9EB927,
-        0xE1E138D9, 0xF8F813EB, 0x9898B32B, 0x11113322, 0x6969BBD2, 0xD9D970A9, 0x8E8E8907, 0x9494A733,
-        0x9B9BB62D, 0x1E1E223C, 0x87879215, 0xE9E920C9, 0xCECE4987, 0x5555FFAA, 0x28287850, 0xDFDF7AA5,
-        0x8C8C8F03, 0xA1A1F859, 0x89898009, 0x0D0D171A, 0xBFBFDA65, 0xE6E631D7, 0x4242C684, 0x6868B8D0,
-        0x4141C382, 0x9999B029, 0x2D2D775A, 0x0F0F111E, 0xB0B0CB7B, 0x5454FCA8, 0xBBBBD66D, 0x16163A2C
-    );
-
-    /**
-     * Precomputed invMixColumns table
-     *
-     * @see Crypt_Rijndael:_encryptBlock()
-     * @see Crypt_Rijndael:_decryptBlock()
-     * @var Array
-     * @access private
-     */
-    var $dt0 = array(
-        0x51F4A750, 0x7E416553, 0x1A17A4C3, 0x3A275E96, 0x3BAB6BCB, 0x1F9D45F1, 0xACFA58AB, 0x4BE30393,
-        0x2030FA55, 0xAD766DF6, 0x88CC7691, 0xF5024C25, 0x4FE5D7FC, 0xC52ACBD7, 0x26354480, 0xB562A38F,
-        0xDEB15A49, 0x25BA1B67, 0x45EA0E98, 0x5DFEC0E1, 0xC32F7502, 0x814CF012, 0x8D4697A3, 0x6BD3F9C6,
-        0x038F5FE7, 0x15929C95, 0xBF6D7AEB, 0x955259DA, 0xD4BE832D, 0x587421D3, 0x49E06929, 0x8EC9C844,
-        0x75C2896A, 0xF48E7978, 0x99583E6B, 0x27B971DD, 0xBEE14FB6, 0xF088AD17, 0xC920AC66, 0x7DCE3AB4,
-        0x63DF4A18, 0xE51A3182, 0x97513360, 0x62537F45, 0xB16477E0, 0xBB6BAE84, 0xFE81A01C, 0xF9082B94,
-        0x70486858, 0x8F45FD19, 0x94DE6C87, 0x527BF8B7, 0xAB73D323, 0x724B02E2, 0xE31F8F57, 0x6655AB2A,
-        0xB2EB2807, 0x2FB5C203, 0x86C57B9A, 0xD33708A5, 0x302887F2, 0x23BFA5B2, 0x02036ABA, 0xED16825C,
-        0x8ACF1C2B, 0xA779B492, 0xF307F2F0, 0x4E69E2A1, 0x65DAF4CD, 0x0605BED5, 0xD134621F, 0xC4A6FE8A,
-        0x342E539D, 0xA2F355A0, 0x058AE132, 0xA4F6EB75, 0x0B83EC39, 0x4060EFAA, 0x5E719F06, 0xBD6E1051,
-        0x3E218AF9, 0x96DD063D, 0xDD3E05AE, 0x4DE6BD46, 0x91548DB5, 0x71C45D05, 0x0406D46F, 0x605015FF,
-        0x1998FB24, 0xD6BDE997, 0x894043CC, 0x67D99E77, 0xB0E842BD, 0x07898B88, 0xE7195B38, 0x79C8EEDB,
-        0xA17C0A47, 0x7C420FE9, 0xF8841EC9, 0x00000000, 0x09808683, 0x322BED48, 0x1E1170AC, 0x6C5A724E,
-        0xFD0EFFFB, 0x0F853856, 0x3DAED51E, 0x362D3927, 0x0A0FD964, 0x685CA621, 0x9B5B54D1, 0x24362E3A,
-        0x0C0A67B1, 0x9357E70F, 0xB4EE96D2, 0x1B9B919E, 0x80C0C54F, 0x61DC20A2, 0x5A774B69, 0x1C121A16,
-        0xE293BA0A, 0xC0A02AE5, 0x3C22E043, 0x121B171D, 0x0E090D0B, 0xF28BC7AD, 0x2DB6A8B9, 0x141EA9C8,
-        0x57F11985, 0xAF75074C, 0xEE99DDBB, 0xA37F60FD, 0xF701269F, 0x5C72F5BC, 0x44663BC5, 0x5BFB7E34,
-        0x8B432976, 0xCB23C6DC, 0xB6EDFC68, 0xB8E4F163, 0xD731DCCA, 0x42638510, 0x13972240, 0x84C61120,
-        0x854A247D, 0xD2BB3DF8, 0xAEF93211, 0xC729A16D, 0x1D9E2F4B, 0xDCB230F3, 0x0D8652EC, 0x77C1E3D0,
-        0x2BB3166C, 0xA970B999, 0x119448FA, 0x47E96422, 0xA8FC8CC4, 0xA0F03F1A, 0x567D2CD8, 0x223390EF,
-        0x87494EC7, 0xD938D1C1, 0x8CCAA2FE, 0x98D40B36, 0xA6F581CF, 0xA57ADE28, 0xDAB78E26, 0x3FADBFA4,
-        0x2C3A9DE4, 0x5078920D, 0x6A5FCC9B, 0x547E4662, 0xF68D13C2, 0x90D8B8E8, 0x2E39F75E, 0x82C3AFF5,
-        0x9F5D80BE, 0x69D0937C, 0x6FD52DA9, 0xCF2512B3, 0xC8AC993B, 0x10187DA7, 0xE89C636E, 0xDB3BBB7B,
-        0xCD267809, 0x6E5918F4, 0xEC9AB701, 0x834F9AA8, 0xE6956E65, 0xAAFFE67E, 0x21BCCF08, 0xEF15E8E6,
-        0xBAE79BD9, 0x4A6F36CE, 0xEA9F09D4, 0x29B07CD6, 0x31A4B2AF, 0x2A3F2331, 0xC6A59430, 0x35A266C0,
-        0x744EBC37, 0xFC82CAA6, 0xE090D0B0, 0x33A7D815, 0xF104984A, 0x41ECDAF7, 0x7FCD500E, 0x1791F62F,
-        0x764DD68D, 0x43EFB04D, 0xCCAA4D54, 0xE49604DF, 0x9ED1B5E3, 0x4C6A881B, 0xC12C1FB8, 0x4665517F,
-        0x9D5EEA04, 0x018C355D, 0xFA877473, 0xFB0B412E, 0xB3671D5A, 0x92DBD252, 0xE9105633, 0x6DD64713,
-        0x9AD7618C, 0x37A10C7A, 0x59F8148E, 0xEB133C89, 0xCEA927EE, 0xB761C935, 0xE11CE5ED, 0x7A47B13C,
-        0x9CD2DF59, 0x55F2733F, 0x1814CE79, 0x73C737BF, 0x53F7CDEA, 0x5FFDAA5B, 0xDF3D6F14, 0x7844DB86,
-        0xCAAFF381, 0xB968C43E, 0x3824342C, 0xC2A3405F, 0x161DC372, 0xBCE2250C, 0x283C498B, 0xFF0D9541,
-        0x39A80171, 0x080CB3DE, 0xD8B4E49C, 0x6456C190, 0x7BCB8461, 0xD532B670, 0x486C5C74, 0xD0B85742
-    );
-
-    /**
-     * Precomputed invMixColumns table
-     *
-     * @see Crypt_Rijndael:_encryptBlock()
-     * @see Crypt_Rijndael:_decryptBlock()
-     * @var Array
-     * @access private
-     */
-    var $dt1 = array(
-        0x5051F4A7, 0x537E4165, 0xC31A17A4, 0x963A275E, 0xCB3BAB6B, 0xF11F9D45, 0xABACFA58, 0x934BE303,
-        0x552030FA, 0xF6AD766D, 0x9188CC76, 0x25F5024C, 0xFC4FE5D7, 0xD7C52ACB, 0x80263544, 0x8FB562A3,
-        0x49DEB15A, 0x6725BA1B, 0x9845EA0E, 0xE15DFEC0, 0x02C32F75, 0x12814CF0, 0xA38D4697, 0xC66BD3F9,
-        0xE7038F5F, 0x9515929C, 0xEBBF6D7A, 0xDA955259, 0x2DD4BE83, 0xD3587421, 0x2949E069, 0x448EC9C8,
-        0x6A75C289, 0x78F48E79, 0x6B99583E, 0xDD27B971, 0xB6BEE14F, 0x17F088AD, 0x66C920AC, 0xB47DCE3A,
-        0x1863DF4A, 0x82E51A31, 0x60975133, 0x4562537F, 0xE0B16477, 0x84BB6BAE, 0x1CFE81A0, 0x94F9082B,
-        0x58704868, 0x198F45FD, 0x8794DE6C, 0xB7527BF8, 0x23AB73D3, 0xE2724B02, 0x57E31F8F, 0x2A6655AB,
-        0x07B2EB28, 0x032FB5C2, 0x9A86C57B, 0xA5D33708, 0xF2302887, 0xB223BFA5, 0xBA02036A, 0x5CED1682,
-        0x2B8ACF1C, 0x92A779B4, 0xF0F307F2, 0xA14E69E2, 0xCD65DAF4, 0xD50605BE, 0x1FD13462, 0x8AC4A6FE,
-        0x9D342E53, 0xA0A2F355, 0x32058AE1, 0x75A4F6EB, 0x390B83EC, 0xAA4060EF, 0x065E719F, 0x51BD6E10,
-        0xF93E218A, 0x3D96DD06, 0xAEDD3E05, 0x464DE6BD, 0xB591548D, 0x0571C45D, 0x6F0406D4, 0xFF605015,
-        0x241998FB, 0x97D6BDE9, 0xCC894043, 0x7767D99E, 0xBDB0E842, 0x8807898B, 0x38E7195B, 0xDB79C8EE,
-        0x47A17C0A, 0xE97C420F, 0xC9F8841E, 0x00000000, 0x83098086, 0x48322BED, 0xAC1E1170, 0x4E6C5A72,
-        0xFBFD0EFF, 0x560F8538, 0x1E3DAED5, 0x27362D39, 0x640A0FD9, 0x21685CA6, 0xD19B5B54, 0x3A24362E,
-        0xB10C0A67, 0x0F9357E7, 0xD2B4EE96, 0x9E1B9B91, 0x4F80C0C5, 0xA261DC20, 0x695A774B, 0x161C121A,
-        0x0AE293BA, 0xE5C0A02A, 0x433C22E0, 0x1D121B17, 0x0B0E090D, 0xADF28BC7, 0xB92DB6A8, 0xC8141EA9,
-        0x8557F119, 0x4CAF7507, 0xBBEE99DD, 0xFDA37F60, 0x9FF70126, 0xBC5C72F5, 0xC544663B, 0x345BFB7E,
-        0x768B4329, 0xDCCB23C6, 0x68B6EDFC, 0x63B8E4F1, 0xCAD731DC, 0x10426385, 0x40139722, 0x2084C611,
-        0x7D854A24, 0xF8D2BB3D, 0x11AEF932, 0x6DC729A1, 0x4B1D9E2F, 0xF3DCB230, 0xEC0D8652, 0xD077C1E3,
-        0x6C2BB316, 0x99A970B9, 0xFA119448, 0x2247E964, 0xC4A8FC8C, 0x1AA0F03F, 0xD8567D2C, 0xEF223390,
-        0xC787494E, 0xC1D938D1, 0xFE8CCAA2, 0x3698D40B, 0xCFA6F581, 0x28A57ADE, 0x26DAB78E, 0xA43FADBF,
-        0xE42C3A9D, 0x0D507892, 0x9B6A5FCC, 0x62547E46, 0xC2F68D13, 0xE890D8B8, 0x5E2E39F7, 0xF582C3AF,
-        0xBE9F5D80, 0x7C69D093, 0xA96FD52D, 0xB3CF2512, 0x3BC8AC99, 0xA710187D, 0x6EE89C63, 0x7BDB3BBB,
-        0x09CD2678, 0xF46E5918, 0x01EC9AB7, 0xA8834F9A, 0x65E6956E, 0x7EAAFFE6, 0x0821BCCF, 0xE6EF15E8,
-        0xD9BAE79B, 0xCE4A6F36, 0xD4EA9F09, 0xD629B07C, 0xAF31A4B2, 0x312A3F23, 0x30C6A594, 0xC035A266,
-        0x37744EBC, 0xA6FC82CA, 0xB0E090D0, 0x1533A7D8, 0x4AF10498, 0xF741ECDA, 0x0E7FCD50, 0x2F1791F6,
-        0x8D764DD6, 0x4D43EFB0, 0x54CCAA4D, 0xDFE49604, 0xE39ED1B5, 0x1B4C6A88, 0xB8C12C1F, 0x7F466551,
-        0x049D5EEA, 0x5D018C35, 0x73FA8774, 0x2EFB0B41, 0x5AB3671D, 0x5292DBD2, 0x33E91056, 0x136DD647,
-        0x8C9AD761, 0x7A37A10C, 0x8E59F814, 0x89EB133C, 0xEECEA927, 0x35B761C9, 0xEDE11CE5, 0x3C7A47B1,
-        0x599CD2DF, 0x3F55F273, 0x791814CE, 0xBF73C737, 0xEA53F7CD, 0x5B5FFDAA, 0x14DF3D6F, 0x867844DB,
-        0x81CAAFF3, 0x3EB968C4, 0x2C382434, 0x5FC2A340, 0x72161DC3, 0x0CBCE225, 0x8B283C49, 0x41FF0D95,
-        0x7139A801, 0xDE080CB3, 0x9CD8B4E4, 0x906456C1, 0x617BCB84, 0x70D532B6, 0x74486C5C, 0x42D0B857
-    );
-
-    /**
-     * Precomputed invMixColumns table
-     *
-     * @see Crypt_Rijndael:_encryptBlock()
-     * @see Crypt_Rijndael:_decryptBlock()
-     * @var Array
-     * @access private
-     */
-    var $dt2 = array(
-        0xA75051F4, 0x65537E41, 0xA4C31A17, 0x5E963A27, 0x6BCB3BAB, 0x45F11F9D, 0x58ABACFA, 0x03934BE3,
-        0xFA552030, 0x6DF6AD76, 0x769188CC, 0x4C25F502, 0xD7FC4FE5, 0xCBD7C52A, 0x44802635, 0xA38FB562,
-        0x5A49DEB1, 0x1B6725BA, 0x0E9845EA, 0xC0E15DFE, 0x7502C32F, 0xF012814C, 0x97A38D46, 0xF9C66BD3,
-        0x5FE7038F, 0x9C951592, 0x7AEBBF6D, 0x59DA9552, 0x832DD4BE, 0x21D35874, 0x692949E0, 0xC8448EC9,
-        0x896A75C2, 0x7978F48E, 0x3E6B9958, 0x71DD27B9, 0x4FB6BEE1, 0xAD17F088, 0xAC66C920, 0x3AB47DCE,
-        0x4A1863DF, 0x3182E51A, 0x33609751, 0x7F456253, 0x77E0B164, 0xAE84BB6B, 0xA01CFE81, 0x2B94F908,
-        0x68587048, 0xFD198F45, 0x6C8794DE, 0xF8B7527B, 0xD323AB73, 0x02E2724B, 0x8F57E31F, 0xAB2A6655,
-        0x2807B2EB, 0xC2032FB5, 0x7B9A86C5, 0x08A5D337, 0x87F23028, 0xA5B223BF, 0x6ABA0203, 0x825CED16,
-        0x1C2B8ACF, 0xB492A779, 0xF2F0F307, 0xE2A14E69, 0xF4CD65DA, 0xBED50605, 0x621FD134, 0xFE8AC4A6,
-        0x539D342E, 0x55A0A2F3, 0xE132058A, 0xEB75A4F6, 0xEC390B83, 0xEFAA4060, 0x9F065E71, 0x1051BD6E,
-        0x8AF93E21, 0x063D96DD, 0x05AEDD3E, 0xBD464DE6, 0x8DB59154, 0x5D0571C4, 0xD46F0406, 0x15FF6050,
-        0xFB241998, 0xE997D6BD, 0x43CC8940, 0x9E7767D9, 0x42BDB0E8, 0x8B880789, 0x5B38E719, 0xEEDB79C8,
-        0x0A47A17C, 0x0FE97C42, 0x1EC9F884, 0x00000000, 0x86830980, 0xED48322B, 0x70AC1E11, 0x724E6C5A,
-        0xFFFBFD0E, 0x38560F85, 0xD51E3DAE, 0x3927362D, 0xD9640A0F, 0xA621685C, 0x54D19B5B, 0x2E3A2436,
-        0x67B10C0A, 0xE70F9357, 0x96D2B4EE, 0x919E1B9B, 0xC54F80C0, 0x20A261DC, 0x4B695A77, 0x1A161C12,
-        0xBA0AE293, 0x2AE5C0A0, 0xE0433C22, 0x171D121B, 0x0D0B0E09, 0xC7ADF28B, 0xA8B92DB6, 0xA9C8141E,
-        0x198557F1, 0x074CAF75, 0xDDBBEE99, 0x60FDA37F, 0x269FF701, 0xF5BC5C72, 0x3BC54466, 0x7E345BFB,
-        0x29768B43, 0xC6DCCB23, 0xFC68B6ED, 0xF163B8E4, 0xDCCAD731, 0x85104263, 0x22401397, 0x112084C6,
-        0x247D854A, 0x3DF8D2BB, 0x3211AEF9, 0xA16DC729, 0x2F4B1D9E, 0x30F3DCB2, 0x52EC0D86, 0xE3D077C1,
-        0x166C2BB3, 0xB999A970, 0x48FA1194, 0x642247E9, 0x8CC4A8FC, 0x3F1AA0F0, 0x2CD8567D, 0x90EF2233,
-        0x4EC78749, 0xD1C1D938, 0xA2FE8CCA, 0x0B3698D4, 0x81CFA6F5, 0xDE28A57A, 0x8E26DAB7, 0xBFA43FAD,
-        0x9DE42C3A, 0x920D5078, 0xCC9B6A5F, 0x4662547E, 0x13C2F68D, 0xB8E890D8, 0xF75E2E39, 0xAFF582C3,
-        0x80BE9F5D, 0x937C69D0, 0x2DA96FD5, 0x12B3CF25, 0x993BC8AC, 0x7DA71018, 0x636EE89C, 0xBB7BDB3B,
-        0x7809CD26, 0x18F46E59, 0xB701EC9A, 0x9AA8834F, 0x6E65E695, 0xE67EAAFF, 0xCF0821BC, 0xE8E6EF15,
-        0x9BD9BAE7, 0x36CE4A6F, 0x09D4EA9F, 0x7CD629B0, 0xB2AF31A4, 0x23312A3F, 0x9430C6A5, 0x66C035A2,
-        0xBC37744E, 0xCAA6FC82, 0xD0B0E090, 0xD81533A7, 0x984AF104, 0xDAF741EC, 0x500E7FCD, 0xF62F1791,
-        0xD68D764D, 0xB04D43EF, 0x4D54CCAA, 0x04DFE496, 0xB5E39ED1, 0x881B4C6A, 0x1FB8C12C, 0x517F4665,
-        0xEA049D5E, 0x355D018C, 0x7473FA87, 0x412EFB0B, 0x1D5AB367, 0xD25292DB, 0x5633E910, 0x47136DD6,
-        0x618C9AD7, 0x0C7A37A1, 0x148E59F8, 0x3C89EB13, 0x27EECEA9, 0xC935B761, 0xE5EDE11C, 0xB13C7A47,
-        0xDF599CD2, 0x733F55F2, 0xCE791814, 0x37BF73C7, 0xCDEA53F7, 0xAA5B5FFD, 0x6F14DF3D, 0xDB867844,
-        0xF381CAAF, 0xC43EB968, 0x342C3824, 0x405FC2A3, 0xC372161D, 0x250CBCE2, 0x498B283C, 0x9541FF0D,
-        0x017139A8, 0xB3DE080C, 0xE49CD8B4, 0xC1906456, 0x84617BCB, 0xB670D532, 0x5C74486C, 0x5742D0B8
-    );
-
-    /**
-     * Precomputed invMixColumns table
-     *
-     * @see Crypt_Rijndael:_encryptBlock()
-     * @see Crypt_Rijndael:_decryptBlock()
-     * @var Array
-     * @access private
-     */
-    var $dt3 = array(
-        0xF4A75051, 0x4165537E, 0x17A4C31A, 0x275E963A, 0xAB6BCB3B, 0x9D45F11F, 0xFA58ABAC, 0xE303934B,
-        0x30FA5520, 0x766DF6AD, 0xCC769188, 0x024C25F5, 0xE5D7FC4F, 0x2ACBD7C5, 0x35448026, 0x62A38FB5,
-        0xB15A49DE, 0xBA1B6725, 0xEA0E9845, 0xFEC0E15D, 0x2F7502C3, 0x4CF01281, 0x4697A38D, 0xD3F9C66B,
-        0x8F5FE703, 0x929C9515, 0x6D7AEBBF, 0x5259DA95, 0xBE832DD4, 0x7421D358, 0xE0692949, 0xC9C8448E,
-        0xC2896A75, 0x8E7978F4, 0x583E6B99, 0xB971DD27, 0xE14FB6BE, 0x88AD17F0, 0x20AC66C9, 0xCE3AB47D,
-        0xDF4A1863, 0x1A3182E5, 0x51336097, 0x537F4562, 0x6477E0B1, 0x6BAE84BB, 0x81A01CFE, 0x082B94F9,
-        0x48685870, 0x45FD198F, 0xDE6C8794, 0x7BF8B752, 0x73D323AB, 0x4B02E272, 0x1F8F57E3, 0x55AB2A66,
-        0xEB2807B2, 0xB5C2032F, 0xC57B9A86, 0x3708A5D3, 0x2887F230, 0xBFA5B223, 0x036ABA02, 0x16825CED,
-        0xCF1C2B8A, 0x79B492A7, 0x07F2F0F3, 0x69E2A14E, 0xDAF4CD65, 0x05BED506, 0x34621FD1, 0xA6FE8AC4,
-        0x2E539D34, 0xF355A0A2, 0x8AE13205, 0xF6EB75A4, 0x83EC390B, 0x60EFAA40, 0x719F065E, 0x6E1051BD,
-        0x218AF93E, 0xDD063D96, 0x3E05AEDD, 0xE6BD464D, 0x548DB591, 0xC45D0571, 0x06D46F04, 0x5015FF60,
-        0x98FB2419, 0xBDE997D6, 0x4043CC89, 0xD99E7767, 0xE842BDB0, 0x898B8807, 0x195B38E7, 0xC8EEDB79,
-        0x7C0A47A1, 0x420FE97C, 0x841EC9F8, 0x00000000, 0x80868309, 0x2BED4832, 0x1170AC1E, 0x5A724E6C,
-        0x0EFFFBFD, 0x8538560F, 0xAED51E3D, 0x2D392736, 0x0FD9640A, 0x5CA62168, 0x5B54D19B, 0x362E3A24,
-        0x0A67B10C, 0x57E70F93, 0xEE96D2B4, 0x9B919E1B, 0xC0C54F80, 0xDC20A261, 0x774B695A, 0x121A161C,
-        0x93BA0AE2, 0xA02AE5C0, 0x22E0433C, 0x1B171D12, 0x090D0B0E, 0x8BC7ADF2, 0xB6A8B92D, 0x1EA9C814,
-        0xF1198557, 0x75074CAF, 0x99DDBBEE, 0x7F60FDA3, 0x01269FF7, 0x72F5BC5C, 0x663BC544, 0xFB7E345B,
-        0x4329768B, 0x23C6DCCB, 0xEDFC68B6, 0xE4F163B8, 0x31DCCAD7, 0x63851042, 0x97224013, 0xC6112084,
-        0x4A247D85, 0xBB3DF8D2, 0xF93211AE, 0x29A16DC7, 0x9E2F4B1D, 0xB230F3DC, 0x8652EC0D, 0xC1E3D077,
-        0xB3166C2B, 0x70B999A9, 0x9448FA11, 0xE9642247, 0xFC8CC4A8, 0xF03F1AA0, 0x7D2CD856, 0x3390EF22,
-        0x494EC787, 0x38D1C1D9, 0xCAA2FE8C, 0xD40B3698, 0xF581CFA6, 0x7ADE28A5, 0xB78E26DA, 0xADBFA43F,
-        0x3A9DE42C, 0x78920D50, 0x5FCC9B6A, 0x7E466254, 0x8D13C2F6, 0xD8B8E890, 0x39F75E2E, 0xC3AFF582,
-        0x5D80BE9F, 0xD0937C69, 0xD52DA96F, 0x2512B3CF, 0xAC993BC8, 0x187DA710, 0x9C636EE8, 0x3BBB7BDB,
-        0x267809CD, 0x5918F46E, 0x9AB701EC, 0x4F9AA883, 0x956E65E6, 0xFFE67EAA, 0xBCCF0821, 0x15E8E6EF,
-        0xE79BD9BA, 0x6F36CE4A, 0x9F09D4EA, 0xB07CD629, 0xA4B2AF31, 0x3F23312A, 0xA59430C6, 0xA266C035,
-        0x4EBC3774, 0x82CAA6FC, 0x90D0B0E0, 0xA7D81533, 0x04984AF1, 0xECDAF741, 0xCD500E7F, 0x91F62F17,
-        0x4DD68D76, 0xEFB04D43, 0xAA4D54CC, 0x9604DFE4, 0xD1B5E39E, 0x6A881B4C, 0x2C1FB8C1, 0x65517F46,
-        0x5EEA049D, 0x8C355D01, 0x877473FA, 0x0B412EFB, 0x671D5AB3, 0xDBD25292, 0x105633E9, 0xD647136D,
-        0xD7618C9A, 0xA10C7A37, 0xF8148E59, 0x133C89EB, 0xA927EECE, 0x61C935B7, 0x1CE5EDE1, 0x47B13C7A,
-        0xD2DF599C, 0xF2733F55, 0x14CE7918, 0xC737BF73, 0xF7CDEA53, 0xFDAA5B5F, 0x3D6F14DF, 0x44DB8678,
-        0xAFF381CA, 0x68C43EB9, 0x24342C38, 0xA3405FC2, 0x1DC37216, 0xE2250CBC, 0x3C498B28, 0x0D9541FF,
-        0xA8017139, 0x0CB3DE08, 0xB4E49CD8, 0x56C19064, 0xCB84617B, 0x32B670D5, 0x6C5C7448, 0xB85742D0
-    );
-
-    /**
-     * The SubByte S-Box
-     *
-     * @see Crypt_Rijndael::_encryptBlock()
-     * @var Array
-     * @access private
-     */
-    var $sbox = array(
-        0x63, 0x7C, 0x77, 0x7B, 0xF2, 0x6B, 0x6F, 0xC5, 0x30, 0x01, 0x67, 0x2B, 0xFE, 0xD7, 0xAB, 0x76,
-        0xCA, 0x82, 0xC9, 0x7D, 0xFA, 0x59, 0x47, 0xF0, 0xAD, 0xD4, 0xA2, 0xAF, 0x9C, 0xA4, 0x72, 0xC0,
-        0xB7, 0xFD, 0x93, 0x26, 0x36, 0x3F, 0xF7, 0xCC, 0x34, 0xA5, 0xE5, 0xF1, 0x71, 0xD8, 0x31, 0x15,
-        0x04, 0xC7, 0x23, 0xC3, 0x18, 0x96, 0x05, 0x9A, 0x07, 0x12, 0x80, 0xE2, 0xEB, 0x27, 0xB2, 0x75,
-        0x09, 0x83, 0x2C, 0x1A, 0x1B, 0x6E, 0x5A, 0xA0, 0x52, 0x3B, 0xD6, 0xB3, 0x29, 0xE3, 0x2F, 0x84,
-        0x53, 0xD1, 0x00, 0xED, 0x20, 0xFC, 0xB1, 0x5B, 0x6A, 0xCB, 0xBE, 0x39, 0x4A, 0x4C, 0x58, 0xCF,
-        0xD0, 0xEF, 0xAA, 0xFB, 0x43, 0x4D, 0x33, 0x85, 0x45, 0xF9, 0x02, 0x7F, 0x50, 0x3C, 0x9F, 0xA8,
-        0x51, 0xA3, 0x40, 0x8F, 0x92, 0x9D, 0x38, 0xF5, 0xBC, 0xB6, 0xDA, 0x21, 0x10, 0xFF, 0xF3, 0xD2,
-        0xCD, 0x0C, 0x13, 0xEC, 0x5F, 0x97, 0x44, 0x17, 0xC4, 0xA7, 0x7E, 0x3D, 0x64, 0x5D, 0x19, 0x73,
-        0x60, 0x81, 0x4F, 0xDC, 0x22, 0x2A, 0x90, 0x88, 0x46, 0xEE, 0xB8, 0x14, 0xDE, 0x5E, 0x0B, 0xDB,
-        0xE0, 0x32, 0x3A, 0x0A, 0x49, 0x06, 0x24, 0x5C, 0xC2, 0xD3, 0xAC, 0x62, 0x91, 0x95, 0xE4, 0x79,
-        0xE7, 0xC8, 0x37, 0x6D, 0x8D, 0xD5, 0x4E, 0xA9, 0x6C, 0x56, 0xF4, 0xEA, 0x65, 0x7A, 0xAE, 0x08,
-        0xBA, 0x78, 0x25, 0x2E, 0x1C, 0xA6, 0xB4, 0xC6, 0xE8, 0xDD, 0x74, 0x1F, 0x4B, 0xBD, 0x8B, 0x8A,
-        0x70, 0x3E, 0xB5, 0x66, 0x48, 0x03, 0xF6, 0x0E, 0x61, 0x35, 0x57, 0xB9, 0x86, 0xC1, 0x1D, 0x9E,
-        0xE1, 0xF8, 0x98, 0x11, 0x69, 0xD9, 0x8E, 0x94, 0x9B, 0x1E, 0x87, 0xE9, 0xCE, 0x55, 0x28, 0xDF,
-        0x8C, 0xA1, 0x89, 0x0D, 0xBF, 0xE6, 0x42, 0x68, 0x41, 0x99, 0x2D, 0x0F, 0xB0, 0x54, 0xBB, 0x16
-    );
-
-    /**
-     * The inverse SubByte S-Box
-     *
-     * @see Crypt_Rijndael::_decryptBlock()
-     * @var Array
-     * @access private
-     */
-    var $isbox = array(
-        0x52, 0x09, 0x6A, 0xD5, 0x30, 0x36, 0xA5, 0x38, 0xBF, 0x40, 0xA3, 0x9E, 0x81, 0xF3, 0xD7, 0xFB,
-        0x7C, 0xE3, 0x39, 0x82, 0x9B, 0x2F, 0xFF, 0x87, 0x34, 0x8E, 0x43, 0x44, 0xC4, 0xDE, 0xE9, 0xCB,
-        0x54, 0x7B, 0x94, 0x32, 0xA6, 0xC2, 0x23, 0x3D, 0xEE, 0x4C, 0x95, 0x0B, 0x42, 0xFA, 0xC3, 0x4E,
-        0x08, 0x2E, 0xA1, 0x66, 0x28, 0xD9, 0x24, 0xB2, 0x76, 0x5B, 0xA2, 0x49, 0x6D, 0x8B, 0xD1, 0x25,
-        0x72, 0xF8, 0xF6, 0x64, 0x86, 0x68, 0x98, 0x16, 0xD4, 0xA4, 0x5C, 0xCC, 0x5D, 0x65, 0xB6, 0x92,
-        0x6C, 0x70, 0x48, 0x50, 0xFD, 0xED, 0xB9, 0xDA, 0x5E, 0x15, 0x46, 0x57, 0xA7, 0x8D, 0x9D, 0x84,
-        0x90, 0xD8, 0xAB, 0x00, 0x8C, 0xBC, 0xD3, 0x0A, 0xF7, 0xE4, 0x58, 0x05, 0xB8, 0xB3, 0x45, 0x06,
-        0xD0, 0x2C, 0x1E, 0x8F, 0xCA, 0x3F, 0x0F, 0x02, 0xC1, 0xAF, 0xBD, 0x03, 0x01, 0x13, 0x8A, 0x6B,
-        0x3A, 0x91, 0x11, 0x41, 0x4F, 0x67, 0xDC, 0xEA, 0x97, 0xF2, 0xCF, 0xCE, 0xF0, 0xB4, 0xE6, 0x73,
-        0x96, 0xAC, 0x74, 0x22, 0xE7, 0xAD, 0x35, 0x85, 0xE2, 0xF9, 0x37, 0xE8, 0x1C, 0x75, 0xDF, 0x6E,
-        0x47, 0xF1, 0x1A, 0x71, 0x1D, 0x29, 0xC5, 0x89, 0x6F, 0xB7, 0x62, 0x0E, 0xAA, 0x18, 0xBE, 0x1B,
-        0xFC, 0x56, 0x3E, 0x4B, 0xC6, 0xD2, 0x79, 0x20, 0x9A, 0xDB, 0xC0, 0xFE, 0x78, 0xCD, 0x5A, 0xF4,
-        0x1F, 0xDD, 0xA8, 0x33, 0x88, 0x07, 0xC7, 0x31, 0xB1, 0x12, 0x10, 0x59, 0x27, 0x80, 0xEC, 0x5F,
-        0x60, 0x51, 0x7F, 0xA9, 0x19, 0xB5, 0x4A, 0x0D, 0x2D, 0xE5, 0x7A, 0x9F, 0x93, 0xC9, 0x9C, 0xEF,
-        0xA0, 0xE0, 0x3B, 0x4D, 0xAE, 0x2A, 0xF5, 0xB0, 0xC8, 0xEB, 0xBB, 0x3C, 0x83, 0x53, 0x99, 0x61,
-        0x17, 0x2B, 0x04, 0x7E, 0xBA, 0x77, 0xD6, 0x26, 0xE1, 0x69, 0x14, 0x63, 0x55, 0x21, 0x0C, 0x7D
-    );
-
     /**
      * Default Constructor.
      *
@@ -682,26 +196,21 @@ class Crypt_Rijndael extends Crypt_Base
      *
      * $mode could be:
      *
-     * - CRYPT_RIJNDAEL_MODE_ECB
+     * - \phpseclib\Crypt\Base::MODE_ECB
      *
-     * - CRYPT_RIJNDAEL_MODE_CBC
+     * - \phpseclib\Crypt\Base::MODE_CBC
      *
-     * - CRYPT_RIJNDAEL_MODE_CTR
+     * - \phpseclib\Crypt\Base::MODE_CTR
      *
-     * - CRYPT_RIJNDAEL_MODE_CFB
+     * - \phpseclib\Crypt\Base::MODE_CFB
      *
-     * - CRYPT_RIJNDAEL_MODE_OFB
+     * - \phpseclib\Crypt\Base::MODE_OFB
      *
-     * If not explicitly set, CRYPT_RIJNDAEL_MODE_CBC will be used.
+     * If not explictly set, \phpseclib\Crypt\Base::MODE_CBC will be used.
      *
-     * @see Crypt_Base::Crypt_Base()
+     * @see \phpseclib\Crypt\Base::Crypt_Base()
      * @param optional Integer $mode
      * @access public
-     */
-    function Crypt_Rijndael($mode = CRYPT_RIJNDAEL_MODE_CBC)
-    {
-        parent::Crypt_Base($mode);
-    }
 
     /**
      * Sets the key.
@@ -715,29 +224,33 @@ class Crypt_Rijndael extends Crypt_Base
      *
      * Note: 160/224-bit keys must explicitly set by setKeyLength(), otherwise they will be round/pad up to 192/256 bits.
      *
-     * @see Crypt_Base:setKey()
+     * @see \phpseclib\Crypt\Base:setKey()
      * @see setKeyLength()
      * @access public
      * @param String $key
      */
     function setKey($key)
     {
-        parent::setKey($key);
-
         if (!$this->explicit_key_length) {
             $length = strlen($key);
             switch (true) {
                 case $length <= 16:
                     $this->key_size = 16;
                     break;
+                case $length <= 20:
+                    $this->key_size = 20;
+                    break;
                 case $length <= 24:
                     $this->key_size = 24;
                     break;
+                case $length <= 28:
+                    $this->key_size = 28;
+                    break;
                 default:
                     $this->key_size = 32;
             }
-            $this->_setupEngine();
         }
+        parent::setKey($key);
     }
 
     /**
@@ -781,7 +294,7 @@ class Crypt_Rijndael extends Crypt_Base
 
         $this->explicit_key_length = true;
         $this->changed = true;
-        $this->_setupEngine();
+        $this->_setEngine();
     }
 
     /**
@@ -798,76 +311,50 @@ class Crypt_Rijndael extends Crypt_Base
         $length >>= 5;
         if ($length > 8) {
             $length = 8;
-        } else if ($length < 4) {
+        } elseif ($length < 4) {
             $length = 4;
         }
         $this->Nb = $length;
         $this->block_size = $length << 2;
         $this->changed = true;
-        $this->_setupEngine();
+        $this->_setEngine();
     }
 
     /**
-     * Setup the fastest possible $engine
+     * Test for engine validity
      *
-     * Determines if the mcrypt (MODE_MCRYPT) $engine available
-     * and usable for the current $block_size and $key_size.
+     * This is mainly just a wrapper to set things up for \phpseclib\Crypt\Base::isValidEngine()
      *
-     * If not, the slower MODE_INTERNAL $engine will be set.
-     *
-     * @see setKey()
-     * @see setKeyLength()
-     * @see setBlockLength()
-     * @access private
+     * @see \phpseclib\Crypt\Base::Crypt_Base()
+     * @param Integer $engine
+     * @access public
+     * @return Boolean
      */
-    function _setupEngine()
+    function isValidEngine($engine)
     {
-        if (constant('CRYPT_' . $this->const_namespace . '_MODE') == CRYPT_MODE_INTERNAL) {
-            // No mcrypt support at all for rijndael
-            return;
-        }
-
-        // The required mcrypt module name for the current $block_size of rijndael
-        $cipher_name_mcrypt = 'rijndael-' . ($this->block_size << 3);
-
-        // Determining the availibility/usability of $cipher_name_mcrypt
-        switch (true) {
-            case $this->key_size % 8: // mcrypt is not usable for 160/224-bit keys, only for 128/192/256-bit keys
-            case !in_array($cipher_name_mcrypt, mcrypt_list_algorithms()): // $cipher_name_mcrypt is not available for the current $block_size
-                $engine = CRYPT_MODE_INTERNAL;
+        switch ($engine) {
+            case self::ENGINE_OPENSSL:
+                if ($this->block_size != 16) {
+                    return false;
+                }
+                $this->cipher_name_openssl_ecb = 'aes-' . ($this->key_size << 3) . '-ecb';
+                $this->cipher_name_openssl = 'aes-' . ($this->key_size << 3) . '-' . $this->_openssl_translate_mode();
                 break;
-            default:
-                $engine = CRYPT_MODE_MCRYPT;
+            case self::ENGINE_MCRYPT:
+                $this->cipher_name_mcrypt = 'rijndael-' . ($this->block_size << 3);
+                if ($this->key_size % 8) { // is it a 160/224-bit key?
+                    // mcrypt is not usable for them, only for 128/192/256-bit keys
+                    return false;
+                }
         }
 
-        if ($this->engine == $engine && $this->cipher_name_mcrypt == $cipher_name_mcrypt) {
-            // allready set, so we not unnecessary close $this->enmcrypt/demcrypt/ecb
-            return;
-        }
-
-        // Set the $engine
-        $this->engine = $engine;
-        $this->cipher_name_mcrypt = $cipher_name_mcrypt;
-
-        if ($this->enmcrypt) {
-            // Closing the current mcrypt resource(s). _mcryptSetup() will, if needed,
-            // (re)open them with the module named in $this->cipher_name_mcrypt
-            mcrypt_module_close($this->enmcrypt);
-            mcrypt_module_close($this->demcrypt);
-            $this->enmcrypt = null;
-            $this->demcrypt = null;
-
-            if ($this->ecb) {
-                mcrypt_module_close($this->ecb);
-                $this->ecb = null;
-            }
-        }
+        return parent::isValidEngine($engine);
     }
 
     /**
-     * Setup the CRYPT_MODE_MCRYPT $engine
+     * Setup the \phpseclib\Crypt\Base::ENGINE_MCRYPT $engine
      *
-     * @see Crypt_Base::_setupMcrypt()
+     * @see \phpseclib\Crypt\Base::_setupMcrypt()
      * @access private
      */
     function _setupMcrypt()
@@ -885,16 +372,15 @@ class Crypt_Rijndael extends Crypt_Base
      */
     function _encryptBlock($in)
     {
-        static $t0, $t1, $t2, $t3, $sbox;
-        if (!$t0) {
-            for ($i = 0; $i < 256; ++$i) {
-                $t0[] = (int)$this->t0[$i];
-                $t1[] = (int)$this->t1[$i];
-                $t2[] = (int)$this->t2[$i];
-                $t3[] = (int)$this->t3[$i];
-                $sbox[] = (int)$this->sbox[$i];
-            }
+        static $tables;
+        if (empty($tables)) {
+            $tables = &$this->_getTables();
         }
+        $t0   = $tables[0];
+        $t1   = $tables[1];
+        $t2   = $tables[2];
+        $t3   = $tables[3];
+        $sbox = $tables[4];
 
         $state = array();
         $words = unpack('N*', $in);
@@ -905,9 +391,9 @@ class Crypt_Rijndael extends Crypt_Base
         $Nr = $this->Nr;
 
         // addRoundKey
-        $i = -1;
+        $wc = $Nb - 1;
         foreach ($words as $word) {
-            $state[] = $word ^ $w[0][++$i];
+            $state[] = $word ^ $w[++$wc];
         }
 
         // fips-197.pdf#page=19, "Figure 5. Pseudo Code for the Cipher", states that this loop has four components -
@@ -930,7 +416,7 @@ class Crypt_Rijndael extends Crypt_Base
                             $t1[$state[$j] >> 16 & 0x000000FF] ^
                             $t2[$state[$k] >>  8 & 0x000000FF] ^
                             $t3[$state[$l]       & 0x000000FF] ^
-                            $w[$round][$i];
+                            $w[++$wc];
                 ++$i;
                 $j = ($j + 1) % $Nb;
                 $k = ($k + 1) % $Nb;
@@ -957,7 +443,7 @@ class Crypt_Rijndael extends Crypt_Base
                         ($state[$j] & 0x00FF0000) ^
                         ($state[$k] & 0x0000FF00) ^
                         ($state[$l] & 0x000000FF) ^
-                         $w[$Nr][$i];
+                         $w[$i];
             ++$i;
             $j = ($j + 1) % $Nb;
             $k = ($k + 1) % $Nb;
@@ -987,16 +473,15 @@ class Crypt_Rijndael extends Crypt_Base
      */
     function _decryptBlock($in)
     {
-        static $dt0, $dt1, $dt2, $dt3, $isbox;
-        if (!$dt0) {
-            for ($i = 0; $i < 256; ++$i) {
-                $dt0[] = (int)$this->dt0[$i];
-                $dt1[] = (int)$this->dt1[$i];
-                $dt2[] = (int)$this->dt2[$i];
-                $dt3[] = (int)$this->dt3[$i];
-                $isbox[] = (int)$this->isbox[$i];
-            }
+        static $invtables;
+        if (empty($invtables)) {
+            $invtables = &$this->_getInvTables();
         }
+        $dt0   = $invtables[0];
+        $dt1   = $invtables[1];
+        $dt2   = $invtables[2];
+        $dt3   = $invtables[3];
+        $isbox = $invtables[4];
 
         $state = array();
         $words = unpack('N*', $in);
@@ -1007,9 +492,9 @@ class Crypt_Rijndael extends Crypt_Base
         $Nr = $this->Nr;
 
         // addRoundKey
-        $i = -1;
+        $wc = $Nb - 1;
         foreach ($words as $word) {
-            $state[] = $word ^ $dw[$Nr][++$i];
+            $state[] = $word ^ $dw[++$wc];
         }
 
         $temp = array();
@@ -1024,7 +509,7 @@ class Crypt_Rijndael extends Crypt_Base
                             $dt1[$state[$j] >> 16 & 0x000000FF] ^
                             $dt2[$state[$k] >>  8 & 0x000000FF] ^
                             $dt3[$state[$l]       & 0x000000FF] ^
-                            $dw[$round][$i];
+                            $dw[++$wc];
                 ++$i;
                 $j = ($j + 1) % $Nb;
                 $k = ($k + 1) % $Nb;
@@ -1045,10 +530,10 @@ class Crypt_Rijndael extends Crypt_Base
                     ($state[$k] & 0x0000FF00) |
                     ($state[$l] & 0x000000FF);
 
-            $temp[$i] = $dw[0][$i] ^ ($isbox[$word       & 0x000000FF]        |
-                                     ($isbox[$word >>  8 & 0x000000FF] <<  8) |
-                                     ($isbox[$word >> 16 & 0x000000FF] << 16) |
-                                     ($isbox[$word >> 24 & 0x000000FF] << 24));
+            $temp[$i] = $dw[$i] ^ ($isbox[$word       & 0x000000FF]        |
+                                  ($isbox[$word >>  8 & 0x000000FF] <<  8) |
+                                  ($isbox[$word >> 16 & 0x000000FF] << 16) |
+                                  ($isbox[$word >> 24 & 0x000000FF] << 24));
             ++$i;
             $j = ($j + 1) % $Nb;
             $k = ($k + 1) % $Nb;
@@ -1072,7 +557,7 @@ class Crypt_Rijndael extends Crypt_Base
     /**
      * Setup the key (expansion)
      *
-     * @see Crypt_Base::_setupKey()
+     * @see \phpseclib\Crypt\Base::_setupKey()
      * @access private
      */
     function _setupKey()
@@ -1129,7 +614,7 @@ class Crypt_Rijndael extends Crypt_Base
                 // with 0xFFFFFFFF (or 0xFFFFFF00) on a 32-bit machine is unnecessary, but on a 64-bit machine, it is.
                 $temp = (($temp << 8) & 0xFFFFFF00) | (($temp >> 24) & 0x000000FF); // rotWord
                 $temp = $this->_subWord($temp) ^ $rcon[$i / $this->Nk];
-            } else if ($this->Nk > 6 && $i % $this->Nk == 4) {
+            } elseif ($this->Nk > 6 && $i % $this->Nk == 4) {
                 $temp = $this->_subWord($temp);
             }
             $w[$i] = $w[$i - $this->Nk] ^ $temp;
@@ -1142,6 +627,7 @@ class Crypt_Rijndael extends Crypt_Base
         //        1. Apply the Key Expansion.
         //        2. Apply InvMixColumn to all Round Keys except the first and the last one."
         // also, see fips-197.pdf#page=27, "5.3.5 Equivalent Inverse Cipher"
+        list($dt0, $dt1, $dt2, $dt3) = $this->_getInvTables();
         $temp = $this->w = $this->dw = array();
         for ($i = $row = $col = 0; $i < $length; $i++, $col++) {
             if ($col == $this->Nb) {
@@ -1152,10 +638,10 @@ class Crypt_Rijndael extends Crypt_Base
                     $j = 0;
                     while ($j < $this->Nb) {
                         $dw = $this->_subWord($this->w[$row][$j]);
-                        $temp[$j] = $this->dt0[$dw >> 24 & 0x000000FF] ^
-                                    $this->dt1[$dw >> 16 & 0x000000FF] ^
-                                    $this->dt2[$dw >>  8 & 0x000000FF] ^
-                                    $this->dt3[$dw       & 0x000000FF];
+                        $temp[$j] = $dt0[$dw >> 24 & 0x000000FF] ^
+                                    $dt1[$dw >> 16 & 0x000000FF] ^
+                                    $dt2[$dw >>  8 & 0x000000FF] ^
+                                    $dt3[$dw       & 0x000000FF];
                         $j++;
                     }
                     $this->dw[$row] = $temp;
@@ -1169,20 +655,18 @@ class Crypt_Rijndael extends Crypt_Base
 
         $this->dw[$row] = $this->w[$row];
 
-        // In case of $this->use_inline_crypt === true we have to use 1-dim key arrays (both ascending)
-        if ($this->use_inline_crypt) {
-            $this->dw = array_reverse($this->dw);
-            $w  = array_pop($this->w);
-            $dw = array_pop($this->dw);
-            foreach ($this->w as $r => $wr) {
-                foreach ($wr as $c => $wc) {
-                    $w[]  = $wc;
-                    $dw[] = $this->dw[$r][$c];
-                }
+        // Converting to 1-dim key arrays (both ascending)
+        $this->dw = array_reverse($this->dw);
+        $w  = array_pop($this->w);
+        $dw = array_pop($this->dw);
+        foreach ($this->w as $r => $wr) {
+            foreach ($wr as $c => $wc) {
+                $w[]  = $wc;
+                $dw[] = $this->dw[$r][$c];
             }
-            $this->w  = $w;
-            $this->dw = $dw;
         }
+        $this->w  = $w;
+        $this->dw = $dw;
     }
 
     /**
@@ -1193,7 +677,10 @@ class Crypt_Rijndael extends Crypt_Base
      */
     function _subWord($word)
     {
-        $sbox = $this->sbox;
+        static $sbox;
+        if (empty($sbox)) {
+            list(,,,, $sbox) = $this->_getTables();
+        }
 
         return  $sbox[$word       & 0x000000FF]        |
                ($sbox[$word >>  8 & 0x000000FF] <<  8) |
@@ -1201,10 +688,183 @@ class Crypt_Rijndael extends Crypt_Base
                ($sbox[$word >> 24 & 0x000000FF] << 24);
     }
 
+    /**
+     * Provides the mixColumns and sboxes tables
+     *
+     * @see Crypt_Rijndael:_encryptBlock()
+     * @see Crypt_Rijndael:_setupInlineCrypt()
+     * @see Crypt_Rijndael:_subWord()
+     * @access private
+     * @return Array &$tables
+     */
+    function &_getTables()
+    {
+        static $tables;
+        if (empty($tables)) {
+            // according to <http://csrc.nist.gov/archive/aes/rijndael/Rijndael-ammended.pdf#page=19> (section 5.2.1),
+            // precomputed tables can be used in the mixColumns phase. in that example, they're assigned t0...t3, so
+            // those are the names we'll use.
+            $t3 = array_map('intval', array(
+                // with array_map('intval', ...) we ensure we have only int's and not
+                // some slower floats converted by php automatically on high values
+                0x6363A5C6, 0x7C7C84F8, 0x777799EE, 0x7B7B8DF6, 0xF2F20DFF, 0x6B6BBDD6, 0x6F6FB1DE, 0xC5C55491,
+                0x30305060, 0x01010302, 0x6767A9CE, 0x2B2B7D56, 0xFEFE19E7, 0xD7D762B5, 0xABABE64D, 0x76769AEC,
+                0xCACA458F, 0x82829D1F, 0xC9C94089, 0x7D7D87FA, 0xFAFA15EF, 0x5959EBB2, 0x4747C98E, 0xF0F00BFB,
+                0xADADEC41, 0xD4D467B3, 0xA2A2FD5F, 0xAFAFEA45, 0x9C9CBF23, 0xA4A4F753, 0x727296E4, 0xC0C05B9B,
+                0xB7B7C275, 0xFDFD1CE1, 0x9393AE3D, 0x26266A4C, 0x36365A6C, 0x3F3F417E, 0xF7F702F5, 0xCCCC4F83,
+                0x34345C68, 0xA5A5F451, 0xE5E534D1, 0xF1F108F9, 0x717193E2, 0xD8D873AB, 0x31315362, 0x15153F2A,
+                0x04040C08, 0xC7C75295, 0x23236546, 0xC3C35E9D, 0x18182830, 0x9696A137, 0x05050F0A, 0x9A9AB52F,
+                0x0707090E, 0x12123624, 0x80809B1B, 0xE2E23DDF, 0xEBEB26CD, 0x2727694E, 0xB2B2CD7F, 0x75759FEA,
+                0x09091B12, 0x83839E1D, 0x2C2C7458, 0x1A1A2E34, 0x1B1B2D36, 0x6E6EB2DC, 0x5A5AEEB4, 0xA0A0FB5B,
+                0x5252F6A4, 0x3B3B4D76, 0xD6D661B7, 0xB3B3CE7D, 0x29297B52, 0xE3E33EDD, 0x2F2F715E, 0x84849713,
+                0x5353F5A6, 0xD1D168B9, 0x00000000, 0xEDED2CC1, 0x20206040, 0xFCFC1FE3, 0xB1B1C879, 0x5B5BEDB6,
+                0x6A6ABED4, 0xCBCB468D, 0xBEBED967, 0x39394B72, 0x4A4ADE94, 0x4C4CD498, 0x5858E8B0, 0xCFCF4A85,
+                0xD0D06BBB, 0xEFEF2AC5, 0xAAAAE54F, 0xFBFB16ED, 0x4343C586, 0x4D4DD79A, 0x33335566, 0x85859411,
+                0x4545CF8A, 0xF9F910E9, 0x02020604, 0x7F7F81FE, 0x5050F0A0, 0x3C3C4478, 0x9F9FBA25, 0xA8A8E34B,
+                0x5151F3A2, 0xA3A3FE5D, 0x4040C080, 0x8F8F8A05, 0x9292AD3F, 0x9D9DBC21, 0x38384870, 0xF5F504F1,
+                0xBCBCDF63, 0xB6B6C177, 0xDADA75AF, 0x21216342, 0x10103020, 0xFFFF1AE5, 0xF3F30EFD, 0xD2D26DBF,
+                0xCDCD4C81, 0x0C0C1418, 0x13133526, 0xECEC2FC3, 0x5F5FE1BE, 0x9797A235, 0x4444CC88, 0x1717392E,
+                0xC4C45793, 0xA7A7F255, 0x7E7E82FC, 0x3D3D477A, 0x6464ACC8, 0x5D5DE7BA, 0x19192B32, 0x737395E6,
+                0x6060A0C0, 0x81819819, 0x4F4FD19E, 0xDCDC7FA3, 0x22226644, 0x2A2A7E54, 0x9090AB3B, 0x8888830B,
+                0x4646CA8C, 0xEEEE29C7, 0xB8B8D36B, 0x14143C28, 0xDEDE79A7, 0x5E5EE2BC, 0x0B0B1D16, 0xDBDB76AD,
+                0xE0E03BDB, 0x32325664, 0x3A3A4E74, 0x0A0A1E14, 0x4949DB92, 0x06060A0C, 0x24246C48, 0x5C5CE4B8,
+                0xC2C25D9F, 0xD3D36EBD, 0xACACEF43, 0x6262A6C4, 0x9191A839, 0x9595A431, 0xE4E437D3, 0x79798BF2,
+                0xE7E732D5, 0xC8C8438B, 0x3737596E, 0x6D6DB7DA, 0x8D8D8C01, 0xD5D564B1, 0x4E4ED29C, 0xA9A9E049,
+                0x6C6CB4D8, 0x5656FAAC, 0xF4F407F3, 0xEAEA25CF, 0x6565AFCA, 0x7A7A8EF4, 0xAEAEE947, 0x08081810,
+                0xBABAD56F, 0x787888F0, 0x25256F4A, 0x2E2E725C, 0x1C1C2438, 0xA6A6F157, 0xB4B4C773, 0xC6C65197,
+                0xE8E823CB, 0xDDDD7CA1, 0x74749CE8, 0x1F1F213E, 0x4B4BDD96, 0xBDBDDC61, 0x8B8B860D, 0x8A8A850F,
+                0x707090E0, 0x3E3E427C, 0xB5B5C471, 0x6666AACC, 0x4848D890, 0x03030506, 0xF6F601F7, 0x0E0E121C,
+                0x6161A3C2, 0x35355F6A, 0x5757F9AE, 0xB9B9D069, 0x86869117, 0xC1C15899, 0x1D1D273A, 0x9E9EB927,
+                0xE1E138D9, 0xF8F813EB, 0x9898B32B, 0x11113322, 0x6969BBD2, 0xD9D970A9, 0x8E8E8907, 0x9494A733,
+                0x9B9BB62D, 0x1E1E223C, 0x87879215, 0xE9E920C9, 0xCECE4987, 0x5555FFAA, 0x28287850, 0xDFDF7AA5,
+                0x8C8C8F03, 0xA1A1F859, 0x89898009, 0x0D0D171A, 0xBFBFDA65, 0xE6E631D7, 0x4242C684, 0x6868B8D0,
+                0x4141C382, 0x9999B029, 0x2D2D775A, 0x0F0F111E, 0xB0B0CB7B, 0x5454FCA8, 0xBBBBD66D, 0x16163A2C
+            ));
+
+            foreach ($t3 as $t3i) {
+                $t0[] = (($t3i << 24) & 0xFF000000) | (($t3i >>  8) & 0x00FFFFFF);
+                $t1[] = (($t3i << 16) & 0xFFFF0000) | (($t3i >> 16) & 0x0000FFFF);
+                $t2[] = (($t3i <<  8) & 0xFFFFFF00) | (($t3i >> 24) & 0x000000FF);
+            }
+
+            $tables = array(
+                // The Precomputed mixColumns tables t0 - t3
+                $t0,
+                $t1,
+                $t2,
+                $t3,
+                // The SubByte S-Box
+                array(
+                    0x63, 0x7C, 0x77, 0x7B, 0xF2, 0x6B, 0x6F, 0xC5, 0x30, 0x01, 0x67, 0x2B, 0xFE, 0xD7, 0xAB, 0x76,
+                    0xCA, 0x82, 0xC9, 0x7D, 0xFA, 0x59, 0x47, 0xF0, 0xAD, 0xD4, 0xA2, 0xAF, 0x9C, 0xA4, 0x72, 0xC0,
+                    0xB7, 0xFD, 0x93, 0x26, 0x36, 0x3F, 0xF7, 0xCC, 0x34, 0xA5, 0xE5, 0xF1, 0x71, 0xD8, 0x31, 0x15,
+                    0x04, 0xC7, 0x23, 0xC3, 0x18, 0x96, 0x05, 0x9A, 0x07, 0x12, 0x80, 0xE2, 0xEB, 0x27, 0xB2, 0x75,
+                    0x09, 0x83, 0x2C, 0x1A, 0x1B, 0x6E, 0x5A, 0xA0, 0x52, 0x3B, 0xD6, 0xB3, 0x29, 0xE3, 0x2F, 0x84,
+                    0x53, 0xD1, 0x00, 0xED, 0x20, 0xFC, 0xB1, 0x5B, 0x6A, 0xCB, 0xBE, 0x39, 0x4A, 0x4C, 0x58, 0xCF,
+                    0xD0, 0xEF, 0xAA, 0xFB, 0x43, 0x4D, 0x33, 0x85, 0x45, 0xF9, 0x02, 0x7F, 0x50, 0x3C, 0x9F, 0xA8,
+                    0x51, 0xA3, 0x40, 0x8F, 0x92, 0x9D, 0x38, 0xF5, 0xBC, 0xB6, 0xDA, 0x21, 0x10, 0xFF, 0xF3, 0xD2,
+                    0xCD, 0x0C, 0x13, 0xEC, 0x5F, 0x97, 0x44, 0x17, 0xC4, 0xA7, 0x7E, 0x3D, 0x64, 0x5D, 0x19, 0x73,
+                    0x60, 0x81, 0x4F, 0xDC, 0x22, 0x2A, 0x90, 0x88, 0x46, 0xEE, 0xB8, 0x14, 0xDE, 0x5E, 0x0B, 0xDB,
+                    0xE0, 0x32, 0x3A, 0x0A, 0x49, 0x06, 0x24, 0x5C, 0xC2, 0xD3, 0xAC, 0x62, 0x91, 0x95, 0xE4, 0x79,
+                    0xE7, 0xC8, 0x37, 0x6D, 0x8D, 0xD5, 0x4E, 0xA9, 0x6C, 0x56, 0xF4, 0xEA, 0x65, 0x7A, 0xAE, 0x08,
+                    0xBA, 0x78, 0x25, 0x2E, 0x1C, 0xA6, 0xB4, 0xC6, 0xE8, 0xDD, 0x74, 0x1F, 0x4B, 0xBD, 0x8B, 0x8A,
+                    0x70, 0x3E, 0xB5, 0x66, 0x48, 0x03, 0xF6, 0x0E, 0x61, 0x35, 0x57, 0xB9, 0x86, 0xC1, 0x1D, 0x9E,
+                    0xE1, 0xF8, 0x98, 0x11, 0x69, 0xD9, 0x8E, 0x94, 0x9B, 0x1E, 0x87, 0xE9, 0xCE, 0x55, 0x28, 0xDF,
+                    0x8C, 0xA1, 0x89, 0x0D, 0xBF, 0xE6, 0x42, 0x68, 0x41, 0x99, 0x2D, 0x0F, 0xB0, 0x54, 0xBB, 0x16
+                )
+            );
+        }
+        return $tables;
+    }
+
+    /**
+     * Provides the inverse mixColumns and inverse sboxes tables
+     *
+     * @see Crypt_Rijndael:_decryptBlock()
+     * @see Crypt_Rijndael:_setupInlineCrypt()
+     * @see Crypt_Rijndael:_setupKey()
+     * @access private
+     * @return Array &$tables
+     */
+    function &_getInvTables()
+    {
+        static $tables;
+        if (empty($tables)) {
+            $dt3 = array_map('intval', array(
+                0xF4A75051, 0x4165537E, 0x17A4C31A, 0x275E963A, 0xAB6BCB3B, 0x9D45F11F, 0xFA58ABAC, 0xE303934B,
+                0x30FA5520, 0x766DF6AD, 0xCC769188, 0x024C25F5, 0xE5D7FC4F, 0x2ACBD7C5, 0x35448026, 0x62A38FB5,
+                0xB15A49DE, 0xBA1B6725, 0xEA0E9845, 0xFEC0E15D, 0x2F7502C3, 0x4CF01281, 0x4697A38D, 0xD3F9C66B,
+                0x8F5FE703, 0x929C9515, 0x6D7AEBBF, 0x5259DA95, 0xBE832DD4, 0x7421D358, 0xE0692949, 0xC9C8448E,
+                0xC2896A75, 0x8E7978F4, 0x583E6B99, 0xB971DD27, 0xE14FB6BE, 0x88AD17F0, 0x20AC66C9, 0xCE3AB47D,
+                0xDF4A1863, 0x1A3182E5, 0x51336097, 0x537F4562, 0x6477E0B1, 0x6BAE84BB, 0x81A01CFE, 0x082B94F9,
+                0x48685870, 0x45FD198F, 0xDE6C8794, 0x7BF8B752, 0x73D323AB, 0x4B02E272, 0x1F8F57E3, 0x55AB2A66,
+                0xEB2807B2, 0xB5C2032F, 0xC57B9A86, 0x3708A5D3, 0x2887F230, 0xBFA5B223, 0x036ABA02, 0x16825CED,
+                0xCF1C2B8A, 0x79B492A7, 0x07F2F0F3, 0x69E2A14E, 0xDAF4CD65, 0x05BED506, 0x34621FD1, 0xA6FE8AC4,
+                0x2E539D34, 0xF355A0A2, 0x8AE13205, 0xF6EB75A4, 0x83EC390B, 0x60EFAA40, 0x719F065E, 0x6E1051BD,
+                0x218AF93E, 0xDD063D96, 0x3E05AEDD, 0xE6BD464D, 0x548DB591, 0xC45D0571, 0x06D46F04, 0x5015FF60,
+                0x98FB2419, 0xBDE997D6, 0x4043CC89, 0xD99E7767, 0xE842BDB0, 0x898B8807, 0x195B38E7, 0xC8EEDB79,
+                0x7C0A47A1, 0x420FE97C, 0x841EC9F8, 0x00000000, 0x80868309, 0x2BED4832, 0x1170AC1E, 0x5A724E6C,
+                0x0EFFFBFD, 0x8538560F, 0xAED51E3D, 0x2D392736, 0x0FD9640A, 0x5CA62168, 0x5B54D19B, 0x362E3A24,
+                0x0A67B10C, 0x57E70F93, 0xEE96D2B4, 0x9B919E1B, 0xC0C54F80, 0xDC20A261, 0x774B695A, 0x121A161C,
+                0x93BA0AE2, 0xA02AE5C0, 0x22E0433C, 0x1B171D12, 0x090D0B0E, 0x8BC7ADF2, 0xB6A8B92D, 0x1EA9C814,
+                0xF1198557, 0x75074CAF, 0x99DDBBEE, 0x7F60FDA3, 0x01269FF7, 0x72F5BC5C, 0x663BC544, 0xFB7E345B,
+                0x4329768B, 0x23C6DCCB, 0xEDFC68B6, 0xE4F163B8, 0x31DCCAD7, 0x63851042, 0x97224013, 0xC6112084,
+                0x4A247D85, 0xBB3DF8D2, 0xF93211AE, 0x29A16DC7, 0x9E2F4B1D, 0xB230F3DC, 0x8652EC0D, 0xC1E3D077,
+                0xB3166C2B, 0x70B999A9, 0x9448FA11, 0xE9642247, 0xFC8CC4A8, 0xF03F1AA0, 0x7D2CD856, 0x3390EF22,
+                0x494EC787, 0x38D1C1D9, 0xCAA2FE8C, 0xD40B3698, 0xF581CFA6, 0x7ADE28A5, 0xB78E26DA, 0xADBFA43F,
+                0x3A9DE42C, 0x78920D50, 0x5FCC9B6A, 0x7E466254, 0x8D13C2F6, 0xD8B8E890, 0x39F75E2E, 0xC3AFF582,
+                0x5D80BE9F, 0xD0937C69, 0xD52DA96F, 0x2512B3CF, 0xAC993BC8, 0x187DA710, 0x9C636EE8, 0x3BBB7BDB,
+                0x267809CD, 0x5918F46E, 0x9AB701EC, 0x4F9AA883, 0x956E65E6, 0xFFE67EAA, 0xBCCF0821, 0x15E8E6EF,
+                0xE79BD9BA, 0x6F36CE4A, 0x9F09D4EA, 0xB07CD629, 0xA4B2AF31, 0x3F23312A, 0xA59430C6, 0xA266C035,
+                0x4EBC3774, 0x82CAA6FC, 0x90D0B0E0, 0xA7D81533, 0x04984AF1, 0xECDAF741, 0xCD500E7F, 0x91F62F17,
+                0x4DD68D76, 0xEFB04D43, 0xAA4D54CC, 0x9604DFE4, 0xD1B5E39E, 0x6A881B4C, 0x2C1FB8C1, 0x65517F46,
+                0x5EEA049D, 0x8C355D01, 0x877473FA, 0x0B412EFB, 0x671D5AB3, 0xDBD25292, 0x105633E9, 0xD647136D,
+                0xD7618C9A, 0xA10C7A37, 0xF8148E59, 0x133C89EB, 0xA927EECE, 0x61C935B7, 0x1CE5EDE1, 0x47B13C7A,
+                0xD2DF599C, 0xF2733F55, 0x14CE7918, 0xC737BF73, 0xF7CDEA53, 0xFDAA5B5F, 0x3D6F14DF, 0x44DB8678,
+                0xAFF381CA, 0x68C43EB9, 0x24342C38, 0xA3405FC2, 0x1DC37216, 0xE2250CBC, 0x3C498B28, 0x0D9541FF,
+                0xA8017139, 0x0CB3DE08, 0xB4E49CD8, 0x56C19064, 0xCB84617B, 0x32B670D5, 0x6C5C7448, 0xB85742D0
+            ));
+
+            foreach ($dt3 as $dt3i) {
+                $dt0[] = (($dt3i << 24) & 0xFF000000) | (($dt3i >>  8) & 0x00FFFFFF);
+                $dt1[] = (($dt3i << 16) & 0xFFFF0000) | (($dt3i >> 16) & 0x0000FFFF);
+                $dt2[] = (($dt3i <<  8) & 0xFFFFFF00) | (($dt3i >> 24) & 0x000000FF);
+            };
+
+            $tables = array(
+                // The Precomputed inverse mixColumns tables dt0 - dt3
+                $dt0,
+                $dt1,
+                $dt2,
+                $dt3,
+                // The inverse SubByte S-Box
+                array(
+                    0x52, 0x09, 0x6A, 0xD5, 0x30, 0x36, 0xA5, 0x38, 0xBF, 0x40, 0xA3, 0x9E, 0x81, 0xF3, 0xD7, 0xFB,
+                    0x7C, 0xE3, 0x39, 0x82, 0x9B, 0x2F, 0xFF, 0x87, 0x34, 0x8E, 0x43, 0x44, 0xC4, 0xDE, 0xE9, 0xCB,
+                    0x54, 0x7B, 0x94, 0x32, 0xA6, 0xC2, 0x23, 0x3D, 0xEE, 0x4C, 0x95, 0x0B, 0x42, 0xFA, 0xC3, 0x4E,
+                    0x08, 0x2E, 0xA1, 0x66, 0x28, 0xD9, 0x24, 0xB2, 0x76, 0x5B, 0xA2, 0x49, 0x6D, 0x8B, 0xD1, 0x25,
+                    0x72, 0xF8, 0xF6, 0x64, 0x86, 0x68, 0x98, 0x16, 0xD4, 0xA4, 0x5C, 0xCC, 0x5D, 0x65, 0xB6, 0x92,
+                    0x6C, 0x70, 0x48, 0x50, 0xFD, 0xED, 0xB9, 0xDA, 0x5E, 0x15, 0x46, 0x57, 0xA7, 0x8D, 0x9D, 0x84,
+                    0x90, 0xD8, 0xAB, 0x00, 0x8C, 0xBC, 0xD3, 0x0A, 0xF7, 0xE4, 0x58, 0x05, 0xB8, 0xB3, 0x45, 0x06,
+                    0xD0, 0x2C, 0x1E, 0x8F, 0xCA, 0x3F, 0x0F, 0x02, 0xC1, 0xAF, 0xBD, 0x03, 0x01, 0x13, 0x8A, 0x6B,
+                    0x3A, 0x91, 0x11, 0x41, 0x4F, 0x67, 0xDC, 0xEA, 0x97, 0xF2, 0xCF, 0xCE, 0xF0, 0xB4, 0xE6, 0x73,
+                    0x96, 0xAC, 0x74, 0x22, 0xE7, 0xAD, 0x35, 0x85, 0xE2, 0xF9, 0x37, 0xE8, 0x1C, 0x75, 0xDF, 0x6E,
+                    0x47, 0xF1, 0x1A, 0x71, 0x1D, 0x29, 0xC5, 0x89, 0x6F, 0xB7, 0x62, 0x0E, 0xAA, 0x18, 0xBE, 0x1B,
+                    0xFC, 0x56, 0x3E, 0x4B, 0xC6, 0xD2, 0x79, 0x20, 0x9A, 0xDB, 0xC0, 0xFE, 0x78, 0xCD, 0x5A, 0xF4,
+                    0x1F, 0xDD, 0xA8, 0x33, 0x88, 0x07, 0xC7, 0x31, 0xB1, 0x12, 0x10, 0x59, 0x27, 0x80, 0xEC, 0x5F,
+                    0x60, 0x51, 0x7F, 0xA9, 0x19, 0xB5, 0x4A, 0x0D, 0x2D, 0xE5, 0x7A, 0x9F, 0x93, 0xC9, 0x9C, 0xEF,
+                    0xA0, 0xE0, 0x3B, 0x4D, 0xAE, 0x2A, 0xF5, 0xB0, 0xC8, 0xEB, 0xBB, 0x3C, 0x83, 0x53, 0x99, 0x61,
+                    0x17, 0x2B, 0x04, 0x7E, 0xBA, 0x77, 0xD6, 0x26, 0xE1, 0x69, 0x14, 0x63, 0x55, 0x21, 0x0C, 0x7D
+                )
+            );
+        }
+        return $tables;
+    }
+
     /**
      * Setup the performance-optimized function for de/encrypt()
      *
-     * @see Crypt_Base::_setupInlineCrypt()
+     * @see \phpseclib\Crypt\Base::_setupInlineCrypt()
      * @access private
      */
     function _setupInlineCrypt()
@@ -1213,44 +873,52 @@ class Crypt_Rijndael extends Crypt_Base
         // So here we are'nt under the same heavy timing-stress as we are in _de/encryptBlock() or de/encrypt().
         // However...the here generated function- $code, stored as php callback in $this->inline_crypt, must work as fast as even possible.
 
-        $lambda_functions =& Crypt_Rijndael::_getLambdaFunctions();
+        $lambda_functions =& self::_getLambdaFunctions();
 
-        // The first 10 generated $lambda_functions will use the key-words hardcoded for better performance.
-        // For memory reason we limit those ultra-optimized functions.
-        // After that, we use pure (extracted) integer vars for the key-words which is faster than accessing them via array.
-        if (count($lambda_functions) < 10) {
-            $w  = $this->w;
-            $dw = $this->dw;
-            $init_encrypt = '';
-            $init_decrypt = '';
-        } else {
-            for ($i = 0, $cw = count($this->w); $i < $cw; ++$i) {
-                $w[]  = '$w['  . $i . ']';
-                $dw[] = '$dw[' . $i . ']';
-            }
-            $init_encrypt = '$w = $self->w;';
-            $init_decrypt = '$dw = $self->dw;';
+        // We create max. 10 hi-optimized code for memory reason. Means: For each $key one ultra fast inline-crypt function.
+        // (Currently, for Crypt_Rijndael/AES, one generated $lambda_function cost on php5.5@32bit ~80kb unfreeable mem and ~130kb on php5.5@64bit)
+        // After that, we'll still create very fast optimized code but not the hi-ultimative code, for each $mode one.
+        $gen_hi_opt_code = (bool)( count($lambda_functions) < 10 );
+
+        // Generation of a uniqe hash for our generated code
+        $code_hash = "Crypt_Rijndael, {$this->mode}, {$this->Nr}, {$this->Nb}";
+        if ($gen_hi_opt_code) {
+            $code_hash = str_pad($code_hash, 32) . $this->_hashInlineCryptFunction($this->key);
         }
 
-        $code_hash = md5(str_pad("Crypt_Rijndael, {$this->mode}, {$this->block_size}, ", 32, "\0") . implode(',', $w));
-
         if (!isset($lambda_functions[$code_hash])) {
+            switch (true) {
+                case $gen_hi_opt_code:
+                    // The hi-optimized $lambda_functions will use the key-words hardcoded for better performance.
+                    $w  = $this->w;
+                    $dw = $this->dw;
+                    $init_encrypt = '';
+                    $init_decrypt = '';
+                    break;
+                default:
+                    for ($i = 0, $cw = count($this->w); $i < $cw; ++$i) {
+                        $w[]  = '$w['  . $i . ']';
+                        $dw[] = '$dw[' . $i . ']';
+                    }
+                    $init_encrypt = '$w  = $self->w;';
+                    $init_decrypt = '$dw = $self->dw;';
+            }
+
             $Nr = $this->Nr;
             $Nb = $this->Nb;
             $c  = $this->c;
 
             // Generating encrypt code:
             $init_encrypt.= '
-                static $t0, $t1, $t2, $t3, $sbox;
-                if (!$t0) {
-                    for ($i = 0; $i < 256; ++$i) {
-                        $t0[$i]    = (int)$self->t0[$i];
-                        $t1[$i]    = (int)$self->t1[$i];
-                        $t2[$i]    = (int)$self->t2[$i];
-                        $t3[$i]    = (int)$self->t3[$i];
-                        $sbox[$i]  = (int)$self->sbox[$i];
-                    }
+                static $tables;
+                if (empty($tables)) {
+                    $tables = &$self->_getTables();
                 }
+                $t0   = $tables[0];
+                $t1   = $tables[1];
+                $t2   = $tables[2];
+                $t3   = $tables[3];
+                $sbox = $tables[4];
             ';
 
             $s  = 'e';
@@ -1289,26 +957,25 @@ class Crypt_Rijndael extends Crypt_Base
             $encrypt_block .= '$in = pack("N*"'."\n";
             for ($i = 0; $i < $Nb; ++$i) {
                 $encrypt_block.= ',
-                    ($'.$e.$i                  .' & 0xFF000000) ^
-                    ($'.$e.(($i + $c[1]) % $Nb).' & 0x00FF0000) ^
-                    ($'.$e.(($i + $c[2]) % $Nb).' & 0x0000FF00) ^
-                    ($'.$e.(($i + $c[3]) % $Nb).' & 0x000000FF) ^
+                    ($'.$e.$i                  .' & '.((int)0xFF000000).') ^
+                    ($'.$e.(($i + $c[1]) % $Nb).' &         0x00FF0000   ) ^
+                    ($'.$e.(($i + $c[2]) % $Nb).' &         0x0000FF00   ) ^
+                    ($'.$e.(($i + $c[3]) % $Nb).' &         0x000000FF   ) ^
                     '.$w[$i]."\n";
             }
             $encrypt_block .= ');';
 
             // Generating decrypt code:
             $init_decrypt.= '
-                static $dt0, $dt1, $dt2, $dt3, $isbox;
-                if (!$dt0) {
-                    for ($i = 0; $i < 256; ++$i) {
-                        $dt0[$i]   = (int)$self->dt0[$i];
-                        $dt1[$i]   = (int)$self->dt1[$i];
-                        $dt2[$i]   = (int)$self->dt2[$i];
-                        $dt3[$i]   = (int)$self->dt3[$i];
-                        $isbox[$i] = (int)$self->isbox[$i];
-                    }
+                static $invtables;
+                if (empty($invtables)) {
+                    $invtables = &$self->_getInvTables();
                 }
+                $dt0   = $invtables[0];
+                $dt1   = $invtables[1];
+                $dt2   = $invtables[2];
+                $dt3   = $invtables[3];
+                $isbox = $invtables[4];
             ';
 
             $s  = 'e';
@@ -1347,10 +1014,10 @@ class Crypt_Rijndael extends Crypt_Base
             $decrypt_block .= '$in = pack("N*"'."\n";
             for ($i = 0; $i < $Nb; ++$i) {
                 $decrypt_block.= ',
-                    ($'.$e.$i.                        ' & 0xFF000000) ^
-                    ($'.$e.(($Nb + $i - $c[1]) % $Nb).' & 0x00FF0000) ^
-                    ($'.$e.(($Nb + $i - $c[2]) % $Nb).' & 0x0000FF00) ^
-                    ($'.$e.(($Nb + $i - $c[3]) % $Nb).' & 0x000000FF) ^
+                    ($'.$e.$i.                        ' & '.((int)0xFF000000).') ^
+                    ($'.$e.(($Nb + $i - $c[1]) % $Nb).' &         0x00FF0000   ) ^
+                    ($'.$e.(($Nb + $i - $c[2]) % $Nb).' &         0x0000FF00   ) ^
+                    ($'.$e.(($Nb + $i - $c[3]) % $Nb).' &         0x000000FF   ) ^
                     '.$dw[$i]."\n";
             }
             $decrypt_block .= ');';
diff --git a/libraries/phpseclib/LICENSE b/libraries/phpseclib/LICENSE
new file mode 100644
index 0000000000..75f6b2045c
--- /dev/null
+++ b/libraries/phpseclib/LICENSE
@@ -0,0 +1,21 @@
+Copyright 2007-2013 TerraFrost and other contributors
+http://phpseclib.sourceforge.net/
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/libraries/plugins/auth/AuthenticationCookie.class.php b/libraries/plugins/auth/AuthenticationCookie.class.php
index 99728b4abc..f3a0a35a2a 100644
--- a/libraries/plugins/auth/AuthenticationCookie.class.php
+++ b/libraries/plugins/auth/AuthenticationCookie.class.php
@@ -10,6 +10,8 @@ if (! defined('PHPMYADMIN')) {
     exit;
 }
 
+use phpseclib\Crypt;
+
 /* Get the authentication interface */
 require_once 'libraries/plugins/AuthenticationPlugin.class.php';
 
@@ -28,6 +30,20 @@ if (! empty($_REQUEST['target'])) {
  */
 require './libraries/plugins/auth/swekey/swekey.auth.lib.php';
 
+/**
+ * phpseclib
+ */
+if (! function_exists('openssl_encrypt')
+    || ! function_exists('openssl_decrypt')
+    || ! function_exists('openssl_random_pseudo_bytes')
+    || PHP_VERSION_ID < 50304
+) {
+    require PHPSECLIB_INC_DIR . '/Crypt/Base.php';
+    require PHPSECLIB_INC_DIR . '/Crypt/Rijndael.php';
+    require PHPSECLIB_INC_DIR . '/Crypt/AES.php';
+    require PHPSECLIB_INC_DIR . '/Crypt/Random.php';
+}
+
 /**
  * Handles the cookie authentication method
  *
@@ -358,19 +374,19 @@ class AuthenticationCookie extends AuthenticationPlugin
             ) {
                 if (! empty($_POST["g-recaptcha-response"])) {
 
-                    include_once 'libraries/plugins/auth/recaptcha/recaptchalib.php';
-                    $reCaptcha = new ReCaptcha(
+                    include_once 'libraries/plugins/auth/recaptcha/autoload.php';
+                    $reCaptcha = new \ReCaptcha\ReCaptcha(
                         $GLOBALS['cfg']['CaptchaLoginPrivateKey']
                     );
 
                     // verify captcha status.
-                    $resp = $reCaptcha->verifyResponse(
-                        $_SERVER["REMOTE_ADDR"],
-                        $_POST["g-recaptcha-response"]
+                    $resp = $reCaptcha->verify(
+                        $_POST["g-recaptcha-response"],
+                        $_SERVER["REMOTE_ADDR"]
                     );
 
                     // Check if the captcha entered is valid, if not stop the login.
-                    if ($resp == null || ! $resp->success) {
+                    if ($resp == null || ! $resp->isSuccess()) {
                         $conn_error = __('Entered captcha is wrong, try again!');
                         $_SESSION['last_valid_captcha'] = false;
                         return false;
@@ -712,7 +728,7 @@ class AuthenticationCookie extends AuthenticationPlugin
             if (self::useOpenSSL()) {
                 $_SESSION['encryption_key'] = openssl_random_pseudo_bytes(256);
             } else {
-                $_SESSION['encryption_key'] = crypt_random_string(256);
+                $_SESSION['encryption_key'] = Crypt\Random::string(256);
             }
         }
         return $_SESSION['encryption_key'];
@@ -753,7 +769,7 @@ class AuthenticationCookie extends AuthenticationPlugin
                 $this->_cookie_iv
             );
         } else {
-            $cipher = new Crypt_AES(CRYPT_AES_MODE_CBC);
+            $cipher = new Crypt\AES(Crypt\Base::MODE_CBC);
             $cipher->setIV($this->_cookie_iv);
             $cipher->setKey($secret);
             return base64_encode($cipher->encrypt($data));
@@ -787,7 +803,7 @@ class AuthenticationCookie extends AuthenticationPlugin
                 $this->_cookie_iv
             );
         } else {
-            $cipher = new Crypt_AES(CRYPT_AES_MODE_CBC);
+            $cipher = new Crypt\AES(Crypt\Base::MODE_CBC);
             $cipher->setIV($this->_cookie_iv);
             $cipher->setKey($secret);
             return $cipher->decrypt(base64_decode($encdata));
@@ -804,7 +820,7 @@ class AuthenticationCookie extends AuthenticationPlugin
         if (self::useOpenSSL()) {
             return openssl_cipher_iv_length('AES-128-CBC');
         }
-        $cipher = new Crypt_AES(CRYPT_AES_MODE_CBC);
+        $cipher = new Crypt\AES(Crypt\Base::MODE_CBC);
         return $cipher->block_size;
     }
 
@@ -823,7 +839,7 @@ class AuthenticationCookie extends AuthenticationPlugin
                 $this->getIVSize()
             );
         } else {
-            $this->_cookie_iv = crypt_random_string(
+            $this->_cookie_iv = Crypt\Random::string(
                 $this->getIVSize()
             );
         }
@@ -864,4 +880,4 @@ class AuthenticationCookie extends AuthenticationPlugin
 if (! AuthenticationCookie::useOpenSSL()) {
     include PHPSECLIB_INC_DIR . '/Crypt/AES.php';
     include PHPSECLIB_INC_DIR . '/Crypt/Random.php';
-}
\ No newline at end of file
+}
diff --git a/libraries/plugins/auth/recaptcha/ReCaptcha/ReCaptcha.php b/libraries/plugins/auth/recaptcha/ReCaptcha/ReCaptcha.php
new file mode 100644
index 0000000000..414c52159d
--- /dev/null
+++ b/libraries/plugins/auth/recaptcha/ReCaptcha/ReCaptcha.php
@@ -0,0 +1,97 @@
+<?php
+/**
+ * This is a PHP library that handles calling reCAPTCHA.
+ *
+ * @copyright Copyright (c) 2015, Google Inc.
+ * @link      http://www.google.com/recaptcha
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+namespace ReCaptcha;
+
+/**
+ * reCAPTCHA client.
+ */
+class ReCaptcha
+{
+    /**
+     * Version of this client library.
+     * @const string
+     */
+    const VERSION = 'php_1.1.0';
+
+    /**
+     * Shared secret for the site.
+     * @var type string
+     */
+    private $secret;
+
+    /**
+     * Method used to communicate  with service. Defaults to POST request.
+     * @var RequestMethod
+     */
+    private $requestMethod;
+
+    /**
+     * Create a configured instance to use the reCAPTCHA service.
+     *
+     * @param string $secret shared secret between site and reCAPTCHA server.
+     * @param RequestMethod $requestMethod method used to send the request. Defaults to POST.
+     */
+    public function __construct($secret, RequestMethod $requestMethod = null)
+    {
+        if (empty($secret)) {
+            throw new \RuntimeException('No secret provided');
+        }
+
+        if (!is_string($secret)) {
+            throw new \RuntimeException('The provided secret must be a string');
+        }
+
+        $this->secret = $secret;
+
+        if (!is_null($requestMethod)) {
+            $this->requestMethod = $requestMethod;
+        } else {
+            $this->requestMethod = new RequestMethod\Post();
+        }
+    }
+
+    /**
+     * Calls the reCAPTCHA siteverify API to verify whether the user passes
+     * CAPTCHA test.
+     *
+     * @param string $response The value of 'g-recaptcha-response' in the submitted form.
+     * @param string $remoteIp The end user's IP address.
+     * @return Response Response from the service.
+     */
+    public function verify($response, $remoteIp = null)
+    {
+        // Discard empty solution submissions
+        if (empty($response)) {
+            $recaptchaResponse = new Response(false, array('missing-input-response'));
+            return $recaptchaResponse;
+        }
+
+        $params = new RequestParameters($this->secret, $response, $remoteIp, self::VERSION);
+        $rawResponse = $this->requestMethod->submit($params);
+        return Response::fromJson($rawResponse);
+    }
+}
diff --git a/libraries/plugins/auth/recaptcha/ReCaptcha/RequestMethod.php b/libraries/plugins/auth/recaptcha/ReCaptcha/RequestMethod.php
new file mode 100644
index 0000000000..fc4dde59c0
--- /dev/null
+++ b/libraries/plugins/auth/recaptcha/ReCaptcha/RequestMethod.php
@@ -0,0 +1,42 @@
+<?php
+/**
+ * This is a PHP library that handles calling reCAPTCHA.
+ *
+ * @copyright Copyright (c) 2015, Google Inc.
+ * @link      http://www.google.com/recaptcha
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+namespace ReCaptcha;
+
+/**
+ * Method used to send the request to the service.
+ */
+interface RequestMethod
+{
+
+    /**
+     * Submit the request with the specified parameters.
+     *
+     * @param RequestParameters $params Request parameters
+     * @return string Body of the reCAPTCHA response
+     */
+    public function submit(RequestParameters $params);
+}
diff --git a/libraries/plugins/auth/recaptcha/ReCaptcha/RequestMethod/Post.php b/libraries/plugins/auth/recaptcha/ReCaptcha/RequestMethod/Post.php
new file mode 100644
index 0000000000..7770d90814
--- /dev/null
+++ b/libraries/plugins/auth/recaptcha/ReCaptcha/RequestMethod/Post.php
@@ -0,0 +1,70 @@
+<?php
+/**
+ * This is a PHP library that handles calling reCAPTCHA.
+ *
+ * @copyright Copyright (c) 2015, Google Inc.
+ * @link      http://www.google.com/recaptcha
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+namespace ReCaptcha\RequestMethod;
+
+use ReCaptcha\RequestMethod;
+use ReCaptcha\RequestParameters;
+
+/**
+ * Sends POST requests to the reCAPTCHA service.
+ */
+class Post implements RequestMethod
+{
+    /**
+     * URL to which requests are POSTed.
+     * @const string
+     */
+    const SITE_VERIFY_URL = 'https://www.google.com/recaptcha/api/siteverify';
+
+    /**
+     * Submit the POST request with the specified parameters.
+     *
+     * @param RequestParameters $params Request parameters
+     * @return string Body of the reCAPTCHA response
+     */
+    public function submit(RequestParameters $params)
+    {
+        /**
+         * PHP 5.6.0 changed the way you specify the peer name for SSL context options.
+         * Using "CN_name" will still work, but it will raise deprecated errors.
+         */
+        $peer_key = version_compare(PHP_VERSION, '5.6.0', '<') ? 'CN_name' : 'peer_name';
+        $options = array(
+            'http' => array(
+                'header' => "Content-type: application/x-www-form-urlencoded\r\n",
+                'method' => 'POST',
+                'content' => $params->toQueryString(),
+                // Force the peer to validate (not needed in 5.6.0+, but still works
+                'verify_peer' => true,
+                // Force the peer validation to use www.google.com
+                $peer_key => 'www.google.com',
+            ),
+        );
+        $context = stream_context_create($options);
+        return file_get_contents(self::SITE_VERIFY_URL, false, $context);
+    }
+}
diff --git a/libraries/plugins/auth/recaptcha/ReCaptcha/RequestMethod/Socket.php b/libraries/plugins/auth/recaptcha/ReCaptcha/RequestMethod/Socket.php
new file mode 100644
index 0000000000..e74fc49d62
--- /dev/null
+++ b/libraries/plugins/auth/recaptcha/ReCaptcha/RequestMethod/Socket.php
@@ -0,0 +1,104 @@
+<?php
+/**
+ * This is a PHP library that handles calling reCAPTCHA.
+ *
+ * @copyright Copyright (c) 2015, Google Inc.
+ * @link      http://www.google.com/recaptcha
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+namespace ReCaptcha\RequestMethod;
+
+/**
+ * Convenience wrapper around native socket and file functions to allow for
+ * mocking.
+ */
+class Socket
+{
+    private $handle = null;
+
+    /**
+     * fsockopen
+     * 
+     * @see http://php.net/fsockopen
+     * @param string $hostname
+     * @param int $port
+     * @param int $errno
+     * @param string $errstr
+     * @param float $timeout
+     * @return resource
+     */
+    public function fsockopen($hostname, $port = -1, &$errno = 0, &$errstr = '', $timeout = null)
+    {
+        $this->handle = fsockopen($hostname, $port, $errno, $errstr, (is_null($timeout) ? ini_get("default_socket_timeout") : $timeout));
+
+        if ($this->handle != false && $errno === 0 && $errstr === '') {
+            return $this->handle;
+        } else {
+            return false;
+        }
+    }
+
+    /**
+     * fwrite
+     * 
+     * @see http://php.net/fwrite
+     * @param string $string
+     * @param int $length
+     * @return int | bool
+     */
+    public function fwrite($string, $length = null)
+    {
+        return fwrite($this->handle, $string, (is_null($length) ? strlen($string) : $length));
+    }
+
+    /**
+     * fgets
+     * 
+     * @see http://php.net/fgets
+     * @param int $length
+     */
+    public function fgets($length = null)
+    {
+        return fgets($this->handle, $length);
+    }
+
+    /**
+     * feof
+     * 
+     * @see http://php.net/feof
+     * @return bool
+     */
+    public function feof()
+    {
+        return feof($this->handle);
+    }
+
+    /**
+     * fclose
+     * 
+     * @see http://php.net/fclose
+     * @return bool
+     */
+    public function fclose()
+    {
+        return fclose($this->handle);
+    }
+}
diff --git a/libraries/plugins/auth/recaptcha/ReCaptcha/RequestMethod/SocketPost.php b/libraries/plugins/auth/recaptcha/ReCaptcha/RequestMethod/SocketPost.php
new file mode 100644
index 0000000000..4f0c61a3fd
--- /dev/null
+++ b/libraries/plugins/auth/recaptcha/ReCaptcha/RequestMethod/SocketPost.php
@@ -0,0 +1,120 @@
+<?php
+/**
+ * This is a PHP library that handles calling reCAPTCHA.
+ *
+ * @copyright Copyright (c) 2015, Google Inc.
+ * @link      http://www.google.com/recaptcha
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+namespace ReCaptcha\RequestMethod;
+
+use ReCaptcha\RequestMethod;
+use ReCaptcha\RequestParameters;
+
+/**
+ * Sends a POST request to the reCAPTCHA service, but makes use of fsockopen() 
+ * instead of get_file_contents(). This is to account for people who may be on 
+ * servers where allow_furl_open is disabled.
+ */
+class SocketPost implements RequestMethod
+{
+    /**
+     * reCAPTCHA service host.
+     * @const string 
+     */
+    const RECAPTCHA_HOST = 'www.google.com';
+
+    /**
+     * @const string reCAPTCHA service path
+     */
+    const SITE_VERIFY_PATH = '/recaptcha/api/siteverify';
+
+    /**
+     * @const string Bad request error
+     */
+    const BAD_REQUEST = '{"success": false, "error-codes": ["invalid-request"]}';
+
+    /**
+     * @const string Bad response error
+     */
+    const BAD_RESPONSE = '{"success": false, "error-codes": ["invalid-response"]}';
+
+    /**
+     * Socket to the reCAPTCHA service
+     * @var Socket
+     */
+    private $socket;
+
+    /**
+     * Constructor
+     * 
+     * @param \ReCaptcha\RequestMethod\Socket $socket optional socket, injectable for testing
+     */
+    public function __construct(Socket $socket = null)
+    {
+        if (!is_null($socket)) {
+            $this->socket = $socket;
+        } else {
+            $this->socket = new Socket();
+        }
+    }
+
+    /**
+     * Submit the POST request with the specified parameters.
+     *
+     * @param RequestParameters $params Request parameters
+     * @return string Body of the reCAPTCHA response
+     */
+    public function submit(RequestParameters $params)
+    {
+        $errno = 0;
+        $errstr = '';
+
+        if ($this->socket->fsockopen('ssl://' . self::RECAPTCHA_HOST, 443, $errno, $errstr, 30) !== false) {
+            $content = $params->toQueryString();
+
+            $request = "POST " . self::SITE_VERIFY_PATH . " HTTP/1.1\r\n";
+            $request .= "Host: " . self::RECAPTCHA_HOST . "\r\n";
+            $request .= "Content-Type: application/x-www-form-urlencoded\r\n";
+            $request .= "Content-length: " . strlen($content) . "\r\n";
+            $request .= "Connection: close\r\n\r\n";
+            $request .= $content . "\r\n\r\n";
+
+            $this->socket->fwrite($request);
+            $response = '';
+
+            while (!$this->socket->feof()) {
+                $response .= $this->socket->fgets(4096);
+            }
+
+            $this->socket->fclose();
+
+            if (0 === strpos($response, 'HTTP/1.1 200 OK')) {
+                $parts = preg_split("#\n\s*\n#Uis", $response);
+                return $parts[1];
+            }
+
+            return self::BAD_RESPONSE;
+        }
+
+        return self::BAD_REQUEST;
+    }
+}
diff --git a/libraries/plugins/auth/recaptcha/ReCaptcha/RequestParameters.php b/libraries/plugins/auth/recaptcha/ReCaptcha/RequestParameters.php
new file mode 100644
index 0000000000..f446842839
--- /dev/null
+++ b/libraries/plugins/auth/recaptcha/ReCaptcha/RequestParameters.php
@@ -0,0 +1,103 @@
+<?php
+/**
+ * This is a PHP library that handles calling reCAPTCHA.
+ *
+ * @copyright Copyright (c) 2015, Google Inc.
+ * @link      http://www.google.com/recaptcha
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+namespace ReCaptcha;
+
+/**
+ * Stores and formats the parameters for the request to the reCAPTCHA service.
+ */
+class RequestParameters
+{
+    /**
+     * Site secret.
+     * @var string
+     */
+    private $secret;
+
+    /**
+     * Form response.
+     * @var string
+     */
+    private $response;
+
+    /**
+     * Remote user's IP address.
+     * @var string
+     */
+    private $remoteIp;
+
+    /**
+     * Client version.
+     * @var string
+     */
+    private $version;
+
+    /**
+     * Initialise parameters.
+     *
+     * @param string $secret Site secret.
+     * @param string $response Value from g-captcha-response form field.
+     * @param string $remoteIp User's IP address.
+     * @param string $version Version of this client library.
+     */
+    public function __construct($secret, $response, $remoteIp = null, $version = null)
+    {
+        $this->secret = $secret;
+        $this->response = $response;
+        $this->remoteIp = $remoteIp;
+        $this->version = $version;
+    }
+
+    /**
+     * Array representation.
+     *
+     * @return array Array formatted parameters.
+     */
+    public function toArray()
+    {
+        $params = array('secret' => $this->secret, 'response' => $this->response);
+
+        if (!is_null($this->remoteIp)) {
+            $params['remoteip'] = $this->remoteIp;
+        }
+
+        if (!is_null($this->version)) {
+            $params['version'] = $this->version;
+        }
+
+        return $params;
+    }
+
+    /**
+     * Query string representation for HTTP request.
+     *
+     * @return string Query string formatted parameters.
+     */
+    public function toQueryString()
+    {
+        return http_build_query($this->toArray());
+    }
+}
diff --git a/libraries/plugins/auth/recaptcha/ReCaptcha/Response.php b/libraries/plugins/auth/recaptcha/ReCaptcha/Response.php
new file mode 100644
index 0000000000..d2d8a8bf77
--- /dev/null
+++ b/libraries/plugins/auth/recaptcha/ReCaptcha/Response.php
@@ -0,0 +1,102 @@
+<?php
+/**
+ * This is a PHP library that handles calling reCAPTCHA.
+ *
+ * @copyright Copyright (c) 2015, Google Inc.
+ * @link      http://www.google.com/recaptcha
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+namespace ReCaptcha;
+
+/**
+ * The response returned from the service.
+ */
+class Response
+{
+    /**
+     * Succes or failure.
+     * @var boolean
+     */
+    private $success = false;
+
+    /**
+     * Error code strings.
+     * @var array
+     */
+    private $errorCodes = array();
+
+    /**
+     * Build the response from the expected JSON returned by the service.
+     *
+     * @param string $json
+     * @return \ReCaptcha\Response
+     */
+    public static function fromJson($json)
+    {
+        $responseData = json_decode($json, true);
+
+        if (!$responseData) {
+            return new Response(false, array('invalid-json'));
+        }
+
+        if (isset($responseData['success']) && $responseData['success'] == true) {
+            return new Response(true);
+        }
+
+        if (isset($responseData['error-codes']) && is_array($responseData['error-codes'])) {
+            return new Response(false, $responseData['error-codes']);
+        }
+
+        return new Response(false);
+    }
+
+    /**
+     * Constructor.
+     *
+     * @param boolean $success
+     * @param array $errorCodes
+     */
+    public function __construct($success, array $errorCodes = array())
+    {
+        $this->success = $success;
+        $this->errorCodes = $errorCodes;
+    }
+
+    /**
+     * Is success?
+     *
+     * @return boolean
+     */
+    public function isSuccess()
+    {
+        return $this->success;
+    }
+
+    /**
+     * Get error codes.
+     *
+     * @return array
+     */
+    public function getErrorCodes()
+    {
+        return $this->errorCodes;
+    }
+}
diff --git a/libraries/plugins/auth/recaptcha/autoload.php b/libraries/plugins/auth/recaptcha/autoload.php
new file mode 100644
index 0000000000..70c3c1c767
--- /dev/null
+++ b/libraries/plugins/auth/recaptcha/autoload.php
@@ -0,0 +1,38 @@
+<?php
+
+/* An autoloader for ReCaptcha\Foo classes. This should be require()d
+ * by the user before attempting to instantiate any of the ReCaptcha
+ * classes.
+ */
+
+spl_autoload_register(function ($class) {
+    if (substr($class, 0, 10) !== 'ReCaptcha\\') {
+      /* If the class does not lie under the "ReCaptcha" namespace,
+       * then we can exit immediately.
+       */
+      return;
+    }
+
+    /* All of the classes have names like "ReCaptcha\Foo", so we need
+     * to replace the backslashes with frontslashes if we want the
+     * name to map directly to a location in the filesystem.
+     */
+    $class = str_replace('\\', '/', $class);
+
+    /* First, check under the current directory. It is important that
+     * we look here first, so that we don't waste time searching for
+     * test classes in the common case.
+     */
+    $path = dirname(__FILE__).'/'.$class.'.php';
+    if (is_readable($path)) {
+        require_once $path;
+    }
+
+    /* If we didn't find what we're looking for already, maybe it's
+     * a test class?
+     */
+    $path = dirname(__FILE__).'/../tests/'.$class.'.php';
+    if (is_readable($path)) {
+        require_once $path;
+    }
+});
\ No newline at end of file
diff --git a/libraries/plugins/auth/recaptcha/recaptchalib.php b/libraries/plugins/auth/recaptcha/recaptchalib.php
deleted file mode 100644
index cca69f9d26..0000000000
--- a/libraries/plugins/auth/recaptcha/recaptchalib.php
+++ /dev/null
@@ -1,139 +0,0 @@
-<?php
-/**
- * This is a PHP library that handles calling reCAPTCHA.
- *    - Documentation and latest version
- *          https://developers.google.com/recaptcha/docs/php
- *    - Get a reCAPTCHA API Key
- *          https://www.google.com/recaptcha/admin/create
- *    - Discussion group
- *          http://groups.google.com/group/recaptcha
- *
- * @copyright Copyright (c) 2014, Google Inc.
- * @link      http://www.google.com/recaptcha
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-/**
- * A ReCaptchaResponse is returned from checkAnswer().
- */
-class ReCaptchaResponse
-{
-    public $success;
-    public $errorCodes;
-}
-
-class ReCaptcha
-{
-    private static $_signupUrl = "https://www.google.com/recaptcha/admin";
-    private static $_siteVerifyUrl =
-        "https://www.google.com/recaptcha/api/siteverify?";
-    private $_secret;
-    private static $_version = "php_1.0";
-
-    /**
-     * Constructor.
-     *
-     * @param string $secret shared secret between site and ReCAPTCHA server.
-     */
-    public function ReCaptcha($secret)
-    {
-        if ($secret == null || $secret == "") {
-            die("To use reCAPTCHA you must get an API key from <a href='"
-                . self::$_signupUrl . "'>" . self::$_signupUrl . "</a>");
-        }
-        $this->_secret=$secret;
-    }
-
-    /**
-     * Encodes the given data into a query string format.
-     *
-     * @param array $data array of string elements to be encoded.
-     *
-     * @return string - encoded request.
-     */
-    private function _encodeQS($data)
-    {
-        $req = "";
-        foreach ($data as $key => $value) {
-            $req .= $key . '=' . urlencode(stripslashes($value)) . '&';
-        }
-
-        // Cut the last '&'
-        $req=substr($req, 0, strlen($req)-1);
-        return $req;
-    }
-
-    /**
-     * Submits an HTTP GET to a reCAPTCHA server.
-     *
-     * @param string $path url path to recaptcha server.
-     * @param array  $data array of parameters to be sent.
-     *
-     * @return array response
-     */
-    private function _submitHTTPGet($path, $data)
-    {
-        $req = $this->_encodeQS($data);
-        $response = file_get_contents($path . $req);
-        return $response;
-    }
-
-    /**
-     * Calls the reCAPTCHA siteverify API to verify whether the user passes
-     * CAPTCHA test.
-     *
-     * @param string $remoteIp   IP address of end user.
-     * @param string $response   response string from recaptcha verification.
-     *
-     * @return ReCaptchaResponse
-     */
-    public function verifyResponse($remoteIp, $response)
-    {
-        // Discard empty solution submissions
-        if ($response == null || strlen($response) == 0) {
-            $recaptchaResponse = new ReCaptchaResponse();
-            $recaptchaResponse->success = false;
-            $recaptchaResponse->errorCodes = 'missing-input';
-            return $recaptchaResponse;
-        }
-
-        $getResponse = $this->_submitHttpGet(
-            self::$_siteVerifyUrl,
-            array (
-                'secret' => $this->_secret,
-                'remoteip' => $remoteIp,
-                'v' => self::$_version,
-                'response' => $response
-            )
-        );
-        $answers = json_decode($getResponse, true);
-        $recaptchaResponse = new ReCaptchaResponse();
-
-        if (trim($answers ['success']) == true) {
-            $recaptchaResponse->success = true;
-        } else {
-            $recaptchaResponse->success = false;
-            $recaptchaResponse->errorCodes = $answers ['error-codes'];
-        }
-
-        return $recaptchaResponse;
-    }
-}
-
diff --git a/po/af.po b/po/af.po
index 27249d559a..484dc65c73 100644
--- a/po/af.po
+++ b/po/af.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 4.5.0-dev\n"
 "Report-Msgid-Bugs-To: developers@phpmyadmin.net\n"
-"POT-Creation-Date: 2015-08-08 13:53-0400\n"
+"POT-Creation-Date: 2015-08-12 08:10-0400\n"
 "PO-Revision-Date: 2014-03-28 11:05+0200\n"
 "Last-Translator: Michal Čihař <michal@cihar.com>\n"
 "Language-Team: Afrikaans <https://hosted.weblate.org/projects/phpmyadmin/"
@@ -56,7 +56,7 @@ msgid "Table comments:"
 msgstr "Tabel kommentaar"
 
 #: db_datadict.php:104 libraries/Index.class.php:699
-#: libraries/insert_edit.lib.php:1567
+#: libraries/insert_edit.lib.php:1565
 #: libraries/navigation/Nodes/Node_Column.class.php:30
 #: libraries/plugins/export/ExportHtmlword.class.php:280
 #: libraries/plugins/export/ExportHtmlword.class.php:375
@@ -70,13 +70,14 @@ msgstr "Tabel kommentaar"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1023
 #: libraries/tracking.lib.php:879 libraries/tracking.lib.php:975
 #: templates/columns_definitions/column_name.phtml:18
-#: templates/index_form.phtml:124 templates/table/table_header.phtml:6
-#: templates/table/zoom_result_form.phtml:33
-#: templates/tbl_relation/common_form.phtml:10
-#: templates/tbl_relation/common_form.phtml:43
-#: templates/tbl_relation/foreign_key_row.phtml:194
-#: templates/tbl_relation/foreign_key_row.phtml:206
-#: templates/tbl_relation/internal_relational_row.phtml:71
+#: templates/table/index_form.phtml:124
+#: templates/table/relation/common_form.phtml:10
+#: templates/table/relation/common_form.phtml:43
+#: templates/table/relation/foreign_key_row.phtml:194
+#: templates/table/relation/foreign_key_row.phtml:206
+#: templates/table/relation/internal_relational_row.phtml:71
+#: templates/table/search/table_header.phtml:6
+#: templates/table/search/zoom_result_form.phtml:33
 msgid "Column"
 msgstr "Kolom naam"
 
@@ -94,21 +95,21 @@ msgstr "Kolom naam"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1001
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1024
 #: libraries/rte/rte_list.lib.php:75 libraries/rte/rte_list.lib.php:103
-#: libraries/rte/rte_routines.lib.php:802
-#: libraries/rte/rte_routines.lib.php:831
-#: libraries/rte/rte_routines.lib.php:1493
+#: libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_routines.lib.php:922
+#: libraries/rte/rte_routines.lib.php:1584
 #: libraries/server_privileges.lib.php:2369 libraries/tracking.lib.php:880
 #: libraries/tracking.lib.php:972
 #: templates/columns_definitions/table_fields_definitions.phtml:11
-#: templates/structure/table_header.phtml:48
-#: templates/structure/table_structure_header.phtml:6
-#: templates/table/table_header.phtml:7
+#: templates/database/structure/table_header.phtml:48
+#: templates/table/search/table_header.phtml:7
+#: templates/table/structure/table_structure_header.phtml:6
 msgid "Type"
 msgstr "Tipe"
 
 #: db_datadict.php:106 libraries/Index.class.php:702
 #: libraries/central_columns.lib.php:708
-#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1576
+#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1574
 #: libraries/plugins/export/ExportHtmlword.class.php:286
 #: libraries/plugins/export/ExportHtmlword.class.php:381
 #: libraries/plugins/export/ExportLatex.class.php:509
@@ -121,8 +122,8 @@ msgstr "Tipe"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1026
 #: libraries/tracking.lib.php:882 libraries/tracking.lib.php:978
 #: templates/columns_definitions/table_fields_definitions.phtml:39
-#: templates/structure/table_structure_header.phtml:9
-#: templates/table/zoom_result_form.phtml:34
+#: templates/table/search/zoom_result_form.phtml:34
+#: templates/table/structure/table_structure_header.phtml:9
 msgid "Null"
 msgstr "Null"
 
@@ -140,8 +141,8 @@ msgstr "Null"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1027
 #: libraries/replication_gui.lib.php:153 libraries/tracking.lib.php:883
 #: templates/columns_definitions/table_fields_definitions.phtml:25
-#: templates/structure/body_for_table_summary.phtml:55
-#: templates/structure/table_structure_header.phtml:10
+#: templates/database/structure/body_for_table_summary.phtml:55
+#: templates/table/structure/table_structure_header.phtml:10
 msgid "Default"
 msgstr "Verstekwaarde (default)"
 
@@ -169,19 +170,19 @@ msgid "Comments"
 msgstr "Kommentaar"
 
 #: db_datadict.php:146
-#: libraries/controllers/StructureController.class.php:1960
-#: libraries/controllers/StructureController.class.php:1965
+#: libraries/controllers/TableStructureController.class.php:951
+#: libraries/controllers/TableStructureController.class.php:956
 #: libraries/tracking.lib.php:922
 #: templates/columns_definitions/column_indexes.phtml:6
-#: templates/structure/check_all_table_column.phtml:22
-#: templates/structure/display_structure.phtml:74
+#: templates/table/structure/check_all_table_column.phtml:22
+#: templates/table/structure/display_structure.phtml:74
 msgid "Primary"
 msgstr "Primere"
 
 #: db_datadict.php:156 js/messages.php:317 libraries/Index.class.php:567
 #: libraries/Index.class.php:606 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261 libraries/mult_submits.lib.php:403
+#: libraries/config/FormDisplay.tpl.php:272 libraries/mult_submits.lib.php:403
 #: libraries/mult_submits.lib.php:417
 #: libraries/plugins/export/ExportHtmlword.class.php:630
 #: libraries/plugins/export/ExportLatex.class.php:589
@@ -197,20 +198,20 @@ msgstr "Primere"
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1010 libraries/tracking.lib.php:1015
 #: prefs_manage.php:140 templates/prefs_autoload.phtml:15
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "No"
 msgstr "Nee"
 
 #: db_datadict.php:156 js/messages.php:443 libraries/Index.class.php:568
 #: libraries/Index.class.php:605 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261
-#: libraries/controllers/StructureController.class.php:1344
-#: libraries/controllers/StructureController.class.php:2223
-#: libraries/controllers/StructureController.class.php:2232
-#: libraries/controllers/StructureController.class.php:2237
-#: libraries/controllers/StructureController.class.php:2242
-#: libraries/controllers/StructureController.class.php:2247
+#: libraries/config/FormDisplay.tpl.php:272
+#: libraries/controllers/TableStructureController.class.php:539
+#: libraries/controllers/TableStructureController.class.php:1201
+#: libraries/controllers/TableStructureController.class.php:1210
+#: libraries/controllers/TableStructureController.class.php:1215
+#: libraries/controllers/TableStructureController.class.php:1220
+#: libraries/controllers/TableStructureController.class.php:1225
 #: libraries/mult_submits.inc.php:82 libraries/mult_submits.inc.php:178
 #: libraries/mult_submits.lib.php:339 libraries/mult_submits.lib.php:372
 #: libraries/mult_submits.lib.php:401 libraries/mult_submits.lib.php:415
@@ -219,8 +220,8 @@ msgstr "Nee"
 #: libraries/plugins/export/ExportOdt.class.php:756
 #: libraries/plugins/export/ExportTexytext.class.php:567
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1077
-#: libraries/server_databases.lib.php:464
-#: libraries/server_databases.lib.php:474
+#: libraries/server_databases.lib.php:475
+#: libraries/server_databases.lib.php:485
 #: libraries/server_privileges.lib.php:2546
 #: libraries/server_privileges.lib.php:2727
 #: libraries/server_privileges.lib.php:2748
@@ -230,7 +231,7 @@ msgstr "Nee"
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1008 libraries/tracking.lib.php:1013
 #: prefs_manage.php:138 templates/prefs_autoload.phtml:14
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "Yes"
 msgstr "Ja"
 
@@ -240,7 +241,7 @@ msgstr "Sien die storting (skema) van die databasis"
 
 #: db_export.php:37 db_tracking.php:90 export.php:382
 #: libraries/DBQbe.class.php:326
-#: libraries/controllers/StructureController.class.php:231
+#: libraries/controllers/DatabaseStructureController.class.php:170
 #: libraries/navigation/NavigationTree.class.php:897
 msgid "No tables found in database."
 msgstr "Geen tabelle in databasis gevind nie."
@@ -251,15 +252,15 @@ msgstr "Geen tabelle in databasis gevind nie."
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:26
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:120
-#: templates/structure/show_create.phtml:18
+#: templates/database/structure/show_create.phtml:18
 #, fuzzy
 msgid "Tables"
 msgstr "Tabel"
 
 #: db_export.php:52 libraries/Menu.class.php:317 libraries/Menu.class.php:425
-#: libraries/Util.class.php:3333 libraries/Util.class.php:3343
-#: libraries/Util.class.php:3349 libraries/Util.class.php:3629
-#: libraries/Util.class.php:4327 libraries/Util.class.php:4344
+#: libraries/Util.class.php:3339 libraries/Util.class.php:3349
+#: libraries/Util.class.php:3355 libraries/Util.class.php:3635
+#: libraries/Util.class.php:4333 libraries/Util.class.php:4350
 #: libraries/central_columns.lib.php:728 libraries/config.values.php:39
 #: libraries/config.values.php:47 libraries/config.values.php:109
 #: libraries/config.values.php:115 libraries/config/setup.forms.php:323
@@ -273,7 +274,7 @@ msgstr "Tabel"
 #: libraries/navigation/Nodes/Node_Table.class.php:283
 #: libraries/server_privileges.lib.php:1141 libraries/tracking.lib.php:874
 #: templates/columns_definitions/table_fields_definitions.phtml:3
-#: templates/designer/table_list.phtml:28
+#: templates/database/designer/table_list.phtml:28
 msgid "Structure"
 msgstr "Struktuur"
 
@@ -285,7 +286,7 @@ msgstr "Struktuur"
 #: libraries/config/user_preferences.forms.php:292
 #: libraries/config/user_preferences.forms.php:297
 #: libraries/server_privileges.lib.php:1140
-#: templates/structure/display_table_stats.phtml:12
+#: templates/table/structure/display_table_stats.phtml:12
 msgid "Data"
 msgstr "Data"
 
@@ -370,10 +371,10 @@ msgstr "Nagegaande tabelle"
 #: libraries/server_privileges.lib.php:2908
 #: libraries/server_privileges.lib.php:3145
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4346
-#: templates/structure/table_header.phtml:21
-#: templates/tbl_relation/foreign_key_row.phtml:176
-#: templates/tbl_relation/internal_relational_row.phtml:63
+#: libraries/server_privileges.lib.php:4372
+#: templates/database/structure/table_header.phtml:21
+#: templates/table/relation/foreign_key_row.phtml:176
+#: templates/table/relation/internal_relational_row.phtml:63
 msgid "Table"
 msgstr "Tabel"
 
@@ -390,7 +391,7 @@ msgid "Updated"
 msgstr "Opgedateer"
 
 #: db_tracking.php:130 js/messages.php:243 libraries/Menu.class.php:552
-#: libraries/Util.class.php:4314 libraries/config.values.php:104
+#: libraries/Util.class.php:4320 libraries/config.values.php:104
 #: libraries/rte/rte_events.lib.php:393 libraries/rte/rte_list.lib.php:101
 #: libraries/server_status_processes.lib.php:92 libraries/tracking.lib.php:279
 msgid "Status"
@@ -399,14 +400,15 @@ msgstr "Status"
 #: db_tracking.php:131 db_tracking.php:290 libraries/Index.class.php:693
 #: libraries/central_columns.lib.php:687 libraries/rte/rte_list.lib.php:74
 #: libraries/rte/rte_list.lib.php:89 libraries/rte/rte_list.lib.php:102
-#: libraries/server_databases.lib.php:398
+#: libraries/server_databases.lib.php:409
 #: libraries/server_privileges.lib.php:2372
 #: libraries/server_privileges.lib.php:3166
 #: libraries/server_privileges.lib.php:3342
 #: libraries/server_user_groups.lib.php:82
 #: libraries/server_variables.lib.php:189 libraries/tracking.lib.php:280
-#: libraries/tracking.lib.php:793 templates/structure/table_header.phtml:30
-#: templates/structure/table_structure_header.phtml:23
+#: libraries/tracking.lib.php:793
+#: templates/database/structure/table_header.phtml:30
+#: templates/table/structure/table_structure_header.phtml:23
 msgid "Action"
 msgstr "Aksie"
 
@@ -450,7 +452,7 @@ msgid "Untracked tables"
 msgstr "Nie gevolgde tabelle"
 
 #: db_tracking.php:305 db_tracking.php:336
-#: templates/structure/optional_action_links.phtml:17
+#: templates/table/structure/optional_action_links.phtml:17
 msgid "Track table"
 msgstr "Volg tabel"
 
@@ -505,7 +507,7 @@ msgid "Value for the column \"%s\""
 msgstr "Waarde vir die kolom \"%s\""
 
 #: gis_data_editor.php:146
-#: templates/gis_visualization/gis_visualization.phtml:37
+#: templates/table/gis_visualization/gis_visualization.phtml:37
 msgid "Use OpenStreetMaps as Base Layer"
 msgstr "Gebruik OpenStreetMaps as basis vlak"
 
@@ -585,35 +587,35 @@ msgstr "Voeg geometrie by"
 #: libraries/display_change_password.lib.php:162
 #: libraries/display_export.lib.php:402 libraries/display_export.lib.php:408
 #: libraries/display_import.lib.php:392 libraries/index.lib.php:44
-#: libraries/insert_edit.lib.php:1546 libraries/insert_edit.lib.php:1583
+#: libraries/insert_edit.lib.php:1544 libraries/insert_edit.lib.php:1581
 #: libraries/normalization.lib.php:165 libraries/normalization.lib.php:821
 #: libraries/operations.lib.php:38 libraries/operations.lib.php:108
 #: libraries/operations.lib.php:263 libraries/operations.lib.php:306
 #: libraries/operations.lib.php:801 libraries/operations.lib.php:874
 #: libraries/operations.lib.php:923 libraries/operations.lib.php:1337
 #: libraries/operations.lib.php:1658
-#: libraries/plugins/auth/AuthenticationCookie.class.php:244
+#: libraries/plugins/auth/AuthenticationCookie.class.php:232
 #: libraries/replication_gui.lib.php:122 libraries/replication_gui.lib.php:161
 #: libraries/replication_gui.lib.php:324 libraries/replication_gui.lib.php:461
 #: libraries/replication_gui.lib.php:906 libraries/rte/rte_events.lib.php:509
-#: libraries/rte/rte_routines.lib.php:969
-#: libraries/rte/rte_routines.lib.php:1581
+#: libraries/rte/rte_routines.lib.php:1060
+#: libraries/rte/rte_routines.lib.php:1672
 #: libraries/rte/rte_triggers.lib.php:396 libraries/server_bin_log.lib.php:61
 #: libraries/server_privileges.lib.php:705
 #: libraries/server_privileges.lib.php:2106
 #: libraries/server_privileges.lib.php:2872
 #: libraries/server_privileges.lib.php:3553
-#: libraries/server_privileges.lib.php:4627
+#: libraries/server_privileges.lib.php:4653
 #: libraries/server_user_groups.lib.php:285
 #: libraries/sql_query_form.lib.php:369 libraries/sql_query_form.lib.php:429
 #: libraries/tracking.lib.php:533 libraries/tracking.lib.php:653
 #: prefs_manage.php:277 prefs_manage.php:355
 #: templates/columns_definitions/column_definitions_form.phtml:59
-#: templates/header_location.phtml:17 templates/index_form.phtml:238
+#: templates/database/create_table.phtml:21 templates/header_location.phtml:28
 #: templates/startAndNumberOfRowsPanel.phtml:14
-#: templates/structure/add_column.phtml:25
-#: templates/table/create_table.phtml:21
-#: templates/table/selection_form.phtml:75 view_create.php:275
+#: templates/table/index_form.phtml:238
+#: templates/table/search/selection_form.phtml:75
+#: templates/table/structure/add_column.phtml:25 view_create.php:275
 #: view_operations.php:106
 msgid "Go"
 msgstr "Gaan voort"
@@ -708,7 +710,7 @@ msgstr ""
 msgid "Could not load import plugins, please check your installation!"
 msgstr ""
 
-#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1466
+#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1460
 #, fuzzy, php-format
 msgid "Bookmark %s has been created."
 msgstr "Tabel %s is verwyder"
@@ -742,12 +744,12 @@ msgstr ""
 msgid "Back"
 msgstr "Terug"
 
-#: index.php:148 libraries/Footer.class.php:70
+#: index.php:149 libraries/Footer.class.php:70
 #, fuzzy
 msgid "phpMyAdmin Demo Server"
 msgstr "phpMyAdmin dokumentasie"
 
-#: index.php:152
+#: index.php:153
 #, php-format
 msgid ""
 "You are using the demo server. You can do anything here, but please do not "
@@ -755,47 +757,47 @@ msgid ""
 "at %s."
 msgstr ""
 
-#: index.php:162
+#: index.php:163
 #, fuzzy
 #| msgid "General relation features"
 msgid "General Settings"
 msgstr "Algemene verwantskap funksies"
 
-#: index.php:190 libraries/display_change_password.lib.php:50
+#: index.php:191 libraries/display_change_password.lib.php:50
 #: libraries/display_change_password.lib.php:53 user_password.php:247
 msgid "Change password"
 msgstr "Verander wagwoord"
 
-#: index.php:206
+#: index.php:207
 msgid "Server connection collation"
 msgstr ""
 
-#: index.php:228
+#: index.php:229
 msgid "Appearance Settings"
 msgstr ""
 
-#: index.php:258 prefs_manage.php:285
+#: index.php:259 prefs_manage.php:285
 #, fuzzy
 #| msgid "General relation features"
 msgid "More settings"
 msgstr "Algemene verwantskap funksies"
 
-#: index.php:279
+#: index.php:280
 #, fuzzy
 #| msgid "Databases"
 msgid "Database server"
 msgstr "databasisse"
 
-#: index.php:282 libraries/plugins/auth/AuthenticationCookie.class.php:181
+#: index.php:283 libraries/plugins/auth/AuthenticationCookie.class.php:169
 msgid "Server:"
 msgstr ""
 
-#: index.php:286
+#: index.php:287
 #, fuzzy
 msgid "Server type:"
 msgstr "Bediener Keuse"
 
-#: index.php:290 libraries/plugins/export/ExportLatex.class.php:212
+#: index.php:291 libraries/plugins/export/ExportLatex.class.php:212
 #: libraries/plugins/export/ExportSql.class.php:687
 #: libraries/plugins/export/ExportXml.class.php:189
 #, fuzzy
@@ -803,84 +805,84 @@ msgstr "Bediener Keuse"
 msgid "Server version:"
 msgstr "Bediener weergawe"
 
-#: index.php:296
+#: index.php:297
 #, fuzzy
 msgid "Protocol version:"
 msgstr "Bediener weergawe"
 
-#: index.php:300
+#: index.php:301
 #, fuzzy
 #| msgid "User"
 msgid "User:"
 msgstr "Gebruiker"
 
-#: index.php:305
+#: index.php:306
 #, fuzzy
 msgid "Server charset:"
 msgstr "Bediener Keuse"
 
-#: index.php:320
+#: index.php:321
 msgid "Web server"
 msgstr ""
 
-#: index.php:331
+#: index.php:332
 #, fuzzy
 msgid "Database client version:"
 msgstr "Tabel kommentaar"
 
-#: index.php:335
+#: index.php:336
 #, fuzzy
 msgid "PHP extension:"
 msgstr "PHP Version"
 
-#: index.php:349
+#: index.php:350
 #, fuzzy
 #| msgid "PHP Version"
 msgid "PHP version:"
 msgstr "PHP Version"
 
-#: index.php:360
+#: index.php:361
 msgid "Show PHP information"
 msgstr "Wys PHP informasie"
 
-#: index.php:383
+#: index.php:384
 #, fuzzy
 msgid "Version information:"
 msgstr "Wys PHP informasie"
 
-#: index.php:392 libraries/Util.class.php:432 libraries/Util.class.php:495
-#: libraries/config/FormDisplay.tpl.php:151
+#: index.php:393 libraries/Util.class.php:432 libraries/Util.class.php:495
+#: libraries/config/FormDisplay.tpl.php:162
 #: libraries/display_export.lib.php:577 libraries/engines/pbxt.lib.php:162
 #: libraries/navigation/NavigationHeader.class.php:196
 #: libraries/server_variables.lib.php:160
 msgid "Documentation"
 msgstr "Dokumentasie"
 
-#: index.php:399
+#: index.php:400
 msgid "Wiki"
 msgstr ""
 
-#: index.php:408
+#: index.php:409
 msgid "Official Homepage"
 msgstr "Amptelike phpMyAdmin Tuisblad"
 
-#: index.php:415
+#: index.php:416
 #, fuzzy
 #| msgid "Attributes"
 msgid "Contribute"
 msgstr "Kenmerke"
 
-#: index.php:422
+#: index.php:423
 msgid "Get support"
 msgstr ""
 
-#: index.php:429
+#: index.php:430
 #, fuzzy
 #| msgid "No change"
 msgid "List of changes"
 msgstr "Geen verandering"
 
-#: index.php:451
+#: index.php:452
 msgid ""
 "You are connected as 'root' with no password, which corresponds to the "
 "default MySQL privileged account. Your MySQL server is running with this "
@@ -888,21 +890,21 @@ msgid ""
 "by setting a password for user 'root'."
 msgstr ""
 
-#: index.php:468
+#: index.php:469
 msgid ""
 "You have enabled mbstring.func_overload in your PHP configuration. This "
 "option is incompatible with phpMyAdmin and might cause some data to be "
 "corrupted!"
 msgstr ""
 
-#: index.php:483
+#: index.php:484
 msgid ""
 "The mbstring PHP extension was not found and you seem to be using a "
 "multibyte charset. Without the mbstring extension phpMyAdmin is unable to "
 "split strings correctly and it may result in unexpected results."
 msgstr ""
 
-#: index.php:500
+#: index.php:501
 msgid ""
 "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini."
 "session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower than "
@@ -910,17 +912,17 @@ msgid ""
 "expire sooner than configured in phpMyAdmin."
 msgstr ""
 
-#: index.php:519
+#: index.php:520
 msgid ""
 "Login cookie store is lower than cookie validity configured in phpMyAdmin, "
 "because of this, your login will expire sooner than configured in phpMyAdmin."
 msgstr ""
 
-#: index.php:535
+#: index.php:536
 msgid "The configuration file now needs a secret passphrase (blowfish_secret)."
 msgstr ""
 
-#: index.php:548
+#: index.php:549
 msgid ""
 "Directory [code]config[/code], which is used by the setup script, still "
 "exists in your phpMyAdmin directory. It is strongly recommended to remove it "
@@ -928,7 +930,7 @@ msgid ""
 "may be compromised by unauthorized people downloading your configuration."
 msgstr ""
 
-#: index.php:564
+#: index.php:565
 #, fuzzy, php-format
 #| msgid ""
 #| " additional features for working with linked tables have been ctivated. "
@@ -940,19 +942,19 @@ msgstr ""
 "Die addisionele funksies om met geskakelde tabelle te werk is ge deaktiveer. "
 "Om uit te vind hoekom kliek %shier%s."
 
-#: index.php:571
+#: index.php:572
 msgid ""
 "Or alternately go to 'Operations' tab of any database to set it up there."
 msgstr ""
 
-#: index.php:620
+#: index.php:621
 #, php-format
 msgid ""
 "Your PHP MySQL library version %s differs from your MySQL server version %s. "
 "This may cause unpredictable behavior."
 msgstr ""
 
-#: index.php:648
+#: index.php:649
 #, php-format
 msgid ""
 "Server running with Suhosin. Please refer to %sdocumentation%s for possible "
@@ -1116,8 +1118,8 @@ msgstr ""
 msgid "Save & Close"
 msgstr "Stoor as leer (file)"
 
-#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:404
-#: libraries/insert_edit.lib.php:1550 prefs_manage.php:361
+#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:415
+#: libraries/insert_edit.lib.php:1548 prefs_manage.php:361
 #: prefs_manage.php:372
 msgid "Reset"
 msgstr "Herstel"
@@ -1158,7 +1160,7 @@ msgstr "Indeks"
 msgid "Edit Index"
 msgstr "Indeks"
 
-#: js/messages.php:99 templates/index_form.phtml:232
+#: js/messages.php:99 templates/table/index_form.phtml:232
 #, fuzzy, php-format
 msgid "Add %s column(s) to index"
 msgstr "Voeg 'n nuwe veld by"
@@ -1186,15 +1188,16 @@ msgstr "Velde omring met"
 msgid "Please select column(s) for the index."
 msgstr "Voeg 'n nuwe veld by"
 
-#: js/messages.php:106 templates/structure/add_column.phtml:1
+#: js/messages.php:106 templates/table/structure/add_column.phtml:1
 #, fuzzy
 #| msgid "You have to choose at least one column to display"
 msgid "You have to add at least one column."
 msgstr "Jy moet ten minste een Kolom kies om te vertoon"
 
-#: js/messages.php:109 libraries/insert_edit.lib.php:1548
+#: js/messages.php:109 libraries/insert_edit.lib.php:1546
 #: templates/columns_definitions/column_definitions_form.phtml:162
-#: templates/index_form.phtml:237 templates/tbl_relation/common_form.phtml:106
+#: templates/table/index_form.phtml:237
+#: templates/table/relation/common_form.phtml:106
 msgid "Preview SQL"
 msgstr ""
 
@@ -1217,7 +1220,7 @@ msgid "SQL query:"
 msgstr "SQL-stelling"
 
 #. l10n: Default label for the y-Axis of Charts
-#: js/messages.php:118 templates/tbl_chart.phtml:109
+#: js/messages.php:118 templates/table/chart/tbl_chart.phtml:109
 #, fuzzy
 #| msgid "Value"
 msgid "Y Values"
@@ -1383,7 +1386,7 @@ msgstr ""
 msgid "Bytes received"
 msgstr ""
 
-#: js/messages.php:169 libraries/server_status.lib.php:226
+#: js/messages.php:169 libraries/server_status.lib.php:235
 msgid "Connections"
 msgstr ""
 
@@ -1442,12 +1445,12 @@ msgstr "%s tabel(le)"
 msgid "Questions"
 msgstr "Operasies"
 
-#: js/messages.php:184 libraries/server_status.lib.php:134
+#: js/messages.php:184 libraries/server_status.lib.php:143
 msgid "Traffic"
 msgstr ""
 
 #: js/messages.php:185 libraries/Menu.class.php:586
-#: libraries/Util.class.php:4318 libraries/server_status_monitor.lib.php:257
+#: libraries/Util.class.php:4324 libraries/server_status_monitor.lib.php:257
 #, fuzzy
 #| msgid "General relation features"
 msgid "Settings"
@@ -1469,8 +1472,9 @@ msgstr ""
 #: libraries/server_status_monitor.lib.php:236
 #: libraries/server_status_processes.lib.php:308
 #: templates/columns_definitions/transformation.phtml:4
-#: templates/designer/options_panel.phtml:178
-#: templates/table/options_zoom.phtml:12 templates/table/rows_zoom.phtml:26
+#: templates/database/designer/options_panel.phtml:178
+#: templates/table/search/options_zoom.phtml:12
+#: templates/table/search/rows_zoom.phtml:26
 msgid "None"
 msgstr "Geen"
 
@@ -1764,8 +1768,8 @@ msgstr ""
 
 #: js/messages.php:270 libraries/Menu.class.php:352
 #: libraries/Menu.class.php:455 libraries/Menu.class.php:582
-#: libraries/Util.class.php:4317 libraries/Util.class.php:4332
-#: libraries/Util.class.php:4349 libraries/config/messages.inc.php:258
+#: libraries/Util.class.php:4323 libraries/Util.class.php:4338
+#: libraries/Util.class.php:4355 libraries/config/messages.inc.php:258
 #: libraries/display_import.lib.php:105
 #: libraries/server_status_monitor.lib.php:318 prefs_manage.php:238
 #: setup/frames/menu.inc.php:26
@@ -1832,13 +1836,13 @@ msgid "Formatting SQL..."
 msgstr ""
 
 #: js/messages.php:293 libraries/server_variables.lib.php:157
-#: templates/designer/aggregate_query_panel.phtml:63
-#: templates/designer/delete_relation_panel.phtml:28
-#: templates/designer/having_query_panel.phtml:117
-#: templates/designer/new_relation_panel.phtml:88
-#: templates/designer/options_panel.phtml:253
-#: templates/designer/rename_to_panel.phtml:45
-#: templates/designer/where_query_panel.phtml:83
+#: templates/database/designer/aggregate_query_panel.phtml:63
+#: templates/database/designer/delete_relation_panel.phtml:28
+#: templates/database/designer/having_query_panel.phtml:117
+#: templates/database/designer/new_relation_panel.phtml:88
+#: templates/database/designer/options_panel.phtml:253
+#: templates/database/designer/rename_to_panel.phtml:45
+#: templates/database/designer/where_query_panel.phtml:83
 msgid "Cancel"
 msgstr ""
 
@@ -1848,7 +1852,7 @@ msgstr ""
 msgid "Page-related settings"
 msgstr "Algemene verwantskap funksies"
 
-#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:402
+#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:413
 msgid "Apply"
 msgstr ""
 
@@ -1884,8 +1888,8 @@ msgstr ""
 msgid "Error text: %s"
 msgstr ""
 
-#: js/messages.php:307 libraries/db_common.inc.php:68
-#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:450
+#: js/messages.php:307 libraries/db_common.inc.php:69
+#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:461
 msgid "No databases selected."
 msgstr ""
 
@@ -1897,12 +1901,13 @@ msgstr ""
 msgid "Adding Primary Key"
 msgstr ""
 
-#: js/messages.php:310 templates/designer/aggregate_query_panel.phtml:59
-#: templates/designer/having_query_panel.phtml:113
-#: templates/designer/new_relation_panel.phtml:87
-#: templates/designer/options_panel.phtml:252
-#: templates/designer/rename_to_panel.phtml:41
-#: templates/designer/where_query_panel.phtml:82
+#: js/messages.php:310
+#: templates/database/designer/aggregate_query_panel.phtml:59
+#: templates/database/designer/having_query_panel.phtml:113
+#: templates/database/designer/new_relation_panel.phtml:87
+#: templates/database/designer/options_panel.phtml:252
+#: templates/database/designer/rename_to_panel.phtml:41
+#: templates/database/designer/where_query_panel.phtml:82
 msgid "OK"
 msgstr "OK"
 
@@ -1924,7 +1929,7 @@ msgstr "Geen databasisse"
 msgid "Changing Charset"
 msgstr ""
 
-#: js/messages.php:320 libraries/Util.class.php:3217
+#: js/messages.php:320 libraries/Util.class.php:3223
 msgid "Enable foreign key checks"
 msgstr ""
 
@@ -1967,20 +1972,21 @@ msgstr ""
 #: js/messages.php:334 libraries/DisplayResults.class.php:4834
 #: libraries/DisplayResults.class.php:5092 libraries/Menu.class.php:344
 #: libraries/Menu.class.php:446 libraries/Menu.class.php:578
-#: libraries/Util.class.php:3636 libraries/Util.class.php:3637
-#: libraries/Util.class.php:4316 libraries/Util.class.php:4331
-#: libraries/Util.class.php:4348 libraries/config/messages.inc.php:252
+#: libraries/Util.class.php:3642 libraries/Util.class.php:3643
+#: libraries/Util.class.php:4322 libraries/Util.class.php:4337
+#: libraries/Util.class.php:4354 libraries/config/messages.inc.php:252
 #: libraries/display_export.lib.php:173 libraries/rte/rte_list.lib.php:146
 #: libraries/server_privileges.lib.php:2211
 #: libraries/server_privileges.lib.php:2290
 #: libraries/server_privileges.lib.php:2632
 #: libraries/server_privileges.lib.php:3356
 #: libraries/server_status_monitor.lib.php:322 prefs_manage.php:303
-#: setup/frames/menu.inc.php:27 templates/structure/check_all_tables.phtml:11
+#: setup/frames/menu.inc.php:27
+#: templates/database/structure/check_all_tables.phtml:11
 msgid "Export"
 msgstr "Export"
 
-#: js/messages.php:337 libraries/rte/rte_routines.lib.php:652
+#: js/messages.php:337 libraries/rte/rte_routines.lib.php:743
 msgid "ENUM/SET editor"
 msgstr ""
 
@@ -2022,7 +2028,7 @@ msgstr "SQL-stelling"
 #: libraries/Console.class.php:214 libraries/DisplayResults.class.php:3474
 #: libraries/DisplayResults.class.php:4818 libraries/Index.class.php:723
 #: libraries/Util.class.php:706 libraries/Util.class.php:1202
-#: libraries/Util.class.php:3634 libraries/Util.class.php:3635
+#: libraries/Util.class.php:3640 libraries/Util.class.php:3641
 #: libraries/central_columns.lib.php:851
 #: libraries/central_columns.lib.php:1193
 #: libraries/config/messages.inc.php:892
@@ -2040,7 +2046,7 @@ msgstr "Verander"
 #: libraries/server_user_groups.lib.php:129
 #: libraries/sql_query_form.lib.php:416 libraries/tracking.lib.php:477
 #: setup/frames/index.inc.php:183 setup/frames/index.inc.php:291
-#: templates/designer/delete_relation_panel.phtml:27
+#: templates/database/designer/delete_relation_panel.phtml:27
 msgid "Delete"
 msgstr "Verwyder"
 
@@ -2218,11 +2224,11 @@ msgid "No dependencies selected!"
 msgstr ""
 
 #: js/messages.php:394 libraries/central_columns.lib.php:1214
-#: libraries/insert_edit.lib.php:1458 libraries/server_variables.lib.php:155
+#: libraries/insert_edit.lib.php:1456 libraries/server_variables.lib.php:155
 #: setup/frames/config.inc.php:42 setup/frames/index.inc.php:279
 #: templates/columns_definitions/column_definitions_form.phtml:165
-#: templates/gis_visualization/gis_visualization.phtml:48
-#: templates/tbl_relation/common_form.phtml:107
+#: templates/table/gis_visualization/gis_visualization.phtml:48
+#: templates/table/relation/common_form.phtml:107
 msgid "Save"
 msgstr "Stoor"
 
@@ -2312,8 +2318,8 @@ msgid "Data point content"
 msgstr "Tabel kommentaar"
 
 #: js/messages.php:430 js/messages.php:562 js/messages.php:579
-#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2573
-#: templates/index_form.phtml:154 templates/index_form.phtml:194
+#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2571
+#: templates/table/index_form.phtml:154 templates/table/index_form.phtml:194
 msgid "Ignore"
 msgstr "Ignoreer"
 
@@ -2374,8 +2380,8 @@ msgstr ""
 msgid "Please select the primary key or a unique key!"
 msgstr ""
 
-#: js/messages.php:457 templates/designer/side_menu.phtml:91
-#: templates/designer/side_menu.phtml:94
+#: js/messages.php:457 templates/database/designer/side_menu.phtml:91
+#: templates/database/designer/side_menu.phtml:94
 #, fuzzy
 #| msgid "Choose field to display"
 msgid "Choose column to display"
@@ -2393,22 +2399,22 @@ msgstr ""
 msgid "Page name"
 msgstr "Bladsy nommer:"
 
-#: js/messages.php:463 templates/designer/side_menu.phtml:56
-#: templates/designer/side_menu.phtml:59
+#: js/messages.php:463 templates/database/designer/side_menu.phtml:56
+#: templates/database/designer/side_menu.phtml:59
 #, fuzzy
 #| msgid "Select All"
 msgid "Save page"
 msgstr "Kies Alles"
 
-#: js/messages.php:464 templates/designer/side_menu.phtml:63
-#: templates/designer/side_menu.phtml:66
+#: js/messages.php:464 templates/database/designer/side_menu.phtml:63
+#: templates/database/designer/side_menu.phtml:66
 #, fuzzy
 #| msgid "Select All"
 msgid "Save page as"
 msgstr "Kies Alles"
 
-#: js/messages.php:465 templates/designer/side_menu.phtml:49
-#: templates/designer/side_menu.phtml:52
+#: js/messages.php:465 templates/database/designer/side_menu.phtml:49
+#: templates/database/designer/side_menu.phtml:52
 #, fuzzy
 #| msgctxt "PDF"
 #| msgid "page"
@@ -2421,7 +2427,7 @@ msgstr "Gebruik"
 msgid "Delete page"
 msgstr "Kies Alles"
 
-#: js/messages.php:467 templates/designer/side_menu.phtml:10
+#: js/messages.php:467 templates/database/designer/side_menu.phtml:10
 msgid "Untitled"
 msgstr ""
 
@@ -2541,7 +2547,7 @@ msgstr "Lyne beeindig deur"
 msgid "cancel"
 msgstr ""
 
-#: js/messages.php:499 libraries/server_status.lib.php:271
+#: js/messages.php:499 libraries/server_status.lib.php:280
 msgid "Aborted"
 msgstr ""
 
@@ -3192,7 +3198,7 @@ msgstr ""
 
 #: js/messages.php:793 libraries/Message.class.php:199
 #: libraries/Util.class.php:654 libraries/core.lib.php:245
-#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1172
+#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1170
 #: tbl_operations.php:229 view_operations.php:63
 msgid "Error"
 msgstr "Fout"
@@ -3251,8 +3257,8 @@ msgstr ""
 msgid "per minute"
 msgstr ""
 
-#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:143
-#: libraries/server_status.lib.php:228
+#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:152
+#: libraries/server_status.lib.php:237
 #: libraries/server_status_queries.lib.php:98
 msgid "per hour"
 msgstr ""
@@ -3270,7 +3276,7 @@ msgstr ""
 msgid "Wrong permissions on configuration file, should not be world writable!"
 msgstr ""
 
-#: libraries/Config.class.php:1799
+#: libraries/Config.class.php:1801
 msgid "Font size"
 msgstr ""
 
@@ -3300,10 +3306,10 @@ msgstr "in navraag"
 #: libraries/server_privileges.lib.php:2890
 #: libraries/server_privileges.lib.php:3144
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4332
+#: libraries/server_privileges.lib.php:4358
 #: libraries/server_status_processes.lib.php:80
-#: templates/tbl_relation/foreign_key_row.phtml:165
-#: templates/tbl_relation/internal_relational_row.phtml:55
+#: templates/table/relation/foreign_key_row.phtml:165
+#: templates/table/relation/internal_relational_row.phtml:55
 msgid "Database"
 msgstr "Databasis"
 
@@ -3409,11 +3415,11 @@ msgstr "Ignoreer SQL Validasie"
 #: libraries/plugins/import/ImportMediawiki.class.php:60
 #: libraries/plugins/import/ImportOds.class.php:59
 #: libraries/plugins/import/ImportShp.class.php:57
-#: libraries/plugins/import/ImportSql.class.php:148
+#: libraries/plugins/import/ImportSql.class.php:51
 #: libraries/plugins/import/ImportXml.class.php:58
-#: libraries/rte/rte_routines.lib.php:833 templates/index_form.phtml:49
-#: templates/structure/row_stats_table.phtml:20
-#: templates/table/options.phtml:2
+#: libraries/rte/rte_routines.lib.php:924 templates/table/index_form.phtml:49
+#: templates/table/search/options.phtml:2
+#: templates/table/structure/row_stats_table.phtml:20
 #, fuzzy
 msgid "Options"
 msgstr "Operasies"
@@ -3455,7 +3461,8 @@ msgstr "Dalend"
 msgid "Order:"
 msgstr ""
 
-#: libraries/Console.class.php:289 templates/table/replace_preview.phtml:17
+#: libraries/Console.class.php:289
+#: templates/table/search/replace_preview.phtml:17
 #, fuzzy
 #| msgid "Column names"
 msgid "Count"
@@ -3572,9 +3579,9 @@ msgstr ""
 #: libraries/operations.lib.php:794 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:191
-#: templates/structure/sortable_header.phtml:21
-#: templates/structure/sortable_header.phtml:38
-#: templates/table/options.phtml:68
+#: templates/database/structure/sortable_header.phtml:21
+#: templates/database/structure/sortable_header.phtml:38
+#: templates/table/search/options.phtml:68
 msgid "Ascending"
 msgstr "Dalend"
 
@@ -3584,13 +3591,14 @@ msgstr "Dalend"
 #: libraries/operations.lib.php:797 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:188
-#: templates/structure/sortable_header.phtml:26
-#: templates/structure/sortable_header.phtml:43
-#: templates/table/options.phtml:69
+#: templates/database/structure/sortable_header.phtml:26
+#: templates/database/structure/sortable_header.phtml:43
+#: templates/table/search/options.phtml:69
 msgid "Descending"
 msgstr "Dalend"
 
-#: libraries/DBQbe.class.php:467 templates/table/search_and_replace.phtml:6
+#: libraries/DBQbe.class.php:467
+#: templates/table/search/search_and_replace.phtml:6
 #, fuzzy
 #| msgid "Column names"
 msgid "Column:"
@@ -3775,12 +3783,12 @@ msgstr[0] "%s resultate binne tabel <i>%s</i>"
 msgstr[1] "%s resultate binne tabel <i>%s</i>"
 
 #: libraries/DbSearch.class.php:354 libraries/Menu.class.php:311
-#: libraries/Util.class.php:3337 libraries/Util.class.php:3347
-#: libraries/Util.class.php:3623 libraries/Util.class.php:3624
-#: libraries/Util.class.php:4343 libraries/config.values.php:43
+#: libraries/Util.class.php:3343 libraries/Util.class.php:3353
+#: libraries/Util.class.php:3629 libraries/Util.class.php:3630
+#: libraries/Util.class.php:4349 libraries/config.values.php:43
 #: libraries/config.values.php:51 libraries/config.values.php:119
 #: libraries/navigation/Nodes/Node_Table.class.php:295
-#: templates/structure/check_all_table_column.phtml:5
+#: templates/table/structure/check_all_table_column.phtml:5
 msgid "Browse"
 msgstr "Beloer Data"
 
@@ -3800,7 +3808,8 @@ msgstr "Soek in databasis"
 msgid "Words or values to search for (wildcard: \"%\"):"
 msgstr "Woord(e) of waarde(s) om voor te soek (wildcard: \"%\"):"
 
-#: libraries/DbSearch.class.php:401 templates/table/search_and_replace.phtml:1
+#: libraries/DbSearch.class.php:401
+#: templates/table/search/search_and_replace.phtml:1
 msgid "Find:"
 msgstr "Vind:"
 
@@ -3853,16 +3862,16 @@ msgstr "Velde"
 msgid "Search this table"
 msgstr "Soek in databasis"
 
-#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2532
-#: libraries/Util.class.php:2535
+#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2538
+#: libraries/Util.class.php:2541
 #, fuzzy
 #| msgid "Begin"
 msgctxt "First page"
 msgid "Begin"
 msgstr "Begin"
 
-#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2533
-#: libraries/Util.class.php:2536 libraries/server_bin_log.lib.php:170
+#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2539
+#: libraries/Util.class.php:2542 libraries/server_bin_log.lib.php:170
 #: libraries/server_bin_log.lib.php:172
 #, fuzzy
 #| msgid "Previous"
@@ -3870,8 +3879,8 @@ msgctxt "Previous page"
 msgid "Previous"
 msgstr "Vorige"
 
-#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2564
-#: libraries/Util.class.php:2574 libraries/server_bin_log.lib.php:204
+#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2570
+#: libraries/Util.class.php:2580 libraries/server_bin_log.lib.php:204
 #: libraries/server_bin_log.lib.php:206
 #, fuzzy
 #| msgid "Next"
@@ -3879,8 +3888,8 @@ msgctxt "Next page"
 msgid "Next"
 msgstr "Volgende"
 
-#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2565
-#: libraries/Util.class.php:2575
+#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2571
+#: libraries/Util.class.php:2581
 #, fuzzy
 #| msgid "End"
 msgctxt "Last page"
@@ -3967,15 +3976,15 @@ msgid "May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]."
 msgstr ""
 
 #: libraries/DisplayResults.class.php:4332 libraries/Message.class.php:180
-#: libraries/controllers/TableRelationController.class.php:258
+#: libraries/controllers/TableRelationController.class.php:259
 #: libraries/controllers/TableSearchController.class.php:655
-#: libraries/rte/rte_routines.lib.php:1332 libraries/sql_query_form.lib.php:89
+#: libraries/rte/rte_routines.lib.php:1423 libraries/sql_query_form.lib.php:89
 #: tbl_operations.php:227 tbl_row_action.php:138 view_operations.php:62
 msgid "Your SQL query has been executed successfully."
 msgstr "Jou SQL-navraag is suksesvol uitgevoer."
 
 #: libraries/DisplayResults.class.php:4660
-#: libraries/controllers/StructureController.class.php:629
+#: libraries/controllers/DatabaseStructureController.class.php:564
 #, php-format
 msgid ""
 "This view has at least this number of rows. Please refer to %sdocumentation"
@@ -3999,33 +4008,33 @@ msgstr ""
 msgid "%d total"
 msgstr "totaal"
 
-#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1318
+#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1312
 #, php-format
 msgid "Query took %01.4f seconds."
 msgstr ""
 
 #: libraries/DisplayResults.class.php:4807
-#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4767
-#: libraries/Util.class.php:4773 libraries/mult_submits.inc.php:50
-#: templates/structure/check_all_tables.phtml:2
-#: templates/structure/check_all_tables.phtml:9
+#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4773
+#: libraries/Util.class.php:4779 libraries/mult_submits.inc.php:50
+#: templates/database/structure/check_all_tables.phtml:2
+#: templates/database/structure/check_all_tables.phtml:9
 msgid "With selected:"
 msgstr "Met gekose:"
 
 #: libraries/DisplayResults.class.php:4811
-#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4769
-#: libraries/Util.class.php:4770 libraries/server_privileges.lib.php:1174
+#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4775
+#: libraries/Util.class.php:4776 libraries/server_privileges.lib.php:1174
 #: libraries/server_privileges.lib.php:1175
 #: libraries/server_privileges.lib.php:1387
 #: libraries/server_user_groups.lib.php:231
-#: templates/structure/check_all_tables.phtml:3
-#: templates/structure/check_all_tables.phtml:4
+#: templates/database/structure/check_all_tables.phtml:3
+#: templates/database/structure/check_all_tables.phtml:4
 msgid "Check All"
 msgstr "Kies Alles"
 
 #: libraries/DisplayResults.class.php:4985 libraries/Header.class.php:383
-#: templates/structure/optional_action_links.phtml:1
-#: templates/structure/print_view_data_dictionary_link.phtml:3
+#: templates/database/structure/print_view_data_dictionary_link.phtml:3
+#: templates/table/structure/optional_action_links.phtml:1
 msgid "Print view"
 msgstr "Drukker mooi (print view)"
 
@@ -4033,7 +4042,8 @@ msgstr "Drukker mooi (print view)"
 msgid "Query results operations"
 msgstr ""
 
-#: libraries/DisplayResults.class.php:5105 templates/tbl_chart.phtml:12
+#: libraries/DisplayResults.class.php:5105
+#: templates/table/chart/tbl_chart.phtml:12
 #, fuzzy
 #| msgid "Displaying Column Comments"
 msgid "Display chart"
@@ -4129,7 +4139,7 @@ msgid "Click on the bar to scroll to top of page"
 msgstr ""
 
 #: libraries/Header.class.php:749
-#: libraries/plugins/auth/AuthenticationCookie.class.php:152
+#: libraries/plugins/auth/AuthenticationCookie.class.php:140
 #, fuzzy
 #| msgid "Cookies must be enabled past this point."
 msgid "Javascript must be enabled past this point!"
@@ -4153,11 +4163,11 @@ msgid "Keyname"
 msgstr "Sleutelnaam"
 
 #: libraries/Index.class.php:697
-#: libraries/controllers/StructureController.class.php:1962
-#: libraries/controllers/StructureController.class.php:1967
+#: libraries/controllers/TableStructureController.class.php:953
+#: libraries/controllers/TableStructureController.class.php:958
 #: libraries/tracking.lib.php:973
 #: templates/columns_definitions/column_indexes.phtml:11
-#: templates/structure/check_all_table_column.phtml:26
+#: templates/table/structure/check_all_table_column.phtml:26
 msgid "Unique"
 msgstr "Uniek"
 
@@ -4176,16 +4186,17 @@ msgstr "Cardinality"
 #: libraries/server_collations.lib.php:35 libraries/tracking.lib.php:881
 #: libraries/tracking.lib.php:977
 #: templates/columns_definitions/table_fields_definitions.phtml:33
-#: templates/structure/row_stats_table.phtml:31
-#: templates/structure/table_header.phtml:55
-#: templates/structure/table_structure_header.phtml:7
-#: templates/table/table_header.phtml:8
+#: templates/database/structure/table_header.phtml:55
+#: templates/table/search/table_header.phtml:8
+#: templates/table/structure/row_stats_table.phtml:31
+#: templates/table/structure/table_structure_header.phtml:7
 msgid "Collation"
 msgstr ""
 
 #: libraries/Index.class.php:703 libraries/rte/rte_events.lib.php:496
-#: libraries/rte/rte_routines.lib.php:956 libraries/tracking.lib.php:885
-#: libraries/tracking.lib.php:979 templates/structure/table_header.phtml:84
+#: libraries/rte/rte_routines.lib.php:1047 libraries/tracking.lib.php:885
+#: libraries/tracking.lib.php:979
+#: templates/database/structure/table_header.phtml:84
 #, fuzzy
 msgid "Comment"
 msgstr "Kommentaar"
@@ -4199,15 +4210,15 @@ msgstr "Die primere sleutel is verwyder."
 msgid "Index %s has been dropped."
 msgstr "Indeks %s is verwyder."
 
-#: libraries/Index.class.php:757 libraries/Util.class.php:3630
-#: libraries/Util.class.php:3631
-#: libraries/controllers/StructureController.class.php:1958
-#: libraries/controllers/StructureController.class.php:1959
+#: libraries/Index.class.php:757 libraries/Util.class.php:3636
+#: libraries/Util.class.php:3637
+#: libraries/controllers/TableStructureController.class.php:949
+#: libraries/controllers/TableStructureController.class.php:950
 #: libraries/operations.lib.php:1607 libraries/rte/rte_list.lib.php:150
 #: libraries/server_databases.lib.php:146
-#: templates/structure/check_all_table_column.phtml:15
-#: templates/structure/check_all_tables.phtml:16
-#: templates/tbl_relation/foreign_key_row.phtml:93
+#: templates/database/structure/check_all_tables.phtml:16
+#: templates/table/relation/foreign_key_row.phtml:93
+#: templates/table/structure/check_all_table_column.phtml:15
 msgid "Drop"
 msgstr "Verwyder"
 
@@ -4236,16 +4247,16 @@ msgstr ""
 #: libraries/Menu.class.php:248
 #: libraries/navigation/Nodes/Node_View.class.php:32
 #: libraries/tbl_info.inc.php:63
-#: templates/structure/structure_table_row.phtml:97
-#: templates/structure/structure_table_row.phtml:159
+#: templates/database/structure/structure_table_row.phtml:97
+#: templates/database/structure/structure_table_row.phtml:159
 msgid "View"
 msgstr ""
 
 #: libraries/Menu.class.php:325 libraries/Menu.class.php:429
-#: libraries/Menu.class.php:548 libraries/Util.class.php:3334
-#: libraries/Util.class.php:3344 libraries/Util.class.php:3350
-#: libraries/Util.class.php:4313 libraries/Util.class.php:4328
-#: libraries/Util.class.php:4345 libraries/config.values.php:40
+#: libraries/Menu.class.php:548 libraries/Util.class.php:3340
+#: libraries/Util.class.php:3350 libraries/Util.class.php:3356
+#: libraries/Util.class.php:4319 libraries/Util.class.php:4334
+#: libraries/Util.class.php:4351 libraries/config.values.php:40
 #: libraries/config.values.php:48 libraries/config.values.php:110
 #: libraries/config.values.php:116 libraries/config/messages.inc.php:321
 #: libraries/navigation/Nodes/Node_Table.class.php:292
@@ -4253,19 +4264,19 @@ msgid "SQL"
 msgstr "SQL"
 
 #: libraries/Menu.class.php:328 libraries/Menu.class.php:432
-#: libraries/Util.class.php:3335 libraries/Util.class.php:3345
-#: libraries/Util.class.php:3351 libraries/Util.class.php:3625
-#: libraries/Util.class.php:3626 libraries/Util.class.php:4329
-#: libraries/Util.class.php:4346 libraries/config.values.php:41
+#: libraries/Util.class.php:3341 libraries/Util.class.php:3351
+#: libraries/Util.class.php:3357 libraries/Util.class.php:3631
+#: libraries/Util.class.php:3632 libraries/Util.class.php:4335
+#: libraries/Util.class.php:4352 libraries/config.values.php:41
 #: libraries/config.values.php:49 libraries/config.values.php:111
 #: libraries/config.values.php:117
 #: libraries/navigation/Nodes/Node_Table.class.php:286
 msgid "Search"
 msgstr "Soek"
 
-#: libraries/Menu.class.php:338 libraries/Util.class.php:3336
-#: libraries/Util.class.php:3346 libraries/Util.class.php:3627
-#: libraries/Util.class.php:3628 libraries/Util.class.php:4347
+#: libraries/Menu.class.php:338 libraries/Util.class.php:3342
+#: libraries/Util.class.php:3352 libraries/Util.class.php:3633
+#: libraries/Util.class.php:3634 libraries/Util.class.php:4353
 #: libraries/config.values.php:42 libraries/config.values.php:50
 #: libraries/config.values.php:118
 #: libraries/navigation/Nodes/Node_Table.class.php:289
@@ -4274,30 +4285,30 @@ msgid "Insert"
 msgstr "Voeg by"
 
 #: libraries/Menu.class.php:362 libraries/Menu.class.php:467
-#: libraries/Util.class.php:4334 libraries/Util.class.php:4350
+#: libraries/Util.class.php:4340 libraries/Util.class.php:4356
 #: libraries/config.values.php:106 libraries/server_common.lib.php:51
 #: libraries/server_privileges.lib.php:2370
 #: libraries/server_privileges.lib.php:3158
-#: libraries/server_privileges.lib.php:4221
+#: libraries/server_privileges.lib.php:4247
 msgid "Privileges"
 msgstr "Regte"
 
 #: libraries/Menu.class.php:371 libraries/Menu.class.php:379
-#: libraries/Menu.class.php:459 libraries/Util.class.php:3338
-#: libraries/Util.class.php:3352 libraries/Util.class.php:4333
-#: libraries/Util.class.php:4351 libraries/config.values.php:112
+#: libraries/Menu.class.php:459 libraries/Util.class.php:3344
+#: libraries/Util.class.php:3358 libraries/Util.class.php:4339
+#: libraries/Util.class.php:4357 libraries/config.values.php:112
 #: view_operations.php:92
 msgid "Operations"
 msgstr "Operasies"
 
 #: libraries/Menu.class.php:384 libraries/Menu.class.php:492
-#: libraries/Util.class.php:4338 libraries/Util.class.php:4352
+#: libraries/Util.class.php:4344 libraries/Util.class.php:4358
 #: libraries/relation.lib.php:255
 msgid "Tracking"
 msgstr ""
 
 #: libraries/Menu.class.php:397 libraries/Menu.class.php:486
-#: libraries/Util.class.php:4337 libraries/Util.class.php:4353
+#: libraries/Util.class.php:4343 libraries/Util.class.php:4359
 #: libraries/navigation/Nodes/Node_Trigger_Container.class.php:24
 #: libraries/plugins/export/ExportHtmlword.class.php:557
 #: libraries/plugins/export/ExportOdt.class.php:685
@@ -4314,16 +4325,16 @@ msgstr ""
 msgid "Database seems to be empty!"
 msgstr ""
 
-#: libraries/Menu.class.php:439 libraries/Util.class.php:4330
+#: libraries/Menu.class.php:439 libraries/Util.class.php:4336
 msgid "Query"
 msgstr "Navraag dmv Voorbeeld"
 
-#: libraries/Menu.class.php:472 libraries/Util.class.php:4335
+#: libraries/Menu.class.php:472 libraries/Util.class.php:4341
 #: libraries/rte/rte_words.lib.php:36
 msgid "Routines"
 msgstr ""
 
-#: libraries/Menu.class.php:479 libraries/Util.class.php:4336
+#: libraries/Menu.class.php:479 libraries/Util.class.php:4342
 #: libraries/navigation/Nodes/Node_Event_Container.class.php:26
 #: libraries/plugins/export/ExportSql.class.php:940
 #: libraries/plugins/export/ExportXml.class.php:107
@@ -4331,22 +4342,22 @@ msgstr ""
 msgid "Events"
 msgstr ""
 
-#: libraries/Menu.class.php:498 libraries/Util.class.php:4339
+#: libraries/Menu.class.php:498 libraries/Util.class.php:4345
 msgid "Designer"
 msgstr ""
 
-#: libraries/Menu.class.php:507 libraries/Util.class.php:4340
-#: templates/structure/check_all_tables.phtml:35
+#: libraries/Menu.class.php:507 libraries/Util.class.php:4346
+#: templates/database/structure/check_all_tables.phtml:35
 #, fuzzy
 #| msgid "Add/Delete Field Columns"
 msgid "Central columns"
 msgstr "Voeg By/Verwyder Veld Kolomme"
 
-#: libraries/Menu.class.php:544 libraries/Util.class.php:4312
+#: libraries/Menu.class.php:544 libraries/Util.class.php:4318
 #: libraries/config.values.php:103 libraries/config/messages.inc.php:266
 #: libraries/config/messages.inc.php:341
 #: libraries/navigation/NavigationTree.class.php:1239
-#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4332
+#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4358
 msgid "Databases"
 msgstr "databasisse"
 
@@ -4357,35 +4368,35 @@ msgid "User accounts"
 msgstr "Gebruiker"
 
 #: libraries/Menu.class.php:595 libraries/ServerStatusData.class.php:121
-#: libraries/Util.class.php:4319 libraries/server_common.lib.php:36
+#: libraries/Util.class.php:4325 libraries/server_common.lib.php:36
 #, fuzzy
 msgid "Binary log"
 msgstr "Biner"
 
 #: libraries/Menu.class.php:601 libraries/ServerStatusData.class.php:126
-#: libraries/Util.class.php:4320 libraries/server_common.lib.php:42
-#: templates/structure/body_for_table_summary.phtml:10
-#: templates/structure/table_header.phtml:27
+#: libraries/Util.class.php:4326 libraries/server_common.lib.php:42
+#: templates/database/structure/body_for_table_summary.phtml:10
+#: templates/database/structure/table_header.phtml:27
 msgid "Replication"
 msgstr ""
 
 #: libraries/Menu.class.php:606 libraries/ServerStatusData.class.php:193
-#: libraries/Util.class.php:4321 libraries/config.values.php:105
+#: libraries/Util.class.php:4327 libraries/config.values.php:105
 #: libraries/server_engines.lib.php:108 libraries/server_engines.lib.php:112
 #: libraries/sql_query_form.lib.php:421
 msgid "Variables"
 msgstr ""
 
-#: libraries/Menu.class.php:610 libraries/Util.class.php:4322
+#: libraries/Menu.class.php:610 libraries/Util.class.php:4328
 msgid "Charsets"
 msgstr ""
 
-#: libraries/Menu.class.php:615 libraries/Util.class.php:4323
+#: libraries/Menu.class.php:615 libraries/Util.class.php:4329
 #: libraries/server_common.lib.php:33 libraries/server_plugins.lib.php:27
 msgid "Plugins"
 msgstr ""
 
-#: libraries/Menu.class.php:626 libraries/Util.class.php:4324
+#: libraries/Menu.class.php:626 libraries/Util.class.php:4330
 msgid "Engines"
 msgstr ""
 
@@ -4410,7 +4421,7 @@ msgid_plural "%1$d rows inserted."
 msgstr[0] ""
 msgstr[1] ""
 
-#: libraries/PDF.class.php:70 libraries/Util.class.php:2521
+#: libraries/PDF.class.php:70 libraries/Util.class.php:2527
 #: libraries/browse_foreigners.lib.php:327
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:865
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:890
@@ -4435,7 +4446,7 @@ msgid "Could not save favorite table!"
 msgstr "Dokumentasie"
 
 #: libraries/RecentFavoriteTable.class.php:212
-#: templates/structure/favorite_anchor.phtml:12
+#: templates/database/structure/favorite_anchor.phtml:12
 #, fuzzy
 msgid "Remove from Favorites"
 msgstr "Hernoem tabel na"
@@ -4616,7 +4627,7 @@ msgid ""
 msgstr ""
 
 #: libraries/StorageEngine.class.php:373
-#: templates/structure/body_for_table_summary.phtml:50
+#: templates/database/structure/body_for_table_summary.phtml:50
 #, php-format
 msgid "%s is the default storage engine on this MySQL server."
 msgstr ""
@@ -5040,10 +5051,10 @@ msgstr ""
 
 #: libraries/Util.class.php:726 libraries/rte/rte_events.lib.php:110
 #: libraries/rte/rte_events.lib.php:119 libraries/rte/rte_events.lib.php:150
-#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:153
-#: libraries/rte/rte_routines.lib.php:162
-#: libraries/rte/rte_routines.lib.php:235
-#: libraries/rte/rte_routines.lib.php:1366
+#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:223
+#: libraries/rte/rte_routines.lib.php:250
+#: libraries/rte/rte_routines.lib.php:372
+#: libraries/rte/rte_routines.lib.php:1457
 #: libraries/rte/rte_triggers.lib.php:86 libraries/rte/rte_triggers.lib.php:95
 #: libraries/rte/rte_triggers.lib.php:127
 msgid "MySQL said: "
@@ -5089,76 +5100,79 @@ msgstr "So"
 msgid "%B %d, %Y at %I:%M %p"
 msgstr ""
 
-#: libraries/Util.class.php:2019
+#: libraries/Util.class.php:2025
 #, php-format
 msgid "%s days, %s hours, %s minutes and %s seconds"
 msgstr ""
 
-#: libraries/Util.class.php:2112
+#: libraries/Util.class.php:2118
 msgid "Missing parameter:"
 msgstr ""
 
-#: libraries/Util.class.php:2645
+#: libraries/Util.class.php:2651
 #, php-format
 msgid "Jump to database \"%s\"."
 msgstr ""
 
-#: libraries/Util.class.php:2670
+#: libraries/Util.class.php:2676
 #, php-format
 msgid "The %s functionality is affected by a known bug, see %s"
 msgstr ""
 
-#: libraries/Util.class.php:2881
+#: libraries/Util.class.php:2887
 msgid "Click to toggle"
 msgstr ""
 
-#: libraries/Util.class.php:3542 prefs_manage.php:248
+#: libraries/Util.class.php:3548 prefs_manage.php:248
 msgid "Browse your computer:"
 msgstr ""
 
-#: libraries/Util.class.php:3567
+#: libraries/Util.class.php:3573
 #, php-format
 msgid "Select from the web server upload directory <b>%s</b>:"
 msgstr ""
 
-#: libraries/Util.class.php:3596 libraries/insert_edit.lib.php:1173
+#: libraries/Util.class.php:3602 libraries/insert_edit.lib.php:1171
 msgid "The directory you set for upload work cannot be reached."
 msgstr ""
 
-#: libraries/Util.class.php:3607
+#: libraries/Util.class.php:3613
 msgid "There are no files to upload!"
 msgstr ""
 
-#: libraries/Util.class.php:3632 libraries/Util.class.php:3633
-#: templates/structure/check_all_tables.phtml:15
+#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: templates/database/structure/check_all_tables.phtml:15
 msgid "Empty"
 msgstr "Maak Leeg"
 
-#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: libraries/Util.class.php:3644 libraries/Util.class.php:3645
 msgid "Execute"
 msgstr ""
 
-#: libraries/Util.class.php:4152
+#: libraries/Util.class.php:4158
 msgid "Print"
 msgstr ""
 
-#: libraries/Util.class.php:4257 templates/structure/row_stats_table.phtml:80
-#: templates/structure/table_header.phtml:95
+#: libraries/Util.class.php:4263
+#: templates/database/structure/table_header.phtml:95
+#: templates/table/structure/row_stats_table.phtml:80
 #, fuzzy
 msgid "Creation"
 msgstr "Skep"
 
-#: libraries/Util.class.php:4263 templates/structure/row_stats_table.phtml:87
-#: templates/structure/table_header.phtml:106
+#: libraries/Util.class.php:4269
+#: templates/database/structure/table_header.phtml:106
+#: templates/table/structure/row_stats_table.phtml:87
 msgid "Last update"
 msgstr ""
 
-#: libraries/Util.class.php:4269 templates/structure/row_stats_table.phtml:94
-#: templates/structure/table_header.phtml:117
+#: libraries/Util.class.php:4275
+#: templates/database/structure/table_header.phtml:117
+#: templates/table/structure/row_stats_table.phtml:94
 msgid "Last check"
 msgstr ""
 
-#: libraries/Util.class.php:4315
+#: libraries/Util.class.php:4321
 #, fuzzy
 #| msgid "User"
 msgid "Users"
@@ -5184,16 +5198,16 @@ msgid "Use this value"
 msgstr ""
 
 #: libraries/build_html_for_db.lib.php:33 libraries/import.lib.php:193
-#: templates/structure/actions_in_table_structure.phtml:113
-#: templates/structure/row_stats_table.phtml:42
-#: templates/structure/table_header.phtml:36
+#: templates/database/structure/table_header.phtml:36
+#: templates/table/structure/actions_in_table_structure.phtml:113
+#: templates/table/structure/row_stats_table.phtml:42
 msgid "Rows"
 msgstr "Rye"
 
 #: libraries/build_html_for_db.lib.php:48 libraries/engines/innodb.lib.php:171
-#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:186
-#: libraries/server_status.lib.php:298
-#: templates/structure/display_table_stats.phtml:40
+#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:195
+#: libraries/server_status.lib.php:307
+#: templates/table/structure/display_table_stats.phtml:40
 #, fuzzy
 msgid "Total"
 msgstr "totaal"
@@ -5204,10 +5218,12 @@ msgid "Jump to database"
 msgstr "Geen databasisse"
 
 #: libraries/build_html_for_db.lib.php:146
+#: templates/database/structure/structure_table_row.phtml:15
 msgid "Not replicated"
 msgstr ""
 
 #: libraries/build_html_for_db.lib.php:158
+#: templates/database/structure/structure_table_row.phtml:16
 msgid "Replicated"
 msgstr ""
 
@@ -5264,17 +5280,17 @@ msgstr ""
 #: libraries/plugins/export/ExportTexytext.class.php:425
 #: libraries/plugins/export/PMA_ExportPdf.class.php:307
 #: libraries/rte/rte_list.lib.php:73 libraries/rte/rte_list.lib.php:85
-#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:830
-#: libraries/rte/rte_routines.lib.php:1492 setup/frames/index.inc.php:162
+#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:921
+#: libraries/rte/rte_routines.lib.php:1583 setup/frames/index.inc.php:162
 #: templates/columns_definitions/table_fields_definitions.phtml:8
-#: templates/structure/table_structure_header.phtml:5
-#: templates/table/create_table.phtml:11
+#: templates/database/create_table.phtml:11
+#: templates/table/structure/table_structure_header.phtml:5
 msgid "Name"
 msgstr "Naam"
 
 #: libraries/central_columns.lib.php:699
 #: libraries/central_columns.lib.php:1381
-#: libraries/rte/rte_routines.lib.php:832
+#: libraries/rte/rte_routines.lib.php:923
 #: templates/columns_definitions/table_fields_definitions.phtml:14
 msgid "Length/Values"
 msgstr "Lengte/Waardes*"
@@ -5297,7 +5313,7 @@ msgid "Select a table"
 msgstr "Kies Tabelle"
 
 #: libraries/central_columns.lib.php:804
-#: templates/structure/add_column.phtml:4
+#: templates/table/structure/add_column.phtml:4
 #, fuzzy
 msgid "Add column"
 msgstr "Voeg 'n nuwe veld by"
@@ -5317,7 +5333,7 @@ msgstr "Voeg 'n nuwe veld by"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1002
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1025
 #: templates/columns_definitions/table_fields_definitions.phtml:36
-#: templates/structure/table_structure_header.phtml:8
+#: templates/table/structure/table_structure_header.phtml:8
 msgid "Attributes"
 msgstr "Kenmerke"
 
@@ -5436,7 +5452,7 @@ msgid "Double click"
 msgstr ""
 
 #: libraries/config.values.php:95 libraries/config.values.php:124
-#: libraries/config/FormDisplay.tpl.php:221 libraries/relation.lib.php:97
+#: libraries/config/FormDisplay.tpl.php:232 libraries/relation.lib.php:97
 #: libraries/relation.lib.php:105
 msgid "Disabled"
 msgstr "Onbeskikbaar"
@@ -5625,21 +5641,21 @@ msgstr ""
 msgid "maximum %s"
 msgstr ""
 
-#: libraries/config/FormDisplay.tpl.php:219
+#: libraries/config/FormDisplay.tpl.php:230
 msgid "This setting is disabled, it will not be applied to your configuration."
 msgstr ""
 
-#: libraries/config/FormDisplay.tpl.php:313
+#: libraries/config/FormDisplay.tpl.php:324
 #, php-format
 msgid "Set value: %s"
 msgstr ""
 
-#: libraries/config/FormDisplay.tpl.php:318
+#: libraries/config/FormDisplay.tpl.php:329
 #: libraries/config/messages.inc.php:610
 msgid "Restore default value"
 msgstr ""
 
-#: libraries/config/FormDisplay.tpl.php:332
+#: libraries/config/FormDisplay.tpl.php:343
 msgid "Allow users to customize this value"
 msgstr ""
 
@@ -6070,7 +6086,7 @@ msgstr "Karakterstel van die leer:"
 
 #: libraries/config/messages.inc.php:136 libraries/config/messages.inc.php:152
 #: libraries/sql_query_form.lib.php:247
-#: templates/structure/row_stats_table.phtml:7
+#: templates/table/structure/row_stats_table.phtml:7
 msgid "Format"
 msgstr "Formaat"
 
@@ -6611,7 +6627,7 @@ msgstr ""
 
 #: libraries/config/messages.inc.php:332
 #: libraries/plugins/export/ExportPdf.class.php:279
-#: templates/structure/secondary_tabs.phtml:8
+#: templates/table/secondary_tabs.phtml:8
 #, fuzzy
 #| msgid "Databases"
 msgid "Table structure"
@@ -8201,107 +8217,34 @@ msgstr ""
 msgid "OpenDocument Text"
 msgstr "Dokumentasie"
 
-#: libraries/controllers/StructureController.class.php:465
+#: libraries/controllers/DatabaseStructureController.class.php:405
 #: tbl_operations.php:382
 #, php-format
 msgid "Table %s has been emptied."
 msgstr "Tabel %s is leeg gemaak."
 
-#: libraries/controllers/StructureController.class.php:486
+#: libraries/controllers/DatabaseStructureController.class.php:426
 #: tbl_operations.php:400 view_operations.php:119
 #, fuzzy, php-format
 msgid "View %s has been dropped."
 msgstr "Veld %s is verwyder"
 
-#: libraries/controllers/StructureController.class.php:487
+#: libraries/controllers/DatabaseStructureController.class.php:427
 #: tbl_operations.php:401
 #, fuzzy, php-format
 #| msgid "Table %s has been dropped."
 msgid "Table %s has been dropped."
 msgstr "Tabel %s is verwyder"
 
-#: libraries/controllers/StructureController.class.php:797
-#, php-format
-msgid "The name '%s' is a MySQL reserved keyword."
-msgid_plural "The names '%s' are MySQL reserved keywords."
-msgstr[0] ""
-msgstr[1] ""
-
-#: libraries/controllers/StructureController.class.php:875
-msgid "No column selected."
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1049
+#: libraries/controllers/DatabaseStructureController.class.php:733
 msgid "Favorite List is full!"
 msgstr ""
 
-#: libraries/controllers/StructureController.class.php:1272
-#, fuzzy
-#| msgid "Database %s has been dropped."
-msgid "The columns have been moved successfully."
-msgstr "Databasis %s is verwyder."
-
-#: libraries/controllers/StructureController.class.php:1535
-#, fuzzy, php-format
-#| msgid "Table %s has been moved to %s."
-msgid ""
-"Table %1$s has been altered successfully. Privileges have been adjusted."
-msgstr "Tabel %s is geskuif na %s."
-
-#: libraries/controllers/StructureController.class.php:1541
-#: libraries/controllers/TableIndexesController.class.php:161
-#: tbl_addfield.php:92
-#, php-format
-msgid "Table %1$s has been altered successfully."
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1588
-#: libraries/tracking.lib.php:1094
-#, fuzzy
-#| msgid "Query"
-msgid "Query error"
-msgstr "Navraag dmv Voorbeeld"
-
-#: libraries/controllers/StructureController.class.php:1806
+#: libraries/controllers/DatabaseStructureController.class.php:947
 #: libraries/mysql_charsets.lib.php:366 libraries/mysql_charsets.lib.php:373
 msgid "unknown"
 msgstr ""
 
-#: libraries/controllers/StructureController.class.php:1957
-#: templates/structure/check_all_table_column.phtml:11
-msgid "Change"
-msgstr "Verander"
-
-#: libraries/controllers/StructureController.class.php:1961
-#: libraries/controllers/StructureController.class.php:1966
-#: libraries/navigation/Nodes/Node_Index.class.php:30
-#: libraries/tracking.lib.php:926
-#: templates/columns_definitions/column_indexes.phtml:16
-#: templates/columns_definitions/table_fields_definitions.phtml:57
-#: templates/structure/check_all_table_column.phtml:30
-#: templates/structure/display_structure.phtml:79
-#: templates/structure/display_table_stats.phtml:19
-msgid "Index"
-msgstr "Indeks"
-
-#: libraries/controllers/StructureController.class.php:1963
-#: libraries/controllers/StructureController.class.php:1968
-#: templates/columns_definitions/column_indexes.phtml:27
-#: templates/structure/check_all_table_column.phtml:37
-msgid "Spatial"
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1964
-#: libraries/controllers/StructureController.class.php:1969
-#: templates/columns_definitions/column_indexes.phtml:22
-#: templates/structure/check_all_table_column.phtml:47
-msgid "Fulltext"
-msgstr "Volteks"
-
-#: libraries/controllers/StructureController.class.php:1970
-msgid "Distinct values"
-msgstr ""
-
 #: libraries/controllers/TableChartController.class.php:82
 #: libraries/controllers/TableGisVisualizationController.class.php:101
 msgid "No SQL query was set to fetch data."
@@ -8317,11 +8260,18 @@ msgstr ""
 msgid "No data to display"
 msgstr "Geen databasisse"
 
-#: libraries/controllers/TableRelationController.class.php:217
+#: libraries/controllers/TableIndexesController.class.php:161
+#: libraries/controllers/TableStructureController.class.php:736
+#: tbl_addfield.php:92
+#, php-format
+msgid "Table %1$s has been altered successfully."
+msgstr ""
+
+#: libraries/controllers/TableRelationController.class.php:218
 msgid "Display column was successfully updated."
 msgstr ""
 
-#: libraries/controllers/TableRelationController.class.php:283
+#: libraries/controllers/TableRelationController.class.php:288
 #, fuzzy
 msgid "Internal relations were successfully updated."
 msgstr "Algemene verwantskap funksies"
@@ -8339,11 +8289,77 @@ msgid "Zoom search"
 msgstr "Soek"
 
 #: libraries/controllers/TableSearchController.class.php:852
-#: templates/table/selection_form.phtml:59
+#: templates/table/search/selection_form.phtml:59
 #, fuzzy
 msgid "Find and replace"
 msgstr "SQL-stelling"
 
+#: libraries/controllers/TableStructureController.class.php:163
+#, php-format
+msgid "The name '%s' is a MySQL reserved keyword."
+msgid_plural "The names '%s' are MySQL reserved keywords."
+msgstr[0] ""
+msgstr[1] ""
+
+#: libraries/controllers/TableStructureController.class.php:241
+msgid "No column selected."
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:467
+#, fuzzy
+#| msgid "Database %s has been dropped."
+msgid "The columns have been moved successfully."
+msgstr "Databasis %s is verwyder."
+
+#: libraries/controllers/TableStructureController.class.php:730
+#, fuzzy, php-format
+#| msgid "Table %s has been moved to %s."
+msgid ""
+"Table %1$s has been altered successfully. Privileges have been adjusted."
+msgstr "Tabel %s is geskuif na %s."
+
+#: libraries/controllers/TableStructureController.class.php:783
+#: libraries/tracking.lib.php:1094
+#, fuzzy
+#| msgid "Query"
+msgid "Query error"
+msgstr "Navraag dmv Voorbeeld"
+
+#: libraries/controllers/TableStructureController.class.php:948
+#: templates/table/structure/check_all_table_column.phtml:11
+msgid "Change"
+msgstr "Verander"
+
+#: libraries/controllers/TableStructureController.class.php:952
+#: libraries/controllers/TableStructureController.class.php:957
+#: libraries/navigation/Nodes/Node_Index.class.php:30
+#: libraries/tracking.lib.php:926
+#: templates/columns_definitions/column_indexes.phtml:16
+#: templates/columns_definitions/table_fields_definitions.phtml:57
+#: templates/table/structure/check_all_table_column.phtml:30
+#: templates/table/structure/display_structure.phtml:79
+#: templates/table/structure/display_table_stats.phtml:19
+msgid "Index"
+msgstr "Indeks"
+
+#: libraries/controllers/TableStructureController.class.php:954
+#: libraries/controllers/TableStructureController.class.php:959
+#: templates/columns_definitions/column_indexes.phtml:27
+#: templates/table/structure/check_all_table_column.phtml:37
+msgid "Spatial"
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:955
+#: libraries/controllers/TableStructureController.class.php:960
+#: templates/columns_definitions/column_indexes.phtml:22
+#: templates/table/structure/check_all_table_column.phtml:47
+msgid "Fulltext"
+msgstr "Volteks"
+
+#: libraries/controllers/TableStructureController.class.php:963
+msgid "Distinct values"
+msgstr ""
+
 #: libraries/core.lib.php:306
 #, php-format
 msgid "The %s extension is missing. Please check your PHP configuration."
@@ -8388,7 +8404,7 @@ msgid "No Password"
 msgstr "Geen Wagwoord"
 
 #: libraries/display_change_password.lib.php:68
-#: libraries/plugins/auth/AuthenticationCookie.class.php:199
+#: libraries/plugins/auth/AuthenticationCookie.class.php:187
 #: libraries/replication_gui.lib.php:422 libraries/replication_gui.lib.php:862
 #: libraries/server_privileges.lib.php:1640
 msgid "Password:"
@@ -9177,12 +9193,12 @@ msgid "Dump has been saved to file %s."
 msgstr ""
 
 #: libraries/import.lib.php:202 libraries/insert_edit.lib.php:124
-#: libraries/rte/rte_routines.lib.php:1353 libraries/sql.lib.php:1312
+#: libraries/rte/rte_routines.lib.php:1444 libraries/sql.lib.php:1306
 #: tbl_get_field.php:44
 msgid "MySQL returned an empty result set (i.e. zero rows)."
 msgstr "MySQL het niks teruggegee nie (dus nul rye)."
 
-#: libraries/import.lib.php:265 libraries/sql.lib.php:1326
+#: libraries/import.lib.php:265 libraries/sql.lib.php:1320
 msgid "[ROLLBACK occurred.]"
 msgstr ""
 
@@ -9248,14 +9264,14 @@ msgstr "Skep 'n indeks op&nbsp;%s&nbsp;kolomme"
 
 #: libraries/insert_edit.lib.php:233
 #: libraries/navigation/Nodes/Node_DatabaseChild.class.php:48
-#: templates/designer/table_list.phtml:40
+#: templates/database/designer/table_list.phtml:40
 msgid "Hide"
 msgstr ""
 
 #: libraries/insert_edit.lib.php:249
 #: libraries/navigation/Nodes/Node_Function.class.php:32
-#: libraries/rte/rte_routines.lib.php:1495
-#: templates/table/table_header.phtml:4
+#: libraries/rte/rte_routines.lib.php:1586
+#: templates/table/search/table_header.phtml:4
 msgid "Function"
 msgstr "Funksie"
 
@@ -9271,85 +9287,86 @@ msgid "Because of its length,<br /> this column might not be editable."
 msgstr ""
 " Omrede sy lengte,<br /> is hierdie veld moontlik nie veranderbaar nie "
 
-#: libraries/insert_edit.lib.php:1050
+#: libraries/insert_edit.lib.php:1048
 msgid "Binary - do not edit"
 msgstr "Biner - moenie verander nie"
 
-#: libraries/insert_edit.lib.php:1176 libraries/server_privileges.lib.php:470
-#: templates/table/options.phtml:36
+#: libraries/insert_edit.lib.php:1174 libraries/server_privileges.lib.php:470
+#: templates/table/search/options.phtml:36
 msgid "Or"
 msgstr "Of"
 
-#: libraries/insert_edit.lib.php:1177
+#: libraries/insert_edit.lib.php:1175
 msgid "web server upload directory:"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1348 templates/table/input_box.phtml:49
+#: libraries/insert_edit.lib.php:1346
+#: templates/table/search/input_box.phtml:49
 #, fuzzy
 #| msgid "Insert"
 msgid "Edit/Insert"
 msgstr "Voeg by"
 
-#: libraries/insert_edit.lib.php:1398
+#: libraries/insert_edit.lib.php:1396
 #, php-format
 msgid "Continue insertion with %s rows"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1428
+#: libraries/insert_edit.lib.php:1426
 msgid "and then"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1461
+#: libraries/insert_edit.lib.php:1459
 msgid "Insert as new row"
 msgstr "Voeg by as 'n nuwe ry"
 
-#: libraries/insert_edit.lib.php:1464
+#: libraries/insert_edit.lib.php:1462
 msgid "Insert as new row and ignore errors"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1467
+#: libraries/insert_edit.lib.php:1465
 msgid "Show insert query"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1487
+#: libraries/insert_edit.lib.php:1485
 msgid "Go back to previous page"
 msgstr "Terug na vorige bladsy"
 
-#: libraries/insert_edit.lib.php:1490
+#: libraries/insert_edit.lib.php:1488
 msgid "Insert another new row"
 msgstr "Voeg 'n nuwe ry by"
 
-#: libraries/insert_edit.lib.php:1495
+#: libraries/insert_edit.lib.php:1493
 #, fuzzy
 msgid "Go back to this page"
 msgstr "Terug na vorige bladsy"
 
-#: libraries/insert_edit.lib.php:1518
+#: libraries/insert_edit.lib.php:1516
 msgid "Edit next row"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1540
+#: libraries/insert_edit.lib.php:1538
 msgid ""
 "Use TAB key to move from value to value, or CTRL+arrows to move anywhere"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1577 libraries/replication_gui.lib.php:542
-#: libraries/rte/rte_routines.lib.php:1497
+#: libraries/insert_edit.lib.php:1575 libraries/replication_gui.lib.php:542
+#: libraries/rte/rte_routines.lib.php:1588
 #: libraries/server_status_variables.lib.php:220
-#: templates/designer/having_query_panel.phtml:100
-#: templates/designer/options_panel.phtml:73
-#: templates/designer/options_panel.phtml:239
-#: templates/designer/where_query_panel.phtml:69
-#: templates/table/table_header.phtml:10
-#: templates/table/zoom_result_form.phtml:35
+#: templates/database/designer/having_query_panel.phtml:100
+#: templates/database/designer/options_panel.phtml:73
+#: templates/database/designer/options_panel.phtml:239
+#: templates/database/designer/where_query_panel.phtml:69
+#: templates/table/search/table_header.phtml:10
+#: templates/table/search/zoom_result_form.phtml:35
 msgid "Value"
 msgstr "Waarde"
 
-#: libraries/insert_edit.lib.php:1937 libraries/sql.lib.php:1309
+#: libraries/insert_edit.lib.php:1935 libraries/sql.lib.php:1303
 msgid "Showing SQL query"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1962 libraries/sql.lib.php:1287
+#: libraries/insert_edit.lib.php:1960 libraries/sql.lib.php:1281
 #, php-format
 msgid "Inserted row id: %1$d"
 msgstr ""
@@ -9788,7 +9805,7 @@ msgstr ""
 #: libraries/navigation/Nodes/Node_View_Container.class.php:26
 #: libraries/navigation/Nodes/Node_View_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:129
-#: templates/structure/show_create.phtml:30
+#: templates/database/structure/show_create.phtml:30
 msgid "Views"
 msgstr ""
 
@@ -10090,7 +10107,7 @@ msgstr "Jy het nie genoeg regte om nou hier te wees nie!"
 
 #: libraries/operations.lib.php:101 libraries/operations.lib.php:249
 #: libraries/operations.lib.php:869 libraries/operations.lib.php:963
-#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:907
+#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:998
 #: templates/columns_definitions/table_fields_definitions.phtml:47
 #, fuzzy
 #| msgid "Edit Privileges"
@@ -10185,22 +10202,22 @@ msgid "Switch to copied table"
 msgstr ""
 
 #: libraries/operations.lib.php:1360
-#: templates/structure/check_all_tables.phtml:18
+#: templates/database/structure/check_all_tables.phtml:18
 msgid "Table maintenance"
 msgstr "Tabel instandhouding"
 
 #: libraries/operations.lib.php:1398
-#: templates/structure/check_all_tables.phtml:19
+#: templates/database/structure/check_all_tables.phtml:19
 msgid "Analyze table"
 msgstr "Analiseer tabel"
 
 #: libraries/operations.lib.php:1413
-#: templates/structure/check_all_tables.phtml:20
+#: templates/database/structure/check_all_tables.phtml:20
 msgid "Check table"
 msgstr "Kontroleer tabel"
 
 #: libraries/operations.lib.php:1428
-#: templates/structure/check_all_tables.phtml:22
+#: templates/database/structure/check_all_tables.phtml:22
 #, fuzzy
 #| msgid "Check table"
 msgid "Checksum table"
@@ -10222,18 +10239,19 @@ msgid "Flush the table (FLUSH)"
 msgstr "Spoel die tabel (\"FLUSH\")"
 
 #: libraries/operations.lib.php:1477
-#: templates/structure/check_all_tables.phtml:23
-#: templates/structure/display_table_stats.phtml:56
+#: templates/database/structure/check_all_tables.phtml:23
+#: templates/table/structure/display_table_stats.phtml:56
 msgid "Optimize table"
 msgstr "Optimaliseer tabel"
 
 #: libraries/operations.lib.php:1492
-#: templates/structure/check_all_tables.phtml:24
+#: templates/database/structure/check_all_tables.phtml:24
 msgid "Repair table"
 msgstr "Herstel tabel"
 
 #: libraries/operations.lib.php:1538
-#: templates/structure/check_all_tables.phtml:14 view_operations.php:127
+#: templates/database/structure/check_all_tables.phtml:14
+#: view_operations.php:127
 #, fuzzy
 #| msgid "Dumping data for table"
 msgid "Delete data or table"
@@ -10362,7 +10380,7 @@ msgid "Cannot connect: invalid settings."
 msgstr ""
 
 #: libraries/plugins/auth/AuthenticationConfig.class.php:108
-#: libraries/plugins/auth/AuthenticationCookie.class.php:134
+#: libraries/plugins/auth/AuthenticationCookie.class.php:122
 #: libraries/plugins/auth/AuthenticationHttp.class.php:96
 #, php-format
 msgid "Welcome to %s"
@@ -10387,38 +10405,38 @@ msgstr ""
 msgid "Retry to connect"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:146
+#: libraries/plugins/auth/AuthenticationCookie.class.php:134
 msgid "Your session has expired. Please log in again."
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:170
+#: libraries/plugins/auth/AuthenticationCookie.class.php:158
 msgid "Log in"
 msgstr "Teken aan"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:178
-#: libraries/plugins/auth/AuthenticationCookie.class.php:188
+#: libraries/plugins/auth/AuthenticationCookie.class.php:166
+#: libraries/plugins/auth/AuthenticationCookie.class.php:176
 msgid "You can enter hostname/IP address and port separated by space."
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:193
+#: libraries/plugins/auth/AuthenticationCookie.class.php:181
 msgid "Username:"
 msgstr "Gebruiker Naam:"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:205
+#: libraries/plugins/auth/AuthenticationCookie.class.php:193
 #, fuzzy
 #| msgid "Server Choice"
 msgid "Server Choice:"
 msgstr "Bediener Keuse"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:386
+#: libraries/plugins/auth/AuthenticationCookie.class.php:374
 msgid "Entered captcha is wrong, try again!"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:396
+#: libraries/plugins/auth/AuthenticationCookie.class.php:384
 msgid "Please enter correct captcha!"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:423
+#: libraries/plugins/auth/AuthenticationCookie.class.php:411
 #, fuzzy
 msgid "You are not allowed to log in to this MySQL server!"
 msgstr "Limits the number of new connections the user may open per hour."
@@ -10524,7 +10542,7 @@ msgstr ""
 #: libraries/plugins/export/ExportOdt.class.php:593
 #: libraries/plugins/export/ExportTexytext.class.php:428
 #: libraries/plugins/export/PMA_ExportPdf.class.php:313
-#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:984
 #: libraries/rte/rte_triggers.lib.php:377
 #, fuzzy
 msgid "Definition"
@@ -10863,7 +10881,7 @@ msgid "Last check:"
 msgstr "Vorige inspeksie:"
 
 #: libraries/plugins/export/ExportSql.class.php:1399
-#: templates/structure/structure_table_row.phtml:183
+#: templates/database/structure/structure_table_row.phtml:183
 msgid "in use"
 msgstr "in gebruik"
 
@@ -11053,18 +11071,14 @@ msgstr ""
 msgid "The imported file does not contain any data!"
 msgstr ""
 
-#: libraries/plugins/import/ImportSql.class.php:169
+#: libraries/plugins/import/ImportSql.class.php:72
 msgid "SQL compatibility mode:"
 msgstr ""
 
-#: libraries/plugins/import/ImportSql.class.php:181
+#: libraries/plugins/import/ImportSql.class.php:84
 msgid "Do not use <code>AUTO_INCREMENT</code> for zero values"
 msgstr ""
 
-#: libraries/plugins/import/ImportSql.class.php:195
-msgid "Read as multibytes"
-msgstr ""
-
 #: libraries/plugins/import/ImportXml.class.php:54
 msgid "XML"
 msgstr ""
@@ -11109,7 +11123,7 @@ msgid "Show grid"
 msgstr "Wys ruitgebied"
 
 #: libraries/plugins/schema/SchemaPdf.class.php:94
-#: templates/structure/print_view_data_dictionary_link.phtml:6
+#: templates/database/structure/print_view_data_dictionary_link.phtml:6
 msgid "Data Dictionary"
 msgstr ""
 
@@ -11141,7 +11155,7 @@ msgid "The %s table doesn't exist!"
 msgstr "Die \"%s\" databasis bestaan nie!"
 
 #: libraries/plugins/schema/eps/Eps_Relation_Schema.class.php:321
-#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:309
+#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:323
 #, fuzzy, php-format
 #| msgid "Schema of the \"%s\" database - Page %s"
 msgid "Schema of the %s database - Page %s"
@@ -11172,7 +11186,7 @@ msgstr "Tabel kommentaar"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1005
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1028
 #: libraries/tracking.lib.php:884
-#: templates/structure/table_structure_header.phtml:11
+#: templates/table/structure/table_structure_header.phtml:11
 msgid "Extra"
 msgstr "Ekstra"
 
@@ -11505,51 +11519,51 @@ msgstr ""
 msgid "Create the needed tables with the <code>%screate_tables.sql</code>."
 msgstr ""
 
-#: libraries/relation.lib.php:360
+#: libraries/relation.lib.php:357
 msgid "Create a pma user and give access to these tables."
 msgstr ""
 
-#: libraries/relation.lib.php:365
+#: libraries/relation.lib.php:360
 msgid ""
 "Enable advanced features in configuration file (<code>config.inc.php</"
 "code>), for example by starting from <code>config.sample.inc.php</code>."
 msgstr ""
 
-#: libraries/relation.lib.php:373
+#: libraries/relation.lib.php:365
 msgid "Re-login to phpMyAdmin to load the updated configuration file."
 msgstr ""
 
-#: libraries/relation.lib.php:1612
+#: libraries/relation.lib.php:1607
 msgid "no description"
 msgstr "geen Beskrywing"
 
-#: libraries/relation.lib.php:1811
+#: libraries/relation.lib.php:1806
 msgid ""
 "You do not have necessary privileges to create a database named "
 "'phpmyadmin'. You may go to 'Operations' tab of any database to set up the "
 "phpMyAdmin configuration storage there."
 msgstr ""
 
-#: libraries/relation.lib.php:1928
+#: libraries/relation.lib.php:1923
 #, php-format
 msgid ""
 "%sCreate%s a database named 'phpmyadmin' and setup the phpMyAdmin "
 "configuration storage there."
 msgstr ""
 
-#: libraries/relation.lib.php:1936
+#: libraries/relation.lib.php:1931
 #, php-format
 msgid ""
 "%sCreate%s the phpMyAdmin configuration storage in the current database."
 msgstr ""
 
-#: libraries/relation.lib.php:1944
+#: libraries/relation.lib.php:1939
 #, php-format
 msgid "%sCreate%s missing phpMyAdmin configuration storage tables."
 msgstr ""
 
 #: libraries/replication_gui.lib.php:46 libraries/replication_gui.lib.php:343
-#: libraries/server_databases.lib.php:387
+#: libraries/server_databases.lib.php:398
 msgid "Master replication"
 msgstr ""
 
@@ -11605,7 +11619,7 @@ msgid ""
 msgstr ""
 
 #: libraries/replication_gui.lib.php:141
-#: libraries/server_databases.lib.php:389
+#: libraries/server_databases.lib.php:400
 msgid "Slave replication"
 msgstr ""
 
@@ -11881,10 +11895,10 @@ msgid "Master server changed successfully to %s."
 msgstr ""
 
 #: libraries/rte/rte_events.lib.php:106 libraries/rte/rte_events.lib.php:115
-#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:149
-#: libraries/rte/rte_routines.lib.php:158
-#: libraries/rte/rte_routines.lib.php:231
-#: libraries/rte/rte_routines.lib.php:1362
+#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:219
+#: libraries/rte/rte_routines.lib.php:246
+#: libraries/rte/rte_routines.lib.php:368
+#: libraries/rte/rte_routines.lib.php:1453
 #: libraries/rte/rte_triggers.lib.php:82 libraries/rte/rte_triggers.lib.php:91
 #: libraries/rte/rte_triggers.lib.php:123
 #, php-format
@@ -11906,7 +11920,7 @@ msgstr "Tabel %s is verwyder"
 msgid "Event %1$s has been created."
 msgstr "Tabel %s is verwyder"
 
-#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:251
+#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:266
 #: libraries/rte/rte_triggers.lib.php:144
 msgid "One or more errors have occurred while processing your request:"
 msgstr ""
@@ -11916,7 +11930,7 @@ msgstr ""
 msgid "Edit event"
 msgstr "Voeg 'n nuwe gebruiker by"
 
-#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:794
+#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:885
 #: libraries/rte/rte_triggers.lib.php:323 view_create.php:180
 msgid "Details"
 msgstr ""
@@ -11931,7 +11945,7 @@ msgstr "Gebruiker naam"
 msgid "Event type"
 msgstr ""
 
-#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:817
+#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:908
 #, fuzzy, php-format
 #| msgid "Change"
 msgid "Change to %s"
@@ -11965,12 +11979,14 @@ msgstr "Einde"
 msgid "On completion preserve"
 msgstr "Voltooi invoegings"
 
-#: libraries/rte/rte_events.lib.php:491 libraries/rte/rte_routines.lib.php:930
+#: libraries/rte/rte_events.lib.php:491
+#: libraries/rte/rte_routines.lib.php:1021
 #: libraries/rte/rte_triggers.lib.php:383 view_create.php:209
 msgid "Definer"
 msgstr ""
 
-#: libraries/rte/rte_events.lib.php:535 libraries/rte/rte_routines.lib.php:997
+#: libraries/rte/rte_events.lib.php:535
+#: libraries/rte/rte_routines.lib.php:1088
 #: libraries/rte/rte_triggers.lib.php:422
 msgid "The definer must be in the \"username@hostname\" format!"
 msgstr ""
@@ -11996,9 +12012,9 @@ msgid "You must provide an event definition."
 msgstr ""
 
 #: libraries/rte/rte_export.lib.php:43 libraries/rte/rte_general.lib.php:72
-#: libraries/rte/rte_routines.lib.php:345
-#: libraries/rte/rte_routines.lib.php:1198
-#: libraries/rte/rte_routines.lib.php:1411
+#: libraries/rte/rte_routines.lib.php:153
+#: libraries/rte/rte_routines.lib.php:1289
+#: libraries/rte/rte_routines.lib.php:1502
 msgid "Error in processing request:"
 msgstr ""
 
@@ -12031,141 +12047,141 @@ msgid ""
 "problems."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:110
-#: libraries/rte/rte_routines.lib.php:1006
+#: libraries/rte/rte_routines.lib.php:123
+msgid "Edit routine"
+msgstr ""
+
+#: libraries/rte/rte_routines.lib.php:200
+#: libraries/rte/rte_routines.lib.php:1097
 #, php-format
 msgid "Invalid routine type: \"%s\""
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:170
+#: libraries/rte/rte_routines.lib.php:253
+#, fuzzy, php-format
+msgid "Routine %1$s has been created."
+msgstr "Tabel %s is verwyder"
+
+#: libraries/rte/rte_routines.lib.php:380
 msgid "Sorry, we failed to restore the dropped routine."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:211
+#: libraries/rte/rte_routines.lib.php:439
 #, fuzzy, php-format
 #| msgid "Table %s has been dropped."
 msgid "Routine %1$s has been modified. Privileges have been adjusted."
 msgstr "Tabel %s is verwyder"
 
-#: libraries/rte/rte_routines.lib.php:216
+#: libraries/rte/rte_routines.lib.php:444
 #, fuzzy, php-format
 #| msgid "Table %s has been dropped."
 msgid "Routine %1$s has been modified."
 msgstr "Tabel %s is verwyder"
 
-#: libraries/rte/rte_routines.lib.php:238
-#, fuzzy, php-format
-msgid "Routine %1$s has been created."
-msgstr "Tabel %s is verwyder"
-
-#: libraries/rte/rte_routines.lib.php:315
-msgid "Edit routine"
-msgstr ""
-
-#: libraries/rte/rte_routines.lib.php:797
+#: libraries/rte/rte_routines.lib.php:888
 #, fuzzy
 #| msgid "Column names"
 msgid "Routine name"
 msgstr "Kolom name"
 
-#: libraries/rte/rte_routines.lib.php:823
+#: libraries/rte/rte_routines.lib.php:914
 msgid "Parameters"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:829
+#: libraries/rte/rte_routines.lib.php:920
 #, fuzzy
 msgid "Direction"
 msgstr "Skep"
 
-#: libraries/rte/rte_routines.lib.php:847
+#: libraries/rte/rte_routines.lib.php:938
 msgid "Add parameter"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:851
+#: libraries/rte/rte_routines.lib.php:942
 #, fuzzy
 msgid "Remove last parameter"
 msgstr "Hernoem tabel na"
 
-#: libraries/rte/rte_routines.lib.php:856
+#: libraries/rte/rte_routines.lib.php:947
 msgid "Return type"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:862
+#: libraries/rte/rte_routines.lib.php:953
 #, fuzzy
 #| msgid "Length/Values"
 msgid "Return length/values"
 msgstr "Lengte/Waardes*"
 
-#: libraries/rte/rte_routines.lib.php:868
+#: libraries/rte/rte_routines.lib.php:959
 #, fuzzy
 msgid "Return options"
 msgstr "Databasis statistieke"
 
-#: libraries/rte/rte_routines.lib.php:899
+#: libraries/rte/rte_routines.lib.php:990
 msgid "Is deterministic"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:920
+#: libraries/rte/rte_routines.lib.php:1011
 msgid ""
 "You do not have sufficient privileges to perform this operation; Please "
 "refer to the documentation for more details"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:935
+#: libraries/rte/rte_routines.lib.php:1026
 msgid "Security type"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:944
+#: libraries/rte/rte_routines.lib.php:1035
 msgid "SQL data access"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1013
+#: libraries/rte/rte_routines.lib.php:1104
 msgid "You must provide a routine name!"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1047
+#: libraries/rte/rte_routines.lib.php:1138
 #, php-format
 msgid "Invalid direction \"%s\" given for parameter."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1069
-#: libraries/rte/rte_routines.lib.php:1131
+#: libraries/rte/rte_routines.lib.php:1160
+#: libraries/rte/rte_routines.lib.php:1222
 msgid ""
 "You must provide length/values for routine parameters of type ENUM, SET, "
 "VARCHAR and VARBINARY."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1095
+#: libraries/rte/rte_routines.lib.php:1186
 msgid "You must provide a name and a type for each routine parameter."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1114
+#: libraries/rte/rte_routines.lib.php:1205
 msgid "You must provide a valid return type for the routine."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1174
+#: libraries/rte/rte_routines.lib.php:1265
 msgid "You must provide a routine definition."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1285
+#: libraries/rte/rte_routines.lib.php:1376
 #, php-format
 msgid "Execution results of routine %s"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1340
+#: libraries/rte/rte_routines.lib.php:1431
 #, php-format
 msgid "%d row affected by the last statement inside the procedure."
 msgid_plural "%d rows affected by the last statement inside the procedure."
 msgstr[0] ""
 msgstr[1] ""
 
-#: libraries/rte/rte_routines.lib.php:1398
-#: libraries/rte/rte_routines.lib.php:1406
+#: libraries/rte/rte_routines.lib.php:1489
+#: libraries/rte/rte_routines.lib.php:1497
 msgid "Execute routine"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1485
-#: libraries/rte/rte_routines.lib.php:1488
+#: libraries/rte/rte_routines.lib.php:1576
+#: libraries/rte/rte_routines.lib.php:1579
 msgid "Routine parameters"
 msgstr ""
 
@@ -12338,7 +12354,7 @@ msgid "Original position"
 msgstr ""
 
 #: libraries/server_bin_log.lib.php:133
-#: templates/structure/display_table_stats.phtml:4
+#: templates/table/structure/display_table_stats.phtml:4
 msgid "Information"
 msgstr ""
 
@@ -12374,13 +12390,13 @@ msgid ""
 "between the web server and the MySQL server."
 msgstr ""
 
-#: libraries/server_databases.lib.php:364
-#: libraries/server_databases.lib.php:365
+#: libraries/server_databases.lib.php:366
+#: libraries/server_databases.lib.php:371
 #, fuzzy
 msgid "Enable Statistics"
 msgstr "Databasis statistieke"
 
-#: libraries/server_databases.lib.php:481
+#: libraries/server_databases.lib.php:492
 #, fuzzy, php-format
 #| msgid "Database %s has been dropped."
 msgid "%1$d database has been dropped successfully."
@@ -12755,7 +12771,7 @@ msgid "You have revoked the privileges for %s."
 msgstr "Jy het die regte herroep vir %s."
 
 #: libraries/server_privileges.lib.php:2059
-#: libraries/server_privileges.lib.php:4290
+#: libraries/server_privileges.lib.php:4316
 #, fuzzy
 #| msgid "Any user"
 msgid "Add user account"
@@ -12926,58 +12942,58 @@ msgstr ""
 msgid "The privileges were reloaded successfully."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:3994
+#: libraries/server_privileges.lib.php:4003
 #, php-format
 msgid "The user %s already exists!"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4232
+#: libraries/server_privileges.lib.php:4258
 #, fuzzy, php-format
 #| msgid "Privileges"
 msgid "Privileges for %s"
 msgstr "Regte"
 
-#: libraries/server_privileges.lib.php:4241
+#: libraries/server_privileges.lib.php:4267
 #: libraries/server_status_processes.lib.php:72
 #: libraries/server_user_groups.lib.php:39
 msgid "User"
 msgstr "Gebruiker"
 
-#: libraries/server_privileges.lib.php:4282
+#: libraries/server_privileges.lib.php:4308
 msgctxt "Create new user"
 msgid "New"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4311
+#: libraries/server_privileges.lib.php:4337
 #, fuzzy
 #| msgid "Edit Privileges"
 msgid "Edit privileges:"
 msgstr "Verander Regte"
 
-#: libraries/server_privileges.lib.php:4312
+#: libraries/server_privileges.lib.php:4338
 #, fuzzy
 #| msgid "User"
 msgid "User account"
 msgstr "Gebruiker"
 
-#: libraries/server_privileges.lib.php:4371
+#: libraries/server_privileges.lib.php:4397
 msgid ""
 "Note: You are attempting to edit privileges of the user with which you are "
 "currently logged in."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4391 libraries/server_users.lib.php:25
+#: libraries/server_privileges.lib.php:4417 libraries/server_users.lib.php:25
 msgid "User accounts overview"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4459
+#: libraries/server_privileges.lib.php:4485
 msgid ""
 "A user account allowing any user from localhost to connect is present. This "
 "will prevent other users from connecting if the host part of their account "
 "allows a connection from any (%) host."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4500
+#: libraries/server_privileges.lib.php:4526
 #, php-format
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
@@ -12986,7 +13002,7 @@ msgid ""
 "%sreload the privileges%s before you continue."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4519
+#: libraries/server_privileges.lib.php:4545
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
 "tables. The content of these tables may differ from the privileges the "
@@ -12995,62 +13011,62 @@ msgid ""
 "privilege."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4569
+#: libraries/server_privileges.lib.php:4595
 msgid "The selected user was not found in the privilege table."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4801
+#: libraries/server_privileges.lib.php:4827
 msgid "You have added a new user."
 msgstr "Jy het 'n nuwe gebruiker bygevoeg."
 
-#: libraries/server_status.lib.php:53
+#: libraries/server_status.lib.php:60
 #, php-format
 msgid "Network traffic since startup: %s"
 msgstr ""
 
-#: libraries/server_status.lib.php:66
+#: libraries/server_status.lib.php:73
 #, php-format
 msgid "This MySQL server has been running for %1$s. It started up on %2$s."
 msgstr ""
 
-#: libraries/server_status.lib.php:80
+#: libraries/server_status.lib.php:94
 msgid ""
 "This MySQL server works as <b>master</b> and <b>slave</b> in <b>replication</"
 "b> process."
 msgstr ""
 
-#: libraries/server_status.lib.php:85
+#: libraries/server_status.lib.php:99
 msgid "This MySQL server works as <b>master</b> in <b>replication</b> process."
 msgstr ""
 
-#: libraries/server_status.lib.php:90
+#: libraries/server_status.lib.php:104
 msgid "This MySQL server works as <b>slave</b> in <b>replication</b> process."
 msgstr ""
 
-#: libraries/server_status.lib.php:106
+#: libraries/server_status.lib.php:116
 msgid "Replication status"
 msgstr ""
 
-#: libraries/server_status.lib.php:137
+#: libraries/server_status.lib.php:146
 msgid ""
 "On a busy server, the byte counters may overrun, so those statistics as "
 "reported by the MySQL server may be incorrect."
 msgstr ""
 
-#: libraries/server_status.lib.php:148
+#: libraries/server_status.lib.php:157
 msgid "Received"
 msgstr ""
 
-#: libraries/server_status.lib.php:167
+#: libraries/server_status.lib.php:176
 msgid "Sent"
 msgstr ""
 
-#: libraries/server_status.lib.php:234
+#: libraries/server_status.lib.php:243
 #, fuzzy
 msgid "Max. concurrent connections"
 msgstr "Tabel kommentaar"
 
-#: libraries/server_status.lib.php:244
+#: libraries/server_status.lib.php:253
 msgid "Failed attempts"
 msgstr ""
 
@@ -14020,7 +14036,7 @@ msgstr ""
 msgid "Not implemented yet."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/AlterOperation.php:193
+#: libraries/sql-parser/src/Components/AlterOperation.php:191
 msgid "Unrecognized alter operation."
 msgstr ""
 
@@ -14034,7 +14050,7 @@ msgid "An opening bracket followed by a set of values was expected."
 msgstr ""
 
 #: libraries/sql-parser/src/Components/ArrayObj.php:101
-#: libraries/sql-parser/src/Components/FieldDefinition.php:202
+#: libraries/sql-parser/src/Components/CreateDefinition.php:202
 msgid "An opening bracket was expected."
 msgstr ""
 
@@ -14042,25 +14058,35 @@ msgstr ""
 msgid "A comma or a closing bracket was expected"
 msgstr ""
 
+#: libraries/sql-parser/src/Components/CreateDefinition.php:246
+#, fuzzy
+#| msgid "With selected:"
+msgid "A comma or a closing bracket was expected."
+msgstr "Met gekose:"
+
+#: libraries/sql-parser/src/Components/CreateDefinition.php:262
+msgid "A closing bracket was expected."
+msgstr ""
+
 #: libraries/sql-parser/src/Components/DataType.php:125
 msgid "Unrecognized data type."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:225
+#: libraries/sql-parser/src/Components/Expression.php:227
 msgid "Unexpected closing bracket."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:246
-#: libraries/sql-parser/src/Components/Expression.php:283
-#: libraries/sql-parser/src/Components/Expression.php:303
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:285
+#: libraries/sql-parser/src/Components/Expression.php:305
 msgid "An alias was previously found."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:257
+#: libraries/sql-parser/src/Components/Expression.php:259
 msgid "Unexpected dot."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:327
+#: libraries/sql-parser/src/Components/Expression.php:329
 #, fuzzy
 #| msgid "With selected:"
 msgid "An alias was expected."
@@ -14072,16 +14098,6 @@ msgstr "Met gekose:"
 msgid "An expression was expected."
 msgstr "Met gekose:"
 
-#: libraries/sql-parser/src/Components/FieldDefinition.php:246
-#, fuzzy
-#| msgid "With selected:"
-msgid "A comma or a closing bracket was expected."
-msgstr "Met gekose:"
-
-#: libraries/sql-parser/src/Components/FieldDefinition.php:262
-msgid "A closing bracket was expected."
-msgstr ""
-
 #: libraries/sql-parser/src/Components/Limit.php:90
 #: libraries/sql-parser/src/Components/Limit.php:112
 msgid "An offset was expected."
@@ -14123,26 +14139,26 @@ msgstr ""
 msgid "Expected delimiter."
 msgstr ""
 
-#: libraries/sql-parser/src/Lexer.php:753
+#: libraries/sql-parser/src/Lexer.php:777
 #, fuzzy, php-format
 msgid "Ending quote %1$s was expected."
 msgstr "Tabel %s is verwyder"
 
-#: libraries/sql-parser/src/Lexer.php:789
+#: libraries/sql-parser/src/Lexer.php:813
 msgid "Variable name was expected."
 msgstr ""
 
-#: libraries/sql-parser/src/Parser.php:380
+#: libraries/sql-parser/src/Parser.php:391
 #, fuzzy
 #| msgid "At Beginning of Table"
 msgid "Unexpected beginning of statement."
 msgstr "By Begin van Tabel"
 
-#: libraries/sql-parser/src/Parser.php:399
+#: libraries/sql-parser/src/Parser.php:410
 msgid "Unrecognized statement type."
 msgstr ""
 
-#: libraries/sql-parser/src/Parser.php:479
+#: libraries/sql-parser/src/Parser.php:489
 msgid "No transaction was previously started."
 msgstr ""
 
@@ -14168,8 +14184,10 @@ msgid "The name of the entity was expected."
 msgstr ""
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:310
-msgid "At least one field definition was expected."
-msgstr ""
+#, fuzzy
+#| msgid "The row has been deleted."
+msgid "At least one column definition was expected."
+msgstr "Die ry is verwyder"
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:329
 msgid "A \"RETURNS\" keyword was expected."
@@ -14234,25 +14252,25 @@ msgstr ""
 msgid "Using bookmark \"%s\" as default browse query."
 msgstr ""
 
-#: libraries/sql.lib.php:1306
+#: libraries/sql.lib.php:1300
 msgid "Showing as PHP code"
 msgstr ""
 
-#: libraries/sql.lib.php:1638
+#: libraries/sql.lib.php:1632
 #, php-format
 msgid ""
 "Current selection does not contain a unique column. Grid edit, checkbox, "
 "Edit, Copy and Delete features are not available. %s"
 msgstr ""
 
-#: libraries/sql.lib.php:1649
+#: libraries/sql.lib.php:1643
 #, php-format
 msgid ""
 "Current selection does not contain a unique column. Grid edit, Edit, Copy "
 "and Delete features may result in undesired behavior. %s"
 msgstr ""
 
-#: libraries/sql.lib.php:1688
+#: libraries/sql.lib.php:1682
 #, php-format
 msgid "Problems with indexes of table `%s`"
 msgstr ""
@@ -14419,7 +14437,7 @@ msgid "Version %s snapshot (SQL code)"
 msgstr ""
 
 #: libraries/tracking.lib.php:947
-#: templates/structure/table_structure_row.phtml:33
+#: templates/table/structure/table_structure_row.phtml:33
 #, fuzzy
 #| msgid "None"
 msgctxt "None for default"
@@ -14473,19 +14491,19 @@ msgstr "Bediener weergawe"
 msgid "Version %1$s was created, tracking for %2$s is active."
 msgstr ""
 
-#: libraries/user_preferences.inc.php:29
+#: libraries/user_preferences.inc.php:30
 #, fuzzy
 #| msgid "General relation features"
 msgid "Manage your settings"
 msgstr "Algemene verwantskap funksies"
 
-#: libraries/user_preferences.inc.php:46 prefs_manage.php:307
+#: libraries/user_preferences.inc.php:54 prefs_manage.php:307
 #, fuzzy
 #| msgid "Modifications have been saved"
 msgid "Configuration has been saved."
 msgstr "Veranderinge is gestoor"
 
-#: libraries/user_preferences.inc.php:66
+#: libraries/user_preferences.inc.php:74
 #, php-format
 msgid ""
 "Your preferences will be saved for current session only. Storing them "
@@ -14878,7 +14896,7 @@ msgid "first"
 msgstr ""
 
 #: templates/columns_definitions/move_column.phtml:12
-#: templates/structure/add_column.phtml:21
+#: templates/table/structure/add_column.phtml:21
 #, fuzzy, php-format
 #| msgid "After %s"
 msgid "after %s"
@@ -14959,238 +14977,342 @@ msgstr "Wys PHP informasie"
 msgid "Input transformation options"
 msgstr "Databasis statistieke"
 
-#: templates/designer/aggregate_query_panel.phtml:22
-#: templates/designer/options_panel.phtml:100
+#: templates/database/create_table.phtml:7
+#: templates/database/designer/side_menu.phtml:77
+#: templates/database/designer/side_menu.phtml:80
+#, fuzzy
+msgid "Create table"
+msgstr "Skep 'n nuwe bladsy"
+
+#: templates/database/create_table.phtml:15
+#, fuzzy
+#| msgid "Number of rows per page"
+msgid "Number of columns"
+msgstr "Hoeveelheid rye per bladsy"
+
+#: templates/database/designer/aggregate_query_panel.phtml:22
+#: templates/database/designer/options_panel.phtml:100
 #, fuzzy
 #| msgid "Create"
 msgid "Aggregate"
 msgstr "Skep"
 
-#: templates/designer/aggregate_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:61
-#: templates/designer/options_panel.phtml:106
-#: templates/designer/options_panel.phtml:170
-#: templates/designer/where_query_panel.phtml:30
-#: templates/table/table_header.phtml:9
+#: templates/database/designer/aggregate_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:61
+#: templates/database/designer/options_panel.phtml:106
+#: templates/database/designer/options_panel.phtml:170
+#: templates/database/designer/where_query_panel.phtml:30
+#: templates/table/search/table_header.phtml:9
 #, fuzzy
 msgid "Operator"
 msgstr "Operasies"
 
-#: templates/designer/database_tables.phtml:29
+#: templates/database/designer/database_tables.phtml:29
 msgid "Toggle"
 msgstr ""
 
-#: templates/designer/database_tables.phtml:40
+#: templates/database/designer/database_tables.phtml:40
 #, fuzzy
 #| msgid "Databases"
 msgid "See table structure"
 msgstr "databasisse"
 
-#: templates/designer/delete_relation_panel.phtml:21
+#: templates/database/designer/delete_relation_panel.phtml:21
 msgid "Delete relation"
 msgstr ""
 
-#: templates/designer/edit_delete_pages.phtml:7
+#: templates/database/designer/edit_delete_pages.phtml:7
 #, fuzzy
 #| msgid "Page number:"
 msgid "Page to open"
 msgstr "Bladsy nommer:"
 
-#: templates/designer/edit_delete_pages.phtml:7
+#: templates/database/designer/edit_delete_pages.phtml:7
 #, fuzzy
 msgid "Page to delete"
 msgstr "Relasie uitsig"
 
-#: templates/designer/having_query_panel.phtml:90
-#: templates/designer/options_panel.phtml:63
-#: templates/designer/options_panel.phtml:229
-#: templates/designer/where_query_panel.phtml:59
+#: templates/database/designer/having_query_panel.phtml:90
+#: templates/database/designer/options_panel.phtml:63
+#: templates/database/designer/options_panel.phtml:229
+#: templates/database/designer/where_query_panel.phtml:59
 #, fuzzy
 #| msgid "Export"
 msgid "Except"
 msgstr "Export"
 
-#: templates/designer/having_query_panel.phtml:102
-#: templates/designer/options_panel.phtml:75
-#: templates/designer/options_panel.phtml:241
-#: templates/designer/where_query_panel.phtml:71
+#: templates/database/designer/having_query_panel.phtml:102
+#: templates/database/designer/options_panel.phtml:75
+#: templates/database/designer/options_panel.phtml:241
+#: templates/database/designer/where_query_panel.phtml:71
 #, fuzzy
 #| msgid "in query"
 msgid "subquery"
 msgstr "in navraag"
 
-#: templates/designer/new_relation_panel.phtml:22
-#: templates/designer/side_menu.phtml:84 templates/designer/side_menu.phtml:87
+#: templates/database/designer/new_relation_panel.phtml:22
+#: templates/database/designer/side_menu.phtml:84
+#: templates/database/designer/side_menu.phtml:87
 msgid "Create relation"
 msgstr ""
 
-#: templates/designer/options_panel.phtml:34
-#: templates/designer/options_panel.phtml:200
+#: templates/database/designer/options_panel.phtml:34
+#: templates/database/designer/options_panel.phtml:200
 #, fuzzy
 msgid "Relation operator"
 msgstr "Relasie uitsig"
 
-#: templates/designer/options_panel.phtml:85
-#: templates/designer/rename_to_panel.phtml:23
+#: templates/database/designer/options_panel.phtml:85
+#: templates/database/designer/rename_to_panel.phtml:23
 #, fuzzy
 msgid "Rename to"
 msgstr "Hernoem tabel na"
 
-#: templates/designer/options_panel.phtml:91
-#: templates/designer/rename_to_panel.phtml:31
+#: templates/database/designer/options_panel.phtml:91
+#: templates/database/designer/rename_to_panel.phtml:31
 #, fuzzy
 #| msgid "User name"
 msgid "New name"
 msgstr "Gebruiker naam"
 
-#: templates/designer/page_save_as.phtml:4
+#: templates/database/designer/page_save_as.phtml:4
 #, fuzzy
 #| msgid "Export"
 msgid "Save to selected page"
 msgstr "Export"
 
-#: templates/designer/page_save_as.phtml:5
+#: templates/database/designer/page_save_as.phtml:5
 #, fuzzy
 #| msgid "Create a new index"
 msgid "Create a page and save to it"
 msgstr "Skep 'n nuwe indeks"
 
-#: templates/designer/page_save_as.phtml:26
+#: templates/database/designer/page_save_as.phtml:26
 #, fuzzy
 #| msgid "User name"
 msgid "New page name"
 msgstr "Gebruiker naam"
 
-#: templates/designer/page_selector.phtml:2
+#: templates/database/designer/page_selector.phtml:2
 #, fuzzy
 #| msgid "Select All"
 msgid "Select page"
 msgstr "Kies Alles"
 
-#: templates/designer/query_details.phtml:10
+#: templates/database/designer/query_details.phtml:10
 #, fuzzy
 msgid "Active options"
 msgstr "Aksie"
 
-#: templates/designer/schema_export.phtml:4
+#: templates/database/designer/schema_export.phtml:4
 msgid "Select Export Relational Type"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:19 templates/designer/side_menu.phtml:25
+#: templates/database/designer/side_menu.phtml:19
+#: templates/database/designer/side_menu.phtml:25
 #, fuzzy
 #| msgid "Show tables"
 msgid "Show/Hide tables list"
 msgstr "Wys tabelle"
 
-#: templates/designer/side_menu.phtml:29 templates/designer/side_menu.phtml:35
-#: templates/designer/side_menu.phtml:36
+#: templates/database/designer/side_menu.phtml:29
+#: templates/database/designer/side_menu.phtml:35
+#: templates/database/designer/side_menu.phtml:36
 msgid "View in fullscreen"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:34
+#: templates/database/designer/side_menu.phtml:34
 msgid "Exit fullscreen"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:41 templates/designer/side_menu.phtml:45
+#: templates/database/designer/side_menu.phtml:41
+#: templates/database/designer/side_menu.phtml:45
 #, fuzzy
 #| msgid "User name"
 msgid "New page"
 msgstr "Gebruiker naam"
 
-#: templates/designer/side_menu.phtml:70 templates/designer/side_menu.phtml:73
+#: templates/database/designer/side_menu.phtml:70
+#: templates/database/designer/side_menu.phtml:73
 #, fuzzy
 #| msgid "Select All"
 msgid "Delete pages"
 msgstr "Kies Alles"
 
-#: templates/designer/side_menu.phtml:77 templates/designer/side_menu.phtml:80
-#: templates/table/create_table.phtml:7
-#, fuzzy
-msgid "Create table"
-msgstr "Skep 'n nuwe bladsy"
-
-#: templates/designer/side_menu.phtml:98
-#: templates/designer/side_menu.phtml:101
+#: templates/database/designer/side_menu.phtml:98
+#: templates/database/designer/side_menu.phtml:101
 msgid "Reload"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:107
-#: templates/designer/side_menu.phtml:110
+#: templates/database/designer/side_menu.phtml:107
+#: templates/database/designer/side_menu.phtml:110
 msgid "Help"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Angular links"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Direct links"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:122
-#: templates/designer/side_menu.phtml:124
+#: templates/database/designer/side_menu.phtml:122
+#: templates/database/designer/side_menu.phtml:124
 msgid "Snap to grid"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:128
-#: templates/designer/side_menu.phtml:134
+#: templates/database/designer/side_menu.phtml:128
+#: templates/database/designer/side_menu.phtml:134
 msgid "Small/Big All"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:138
-#: templates/designer/side_menu.phtml:141
+#: templates/database/designer/side_menu.phtml:138
+#: templates/database/designer/side_menu.phtml:141
 msgid "Toggle small/big"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:145
-#: templates/designer/side_menu.phtml:148
+#: templates/database/designer/side_menu.phtml:145
+#: templates/database/designer/side_menu.phtml:148
 msgid "Toggle relation lines"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:153
-#: templates/designer/side_menu.phtml:156
+#: templates/database/designer/side_menu.phtml:153
+#: templates/database/designer/side_menu.phtml:156
 #, fuzzy
 #| msgid "Export"
 msgid "Export schema"
 msgstr "Export"
 
-#: templates/designer/side_menu.phtml:165
-#: templates/designer/side_menu.phtml:168
+#: templates/database/designer/side_menu.phtml:165
+#: templates/database/designer/side_menu.phtml:168
 #, fuzzy
 #| msgid "Submit Query"
 msgid "Build Query"
 msgstr "Doen Navraag"
 
-#: templates/designer/side_menu.phtml:173
-#: templates/designer/side_menu.phtml:177
+#: templates/database/designer/side_menu.phtml:173
+#: templates/database/designer/side_menu.phtml:177
 msgid "Move Menu"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:181
-#: templates/designer/side_menu.phtml:186
+#: templates/database/designer/side_menu.phtml:181
+#: templates/database/designer/side_menu.phtml:186
 #, fuzzy
 #| msgid "Partial Texts"
 msgid "Pin text"
 msgstr "Gedeeltelike Tekste"
 
-#: templates/designer/table_list.phtml:4
+#: templates/database/designer/table_list.phtml:4
 #, fuzzy
 msgid "Hide/Show all"
 msgstr "Wys alles"
 
-#: templates/designer/table_list.phtml:14
+#: templates/database/designer/table_list.phtml:14
 msgid "Hide/Show Tables with no relation"
 msgstr ""
 
-#: templates/designer/table_list.phtml:59
+#: templates/database/designer/table_list.phtml:59
 #, fuzzy
 #| msgid "Number of rows per page"
 msgid "Number of tables:"
 msgstr "Hoeveelheid rye per bladsy"
 
+#: templates/database/structure/body_for_table_summary.phtml:6
+#, php-format
+msgid "%s table"
+msgid_plural "%s tables"
+msgstr[0] "%s tabel"
+msgstr[1] "%s tabelle"
+
+#: templates/database/structure/body_for_table_summary.phtml:17
+msgid "Sum"
+msgstr "Som"
+
+#: templates/database/structure/check_all_tables.phtml:6
+msgid "Check tables having overhead"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:10
+#, fuzzy
+#| msgid "Show color"
+msgid "Show create"
+msgstr "Wys kleur"
+
+#: templates/database/structure/check_all_tables.phtml:27
+msgid "Prefix"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:28
+msgid "Add prefix to table"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:29
+#, fuzzy
+#| msgid "Replace table data with file"
+msgid "Replace table prefix"
+msgstr "Vervang tabel data met leer (file)"
+
+#: templates/database/structure/check_all_tables.phtml:30
+#, fuzzy
+#| msgid "Replace table data with file"
+msgid "Copy table with prefix"
+msgstr "Vervang tabel data met leer (file)"
+
+#: templates/database/structure/check_all_tables.phtml:36
+#, fuzzy
+msgid "Add columns to central list"
+msgstr "Voeg 'n nuwe veld by"
+
+#: templates/database/structure/check_all_tables.phtml:37
+msgid "Remove columns from central list"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:38
+#, fuzzy
+msgid "Make consistent with central list"
+msgstr "Voeg 'n nuwe veld by"
+
+#: templates/database/structure/favorite_anchor.phtml:12
+#, fuzzy
+msgid "Add to Favorites"
+msgstr "Voeg 'n nuwe gebruiker by"
+
+#: templates/database/structure/show_create.phtml:2
+msgid "Showing create queries"
+msgstr ""
+
+#: templates/database/structure/sortable_header.phtml:13
+msgid "Sort"
+msgstr "Sorteer"
+
+#: templates/database/structure/table_header.phtml:42
+msgid ""
+"May be approximate. Click on the number to get the exact count. See "
+"[doc@faq3-11]FAQ 3.11[/doc]."
+msgstr ""
+
+#: templates/database/structure/table_header.phtml:66
+#: templates/table/index_form.phtml:127
+msgid "Size"
+msgstr "Grootte"
+
+#: templates/database/structure/table_header.phtml:74
+#: templates/table/structure/display_table_stats.phtml:27
+msgid "Overhead"
+msgstr "Overhead"
+
+#: templates/database/structure/tracking_icon.phtml:4
+msgid "Tracking is active."
+msgstr ""
+
+#: templates/database/structure/tracking_icon.phtml:8
+msgid "Tracking is not active."
+msgstr ""
+
 #: templates/error/report_form.phtml:7
 msgid ""
 "phpMyAdmin has encountered an error. We have collected data about this error "
@@ -15206,69 +15328,6 @@ msgstr ""
 msgid "Please explain the steps that lead to the error:"
 msgstr ""
 
-#: templates/gis_visualization/gis_visualization.phtml:3
-msgid "Display GIS Visualization"
-msgstr ""
-
-#: templates/gis_visualization/gis_visualization.phtml:8
-#, fuzzy
-#| msgid "Add/Delete Field Columns"
-msgid "Label column"
-msgstr "Voeg By/Verwyder Veld Kolomme"
-
-#: templates/gis_visualization/gis_visualization.phtml:11
-msgid "-- None --"
-msgstr ""
-
-#: templates/gis_visualization/gis_visualization.phtml:19
-#, fuzzy
-msgid "Spatial column"
-msgstr "totaal"
-
-#: templates/index_form.phtml:16
-msgid "Index name:"
-msgstr "Indeks naam&nbsp;:"
-
-#: templates/index_form.phtml:19
-msgid ""
-"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
-msgstr ""
-"\"PRIMARY\" <b>moet</b> die naam wees van die primere sleutel, en <b>slegs</"
-"b> van die primere sleutel!"
-
-#: templates/index_form.phtml:40
-#, fuzzy
-#| msgid "Index name:"
-msgid "Index choice:"
-msgstr "Indeks naam&nbsp;:"
-
-#: templates/index_form.phtml:57
-msgid "Key block size:"
-msgstr ""
-
-#: templates/index_form.phtml:74
-msgid "Index type:"
-msgstr "Indeks tipe&nbsp;:"
-
-#: templates/index_form.phtml:86
-#, fuzzy
-#| msgid "User"
-msgid "Parser:"
-msgstr "Gebruiker"
-
-#: templates/index_form.phtml:102
-#, fuzzy
-msgid "Comment:"
-msgstr "Kommentaar"
-
-#: templates/index_form.phtml:127 templates/structure/table_header.phtml:66
-msgid "Size"
-msgstr "Grootte"
-
-#: templates/index_form.phtml:149 templates/index_form.phtml:190
-msgid "Drag to reorder"
-msgstr ""
-
 #: templates/prefs_autoload.phtml:9
 msgid ""
 "Your browser has phpMyAdmin configuration for this domain. Would you like to "
@@ -15281,474 +15340,440 @@ msgstr ""
 msgid "Start row:"
 msgstr "Sa"
 
-#: templates/structure/actions_in_table_structure.phtml:14
-#, php-format
-msgid "A primary key has been added on %s."
-msgstr "'n primere sleutel is bygevoeg op %s."
-
-#: templates/structure/actions_in_table_structure.phtml:34
-#: templates/structure/actions_in_table_structure.phtml:54
-#: templates/structure/actions_in_table_structure.phtml:79
-#: templates/structure/actions_in_table_structure.phtml:101
-#, php-format
-msgid "An index has been added on %s."
-msgstr "'n Indeks is bygevoeg op %s."
-
-#: templates/structure/actions_in_table_structure.phtml:130
-#: templates/structure/check_all_table_column.phtml:59
-#, fuzzy
-msgid "Remove from central columns"
-msgstr "Hernoem tabel na"
-
-#: templates/structure/actions_in_table_structure.phtml:138
-#: templates/structure/check_all_table_column.phtml:55
-#, fuzzy
-msgid "Add to central columns"
-msgstr "Voeg 'n nuwe veld by"
-
-#: templates/structure/add_column.phtml:7
-#, fuzzy, php-format
-msgid "Add %s column(s)"
-msgstr "Voeg 'n nuwe veld by"
-
-#: templates/structure/add_column.phtml:12
-#, fuzzy
-#| msgid "At Beginning of Table"
-msgid "at beginning of table"
-msgstr "By Begin van Tabel"
-
-#: templates/structure/body_for_table_summary.phtml:6
-#, php-format
-msgid "%s table"
-msgid_plural "%s tables"
-msgstr[0] "%s tabel"
-msgstr[1] "%s tabelle"
-
-#: templates/structure/body_for_table_summary.phtml:17
-msgid "Sum"
-msgstr "Som"
-
-#: templates/structure/check_all_tables.phtml:6
-msgid "Check tables having overhead"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:10
-#, fuzzy
-#| msgid "Show color"
-msgid "Show create"
-msgstr "Wys kleur"
-
-#: templates/structure/check_all_tables.phtml:27
-msgid "Prefix"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:28
-msgid "Add prefix to table"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:29
-#, fuzzy
-#| msgid "Replace table data with file"
-msgid "Replace table prefix"
-msgstr "Vervang tabel data met leer (file)"
-
-#: templates/structure/check_all_tables.phtml:30
-#, fuzzy
-#| msgid "Replace table data with file"
-msgid "Copy table with prefix"
-msgstr "Vervang tabel data met leer (file)"
-
-#: templates/structure/check_all_tables.phtml:36
-#, fuzzy
-msgid "Add columns to central list"
-msgstr "Voeg 'n nuwe veld by"
-
-#: templates/structure/check_all_tables.phtml:37
-msgid "Remove columns from central list"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:38
-#, fuzzy
-msgid "Make consistent with central list"
-msgstr "Voeg 'n nuwe veld by"
-
-#: templates/structure/display_structure.phtml:140 view_create.php:181
-#, fuzzy
-#| msgid "Print view"
-msgid "Edit view"
-msgstr "Drukker mooi (print view)"
-
-#: templates/structure/display_table_stats.phtml:9
-msgid "Space usage"
-msgstr "Spasie verbruik"
-
-#: templates/structure/display_table_stats.phtml:27
-#: templates/structure/table_header.phtml:74
-msgid "Overhead"
-msgstr "Overhead"
-
-#: templates/structure/display_table_stats.phtml:32
-msgid "Effective"
-msgstr "Effektief"
-
-#: templates/structure/favorite_anchor.phtml:12
-#, fuzzy
-msgid "Add to Favorites"
-msgstr "Voeg 'n nuwe gebruiker by"
-
-#: templates/structure/move_columns_dialog.phtml:1
-#: templates/structure/optional_action_links.phtml:21
-#, fuzzy
-msgid "Move columns"
-msgstr "Voeg 'n nuwe veld by"
-
-#: templates/structure/move_columns_dialog.phtml:2
-msgid "Move the columns by dragging them up and down."
-msgstr ""
-
-#: templates/structure/optional_action_links.phtml:9
-msgid "Propose table structure"
-msgstr "Stel tabel struktuur voor"
-
-#: templates/structure/optional_action_links.phtml:24
-#, fuzzy
-#| msgid "Propose table structure"
-msgid "Improve table structure"
-msgstr "Stel tabel struktuur voor"
-
-#: templates/structure/optional_action_links.phtml:30
-#, fuzzy
-#| msgid "Track table"
-msgid "Track view"
-msgstr "Volg tabel"
-
-#: templates/structure/row_stats_table.phtml:3
-#, fuzzy
-#| msgid "Row Statistics"
-msgid "Row statistics"
-msgstr "Ry Statistiek"
-
-#: templates/structure/row_stats_table.phtml:9
-msgid "static"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:11
-msgid "dynamic"
-msgstr "dinamies"
-
-#: templates/structure/row_stats_table.phtml:22
-msgid "partitioned"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:54
-msgid "Row length"
-msgstr "Ry lengte"
-
-#: templates/structure/row_stats_table.phtml:66
-msgid "Row size"
-msgstr "Ry grootte"
-
-#: templates/structure/row_stats_table.phtml:73
-msgid "Next autoindex"
-msgstr ""
-
-#: templates/structure/secondary_tabs.phtml:14
-#, fuzzy
-#| msgid "Relation view"
-msgid "Relation view"
-msgstr "Relasie uitsig"
-
-#: templates/structure/show_create.phtml:2
-msgid "Showing create queries"
-msgstr ""
-
-#: templates/structure/sortable_header.phtml:13
-msgid "Sort"
-msgstr "Sorteer"
-
-#: templates/structure/table_header.phtml:42
-msgid ""
-"May be approximate. Click on the number to get the exact count. See "
-"[doc@faq3-11]FAQ 3.11[/doc]."
-msgstr ""
-
-#: templates/structure/table_structure_row.phtml:46
-#, fuzzy, php-format
-#| msgid "Table %s has been dropped."
-msgid "Column %s has been dropped."
-msgstr "Tabel %s is verwyder"
-
-#: templates/structure/tracking_icon.phtml:4
-msgid "Tracking is active."
-msgstr ""
-
-#: templates/structure/tracking_icon.phtml:8
-msgid "Tracking is not active."
-msgstr ""
-
-#: templates/table/create_table.phtml:15
-#, fuzzy
-#| msgid "Number of rows per page"
-msgid "Number of columns"
-msgstr "Hoeveelheid rye per bladsy"
-
-#: templates/table/options.phtml:8
-#, fuzzy
-#| msgid "Select fields (at least one):"
-msgid "Select columns (at least one):"
-msgstr "Kies Velde (ten minste een):"
-
-#: templates/table/options.phtml:37
-msgid "Add search conditions (body of the \"where\" clause):"
-msgstr "Voeg soek kriteria by (laaste deel van die \"where\" in SQL SELECT):"
-
-#: templates/table/options.phtml:45
-msgid "Number of rows per page"
-msgstr "Hoeveelheid rye per bladsy"
-
-#: templates/table/options.phtml:56
-msgid "Display order:"
-msgstr "Vertoon volgorde:"
-
-#: templates/table/options_zoom.phtml:6
-msgid "Use this column to label each point"
-msgstr ""
-
-#: templates/table/options_zoom.phtml:35
-msgid "Maximum rows to plot"
-msgstr ""
-
-#: templates/table/replace_preview.phtml:13
-msgid "Find and replace - preview"
-msgstr ""
-
-#: templates/table/replace_preview.phtml:18
-#, fuzzy
-#| msgid "Lines terminated by"
-msgid "Original string"
-msgstr "Lyne beeindig deur"
-
-#: templates/table/replace_preview.phtml:19
-#, fuzzy
-msgid "Replaced string"
-msgstr "Operasies"
-
-#: templates/table/replace_preview.phtml:40
-#, fuzzy
-msgid "Replace"
-msgstr "Herstel tabel"
-
-#: templates/table/rows_zoom.phtml:16
-#, fuzzy
-msgid "Additional search criteria"
-msgstr "SQL-stelling"
-
-#: templates/table/search_and_replace.phtml:3
-#, fuzzy
-#| msgid "Replace table data with file"
-msgid "Replace with:"
-msgstr "Vervang tabel data met leer (file)"
-
-#: templates/table/search_and_replace.phtml:22
-#, fuzzy
-#| msgid "as regular expression"
-msgid "Use regular expression"
-msgstr "as 'n regular expression"
-
-#: templates/table/selection_form.phtml:12
-#, fuzzy
-#| msgid "Do a \"query by example\" (wildcard: \"%\")"
-msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
-msgstr "Doen 'n \"Navraag dmv Voorbeeld\" (wildcard: \"%\")"
-
-#: templates/table/selection_form.phtml:34
-msgid "Do a \"query by example\" (wildcard: \"%\")"
-msgstr "Doen 'n \"Navraag dmv Voorbeeld\" (wildcard: \"%\")"
-
-#: templates/table/zoom_result_form.phtml:7
-msgid "Browse/Edit the points"
-msgstr ""
-
-#: templates/table/zoom_result_form.phtml:15
-msgid "How to use"
-msgstr ""
-
-#: templates/table/zoom_result_form.phtml:23
-#, fuzzy
-#| msgid "Reset"
-msgid "Reset zoom"
-msgstr "Herstel"
-
-#: templates/tbl_chart.phtml:17
+#: templates/table/chart/tbl_chart.phtml:17
 #, fuzzy
 #| msgid "Mar"
 msgctxt "Chart type"
 msgid "Bar"
 msgstr "Mar"
 
-#: templates/tbl_chart.phtml:21
+#: templates/table/chart/tbl_chart.phtml:21
 #, fuzzy
 #| msgid "Column names"
 msgctxt "Chart type"
 msgid "Column"
 msgstr "Kolom name"
 
-#: templates/tbl_chart.phtml:25
+#: templates/table/chart/tbl_chart.phtml:25
 msgctxt "Chart type"
 msgid "Line"
 msgstr ""
 
-#: templates/tbl_chart.phtml:29
+#: templates/table/chart/tbl_chart.phtml:29
 msgctxt "Chart type"
 msgid "Spline"
 msgstr ""
 
-#: templates/tbl_chart.phtml:33
+#: templates/table/chart/tbl_chart.phtml:33
 msgctxt "Chart type"
 msgid "Area"
 msgstr ""
 
-#: templates/tbl_chart.phtml:37
+#: templates/table/chart/tbl_chart.phtml:37
 #, fuzzy
 #| msgid "PiB"
 msgctxt "Chart type"
 msgid "Pie"
 msgstr "PB"
 
-#: templates/tbl_chart.phtml:41
+#: templates/table/chart/tbl_chart.phtml:41
 msgctxt "Chart type"
 msgid "Timeline"
 msgstr ""
 
-#: templates/tbl_chart.phtml:45
+#: templates/table/chart/tbl_chart.phtml:45
 msgctxt "Chart type"
 msgid "Scatter"
 msgstr ""
 
-#: templates/tbl_chart.phtml:50
+#: templates/table/chart/tbl_chart.phtml:50
 msgid "Stacked"
 msgstr ""
 
-#: templates/tbl_chart.phtml:53
+#: templates/table/chart/tbl_chart.phtml:53
 #, fuzzy
 msgid "Chart title"
 msgstr "Geen tabelle"
 
-#: templates/tbl_chart.phtml:57
+#: templates/table/chart/tbl_chart.phtml:57
 msgid "X-Axis:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:72
+#: templates/table/chart/tbl_chart.phtml:72
 #, fuzzy
 msgid "Series:"
 msgstr "SQL-stelling"
 
-#: templates/tbl_chart.phtml:102
+#: templates/table/chart/tbl_chart.phtml:102
 msgid "X-Axis label:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:104
+#: templates/table/chart/tbl_chart.phtml:104
 #, fuzzy
 #| msgid "Value"
 msgid "X Values"
 msgstr "Waarde"
 
-#: templates/tbl_chart.phtml:107
+#: templates/table/chart/tbl_chart.phtml:107
 msgid "Y-Axis label:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:115
+#: templates/table/chart/tbl_chart.phtml:115
 msgid "Series names are in a column"
 msgstr ""
 
-#: templates/tbl_chart.phtml:118
+#: templates/table/chart/tbl_chart.phtml:118
 #, fuzzy
 #| msgid "Inside table(s):"
 msgid "Series column:"
 msgstr "Binne tabel(le):"
 
-#: templates/tbl_chart.phtml:130
+#: templates/table/chart/tbl_chart.phtml:130
 #, fuzzy
 #| msgid "Number of rows per page"
 msgid "Value Column:"
 msgstr "Hoeveelheid rye per bladsy"
 
-#: templates/tbl_chart.phtml:150
+#: templates/table/chart/tbl_chart.phtml:150
 #, fuzzy
 #| msgid "Save as file"
 msgid "Save chart as image"
 msgstr "Stoor as leer (file)"
 
-#: templates/tbl_relation/common_form.phtml:7
+#: templates/table/gis_visualization/gis_visualization.phtml:3
+msgid "Display GIS Visualization"
+msgstr ""
+
+#: templates/table/gis_visualization/gis_visualization.phtml:8
+#, fuzzy
+#| msgid "Add/Delete Field Columns"
+msgid "Label column"
+msgstr "Voeg By/Verwyder Veld Kolomme"
+
+#: templates/table/gis_visualization/gis_visualization.phtml:11
+msgid "-- None --"
+msgstr ""
+
+#: templates/table/gis_visualization/gis_visualization.phtml:19
+#, fuzzy
+msgid "Spatial column"
+msgstr "totaal"
+
+#: templates/table/index_form.phtml:16
+msgid "Index name:"
+msgstr "Indeks naam&nbsp;:"
+
+#: templates/table/index_form.phtml:19
+msgid ""
+"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
+msgstr ""
+"\"PRIMARY\" <b>moet</b> die naam wees van die primere sleutel, en <b>slegs</"
+"b> van die primere sleutel!"
+
+#: templates/table/index_form.phtml:40
+#, fuzzy
+#| msgid "Index name:"
+msgid "Index choice:"
+msgstr "Indeks naam&nbsp;:"
+
+#: templates/table/index_form.phtml:57
+msgid "Key block size:"
+msgstr ""
+
+#: templates/table/index_form.phtml:74
+msgid "Index type:"
+msgstr "Indeks tipe&nbsp;:"
+
+#: templates/table/index_form.phtml:86
+#, fuzzy
+#| msgid "User"
+msgid "Parser:"
+msgstr "Gebruiker"
+
+#: templates/table/index_form.phtml:102
+#, fuzzy
+msgid "Comment:"
+msgstr "Kommentaar"
+
+#: templates/table/index_form.phtml:149 templates/table/index_form.phtml:190
+msgid "Drag to reorder"
+msgstr ""
+
+#: templates/table/relation/common_form.phtml:7
 #, fuzzy
 msgid "Internal relations"
 msgstr "Algemene verwantskap funksies"
 
-#: templates/tbl_relation/common_form.phtml:11
+#: templates/table/relation/common_form.phtml:11
 #, fuzzy
 msgid "Internal relation"
 msgstr "Algemene verwantskap funksies"
 
-#: templates/tbl_relation/common_form.phtml:14
+#: templates/table/relation/common_form.phtml:14
 msgid ""
 "An internal relation is not necessary when a corresponding FOREIGN KEY "
 "relation exists."
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:37
+#: templates/table/relation/common_form.phtml:37
 msgid "Foreign key constraints"
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:40
+#: templates/table/relation/common_form.phtml:40
 #, fuzzy
 #| msgid "Action"
 msgid "Actions"
 msgstr "Aksie"
 
-#: templates/tbl_relation/common_form.phtml:41
+#: templates/table/relation/common_form.phtml:41
 #, fuzzy
 #| msgid "Column names"
 msgid "Constraint properties"
 msgstr "Kolom name"
 
-#: templates/tbl_relation/common_form.phtml:44
+#: templates/table/relation/common_form.phtml:44
 msgid ""
 "Only columns with index will be displayed. You can define an index below."
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:49
+#: templates/table/relation/common_form.phtml:49
 msgid "Foreign key constraint"
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:81
+#: templates/table/relation/common_form.phtml:81
 #, fuzzy
 #| msgid "Add a linestring"
 msgid "+ Add constraint"
 msgstr "Voeg 'n lynstring by"
 
-#: templates/tbl_relation/common_form.phtml:91
+#: templates/table/relation/common_form.phtml:91
 #, fuzzy
 #| msgid "Choose field to display"
 msgid "Choose column to display:"
 msgstr "Kies 'n Veld om te vertoon"
 
-#: templates/tbl_relation/foreign_key_row.phtml:13
+#: templates/table/relation/foreign_key_row.phtml:13
 #, fuzzy, php-format
 #| msgid "Field %s has been dropped."
 msgid "Foreign key constraint %s has been dropped"
 msgstr "Veld %s is verwyder"
 
-#: templates/tbl_relation/foreign_key_row.phtml:102
+#: templates/table/relation/foreign_key_row.phtml:102
 #, fuzzy
 #| msgid "Column names"
 msgid "Constraint name"
 msgstr "Kolom name"
 
-#: templates/tbl_relation/foreign_key_row.phtml:157
+#: templates/table/relation/foreign_key_row.phtml:157
 #, fuzzy
 msgid "+ Add column"
 msgstr "Voeg 'n nuwe veld by"
 
+#: templates/table/search/options.phtml:8
+#, fuzzy
+#| msgid "Select fields (at least one):"
+msgid "Select columns (at least one):"
+msgstr "Kies Velde (ten minste een):"
+
+#: templates/table/search/options.phtml:37
+msgid "Add search conditions (body of the \"where\" clause):"
+msgstr "Voeg soek kriteria by (laaste deel van die \"where\" in SQL SELECT):"
+
+#: templates/table/search/options.phtml:45
+msgid "Number of rows per page"
+msgstr "Hoeveelheid rye per bladsy"
+
+#: templates/table/search/options.phtml:56
+msgid "Display order:"
+msgstr "Vertoon volgorde:"
+
+#: templates/table/search/options_zoom.phtml:6
+msgid "Use this column to label each point"
+msgstr ""
+
+#: templates/table/search/options_zoom.phtml:35
+msgid "Maximum rows to plot"
+msgstr ""
+
+#: templates/table/search/replace_preview.phtml:13
+msgid "Find and replace - preview"
+msgstr ""
+
+#: templates/table/search/replace_preview.phtml:18
+#, fuzzy
+#| msgid "Lines terminated by"
+msgid "Original string"
+msgstr "Lyne beeindig deur"
+
+#: templates/table/search/replace_preview.phtml:19
+#, fuzzy
+msgid "Replaced string"
+msgstr "Operasies"
+
+#: templates/table/search/replace_preview.phtml:40
+#, fuzzy
+msgid "Replace"
+msgstr "Herstel tabel"
+
+#: templates/table/search/rows_zoom.phtml:16
+#, fuzzy
+msgid "Additional search criteria"
+msgstr "SQL-stelling"
+
+#: templates/table/search/search_and_replace.phtml:3
+#, fuzzy
+#| msgid "Replace table data with file"
+msgid "Replace with:"
+msgstr "Vervang tabel data met leer (file)"
+
+#: templates/table/search/search_and_replace.phtml:22
+#, fuzzy
+#| msgid "as regular expression"
+msgid "Use regular expression"
+msgstr "as 'n regular expression"
+
+#: templates/table/search/selection_form.phtml:12
+#, fuzzy
+#| msgid "Do a \"query by example\" (wildcard: \"%\")"
+msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
+msgstr "Doen 'n \"Navraag dmv Voorbeeld\" (wildcard: \"%\")"
+
+#: templates/table/search/selection_form.phtml:34
+msgid "Do a \"query by example\" (wildcard: \"%\")"
+msgstr "Doen 'n \"Navraag dmv Voorbeeld\" (wildcard: \"%\")"
+
+#: templates/table/search/zoom_result_form.phtml:7
+msgid "Browse/Edit the points"
+msgstr ""
+
+#: templates/table/search/zoom_result_form.phtml:15
+msgid "How to use"
+msgstr ""
+
+#: templates/table/search/zoom_result_form.phtml:23
+#, fuzzy
+#| msgid "Reset"
+msgid "Reset zoom"
+msgstr "Herstel"
+
+#: templates/table/secondary_tabs.phtml:14
+#, fuzzy
+#| msgid "Relation view"
+msgid "Relation view"
+msgstr "Relasie uitsig"
+
+#: templates/table/structure/actions_in_table_structure.phtml:14
+#, php-format
+msgid "A primary key has been added on %s."
+msgstr "'n primere sleutel is bygevoeg op %s."
+
+#: templates/table/structure/actions_in_table_structure.phtml:34
+#: templates/table/structure/actions_in_table_structure.phtml:54
+#: templates/table/structure/actions_in_table_structure.phtml:79
+#: templates/table/structure/actions_in_table_structure.phtml:101
+#, php-format
+msgid "An index has been added on %s."
+msgstr "'n Indeks is bygevoeg op %s."
+
+#: templates/table/structure/actions_in_table_structure.phtml:130
+#: templates/table/structure/check_all_table_column.phtml:59
+#, fuzzy
+msgid "Remove from central columns"
+msgstr "Hernoem tabel na"
+
+#: templates/table/structure/actions_in_table_structure.phtml:138
+#: templates/table/structure/check_all_table_column.phtml:55
+#, fuzzy
+msgid "Add to central columns"
+msgstr "Voeg 'n nuwe veld by"
+
+#: templates/table/structure/add_column.phtml:7
+#, fuzzy, php-format
+msgid "Add %s column(s)"
+msgstr "Voeg 'n nuwe veld by"
+
+#: templates/table/structure/add_column.phtml:12
+#, fuzzy
+#| msgid "At Beginning of Table"
+msgid "at beginning of table"
+msgstr "By Begin van Tabel"
+
+#: templates/table/structure/display_structure.phtml:140 view_create.php:181
+#, fuzzy
+#| msgid "Print view"
+msgid "Edit view"
+msgstr "Drukker mooi (print view)"
+
+#: templates/table/structure/display_table_stats.phtml:9
+msgid "Space usage"
+msgstr "Spasie verbruik"
+
+#: templates/table/structure/display_table_stats.phtml:32
+msgid "Effective"
+msgstr "Effektief"
+
+#: templates/table/structure/move_columns_dialog.phtml:1
+#: templates/table/structure/optional_action_links.phtml:21
+#, fuzzy
+msgid "Move columns"
+msgstr "Voeg 'n nuwe veld by"
+
+#: templates/table/structure/move_columns_dialog.phtml:2
+msgid "Move the columns by dragging them up and down."
+msgstr ""
+
+#: templates/table/structure/optional_action_links.phtml:9
+msgid "Propose table structure"
+msgstr "Stel tabel struktuur voor"
+
+#: templates/table/structure/optional_action_links.phtml:24
+#, fuzzy
+#| msgid "Propose table structure"
+msgid "Improve table structure"
+msgstr "Stel tabel struktuur voor"
+
+#: templates/table/structure/optional_action_links.phtml:30
+#, fuzzy
+#| msgid "Track table"
+msgid "Track view"
+msgstr "Volg tabel"
+
+#: templates/table/structure/row_stats_table.phtml:3
+#, fuzzy
+#| msgid "Row Statistics"
+msgid "Row statistics"
+msgstr "Ry Statistiek"
+
+#: templates/table/structure/row_stats_table.phtml:9
+msgid "static"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:11
+msgid "dynamic"
+msgstr "dinamies"
+
+#: templates/table/structure/row_stats_table.phtml:22
+msgid "partitioned"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:54
+msgid "Row length"
+msgstr "Ry lengte"
+
+#: templates/table/structure/row_stats_table.phtml:66
+msgid "Row size"
+msgstr "Ry grootte"
+
+#: templates/table/structure/row_stats_table.phtml:73
+msgid "Next autoindex"
+msgstr ""
+
+#: templates/table/structure/table_structure_row.phtml:46
+#, fuzzy, php-format
+#| msgid "Table %s has been dropped."
+msgid "Column %s has been dropped."
+msgstr "Tabel %s is verwyder"
+
 #: themes.php:17 themes.php:22
 msgid "Theme"
 msgstr ""
diff --git a/po/ar.po b/po/ar.po
index e05b4b1189..21b7ab7b0d 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 4.5.0-dev\n"
 "Report-Msgid-Bugs-To: developers@phpmyadmin.net\n"
-"POT-Creation-Date: 2015-08-08 13:53-0400\n"
+"POT-Creation-Date: 2015-08-12 08:10-0400\n"
 "PO-Revision-Date: 2015-03-27 10:17+0200\n"
 "Last-Translator: Ahmed Saleh Abd El-Raouf Ismae <a.saleh.ismael@gmail.com>\n"
 "Language-Team: Arabic <https://hosted.weblate.org/projects/phpmyadmin/master/"
@@ -54,7 +54,7 @@ msgid "Table comments:"
 msgstr "تعليقات الجدول:"
 
 #: db_datadict.php:104 libraries/Index.class.php:699
-#: libraries/insert_edit.lib.php:1567
+#: libraries/insert_edit.lib.php:1565
 #: libraries/navigation/Nodes/Node_Column.class.php:30
 #: libraries/plugins/export/ExportHtmlword.class.php:280
 #: libraries/plugins/export/ExportHtmlword.class.php:375
@@ -68,13 +68,14 @@ msgstr "تعليقات الجدول:"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1023
 #: libraries/tracking.lib.php:879 libraries/tracking.lib.php:975
 #: templates/columns_definitions/column_name.phtml:18
-#: templates/index_form.phtml:124 templates/table/table_header.phtml:6
-#: templates/table/zoom_result_form.phtml:33
-#: templates/tbl_relation/common_form.phtml:10
-#: templates/tbl_relation/common_form.phtml:43
-#: templates/tbl_relation/foreign_key_row.phtml:194
-#: templates/tbl_relation/foreign_key_row.phtml:206
-#: templates/tbl_relation/internal_relational_row.phtml:71
+#: templates/table/index_form.phtml:124
+#: templates/table/relation/common_form.phtml:10
+#: templates/table/relation/common_form.phtml:43
+#: templates/table/relation/foreign_key_row.phtml:194
+#: templates/table/relation/foreign_key_row.phtml:206
+#: templates/table/relation/internal_relational_row.phtml:71
+#: templates/table/search/table_header.phtml:6
+#: templates/table/search/zoom_result_form.phtml:33
 msgid "Column"
 msgstr "عمود"
 
@@ -92,21 +93,21 @@ msgstr "عمود"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1001
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1024
 #: libraries/rte/rte_list.lib.php:75 libraries/rte/rte_list.lib.php:103
-#: libraries/rte/rte_routines.lib.php:802
-#: libraries/rte/rte_routines.lib.php:831
-#: libraries/rte/rte_routines.lib.php:1493
+#: libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_routines.lib.php:922
+#: libraries/rte/rte_routines.lib.php:1584
 #: libraries/server_privileges.lib.php:2369 libraries/tracking.lib.php:880
 #: libraries/tracking.lib.php:972
 #: templates/columns_definitions/table_fields_definitions.phtml:11
-#: templates/structure/table_header.phtml:48
-#: templates/structure/table_structure_header.phtml:6
-#: templates/table/table_header.phtml:7
+#: templates/database/structure/table_header.phtml:48
+#: templates/table/search/table_header.phtml:7
+#: templates/table/structure/table_structure_header.phtml:6
 msgid "Type"
 msgstr "النوع"
 
 #: db_datadict.php:106 libraries/Index.class.php:702
 #: libraries/central_columns.lib.php:708
-#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1576
+#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1574
 #: libraries/plugins/export/ExportHtmlword.class.php:286
 #: libraries/plugins/export/ExportHtmlword.class.php:381
 #: libraries/plugins/export/ExportLatex.class.php:509
@@ -119,8 +120,8 @@ msgstr "النوع"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1026
 #: libraries/tracking.lib.php:882 libraries/tracking.lib.php:978
 #: templates/columns_definitions/table_fields_definitions.phtml:39
-#: templates/structure/table_structure_header.phtml:9
-#: templates/table/zoom_result_form.phtml:34
+#: templates/table/search/zoom_result_form.phtml:34
+#: templates/table/structure/table_structure_header.phtml:9
 msgid "Null"
 msgstr "خالي"
 
@@ -138,8 +139,8 @@ msgstr "خالي"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1027
 #: libraries/replication_gui.lib.php:153 libraries/tracking.lib.php:883
 #: templates/columns_definitions/table_fields_definitions.phtml:25
-#: templates/structure/body_for_table_summary.phtml:55
-#: templates/structure/table_structure_header.phtml:10
+#: templates/database/structure/body_for_table_summary.phtml:55
+#: templates/table/structure/table_structure_header.phtml:10
 msgid "Default"
 msgstr "إفتراضي"
 
@@ -167,19 +168,19 @@ msgid "Comments"
 msgstr "التعليقات"
 
 #: db_datadict.php:146
-#: libraries/controllers/StructureController.class.php:1960
-#: libraries/controllers/StructureController.class.php:1965
+#: libraries/controllers/TableStructureController.class.php:951
+#: libraries/controllers/TableStructureController.class.php:956
 #: libraries/tracking.lib.php:922
 #: templates/columns_definitions/column_indexes.phtml:6
-#: templates/structure/check_all_table_column.phtml:22
-#: templates/structure/display_structure.phtml:74
+#: templates/table/structure/check_all_table_column.phtml:22
+#: templates/table/structure/display_structure.phtml:74
 msgid "Primary"
 msgstr "أساسي"
 
 #: db_datadict.php:156 js/messages.php:317 libraries/Index.class.php:567
 #: libraries/Index.class.php:606 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261 libraries/mult_submits.lib.php:403
+#: libraries/config/FormDisplay.tpl.php:272 libraries/mult_submits.lib.php:403
 #: libraries/mult_submits.lib.php:417
 #: libraries/plugins/export/ExportHtmlword.class.php:630
 #: libraries/plugins/export/ExportLatex.class.php:589
@@ -195,20 +196,20 @@ msgstr "أساسي"
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1010 libraries/tracking.lib.php:1015
 #: prefs_manage.php:140 templates/prefs_autoload.phtml:15
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "No"
 msgstr "لا"
 
 #: db_datadict.php:156 js/messages.php:443 libraries/Index.class.php:568
 #: libraries/Index.class.php:605 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261
-#: libraries/controllers/StructureController.class.php:1344
-#: libraries/controllers/StructureController.class.php:2223
-#: libraries/controllers/StructureController.class.php:2232
-#: libraries/controllers/StructureController.class.php:2237
-#: libraries/controllers/StructureController.class.php:2242
-#: libraries/controllers/StructureController.class.php:2247
+#: libraries/config/FormDisplay.tpl.php:272
+#: libraries/controllers/TableStructureController.class.php:539
+#: libraries/controllers/TableStructureController.class.php:1201
+#: libraries/controllers/TableStructureController.class.php:1210
+#: libraries/controllers/TableStructureController.class.php:1215
+#: libraries/controllers/TableStructureController.class.php:1220
+#: libraries/controllers/TableStructureController.class.php:1225
 #: libraries/mult_submits.inc.php:82 libraries/mult_submits.inc.php:178
 #: libraries/mult_submits.lib.php:339 libraries/mult_submits.lib.php:372
 #: libraries/mult_submits.lib.php:401 libraries/mult_submits.lib.php:415
@@ -217,8 +218,8 @@ msgstr "لا"
 #: libraries/plugins/export/ExportOdt.class.php:756
 #: libraries/plugins/export/ExportTexytext.class.php:567
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1077
-#: libraries/server_databases.lib.php:464
-#: libraries/server_databases.lib.php:474
+#: libraries/server_databases.lib.php:475
+#: libraries/server_databases.lib.php:485
 #: libraries/server_privileges.lib.php:2546
 #: libraries/server_privileges.lib.php:2727
 #: libraries/server_privileges.lib.php:2748
@@ -228,7 +229,7 @@ msgstr "لا"
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1008 libraries/tracking.lib.php:1013
 #: prefs_manage.php:138 templates/prefs_autoload.phtml:14
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "Yes"
 msgstr "نعم"
 
@@ -238,7 +239,7 @@ msgstr "عرض مخطط تصدير قاعدة البيانات"
 
 #: db_export.php:37 db_tracking.php:90 export.php:382
 #: libraries/DBQbe.class.php:326
-#: libraries/controllers/StructureController.class.php:231
+#: libraries/controllers/DatabaseStructureController.class.php:170
 #: libraries/navigation/NavigationTree.class.php:897
 msgid "No tables found in database."
 msgstr "لم يعثر على جداول في قاعدة البيانات."
@@ -249,14 +250,14 @@ msgstr "لم يعثر على جداول في قاعدة البيانات."
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:26
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:120
-#: templates/structure/show_create.phtml:18
+#: templates/database/structure/show_create.phtml:18
 msgid "Tables"
 msgstr "جداول"
 
 #: db_export.php:52 libraries/Menu.class.php:317 libraries/Menu.class.php:425
-#: libraries/Util.class.php:3333 libraries/Util.class.php:3343
-#: libraries/Util.class.php:3349 libraries/Util.class.php:3629
-#: libraries/Util.class.php:4327 libraries/Util.class.php:4344
+#: libraries/Util.class.php:3339 libraries/Util.class.php:3349
+#: libraries/Util.class.php:3355 libraries/Util.class.php:3635
+#: libraries/Util.class.php:4333 libraries/Util.class.php:4350
 #: libraries/central_columns.lib.php:728 libraries/config.values.php:39
 #: libraries/config.values.php:47 libraries/config.values.php:109
 #: libraries/config.values.php:115 libraries/config/setup.forms.php:323
@@ -270,7 +271,7 @@ msgstr "جداول"
 #: libraries/navigation/Nodes/Node_Table.class.php:283
 #: libraries/server_privileges.lib.php:1141 libraries/tracking.lib.php:874
 #: templates/columns_definitions/table_fields_definitions.phtml:3
-#: templates/designer/table_list.phtml:28
+#: templates/database/designer/table_list.phtml:28
 msgid "Structure"
 msgstr "بناء"
 
@@ -282,7 +283,7 @@ msgstr "بناء"
 #: libraries/config/user_preferences.forms.php:292
 #: libraries/config/user_preferences.forms.php:297
 #: libraries/server_privileges.lib.php:1140
-#: templates/structure/display_table_stats.phtml:12
+#: templates/table/structure/display_table_stats.phtml:12
 msgid "Data"
 msgstr "بيانات"
 
@@ -354,10 +355,10 @@ msgstr "الجداول المتعقبة"
 #: libraries/server_privileges.lib.php:2908
 #: libraries/server_privileges.lib.php:3145
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4346
-#: templates/structure/table_header.phtml:21
-#: templates/tbl_relation/foreign_key_row.phtml:176
-#: templates/tbl_relation/internal_relational_row.phtml:63
+#: libraries/server_privileges.lib.php:4372
+#: templates/database/structure/table_header.phtml:21
+#: templates/table/relation/foreign_key_row.phtml:176
+#: templates/table/relation/internal_relational_row.phtml:63
 msgid "Table"
 msgstr "الجدول"
 
@@ -374,7 +375,7 @@ msgid "Updated"
 msgstr "محدث"
 
 #: db_tracking.php:130 js/messages.php:243 libraries/Menu.class.php:552
-#: libraries/Util.class.php:4314 libraries/config.values.php:104
+#: libraries/Util.class.php:4320 libraries/config.values.php:104
 #: libraries/rte/rte_events.lib.php:393 libraries/rte/rte_list.lib.php:101
 #: libraries/server_status_processes.lib.php:92 libraries/tracking.lib.php:279
 msgid "Status"
@@ -383,14 +384,15 @@ msgstr "الحالة"
 #: db_tracking.php:131 db_tracking.php:290 libraries/Index.class.php:693
 #: libraries/central_columns.lib.php:687 libraries/rte/rte_list.lib.php:74
 #: libraries/rte/rte_list.lib.php:89 libraries/rte/rte_list.lib.php:102
-#: libraries/server_databases.lib.php:398
+#: libraries/server_databases.lib.php:409
 #: libraries/server_privileges.lib.php:2372
 #: libraries/server_privileges.lib.php:3166
 #: libraries/server_privileges.lib.php:3342
 #: libraries/server_user_groups.lib.php:82
 #: libraries/server_variables.lib.php:189 libraries/tracking.lib.php:280
-#: libraries/tracking.lib.php:793 templates/structure/table_header.phtml:30
-#: templates/structure/table_structure_header.phtml:23
+#: libraries/tracking.lib.php:793
+#: templates/database/structure/table_header.phtml:30
+#: templates/table/structure/table_structure_header.phtml:23
 msgid "Action"
 msgstr "العملية"
 
@@ -432,7 +434,7 @@ msgid "Untracked tables"
 msgstr "الجداول الغير متتبعة"
 
 #: db_tracking.php:305 db_tracking.php:336
-#: templates/structure/optional_action_links.phtml:17
+#: templates/table/structure/optional_action_links.phtml:17
 msgid "Track table"
 msgstr "تتبع الجدول"
 
@@ -482,7 +484,7 @@ msgid "Value for the column \"%s\""
 msgstr "قيمة العمود \"%s\""
 
 #: gis_data_editor.php:146
-#: templates/gis_visualization/gis_visualization.phtml:37
+#: templates/table/gis_visualization/gis_visualization.phtml:37
 msgid "Use OpenStreetMaps as Base Layer"
 msgstr "إستعمل خريطة الشوارع الحرة كطبقة أساسية"
 
@@ -562,35 +564,35 @@ msgstr "أضف هندسة"
 #: libraries/display_change_password.lib.php:162
 #: libraries/display_export.lib.php:402 libraries/display_export.lib.php:408
 #: libraries/display_import.lib.php:392 libraries/index.lib.php:44
-#: libraries/insert_edit.lib.php:1546 libraries/insert_edit.lib.php:1583
+#: libraries/insert_edit.lib.php:1544 libraries/insert_edit.lib.php:1581
 #: libraries/normalization.lib.php:165 libraries/normalization.lib.php:821
 #: libraries/operations.lib.php:38 libraries/operations.lib.php:108
 #: libraries/operations.lib.php:263 libraries/operations.lib.php:306
 #: libraries/operations.lib.php:801 libraries/operations.lib.php:874
 #: libraries/operations.lib.php:923 libraries/operations.lib.php:1337
 #: libraries/operations.lib.php:1658
-#: libraries/plugins/auth/AuthenticationCookie.class.php:244
+#: libraries/plugins/auth/AuthenticationCookie.class.php:232
 #: libraries/replication_gui.lib.php:122 libraries/replication_gui.lib.php:161
 #: libraries/replication_gui.lib.php:324 libraries/replication_gui.lib.php:461
 #: libraries/replication_gui.lib.php:906 libraries/rte/rte_events.lib.php:509
-#: libraries/rte/rte_routines.lib.php:969
-#: libraries/rte/rte_routines.lib.php:1581
+#: libraries/rte/rte_routines.lib.php:1060
+#: libraries/rte/rte_routines.lib.php:1672
 #: libraries/rte/rte_triggers.lib.php:396 libraries/server_bin_log.lib.php:61
 #: libraries/server_privileges.lib.php:705
 #: libraries/server_privileges.lib.php:2106
 #: libraries/server_privileges.lib.php:2872
 #: libraries/server_privileges.lib.php:3553
-#: libraries/server_privileges.lib.php:4627
+#: libraries/server_privileges.lib.php:4653
 #: libraries/server_user_groups.lib.php:285
 #: libraries/sql_query_form.lib.php:369 libraries/sql_query_form.lib.php:429
 #: libraries/tracking.lib.php:533 libraries/tracking.lib.php:653
 #: prefs_manage.php:277 prefs_manage.php:355
 #: templates/columns_definitions/column_definitions_form.phtml:59
-#: templates/header_location.phtml:17 templates/index_form.phtml:238
+#: templates/database/create_table.phtml:21 templates/header_location.phtml:28
 #: templates/startAndNumberOfRowsPanel.phtml:14
-#: templates/structure/add_column.phtml:25
-#: templates/table/create_table.phtml:21
-#: templates/table/selection_form.phtml:75 view_create.php:275
+#: templates/table/index_form.phtml:238
+#: templates/table/search/selection_form.phtml:75
+#: templates/table/structure/add_column.phtml:25 view_create.php:275
 #: view_operations.php:106
 msgid "Go"
 msgstr "إنطلق"
@@ -674,7 +676,7 @@ msgstr "لاتستطيع تغيير ترميز الملفات بدون مكتب
 msgid "Could not load import plugins, please check your installation!"
 msgstr "لم أتمكن من تحميل قوابس الاستيراد، الرجاء فحص تثبيتك!"
 
-#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1466
+#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1460
 #, php-format
 msgid "Bookmark %s has been created."
 msgstr "تم إنشاء العلامة المرجعية %s."
@@ -708,11 +710,11 @@ msgstr ""
 msgid "Back"
 msgstr "رجوع"
 
-#: index.php:148 libraries/Footer.class.php:70
+#: index.php:149 libraries/Footer.class.php:70
 msgid "phpMyAdmin Demo Server"
 msgstr "phpMyAdmin الخادم التجريبي"
 
-#: index.php:152
+#: index.php:153
 #, php-format
 msgid ""
 "You are using the demo server. You can do anything here, but please do not "
@@ -720,110 +722,110 @@ msgid ""
 "at %s."
 msgstr ""
 
-#: index.php:162
+#: index.php:163
 msgid "General Settings"
 msgstr "الإعدادات العامة"
 
-#: index.php:190 libraries/display_change_password.lib.php:50
+#: index.php:191 libraries/display_change_password.lib.php:50
 #: libraries/display_change_password.lib.php:53 user_password.php:247
 msgid "Change password"
 msgstr "تغيير كلمة السر"
 
-#: index.php:206
+#: index.php:207
 msgid "Server connection collation"
 msgstr "إعدادات الأتصال بالخادم"
 
-#: index.php:228
+#: index.php:229
 msgid "Appearance Settings"
 msgstr "إعدادات المظهر"
 
-#: index.php:258 prefs_manage.php:285
+#: index.php:259 prefs_manage.php:285
 msgid "More settings"
 msgstr "المزيد من الإعدادات"
 
-#: index.php:279
+#: index.php:280
 msgid "Database server"
 msgstr "خادم قاعدة بيانات"
 
-#: index.php:282 libraries/plugins/auth/AuthenticationCookie.class.php:181
+#: index.php:283 libraries/plugins/auth/AuthenticationCookie.class.php:169
 msgid "Server:"
 msgstr "الخادم:"
 
-#: index.php:286
+#: index.php:287
 msgid "Server type:"
 msgstr "نوع الخادم :"
 
-#: index.php:290 libraries/plugins/export/ExportLatex.class.php:212
+#: index.php:291 libraries/plugins/export/ExportLatex.class.php:212
 #: libraries/plugins/export/ExportSql.class.php:687
 #: libraries/plugins/export/ExportXml.class.php:189
 msgid "Server version:"
 msgstr "إصدار الخادم :"
 
-#: index.php:296
+#: index.php:297
 msgid "Protocol version:"
 msgstr "نسخة البروتوكول :"
 
-#: index.php:300
+#: index.php:301
 msgid "User:"
 msgstr "المستخدم :"
 
-#: index.php:305
+#: index.php:306
 msgid "Server charset:"
 msgstr "مجموعة أحرف الخادم :"
 
-#: index.php:320
+#: index.php:321
 msgid "Web server"
 msgstr "خادم الويب"
 
-#: index.php:331
+#: index.php:332
 msgid "Database client version:"
 msgstr "إصدار عميل قاعدة البيانات :"
 
-#: index.php:335
+#: index.php:336
 msgid "PHP extension:"
 msgstr "PHP إمتداد:"
 
-#: index.php:349
+#: index.php:350
 msgid "PHP version:"
 msgstr "PHP إصدار :"
 
-#: index.php:360
+#: index.php:361
 msgid "Show PHP information"
 msgstr "عرض المعلومات المتعلقة ب  PHP"
 
-#: index.php:383
+#: index.php:384
 msgid "Version information:"
 msgstr "بيانات الإصدار:"
 
-#: index.php:392 libraries/Util.class.php:432 libraries/Util.class.php:495
-#: libraries/config/FormDisplay.tpl.php:151
+#: index.php:393 libraries/Util.class.php:432 libraries/Util.class.php:495
+#: libraries/config/FormDisplay.tpl.php:162
 #: libraries/display_export.lib.php:577 libraries/engines/pbxt.lib.php:162
 #: libraries/navigation/NavigationHeader.class.php:196
 #: libraries/server_variables.lib.php:160
 msgid "Documentation"
 msgstr "مستندات وثائقية"
 
-#: index.php:399
+#: index.php:400
 msgid "Wiki"
 msgstr "ويكي"
 
-#: index.php:408
+#: index.php:409
 msgid "Official Homepage"
 msgstr "الصفحة الرئيسية الرسمية لـ phpMyAdmin"
 
-#: index.php:415
+#: index.php:416
 msgid "Contribute"
 msgstr "مشاركه"
 
-#: index.php:422
+#: index.php:423
 msgid "Get support"
 msgstr "اجلب دعم"
 
-#: index.php:429
+#: index.php:430
 msgid "List of changes"
 msgstr "قائمة التعديلات"
 
-#: index.php:451
+#: index.php:452
 #, fuzzy
 #| msgid ""
 #| "Your configuration file contains settings (root with no password) that "
@@ -841,21 +843,21 @@ msgstr ""
 "الافتراضية معرض لخطر الاقتحام، وعليك أن تقوم بإصلاح ثغرة الأمان هذه في أقرب "
 "وقت ممكن."
 
-#: index.php:468
+#: index.php:469
 msgid ""
 "You have enabled mbstring.func_overload in your PHP configuration. This "
 "option is incompatible with phpMyAdmin and might cause some data to be "
 "corrupted!"
 msgstr ""
 
-#: index.php:483
+#: index.php:484
 msgid ""
 "The mbstring PHP extension was not found and you seem to be using a "
 "multibyte charset. Without the mbstring extension phpMyAdmin is unable to "
 "split strings correctly and it may result in unexpected results."
 msgstr ""
 
-#: index.php:500
+#: index.php:501
 msgid ""
 "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini."
 "session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower than "
@@ -863,17 +865,17 @@ msgid ""
 "expire sooner than configured in phpMyAdmin."
 msgstr ""
 
-#: index.php:519
+#: index.php:520
 msgid ""
 "Login cookie store is lower than cookie validity configured in phpMyAdmin, "
 "because of this, your login will expire sooner than configured in phpMyAdmin."
 msgstr ""
 
-#: index.php:535
+#: index.php:536
 msgid "The configuration file now needs a secret passphrase (blowfish_secret)."
 msgstr "يحتاج ملف الإعداد الآن إلى كلمة المرور السرية."
 
-#: index.php:548
+#: index.php:549
 msgid ""
 "Directory [code]config[/code], which is used by the setup script, still "
 "exists in your phpMyAdmin directory. It is strongly recommended to remove it "
@@ -881,7 +883,7 @@ msgid ""
 "may be compromised by unauthorized people downloading your configuration."
 msgstr ""
 
-#: index.php:564
+#: index.php:565
 #, fuzzy, php-format
 #| msgid ""
 #| " additional features for working with linked tables have been ctivated. "
@@ -893,19 +895,19 @@ msgstr ""
 "تم تعطيل المزايا الإضافية للعمل بالجداول المترابطة. لمعرفة السبب اضغط %sهنا"
 "%s."
 
-#: index.php:571
+#: index.php:572
 msgid ""
 "Or alternately go to 'Operations' tab of any database to set it up there."
 msgstr ""
 
-#: index.php:620
+#: index.php:621
 #, php-format
 msgid ""
 "Your PHP MySQL library version %s differs from your MySQL server version %s. "
 "This may cause unpredictable behavior."
 msgstr ""
 
-#: index.php:648
+#: index.php:649
 #, php-format
 msgid ""
 "Server running with Suhosin. Please refer to %sdocumentation%s for possible "
@@ -1074,8 +1076,8 @@ msgstr ""
 msgid "Save & Close"
 msgstr "حفظ كملف"
 
-#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:404
-#: libraries/insert_edit.lib.php:1550 prefs_manage.php:361
+#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:415
+#: libraries/insert_edit.lib.php:1548 prefs_manage.php:361
 #: prefs_manage.php:372
 msgid "Reset"
 msgstr "إعادة تعيين"
@@ -1116,7 +1118,7 @@ msgstr "إضافة فهرس"
 msgid "Edit Index"
 msgstr "حرّر الفهرس"
 
-#: js/messages.php:99 templates/index_form.phtml:232
+#: js/messages.php:99 templates/table/index_form.phtml:232
 #, fuzzy, php-format
 #| msgid "Add %d column(s) to index"
 msgid "Add %s column(s) to index"
@@ -1146,15 +1148,16 @@ msgstr "حقل محاط بـ"
 msgid "Please select column(s) for the index."
 msgstr "أضف %d عمود/عواميد إلى الفهرس"
 
-#: js/messages.php:106 templates/structure/add_column.phtml:1
+#: js/messages.php:106 templates/table/structure/add_column.phtml:1
 #, fuzzy
 #| msgid "You have to choose at least one column to display"
 msgid "You have to add at least one column."
 msgstr "عليك اختيار عمود واحد على الأقل للعرض"
 
-#: js/messages.php:109 libraries/insert_edit.lib.php:1548
+#: js/messages.php:109 libraries/insert_edit.lib.php:1546
 #: templates/columns_definitions/column_definitions_form.phtml:162
-#: templates/index_form.phtml:237 templates/tbl_relation/common_form.phtml:106
+#: templates/table/index_form.phtml:237
+#: templates/table/relation/common_form.phtml:106
 msgid "Preview SQL"
 msgstr ""
 
@@ -1177,7 +1180,7 @@ msgid "SQL query:"
 msgstr "استعلام SQL"
 
 #. l10n: Default label for the y-Axis of Charts
-#: js/messages.php:118 templates/tbl_chart.phtml:109
+#: js/messages.php:118 templates/table/chart/tbl_chart.phtml:109
 #, fuzzy
 #| msgid "Value"
 msgid "Y Values"
@@ -1339,7 +1342,7 @@ msgstr "بايتات أُرسلت"
 msgid "Bytes received"
 msgstr "بايتات أُستلمت"
 
-#: js/messages.php:169 libraries/server_status.lib.php:226
+#: js/messages.php:169 libraries/server_status.lib.php:235
 msgid "Connections"
 msgstr "اتصالات"
 
@@ -1396,12 +1399,12 @@ msgstr "%d جدول/جداول"
 msgid "Questions"
 msgstr "العمليات"
 
-#: js/messages.php:184 libraries/server_status.lib.php:134
+#: js/messages.php:184 libraries/server_status.lib.php:143
 msgid "Traffic"
 msgstr "بيانات سير"
 
 #: js/messages.php:185 libraries/Menu.class.php:586
-#: libraries/Util.class.php:4318 libraries/server_status_monitor.lib.php:257
+#: libraries/Util.class.php:4324 libraries/server_status_monitor.lib.php:257
 msgid "Settings"
 msgstr "الإعدادات"
 
@@ -1423,8 +1426,9 @@ msgstr "فضلا , أضف متغير واحد على الأقل للسلسلة"
 #: libraries/server_status_monitor.lib.php:236
 #: libraries/server_status_processes.lib.php:308
 #: templates/columns_definitions/transformation.phtml:4
-#: templates/designer/options_panel.phtml:178
-#: templates/table/options_zoom.phtml:12 templates/table/rows_zoom.phtml:26
+#: templates/database/designer/options_panel.phtml:178
+#: templates/table/search/options_zoom.phtml:12
+#: templates/table/search/rows_zoom.phtml:26
 msgid "None"
 msgstr "لا شيء"
 
@@ -1696,8 +1700,8 @@ msgstr ""
 
 #: js/messages.php:270 libraries/Menu.class.php:352
 #: libraries/Menu.class.php:455 libraries/Menu.class.php:582
-#: libraries/Util.class.php:4317 libraries/Util.class.php:4332
-#: libraries/Util.class.php:4349 libraries/config/messages.inc.php:258
+#: libraries/Util.class.php:4323 libraries/Util.class.php:4338
+#: libraries/Util.class.php:4355 libraries/config/messages.inc.php:258
 #: libraries/display_import.lib.php:105
 #: libraries/server_status_monitor.lib.php:318 prefs_manage.php:238
 #: setup/frames/menu.inc.php:26
@@ -1759,13 +1763,13 @@ msgid "Formatting SQL..."
 msgstr ""
 
 #: js/messages.php:293 libraries/server_variables.lib.php:157
-#: templates/designer/aggregate_query_panel.phtml:63
-#: templates/designer/delete_relation_panel.phtml:28
-#: templates/designer/having_query_panel.phtml:117
-#: templates/designer/new_relation_panel.phtml:88
-#: templates/designer/options_panel.phtml:253
-#: templates/designer/rename_to_panel.phtml:45
-#: templates/designer/where_query_panel.phtml:83
+#: templates/database/designer/aggregate_query_panel.phtml:63
+#: templates/database/designer/delete_relation_panel.phtml:28
+#: templates/database/designer/having_query_panel.phtml:117
+#: templates/database/designer/new_relation_panel.phtml:88
+#: templates/database/designer/options_panel.phtml:253
+#: templates/database/designer/rename_to_panel.phtml:45
+#: templates/database/designer/where_query_panel.phtml:83
 msgid "Cancel"
 msgstr "ألغاء"
 
@@ -1775,7 +1779,7 @@ msgstr "ألغاء"
 msgid "Page-related settings"
 msgstr "تغيير الإعدادات"
 
-#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:402
+#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:413
 msgid "Apply"
 msgstr ""
 
@@ -1812,8 +1816,8 @@ msgstr ""
 msgid "Error text: %s"
 msgstr ""
 
-#: js/messages.php:307 libraries/db_common.inc.php:68
-#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:450
+#: js/messages.php:307 libraries/db_common.inc.php:69
+#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:461
 msgid "No databases selected."
 msgstr "لا قواعد بيانات محددة."
 
@@ -1825,12 +1829,13 @@ msgstr "إزالة العمود"
 msgid "Adding Primary Key"
 msgstr "إضافة مفتاح رئيسي"
 
-#: js/messages.php:310 templates/designer/aggregate_query_panel.phtml:59
-#: templates/designer/having_query_panel.phtml:113
-#: templates/designer/new_relation_panel.phtml:87
-#: templates/designer/options_panel.phtml:252
-#: templates/designer/rename_to_panel.phtml:41
-#: templates/designer/where_query_panel.phtml:82
+#: js/messages.php:310
+#: templates/database/designer/aggregate_query_panel.phtml:59
+#: templates/database/designer/having_query_panel.phtml:113
+#: templates/database/designer/new_relation_panel.phtml:87
+#: templates/database/designer/options_panel.phtml:252
+#: templates/database/designer/rename_to_panel.phtml:41
+#: templates/database/designer/where_query_panel.phtml:82
 msgid "OK"
 msgstr "موافق"
 
@@ -1850,7 +1855,7 @@ msgstr "نسخ قاعدة البيانات"
 msgid "Changing Charset"
 msgstr "تغيير مجموعة المحارف"
 
-#: js/messages.php:320 libraries/Util.class.php:3217
+#: js/messages.php:320 libraries/Util.class.php:3223
 #, fuzzy
 #| msgid "Disable foreign key checks"
 msgid "Enable foreign key checks"
@@ -1889,20 +1894,21 @@ msgstr "تعريف الدالة المخزنة يجب أن تحتوي جملة R
 #: js/messages.php:334 libraries/DisplayResults.class.php:4834
 #: libraries/DisplayResults.class.php:5092 libraries/Menu.class.php:344
 #: libraries/Menu.class.php:446 libraries/Menu.class.php:578
-#: libraries/Util.class.php:3636 libraries/Util.class.php:3637
-#: libraries/Util.class.php:4316 libraries/Util.class.php:4331
-#: libraries/Util.class.php:4348 libraries/config/messages.inc.php:252
+#: libraries/Util.class.php:3642 libraries/Util.class.php:3643
+#: libraries/Util.class.php:4322 libraries/Util.class.php:4337
+#: libraries/Util.class.php:4354 libraries/config/messages.inc.php:252
 #: libraries/display_export.lib.php:173 libraries/rte/rte_list.lib.php:146
 #: libraries/server_privileges.lib.php:2211
 #: libraries/server_privileges.lib.php:2290
 #: libraries/server_privileges.lib.php:2632
 #: libraries/server_privileges.lib.php:3356
 #: libraries/server_status_monitor.lib.php:322 prefs_manage.php:303
-#: setup/frames/menu.inc.php:27 templates/structure/check_all_tables.phtml:11
+#: setup/frames/menu.inc.php:27
+#: templates/database/structure/check_all_tables.phtml:11
 msgid "Export"
 msgstr "تصدير"
 
-#: js/messages.php:337 libraries/rte/rte_routines.lib.php:652
+#: js/messages.php:337 libraries/rte/rte_routines.lib.php:743
 msgid "ENUM/SET editor"
 msgstr ""
 
@@ -1944,7 +1950,7 @@ msgstr "إظهار صندوق الإستعلام"
 #: libraries/Console.class.php:214 libraries/DisplayResults.class.php:3474
 #: libraries/DisplayResults.class.php:4818 libraries/Index.class.php:723
 #: libraries/Util.class.php:706 libraries/Util.class.php:1202
-#: libraries/Util.class.php:3634 libraries/Util.class.php:3635
+#: libraries/Util.class.php:3640 libraries/Util.class.php:3641
 #: libraries/central_columns.lib.php:851
 #: libraries/central_columns.lib.php:1193
 #: libraries/config/messages.inc.php:892
@@ -1962,7 +1968,7 @@ msgstr "تعديل"
 #: libraries/server_user_groups.lib.php:129
 #: libraries/sql_query_form.lib.php:416 libraries/tracking.lib.php:477
 #: setup/frames/index.inc.php:183 setup/frames/index.inc.php:291
-#: templates/designer/delete_relation_panel.phtml:27
+#: templates/database/designer/delete_relation_panel.phtml:27
 msgid "Delete"
 msgstr "حذف"
 
@@ -2144,11 +2150,11 @@ msgid "No dependencies selected!"
 msgstr "لا قواعد بيانات محددة."
 
 #: js/messages.php:394 libraries/central_columns.lib.php:1214
-#: libraries/insert_edit.lib.php:1458 libraries/server_variables.lib.php:155
+#: libraries/insert_edit.lib.php:1456 libraries/server_variables.lib.php:155
 #: setup/frames/config.inc.php:42 setup/frames/index.inc.php:279
 #: templates/columns_definitions/column_definitions_form.phtml:165
-#: templates/gis_visualization/gis_visualization.phtml:48
-#: templates/tbl_relation/common_form.phtml:107
+#: templates/table/gis_visualization/gis_visualization.phtml:48
+#: templates/table/relation/common_form.phtml:107
 msgid "Save"
 msgstr "حفظ"
 
@@ -2240,8 +2246,8 @@ msgid "Data point content"
 msgstr "محتوى نقطة البيانات"
 
 #: js/messages.php:430 js/messages.php:562 js/messages.php:579
-#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2573
-#: templates/index_form.phtml:154 templates/index_form.phtml:194
+#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2571
+#: templates/table/index_form.phtml:154 templates/table/index_form.phtml:194
 msgid "Ignore"
 msgstr "تجاهل"
 
@@ -2302,8 +2308,8 @@ msgstr "إختيار المفتاح الغريب"
 msgid "Please select the primary key or a unique key!"
 msgstr "فضلاً أختر المفتاح الرئيسي أو المفتاح الفريد"
 
-#: js/messages.php:457 templates/designer/side_menu.phtml:91
-#: templates/designer/side_menu.phtml:94
+#: js/messages.php:457 templates/database/designer/side_menu.phtml:91
+#: templates/database/designer/side_menu.phtml:94
 msgid "Choose column to display"
 msgstr "اختر الحقل لإظهاره"
 
@@ -2319,22 +2325,22 @@ msgstr ""
 msgid "Page name"
 msgstr "صفحة رقم:"
 
-#: js/messages.php:463 templates/designer/side_menu.phtml:56
-#: templates/designer/side_menu.phtml:59
+#: js/messages.php:463 templates/database/designer/side_menu.phtml:56
+#: templates/database/designer/side_menu.phtml:59
 #, fuzzy
 #| msgid "Select Tables"
 msgid "Save page"
 msgstr "اختر الجداول"
 
-#: js/messages.php:464 templates/designer/side_menu.phtml:63
-#: templates/designer/side_menu.phtml:66
+#: js/messages.php:464 templates/database/designer/side_menu.phtml:63
+#: templates/database/designer/side_menu.phtml:66
 #, fuzzy
 #| msgid "Select Tables"
 msgid "Save page as"
 msgstr "اختر الجداول"
 
-#: js/messages.php:465 templates/designer/side_menu.phtml:49
-#: templates/designer/side_menu.phtml:52
+#: js/messages.php:465 templates/database/designer/side_menu.phtml:49
+#: templates/database/designer/side_menu.phtml:52
 #, fuzzy
 #| msgid "Free pages"
 msgid "Open page"
@@ -2346,7 +2352,7 @@ msgstr "صفحات حرة"
 msgid "Delete page"
 msgstr "اختر الجداول"
 
-#: js/messages.php:467 templates/designer/side_menu.phtml:10
+#: js/messages.php:467 templates/database/designer/side_menu.phtml:10
 #, fuzzy
 #| msgid "Unit"
 msgid "Untitled"
@@ -2480,7 +2486,7 @@ msgstr "منحنى"
 msgid "cancel"
 msgstr "ألغاء"
 
-#: js/messages.php:499 libraries/server_status.lib.php:271
+#: js/messages.php:499 libraries/server_status.lib.php:280
 msgid "Aborted"
 msgstr "ألغي"
 
@@ -3113,7 +3119,7 @@ msgstr "رقم منفذ غير صحيح"
 
 #: js/messages.php:793 libraries/Message.class.php:199
 #: libraries/Util.class.php:654 libraries/core.lib.php:245
-#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1172
+#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1170
 #: tbl_operations.php:229 view_operations.php:63
 msgid "Error"
 msgstr "خطأ"
@@ -3175,8 +3181,8 @@ msgstr "لكل ثانية"
 msgid "per minute"
 msgstr "لكل دقيقة"
 
-#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:143
-#: libraries/server_status.lib.php:228
+#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:152
+#: libraries/server_status.lib.php:237
 #: libraries/server_status_queries.lib.php:98
 msgid "per hour"
 msgstr "لكل ساعة"
@@ -3194,7 +3200,7 @@ msgstr "ملف الإعدادت (%s) غير قابل للقراءة."
 msgid "Wrong permissions on configuration file, should not be world writable!"
 msgstr "صلاحيات خاطئة على ملف الإعدادات , لاينبغى أن يكون قابل للكتابة!"
 
-#: libraries/Config.class.php:1799
+#: libraries/Config.class.php:1801
 msgid "Font size"
 msgstr "حجم الخط"
 
@@ -3224,10 +3230,10 @@ msgstr "في الاستعلام"
 #: libraries/server_privileges.lib.php:2890
 #: libraries/server_privileges.lib.php:3144
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4332
+#: libraries/server_privileges.lib.php:4358
 #: libraries/server_status_processes.lib.php:80
-#: templates/tbl_relation/foreign_key_row.phtml:165
-#: templates/tbl_relation/internal_relational_row.phtml:55
+#: templates/table/relation/foreign_key_row.phtml:165
+#: templates/table/relation/internal_relational_row.phtml:55
 msgid "Database"
 msgstr "قاعدة البيانات"
 
@@ -3340,11 +3346,11 @@ msgstr "نصوص SQL سابقة"
 #: libraries/plugins/import/ImportMediawiki.class.php:60
 #: libraries/plugins/import/ImportOds.class.php:59
 #: libraries/plugins/import/ImportShp.class.php:57
-#: libraries/plugins/import/ImportSql.class.php:148
+#: libraries/plugins/import/ImportSql.class.php:51
 #: libraries/plugins/import/ImportXml.class.php:58
-#: libraries/rte/rte_routines.lib.php:833 templates/index_form.phtml:49
-#: templates/structure/row_stats_table.phtml:20
-#: templates/table/options.phtml:2
+#: libraries/rte/rte_routines.lib.php:924 templates/table/index_form.phtml:49
+#: templates/table/search/options.phtml:2
+#: templates/table/structure/row_stats_table.phtml:20
 msgid "Options"
 msgstr "خيارات"
 
@@ -3389,7 +3395,8 @@ msgstr "تنازليا"
 msgid "Order:"
 msgstr "آخر"
 
-#: libraries/Console.class.php:289 templates/table/replace_preview.phtml:17
+#: libraries/Console.class.php:289
+#: templates/table/search/replace_preview.phtml:17
 #, fuzzy
 #| msgid "Column"
 msgid "Count"
@@ -3516,9 +3523,9 @@ msgstr "بدل إلى الجدول المنسوخ"
 #: libraries/operations.lib.php:794 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:191
-#: templates/structure/sortable_header.phtml:21
-#: templates/structure/sortable_header.phtml:38
-#: templates/table/options.phtml:68
+#: templates/database/structure/sortable_header.phtml:21
+#: templates/database/structure/sortable_header.phtml:38
+#: templates/table/search/options.phtml:68
 msgid "Ascending"
 msgstr "تصاعديا"
 
@@ -3528,13 +3535,14 @@ msgstr "تصاعديا"
 #: libraries/operations.lib.php:797 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:188
-#: templates/structure/sortable_header.phtml:26
-#: templates/structure/sortable_header.phtml:43
-#: templates/table/options.phtml:69
+#: templates/database/structure/sortable_header.phtml:26
+#: templates/database/structure/sortable_header.phtml:43
+#: templates/table/search/options.phtml:69
 msgid "Descending"
 msgstr "تنازليا"
 
-#: libraries/DBQbe.class.php:467 templates/table/search_and_replace.phtml:6
+#: libraries/DBQbe.class.php:467
+#: templates/table/search/search_and_replace.phtml:6
 #, fuzzy
 #| msgid "Column"
 msgid "Column:"
@@ -3723,12 +3731,12 @@ msgstr[4] "%s مطابقة في الجدول <i>%s</i>"
 msgstr[5] "%s مطابقة في الجدول <i>%s</i>"
 
 #: libraries/DbSearch.class.php:354 libraries/Menu.class.php:311
-#: libraries/Util.class.php:3337 libraries/Util.class.php:3347
-#: libraries/Util.class.php:3623 libraries/Util.class.php:3624
-#: libraries/Util.class.php:4343 libraries/config.values.php:43
+#: libraries/Util.class.php:3343 libraries/Util.class.php:3353
+#: libraries/Util.class.php:3629 libraries/Util.class.php:3630
+#: libraries/Util.class.php:4349 libraries/config.values.php:43
 #: libraries/config.values.php:51 libraries/config.values.php:119
 #: libraries/navigation/Nodes/Node_Table.class.php:295
-#: templates/structure/check_all_table_column.phtml:5
+#: templates/table/structure/check_all_table_column.phtml:5
 msgid "Browse"
 msgstr "استعراض"
 
@@ -3745,7 +3753,8 @@ msgstr "بحث في قاعدة البيانات"
 msgid "Words or values to search for (wildcard: \"%\"):"
 msgstr "الكلمات أو القيم المطلوب البحث عنها (wildcard: \"%\"):"
 
-#: libraries/DbSearch.class.php:401 templates/table/search_and_replace.phtml:1
+#: libraries/DbSearch.class.php:401
+#: templates/table/search/search_and_replace.phtml:1
 msgid "Find:"
 msgstr "ابحث:"
 
@@ -3793,28 +3802,28 @@ msgstr "مرشح"
 msgid "Search this table"
 msgstr "بحث في قاعدة البيانات"
 
-#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2532
-#: libraries/Util.class.php:2535
+#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2538
+#: libraries/Util.class.php:2541
 msgctxt "First page"
 msgid "Begin"
 msgstr "بداية"
 
-#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2533
-#: libraries/Util.class.php:2536 libraries/server_bin_log.lib.php:170
+#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2539
+#: libraries/Util.class.php:2542 libraries/server_bin_log.lib.php:170
 #: libraries/server_bin_log.lib.php:172
 msgctxt "Previous page"
 msgid "Previous"
 msgstr "سابق"
 
-#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2564
-#: libraries/Util.class.php:2574 libraries/server_bin_log.lib.php:204
+#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2570
+#: libraries/Util.class.php:2580 libraries/server_bin_log.lib.php:204
 #: libraries/server_bin_log.lib.php:206
 msgctxt "Next page"
 msgid "Next"
 msgstr "التالي"
 
-#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2565
-#: libraries/Util.class.php:2575
+#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2571
+#: libraries/Util.class.php:2581
 msgctxt "Last page"
 msgid "End"
 msgstr "نهاية"
@@ -3893,9 +3902,9 @@ msgid "May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]."
 msgstr "ممكن أن يكون تقريبي. أنظر إلى [doc@faq3-11]الأسئلة المتكررة 3.11[/doc]"
 
 #: libraries/DisplayResults.class.php:4332 libraries/Message.class.php:180
-#: libraries/controllers/TableRelationController.class.php:258
+#: libraries/controllers/TableRelationController.class.php:259
 #: libraries/controllers/TableSearchController.class.php:655
-#: libraries/rte/rte_routines.lib.php:1332 libraries/sql_query_form.lib.php:89
+#: libraries/rte/rte_routines.lib.php:1423 libraries/sql_query_form.lib.php:89
 #: tbl_operations.php:227 tbl_row_action.php:138 view_operations.php:62
 #, fuzzy
 #| msgid "Your SQL query has been executed successfully."
@@ -3903,7 +3912,7 @@ msgid "Your SQL query has been executed successfully."
 msgstr "تم تنفيذ إستعلام SQL  بنجاح"
 
 #: libraries/DisplayResults.class.php:4660
-#: libraries/controllers/StructureController.class.php:629
+#: libraries/controllers/DatabaseStructureController.class.php:564
 #, php-format
 msgid ""
 "This view has at least this number of rows. Please refer to %sdocumentation"
@@ -3929,34 +3938,34 @@ msgstr ""
 msgid "%d total"
 msgstr "المجموع"
 
-#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1318
+#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1312
 #, fuzzy, php-format
 #| msgid "Query took %01.4f sec"
 msgid "Query took %01.4f seconds."
 msgstr "استغرق الاستعلام %01.4f ثانية"
 
 #: libraries/DisplayResults.class.php:4807
-#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4767
-#: libraries/Util.class.php:4773 libraries/mult_submits.inc.php:50
-#: templates/structure/check_all_tables.phtml:2
-#: templates/structure/check_all_tables.phtml:9
+#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4773
+#: libraries/Util.class.php:4779 libraries/mult_submits.inc.php:50
+#: templates/database/structure/check_all_tables.phtml:2
+#: templates/database/structure/check_all_tables.phtml:9
 msgid "With selected:"
 msgstr "مع المحدد:"
 
 #: libraries/DisplayResults.class.php:4811
-#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4769
-#: libraries/Util.class.php:4770 libraries/server_privileges.lib.php:1174
+#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4775
+#: libraries/Util.class.php:4776 libraries/server_privileges.lib.php:1174
 #: libraries/server_privileges.lib.php:1175
 #: libraries/server_privileges.lib.php:1387
 #: libraries/server_user_groups.lib.php:231
-#: templates/structure/check_all_tables.phtml:3
-#: templates/structure/check_all_tables.phtml:4
+#: templates/database/structure/check_all_tables.phtml:3
+#: templates/database/structure/check_all_tables.phtml:4
 msgid "Check All"
 msgstr "تحديد الكل"
 
 #: libraries/DisplayResults.class.php:4985 libraries/Header.class.php:383
-#: templates/structure/optional_action_links.phtml:1
-#: templates/structure/print_view_data_dictionary_link.phtml:3
+#: templates/database/structure/print_view_data_dictionary_link.phtml:3
+#: templates/table/structure/optional_action_links.phtml:1
 msgid "Print view"
 msgstr "عرض نسخة للطباعة"
 
@@ -3964,7 +3973,8 @@ msgstr "عرض نسخة للطباعة"
 msgid "Query results operations"
 msgstr "عمليّات على نتائج الإستعلام"
 
-#: libraries/DisplayResults.class.php:5105 templates/tbl_chart.phtml:12
+#: libraries/DisplayResults.class.php:5105
+#: templates/table/chart/tbl_chart.phtml:12
 msgid "Display chart"
 msgstr "عرض الرّسم البياني"
 
@@ -4065,7 +4075,7 @@ msgid "Click on the bar to scroll to top of page"
 msgstr ""
 
 #: libraries/Header.class.php:749
-#: libraries/plugins/auth/AuthenticationCookie.class.php:152
+#: libraries/plugins/auth/AuthenticationCookie.class.php:140
 #, fuzzy
 #| msgid "Javascript must be enabled past this point"
 msgid "Javascript must be enabled past this point!"
@@ -4089,11 +4099,11 @@ msgid "Keyname"
 msgstr "اسم المفتاح"
 
 #: libraries/Index.class.php:697
-#: libraries/controllers/StructureController.class.php:1962
-#: libraries/controllers/StructureController.class.php:1967
+#: libraries/controllers/TableStructureController.class.php:953
+#: libraries/controllers/TableStructureController.class.php:958
 #: libraries/tracking.lib.php:973
 #: templates/columns_definitions/column_indexes.phtml:11
-#: templates/structure/check_all_table_column.phtml:26
+#: templates/table/structure/check_all_table_column.phtml:26
 msgid "Unique"
 msgstr "فريد"
 
@@ -4112,16 +4122,17 @@ msgstr ""
 #: libraries/server_collations.lib.php:35 libraries/tracking.lib.php:881
 #: libraries/tracking.lib.php:977
 #: templates/columns_definitions/table_fields_definitions.phtml:33
-#: templates/structure/row_stats_table.phtml:31
-#: templates/structure/table_header.phtml:55
-#: templates/structure/table_structure_header.phtml:7
-#: templates/table/table_header.phtml:8
+#: templates/database/structure/table_header.phtml:55
+#: templates/table/search/table_header.phtml:8
+#: templates/table/structure/row_stats_table.phtml:31
+#: templates/table/structure/table_structure_header.phtml:7
 msgid "Collation"
 msgstr ""
 
 #: libraries/Index.class.php:703 libraries/rte/rte_events.lib.php:496
-#: libraries/rte/rte_routines.lib.php:956 libraries/tracking.lib.php:885
-#: libraries/tracking.lib.php:979 templates/structure/table_header.phtml:84
+#: libraries/rte/rte_routines.lib.php:1047 libraries/tracking.lib.php:885
+#: libraries/tracking.lib.php:979
+#: templates/database/structure/table_header.phtml:84
 msgid "Comment"
 msgstr "تعليق"
 
@@ -4134,15 +4145,15 @@ msgstr "لقد تم حذف المفتاح الأساسي."
 msgid "Index %s has been dropped."
 msgstr "تم حذف الفهرس %s."
 
-#: libraries/Index.class.php:757 libraries/Util.class.php:3630
-#: libraries/Util.class.php:3631
-#: libraries/controllers/StructureController.class.php:1958
-#: libraries/controllers/StructureController.class.php:1959
+#: libraries/Index.class.php:757 libraries/Util.class.php:3636
+#: libraries/Util.class.php:3637
+#: libraries/controllers/TableStructureController.class.php:949
+#: libraries/controllers/TableStructureController.class.php:950
 #: libraries/operations.lib.php:1607 libraries/rte/rte_list.lib.php:150
 #: libraries/server_databases.lib.php:146
-#: templates/structure/check_all_table_column.phtml:15
-#: templates/structure/check_all_tables.phtml:16
-#: templates/tbl_relation/foreign_key_row.phtml:93
+#: templates/database/structure/check_all_tables.phtml:16
+#: templates/table/relation/foreign_key_row.phtml:93
+#: templates/table/structure/check_all_table_column.phtml:15
 msgid "Drop"
 msgstr "سقّط"
 
@@ -4171,16 +4182,16 @@ msgstr "خادم"
 #: libraries/Menu.class.php:248
 #: libraries/navigation/Nodes/Node_View.class.php:32
 #: libraries/tbl_info.inc.php:63
-#: templates/structure/structure_table_row.phtml:97
-#: templates/structure/structure_table_row.phtml:159
+#: templates/database/structure/structure_table_row.phtml:97
+#: templates/database/structure/structure_table_row.phtml:159
 msgid "View"
 msgstr "عرض"
 
 #: libraries/Menu.class.php:325 libraries/Menu.class.php:429
-#: libraries/Menu.class.php:548 libraries/Util.class.php:3334
-#: libraries/Util.class.php:3344 libraries/Util.class.php:3350
-#: libraries/Util.class.php:4313 libraries/Util.class.php:4328
-#: libraries/Util.class.php:4345 libraries/config.values.php:40
+#: libraries/Menu.class.php:548 libraries/Util.class.php:3340
+#: libraries/Util.class.php:3350 libraries/Util.class.php:3356
+#: libraries/Util.class.php:4319 libraries/Util.class.php:4334
+#: libraries/Util.class.php:4351 libraries/config.values.php:40
 #: libraries/config.values.php:48 libraries/config.values.php:110
 #: libraries/config.values.php:116 libraries/config/messages.inc.php:321
 #: libraries/navigation/Nodes/Node_Table.class.php:292
@@ -4188,19 +4199,19 @@ msgid "SQL"
 msgstr "SQL"
 
 #: libraries/Menu.class.php:328 libraries/Menu.class.php:432
-#: libraries/Util.class.php:3335 libraries/Util.class.php:3345
-#: libraries/Util.class.php:3351 libraries/Util.class.php:3625
-#: libraries/Util.class.php:3626 libraries/Util.class.php:4329
-#: libraries/Util.class.php:4346 libraries/config.values.php:41
+#: libraries/Util.class.php:3341 libraries/Util.class.php:3351
+#: libraries/Util.class.php:3357 libraries/Util.class.php:3631
+#: libraries/Util.class.php:3632 libraries/Util.class.php:4335
+#: libraries/Util.class.php:4352 libraries/config.values.php:41
 #: libraries/config.values.php:49 libraries/config.values.php:111
 #: libraries/config.values.php:117
 #: libraries/navigation/Nodes/Node_Table.class.php:286
 msgid "Search"
 msgstr "إبحث"
 
-#: libraries/Menu.class.php:338 libraries/Util.class.php:3336
-#: libraries/Util.class.php:3346 libraries/Util.class.php:3627
-#: libraries/Util.class.php:3628 libraries/Util.class.php:4347
+#: libraries/Menu.class.php:338 libraries/Util.class.php:3342
+#: libraries/Util.class.php:3352 libraries/Util.class.php:3633
+#: libraries/Util.class.php:3634 libraries/Util.class.php:4353
 #: libraries/config.values.php:42 libraries/config.values.php:50
 #: libraries/config.values.php:118
 #: libraries/navigation/Nodes/Node_Table.class.php:289
@@ -4209,30 +4220,30 @@ msgid "Insert"
 msgstr "إدخال"
 
 #: libraries/Menu.class.php:362 libraries/Menu.class.php:467
-#: libraries/Util.class.php:4334 libraries/Util.class.php:4350
+#: libraries/Util.class.php:4340 libraries/Util.class.php:4356
 #: libraries/config.values.php:106 libraries/server_common.lib.php:51
 #: libraries/server_privileges.lib.php:2370
 #: libraries/server_privileges.lib.php:3158
-#: libraries/server_privileges.lib.php:4221
+#: libraries/server_privileges.lib.php:4247
 msgid "Privileges"
 msgstr "الإمتيازات"
 
 #: libraries/Menu.class.php:371 libraries/Menu.class.php:379
-#: libraries/Menu.class.php:459 libraries/Util.class.php:3338
-#: libraries/Util.class.php:3352 libraries/Util.class.php:4333
-#: libraries/Util.class.php:4351 libraries/config.values.php:112
+#: libraries/Menu.class.php:459 libraries/Util.class.php:3344
+#: libraries/Util.class.php:3358 libraries/Util.class.php:4339
+#: libraries/Util.class.php:4357 libraries/config.values.php:112
 #: view_operations.php:92
 msgid "Operations"
 msgstr "عمليات"
 
 #: libraries/Menu.class.php:384 libraries/Menu.class.php:492
-#: libraries/Util.class.php:4338 libraries/Util.class.php:4352
+#: libraries/Util.class.php:4344 libraries/Util.class.php:4358
 #: libraries/relation.lib.php:255
 msgid "Tracking"
 msgstr "تتبع"
 
 #: libraries/Menu.class.php:397 libraries/Menu.class.php:486
-#: libraries/Util.class.php:4337 libraries/Util.class.php:4353
+#: libraries/Util.class.php:4343 libraries/Util.class.php:4359
 #: libraries/navigation/Nodes/Node_Trigger_Container.class.php:24
 #: libraries/plugins/export/ExportHtmlword.class.php:557
 #: libraries/plugins/export/ExportOdt.class.php:685
@@ -4249,16 +4260,16 @@ msgstr ""
 msgid "Database seems to be empty!"
 msgstr "قاعدة البيانات فارغة!"
 
-#: libraries/Menu.class.php:439 libraries/Util.class.php:4330
+#: libraries/Menu.class.php:439 libraries/Util.class.php:4336
 msgid "Query"
 msgstr "استعلام بواسطة مثال"
 
-#: libraries/Menu.class.php:472 libraries/Util.class.php:4335
+#: libraries/Menu.class.php:472 libraries/Util.class.php:4341
 #: libraries/rte/rte_words.lib.php:36
 msgid "Routines"
 msgstr ""
 
-#: libraries/Menu.class.php:479 libraries/Util.class.php:4336
+#: libraries/Menu.class.php:479 libraries/Util.class.php:4342
 #: libraries/navigation/Nodes/Node_Event_Container.class.php:26
 #: libraries/plugins/export/ExportSql.class.php:940
 #: libraries/plugins/export/ExportXml.class.php:107
@@ -4266,22 +4277,22 @@ msgstr ""
 msgid "Events"
 msgstr "أحداث"
 
-#: libraries/Menu.class.php:498 libraries/Util.class.php:4339
+#: libraries/Menu.class.php:498 libraries/Util.class.php:4345
 msgid "Designer"
 msgstr "المصمم"
 
-#: libraries/Menu.class.php:507 libraries/Util.class.php:4340
-#: templates/structure/check_all_tables.phtml:35
+#: libraries/Menu.class.php:507 libraries/Util.class.php:4346
+#: templates/database/structure/check_all_tables.phtml:35
 #, fuzzy
 #| msgid "Textarea columns"
 msgid "Central columns"
 msgstr "عواميد منطقة النص"
 
-#: libraries/Menu.class.php:544 libraries/Util.class.php:4312
+#: libraries/Menu.class.php:544 libraries/Util.class.php:4318
 #: libraries/config.values.php:103 libraries/config/messages.inc.php:266
 #: libraries/config/messages.inc.php:341
 #: libraries/navigation/NavigationTree.class.php:1239
-#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4332
+#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4358
 msgid "Databases"
 msgstr "قاعدة بيانات"
 
@@ -4292,34 +4303,34 @@ msgid "User accounts"
 msgstr "المستخدمون"
 
 #: libraries/Menu.class.php:595 libraries/ServerStatusData.class.php:121
-#: libraries/Util.class.php:4319 libraries/server_common.lib.php:36
+#: libraries/Util.class.php:4325 libraries/server_common.lib.php:36
 msgid "Binary log"
 msgstr "سجل ثنائي"
 
 #: libraries/Menu.class.php:601 libraries/ServerStatusData.class.php:126
-#: libraries/Util.class.php:4320 libraries/server_common.lib.php:42
-#: templates/structure/body_for_table_summary.phtml:10
-#: templates/structure/table_header.phtml:27
+#: libraries/Util.class.php:4326 libraries/server_common.lib.php:42
+#: templates/database/structure/body_for_table_summary.phtml:10
+#: templates/database/structure/table_header.phtml:27
 msgid "Replication"
 msgstr "إستنساخ"
 
 #: libraries/Menu.class.php:606 libraries/ServerStatusData.class.php:193
-#: libraries/Util.class.php:4321 libraries/config.values.php:105
+#: libraries/Util.class.php:4327 libraries/config.values.php:105
 #: libraries/server_engines.lib.php:108 libraries/server_engines.lib.php:112
 #: libraries/sql_query_form.lib.php:421
 msgid "Variables"
 msgstr "متغيرات"
 
-#: libraries/Menu.class.php:610 libraries/Util.class.php:4322
+#: libraries/Menu.class.php:610 libraries/Util.class.php:4328
 msgid "Charsets"
 msgstr "مجموعات المحارف"
 
-#: libraries/Menu.class.php:615 libraries/Util.class.php:4323
+#: libraries/Menu.class.php:615 libraries/Util.class.php:4329
 #: libraries/server_common.lib.php:33 libraries/server_plugins.lib.php:27
 msgid "Plugins"
 msgstr "القوابس"
 
-#: libraries/Menu.class.php:626 libraries/Util.class.php:4324
+#: libraries/Menu.class.php:626 libraries/Util.class.php:4330
 msgid "Engines"
 msgstr "محركات"
 
@@ -4356,7 +4367,7 @@ msgstr[3] "%1$d صفوف أضيفت."
 msgstr[4] "%1$d صفوف أضيفت."
 msgstr[5] "%1$d صفوف أضيفت."
 
-#: libraries/PDF.class.php:70 libraries/Util.class.php:2521
+#: libraries/PDF.class.php:70 libraries/Util.class.php:2527
 #: libraries/browse_foreigners.lib.php:327
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:865
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:890
@@ -4381,7 +4392,7 @@ msgid "Could not save favorite table!"
 msgstr "لايستطيع حفظ الجدول الأخير"
 
 #: libraries/RecentFavoriteTable.class.php:212
-#: templates/structure/favorite_anchor.phtml:12
+#: templates/database/structure/favorite_anchor.phtml:12
 #, fuzzy
 #| msgid "Remove chart"
 msgid "Remove from Favorites"
@@ -4572,7 +4583,7 @@ msgid ""
 msgstr "لايوجد معلومات تفصيلية لحالة محرك التخزين هذا."
 
 #: libraries/StorageEngine.class.php:373
-#: templates/structure/body_for_table_summary.phtml:50
+#: templates/database/structure/body_for_table_summary.phtml:50
 #, php-format
 msgid "%s is the default storage engine on this MySQL server."
 msgstr "%s هو محرك التخزين الغيابي على خادم الMySQL هذا."
@@ -4997,10 +5008,10 @@ msgstr ""
 
 #: libraries/Util.class.php:726 libraries/rte/rte_events.lib.php:110
 #: libraries/rte/rte_events.lib.php:119 libraries/rte/rte_events.lib.php:150
-#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:153
-#: libraries/rte/rte_routines.lib.php:162
-#: libraries/rte/rte_routines.lib.php:235
-#: libraries/rte/rte_routines.lib.php:1366
+#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:223
+#: libraries/rte/rte_routines.lib.php:250
+#: libraries/rte/rte_routines.lib.php:372
+#: libraries/rte/rte_routines.lib.php:1457
 #: libraries/rte/rte_triggers.lib.php:86 libraries/rte/rte_triggers.lib.php:95
 #: libraries/rte/rte_triggers.lib.php:127
 msgid "MySQL said: "
@@ -5046,77 +5057,80 @@ msgstr "الأحد"
 msgid "%B %d, %Y at %I:%M %p"
 msgstr "%d %B %Y الساعة %H:%M"
 
-#: libraries/Util.class.php:2019
+#: libraries/Util.class.php:2025
 #, php-format
 msgid "%s days, %s hours, %s minutes and %s seconds"
 msgstr "%s يوم، %s ساعة، %s دقيقة و%s ثانية"
 
-#: libraries/Util.class.php:2112
+#: libraries/Util.class.php:2118
 msgid "Missing parameter:"
 msgstr "مدخلات مفقودة:"
 
-#: libraries/Util.class.php:2645
+#: libraries/Util.class.php:2651
 #, php-format
 msgid "Jump to database \"%s\"."
 msgstr "الذهاب إلى قاعدة البيانات \"%s\"."
 
-#: libraries/Util.class.php:2670
+#: libraries/Util.class.php:2676
 #, php-format
 msgid "The %s functionality is affected by a known bug, see %s"
 msgstr "إنّ ال %s الوظيفية هي مصابة بعطل معروف، أنظر إلى %s"
 
-#: libraries/Util.class.php:2881
+#: libraries/Util.class.php:2887
 msgid "Click to toggle"
 msgstr "إضغط للإختيار"
 
-#: libraries/Util.class.php:3542 prefs_manage.php:248
+#: libraries/Util.class.php:3548 prefs_manage.php:248
 msgid "Browse your computer:"
 msgstr "تصفح حاسبك:"
 
-#: libraries/Util.class.php:3567
+#: libraries/Util.class.php:3573
 #, php-format
 msgid "Select from the web server upload directory <b>%s</b>:"
 msgstr "إختر مجلد الرفع من الخادم <b>%s</b>:"
 
-#: libraries/Util.class.php:3596 libraries/insert_edit.lib.php:1173
+#: libraries/Util.class.php:3602 libraries/insert_edit.lib.php:1171
 msgid "The directory you set for upload work cannot be reached."
 msgstr "لا يمكن الوصول إلى الدليل اللذي عينته لعمل التحميل."
 
-#: libraries/Util.class.php:3607
+#: libraries/Util.class.php:3613
 #, fuzzy
 #| msgid "There are no files to upload"
 msgid "There are no files to upload!"
 msgstr "لايوجد أي ملفات لرفعها"
 
-#: libraries/Util.class.php:3632 libraries/Util.class.php:3633
-#: templates/structure/check_all_tables.phtml:15
+#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: templates/database/structure/check_all_tables.phtml:15
 msgid "Empty"
 msgstr "إفراغ"
 
-#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: libraries/Util.class.php:3644 libraries/Util.class.php:3645
 msgid "Execute"
 msgstr "تنفيذ"
 
-#: libraries/Util.class.php:4152
+#: libraries/Util.class.php:4158
 msgid "Print"
 msgstr "طباعة"
 
-#: libraries/Util.class.php:4257 templates/structure/row_stats_table.phtml:80
-#: templates/structure/table_header.phtml:95
+#: libraries/Util.class.php:4263
+#: templates/database/structure/table_header.phtml:95
+#: templates/table/structure/row_stats_table.phtml:80
 msgid "Creation"
 msgstr "الإنشاء"
 
-#: libraries/Util.class.php:4263 templates/structure/row_stats_table.phtml:87
-#: templates/structure/table_header.phtml:106
+#: libraries/Util.class.php:4269
+#: templates/database/structure/table_header.phtml:106
+#: templates/table/structure/row_stats_table.phtml:87
 msgid "Last update"
 msgstr "آخر تحديث"
 
-#: libraries/Util.class.php:4269 templates/structure/row_stats_table.phtml:94
-#: templates/structure/table_header.phtml:117
+#: libraries/Util.class.php:4275
+#: templates/database/structure/table_header.phtml:117
+#: templates/table/structure/row_stats_table.phtml:94
 msgid "Last check"
 msgstr "آخر فحص"
 
-#: libraries/Util.class.php:4315
+#: libraries/Util.class.php:4321
 msgid "Users"
 msgstr "المستخدمون"
 
@@ -5139,16 +5153,16 @@ msgid "Use this value"
 msgstr "إستعمل هذه القيمة"
 
 #: libraries/build_html_for_db.lib.php:33 libraries/import.lib.php:193
-#: templates/structure/actions_in_table_structure.phtml:113
-#: templates/structure/row_stats_table.phtml:42
-#: templates/structure/table_header.phtml:36
+#: templates/database/structure/table_header.phtml:36
+#: templates/table/structure/actions_in_table_structure.phtml:113
+#: templates/table/structure/row_stats_table.phtml:42
 msgid "Rows"
 msgstr "صفوف"
 
 #: libraries/build_html_for_db.lib.php:48 libraries/engines/innodb.lib.php:171
-#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:186
-#: libraries/server_status.lib.php:298
-#: templates/structure/display_table_stats.phtml:40
+#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:195
+#: libraries/server_status.lib.php:307
+#: templates/table/structure/display_table_stats.phtml:40
 msgid "Total"
 msgstr "مجموع كلي"
 
@@ -5157,10 +5171,12 @@ msgid "Jump to database"
 msgstr "قفز لقاعدة البيانات"
 
 #: libraries/build_html_for_db.lib.php:146
+#: templates/database/structure/structure_table_row.phtml:15
 msgid "Not replicated"
 msgstr "غير مستنسخة"
 
 #: libraries/build_html_for_db.lib.php:158
+#: templates/database/structure/structure_table_row.phtml:16
 msgid "Replicated"
 msgstr "مستنسخة"
 
@@ -5217,17 +5233,17 @@ msgstr "لا"
 #: libraries/plugins/export/ExportTexytext.class.php:425
 #: libraries/plugins/export/PMA_ExportPdf.class.php:307
 #: libraries/rte/rte_list.lib.php:73 libraries/rte/rte_list.lib.php:85
-#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:830
-#: libraries/rte/rte_routines.lib.php:1492 setup/frames/index.inc.php:162
+#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:921
+#: libraries/rte/rte_routines.lib.php:1583 setup/frames/index.inc.php:162
 #: templates/columns_definitions/table_fields_definitions.phtml:8
-#: templates/structure/table_structure_header.phtml:5
-#: templates/table/create_table.phtml:11
+#: templates/database/create_table.phtml:11
+#: templates/table/structure/table_structure_header.phtml:5
 msgid "Name"
 msgstr "الاسم"
 
 #: libraries/central_columns.lib.php:699
 #: libraries/central_columns.lib.php:1381
-#: libraries/rte/rte_routines.lib.php:832
+#: libraries/rte/rte_routines.lib.php:923
 #: templates/columns_definitions/table_fields_definitions.phtml:14
 msgid "Length/Values"
 msgstr "الطول/القيمة"
@@ -5250,7 +5266,7 @@ msgid "Select a table"
 msgstr "اختر الجداول"
 
 #: libraries/central_columns.lib.php:804
-#: templates/structure/add_column.phtml:4
+#: templates/table/structure/add_column.phtml:4
 msgid "Add column"
 msgstr "إضافة عمود"
 
@@ -5270,7 +5286,7 @@ msgstr "إضافة عمود"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1002
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1025
 #: templates/columns_definitions/table_fields_definitions.phtml:36
-#: templates/structure/table_structure_header.phtml:8
+#: templates/table/structure/table_structure_header.phtml:8
 msgid "Attributes"
 msgstr "الخواص"
 
@@ -5386,7 +5402,7 @@ msgid "Double click"
 msgstr ""
 
 #: libraries/config.values.php:95 libraries/config.values.php:124
-#: libraries/config/FormDisplay.tpl.php:221 libraries/relation.lib.php:97
+#: libraries/config/FormDisplay.tpl.php:232 libraries/relation.lib.php:97
 #: libraries/relation.lib.php:105
 msgid "Disabled"
 msgstr "معطل"
@@ -5577,21 +5593,21 @@ msgstr "التصدير لن يتم , الدالة (%s) مفقودة"
 msgid "maximum %s"
 msgstr "أقصى %s"
 
-#: libraries/config/FormDisplay.tpl.php:219
+#: libraries/config/FormDisplay.tpl.php:230
 msgid "This setting is disabled, it will not be applied to your configuration."
 msgstr "هذا الإعداد معطل , لن يتم تطبيقه في التكوين."
 
-#: libraries/config/FormDisplay.tpl.php:313
+#: libraries/config/FormDisplay.tpl.php:324
 #, php-format
 msgid "Set value: %s"
 msgstr "تعيين القيمة: %s"
 
-#: libraries/config/FormDisplay.tpl.php:318
+#: libraries/config/FormDisplay.tpl.php:329
 #: libraries/config/messages.inc.php:610
 msgid "Restore default value"
 msgstr "إستعادة القيمة الإفتراضية"
 
-#: libraries/config/FormDisplay.tpl.php:332
+#: libraries/config/FormDisplay.tpl.php:343
 msgid "Allow users to customize this value"
 msgstr "السماح للمستخدمين بتخصيص هذه القيمة"
 
@@ -6064,7 +6080,7 @@ msgstr "مجموعة الأحرف للملف"
 
 #: libraries/config/messages.inc.php:136 libraries/config/messages.inc.php:152
 #: libraries/sql_query_form.lib.php:247
-#: templates/structure/row_stats_table.phtml:7
+#: templates/table/structure/row_stats_table.phtml:7
 msgid "Format"
 msgstr "صيغة"
 
@@ -6642,7 +6658,7 @@ msgstr ""
 
 #: libraries/config/messages.inc.php:332
 #: libraries/plugins/export/ExportPdf.class.php:279
-#: templates/structure/secondary_tabs.phtml:8
+#: templates/table/secondary_tabs.phtml:8
 msgid "Table structure"
 msgstr "بنية الجدول"
 
@@ -8308,114 +8324,35 @@ msgstr ""
 msgid "OpenDocument Text"
 msgstr "مستند مفتوح"
 
-#: libraries/controllers/StructureController.class.php:465
+#: libraries/controllers/DatabaseStructureController.class.php:405
 #: tbl_operations.php:382
 #, php-format
 msgid "Table %s has been emptied."
 msgstr "تم إفراغ محتويات الجدول %s."
 
-#: libraries/controllers/StructureController.class.php:486
+#: libraries/controllers/DatabaseStructureController.class.php:426
 #: tbl_operations.php:400 view_operations.php:119
 #, fuzzy, php-format
 #| msgid "View %s has been dropped."
 msgid "View %s has been dropped."
 msgstr "تم إزالة %s  من العرض"
 
-#: libraries/controllers/StructureController.class.php:487
+#: libraries/controllers/DatabaseStructureController.class.php:427
 #: tbl_operations.php:401
 #, fuzzy, php-format
 #| msgid "Table %s has been dropped."
 msgid "Table %s has been dropped."
 msgstr "تم إزالة الجدول %s"
 
-#: libraries/controllers/StructureController.class.php:797
-#, php-format
-msgid "The name '%s' is a MySQL reserved keyword."
-msgid_plural "The names '%s' are MySQL reserved keywords."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-msgstr[4] ""
-msgstr[5] ""
-
-#: libraries/controllers/StructureController.class.php:875
-#, fuzzy
-#| msgid "No rows selected"
-msgid "No column selected."
-msgstr "لايوجد صفوف مختارة"
-
-#: libraries/controllers/StructureController.class.php:1049
+#: libraries/controllers/DatabaseStructureController.class.php:733
 msgid "Favorite List is full!"
 msgstr ""
 
-#: libraries/controllers/StructureController.class.php:1272
-#, fuzzy
-#| msgid "The selected users have been deleted successfully."
-msgid "The columns have been moved successfully."
-msgstr "تم حذف المستخدمين المحددين بنجاح."
-
-#: libraries/controllers/StructureController.class.php:1535
-#, fuzzy, php-format
-#| msgid "Table %s has been moved to %s."
-msgid ""
-"Table %1$s has been altered successfully. Privileges have been adjusted."
-msgstr "%s جدول تم نقله إلى %s."
-
-#: libraries/controllers/StructureController.class.php:1541
-#: libraries/controllers/TableIndexesController.class.php:161
-#: tbl_addfield.php:92
-#, php-format
-msgid "Table %1$s has been altered successfully."
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1588
-#: libraries/tracking.lib.php:1094
-msgid "Query error"
-msgstr "خطأ في الإستعلام"
-
-#: libraries/controllers/StructureController.class.php:1806
+#: libraries/controllers/DatabaseStructureController.class.php:947
 #: libraries/mysql_charsets.lib.php:366 libraries/mysql_charsets.lib.php:373
 msgid "unknown"
 msgstr "غير معروفة"
 
-#: libraries/controllers/StructureController.class.php:1957
-#: templates/structure/check_all_table_column.phtml:11
-msgid "Change"
-msgstr "تغيير"
-
-#: libraries/controllers/StructureController.class.php:1961
-#: libraries/controllers/StructureController.class.php:1966
-#: libraries/navigation/Nodes/Node_Index.class.php:30
-#: libraries/tracking.lib.php:926
-#: templates/columns_definitions/column_indexes.phtml:16
-#: templates/columns_definitions/table_fields_definitions.phtml:57
-#: templates/structure/check_all_table_column.phtml:30
-#: templates/structure/display_structure.phtml:79
-#: templates/structure/display_table_stats.phtml:19
-msgid "Index"
-msgstr "فهرست"
-
-#: libraries/controllers/StructureController.class.php:1963
-#: libraries/controllers/StructureController.class.php:1968
-#: templates/columns_definitions/column_indexes.phtml:27
-#: templates/structure/check_all_table_column.phtml:37
-msgid "Spatial"
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1964
-#: libraries/controllers/StructureController.class.php:1969
-#: templates/columns_definitions/column_indexes.phtml:22
-#: templates/structure/check_all_table_column.phtml:47
-msgid "Fulltext"
-msgstr "النص كاملا"
-
-#: libraries/controllers/StructureController.class.php:1970
-#, fuzzy
-#| msgid "Browse distinct values"
-msgid "Distinct values"
-msgstr "إستعرض القيم المميزة"
-
 #: libraries/controllers/TableChartController.class.php:82
 #: libraries/controllers/TableGisVisualizationController.class.php:101
 msgid "No SQL query was set to fetch data."
@@ -8431,13 +8368,20 @@ msgstr ""
 msgid "No data to display"
 msgstr "لايوجد بيانات"
 
-#: libraries/controllers/TableRelationController.class.php:217
+#: libraries/controllers/TableIndexesController.class.php:161
+#: libraries/controllers/TableStructureController.class.php:736
+#: tbl_addfield.php:92
+#, php-format
+msgid "Table %1$s has been altered successfully."
+msgstr ""
+
+#: libraries/controllers/TableRelationController.class.php:218
 #, fuzzy
 #| msgid "Thread %s was successfully killed."
 msgid "Display column was successfully updated."
 msgstr "تم إيقاف العمليّة %s بنجاح."
 
-#: libraries/controllers/TableRelationController.class.php:283
+#: libraries/controllers/TableRelationController.class.php:288
 #, fuzzy
 #| msgid "Internal relations"
 msgid "Internal relations were successfully updated."
@@ -8456,12 +8400,84 @@ msgid "Zoom search"
 msgstr "بحث"
 
 #: libraries/controllers/TableSearchController.class.php:852
-#: templates/table/selection_form.phtml:59
+#: templates/table/search/selection_form.phtml:59
 #, fuzzy
 #| msgid "Find and Replace"
 msgid "Find and replace"
 msgstr "بحث واستبدال"
 
+#: libraries/controllers/TableStructureController.class.php:163
+#, php-format
+msgid "The name '%s' is a MySQL reserved keyword."
+msgid_plural "The names '%s' are MySQL reserved keywords."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+msgstr[5] ""
+
+#: libraries/controllers/TableStructureController.class.php:241
+#, fuzzy
+#| msgid "No rows selected"
+msgid "No column selected."
+msgstr "لايوجد صفوف مختارة"
+
+#: libraries/controllers/TableStructureController.class.php:467
+#, fuzzy
+#| msgid "The selected users have been deleted successfully."
+msgid "The columns have been moved successfully."
+msgstr "تم حذف المستخدمين المحددين بنجاح."
+
+#: libraries/controllers/TableStructureController.class.php:730
+#, fuzzy, php-format
+#| msgid "Table %s has been moved to %s."
+msgid ""
+"Table %1$s has been altered successfully. Privileges have been adjusted."
+msgstr "%s جدول تم نقله إلى %s."
+
+#: libraries/controllers/TableStructureController.class.php:783
+#: libraries/tracking.lib.php:1094
+msgid "Query error"
+msgstr "خطأ في الإستعلام"
+
+#: libraries/controllers/TableStructureController.class.php:948
+#: templates/table/structure/check_all_table_column.phtml:11
+msgid "Change"
+msgstr "تغيير"
+
+#: libraries/controllers/TableStructureController.class.php:952
+#: libraries/controllers/TableStructureController.class.php:957
+#: libraries/navigation/Nodes/Node_Index.class.php:30
+#: libraries/tracking.lib.php:926
+#: templates/columns_definitions/column_indexes.phtml:16
+#: templates/columns_definitions/table_fields_definitions.phtml:57
+#: templates/table/structure/check_all_table_column.phtml:30
+#: templates/table/structure/display_structure.phtml:79
+#: templates/table/structure/display_table_stats.phtml:19
+msgid "Index"
+msgstr "فهرست"
+
+#: libraries/controllers/TableStructureController.class.php:954
+#: libraries/controllers/TableStructureController.class.php:959
+#: templates/columns_definitions/column_indexes.phtml:27
+#: templates/table/structure/check_all_table_column.phtml:37
+msgid "Spatial"
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:955
+#: libraries/controllers/TableStructureController.class.php:960
+#: templates/columns_definitions/column_indexes.phtml:22
+#: templates/table/structure/check_all_table_column.phtml:47
+msgid "Fulltext"
+msgstr "النص كاملا"
+
+#: libraries/controllers/TableStructureController.class.php:963
+#, fuzzy
+#| msgid "Browse distinct values"
+msgid "Distinct values"
+msgstr "إستعرض القيم المميزة"
+
 #: libraries/core.lib.php:306
 #, php-format
 msgid "The %s extension is missing. Please check your PHP configuration."
@@ -8508,7 +8524,7 @@ msgid "No Password"
 msgstr "لا كلمة سر"
 
 #: libraries/display_change_password.lib.php:68
-#: libraries/plugins/auth/AuthenticationCookie.class.php:199
+#: libraries/plugins/auth/AuthenticationCookie.class.php:187
 #: libraries/replication_gui.lib.php:422 libraries/replication_gui.lib.php:862
 #: libraries/server_privileges.lib.php:1640
 msgid "Password:"
@@ -9285,12 +9301,12 @@ msgid "Dump has been saved to file %s."
 msgstr "تم حفظ الـDump إلى الملف %s."
 
 #: libraries/import.lib.php:202 libraries/insert_edit.lib.php:124
-#: libraries/rte/rte_routines.lib.php:1353 libraries/sql.lib.php:1312
+#: libraries/rte/rte_routines.lib.php:1444 libraries/sql.lib.php:1306
 #: tbl_get_field.php:44
 msgid "MySQL returned an empty result set (i.e. zero rows)."
 msgstr "قام MySQL  بإرجاع نتيجة فارغة."
 
-#: libraries/import.lib.php:265 libraries/sql.lib.php:1326
+#: libraries/import.lib.php:265 libraries/sql.lib.php:1320
 msgid "[ROLLBACK occurred.]"
 msgstr ""
 
@@ -9358,14 +9374,14 @@ msgstr "إنشاء فهرس للعمود %s"
 
 #: libraries/insert_edit.lib.php:233
 #: libraries/navigation/Nodes/Node_DatabaseChild.class.php:48
-#: templates/designer/table_list.phtml:40
+#: templates/database/designer/table_list.phtml:40
 msgid "Hide"
 msgstr "أخفاء"
 
 #: libraries/insert_edit.lib.php:249
 #: libraries/navigation/Nodes/Node_Function.class.php:32
-#: libraries/rte/rte_routines.lib.php:1495
-#: templates/table/table_header.phtml:4
+#: libraries/rte/rte_routines.lib.php:1586
+#: templates/table/search/table_header.phtml:4
 msgid "Function"
 msgstr "دالة"
 
@@ -9380,84 +9396,85 @@ msgstr "ثنائي"
 msgid "Because of its length,<br /> this column might not be editable."
 msgstr "بسبب طوله,<br /> فمن المحتمل أن هذا الحقل غير قابل للتحرير "
 
-#: libraries/insert_edit.lib.php:1050
+#: libraries/insert_edit.lib.php:1048
 msgid "Binary - do not edit"
 msgstr "ثنائي - لاتحرره"
 
-#: libraries/insert_edit.lib.php:1176 libraries/server_privileges.lib.php:470
-#: templates/table/options.phtml:36
+#: libraries/insert_edit.lib.php:1174 libraries/server_privileges.lib.php:470
+#: templates/table/search/options.phtml:36
 msgid "Or"
 msgstr "أو"
 
-#: libraries/insert_edit.lib.php:1177
+#: libraries/insert_edit.lib.php:1175
 #, fuzzy
 #| msgid "web server upload directory"
 msgid "web server upload directory:"
 msgstr "دليل تحميل الملفات على خادم الشبكة"
 
-#: libraries/insert_edit.lib.php:1348 templates/table/input_box.phtml:49
+#: libraries/insert_edit.lib.php:1346
+#: templates/table/search/input_box.phtml:49
 msgid "Edit/Insert"
 msgstr "تحرير/إدخال"
 
-#: libraries/insert_edit.lib.php:1398
+#: libraries/insert_edit.lib.php:1396
 #, php-format
 msgid "Continue insertion with %s rows"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1428
+#: libraries/insert_edit.lib.php:1426
 msgid "and then"
 msgstr "وبعدها"
 
-#: libraries/insert_edit.lib.php:1461
+#: libraries/insert_edit.lib.php:1459
 msgid "Insert as new row"
 msgstr "إدخال كتسجيل جديد"
 
-#: libraries/insert_edit.lib.php:1464
+#: libraries/insert_edit.lib.php:1462
 msgid "Insert as new row and ignore errors"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1467
+#: libraries/insert_edit.lib.php:1465
 msgid "Show insert query"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1487
+#: libraries/insert_edit.lib.php:1485
 msgid "Go back to previous page"
 msgstr "الرجوع إلى الصفحة السابقة"
 
-#: libraries/insert_edit.lib.php:1490
+#: libraries/insert_edit.lib.php:1488
 msgid "Insert another new row"
 msgstr "إدخال تسجيل جديد"
 
-#: libraries/insert_edit.lib.php:1495
+#: libraries/insert_edit.lib.php:1493
 msgid "Go back to this page"
 msgstr "ارجع إلى هذه الصفحة"
 
-#: libraries/insert_edit.lib.php:1518
+#: libraries/insert_edit.lib.php:1516
 msgid "Edit next row"
 msgstr "عدل الصف التالي"
 
-#: libraries/insert_edit.lib.php:1540
+#: libraries/insert_edit.lib.php:1538
 msgid ""
 "Use TAB key to move from value to value, or CTRL+arrows to move anywhere"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1577 libraries/replication_gui.lib.php:542
-#: libraries/rte/rte_routines.lib.php:1497
+#: libraries/insert_edit.lib.php:1575 libraries/replication_gui.lib.php:542
+#: libraries/rte/rte_routines.lib.php:1588
 #: libraries/server_status_variables.lib.php:220
-#: templates/designer/having_query_panel.phtml:100
-#: templates/designer/options_panel.phtml:73
-#: templates/designer/options_panel.phtml:239
-#: templates/designer/where_query_panel.phtml:69
-#: templates/table/table_header.phtml:10
-#: templates/table/zoom_result_form.phtml:35
+#: templates/database/designer/having_query_panel.phtml:100
+#: templates/database/designer/options_panel.phtml:73
+#: templates/database/designer/options_panel.phtml:239
+#: templates/database/designer/where_query_panel.phtml:69
+#: templates/table/search/table_header.phtml:10
+#: templates/table/search/zoom_result_form.phtml:35
 msgid "Value"
 msgstr "القيمة"
 
-#: libraries/insert_edit.lib.php:1937 libraries/sql.lib.php:1309
+#: libraries/insert_edit.lib.php:1935 libraries/sql.lib.php:1303
 msgid "Showing SQL query"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1962 libraries/sql.lib.php:1287
+#: libraries/insert_edit.lib.php:1960 libraries/sql.lib.php:1281
 #, php-format
 msgid "Inserted row id: %1$d"
 msgstr ""
@@ -9914,7 +9931,7 @@ msgstr ""
 #: libraries/navigation/Nodes/Node_View_Container.class.php:26
 #: libraries/navigation/Nodes/Node_View_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:129
-#: templates/structure/show_create.phtml:30
+#: templates/database/structure/show_create.phtml:30
 msgid "Views"
 msgstr ""
 
@@ -10226,7 +10243,7 @@ msgstr "ليس لديك الحقوق الكافية بأن تكون هنا ال
 
 #: libraries/operations.lib.php:101 libraries/operations.lib.php:249
 #: libraries/operations.lib.php:869 libraries/operations.lib.php:963
-#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:907
+#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:998
 #: templates/columns_definitions/table_fields_definitions.phtml:47
 #, fuzzy
 #| msgid "Edit Privileges"
@@ -10320,22 +10337,22 @@ msgid "Switch to copied table"
 msgstr "بدل إلى الجدول المنسوخ"
 
 #: libraries/operations.lib.php:1360
-#: templates/structure/check_all_tables.phtml:18
+#: templates/database/structure/check_all_tables.phtml:18
 msgid "Table maintenance"
 msgstr "صيانة الجدول"
 
 #: libraries/operations.lib.php:1398
-#: templates/structure/check_all_tables.phtml:19
+#: templates/database/structure/check_all_tables.phtml:19
 msgid "Analyze table"
 msgstr "تحليل الجدول"
 
 #: libraries/operations.lib.php:1413
-#: templates/structure/check_all_tables.phtml:20
+#: templates/database/structure/check_all_tables.phtml:20
 msgid "Check table"
 msgstr "التحقق من الجدول"
 
 #: libraries/operations.lib.php:1428
-#: templates/structure/check_all_tables.phtml:22
+#: templates/database/structure/check_all_tables.phtml:22
 #, fuzzy
 #| msgid "Check table"
 msgid "Checksum table"
@@ -10355,18 +10372,19 @@ msgid "Flush the table (FLUSH)"
 msgstr "إعادة تحميل الجدول (FLUSH)"
 
 #: libraries/operations.lib.php:1477
-#: templates/structure/check_all_tables.phtml:23
-#: templates/structure/display_table_stats.phtml:56
+#: templates/database/structure/check_all_tables.phtml:23
+#: templates/table/structure/display_table_stats.phtml:56
 msgid "Optimize table"
 msgstr "تحسين الجدول"
 
 #: libraries/operations.lib.php:1492
-#: templates/structure/check_all_tables.phtml:24
+#: templates/database/structure/check_all_tables.phtml:24
 msgid "Repair table"
 msgstr "إصلاح الجدول"
 
 #: libraries/operations.lib.php:1538
-#: templates/structure/check_all_tables.phtml:14 view_operations.php:127
+#: templates/database/structure/check_all_tables.phtml:14
+#: view_operations.php:127
 msgid "Delete data or table"
 msgstr "حذف البيانات او الجدول"
 
@@ -10494,7 +10512,7 @@ msgid "Cannot connect: invalid settings."
 msgstr "لايمكن الإتصال: إعدادات غير صحيحة."
 
 #: libraries/plugins/auth/AuthenticationConfig.class.php:108
-#: libraries/plugins/auth/AuthenticationCookie.class.php:134
+#: libraries/plugins/auth/AuthenticationCookie.class.php:122
 #: libraries/plugins/auth/AuthenticationHttp.class.php:96
 #, php-format
 msgid "Welcome to %s"
@@ -10522,38 +10540,38 @@ msgstr ""
 msgid "Retry to connect"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:146
+#: libraries/plugins/auth/AuthenticationCookie.class.php:134
 msgid "Your session has expired. Please log in again."
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:170
+#: libraries/plugins/auth/AuthenticationCookie.class.php:158
 msgid "Log in"
 msgstr "دخول"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:178
-#: libraries/plugins/auth/AuthenticationCookie.class.php:188
+#: libraries/plugins/auth/AuthenticationCookie.class.php:166
+#: libraries/plugins/auth/AuthenticationCookie.class.php:176
 msgid "You can enter hostname/IP address and port separated by space."
 msgstr "يمكن أن تدخل عنوان المضيف والمنفذ مفصولان بالمسافة."
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:193
+#: libraries/plugins/auth/AuthenticationCookie.class.php:181
 msgid "Username:"
 msgstr "اسم المستخدم:"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:205
+#: libraries/plugins/auth/AuthenticationCookie.class.php:193
 #, fuzzy
 #| msgid "Server Choice"
 msgid "Server Choice:"
 msgstr "اختيار الخادم"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:386
+#: libraries/plugins/auth/AuthenticationCookie.class.php:374
 msgid "Entered captcha is wrong, try again!"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:396
+#: libraries/plugins/auth/AuthenticationCookie.class.php:384
 msgid "Please enter correct captcha!"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:423
+#: libraries/plugins/auth/AuthenticationCookie.class.php:411
 #, fuzzy
 #| msgid "Cannot log in to the MySQL server"
 msgid "You are not allowed to log in to this MySQL server!"
@@ -10661,7 +10679,7 @@ msgstr "حدث"
 #: libraries/plugins/export/ExportOdt.class.php:593
 #: libraries/plugins/export/ExportTexytext.class.php:428
 #: libraries/plugins/export/PMA_ExportPdf.class.php:313
-#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:984
 #: libraries/rte/rte_triggers.lib.php:377
 #, fuzzy
 #| msgid "Description"
@@ -11012,7 +11030,7 @@ msgid "Last check:"
 msgstr "آخر فحص:"
 
 #: libraries/plugins/export/ExportSql.class.php:1399
-#: templates/structure/structure_table_row.phtml:183
+#: templates/database/structure/structure_table_row.phtml:183
 msgid "in use"
 msgstr "قيد الإستعمال"
 
@@ -11212,18 +11230,14 @@ msgstr ""
 msgid "The imported file does not contain any data!"
 msgstr "الملف %s لايحتوي على أي مفتاح تعريف"
 
-#: libraries/plugins/import/ImportSql.class.php:169
+#: libraries/plugins/import/ImportSql.class.php:72
 msgid "SQL compatibility mode:"
 msgstr ""
 
-#: libraries/plugins/import/ImportSql.class.php:181
+#: libraries/plugins/import/ImportSql.class.php:84
 msgid "Do not use <code>AUTO_INCREMENT</code> for zero values"
 msgstr ""
 
-#: libraries/plugins/import/ImportSql.class.php:195
-msgid "Read as multibytes"
-msgstr ""
-
 #: libraries/plugins/import/ImportXml.class.php:54
 msgid "XML"
 msgstr "إكس إم إل"
@@ -11268,7 +11282,7 @@ msgid "Show grid"
 msgstr "أظهر تخطيط الجدول"
 
 #: libraries/plugins/schema/SchemaPdf.class.php:94
-#: templates/structure/print_view_data_dictionary_link.phtml:6
+#: templates/database/structure/print_view_data_dictionary_link.phtml:6
 msgid "Data Dictionary"
 msgstr "قاموس البيانات"
 
@@ -11300,7 +11314,7 @@ msgid "The %s table doesn't exist!"
 msgstr "الجدول \"%s\" غير موجود!"
 
 #: libraries/plugins/schema/eps/Eps_Relation_Schema.class.php:321
-#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:309
+#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:323
 #, fuzzy, php-format
 #| msgid "Schema of the \"%s\" database - Page %s"
 msgid "Schema of the %s database - Page %s"
@@ -11330,7 +11344,7 @@ msgstr "جدول المحتويات"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1005
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1028
 #: libraries/tracking.lib.php:884
-#: templates/structure/table_structure_header.phtml:11
+#: templates/table/structure/table_structure_header.phtml:11
 msgid "Extra"
 msgstr "إضافي"
 
@@ -11713,32 +11727,32 @@ msgstr ""
 msgid "Create the needed tables with the <code>%screate_tables.sql</code>."
 msgstr ""
 
-#: libraries/relation.lib.php:360
+#: libraries/relation.lib.php:357
 msgid "Create a pma user and give access to these tables."
 msgstr ""
 
-#: libraries/relation.lib.php:365
+#: libraries/relation.lib.php:360
 msgid ""
 "Enable advanced features in configuration file (<code>config.inc.php</"
 "code>), for example by starting from <code>config.sample.inc.php</code>."
 msgstr ""
 
-#: libraries/relation.lib.php:373
+#: libraries/relation.lib.php:365
 msgid "Re-login to phpMyAdmin to load the updated configuration file."
 msgstr ""
 
-#: libraries/relation.lib.php:1612
+#: libraries/relation.lib.php:1607
 msgid "no description"
 msgstr "بدون وصف"
 
-#: libraries/relation.lib.php:1811
+#: libraries/relation.lib.php:1806
 msgid ""
 "You do not have necessary privileges to create a database named "
 "'phpmyadmin'. You may go to 'Operations' tab of any database to set up the "
 "phpMyAdmin configuration storage there."
 msgstr ""
 
-#: libraries/relation.lib.php:1928
+#: libraries/relation.lib.php:1923
 #, fuzzy, php-format
 #| msgid ""
 #| "Tracking of changes made in database. Requires the phpMyAdmin "
@@ -11748,13 +11762,13 @@ msgid ""
 "configuration storage there."
 msgstr "تعقب التغيرات الحاصلة على قاعدة البيانات."
 
-#: libraries/relation.lib.php:1936
+#: libraries/relation.lib.php:1931
 #, php-format
 msgid ""
 "%sCreate%s the phpMyAdmin configuration storage in the current database."
 msgstr ""
 
-#: libraries/relation.lib.php:1944
+#: libraries/relation.lib.php:1939
 #, fuzzy, php-format
 #| msgid ""
 #| "Tracking of changes made in database. Requires the phpMyAdmin "
@@ -11763,7 +11777,7 @@ msgid "%sCreate%s missing phpMyAdmin configuration storage tables."
 msgstr "تعقب التغيرات الحاصلة على قاعدة البيانات."
 
 #: libraries/replication_gui.lib.php:46 libraries/replication_gui.lib.php:343
-#: libraries/server_databases.lib.php:387
+#: libraries/server_databases.lib.php:398
 msgid "Master replication"
 msgstr ""
 
@@ -11818,7 +11832,7 @@ msgid ""
 msgstr ""
 
 #: libraries/replication_gui.lib.php:141
-#: libraries/server_databases.lib.php:389
+#: libraries/server_databases.lib.php:400
 msgid "Slave replication"
 msgstr ""
 
@@ -12102,10 +12116,10 @@ msgid "Master server changed successfully to %s."
 msgstr "تم إعادة قراءة الصلاحيات بنجاح."
 
 #: libraries/rte/rte_events.lib.php:106 libraries/rte/rte_events.lib.php:115
-#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:149
-#: libraries/rte/rte_routines.lib.php:158
-#: libraries/rte/rte_routines.lib.php:231
-#: libraries/rte/rte_routines.lib.php:1362
+#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:219
+#: libraries/rte/rte_routines.lib.php:246
+#: libraries/rte/rte_routines.lib.php:368
+#: libraries/rte/rte_routines.lib.php:1453
 #: libraries/rte/rte_triggers.lib.php:82 libraries/rte/rte_triggers.lib.php:91
 #: libraries/rte/rte_triggers.lib.php:123
 #, fuzzy, php-format
@@ -12130,7 +12144,7 @@ msgstr "تم تعديل الإجراء %1$s"
 msgid "Event %1$s has been created."
 msgstr "تم إنشاء الإجراء %1$s."
 
-#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:251
+#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:266
 #: libraries/rte/rte_triggers.lib.php:144
 #, fuzzy
 #| msgid ""
@@ -12144,7 +12158,7 @@ msgstr "<b>حصل خطأ أثناء معالجة طلبك: </b>"
 msgid "Edit event"
 msgstr "حدث"
 
-#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:794
+#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:885
 #: libraries/rte/rte_triggers.lib.php:323 view_create.php:180
 msgid "Details"
 msgstr ""
@@ -12159,7 +12173,7 @@ msgstr "نوع الحدث"
 msgid "Event type"
 msgstr "نوع الحدث"
 
-#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:817
+#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:908
 #, fuzzy, php-format
 #| msgid "Change"
 msgid "Change to %s"
@@ -12197,12 +12211,14 @@ msgstr "نهاية"
 msgid "On completion preserve"
 msgstr "إدخال كامل"
 
-#: libraries/rte/rte_events.lib.php:491 libraries/rte/rte_routines.lib.php:930
+#: libraries/rte/rte_events.lib.php:491
+#: libraries/rte/rte_routines.lib.php:1021
 #: libraries/rte/rte_triggers.lib.php:383 view_create.php:209
 msgid "Definer"
 msgstr ""
 
-#: libraries/rte/rte_events.lib.php:535 libraries/rte/rte_routines.lib.php:997
+#: libraries/rte/rte_events.lib.php:535
+#: libraries/rte/rte_routines.lib.php:1088
 #: libraries/rte/rte_triggers.lib.php:422
 msgid "The definer must be in the \"username@hostname\" format!"
 msgstr ""
@@ -12230,9 +12246,9 @@ msgid "You must provide an event definition."
 msgstr ""
 
 #: libraries/rte/rte_export.lib.php:43 libraries/rte/rte_general.lib.php:72
-#: libraries/rte/rte_routines.lib.php:345
-#: libraries/rte/rte_routines.lib.php:1198
-#: libraries/rte/rte_routines.lib.php:1411
+#: libraries/rte/rte_routines.lib.php:153
+#: libraries/rte/rte_routines.lib.php:1289
+#: libraries/rte/rte_routines.lib.php:1502
 #, fuzzy
 #| msgid "Error in processing request"
 msgid "Error in processing request:"
@@ -12276,136 +12292,136 @@ msgstr ""
 "المتعددة. <B> فتنفيذ بعض الإجراءات المخزنة قد تفشل! </ B> الرجاء استخدام "
 "ملحق 'mysqli' لتجنب أي مشاكل."
 
-#: libraries/rte/rte_routines.lib.php:110
-#: libraries/rte/rte_routines.lib.php:1006
+#: libraries/rte/rte_routines.lib.php:123
+msgid "Edit routine"
+msgstr "تعديل الإجراء"
+
+#: libraries/rte/rte_routines.lib.php:200
+#: libraries/rte/rte_routines.lib.php:1097
 #, php-format
 msgid "Invalid routine type: \"%s\""
 msgstr "نوع الإجراء غير صحيح: %s"
 
-#: libraries/rte/rte_routines.lib.php:170
+#: libraries/rte/rte_routines.lib.php:253
+#, php-format
+msgid "Routine %1$s has been created."
+msgstr "تم إنشاء الإجراء %1$s."
+
+#: libraries/rte/rte_routines.lib.php:380
 msgid "Sorry, we failed to restore the dropped routine."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:211
+#: libraries/rte/rte_routines.lib.php:439
 #, fuzzy, php-format
 #| msgid "Routine %1$s has been modified."
 msgid "Routine %1$s has been modified. Privileges have been adjusted."
 msgstr "تم تعديل الإجراء %1$s."
 
-#: libraries/rte/rte_routines.lib.php:216
+#: libraries/rte/rte_routines.lib.php:444
 #, php-format
 msgid "Routine %1$s has been modified."
 msgstr "تم تعديل الإجراء %1$s."
 
-#: libraries/rte/rte_routines.lib.php:238
-#, php-format
-msgid "Routine %1$s has been created."
-msgstr "تم إنشاء الإجراء %1$s."
-
-#: libraries/rte/rte_routines.lib.php:315
-msgid "Edit routine"
-msgstr "تعديل الإجراء"
-
-#: libraries/rte/rte_routines.lib.php:797
+#: libraries/rte/rte_routines.lib.php:888
 #, fuzzy
 #| msgid "Column names"
 msgid "Routine name"
 msgstr "اسم العمود"
 
-#: libraries/rte/rte_routines.lib.php:823
+#: libraries/rte/rte_routines.lib.php:914
 msgid "Parameters"
 msgstr "معايير"
 
-#: libraries/rte/rte_routines.lib.php:829
+#: libraries/rte/rte_routines.lib.php:920
 #, fuzzy
 #| msgid "Creation"
 msgid "Direction"
 msgstr "الإنشاء"
 
-#: libraries/rte/rte_routines.lib.php:847
+#: libraries/rte/rte_routines.lib.php:938
 #, fuzzy
 #| msgid "Add new field"
 msgid "Add parameter"
 msgstr "إضافة حقل جديد"
 
-#: libraries/rte/rte_routines.lib.php:851
+#: libraries/rte/rte_routines.lib.php:942
 #, fuzzy
 #| msgid "Remove database"
 msgid "Remove last parameter"
 msgstr "حذف قاعدة البيانات"
 
-#: libraries/rte/rte_routines.lib.php:856
+#: libraries/rte/rte_routines.lib.php:947
 msgid "Return type"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:862
+#: libraries/rte/rte_routines.lib.php:953
 #, fuzzy
 #| msgid "Length/Values"
 msgid "Return length/values"
 msgstr "الطول/القيمة"
 
-#: libraries/rte/rte_routines.lib.php:868
+#: libraries/rte/rte_routines.lib.php:959
 #, fuzzy
 #| msgid "Table options"
 msgid "Return options"
 msgstr "خيارات الجدول"
 
-#: libraries/rte/rte_routines.lib.php:899
+#: libraries/rte/rte_routines.lib.php:990
 msgid "Is deterministic"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:920
+#: libraries/rte/rte_routines.lib.php:1011
 msgid ""
 "You do not have sufficient privileges to perform this operation; Please "
 "refer to the documentation for more details"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:935
+#: libraries/rte/rte_routines.lib.php:1026
 #, fuzzy
 #| msgid "Query type"
 msgid "Security type"
 msgstr "نوع الاستعلام"
 
-#: libraries/rte/rte_routines.lib.php:944
+#: libraries/rte/rte_routines.lib.php:1035
 msgid "SQL data access"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1013
+#: libraries/rte/rte_routines.lib.php:1104
 #, fuzzy
 #| msgid "Invalid table name"
 msgid "You must provide a routine name!"
 msgstr "اسم الجدول غير صالح"
 
-#: libraries/rte/rte_routines.lib.php:1047
+#: libraries/rte/rte_routines.lib.php:1138
 #, php-format
 msgid "Invalid direction \"%s\" given for parameter."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1069
-#: libraries/rte/rte_routines.lib.php:1131
+#: libraries/rte/rte_routines.lib.php:1160
+#: libraries/rte/rte_routines.lib.php:1222
 msgid ""
 "You must provide length/values for routine parameters of type ENUM, SET, "
 "VARCHAR and VARBINARY."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1095
+#: libraries/rte/rte_routines.lib.php:1186
 msgid "You must provide a name and a type for each routine parameter."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1114
+#: libraries/rte/rte_routines.lib.php:1205
 msgid "You must provide a valid return type for the routine."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1174
+#: libraries/rte/rte_routines.lib.php:1265
 msgid "You must provide a routine definition."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1285
+#: libraries/rte/rte_routines.lib.php:1376
 #, php-format
 msgid "Execution results of routine %s"
 msgstr "نتائج تنفيذ الإجراء %s"
 
-#: libraries/rte/rte_routines.lib.php:1340
+#: libraries/rte/rte_routines.lib.php:1431
 #, fuzzy, php-format
 #| msgid "%d row affected by the last statement inside the procedure"
 #| msgid_plural "%d rows affected by the last statement inside the procedure"
@@ -12418,13 +12434,13 @@ msgstr[3] "%d تأثر بالإجراء الأخير"
 msgstr[4] "%d تأثر بالإجراء الأخير"
 msgstr[5] "%d تأثر بالإجراء الأخير"
 
-#: libraries/rte/rte_routines.lib.php:1398
-#: libraries/rte/rte_routines.lib.php:1406
+#: libraries/rte/rte_routines.lib.php:1489
+#: libraries/rte/rte_routines.lib.php:1497
 msgid "Execute routine"
 msgstr "تنفيذ"
 
-#: libraries/rte/rte_routines.lib.php:1485
-#: libraries/rte/rte_routines.lib.php:1488
+#: libraries/rte/rte_routines.lib.php:1576
+#: libraries/rte/rte_routines.lib.php:1579
 msgid "Routine parameters"
 msgstr ""
 
@@ -12618,7 +12634,7 @@ msgid "Original position"
 msgstr "الوضع الأصلي"
 
 #: libraries/server_bin_log.lib.php:133
-#: templates/structure/display_table_stats.phtml:4
+#: templates/table/structure/display_table_stats.phtml:4
 msgid "Information"
 msgstr "معلومات"
 
@@ -12656,12 +12672,12 @@ msgstr ""
 "ملاحظة: تمكين إحصائيات قواعد البيانات هنا قد يسبب تدفق بيانات ثقيل بين خادم "
 "الويب وخادم MySQL."
 
-#: libraries/server_databases.lib.php:364
-#: libraries/server_databases.lib.php:365
+#: libraries/server_databases.lib.php:366
+#: libraries/server_databases.lib.php:371
 msgid "Enable Statistics"
 msgstr "مكن الإحصائيات"
 
-#: libraries/server_databases.lib.php:481
+#: libraries/server_databases.lib.php:492
 #, fuzzy, php-format
 #| msgid "%s databases have been dropped successfully."
 msgid "%1$d database has been dropped successfully."
@@ -13046,7 +13062,7 @@ msgid "You have revoked the privileges for %s."
 msgstr "لقد أبطلت الامتيازات لـ %s."
 
 #: libraries/server_privileges.lib.php:2059
-#: libraries/server_privileges.lib.php:4290
+#: libraries/server_privileges.lib.php:4316
 #, fuzzy
 #| msgid "Add user"
 msgid "Add user account"
@@ -13231,60 +13247,60 @@ msgstr "قيد حذف %s"
 msgid "The privileges were reloaded successfully."
 msgstr "تم إعادة قراءة الصلاحيات بنجاح."
 
-#: libraries/server_privileges.lib.php:3994
+#: libraries/server_privileges.lib.php:4003
 #, php-format
 msgid "The user %s already exists!"
 msgstr "اسم المستخدم %s موجود مسبقاً!"
 
-#: libraries/server_privileges.lib.php:4232
+#: libraries/server_privileges.lib.php:4258
 #, fuzzy, php-format
 #| msgid "Privileges"
 msgid "Privileges for %s"
 msgstr "الإمتيازات"
 
-#: libraries/server_privileges.lib.php:4241
+#: libraries/server_privileges.lib.php:4267
 #: libraries/server_status_processes.lib.php:72
 #: libraries/server_user_groups.lib.php:39
 msgid "User"
 msgstr "المستخدم"
 
-#: libraries/server_privileges.lib.php:4282
+#: libraries/server_privileges.lib.php:4308
 msgctxt "Create new user"
 msgid "New"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4311
+#: libraries/server_privileges.lib.php:4337
 #, fuzzy
 #| msgid "Edit Privileges"
 msgid "Edit privileges:"
 msgstr "تحرير الامتيازات"
 
-#: libraries/server_privileges.lib.php:4312
+#: libraries/server_privileges.lib.php:4338
 #, fuzzy
 #| msgid "Users"
 msgid "User account"
 msgstr "المستخدمون"
 
-#: libraries/server_privileges.lib.php:4371
+#: libraries/server_privileges.lib.php:4397
 msgid ""
 "Note: You are attempting to edit privileges of the user with which you are "
 "currently logged in."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4391 libraries/server_users.lib.php:25
+#: libraries/server_privileges.lib.php:4417 libraries/server_users.lib.php:25
 #, fuzzy
 #| msgid "User overview"
 msgid "User accounts overview"
 msgstr "معلومات المستخدم"
 
-#: libraries/server_privileges.lib.php:4459
+#: libraries/server_privileges.lib.php:4485
 msgid ""
 "A user account allowing any user from localhost to connect is present. This "
 "will prevent other users from connecting if the host part of their account "
 "allows a connection from any (%) host."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4500
+#: libraries/server_privileges.lib.php:4526
 #, php-format
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
@@ -13297,7 +13313,7 @@ msgstr ""
 "ما تم التعديل عليها يدويا. في هذه الحالة، عليك %s بإعادة قراءة الصلاحيات %s "
 "قبل أن تكمل."
 
-#: libraries/server_privileges.lib.php:4519
+#: libraries/server_privileges.lib.php:4545
 #, fuzzy
 #| msgid ""
 #| "Note: phpMyAdmin gets the users' privileges directly from MySQL's "
@@ -13316,64 +13332,64 @@ msgstr ""
 "ما تم التعديل عليها يدويا. في هذه الحالة، عليك %s بإعادة قراءة الصلاحيات %s "
 "قبل أن تكمل."
 
-#: libraries/server_privileges.lib.php:4569
+#: libraries/server_privileges.lib.php:4595
 msgid "The selected user was not found in the privilege table."
 msgstr "المستخدم المحدد غير موجود في جدول الصلاحيات."
 
-#: libraries/server_privileges.lib.php:4801
+#: libraries/server_privileges.lib.php:4827
 msgid "You have added a new user."
 msgstr "لقد أضفت مستخدم جديد."
 
-#: libraries/server_status.lib.php:53
+#: libraries/server_status.lib.php:60
 #, php-format
 msgid "Network traffic since startup: %s"
 msgstr ""
 
-#: libraries/server_status.lib.php:66
+#: libraries/server_status.lib.php:73
 #, fuzzy, php-format
 #| msgid "This MySQL server has been running for %s. It started up on %s."
 msgid "This MySQL server has been running for %1$s. It started up on %2$s."
 msgstr "مضى على عمل خادم MySQL مدة %s. بدأ العمل في %s."
 
-#: libraries/server_status.lib.php:80
+#: libraries/server_status.lib.php:94
 msgid ""
 "This MySQL server works as <b>master</b> and <b>slave</b> in <b>replication</"
 "b> process."
 msgstr ""
 
-#: libraries/server_status.lib.php:85
+#: libraries/server_status.lib.php:99
 msgid "This MySQL server works as <b>master</b> in <b>replication</b> process."
 msgstr ""
 
-#: libraries/server_status.lib.php:90
+#: libraries/server_status.lib.php:104
 msgid "This MySQL server works as <b>slave</b> in <b>replication</b> process."
 msgstr ""
 
-#: libraries/server_status.lib.php:106
+#: libraries/server_status.lib.php:116
 msgid "Replication status"
 msgstr ""
 
-#: libraries/server_status.lib.php:137
+#: libraries/server_status.lib.php:146
 msgid ""
 "On a busy server, the byte counters may overrun, so those statistics as "
 "reported by the MySQL server may be incorrect."
 msgstr ""
 
-#: libraries/server_status.lib.php:148
+#: libraries/server_status.lib.php:157
 msgid "Received"
 msgstr "استلم"
 
-#: libraries/server_status.lib.php:167
+#: libraries/server_status.lib.php:176
 msgid "Sent"
 msgstr "أرسل"
 
-#: libraries/server_status.lib.php:234
+#: libraries/server_status.lib.php:243
 #, fuzzy
 #| msgid "Connections"
 msgid "Max. concurrent connections"
 msgstr "اتصالات"
 
-#: libraries/server_status.lib.php:244
+#: libraries/server_status.lib.php:253
 msgid "Failed attempts"
 msgstr "محاولات أخفقت"
 
@@ -14370,7 +14386,7 @@ msgstr ""
 msgid "Not implemented yet."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/AlterOperation.php:193
+#: libraries/sql-parser/src/Components/AlterOperation.php:191
 msgid "Unrecognized alter operation."
 msgstr ""
 
@@ -14384,7 +14400,7 @@ msgid "An opening bracket followed by a set of values was expected."
 msgstr ""
 
 #: libraries/sql-parser/src/Components/ArrayObj.php:101
-#: libraries/sql-parser/src/Components/FieldDefinition.php:202
+#: libraries/sql-parser/src/Components/CreateDefinition.php:202
 msgid "An opening bracket was expected."
 msgstr ""
 
@@ -14392,25 +14408,35 @@ msgstr ""
 msgid "A comma or a closing bracket was expected"
 msgstr ""
 
+#: libraries/sql-parser/src/Components/CreateDefinition.php:246
+#, fuzzy
+#| msgid "No tables selected."
+msgid "A comma or a closing bracket was expected."
+msgstr "لم يتم تحديد أى جداول ."
+
+#: libraries/sql-parser/src/Components/CreateDefinition.php:262
+msgid "A closing bracket was expected."
+msgstr ""
+
 #: libraries/sql-parser/src/Components/DataType.php:125
 msgid "Unrecognized data type."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:225
+#: libraries/sql-parser/src/Components/Expression.php:227
 msgid "Unexpected closing bracket."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:246
-#: libraries/sql-parser/src/Components/Expression.php:283
-#: libraries/sql-parser/src/Components/Expression.php:303
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:285
+#: libraries/sql-parser/src/Components/Expression.php:305
 msgid "An alias was previously found."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:257
+#: libraries/sql-parser/src/Components/Expression.php:259
 msgid "Unexpected dot."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:327
+#: libraries/sql-parser/src/Components/Expression.php:329
 #, fuzzy
 #| msgid "No tables selected."
 msgid "An alias was expected."
@@ -14422,16 +14448,6 @@ msgstr "لم يتم تحديد أى جداول ."
 msgid "An expression was expected."
 msgstr "لايوجد صفوف مختارة"
 
-#: libraries/sql-parser/src/Components/FieldDefinition.php:246
-#, fuzzy
-#| msgid "No tables selected."
-msgid "A comma or a closing bracket was expected."
-msgstr "لم يتم تحديد أى جداول ."
-
-#: libraries/sql-parser/src/Components/FieldDefinition.php:262
-msgid "A closing bracket was expected."
-msgstr ""
-
 #: libraries/sql-parser/src/Components/Limit.php:90
 #: libraries/sql-parser/src/Components/Limit.php:112
 msgid "An offset was expected."
@@ -14475,29 +14491,29 @@ msgstr ""
 msgid "Expected delimiter."
 msgstr ""
 
-#: libraries/sql-parser/src/Lexer.php:753
+#: libraries/sql-parser/src/Lexer.php:777
 #, fuzzy, php-format
 #| msgid "Routine %1$s has been created."
 msgid "Ending quote %1$s was expected."
 msgstr "تم إنشاء الإجراء %1$s."
 
-#: libraries/sql-parser/src/Lexer.php:789
+#: libraries/sql-parser/src/Lexer.php:813
 #, fuzzy
 #| msgid "Table name template"
 msgid "Variable name was expected."
 msgstr "إسم قالب الجدول"
 
-#: libraries/sql-parser/src/Parser.php:380
+#: libraries/sql-parser/src/Parser.php:391
 #, fuzzy
 #| msgid "At Beginning of Table"
 msgid "Unexpected beginning of statement."
 msgstr "في بداية الجدول"
 
-#: libraries/sql-parser/src/Parser.php:399
+#: libraries/sql-parser/src/Parser.php:410
 msgid "Unrecognized statement type."
 msgstr ""
 
-#: libraries/sql-parser/src/Parser.php:479
+#: libraries/sql-parser/src/Parser.php:489
 msgid "No transaction was previously started."
 msgstr ""
 
@@ -14525,8 +14541,10 @@ msgid "The name of the entity was expected."
 msgstr ""
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:310
-msgid "At least one field definition was expected."
-msgstr ""
+#, fuzzy
+#| msgid "The row has been deleted."
+msgid "At least one column definition was expected."
+msgstr "لقد تمّ حذف الصّف"
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:329
 msgid "A \"RETURNS\" keyword was expected."
@@ -14603,25 +14621,25 @@ msgstr "تم إنشاء العلامة المرجعية %s"
 msgid "Using bookmark \"%s\" as default browse query."
 msgstr ""
 
-#: libraries/sql.lib.php:1306
+#: libraries/sql.lib.php:1300
 msgid "Showing as PHP code"
 msgstr ""
 
-#: libraries/sql.lib.php:1638
+#: libraries/sql.lib.php:1632
 #, php-format
 msgid ""
 "Current selection does not contain a unique column. Grid edit, checkbox, "
 "Edit, Copy and Delete features are not available. %s"
 msgstr ""
 
-#: libraries/sql.lib.php:1649
+#: libraries/sql.lib.php:1643
 #, php-format
 msgid ""
 "Current selection does not contain a unique column. Grid edit, Edit, Copy "
 "and Delete features may result in undesired behavior. %s"
 msgstr ""
 
-#: libraries/sql.lib.php:1688
+#: libraries/sql.lib.php:1682
 #, php-format
 msgid "Problems with indexes of table `%s`"
 msgstr ""
@@ -14790,7 +14808,7 @@ msgid "Version %s snapshot (SQL code)"
 msgstr ""
 
 #: libraries/tracking.lib.php:947
-#: templates/structure/table_structure_row.phtml:33
+#: templates/table/structure/table_structure_row.phtml:33
 msgctxt "None for default"
 msgid "None"
 msgstr "لا شيء"
@@ -14846,19 +14864,19 @@ msgstr "انشئ إصدار %s  لـ %s.s%s"
 msgid "Version %1$s was created, tracking for %2$s is active."
 msgstr "تم إنشاء الإصدار %s , التتبع نشط لـ %s.%s"
 
-#: libraries/user_preferences.inc.php:29
+#: libraries/user_preferences.inc.php:30
 #, fuzzy
 #| msgid "General relation features"
 msgid "Manage your settings"
 msgstr "المزايا العامّة للرابط"
 
-#: libraries/user_preferences.inc.php:46 prefs_manage.php:307
+#: libraries/user_preferences.inc.php:54 prefs_manage.php:307
 #, fuzzy
 #| msgid "Modifications have been saved"
 msgid "Configuration has been saved."
 msgstr "تمت التعديلات"
 
-#: libraries/user_preferences.inc.php:66
+#: libraries/user_preferences.inc.php:74
 #, php-format
 msgid ""
 "Your preferences will be saved for current session only. Storing them "
@@ -15256,7 +15274,7 @@ msgid "first"
 msgstr ""
 
 #: templates/columns_definitions/move_column.phtml:12
-#: templates/structure/add_column.phtml:21
+#: templates/table/structure/add_column.phtml:21
 #, fuzzy, php-format
 #| msgid "After %s"
 msgid "after %s"
@@ -15343,241 +15361,352 @@ msgstr "تحويل المتصفح"
 msgid "Input transformation options"
 msgstr "خيارات التحويل"
 
-#: templates/designer/aggregate_query_panel.phtml:22
-#: templates/designer/options_panel.phtml:100
+#: templates/database/create_table.phtml:7
+#: templates/database/designer/side_menu.phtml:77
+#: templates/database/designer/side_menu.phtml:80
+msgid "Create table"
+msgstr "أنشئ الجدول"
+
+#: templates/database/create_table.phtml:15
+msgid "Number of columns"
+msgstr "عدد العواميد"
+
+#: templates/database/designer/aggregate_query_panel.phtml:22
+#: templates/database/designer/options_panel.phtml:100
 #, fuzzy
 #| msgid "Create"
 msgid "Aggregate"
 msgstr "تكوين"
 
-#: templates/designer/aggregate_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:61
-#: templates/designer/options_panel.phtml:106
-#: templates/designer/options_panel.phtml:170
-#: templates/designer/where_query_panel.phtml:30
-#: templates/table/table_header.phtml:9
+#: templates/database/designer/aggregate_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:61
+#: templates/database/designer/options_panel.phtml:106
+#: templates/database/designer/options_panel.phtml:170
+#: templates/database/designer/where_query_panel.phtml:30
+#: templates/table/search/table_header.phtml:9
 msgid "Operator"
 msgstr "عامل التشغيل"
 
-#: templates/designer/database_tables.phtml:29
+#: templates/database/designer/database_tables.phtml:29
 msgid "Toggle"
 msgstr ""
 
-#: templates/designer/database_tables.phtml:40
+#: templates/database/designer/database_tables.phtml:40
 #, fuzzy
 #| msgid "Table structure"
 msgid "See table structure"
 msgstr "بنية الجدول"
 
-#: templates/designer/delete_relation_panel.phtml:21
+#: templates/database/designer/delete_relation_panel.phtml:21
 msgid "Delete relation"
 msgstr ""
 
-#: templates/designer/edit_delete_pages.phtml:7
+#: templates/database/designer/edit_delete_pages.phtml:7
 #, fuzzy
 #| msgid "Page titles"
 msgid "Page to open"
 msgstr "عناوين الصفحة"
 
-#: templates/designer/edit_delete_pages.phtml:7
+#: templates/database/designer/edit_delete_pages.phtml:7
 #, fuzzy
 #| msgid "Page titles"
 msgid "Page to delete"
 msgstr "عناوين الصفحة"
 
-#: templates/designer/having_query_panel.phtml:90
-#: templates/designer/options_panel.phtml:63
-#: templates/designer/options_panel.phtml:229
-#: templates/designer/where_query_panel.phtml:59
+#: templates/database/designer/having_query_panel.phtml:90
+#: templates/database/designer/options_panel.phtml:63
+#: templates/database/designer/options_panel.phtml:229
+#: templates/database/designer/where_query_panel.phtml:59
 #, fuzzy
 #| msgid "Export"
 msgid "Except"
 msgstr "تصدير"
 
-#: templates/designer/having_query_panel.phtml:102
-#: templates/designer/options_panel.phtml:75
-#: templates/designer/options_panel.phtml:241
-#: templates/designer/where_query_panel.phtml:71
+#: templates/database/designer/having_query_panel.phtml:102
+#: templates/database/designer/options_panel.phtml:75
+#: templates/database/designer/options_panel.phtml:241
+#: templates/database/designer/where_query_panel.phtml:71
 #, fuzzy
 #| msgid "in query"
 msgid "subquery"
 msgstr "في الاستعلام"
 
-#: templates/designer/new_relation_panel.phtml:22
-#: templates/designer/side_menu.phtml:84 templates/designer/side_menu.phtml:87
+#: templates/database/designer/new_relation_panel.phtml:22
+#: templates/database/designer/side_menu.phtml:84
+#: templates/database/designer/side_menu.phtml:87
 msgid "Create relation"
 msgstr ""
 
-#: templates/designer/options_panel.phtml:34
-#: templates/designer/options_panel.phtml:200
+#: templates/database/designer/options_panel.phtml:34
+#: templates/database/designer/options_panel.phtml:200
 #, fuzzy
 #| msgid "Relation view"
 msgid "Relation operator"
 msgstr "عرض الروابط"
 
-#: templates/designer/options_panel.phtml:85
-#: templates/designer/rename_to_panel.phtml:23
+#: templates/database/designer/options_panel.phtml:85
+#: templates/database/designer/rename_to_panel.phtml:23
 #, fuzzy
 #| msgid "Rename table to"
 msgid "Rename to"
 msgstr "تغيير اسم جدول إلى"
 
-#: templates/designer/options_panel.phtml:91
-#: templates/designer/rename_to_panel.phtml:31
+#: templates/database/designer/options_panel.phtml:91
+#: templates/database/designer/rename_to_panel.phtml:31
 #, fuzzy
 #| msgid "User name"
 msgid "New name"
 msgstr "اسم المستخدم"
 
-#: templates/designer/page_save_as.phtml:4
+#: templates/database/designer/page_save_as.phtml:4
 #, fuzzy
 #| msgid "Import files"
 msgid "Save to selected page"
 msgstr "استورد الملفات"
 
-#: templates/designer/page_save_as.phtml:5
+#: templates/database/designer/page_save_as.phtml:5
 #, fuzzy
 #| msgid "Create a new index"
 msgid "Create a page and save to it"
 msgstr "تصميم فهرسه جديده"
 
-#: templates/designer/page_save_as.phtml:26
+#: templates/database/designer/page_save_as.phtml:26
 #, fuzzy
 #| msgid "User name"
 msgid "New page name"
 msgstr "اسم المستخدم"
 
-#: templates/designer/page_selector.phtml:2
+#: templates/database/designer/page_selector.phtml:2
 #, fuzzy
 #| msgid "Select Tables"
 msgid "Select page"
 msgstr "اختر الجداول"
 
-#: templates/designer/query_details.phtml:10
+#: templates/database/designer/query_details.phtml:10
 #, fuzzy
 #| msgid "Table options"
 msgid "Active options"
 msgstr "خيارات الجدول"
 
-#: templates/designer/schema_export.phtml:4
+#: templates/database/designer/schema_export.phtml:4
 msgid "Select Export Relational Type"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:19 templates/designer/side_menu.phtml:25
+#: templates/database/designer/side_menu.phtml:19
+#: templates/database/designer/side_menu.phtml:25
 #, fuzzy
 #| msgid "Show tables"
 msgid "Show/Hide tables list"
 msgstr "عرض الجداول"
 
-#: templates/designer/side_menu.phtml:29 templates/designer/side_menu.phtml:35
-#: templates/designer/side_menu.phtml:36
+#: templates/database/designer/side_menu.phtml:29
+#: templates/database/designer/side_menu.phtml:35
+#: templates/database/designer/side_menu.phtml:36
 msgid "View in fullscreen"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:34
+#: templates/database/designer/side_menu.phtml:34
 msgid "Exit fullscreen"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:41 templates/designer/side_menu.phtml:45
+#: templates/database/designer/side_menu.phtml:41
+#: templates/database/designer/side_menu.phtml:45
 #, fuzzy
 #| msgid "User name"
 msgid "New page"
 msgstr "اسم المستخدم"
 
-#: templates/designer/side_menu.phtml:70 templates/designer/side_menu.phtml:73
+#: templates/database/designer/side_menu.phtml:70
+#: templates/database/designer/side_menu.phtml:73
 #, fuzzy
 #| msgid "Select Tables"
 msgid "Delete pages"
 msgstr "اختر الجداول"
 
-#: templates/designer/side_menu.phtml:77 templates/designer/side_menu.phtml:80
-#: templates/table/create_table.phtml:7
-msgid "Create table"
-msgstr "أنشئ الجدول"
-
-#: templates/designer/side_menu.phtml:98
-#: templates/designer/side_menu.phtml:101
+#: templates/database/designer/side_menu.phtml:98
+#: templates/database/designer/side_menu.phtml:101
 msgid "Reload"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:107
-#: templates/designer/side_menu.phtml:110
+#: templates/database/designer/side_menu.phtml:107
+#: templates/database/designer/side_menu.phtml:110
 msgid "Help"
 msgstr "مساعدة"
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Angular links"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Direct links"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:122
-#: templates/designer/side_menu.phtml:124
+#: templates/database/designer/side_menu.phtml:122
+#: templates/database/designer/side_menu.phtml:124
 msgid "Snap to grid"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:128
-#: templates/designer/side_menu.phtml:134
+#: templates/database/designer/side_menu.phtml:128
+#: templates/database/designer/side_menu.phtml:134
 msgid "Small/Big All"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:138
-#: templates/designer/side_menu.phtml:141
+#: templates/database/designer/side_menu.phtml:138
+#: templates/database/designer/side_menu.phtml:141
 msgid "Toggle small/big"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:145
-#: templates/designer/side_menu.phtml:148
+#: templates/database/designer/side_menu.phtml:145
+#: templates/database/designer/side_menu.phtml:148
 #, fuzzy
 #| msgid "Traditional Chinese"
 msgid "Toggle relation lines"
 msgstr "الصينية التقليدية"
 
-#: templates/designer/side_menu.phtml:153
-#: templates/designer/side_menu.phtml:156
+#: templates/database/designer/side_menu.phtml:153
+#: templates/database/designer/side_menu.phtml:156
 #, fuzzy
 #| msgid "Export"
 msgid "Export schema"
 msgstr "تصدير"
 
-#: templates/designer/side_menu.phtml:165
-#: templates/designer/side_menu.phtml:168
+#: templates/database/designer/side_menu.phtml:165
+#: templates/database/designer/side_menu.phtml:168
 #, fuzzy
 #| msgid "Submit Query"
 msgid "Build Query"
 msgstr "إرسال الاستعلام"
 
-#: templates/designer/side_menu.phtml:173
-#: templates/designer/side_menu.phtml:177
+#: templates/database/designer/side_menu.phtml:173
+#: templates/database/designer/side_menu.phtml:177
 msgid "Move Menu"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:181
-#: templates/designer/side_menu.phtml:186
+#: templates/database/designer/side_menu.phtml:181
+#: templates/database/designer/side_menu.phtml:186
 #, fuzzy
 #| msgid "Partial texts"
 msgid "Pin text"
 msgstr "نصوص جزئيّة"
 
-#: templates/designer/table_list.phtml:4
+#: templates/database/designer/table_list.phtml:4
 msgid "Hide/Show all"
 msgstr ""
 
-#: templates/designer/table_list.phtml:14
+#: templates/database/designer/table_list.phtml:14
 msgid "Hide/Show Tables with no relation"
 msgstr ""
 
-#: templates/designer/table_list.phtml:59
+#: templates/database/designer/table_list.phtml:59
 #, fuzzy
 #| msgid "Number of tables"
 msgid "Number of tables:"
 msgstr "عدد الجداول"
 
+#: templates/database/structure/body_for_table_summary.phtml:6
+#, php-format
+msgid "%s table"
+msgid_plural "%s tables"
+msgstr[0] "%s جدول (جداول)"
+msgstr[1] "%s جدول (جداول)"
+msgstr[2] "%s جدول (جداول)"
+msgstr[3] "%s جدول (جداول)"
+msgstr[4] "%s جدول (جداول)"
+msgstr[5] "%s جدول (جداول)"
+
+#: templates/database/structure/body_for_table_summary.phtml:17
+msgid "Sum"
+msgstr "المجموع"
+
+#: templates/database/structure/check_all_tables.phtml:6
+msgid "Check tables having overhead"
+msgstr "تحقق من الجداول التي تحمل عبء زائد"
+
+#: templates/database/structure/check_all_tables.phtml:10
+#, fuzzy
+#| msgid "Show color"
+msgid "Show create"
+msgstr "أظهر اللون"
+
+#: templates/database/structure/check_all_tables.phtml:27
+#, fuzzy
+#| msgid "Add new field"
+msgid "Prefix"
+msgstr "إضافة حقل جديد"
+
+#: templates/database/structure/check_all_tables.phtml:28
+msgid "Add prefix to table"
+msgstr "إضافة بادئة للجدول"
+
+#: templates/database/structure/check_all_tables.phtml:29
+msgid "Replace table prefix"
+msgstr "استبدال بادئة الجدول"
+
+#: templates/database/structure/check_all_tables.phtml:30
+msgid "Copy table with prefix"
+msgstr "نسخ الجدول مع البادئة"
+
+#: templates/database/structure/check_all_tables.phtml:36
+#, fuzzy
+#| msgid "CHAR textarea columns"
+msgid "Add columns to central list"
+msgstr "أعمدة مربع النص لـ CHAR"
+
+#: templates/database/structure/check_all_tables.phtml:37
+msgid "Remove columns from central list"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:38
+#, fuzzy
+#| msgid "CHAR textarea columns"
+msgid "Make consistent with central list"
+msgstr "أعمدة مربع النص لـ CHAR"
+
+#: templates/database/structure/favorite_anchor.phtml:12
+#, fuzzy
+#| msgid "Add a new User"
+msgid "Add to Favorites"
+msgstr "أضف مستخدم جديد"
+
+#: templates/database/structure/show_create.phtml:2
+#, fuzzy
+#| msgid "Show Full Queries"
+msgid "Showing create queries"
+msgstr "اعرض الاستعلامات كاملة"
+
+#: templates/database/structure/sortable_header.phtml:13
+msgid "Sort"
+msgstr "ترتيب"
+
+#: templates/database/structure/table_header.phtml:42
+#, fuzzy
+#| msgid "May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]"
+msgid ""
+"May be approximate. Click on the number to get the exact count. See "
+"[doc@faq3-11]FAQ 3.11[/doc]."
+msgstr "ممكن أن يكون تقريبي. أنظر إلى [doc@faq3-11]الأسئلة المتكررة 3.11[/doc]"
+
+#: templates/database/structure/table_header.phtml:66
+#: templates/table/index_form.phtml:127
+msgid "Size"
+msgstr "الحجم"
+
+#: templates/database/structure/table_header.phtml:74
+#: templates/table/structure/display_table_stats.phtml:27
+msgid "Overhead"
+msgstr "الحمل الزائد"
+
+#: templates/database/structure/tracking_icon.phtml:4
+msgid "Tracking is active."
+msgstr "التتبع نشط."
+
+#: templates/database/structure/tracking_icon.phtml:8
+msgid "Tracking is not active."
+msgstr "التتبع غير نشط."
+
 #: templates/error/report_form.phtml:7
 msgid ""
 "phpMyAdmin has encountered an error. We have collected data about this error "
@@ -15593,74 +15722,6 @@ msgstr ""
 msgid "Please explain the steps that lead to the error:"
 msgstr ""
 
-#: templates/gis_visualization/gis_visualization.phtml:3
-msgid "Display GIS Visualization"
-msgstr ""
-
-#: templates/gis_visualization/gis_visualization.phtml:8
-#, fuzzy
-#| msgid "Add/Delete Field Columns"
-msgid "Label column"
-msgstr "إضافه/حذف عمود حقل"
-
-#: templates/gis_visualization/gis_visualization.phtml:11
-#, fuzzy
-#| msgid "- none -"
-msgid "-- None --"
-msgstr "- لا شيء -"
-
-#: templates/gis_visualization/gis_visualization.phtml:19
-#, fuzzy
-#| msgid "Total"
-msgid "Spatial column"
-msgstr "مجموع كلي"
-
-#: templates/index_form.phtml:16
-msgid "Index name:"
-msgstr "اسم الفهرس&nbsp;:"
-
-#: templates/index_form.phtml:19
-msgid ""
-"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
-msgstr ""
-"\"الأساسي\" <b>يجب</b> يجب أن يكون الاسم <b>وأيضاً فقط</b> المفتاح الأساسي!"
-
-#: templates/index_form.phtml:40
-#, fuzzy
-#| msgid "Index name:"
-msgid "Index choice:"
-msgstr "اسم الفهرس&nbsp;:"
-
-#: templates/index_form.phtml:57
-msgid "Key block size:"
-msgstr ""
-
-#: templates/index_form.phtml:74
-msgid "Index type:"
-msgstr "نوع الفهرس&nbsp;:"
-
-#: templates/index_form.phtml:86
-#, fuzzy
-#| msgid "User"
-msgid "Parser:"
-msgstr "المستخدم"
-
-#: templates/index_form.phtml:102
-#, fuzzy
-#| msgid "Comment"
-msgid "Comment:"
-msgstr "تعليق"
-
-#: templates/index_form.phtml:127 templates/structure/table_header.phtml:66
-msgid "Size"
-msgstr "الحجم"
-
-#: templates/index_form.phtml:149 templates/index_form.phtml:190
-#, fuzzy
-#| msgid "Drag to reorder"
-msgid "Drag to reorder"
-msgstr "إسحب لإعادة الترتيب"
-
 #: templates/prefs_autoload.phtml:9
 msgid ""
 "Your browser has phpMyAdmin configuration for this domain. Would you like to "
@@ -15673,329 +15734,26 @@ msgstr ""
 msgid "Start row:"
 msgstr "صف البداية"
 
-#: templates/structure/actions_in_table_structure.phtml:14
-#, php-format
-msgid "A primary key has been added on %s."
-msgstr "تم إضافة المفتاح الأساسي في %s."
-
-#: templates/structure/actions_in_table_structure.phtml:34
-#: templates/structure/actions_in_table_structure.phtml:54
-#: templates/structure/actions_in_table_structure.phtml:79
-#: templates/structure/actions_in_table_structure.phtml:101
-#, php-format
-msgid "An index has been added on %s."
-msgstr "تم إضافة الفهرس في %s."
-
-#: templates/structure/actions_in_table_structure.phtml:130
-#: templates/structure/check_all_table_column.phtml:59
-#, fuzzy
-#| msgid "Remove chart"
-msgid "Remove from central columns"
-msgstr "حذف الرسم البياني"
-
-#: templates/structure/actions_in_table_structure.phtml:138
-#: templates/structure/check_all_table_column.phtml:55
-#, fuzzy
-#| msgid "CHAR textarea columns"
-msgid "Add to central columns"
-msgstr "أعمدة مربع النص لـ CHAR"
-
-#: templates/structure/add_column.phtml:7
-#, fuzzy, php-format
-#| msgid "Add into comments"
-msgid "Add %s column(s)"
-msgstr "أضف إلى الملاحظات"
-
-#: templates/structure/add_column.phtml:12
-#, fuzzy
-#| msgid "At Beginning of Table"
-msgid "at beginning of table"
-msgstr "في بداية الجدول"
-
-#: templates/structure/body_for_table_summary.phtml:6
-#, php-format
-msgid "%s table"
-msgid_plural "%s tables"
-msgstr[0] "%s جدول (جداول)"
-msgstr[1] "%s جدول (جداول)"
-msgstr[2] "%s جدول (جداول)"
-msgstr[3] "%s جدول (جداول)"
-msgstr[4] "%s جدول (جداول)"
-msgstr[5] "%s جدول (جداول)"
-
-#: templates/structure/body_for_table_summary.phtml:17
-msgid "Sum"
-msgstr "المجموع"
-
-#: templates/structure/check_all_tables.phtml:6
-msgid "Check tables having overhead"
-msgstr "تحقق من الجداول التي تحمل عبء زائد"
-
-#: templates/structure/check_all_tables.phtml:10
-#, fuzzy
-#| msgid "Show color"
-msgid "Show create"
-msgstr "أظهر اللون"
-
-#: templates/structure/check_all_tables.phtml:27
-#, fuzzy
-#| msgid "Add new field"
-msgid "Prefix"
-msgstr "إضافة حقل جديد"
-
-#: templates/structure/check_all_tables.phtml:28
-msgid "Add prefix to table"
-msgstr "إضافة بادئة للجدول"
-
-#: templates/structure/check_all_tables.phtml:29
-msgid "Replace table prefix"
-msgstr "استبدال بادئة الجدول"
-
-#: templates/structure/check_all_tables.phtml:30
-msgid "Copy table with prefix"
-msgstr "نسخ الجدول مع البادئة"
-
-#: templates/structure/check_all_tables.phtml:36
-#, fuzzy
-#| msgid "CHAR textarea columns"
-msgid "Add columns to central list"
-msgstr "أعمدة مربع النص لـ CHAR"
-
-#: templates/structure/check_all_tables.phtml:37
-msgid "Remove columns from central list"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:38
-#, fuzzy
-#| msgid "CHAR textarea columns"
-msgid "Make consistent with central list"
-msgstr "أعمدة مربع النص لـ CHAR"
-
-#: templates/structure/display_structure.phtml:140 view_create.php:181
-#, fuzzy
-#| msgid "Print view"
-msgid "Edit view"
-msgstr "عرض نسخة للطباعة"
-
-#: templates/structure/display_table_stats.phtml:9
-msgid "Space usage"
-msgstr "المساحة المستخدمة"
-
-#: templates/structure/display_table_stats.phtml:27
-#: templates/structure/table_header.phtml:74
-msgid "Overhead"
-msgstr "الحمل الزائد"
-
-#: templates/structure/display_table_stats.phtml:32
-msgid "Effective"
-msgstr "فعال"
-
-#: templates/structure/favorite_anchor.phtml:12
-#, fuzzy
-#| msgid "Add a new User"
-msgid "Add to Favorites"
-msgstr "أضف مستخدم جديد"
-
-#: templates/structure/move_columns_dialog.phtml:1
-#: templates/structure/optional_action_links.phtml:21
-#, fuzzy
-#| msgid "Add columns"
-msgid "Move columns"
-msgstr "إضافة أعمدة"
-
-#: templates/structure/move_columns_dialog.phtml:2
-msgid "Move the columns by dragging them up and down."
-msgstr ""
-
-#: templates/structure/optional_action_links.phtml:9
-msgid "Propose table structure"
-msgstr "اقترح بناء الجدول"
-
-#: templates/structure/optional_action_links.phtml:24
-#, fuzzy
-#| msgid "Propose table structure"
-msgid "Improve table structure"
-msgstr "اقترح بناء الجدول"
-
-#: templates/structure/optional_action_links.phtml:30
-msgid "Track view"
-msgstr "تتبع الجدول"
-
-#: templates/structure/row_stats_table.phtml:3
-#, fuzzy
-#| msgid "Row Statistics"
-msgid "Row statistics"
-msgstr "إحصائيات"
-
-#: templates/structure/row_stats_table.phtml:9
-msgid "static"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:11
-msgid "dynamic"
-msgstr "ديناميكي"
-
-#: templates/structure/row_stats_table.phtml:22
-msgid "partitioned"
-msgstr "مقسم"
-
-#: templates/structure/row_stats_table.phtml:54
-msgid "Row length"
-msgstr "طول الصف"
-
-#: templates/structure/row_stats_table.phtml:66
-msgid "Row size"
-msgstr "مقاس الصف"
-
-#: templates/structure/row_stats_table.phtml:73
-msgid "Next autoindex"
-msgstr ""
-
-#: templates/structure/secondary_tabs.phtml:14
-#, fuzzy
-#| msgid "Relation view"
-msgid "Relation view"
-msgstr "عرض العلاقات"
-
-#: templates/structure/show_create.phtml:2
-#, fuzzy
-#| msgid "Show Full Queries"
-msgid "Showing create queries"
-msgstr "اعرض الاستعلامات كاملة"
-
-#: templates/structure/sortable_header.phtml:13
-msgid "Sort"
-msgstr "ترتيب"
-
-#: templates/structure/table_header.phtml:42
-#, fuzzy
-#| msgid "May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]"
-msgid ""
-"May be approximate. Click on the number to get the exact count. See "
-"[doc@faq3-11]FAQ 3.11[/doc]."
-msgstr "ممكن أن يكون تقريبي. أنظر إلى [doc@faq3-11]الأسئلة المتكررة 3.11[/doc]"
-
-#: templates/structure/table_structure_row.phtml:46
-#, php-format
-msgid "Column %s has been dropped."
-msgstr "تم حذف العمود %s."
-
-#: templates/structure/tracking_icon.phtml:4
-msgid "Tracking is active."
-msgstr "التتبع نشط."
-
-#: templates/structure/tracking_icon.phtml:8
-msgid "Tracking is not active."
-msgstr "التتبع غير نشط."
-
-#: templates/table/create_table.phtml:15
-msgid "Number of columns"
-msgstr "عدد العواميد"
-
-#: templates/table/options.phtml:8
-msgid "Select columns (at least one):"
-msgstr "اختيار الأعمدة (واحد على الأقل):"
-
-#: templates/table/options.phtml:37
-msgid "Add search conditions (body of the \"where\" clause):"
-msgstr "أضف شروط البحث (الفقرة \"where\" ):"
-
-#: templates/table/options.phtml:45
-msgid "Number of rows per page"
-msgstr "رقم السجلات لكل صفحة"
-
-#: templates/table/options.phtml:56
-msgid "Display order:"
-msgstr "ترتيب العرض:"
-
-#: templates/table/options_zoom.phtml:6
-msgid "Use this column to label each point"
-msgstr ""
-
-#: templates/table/options_zoom.phtml:35
-msgid "Maximum rows to plot"
-msgstr "أقصى عدد الصفوف للرسم"
-
-#: templates/table/replace_preview.phtml:13
-msgid "Find and replace - preview"
-msgstr "بحث واستبدال - المعاينة"
-
-#: templates/table/replace_preview.phtml:18
-#, fuzzy
-#| msgid "Linestring"
-msgid "Original string"
-msgstr "منحنى"
-
-#: templates/table/replace_preview.phtml:19
-#, fuzzy
-#| msgid "Related Links"
-msgid "Replaced string"
-msgstr "روابط ذات صلة"
-
-#: templates/table/replace_preview.phtml:40
-#, fuzzy
-#| msgid "Replicated"
-msgid "Replace"
-msgstr "مستنسخة"
-
-#: templates/table/rows_zoom.phtml:16
-msgid "Additional search criteria"
-msgstr "معايير بحث إضافية"
-
-#: templates/table/search_and_replace.phtml:3
-#, fuzzy
-#| msgid "Replace NULL by"
-msgid "Replace with:"
-msgstr "استبدل NULL بـ"
-
-#: templates/table/search_and_replace.phtml:22
-#, fuzzy
-#| msgid "as regular expression"
-msgid "Use regular expression"
-msgstr "كتعبير قياسي"
-
-#: templates/table/selection_form.phtml:12
-#, fuzzy
-#| msgid "Do a \"query by example\" (wildcard: \"%\")"
-msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
-msgstr "عمل \"استعلام بواسطة المثال\" (بدل: \"%\")"
-
-#: templates/table/selection_form.phtml:34
-msgid "Do a \"query by example\" (wildcard: \"%\")"
-msgstr "عمل \"استعلام بواسطة المثال\" (بدل: \"%\")"
-
-#: templates/table/zoom_result_form.phtml:7
-msgid "Browse/Edit the points"
-msgstr "تصفح/حرّر النقاط"
-
-#: templates/table/zoom_result_form.phtml:15
-msgid "How to use"
-msgstr "كيفية الإستعمال"
-
-#: templates/table/zoom_result_form.phtml:23
-msgid "Reset zoom"
-msgstr "إعادة تعيين المقربة"
-
-#: templates/tbl_chart.phtml:17
+#: templates/table/chart/tbl_chart.phtml:17
 #, fuzzy
 #| msgid "Mar"
 msgctxt "Chart type"
 msgid "Bar"
 msgstr "مارس"
 
-#: templates/tbl_chart.phtml:21
+#: templates/table/chart/tbl_chart.phtml:21
 #, fuzzy
 #| msgid "Column"
 msgctxt "Chart type"
 msgid "Column"
 msgstr "عمود"
 
-#: templates/tbl_chart.phtml:25
+#: templates/table/chart/tbl_chart.phtml:25
 msgctxt "Chart type"
 msgid "Line"
 msgstr ""
 
-#: templates/tbl_chart.phtml:29
+#: templates/table/chart/tbl_chart.phtml:29
 #, fuzzy
 #| msgctxt "Inline edit query"
 #| msgid "Inline"
@@ -16003,155 +15761,422 @@ msgctxt "Chart type"
 msgid "Spline"
 msgstr "مضمن"
 
-#: templates/tbl_chart.phtml:33
+#: templates/table/chart/tbl_chart.phtml:33
 msgctxt "Chart type"
 msgid "Area"
 msgstr ""
 
-#: templates/tbl_chart.phtml:37
+#: templates/table/chart/tbl_chart.phtml:37
 #, fuzzy
 #| msgid "PiB"
 msgctxt "Chart type"
 msgid "Pie"
 msgstr "بيتابايت"
 
-#: templates/tbl_chart.phtml:41
+#: templates/table/chart/tbl_chart.phtml:41
 #, fuzzy
 #| msgid "Time"
 msgctxt "Chart type"
 msgid "Timeline"
 msgstr "وقت"
 
-#: templates/tbl_chart.phtml:45
+#: templates/table/chart/tbl_chart.phtml:45
 msgctxt "Chart type"
 msgid "Scatter"
 msgstr ""
 
-#: templates/tbl_chart.phtml:50
+#: templates/table/chart/tbl_chart.phtml:50
 msgid "Stacked"
 msgstr ""
 
-#: templates/tbl_chart.phtml:53
+#: templates/table/chart/tbl_chart.phtml:53
 #, fuzzy
 #| msgid "Import files"
 msgid "Chart title"
 msgstr "استورد الملفات"
 
-#: templates/tbl_chart.phtml:57
+#: templates/table/chart/tbl_chart.phtml:57
 msgid "X-Axis:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:72
+#: templates/table/chart/tbl_chart.phtml:72
 msgid "Series:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:102
+#: templates/table/chart/tbl_chart.phtml:102
 msgid "X-Axis label:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:104
+#: templates/table/chart/tbl_chart.phtml:104
 #, fuzzy
 #| msgid "Value"
 msgid "X Values"
 msgstr "القيمة"
 
-#: templates/tbl_chart.phtml:107
+#: templates/table/chart/tbl_chart.phtml:107
 msgid "Y-Axis label:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:115
+#: templates/table/chart/tbl_chart.phtml:115
 msgid "Series names are in a column"
 msgstr ""
 
-#: templates/tbl_chart.phtml:118
+#: templates/table/chart/tbl_chart.phtml:118
 #, fuzzy
 #| msgid "Inside column:"
 msgid "Series column:"
 msgstr "داخل العمود:"
 
-#: templates/tbl_chart.phtml:130
+#: templates/table/chart/tbl_chart.phtml:130
 #, fuzzy
 #| msgid "Values for column %s"
 msgid "Value Column:"
 msgstr "القيم للعمود %s"
 
-#: templates/tbl_chart.phtml:150
+#: templates/table/chart/tbl_chart.phtml:150
 #, fuzzy
 #| msgid "Save as file"
 msgid "Save chart as image"
 msgstr "حفظ كملف"
 
-#: templates/tbl_relation/common_form.phtml:7
+#: templates/table/gis_visualization/gis_visualization.phtml:3
+msgid "Display GIS Visualization"
+msgstr ""
+
+#: templates/table/gis_visualization/gis_visualization.phtml:8
+#, fuzzy
+#| msgid "Add/Delete Field Columns"
+msgid "Label column"
+msgstr "إضافه/حذف عمود حقل"
+
+#: templates/table/gis_visualization/gis_visualization.phtml:11
+#, fuzzy
+#| msgid "- none -"
+msgid "-- None --"
+msgstr "- لا شيء -"
+
+#: templates/table/gis_visualization/gis_visualization.phtml:19
+#, fuzzy
+#| msgid "Total"
+msgid "Spatial column"
+msgstr "مجموع كلي"
+
+#: templates/table/index_form.phtml:16
+msgid "Index name:"
+msgstr "اسم الفهرس&nbsp;:"
+
+#: templates/table/index_form.phtml:19
+msgid ""
+"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
+msgstr ""
+"\"الأساسي\" <b>يجب</b> يجب أن يكون الاسم <b>وأيضاً فقط</b> المفتاح الأساسي!"
+
+#: templates/table/index_form.phtml:40
+#, fuzzy
+#| msgid "Index name:"
+msgid "Index choice:"
+msgstr "اسم الفهرس&nbsp;:"
+
+#: templates/table/index_form.phtml:57
+msgid "Key block size:"
+msgstr ""
+
+#: templates/table/index_form.phtml:74
+msgid "Index type:"
+msgstr "نوع الفهرس&nbsp;:"
+
+#: templates/table/index_form.phtml:86
+#, fuzzy
+#| msgid "User"
+msgid "Parser:"
+msgstr "المستخدم"
+
+#: templates/table/index_form.phtml:102
+#, fuzzy
+#| msgid "Comment"
+msgid "Comment:"
+msgstr "تعليق"
+
+#: templates/table/index_form.phtml:149 templates/table/index_form.phtml:190
+#, fuzzy
+#| msgid "Drag to reorder"
+msgid "Drag to reorder"
+msgstr "إسحب لإعادة الترتيب"
+
+#: templates/table/relation/common_form.phtml:7
 msgid "Internal relations"
 msgstr "العلاقات الداخلية"
 
-#: templates/tbl_relation/common_form.phtml:11
+#: templates/table/relation/common_form.phtml:11
 msgid "Internal relation"
 msgstr "العلاقات الداخلية"
 
-#: templates/tbl_relation/common_form.phtml:14
+#: templates/table/relation/common_form.phtml:14
 msgid ""
 "An internal relation is not necessary when a corresponding FOREIGN KEY "
 "relation exists."
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:37
+#: templates/table/relation/common_form.phtml:37
 #, fuzzy
 #| msgid "Foreign key constraint"
 msgid "Foreign key constraints"
 msgstr "قيود المفتاح الغريب"
 
-#: templates/tbl_relation/common_form.phtml:40
+#: templates/table/relation/common_form.phtml:40
 #, fuzzy
 #| msgid "Action"
 msgid "Actions"
 msgstr "العملية"
 
-#: templates/tbl_relation/common_form.phtml:41
+#: templates/table/relation/common_form.phtml:41
 #, fuzzy
 #| msgid "Constraints for table"
 msgid "Constraint properties"
 msgstr "القيود للجدول"
 
-#: templates/tbl_relation/common_form.phtml:44
+#: templates/table/relation/common_form.phtml:44
 msgid ""
 "Only columns with index will be displayed. You can define an index below."
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:49
+#: templates/table/relation/common_form.phtml:49
 msgid "Foreign key constraint"
 msgstr "قيود المفتاح الغريب"
 
-#: templates/tbl_relation/common_form.phtml:81
+#: templates/table/relation/common_form.phtml:81
 #, fuzzy
 #| msgid "Add constraints"
 msgid "+ Add constraint"
 msgstr "أضف قيود"
 
-#: templates/tbl_relation/common_form.phtml:91
+#: templates/table/relation/common_form.phtml:91
 #, fuzzy
 #| msgid "Choose column to display"
 msgid "Choose column to display:"
 msgstr "اختر الحقل لإظهاره"
 
-#: templates/tbl_relation/foreign_key_row.phtml:13
+#: templates/table/relation/foreign_key_row.phtml:13
 #, fuzzy, php-format
 #| msgid "Foreign key constraint"
 msgid "Foreign key constraint %s has been dropped"
 msgstr "قيود المفتاح الغريب"
 
-#: templates/tbl_relation/foreign_key_row.phtml:102
+#: templates/table/relation/foreign_key_row.phtml:102
 #, fuzzy
 #| msgid "Constraints for table"
 msgid "Constraint name"
 msgstr "القيود للجدول"
 
-#: templates/tbl_relation/foreign_key_row.phtml:157
+#: templates/table/relation/foreign_key_row.phtml:157
 #, fuzzy
 #| msgid "Add column"
 msgid "+ Add column"
 msgstr "إضافة عمود"
 
+#: templates/table/search/options.phtml:8
+msgid "Select columns (at least one):"
+msgstr "اختيار الأعمدة (واحد على الأقل):"
+
+#: templates/table/search/options.phtml:37
+msgid "Add search conditions (body of the \"where\" clause):"
+msgstr "أضف شروط البحث (الفقرة \"where\" ):"
+
+#: templates/table/search/options.phtml:45
+msgid "Number of rows per page"
+msgstr "رقم السجلات لكل صفحة"
+
+#: templates/table/search/options.phtml:56
+msgid "Display order:"
+msgstr "ترتيب العرض:"
+
+#: templates/table/search/options_zoom.phtml:6
+msgid "Use this column to label each point"
+msgstr ""
+
+#: templates/table/search/options_zoom.phtml:35
+msgid "Maximum rows to plot"
+msgstr "أقصى عدد الصفوف للرسم"
+
+#: templates/table/search/replace_preview.phtml:13
+msgid "Find and replace - preview"
+msgstr "بحث واستبدال - المعاينة"
+
+#: templates/table/search/replace_preview.phtml:18
+#, fuzzy
+#| msgid "Linestring"
+msgid "Original string"
+msgstr "منحنى"
+
+#: templates/table/search/replace_preview.phtml:19
+#, fuzzy
+#| msgid "Related Links"
+msgid "Replaced string"
+msgstr "روابط ذات صلة"
+
+#: templates/table/search/replace_preview.phtml:40
+#, fuzzy
+#| msgid "Replicated"
+msgid "Replace"
+msgstr "مستنسخة"
+
+#: templates/table/search/rows_zoom.phtml:16
+msgid "Additional search criteria"
+msgstr "معايير بحث إضافية"
+
+#: templates/table/search/search_and_replace.phtml:3
+#, fuzzy
+#| msgid "Replace NULL by"
+msgid "Replace with:"
+msgstr "استبدل NULL بـ"
+
+#: templates/table/search/search_and_replace.phtml:22
+#, fuzzy
+#| msgid "as regular expression"
+msgid "Use regular expression"
+msgstr "كتعبير قياسي"
+
+#: templates/table/search/selection_form.phtml:12
+#, fuzzy
+#| msgid "Do a \"query by example\" (wildcard: \"%\")"
+msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
+msgstr "عمل \"استعلام بواسطة المثال\" (بدل: \"%\")"
+
+#: templates/table/search/selection_form.phtml:34
+msgid "Do a \"query by example\" (wildcard: \"%\")"
+msgstr "عمل \"استعلام بواسطة المثال\" (بدل: \"%\")"
+
+#: templates/table/search/zoom_result_form.phtml:7
+msgid "Browse/Edit the points"
+msgstr "تصفح/حرّر النقاط"
+
+#: templates/table/search/zoom_result_form.phtml:15
+msgid "How to use"
+msgstr "كيفية الإستعمال"
+
+#: templates/table/search/zoom_result_form.phtml:23
+msgid "Reset zoom"
+msgstr "إعادة تعيين المقربة"
+
+#: templates/table/secondary_tabs.phtml:14
+#, fuzzy
+#| msgid "Relation view"
+msgid "Relation view"
+msgstr "عرض العلاقات"
+
+#: templates/table/structure/actions_in_table_structure.phtml:14
+#, php-format
+msgid "A primary key has been added on %s."
+msgstr "تم إضافة المفتاح الأساسي في %s."
+
+#: templates/table/structure/actions_in_table_structure.phtml:34
+#: templates/table/structure/actions_in_table_structure.phtml:54
+#: templates/table/structure/actions_in_table_structure.phtml:79
+#: templates/table/structure/actions_in_table_structure.phtml:101
+#, php-format
+msgid "An index has been added on %s."
+msgstr "تم إضافة الفهرس في %s."
+
+#: templates/table/structure/actions_in_table_structure.phtml:130
+#: templates/table/structure/check_all_table_column.phtml:59
+#, fuzzy
+#| msgid "Remove chart"
+msgid "Remove from central columns"
+msgstr "حذف الرسم البياني"
+
+#: templates/table/structure/actions_in_table_structure.phtml:138
+#: templates/table/structure/check_all_table_column.phtml:55
+#, fuzzy
+#| msgid "CHAR textarea columns"
+msgid "Add to central columns"
+msgstr "أعمدة مربع النص لـ CHAR"
+
+#: templates/table/structure/add_column.phtml:7
+#, fuzzy, php-format
+#| msgid "Add into comments"
+msgid "Add %s column(s)"
+msgstr "أضف إلى الملاحظات"
+
+#: templates/table/structure/add_column.phtml:12
+#, fuzzy
+#| msgid "At Beginning of Table"
+msgid "at beginning of table"
+msgstr "في بداية الجدول"
+
+#: templates/table/structure/display_structure.phtml:140 view_create.php:181
+#, fuzzy
+#| msgid "Print view"
+msgid "Edit view"
+msgstr "عرض نسخة للطباعة"
+
+#: templates/table/structure/display_table_stats.phtml:9
+msgid "Space usage"
+msgstr "المساحة المستخدمة"
+
+#: templates/table/structure/display_table_stats.phtml:32
+msgid "Effective"
+msgstr "فعال"
+
+#: templates/table/structure/move_columns_dialog.phtml:1
+#: templates/table/structure/optional_action_links.phtml:21
+#, fuzzy
+#| msgid "Add columns"
+msgid "Move columns"
+msgstr "إضافة أعمدة"
+
+#: templates/table/structure/move_columns_dialog.phtml:2
+msgid "Move the columns by dragging them up and down."
+msgstr ""
+
+#: templates/table/structure/optional_action_links.phtml:9
+msgid "Propose table structure"
+msgstr "اقترح بناء الجدول"
+
+#: templates/table/structure/optional_action_links.phtml:24
+#, fuzzy
+#| msgid "Propose table structure"
+msgid "Improve table structure"
+msgstr "اقترح بناء الجدول"
+
+#: templates/table/structure/optional_action_links.phtml:30
+msgid "Track view"
+msgstr "تتبع الجدول"
+
+#: templates/table/structure/row_stats_table.phtml:3
+#, fuzzy
+#| msgid "Row Statistics"
+msgid "Row statistics"
+msgstr "إحصائيات"
+
+#: templates/table/structure/row_stats_table.phtml:9
+msgid "static"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:11
+msgid "dynamic"
+msgstr "ديناميكي"
+
+#: templates/table/structure/row_stats_table.phtml:22
+msgid "partitioned"
+msgstr "مقسم"
+
+#: templates/table/structure/row_stats_table.phtml:54
+msgid "Row length"
+msgstr "طول الصف"
+
+#: templates/table/structure/row_stats_table.phtml:66
+msgid "Row size"
+msgstr "مقاس الصف"
+
+#: templates/table/structure/row_stats_table.phtml:73
+msgid "Next autoindex"
+msgstr ""
+
+#: templates/table/structure/table_structure_row.phtml:46
+#, php-format
+msgid "Column %s has been dropped."
+msgstr "تم حذف العمود %s."
+
 #: themes.php:17 themes.php:22
 msgid "Theme"
 msgstr "مظهر"
diff --git a/po/az.po b/po/az.po
index d55d0510d9..646d4947e7 100644
--- a/po/az.po
+++ b/po/az.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 4.5.0-dev\n"
 "Report-Msgid-Bugs-To: developers@phpmyadmin.net\n"
-"POT-Creation-Date: 2015-08-08 13:53-0400\n"
+"POT-Creation-Date: 2015-08-12 08:10-0400\n"
 "PO-Revision-Date: 2015-05-21 01:04+0200\n"
 "Last-Translator: Sevdimali İsa <sevdimaliisayev@mail.ru>\n"
 "Language-Team: Azerbaijani <https://hosted.weblate.org/projects/phpmyadmin/"
@@ -53,7 +53,7 @@ msgid "Table comments:"
 msgstr "Cədvəl şərhləri:"
 
 #: db_datadict.php:104 libraries/Index.class.php:699
-#: libraries/insert_edit.lib.php:1567
+#: libraries/insert_edit.lib.php:1565
 #: libraries/navigation/Nodes/Node_Column.class.php:30
 #: libraries/plugins/export/ExportHtmlword.class.php:280
 #: libraries/plugins/export/ExportHtmlword.class.php:375
@@ -67,13 +67,14 @@ msgstr "Cədvəl şərhləri:"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1023
 #: libraries/tracking.lib.php:879 libraries/tracking.lib.php:975
 #: templates/columns_definitions/column_name.phtml:18
-#: templates/index_form.phtml:124 templates/table/table_header.phtml:6
-#: templates/table/zoom_result_form.phtml:33
-#: templates/tbl_relation/common_form.phtml:10
-#: templates/tbl_relation/common_form.phtml:43
-#: templates/tbl_relation/foreign_key_row.phtml:194
-#: templates/tbl_relation/foreign_key_row.phtml:206
-#: templates/tbl_relation/internal_relational_row.phtml:71
+#: templates/table/index_form.phtml:124
+#: templates/table/relation/common_form.phtml:10
+#: templates/table/relation/common_form.phtml:43
+#: templates/table/relation/foreign_key_row.phtml:194
+#: templates/table/relation/foreign_key_row.phtml:206
+#: templates/table/relation/internal_relational_row.phtml:71
+#: templates/table/search/table_header.phtml:6
+#: templates/table/search/zoom_result_form.phtml:33
 msgid "Column"
 msgstr "Sütun"
 
@@ -91,21 +92,21 @@ msgstr "Sütun"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1001
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1024
 #: libraries/rte/rte_list.lib.php:75 libraries/rte/rte_list.lib.php:103
-#: libraries/rte/rte_routines.lib.php:802
-#: libraries/rte/rte_routines.lib.php:831
-#: libraries/rte/rte_routines.lib.php:1493
+#: libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_routines.lib.php:922
+#: libraries/rte/rte_routines.lib.php:1584
 #: libraries/server_privileges.lib.php:2369 libraries/tracking.lib.php:880
 #: libraries/tracking.lib.php:972
 #: templates/columns_definitions/table_fields_definitions.phtml:11
-#: templates/structure/table_header.phtml:48
-#: templates/structure/table_structure_header.phtml:6
-#: templates/table/table_header.phtml:7
+#: templates/database/structure/table_header.phtml:48
+#: templates/table/search/table_header.phtml:7
+#: templates/table/structure/table_structure_header.phtml:6
 msgid "Type"
 msgstr "Tip"
 
 #: db_datadict.php:106 libraries/Index.class.php:702
 #: libraries/central_columns.lib.php:708
-#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1576
+#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1574
 #: libraries/plugins/export/ExportHtmlword.class.php:286
 #: libraries/plugins/export/ExportHtmlword.class.php:381
 #: libraries/plugins/export/ExportLatex.class.php:509
@@ -118,8 +119,8 @@ msgstr "Tip"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1026
 #: libraries/tracking.lib.php:882 libraries/tracking.lib.php:978
 #: templates/columns_definitions/table_fields_definitions.phtml:39
-#: templates/structure/table_structure_header.phtml:9
-#: templates/table/zoom_result_form.phtml:34
+#: templates/table/search/zoom_result_form.phtml:34
+#: templates/table/structure/table_structure_header.phtml:9
 msgid "Null"
 msgstr "Null"
 
@@ -137,8 +138,8 @@ msgstr "Null"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1027
 #: libraries/replication_gui.lib.php:153 libraries/tracking.lib.php:883
 #: templates/columns_definitions/table_fields_definitions.phtml:25
-#: templates/structure/body_for_table_summary.phtml:55
-#: templates/structure/table_structure_header.phtml:10
+#: templates/database/structure/body_for_table_summary.phtml:55
+#: templates/table/structure/table_structure_header.phtml:10
 msgid "Default"
 msgstr "Susmaya görə"
 
@@ -166,19 +167,19 @@ msgid "Comments"
 msgstr "Şərhlər"
 
 #: db_datadict.php:146
-#: libraries/controllers/StructureController.class.php:1960
-#: libraries/controllers/StructureController.class.php:1965
+#: libraries/controllers/TableStructureController.class.php:951
+#: libraries/controllers/TableStructureController.class.php:956
 #: libraries/tracking.lib.php:922
 #: templates/columns_definitions/column_indexes.phtml:6
-#: templates/structure/check_all_table_column.phtml:22
-#: templates/structure/display_structure.phtml:74
+#: templates/table/structure/check_all_table_column.phtml:22
+#: templates/table/structure/display_structure.phtml:74
 msgid "Primary"
 msgstr "Birinci dərəcəli"
 
 #: db_datadict.php:156 js/messages.php:317 libraries/Index.class.php:567
 #: libraries/Index.class.php:606 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261 libraries/mult_submits.lib.php:403
+#: libraries/config/FormDisplay.tpl.php:272 libraries/mult_submits.lib.php:403
 #: libraries/mult_submits.lib.php:417
 #: libraries/plugins/export/ExportHtmlword.class.php:630
 #: libraries/plugins/export/ExportLatex.class.php:589
@@ -194,20 +195,20 @@ msgstr "Birinci dərəcəli"
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1010 libraries/tracking.lib.php:1015
 #: prefs_manage.php:140 templates/prefs_autoload.phtml:15
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "No"
 msgstr "Xeyr"
 
 #: db_datadict.php:156 js/messages.php:443 libraries/Index.class.php:568
 #: libraries/Index.class.php:605 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261
-#: libraries/controllers/StructureController.class.php:1344
-#: libraries/controllers/StructureController.class.php:2223
-#: libraries/controllers/StructureController.class.php:2232
-#: libraries/controllers/StructureController.class.php:2237
-#: libraries/controllers/StructureController.class.php:2242
-#: libraries/controllers/StructureController.class.php:2247
+#: libraries/config/FormDisplay.tpl.php:272
+#: libraries/controllers/TableStructureController.class.php:539
+#: libraries/controllers/TableStructureController.class.php:1201
+#: libraries/controllers/TableStructureController.class.php:1210
+#: libraries/controllers/TableStructureController.class.php:1215
+#: libraries/controllers/TableStructureController.class.php:1220
+#: libraries/controllers/TableStructureController.class.php:1225
 #: libraries/mult_submits.inc.php:82 libraries/mult_submits.inc.php:178
 #: libraries/mult_submits.lib.php:339 libraries/mult_submits.lib.php:372
 #: libraries/mult_submits.lib.php:401 libraries/mult_submits.lib.php:415
@@ -216,8 +217,8 @@ msgstr "Xeyr"
 #: libraries/plugins/export/ExportOdt.class.php:756
 #: libraries/plugins/export/ExportTexytext.class.php:567
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1077
-#: libraries/server_databases.lib.php:464
-#: libraries/server_databases.lib.php:474
+#: libraries/server_databases.lib.php:475
+#: libraries/server_databases.lib.php:485
 #: libraries/server_privileges.lib.php:2546
 #: libraries/server_privileges.lib.php:2727
 #: libraries/server_privileges.lib.php:2748
@@ -227,7 +228,7 @@ msgstr "Xeyr"
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1008 libraries/tracking.lib.php:1013
 #: prefs_manage.php:138 templates/prefs_autoload.phtml:14
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "Yes"
 msgstr "Bəli"
 
@@ -237,7 +238,7 @@ msgstr "Verilənlər bazasının sxemini göster"
 
 #: db_export.php:37 db_tracking.php:90 export.php:382
 #: libraries/DBQbe.class.php:326
-#: libraries/controllers/StructureController.class.php:231
+#: libraries/controllers/DatabaseStructureController.class.php:170
 #: libraries/navigation/NavigationTree.class.php:897
 msgid "No tables found in database."
 msgstr "Verilənlər bazasında cədvəl yoxdur."
@@ -248,14 +249,14 @@ msgstr "Verilənlər bazasında cədvəl yoxdur."
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:26
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:120
-#: templates/structure/show_create.phtml:18
+#: templates/database/structure/show_create.phtml:18
 msgid "Tables"
 msgstr "Cədvəllər"
 
 #: db_export.php:52 libraries/Menu.class.php:317 libraries/Menu.class.php:425
-#: libraries/Util.class.php:3333 libraries/Util.class.php:3343
-#: libraries/Util.class.php:3349 libraries/Util.class.php:3629
-#: libraries/Util.class.php:4327 libraries/Util.class.php:4344
+#: libraries/Util.class.php:3339 libraries/Util.class.php:3349
+#: libraries/Util.class.php:3355 libraries/Util.class.php:3635
+#: libraries/Util.class.php:4333 libraries/Util.class.php:4350
 #: libraries/central_columns.lib.php:728 libraries/config.values.php:39
 #: libraries/config.values.php:47 libraries/config.values.php:109
 #: libraries/config.values.php:115 libraries/config/setup.forms.php:323
@@ -269,7 +270,7 @@ msgstr "Cədvəllər"
 #: libraries/navigation/Nodes/Node_Table.class.php:283
 #: libraries/server_privileges.lib.php:1141 libraries/tracking.lib.php:874
 #: templates/columns_definitions/table_fields_definitions.phtml:3
-#: templates/designer/table_list.phtml:28
+#: templates/database/designer/table_list.phtml:28
 msgid "Structure"
 msgstr "Quruluş"
 
@@ -281,7 +282,7 @@ msgstr "Quruluş"
 #: libraries/config/user_preferences.forms.php:292
 #: libraries/config/user_preferences.forms.php:297
 #: libraries/server_privileges.lib.php:1140
-#: templates/structure/display_table_stats.phtml:12
+#: templates/table/structure/display_table_stats.phtml:12
 msgid "Data"
 msgstr "Məlumat"
 
@@ -356,10 +357,10 @@ msgstr "İzlənən cədvəllər"
 #: libraries/server_privileges.lib.php:2908
 #: libraries/server_privileges.lib.php:3145
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4346
-#: templates/structure/table_header.phtml:21
-#: templates/tbl_relation/foreign_key_row.phtml:176
-#: templates/tbl_relation/internal_relational_row.phtml:63
+#: libraries/server_privileges.lib.php:4372
+#: templates/database/structure/table_header.phtml:21
+#: templates/table/relation/foreign_key_row.phtml:176
+#: templates/table/relation/internal_relational_row.phtml:63
 msgid "Table"
 msgstr "Cədvəl"
 
@@ -376,7 +377,7 @@ msgid "Updated"
 msgstr "Yeniləndi"
 
 #: db_tracking.php:130 js/messages.php:243 libraries/Menu.class.php:552
-#: libraries/Util.class.php:4314 libraries/config.values.php:104
+#: libraries/Util.class.php:4320 libraries/config.values.php:104
 #: libraries/rte/rte_events.lib.php:393 libraries/rte/rte_list.lib.php:101
 #: libraries/server_status_processes.lib.php:92 libraries/tracking.lib.php:279
 msgid "Status"
@@ -385,14 +386,15 @@ msgstr "Status"
 #: db_tracking.php:131 db_tracking.php:290 libraries/Index.class.php:693
 #: libraries/central_columns.lib.php:687 libraries/rte/rte_list.lib.php:74
 #: libraries/rte/rte_list.lib.php:89 libraries/rte/rte_list.lib.php:102
-#: libraries/server_databases.lib.php:398
+#: libraries/server_databases.lib.php:409
 #: libraries/server_privileges.lib.php:2372
 #: libraries/server_privileges.lib.php:3166
 #: libraries/server_privileges.lib.php:3342
 #: libraries/server_user_groups.lib.php:82
 #: libraries/server_variables.lib.php:189 libraries/tracking.lib.php:280
-#: libraries/tracking.lib.php:793 templates/structure/table_header.phtml:30
-#: templates/structure/table_structure_header.phtml:23
+#: libraries/tracking.lib.php:793
+#: templates/database/structure/table_header.phtml:30
+#: templates/table/structure/table_structure_header.phtml:23
 msgid "Action"
 msgstr "Fəaliyyətlər"
 
@@ -434,7 +436,7 @@ msgid "Untracked tables"
 msgstr "İzlənilməyən cədvəllər"
 
 #: db_tracking.php:305 db_tracking.php:336
-#: templates/structure/optional_action_links.phtml:17
+#: templates/table/structure/optional_action_links.phtml:17
 msgid "Track table"
 msgstr "Cedvəli İzlə"
 
@@ -487,7 +489,7 @@ msgid "Value for the column \"%s\""
 msgstr "\"%s\" sütunu üçün verilən"
 
 #: gis_data_editor.php:146
-#: templates/gis_visualization/gis_visualization.phtml:37
+#: templates/table/gis_visualization/gis_visualization.phtml:37
 msgid "Use OpenStreetMaps as Base Layer"
 msgstr ""
 
@@ -567,35 +569,35 @@ msgstr "Həndəsə əlavə et"
 #: libraries/display_change_password.lib.php:162
 #: libraries/display_export.lib.php:402 libraries/display_export.lib.php:408
 #: libraries/display_import.lib.php:392 libraries/index.lib.php:44
-#: libraries/insert_edit.lib.php:1546 libraries/insert_edit.lib.php:1583
+#: libraries/insert_edit.lib.php:1544 libraries/insert_edit.lib.php:1581
 #: libraries/normalization.lib.php:165 libraries/normalization.lib.php:821
 #: libraries/operations.lib.php:38 libraries/operations.lib.php:108
 #: libraries/operations.lib.php:263 libraries/operations.lib.php:306
 #: libraries/operations.lib.php:801 libraries/operations.lib.php:874
 #: libraries/operations.lib.php:923 libraries/operations.lib.php:1337
 #: libraries/operations.lib.php:1658
-#: libraries/plugins/auth/AuthenticationCookie.class.php:244
+#: libraries/plugins/auth/AuthenticationCookie.class.php:232
 #: libraries/replication_gui.lib.php:122 libraries/replication_gui.lib.php:161
 #: libraries/replication_gui.lib.php:324 libraries/replication_gui.lib.php:461
 #: libraries/replication_gui.lib.php:906 libraries/rte/rte_events.lib.php:509
-#: libraries/rte/rte_routines.lib.php:969
-#: libraries/rte/rte_routines.lib.php:1581
+#: libraries/rte/rte_routines.lib.php:1060
+#: libraries/rte/rte_routines.lib.php:1672
 #: libraries/rte/rte_triggers.lib.php:396 libraries/server_bin_log.lib.php:61
 #: libraries/server_privileges.lib.php:705
 #: libraries/server_privileges.lib.php:2106
 #: libraries/server_privileges.lib.php:2872
 #: libraries/server_privileges.lib.php:3553
-#: libraries/server_privileges.lib.php:4627
+#: libraries/server_privileges.lib.php:4653
 #: libraries/server_user_groups.lib.php:285
 #: libraries/sql_query_form.lib.php:369 libraries/sql_query_form.lib.php:429
 #: libraries/tracking.lib.php:533 libraries/tracking.lib.php:653
 #: prefs_manage.php:277 prefs_manage.php:355
 #: templates/columns_definitions/column_definitions_form.phtml:59
-#: templates/header_location.phtml:17 templates/index_form.phtml:238
+#: templates/database/create_table.phtml:21 templates/header_location.phtml:28
 #: templates/startAndNumberOfRowsPanel.phtml:14
-#: templates/structure/add_column.phtml:25
-#: templates/table/create_table.phtml:21
-#: templates/table/selection_form.phtml:75 view_create.php:275
+#: templates/table/index_form.phtml:238
+#: templates/table/search/selection_form.phtml:75
+#: templates/table/structure/add_column.phtml:25 view_create.php:275
 #: view_operations.php:106
 msgid "Go"
 msgstr "Davam"
@@ -680,7 +682,7 @@ msgstr ""
 msgid "Could not load import plugins, please check your installation!"
 msgstr "İmport pluqini yüklənmədi, zəhmət olmasa quraşdırmanı yoxlayın!"
 
-#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1466
+#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1460
 #, php-format
 msgid "Bookmark %s has been created."
 msgstr "Əlfəcin %s yaradıldı."
@@ -719,11 +721,11 @@ msgstr ""
 msgid "Back"
 msgstr "Geri"
 
-#: index.php:148 libraries/Footer.class.php:70
+#: index.php:149 libraries/Footer.class.php:70
 msgid "phpMyAdmin Demo Server"
 msgstr "phpMyAdmin Demo Server"
 
-#: index.php:152
+#: index.php:153
 #, php-format
 msgid ""
 "You are using the demo server. You can do anything here, but please do not "
@@ -734,112 +736,112 @@ msgstr ""
 "ancaq zəhmət olmasa root, debian-sys-maint və pma users istifadəçilərini "
 "dəyişdirməyin. Daha ətraflı məlumat üçün: %s."
 
-#: index.php:162
+#: index.php:163
 msgid "General Settings"
 msgstr "Ümumi Tənzimləmələr"
 
-#: index.php:190 libraries/display_change_password.lib.php:50
+#: index.php:191 libraries/display_change_password.lib.php:50
 #: libraries/display_change_password.lib.php:53 user_password.php:247
 msgid "Change password"
 msgstr "Parolu Dəyişdir"
 
-#: index.php:206
+#: index.php:207
 msgid "Server connection collation"
 msgstr "Server qoşulma qarşılaşdırması"
 
-#: index.php:228
+#: index.php:229
 msgid "Appearance Settings"
 msgstr "Mövzu Tənzimləmələri"
 
-#: index.php:258 prefs_manage.php:285
+#: index.php:259 prefs_manage.php:285
 msgid "More settings"
 msgstr "Daha çox tənzimləmələr"
 
-#: index.php:279
+#: index.php:280
 msgid "Database server"
 msgstr "Verilənlər Bazası Serveri"
 
-#: index.php:282 libraries/plugins/auth/AuthenticationCookie.class.php:181
+#: index.php:283 libraries/plugins/auth/AuthenticationCookie.class.php:169
 msgid "Server:"
 msgstr "Server:"
 
-#: index.php:286
+#: index.php:287
 msgid "Server type:"
 msgstr "Server tipi:"
 
-#: index.php:290 libraries/plugins/export/ExportLatex.class.php:212
+#: index.php:291 libraries/plugins/export/ExportLatex.class.php:212
 #: libraries/plugins/export/ExportSql.class.php:687
 #: libraries/plugins/export/ExportXml.class.php:189
 msgid "Server version:"
 msgstr "Server versiyası:"
 
-#: index.php:296
+#: index.php:297
 msgid "Protocol version:"
 msgstr "Protokol versiyası:"
 
-#: index.php:300
+#: index.php:301
 msgid "User:"
 msgstr "İstifadəçi:"
 
-#: index.php:305
+#: index.php:306
 msgid "Server charset:"
 msgstr "Server kodlaşdırılması:"
 
-#: index.php:320
+#: index.php:321
 msgid "Web server"
 msgstr "Web server"
 
-#: index.php:331
+#: index.php:332
 msgid "Database client version:"
 msgstr "Verilənlər Bazası kliyent versiyası:"
 
-#: index.php:335
+#: index.php:336
 msgid "PHP extension:"
 msgstr "PHP genişlənməsi:"
 
-#: index.php:349
+#: index.php:350
 #, fuzzy
 #| msgid "PHP Version:"
 msgid "PHP version:"
 msgstr "PHP Versiyası:"
 
-#: index.php:360
+#: index.php:361
 msgid "Show PHP information"
 msgstr "PHPInfo() me'lumatını göster"
 
-#: index.php:383
+#: index.php:384
 msgid "Version information:"
 msgstr "Versiya informasiyası:"
 
-#: index.php:392 libraries/Util.class.php:432 libraries/Util.class.php:495
-#: libraries/config/FormDisplay.tpl.php:151
+#: index.php:393 libraries/Util.class.php:432 libraries/Util.class.php:495
+#: libraries/config/FormDisplay.tpl.php:162
 #: libraries/display_export.lib.php:577 libraries/engines/pbxt.lib.php:162
 #: libraries/navigation/NavigationHeader.class.php:196
 #: libraries/server_variables.lib.php:160
 msgid "Documentation"
 msgstr "Dokumentasiya"
 
-#: index.php:399
+#: index.php:400
 msgid "Wiki"
 msgstr "Wiki"
 
-#: index.php:408
+#: index.php:409
 msgid "Official Homepage"
 msgstr "phpMyAdmin Rəsmi İnternet Səhifəsi"
 
-#: index.php:415
+#: index.php:416
 msgid "Contribute"
 msgstr "Kömək etmək"
 
-#: index.php:422
+#: index.php:423
 msgid "Get support"
 msgstr "Dəstək almaq"
 
-#: index.php:429
+#: index.php:430
 msgid "List of changes"
 msgstr "Dəyişikliklərin siyahısı"
 
-#: index.php:451
+#: index.php:452
 #, fuzzy
 #| msgid ""
 #| "Your configuration file contains settings (root with no password) that "
@@ -856,7 +858,7 @@ msgstr ""
 "istifadəçisi) mövcuddur ki, bu da təhlükəsizlik nöqteyi nəzərindən etibarlı "
 "deyildir."
 
-#: index.php:468
+#: index.php:469
 msgid ""
 "You have enabled mbstring.func_overload in your PHP configuration. This "
 "option is incompatible with phpMyAdmin and might cause some data to be "
@@ -865,14 +867,14 @@ msgstr ""
 "mbstring.func_overload PHP konfiqurasiyanızda aktivləşdirilib. Bu seçim "
 "phpMyAdmin ilə uyğunlaşmır və bəzi verilənlərin korlanmasına səbəb ola bilər!"
 
-#: index.php:483
+#: index.php:484
 msgid ""
 "The mbstring PHP extension was not found and you seem to be using a "
 "multibyte charset. Without the mbstring extension phpMyAdmin is unable to "
 "split strings correctly and it may result in unexpected results."
 msgstr ""
 
-#: index.php:500
+#: index.php:501
 msgid ""
 "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini."
 "session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower than "
@@ -880,19 +882,19 @@ msgid ""
 "expire sooner than configured in phpMyAdmin."
 msgstr ""
 
-#: index.php:519
+#: index.php:520
 msgid ""
 "Login cookie store is lower than cookie validity configured in phpMyAdmin, "
 "because of this, your login will expire sooner than configured in phpMyAdmin."
 msgstr ""
 
-#: index.php:535
+#: index.php:536
 msgid "The configuration file now needs a secret passphrase (blowfish_secret)."
 msgstr ""
 "Konfiqurasiya faylı üçün gizli parol ifadəsinə ehtiyac "
 "vardır(blowfish_secret)."
 
-#: index.php:548
+#: index.php:549
 msgid ""
 "Directory [code]config[/code], which is used by the setup script, still "
 "exists in your phpMyAdmin directory. It is strongly recommended to remove it "
@@ -900,7 +902,7 @@ msgid ""
 "may be compromised by unauthorized people downloading your configuration."
 msgstr ""
 
-#: index.php:564
+#: index.php:565
 #, php-format
 msgid ""
 "The phpMyAdmin configuration storage is not completely configured, some "
@@ -910,12 +912,12 @@ msgstr ""
 "genişləndirilimiş xüsusiyyətlər deaktiv edildi. Səbəbini öyrənmək üçün "
 "%sburaya%s klikləyin. "
 
-#: index.php:571
+#: index.php:572
 msgid ""
 "Or alternately go to 'Operations' tab of any database to set it up there."
 msgstr ""
 
-#: index.php:620
+#: index.php:621
 #, php-format
 msgid ""
 "Your PHP MySQL library version %s differs from your MySQL server version %s. "
@@ -924,7 +926,7 @@ msgstr ""
 "PHP MySQL kitabxananızın %s versiyası,MySQL serverinizin %s versiyasından "
 "fərqlidir. Bu gözlənilməz davranışa səbəb ola bilər."
 
-#: index.php:648
+#: index.php:649
 #, php-format
 msgid ""
 "Server running with Suhosin. Please refer to %sdocumentation%s for possible "
@@ -1077,8 +1079,8 @@ msgstr ""
 msgid "Save & Close"
 msgstr "Yaddaşa ver və Bağla"
 
-#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:404
-#: libraries/insert_edit.lib.php:1550 prefs_manage.php:361
+#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:415
+#: libraries/insert_edit.lib.php:1548 prefs_manage.php:361
 #: prefs_manage.php:372
 msgid "Reset"
 msgstr "Sıfırla"
@@ -1111,7 +1113,7 @@ msgstr "İndeks əlavə et"
 msgid "Edit Index"
 msgstr "İndeksi redaktə et"
 
-#: js/messages.php:99 templates/index_form.phtml:232
+#: js/messages.php:99 templates/table/index_form.phtml:232
 #, php-format
 msgid "Add %s column(s) to index"
 msgstr "İndeksə %s sütun əlavə et"
@@ -1134,13 +1136,14 @@ msgstr "Saheler ehate edildiyi işare"
 msgid "Please select column(s) for the index."
 msgstr "İndeksə əlavə olunması üçün sütunları seçin."
 
-#: js/messages.php:106 templates/structure/add_column.phtml:1
+#: js/messages.php:106 templates/table/structure/add_column.phtml:1
 msgid "You have to add at least one column."
 msgstr "Ən az bir sütun əlavə etməlisiniz."
 
-#: js/messages.php:109 libraries/insert_edit.lib.php:1548
+#: js/messages.php:109 libraries/insert_edit.lib.php:1546
 #: templates/columns_definitions/column_definitions_form.phtml:162
-#: templates/index_form.phtml:237 templates/tbl_relation/common_form.phtml:106
+#: templates/table/index_form.phtml:237
+#: templates/table/relation/common_form.phtml:106
 msgid "Preview SQL"
 msgstr "SQL önizləmə"
 
@@ -1157,7 +1160,7 @@ msgid "SQL query:"
 msgstr "SQL sorğusu:"
 
 #. l10n: Default label for the y-Axis of Charts
-#: js/messages.php:118 templates/tbl_chart.phtml:109
+#: js/messages.php:118 templates/table/chart/tbl_chart.phtml:109
 msgid "Y Values"
 msgstr "Y Qiyməti"
 
@@ -1314,7 +1317,7 @@ msgstr "Göndərilmiş bayt"
 msgid "Bytes received"
 msgstr "Alınan bayt"
 
-#: js/messages.php:169 libraries/server_status.lib.php:226
+#: js/messages.php:169 libraries/server_status.lib.php:235
 msgid "Connections"
 msgstr "Əlaqələr"
 
@@ -1371,12 +1374,12 @@ msgstr "%d cədvəl"
 msgid "Questions"
 msgstr "Suallar"
 
-#: js/messages.php:184 libraries/server_status.lib.php:134
+#: js/messages.php:184 libraries/server_status.lib.php:143
 msgid "Traffic"
 msgstr "Trafik"
 
 #: js/messages.php:185 libraries/Menu.class.php:586
-#: libraries/Util.class.php:4318 libraries/server_status_monitor.lib.php:257
+#: libraries/Util.class.php:4324 libraries/server_status_monitor.lib.php:257
 msgid "Settings"
 msgstr "Tənzimləmələr"
 
@@ -1396,8 +1399,9 @@ msgstr "Zəhmət olmasa massivə ən azı bir dəyişən əlavə edin!"
 #: libraries/server_status_monitor.lib.php:236
 #: libraries/server_status_processes.lib.php:308
 #: templates/columns_definitions/transformation.phtml:4
-#: templates/designer/options_panel.phtml:178
-#: templates/table/options_zoom.phtml:12 templates/table/rows_zoom.phtml:26
+#: templates/database/designer/options_panel.phtml:178
+#: templates/table/search/options_zoom.phtml:12
+#: templates/table/search/rows_zoom.phtml:26
 msgid "None"
 msgstr "Heç biri"
 
@@ -1669,8 +1673,8 @@ msgstr ""
 
 #: js/messages.php:270 libraries/Menu.class.php:352
 #: libraries/Menu.class.php:455 libraries/Menu.class.php:582
-#: libraries/Util.class.php:4317 libraries/Util.class.php:4332
-#: libraries/Util.class.php:4349 libraries/config/messages.inc.php:258
+#: libraries/Util.class.php:4323 libraries/Util.class.php:4338
+#: libraries/Util.class.php:4355 libraries/config/messages.inc.php:258
 #: libraries/display_import.lib.php:105
 #: libraries/server_status_monitor.lib.php:318 prefs_manage.php:238
 #: setup/frames/menu.inc.php:26
@@ -1730,13 +1734,13 @@ msgid "Formatting SQL..."
 msgstr ""
 
 #: js/messages.php:293 libraries/server_variables.lib.php:157
-#: templates/designer/aggregate_query_panel.phtml:63
-#: templates/designer/delete_relation_panel.phtml:28
-#: templates/designer/having_query_panel.phtml:117
-#: templates/designer/new_relation_panel.phtml:88
-#: templates/designer/options_panel.phtml:253
-#: templates/designer/rename_to_panel.phtml:45
-#: templates/designer/where_query_panel.phtml:83
+#: templates/database/designer/aggregate_query_panel.phtml:63
+#: templates/database/designer/delete_relation_panel.phtml:28
+#: templates/database/designer/having_query_panel.phtml:117
+#: templates/database/designer/new_relation_panel.phtml:88
+#: templates/database/designer/options_panel.phtml:253
+#: templates/database/designer/rename_to_panel.phtml:45
+#: templates/database/designer/where_query_panel.phtml:83
 msgid "Cancel"
 msgstr "Ləğv et"
 
@@ -1746,7 +1750,7 @@ msgstr "Ləğv et"
 msgid "Page-related settings"
 msgstr "Dəyişdirmə tənzimləmələri"
 
-#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:402
+#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:413
 msgid "Apply"
 msgstr "Təsdiqlə"
 
@@ -1783,8 +1787,8 @@ msgstr "Xəta Kodu: %s"
 msgid "Error text: %s"
 msgstr "Xəta mətni: %s"
 
-#: js/messages.php:307 libraries/db_common.inc.php:68
-#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:450
+#: js/messages.php:307 libraries/db_common.inc.php:69
+#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:461
 msgid "No databases selected."
 msgstr "Heç bir baza seçilmemişdir."
 
@@ -1796,12 +1800,13 @@ msgstr ""
 msgid "Adding Primary Key"
 msgstr "İlkin açar əlavə olunur"
 
-#: js/messages.php:310 templates/designer/aggregate_query_panel.phtml:59
-#: templates/designer/having_query_panel.phtml:113
-#: templates/designer/new_relation_panel.phtml:87
-#: templates/designer/options_panel.phtml:252
-#: templates/designer/rename_to_panel.phtml:41
-#: templates/designer/where_query_panel.phtml:82
+#: js/messages.php:310
+#: templates/database/designer/aggregate_query_panel.phtml:59
+#: templates/database/designer/having_query_panel.phtml:113
+#: templates/database/designer/new_relation_panel.phtml:87
+#: templates/database/designer/options_panel.phtml:252
+#: templates/database/designer/rename_to_panel.phtml:41
+#: templates/database/designer/where_query_panel.phtml:82
 msgid "OK"
 msgstr "Tamam"
 
@@ -1821,7 +1826,7 @@ msgstr "Verilənlər Bazası kopyalanır"
 msgid "Changing Charset"
 msgstr "Kodlaşdırma dəyişdirilir"
 
-#: js/messages.php:320 libraries/Util.class.php:3217
+#: js/messages.php:320 libraries/Util.class.php:3223
 msgid "Enable foreign key checks"
 msgstr ""
 
@@ -1856,20 +1861,21 @@ msgstr ""
 #: js/messages.php:334 libraries/DisplayResults.class.php:4834
 #: libraries/DisplayResults.class.php:5092 libraries/Menu.class.php:344
 #: libraries/Menu.class.php:446 libraries/Menu.class.php:578
-#: libraries/Util.class.php:3636 libraries/Util.class.php:3637
-#: libraries/Util.class.php:4316 libraries/Util.class.php:4331
-#: libraries/Util.class.php:4348 libraries/config/messages.inc.php:252
+#: libraries/Util.class.php:3642 libraries/Util.class.php:3643
+#: libraries/Util.class.php:4322 libraries/Util.class.php:4337
+#: libraries/Util.class.php:4354 libraries/config/messages.inc.php:252
 #: libraries/display_export.lib.php:173 libraries/rte/rte_list.lib.php:146
 #: libraries/server_privileges.lib.php:2211
 #: libraries/server_privileges.lib.php:2290
 #: libraries/server_privileges.lib.php:2632
 #: libraries/server_privileges.lib.php:3356
 #: libraries/server_status_monitor.lib.php:322 prefs_manage.php:303
-#: setup/frames/menu.inc.php:27 templates/structure/check_all_tables.phtml:11
+#: setup/frames/menu.inc.php:27
+#: templates/database/structure/check_all_tables.phtml:11
 msgid "Export"
 msgstr "Eksport"
 
-#: js/messages.php:337 libraries/rte/rte_routines.lib.php:652
+#: js/messages.php:337 libraries/rte/rte_routines.lib.php:743
 msgid "ENUM/SET editor"
 msgstr "ENUM/SET redaktoru"
 
@@ -1910,7 +1916,7 @@ msgstr "Sorğu qutusunu göstər"
 #: libraries/Console.class.php:214 libraries/DisplayResults.class.php:3474
 #: libraries/DisplayResults.class.php:4818 libraries/Index.class.php:723
 #: libraries/Util.class.php:706 libraries/Util.class.php:1202
-#: libraries/Util.class.php:3634 libraries/Util.class.php:3635
+#: libraries/Util.class.php:3640 libraries/Util.class.php:3641
 #: libraries/central_columns.lib.php:851
 #: libraries/central_columns.lib.php:1193
 #: libraries/config/messages.inc.php:892
@@ -1928,7 +1934,7 @@ msgstr "Redaktə et"
 #: libraries/server_user_groups.lib.php:129
 #: libraries/sql_query_form.lib.php:416 libraries/tracking.lib.php:477
 #: setup/frames/index.inc.php:183 setup/frames/index.inc.php:291
-#: templates/designer/delete_relation_panel.phtml:27
+#: templates/database/designer/delete_relation_panel.phtml:27
 msgid "Delete"
 msgstr "Sil"
 
@@ -2097,11 +2103,11 @@ msgid "No dependencies selected!"
 msgstr "Heç bir baza seçilmemişdir."
 
 #: js/messages.php:394 libraries/central_columns.lib.php:1214
-#: libraries/insert_edit.lib.php:1458 libraries/server_variables.lib.php:155
+#: libraries/insert_edit.lib.php:1456 libraries/server_variables.lib.php:155
 #: setup/frames/config.inc.php:42 setup/frames/index.inc.php:279
 #: templates/columns_definitions/column_definitions_form.phtml:165
-#: templates/gis_visualization/gis_visualization.phtml:48
-#: templates/tbl_relation/common_form.phtml:107
+#: templates/table/gis_visualization/gis_visualization.phtml:48
+#: templates/table/relation/common_form.phtml:107
 msgid "Save"
 msgstr "Yaddaşa ver"
 
@@ -2179,8 +2185,8 @@ msgid "Data point content"
 msgstr "Verilən nöqtə məzmunu"
 
 #: js/messages.php:430 js/messages.php:562 js/messages.php:579
-#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2573
-#: templates/index_form.phtml:154 templates/index_form.phtml:194
+#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2571
+#: templates/table/index_form.phtml:154 templates/table/index_form.phtml:194
 msgid "Ignore"
 msgstr "Diqqətə Alma"
 
@@ -2239,8 +2245,8 @@ msgstr ""
 msgid "Please select the primary key or a unique key!"
 msgstr "Zəhmət olmasa birinci dərəcəli və ya unikal açar seçin!"
 
-#: js/messages.php:457 templates/designer/side_menu.phtml:91
-#: templates/designer/side_menu.phtml:94
+#: js/messages.php:457 templates/database/designer/side_menu.phtml:91
+#: templates/database/designer/side_menu.phtml:94
 msgid "Choose column to display"
 msgstr "Göstərmək üçün sütun seçin"
 
@@ -2254,20 +2260,20 @@ msgstr ""
 msgid "Page name"
 msgstr "Səhifə adı"
 
-#: js/messages.php:463 templates/designer/side_menu.phtml:56
-#: templates/designer/side_menu.phtml:59
+#: js/messages.php:463 templates/database/designer/side_menu.phtml:56
+#: templates/database/designer/side_menu.phtml:59
 msgid "Save page"
 msgstr "Səhifəni yaddaşa ver"
 
-#: js/messages.php:464 templates/designer/side_menu.phtml:63
-#: templates/designer/side_menu.phtml:66
+#: js/messages.php:464 templates/database/designer/side_menu.phtml:63
+#: templates/database/designer/side_menu.phtml:66
 #, fuzzy
 #| msgid "Save page"
 msgid "Save page as"
 msgstr "Səhifəni yaddaşa ver"
 
-#: js/messages.php:465 templates/designer/side_menu.phtml:49
-#: templates/designer/side_menu.phtml:52
+#: js/messages.php:465 templates/database/designer/side_menu.phtml:49
+#: templates/database/designer/side_menu.phtml:52
 msgid "Open page"
 msgstr "Səhifəni aç"
 
@@ -2275,7 +2281,7 @@ msgstr "Səhifəni aç"
 msgid "Delete page"
 msgstr "Səhifəni sil"
 
-#: js/messages.php:467 templates/designer/side_menu.phtml:10
+#: js/messages.php:467 templates/database/designer/side_menu.phtml:10
 msgid "Untitled"
 msgstr "Başlıqsız"
 
@@ -2392,7 +2398,7 @@ msgstr "Orjinal sətir"
 msgid "cancel"
 msgstr "ləğv et"
 
-#: js/messages.php:499 libraries/server_status.lib.php:271
+#: js/messages.php:499 libraries/server_status.lib.php:280
 msgid "Aborted"
 msgstr "Dayandırılmış Əlaqələr"
 
@@ -2986,7 +2992,7 @@ msgstr "Zəhmət olmasa keçərli bir nömrə daxil edin!"
 
 #: js/messages.php:793 libraries/Message.class.php:199
 #: libraries/Util.class.php:654 libraries/core.lib.php:245
-#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1172
+#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1170
 #: tbl_operations.php:229 view_operations.php:63
 msgid "Error"
 msgstr "Xəta"
@@ -3047,8 +3053,8 @@ msgstr "saniyədə"
 msgid "per minute"
 msgstr "dəqiqədə"
 
-#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:143
-#: libraries/server_status.lib.php:228
+#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:152
+#: libraries/server_status.lib.php:237
 #: libraries/server_status_queries.lib.php:98
 msgid "per hour"
 msgstr "saatda"
@@ -3067,7 +3073,7 @@ msgid "Wrong permissions on configuration file, should not be world writable!"
 msgstr ""
 "Konfiqurasiya faylında yanlış icazələr, hərkəsə yazılabilən olmamalıdır!"
 
-#: libraries/Config.class.php:1799
+#: libraries/Config.class.php:1801
 msgid "Font size"
 msgstr "Şrift ölçüsü"
 
@@ -3095,10 +3101,10 @@ msgstr "Sorğunu təkrarla"
 #: libraries/server_privileges.lib.php:2890
 #: libraries/server_privileges.lib.php:3144
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4332
+#: libraries/server_privileges.lib.php:4358
 #: libraries/server_status_processes.lib.php:80
-#: templates/tbl_relation/foreign_key_row.phtml:165
-#: templates/tbl_relation/internal_relational_row.phtml:55
+#: templates/table/relation/foreign_key_row.phtml:165
+#: templates/table/relation/internal_relational_row.phtml:55
 msgid "Database"
 msgstr "Verilənlər Bazası"
 
@@ -3191,11 +3197,11 @@ msgstr "Tarixçə"
 #: libraries/plugins/import/ImportMediawiki.class.php:60
 #: libraries/plugins/import/ImportOds.class.php:59
 #: libraries/plugins/import/ImportShp.class.php:57
-#: libraries/plugins/import/ImportSql.class.php:148
+#: libraries/plugins/import/ImportSql.class.php:51
 #: libraries/plugins/import/ImportXml.class.php:58
-#: libraries/rte/rte_routines.lib.php:833 templates/index_form.phtml:49
-#: templates/structure/row_stats_table.phtml:20
-#: templates/table/options.phtml:2
+#: libraries/rte/rte_routines.lib.php:924 templates/table/index_form.phtml:49
+#: templates/table/search/options.phtml:2
+#: templates/table/structure/row_stats_table.phtml:20
 msgid "Options"
 msgstr "Seçimlər"
 
@@ -3234,7 +3240,8 @@ msgstr "Azalan sırada"
 msgid "Order:"
 msgstr "Sıra"
 
-#: libraries/Console.class.php:289 templates/table/replace_preview.phtml:17
+#: libraries/Console.class.php:289
+#: templates/table/search/replace_preview.phtml:17
 msgid "Count"
 msgstr "Sayı"
 
@@ -3345,9 +3352,9 @@ msgstr "Qaranlıq temaya keç"
 #: libraries/operations.lib.php:794 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:191
-#: templates/structure/sortable_header.phtml:21
-#: templates/structure/sortable_header.phtml:38
-#: templates/table/options.phtml:68
+#: templates/database/structure/sortable_header.phtml:21
+#: templates/database/structure/sortable_header.phtml:38
+#: templates/table/search/options.phtml:68
 msgid "Ascending"
 msgstr "Artan sırada"
 
@@ -3357,13 +3364,14 @@ msgstr "Artan sırada"
 #: libraries/operations.lib.php:797 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:188
-#: templates/structure/sortable_header.phtml:26
-#: templates/structure/sortable_header.phtml:43
-#: templates/table/options.phtml:69
+#: templates/database/structure/sortable_header.phtml:26
+#: templates/database/structure/sortable_header.phtml:43
+#: templates/table/search/options.phtml:69
 msgid "Descending"
 msgstr "Azalan sırada"
 
-#: libraries/DBQbe.class.php:467 templates/table/search_and_replace.phtml:6
+#: libraries/DBQbe.class.php:467
+#: templates/table/search/search_and_replace.phtml:6
 msgid "Column:"
 msgstr "Sütun:"
 
@@ -3524,12 +3532,12 @@ msgstr[0] "<strong>%2$s</strong> cədvəlində %1$s uyğunluq"
 msgstr[1] "<strong>%2$s</strong> cədvəlində %1$s uyğunluq"
 
 #: libraries/DbSearch.class.php:354 libraries/Menu.class.php:311
-#: libraries/Util.class.php:3337 libraries/Util.class.php:3347
-#: libraries/Util.class.php:3623 libraries/Util.class.php:3624
-#: libraries/Util.class.php:4343 libraries/config.values.php:43
+#: libraries/Util.class.php:3343 libraries/Util.class.php:3353
+#: libraries/Util.class.php:3629 libraries/Util.class.php:3630
+#: libraries/Util.class.php:4349 libraries/config.values.php:43
 #: libraries/config.values.php:51 libraries/config.values.php:119
 #: libraries/navigation/Nodes/Node_Table.class.php:295
-#: templates/structure/check_all_table_column.phtml:5
+#: templates/table/structure/check_all_table_column.phtml:5
 msgid "Browse"
 msgstr "Göz at"
 
@@ -3546,7 +3554,8 @@ msgstr "Verilənlər Bazasında axtar"
 msgid "Words or values to search for (wildcard: \"%\"):"
 msgstr "Axtarmaq üçün söz(lər) və ya verilən(lər) (wildcard: \"%\"):"
 
-#: libraries/DbSearch.class.php:401 templates/table/search_and_replace.phtml:1
+#: libraries/DbSearch.class.php:401
+#: templates/table/search/search_and_replace.phtml:1
 msgid "Find:"
 msgstr "Tap:"
 
@@ -3590,28 +3599,28 @@ msgstr "Sətirləri filtrlə"
 msgid "Search this table"
 msgstr "Bu cədvəldə axtar"
 
-#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2532
-#: libraries/Util.class.php:2535
+#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2538
+#: libraries/Util.class.php:2541
 msgctxt "First page"
 msgid "Begin"
 msgstr "Başlanğıc"
 
-#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2533
-#: libraries/Util.class.php:2536 libraries/server_bin_log.lib.php:170
+#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2539
+#: libraries/Util.class.php:2542 libraries/server_bin_log.lib.php:170
 #: libraries/server_bin_log.lib.php:172
 msgctxt "Previous page"
 msgid "Previous"
 msgstr "Əvvəlki"
 
-#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2564
-#: libraries/Util.class.php:2574 libraries/server_bin_log.lib.php:204
+#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2570
+#: libraries/Util.class.php:2580 libraries/server_bin_log.lib.php:204
 #: libraries/server_bin_log.lib.php:206
 msgctxt "Next page"
 msgid "Next"
 msgstr "Sonrakı"
 
-#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2565
-#: libraries/Util.class.php:2575
+#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2571
+#: libraries/Util.class.php:2581
 msgctxt "Last page"
 msgid "End"
 msgstr "Son"
@@ -3686,15 +3695,15 @@ msgid "May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]."
 msgstr ""
 
 #: libraries/DisplayResults.class.php:4332 libraries/Message.class.php:180
-#: libraries/controllers/TableRelationController.class.php:258
+#: libraries/controllers/TableRelationController.class.php:259
 #: libraries/controllers/TableSearchController.class.php:655
-#: libraries/rte/rte_routines.lib.php:1332 libraries/sql_query_form.lib.php:89
+#: libraries/rte/rte_routines.lib.php:1423 libraries/sql_query_form.lib.php:89
 #: tbl_operations.php:227 tbl_row_action.php:138 view_operations.php:62
 msgid "Your SQL query has been executed successfully."
 msgstr "SQL sorğunuz müvəffəqiyyətlə icra edilmişdir."
 
 #: libraries/DisplayResults.class.php:4660
-#: libraries/controllers/StructureController.class.php:629
+#: libraries/controllers/DatabaseStructureController.class.php:564
 #, php-format
 msgid ""
 "This view has at least this number of rows. Please refer to %sdocumentation"
@@ -3718,33 +3727,33 @@ msgstr "%1$d toplam, %2$d sorğuda"
 msgid "%d total"
 msgstr "cəmi %d"
 
-#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1318
+#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1312
 #, php-format
 msgid "Query took %01.4f seconds."
 msgstr "sorğu %01.4f saniyədə icra edildi."
 
 #: libraries/DisplayResults.class.php:4807
-#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4767
-#: libraries/Util.class.php:4773 libraries/mult_submits.inc.php:50
-#: templates/structure/check_all_tables.phtml:2
-#: templates/structure/check_all_tables.phtml:9
+#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4773
+#: libraries/Util.class.php:4779 libraries/mult_submits.inc.php:50
+#: templates/database/structure/check_all_tables.phtml:2
+#: templates/database/structure/check_all_tables.phtml:9
 msgid "With selected:"
 msgstr "Seçilənləri:"
 
 #: libraries/DisplayResults.class.php:4811
-#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4769
-#: libraries/Util.class.php:4770 libraries/server_privileges.lib.php:1174
+#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4775
+#: libraries/Util.class.php:4776 libraries/server_privileges.lib.php:1174
 #: libraries/server_privileges.lib.php:1175
 #: libraries/server_privileges.lib.php:1387
 #: libraries/server_user_groups.lib.php:231
-#: templates/structure/check_all_tables.phtml:3
-#: templates/structure/check_all_tables.phtml:4
+#: templates/database/structure/check_all_tables.phtml:3
+#: templates/database/structure/check_all_tables.phtml:4
 msgid "Check All"
 msgstr "Hamısını Seç"
 
 #: libraries/DisplayResults.class.php:4985 libraries/Header.class.php:383
-#: templates/structure/optional_action_links.phtml:1
-#: templates/structure/print_view_data_dictionary_link.phtml:3
+#: templates/database/structure/print_view_data_dictionary_link.phtml:3
+#: templates/table/structure/optional_action_links.phtml:1
 msgid "Print view"
 msgstr "Çap görüntüsü"
 
@@ -3752,7 +3761,8 @@ msgstr "Çap görüntüsü"
 msgid "Query results operations"
 msgstr ""
 
-#: libraries/DisplayResults.class.php:5105 templates/tbl_chart.phtml:12
+#: libraries/DisplayResults.class.php:5105
+#: templates/table/chart/tbl_chart.phtml:12
 msgid "Display chart"
 msgstr "Diaqram göstər"
 
@@ -3843,7 +3853,7 @@ msgid "Click on the bar to scroll to top of page"
 msgstr ""
 
 #: libraries/Header.class.php:749
-#: libraries/plugins/auth/AuthenticationCookie.class.php:152
+#: libraries/plugins/auth/AuthenticationCookie.class.php:140
 msgid "Javascript must be enabled past this point!"
 msgstr "Bu hissəni keçmək üçün Javascript aktiv olmalıdır!"
 
@@ -3865,11 +3875,11 @@ msgid "Keyname"
 msgstr "Açar söz"
 
 #: libraries/Index.class.php:697
-#: libraries/controllers/StructureController.class.php:1962
-#: libraries/controllers/StructureController.class.php:1967
+#: libraries/controllers/TableStructureController.class.php:953
+#: libraries/controllers/TableStructureController.class.php:958
 #: libraries/tracking.lib.php:973
 #: templates/columns_definitions/column_indexes.phtml:11
-#: templates/structure/check_all_table_column.phtml:26
+#: templates/table/structure/check_all_table_column.phtml:26
 msgid "Unique"
 msgstr "Unikal"
 
@@ -3888,16 +3898,17 @@ msgstr "Cardinality"
 #: libraries/server_collations.lib.php:35 libraries/tracking.lib.php:881
 #: libraries/tracking.lib.php:977
 #: templates/columns_definitions/table_fields_definitions.phtml:33
-#: templates/structure/row_stats_table.phtml:31
-#: templates/structure/table_header.phtml:55
-#: templates/structure/table_structure_header.phtml:7
-#: templates/table/table_header.phtml:8
+#: templates/database/structure/table_header.phtml:55
+#: templates/table/search/table_header.phtml:8
+#: templates/table/structure/row_stats_table.phtml:31
+#: templates/table/structure/table_structure_header.phtml:7
 msgid "Collation"
 msgstr "Qarşılaşdırma"
 
 #: libraries/Index.class.php:703 libraries/rte/rte_events.lib.php:496
-#: libraries/rte/rte_routines.lib.php:956 libraries/tracking.lib.php:885
-#: libraries/tracking.lib.php:979 templates/structure/table_header.phtml:84
+#: libraries/rte/rte_routines.lib.php:1047 libraries/tracking.lib.php:885
+#: libraries/tracking.lib.php:979
+#: templates/database/structure/table_header.phtml:84
 msgid "Comment"
 msgstr "Şərh"
 
@@ -3910,15 +3921,15 @@ msgstr "Birinci dərəcəli açar ləğv edildi."
 msgid "Index %s has been dropped."
 msgstr "%s indeksi ləğv edildi."
 
-#: libraries/Index.class.php:757 libraries/Util.class.php:3630
-#: libraries/Util.class.php:3631
-#: libraries/controllers/StructureController.class.php:1958
-#: libraries/controllers/StructureController.class.php:1959
+#: libraries/Index.class.php:757 libraries/Util.class.php:3636
+#: libraries/Util.class.php:3637
+#: libraries/controllers/TableStructureController.class.php:949
+#: libraries/controllers/TableStructureController.class.php:950
 #: libraries/operations.lib.php:1607 libraries/rte/rte_list.lib.php:150
 #: libraries/server_databases.lib.php:146
-#: templates/structure/check_all_table_column.phtml:15
-#: templates/structure/check_all_tables.phtml:16
-#: templates/tbl_relation/foreign_key_row.phtml:93
+#: templates/database/structure/check_all_tables.phtml:16
+#: templates/table/relation/foreign_key_row.phtml:93
+#: templates/table/structure/check_all_table_column.phtml:15
 msgid "Drop"
 msgstr "Ləğv et"
 
@@ -3947,16 +3958,16 @@ msgstr "Server"
 #: libraries/Menu.class.php:248
 #: libraries/navigation/Nodes/Node_View.class.php:32
 #: libraries/tbl_info.inc.php:63
-#: templates/structure/structure_table_row.phtml:97
-#: templates/structure/structure_table_row.phtml:159
+#: templates/database/structure/structure_table_row.phtml:97
+#: templates/database/structure/structure_table_row.phtml:159
 msgid "View"
 msgstr "Görünüş"
 
 #: libraries/Menu.class.php:325 libraries/Menu.class.php:429
-#: libraries/Menu.class.php:548 libraries/Util.class.php:3334
-#: libraries/Util.class.php:3344 libraries/Util.class.php:3350
-#: libraries/Util.class.php:4313 libraries/Util.class.php:4328
-#: libraries/Util.class.php:4345 libraries/config.values.php:40
+#: libraries/Menu.class.php:548 libraries/Util.class.php:3340
+#: libraries/Util.class.php:3350 libraries/Util.class.php:3356
+#: libraries/Util.class.php:4319 libraries/Util.class.php:4334
+#: libraries/Util.class.php:4351 libraries/config.values.php:40
 #: libraries/config.values.php:48 libraries/config.values.php:110
 #: libraries/config.values.php:116 libraries/config/messages.inc.php:321
 #: libraries/navigation/Nodes/Node_Table.class.php:292
@@ -3964,19 +3975,19 @@ msgid "SQL"
 msgstr "SQL"
 
 #: libraries/Menu.class.php:328 libraries/Menu.class.php:432
-#: libraries/Util.class.php:3335 libraries/Util.class.php:3345
-#: libraries/Util.class.php:3351 libraries/Util.class.php:3625
-#: libraries/Util.class.php:3626 libraries/Util.class.php:4329
-#: libraries/Util.class.php:4346 libraries/config.values.php:41
+#: libraries/Util.class.php:3341 libraries/Util.class.php:3351
+#: libraries/Util.class.php:3357 libraries/Util.class.php:3631
+#: libraries/Util.class.php:3632 libraries/Util.class.php:4335
+#: libraries/Util.class.php:4352 libraries/config.values.php:41
 #: libraries/config.values.php:49 libraries/config.values.php:111
 #: libraries/config.values.php:117
 #: libraries/navigation/Nodes/Node_Table.class.php:286
 msgid "Search"
 msgstr "Axtarış"
 
-#: libraries/Menu.class.php:338 libraries/Util.class.php:3336
-#: libraries/Util.class.php:3346 libraries/Util.class.php:3627
-#: libraries/Util.class.php:3628 libraries/Util.class.php:4347
+#: libraries/Menu.class.php:338 libraries/Util.class.php:3342
+#: libraries/Util.class.php:3352 libraries/Util.class.php:3633
+#: libraries/Util.class.php:3634 libraries/Util.class.php:4353
 #: libraries/config.values.php:42 libraries/config.values.php:50
 #: libraries/config.values.php:118
 #: libraries/navigation/Nodes/Node_Table.class.php:289
@@ -3985,30 +3996,30 @@ msgid "Insert"
 msgstr "Əlavə et"
 
 #: libraries/Menu.class.php:362 libraries/Menu.class.php:467
-#: libraries/Util.class.php:4334 libraries/Util.class.php:4350
+#: libraries/Util.class.php:4340 libraries/Util.class.php:4356
 #: libraries/config.values.php:106 libraries/server_common.lib.php:51
 #: libraries/server_privileges.lib.php:2370
 #: libraries/server_privileges.lib.php:3158
-#: libraries/server_privileges.lib.php:4221
+#: libraries/server_privileges.lib.php:4247
 msgid "Privileges"
 msgstr "Səlahiyyətlər"
 
 #: libraries/Menu.class.php:371 libraries/Menu.class.php:379
-#: libraries/Menu.class.php:459 libraries/Util.class.php:3338
-#: libraries/Util.class.php:3352 libraries/Util.class.php:4333
-#: libraries/Util.class.php:4351 libraries/config.values.php:112
+#: libraries/Menu.class.php:459 libraries/Util.class.php:3344
+#: libraries/Util.class.php:3358 libraries/Util.class.php:4339
+#: libraries/Util.class.php:4357 libraries/config.values.php:112
 #: view_operations.php:92
 msgid "Operations"
 msgstr "Əməliyyatlar"
 
 #: libraries/Menu.class.php:384 libraries/Menu.class.php:492
-#: libraries/Util.class.php:4338 libraries/Util.class.php:4352
+#: libraries/Util.class.php:4344 libraries/Util.class.php:4358
 #: libraries/relation.lib.php:255
 msgid "Tracking"
 msgstr "İzləmə"
 
 #: libraries/Menu.class.php:397 libraries/Menu.class.php:486
-#: libraries/Util.class.php:4337 libraries/Util.class.php:4353
+#: libraries/Util.class.php:4343 libraries/Util.class.php:4359
 #: libraries/navigation/Nodes/Node_Trigger_Container.class.php:24
 #: libraries/plugins/export/ExportHtmlword.class.php:557
 #: libraries/plugins/export/ExportOdt.class.php:685
@@ -4025,16 +4036,16 @@ msgstr ""
 msgid "Database seems to be empty!"
 msgstr "Verilənlər Bazası boş olaraq görsənir!"
 
-#: libraries/Menu.class.php:439 libraries/Util.class.php:4330
+#: libraries/Menu.class.php:439 libraries/Util.class.php:4336
 msgid "Query"
 msgstr "Sorğu"
 
-#: libraries/Menu.class.php:472 libraries/Util.class.php:4335
+#: libraries/Menu.class.php:472 libraries/Util.class.php:4341
 #: libraries/rte/rte_words.lib.php:36
 msgid "Routines"
 msgstr "Rutinlər"
 
-#: libraries/Menu.class.php:479 libraries/Util.class.php:4336
+#: libraries/Menu.class.php:479 libraries/Util.class.php:4342
 #: libraries/navigation/Nodes/Node_Event_Container.class.php:26
 #: libraries/plugins/export/ExportSql.class.php:940
 #: libraries/plugins/export/ExportXml.class.php:107
@@ -4042,20 +4053,20 @@ msgstr "Rutinlər"
 msgid "Events"
 msgstr "Hadisələr"
 
-#: libraries/Menu.class.php:498 libraries/Util.class.php:4339
+#: libraries/Menu.class.php:498 libraries/Util.class.php:4345
 msgid "Designer"
 msgstr "Dizayner"
 
-#: libraries/Menu.class.php:507 libraries/Util.class.php:4340
-#: templates/structure/check_all_tables.phtml:35
+#: libraries/Menu.class.php:507 libraries/Util.class.php:4346
+#: templates/database/structure/check_all_tables.phtml:35
 msgid "Central columns"
 msgstr "Orta sütunlar"
 
-#: libraries/Menu.class.php:544 libraries/Util.class.php:4312
+#: libraries/Menu.class.php:544 libraries/Util.class.php:4318
 #: libraries/config.values.php:103 libraries/config/messages.inc.php:266
 #: libraries/config/messages.inc.php:341
 #: libraries/navigation/NavigationTree.class.php:1239
-#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4332
+#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4358
 msgid "Databases"
 msgstr "Verilənlər Bazaları"
 
@@ -4066,34 +4077,34 @@ msgid "User accounts"
 msgstr "İstifadəçi qrupları"
 
 #: libraries/Menu.class.php:595 libraries/ServerStatusData.class.php:121
-#: libraries/Util.class.php:4319 libraries/server_common.lib.php:36
+#: libraries/Util.class.php:4325 libraries/server_common.lib.php:36
 msgid "Binary log"
 msgstr "Binar logu"
 
 #: libraries/Menu.class.php:601 libraries/ServerStatusData.class.php:126
-#: libraries/Util.class.php:4320 libraries/server_common.lib.php:42
-#: templates/structure/body_for_table_summary.phtml:10
-#: templates/structure/table_header.phtml:27
+#: libraries/Util.class.php:4326 libraries/server_common.lib.php:42
+#: templates/database/structure/body_for_table_summary.phtml:10
+#: templates/database/structure/table_header.phtml:27
 msgid "Replication"
 msgstr "Təkrarlanma(replikasiya)"
 
 #: libraries/Menu.class.php:606 libraries/ServerStatusData.class.php:193
-#: libraries/Util.class.php:4321 libraries/config.values.php:105
+#: libraries/Util.class.php:4327 libraries/config.values.php:105
 #: libraries/server_engines.lib.php:108 libraries/server_engines.lib.php:112
 #: libraries/sql_query_form.lib.php:421
 msgid "Variables"
 msgstr "Dəyişənlər"
 
-#: libraries/Menu.class.php:610 libraries/Util.class.php:4322
+#: libraries/Menu.class.php:610 libraries/Util.class.php:4328
 msgid "Charsets"
 msgstr "kodlaşdırma"
 
-#: libraries/Menu.class.php:615 libraries/Util.class.php:4323
+#: libraries/Menu.class.php:615 libraries/Util.class.php:4329
 #: libraries/server_common.lib.php:33 libraries/server_plugins.lib.php:27
 msgid "Plugins"
 msgstr "Qoşmalar"
 
-#: libraries/Menu.class.php:626 libraries/Util.class.php:4324
+#: libraries/Menu.class.php:626 libraries/Util.class.php:4330
 msgid "Engines"
 msgstr "Motorlar"
 
@@ -4118,7 +4129,7 @@ msgid_plural "%1$d rows inserted."
 msgstr[0] "%1$d sətir əlavə edildi."
 msgstr[1] "%1$d sətir əlavə edildi."
 
-#: libraries/PDF.class.php:70 libraries/Util.class.php:2521
+#: libraries/PDF.class.php:70 libraries/Util.class.php:2527
 #: libraries/browse_foreigners.lib.php:327
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:865
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:890
@@ -4139,7 +4150,7 @@ msgid "Could not save favorite table!"
 msgstr "Favorit cədvəli yaddaşa verilə bilmədi!"
 
 #: libraries/RecentFavoriteTable.class.php:212
-#: templates/structure/favorite_anchor.phtml:12
+#: templates/database/structure/favorite_anchor.phtml:12
 msgid "Remove from Favorites"
 msgstr "Favoritlərdən çıxart"
 
@@ -4305,7 +4316,7 @@ msgid ""
 msgstr "Bu depolama motoru haqqında etrafli status me'lumatı mövcud deyildir."
 
 #: libraries/StorageEngine.class.php:373
-#: templates/structure/body_for_table_summary.phtml:50
+#: templates/database/structure/body_for_table_summary.phtml:50
 #, php-format
 msgid "%s is the default storage engine on this MySQL server."
 msgstr "%s bu MySQL serverinde esas depolama motoru olaraq qurulmuşdur."
@@ -4749,10 +4760,10 @@ msgstr ""
 
 #: libraries/Util.class.php:726 libraries/rte/rte_events.lib.php:110
 #: libraries/rte/rte_events.lib.php:119 libraries/rte/rte_events.lib.php:150
-#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:153
-#: libraries/rte/rte_routines.lib.php:162
-#: libraries/rte/rte_routines.lib.php:235
-#: libraries/rte/rte_routines.lib.php:1366
+#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:223
+#: libraries/rte/rte_routines.lib.php:250
+#: libraries/rte/rte_routines.lib.php:372
+#: libraries/rte/rte_routines.lib.php:1457
 #: libraries/rte/rte_triggers.lib.php:86 libraries/rte/rte_triggers.lib.php:95
 #: libraries/rte/rte_triggers.lib.php:127
 msgid "MySQL said: "
@@ -4796,75 +4807,78 @@ msgstr "Baz"
 msgid "%B %d, %Y at %I:%M %p"
 msgstr "%d %B, %Y saat %H:%M"
 
-#: libraries/Util.class.php:2019
+#: libraries/Util.class.php:2025
 #, php-format
 msgid "%s days, %s hours, %s minutes and %s seconds"
 msgstr "%s gün, %s saat, %s dəqiqə və %s saniyə"
 
-#: libraries/Util.class.php:2112
+#: libraries/Util.class.php:2118
 msgid "Missing parameter:"
 msgstr "Əskik parametrlər:"
 
-#: libraries/Util.class.php:2645
+#: libraries/Util.class.php:2651
 #, php-format
 msgid "Jump to database \"%s\"."
 msgstr "\"%s\" verilənlər bazasına keç."
 
-#: libraries/Util.class.php:2670
+#: libraries/Util.class.php:2676
 #, php-format
 msgid "The %s functionality is affected by a known bug, see %s"
 msgstr "%s Funksionallıq bilinən bir xəta tərəfindən zədələnib, baxın %s"
 
-#: libraries/Util.class.php:2881
+#: libraries/Util.class.php:2887
 msgid "Click to toggle"
 msgstr "Dəyişmək üçün tıklayın"
 
-#: libraries/Util.class.php:3542 prefs_manage.php:248
+#: libraries/Util.class.php:3548 prefs_manage.php:248
 msgid "Browse your computer:"
 msgstr "Kompüterindən seç:"
 
-#: libraries/Util.class.php:3567
+#: libraries/Util.class.php:3573
 #, php-format
 msgid "Select from the web server upload directory <b>%s</b>:"
 msgstr "Web server upload direktoriyasından<b>%s</b> seçin:"
 
-#: libraries/Util.class.php:3596 libraries/insert_edit.lib.php:1173
+#: libraries/Util.class.php:3602 libraries/insert_edit.lib.php:1171
 msgid "The directory you set for upload work cannot be reached."
 msgstr "Upload işleri üçün te'yin etdiyiniz direktoriya tapılmadı."
 
-#: libraries/Util.class.php:3607
+#: libraries/Util.class.php:3613
 msgid "There are no files to upload!"
 msgstr "Yüklənəcək fayl yoxdur!"
 
-#: libraries/Util.class.php:3632 libraries/Util.class.php:3633
-#: templates/structure/check_all_tables.phtml:15
+#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: templates/database/structure/check_all_tables.phtml:15
 msgid "Empty"
 msgstr "Boşalt"
 
-#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: libraries/Util.class.php:3644 libraries/Util.class.php:3645
 msgid "Execute"
 msgstr "İcra et"
 
-#: libraries/Util.class.php:4152
+#: libraries/Util.class.php:4158
 msgid "Print"
 msgstr "Çap et"
 
-#: libraries/Util.class.php:4257 templates/structure/row_stats_table.phtml:80
-#: templates/structure/table_header.phtml:95
+#: libraries/Util.class.php:4263
+#: templates/database/structure/table_header.phtml:95
+#: templates/table/structure/row_stats_table.phtml:80
 msgid "Creation"
 msgstr "Quruluş"
 
-#: libraries/Util.class.php:4263 templates/structure/row_stats_table.phtml:87
-#: templates/structure/table_header.phtml:106
+#: libraries/Util.class.php:4269
+#: templates/database/structure/table_header.phtml:106
+#: templates/table/structure/row_stats_table.phtml:87
 msgid "Last update"
 msgstr "En son yenilenme"
 
-#: libraries/Util.class.php:4269 templates/structure/row_stats_table.phtml:94
-#: templates/structure/table_header.phtml:117
+#: libraries/Util.class.php:4275
+#: templates/database/structure/table_header.phtml:117
+#: templates/table/structure/row_stats_table.phtml:94
 msgid "Last check"
 msgstr "En son yoxlama"
 
-#: libraries/Util.class.php:4315
+#: libraries/Util.class.php:4321
 msgid "Users"
 msgstr "İstifadəçilər"
 
@@ -4885,16 +4899,16 @@ msgid "Use this value"
 msgstr "Bu qiymətdən istifadə et"
 
 #: libraries/build_html_for_db.lib.php:33 libraries/import.lib.php:193
-#: templates/structure/actions_in_table_structure.phtml:113
-#: templates/structure/row_stats_table.phtml:42
-#: templates/structure/table_header.phtml:36
+#: templates/database/structure/table_header.phtml:36
+#: templates/table/structure/actions_in_table_structure.phtml:113
+#: templates/table/structure/row_stats_table.phtml:42
 msgid "Rows"
 msgstr "Sıra sayı"
 
 #: libraries/build_html_for_db.lib.php:48 libraries/engines/innodb.lib.php:171
-#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:186
-#: libraries/server_status.lib.php:298
-#: templates/structure/display_table_stats.phtml:40
+#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:195
+#: libraries/server_status.lib.php:307
+#: templates/table/structure/display_table_stats.phtml:40
 msgid "Total"
 msgstr "Cəmi"
 
@@ -4903,10 +4917,12 @@ msgid "Jump to database"
 msgstr "Verilənlər Bazasına get"
 
 #: libraries/build_html_for_db.lib.php:146
+#: templates/database/structure/structure_table_row.phtml:15
 msgid "Not replicated"
 msgstr ""
 
 #: libraries/build_html_for_db.lib.php:158
+#: templates/database/structure/structure_table_row.phtml:16
 msgid "Replicated"
 msgstr "Təkrarlandı(kopyalandı)"
 
@@ -4959,17 +4975,17 @@ msgstr "XEYR"
 #: libraries/plugins/export/ExportTexytext.class.php:425
 #: libraries/plugins/export/PMA_ExportPdf.class.php:307
 #: libraries/rte/rte_list.lib.php:73 libraries/rte/rte_list.lib.php:85
-#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:830
-#: libraries/rte/rte_routines.lib.php:1492 setup/frames/index.inc.php:162
+#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:921
+#: libraries/rte/rte_routines.lib.php:1583 setup/frames/index.inc.php:162
 #: templates/columns_definitions/table_fields_definitions.phtml:8
-#: templates/structure/table_structure_header.phtml:5
-#: templates/table/create_table.phtml:11
+#: templates/database/create_table.phtml:11
+#: templates/table/structure/table_structure_header.phtml:5
 msgid "Name"
 msgstr "Adı"
 
 #: libraries/central_columns.lib.php:699
 #: libraries/central_columns.lib.php:1381
-#: libraries/rte/rte_routines.lib.php:832
+#: libraries/rte/rte_routines.lib.php:923
 #: templates/columns_definitions/table_fields_definitions.phtml:14
 msgid "Length/Values"
 msgstr "Uzunluq/Dəyərlər"
@@ -4990,7 +5006,7 @@ msgid "Select a table"
 msgstr "Bir Cədvəl Seç"
 
 #: libraries/central_columns.lib.php:804
-#: templates/structure/add_column.phtml:4
+#: templates/table/structure/add_column.phtml:4
 msgid "Add column"
 msgstr "Sütun əlavə et"
 
@@ -5006,7 +5022,7 @@ msgstr "Yeni sütun əlavə et"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1002
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1025
 #: templates/columns_definitions/table_fields_definitions.phtml:36
-#: templates/structure/table_structure_header.phtml:8
+#: templates/table/structure/table_structure_header.phtml:8
 msgid "Attributes"
 msgstr "Xüsusiyyətlər"
 
@@ -5119,7 +5135,7 @@ msgid "Double click"
 msgstr "İki dəfə tıklayın"
 
 #: libraries/config.values.php:95 libraries/config.values.php:124
-#: libraries/config/FormDisplay.tpl.php:221 libraries/relation.lib.php:97
+#: libraries/config/FormDisplay.tpl.php:232 libraries/relation.lib.php:97
 #: libraries/relation.lib.php:105
 msgid "Disabled"
 msgstr "Söndürülüb"
@@ -5298,21 +5314,21 @@ msgstr ""
 msgid "maximum %s"
 msgstr "maksimum %s"
 
-#: libraries/config/FormDisplay.tpl.php:219
+#: libraries/config/FormDisplay.tpl.php:230
 msgid "This setting is disabled, it will not be applied to your configuration."
 msgstr "Bu seçim deaktiv edilib, konfiqurasiyanıza tətbiq edilməyəcək."
 
-#: libraries/config/FormDisplay.tpl.php:313
+#: libraries/config/FormDisplay.tpl.php:324
 #, php-format
 msgid "Set value: %s"
 msgstr ""
 
-#: libraries/config/FormDisplay.tpl.php:318
+#: libraries/config/FormDisplay.tpl.php:329
 #: libraries/config/messages.inc.php:610
 msgid "Restore default value"
 msgstr "Susmaya görə olan dəyəri geri qaytar"
 
-#: libraries/config/FormDisplay.tpl.php:332
+#: libraries/config/FormDisplay.tpl.php:343
 msgid "Allow users to customize this value"
 msgstr "Bu dəyəri fərdiləşdirmək üçün istifadəçilərə icazə ver"
 
@@ -5741,7 +5757,7 @@ msgstr "Faylın kodlaşdırması(charset)"
 
 #: libraries/config/messages.inc.php:136 libraries/config/messages.inc.php:152
 #: libraries/sql_query_form.lib.php:247
-#: templates/structure/row_stats_table.phtml:7
+#: templates/table/structure/row_stats_table.phtml:7
 msgid "Format"
 msgstr "Format"
 
@@ -6252,7 +6268,7 @@ msgstr ""
 
 #: libraries/config/messages.inc.php:332
 #: libraries/plugins/export/ExportPdf.class.php:279
-#: templates/structure/secondary_tabs.phtml:8
+#: templates/table/secondary_tabs.phtml:8
 msgid "Table structure"
 msgstr "Cədvəl strukturu"
 
@@ -7835,103 +7851,33 @@ msgstr "Microsoft Word 2000"
 msgid "OpenDocument Text"
 msgstr "OpenDocument Mətni"
 
-#: libraries/controllers/StructureController.class.php:465
+#: libraries/controllers/DatabaseStructureController.class.php:405
 #: tbl_operations.php:382
 #, php-format
 msgid "Table %s has been emptied."
 msgstr "%s cədvəli boşaldıldı."
 
-#: libraries/controllers/StructureController.class.php:486
+#: libraries/controllers/DatabaseStructureController.class.php:426
 #: tbl_operations.php:400 view_operations.php:119
 #, php-format
 msgid "View %s has been dropped."
 msgstr "%s görünüşünü yığışdır."
 
-#: libraries/controllers/StructureController.class.php:487
+#: libraries/controllers/DatabaseStructureController.class.php:427
 #: tbl_operations.php:401
 #, php-format
 msgid "Table %s has been dropped."
 msgstr "%s cədvəli ləğv edildi."
 
-#: libraries/controllers/StructureController.class.php:797
-#, fuzzy, php-format
-#| msgid "The column name '%s' is a MySQL reserved keyword."
-msgid "The name '%s' is a MySQL reserved keyword."
-msgid_plural "The names '%s' are MySQL reserved keywords."
-msgstr[0] "Sütün adı  '%s' MySQL'ə ayrılmış açar kəlimədir."
-msgstr[1] "Sütün adı  '%s' MySQL'ə ayrılmış açar kəlimədir."
-
-#: libraries/controllers/StructureController.class.php:875
-msgid "No column selected."
-msgstr "Sütun seçilməmişdir."
-
-#: libraries/controllers/StructureController.class.php:1049
+#: libraries/controllers/DatabaseStructureController.class.php:733
 msgid "Favorite List is full!"
 msgstr "Seçilmiş siyahı doludur!"
 
-#: libraries/controllers/StructureController.class.php:1272
-msgid "The columns have been moved successfully."
-msgstr "Sütunlar uğurlu şəkildə daşındı."
-
-#: libraries/controllers/StructureController.class.php:1535
-#, fuzzy, php-format
-#| msgid "Table %1$s has been altered successfully."
-msgid ""
-"Table %1$s has been altered successfully. Privileges have been adjusted."
-msgstr "%1$s cədvəli uğurlu bir şəkildə dəyişdirildi."
-
-#: libraries/controllers/StructureController.class.php:1541
-#: libraries/controllers/TableIndexesController.class.php:161
-#: tbl_addfield.php:92
-#, php-format
-msgid "Table %1$s has been altered successfully."
-msgstr "%1$s cədvəli uğurlu bir şəkildə dəyişdirildi."
-
-#: libraries/controllers/StructureController.class.php:1588
-#: libraries/tracking.lib.php:1094
-msgid "Query error"
-msgstr "Sorğu xətası"
-
-#: libraries/controllers/StructureController.class.php:1806
+#: libraries/controllers/DatabaseStructureController.class.php:947
 #: libraries/mysql_charsets.lib.php:366 libraries/mysql_charsets.lib.php:373
 msgid "unknown"
 msgstr "bilinmir"
 
-#: libraries/controllers/StructureController.class.php:1957
-#: templates/structure/check_all_table_column.phtml:11
-msgid "Change"
-msgstr "Dəyişdir"
-
-#: libraries/controllers/StructureController.class.php:1961
-#: libraries/controllers/StructureController.class.php:1966
-#: libraries/navigation/Nodes/Node_Index.class.php:30
-#: libraries/tracking.lib.php:926
-#: templates/columns_definitions/column_indexes.phtml:16
-#: templates/columns_definitions/table_fields_definitions.phtml:57
-#: templates/structure/check_all_table_column.phtml:30
-#: templates/structure/display_structure.phtml:79
-#: templates/structure/display_table_stats.phtml:19
-msgid "Index"
-msgstr "İndeks"
-
-#: libraries/controllers/StructureController.class.php:1963
-#: libraries/controllers/StructureController.class.php:1968
-#: templates/columns_definitions/column_indexes.phtml:27
-#: templates/structure/check_all_table_column.phtml:37
-msgid "Spatial"
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1964
-#: libraries/controllers/StructureController.class.php:1969
-#: templates/columns_definitions/column_indexes.phtml:22
-#: templates/structure/check_all_table_column.phtml:47
-msgid "Fulltext"
-msgstr "Tam metn (Fulltext)"
-
-#: libraries/controllers/StructureController.class.php:1970
-msgid "Distinct values"
-msgstr "Fərdi qiymətlər"
-
 #: libraries/controllers/TableChartController.class.php:82
 #: libraries/controllers/TableGisVisualizationController.class.php:101
 msgid "No SQL query was set to fetch data."
@@ -7945,13 +7891,20 @@ msgstr ""
 msgid "No data to display"
 msgstr "Göstərmək üçün məlumat yoxdur"
 
-#: libraries/controllers/TableRelationController.class.php:217
+#: libraries/controllers/TableIndexesController.class.php:161
+#: libraries/controllers/TableStructureController.class.php:736
+#: tbl_addfield.php:92
+#, php-format
+msgid "Table %1$s has been altered successfully."
+msgstr "%1$s cədvəli uğurlu bir şəkildə dəyişdirildi."
+
+#: libraries/controllers/TableRelationController.class.php:218
 #, fuzzy
 #| msgid "Thread %s was successfully killed."
 msgid "Display column was successfully updated."
 msgstr "Thread %s uğurla söndürüldü (killed)."
 
-#: libraries/controllers/TableRelationController.class.php:283
+#: libraries/controllers/TableRelationController.class.php:288
 msgid "Internal relations were successfully updated."
 msgstr "Daxili əlaqələr uğurla yeniləndi."
 
@@ -7966,10 +7919,73 @@ msgid "Zoom search"
 msgstr "Axtarış"
 
 #: libraries/controllers/TableSearchController.class.php:852
-#: templates/table/selection_form.phtml:59
+#: templates/table/search/selection_form.phtml:59
 msgid "Find and replace"
 msgstr "Tap və Əvəz et"
 
+#: libraries/controllers/TableStructureController.class.php:163
+#, fuzzy, php-format
+#| msgid "The column name '%s' is a MySQL reserved keyword."
+msgid "The name '%s' is a MySQL reserved keyword."
+msgid_plural "The names '%s' are MySQL reserved keywords."
+msgstr[0] "Sütün adı  '%s' MySQL'ə ayrılmış açar kəlimədir."
+msgstr[1] "Sütün adı  '%s' MySQL'ə ayrılmış açar kəlimədir."
+
+#: libraries/controllers/TableStructureController.class.php:241
+msgid "No column selected."
+msgstr "Sütun seçilməmişdir."
+
+#: libraries/controllers/TableStructureController.class.php:467
+msgid "The columns have been moved successfully."
+msgstr "Sütunlar uğurlu şəkildə daşındı."
+
+#: libraries/controllers/TableStructureController.class.php:730
+#, fuzzy, php-format
+#| msgid "Table %1$s has been altered successfully."
+msgid ""
+"Table %1$s has been altered successfully. Privileges have been adjusted."
+msgstr "%1$s cədvəli uğurlu bir şəkildə dəyişdirildi."
+
+#: libraries/controllers/TableStructureController.class.php:783
+#: libraries/tracking.lib.php:1094
+msgid "Query error"
+msgstr "Sorğu xətası"
+
+#: libraries/controllers/TableStructureController.class.php:948
+#: templates/table/structure/check_all_table_column.phtml:11
+msgid "Change"
+msgstr "Dəyişdir"
+
+#: libraries/controllers/TableStructureController.class.php:952
+#: libraries/controllers/TableStructureController.class.php:957
+#: libraries/navigation/Nodes/Node_Index.class.php:30
+#: libraries/tracking.lib.php:926
+#: templates/columns_definitions/column_indexes.phtml:16
+#: templates/columns_definitions/table_fields_definitions.phtml:57
+#: templates/table/structure/check_all_table_column.phtml:30
+#: templates/table/structure/display_structure.phtml:79
+#: templates/table/structure/display_table_stats.phtml:19
+msgid "Index"
+msgstr "İndeks"
+
+#: libraries/controllers/TableStructureController.class.php:954
+#: libraries/controllers/TableStructureController.class.php:959
+#: templates/columns_definitions/column_indexes.phtml:27
+#: templates/table/structure/check_all_table_column.phtml:37
+msgid "Spatial"
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:955
+#: libraries/controllers/TableStructureController.class.php:960
+#: templates/columns_definitions/column_indexes.phtml:22
+#: templates/table/structure/check_all_table_column.phtml:47
+msgid "Fulltext"
+msgstr "Tam metn (Fulltext)"
+
+#: libraries/controllers/TableStructureController.class.php:963
+msgid "Distinct values"
+msgstr "Fərdi qiymətlər"
+
 #: libraries/core.lib.php:306
 #, php-format
 msgid "The %s extension is missing. Please check your PHP configuration."
@@ -8016,7 +8032,7 @@ msgid "No Password"
 msgstr "Parol Yoxdur"
 
 #: libraries/display_change_password.lib.php:68
-#: libraries/plugins/auth/AuthenticationCookie.class.php:199
+#: libraries/plugins/auth/AuthenticationCookie.class.php:187
 #: libraries/replication_gui.lib.php:422 libraries/replication_gui.lib.php:862
 #: libraries/server_privileges.lib.php:1640
 msgid "Password:"
@@ -8767,12 +8783,12 @@ msgid "Dump has been saved to file %s."
 msgstr "Sxem %s faylına qeyd edildi."
 
 #: libraries/import.lib.php:202 libraries/insert_edit.lib.php:124
-#: libraries/rte/rte_routines.lib.php:1353 libraries/sql.lib.php:1312
+#: libraries/rte/rte_routines.lib.php:1444 libraries/sql.lib.php:1306
 #: tbl_get_field.php:44
 msgid "MySQL returned an empty result set (i.e. zero rows)."
 msgstr "MySQL boş nəticə çoxluğu göndərdi(yəni sıfır sətir)."
 
-#: libraries/import.lib.php:265 libraries/sql.lib.php:1326
+#: libraries/import.lib.php:265 libraries/sql.lib.php:1320
 msgid "[ROLLBACK occurred.]"
 msgstr ""
 
@@ -8836,14 +8852,14 @@ msgstr "&nbsp;%s&nbsp;sütunda indeks yarat"
 
 #: libraries/insert_edit.lib.php:233
 #: libraries/navigation/Nodes/Node_DatabaseChild.class.php:48
-#: templates/designer/table_list.phtml:40
+#: templates/database/designer/table_list.phtml:40
 msgid "Hide"
 msgstr ""
 
 #: libraries/insert_edit.lib.php:249
 #: libraries/navigation/Nodes/Node_Function.class.php:32
-#: libraries/rte/rte_routines.lib.php:1495
-#: templates/table/table_header.phtml:4
+#: libraries/rte/rte_routines.lib.php:1586
+#: templates/table/search/table_header.phtml:4
 msgid "Function"
 msgstr "Funksiya"
 
@@ -8856,82 +8872,83 @@ msgstr ""
 msgid "Because of its length,<br /> this column might not be editable."
 msgstr "Uzun olduğuna görə,<br /> bu sütun redaktə edilməyə bilər."
 
-#: libraries/insert_edit.lib.php:1050
+#: libraries/insert_edit.lib.php:1048
 msgid "Binary - do not edit"
 msgstr "Binary - deyişiklik etme"
 
-#: libraries/insert_edit.lib.php:1176 libraries/server_privileges.lib.php:470
-#: templates/table/options.phtml:36
+#: libraries/insert_edit.lib.php:1174 libraries/server_privileges.lib.php:470
+#: templates/table/search/options.phtml:36
 msgid "Or"
 msgstr "ya da"
 
-#: libraries/insert_edit.lib.php:1177
+#: libraries/insert_edit.lib.php:1175
 msgid "web server upload directory:"
 msgstr "web-server upload direktoriyası:"
 
-#: libraries/insert_edit.lib.php:1348 templates/table/input_box.phtml:49
+#: libraries/insert_edit.lib.php:1346
+#: templates/table/search/input_box.phtml:49
 msgid "Edit/Insert"
 msgstr "Redaktə et/Əlavə et"
 
-#: libraries/insert_edit.lib.php:1398
+#: libraries/insert_edit.lib.php:1396
 #, php-format
 msgid "Continue insertion with %s rows"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1428
+#: libraries/insert_edit.lib.php:1426
 msgid "and then"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1461
+#: libraries/insert_edit.lib.php:1459
 msgid "Insert as new row"
 msgstr "Yeni sətir olaraq əlavə et"
 
-#: libraries/insert_edit.lib.php:1464
+#: libraries/insert_edit.lib.php:1462
 msgid "Insert as new row and ignore errors"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1467
+#: libraries/insert_edit.lib.php:1465
 msgid "Show insert query"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1487
+#: libraries/insert_edit.lib.php:1485
 msgid "Go back to previous page"
 msgstr "Evvelki sehifeye qayıt"
 
-#: libraries/insert_edit.lib.php:1490
+#: libraries/insert_edit.lib.php:1488
 msgid "Insert another new row"
 msgstr "Teze bir setir daha gir"
 
-#: libraries/insert_edit.lib.php:1495
+#: libraries/insert_edit.lib.php:1493
 msgid "Go back to this page"
 msgstr "Bu sehifeye geri dön"
 
-#: libraries/insert_edit.lib.php:1518
+#: libraries/insert_edit.lib.php:1516
 msgid "Edit next row"
 msgstr "Bir sonrakı setre keç"
 
-#: libraries/insert_edit.lib.php:1540
+#: libraries/insert_edit.lib.php:1538
 msgid ""
 "Use TAB key to move from value to value, or CTRL+arrows to move anywhere"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1577 libraries/replication_gui.lib.php:542
-#: libraries/rte/rte_routines.lib.php:1497
+#: libraries/insert_edit.lib.php:1575 libraries/replication_gui.lib.php:542
+#: libraries/rte/rte_routines.lib.php:1588
 #: libraries/server_status_variables.lib.php:220
-#: templates/designer/having_query_panel.phtml:100
-#: templates/designer/options_panel.phtml:73
-#: templates/designer/options_panel.phtml:239
-#: templates/designer/where_query_panel.phtml:69
-#: templates/table/table_header.phtml:10
-#: templates/table/zoom_result_form.phtml:35
+#: templates/database/designer/having_query_panel.phtml:100
+#: templates/database/designer/options_panel.phtml:73
+#: templates/database/designer/options_panel.phtml:239
+#: templates/database/designer/where_query_panel.phtml:69
+#: templates/table/search/table_header.phtml:10
+#: templates/table/search/zoom_result_form.phtml:35
 msgid "Value"
 msgstr "Dəyər"
 
-#: libraries/insert_edit.lib.php:1937 libraries/sql.lib.php:1309
+#: libraries/insert_edit.lib.php:1935 libraries/sql.lib.php:1303
 msgid "Showing SQL query"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1962 libraries/sql.lib.php:1287
+#: libraries/insert_edit.lib.php:1960 libraries/sql.lib.php:1281
 #, php-format
 msgid "Inserted row id: %1$d"
 msgstr ""
@@ -9345,7 +9362,7 @@ msgstr "Yeni"
 #: libraries/navigation/Nodes/Node_View_Container.class.php:26
 #: libraries/navigation/Nodes/Node_View_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:129
-#: templates/structure/show_create.phtml:30
+#: templates/database/structure/show_create.phtml:30
 msgid "Views"
 msgstr ""
 
@@ -9641,7 +9658,7 @@ msgstr "Burada olma haqqınız yoxdur!"
 
 #: libraries/operations.lib.php:101 libraries/operations.lib.php:249
 #: libraries/operations.lib.php:869 libraries/operations.lib.php:963
-#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:907
+#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:998
 #: templates/columns_definitions/table_fields_definitions.phtml:47
 #, fuzzy
 #| msgid "Edit Privileges"
@@ -9733,22 +9750,22 @@ msgid "Switch to copied table"
 msgstr "Kopyalanmış cedvele keç"
 
 #: libraries/operations.lib.php:1360
-#: templates/structure/check_all_tables.phtml:18
+#: templates/database/structure/check_all_tables.phtml:18
 msgid "Table maintenance"
 msgstr "Cədvəl təmizliyi"
 
 #: libraries/operations.lib.php:1398
-#: templates/structure/check_all_tables.phtml:19
+#: templates/database/structure/check_all_tables.phtml:19
 msgid "Analyze table"
 msgstr "Cədvəli analiz et"
 
 #: libraries/operations.lib.php:1413
-#: templates/structure/check_all_tables.phtml:20
+#: templates/database/structure/check_all_tables.phtml:20
 msgid "Check table"
 msgstr "Cədvəli yoxla"
 
 #: libraries/operations.lib.php:1428
-#: templates/structure/check_all_tables.phtml:22
+#: templates/database/structure/check_all_tables.phtml:22
 #, fuzzy
 #| msgid "Check table"
 msgid "Checksum table"
@@ -9768,18 +9785,19 @@ msgid "Flush the table (FLUSH)"
 msgstr "Cədvəli təmizlə(FLUSH)"
 
 #: libraries/operations.lib.php:1477
-#: templates/structure/check_all_tables.phtml:23
-#: templates/structure/display_table_stats.phtml:56
+#: templates/database/structure/check_all_tables.phtml:23
+#: templates/table/structure/display_table_stats.phtml:56
 msgid "Optimize table"
 msgstr "Cədvəli optimallaşdır"
 
 #: libraries/operations.lib.php:1492
-#: templates/structure/check_all_tables.phtml:24
+#: templates/database/structure/check_all_tables.phtml:24
 msgid "Repair table"
 msgstr "Cedveli te'mir et"
 
 #: libraries/operations.lib.php:1538
-#: templates/structure/check_all_tables.phtml:14 view_operations.php:127
+#: templates/database/structure/check_all_tables.phtml:14
+#: view_operations.php:127
 msgid "Delete data or table"
 msgstr "Cədvəl və ya veriləni sil"
 
@@ -9905,7 +9923,7 @@ msgid "Cannot connect: invalid settings."
 msgstr "Əlaqə qurula bilmir: yalnış tənzimləmə."
 
 #: libraries/plugins/auth/AuthenticationConfig.class.php:108
-#: libraries/plugins/auth/AuthenticationCookie.class.php:134
+#: libraries/plugins/auth/AuthenticationCookie.class.php:122
 #: libraries/plugins/auth/AuthenticationHttp.class.php:96
 #, php-format
 msgid "Welcome to %s"
@@ -9936,36 +9954,36 @@ msgstr ""
 msgid "Retry to connect"
 msgstr "Təkara qoşul"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:146
+#: libraries/plugins/auth/AuthenticationCookie.class.php:134
 msgid "Your session has expired. Please log in again."
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:170
+#: libraries/plugins/auth/AuthenticationCookie.class.php:158
 msgid "Log in"
 msgstr "Giriş et"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:178
-#: libraries/plugins/auth/AuthenticationCookie.class.php:188
+#: libraries/plugins/auth/AuthenticationCookie.class.php:166
+#: libraries/plugins/auth/AuthenticationCookie.class.php:176
 msgid "You can enter hostname/IP address and port separated by space."
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:193
+#: libraries/plugins/auth/AuthenticationCookie.class.php:181
 msgid "Username:"
 msgstr "İstifadəçi Adı:"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:205
+#: libraries/plugins/auth/AuthenticationCookie.class.php:193
 msgid "Server Choice:"
 msgstr "Server seçimi:"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:386
+#: libraries/plugins/auth/AuthenticationCookie.class.php:374
 msgid "Entered captcha is wrong, try again!"
 msgstr "Daxil edilən captcha yanlışdır, təkrar sınayın!"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:396
+#: libraries/plugins/auth/AuthenticationCookie.class.php:384
 msgid "Please enter correct captcha!"
 msgstr "Lütfən düzgün captcha daxil edin!"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:423
+#: libraries/plugins/auth/AuthenticationCookie.class.php:411
 #, fuzzy
 #| msgid "Cannot log in to the MySQL server"
 msgid "You are not allowed to log in to this MySQL server!"
@@ -10067,7 +10085,7 @@ msgstr "Hadisə"
 #: libraries/plugins/export/ExportOdt.class.php:593
 #: libraries/plugins/export/ExportTexytext.class.php:428
 #: libraries/plugins/export/PMA_ExportPdf.class.php:313
-#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:984
 #: libraries/rte/rte_triggers.lib.php:377
 msgid "Definition"
 msgstr "Tərif"
@@ -10372,7 +10390,7 @@ msgid "Last check:"
 msgstr "Ən son yoxlama:"
 
 #: libraries/plugins/export/ExportSql.class.php:1399
-#: templates/structure/structure_table_row.phtml:183
+#: templates/database/structure/structure_table_row.phtml:183
 msgid "in use"
 msgstr "istifadede"
 
@@ -10560,18 +10578,14 @@ msgstr ""
 msgid "The imported file does not contain any data!"
 msgstr ""
 
-#: libraries/plugins/import/ImportSql.class.php:169
+#: libraries/plugins/import/ImportSql.class.php:72
 msgid "SQL compatibility mode:"
 msgstr "SQL compatibility rejimi:"
 
-#: libraries/plugins/import/ImportSql.class.php:181
+#: libraries/plugins/import/ImportSql.class.php:84
 msgid "Do not use <code>AUTO_INCREMENT</code> for zero values"
 msgstr "Sıfır qiymətləri üçün <code>AUTO_INCREMENT</code> istifadə etmə"
 
-#: libraries/plugins/import/ImportSql.class.php:195
-msgid "Read as multibytes"
-msgstr ""
-
 #: libraries/plugins/import/ImportXml.class.php:54
 msgid "XML"
 msgstr "XML"
@@ -10614,7 +10628,7 @@ msgid "Show grid"
 msgstr ""
 
 #: libraries/plugins/schema/SchemaPdf.class.php:94
-#: templates/structure/print_view_data_dictionary_link.phtml:6
+#: templates/database/structure/print_view_data_dictionary_link.phtml:6
 msgid "Data Dictionary"
 msgstr "Verilənlər lüğəti"
 
@@ -10645,7 +10659,7 @@ msgid "The %s table doesn't exist!"
 msgstr "%s cədvəli mövcud deyil!"
 
 #: libraries/plugins/schema/eps/Eps_Relation_Schema.class.php:321
-#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:309
+#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:323
 #, php-format
 msgid "Schema of the %s database - Page %s"
 msgstr "%s Bazasının sxemi - Səhifə %s"
@@ -10674,7 +10688,7 @@ msgstr "İçindəkilər Cədvəli"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1005
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1028
 #: libraries/tracking.lib.php:884
-#: templates/structure/table_structure_header.phtml:11
+#: templates/table/structure/table_structure_header.phtml:11
 msgid "Extra"
 msgstr "Əlavə"
 
@@ -11035,51 +11049,51 @@ msgstr ""
 msgid "Create the needed tables with the <code>%screate_tables.sql</code>."
 msgstr ""
 
-#: libraries/relation.lib.php:360
+#: libraries/relation.lib.php:357
 msgid "Create a pma user and give access to these tables."
 msgstr ""
 
-#: libraries/relation.lib.php:365
+#: libraries/relation.lib.php:360
 msgid ""
 "Enable advanced features in configuration file (<code>config.inc.php</"
 "code>), for example by starting from <code>config.sample.inc.php</code>."
 msgstr ""
 
-#: libraries/relation.lib.php:373
+#: libraries/relation.lib.php:365
 msgid "Re-login to phpMyAdmin to load the updated configuration file."
 msgstr ""
 
-#: libraries/relation.lib.php:1612
+#: libraries/relation.lib.php:1607
 msgid "no description"
 msgstr "Haqqında məlumat (description) mövcud deyildir"
 
-#: libraries/relation.lib.php:1811
+#: libraries/relation.lib.php:1806
 msgid ""
 "You do not have necessary privileges to create a database named "
 "'phpmyadmin'. You may go to 'Operations' tab of any database to set up the "
 "phpMyAdmin configuration storage there."
 msgstr ""
 
-#: libraries/relation.lib.php:1928
+#: libraries/relation.lib.php:1923
 #, php-format
 msgid ""
 "%sCreate%s a database named 'phpmyadmin' and setup the phpMyAdmin "
 "configuration storage there."
 msgstr ""
 
-#: libraries/relation.lib.php:1936
+#: libraries/relation.lib.php:1931
 #, php-format
 msgid ""
 "%sCreate%s the phpMyAdmin configuration storage in the current database."
 msgstr ""
 
-#: libraries/relation.lib.php:1944
+#: libraries/relation.lib.php:1939
 #, php-format
 msgid "%sCreate%s missing phpMyAdmin configuration storage tables."
 msgstr ""
 
 #: libraries/replication_gui.lib.php:46 libraries/replication_gui.lib.php:343
-#: libraries/server_databases.lib.php:387
+#: libraries/server_databases.lib.php:398
 msgid "Master replication"
 msgstr ""
 
@@ -11135,7 +11149,7 @@ msgid ""
 msgstr ""
 
 #: libraries/replication_gui.lib.php:141
-#: libraries/server_databases.lib.php:389
+#: libraries/server_databases.lib.php:400
 msgid "Slave replication"
 msgstr ""
 
@@ -11402,10 +11416,10 @@ msgid "Master server changed successfully to %s."
 msgstr "Master server %s olaraq uğurla dəyişdirildi."
 
 #: libraries/rte/rte_events.lib.php:106 libraries/rte/rte_events.lib.php:115
-#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:149
-#: libraries/rte/rte_routines.lib.php:158
-#: libraries/rte/rte_routines.lib.php:231
-#: libraries/rte/rte_routines.lib.php:1362
+#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:219
+#: libraries/rte/rte_routines.lib.php:246
+#: libraries/rte/rte_routines.lib.php:368
+#: libraries/rte/rte_routines.lib.php:1453
 #: libraries/rte/rte_triggers.lib.php:82 libraries/rte/rte_triggers.lib.php:91
 #: libraries/rte/rte_triggers.lib.php:123
 #, php-format
@@ -11426,7 +11440,7 @@ msgstr "%1$s hadisəsi dəyişdirildi."
 msgid "Event %1$s has been created."
 msgstr "%1$s hadisəsi yaradıldı."
 
-#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:251
+#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:266
 #: libraries/rte/rte_triggers.lib.php:144
 msgid "One or more errors have occurred while processing your request:"
 msgstr "İstəyiniz yerinə yetirilərkən bir və ya daha çox xəta yarandı:"
@@ -11435,7 +11449,7 @@ msgstr "İstəyiniz yerinə yetirilərkən bir və ya daha çox xəta yarandı:"
 msgid "Edit event"
 msgstr "Hadisəni redaktə et"
 
-#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:794
+#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:885
 #: libraries/rte/rte_triggers.lib.php:323 view_create.php:180
 msgid "Details"
 msgstr "Təfsilatları"
@@ -11448,7 +11462,7 @@ msgstr "Hadisə adı"
 msgid "Event type"
 msgstr "Hadisə tipi"
 
-#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:817
+#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:908
 #, php-format
 msgid "Change to %s"
 msgstr "%s buna dəyiş"
@@ -11475,12 +11489,14 @@ msgstr "Son"
 msgid "On completion preserve"
 msgstr "Tamamlamada qoruma"
 
-#: libraries/rte/rte_events.lib.php:491 libraries/rte/rte_routines.lib.php:930
+#: libraries/rte/rte_events.lib.php:491
+#: libraries/rte/rte_routines.lib.php:1021
 #: libraries/rte/rte_triggers.lib.php:383 view_create.php:209
 msgid "Definer"
 msgstr "Təyinedici"
 
-#: libraries/rte/rte_events.lib.php:535 libraries/rte/rte_routines.lib.php:997
+#: libraries/rte/rte_events.lib.php:535
+#: libraries/rte/rte_routines.lib.php:1088
 #: libraries/rte/rte_triggers.lib.php:422
 msgid "The definer must be in the \"username@hostname\" format!"
 msgstr "Təyinedici\"username@hostname\" formatında olmalıdır!"
@@ -11506,9 +11522,9 @@ msgid "You must provide an event definition."
 msgstr "Bir hadisə tərifi verməlisiniz."
 
 #: libraries/rte/rte_export.lib.php:43 libraries/rte/rte_general.lib.php:72
-#: libraries/rte/rte_routines.lib.php:345
-#: libraries/rte/rte_routines.lib.php:1198
-#: libraries/rte/rte_routines.lib.php:1411
+#: libraries/rte/rte_routines.lib.php:153
+#: libraries/rte/rte_routines.lib.php:1289
+#: libraries/rte/rte_routines.lib.php:1502
 #, fuzzy
 #| msgid "Processes"
 msgid "Error in processing request:"
@@ -11546,134 +11562,134 @@ msgstr ""
 "icrasında xəta ola bilər![/strong]. Zəhmət olmasa, problemlərin qarşısın "
 "almaq üçün təkmilləşdirilmiş 'mysqli' genişlənməsi istifadə edin."
 
-#: libraries/rte/rte_routines.lib.php:110
-#: libraries/rte/rte_routines.lib.php:1006
+#: libraries/rte/rte_routines.lib.php:123
+msgid "Edit routine"
+msgstr "Proseduranı redaktə et"
+
+#: libraries/rte/rte_routines.lib.php:200
+#: libraries/rte/rte_routines.lib.php:1097
 #, php-format
 msgid "Invalid routine type: \"%s\""
 msgstr "Səhv tip prosedurları: \"%s\""
 
-#: libraries/rte/rte_routines.lib.php:170
+#: libraries/rte/rte_routines.lib.php:253
+#, php-format
+msgid "Routine %1$s has been created."
+msgstr "Prosedura %1$s yaradıldı."
+
+#: libraries/rte/rte_routines.lib.php:380
 msgid "Sorry, we failed to restore the dropped routine."
 msgstr ""
 "Bağışlayın, silinmiş(dropped) proseduraların bərpa edilməsi uğursuz oldu."
 
-#: libraries/rte/rte_routines.lib.php:211
+#: libraries/rte/rte_routines.lib.php:439
 #, fuzzy, php-format
 #| msgid "Routine %1$s has been modified."
 msgid "Routine %1$s has been modified. Privileges have been adjusted."
 msgstr "Prosedura %1$s dəyişdirildi."
 
-#: libraries/rte/rte_routines.lib.php:216
+#: libraries/rte/rte_routines.lib.php:444
 #, php-format
 msgid "Routine %1$s has been modified."
 msgstr "Prosedura %1$s dəyişdirildi."
 
-#: libraries/rte/rte_routines.lib.php:238
-#, php-format
-msgid "Routine %1$s has been created."
-msgstr "Prosedura %1$s yaradıldı."
-
-#: libraries/rte/rte_routines.lib.php:315
-msgid "Edit routine"
-msgstr "Proseduranı redaktə et"
-
-#: libraries/rte/rte_routines.lib.php:797
+#: libraries/rte/rte_routines.lib.php:888
 msgid "Routine name"
 msgstr "Prosedura adı"
 
-#: libraries/rte/rte_routines.lib.php:823
+#: libraries/rte/rte_routines.lib.php:914
 msgid "Parameters"
 msgstr "Parametrlər"
 
-#: libraries/rte/rte_routines.lib.php:829
+#: libraries/rte/rte_routines.lib.php:920
 msgid "Direction"
 msgstr "İstiqamət"
 
-#: libraries/rte/rte_routines.lib.php:847
+#: libraries/rte/rte_routines.lib.php:938
 msgid "Add parameter"
 msgstr "Parametr əlavə et"
 
-#: libraries/rte/rte_routines.lib.php:851
+#: libraries/rte/rte_routines.lib.php:942
 msgid "Remove last parameter"
 msgstr "Son parametri sil"
 
-#: libraries/rte/rte_routines.lib.php:856
+#: libraries/rte/rte_routines.lib.php:947
 msgid "Return type"
 msgstr "Geri dönüş tipi"
 
-#: libraries/rte/rte_routines.lib.php:862
+#: libraries/rte/rte_routines.lib.php:953
 msgid "Return length/values"
 msgstr "Geri dönüş uzunluğu/qiymətləri"
 
-#: libraries/rte/rte_routines.lib.php:868
+#: libraries/rte/rte_routines.lib.php:959
 msgid "Return options"
 msgstr "Geri dönüş seçənəkləri"
 
-#: libraries/rte/rte_routines.lib.php:899
+#: libraries/rte/rte_routines.lib.php:990
 msgid "Is deterministic"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:920
+#: libraries/rte/rte_routines.lib.php:1011
 msgid ""
 "You do not have sufficient privileges to perform this operation; Please "
 "refer to the documentation for more details"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:935
+#: libraries/rte/rte_routines.lib.php:1026
 msgid "Security type"
 msgstr "Təhlükəsizlik tipi"
 
-#: libraries/rte/rte_routines.lib.php:944
+#: libraries/rte/rte_routines.lib.php:1035
 msgid "SQL data access"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1013
+#: libraries/rte/rte_routines.lib.php:1104
 msgid "You must provide a routine name!"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1047
+#: libraries/rte/rte_routines.lib.php:1138
 #, php-format
 msgid "Invalid direction \"%s\" given for parameter."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1069
-#: libraries/rte/rte_routines.lib.php:1131
+#: libraries/rte/rte_routines.lib.php:1160
+#: libraries/rte/rte_routines.lib.php:1222
 msgid ""
 "You must provide length/values for routine parameters of type ENUM, SET, "
 "VARCHAR and VARBINARY."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1095
+#: libraries/rte/rte_routines.lib.php:1186
 msgid "You must provide a name and a type for each routine parameter."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1114
+#: libraries/rte/rte_routines.lib.php:1205
 msgid "You must provide a valid return type for the routine."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1174
+#: libraries/rte/rte_routines.lib.php:1265
 msgid "You must provide a routine definition."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1285
+#: libraries/rte/rte_routines.lib.php:1376
 #, php-format
 msgid "Execution results of routine %s"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1340
+#: libraries/rte/rte_routines.lib.php:1431
 #, php-format
 msgid "%d row affected by the last statement inside the procedure."
 msgid_plural "%d rows affected by the last statement inside the procedure."
 msgstr[0] ""
 msgstr[1] ""
 
-#: libraries/rte/rte_routines.lib.php:1398
-#: libraries/rte/rte_routines.lib.php:1406
+#: libraries/rte/rte_routines.lib.php:1489
+#: libraries/rte/rte_routines.lib.php:1497
 msgid "Execute routine"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1485
-#: libraries/rte/rte_routines.lib.php:1488
+#: libraries/rte/rte_routines.lib.php:1576
+#: libraries/rte/rte_routines.lib.php:1579
 msgid "Routine parameters"
 msgstr ""
 
@@ -11833,7 +11849,7 @@ msgid "Original position"
 msgstr ""
 
 #: libraries/server_bin_log.lib.php:133
-#: templates/structure/display_table_stats.phtml:4
+#: templates/table/structure/display_table_stats.phtml:4
 msgid "Information"
 msgstr "İnformasiya"
 
@@ -11871,12 +11887,12 @@ msgstr ""
 "Qeyd: Verilənlər Bazası statistikalarını burada aktivləşdirməklə webserver-"
 "lə MySQL server arasında ağır trafikə səbəb ola bilərsiniz."
 
-#: libraries/server_databases.lib.php:364
-#: libraries/server_databases.lib.php:365
+#: libraries/server_databases.lib.php:366
+#: libraries/server_databases.lib.php:371
 msgid "Enable Statistics"
 msgstr "Statistikaları Aktivləşdir"
 
-#: libraries/server_databases.lib.php:481
+#: libraries/server_databases.lib.php:492
 #, php-format
 msgid "%1$d database has been dropped successfully."
 msgid_plural "%1$d databases have been dropped successfully."
@@ -12252,7 +12268,7 @@ msgid "You have revoked the privileges for %s."
 msgstr "%s üçün səlahiyyətləri geri aldınız."
 
 #: libraries/server_privileges.lib.php:2059
-#: libraries/server_privileges.lib.php:4290
+#: libraries/server_privileges.lib.php:4316
 #, fuzzy
 #| msgid "Add user group"
 msgid "Add user account"
@@ -12427,59 +12443,59 @@ msgstr "%s silinir"
 msgid "The privileges were reloaded successfully."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:3994
+#: libraries/server_privileges.lib.php:4003
 #, php-format
 msgid "The user %s already exists!"
 msgstr "%s istifadeçisi mövcuddur!"
 
-#: libraries/server_privileges.lib.php:4232
+#: libraries/server_privileges.lib.php:4258
 #, php-format
 msgid "Privileges for %s"
 msgstr "%s üçün səlahiyyətlər"
 
-#: libraries/server_privileges.lib.php:4241
+#: libraries/server_privileges.lib.php:4267
 #: libraries/server_status_processes.lib.php:72
 #: libraries/server_user_groups.lib.php:39
 msgid "User"
 msgstr "İstifadəçi"
 
-#: libraries/server_privileges.lib.php:4282
+#: libraries/server_privileges.lib.php:4308
 msgctxt "Create new user"
 msgid "New"
 msgstr "Yeni"
 
-#: libraries/server_privileges.lib.php:4311
+#: libraries/server_privileges.lib.php:4337
 #, fuzzy
 #| msgid "Edit Privileges:"
 msgid "Edit privileges:"
 msgstr "Səlahiyyətləri redaktə et:"
 
-#: libraries/server_privileges.lib.php:4312
+#: libraries/server_privileges.lib.php:4338
 #, fuzzy
 #| msgid "User group"
 msgid "User account"
 msgstr "İstifadəçi qrupu"
 
-#: libraries/server_privileges.lib.php:4371
+#: libraries/server_privileges.lib.php:4397
 msgid ""
 "Note: You are attempting to edit privileges of the user with which you are "
 "currently logged in."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4391 libraries/server_users.lib.php:25
+#: libraries/server_privileges.lib.php:4417 libraries/server_users.lib.php:25
 #, fuzzy
 #| msgid "Users overview"
 msgid "User accounts overview"
 msgstr "İstifadəçilərə ümumi baxış"
 
-#: libraries/server_privileges.lib.php:4459
+#: libraries/server_privileges.lib.php:4485
 msgid ""
 "A user account allowing any user from localhost to connect is present. This "
 "will prevent other users from connecting if the host part of their account "
 "allows a connection from any (%) host."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4500
+#: libraries/server_privileges.lib.php:4526
 #, php-format
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
@@ -12492,7 +12508,7 @@ msgstr ""
 "içərisindəkilər webserver-in istifadə etdiklərindən fərqli ola bilər. Bu "
 "halda, davam etmədən əvvəl, səlahiyyətləri %syenidən yükləməlisiniz%s."
 
-#: libraries/server_privileges.lib.php:4519
+#: libraries/server_privileges.lib.php:4545
 #, fuzzy
 #| msgid ""
 #| "Note: phpMyAdmin gets the users' privileges directly from MySQL's "
@@ -12511,63 +12527,63 @@ msgstr ""
 "içərisindəkilər webserver-in istifadə etdiklərindən fərqli ola bilər. Bu "
 "halda, davam etmədən əvvəl, səlahiyyətləri %syenidən yükləməlisiniz%s."
 
-#: libraries/server_privileges.lib.php:4569
+#: libraries/server_privileges.lib.php:4595
 msgid "The selected user was not found in the privilege table."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4801
+#: libraries/server_privileges.lib.php:4827
 msgid "You have added a new user."
 msgstr "Yeni istifadəçi əlavə etdiniz."
 
-#: libraries/server_status.lib.php:53
+#: libraries/server_status.lib.php:60
 #, php-format
 msgid "Network traffic since startup: %s"
 msgstr "Başlanğıcdan bəri Şəbəkə trafiki: %s"
 
-#: libraries/server_status.lib.php:66
+#: libraries/server_status.lib.php:73
 #, php-format
 msgid "This MySQL server has been running for %1$s. It started up on %2$s."
 msgstr "Bu MySQL serverin işləmə müddəti: %1$s. Başladığı zaman: %2$s."
 
-#: libraries/server_status.lib.php:80
+#: libraries/server_status.lib.php:94
 msgid ""
 "This MySQL server works as <b>master</b> and <b>slave</b> in <b>replication</"
 "b> process."
 msgstr ""
 
-#: libraries/server_status.lib.php:85
+#: libraries/server_status.lib.php:99
 msgid "This MySQL server works as <b>master</b> in <b>replication</b> process."
 msgstr ""
 
-#: libraries/server_status.lib.php:90
+#: libraries/server_status.lib.php:104
 msgid "This MySQL server works as <b>slave</b> in <b>replication</b> process."
 msgstr ""
 
-#: libraries/server_status.lib.php:106
+#: libraries/server_status.lib.php:116
 msgid "Replication status"
 msgstr ""
 
-#: libraries/server_status.lib.php:137
+#: libraries/server_status.lib.php:146
 msgid ""
 "On a busy server, the byte counters may overrun, so those statistics as "
 "reported by the MySQL server may be incorrect."
 msgstr ""
 
-#: libraries/server_status.lib.php:148
+#: libraries/server_status.lib.php:157
 msgid "Received"
 msgstr "Alındı"
 
-#: libraries/server_status.lib.php:167
+#: libraries/server_status.lib.php:176
 msgid "Sent"
 msgstr "Göndərildi"
 
-#: libraries/server_status.lib.php:234
+#: libraries/server_status.lib.php:243
 #, fuzzy
 #| msgid "Connections"
 msgid "Max. concurrent connections"
 msgstr "Elaqeler"
 
-#: libraries/server_status.lib.php:244
+#: libraries/server_status.lib.php:253
 msgid "Failed attempts"
 msgstr "Uğursuz Cəhdlər"
 
@@ -13512,7 +13528,7 @@ msgstr ""
 msgid "Not implemented yet."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/AlterOperation.php:193
+#: libraries/sql-parser/src/Components/AlterOperation.php:191
 msgid "Unrecognized alter operation."
 msgstr ""
 
@@ -13526,7 +13542,7 @@ msgid "An opening bracket followed by a set of values was expected."
 msgstr ""
 
 #: libraries/sql-parser/src/Components/ArrayObj.php:101
-#: libraries/sql-parser/src/Components/FieldDefinition.php:202
+#: libraries/sql-parser/src/Components/CreateDefinition.php:202
 msgid "An opening bracket was expected."
 msgstr ""
 
@@ -13534,25 +13550,35 @@ msgstr ""
 msgid "A comma or a closing bracket was expected"
 msgstr ""
 
+#: libraries/sql-parser/src/Components/CreateDefinition.php:246
+#, fuzzy
+#| msgid "No tables selected."
+msgid "A comma or a closing bracket was expected."
+msgstr "Heç bir cədvəl seçilməmişdir."
+
+#: libraries/sql-parser/src/Components/CreateDefinition.php:262
+msgid "A closing bracket was expected."
+msgstr ""
+
 #: libraries/sql-parser/src/Components/DataType.php:125
 msgid "Unrecognized data type."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:225
+#: libraries/sql-parser/src/Components/Expression.php:227
 msgid "Unexpected closing bracket."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:246
-#: libraries/sql-parser/src/Components/Expression.php:283
-#: libraries/sql-parser/src/Components/Expression.php:303
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:285
+#: libraries/sql-parser/src/Components/Expression.php:305
 msgid "An alias was previously found."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:257
+#: libraries/sql-parser/src/Components/Expression.php:259
 msgid "Unexpected dot."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:327
+#: libraries/sql-parser/src/Components/Expression.php:329
 #, fuzzy
 #| msgid "No tables selected."
 msgid "An alias was expected."
@@ -13564,16 +13590,6 @@ msgstr "Heç bir cədvəl seçilməmişdir."
 msgid "An expression was expected."
 msgstr "Sütun seçilməmişdir."
 
-#: libraries/sql-parser/src/Components/FieldDefinition.php:246
-#, fuzzy
-#| msgid "No tables selected."
-msgid "A comma or a closing bracket was expected."
-msgstr "Heç bir cədvəl seçilməmişdir."
-
-#: libraries/sql-parser/src/Components/FieldDefinition.php:262
-msgid "A closing bracket was expected."
-msgstr ""
-
 #: libraries/sql-parser/src/Components/Limit.php:90
 #: libraries/sql-parser/src/Components/Limit.php:112
 msgid "An offset was expected."
@@ -13621,29 +13637,29 @@ msgstr ""
 msgid "Expected delimiter."
 msgstr ""
 
-#: libraries/sql-parser/src/Lexer.php:753
+#: libraries/sql-parser/src/Lexer.php:777
 #, fuzzy, php-format
 #| msgid "Event %1$s has been created."
 msgid "Ending quote %1$s was expected."
 msgstr "%1$s hadisəsi yaradıldı."
 
-#: libraries/sql-parser/src/Lexer.php:789
+#: libraries/sql-parser/src/Lexer.php:813
 #, fuzzy
 #| msgid "Table name template"
 msgid "Variable name was expected."
 msgstr "Cədvəl adı şablonu"
 
-#: libraries/sql-parser/src/Parser.php:380
+#: libraries/sql-parser/src/Parser.php:391
 #, fuzzy
 #| msgid "At Beginning of Table"
 msgid "Unexpected beginning of statement."
 msgstr "Cədvəlin başına"
 
-#: libraries/sql-parser/src/Parser.php:399
+#: libraries/sql-parser/src/Parser.php:410
 msgid "Unrecognized statement type."
 msgstr ""
 
-#: libraries/sql-parser/src/Parser.php:479
+#: libraries/sql-parser/src/Parser.php:489
 msgid "No transaction was previously started."
 msgstr ""
 
@@ -13673,8 +13689,10 @@ msgid "The name of the entity was expected."
 msgstr "Açıq olan cədvəl sayı."
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:310
-msgid "At least one field definition was expected."
-msgstr ""
+#, fuzzy
+#| msgid "The row has been deleted."
+msgid "At least one column definition was expected."
+msgstr "Sətir silindi."
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:329
 msgid "A \"RETURNS\" keyword was expected."
@@ -13733,25 +13751,25 @@ msgstr "Əlfəcin yaradıla bilmədi!"
 msgid "Using bookmark \"%s\" as default browse query."
 msgstr ""
 
-#: libraries/sql.lib.php:1306
+#: libraries/sql.lib.php:1300
 msgid "Showing as PHP code"
 msgstr "PHP kodu olaraq göstərilir"
 
-#: libraries/sql.lib.php:1638
+#: libraries/sql.lib.php:1632
 #, php-format
 msgid ""
 "Current selection does not contain a unique column. Grid edit, checkbox, "
 "Edit, Copy and Delete features are not available. %s"
 msgstr ""
 
-#: libraries/sql.lib.php:1649
+#: libraries/sql.lib.php:1643
 #, php-format
 msgid ""
 "Current selection does not contain a unique column. Grid edit, Edit, Copy "
 "and Delete features may result in undesired behavior. %s"
 msgstr ""
 
-#: libraries/sql.lib.php:1688
+#: libraries/sql.lib.php:1682
 #, php-format
 msgid "Problems with indexes of table `%s`"
 msgstr "`%s` cədvəlinin indeksləri ilə əlaqəli problemlər"
@@ -13913,7 +13931,7 @@ msgid "Version %s snapshot (SQL code)"
 msgstr ""
 
 #: libraries/tracking.lib.php:947
-#: templates/structure/table_structure_row.phtml:33
+#: templates/table/structure/table_structure_row.phtml:33
 msgctxt "None for default"
 msgid "None"
 msgstr "Heç biri"
@@ -13965,17 +13983,17 @@ msgstr "Server versiyası"
 msgid "Version %1$s was created, tracking for %2$s is active."
 msgstr ""
 
-#: libraries/user_preferences.inc.php:29
+#: libraries/user_preferences.inc.php:30
 msgid "Manage your settings"
 msgstr "Tənzimləmələrinizi idarə edin"
 
-#: libraries/user_preferences.inc.php:46 prefs_manage.php:307
+#: libraries/user_preferences.inc.php:54 prefs_manage.php:307
 #, fuzzy
 #| msgid "Modifications have been saved"
 msgid "Configuration has been saved."
 msgstr "Modifications have been saved"
 
-#: libraries/user_preferences.inc.php:66
+#: libraries/user_preferences.inc.php:74
 #, php-format
 msgid ""
 "Your preferences will be saved for current session only. Storing them "
@@ -14371,7 +14389,7 @@ msgid "first"
 msgstr "İlk"
 
 #: templates/columns_definitions/move_column.phtml:12
-#: templates/structure/add_column.phtml:21
+#: templates/table/structure/add_column.phtml:21
 #, php-format
 msgid "after %s"
 msgstr "%s sonrasına"
@@ -14454,211 +14472,307 @@ msgstr "Daxil edilən transformasiyaları"
 msgid "Input transformation options"
 msgstr "Transformasiya variantları"
 
-#: templates/designer/aggregate_query_panel.phtml:22
-#: templates/designer/options_panel.phtml:100
+#: templates/database/create_table.phtml:7
+#: templates/database/designer/side_menu.phtml:77
+#: templates/database/designer/side_menu.phtml:80
+msgid "Create table"
+msgstr "Cədvəl yarat"
+
+#: templates/database/create_table.phtml:15
+msgid "Number of columns"
+msgstr "Sütun sayı"
+
+#: templates/database/designer/aggregate_query_panel.phtml:22
+#: templates/database/designer/options_panel.phtml:100
 #, fuzzy
 #| msgid "Create"
 msgid "Aggregate"
 msgstr "Qur"
 
-#: templates/designer/aggregate_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:61
-#: templates/designer/options_panel.phtml:106
-#: templates/designer/options_panel.phtml:170
-#: templates/designer/where_query_panel.phtml:30
-#: templates/table/table_header.phtml:9
+#: templates/database/designer/aggregate_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:61
+#: templates/database/designer/options_panel.phtml:106
+#: templates/database/designer/options_panel.phtml:170
+#: templates/database/designer/where_query_panel.phtml:30
+#: templates/table/search/table_header.phtml:9
 msgid "Operator"
 msgstr "Operator"
 
-#: templates/designer/database_tables.phtml:29
+#: templates/database/designer/database_tables.phtml:29
 msgid "Toggle"
 msgstr ""
 
-#: templates/designer/database_tables.phtml:40
+#: templates/database/designer/database_tables.phtml:40
 #, fuzzy
 #| msgid "Table structure"
 msgid "See table structure"
 msgstr "Cədvəl strukturu"
 
-#: templates/designer/delete_relation_panel.phtml:21
+#: templates/database/designer/delete_relation_panel.phtml:21
 msgid "Delete relation"
 msgstr ""
 
-#: templates/designer/edit_delete_pages.phtml:7
+#: templates/database/designer/edit_delete_pages.phtml:7
 msgid "Page to open"
 msgstr "Açmaq üçün Səhifə"
 
-#: templates/designer/edit_delete_pages.phtml:7
+#: templates/database/designer/edit_delete_pages.phtml:7
 msgid "Page to delete"
 msgstr "Silmək üçün səhifə"
 
-#: templates/designer/having_query_panel.phtml:90
-#: templates/designer/options_panel.phtml:63
-#: templates/designer/options_panel.phtml:229
-#: templates/designer/where_query_panel.phtml:59
+#: templates/database/designer/having_query_panel.phtml:90
+#: templates/database/designer/options_panel.phtml:63
+#: templates/database/designer/options_panel.phtml:229
+#: templates/database/designer/where_query_panel.phtml:59
 msgid "Except"
 msgstr "Xaric"
 
-#: templates/designer/having_query_panel.phtml:102
-#: templates/designer/options_panel.phtml:75
-#: templates/designer/options_panel.phtml:241
-#: templates/designer/where_query_panel.phtml:71
+#: templates/database/designer/having_query_panel.phtml:102
+#: templates/database/designer/options_panel.phtml:75
+#: templates/database/designer/options_panel.phtml:241
+#: templates/database/designer/where_query_panel.phtml:71
 msgid "subquery"
 msgstr "alt sorğu"
 
-#: templates/designer/new_relation_panel.phtml:22
-#: templates/designer/side_menu.phtml:84 templates/designer/side_menu.phtml:87
+#: templates/database/designer/new_relation_panel.phtml:22
+#: templates/database/designer/side_menu.phtml:84
+#: templates/database/designer/side_menu.phtml:87
 msgid "Create relation"
 msgstr ""
 
-#: templates/designer/options_panel.phtml:34
-#: templates/designer/options_panel.phtml:200
+#: templates/database/designer/options_panel.phtml:34
+#: templates/database/designer/options_panel.phtml:200
 #, fuzzy
 msgid "Relation operator"
 msgstr "Relation view"
 
-#: templates/designer/options_panel.phtml:85
-#: templates/designer/rename_to_panel.phtml:23
+#: templates/database/designer/options_panel.phtml:85
+#: templates/database/designer/rename_to_panel.phtml:23
 #, fuzzy
 msgid "Rename to"
 msgstr "Cedveli yeniden adlandır"
 
-#: templates/designer/options_panel.phtml:91
-#: templates/designer/rename_to_panel.phtml:31
+#: templates/database/designer/options_panel.phtml:91
+#: templates/database/designer/rename_to_panel.phtml:31
 msgid "New name"
 msgstr "Yeni ad"
 
-#: templates/designer/page_save_as.phtml:4
+#: templates/database/designer/page_save_as.phtml:4
 msgid "Save to selected page"
 msgstr "Seçilən səhifəni yaddaşa ver"
 
-#: templates/designer/page_save_as.phtml:5
+#: templates/database/designer/page_save_as.phtml:5
 msgid "Create a page and save to it"
 msgstr "Səhifə yarat və ona yaddaşa ver"
 
-#: templates/designer/page_save_as.phtml:26
+#: templates/database/designer/page_save_as.phtml:26
 msgid "New page name"
 msgstr "Yeni səhifə adı"
 
-#: templates/designer/page_selector.phtml:2
+#: templates/database/designer/page_selector.phtml:2
 msgid "Select page"
 msgstr "Səhifə Seç"
 
-#: templates/designer/query_details.phtml:10
+#: templates/database/designer/query_details.phtml:10
 msgid "Active options"
 msgstr "Aktiv seçimlər"
 
-#: templates/designer/schema_export.phtml:4
+#: templates/database/designer/schema_export.phtml:4
 msgid "Select Export Relational Type"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:19 templates/designer/side_menu.phtml:25
+#: templates/database/designer/side_menu.phtml:19
+#: templates/database/designer/side_menu.phtml:25
 msgid "Show/Hide tables list"
 msgstr "Cədvəl siyahısını göstər/gizlə"
 
-#: templates/designer/side_menu.phtml:29 templates/designer/side_menu.phtml:35
-#: templates/designer/side_menu.phtml:36
+#: templates/database/designer/side_menu.phtml:29
+#: templates/database/designer/side_menu.phtml:35
+#: templates/database/designer/side_menu.phtml:36
 msgid "View in fullscreen"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:34
+#: templates/database/designer/side_menu.phtml:34
 msgid "Exit fullscreen"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:41 templates/designer/side_menu.phtml:45
+#: templates/database/designer/side_menu.phtml:41
+#: templates/database/designer/side_menu.phtml:45
 msgid "New page"
 msgstr "Yeni Səhifə"
 
-#: templates/designer/side_menu.phtml:70 templates/designer/side_menu.phtml:73
+#: templates/database/designer/side_menu.phtml:70
+#: templates/database/designer/side_menu.phtml:73
 #, fuzzy
 #| msgid "Select All"
 msgid "Delete pages"
 msgstr "Hamısını Seç"
 
-#: templates/designer/side_menu.phtml:77 templates/designer/side_menu.phtml:80
-#: templates/table/create_table.phtml:7
-msgid "Create table"
-msgstr "Cədvəl yarat"
-
-#: templates/designer/side_menu.phtml:98
-#: templates/designer/side_menu.phtml:101
+#: templates/database/designer/side_menu.phtml:98
+#: templates/database/designer/side_menu.phtml:101
 msgid "Reload"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:107
-#: templates/designer/side_menu.phtml:110
+#: templates/database/designer/side_menu.phtml:107
+#: templates/database/designer/side_menu.phtml:110
 msgid "Help"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Angular links"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Direct links"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:122
-#: templates/designer/side_menu.phtml:124
+#: templates/database/designer/side_menu.phtml:122
+#: templates/database/designer/side_menu.phtml:124
 msgid "Snap to grid"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:128
-#: templates/designer/side_menu.phtml:134
+#: templates/database/designer/side_menu.phtml:128
+#: templates/database/designer/side_menu.phtml:134
 msgid "Small/Big All"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:138
-#: templates/designer/side_menu.phtml:141
+#: templates/database/designer/side_menu.phtml:138
+#: templates/database/designer/side_menu.phtml:141
 msgid "Toggle small/big"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:145
-#: templates/designer/side_menu.phtml:148
+#: templates/database/designer/side_menu.phtml:145
+#: templates/database/designer/side_menu.phtml:148
 #, fuzzy
 #| msgid "Traditional Chinese"
 msgid "Toggle relation lines"
 msgstr "Enenevi Çin Dili"
 
-#: templates/designer/side_menu.phtml:153
-#: templates/designer/side_menu.phtml:156
+#: templates/database/designer/side_menu.phtml:153
+#: templates/database/designer/side_menu.phtml:156
 #, fuzzy
 #| msgid "Export"
 msgid "Export schema"
 msgstr "Eksport"
 
-#: templates/designer/side_menu.phtml:165
-#: templates/designer/side_menu.phtml:168
+#: templates/database/designer/side_menu.phtml:165
+#: templates/database/designer/side_menu.phtml:168
 msgid "Build Query"
 msgstr "Sorğu yarat"
 
-#: templates/designer/side_menu.phtml:173
-#: templates/designer/side_menu.phtml:177
+#: templates/database/designer/side_menu.phtml:173
+#: templates/database/designer/side_menu.phtml:177
 msgid "Move Menu"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:181
-#: templates/designer/side_menu.phtml:186
+#: templates/database/designer/side_menu.phtml:181
+#: templates/database/designer/side_menu.phtml:186
 #, fuzzy
 #| msgid "Partial texts"
 msgid "Pin text"
 msgstr "Qismi Mətnlər"
 
-#: templates/designer/table_list.phtml:4
+#: templates/database/designer/table_list.phtml:4
 msgid "Hide/Show all"
 msgstr "Hamısını Göstər/Gizlət"
 
-#: templates/designer/table_list.phtml:14
+#: templates/database/designer/table_list.phtml:14
 msgid "Hide/Show Tables with no relation"
 msgstr ""
 
-#: templates/designer/table_list.phtml:59
+#: templates/database/designer/table_list.phtml:59
 msgid "Number of tables:"
 msgstr "Cədvəl sayı:"
 
+#: templates/database/structure/body_for_table_summary.phtml:6
+#, php-format
+msgid "%s table"
+msgid_plural "%s tables"
+msgstr[0] "%s cədvəl"
+msgstr[1] "%s cədvəl"
+
+#: templates/database/structure/body_for_table_summary.phtml:17
+msgid "Sum"
+msgstr "Cəmi"
+
+#: templates/database/structure/check_all_tables.phtml:6
+msgid "Check tables having overhead"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:10
+msgid "Show create"
+msgstr "Yaradılmanı göstər"
+
+#: templates/database/structure/check_all_tables.phtml:27
+#, fuzzy
+#| msgid "Add prefix"
+msgid "Prefix"
+msgstr "Prefiks əlavə et"
+
+#: templates/database/structure/check_all_tables.phtml:28
+msgid "Add prefix to table"
+msgstr "Cədvələ prefiks əlavə et"
+
+#: templates/database/structure/check_all_tables.phtml:29
+msgid "Replace table prefix"
+msgstr "Cədvəl prefiksini dəyiş"
+
+#: templates/database/structure/check_all_tables.phtml:30
+msgid "Copy table with prefix"
+msgstr "Cədvəli prefiks ilə birgə kopyala"
+
+#: templates/database/structure/check_all_tables.phtml:36
+msgid "Add columns to central list"
+msgstr "Sütunları orta siyahıya əlavə et"
+
+#: templates/database/structure/check_all_tables.phtml:37
+msgid "Remove columns from central list"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:38
+#, fuzzy
+msgid "Make consistent with central list"
+msgstr "Orta siyahı ilə uyğun elə"
+
+#: templates/database/structure/favorite_anchor.phtml:12
+msgid "Add to Favorites"
+msgstr "Favoritlərə əlavə et"
+
+#: templates/database/structure/show_create.phtml:2
+msgid "Showing create queries"
+msgstr "Yaradılmış sorğular göstərilir"
+
+#: templates/database/structure/sortable_header.phtml:13
+msgid "Sort"
+msgstr "Sırala"
+
+#: templates/database/structure/table_header.phtml:42
+msgid ""
+"May be approximate. Click on the number to get the exact count. See "
+"[doc@faq3-11]FAQ 3.11[/doc]."
+msgstr ""
+
+#: templates/database/structure/table_header.phtml:66
+#: templates/table/index_form.phtml:127
+msgid "Size"
+msgstr "Boy"
+
+#: templates/database/structure/table_header.phtml:74
+#: templates/table/structure/display_table_stats.phtml:27
+msgid "Overhead"
+msgstr "Aşma dəyəri"
+
+#: templates/database/structure/tracking_icon.phtml:4
+msgid "Tracking is active."
+msgstr ""
+
+#: templates/database/structure/tracking_icon.phtml:8
+msgid "Tracking is not active."
+msgstr "İzləmə aktiv deyil."
+
 #: templates/error/report_form.phtml:7
 msgid ""
 "phpMyAdmin has encountered an error. We have collected data about this error "
@@ -14674,68 +14788,6 @@ msgstr ""
 msgid "Please explain the steps that lead to the error:"
 msgstr "Zəhmət olmasa xətaya səbəb olan addımları açıqlayın:"
 
-#: templates/gis_visualization/gis_visualization.phtml:3
-msgid "Display GIS Visualization"
-msgstr ""
-
-#: templates/gis_visualization/gis_visualization.phtml:8
-#, fuzzy
-#| msgid "Add/Delete Field Columns"
-msgid "Label column"
-msgstr "Sahe Sütunlarını Elave Et/Sil"
-
-#: templates/gis_visualization/gis_visualization.phtml:11
-msgid "-- None --"
-msgstr ""
-
-#: templates/gis_visualization/gis_visualization.phtml:19
-msgid "Spatial column"
-msgstr "Fəza sütunu"
-
-#: templates/index_form.phtml:16
-msgid "Index name:"
-msgstr "İndex adı&nbsp;:"
-
-#: templates/index_form.phtml:19
-msgid ""
-"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
-msgstr ""
-"\"PRIMARY\" <b>sadəcə</b> birinci dərəcəli açarın adı <b>olmalıdır</b>!"
-
-#: templates/index_form.phtml:40
-#, fuzzy
-#| msgid "Index cache size"
-msgid "Index choice:"
-msgstr "Indeks keş ölçüsü"
-
-#: templates/index_form.phtml:57
-msgid "Key block size:"
-msgstr ""
-
-#: templates/index_form.phtml:74
-msgid "Index type:"
-msgstr "İndex tipi&nbsp;:"
-
-#: templates/index_form.phtml:86
-#, fuzzy
-#| msgid "User:"
-msgid "Parser:"
-msgstr "İstifadəçi:"
-
-#: templates/index_form.phtml:102
-msgid "Comment:"
-msgstr "Şərh:"
-
-#: templates/index_form.phtml:127 templates/structure/table_header.phtml:66
-msgid "Size"
-msgstr "Boy"
-
-#: templates/index_form.phtml:149 templates/index_form.phtml:190
-#, fuzzy
-#| msgid "Drag to reorder."
-msgid "Drag to reorder"
-msgstr "Yenidən düzənləmək üçün sürükləyin."
-
 #: templates/prefs_autoload.phtml:9
 msgid ""
 "Your browser has phpMyAdmin configuration for this domain. Would you like to "
@@ -14746,367 +14798,159 @@ msgstr ""
 msgid "Start row:"
 msgstr "Başlanğıc sətri:"
 
-#: templates/structure/actions_in_table_structure.phtml:14
-#, php-format
-msgid "A primary key has been added on %s."
-msgstr "%s üzərinə Birinci Dərəcəli Açar əlavə edildi."
-
-#: templates/structure/actions_in_table_structure.phtml:34
-#: templates/structure/actions_in_table_structure.phtml:54
-#: templates/structure/actions_in_table_structure.phtml:79
-#: templates/structure/actions_in_table_structure.phtml:101
-#, php-format
-msgid "An index has been added on %s."
-msgstr "%s üzərinə indeks əlavə edildi."
-
-#: templates/structure/actions_in_table_structure.phtml:130
-#: templates/structure/check_all_table_column.phtml:59
-#, fuzzy
-msgid "Remove from central columns"
-msgstr "Cedveli yeniden adlandır"
-
-#: templates/structure/actions_in_table_structure.phtml:138
-#: templates/structure/check_all_table_column.phtml:55
-msgid "Add to central columns"
-msgstr "Orta siyahılara əlavə et"
-
-#: templates/structure/add_column.phtml:7
-#, php-format
-msgid "Add %s column(s)"
-msgstr "%s sütunu əlavə et"
-
-#: templates/structure/add_column.phtml:12
-#, fuzzy
-#| msgid "At Beginning of Table"
-msgid "at beginning of table"
-msgstr "Cədvəlin başına"
-
-#: templates/structure/body_for_table_summary.phtml:6
-#, php-format
-msgid "%s table"
-msgid_plural "%s tables"
-msgstr[0] "%s cədvəl"
-msgstr[1] "%s cədvəl"
-
-#: templates/structure/body_for_table_summary.phtml:17
-msgid "Sum"
-msgstr "Cəmi"
-
-#: templates/structure/check_all_tables.phtml:6
-msgid "Check tables having overhead"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:10
-msgid "Show create"
-msgstr "Yaradılmanı göstər"
-
-#: templates/structure/check_all_tables.phtml:27
-#, fuzzy
-#| msgid "Add prefix"
-msgid "Prefix"
-msgstr "Prefiks əlavə et"
-
-#: templates/structure/check_all_tables.phtml:28
-msgid "Add prefix to table"
-msgstr "Cədvələ prefiks əlavə et"
-
-#: templates/structure/check_all_tables.phtml:29
-msgid "Replace table prefix"
-msgstr "Cədvəl prefiksini dəyiş"
-
-#: templates/structure/check_all_tables.phtml:30
-msgid "Copy table with prefix"
-msgstr "Cədvəli prefiks ilə birgə kopyala"
-
-#: templates/structure/check_all_tables.phtml:36
-msgid "Add columns to central list"
-msgstr "Sütunları orta siyahıya əlavə et"
-
-#: templates/structure/check_all_tables.phtml:37
-msgid "Remove columns from central list"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:38
-#, fuzzy
-msgid "Make consistent with central list"
-msgstr "Orta siyahı ilə uyğun elə"
-
-#: templates/structure/display_structure.phtml:140 view_create.php:181
-msgid "Edit view"
-msgstr "Redaktə görünuşü"
-
-#: templates/structure/display_table_stats.phtml:9
-msgid "Space usage"
-msgstr "Yer istifadəsi"
-
-#: templates/structure/display_table_stats.phtml:27
-#: templates/structure/table_header.phtml:74
-msgid "Overhead"
-msgstr "Aşma dəyəri"
-
-#: templates/structure/display_table_stats.phtml:32
-msgid "Effective"
-msgstr "Effektiv"
-
-#: templates/structure/favorite_anchor.phtml:12
-msgid "Add to Favorites"
-msgstr "Favoritlərə əlavə et"
-
-#: templates/structure/move_columns_dialog.phtml:1
-#: templates/structure/optional_action_links.phtml:21
-msgid "Move columns"
-msgstr "Sütunları köçür(move)"
-
-#: templates/structure/move_columns_dialog.phtml:2
-msgid "Move the columns by dragging them up and down."
-msgstr ""
-
-#: templates/structure/optional_action_links.phtml:9
-msgid "Propose table structure"
-msgstr "Cədvəl strukturu təklif et"
-
-#: templates/structure/optional_action_links.phtml:24
-msgid "Improve table structure"
-msgstr "Cədvəl strukturunu yaxşılaşdır"
-
-#: templates/structure/optional_action_links.phtml:30
-msgid "Track view"
-msgstr "İzləmə görünüşü"
-
-#: templates/structure/row_stats_table.phtml:3
-msgid "Row statistics"
-msgstr "Sətir Statistikası"
-
-#: templates/structure/row_stats_table.phtml:9
-msgid "static"
-msgstr "statik"
-
-#: templates/structure/row_stats_table.phtml:11
-msgid "dynamic"
-msgstr "dinamik"
-
-#: templates/structure/row_stats_table.phtml:22
-msgid "partitioned"
-msgstr "bölündü"
-
-#: templates/structure/row_stats_table.phtml:54
-msgid "Row length"
-msgstr "Sıra uzunluğu"
-
-#: templates/structure/row_stats_table.phtml:66
-msgid "Row size"
-msgstr "Sıra boyu"
-
-#: templates/structure/row_stats_table.phtml:73
-msgid "Next autoindex"
-msgstr "Növbəti avtoindeks"
-
-#: templates/structure/secondary_tabs.phtml:14
-#, fuzzy
-#| msgid "Relational key"
-msgid "Relation view"
-msgstr "Əlaqəli açar"
-
-#: templates/structure/show_create.phtml:2
-msgid "Showing create queries"
-msgstr "Yaradılmış sorğular göstərilir"
-
-#: templates/structure/sortable_header.phtml:13
-msgid "Sort"
-msgstr "Sırala"
-
-#: templates/structure/table_header.phtml:42
-msgid ""
-"May be approximate. Click on the number to get the exact count. See "
-"[doc@faq3-11]FAQ 3.11[/doc]."
-msgstr ""
-
-#: templates/structure/table_structure_row.phtml:46
-#, php-format
-msgid "Column %s has been dropped."
-msgstr "%s sütunu ləğv edildi."
-
-#: templates/structure/tracking_icon.phtml:4
-msgid "Tracking is active."
-msgstr ""
-
-#: templates/structure/tracking_icon.phtml:8
-msgid "Tracking is not active."
-msgstr "İzləmə aktiv deyil."
-
-#: templates/table/create_table.phtml:15
-msgid "Number of columns"
-msgstr "Sütun sayı"
-
-#: templates/table/options.phtml:8
-msgid "Select columns (at least one):"
-msgstr "Sütunları seçin (ən az birini):"
-
-#: templates/table/options.phtml:37
-msgid "Add search conditions (body of the \"where\" clause):"
-msgstr "Axtarış şərtlərini əlavə edin (\"where\" ifadəsinin əsas mətni):"
-
-#: templates/table/options.phtml:45
-msgid "Number of rows per page"
-msgstr "Hər səhifədəki sətir sayı"
-
-#: templates/table/options.phtml:56
-msgid "Display order:"
-msgstr "Görünüş sırası:"
-
-#: templates/table/options_zoom.phtml:6
-msgid "Use this column to label each point"
-msgstr ""
-
-#: templates/table/options_zoom.phtml:35
-msgid "Maximum rows to plot"
-msgstr ""
-
-#: templates/table/replace_preview.phtml:13
-msgid "Find and replace - preview"
-msgstr "Tap və dəyişdir - önizləməsi"
-
-#: templates/table/replace_preview.phtml:18
-msgid "Original string"
-msgstr "Orjinal sətir"
-
-#: templates/table/replace_preview.phtml:19
-msgid "Replaced string"
-msgstr "Dəyişdirilmiş sətir"
-
-#: templates/table/replace_preview.phtml:40
-msgid "Replace"
-msgstr "Dəyişdir"
-
-#: templates/table/rows_zoom.phtml:16
-msgid "Additional search criteria"
-msgstr "Əlavə axtarış kriteriyası"
-
-#: templates/table/search_and_replace.phtml:3
-msgid "Replace with:"
-msgstr "Bununla dəyişdir:"
-
-#: templates/table/search_and_replace.phtml:22
-msgid "Use regular expression"
-msgstr "Requlyar ifadə (regular expression) istifadə et"
-
-#: templates/table/selection_form.phtml:12
-msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
-msgstr "İki fərqli sütun üçün \"nümunə ilə sorğu\" (wildcard: \"%\")"
-
-#: templates/table/selection_form.phtml:34
-msgid "Do a \"query by example\" (wildcard: \"%\")"
-msgstr "\"Nümunəyə görə sorğu\" göndərin (xüsusi işarə: \"%\")"
-
-#: templates/table/zoom_result_form.phtml:7
-msgid "Browse/Edit the points"
-msgstr ""
-
-#: templates/table/zoom_result_form.phtml:15
-msgid "How to use"
-msgstr "Necə istifadə etmək lazımdır"
-
-#: templates/table/zoom_result_form.phtml:23
-#, fuzzy
-#| msgid "Reset"
-msgid "Reset zoom"
-msgstr "Fokuslanmanı sıfırla"
-
-#: templates/tbl_chart.phtml:17
+#: templates/table/chart/tbl_chart.phtml:17
 msgctxt "Chart type"
 msgid "Bar"
 msgstr "Çubuq"
 
-#: templates/tbl_chart.phtml:21
+#: templates/table/chart/tbl_chart.phtml:21
 msgctxt "Chart type"
 msgid "Column"
 msgstr "Sütun"
 
-#: templates/tbl_chart.phtml:25
+#: templates/table/chart/tbl_chart.phtml:25
 msgctxt "Chart type"
 msgid "Line"
 msgstr "Xətt"
 
-#: templates/tbl_chart.phtml:29
+#: templates/table/chart/tbl_chart.phtml:29
 msgctxt "Chart type"
 msgid "Spline"
 msgstr "Əyri"
 
-#: templates/tbl_chart.phtml:33
+#: templates/table/chart/tbl_chart.phtml:33
 msgctxt "Chart type"
 msgid "Area"
 msgstr "Sahə"
 
-#: templates/tbl_chart.phtml:37
+#: templates/table/chart/tbl_chart.phtml:37
 msgctxt "Chart type"
 msgid "Pie"
 msgstr "Dairəvi diaqram"
 
-#: templates/tbl_chart.phtml:41
+#: templates/table/chart/tbl_chart.phtml:41
 msgctxt "Chart type"
 msgid "Timeline"
 msgstr "Vaxt qrafiki"
 
-#: templates/tbl_chart.phtml:45
+#: templates/table/chart/tbl_chart.phtml:45
 msgctxt "Chart type"
 msgid "Scatter"
 msgstr ""
 
-#: templates/tbl_chart.phtml:50
+#: templates/table/chart/tbl_chart.phtml:50
 msgid "Stacked"
 msgstr ""
 
-#: templates/tbl_chart.phtml:53
+#: templates/table/chart/tbl_chart.phtml:53
 msgid "Chart title"
 msgstr "Diaqram başlığı"
 
-#: templates/tbl_chart.phtml:57
+#: templates/table/chart/tbl_chart.phtml:57
 msgid "X-Axis:"
 msgstr "X-Oxu:"
 
-#: templates/tbl_chart.phtml:72
+#: templates/table/chart/tbl_chart.phtml:72
 msgid "Series:"
 msgstr "Ardıcıllıq:"
 
-#: templates/tbl_chart.phtml:102
+#: templates/table/chart/tbl_chart.phtml:102
 msgid "X-Axis label:"
 msgstr "X-Oxu nişanı:"
 
-#: templates/tbl_chart.phtml:104
+#: templates/table/chart/tbl_chart.phtml:104
 msgid "X Values"
 msgstr "X Dəyəri"
 
-#: templates/tbl_chart.phtml:107
+#: templates/table/chart/tbl_chart.phtml:107
 msgid "Y-Axis label:"
 msgstr "Y-Oxu nişanı:"
 
-#: templates/tbl_chart.phtml:115
+#: templates/table/chart/tbl_chart.phtml:115
 msgid "Series names are in a column"
 msgstr ""
 
-#: templates/tbl_chart.phtml:118
+#: templates/table/chart/tbl_chart.phtml:118
 msgid "Series column:"
 msgstr "Ardıcıllıq sütunu:"
 
-#: templates/tbl_chart.phtml:130
+#: templates/table/chart/tbl_chart.phtml:130
 #, fuzzy
 #| msgid "Value column:"
 msgid "Value Column:"
 msgstr "Qiymət sütunu:"
 
-#: templates/tbl_chart.phtml:150
+#: templates/table/chart/tbl_chart.phtml:150
 msgid "Save chart as image"
 msgstr "Diaqramı şəkil olaraq yaddaşa ver"
 
-#: templates/tbl_relation/common_form.phtml:7
+#: templates/table/gis_visualization/gis_visualization.phtml:3
+msgid "Display GIS Visualization"
+msgstr ""
+
+#: templates/table/gis_visualization/gis_visualization.phtml:8
+#, fuzzy
+#| msgid "Add/Delete Field Columns"
+msgid "Label column"
+msgstr "Sahe Sütunlarını Elave Et/Sil"
+
+#: templates/table/gis_visualization/gis_visualization.phtml:11
+msgid "-- None --"
+msgstr ""
+
+#: templates/table/gis_visualization/gis_visualization.phtml:19
+msgid "Spatial column"
+msgstr "Fəza sütunu"
+
+#: templates/table/index_form.phtml:16
+msgid "Index name:"
+msgstr "İndex adı&nbsp;:"
+
+#: templates/table/index_form.phtml:19
+msgid ""
+"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
+msgstr ""
+"\"PRIMARY\" <b>sadəcə</b> birinci dərəcəli açarın adı <b>olmalıdır</b>!"
+
+#: templates/table/index_form.phtml:40
+#, fuzzy
+#| msgid "Index cache size"
+msgid "Index choice:"
+msgstr "Indeks keş ölçüsü"
+
+#: templates/table/index_form.phtml:57
+msgid "Key block size:"
+msgstr ""
+
+#: templates/table/index_form.phtml:74
+msgid "Index type:"
+msgstr "İndex tipi&nbsp;:"
+
+#: templates/table/index_form.phtml:86
+#, fuzzy
+#| msgid "User:"
+msgid "Parser:"
+msgstr "İstifadəçi:"
+
+#: templates/table/index_form.phtml:102
+msgid "Comment:"
+msgstr "Şərh:"
+
+#: templates/table/index_form.phtml:149 templates/table/index_form.phtml:190
+#, fuzzy
+#| msgid "Drag to reorder."
+msgid "Drag to reorder"
+msgstr "Yenidən düzənləmək üçün sürükləyin."
+
+#: templates/table/relation/common_form.phtml:7
 msgid "Internal relations"
 msgstr "Daxili əlaqələr"
 
-#: templates/tbl_relation/common_form.phtml:11
+#: templates/table/relation/common_form.phtml:11
 msgid "Internal relation"
 msgstr "Daxili əlaqə"
 
-#: templates/tbl_relation/common_form.phtml:14
+#: templates/table/relation/common_form.phtml:14
 msgid ""
 "An internal relation is not necessary when a corresponding FOREIGN KEY "
 "relation exists."
@@ -15114,57 +14958,238 @@ msgstr ""
 "FOREIGN KEY bağlantısının yerini tutan bir bağlantı varkən daxili bağlantı "
 "yaratmaq mümkün deyildir."
 
-#: templates/tbl_relation/common_form.phtml:37
+#: templates/table/relation/common_form.phtml:37
 msgid "Foreign key constraints"
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:40
+#: templates/table/relation/common_form.phtml:40
 msgid "Actions"
 msgstr "Fəaliyyətlər"
 
-#: templates/tbl_relation/common_form.phtml:41
+#: templates/table/relation/common_form.phtml:41
 #, fuzzy
 #| msgid "Column names"
 msgid "Constraint properties"
 msgstr "Sütun adları"
 
-#: templates/tbl_relation/common_form.phtml:44
+#: templates/table/relation/common_form.phtml:44
 msgid ""
 "Only columns with index will be displayed. You can define an index below."
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:49
+#: templates/table/relation/common_form.phtml:49
 msgid "Foreign key constraint"
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:81
+#: templates/table/relation/common_form.phtml:81
 #, fuzzy
 #| msgid "Add a linestring"
 msgid "+ Add constraint"
 msgstr "Sətir sırası əlavə et"
 
-#: templates/tbl_relation/common_form.phtml:91
+#: templates/table/relation/common_form.phtml:91
 msgid "Choose column to display:"
 msgstr "Göstərmək üçün sütun seçin:"
 
-#: templates/tbl_relation/foreign_key_row.phtml:13
+#: templates/table/relation/foreign_key_row.phtml:13
 #, fuzzy, php-format
 #| msgid "Field %s has been dropped."
 msgid "Foreign key constraint %s has been dropped"
 msgstr "%s sahesi leğv edildi"
 
-#: templates/tbl_relation/foreign_key_row.phtml:102
+#: templates/table/relation/foreign_key_row.phtml:102
 #, fuzzy
 #| msgid "Column names"
 msgid "Constraint name"
 msgstr "Sütun adları"
 
-#: templates/tbl_relation/foreign_key_row.phtml:157
+#: templates/table/relation/foreign_key_row.phtml:157
 #, fuzzy
 #| msgid "Add column"
 msgid "+ Add column"
 msgstr "Sütun əlavə et"
 
+#: templates/table/search/options.phtml:8
+msgid "Select columns (at least one):"
+msgstr "Sütunları seçin (ən az birini):"
+
+#: templates/table/search/options.phtml:37
+msgid "Add search conditions (body of the \"where\" clause):"
+msgstr "Axtarış şərtlərini əlavə edin (\"where\" ifadəsinin əsas mətni):"
+
+#: templates/table/search/options.phtml:45
+msgid "Number of rows per page"
+msgstr "Hər səhifədəki sətir sayı"
+
+#: templates/table/search/options.phtml:56
+msgid "Display order:"
+msgstr "Görünüş sırası:"
+
+#: templates/table/search/options_zoom.phtml:6
+msgid "Use this column to label each point"
+msgstr ""
+
+#: templates/table/search/options_zoom.phtml:35
+msgid "Maximum rows to plot"
+msgstr ""
+
+#: templates/table/search/replace_preview.phtml:13
+msgid "Find and replace - preview"
+msgstr "Tap və dəyişdir - önizləməsi"
+
+#: templates/table/search/replace_preview.phtml:18
+msgid "Original string"
+msgstr "Orjinal sətir"
+
+#: templates/table/search/replace_preview.phtml:19
+msgid "Replaced string"
+msgstr "Dəyişdirilmiş sətir"
+
+#: templates/table/search/replace_preview.phtml:40
+msgid "Replace"
+msgstr "Dəyişdir"
+
+#: templates/table/search/rows_zoom.phtml:16
+msgid "Additional search criteria"
+msgstr "Əlavə axtarış kriteriyası"
+
+#: templates/table/search/search_and_replace.phtml:3
+msgid "Replace with:"
+msgstr "Bununla dəyişdir:"
+
+#: templates/table/search/search_and_replace.phtml:22
+msgid "Use regular expression"
+msgstr "Requlyar ifadə (regular expression) istifadə et"
+
+#: templates/table/search/selection_form.phtml:12
+msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
+msgstr "İki fərqli sütun üçün \"nümunə ilə sorğu\" (wildcard: \"%\")"
+
+#: templates/table/search/selection_form.phtml:34
+msgid "Do a \"query by example\" (wildcard: \"%\")"
+msgstr "\"Nümunəyə görə sorğu\" göndərin (xüsusi işarə: \"%\")"
+
+#: templates/table/search/zoom_result_form.phtml:7
+msgid "Browse/Edit the points"
+msgstr ""
+
+#: templates/table/search/zoom_result_form.phtml:15
+msgid "How to use"
+msgstr "Necə istifadə etmək lazımdır"
+
+#: templates/table/search/zoom_result_form.phtml:23
+#, fuzzy
+#| msgid "Reset"
+msgid "Reset zoom"
+msgstr "Fokuslanmanı sıfırla"
+
+#: templates/table/secondary_tabs.phtml:14
+#, fuzzy
+#| msgid "Relational key"
+msgid "Relation view"
+msgstr "Əlaqəli açar"
+
+#: templates/table/structure/actions_in_table_structure.phtml:14
+#, php-format
+msgid "A primary key has been added on %s."
+msgstr "%s üzərinə Birinci Dərəcəli Açar əlavə edildi."
+
+#: templates/table/structure/actions_in_table_structure.phtml:34
+#: templates/table/structure/actions_in_table_structure.phtml:54
+#: templates/table/structure/actions_in_table_structure.phtml:79
+#: templates/table/structure/actions_in_table_structure.phtml:101
+#, php-format
+msgid "An index has been added on %s."
+msgstr "%s üzərinə indeks əlavə edildi."
+
+#: templates/table/structure/actions_in_table_structure.phtml:130
+#: templates/table/structure/check_all_table_column.phtml:59
+#, fuzzy
+msgid "Remove from central columns"
+msgstr "Cedveli yeniden adlandır"
+
+#: templates/table/structure/actions_in_table_structure.phtml:138
+#: templates/table/structure/check_all_table_column.phtml:55
+msgid "Add to central columns"
+msgstr "Orta siyahılara əlavə et"
+
+#: templates/table/structure/add_column.phtml:7
+#, php-format
+msgid "Add %s column(s)"
+msgstr "%s sütunu əlavə et"
+
+#: templates/table/structure/add_column.phtml:12
+#, fuzzy
+#| msgid "At Beginning of Table"
+msgid "at beginning of table"
+msgstr "Cədvəlin başına"
+
+#: templates/table/structure/display_structure.phtml:140 view_create.php:181
+msgid "Edit view"
+msgstr "Redaktə görünuşü"
+
+#: templates/table/structure/display_table_stats.phtml:9
+msgid "Space usage"
+msgstr "Yer istifadəsi"
+
+#: templates/table/structure/display_table_stats.phtml:32
+msgid "Effective"
+msgstr "Effektiv"
+
+#: templates/table/structure/move_columns_dialog.phtml:1
+#: templates/table/structure/optional_action_links.phtml:21
+msgid "Move columns"
+msgstr "Sütunları köçür(move)"
+
+#: templates/table/structure/move_columns_dialog.phtml:2
+msgid "Move the columns by dragging them up and down."
+msgstr ""
+
+#: templates/table/structure/optional_action_links.phtml:9
+msgid "Propose table structure"
+msgstr "Cədvəl strukturu təklif et"
+
+#: templates/table/structure/optional_action_links.phtml:24
+msgid "Improve table structure"
+msgstr "Cədvəl strukturunu yaxşılaşdır"
+
+#: templates/table/structure/optional_action_links.phtml:30
+msgid "Track view"
+msgstr "İzləmə görünüşü"
+
+#: templates/table/structure/row_stats_table.phtml:3
+msgid "Row statistics"
+msgstr "Sətir Statistikası"
+
+#: templates/table/structure/row_stats_table.phtml:9
+msgid "static"
+msgstr "statik"
+
+#: templates/table/structure/row_stats_table.phtml:11
+msgid "dynamic"
+msgstr "dinamik"
+
+#: templates/table/structure/row_stats_table.phtml:22
+msgid "partitioned"
+msgstr "bölündü"
+
+#: templates/table/structure/row_stats_table.phtml:54
+msgid "Row length"
+msgstr "Sıra uzunluğu"
+
+#: templates/table/structure/row_stats_table.phtml:66
+msgid "Row size"
+msgstr "Sıra boyu"
+
+#: templates/table/structure/row_stats_table.phtml:73
+msgid "Next autoindex"
+msgstr "Növbəti avtoindeks"
+
+#: templates/table/structure/table_structure_row.phtml:46
+#, php-format
+msgid "Column %s has been dropped."
+msgstr "%s sütunu ləğv edildi."
+
 #: themes.php:17 themes.php:22
 msgid "Theme"
 msgstr ""
diff --git a/po/be.po b/po/be.po
index 510a8861dc..04bbb829f2 100644
--- a/po/be.po
+++ b/po/be.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 4.5.0-dev\n"
 "Report-Msgid-Bugs-To: developers@phpmyadmin.net\n"
-"POT-Creation-Date: 2015-08-08 13:53-0400\n"
+"POT-Creation-Date: 2015-08-12 08:10-0400\n"
 "PO-Revision-Date: 2015-05-15 14:28+0200\n"
 "Last-Translator: Viktar Palstsiuk <vipals@gmail.com>\n"
 "Language-Team: Belarusian <https://hosted.weblate.org/projects/phpmyadmin/"
@@ -54,7 +54,7 @@ msgid "Table comments:"
 msgstr "Камэнтар да табліцы:"
 
 #: db_datadict.php:104 libraries/Index.class.php:699
-#: libraries/insert_edit.lib.php:1567
+#: libraries/insert_edit.lib.php:1565
 #: libraries/navigation/Nodes/Node_Column.class.php:30
 #: libraries/plugins/export/ExportHtmlword.class.php:280
 #: libraries/plugins/export/ExportHtmlword.class.php:375
@@ -68,13 +68,14 @@ msgstr "Камэнтар да табліцы:"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1023
 #: libraries/tracking.lib.php:879 libraries/tracking.lib.php:975
 #: templates/columns_definitions/column_name.phtml:18
-#: templates/index_form.phtml:124 templates/table/table_header.phtml:6
-#: templates/table/zoom_result_form.phtml:33
-#: templates/tbl_relation/common_form.phtml:10
-#: templates/tbl_relation/common_form.phtml:43
-#: templates/tbl_relation/foreign_key_row.phtml:194
-#: templates/tbl_relation/foreign_key_row.phtml:206
-#: templates/tbl_relation/internal_relational_row.phtml:71
+#: templates/table/index_form.phtml:124
+#: templates/table/relation/common_form.phtml:10
+#: templates/table/relation/common_form.phtml:43
+#: templates/table/relation/foreign_key_row.phtml:194
+#: templates/table/relation/foreign_key_row.phtml:206
+#: templates/table/relation/internal_relational_row.phtml:71
+#: templates/table/search/table_header.phtml:6
+#: templates/table/search/zoom_result_form.phtml:33
 msgid "Column"
 msgstr "Калонка"
 
@@ -92,21 +93,21 @@ msgstr "Калонка"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1001
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1024
 #: libraries/rte/rte_list.lib.php:75 libraries/rte/rte_list.lib.php:103
-#: libraries/rte/rte_routines.lib.php:802
-#: libraries/rte/rte_routines.lib.php:831
-#: libraries/rte/rte_routines.lib.php:1493
+#: libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_routines.lib.php:922
+#: libraries/rte/rte_routines.lib.php:1584
 #: libraries/server_privileges.lib.php:2369 libraries/tracking.lib.php:880
 #: libraries/tracking.lib.php:972
 #: templates/columns_definitions/table_fields_definitions.phtml:11
-#: templates/structure/table_header.phtml:48
-#: templates/structure/table_structure_header.phtml:6
-#: templates/table/table_header.phtml:7
+#: templates/database/structure/table_header.phtml:48
+#: templates/table/search/table_header.phtml:7
+#: templates/table/structure/table_structure_header.phtml:6
 msgid "Type"
 msgstr "Тып"
 
 #: db_datadict.php:106 libraries/Index.class.php:702
 #: libraries/central_columns.lib.php:708
-#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1576
+#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1574
 #: libraries/plugins/export/ExportHtmlword.class.php:286
 #: libraries/plugins/export/ExportHtmlword.class.php:381
 #: libraries/plugins/export/ExportLatex.class.php:509
@@ -119,8 +120,8 @@ msgstr "Тып"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1026
 #: libraries/tracking.lib.php:882 libraries/tracking.lib.php:978
 #: templates/columns_definitions/table_fields_definitions.phtml:39
-#: templates/structure/table_structure_header.phtml:9
-#: templates/table/zoom_result_form.phtml:34
+#: templates/table/search/zoom_result_form.phtml:34
+#: templates/table/structure/table_structure_header.phtml:9
 msgid "Null"
 msgstr "Нуль"
 
@@ -138,8 +139,8 @@ msgstr "Нуль"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1027
 #: libraries/replication_gui.lib.php:153 libraries/tracking.lib.php:883
 #: templates/columns_definitions/table_fields_definitions.phtml:25
-#: templates/structure/body_for_table_summary.phtml:55
-#: templates/structure/table_structure_header.phtml:10
+#: templates/database/structure/body_for_table_summary.phtml:55
+#: templates/table/structure/table_structure_header.phtml:10
 msgid "Default"
 msgstr "Па змоўчаньні"
 
@@ -167,19 +168,19 @@ msgid "Comments"
 msgstr "Камэнтары"
 
 #: db_datadict.php:146
-#: libraries/controllers/StructureController.class.php:1960
-#: libraries/controllers/StructureController.class.php:1965
+#: libraries/controllers/TableStructureController.class.php:951
+#: libraries/controllers/TableStructureController.class.php:956
 #: libraries/tracking.lib.php:922
 #: templates/columns_definitions/column_indexes.phtml:6
-#: templates/structure/check_all_table_column.phtml:22
-#: templates/structure/display_structure.phtml:74
+#: templates/table/structure/check_all_table_column.phtml:22
+#: templates/table/structure/display_structure.phtml:74
 msgid "Primary"
 msgstr "Першасны"
 
 #: db_datadict.php:156 js/messages.php:317 libraries/Index.class.php:567
 #: libraries/Index.class.php:606 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261 libraries/mult_submits.lib.php:403
+#: libraries/config/FormDisplay.tpl.php:272 libraries/mult_submits.lib.php:403
 #: libraries/mult_submits.lib.php:417
 #: libraries/plugins/export/ExportHtmlword.class.php:630
 #: libraries/plugins/export/ExportLatex.class.php:589
@@ -195,20 +196,20 @@ msgstr "Першасны"
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1010 libraries/tracking.lib.php:1015
 #: prefs_manage.php:140 templates/prefs_autoload.phtml:15
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "No"
 msgstr "Не"
 
 #: db_datadict.php:156 js/messages.php:443 libraries/Index.class.php:568
 #: libraries/Index.class.php:605 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261
-#: libraries/controllers/StructureController.class.php:1344
-#: libraries/controllers/StructureController.class.php:2223
-#: libraries/controllers/StructureController.class.php:2232
-#: libraries/controllers/StructureController.class.php:2237
-#: libraries/controllers/StructureController.class.php:2242
-#: libraries/controllers/StructureController.class.php:2247
+#: libraries/config/FormDisplay.tpl.php:272
+#: libraries/controllers/TableStructureController.class.php:539
+#: libraries/controllers/TableStructureController.class.php:1201
+#: libraries/controllers/TableStructureController.class.php:1210
+#: libraries/controllers/TableStructureController.class.php:1215
+#: libraries/controllers/TableStructureController.class.php:1220
+#: libraries/controllers/TableStructureController.class.php:1225
 #: libraries/mult_submits.inc.php:82 libraries/mult_submits.inc.php:178
 #: libraries/mult_submits.lib.php:339 libraries/mult_submits.lib.php:372
 #: libraries/mult_submits.lib.php:401 libraries/mult_submits.lib.php:415
@@ -217,8 +218,8 @@ msgstr "Не"
 #: libraries/plugins/export/ExportOdt.class.php:756
 #: libraries/plugins/export/ExportTexytext.class.php:567
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1077
-#: libraries/server_databases.lib.php:464
-#: libraries/server_databases.lib.php:474
+#: libraries/server_databases.lib.php:475
+#: libraries/server_databases.lib.php:485
 #: libraries/server_privileges.lib.php:2546
 #: libraries/server_privileges.lib.php:2727
 #: libraries/server_privileges.lib.php:2748
@@ -228,7 +229,7 @@ msgstr "Не"
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1008 libraries/tracking.lib.php:1013
 #: prefs_manage.php:138 templates/prefs_autoload.phtml:14
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "Yes"
 msgstr "Так"
 
@@ -238,7 +239,7 @@ msgstr "Праглядзець дамп (схему) базы дадзеных"
 
 #: db_export.php:37 db_tracking.php:90 export.php:382
 #: libraries/DBQbe.class.php:326
-#: libraries/controllers/StructureController.class.php:231
+#: libraries/controllers/DatabaseStructureController.class.php:170
 #: libraries/navigation/NavigationTree.class.php:897
 msgid "No tables found in database."
 msgstr "У базе дадзеных табліц ня выяўлена."
@@ -249,14 +250,14 @@ msgstr "У базе дадзеных табліц ня выяўлена."
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:26
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:120
-#: templates/structure/show_create.phtml:18
+#: templates/database/structure/show_create.phtml:18
 msgid "Tables"
 msgstr "Табліц"
 
 #: db_export.php:52 libraries/Menu.class.php:317 libraries/Menu.class.php:425
-#: libraries/Util.class.php:3333 libraries/Util.class.php:3343
-#: libraries/Util.class.php:3349 libraries/Util.class.php:3629
-#: libraries/Util.class.php:4327 libraries/Util.class.php:4344
+#: libraries/Util.class.php:3339 libraries/Util.class.php:3349
+#: libraries/Util.class.php:3355 libraries/Util.class.php:3635
+#: libraries/Util.class.php:4333 libraries/Util.class.php:4350
 #: libraries/central_columns.lib.php:728 libraries/config.values.php:39
 #: libraries/config.values.php:47 libraries/config.values.php:109
 #: libraries/config.values.php:115 libraries/config/setup.forms.php:323
@@ -270,7 +271,7 @@ msgstr "Табліц"
 #: libraries/navigation/Nodes/Node_Table.class.php:283
 #: libraries/server_privileges.lib.php:1141 libraries/tracking.lib.php:874
 #: templates/columns_definitions/table_fields_definitions.phtml:3
-#: templates/designer/table_list.phtml:28
+#: templates/database/designer/table_list.phtml:28
 msgid "Structure"
 msgstr "Структура"
 
@@ -282,7 +283,7 @@ msgstr "Структура"
 #: libraries/config/user_preferences.forms.php:292
 #: libraries/config/user_preferences.forms.php:297
 #: libraries/server_privileges.lib.php:1140
-#: templates/structure/display_table_stats.phtml:12
+#: templates/table/structure/display_table_stats.phtml:12
 msgid "Data"
 msgstr "Дадзеныя"
 
@@ -359,10 +360,10 @@ msgstr "Праверыць табліцу"
 #: libraries/server_privileges.lib.php:2908
 #: libraries/server_privileges.lib.php:3145
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4346
-#: templates/structure/table_header.phtml:21
-#: templates/tbl_relation/foreign_key_row.phtml:176
-#: templates/tbl_relation/internal_relational_row.phtml:63
+#: libraries/server_privileges.lib.php:4372
+#: templates/database/structure/table_header.phtml:21
+#: templates/table/relation/foreign_key_row.phtml:176
+#: templates/table/relation/internal_relational_row.phtml:63
 msgid "Table"
 msgstr "Табліца"
 
@@ -381,7 +382,7 @@ msgid "Updated"
 msgstr ""
 
 #: db_tracking.php:130 js/messages.php:243 libraries/Menu.class.php:552
-#: libraries/Util.class.php:4314 libraries/config.values.php:104
+#: libraries/Util.class.php:4320 libraries/config.values.php:104
 #: libraries/rte/rte_events.lib.php:393 libraries/rte/rte_list.lib.php:101
 #: libraries/server_status_processes.lib.php:92 libraries/tracking.lib.php:279
 msgid "Status"
@@ -390,14 +391,15 @@ msgstr "Стан"
 #: db_tracking.php:131 db_tracking.php:290 libraries/Index.class.php:693
 #: libraries/central_columns.lib.php:687 libraries/rte/rte_list.lib.php:74
 #: libraries/rte/rte_list.lib.php:89 libraries/rte/rte_list.lib.php:102
-#: libraries/server_databases.lib.php:398
+#: libraries/server_databases.lib.php:409
 #: libraries/server_privileges.lib.php:2372
 #: libraries/server_privileges.lib.php:3166
 #: libraries/server_privileges.lib.php:3342
 #: libraries/server_user_groups.lib.php:82
 #: libraries/server_variables.lib.php:189 libraries/tracking.lib.php:280
-#: libraries/tracking.lib.php:793 templates/structure/table_header.phtml:30
-#: templates/structure/table_structure_header.phtml:23
+#: libraries/tracking.lib.php:793
+#: templates/database/structure/table_header.phtml:30
+#: templates/table/structure/table_structure_header.phtml:23
 msgid "Action"
 msgstr "Дзеяньне"
 
@@ -444,7 +446,7 @@ msgid "Untracked tables"
 msgstr "Праверыць табліцу"
 
 #: db_tracking.php:305 db_tracking.php:336
-#: templates/structure/optional_action_links.phtml:17
+#: templates/table/structure/optional_action_links.phtml:17
 #, fuzzy
 msgid "Track table"
 msgstr "Праверыць табліцу"
@@ -500,7 +502,7 @@ msgid "Value for the column \"%s\""
 msgstr ""
 
 #: gis_data_editor.php:146
-#: templates/gis_visualization/gis_visualization.phtml:37
+#: templates/table/gis_visualization/gis_visualization.phtml:37
 msgid "Use OpenStreetMaps as Base Layer"
 msgstr ""
 
@@ -591,35 +593,35 @@ msgstr "Дадаць новага карыстальніка"
 #: libraries/display_change_password.lib.php:162
 #: libraries/display_export.lib.php:402 libraries/display_export.lib.php:408
 #: libraries/display_import.lib.php:392 libraries/index.lib.php:44
-#: libraries/insert_edit.lib.php:1546 libraries/insert_edit.lib.php:1583
+#: libraries/insert_edit.lib.php:1544 libraries/insert_edit.lib.php:1581
 #: libraries/normalization.lib.php:165 libraries/normalization.lib.php:821
 #: libraries/operations.lib.php:38 libraries/operations.lib.php:108
 #: libraries/operations.lib.php:263 libraries/operations.lib.php:306
 #: libraries/operations.lib.php:801 libraries/operations.lib.php:874
 #: libraries/operations.lib.php:923 libraries/operations.lib.php:1337
 #: libraries/operations.lib.php:1658
-#: libraries/plugins/auth/AuthenticationCookie.class.php:244
+#: libraries/plugins/auth/AuthenticationCookie.class.php:232
 #: libraries/replication_gui.lib.php:122 libraries/replication_gui.lib.php:161
 #: libraries/replication_gui.lib.php:324 libraries/replication_gui.lib.php:461
 #: libraries/replication_gui.lib.php:906 libraries/rte/rte_events.lib.php:509
-#: libraries/rte/rte_routines.lib.php:969
-#: libraries/rte/rte_routines.lib.php:1581
+#: libraries/rte/rte_routines.lib.php:1060
+#: libraries/rte/rte_routines.lib.php:1672
 #: libraries/rte/rte_triggers.lib.php:396 libraries/server_bin_log.lib.php:61
 #: libraries/server_privileges.lib.php:705
 #: libraries/server_privileges.lib.php:2106
 #: libraries/server_privileges.lib.php:2872
 #: libraries/server_privileges.lib.php:3553
-#: libraries/server_privileges.lib.php:4627
+#: libraries/server_privileges.lib.php:4653
 #: libraries/server_user_groups.lib.php:285
 #: libraries/sql_query_form.lib.php:369 libraries/sql_query_form.lib.php:429
 #: libraries/tracking.lib.php:533 libraries/tracking.lib.php:653
 #: prefs_manage.php:277 prefs_manage.php:355
 #: templates/columns_definitions/column_definitions_form.phtml:59
-#: templates/header_location.phtml:17 templates/index_form.phtml:238
+#: templates/database/create_table.phtml:21 templates/header_location.phtml:28
 #: templates/startAndNumberOfRowsPanel.phtml:14
-#: templates/structure/add_column.phtml:25
-#: templates/table/create_table.phtml:21
-#: templates/table/selection_form.phtml:75 view_create.php:275
+#: templates/table/index_form.phtml:238
+#: templates/table/search/selection_form.phtml:75
+#: templates/table/structure/add_column.phtml:25 view_create.php:275
 #: view_operations.php:106
 msgid "Go"
 msgstr "Панеслася"
@@ -716,7 +718,7 @@ msgid "Could not load import plugins, please check your installation!"
 msgstr ""
 "Немагчыма загрузіць плагіны імпартаваньня, калі ласка, праверце ўсталёўку!"
 
-#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1466
+#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1460
 #, fuzzy, php-format
 #| msgid "Bookmark %s created"
 msgid "Bookmark %s has been created."
@@ -759,12 +761,12 @@ msgstr ""
 msgid "Back"
 msgstr "Назад"
 
-#: index.php:148 libraries/Footer.class.php:70
+#: index.php:149 libraries/Footer.class.php:70
 #, fuzzy
 msgid "phpMyAdmin Demo Server"
 msgstr "Дакумэнтацыя па phpMyAdmin"
 
-#: index.php:152
+#: index.php:153
 #, php-format
 msgid ""
 "You are using the demo server. You can do anything here, but please do not "
@@ -772,49 +774,49 @@ msgid ""
 "at %s."
 msgstr ""
 
-#: index.php:162
+#: index.php:163
 #, fuzzy
 #| msgid "General relation features"
 msgid "General Settings"
 msgstr "Магчымасьці асноўных сувязяў"
 
-#: index.php:190 libraries/display_change_password.lib.php:50
+#: index.php:191 libraries/display_change_password.lib.php:50
 #: libraries/display_change_password.lib.php:53 user_password.php:247
 msgid "Change password"
 msgstr "Зьмяніць пароль"
 
-#: index.php:206
+#: index.php:207
 #, fuzzy
 #| msgid "MySQL connection collation"
 msgid "Server connection collation"
 msgstr "Супастаўленьне падлучэньня да MySQL"
 
-#: index.php:228
+#: index.php:229
 msgid "Appearance Settings"
 msgstr ""
 
-#: index.php:258 prefs_manage.php:285
+#: index.php:259 prefs_manage.php:285
 #, fuzzy
 #| msgid "General relation features"
 msgid "More settings"
 msgstr "Магчымасьці асноўных сувязяў"
 
-#: index.php:279
+#: index.php:280
 #, fuzzy
 #| msgid "Database for user"
 msgid "Database server"
 msgstr "База дадзеных для карыстальніка"
 
-#: index.php:282 libraries/plugins/auth/AuthenticationCookie.class.php:181
+#: index.php:283 libraries/plugins/auth/AuthenticationCookie.class.php:169
 msgid "Server:"
 msgstr "Сэрвэр:"
 
-#: index.php:286
+#: index.php:287
 #, fuzzy
 msgid "Server type:"
 msgstr "ID сэрвэра"
 
-#: index.php:290 libraries/plugins/export/ExportLatex.class.php:212
+#: index.php:291 libraries/plugins/export/ExportLatex.class.php:212
 #: libraries/plugins/export/ExportSql.class.php:687
 #: libraries/plugins/export/ExportXml.class.php:189
 #, fuzzy
@@ -822,87 +824,87 @@ msgstr "ID сэрвэра"
 msgid "Server version:"
 msgstr "Вэрсія сэрвэра"
 
-#: index.php:296
+#: index.php:297
 #, fuzzy
 #| msgid "Protocol version"
 msgid "Protocol version:"
 msgstr "Вэрсія пратаколу"
 
-#: index.php:300
+#: index.php:301
 #, fuzzy
 #| msgid "User"
 msgid "User:"
 msgstr "Карыстальнік"
 
-#: index.php:305
+#: index.php:306
 #, fuzzy
 msgid "Server charset:"
 msgstr "Выбар сэрвэра"
 
-#: index.php:320
+#: index.php:321
 msgid "Web server"
 msgstr "Вэб-сэрвэр"
 
-#: index.php:331
+#: index.php:332
 #, fuzzy
 msgid "Database client version:"
 msgstr "Вэрсія кліента MySQL"
 
-#: index.php:335
+#: index.php:336
 #, fuzzy
 #| msgid "PHP extension"
 msgid "PHP extension:"
 msgstr "Пашырэньне PHP"
 
-#: index.php:349
+#: index.php:350
 #, fuzzy
 #| msgid "PHP Version"
 msgid "PHP version:"
 msgstr "Вэрсія PHP"
 
-#: index.php:360
+#: index.php:361
 msgid "Show PHP information"
 msgstr "Паказаць інфармацыю пра PHP"
 
-#: index.php:383
+#: index.php:384
 #, fuzzy
 #| msgid "Version information"
 msgid "Version information:"
 msgstr "Інфармацыя пра вэрсію"
 
-#: index.php:392 libraries/Util.class.php:432 libraries/Util.class.php:495
-#: libraries/config/FormDisplay.tpl.php:151
+#: index.php:393 libraries/Util.class.php:432 libraries/Util.class.php:495
+#: libraries/config/FormDisplay.tpl.php:162
 #: libraries/display_export.lib.php:577 libraries/engines/pbxt.lib.php:162
 #: libraries/navigation/NavigationHeader.class.php:196
 #: libraries/server_variables.lib.php:160
 msgid "Documentation"
 msgstr "Дакумэнтацыя"
 
-#: index.php:399
+#: index.php:400
 msgid "Wiki"
 msgstr "Wiki"
 
-#: index.php:408
+#: index.php:409
 msgid "Official Homepage"
 msgstr "Афіцыйная старонка phpMyAdmin"
 
-#: index.php:415
+#: index.php:416
 #, fuzzy
 #| msgid "Attributes"
 msgid "Contribute"
 msgstr "Атрыбуты"
 
-#: index.php:422
+#: index.php:423
 msgid "Get support"
 msgstr ""
 
-#: index.php:429
+#: index.php:430
 #, fuzzy
 #| msgid "No change"
 msgid "List of changes"
 msgstr "Няма зьменаў"
 
-#: index.php:451
+#: index.php:452
 #, fuzzy
 #| msgid ""
 #| "Your configuration file contains settings (root with no password) that "
@@ -921,7 +923,7 @@ msgstr ""
 "зьнешняга ўрываньня, і таму вам абавязкова трэба выправіць гэтую хібу ў "
 "бясьпецы."
 
-#: index.php:468
+#: index.php:469
 msgid ""
 "You have enabled mbstring.func_overload in your PHP configuration. This "
 "option is incompatible with phpMyAdmin and might cause some data to be "
@@ -930,7 +932,7 @@ msgstr ""
 "Вы ўключылі mbstring.func_overload у вашым канфігурацыйным файле PHP. Гэтая "
 "опцыя несумяшчальная з phpMyAdmin і можа выклікаць пашкоджаньне дадзеных!"
 
-#: index.php:483
+#: index.php:484
 msgid ""
 "The mbstring PHP extension was not found and you seem to be using a "
 "multibyte charset. Without the mbstring extension phpMyAdmin is unable to "
@@ -940,7 +942,7 @@ msgstr ""
 "шматбайтавую кадыроўку. Без пашырэньня mbstring phpMyAdmin ня можа падзяляць "
 "радкі карэктна, і гэта можа прывесьці да нечаканых вынікаў."
 
-#: index.php:500
+#: index.php:501
 msgid ""
 "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini."
 "session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower than "
@@ -948,18 +950,18 @@ msgid ""
 "expire sooner than configured in phpMyAdmin."
 msgstr ""
 
-#: index.php:519
+#: index.php:520
 msgid ""
 "Login cookie store is lower than cookie validity configured in phpMyAdmin, "
 "because of this, your login will expire sooner than configured in phpMyAdmin."
 msgstr ""
 
-#: index.php:535
+#: index.php:536
 msgid "The configuration file now needs a secret passphrase (blowfish_secret)."
 msgstr ""
 "Канфігурацыйнаму файлу зараз патрэбная сакрэтная фраза (blowfish_secret)."
 
-#: index.php:548
+#: index.php:549
 msgid ""
 "Directory [code]config[/code], which is used by the setup script, still "
 "exists in your phpMyAdmin directory. It is strongly recommended to remove it "
@@ -967,7 +969,7 @@ msgid ""
 "may be compromised by unauthorized people downloading your configuration."
 msgstr ""
 
-#: index.php:564
+#: index.php:565
 #, fuzzy, php-format
 #| msgid ""
 #| " additional features for working with linked tables have been ctivated. "
@@ -979,12 +981,12 @@ msgstr ""
 "Дадатковыя магчымасьці работы з зьвязанымі табліцамі былі адключаныя. Каб "
 "высьветліць чаму, націсьніце %sтут%s."
 
-#: index.php:571
+#: index.php:572
 msgid ""
 "Or alternately go to 'Operations' tab of any database to set it up there."
 msgstr ""
 
-#: index.php:620
+#: index.php:621
 #, php-format
 msgid ""
 "Your PHP MySQL library version %s differs from your MySQL server version %s. "
@@ -993,7 +995,7 @@ msgstr ""
 "Вэрсія вашай бібліятэкі MySQL для PHP %s адрозьніваецца ад вэрсіі вашага "
 "сэрвэра MySQL %s. Гэта можа выклікаць непрадказальныя паводзіны."
 
-#: index.php:648
+#: index.php:649
 #, php-format
 msgid ""
 "Server running with Suhosin. Please refer to %sdocumentation%s for possible "
@@ -1167,8 +1169,8 @@ msgstr ""
 msgid "Save & Close"
 msgstr "Захаваць як файл"
 
-#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:404
-#: libraries/insert_edit.lib.php:1550 prefs_manage.php:361
+#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:415
+#: libraries/insert_edit.lib.php:1548 prefs_manage.php:361
 #: prefs_manage.php:372
 msgid "Reset"
 msgstr "Скінуць"
@@ -1213,7 +1215,7 @@ msgstr "Дадаць новае поле"
 msgid "Edit Index"
 msgstr "Рэдагаваць наступны радок"
 
-#: js/messages.php:99 templates/index_form.phtml:232
+#: js/messages.php:99 templates/table/index_form.phtml:232
 #, fuzzy, php-format
 #| msgid "Add %s field(s)"
 msgid "Add %s column(s) to index"
@@ -1243,15 +1245,16 @@ msgstr "Палі ўзятыя ў"
 msgid "Please select column(s) for the index."
 msgstr "Дадаць %s новыя палі"
 
-#: js/messages.php:106 templates/structure/add_column.phtml:1
+#: js/messages.php:106 templates/table/structure/add_column.phtml:1
 #, fuzzy
 #| msgid "You have to add at least one field."
 msgid "You have to add at least one column."
 msgstr "Трэба дадаць прынамсі адно поле."
 
-#: js/messages.php:109 libraries/insert_edit.lib.php:1548
+#: js/messages.php:109 libraries/insert_edit.lib.php:1546
 #: templates/columns_definitions/column_definitions_form.phtml:162
-#: templates/index_form.phtml:237 templates/tbl_relation/common_form.phtml:106
+#: templates/table/index_form.phtml:237
+#: templates/table/relation/common_form.phtml:106
 msgid "Preview SQL"
 msgstr ""
 
@@ -1274,7 +1277,7 @@ msgid "SQL query:"
 msgstr "SQL-запыт"
 
 #. l10n: Default label for the y-Axis of Charts
-#: js/messages.php:118 templates/tbl_chart.phtml:109
+#: js/messages.php:118 templates/table/chart/tbl_chart.phtml:109
 #, fuzzy
 #| msgid "Value"
 msgid "Y Values"
@@ -1455,7 +1458,7 @@ msgstr ""
 msgid "Bytes received"
 msgstr "Атрымана"
 
-#: js/messages.php:169 libraries/server_status.lib.php:226
+#: js/messages.php:169 libraries/server_status.lib.php:235
 msgid "Connections"
 msgstr "Падлучэньні"
 
@@ -1514,12 +1517,12 @@ msgstr "%s табліц(ы)"
 msgid "Questions"
 msgstr "Пэрсыдзкая"
 
-#: js/messages.php:184 libraries/server_status.lib.php:134
+#: js/messages.php:184 libraries/server_status.lib.php:143
 msgid "Traffic"
 msgstr "Трафік"
 
 #: js/messages.php:185 libraries/Menu.class.php:586
-#: libraries/Util.class.php:4318 libraries/server_status_monitor.lib.php:257
+#: libraries/Util.class.php:4324 libraries/server_status_monitor.lib.php:257
 #, fuzzy
 #| msgid "General relation features"
 msgid "Settings"
@@ -1543,8 +1546,9 @@ msgstr ""
 #: libraries/server_status_monitor.lib.php:236
 #: libraries/server_status_processes.lib.php:308
 #: templates/columns_definitions/transformation.phtml:4
-#: templates/designer/options_panel.phtml:178
-#: templates/table/options_zoom.phtml:12 templates/table/rows_zoom.phtml:26
+#: templates/database/designer/options_panel.phtml:178
+#: templates/table/search/options_zoom.phtml:12
+#: templates/table/search/rows_zoom.phtml:26
 msgid "None"
 msgstr "Няма"
 
@@ -1848,8 +1852,8 @@ msgstr ""
 
 #: js/messages.php:270 libraries/Menu.class.php:352
 #: libraries/Menu.class.php:455 libraries/Menu.class.php:582
-#: libraries/Util.class.php:4317 libraries/Util.class.php:4332
-#: libraries/Util.class.php:4349 libraries/config/messages.inc.php:258
+#: libraries/Util.class.php:4323 libraries/Util.class.php:4338
+#: libraries/Util.class.php:4355 libraries/config/messages.inc.php:258
 #: libraries/display_import.lib.php:105
 #: libraries/server_status_monitor.lib.php:318 prefs_manage.php:238
 #: setup/frames/menu.inc.php:26
@@ -1920,13 +1924,13 @@ msgid "Formatting SQL..."
 msgstr ""
 
 #: js/messages.php:293 libraries/server_variables.lib.php:157
-#: templates/designer/aggregate_query_panel.phtml:63
-#: templates/designer/delete_relation_panel.phtml:28
-#: templates/designer/having_query_panel.phtml:117
-#: templates/designer/new_relation_panel.phtml:88
-#: templates/designer/options_panel.phtml:253
-#: templates/designer/rename_to_panel.phtml:45
-#: templates/designer/where_query_panel.phtml:83
+#: templates/database/designer/aggregate_query_panel.phtml:63
+#: templates/database/designer/delete_relation_panel.phtml:28
+#: templates/database/designer/having_query_panel.phtml:117
+#: templates/database/designer/new_relation_panel.phtml:88
+#: templates/database/designer/options_panel.phtml:253
+#: templates/database/designer/rename_to_panel.phtml:45
+#: templates/database/designer/where_query_panel.phtml:83
 msgid "Cancel"
 msgstr "Скасаваць"
 
@@ -1936,7 +1940,7 @@ msgstr "Скасаваць"
 msgid "Page-related settings"
 msgstr "Магчымасьці асноўных сувязяў"
 
-#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:402
+#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:413
 msgid "Apply"
 msgstr ""
 
@@ -1974,8 +1978,8 @@ msgstr ""
 msgid "Error text: %s"
 msgstr ""
 
-#: js/messages.php:307 libraries/db_common.inc.php:68
-#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:450
+#: js/messages.php:307 libraries/db_common.inc.php:69
+#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:461
 msgid "No databases selected."
 msgstr "Ня выбраная база дадзеных."
 
@@ -1987,12 +1991,13 @@ msgstr ""
 msgid "Adding Primary Key"
 msgstr ""
 
-#: js/messages.php:310 templates/designer/aggregate_query_panel.phtml:59
-#: templates/designer/having_query_panel.phtml:113
-#: templates/designer/new_relation_panel.phtml:87
-#: templates/designer/options_panel.phtml:252
-#: templates/designer/rename_to_panel.phtml:41
-#: templates/designer/where_query_panel.phtml:82
+#: js/messages.php:310
+#: templates/database/designer/aggregate_query_panel.phtml:59
+#: templates/database/designer/having_query_panel.phtml:113
+#: templates/database/designer/new_relation_panel.phtml:87
+#: templates/database/designer/options_panel.phtml:252
+#: templates/database/designer/rename_to_panel.phtml:41
+#: templates/database/designer/where_query_panel.phtml:82
 msgid "OK"
 msgstr "OK"
 
@@ -2018,7 +2023,7 @@ msgstr "Капіяваць базу дадзеных у"
 msgid "Changing Charset"
 msgstr "Кадыроўка"
 
-#: js/messages.php:320 libraries/Util.class.php:3217
+#: js/messages.php:320 libraries/Util.class.php:3223
 #, fuzzy
 #| msgid "Disable foreign key checks"
 msgid "Enable foreign key checks"
@@ -2064,20 +2069,21 @@ msgstr ""
 #: js/messages.php:334 libraries/DisplayResults.class.php:4834
 #: libraries/DisplayResults.class.php:5092 libraries/Menu.class.php:344
 #: libraries/Menu.class.php:446 libraries/Menu.class.php:578
-#: libraries/Util.class.php:3636 libraries/Util.class.php:3637
-#: libraries/Util.class.php:4316 libraries/Util.class.php:4331
-#: libraries/Util.class.php:4348 libraries/config/messages.inc.php:252
+#: libraries/Util.class.php:3642 libraries/Util.class.php:3643
+#: libraries/Util.class.php:4322 libraries/Util.class.php:4337
+#: libraries/Util.class.php:4354 libraries/config/messages.inc.php:252
 #: libraries/display_export.lib.php:173 libraries/rte/rte_list.lib.php:146
 #: libraries/server_privileges.lib.php:2211
 #: libraries/server_privileges.lib.php:2290
 #: libraries/server_privileges.lib.php:2632
 #: libraries/server_privileges.lib.php:3356
 #: libraries/server_status_monitor.lib.php:322 prefs_manage.php:303
-#: setup/frames/menu.inc.php:27 templates/structure/check_all_tables.phtml:11
+#: setup/frames/menu.inc.php:27
+#: templates/database/structure/check_all_tables.phtml:11
 msgid "Export"
 msgstr "Экспарт"
 
-#: js/messages.php:337 libraries/rte/rte_routines.lib.php:652
+#: js/messages.php:337 libraries/rte/rte_routines.lib.php:743
 msgid "ENUM/SET editor"
 msgstr ""
 
@@ -2119,7 +2125,7 @@ msgstr "SQL-запыт"
 #: libraries/Console.class.php:214 libraries/DisplayResults.class.php:3474
 #: libraries/DisplayResults.class.php:4818 libraries/Index.class.php:723
 #: libraries/Util.class.php:706 libraries/Util.class.php:1202
-#: libraries/Util.class.php:3634 libraries/Util.class.php:3635
+#: libraries/Util.class.php:3640 libraries/Util.class.php:3641
 #: libraries/central_columns.lib.php:851
 #: libraries/central_columns.lib.php:1193
 #: libraries/config/messages.inc.php:892
@@ -2137,7 +2143,7 @@ msgstr "Рэдагаваць"
 #: libraries/server_user_groups.lib.php:129
 #: libraries/sql_query_form.lib.php:416 libraries/tracking.lib.php:477
 #: setup/frames/index.inc.php:183 setup/frames/index.inc.php:291
-#: templates/designer/delete_relation_panel.phtml:27
+#: templates/database/designer/delete_relation_panel.phtml:27
 msgid "Delete"
 msgstr "Выдаліць"
 
@@ -2318,11 +2324,11 @@ msgid "No dependencies selected!"
 msgstr "Ня выбраная база дадзеных."
 
 #: js/messages.php:394 libraries/central_columns.lib.php:1214
-#: libraries/insert_edit.lib.php:1458 libraries/server_variables.lib.php:155
+#: libraries/insert_edit.lib.php:1456 libraries/server_variables.lib.php:155
 #: setup/frames/config.inc.php:42 setup/frames/index.inc.php:279
 #: templates/columns_definitions/column_definitions_form.phtml:165
-#: templates/gis_visualization/gis_visualization.phtml:48
-#: templates/tbl_relation/common_form.phtml:107
+#: templates/table/gis_visualization/gis_visualization.phtml:48
+#: templates/table/relation/common_form.phtml:107
 msgid "Save"
 msgstr "Захаваць"
 
@@ -2414,8 +2420,8 @@ msgid "Data point content"
 msgstr "Памер указальніка на дадзеныя"
 
 #: js/messages.php:430 js/messages.php:562 js/messages.php:579
-#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2573
-#: templates/index_form.phtml:154 templates/index_form.phtml:194
+#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2571
+#: templates/table/index_form.phtml:154 templates/table/index_form.phtml:194
 msgid "Ignore"
 msgstr "Ігнараваць"
 
@@ -2478,8 +2484,8 @@ msgstr "Выберыце зьнешні ключ"
 msgid "Please select the primary key or a unique key!"
 msgstr "Калі ласка, выберыце першасны (PRIMARY) альбо ўнікальны ключ (UNIQUE)"
 
-#: js/messages.php:457 templates/designer/side_menu.phtml:91
-#: templates/designer/side_menu.phtml:94
+#: js/messages.php:457 templates/database/designer/side_menu.phtml:91
+#: templates/database/designer/side_menu.phtml:94
 #, fuzzy
 #| msgid "Choose field to display"
 msgid "Choose column to display"
@@ -2497,22 +2503,22 @@ msgstr ""
 msgid "Page name"
 msgstr "Старонка:"
 
-#: js/messages.php:463 templates/designer/side_menu.phtml:56
-#: templates/designer/side_menu.phtml:59
+#: js/messages.php:463 templates/database/designer/side_menu.phtml:56
+#: templates/database/designer/side_menu.phtml:59
 #, fuzzy
 #| msgid "Select All"
 msgid "Save page"
 msgstr "Выбраць усё"
 
-#: js/messages.php:464 templates/designer/side_menu.phtml:63
-#: templates/designer/side_menu.phtml:66
+#: js/messages.php:464 templates/database/designer/side_menu.phtml:63
+#: templates/database/designer/side_menu.phtml:66
 #, fuzzy
 #| msgid "Select All"
 msgid "Save page as"
 msgstr "Выбраць усё"
 
-#: js/messages.php:465 templates/designer/side_menu.phtml:49
-#: templates/designer/side_menu.phtml:52
+#: js/messages.php:465 templates/database/designer/side_menu.phtml:49
+#: templates/database/designer/side_menu.phtml:52
 #, fuzzy
 #| msgid "Free pages"
 msgid "Open page"
@@ -2524,7 +2530,7 @@ msgstr "Вольных старонак"
 msgid "Delete page"
 msgstr "Выбраць усё"
 
-#: js/messages.php:467 templates/designer/side_menu.phtml:10
+#: js/messages.php:467 templates/database/designer/side_menu.phtml:10
 msgid "Untitled"
 msgstr ""
 
@@ -2649,7 +2655,7 @@ msgstr "Першапачатковая пазыцыя"
 msgid "cancel"
 msgstr "Скасаваць"
 
-#: js/messages.php:499 libraries/server_status.lib.php:271
+#: js/messages.php:499 libraries/server_status.lib.php:280
 msgid "Aborted"
 msgstr "Спынена"
 
@@ -3335,7 +3341,7 @@ msgstr "%d не зьяўляецца карэктным нумарам радк
 
 #: js/messages.php:793 libraries/Message.class.php:199
 #: libraries/Util.class.php:654 libraries/core.lib.php:245
-#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1172
+#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1170
 #: tbl_operations.php:229 view_operations.php:63
 msgid "Error"
 msgstr "Памылка"
@@ -3395,8 +3401,8 @@ msgstr "у сэкунду"
 msgid "per minute"
 msgstr "у хвіліну"
 
-#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:143
-#: libraries/server_status.lib.php:228
+#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:152
+#: libraries/server_status.lib.php:237
 #: libraries/server_status_queries.lib.php:98
 msgid "per hour"
 msgstr "у гадзіну"
@@ -3414,7 +3420,7 @@ msgstr ""
 msgid "Wrong permissions on configuration file, should not be world writable!"
 msgstr ""
 
-#: libraries/Config.class.php:1799
+#: libraries/Config.class.php:1801
 msgid "Font size"
 msgstr "Памер шрыфта"
 
@@ -3444,10 +3450,10 @@ msgstr "па запыту"
 #: libraries/server_privileges.lib.php:2890
 #: libraries/server_privileges.lib.php:3144
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4332
+#: libraries/server_privileges.lib.php:4358
 #: libraries/server_status_processes.lib.php:80
-#: templates/tbl_relation/foreign_key_row.phtml:165
-#: templates/tbl_relation/internal_relational_row.phtml:55
+#: templates/table/relation/foreign_key_row.phtml:165
+#: templates/table/relation/internal_relational_row.phtml:55
 msgid "Database"
 msgstr "База дадзеных"
 
@@ -3555,11 +3561,11 @@ msgstr "Гісторыя SQL"
 #: libraries/plugins/import/ImportMediawiki.class.php:60
 #: libraries/plugins/import/ImportOds.class.php:59
 #: libraries/plugins/import/ImportShp.class.php:57
-#: libraries/plugins/import/ImportSql.class.php:148
+#: libraries/plugins/import/ImportSql.class.php:51
 #: libraries/plugins/import/ImportXml.class.php:58
-#: libraries/rte/rte_routines.lib.php:833 templates/index_form.phtml:49
-#: templates/structure/row_stats_table.phtml:20
-#: templates/table/options.phtml:2
+#: libraries/rte/rte_routines.lib.php:924 templates/table/index_form.phtml:49
+#: templates/table/search/options.phtml:2
+#: templates/table/structure/row_stats_table.phtml:20
 msgid "Options"
 msgstr "Налады"
 
@@ -3602,7 +3608,8 @@ msgstr "адваротны"
 msgid "Order:"
 msgstr ""
 
-#: libraries/Console.class.php:289 templates/table/replace_preview.phtml:17
+#: libraries/Console.class.php:289
+#: templates/table/search/replace_preview.phtml:17
 #, fuzzy
 #| msgid "Column names"
 msgid "Count"
@@ -3723,9 +3730,9 @@ msgstr "Перайсьці да скапіяванай табліцы"
 #: libraries/operations.lib.php:794 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:191
-#: templates/structure/sortable_header.phtml:21
-#: templates/structure/sortable_header.phtml:38
-#: templates/table/options.phtml:68
+#: templates/database/structure/sortable_header.phtml:21
+#: templates/database/structure/sortable_header.phtml:38
+#: templates/table/search/options.phtml:68
 msgid "Ascending"
 msgstr "прамы"
 
@@ -3735,13 +3742,14 @@ msgstr "прамы"
 #: libraries/operations.lib.php:797 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:188
-#: templates/structure/sortable_header.phtml:26
-#: templates/structure/sortable_header.phtml:43
-#: templates/table/options.phtml:69
+#: templates/database/structure/sortable_header.phtml:26
+#: templates/database/structure/sortable_header.phtml:43
+#: templates/table/search/options.phtml:69
 msgid "Descending"
 msgstr "адваротны"
 
-#: libraries/DBQbe.class.php:467 templates/table/search_and_replace.phtml:6
+#: libraries/DBQbe.class.php:467
+#: templates/table/search/search_and_replace.phtml:6
 #, fuzzy
 #| msgid "Column names"
 msgid "Column:"
@@ -3932,12 +3940,12 @@ msgstr[0] "%s супадзеньняў у табліцы <i>%s</i>"
 msgstr[1] "%s супадзеньняў у табліцы <i>%s</i>"
 
 #: libraries/DbSearch.class.php:354 libraries/Menu.class.php:311
-#: libraries/Util.class.php:3337 libraries/Util.class.php:3347
-#: libraries/Util.class.php:3623 libraries/Util.class.php:3624
-#: libraries/Util.class.php:4343 libraries/config.values.php:43
+#: libraries/Util.class.php:3343 libraries/Util.class.php:3353
+#: libraries/Util.class.php:3629 libraries/Util.class.php:3630
+#: libraries/Util.class.php:4349 libraries/config.values.php:43
 #: libraries/config.values.php:51 libraries/config.values.php:119
 #: libraries/navigation/Nodes/Node_Table.class.php:295
-#: templates/structure/check_all_table_column.phtml:5
+#: templates/table/structure/check_all_table_column.phtml:5
 msgid "Browse"
 msgstr "Прагляд"
 
@@ -3957,7 +3965,8 @@ msgstr "Пошук у базе дадзеных"
 msgid "Words or values to search for (wildcard: \"%\"):"
 msgstr "Слова(ы) або значэньне(і) для пошуку (маска: \"%\"):"
 
-#: libraries/DbSearch.class.php:401 templates/table/search_and_replace.phtml:1
+#: libraries/DbSearch.class.php:401
+#: templates/table/search/search_and_replace.phtml:1
 msgid "Find:"
 msgstr "Знайсьці:"
 
@@ -4011,16 +4020,16 @@ msgstr "Файлы"
 msgid "Search this table"
 msgstr "Пошук у базе дадзеных"
 
-#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2532
-#: libraries/Util.class.php:2535
+#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2538
+#: libraries/Util.class.php:2541
 #, fuzzy
 #| msgid "Begin"
 msgctxt "First page"
 msgid "Begin"
 msgstr "Першая старонка"
 
-#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2533
-#: libraries/Util.class.php:2536 libraries/server_bin_log.lib.php:170
+#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2539
+#: libraries/Util.class.php:2542 libraries/server_bin_log.lib.php:170
 #: libraries/server_bin_log.lib.php:172
 #, fuzzy
 #| msgid "Previous"
@@ -4028,8 +4037,8 @@ msgctxt "Previous page"
 msgid "Previous"
 msgstr "Папярэдняя старонка"
 
-#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2564
-#: libraries/Util.class.php:2574 libraries/server_bin_log.lib.php:204
+#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2570
+#: libraries/Util.class.php:2580 libraries/server_bin_log.lib.php:204
 #: libraries/server_bin_log.lib.php:206
 #, fuzzy
 #| msgid "Next"
@@ -4037,8 +4046,8 @@ msgctxt "Next page"
 msgid "Next"
 msgstr "Наступная старонка"
 
-#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2565
-#: libraries/Util.class.php:2575
+#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2571
+#: libraries/Util.class.php:2581
 #, fuzzy
 #| msgid "End"
 msgctxt "Last page"
@@ -4127,9 +4136,9 @@ msgid "May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]."
 msgstr "Значэньне можа быць прыблізным. Гл. [doc@faq3-11]FAQ 3.11[/doc]"
 
 #: libraries/DisplayResults.class.php:4332 libraries/Message.class.php:180
-#: libraries/controllers/TableRelationController.class.php:258
+#: libraries/controllers/TableRelationController.class.php:259
 #: libraries/controllers/TableSearchController.class.php:655
-#: libraries/rte/rte_routines.lib.php:1332 libraries/sql_query_form.lib.php:89
+#: libraries/rte/rte_routines.lib.php:1423 libraries/sql_query_form.lib.php:89
 #: tbl_operations.php:227 tbl_row_action.php:138 view_operations.php:62
 #, fuzzy
 #| msgid "Your SQL query has been executed successfully."
@@ -4137,7 +4146,7 @@ msgid "Your SQL query has been executed successfully."
 msgstr "Ваш SQL-запыт быў пасьпяхова выкананы"
 
 #: libraries/DisplayResults.class.php:4660
-#: libraries/controllers/StructureController.class.php:629
+#: libraries/controllers/DatabaseStructureController.class.php:564
 #, php-format
 msgid ""
 "This view has at least this number of rows. Please refer to %sdocumentation"
@@ -4163,34 +4172,34 @@ msgstr ""
 msgid "%d total"
 msgstr "усяго"
 
-#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1318
+#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1312
 #, fuzzy, php-format
 #| msgid "Query took %01.4f sec"
 msgid "Query took %01.4f seconds."
 msgstr "Запыт выконваўся %01.4f сэк"
 
 #: libraries/DisplayResults.class.php:4807
-#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4767
-#: libraries/Util.class.php:4773 libraries/mult_submits.inc.php:50
-#: templates/structure/check_all_tables.phtml:2
-#: templates/structure/check_all_tables.phtml:9
+#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4773
+#: libraries/Util.class.php:4779 libraries/mult_submits.inc.php:50
+#: templates/database/structure/check_all_tables.phtml:2
+#: templates/database/structure/check_all_tables.phtml:9
 msgid "With selected:"
 msgstr "З адзначанымі:"
 
 #: libraries/DisplayResults.class.php:4811
-#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4769
-#: libraries/Util.class.php:4770 libraries/server_privileges.lib.php:1174
+#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4775
+#: libraries/Util.class.php:4776 libraries/server_privileges.lib.php:1174
 #: libraries/server_privileges.lib.php:1175
 #: libraries/server_privileges.lib.php:1387
 #: libraries/server_user_groups.lib.php:231
-#: templates/structure/check_all_tables.phtml:3
-#: templates/structure/check_all_tables.phtml:4
+#: templates/database/structure/check_all_tables.phtml:3
+#: templates/database/structure/check_all_tables.phtml:4
 msgid "Check All"
 msgstr "Адзначыць усё"
 
 #: libraries/DisplayResults.class.php:4985 libraries/Header.class.php:383
-#: templates/structure/optional_action_links.phtml:1
-#: templates/structure/print_view_data_dictionary_link.phtml:3
+#: templates/database/structure/print_view_data_dictionary_link.phtml:3
+#: templates/table/structure/optional_action_links.phtml:1
 msgid "Print view"
 msgstr "Вэрсія для друку"
 
@@ -4198,7 +4207,8 @@ msgstr "Вэрсія для друку"
 msgid "Query results operations"
 msgstr "Дзеяньні з вынікамі запытаў"
 
-#: libraries/DisplayResults.class.php:5105 templates/tbl_chart.phtml:12
+#: libraries/DisplayResults.class.php:5105
+#: templates/table/chart/tbl_chart.phtml:12
 #, fuzzy
 #| msgid "Display PDF schema"
 msgid "Display chart"
@@ -4305,7 +4315,7 @@ msgid "Click on the bar to scroll to top of page"
 msgstr ""
 
 #: libraries/Header.class.php:749
-#: libraries/plugins/auth/AuthenticationCookie.class.php:152
+#: libraries/plugins/auth/AuthenticationCookie.class.php:140
 #, fuzzy
 #| msgid "Cookies must be enabled past this point."
 msgid "Javascript must be enabled past this point!"
@@ -4329,11 +4339,11 @@ msgid "Keyname"
 msgstr "Імя ключа"
 
 #: libraries/Index.class.php:697
-#: libraries/controllers/StructureController.class.php:1962
-#: libraries/controllers/StructureController.class.php:1967
+#: libraries/controllers/TableStructureController.class.php:953
+#: libraries/controllers/TableStructureController.class.php:958
 #: libraries/tracking.lib.php:973
 #: templates/columns_definitions/column_indexes.phtml:11
-#: templates/structure/check_all_table_column.phtml:26
+#: templates/table/structure/check_all_table_column.phtml:26
 msgid "Unique"
 msgstr "Унікальнае"
 
@@ -4352,16 +4362,17 @@ msgstr "Колькасьць элемэнтаў"
 #: libraries/server_collations.lib.php:35 libraries/tracking.lib.php:881
 #: libraries/tracking.lib.php:977
 #: templates/columns_definitions/table_fields_definitions.phtml:33
-#: templates/structure/row_stats_table.phtml:31
-#: templates/structure/table_header.phtml:55
-#: templates/structure/table_structure_header.phtml:7
-#: templates/table/table_header.phtml:8
+#: templates/database/structure/table_header.phtml:55
+#: templates/table/search/table_header.phtml:8
+#: templates/table/structure/row_stats_table.phtml:31
+#: templates/table/structure/table_structure_header.phtml:7
 msgid "Collation"
 msgstr "Супастаўленьне"
 
 #: libraries/Index.class.php:703 libraries/rte/rte_events.lib.php:496
-#: libraries/rte/rte_routines.lib.php:956 libraries/tracking.lib.php:885
-#: libraries/tracking.lib.php:979 templates/structure/table_header.phtml:84
+#: libraries/rte/rte_routines.lib.php:1047 libraries/tracking.lib.php:885
+#: libraries/tracking.lib.php:979
+#: templates/database/structure/table_header.phtml:84
 msgid "Comment"
 msgstr "Камэнтар"
 
@@ -4374,15 +4385,15 @@ msgstr "Першасны ключ быў выдалены."
 msgid "Index %s has been dropped."
 msgstr "Індэкс %s быў выдалены."
 
-#: libraries/Index.class.php:757 libraries/Util.class.php:3630
-#: libraries/Util.class.php:3631
-#: libraries/controllers/StructureController.class.php:1958
-#: libraries/controllers/StructureController.class.php:1959
+#: libraries/Index.class.php:757 libraries/Util.class.php:3636
+#: libraries/Util.class.php:3637
+#: libraries/controllers/TableStructureController.class.php:949
+#: libraries/controllers/TableStructureController.class.php:950
 #: libraries/operations.lib.php:1607 libraries/rte/rte_list.lib.php:150
 #: libraries/server_databases.lib.php:146
-#: templates/structure/check_all_table_column.phtml:15
-#: templates/structure/check_all_tables.phtml:16
-#: templates/tbl_relation/foreign_key_row.phtml:93
+#: templates/database/structure/check_all_tables.phtml:16
+#: templates/table/relation/foreign_key_row.phtml:93
+#: templates/table/structure/check_all_table_column.phtml:15
 msgid "Drop"
 msgstr "Выдаліць"
 
@@ -4413,16 +4424,16 @@ msgstr "Сэрвэр"
 #: libraries/Menu.class.php:248
 #: libraries/navigation/Nodes/Node_View.class.php:32
 #: libraries/tbl_info.inc.php:63
-#: templates/structure/structure_table_row.phtml:97
-#: templates/structure/structure_table_row.phtml:159
+#: templates/database/structure/structure_table_row.phtml:97
+#: templates/database/structure/structure_table_row.phtml:159
 msgid "View"
 msgstr "Выгляд"
 
 #: libraries/Menu.class.php:325 libraries/Menu.class.php:429
-#: libraries/Menu.class.php:548 libraries/Util.class.php:3334
-#: libraries/Util.class.php:3344 libraries/Util.class.php:3350
-#: libraries/Util.class.php:4313 libraries/Util.class.php:4328
-#: libraries/Util.class.php:4345 libraries/config.values.php:40
+#: libraries/Menu.class.php:548 libraries/Util.class.php:3340
+#: libraries/Util.class.php:3350 libraries/Util.class.php:3356
+#: libraries/Util.class.php:4319 libraries/Util.class.php:4334
+#: libraries/Util.class.php:4351 libraries/config.values.php:40
 #: libraries/config.values.php:48 libraries/config.values.php:110
 #: libraries/config.values.php:116 libraries/config/messages.inc.php:321
 #: libraries/navigation/Nodes/Node_Table.class.php:292
@@ -4430,19 +4441,19 @@ msgid "SQL"
 msgstr "SQL"
 
 #: libraries/Menu.class.php:328 libraries/Menu.class.php:432
-#: libraries/Util.class.php:3335 libraries/Util.class.php:3345
-#: libraries/Util.class.php:3351 libraries/Util.class.php:3625
-#: libraries/Util.class.php:3626 libraries/Util.class.php:4329
-#: libraries/Util.class.php:4346 libraries/config.values.php:41
+#: libraries/Util.class.php:3341 libraries/Util.class.php:3351
+#: libraries/Util.class.php:3357 libraries/Util.class.php:3631
+#: libraries/Util.class.php:3632 libraries/Util.class.php:4335
+#: libraries/Util.class.php:4352 libraries/config.values.php:41
 #: libraries/config.values.php:49 libraries/config.values.php:111
 #: libraries/config.values.php:117
 #: libraries/navigation/Nodes/Node_Table.class.php:286
 msgid "Search"
 msgstr "Пошук"
 
-#: libraries/Menu.class.php:338 libraries/Util.class.php:3336
-#: libraries/Util.class.php:3346 libraries/Util.class.php:3627
-#: libraries/Util.class.php:3628 libraries/Util.class.php:4347
+#: libraries/Menu.class.php:338 libraries/Util.class.php:3342
+#: libraries/Util.class.php:3352 libraries/Util.class.php:3633
+#: libraries/Util.class.php:3634 libraries/Util.class.php:4353
 #: libraries/config.values.php:42 libraries/config.values.php:50
 #: libraries/config.values.php:118
 #: libraries/navigation/Nodes/Node_Table.class.php:289
@@ -4451,30 +4462,30 @@ msgid "Insert"
 msgstr "Уставіць"
 
 #: libraries/Menu.class.php:362 libraries/Menu.class.php:467
-#: libraries/Util.class.php:4334 libraries/Util.class.php:4350
+#: libraries/Util.class.php:4340 libraries/Util.class.php:4356
 #: libraries/config.values.php:106 libraries/server_common.lib.php:51
 #: libraries/server_privileges.lib.php:2370
 #: libraries/server_privileges.lib.php:3158
-#: libraries/server_privileges.lib.php:4221
+#: libraries/server_privileges.lib.php:4247
 msgid "Privileges"
 msgstr "Прывілеі"
 
 #: libraries/Menu.class.php:371 libraries/Menu.class.php:379
-#: libraries/Menu.class.php:459 libraries/Util.class.php:3338
-#: libraries/Util.class.php:3352 libraries/Util.class.php:4333
-#: libraries/Util.class.php:4351 libraries/config.values.php:112
+#: libraries/Menu.class.php:459 libraries/Util.class.php:3344
+#: libraries/Util.class.php:3358 libraries/Util.class.php:4339
+#: libraries/Util.class.php:4357 libraries/config.values.php:112
 #: view_operations.php:92
 msgid "Operations"
 msgstr "Апэрацыі"
 
 #: libraries/Menu.class.php:384 libraries/Menu.class.php:492
-#: libraries/Util.class.php:4338 libraries/Util.class.php:4352
+#: libraries/Util.class.php:4344 libraries/Util.class.php:4358
 #: libraries/relation.lib.php:255
 msgid "Tracking"
 msgstr ""
 
 #: libraries/Menu.class.php:397 libraries/Menu.class.php:486
-#: libraries/Util.class.php:4337 libraries/Util.class.php:4353
+#: libraries/Util.class.php:4343 libraries/Util.class.php:4359
 #: libraries/navigation/Nodes/Node_Trigger_Container.class.php:24
 #: libraries/plugins/export/ExportHtmlword.class.php:557
 #: libraries/plugins/export/ExportOdt.class.php:685
@@ -4491,16 +4502,16 @@ msgstr "Трыгеры"
 msgid "Database seems to be empty!"
 msgstr "База дадзеных — пустая!"
 
-#: libraries/Menu.class.php:439 libraries/Util.class.php:4330
+#: libraries/Menu.class.php:439 libraries/Util.class.php:4336
 msgid "Query"
 msgstr "Запыт згодна прыкладу"
 
-#: libraries/Menu.class.php:472 libraries/Util.class.php:4335
+#: libraries/Menu.class.php:472 libraries/Util.class.php:4341
 #: libraries/rte/rte_words.lib.php:36
 msgid "Routines"
 msgstr "Працэдуры"
 
-#: libraries/Menu.class.php:479 libraries/Util.class.php:4336
+#: libraries/Menu.class.php:479 libraries/Util.class.php:4342
 #: libraries/navigation/Nodes/Node_Event_Container.class.php:26
 #: libraries/plugins/export/ExportSql.class.php:940
 #: libraries/plugins/export/ExportXml.class.php:107
@@ -4508,22 +4519,22 @@ msgstr "Працэдуры"
 msgid "Events"
 msgstr "Падзеі"
 
-#: libraries/Menu.class.php:498 libraries/Util.class.php:4339
+#: libraries/Menu.class.php:498 libraries/Util.class.php:4345
 msgid "Designer"
 msgstr "Дызайнэр"
 
-#: libraries/Menu.class.php:507 libraries/Util.class.php:4340
-#: templates/structure/check_all_tables.phtml:35
+#: libraries/Menu.class.php:507 libraries/Util.class.php:4346
+#: templates/database/structure/check_all_tables.phtml:35
 #, fuzzy
 #| msgid "Add/Delete Field Columns"
 msgid "Central columns"
 msgstr "Дадаць/выдаліць калёнку крытэру"
 
-#: libraries/Menu.class.php:544 libraries/Util.class.php:4312
+#: libraries/Menu.class.php:544 libraries/Util.class.php:4318
 #: libraries/config.values.php:103 libraries/config/messages.inc.php:266
 #: libraries/config/messages.inc.php:341
 #: libraries/navigation/NavigationTree.class.php:1239
-#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4332
+#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4358
 msgid "Databases"
 msgstr "Базы дадзеных"
 
@@ -4534,34 +4545,34 @@ msgid "User accounts"
 msgstr "Карыстальнік"
 
 #: libraries/Menu.class.php:595 libraries/ServerStatusData.class.php:121
-#: libraries/Util.class.php:4319 libraries/server_common.lib.php:36
+#: libraries/Util.class.php:4325 libraries/server_common.lib.php:36
 msgid "Binary log"
 msgstr "Двайковы лог"
 
 #: libraries/Menu.class.php:601 libraries/ServerStatusData.class.php:126
-#: libraries/Util.class.php:4320 libraries/server_common.lib.php:42
-#: templates/structure/body_for_table_summary.phtml:10
-#: templates/structure/table_header.phtml:27
+#: libraries/Util.class.php:4326 libraries/server_common.lib.php:42
+#: templates/database/structure/body_for_table_summary.phtml:10
+#: templates/database/structure/table_header.phtml:27
 msgid "Replication"
 msgstr "Рэплікацыя"
 
 #: libraries/Menu.class.php:606 libraries/ServerStatusData.class.php:193
-#: libraries/Util.class.php:4321 libraries/config.values.php:105
+#: libraries/Util.class.php:4327 libraries/config.values.php:105
 #: libraries/server_engines.lib.php:108 libraries/server_engines.lib.php:112
 #: libraries/sql_query_form.lib.php:421
 msgid "Variables"
 msgstr "Зьменныя"
 
-#: libraries/Menu.class.php:610 libraries/Util.class.php:4322
+#: libraries/Menu.class.php:610 libraries/Util.class.php:4328
 msgid "Charsets"
 msgstr "Кадыроўкі"
 
-#: libraries/Menu.class.php:615 libraries/Util.class.php:4323
+#: libraries/Menu.class.php:615 libraries/Util.class.php:4329
 #: libraries/server_common.lib.php:33 libraries/server_plugins.lib.php:27
 msgid "Plugins"
 msgstr ""
 
-#: libraries/Menu.class.php:626 libraries/Util.class.php:4324
+#: libraries/Menu.class.php:626 libraries/Util.class.php:4330
 msgid "Engines"
 msgstr "Машыны"
 
@@ -4589,7 +4600,7 @@ msgid_plural "%1$d rows inserted."
 msgstr[0] "Устаўлена радкоў: %1$d."
 msgstr[1] "Устаўлена радкоў: %1$d."
 
-#: libraries/PDF.class.php:70 libraries/Util.class.php:2521
+#: libraries/PDF.class.php:70 libraries/Util.class.php:2527
 #: libraries/browse_foreigners.lib.php:327
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:865
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:890
@@ -4616,7 +4627,7 @@ msgid "Could not save favorite table!"
 msgstr "Немагчыма загрузіць канфігурацыю па змоўчаньні з: \"%1$s\""
 
 #: libraries/RecentFavoriteTable.class.php:212
-#: templates/structure/favorite_anchor.phtml:12
+#: templates/database/structure/favorite_anchor.phtml:12
 #, fuzzy
 #| msgid "Rename database to"
 msgid "Remove from Favorites"
@@ -4800,7 +4811,7 @@ msgstr ""
 "Для гэтай машыны захаваньня дадзеных дэтальная інфармацыя не даступная."
 
 #: libraries/StorageEngine.class.php:373
-#: templates/structure/body_for_table_summary.phtml:50
+#: templates/database/structure/body_for_table_summary.phtml:50
 #, php-format
 msgid "%s is the default storage engine on this MySQL server."
 msgstr ""
@@ -5234,10 +5245,10 @@ msgstr ""
 
 #: libraries/Util.class.php:726 libraries/rte/rte_events.lib.php:110
 #: libraries/rte/rte_events.lib.php:119 libraries/rte/rte_events.lib.php:150
-#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:153
-#: libraries/rte/rte_routines.lib.php:162
-#: libraries/rte/rte_routines.lib.php:235
-#: libraries/rte/rte_routines.lib.php:1366
+#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:223
+#: libraries/rte/rte_routines.lib.php:250
+#: libraries/rte/rte_routines.lib.php:372
+#: libraries/rte/rte_routines.lib.php:1457
 #: libraries/rte/rte_triggers.lib.php:86 libraries/rte/rte_triggers.lib.php:95
 #: libraries/rte/rte_triggers.lib.php:127
 msgid "MySQL said: "
@@ -5283,80 +5294,83 @@ msgstr "Ндз"
 msgid "%B %d, %Y at %I:%M %p"
 msgstr "%d %B %Y, %H:%M"
 
-#: libraries/Util.class.php:2019
+#: libraries/Util.class.php:2025
 #, php-format
 msgid "%s days, %s hours, %s minutes and %s seconds"
 msgstr "%s дзён, %s гадзінаў, %s хвілінаў і %s сэкундаў"
 
-#: libraries/Util.class.php:2112
+#: libraries/Util.class.php:2118
 #, fuzzy
 #| msgid "Routines"
 msgid "Missing parameter:"
 msgstr "Працэдуры"
 
-#: libraries/Util.class.php:2645
+#: libraries/Util.class.php:2651
 #, php-format
 msgid "Jump to database \"%s\"."
 msgstr "Перайсьці да базы дадзеных \"%s\"."
 
-#: libraries/Util.class.php:2670
+#: libraries/Util.class.php:2676
 #, php-format
 msgid "The %s functionality is affected by a known bug, see %s"
 msgstr ""
 "Існуе вядомая памылка з выкарыстаньнем парамэтра %s, глядзіце апісаньне на %s"
 
-#: libraries/Util.class.php:2881
+#: libraries/Util.class.php:2887
 msgid "Click to toggle"
 msgstr ""
 
-#: libraries/Util.class.php:3542 prefs_manage.php:248
+#: libraries/Util.class.php:3548 prefs_manage.php:248
 msgid "Browse your computer:"
 msgstr ""
 
-#: libraries/Util.class.php:3567
+#: libraries/Util.class.php:3573
 #, fuzzy, php-format
 #| msgid "web server upload directory"
 msgid "Select from the web server upload directory <b>%s</b>:"
 msgstr "тэчка вэб-сэрвэра для загрузкі файлаў"
 
-#: libraries/Util.class.php:3596 libraries/insert_edit.lib.php:1173
+#: libraries/Util.class.php:3602 libraries/insert_edit.lib.php:1171
 msgid "The directory you set for upload work cannot be reached."
 msgstr "Немагчыма адкрыць пазначаную вамі тэчку для загрузкі файлаў."
 
-#: libraries/Util.class.php:3607
+#: libraries/Util.class.php:3613
 #, fuzzy
 msgid "There are no files to upload!"
 msgstr "Праверыць табліцу"
 
-#: libraries/Util.class.php:3632 libraries/Util.class.php:3633
-#: templates/structure/check_all_tables.phtml:15
+#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: templates/database/structure/check_all_tables.phtml:15
 msgid "Empty"
 msgstr "Ачысьціць"
 
-#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: libraries/Util.class.php:3644 libraries/Util.class.php:3645
 msgid "Execute"
 msgstr ""
 
-#: libraries/Util.class.php:4152
+#: libraries/Util.class.php:4158
 msgid "Print"
 msgstr "Друк"
 
-#: libraries/Util.class.php:4257 templates/structure/row_stats_table.phtml:80
-#: templates/structure/table_header.phtml:95
+#: libraries/Util.class.php:4263
+#: templates/database/structure/table_header.phtml:95
+#: templates/table/structure/row_stats_table.phtml:80
 msgid "Creation"
 msgstr "Створаная"
 
-#: libraries/Util.class.php:4263 templates/structure/row_stats_table.phtml:87
-#: templates/structure/table_header.phtml:106
+#: libraries/Util.class.php:4269
+#: templates/database/structure/table_header.phtml:106
+#: templates/table/structure/row_stats_table.phtml:87
 msgid "Last update"
 msgstr "Апошняе абнаўленьне"
 
-#: libraries/Util.class.php:4269 templates/structure/row_stats_table.phtml:94
-#: templates/structure/table_header.phtml:117
+#: libraries/Util.class.php:4275
+#: templates/database/structure/table_header.phtml:117
+#: templates/table/structure/row_stats_table.phtml:94
 msgid "Last check"
 msgstr "Апошняя праверка"
 
-#: libraries/Util.class.php:4315
+#: libraries/Util.class.php:4321
 #, fuzzy
 #| msgid "User"
 msgid "Users"
@@ -5381,16 +5395,16 @@ msgid "Use this value"
 msgstr "Выкарыстоўваць гэта значэньне"
 
 #: libraries/build_html_for_db.lib.php:33 libraries/import.lib.php:193
-#: templates/structure/actions_in_table_structure.phtml:113
-#: templates/structure/row_stats_table.phtml:42
-#: templates/structure/table_header.phtml:36
+#: templates/database/structure/table_header.phtml:36
+#: templates/table/structure/actions_in_table_structure.phtml:113
+#: templates/table/structure/row_stats_table.phtml:42
 msgid "Rows"
 msgstr "Радкі"
 
 #: libraries/build_html_for_db.lib.php:48 libraries/engines/innodb.lib.php:171
-#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:186
-#: libraries/server_status.lib.php:298
-#: templates/structure/display_table_stats.phtml:40
+#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:195
+#: libraries/server_status.lib.php:307
+#: templates/table/structure/display_table_stats.phtml:40
 msgid "Total"
 msgstr "Агулам"
 
@@ -5400,10 +5414,12 @@ msgid "Jump to database"
 msgstr "Базы дадзеных адсутнічаюць"
 
 #: libraries/build_html_for_db.lib.php:146
+#: templates/database/structure/structure_table_row.phtml:15
 msgid "Not replicated"
 msgstr ""
 
 #: libraries/build_html_for_db.lib.php:158
+#: templates/database/structure/structure_table_row.phtml:16
 #, fuzzy
 #| msgid "Replication"
 msgid "Replicated"
@@ -5462,17 +5478,17 @@ msgstr ""
 #: libraries/plugins/export/ExportTexytext.class.php:425
 #: libraries/plugins/export/PMA_ExportPdf.class.php:307
 #: libraries/rte/rte_list.lib.php:73 libraries/rte/rte_list.lib.php:85
-#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:830
-#: libraries/rte/rte_routines.lib.php:1492 setup/frames/index.inc.php:162
+#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:921
+#: libraries/rte/rte_routines.lib.php:1583 setup/frames/index.inc.php:162
 #: templates/columns_definitions/table_fields_definitions.phtml:8
-#: templates/structure/table_structure_header.phtml:5
-#: templates/table/create_table.phtml:11
+#: templates/database/create_table.phtml:11
+#: templates/table/structure/table_structure_header.phtml:5
 msgid "Name"
 msgstr "Назва"
 
 #: libraries/central_columns.lib.php:699
 #: libraries/central_columns.lib.php:1381
-#: libraries/rte/rte_routines.lib.php:832
+#: libraries/rte/rte_routines.lib.php:923
 #: templates/columns_definitions/table_fields_definitions.phtml:14
 msgid "Length/Values"
 msgstr "Даўжыня/Значэньні*"
@@ -5495,7 +5511,7 @@ msgid "Select a table"
 msgstr "Выберыце табліцу(ы)"
 
 #: libraries/central_columns.lib.php:804
-#: templates/structure/add_column.phtml:4
+#: templates/table/structure/add_column.phtml:4
 #, fuzzy
 #| msgid "Add %s field(s)"
 msgid "Add column"
@@ -5517,7 +5533,7 @@ msgstr "Дадаць %s новыя палі"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1002
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1025
 #: templates/columns_definitions/table_fields_definitions.phtml:36
-#: templates/structure/table_structure_header.phtml:8
+#: templates/table/structure/table_structure_header.phtml:8
 msgid "Attributes"
 msgstr "Атрыбуты"
 
@@ -5642,7 +5658,7 @@ msgid "Double click"
 msgstr ""
 
 #: libraries/config.values.php:95 libraries/config.values.php:124
-#: libraries/config/FormDisplay.tpl.php:221 libraries/relation.lib.php:97
+#: libraries/config/FormDisplay.tpl.php:232 libraries/relation.lib.php:97
 #: libraries/relation.lib.php:105
 msgid "Disabled"
 msgstr "Адключана"
@@ -5834,21 +5850,21 @@ msgstr ""
 msgid "maximum %s"
 msgstr ""
 
-#: libraries/config/FormDisplay.tpl.php:219
+#: libraries/config/FormDisplay.tpl.php:230
 msgid "This setting is disabled, it will not be applied to your configuration."
 msgstr ""
 
-#: libraries/config/FormDisplay.tpl.php:313
+#: libraries/config/FormDisplay.tpl.php:324
 #, php-format
 msgid "Set value: %s"
 msgstr ""
 
-#: libraries/config/FormDisplay.tpl.php:318
+#: libraries/config/FormDisplay.tpl.php:329
 #: libraries/config/messages.inc.php:610
 msgid "Restore default value"
 msgstr ""
 
-#: libraries/config/FormDisplay.tpl.php:332
+#: libraries/config/FormDisplay.tpl.php:343
 msgid "Allow users to customize this value"
 msgstr ""
 
@@ -6290,7 +6306,7 @@ msgstr "Кадыроўка файла:"
 
 #: libraries/config/messages.inc.php:136 libraries/config/messages.inc.php:152
 #: libraries/sql_query_form.lib.php:247
-#: templates/structure/row_stats_table.phtml:7
+#: templates/table/structure/row_stats_table.phtml:7
 msgid "Format"
 msgstr "Фармат"
 
@@ -6856,7 +6872,7 @@ msgstr ""
 
 #: libraries/config/messages.inc.php:332
 #: libraries/plugins/export/ExportPdf.class.php:279
-#: templates/structure/secondary_tabs.phtml:8
+#: templates/table/secondary_tabs.phtml:8
 #, fuzzy
 #| msgid "Database for user"
 msgid "Table structure"
@@ -8505,113 +8521,35 @@ msgstr "Microsoft Word 2000"
 msgid "OpenDocument Text"
 msgstr "Тэкст Open Document"
 
-#: libraries/controllers/StructureController.class.php:465
+#: libraries/controllers/DatabaseStructureController.class.php:405
 #: tbl_operations.php:382
 #, php-format
 msgid "Table %s has been emptied."
 msgstr "Табліца %s была ачышчаная."
 
-#: libraries/controllers/StructureController.class.php:486
+#: libraries/controllers/DatabaseStructureController.class.php:426
 #: tbl_operations.php:400 view_operations.php:119
 #, fuzzy, php-format
 #| msgid "View %s has been dropped."
 msgid "View %s has been dropped."
 msgstr "Выгляд %s быў выдалены"
 
-#: libraries/controllers/StructureController.class.php:487
+#: libraries/controllers/DatabaseStructureController.class.php:427
 #: tbl_operations.php:401
 #, fuzzy, php-format
 #| msgid "Table %s has been dropped."
 msgid "Table %s has been dropped."
 msgstr "Табліца %s была выдаленая"
 
-#: libraries/controllers/StructureController.class.php:797
-#, php-format
-msgid "The name '%s' is a MySQL reserved keyword."
-msgid_plural "The names '%s' are MySQL reserved keywords."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: libraries/controllers/StructureController.class.php:875
-#, fuzzy
-#| msgid "No rows selected"
-msgid "No column selected."
-msgstr "Ніводны радок ня выбраны"
-
-#: libraries/controllers/StructureController.class.php:1049
+#: libraries/controllers/DatabaseStructureController.class.php:733
 msgid "Favorite List is full!"
 msgstr ""
 
-#: libraries/controllers/StructureController.class.php:1272
-#, fuzzy
-#| msgid "The selected users have been deleted successfully."
-msgid "The columns have been moved successfully."
-msgstr "Выбраныя карыстальнікі былі пасьпяхова выдаленыя."
-
-#: libraries/controllers/StructureController.class.php:1535
-#, fuzzy, php-format
-#| msgid "Table %1$s has been altered successfully."
-msgid ""
-"Table %1$s has been altered successfully. Privileges have been adjusted."
-msgstr "Табліца %1$s была пасьпяхова зьмененая."
-
-#: libraries/controllers/StructureController.class.php:1541
-#: libraries/controllers/TableIndexesController.class.php:161
-#: tbl_addfield.php:92
-#, php-format
-msgid "Table %1$s has been altered successfully."
-msgstr "Табліца %1$s была пасьпяхова зьмененая."
-
-#: libraries/controllers/StructureController.class.php:1588
-#: libraries/tracking.lib.php:1094
-#, fuzzy
-#| msgid "Query type"
-msgid "Query error"
-msgstr "Тып запыту"
-
-#: libraries/controllers/StructureController.class.php:1806
+#: libraries/controllers/DatabaseStructureController.class.php:947
 #: libraries/mysql_charsets.lib.php:366 libraries/mysql_charsets.lib.php:373
 msgid "unknown"
 msgstr "невядома"
 
-#: libraries/controllers/StructureController.class.php:1957
-#: templates/structure/check_all_table_column.phtml:11
-msgid "Change"
-msgstr "Зьмяніць"
-
-#: libraries/controllers/StructureController.class.php:1961
-#: libraries/controllers/StructureController.class.php:1966
-#: libraries/navigation/Nodes/Node_Index.class.php:30
-#: libraries/tracking.lib.php:926
-#: templates/columns_definitions/column_indexes.phtml:16
-#: templates/columns_definitions/table_fields_definitions.phtml:57
-#: templates/structure/check_all_table_column.phtml:30
-#: templates/structure/display_structure.phtml:79
-#: templates/structure/display_table_stats.phtml:19
-msgid "Index"
-msgstr "Індэкс"
-
-#: libraries/controllers/StructureController.class.php:1963
-#: libraries/controllers/StructureController.class.php:1968
-#: templates/columns_definitions/column_indexes.phtml:27
-#: templates/structure/check_all_table_column.phtml:37
-msgid "Spatial"
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1964
-#: libraries/controllers/StructureController.class.php:1969
-#: templates/columns_definitions/column_indexes.phtml:22
-#: templates/structure/check_all_table_column.phtml:47
-msgid "Fulltext"
-msgstr "Поўнатэкстэкставае"
-
-#: libraries/controllers/StructureController.class.php:1970
-#, fuzzy
-#| msgid "Browse distinct values"
-msgid "Distinct values"
-msgstr "Прагляд розных значэньняў"
-
 #: libraries/controllers/TableChartController.class.php:82
 #: libraries/controllers/TableGisVisualizationController.class.php:101
 msgid "No SQL query was set to fetch data."
@@ -8627,13 +8565,20 @@ msgstr ""
 msgid "No data to display"
 msgstr "Базы дадзеных адсутнічаюць"
 
-#: libraries/controllers/TableRelationController.class.php:217
+#: libraries/controllers/TableIndexesController.class.php:161
+#: libraries/controllers/TableStructureController.class.php:736
+#: tbl_addfield.php:92
+#, php-format
+msgid "Table %1$s has been altered successfully."
+msgstr "Табліца %1$s была пасьпяхова зьмененая."
+
+#: libraries/controllers/TableRelationController.class.php:218
 #, fuzzy
 #| msgid "Thread %s was successfully killed."
 msgid "Display column was successfully updated."
 msgstr "Паток %s быў пасьпяхова спынены."
 
-#: libraries/controllers/TableRelationController.class.php:283
+#: libraries/controllers/TableRelationController.class.php:288
 #, fuzzy
 #| msgid "Internal relation added"
 msgid "Internal relations were successfully updated."
@@ -8652,11 +8597,82 @@ msgid "Zoom search"
 msgstr "Пошук"
 
 #: libraries/controllers/TableSearchController.class.php:852
-#: templates/table/selection_form.phtml:59
+#: templates/table/search/selection_form.phtml:59
 #, fuzzy
 msgid "Find and replace"
 msgstr "SQL-запыт"
 
+#: libraries/controllers/TableStructureController.class.php:163
+#, php-format
+msgid "The name '%s' is a MySQL reserved keyword."
+msgid_plural "The names '%s' are MySQL reserved keywords."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: libraries/controllers/TableStructureController.class.php:241
+#, fuzzy
+#| msgid "No rows selected"
+msgid "No column selected."
+msgstr "Ніводны радок ня выбраны"
+
+#: libraries/controllers/TableStructureController.class.php:467
+#, fuzzy
+#| msgid "The selected users have been deleted successfully."
+msgid "The columns have been moved successfully."
+msgstr "Выбраныя карыстальнікі былі пасьпяхова выдаленыя."
+
+#: libraries/controllers/TableStructureController.class.php:730
+#, fuzzy, php-format
+#| msgid "Table %1$s has been altered successfully."
+msgid ""
+"Table %1$s has been altered successfully. Privileges have been adjusted."
+msgstr "Табліца %1$s была пасьпяхова зьмененая."
+
+#: libraries/controllers/TableStructureController.class.php:783
+#: libraries/tracking.lib.php:1094
+#, fuzzy
+#| msgid "Query type"
+msgid "Query error"
+msgstr "Тып запыту"
+
+#: libraries/controllers/TableStructureController.class.php:948
+#: templates/table/structure/check_all_table_column.phtml:11
+msgid "Change"
+msgstr "Зьмяніць"
+
+#: libraries/controllers/TableStructureController.class.php:952
+#: libraries/controllers/TableStructureController.class.php:957
+#: libraries/navigation/Nodes/Node_Index.class.php:30
+#: libraries/tracking.lib.php:926
+#: templates/columns_definitions/column_indexes.phtml:16
+#: templates/columns_definitions/table_fields_definitions.phtml:57
+#: templates/table/structure/check_all_table_column.phtml:30
+#: templates/table/structure/display_structure.phtml:79
+#: templates/table/structure/display_table_stats.phtml:19
+msgid "Index"
+msgstr "Індэкс"
+
+#: libraries/controllers/TableStructureController.class.php:954
+#: libraries/controllers/TableStructureController.class.php:959
+#: templates/columns_definitions/column_indexes.phtml:27
+#: templates/table/structure/check_all_table_column.phtml:37
+msgid "Spatial"
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:955
+#: libraries/controllers/TableStructureController.class.php:960
+#: templates/columns_definitions/column_indexes.phtml:22
+#: templates/table/structure/check_all_table_column.phtml:47
+msgid "Fulltext"
+msgstr "Поўнатэкстэкставае"
+
+#: libraries/controllers/TableStructureController.class.php:963
+#, fuzzy
+#| msgid "Browse distinct values"
+msgid "Distinct values"
+msgstr "Прагляд розных значэньняў"
+
 #: libraries/core.lib.php:306
 #, php-format
 msgid "The %s extension is missing. Please check your PHP configuration."
@@ -8704,7 +8720,7 @@ msgid "No Password"
 msgstr "Без пароля"
 
 #: libraries/display_change_password.lib.php:68
-#: libraries/plugins/auth/AuthenticationCookie.class.php:199
+#: libraries/plugins/auth/AuthenticationCookie.class.php:187
 #: libraries/replication_gui.lib.php:422 libraries/replication_gui.lib.php:862
 #: libraries/server_privileges.lib.php:1640
 msgid "Password:"
@@ -9578,12 +9594,12 @@ msgid "Dump has been saved to file %s."
 msgstr "Дамп захаваны ў файл %s."
 
 #: libraries/import.lib.php:202 libraries/insert_edit.lib.php:124
-#: libraries/rte/rte_routines.lib.php:1353 libraries/sql.lib.php:1312
+#: libraries/rte/rte_routines.lib.php:1444 libraries/sql.lib.php:1306
 #: tbl_get_field.php:44
 msgid "MySQL returned an empty result set (i.e. zero rows)."
 msgstr "MySQL вярнула пусты вынік (то бок нуль радкоў)."
 
-#: libraries/import.lib.php:265 libraries/sql.lib.php:1326
+#: libraries/import.lib.php:265 libraries/sql.lib.php:1320
 msgid "[ROLLBACK occurred.]"
 msgstr ""
 
@@ -9650,14 +9666,14 @@ msgstr "Стварыць індэкс на&nbsp;%s&nbsp;калёнках"
 
 #: libraries/insert_edit.lib.php:233
 #: libraries/navigation/Nodes/Node_DatabaseChild.class.php:48
-#: templates/designer/table_list.phtml:40
+#: templates/database/designer/table_list.phtml:40
 msgid "Hide"
 msgstr "Схаваць"
 
 #: libraries/insert_edit.lib.php:249
 #: libraries/navigation/Nodes/Node_Function.class.php:32
-#: libraries/rte/rte_routines.lib.php:1495
-#: templates/table/table_header.phtml:4
+#: libraries/rte/rte_routines.lib.php:1586
+#: templates/table/search/table_header.phtml:4
 msgid "Function"
 msgstr "Функцыя"
 
@@ -9672,90 +9688,91 @@ msgstr "Двайковы"
 msgid "Because of its length,<br /> this column might not be editable."
 msgstr "З-за вялікай даўжыні,<br /> гэтае поле ня можа быць адрэдагаванае "
 
-#: libraries/insert_edit.lib.php:1050
+#: libraries/insert_edit.lib.php:1048
 msgid "Binary - do not edit"
 msgstr "Двайковыя дадзеныя — не рэдагуюцца"
 
-#: libraries/insert_edit.lib.php:1176 libraries/server_privileges.lib.php:470
-#: templates/table/options.phtml:36
+#: libraries/insert_edit.lib.php:1174 libraries/server_privileges.lib.php:470
+#: templates/table/search/options.phtml:36
 msgid "Or"
 msgstr "Або"
 
-#: libraries/insert_edit.lib.php:1177
+#: libraries/insert_edit.lib.php:1175
 #, fuzzy
 #| msgid "web server upload directory"
 msgid "web server upload directory:"
 msgstr "тэчка вэб-сэрвэра для загрузкі файлаў"
 
-#: libraries/insert_edit.lib.php:1348 templates/table/input_box.phtml:49
+#: libraries/insert_edit.lib.php:1346
+#: templates/table/search/input_box.phtml:49
 #, fuzzy
 #| msgid "Insert"
 msgid "Edit/Insert"
 msgstr "Уставіць"
 
-#: libraries/insert_edit.lib.php:1398
+#: libraries/insert_edit.lib.php:1396
 #, fuzzy, php-format
 #| msgid "Restart insertion with %s rows"
 msgid "Continue insertion with %s rows"
 msgstr "Пачаць устаўку зноў з %s-га радку"
 
-#: libraries/insert_edit.lib.php:1428
+#: libraries/insert_edit.lib.php:1426
 msgid "and then"
 msgstr "і пасьля"
 
-#: libraries/insert_edit.lib.php:1461
+#: libraries/insert_edit.lib.php:1459
 msgid "Insert as new row"
 msgstr "Уставіць як новы радок"
 
-#: libraries/insert_edit.lib.php:1464
+#: libraries/insert_edit.lib.php:1462
 msgid "Insert as new row and ignore errors"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1467
+#: libraries/insert_edit.lib.php:1465
 #, fuzzy
 msgid "Show insert query"
 msgstr "У выглядзе SQL-запыту"
 
-#: libraries/insert_edit.lib.php:1487
+#: libraries/insert_edit.lib.php:1485
 msgid "Go back to previous page"
 msgstr "Перайсьці да папярэдняй старонкі"
 
-#: libraries/insert_edit.lib.php:1490
+#: libraries/insert_edit.lib.php:1488
 msgid "Insert another new row"
 msgstr "Дадаць яшчэ адзін радок"
 
-#: libraries/insert_edit.lib.php:1495
+#: libraries/insert_edit.lib.php:1493
 msgid "Go back to this page"
 msgstr "Вярнуцца да гэтай старонкі"
 
-#: libraries/insert_edit.lib.php:1518
+#: libraries/insert_edit.lib.php:1516
 msgid "Edit next row"
 msgstr "Рэдагаваць наступны радок"
 
-#: libraries/insert_edit.lib.php:1540
+#: libraries/insert_edit.lib.php:1538
 msgid ""
 "Use TAB key to move from value to value, or CTRL+arrows to move anywhere"
 msgstr ""
 "Выкарыстоўвайце клявішу TAB для перамяшчэньня ад значэньня да значэньня або "
 "CTRL+стрэлкі для перамяшчэньня ў любое іншае месца"
 
-#: libraries/insert_edit.lib.php:1577 libraries/replication_gui.lib.php:542
-#: libraries/rte/rte_routines.lib.php:1497
+#: libraries/insert_edit.lib.php:1575 libraries/replication_gui.lib.php:542
+#: libraries/rte/rte_routines.lib.php:1588
 #: libraries/server_status_variables.lib.php:220
-#: templates/designer/having_query_panel.phtml:100
-#: templates/designer/options_panel.phtml:73
-#: templates/designer/options_panel.phtml:239
-#: templates/designer/where_query_panel.phtml:69
-#: templates/table/table_header.phtml:10
-#: templates/table/zoom_result_form.phtml:35
+#: templates/database/designer/having_query_panel.phtml:100
+#: templates/database/designer/options_panel.phtml:73
+#: templates/database/designer/options_panel.phtml:239
+#: templates/database/designer/where_query_panel.phtml:69
+#: templates/table/search/table_header.phtml:10
+#: templates/table/search/zoom_result_form.phtml:35
 msgid "Value"
 msgstr "Значэньне"
 
-#: libraries/insert_edit.lib.php:1937 libraries/sql.lib.php:1309
+#: libraries/insert_edit.lib.php:1935 libraries/sql.lib.php:1303
 msgid "Showing SQL query"
 msgstr "У выглядзе SQL-запыту"
 
-#: libraries/insert_edit.lib.php:1962 libraries/sql.lib.php:1287
+#: libraries/insert_edit.lib.php:1960 libraries/sql.lib.php:1281
 #, php-format
 msgid "Inserted row id: %1$d"
 msgstr "ID устаўленага радку: %1$d"
@@ -10207,7 +10224,7 @@ msgstr ""
 #: libraries/navigation/Nodes/Node_View_Container.class.php:26
 #: libraries/navigation/Nodes/Node_View_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:129
-#: templates/structure/show_create.phtml:30
+#: templates/database/structure/show_create.phtml:30
 #, fuzzy
 #| msgid "View"
 msgid "Views"
@@ -10519,7 +10536,7 @@ msgstr "Вы ня маеце дастатковых прывілеяў быць
 
 #: libraries/operations.lib.php:101 libraries/operations.lib.php:249
 #: libraries/operations.lib.php:869 libraries/operations.lib.php:963
-#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:907
+#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:998
 #: templates/columns_definitions/table_fields_definitions.phtml:47
 #, fuzzy
 #| msgid "Edit Privileges"
@@ -10616,22 +10633,22 @@ msgid "Switch to copied table"
 msgstr "Перайсьці да скапіяванай табліцы"
 
 #: libraries/operations.lib.php:1360
-#: templates/structure/check_all_tables.phtml:18
+#: templates/database/structure/check_all_tables.phtml:18
 msgid "Table maintenance"
 msgstr "Абслугоўваньне табліцы"
 
 #: libraries/operations.lib.php:1398
-#: templates/structure/check_all_tables.phtml:19
+#: templates/database/structure/check_all_tables.phtml:19
 msgid "Analyze table"
 msgstr "Аналізаваць табліцу"
 
 #: libraries/operations.lib.php:1413
-#: templates/structure/check_all_tables.phtml:20
+#: templates/database/structure/check_all_tables.phtml:20
 msgid "Check table"
 msgstr "Праверыць табліцу"
 
 #: libraries/operations.lib.php:1428
-#: templates/structure/check_all_tables.phtml:22
+#: templates/database/structure/check_all_tables.phtml:22
 #, fuzzy
 #| msgid "Check table"
 msgid "Checksum table"
@@ -10653,18 +10670,19 @@ msgid "Flush the table (FLUSH)"
 msgstr "Скінуць кэш табліцы (\"FLUSH\")"
 
 #: libraries/operations.lib.php:1477
-#: templates/structure/check_all_tables.phtml:23
-#: templates/structure/display_table_stats.phtml:56
+#: templates/database/structure/check_all_tables.phtml:23
+#: templates/table/structure/display_table_stats.phtml:56
 msgid "Optimize table"
 msgstr "Аптымізаваць табліцу"
 
 #: libraries/operations.lib.php:1492
-#: templates/structure/check_all_tables.phtml:24
+#: templates/database/structure/check_all_tables.phtml:24
 msgid "Repair table"
 msgstr "Рамантаваць табліцу"
 
 #: libraries/operations.lib.php:1538
-#: templates/structure/check_all_tables.phtml:14 view_operations.php:127
+#: templates/database/structure/check_all_tables.phtml:14
+#: view_operations.php:127
 #, fuzzy
 #| msgid "Dumping data for table"
 msgid "Delete data or table"
@@ -10795,7 +10813,7 @@ msgid "Cannot connect: invalid settings."
 msgstr "Немагчыма падлучыцца: няправільныя налады."
 
 #: libraries/plugins/auth/AuthenticationConfig.class.php:108
-#: libraries/plugins/auth/AuthenticationCookie.class.php:134
+#: libraries/plugins/auth/AuthenticationCookie.class.php:122
 #: libraries/plugins/auth/AuthenticationHttp.class.php:96
 #, php-format
 msgid "Welcome to %s"
@@ -10826,38 +10844,38 @@ msgstr ""
 msgid "Retry to connect"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:146
+#: libraries/plugins/auth/AuthenticationCookie.class.php:134
 msgid "Your session has expired. Please log in again."
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:170
+#: libraries/plugins/auth/AuthenticationCookie.class.php:158
 msgid "Log in"
 msgstr "Уваход у сыстэму"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:178
-#: libraries/plugins/auth/AuthenticationCookie.class.php:188
+#: libraries/plugins/auth/AuthenticationCookie.class.php:166
+#: libraries/plugins/auth/AuthenticationCookie.class.php:176
 msgid "You can enter hostname/IP address and port separated by space."
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:193
+#: libraries/plugins/auth/AuthenticationCookie.class.php:181
 msgid "Username:"
 msgstr "Імя карыстальніка:"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:205
+#: libraries/plugins/auth/AuthenticationCookie.class.php:193
 #, fuzzy
 #| msgid "Server Choice"
 msgid "Server Choice:"
 msgstr "Выбар сэрвэра"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:386
+#: libraries/plugins/auth/AuthenticationCookie.class.php:374
 msgid "Entered captcha is wrong, try again!"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:396
+#: libraries/plugins/auth/AuthenticationCookie.class.php:384
 msgid "Please enter correct captcha!"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:423
+#: libraries/plugins/auth/AuthenticationCookie.class.php:411
 #, fuzzy
 #| msgid "Cannot log in to the MySQL server"
 msgid "You are not allowed to log in to this MySQL server!"
@@ -10969,7 +10987,7 @@ msgstr "Падзея"
 #: libraries/plugins/export/ExportOdt.class.php:593
 #: libraries/plugins/export/ExportTexytext.class.php:428
 #: libraries/plugins/export/PMA_ExportPdf.class.php:313
-#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:984
 #: libraries/rte/rte_triggers.lib.php:377
 #, fuzzy
 #| msgid "Description"
@@ -11321,7 +11339,7 @@ msgid "Last check:"
 msgstr "Апошняя праверка:"
 
 #: libraries/plugins/export/ExportSql.class.php:1399
-#: templates/structure/structure_table_row.phtml:183
+#: templates/database/structure/structure_table_row.phtml:183
 msgid "in use"
 msgstr "выкарыстоўваецца"
 
@@ -11525,22 +11543,16 @@ msgstr ""
 msgid "The imported file does not contain any data!"
 msgstr "Файл %s ня ўтрымлівае ніякага ідэнтыфікатара ключа"
 
-#: libraries/plugins/import/ImportSql.class.php:169
+#: libraries/plugins/import/ImportSql.class.php:72
 #, fuzzy
 #| msgid "SQL compatibility mode"
 msgid "SQL compatibility mode:"
 msgstr "Рэжым сумяшчальнасьці SQL"
 
-#: libraries/plugins/import/ImportSql.class.php:181
+#: libraries/plugins/import/ImportSql.class.php:84
 msgid "Do not use <code>AUTO_INCREMENT</code> for zero values"
 msgstr ""
 
-#: libraries/plugins/import/ImportSql.class.php:195
-#, fuzzy
-#| msgid "Read misses"
-msgid "Read as multibytes"
-msgstr "Пропускаў чытаньня"
-
 #: libraries/plugins/import/ImportXml.class.php:54
 msgid "XML"
 msgstr "XML"
@@ -11585,7 +11597,7 @@ msgid "Show grid"
 msgstr "Паказаць сетку"
 
 #: libraries/plugins/schema/SchemaPdf.class.php:94
-#: templates/structure/print_view_data_dictionary_link.phtml:6
+#: templates/database/structure/print_view_data_dictionary_link.phtml:6
 msgid "Data Dictionary"
 msgstr "Слоўнік дадзеных"
 
@@ -11617,7 +11629,7 @@ msgid "The %s table doesn't exist!"
 msgstr "Табліцы \"%s\" не існуе!"
 
 #: libraries/plugins/schema/eps/Eps_Relation_Schema.class.php:321
-#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:309
+#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:323
 #, fuzzy, php-format
 #| msgid "Schema of the \"%s\" database - Page %s"
 msgid "Schema of the %s database - Page %s"
@@ -11646,7 +11658,7 @@ msgstr "Зьмест"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1005
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1028
 #: libraries/tracking.lib.php:884
-#: templates/structure/table_structure_header.phtml:11
+#: templates/table/structure/table_structure_header.phtml:11
 msgid "Extra"
 msgstr "Дадаткова"
 
@@ -12072,51 +12084,51 @@ msgstr ""
 msgid "Create the needed tables with the <code>%screate_tables.sql</code>."
 msgstr ""
 
-#: libraries/relation.lib.php:360
+#: libraries/relation.lib.php:357
 msgid "Create a pma user and give access to these tables."
 msgstr ""
 
-#: libraries/relation.lib.php:365
+#: libraries/relation.lib.php:360
 msgid ""
 "Enable advanced features in configuration file (<code>config.inc.php</"
 "code>), for example by starting from <code>config.sample.inc.php</code>."
 msgstr ""
 
-#: libraries/relation.lib.php:373
+#: libraries/relation.lib.php:365
 msgid "Re-login to phpMyAdmin to load the updated configuration file."
 msgstr ""
 
-#: libraries/relation.lib.php:1612
+#: libraries/relation.lib.php:1607
 msgid "no description"
 msgstr "няма апісаньня"
 
-#: libraries/relation.lib.php:1811
+#: libraries/relation.lib.php:1806
 msgid ""
 "You do not have necessary privileges to create a database named "
 "'phpmyadmin'. You may go to 'Operations' tab of any database to set up the "
 "phpMyAdmin configuration storage there."
 msgstr ""
 
-#: libraries/relation.lib.php:1928
+#: libraries/relation.lib.php:1923
 #, php-format
 msgid ""
 "%sCreate%s a database named 'phpmyadmin' and setup the phpMyAdmin "
 "configuration storage there."
 msgstr ""
 
-#: libraries/relation.lib.php:1936
+#: libraries/relation.lib.php:1931
 #, php-format
 msgid ""
 "%sCreate%s the phpMyAdmin configuration storage in the current database."
 msgstr ""
 
-#: libraries/relation.lib.php:1944
+#: libraries/relation.lib.php:1939
 #, php-format
 msgid "%sCreate%s missing phpMyAdmin configuration storage tables."
 msgstr ""
 
 #: libraries/replication_gui.lib.php:46 libraries/replication_gui.lib.php:343
-#: libraries/server_databases.lib.php:387
+#: libraries/server_databases.lib.php:398
 msgid "Master replication"
 msgstr ""
 
@@ -12172,7 +12184,7 @@ msgid ""
 msgstr ""
 
 #: libraries/replication_gui.lib.php:141
-#: libraries/server_databases.lib.php:389
+#: libraries/server_databases.lib.php:400
 msgid "Slave replication"
 msgstr ""
 
@@ -12457,10 +12469,10 @@ msgid "Master server changed successfully to %s."
 msgstr "Прывілеі былі пасьпяхова перазагружаныя."
 
 #: libraries/rte/rte_events.lib.php:106 libraries/rte/rte_events.lib.php:115
-#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:149
-#: libraries/rte/rte_routines.lib.php:158
-#: libraries/rte/rte_routines.lib.php:231
-#: libraries/rte/rte_routines.lib.php:1362
+#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:219
+#: libraries/rte/rte_routines.lib.php:246
+#: libraries/rte/rte_routines.lib.php:368
+#: libraries/rte/rte_routines.lib.php:1453
 #: libraries/rte/rte_triggers.lib.php:82 libraries/rte/rte_triggers.lib.php:91
 #: libraries/rte/rte_triggers.lib.php:123
 #, php-format
@@ -12483,7 +12495,7 @@ msgstr "Табліца %s была выдаленая"
 msgid "Event %1$s has been created."
 msgstr "Табліца %1$s створаная."
 
-#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:251
+#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:266
 #: libraries/rte/rte_triggers.lib.php:144
 msgid "One or more errors have occurred while processing your request:"
 msgstr ""
@@ -12493,7 +12505,7 @@ msgstr ""
 msgid "Edit event"
 msgstr "Вэб-сэрвэр"
 
-#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:794
+#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:885
 #: libraries/rte/rte_triggers.lib.php:323 view_create.php:180
 #, fuzzy
 #| msgid "Details…"
@@ -12510,7 +12522,7 @@ msgstr "Тып падзеі"
 msgid "Event type"
 msgstr "Тып падзеі"
 
-#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:817
+#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:908
 #, fuzzy, php-format
 #| msgid "Change"
 msgid "Change to %s"
@@ -12545,12 +12557,14 @@ msgstr "Апошняя старонка"
 msgid "On completion preserve"
 msgstr "Поўная ўстаўка"
 
-#: libraries/rte/rte_events.lib.php:491 libraries/rte/rte_routines.lib.php:930
+#: libraries/rte/rte_events.lib.php:491
+#: libraries/rte/rte_routines.lib.php:1021
 #: libraries/rte/rte_triggers.lib.php:383 view_create.php:209
 msgid "Definer"
 msgstr ""
 
-#: libraries/rte/rte_events.lib.php:535 libraries/rte/rte_routines.lib.php:997
+#: libraries/rte/rte_events.lib.php:535
+#: libraries/rte/rte_routines.lib.php:1088
 #: libraries/rte/rte_triggers.lib.php:422
 msgid "The definer must be in the \"username@hostname\" format!"
 msgstr ""
@@ -12578,9 +12592,9 @@ msgid "You must provide an event definition."
 msgstr ""
 
 #: libraries/rte/rte_export.lib.php:43 libraries/rte/rte_general.lib.php:72
-#: libraries/rte/rte_routines.lib.php:345
-#: libraries/rte/rte_routines.lib.php:1198
-#: libraries/rte/rte_routines.lib.php:1411
+#: libraries/rte/rte_routines.lib.php:153
+#: libraries/rte/rte_routines.lib.php:1289
+#: libraries/rte/rte_routines.lib.php:1502
 #, fuzzy
 #| msgid "Processes"
 msgid "Error in processing request:"
@@ -12616,141 +12630,141 @@ msgid ""
 "problems."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:110
-#: libraries/rte/rte_routines.lib.php:1006
+#: libraries/rte/rte_routines.lib.php:123
+#, fuzzy
+msgid "Edit routine"
+msgstr "Вэб-сэрвэр"
+
+#: libraries/rte/rte_routines.lib.php:200
+#: libraries/rte/rte_routines.lib.php:1097
 #, fuzzy, php-format
 #| msgid "Invalid server index: \"%s\""
 msgid "Invalid routine type: \"%s\""
 msgstr "Некарэктны індэкс сэрвэра: \"%s\""
 
-#: libraries/rte/rte_routines.lib.php:170
-msgid "Sorry, we failed to restore the dropped routine."
-msgstr ""
-
-#: libraries/rte/rte_routines.lib.php:211
-#, fuzzy, php-format
-#| msgid "Table %s has been dropped."
-msgid "Routine %1$s has been modified. Privileges have been adjusted."
-msgstr "Табліца %s была выдаленая"
-
-#: libraries/rte/rte_routines.lib.php:216
-#, fuzzy, php-format
-#| msgid "Table %s has been dropped."
-msgid "Routine %1$s has been modified."
-msgstr "Табліца %s была выдаленая"
-
-#: libraries/rte/rte_routines.lib.php:238
+#: libraries/rte/rte_routines.lib.php:253
 #, fuzzy, php-format
 #| msgid "Table %1$s has been created."
 msgid "Routine %1$s has been created."
 msgstr "Табліца %1$s створаная."
 
-#: libraries/rte/rte_routines.lib.php:315
-#, fuzzy
-msgid "Edit routine"
-msgstr "Вэб-сэрвэр"
+#: libraries/rte/rte_routines.lib.php:380
+msgid "Sorry, we failed to restore the dropped routine."
+msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:797
+#: libraries/rte/rte_routines.lib.php:439
+#, fuzzy, php-format
+#| msgid "Table %s has been dropped."
+msgid "Routine %1$s has been modified. Privileges have been adjusted."
+msgstr "Табліца %s была выдаленая"
+
+#: libraries/rte/rte_routines.lib.php:444
+#, fuzzy, php-format
+#| msgid "Table %s has been dropped."
+msgid "Routine %1$s has been modified."
+msgstr "Табліца %s была выдаленая"
+
+#: libraries/rte/rte_routines.lib.php:888
 #, fuzzy
 #| msgid "Routines"
 msgid "Routine name"
 msgstr "Працэдуры"
 
-#: libraries/rte/rte_routines.lib.php:823
+#: libraries/rte/rte_routines.lib.php:914
 msgid "Parameters"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:829
+#: libraries/rte/rte_routines.lib.php:920
 #, fuzzy
 #| msgid "Direct links"
 msgid "Direction"
 msgstr "Прамыя лініі сувязяў"
 
-#: libraries/rte/rte_routines.lib.php:847
+#: libraries/rte/rte_routines.lib.php:938
 #, fuzzy
 #| msgid "Add new field"
 msgid "Add parameter"
 msgstr "Дадаць новае поле"
 
-#: libraries/rte/rte_routines.lib.php:851
+#: libraries/rte/rte_routines.lib.php:942
 #, fuzzy
 #| msgid "Rename database to"
 msgid "Remove last parameter"
 msgstr "Перайменаваць базу дадзеных у"
 
-#: libraries/rte/rte_routines.lib.php:856
+#: libraries/rte/rte_routines.lib.php:947
 msgid "Return type"
 msgstr "Тып працэдуры"
 
-#: libraries/rte/rte_routines.lib.php:862
+#: libraries/rte/rte_routines.lib.php:953
 #, fuzzy
 #| msgid "Length/Values"
 msgid "Return length/values"
 msgstr "Даўжыня/Значэньні*"
 
-#: libraries/rte/rte_routines.lib.php:868
+#: libraries/rte/rte_routines.lib.php:959
 #, fuzzy
 #| msgid "Table options"
 msgid "Return options"
 msgstr "Опцыі табліцы"
 
-#: libraries/rte/rte_routines.lib.php:899
+#: libraries/rte/rte_routines.lib.php:990
 msgid "Is deterministic"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:920
+#: libraries/rte/rte_routines.lib.php:1011
 msgid ""
 "You do not have sufficient privileges to perform this operation; Please "
 "refer to the documentation for more details"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:935
+#: libraries/rte/rte_routines.lib.php:1026
 #, fuzzy
 #| msgid "Query type"
 msgid "Security type"
 msgstr "Тып запыту"
 
-#: libraries/rte/rte_routines.lib.php:944
+#: libraries/rte/rte_routines.lib.php:1035
 msgid "SQL data access"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1013
+#: libraries/rte/rte_routines.lib.php:1104
 #, fuzzy
 #| msgid "Invalid table name"
 msgid "You must provide a routine name!"
 msgstr "Некарэктнае імя табліцы"
 
-#: libraries/rte/rte_routines.lib.php:1047
+#: libraries/rte/rte_routines.lib.php:1138
 #, php-format
 msgid "Invalid direction \"%s\" given for parameter."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1069
-#: libraries/rte/rte_routines.lib.php:1131
+#: libraries/rte/rte_routines.lib.php:1160
+#: libraries/rte/rte_routines.lib.php:1222
 msgid ""
 "You must provide length/values for routine parameters of type ENUM, SET, "
 "VARCHAR and VARBINARY."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1095
+#: libraries/rte/rte_routines.lib.php:1186
 msgid "You must provide a name and a type for each routine parameter."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1114
+#: libraries/rte/rte_routines.lib.php:1205
 msgid "You must provide a valid return type for the routine."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1174
+#: libraries/rte/rte_routines.lib.php:1265
 msgid "You must provide a routine definition."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1285
+#: libraries/rte/rte_routines.lib.php:1376
 #, fuzzy, php-format
 #| msgid "Allows executing stored routines."
 msgid "Execution results of routine %s"
 msgstr "Дазваляе выкананьне праграмаў, якія захоўваюцца."
 
-#: libraries/rte/rte_routines.lib.php:1340
+#: libraries/rte/rte_routines.lib.php:1431
 #, php-format
 msgid "%d row affected by the last statement inside the procedure."
 msgid_plural "%d rows affected by the last statement inside the procedure."
@@ -12758,13 +12772,13 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: libraries/rte/rte_routines.lib.php:1398
-#: libraries/rte/rte_routines.lib.php:1406
+#: libraries/rte/rte_routines.lib.php:1489
+#: libraries/rte/rte_routines.lib.php:1497
 msgid "Execute routine"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1485
-#: libraries/rte/rte_routines.lib.php:1488
+#: libraries/rte/rte_routines.lib.php:1576
+#: libraries/rte/rte_routines.lib.php:1579
 #, fuzzy
 #| msgid "Routines"
 msgid "Routine parameters"
@@ -12960,7 +12974,7 @@ msgid "Original position"
 msgstr "Першапачатковая пазыцыя"
 
 #: libraries/server_bin_log.lib.php:133
-#: templates/structure/display_table_stats.phtml:4
+#: templates/table/structure/display_table_stats.phtml:4
 msgid "Information"
 msgstr "Інфармацыя"
 
@@ -12998,12 +13012,12 @@ msgstr ""
 "Заўвага: Уключэньне статыстыкі базы дадзеных можа выклікаць вялікую "
 "колькасьць трафіку паміж вэб-сэрвэрам і сэрвэрам MySQL."
 
-#: libraries/server_databases.lib.php:364
-#: libraries/server_databases.lib.php:365
+#: libraries/server_databases.lib.php:366
+#: libraries/server_databases.lib.php:371
 msgid "Enable Statistics"
 msgstr "Уключыць статыстыку"
 
-#: libraries/server_databases.lib.php:481
+#: libraries/server_databases.lib.php:492
 #, fuzzy, php-format
 #| msgid "%s databases have been dropped successfully."
 msgid "%1$d database has been dropped successfully."
@@ -13396,7 +13410,7 @@ msgid "You have revoked the privileges for %s."
 msgstr "Вы анулявалі прывілеі для %s."
 
 #: libraries/server_privileges.lib.php:2059
-#: libraries/server_privileges.lib.php:4290
+#: libraries/server_privileges.lib.php:4316
 #, fuzzy
 #| msgid "Any user"
 msgid "Add user account"
@@ -13585,60 +13599,60 @@ msgstr "Выдаленьне %s"
 msgid "The privileges were reloaded successfully."
 msgstr "Прывілеі былі пасьпяхова перазагружаныя."
 
-#: libraries/server_privileges.lib.php:3994
+#: libraries/server_privileges.lib.php:4003
 #, php-format
 msgid "The user %s already exists!"
 msgstr "Карыстальнік %s ужо існуе!"
 
-#: libraries/server_privileges.lib.php:4232
+#: libraries/server_privileges.lib.php:4258
 #, fuzzy, php-format
 #| msgid "Privileges"
 msgid "Privileges for %s"
 msgstr "Прывілеі"
 
-#: libraries/server_privileges.lib.php:4241
+#: libraries/server_privileges.lib.php:4267
 #: libraries/server_status_processes.lib.php:72
 #: libraries/server_user_groups.lib.php:39
 msgid "User"
 msgstr "Карыстальнік"
 
-#: libraries/server_privileges.lib.php:4282
+#: libraries/server_privileges.lib.php:4308
 msgctxt "Create new user"
 msgid "New"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4311
+#: libraries/server_privileges.lib.php:4337
 #, fuzzy
 #| msgid "Edit Privileges"
 msgid "Edit privileges:"
 msgstr "Рэдагаваць прывілеі"
 
-#: libraries/server_privileges.lib.php:4312
+#: libraries/server_privileges.lib.php:4338
 #, fuzzy
 #| msgid "User"
 msgid "User account"
 msgstr "Карыстальнік"
 
-#: libraries/server_privileges.lib.php:4371
+#: libraries/server_privileges.lib.php:4397
 msgid ""
 "Note: You are attempting to edit privileges of the user with which you are "
 "currently logged in."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4391 libraries/server_users.lib.php:25
+#: libraries/server_privileges.lib.php:4417 libraries/server_users.lib.php:25
 #, fuzzy
 #| msgid "User overview"
 msgid "User accounts overview"
 msgstr "Карыстальнікі"
 
-#: libraries/server_privileges.lib.php:4459
+#: libraries/server_privileges.lib.php:4485
 msgid ""
 "A user account allowing any user from localhost to connect is present. This "
 "will prevent other users from connecting if the host part of their account "
 "allows a connection from any (%) host."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4500
+#: libraries/server_privileges.lib.php:4526
 #, php-format
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
@@ -13651,7 +13665,7 @@ msgstr ""
 "якія выкарыстоўвае сэрвэр, калі яны былі зьмененыя ўручную. У гэтым выпадку "
 "вам трэба %sперазагрузіць прывілеі%s да таго, як вы працягнеце."
 
-#: libraries/server_privileges.lib.php:4519
+#: libraries/server_privileges.lib.php:4545
 #, fuzzy
 #| msgid ""
 #| "Note: phpMyAdmin gets the users' privileges directly from MySQL's "
@@ -13670,45 +13684,45 @@ msgstr ""
 "якія выкарыстоўвае сэрвэр, калі яны былі зьмененыя ўручную. У гэтым выпадку "
 "вам трэба %sперазагрузіць прывілеі%s да таго, як вы працягнеце."
 
-#: libraries/server_privileges.lib.php:4569
+#: libraries/server_privileges.lib.php:4595
 msgid "The selected user was not found in the privilege table."
 msgstr "Вылучаны карыстальнік ня знойдзены ў табліцы прывілеяў."
 
-#: libraries/server_privileges.lib.php:4801
+#: libraries/server_privileges.lib.php:4827
 msgid "You have added a new user."
 msgstr "Быў дададзены новы карыстальнік."
 
-#: libraries/server_status.lib.php:53
+#: libraries/server_status.lib.php:60
 #, php-format
 msgid "Network traffic since startup: %s"
 msgstr ""
 
-#: libraries/server_status.lib.php:66
+#: libraries/server_status.lib.php:73
 #, fuzzy, php-format
 #| msgid "This MySQL server has been running for %s. It started up on %s."
 msgid "This MySQL server has been running for %1$s. It started up on %2$s."
 msgstr "Гэты сэрвэр MySQL працуе %s. Ён быў запушчаны %s."
 
-#: libraries/server_status.lib.php:80
+#: libraries/server_status.lib.php:94
 msgid ""
 "This MySQL server works as <b>master</b> and <b>slave</b> in <b>replication</"
 "b> process."
 msgstr ""
 
-#: libraries/server_status.lib.php:85
+#: libraries/server_status.lib.php:99
 msgid "This MySQL server works as <b>master</b> in <b>replication</b> process."
 msgstr ""
 
-#: libraries/server_status.lib.php:90
+#: libraries/server_status.lib.php:104
 msgid "This MySQL server works as <b>slave</b> in <b>replication</b> process."
 msgstr ""
 
-#: libraries/server_status.lib.php:106
+#: libraries/server_status.lib.php:116
 #, fuzzy
 msgid "Replication status"
 msgstr "Рэплікацыя"
 
-#: libraries/server_status.lib.php:137
+#: libraries/server_status.lib.php:146
 msgid ""
 "On a busy server, the byte counters may overrun, so those statistics as "
 "reported by the MySQL server may be incorrect."
@@ -13716,21 +13730,21 @@ msgstr ""
 "На загружаным сэрвэры байтавыя лічыльнікі могуць пераскокваць кола, таму "
 "статыстыка, якую паказвае MySQL-сэрвэр, можа быць няправільнай."
 
-#: libraries/server_status.lib.php:148
+#: libraries/server_status.lib.php:157
 msgid "Received"
 msgstr "Атрымана"
 
-#: libraries/server_status.lib.php:167
+#: libraries/server_status.lib.php:176
 msgid "Sent"
 msgstr "Адпраўлена"
 
-#: libraries/server_status.lib.php:234
+#: libraries/server_status.lib.php:243
 #, fuzzy
 #| msgid "max. concurrent connections"
 msgid "Max. concurrent connections"
 msgstr "максымум адначасовых злучэньняў"
 
-#: libraries/server_status.lib.php:244
+#: libraries/server_status.lib.php:253
 msgid "Failed attempts"
 msgstr "Няўдалых спробаў"
 
@@ -14853,7 +14867,7 @@ msgstr ""
 msgid "Not implemented yet."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/AlterOperation.php:193
+#: libraries/sql-parser/src/Components/AlterOperation.php:191
 msgid "Unrecognized alter operation."
 msgstr ""
 
@@ -14867,7 +14881,7 @@ msgid "An opening bracket followed by a set of values was expected."
 msgstr ""
 
 #: libraries/sql-parser/src/Components/ArrayObj.php:101
-#: libraries/sql-parser/src/Components/FieldDefinition.php:202
+#: libraries/sql-parser/src/Components/CreateDefinition.php:202
 msgid "An opening bracket was expected."
 msgstr ""
 
@@ -14875,25 +14889,35 @@ msgstr ""
 msgid "A comma or a closing bracket was expected"
 msgstr ""
 
+#: libraries/sql-parser/src/Components/CreateDefinition.php:246
+#, fuzzy
+#| msgid "No databases selected."
+msgid "A comma or a closing bracket was expected."
+msgstr "Ня выбраная база дадзеных."
+
+#: libraries/sql-parser/src/Components/CreateDefinition.php:262
+msgid "A closing bracket was expected."
+msgstr ""
+
 #: libraries/sql-parser/src/Components/DataType.php:125
 msgid "Unrecognized data type."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:225
+#: libraries/sql-parser/src/Components/Expression.php:227
 msgid "Unexpected closing bracket."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:246
-#: libraries/sql-parser/src/Components/Expression.php:283
-#: libraries/sql-parser/src/Components/Expression.php:303
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:285
+#: libraries/sql-parser/src/Components/Expression.php:305
 msgid "An alias was previously found."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:257
+#: libraries/sql-parser/src/Components/Expression.php:259
 msgid "Unexpected dot."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:327
+#: libraries/sql-parser/src/Components/Expression.php:329
 #, fuzzy
 #| msgid "No databases selected."
 msgid "An alias was expected."
@@ -14905,16 +14929,6 @@ msgstr "Ня выбраная база дадзеных."
 msgid "An expression was expected."
 msgstr "Ніводны радок ня выбраны"
 
-#: libraries/sql-parser/src/Components/FieldDefinition.php:246
-#, fuzzy
-#| msgid "No databases selected."
-msgid "A comma or a closing bracket was expected."
-msgstr "Ня выбраная база дадзеных."
-
-#: libraries/sql-parser/src/Components/FieldDefinition.php:262
-msgid "A closing bracket was expected."
-msgstr ""
-
 #: libraries/sql-parser/src/Components/Limit.php:90
 #: libraries/sql-parser/src/Components/Limit.php:112
 msgid "An offset was expected."
@@ -14960,28 +14974,28 @@ msgstr ""
 msgid "Expected delimiter."
 msgstr ""
 
-#: libraries/sql-parser/src/Lexer.php:753
+#: libraries/sql-parser/src/Lexer.php:777
 #, fuzzy, php-format
 #| msgid "Table %1$s has been created."
 msgid "Ending quote %1$s was expected."
 msgstr "Табліца %1$s створаная."
 
-#: libraries/sql-parser/src/Lexer.php:789
+#: libraries/sql-parser/src/Lexer.php:813
 #, fuzzy
 msgid "Variable name was expected."
 msgstr "Шаблён назвы файла"
 
-#: libraries/sql-parser/src/Parser.php:380
+#: libraries/sql-parser/src/Parser.php:391
 #, fuzzy
 #| msgid "At Beginning of Table"
 msgid "Unexpected beginning of statement."
 msgstr "У пачатку табліцы"
 
-#: libraries/sql-parser/src/Parser.php:399
+#: libraries/sql-parser/src/Parser.php:410
 msgid "Unrecognized statement type."
 msgstr ""
 
-#: libraries/sql-parser/src/Parser.php:479
+#: libraries/sql-parser/src/Parser.php:489
 msgid "No transaction was previously started."
 msgstr ""
 
@@ -15009,8 +15023,10 @@ msgid "The name of the entity was expected."
 msgstr "Колькасьць адкрытых табліц."
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:310
-msgid "At least one field definition was expected."
-msgstr ""
+#, fuzzy
+#| msgid "The row has been deleted."
+msgid "At least one column definition was expected."
+msgstr "Радок быў выдалены"
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:329
 msgid "A \"RETURNS\" keyword was expected."
@@ -15082,25 +15098,25 @@ msgstr "Закладка %s створаная"
 msgid "Using bookmark \"%s\" as default browse query."
 msgstr ""
 
-#: libraries/sql.lib.php:1306
+#: libraries/sql.lib.php:1300
 msgid "Showing as PHP code"
 msgstr "У выглядзе PHP-коду"
 
-#: libraries/sql.lib.php:1638
+#: libraries/sql.lib.php:1632
 #, php-format
 msgid ""
 "Current selection does not contain a unique column. Grid edit, checkbox, "
 "Edit, Copy and Delete features are not available. %s"
 msgstr ""
 
-#: libraries/sql.lib.php:1649
+#: libraries/sql.lib.php:1643
 #, php-format
 msgid ""
 "Current selection does not contain a unique column. Grid edit, Edit, Copy "
 "and Delete features may result in undesired behavior. %s"
 msgstr ""
 
-#: libraries/sql.lib.php:1688
+#: libraries/sql.lib.php:1682
 #, php-format
 msgid "Problems with indexes of table `%s`"
 msgstr "Праблемы з індэксамі для табліцы `%s`"
@@ -15269,7 +15285,7 @@ msgid "Version %s snapshot (SQL code)"
 msgstr ""
 
 #: libraries/tracking.lib.php:947
-#: templates/structure/table_structure_row.phtml:33
+#: templates/table/structure/table_structure_row.phtml:33
 #, fuzzy
 #| msgid "None"
 msgctxt "None for default"
@@ -15323,19 +15339,19 @@ msgstr "Стварыць сувязь"
 msgid "Version %1$s was created, tracking for %2$s is active."
 msgstr ""
 
-#: libraries/user_preferences.inc.php:29
+#: libraries/user_preferences.inc.php:30
 #, fuzzy
 #| msgid "General relation features"
 msgid "Manage your settings"
 msgstr "Магчымасьці асноўных сувязяў"
 
-#: libraries/user_preferences.inc.php:46 prefs_manage.php:307
+#: libraries/user_preferences.inc.php:54 prefs_manage.php:307
 #, fuzzy
 #| msgid "Modifications have been saved"
 msgid "Configuration has been saved."
 msgstr "Мадыфікацыі былі захаваныя"
 
-#: libraries/user_preferences.inc.php:66
+#: libraries/user_preferences.inc.php:74
 #, php-format
 msgid ""
 "Your preferences will be saved for current session only. Storing them "
@@ -15747,7 +15763,7 @@ msgid "first"
 msgstr ""
 
 #: templates/columns_definitions/move_column.phtml:12
-#: templates/structure/add_column.phtml:21
+#: templates/table/structure/add_column.phtml:21
 #, fuzzy, php-format
 #| msgid "After %s"
 msgid "after %s"
@@ -15835,241 +15851,354 @@ msgstr "Пераўтварэньне MIME-тыпу браўзэрам"
 msgid "Input transformation options"
 msgstr "Опцыі пераўтварэньня"
 
-#: templates/designer/aggregate_query_panel.phtml:22
-#: templates/designer/options_panel.phtml:100
+#: templates/database/create_table.phtml:7
+#: templates/database/designer/side_menu.phtml:77
+#: templates/database/designer/side_menu.phtml:80
+msgid "Create table"
+msgstr "Стварыць табліцу"
+
+#: templates/database/create_table.phtml:15
+#, fuzzy
+#| msgid "Number of fields"
+msgid "Number of columns"
+msgstr "Колькасьць палёў"
+
+#: templates/database/designer/aggregate_query_panel.phtml:22
+#: templates/database/designer/options_panel.phtml:100
 #, fuzzy
 #| msgid "Create"
 msgid "Aggregate"
 msgstr "Стварыць"
 
-#: templates/designer/aggregate_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:61
-#: templates/designer/options_panel.phtml:106
-#: templates/designer/options_panel.phtml:170
-#: templates/designer/where_query_panel.phtml:30
-#: templates/table/table_header.phtml:9
+#: templates/database/designer/aggregate_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:61
+#: templates/database/designer/options_panel.phtml:106
+#: templates/database/designer/options_panel.phtml:170
+#: templates/database/designer/where_query_panel.phtml:30
+#: templates/table/search/table_header.phtml:9
 msgid "Operator"
 msgstr "Апэратар"
 
-#: templates/designer/database_tables.phtml:29
+#: templates/database/designer/database_tables.phtml:29
 msgid "Toggle"
 msgstr ""
 
-#: templates/designer/database_tables.phtml:40
+#: templates/database/designer/database_tables.phtml:40
 #, fuzzy
 #| msgid "Database for user"
 msgid "See table structure"
 msgstr "База дадзеных для карыстальніка"
 
-#: templates/designer/delete_relation_panel.phtml:21
+#: templates/database/designer/delete_relation_panel.phtml:21
 msgid "Delete relation"
 msgstr "Выдаліць сувязь"
 
-#: templates/designer/edit_delete_pages.phtml:7
+#: templates/database/designer/edit_delete_pages.phtml:7
 #, fuzzy
 #| msgid "Page number:"
 msgid "Page to open"
 msgstr "Старонка:"
 
-#: templates/designer/edit_delete_pages.phtml:7
+#: templates/database/designer/edit_delete_pages.phtml:7
 #, fuzzy
 #| msgid "Relation deleted"
 msgid "Page to delete"
 msgstr "Сувязь выдаленая"
 
-#: templates/designer/having_query_panel.phtml:90
-#: templates/designer/options_panel.phtml:63
-#: templates/designer/options_panel.phtml:229
-#: templates/designer/where_query_panel.phtml:59
+#: templates/database/designer/having_query_panel.phtml:90
+#: templates/database/designer/options_panel.phtml:63
+#: templates/database/designer/options_panel.phtml:229
+#: templates/database/designer/where_query_panel.phtml:59
 #, fuzzy
 #| msgid "Export"
 msgid "Except"
 msgstr "Экспарт"
 
-#: templates/designer/having_query_panel.phtml:102
-#: templates/designer/options_panel.phtml:75
-#: templates/designer/options_panel.phtml:241
-#: templates/designer/where_query_panel.phtml:71
+#: templates/database/designer/having_query_panel.phtml:102
+#: templates/database/designer/options_panel.phtml:75
+#: templates/database/designer/options_panel.phtml:241
+#: templates/database/designer/where_query_panel.phtml:71
 #, fuzzy
 #| msgid "in query"
 msgid "subquery"
 msgstr "па запыту"
 
-#: templates/designer/new_relation_panel.phtml:22
-#: templates/designer/side_menu.phtml:84 templates/designer/side_menu.phtml:87
+#: templates/database/designer/new_relation_panel.phtml:22
+#: templates/database/designer/side_menu.phtml:84
+#: templates/database/designer/side_menu.phtml:87
 msgid "Create relation"
 msgstr "Стварыць сувязь"
 
-#: templates/designer/options_panel.phtml:34
-#: templates/designer/options_panel.phtml:200
+#: templates/database/designer/options_panel.phtml:34
+#: templates/database/designer/options_panel.phtml:200
 #, fuzzy
 #| msgid "Relation deleted"
 msgid "Relation operator"
 msgstr "Сувязь выдаленая"
 
-#: templates/designer/options_panel.phtml:85
-#: templates/designer/rename_to_panel.phtml:23
+#: templates/database/designer/options_panel.phtml:85
+#: templates/database/designer/rename_to_panel.phtml:23
 #, fuzzy
 msgid "Rename to"
 msgstr "Перайменаваць табліцу ў"
 
-#: templates/designer/options_panel.phtml:91
-#: templates/designer/rename_to_panel.phtml:31
+#: templates/database/designer/options_panel.phtml:91
+#: templates/database/designer/rename_to_panel.phtml:31
 #, fuzzy
 #| msgid "User name"
 msgid "New name"
 msgstr "Імя карыстальніка"
 
-#: templates/designer/page_save_as.phtml:4
+#: templates/database/designer/page_save_as.phtml:4
 #, fuzzy
 #| msgid "Export/Import to scale"
 msgid "Save to selected page"
 msgstr "Маштаб"
 
-#: templates/designer/page_save_as.phtml:5
+#: templates/database/designer/page_save_as.phtml:5
 #, fuzzy
 #| msgid "Create a new index"
 msgid "Create a page and save to it"
 msgstr "Стварыць новы індэкс"
 
-#: templates/designer/page_save_as.phtml:26
+#: templates/database/designer/page_save_as.phtml:26
 #, fuzzy
 #| msgid "User name"
 msgid "New page name"
 msgstr "Імя карыстальніка"
 
-#: templates/designer/page_selector.phtml:2
+#: templates/database/designer/page_selector.phtml:2
 #, fuzzy
 #| msgid "Select All"
 msgid "Select page"
 msgstr "Выбраць усё"
 
-#: templates/designer/query_details.phtml:10
+#: templates/database/designer/query_details.phtml:10
 #, fuzzy
 #| msgid "Table options"
 msgid "Active options"
 msgstr "Опцыі табліцы"
 
-#: templates/designer/schema_export.phtml:4
+#: templates/database/designer/schema_export.phtml:4
 msgid "Select Export Relational Type"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:19 templates/designer/side_menu.phtml:25
+#: templates/database/designer/side_menu.phtml:19
+#: templates/database/designer/side_menu.phtml:25
 #, fuzzy
 #| msgid "Show tables"
 msgid "Show/Hide tables list"
 msgstr "Паказаць табліцы"
 
-#: templates/designer/side_menu.phtml:29 templates/designer/side_menu.phtml:35
-#: templates/designer/side_menu.phtml:36
+#: templates/database/designer/side_menu.phtml:29
+#: templates/database/designer/side_menu.phtml:35
+#: templates/database/designer/side_menu.phtml:36
 msgid "View in fullscreen"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:34
+#: templates/database/designer/side_menu.phtml:34
 msgid "Exit fullscreen"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:41 templates/designer/side_menu.phtml:45
+#: templates/database/designer/side_menu.phtml:41
+#: templates/database/designer/side_menu.phtml:45
 #, fuzzy
 #| msgid "User name"
 msgid "New page"
 msgstr "Імя карыстальніка"
 
-#: templates/designer/side_menu.phtml:70 templates/designer/side_menu.phtml:73
+#: templates/database/designer/side_menu.phtml:70
+#: templates/database/designer/side_menu.phtml:73
 #, fuzzy
 #| msgid "Select All"
 msgid "Delete pages"
 msgstr "Выбраць усё"
 
-#: templates/designer/side_menu.phtml:77 templates/designer/side_menu.phtml:80
-#: templates/table/create_table.phtml:7
-msgid "Create table"
-msgstr "Стварыць табліцу"
-
-#: templates/designer/side_menu.phtml:98
-#: templates/designer/side_menu.phtml:101
+#: templates/database/designer/side_menu.phtml:98
+#: templates/database/designer/side_menu.phtml:101
 msgid "Reload"
 msgstr "Абнавіць"
 
-#: templates/designer/side_menu.phtml:107
-#: templates/designer/side_menu.phtml:110
+#: templates/database/designer/side_menu.phtml:107
+#: templates/database/designer/side_menu.phtml:110
 msgid "Help"
 msgstr "Дапамога"
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Angular links"
 msgstr "Вуглавыя лініі сувязяў"
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Direct links"
 msgstr "Прамыя лініі сувязяў"
 
-#: templates/designer/side_menu.phtml:122
-#: templates/designer/side_menu.phtml:124
+#: templates/database/designer/side_menu.phtml:122
+#: templates/database/designer/side_menu.phtml:124
 msgid "Snap to grid"
 msgstr "Зьвяць зь сеткай"
 
-#: templates/designer/side_menu.phtml:128
-#: templates/designer/side_menu.phtml:134
+#: templates/database/designer/side_menu.phtml:128
+#: templates/database/designer/side_menu.phtml:134
 msgid "Small/Big All"
 msgstr "Згарнуць/разгарнуць адлюстраваньне ўсіх табліц"
 
-#: templates/designer/side_menu.phtml:138
-#: templates/designer/side_menu.phtml:141
+#: templates/database/designer/side_menu.phtml:138
+#: templates/database/designer/side_menu.phtml:141
 msgid "Toggle small/big"
 msgstr "Пераключыць маленькі/вялікі"
 
-#: templates/designer/side_menu.phtml:145
-#: templates/designer/side_menu.phtml:148
+#: templates/database/designer/side_menu.phtml:145
+#: templates/database/designer/side_menu.phtml:148
 #, fuzzy
 #| msgid "To select relation, click :"
 msgid "Toggle relation lines"
 msgstr ""
 "Каб выбраць сувязь, націсьніце на кропцы злучэньня, як паказана на выяве:"
 
-#: templates/designer/side_menu.phtml:153
-#: templates/designer/side_menu.phtml:156
+#: templates/database/designer/side_menu.phtml:153
+#: templates/database/designer/side_menu.phtml:156
 #, fuzzy
 #| msgid "Export"
 msgid "Export schema"
 msgstr "Экспарт"
 
-#: templates/designer/side_menu.phtml:165
-#: templates/designer/side_menu.phtml:168
+#: templates/database/designer/side_menu.phtml:165
+#: templates/database/designer/side_menu.phtml:168
 #, fuzzy
 #| msgid "Submit Query"
 msgid "Build Query"
 msgstr "Выканаць запыт"
 
-#: templates/designer/side_menu.phtml:173
-#: templates/designer/side_menu.phtml:177
+#: templates/database/designer/side_menu.phtml:173
+#: templates/database/designer/side_menu.phtml:177
 msgid "Move Menu"
 msgstr "Перасунуць мэню"
 
-#: templates/designer/side_menu.phtml:181
-#: templates/designer/side_menu.phtml:186
+#: templates/database/designer/side_menu.phtml:181
+#: templates/database/designer/side_menu.phtml:186
 #, fuzzy
 #| msgid "Partial Texts"
 msgid "Pin text"
 msgstr "Частковыя тэксты"
 
-#: templates/designer/table_list.phtml:4
+#: templates/database/designer/table_list.phtml:4
 msgid "Hide/Show all"
 msgstr "Схаваць/паказаць усе табліцы"
 
-#: templates/designer/table_list.phtml:14
+#: templates/database/designer/table_list.phtml:14
 msgid "Hide/Show Tables with no relation"
 msgstr "Схаваць/паказаць табліцы бяз сувязяў"
 
-#: templates/designer/table_list.phtml:59
+#: templates/database/designer/table_list.phtml:59
 #, fuzzy
 #| msgid "Number of tables"
 msgid "Number of tables:"
 msgstr "Колькасьць табліц"
 
+#: templates/database/structure/body_for_table_summary.phtml:6
+#, php-format
+msgid "%s table"
+msgid_plural "%s tables"
+msgstr[0] "%s табліца"
+msgstr[1] "%s табліцы"
+msgstr[2] "%s табліц"
+
+#: templates/database/structure/body_for_table_summary.phtml:17
+msgid "Sum"
+msgstr "Усяго"
+
+#: templates/database/structure/check_all_tables.phtml:6
+msgid "Check tables having overhead"
+msgstr "Адзначыць тыя, што патрабуюць аптымізацыі"
+
+#: templates/database/structure/check_all_tables.phtml:10
+#, fuzzy
+#| msgid "Show color"
+msgid "Show create"
+msgstr "Паказаць колер"
+
+#: templates/database/structure/check_all_tables.phtml:27
+#, fuzzy
+#| msgid "Add new field"
+msgid "Prefix"
+msgstr "Дадаць новае поле"
+
+#: templates/database/structure/check_all_tables.phtml:28
+#, fuzzy
+msgid "Add prefix to table"
+msgstr "Базы дадзеных адсутнічаюць"
+
+#: templates/database/structure/check_all_tables.phtml:29
+#, fuzzy
+#| msgid "Replace table data with file"
+msgid "Replace table prefix"
+msgstr "Замяніць дадзеныя табліцы дадзенымі з файла"
+
+#: templates/database/structure/check_all_tables.phtml:30
+#, fuzzy
+#| msgid "Replace table data with file"
+msgid "Copy table with prefix"
+msgstr "Замяніць дадзеныя табліцы дадзенымі з файла"
+
+#: templates/database/structure/check_all_tables.phtml:36
+#, fuzzy
+#| msgid "Add %s field(s)"
+msgid "Add columns to central list"
+msgstr "Дадаць %s новыя палі"
+
+#: templates/database/structure/check_all_tables.phtml:37
+msgid "Remove columns from central list"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:38
+#, fuzzy
+#| msgid "Add %s field(s)"
+msgid "Make consistent with central list"
+msgstr "Дадаць %s новыя палі"
+
+#: templates/database/structure/favorite_anchor.phtml:12
+#, fuzzy
+msgid "Add to Favorites"
+msgstr "Дадаць новага карыстальніка"
+
+#: templates/database/structure/show_create.phtml:2
+#, fuzzy
+msgid "Showing create queries"
+msgstr "Паказаць поўныя запыты"
+
+#: templates/database/structure/sortable_header.phtml:13
+msgid "Sort"
+msgstr "Парадак"
+
+#: templates/database/structure/table_header.phtml:42
+#, fuzzy
+#| msgid "May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]"
+msgid ""
+"May be approximate. Click on the number to get the exact count. See "
+"[doc@faq3-11]FAQ 3.11[/doc]."
+msgstr "Значэньне можа быць прыблізным. Гл. [doc@faq3-11]FAQ 3.11[/doc]"
+
+#: templates/database/structure/table_header.phtml:66
+#: templates/table/index_form.phtml:127
+msgid "Size"
+msgstr "Памер"
+
+#: templates/database/structure/table_header.phtml:74
+#: templates/table/structure/display_table_stats.phtml:27
+msgid "Overhead"
+msgstr "Выкарыстаньне рэсурсаў"
+
+#: templates/database/structure/tracking_icon.phtml:4
+msgid "Tracking is active."
+msgstr ""
+
+#: templates/database/structure/tracking_icon.phtml:8
+msgid "Tracking is not active."
+msgstr ""
+
 #: templates/error/report_form.phtml:7
 msgid ""
 "phpMyAdmin has encountered an error. We have collected data about this error "
@@ -16085,70 +16214,6 @@ msgstr ""
 msgid "Please explain the steps that lead to the error:"
 msgstr ""
 
-#: templates/gis_visualization/gis_visualization.phtml:3
-msgid "Display GIS Visualization"
-msgstr ""
-
-#: templates/gis_visualization/gis_visualization.phtml:8
-#, fuzzy
-#| msgid "Add/Delete Field Columns"
-msgid "Label column"
-msgstr "Дадаць/выдаліць калёнку крытэру"
-
-#: templates/gis_visualization/gis_visualization.phtml:11
-msgid "-- None --"
-msgstr ""
-
-#: templates/gis_visualization/gis_visualization.phtml:19
-#, fuzzy
-#| msgid "Log file count"
-msgid "Spatial column"
-msgstr "Колькасьць файлаў логу"
-
-#: templates/index_form.phtml:16
-msgid "Index name:"
-msgstr "Імя індэкса:"
-
-#: templates/index_form.phtml:19
-msgid ""
-"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
-msgstr ""
-"\"PRIMARY\" <b>мусіць</b> быць імем першаснага ключа і <b>толькі</b> яго!"
-
-#: templates/index_form.phtml:40
-#, fuzzy
-#| msgid "Index cache size"
-msgid "Index choice:"
-msgstr "Памер кэшу індэксаў"
-
-#: templates/index_form.phtml:57
-msgid "Key block size:"
-msgstr ""
-
-#: templates/index_form.phtml:74
-msgid "Index type:"
-msgstr "Тып індэкса:"
-
-#: templates/index_form.phtml:86
-#, fuzzy
-#| msgid "User"
-msgid "Parser:"
-msgstr "Карыстальнік"
-
-#: templates/index_form.phtml:102
-#, fuzzy
-#| msgid "Comment"
-msgid "Comment:"
-msgstr "Камэнтар"
-
-#: templates/index_form.phtml:127 templates/structure/table_header.phtml:66
-msgid "Size"
-msgstr "Памер"
-
-#: templates/index_form.phtml:149 templates/index_form.phtml:190
-msgid "Drag to reorder"
-msgstr ""
-
 #: templates/prefs_autoload.phtml:9
 msgid ""
 "Your browser has phpMyAdmin configuration for this domain. Would you like to "
@@ -16161,437 +16226,184 @@ msgstr ""
 msgid "Start row:"
 msgstr "Суб"
 
-#: templates/structure/actions_in_table_structure.phtml:14
-#, php-format
-msgid "A primary key has been added on %s."
-msgstr "Першасны ключ быў дададзены да %s."
-
-#: templates/structure/actions_in_table_structure.phtml:34
-#: templates/structure/actions_in_table_structure.phtml:54
-#: templates/structure/actions_in_table_structure.phtml:79
-#: templates/structure/actions_in_table_structure.phtml:101
-#, php-format
-msgid "An index has been added on %s."
-msgstr "Быў дададзены індэкс для %s."
-
-#: templates/structure/actions_in_table_structure.phtml:130
-#: templates/structure/check_all_table_column.phtml:59
-#, fuzzy
-#| msgid "Rename database to"
-msgid "Remove from central columns"
-msgstr "Перайменаваць базу дадзеных у"
-
-#: templates/structure/actions_in_table_structure.phtml:138
-#: templates/structure/check_all_table_column.phtml:55
-#, fuzzy
-#| msgid "Add %s field(s)"
-msgid "Add to central columns"
-msgstr "Дадаць %s новыя палі"
-
-#: templates/structure/add_column.phtml:7
-#, fuzzy, php-format
-#| msgid "Add %s field(s)"
-msgid "Add %s column(s)"
-msgstr "Дадаць %s новыя палі"
-
-#: templates/structure/add_column.phtml:12
-#, fuzzy
-#| msgid "At Beginning of Table"
-msgid "at beginning of table"
-msgstr "У пачатку табліцы"
-
-#: templates/structure/body_for_table_summary.phtml:6
-#, php-format
-msgid "%s table"
-msgid_plural "%s tables"
-msgstr[0] "%s табліца"
-msgstr[1] "%s табліцы"
-msgstr[2] "%s табліц"
-
-#: templates/structure/body_for_table_summary.phtml:17
-msgid "Sum"
-msgstr "Усяго"
-
-#: templates/structure/check_all_tables.phtml:6
-msgid "Check tables having overhead"
-msgstr "Адзначыць тыя, што патрабуюць аптымізацыі"
-
-#: templates/structure/check_all_tables.phtml:10
-#, fuzzy
-#| msgid "Show color"
-msgid "Show create"
-msgstr "Паказаць колер"
-
-#: templates/structure/check_all_tables.phtml:27
-#, fuzzy
-#| msgid "Add new field"
-msgid "Prefix"
-msgstr "Дадаць новае поле"
-
-#: templates/structure/check_all_tables.phtml:28
-#, fuzzy
-msgid "Add prefix to table"
-msgstr "Базы дадзеных адсутнічаюць"
-
-#: templates/structure/check_all_tables.phtml:29
-#, fuzzy
-#| msgid "Replace table data with file"
-msgid "Replace table prefix"
-msgstr "Замяніць дадзеныя табліцы дадзенымі з файла"
-
-#: templates/structure/check_all_tables.phtml:30
-#, fuzzy
-#| msgid "Replace table data with file"
-msgid "Copy table with prefix"
-msgstr "Замяніць дадзеныя табліцы дадзенымі з файла"
-
-#: templates/structure/check_all_tables.phtml:36
-#, fuzzy
-#| msgid "Add %s field(s)"
-msgid "Add columns to central list"
-msgstr "Дадаць %s новыя палі"
-
-#: templates/structure/check_all_tables.phtml:37
-msgid "Remove columns from central list"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:38
-#, fuzzy
-#| msgid "Add %s field(s)"
-msgid "Make consistent with central list"
-msgstr "Дадаць %s новыя палі"
-
-#: templates/structure/display_structure.phtml:140 view_create.php:181
-#, fuzzy
-#| msgid "Print view"
-msgid "Edit view"
-msgstr "Вэрсія для друку"
-
-#: templates/structure/display_table_stats.phtml:9
-msgid "Space usage"
-msgstr "Выкарыстаньне прасторы"
-
-#: templates/structure/display_table_stats.phtml:27
-#: templates/structure/table_header.phtml:74
-msgid "Overhead"
-msgstr "Выкарыстаньне рэсурсаў"
-
-#: templates/structure/display_table_stats.phtml:32
-msgid "Effective"
-msgstr "Эфэктыўнасьць"
-
-#: templates/structure/favorite_anchor.phtml:12
-#, fuzzy
-msgid "Add to Favorites"
-msgstr "Дадаць новага карыстальніка"
-
-#: templates/structure/move_columns_dialog.phtml:1
-#: templates/structure/optional_action_links.phtml:21
-#, fuzzy
-#| msgid "Add %s field(s)"
-msgid "Move columns"
-msgstr "Дадаць %s новыя палі"
-
-#: templates/structure/move_columns_dialog.phtml:2
-msgid "Move the columns by dragging them up and down."
-msgstr ""
-
-#: templates/structure/optional_action_links.phtml:9
-msgid "Propose table structure"
-msgstr "Прапанаваная структура табліцы"
-
-#: templates/structure/optional_action_links.phtml:24
-#, fuzzy
-#| msgid "Propose table structure"
-msgid "Improve table structure"
-msgstr "Прапанаваная структура табліцы"
-
-#: templates/structure/optional_action_links.phtml:30
-#, fuzzy
-msgid "Track view"
-msgstr "Праверыць табліцу"
-
-#: templates/structure/row_stats_table.phtml:3
-#, fuzzy
-#| msgid "Row Statistics"
-msgid "Row statistics"
-msgstr "Статыстыка радку"
-
-#: templates/structure/row_stats_table.phtml:9
-msgid "static"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:11
-msgid "dynamic"
-msgstr "дынамічны"
-
-#: templates/structure/row_stats_table.phtml:22
-msgid "partitioned"
-msgstr "падзеленая на сэкцыі"
-
-#: templates/structure/row_stats_table.phtml:54
-msgid "Row length"
-msgstr "Даўжыня радка"
-
-#: templates/structure/row_stats_table.phtml:66
-msgid "Row size"
-msgstr "Памер радка"
-
-#: templates/structure/row_stats_table.phtml:73
-msgid "Next autoindex"
-msgstr ""
-
-#: templates/structure/secondary_tabs.phtml:14
-#, fuzzy
-#| msgid "Relation view"
-msgid "Relation view"
-msgstr "Прагляд залежнасьцяў"
-
-#: templates/structure/show_create.phtml:2
-#, fuzzy
-msgid "Showing create queries"
-msgstr "Паказаць поўныя запыты"
-
-#: templates/structure/sortable_header.phtml:13
-msgid "Sort"
-msgstr "Парадак"
-
-#: templates/structure/table_header.phtml:42
-#, fuzzy
-#| msgid "May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]"
-msgid ""
-"May be approximate. Click on the number to get the exact count. See "
-"[doc@faq3-11]FAQ 3.11[/doc]."
-msgstr "Значэньне можа быць прыблізным. Гл. [doc@faq3-11]FAQ 3.11[/doc]"
-
-#: templates/structure/table_structure_row.phtml:46
-#, fuzzy, php-format
-#| msgid "Table %s has been dropped."
-msgid "Column %s has been dropped."
-msgstr "Табліца %s была выдаленая"
-
-#: templates/structure/tracking_icon.phtml:4
-msgid "Tracking is active."
-msgstr ""
-
-#: templates/structure/tracking_icon.phtml:8
-msgid "Tracking is not active."
-msgstr ""
-
-#: templates/table/create_table.phtml:15
-#, fuzzy
-#| msgid "Number of fields"
-msgid "Number of columns"
-msgstr "Колькасьць палёў"
-
-#: templates/table/options.phtml:8
-#, fuzzy
-#| msgid "Select fields (at least one):"
-msgid "Select columns (at least one):"
-msgstr "Выбраць палі (прынамсі адно):"
-
-#: templates/table/options.phtml:37
-msgid "Add search conditions (body of the \"where\" clause):"
-msgstr "Дадаць умовы пошуку (цела для ўмовы \"where\"):"
-
-#: templates/table/options.phtml:45
-msgid "Number of rows per page"
-msgstr "Колькасьць радкоў на старонку"
-
-#: templates/table/options.phtml:56
-msgid "Display order:"
-msgstr "Парадак прагляду:"
-
-#: templates/table/options_zoom.phtml:6
-msgid "Use this column to label each point"
-msgstr ""
-
-#: templates/table/options_zoom.phtml:35
-msgid "Maximum rows to plot"
-msgstr ""
-
-#: templates/table/replace_preview.phtml:13
-msgid "Find and replace - preview"
-msgstr ""
-
-#: templates/table/replace_preview.phtml:18
-#, fuzzy
-#| msgid "Original position"
-msgid "Original string"
-msgstr "Першапачатковая пазыцыя"
-
-#: templates/table/replace_preview.phtml:19
-#, fuzzy
-#| msgid "Relations"
-msgid "Replaced string"
-msgstr "Сувязі"
-
-#: templates/table/replace_preview.phtml:40
-#, fuzzy
-#| msgid "Replication"
-msgid "Replace"
-msgstr "Рэплікацыя"
-
-#: templates/table/rows_zoom.phtml:16
-#, fuzzy
-msgid "Additional search criteria"
-msgstr "SQL-запыт"
-
-#: templates/table/search_and_replace.phtml:3
-#, fuzzy
-#| msgid "Replace NULL by"
-msgid "Replace with:"
-msgstr "Замяняць NULL на"
-
-#: templates/table/search_and_replace.phtml:22
-#, fuzzy
-#| msgid "as regular expression"
-msgid "Use regular expression"
-msgstr "рэгулярны выраз"
-
-#: templates/table/selection_form.phtml:12
-#, fuzzy
-#| msgid "Do a \"query by example\" (wildcard: \"%\")"
-msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
-msgstr "Выканаць \"запыт згодна прыклада\" (сымбаль падстаноўкі: \"%\")"
-
-#: templates/table/selection_form.phtml:34
-msgid "Do a \"query by example\" (wildcard: \"%\")"
-msgstr "Выканаць \"запыт згодна прыклада\" (сымбаль падстаноўкі: \"%\")"
-
-#: templates/table/zoom_result_form.phtml:7
-msgid "Browse/Edit the points"
-msgstr ""
-
-#: templates/table/zoom_result_form.phtml:15
-#, fuzzy
-msgid "How to use"
-msgstr "Пашырэньне PHP"
-
-#: templates/table/zoom_result_form.phtml:23
-#, fuzzy
-#| msgid "Reset"
-msgid "Reset zoom"
-msgstr "Скінуць"
-
-#: templates/tbl_chart.phtml:17
+#: templates/table/chart/tbl_chart.phtml:17
 #, fuzzy
 #| msgid "Mar"
 msgctxt "Chart type"
 msgid "Bar"
 msgstr "Сак"
 
-#: templates/tbl_chart.phtml:21
+#: templates/table/chart/tbl_chart.phtml:21
 #, fuzzy
 #| msgid "Column names"
 msgctxt "Chart type"
 msgid "Column"
 msgstr "Назвы калёнак"
 
-#: templates/tbl_chart.phtml:25
+#: templates/table/chart/tbl_chart.phtml:25
 msgctxt "Chart type"
 msgid "Line"
 msgstr ""
 
-#: templates/tbl_chart.phtml:29
+#: templates/table/chart/tbl_chart.phtml:29
 #, fuzzy
 #| msgid "Engines"
 msgctxt "Chart type"
 msgid "Spline"
 msgstr "Машыны"
 
-#: templates/tbl_chart.phtml:33
+#: templates/table/chart/tbl_chart.phtml:33
 msgctxt "Chart type"
 msgid "Area"
 msgstr ""
 
-#: templates/tbl_chart.phtml:37
+#: templates/table/chart/tbl_chart.phtml:37
 #, fuzzy
 #| msgid "PiB"
 msgctxt "Chart type"
 msgid "Pie"
 msgstr "ПіБ"
 
-#: templates/tbl_chart.phtml:41
+#: templates/table/chart/tbl_chart.phtml:41
 #, fuzzy
 #| msgid "Time"
 msgctxt "Chart type"
 msgid "Timeline"
 msgstr "Час"
 
-#: templates/tbl_chart.phtml:45
+#: templates/table/chart/tbl_chart.phtml:45
 msgctxt "Chart type"
 msgid "Scatter"
 msgstr ""
 
-#: templates/tbl_chart.phtml:50
+#: templates/table/chart/tbl_chart.phtml:50
 #, fuzzy
 #| msgid "Packed"
 msgid "Stacked"
 msgstr "Сьціснутая"
 
-#: templates/tbl_chart.phtml:53
+#: templates/table/chart/tbl_chart.phtml:53
 #, fuzzy
 #| msgid "Report title"
 msgid "Chart title"
 msgstr "Загаловак справаздачы"
 
-#: templates/tbl_chart.phtml:57
+#: templates/table/chart/tbl_chart.phtml:57
 msgid "X-Axis:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:72
+#: templates/table/chart/tbl_chart.phtml:72
 #, fuzzy
 msgid "Series:"
 msgstr "SQL-запыт"
 
-#: templates/tbl_chart.phtml:102
+#: templates/table/chart/tbl_chart.phtml:102
 msgid "X-Axis label:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:104
+#: templates/table/chart/tbl_chart.phtml:104
 #, fuzzy
 #| msgid "Value"
 msgid "X Values"
 msgstr "Значэньне"
 
-#: templates/tbl_chart.phtml:107
+#: templates/table/chart/tbl_chart.phtml:107
 msgid "Y-Axis label:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:115
+#: templates/table/chart/tbl_chart.phtml:115
 msgid "Series names are in a column"
 msgstr ""
 
-#: templates/tbl_chart.phtml:118
+#: templates/table/chart/tbl_chart.phtml:118
 #, fuzzy
 #| msgid "Inside field:"
 msgid "Series column:"
 msgstr "Унутры поля:"
 
-#: templates/tbl_chart.phtml:130
+#: templates/table/chart/tbl_chart.phtml:130
 #, fuzzy
 #| msgid "Number of fields"
 msgid "Value Column:"
 msgstr "Колькасьць палёў"
 
-#: templates/tbl_chart.phtml:150
+#: templates/table/chart/tbl_chart.phtml:150
 #, fuzzy
 #| msgid "Save as file"
 msgid "Save chart as image"
 msgstr "Захаваць як файл"
 
-#: templates/tbl_relation/common_form.phtml:7
+#: templates/table/gis_visualization/gis_visualization.phtml:3
+msgid "Display GIS Visualization"
+msgstr ""
+
+#: templates/table/gis_visualization/gis_visualization.phtml:8
+#, fuzzy
+#| msgid "Add/Delete Field Columns"
+msgid "Label column"
+msgstr "Дадаць/выдаліць калёнку крытэру"
+
+#: templates/table/gis_visualization/gis_visualization.phtml:11
+msgid "-- None --"
+msgstr ""
+
+#: templates/table/gis_visualization/gis_visualization.phtml:19
+#, fuzzy
+#| msgid "Log file count"
+msgid "Spatial column"
+msgstr "Колькасьць файлаў логу"
+
+#: templates/table/index_form.phtml:16
+msgid "Index name:"
+msgstr "Імя індэкса:"
+
+#: templates/table/index_form.phtml:19
+msgid ""
+"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
+msgstr ""
+"\"PRIMARY\" <b>мусіць</b> быць імем першаснага ключа і <b>толькі</b> яго!"
+
+#: templates/table/index_form.phtml:40
+#, fuzzy
+#| msgid "Index cache size"
+msgid "Index choice:"
+msgstr "Памер кэшу індэксаў"
+
+#: templates/table/index_form.phtml:57
+msgid "Key block size:"
+msgstr ""
+
+#: templates/table/index_form.phtml:74
+msgid "Index type:"
+msgstr "Тып індэкса:"
+
+#: templates/table/index_form.phtml:86
+#, fuzzy
+#| msgid "User"
+msgid "Parser:"
+msgstr "Карыстальнік"
+
+#: templates/table/index_form.phtml:102
+#, fuzzy
+#| msgid "Comment"
+msgid "Comment:"
+msgstr "Камэнтар"
+
+#: templates/table/index_form.phtml:149 templates/table/index_form.phtml:190
+msgid "Drag to reorder"
+msgstr ""
+
+#: templates/table/relation/common_form.phtml:7
 msgid "Internal relations"
 msgstr "Унутраныя сувязі"
 
-#: templates/tbl_relation/common_form.phtml:11
+#: templates/table/relation/common_form.phtml:11
 #, fuzzy
 #| msgid "Internal relations"
 msgid "Internal relation"
 msgstr "Унутраныя сувязі"
 
-#: templates/tbl_relation/common_form.phtml:14
+#: templates/table/relation/common_form.phtml:14
 msgid ""
 "An internal relation is not necessary when a corresponding FOREIGN KEY "
 "relation exists."
@@ -16599,61 +16411,272 @@ msgstr ""
 "Унутраная сувязь не зьяўляецца абавязковай, калі існуе адпаведная сувязь "
 "FOREIGN KEY."
 
-#: templates/tbl_relation/common_form.phtml:37
+#: templates/table/relation/common_form.phtml:37
 #, fuzzy
 #| msgid "Disable foreign key checks"
 msgid "Foreign key constraints"
 msgstr "Адключыць праверку зьнешніх ключоў"
 
-#: templates/tbl_relation/common_form.phtml:40
+#: templates/table/relation/common_form.phtml:40
 msgid "Actions"
 msgstr "Дзеяньні"
 
-#: templates/tbl_relation/common_form.phtml:41
+#: templates/table/relation/common_form.phtml:41
 #, fuzzy
 #| msgid "Constraints for table"
 msgid "Constraint properties"
 msgstr "Абмежаваньні для табліцы"
 
-#: templates/tbl_relation/common_form.phtml:44
+#: templates/table/relation/common_form.phtml:44
 msgid ""
 "Only columns with index will be displayed. You can define an index below."
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:49
+#: templates/table/relation/common_form.phtml:49
 msgid "Foreign key constraint"
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:81
+#: templates/table/relation/common_form.phtml:81
 #, fuzzy
 #| msgid "Add constraints"
 msgid "+ Add constraint"
 msgstr "Дадаць абмежаваньні"
 
-#: templates/tbl_relation/common_form.phtml:91
+#: templates/table/relation/common_form.phtml:91
 #, fuzzy
 #| msgid "Choose field to display"
 msgid "Choose column to display:"
 msgstr "Выберыце поле для адлюстраваньня"
 
-#: templates/tbl_relation/foreign_key_row.phtml:13
+#: templates/table/relation/foreign_key_row.phtml:13
 #, fuzzy, php-format
 #| msgid "Disable foreign key checks"
 msgid "Foreign key constraint %s has been dropped"
 msgstr "Адключыць праверку зьнешніх ключоў"
 
-#: templates/tbl_relation/foreign_key_row.phtml:102
+#: templates/table/relation/foreign_key_row.phtml:102
 #, fuzzy
 #| msgid "Constraints for table"
 msgid "Constraint name"
 msgstr "Абмежаваньні для табліцы"
 
-#: templates/tbl_relation/foreign_key_row.phtml:157
+#: templates/table/relation/foreign_key_row.phtml:157
 #, fuzzy
 #| msgid "Add %s field(s)"
 msgid "+ Add column"
 msgstr "Дадаць %s новыя палі"
 
+#: templates/table/search/options.phtml:8
+#, fuzzy
+#| msgid "Select fields (at least one):"
+msgid "Select columns (at least one):"
+msgstr "Выбраць палі (прынамсі адно):"
+
+#: templates/table/search/options.phtml:37
+msgid "Add search conditions (body of the \"where\" clause):"
+msgstr "Дадаць умовы пошуку (цела для ўмовы \"where\"):"
+
+#: templates/table/search/options.phtml:45
+msgid "Number of rows per page"
+msgstr "Колькасьць радкоў на старонку"
+
+#: templates/table/search/options.phtml:56
+msgid "Display order:"
+msgstr "Парадак прагляду:"
+
+#: templates/table/search/options_zoom.phtml:6
+msgid "Use this column to label each point"
+msgstr ""
+
+#: templates/table/search/options_zoom.phtml:35
+msgid "Maximum rows to plot"
+msgstr ""
+
+#: templates/table/search/replace_preview.phtml:13
+msgid "Find and replace - preview"
+msgstr ""
+
+#: templates/table/search/replace_preview.phtml:18
+#, fuzzy
+#| msgid "Original position"
+msgid "Original string"
+msgstr "Першапачатковая пазыцыя"
+
+#: templates/table/search/replace_preview.phtml:19
+#, fuzzy
+#| msgid "Relations"
+msgid "Replaced string"
+msgstr "Сувязі"
+
+#: templates/table/search/replace_preview.phtml:40
+#, fuzzy
+#| msgid "Replication"
+msgid "Replace"
+msgstr "Рэплікацыя"
+
+#: templates/table/search/rows_zoom.phtml:16
+#, fuzzy
+msgid "Additional search criteria"
+msgstr "SQL-запыт"
+
+#: templates/table/search/search_and_replace.phtml:3
+#, fuzzy
+#| msgid "Replace NULL by"
+msgid "Replace with:"
+msgstr "Замяняць NULL на"
+
+#: templates/table/search/search_and_replace.phtml:22
+#, fuzzy
+#| msgid "as regular expression"
+msgid "Use regular expression"
+msgstr "рэгулярны выраз"
+
+#: templates/table/search/selection_form.phtml:12
+#, fuzzy
+#| msgid "Do a \"query by example\" (wildcard: \"%\")"
+msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
+msgstr "Выканаць \"запыт згодна прыклада\" (сымбаль падстаноўкі: \"%\")"
+
+#: templates/table/search/selection_form.phtml:34
+msgid "Do a \"query by example\" (wildcard: \"%\")"
+msgstr "Выканаць \"запыт згодна прыклада\" (сымбаль падстаноўкі: \"%\")"
+
+#: templates/table/search/zoom_result_form.phtml:7
+msgid "Browse/Edit the points"
+msgstr ""
+
+#: templates/table/search/zoom_result_form.phtml:15
+#, fuzzy
+msgid "How to use"
+msgstr "Пашырэньне PHP"
+
+#: templates/table/search/zoom_result_form.phtml:23
+#, fuzzy
+#| msgid "Reset"
+msgid "Reset zoom"
+msgstr "Скінуць"
+
+#: templates/table/secondary_tabs.phtml:14
+#, fuzzy
+#| msgid "Relation view"
+msgid "Relation view"
+msgstr "Прагляд залежнасьцяў"
+
+#: templates/table/structure/actions_in_table_structure.phtml:14
+#, php-format
+msgid "A primary key has been added on %s."
+msgstr "Першасны ключ быў дададзены да %s."
+
+#: templates/table/structure/actions_in_table_structure.phtml:34
+#: templates/table/structure/actions_in_table_structure.phtml:54
+#: templates/table/structure/actions_in_table_structure.phtml:79
+#: templates/table/structure/actions_in_table_structure.phtml:101
+#, php-format
+msgid "An index has been added on %s."
+msgstr "Быў дададзены індэкс для %s."
+
+#: templates/table/structure/actions_in_table_structure.phtml:130
+#: templates/table/structure/check_all_table_column.phtml:59
+#, fuzzy
+#| msgid "Rename database to"
+msgid "Remove from central columns"
+msgstr "Перайменаваць базу дадзеных у"
+
+#: templates/table/structure/actions_in_table_structure.phtml:138
+#: templates/table/structure/check_all_table_column.phtml:55
+#, fuzzy
+#| msgid "Add %s field(s)"
+msgid "Add to central columns"
+msgstr "Дадаць %s новыя палі"
+
+#: templates/table/structure/add_column.phtml:7
+#, fuzzy, php-format
+#| msgid "Add %s field(s)"
+msgid "Add %s column(s)"
+msgstr "Дадаць %s новыя палі"
+
+#: templates/table/structure/add_column.phtml:12
+#, fuzzy
+#| msgid "At Beginning of Table"
+msgid "at beginning of table"
+msgstr "У пачатку табліцы"
+
+#: templates/table/structure/display_structure.phtml:140 view_create.php:181
+#, fuzzy
+#| msgid "Print view"
+msgid "Edit view"
+msgstr "Вэрсія для друку"
+
+#: templates/table/structure/display_table_stats.phtml:9
+msgid "Space usage"
+msgstr "Выкарыстаньне прасторы"
+
+#: templates/table/structure/display_table_stats.phtml:32
+msgid "Effective"
+msgstr "Эфэктыўнасьць"
+
+#: templates/table/structure/move_columns_dialog.phtml:1
+#: templates/table/structure/optional_action_links.phtml:21
+#, fuzzy
+#| msgid "Add %s field(s)"
+msgid "Move columns"
+msgstr "Дадаць %s новыя палі"
+
+#: templates/table/structure/move_columns_dialog.phtml:2
+msgid "Move the columns by dragging them up and down."
+msgstr ""
+
+#: templates/table/structure/optional_action_links.phtml:9
+msgid "Propose table structure"
+msgstr "Прапанаваная структура табліцы"
+
+#: templates/table/structure/optional_action_links.phtml:24
+#, fuzzy
+#| msgid "Propose table structure"
+msgid "Improve table structure"
+msgstr "Прапанаваная структура табліцы"
+
+#: templates/table/structure/optional_action_links.phtml:30
+#, fuzzy
+msgid "Track view"
+msgstr "Праверыць табліцу"
+
+#: templates/table/structure/row_stats_table.phtml:3
+#, fuzzy
+#| msgid "Row Statistics"
+msgid "Row statistics"
+msgstr "Статыстыка радку"
+
+#: templates/table/structure/row_stats_table.phtml:9
+msgid "static"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:11
+msgid "dynamic"
+msgstr "дынамічны"
+
+#: templates/table/structure/row_stats_table.phtml:22
+msgid "partitioned"
+msgstr "падзеленая на сэкцыі"
+
+#: templates/table/structure/row_stats_table.phtml:54
+msgid "Row length"
+msgstr "Даўжыня радка"
+
+#: templates/table/structure/row_stats_table.phtml:66
+msgid "Row size"
+msgstr "Памер радка"
+
+#: templates/table/structure/row_stats_table.phtml:73
+msgid "Next autoindex"
+msgstr ""
+
+#: templates/table/structure/table_structure_row.phtml:46
+#, fuzzy, php-format
+#| msgid "Table %s has been dropped."
+msgid "Column %s has been dropped."
+msgstr "Табліца %s была выдаленая"
+
 #: themes.php:17 themes.php:22
 msgid "Theme"
 msgstr ""
@@ -17909,6 +17932,11 @@ msgstr ""
 msgid "concurrent_insert is set to 0"
 msgstr "максымум адначасовых злучэньняў"
 
+#, fuzzy
+#~| msgid "Read misses"
+#~ msgid "Read as multibytes"
+#~ msgstr "Пропускаў чытаньня"
+
 #, fuzzy
 #~| msgid "Relational display field"
 #~ msgid "Relational display column"
diff --git a/po/be@latin.po b/po/be@latin.po
index d741b8f8ed..55e4ab5bf5 100644
--- a/po/be@latin.po
+++ b/po/be@latin.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 4.5.0-dev\n"
 "Report-Msgid-Bugs-To: developers@phpmyadmin.net\n"
-"POT-Creation-Date: 2015-08-08 13:53-0400\n"
+"POT-Creation-Date: 2015-08-12 08:10-0400\n"
 "PO-Revision-Date: 2014-03-28 11:02+0200\n"
 "Last-Translator: Michal Čihař <michal@cihar.com>\n"
 "Language-Team: Belarusian (latin) <https://hosted.weblate.org/projects/"
@@ -55,7 +55,7 @@ msgid "Table comments:"
 msgstr "Kamentar da tablicy"
 
 #: db_datadict.php:104 libraries/Index.class.php:699
-#: libraries/insert_edit.lib.php:1567
+#: libraries/insert_edit.lib.php:1565
 #: libraries/navigation/Nodes/Node_Column.class.php:30
 #: libraries/plugins/export/ExportHtmlword.class.php:280
 #: libraries/plugins/export/ExportHtmlword.class.php:375
@@ -69,13 +69,14 @@ msgstr "Kamentar da tablicy"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1023
 #: libraries/tracking.lib.php:879 libraries/tracking.lib.php:975
 #: templates/columns_definitions/column_name.phtml:18
-#: templates/index_form.phtml:124 templates/table/table_header.phtml:6
-#: templates/table/zoom_result_form.phtml:33
-#: templates/tbl_relation/common_form.phtml:10
-#: templates/tbl_relation/common_form.phtml:43
-#: templates/tbl_relation/foreign_key_row.phtml:194
-#: templates/tbl_relation/foreign_key_row.phtml:206
-#: templates/tbl_relation/internal_relational_row.phtml:71
+#: templates/table/index_form.phtml:124
+#: templates/table/relation/common_form.phtml:10
+#: templates/table/relation/common_form.phtml:43
+#: templates/table/relation/foreign_key_row.phtml:194
+#: templates/table/relation/foreign_key_row.phtml:206
+#: templates/table/relation/internal_relational_row.phtml:71
+#: templates/table/search/table_header.phtml:6
+#: templates/table/search/zoom_result_form.phtml:33
 #, fuzzy
 #| msgid "Column names"
 msgid "Column"
@@ -95,21 +96,21 @@ msgstr "Nazvy kalonak"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1001
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1024
 #: libraries/rte/rte_list.lib.php:75 libraries/rte/rte_list.lib.php:103
-#: libraries/rte/rte_routines.lib.php:802
-#: libraries/rte/rte_routines.lib.php:831
-#: libraries/rte/rte_routines.lib.php:1493
+#: libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_routines.lib.php:922
+#: libraries/rte/rte_routines.lib.php:1584
 #: libraries/server_privileges.lib.php:2369 libraries/tracking.lib.php:880
 #: libraries/tracking.lib.php:972
 #: templates/columns_definitions/table_fields_definitions.phtml:11
-#: templates/structure/table_header.phtml:48
-#: templates/structure/table_structure_header.phtml:6
-#: templates/table/table_header.phtml:7
+#: templates/database/structure/table_header.phtml:48
+#: templates/table/search/table_header.phtml:7
+#: templates/table/structure/table_structure_header.phtml:6
 msgid "Type"
 msgstr "Typ"
 
 #: db_datadict.php:106 libraries/Index.class.php:702
 #: libraries/central_columns.lib.php:708
-#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1576
+#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1574
 #: libraries/plugins/export/ExportHtmlword.class.php:286
 #: libraries/plugins/export/ExportHtmlword.class.php:381
 #: libraries/plugins/export/ExportLatex.class.php:509
@@ -122,8 +123,8 @@ msgstr "Typ"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1026
 #: libraries/tracking.lib.php:882 libraries/tracking.lib.php:978
 #: templates/columns_definitions/table_fields_definitions.phtml:39
-#: templates/structure/table_structure_header.phtml:9
-#: templates/table/zoom_result_form.phtml:34
+#: templates/table/search/zoom_result_form.phtml:34
+#: templates/table/structure/table_structure_header.phtml:9
 msgid "Null"
 msgstr "Nul"
 
@@ -141,8 +142,8 @@ msgstr "Nul"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1027
 #: libraries/replication_gui.lib.php:153 libraries/tracking.lib.php:883
 #: templates/columns_definitions/table_fields_definitions.phtml:25
-#: templates/structure/body_for_table_summary.phtml:55
-#: templates/structure/table_structure_header.phtml:10
+#: templates/database/structure/body_for_table_summary.phtml:55
+#: templates/table/structure/table_structure_header.phtml:10
 msgid "Default"
 msgstr "Pa zmoŭčańni"
 
@@ -170,19 +171,19 @@ msgid "Comments"
 msgstr "Kamentary"
 
 #: db_datadict.php:146
-#: libraries/controllers/StructureController.class.php:1960
-#: libraries/controllers/StructureController.class.php:1965
+#: libraries/controllers/TableStructureController.class.php:951
+#: libraries/controllers/TableStructureController.class.php:956
 #: libraries/tracking.lib.php:922
 #: templates/columns_definitions/column_indexes.phtml:6
-#: templates/structure/check_all_table_column.phtml:22
-#: templates/structure/display_structure.phtml:74
+#: templates/table/structure/check_all_table_column.phtml:22
+#: templates/table/structure/display_structure.phtml:74
 msgid "Primary"
 msgstr "Pieršasny"
 
 #: db_datadict.php:156 js/messages.php:317 libraries/Index.class.php:567
 #: libraries/Index.class.php:606 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261 libraries/mult_submits.lib.php:403
+#: libraries/config/FormDisplay.tpl.php:272 libraries/mult_submits.lib.php:403
 #: libraries/mult_submits.lib.php:417
 #: libraries/plugins/export/ExportHtmlword.class.php:630
 #: libraries/plugins/export/ExportLatex.class.php:589
@@ -198,20 +199,20 @@ msgstr "Pieršasny"
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1010 libraries/tracking.lib.php:1015
 #: prefs_manage.php:140 templates/prefs_autoload.phtml:15
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "No"
 msgstr "Nie"
 
 #: db_datadict.php:156 js/messages.php:443 libraries/Index.class.php:568
 #: libraries/Index.class.php:605 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261
-#: libraries/controllers/StructureController.class.php:1344
-#: libraries/controllers/StructureController.class.php:2223
-#: libraries/controllers/StructureController.class.php:2232
-#: libraries/controllers/StructureController.class.php:2237
-#: libraries/controllers/StructureController.class.php:2242
-#: libraries/controllers/StructureController.class.php:2247
+#: libraries/config/FormDisplay.tpl.php:272
+#: libraries/controllers/TableStructureController.class.php:539
+#: libraries/controllers/TableStructureController.class.php:1201
+#: libraries/controllers/TableStructureController.class.php:1210
+#: libraries/controllers/TableStructureController.class.php:1215
+#: libraries/controllers/TableStructureController.class.php:1220
+#: libraries/controllers/TableStructureController.class.php:1225
 #: libraries/mult_submits.inc.php:82 libraries/mult_submits.inc.php:178
 #: libraries/mult_submits.lib.php:339 libraries/mult_submits.lib.php:372
 #: libraries/mult_submits.lib.php:401 libraries/mult_submits.lib.php:415
@@ -220,8 +221,8 @@ msgstr "Nie"
 #: libraries/plugins/export/ExportOdt.class.php:756
 #: libraries/plugins/export/ExportTexytext.class.php:567
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1077
-#: libraries/server_databases.lib.php:464
-#: libraries/server_databases.lib.php:474
+#: libraries/server_databases.lib.php:475
+#: libraries/server_databases.lib.php:485
 #: libraries/server_privileges.lib.php:2546
 #: libraries/server_privileges.lib.php:2727
 #: libraries/server_privileges.lib.php:2748
@@ -231,7 +232,7 @@ msgstr "Nie"
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1008 libraries/tracking.lib.php:1013
 #: prefs_manage.php:138 templates/prefs_autoload.phtml:14
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "Yes"
 msgstr "Tak"
 
@@ -241,7 +242,7 @@ msgstr "Prahladzieć damp (schiemu) bazy dadzienych"
 
 #: db_export.php:37 db_tracking.php:90 export.php:382
 #: libraries/DBQbe.class.php:326
-#: libraries/controllers/StructureController.class.php:231
+#: libraries/controllers/DatabaseStructureController.class.php:170
 #: libraries/navigation/NavigationTree.class.php:897
 msgid "No tables found in database."
 msgstr "U bazie dadzienych tablic nia vyjaŭlena."
@@ -252,14 +253,14 @@ msgstr "U bazie dadzienych tablic nia vyjaŭlena."
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:26
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:120
-#: templates/structure/show_create.phtml:18
+#: templates/database/structure/show_create.phtml:18
 msgid "Tables"
 msgstr "Tablic"
 
 #: db_export.php:52 libraries/Menu.class.php:317 libraries/Menu.class.php:425
-#: libraries/Util.class.php:3333 libraries/Util.class.php:3343
-#: libraries/Util.class.php:3349 libraries/Util.class.php:3629
-#: libraries/Util.class.php:4327 libraries/Util.class.php:4344
+#: libraries/Util.class.php:3339 libraries/Util.class.php:3349
+#: libraries/Util.class.php:3355 libraries/Util.class.php:3635
+#: libraries/Util.class.php:4333 libraries/Util.class.php:4350
 #: libraries/central_columns.lib.php:728 libraries/config.values.php:39
 #: libraries/config.values.php:47 libraries/config.values.php:109
 #: libraries/config.values.php:115 libraries/config/setup.forms.php:323
@@ -273,7 +274,7 @@ msgstr "Tablic"
 #: libraries/navigation/Nodes/Node_Table.class.php:283
 #: libraries/server_privileges.lib.php:1141 libraries/tracking.lib.php:874
 #: templates/columns_definitions/table_fields_definitions.phtml:3
-#: templates/designer/table_list.phtml:28
+#: templates/database/designer/table_list.phtml:28
 msgid "Structure"
 msgstr "Struktura"
 
@@ -285,7 +286,7 @@ msgstr "Struktura"
 #: libraries/config/user_preferences.forms.php:292
 #: libraries/config/user_preferences.forms.php:297
 #: libraries/server_privileges.lib.php:1140
-#: templates/structure/display_table_stats.phtml:12
+#: templates/table/structure/display_table_stats.phtml:12
 msgid "Data"
 msgstr "Dadzienyja"
 
@@ -371,10 +372,10 @@ msgstr ""
 #: libraries/server_privileges.lib.php:2908
 #: libraries/server_privileges.lib.php:3145
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4346
-#: templates/structure/table_header.phtml:21
-#: templates/tbl_relation/foreign_key_row.phtml:176
-#: templates/tbl_relation/internal_relational_row.phtml:63
+#: libraries/server_privileges.lib.php:4372
+#: templates/database/structure/table_header.phtml:21
+#: templates/table/relation/foreign_key_row.phtml:176
+#: templates/table/relation/internal_relational_row.phtml:63
 msgid "Table"
 msgstr "Tablica"
 
@@ -391,7 +392,7 @@ msgid "Updated"
 msgstr ""
 
 #: db_tracking.php:130 js/messages.php:243 libraries/Menu.class.php:552
-#: libraries/Util.class.php:4314 libraries/config.values.php:104
+#: libraries/Util.class.php:4320 libraries/config.values.php:104
 #: libraries/rte/rte_events.lib.php:393 libraries/rte/rte_list.lib.php:101
 #: libraries/server_status_processes.lib.php:92 libraries/tracking.lib.php:279
 msgid "Status"
@@ -400,14 +401,15 @@ msgstr "Stan"
 #: db_tracking.php:131 db_tracking.php:290 libraries/Index.class.php:693
 #: libraries/central_columns.lib.php:687 libraries/rte/rte_list.lib.php:74
 #: libraries/rte/rte_list.lib.php:89 libraries/rte/rte_list.lib.php:102
-#: libraries/server_databases.lib.php:398
+#: libraries/server_databases.lib.php:409
 #: libraries/server_privileges.lib.php:2372
 #: libraries/server_privileges.lib.php:3166
 #: libraries/server_privileges.lib.php:3342
 #: libraries/server_user_groups.lib.php:82
 #: libraries/server_variables.lib.php:189 libraries/tracking.lib.php:280
-#: libraries/tracking.lib.php:793 templates/structure/table_header.phtml:30
-#: templates/structure/table_structure_header.phtml:23
+#: libraries/tracking.lib.php:793
+#: templates/database/structure/table_header.phtml:30
+#: templates/table/structure/table_structure_header.phtml:23
 msgid "Action"
 msgstr "Dziejańnie"
 
@@ -451,7 +453,7 @@ msgid "Untracked tables"
 msgstr ""
 
 #: db_tracking.php:305 db_tracking.php:336
-#: templates/structure/optional_action_links.phtml:17
+#: templates/table/structure/optional_action_links.phtml:17
 msgid "Track table"
 msgstr ""
 
@@ -507,7 +509,7 @@ msgid "Value for the column \"%s\""
 msgstr ""
 
 #: gis_data_editor.php:146
-#: templates/gis_visualization/gis_visualization.phtml:37
+#: templates/table/gis_visualization/gis_visualization.phtml:37
 msgid "Use OpenStreetMaps as Base Layer"
 msgstr ""
 
@@ -597,35 +599,35 @@ msgstr "Dadać novaha karystalnika"
 #: libraries/display_change_password.lib.php:162
 #: libraries/display_export.lib.php:402 libraries/display_export.lib.php:408
 #: libraries/display_import.lib.php:392 libraries/index.lib.php:44
-#: libraries/insert_edit.lib.php:1546 libraries/insert_edit.lib.php:1583
+#: libraries/insert_edit.lib.php:1544 libraries/insert_edit.lib.php:1581
 #: libraries/normalization.lib.php:165 libraries/normalization.lib.php:821
 #: libraries/operations.lib.php:38 libraries/operations.lib.php:108
 #: libraries/operations.lib.php:263 libraries/operations.lib.php:306
 #: libraries/operations.lib.php:801 libraries/operations.lib.php:874
 #: libraries/operations.lib.php:923 libraries/operations.lib.php:1337
 #: libraries/operations.lib.php:1658
-#: libraries/plugins/auth/AuthenticationCookie.class.php:244
+#: libraries/plugins/auth/AuthenticationCookie.class.php:232
 #: libraries/replication_gui.lib.php:122 libraries/replication_gui.lib.php:161
 #: libraries/replication_gui.lib.php:324 libraries/replication_gui.lib.php:461
 #: libraries/replication_gui.lib.php:906 libraries/rte/rte_events.lib.php:509
-#: libraries/rte/rte_routines.lib.php:969
-#: libraries/rte/rte_routines.lib.php:1581
+#: libraries/rte/rte_routines.lib.php:1060
+#: libraries/rte/rte_routines.lib.php:1672
 #: libraries/rte/rte_triggers.lib.php:396 libraries/server_bin_log.lib.php:61
 #: libraries/server_privileges.lib.php:705
 #: libraries/server_privileges.lib.php:2106
 #: libraries/server_privileges.lib.php:2872
 #: libraries/server_privileges.lib.php:3553
-#: libraries/server_privileges.lib.php:4627
+#: libraries/server_privileges.lib.php:4653
 #: libraries/server_user_groups.lib.php:285
 #: libraries/sql_query_form.lib.php:369 libraries/sql_query_form.lib.php:429
 #: libraries/tracking.lib.php:533 libraries/tracking.lib.php:653
 #: prefs_manage.php:277 prefs_manage.php:355
 #: templates/columns_definitions/column_definitions_form.phtml:59
-#: templates/header_location.phtml:17 templates/index_form.phtml:238
+#: templates/database/create_table.phtml:21 templates/header_location.phtml:28
 #: templates/startAndNumberOfRowsPanel.phtml:14
-#: templates/structure/add_column.phtml:25
-#: templates/table/create_table.phtml:21
-#: templates/table/selection_form.phtml:75 view_create.php:275
+#: templates/table/index_form.phtml:238
+#: templates/table/search/selection_form.phtml:75
+#: templates/table/structure/add_column.phtml:25 view_create.php:275
 #: view_operations.php:106
 msgid "Go"
 msgstr "Paniesłasia"
@@ -722,7 +724,7 @@ msgid "Could not load import plugins, please check your installation!"
 msgstr ""
 "Niemahčyma zahruzić płahiny impartavańnia, kali łaska, praviercie ŭstaloŭku!"
 
-#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1466
+#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1460
 #, fuzzy, php-format
 #| msgid "Bookmark %s created"
 msgid "Bookmark %s has been created."
@@ -765,11 +767,11 @@ msgstr ""
 msgid "Back"
 msgstr "Nazad"
 
-#: index.php:148 libraries/Footer.class.php:70
+#: index.php:149 libraries/Footer.class.php:70
 msgid "phpMyAdmin Demo Server"
 msgstr ""
 
-#: index.php:152
+#: index.php:153
 #, php-format
 msgid ""
 "You are using the demo server. You can do anything here, but please do not "
@@ -777,50 +779,50 @@ msgid ""
 "at %s."
 msgstr ""
 
-#: index.php:162
+#: index.php:163
 #, fuzzy
 #| msgid "General relation features"
 msgid "General Settings"
 msgstr "Mahčymaści asnoŭnych suviaziaŭ"
 
-#: index.php:190 libraries/display_change_password.lib.php:50
+#: index.php:191 libraries/display_change_password.lib.php:50
 #: libraries/display_change_password.lib.php:53 user_password.php:247
 msgid "Change password"
 msgstr "Źmianić parol"
 
-#: index.php:206
+#: index.php:207
 #, fuzzy
 #| msgid "MySQL connection collation"
 msgid "Server connection collation"
 msgstr "Supastaŭleńnie padłučeńnia da MySQL"
 
-#: index.php:228
+#: index.php:229
 msgid "Appearance Settings"
 msgstr ""
 
-#: index.php:258 prefs_manage.php:285
+#: index.php:259 prefs_manage.php:285
 #, fuzzy
 #| msgid "General relation features"
 msgid "More settings"
 msgstr "Mahčymaści asnoŭnych suviaziaŭ"
 
-#: index.php:279
+#: index.php:280
 #, fuzzy
 #| msgid "Database for user"
 msgid "Database server"
 msgstr "Baza dadzienych dla karystalnika"
 
-#: index.php:282 libraries/plugins/auth/AuthenticationCookie.class.php:181
+#: index.php:283 libraries/plugins/auth/AuthenticationCookie.class.php:169
 msgid "Server:"
 msgstr "Server:"
 
-#: index.php:286
+#: index.php:287
 #, fuzzy
 #| msgid "Server"
 msgid "Server type:"
 msgstr "Server"
 
-#: index.php:290 libraries/plugins/export/ExportLatex.class.php:212
+#: index.php:291 libraries/plugins/export/ExportLatex.class.php:212
 #: libraries/plugins/export/ExportSql.class.php:687
 #: libraries/plugins/export/ExportXml.class.php:189
 #, fuzzy
@@ -828,89 +830,89 @@ msgstr "Server"
 msgid "Server version:"
 msgstr "Versija servera"
 
-#: index.php:296
+#: index.php:297
 #, fuzzy
 #| msgid "Protocol version"
 msgid "Protocol version:"
 msgstr "Versija pratakołu"
 
-#: index.php:300
+#: index.php:301
 #, fuzzy
 #| msgid "User"
 msgid "User:"
 msgstr "Karystalnik"
 
-#: index.php:305
+#: index.php:306
 #, fuzzy
 #| msgid "Rename database to"
 msgid "Server charset:"
 msgstr "Pierajmienavać bazu dadzienych u"
 
-#: index.php:320
+#: index.php:321
 msgid "Web server"
 msgstr "Web-server"
 
-#: index.php:331
+#: index.php:332
 #, fuzzy
 #| msgid "MySQL client version"
 msgid "Database client version:"
 msgstr "Versija klijenta MySQL"
 
-#: index.php:335
+#: index.php:336
 #, fuzzy
 #| msgid "PHP extension"
 msgid "PHP extension:"
 msgstr "Pašyreńnie PHP"
 
-#: index.php:349
+#: index.php:350
 #, fuzzy
 #| msgid "PHP Version"
 msgid "PHP version:"
 msgstr "Versija PHP"
 
-#: index.php:360
+#: index.php:361
 msgid "Show PHP information"
 msgstr "Pakazać infarmacyju pra PHP"
 
-#: index.php:383
+#: index.php:384
 #, fuzzy
 #| msgid "Version information"
 msgid "Version information:"
 msgstr "Infarmacyja pra versiju"
 
-#: index.php:392 libraries/Util.class.php:432 libraries/Util.class.php:495
-#: libraries/config/FormDisplay.tpl.php:151
+#: index.php:393 libraries/Util.class.php:432 libraries/Util.class.php:495
+#: libraries/config/FormDisplay.tpl.php:162
 #: libraries/display_export.lib.php:577 libraries/engines/pbxt.lib.php:162
 #: libraries/navigation/NavigationHeader.class.php:196
 #: libraries/server_variables.lib.php:160
 msgid "Documentation"
 msgstr "Dakumentacyja"
 
-#: index.php:399
+#: index.php:400
 msgid "Wiki"
 msgstr "Wiki"
 
-#: index.php:408
+#: index.php:409
 msgid "Official Homepage"
 msgstr "Aficyjnaja staronka phpMyAdmin"
 
-#: index.php:415
+#: index.php:416
 #, fuzzy
 #| msgid "Attributes"
 msgid "Contribute"
 msgstr "Atrybuty"
 
-#: index.php:422
+#: index.php:423
 msgid "Get support"
 msgstr ""
 
-#: index.php:429
+#: index.php:430
 #, fuzzy
 #| msgid "No change"
 msgid "List of changes"
 msgstr "Niama źmienaŭ"
 
-#: index.php:451
+#: index.php:452
 #, fuzzy
 #| msgid ""
 #| "Your configuration file contains settings (root with no password) that "
@@ -929,7 +931,7 @@ msgstr ""
 "źniešniaha ŭryvańnia, i tamu vam abaviazkova treba vypravić hetuju chibu ŭ "
 "biaśpiecy."
 
-#: index.php:468
+#: index.php:469
 msgid ""
 "You have enabled mbstring.func_overload in your PHP configuration. This "
 "option is incompatible with phpMyAdmin and might cause some data to be "
@@ -938,7 +940,7 @@ msgstr ""
 "Vy ŭklučyli mbstring.func_overload u vašym kanfihuracyjnym fajle PHP. Hetaja "
 "opcyja niesumiaščalnaja z phpMyAdmin i moža vyklikać paškodžańnie dadzienych!"
 
-#: index.php:483
+#: index.php:484
 msgid ""
 "The mbstring PHP extension was not found and you seem to be using a "
 "multibyte charset. Without the mbstring extension phpMyAdmin is unable to "
@@ -948,7 +950,7 @@ msgstr ""
 "šmatbajtavuju kadyroŭku. Biez pašyreńnia mbstring phpMyAdmin nia moža "
 "padzialać radki karektna, i heta moža pryvieści da niečakanych vynikaŭ."
 
-#: index.php:500
+#: index.php:501
 msgid ""
 "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini."
 "session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower than "
@@ -956,18 +958,18 @@ msgid ""
 "expire sooner than configured in phpMyAdmin."
 msgstr ""
 
-#: index.php:519
+#: index.php:520
 msgid ""
 "Login cookie store is lower than cookie validity configured in phpMyAdmin, "
 "because of this, your login will expire sooner than configured in phpMyAdmin."
 msgstr ""
 
-#: index.php:535
+#: index.php:536
 msgid "The configuration file now needs a secret passphrase (blowfish_secret)."
 msgstr ""
 "Kanfihuracyjnamu fajłu zaraz patrebnaja sakretnaja fraza (blowfish_secret)."
 
-#: index.php:548
+#: index.php:549
 msgid ""
 "Directory [code]config[/code], which is used by the setup script, still "
 "exists in your phpMyAdmin directory. It is strongly recommended to remove it "
@@ -975,7 +977,7 @@ msgid ""
 "may be compromised by unauthorized people downloading your configuration."
 msgstr ""
 
-#: index.php:564
+#: index.php:565
 #, fuzzy, php-format
 #| msgid ""
 #| " additional features for working with linked tables have been ctivated. "
@@ -987,12 +989,12 @@ msgstr ""
 "Dadatkovyja mahčymaści raboty z źviazanymi tablicami byli adklučanyja. Kab "
 "vyśvietlić čamu, naciśnicie %stut%s."
 
-#: index.php:571
+#: index.php:572
 msgid ""
 "Or alternately go to 'Operations' tab of any database to set it up there."
 msgstr ""
 
-#: index.php:620
+#: index.php:621
 #, php-format
 msgid ""
 "Your PHP MySQL library version %s differs from your MySQL server version %s. "
@@ -1001,7 +1003,7 @@ msgstr ""
 "Versija vašaj biblijateki MySQL dla PHP %s adroźnivajecca ad versii vašaha "
 "servera MySQL %s. Heta moža vyklikać niepradkazalnyja pavodziny."
 
-#: index.php:648
+#: index.php:649
 #, php-format
 msgid ""
 "Server running with Suhosin. Please refer to %sdocumentation%s for possible "
@@ -1175,8 +1177,8 @@ msgstr ""
 msgid "Save & Close"
 msgstr "Zachavać jak fajł"
 
-#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:404
-#: libraries/insert_edit.lib.php:1550 prefs_manage.php:361
+#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:415
+#: libraries/insert_edit.lib.php:1548 prefs_manage.php:361
 #: prefs_manage.php:372
 msgid "Reset"
 msgstr "Skinuć"
@@ -1221,7 +1223,7 @@ msgstr "Dadać novaje pole"
 msgid "Edit Index"
 msgstr "Redagavać nastupny radok"
 
-#: js/messages.php:99 templates/index_form.phtml:232
+#: js/messages.php:99 templates/table/index_form.phtml:232
 #, fuzzy, php-format
 #| msgid "Add %s field(s)"
 msgid "Add %s column(s) to index"
@@ -1251,15 +1253,16 @@ msgstr "Pali ŭziatyja ŭ"
 msgid "Please select column(s) for the index."
 msgstr "Dadać %s novyja pali"
 
-#: js/messages.php:106 templates/structure/add_column.phtml:1
+#: js/messages.php:106 templates/table/structure/add_column.phtml:1
 #, fuzzy
 #| msgid "You have to add at least one field."
 msgid "You have to add at least one column."
 msgstr "Treba dadać prynamsi adno pole."
 
-#: js/messages.php:109 libraries/insert_edit.lib.php:1548
+#: js/messages.php:109 libraries/insert_edit.lib.php:1546
 #: templates/columns_definitions/column_definitions_form.phtml:162
-#: templates/index_form.phtml:237 templates/tbl_relation/common_form.phtml:106
+#: templates/table/index_form.phtml:237
+#: templates/table/relation/common_form.phtml:106
 msgid "Preview SQL"
 msgstr ""
 
@@ -1282,7 +1285,7 @@ msgid "SQL query:"
 msgstr "SQL-zapyt"
 
 #. l10n: Default label for the y-Axis of Charts
-#: js/messages.php:118 templates/tbl_chart.phtml:109
+#: js/messages.php:118 templates/table/chart/tbl_chart.phtml:109
 #, fuzzy
 #| msgid "Value"
 msgid "Y Values"
@@ -1463,7 +1466,7 @@ msgstr ""
 msgid "Bytes received"
 msgstr "Atrymana"
 
-#: js/messages.php:169 libraries/server_status.lib.php:226
+#: js/messages.php:169 libraries/server_status.lib.php:235
 msgid "Connections"
 msgstr "Padłučeńni"
 
@@ -1523,12 +1526,12 @@ msgstr "%s tablic(y)"
 msgid "Questions"
 msgstr "Suviazi"
 
-#: js/messages.php:184 libraries/server_status.lib.php:134
+#: js/messages.php:184 libraries/server_status.lib.php:143
 msgid "Traffic"
 msgstr "Trafik"
 
 #: js/messages.php:185 libraries/Menu.class.php:586
-#: libraries/Util.class.php:4318 libraries/server_status_monitor.lib.php:257
+#: libraries/Util.class.php:4324 libraries/server_status_monitor.lib.php:257
 #, fuzzy
 #| msgid "General relation features"
 msgid "Settings"
@@ -1552,8 +1555,9 @@ msgstr ""
 #: libraries/server_status_monitor.lib.php:236
 #: libraries/server_status_processes.lib.php:308
 #: templates/columns_definitions/transformation.phtml:4
-#: templates/designer/options_panel.phtml:178
-#: templates/table/options_zoom.phtml:12 templates/table/rows_zoom.phtml:26
+#: templates/database/designer/options_panel.phtml:178
+#: templates/table/search/options_zoom.phtml:12
+#: templates/table/search/rows_zoom.phtml:26
 msgid "None"
 msgstr "Nijakaja"
 
@@ -1861,8 +1865,8 @@ msgstr ""
 
 #: js/messages.php:270 libraries/Menu.class.php:352
 #: libraries/Menu.class.php:455 libraries/Menu.class.php:582
-#: libraries/Util.class.php:4317 libraries/Util.class.php:4332
-#: libraries/Util.class.php:4349 libraries/config/messages.inc.php:258
+#: libraries/Util.class.php:4323 libraries/Util.class.php:4338
+#: libraries/Util.class.php:4355 libraries/config/messages.inc.php:258
 #: libraries/display_import.lib.php:105
 #: libraries/server_status_monitor.lib.php:318 prefs_manage.php:238
 #: setup/frames/menu.inc.php:26
@@ -1934,13 +1938,13 @@ msgid "Formatting SQL..."
 msgstr ""
 
 #: js/messages.php:293 libraries/server_variables.lib.php:157
-#: templates/designer/aggregate_query_panel.phtml:63
-#: templates/designer/delete_relation_panel.phtml:28
-#: templates/designer/having_query_panel.phtml:117
-#: templates/designer/new_relation_panel.phtml:88
-#: templates/designer/options_panel.phtml:253
-#: templates/designer/rename_to_panel.phtml:45
-#: templates/designer/where_query_panel.phtml:83
+#: templates/database/designer/aggregate_query_panel.phtml:63
+#: templates/database/designer/delete_relation_panel.phtml:28
+#: templates/database/designer/having_query_panel.phtml:117
+#: templates/database/designer/new_relation_panel.phtml:88
+#: templates/database/designer/options_panel.phtml:253
+#: templates/database/designer/rename_to_panel.phtml:45
+#: templates/database/designer/where_query_panel.phtml:83
 msgid "Cancel"
 msgstr "Skasavać"
 
@@ -1950,7 +1954,7 @@ msgstr "Skasavać"
 msgid "Page-related settings"
 msgstr "Mahčymaści asnoŭnych suviaziaŭ"
 
-#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:402
+#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:413
 msgid "Apply"
 msgstr ""
 
@@ -1989,8 +1993,8 @@ msgstr ""
 msgid "Error text: %s"
 msgstr ""
 
-#: js/messages.php:307 libraries/db_common.inc.php:68
-#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:450
+#: js/messages.php:307 libraries/db_common.inc.php:69
+#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:461
 msgid "No databases selected."
 msgstr "Nia vybranaja baza dadzienych."
 
@@ -2002,12 +2006,13 @@ msgstr ""
 msgid "Adding Primary Key"
 msgstr ""
 
-#: js/messages.php:310 templates/designer/aggregate_query_panel.phtml:59
-#: templates/designer/having_query_panel.phtml:113
-#: templates/designer/new_relation_panel.phtml:87
-#: templates/designer/options_panel.phtml:252
-#: templates/designer/rename_to_panel.phtml:41
-#: templates/designer/where_query_panel.phtml:82
+#: js/messages.php:310
+#: templates/database/designer/aggregate_query_panel.phtml:59
+#: templates/database/designer/having_query_panel.phtml:113
+#: templates/database/designer/new_relation_panel.phtml:87
+#: templates/database/designer/options_panel.phtml:252
+#: templates/database/designer/rename_to_panel.phtml:41
+#: templates/database/designer/where_query_panel.phtml:82
 msgid "OK"
 msgstr "OK"
 
@@ -2033,7 +2038,7 @@ msgstr "Kapijavać bazu dadzienych u"
 msgid "Changing Charset"
 msgstr "Kadyroŭka"
 
-#: js/messages.php:320 libraries/Util.class.php:3217
+#: js/messages.php:320 libraries/Util.class.php:3223
 #, fuzzy
 #| msgid "Disable foreign key checks"
 msgid "Enable foreign key checks"
@@ -2081,20 +2086,21 @@ msgstr ""
 #: js/messages.php:334 libraries/DisplayResults.class.php:4834
 #: libraries/DisplayResults.class.php:5092 libraries/Menu.class.php:344
 #: libraries/Menu.class.php:446 libraries/Menu.class.php:578
-#: libraries/Util.class.php:3636 libraries/Util.class.php:3637
-#: libraries/Util.class.php:4316 libraries/Util.class.php:4331
-#: libraries/Util.class.php:4348 libraries/config/messages.inc.php:252
+#: libraries/Util.class.php:3642 libraries/Util.class.php:3643
+#: libraries/Util.class.php:4322 libraries/Util.class.php:4337
+#: libraries/Util.class.php:4354 libraries/config/messages.inc.php:252
 #: libraries/display_export.lib.php:173 libraries/rte/rte_list.lib.php:146
 #: libraries/server_privileges.lib.php:2211
 #: libraries/server_privileges.lib.php:2290
 #: libraries/server_privileges.lib.php:2632
 #: libraries/server_privileges.lib.php:3356
 #: libraries/server_status_monitor.lib.php:322 prefs_manage.php:303
-#: setup/frames/menu.inc.php:27 templates/structure/check_all_tables.phtml:11
+#: setup/frames/menu.inc.php:27
+#: templates/database/structure/check_all_tables.phtml:11
 msgid "Export"
 msgstr "Ekspart"
 
-#: js/messages.php:337 libraries/rte/rte_routines.lib.php:652
+#: js/messages.php:337 libraries/rte/rte_routines.lib.php:743
 msgid "ENUM/SET editor"
 msgstr ""
 
@@ -2139,7 +2145,7 @@ msgstr "U vyhladzie SQL-zapytu"
 #: libraries/Console.class.php:214 libraries/DisplayResults.class.php:3474
 #: libraries/DisplayResults.class.php:4818 libraries/Index.class.php:723
 #: libraries/Util.class.php:706 libraries/Util.class.php:1202
-#: libraries/Util.class.php:3634 libraries/Util.class.php:3635
+#: libraries/Util.class.php:3640 libraries/Util.class.php:3641
 #: libraries/central_columns.lib.php:851
 #: libraries/central_columns.lib.php:1193
 #: libraries/config/messages.inc.php:892
@@ -2157,7 +2163,7 @@ msgstr "Redagavać"
 #: libraries/server_user_groups.lib.php:129
 #: libraries/sql_query_form.lib.php:416 libraries/tracking.lib.php:477
 #: setup/frames/index.inc.php:183 setup/frames/index.inc.php:291
-#: templates/designer/delete_relation_panel.phtml:27
+#: templates/database/designer/delete_relation_panel.phtml:27
 msgid "Delete"
 msgstr "Vydalić"
 
@@ -2339,11 +2345,11 @@ msgid "No dependencies selected!"
 msgstr "Nia vybranaja baza dadzienych."
 
 #: js/messages.php:394 libraries/central_columns.lib.php:1214
-#: libraries/insert_edit.lib.php:1458 libraries/server_variables.lib.php:155
+#: libraries/insert_edit.lib.php:1456 libraries/server_variables.lib.php:155
 #: setup/frames/config.inc.php:42 setup/frames/index.inc.php:279
 #: templates/columns_definitions/column_definitions_form.phtml:165
-#: templates/gis_visualization/gis_visualization.phtml:48
-#: templates/tbl_relation/common_form.phtml:107
+#: templates/table/gis_visualization/gis_visualization.phtml:48
+#: templates/table/relation/common_form.phtml:107
 msgid "Save"
 msgstr "Zachavać"
 
@@ -2438,8 +2444,8 @@ msgid "Data point content"
 msgstr "Pamier ukazalnika na dadzienyja"
 
 #: js/messages.php:430 js/messages.php:562 js/messages.php:579
-#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2573
-#: templates/index_form.phtml:154 templates/index_form.phtml:194
+#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2571
+#: templates/table/index_form.phtml:154 templates/table/index_form.phtml:194
 msgid "Ignore"
 msgstr "Ignaravać"
 
@@ -2502,8 +2508,8 @@ msgstr "Vybierycie źniešni kluč"
 msgid "Please select the primary key or a unique key!"
 msgstr "Kali łaska, vybierycie pieršasny (PRIMARY) albo ŭnikalny kluč (UNIQUE)"
 
-#: js/messages.php:457 templates/designer/side_menu.phtml:91
-#: templates/designer/side_menu.phtml:94
+#: js/messages.php:457 templates/database/designer/side_menu.phtml:91
+#: templates/database/designer/side_menu.phtml:94
 #, fuzzy
 #| msgid "Choose field to display"
 msgid "Choose column to display"
@@ -2521,22 +2527,22 @@ msgstr ""
 msgid "Page name"
 msgstr "Staronka:"
 
-#: js/messages.php:463 templates/designer/side_menu.phtml:56
-#: templates/designer/side_menu.phtml:59
+#: js/messages.php:463 templates/database/designer/side_menu.phtml:56
+#: templates/database/designer/side_menu.phtml:59
 #, fuzzy
 #| msgid "Select All"
 msgid "Save page"
 msgstr "Vybrać usio"
 
-#: js/messages.php:464 templates/designer/side_menu.phtml:63
-#: templates/designer/side_menu.phtml:66
+#: js/messages.php:464 templates/database/designer/side_menu.phtml:63
+#: templates/database/designer/side_menu.phtml:66
 #, fuzzy
 #| msgid "Select All"
 msgid "Save page as"
 msgstr "Vybrać usio"
 
-#: js/messages.php:465 templates/designer/side_menu.phtml:49
-#: templates/designer/side_menu.phtml:52
+#: js/messages.php:465 templates/database/designer/side_menu.phtml:49
+#: templates/database/designer/side_menu.phtml:52
 #, fuzzy
 #| msgid "Free pages"
 msgid "Open page"
@@ -2548,7 +2554,7 @@ msgstr "Volnych staronak"
 msgid "Delete page"
 msgstr "Vybrać usio"
 
-#: js/messages.php:467 templates/designer/side_menu.phtml:10
+#: js/messages.php:467 templates/database/designer/side_menu.phtml:10
 msgid "Untitled"
 msgstr ""
 
@@ -2673,7 +2679,7 @@ msgstr "Pieršapačatkovaja pazycyja"
 msgid "cancel"
 msgstr "Skasavać"
 
-#: js/messages.php:499 libraries/server_status.lib.php:271
+#: js/messages.php:499 libraries/server_status.lib.php:280
 msgid "Aborted"
 msgstr "Spyniena"
 
@@ -3365,7 +3371,7 @@ msgstr "%d nie źjaŭlajecca karektnym numaram radka."
 
 #: js/messages.php:793 libraries/Message.class.php:199
 #: libraries/Util.class.php:654 libraries/core.lib.php:245
-#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1172
+#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1170
 #: tbl_operations.php:229 view_operations.php:63
 msgid "Error"
 msgstr "Pamyłka"
@@ -3425,8 +3431,8 @@ msgstr "u sekundu"
 msgid "per minute"
 msgstr "u chvilinu"
 
-#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:143
-#: libraries/server_status.lib.php:228
+#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:152
+#: libraries/server_status.lib.php:237
 #: libraries/server_status_queries.lib.php:98
 msgid "per hour"
 msgstr "u hadzinu"
@@ -3444,7 +3450,7 @@ msgstr ""
 msgid "Wrong permissions on configuration file, should not be world writable!"
 msgstr ""
 
-#: libraries/Config.class.php:1799
+#: libraries/Config.class.php:1801
 msgid "Font size"
 msgstr "Pamier šryfta"
 
@@ -3474,10 +3480,10 @@ msgstr "pa zapytu"
 #: libraries/server_privileges.lib.php:2890
 #: libraries/server_privileges.lib.php:3144
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4332
+#: libraries/server_privileges.lib.php:4358
 #: libraries/server_status_processes.lib.php:80
-#: templates/tbl_relation/foreign_key_row.phtml:165
-#: templates/tbl_relation/internal_relational_row.phtml:55
+#: templates/table/relation/foreign_key_row.phtml:165
+#: templates/table/relation/internal_relational_row.phtml:55
 msgid "Database"
 msgstr "Baza dadzienych"
 
@@ -3585,11 +3591,11 @@ msgstr "Historyja SQL"
 #: libraries/plugins/import/ImportMediawiki.class.php:60
 #: libraries/plugins/import/ImportOds.class.php:59
 #: libraries/plugins/import/ImportShp.class.php:57
-#: libraries/plugins/import/ImportSql.class.php:148
+#: libraries/plugins/import/ImportSql.class.php:51
 #: libraries/plugins/import/ImportXml.class.php:58
-#: libraries/rte/rte_routines.lib.php:833 templates/index_form.phtml:49
-#: templates/structure/row_stats_table.phtml:20
-#: templates/table/options.phtml:2
+#: libraries/rte/rte_routines.lib.php:924 templates/table/index_form.phtml:49
+#: templates/table/search/options.phtml:2
+#: templates/table/structure/row_stats_table.phtml:20
 msgid "Options"
 msgstr "Nałady"
 
@@ -3632,7 +3638,8 @@ msgstr "advarotny"
 msgid "Order:"
 msgstr ""
 
-#: libraries/Console.class.php:289 templates/table/replace_preview.phtml:17
+#: libraries/Console.class.php:289
+#: templates/table/search/replace_preview.phtml:17
 #, fuzzy
 #| msgid "Column names"
 msgid "Count"
@@ -3757,9 +3764,9 @@ msgstr "Pierajści da skapijavanaj tablicy"
 #: libraries/operations.lib.php:794 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:191
-#: templates/structure/sortable_header.phtml:21
-#: templates/structure/sortable_header.phtml:38
-#: templates/table/options.phtml:68
+#: templates/database/structure/sortable_header.phtml:21
+#: templates/database/structure/sortable_header.phtml:38
+#: templates/table/search/options.phtml:68
 msgid "Ascending"
 msgstr "pramy"
 
@@ -3769,13 +3776,14 @@ msgstr "pramy"
 #: libraries/operations.lib.php:797 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:188
-#: templates/structure/sortable_header.phtml:26
-#: templates/structure/sortable_header.phtml:43
-#: templates/table/options.phtml:69
+#: templates/database/structure/sortable_header.phtml:26
+#: templates/database/structure/sortable_header.phtml:43
+#: templates/table/search/options.phtml:69
 msgid "Descending"
 msgstr "advarotny"
 
-#: libraries/DBQbe.class.php:467 templates/table/search_and_replace.phtml:6
+#: libraries/DBQbe.class.php:467
+#: templates/table/search/search_and_replace.phtml:6
 #, fuzzy
 #| msgid "Column names"
 msgid "Column:"
@@ -3968,12 +3976,12 @@ msgstr[1] "%s supadzieńniaŭ u tablicy %s"
 msgstr[2] "%s supadzieńniaŭ u tablicy %s"
 
 #: libraries/DbSearch.class.php:354 libraries/Menu.class.php:311
-#: libraries/Util.class.php:3337 libraries/Util.class.php:3347
-#: libraries/Util.class.php:3623 libraries/Util.class.php:3624
-#: libraries/Util.class.php:4343 libraries/config.values.php:43
+#: libraries/Util.class.php:3343 libraries/Util.class.php:3353
+#: libraries/Util.class.php:3629 libraries/Util.class.php:3630
+#: libraries/Util.class.php:4349 libraries/config.values.php:43
 #: libraries/config.values.php:51 libraries/config.values.php:119
 #: libraries/navigation/Nodes/Node_Table.class.php:295
-#: templates/structure/check_all_table_column.phtml:5
+#: templates/table/structure/check_all_table_column.phtml:5
 msgid "Browse"
 msgstr "Prahlad"
 
@@ -3993,7 +4001,8 @@ msgstr "Pošuk u bazie dadzienych"
 msgid "Words or values to search for (wildcard: \"%\"):"
 msgstr "Słova(y) abo značeńnie(i) dla pošuku (maska: \"%\"):"
 
-#: libraries/DbSearch.class.php:401 templates/table/search_and_replace.phtml:1
+#: libraries/DbSearch.class.php:401
+#: templates/table/search/search_and_replace.phtml:1
 msgid "Find:"
 msgstr "Znajści:"
 
@@ -4047,16 +4056,16 @@ msgstr "Fajły"
 msgid "Search this table"
 msgstr "Pošuk u bazie dadzienych"
 
-#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2532
-#: libraries/Util.class.php:2535
+#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2538
+#: libraries/Util.class.php:2541
 #, fuzzy
 #| msgid "Begin"
 msgctxt "First page"
 msgid "Begin"
 msgstr "Pieršaja staronka"
 
-#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2533
-#: libraries/Util.class.php:2536 libraries/server_bin_log.lib.php:170
+#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2539
+#: libraries/Util.class.php:2542 libraries/server_bin_log.lib.php:170
 #: libraries/server_bin_log.lib.php:172
 #, fuzzy
 #| msgid "Previous"
@@ -4064,8 +4073,8 @@ msgctxt "Previous page"
 msgid "Previous"
 msgstr "Papiaredniaja staronka"
 
-#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2564
-#: libraries/Util.class.php:2574 libraries/server_bin_log.lib.php:204
+#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2570
+#: libraries/Util.class.php:2580 libraries/server_bin_log.lib.php:204
 #: libraries/server_bin_log.lib.php:206
 #, fuzzy
 #| msgid "Next"
@@ -4073,8 +4082,8 @@ msgctxt "Next page"
 msgid "Next"
 msgstr "Nastupnaja staronka"
 
-#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2565
-#: libraries/Util.class.php:2575
+#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2571
+#: libraries/Util.class.php:2581
 #, fuzzy
 #| msgid "End"
 msgctxt "Last page"
@@ -4163,9 +4172,9 @@ msgid "May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]."
 msgstr "Značeńnie moža być prybliznym. Hł. [doc@faq3-11]FAQ 3.11[/doc]"
 
 #: libraries/DisplayResults.class.php:4332 libraries/Message.class.php:180
-#: libraries/controllers/TableRelationController.class.php:258
+#: libraries/controllers/TableRelationController.class.php:259
 #: libraries/controllers/TableSearchController.class.php:655
-#: libraries/rte/rte_routines.lib.php:1332 libraries/sql_query_form.lib.php:89
+#: libraries/rte/rte_routines.lib.php:1423 libraries/sql_query_form.lib.php:89
 #: tbl_operations.php:227 tbl_row_action.php:138 view_operations.php:62
 #, fuzzy
 #| msgid "Your SQL query has been executed successfully."
@@ -4173,7 +4182,7 @@ msgid "Your SQL query has been executed successfully."
 msgstr "Vaš SQL-zapyt byŭ paśpiachova vykanany"
 
 #: libraries/DisplayResults.class.php:4660
-#: libraries/controllers/StructureController.class.php:629
+#: libraries/controllers/DatabaseStructureController.class.php:564
 #, php-format
 msgid ""
 "This view has at least this number of rows. Please refer to %sdocumentation"
@@ -4199,34 +4208,34 @@ msgstr ""
 msgid "%d total"
 msgstr "usiaho"
 
-#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1318
+#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1312
 #, fuzzy, php-format
 #| msgid "Query took %01.4f sec"
 msgid "Query took %01.4f seconds."
 msgstr "Zapyt vykonvaŭsia %01.4f sek"
 
 #: libraries/DisplayResults.class.php:4807
-#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4767
-#: libraries/Util.class.php:4773 libraries/mult_submits.inc.php:50
-#: templates/structure/check_all_tables.phtml:2
-#: templates/structure/check_all_tables.phtml:9
+#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4773
+#: libraries/Util.class.php:4779 libraries/mult_submits.inc.php:50
+#: templates/database/structure/check_all_tables.phtml:2
+#: templates/database/structure/check_all_tables.phtml:9
 msgid "With selected:"
 msgstr "Z adznačanymi:"
 
 #: libraries/DisplayResults.class.php:4811
-#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4769
-#: libraries/Util.class.php:4770 libraries/server_privileges.lib.php:1174
+#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4775
+#: libraries/Util.class.php:4776 libraries/server_privileges.lib.php:1174
 #: libraries/server_privileges.lib.php:1175
 #: libraries/server_privileges.lib.php:1387
 #: libraries/server_user_groups.lib.php:231
-#: templates/structure/check_all_tables.phtml:3
-#: templates/structure/check_all_tables.phtml:4
+#: templates/database/structure/check_all_tables.phtml:3
+#: templates/database/structure/check_all_tables.phtml:4
 msgid "Check All"
 msgstr "Adznačyć usio"
 
 #: libraries/DisplayResults.class.php:4985 libraries/Header.class.php:383
-#: templates/structure/optional_action_links.phtml:1
-#: templates/structure/print_view_data_dictionary_link.phtml:3
+#: templates/database/structure/print_view_data_dictionary_link.phtml:3
+#: templates/table/structure/optional_action_links.phtml:1
 msgid "Print view"
 msgstr "Versija dla druku"
 
@@ -4234,7 +4243,8 @@ msgstr "Versija dla druku"
 msgid "Query results operations"
 msgstr "Dziejańni z vynikami zapytaŭ"
 
-#: libraries/DisplayResults.class.php:5105 templates/tbl_chart.phtml:12
+#: libraries/DisplayResults.class.php:5105
+#: templates/table/chart/tbl_chart.phtml:12
 #, fuzzy
 #| msgid "Display PDF schema"
 msgid "Display chart"
@@ -4341,7 +4351,7 @@ msgid "Click on the bar to scroll to top of page"
 msgstr ""
 
 #: libraries/Header.class.php:749
-#: libraries/plugins/auth/AuthenticationCookie.class.php:152
+#: libraries/plugins/auth/AuthenticationCookie.class.php:140
 #, fuzzy
 #| msgid "Cookies must be enabled past this point."
 msgid "Javascript must be enabled past this point!"
@@ -4365,11 +4375,11 @@ msgid "Keyname"
 msgstr "Imia kluča"
 
 #: libraries/Index.class.php:697
-#: libraries/controllers/StructureController.class.php:1962
-#: libraries/controllers/StructureController.class.php:1967
+#: libraries/controllers/TableStructureController.class.php:953
+#: libraries/controllers/TableStructureController.class.php:958
 #: libraries/tracking.lib.php:973
 #: templates/columns_definitions/column_indexes.phtml:11
-#: templates/structure/check_all_table_column.phtml:26
+#: templates/table/structure/check_all_table_column.phtml:26
 msgid "Unique"
 msgstr "Unikalnaje"
 
@@ -4388,16 +4398,17 @@ msgstr "Kolkaść elementaŭ"
 #: libraries/server_collations.lib.php:35 libraries/tracking.lib.php:881
 #: libraries/tracking.lib.php:977
 #: templates/columns_definitions/table_fields_definitions.phtml:33
-#: templates/structure/row_stats_table.phtml:31
-#: templates/structure/table_header.phtml:55
-#: templates/structure/table_structure_header.phtml:7
-#: templates/table/table_header.phtml:8
+#: templates/database/structure/table_header.phtml:55
+#: templates/table/search/table_header.phtml:8
+#: templates/table/structure/row_stats_table.phtml:31
+#: templates/table/structure/table_structure_header.phtml:7
 msgid "Collation"
 msgstr "Supastaŭleńnie"
 
 #: libraries/Index.class.php:703 libraries/rte/rte_events.lib.php:496
-#: libraries/rte/rte_routines.lib.php:956 libraries/tracking.lib.php:885
-#: libraries/tracking.lib.php:979 templates/structure/table_header.phtml:84
+#: libraries/rte/rte_routines.lib.php:1047 libraries/tracking.lib.php:885
+#: libraries/tracking.lib.php:979
+#: templates/database/structure/table_header.phtml:84
 msgid "Comment"
 msgstr "Kamentar"
 
@@ -4410,15 +4421,15 @@ msgstr "Pieršasny kluč byŭ vydaleny."
 msgid "Index %s has been dropped."
 msgstr "Indeks %s byŭ vydaleny."
 
-#: libraries/Index.class.php:757 libraries/Util.class.php:3630
-#: libraries/Util.class.php:3631
-#: libraries/controllers/StructureController.class.php:1958
-#: libraries/controllers/StructureController.class.php:1959
+#: libraries/Index.class.php:757 libraries/Util.class.php:3636
+#: libraries/Util.class.php:3637
+#: libraries/controllers/TableStructureController.class.php:949
+#: libraries/controllers/TableStructureController.class.php:950
 #: libraries/operations.lib.php:1607 libraries/rte/rte_list.lib.php:150
 #: libraries/server_databases.lib.php:146
-#: templates/structure/check_all_table_column.phtml:15
-#: templates/structure/check_all_tables.phtml:16
-#: templates/tbl_relation/foreign_key_row.phtml:93
+#: templates/database/structure/check_all_tables.phtml:16
+#: templates/table/relation/foreign_key_row.phtml:93
+#: templates/table/structure/check_all_table_column.phtml:15
 msgid "Drop"
 msgstr "Vydalić"
 
@@ -4449,16 +4460,16 @@ msgstr "Server"
 #: libraries/Menu.class.php:248
 #: libraries/navigation/Nodes/Node_View.class.php:32
 #: libraries/tbl_info.inc.php:63
-#: templates/structure/structure_table_row.phtml:97
-#: templates/structure/structure_table_row.phtml:159
+#: templates/database/structure/structure_table_row.phtml:97
+#: templates/database/structure/structure_table_row.phtml:159
 msgid "View"
 msgstr "Vyhlad"
 
 #: libraries/Menu.class.php:325 libraries/Menu.class.php:429
-#: libraries/Menu.class.php:548 libraries/Util.class.php:3334
-#: libraries/Util.class.php:3344 libraries/Util.class.php:3350
-#: libraries/Util.class.php:4313 libraries/Util.class.php:4328
-#: libraries/Util.class.php:4345 libraries/config.values.php:40
+#: libraries/Menu.class.php:548 libraries/Util.class.php:3340
+#: libraries/Util.class.php:3350 libraries/Util.class.php:3356
+#: libraries/Util.class.php:4319 libraries/Util.class.php:4334
+#: libraries/Util.class.php:4351 libraries/config.values.php:40
 #: libraries/config.values.php:48 libraries/config.values.php:110
 #: libraries/config.values.php:116 libraries/config/messages.inc.php:321
 #: libraries/navigation/Nodes/Node_Table.class.php:292
@@ -4466,19 +4477,19 @@ msgid "SQL"
 msgstr "SQL"
 
 #: libraries/Menu.class.php:328 libraries/Menu.class.php:432
-#: libraries/Util.class.php:3335 libraries/Util.class.php:3345
-#: libraries/Util.class.php:3351 libraries/Util.class.php:3625
-#: libraries/Util.class.php:3626 libraries/Util.class.php:4329
-#: libraries/Util.class.php:4346 libraries/config.values.php:41
+#: libraries/Util.class.php:3341 libraries/Util.class.php:3351
+#: libraries/Util.class.php:3357 libraries/Util.class.php:3631
+#: libraries/Util.class.php:3632 libraries/Util.class.php:4335
+#: libraries/Util.class.php:4352 libraries/config.values.php:41
 #: libraries/config.values.php:49 libraries/config.values.php:111
 #: libraries/config.values.php:117
 #: libraries/navigation/Nodes/Node_Table.class.php:286
 msgid "Search"
 msgstr "Pošuk"
 
-#: libraries/Menu.class.php:338 libraries/Util.class.php:3336
-#: libraries/Util.class.php:3346 libraries/Util.class.php:3627
-#: libraries/Util.class.php:3628 libraries/Util.class.php:4347
+#: libraries/Menu.class.php:338 libraries/Util.class.php:3342
+#: libraries/Util.class.php:3352 libraries/Util.class.php:3633
+#: libraries/Util.class.php:3634 libraries/Util.class.php:4353
 #: libraries/config.values.php:42 libraries/config.values.php:50
 #: libraries/config.values.php:118
 #: libraries/navigation/Nodes/Node_Table.class.php:289
@@ -4487,30 +4498,30 @@ msgid "Insert"
 msgstr "Ustavić"
 
 #: libraries/Menu.class.php:362 libraries/Menu.class.php:467
-#: libraries/Util.class.php:4334 libraries/Util.class.php:4350
+#: libraries/Util.class.php:4340 libraries/Util.class.php:4356
 #: libraries/config.values.php:106 libraries/server_common.lib.php:51
 #: libraries/server_privileges.lib.php:2370
 #: libraries/server_privileges.lib.php:3158
-#: libraries/server_privileges.lib.php:4221
+#: libraries/server_privileges.lib.php:4247
 msgid "Privileges"
 msgstr "Pryvilei"
 
 #: libraries/Menu.class.php:371 libraries/Menu.class.php:379
-#: libraries/Menu.class.php:459 libraries/Util.class.php:3338
-#: libraries/Util.class.php:3352 libraries/Util.class.php:4333
-#: libraries/Util.class.php:4351 libraries/config.values.php:112
+#: libraries/Menu.class.php:459 libraries/Util.class.php:3344
+#: libraries/Util.class.php:3358 libraries/Util.class.php:4339
+#: libraries/Util.class.php:4357 libraries/config.values.php:112
 #: view_operations.php:92
 msgid "Operations"
 msgstr "Aperacyi"
 
 #: libraries/Menu.class.php:384 libraries/Menu.class.php:492
-#: libraries/Util.class.php:4338 libraries/Util.class.php:4352
+#: libraries/Util.class.php:4344 libraries/Util.class.php:4358
 #: libraries/relation.lib.php:255
 msgid "Tracking"
 msgstr ""
 
 #: libraries/Menu.class.php:397 libraries/Menu.class.php:486
-#: libraries/Util.class.php:4337 libraries/Util.class.php:4353
+#: libraries/Util.class.php:4343 libraries/Util.class.php:4359
 #: libraries/navigation/Nodes/Node_Trigger_Container.class.php:24
 #: libraries/plugins/export/ExportHtmlword.class.php:557
 #: libraries/plugins/export/ExportOdt.class.php:685
@@ -4527,16 +4538,16 @@ msgstr "Tryhiery"
 msgid "Database seems to be empty!"
 msgstr "Baza dadzienych — pustaja!"
 
-#: libraries/Menu.class.php:439 libraries/Util.class.php:4330
+#: libraries/Menu.class.php:439 libraries/Util.class.php:4336
 msgid "Query"
 msgstr "Zapyt zhodna prykładu"
 
-#: libraries/Menu.class.php:472 libraries/Util.class.php:4335
+#: libraries/Menu.class.php:472 libraries/Util.class.php:4341
 #: libraries/rte/rte_words.lib.php:36
 msgid "Routines"
 msgstr "Pracedury"
 
-#: libraries/Menu.class.php:479 libraries/Util.class.php:4336
+#: libraries/Menu.class.php:479 libraries/Util.class.php:4342
 #: libraries/navigation/Nodes/Node_Event_Container.class.php:26
 #: libraries/plugins/export/ExportSql.class.php:940
 #: libraries/plugins/export/ExportXml.class.php:107
@@ -4544,22 +4555,22 @@ msgstr "Pracedury"
 msgid "Events"
 msgstr "Padziei"
 
-#: libraries/Menu.class.php:498 libraries/Util.class.php:4339
+#: libraries/Menu.class.php:498 libraries/Util.class.php:4345
 msgid "Designer"
 msgstr "Dyzajner"
 
-#: libraries/Menu.class.php:507 libraries/Util.class.php:4340
-#: templates/structure/check_all_tables.phtml:35
+#: libraries/Menu.class.php:507 libraries/Util.class.php:4346
+#: templates/database/structure/check_all_tables.phtml:35
 #, fuzzy
 #| msgid "Add/Delete Field Columns"
 msgid "Central columns"
 msgstr "Dadać/vydalić kalonku kryteru"
 
-#: libraries/Menu.class.php:544 libraries/Util.class.php:4312
+#: libraries/Menu.class.php:544 libraries/Util.class.php:4318
 #: libraries/config.values.php:103 libraries/config/messages.inc.php:266
 #: libraries/config/messages.inc.php:341
 #: libraries/navigation/NavigationTree.class.php:1239
-#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4332
+#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4358
 msgid "Databases"
 msgstr "Bazy dadzienych"
 
@@ -4570,34 +4581,34 @@ msgid "User accounts"
 msgstr "Karystalnik"
 
 #: libraries/Menu.class.php:595 libraries/ServerStatusData.class.php:121
-#: libraries/Util.class.php:4319 libraries/server_common.lib.php:36
+#: libraries/Util.class.php:4325 libraries/server_common.lib.php:36
 msgid "Binary log"
 msgstr "Dvajkovy łog"
 
 #: libraries/Menu.class.php:601 libraries/ServerStatusData.class.php:126
-#: libraries/Util.class.php:4320 libraries/server_common.lib.php:42
-#: templates/structure/body_for_table_summary.phtml:10
-#: templates/structure/table_header.phtml:27
+#: libraries/Util.class.php:4326 libraries/server_common.lib.php:42
+#: templates/database/structure/body_for_table_summary.phtml:10
+#: templates/database/structure/table_header.phtml:27
 msgid "Replication"
 msgstr "Replikacyja"
 
 #: libraries/Menu.class.php:606 libraries/ServerStatusData.class.php:193
-#: libraries/Util.class.php:4321 libraries/config.values.php:105
+#: libraries/Util.class.php:4327 libraries/config.values.php:105
 #: libraries/server_engines.lib.php:108 libraries/server_engines.lib.php:112
 #: libraries/sql_query_form.lib.php:421
 msgid "Variables"
 msgstr "Źmiennyja"
 
-#: libraries/Menu.class.php:610 libraries/Util.class.php:4322
+#: libraries/Menu.class.php:610 libraries/Util.class.php:4328
 msgid "Charsets"
 msgstr "Kadyroŭki"
 
-#: libraries/Menu.class.php:615 libraries/Util.class.php:4323
+#: libraries/Menu.class.php:615 libraries/Util.class.php:4329
 #: libraries/server_common.lib.php:33 libraries/server_plugins.lib.php:27
 msgid "Plugins"
 msgstr ""
 
-#: libraries/Menu.class.php:626 libraries/Util.class.php:4324
+#: libraries/Menu.class.php:626 libraries/Util.class.php:4330
 msgid "Engines"
 msgstr "Mašyny"
 
@@ -4625,7 +4636,7 @@ msgid_plural "%1$d rows inserted."
 msgstr[0] "Ustaŭlena radkoŭ: %1$d."
 msgstr[1] "Ustaŭlena radkoŭ: %1$d."
 
-#: libraries/PDF.class.php:70 libraries/Util.class.php:2521
+#: libraries/PDF.class.php:70 libraries/Util.class.php:2527
 #: libraries/browse_foreigners.lib.php:327
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:865
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:890
@@ -4652,7 +4663,7 @@ msgid "Could not save favorite table!"
 msgstr "Niemahčyma zahruzić kanfihuracyju pa zmoŭčańni z: \"%1$s\""
 
 #: libraries/RecentFavoriteTable.class.php:212
-#: templates/structure/favorite_anchor.phtml:12
+#: templates/database/structure/favorite_anchor.phtml:12
 #, fuzzy
 #| msgid "Rename database to"
 msgid "Remove from Favorites"
@@ -4842,7 +4853,7 @@ msgstr ""
 "Dla hetaj mašyny zachavańnia dadzienych detalnaja infarmacyja nie dastupnaja."
 
 #: libraries/StorageEngine.class.php:373
-#: templates/structure/body_for_table_summary.phtml:50
+#: templates/database/structure/body_for_table_summary.phtml:50
 #, php-format
 msgid "%s is the default storage engine on this MySQL server."
 msgstr ""
@@ -5277,10 +5288,10 @@ msgstr ""
 
 #: libraries/Util.class.php:726 libraries/rte/rte_events.lib.php:110
 #: libraries/rte/rte_events.lib.php:119 libraries/rte/rte_events.lib.php:150
-#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:153
-#: libraries/rte/rte_routines.lib.php:162
-#: libraries/rte/rte_routines.lib.php:235
-#: libraries/rte/rte_routines.lib.php:1366
+#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:223
+#: libraries/rte/rte_routines.lib.php:250
+#: libraries/rte/rte_routines.lib.php:372
+#: libraries/rte/rte_routines.lib.php:1457
 #: libraries/rte/rte_triggers.lib.php:86 libraries/rte/rte_triggers.lib.php:95
 #: libraries/rte/rte_triggers.lib.php:127
 msgid "MySQL said: "
@@ -5326,80 +5337,83 @@ msgstr "Ndz"
 msgid "%B %d, %Y at %I:%M %p"
 msgstr "%d %B %Y, %H:%M"
 
-#: libraries/Util.class.php:2019
+#: libraries/Util.class.php:2025
 #, php-format
 msgid "%s days, %s hours, %s minutes and %s seconds"
 msgstr "%s dzion, %s hadzinaŭ, %s chvilinaŭ i %s sekundaŭ"
 
-#: libraries/Util.class.php:2112
+#: libraries/Util.class.php:2118
 #, fuzzy
 #| msgid "Routines"
 msgid "Missing parameter:"
 msgstr "Pracedury"
 
-#: libraries/Util.class.php:2645
+#: libraries/Util.class.php:2651
 #, php-format
 msgid "Jump to database \"%s\"."
 msgstr "Pierajści da bazy dadzienych \"%s\"."
 
-#: libraries/Util.class.php:2670
+#: libraries/Util.class.php:2676
 #, php-format
 msgid "The %s functionality is affected by a known bug, see %s"
 msgstr ""
 "Isnuje viadomaja pamyłka z vykarystańniem parametra %s, hladzicie apisańnie "
 "na %s"
 
-#: libraries/Util.class.php:2881
+#: libraries/Util.class.php:2887
 msgid "Click to toggle"
 msgstr ""
 
-#: libraries/Util.class.php:3542 prefs_manage.php:248
+#: libraries/Util.class.php:3548 prefs_manage.php:248
 msgid "Browse your computer:"
 msgstr ""
 
-#: libraries/Util.class.php:3567
+#: libraries/Util.class.php:3573
 #, fuzzy, php-format
 #| msgid "web server upload directory"
 msgid "Select from the web server upload directory <b>%s</b>:"
 msgstr "tečka web-servera dla zahruzki fajłaŭ"
 
-#: libraries/Util.class.php:3596 libraries/insert_edit.lib.php:1173
+#: libraries/Util.class.php:3602 libraries/insert_edit.lib.php:1171
 msgid "The directory you set for upload work cannot be reached."
 msgstr "Niemahčyma adkryć paznačanuju vami tečku dla zahruzki fajłaŭ."
 
-#: libraries/Util.class.php:3607
+#: libraries/Util.class.php:3613
 msgid "There are no files to upload!"
 msgstr ""
 
-#: libraries/Util.class.php:3632 libraries/Util.class.php:3633
-#: templates/structure/check_all_tables.phtml:15
+#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: templates/database/structure/check_all_tables.phtml:15
 msgid "Empty"
 msgstr "Ačyścić"
 
-#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: libraries/Util.class.php:3644 libraries/Util.class.php:3645
 msgid "Execute"
 msgstr ""
 
-#: libraries/Util.class.php:4152
+#: libraries/Util.class.php:4158
 msgid "Print"
 msgstr "Druk"
 
-#: libraries/Util.class.php:4257 templates/structure/row_stats_table.phtml:80
-#: templates/structure/table_header.phtml:95
+#: libraries/Util.class.php:4263
+#: templates/database/structure/table_header.phtml:95
+#: templates/table/structure/row_stats_table.phtml:80
 msgid "Creation"
 msgstr "Stvoranaja"
 
-#: libraries/Util.class.php:4263 templates/structure/row_stats_table.phtml:87
-#: templates/structure/table_header.phtml:106
+#: libraries/Util.class.php:4269
+#: templates/database/structure/table_header.phtml:106
+#: templates/table/structure/row_stats_table.phtml:87
 msgid "Last update"
 msgstr "Apošniaje abnaŭleńnie"
 
-#: libraries/Util.class.php:4269 templates/structure/row_stats_table.phtml:94
-#: templates/structure/table_header.phtml:117
+#: libraries/Util.class.php:4275
+#: templates/database/structure/table_header.phtml:117
+#: templates/table/structure/row_stats_table.phtml:94
 msgid "Last check"
 msgstr "Apošniaja pravierka"
 
-#: libraries/Util.class.php:4315
+#: libraries/Util.class.php:4321
 #, fuzzy
 #| msgid "User"
 msgid "Users"
@@ -5424,16 +5438,16 @@ msgid "Use this value"
 msgstr "Vykarystoŭvać heta značeńnie"
 
 #: libraries/build_html_for_db.lib.php:33 libraries/import.lib.php:193
-#: templates/structure/actions_in_table_structure.phtml:113
-#: templates/structure/row_stats_table.phtml:42
-#: templates/structure/table_header.phtml:36
+#: templates/database/structure/table_header.phtml:36
+#: templates/table/structure/actions_in_table_structure.phtml:113
+#: templates/table/structure/row_stats_table.phtml:42
 msgid "Rows"
 msgstr "Radki"
 
 #: libraries/build_html_for_db.lib.php:48 libraries/engines/innodb.lib.php:171
-#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:186
-#: libraries/server_status.lib.php:298
-#: templates/structure/display_table_stats.phtml:40
+#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:195
+#: libraries/server_status.lib.php:307
+#: templates/table/structure/display_table_stats.phtml:40
 msgid "Total"
 msgstr "Ahułam"
 
@@ -5444,10 +5458,12 @@ msgid "Jump to database"
 msgstr "Bazy dadzienych adsutničajuć"
 
 #: libraries/build_html_for_db.lib.php:146
+#: templates/database/structure/structure_table_row.phtml:15
 msgid "Not replicated"
 msgstr ""
 
 #: libraries/build_html_for_db.lib.php:158
+#: templates/database/structure/structure_table_row.phtml:16
 #, fuzzy
 #| msgid "Replication"
 msgid "Replicated"
@@ -5506,17 +5522,17 @@ msgstr ""
 #: libraries/plugins/export/ExportTexytext.class.php:425
 #: libraries/plugins/export/PMA_ExportPdf.class.php:307
 #: libraries/rte/rte_list.lib.php:73 libraries/rte/rte_list.lib.php:85
-#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:830
-#: libraries/rte/rte_routines.lib.php:1492 setup/frames/index.inc.php:162
+#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:921
+#: libraries/rte/rte_routines.lib.php:1583 setup/frames/index.inc.php:162
 #: templates/columns_definitions/table_fields_definitions.phtml:8
-#: templates/structure/table_structure_header.phtml:5
-#: templates/table/create_table.phtml:11
+#: templates/database/create_table.phtml:11
+#: templates/table/structure/table_structure_header.phtml:5
 msgid "Name"
 msgstr "Nazva"
 
 #: libraries/central_columns.lib.php:699
 #: libraries/central_columns.lib.php:1381
-#: libraries/rte/rte_routines.lib.php:832
+#: libraries/rte/rte_routines.lib.php:923
 #: templates/columns_definitions/table_fields_definitions.phtml:14
 msgid "Length/Values"
 msgstr "Daŭžynia/Značeńni*"
@@ -5539,7 +5555,7 @@ msgid "Select a table"
 msgstr "Vybierycie tablicu(y)"
 
 #: libraries/central_columns.lib.php:804
-#: templates/structure/add_column.phtml:4
+#: templates/table/structure/add_column.phtml:4
 #, fuzzy
 #| msgid "Add %s field(s)"
 msgid "Add column"
@@ -5561,7 +5577,7 @@ msgstr "Dadać %s novyja pali"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1002
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1025
 #: templates/columns_definitions/table_fields_definitions.phtml:36
-#: templates/structure/table_structure_header.phtml:8
+#: templates/table/structure/table_structure_header.phtml:8
 msgid "Attributes"
 msgstr "Atrybuty"
 
@@ -5687,7 +5703,7 @@ msgid "Double click"
 msgstr ""
 
 #: libraries/config.values.php:95 libraries/config.values.php:124
-#: libraries/config/FormDisplay.tpl.php:221 libraries/relation.lib.php:97
+#: libraries/config/FormDisplay.tpl.php:232 libraries/relation.lib.php:97
 #: libraries/relation.lib.php:105
 msgid "Disabled"
 msgstr "Adklučana"
@@ -5879,21 +5895,21 @@ msgstr ""
 msgid "maximum %s"
 msgstr ""
 
-#: libraries/config/FormDisplay.tpl.php:219
+#: libraries/config/FormDisplay.tpl.php:230
 msgid "This setting is disabled, it will not be applied to your configuration."
 msgstr ""
 
-#: libraries/config/FormDisplay.tpl.php:313
+#: libraries/config/FormDisplay.tpl.php:324
 #, php-format
 msgid "Set value: %s"
 msgstr ""
 
-#: libraries/config/FormDisplay.tpl.php:318
+#: libraries/config/FormDisplay.tpl.php:329
 #: libraries/config/messages.inc.php:610
 msgid "Restore default value"
 msgstr ""
 
-#: libraries/config/FormDisplay.tpl.php:332
+#: libraries/config/FormDisplay.tpl.php:343
 msgid "Allow users to customize this value"
 msgstr ""
 
@@ -6334,7 +6350,7 @@ msgstr ""
 
 #: libraries/config/messages.inc.php:136 libraries/config/messages.inc.php:152
 #: libraries/sql_query_form.lib.php:247
-#: templates/structure/row_stats_table.phtml:7
+#: templates/table/structure/row_stats_table.phtml:7
 msgid "Format"
 msgstr "Farmat"
 
@@ -6905,7 +6921,7 @@ msgstr ""
 
 #: libraries/config/messages.inc.php:332
 #: libraries/plugins/export/ExportPdf.class.php:279
-#: templates/structure/secondary_tabs.phtml:8
+#: templates/table/secondary_tabs.phtml:8
 #, fuzzy
 #| msgid "Database for user"
 msgid "Table structure"
@@ -8546,113 +8562,35 @@ msgstr "Microsoft Word 2000"
 msgid "OpenDocument Text"
 msgstr "Tekst Open Document"
 
-#: libraries/controllers/StructureController.class.php:465
+#: libraries/controllers/DatabaseStructureController.class.php:405
 #: tbl_operations.php:382
 #, php-format
 msgid "Table %s has been emptied."
 msgstr "Tablica %s była ačyščanaja."
 
-#: libraries/controllers/StructureController.class.php:486
+#: libraries/controllers/DatabaseStructureController.class.php:426
 #: tbl_operations.php:400 view_operations.php:119
 #, fuzzy, php-format
 #| msgid "View %s has been dropped."
 msgid "View %s has been dropped."
 msgstr "Vyhlad %s byŭ vydaleny"
 
-#: libraries/controllers/StructureController.class.php:487
+#: libraries/controllers/DatabaseStructureController.class.php:427
 #: tbl_operations.php:401
 #, fuzzy, php-format
 #| msgid "Table %s has been dropped."
 msgid "Table %s has been dropped."
 msgstr "Tablica %s była vydalenaja"
 
-#: libraries/controllers/StructureController.class.php:797
-#, php-format
-msgid "The name '%s' is a MySQL reserved keyword."
-msgid_plural "The names '%s' are MySQL reserved keywords."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: libraries/controllers/StructureController.class.php:875
-#, fuzzy
-#| msgid "No rows selected"
-msgid "No column selected."
-msgstr "Nivodny radok nia vybrany"
-
-#: libraries/controllers/StructureController.class.php:1049
+#: libraries/controllers/DatabaseStructureController.class.php:733
 msgid "Favorite List is full!"
 msgstr ""
 
-#: libraries/controllers/StructureController.class.php:1272
-#, fuzzy
-#| msgid "The selected users have been deleted successfully."
-msgid "The columns have been moved successfully."
-msgstr "Vybranyja karystalniki byli paśpiachova vydalenyja."
-
-#: libraries/controllers/StructureController.class.php:1535
-#, fuzzy, php-format
-#| msgid "Table %1$s has been altered successfully."
-msgid ""
-"Table %1$s has been altered successfully. Privileges have been adjusted."
-msgstr "Tablica %1$s była paśpiachova źmienienaja."
-
-#: libraries/controllers/StructureController.class.php:1541
-#: libraries/controllers/TableIndexesController.class.php:161
-#: tbl_addfield.php:92
-#, php-format
-msgid "Table %1$s has been altered successfully."
-msgstr "Tablica %1$s była paśpiachova źmienienaja."
-
-#: libraries/controllers/StructureController.class.php:1588
-#: libraries/tracking.lib.php:1094
-#, fuzzy
-#| msgid "Query type"
-msgid "Query error"
-msgstr "Typ zapytu"
-
-#: libraries/controllers/StructureController.class.php:1806
+#: libraries/controllers/DatabaseStructureController.class.php:947
 #: libraries/mysql_charsets.lib.php:366 libraries/mysql_charsets.lib.php:373
 msgid "unknown"
 msgstr "nieviadoma"
 
-#: libraries/controllers/StructureController.class.php:1957
-#: templates/structure/check_all_table_column.phtml:11
-msgid "Change"
-msgstr "Źmianić"
-
-#: libraries/controllers/StructureController.class.php:1961
-#: libraries/controllers/StructureController.class.php:1966
-#: libraries/navigation/Nodes/Node_Index.class.php:30
-#: libraries/tracking.lib.php:926
-#: templates/columns_definitions/column_indexes.phtml:16
-#: templates/columns_definitions/table_fields_definitions.phtml:57
-#: templates/structure/check_all_table_column.phtml:30
-#: templates/structure/display_structure.phtml:79
-#: templates/structure/display_table_stats.phtml:19
-msgid "Index"
-msgstr "Indeks"
-
-#: libraries/controllers/StructureController.class.php:1963
-#: libraries/controllers/StructureController.class.php:1968
-#: templates/columns_definitions/column_indexes.phtml:27
-#: templates/structure/check_all_table_column.phtml:37
-msgid "Spatial"
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1964
-#: libraries/controllers/StructureController.class.php:1969
-#: templates/columns_definitions/column_indexes.phtml:22
-#: templates/structure/check_all_table_column.phtml:47
-msgid "Fulltext"
-msgstr "Poŭnatekstekstavaje"
-
-#: libraries/controllers/StructureController.class.php:1970
-#, fuzzy
-#| msgid "Browse distinct values"
-msgid "Distinct values"
-msgstr "Prahlad roznych značeńniaŭ"
-
 #: libraries/controllers/TableChartController.class.php:82
 #: libraries/controllers/TableGisVisualizationController.class.php:101
 msgid "No SQL query was set to fetch data."
@@ -8668,13 +8606,20 @@ msgstr ""
 msgid "No data to display"
 msgstr "Bazy dadzienych adsutničajuć"
 
-#: libraries/controllers/TableRelationController.class.php:217
+#: libraries/controllers/TableIndexesController.class.php:161
+#: libraries/controllers/TableStructureController.class.php:736
+#: tbl_addfield.php:92
+#, php-format
+msgid "Table %1$s has been altered successfully."
+msgstr "Tablica %1$s była paśpiachova źmienienaja."
+
+#: libraries/controllers/TableRelationController.class.php:218
 #, fuzzy
 #| msgid "Thread %s was successfully killed."
 msgid "Display column was successfully updated."
 msgstr "Patok %s byŭ paśpiachova spynieny."
 
-#: libraries/controllers/TableRelationController.class.php:283
+#: libraries/controllers/TableRelationController.class.php:288
 #, fuzzy
 #| msgid "Internal relation added"
 msgid "Internal relations were successfully updated."
@@ -8693,12 +8638,83 @@ msgid "Zoom search"
 msgstr "Pošuk"
 
 #: libraries/controllers/TableSearchController.class.php:852
-#: templates/table/selection_form.phtml:59
+#: templates/table/search/selection_form.phtml:59
 #, fuzzy
 #| msgid "in query"
 msgid "Find and replace"
 msgstr "pa zapytu"
 
+#: libraries/controllers/TableStructureController.class.php:163
+#, php-format
+msgid "The name '%s' is a MySQL reserved keyword."
+msgid_plural "The names '%s' are MySQL reserved keywords."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: libraries/controllers/TableStructureController.class.php:241
+#, fuzzy
+#| msgid "No rows selected"
+msgid "No column selected."
+msgstr "Nivodny radok nia vybrany"
+
+#: libraries/controllers/TableStructureController.class.php:467
+#, fuzzy
+#| msgid "The selected users have been deleted successfully."
+msgid "The columns have been moved successfully."
+msgstr "Vybranyja karystalniki byli paśpiachova vydalenyja."
+
+#: libraries/controllers/TableStructureController.class.php:730
+#, fuzzy, php-format
+#| msgid "Table %1$s has been altered successfully."
+msgid ""
+"Table %1$s has been altered successfully. Privileges have been adjusted."
+msgstr "Tablica %1$s była paśpiachova źmienienaja."
+
+#: libraries/controllers/TableStructureController.class.php:783
+#: libraries/tracking.lib.php:1094
+#, fuzzy
+#| msgid "Query type"
+msgid "Query error"
+msgstr "Typ zapytu"
+
+#: libraries/controllers/TableStructureController.class.php:948
+#: templates/table/structure/check_all_table_column.phtml:11
+msgid "Change"
+msgstr "Źmianić"
+
+#: libraries/controllers/TableStructureController.class.php:952
+#: libraries/controllers/TableStructureController.class.php:957
+#: libraries/navigation/Nodes/Node_Index.class.php:30
+#: libraries/tracking.lib.php:926
+#: templates/columns_definitions/column_indexes.phtml:16
+#: templates/columns_definitions/table_fields_definitions.phtml:57
+#: templates/table/structure/check_all_table_column.phtml:30
+#: templates/table/structure/display_structure.phtml:79
+#: templates/table/structure/display_table_stats.phtml:19
+msgid "Index"
+msgstr "Indeks"
+
+#: libraries/controllers/TableStructureController.class.php:954
+#: libraries/controllers/TableStructureController.class.php:959
+#: templates/columns_definitions/column_indexes.phtml:27
+#: templates/table/structure/check_all_table_column.phtml:37
+msgid "Spatial"
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:955
+#: libraries/controllers/TableStructureController.class.php:960
+#: templates/columns_definitions/column_indexes.phtml:22
+#: templates/table/structure/check_all_table_column.phtml:47
+msgid "Fulltext"
+msgstr "Poŭnatekstekstavaje"
+
+#: libraries/controllers/TableStructureController.class.php:963
+#, fuzzy
+#| msgid "Browse distinct values"
+msgid "Distinct values"
+msgstr "Prahlad roznych značeńniaŭ"
+
 #: libraries/core.lib.php:306
 #, php-format
 msgid "The %s extension is missing. Please check your PHP configuration."
@@ -8746,7 +8762,7 @@ msgid "No Password"
 msgstr "Biez parola"
 
 #: libraries/display_change_password.lib.php:68
-#: libraries/plugins/auth/AuthenticationCookie.class.php:199
+#: libraries/plugins/auth/AuthenticationCookie.class.php:187
 #: libraries/replication_gui.lib.php:422 libraries/replication_gui.lib.php:862
 #: libraries/server_privileges.lib.php:1640
 msgid "Password:"
@@ -9627,12 +9643,12 @@ msgid "Dump has been saved to file %s."
 msgstr "Damp zachavany ŭ fajł %s."
 
 #: libraries/import.lib.php:202 libraries/insert_edit.lib.php:124
-#: libraries/rte/rte_routines.lib.php:1353 libraries/sql.lib.php:1312
+#: libraries/rte/rte_routines.lib.php:1444 libraries/sql.lib.php:1306
 #: tbl_get_field.php:44
 msgid "MySQL returned an empty result set (i.e. zero rows)."
 msgstr "MySQL viarnuła pusty vynik (to bok nul radkoŭ)."
 
-#: libraries/import.lib.php:265 libraries/sql.lib.php:1326
+#: libraries/import.lib.php:265 libraries/sql.lib.php:1320
 msgid "[ROLLBACK occurred.]"
 msgstr ""
 
@@ -9700,14 +9716,14 @@ msgstr "Stvaryć indeks na %s kalonkach"
 
 #: libraries/insert_edit.lib.php:233
 #: libraries/navigation/Nodes/Node_DatabaseChild.class.php:48
-#: templates/designer/table_list.phtml:40
+#: templates/database/designer/table_list.phtml:40
 msgid "Hide"
 msgstr "Schavać"
 
 #: libraries/insert_edit.lib.php:249
 #: libraries/navigation/Nodes/Node_Function.class.php:32
-#: libraries/rte/rte_routines.lib.php:1495
-#: templates/table/table_header.phtml:4
+#: libraries/rte/rte_routines.lib.php:1586
+#: templates/table/search/table_header.phtml:4
 msgid "Function"
 msgstr "Funkcyja"
 
@@ -9722,89 +9738,90 @@ msgstr "Dvajkovy"
 msgid "Because of its length,<br /> this column might not be editable."
 msgstr "Z-za vialikaj daŭžyni, hetaje pole nia moža być adredagavanaje "
 
-#: libraries/insert_edit.lib.php:1050
+#: libraries/insert_edit.lib.php:1048
 msgid "Binary - do not edit"
 msgstr "Dvajkovyja dadzienyja — nie redagujucca"
 
-#: libraries/insert_edit.lib.php:1176 libraries/server_privileges.lib.php:470
-#: templates/table/options.phtml:36
+#: libraries/insert_edit.lib.php:1174 libraries/server_privileges.lib.php:470
+#: templates/table/search/options.phtml:36
 msgid "Or"
 msgstr "Abo"
 
-#: libraries/insert_edit.lib.php:1177
+#: libraries/insert_edit.lib.php:1175
 #, fuzzy
 #| msgid "web server upload directory"
 msgid "web server upload directory:"
 msgstr "tečka web-servera dla zahruzki fajłaŭ"
 
-#: libraries/insert_edit.lib.php:1348 templates/table/input_box.phtml:49
+#: libraries/insert_edit.lib.php:1346
+#: templates/table/search/input_box.phtml:49
 #, fuzzy
 #| msgid "Insert"
 msgid "Edit/Insert"
 msgstr "Ustavić"
 
-#: libraries/insert_edit.lib.php:1398
+#: libraries/insert_edit.lib.php:1396
 #, fuzzy, php-format
 #| msgid "Restart insertion with %s rows"
 msgid "Continue insertion with %s rows"
 msgstr "Pačać ustaŭku znoŭ z %s-ha radku"
 
-#: libraries/insert_edit.lib.php:1428
+#: libraries/insert_edit.lib.php:1426
 msgid "and then"
 msgstr "i paśla"
 
-#: libraries/insert_edit.lib.php:1461
+#: libraries/insert_edit.lib.php:1459
 msgid "Insert as new row"
 msgstr "Ustavić jak novy radok"
 
-#: libraries/insert_edit.lib.php:1464
+#: libraries/insert_edit.lib.php:1462
 msgid "Insert as new row and ignore errors"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1467
+#: libraries/insert_edit.lib.php:1465
 msgid "Show insert query"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1487
+#: libraries/insert_edit.lib.php:1485
 msgid "Go back to previous page"
 msgstr "Pierajści da papiaredniaj staronki"
 
-#: libraries/insert_edit.lib.php:1490
+#: libraries/insert_edit.lib.php:1488
 msgid "Insert another new row"
 msgstr "Dadać jašče adzin radok"
 
-#: libraries/insert_edit.lib.php:1495
+#: libraries/insert_edit.lib.php:1493
 msgid "Go back to this page"
 msgstr "Viarnucca da hetaj staronki"
 
-#: libraries/insert_edit.lib.php:1518
+#: libraries/insert_edit.lib.php:1516
 msgid "Edit next row"
 msgstr "Redagavać nastupny radok"
 
-#: libraries/insert_edit.lib.php:1540
+#: libraries/insert_edit.lib.php:1538
 msgid ""
 "Use TAB key to move from value to value, or CTRL+arrows to move anywhere"
 msgstr ""
 "Vykarystoŭvajcie klavišu TAB dla pieramiaščeńnia ad značeńnia da značeńnia "
 "abo CTRL+strełki dla pieramiaščeńnia ŭ luboje inšaje miesca"
 
-#: libraries/insert_edit.lib.php:1577 libraries/replication_gui.lib.php:542
-#: libraries/rte/rte_routines.lib.php:1497
+#: libraries/insert_edit.lib.php:1575 libraries/replication_gui.lib.php:542
+#: libraries/rte/rte_routines.lib.php:1588
 #: libraries/server_status_variables.lib.php:220
-#: templates/designer/having_query_panel.phtml:100
-#: templates/designer/options_panel.phtml:73
-#: templates/designer/options_panel.phtml:239
-#: templates/designer/where_query_panel.phtml:69
-#: templates/table/table_header.phtml:10
-#: templates/table/zoom_result_form.phtml:35
+#: templates/database/designer/having_query_panel.phtml:100
+#: templates/database/designer/options_panel.phtml:73
+#: templates/database/designer/options_panel.phtml:239
+#: templates/database/designer/where_query_panel.phtml:69
+#: templates/table/search/table_header.phtml:10
+#: templates/table/search/zoom_result_form.phtml:35
 msgid "Value"
 msgstr "Značeńnie"
 
-#: libraries/insert_edit.lib.php:1937 libraries/sql.lib.php:1309
+#: libraries/insert_edit.lib.php:1935 libraries/sql.lib.php:1303
 msgid "Showing SQL query"
 msgstr "U vyhladzie SQL-zapytu"
 
-#: libraries/insert_edit.lib.php:1962 libraries/sql.lib.php:1287
+#: libraries/insert_edit.lib.php:1960 libraries/sql.lib.php:1281
 #, php-format
 msgid "Inserted row id: %1$d"
 msgstr "ID ustaŭlenaha radku: %1$d"
@@ -10258,7 +10275,7 @@ msgstr ""
 #: libraries/navigation/Nodes/Node_View_Container.class.php:26
 #: libraries/navigation/Nodes/Node_View_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:129
-#: templates/structure/show_create.phtml:30
+#: templates/database/structure/show_create.phtml:30
 #, fuzzy
 #| msgid "View"
 msgid "Views"
@@ -10570,7 +10587,7 @@ msgstr "Vy nia majecie dastatkovych pryvilejaŭ być u hetym miescy ŭ hety čas
 
 #: libraries/operations.lib.php:101 libraries/operations.lib.php:249
 #: libraries/operations.lib.php:869 libraries/operations.lib.php:963
-#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:907
+#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:998
 #: templates/columns_definitions/table_fields_definitions.phtml:47
 #, fuzzy
 #| msgid "Edit Privileges"
@@ -10668,22 +10685,22 @@ msgid "Switch to copied table"
 msgstr "Pierajści da skapijavanaj tablicy"
 
 #: libraries/operations.lib.php:1360
-#: templates/structure/check_all_tables.phtml:18
+#: templates/database/structure/check_all_tables.phtml:18
 msgid "Table maintenance"
 msgstr "Absłuhoŭvańnie tablicy"
 
 #: libraries/operations.lib.php:1398
-#: templates/structure/check_all_tables.phtml:19
+#: templates/database/structure/check_all_tables.phtml:19
 msgid "Analyze table"
 msgstr "Analizavać tablicu"
 
 #: libraries/operations.lib.php:1413
-#: templates/structure/check_all_tables.phtml:20
+#: templates/database/structure/check_all_tables.phtml:20
 msgid "Check table"
 msgstr "Pravieryć tablicu"
 
 #: libraries/operations.lib.php:1428
-#: templates/structure/check_all_tables.phtml:22
+#: templates/database/structure/check_all_tables.phtml:22
 #, fuzzy
 #| msgid "Check table"
 msgid "Checksum table"
@@ -10705,18 +10722,19 @@ msgid "Flush the table (FLUSH)"
 msgstr "Skinuć keš tablicy (\"FLUSH\")"
 
 #: libraries/operations.lib.php:1477
-#: templates/structure/check_all_tables.phtml:23
-#: templates/structure/display_table_stats.phtml:56
+#: templates/database/structure/check_all_tables.phtml:23
+#: templates/table/structure/display_table_stats.phtml:56
 msgid "Optimize table"
 msgstr "Aptymizavać tablicu"
 
 #: libraries/operations.lib.php:1492
-#: templates/structure/check_all_tables.phtml:24
+#: templates/database/structure/check_all_tables.phtml:24
 msgid "Repair table"
 msgstr "Ramantavać tablicu"
 
 #: libraries/operations.lib.php:1538
-#: templates/structure/check_all_tables.phtml:14 view_operations.php:127
+#: templates/database/structure/check_all_tables.phtml:14
+#: view_operations.php:127
 #, fuzzy
 #| msgid "Dumping data for table"
 msgid "Delete data or table"
@@ -10847,7 +10865,7 @@ msgid "Cannot connect: invalid settings."
 msgstr "Niemahčyma padłučycca: niapravilnyja nałady."
 
 #: libraries/plugins/auth/AuthenticationConfig.class.php:108
-#: libraries/plugins/auth/AuthenticationCookie.class.php:134
+#: libraries/plugins/auth/AuthenticationCookie.class.php:122
 #: libraries/plugins/auth/AuthenticationHttp.class.php:96
 #, php-format
 msgid "Welcome to %s"
@@ -10878,38 +10896,38 @@ msgstr ""
 msgid "Retry to connect"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:146
+#: libraries/plugins/auth/AuthenticationCookie.class.php:134
 msgid "Your session has expired. Please log in again."
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:170
+#: libraries/plugins/auth/AuthenticationCookie.class.php:158
 msgid "Log in"
 msgstr "Uvachod u systemu"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:178
-#: libraries/plugins/auth/AuthenticationCookie.class.php:188
+#: libraries/plugins/auth/AuthenticationCookie.class.php:166
+#: libraries/plugins/auth/AuthenticationCookie.class.php:176
 msgid "You can enter hostname/IP address and port separated by space."
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:193
+#: libraries/plugins/auth/AuthenticationCookie.class.php:181
 msgid "Username:"
 msgstr "Imia karystalnika:"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:205
+#: libraries/plugins/auth/AuthenticationCookie.class.php:193
 #, fuzzy
 #| msgid "Server Choice"
 msgid "Server Choice:"
 msgstr "Vybar servera"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:386
+#: libraries/plugins/auth/AuthenticationCookie.class.php:374
 msgid "Entered captcha is wrong, try again!"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:396
+#: libraries/plugins/auth/AuthenticationCookie.class.php:384
 msgid "Please enter correct captcha!"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:423
+#: libraries/plugins/auth/AuthenticationCookie.class.php:411
 #, fuzzy
 #| msgid "Cannot log in to the MySQL server"
 msgid "You are not allowed to log in to this MySQL server!"
@@ -11023,7 +11041,7 @@ msgstr "Padzieja"
 #: libraries/plugins/export/ExportOdt.class.php:593
 #: libraries/plugins/export/ExportTexytext.class.php:428
 #: libraries/plugins/export/PMA_ExportPdf.class.php:313
-#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:984
 #: libraries/rte/rte_triggers.lib.php:377
 #, fuzzy
 #| msgid "Description"
@@ -11383,7 +11401,7 @@ msgid "Last check:"
 msgstr "Apošniaja pravierka"
 
 #: libraries/plugins/export/ExportSql.class.php:1399
-#: templates/structure/structure_table_row.phtml:183
+#: templates/database/structure/structure_table_row.phtml:183
 msgid "in use"
 msgstr "vykarystoŭvajecca"
 
@@ -11586,22 +11604,16 @@ msgstr ""
 msgid "The imported file does not contain any data!"
 msgstr "Fajł %s nia ŭtrymlivaje nijakaha identyfikatara kluča"
 
-#: libraries/plugins/import/ImportSql.class.php:169
+#: libraries/plugins/import/ImportSql.class.php:72
 #, fuzzy
 #| msgid "SQL compatibility mode"
 msgid "SQL compatibility mode:"
 msgstr "Režym sumiaščalnaści SQL"
 
-#: libraries/plugins/import/ImportSql.class.php:181
+#: libraries/plugins/import/ImportSql.class.php:84
 msgid "Do not use <code>AUTO_INCREMENT</code> for zero values"
 msgstr ""
 
-#: libraries/plugins/import/ImportSql.class.php:195
-#, fuzzy
-#| msgid "Read misses"
-msgid "Read as multibytes"
-msgstr "Propuskaŭ čytańnia"
-
 #: libraries/plugins/import/ImportXml.class.php:54
 msgid "XML"
 msgstr "XML"
@@ -11646,7 +11658,7 @@ msgid "Show grid"
 msgstr "Pakazać sietku"
 
 #: libraries/plugins/schema/SchemaPdf.class.php:94
-#: templates/structure/print_view_data_dictionary_link.phtml:6
+#: templates/database/structure/print_view_data_dictionary_link.phtml:6
 msgid "Data Dictionary"
 msgstr "Słoŭnik dadzienych"
 
@@ -11678,7 +11690,7 @@ msgid "The %s table doesn't exist!"
 msgstr "Tablicy \"%s\" nie isnuje!"
 
 #: libraries/plugins/schema/eps/Eps_Relation_Schema.class.php:321
-#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:309
+#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:323
 #, fuzzy, php-format
 #| msgid "Schema of the \"%s\" database - Page %s"
 msgid "Schema of the %s database - Page %s"
@@ -11708,7 +11720,7 @@ msgstr "Źmiest"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1005
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1028
 #: libraries/tracking.lib.php:884
-#: templates/structure/table_structure_header.phtml:11
+#: templates/table/structure/table_structure_header.phtml:11
 msgid "Extra"
 msgstr "Dadatkova"
 
@@ -12139,51 +12151,51 @@ msgstr ""
 msgid "Create the needed tables with the <code>%screate_tables.sql</code>."
 msgstr ""
 
-#: libraries/relation.lib.php:360
+#: libraries/relation.lib.php:357
 msgid "Create a pma user and give access to these tables."
 msgstr ""
 
-#: libraries/relation.lib.php:365
+#: libraries/relation.lib.php:360
 msgid ""
 "Enable advanced features in configuration file (<code>config.inc.php</"
 "code>), for example by starting from <code>config.sample.inc.php</code>."
 msgstr ""
 
-#: libraries/relation.lib.php:373
+#: libraries/relation.lib.php:365
 msgid "Re-login to phpMyAdmin to load the updated configuration file."
 msgstr ""
 
-#: libraries/relation.lib.php:1612
+#: libraries/relation.lib.php:1607
 msgid "no description"
 msgstr "niama apisańnia"
 
-#: libraries/relation.lib.php:1811
+#: libraries/relation.lib.php:1806
 msgid ""
 "You do not have necessary privileges to create a database named "
 "'phpmyadmin'. You may go to 'Operations' tab of any database to set up the "
 "phpMyAdmin configuration storage there."
 msgstr ""
 
-#: libraries/relation.lib.php:1928
+#: libraries/relation.lib.php:1923
 #, php-format
 msgid ""
 "%sCreate%s a database named 'phpmyadmin' and setup the phpMyAdmin "
 "configuration storage there."
 msgstr ""
 
-#: libraries/relation.lib.php:1936
+#: libraries/relation.lib.php:1931
 #, php-format
 msgid ""
 "%sCreate%s the phpMyAdmin configuration storage in the current database."
 msgstr ""
 
-#: libraries/relation.lib.php:1944
+#: libraries/relation.lib.php:1939
 #, php-format
 msgid "%sCreate%s missing phpMyAdmin configuration storage tables."
 msgstr ""
 
 #: libraries/replication_gui.lib.php:46 libraries/replication_gui.lib.php:343
-#: libraries/server_databases.lib.php:387
+#: libraries/server_databases.lib.php:398
 msgid "Master replication"
 msgstr ""
 
@@ -12238,7 +12250,7 @@ msgid ""
 msgstr ""
 
 #: libraries/replication_gui.lib.php:141
-#: libraries/server_databases.lib.php:389
+#: libraries/server_databases.lib.php:400
 msgid "Slave replication"
 msgstr ""
 
@@ -12522,10 +12534,10 @@ msgid "Master server changed successfully to %s."
 msgstr "Pryvilei byli paśpiachova pierazahružanyja."
 
 #: libraries/rte/rte_events.lib.php:106 libraries/rte/rte_events.lib.php:115
-#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:149
-#: libraries/rte/rte_routines.lib.php:158
-#: libraries/rte/rte_routines.lib.php:231
-#: libraries/rte/rte_routines.lib.php:1362
+#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:219
+#: libraries/rte/rte_routines.lib.php:246
+#: libraries/rte/rte_routines.lib.php:368
+#: libraries/rte/rte_routines.lib.php:1453
 #: libraries/rte/rte_triggers.lib.php:82 libraries/rte/rte_triggers.lib.php:91
 #: libraries/rte/rte_triggers.lib.php:123
 #, php-format
@@ -12548,7 +12560,7 @@ msgstr "Tablica %s była vydalenaja"
 msgid "Event %1$s has been created."
 msgstr "Tablica %1$s stvoranaja."
 
-#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:251
+#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:266
 #: libraries/rte/rte_triggers.lib.php:144
 msgid "One or more errors have occurred while processing your request:"
 msgstr ""
@@ -12559,7 +12571,7 @@ msgstr ""
 msgid "Edit event"
 msgstr "Padzieja"
 
-#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:794
+#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:885
 #: libraries/rte/rte_triggers.lib.php:323 view_create.php:180
 #, fuzzy
 #| msgid "Details…"
@@ -12576,7 +12588,7 @@ msgstr "Typ padziei"
 msgid "Event type"
 msgstr "Typ padziei"
 
-#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:817
+#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:908
 #, fuzzy, php-format
 #| msgid "Change"
 msgid "Change to %s"
@@ -12610,12 +12622,14 @@ msgstr "Apošniaja staronka"
 msgid "On completion preserve"
 msgstr "Poŭnaja ŭstaŭka"
 
-#: libraries/rte/rte_events.lib.php:491 libraries/rte/rte_routines.lib.php:930
+#: libraries/rte/rte_events.lib.php:491
+#: libraries/rte/rte_routines.lib.php:1021
 #: libraries/rte/rte_triggers.lib.php:383 view_create.php:209
 msgid "Definer"
 msgstr ""
 
-#: libraries/rte/rte_events.lib.php:535 libraries/rte/rte_routines.lib.php:997
+#: libraries/rte/rte_events.lib.php:535
+#: libraries/rte/rte_routines.lib.php:1088
 #: libraries/rte/rte_triggers.lib.php:422
 msgid "The definer must be in the \"username@hostname\" format!"
 msgstr ""
@@ -12643,9 +12657,9 @@ msgid "You must provide an event definition."
 msgstr ""
 
 #: libraries/rte/rte_export.lib.php:43 libraries/rte/rte_general.lib.php:72
-#: libraries/rte/rte_routines.lib.php:345
-#: libraries/rte/rte_routines.lib.php:1198
-#: libraries/rte/rte_routines.lib.php:1411
+#: libraries/rte/rte_routines.lib.php:153
+#: libraries/rte/rte_routines.lib.php:1289
+#: libraries/rte/rte_routines.lib.php:1502
 #, fuzzy
 #| msgid "Processes"
 msgid "Error in processing request:"
@@ -12681,142 +12695,142 @@ msgid ""
 "problems."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:110
-#: libraries/rte/rte_routines.lib.php:1006
-#, fuzzy, php-format
-#| msgid "Invalid server index: \"%s\""
-msgid "Invalid routine type: \"%s\""
-msgstr "Niekarektny indeks servera: \"%s\""
-
-#: libraries/rte/rte_routines.lib.php:170
-msgid "Sorry, we failed to restore the dropped routine."
-msgstr ""
-
-#: libraries/rte/rte_routines.lib.php:211
-#, fuzzy, php-format
-#| msgid "Table %s has been dropped."
-msgid "Routine %1$s has been modified. Privileges have been adjusted."
-msgstr "Tablica %s była vydalenaja"
-
-#: libraries/rte/rte_routines.lib.php:216
-#, fuzzy, php-format
-#| msgid "Table %s has been dropped."
-msgid "Routine %1$s has been modified."
-msgstr "Tablica %s była vydalenaja"
-
-#: libraries/rte/rte_routines.lib.php:238
-#, fuzzy, php-format
-#| msgid "Table %1$s has been created."
-msgid "Routine %1$s has been created."
-msgstr "Tablica %1$s stvoranaja."
-
-#: libraries/rte/rte_routines.lib.php:315
+#: libraries/rte/rte_routines.lib.php:123
 #, fuzzy
 #| msgid "Routines"
 msgid "Edit routine"
 msgstr "Pracedury"
 
-#: libraries/rte/rte_routines.lib.php:797
+#: libraries/rte/rte_routines.lib.php:200
+#: libraries/rte/rte_routines.lib.php:1097
+#, fuzzy, php-format
+#| msgid "Invalid server index: \"%s\""
+msgid "Invalid routine type: \"%s\""
+msgstr "Niekarektny indeks servera: \"%s\""
+
+#: libraries/rte/rte_routines.lib.php:253
+#, fuzzy, php-format
+#| msgid "Table %1$s has been created."
+msgid "Routine %1$s has been created."
+msgstr "Tablica %1$s stvoranaja."
+
+#: libraries/rte/rte_routines.lib.php:380
+msgid "Sorry, we failed to restore the dropped routine."
+msgstr ""
+
+#: libraries/rte/rte_routines.lib.php:439
+#, fuzzy, php-format
+#| msgid "Table %s has been dropped."
+msgid "Routine %1$s has been modified. Privileges have been adjusted."
+msgstr "Tablica %s była vydalenaja"
+
+#: libraries/rte/rte_routines.lib.php:444
+#, fuzzy, php-format
+#| msgid "Table %s has been dropped."
+msgid "Routine %1$s has been modified."
+msgstr "Tablica %s była vydalenaja"
+
+#: libraries/rte/rte_routines.lib.php:888
 #, fuzzy
 #| msgid "Routines"
 msgid "Routine name"
 msgstr "Pracedury"
 
-#: libraries/rte/rte_routines.lib.php:823
+#: libraries/rte/rte_routines.lib.php:914
 msgid "Parameters"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:829
+#: libraries/rte/rte_routines.lib.php:920
 #, fuzzy
 #| msgid "Direct links"
 msgid "Direction"
 msgstr "Pramyja linii suviaziaŭ"
 
-#: libraries/rte/rte_routines.lib.php:847
+#: libraries/rte/rte_routines.lib.php:938
 #, fuzzy
 #| msgid "Add new field"
 msgid "Add parameter"
 msgstr "Dadać novaje pole"
 
-#: libraries/rte/rte_routines.lib.php:851
+#: libraries/rte/rte_routines.lib.php:942
 #, fuzzy
 #| msgid "Rename database to"
 msgid "Remove last parameter"
 msgstr "Pierajmienavać bazu dadzienych u"
 
-#: libraries/rte/rte_routines.lib.php:856
+#: libraries/rte/rte_routines.lib.php:947
 msgid "Return type"
 msgstr "Typ pracedury"
 
-#: libraries/rte/rte_routines.lib.php:862
+#: libraries/rte/rte_routines.lib.php:953
 #, fuzzy
 #| msgid "Length/Values"
 msgid "Return length/values"
 msgstr "Daŭžynia/Značeńni*"
 
-#: libraries/rte/rte_routines.lib.php:868
+#: libraries/rte/rte_routines.lib.php:959
 #, fuzzy
 #| msgid "Table options"
 msgid "Return options"
 msgstr "Opcyi tablicy"
 
-#: libraries/rte/rte_routines.lib.php:899
+#: libraries/rte/rte_routines.lib.php:990
 msgid "Is deterministic"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:920
+#: libraries/rte/rte_routines.lib.php:1011
 msgid ""
 "You do not have sufficient privileges to perform this operation; Please "
 "refer to the documentation for more details"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:935
+#: libraries/rte/rte_routines.lib.php:1026
 #, fuzzy
 #| msgid "Query type"
 msgid "Security type"
 msgstr "Typ zapytu"
 
-#: libraries/rte/rte_routines.lib.php:944
+#: libraries/rte/rte_routines.lib.php:1035
 msgid "SQL data access"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1013
+#: libraries/rte/rte_routines.lib.php:1104
 #, fuzzy
 #| msgid "Invalid table name"
 msgid "You must provide a routine name!"
 msgstr "Niekarektnaje imia tablicy"
 
-#: libraries/rte/rte_routines.lib.php:1047
+#: libraries/rte/rte_routines.lib.php:1138
 #, php-format
 msgid "Invalid direction \"%s\" given for parameter."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1069
-#: libraries/rte/rte_routines.lib.php:1131
+#: libraries/rte/rte_routines.lib.php:1160
+#: libraries/rte/rte_routines.lib.php:1222
 msgid ""
 "You must provide length/values for routine parameters of type ENUM, SET, "
 "VARCHAR and VARBINARY."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1095
+#: libraries/rte/rte_routines.lib.php:1186
 msgid "You must provide a name and a type for each routine parameter."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1114
+#: libraries/rte/rte_routines.lib.php:1205
 msgid "You must provide a valid return type for the routine."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1174
+#: libraries/rte/rte_routines.lib.php:1265
 msgid "You must provide a routine definition."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1285
+#: libraries/rte/rte_routines.lib.php:1376
 #, fuzzy, php-format
 #| msgid "Allows executing stored routines."
 msgid "Execution results of routine %s"
 msgstr "Dazvalaje vykanańnie pragramaŭ, jakija zachoŭvajucca."
 
-#: libraries/rte/rte_routines.lib.php:1340
+#: libraries/rte/rte_routines.lib.php:1431
 #, php-format
 msgid "%d row affected by the last statement inside the procedure."
 msgid_plural "%d rows affected by the last statement inside the procedure."
@@ -12824,13 +12838,13 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: libraries/rte/rte_routines.lib.php:1398
-#: libraries/rte/rte_routines.lib.php:1406
+#: libraries/rte/rte_routines.lib.php:1489
+#: libraries/rte/rte_routines.lib.php:1497
 msgid "Execute routine"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1485
-#: libraries/rte/rte_routines.lib.php:1488
+#: libraries/rte/rte_routines.lib.php:1576
+#: libraries/rte/rte_routines.lib.php:1579
 #, fuzzy
 #| msgid "Routines"
 msgid "Routine parameters"
@@ -13026,7 +13040,7 @@ msgid "Original position"
 msgstr "Pieršapačatkovaja pazycyja"
 
 #: libraries/server_bin_log.lib.php:133
-#: templates/structure/display_table_stats.phtml:4
+#: templates/table/structure/display_table_stats.phtml:4
 msgid "Information"
 msgstr "Infarmacyja"
 
@@ -13064,12 +13078,12 @@ msgstr ""
 "Zaŭvaha: Uklučeńnie statystyki bazy dadzienych moža vyklikać vialikuju "
 "kolkaść trafiku pamiž web-serveram i serveram MySQL."
 
-#: libraries/server_databases.lib.php:364
-#: libraries/server_databases.lib.php:365
+#: libraries/server_databases.lib.php:366
+#: libraries/server_databases.lib.php:371
 msgid "Enable Statistics"
 msgstr "Uklučyć statystyku"
 
-#: libraries/server_databases.lib.php:481
+#: libraries/server_databases.lib.php:492
 #, fuzzy, php-format
 #| msgid "%s databases have been dropped successfully."
 msgid "%1$d database has been dropped successfully."
@@ -13463,7 +13477,7 @@ msgid "You have revoked the privileges for %s."
 msgstr "Vy anulavali pryvilei dla %s."
 
 #: libraries/server_privileges.lib.php:2059
-#: libraries/server_privileges.lib.php:4290
+#: libraries/server_privileges.lib.php:4316
 #, fuzzy
 #| msgid "Any user"
 msgid "Add user account"
@@ -13654,60 +13668,60 @@ msgstr "Vydaleńnie %s"
 msgid "The privileges were reloaded successfully."
 msgstr "Pryvilei byli paśpiachova pierazahružanyja."
 
-#: libraries/server_privileges.lib.php:3994
+#: libraries/server_privileges.lib.php:4003
 #, php-format
 msgid "The user %s already exists!"
 msgstr "Karystalnik %s užo isnuje!"
 
-#: libraries/server_privileges.lib.php:4232
+#: libraries/server_privileges.lib.php:4258
 #, fuzzy, php-format
 #| msgid "Privileges"
 msgid "Privileges for %s"
 msgstr "Pryvilei"
 
-#: libraries/server_privileges.lib.php:4241
+#: libraries/server_privileges.lib.php:4267
 #: libraries/server_status_processes.lib.php:72
 #: libraries/server_user_groups.lib.php:39
 msgid "User"
 msgstr "Karystalnik"
 
-#: libraries/server_privileges.lib.php:4282
+#: libraries/server_privileges.lib.php:4308
 msgctxt "Create new user"
 msgid "New"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4311
+#: libraries/server_privileges.lib.php:4337
 #, fuzzy
 #| msgid "Edit Privileges"
 msgid "Edit privileges:"
 msgstr "Redagavać pryvilei"
 
-#: libraries/server_privileges.lib.php:4312
+#: libraries/server_privileges.lib.php:4338
 #, fuzzy
 #| msgid "User"
 msgid "User account"
 msgstr "Karystalnik"
 
-#: libraries/server_privileges.lib.php:4371
+#: libraries/server_privileges.lib.php:4397
 msgid ""
 "Note: You are attempting to edit privileges of the user with which you are "
 "currently logged in."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4391 libraries/server_users.lib.php:25
+#: libraries/server_privileges.lib.php:4417 libraries/server_users.lib.php:25
 #, fuzzy
 #| msgid "User overview"
 msgid "User accounts overview"
 msgstr "Karystalniki"
 
-#: libraries/server_privileges.lib.php:4459
+#: libraries/server_privileges.lib.php:4485
 msgid ""
 "A user account allowing any user from localhost to connect is present. This "
 "will prevent other users from connecting if the host part of their account "
 "allows a connection from any (%) host."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4500
+#: libraries/server_privileges.lib.php:4526
 #, php-format
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
@@ -13720,7 +13734,7 @@ msgstr ""
 "jakija vykarystoŭvaje server, kali jany byli źmienienyja ŭručnuju. U hetym "
 "vypadku vam treba %spierazahruzić pryvilei%s da taho, jak vy praciahniecie."
 
-#: libraries/server_privileges.lib.php:4519
+#: libraries/server_privileges.lib.php:4545
 #, fuzzy
 #| msgid ""
 #| "Note: phpMyAdmin gets the users' privileges directly from MySQL's "
@@ -13739,44 +13753,44 @@ msgstr ""
 "jakija vykarystoŭvaje server, kali jany byli źmienienyja ŭručnuju. U hetym "
 "vypadku vam treba %spierazahruzić pryvilei%s da taho, jak vy praciahniecie."
 
-#: libraries/server_privileges.lib.php:4569
+#: libraries/server_privileges.lib.php:4595
 msgid "The selected user was not found in the privilege table."
 msgstr "Vyłučany karystalnik nia znojdzieny ŭ tablicy pryvilejaŭ."
 
-#: libraries/server_privileges.lib.php:4801
+#: libraries/server_privileges.lib.php:4827
 msgid "You have added a new user."
 msgstr "Byŭ dadadzieny novy karystalnik."
 
-#: libraries/server_status.lib.php:53
+#: libraries/server_status.lib.php:60
 #, php-format
 msgid "Network traffic since startup: %s"
 msgstr ""
 
-#: libraries/server_status.lib.php:66
+#: libraries/server_status.lib.php:73
 #, fuzzy, php-format
 #| msgid "This MySQL server has been running for %s. It started up on %s."
 msgid "This MySQL server has been running for %1$s. It started up on %2$s."
 msgstr "Hety server MySQL pracuje %s. Jon byŭ zapuščany %s."
 
-#: libraries/server_status.lib.php:80
+#: libraries/server_status.lib.php:94
 msgid ""
 "This MySQL server works as <b>master</b> and <b>slave</b> in <b>replication</"
 "b> process."
 msgstr ""
 
-#: libraries/server_status.lib.php:85
+#: libraries/server_status.lib.php:99
 msgid "This MySQL server works as <b>master</b> in <b>replication</b> process."
 msgstr ""
 
-#: libraries/server_status.lib.php:90
+#: libraries/server_status.lib.php:104
 msgid "This MySQL server works as <b>slave</b> in <b>replication</b> process."
 msgstr ""
 
-#: libraries/server_status.lib.php:106
+#: libraries/server_status.lib.php:116
 msgid "Replication status"
 msgstr ""
 
-#: libraries/server_status.lib.php:137
+#: libraries/server_status.lib.php:146
 msgid ""
 "On a busy server, the byte counters may overrun, so those statistics as "
 "reported by the MySQL server may be incorrect."
@@ -13784,21 +13798,21 @@ msgstr ""
 "Na zahružanym servery bajtavyja ličylniki mohuć pieraskokvać koła, tamu "
 "statystyka, jakuju pakazvaje MySQL-server, moža być niapravilnaj."
 
-#: libraries/server_status.lib.php:148
+#: libraries/server_status.lib.php:157
 msgid "Received"
 msgstr "Atrymana"
 
-#: libraries/server_status.lib.php:167
+#: libraries/server_status.lib.php:176
 msgid "Sent"
 msgstr "Adpraŭlena"
 
-#: libraries/server_status.lib.php:234
+#: libraries/server_status.lib.php:243
 #, fuzzy
 #| msgid "max. concurrent connections"
 msgid "Max. concurrent connections"
 msgstr "maksymum adnačasovych złučeńniaŭ"
 
-#: libraries/server_status.lib.php:244
+#: libraries/server_status.lib.php:253
 msgid "Failed attempts"
 msgstr "Niaŭdałych sprobaŭ"
 
@@ -14921,7 +14935,7 @@ msgstr ""
 msgid "Not implemented yet."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/AlterOperation.php:193
+#: libraries/sql-parser/src/Components/AlterOperation.php:191
 msgid "Unrecognized alter operation."
 msgstr ""
 
@@ -14935,7 +14949,7 @@ msgid "An opening bracket followed by a set of values was expected."
 msgstr ""
 
 #: libraries/sql-parser/src/Components/ArrayObj.php:101
-#: libraries/sql-parser/src/Components/FieldDefinition.php:202
+#: libraries/sql-parser/src/Components/CreateDefinition.php:202
 msgid "An opening bracket was expected."
 msgstr ""
 
@@ -14943,25 +14957,35 @@ msgstr ""
 msgid "A comma or a closing bracket was expected"
 msgstr ""
 
+#: libraries/sql-parser/src/Components/CreateDefinition.php:246
+#, fuzzy
+#| msgid "No databases selected."
+msgid "A comma or a closing bracket was expected."
+msgstr "Nia vybranaja baza dadzienych."
+
+#: libraries/sql-parser/src/Components/CreateDefinition.php:262
+msgid "A closing bracket was expected."
+msgstr ""
+
 #: libraries/sql-parser/src/Components/DataType.php:125
 msgid "Unrecognized data type."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:225
+#: libraries/sql-parser/src/Components/Expression.php:227
 msgid "Unexpected closing bracket."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:246
-#: libraries/sql-parser/src/Components/Expression.php:283
-#: libraries/sql-parser/src/Components/Expression.php:303
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:285
+#: libraries/sql-parser/src/Components/Expression.php:305
 msgid "An alias was previously found."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:257
+#: libraries/sql-parser/src/Components/Expression.php:259
 msgid "Unexpected dot."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:327
+#: libraries/sql-parser/src/Components/Expression.php:329
 #, fuzzy
 #| msgid "No databases selected."
 msgid "An alias was expected."
@@ -14973,16 +14997,6 @@ msgstr "Nia vybranaja baza dadzienych."
 msgid "An expression was expected."
 msgstr "Nivodny radok nia vybrany"
 
-#: libraries/sql-parser/src/Components/FieldDefinition.php:246
-#, fuzzy
-#| msgid "No databases selected."
-msgid "A comma or a closing bracket was expected."
-msgstr "Nia vybranaja baza dadzienych."
-
-#: libraries/sql-parser/src/Components/FieldDefinition.php:262
-msgid "A closing bracket was expected."
-msgstr ""
-
 #: libraries/sql-parser/src/Components/Limit.php:90
 #: libraries/sql-parser/src/Components/Limit.php:112
 msgid "An offset was expected."
@@ -15028,27 +15042,27 @@ msgstr ""
 msgid "Expected delimiter."
 msgstr ""
 
-#: libraries/sql-parser/src/Lexer.php:753
+#: libraries/sql-parser/src/Lexer.php:777
 #, fuzzy, php-format
 #| msgid "Table %1$s has been created."
 msgid "Ending quote %1$s was expected."
 msgstr "Tablica %1$s stvoranaja."
 
-#: libraries/sql-parser/src/Lexer.php:789
+#: libraries/sql-parser/src/Lexer.php:813
 msgid "Variable name was expected."
 msgstr ""
 
-#: libraries/sql-parser/src/Parser.php:380
+#: libraries/sql-parser/src/Parser.php:391
 #, fuzzy
 #| msgid "At Beginning of Table"
 msgid "Unexpected beginning of statement."
 msgstr "U pačatku tablicy"
 
-#: libraries/sql-parser/src/Parser.php:399
+#: libraries/sql-parser/src/Parser.php:410
 msgid "Unrecognized statement type."
 msgstr ""
 
-#: libraries/sql-parser/src/Parser.php:479
+#: libraries/sql-parser/src/Parser.php:489
 msgid "No transaction was previously started."
 msgstr ""
 
@@ -15076,8 +15090,10 @@ msgid "The name of the entity was expected."
 msgstr "Kolkaść adkrytych tablic."
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:310
-msgid "At least one field definition was expected."
-msgstr ""
+#, fuzzy
+#| msgid "The row has been deleted."
+msgid "At least one column definition was expected."
+msgstr "Radok byŭ vydaleny"
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:329
 msgid "A \"RETURNS\" keyword was expected."
@@ -15150,25 +15166,25 @@ msgstr "Zakładka %s stvoranaja"
 msgid "Using bookmark \"%s\" as default browse query."
 msgstr ""
 
-#: libraries/sql.lib.php:1306
+#: libraries/sql.lib.php:1300
 msgid "Showing as PHP code"
 msgstr "U vyhladzie PHP-kodu"
 
-#: libraries/sql.lib.php:1638
+#: libraries/sql.lib.php:1632
 #, php-format
 msgid ""
 "Current selection does not contain a unique column. Grid edit, checkbox, "
 "Edit, Copy and Delete features are not available. %s"
 msgstr ""
 
-#: libraries/sql.lib.php:1649
+#: libraries/sql.lib.php:1643
 #, php-format
 msgid ""
 "Current selection does not contain a unique column. Grid edit, Edit, Copy "
 "and Delete features may result in undesired behavior. %s"
 msgstr ""
 
-#: libraries/sql.lib.php:1688
+#: libraries/sql.lib.php:1682
 #, php-format
 msgid "Problems with indexes of table `%s`"
 msgstr "Prablemy z indeksami dla tablicy `%s`"
@@ -15337,7 +15353,7 @@ msgid "Version %s snapshot (SQL code)"
 msgstr ""
 
 #: libraries/tracking.lib.php:947
-#: templates/structure/table_structure_row.phtml:33
+#: templates/table/structure/table_structure_row.phtml:33
 #, fuzzy
 #| msgid "None"
 msgctxt "None for default"
@@ -15392,19 +15408,19 @@ msgstr "Mahčymaści asnoŭnych suviaziaŭ"
 msgid "Version %1$s was created, tracking for %2$s is active."
 msgstr ""
 
-#: libraries/user_preferences.inc.php:29
+#: libraries/user_preferences.inc.php:30
 #, fuzzy
 #| msgid "General relation features"
 msgid "Manage your settings"
 msgstr "Mahčymaści asnoŭnych suviaziaŭ"
 
-#: libraries/user_preferences.inc.php:46 prefs_manage.php:307
+#: libraries/user_preferences.inc.php:54 prefs_manage.php:307
 #, fuzzy
 #| msgid "Modifications have been saved"
 msgid "Configuration has been saved."
 msgstr "Madyfikacyi byli zachavanyja"
 
-#: libraries/user_preferences.inc.php:66
+#: libraries/user_preferences.inc.php:74
 #, php-format
 msgid ""
 "Your preferences will be saved for current session only. Storing them "
@@ -15809,7 +15825,7 @@ msgid "first"
 msgstr ""
 
 #: templates/columns_definitions/move_column.phtml:12
-#: templates/structure/add_column.phtml:21
+#: templates/table/structure/add_column.phtml:21
 #, fuzzy, php-format
 #| msgid "After %s"
 msgid "after %s"
@@ -15897,242 +15913,357 @@ msgstr "Pieraŭtvareńnie MIME-typu braŭzeram"
 msgid "Input transformation options"
 msgstr "Opcyi pieraŭtvareńnia"
 
-#: templates/designer/aggregate_query_panel.phtml:22
-#: templates/designer/options_panel.phtml:100
+#: templates/database/create_table.phtml:7
+#: templates/database/designer/side_menu.phtml:77
+#: templates/database/designer/side_menu.phtml:80
+msgid "Create table"
+msgstr "Stvaryć tablicu"
+
+#: templates/database/create_table.phtml:15
+#, fuzzy
+#| msgid "Number of fields"
+msgid "Number of columns"
+msgstr "Kolkaść paloŭ"
+
+#: templates/database/designer/aggregate_query_panel.phtml:22
+#: templates/database/designer/options_panel.phtml:100
 #, fuzzy
 #| msgid "Create"
 msgid "Aggregate"
 msgstr "Stvaryć"
 
-#: templates/designer/aggregate_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:61
-#: templates/designer/options_panel.phtml:106
-#: templates/designer/options_panel.phtml:170
-#: templates/designer/where_query_panel.phtml:30
-#: templates/table/table_header.phtml:9
+#: templates/database/designer/aggregate_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:61
+#: templates/database/designer/options_panel.phtml:106
+#: templates/database/designer/options_panel.phtml:170
+#: templates/database/designer/where_query_panel.phtml:30
+#: templates/table/search/table_header.phtml:9
 msgid "Operator"
 msgstr "Aperatar"
 
-#: templates/designer/database_tables.phtml:29
+#: templates/database/designer/database_tables.phtml:29
 msgid "Toggle"
 msgstr ""
 
-#: templates/designer/database_tables.phtml:40
+#: templates/database/designer/database_tables.phtml:40
 #, fuzzy
 #| msgid "Database for user"
 msgid "See table structure"
 msgstr "Baza dadzienych dla karystalnika"
 
-#: templates/designer/delete_relation_panel.phtml:21
+#: templates/database/designer/delete_relation_panel.phtml:21
 msgid "Delete relation"
 msgstr "Vydalić suviaź"
 
-#: templates/designer/edit_delete_pages.phtml:7
+#: templates/database/designer/edit_delete_pages.phtml:7
 #, fuzzy
 #| msgid "Page number:"
 msgid "Page to open"
 msgstr "Staronka:"
 
-#: templates/designer/edit_delete_pages.phtml:7
+#: templates/database/designer/edit_delete_pages.phtml:7
 #, fuzzy
 #| msgid "Relation deleted"
 msgid "Page to delete"
 msgstr "Suviaź vydalenaja"
 
-#: templates/designer/having_query_panel.phtml:90
-#: templates/designer/options_panel.phtml:63
-#: templates/designer/options_panel.phtml:229
-#: templates/designer/where_query_panel.phtml:59
+#: templates/database/designer/having_query_panel.phtml:90
+#: templates/database/designer/options_panel.phtml:63
+#: templates/database/designer/options_panel.phtml:229
+#: templates/database/designer/where_query_panel.phtml:59
 #, fuzzy
 #| msgid "Export"
 msgid "Except"
 msgstr "Ekspart"
 
-#: templates/designer/having_query_panel.phtml:102
-#: templates/designer/options_panel.phtml:75
-#: templates/designer/options_panel.phtml:241
-#: templates/designer/where_query_panel.phtml:71
+#: templates/database/designer/having_query_panel.phtml:102
+#: templates/database/designer/options_panel.phtml:75
+#: templates/database/designer/options_panel.phtml:241
+#: templates/database/designer/where_query_panel.phtml:71
 #, fuzzy
 #| msgid "in query"
 msgid "subquery"
 msgstr "pa zapytu"
 
-#: templates/designer/new_relation_panel.phtml:22
-#: templates/designer/side_menu.phtml:84 templates/designer/side_menu.phtml:87
+#: templates/database/designer/new_relation_panel.phtml:22
+#: templates/database/designer/side_menu.phtml:84
+#: templates/database/designer/side_menu.phtml:87
 msgid "Create relation"
 msgstr "Stvaryć suviaź"
 
-#: templates/designer/options_panel.phtml:34
-#: templates/designer/options_panel.phtml:200
+#: templates/database/designer/options_panel.phtml:34
+#: templates/database/designer/options_panel.phtml:200
 #, fuzzy
 #| msgid "Relation deleted"
 msgid "Relation operator"
 msgstr "Suviaź vydalenaja"
 
-#: templates/designer/options_panel.phtml:85
-#: templates/designer/rename_to_panel.phtml:23
+#: templates/database/designer/options_panel.phtml:85
+#: templates/database/designer/rename_to_panel.phtml:23
 #, fuzzy
 #| msgid "Rename table to"
 msgid "Rename to"
 msgstr "Pierajmienavać tablicu ŭ"
 
-#: templates/designer/options_panel.phtml:91
-#: templates/designer/rename_to_panel.phtml:31
+#: templates/database/designer/options_panel.phtml:91
+#: templates/database/designer/rename_to_panel.phtml:31
 #, fuzzy
 #| msgid "User name"
 msgid "New name"
 msgstr "Imia karystalnika"
 
-#: templates/designer/page_save_as.phtml:4
+#: templates/database/designer/page_save_as.phtml:4
 #, fuzzy
 #| msgid "Export/Import to scale"
 msgid "Save to selected page"
 msgstr "Maštab"
 
-#: templates/designer/page_save_as.phtml:5
+#: templates/database/designer/page_save_as.phtml:5
 #, fuzzy
 #| msgid "Create a new index"
 msgid "Create a page and save to it"
 msgstr "Stvaryć novy indeks"
 
-#: templates/designer/page_save_as.phtml:26
+#: templates/database/designer/page_save_as.phtml:26
 #, fuzzy
 #| msgid "User name"
 msgid "New page name"
 msgstr "Imia karystalnika"
 
-#: templates/designer/page_selector.phtml:2
+#: templates/database/designer/page_selector.phtml:2
 #, fuzzy
 #| msgid "Select All"
 msgid "Select page"
 msgstr "Vybrać usio"
 
-#: templates/designer/query_details.phtml:10
+#: templates/database/designer/query_details.phtml:10
 #, fuzzy
 #| msgid "Table options"
 msgid "Active options"
 msgstr "Opcyi tablicy"
 
-#: templates/designer/schema_export.phtml:4
+#: templates/database/designer/schema_export.phtml:4
 msgid "Select Export Relational Type"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:19 templates/designer/side_menu.phtml:25
+#: templates/database/designer/side_menu.phtml:19
+#: templates/database/designer/side_menu.phtml:25
 #, fuzzy
 #| msgid "Show tables"
 msgid "Show/Hide tables list"
 msgstr "Pakazać tablicy"
 
-#: templates/designer/side_menu.phtml:29 templates/designer/side_menu.phtml:35
-#: templates/designer/side_menu.phtml:36
+#: templates/database/designer/side_menu.phtml:29
+#: templates/database/designer/side_menu.phtml:35
+#: templates/database/designer/side_menu.phtml:36
 msgid "View in fullscreen"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:34
+#: templates/database/designer/side_menu.phtml:34
 msgid "Exit fullscreen"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:41 templates/designer/side_menu.phtml:45
+#: templates/database/designer/side_menu.phtml:41
+#: templates/database/designer/side_menu.phtml:45
 #, fuzzy
 #| msgid "User name"
 msgid "New page"
 msgstr "Imia karystalnika"
 
-#: templates/designer/side_menu.phtml:70 templates/designer/side_menu.phtml:73
+#: templates/database/designer/side_menu.phtml:70
+#: templates/database/designer/side_menu.phtml:73
 #, fuzzy
 #| msgid "Select All"
 msgid "Delete pages"
 msgstr "Vybrać usio"
 
-#: templates/designer/side_menu.phtml:77 templates/designer/side_menu.phtml:80
-#: templates/table/create_table.phtml:7
-msgid "Create table"
-msgstr "Stvaryć tablicu"
-
-#: templates/designer/side_menu.phtml:98
-#: templates/designer/side_menu.phtml:101
+#: templates/database/designer/side_menu.phtml:98
+#: templates/database/designer/side_menu.phtml:101
 msgid "Reload"
 msgstr "Abnavić"
 
-#: templates/designer/side_menu.phtml:107
-#: templates/designer/side_menu.phtml:110
+#: templates/database/designer/side_menu.phtml:107
+#: templates/database/designer/side_menu.phtml:110
 msgid "Help"
 msgstr "Dapamoha"
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Angular links"
 msgstr "Vuhłavyja linii suviaziaŭ"
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Direct links"
 msgstr "Pramyja linii suviaziaŭ"
 
-#: templates/designer/side_menu.phtml:122
-#: templates/designer/side_menu.phtml:124
+#: templates/database/designer/side_menu.phtml:122
+#: templates/database/designer/side_menu.phtml:124
 msgid "Snap to grid"
 msgstr "Źviać ź sietkaj"
 
-#: templates/designer/side_menu.phtml:128
-#: templates/designer/side_menu.phtml:134
+#: templates/database/designer/side_menu.phtml:128
+#: templates/database/designer/side_menu.phtml:134
 msgid "Small/Big All"
 msgstr "Zharnuć/razharnuć adlustravańnie ŭsich tablic"
 
-#: templates/designer/side_menu.phtml:138
-#: templates/designer/side_menu.phtml:141
+#: templates/database/designer/side_menu.phtml:138
+#: templates/database/designer/side_menu.phtml:141
 msgid "Toggle small/big"
 msgstr "Pieraklučyć maleńki/vialiki"
 
-#: templates/designer/side_menu.phtml:145
-#: templates/designer/side_menu.phtml:148
+#: templates/database/designer/side_menu.phtml:145
+#: templates/database/designer/side_menu.phtml:148
 #, fuzzy
 #| msgid "To select relation, click :"
 msgid "Toggle relation lines"
 msgstr ""
 "Kab vybrać suviaź, naciśnicie na kropcy złučeńnia, jak pakazana na vyjavie:"
 
-#: templates/designer/side_menu.phtml:153
-#: templates/designer/side_menu.phtml:156
+#: templates/database/designer/side_menu.phtml:153
+#: templates/database/designer/side_menu.phtml:156
 #, fuzzy
 #| msgid "Export"
 msgid "Export schema"
 msgstr "Ekspart"
 
-#: templates/designer/side_menu.phtml:165
-#: templates/designer/side_menu.phtml:168
+#: templates/database/designer/side_menu.phtml:165
+#: templates/database/designer/side_menu.phtml:168
 #, fuzzy
 #| msgid "Submit Query"
 msgid "Build Query"
 msgstr "Vykanać zapyt"
 
-#: templates/designer/side_menu.phtml:173
-#: templates/designer/side_menu.phtml:177
+#: templates/database/designer/side_menu.phtml:173
+#: templates/database/designer/side_menu.phtml:177
 msgid "Move Menu"
 msgstr "Pierasunuć meniu"
 
-#: templates/designer/side_menu.phtml:181
-#: templates/designer/side_menu.phtml:186
+#: templates/database/designer/side_menu.phtml:181
+#: templates/database/designer/side_menu.phtml:186
 #, fuzzy
 #| msgid "Partial Texts"
 msgid "Pin text"
 msgstr "Častkovyja teksty"
 
-#: templates/designer/table_list.phtml:4
+#: templates/database/designer/table_list.phtml:4
 msgid "Hide/Show all"
 msgstr "Schavać/pakazać usie tablicy"
 
-#: templates/designer/table_list.phtml:14
+#: templates/database/designer/table_list.phtml:14
 msgid "Hide/Show Tables with no relation"
 msgstr "Schavać/pakazać tablicy biaz suviaziaŭ"
 
-#: templates/designer/table_list.phtml:59
+#: templates/database/designer/table_list.phtml:59
 #, fuzzy
 #| msgid "Number of tables"
 msgid "Number of tables:"
 msgstr "Kolkaść tablic"
 
+#: templates/database/structure/body_for_table_summary.phtml:6
+#, fuzzy, php-format
+#| msgid "%s table(s)"
+msgid "%s table"
+msgid_plural "%s tables"
+msgstr[0] "%s tablic(y)"
+msgstr[1] "%s tablic(y)"
+msgstr[2] "%s tablic(y)"
+
+#: templates/database/structure/body_for_table_summary.phtml:17
+msgid "Sum"
+msgstr "Usiaho"
+
+#: templates/database/structure/check_all_tables.phtml:6
+msgid "Check tables having overhead"
+msgstr "Adznačyć tyja, što patrabujuć aptymizacyi"
+
+#: templates/database/structure/check_all_tables.phtml:10
+#, fuzzy
+#| msgid "Show color"
+msgid "Show create"
+msgstr "Pakazać koler"
+
+#: templates/database/structure/check_all_tables.phtml:27
+#, fuzzy
+#| msgid "Add new field"
+msgid "Prefix"
+msgstr "Dadać novaje pole"
+
+#: templates/database/structure/check_all_tables.phtml:28
+msgid "Add prefix to table"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:29
+#, fuzzy
+#| msgid "Replace table data with file"
+msgid "Replace table prefix"
+msgstr "Zamianić dadzienyja tablicy dadzienymi z fajła"
+
+#: templates/database/structure/check_all_tables.phtml:30
+#, fuzzy
+#| msgid "Replace table data with file"
+msgid "Copy table with prefix"
+msgstr "Zamianić dadzienyja tablicy dadzienymi z fajła"
+
+#: templates/database/structure/check_all_tables.phtml:36
+#, fuzzy
+#| msgid "Add %s field(s)"
+msgid "Add columns to central list"
+msgstr "Dadać %s novyja pali"
+
+#: templates/database/structure/check_all_tables.phtml:37
+msgid "Remove columns from central list"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:38
+#, fuzzy
+#| msgid "Add %s field(s)"
+msgid "Make consistent with central list"
+msgstr "Dadać %s novyja pali"
+
+#: templates/database/structure/favorite_anchor.phtml:12
+#, fuzzy
+#| msgid "Add a new User"
+msgid "Add to Favorites"
+msgstr "Dadać novaha karystalnika"
+
+#: templates/database/structure/show_create.phtml:2
+#, fuzzy
+#| msgid "Showing SQL query"
+msgid "Showing create queries"
+msgstr "U vyhladzie SQL-zapytu"
+
+#: templates/database/structure/sortable_header.phtml:13
+msgid "Sort"
+msgstr "Paradak"
+
+#: templates/database/structure/table_header.phtml:42
+#, fuzzy
+#| msgid "May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]"
+msgid ""
+"May be approximate. Click on the number to get the exact count. See "
+"[doc@faq3-11]FAQ 3.11[/doc]."
+msgstr "Značeńnie moža być prybliznym. Hł. [doc@faq3-11]FAQ 3.11[/doc]"
+
+#: templates/database/structure/table_header.phtml:66
+#: templates/table/index_form.phtml:127
+msgid "Size"
+msgstr "Pamier"
+
+#: templates/database/structure/table_header.phtml:74
+#: templates/table/structure/display_table_stats.phtml:27
+msgid "Overhead"
+msgstr "Vykarystańnie resursaŭ"
+
+#: templates/database/structure/tracking_icon.phtml:4
+msgid "Tracking is active."
+msgstr ""
+
+#: templates/database/structure/tracking_icon.phtml:8
+msgid "Tracking is not active."
+msgstr ""
+
 #: templates/error/report_form.phtml:7
 msgid ""
 "phpMyAdmin has encountered an error. We have collected data about this error "
@@ -16148,70 +16279,6 @@ msgstr ""
 msgid "Please explain the steps that lead to the error:"
 msgstr ""
 
-#: templates/gis_visualization/gis_visualization.phtml:3
-msgid "Display GIS Visualization"
-msgstr ""
-
-#: templates/gis_visualization/gis_visualization.phtml:8
-#, fuzzy
-#| msgid "Add/Delete Field Columns"
-msgid "Label column"
-msgstr "Dadać/vydalić kalonku kryteru"
-
-#: templates/gis_visualization/gis_visualization.phtml:11
-msgid "-- None --"
-msgstr ""
-
-#: templates/gis_visualization/gis_visualization.phtml:19
-#, fuzzy
-#| msgid "Log file count"
-msgid "Spatial column"
-msgstr "Kolkaść fajłaŭ łogu"
-
-#: templates/index_form.phtml:16
-msgid "Index name:"
-msgstr "Imia indeksa:"
-
-#: templates/index_form.phtml:19
-msgid ""
-"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
-msgstr ""
-"\"PRIMARY\" <b>musić</b> być imiem pieršasnaha kluča i <b>tolki</b> jaho!"
-
-#: templates/index_form.phtml:40
-#, fuzzy
-#| msgid "Index cache size"
-msgid "Index choice:"
-msgstr "Pamier kešu indeksaŭ"
-
-#: templates/index_form.phtml:57
-msgid "Key block size:"
-msgstr ""
-
-#: templates/index_form.phtml:74
-msgid "Index type:"
-msgstr "Typ indeksa:"
-
-#: templates/index_form.phtml:86
-#, fuzzy
-#| msgid "User"
-msgid "Parser:"
-msgstr "Karystalnik"
-
-#: templates/index_form.phtml:102
-#, fuzzy
-#| msgid "Comment"
-msgid "Comment:"
-msgstr "Kamentar"
-
-#: templates/index_form.phtml:127 templates/structure/table_header.phtml:66
-msgid "Size"
-msgstr "Pamier"
-
-#: templates/index_form.phtml:149 templates/index_form.phtml:190
-msgid "Drag to reorder"
-msgstr ""
-
 #: templates/prefs_autoload.phtml:9
 msgid ""
 "Your browser has phpMyAdmin configuration for this domain. Would you like to "
@@ -16224,439 +16291,183 @@ msgstr ""
 msgid "Start row:"
 msgstr "Pakazanyja zapisy"
 
-#: templates/structure/actions_in_table_structure.phtml:14
-#, php-format
-msgid "A primary key has been added on %s."
-msgstr "Pieršasny kluč byŭ dadadzieny da %s."
-
-#: templates/structure/actions_in_table_structure.phtml:34
-#: templates/structure/actions_in_table_structure.phtml:54
-#: templates/structure/actions_in_table_structure.phtml:79
-#: templates/structure/actions_in_table_structure.phtml:101
-#, php-format
-msgid "An index has been added on %s."
-msgstr "Byŭ dadadzieny indeks dla %s."
-
-#: templates/structure/actions_in_table_structure.phtml:130
-#: templates/structure/check_all_table_column.phtml:59
-#, fuzzy
-#| msgid "Rename database to"
-msgid "Remove from central columns"
-msgstr "Pierajmienavać bazu dadzienych u"
-
-#: templates/structure/actions_in_table_structure.phtml:138
-#: templates/structure/check_all_table_column.phtml:55
-#, fuzzy
-#| msgid "Add %s field(s)"
-msgid "Add to central columns"
-msgstr "Dadać %s novyja pali"
-
-#: templates/structure/add_column.phtml:7
-#, fuzzy, php-format
-#| msgid "Add %s field(s)"
-msgid "Add %s column(s)"
-msgstr "Dadać %s novyja pali"
-
-#: templates/structure/add_column.phtml:12
-#, fuzzy
-#| msgid "At Beginning of Table"
-msgid "at beginning of table"
-msgstr "U pačatku tablicy"
-
-#: templates/structure/body_for_table_summary.phtml:6
-#, fuzzy, php-format
-#| msgid "%s table(s)"
-msgid "%s table"
-msgid_plural "%s tables"
-msgstr[0] "%s tablic(y)"
-msgstr[1] "%s tablic(y)"
-msgstr[2] "%s tablic(y)"
-
-#: templates/structure/body_for_table_summary.phtml:17
-msgid "Sum"
-msgstr "Usiaho"
-
-#: templates/structure/check_all_tables.phtml:6
-msgid "Check tables having overhead"
-msgstr "Adznačyć tyja, što patrabujuć aptymizacyi"
-
-#: templates/structure/check_all_tables.phtml:10
-#, fuzzy
-#| msgid "Show color"
-msgid "Show create"
-msgstr "Pakazać koler"
-
-#: templates/structure/check_all_tables.phtml:27
-#, fuzzy
-#| msgid "Add new field"
-msgid "Prefix"
-msgstr "Dadać novaje pole"
-
-#: templates/structure/check_all_tables.phtml:28
-msgid "Add prefix to table"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:29
-#, fuzzy
-#| msgid "Replace table data with file"
-msgid "Replace table prefix"
-msgstr "Zamianić dadzienyja tablicy dadzienymi z fajła"
-
-#: templates/structure/check_all_tables.phtml:30
-#, fuzzy
-#| msgid "Replace table data with file"
-msgid "Copy table with prefix"
-msgstr "Zamianić dadzienyja tablicy dadzienymi z fajła"
-
-#: templates/structure/check_all_tables.phtml:36
-#, fuzzy
-#| msgid "Add %s field(s)"
-msgid "Add columns to central list"
-msgstr "Dadać %s novyja pali"
-
-#: templates/structure/check_all_tables.phtml:37
-msgid "Remove columns from central list"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:38
-#, fuzzy
-#| msgid "Add %s field(s)"
-msgid "Make consistent with central list"
-msgstr "Dadać %s novyja pali"
-
-#: templates/structure/display_structure.phtml:140 view_create.php:181
-#, fuzzy
-#| msgid "Print view"
-msgid "Edit view"
-msgstr "Versija dla druku"
-
-#: templates/structure/display_table_stats.phtml:9
-msgid "Space usage"
-msgstr "Vykarystańnie prastory"
-
-#: templates/structure/display_table_stats.phtml:27
-#: templates/structure/table_header.phtml:74
-msgid "Overhead"
-msgstr "Vykarystańnie resursaŭ"
-
-#: templates/structure/display_table_stats.phtml:32
-msgid "Effective"
-msgstr "Efektyŭnaść"
-
-#: templates/structure/favorite_anchor.phtml:12
-#, fuzzy
-#| msgid "Add a new User"
-msgid "Add to Favorites"
-msgstr "Dadać novaha karystalnika"
-
-#: templates/structure/move_columns_dialog.phtml:1
-#: templates/structure/optional_action_links.phtml:21
-#, fuzzy
-#| msgid "Add %s field(s)"
-msgid "Move columns"
-msgstr "Dadać %s novyja pali"
-
-#: templates/structure/move_columns_dialog.phtml:2
-msgid "Move the columns by dragging them up and down."
-msgstr ""
-
-#: templates/structure/optional_action_links.phtml:9
-msgid "Propose table structure"
-msgstr "Prapanavanaja struktura tablicy"
-
-#: templates/structure/optional_action_links.phtml:24
-#, fuzzy
-#| msgid "Propose table structure"
-msgid "Improve table structure"
-msgstr "Prapanavanaja struktura tablicy"
-
-#: templates/structure/optional_action_links.phtml:30
-#, fuzzy
-#| msgid "Create"
-msgid "Track view"
-msgstr "Stvaryć"
-
-#: templates/structure/row_stats_table.phtml:3
-#, fuzzy
-#| msgid "Row Statistics"
-msgid "Row statistics"
-msgstr "Statystyka radku"
-
-#: templates/structure/row_stats_table.phtml:9
-msgid "static"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:11
-msgid "dynamic"
-msgstr "dynamičny"
-
-#: templates/structure/row_stats_table.phtml:22
-msgid "partitioned"
-msgstr "padzielenaja na sekcyi"
-
-#: templates/structure/row_stats_table.phtml:54
-msgid "Row length"
-msgstr "Daŭžynia radka"
-
-#: templates/structure/row_stats_table.phtml:66
-msgid "Row size"
-msgstr "Pamier radka"
-
-#: templates/structure/row_stats_table.phtml:73
-msgid "Next autoindex"
-msgstr ""
-
-#: templates/structure/secondary_tabs.phtml:14
-#, fuzzy
-#| msgid "Relation view"
-msgid "Relation view"
-msgstr "Prahlad zaležnaściaŭ"
-
-#: templates/structure/show_create.phtml:2
-#, fuzzy
-#| msgid "Showing SQL query"
-msgid "Showing create queries"
-msgstr "U vyhladzie SQL-zapytu"
-
-#: templates/structure/sortable_header.phtml:13
-msgid "Sort"
-msgstr "Paradak"
-
-#: templates/structure/table_header.phtml:42
-#, fuzzy
-#| msgid "May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]"
-msgid ""
-"May be approximate. Click on the number to get the exact count. See "
-"[doc@faq3-11]FAQ 3.11[/doc]."
-msgstr "Značeńnie moža być prybliznym. Hł. [doc@faq3-11]FAQ 3.11[/doc]"
-
-#: templates/structure/table_structure_row.phtml:46
-#, fuzzy, php-format
-#| msgid "Table %s has been dropped."
-msgid "Column %s has been dropped."
-msgstr "Tablica %s była vydalenaja"
-
-#: templates/structure/tracking_icon.phtml:4
-msgid "Tracking is active."
-msgstr ""
-
-#: templates/structure/tracking_icon.phtml:8
-msgid "Tracking is not active."
-msgstr ""
-
-#: templates/table/create_table.phtml:15
-#, fuzzy
-#| msgid "Number of fields"
-msgid "Number of columns"
-msgstr "Kolkaść paloŭ"
-
-#: templates/table/options.phtml:8
-#, fuzzy
-#| msgid "Select fields (at least one):"
-msgid "Select columns (at least one):"
-msgstr "Vybrać pali (prynamsi adno):"
-
-#: templates/table/options.phtml:37
-msgid "Add search conditions (body of the \"where\" clause):"
-msgstr "Dadać umovy pošuku (cieła dla ŭmovy \"where\"):"
-
-#: templates/table/options.phtml:45
-msgid "Number of rows per page"
-msgstr "Kolkaść radkoŭ na staronku"
-
-#: templates/table/options.phtml:56
-msgid "Display order:"
-msgstr "Paradak prahladu:"
-
-#: templates/table/options_zoom.phtml:6
-msgid "Use this column to label each point"
-msgstr ""
-
-#: templates/table/options_zoom.phtml:35
-msgid "Maximum rows to plot"
-msgstr ""
-
-#: templates/table/replace_preview.phtml:13
-msgid "Find and replace - preview"
-msgstr ""
-
-#: templates/table/replace_preview.phtml:18
-#, fuzzy
-#| msgid "Original position"
-msgid "Original string"
-msgstr "Pieršapačatkovaja pazycyja"
-
-#: templates/table/replace_preview.phtml:19
-#, fuzzy
-#| msgid "Relations"
-msgid "Replaced string"
-msgstr "Suviazi"
-
-#: templates/table/replace_preview.phtml:40
-#, fuzzy
-#| msgid "Replication"
-msgid "Replace"
-msgstr "Replikacyja"
-
-#: templates/table/rows_zoom.phtml:16
-#, fuzzy
-#| msgid "in query"
-msgid "Additional search criteria"
-msgstr "pa zapytu"
-
-#: templates/table/search_and_replace.phtml:3
-#, fuzzy
-#| msgid "Replace NULL by"
-msgid "Replace with:"
-msgstr "Zamianiać NULL na"
-
-#: templates/table/search_and_replace.phtml:22
-#, fuzzy
-#| msgid "as regular expression"
-msgid "Use regular expression"
-msgstr "rehularny vyraz"
-
-#: templates/table/selection_form.phtml:12
-#, fuzzy
-#| msgid "Do a \"query by example\" (wildcard: \"%\")"
-msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
-msgstr "Vykanać \"zapyt zhodna prykłada\" (symbal padstanoŭki: \"%\")"
-
-#: templates/table/selection_form.phtml:34
-msgid "Do a \"query by example\" (wildcard: \"%\")"
-msgstr "Vykanać \"zapyt zhodna prykłada\" (symbal padstanoŭki: \"%\")"
-
-#: templates/table/zoom_result_form.phtml:7
-msgid "Browse/Edit the points"
-msgstr ""
-
-#: templates/table/zoom_result_form.phtml:15
-msgid "How to use"
-msgstr ""
-
-#: templates/table/zoom_result_form.phtml:23
-#, fuzzy
-#| msgid "Reset"
-msgid "Reset zoom"
-msgstr "Skinuć"
-
-#: templates/tbl_chart.phtml:17
+#: templates/table/chart/tbl_chart.phtml:17
 #, fuzzy
 #| msgid "Mar"
 msgctxt "Chart type"
 msgid "Bar"
 msgstr "Sak"
 
-#: templates/tbl_chart.phtml:21
+#: templates/table/chart/tbl_chart.phtml:21
 #, fuzzy
 #| msgid "Column names"
 msgctxt "Chart type"
 msgid "Column"
 msgstr "Nazvy kalonak"
 
-#: templates/tbl_chart.phtml:25
+#: templates/table/chart/tbl_chart.phtml:25
 msgctxt "Chart type"
 msgid "Line"
 msgstr ""
 
-#: templates/tbl_chart.phtml:29
+#: templates/table/chart/tbl_chart.phtml:29
 #, fuzzy
 #| msgid "Engines"
 msgctxt "Chart type"
 msgid "Spline"
 msgstr "Mašyny"
 
-#: templates/tbl_chart.phtml:33
+#: templates/table/chart/tbl_chart.phtml:33
 msgctxt "Chart type"
 msgid "Area"
 msgstr ""
 
-#: templates/tbl_chart.phtml:37
+#: templates/table/chart/tbl_chart.phtml:37
 #, fuzzy
 #| msgid "PiB"
 msgctxt "Chart type"
 msgid "Pie"
 msgstr "PiB"
 
-#: templates/tbl_chart.phtml:41
+#: templates/table/chart/tbl_chart.phtml:41
 #, fuzzy
 #| msgid "Time"
 msgctxt "Chart type"
 msgid "Timeline"
 msgstr "Čas"
 
-#: templates/tbl_chart.phtml:45
+#: templates/table/chart/tbl_chart.phtml:45
 msgctxt "Chart type"
 msgid "Scatter"
 msgstr ""
 
-#: templates/tbl_chart.phtml:50
+#: templates/table/chart/tbl_chart.phtml:50
 #, fuzzy
 #| msgid "Packed"
 msgid "Stacked"
 msgstr "Ścisnutaja"
 
-#: templates/tbl_chart.phtml:53
+#: templates/table/chart/tbl_chart.phtml:53
 #, fuzzy
 #| msgid "Report title"
 msgid "Chart title"
 msgstr "Zahałovak spravazdačy"
 
-#: templates/tbl_chart.phtml:57
+#: templates/table/chart/tbl_chart.phtml:57
 msgid "X-Axis:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:72
+#: templates/table/chart/tbl_chart.phtml:72
 msgid "Series:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:102
+#: templates/table/chart/tbl_chart.phtml:102
 msgid "X-Axis label:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:104
+#: templates/table/chart/tbl_chart.phtml:104
 #, fuzzy
 #| msgid "Value"
 msgid "X Values"
 msgstr "Značeńnie"
 
-#: templates/tbl_chart.phtml:107
+#: templates/table/chart/tbl_chart.phtml:107
 msgid "Y-Axis label:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:115
+#: templates/table/chart/tbl_chart.phtml:115
 msgid "Series names are in a column"
 msgstr ""
 
-#: templates/tbl_chart.phtml:118
+#: templates/table/chart/tbl_chart.phtml:118
 #, fuzzy
 #| msgid "Inside field:"
 msgid "Series column:"
 msgstr "Unutry pola:"
 
-#: templates/tbl_chart.phtml:130
+#: templates/table/chart/tbl_chart.phtml:130
 #, fuzzy
 #| msgid "Number of fields"
 msgid "Value Column:"
 msgstr "Kolkaść paloŭ"
 
-#: templates/tbl_chart.phtml:150
+#: templates/table/chart/tbl_chart.phtml:150
 #, fuzzy
 #| msgid "Save as file"
 msgid "Save chart as image"
 msgstr "Zachavać jak fajł"
 
-#: templates/tbl_relation/common_form.phtml:7
+#: templates/table/gis_visualization/gis_visualization.phtml:3
+msgid "Display GIS Visualization"
+msgstr ""
+
+#: templates/table/gis_visualization/gis_visualization.phtml:8
+#, fuzzy
+#| msgid "Add/Delete Field Columns"
+msgid "Label column"
+msgstr "Dadać/vydalić kalonku kryteru"
+
+#: templates/table/gis_visualization/gis_visualization.phtml:11
+msgid "-- None --"
+msgstr ""
+
+#: templates/table/gis_visualization/gis_visualization.phtml:19
+#, fuzzy
+#| msgid "Log file count"
+msgid "Spatial column"
+msgstr "Kolkaść fajłaŭ łogu"
+
+#: templates/table/index_form.phtml:16
+msgid "Index name:"
+msgstr "Imia indeksa:"
+
+#: templates/table/index_form.phtml:19
+msgid ""
+"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
+msgstr ""
+"\"PRIMARY\" <b>musić</b> być imiem pieršasnaha kluča i <b>tolki</b> jaho!"
+
+#: templates/table/index_form.phtml:40
+#, fuzzy
+#| msgid "Index cache size"
+msgid "Index choice:"
+msgstr "Pamier kešu indeksaŭ"
+
+#: templates/table/index_form.phtml:57
+msgid "Key block size:"
+msgstr ""
+
+#: templates/table/index_form.phtml:74
+msgid "Index type:"
+msgstr "Typ indeksa:"
+
+#: templates/table/index_form.phtml:86
+#, fuzzy
+#| msgid "User"
+msgid "Parser:"
+msgstr "Karystalnik"
+
+#: templates/table/index_form.phtml:102
+#, fuzzy
+#| msgid "Comment"
+msgid "Comment:"
+msgstr "Kamentar"
+
+#: templates/table/index_form.phtml:149 templates/table/index_form.phtml:190
+msgid "Drag to reorder"
+msgstr ""
+
+#: templates/table/relation/common_form.phtml:7
 msgid "Internal relations"
 msgstr "Unutranyja suviazi"
 
-#: templates/tbl_relation/common_form.phtml:11
+#: templates/table/relation/common_form.phtml:11
 #, fuzzy
 #| msgid "Internal relations"
 msgid "Internal relation"
 msgstr "Unutranyja suviazi"
 
-#: templates/tbl_relation/common_form.phtml:14
+#: templates/table/relation/common_form.phtml:14
 msgid ""
 "An internal relation is not necessary when a corresponding FOREIGN KEY "
 "relation exists."
@@ -16664,61 +16475,273 @@ msgstr ""
 "Unutranaja suviaź nie źjaŭlajecca abaviazkovaj, kali isnuje adpaviednaja "
 "suviaź FOREIGN KEY."
 
-#: templates/tbl_relation/common_form.phtml:37
+#: templates/table/relation/common_form.phtml:37
 #, fuzzy
 #| msgid "Disable foreign key checks"
 msgid "Foreign key constraints"
 msgstr "Adklučyć pravierku źniešnich klučoŭ"
 
-#: templates/tbl_relation/common_form.phtml:40
+#: templates/table/relation/common_form.phtml:40
 msgid "Actions"
 msgstr "Dziejańni"
 
-#: templates/tbl_relation/common_form.phtml:41
+#: templates/table/relation/common_form.phtml:41
 #, fuzzy
 #| msgid "Constraints for table"
 msgid "Constraint properties"
 msgstr "Abmiežavańni dla tablicy"
 
-#: templates/tbl_relation/common_form.phtml:44
+#: templates/table/relation/common_form.phtml:44
 msgid ""
 "Only columns with index will be displayed. You can define an index below."
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:49
+#: templates/table/relation/common_form.phtml:49
 msgid "Foreign key constraint"
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:81
+#: templates/table/relation/common_form.phtml:81
 #, fuzzy
 #| msgid "Add constraints"
 msgid "+ Add constraint"
 msgstr "Dadać abmiežavańni"
 
-#: templates/tbl_relation/common_form.phtml:91
+#: templates/table/relation/common_form.phtml:91
 #, fuzzy
 #| msgid "Choose field to display"
 msgid "Choose column to display:"
 msgstr "Vybierycie pole dla adlustravańnia"
 
-#: templates/tbl_relation/foreign_key_row.phtml:13
+#: templates/table/relation/foreign_key_row.phtml:13
 #, fuzzy, php-format
 #| msgid "Disable foreign key checks"
 msgid "Foreign key constraint %s has been dropped"
 msgstr "Adklučyć pravierku źniešnich klučoŭ"
 
-#: templates/tbl_relation/foreign_key_row.phtml:102
+#: templates/table/relation/foreign_key_row.phtml:102
 #, fuzzy
 #| msgid "Constraints for table"
 msgid "Constraint name"
 msgstr "Abmiežavańni dla tablicy"
 
-#: templates/tbl_relation/foreign_key_row.phtml:157
+#: templates/table/relation/foreign_key_row.phtml:157
 #, fuzzy
 #| msgid "Add %s field(s)"
 msgid "+ Add column"
 msgstr "Dadać %s novyja pali"
 
+#: templates/table/search/options.phtml:8
+#, fuzzy
+#| msgid "Select fields (at least one):"
+msgid "Select columns (at least one):"
+msgstr "Vybrać pali (prynamsi adno):"
+
+#: templates/table/search/options.phtml:37
+msgid "Add search conditions (body of the \"where\" clause):"
+msgstr "Dadać umovy pošuku (cieła dla ŭmovy \"where\"):"
+
+#: templates/table/search/options.phtml:45
+msgid "Number of rows per page"
+msgstr "Kolkaść radkoŭ na staronku"
+
+#: templates/table/search/options.phtml:56
+msgid "Display order:"
+msgstr "Paradak prahladu:"
+
+#: templates/table/search/options_zoom.phtml:6
+msgid "Use this column to label each point"
+msgstr ""
+
+#: templates/table/search/options_zoom.phtml:35
+msgid "Maximum rows to plot"
+msgstr ""
+
+#: templates/table/search/replace_preview.phtml:13
+msgid "Find and replace - preview"
+msgstr ""
+
+#: templates/table/search/replace_preview.phtml:18
+#, fuzzy
+#| msgid "Original position"
+msgid "Original string"
+msgstr "Pieršapačatkovaja pazycyja"
+
+#: templates/table/search/replace_preview.phtml:19
+#, fuzzy
+#| msgid "Relations"
+msgid "Replaced string"
+msgstr "Suviazi"
+
+#: templates/table/search/replace_preview.phtml:40
+#, fuzzy
+#| msgid "Replication"
+msgid "Replace"
+msgstr "Replikacyja"
+
+#: templates/table/search/rows_zoom.phtml:16
+#, fuzzy
+#| msgid "in query"
+msgid "Additional search criteria"
+msgstr "pa zapytu"
+
+#: templates/table/search/search_and_replace.phtml:3
+#, fuzzy
+#| msgid "Replace NULL by"
+msgid "Replace with:"
+msgstr "Zamianiać NULL na"
+
+#: templates/table/search/search_and_replace.phtml:22
+#, fuzzy
+#| msgid "as regular expression"
+msgid "Use regular expression"
+msgstr "rehularny vyraz"
+
+#: templates/table/search/selection_form.phtml:12
+#, fuzzy
+#| msgid "Do a \"query by example\" (wildcard: \"%\")"
+msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
+msgstr "Vykanać \"zapyt zhodna prykłada\" (symbal padstanoŭki: \"%\")"
+
+#: templates/table/search/selection_form.phtml:34
+msgid "Do a \"query by example\" (wildcard: \"%\")"
+msgstr "Vykanać \"zapyt zhodna prykłada\" (symbal padstanoŭki: \"%\")"
+
+#: templates/table/search/zoom_result_form.phtml:7
+msgid "Browse/Edit the points"
+msgstr ""
+
+#: templates/table/search/zoom_result_form.phtml:15
+msgid "How to use"
+msgstr ""
+
+#: templates/table/search/zoom_result_form.phtml:23
+#, fuzzy
+#| msgid "Reset"
+msgid "Reset zoom"
+msgstr "Skinuć"
+
+#: templates/table/secondary_tabs.phtml:14
+#, fuzzy
+#| msgid "Relation view"
+msgid "Relation view"
+msgstr "Prahlad zaležnaściaŭ"
+
+#: templates/table/structure/actions_in_table_structure.phtml:14
+#, php-format
+msgid "A primary key has been added on %s."
+msgstr "Pieršasny kluč byŭ dadadzieny da %s."
+
+#: templates/table/structure/actions_in_table_structure.phtml:34
+#: templates/table/structure/actions_in_table_structure.phtml:54
+#: templates/table/structure/actions_in_table_structure.phtml:79
+#: templates/table/structure/actions_in_table_structure.phtml:101
+#, php-format
+msgid "An index has been added on %s."
+msgstr "Byŭ dadadzieny indeks dla %s."
+
+#: templates/table/structure/actions_in_table_structure.phtml:130
+#: templates/table/structure/check_all_table_column.phtml:59
+#, fuzzy
+#| msgid "Rename database to"
+msgid "Remove from central columns"
+msgstr "Pierajmienavać bazu dadzienych u"
+
+#: templates/table/structure/actions_in_table_structure.phtml:138
+#: templates/table/structure/check_all_table_column.phtml:55
+#, fuzzy
+#| msgid "Add %s field(s)"
+msgid "Add to central columns"
+msgstr "Dadać %s novyja pali"
+
+#: templates/table/structure/add_column.phtml:7
+#, fuzzy, php-format
+#| msgid "Add %s field(s)"
+msgid "Add %s column(s)"
+msgstr "Dadać %s novyja pali"
+
+#: templates/table/structure/add_column.phtml:12
+#, fuzzy
+#| msgid "At Beginning of Table"
+msgid "at beginning of table"
+msgstr "U pačatku tablicy"
+
+#: templates/table/structure/display_structure.phtml:140 view_create.php:181
+#, fuzzy
+#| msgid "Print view"
+msgid "Edit view"
+msgstr "Versija dla druku"
+
+#: templates/table/structure/display_table_stats.phtml:9
+msgid "Space usage"
+msgstr "Vykarystańnie prastory"
+
+#: templates/table/structure/display_table_stats.phtml:32
+msgid "Effective"
+msgstr "Efektyŭnaść"
+
+#: templates/table/structure/move_columns_dialog.phtml:1
+#: templates/table/structure/optional_action_links.phtml:21
+#, fuzzy
+#| msgid "Add %s field(s)"
+msgid "Move columns"
+msgstr "Dadać %s novyja pali"
+
+#: templates/table/structure/move_columns_dialog.phtml:2
+msgid "Move the columns by dragging them up and down."
+msgstr ""
+
+#: templates/table/structure/optional_action_links.phtml:9
+msgid "Propose table structure"
+msgstr "Prapanavanaja struktura tablicy"
+
+#: templates/table/structure/optional_action_links.phtml:24
+#, fuzzy
+#| msgid "Propose table structure"
+msgid "Improve table structure"
+msgstr "Prapanavanaja struktura tablicy"
+
+#: templates/table/structure/optional_action_links.phtml:30
+#, fuzzy
+#| msgid "Create"
+msgid "Track view"
+msgstr "Stvaryć"
+
+#: templates/table/structure/row_stats_table.phtml:3
+#, fuzzy
+#| msgid "Row Statistics"
+msgid "Row statistics"
+msgstr "Statystyka radku"
+
+#: templates/table/structure/row_stats_table.phtml:9
+msgid "static"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:11
+msgid "dynamic"
+msgstr "dynamičny"
+
+#: templates/table/structure/row_stats_table.phtml:22
+msgid "partitioned"
+msgstr "padzielenaja na sekcyi"
+
+#: templates/table/structure/row_stats_table.phtml:54
+msgid "Row length"
+msgstr "Daŭžynia radka"
+
+#: templates/table/structure/row_stats_table.phtml:66
+msgid "Row size"
+msgstr "Pamier radka"
+
+#: templates/table/structure/row_stats_table.phtml:73
+msgid "Next autoindex"
+msgstr ""
+
+#: templates/table/structure/table_structure_row.phtml:46
+#, fuzzy, php-format
+#| msgid "Table %s has been dropped."
+msgid "Column %s has been dropped."
+msgstr "Tablica %s była vydalenaja"
+
 #: themes.php:17 themes.php:22
 msgid "Theme"
 msgstr ""
@@ -17990,6 +18013,11 @@ msgstr ""
 msgid "concurrent_insert is set to 0"
 msgstr "maksymum adnačasovych złučeńniaŭ"
 
+#, fuzzy
+#~| msgid "Read misses"
+#~ msgid "Read as multibytes"
+#~ msgstr "Propuskaŭ čytańnia"
+
 #, fuzzy
 #~| msgid "Relational display field"
 #~ msgid "Relational display column"
diff --git a/po/bg.po b/po/bg.po
index b64c946cd3..dca21f8de1 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 4.5.0-dev\n"
 "Report-Msgid-Bugs-To: developers@phpmyadmin.net\n"
-"POT-Creation-Date: 2015-08-08 13:53-0400\n"
+"POT-Creation-Date: 2015-08-12 08:10-0400\n"
 "PO-Revision-Date: 2015-06-28 13:36+0200\n"
 "Last-Translator: Valter Georgiev <blagynchy@gmail.com>\n"
 "Language-Team: Bulgarian <https://hosted.weblate.org/projects/phpmyadmin/"
@@ -53,7 +53,7 @@ msgid "Table comments:"
 msgstr "Коментари към таблицата:"
 
 #: db_datadict.php:104 libraries/Index.class.php:699
-#: libraries/insert_edit.lib.php:1567
+#: libraries/insert_edit.lib.php:1565
 #: libraries/navigation/Nodes/Node_Column.class.php:30
 #: libraries/plugins/export/ExportHtmlword.class.php:280
 #: libraries/plugins/export/ExportHtmlword.class.php:375
@@ -67,13 +67,14 @@ msgstr "Коментари към таблицата:"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1023
 #: libraries/tracking.lib.php:879 libraries/tracking.lib.php:975
 #: templates/columns_definitions/column_name.phtml:18
-#: templates/index_form.phtml:124 templates/table/table_header.phtml:6
-#: templates/table/zoom_result_form.phtml:33
-#: templates/tbl_relation/common_form.phtml:10
-#: templates/tbl_relation/common_form.phtml:43
-#: templates/tbl_relation/foreign_key_row.phtml:194
-#: templates/tbl_relation/foreign_key_row.phtml:206
-#: templates/tbl_relation/internal_relational_row.phtml:71
+#: templates/table/index_form.phtml:124
+#: templates/table/relation/common_form.phtml:10
+#: templates/table/relation/common_form.phtml:43
+#: templates/table/relation/foreign_key_row.phtml:194
+#: templates/table/relation/foreign_key_row.phtml:206
+#: templates/table/relation/internal_relational_row.phtml:71
+#: templates/table/search/table_header.phtml:6
+#: templates/table/search/zoom_result_form.phtml:33
 msgid "Column"
 msgstr "Kолона"
 
@@ -91,21 +92,21 @@ msgstr "Kолона"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1001
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1024
 #: libraries/rte/rte_list.lib.php:75 libraries/rte/rte_list.lib.php:103
-#: libraries/rte/rte_routines.lib.php:802
-#: libraries/rte/rte_routines.lib.php:831
-#: libraries/rte/rte_routines.lib.php:1493
+#: libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_routines.lib.php:922
+#: libraries/rte/rte_routines.lib.php:1584
 #: libraries/server_privileges.lib.php:2369 libraries/tracking.lib.php:880
 #: libraries/tracking.lib.php:972
 #: templates/columns_definitions/table_fields_definitions.phtml:11
-#: templates/structure/table_header.phtml:48
-#: templates/structure/table_structure_header.phtml:6
-#: templates/table/table_header.phtml:7
+#: templates/database/structure/table_header.phtml:48
+#: templates/table/search/table_header.phtml:7
+#: templates/table/structure/table_structure_header.phtml:6
 msgid "Type"
 msgstr "Тип"
 
 #: db_datadict.php:106 libraries/Index.class.php:702
 #: libraries/central_columns.lib.php:708
-#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1576
+#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1574
 #: libraries/plugins/export/ExportHtmlword.class.php:286
 #: libraries/plugins/export/ExportHtmlword.class.php:381
 #: libraries/plugins/export/ExportLatex.class.php:509
@@ -118,8 +119,8 @@ msgstr "Тип"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1026
 #: libraries/tracking.lib.php:882 libraries/tracking.lib.php:978
 #: templates/columns_definitions/table_fields_definitions.phtml:39
-#: templates/structure/table_structure_header.phtml:9
-#: templates/table/zoom_result_form.phtml:34
+#: templates/table/search/zoom_result_form.phtml:34
+#: templates/table/structure/table_structure_header.phtml:9
 msgid "Null"
 msgstr "Празно"
 
@@ -137,8 +138,8 @@ msgstr "Празно"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1027
 #: libraries/replication_gui.lib.php:153 libraries/tracking.lib.php:883
 #: templates/columns_definitions/table_fields_definitions.phtml:25
-#: templates/structure/body_for_table_summary.phtml:55
-#: templates/structure/table_structure_header.phtml:10
+#: templates/database/structure/body_for_table_summary.phtml:55
+#: templates/table/structure/table_structure_header.phtml:10
 msgid "Default"
 msgstr "По подразбиране"
 
@@ -166,19 +167,19 @@ msgid "Comments"
 msgstr "Коментари"
 
 #: db_datadict.php:146
-#: libraries/controllers/StructureController.class.php:1960
-#: libraries/controllers/StructureController.class.php:1965
+#: libraries/controllers/TableStructureController.class.php:951
+#: libraries/controllers/TableStructureController.class.php:956
 #: libraries/tracking.lib.php:922
 #: templates/columns_definitions/column_indexes.phtml:6
-#: templates/structure/check_all_table_column.phtml:22
-#: templates/structure/display_structure.phtml:74
+#: templates/table/structure/check_all_table_column.phtml:22
+#: templates/table/structure/display_structure.phtml:74
 msgid "Primary"
 msgstr "Първичен"
 
 #: db_datadict.php:156 js/messages.php:317 libraries/Index.class.php:567
 #: libraries/Index.class.php:606 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261 libraries/mult_submits.lib.php:403
+#: libraries/config/FormDisplay.tpl.php:272 libraries/mult_submits.lib.php:403
 #: libraries/mult_submits.lib.php:417
 #: libraries/plugins/export/ExportHtmlword.class.php:630
 #: libraries/plugins/export/ExportLatex.class.php:589
@@ -194,20 +195,20 @@ msgstr "Първичен"
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1010 libraries/tracking.lib.php:1015
 #: prefs_manage.php:140 templates/prefs_autoload.phtml:15
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "No"
 msgstr "Не"
 
 #: db_datadict.php:156 js/messages.php:443 libraries/Index.class.php:568
 #: libraries/Index.class.php:605 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261
-#: libraries/controllers/StructureController.class.php:1344
-#: libraries/controllers/StructureController.class.php:2223
-#: libraries/controllers/StructureController.class.php:2232
-#: libraries/controllers/StructureController.class.php:2237
-#: libraries/controllers/StructureController.class.php:2242
-#: libraries/controllers/StructureController.class.php:2247
+#: libraries/config/FormDisplay.tpl.php:272
+#: libraries/controllers/TableStructureController.class.php:539
+#: libraries/controllers/TableStructureController.class.php:1201
+#: libraries/controllers/TableStructureController.class.php:1210
+#: libraries/controllers/TableStructureController.class.php:1215
+#: libraries/controllers/TableStructureController.class.php:1220
+#: libraries/controllers/TableStructureController.class.php:1225
 #: libraries/mult_submits.inc.php:82 libraries/mult_submits.inc.php:178
 #: libraries/mult_submits.lib.php:339 libraries/mult_submits.lib.php:372
 #: libraries/mult_submits.lib.php:401 libraries/mult_submits.lib.php:415
@@ -216,8 +217,8 @@ msgstr "Не"
 #: libraries/plugins/export/ExportOdt.class.php:756
 #: libraries/plugins/export/ExportTexytext.class.php:567
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1077
-#: libraries/server_databases.lib.php:464
-#: libraries/server_databases.lib.php:474
+#: libraries/server_databases.lib.php:475
+#: libraries/server_databases.lib.php:485
 #: libraries/server_privileges.lib.php:2546
 #: libraries/server_privileges.lib.php:2727
 #: libraries/server_privileges.lib.php:2748
@@ -227,7 +228,7 @@ msgstr "Не"
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1008 libraries/tracking.lib.php:1013
 #: prefs_manage.php:138 templates/prefs_autoload.phtml:14
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "Yes"
 msgstr "Да"
 
@@ -237,7 +238,7 @@ msgstr "Преглед на схема (дъмп) на БД"
 
 #: db_export.php:37 db_tracking.php:90 export.php:382
 #: libraries/DBQbe.class.php:326
-#: libraries/controllers/StructureController.class.php:231
+#: libraries/controllers/DatabaseStructureController.class.php:170
 #: libraries/navigation/NavigationTree.class.php:897
 msgid "No tables found in database."
 msgstr "В БД няма таблици."
@@ -248,14 +249,14 @@ msgstr "В БД няма таблици."
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:26
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:120
-#: templates/structure/show_create.phtml:18
+#: templates/database/structure/show_create.phtml:18
 msgid "Tables"
 msgstr "Таблици"
 
 #: db_export.php:52 libraries/Menu.class.php:317 libraries/Menu.class.php:425
-#: libraries/Util.class.php:3333 libraries/Util.class.php:3343
-#: libraries/Util.class.php:3349 libraries/Util.class.php:3629
-#: libraries/Util.class.php:4327 libraries/Util.class.php:4344
+#: libraries/Util.class.php:3339 libraries/Util.class.php:3349
+#: libraries/Util.class.php:3355 libraries/Util.class.php:3635
+#: libraries/Util.class.php:4333 libraries/Util.class.php:4350
 #: libraries/central_columns.lib.php:728 libraries/config.values.php:39
 #: libraries/config.values.php:47 libraries/config.values.php:109
 #: libraries/config.values.php:115 libraries/config/setup.forms.php:323
@@ -269,7 +270,7 @@ msgstr "Таблици"
 #: libraries/navigation/Nodes/Node_Table.class.php:283
 #: libraries/server_privileges.lib.php:1141 libraries/tracking.lib.php:874
 #: templates/columns_definitions/table_fields_definitions.phtml:3
-#: templates/designer/table_list.phtml:28
+#: templates/database/designer/table_list.phtml:28
 msgid "Structure"
 msgstr "Структура"
 
@@ -281,7 +282,7 @@ msgstr "Структура"
 #: libraries/config/user_preferences.forms.php:292
 #: libraries/config/user_preferences.forms.php:297
 #: libraries/server_privileges.lib.php:1140
-#: templates/structure/display_table_stats.phtml:12
+#: templates/table/structure/display_table_stats.phtml:12
 msgid "Data"
 msgstr "Данни"
 
@@ -354,10 +355,10 @@ msgstr "Следени таблици"
 #: libraries/server_privileges.lib.php:2908
 #: libraries/server_privileges.lib.php:3145
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4346
-#: templates/structure/table_header.phtml:21
-#: templates/tbl_relation/foreign_key_row.phtml:176
-#: templates/tbl_relation/internal_relational_row.phtml:63
+#: libraries/server_privileges.lib.php:4372
+#: templates/database/structure/table_header.phtml:21
+#: templates/table/relation/foreign_key_row.phtml:176
+#: templates/table/relation/internal_relational_row.phtml:63
 msgid "Table"
 msgstr "Таблица"
 
@@ -374,7 +375,7 @@ msgid "Updated"
 msgstr "Актуализиран"
 
 #: db_tracking.php:130 js/messages.php:243 libraries/Menu.class.php:552
-#: libraries/Util.class.php:4314 libraries/config.values.php:104
+#: libraries/Util.class.php:4320 libraries/config.values.php:104
 #: libraries/rte/rte_events.lib.php:393 libraries/rte/rte_list.lib.php:101
 #: libraries/server_status_processes.lib.php:92 libraries/tracking.lib.php:279
 msgid "Status"
@@ -383,14 +384,15 @@ msgstr "Състояние"
 #: db_tracking.php:131 db_tracking.php:290 libraries/Index.class.php:693
 #: libraries/central_columns.lib.php:687 libraries/rte/rte_list.lib.php:74
 #: libraries/rte/rte_list.lib.php:89 libraries/rte/rte_list.lib.php:102
-#: libraries/server_databases.lib.php:398
+#: libraries/server_databases.lib.php:409
 #: libraries/server_privileges.lib.php:2372
 #: libraries/server_privileges.lib.php:3166
 #: libraries/server_privileges.lib.php:3342
 #: libraries/server_user_groups.lib.php:82
 #: libraries/server_variables.lib.php:189 libraries/tracking.lib.php:280
-#: libraries/tracking.lib.php:793 templates/structure/table_header.phtml:30
-#: templates/structure/table_structure_header.phtml:23
+#: libraries/tracking.lib.php:793
+#: templates/database/structure/table_header.phtml:30
+#: templates/table/structure/table_structure_header.phtml:23
 msgid "Action"
 msgstr "Действие"
 
@@ -432,7 +434,7 @@ msgid "Untracked tables"
 msgstr "Непроследявани таблици"
 
 #: db_tracking.php:305 db_tracking.php:336
-#: templates/structure/optional_action_links.phtml:17
+#: templates/table/structure/optional_action_links.phtml:17
 msgid "Track table"
 msgstr "Следене на таблица"
 
@@ -486,7 +488,7 @@ msgid "Value for the column \"%s\""
 msgstr "Стойност за колона \"%s\""
 
 #: gis_data_editor.php:146
-#: templates/gis_visualization/gis_visualization.phtml:37
+#: templates/table/gis_visualization/gis_visualization.phtml:37
 msgid "Use OpenStreetMaps as Base Layer"
 msgstr "Използване на OpenStreetMaps като основен слой"
 
@@ -566,35 +568,35 @@ msgstr "Добави геометрия"
 #: libraries/display_change_password.lib.php:162
 #: libraries/display_export.lib.php:402 libraries/display_export.lib.php:408
 #: libraries/display_import.lib.php:392 libraries/index.lib.php:44
-#: libraries/insert_edit.lib.php:1546 libraries/insert_edit.lib.php:1583
+#: libraries/insert_edit.lib.php:1544 libraries/insert_edit.lib.php:1581
 #: libraries/normalization.lib.php:165 libraries/normalization.lib.php:821
 #: libraries/operations.lib.php:38 libraries/operations.lib.php:108
 #: libraries/operations.lib.php:263 libraries/operations.lib.php:306
 #: libraries/operations.lib.php:801 libraries/operations.lib.php:874
 #: libraries/operations.lib.php:923 libraries/operations.lib.php:1337
 #: libraries/operations.lib.php:1658
-#: libraries/plugins/auth/AuthenticationCookie.class.php:244
+#: libraries/plugins/auth/AuthenticationCookie.class.php:232
 #: libraries/replication_gui.lib.php:122 libraries/replication_gui.lib.php:161
 #: libraries/replication_gui.lib.php:324 libraries/replication_gui.lib.php:461
 #: libraries/replication_gui.lib.php:906 libraries/rte/rte_events.lib.php:509
-#: libraries/rte/rte_routines.lib.php:969
-#: libraries/rte/rte_routines.lib.php:1581
+#: libraries/rte/rte_routines.lib.php:1060
+#: libraries/rte/rte_routines.lib.php:1672
 #: libraries/rte/rte_triggers.lib.php:396 libraries/server_bin_log.lib.php:61
 #: libraries/server_privileges.lib.php:705
 #: libraries/server_privileges.lib.php:2106
 #: libraries/server_privileges.lib.php:2872
 #: libraries/server_privileges.lib.php:3553
-#: libraries/server_privileges.lib.php:4627
+#: libraries/server_privileges.lib.php:4653
 #: libraries/server_user_groups.lib.php:285
 #: libraries/sql_query_form.lib.php:369 libraries/sql_query_form.lib.php:429
 #: libraries/tracking.lib.php:533 libraries/tracking.lib.php:653
 #: prefs_manage.php:277 prefs_manage.php:355
 #: templates/columns_definitions/column_definitions_form.phtml:59
-#: templates/header_location.phtml:17 templates/index_form.phtml:238
+#: templates/database/create_table.phtml:21 templates/header_location.phtml:28
 #: templates/startAndNumberOfRowsPanel.phtml:14
-#: templates/structure/add_column.phtml:25
-#: templates/table/create_table.phtml:21
-#: templates/table/selection_form.phtml:75 view_create.php:275
+#: templates/table/index_form.phtml:238
+#: templates/table/search/selection_form.phtml:75
+#: templates/table/structure/add_column.phtml:25 view_create.php:275
 #: view_operations.php:106
 msgid "Go"
 msgstr "Изпълнение"
@@ -687,7 +689,7 @@ msgstr ""
 "Не могат да бъдат заредени разширенията за импорт, моля проверете "
 "инсталацията!"
 
-#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1466
+#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1460
 #, php-format
 msgid "Bookmark %s has been created."
 msgstr "Отметката %s беше създадена."
@@ -726,11 +728,11 @@ msgstr ""
 msgid "Back"
 msgstr "Назад"
 
-#: index.php:148 libraries/Footer.class.php:70
+#: index.php:149 libraries/Footer.class.php:70
 msgid "phpMyAdmin Demo Server"
 msgstr "phpMyAdmin Демонстрационен сървър"
 
-#: index.php:152
+#: index.php:153
 #, php-format
 msgid ""
 "You are using the demo server. You can do anything here, but please do not "
@@ -741,110 +743,110 @@ msgstr ""
 "променяйте потребителите root, debian-sys-maint и pma. За повече информация "
 "потърсете %s."
 
-#: index.php:162
+#: index.php:163
 msgid "General Settings"
 msgstr "Общи настройки"
 
-#: index.php:190 libraries/display_change_password.lib.php:50
+#: index.php:191 libraries/display_change_password.lib.php:50
 #: libraries/display_change_password.lib.php:53 user_password.php:247
 msgid "Change password"
 msgstr "Смяна на паролата"
 
-#: index.php:206
+#: index.php:207
 msgid "Server connection collation"
 msgstr "Колация на връзката към сървъра"
 
-#: index.php:228
+#: index.php:229
 msgid "Appearance Settings"
 msgstr "Визуални настройки"
 
-#: index.php:258 prefs_manage.php:285
+#: index.php:259 prefs_manage.php:285
 msgid "More settings"
 msgstr "Още"
 
-#: index.php:279
+#: index.php:280
 msgid "Database server"
 msgstr "SQL сървър"
 
-#: index.php:282 libraries/plugins/auth/AuthenticationCookie.class.php:181
+#: index.php:283 libraries/plugins/auth/AuthenticationCookie.class.php:169
 msgid "Server:"
 msgstr "Сървър:"
 
-#: index.php:286
+#: index.php:287
 msgid "Server type:"
 msgstr "Тип на сървъра:"
 
-#: index.php:290 libraries/plugins/export/ExportLatex.class.php:212
+#: index.php:291 libraries/plugins/export/ExportLatex.class.php:212
 #: libraries/plugins/export/ExportSql.class.php:687
 #: libraries/plugins/export/ExportXml.class.php:189
 msgid "Server version:"
 msgstr "Версия на сървъра:"
 
-#: index.php:296
+#: index.php:297
 msgid "Protocol version:"
 msgstr "Версия на протокола:"
 
-#: index.php:300
+#: index.php:301
 msgid "User:"
 msgstr "Потребител:"
 
-#: index.php:305
+#: index.php:306
 msgid "Server charset:"
 msgstr "Знаков набор (charset) на сървъра:"
 
-#: index.php:320
+#: index.php:321
 msgid "Web server"
 msgstr "Web сървър"
 
-#: index.php:331
+#: index.php:332
 msgid "Database client version:"
 msgstr "Версия на БД клиент:"
 
-#: index.php:335
+#: index.php:336
 msgid "PHP extension:"
 msgstr "PHP разширение:"
 
-#: index.php:349
+#: index.php:350
 msgid "PHP version:"
 msgstr "PHP Версия:"
 
-#: index.php:360
+#: index.php:361
 msgid "Show PHP information"
 msgstr "Информация за PHP"
 
-#: index.php:383
+#: index.php:384
 msgid "Version information:"
 msgstr "Версия:"
 
-#: index.php:392 libraries/Util.class.php:432 libraries/Util.class.php:495
-#: libraries/config/FormDisplay.tpl.php:151
+#: index.php:393 libraries/Util.class.php:432 libraries/Util.class.php:495
+#: libraries/config/FormDisplay.tpl.php:162
 #: libraries/display_export.lib.php:577 libraries/engines/pbxt.lib.php:162
 #: libraries/navigation/NavigationHeader.class.php:196
 #: libraries/server_variables.lib.php:160
 msgid "Documentation"
 msgstr "Документация"
 
-#: index.php:399
+#: index.php:400
 msgid "Wiki"
 msgstr "Wiki"
 
-#: index.php:408
+#: index.php:409
 msgid "Official Homepage"
 msgstr "Официална страница"
 
-#: index.php:415
+#: index.php:416
 msgid "Contribute"
 msgstr "Принос"
 
-#: index.php:422
+#: index.php:423
 msgid "Get support"
 msgstr "Получаване на помощ"
 
-#: index.php:429
+#: index.php:430
 msgid "List of changes"
 msgstr "Списък с промени"
 
-#: index.php:451
+#: index.php:452
 msgid ""
 "You are connected as 'root' with no password, which corresponds to the "
 "default MySQL privileged account. Your MySQL server is running with this "
@@ -856,7 +858,7 @@ msgstr ""
 "отворен за хакерски атаки, наистина трябва да оправите тази дупка в "
 "сигурността като зададете парола на потребителя 'root'."
 
-#: index.php:468
+#: index.php:469
 msgid ""
 "You have enabled mbstring.func_overload in your PHP configuration. This "
 "option is incompatible with phpMyAdmin and might cause some data to be "
@@ -865,7 +867,7 @@ msgstr ""
 "Имате включено mbstring.func_overload в настройките на PHP. Тази опция е "
 "несъвместима с phpMyAdmin и може да причини повреда на данни!"
 
-#: index.php:483
+#: index.php:484
 msgid ""
 "The mbstring PHP extension was not found and you seem to be using a "
 "multibyte charset. Without the mbstring extension phpMyAdmin is unable to "
@@ -875,7 +877,7 @@ msgstr ""
 "символен набор. Без това разширение phpMyAdmin не може да разделя правилно "
 "низове и това може да доведе до неочаквани резултати."
 
-#: index.php:500
+#: index.php:501
 msgid ""
 "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini."
 "session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower than "
@@ -887,7 +889,7 @@ msgstr ""
 "отколкото валидността на бисквитката в phpMyAdmin. Поради това, Вашата сесия "
 "ще изтече по-бързо, отколкото е настройката в phpMyAdmin."
 
-#: index.php:519
+#: index.php:520
 msgid ""
 "Login cookie store is lower than cookie validity configured in phpMyAdmin, "
 "because of this, your login will expire sooner than configured in phpMyAdmin."
@@ -896,11 +898,11 @@ msgstr ""
 "PhpMyAdmin, защото от това, данните за вход ще изтече по-рано от "
 "конфигурирана в PhpMyAdmin."
 
-#: index.php:535
+#: index.php:536
 msgid "The configuration file now needs a secret passphrase (blowfish_secret)."
 msgstr "Конфигурационният файл има нужда от тайна фраза (blowfish_secret)."
 
-#: index.php:548
+#: index.php:549
 msgid ""
 "Directory [code]config[/code], which is used by the setup script, still "
 "exists in your phpMyAdmin directory. It is strongly recommended to remove it "
@@ -913,7 +915,7 @@ msgstr ""
 "на сървъра Ви е компрометирана, защото неоторозирани лица могат да свалят "
 "конфигурационните Ви файлове."
 
-#: index.php:564
+#: index.php:565
 #, php-format
 msgid ""
 "The phpMyAdmin configuration storage is not completely configured, some "
@@ -922,14 +924,14 @@ msgstr ""
 "Хранилището за конфигурации на phpMyAdmin е недобре настроено и някои "
 "разширени функции са деактивирани. За да разберете защо натиснете %sтук%s. "
 
-#: index.php:571
+#: index.php:572
 msgid ""
 "Or alternately go to 'Operations' tab of any database to set it up there."
 msgstr ""
 "Или отидете в раздела \"Операции\" на всяка база данни, за да го настроите "
 "там."
 
-#: index.php:620
+#: index.php:621
 #, php-format
 msgid ""
 "Your PHP MySQL library version %s differs from your MySQL server version %s. "
@@ -938,7 +940,7 @@ msgstr ""
 "Вашата версия на MySQL библиотеката (%s) се различава от инсталираната на "
 "MySQL сървъра версия (%s). Това може да доведе до неочаквани резултати."
 
-#: index.php:648
+#: index.php:649
 #, php-format
 msgid ""
 "Server running with Suhosin. Please refer to %sdocumentation%s for possible "
@@ -1082,8 +1084,8 @@ msgstr ""
 msgid "Save & Close"
 msgstr "Запис & затварянре"
 
-#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:404
-#: libraries/insert_edit.lib.php:1550 prefs_manage.php:361
+#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:415
+#: libraries/insert_edit.lib.php:1548 prefs_manage.php:361
 #: prefs_manage.php:372
 msgid "Reset"
 msgstr "Изчистване"
@@ -1116,7 +1118,7 @@ msgstr "Добавяне индекс"
 msgid "Edit Index"
 msgstr "Редактиране индекс"
 
-#: js/messages.php:99 templates/index_form.phtml:232
+#: js/messages.php:99 templates/table/index_form.phtml:232
 #, php-format
 msgid "Add %s column(s) to index"
 msgstr "Добавяне на %s колона(и) към индекса"
@@ -1137,13 +1139,14 @@ msgstr "Комбинация от:"
 msgid "Please select column(s) for the index."
 msgstr "Моля, изберете колони за индекса."
 
-#: js/messages.php:106 templates/structure/add_column.phtml:1
+#: js/messages.php:106 templates/table/structure/add_column.phtml:1
 msgid "You have to add at least one column."
 msgstr "Трябва да добавите поне една колона."
 
-#: js/messages.php:109 libraries/insert_edit.lib.php:1548
+#: js/messages.php:109 libraries/insert_edit.lib.php:1546
 #: templates/columns_definitions/column_definitions_form.phtml:162
-#: templates/index_form.phtml:237 templates/tbl_relation/common_form.phtml:106
+#: templates/table/index_form.phtml:237
+#: templates/table/relation/common_form.phtml:106
 msgid "Preview SQL"
 msgstr "Преглед на SQL"
 
@@ -1160,7 +1163,7 @@ msgid "SQL query:"
 msgstr "SQL заявка:"
 
 #. l10n: Default label for the y-Axis of Charts
-#: js/messages.php:118 templates/tbl_chart.phtml:109
+#: js/messages.php:118 templates/table/chart/tbl_chart.phtml:109
 msgid "Y Values"
 msgstr "Стойности на Y"
 
@@ -1321,7 +1324,7 @@ msgstr "Байта изпратени"
 msgid "Bytes received"
 msgstr "Байта получени"
 
-#: js/messages.php:169 libraries/server_status.lib.php:226
+#: js/messages.php:169 libraries/server_status.lib.php:235
 msgid "Connections"
 msgstr "Връзки"
 
@@ -1378,12 +1381,12 @@ msgstr "%d таблица(и)"
 msgid "Questions"
 msgstr "Запитвания"
 
-#: js/messages.php:184 libraries/server_status.lib.php:134
+#: js/messages.php:184 libraries/server_status.lib.php:143
 msgid "Traffic"
 msgstr "Трафик"
 
 #: js/messages.php:185 libraries/Menu.class.php:586
-#: libraries/Util.class.php:4318 libraries/server_status_monitor.lib.php:257
+#: libraries/Util.class.php:4324 libraries/server_status_monitor.lib.php:257
 msgid "Settings"
 msgstr "Настройки"
 
@@ -1403,8 +1406,9 @@ msgstr "Моля добавете поне една променлива към
 #: libraries/server_status_monitor.lib.php:236
 #: libraries/server_status_processes.lib.php:308
 #: templates/columns_definitions/transformation.phtml:4
-#: templates/designer/options_panel.phtml:178
-#: templates/table/options_zoom.phtml:12 templates/table/rows_zoom.phtml:26
+#: templates/database/designer/options_panel.phtml:178
+#: templates/table/search/options_zoom.phtml:12
+#: templates/table/search/rows_zoom.phtml:26
 msgid "None"
 msgstr "Няма"
 
@@ -1692,8 +1696,8 @@ msgstr ""
 
 #: js/messages.php:270 libraries/Menu.class.php:352
 #: libraries/Menu.class.php:455 libraries/Menu.class.php:582
-#: libraries/Util.class.php:4317 libraries/Util.class.php:4332
-#: libraries/Util.class.php:4349 libraries/config/messages.inc.php:258
+#: libraries/Util.class.php:4323 libraries/Util.class.php:4338
+#: libraries/Util.class.php:4355 libraries/config/messages.inc.php:258
 #: libraries/display_import.lib.php:105
 #: libraries/server_status_monitor.lib.php:318 prefs_manage.php:238
 #: setup/frames/menu.inc.php:26
@@ -1753,13 +1757,13 @@ msgid "Formatting SQL..."
 msgstr "Форматиране на SQL..."
 
 #: js/messages.php:293 libraries/server_variables.lib.php:157
-#: templates/designer/aggregate_query_panel.phtml:63
-#: templates/designer/delete_relation_panel.phtml:28
-#: templates/designer/having_query_panel.phtml:117
-#: templates/designer/new_relation_panel.phtml:88
-#: templates/designer/options_panel.phtml:253
-#: templates/designer/rename_to_panel.phtml:45
-#: templates/designer/where_query_panel.phtml:83
+#: templates/database/designer/aggregate_query_panel.phtml:63
+#: templates/database/designer/delete_relation_panel.phtml:28
+#: templates/database/designer/having_query_panel.phtml:117
+#: templates/database/designer/new_relation_panel.phtml:88
+#: templates/database/designer/options_panel.phtml:253
+#: templates/database/designer/rename_to_panel.phtml:45
+#: templates/database/designer/where_query_panel.phtml:83
 msgid "Cancel"
 msgstr "Отмяна"
 
@@ -1767,7 +1771,7 @@ msgstr "Отмяна"
 msgid "Page-related settings"
 msgstr "Страница-свързани настройки"
 
-#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:402
+#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:413
 msgid "Apply"
 msgstr "Прилагане"
 
@@ -1802,8 +1806,8 @@ msgstr "Код за грешка: %s"
 msgid "Error text: %s"
 msgstr "Текст на грешката: %s"
 
-#: js/messages.php:307 libraries/db_common.inc.php:68
-#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:450
+#: js/messages.php:307 libraries/db_common.inc.php:69
+#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:461
 msgid "No databases selected."
 msgstr "Няма избрани БД."
 
@@ -1815,12 +1819,13 @@ msgstr "Изтриване на колона"
 msgid "Adding Primary Key"
 msgstr "Добавяне на първичен ключ"
 
-#: js/messages.php:310 templates/designer/aggregate_query_panel.phtml:59
-#: templates/designer/having_query_panel.phtml:113
-#: templates/designer/new_relation_panel.phtml:87
-#: templates/designer/options_panel.phtml:252
-#: templates/designer/rename_to_panel.phtml:41
-#: templates/designer/where_query_panel.phtml:82
+#: js/messages.php:310
+#: templates/database/designer/aggregate_query_panel.phtml:59
+#: templates/database/designer/having_query_panel.phtml:113
+#: templates/database/designer/new_relation_panel.phtml:87
+#: templates/database/designer/options_panel.phtml:252
+#: templates/database/designer/rename_to_panel.phtml:41
+#: templates/database/designer/where_query_panel.phtml:82
 msgid "OK"
 msgstr "OK"
 
@@ -1840,7 +1845,7 @@ msgstr "Копиране БД"
 msgid "Changing Charset"
 msgstr "Промяна знаков набор"
 
-#: js/messages.php:320 libraries/Util.class.php:3217
+#: js/messages.php:320 libraries/Util.class.php:3223
 msgid "Enable foreign key checks"
 msgstr "Включване на проверките за външен ключ"
 
@@ -1875,20 +1880,21 @@ msgstr "Дефиницията на съхранена процедура тря
 #: js/messages.php:334 libraries/DisplayResults.class.php:4834
 #: libraries/DisplayResults.class.php:5092 libraries/Menu.class.php:344
 #: libraries/Menu.class.php:446 libraries/Menu.class.php:578
-#: libraries/Util.class.php:3636 libraries/Util.class.php:3637
-#: libraries/Util.class.php:4316 libraries/Util.class.php:4331
-#: libraries/Util.class.php:4348 libraries/config/messages.inc.php:252
+#: libraries/Util.class.php:3642 libraries/Util.class.php:3643
+#: libraries/Util.class.php:4322 libraries/Util.class.php:4337
+#: libraries/Util.class.php:4354 libraries/config/messages.inc.php:252
 #: libraries/display_export.lib.php:173 libraries/rte/rte_list.lib.php:146
 #: libraries/server_privileges.lib.php:2211
 #: libraries/server_privileges.lib.php:2290
 #: libraries/server_privileges.lib.php:2632
 #: libraries/server_privileges.lib.php:3356
 #: libraries/server_status_monitor.lib.php:322 prefs_manage.php:303
-#: setup/frames/menu.inc.php:27 templates/structure/check_all_tables.phtml:11
+#: setup/frames/menu.inc.php:27
+#: templates/database/structure/check_all_tables.phtml:11
 msgid "Export"
 msgstr "Експорт"
 
-#: js/messages.php:337 libraries/rte/rte_routines.lib.php:652
+#: js/messages.php:337 libraries/rte/rte_routines.lib.php:743
 msgid "ENUM/SET editor"
 msgstr "ENUM/SET редактор"
 
@@ -1927,7 +1933,7 @@ msgstr "Показване формата за заявки"
 #: libraries/Console.class.php:214 libraries/DisplayResults.class.php:3474
 #: libraries/DisplayResults.class.php:4818 libraries/Index.class.php:723
 #: libraries/Util.class.php:706 libraries/Util.class.php:1202
-#: libraries/Util.class.php:3634 libraries/Util.class.php:3635
+#: libraries/Util.class.php:3640 libraries/Util.class.php:3641
 #: libraries/central_columns.lib.php:851
 #: libraries/central_columns.lib.php:1193
 #: libraries/config/messages.inc.php:892
@@ -1945,7 +1951,7 @@ msgstr "Редакция"
 #: libraries/server_user_groups.lib.php:129
 #: libraries/sql_query_form.lib.php:416 libraries/tracking.lib.php:477
 #: setup/frames/index.inc.php:183 setup/frames/index.inc.php:291
-#: templates/designer/delete_relation_panel.phtml:27
+#: templates/database/designer/delete_relation_panel.phtml:27
 msgid "Delete"
 msgstr "Изтриване"
 
@@ -2116,11 +2122,11 @@ msgid "No dependencies selected!"
 msgstr "Няма избрани зависимости!"
 
 #: js/messages.php:394 libraries/central_columns.lib.php:1214
-#: libraries/insert_edit.lib.php:1458 libraries/server_variables.lib.php:155
+#: libraries/insert_edit.lib.php:1456 libraries/server_variables.lib.php:155
 #: setup/frames/config.inc.php:42 setup/frames/index.inc.php:279
 #: templates/columns_definitions/column_definitions_form.phtml:165
-#: templates/gis_visualization/gis_visualization.phtml:48
-#: templates/tbl_relation/common_form.phtml:107
+#: templates/table/gis_visualization/gis_visualization.phtml:48
+#: templates/table/relation/common_form.phtml:107
 msgid "Save"
 msgstr "Запазване"
 
@@ -2201,8 +2207,8 @@ msgid "Data point content"
 msgstr "Съдържание на точката с данни"
 
 #: js/messages.php:430 js/messages.php:562 js/messages.php:579
-#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2573
-#: templates/index_form.phtml:154 templates/index_form.phtml:194
+#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2571
+#: templates/table/index_form.phtml:154 templates/table/index_form.phtml:194
 msgid "Ignore"
 msgstr "Игнориране"
 
@@ -2263,8 +2269,8 @@ msgstr "Избор външен ключ"
 msgid "Please select the primary key or a unique key!"
 msgstr "Моля изберете главен или уникален ключ!"
 
-#: js/messages.php:457 templates/designer/side_menu.phtml:91
-#: templates/designer/side_menu.phtml:94
+#: js/messages.php:457 templates/database/designer/side_menu.phtml:91
+#: templates/database/designer/side_menu.phtml:94
 msgid "Choose column to display"
 msgstr "Изберете колона за показване"
 
@@ -2280,18 +2286,18 @@ msgstr ""
 msgid "Page name"
 msgstr "Име на страница"
 
-#: js/messages.php:463 templates/designer/side_menu.phtml:56
-#: templates/designer/side_menu.phtml:59
+#: js/messages.php:463 templates/database/designer/side_menu.phtml:56
+#: templates/database/designer/side_menu.phtml:59
 msgid "Save page"
 msgstr "Записване на страница"
 
-#: js/messages.php:464 templates/designer/side_menu.phtml:63
-#: templates/designer/side_menu.phtml:66
+#: js/messages.php:464 templates/database/designer/side_menu.phtml:63
+#: templates/database/designer/side_menu.phtml:66
 msgid "Save page as"
 msgstr "Записване на страница като"
 
-#: js/messages.php:465 templates/designer/side_menu.phtml:49
-#: templates/designer/side_menu.phtml:52
+#: js/messages.php:465 templates/database/designer/side_menu.phtml:49
+#: templates/database/designer/side_menu.phtml:52
 msgid "Open page"
 msgstr "Отвори страница"
 
@@ -2299,7 +2305,7 @@ msgstr "Отвори страница"
 msgid "Delete page"
 msgstr "Изтриване на страница"
 
-#: js/messages.php:467 templates/designer/side_menu.phtml:10
+#: js/messages.php:467 templates/database/designer/side_menu.phtml:10
 msgid "Untitled"
 msgstr "Неозаглавено"
 
@@ -2420,7 +2426,7 @@ msgstr "Първоначална дължина"
 msgid "cancel"
 msgstr "Отмяна"
 
-#: js/messages.php:499 libraries/server_status.lib.php:271
+#: js/messages.php:499 libraries/server_status.lib.php:280
 msgid "Aborted"
 msgstr "Прекъснати"
 
@@ -2993,7 +2999,7 @@ msgstr "Моля, въведете валиден HEX"
 
 #: js/messages.php:793 libraries/Message.class.php:199
 #: libraries/Util.class.php:654 libraries/core.lib.php:245
-#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1172
+#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1170
 #: tbl_operations.php:229 view_operations.php:63
 msgid "Error"
 msgstr "Грешка"
@@ -3054,8 +3060,8 @@ msgstr "на секунда"
 msgid "per minute"
 msgstr "на минута"
 
-#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:143
-#: libraries/server_status.lib.php:228
+#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:152
+#: libraries/server_status.lib.php:237
 #: libraries/server_status_queries.lib.php:98
 msgid "per hour"
 msgstr "на час"
@@ -3075,7 +3081,7 @@ msgstr ""
 "Неподходящи права на файлът с настройки, в него не трябва да може да пише "
 "всеки!"
 
-#: libraries/Config.class.php:1799
+#: libraries/Config.class.php:1801
 msgid "Font size"
 msgstr "Размер шрифт"
 
@@ -3103,10 +3109,10 @@ msgstr "Подзаявка"
 #: libraries/server_privileges.lib.php:2890
 #: libraries/server_privileges.lib.php:3144
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4332
+#: libraries/server_privileges.lib.php:4358
 #: libraries/server_status_processes.lib.php:80
-#: templates/tbl_relation/foreign_key_row.phtml:165
-#: templates/tbl_relation/internal_relational_row.phtml:55
+#: templates/table/relation/foreign_key_row.phtml:165
+#: templates/table/relation/internal_relational_row.phtml:55
 msgid "Database"
 msgstr "DB"
 
@@ -3199,11 +3205,11 @@ msgstr "SQL изтория"
 #: libraries/plugins/import/ImportMediawiki.class.php:60
 #: libraries/plugins/import/ImportOds.class.php:59
 #: libraries/plugins/import/ImportShp.class.php:57
-#: libraries/plugins/import/ImportSql.class.php:148
+#: libraries/plugins/import/ImportSql.class.php:51
 #: libraries/plugins/import/ImportXml.class.php:58
-#: libraries/rte/rte_routines.lib.php:833 templates/index_form.phtml:49
-#: templates/structure/row_stats_table.phtml:20
-#: templates/table/options.phtml:2
+#: libraries/rte/rte_routines.lib.php:924 templates/table/index_form.phtml:49
+#: templates/table/search/options.phtml:2
+#: templates/table/structure/row_stats_table.phtml:20
 msgid "Options"
 msgstr "Настройки"
 
@@ -3236,7 +3242,8 @@ msgstr "низходящо"
 msgid "Order:"
 msgstr "Поръчка:"
 
-#: libraries/Console.class.php:289 templates/table/replace_preview.phtml:17
+#: libraries/Console.class.php:289
+#: templates/table/search/replace_preview.phtml:17
 msgid "Count"
 msgstr "Броене"
 
@@ -3331,9 +3338,9 @@ msgstr "Превключи на тъмна палитра"
 #: libraries/operations.lib.php:794 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:191
-#: templates/structure/sortable_header.phtml:21
-#: templates/structure/sortable_header.phtml:38
-#: templates/table/options.phtml:68
+#: templates/database/structure/sortable_header.phtml:21
+#: templates/database/structure/sortable_header.phtml:38
+#: templates/table/search/options.phtml:68
 msgid "Ascending"
 msgstr "Възходящо"
 
@@ -3343,13 +3350,14 @@ msgstr "Възходящо"
 #: libraries/operations.lib.php:797 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:188
-#: templates/structure/sortable_header.phtml:26
-#: templates/structure/sortable_header.phtml:43
-#: templates/table/options.phtml:69
+#: templates/database/structure/sortable_header.phtml:26
+#: templates/database/structure/sortable_header.phtml:43
+#: templates/table/search/options.phtml:69
 msgid "Descending"
 msgstr "Низходящо"
 
-#: libraries/DBQbe.class.php:467 templates/table/search_and_replace.phtml:6
+#: libraries/DBQbe.class.php:467
+#: templates/table/search/search_and_replace.phtml:6
 msgid "Column:"
 msgstr "Колона:"
 
@@ -3514,12 +3522,12 @@ msgstr[0] "%1$s съвпадение в таблица <strong>%2$s</strong>"
 msgstr[1] "%1$s съвпадения в таблица <strong>%2$s</strong>"
 
 #: libraries/DbSearch.class.php:354 libraries/Menu.class.php:311
-#: libraries/Util.class.php:3337 libraries/Util.class.php:3347
-#: libraries/Util.class.php:3623 libraries/Util.class.php:3624
-#: libraries/Util.class.php:4343 libraries/config.values.php:43
+#: libraries/Util.class.php:3343 libraries/Util.class.php:3353
+#: libraries/Util.class.php:3629 libraries/Util.class.php:3630
+#: libraries/Util.class.php:4349 libraries/config.values.php:43
 #: libraries/config.values.php:51 libraries/config.values.php:119
 #: libraries/navigation/Nodes/Node_Table.class.php:295
-#: templates/structure/check_all_table_column.phtml:5
+#: templates/table/structure/check_all_table_column.phtml:5
 msgid "Browse"
 msgstr "Прелистване"
 
@@ -3536,7 +3544,8 @@ msgstr "Търсене в БД"
 msgid "Words or values to search for (wildcard: \"%\"):"
 msgstr "Думи или стойности за търсене (знак за заместване: \"%\"):"
 
-#: libraries/DbSearch.class.php:401 templates/table/search_and_replace.phtml:1
+#: libraries/DbSearch.class.php:401
+#: templates/table/search/search_and_replace.phtml:1
 msgid "Find:"
 msgstr "Намери:"
 
@@ -3584,28 +3593,28 @@ msgstr "Филтри"
 msgid "Search this table"
 msgstr "Търсене в БД"
 
-#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2532
-#: libraries/Util.class.php:2535
+#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2538
+#: libraries/Util.class.php:2541
 msgctxt "First page"
 msgid "Begin"
 msgstr "Начало"
 
-#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2533
-#: libraries/Util.class.php:2536 libraries/server_bin_log.lib.php:170
+#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2539
+#: libraries/Util.class.php:2542 libraries/server_bin_log.lib.php:170
 #: libraries/server_bin_log.lib.php:172
 msgctxt "Previous page"
 msgid "Previous"
 msgstr "Предна"
 
-#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2564
-#: libraries/Util.class.php:2574 libraries/server_bin_log.lib.php:204
+#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2570
+#: libraries/Util.class.php:2580 libraries/server_bin_log.lib.php:204
 #: libraries/server_bin_log.lib.php:206
 msgctxt "Next page"
 msgid "Next"
 msgstr "Следваща"
 
-#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2565
-#: libraries/Util.class.php:2575
+#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2571
+#: libraries/Util.class.php:2581
 msgctxt "Last page"
 msgid "End"
 msgstr "Последна"
@@ -3684,9 +3693,9 @@ msgid "May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]."
 msgstr "Може да има приблизителна стойност. Виж [doc@faq3-11]FAQ 3.11[/doc]"
 
 #: libraries/DisplayResults.class.php:4332 libraries/Message.class.php:180
-#: libraries/controllers/TableRelationController.class.php:258
+#: libraries/controllers/TableRelationController.class.php:259
 #: libraries/controllers/TableSearchController.class.php:655
-#: libraries/rte/rte_routines.lib.php:1332 libraries/sql_query_form.lib.php:89
+#: libraries/rte/rte_routines.lib.php:1423 libraries/sql_query_form.lib.php:89
 #: tbl_operations.php:227 tbl_row_action.php:138 view_operations.php:62
 #, fuzzy
 #| msgid "Your SQL query has been executed successfully."
@@ -3694,7 +3703,7 @@ msgid "Your SQL query has been executed successfully."
 msgstr "SQL заявката беше изпълнена успешно"
 
 #: libraries/DisplayResults.class.php:4660
-#: libraries/controllers/StructureController.class.php:629
+#: libraries/controllers/DatabaseStructureController.class.php:564
 #, php-format
 msgid ""
 "This view has at least this number of rows. Please refer to %sdocumentation"
@@ -3718,34 +3727,34 @@ msgstr ""
 msgid "%d total"
 msgstr "общо"
 
-#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1318
+#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1312
 #, fuzzy, php-format
 #| msgid "Query took %01.4f sec"
 msgid "Query took %01.4f seconds."
 msgstr "Заявката отне %01.4f секунди"
 
 #: libraries/DisplayResults.class.php:4807
-#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4767
-#: libraries/Util.class.php:4773 libraries/mult_submits.inc.php:50
-#: templates/structure/check_all_tables.phtml:2
-#: templates/structure/check_all_tables.phtml:9
+#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4773
+#: libraries/Util.class.php:4779 libraries/mult_submits.inc.php:50
+#: templates/database/structure/check_all_tables.phtml:2
+#: templates/database/structure/check_all_tables.phtml:9
 msgid "With selected:"
 msgstr "Когато има отметка:"
 
 #: libraries/DisplayResults.class.php:4811
-#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4769
-#: libraries/Util.class.php:4770 libraries/server_privileges.lib.php:1174
+#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4775
+#: libraries/Util.class.php:4776 libraries/server_privileges.lib.php:1174
 #: libraries/server_privileges.lib.php:1175
 #: libraries/server_privileges.lib.php:1387
 #: libraries/server_user_groups.lib.php:231
-#: templates/structure/check_all_tables.phtml:3
-#: templates/structure/check_all_tables.phtml:4
+#: templates/database/structure/check_all_tables.phtml:3
+#: templates/database/structure/check_all_tables.phtml:4
 msgid "Check All"
 msgstr "Маркиране всички"
 
 #: libraries/DisplayResults.class.php:4985 libraries/Header.class.php:383
-#: templates/structure/optional_action_links.phtml:1
-#: templates/structure/print_view_data_dictionary_link.phtml:3
+#: templates/database/structure/print_view_data_dictionary_link.phtml:3
+#: templates/table/structure/optional_action_links.phtml:1
 msgid "Print view"
 msgstr "Преглед за печат"
 
@@ -3753,7 +3762,8 @@ msgstr "Преглед за печат"
 msgid "Query results operations"
 msgstr "Операции с резултата от заявката"
 
-#: libraries/DisplayResults.class.php:5105 templates/tbl_chart.phtml:12
+#: libraries/DisplayResults.class.php:5105
+#: templates/table/chart/tbl_chart.phtml:12
 msgid "Display chart"
 msgstr "Диаграма"
 
@@ -3856,7 +3866,7 @@ msgid "Click on the bar to scroll to top of page"
 msgstr ""
 
 #: libraries/Header.class.php:749
-#: libraries/plugins/auth/AuthenticationCookie.class.php:152
+#: libraries/plugins/auth/AuthenticationCookie.class.php:140
 #, fuzzy
 #| msgid "Javascript must be enabled past this point"
 msgid "Javascript must be enabled past this point!"
@@ -3880,11 +3890,11 @@ msgid "Keyname"
 msgstr "Име на ключ"
 
 #: libraries/Index.class.php:697
-#: libraries/controllers/StructureController.class.php:1962
-#: libraries/controllers/StructureController.class.php:1967
+#: libraries/controllers/TableStructureController.class.php:953
+#: libraries/controllers/TableStructureController.class.php:958
 #: libraries/tracking.lib.php:973
 #: templates/columns_definitions/column_indexes.phtml:11
-#: templates/structure/check_all_table_column.phtml:26
+#: templates/table/structure/check_all_table_column.phtml:26
 msgid "Unique"
 msgstr "Уникално"
 
@@ -3903,16 +3913,17 @@ msgstr "Кардиналност"
 #: libraries/server_collations.lib.php:35 libraries/tracking.lib.php:881
 #: libraries/tracking.lib.php:977
 #: templates/columns_definitions/table_fields_definitions.phtml:33
-#: templates/structure/row_stats_table.phtml:31
-#: templates/structure/table_header.phtml:55
-#: templates/structure/table_structure_header.phtml:7
-#: templates/table/table_header.phtml:8
+#: templates/database/structure/table_header.phtml:55
+#: templates/table/search/table_header.phtml:8
+#: templates/table/structure/row_stats_table.phtml:31
+#: templates/table/structure/table_structure_header.phtml:7
 msgid "Collation"
 msgstr "Колация"
 
 #: libraries/Index.class.php:703 libraries/rte/rte_events.lib.php:496
-#: libraries/rte/rte_routines.lib.php:956 libraries/tracking.lib.php:885
-#: libraries/tracking.lib.php:979 templates/structure/table_header.phtml:84
+#: libraries/rte/rte_routines.lib.php:1047 libraries/tracking.lib.php:885
+#: libraries/tracking.lib.php:979
+#: templates/database/structure/table_header.phtml:84
 msgid "Comment"
 msgstr "Коментар"
 
@@ -3925,15 +3936,15 @@ msgstr "Главният ключ беше изтрит."
 msgid "Index %s has been dropped."
 msgstr "Индекс %s беше изтрит."
 
-#: libraries/Index.class.php:757 libraries/Util.class.php:3630
-#: libraries/Util.class.php:3631
-#: libraries/controllers/StructureController.class.php:1958
-#: libraries/controllers/StructureController.class.php:1959
+#: libraries/Index.class.php:757 libraries/Util.class.php:3636
+#: libraries/Util.class.php:3637
+#: libraries/controllers/TableStructureController.class.php:949
+#: libraries/controllers/TableStructureController.class.php:950
 #: libraries/operations.lib.php:1607 libraries/rte/rte_list.lib.php:150
 #: libraries/server_databases.lib.php:146
-#: templates/structure/check_all_table_column.phtml:15
-#: templates/structure/check_all_tables.phtml:16
-#: templates/tbl_relation/foreign_key_row.phtml:93
+#: templates/database/structure/check_all_tables.phtml:16
+#: templates/table/relation/foreign_key_row.phtml:93
+#: templates/table/structure/check_all_table_column.phtml:15
 msgid "Drop"
 msgstr "Изтриване"
 
@@ -3964,16 +3975,16 @@ msgstr "Сървър"
 #: libraries/Menu.class.php:248
 #: libraries/navigation/Nodes/Node_View.class.php:32
 #: libraries/tbl_info.inc.php:63
-#: templates/structure/structure_table_row.phtml:97
-#: templates/structure/structure_table_row.phtml:159
+#: templates/database/structure/structure_table_row.phtml:97
+#: templates/database/structure/structure_table_row.phtml:159
 msgid "View"
 msgstr "Изглед"
 
 #: libraries/Menu.class.php:325 libraries/Menu.class.php:429
-#: libraries/Menu.class.php:548 libraries/Util.class.php:3334
-#: libraries/Util.class.php:3344 libraries/Util.class.php:3350
-#: libraries/Util.class.php:4313 libraries/Util.class.php:4328
-#: libraries/Util.class.php:4345 libraries/config.values.php:40
+#: libraries/Menu.class.php:548 libraries/Util.class.php:3340
+#: libraries/Util.class.php:3350 libraries/Util.class.php:3356
+#: libraries/Util.class.php:4319 libraries/Util.class.php:4334
+#: libraries/Util.class.php:4351 libraries/config.values.php:40
 #: libraries/config.values.php:48 libraries/config.values.php:110
 #: libraries/config.values.php:116 libraries/config/messages.inc.php:321
 #: libraries/navigation/Nodes/Node_Table.class.php:292
@@ -3981,19 +3992,19 @@ msgid "SQL"
 msgstr "SQL"
 
 #: libraries/Menu.class.php:328 libraries/Menu.class.php:432
-#: libraries/Util.class.php:3335 libraries/Util.class.php:3345
-#: libraries/Util.class.php:3351 libraries/Util.class.php:3625
-#: libraries/Util.class.php:3626 libraries/Util.class.php:4329
-#: libraries/Util.class.php:4346 libraries/config.values.php:41
+#: libraries/Util.class.php:3341 libraries/Util.class.php:3351
+#: libraries/Util.class.php:3357 libraries/Util.class.php:3631
+#: libraries/Util.class.php:3632 libraries/Util.class.php:4335
+#: libraries/Util.class.php:4352 libraries/config.values.php:41
 #: libraries/config.values.php:49 libraries/config.values.php:111
 #: libraries/config.values.php:117
 #: libraries/navigation/Nodes/Node_Table.class.php:286
 msgid "Search"
 msgstr "Търсене"
 
-#: libraries/Menu.class.php:338 libraries/Util.class.php:3336
-#: libraries/Util.class.php:3346 libraries/Util.class.php:3627
-#: libraries/Util.class.php:3628 libraries/Util.class.php:4347
+#: libraries/Menu.class.php:338 libraries/Util.class.php:3342
+#: libraries/Util.class.php:3352 libraries/Util.class.php:3633
+#: libraries/Util.class.php:3634 libraries/Util.class.php:4353
 #: libraries/config.values.php:42 libraries/config.values.php:50
 #: libraries/config.values.php:118
 #: libraries/navigation/Nodes/Node_Table.class.php:289
@@ -4002,30 +4013,30 @@ msgid "Insert"
 msgstr "Вмъкване"
 
 #: libraries/Menu.class.php:362 libraries/Menu.class.php:467
-#: libraries/Util.class.php:4334 libraries/Util.class.php:4350
+#: libraries/Util.class.php:4340 libraries/Util.class.php:4356
 #: libraries/config.values.php:106 libraries/server_common.lib.php:51
 #: libraries/server_privileges.lib.php:2370
 #: libraries/server_privileges.lib.php:3158
-#: libraries/server_privileges.lib.php:4221
+#: libraries/server_privileges.lib.php:4247
 msgid "Privileges"
 msgstr "Права"
 
 #: libraries/Menu.class.php:371 libraries/Menu.class.php:379
-#: libraries/Menu.class.php:459 libraries/Util.class.php:3338
-#: libraries/Util.class.php:3352 libraries/Util.class.php:4333
-#: libraries/Util.class.php:4351 libraries/config.values.php:112
+#: libraries/Menu.class.php:459 libraries/Util.class.php:3344
+#: libraries/Util.class.php:3358 libraries/Util.class.php:4339
+#: libraries/Util.class.php:4357 libraries/config.values.php:112
 #: view_operations.php:92
 msgid "Operations"
 msgstr "Операции"
 
 #: libraries/Menu.class.php:384 libraries/Menu.class.php:492
-#: libraries/Util.class.php:4338 libraries/Util.class.php:4352
+#: libraries/Util.class.php:4344 libraries/Util.class.php:4358
 #: libraries/relation.lib.php:255
 msgid "Tracking"
 msgstr "Проследяване"
 
 #: libraries/Menu.class.php:397 libraries/Menu.class.php:486
-#: libraries/Util.class.php:4337 libraries/Util.class.php:4353
+#: libraries/Util.class.php:4343 libraries/Util.class.php:4359
 #: libraries/navigation/Nodes/Node_Trigger_Container.class.php:24
 #: libraries/plugins/export/ExportHtmlword.class.php:557
 #: libraries/plugins/export/ExportOdt.class.php:685
@@ -4042,16 +4053,16 @@ msgstr "Тригери"
 msgid "Database seems to be empty!"
 msgstr "БД изглежда празна!"
 
-#: libraries/Menu.class.php:439 libraries/Util.class.php:4330
+#: libraries/Menu.class.php:439 libraries/Util.class.php:4336
 msgid "Query"
 msgstr "Заявка по пример"
 
-#: libraries/Menu.class.php:472 libraries/Util.class.php:4335
+#: libraries/Menu.class.php:472 libraries/Util.class.php:4341
 #: libraries/rte/rte_words.lib.php:36
 msgid "Routines"
 msgstr "Процедури"
 
-#: libraries/Menu.class.php:479 libraries/Util.class.php:4336
+#: libraries/Menu.class.php:479 libraries/Util.class.php:4342
 #: libraries/navigation/Nodes/Node_Event_Container.class.php:26
 #: libraries/plugins/export/ExportSql.class.php:940
 #: libraries/plugins/export/ExportXml.class.php:107
@@ -4059,22 +4070,22 @@ msgstr "Процедури"
 msgid "Events"
 msgstr "Събития"
 
-#: libraries/Menu.class.php:498 libraries/Util.class.php:4339
+#: libraries/Menu.class.php:498 libraries/Util.class.php:4345
 msgid "Designer"
 msgstr "Строител"
 
-#: libraries/Menu.class.php:507 libraries/Util.class.php:4340
-#: templates/structure/check_all_tables.phtml:35
+#: libraries/Menu.class.php:507 libraries/Util.class.php:4346
+#: templates/database/structure/check_all_tables.phtml:35
 #, fuzzy
 #| msgid "Textarea columns"
 msgid "Central columns"
 msgstr "Колони в текство поле"
 
-#: libraries/Menu.class.php:544 libraries/Util.class.php:4312
+#: libraries/Menu.class.php:544 libraries/Util.class.php:4318
 #: libraries/config.values.php:103 libraries/config/messages.inc.php:266
 #: libraries/config/messages.inc.php:341
 #: libraries/navigation/NavigationTree.class.php:1239
-#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4332
+#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4358
 msgid "Databases"
 msgstr "БД"
 
@@ -4085,34 +4096,34 @@ msgid "User accounts"
 msgstr "Потребители"
 
 #: libraries/Menu.class.php:595 libraries/ServerStatusData.class.php:121
-#: libraries/Util.class.php:4319 libraries/server_common.lib.php:36
+#: libraries/Util.class.php:4325 libraries/server_common.lib.php:36
 msgid "Binary log"
 msgstr "Двоичен дневник"
 
 #: libraries/Menu.class.php:601 libraries/ServerStatusData.class.php:126
-#: libraries/Util.class.php:4320 libraries/server_common.lib.php:42
-#: templates/structure/body_for_table_summary.phtml:10
-#: templates/structure/table_header.phtml:27
+#: libraries/Util.class.php:4326 libraries/server_common.lib.php:42
+#: templates/database/structure/body_for_table_summary.phtml:10
+#: templates/database/structure/table_header.phtml:27
 msgid "Replication"
 msgstr "Репликация"
 
 #: libraries/Menu.class.php:606 libraries/ServerStatusData.class.php:193
-#: libraries/Util.class.php:4321 libraries/config.values.php:105
+#: libraries/Util.class.php:4327 libraries/config.values.php:105
 #: libraries/server_engines.lib.php:108 libraries/server_engines.lib.php:112
 #: libraries/sql_query_form.lib.php:421
 msgid "Variables"
 msgstr "Променливи"
 
-#: libraries/Menu.class.php:610 libraries/Util.class.php:4322
+#: libraries/Menu.class.php:610 libraries/Util.class.php:4328
 msgid "Charsets"
 msgstr "Знакови набори"
 
-#: libraries/Menu.class.php:615 libraries/Util.class.php:4323
+#: libraries/Menu.class.php:615 libraries/Util.class.php:4329
 #: libraries/server_common.lib.php:33 libraries/server_plugins.lib.php:27
 msgid "Plugins"
 msgstr "Добавки"
 
-#: libraries/Menu.class.php:626 libraries/Util.class.php:4324
+#: libraries/Menu.class.php:626 libraries/Util.class.php:4330
 msgid "Engines"
 msgstr "Хранилища"
 
@@ -4137,7 +4148,7 @@ msgid_plural "%1$d rows inserted."
 msgstr[0] "%1$d ред добавен."
 msgstr[1] "%1$d реда добавени."
 
-#: libraries/PDF.class.php:70 libraries/Util.class.php:2521
+#: libraries/PDF.class.php:70 libraries/Util.class.php:2527
 #: libraries/browse_foreigners.lib.php:327
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:865
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:890
@@ -4162,7 +4173,7 @@ msgid "Could not save favorite table!"
 msgstr "Наскоро отваряната таблице не можа да бъде записана"
 
 #: libraries/RecentFavoriteTable.class.php:212
-#: templates/structure/favorite_anchor.phtml:12
+#: templates/database/structure/favorite_anchor.phtml:12
 #, fuzzy
 #| msgid "Remove chart"
 msgid "Remove from Favorites"
@@ -4345,7 +4356,7 @@ msgid ""
 msgstr "Няма детайлна информация за състоянието на това хранилище на данни."
 
 #: libraries/StorageEngine.class.php:373
-#: templates/structure/body_for_table_summary.phtml:50
+#: templates/database/structure/body_for_table_summary.phtml:50
 #, php-format
 msgid "%s is the default storage engine on this MySQL server."
 msgstr "%s е хранилището на данни по подразбиране на този MySQL сървър."
@@ -4775,10 +4786,10 @@ msgstr ""
 
 #: libraries/Util.class.php:726 libraries/rte/rte_events.lib.php:110
 #: libraries/rte/rte_events.lib.php:119 libraries/rte/rte_events.lib.php:150
-#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:153
-#: libraries/rte/rte_routines.lib.php:162
-#: libraries/rte/rte_routines.lib.php:235
-#: libraries/rte/rte_routines.lib.php:1366
+#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:223
+#: libraries/rte/rte_routines.lib.php:250
+#: libraries/rte/rte_routines.lib.php:372
+#: libraries/rte/rte_routines.lib.php:1457
 #: libraries/rte/rte_triggers.lib.php:86 libraries/rte/rte_triggers.lib.php:95
 #: libraries/rte/rte_triggers.lib.php:127
 msgid "MySQL said: "
@@ -4824,77 +4835,80 @@ msgstr "нд"
 msgid "%B %d, %Y at %I:%M %p"
 msgstr "%e %B %Y в %H:%M"
 
-#: libraries/Util.class.php:2019
+#: libraries/Util.class.php:2025
 #, php-format
 msgid "%s days, %s hours, %s minutes and %s seconds"
 msgstr "%s дена, %s часа, %s минути и %s секунди"
 
-#: libraries/Util.class.php:2112
+#: libraries/Util.class.php:2118
 msgid "Missing parameter:"
 msgstr "Липсващ параметър:"
 
-#: libraries/Util.class.php:2645
+#: libraries/Util.class.php:2651
 #, php-format
 msgid "Jump to database \"%s\"."
 msgstr "Показване БД \"%s\"."
 
-#: libraries/Util.class.php:2670
+#: libraries/Util.class.php:2676
 #, php-format
 msgid "The %s functionality is affected by a known bug, see %s"
 msgstr "Функционалността %s се влияе от известен дефект, виж %s"
 
-#: libraries/Util.class.php:2881
+#: libraries/Util.class.php:2887
 msgid "Click to toggle"
 msgstr "Щракване за превключване"
 
-#: libraries/Util.class.php:3542 prefs_manage.php:248
+#: libraries/Util.class.php:3548 prefs_manage.php:248
 msgid "Browse your computer:"
 msgstr "Разглеждане на компютъра:"
 
-#: libraries/Util.class.php:3567
+#: libraries/Util.class.php:3573
 #, php-format
 msgid "Select from the web server upload directory <b>%s</b>:"
 msgstr "Избор от директорията за качване <b>%s</b>:"
 
-#: libraries/Util.class.php:3596 libraries/insert_edit.lib.php:1173
+#: libraries/Util.class.php:3602 libraries/insert_edit.lib.php:1171
 msgid "The directory you set for upload work cannot be reached."
 msgstr "Папката, която сте указали за качване е недостъпна."
 
-#: libraries/Util.class.php:3607
+#: libraries/Util.class.php:3613
 #, fuzzy
 #| msgid "There are no files to upload"
 msgid "There are no files to upload!"
 msgstr "Няма файлве за качване"
 
-#: libraries/Util.class.php:3632 libraries/Util.class.php:3633
-#: templates/structure/check_all_tables.phtml:15
+#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: templates/database/structure/check_all_tables.phtml:15
 msgid "Empty"
 msgstr "Изчистване"
 
-#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: libraries/Util.class.php:3644 libraries/Util.class.php:3645
 msgid "Execute"
 msgstr "Изпълнение"
 
-#: libraries/Util.class.php:4152
+#: libraries/Util.class.php:4158
 msgid "Print"
 msgstr "Печат"
 
-#: libraries/Util.class.php:4257 templates/structure/row_stats_table.phtml:80
-#: templates/structure/table_header.phtml:95
+#: libraries/Util.class.php:4263
+#: templates/database/structure/table_header.phtml:95
+#: templates/table/structure/row_stats_table.phtml:80
 msgid "Creation"
 msgstr "Дата на създаване"
 
-#: libraries/Util.class.php:4263 templates/structure/row_stats_table.phtml:87
-#: templates/structure/table_header.phtml:106
+#: libraries/Util.class.php:4269
+#: templates/database/structure/table_header.phtml:106
+#: templates/table/structure/row_stats_table.phtml:87
 msgid "Last update"
 msgstr "Последно обновление"
 
-#: libraries/Util.class.php:4269 templates/structure/row_stats_table.phtml:94
-#: templates/structure/table_header.phtml:117
+#: libraries/Util.class.php:4275
+#: templates/database/structure/table_header.phtml:117
+#: templates/table/structure/row_stats_table.phtml:94
 msgid "Last check"
 msgstr "Последна проверка"
 
-#: libraries/Util.class.php:4315
+#: libraries/Util.class.php:4321
 msgid "Users"
 msgstr "Потребители"
 
@@ -4917,16 +4931,16 @@ msgid "Use this value"
 msgstr "Използване тази стойност"
 
 #: libraries/build_html_for_db.lib.php:33 libraries/import.lib.php:193
-#: templates/structure/actions_in_table_structure.phtml:113
-#: templates/structure/row_stats_table.phtml:42
-#: templates/structure/table_header.phtml:36
+#: templates/database/structure/table_header.phtml:36
+#: templates/table/structure/actions_in_table_structure.phtml:113
+#: templates/table/structure/row_stats_table.phtml:42
 msgid "Rows"
 msgstr "Редове"
 
 #: libraries/build_html_for_db.lib.php:48 libraries/engines/innodb.lib.php:171
-#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:186
-#: libraries/server_status.lib.php:298
-#: templates/structure/display_table_stats.phtml:40
+#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:195
+#: libraries/server_status.lib.php:307
+#: templates/table/structure/display_table_stats.phtml:40
 msgid "Total"
 msgstr "Общо"
 
@@ -4935,10 +4949,12 @@ msgid "Jump to database"
 msgstr "Прескачане до БД"
 
 #: libraries/build_html_for_db.lib.php:146
+#: templates/database/structure/structure_table_row.phtml:15
 msgid "Not replicated"
 msgstr "Нереплицирана"
 
 #: libraries/build_html_for_db.lib.php:158
+#: templates/database/structure/structure_table_row.phtml:16
 msgid "Replicated"
 msgstr "Реплицирана"
 
@@ -4995,17 +5011,17 @@ msgstr ""
 #: libraries/plugins/export/ExportTexytext.class.php:425
 #: libraries/plugins/export/PMA_ExportPdf.class.php:307
 #: libraries/rte/rte_list.lib.php:73 libraries/rte/rte_list.lib.php:85
-#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:830
-#: libraries/rte/rte_routines.lib.php:1492 setup/frames/index.inc.php:162
+#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:921
+#: libraries/rte/rte_routines.lib.php:1583 setup/frames/index.inc.php:162
 #: templates/columns_definitions/table_fields_definitions.phtml:8
-#: templates/structure/table_structure_header.phtml:5
-#: templates/table/create_table.phtml:11
+#: templates/database/create_table.phtml:11
+#: templates/table/structure/table_structure_header.phtml:5
 msgid "Name"
 msgstr "Име"
 
 #: libraries/central_columns.lib.php:699
 #: libraries/central_columns.lib.php:1381
-#: libraries/rte/rte_routines.lib.php:832
+#: libraries/rte/rte_routines.lib.php:923
 #: templates/columns_definitions/table_fields_definitions.phtml:14
 msgid "Length/Values"
 msgstr "Дължина/Стойности"
@@ -5028,7 +5044,7 @@ msgid "Select a table"
 msgstr "Избор на таблици"
 
 #: libraries/central_columns.lib.php:804
-#: templates/structure/add_column.phtml:4
+#: templates/table/structure/add_column.phtml:4
 msgid "Add column"
 msgstr "Добавяне колона"
 
@@ -5048,7 +5064,7 @@ msgstr "Добавяне колона"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1002
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1025
 #: templates/columns_definitions/table_fields_definitions.phtml:36
-#: templates/structure/table_structure_header.phtml:8
+#: templates/table/structure/table_structure_header.phtml:8
 msgid "Attributes"
 msgstr "Атрибути"
 
@@ -5168,7 +5184,7 @@ msgid "Double click"
 msgstr ""
 
 #: libraries/config.values.php:95 libraries/config.values.php:124
-#: libraries/config/FormDisplay.tpl.php:221 libraries/relation.lib.php:97
+#: libraries/config/FormDisplay.tpl.php:232 libraries/relation.lib.php:97
 #: libraries/relation.lib.php:105
 msgid "Disabled"
 msgstr "Забранено"
@@ -5359,21 +5375,21 @@ msgstr "експортът не работи, липсваща функцион
 msgid "maximum %s"
 msgstr "най-много %s"
 
-#: libraries/config/FormDisplay.tpl.php:219
+#: libraries/config/FormDisplay.tpl.php:230
 msgid "This setting is disabled, it will not be applied to your configuration."
 msgstr "Тази настройка е забранена, тя няма да влияе на конфигурацията."
 
-#: libraries/config/FormDisplay.tpl.php:313
+#: libraries/config/FormDisplay.tpl.php:324
 #, php-format
 msgid "Set value: %s"
 msgstr "Стойност: %s"
 
-#: libraries/config/FormDisplay.tpl.php:318
+#: libraries/config/FormDisplay.tpl.php:329
 #: libraries/config/messages.inc.php:610
 msgid "Restore default value"
 msgstr "Стойност по подразбиране"
 
-#: libraries/config/FormDisplay.tpl.php:332
+#: libraries/config/FormDisplay.tpl.php:343
 msgid "Allow users to customize this value"
 msgstr "Позволение на потребители да променят стойността"
 
@@ -5902,7 +5918,7 @@ msgstr "Знаков набор на файла"
 
 #: libraries/config/messages.inc.php:136 libraries/config/messages.inc.php:152
 #: libraries/sql_query_form.lib.php:247
-#: templates/structure/row_stats_table.phtml:7
+#: templates/table/structure/row_stats_table.phtml:7
 msgid "Format"
 msgstr "Формат"
 
@@ -6493,7 +6509,7 @@ msgstr ""
 
 #: libraries/config/messages.inc.php:332
 #: libraries/plugins/export/ExportPdf.class.php:279
-#: templates/structure/secondary_tabs.phtml:8
+#: templates/table/secondary_tabs.phtml:8
 msgid "Table structure"
 msgstr "Структура на таблица"
 
@@ -8285,104 +8301,35 @@ msgstr "Microsoft Word 2000"
 msgid "OpenDocument Text"
 msgstr "Open Document Text"
 
-#: libraries/controllers/StructureController.class.php:465
+#: libraries/controllers/DatabaseStructureController.class.php:405
 #: tbl_operations.php:382
 #, php-format
 msgid "Table %s has been emptied."
 msgstr "Таблицата %s беше изчистена."
 
-#: libraries/controllers/StructureController.class.php:486
+#: libraries/controllers/DatabaseStructureController.class.php:426
 #: tbl_operations.php:400 view_operations.php:119
 #, fuzzy, php-format
 #| msgid "View %s has been dropped."
 msgid "View %s has been dropped."
 msgstr "Изглед %s беше изтрит"
 
-#: libraries/controllers/StructureController.class.php:487
+#: libraries/controllers/DatabaseStructureController.class.php:427
 #: tbl_operations.php:401
 #, fuzzy, php-format
 #| msgid "Table %s has been dropped."
 msgid "Table %s has been dropped."
 msgstr "Таблицата %s беше изтрита"
 
-#: libraries/controllers/StructureController.class.php:797
-#, php-format
-msgid "The name '%s' is a MySQL reserved keyword."
-msgid_plural "The names '%s' are MySQL reserved keywords."
-msgstr[0] ""
-msgstr[1] ""
-
-#: libraries/controllers/StructureController.class.php:875
-msgid "No column selected."
-msgstr "Няма избрана колона."
-
-#: libraries/controllers/StructureController.class.php:1049
+#: libraries/controllers/DatabaseStructureController.class.php:733
 msgid "Favorite List is full!"
 msgstr "Листа с фаворитите е пълен!"
 
-#: libraries/controllers/StructureController.class.php:1272
-msgid "The columns have been moved successfully."
-msgstr "Колоните бяха преместени упешно."
-
-#: libraries/controllers/StructureController.class.php:1535
-#, fuzzy, php-format
-#| msgid "Table %1$s has been altered successfully."
-msgid ""
-"Table %1$s has been altered successfully. Privileges have been adjusted."
-msgstr "Таблицата %1$s беше променена."
-
-#: libraries/controllers/StructureController.class.php:1541
-#: libraries/controllers/TableIndexesController.class.php:161
-#: tbl_addfield.php:92
-#, php-format
-msgid "Table %1$s has been altered successfully."
-msgstr "Таблицата %1$s беше променена."
-
-#: libraries/controllers/StructureController.class.php:1588
-#: libraries/tracking.lib.php:1094
-msgid "Query error"
-msgstr "Грешка в заявката"
-
-#: libraries/controllers/StructureController.class.php:1806
+#: libraries/controllers/DatabaseStructureController.class.php:947
 #: libraries/mysql_charsets.lib.php:366 libraries/mysql_charsets.lib.php:373
 msgid "unknown"
 msgstr "непознат"
 
-#: libraries/controllers/StructureController.class.php:1957
-#: templates/structure/check_all_table_column.phtml:11
-msgid "Change"
-msgstr "Промяна"
-
-#: libraries/controllers/StructureController.class.php:1961
-#: libraries/controllers/StructureController.class.php:1966
-#: libraries/navigation/Nodes/Node_Index.class.php:30
-#: libraries/tracking.lib.php:926
-#: templates/columns_definitions/column_indexes.phtml:16
-#: templates/columns_definitions/table_fields_definitions.phtml:57
-#: templates/structure/check_all_table_column.phtml:30
-#: templates/structure/display_structure.phtml:79
-#: templates/structure/display_table_stats.phtml:19
-msgid "Index"
-msgstr "Индекс"
-
-#: libraries/controllers/StructureController.class.php:1963
-#: libraries/controllers/StructureController.class.php:1968
-#: templates/columns_definitions/column_indexes.phtml:27
-#: templates/structure/check_all_table_column.phtml:37
-msgid "Spatial"
-msgstr "Пространствен"
-
-#: libraries/controllers/StructureController.class.php:1964
-#: libraries/controllers/StructureController.class.php:1969
-#: templates/columns_definitions/column_indexes.phtml:22
-#: templates/structure/check_all_table_column.phtml:47
-msgid "Fulltext"
-msgstr "Пълнотекстово"
-
-#: libraries/controllers/StructureController.class.php:1970
-msgid "Distinct values"
-msgstr "Уникални стойности"
-
 #: libraries/controllers/TableChartController.class.php:82
 #: libraries/controllers/TableGisVisualizationController.class.php:101
 msgid "No SQL query was set to fetch data."
@@ -8398,13 +8345,20 @@ msgstr ""
 msgid "No data to display"
 msgstr "Няма данни"
 
-#: libraries/controllers/TableRelationController.class.php:217
+#: libraries/controllers/TableIndexesController.class.php:161
+#: libraries/controllers/TableStructureController.class.php:736
+#: tbl_addfield.php:92
+#, php-format
+msgid "Table %1$s has been altered successfully."
+msgstr "Таблицата %1$s беше променена."
+
+#: libraries/controllers/TableRelationController.class.php:218
 #, fuzzy
 #| msgid "Thread %s was successfully killed."
 msgid "Display column was successfully updated."
 msgstr "Нишка %s беше успешно спряна."
 
-#: libraries/controllers/TableRelationController.class.php:283
+#: libraries/controllers/TableRelationController.class.php:288
 #, fuzzy
 #| msgid "Internal relation added"
 msgid "Internal relations were successfully updated."
@@ -8423,12 +8377,74 @@ msgid "Zoom search"
 msgstr "Търсене в област"
 
 #: libraries/controllers/TableSearchController.class.php:852
-#: templates/table/selection_form.phtml:59
+#: templates/table/search/selection_form.phtml:59
 #, fuzzy
 #| msgid "Hide find and replace criteria"
 msgid "Find and replace"
 msgstr "Скриване параметрите за търсене и заместване"
 
+#: libraries/controllers/TableStructureController.class.php:163
+#, php-format
+msgid "The name '%s' is a MySQL reserved keyword."
+msgid_plural "The names '%s' are MySQL reserved keywords."
+msgstr[0] ""
+msgstr[1] ""
+
+#: libraries/controllers/TableStructureController.class.php:241
+msgid "No column selected."
+msgstr "Няма избрана колона."
+
+#: libraries/controllers/TableStructureController.class.php:467
+msgid "The columns have been moved successfully."
+msgstr "Колоните бяха преместени упешно."
+
+#: libraries/controllers/TableStructureController.class.php:730
+#, fuzzy, php-format
+#| msgid "Table %1$s has been altered successfully."
+msgid ""
+"Table %1$s has been altered successfully. Privileges have been adjusted."
+msgstr "Таблицата %1$s беше променена."
+
+#: libraries/controllers/TableStructureController.class.php:783
+#: libraries/tracking.lib.php:1094
+msgid "Query error"
+msgstr "Грешка в заявката"
+
+#: libraries/controllers/TableStructureController.class.php:948
+#: templates/table/structure/check_all_table_column.phtml:11
+msgid "Change"
+msgstr "Промяна"
+
+#: libraries/controllers/TableStructureController.class.php:952
+#: libraries/controllers/TableStructureController.class.php:957
+#: libraries/navigation/Nodes/Node_Index.class.php:30
+#: libraries/tracking.lib.php:926
+#: templates/columns_definitions/column_indexes.phtml:16
+#: templates/columns_definitions/table_fields_definitions.phtml:57
+#: templates/table/structure/check_all_table_column.phtml:30
+#: templates/table/structure/display_structure.phtml:79
+#: templates/table/structure/display_table_stats.phtml:19
+msgid "Index"
+msgstr "Индекс"
+
+#: libraries/controllers/TableStructureController.class.php:954
+#: libraries/controllers/TableStructureController.class.php:959
+#: templates/columns_definitions/column_indexes.phtml:27
+#: templates/table/structure/check_all_table_column.phtml:37
+msgid "Spatial"
+msgstr "Пространствен"
+
+#: libraries/controllers/TableStructureController.class.php:955
+#: libraries/controllers/TableStructureController.class.php:960
+#: templates/columns_definitions/column_indexes.phtml:22
+#: templates/table/structure/check_all_table_column.phtml:47
+msgid "Fulltext"
+msgstr "Пълнотекстово"
+
+#: libraries/controllers/TableStructureController.class.php:963
+msgid "Distinct values"
+msgstr "Уникални стойности"
+
 #: libraries/core.lib.php:306
 #, php-format
 msgid "The %s extension is missing. Please check your PHP configuration."
@@ -8477,7 +8493,7 @@ msgid "No Password"
 msgstr "Без парола"
 
 #: libraries/display_change_password.lib.php:68
-#: libraries/plugins/auth/AuthenticationCookie.class.php:199
+#: libraries/plugins/auth/AuthenticationCookie.class.php:187
 #: libraries/replication_gui.lib.php:422 libraries/replication_gui.lib.php:862
 #: libraries/server_privileges.lib.php:1640
 msgid "Password:"
@@ -9243,12 +9259,12 @@ msgid "Dump has been saved to file %s."
 msgstr "Схемата беше запазена във файл %s."
 
 #: libraries/import.lib.php:202 libraries/insert_edit.lib.php:124
-#: libraries/rte/rte_routines.lib.php:1353 libraries/sql.lib.php:1312
+#: libraries/rte/rte_routines.lib.php:1444 libraries/sql.lib.php:1306
 #: tbl_get_field.php:44
 msgid "MySQL returned an empty result set (i.e. zero rows)."
 msgstr "MySQL върна празен резултат (т.е. нула редове)."
 
-#: libraries/import.lib.php:265 libraries/sql.lib.php:1326
+#: libraries/import.lib.php:265 libraries/sql.lib.php:1320
 msgid "[ROLLBACK occurred.]"
 msgstr ""
 
@@ -9312,14 +9328,14 @@ msgstr "Създаване на индекс върху &nbsp;%s&nbsp;колон
 
 #: libraries/insert_edit.lib.php:233
 #: libraries/navigation/Nodes/Node_DatabaseChild.class.php:48
-#: templates/designer/table_list.phtml:40
+#: templates/database/designer/table_list.phtml:40
 msgid "Hide"
 msgstr "Скриване"
 
 #: libraries/insert_edit.lib.php:249
 #: libraries/navigation/Nodes/Node_Function.class.php:32
-#: libraries/rte/rte_routines.lib.php:1495
-#: templates/table/table_header.phtml:4
+#: libraries/rte/rte_routines.lib.php:1586
+#: templates/table/search/table_header.phtml:4
 msgid "Function"
 msgstr "Функция"
 
@@ -9334,86 +9350,87 @@ msgstr "двоичен"
 msgid "Because of its length,<br /> this column might not be editable."
 msgstr "Поради дължината си,<br />това поле може да е нередактируемо"
 
-#: libraries/insert_edit.lib.php:1050
+#: libraries/insert_edit.lib.php:1048
 msgid "Binary - do not edit"
 msgstr "Двоично - не се редактира"
 
-#: libraries/insert_edit.lib.php:1176 libraries/server_privileges.lib.php:470
-#: templates/table/options.phtml:36
+#: libraries/insert_edit.lib.php:1174 libraries/server_privileges.lib.php:470
+#: templates/table/search/options.phtml:36
 msgid "Or"
 msgstr "Или"
 
-#: libraries/insert_edit.lib.php:1177
+#: libraries/insert_edit.lib.php:1175
 #, fuzzy
 #| msgid "web server upload directory"
 msgid "web server upload directory:"
 msgstr "директорията за upload на web сървъра"
 
-#: libraries/insert_edit.lib.php:1348 templates/table/input_box.phtml:49
+#: libraries/insert_edit.lib.php:1346
+#: templates/table/search/input_box.phtml:49
 msgid "Edit/Insert"
 msgstr "Редакция/Вмъкване"
 
-#: libraries/insert_edit.lib.php:1398
+#: libraries/insert_edit.lib.php:1396
 #, php-format
 msgid "Continue insertion with %s rows"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1428
+#: libraries/insert_edit.lib.php:1426
 msgid "and then"
 msgstr "и след това"
 
-#: libraries/insert_edit.lib.php:1461
+#: libraries/insert_edit.lib.php:1459
 msgid "Insert as new row"
 msgstr "Вмъкване като нов ред"
 
-#: libraries/insert_edit.lib.php:1464
+#: libraries/insert_edit.lib.php:1462
 msgid "Insert as new row and ignore errors"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1467
+#: libraries/insert_edit.lib.php:1465
 msgid "Show insert query"
 msgstr "Показване заявка за вмъкване"
 
-#: libraries/insert_edit.lib.php:1487
+#: libraries/insert_edit.lib.php:1485
 msgid "Go back to previous page"
 msgstr "Обратно към предната страница"
 
-#: libraries/insert_edit.lib.php:1490
+#: libraries/insert_edit.lib.php:1488
 msgid "Insert another new row"
 msgstr "Вмъкване нов ред"
 
-#: libraries/insert_edit.lib.php:1495
+#: libraries/insert_edit.lib.php:1493
 msgid "Go back to this page"
 msgstr "Връщане към тази страница"
 
-#: libraries/insert_edit.lib.php:1518
+#: libraries/insert_edit.lib.php:1516
 msgid "Edit next row"
 msgstr "Редакция на следващия ред"
 
-#: libraries/insert_edit.lib.php:1540
+#: libraries/insert_edit.lib.php:1538
 msgid ""
 "Use TAB key to move from value to value, or CTRL+arrows to move anywhere"
 msgstr ""
 "Използвайте клавиша TAB, за да премествате крурсора от стойност на стойност "
 "или CTRL+стрелка, за да премествате курсора в съответната посока"
 
-#: libraries/insert_edit.lib.php:1577 libraries/replication_gui.lib.php:542
-#: libraries/rte/rte_routines.lib.php:1497
+#: libraries/insert_edit.lib.php:1575 libraries/replication_gui.lib.php:542
+#: libraries/rte/rte_routines.lib.php:1588
 #: libraries/server_status_variables.lib.php:220
-#: templates/designer/having_query_panel.phtml:100
-#: templates/designer/options_panel.phtml:73
-#: templates/designer/options_panel.phtml:239
-#: templates/designer/where_query_panel.phtml:69
-#: templates/table/table_header.phtml:10
-#: templates/table/zoom_result_form.phtml:35
+#: templates/database/designer/having_query_panel.phtml:100
+#: templates/database/designer/options_panel.phtml:73
+#: templates/database/designer/options_panel.phtml:239
+#: templates/database/designer/where_query_panel.phtml:69
+#: templates/table/search/table_header.phtml:10
+#: templates/table/search/zoom_result_form.phtml:35
 msgid "Value"
 msgstr "Стойност"
 
-#: libraries/insert_edit.lib.php:1937 libraries/sql.lib.php:1309
+#: libraries/insert_edit.lib.php:1935 libraries/sql.lib.php:1303
 msgid "Showing SQL query"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1962 libraries/sql.lib.php:1287
+#: libraries/insert_edit.lib.php:1960 libraries/sql.lib.php:1281
 #, php-format
 msgid "Inserted row id: %1$d"
 msgstr ""
@@ -9872,7 +9889,7 @@ msgstr "Нов"
 #: libraries/navigation/Nodes/Node_View_Container.class.php:26
 #: libraries/navigation/Nodes/Node_View_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:129
-#: templates/structure/show_create.phtml:30
+#: templates/database/structure/show_create.phtml:30
 msgid "Views"
 msgstr "Изглед"
 
@@ -10187,7 +10204,7 @@ msgstr "Не разполагате с права, за да се намират
 
 #: libraries/operations.lib.php:101 libraries/operations.lib.php:249
 #: libraries/operations.lib.php:869 libraries/operations.lib.php:963
-#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:907
+#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:998
 #: templates/columns_definitions/table_fields_definitions.phtml:47
 #, fuzzy
 #| msgid "Edit Privileges"
@@ -10281,22 +10298,22 @@ msgid "Switch to copied table"
 msgstr "Превключване към копираната таблица"
 
 #: libraries/operations.lib.php:1360
-#: templates/structure/check_all_tables.phtml:18
+#: templates/database/structure/check_all_tables.phtml:18
 msgid "Table maintenance"
 msgstr "Поддръжка на таблицата"
 
 #: libraries/operations.lib.php:1398
-#: templates/structure/check_all_tables.phtml:19
+#: templates/database/structure/check_all_tables.phtml:19
 msgid "Analyze table"
 msgstr "Анализиране на таблицата"
 
 #: libraries/operations.lib.php:1413
-#: templates/structure/check_all_tables.phtml:20
+#: templates/database/structure/check_all_tables.phtml:20
 msgid "Check table"
 msgstr "Проверка на таблицата"
 
 #: libraries/operations.lib.php:1428
-#: templates/structure/check_all_tables.phtml:22
+#: templates/database/structure/check_all_tables.phtml:22
 #, fuzzy
 #| msgid "Check table"
 msgid "Checksum table"
@@ -10316,18 +10333,19 @@ msgid "Flush the table (FLUSH)"
 msgstr "Изпразване кеша на таблицата (FLUSH)"
 
 #: libraries/operations.lib.php:1477
-#: templates/structure/check_all_tables.phtml:23
-#: templates/structure/display_table_stats.phtml:56
+#: templates/database/structure/check_all_tables.phtml:23
+#: templates/table/structure/display_table_stats.phtml:56
 msgid "Optimize table"
 msgstr "Оптимизация на таблицата"
 
 #: libraries/operations.lib.php:1492
-#: templates/structure/check_all_tables.phtml:24
+#: templates/database/structure/check_all_tables.phtml:24
 msgid "Repair table"
 msgstr "Поправяне на таблицата"
 
 #: libraries/operations.lib.php:1538
-#: templates/structure/check_all_tables.phtml:14 view_operations.php:127
+#: templates/database/structure/check_all_tables.phtml:14
+#: view_operations.php:127
 msgid "Delete data or table"
 msgstr ""
 
@@ -10452,7 +10470,7 @@ msgid "Cannot connect: invalid settings."
 msgstr "Връзката неосъществима: невалидни настройки."
 
 #: libraries/plugins/auth/AuthenticationConfig.class.php:108
-#: libraries/plugins/auth/AuthenticationCookie.class.php:134
+#: libraries/plugins/auth/AuthenticationCookie.class.php:122
 #: libraries/plugins/auth/AuthenticationHttp.class.php:96
 #, php-format
 msgid "Welcome to %s"
@@ -10483,38 +10501,38 @@ msgstr ""
 msgid "Retry to connect"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:146
+#: libraries/plugins/auth/AuthenticationCookie.class.php:134
 msgid "Your session has expired. Please log in again."
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:170
+#: libraries/plugins/auth/AuthenticationCookie.class.php:158
 msgid "Log in"
 msgstr "Вход"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:178
-#: libraries/plugins/auth/AuthenticationCookie.class.php:188
+#: libraries/plugins/auth/AuthenticationCookie.class.php:166
+#: libraries/plugins/auth/AuthenticationCookie.class.php:176
 msgid "You can enter hostname/IP address and port separated by space."
 msgstr "Можете да въведете хост/IP адрес и порт, разделени с интервал."
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:193
+#: libraries/plugins/auth/AuthenticationCookie.class.php:181
 msgid "Username:"
 msgstr "Име:"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:205
+#: libraries/plugins/auth/AuthenticationCookie.class.php:193
 #, fuzzy
 #| msgid "Server Choice"
 msgid "Server Choice:"
 msgstr "Избор на сървър"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:386
+#: libraries/plugins/auth/AuthenticationCookie.class.php:374
 msgid "Entered captcha is wrong, try again!"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:396
+#: libraries/plugins/auth/AuthenticationCookie.class.php:384
 msgid "Please enter correct captcha!"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:423
+#: libraries/plugins/auth/AuthenticationCookie.class.php:411
 #, fuzzy
 #| msgid "Cannot log in to the MySQL server"
 msgid "You are not allowed to log in to this MySQL server!"
@@ -10612,7 +10630,7 @@ msgstr "Действие"
 #: libraries/plugins/export/ExportOdt.class.php:593
 #: libraries/plugins/export/ExportTexytext.class.php:428
 #: libraries/plugins/export/PMA_ExportPdf.class.php:313
-#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:984
 #: libraries/rte/rte_triggers.lib.php:377
 msgid "Definition"
 msgstr "Описание"
@@ -10962,7 +10980,7 @@ msgid "Last check:"
 msgstr "Последна проверка:"
 
 #: libraries/plugins/export/ExportSql.class.php:1399
-#: templates/structure/structure_table_row.phtml:183
+#: templates/database/structure/structure_table_row.phtml:183
 msgid "in use"
 msgstr "ползва се в момента"
 
@@ -11158,20 +11176,14 @@ msgstr ""
 msgid "The imported file does not contain any data!"
 msgstr "Импортираният файл не съдържа никаква информация"
 
-#: libraries/plugins/import/ImportSql.class.php:169
+#: libraries/plugins/import/ImportSql.class.php:72
 msgid "SQL compatibility mode:"
 msgstr "Режим на съвместимост на SQL:"
 
-#: libraries/plugins/import/ImportSql.class.php:181
+#: libraries/plugins/import/ImportSql.class.php:84
 msgid "Do not use <code>AUTO_INCREMENT</code> for zero values"
 msgstr "Да не се използва <code>AUTO_INCREMENT</code> за нулеви стойности"
 
-#: libraries/plugins/import/ImportSql.class.php:195
-#, fuzzy
-#| msgid "Read misses"
-msgid "Read as multibytes"
-msgstr "Пропуснати прочитания"
-
 #: libraries/plugins/import/ImportXml.class.php:54
 msgid "XML"
 msgstr "XML"
@@ -11214,7 +11226,7 @@ msgid "Show grid"
 msgstr "Мрежата видима"
 
 #: libraries/plugins/schema/SchemaPdf.class.php:94
-#: templates/structure/print_view_data_dictionary_link.phtml:6
+#: templates/database/structure/print_view_data_dictionary_link.phtml:6
 msgid "Data Dictionary"
 msgstr "Речник на данните"
 
@@ -11245,7 +11257,7 @@ msgid "The %s table doesn't exist!"
 msgstr "Таблицата %s не съществува!"
 
 #: libraries/plugins/schema/eps/Eps_Relation_Schema.class.php:321
-#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:309
+#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:323
 #, php-format
 msgid "Schema of the %s database - Page %s"
 msgstr "Схема на БД %s - страница %s"
@@ -11274,7 +11286,7 @@ msgstr "Съдържание"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1005
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1028
 #: libraries/tracking.lib.php:884
-#: templates/structure/table_structure_header.phtml:11
+#: templates/table/structure/table_structure_header.phtml:11
 msgid "Extra"
 msgstr "Допълнително"
 
@@ -11666,11 +11678,11 @@ msgstr "Бързи стъпки за настройка на разширени
 msgid "Create the needed tables with the <code>%screate_tables.sql</code>."
 msgstr ""
 
-#: libraries/relation.lib.php:360
+#: libraries/relation.lib.php:357
 msgid "Create a pma user and give access to these tables."
 msgstr ""
 
-#: libraries/relation.lib.php:365
+#: libraries/relation.lib.php:360
 msgid ""
 "Enable advanced features in configuration file (<code>config.inc.php</"
 "code>), for example by starting from <code>config.sample.inc.php</code>."
@@ -11678,22 +11690,22 @@ msgstr ""
 "Включване на допълнителните функции в конфигурационния файл (<code>config."
 "inc.php</code>), започнете с примера в <code>config.sample.inc.php</code>."
 
-#: libraries/relation.lib.php:373
+#: libraries/relation.lib.php:365
 msgid "Re-login to phpMyAdmin to load the updated configuration file."
 msgstr ""
 
-#: libraries/relation.lib.php:1612
+#: libraries/relation.lib.php:1607
 msgid "no description"
 msgstr "няма описание"
 
-#: libraries/relation.lib.php:1811
+#: libraries/relation.lib.php:1806
 msgid ""
 "You do not have necessary privileges to create a database named "
 "'phpmyadmin'. You may go to 'Operations' tab of any database to set up the "
 "phpMyAdmin configuration storage there."
 msgstr ""
 
-#: libraries/relation.lib.php:1928
+#: libraries/relation.lib.php:1923
 #, fuzzy, php-format
 #| msgid "Missing phpMyAdmin configuration storage tables"
 msgid ""
@@ -11701,21 +11713,21 @@ msgid ""
 "configuration storage there."
 msgstr "Липсват таблици от хранилището за конфигурация на phpMyAdmin"
 
-#: libraries/relation.lib.php:1936
+#: libraries/relation.lib.php:1931
 #, fuzzy, php-format
 #| msgid "Missing phpMyAdmin configuration storage tables"
 msgid ""
 "%sCreate%s the phpMyAdmin configuration storage in the current database."
 msgstr "Липсват таблици от хранилището за конфигурация на phpMyAdmin"
 
-#: libraries/relation.lib.php:1944
+#: libraries/relation.lib.php:1939
 #, fuzzy, php-format
 #| msgid "Missing phpMyAdmin configuration storage tables"
 msgid "%sCreate%s missing phpMyAdmin configuration storage tables."
 msgstr "Липсват таблици от хранилището за конфигурация на phpMyAdmin"
 
 #: libraries/replication_gui.lib.php:46 libraries/replication_gui.lib.php:343
-#: libraries/server_databases.lib.php:387
+#: libraries/server_databases.lib.php:398
 msgid "Master replication"
 msgstr "Главен сървър"
 
@@ -11775,7 +11787,7 @@ msgstr ""
 "сървър <b>е</b> конфигуриран като главен."
 
 #: libraries/replication_gui.lib.php:141
-#: libraries/server_databases.lib.php:389
+#: libraries/server_databases.lib.php:400
 msgid "Slave replication"
 msgstr "Подчинен сървър"
 
@@ -12072,10 +12084,10 @@ msgid "Master server changed successfully to %s."
 msgstr "Главният сървър сменен с %s"
 
 #: libraries/rte/rte_events.lib.php:106 libraries/rte/rte_events.lib.php:115
-#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:149
-#: libraries/rte/rte_routines.lib.php:158
-#: libraries/rte/rte_routines.lib.php:231
-#: libraries/rte/rte_routines.lib.php:1362
+#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:219
+#: libraries/rte/rte_routines.lib.php:246
+#: libraries/rte/rte_routines.lib.php:368
+#: libraries/rte/rte_routines.lib.php:1453
 #: libraries/rte/rte_triggers.lib.php:82 libraries/rte/rte_triggers.lib.php:91
 #: libraries/rte/rte_triggers.lib.php:123
 #, php-format
@@ -12096,7 +12108,7 @@ msgstr "Събитието %1$s беше променено."
 msgid "Event %1$s has been created."
 msgstr "Събитието %1$s беше създадено."
 
-#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:251
+#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:266
 #: libraries/rte/rte_triggers.lib.php:144
 #, fuzzy
 #| msgid ""
@@ -12108,7 +12120,7 @@ msgstr "<b>Една или повече грешки възникнаха при
 msgid "Edit event"
 msgstr "Редакция събитие"
 
-#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:794
+#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:885
 #: libraries/rte/rte_triggers.lib.php:323 view_create.php:180
 msgid "Details"
 msgstr "Подробности"
@@ -12121,7 +12133,7 @@ msgstr "Име на събитие"
 msgid "Event type"
 msgstr "Тип на събитието"
 
-#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:817
+#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:908
 #, php-format
 msgid "Change to %s"
 msgstr "Промяна на %s"
@@ -12148,12 +12160,14 @@ msgstr "Край"
 msgid "On completion preserve"
 msgstr ""
 
-#: libraries/rte/rte_events.lib.php:491 libraries/rte/rte_routines.lib.php:930
+#: libraries/rte/rte_events.lib.php:491
+#: libraries/rte/rte_routines.lib.php:1021
 #: libraries/rte/rte_triggers.lib.php:383 view_create.php:209
 msgid "Definer"
 msgstr ""
 
-#: libraries/rte/rte_events.lib.php:535 libraries/rte/rte_routines.lib.php:997
+#: libraries/rte/rte_events.lib.php:535
+#: libraries/rte/rte_routines.lib.php:1088
 #: libraries/rte/rte_triggers.lib.php:422
 msgid "The definer must be in the \"username@hostname\" format!"
 msgstr ""
@@ -12181,9 +12195,9 @@ msgid "You must provide an event definition."
 msgstr "Трябва да дадете дефиниция на събитието."
 
 #: libraries/rte/rte_export.lib.php:43 libraries/rte/rte_general.lib.php:72
-#: libraries/rte/rte_routines.lib.php:345
-#: libraries/rte/rte_routines.lib.php:1198
-#: libraries/rte/rte_routines.lib.php:1411
+#: libraries/rte/rte_routines.lib.php:153
+#: libraries/rte/rte_routines.lib.php:1289
+#: libraries/rte/rte_routines.lib.php:1502
 #, fuzzy
 #| msgid "Error in processing request"
 msgid "Error in processing request:"
@@ -12221,99 +12235,99 @@ msgstr ""
 "съхранени процедури може да пропадне![/strong] Моля, използвайте подобреното "
 "разширение 'mysqli', за да избегнете проблеми."
 
-#: libraries/rte/rte_routines.lib.php:110
-#: libraries/rte/rte_routines.lib.php:1006
+#: libraries/rte/rte_routines.lib.php:123
+msgid "Edit routine"
+msgstr "Редактиране"
+
+#: libraries/rte/rte_routines.lib.php:200
+#: libraries/rte/rte_routines.lib.php:1097
 #, php-format
 msgid "Invalid routine type: \"%s\""
 msgstr "Невалиден тип процедура: \"%s\""
 
-#: libraries/rte/rte_routines.lib.php:170
+#: libraries/rte/rte_routines.lib.php:253
+#, php-format
+msgid "Routine %1$s has been created."
+msgstr "Процедура %1$s беше създадена."
+
+#: libraries/rte/rte_routines.lib.php:380
 msgid "Sorry, we failed to restore the dropped routine."
 msgstr "Съжаляваме, но възстановяването на изтритата процедура е неуспешно."
 
-#: libraries/rte/rte_routines.lib.php:211
+#: libraries/rte/rte_routines.lib.php:439
 #, fuzzy, php-format
 #| msgid "Routine %1$s has been modified."
 msgid "Routine %1$s has been modified. Privileges have been adjusted."
 msgstr "Процедурата%1$s беше променена."
 
-#: libraries/rte/rte_routines.lib.php:216
+#: libraries/rte/rte_routines.lib.php:444
 #, php-format
 msgid "Routine %1$s has been modified."
 msgstr "Процедурата%1$s беше променена."
 
-#: libraries/rte/rte_routines.lib.php:238
-#, php-format
-msgid "Routine %1$s has been created."
-msgstr "Процедура %1$s беше създадена."
-
-#: libraries/rte/rte_routines.lib.php:315
-msgid "Edit routine"
-msgstr "Редактиране"
-
-#: libraries/rte/rte_routines.lib.php:797
+#: libraries/rte/rte_routines.lib.php:888
 msgid "Routine name"
 msgstr "Име"
 
-#: libraries/rte/rte_routines.lib.php:823
+#: libraries/rte/rte_routines.lib.php:914
 msgid "Parameters"
 msgstr "Параметри"
 
-#: libraries/rte/rte_routines.lib.php:829
+#: libraries/rte/rte_routines.lib.php:920
 msgid "Direction"
 msgstr "Посока"
 
-#: libraries/rte/rte_routines.lib.php:847
+#: libraries/rte/rte_routines.lib.php:938
 msgid "Add parameter"
 msgstr "Нов параметър"
 
-#: libraries/rte/rte_routines.lib.php:851
+#: libraries/rte/rte_routines.lib.php:942
 msgid "Remove last parameter"
 msgstr "Изтриване на последен параметър"
 
-#: libraries/rte/rte_routines.lib.php:856
+#: libraries/rte/rte_routines.lib.php:947
 msgid "Return type"
 msgstr "Тип данни при изход"
 
-#: libraries/rte/rte_routines.lib.php:862
+#: libraries/rte/rte_routines.lib.php:953
 msgid "Return length/values"
 msgstr "Дължина/стойност на данни при изход"
 
-#: libraries/rte/rte_routines.lib.php:868
+#: libraries/rte/rte_routines.lib.php:959
 msgid "Return options"
 msgstr "Настройки на данни при изход"
 
-#: libraries/rte/rte_routines.lib.php:899
+#: libraries/rte/rte_routines.lib.php:990
 msgid "Is deterministic"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:920
+#: libraries/rte/rte_routines.lib.php:1011
 msgid ""
 "You do not have sufficient privileges to perform this operation; Please "
 "refer to the documentation for more details"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:935
+#: libraries/rte/rte_routines.lib.php:1026
 msgid "Security type"
 msgstr "Сигурност"
 
-#: libraries/rte/rte_routines.lib.php:944
+#: libraries/rte/rte_routines.lib.php:1035
 msgid "SQL data access"
 msgstr "Достъп до SQL данните"
 
-#: libraries/rte/rte_routines.lib.php:1013
+#: libraries/rte/rte_routines.lib.php:1104
 #, fuzzy
 #| msgid "You must provide a routine name"
 msgid "You must provide a routine name!"
 msgstr "Трябва да дадете име на процедурата"
 
-#: libraries/rte/rte_routines.lib.php:1047
+#: libraries/rte/rte_routines.lib.php:1138
 #, php-format
 msgid "Invalid direction \"%s\" given for parameter."
 msgstr "Невалидна посока \"%s\" подадена като параметър."
 
-#: libraries/rte/rte_routines.lib.php:1069
-#: libraries/rte/rte_routines.lib.php:1131
+#: libraries/rte/rte_routines.lib.php:1160
+#: libraries/rte/rte_routines.lib.php:1222
 msgid ""
 "You must provide length/values for routine parameters of type ENUM, SET, "
 "VARCHAR and VARBINARY."
@@ -12321,24 +12335,24 @@ msgstr ""
 "Трябва да дадете дължина/стойност за параметрите на процедурата от тип ENUM, "
 "SET, VARCHAR и VARBINARY."
 
-#: libraries/rte/rte_routines.lib.php:1095
+#: libraries/rte/rte_routines.lib.php:1186
 msgid "You must provide a name and a type for each routine parameter."
 msgstr "Трябва да дадете име и тип за всеки параметър на процедурата."
 
-#: libraries/rte/rte_routines.lib.php:1114
+#: libraries/rte/rte_routines.lib.php:1205
 msgid "You must provide a valid return type for the routine."
 msgstr "Трябва да дадете валиден тип на данните при изход на процедурата."
 
-#: libraries/rte/rte_routines.lib.php:1174
+#: libraries/rte/rte_routines.lib.php:1265
 msgid "You must provide a routine definition."
 msgstr "Трябва да дадете дефиниция на процедурата."
 
-#: libraries/rte/rte_routines.lib.php:1285
+#: libraries/rte/rte_routines.lib.php:1376
 #, php-format
 msgid "Execution results of routine %s"
 msgstr "Резултати от изпълнението на процедура %s"
 
-#: libraries/rte/rte_routines.lib.php:1340
+#: libraries/rte/rte_routines.lib.php:1431
 #, fuzzy, php-format
 #| msgid "%d row affected by the last statement inside the procedure"
 #| msgid_plural "%d rows affected by the last statement inside the procedure"
@@ -12347,13 +12361,13 @@ msgid_plural "%d rows affected by the last statement inside the procedure."
 msgstr[0] "%d ред променен от последният израз на съхранената процедура"
 msgstr[1] "%d реда променени от последният израз на съхранената процедура"
 
-#: libraries/rte/rte_routines.lib.php:1398
-#: libraries/rte/rte_routines.lib.php:1406
+#: libraries/rte/rte_routines.lib.php:1489
+#: libraries/rte/rte_routines.lib.php:1497
 msgid "Execute routine"
 msgstr "Изпълнение на процедура"
 
-#: libraries/rte/rte_routines.lib.php:1485
-#: libraries/rte/rte_routines.lib.php:1488
+#: libraries/rte/rte_routines.lib.php:1576
+#: libraries/rte/rte_routines.lib.php:1579
 msgid "Routine parameters"
 msgstr "Параметри на процедурата"
 
@@ -12517,7 +12531,7 @@ msgid "Original position"
 msgstr "Първоначално положение"
 
 #: libraries/server_bin_log.lib.php:133
-#: templates/structure/display_table_stats.phtml:4
+#: templates/table/structure/display_table_stats.phtml:4
 msgid "Information"
 msgstr "Информация"
 
@@ -12555,12 +12569,12 @@ msgstr ""
 "Забележка: Разрешаването на статистика на БД може да коства много голям "
 "трафик между web сървъра и MySQL сървъра."
 
-#: libraries/server_databases.lib.php:364
-#: libraries/server_databases.lib.php:365
+#: libraries/server_databases.lib.php:366
+#: libraries/server_databases.lib.php:371
 msgid "Enable Statistics"
 msgstr "Разрешаване на статистика"
 
-#: libraries/server_databases.lib.php:481
+#: libraries/server_databases.lib.php:492
 #, php-format
 msgid "%1$d database has been dropped successfully."
 msgid_plural "%1$d databases have been dropped successfully."
@@ -12946,7 +12960,7 @@ msgid "You have revoked the privileges for %s."
 msgstr "Вие отменихте правата на %s."
 
 #: libraries/server_privileges.lib.php:2059
-#: libraries/server_privileges.lib.php:4290
+#: libraries/server_privileges.lib.php:4316
 #, fuzzy
 #| msgid "Add user"
 msgid "Add user account"
@@ -13129,61 +13143,61 @@ msgstr "Изтриване на %s"
 msgid "The privileges were reloaded successfully."
 msgstr "Правата бяха презаредени успешно."
 
-#: libraries/server_privileges.lib.php:3994
+#: libraries/server_privileges.lib.php:4003
 #, php-format
 msgid "The user %s already exists!"
 msgstr "Потребител %s вече съществува!"
 
-#: libraries/server_privileges.lib.php:4232
+#: libraries/server_privileges.lib.php:4258
 #, php-format
 msgid "Privileges for %s"
 msgstr "Права на %s"
 
-#: libraries/server_privileges.lib.php:4241
+#: libraries/server_privileges.lib.php:4267
 #: libraries/server_status_processes.lib.php:72
 #: libraries/server_user_groups.lib.php:39
 msgid "User"
 msgstr "Потребител"
 
-#: libraries/server_privileges.lib.php:4282
+#: libraries/server_privileges.lib.php:4308
 #, fuzzy
 #| msgid "New"
 msgctxt "Create new user"
 msgid "New"
 msgstr "Нов"
 
-#: libraries/server_privileges.lib.php:4311
+#: libraries/server_privileges.lib.php:4337
 #, fuzzy
 #| msgid "Edit Privileges"
 msgid "Edit privileges:"
 msgstr "Редакция"
 
-#: libraries/server_privileges.lib.php:4312
+#: libraries/server_privileges.lib.php:4338
 #, fuzzy
 #| msgid "Users"
 msgid "User account"
 msgstr "Потребители"
 
-#: libraries/server_privileges.lib.php:4371
+#: libraries/server_privileges.lib.php:4397
 msgid ""
 "Note: You are attempting to edit privileges of the user with which you are "
 "currently logged in."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4391 libraries/server_users.lib.php:25
+#: libraries/server_privileges.lib.php:4417 libraries/server_users.lib.php:25
 #, fuzzy
 #| msgid "Users overview"
 msgid "User accounts overview"
 msgstr "Преглед потребители"
 
-#: libraries/server_privileges.lib.php:4459
+#: libraries/server_privileges.lib.php:4485
 msgid ""
 "A user account allowing any user from localhost to connect is present. This "
 "will prevent other users from connecting if the host part of their account "
 "allows a connection from any (%) host."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4500
+#: libraries/server_privileges.lib.php:4526
 #, php-format
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
@@ -13196,7 +13210,7 @@ msgstr ""
 "правата които използва сървъра ако към него са направени промени на ръка. В "
 "този случай, трябва да %sпрезаредите правата%s преди да продължите."
 
-#: libraries/server_privileges.lib.php:4519
+#: libraries/server_privileges.lib.php:4545
 #, fuzzy
 #| msgid ""
 #| "Note: phpMyAdmin gets the users' privileges directly from MySQL's "
@@ -13215,25 +13229,25 @@ msgstr ""
 "правата които използва сървъра ако към него са направени промени на ръка. В "
 "този случай, трябва да %sпрезаредите правата%s преди да продължите."
 
-#: libraries/server_privileges.lib.php:4569
+#: libraries/server_privileges.lib.php:4595
 msgid "The selected user was not found in the privilege table."
 msgstr "Избраният потребител не беше открит в таблицата с права."
 
-#: libraries/server_privileges.lib.php:4801
+#: libraries/server_privileges.lib.php:4827
 msgid "You have added a new user."
 msgstr "Вие добавихте нов потребител."
 
-#: libraries/server_status.lib.php:53
+#: libraries/server_status.lib.php:60
 #, php-format
 msgid "Network traffic since startup: %s"
 msgstr "Мрежови трафик от включването: %s"
 
-#: libraries/server_status.lib.php:66
+#: libraries/server_status.lib.php:73
 #, php-format
 msgid "This MySQL server has been running for %1$s. It started up on %2$s."
 msgstr "Този MySQL сървър работи от %1$s. Пуснат е на %2$s."
 
-#: libraries/server_status.lib.php:80
+#: libraries/server_status.lib.php:94
 msgid ""
 "This MySQL server works as <b>master</b> and <b>slave</b> in <b>replication</"
 "b> process."
@@ -13241,19 +13255,19 @@ msgstr ""
 "Този MySQL сървър работи като <b>главен</b> и <b>подчинен</b> в "
 "<b>репликация</b>."
 
-#: libraries/server_status.lib.php:85
+#: libraries/server_status.lib.php:99
 msgid "This MySQL server works as <b>master</b> in <b>replication</b> process."
 msgstr "Този MySQL сървър работи като <b>главен</b> в <b>репликация</b>."
 
-#: libraries/server_status.lib.php:90
+#: libraries/server_status.lib.php:104
 msgid "This MySQL server works as <b>slave</b> in <b>replication</b> process."
 msgstr "Този MySQL сървър работи като <b>подчинен</b> в <b>репликация</b>."
 
-#: libraries/server_status.lib.php:106
+#: libraries/server_status.lib.php:116
 msgid "Replication status"
 msgstr "Състояние на репликацията"
 
-#: libraries/server_status.lib.php:137
+#: libraries/server_status.lib.php:146
 msgid ""
 "On a busy server, the byte counters may overrun, so those statistics as "
 "reported by the MySQL server may be incorrect."
@@ -13261,21 +13275,21 @@ msgstr ""
 "При натоварен сървър байтовите броячи може да превъртат и статистиката "
 "докладвана от MySQL да е невярна."
 
-#: libraries/server_status.lib.php:148
+#: libraries/server_status.lib.php:157
 msgid "Received"
 msgstr "Получени"
 
-#: libraries/server_status.lib.php:167
+#: libraries/server_status.lib.php:176
 msgid "Sent"
 msgstr "Изпратени"
 
-#: libraries/server_status.lib.php:234
+#: libraries/server_status.lib.php:243
 #, fuzzy
 #| msgid "max. concurrent connections"
 msgid "Max. concurrent connections"
 msgstr "максимален брой едновременни връзки"
 
-#: libraries/server_status.lib.php:244
+#: libraries/server_status.lib.php:253
 msgid "Failed attempts"
 msgstr "Неуспешни опити"
 
@@ -14248,7 +14262,7 @@ msgstr ""
 msgid "Not implemented yet."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/AlterOperation.php:193
+#: libraries/sql-parser/src/Components/AlterOperation.php:191
 msgid "Unrecognized alter operation."
 msgstr ""
 
@@ -14262,7 +14276,7 @@ msgid "An opening bracket followed by a set of values was expected."
 msgstr ""
 
 #: libraries/sql-parser/src/Components/ArrayObj.php:101
-#: libraries/sql-parser/src/Components/FieldDefinition.php:202
+#: libraries/sql-parser/src/Components/CreateDefinition.php:202
 msgid "An opening bracket was expected."
 msgstr ""
 
@@ -14270,25 +14284,35 @@ msgstr ""
 msgid "A comma or a closing bracket was expected"
 msgstr ""
 
+#: libraries/sql-parser/src/Components/CreateDefinition.php:246
+#, fuzzy
+#| msgid "No tables selected."
+msgid "A comma or a closing bracket was expected."
+msgstr "Няма избрани таблици."
+
+#: libraries/sql-parser/src/Components/CreateDefinition.php:262
+msgid "A closing bracket was expected."
+msgstr ""
+
 #: libraries/sql-parser/src/Components/DataType.php:125
 msgid "Unrecognized data type."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:225
+#: libraries/sql-parser/src/Components/Expression.php:227
 msgid "Unexpected closing bracket."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:246
-#: libraries/sql-parser/src/Components/Expression.php:283
-#: libraries/sql-parser/src/Components/Expression.php:303
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:285
+#: libraries/sql-parser/src/Components/Expression.php:305
 msgid "An alias was previously found."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:257
+#: libraries/sql-parser/src/Components/Expression.php:259
 msgid "Unexpected dot."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:327
+#: libraries/sql-parser/src/Components/Expression.php:329
 #, fuzzy
 #| msgid "No tables selected."
 msgid "An alias was expected."
@@ -14300,16 +14324,6 @@ msgstr "Няма избрани таблици."
 msgid "An expression was expected."
 msgstr "Няма върнати редове"
 
-#: libraries/sql-parser/src/Components/FieldDefinition.php:246
-#, fuzzy
-#| msgid "No tables selected."
-msgid "A comma or a closing bracket was expected."
-msgstr "Няма избрани таблици."
-
-#: libraries/sql-parser/src/Components/FieldDefinition.php:262
-msgid "A closing bracket was expected."
-msgstr ""
-
 #: libraries/sql-parser/src/Components/Limit.php:90
 #: libraries/sql-parser/src/Components/Limit.php:112
 msgid "An offset was expected."
@@ -14357,29 +14371,29 @@ msgstr ""
 msgid "Expected delimiter."
 msgstr ""
 
-#: libraries/sql-parser/src/Lexer.php:753
+#: libraries/sql-parser/src/Lexer.php:777
 #, fuzzy, php-format
 #| msgid "Event %1$s has been created."
 msgid "Ending quote %1$s was expected."
 msgstr "Събитието %1$s беше създадено."
 
-#: libraries/sql-parser/src/Lexer.php:789
+#: libraries/sql-parser/src/Lexer.php:813
 #, fuzzy
 #| msgid "Table name template"
 msgid "Variable name was expected."
 msgstr "Шаблон за име на таблица"
 
-#: libraries/sql-parser/src/Parser.php:380
+#: libraries/sql-parser/src/Parser.php:391
 #, fuzzy
 #| msgid "At Beginning of Table"
 msgid "Unexpected beginning of statement."
 msgstr "В началото на таблицата"
 
-#: libraries/sql-parser/src/Parser.php:399
+#: libraries/sql-parser/src/Parser.php:410
 msgid "Unrecognized statement type."
 msgstr ""
 
-#: libraries/sql-parser/src/Parser.php:479
+#: libraries/sql-parser/src/Parser.php:489
 msgid "No transaction was previously started."
 msgstr ""
 
@@ -14409,8 +14423,10 @@ msgid "The name of the entity was expected."
 msgstr "Броят отворени таблици."
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:310
-msgid "At least one field definition was expected."
-msgstr ""
+#, fuzzy
+#| msgid "The row has been deleted."
+msgid "At least one column definition was expected."
+msgstr "Редът беше изтрит"
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:329
 msgid "A \"RETURNS\" keyword was expected."
@@ -14488,11 +14504,11 @@ msgstr "Белязка %s беше създадена"
 msgid "Using bookmark \"%s\" as default browse query."
 msgstr ""
 
-#: libraries/sql.lib.php:1306
+#: libraries/sql.lib.php:1300
 msgid "Showing as PHP code"
 msgstr "Показване като PHP-код"
 
-#: libraries/sql.lib.php:1638
+#: libraries/sql.lib.php:1632
 #, fuzzy, php-format
 #| msgid ""
 #| "This table does not contain a unique column. Features related to the grid "
@@ -14505,7 +14521,7 @@ msgstr ""
 "редакция, отметката, връзките редактиране, копиране и изтриване може да не "
 "работят след запазване."
 
-#: libraries/sql.lib.php:1649
+#: libraries/sql.lib.php:1643
 #, fuzzy, php-format
 #| msgid ""
 #| "This table does not contain a unique column. Features related to the grid "
@@ -14518,7 +14534,7 @@ msgstr ""
 "редакция, отметката, връзките редактиране, копиране и изтриване може да не "
 "работят след запазване."
 
-#: libraries/sql.lib.php:1688
+#: libraries/sql.lib.php:1682
 #, php-format
 msgid "Problems with indexes of table `%s`"
 msgstr "Проблем с индексите на таблица `%s`"
@@ -14682,7 +14698,7 @@ msgid "Version %s snapshot (SQL code)"
 msgstr ""
 
 #: libraries/tracking.lib.php:947
-#: templates/structure/table_structure_row.phtml:33
+#: templates/table/structure/table_structure_row.phtml:33
 msgctxt "None for default"
 msgid "None"
 msgstr "Няма"
@@ -14735,15 +14751,15 @@ msgstr "Създаване на версия %1$s от %2$s"
 msgid "Version %1$s was created, tracking for %2$s is active."
 msgstr ""
 
-#: libraries/user_preferences.inc.php:29
+#: libraries/user_preferences.inc.php:30
 msgid "Manage your settings"
 msgstr "Управление мои настройки"
 
-#: libraries/user_preferences.inc.php:46 prefs_manage.php:307
+#: libraries/user_preferences.inc.php:54 prefs_manage.php:307
 msgid "Configuration has been saved."
 msgstr "Конфигурацията е записана."
 
-#: libraries/user_preferences.inc.php:66
+#: libraries/user_preferences.inc.php:74
 #, php-format
 msgid ""
 "Your preferences will be saved for current session only. Storing them "
@@ -15142,7 +15158,7 @@ msgid "first"
 msgstr ""
 
 #: templates/columns_definitions/move_column.phtml:12
-#: templates/structure/add_column.phtml:21
+#: templates/table/structure/add_column.phtml:21
 #, php-format
 msgid "after %s"
 msgstr "след %s"
@@ -15222,221 +15238,326 @@ msgstr "Браузърна трансформация"
 msgid "Input transformation options"
 msgstr "Опции на трансформацията"
 
-#: templates/designer/aggregate_query_panel.phtml:22
-#: templates/designer/options_panel.phtml:100
+#: templates/database/create_table.phtml:7
+#: templates/database/designer/side_menu.phtml:77
+#: templates/database/designer/side_menu.phtml:80
+msgid "Create table"
+msgstr "Създаване таблица"
+
+#: templates/database/create_table.phtml:15
+msgid "Number of columns"
+msgstr "Брой колони"
+
+#: templates/database/designer/aggregate_query_panel.phtml:22
+#: templates/database/designer/options_panel.phtml:100
 msgid "Aggregate"
 msgstr "Агрегиране"
 
-#: templates/designer/aggregate_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:61
-#: templates/designer/options_panel.phtml:106
-#: templates/designer/options_panel.phtml:170
-#: templates/designer/where_query_panel.phtml:30
-#: templates/table/table_header.phtml:9
+#: templates/database/designer/aggregate_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:61
+#: templates/database/designer/options_panel.phtml:106
+#: templates/database/designer/options_panel.phtml:170
+#: templates/database/designer/where_query_panel.phtml:30
+#: templates/table/search/table_header.phtml:9
 msgid "Operator"
 msgstr "Оператор"
 
-#: templates/designer/database_tables.phtml:29
+#: templates/database/designer/database_tables.phtml:29
 msgid "Toggle"
 msgstr ""
 
-#: templates/designer/database_tables.phtml:40
+#: templates/database/designer/database_tables.phtml:40
 #, fuzzy
 #| msgid "Table structure"
 msgid "See table structure"
 msgstr "Структура на таблица"
 
-#: templates/designer/delete_relation_panel.phtml:21
+#: templates/database/designer/delete_relation_panel.phtml:21
 msgid "Delete relation"
 msgstr "Изтриване релация"
 
-#: templates/designer/edit_delete_pages.phtml:7
+#: templates/database/designer/edit_delete_pages.phtml:7
 #, fuzzy
 #| msgid "Page titles"
 msgid "Page to open"
 msgstr "Заглавие в браузъра"
 
-#: templates/designer/edit_delete_pages.phtml:7
+#: templates/database/designer/edit_delete_pages.phtml:7
 #, fuzzy
 #| msgid "Relation deleted"
 msgid "Page to delete"
 msgstr "Релацията изтрита"
 
-#: templates/designer/having_query_panel.phtml:90
-#: templates/designer/options_panel.phtml:63
-#: templates/designer/options_panel.phtml:229
-#: templates/designer/where_query_panel.phtml:59
+#: templates/database/designer/having_query_panel.phtml:90
+#: templates/database/designer/options_panel.phtml:63
+#: templates/database/designer/options_panel.phtml:229
+#: templates/database/designer/where_query_panel.phtml:59
 msgid "Except"
 msgstr "Освен"
 
-#: templates/designer/having_query_panel.phtml:102
-#: templates/designer/options_panel.phtml:75
-#: templates/designer/options_panel.phtml:241
-#: templates/designer/where_query_panel.phtml:71
+#: templates/database/designer/having_query_panel.phtml:102
+#: templates/database/designer/options_panel.phtml:75
+#: templates/database/designer/options_panel.phtml:241
+#: templates/database/designer/where_query_panel.phtml:71
 msgid "subquery"
 msgstr "подзаявка"
 
-#: templates/designer/new_relation_panel.phtml:22
-#: templates/designer/side_menu.phtml:84 templates/designer/side_menu.phtml:87
+#: templates/database/designer/new_relation_panel.phtml:22
+#: templates/database/designer/side_menu.phtml:84
+#: templates/database/designer/side_menu.phtml:87
 msgid "Create relation"
 msgstr "Създаване релация"
 
-#: templates/designer/options_panel.phtml:34
-#: templates/designer/options_panel.phtml:200
+#: templates/database/designer/options_panel.phtml:34
+#: templates/database/designer/options_panel.phtml:200
 msgid "Relation operator"
 msgstr "Оператор на отношение"
 
-#: templates/designer/options_panel.phtml:85
-#: templates/designer/rename_to_panel.phtml:23
+#: templates/database/designer/options_panel.phtml:85
+#: templates/database/designer/rename_to_panel.phtml:23
 msgid "Rename to"
 msgstr "Преименуване на"
 
-#: templates/designer/options_panel.phtml:91
-#: templates/designer/rename_to_panel.phtml:31
+#: templates/database/designer/options_panel.phtml:91
+#: templates/database/designer/rename_to_panel.phtml:31
 msgid "New name"
 msgstr "Ново име"
 
-#: templates/designer/page_save_as.phtml:4
+#: templates/database/designer/page_save_as.phtml:4
 #, fuzzy
 #| msgid "Export to selected page"
 msgid "Save to selected page"
 msgstr "Експорт към избраната страница"
 
-#: templates/designer/page_save_as.phtml:5
+#: templates/database/designer/page_save_as.phtml:5
 #, fuzzy
 #| msgid "Create a page and export to it"
 msgid "Create a page and save to it"
 msgstr "създаване на страница и експорт към нея"
 
-#: templates/designer/page_save_as.phtml:26
+#: templates/database/designer/page_save_as.phtml:26
 #, fuzzy
 #| msgid "New page name: "
 msgid "New page name"
 msgstr "Име: "
 
-#: templates/designer/page_selector.phtml:2
+#: templates/database/designer/page_selector.phtml:2
 msgid "Select page"
 msgstr "Избор на страница"
 
-#: templates/designer/query_details.phtml:10
+#: templates/database/designer/query_details.phtml:10
 msgid "Active options"
 msgstr "Активни опции"
 
-#: templates/designer/schema_export.phtml:4
+#: templates/database/designer/schema_export.phtml:4
 msgid "Select Export Relational Type"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:19 templates/designer/side_menu.phtml:25
+#: templates/database/designer/side_menu.phtml:19
+#: templates/database/designer/side_menu.phtml:25
 #, fuzzy
 #| msgid "Showing tables"
 msgid "Show/Hide tables list"
 msgstr "Показване таблици"
 
-#: templates/designer/side_menu.phtml:29 templates/designer/side_menu.phtml:35
-#: templates/designer/side_menu.phtml:36
+#: templates/database/designer/side_menu.phtml:29
+#: templates/database/designer/side_menu.phtml:35
+#: templates/database/designer/side_menu.phtml:36
 msgid "View in fullscreen"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:34
+#: templates/database/designer/side_menu.phtml:34
 msgid "Exit fullscreen"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:41 templates/designer/side_menu.phtml:45
+#: templates/database/designer/side_menu.phtml:41
+#: templates/database/designer/side_menu.phtml:45
 #, fuzzy
 #| msgid "New name"
 msgid "New page"
 msgstr "Ново име"
 
-#: templates/designer/side_menu.phtml:70 templates/designer/side_menu.phtml:73
+#: templates/database/designer/side_menu.phtml:70
+#: templates/database/designer/side_menu.phtml:73
 #, fuzzy
 #| msgid "Select page"
 msgid "Delete pages"
 msgstr "Избор на страница"
 
-#: templates/designer/side_menu.phtml:77 templates/designer/side_menu.phtml:80
-#: templates/table/create_table.phtml:7
-msgid "Create table"
-msgstr "Създаване таблица"
-
-#: templates/designer/side_menu.phtml:98
-#: templates/designer/side_menu.phtml:101
+#: templates/database/designer/side_menu.phtml:98
+#: templates/database/designer/side_menu.phtml:101
 msgid "Reload"
 msgstr "Презареждане"
 
-#: templates/designer/side_menu.phtml:107
-#: templates/designer/side_menu.phtml:110
+#: templates/database/designer/side_menu.phtml:107
+#: templates/database/designer/side_menu.phtml:110
 msgid "Help"
 msgstr "Помощ"
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Angular links"
 msgstr "Ъгловати връзки"
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Direct links"
 msgstr "Прави връзки"
 
-#: templates/designer/side_menu.phtml:122
-#: templates/designer/side_menu.phtml:124
+#: templates/database/designer/side_menu.phtml:122
+#: templates/database/designer/side_menu.phtml:124
 msgid "Snap to grid"
 msgstr "Прилепване към мрежата"
 
-#: templates/designer/side_menu.phtml:128
-#: templates/designer/side_menu.phtml:134
+#: templates/database/designer/side_menu.phtml:128
+#: templates/database/designer/side_menu.phtml:134
 msgid "Small/Big All"
 msgstr "Малки/големи всички"
 
-#: templates/designer/side_menu.phtml:138
-#: templates/designer/side_menu.phtml:141
+#: templates/database/designer/side_menu.phtml:138
+#: templates/database/designer/side_menu.phtml:141
 msgid "Toggle small/big"
 msgstr "Превключване на малки/големи"
 
-#: templates/designer/side_menu.phtml:145
-#: templates/designer/side_menu.phtml:148
+#: templates/database/designer/side_menu.phtml:145
+#: templates/database/designer/side_menu.phtml:148
 msgid "Toggle relation lines"
 msgstr "Превключване на редовете с релации"
 
-#: templates/designer/side_menu.phtml:153
-#: templates/designer/side_menu.phtml:156
+#: templates/database/designer/side_menu.phtml:153
+#: templates/database/designer/side_menu.phtml:156
 #, fuzzy
 #| msgid "Export all"
 msgid "Export schema"
 msgstr "Експорт всички"
 
-#: templates/designer/side_menu.phtml:165
-#: templates/designer/side_menu.phtml:168
+#: templates/database/designer/side_menu.phtml:165
+#: templates/database/designer/side_menu.phtml:168
 msgid "Build Query"
 msgstr "Построяване на заявка"
 
-#: templates/designer/side_menu.phtml:173
-#: templates/designer/side_menu.phtml:177
+#: templates/database/designer/side_menu.phtml:173
+#: templates/database/designer/side_menu.phtml:177
 msgid "Move Menu"
 msgstr "Меню Преместване"
 
-#: templates/designer/side_menu.phtml:181
-#: templates/designer/side_menu.phtml:186
+#: templates/database/designer/side_menu.phtml:181
+#: templates/database/designer/side_menu.phtml:186
 #, fuzzy
 #| msgid "Partial texts"
 msgid "Pin text"
 msgstr "Частични текстове"
 
-#: templates/designer/table_list.phtml:4
+#: templates/database/designer/table_list.phtml:4
 msgid "Hide/Show all"
 msgstr "Показване/скриване всички"
 
-#: templates/designer/table_list.phtml:14
+#: templates/database/designer/table_list.phtml:14
 msgid "Hide/Show Tables with no relation"
 msgstr "Показване/скриване таблици без релации"
 
-#: templates/designer/table_list.phtml:59
+#: templates/database/designer/table_list.phtml:59
 #, fuzzy
 #| msgid "Number of tables"
 msgid "Number of tables:"
 msgstr "Брой таблици"
 
+#: templates/database/structure/body_for_table_summary.phtml:6
+#, php-format
+msgid "%s table"
+msgid_plural "%s tables"
+msgstr[0] "%s таблица"
+msgstr[1] "%s таблици"
+
+#: templates/database/structure/body_for_table_summary.phtml:17
+msgid "Sum"
+msgstr "Сума"
+
+#: templates/database/structure/check_all_tables.phtml:6
+msgid "Check tables having overhead"
+msgstr "Маркиране на таблиците със загубено място"
+
+#: templates/database/structure/check_all_tables.phtml:10
+#, fuzzy
+#| msgid "Show color"
+msgid "Show create"
+msgstr "Показване свят"
+
+#: templates/database/structure/check_all_tables.phtml:27
+#, fuzzy
+#| msgid "Add prefix"
+msgid "Prefix"
+msgstr "Добавяне на представка"
+
+#: templates/database/structure/check_all_tables.phtml:28
+msgid "Add prefix to table"
+msgstr "Добавяне представка към таблица"
+
+#: templates/database/structure/check_all_tables.phtml:29
+msgid "Replace table prefix"
+msgstr "Замяна на представката на таблица"
+
+#: templates/database/structure/check_all_tables.phtml:30
+msgid "Copy table with prefix"
+msgstr "Копиране на таблицата с представка"
+
+#: templates/database/structure/check_all_tables.phtml:36
+#, fuzzy
+#| msgid "CHAR textarea columns"
+msgid "Add columns to central list"
+msgstr "Колони за CHAR текство поле"
+
+#: templates/database/structure/check_all_tables.phtml:37
+msgid "Remove columns from central list"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:38
+#, fuzzy
+#| msgid "CHAR textarea columns"
+msgid "Make consistent with central list"
+msgstr "Колони за CHAR текство поле"
+
+#: templates/database/structure/favorite_anchor.phtml:12
+msgid "Add to Favorites"
+msgstr ""
+
+#: templates/database/structure/show_create.phtml:2
+#, fuzzy
+#| msgid "Show SQL queries"
+msgid "Showing create queries"
+msgstr "Показване на SQL заявките"
+
+#: templates/database/structure/sortable_header.phtml:13
+msgid "Sort"
+msgstr "Сортиране"
+
+#: templates/database/structure/table_header.phtml:42
+#, fuzzy
+#| msgid "May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]"
+msgid ""
+"May be approximate. Click on the number to get the exact count. See "
+"[doc@faq3-11]FAQ 3.11[/doc]."
+msgstr "Може да има приблизителна стойност. Виж [doc@faq3-11]FAQ 3.11[/doc]"
+
+#: templates/database/structure/table_header.phtml:66
+#: templates/table/index_form.phtml:127
+msgid "Size"
+msgstr "Размер"
+
+#: templates/database/structure/table_header.phtml:74
+#: templates/table/structure/display_table_stats.phtml:27
+msgid "Overhead"
+msgstr "Загубено място"
+
+#: templates/database/structure/tracking_icon.phtml:4
+msgid "Tracking is active."
+msgstr "Проследяването е активно."
+
+#: templates/database/structure/tracking_icon.phtml:8
+msgid "Tracking is not active."
+msgstr "Проследяването е неактивно."
+
 #: templates/error/report_form.phtml:7
 msgid ""
 "phpMyAdmin has encountered an error. We have collected data about this error "
@@ -15452,68 +15573,6 @@ msgstr ""
 msgid "Please explain the steps that lead to the error:"
 msgstr ""
 
-#: templates/gis_visualization/gis_visualization.phtml:3
-msgid "Display GIS Visualization"
-msgstr ""
-
-#: templates/gis_visualization/gis_visualization.phtml:8
-msgid "Label column"
-msgstr "Етикет на колона"
-
-#: templates/gis_visualization/gis_visualization.phtml:11
-msgid "-- None --"
-msgstr "-- без --"
-
-#: templates/gis_visualization/gis_visualization.phtml:19
-msgid "Spatial column"
-msgstr "Пространствено поле"
-
-#: templates/index_form.phtml:16
-msgid "Index name:"
-msgstr "Име на индекс:"
-
-#: templates/index_form.phtml:19
-msgid ""
-"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
-msgstr ""
-"\"PRIMARY\" <b>трябва</b> да е името на <b>и единствено на</b> главен ключ!"
-
-#: templates/index_form.phtml:40
-#, fuzzy
-#| msgid "Index cache size"
-msgid "Index choice:"
-msgstr "Размер на буфера за индекси"
-
-#: templates/index_form.phtml:57
-msgid "Key block size:"
-msgstr ""
-
-#: templates/index_form.phtml:74
-msgid "Index type:"
-msgstr "Тип на индекса:"
-
-#: templates/index_form.phtml:86
-#, fuzzy
-#| msgid "User:"
-msgid "Parser:"
-msgstr "Потребител:"
-
-#: templates/index_form.phtml:102
-#, fuzzy
-#| msgid "Comment"
-msgid "Comment:"
-msgstr "Коментар"
-
-#: templates/index_form.phtml:127 templates/structure/table_header.phtml:66
-msgid "Size"
-msgstr "Размер"
-
-#: templates/index_form.phtml:149 templates/index_form.phtml:190
-#, fuzzy
-#| msgid "Drag to reorder"
-msgid "Drag to reorder"
-msgstr "Завличане за промяна на подредбата"
-
 #: templates/prefs_autoload.phtml:9
 msgid ""
 "Your browser has phpMyAdmin configuration for this domain. Would you like to "
@@ -15528,462 +15587,426 @@ msgstr ""
 msgid "Start row:"
 msgstr "Начален ред"
 
-#: templates/structure/actions_in_table_structure.phtml:14
-#, php-format
-msgid "A primary key has been added on %s."
-msgstr "Беше добавен първичен ключ към %s."
-
-#: templates/structure/actions_in_table_structure.phtml:34
-#: templates/structure/actions_in_table_structure.phtml:54
-#: templates/structure/actions_in_table_structure.phtml:79
-#: templates/structure/actions_in_table_structure.phtml:101
-#, php-format
-msgid "An index has been added on %s."
-msgstr "Беше добавен индекс на %s."
-
-#: templates/structure/actions_in_table_structure.phtml:130
-#: templates/structure/check_all_table_column.phtml:59
-#, fuzzy
-#| msgid "Remove column(s)"
-msgid "Remove from central columns"
-msgstr "Изтриване колона(и)"
-
-#: templates/structure/actions_in_table_structure.phtml:138
-#: templates/structure/check_all_table_column.phtml:55
-#, fuzzy
-#| msgid "CHAR textarea columns"
-msgid "Add to central columns"
-msgstr "Колони за CHAR текство поле"
-
-#: templates/structure/add_column.phtml:7
-#, php-format
-msgid "Add %s column(s)"
-msgstr "Добавяне %s колона(и)"
-
-#: templates/structure/add_column.phtml:12
-#, fuzzy
-#| msgid "At Beginning of Table"
-msgid "at beginning of table"
-msgstr "В началото на таблицата"
-
-#: templates/structure/body_for_table_summary.phtml:6
-#, php-format
-msgid "%s table"
-msgid_plural "%s tables"
-msgstr[0] "%s таблица"
-msgstr[1] "%s таблици"
-
-#: templates/structure/body_for_table_summary.phtml:17
-msgid "Sum"
-msgstr "Сума"
-
-#: templates/structure/check_all_tables.phtml:6
-msgid "Check tables having overhead"
-msgstr "Маркиране на таблиците със загубено място"
-
-#: templates/structure/check_all_tables.phtml:10
-#, fuzzy
-#| msgid "Show color"
-msgid "Show create"
-msgstr "Показване свят"
-
-#: templates/structure/check_all_tables.phtml:27
-#, fuzzy
-#| msgid "Add prefix"
-msgid "Prefix"
-msgstr "Добавяне на представка"
-
-#: templates/structure/check_all_tables.phtml:28
-msgid "Add prefix to table"
-msgstr "Добавяне представка към таблица"
-
-#: templates/structure/check_all_tables.phtml:29
-msgid "Replace table prefix"
-msgstr "Замяна на представката на таблица"
-
-#: templates/structure/check_all_tables.phtml:30
-msgid "Copy table with prefix"
-msgstr "Копиране на таблицата с представка"
-
-#: templates/structure/check_all_tables.phtml:36
-#, fuzzy
-#| msgid "CHAR textarea columns"
-msgid "Add columns to central list"
-msgstr "Колони за CHAR текство поле"
-
-#: templates/structure/check_all_tables.phtml:37
-msgid "Remove columns from central list"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:38
-#, fuzzy
-#| msgid "CHAR textarea columns"
-msgid "Make consistent with central list"
-msgstr "Колони за CHAR текство поле"
-
-#: templates/structure/display_structure.phtml:140 view_create.php:181
-msgid "Edit view"
-msgstr "Изглед за редакция"
-
-#: templates/structure/display_table_stats.phtml:9
-msgid "Space usage"
-msgstr "Използвано място"
-
-#: templates/structure/display_table_stats.phtml:27
-#: templates/structure/table_header.phtml:74
-msgid "Overhead"
-msgstr "Загубено място"
-
-#: templates/structure/display_table_stats.phtml:32
-msgid "Effective"
-msgstr "Ефективни"
-
-#: templates/structure/favorite_anchor.phtml:12
-msgid "Add to Favorites"
-msgstr ""
-
-#: templates/structure/move_columns_dialog.phtml:1
-#: templates/structure/optional_action_links.phtml:21
-msgid "Move columns"
-msgstr "Преместване колони"
-
-#: templates/structure/move_columns_dialog.phtml:2
-msgid "Move the columns by dragging them up and down."
-msgstr ""
-
-#: templates/structure/optional_action_links.phtml:9
-msgid "Propose table structure"
-msgstr "Анализ на таблицата"
-
-#: templates/structure/optional_action_links.phtml:24
-#, fuzzy
-#| msgid "Propose table structure"
-msgid "Improve table structure"
-msgstr "Анализ на таблицата"
-
-#: templates/structure/optional_action_links.phtml:30
-msgid "Track view"
-msgstr "Изглед за следене"
-
-#: templates/structure/row_stats_table.phtml:3
-#, fuzzy
-#| msgid "Row Statistics"
-msgid "Row statistics"
-msgstr "Статистика за редовете"
-
-#: templates/structure/row_stats_table.phtml:9
-msgid "static"
-msgstr "статичен"
-
-#: templates/structure/row_stats_table.phtml:11
-msgid "dynamic"
-msgstr "динамичен"
-
-#: templates/structure/row_stats_table.phtml:22
-msgid "partitioned"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:54
-msgid "Row length"
-msgstr "Дължина ред"
-
-#: templates/structure/row_stats_table.phtml:66
-msgid "Row size"
-msgstr "Размер ред"
-
-#: templates/structure/row_stats_table.phtml:73
-msgid "Next autoindex"
-msgstr ""
-
-#: templates/structure/secondary_tabs.phtml:14
-#, fuzzy
-#| msgid "Relation view"
-msgid "Relation view"
-msgstr "Преглед релации"
-
-#: templates/structure/show_create.phtml:2
-#, fuzzy
-#| msgid "Show SQL queries"
-msgid "Showing create queries"
-msgstr "Показване на SQL заявките"
-
-#: templates/structure/sortable_header.phtml:13
-msgid "Sort"
-msgstr "Сортиране"
-
-#: templates/structure/table_header.phtml:42
-#, fuzzy
-#| msgid "May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]"
-msgid ""
-"May be approximate. Click on the number to get the exact count. See "
-"[doc@faq3-11]FAQ 3.11[/doc]."
-msgstr "Може да има приблизителна стойност. Виж [doc@faq3-11]FAQ 3.11[/doc]"
-
-#: templates/structure/table_structure_row.phtml:46
-#, php-format
-msgid "Column %s has been dropped."
-msgstr "Колоната %s беше изтрита."
-
-#: templates/structure/tracking_icon.phtml:4
-msgid "Tracking is active."
-msgstr "Проследяването е активно."
-
-#: templates/structure/tracking_icon.phtml:8
-msgid "Tracking is not active."
-msgstr "Проследяването е неактивно."
-
-#: templates/table/create_table.phtml:15
-msgid "Number of columns"
-msgstr "Брой колони"
-
-#: templates/table/options.phtml:8
-msgid "Select columns (at least one):"
-msgstr "Избор на колона (поне една):"
-
-#: templates/table/options.phtml:37
-msgid "Add search conditions (body of the \"where\" clause):"
-msgstr "Добавяне на условие за търсене (съдържание на \"where\" клаузата):"
-
-#: templates/table/options.phtml:45
-msgid "Number of rows per page"
-msgstr "Брой редове на страница"
-
-#: templates/table/options.phtml:56
-msgid "Display order:"
-msgstr "Подреждане по:"
-
-#: templates/table/options_zoom.phtml:6
-msgid "Use this column to label each point"
-msgstr "Използване колоната като етикет за всяка точка"
-
-#: templates/table/options_zoom.phtml:35
-msgid "Maximum rows to plot"
-msgstr "Максимален брой редове за изчертаване"
-
-#: templates/table/replace_preview.phtml:13
-msgid "Find and replace - preview"
-msgstr ""
-
-#: templates/table/replace_preview.phtml:18
-#, fuzzy
-#| msgid "Original position"
-msgid "Original string"
-msgstr "Първоначално положение"
-
-#: templates/table/replace_preview.phtml:19
-#, fuzzy
-#| msgid "Replace table prefix"
-msgid "Replaced string"
-msgstr "Замяна на представката на таблица"
-
-#: templates/table/replace_preview.phtml:40
-#, fuzzy
-#| msgid "Replicated"
-msgid "Replace"
-msgstr "Реплицирана"
-
-#: templates/table/rows_zoom.phtml:16
-msgid "Additional search criteria"
-msgstr "Допълнителен критерий за търсене"
-
-#: templates/table/search_and_replace.phtml:3
-#, fuzzy
-#| msgid "Replace NULL with:"
-msgid "Replace with:"
-msgstr "Замяна NULL с:"
-
-#: templates/table/search_and_replace.phtml:22
-#, fuzzy
-#| msgid "as regular expression"
-msgid "Use regular expression"
-msgstr "като регулярен израз"
-
-#: templates/table/selection_form.phtml:12
-msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
-msgstr ""
-"Изпълняване \"заявка по шаблон\" (знак за заместване: \"%\") за две различни "
-"колони"
-
-#: templates/table/selection_form.phtml:34
-msgid "Do a \"query by example\" (wildcard: \"%\")"
-msgstr "Изпълняване на \"заявка по шаблон\" (знак за заместване: \"%\")"
-
-#: templates/table/zoom_result_form.phtml:7
-msgid "Browse/Edit the points"
-msgstr "Прелистване/Редакция точки"
-
-#: templates/table/zoom_result_form.phtml:15
-msgid "How to use"
-msgstr "Как да бъде използвано"
-
-#: templates/table/zoom_result_form.phtml:23
-msgid "Reset zoom"
-msgstr "Възстановяване на мащабирането"
-
-#: templates/tbl_chart.phtml:17
+#: templates/table/chart/tbl_chart.phtml:17
 msgctxt "Chart type"
 msgid "Bar"
 msgstr "Стълб"
 
-#: templates/tbl_chart.phtml:21
+#: templates/table/chart/tbl_chart.phtml:21
 msgctxt "Chart type"
 msgid "Column"
 msgstr "Kолона"
 
-#: templates/tbl_chart.phtml:25
+#: templates/table/chart/tbl_chart.phtml:25
 msgctxt "Chart type"
 msgid "Line"
 msgstr "Линия"
 
-#: templates/tbl_chart.phtml:29
+#: templates/table/chart/tbl_chart.phtml:29
 msgctxt "Chart type"
 msgid "Spline"
 msgstr "Сплайн"
 
-#: templates/tbl_chart.phtml:33
+#: templates/table/chart/tbl_chart.phtml:33
 msgctxt "Chart type"
 msgid "Area"
 msgstr ""
 
-#: templates/tbl_chart.phtml:37
+#: templates/table/chart/tbl_chart.phtml:37
 msgctxt "Chart type"
 msgid "Pie"
 msgstr "Пита"
 
-#: templates/tbl_chart.phtml:41
+#: templates/table/chart/tbl_chart.phtml:41
 #, fuzzy
 #| msgid "Time"
 msgctxt "Chart type"
 msgid "Timeline"
 msgstr "Време"
 
-#: templates/tbl_chart.phtml:45
+#: templates/table/chart/tbl_chart.phtml:45
 msgctxt "Chart type"
 msgid "Scatter"
 msgstr ""
 
-#: templates/tbl_chart.phtml:50
+#: templates/table/chart/tbl_chart.phtml:50
 msgid "Stacked"
 msgstr "Припокриващи се"
 
-#: templates/tbl_chart.phtml:53
+#: templates/table/chart/tbl_chart.phtml:53
 msgid "Chart title"
 msgstr "Заглавие на диаграмата"
 
-#: templates/tbl_chart.phtml:57
+#: templates/table/chart/tbl_chart.phtml:57
 msgid "X-Axis:"
 msgstr "Ос X:"
 
-#: templates/tbl_chart.phtml:72
+#: templates/table/chart/tbl_chart.phtml:72
 msgid "Series:"
 msgstr "Поредици:"
 
-#: templates/tbl_chart.phtml:102
+#: templates/table/chart/tbl_chart.phtml:102
 msgid "X-Axis label:"
 msgstr "Етикет на оста X:"
 
-#: templates/tbl_chart.phtml:104
+#: templates/table/chart/tbl_chart.phtml:104
 msgid "X Values"
 msgstr "Стойности на X"
 
-#: templates/tbl_chart.phtml:107
+#: templates/table/chart/tbl_chart.phtml:107
 msgid "Y-Axis label:"
 msgstr "Етикет на оста Y:"
 
-#: templates/tbl_chart.phtml:115
+#: templates/table/chart/tbl_chart.phtml:115
 msgid "Series names are in a column"
 msgstr ""
 
-#: templates/tbl_chart.phtml:118
+#: templates/table/chart/tbl_chart.phtml:118
 #, fuzzy
 #| msgid "Inside column:"
 msgid "Series column:"
 msgstr "В колона:"
 
-#: templates/tbl_chart.phtml:130
+#: templates/table/chart/tbl_chart.phtml:130
 #, fuzzy
 #| msgid "Values for column %s"
 msgid "Value Column:"
 msgstr "Стойности за колоната %s"
 
-#: templates/tbl_chart.phtml:150
+#: templates/table/chart/tbl_chart.phtml:150
 #, fuzzy
 #| msgid "Save as file"
 msgid "Save chart as image"
 msgstr "Изпращане"
 
-#: templates/tbl_relation/common_form.phtml:7
+#: templates/table/gis_visualization/gis_visualization.phtml:3
+msgid "Display GIS Visualization"
+msgstr ""
+
+#: templates/table/gis_visualization/gis_visualization.phtml:8
+msgid "Label column"
+msgstr "Етикет на колона"
+
+#: templates/table/gis_visualization/gis_visualization.phtml:11
+msgid "-- None --"
+msgstr "-- без --"
+
+#: templates/table/gis_visualization/gis_visualization.phtml:19
+msgid "Spatial column"
+msgstr "Пространствено поле"
+
+#: templates/table/index_form.phtml:16
+msgid "Index name:"
+msgstr "Име на индекс:"
+
+#: templates/table/index_form.phtml:19
+msgid ""
+"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
+msgstr ""
+"\"PRIMARY\" <b>трябва</b> да е името на <b>и единствено на</b> главен ключ!"
+
+#: templates/table/index_form.phtml:40
+#, fuzzy
+#| msgid "Index cache size"
+msgid "Index choice:"
+msgstr "Размер на буфера за индекси"
+
+#: templates/table/index_form.phtml:57
+msgid "Key block size:"
+msgstr ""
+
+#: templates/table/index_form.phtml:74
+msgid "Index type:"
+msgstr "Тип на индекса:"
+
+#: templates/table/index_form.phtml:86
+#, fuzzy
+#| msgid "User:"
+msgid "Parser:"
+msgstr "Потребител:"
+
+#: templates/table/index_form.phtml:102
+#, fuzzy
+#| msgid "Comment"
+msgid "Comment:"
+msgstr "Коментар"
+
+#: templates/table/index_form.phtml:149 templates/table/index_form.phtml:190
+#, fuzzy
+#| msgid "Drag to reorder"
+msgid "Drag to reorder"
+msgstr "Завличане за промяна на подредбата"
+
+#: templates/table/relation/common_form.phtml:7
 msgid "Internal relations"
 msgstr "Вътрешни релации"
 
-#: templates/tbl_relation/common_form.phtml:11
+#: templates/table/relation/common_form.phtml:11
 msgid "Internal relation"
 msgstr "Вътрешна релация"
 
-#: templates/tbl_relation/common_form.phtml:14
+#: templates/table/relation/common_form.phtml:14
 msgid ""
 "An internal relation is not necessary when a corresponding FOREIGN KEY "
 "relation exists."
 msgstr ""
 "Вътрешна релация не е необходима, при наличието на съответен FOREIGN KEY."
 
-#: templates/tbl_relation/common_form.phtml:37
+#: templates/table/relation/common_form.phtml:37
 #, fuzzy
 #| msgid "Foreign key constraint"
 msgid "Foreign key constraints"
 msgstr "Ограничение за външен ключ"
 
-#: templates/tbl_relation/common_form.phtml:40
+#: templates/table/relation/common_form.phtml:40
 #, fuzzy
 #| msgid "Action"
 msgid "Actions"
 msgstr "Действие"
 
-#: templates/tbl_relation/common_form.phtml:41
+#: templates/table/relation/common_form.phtml:41
 #, fuzzy
 #| msgid "Constraints for table"
 msgid "Constraint properties"
 msgstr "Ограничения за таблица"
 
-#: templates/tbl_relation/common_form.phtml:44
+#: templates/table/relation/common_form.phtml:44
 msgid ""
 "Only columns with index will be displayed. You can define an index below."
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:49
+#: templates/table/relation/common_form.phtml:49
 msgid "Foreign key constraint"
 msgstr "Ограничение за външен ключ"
 
-#: templates/tbl_relation/common_form.phtml:81
+#: templates/table/relation/common_form.phtml:81
 #, fuzzy
 #| msgid "Add constraints"
 msgid "+ Add constraint"
 msgstr "Добавяне ограничения"
 
-#: templates/tbl_relation/common_form.phtml:91
+#: templates/table/relation/common_form.phtml:91
 #, fuzzy
 #| msgid "Choose column to display"
 msgid "Choose column to display:"
 msgstr "Изберете колона за показване"
 
-#: templates/tbl_relation/foreign_key_row.phtml:13
+#: templates/table/relation/foreign_key_row.phtml:13
 #, fuzzy, php-format
 #| msgid "Foreign key constraint"
 msgid "Foreign key constraint %s has been dropped"
 msgstr "Ограничение за външен ключ"
 
-#: templates/tbl_relation/foreign_key_row.phtml:102
+#: templates/table/relation/foreign_key_row.phtml:102
 #, fuzzy
 #| msgid "Constraints for table"
 msgid "Constraint name"
 msgstr "Ограничения за таблица"
 
-#: templates/tbl_relation/foreign_key_row.phtml:157
+#: templates/table/relation/foreign_key_row.phtml:157
 #, fuzzy
 #| msgid "Add column"
 msgid "+ Add column"
 msgstr "Добавяне колона"
 
+#: templates/table/search/options.phtml:8
+msgid "Select columns (at least one):"
+msgstr "Избор на колона (поне една):"
+
+#: templates/table/search/options.phtml:37
+msgid "Add search conditions (body of the \"where\" clause):"
+msgstr "Добавяне на условие за търсене (съдържание на \"where\" клаузата):"
+
+#: templates/table/search/options.phtml:45
+msgid "Number of rows per page"
+msgstr "Брой редове на страница"
+
+#: templates/table/search/options.phtml:56
+msgid "Display order:"
+msgstr "Подреждане по:"
+
+#: templates/table/search/options_zoom.phtml:6
+msgid "Use this column to label each point"
+msgstr "Използване колоната като етикет за всяка точка"
+
+#: templates/table/search/options_zoom.phtml:35
+msgid "Maximum rows to plot"
+msgstr "Максимален брой редове за изчертаване"
+
+#: templates/table/search/replace_preview.phtml:13
+msgid "Find and replace - preview"
+msgstr ""
+
+#: templates/table/search/replace_preview.phtml:18
+#, fuzzy
+#| msgid "Original position"
+msgid "Original string"
+msgstr "Първоначално положение"
+
+#: templates/table/search/replace_preview.phtml:19
+#, fuzzy
+#| msgid "Replace table prefix"
+msgid "Replaced string"
+msgstr "Замяна на представката на таблица"
+
+#: templates/table/search/replace_preview.phtml:40
+#, fuzzy
+#| msgid "Replicated"
+msgid "Replace"
+msgstr "Реплицирана"
+
+#: templates/table/search/rows_zoom.phtml:16
+msgid "Additional search criteria"
+msgstr "Допълнителен критерий за търсене"
+
+#: templates/table/search/search_and_replace.phtml:3
+#, fuzzy
+#| msgid "Replace NULL with:"
+msgid "Replace with:"
+msgstr "Замяна NULL с:"
+
+#: templates/table/search/search_and_replace.phtml:22
+#, fuzzy
+#| msgid "as regular expression"
+msgid "Use regular expression"
+msgstr "като регулярен израз"
+
+#: templates/table/search/selection_form.phtml:12
+msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
+msgstr ""
+"Изпълняване \"заявка по шаблон\" (знак за заместване: \"%\") за две различни "
+"колони"
+
+#: templates/table/search/selection_form.phtml:34
+msgid "Do a \"query by example\" (wildcard: \"%\")"
+msgstr "Изпълняване на \"заявка по шаблон\" (знак за заместване: \"%\")"
+
+#: templates/table/search/zoom_result_form.phtml:7
+msgid "Browse/Edit the points"
+msgstr "Прелистване/Редакция точки"
+
+#: templates/table/search/zoom_result_form.phtml:15
+msgid "How to use"
+msgstr "Как да бъде използвано"
+
+#: templates/table/search/zoom_result_form.phtml:23
+msgid "Reset zoom"
+msgstr "Възстановяване на мащабирането"
+
+#: templates/table/secondary_tabs.phtml:14
+#, fuzzy
+#| msgid "Relation view"
+msgid "Relation view"
+msgstr "Преглед релации"
+
+#: templates/table/structure/actions_in_table_structure.phtml:14
+#, php-format
+msgid "A primary key has been added on %s."
+msgstr "Беше добавен първичен ключ към %s."
+
+#: templates/table/structure/actions_in_table_structure.phtml:34
+#: templates/table/structure/actions_in_table_structure.phtml:54
+#: templates/table/structure/actions_in_table_structure.phtml:79
+#: templates/table/structure/actions_in_table_structure.phtml:101
+#, php-format
+msgid "An index has been added on %s."
+msgstr "Беше добавен индекс на %s."
+
+#: templates/table/structure/actions_in_table_structure.phtml:130
+#: templates/table/structure/check_all_table_column.phtml:59
+#, fuzzy
+#| msgid "Remove column(s)"
+msgid "Remove from central columns"
+msgstr "Изтриване колона(и)"
+
+#: templates/table/structure/actions_in_table_structure.phtml:138
+#: templates/table/structure/check_all_table_column.phtml:55
+#, fuzzy
+#| msgid "CHAR textarea columns"
+msgid "Add to central columns"
+msgstr "Колони за CHAR текство поле"
+
+#: templates/table/structure/add_column.phtml:7
+#, php-format
+msgid "Add %s column(s)"
+msgstr "Добавяне %s колона(и)"
+
+#: templates/table/structure/add_column.phtml:12
+#, fuzzy
+#| msgid "At Beginning of Table"
+msgid "at beginning of table"
+msgstr "В началото на таблицата"
+
+#: templates/table/structure/display_structure.phtml:140 view_create.php:181
+msgid "Edit view"
+msgstr "Изглед за редакция"
+
+#: templates/table/structure/display_table_stats.phtml:9
+msgid "Space usage"
+msgstr "Използвано място"
+
+#: templates/table/structure/display_table_stats.phtml:32
+msgid "Effective"
+msgstr "Ефективни"
+
+#: templates/table/structure/move_columns_dialog.phtml:1
+#: templates/table/structure/optional_action_links.phtml:21
+msgid "Move columns"
+msgstr "Преместване колони"
+
+#: templates/table/structure/move_columns_dialog.phtml:2
+msgid "Move the columns by dragging them up and down."
+msgstr ""
+
+#: templates/table/structure/optional_action_links.phtml:9
+msgid "Propose table structure"
+msgstr "Анализ на таблицата"
+
+#: templates/table/structure/optional_action_links.phtml:24
+#, fuzzy
+#| msgid "Propose table structure"
+msgid "Improve table structure"
+msgstr "Анализ на таблицата"
+
+#: templates/table/structure/optional_action_links.phtml:30
+msgid "Track view"
+msgstr "Изглед за следене"
+
+#: templates/table/structure/row_stats_table.phtml:3
+#, fuzzy
+#| msgid "Row Statistics"
+msgid "Row statistics"
+msgstr "Статистика за редовете"
+
+#: templates/table/structure/row_stats_table.phtml:9
+msgid "static"
+msgstr "статичен"
+
+#: templates/table/structure/row_stats_table.phtml:11
+msgid "dynamic"
+msgstr "динамичен"
+
+#: templates/table/structure/row_stats_table.phtml:22
+msgid "partitioned"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:54
+msgid "Row length"
+msgstr "Дължина ред"
+
+#: templates/table/structure/row_stats_table.phtml:66
+msgid "Row size"
+msgstr "Размер ред"
+
+#: templates/table/structure/row_stats_table.phtml:73
+msgid "Next autoindex"
+msgstr ""
+
+#: templates/table/structure/table_structure_row.phtml:46
+#, php-format
+msgid "Column %s has been dropped."
+msgstr "Колоната %s беше изтрита."
+
 #: themes.php:17 themes.php:22
 msgid "Theme"
 msgstr "Тема"
@@ -17178,6 +17201,11 @@ msgstr ""
 msgid "concurrent_insert is set to 0"
 msgstr "concurrent_insert e 0"
 
+#, fuzzy
+#~| msgid "Read misses"
+#~ msgid "Read as multibytes"
+#~ msgstr "Пропуснати прочитания"
+
 #~ msgid "Add index"
 #~ msgstr "Добавяне на индекс"
 
diff --git a/po/bn.po b/po/bn.po
index 36485f3118..898cecef25 100644
--- a/po/bn.po
+++ b/po/bn.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 4.5.0-dev\n"
 "Report-Msgid-Bugs-To: developers@phpmyadmin.net\n"
-"POT-Creation-Date: 2015-08-08 13:53-0400\n"
+"POT-Creation-Date: 2015-08-12 08:10-0400\n"
 "PO-Revision-Date: 2015-07-14 11:09+0200\n"
 "Last-Translator: Michal Čihař <michal@cihar.com>\n"
 "Language-Team: Bengali <https://hosted.weblate.org/projects/phpmyadmin/"
@@ -54,7 +54,7 @@ msgid "Table comments:"
 msgstr "টেবিলের মন্তব্য সমূহ:"
 
 #: db_datadict.php:104 libraries/Index.class.php:699
-#: libraries/insert_edit.lib.php:1567
+#: libraries/insert_edit.lib.php:1565
 #: libraries/navigation/Nodes/Node_Column.class.php:30
 #: libraries/plugins/export/ExportHtmlword.class.php:280
 #: libraries/plugins/export/ExportHtmlword.class.php:375
@@ -68,13 +68,14 @@ msgstr "টেবিলের মন্তব্য সমূহ:"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1023
 #: libraries/tracking.lib.php:879 libraries/tracking.lib.php:975
 #: templates/columns_definitions/column_name.phtml:18
-#: templates/index_form.phtml:124 templates/table/table_header.phtml:6
-#: templates/table/zoom_result_form.phtml:33
-#: templates/tbl_relation/common_form.phtml:10
-#: templates/tbl_relation/common_form.phtml:43
-#: templates/tbl_relation/foreign_key_row.phtml:194
-#: templates/tbl_relation/foreign_key_row.phtml:206
-#: templates/tbl_relation/internal_relational_row.phtml:71
+#: templates/table/index_form.phtml:124
+#: templates/table/relation/common_form.phtml:10
+#: templates/table/relation/common_form.phtml:43
+#: templates/table/relation/foreign_key_row.phtml:194
+#: templates/table/relation/foreign_key_row.phtml:206
+#: templates/table/relation/internal_relational_row.phtml:71
+#: templates/table/search/table_header.phtml:6
+#: templates/table/search/zoom_result_form.phtml:33
 msgid "Column"
 msgstr "স্তম্ভ"
 
@@ -92,21 +93,21 @@ msgstr "স্তম্ভ"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1001
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1024
 #: libraries/rte/rte_list.lib.php:75 libraries/rte/rte_list.lib.php:103
-#: libraries/rte/rte_routines.lib.php:802
-#: libraries/rte/rte_routines.lib.php:831
-#: libraries/rte/rte_routines.lib.php:1493
+#: libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_routines.lib.php:922
+#: libraries/rte/rte_routines.lib.php:1584
 #: libraries/server_privileges.lib.php:2369 libraries/tracking.lib.php:880
 #: libraries/tracking.lib.php:972
 #: templates/columns_definitions/table_fields_definitions.phtml:11
-#: templates/structure/table_header.phtml:48
-#: templates/structure/table_structure_header.phtml:6
-#: templates/table/table_header.phtml:7
+#: templates/database/structure/table_header.phtml:48
+#: templates/table/search/table_header.phtml:7
+#: templates/table/structure/table_structure_header.phtml:6
 msgid "Type"
 msgstr "ধরণ"
 
 #: db_datadict.php:106 libraries/Index.class.php:702
 #: libraries/central_columns.lib.php:708
-#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1576
+#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1574
 #: libraries/plugins/export/ExportHtmlword.class.php:286
 #: libraries/plugins/export/ExportHtmlword.class.php:381
 #: libraries/plugins/export/ExportLatex.class.php:509
@@ -119,8 +120,8 @@ msgstr "ধরণ"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1026
 #: libraries/tracking.lib.php:882 libraries/tracking.lib.php:978
 #: templates/columns_definitions/table_fields_definitions.phtml:39
-#: templates/structure/table_structure_header.phtml:9
-#: templates/table/zoom_result_form.phtml:34
+#: templates/table/search/zoom_result_form.phtml:34
+#: templates/table/structure/table_structure_header.phtml:9
 msgid "Null"
 msgstr "নাল"
 
@@ -138,8 +139,8 @@ msgstr "নাল"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1027
 #: libraries/replication_gui.lib.php:153 libraries/tracking.lib.php:883
 #: templates/columns_definitions/table_fields_definitions.phtml:25
-#: templates/structure/body_for_table_summary.phtml:55
-#: templates/structure/table_structure_header.phtml:10
+#: templates/database/structure/body_for_table_summary.phtml:55
+#: templates/table/structure/table_structure_header.phtml:10
 msgid "Default"
 msgstr "স্বাভাবিক"
 
@@ -167,19 +168,19 @@ msgid "Comments"
 msgstr "মন্তব্য"
 
 #: db_datadict.php:146
-#: libraries/controllers/StructureController.class.php:1960
-#: libraries/controllers/StructureController.class.php:1965
+#: libraries/controllers/TableStructureController.class.php:951
+#: libraries/controllers/TableStructureController.class.php:956
 #: libraries/tracking.lib.php:922
 #: templates/columns_definitions/column_indexes.phtml:6
-#: templates/structure/check_all_table_column.phtml:22
-#: templates/structure/display_structure.phtml:74
+#: templates/table/structure/check_all_table_column.phtml:22
+#: templates/table/structure/display_structure.phtml:74
 msgid "Primary"
 msgstr "প্রাথমিক"
 
 #: db_datadict.php:156 js/messages.php:317 libraries/Index.class.php:567
 #: libraries/Index.class.php:606 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261 libraries/mult_submits.lib.php:403
+#: libraries/config/FormDisplay.tpl.php:272 libraries/mult_submits.lib.php:403
 #: libraries/mult_submits.lib.php:417
 #: libraries/plugins/export/ExportHtmlword.class.php:630
 #: libraries/plugins/export/ExportLatex.class.php:589
@@ -195,20 +196,20 @@ msgstr "প্রাথমিক"
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1010 libraries/tracking.lib.php:1015
 #: prefs_manage.php:140 templates/prefs_autoload.phtml:15
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "No"
 msgstr "না"
 
 #: db_datadict.php:156 js/messages.php:443 libraries/Index.class.php:568
 #: libraries/Index.class.php:605 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261
-#: libraries/controllers/StructureController.class.php:1344
-#: libraries/controllers/StructureController.class.php:2223
-#: libraries/controllers/StructureController.class.php:2232
-#: libraries/controllers/StructureController.class.php:2237
-#: libraries/controllers/StructureController.class.php:2242
-#: libraries/controllers/StructureController.class.php:2247
+#: libraries/config/FormDisplay.tpl.php:272
+#: libraries/controllers/TableStructureController.class.php:539
+#: libraries/controllers/TableStructureController.class.php:1201
+#: libraries/controllers/TableStructureController.class.php:1210
+#: libraries/controllers/TableStructureController.class.php:1215
+#: libraries/controllers/TableStructureController.class.php:1220
+#: libraries/controllers/TableStructureController.class.php:1225
 #: libraries/mult_submits.inc.php:82 libraries/mult_submits.inc.php:178
 #: libraries/mult_submits.lib.php:339 libraries/mult_submits.lib.php:372
 #: libraries/mult_submits.lib.php:401 libraries/mult_submits.lib.php:415
@@ -217,8 +218,8 @@ msgstr "না"
 #: libraries/plugins/export/ExportOdt.class.php:756
 #: libraries/plugins/export/ExportTexytext.class.php:567
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1077
-#: libraries/server_databases.lib.php:464
-#: libraries/server_databases.lib.php:474
+#: libraries/server_databases.lib.php:475
+#: libraries/server_databases.lib.php:485
 #: libraries/server_privileges.lib.php:2546
 #: libraries/server_privileges.lib.php:2727
 #: libraries/server_privileges.lib.php:2748
@@ -228,7 +229,7 @@ msgstr "না"
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1008 libraries/tracking.lib.php:1013
 #: prefs_manage.php:138 templates/prefs_autoload.phtml:14
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "Yes"
 msgstr "হ্যাঁ"
 
@@ -238,7 +239,7 @@ msgstr "ডাটাবেজ(গঠন)স্তুপ দেখাও"
 
 #: db_export.php:37 db_tracking.php:90 export.php:382
 #: libraries/DBQbe.class.php:326
-#: libraries/controllers/StructureController.class.php:231
+#: libraries/controllers/DatabaseStructureController.class.php:170
 #: libraries/navigation/NavigationTree.class.php:897
 msgid "No tables found in database."
 msgstr "ডাটাবেইজে কোন টেবিল নাই।"
@@ -249,14 +250,14 @@ msgstr "ডাটাবেইজে কোন টেবিল নাই।"
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:26
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:120
-#: templates/structure/show_create.phtml:18
+#: templates/database/structure/show_create.phtml:18
 msgid "Tables"
 msgstr "টেবল"
 
 #: db_export.php:52 libraries/Menu.class.php:317 libraries/Menu.class.php:425
-#: libraries/Util.class.php:3333 libraries/Util.class.php:3343
-#: libraries/Util.class.php:3349 libraries/Util.class.php:3629
-#: libraries/Util.class.php:4327 libraries/Util.class.php:4344
+#: libraries/Util.class.php:3339 libraries/Util.class.php:3349
+#: libraries/Util.class.php:3355 libraries/Util.class.php:3635
+#: libraries/Util.class.php:4333 libraries/Util.class.php:4350
 #: libraries/central_columns.lib.php:728 libraries/config.values.php:39
 #: libraries/config.values.php:47 libraries/config.values.php:109
 #: libraries/config.values.php:115 libraries/config/setup.forms.php:323
@@ -270,7 +271,7 @@ msgstr "টেবল"
 #: libraries/navigation/Nodes/Node_Table.class.php:283
 #: libraries/server_privileges.lib.php:1141 libraries/tracking.lib.php:874
 #: templates/columns_definitions/table_fields_definitions.phtml:3
-#: templates/designer/table_list.phtml:28
+#: templates/database/designer/table_list.phtml:28
 msgid "Structure"
 msgstr "গঠন"
 
@@ -282,7 +283,7 @@ msgstr "গঠন"
 #: libraries/config/user_preferences.forms.php:292
 #: libraries/config/user_preferences.forms.php:297
 #: libraries/server_privileges.lib.php:1140
-#: templates/structure/display_table_stats.phtml:12
+#: templates/table/structure/display_table_stats.phtml:12
 msgid "Data"
 msgstr "তথ্য"
 
@@ -368,10 +369,10 @@ msgstr "ট্রেক কৃত টেবিলসমূহ"
 #: libraries/server_privileges.lib.php:2908
 #: libraries/server_privileges.lib.php:3145
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4346
-#: templates/structure/table_header.phtml:21
-#: templates/tbl_relation/foreign_key_row.phtml:176
-#: templates/tbl_relation/internal_relational_row.phtml:63
+#: libraries/server_privileges.lib.php:4372
+#: templates/database/structure/table_header.phtml:21
+#: templates/table/relation/foreign_key_row.phtml:176
+#: templates/table/relation/internal_relational_row.phtml:63
 msgid "Table"
 msgstr "টেবল"
 
@@ -388,7 +389,7 @@ msgid "Updated"
 msgstr "আধুনিকায়ন হয়েছে"
 
 #: db_tracking.php:130 js/messages.php:243 libraries/Menu.class.php:552
-#: libraries/Util.class.php:4314 libraries/config.values.php:104
+#: libraries/Util.class.php:4320 libraries/config.values.php:104
 #: libraries/rte/rte_events.lib.php:393 libraries/rte/rte_list.lib.php:101
 #: libraries/server_status_processes.lib.php:92 libraries/tracking.lib.php:279
 msgid "Status"
@@ -397,14 +398,15 @@ msgstr "অবস্থা"
 #: db_tracking.php:131 db_tracking.php:290 libraries/Index.class.php:693
 #: libraries/central_columns.lib.php:687 libraries/rte/rte_list.lib.php:74
 #: libraries/rte/rte_list.lib.php:89 libraries/rte/rte_list.lib.php:102
-#: libraries/server_databases.lib.php:398
+#: libraries/server_databases.lib.php:409
 #: libraries/server_privileges.lib.php:2372
 #: libraries/server_privileges.lib.php:3166
 #: libraries/server_privileges.lib.php:3342
 #: libraries/server_user_groups.lib.php:82
 #: libraries/server_variables.lib.php:189 libraries/tracking.lib.php:280
-#: libraries/tracking.lib.php:793 templates/structure/table_header.phtml:30
-#: templates/structure/table_structure_header.phtml:23
+#: libraries/tracking.lib.php:793
+#: templates/database/structure/table_header.phtml:30
+#: templates/table/structure/table_structure_header.phtml:23
 msgid "Action"
 msgstr "কর্ম"
 
@@ -448,7 +450,7 @@ msgid "Untracked tables"
 msgstr "ট্রেকিং হয়নি যে টেবিলসমুহ"
 
 #: db_tracking.php:305 db_tracking.php:336
-#: templates/structure/optional_action_links.phtml:17
+#: templates/table/structure/optional_action_links.phtml:17
 msgid "Track table"
 msgstr "টেবিল ট্রেক"
 
@@ -501,7 +503,7 @@ msgid "Value for the column \"%s\""
 msgstr "স্বম্ভ \"%s\" এর জন্য তথ্য"
 
 #: gis_data_editor.php:146
-#: templates/gis_visualization/gis_visualization.phtml:37
+#: templates/table/gis_visualization/gis_visualization.phtml:37
 msgid "Use OpenStreetMaps as Base Layer"
 msgstr "ওপেনস্ট্রীটম্যাপ প্রধান স্তর হিসাবে ব্যবহার কর"
 
@@ -581,35 +583,35 @@ msgstr "জ্যামিতি যোগ কর"
 #: libraries/display_change_password.lib.php:162
 #: libraries/display_export.lib.php:402 libraries/display_export.lib.php:408
 #: libraries/display_import.lib.php:392 libraries/index.lib.php:44
-#: libraries/insert_edit.lib.php:1546 libraries/insert_edit.lib.php:1583
+#: libraries/insert_edit.lib.php:1544 libraries/insert_edit.lib.php:1581
 #: libraries/normalization.lib.php:165 libraries/normalization.lib.php:821
 #: libraries/operations.lib.php:38 libraries/operations.lib.php:108
 #: libraries/operations.lib.php:263 libraries/operations.lib.php:306
 #: libraries/operations.lib.php:801 libraries/operations.lib.php:874
 #: libraries/operations.lib.php:923 libraries/operations.lib.php:1337
 #: libraries/operations.lib.php:1658
-#: libraries/plugins/auth/AuthenticationCookie.class.php:244
+#: libraries/plugins/auth/AuthenticationCookie.class.php:232
 #: libraries/replication_gui.lib.php:122 libraries/replication_gui.lib.php:161
 #: libraries/replication_gui.lib.php:324 libraries/replication_gui.lib.php:461
 #: libraries/replication_gui.lib.php:906 libraries/rte/rte_events.lib.php:509
-#: libraries/rte/rte_routines.lib.php:969
-#: libraries/rte/rte_routines.lib.php:1581
+#: libraries/rte/rte_routines.lib.php:1060
+#: libraries/rte/rte_routines.lib.php:1672
 #: libraries/rte/rte_triggers.lib.php:396 libraries/server_bin_log.lib.php:61
 #: libraries/server_privileges.lib.php:705
 #: libraries/server_privileges.lib.php:2106
 #: libraries/server_privileges.lib.php:2872
 #: libraries/server_privileges.lib.php:3553
-#: libraries/server_privileges.lib.php:4627
+#: libraries/server_privileges.lib.php:4653
 #: libraries/server_user_groups.lib.php:285
 #: libraries/sql_query_form.lib.php:369 libraries/sql_query_form.lib.php:429
 #: libraries/tracking.lib.php:533 libraries/tracking.lib.php:653
 #: prefs_manage.php:277 prefs_manage.php:355
 #: templates/columns_definitions/column_definitions_form.phtml:59
-#: templates/header_location.phtml:17 templates/index_form.phtml:238
+#: templates/database/create_table.phtml:21 templates/header_location.phtml:28
 #: templates/startAndNumberOfRowsPanel.phtml:14
-#: templates/structure/add_column.phtml:25
-#: templates/table/create_table.phtml:21
-#: templates/table/selection_form.phtml:75 view_create.php:275
+#: templates/table/index_form.phtml:238
+#: templates/table/search/selection_form.phtml:75
+#: templates/table/structure/add_column.phtml:25 view_create.php:275
 #: view_operations.php:106
 msgid "Go"
 msgstr "যাও"
@@ -708,7 +710,7 @@ msgid "Could not load import plugins, please check your installation!"
 msgstr ""
 "আমদানি সহায়ক (plugin) পাওয়া যাচ্ছে না, অনুগ্রহ করে আপনার ইন্সষ্টলেশন পরীক্ষা করুন!"
 
-#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1466
+#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1460
 #, fuzzy, php-format
 #| msgid "Bookmark %s created"
 msgid "Bookmark %s has been created."
@@ -748,11 +750,11 @@ msgstr ""
 msgid "Back"
 msgstr "পিছনে"
 
-#: index.php:148 libraries/Footer.class.php:70
+#: index.php:149 libraries/Footer.class.php:70
 msgid "phpMyAdmin Demo Server"
 msgstr "পিএইছপিমাইএডমিন ডেমো সার্ভার"
 
-#: index.php:152
+#: index.php:153
 #, php-format
 msgid ""
 "You are using the demo server. You can do anything here, but please do not "
@@ -762,112 +764,112 @@ msgstr ""
 "আপনি একটি ডেমো সার্ভার ব্যবহার করছেন। আপনি সবকিছুই করতে পারবেন কিন্ত অনুগ্রহ করে "
 "রুট পরিবর্তন করবেন না, debian এবং pma ব্যবহারকারী। আরও তথ্য জন্য %s এ আছে।"
 
-#: index.php:162
+#: index.php:163
 msgid "General Settings"
 msgstr "সাধারন সেটিংস"
 
-#: index.php:190 libraries/display_change_password.lib.php:50
+#: index.php:191 libraries/display_change_password.lib.php:50
 #: libraries/display_change_password.lib.php:53 user_password.php:247
 msgid "Change password"
 msgstr "পাসওয়ার্ড পরিবর্তন"
 
-#: index.php:206
+#: index.php:207
 msgid "Server connection collation"
 msgstr "সার্ভার সংযোগে ব্যবহৃত ভাষা"
 
-#: index.php:228
+#: index.php:229
 msgid "Appearance Settings"
 msgstr "আপিয়ারেন্স সেটিংস"
 
-#: index.php:258 prefs_manage.php:285
+#: index.php:259 prefs_manage.php:285
 msgid "More settings"
 msgstr "আরো সেটিংস"
 
-#: index.php:279
+#: index.php:280
 msgid "Database server"
 msgstr "ডাটাবেইজ সার্ভার"
 
-#: index.php:282 libraries/plugins/auth/AuthenticationCookie.class.php:181
+#: index.php:283 libraries/plugins/auth/AuthenticationCookie.class.php:169
 msgid "Server:"
 msgstr "সার্ভার:"
 
-#: index.php:286
+#: index.php:287
 msgid "Server type:"
 msgstr "সার্ভারের ধরন:"
 
-#: index.php:290 libraries/plugins/export/ExportLatex.class.php:212
+#: index.php:291 libraries/plugins/export/ExportLatex.class.php:212
 #: libraries/plugins/export/ExportSql.class.php:687
 #: libraries/plugins/export/ExportXml.class.php:189
 msgid "Server version:"
 msgstr "সার্ভার সংস্করন:"
 
-#: index.php:296
+#: index.php:297
 msgid "Protocol version:"
 msgstr "সংযোগ বিধি সংস্করন:"
 
-#: index.php:300
+#: index.php:301
 msgid "User:"
 msgstr "ব্যবহারকারী:"
 
-#: index.php:305
+#: index.php:306
 msgid "Server charset:"
 msgstr "সার্ভারের বর্ণসম্ভার:"
 
-#: index.php:320
+#: index.php:321
 msgid "Web server"
 msgstr "ওয়েব র্সাভার"
 
-#: index.php:331
+#: index.php:332
 msgid "Database client version:"
 msgstr "ডাটাবেইজ সংযোজক সংস্করন:"
 
-#: index.php:335
+#: index.php:336
 msgid "PHP extension:"
 msgstr "পিএইছপি সংযোজক:"
 
-#: index.php:349
+#: index.php:350
 #, fuzzy
 #| msgid "PHP Version:"
 msgid "PHP version:"
 msgstr "পিএইছপির সংস্করন:"
 
-#: index.php:360
+#: index.php:361
 msgid "Show PHP information"
 msgstr "পিএইছপির তথ্যাবলী দেখাও"
 
-#: index.php:383
+#: index.php:384
 msgid "Version information:"
 msgstr "সংস্করন সম্পর্কিত তথ্য:"
 
-#: index.php:392 libraries/Util.class.php:432 libraries/Util.class.php:495
-#: libraries/config/FormDisplay.tpl.php:151
+#: index.php:393 libraries/Util.class.php:432 libraries/Util.class.php:495
+#: libraries/config/FormDisplay.tpl.php:162
 #: libraries/display_export.lib.php:577 libraries/engines/pbxt.lib.php:162
 #: libraries/navigation/NavigationHeader.class.php:196
 #: libraries/server_variables.lib.php:160
 msgid "Documentation"
 msgstr "সহায়িকা"
 
-#: index.php:399
+#: index.php:400
 msgid "Wiki"
 msgstr "উইকি"
 
-#: index.php:408
+#: index.php:409
 msgid "Official Homepage"
 msgstr "দাপ্তরিক প্রধানপাতা"
 
-#: index.php:415
+#: index.php:416
 msgid "Contribute"
 msgstr "সহায়তা করুন"
 
-#: index.php:422
+#: index.php:423
 msgid "Get support"
 msgstr "সাহায্য নিন"
 
-#: index.php:429
+#: index.php:430
 msgid "List of changes"
 msgstr "পরিবর্তনের তালিকা"
 
-#: index.php:451
+#: index.php:452
 #, fuzzy
 #| msgid ""
 #| "Your configuration file contains settings (root with no password) that "
@@ -884,7 +886,7 @@ msgstr ""
 "স্বাভাবিক ভাবেই শুন্য আছে এবং বিপদজনক। কোন অবাঞ্চিত বিষয় প্রতিহত করার জন্য প্রধান "
 "ব্যবহারকারীর জন্য একটি পাসওর্য়াড দিন।"
 
-#: index.php:468
+#: index.php:469
 msgid ""
 "You have enabled mbstring.func_overload in your PHP configuration. This "
 "option is incompatible with phpMyAdmin and might cause some data to be "
@@ -893,7 +895,7 @@ msgstr ""
 "আপনার পিএইছপির জন্য mbstring.func_overload ফাংশনটি ব্যবহার করা হচ্ছে। এটা  "
 "phpMyAdmin এর সঙ্গে সামঞ্জস্যপূর্ণ নয় এবং কিছু তথ্য নষ্ট করতে পারে!"
 
-#: index.php:483
+#: index.php:484
 msgid ""
 "The mbstring PHP extension was not found and you seem to be using a "
 "multibyte charset. Without the mbstring extension phpMyAdmin is unable to "
@@ -903,7 +905,7 @@ msgstr ""
 "করছেন। mbstring সংযোজক ছাড়া phpMyAdmin শব্দকে সঠিকভাবে খন্ড করতে পারবে না যা "
 "অপ্রত্যাশিত ফল দিতে পারে।"
 
-#: index.php:500
+#: index.php:501
 #, fuzzy
 #| msgid ""
 #| "Your PHP parameter [a@http://php.net/manual/en/session.configuration."
@@ -920,7 +922,7 @@ msgstr ""
 "session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] মান phpMyAdmin এর "
 "কুকির থেকে কম স্থায়ী, এ জন্য আপনার লগইনের কার্যকাল দ্রুত শেষ হয়ে যাবে।"
 
-#: index.php:519
+#: index.php:520
 msgid ""
 "Login cookie store is lower than cookie validity configured in phpMyAdmin, "
 "because of this, your login will expire sooner than configured in phpMyAdmin."
@@ -928,11 +930,11 @@ msgstr ""
 "লগইন কুকি phpMyAdmin কুকির চাইতে কম সময় কার্যকর থাকবে এই জন্য আপনার লগইন সময় "
 "তাড়াতাড়ি শেষ হয়ে যাবে।"
 
-#: index.php:535
+#: index.php:536
 msgid "The configuration file now needs a secret passphrase (blowfish_secret)."
 msgstr "কনফিগারেশন ফাইলে একটি নিরাপত্তাবাক্য (blowfish_secret) দিতে হবে।"
 
-#: index.php:548
+#: index.php:549
 msgid ""
 "Directory [code]config[/code], which is used by the setup script, still "
 "exists in your phpMyAdmin directory. It is strongly recommended to remove it "
@@ -942,7 +944,7 @@ msgstr ""
 "সেটআপে ব্যবহৃত ডিরেক্টরী [code]config[/code] এখনো রয়েছে। এটা অবশ্যই মুছে ফেলা "
 "প্রয়োজন।"
 
-#: index.php:564
+#: index.php:565
 #, fuzzy, php-format
 #| msgid ""
 #| "The phpMyAdmin configuration storage is not completely configured, some "
@@ -954,12 +956,12 @@ msgstr ""
 "কনফিগারেশন মজুদ ব্যবস্থা (phpMyAdmin)সর্ম্পূণভাবে সম্পন্ন হয়নি, কিছু উন্নত বিষয় "
 "অকার্যকর রয়েছে। কেন জানতে ক্লীক করুন %shere%s।"
 
-#: index.php:571
+#: index.php:572
 msgid ""
 "Or alternately go to 'Operations' tab of any database to set it up there."
 msgstr ""
 
-#: index.php:620
+#: index.php:621
 #, php-format
 msgid ""
 "Your PHP MySQL library version %s differs from your MySQL server version %s. "
@@ -968,7 +970,7 @@ msgstr ""
 "আপনার পিএইছপি মাইএসকিউএল লাইব্রেরী সংস্করন %s মাইএসকিউএল সার্ভার %s থেকে ভিন্ন "
 "যা কিছু অপ্রত্যাশিত ফলাফল দিতে পারে।"
 
-#: index.php:648
+#: index.php:649
 #, php-format
 msgid ""
 "Server running with Suhosin. Please refer to %sdocumentation%s for possible "
@@ -1138,8 +1140,8 @@ msgstr ""
 msgid "Save & Close"
 msgstr "ফাইল এর মত সংরক্ষন"
 
-#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:404
-#: libraries/insert_edit.lib.php:1550 prefs_manage.php:361
+#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:415
+#: libraries/insert_edit.lib.php:1548 prefs_manage.php:361
 #: prefs_manage.php:372
 msgid "Reset"
 msgstr "পূর্বাবস্থায়"
@@ -1176,7 +1178,7 @@ msgstr "ইনডেক্স্ যোগকর"
 msgid "Edit Index"
 msgstr "ইনডেক্স সম্পাদনা"
 
-#: js/messages.php:99 templates/index_form.phtml:232
+#: js/messages.php:99 templates/table/index_form.phtml:232
 #, php-format
 msgid "Add %s column(s) to index"
 msgstr "%s স্বম্ভ ইনডেক্সে যোগ কর"
@@ -1205,13 +1207,14 @@ msgstr "স্তম্ভ সীমিত করা হবে:"
 msgid "Please select column(s) for the index."
 msgstr "%s স্বম্ভ ইনডেক্সে যোগ কর"
 
-#: js/messages.php:106 templates/structure/add_column.phtml:1
+#: js/messages.php:106 templates/table/structure/add_column.phtml:1
 msgid "You have to add at least one column."
 msgstr "আপনাকে অন্তত একটি স্বম্ভ যোগ করতে হবে।"
 
-#: js/messages.php:109 libraries/insert_edit.lib.php:1548
+#: js/messages.php:109 libraries/insert_edit.lib.php:1546
 #: templates/columns_definitions/column_definitions_form.phtml:162
-#: templates/index_form.phtml:237 templates/tbl_relation/common_form.phtml:106
+#: templates/table/index_form.phtml:237
+#: templates/table/relation/common_form.phtml:106
 msgid "Preview SQL"
 msgstr ""
 
@@ -1232,7 +1235,7 @@ msgid "SQL query:"
 msgstr "SQL অনুসন্ধান:"
 
 #. l10n: Default label for the y-Axis of Charts
-#: js/messages.php:118 templates/tbl_chart.phtml:109
+#: js/messages.php:118 templates/table/chart/tbl_chart.phtml:109
 msgid "Y Values"
 msgstr "Y এর মানসমূহ"
 
@@ -1394,7 +1397,7 @@ msgstr "প্রেরিত বাইট"
 msgid "Bytes received"
 msgstr "গৃহীত বাইট"
 
-#: js/messages.php:169 libraries/server_status.lib.php:226
+#: js/messages.php:169 libraries/server_status.lib.php:235
 msgid "Connections"
 msgstr "সংযোগসমূহ"
 
@@ -1451,12 +1454,12 @@ msgstr "%d টেবিল"
 msgid "Questions"
 msgstr "প্রশ্নসমূহ"
 
-#: js/messages.php:184 libraries/server_status.lib.php:134
+#: js/messages.php:184 libraries/server_status.lib.php:143
 msgid "Traffic"
 msgstr "গমনাগমন"
 
 #: js/messages.php:185 libraries/Menu.class.php:586
-#: libraries/Util.class.php:4318 libraries/server_status_monitor.lib.php:257
+#: libraries/Util.class.php:4324 libraries/server_status_monitor.lib.php:257
 msgid "Settings"
 msgstr "সেটিংস"
 
@@ -1476,8 +1479,9 @@ msgstr "সিরিজে অন্তত একটি চলক যোগ ক
 #: libraries/server_status_monitor.lib.php:236
 #: libraries/server_status_processes.lib.php:308
 #: templates/columns_definitions/transformation.phtml:4
-#: templates/designer/options_panel.phtml:178
-#: templates/table/options_zoom.phtml:12 templates/table/rows_zoom.phtml:26
+#: templates/database/designer/options_panel.phtml:178
+#: templates/table/search/options_zoom.phtml:12
+#: templates/table/search/rows_zoom.phtml:26
 msgid "None"
 msgstr "কিছু না"
 
@@ -1761,8 +1765,8 @@ msgstr ""
 
 #: js/messages.php:270 libraries/Menu.class.php:352
 #: libraries/Menu.class.php:455 libraries/Menu.class.php:582
-#: libraries/Util.class.php:4317 libraries/Util.class.php:4332
-#: libraries/Util.class.php:4349 libraries/config/messages.inc.php:258
+#: libraries/Util.class.php:4323 libraries/Util.class.php:4338
+#: libraries/Util.class.php:4355 libraries/config/messages.inc.php:258
 #: libraries/display_import.lib.php:105
 #: libraries/server_status_monitor.lib.php:318 prefs_manage.php:238
 #: setup/frames/menu.inc.php:26
@@ -1822,13 +1826,13 @@ msgid "Formatting SQL..."
 msgstr ""
 
 #: js/messages.php:293 libraries/server_variables.lib.php:157
-#: templates/designer/aggregate_query_panel.phtml:63
-#: templates/designer/delete_relation_panel.phtml:28
-#: templates/designer/having_query_panel.phtml:117
-#: templates/designer/new_relation_panel.phtml:88
-#: templates/designer/options_panel.phtml:253
-#: templates/designer/rename_to_panel.phtml:45
-#: templates/designer/where_query_panel.phtml:83
+#: templates/database/designer/aggregate_query_panel.phtml:63
+#: templates/database/designer/delete_relation_panel.phtml:28
+#: templates/database/designer/having_query_panel.phtml:117
+#: templates/database/designer/new_relation_panel.phtml:88
+#: templates/database/designer/options_panel.phtml:253
+#: templates/database/designer/rename_to_panel.phtml:45
+#: templates/database/designer/where_query_panel.phtml:83
 msgid "Cancel"
 msgstr "বাতিল"
 
@@ -1838,7 +1842,7 @@ msgstr "বাতিল"
 msgid "Page-related settings"
 msgstr "সেটিংস পরিবর্তন"
 
-#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:402
+#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:413
 msgid "Apply"
 msgstr "প্রয়োগ"
 
@@ -1875,8 +1879,8 @@ msgstr "ভুল নং:%s"
 msgid "Error text: %s"
 msgstr "ভুলটি : %s"
 
-#: js/messages.php:307 libraries/db_common.inc.php:68
-#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:450
+#: js/messages.php:307 libraries/db_common.inc.php:69
+#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:461
 msgid "No databases selected."
 msgstr "ডাটাবেইজ নিবার্চন করা হয়নি।"
 
@@ -1888,12 +1892,13 @@ msgstr "স্তম্ভ মুছছি"
 msgid "Adding Primary Key"
 msgstr "প্রাইমারী কী যোগ করছি"
 
-#: js/messages.php:310 templates/designer/aggregate_query_panel.phtml:59
-#: templates/designer/having_query_panel.phtml:113
-#: templates/designer/new_relation_panel.phtml:87
-#: templates/designer/options_panel.phtml:252
-#: templates/designer/rename_to_panel.phtml:41
-#: templates/designer/where_query_panel.phtml:82
+#: js/messages.php:310
+#: templates/database/designer/aggregate_query_panel.phtml:59
+#: templates/database/designer/having_query_panel.phtml:113
+#: templates/database/designer/new_relation_panel.phtml:87
+#: templates/database/designer/options_panel.phtml:252
+#: templates/database/designer/rename_to_panel.phtml:41
+#: templates/database/designer/where_query_panel.phtml:82
 msgid "OK"
 msgstr "ওকে"
 
@@ -1913,7 +1918,7 @@ msgstr "ডাটাবেইজের প্রতিলিপি করছি"
 msgid "Changing Charset"
 msgstr "বর্ণ রাশি পরিবর্তন করছি"
 
-#: js/messages.php:320 libraries/Util.class.php:3217
+#: js/messages.php:320 libraries/Util.class.php:3223
 #, fuzzy
 #| msgid "Disable foreign key checks"
 msgid "Enable foreign key checks"
@@ -1952,20 +1957,21 @@ msgstr "সঞ্চিত ফাংশনে অবশ্যই একটি 
 #: js/messages.php:334 libraries/DisplayResults.class.php:4834
 #: libraries/DisplayResults.class.php:5092 libraries/Menu.class.php:344
 #: libraries/Menu.class.php:446 libraries/Menu.class.php:578
-#: libraries/Util.class.php:3636 libraries/Util.class.php:3637
-#: libraries/Util.class.php:4316 libraries/Util.class.php:4331
-#: libraries/Util.class.php:4348 libraries/config/messages.inc.php:252
+#: libraries/Util.class.php:3642 libraries/Util.class.php:3643
+#: libraries/Util.class.php:4322 libraries/Util.class.php:4337
+#: libraries/Util.class.php:4354 libraries/config/messages.inc.php:252
 #: libraries/display_export.lib.php:173 libraries/rte/rte_list.lib.php:146
 #: libraries/server_privileges.lib.php:2211
 #: libraries/server_privileges.lib.php:2290
 #: libraries/server_privileges.lib.php:2632
 #: libraries/server_privileges.lib.php:3356
 #: libraries/server_status_monitor.lib.php:322 prefs_manage.php:303
-#: setup/frames/menu.inc.php:27 templates/structure/check_all_tables.phtml:11
+#: setup/frames/menu.inc.php:27
+#: templates/database/structure/check_all_tables.phtml:11
 msgid "Export"
 msgstr "রফতানী"
 
-#: js/messages.php:337 libraries/rte/rte_routines.lib.php:652
+#: js/messages.php:337 libraries/rte/rte_routines.lib.php:743
 msgid "ENUM/SET editor"
 msgstr "ENUM/SET সম্পাদক"
 
@@ -2004,7 +2010,7 @@ msgstr "অনুসন্ধান বক্সটি দেখাও"
 #: libraries/Console.class.php:214 libraries/DisplayResults.class.php:3474
 #: libraries/DisplayResults.class.php:4818 libraries/Index.class.php:723
 #: libraries/Util.class.php:706 libraries/Util.class.php:1202
-#: libraries/Util.class.php:3634 libraries/Util.class.php:3635
+#: libraries/Util.class.php:3640 libraries/Util.class.php:3641
 #: libraries/central_columns.lib.php:851
 #: libraries/central_columns.lib.php:1193
 #: libraries/config/messages.inc.php:892
@@ -2022,7 +2028,7 @@ msgstr "সম্পাদনা"
 #: libraries/server_user_groups.lib.php:129
 #: libraries/sql_query_form.lib.php:416 libraries/tracking.lib.php:477
 #: setup/frames/index.inc.php:183 setup/frames/index.inc.php:291
-#: templates/designer/delete_relation_panel.phtml:27
+#: templates/database/designer/delete_relation_panel.phtml:27
 msgid "Delete"
 msgstr "মুছ"
 
@@ -2204,11 +2210,11 @@ msgid "No dependencies selected!"
 msgstr "ডাটাবেইজ নিবার্চন করা হয়নি।"
 
 #: js/messages.php:394 libraries/central_columns.lib.php:1214
-#: libraries/insert_edit.lib.php:1458 libraries/server_variables.lib.php:155
+#: libraries/insert_edit.lib.php:1456 libraries/server_variables.lib.php:155
 #: setup/frames/config.inc.php:42 setup/frames/index.inc.php:279
 #: templates/columns_definitions/column_definitions_form.phtml:165
-#: templates/gis_visualization/gis_visualization.phtml:48
-#: templates/tbl_relation/common_form.phtml:107
+#: templates/table/gis_visualization/gis_visualization.phtml:48
+#: templates/table/relation/common_form.phtml:107
 msgid "Save"
 msgstr "সংরক্ষন"
 
@@ -2296,8 +2302,8 @@ msgid "Data point content"
 msgstr "প্রতিটি পয়েন্টের বিষয়"
 
 #: js/messages.php:430 js/messages.php:562 js/messages.php:579
-#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2573
-#: templates/index_form.phtml:154 templates/index_form.phtml:194
+#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2571
+#: templates/table/index_form.phtml:154 templates/table/index_form.phtml:194
 msgid "Ignore"
 msgstr "উপেক্ষা"
 
@@ -2358,8 +2364,8 @@ msgstr "ফরেন কী নির্বাচন করুন"
 msgid "Please select the primary key or a unique key!"
 msgstr "অনুগ্রহ করে প্রাথমিক কী বা একটি অনন্য কী নির্বাচন করুন!"
 
-#: js/messages.php:457 templates/designer/side_menu.phtml:91
-#: templates/designer/side_menu.phtml:94
+#: js/messages.php:457 templates/database/designer/side_menu.phtml:91
+#: templates/database/designer/side_menu.phtml:94
 msgid "Choose column to display"
 msgstr "দেখানোর জন্য স্বম্ভ পছন্দ করেন"
 
@@ -2375,22 +2381,22 @@ msgstr ""
 msgid "Page name"
 msgstr "পাতার নাম"
 
-#: js/messages.php:463 templates/designer/side_menu.phtml:56
-#: templates/designer/side_menu.phtml:59
+#: js/messages.php:463 templates/database/designer/side_menu.phtml:56
+#: templates/database/designer/side_menu.phtml:59
 #, fuzzy
 #| msgid "Select page"
 msgid "Save page"
 msgstr "পাতা নির্বাচন"
 
-#: js/messages.php:464 templates/designer/side_menu.phtml:63
-#: templates/designer/side_menu.phtml:66
+#: js/messages.php:464 templates/database/designer/side_menu.phtml:63
+#: templates/database/designer/side_menu.phtml:66
 #, fuzzy
 #| msgid "Select page"
 msgid "Save page as"
 msgstr "পাতা নির্বাচন"
 
-#: js/messages.php:465 templates/designer/side_menu.phtml:49
-#: templates/designer/side_menu.phtml:52
+#: js/messages.php:465 templates/database/designer/side_menu.phtml:49
+#: templates/database/designer/side_menu.phtml:52
 #, fuzzy
 #| msgid "Free pages"
 msgid "Open page"
@@ -2402,7 +2408,7 @@ msgstr "মুক্ত পাতাসমূহ"
 msgid "Delete page"
 msgstr "পাতা নির্বাচন"
 
-#: js/messages.php:467 templates/designer/side_menu.phtml:10
+#: js/messages.php:467 templates/database/designer/side_menu.phtml:10
 #, fuzzy
 #| msgid "Unit"
 msgid "Untitled"
@@ -2541,7 +2547,7 @@ msgstr "প্রকৃত লেখা"
 msgid "cancel"
 msgstr "বাতিল"
 
-#: js/messages.php:499 libraries/server_status.lib.php:271
+#: js/messages.php:499 libraries/server_status.lib.php:280
 msgid "Aborted"
 msgstr "বাতিলকৃত"
 
@@ -3161,7 +3167,7 @@ msgstr "একটি কার্যকর নাম্বার দিন!"
 
 #: js/messages.php:793 libraries/Message.class.php:199
 #: libraries/Util.class.php:654 libraries/core.lib.php:245
-#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1172
+#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1170
 #: tbl_operations.php:229 view_operations.php:63
 msgid "Error"
 msgstr "ভুল"
@@ -3220,8 +3226,8 @@ msgstr "প্রতি সেকেন্ডে"
 msgid "per minute"
 msgstr "প্রতি মিনিটে"
 
-#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:143
-#: libraries/server_status.lib.php:228
+#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:152
+#: libraries/server_status.lib.php:237
 #: libraries/server_status_queries.lib.php:98
 msgid "per hour"
 msgstr "প্রতি ঘন্টায়"
@@ -3239,7 +3245,7 @@ msgstr "বর্তমান কনফিগারেশন ফাইল (%s) 
 msgid "Wrong permissions on configuration file, should not be world writable!"
 msgstr "কনফিগারেশন ফাইলে ভুল অনুমতি দেয়া, ওটা লেখার মত নয়"
 
-#: libraries/Config.class.php:1799
+#: libraries/Config.class.php:1801
 msgid "Font size"
 msgstr "অক্ষরের আকার"
 
@@ -3269,10 +3275,10 @@ msgstr "সহ-অনুসন্ধান"
 #: libraries/server_privileges.lib.php:2890
 #: libraries/server_privileges.lib.php:3144
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4332
+#: libraries/server_privileges.lib.php:4358
 #: libraries/server_status_processes.lib.php:80
-#: templates/tbl_relation/foreign_key_row.phtml:165
-#: templates/tbl_relation/internal_relational_row.phtml:55
+#: templates/table/relation/foreign_key_row.phtml:165
+#: templates/table/relation/internal_relational_row.phtml:55
 msgid "Database"
 msgstr "ডাটাবেইজ"
 
@@ -3383,11 +3389,11 @@ msgstr "এসকিউএল ইতিহাস"
 #: libraries/plugins/import/ImportMediawiki.class.php:60
 #: libraries/plugins/import/ImportOds.class.php:59
 #: libraries/plugins/import/ImportShp.class.php:57
-#: libraries/plugins/import/ImportSql.class.php:148
+#: libraries/plugins/import/ImportSql.class.php:51
 #: libraries/plugins/import/ImportXml.class.php:58
-#: libraries/rte/rte_routines.lib.php:833 templates/index_form.phtml:49
-#: templates/structure/row_stats_table.phtml:20
-#: templates/table/options.phtml:2
+#: libraries/rte/rte_routines.lib.php:924 templates/table/index_form.phtml:49
+#: templates/table/search/options.phtml:2
+#: templates/table/structure/row_stats_table.phtml:20
 msgid "Options"
 msgstr "অপশনস"
 
@@ -3432,7 +3438,8 @@ msgstr "অধ মুখী"
 msgid "Order:"
 msgstr "বিন্যাস"
 
-#: libraries/Console.class.php:289 templates/table/replace_preview.phtml:17
+#: libraries/Console.class.php:289
+#: templates/table/search/replace_preview.phtml:17
 msgid "Count"
 msgstr "অংক"
 
@@ -3558,9 +3565,9 @@ msgstr "প্রতিলিপিকৃত টেবিলে যাও"
 #: libraries/operations.lib.php:794 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:191
-#: templates/structure/sortable_header.phtml:21
-#: templates/structure/sortable_header.phtml:38
-#: templates/table/options.phtml:68
+#: templates/database/structure/sortable_header.phtml:21
+#: templates/database/structure/sortable_header.phtml:38
+#: templates/table/search/options.phtml:68
 msgid "Ascending"
 msgstr "উর্ধ্ব মূখী"
 
@@ -3570,13 +3577,14 @@ msgstr "উর্ধ্ব মূখী"
 #: libraries/operations.lib.php:797 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:188
-#: templates/structure/sortable_header.phtml:26
-#: templates/structure/sortable_header.phtml:43
-#: templates/table/options.phtml:69
+#: templates/database/structure/sortable_header.phtml:26
+#: templates/database/structure/sortable_header.phtml:43
+#: templates/table/search/options.phtml:69
 msgid "Descending"
 msgstr "অধ মুখী"
 
-#: libraries/DBQbe.class.php:467 templates/table/search_and_replace.phtml:6
+#: libraries/DBQbe.class.php:467
+#: templates/table/search/search_and_replace.phtml:6
 msgid "Column:"
 msgstr "স্তম্ভ"
 
@@ -3744,12 +3752,12 @@ msgstr[0] "<strong>%2$s</strong> মধ্যে %1$s মিল"
 msgstr[1] "<strong>%2$s</strong> মধ্যে %1$s গুলো মিল"
 
 #: libraries/DbSearch.class.php:354 libraries/Menu.class.php:311
-#: libraries/Util.class.php:3337 libraries/Util.class.php:3347
-#: libraries/Util.class.php:3623 libraries/Util.class.php:3624
-#: libraries/Util.class.php:4343 libraries/config.values.php:43
+#: libraries/Util.class.php:3343 libraries/Util.class.php:3353
+#: libraries/Util.class.php:3629 libraries/Util.class.php:3630
+#: libraries/Util.class.php:4349 libraries/config.values.php:43
 #: libraries/config.values.php:51 libraries/config.values.php:119
 #: libraries/navigation/Nodes/Node_Table.class.php:295
-#: templates/structure/check_all_table_column.phtml:5
+#: templates/table/structure/check_all_table_column.phtml:5
 msgid "Browse"
 msgstr "দেখা"
 
@@ -3766,7 +3774,8 @@ msgstr "ডাটাবেইজে খোঁজ"
 msgid "Words or values to search for (wildcard: \"%\"):"
 msgstr "খোঁজার জন্য শব্দ বা সংখ্যা (wildcard: \"%\"):"
 
-#: libraries/DbSearch.class.php:401 templates/table/search_and_replace.phtml:1
+#: libraries/DbSearch.class.php:401
+#: templates/table/search/search_and_replace.phtml:1
 msgid "Find:"
 msgstr "খোঁজা:"
 
@@ -3814,28 +3823,28 @@ msgstr "ফিল্টারসমূহ"
 msgid "Search this table"
 msgstr "ডাটাবেইজে খোঁজ"
 
-#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2532
-#: libraries/Util.class.php:2535
+#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2538
+#: libraries/Util.class.php:2541
 msgctxt "First page"
 msgid "Begin"
 msgstr "আরম্ভ"
 
-#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2533
-#: libraries/Util.class.php:2536 libraries/server_bin_log.lib.php:170
+#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2539
+#: libraries/Util.class.php:2542 libraries/server_bin_log.lib.php:170
 #: libraries/server_bin_log.lib.php:172
 msgctxt "Previous page"
 msgid "Previous"
 msgstr "পূর্ববর্তী"
 
-#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2564
-#: libraries/Util.class.php:2574 libraries/server_bin_log.lib.php:204
+#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2570
+#: libraries/Util.class.php:2580 libraries/server_bin_log.lib.php:204
 #: libraries/server_bin_log.lib.php:206
 msgctxt "Next page"
 msgid "Next"
 msgstr "পরবর্তী"
 
-#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2565
-#: libraries/Util.class.php:2575
+#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2571
+#: libraries/Util.class.php:2581
 msgctxt "Last page"
 msgid "End"
 msgstr "শেষ"
@@ -3910,15 +3919,15 @@ msgid "May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]."
 msgstr "সম্ভবত আনুমানিক। [doc@faq3-11]FAQ 3.11[/doc] দেখুন।"
 
 #: libraries/DisplayResults.class.php:4332 libraries/Message.class.php:180
-#: libraries/controllers/TableRelationController.class.php:258
+#: libraries/controllers/TableRelationController.class.php:259
 #: libraries/controllers/TableSearchController.class.php:655
-#: libraries/rte/rte_routines.lib.php:1332 libraries/sql_query_form.lib.php:89
+#: libraries/rte/rte_routines.lib.php:1423 libraries/sql_query_form.lib.php:89
 #: tbl_operations.php:227 tbl_row_action.php:138 view_operations.php:62
 msgid "Your SQL query has been executed successfully."
 msgstr "আপনার SQL অনুসন্ধানটি সফলভাবে কাজ করেছে."
 
 #: libraries/DisplayResults.class.php:4660
-#: libraries/controllers/StructureController.class.php:629
+#: libraries/controllers/DatabaseStructureController.class.php:564
 #, php-format
 msgid ""
 "This view has at least this number of rows. Please refer to %sdocumentation"
@@ -3941,33 +3950,33 @@ msgstr "মোট %1$d, অনুসন্ধানে %2$d"
 msgid "%d total"
 msgstr "%d মোট"
 
-#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1318
+#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1312
 #, php-format
 msgid "Query took %01.4f seconds."
 msgstr "অনুসন্ধানে %01.4f সেঃ লেগেছ."
 
 #: libraries/DisplayResults.class.php:4807
-#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4767
-#: libraries/Util.class.php:4773 libraries/mult_submits.inc.php:50
-#: templates/structure/check_all_tables.phtml:2
-#: templates/structure/check_all_tables.phtml:9
+#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4773
+#: libraries/Util.class.php:4779 libraries/mult_submits.inc.php:50
+#: templates/database/structure/check_all_tables.phtml:2
+#: templates/database/structure/check_all_tables.phtml:9
 msgid "With selected:"
 msgstr "নিবার্চিত গুলো নিয়ে:"
 
 #: libraries/DisplayResults.class.php:4811
-#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4769
-#: libraries/Util.class.php:4770 libraries/server_privileges.lib.php:1174
+#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4775
+#: libraries/Util.class.php:4776 libraries/server_privileges.lib.php:1174
 #: libraries/server_privileges.lib.php:1175
 #: libraries/server_privileges.lib.php:1387
 #: libraries/server_user_groups.lib.php:231
-#: templates/structure/check_all_tables.phtml:3
-#: templates/structure/check_all_tables.phtml:4
+#: templates/database/structure/check_all_tables.phtml:3
+#: templates/database/structure/check_all_tables.phtml:4
 msgid "Check All"
 msgstr "সবগুলোতে টিক দাও"
 
 #: libraries/DisplayResults.class.php:4985 libraries/Header.class.php:383
-#: templates/structure/optional_action_links.phtml:1
-#: templates/structure/print_view_data_dictionary_link.phtml:3
+#: templates/database/structure/print_view_data_dictionary_link.phtml:3
+#: templates/table/structure/optional_action_links.phtml:1
 msgid "Print view"
 msgstr "মুদ্রনের দেখা"
 
@@ -3975,7 +3984,8 @@ msgstr "মুদ্রনের দেখা"
 msgid "Query results operations"
 msgstr "অনুসন্ধান ফল"
 
-#: libraries/DisplayResults.class.php:5105 templates/tbl_chart.phtml:12
+#: libraries/DisplayResults.class.php:5105
+#: templates/table/chart/tbl_chart.phtml:12
 msgid "Display chart"
 msgstr "চিত্র দেখাও"
 
@@ -4068,7 +4078,7 @@ msgid "Click on the bar to scroll to top of page"
 msgstr "পাতার উপরে যাওয়ার জন্য বারে ক্লীক করুন"
 
 #: libraries/Header.class.php:749
-#: libraries/plugins/auth/AuthenticationCookie.class.php:152
+#: libraries/plugins/auth/AuthenticationCookie.class.php:140
 msgid "Javascript must be enabled past this point!"
 msgstr "এখানে আসার পুর্বেই জাভা স্ক্রীপট কার্যকর থাকতে হবে।"
 
@@ -4090,11 +4100,11 @@ msgid "Keyname"
 msgstr "কী'র নাম"
 
 #: libraries/Index.class.php:697
-#: libraries/controllers/StructureController.class.php:1962
-#: libraries/controllers/StructureController.class.php:1967
+#: libraries/controllers/TableStructureController.class.php:953
+#: libraries/controllers/TableStructureController.class.php:958
 #: libraries/tracking.lib.php:973
 #: templates/columns_definitions/column_indexes.phtml:11
-#: templates/structure/check_all_table_column.phtml:26
+#: templates/table/structure/check_all_table_column.phtml:26
 msgid "Unique"
 msgstr "অনন্য"
 
@@ -4113,16 +4123,17 @@ msgstr "Cardinality"
 #: libraries/server_collations.lib.php:35 libraries/tracking.lib.php:881
 #: libraries/tracking.lib.php:977
 #: templates/columns_definitions/table_fields_definitions.phtml:33
-#: templates/structure/row_stats_table.phtml:31
-#: templates/structure/table_header.phtml:55
-#: templates/structure/table_structure_header.phtml:7
-#: templates/table/table_header.phtml:8
+#: templates/database/structure/table_header.phtml:55
+#: templates/table/search/table_header.phtml:8
+#: templates/table/structure/row_stats_table.phtml:31
+#: templates/table/structure/table_structure_header.phtml:7
 msgid "Collation"
 msgstr "ভাষা"
 
 #: libraries/Index.class.php:703 libraries/rte/rte_events.lib.php:496
-#: libraries/rte/rte_routines.lib.php:956 libraries/tracking.lib.php:885
-#: libraries/tracking.lib.php:979 templates/structure/table_header.phtml:84
+#: libraries/rte/rte_routines.lib.php:1047 libraries/tracking.lib.php:885
+#: libraries/tracking.lib.php:979
+#: templates/database/structure/table_header.phtml:84
 msgid "Comment"
 msgstr "মন্তব্য"
 
@@ -4135,15 +4146,15 @@ msgstr "প্রাথমিক কী মুছা হয়েছে"
 msgid "Index %s has been dropped."
 msgstr "ইনডেক্স %s মুছা হয়েছে।"
 
-#: libraries/Index.class.php:757 libraries/Util.class.php:3630
-#: libraries/Util.class.php:3631
-#: libraries/controllers/StructureController.class.php:1958
-#: libraries/controllers/StructureController.class.php:1959
+#: libraries/Index.class.php:757 libraries/Util.class.php:3636
+#: libraries/Util.class.php:3637
+#: libraries/controllers/TableStructureController.class.php:949
+#: libraries/controllers/TableStructureController.class.php:950
 #: libraries/operations.lib.php:1607 libraries/rte/rte_list.lib.php:150
 #: libraries/server_databases.lib.php:146
-#: templates/structure/check_all_table_column.phtml:15
-#: templates/structure/check_all_tables.phtml:16
-#: templates/tbl_relation/foreign_key_row.phtml:93
+#: templates/database/structure/check_all_tables.phtml:16
+#: templates/table/relation/foreign_key_row.phtml:93
+#: templates/table/structure/check_all_table_column.phtml:15
 msgid "Drop"
 msgstr "মুছ"
 
@@ -4172,16 +4183,16 @@ msgstr "সার্ভার"
 #: libraries/Menu.class.php:248
 #: libraries/navigation/Nodes/Node_View.class.php:32
 #: libraries/tbl_info.inc.php:63
-#: templates/structure/structure_table_row.phtml:97
-#: templates/structure/structure_table_row.phtml:159
+#: templates/database/structure/structure_table_row.phtml:97
+#: templates/database/structure/structure_table_row.phtml:159
 msgid "View"
 msgstr "দেখা"
 
 #: libraries/Menu.class.php:325 libraries/Menu.class.php:429
-#: libraries/Menu.class.php:548 libraries/Util.class.php:3334
-#: libraries/Util.class.php:3344 libraries/Util.class.php:3350
-#: libraries/Util.class.php:4313 libraries/Util.class.php:4328
-#: libraries/Util.class.php:4345 libraries/config.values.php:40
+#: libraries/Menu.class.php:548 libraries/Util.class.php:3340
+#: libraries/Util.class.php:3350 libraries/Util.class.php:3356
+#: libraries/Util.class.php:4319 libraries/Util.class.php:4334
+#: libraries/Util.class.php:4351 libraries/config.values.php:40
 #: libraries/config.values.php:48 libraries/config.values.php:110
 #: libraries/config.values.php:116 libraries/config/messages.inc.php:321
 #: libraries/navigation/Nodes/Node_Table.class.php:292
@@ -4189,19 +4200,19 @@ msgid "SQL"
 msgstr "এসকিউএল"
 
 #: libraries/Menu.class.php:328 libraries/Menu.class.php:432
-#: libraries/Util.class.php:3335 libraries/Util.class.php:3345
-#: libraries/Util.class.php:3351 libraries/Util.class.php:3625
-#: libraries/Util.class.php:3626 libraries/Util.class.php:4329
-#: libraries/Util.class.php:4346 libraries/config.values.php:41
+#: libraries/Util.class.php:3341 libraries/Util.class.php:3351
+#: libraries/Util.class.php:3357 libraries/Util.class.php:3631
+#: libraries/Util.class.php:3632 libraries/Util.class.php:4335
+#: libraries/Util.class.php:4352 libraries/config.values.php:41
 #: libraries/config.values.php:49 libraries/config.values.php:111
 #: libraries/config.values.php:117
 #: libraries/navigation/Nodes/Node_Table.class.php:286
 msgid "Search"
 msgstr "খোঁজা"
 
-#: libraries/Menu.class.php:338 libraries/Util.class.php:3336
-#: libraries/Util.class.php:3346 libraries/Util.class.php:3627
-#: libraries/Util.class.php:3628 libraries/Util.class.php:4347
+#: libraries/Menu.class.php:338 libraries/Util.class.php:3342
+#: libraries/Util.class.php:3352 libraries/Util.class.php:3633
+#: libraries/Util.class.php:3634 libraries/Util.class.php:4353
 #: libraries/config.values.php:42 libraries/config.values.php:50
 #: libraries/config.values.php:118
 #: libraries/navigation/Nodes/Node_Table.class.php:289
@@ -4210,30 +4221,30 @@ msgid "Insert"
 msgstr "ইনর্সাট"
 
 #: libraries/Menu.class.php:362 libraries/Menu.class.php:467
-#: libraries/Util.class.php:4334 libraries/Util.class.php:4350
+#: libraries/Util.class.php:4340 libraries/Util.class.php:4356
 #: libraries/config.values.php:106 libraries/server_common.lib.php:51
 #: libraries/server_privileges.lib.php:2370
 #: libraries/server_privileges.lib.php:3158
-#: libraries/server_privileges.lib.php:4221
+#: libraries/server_privileges.lib.php:4247
 msgid "Privileges"
 msgstr "অধিকারসমূহ"
 
 #: libraries/Menu.class.php:371 libraries/Menu.class.php:379
-#: libraries/Menu.class.php:459 libraries/Util.class.php:3338
-#: libraries/Util.class.php:3352 libraries/Util.class.php:4333
-#: libraries/Util.class.php:4351 libraries/config.values.php:112
+#: libraries/Menu.class.php:459 libraries/Util.class.php:3344
+#: libraries/Util.class.php:3358 libraries/Util.class.php:4339
+#: libraries/Util.class.php:4357 libraries/config.values.php:112
 #: view_operations.php:92
 msgid "Operations"
 msgstr "কাজসমূহ"
 
 #: libraries/Menu.class.php:384 libraries/Menu.class.php:492
-#: libraries/Util.class.php:4338 libraries/Util.class.php:4352
+#: libraries/Util.class.php:4344 libraries/Util.class.php:4358
 #: libraries/relation.lib.php:255
 msgid "Tracking"
 msgstr "ট্রেকিং"
 
 #: libraries/Menu.class.php:397 libraries/Menu.class.php:486
-#: libraries/Util.class.php:4337 libraries/Util.class.php:4353
+#: libraries/Util.class.php:4343 libraries/Util.class.php:4359
 #: libraries/navigation/Nodes/Node_Trigger_Container.class.php:24
 #: libraries/plugins/export/ExportHtmlword.class.php:557
 #: libraries/plugins/export/ExportOdt.class.php:685
@@ -4250,16 +4261,16 @@ msgstr "ট্রিগারসমূহ"
 msgid "Database seems to be empty!"
 msgstr "ডাটাবেইজটি খালি মনে হয়!"
 
-#: libraries/Menu.class.php:439 libraries/Util.class.php:4330
+#: libraries/Menu.class.php:439 libraries/Util.class.php:4336
 msgid "Query"
 msgstr "অনুসন্ধান"
 
-#: libraries/Menu.class.php:472 libraries/Util.class.php:4335
+#: libraries/Menu.class.php:472 libraries/Util.class.php:4341
 #: libraries/rte/rte_words.lib.php:36
 msgid "Routines"
 msgstr "রুটিনসমূহ"
 
-#: libraries/Menu.class.php:479 libraries/Util.class.php:4336
+#: libraries/Menu.class.php:479 libraries/Util.class.php:4342
 #: libraries/navigation/Nodes/Node_Event_Container.class.php:26
 #: libraries/plugins/export/ExportSql.class.php:940
 #: libraries/plugins/export/ExportXml.class.php:107
@@ -4267,22 +4278,22 @@ msgstr "রুটিনসমূহ"
 msgid "Events"
 msgstr "ইভেন্টসমূহ"
 
-#: libraries/Menu.class.php:498 libraries/Util.class.php:4339
+#: libraries/Menu.class.php:498 libraries/Util.class.php:4345
 msgid "Designer"
 msgstr "নকশাকারী"
 
-#: libraries/Menu.class.php:507 libraries/Util.class.php:4340
-#: templates/structure/check_all_tables.phtml:35
+#: libraries/Menu.class.php:507 libraries/Util.class.php:4346
+#: templates/database/structure/check_all_tables.phtml:35
 #, fuzzy
 #| msgid "Textarea columns"
 msgid "Central columns"
 msgstr "টেক্সএরিয়া স্তম্ভ"
 
-#: libraries/Menu.class.php:544 libraries/Util.class.php:4312
+#: libraries/Menu.class.php:544 libraries/Util.class.php:4318
 #: libraries/config.values.php:103 libraries/config/messages.inc.php:266
 #: libraries/config/messages.inc.php:341
 #: libraries/navigation/NavigationTree.class.php:1239
-#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4332
+#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4358
 msgid "Databases"
 msgstr "ডাটাবেইজ"
 
@@ -4293,34 +4304,34 @@ msgid "User accounts"
 msgstr "ব্যবহারকারীর দল"
 
 #: libraries/Menu.class.php:595 libraries/ServerStatusData.class.php:121
-#: libraries/Util.class.php:4319 libraries/server_common.lib.php:36
+#: libraries/Util.class.php:4325 libraries/server_common.lib.php:36
 msgid "Binary log"
 msgstr "বাইনারী লগ"
 
 #: libraries/Menu.class.php:601 libraries/ServerStatusData.class.php:126
-#: libraries/Util.class.php:4320 libraries/server_common.lib.php:42
-#: templates/structure/body_for_table_summary.phtml:10
-#: templates/structure/table_header.phtml:27
+#: libraries/Util.class.php:4326 libraries/server_common.lib.php:42
+#: templates/database/structure/body_for_table_summary.phtml:10
+#: templates/database/structure/table_header.phtml:27
 msgid "Replication"
 msgstr "অনুলিপি"
 
 #: libraries/Menu.class.php:606 libraries/ServerStatusData.class.php:193
-#: libraries/Util.class.php:4321 libraries/config.values.php:105
+#: libraries/Util.class.php:4327 libraries/config.values.php:105
 #: libraries/server_engines.lib.php:108 libraries/server_engines.lib.php:112
 #: libraries/sql_query_form.lib.php:421
 msgid "Variables"
 msgstr "চলকসমূহ"
 
-#: libraries/Menu.class.php:610 libraries/Util.class.php:4322
+#: libraries/Menu.class.php:610 libraries/Util.class.php:4328
 msgid "Charsets"
 msgstr "বর্ণরাশী"
 
-#: libraries/Menu.class.php:615 libraries/Util.class.php:4323
+#: libraries/Menu.class.php:615 libraries/Util.class.php:4329
 #: libraries/server_common.lib.php:33 libraries/server_plugins.lib.php:27
 msgid "Plugins"
 msgstr "প্লাগইন"
 
-#: libraries/Menu.class.php:626 libraries/Util.class.php:4324
+#: libraries/Menu.class.php:626 libraries/Util.class.php:4330
 msgid "Engines"
 msgstr "ব্যবস্থাসমূহ"
 
@@ -4345,7 +4356,7 @@ msgid_plural "%1$d rows inserted."
 msgstr[0] "%1$d টি রো প্রবেশ করেছে।"
 msgstr[1] "%1$d টি রো প্রবেশ করেছে।"
 
-#: libraries/PDF.class.php:70 libraries/Util.class.php:2521
+#: libraries/PDF.class.php:70 libraries/Util.class.php:2527
 #: libraries/browse_foreigners.lib.php:327
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:865
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:890
@@ -4370,7 +4381,7 @@ msgid "Could not save favorite table!"
 msgstr "সাম্প্রতিক টেবিল সংরক্ষন করা হয় নাই"
 
 #: libraries/RecentFavoriteTable.class.php:212
-#: templates/structure/favorite_anchor.phtml:12
+#: templates/database/structure/favorite_anchor.phtml:12
 #, fuzzy
 #| msgid "Remove chart"
 msgid "Remove from Favorites"
@@ -4553,7 +4564,7 @@ msgid ""
 msgstr "মজুদ ব্যবস্থার অবস্থা সর্ম্পকে বিশদ তথ্য নাই।"
 
 #: libraries/StorageEngine.class.php:373
-#: templates/structure/body_for_table_summary.phtml:50
+#: templates/database/structure/body_for_table_summary.phtml:50
 #, php-format
 msgid "%s is the default storage engine on this MySQL server."
 msgstr "%s এই মাইএসকিউএল সার্ভার এর স্বাভাবিক মজুদ ব্যবস্থা।"
@@ -5018,10 +5029,10 @@ msgstr ""
 
 #: libraries/Util.class.php:726 libraries/rte/rte_events.lib.php:110
 #: libraries/rte/rte_events.lib.php:119 libraries/rte/rte_events.lib.php:150
-#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:153
-#: libraries/rte/rte_routines.lib.php:162
-#: libraries/rte/rte_routines.lib.php:235
-#: libraries/rte/rte_routines.lib.php:1366
+#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:223
+#: libraries/rte/rte_routines.lib.php:250
+#: libraries/rte/rte_routines.lib.php:372
+#: libraries/rte/rte_routines.lib.php:1457
 #: libraries/rte/rte_triggers.lib.php:86 libraries/rte/rte_triggers.lib.php:95
 #: libraries/rte/rte_triggers.lib.php:127
 msgid "MySQL said: "
@@ -5067,77 +5078,80 @@ msgstr "রবিবার"
 msgid "%B %d, %Y at %I:%M %p"
 msgstr ""
 
-#: libraries/Util.class.php:2019
+#: libraries/Util.class.php:2025
 #, php-format
 msgid "%s days, %s hours, %s minutes and %s seconds"
 msgstr "%s দিন, %s ঘন্টা, %s মিনিট এবং %s সেকেন্ড"
 
-#: libraries/Util.class.php:2112
+#: libraries/Util.class.php:2118
 msgid "Missing parameter:"
 msgstr "parameter নাই:"
 
-#: libraries/Util.class.php:2645
+#: libraries/Util.class.php:2651
 #, php-format
 msgid "Jump to database \"%s\"."
 msgstr "ডাটাবেইজ \"%s\" যাও।"
 
-#: libraries/Util.class.php:2670
+#: libraries/Util.class.php:2676
 #, php-format
 msgid "The %s functionality is affected by a known bug, see %s"
 msgstr "%s কার্যকারিতা একটি চিহ্নিত সমস্যা, %s দেখুন"
 
-#: libraries/Util.class.php:2881
+#: libraries/Util.class.php:2887
 msgid "Click to toggle"
 msgstr "টোগল ক্লীক করুন"
 
-#: libraries/Util.class.php:3542 prefs_manage.php:248
+#: libraries/Util.class.php:3548 prefs_manage.php:248
 msgid "Browse your computer:"
 msgstr "আপনার কম্পিউটারে দেখুন:"
 
-#: libraries/Util.class.php:3567
+#: libraries/Util.class.php:3573
 #, php-format
 msgid "Select from the web server upload directory <b>%s</b>:"
 msgstr "ওয়েভ সার্ভারের আপলোড ডিরেক্টরি থেকে নির্বাচন করুন <b>%s</b>:"
 
-#: libraries/Util.class.php:3596 libraries/insert_edit.lib.php:1173
+#: libraries/Util.class.php:3602 libraries/insert_edit.lib.php:1171
 msgid "The directory you set for upload work cannot be reached."
 msgstr "আপলোড করার জন্য নির্ধারিত ডিরেক্টরীটি পাওয়া যাচ্ছে না।"
 
-#: libraries/Util.class.php:3607
+#: libraries/Util.class.php:3613
 #, fuzzy
 #| msgid "There are no files to upload"
 msgid "There are no files to upload!"
 msgstr "আপলোড করার জন্য কোন ফাইল নাই"
 
-#: libraries/Util.class.php:3632 libraries/Util.class.php:3633
-#: templates/structure/check_all_tables.phtml:15
+#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: templates/database/structure/check_all_tables.phtml:15
 msgid "Empty"
 msgstr "খালি"
 
-#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: libraries/Util.class.php:3644 libraries/Util.class.php:3645
 msgid "Execute"
 msgstr "কর"
 
-#: libraries/Util.class.php:4152
+#: libraries/Util.class.php:4158
 msgid "Print"
 msgstr "প্রিন্ট"
 
-#: libraries/Util.class.php:4257 templates/structure/row_stats_table.phtml:80
-#: templates/structure/table_header.phtml:95
+#: libraries/Util.class.php:4263
+#: templates/database/structure/table_header.phtml:95
+#: templates/table/structure/row_stats_table.phtml:80
 msgid "Creation"
 msgstr "প্রস্তুত"
 
-#: libraries/Util.class.php:4263 templates/structure/row_stats_table.phtml:87
-#: templates/structure/table_header.phtml:106
+#: libraries/Util.class.php:4269
+#: templates/database/structure/table_header.phtml:106
+#: templates/table/structure/row_stats_table.phtml:87
 msgid "Last update"
 msgstr "সর্বশেষ আপডেট"
 
-#: libraries/Util.class.php:4269 templates/structure/row_stats_table.phtml:94
-#: templates/structure/table_header.phtml:117
+#: libraries/Util.class.php:4275
+#: templates/database/structure/table_header.phtml:117
+#: templates/table/structure/row_stats_table.phtml:94
 msgid "Last check"
 msgstr "সর্বশেষ যাচাই"
 
-#: libraries/Util.class.php:4315
+#: libraries/Util.class.php:4321
 msgid "Users"
 msgstr "ব্যবহারকারী"
 
@@ -5158,16 +5172,16 @@ msgid "Use this value"
 msgstr "এই মানটি ব্যবহার কর"
 
 #: libraries/build_html_for_db.lib.php:33 libraries/import.lib.php:193
-#: templates/structure/actions_in_table_structure.phtml:113
-#: templates/structure/row_stats_table.phtml:42
-#: templates/structure/table_header.phtml:36
+#: templates/database/structure/table_header.phtml:36
+#: templates/table/structure/actions_in_table_structure.phtml:113
+#: templates/table/structure/row_stats_table.phtml:42
 msgid "Rows"
 msgstr "সারির #"
 
 #: libraries/build_html_for_db.lib.php:48 libraries/engines/innodb.lib.php:171
-#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:186
-#: libraries/server_status.lib.php:298
-#: templates/structure/display_table_stats.phtml:40
+#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:195
+#: libraries/server_status.lib.php:307
+#: templates/table/structure/display_table_stats.phtml:40
 msgid "Total"
 msgstr "মোট"
 
@@ -5176,10 +5190,12 @@ msgid "Jump to database"
 msgstr "ডাটাবেইজে যাও"
 
 #: libraries/build_html_for_db.lib.php:146
+#: templates/database/structure/structure_table_row.phtml:15
 msgid "Not replicated"
 msgstr "প্রতিলিপি হয় নাই"
 
 #: libraries/build_html_for_db.lib.php:158
+#: templates/database/structure/structure_table_row.phtml:16
 msgid "Replicated"
 msgstr "প্রতিলিপি করা হয়েছে"
 
@@ -5236,17 +5252,17 @@ msgstr ""
 #: libraries/plugins/export/ExportTexytext.class.php:425
 #: libraries/plugins/export/PMA_ExportPdf.class.php:307
 #: libraries/rte/rte_list.lib.php:73 libraries/rte/rte_list.lib.php:85
-#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:830
-#: libraries/rte/rte_routines.lib.php:1492 setup/frames/index.inc.php:162
+#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:921
+#: libraries/rte/rte_routines.lib.php:1583 setup/frames/index.inc.php:162
 #: templates/columns_definitions/table_fields_definitions.phtml:8
-#: templates/structure/table_structure_header.phtml:5
-#: templates/table/create_table.phtml:11
+#: templates/database/create_table.phtml:11
+#: templates/table/structure/table_structure_header.phtml:5
 msgid "Name"
 msgstr "নাম"
 
 #: libraries/central_columns.lib.php:699
 #: libraries/central_columns.lib.php:1381
-#: libraries/rte/rte_routines.lib.php:832
+#: libraries/rte/rte_routines.lib.php:923
 #: templates/columns_definitions/table_fields_definitions.phtml:14
 msgid "Length/Values"
 msgstr "দৈর্ঘ্য/মানসমূহ"
@@ -5269,7 +5285,7 @@ msgid "Select a table"
 msgstr "টেবল নির্বাচন"
 
 #: libraries/central_columns.lib.php:804
-#: templates/structure/add_column.phtml:4
+#: templates/table/structure/add_column.phtml:4
 msgid "Add column"
 msgstr "স্বম্ভ যোগ করা"
 
@@ -5289,7 +5305,7 @@ msgstr "স্বম্ভ যোগ করা"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1002
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1025
 #: templates/columns_definitions/table_fields_definitions.phtml:36
-#: templates/structure/table_structure_header.phtml:8
+#: templates/table/structure/table_structure_header.phtml:8
 msgid "Attributes"
 msgstr "গুনাবলী"
 
@@ -5401,7 +5417,7 @@ msgid "Double click"
 msgstr "ডাবল ক্লীক"
 
 #: libraries/config.values.php:95 libraries/config.values.php:124
-#: libraries/config/FormDisplay.tpl.php:221 libraries/relation.lib.php:97
+#: libraries/config/FormDisplay.tpl.php:232 libraries/relation.lib.php:97
 #: libraries/relation.lib.php:105
 msgid "Disabled"
 msgstr "অকার্যকর"
@@ -5590,21 +5606,21 @@ msgstr "ফাংশন %s না পাওয়ায় সংকোচিত র
 msgid "maximum %s"
 msgstr "সর্বোচ্চ %s"
 
-#: libraries/config/FormDisplay.tpl.php:219
+#: libraries/config/FormDisplay.tpl.php:230
 msgid "This setting is disabled, it will not be applied to your configuration."
 msgstr "এই সেটিংস অকার্যকর করা আছে, আপনার কনফিগারেশনে প্রয়োগ করা যাবে না।"
 
-#: libraries/config/FormDisplay.tpl.php:313
+#: libraries/config/FormDisplay.tpl.php:324
 #, php-format
 msgid "Set value: %s"
 msgstr "মান সেট কর:%s"
 
-#: libraries/config/FormDisplay.tpl.php:318
+#: libraries/config/FormDisplay.tpl.php:329
 #: libraries/config/messages.inc.php:610
 msgid "Restore default value"
 msgstr "স্বাভাবিক মান ফিরিয়ে আন"
 
-#: libraries/config/FormDisplay.tpl.php:332
+#: libraries/config/FormDisplay.tpl.php:343
 msgid "Allow users to customize this value"
 msgstr "ব্যাবহারকারীদেরকে এই মান পছন্দ করার অনুমতি দিন"
 
@@ -6110,7 +6126,7 @@ msgstr "ফাইলের বর্ণরাশি"
 
 #: libraries/config/messages.inc.php:136 libraries/config/messages.inc.php:152
 #: libraries/sql_query_form.lib.php:247
-#: templates/structure/row_stats_table.phtml:7
+#: templates/table/structure/row_stats_table.phtml:7
 msgid "Format"
 msgstr "গঠন"
 
@@ -6631,7 +6647,7 @@ msgstr "ডাটাবেইজ গঠনের সাথে বিশদ ক
 
 #: libraries/config/messages.inc.php:332
 #: libraries/plugins/export/ExportPdf.class.php:279
-#: templates/structure/secondary_tabs.phtml:8
+#: templates/table/secondary_tabs.phtml:8
 msgid "Table structure"
 msgstr "টেবলের জন্য টেবলের গঠন"
 
@@ -8338,103 +8354,33 @@ msgstr "মাইক্রোসফট ওর্য়াড ২০০০"
 msgid "OpenDocument Text"
 msgstr "ওপেন অফিস টেক্সট"
 
-#: libraries/controllers/StructureController.class.php:465
+#: libraries/controllers/DatabaseStructureController.class.php:405
 #: tbl_operations.php:382
 #, php-format
 msgid "Table %s has been emptied."
 msgstr "টেবিল %s খালি করা হয়েছে"
 
-#: libraries/controllers/StructureController.class.php:486
+#: libraries/controllers/DatabaseStructureController.class.php:426
 #: tbl_operations.php:400 view_operations.php:119
 #, php-format
 msgid "View %s has been dropped."
 msgstr "ভিউ %s মুছা হয়েছে।"
 
-#: libraries/controllers/StructureController.class.php:487
+#: libraries/controllers/DatabaseStructureController.class.php:427
 #: tbl_operations.php:401
 #, php-format
 msgid "Table %s has been dropped."
 msgstr "টেবল %s মুছা হয়েছে।"
 
-#: libraries/controllers/StructureController.class.php:797
-#, fuzzy, php-format
-#| msgid "The column name '%s' is a MySQL reserved keyword."
-msgid "The name '%s' is a MySQL reserved keyword."
-msgid_plural "The names '%s' are MySQL reserved keywords."
-msgstr[0] "স্তম্ভের নাম '%s'টি MySQL'র সংরক্ষিত শব্দ।"
-msgstr[1] "স্তম্ভের নাম '%s'টি MySQL'র সংরক্ষিত শব্দ।"
-
-#: libraries/controllers/StructureController.class.php:875
-msgid "No column selected."
-msgstr "কোন স্তম্ভ নির্বাচন করা হয় নাই"
-
-#: libraries/controllers/StructureController.class.php:1049
+#: libraries/controllers/DatabaseStructureController.class.php:733
 msgid "Favorite List is full!"
 msgstr ""
 
-#: libraries/controllers/StructureController.class.php:1272
-msgid "The columns have been moved successfully."
-msgstr "স্তম্ভগুলো সফলভাবে সরানো হয়েছে।"
-
-#: libraries/controllers/StructureController.class.php:1535
-#, fuzzy, php-format
-#| msgid "Table %1$s has been altered successfully."
-msgid ""
-"Table %1$s has been altered successfully. Privileges have been adjusted."
-msgstr "%1$s টেবিলটি সফলভাবে পরিবর্তন করা হয়েছে।"
-
-#: libraries/controllers/StructureController.class.php:1541
-#: libraries/controllers/TableIndexesController.class.php:161
-#: tbl_addfield.php:92
-#, php-format
-msgid "Table %1$s has been altered successfully."
-msgstr "%1$s টেবিলটি সফলভাবে পরিবর্তন করা হয়েছে।"
-
-#: libraries/controllers/StructureController.class.php:1588
-#: libraries/tracking.lib.php:1094
-msgid "Query error"
-msgstr "অনুসন্ধানে ভুল"
-
-#: libraries/controllers/StructureController.class.php:1806
+#: libraries/controllers/DatabaseStructureController.class.php:947
 #: libraries/mysql_charsets.lib.php:366 libraries/mysql_charsets.lib.php:373
 msgid "unknown"
 msgstr "অজানা"
 
-#: libraries/controllers/StructureController.class.php:1957
-#: templates/structure/check_all_table_column.phtml:11
-msgid "Change"
-msgstr "পরিবর্তন"
-
-#: libraries/controllers/StructureController.class.php:1961
-#: libraries/controllers/StructureController.class.php:1966
-#: libraries/navigation/Nodes/Node_Index.class.php:30
-#: libraries/tracking.lib.php:926
-#: templates/columns_definitions/column_indexes.phtml:16
-#: templates/columns_definitions/table_fields_definitions.phtml:57
-#: templates/structure/check_all_table_column.phtml:30
-#: templates/structure/display_structure.phtml:79
-#: templates/structure/display_table_stats.phtml:19
-msgid "Index"
-msgstr "ইনডেক্স"
-
-#: libraries/controllers/StructureController.class.php:1963
-#: libraries/controllers/StructureController.class.php:1968
-#: templates/columns_definitions/column_indexes.phtml:27
-#: templates/structure/check_all_table_column.phtml:37
-msgid "Spatial"
-msgstr "স্পাটিয়াল"
-
-#: libraries/controllers/StructureController.class.php:1964
-#: libraries/controllers/StructureController.class.php:1969
-#: templates/columns_definitions/column_indexes.phtml:22
-#: templates/structure/check_all_table_column.phtml:47
-msgid "Fulltext"
-msgstr "ফুলটেক্সট"
-
-#: libraries/controllers/StructureController.class.php:1970
-msgid "Distinct values"
-msgstr "স্বতন্ত্র মানগুলো"
-
 #: libraries/controllers/TableChartController.class.php:82
 #: libraries/controllers/TableGisVisualizationController.class.php:101
 msgid "No SQL query was set to fetch data."
@@ -8448,13 +8394,20 @@ msgstr "প্লটের জন্য টেবলে কোন গাণি
 msgid "No data to display"
 msgstr "প্রর্দশনের কোন তথ্য নাই"
 
-#: libraries/controllers/TableRelationController.class.php:217
+#: libraries/controllers/TableIndexesController.class.php:161
+#: libraries/controllers/TableStructureController.class.php:736
+#: tbl_addfield.php:92
+#, php-format
+msgid "Table %1$s has been altered successfully."
+msgstr "%1$s টেবিলটি সফলভাবে পরিবর্তন করা হয়েছে।"
+
+#: libraries/controllers/TableRelationController.class.php:218
 #, fuzzy
 #| msgid "Thread %s was successfully killed."
 msgid "Display column was successfully updated."
 msgstr "প্রক্রিয়া %s সফলভাবে ধ্বংস করা হয়েছে।"
 
-#: libraries/controllers/TableRelationController.class.php:283
+#: libraries/controllers/TableRelationController.class.php:288
 #, fuzzy
 #| msgid "Internal relation added"
 msgid "Internal relations were successfully updated."
@@ -8473,12 +8426,75 @@ msgid "Zoom search"
 msgstr "খোজাঁ বড় কর"
 
 #: libraries/controllers/TableSearchController.class.php:852
-#: templates/table/selection_form.phtml:59
+#: templates/table/search/selection_form.phtml:59
 #, fuzzy
 #| msgid "Find and Replace"
 msgid "Find and replace"
 msgstr "পাওয়া এবং প্রতিস্থাপন"
 
+#: libraries/controllers/TableStructureController.class.php:163
+#, fuzzy, php-format
+#| msgid "The column name '%s' is a MySQL reserved keyword."
+msgid "The name '%s' is a MySQL reserved keyword."
+msgid_plural "The names '%s' are MySQL reserved keywords."
+msgstr[0] "স্তম্ভের নাম '%s'টি MySQL'র সংরক্ষিত শব্দ।"
+msgstr[1] "স্তম্ভের নাম '%s'টি MySQL'র সংরক্ষিত শব্দ।"
+
+#: libraries/controllers/TableStructureController.class.php:241
+msgid "No column selected."
+msgstr "কোন স্তম্ভ নির্বাচন করা হয় নাই"
+
+#: libraries/controllers/TableStructureController.class.php:467
+msgid "The columns have been moved successfully."
+msgstr "স্তম্ভগুলো সফলভাবে সরানো হয়েছে।"
+
+#: libraries/controllers/TableStructureController.class.php:730
+#, fuzzy, php-format
+#| msgid "Table %1$s has been altered successfully."
+msgid ""
+"Table %1$s has been altered successfully. Privileges have been adjusted."
+msgstr "%1$s টেবিলটি সফলভাবে পরিবর্তন করা হয়েছে।"
+
+#: libraries/controllers/TableStructureController.class.php:783
+#: libraries/tracking.lib.php:1094
+msgid "Query error"
+msgstr "অনুসন্ধানে ভুল"
+
+#: libraries/controllers/TableStructureController.class.php:948
+#: templates/table/structure/check_all_table_column.phtml:11
+msgid "Change"
+msgstr "পরিবর্তন"
+
+#: libraries/controllers/TableStructureController.class.php:952
+#: libraries/controllers/TableStructureController.class.php:957
+#: libraries/navigation/Nodes/Node_Index.class.php:30
+#: libraries/tracking.lib.php:926
+#: templates/columns_definitions/column_indexes.phtml:16
+#: templates/columns_definitions/table_fields_definitions.phtml:57
+#: templates/table/structure/check_all_table_column.phtml:30
+#: templates/table/structure/display_structure.phtml:79
+#: templates/table/structure/display_table_stats.phtml:19
+msgid "Index"
+msgstr "ইনডেক্স"
+
+#: libraries/controllers/TableStructureController.class.php:954
+#: libraries/controllers/TableStructureController.class.php:959
+#: templates/columns_definitions/column_indexes.phtml:27
+#: templates/table/structure/check_all_table_column.phtml:37
+msgid "Spatial"
+msgstr "স্পাটিয়াল"
+
+#: libraries/controllers/TableStructureController.class.php:955
+#: libraries/controllers/TableStructureController.class.php:960
+#: templates/columns_definitions/column_indexes.phtml:22
+#: templates/table/structure/check_all_table_column.phtml:47
+msgid "Fulltext"
+msgstr "ফুলটেক্সট"
+
+#: libraries/controllers/TableStructureController.class.php:963
+msgid "Distinct values"
+msgstr "স্বতন্ত্র মানগুলো"
+
 #: libraries/core.lib.php:306
 #, php-format
 msgid "The %s extension is missing. Please check your PHP configuration."
@@ -8526,7 +8542,7 @@ msgid "No Password"
 msgstr "পাসওর্য়াড নাই"
 
 #: libraries/display_change_password.lib.php:68
-#: libraries/plugins/auth/AuthenticationCookie.class.php:199
+#: libraries/plugins/auth/AuthenticationCookie.class.php:187
 #: libraries/replication_gui.lib.php:422 libraries/replication_gui.lib.php:862
 #: libraries/server_privileges.lib.php:1640
 msgid "Password:"
@@ -9333,12 +9349,12 @@ msgid "Dump has been saved to file %s."
 msgstr "স্তুপকৃত তথ্য %s ফাইলে সংরক্ষন করা হয়েছে।"
 
 #: libraries/import.lib.php:202 libraries/insert_edit.lib.php:124
-#: libraries/rte/rte_routines.lib.php:1353 libraries/sql.lib.php:1312
+#: libraries/rte/rte_routines.lib.php:1444 libraries/sql.lib.php:1306
 #: tbl_get_field.php:44
 msgid "MySQL returned an empty result set (i.e. zero rows)."
 msgstr "মাইএসকিউএল কিছু পায়নি। (শুন্য তথ্য)।"
 
-#: libraries/import.lib.php:265 libraries/sql.lib.php:1326
+#: libraries/import.lib.php:265 libraries/sql.lib.php:1320
 msgid "[ROLLBACK occurred.]"
 msgstr ""
 
@@ -9409,14 +9425,14 @@ msgstr "&nbsp;%s&nbsp; কলামসমূহে একটি ইনডেক
 
 #: libraries/insert_edit.lib.php:233
 #: libraries/navigation/Nodes/Node_DatabaseChild.class.php:48
-#: templates/designer/table_list.phtml:40
+#: templates/database/designer/table_list.phtml:40
 msgid "Hide"
 msgstr "লুকাও"
 
 #: libraries/insert_edit.lib.php:249
 #: libraries/navigation/Nodes/Node_Function.class.php:32
-#: libraries/rte/rte_routines.lib.php:1495
-#: templates/table/table_header.phtml:4
+#: libraries/rte/rte_routines.lib.php:1586
+#: templates/table/search/table_header.phtml:4
 msgid "Function"
 msgstr "ফাংশন"
 
@@ -9431,84 +9447,85 @@ msgstr "বাইনারী"
 msgid "Because of its length,<br /> this column might not be editable."
 msgstr "দৈর্ঘ্যের জন্য এই স্বম্ভ সম্পাদন করা যাবে না"
 
-#: libraries/insert_edit.lib.php:1050
+#: libraries/insert_edit.lib.php:1048
 msgid "Binary - do not edit"
 msgstr "Binary - সম্পাদন করবেন না"
 
-#: libraries/insert_edit.lib.php:1176 libraries/server_privileges.lib.php:470
-#: templates/table/options.phtml:36
+#: libraries/insert_edit.lib.php:1174 libraries/server_privileges.lib.php:470
+#: templates/table/search/options.phtml:36
 msgid "Or"
 msgstr "অথবা"
 
-#: libraries/insert_edit.lib.php:1177
+#: libraries/insert_edit.lib.php:1175
 msgid "web server upload directory:"
 msgstr "ওয়েব সার্ভারের আপলোড ডিরেক্টরি:"
 
-#: libraries/insert_edit.lib.php:1348 templates/table/input_box.phtml:49
+#: libraries/insert_edit.lib.php:1346
+#: templates/table/search/input_box.phtml:49
 msgid "Edit/Insert"
 msgstr "সম্পাদন/নতুন"
 
-#: libraries/insert_edit.lib.php:1398
+#: libraries/insert_edit.lib.php:1396
 #, php-format
 msgid "Continue insertion with %s rows"
 msgstr "%s রোতে প্রবেশ করানো চলতে থাকবে"
 
-#: libraries/insert_edit.lib.php:1428
+#: libraries/insert_edit.lib.php:1426
 msgid "and then"
 msgstr "এবং তারপর"
 
-#: libraries/insert_edit.lib.php:1461
+#: libraries/insert_edit.lib.php:1459
 msgid "Insert as new row"
 msgstr "নতুন রো হিসাবে প্রবেশ করাও"
 
-#: libraries/insert_edit.lib.php:1464
+#: libraries/insert_edit.lib.php:1462
 msgid "Insert as new row and ignore errors"
 msgstr "নতুন রো হিসাবে প্রবেশ করাও এবং ভুলসমূহ উপেক্ষা কর"
 
-#: libraries/insert_edit.lib.php:1467
+#: libraries/insert_edit.lib.php:1465
 msgid "Show insert query"
 msgstr "প্রবেশ করানোর অনুসন্ধান দেখাও"
 
-#: libraries/insert_edit.lib.php:1487
+#: libraries/insert_edit.lib.php:1485
 msgid "Go back to previous page"
 msgstr "পূর্ববর্তী পাতায় যাও"
 
-#: libraries/insert_edit.lib.php:1490
+#: libraries/insert_edit.lib.php:1488
 msgid "Insert another new row"
 msgstr "অন্য আরেকটি নতুন রো প্রবেশ করাও"
 
-#: libraries/insert_edit.lib.php:1495
+#: libraries/insert_edit.lib.php:1493
 msgid "Go back to this page"
 msgstr "এই পাতাতেই ফিরে আস"
 
-#: libraries/insert_edit.lib.php:1518
+#: libraries/insert_edit.lib.php:1516
 msgid "Edit next row"
 msgstr "পরবর্তী রো সম্পাদনা"
 
-#: libraries/insert_edit.lib.php:1540
+#: libraries/insert_edit.lib.php:1538
 msgid ""
 "Use TAB key to move from value to value, or CTRL+arrows to move anywhere"
 msgstr ""
 "ট্যাব কি দিয়ে মান থেকে মানে যাওয়া যাবে বা CTRL+arrows দিয়ে যে কোন জায়গায় "
 "যাওয়া যাবে।"
 
-#: libraries/insert_edit.lib.php:1577 libraries/replication_gui.lib.php:542
-#: libraries/rte/rte_routines.lib.php:1497
+#: libraries/insert_edit.lib.php:1575 libraries/replication_gui.lib.php:542
+#: libraries/rte/rte_routines.lib.php:1588
 #: libraries/server_status_variables.lib.php:220
-#: templates/designer/having_query_panel.phtml:100
-#: templates/designer/options_panel.phtml:73
-#: templates/designer/options_panel.phtml:239
-#: templates/designer/where_query_panel.phtml:69
-#: templates/table/table_header.phtml:10
-#: templates/table/zoom_result_form.phtml:35
+#: templates/database/designer/having_query_panel.phtml:100
+#: templates/database/designer/options_panel.phtml:73
+#: templates/database/designer/options_panel.phtml:239
+#: templates/database/designer/where_query_panel.phtml:69
+#: templates/table/search/table_header.phtml:10
+#: templates/table/search/zoom_result_form.phtml:35
 msgid "Value"
 msgstr "মান"
 
-#: libraries/insert_edit.lib.php:1937 libraries/sql.lib.php:1309
+#: libraries/insert_edit.lib.php:1935 libraries/sql.lib.php:1303
 msgid "Showing SQL query"
 msgstr "এসকিউএল অনুসন্ধান দেখাচ্ছে"
 
-#: libraries/insert_edit.lib.php:1962 libraries/sql.lib.php:1287
+#: libraries/insert_edit.lib.php:1960 libraries/sql.lib.php:1281
 #, php-format
 msgid "Inserted row id: %1$d"
 msgstr "প্রবেশকৃত রো আইডি: %1$d"
@@ -9927,7 +9944,7 @@ msgstr "নতুন"
 #: libraries/navigation/Nodes/Node_View_Container.class.php:26
 #: libraries/navigation/Nodes/Node_View_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:129
-#: templates/structure/show_create.phtml:30
+#: templates/database/structure/show_create.phtml:30
 msgid "Views"
 msgstr "ভিউসমূহ"
 
@@ -10237,7 +10254,7 @@ msgstr "এই মূহুর্তে এখানে থাকার জন
 
 #: libraries/operations.lib.php:101 libraries/operations.lib.php:249
 #: libraries/operations.lib.php:869 libraries/operations.lib.php:963
-#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:907
+#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:998
 #: templates/columns_definitions/table_fields_definitions.phtml:47
 #, fuzzy
 #| msgid "Edit Privileges"
@@ -10329,22 +10346,22 @@ msgid "Switch to copied table"
 msgstr "প্রতিলিপিকৃত টেবিলে যাও"
 
 #: libraries/operations.lib.php:1360
-#: templates/structure/check_all_tables.phtml:18
+#: templates/database/structure/check_all_tables.phtml:18
 msgid "Table maintenance"
 msgstr "টেবিল রক্ষণাবেক্ষণ"
 
 #: libraries/operations.lib.php:1398
-#: templates/structure/check_all_tables.phtml:19
+#: templates/database/structure/check_all_tables.phtml:19
 msgid "Analyze table"
 msgstr "টেবিল নিরীক্ষা করা"
 
 #: libraries/operations.lib.php:1413
-#: templates/structure/check_all_tables.phtml:20
+#: templates/database/structure/check_all_tables.phtml:20
 msgid "Check table"
 msgstr "টেবল পরীক্ষা"
 
 #: libraries/operations.lib.php:1428
-#: templates/structure/check_all_tables.phtml:22
+#: templates/database/structure/check_all_tables.phtml:22
 #, fuzzy
 #| msgid "Check table"
 msgid "Checksum table"
@@ -10364,18 +10381,19 @@ msgid "Flush the table (FLUSH)"
 msgstr "টেবিলটি ফ্লাশ কর (FLUSH)"
 
 #: libraries/operations.lib.php:1477
-#: templates/structure/check_all_tables.phtml:23
-#: templates/structure/display_table_stats.phtml:56
+#: templates/database/structure/check_all_tables.phtml:23
+#: templates/table/structure/display_table_stats.phtml:56
 msgid "Optimize table"
 msgstr "টেবিল সর্বোচ্চ কার্যপযোগী কর"
 
 #: libraries/operations.lib.php:1492
-#: templates/structure/check_all_tables.phtml:24
+#: templates/database/structure/check_all_tables.phtml:24
 msgid "Repair table"
 msgstr "টেবিল মেরামত"
 
 #: libraries/operations.lib.php:1538
-#: templates/structure/check_all_tables.phtml:14 view_operations.php:127
+#: templates/database/structure/check_all_tables.phtml:14
+#: view_operations.php:127
 msgid "Delete data or table"
 msgstr "তথ্য বা টেবিল মুছ"
 
@@ -10500,7 +10518,7 @@ msgid "Cannot connect: invalid settings."
 msgstr "সংযোগ করা যায়নি: অকার্যকর সেটিংস।"
 
 #: libraries/plugins/auth/AuthenticationConfig.class.php:108
-#: libraries/plugins/auth/AuthenticationCookie.class.php:134
+#: libraries/plugins/auth/AuthenticationCookie.class.php:122
 #: libraries/plugins/auth/AuthenticationHttp.class.php:96
 #, php-format
 msgid "Welcome to %s"
@@ -10529,37 +10547,37 @@ msgstr ""
 msgid "Retry to connect"
 msgstr "পুনরায় সংযোগের চেষ্ট কর"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:146
+#: libraries/plugins/auth/AuthenticationCookie.class.php:134
 msgid "Your session has expired. Please log in again."
 msgstr "আপনার সেশন শেষ হয়ে গেছে। আবার লগইন করুন।"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:170
+#: libraries/plugins/auth/AuthenticationCookie.class.php:158
 msgid "Log in"
 msgstr "লগইন"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:178
-#: libraries/plugins/auth/AuthenticationCookie.class.php:188
+#: libraries/plugins/auth/AuthenticationCookie.class.php:166
+#: libraries/plugins/auth/AuthenticationCookie.class.php:176
 msgid "You can enter hostname/IP address and port separated by space."
 msgstr ""
 "আপনি ফাকা জায়গা দ্বারা আলাদা করে হোষ্টেনেম/আইপি ঠিকানা এবং পোর্ট দিতে পারেন।"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:193
+#: libraries/plugins/auth/AuthenticationCookie.class.php:181
 msgid "Username:"
 msgstr "নাম:"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:205
+#: libraries/plugins/auth/AuthenticationCookie.class.php:193
 msgid "Server Choice:"
 msgstr "পছন্দের সার্ভার:"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:386
+#: libraries/plugins/auth/AuthenticationCookie.class.php:374
 msgid "Entered captcha is wrong, try again!"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:396
+#: libraries/plugins/auth/AuthenticationCookie.class.php:384
 msgid "Please enter correct captcha!"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:423
+#: libraries/plugins/auth/AuthenticationCookie.class.php:411
 #, fuzzy
 #| msgid "Cannot log in to the MySQL server"
 msgid "You are not allowed to log in to this MySQL server!"
@@ -10657,7 +10675,7 @@ msgstr "ইভেন্ট"
 #: libraries/plugins/export/ExportOdt.class.php:593
 #: libraries/plugins/export/ExportTexytext.class.php:428
 #: libraries/plugins/export/PMA_ExportPdf.class.php:313
-#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:984
 #: libraries/rte/rte_triggers.lib.php:377
 msgid "Definition"
 msgstr "সংজ্ঞা"
@@ -10984,7 +11002,7 @@ msgid "Last check:"
 msgstr "সর্বশেষ যাচাই:"
 
 #: libraries/plugins/export/ExportSql.class.php:1399
-#: templates/structure/structure_table_row.phtml:183
+#: templates/database/structure/structure_table_row.phtml:183
 msgid "in use"
 msgstr "ব্যবহৃত"
 
@@ -11180,20 +11198,14 @@ msgstr "MySQL Spatial সংযোজক ESRI type \"%s\" সমর্থন ক
 msgid "The imported file does not contain any data!"
 msgstr "আমদানিকৃত ফাইলটিতে কোন তথ্য নাই"
 
-#: libraries/plugins/import/ImportSql.class.php:169
+#: libraries/plugins/import/ImportSql.class.php:72
 msgid "SQL compatibility mode:"
 msgstr "SQL উপযুক্ততার পদ্ধতি:"
 
-#: libraries/plugins/import/ImportSql.class.php:181
+#: libraries/plugins/import/ImportSql.class.php:84
 msgid "Do not use <code>AUTO_INCREMENT</code> for zero values"
 msgstr "শুন্য মানের জন্য <code>AUTO_INCREMENT</code> ব্যবহার করো না"
 
-#: libraries/plugins/import/ImportSql.class.php:195
-#, fuzzy
-#| msgid "Read misses"
-msgid "Read as multibytes"
-msgstr "পড়া ব্যার্থ হয়েছে"
-
 #: libraries/plugins/import/ImportXml.class.php:54
 msgid "XML"
 msgstr "এক্সএমএল"
@@ -11236,7 +11248,7 @@ msgid "Show grid"
 msgstr "গ্রীড দেখাও"
 
 #: libraries/plugins/schema/SchemaPdf.class.php:94
-#: templates/structure/print_view_data_dictionary_link.phtml:6
+#: templates/database/structure/print_view_data_dictionary_link.phtml:6
 msgid "Data Dictionary"
 msgstr "তথ্য অভিধান"
 
@@ -11267,7 +11279,7 @@ msgid "The %s table doesn't exist!"
 msgstr "%s টেবলটি নাই!"
 
 #: libraries/plugins/schema/eps/Eps_Relation_Schema.class.php:321
-#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:309
+#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:323
 #, php-format
 msgid "Schema of the %s database - Page %s"
 msgstr "%s ডাটাবেইজের রূপরেখা - পাতা %s"
@@ -11296,7 +11308,7 @@ msgstr "সুচিপত্র"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1005
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1028
 #: libraries/tracking.lib.php:884
-#: templates/structure/table_structure_header.phtml:11
+#: templates/table/structure/table_structure_header.phtml:11
 msgid "Extra"
 msgstr "বেশতী"
 
@@ -11694,11 +11706,11 @@ msgstr ""
 "প্রয়োজনীয় টেবলসমূহ  <code>examples/create_tables.sql</code> এর সাহায্যে তৈরী কর "
 "।"
 
-#: libraries/relation.lib.php:360
+#: libraries/relation.lib.php:357
 msgid "Create a pma user and give access to these tables."
 msgstr "একটি PMA ব্যবহারকারী তৈরী কর এবং টেবিলসমূহে প্রবেশাধীকার দাও।"
 
-#: libraries/relation.lib.php:365
+#: libraries/relation.lib.php:360
 msgid ""
 "Enable advanced features in configuration file (<code>config.inc.php</"
 "code>), for example by starting from <code>config.sample.inc.php</code>."
@@ -11706,22 +11718,22 @@ msgstr ""
 "কনফিগারেশন ফাইলে (<code>config.inc.php</code>) উন্নততর বিষয়গুলো কার্যকর কর, "
 "উদাহরণ স্বরুপ <code>config.sample.inc.php</code> থেকে শুরু কর।"
 
-#: libraries/relation.lib.php:373
+#: libraries/relation.lib.php:365
 msgid "Re-login to phpMyAdmin to load the updated configuration file."
 msgstr "আধুনিক কনফিগারেশন ফাইল লোড করার জন্য phpMyAdmin এ আবার লগইন করুন।"
 
-#: libraries/relation.lib.php:1612
+#: libraries/relation.lib.php:1607
 msgid "no description"
 msgstr "বণর্না নাই"
 
-#: libraries/relation.lib.php:1811
+#: libraries/relation.lib.php:1806
 msgid ""
 "You do not have necessary privileges to create a database named "
 "'phpmyadmin'. You may go to 'Operations' tab of any database to set up the "
 "phpMyAdmin configuration storage there."
 msgstr ""
 
-#: libraries/relation.lib.php:1928
+#: libraries/relation.lib.php:1923
 #, fuzzy, php-format
 #| msgid "Missing phpMyAdmin configuration storage tables"
 msgid ""
@@ -11729,21 +11741,21 @@ msgid ""
 "configuration storage there."
 msgstr "phpMyAdmin কনফিগারেশনের storage table পাওয়া যাচ্ছে না"
 
-#: libraries/relation.lib.php:1936
+#: libraries/relation.lib.php:1931
 #, fuzzy, php-format
 #| msgid "Missing phpMyAdmin configuration storage tables"
 msgid ""
 "%sCreate%s the phpMyAdmin configuration storage in the current database."
 msgstr "phpMyAdmin কনফিগারেশনের storage table পাওয়া যাচ্ছে না"
 
-#: libraries/relation.lib.php:1944
+#: libraries/relation.lib.php:1939
 #, fuzzy, php-format
 #| msgid "Missing phpMyAdmin configuration storage tables"
 msgid "%sCreate%s missing phpMyAdmin configuration storage tables."
 msgstr "phpMyAdmin কনফিগারেশনের storage table পাওয়া যাচ্ছে না"
 
 #: libraries/replication_gui.lib.php:46 libraries/replication_gui.lib.php:343
-#: libraries/server_databases.lib.php:387
+#: libraries/server_databases.lib.php:398
 msgid "Master replication"
 msgstr "প্রধান প্রতিলিপি"
 
@@ -11810,7 +11822,7 @@ msgid ""
 msgstr ""
 
 #: libraries/replication_gui.lib.php:141
-#: libraries/server_databases.lib.php:389
+#: libraries/server_databases.lib.php:400
 msgid "Slave replication"
 msgstr "সহযোগী প্রতিলিপি"
 
@@ -12084,10 +12096,10 @@ msgid "Master server changed successfully to %s."
 msgstr "প্রধান সার্ভারটি সফলভাবে %s তে পরিবর্তন করা হয়েছে"
 
 #: libraries/rte/rte_events.lib.php:106 libraries/rte/rte_events.lib.php:115
-#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:149
-#: libraries/rte/rte_routines.lib.php:158
-#: libraries/rte/rte_routines.lib.php:231
-#: libraries/rte/rte_routines.lib.php:1362
+#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:219
+#: libraries/rte/rte_routines.lib.php:246
+#: libraries/rte/rte_routines.lib.php:368
+#: libraries/rte/rte_routines.lib.php:1453
 #: libraries/rte/rte_triggers.lib.php:82 libraries/rte/rte_triggers.lib.php:91
 #: libraries/rte/rte_triggers.lib.php:123
 #, php-format
@@ -12108,7 +12120,7 @@ msgstr "ইভেন্ট %1$s পরিবর্তন হয়েছে।"
 msgid "Event %1$s has been created."
 msgstr "ইভেন্ট %1$s তৈরী হয়েছে।"
 
-#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:251
+#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:266
 #: libraries/rte/rte_triggers.lib.php:144
 msgid "One or more errors have occurred while processing your request:"
 msgstr "আপনার কাজ প্রক্রিয়া করার সময় এক বা একাধীক ভুল হয়েছে:"
@@ -12117,7 +12129,7 @@ msgstr "আপনার কাজ প্রক্রিয়া করার স
 msgid "Edit event"
 msgstr "ইভেন্ট সম্পাদনা"
 
-#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:794
+#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:885
 #: libraries/rte/rte_triggers.lib.php:323 view_create.php:180
 msgid "Details"
 msgstr "বিশদ"
@@ -12130,7 +12142,7 @@ msgstr "ইভেন্টের নাম"
 msgid "Event type"
 msgstr "ইভেন্টের ধরন"
 
-#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:817
+#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:908
 #, php-format
 msgid "Change to %s"
 msgstr "পরিবর্তন কর %s এ"
@@ -12157,12 +12169,14 @@ msgstr "শেষ"
 msgid "On completion preserve"
 msgstr "শেষ করার পর রক্ষাকর"
 
-#: libraries/rte/rte_events.lib.php:491 libraries/rte/rte_routines.lib.php:930
+#: libraries/rte/rte_events.lib.php:491
+#: libraries/rte/rte_routines.lib.php:1021
 #: libraries/rte/rte_triggers.lib.php:383 view_create.php:209
 msgid "Definer"
 msgstr "সংজ্ঞা দানকারী"
 
-#: libraries/rte/rte_events.lib.php:535 libraries/rte/rte_routines.lib.php:997
+#: libraries/rte/rte_events.lib.php:535
+#: libraries/rte/rte_routines.lib.php:1088
 #: libraries/rte/rte_triggers.lib.php:422
 #, fuzzy
 #| msgid "The definer must be in the \"username@hostname\" format"
@@ -12192,9 +12206,9 @@ msgid "You must provide an event definition."
 msgstr "আপনাকে অবশ্যই ইভেন্টের সংজ্ঞা দিতে হবে।"
 
 #: libraries/rte/rte_export.lib.php:43 libraries/rte/rte_general.lib.php:72
-#: libraries/rte/rte_routines.lib.php:345
-#: libraries/rte/rte_routines.lib.php:1198
-#: libraries/rte/rte_routines.lib.php:1411
+#: libraries/rte/rte_routines.lib.php:153
+#: libraries/rte/rte_routines.lib.php:1289
+#: libraries/rte/rte_routines.lib.php:1502
 msgid "Error in processing request:"
 msgstr "নির্দেশ প্রক্রিয়া করনে সমস্যা হয়েছে:"
 
@@ -12229,99 +12243,99 @@ msgstr ""
 "অনুসন্ধান ত্বত্তাবধান করতে সক্ষম নয়। [strong]কিছু সঞ্চিত রুটিনের কাজ হয়ত ব্যার্থ হবে![/"
 "strong] সমস্যা এড়াতে 'mysqli' সংযোজক ব্যবহার করুন।"
 
-#: libraries/rte/rte_routines.lib.php:110
-#: libraries/rte/rte_routines.lib.php:1006
+#: libraries/rte/rte_routines.lib.php:123
+msgid "Edit routine"
+msgstr "রুটিন সম্পাদনা"
+
+#: libraries/rte/rte_routines.lib.php:200
+#: libraries/rte/rte_routines.lib.php:1097
 #, php-format
 msgid "Invalid routine type: \"%s\""
 msgstr "অকার্যকর রুটিন ধরন:\"%s\""
 
-#: libraries/rte/rte_routines.lib.php:170
+#: libraries/rte/rte_routines.lib.php:253
+#, php-format
+msgid "Routine %1$s has been created."
+msgstr "রুটিন %1$s তৈরী করা হয়েছে।"
+
+#: libraries/rte/rte_routines.lib.php:380
 msgid "Sorry, we failed to restore the dropped routine."
 msgstr "দুখিত, মুছে ফেলা রুটিনটি ফেরত আনা যায়নি।"
 
-#: libraries/rte/rte_routines.lib.php:211
+#: libraries/rte/rte_routines.lib.php:439
 #, fuzzy, php-format
 #| msgid "Routine %1$s has been modified."
 msgid "Routine %1$s has been modified. Privileges have been adjusted."
 msgstr "রুটিন %1$s পরিবর্তীত হয়েছে।"
 
-#: libraries/rte/rte_routines.lib.php:216
+#: libraries/rte/rte_routines.lib.php:444
 #, php-format
 msgid "Routine %1$s has been modified."
 msgstr "রুটিন %1$s পরিবর্তীত হয়েছে।"
 
-#: libraries/rte/rte_routines.lib.php:238
-#, php-format
-msgid "Routine %1$s has been created."
-msgstr "রুটিন %1$s তৈরী করা হয়েছে।"
-
-#: libraries/rte/rte_routines.lib.php:315
-msgid "Edit routine"
-msgstr "রুটিন সম্পাদনা"
-
-#: libraries/rte/rte_routines.lib.php:797
+#: libraries/rte/rte_routines.lib.php:888
 msgid "Routine name"
 msgstr "রুটিনের নাম"
 
-#: libraries/rte/rte_routines.lib.php:823
+#: libraries/rte/rte_routines.lib.php:914
 msgid "Parameters"
 msgstr "প্যারামিটার সমূহ"
 
-#: libraries/rte/rte_routines.lib.php:829
+#: libraries/rte/rte_routines.lib.php:920
 msgid "Direction"
 msgstr "দিক"
 
-#: libraries/rte/rte_routines.lib.php:847
+#: libraries/rte/rte_routines.lib.php:938
 msgid "Add parameter"
 msgstr "প্যারামিটার যোগকর"
 
-#: libraries/rte/rte_routines.lib.php:851
+#: libraries/rte/rte_routines.lib.php:942
 msgid "Remove last parameter"
 msgstr "শেষ প্যারামিটারটি মুছ"
 
-#: libraries/rte/rte_routines.lib.php:856
+#: libraries/rte/rte_routines.lib.php:947
 msgid "Return type"
 msgstr "ফেরতের ধরন"
 
-#: libraries/rte/rte_routines.lib.php:862
+#: libraries/rte/rte_routines.lib.php:953
 msgid "Return length/values"
 msgstr "ফেরতের দৈর্ঘ্য/মানসমূহ"
 
-#: libraries/rte/rte_routines.lib.php:868
+#: libraries/rte/rte_routines.lib.php:959
 msgid "Return options"
 msgstr "রুটিনের পছন্দসমূহ"
 
-#: libraries/rte/rte_routines.lib.php:899
+#: libraries/rte/rte_routines.lib.php:990
 msgid "Is deterministic"
 msgstr "নির্ধারক"
 
-#: libraries/rte/rte_routines.lib.php:920
+#: libraries/rte/rte_routines.lib.php:1011
 msgid ""
 "You do not have sufficient privileges to perform this operation; Please "
 "refer to the documentation for more details"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:935
+#: libraries/rte/rte_routines.lib.php:1026
 msgid "Security type"
 msgstr "নিরাপত্তার ধরণ"
 
-#: libraries/rte/rte_routines.lib.php:944
+#: libraries/rte/rte_routines.lib.php:1035
 msgid "SQL data access"
 msgstr "SQL তথ্যে প্রবেশ"
 
-#: libraries/rte/rte_routines.lib.php:1013
+#: libraries/rte/rte_routines.lib.php:1104
 #, fuzzy
 #| msgid "You must provide a routine name"
 msgid "You must provide a routine name!"
 msgstr "আপনাকে অবশ্যই একটি রুটিনের নাম দিতে হবে"
 
-#: libraries/rte/rte_routines.lib.php:1047
+#: libraries/rte/rte_routines.lib.php:1138
 #, php-format
 msgid "Invalid direction \"%s\" given for parameter."
 msgstr "প্যারামিটারের জন্য অকার্যকর নির্দেশনা \"%s\"।"
 
-#: libraries/rte/rte_routines.lib.php:1069
-#: libraries/rte/rte_routines.lib.php:1131
+#: libraries/rte/rte_routines.lib.php:1160
+#: libraries/rte/rte_routines.lib.php:1222
 msgid ""
 "You must provide length/values for routine parameters of type ENUM, SET, "
 "VARCHAR and VARBINARY."
@@ -12329,24 +12343,24 @@ msgstr ""
 "ENUM, SET,VARCHAR and VARBINARY এর রুটিনের প্যারামিটরে দৈর্ঘ্য/মান অবশ্যই দিতে "
 "হবে।"
 
-#: libraries/rte/rte_routines.lib.php:1095
+#: libraries/rte/rte_routines.lib.php:1186
 msgid "You must provide a name and a type for each routine parameter."
 msgstr "প্রতিটি রুটিন প্যারামিটারের জন্য অবশ্যই একটি নাম এবং ধরন দিতে হবে।"
 
-#: libraries/rte/rte_routines.lib.php:1114
+#: libraries/rte/rte_routines.lib.php:1205
 msgid "You must provide a valid return type for the routine."
 msgstr "আপনাকে অবশ্যই রুটিনের কার্যকর ফেরত ধরণ দিতে হবে।"
 
-#: libraries/rte/rte_routines.lib.php:1174
+#: libraries/rte/rte_routines.lib.php:1265
 msgid "You must provide a routine definition."
 msgstr "আপনাকে অবশ্যই রুটিনের একটি সংজ্ঞা দিতে হবে।"
 
-#: libraries/rte/rte_routines.lib.php:1285
+#: libraries/rte/rte_routines.lib.php:1376
 #, php-format
 msgid "Execution results of routine %s"
 msgstr "রুটিন %s এর সম্পাদনের ফলাফল"
 
-#: libraries/rte/rte_routines.lib.php:1340
+#: libraries/rte/rte_routines.lib.php:1431
 #, fuzzy, php-format
 #| msgid "%d row affected by the last statement inside the procedure"
 #| msgid_plural "%d rows affected by the last statement inside the procedure"
@@ -12355,13 +12369,13 @@ msgid_plural "%d rows affected by the last statement inside the procedure."
 msgstr[0] "প্রসিউডারের শেষ স্টেটমেন্ট দ্বারা %d টি রো প্রভাবিত হয়েছে।"
 msgstr[1] "্রসিউডারের শেষ স্টেটমেন্ট দ্বারা %d টি রো প্রভাবিত হয়েছে।"
 
-#: libraries/rte/rte_routines.lib.php:1398
-#: libraries/rte/rte_routines.lib.php:1406
+#: libraries/rte/rte_routines.lib.php:1489
+#: libraries/rte/rte_routines.lib.php:1497
 msgid "Execute routine"
 msgstr "রুটিন নির্বাহ কর"
 
-#: libraries/rte/rte_routines.lib.php:1485
-#: libraries/rte/rte_routines.lib.php:1488
+#: libraries/rte/rte_routines.lib.php:1576
+#: libraries/rte/rte_routines.lib.php:1579
 msgid "Routine parameters"
 msgstr "রুটিনের প্যারামিটার"
 
@@ -12523,7 +12537,7 @@ msgid "Original position"
 msgstr "মূল অবস্থান"
 
 #: libraries/server_bin_log.lib.php:133
-#: templates/structure/display_table_stats.phtml:4
+#: templates/table/structure/display_table_stats.phtml:4
 msgid "Information"
 msgstr "তথ্যাদি"
 
@@ -12561,12 +12575,12 @@ msgstr ""
 "টিকা: ডাটাবেইজের পরিসংখ্যান কার্যকর করলে ওয়েব সার্ভার এবং মাইএসকিউল সার্ভারের "
 "কাজের পরিমান বেড়ে যাবে।"
 
-#: libraries/server_databases.lib.php:364
-#: libraries/server_databases.lib.php:365
+#: libraries/server_databases.lib.php:366
+#: libraries/server_databases.lib.php:371
 msgid "Enable Statistics"
 msgstr "পরিসংখ্যান কার্যকর"
 
-#: libraries/server_databases.lib.php:481
+#: libraries/server_databases.lib.php:492
 #, php-format
 msgid "%1$d database has been dropped successfully."
 msgid_plural "%1$d databases have been dropped successfully."
@@ -12943,7 +12957,7 @@ msgid "You have revoked the privileges for %s."
 msgstr "%s অধিকার সমূহ বাতিল করা হয়েছে।"
 
 #: libraries/server_privileges.lib.php:2059
-#: libraries/server_privileges.lib.php:4290
+#: libraries/server_privileges.lib.php:4316
 #, fuzzy
 #| msgid "Add user group"
 msgid "Add user account"
@@ -13118,59 +13132,59 @@ msgstr "%s মুছছি"
 msgid "The privileges were reloaded successfully."
 msgstr "অধিকারসমূহ সফলভাবে পুনরায় পূর্ণকরা হয়েছে।"
 
-#: libraries/server_privileges.lib.php:3994
+#: libraries/server_privileges.lib.php:4003
 #, php-format
 msgid "The user %s already exists!"
 msgstr "ব্যবহারকারী %s পূর্ব থেকেই আছে!"
 
-#: libraries/server_privileges.lib.php:4232
+#: libraries/server_privileges.lib.php:4258
 #, php-format
 msgid "Privileges for %s"
 msgstr "%s এর অধিকারসমূহ"
 
-#: libraries/server_privileges.lib.php:4241
+#: libraries/server_privileges.lib.php:4267
 #: libraries/server_status_processes.lib.php:72
 #: libraries/server_user_groups.lib.php:39
 msgid "User"
 msgstr "ব্যবহারকারী"
 
-#: libraries/server_privileges.lib.php:4282
+#: libraries/server_privileges.lib.php:4308
 msgctxt "Create new user"
 msgid "New"
 msgstr "নতুন"
 
-#: libraries/server_privileges.lib.php:4311
+#: libraries/server_privileges.lib.php:4337
 #, fuzzy
 #| msgid "Edit Privileges:"
 msgid "Edit privileges:"
 msgstr "সুবিধাসমূহ সম্পাদনা:"
 
-#: libraries/server_privileges.lib.php:4312
+#: libraries/server_privileges.lib.php:4338
 #, fuzzy
 #| msgid "User group"
 msgid "User account"
 msgstr "ব্যাবহারকারীর দল"
 
-#: libraries/server_privileges.lib.php:4371
+#: libraries/server_privileges.lib.php:4397
 msgid ""
 "Note: You are attempting to edit privileges of the user with which you are "
 "currently logged in."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4391 libraries/server_users.lib.php:25
+#: libraries/server_privileges.lib.php:4417 libraries/server_users.lib.php:25
 #, fuzzy
 #| msgid "Users overview"
 msgid "User accounts overview"
 msgstr "একনজরে ব্যবহারকারীগণ"
 
-#: libraries/server_privileges.lib.php:4459
+#: libraries/server_privileges.lib.php:4485
 msgid ""
 "A user account allowing any user from localhost to connect is present. This "
 "will prevent other users from connecting if the host part of their account "
 "allows a connection from any (%) host."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4500
+#: libraries/server_privileges.lib.php:4526
 #, php-format
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
@@ -13183,7 +13197,7 @@ msgstr ""
 "হতে পারে যদি তা পরিবর্তীত হয়ে থাকে। এরুপ ক্ষেত্রে %sreload the privileges%s করতে "
 "হবে।"
 
-#: libraries/server_privileges.lib.php:4519
+#: libraries/server_privileges.lib.php:4545
 #, fuzzy
 #| msgid ""
 #| "Note: phpMyAdmin gets the users' privileges directly from MySQL's "
@@ -13202,25 +13216,25 @@ msgstr ""
 "হতে পারে যদি তা পরিবর্তীত হয়ে থাকে। এরুপ ক্ষেত্রে %sreload the privileges%s করতে "
 "হবে।"
 
-#: libraries/server_privileges.lib.php:4569
+#: libraries/server_privileges.lib.php:4595
 msgid "The selected user was not found in the privilege table."
 msgstr "অধিকার টেবিলে এই ব্যবহারকারী সর্ম্পকে কোন তথ্য নাই।"
 
-#: libraries/server_privileges.lib.php:4801
+#: libraries/server_privileges.lib.php:4827
 msgid "You have added a new user."
 msgstr "একজন নতুন ব্যবহারকারী যোগ করেছেন।"
 
-#: libraries/server_status.lib.php:53
+#: libraries/server_status.lib.php:60
 #, php-format
 msgid "Network traffic since startup: %s"
 msgstr "আরম্ভ করার পর থেকে নেটওর্য়াকে গমনাগমন: %s"
 
-#: libraries/server_status.lib.php:66
+#: libraries/server_status.lib.php:73
 #, php-format
 msgid "This MySQL server has been running for %1$s. It started up on %2$s."
 msgstr "%1$s মাইএসকিউএল সার্ভার চলছে। %2$s আরম্ভ করা হয়েছে।"
 
-#: libraries/server_status.lib.php:80
+#: libraries/server_status.lib.php:94
 msgid ""
 "This MySQL server works as <b>master</b> and <b>slave</b> in <b>replication</"
 "b> process."
@@ -13228,19 +13242,19 @@ msgstr ""
 "প্রতিলিপির জন্য এই মাইএসকিউএল সার্ভারটি <b>master</b> এবং <b>slave</b>'হিসাবে "
 "কাজ করছে।"
 
-#: libraries/server_status.lib.php:85
+#: libraries/server_status.lib.php:99
 msgid "This MySQL server works as <b>master</b> in <b>replication</b> process."
 msgstr "প্রতিলিপিলির জন্য এই মাইএসকিউএল সার্ভারটি <b>master</b> হিসাবে কাজ করছে।"
 
-#: libraries/server_status.lib.php:90
+#: libraries/server_status.lib.php:104
 msgid "This MySQL server works as <b>slave</b> in <b>replication</b> process."
 msgstr "প্রতিলিপির জন্য এই মাইএসকিউএল সার্ভারটি <b>slave</b> হিসাবে কাজ করছে।"
 
-#: libraries/server_status.lib.php:106
+#: libraries/server_status.lib.php:116
 msgid "Replication status"
 msgstr "প্রতিলিপির অবস্থা"
 
-#: libraries/server_status.lib.php:137
+#: libraries/server_status.lib.php:146
 msgid ""
 "On a busy server, the byte counters may overrun, so those statistics as "
 "reported by the MySQL server may be incorrect."
@@ -13248,21 +13262,21 @@ msgstr ""
 "ব্যস্ত সার্ভারে, বাইট গননাকারীটি বেশী ব্যবহার হতে পারে, তাই মাইএসকিউএল সার্ভারের "
 "প্রর্দশিত পরিসংখান সঠিক নাও হতে পারে।"
 
-#: libraries/server_status.lib.php:148
+#: libraries/server_status.lib.php:157
 msgid "Received"
 msgstr "গৃহীত"
 
-#: libraries/server_status.lib.php:167
+#: libraries/server_status.lib.php:176
 msgid "Sent"
 msgstr "প্রেরিত"
 
-#: libraries/server_status.lib.php:234
+#: libraries/server_status.lib.php:243
 #, fuzzy
 #| msgid "max. concurrent connections"
 msgid "Max. concurrent connections"
 msgstr "একত্রে সবোর্চ্চ সংযোগসমূহ"
 
-#: libraries/server_status.lib.php:244
+#: libraries/server_status.lib.php:253
 msgid "Failed attempts"
 msgstr "ব্যর্থ প্রচেষ্টা সমূহ"
 
@@ -14289,7 +14303,7 @@ msgstr ""
 msgid "Not implemented yet."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/AlterOperation.php:193
+#: libraries/sql-parser/src/Components/AlterOperation.php:191
 msgid "Unrecognized alter operation."
 msgstr ""
 
@@ -14303,7 +14317,7 @@ msgid "An opening bracket followed by a set of values was expected."
 msgstr ""
 
 #: libraries/sql-parser/src/Components/ArrayObj.php:101
-#: libraries/sql-parser/src/Components/FieldDefinition.php:202
+#: libraries/sql-parser/src/Components/CreateDefinition.php:202
 msgid "An opening bracket was expected."
 msgstr ""
 
@@ -14311,25 +14325,35 @@ msgstr ""
 msgid "A comma or a closing bracket was expected"
 msgstr ""
 
+#: libraries/sql-parser/src/Components/CreateDefinition.php:246
+#, fuzzy
+#| msgid "No databases selected."
+msgid "A comma or a closing bracket was expected."
+msgstr "ডাটাবেইজ নিবার্চন করা হয়নি।"
+
+#: libraries/sql-parser/src/Components/CreateDefinition.php:262
+msgid "A closing bracket was expected."
+msgstr ""
+
 #: libraries/sql-parser/src/Components/DataType.php:125
 msgid "Unrecognized data type."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:225
+#: libraries/sql-parser/src/Components/Expression.php:227
 msgid "Unexpected closing bracket."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:246
-#: libraries/sql-parser/src/Components/Expression.php:283
-#: libraries/sql-parser/src/Components/Expression.php:303
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:285
+#: libraries/sql-parser/src/Components/Expression.php:305
 msgid "An alias was previously found."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:257
+#: libraries/sql-parser/src/Components/Expression.php:259
 msgid "Unexpected dot."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:327
+#: libraries/sql-parser/src/Components/Expression.php:329
 #, fuzzy
 #| msgid "No databases selected."
 msgid "An alias was expected."
@@ -14341,16 +14365,6 @@ msgstr "ডাটাবেইজ নিবার্চন করা হয়নি
 msgid "An expression was expected."
 msgstr "কোন রো নির্বাচন করা হয় নাই"
 
-#: libraries/sql-parser/src/Components/FieldDefinition.php:246
-#, fuzzy
-#| msgid "No databases selected."
-msgid "A comma or a closing bracket was expected."
-msgstr "ডাটাবেইজ নিবার্চন করা হয়নি।"
-
-#: libraries/sql-parser/src/Components/FieldDefinition.php:262
-msgid "A closing bracket was expected."
-msgstr ""
-
 #: libraries/sql-parser/src/Components/Limit.php:90
 #: libraries/sql-parser/src/Components/Limit.php:112
 msgid "An offset was expected."
@@ -14398,29 +14412,29 @@ msgstr ""
 msgid "Expected delimiter."
 msgstr ""
 
-#: libraries/sql-parser/src/Lexer.php:753
+#: libraries/sql-parser/src/Lexer.php:777
 #, fuzzy, php-format
 #| msgid "Event %1$s has been created."
 msgid "Ending quote %1$s was expected."
 msgstr "ইভেন্ট %1$s তৈরী হয়েছে।"
 
-#: libraries/sql-parser/src/Lexer.php:789
+#: libraries/sql-parser/src/Lexer.php:813
 #, fuzzy
 #| msgid "Table name template"
 msgid "Variable name was expected."
 msgstr "টেবলের নামের নকশা"
 
-#: libraries/sql-parser/src/Parser.php:380
+#: libraries/sql-parser/src/Parser.php:391
 #, fuzzy
 #| msgid "At Beginning of Table"
 msgid "Unexpected beginning of statement."
 msgstr "টেবিলের শুরুতে"
 
-#: libraries/sql-parser/src/Parser.php:399
+#: libraries/sql-parser/src/Parser.php:410
 msgid "Unrecognized statement type."
 msgstr ""
 
-#: libraries/sql-parser/src/Parser.php:479
+#: libraries/sql-parser/src/Parser.php:489
 msgid "No transaction was previously started."
 msgstr ""
 
@@ -14450,8 +14464,10 @@ msgid "The name of the entity was expected."
 msgstr "খোলা টেবিলের সংখ্যা।"
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:310
-msgid "At least one field definition was expected."
-msgstr ""
+#, fuzzy
+#| msgid "The row has been deleted."
+msgid "At least one column definition was expected."
+msgstr "রো টি মুছা হয়েছে।"
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:329
 msgid "A \"RETURNS\" keyword was expected."
@@ -14512,11 +14528,11 @@ msgstr "বুকমার্ক  %s তৈরী করা হয়েছে"
 msgid "Using bookmark \"%s\" as default browse query."
 msgstr "বুকমার্ক \"%s\" দেখার জন্য স্বাভাবিক অনুসন্ধান হিসাবে ব্যবহৃত হচ্ছে।"
 
-#: libraries/sql.lib.php:1306
+#: libraries/sql.lib.php:1300
 msgid "Showing as PHP code"
 msgstr "পিএইছপি কোড দেখাচ্ছে"
 
-#: libraries/sql.lib.php:1638
+#: libraries/sql.lib.php:1632
 #, fuzzy, php-format
 #| msgid ""
 #| "Current selection does not contain a unique column. Grid edit, checkbox, "
@@ -14528,7 +14544,7 @@ msgstr ""
 "এই নির্বাচনে কোন অনন্য স্তম্ভ নাই। সম্পাদনা, চেকবক্স, প্রতিলিপি এবং মুছার ব্যবস্থা কাজ "
 "করবে না।"
 
-#: libraries/sql.lib.php:1649
+#: libraries/sql.lib.php:1643
 #, fuzzy, php-format
 #| msgid ""
 #| "Current selection does not contain a unique column. Grid edit, checkbox, "
@@ -14540,7 +14556,7 @@ msgstr ""
 "এই নির্বাচনে কোন অনন্য স্তম্ভ নাই। সম্পাদনা, চেকবক্স, প্রতিলিপি এবং মুছার ব্যবস্থা কাজ "
 "করবে না।"
 
-#: libraries/sql.lib.php:1688
+#: libraries/sql.lib.php:1682
 #, php-format
 msgid "Problems with indexes of table `%s`"
 msgstr "টেবল `%s` এর ইনডেক্সে সমস্যা আছে"
@@ -14704,7 +14720,7 @@ msgid "Version %s snapshot (SQL code)"
 msgstr "সংস্করন %s এর স্ন্যাপশট (SQL code)"
 
 #: libraries/tracking.lib.php:947
-#: templates/structure/table_structure_row.phtml:33
+#: templates/table/structure/table_structure_row.phtml:33
 msgctxt "None for default"
 msgid "None"
 msgstr "কিছু না"
@@ -14757,15 +14773,15 @@ msgstr "%1$s এর %2$s সংস্করন তৈরী কর"
 msgid "Version %1$s was created, tracking for %2$s is active."
 msgstr "%1$s সংস্করন তৈরী করা হয়েছে, %2$s ট্রেকিং কার্য চলছে।"
 
-#: libraries/user_preferences.inc.php:29
+#: libraries/user_preferences.inc.php:30
 msgid "Manage your settings"
 msgstr "আপনার সেটিংস রক্ষণাবেক্ষণ করুন"
 
-#: libraries/user_preferences.inc.php:46 prefs_manage.php:307
+#: libraries/user_preferences.inc.php:54 prefs_manage.php:307
 msgid "Configuration has been saved."
 msgstr "কনফিগারেশন সংরক্ষন করা হয়েছে"
 
-#: libraries/user_preferences.inc.php:66
+#: libraries/user_preferences.inc.php:74
 #, php-format
 msgid ""
 "Your preferences will be saved for current session only. Storing them "
@@ -15178,7 +15194,7 @@ msgid "first"
 msgstr "প্রথম"
 
 #: templates/columns_definitions/move_column.phtml:12
-#: templates/structure/add_column.phtml:21
+#: templates/table/structure/add_column.phtml:21
 #, php-format
 msgid "after %s"
 msgstr "%s এর পরে"
@@ -15251,219 +15267,326 @@ msgstr "ব্রাউজারের রুপান্তর"
 msgid "Input transformation options"
 msgstr "রুপান্তরের অপশন"
 
-#: templates/designer/aggregate_query_panel.phtml:22
-#: templates/designer/options_panel.phtml:100
+#: templates/database/create_table.phtml:7
+#: templates/database/designer/side_menu.phtml:77
+#: templates/database/designer/side_menu.phtml:80
+msgid "Create table"
+msgstr "টেবিল তৈরী কর"
+
+#: templates/database/create_table.phtml:15
+msgid "Number of columns"
+msgstr "স্তম্ভের সংখ্যা"
+
+#: templates/database/designer/aggregate_query_panel.phtml:22
+#: templates/database/designer/options_panel.phtml:100
 msgid "Aggregate"
 msgstr "সমষ্টিগত"
 
-#: templates/designer/aggregate_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:61
-#: templates/designer/options_panel.phtml:106
-#: templates/designer/options_panel.phtml:170
-#: templates/designer/where_query_panel.phtml:30
-#: templates/table/table_header.phtml:9
+#: templates/database/designer/aggregate_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:61
+#: templates/database/designer/options_panel.phtml:106
+#: templates/database/designer/options_panel.phtml:170
+#: templates/database/designer/where_query_panel.phtml:30
+#: templates/table/search/table_header.phtml:9
 msgid "Operator"
 msgstr "পরিচালক"
 
-#: templates/designer/database_tables.phtml:29
+#: templates/database/designer/database_tables.phtml:29
 msgid "Toggle"
 msgstr ""
 
-#: templates/designer/database_tables.phtml:40
+#: templates/database/designer/database_tables.phtml:40
 #, fuzzy
 #| msgid "Table structure"
 msgid "See table structure"
 msgstr "টেবলের জন্য টেবলের গঠন"
 
-#: templates/designer/delete_relation_panel.phtml:21
+#: templates/database/designer/delete_relation_panel.phtml:21
 msgid "Delete relation"
 msgstr "সর্ম্পক মুছা"
 
-#: templates/designer/edit_delete_pages.phtml:7
+#: templates/database/designer/edit_delete_pages.phtml:7
 #, fuzzy
 #| msgid "Page titles"
 msgid "Page to open"
 msgstr "পাতার শিরোনাম"
 
-#: templates/designer/edit_delete_pages.phtml:7
+#: templates/database/designer/edit_delete_pages.phtml:7
 #, fuzzy
 #| msgid "Relation deleted"
 msgid "Page to delete"
 msgstr "সর্ম্পক মুছা হয়েছে"
 
-#: templates/designer/having_query_panel.phtml:90
-#: templates/designer/options_panel.phtml:63
-#: templates/designer/options_panel.phtml:229
-#: templates/designer/where_query_panel.phtml:59
+#: templates/database/designer/having_query_panel.phtml:90
+#: templates/database/designer/options_panel.phtml:63
+#: templates/database/designer/options_panel.phtml:229
+#: templates/database/designer/where_query_panel.phtml:59
 msgid "Except"
 msgstr "ব্যতিত"
 
-#: templates/designer/having_query_panel.phtml:102
-#: templates/designer/options_panel.phtml:75
-#: templates/designer/options_panel.phtml:241
-#: templates/designer/where_query_panel.phtml:71
+#: templates/database/designer/having_query_panel.phtml:102
+#: templates/database/designer/options_panel.phtml:75
+#: templates/database/designer/options_panel.phtml:241
+#: templates/database/designer/where_query_panel.phtml:71
 msgid "subquery"
 msgstr "সহ-অনুসন্ধান"
 
-#: templates/designer/new_relation_panel.phtml:22
-#: templates/designer/side_menu.phtml:84 templates/designer/side_menu.phtml:87
+#: templates/database/designer/new_relation_panel.phtml:22
+#: templates/database/designer/side_menu.phtml:84
+#: templates/database/designer/side_menu.phtml:87
 msgid "Create relation"
 msgstr "সম্পর্ক তৈরী কর"
 
-#: templates/designer/options_panel.phtml:34
-#: templates/designer/options_panel.phtml:200
+#: templates/database/designer/options_panel.phtml:34
+#: templates/database/designer/options_panel.phtml:200
 msgid "Relation operator"
 msgstr "সর্ম্পক পরিচালক"
 
-#: templates/designer/options_panel.phtml:85
-#: templates/designer/rename_to_panel.phtml:23
+#: templates/database/designer/options_panel.phtml:85
+#: templates/database/designer/rename_to_panel.phtml:23
 msgid "Rename to"
 msgstr "নাম পরিবর্তন"
 
-#: templates/designer/options_panel.phtml:91
-#: templates/designer/rename_to_panel.phtml:31
+#: templates/database/designer/options_panel.phtml:91
+#: templates/database/designer/rename_to_panel.phtml:31
 msgid "New name"
 msgstr "নতুন নাম"
 
-#: templates/designer/page_save_as.phtml:4
+#: templates/database/designer/page_save_as.phtml:4
 #, fuzzy
 #| msgid "Export to selected page"
 msgid "Save to selected page"
 msgstr "নির্বাচিত পাতায় রফতানি কর"
 
-#: templates/designer/page_save_as.phtml:5
+#: templates/database/designer/page_save_as.phtml:5
 #, fuzzy
 #| msgid "Create a page and export to it"
 msgid "Create a page and save to it"
 msgstr "একটি পাতা তৈরী কর এবং উহাতে রফতানী কর"
 
-#: templates/designer/page_save_as.phtml:26
+#: templates/database/designer/page_save_as.phtml:26
 #, fuzzy
 #| msgid "New page name: "
 msgid "New page name"
 msgstr "নতুন পাতার নাম: "
 
-#: templates/designer/page_selector.phtml:2
+#: templates/database/designer/page_selector.phtml:2
 msgid "Select page"
 msgstr "পাতা নির্বাচন"
 
-#: templates/designer/query_details.phtml:10
+#: templates/database/designer/query_details.phtml:10
 msgid "Active options"
 msgstr "কার্যকর অপশনসমূহ"
 
-#: templates/designer/schema_export.phtml:4
+#: templates/database/designer/schema_export.phtml:4
 msgid "Select Export Relational Type"
 msgstr "রফতানীর সম্পর্কের ধরন নিধার্রান"
 
-#: templates/designer/side_menu.phtml:19 templates/designer/side_menu.phtml:25
+#: templates/database/designer/side_menu.phtml:19
+#: templates/database/designer/side_menu.phtml:25
 #, fuzzy
 #| msgid "Showing tables:"
 msgid "Show/Hide tables list"
 msgstr "টেবলসমূহ দেখাচ্ছে:"
 
-#: templates/designer/side_menu.phtml:29 templates/designer/side_menu.phtml:35
-#: templates/designer/side_menu.phtml:36
+#: templates/database/designer/side_menu.phtml:29
+#: templates/database/designer/side_menu.phtml:35
+#: templates/database/designer/side_menu.phtml:36
 msgid "View in fullscreen"
 msgstr "পুর্ণ পর্দায় দেখা"
 
-#: templates/designer/side_menu.phtml:34
+#: templates/database/designer/side_menu.phtml:34
 msgid "Exit fullscreen"
 msgstr "পূর্ণ পর্দা বন্ধ"
 
-#: templates/designer/side_menu.phtml:41 templates/designer/side_menu.phtml:45
+#: templates/database/designer/side_menu.phtml:41
+#: templates/database/designer/side_menu.phtml:45
 #, fuzzy
 #| msgid "New name"
 msgid "New page"
 msgstr "নতুন নাম"
 
-#: templates/designer/side_menu.phtml:70 templates/designer/side_menu.phtml:73
+#: templates/database/designer/side_menu.phtml:70
+#: templates/database/designer/side_menu.phtml:73
 #, fuzzy
 #| msgid "Select page"
 msgid "Delete pages"
 msgstr "পাতা নির্বাচন"
 
-#: templates/designer/side_menu.phtml:77 templates/designer/side_menu.phtml:80
-#: templates/table/create_table.phtml:7
-msgid "Create table"
-msgstr "টেবিল তৈরী কর"
-
-#: templates/designer/side_menu.phtml:98
-#: templates/designer/side_menu.phtml:101
+#: templates/database/designer/side_menu.phtml:98
+#: templates/database/designer/side_menu.phtml:101
 msgid "Reload"
 msgstr "রিলোড"
 
-#: templates/designer/side_menu.phtml:107
-#: templates/designer/side_menu.phtml:110
+#: templates/database/designer/side_menu.phtml:107
+#: templates/database/designer/side_menu.phtml:110
 msgid "Help"
 msgstr "সাহায্য"
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Angular links"
 msgstr "কোণিক সংযোগ"
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Direct links"
 msgstr "সরাসরি সংযোগ"
 
-#: templates/designer/side_menu.phtml:122
-#: templates/designer/side_menu.phtml:124
+#: templates/database/designer/side_menu.phtml:122
+#: templates/database/designer/side_menu.phtml:124
 msgid "Snap to grid"
 msgstr "গ্রীড অনুযায়ী"
 
-#: templates/designer/side_menu.phtml:128
-#: templates/designer/side_menu.phtml:134
+#: templates/database/designer/side_menu.phtml:128
+#: templates/database/designer/side_menu.phtml:134
 msgid "Small/Big All"
 msgstr "ছোট/বড় সব"
 
-#: templates/designer/side_menu.phtml:138
-#: templates/designer/side_menu.phtml:141
+#: templates/database/designer/side_menu.phtml:138
+#: templates/database/designer/side_menu.phtml:141
 msgid "Toggle small/big"
 msgstr "ছোট/বড় টোগল"
 
-#: templates/designer/side_menu.phtml:145
-#: templates/designer/side_menu.phtml:148
+#: templates/database/designer/side_menu.phtml:145
+#: templates/database/designer/side_menu.phtml:148
 msgid "Toggle relation lines"
 msgstr "সর্ম্পক রেখা টোগল"
 
-#: templates/designer/side_menu.phtml:153
-#: templates/designer/side_menu.phtml:156
+#: templates/database/designer/side_menu.phtml:153
+#: templates/database/designer/side_menu.phtml:156
 #, fuzzy
 #| msgid "Export"
 msgid "Export schema"
 msgstr "Export"
 
-#: templates/designer/side_menu.phtml:165
-#: templates/designer/side_menu.phtml:168
+#: templates/database/designer/side_menu.phtml:165
+#: templates/database/designer/side_menu.phtml:168
 msgid "Build Query"
 msgstr "অনুসন্ধান তৈরী"
 
-#: templates/designer/side_menu.phtml:173
-#: templates/designer/side_menu.phtml:177
+#: templates/database/designer/side_menu.phtml:173
+#: templates/database/designer/side_menu.phtml:177
 msgid "Move Menu"
 msgstr "মেন্যু সরান"
 
-#: templates/designer/side_menu.phtml:181
-#: templates/designer/side_menu.phtml:186
+#: templates/database/designer/side_menu.phtml:181
+#: templates/database/designer/side_menu.phtml:186
 #, fuzzy
 #| msgid "Partial texts"
 msgid "Pin text"
 msgstr "আংশিক লেখা"
 
-#: templates/designer/table_list.phtml:4
+#: templates/database/designer/table_list.phtml:4
 msgid "Hide/Show all"
 msgstr "সব দেখা/লুকানো"
 
-#: templates/designer/table_list.phtml:14
+#: templates/database/designer/table_list.phtml:14
 msgid "Hide/Show Tables with no relation"
 msgstr "সম্পর্কহীন টেবল দেখাও/লুকাও"
 
-#: templates/designer/table_list.phtml:59
+#: templates/database/designer/table_list.phtml:59
 msgid "Number of tables:"
 msgstr "টেবলের সংখ্যা:"
 
+#: templates/database/structure/body_for_table_summary.phtml:6
+#, php-format
+msgid "%s table"
+msgid_plural "%s tables"
+msgstr[0] "%s টি টেবল"
+msgstr[1] "%s টি টেবল"
+
+#: templates/database/structure/body_for_table_summary.phtml:17
+msgid "Sum"
+msgstr "যোগ"
+
+#: templates/database/structure/check_all_tables.phtml:6
+msgid "Check tables having overhead"
+msgstr "অতিরিক্ত তথ্যের টেবিলগুলো নির্বাচিত কর"
+
+#: templates/database/structure/check_all_tables.phtml:10
+#, fuzzy
+#| msgid "Show color"
+msgid "Show create"
+msgstr "রং দেখাও"
+
+#: templates/database/structure/check_all_tables.phtml:27
+#, fuzzy
+#| msgid "Add prefix"
+msgid "Prefix"
+msgstr "পূবাংশ যোগ"
+
+#: templates/database/structure/check_all_tables.phtml:28
+msgid "Add prefix to table"
+msgstr "টেবল এর নামের পূর্বাংশ যোগ করা"
+
+#: templates/database/structure/check_all_tables.phtml:29
+msgid "Replace table prefix"
+msgstr "টেবল এর নামের পূর্বাংশ প্রতিস্থাপন করা"
+
+#: templates/database/structure/check_all_tables.phtml:30
+msgid "Copy table with prefix"
+msgstr "টেবল নামের পূর্বাংশসহ প্রতিলিপি কর"
+
+#: templates/database/structure/check_all_tables.phtml:36
+#, fuzzy
+#| msgid "CHAR textarea columns"
+msgid "Add columns to central list"
+msgstr "CHAR textarea'র স্তম্ভ"
+
+#: templates/database/structure/check_all_tables.phtml:37
+msgid "Remove columns from central list"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:38
+#, fuzzy
+#| msgid "CHAR textarea columns"
+msgid "Make consistent with central list"
+msgstr "CHAR textarea'র স্তম্ভ"
+
+#: templates/database/structure/favorite_anchor.phtml:12
+#, fuzzy
+#| msgid "Add this series"
+msgid "Add to Favorites"
+msgstr "এই ধারাটি যোগ কর"
+
+#: templates/database/structure/show_create.phtml:2
+#, fuzzy
+#| msgid "Show SQL queries"
+msgid "Showing create queries"
+msgstr "SQL অনুসন্ধান দেখাও"
+
+#: templates/database/structure/sortable_header.phtml:13
+msgid "Sort"
+msgstr "গুছানো"
+
+#: templates/database/structure/table_header.phtml:42
+#, fuzzy
+#| msgid "May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]."
+msgid ""
+"May be approximate. Click on the number to get the exact count. See "
+"[doc@faq3-11]FAQ 3.11[/doc]."
+msgstr "সম্ভবত আনুমানিক। [doc@faq3-11]FAQ 3.11[/doc] দেখুন।"
+
+#: templates/database/structure/table_header.phtml:66
+#: templates/table/index_form.phtml:127
+msgid "Size"
+msgstr "আকার"
+
+#: templates/database/structure/table_header.phtml:74
+#: templates/table/structure/display_table_stats.phtml:27
+msgid "Overhead"
+msgstr "অতিরিক্ত"
+
+#: templates/database/structure/tracking_icon.phtml:4
+msgid "Tracking is active."
+msgstr "অনুসরণ কার্যকর রয়েছে।"
+
+#: templates/database/structure/tracking_icon.phtml:8
+msgid "Tracking is not active."
+msgstr "অনুসরণ অকার্যকর রয়েছে।"
+
 #: templates/error/report_form.phtml:7
 msgid ""
 "phpMyAdmin has encountered an error. We have collected data about this error "
@@ -15479,65 +15602,6 @@ msgstr ""
 msgid "Please explain the steps that lead to the error:"
 msgstr ""
 
-#: templates/gis_visualization/gis_visualization.phtml:3
-msgid "Display GIS Visualization"
-msgstr "GIS দেখাও"
-
-#: templates/gis_visualization/gis_visualization.phtml:8
-msgid "Label column"
-msgstr "লেবেল স্বম্ভ"
-
-#: templates/gis_visualization/gis_visualization.phtml:11
-msgid "-- None --"
-msgstr "-- কিছু না --"
-
-#: templates/gis_visualization/gis_visualization.phtml:19
-msgid "Spatial column"
-msgstr "স্থান সর্ম্পকিত স্তম্ভ"
-
-#: templates/index_form.phtml:16
-msgid "Index name:"
-msgstr "ইনডেক্সের নাম:"
-
-#: templates/index_form.phtml:19
-msgid ""
-"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
-msgstr "\"PRIMARY\" <b>অবশ্যই</b> একটি একক প্রাথমিক কী'র নাম হতে হবে!"
-
-#: templates/index_form.phtml:40
-#, fuzzy
-#| msgid "Index cache size"
-msgid "Index choice:"
-msgstr "ইনডেক্সের ক্যাশের আকার"
-
-#: templates/index_form.phtml:57
-msgid "Key block size:"
-msgstr ""
-
-#: templates/index_form.phtml:74
-msgid "Index type:"
-msgstr "ইনডেক্সের ধরণ:"
-
-#: templates/index_form.phtml:86
-#, fuzzy
-#| msgid "User:"
-msgid "Parser:"
-msgstr "ব্যবহারকারী:"
-
-#: templates/index_form.phtml:102
-msgid "Comment:"
-msgstr "মন্তব্য:"
-
-#: templates/index_form.phtml:127 templates/structure/table_header.phtml:66
-msgid "Size"
-msgstr "আকার"
-
-#: templates/index_form.phtml:149 templates/index_form.phtml:190
-#, fuzzy
-#| msgid "Drag to reorder"
-msgid "Drag to reorder"
-msgstr "পুনবিন্যাসের জন্য টানুন"
-
 #: templates/prefs_autoload.phtml:9
 msgid ""
 "Your browser has phpMyAdmin configuration for this domain. Would you like to "
@@ -15550,448 +15614,407 @@ msgstr ""
 msgid "Start row:"
 msgstr "শুরুর স্তম্ভ:"
 
-#: templates/structure/actions_in_table_structure.phtml:14
-#, php-format
-msgid "A primary key has been added on %s."
-msgstr "%s একটি প্রাইমারি কী যোগ করা হয়েছে"
-
-#: templates/structure/actions_in_table_structure.phtml:34
-#: templates/structure/actions_in_table_structure.phtml:54
-#: templates/structure/actions_in_table_structure.phtml:79
-#: templates/structure/actions_in_table_structure.phtml:101
-#, php-format
-msgid "An index has been added on %s."
-msgstr "%s এ একটি ইনডেক্স যোগ করা হয়েছে"
-
-#: templates/structure/actions_in_table_structure.phtml:130
-#: templates/structure/check_all_table_column.phtml:59
-#, fuzzy
-#| msgid "Remove chart"
-msgid "Remove from central columns"
-msgstr "চিত্র মুছ"
-
-#: templates/structure/actions_in_table_structure.phtml:138
-#: templates/structure/check_all_table_column.phtml:55
-#, fuzzy
-#| msgid "CHAR textarea columns"
-msgid "Add to central columns"
-msgstr "CHAR textarea'র স্তম্ভ"
-
-#: templates/structure/add_column.phtml:7
-#, php-format
-msgid "Add %s column(s)"
-msgstr "%s স্বম্ভ যোগ কর"
-
-#: templates/structure/add_column.phtml:12
-#, fuzzy
-#| msgid "At Beginning of Table"
-msgid "at beginning of table"
-msgstr "টেবিলের শুরুতে"
-
-#: templates/structure/body_for_table_summary.phtml:6
-#, php-format
-msgid "%s table"
-msgid_plural "%s tables"
-msgstr[0] "%s টি টেবল"
-msgstr[1] "%s টি টেবল"
-
-#: templates/structure/body_for_table_summary.phtml:17
-msgid "Sum"
-msgstr "যোগ"
-
-#: templates/structure/check_all_tables.phtml:6
-msgid "Check tables having overhead"
-msgstr "অতিরিক্ত তথ্যের টেবিলগুলো নির্বাচিত কর"
-
-#: templates/structure/check_all_tables.phtml:10
-#, fuzzy
-#| msgid "Show color"
-msgid "Show create"
-msgstr "রং দেখাও"
-
-#: templates/structure/check_all_tables.phtml:27
-#, fuzzy
-#| msgid "Add prefix"
-msgid "Prefix"
-msgstr "পূবাংশ যোগ"
-
-#: templates/structure/check_all_tables.phtml:28
-msgid "Add prefix to table"
-msgstr "টেবল এর নামের পূর্বাংশ যোগ করা"
-
-#: templates/structure/check_all_tables.phtml:29
-msgid "Replace table prefix"
-msgstr "টেবল এর নামের পূর্বাংশ প্রতিস্থাপন করা"
-
-#: templates/structure/check_all_tables.phtml:30
-msgid "Copy table with prefix"
-msgstr "টেবল নামের পূর্বাংশসহ প্রতিলিপি কর"
-
-#: templates/structure/check_all_tables.phtml:36
-#, fuzzy
-#| msgid "CHAR textarea columns"
-msgid "Add columns to central list"
-msgstr "CHAR textarea'র স্তম্ভ"
-
-#: templates/structure/check_all_tables.phtml:37
-msgid "Remove columns from central list"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:38
-#, fuzzy
-#| msgid "CHAR textarea columns"
-msgid "Make consistent with central list"
-msgstr "CHAR textarea'র স্তম্ভ"
-
-#: templates/structure/display_structure.phtml:140 view_create.php:181
-msgid "Edit view"
-msgstr "সম্পাদনা ভিউ"
-
-#: templates/structure/display_table_stats.phtml:9
-msgid "Space usage"
-msgstr "ব্যবহৃত জায়গা"
-
-#: templates/structure/display_table_stats.phtml:27
-#: templates/structure/table_header.phtml:74
-msgid "Overhead"
-msgstr "অতিরিক্ত"
-
-#: templates/structure/display_table_stats.phtml:32
-msgid "Effective"
-msgstr "কার্যকর"
-
-#: templates/structure/favorite_anchor.phtml:12
-#, fuzzy
-#| msgid "Add this series"
-msgid "Add to Favorites"
-msgstr "এই ধারাটি যোগ কর"
-
-#: templates/structure/move_columns_dialog.phtml:1
-#: templates/structure/optional_action_links.phtml:21
-msgid "Move columns"
-msgstr "স্বম্ভ সরাও"
-
-#: templates/structure/move_columns_dialog.phtml:2
-msgid "Move the columns by dragging them up and down."
-msgstr "উপর নীচে টান দিয়ে স্তম্ভটি সরান।"
-
-#: templates/structure/optional_action_links.phtml:9
-msgid "Propose table structure"
-msgstr "প্রস্তাবিত টেবল গঠন"
-
-#: templates/structure/optional_action_links.phtml:24
-#, fuzzy
-#| msgid "Propose table structure"
-msgid "Improve table structure"
-msgstr "প্রস্তাবিত টেবল গঠন"
-
-#: templates/structure/optional_action_links.phtml:30
-#, fuzzy
-#| msgid "Track table"
-msgid "Track view"
-msgstr "টেবিল ট্রেক"
-
-#: templates/structure/row_stats_table.phtml:3
-msgid "Row statistics"
-msgstr "রো'র পরিসংখ্যান"
-
-#: templates/structure/row_stats_table.phtml:9
-msgid "static"
-msgstr "স্থায়ী"
-
-#: templates/structure/row_stats_table.phtml:11
-msgid "dynamic"
-msgstr "পরিবর্তনশীল"
-
-#: templates/structure/row_stats_table.phtml:22
-msgid "partitioned"
-msgstr "খন্ড করা হয়েছে"
-
-#: templates/structure/row_stats_table.phtml:54
-msgid "Row length"
-msgstr "রো'র দৈর্ঘ্য"
-
-#: templates/structure/row_stats_table.phtml:66
-msgid "Row size"
-msgstr "রো'র আকার"
-
-#: templates/structure/row_stats_table.phtml:73
-msgid "Next autoindex"
-msgstr "পরবর্তী অটোইনডেক্স"
-
-#: templates/structure/secondary_tabs.phtml:14
-#, fuzzy
-#| msgid "Relation view"
-msgid "Relation view"
-msgstr "সর্ম্পক ভিউ"
-
-#: templates/structure/show_create.phtml:2
-#, fuzzy
-#| msgid "Show SQL queries"
-msgid "Showing create queries"
-msgstr "SQL অনুসন্ধান দেখাও"
-
-#: templates/structure/sortable_header.phtml:13
-msgid "Sort"
-msgstr "গুছানো"
-
-#: templates/structure/table_header.phtml:42
-#, fuzzy
-#| msgid "May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]."
-msgid ""
-"May be approximate. Click on the number to get the exact count. See "
-"[doc@faq3-11]FAQ 3.11[/doc]."
-msgstr "সম্ভবত আনুমানিক। [doc@faq3-11]FAQ 3.11[/doc] দেখুন।"
-
-#: templates/structure/table_structure_row.phtml:46
-#, php-format
-msgid "Column %s has been dropped."
-msgstr "স্বম্ভ %s মুছা হয়েছে"
-
-#: templates/structure/tracking_icon.phtml:4
-msgid "Tracking is active."
-msgstr "অনুসরণ কার্যকর রয়েছে।"
-
-#: templates/structure/tracking_icon.phtml:8
-msgid "Tracking is not active."
-msgstr "অনুসরণ অকার্যকর রয়েছে।"
-
-#: templates/table/create_table.phtml:15
-msgid "Number of columns"
-msgstr "স্তম্ভের সংখ্যা"
-
-#: templates/table/options.phtml:8
-msgid "Select columns (at least one):"
-msgstr "স্বম্ভ নির্বাচন করুন (একটি হলেও):"
-
-#: templates/table/options.phtml:37
-msgid "Add search conditions (body of the \"where\" clause):"
-msgstr "খোঁজার জন্য শর্ত দিন((body of the \"where\"clause):"
-
-#: templates/table/options.phtml:45
-msgid "Number of rows per page"
-msgstr "প্রতি পাতায় রো'র সংখ্যা"
-
-#: templates/table/options.phtml:56
-msgid "Display order:"
-msgstr "প্রদর্শন ধারা:"
-
-#: templates/table/options_zoom.phtml:6
-msgid "Use this column to label each point"
-msgstr "প্রতিটি পয়েন্টের জন্য স্তম্ভের লেবেলটি ব্যবহার কর"
-
-#: templates/table/options_zoom.phtml:35
-msgid "Maximum rows to plot"
-msgstr "অংশের জন্য সর্বোচ্চ রো"
-
-#: templates/table/replace_preview.phtml:13
-msgid "Find and replace - preview"
-msgstr "পাওয়া এবং প্রতিস্থাপন - পুর্বদর্শন"
-
-#: templates/table/replace_preview.phtml:18
-msgid "Original string"
-msgstr "প্রকৃত লেখা"
-
-#: templates/table/replace_preview.phtml:19
-msgid "Replaced string"
-msgstr "প্রতিস্থাপিত লেখা"
-
-#: templates/table/replace_preview.phtml:40
-msgid "Replace"
-msgstr "প্রতিস্থাপন করা হয়েছে"
-
-#: templates/table/rows_zoom.phtml:16
-msgid "Additional search criteria"
-msgstr "খোঁজার অতিরিক্ত শর্ত"
-
-#: templates/table/search_and_replace.phtml:3
-msgid "Replace with:"
-msgstr "এর দ্বারা প্রতিস্থাপন কর:"
-
-#: templates/table/search_and_replace.phtml:22
-#, fuzzy
-#| msgid "as regular expression"
-msgid "Use regular expression"
-msgstr "রেগুলার এক্সপ্রেশনের মত"
-
-#: templates/table/selection_form.phtml:12
-msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
-msgstr ""
-"দুইটি ভিন্ন স্তম্ভের জন্য একটি অনুসন্ধান \"query by example\" (wildcard: \"%\") কর"
-
-#: templates/table/selection_form.phtml:34
-msgid "Do a \"query by example\" (wildcard: \"%\")"
-msgstr "কর \"query by example\" (wildcard: \"%\")"
-
-#: templates/table/zoom_result_form.phtml:7
-msgid "Browse/Edit the points"
-msgstr "পয়েন্ট দেখা/সম্পাদনা"
-
-#: templates/table/zoom_result_form.phtml:15
-msgid "How to use"
-msgstr "কিভাবে ব্যবহার করবেন"
-
-#: templates/table/zoom_result_form.phtml:23
-msgid "Reset zoom"
-msgstr "জুম রিসেট"
-
-#: templates/tbl_chart.phtml:17
+#: templates/table/chart/tbl_chart.phtml:17
 msgctxt "Chart type"
 msgid "Bar"
 msgstr "বার"
 
-#: templates/tbl_chart.phtml:21
+#: templates/table/chart/tbl_chart.phtml:21
 msgctxt "Chart type"
 msgid "Column"
 msgstr "স্তম্ভ"
 
-#: templates/tbl_chart.phtml:25
+#: templates/table/chart/tbl_chart.phtml:25
 msgctxt "Chart type"
 msgid "Line"
 msgstr "লাইন"
 
-#: templates/tbl_chart.phtml:29
+#: templates/table/chart/tbl_chart.phtml:29
 msgctxt "Chart type"
 msgid "Spline"
 msgstr "স্পালাইন"
 
-#: templates/tbl_chart.phtml:33
+#: templates/table/chart/tbl_chart.phtml:33
 msgctxt "Chart type"
 msgid "Area"
 msgstr "এলাকা"
 
-#: templates/tbl_chart.phtml:37
+#: templates/table/chart/tbl_chart.phtml:37
 msgctxt "Chart type"
 msgid "Pie"
 msgstr "পাই"
 
-#: templates/tbl_chart.phtml:41
+#: templates/table/chart/tbl_chart.phtml:41
 msgctxt "Chart type"
 msgid "Timeline"
 msgstr "সময়রেখা"
 
-#: templates/tbl_chart.phtml:45
+#: templates/table/chart/tbl_chart.phtml:45
 msgctxt "Chart type"
 msgid "Scatter"
 msgstr ""
 
-#: templates/tbl_chart.phtml:50
+#: templates/table/chart/tbl_chart.phtml:50
 msgid "Stacked"
 msgstr "স্তুপীকৃত"
 
-#: templates/tbl_chart.phtml:53
+#: templates/table/chart/tbl_chart.phtml:53
 msgid "Chart title"
 msgstr "চিত্রের নাম"
 
-#: templates/tbl_chart.phtml:57
+#: templates/table/chart/tbl_chart.phtml:57
 msgid "X-Axis:"
 msgstr "X- অক্ষ:"
 
-#: templates/tbl_chart.phtml:72
+#: templates/table/chart/tbl_chart.phtml:72
 msgid "Series:"
 msgstr "ধারা:"
 
-#: templates/tbl_chart.phtml:102
+#: templates/table/chart/tbl_chart.phtml:102
 msgid "X-Axis label:"
 msgstr "X- অক্ষের মোড়ক:"
 
-#: templates/tbl_chart.phtml:104
+#: templates/table/chart/tbl_chart.phtml:104
 msgid "X Values"
 msgstr "X এর মান"
 
-#: templates/tbl_chart.phtml:107
+#: templates/table/chart/tbl_chart.phtml:107
 msgid "Y-Axis label:"
 msgstr "Y-অক্ষের মোড়ক:"
 
-#: templates/tbl_chart.phtml:115
+#: templates/table/chart/tbl_chart.phtml:115
 msgid "Series names are in a column"
 msgstr ""
 
-#: templates/tbl_chart.phtml:118
+#: templates/table/chart/tbl_chart.phtml:118
 #, fuzzy
 #| msgid "Inside column:"
 msgid "Series column:"
 msgstr "স্তম্ভের ভিতরে:"
 
-#: templates/tbl_chart.phtml:130
+#: templates/table/chart/tbl_chart.phtml:130
 #, fuzzy
 #| msgid "Values for column %s"
 msgid "Value Column:"
 msgstr "%s স্তম্ভের জন্য তথ্য"
 
-#: templates/tbl_chart.phtml:150
+#: templates/table/chart/tbl_chart.phtml:150
 #, fuzzy
 #| msgid "Save as file"
 msgid "Save chart as image"
 msgstr "ফাইল এর মত সংরক্ষন"
 
-#: templates/tbl_relation/common_form.phtml:7
+#: templates/table/gis_visualization/gis_visualization.phtml:3
+msgid "Display GIS Visualization"
+msgstr "GIS দেখাও"
+
+#: templates/table/gis_visualization/gis_visualization.phtml:8
+msgid "Label column"
+msgstr "লেবেল স্বম্ভ"
+
+#: templates/table/gis_visualization/gis_visualization.phtml:11
+msgid "-- None --"
+msgstr "-- কিছু না --"
+
+#: templates/table/gis_visualization/gis_visualization.phtml:19
+msgid "Spatial column"
+msgstr "স্থান সর্ম্পকিত স্তম্ভ"
+
+#: templates/table/index_form.phtml:16
+msgid "Index name:"
+msgstr "ইনডেক্সের নাম:"
+
+#: templates/table/index_form.phtml:19
+msgid ""
+"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
+msgstr "\"PRIMARY\" <b>অবশ্যই</b> একটি একক প্রাথমিক কী'র নাম হতে হবে!"
+
+#: templates/table/index_form.phtml:40
+#, fuzzy
+#| msgid "Index cache size"
+msgid "Index choice:"
+msgstr "ইনডেক্সের ক্যাশের আকার"
+
+#: templates/table/index_form.phtml:57
+msgid "Key block size:"
+msgstr ""
+
+#: templates/table/index_form.phtml:74
+msgid "Index type:"
+msgstr "ইনডেক্সের ধরণ:"
+
+#: templates/table/index_form.phtml:86
+#, fuzzy
+#| msgid "User:"
+msgid "Parser:"
+msgstr "ব্যবহারকারী:"
+
+#: templates/table/index_form.phtml:102
+msgid "Comment:"
+msgstr "মন্তব্য:"
+
+#: templates/table/index_form.phtml:149 templates/table/index_form.phtml:190
+#, fuzzy
+#| msgid "Drag to reorder"
+msgid "Drag to reorder"
+msgstr "পুনবিন্যাসের জন্য টানুন"
+
+#: templates/table/relation/common_form.phtml:7
 msgid "Internal relations"
 msgstr "অভ্যন্তরীন সর্ম্পক"
 
-#: templates/tbl_relation/common_form.phtml:11
+#: templates/table/relation/common_form.phtml:11
 msgid "Internal relation"
 msgstr "আভ্যন্তরীন রিলেশন"
 
-#: templates/tbl_relation/common_form.phtml:14
+#: templates/table/relation/common_form.phtml:14
 msgid ""
 "An internal relation is not necessary when a corresponding FOREIGN KEY "
 "relation exists."
 msgstr "যখন ফরেন কী সর্ম্পক থাকে তখন অভ্যন্তরীন সর্ম্পকটি প্রয়োজনীয় নয়।"
 
-#: templates/tbl_relation/common_form.phtml:37
+#: templates/table/relation/common_form.phtml:37
 #, fuzzy
 #| msgid "Foreign key constraint"
 msgid "Foreign key constraints"
 msgstr "ফরেন কীর নিয়ম"
 
-#: templates/tbl_relation/common_form.phtml:40
+#: templates/table/relation/common_form.phtml:40
 #, fuzzy
 #| msgid "Action"
 msgid "Actions"
 msgstr "কর্ম"
 
-#: templates/tbl_relation/common_form.phtml:41
+#: templates/table/relation/common_form.phtml:41
 #, fuzzy
 #| msgid "Constraints for table"
 msgid "Constraint properties"
 msgstr "টেবলের সীমবদ্ধতা"
 
-#: templates/tbl_relation/common_form.phtml:44
+#: templates/table/relation/common_form.phtml:44
 msgid ""
 "Only columns with index will be displayed. You can define an index below."
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:49
+#: templates/table/relation/common_form.phtml:49
 msgid "Foreign key constraint"
 msgstr "ফরেন কীর নিয়ম"
 
-#: templates/tbl_relation/common_form.phtml:81
+#: templates/table/relation/common_form.phtml:81
 #, fuzzy
 #| msgid "Add constraints"
 msgid "+ Add constraint"
 msgstr "নিয়মাবলী যোগ কর"
 
-#: templates/tbl_relation/common_form.phtml:91
+#: templates/table/relation/common_form.phtml:91
 msgid "Choose column to display:"
 msgstr "প্রদর্শনের জন্য স্তম্ভ পছন্দ কর:"
 
-#: templates/tbl_relation/foreign_key_row.phtml:13
+#: templates/table/relation/foreign_key_row.phtml:13
 #, fuzzy, php-format
 #| msgid "Foreign key constraint"
 msgid "Foreign key constraint %s has been dropped"
 msgstr "ফরেন কীর নিয়ম"
 
-#: templates/tbl_relation/foreign_key_row.phtml:102
+#: templates/table/relation/foreign_key_row.phtml:102
 msgid "Constraint name"
 msgstr "কন্সট্রেইনের নাম"
 
-#: templates/tbl_relation/foreign_key_row.phtml:157
+#: templates/table/relation/foreign_key_row.phtml:157
 #, fuzzy
 #| msgid "Add column"
 msgid "+ Add column"
 msgstr "স্বম্ভ যোগ করা"
 
+#: templates/table/search/options.phtml:8
+msgid "Select columns (at least one):"
+msgstr "স্বম্ভ নির্বাচন করুন (একটি হলেও):"
+
+#: templates/table/search/options.phtml:37
+msgid "Add search conditions (body of the \"where\" clause):"
+msgstr "খোঁজার জন্য শর্ত দিন((body of the \"where\"clause):"
+
+#: templates/table/search/options.phtml:45
+msgid "Number of rows per page"
+msgstr "প্রতি পাতায় রো'র সংখ্যা"
+
+#: templates/table/search/options.phtml:56
+msgid "Display order:"
+msgstr "প্রদর্শন ধারা:"
+
+#: templates/table/search/options_zoom.phtml:6
+msgid "Use this column to label each point"
+msgstr "প্রতিটি পয়েন্টের জন্য স্তম্ভের লেবেলটি ব্যবহার কর"
+
+#: templates/table/search/options_zoom.phtml:35
+msgid "Maximum rows to plot"
+msgstr "অংশের জন্য সর্বোচ্চ রো"
+
+#: templates/table/search/replace_preview.phtml:13
+msgid "Find and replace - preview"
+msgstr "পাওয়া এবং প্রতিস্থাপন - পুর্বদর্শন"
+
+#: templates/table/search/replace_preview.phtml:18
+msgid "Original string"
+msgstr "প্রকৃত লেখা"
+
+#: templates/table/search/replace_preview.phtml:19
+msgid "Replaced string"
+msgstr "প্রতিস্থাপিত লেখা"
+
+#: templates/table/search/replace_preview.phtml:40
+msgid "Replace"
+msgstr "প্রতিস্থাপন করা হয়েছে"
+
+#: templates/table/search/rows_zoom.phtml:16
+msgid "Additional search criteria"
+msgstr "খোঁজার অতিরিক্ত শর্ত"
+
+#: templates/table/search/search_and_replace.phtml:3
+msgid "Replace with:"
+msgstr "এর দ্বারা প্রতিস্থাপন কর:"
+
+#: templates/table/search/search_and_replace.phtml:22
+#, fuzzy
+#| msgid "as regular expression"
+msgid "Use regular expression"
+msgstr "রেগুলার এক্সপ্রেশনের মত"
+
+#: templates/table/search/selection_form.phtml:12
+msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
+msgstr ""
+"দুইটি ভিন্ন স্তম্ভের জন্য একটি অনুসন্ধান \"query by example\" (wildcard: \"%\") কর"
+
+#: templates/table/search/selection_form.phtml:34
+msgid "Do a \"query by example\" (wildcard: \"%\")"
+msgstr "কর \"query by example\" (wildcard: \"%\")"
+
+#: templates/table/search/zoom_result_form.phtml:7
+msgid "Browse/Edit the points"
+msgstr "পয়েন্ট দেখা/সম্পাদনা"
+
+#: templates/table/search/zoom_result_form.phtml:15
+msgid "How to use"
+msgstr "কিভাবে ব্যবহার করবেন"
+
+#: templates/table/search/zoom_result_form.phtml:23
+msgid "Reset zoom"
+msgstr "জুম রিসেট"
+
+#: templates/table/secondary_tabs.phtml:14
+#, fuzzy
+#| msgid "Relation view"
+msgid "Relation view"
+msgstr "সর্ম্পক ভিউ"
+
+#: templates/table/structure/actions_in_table_structure.phtml:14
+#, php-format
+msgid "A primary key has been added on %s."
+msgstr "%s একটি প্রাইমারি কী যোগ করা হয়েছে"
+
+#: templates/table/structure/actions_in_table_structure.phtml:34
+#: templates/table/structure/actions_in_table_structure.phtml:54
+#: templates/table/structure/actions_in_table_structure.phtml:79
+#: templates/table/structure/actions_in_table_structure.phtml:101
+#, php-format
+msgid "An index has been added on %s."
+msgstr "%s এ একটি ইনডেক্স যোগ করা হয়েছে"
+
+#: templates/table/structure/actions_in_table_structure.phtml:130
+#: templates/table/structure/check_all_table_column.phtml:59
+#, fuzzy
+#| msgid "Remove chart"
+msgid "Remove from central columns"
+msgstr "চিত্র মুছ"
+
+#: templates/table/structure/actions_in_table_structure.phtml:138
+#: templates/table/structure/check_all_table_column.phtml:55
+#, fuzzy
+#| msgid "CHAR textarea columns"
+msgid "Add to central columns"
+msgstr "CHAR textarea'র স্তম্ভ"
+
+#: templates/table/structure/add_column.phtml:7
+#, php-format
+msgid "Add %s column(s)"
+msgstr "%s স্বম্ভ যোগ কর"
+
+#: templates/table/structure/add_column.phtml:12
+#, fuzzy
+#| msgid "At Beginning of Table"
+msgid "at beginning of table"
+msgstr "টেবিলের শুরুতে"
+
+#: templates/table/structure/display_structure.phtml:140 view_create.php:181
+msgid "Edit view"
+msgstr "সম্পাদনা ভিউ"
+
+#: templates/table/structure/display_table_stats.phtml:9
+msgid "Space usage"
+msgstr "ব্যবহৃত জায়গা"
+
+#: templates/table/structure/display_table_stats.phtml:32
+msgid "Effective"
+msgstr "কার্যকর"
+
+#: templates/table/structure/move_columns_dialog.phtml:1
+#: templates/table/structure/optional_action_links.phtml:21
+msgid "Move columns"
+msgstr "স্বম্ভ সরাও"
+
+#: templates/table/structure/move_columns_dialog.phtml:2
+msgid "Move the columns by dragging them up and down."
+msgstr "উপর নীচে টান দিয়ে স্তম্ভটি সরান।"
+
+#: templates/table/structure/optional_action_links.phtml:9
+msgid "Propose table structure"
+msgstr "প্রস্তাবিত টেবল গঠন"
+
+#: templates/table/structure/optional_action_links.phtml:24
+#, fuzzy
+#| msgid "Propose table structure"
+msgid "Improve table structure"
+msgstr "প্রস্তাবিত টেবল গঠন"
+
+#: templates/table/structure/optional_action_links.phtml:30
+#, fuzzy
+#| msgid "Track table"
+msgid "Track view"
+msgstr "টেবিল ট্রেক"
+
+#: templates/table/structure/row_stats_table.phtml:3
+msgid "Row statistics"
+msgstr "রো'র পরিসংখ্যান"
+
+#: templates/table/structure/row_stats_table.phtml:9
+msgid "static"
+msgstr "স্থায়ী"
+
+#: templates/table/structure/row_stats_table.phtml:11
+msgid "dynamic"
+msgstr "পরিবর্তনশীল"
+
+#: templates/table/structure/row_stats_table.phtml:22
+msgid "partitioned"
+msgstr "খন্ড করা হয়েছে"
+
+#: templates/table/structure/row_stats_table.phtml:54
+msgid "Row length"
+msgstr "রো'র দৈর্ঘ্য"
+
+#: templates/table/structure/row_stats_table.phtml:66
+msgid "Row size"
+msgstr "রো'র আকার"
+
+#: templates/table/structure/row_stats_table.phtml:73
+msgid "Next autoindex"
+msgstr "পরবর্তী অটোইনডেক্স"
+
+#: templates/table/structure/table_structure_row.phtml:46
+#, php-format
+msgid "Column %s has been dropped."
+msgstr "স্বম্ভ %s মুছা হয়েছে"
+
 #: themes.php:17 themes.php:22
 msgid "Theme"
 msgstr "খীম"
@@ -17259,6 +17282,11 @@ msgstr ""
 msgid "concurrent_insert is set to 0"
 msgstr "concurrent_insert এর জন্য ০ নির্ধারন করা হয়েছে"
 
+#, fuzzy
+#~| msgid "Read misses"
+#~ msgid "Read as multibytes"
+#~ msgstr "পড়া ব্যার্থ হয়েছে"
+
 #~ msgid "Relational display column"
 #~ msgstr "সর্ম্পক দেখানোর স্থম্ভ"
 
diff --git a/po/br.po b/po/br.po
index 7a10615225..17509c49cf 100644
--- a/po/br.po
+++ b/po/br.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 4.5.0-dev\n"
 "Report-Msgid-Bugs-To: developers@phpmyadmin.net\n"
-"POT-Creation-Date: 2015-08-08 13:53-0400\n"
+"POT-Creation-Date: 2015-08-12 08:10-0400\n"
 "PO-Revision-Date: 2014-03-28 11:07+0200\n"
 "Last-Translator: Michal Čihař <michal@cihar.com>\n"
 "Language-Team: Breton <https://hosted.weblate.org/projects/phpmyadmin/master/"
@@ -60,7 +60,7 @@ msgid "Table comments:"
 msgstr "Evezhiadennoù diwar-benn an daolenn :"
 
 #: db_datadict.php:104 libraries/Index.class.php:699
-#: libraries/insert_edit.lib.php:1567
+#: libraries/insert_edit.lib.php:1565
 #: libraries/navigation/Nodes/Node_Column.class.php:30
 #: libraries/plugins/export/ExportHtmlword.class.php:280
 #: libraries/plugins/export/ExportHtmlword.class.php:375
@@ -74,13 +74,14 @@ msgstr "Evezhiadennoù diwar-benn an daolenn :"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1023
 #: libraries/tracking.lib.php:879 libraries/tracking.lib.php:975
 #: templates/columns_definitions/column_name.phtml:18
-#: templates/index_form.phtml:124 templates/table/table_header.phtml:6
-#: templates/table/zoom_result_form.phtml:33
-#: templates/tbl_relation/common_form.phtml:10
-#: templates/tbl_relation/common_form.phtml:43
-#: templates/tbl_relation/foreign_key_row.phtml:194
-#: templates/tbl_relation/foreign_key_row.phtml:206
-#: templates/tbl_relation/internal_relational_row.phtml:71
+#: templates/table/index_form.phtml:124
+#: templates/table/relation/common_form.phtml:10
+#: templates/table/relation/common_form.phtml:43
+#: templates/table/relation/foreign_key_row.phtml:194
+#: templates/table/relation/foreign_key_row.phtml:206
+#: templates/table/relation/internal_relational_row.phtml:71
+#: templates/table/search/table_header.phtml:6
+#: templates/table/search/zoom_result_form.phtml:33
 msgid "Column"
 msgstr "Bann"
 
@@ -98,21 +99,21 @@ msgstr "Bann"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1001
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1024
 #: libraries/rte/rte_list.lib.php:75 libraries/rte/rte_list.lib.php:103
-#: libraries/rte/rte_routines.lib.php:802
-#: libraries/rte/rte_routines.lib.php:831
-#: libraries/rte/rte_routines.lib.php:1493
+#: libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_routines.lib.php:922
+#: libraries/rte/rte_routines.lib.php:1584
 #: libraries/server_privileges.lib.php:2369 libraries/tracking.lib.php:880
 #: libraries/tracking.lib.php:972
 #: templates/columns_definitions/table_fields_definitions.phtml:11
-#: templates/structure/table_header.phtml:48
-#: templates/structure/table_structure_header.phtml:6
-#: templates/table/table_header.phtml:7
+#: templates/database/structure/table_header.phtml:48
+#: templates/table/search/table_header.phtml:7
+#: templates/table/structure/table_structure_header.phtml:6
 msgid "Type"
 msgstr "Seurt"
 
 #: db_datadict.php:106 libraries/Index.class.php:702
 #: libraries/central_columns.lib.php:708
-#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1576
+#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1574
 #: libraries/plugins/export/ExportHtmlword.class.php:286
 #: libraries/plugins/export/ExportHtmlword.class.php:381
 #: libraries/plugins/export/ExportLatex.class.php:509
@@ -125,8 +126,8 @@ msgstr "Seurt"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1026
 #: libraries/tracking.lib.php:882 libraries/tracking.lib.php:978
 #: templates/columns_definitions/table_fields_definitions.phtml:39
-#: templates/structure/table_structure_header.phtml:9
-#: templates/table/zoom_result_form.phtml:34
+#: templates/table/search/zoom_result_form.phtml:34
+#: templates/table/structure/table_structure_header.phtml:9
 msgid "Null"
 msgstr "Null"
 
@@ -144,8 +145,8 @@ msgstr "Null"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1027
 #: libraries/replication_gui.lib.php:153 libraries/tracking.lib.php:883
 #: templates/columns_definitions/table_fields_definitions.phtml:25
-#: templates/structure/body_for_table_summary.phtml:55
-#: templates/structure/table_structure_header.phtml:10
+#: templates/database/structure/body_for_table_summary.phtml:55
+#: templates/table/structure/table_structure_header.phtml:10
 msgid "Default"
 msgstr "Dre ziouer"
 
@@ -173,19 +174,19 @@ msgid "Comments"
 msgstr "Evezhiadennoù"
 
 #: db_datadict.php:146
-#: libraries/controllers/StructureController.class.php:1960
-#: libraries/controllers/StructureController.class.php:1965
+#: libraries/controllers/TableStructureController.class.php:951
+#: libraries/controllers/TableStructureController.class.php:956
 #: libraries/tracking.lib.php:922
 #: templates/columns_definitions/column_indexes.phtml:6
-#: templates/structure/check_all_table_column.phtml:22
-#: templates/structure/display_structure.phtml:74
+#: templates/table/structure/check_all_table_column.phtml:22
+#: templates/table/structure/display_structure.phtml:74
 msgid "Primary"
 msgstr ""
 
 #: db_datadict.php:156 js/messages.php:317 libraries/Index.class.php:567
 #: libraries/Index.class.php:606 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261 libraries/mult_submits.lib.php:403
+#: libraries/config/FormDisplay.tpl.php:272 libraries/mult_submits.lib.php:403
 #: libraries/mult_submits.lib.php:417
 #: libraries/plugins/export/ExportHtmlword.class.php:630
 #: libraries/plugins/export/ExportLatex.class.php:589
@@ -201,20 +202,20 @@ msgstr ""
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1010 libraries/tracking.lib.php:1015
 #: prefs_manage.php:140 templates/prefs_autoload.phtml:15
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "No"
 msgstr "Ket"
 
 #: db_datadict.php:156 js/messages.php:443 libraries/Index.class.php:568
 #: libraries/Index.class.php:605 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261
-#: libraries/controllers/StructureController.class.php:1344
-#: libraries/controllers/StructureController.class.php:2223
-#: libraries/controllers/StructureController.class.php:2232
-#: libraries/controllers/StructureController.class.php:2237
-#: libraries/controllers/StructureController.class.php:2242
-#: libraries/controllers/StructureController.class.php:2247
+#: libraries/config/FormDisplay.tpl.php:272
+#: libraries/controllers/TableStructureController.class.php:539
+#: libraries/controllers/TableStructureController.class.php:1201
+#: libraries/controllers/TableStructureController.class.php:1210
+#: libraries/controllers/TableStructureController.class.php:1215
+#: libraries/controllers/TableStructureController.class.php:1220
+#: libraries/controllers/TableStructureController.class.php:1225
 #: libraries/mult_submits.inc.php:82 libraries/mult_submits.inc.php:178
 #: libraries/mult_submits.lib.php:339 libraries/mult_submits.lib.php:372
 #: libraries/mult_submits.lib.php:401 libraries/mult_submits.lib.php:415
@@ -223,8 +224,8 @@ msgstr "Ket"
 #: libraries/plugins/export/ExportOdt.class.php:756
 #: libraries/plugins/export/ExportTexytext.class.php:567
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1077
-#: libraries/server_databases.lib.php:464
-#: libraries/server_databases.lib.php:474
+#: libraries/server_databases.lib.php:475
+#: libraries/server_databases.lib.php:485
 #: libraries/server_privileges.lib.php:2546
 #: libraries/server_privileges.lib.php:2727
 #: libraries/server_privileges.lib.php:2748
@@ -234,7 +235,7 @@ msgstr "Ket"
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1008 libraries/tracking.lib.php:1013
 #: prefs_manage.php:138 templates/prefs_autoload.phtml:14
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "Yes"
 msgstr "Ya"
 
@@ -244,7 +245,7 @@ msgstr "Gwelet un ezporzhiadenn (chema) eus an diaz roadennoù"
 
 #: db_export.php:37 db_tracking.php:90 export.php:382
 #: libraries/DBQbe.class.php:326
-#: libraries/controllers/StructureController.class.php:231
+#: libraries/controllers/DatabaseStructureController.class.php:170
 #: libraries/navigation/NavigationTree.class.php:897
 msgid "No tables found in database."
 msgstr "N'eus bet kavet taolenn ebet en diaz roadennoù."
@@ -255,14 +256,14 @@ msgstr "N'eus bet kavet taolenn ebet en diaz roadennoù."
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:26
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:120
-#: templates/structure/show_create.phtml:18
+#: templates/database/structure/show_create.phtml:18
 msgid "Tables"
 msgstr "Taolennoù"
 
 #: db_export.php:52 libraries/Menu.class.php:317 libraries/Menu.class.php:425
-#: libraries/Util.class.php:3333 libraries/Util.class.php:3343
-#: libraries/Util.class.php:3349 libraries/Util.class.php:3629
-#: libraries/Util.class.php:4327 libraries/Util.class.php:4344
+#: libraries/Util.class.php:3339 libraries/Util.class.php:3349
+#: libraries/Util.class.php:3355 libraries/Util.class.php:3635
+#: libraries/Util.class.php:4333 libraries/Util.class.php:4350
 #: libraries/central_columns.lib.php:728 libraries/config.values.php:39
 #: libraries/config.values.php:47 libraries/config.values.php:109
 #: libraries/config.values.php:115 libraries/config/setup.forms.php:323
@@ -276,7 +277,7 @@ msgstr "Taolennoù"
 #: libraries/navigation/Nodes/Node_Table.class.php:283
 #: libraries/server_privileges.lib.php:1141 libraries/tracking.lib.php:874
 #: templates/columns_definitions/table_fields_definitions.phtml:3
-#: templates/designer/table_list.phtml:28
+#: templates/database/designer/table_list.phtml:28
 msgid "Structure"
 msgstr "Framm"
 
@@ -288,7 +289,7 @@ msgstr "Framm"
 #: libraries/config/user_preferences.forms.php:292
 #: libraries/config/user_preferences.forms.php:297
 #: libraries/server_privileges.lib.php:1140
-#: templates/structure/display_table_stats.phtml:12
+#: templates/table/structure/display_table_stats.phtml:12
 msgid "Data"
 msgstr "Roadennoù"
 
@@ -373,10 +374,10 @@ msgstr "Taolennoù heuliet-pizh"
 #: libraries/server_privileges.lib.php:2908
 #: libraries/server_privileges.lib.php:3145
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4346
-#: templates/structure/table_header.phtml:21
-#: templates/tbl_relation/foreign_key_row.phtml:176
-#: templates/tbl_relation/internal_relational_row.phtml:63
+#: libraries/server_privileges.lib.php:4372
+#: templates/database/structure/table_header.phtml:21
+#: templates/table/relation/foreign_key_row.phtml:176
+#: templates/table/relation/internal_relational_row.phtml:63
 msgid "Table"
 msgstr "Taolenn"
 
@@ -393,7 +394,7 @@ msgid "Updated"
 msgstr "Hizivaet"
 
 #: db_tracking.php:130 js/messages.php:243 libraries/Menu.class.php:552
-#: libraries/Util.class.php:4314 libraries/config.values.php:104
+#: libraries/Util.class.php:4320 libraries/config.values.php:104
 #: libraries/rte/rte_events.lib.php:393 libraries/rte/rte_list.lib.php:101
 #: libraries/server_status_processes.lib.php:92 libraries/tracking.lib.php:279
 msgid "Status"
@@ -402,14 +403,15 @@ msgstr "Statud"
 #: db_tracking.php:131 db_tracking.php:290 libraries/Index.class.php:693
 #: libraries/central_columns.lib.php:687 libraries/rte/rte_list.lib.php:74
 #: libraries/rte/rte_list.lib.php:89 libraries/rte/rte_list.lib.php:102
-#: libraries/server_databases.lib.php:398
+#: libraries/server_databases.lib.php:409
 #: libraries/server_privileges.lib.php:2372
 #: libraries/server_privileges.lib.php:3166
 #: libraries/server_privileges.lib.php:3342
 #: libraries/server_user_groups.lib.php:82
 #: libraries/server_variables.lib.php:189 libraries/tracking.lib.php:280
-#: libraries/tracking.lib.php:793 templates/structure/table_header.phtml:30
-#: templates/structure/table_structure_header.phtml:23
+#: libraries/tracking.lib.php:793
+#: templates/database/structure/table_header.phtml:30
+#: templates/table/structure/table_structure_header.phtml:23
 msgid "Action"
 msgstr "Oberiadenn"
 
@@ -453,7 +455,7 @@ msgid "Untracked tables"
 msgstr "Taolennoù n'int ket heuliet"
 
 #: db_tracking.php:305 db_tracking.php:336
-#: templates/structure/optional_action_links.phtml:17
+#: templates/table/structure/optional_action_links.phtml:17
 msgid "Track table"
 msgstr "Heuliañ an daolenn"
 
@@ -509,7 +511,7 @@ msgid "Value for the column \"%s\""
 msgstr "Talvoud evit ar bann \"%s\""
 
 #: gis_data_editor.php:146
-#: templates/gis_visualization/gis_visualization.phtml:37
+#: templates/table/gis_visualization/gis_visualization.phtml:37
 msgid "Use OpenStreetMaps as Base Layer"
 msgstr "Ober gant OpenStreetMaps evit ar gwiskad diazez"
 
@@ -593,35 +595,35 @@ msgstr "Ouzhpennañ mentoniezh"
 #: libraries/display_change_password.lib.php:162
 #: libraries/display_export.lib.php:402 libraries/display_export.lib.php:408
 #: libraries/display_import.lib.php:392 libraries/index.lib.php:44
-#: libraries/insert_edit.lib.php:1546 libraries/insert_edit.lib.php:1583
+#: libraries/insert_edit.lib.php:1544 libraries/insert_edit.lib.php:1581
 #: libraries/normalization.lib.php:165 libraries/normalization.lib.php:821
 #: libraries/operations.lib.php:38 libraries/operations.lib.php:108
 #: libraries/operations.lib.php:263 libraries/operations.lib.php:306
 #: libraries/operations.lib.php:801 libraries/operations.lib.php:874
 #: libraries/operations.lib.php:923 libraries/operations.lib.php:1337
 #: libraries/operations.lib.php:1658
-#: libraries/plugins/auth/AuthenticationCookie.class.php:244
+#: libraries/plugins/auth/AuthenticationCookie.class.php:232
 #: libraries/replication_gui.lib.php:122 libraries/replication_gui.lib.php:161
 #: libraries/replication_gui.lib.php:324 libraries/replication_gui.lib.php:461
 #: libraries/replication_gui.lib.php:906 libraries/rte/rte_events.lib.php:509
-#: libraries/rte/rte_routines.lib.php:969
-#: libraries/rte/rte_routines.lib.php:1581
+#: libraries/rte/rte_routines.lib.php:1060
+#: libraries/rte/rte_routines.lib.php:1672
 #: libraries/rte/rte_triggers.lib.php:396 libraries/server_bin_log.lib.php:61
 #: libraries/server_privileges.lib.php:705
 #: libraries/server_privileges.lib.php:2106
 #: libraries/server_privileges.lib.php:2872
 #: libraries/server_privileges.lib.php:3553
-#: libraries/server_privileges.lib.php:4627
+#: libraries/server_privileges.lib.php:4653
 #: libraries/server_user_groups.lib.php:285
 #: libraries/sql_query_form.lib.php:369 libraries/sql_query_form.lib.php:429
 #: libraries/tracking.lib.php:533 libraries/tracking.lib.php:653
 #: prefs_manage.php:277 prefs_manage.php:355
 #: templates/columns_definitions/column_definitions_form.phtml:59
-#: templates/header_location.phtml:17 templates/index_form.phtml:238
+#: templates/database/create_table.phtml:21 templates/header_location.phtml:28
 #: templates/startAndNumberOfRowsPanel.phtml:14
-#: templates/structure/add_column.phtml:25
-#: templates/table/create_table.phtml:21
-#: templates/table/selection_form.phtml:75 view_create.php:275
+#: templates/table/index_form.phtml:238
+#: templates/table/search/selection_form.phtml:75
+#: templates/table/structure/add_column.phtml:25 view_create.php:275
 #: view_operations.php:106
 msgid "Go"
 msgstr "Mont"
@@ -726,7 +728,7 @@ msgstr "Dibosupl amdreiñ an arouezennoù hep levraoueg amdreiñ"
 msgid "Could not load import plugins, please check your installation!"
 msgstr "Dibosupl enporzhiañ an adveziantoù. Gwiriit ho staliadur !"
 
-#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1466
+#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1460
 #, fuzzy, php-format
 #| msgid "Bookmark %s created"
 msgid "Bookmark %s has been created."
@@ -769,11 +771,11 @@ msgstr ""
 msgid "Back"
 msgstr "Distreiñ"
 
-#: index.php:148 libraries/Footer.class.php:70
+#: index.php:149 libraries/Footer.class.php:70
 msgid "phpMyAdmin Demo Server"
 msgstr ""
 
-#: index.php:152
+#: index.php:153
 #, php-format
 msgid ""
 "You are using the demo server. You can do anything here, but please do not "
@@ -781,46 +783,46 @@ msgid ""
 "at %s."
 msgstr ""
 
-#: index.php:162
+#: index.php:163
 msgid "General Settings"
 msgstr ""
 
-#: index.php:190 libraries/display_change_password.lib.php:50
+#: index.php:191 libraries/display_change_password.lib.php:50
 #: libraries/display_change_password.lib.php:53 user_password.php:247
 msgid "Change password"
 msgstr ""
 
-#: index.php:206
+#: index.php:207
 #, fuzzy
 #| msgid "Server configuration"
 msgid "Server connection collation"
 msgstr "Kefluniadur ar servijer"
 
-#: index.php:228
+#: index.php:229
 msgid "Appearance Settings"
 msgstr ""
 
-#: index.php:258 prefs_manage.php:285
+#: index.php:259 prefs_manage.php:285
 msgid "More settings"
 msgstr ""
 
-#: index.php:279
+#: index.php:280
 #, fuzzy
 #| msgid "Databases"
 msgid "Database server"
 msgstr "Diazoù roadennoù"
 
-#: index.php:282 libraries/plugins/auth/AuthenticationCookie.class.php:181
+#: index.php:283 libraries/plugins/auth/AuthenticationCookie.class.php:169
 msgid "Server:"
 msgstr "Servijer :"
 
-#: index.php:286
+#: index.php:287
 #, fuzzy
 #| msgid "Server"
 msgid "Server type:"
 msgstr "Servijer"
 
-#: index.php:290 libraries/plugins/export/ExportLatex.class.php:212
+#: index.php:291 libraries/plugins/export/ExportLatex.class.php:212
 #: libraries/plugins/export/ExportSql.class.php:687
 #: libraries/plugins/export/ExportXml.class.php:189
 #, fuzzy
@@ -828,81 +830,81 @@ msgstr "Servijer"
 msgid "Server version:"
 msgstr "Stumm diwezhañ"
 
-#: index.php:296
+#: index.php:297
 #, fuzzy
 #| msgid "Last version"
 msgid "Protocol version:"
 msgstr "Stumm diwezhañ"
 
-#: index.php:300
+#: index.php:301
 #, fuzzy
 #| msgid "Username:"
 msgid "User:"
 msgstr "Anv implijer :"
 
-#: index.php:305
+#: index.php:306
 #, fuzzy
 #| msgid "Remove chart"
 msgid "Server charset:"
 msgstr "Dilemel ar grafik"
 
-#: index.php:320
+#: index.php:321
 msgid "Web server"
 msgstr ""
 
-#: index.php:331
+#: index.php:332
 #, fuzzy
 #| msgid "Database comment"
 msgid "Database client version:"
 msgstr "Evezhiadenn diwar-benn an diaz roadennoù : "
 
-#: index.php:335
+#: index.php:336
 msgid "PHP extension:"
 msgstr ""
 
-#: index.php:349
+#: index.php:350
 #, fuzzy
 #| msgid "Versions"
 msgid "PHP version:"
 msgstr "Stummoù"
 
-#: index.php:360
+#: index.php:361
 msgid "Show PHP information"
 msgstr ""
 
-#: index.php:383
+#: index.php:384
 msgid "Version information:"
 msgstr ""
 
-#: index.php:392 libraries/Util.class.php:432 libraries/Util.class.php:495
-#: libraries/config/FormDisplay.tpl.php:151
+#: index.php:393 libraries/Util.class.php:432 libraries/Util.class.php:495
+#: libraries/config/FormDisplay.tpl.php:162
 #: libraries/display_export.lib.php:577 libraries/engines/pbxt.lib.php:162
 #: libraries/navigation/NavigationHeader.class.php:196
 #: libraries/server_variables.lib.php:160
 msgid "Documentation"
 msgstr "Teuliadur"
 
-#: index.php:399
+#: index.php:400
 msgid "Wiki"
 msgstr ""
 
-#: index.php:408
+#: index.php:409
 msgid "Official Homepage"
 msgstr ""
 
-#: index.php:415
+#: index.php:416
 msgid "Contribute"
 msgstr ""
 
-#: index.php:422
+#: index.php:423
 msgid "Get support"
 msgstr ""
 
-#: index.php:429
+#: index.php:430
 msgid "List of changes"
 msgstr ""
 
-#: index.php:451
+#: index.php:452
 msgid ""
 "You are connected as 'root' with no password, which corresponds to the "
 "default MySQL privileged account. Your MySQL server is running with this "
@@ -910,21 +912,21 @@ msgid ""
 "by setting a password for user 'root'."
 msgstr ""
 
-#: index.php:468
+#: index.php:469
 msgid ""
 "You have enabled mbstring.func_overload in your PHP configuration. This "
 "option is incompatible with phpMyAdmin and might cause some data to be "
 "corrupted!"
 msgstr ""
 
-#: index.php:483
+#: index.php:484
 msgid ""
 "The mbstring PHP extension was not found and you seem to be using a "
 "multibyte charset. Without the mbstring extension phpMyAdmin is unable to "
 "split strings correctly and it may result in unexpected results."
 msgstr ""
 
-#: index.php:500
+#: index.php:501
 msgid ""
 "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini."
 "session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower than "
@@ -932,17 +934,17 @@ msgid ""
 "expire sooner than configured in phpMyAdmin."
 msgstr ""
 
-#: index.php:519
+#: index.php:520
 msgid ""
 "Login cookie store is lower than cookie validity configured in phpMyAdmin, "
 "because of this, your login will expire sooner than configured in phpMyAdmin."
 msgstr ""
 
-#: index.php:535
+#: index.php:536
 msgid "The configuration file now needs a secret passphrase (blowfish_secret)."
 msgstr ""
 
-#: index.php:548
+#: index.php:549
 msgid ""
 "Directory [code]config[/code], which is used by the setup script, still "
 "exists in your phpMyAdmin directory. It is strongly recommended to remove it "
@@ -950,7 +952,7 @@ msgid ""
 "may be compromised by unauthorized people downloading your configuration."
 msgstr ""
 
-#: index.php:564
+#: index.php:565
 #, fuzzy, php-format
 #| msgid ""
 #| "The phpMyAdmin configuration storage has been deactivated. To find out "
@@ -962,19 +964,19 @@ msgstr ""
 "Diweredekaet eo bet ar stokañ kefluniadurioù evit phpMyAdmin. Evit gouzout "
 "perak klikañ %samañ%s."
 
-#: index.php:571
+#: index.php:572
 msgid ""
 "Or alternately go to 'Operations' tab of any database to set it up there."
 msgstr ""
 
-#: index.php:620
+#: index.php:621
 #, php-format
 msgid ""
 "Your PHP MySQL library version %s differs from your MySQL server version %s. "
 "This may cause unpredictable behavior."
 msgstr ""
 
-#: index.php:648
+#: index.php:649
 #, php-format
 msgid ""
 "Server running with Suhosin. Please refer to %sdocumentation%s for possible "
@@ -1140,8 +1142,8 @@ msgstr ""
 msgid "Save & Close"
 msgstr "Enrollañ evel restr"
 
-#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:404
-#: libraries/insert_edit.lib.php:1550 prefs_manage.php:361
+#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:415
+#: libraries/insert_edit.lib.php:1548 prefs_manage.php:361
 #: prefs_manage.php:372
 msgid "Reset"
 msgstr "Adderaouekaat"
@@ -1186,7 +1188,7 @@ msgstr "Menegerioù"
 msgid "Edit Index"
 msgstr "Mod aozañ"
 
-#: js/messages.php:99 templates/index_form.phtml:232
+#: js/messages.php:99 templates/table/index_form.phtml:232
 #, fuzzy, php-format
 #| msgid "Add/Delete columns"
 msgid "Add %s column(s) to index"
@@ -1212,13 +1214,14 @@ msgstr "Bannoù a echu gant"
 msgid "Please select column(s) for the index."
 msgstr "Ouzhpennañ/Diverkañ bannoù"
 
-#: js/messages.php:106 templates/structure/add_column.phtml:1
+#: js/messages.php:106 templates/table/structure/add_column.phtml:1
 msgid "You have to add at least one column."
 msgstr ""
 
-#: js/messages.php:109 libraries/insert_edit.lib.php:1548
+#: js/messages.php:109 libraries/insert_edit.lib.php:1546
 #: templates/columns_definitions/column_definitions_form.phtml:162
-#: templates/index_form.phtml:237 templates/tbl_relation/common_form.phtml:106
+#: templates/table/index_form.phtml:237
+#: templates/table/relation/common_form.phtml:106
 msgid "Preview SQL"
 msgstr ""
 
@@ -1241,7 +1244,7 @@ msgid "SQL query:"
 msgstr "Reked SQL"
 
 #. l10n: Default label for the y-Axis of Charts
-#: js/messages.php:118 templates/tbl_chart.phtml:109
+#: js/messages.php:118 templates/table/chart/tbl_chart.phtml:109
 msgid "Y Values"
 msgstr ""
 
@@ -1399,7 +1402,7 @@ msgstr "Oktedoù kaset"
 msgid "Bytes received"
 msgstr "Oktedoù resevet"
 
-#: js/messages.php:169 libraries/server_status.lib.php:226
+#: js/messages.php:169 libraries/server_status.lib.php:235
 msgid "Connections"
 msgstr "Kevreadennoù"
 
@@ -1458,12 +1461,12 @@ msgstr "%s daolenn"
 msgid "Questions"
 msgstr "Goulennoù"
 
-#: js/messages.php:184 libraries/server_status.lib.php:134
+#: js/messages.php:184 libraries/server_status.lib.php:143
 msgid "Traffic"
 msgstr "Tremenerezh"
 
 #: js/messages.php:185 libraries/Menu.class.php:586
-#: libraries/Util.class.php:4318 libraries/server_status_monitor.lib.php:257
+#: libraries/Util.class.php:4324 libraries/server_status_monitor.lib.php:257
 msgid "Settings"
 msgstr "Arventennoù"
 
@@ -1485,8 +1488,9 @@ msgstr "Ouzhpennit da nebeutañ unan eus an argemennoù d'an heuliad"
 #: libraries/server_status_monitor.lib.php:236
 #: libraries/server_status_processes.lib.php:308
 #: templates/columns_definitions/transformation.phtml:4
-#: templates/designer/options_panel.phtml:178
-#: templates/table/options_zoom.phtml:12 templates/table/rows_zoom.phtml:26
+#: templates/database/designer/options_panel.phtml:178
+#: templates/table/search/options_zoom.phtml:12
+#: templates/table/search/rows_zoom.phtml:26
 msgid "None"
 msgstr "Hini"
 
@@ -1782,8 +1786,8 @@ msgstr ""
 
 #: js/messages.php:270 libraries/Menu.class.php:352
 #: libraries/Menu.class.php:455 libraries/Menu.class.php:582
-#: libraries/Util.class.php:4317 libraries/Util.class.php:4332
-#: libraries/Util.class.php:4349 libraries/config/messages.inc.php:258
+#: libraries/Util.class.php:4323 libraries/Util.class.php:4338
+#: libraries/Util.class.php:4355 libraries/config/messages.inc.php:258
 #: libraries/display_import.lib.php:105
 #: libraries/server_status_monitor.lib.php:318 prefs_manage.php:238
 #: setup/frames/menu.inc.php:26
@@ -1853,13 +1857,13 @@ msgid "Formatting SQL..."
 msgstr ""
 
 #: js/messages.php:293 libraries/server_variables.lib.php:157
-#: templates/designer/aggregate_query_panel.phtml:63
-#: templates/designer/delete_relation_panel.phtml:28
-#: templates/designer/having_query_panel.phtml:117
-#: templates/designer/new_relation_panel.phtml:88
-#: templates/designer/options_panel.phtml:253
-#: templates/designer/rename_to_panel.phtml:45
-#: templates/designer/where_query_panel.phtml:83
+#: templates/database/designer/aggregate_query_panel.phtml:63
+#: templates/database/designer/delete_relation_panel.phtml:28
+#: templates/database/designer/having_query_panel.phtml:117
+#: templates/database/designer/new_relation_panel.phtml:88
+#: templates/database/designer/options_panel.phtml:253
+#: templates/database/designer/rename_to_panel.phtml:45
+#: templates/database/designer/where_query_panel.phtml:83
 msgid "Cancel"
 msgstr "Nullañ"
 
@@ -1869,7 +1873,7 @@ msgstr "Nullañ"
 msgid "Page-related settings"
 msgstr "Kemmañ an arventennoù"
 
-#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:402
+#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:413
 msgid "Apply"
 msgstr ""
 
@@ -1904,8 +1908,8 @@ msgstr ""
 msgid "Error text: %s"
 msgstr ""
 
-#: js/messages.php:307 libraries/db_common.inc.php:68
-#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:450
+#: js/messages.php:307 libraries/db_common.inc.php:69
+#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:461
 msgid "No databases selected."
 msgstr ""
 
@@ -1917,12 +1921,13 @@ msgstr "Diverkañ ar bann"
 msgid "Adding Primary Key"
 msgstr "Ouzhpennañ un alc'hwez kentidik"
 
-#: js/messages.php:310 templates/designer/aggregate_query_panel.phtml:59
-#: templates/designer/having_query_panel.phtml:113
-#: templates/designer/new_relation_panel.phtml:87
-#: templates/designer/options_panel.phtml:252
-#: templates/designer/rename_to_panel.phtml:41
-#: templates/designer/where_query_panel.phtml:82
+#: js/messages.php:310
+#: templates/database/designer/aggregate_query_panel.phtml:59
+#: templates/database/designer/having_query_panel.phtml:113
+#: templates/database/designer/new_relation_panel.phtml:87
+#: templates/database/designer/options_panel.phtml:252
+#: templates/database/designer/rename_to_panel.phtml:41
+#: templates/database/designer/where_query_panel.phtml:82
 msgid "OK"
 msgstr "Mat eo"
 
@@ -1942,7 +1947,7 @@ msgstr "Oc'h eilañ an diaz roadennoù"
 msgid "Changing Charset"
 msgstr "O cheñch ar strobad arouezennoù"
 
-#: js/messages.php:320 libraries/Util.class.php:3217
+#: js/messages.php:320 libraries/Util.class.php:3223
 #, fuzzy
 #| msgid "Disable foreign key checks"
 msgid "Enable foreign key checks"
@@ -1982,20 +1987,21 @@ msgstr ""
 #: js/messages.php:334 libraries/DisplayResults.class.php:4834
 #: libraries/DisplayResults.class.php:5092 libraries/Menu.class.php:344
 #: libraries/Menu.class.php:446 libraries/Menu.class.php:578
-#: libraries/Util.class.php:3636 libraries/Util.class.php:3637
-#: libraries/Util.class.php:4316 libraries/Util.class.php:4331
-#: libraries/Util.class.php:4348 libraries/config/messages.inc.php:252
+#: libraries/Util.class.php:3642 libraries/Util.class.php:3643
+#: libraries/Util.class.php:4322 libraries/Util.class.php:4337
+#: libraries/Util.class.php:4354 libraries/config/messages.inc.php:252
 #: libraries/display_export.lib.php:173 libraries/rte/rte_list.lib.php:146
 #: libraries/server_privileges.lib.php:2211
 #: libraries/server_privileges.lib.php:2290
 #: libraries/server_privileges.lib.php:2632
 #: libraries/server_privileges.lib.php:3356
 #: libraries/server_status_monitor.lib.php:322 prefs_manage.php:303
-#: setup/frames/menu.inc.php:27 templates/structure/check_all_tables.phtml:11
+#: setup/frames/menu.inc.php:27
+#: templates/database/structure/check_all_tables.phtml:11
 msgid "Export"
 msgstr "Ezporzhiañ"
 
-#: js/messages.php:337 libraries/rte/rte_routines.lib.php:652
+#: js/messages.php:337 libraries/rte/rte_routines.lib.php:743
 msgid "ENUM/SET editor"
 msgstr ""
 
@@ -2039,7 +2045,7 @@ msgstr "Diskouez ar voest rekedoù SQL"
 #: libraries/Console.class.php:214 libraries/DisplayResults.class.php:3474
 #: libraries/DisplayResults.class.php:4818 libraries/Index.class.php:723
 #: libraries/Util.class.php:706 libraries/Util.class.php:1202
-#: libraries/Util.class.php:3634 libraries/Util.class.php:3635
+#: libraries/Util.class.php:3640 libraries/Util.class.php:3641
 #: libraries/central_columns.lib.php:851
 #: libraries/central_columns.lib.php:1193
 #: libraries/config/messages.inc.php:892
@@ -2057,7 +2063,7 @@ msgstr "Kemmañ"
 #: libraries/server_user_groups.lib.php:129
 #: libraries/sql_query_form.lib.php:416 libraries/tracking.lib.php:477
 #: setup/frames/index.inc.php:183 setup/frames/index.inc.php:291
-#: templates/designer/delete_relation_panel.phtml:27
+#: templates/database/designer/delete_relation_panel.phtml:27
 msgid "Delete"
 msgstr "Diverkañ"
 
@@ -2235,11 +2241,11 @@ msgid "No dependencies selected!"
 msgstr "N'eus bet diuzet linenn ebet"
 
 #: js/messages.php:394 libraries/central_columns.lib.php:1214
-#: libraries/insert_edit.lib.php:1458 libraries/server_variables.lib.php:155
+#: libraries/insert_edit.lib.php:1456 libraries/server_variables.lib.php:155
 #: setup/frames/config.inc.php:42 setup/frames/index.inc.php:279
 #: templates/columns_definitions/column_definitions_form.phtml:165
-#: templates/gis_visualization/gis_visualization.phtml:48
-#: templates/tbl_relation/common_form.phtml:107
+#: templates/table/gis_visualization/gis_visualization.phtml:48
+#: templates/table/relation/common_form.phtml:107
 msgid "Save"
 msgstr "Enrollañ"
 
@@ -2328,8 +2334,8 @@ msgid "Data point content"
 msgstr ""
 
 #: js/messages.php:430 js/messages.php:562 js/messages.php:579
-#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2573
-#: templates/index_form.phtml:154 templates/index_form.phtml:194
+#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2571
+#: templates/table/index_form.phtml:154 templates/table/index_form.phtml:194
 msgid "Ignore"
 msgstr "Na ober van"
 
@@ -2390,8 +2396,8 @@ msgstr "Diuzit an alc'hwez estren"
 msgid "Please select the primary key or a unique key!"
 msgstr "Diuzit an alc'hwez kentidik pe un alc'hwez nemetañ"
 
-#: js/messages.php:457 templates/designer/side_menu.phtml:91
-#: templates/designer/side_menu.phtml:94
+#: js/messages.php:457 templates/database/designer/side_menu.phtml:91
+#: templates/database/designer/side_menu.phtml:94
 msgid "Choose column to display"
 msgstr "Dibab ar bann da ziskouez"
 
@@ -2407,22 +2413,22 @@ msgstr ""
 msgid "Page name"
 msgstr ""
 
-#: js/messages.php:463 templates/designer/side_menu.phtml:56
-#: templates/designer/side_menu.phtml:59
+#: js/messages.php:463 templates/database/designer/side_menu.phtml:56
+#: templates/database/designer/side_menu.phtml:59
 #, fuzzy
 #| msgid "Save as file"
 msgid "Save page"
 msgstr "Enrollañ evel restr"
 
-#: js/messages.php:464 templates/designer/side_menu.phtml:63
-#: templates/designer/side_menu.phtml:66
+#: js/messages.php:464 templates/database/designer/side_menu.phtml:63
+#: templates/database/designer/side_menu.phtml:66
 #, fuzzy
 #| msgid "Save as file"
 msgid "Save page as"
 msgstr "Enrollañ evel restr"
 
-#: js/messages.php:465 templates/designer/side_menu.phtml:49
-#: templates/designer/side_menu.phtml:52
+#: js/messages.php:465 templates/database/designer/side_menu.phtml:49
+#: templates/database/designer/side_menu.phtml:52
 #, fuzzy
 #| msgid "Open"
 msgid "Open page"
@@ -2434,7 +2440,7 @@ msgstr "Digor"
 msgid "Delete page"
 msgstr "Diverkañ"
 
-#: js/messages.php:467 templates/designer/side_menu.phtml:10
+#: js/messages.php:467 templates/database/designer/side_menu.phtml:10
 msgid "Untitled"
 msgstr ""
 
@@ -2556,7 +2562,7 @@ msgstr "Aradennad linennoù"
 msgid "cancel"
 msgstr "Nullañ"
 
-#: js/messages.php:499 libraries/server_status.lib.php:271
+#: js/messages.php:499 libraries/server_status.lib.php:280
 msgid "Aborted"
 msgstr ""
 
@@ -3187,7 +3193,7 @@ msgstr "Niverenn borzh direizh"
 
 #: js/messages.php:793 libraries/Message.class.php:199
 #: libraries/Util.class.php:654 libraries/core.lib.php:245
-#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1172
+#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1170
 #: tbl_operations.php:229 view_operations.php:63
 msgid "Error"
 msgstr "Fazi"
@@ -3247,8 +3253,8 @@ msgstr ""
 msgid "per minute"
 msgstr ""
 
-#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:143
-#: libraries/server_status.lib.php:228
+#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:152
+#: libraries/server_status.lib.php:237
 #: libraries/server_status_queries.lib.php:98
 msgid "per hour"
 msgstr ""
@@ -3266,7 +3272,7 @@ msgstr ""
 msgid "Wrong permissions on configuration file, should not be world writable!"
 msgstr ""
 
-#: libraries/Config.class.php:1799
+#: libraries/Config.class.php:1801
 msgid "Font size"
 msgstr "Ment an destenn"
 
@@ -3296,10 +3302,10 @@ msgstr "Reked SQL"
 #: libraries/server_privileges.lib.php:2890
 #: libraries/server_privileges.lib.php:3144
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4332
+#: libraries/server_privileges.lib.php:4358
 #: libraries/server_status_processes.lib.php:80
-#: templates/tbl_relation/foreign_key_row.phtml:165
-#: templates/tbl_relation/internal_relational_row.phtml:55
+#: templates/table/relation/foreign_key_row.phtml:165
+#: templates/table/relation/internal_relational_row.phtml:55
 msgid "Database"
 msgstr "Diaz roadennoù"
 
@@ -3408,11 +3414,11 @@ msgstr "Kadarnataer SQL"
 #: libraries/plugins/import/ImportMediawiki.class.php:60
 #: libraries/plugins/import/ImportOds.class.php:59
 #: libraries/plugins/import/ImportShp.class.php:57
-#: libraries/plugins/import/ImportSql.class.php:148
+#: libraries/plugins/import/ImportSql.class.php:51
 #: libraries/plugins/import/ImportXml.class.php:58
-#: libraries/rte/rte_routines.lib.php:833 templates/index_form.phtml:49
-#: templates/structure/row_stats_table.phtml:20
-#: templates/table/options.phtml:2
+#: libraries/rte/rte_routines.lib.php:924 templates/table/index_form.phtml:49
+#: templates/table/search/options.phtml:2
+#: templates/table/structure/row_stats_table.phtml:20
 msgid "Options"
 msgstr ""
 
@@ -3457,7 +3463,8 @@ msgstr "War zigresk"
 msgid "Order:"
 msgstr "Udb all"
 
-#: libraries/Console.class.php:289 templates/table/replace_preview.phtml:17
+#: libraries/Console.class.php:289
+#: templates/table/search/replace_preview.phtml:17
 #, fuzzy
 #| msgid "Column"
 msgid "Count"
@@ -3584,9 +3591,9 @@ msgstr "Mont d'an diaz roadennoù eilet"
 #: libraries/operations.lib.php:794 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:191
-#: templates/structure/sortable_header.phtml:21
-#: templates/structure/sortable_header.phtml:38
-#: templates/table/options.phtml:68
+#: templates/database/structure/sortable_header.phtml:21
+#: templates/database/structure/sortable_header.phtml:38
+#: templates/table/search/options.phtml:68
 msgid "Ascending"
 msgstr "War gresk"
 
@@ -3596,13 +3603,14 @@ msgstr "War gresk"
 #: libraries/operations.lib.php:797 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:188
-#: templates/structure/sortable_header.phtml:26
-#: templates/structure/sortable_header.phtml:43
-#: templates/table/options.phtml:69
+#: templates/database/structure/sortable_header.phtml:26
+#: templates/database/structure/sortable_header.phtml:43
+#: templates/table/search/options.phtml:69
 msgid "Descending"
 msgstr "War zigresk"
 
-#: libraries/DBQbe.class.php:467 templates/table/search_and_replace.phtml:6
+#: libraries/DBQbe.class.php:467
+#: templates/table/search/search_and_replace.phtml:6
 #, fuzzy
 #| msgid "Column"
 msgid "Column:"
@@ -3783,12 +3791,12 @@ msgstr[0] "%s glotadenn en daolenn <i>%s</i>"
 msgstr[1] "%s klotadenn en daolenn <i>%s</i>"
 
 #: libraries/DbSearch.class.php:354 libraries/Menu.class.php:311
-#: libraries/Util.class.php:3337 libraries/Util.class.php:3347
-#: libraries/Util.class.php:3623 libraries/Util.class.php:3624
-#: libraries/Util.class.php:4343 libraries/config.values.php:43
+#: libraries/Util.class.php:3343 libraries/Util.class.php:3353
+#: libraries/Util.class.php:3629 libraries/Util.class.php:3630
+#: libraries/Util.class.php:4349 libraries/config.values.php:43
 #: libraries/config.values.php:51 libraries/config.values.php:119
 #: libraries/navigation/Nodes/Node_Table.class.php:295
-#: templates/structure/check_all_table_column.phtml:5
+#: templates/table/structure/check_all_table_column.phtml:5
 msgid "Browse"
 msgstr "Furchal"
 
@@ -3805,7 +3813,8 @@ msgstr "Klask en diaz roadennoù"
 msgid "Words or values to search for (wildcard: \"%\"):"
 msgstr "Gerioù pe dalvoudoù da glask (Joker: \"%\") :"
 
-#: libraries/DbSearch.class.php:401 templates/table/search_and_replace.phtml:1
+#: libraries/DbSearch.class.php:401
+#: templates/table/search/search_and_replace.phtml:1
 msgid "Find:"
 msgstr "Kavout :"
 
@@ -3854,16 +3863,16 @@ msgstr "Silañ"
 msgid "Search this table"
 msgstr "Klask en diaz roadennoù"
 
-#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2532
-#: libraries/Util.class.php:2535
+#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2538
+#: libraries/Util.class.php:2541
 #, fuzzy
 #| msgid "Begin"
 msgctxt "First page"
 msgid "Begin"
 msgstr "Kregiñ"
 
-#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2533
-#: libraries/Util.class.php:2536 libraries/server_bin_log.lib.php:170
+#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2539
+#: libraries/Util.class.php:2542 libraries/server_bin_log.lib.php:170
 #: libraries/server_bin_log.lib.php:172
 #, fuzzy
 #| msgid "Previous"
@@ -3871,8 +3880,8 @@ msgctxt "Previous page"
 msgid "Previous"
 msgstr "Kent"
 
-#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2564
-#: libraries/Util.class.php:2574 libraries/server_bin_log.lib.php:204
+#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2570
+#: libraries/Util.class.php:2580 libraries/server_bin_log.lib.php:204
 #: libraries/server_bin_log.lib.php:206
 #, fuzzy
 #| msgid "Next"
@@ -3880,8 +3889,8 @@ msgctxt "Next page"
 msgid "Next"
 msgstr "War-lerc'h"
 
-#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2565
-#: libraries/Util.class.php:2575
+#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2571
+#: libraries/Util.class.php:2581
 #, fuzzy
 #| msgid "End"
 msgctxt "Last page"
@@ -3963,9 +3972,9 @@ msgstr ""
 "Fazi en ur zilec'hiañ ar restr pellgarget; gwelet [doc@faq1-11]FAQ 1.11[/doc]"
 
 #: libraries/DisplayResults.class.php:4332 libraries/Message.class.php:180
-#: libraries/controllers/TableRelationController.class.php:258
+#: libraries/controllers/TableRelationController.class.php:259
 #: libraries/controllers/TableSearchController.class.php:655
-#: libraries/rte/rte_routines.lib.php:1332 libraries/sql_query_form.lib.php:89
+#: libraries/rte/rte_routines.lib.php:1423 libraries/sql_query_form.lib.php:89
 #: tbl_operations.php:227 tbl_row_action.php:138 view_operations.php:62
 #, fuzzy
 #| msgid "Your SQL query has been executed successfully."
@@ -3973,7 +3982,7 @@ msgid "Your SQL query has been executed successfully."
 msgstr "Sevenet eo bet ho reked SQL ervat"
 
 #: libraries/DisplayResults.class.php:4660
-#: libraries/controllers/StructureController.class.php:629
+#: libraries/controllers/DatabaseStructureController.class.php:564
 #, php-format
 msgid ""
 "This view has at least this number of rows. Please refer to %sdocumentation"
@@ -3999,33 +4008,33 @@ msgstr ""
 msgid "%d total"
 msgstr "%s daolenn"
 
-#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1318
+#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1312
 #, php-format
 msgid "Query took %01.4f seconds."
 msgstr ""
 
 #: libraries/DisplayResults.class.php:4807
-#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4767
-#: libraries/Util.class.php:4773 libraries/mult_submits.inc.php:50
-#: templates/structure/check_all_tables.phtml:2
-#: templates/structure/check_all_tables.phtml:9
+#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4773
+#: libraries/Util.class.php:4779 libraries/mult_submits.inc.php:50
+#: templates/database/structure/check_all_tables.phtml:2
+#: templates/database/structure/check_all_tables.phtml:9
 msgid "With selected:"
 msgstr "Evit ar re zo diuzet :"
 
 #: libraries/DisplayResults.class.php:4811
-#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4769
-#: libraries/Util.class.php:4770 libraries/server_privileges.lib.php:1174
+#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4775
+#: libraries/Util.class.php:4776 libraries/server_privileges.lib.php:1174
 #: libraries/server_privileges.lib.php:1175
 #: libraries/server_privileges.lib.php:1387
 #: libraries/server_user_groups.lib.php:231
-#: templates/structure/check_all_tables.phtml:3
-#: templates/structure/check_all_tables.phtml:4
+#: templates/database/structure/check_all_tables.phtml:3
+#: templates/database/structure/check_all_tables.phtml:4
 msgid "Check All"
 msgstr "Askañ pep tra"
 
 #: libraries/DisplayResults.class.php:4985 libraries/Header.class.php:383
-#: templates/structure/optional_action_links.phtml:1
-#: templates/structure/print_view_data_dictionary_link.phtml:3
+#: templates/database/structure/print_view_data_dictionary_link.phtml:3
+#: templates/table/structure/optional_action_links.phtml:1
 msgid "Print view"
 msgstr "Stumm da voullañ"
 
@@ -4033,7 +4042,8 @@ msgstr "Stumm da voullañ"
 msgid "Query results operations"
 msgstr ""
 
-#: libraries/DisplayResults.class.php:5105 templates/tbl_chart.phtml:12
+#: libraries/DisplayResults.class.php:5105
+#: templates/table/chart/tbl_chart.phtml:12
 msgid "Display chart"
 msgstr ""
 
@@ -4133,7 +4143,7 @@ msgid "Click on the bar to scroll to top of page"
 msgstr ""
 
 #: libraries/Header.class.php:749
-#: libraries/plugins/auth/AuthenticationCookie.class.php:152
+#: libraries/plugins/auth/AuthenticationCookie.class.php:140
 #, fuzzy
 #| msgid "Cookies must be enabled past this point."
 msgid "Javascript must be enabled past this point!"
@@ -4157,11 +4167,11 @@ msgid "Keyname"
 msgstr "Anv ar meneger"
 
 #: libraries/Index.class.php:697
-#: libraries/controllers/StructureController.class.php:1962
-#: libraries/controllers/StructureController.class.php:1967
+#: libraries/controllers/TableStructureController.class.php:953
+#: libraries/controllers/TableStructureController.class.php:958
 #: libraries/tracking.lib.php:973
 #: templates/columns_definitions/column_indexes.phtml:11
-#: templates/structure/check_all_table_column.phtml:26
+#: templates/table/structure/check_all_table_column.phtml:26
 msgid "Unique"
 msgstr "Dibar"
 
@@ -4180,16 +4190,17 @@ msgstr "Kardinalegezh"
 #: libraries/server_collations.lib.php:35 libraries/tracking.lib.php:881
 #: libraries/tracking.lib.php:977
 #: templates/columns_definitions/table_fields_definitions.phtml:33
-#: templates/structure/row_stats_table.phtml:31
-#: templates/structure/table_header.phtml:55
-#: templates/structure/table_structure_header.phtml:7
-#: templates/table/table_header.phtml:8
+#: templates/database/structure/table_header.phtml:55
+#: templates/table/search/table_header.phtml:8
+#: templates/table/structure/row_stats_table.phtml:31
+#: templates/table/structure/table_structure_header.phtml:7
 msgid "Collation"
 msgstr "Etrerummadiñ"
 
 #: libraries/Index.class.php:703 libraries/rte/rte_events.lib.php:496
-#: libraries/rte/rte_routines.lib.php:956 libraries/tracking.lib.php:885
-#: libraries/tracking.lib.php:979 templates/structure/table_header.phtml:84
+#: libraries/rte/rte_routines.lib.php:1047 libraries/tracking.lib.php:885
+#: libraries/tracking.lib.php:979
+#: templates/database/structure/table_header.phtml:84
 msgid "Comment"
 msgstr "Evezhiadenn"
 
@@ -4202,15 +4213,15 @@ msgstr "Diverket eo bet an alc'hwez kentidik."
 msgid "Index %s has been dropped."
 msgstr "Diverket eo bet ar meneger %s."
 
-#: libraries/Index.class.php:757 libraries/Util.class.php:3630
-#: libraries/Util.class.php:3631
-#: libraries/controllers/StructureController.class.php:1958
-#: libraries/controllers/StructureController.class.php:1959
+#: libraries/Index.class.php:757 libraries/Util.class.php:3636
+#: libraries/Util.class.php:3637
+#: libraries/controllers/TableStructureController.class.php:949
+#: libraries/controllers/TableStructureController.class.php:950
 #: libraries/operations.lib.php:1607 libraries/rte/rte_list.lib.php:150
 #: libraries/server_databases.lib.php:146
-#: templates/structure/check_all_table_column.phtml:15
-#: templates/structure/check_all_tables.phtml:16
-#: templates/tbl_relation/foreign_key_row.phtml:93
+#: templates/database/structure/check_all_tables.phtml:16
+#: templates/table/relation/foreign_key_row.phtml:93
+#: templates/table/structure/check_all_table_column.phtml:15
 msgid "Drop"
 msgstr "Dilezel"
 
@@ -4241,16 +4252,16 @@ msgstr "Servijer"
 #: libraries/Menu.class.php:248
 #: libraries/navigation/Nodes/Node_View.class.php:32
 #: libraries/tbl_info.inc.php:63
-#: templates/structure/structure_table_row.phtml:97
-#: templates/structure/structure_table_row.phtml:159
+#: templates/database/structure/structure_table_row.phtml:97
+#: templates/database/structure/structure_table_row.phtml:159
 msgid "View"
 msgstr "Gwelet"
 
 #: libraries/Menu.class.php:325 libraries/Menu.class.php:429
-#: libraries/Menu.class.php:548 libraries/Util.class.php:3334
-#: libraries/Util.class.php:3344 libraries/Util.class.php:3350
-#: libraries/Util.class.php:4313 libraries/Util.class.php:4328
-#: libraries/Util.class.php:4345 libraries/config.values.php:40
+#: libraries/Menu.class.php:548 libraries/Util.class.php:3340
+#: libraries/Util.class.php:3350 libraries/Util.class.php:3356
+#: libraries/Util.class.php:4319 libraries/Util.class.php:4334
+#: libraries/Util.class.php:4351 libraries/config.values.php:40
 #: libraries/config.values.php:48 libraries/config.values.php:110
 #: libraries/config.values.php:116 libraries/config/messages.inc.php:321
 #: libraries/navigation/Nodes/Node_Table.class.php:292
@@ -4258,19 +4269,19 @@ msgid "SQL"
 msgstr "SQL"
 
 #: libraries/Menu.class.php:328 libraries/Menu.class.php:432
-#: libraries/Util.class.php:3335 libraries/Util.class.php:3345
-#: libraries/Util.class.php:3351 libraries/Util.class.php:3625
-#: libraries/Util.class.php:3626 libraries/Util.class.php:4329
-#: libraries/Util.class.php:4346 libraries/config.values.php:41
+#: libraries/Util.class.php:3341 libraries/Util.class.php:3351
+#: libraries/Util.class.php:3357 libraries/Util.class.php:3631
+#: libraries/Util.class.php:3632 libraries/Util.class.php:4335
+#: libraries/Util.class.php:4352 libraries/config.values.php:41
 #: libraries/config.values.php:49 libraries/config.values.php:111
 #: libraries/config.values.php:117
 #: libraries/navigation/Nodes/Node_Table.class.php:286
 msgid "Search"
 msgstr "Klask"
 
-#: libraries/Menu.class.php:338 libraries/Util.class.php:3336
-#: libraries/Util.class.php:3346 libraries/Util.class.php:3627
-#: libraries/Util.class.php:3628 libraries/Util.class.php:4347
+#: libraries/Menu.class.php:338 libraries/Util.class.php:3342
+#: libraries/Util.class.php:3352 libraries/Util.class.php:3633
+#: libraries/Util.class.php:3634 libraries/Util.class.php:4353
 #: libraries/config.values.php:42 libraries/config.values.php:50
 #: libraries/config.values.php:118
 #: libraries/navigation/Nodes/Node_Table.class.php:289
@@ -4279,30 +4290,30 @@ msgid "Insert"
 msgstr "Ensoc'hañ"
 
 #: libraries/Menu.class.php:362 libraries/Menu.class.php:467
-#: libraries/Util.class.php:4334 libraries/Util.class.php:4350
+#: libraries/Util.class.php:4340 libraries/Util.class.php:4356
 #: libraries/config.values.php:106 libraries/server_common.lib.php:51
 #: libraries/server_privileges.lib.php:2370
 #: libraries/server_privileges.lib.php:3158
-#: libraries/server_privileges.lib.php:4221
+#: libraries/server_privileges.lib.php:4247
 msgid "Privileges"
 msgstr ""
 
 #: libraries/Menu.class.php:371 libraries/Menu.class.php:379
-#: libraries/Menu.class.php:459 libraries/Util.class.php:3338
-#: libraries/Util.class.php:3352 libraries/Util.class.php:4333
-#: libraries/Util.class.php:4351 libraries/config.values.php:112
+#: libraries/Menu.class.php:459 libraries/Util.class.php:3344
+#: libraries/Util.class.php:3358 libraries/Util.class.php:4339
+#: libraries/Util.class.php:4357 libraries/config.values.php:112
 #: view_operations.php:92
 msgid "Operations"
 msgstr "Oberiadennoù"
 
 #: libraries/Menu.class.php:384 libraries/Menu.class.php:492
-#: libraries/Util.class.php:4338 libraries/Util.class.php:4352
+#: libraries/Util.class.php:4344 libraries/Util.class.php:4358
 #: libraries/relation.lib.php:255
 msgid "Tracking"
 msgstr ""
 
 #: libraries/Menu.class.php:397 libraries/Menu.class.php:486
-#: libraries/Util.class.php:4337 libraries/Util.class.php:4353
+#: libraries/Util.class.php:4343 libraries/Util.class.php:4359
 #: libraries/navigation/Nodes/Node_Trigger_Container.class.php:24
 #: libraries/plugins/export/ExportHtmlword.class.php:557
 #: libraries/plugins/export/ExportOdt.class.php:685
@@ -4319,16 +4330,16 @@ msgstr ""
 msgid "Database seems to be empty!"
 msgstr ""
 
-#: libraries/Menu.class.php:439 libraries/Util.class.php:4330
+#: libraries/Menu.class.php:439 libraries/Util.class.php:4336
 msgid "Query"
 msgstr ""
 
-#: libraries/Menu.class.php:472 libraries/Util.class.php:4335
+#: libraries/Menu.class.php:472 libraries/Util.class.php:4341
 #: libraries/rte/rte_words.lib.php:36
 msgid "Routines"
 msgstr ""
 
-#: libraries/Menu.class.php:479 libraries/Util.class.php:4336
+#: libraries/Menu.class.php:479 libraries/Util.class.php:4342
 #: libraries/navigation/Nodes/Node_Event_Container.class.php:26
 #: libraries/plugins/export/ExportSql.class.php:940
 #: libraries/plugins/export/ExportXml.class.php:107
@@ -4336,22 +4347,22 @@ msgstr ""
 msgid "Events"
 msgstr ""
 
-#: libraries/Menu.class.php:498 libraries/Util.class.php:4339
+#: libraries/Menu.class.php:498 libraries/Util.class.php:4345
 msgid "Designer"
 msgstr ""
 
-#: libraries/Menu.class.php:507 libraries/Util.class.php:4340
-#: templates/structure/check_all_tables.phtml:35
+#: libraries/Menu.class.php:507 libraries/Util.class.php:4346
+#: templates/database/structure/check_all_tables.phtml:35
 #, fuzzy
 #| msgid "CHAR textarea columns"
 msgid "Central columns"
 msgstr "Bannoù evit an takadoù skrid CHAR"
 
-#: libraries/Menu.class.php:544 libraries/Util.class.php:4312
+#: libraries/Menu.class.php:544 libraries/Util.class.php:4318
 #: libraries/config.values.php:103 libraries/config/messages.inc.php:266
 #: libraries/config/messages.inc.php:341
 #: libraries/navigation/NavigationTree.class.php:1239
-#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4332
+#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4358
 msgid "Databases"
 msgstr "Diazoù roadennoù"
 
@@ -4360,34 +4371,34 @@ msgid "User accounts"
 msgstr ""
 
 #: libraries/Menu.class.php:595 libraries/ServerStatusData.class.php:121
-#: libraries/Util.class.php:4319 libraries/server_common.lib.php:36
+#: libraries/Util.class.php:4325 libraries/server_common.lib.php:36
 msgid "Binary log"
 msgstr ""
 
 #: libraries/Menu.class.php:601 libraries/ServerStatusData.class.php:126
-#: libraries/Util.class.php:4320 libraries/server_common.lib.php:42
-#: templates/structure/body_for_table_summary.phtml:10
-#: templates/structure/table_header.phtml:27
+#: libraries/Util.class.php:4326 libraries/server_common.lib.php:42
+#: templates/database/structure/body_for_table_summary.phtml:10
+#: templates/database/structure/table_header.phtml:27
 msgid "Replication"
 msgstr "Eilañ"
 
 #: libraries/Menu.class.php:606 libraries/ServerStatusData.class.php:193
-#: libraries/Util.class.php:4321 libraries/config.values.php:105
+#: libraries/Util.class.php:4327 libraries/config.values.php:105
 #: libraries/server_engines.lib.php:108 libraries/server_engines.lib.php:112
 #: libraries/sql_query_form.lib.php:421
 msgid "Variables"
 msgstr ""
 
-#: libraries/Menu.class.php:610 libraries/Util.class.php:4322
+#: libraries/Menu.class.php:610 libraries/Util.class.php:4328
 msgid "Charsets"
 msgstr ""
 
-#: libraries/Menu.class.php:615 libraries/Util.class.php:4323
+#: libraries/Menu.class.php:615 libraries/Util.class.php:4329
 #: libraries/server_common.lib.php:33 libraries/server_plugins.lib.php:27
 msgid "Plugins"
 msgstr ""
 
-#: libraries/Menu.class.php:626 libraries/Util.class.php:4324
+#: libraries/Menu.class.php:626 libraries/Util.class.php:4330
 msgid "Engines"
 msgstr ""
 
@@ -4412,7 +4423,7 @@ msgid_plural "%1$d rows inserted."
 msgstr[0] "%1$d linenn ensoc'het."
 msgstr[1] "%1$d linenn ensoc'het."
 
-#: libraries/PDF.class.php:70 libraries/Util.class.php:2521
+#: libraries/PDF.class.php:70 libraries/Util.class.php:2527
 #: libraries/browse_foreigners.lib.php:327
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:865
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:890
@@ -4437,7 +4448,7 @@ msgid "Could not save favorite table!"
 msgstr "N'eus ket bet gallet enrollañ an daolenn envez"
 
 #: libraries/RecentFavoriteTable.class.php:212
-#: templates/structure/favorite_anchor.phtml:12
+#: templates/database/structure/favorite_anchor.phtml:12
 #, fuzzy
 #| msgid "Remove chart"
 msgid "Remove from Favorites"
@@ -4615,7 +4626,7 @@ msgid ""
 msgstr "N'eus tamm titour dre ar munud ebet evit al lusker stokañ-mañ."
 
 #: libraries/StorageEngine.class.php:373
-#: templates/structure/body_for_table_summary.phtml:50
+#: templates/database/structure/body_for_table_summary.phtml:50
 #, php-format
 msgid "%s is the default storage engine on this MySQL server."
 msgstr "War ar servijer MySQL-mañ ez eo %s ar c'heflusker stokañ dre ziouer."
@@ -5050,10 +5061,10 @@ msgstr ""
 
 #: libraries/Util.class.php:726 libraries/rte/rte_events.lib.php:110
 #: libraries/rte/rte_events.lib.php:119 libraries/rte/rte_events.lib.php:150
-#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:153
-#: libraries/rte/rte_routines.lib.php:162
-#: libraries/rte/rte_routines.lib.php:235
-#: libraries/rte/rte_routines.lib.php:1366
+#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:223
+#: libraries/rte/rte_routines.lib.php:250
+#: libraries/rte/rte_routines.lib.php:372
+#: libraries/rte/rte_routines.lib.php:1457
 #: libraries/rte/rte_triggers.lib.php:86 libraries/rte/rte_triggers.lib.php:95
 #: libraries/rte/rte_triggers.lib.php:127
 msgid "MySQL said: "
@@ -5099,77 +5110,80 @@ msgstr "Sul"
 msgid "%B %d, %Y at %I:%M %p"
 msgstr "%A %d %B %Y da %H:%M"
 
-#: libraries/Util.class.php:2019
+#: libraries/Util.class.php:2025
 #, php-format
 msgid "%s days, %s hours, %s minutes and %s seconds"
 msgstr "%s deiz, %s eur, %s munut ha %s eilenn"
 
-#: libraries/Util.class.php:2112
+#: libraries/Util.class.php:2118
 msgid "Missing parameter:"
 msgstr ""
 
-#: libraries/Util.class.php:2645
+#: libraries/Util.class.php:2651
 #, php-format
 msgid "Jump to database \"%s\"."
 msgstr "Mont d'an diaz roadennoù \"%s\"."
 
-#: libraries/Util.class.php:2670
+#: libraries/Util.class.php:2676
 #, php-format
 msgid "The %s functionality is affected by a known bug, see %s"
 msgstr "Direizhet eo an arc'hwel %s gant un draen anavezet, sellit ouzh %s"
 
-#: libraries/Util.class.php:2881
+#: libraries/Util.class.php:2887
 msgid "Click to toggle"
 msgstr "Klikañ evit gwintañ"
 
-#: libraries/Util.class.php:3542 prefs_manage.php:248
+#: libraries/Util.class.php:3548 prefs_manage.php:248
 msgid "Browse your computer:"
 msgstr "Furchal en hoc'h urzhiataer :"
 
-#: libraries/Util.class.php:3567
+#: libraries/Util.class.php:3573
 #, php-format
 msgid "Select from the web server upload directory <b>%s</b>:"
 msgstr "Diuzit e-mesk kavlec'h pellgargañ ar servijer web <b>%s</b> :"
 
-#: libraries/Util.class.php:3596 libraries/insert_edit.lib.php:1173
+#: libraries/Util.class.php:3602 libraries/insert_edit.lib.php:1171
 msgid "The directory you set for upload work cannot be reached."
 msgstr "Ar c'havlec'h treuzkas n'hall ket bezañ diraezet."
 
-#: libraries/Util.class.php:3607
+#: libraries/Util.class.php:3613
 #, fuzzy
 #| msgid "There are no files to upload"
 msgid "There are no files to upload!"
 msgstr "N'eus restr ebet da enporzhiañ"
 
-#: libraries/Util.class.php:3632 libraries/Util.class.php:3633
-#: templates/structure/check_all_tables.phtml:15
+#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: templates/database/structure/check_all_tables.phtml:15
 msgid "Empty"
 msgstr "Goullonderiñ"
 
-#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: libraries/Util.class.php:3644 libraries/Util.class.php:3645
 msgid "Execute"
 msgstr "Seveniñ"
 
-#: libraries/Util.class.php:4152
+#: libraries/Util.class.php:4158
 msgid "Print"
 msgstr "Moullañ"
 
-#: libraries/Util.class.php:4257 templates/structure/row_stats_table.phtml:80
-#: templates/structure/table_header.phtml:95
+#: libraries/Util.class.php:4263
+#: templates/database/structure/table_header.phtml:95
+#: templates/table/structure/row_stats_table.phtml:80
 msgid "Creation"
 msgstr "Krouiñ"
 
-#: libraries/Util.class.php:4263 templates/structure/row_stats_table.phtml:87
-#: templates/structure/table_header.phtml:106
+#: libraries/Util.class.php:4269
+#: templates/database/structure/table_header.phtml:106
+#: templates/table/structure/row_stats_table.phtml:87
 msgid "Last update"
 msgstr "Hizivadenn ziwezhañ"
 
-#: libraries/Util.class.php:4269 templates/structure/row_stats_table.phtml:94
-#: templates/structure/table_header.phtml:117
+#: libraries/Util.class.php:4275
+#: templates/database/structure/table_header.phtml:117
+#: templates/table/structure/row_stats_table.phtml:94
 msgid "Last check"
 msgstr "Gwiriadenn ziwezhañ"
 
-#: libraries/Util.class.php:4315
+#: libraries/Util.class.php:4321
 msgid "Users"
 msgstr ""
 
@@ -5192,16 +5206,16 @@ msgid "Use this value"
 msgstr "Ober gant an talvoud-mañ"
 
 #: libraries/build_html_for_db.lib.php:33 libraries/import.lib.php:193
-#: templates/structure/actions_in_table_structure.phtml:113
-#: templates/structure/row_stats_table.phtml:42
-#: templates/structure/table_header.phtml:36
+#: templates/database/structure/table_header.phtml:36
+#: templates/table/structure/actions_in_table_structure.phtml:113
+#: templates/table/structure/row_stats_table.phtml:42
 msgid "Rows"
 msgstr "Linennoù"
 
 #: libraries/build_html_for_db.lib.php:48 libraries/engines/innodb.lib.php:171
-#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:186
-#: libraries/server_status.lib.php:298
-#: templates/structure/display_table_stats.phtml:40
+#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:195
+#: libraries/server_status.lib.php:307
+#: templates/table/structure/display_table_stats.phtml:40
 msgid "Total"
 msgstr "Hollad"
 
@@ -5210,10 +5224,12 @@ msgid "Jump to database"
 msgstr "Mont d'an diaz roadennoù"
 
 #: libraries/build_html_for_db.lib.php:146
+#: templates/database/structure/structure_table_row.phtml:15
 msgid "Not replicated"
 msgstr "N'eo ket eilet"
 
 #: libraries/build_html_for_db.lib.php:158
+#: templates/database/structure/structure_table_row.phtml:16
 msgid "Replicated"
 msgstr "Eilet"
 
@@ -5270,17 +5286,17 @@ msgstr ""
 #: libraries/plugins/export/ExportTexytext.class.php:425
 #: libraries/plugins/export/PMA_ExportPdf.class.php:307
 #: libraries/rte/rte_list.lib.php:73 libraries/rte/rte_list.lib.php:85
-#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:830
-#: libraries/rte/rte_routines.lib.php:1492 setup/frames/index.inc.php:162
+#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:921
+#: libraries/rte/rte_routines.lib.php:1583 setup/frames/index.inc.php:162
 #: templates/columns_definitions/table_fields_definitions.phtml:8
-#: templates/structure/table_structure_header.phtml:5
-#: templates/table/create_table.phtml:11
+#: templates/database/create_table.phtml:11
+#: templates/table/structure/table_structure_header.phtml:5
 msgid "Name"
 msgstr ""
 
 #: libraries/central_columns.lib.php:699
 #: libraries/central_columns.lib.php:1381
-#: libraries/rte/rte_routines.lib.php:832
+#: libraries/rte/rte_routines.lib.php:923
 #: templates/columns_definitions/table_fields_definitions.phtml:14
 msgid "Length/Values"
 msgstr ""
@@ -5301,7 +5317,7 @@ msgid "Select a table"
 msgstr "Diuzañ pep tra"
 
 #: libraries/central_columns.lib.php:804
-#: templates/structure/add_column.phtml:4
+#: templates/table/structure/add_column.phtml:4
 msgid "Add column"
 msgstr ""
 
@@ -5321,7 +5337,7 @@ msgstr "Ouzhpennañ/Diverkañ bannoù"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1002
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1025
 #: templates/columns_definitions/table_fields_definitions.phtml:36
-#: templates/structure/table_structure_header.phtml:8
+#: templates/table/structure/table_structure_header.phtml:8
 msgid "Attributes"
 msgstr ""
 
@@ -5445,7 +5461,7 @@ msgid "Double click"
 msgstr ""
 
 #: libraries/config.values.php:95 libraries/config.values.php:124
-#: libraries/config/FormDisplay.tpl.php:221 libraries/relation.lib.php:97
+#: libraries/config/FormDisplay.tpl.php:232 libraries/relation.lib.php:97
 #: libraries/relation.lib.php:105
 msgid "Disabled"
 msgstr "Diweredekaet"
@@ -5636,22 +5652,22 @@ msgstr "Ne'z aio ket an ezporzhiañ en-dro, un arc'hwel a vank (%s)"
 msgid "maximum %s"
 msgstr "%s d'ar muiañ"
 
-#: libraries/config/FormDisplay.tpl.php:219
+#: libraries/config/FormDisplay.tpl.php:230
 msgid "This setting is disabled, it will not be applied to your configuration."
 msgstr ""
 "Diweredekaet eo an arventenn; ne vo ket lakaet e pleustr gant ho kefluniadur."
 
-#: libraries/config/FormDisplay.tpl.php:313
+#: libraries/config/FormDisplay.tpl.php:324
 #, php-format
 msgid "Set value: %s"
 msgstr "Lakaat an talvoud da %s"
 
-#: libraries/config/FormDisplay.tpl.php:318
+#: libraries/config/FormDisplay.tpl.php:329
 #: libraries/config/messages.inc.php:610
 msgid "Restore default value"
 msgstr "Adlakaat an talvoud dre ziouer"
 
-#: libraries/config/FormDisplay.tpl.php:332
+#: libraries/config/FormDisplay.tpl.php:343
 msgid "Allow users to customize this value"
 msgstr "Aotren an implijerien da bersonelaat an talvoud-mañ"
 
@@ -6161,7 +6177,7 @@ msgstr "Strobad arouezennoù ar restr"
 
 #: libraries/config/messages.inc.php:136 libraries/config/messages.inc.php:152
 #: libraries/sql_query_form.lib.php:247
-#: templates/structure/row_stats_table.phtml:7
+#: templates/table/structure/row_stats_table.phtml:7
 msgid "Format"
 msgstr "Furmad"
 
@@ -6771,7 +6787,7 @@ msgstr ""
 
 #: libraries/config/messages.inc.php:332
 #: libraries/plugins/export/ExportPdf.class.php:279
-#: templates/structure/secondary_tabs.phtml:8
+#: templates/table/secondary_tabs.phtml:8
 #, fuzzy
 #| msgid "Databases"
 msgid "Table structure"
@@ -8400,110 +8416,35 @@ msgstr ""
 msgid "OpenDocument Text"
 msgstr "Testenn Open Document"
 
-#: libraries/controllers/StructureController.class.php:465
+#: libraries/controllers/DatabaseStructureController.class.php:405
 #: tbl_operations.php:382
 #, php-format
 msgid "Table %s has been emptied."
 msgstr "Goullonderet eo bet an daolenn %s."
 
-#: libraries/controllers/StructureController.class.php:486
+#: libraries/controllers/DatabaseStructureController.class.php:426
 #: tbl_operations.php:400 view_operations.php:119
 #, fuzzy, php-format
 #| msgid "View %s has been dropped."
 msgid "View %s has been dropped."
 msgstr "Diverket eo bet ar Gweled %s"
 
-#: libraries/controllers/StructureController.class.php:487
+#: libraries/controllers/DatabaseStructureController.class.php:427
 #: tbl_operations.php:401
 #, fuzzy, php-format
 #| msgid "Table %s has been dropped."
 msgid "Table %s has been dropped."
 msgstr "Diverket eo bet an daolenn %s"
 
-#: libraries/controllers/StructureController.class.php:797
-#, php-format
-msgid "The name '%s' is a MySQL reserved keyword."
-msgid_plural "The names '%s' are MySQL reserved keywords."
-msgstr[0] ""
-msgstr[1] ""
-
-#: libraries/controllers/StructureController.class.php:875
-#, fuzzy
-#| msgid "No rows selected"
-msgid "No column selected."
-msgstr "N'eus bet diuzet linenn ebet"
-
-#: libraries/controllers/StructureController.class.php:1049
+#: libraries/controllers/DatabaseStructureController.class.php:733
 msgid "Favorite List is full!"
 msgstr ""
 
-#: libraries/controllers/StructureController.class.php:1272
-#, fuzzy
-#| msgid "Database %s has been dropped."
-msgid "The columns have been moved successfully."
-msgstr "Diverket eo bet an diaz roadennoù %s."
-
-#: libraries/controllers/StructureController.class.php:1535
-#, fuzzy, php-format
-#| msgid "Routine %1$s has been modified."
-msgid ""
-"Table %1$s has been altered successfully. Privileges have been adjusted."
-msgstr "Kemmet eo bet an argerzh %1$s."
-
-#: libraries/controllers/StructureController.class.php:1541
-#: libraries/controllers/TableIndexesController.class.php:161
-#: tbl_addfield.php:92
-#, php-format
-msgid "Table %1$s has been altered successfully."
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1588
-#: libraries/tracking.lib.php:1094
-msgid "Query error"
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1806
+#: libraries/controllers/DatabaseStructureController.class.php:947
 #: libraries/mysql_charsets.lib.php:366 libraries/mysql_charsets.lib.php:373
 msgid "unknown"
 msgstr ""
 
-#: libraries/controllers/StructureController.class.php:1957
-#: templates/structure/check_all_table_column.phtml:11
-msgid "Change"
-msgstr "Kemmañ"
-
-#: libraries/controllers/StructureController.class.php:1961
-#: libraries/controllers/StructureController.class.php:1966
-#: libraries/navigation/Nodes/Node_Index.class.php:30
-#: libraries/tracking.lib.php:926
-#: templates/columns_definitions/column_indexes.phtml:16
-#: templates/columns_definitions/table_fields_definitions.phtml:57
-#: templates/structure/check_all_table_column.phtml:30
-#: templates/structure/display_structure.phtml:79
-#: templates/structure/display_table_stats.phtml:19
-msgid "Index"
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1963
-#: libraries/controllers/StructureController.class.php:1968
-#: templates/columns_definitions/column_indexes.phtml:27
-#: templates/structure/check_all_table_column.phtml:37
-msgid "Spatial"
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1964
-#: libraries/controllers/StructureController.class.php:1969
-#: templates/columns_definitions/column_indexes.phtml:22
-#: templates/structure/check_all_table_column.phtml:47
-msgid "Fulltext"
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1970
-#, fuzzy
-#| msgid "Use this value"
-msgid "Distinct values"
-msgstr "Ober gant an talvoud-mañ"
-
 #: libraries/controllers/TableChartController.class.php:82
 #: libraries/controllers/TableGisVisualizationController.class.php:101
 msgid "No SQL query was set to fetch data."
@@ -8519,11 +8460,18 @@ msgstr ""
 msgid "No data to display"
 msgstr "Dibab ar bann da ziskouez"
 
-#: libraries/controllers/TableRelationController.class.php:217
+#: libraries/controllers/TableIndexesController.class.php:161
+#: libraries/controllers/TableStructureController.class.php:736
+#: tbl_addfield.php:92
+#, php-format
+msgid "Table %1$s has been altered successfully."
+msgstr ""
+
+#: libraries/controllers/TableRelationController.class.php:218
 msgid "Display column was successfully updated."
 msgstr ""
 
-#: libraries/controllers/TableRelationController.class.php:283
+#: libraries/controllers/TableRelationController.class.php:288
 #, fuzzy
 #| msgid "The bookmark has been deleted."
 msgid "Internal relations were successfully updated."
@@ -8542,12 +8490,80 @@ msgid "Zoom search"
 msgstr "Klask"
 
 #: libraries/controllers/TableSearchController.class.php:852
-#: templates/table/selection_form.phtml:59
+#: templates/table/search/selection_form.phtml:59
 #, fuzzy
 #| msgid "Hide search criteria"
 msgid "Find and replace"
 msgstr "Kuzhat an dezverkoù klask"
 
+#: libraries/controllers/TableStructureController.class.php:163
+#, php-format
+msgid "The name '%s' is a MySQL reserved keyword."
+msgid_plural "The names '%s' are MySQL reserved keywords."
+msgstr[0] ""
+msgstr[1] ""
+
+#: libraries/controllers/TableStructureController.class.php:241
+#, fuzzy
+#| msgid "No rows selected"
+msgid "No column selected."
+msgstr "N'eus bet diuzet linenn ebet"
+
+#: libraries/controllers/TableStructureController.class.php:467
+#, fuzzy
+#| msgid "Database %s has been dropped."
+msgid "The columns have been moved successfully."
+msgstr "Diverket eo bet an diaz roadennoù %s."
+
+#: libraries/controllers/TableStructureController.class.php:730
+#, fuzzy, php-format
+#| msgid "Routine %1$s has been modified."
+msgid ""
+"Table %1$s has been altered successfully. Privileges have been adjusted."
+msgstr "Kemmet eo bet an argerzh %1$s."
+
+#: libraries/controllers/TableStructureController.class.php:783
+#: libraries/tracking.lib.php:1094
+msgid "Query error"
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:948
+#: templates/table/structure/check_all_table_column.phtml:11
+msgid "Change"
+msgstr "Kemmañ"
+
+#: libraries/controllers/TableStructureController.class.php:952
+#: libraries/controllers/TableStructureController.class.php:957
+#: libraries/navigation/Nodes/Node_Index.class.php:30
+#: libraries/tracking.lib.php:926
+#: templates/columns_definitions/column_indexes.phtml:16
+#: templates/columns_definitions/table_fields_definitions.phtml:57
+#: templates/table/structure/check_all_table_column.phtml:30
+#: templates/table/structure/display_structure.phtml:79
+#: templates/table/structure/display_table_stats.phtml:19
+msgid "Index"
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:954
+#: libraries/controllers/TableStructureController.class.php:959
+#: templates/columns_definitions/column_indexes.phtml:27
+#: templates/table/structure/check_all_table_column.phtml:37
+msgid "Spatial"
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:955
+#: libraries/controllers/TableStructureController.class.php:960
+#: templates/columns_definitions/column_indexes.phtml:22
+#: templates/table/structure/check_all_table_column.phtml:47
+msgid "Fulltext"
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:963
+#, fuzzy
+#| msgid "Use this value"
+msgid "Distinct values"
+msgstr "Ober gant an talvoud-mañ"
+
 #: libraries/core.lib.php:306
 #, php-format
 msgid "The %s extension is missing. Please check your PHP configuration."
@@ -8594,7 +8610,7 @@ msgid "No Password"
 msgstr ""
 
 #: libraries/display_change_password.lib.php:68
-#: libraries/plugins/auth/AuthenticationCookie.class.php:199
+#: libraries/plugins/auth/AuthenticationCookie.class.php:187
 #: libraries/replication_gui.lib.php:422 libraries/replication_gui.lib.php:862
 #: libraries/server_privileges.lib.php:1640
 msgid "Password:"
@@ -9368,12 +9384,12 @@ msgid "Dump has been saved to file %s."
 msgstr "Enrollet eo bet ar restr ezporzhiañ e%s."
 
 #: libraries/import.lib.php:202 libraries/insert_edit.lib.php:124
-#: libraries/rte/rte_routines.lib.php:1353 libraries/sql.lib.php:1312
+#: libraries/rte/rte_routines.lib.php:1444 libraries/sql.lib.php:1306
 #: tbl_get_field.php:44
 msgid "MySQL returned an empty result set (i.e. zero rows)."
 msgstr "Distroet ez eus un disoc'h goullo gant MySQL (linenn ebet)."
 
-#: libraries/import.lib.php:265 libraries/sql.lib.php:1326
+#: libraries/import.lib.php:265 libraries/sql.lib.php:1320
 msgid "[ROLLBACK occurred.]"
 msgstr ""
 
@@ -9441,14 +9457,14 @@ msgstr ""
 
 #: libraries/insert_edit.lib.php:233
 #: libraries/navigation/Nodes/Node_DatabaseChild.class.php:48
-#: templates/designer/table_list.phtml:40
+#: templates/database/designer/table_list.phtml:40
 msgid "Hide"
 msgstr "Kuzhat"
 
 #: libraries/insert_edit.lib.php:249
 #: libraries/navigation/Nodes/Node_Function.class.php:32
-#: libraries/rte/rte_routines.lib.php:1495
-#: templates/table/table_header.phtml:4
+#: libraries/rte/rte_routines.lib.php:1586
+#: templates/table/search/table_header.phtml:4
 msgid "Function"
 msgstr ""
 
@@ -9461,86 +9477,87 @@ msgstr ""
 msgid "Because of its length,<br /> this column might not be editable."
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1050
+#: libraries/insert_edit.lib.php:1048
 msgid "Binary - do not edit"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1176 libraries/server_privileges.lib.php:470
-#: templates/table/options.phtml:36
+#: libraries/insert_edit.lib.php:1174 libraries/server_privileges.lib.php:470
+#: templates/table/search/options.phtml:36
 msgid "Or"
 msgstr "Pe"
 
-#: libraries/insert_edit.lib.php:1177
+#: libraries/insert_edit.lib.php:1175
 #, fuzzy
 #| msgid "Select from the web server upload directory <b>%s</b>:"
 msgid "web server upload directory:"
 msgstr "Diuzit e-mesk kavlec'h pellgargañ ar servijer web <b>%s</b> :"
 
-#: libraries/insert_edit.lib.php:1348 templates/table/input_box.phtml:49
+#: libraries/insert_edit.lib.php:1346
+#: templates/table/search/input_box.phtml:49
 #, fuzzy
 #| msgid "Insert"
 msgid "Edit/Insert"
 msgstr "Ensoc'hañ"
 
-#: libraries/insert_edit.lib.php:1398
+#: libraries/insert_edit.lib.php:1396
 #, php-format
 msgid "Continue insertion with %s rows"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1428
+#: libraries/insert_edit.lib.php:1426
 msgid "and then"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1461
+#: libraries/insert_edit.lib.php:1459
 msgid "Insert as new row"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1464
+#: libraries/insert_edit.lib.php:1462
 msgid "Insert as new row and ignore errors"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1467
+#: libraries/insert_edit.lib.php:1465
 msgid "Show insert query"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1487
+#: libraries/insert_edit.lib.php:1485
 msgid "Go back to previous page"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1490
+#: libraries/insert_edit.lib.php:1488
 msgid "Insert another new row"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1495
+#: libraries/insert_edit.lib.php:1493
 msgid "Go back to this page"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1518
+#: libraries/insert_edit.lib.php:1516
 msgid "Edit next row"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1540
+#: libraries/insert_edit.lib.php:1538
 msgid ""
 "Use TAB key to move from value to value, or CTRL+arrows to move anywhere"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1577 libraries/replication_gui.lib.php:542
-#: libraries/rte/rte_routines.lib.php:1497
+#: libraries/insert_edit.lib.php:1575 libraries/replication_gui.lib.php:542
+#: libraries/rte/rte_routines.lib.php:1588
 #: libraries/server_status_variables.lib.php:220
-#: templates/designer/having_query_panel.phtml:100
-#: templates/designer/options_panel.phtml:73
-#: templates/designer/options_panel.phtml:239
-#: templates/designer/where_query_panel.phtml:69
-#: templates/table/table_header.phtml:10
-#: templates/table/zoom_result_form.phtml:35
+#: templates/database/designer/having_query_panel.phtml:100
+#: templates/database/designer/options_panel.phtml:73
+#: templates/database/designer/options_panel.phtml:239
+#: templates/database/designer/where_query_panel.phtml:69
+#: templates/table/search/table_header.phtml:10
+#: templates/table/search/zoom_result_form.phtml:35
 msgid "Value"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1937 libraries/sql.lib.php:1309
+#: libraries/insert_edit.lib.php:1935 libraries/sql.lib.php:1303
 msgid "Showing SQL query"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1962 libraries/sql.lib.php:1287
+#: libraries/insert_edit.lib.php:1960 libraries/sql.lib.php:1281
 #, php-format
 msgid "Inserted row id: %1$d"
 msgstr ""
@@ -9981,7 +9998,7 @@ msgstr ""
 #: libraries/navigation/Nodes/Node_View_Container.class.php:26
 #: libraries/navigation/Nodes/Node_View_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:129
-#: templates/structure/show_create.phtml:30
+#: templates/database/structure/show_create.phtml:30
 msgid "Views"
 msgstr ""
 
@@ -10287,7 +10304,7 @@ msgstr ""
 
 #: libraries/operations.lib.php:101 libraries/operations.lib.php:249
 #: libraries/operations.lib.php:869 libraries/operations.lib.php:963
-#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:907
+#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:998
 #: templates/columns_definitions/table_fields_definitions.phtml:47
 #, fuzzy
 #| msgid "Reloading Privileges"
@@ -10381,22 +10398,22 @@ msgid "Switch to copied table"
 msgstr ""
 
 #: libraries/operations.lib.php:1360
-#: templates/structure/check_all_tables.phtml:18
+#: templates/database/structure/check_all_tables.phtml:18
 msgid "Table maintenance"
 msgstr ""
 
 #: libraries/operations.lib.php:1398
-#: templates/structure/check_all_tables.phtml:19
+#: templates/database/structure/check_all_tables.phtml:19
 msgid "Analyze table"
 msgstr "Dielfennañ an daolenn"
 
 #: libraries/operations.lib.php:1413
-#: templates/structure/check_all_tables.phtml:20
+#: templates/database/structure/check_all_tables.phtml:20
 msgid "Check table"
 msgstr "Gwiriañ an daolenn"
 
 #: libraries/operations.lib.php:1428
-#: templates/structure/check_all_tables.phtml:22
+#: templates/database/structure/check_all_tables.phtml:22
 #, fuzzy
 #| msgid "Check table"
 msgid "Checksum table"
@@ -10416,18 +10433,19 @@ msgid "Flush the table (FLUSH)"
 msgstr ""
 
 #: libraries/operations.lib.php:1477
-#: templates/structure/check_all_tables.phtml:23
-#: templates/structure/display_table_stats.phtml:56
+#: templates/database/structure/check_all_tables.phtml:23
+#: templates/table/structure/display_table_stats.phtml:56
 msgid "Optimize table"
 msgstr "Lakaat an daolenn diouzh ar gwellañ"
 
 #: libraries/operations.lib.php:1492
-#: templates/structure/check_all_tables.phtml:24
+#: templates/database/structure/check_all_tables.phtml:24
 msgid "Repair table"
 msgstr "Dresañ an daolenn"
 
 #: libraries/operations.lib.php:1538
-#: templates/structure/check_all_tables.phtml:14 view_operations.php:127
+#: templates/database/structure/check_all_tables.phtml:14
+#: view_operations.php:127
 msgid "Delete data or table"
 msgstr ""
 
@@ -10554,7 +10572,7 @@ msgid "Cannot connect: invalid settings."
 msgstr "Dibosupl kevreañ : arventennoù direizh."
 
 #: libraries/plugins/auth/AuthenticationConfig.class.php:108
-#: libraries/plugins/auth/AuthenticationCookie.class.php:134
+#: libraries/plugins/auth/AuthenticationCookie.class.php:122
 #: libraries/plugins/auth/AuthenticationHttp.class.php:96
 #, php-format
 msgid "Welcome to %s"
@@ -10585,40 +10603,40 @@ msgstr ""
 msgid "Retry to connect"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:146
+#: libraries/plugins/auth/AuthenticationCookie.class.php:134
 msgid "Your session has expired. Please log in again."
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:170
+#: libraries/plugins/auth/AuthenticationCookie.class.php:158
 msgid "Log in"
 msgstr "Kevreañ"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:178
-#: libraries/plugins/auth/AuthenticationCookie.class.php:188
+#: libraries/plugins/auth/AuthenticationCookie.class.php:166
+#: libraries/plugins/auth/AuthenticationCookie.class.php:176
 msgid "You can enter hostname/IP address and port separated by space."
 msgstr ""
 "Gallout a rit merkañ anv ar servijer pe e chomlec'h IP, gant ar porzh "
 "dispartiet dre un esaouenn."
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:193
+#: libraries/plugins/auth/AuthenticationCookie.class.php:181
 msgid "Username:"
 msgstr "Anv implijer :"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:205
+#: libraries/plugins/auth/AuthenticationCookie.class.php:193
 #, fuzzy
 #| msgid "Server Choice"
 msgid "Server Choice:"
 msgstr "Dibab ar servijer"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:386
+#: libraries/plugins/auth/AuthenticationCookie.class.php:374
 msgid "Entered captcha is wrong, try again!"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:396
+#: libraries/plugins/auth/AuthenticationCookie.class.php:384
 msgid "Please enter correct captcha!"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:423
+#: libraries/plugins/auth/AuthenticationCookie.class.php:411
 #, fuzzy
 #| msgid "Cannot log in to the MySQL server"
 msgid "You are not allowed to log in to this MySQL server!"
@@ -10716,7 +10734,7 @@ msgstr ""
 #: libraries/plugins/export/ExportOdt.class.php:593
 #: libraries/plugins/export/ExportTexytext.class.php:428
 #: libraries/plugins/export/PMA_ExportPdf.class.php:313
-#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:984
 #: libraries/rte/rte_triggers.lib.php:377
 msgid "Definition"
 msgstr ""
@@ -11046,7 +11064,7 @@ msgid "Last check:"
 msgstr "Gwiriet da ziwezhañ :"
 
 #: libraries/plugins/export/ExportSql.class.php:1399
-#: templates/structure/structure_table_row.phtml:183
+#: templates/database/structure/structure_table_row.phtml:183
 msgid "in use"
 msgstr "en implij"
 
@@ -11242,18 +11260,14 @@ msgstr ""
 msgid "The imported file does not contain any data!"
 msgstr "N'eus anaouder alc'hwez ebet er restr %s"
 
-#: libraries/plugins/import/ImportSql.class.php:169
+#: libraries/plugins/import/ImportSql.class.php:72
 msgid "SQL compatibility mode:"
 msgstr ""
 
-#: libraries/plugins/import/ImportSql.class.php:181
+#: libraries/plugins/import/ImportSql.class.php:84
 msgid "Do not use <code>AUTO_INCREMENT</code> for zero values"
 msgstr ""
 
-#: libraries/plugins/import/ImportSql.class.php:195
-msgid "Read as multibytes"
-msgstr ""
-
 #: libraries/plugins/import/ImportXml.class.php:54
 msgid "XML"
 msgstr ""
@@ -11298,7 +11312,7 @@ msgid "Show grid"
 msgstr ""
 
 #: libraries/plugins/schema/SchemaPdf.class.php:94
-#: templates/structure/print_view_data_dictionary_link.phtml:6
+#: templates/database/structure/print_view_data_dictionary_link.phtml:6
 msgid "Data Dictionary"
 msgstr "Geriadur roadennoù"
 
@@ -11329,7 +11343,7 @@ msgid "The %s table doesn't exist!"
 msgstr ""
 
 #: libraries/plugins/schema/eps/Eps_Relation_Schema.class.php:321
-#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:309
+#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:323
 #, php-format
 msgid "Schema of the %s database - Page %s"
 msgstr ""
@@ -11358,7 +11372,7 @@ msgstr ""
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1005
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1028
 #: libraries/tracking.lib.php:884
-#: templates/structure/table_structure_header.phtml:11
+#: templates/table/structure/table_structure_header.phtml:11
 msgid "Extra"
 msgstr ""
 
@@ -11687,32 +11701,32 @@ msgstr ""
 msgid "Create the needed tables with the <code>%screate_tables.sql</code>."
 msgstr ""
 
-#: libraries/relation.lib.php:360
+#: libraries/relation.lib.php:357
 msgid "Create a pma user and give access to these tables."
 msgstr ""
 
-#: libraries/relation.lib.php:365
+#: libraries/relation.lib.php:360
 msgid ""
 "Enable advanced features in configuration file (<code>config.inc.php</"
 "code>), for example by starting from <code>config.sample.inc.php</code>."
 msgstr ""
 
-#: libraries/relation.lib.php:373
+#: libraries/relation.lib.php:365
 msgid "Re-login to phpMyAdmin to load the updated configuration file."
 msgstr ""
 
-#: libraries/relation.lib.php:1612
+#: libraries/relation.lib.php:1607
 msgid "no description"
 msgstr ""
 
-#: libraries/relation.lib.php:1811
+#: libraries/relation.lib.php:1806
 msgid ""
 "You do not have necessary privileges to create a database named "
 "'phpmyadmin'. You may go to 'Operations' tab of any database to set up the "
 "phpMyAdmin configuration storage there."
 msgstr ""
 
-#: libraries/relation.lib.php:1928
+#: libraries/relation.lib.php:1923
 #, fuzzy, php-format
 #| msgid ""
 #| "Tracking of changes made in database. Requires the phpMyAdmin "
@@ -11724,13 +11738,13 @@ msgstr ""
 "Heuliañ ar c'hemmoù graet en diaz roadennoù. Rekis eo kaout ar stokañ "
 "kefluniadurioù phpMyAdmin."
 
-#: libraries/relation.lib.php:1936
+#: libraries/relation.lib.php:1931
 #, php-format
 msgid ""
 "%sCreate%s the phpMyAdmin configuration storage in the current database."
 msgstr ""
 
-#: libraries/relation.lib.php:1944
+#: libraries/relation.lib.php:1939
 #, fuzzy, php-format
 #| msgid ""
 #| "Tracking of changes made in database. Requires the phpMyAdmin "
@@ -11741,7 +11755,7 @@ msgstr ""
 "kefluniadurioù phpMyAdmin."
 
 #: libraries/replication_gui.lib.php:46 libraries/replication_gui.lib.php:343
-#: libraries/server_databases.lib.php:387
+#: libraries/server_databases.lib.php:398
 msgid "Master replication"
 msgstr ""
 
@@ -11796,7 +11810,7 @@ msgid ""
 msgstr ""
 
 #: libraries/replication_gui.lib.php:141
-#: libraries/server_databases.lib.php:389
+#: libraries/server_databases.lib.php:400
 msgid "Slave replication"
 msgstr ""
 
@@ -12067,10 +12081,10 @@ msgid "Master server changed successfully to %s."
 msgstr ""
 
 #: libraries/rte/rte_events.lib.php:106 libraries/rte/rte_events.lib.php:115
-#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:149
-#: libraries/rte/rte_routines.lib.php:158
-#: libraries/rte/rte_routines.lib.php:231
-#: libraries/rte/rte_routines.lib.php:1362
+#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:219
+#: libraries/rte/rte_routines.lib.php:246
+#: libraries/rte/rte_routines.lib.php:368
+#: libraries/rte/rte_routines.lib.php:1453
 #: libraries/rte/rte_triggers.lib.php:82 libraries/rte/rte_triggers.lib.php:91
 #: libraries/rte/rte_triggers.lib.php:123
 #, php-format
@@ -12095,7 +12109,7 @@ msgstr "Kemmet eo bet an argerzh %1s."
 msgid "Event %1$s has been created."
 msgstr "Krouet eo bet an argerzh %1s."
 
-#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:251
+#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:266
 #: libraries/rte/rte_triggers.lib.php:144
 #, fuzzy
 #| msgid ""
@@ -12107,7 +12121,7 @@ msgstr "<b>Ur fazi, pe meur a hini, zo bet en ur seveniñ ho koulenn :</b>"
 msgid "Edit event"
 msgstr ""
 
-#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:794
+#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:885
 #: libraries/rte/rte_triggers.lib.php:323 view_create.php:180
 msgid "Details"
 msgstr ""
@@ -12120,7 +12134,7 @@ msgstr ""
 msgid "Event type"
 msgstr ""
 
-#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:817
+#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:908
 #, php-format
 msgid "Change to %s"
 msgstr ""
@@ -12157,12 +12171,14 @@ msgstr "Fin"
 msgid "On completion preserve"
 msgstr "Ensoc'hadennoù sevenet"
 
-#: libraries/rte/rte_events.lib.php:491 libraries/rte/rte_routines.lib.php:930
+#: libraries/rte/rte_events.lib.php:491
+#: libraries/rte/rte_routines.lib.php:1021
 #: libraries/rte/rte_triggers.lib.php:383 view_create.php:209
 msgid "Definer"
 msgstr ""
 
-#: libraries/rte/rte_events.lib.php:535 libraries/rte/rte_routines.lib.php:997
+#: libraries/rte/rte_events.lib.php:535
+#: libraries/rte/rte_routines.lib.php:1088
 #: libraries/rte/rte_triggers.lib.php:422
 msgid "The definer must be in the \"username@hostname\" format!"
 msgstr ""
@@ -12190,9 +12206,9 @@ msgid "You must provide an event definition."
 msgstr ""
 
 #: libraries/rte/rte_export.lib.php:43 libraries/rte/rte_general.lib.php:72
-#: libraries/rte/rte_routines.lib.php:345
-#: libraries/rte/rte_routines.lib.php:1198
-#: libraries/rte/rte_routines.lib.php:1411
+#: libraries/rte/rte_routines.lib.php:153
+#: libraries/rte/rte_routines.lib.php:1289
+#: libraries/rte/rte_routines.lib.php:1502
 #, fuzzy
 #| msgid "Error in processing request"
 msgid "Error in processing request:"
@@ -12234,122 +12250,122 @@ msgstr ""
 "merañ ar rekedoù lies. <b>Gallout a ra ar seveniñ argerzhioù stoket zo "
 "c'hwitañ !</b> Grit gant an astenn 'mysqli' gwellaet, kuit da gaout kudennoù."
 
-#: libraries/rte/rte_routines.lib.php:110
-#: libraries/rte/rte_routines.lib.php:1006
+#: libraries/rte/rte_routines.lib.php:123
+msgid "Edit routine"
+msgstr "Kemmañ un argerzh"
+
+#: libraries/rte/rte_routines.lib.php:200
+#: libraries/rte/rte_routines.lib.php:1097
 #, php-format
 msgid "Invalid routine type: \"%s\""
 msgstr "Seurt argerzh faziek : \"%s\""
 
-#: libraries/rte/rte_routines.lib.php:170
+#: libraries/rte/rte_routines.lib.php:253
+#, php-format
+msgid "Routine %1$s has been created."
+msgstr "Krouet eo bet an argerzh %1$s."
+
+#: libraries/rte/rte_routines.lib.php:380
 msgid "Sorry, we failed to restore the dropped routine."
 msgstr "Ho tigarez, disposupl eo bet assevel an argerzh."
 
-#: libraries/rte/rte_routines.lib.php:211
+#: libraries/rte/rte_routines.lib.php:439
 #, fuzzy, php-format
 #| msgid "Routine %1$s has been modified."
 msgid "Routine %1$s has been modified. Privileges have been adjusted."
 msgstr "Kemmet eo bet an argerzh %1$s."
 
-#: libraries/rte/rte_routines.lib.php:216
+#: libraries/rte/rte_routines.lib.php:444
 #, php-format
 msgid "Routine %1$s has been modified."
 msgstr "Kemmet eo bet an argerzh %1$s."
 
-#: libraries/rte/rte_routines.lib.php:238
-#, php-format
-msgid "Routine %1$s has been created."
-msgstr "Krouet eo bet an argerzh %1$s."
-
-#: libraries/rte/rte_routines.lib.php:315
-msgid "Edit routine"
-msgstr "Kemmañ un argerzh"
-
-#: libraries/rte/rte_routines.lib.php:797
+#: libraries/rte/rte_routines.lib.php:888
 msgid "Routine name"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:823
+#: libraries/rte/rte_routines.lib.php:914
 msgid "Parameters"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:829
+#: libraries/rte/rte_routines.lib.php:920
 msgid "Direction"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:847
+#: libraries/rte/rte_routines.lib.php:938
 msgid "Add parameter"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:851
+#: libraries/rte/rte_routines.lib.php:942
 msgid "Remove last parameter"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:856
+#: libraries/rte/rte_routines.lib.php:947
 msgid "Return type"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:862
+#: libraries/rte/rte_routines.lib.php:953
 msgid "Return length/values"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:868
+#: libraries/rte/rte_routines.lib.php:959
 msgid "Return options"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:899
+#: libraries/rte/rte_routines.lib.php:990
 msgid "Is deterministic"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:920
+#: libraries/rte/rte_routines.lib.php:1011
 msgid ""
 "You do not have sufficient privileges to perform this operation; Please "
 "refer to the documentation for more details"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:935
+#: libraries/rte/rte_routines.lib.php:1026
 msgid "Security type"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:944
+#: libraries/rte/rte_routines.lib.php:1035
 msgid "SQL data access"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1013
+#: libraries/rte/rte_routines.lib.php:1104
 #, fuzzy
 #| msgid "Invalid table name"
 msgid "You must provide a routine name!"
 msgstr "Anv taolenn direizh"
 
-#: libraries/rte/rte_routines.lib.php:1047
+#: libraries/rte/rte_routines.lib.php:1138
 #, php-format
 msgid "Invalid direction \"%s\" given for parameter."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1069
-#: libraries/rte/rte_routines.lib.php:1131
+#: libraries/rte/rte_routines.lib.php:1160
+#: libraries/rte/rte_routines.lib.php:1222
 msgid ""
 "You must provide length/values for routine parameters of type ENUM, SET, "
 "VARCHAR and VARBINARY."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1095
+#: libraries/rte/rte_routines.lib.php:1186
 msgid "You must provide a name and a type for each routine parameter."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1114
+#: libraries/rte/rte_routines.lib.php:1205
 msgid "You must provide a valid return type for the routine."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1174
+#: libraries/rte/rte_routines.lib.php:1265
 msgid "You must provide a routine definition."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1285
+#: libraries/rte/rte_routines.lib.php:1376
 #, php-format
 msgid "Execution results of routine %s"
 msgstr "Disoc'hoù seveniñ an argerzh %s"
 
-#: libraries/rte/rte_routines.lib.php:1340
+#: libraries/rte/rte_routines.lib.php:1431
 #, fuzzy, php-format
 #| msgid "%d row affected by the last statement inside the procedure"
 #| msgid_plural "%d rows affected by the last statement inside the procedure"
@@ -12358,13 +12374,13 @@ msgid_plural "%d rows affected by the last statement inside the procedure."
 msgstr[0] "Tizhet ez eus bet %d linenn dre embannadenn ziwezhañ an argerzh"
 msgstr[1] "Tizhet ez eus bet %d linenn dre embannadenn ziwezhañ an argerzh"
 
-#: libraries/rte/rte_routines.lib.php:1398
-#: libraries/rte/rte_routines.lib.php:1406
+#: libraries/rte/rte_routines.lib.php:1489
+#: libraries/rte/rte_routines.lib.php:1497
 msgid "Execute routine"
 msgstr "Seveniñ an argerzh"
 
-#: libraries/rte/rte_routines.lib.php:1485
-#: libraries/rte/rte_routines.lib.php:1488
+#: libraries/rte/rte_routines.lib.php:1576
+#: libraries/rte/rte_routines.lib.php:1579
 msgid "Routine parameters"
 msgstr ""
 
@@ -12545,7 +12561,7 @@ msgid "Original position"
 msgstr ""
 
 #: libraries/server_bin_log.lib.php:133
-#: templates/structure/display_table_stats.phtml:4
+#: templates/table/structure/display_table_stats.phtml:4
 msgid "Information"
 msgstr ""
 
@@ -12581,12 +12597,12 @@ msgid ""
 "between the web server and the MySQL server."
 msgstr ""
 
-#: libraries/server_databases.lib.php:364
-#: libraries/server_databases.lib.php:365
+#: libraries/server_databases.lib.php:366
+#: libraries/server_databases.lib.php:371
 msgid "Enable Statistics"
 msgstr ""
 
-#: libraries/server_databases.lib.php:481
+#: libraries/server_databases.lib.php:492
 #, fuzzy, php-format
 #| msgid "Database %s has been dropped."
 msgid "%1$d database has been dropped successfully."
@@ -12953,7 +12969,7 @@ msgid "You have revoked the privileges for %s."
 msgstr ""
 
 #: libraries/server_privileges.lib.php:2059
-#: libraries/server_privileges.lib.php:4290
+#: libraries/server_privileges.lib.php:4316
 #, fuzzy
 #| msgid "Add user"
 msgid "Add user account"
@@ -13124,56 +13140,56 @@ msgstr ""
 msgid "The privileges were reloaded successfully."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:3994
+#: libraries/server_privileges.lib.php:4003
 #, php-format
 msgid "The user %s already exists!"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4232
+#: libraries/server_privileges.lib.php:4258
 #, fuzzy, php-format
 #| msgid "Check Privileges"
 msgid "Privileges for %s"
 msgstr "Gwiriañ ar gwirioù"
 
-#: libraries/server_privileges.lib.php:4241
+#: libraries/server_privileges.lib.php:4267
 #: libraries/server_status_processes.lib.php:72
 #: libraries/server_user_groups.lib.php:39
 msgid "User"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4282
+#: libraries/server_privileges.lib.php:4308
 msgctxt "Create new user"
 msgid "New"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4311
+#: libraries/server_privileges.lib.php:4337
 #, fuzzy
 #| msgid "Reloading Privileges"
 msgid "Edit privileges:"
 msgstr "Oc'h adkargañ an dreistgwirioù"
 
-#: libraries/server_privileges.lib.php:4312
+#: libraries/server_privileges.lib.php:4338
 msgid "User account"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4371
+#: libraries/server_privileges.lib.php:4397
 msgid ""
 "Note: You are attempting to edit privileges of the user with which you are "
 "currently logged in."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4391 libraries/server_users.lib.php:25
+#: libraries/server_privileges.lib.php:4417 libraries/server_users.lib.php:25
 msgid "User accounts overview"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4459
+#: libraries/server_privileges.lib.php:4485
 msgid ""
 "A user account allowing any user from localhost to connect is present. This "
 "will prevent other users from connecting if the host part of their account "
 "allows a connection from any (%) host."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4500
+#: libraries/server_privileges.lib.php:4526
 #, php-format
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
@@ -13182,7 +13198,7 @@ msgid ""
 "%sreload the privileges%s before you continue."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4519
+#: libraries/server_privileges.lib.php:4545
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
 "tables. The content of these tables may differ from the privileges the "
@@ -13191,63 +13207,63 @@ msgid ""
 "privilege."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4569
+#: libraries/server_privileges.lib.php:4595
 msgid "The selected user was not found in the privilege table."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4801
+#: libraries/server_privileges.lib.php:4827
 msgid "You have added a new user."
 msgstr ""
 
-#: libraries/server_status.lib.php:53
+#: libraries/server_status.lib.php:60
 #, php-format
 msgid "Network traffic since startup: %s"
 msgstr ""
 
-#: libraries/server_status.lib.php:66
+#: libraries/server_status.lib.php:73
 #, php-format
 msgid "This MySQL server has been running for %1$s. It started up on %2$s."
 msgstr ""
 
-#: libraries/server_status.lib.php:80
+#: libraries/server_status.lib.php:94
 msgid ""
 "This MySQL server works as <b>master</b> and <b>slave</b> in <b>replication</"
 "b> process."
 msgstr ""
 
-#: libraries/server_status.lib.php:85
+#: libraries/server_status.lib.php:99
 msgid "This MySQL server works as <b>master</b> in <b>replication</b> process."
 msgstr ""
 
-#: libraries/server_status.lib.php:90
+#: libraries/server_status.lib.php:104
 msgid "This MySQL server works as <b>slave</b> in <b>replication</b> process."
 msgstr ""
 
-#: libraries/server_status.lib.php:106
+#: libraries/server_status.lib.php:116
 msgid "Replication status"
 msgstr ""
 
-#: libraries/server_status.lib.php:137
+#: libraries/server_status.lib.php:146
 msgid ""
 "On a busy server, the byte counters may overrun, so those statistics as "
 "reported by the MySQL server may be incorrect."
 msgstr ""
 
-#: libraries/server_status.lib.php:148
+#: libraries/server_status.lib.php:157
 msgid "Received"
 msgstr ""
 
-#: libraries/server_status.lib.php:167
+#: libraries/server_status.lib.php:176
 msgid "Sent"
 msgstr ""
 
-#: libraries/server_status.lib.php:234
+#: libraries/server_status.lib.php:243
 #, fuzzy
 #| msgid "Force SSL connection"
 msgid "Max. concurrent connections"
 msgstr "Rediañ ar c'hevreadennoù SSL"
 
-#: libraries/server_status.lib.php:244
+#: libraries/server_status.lib.php:253
 msgid "Failed attempts"
 msgstr ""
 
@@ -14214,7 +14230,7 @@ msgstr ""
 msgid "Not implemented yet."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/AlterOperation.php:193
+#: libraries/sql-parser/src/Components/AlterOperation.php:191
 msgid "Unrecognized alter operation."
 msgstr ""
 
@@ -14228,7 +14244,7 @@ msgid "An opening bracket followed by a set of values was expected."
 msgstr ""
 
 #: libraries/sql-parser/src/Components/ArrayObj.php:101
-#: libraries/sql-parser/src/Components/FieldDefinition.php:202
+#: libraries/sql-parser/src/Components/CreateDefinition.php:202
 msgid "An opening bracket was expected."
 msgstr ""
 
@@ -14236,25 +14252,35 @@ msgstr ""
 msgid "A comma or a closing bracket was expected"
 msgstr ""
 
+#: libraries/sql-parser/src/Components/CreateDefinition.php:246
+#, fuzzy
+#| msgid "No rows selected"
+msgid "A comma or a closing bracket was expected."
+msgstr "N'eus bet diuzet linenn ebet"
+
+#: libraries/sql-parser/src/Components/CreateDefinition.php:262
+msgid "A closing bracket was expected."
+msgstr ""
+
 #: libraries/sql-parser/src/Components/DataType.php:125
 msgid "Unrecognized data type."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:225
+#: libraries/sql-parser/src/Components/Expression.php:227
 msgid "Unexpected closing bracket."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:246
-#: libraries/sql-parser/src/Components/Expression.php:283
-#: libraries/sql-parser/src/Components/Expression.php:303
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:285
+#: libraries/sql-parser/src/Components/Expression.php:305
 msgid "An alias was previously found."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:257
+#: libraries/sql-parser/src/Components/Expression.php:259
 msgid "Unexpected dot."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:327
+#: libraries/sql-parser/src/Components/Expression.php:329
 #, fuzzy
 #| msgid "No rows selected"
 msgid "An alias was expected."
@@ -14266,16 +14292,6 @@ msgstr "N'eus bet diuzet linenn ebet"
 msgid "An expression was expected."
 msgstr "N'eus bet diuzet linenn ebet"
 
-#: libraries/sql-parser/src/Components/FieldDefinition.php:246
-#, fuzzy
-#| msgid "No rows selected"
-msgid "A comma or a closing bracket was expected."
-msgstr "N'eus bet diuzet linenn ebet"
-
-#: libraries/sql-parser/src/Components/FieldDefinition.php:262
-msgid "A closing bracket was expected."
-msgstr ""
-
 #: libraries/sql-parser/src/Components/Limit.php:90
 #: libraries/sql-parser/src/Components/Limit.php:112
 msgid "An offset was expected."
@@ -14317,29 +14333,29 @@ msgstr ""
 msgid "Expected delimiter."
 msgstr ""
 
-#: libraries/sql-parser/src/Lexer.php:753
+#: libraries/sql-parser/src/Lexer.php:777
 #, fuzzy, php-format
 #| msgid "Routine %1$s has been created."
 msgid "Ending quote %1$s was expected."
 msgstr "Krouet eo bet an argerzh %1s."
 
-#: libraries/sql-parser/src/Lexer.php:789
+#: libraries/sql-parser/src/Lexer.php:813
 #, fuzzy
 #| msgid "Table name template"
 msgid "Variable name was expected."
 msgstr "Patrom anv taolenn"
 
-#: libraries/sql-parser/src/Parser.php:380
+#: libraries/sql-parser/src/Parser.php:391
 #, fuzzy
 #| msgid "Number of inserted rows"
 msgid "Unexpected beginning of statement."
 msgstr "Niver a linennoù da ensoc'hañ"
 
-#: libraries/sql-parser/src/Parser.php:399
+#: libraries/sql-parser/src/Parser.php:410
 msgid "Unrecognized statement type."
 msgstr ""
 
-#: libraries/sql-parser/src/Parser.php:479
+#: libraries/sql-parser/src/Parser.php:489
 msgid "No transaction was previously started."
 msgstr ""
 
@@ -14365,8 +14381,10 @@ msgid "The name of the entity was expected."
 msgstr ""
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:310
-msgid "At least one field definition was expected."
-msgstr ""
+#, fuzzy
+#| msgid "The bookmark has been deleted."
+msgid "At least one column definition was expected."
+msgstr "Diverket eo bet ar sined."
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:329
 msgid "A \"RETURNS\" keyword was expected."
@@ -14441,25 +14459,25 @@ msgstr "Krouet eo bet ar sined %s"
 msgid "Using bookmark \"%s\" as default browse query."
 msgstr ""
 
-#: libraries/sql.lib.php:1306
+#: libraries/sql.lib.php:1300
 msgid "Showing as PHP code"
 msgstr ""
 
-#: libraries/sql.lib.php:1638
+#: libraries/sql.lib.php:1632
 #, php-format
 msgid ""
 "Current selection does not contain a unique column. Grid edit, checkbox, "
 "Edit, Copy and Delete features are not available. %s"
 msgstr ""
 
-#: libraries/sql.lib.php:1649
+#: libraries/sql.lib.php:1643
 #, php-format
 msgid ""
 "Current selection does not contain a unique column. Grid edit, Edit, Copy "
 "and Delete features may result in undesired behavior. %s"
 msgstr ""
 
-#: libraries/sql.lib.php:1688
+#: libraries/sql.lib.php:1682
 #, php-format
 msgid "Problems with indexes of table `%s`"
 msgstr ""
@@ -14624,7 +14642,7 @@ msgid "Version %s snapshot (SQL code)"
 msgstr ""
 
 #: libraries/tracking.lib.php:947
-#: templates/structure/table_structure_row.phtml:33
+#: templates/table/structure/table_structure_row.phtml:33
 msgctxt "None for default"
 msgid "None"
 msgstr ""
@@ -14679,15 +14697,15 @@ msgstr "Arventennoù pouezus all"
 msgid "Version %1$s was created, tracking for %2$s is active."
 msgstr ""
 
-#: libraries/user_preferences.inc.php:29
+#: libraries/user_preferences.inc.php:30
 msgid "Manage your settings"
 msgstr ""
 
-#: libraries/user_preferences.inc.php:46 prefs_manage.php:307
+#: libraries/user_preferences.inc.php:54 prefs_manage.php:307
 msgid "Configuration has been saved."
 msgstr ""
 
-#: libraries/user_preferences.inc.php:66
+#: libraries/user_preferences.inc.php:74
 #, php-format
 msgid ""
 "Your preferences will be saved for current session only. Storing them "
@@ -15077,7 +15095,7 @@ msgid "first"
 msgstr ""
 
 #: templates/columns_definitions/move_column.phtml:12
-#: templates/structure/add_column.phtml:21
+#: templates/table/structure/add_column.phtml:21
 #, php-format
 msgid "after %s"
 msgstr ""
@@ -15144,218 +15162,322 @@ msgstr ""
 msgid "Input transformation options"
 msgstr "Dibarzhioù diskwel an diazoù roadennoù"
 
-#: templates/designer/aggregate_query_panel.phtml:22
-#: templates/designer/options_panel.phtml:100
+#: templates/database/create_table.phtml:7
+#: templates/database/designer/side_menu.phtml:77
+#: templates/database/designer/side_menu.phtml:80
+msgid "Create table"
+msgstr ""
+
+#: templates/database/create_table.phtml:15
+msgid "Number of columns"
+msgstr ""
+
+#: templates/database/designer/aggregate_query_panel.phtml:22
+#: templates/database/designer/options_panel.phtml:100
 msgid "Aggregate"
 msgstr ""
 
-#: templates/designer/aggregate_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:61
-#: templates/designer/options_panel.phtml:106
-#: templates/designer/options_panel.phtml:170
-#: templates/designer/where_query_panel.phtml:30
-#: templates/table/table_header.phtml:9
+#: templates/database/designer/aggregate_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:61
+#: templates/database/designer/options_panel.phtml:106
+#: templates/database/designer/options_panel.phtml:170
+#: templates/database/designer/where_query_panel.phtml:30
+#: templates/table/search/table_header.phtml:9
 msgid "Operator"
 msgstr ""
 
-#: templates/designer/database_tables.phtml:29
+#: templates/database/designer/database_tables.phtml:29
 msgid "Toggle"
 msgstr ""
 
-#: templates/designer/database_tables.phtml:40
+#: templates/database/designer/database_tables.phtml:40
 #, fuzzy
 #| msgid "Databases"
 msgid "See table structure"
 msgstr "Diazoù roadennoù"
 
-#: templates/designer/delete_relation_panel.phtml:21
+#: templates/database/designer/delete_relation_panel.phtml:21
 msgid "Delete relation"
 msgstr ""
 
-#: templates/designer/edit_delete_pages.phtml:7
+#: templates/database/designer/edit_delete_pages.phtml:7
 #, fuzzy
 #| msgid "Page titles"
 msgid "Page to open"
 msgstr "Titloù pajennoù"
 
-#: templates/designer/edit_delete_pages.phtml:7
+#: templates/database/designer/edit_delete_pages.phtml:7
 #, fuzzy
 #| msgid "Page titles"
 msgid "Page to delete"
 msgstr "Titloù pajennoù"
 
-#: templates/designer/having_query_panel.phtml:90
-#: templates/designer/options_panel.phtml:63
-#: templates/designer/options_panel.phtml:229
-#: templates/designer/where_query_panel.phtml:59
+#: templates/database/designer/having_query_panel.phtml:90
+#: templates/database/designer/options_panel.phtml:63
+#: templates/database/designer/options_panel.phtml:229
+#: templates/database/designer/where_query_panel.phtml:59
 msgid "Except"
 msgstr ""
 
-#: templates/designer/having_query_panel.phtml:102
-#: templates/designer/options_panel.phtml:75
-#: templates/designer/options_panel.phtml:241
-#: templates/designer/where_query_panel.phtml:71
+#: templates/database/designer/having_query_panel.phtml:102
+#: templates/database/designer/options_panel.phtml:75
+#: templates/database/designer/options_panel.phtml:241
+#: templates/database/designer/where_query_panel.phtml:71
 msgid "subquery"
 msgstr ""
 
-#: templates/designer/new_relation_panel.phtml:22
-#: templates/designer/side_menu.phtml:84 templates/designer/side_menu.phtml:87
+#: templates/database/designer/new_relation_panel.phtml:22
+#: templates/database/designer/side_menu.phtml:84
+#: templates/database/designer/side_menu.phtml:87
 msgid "Create relation"
 msgstr ""
 
-#: templates/designer/options_panel.phtml:34
-#: templates/designer/options_panel.phtml:200
+#: templates/database/designer/options_panel.phtml:34
+#: templates/database/designer/options_panel.phtml:200
 msgid "Relation operator"
 msgstr ""
 
-#: templates/designer/options_panel.phtml:85
-#: templates/designer/rename_to_panel.phtml:23
+#: templates/database/designer/options_panel.phtml:85
+#: templates/database/designer/rename_to_panel.phtml:23
 msgid "Rename to"
 msgstr ""
 
-#: templates/designer/options_panel.phtml:91
-#: templates/designer/rename_to_panel.phtml:31
+#: templates/database/designer/options_panel.phtml:91
+#: templates/database/designer/rename_to_panel.phtml:31
 msgid "New name"
 msgstr ""
 
-#: templates/designer/page_save_as.phtml:4
+#: templates/database/designer/page_save_as.phtml:4
 #, fuzzy
 #| msgid "Invalid table name"
 msgid "Save to selected page"
 msgstr "Anv taolenn direizh"
 
-#: templates/designer/page_save_as.phtml:5
+#: templates/database/designer/page_save_as.phtml:5
 msgid "Create a page and save to it"
 msgstr ""
 
-#: templates/designer/page_save_as.phtml:26
+#: templates/database/designer/page_save_as.phtml:26
 msgid "New page name"
 msgstr ""
 
-#: templates/designer/page_selector.phtml:2
+#: templates/database/designer/page_selector.phtml:2
 msgid "Select page"
 msgstr ""
 
-#: templates/designer/query_details.phtml:10
+#: templates/database/designer/query_details.phtml:10
 msgid "Active options"
 msgstr ""
 
-#: templates/designer/schema_export.phtml:4
+#: templates/database/designer/schema_export.phtml:4
 msgid "Select Export Relational Type"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:19 templates/designer/side_menu.phtml:25
+#: templates/database/designer/side_menu.phtml:19
+#: templates/database/designer/side_menu.phtml:25
 #, fuzzy
 #| msgid "Show all"
 msgid "Show/Hide tables list"
 msgstr "Diskouez pep tra"
 
-#: templates/designer/side_menu.phtml:29 templates/designer/side_menu.phtml:35
-#: templates/designer/side_menu.phtml:36
+#: templates/database/designer/side_menu.phtml:29
+#: templates/database/designer/side_menu.phtml:35
+#: templates/database/designer/side_menu.phtml:36
 msgid "View in fullscreen"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:34
+#: templates/database/designer/side_menu.phtml:34
 msgid "Exit fullscreen"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:41 templates/designer/side_menu.phtml:45
+#: templates/database/designer/side_menu.phtml:41
+#: templates/database/designer/side_menu.phtml:45
 #, fuzzy
 #| msgctxt "PDF"
 #| msgid "page"
 msgid "New page"
 msgstr "Kemmañ"
 
-#: templates/designer/side_menu.phtml:70 templates/designer/side_menu.phtml:73
+#: templates/database/designer/side_menu.phtml:70
+#: templates/database/designer/side_menu.phtml:73
 #, fuzzy
 #| msgid "Delete"
 msgid "Delete pages"
 msgstr "Diverkañ"
 
-#: templates/designer/side_menu.phtml:77 templates/designer/side_menu.phtml:80
-#: templates/table/create_table.phtml:7
-msgid "Create table"
-msgstr ""
-
-#: templates/designer/side_menu.phtml:98
-#: templates/designer/side_menu.phtml:101
+#: templates/database/designer/side_menu.phtml:98
+#: templates/database/designer/side_menu.phtml:101
 msgid "Reload"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:107
-#: templates/designer/side_menu.phtml:110
+#: templates/database/designer/side_menu.phtml:107
+#: templates/database/designer/side_menu.phtml:110
 msgid "Help"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Angular links"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Direct links"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:122
-#: templates/designer/side_menu.phtml:124
+#: templates/database/designer/side_menu.phtml:122
+#: templates/database/designer/side_menu.phtml:124
 msgid "Snap to grid"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:128
-#: templates/designer/side_menu.phtml:134
+#: templates/database/designer/side_menu.phtml:128
+#: templates/database/designer/side_menu.phtml:134
 msgid "Small/Big All"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:138
-#: templates/designer/side_menu.phtml:141
+#: templates/database/designer/side_menu.phtml:138
+#: templates/database/designer/side_menu.phtml:141
 msgid "Toggle small/big"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:145
-#: templates/designer/side_menu.phtml:148
+#: templates/database/designer/side_menu.phtml:145
+#: templates/database/designer/side_menu.phtml:148
 msgid "Toggle relation lines"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:153
-#: templates/designer/side_menu.phtml:156
+#: templates/database/designer/side_menu.phtml:153
+#: templates/database/designer/side_menu.phtml:156
 #, fuzzy
 #| msgid "Export"
 msgid "Export schema"
 msgstr "Ezporzhiañ"
 
-#: templates/designer/side_menu.phtml:165
-#: templates/designer/side_menu.phtml:168
+#: templates/database/designer/side_menu.phtml:165
+#: templates/database/designer/side_menu.phtml:168
 msgid "Build Query"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:173
-#: templates/designer/side_menu.phtml:177
+#: templates/database/designer/side_menu.phtml:173
+#: templates/database/designer/side_menu.phtml:177
 msgid "Move Menu"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:181
-#: templates/designer/side_menu.phtml:186
+#: templates/database/designer/side_menu.phtml:181
+#: templates/database/designer/side_menu.phtml:186
 #, fuzzy
 #| msgid "Point"
 msgid "Pin text"
 msgstr "Poent"
 
-#: templates/designer/table_list.phtml:4
+#: templates/database/designer/table_list.phtml:4
 msgid "Hide/Show all"
 msgstr ""
 
-#: templates/designer/table_list.phtml:14
+#: templates/database/designer/table_list.phtml:14
 msgid "Hide/Show Tables with no relation"
 msgstr ""
 
-#: templates/designer/table_list.phtml:59
+#: templates/database/designer/table_list.phtml:59
 #, fuzzy
 #| msgid "Number of inserted rows"
 msgid "Number of tables:"
 msgstr "Niver a linennoù da ensoc'hañ"
 
+#: templates/database/structure/body_for_table_summary.phtml:6
+#, php-format
+msgid "%s table"
+msgid_plural "%s tables"
+msgstr[0] "%s daolenn"
+msgstr[1] "%s taolenn"
+
+#: templates/database/structure/body_for_table_summary.phtml:17
+msgid "Sum"
+msgstr "Sammad"
+
+#: templates/database/structure/check_all_tables.phtml:6
+msgid "Check tables having overhead"
+msgstr "Askañ an taolennoù gant dilerc'hioù"
+
+#: templates/database/structure/check_all_tables.phtml:10
+#, fuzzy
+#| msgid "Show all"
+msgid "Show create"
+msgstr "Diskouez pep tra"
+
+#: templates/database/structure/check_all_tables.phtml:27
+msgid "Prefix"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:28
+msgid "Add prefix to table"
+msgstr "Ouzhpennañ ur rakger d'an daolenn"
+
+#: templates/database/structure/check_all_tables.phtml:29
+msgid "Replace table prefix"
+msgstr "Erlec'hiañ rakger an daolenn"
+
+#: templates/database/structure/check_all_tables.phtml:30
+msgid "Copy table with prefix"
+msgstr "Eilañ an daolenn enni ur rakger"
+
+#: templates/database/structure/check_all_tables.phtml:36
+#, fuzzy
+#| msgid "CHAR textarea columns"
+msgid "Add columns to central list"
+msgstr "Bannoù evit an takadoù skrid CHAR"
+
+#: templates/database/structure/check_all_tables.phtml:37
+msgid "Remove columns from central list"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:38
+#, fuzzy
+#| msgid "CHAR textarea columns"
+msgid "Make consistent with central list"
+msgstr "Bannoù evit an takadoù skrid CHAR"
+
+#: templates/database/structure/favorite_anchor.phtml:12
+#, fuzzy
+#| msgid "Add user"
+msgid "Add to Favorites"
+msgstr "Ouzhpennañ un implijer"
+
+#: templates/database/structure/show_create.phtml:2
+msgid "Showing create queries"
+msgstr ""
+
+#: templates/database/structure/sortable_header.phtml:13
+msgid "Sort"
+msgstr "Urzhiañ"
+
+#: templates/database/structure/table_header.phtml:42
+#, fuzzy
+#| msgid "Error moving the uploaded file, see [doc@faq1-11]FAQ 1.11[/doc]"
+msgid ""
+"May be approximate. Click on the number to get the exact count. See "
+"[doc@faq3-11]FAQ 3.11[/doc]."
+msgstr ""
+"Fazi en ur zilec'hiañ ar restr pellgarget; gwelet [doc@faq1-11]FAQ 1.11[/doc]"
+
+#: templates/database/structure/table_header.phtml:66
+#: templates/table/index_form.phtml:127
+msgid "Size"
+msgstr "Ment"
+
+#: templates/database/structure/table_header.phtml:74
+#: templates/table/structure/display_table_stats.phtml:27
+msgid "Overhead"
+msgstr "Dilerc'hioù"
+
+#: templates/database/structure/tracking_icon.phtml:4
+msgid "Tracking is active."
+msgstr "Oberiant eo an heuliañ."
+
+#: templates/database/structure/tracking_icon.phtml:8
+msgid "Tracking is not active."
+msgstr "N'eo ket oberiant an heuliañ."
+
 #: templates/error/report_form.phtml:7
 msgid ""
 "phpMyAdmin has encountered an error. We have collected data about this error "
@@ -15371,65 +15493,6 @@ msgstr ""
 msgid "Please explain the steps that lead to the error:"
 msgstr ""
 
-#: templates/gis_visualization/gis_visualization.phtml:3
-msgid "Display GIS Visualization"
-msgstr ""
-
-#: templates/gis_visualization/gis_visualization.phtml:8
-msgid "Label column"
-msgstr ""
-
-#: templates/gis_visualization/gis_visualization.phtml:11
-msgid "-- None --"
-msgstr ""
-
-#: templates/gis_visualization/gis_visualization.phtml:19
-msgid "Spatial column"
-msgstr ""
-
-#: templates/index_form.phtml:16
-msgid "Index name:"
-msgstr ""
-
-#: templates/index_form.phtml:19
-msgid ""
-"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
-msgstr ""
-
-#: templates/index_form.phtml:40
-#, fuzzy
-#| msgid "Indexes"
-msgid "Index choice:"
-msgstr "Menegerioù"
-
-#: templates/index_form.phtml:57
-msgid "Key block size:"
-msgstr ""
-
-#: templates/index_form.phtml:74
-msgid "Index type:"
-msgstr ""
-
-#: templates/index_form.phtml:86
-#, fuzzy
-#| msgid "Username:"
-msgid "Parser:"
-msgstr "Anv implijer :"
-
-#: templates/index_form.phtml:102
-#, fuzzy
-#| msgid "Comment"
-msgid "Comment:"
-msgstr "Evezhiadenn"
-
-#: templates/index_form.phtml:127 templates/structure/table_header.phtml:66
-msgid "Size"
-msgstr "Ment"
-
-#: templates/index_form.phtml:149 templates/index_form.phtml:190
-msgid "Drag to reorder"
-msgstr ""
-
 #: templates/prefs_autoload.phtml:9
 msgid ""
 "Your browser has phpMyAdmin configuration for this domain. Would you like to "
@@ -15442,325 +15505,26 @@ msgstr ""
 msgid "Start row:"
 msgstr "Urzhiañ"
 
-#: templates/structure/actions_in_table_structure.phtml:14
-#, php-format
-msgid "A primary key has been added on %s."
-msgstr ""
-
-#: templates/structure/actions_in_table_structure.phtml:34
-#: templates/structure/actions_in_table_structure.phtml:54
-#: templates/structure/actions_in_table_structure.phtml:79
-#: templates/structure/actions_in_table_structure.phtml:101
-#, php-format
-msgid "An index has been added on %s."
-msgstr ""
-
-#: templates/structure/actions_in_table_structure.phtml:130
-#: templates/structure/check_all_table_column.phtml:59
-#, fuzzy
-#| msgid "Remove chart"
-msgid "Remove from central columns"
-msgstr "Dilemel ar grafik"
-
-#: templates/structure/actions_in_table_structure.phtml:138
-#: templates/structure/check_all_table_column.phtml:55
-#, fuzzy
-#| msgid "CHAR textarea columns"
-msgid "Add to central columns"
-msgstr "Bannoù evit an takadoù skrid CHAR"
-
-#: templates/structure/add_column.phtml:7
-#, php-format
-msgid "Add %s column(s)"
-msgstr ""
-
-#: templates/structure/add_column.phtml:12
-#, fuzzy
-#| msgid "Number of inserted rows"
-msgid "at beginning of table"
-msgstr "Niver a linennoù da ensoc'hañ"
-
-#: templates/structure/body_for_table_summary.phtml:6
-#, php-format
-msgid "%s table"
-msgid_plural "%s tables"
-msgstr[0] "%s daolenn"
-msgstr[1] "%s taolenn"
-
-#: templates/structure/body_for_table_summary.phtml:17
-msgid "Sum"
-msgstr "Sammad"
-
-#: templates/structure/check_all_tables.phtml:6
-msgid "Check tables having overhead"
-msgstr "Askañ an taolennoù gant dilerc'hioù"
-
-#: templates/structure/check_all_tables.phtml:10
-#, fuzzy
-#| msgid "Show all"
-msgid "Show create"
-msgstr "Diskouez pep tra"
-
-#: templates/structure/check_all_tables.phtml:27
-msgid "Prefix"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:28
-msgid "Add prefix to table"
-msgstr "Ouzhpennañ ur rakger d'an daolenn"
-
-#: templates/structure/check_all_tables.phtml:29
-msgid "Replace table prefix"
-msgstr "Erlec'hiañ rakger an daolenn"
-
-#: templates/structure/check_all_tables.phtml:30
-msgid "Copy table with prefix"
-msgstr "Eilañ an daolenn enni ur rakger"
-
-#: templates/structure/check_all_tables.phtml:36
-#, fuzzy
-#| msgid "CHAR textarea columns"
-msgid "Add columns to central list"
-msgstr "Bannoù evit an takadoù skrid CHAR"
-
-#: templates/structure/check_all_tables.phtml:37
-msgid "Remove columns from central list"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:38
-#, fuzzy
-#| msgid "CHAR textarea columns"
-msgid "Make consistent with central list"
-msgstr "Bannoù evit an takadoù skrid CHAR"
-
-#: templates/structure/display_structure.phtml:140 view_create.php:181
-#, fuzzy
-#| msgid "Print view"
-msgid "Edit view"
-msgstr "Stumm da voullañ"
-
-#: templates/structure/display_table_stats.phtml:9
-msgid "Space usage"
-msgstr ""
-
-#: templates/structure/display_table_stats.phtml:27
-#: templates/structure/table_header.phtml:74
-msgid "Overhead"
-msgstr "Dilerc'hioù"
-
-#: templates/structure/display_table_stats.phtml:32
-msgid "Effective"
-msgstr ""
-
-#: templates/structure/favorite_anchor.phtml:12
-#, fuzzy
-#| msgid "Add user"
-msgid "Add to Favorites"
-msgstr "Ouzhpennañ un implijer"
-
-#: templates/structure/move_columns_dialog.phtml:1
-#: templates/structure/optional_action_links.phtml:21
-#, fuzzy
-#| msgid "Add/Delete columns"
-msgid "Move columns"
-msgstr "Ouzhpennañ/Diverkañ bannoù"
-
-#: templates/structure/move_columns_dialog.phtml:2
-msgid "Move the columns by dragging them up and down."
-msgstr ""
-
-#: templates/structure/optional_action_links.phtml:9
-msgid "Propose table structure"
-msgstr ""
-
-#: templates/structure/optional_action_links.phtml:24
-#, fuzzy
-#| msgid "Databases"
-msgid "Improve table structure"
-msgstr "Diazoù roadennoù"
-
-#: templates/structure/optional_action_links.phtml:30
-#, fuzzy
-#| msgid "Track table"
-msgid "Track view"
-msgstr "Heuliañ an daolenn"
-
-#: templates/structure/row_stats_table.phtml:3
-#, fuzzy
-#| msgid "Query statistics"
-msgid "Row statistics"
-msgstr "Stadegoù war ar rekedoù"
-
-#: templates/structure/row_stats_table.phtml:9
-msgid "static"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:11
-msgid "dynamic"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:22
-msgid "partitioned"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:54
-msgid "Row length"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:66
-msgid "Row size"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:73
-msgid "Next autoindex"
-msgstr ""
-
-#: templates/structure/secondary_tabs.phtml:14
-#, fuzzy
-#| msgid "Relations"
-msgid "Relation view"
-msgstr "Darempredoù"
-
-#: templates/structure/show_create.phtml:2
-msgid "Showing create queries"
-msgstr ""
-
-#: templates/structure/sortable_header.phtml:13
-msgid "Sort"
-msgstr "Urzhiañ"
-
-#: templates/structure/table_header.phtml:42
-#, fuzzy
-#| msgid "Error moving the uploaded file, see [doc@faq1-11]FAQ 1.11[/doc]"
-msgid ""
-"May be approximate. Click on the number to get the exact count. See "
-"[doc@faq3-11]FAQ 3.11[/doc]."
-msgstr ""
-"Fazi en ur zilec'hiañ ar restr pellgarget; gwelet [doc@faq1-11]FAQ 1.11[/doc]"
-
-#: templates/structure/table_structure_row.phtml:46
-#, php-format
-msgid "Column %s has been dropped."
-msgstr ""
-
-#: templates/structure/tracking_icon.phtml:4
-msgid "Tracking is active."
-msgstr "Oberiant eo an heuliañ."
-
-#: templates/structure/tracking_icon.phtml:8
-msgid "Tracking is not active."
-msgstr "N'eo ket oberiant an heuliañ."
-
-#: templates/table/create_table.phtml:15
-msgid "Number of columns"
-msgstr ""
-
-#: templates/table/options.phtml:8
-msgid "Select columns (at least one):"
-msgstr ""
-
-#: templates/table/options.phtml:37
-msgid "Add search conditions (body of the \"where\" clause):"
-msgstr ""
-
-#: templates/table/options.phtml:45
-msgid "Number of rows per page"
-msgstr ""
-
-#: templates/table/options.phtml:56
-msgid "Display order:"
-msgstr ""
-
-#: templates/table/options_zoom.phtml:6
-msgid "Use this column to label each point"
-msgstr ""
-
-#: templates/table/options_zoom.phtml:35
-msgid "Maximum rows to plot"
-msgstr ""
-
-#: templates/table/replace_preview.phtml:13
-msgid "Find and replace - preview"
-msgstr ""
-
-#: templates/table/replace_preview.phtml:18
-#, fuzzy
-#| msgid "Linestring"
-msgid "Original string"
-msgstr "Aradennad linennoù"
-
-#: templates/table/replace_preview.phtml:19
-#, fuzzy
-#| msgid "Replace table prefix"
-msgid "Replaced string"
-msgstr "Erlec'hiañ rakger an daolenn"
-
-#: templates/table/replace_preview.phtml:40
-#, fuzzy
-#| msgid "Replicated"
-msgid "Replace"
-msgstr "Eilet"
-
-#: templates/table/rows_zoom.phtml:16
-#, fuzzy
-#| msgid "Hide search criteria"
-msgid "Additional search criteria"
-msgstr "Kuzhat an dezverkoù klask"
-
-#: templates/table/search_and_replace.phtml:3
-#, fuzzy
-#| msgid "Replace NULL by"
-msgid "Replace with:"
-msgstr "Erlec'hiañ NULL gant"
-
-#: templates/table/search_and_replace.phtml:22
-#, fuzzy
-#| msgid "as regular expression"
-msgid "Use regular expression"
-msgstr "evel un droienn reoliek"
-
-#: templates/table/selection_form.phtml:12
-msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
-msgstr ""
-
-#: templates/table/selection_form.phtml:34
-msgid "Do a \"query by example\" (wildcard: \"%\")"
-msgstr ""
-
-#: templates/table/zoom_result_form.phtml:7
-msgid "Browse/Edit the points"
-msgstr ""
-
-#: templates/table/zoom_result_form.phtml:15
-msgid "How to use"
-msgstr ""
-
-#: templates/table/zoom_result_form.phtml:23
-#, fuzzy
-#| msgid "Reset"
-msgid "Reset zoom"
-msgstr "Adderaouekaat"
-
-#: templates/tbl_chart.phtml:17
+#: templates/table/chart/tbl_chart.phtml:17
 #, fuzzy
 #| msgid "Mar"
 msgctxt "Chart type"
 msgid "Bar"
 msgstr "Meu"
 
-#: templates/tbl_chart.phtml:21
+#: templates/table/chart/tbl_chart.phtml:21
 #, fuzzy
 #| msgid "Column"
 msgctxt "Chart type"
 msgid "Column"
 msgstr "Bann"
 
-#: templates/tbl_chart.phtml:25
+#: templates/table/chart/tbl_chart.phtml:25
 msgctxt "Chart type"
 msgid "Line"
 msgstr ""
 
-#: templates/tbl_chart.phtml:29
+#: templates/table/chart/tbl_chart.phtml:29
 #, fuzzy
 #| msgctxt "Inline edit query"
 #| msgid "Inline"
@@ -15768,153 +15532,414 @@ msgctxt "Chart type"
 msgid "Spline"
 msgstr "Enlinenn"
 
-#: templates/tbl_chart.phtml:33
+#: templates/table/chart/tbl_chart.phtml:33
 msgctxt "Chart type"
 msgid "Area"
 msgstr ""
 
-#: templates/tbl_chart.phtml:37
+#: templates/table/chart/tbl_chart.phtml:37
 #, fuzzy
 #| msgid "PiB"
 msgctxt "Chart type"
 msgid "Pie"
 msgstr "Pio"
 
-#: templates/tbl_chart.phtml:41
+#: templates/table/chart/tbl_chart.phtml:41
 #, fuzzy
 #| msgid "Theme"
 msgctxt "Chart type"
 msgid "Timeline"
 msgstr "Tem"
 
-#: templates/tbl_chart.phtml:45
+#: templates/table/chart/tbl_chart.phtml:45
 msgctxt "Chart type"
 msgid "Scatter"
 msgstr ""
 
-#: templates/tbl_chart.phtml:50
+#: templates/table/chart/tbl_chart.phtml:50
 msgid "Stacked"
 msgstr ""
 
-#: templates/tbl_chart.phtml:53
+#: templates/table/chart/tbl_chart.phtml:53
 msgid "Chart title"
 msgstr ""
 
-#: templates/tbl_chart.phtml:57
+#: templates/table/chart/tbl_chart.phtml:57
 msgid "X-Axis:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:72
+#: templates/table/chart/tbl_chart.phtml:72
 msgid "Series:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:102
+#: templates/table/chart/tbl_chart.phtml:102
 msgid "X-Axis label:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:104
+#: templates/table/chart/tbl_chart.phtml:104
 msgid "X Values"
 msgstr ""
 
-#: templates/tbl_chart.phtml:107
+#: templates/table/chart/tbl_chart.phtml:107
 msgid "Y-Axis label:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:115
+#: templates/table/chart/tbl_chart.phtml:115
 msgid "Series names are in a column"
 msgstr ""
 
-#: templates/tbl_chart.phtml:118
+#: templates/table/chart/tbl_chart.phtml:118
 #, fuzzy
 #| msgid "Inside column:"
 msgid "Series column:"
 msgstr "Er bann :"
 
-#: templates/tbl_chart.phtml:130
+#: templates/table/chart/tbl_chart.phtml:130
 #, fuzzy
 #| msgid "Values for the column \"%s\""
 msgid "Value Column:"
 msgstr "Talvoudoù evit ar bann \"%s\""
 
-#: templates/tbl_chart.phtml:150
+#: templates/table/chart/tbl_chart.phtml:150
 #, fuzzy
 #| msgid "Save as file"
 msgid "Save chart as image"
 msgstr "Enrollañ evel restr"
 
-#: templates/tbl_relation/common_form.phtml:7
+#: templates/table/gis_visualization/gis_visualization.phtml:3
+msgid "Display GIS Visualization"
+msgstr ""
+
+#: templates/table/gis_visualization/gis_visualization.phtml:8
+msgid "Label column"
+msgstr ""
+
+#: templates/table/gis_visualization/gis_visualization.phtml:11
+msgid "-- None --"
+msgstr ""
+
+#: templates/table/gis_visualization/gis_visualization.phtml:19
+msgid "Spatial column"
+msgstr ""
+
+#: templates/table/index_form.phtml:16
+msgid "Index name:"
+msgstr ""
+
+#: templates/table/index_form.phtml:19
+msgid ""
+"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
+msgstr ""
+
+#: templates/table/index_form.phtml:40
+#, fuzzy
+#| msgid "Indexes"
+msgid "Index choice:"
+msgstr "Menegerioù"
+
+#: templates/table/index_form.phtml:57
+msgid "Key block size:"
+msgstr ""
+
+#: templates/table/index_form.phtml:74
+msgid "Index type:"
+msgstr ""
+
+#: templates/table/index_form.phtml:86
+#, fuzzy
+#| msgid "Username:"
+msgid "Parser:"
+msgstr "Anv implijer :"
+
+#: templates/table/index_form.phtml:102
+#, fuzzy
+#| msgid "Comment"
+msgid "Comment:"
+msgstr "Evezhiadenn"
+
+#: templates/table/index_form.phtml:149 templates/table/index_form.phtml:190
+msgid "Drag to reorder"
+msgstr ""
+
+#: templates/table/relation/common_form.phtml:7
 #, fuzzy
 #| msgid "The bookmark has been deleted."
 msgid "Internal relations"
 msgstr "Diverket eo bet ar sined."
 
-#: templates/tbl_relation/common_form.phtml:11
+#: templates/table/relation/common_form.phtml:11
 msgid "Internal relation"
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:14
+#: templates/table/relation/common_form.phtml:14
 msgid ""
 "An internal relation is not necessary when a corresponding FOREIGN KEY "
 "relation exists."
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:37
+#: templates/table/relation/common_form.phtml:37
 #, fuzzy
 #| msgid "Foreign key limit"
 msgid "Foreign key constraints"
 msgstr "Bevenn evit an alc'hwezioù estren"
 
-#: templates/tbl_relation/common_form.phtml:40
+#: templates/table/relation/common_form.phtml:40
 #, fuzzy
 #| msgid "Action"
 msgid "Actions"
 msgstr "Oberiadenn"
 
-#: templates/tbl_relation/common_form.phtml:41
+#: templates/table/relation/common_form.phtml:41
 #, fuzzy
 #| msgid "Add constraints"
 msgid "Constraint properties"
 msgstr "Ouzhpennañ ar strishadurioù"
 
-#: templates/tbl_relation/common_form.phtml:44
+#: templates/table/relation/common_form.phtml:44
 msgid ""
 "Only columns with index will be displayed. You can define an index below."
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:49
+#: templates/table/relation/common_form.phtml:49
 msgid "Foreign key constraint"
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:81
+#: templates/table/relation/common_form.phtml:81
 #, fuzzy
 #| msgid "Add constraints"
 msgid "+ Add constraint"
 msgstr "Ouzhpennañ ar strishadurioù"
 
-#: templates/tbl_relation/common_form.phtml:91
+#: templates/table/relation/common_form.phtml:91
 #, fuzzy
 #| msgid "Choose column to display"
 msgid "Choose column to display:"
 msgstr "Dibab ar bann da ziskouez"
 
-#: templates/tbl_relation/foreign_key_row.phtml:13
+#: templates/table/relation/foreign_key_row.phtml:13
 #, fuzzy, php-format
 #| msgid "Foreign key limit"
 msgid "Foreign key constraint %s has been dropped"
 msgstr "Bevenn evit an alc'hwezioù estren"
 
-#: templates/tbl_relation/foreign_key_row.phtml:102
+#: templates/table/relation/foreign_key_row.phtml:102
 #, fuzzy
 #| msgid "Add constraints"
 msgid "Constraint name"
 msgstr "Ouzhpennañ ar strishadurioù"
 
-#: templates/tbl_relation/foreign_key_row.phtml:157
+#: templates/table/relation/foreign_key_row.phtml:157
 #, fuzzy
 #| msgid "Add/Delete columns"
 msgid "+ Add column"
 msgstr "Ouzhpennañ/Diverkañ bannoù"
 
+#: templates/table/search/options.phtml:8
+msgid "Select columns (at least one):"
+msgstr ""
+
+#: templates/table/search/options.phtml:37
+msgid "Add search conditions (body of the \"where\" clause):"
+msgstr ""
+
+#: templates/table/search/options.phtml:45
+msgid "Number of rows per page"
+msgstr ""
+
+#: templates/table/search/options.phtml:56
+msgid "Display order:"
+msgstr ""
+
+#: templates/table/search/options_zoom.phtml:6
+msgid "Use this column to label each point"
+msgstr ""
+
+#: templates/table/search/options_zoom.phtml:35
+msgid "Maximum rows to plot"
+msgstr ""
+
+#: templates/table/search/replace_preview.phtml:13
+msgid "Find and replace - preview"
+msgstr ""
+
+#: templates/table/search/replace_preview.phtml:18
+#, fuzzy
+#| msgid "Linestring"
+msgid "Original string"
+msgstr "Aradennad linennoù"
+
+#: templates/table/search/replace_preview.phtml:19
+#, fuzzy
+#| msgid "Replace table prefix"
+msgid "Replaced string"
+msgstr "Erlec'hiañ rakger an daolenn"
+
+#: templates/table/search/replace_preview.phtml:40
+#, fuzzy
+#| msgid "Replicated"
+msgid "Replace"
+msgstr "Eilet"
+
+#: templates/table/search/rows_zoom.phtml:16
+#, fuzzy
+#| msgid "Hide search criteria"
+msgid "Additional search criteria"
+msgstr "Kuzhat an dezverkoù klask"
+
+#: templates/table/search/search_and_replace.phtml:3
+#, fuzzy
+#| msgid "Replace NULL by"
+msgid "Replace with:"
+msgstr "Erlec'hiañ NULL gant"
+
+#: templates/table/search/search_and_replace.phtml:22
+#, fuzzy
+#| msgid "as regular expression"
+msgid "Use regular expression"
+msgstr "evel un droienn reoliek"
+
+#: templates/table/search/selection_form.phtml:12
+msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
+msgstr ""
+
+#: templates/table/search/selection_form.phtml:34
+msgid "Do a \"query by example\" (wildcard: \"%\")"
+msgstr ""
+
+#: templates/table/search/zoom_result_form.phtml:7
+msgid "Browse/Edit the points"
+msgstr ""
+
+#: templates/table/search/zoom_result_form.phtml:15
+msgid "How to use"
+msgstr ""
+
+#: templates/table/search/zoom_result_form.phtml:23
+#, fuzzy
+#| msgid "Reset"
+msgid "Reset zoom"
+msgstr "Adderaouekaat"
+
+#: templates/table/secondary_tabs.phtml:14
+#, fuzzy
+#| msgid "Relations"
+msgid "Relation view"
+msgstr "Darempredoù"
+
+#: templates/table/structure/actions_in_table_structure.phtml:14
+#, php-format
+msgid "A primary key has been added on %s."
+msgstr ""
+
+#: templates/table/structure/actions_in_table_structure.phtml:34
+#: templates/table/structure/actions_in_table_structure.phtml:54
+#: templates/table/structure/actions_in_table_structure.phtml:79
+#: templates/table/structure/actions_in_table_structure.phtml:101
+#, php-format
+msgid "An index has been added on %s."
+msgstr ""
+
+#: templates/table/structure/actions_in_table_structure.phtml:130
+#: templates/table/structure/check_all_table_column.phtml:59
+#, fuzzy
+#| msgid "Remove chart"
+msgid "Remove from central columns"
+msgstr "Dilemel ar grafik"
+
+#: templates/table/structure/actions_in_table_structure.phtml:138
+#: templates/table/structure/check_all_table_column.phtml:55
+#, fuzzy
+#| msgid "CHAR textarea columns"
+msgid "Add to central columns"
+msgstr "Bannoù evit an takadoù skrid CHAR"
+
+#: templates/table/structure/add_column.phtml:7
+#, php-format
+msgid "Add %s column(s)"
+msgstr ""
+
+#: templates/table/structure/add_column.phtml:12
+#, fuzzy
+#| msgid "Number of inserted rows"
+msgid "at beginning of table"
+msgstr "Niver a linennoù da ensoc'hañ"
+
+#: templates/table/structure/display_structure.phtml:140 view_create.php:181
+#, fuzzy
+#| msgid "Print view"
+msgid "Edit view"
+msgstr "Stumm da voullañ"
+
+#: templates/table/structure/display_table_stats.phtml:9
+msgid "Space usage"
+msgstr ""
+
+#: templates/table/structure/display_table_stats.phtml:32
+msgid "Effective"
+msgstr ""
+
+#: templates/table/structure/move_columns_dialog.phtml:1
+#: templates/table/structure/optional_action_links.phtml:21
+#, fuzzy
+#| msgid "Add/Delete columns"
+msgid "Move columns"
+msgstr "Ouzhpennañ/Diverkañ bannoù"
+
+#: templates/table/structure/move_columns_dialog.phtml:2
+msgid "Move the columns by dragging them up and down."
+msgstr ""
+
+#: templates/table/structure/optional_action_links.phtml:9
+msgid "Propose table structure"
+msgstr ""
+
+#: templates/table/structure/optional_action_links.phtml:24
+#, fuzzy
+#| msgid "Databases"
+msgid "Improve table structure"
+msgstr "Diazoù roadennoù"
+
+#: templates/table/structure/optional_action_links.phtml:30
+#, fuzzy
+#| msgid "Track table"
+msgid "Track view"
+msgstr "Heuliañ an daolenn"
+
+#: templates/table/structure/row_stats_table.phtml:3
+#, fuzzy
+#| msgid "Query statistics"
+msgid "Row statistics"
+msgstr "Stadegoù war ar rekedoù"
+
+#: templates/table/structure/row_stats_table.phtml:9
+msgid "static"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:11
+msgid "dynamic"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:22
+msgid "partitioned"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:54
+msgid "Row length"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:66
+msgid "Row size"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:73
+msgid "Next autoindex"
+msgstr ""
+
+#: templates/table/structure/table_structure_row.phtml:46
+#, php-format
+msgid "Column %s has been dropped."
+msgstr ""
+
 #: themes.php:17 themes.php:22
 msgid "Theme"
 msgstr "Tem"
diff --git a/po/bs.po b/po/bs.po
index 5f39cf7c4f..c65471601a 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 4.5.0-dev\n"
 "Report-Msgid-Bugs-To: developers@phpmyadmin.net\n"
-"POT-Creation-Date: 2015-08-08 13:53-0400\n"
+"POT-Creation-Date: 2015-08-12 08:10-0400\n"
 "PO-Revision-Date: 2014-03-31 14:23+0200\n"
 "Last-Translator: Michal Čihař <michal@cihar.com>\n"
 "Language-Team: Bosnian <https://hosted.weblate.org/projects/phpmyadmin/"
@@ -55,7 +55,7 @@ msgid "Table comments:"
 msgstr "Komentari tabele"
 
 #: db_datadict.php:104 libraries/Index.class.php:699
-#: libraries/insert_edit.lib.php:1567
+#: libraries/insert_edit.lib.php:1565
 #: libraries/navigation/Nodes/Node_Column.class.php:30
 #: libraries/plugins/export/ExportHtmlword.class.php:280
 #: libraries/plugins/export/ExportHtmlword.class.php:375
@@ -69,13 +69,14 @@ msgstr "Komentari tabele"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1023
 #: libraries/tracking.lib.php:879 libraries/tracking.lib.php:975
 #: templates/columns_definitions/column_name.phtml:18
-#: templates/index_form.phtml:124 templates/table/table_header.phtml:6
-#: templates/table/zoom_result_form.phtml:33
-#: templates/tbl_relation/common_form.phtml:10
-#: templates/tbl_relation/common_form.phtml:43
-#: templates/tbl_relation/foreign_key_row.phtml:194
-#: templates/tbl_relation/foreign_key_row.phtml:206
-#: templates/tbl_relation/internal_relational_row.phtml:71
+#: templates/table/index_form.phtml:124
+#: templates/table/relation/common_form.phtml:10
+#: templates/table/relation/common_form.phtml:43
+#: templates/table/relation/foreign_key_row.phtml:194
+#: templates/table/relation/foreign_key_row.phtml:206
+#: templates/table/relation/internal_relational_row.phtml:71
+#: templates/table/search/table_header.phtml:6
+#: templates/table/search/zoom_result_form.phtml:33
 msgid "Column"
 msgstr "Kolona"
 
@@ -93,21 +94,21 @@ msgstr "Kolona"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1001
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1024
 #: libraries/rte/rte_list.lib.php:75 libraries/rte/rte_list.lib.php:103
-#: libraries/rte/rte_routines.lib.php:802
-#: libraries/rte/rte_routines.lib.php:831
-#: libraries/rte/rte_routines.lib.php:1493
+#: libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_routines.lib.php:922
+#: libraries/rte/rte_routines.lib.php:1584
 #: libraries/server_privileges.lib.php:2369 libraries/tracking.lib.php:880
 #: libraries/tracking.lib.php:972
 #: templates/columns_definitions/table_fields_definitions.phtml:11
-#: templates/structure/table_header.phtml:48
-#: templates/structure/table_structure_header.phtml:6
-#: templates/table/table_header.phtml:7
+#: templates/database/structure/table_header.phtml:48
+#: templates/table/search/table_header.phtml:7
+#: templates/table/structure/table_structure_header.phtml:6
 msgid "Type"
 msgstr "Tip"
 
 #: db_datadict.php:106 libraries/Index.class.php:702
 #: libraries/central_columns.lib.php:708
-#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1576
+#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1574
 #: libraries/plugins/export/ExportHtmlword.class.php:286
 #: libraries/plugins/export/ExportHtmlword.class.php:381
 #: libraries/plugins/export/ExportLatex.class.php:509
@@ -120,8 +121,8 @@ msgstr "Tip"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1026
 #: libraries/tracking.lib.php:882 libraries/tracking.lib.php:978
 #: templates/columns_definitions/table_fields_definitions.phtml:39
-#: templates/structure/table_structure_header.phtml:9
-#: templates/table/zoom_result_form.phtml:34
+#: templates/table/search/zoom_result_form.phtml:34
+#: templates/table/structure/table_structure_header.phtml:9
 msgid "Null"
 msgstr "Null"
 
@@ -139,8 +140,8 @@ msgstr "Null"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1027
 #: libraries/replication_gui.lib.php:153 libraries/tracking.lib.php:883
 #: templates/columns_definitions/table_fields_definitions.phtml:25
-#: templates/structure/body_for_table_summary.phtml:55
-#: templates/structure/table_structure_header.phtml:10
+#: templates/database/structure/body_for_table_summary.phtml:55
+#: templates/table/structure/table_structure_header.phtml:10
 msgid "Default"
 msgstr "Podrazumjevano"
 
@@ -168,19 +169,19 @@ msgid "Comments"
 msgstr "Komentari"
 
 #: db_datadict.php:146
-#: libraries/controllers/StructureController.class.php:1960
-#: libraries/controllers/StructureController.class.php:1965
+#: libraries/controllers/TableStructureController.class.php:951
+#: libraries/controllers/TableStructureController.class.php:956
 #: libraries/tracking.lib.php:922
 #: templates/columns_definitions/column_indexes.phtml:6
-#: templates/structure/check_all_table_column.phtml:22
-#: templates/structure/display_structure.phtml:74
+#: templates/table/structure/check_all_table_column.phtml:22
+#: templates/table/structure/display_structure.phtml:74
 msgid "Primary"
 msgstr "Primarni"
 
 #: db_datadict.php:156 js/messages.php:317 libraries/Index.class.php:567
 #: libraries/Index.class.php:606 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261 libraries/mult_submits.lib.php:403
+#: libraries/config/FormDisplay.tpl.php:272 libraries/mult_submits.lib.php:403
 #: libraries/mult_submits.lib.php:417
 #: libraries/plugins/export/ExportHtmlword.class.php:630
 #: libraries/plugins/export/ExportLatex.class.php:589
@@ -196,20 +197,20 @@ msgstr "Primarni"
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1010 libraries/tracking.lib.php:1015
 #: prefs_manage.php:140 templates/prefs_autoload.phtml:15
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "No"
 msgstr "Ne"
 
 #: db_datadict.php:156 js/messages.php:443 libraries/Index.class.php:568
 #: libraries/Index.class.php:605 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261
-#: libraries/controllers/StructureController.class.php:1344
-#: libraries/controllers/StructureController.class.php:2223
-#: libraries/controllers/StructureController.class.php:2232
-#: libraries/controllers/StructureController.class.php:2237
-#: libraries/controllers/StructureController.class.php:2242
-#: libraries/controllers/StructureController.class.php:2247
+#: libraries/config/FormDisplay.tpl.php:272
+#: libraries/controllers/TableStructureController.class.php:539
+#: libraries/controllers/TableStructureController.class.php:1201
+#: libraries/controllers/TableStructureController.class.php:1210
+#: libraries/controllers/TableStructureController.class.php:1215
+#: libraries/controllers/TableStructureController.class.php:1220
+#: libraries/controllers/TableStructureController.class.php:1225
 #: libraries/mult_submits.inc.php:82 libraries/mult_submits.inc.php:178
 #: libraries/mult_submits.lib.php:339 libraries/mult_submits.lib.php:372
 #: libraries/mult_submits.lib.php:401 libraries/mult_submits.lib.php:415
@@ -218,8 +219,8 @@ msgstr "Ne"
 #: libraries/plugins/export/ExportOdt.class.php:756
 #: libraries/plugins/export/ExportTexytext.class.php:567
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1077
-#: libraries/server_databases.lib.php:464
-#: libraries/server_databases.lib.php:474
+#: libraries/server_databases.lib.php:475
+#: libraries/server_databases.lib.php:485
 #: libraries/server_privileges.lib.php:2546
 #: libraries/server_privileges.lib.php:2727
 #: libraries/server_privileges.lib.php:2748
@@ -229,7 +230,7 @@ msgstr "Ne"
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1008 libraries/tracking.lib.php:1013
 #: prefs_manage.php:138 templates/prefs_autoload.phtml:14
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "Yes"
 msgstr "Da"
 
@@ -239,7 +240,7 @@ msgstr "Prikaži sadržaj (shemu) baze"
 
 #: db_export.php:37 db_tracking.php:90 export.php:382
 #: libraries/DBQbe.class.php:326
-#: libraries/controllers/StructureController.class.php:231
+#: libraries/controllers/DatabaseStructureController.class.php:170
 #: libraries/navigation/NavigationTree.class.php:897
 msgid "No tables found in database."
 msgstr "Tabele nisu pronađene u bazi."
@@ -250,14 +251,14 @@ msgstr "Tabele nisu pronađene u bazi."
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:26
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:120
-#: templates/structure/show_create.phtml:18
+#: templates/database/structure/show_create.phtml:18
 msgid "Tables"
 msgstr "Tabele"
 
 #: db_export.php:52 libraries/Menu.class.php:317 libraries/Menu.class.php:425
-#: libraries/Util.class.php:3333 libraries/Util.class.php:3343
-#: libraries/Util.class.php:3349 libraries/Util.class.php:3629
-#: libraries/Util.class.php:4327 libraries/Util.class.php:4344
+#: libraries/Util.class.php:3339 libraries/Util.class.php:3349
+#: libraries/Util.class.php:3355 libraries/Util.class.php:3635
+#: libraries/Util.class.php:4333 libraries/Util.class.php:4350
 #: libraries/central_columns.lib.php:728 libraries/config.values.php:39
 #: libraries/config.values.php:47 libraries/config.values.php:109
 #: libraries/config.values.php:115 libraries/config/setup.forms.php:323
@@ -271,7 +272,7 @@ msgstr "Tabele"
 #: libraries/navigation/Nodes/Node_Table.class.php:283
 #: libraries/server_privileges.lib.php:1141 libraries/tracking.lib.php:874
 #: templates/columns_definitions/table_fields_definitions.phtml:3
-#: templates/designer/table_list.phtml:28
+#: templates/database/designer/table_list.phtml:28
 msgid "Structure"
 msgstr "Struktura"
 
@@ -283,7 +284,7 @@ msgstr "Struktura"
 #: libraries/config/user_preferences.forms.php:292
 #: libraries/config/user_preferences.forms.php:297
 #: libraries/server_privileges.lib.php:1140
-#: templates/structure/display_table_stats.phtml:12
+#: templates/table/structure/display_table_stats.phtml:12
 msgid "Data"
 msgstr "Podaci"
 
@@ -366,10 +367,10 @@ msgstr ""
 #: libraries/server_privileges.lib.php:2908
 #: libraries/server_privileges.lib.php:3145
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4346
-#: templates/structure/table_header.phtml:21
-#: templates/tbl_relation/foreign_key_row.phtml:176
-#: templates/tbl_relation/internal_relational_row.phtml:63
+#: libraries/server_privileges.lib.php:4372
+#: templates/database/structure/table_header.phtml:21
+#: templates/table/relation/foreign_key_row.phtml:176
+#: templates/table/relation/internal_relational_row.phtml:63
 msgid "Table"
 msgstr "Tabela"
 
@@ -386,7 +387,7 @@ msgid "Updated"
 msgstr ""
 
 #: db_tracking.php:130 js/messages.php:243 libraries/Menu.class.php:552
-#: libraries/Util.class.php:4314 libraries/config.values.php:104
+#: libraries/Util.class.php:4320 libraries/config.values.php:104
 #: libraries/rte/rte_events.lib.php:393 libraries/rte/rte_list.lib.php:101
 #: libraries/server_status_processes.lib.php:92 libraries/tracking.lib.php:279
 msgid "Status"
@@ -395,14 +396,15 @@ msgstr "Status"
 #: db_tracking.php:131 db_tracking.php:290 libraries/Index.class.php:693
 #: libraries/central_columns.lib.php:687 libraries/rte/rte_list.lib.php:74
 #: libraries/rte/rte_list.lib.php:89 libraries/rte/rte_list.lib.php:102
-#: libraries/server_databases.lib.php:398
+#: libraries/server_databases.lib.php:409
 #: libraries/server_privileges.lib.php:2372
 #: libraries/server_privileges.lib.php:3166
 #: libraries/server_privileges.lib.php:3342
 #: libraries/server_user_groups.lib.php:82
 #: libraries/server_variables.lib.php:189 libraries/tracking.lib.php:280
-#: libraries/tracking.lib.php:793 templates/structure/table_header.phtml:30
-#: templates/structure/table_structure_header.phtml:23
+#: libraries/tracking.lib.php:793
+#: templates/database/structure/table_header.phtml:30
+#: templates/table/structure/table_structure_header.phtml:23
 msgid "Action"
 msgstr "Akcija"
 
@@ -447,7 +449,7 @@ msgid "Untracked tables"
 msgstr ""
 
 #: db_tracking.php:305 db_tracking.php:336
-#: templates/structure/optional_action_links.phtml:17
+#: templates/table/structure/optional_action_links.phtml:17
 #, fuzzy
 msgid "Track table"
 msgstr "Provjeri tabelu"
@@ -503,7 +505,7 @@ msgid "Value for the column \"%s\""
 msgstr ""
 
 #: gis_data_editor.php:146
-#: templates/gis_visualization/gis_visualization.phtml:37
+#: templates/table/gis_visualization/gis_visualization.phtml:37
 msgid "Use OpenStreetMaps as Base Layer"
 msgstr ""
 
@@ -592,35 +594,35 @@ msgstr "Dodaj novog korisnika"
 #: libraries/display_change_password.lib.php:162
 #: libraries/display_export.lib.php:402 libraries/display_export.lib.php:408
 #: libraries/display_import.lib.php:392 libraries/index.lib.php:44
-#: libraries/insert_edit.lib.php:1546 libraries/insert_edit.lib.php:1583
+#: libraries/insert_edit.lib.php:1544 libraries/insert_edit.lib.php:1581
 #: libraries/normalization.lib.php:165 libraries/normalization.lib.php:821
 #: libraries/operations.lib.php:38 libraries/operations.lib.php:108
 #: libraries/operations.lib.php:263 libraries/operations.lib.php:306
 #: libraries/operations.lib.php:801 libraries/operations.lib.php:874
 #: libraries/operations.lib.php:923 libraries/operations.lib.php:1337
 #: libraries/operations.lib.php:1658
-#: libraries/plugins/auth/AuthenticationCookie.class.php:244
+#: libraries/plugins/auth/AuthenticationCookie.class.php:232
 #: libraries/replication_gui.lib.php:122 libraries/replication_gui.lib.php:161
 #: libraries/replication_gui.lib.php:324 libraries/replication_gui.lib.php:461
 #: libraries/replication_gui.lib.php:906 libraries/rte/rte_events.lib.php:509
-#: libraries/rte/rte_routines.lib.php:969
-#: libraries/rte/rte_routines.lib.php:1581
+#: libraries/rte/rte_routines.lib.php:1060
+#: libraries/rte/rte_routines.lib.php:1672
 #: libraries/rte/rte_triggers.lib.php:396 libraries/server_bin_log.lib.php:61
 #: libraries/server_privileges.lib.php:705
 #: libraries/server_privileges.lib.php:2106
 #: libraries/server_privileges.lib.php:2872
 #: libraries/server_privileges.lib.php:3553
-#: libraries/server_privileges.lib.php:4627
+#: libraries/server_privileges.lib.php:4653
 #: libraries/server_user_groups.lib.php:285
 #: libraries/sql_query_form.lib.php:369 libraries/sql_query_form.lib.php:429
 #: libraries/tracking.lib.php:533 libraries/tracking.lib.php:653
 #: prefs_manage.php:277 prefs_manage.php:355
 #: templates/columns_definitions/column_definitions_form.phtml:59
-#: templates/header_location.phtml:17 templates/index_form.phtml:238
+#: templates/database/create_table.phtml:21 templates/header_location.phtml:28
 #: templates/startAndNumberOfRowsPanel.phtml:14
-#: templates/structure/add_column.phtml:25
-#: templates/table/create_table.phtml:21
-#: templates/table/selection_form.phtml:75 view_create.php:275
+#: templates/table/index_form.phtml:238
+#: templates/table/search/selection_form.phtml:75
+#: templates/table/structure/add_column.phtml:25 view_create.php:275
 #: view_operations.php:106
 msgid "Go"
 msgstr "Kreni"
@@ -704,7 +706,7 @@ msgstr ""
 msgid "Could not load import plugins, please check your installation!"
 msgstr ""
 
-#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1466
+#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1460
 #, fuzzy, php-format
 msgid "Bookmark %s has been created."
 msgstr "Tabela %s je odbačena"
@@ -738,12 +740,12 @@ msgstr ""
 msgid "Back"
 msgstr "Nazad"
 
-#: index.php:148 libraries/Footer.class.php:70
+#: index.php:149 libraries/Footer.class.php:70
 #, fuzzy
 msgid "phpMyAdmin Demo Server"
 msgstr "phpMyAdmin dokumentacija"
 
-#: index.php:152
+#: index.php:153
 #, php-format
 msgid ""
 "You are using the demo server. You can do anything here, but please do not "
@@ -751,48 +753,48 @@ msgid ""
 "at %s."
 msgstr ""
 
-#: index.php:162
+#: index.php:163
 #, fuzzy
 #| msgid "General relation features"
 msgid "General Settings"
 msgstr "Opšte osobine relacija"
 
-#: index.php:190 libraries/display_change_password.lib.php:50
+#: index.php:191 libraries/display_change_password.lib.php:50
 #: libraries/display_change_password.lib.php:53 user_password.php:247
 msgid "Change password"
 msgstr "Promeni lozinku"
 
-#: index.php:206
+#: index.php:207
 msgid "Server connection collation"
 msgstr ""
 
-#: index.php:228
+#: index.php:229
 msgid "Appearance Settings"
 msgstr ""
 
-#: index.php:258 prefs_manage.php:285
+#: index.php:259 prefs_manage.php:285
 #, fuzzy
 #| msgid "General relation features"
 msgid "More settings"
 msgstr "Opšte osobine relacija"
 
-#: index.php:279
+#: index.php:280
 #, fuzzy
 #| msgid "Databases"
 msgid "Database server"
 msgstr "Baze"
 
-#: index.php:282 libraries/plugins/auth/AuthenticationCookie.class.php:181
+#: index.php:283 libraries/plugins/auth/AuthenticationCookie.class.php:169
 #, fuzzy
 msgid "Server:"
 msgstr "Server"
 
-#: index.php:286
+#: index.php:287
 #, fuzzy
 msgid "Server type:"
 msgstr "Izbor servera"
 
-#: index.php:290 libraries/plugins/export/ExportLatex.class.php:212
+#: index.php:291 libraries/plugins/export/ExportLatex.class.php:212
 #: libraries/plugins/export/ExportSql.class.php:687
 #: libraries/plugins/export/ExportXml.class.php:189
 #, fuzzy
@@ -800,85 +802,85 @@ msgstr "Izbor servera"
 msgid "Server version:"
 msgstr "Verzija servera"
 
-#: index.php:296
+#: index.php:297
 #, fuzzy
 msgid "Protocol version:"
 msgstr "Verzija servera"
 
-#: index.php:300
+#: index.php:301
 #, fuzzy
 #| msgid "User"
 msgid "User:"
 msgstr "Korisnik"
 
-#: index.php:305
+#: index.php:306
 #, fuzzy
 msgid "Server charset:"
 msgstr "Izbor servera"
 
-#: index.php:320
+#: index.php:321
 msgid "Web server"
 msgstr ""
 
-#: index.php:331
+#: index.php:332
 #, fuzzy
 #| msgid "Database comment"
 msgid "Database client version:"
 msgstr "Komentar baze:"
 
-#: index.php:335
+#: index.php:336
 #, fuzzy
 msgid "PHP extension:"
 msgstr "verzija PHP-a"
 
-#: index.php:349
+#: index.php:350
 #, fuzzy
 #| msgid "PHP Version"
 msgid "PHP version:"
 msgstr "verzija PHP-a"
 
-#: index.php:360
+#: index.php:361
 msgid "Show PHP information"
 msgstr "Prikaži informacije o PHP-u"
 
-#: index.php:383
+#: index.php:384
 #, fuzzy
 msgid "Version information:"
 msgstr "Podatci o prijavi"
 
-#: index.php:392 libraries/Util.class.php:432 libraries/Util.class.php:495
-#: libraries/config/FormDisplay.tpl.php:151
+#: index.php:393 libraries/Util.class.php:432 libraries/Util.class.php:495
+#: libraries/config/FormDisplay.tpl.php:162
 #: libraries/display_export.lib.php:577 libraries/engines/pbxt.lib.php:162
 #: libraries/navigation/NavigationHeader.class.php:196
 #: libraries/server_variables.lib.php:160
 msgid "Documentation"
 msgstr "Dokumentacija"
 
-#: index.php:399
+#: index.php:400
 msgid "Wiki"
 msgstr ""
 
-#: index.php:408
+#: index.php:409
 msgid "Official Homepage"
 msgstr "phpMyAdmin veb sajt"
 
-#: index.php:415
+#: index.php:416
 #, fuzzy
 #| msgid "Attributes"
 msgid "Contribute"
 msgstr "Atributi"
 
-#: index.php:422
+#: index.php:423
 msgid "Get support"
 msgstr ""
 
-#: index.php:429
+#: index.php:430
 #, fuzzy
 #| msgid "No change"
 msgid "List of changes"
 msgstr "Nema izmjena"
 
-#: index.php:451
+#: index.php:452
 #, fuzzy
 #| msgid ""
 #| "Your configuration file contains settings (root with no password) that "
@@ -896,21 +898,21 @@ msgstr ""
 "ovim podešavanjima, otvoren je za hakovanje, i zaista treba da ispravite "
 "ovaj sigurnosni rizik."
 
-#: index.php:468
+#: index.php:469
 msgid ""
 "You have enabled mbstring.func_overload in your PHP configuration. This "
 "option is incompatible with phpMyAdmin and might cause some data to be "
 "corrupted!"
 msgstr ""
 
-#: index.php:483
+#: index.php:484
 msgid ""
 "The mbstring PHP extension was not found and you seem to be using a "
 "multibyte charset. Without the mbstring extension phpMyAdmin is unable to "
 "split strings correctly and it may result in unexpected results."
 msgstr ""
 
-#: index.php:500
+#: index.php:501
 msgid ""
 "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini."
 "session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower than "
@@ -918,17 +920,17 @@ msgid ""
 "expire sooner than configured in phpMyAdmin."
 msgstr ""
 
-#: index.php:519
+#: index.php:520
 msgid ""
 "Login cookie store is lower than cookie validity configured in phpMyAdmin, "
 "because of this, your login will expire sooner than configured in phpMyAdmin."
 msgstr ""
 
-#: index.php:535
+#: index.php:536
 msgid "The configuration file now needs a secret passphrase (blowfish_secret)."
 msgstr "Konfiguraciona datoteka zahtjeva tajnu lozinku (blowfish_secret)."
 
-#: index.php:548
+#: index.php:549
 msgid ""
 "Directory [code]config[/code], which is used by the setup script, still "
 "exists in your phpMyAdmin directory. It is strongly recommended to remove it "
@@ -936,7 +938,7 @@ msgid ""
 "may be compromised by unauthorized people downloading your configuration."
 msgstr ""
 
-#: index.php:564
+#: index.php:565
 #, fuzzy, php-format
 #| msgid ""
 #| " additional features for working with linked tables have been ctivated. "
@@ -948,19 +950,19 @@ msgstr ""
 "Dodatne mogućnosti za rad sa povezanim tabelama su isključene. Da biste "
 "saznali zašto, kliknite %sovde%s."
 
-#: index.php:571
+#: index.php:572
 msgid ""
 "Or alternately go to 'Operations' tab of any database to set it up there."
 msgstr ""
 
-#: index.php:620
+#: index.php:621
 #, php-format
 msgid ""
 "Your PHP MySQL library version %s differs from your MySQL server version %s. "
 "This may cause unpredictable behavior."
 msgstr ""
 
-#: index.php:648
+#: index.php:649
 #, php-format
 msgid ""
 "Server running with Suhosin. Please refer to %sdocumentation%s for possible "
@@ -1128,8 +1130,8 @@ msgstr ""
 msgid "Save & Close"
 msgstr "Sačuvaj kao datoteku"
 
-#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:404
-#: libraries/insert_edit.lib.php:1550 prefs_manage.php:361
+#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:415
+#: libraries/insert_edit.lib.php:1548 prefs_manage.php:361
 #: prefs_manage.php:372
 msgid "Reset"
 msgstr "Resetuj"
@@ -1170,7 +1172,7 @@ msgstr "Dodaj novo polje"
 msgid "Edit Index"
 msgstr "Ključ"
 
-#: js/messages.php:99 templates/index_form.phtml:232
+#: js/messages.php:99 templates/table/index_form.phtml:232
 #, fuzzy, php-format
 msgid "Add %s column(s) to index"
 msgstr "Dodaj novo polje"
@@ -1198,15 +1200,16 @@ msgstr "Polja ograničena sa"
 msgid "Please select column(s) for the index."
 msgstr "Dodaj novo polje"
 
-#: js/messages.php:106 templates/structure/add_column.phtml:1
+#: js/messages.php:106 templates/table/structure/add_column.phtml:1
 #, fuzzy
 #| msgid "You have to choose at least one column to display"
 msgid "You have to add at least one column."
 msgstr "Morate izabrati bar jednu kolonu za prikaz"
 
-#: js/messages.php:109 libraries/insert_edit.lib.php:1548
+#: js/messages.php:109 libraries/insert_edit.lib.php:1546
 #: templates/columns_definitions/column_definitions_form.phtml:162
-#: templates/index_form.phtml:237 templates/tbl_relation/common_form.phtml:106
+#: templates/table/index_form.phtml:237
+#: templates/table/relation/common_form.phtml:106
 msgid "Preview SQL"
 msgstr ""
 
@@ -1229,7 +1232,7 @@ msgid "SQL query:"
 msgstr "SQL upit"
 
 #. l10n: Default label for the y-Axis of Charts
-#: js/messages.php:118 templates/tbl_chart.phtml:109
+#: js/messages.php:118 templates/table/chart/tbl_chart.phtml:109
 #, fuzzy
 #| msgid "Value"
 msgid "Y Values"
@@ -1400,7 +1403,7 @@ msgstr ""
 msgid "Bytes received"
 msgstr "Primljeno"
 
-#: js/messages.php:169 libraries/server_status.lib.php:226
+#: js/messages.php:169 libraries/server_status.lib.php:235
 msgid "Connections"
 msgstr "Konekcije"
 
@@ -1459,12 +1462,12 @@ msgstr "%s tabela"
 msgid "Questions"
 msgstr "Operacije"
 
-#: js/messages.php:184 libraries/server_status.lib.php:134
+#: js/messages.php:184 libraries/server_status.lib.php:143
 msgid "Traffic"
 msgstr "Saobraćaj"
 
 #: js/messages.php:185 libraries/Menu.class.php:586
-#: libraries/Util.class.php:4318 libraries/server_status_monitor.lib.php:257
+#: libraries/Util.class.php:4324 libraries/server_status_monitor.lib.php:257
 #, fuzzy
 #| msgid "General relation features"
 msgid "Settings"
@@ -1486,8 +1489,9 @@ msgstr ""
 #: libraries/server_status_monitor.lib.php:236
 #: libraries/server_status_processes.lib.php:308
 #: templates/columns_definitions/transformation.phtml:4
-#: templates/designer/options_panel.phtml:178
-#: templates/table/options_zoom.phtml:12 templates/table/rows_zoom.phtml:26
+#: templates/database/designer/options_panel.phtml:178
+#: templates/table/search/options_zoom.phtml:12
+#: templates/table/search/rows_zoom.phtml:26
 msgid "None"
 msgstr "nema"
 
@@ -1787,8 +1791,8 @@ msgstr ""
 
 #: js/messages.php:270 libraries/Menu.class.php:352
 #: libraries/Menu.class.php:455 libraries/Menu.class.php:582
-#: libraries/Util.class.php:4317 libraries/Util.class.php:4332
-#: libraries/Util.class.php:4349 libraries/config/messages.inc.php:258
+#: libraries/Util.class.php:4323 libraries/Util.class.php:4338
+#: libraries/Util.class.php:4355 libraries/config/messages.inc.php:258
 #: libraries/display_import.lib.php:105
 #: libraries/server_status_monitor.lib.php:318 prefs_manage.php:238
 #: setup/frames/menu.inc.php:26
@@ -1855,13 +1859,13 @@ msgid "Formatting SQL..."
 msgstr ""
 
 #: js/messages.php:293 libraries/server_variables.lib.php:157
-#: templates/designer/aggregate_query_panel.phtml:63
-#: templates/designer/delete_relation_panel.phtml:28
-#: templates/designer/having_query_panel.phtml:117
-#: templates/designer/new_relation_panel.phtml:88
-#: templates/designer/options_panel.phtml:253
-#: templates/designer/rename_to_panel.phtml:45
-#: templates/designer/where_query_panel.phtml:83
+#: templates/database/designer/aggregate_query_panel.phtml:63
+#: templates/database/designer/delete_relation_panel.phtml:28
+#: templates/database/designer/having_query_panel.phtml:117
+#: templates/database/designer/new_relation_panel.phtml:88
+#: templates/database/designer/options_panel.phtml:253
+#: templates/database/designer/rename_to_panel.phtml:45
+#: templates/database/designer/where_query_panel.phtml:83
 msgid "Cancel"
 msgstr ""
 
@@ -1871,7 +1875,7 @@ msgstr ""
 msgid "Page-related settings"
 msgstr "Opšte osobine relacija"
 
-#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:402
+#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:413
 msgid "Apply"
 msgstr ""
 
@@ -1909,8 +1913,8 @@ msgstr ""
 msgid "Error text: %s"
 msgstr ""
 
-#: js/messages.php:307 libraries/db_common.inc.php:68
-#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:450
+#: js/messages.php:307 libraries/db_common.inc.php:69
+#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:461
 msgid "No databases selected."
 msgstr "Nije izabrana ni jedna baza."
 
@@ -1922,12 +1926,13 @@ msgstr ""
 msgid "Adding Primary Key"
 msgstr ""
 
-#: js/messages.php:310 templates/designer/aggregate_query_panel.phtml:59
-#: templates/designer/having_query_panel.phtml:113
-#: templates/designer/new_relation_panel.phtml:87
-#: templates/designer/options_panel.phtml:252
-#: templates/designer/rename_to_panel.phtml:41
-#: templates/designer/where_query_panel.phtml:82
+#: js/messages.php:310
+#: templates/database/designer/aggregate_query_panel.phtml:59
+#: templates/database/designer/having_query_panel.phtml:113
+#: templates/database/designer/new_relation_panel.phtml:87
+#: templates/database/designer/options_panel.phtml:252
+#: templates/database/designer/rename_to_panel.phtml:41
+#: templates/database/designer/where_query_panel.phtml:82
 msgid "OK"
 msgstr "U redu"
 
@@ -1951,7 +1956,7 @@ msgstr "Baza ne postoji"
 msgid "Changing Charset"
 msgstr "Karakter set"
 
-#: js/messages.php:320 libraries/Util.class.php:3217
+#: js/messages.php:320 libraries/Util.class.php:3223
 msgid "Enable foreign key checks"
 msgstr ""
 
@@ -1994,20 +1999,21 @@ msgstr ""
 #: js/messages.php:334 libraries/DisplayResults.class.php:4834
 #: libraries/DisplayResults.class.php:5092 libraries/Menu.class.php:344
 #: libraries/Menu.class.php:446 libraries/Menu.class.php:578
-#: libraries/Util.class.php:3636 libraries/Util.class.php:3637
-#: libraries/Util.class.php:4316 libraries/Util.class.php:4331
-#: libraries/Util.class.php:4348 libraries/config/messages.inc.php:252
+#: libraries/Util.class.php:3642 libraries/Util.class.php:3643
+#: libraries/Util.class.php:4322 libraries/Util.class.php:4337
+#: libraries/Util.class.php:4354 libraries/config/messages.inc.php:252
 #: libraries/display_export.lib.php:173 libraries/rte/rte_list.lib.php:146
 #: libraries/server_privileges.lib.php:2211
 #: libraries/server_privileges.lib.php:2290
 #: libraries/server_privileges.lib.php:2632
 #: libraries/server_privileges.lib.php:3356
 #: libraries/server_status_monitor.lib.php:322 prefs_manage.php:303
-#: setup/frames/menu.inc.php:27 templates/structure/check_all_tables.phtml:11
+#: setup/frames/menu.inc.php:27
+#: templates/database/structure/check_all_tables.phtml:11
 msgid "Export"
 msgstr "Izvoz"
 
-#: js/messages.php:337 libraries/rte/rte_routines.lib.php:652
+#: js/messages.php:337 libraries/rte/rte_routines.lib.php:743
 msgid "ENUM/SET editor"
 msgstr ""
 
@@ -2049,7 +2055,7 @@ msgstr "SQL upit"
 #: libraries/Console.class.php:214 libraries/DisplayResults.class.php:3474
 #: libraries/DisplayResults.class.php:4818 libraries/Index.class.php:723
 #: libraries/Util.class.php:706 libraries/Util.class.php:1202
-#: libraries/Util.class.php:3634 libraries/Util.class.php:3635
+#: libraries/Util.class.php:3640 libraries/Util.class.php:3641
 #: libraries/central_columns.lib.php:851
 #: libraries/central_columns.lib.php:1193
 #: libraries/config/messages.inc.php:892
@@ -2067,7 +2073,7 @@ msgstr "Promeni"
 #: libraries/server_user_groups.lib.php:129
 #: libraries/sql_query_form.lib.php:416 libraries/tracking.lib.php:477
 #: setup/frames/index.inc.php:183 setup/frames/index.inc.php:291
-#: templates/designer/delete_relation_panel.phtml:27
+#: templates/database/designer/delete_relation_panel.phtml:27
 msgid "Delete"
 msgstr "Obriši"
 
@@ -2249,11 +2255,11 @@ msgid "No dependencies selected!"
 msgstr "Nije izabrana ni jedna baza."
 
 #: js/messages.php:394 libraries/central_columns.lib.php:1214
-#: libraries/insert_edit.lib.php:1458 libraries/server_variables.lib.php:155
+#: libraries/insert_edit.lib.php:1456 libraries/server_variables.lib.php:155
 #: setup/frames/config.inc.php:42 setup/frames/index.inc.php:279
 #: templates/columns_definitions/column_definitions_form.phtml:165
-#: templates/gis_visualization/gis_visualization.phtml:48
-#: templates/tbl_relation/common_form.phtml:107
+#: templates/table/gis_visualization/gis_visualization.phtml:48
+#: templates/table/relation/common_form.phtml:107
 msgid "Save"
 msgstr "Sačuvaj"
 
@@ -2344,8 +2350,8 @@ msgid "Data point content"
 msgstr "Sadržaj"
 
 #: js/messages.php:430 js/messages.php:562 js/messages.php:579
-#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2573
-#: templates/index_form.phtml:154 templates/index_form.phtml:194
+#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2571
+#: templates/table/index_form.phtml:154 templates/table/index_form.phtml:194
 msgid "Ignore"
 msgstr "Ignoriši"
 
@@ -2406,8 +2412,8 @@ msgstr ""
 msgid "Please select the primary key or a unique key!"
 msgstr ""
 
-#: js/messages.php:457 templates/designer/side_menu.phtml:91
-#: templates/designer/side_menu.phtml:94
+#: js/messages.php:457 templates/database/designer/side_menu.phtml:91
+#: templates/database/designer/side_menu.phtml:94
 #, fuzzy
 #| msgid "Choose field to display"
 msgid "Choose column to display"
@@ -2425,22 +2431,22 @@ msgstr ""
 msgid "Page name"
 msgstr "Broj strane:"
 
-#: js/messages.php:463 templates/designer/side_menu.phtml:56
-#: templates/designer/side_menu.phtml:59
+#: js/messages.php:463 templates/database/designer/side_menu.phtml:56
+#: templates/database/designer/side_menu.phtml:59
 #, fuzzy
 #| msgid "Select All"
 msgid "Save page"
 msgstr "Izaberi sve"
 
-#: js/messages.php:464 templates/designer/side_menu.phtml:63
-#: templates/designer/side_menu.phtml:66
+#: js/messages.php:464 templates/database/designer/side_menu.phtml:63
+#: templates/database/designer/side_menu.phtml:66
 #, fuzzy
 #| msgid "Select All"
 msgid "Save page as"
 msgstr "Izaberi sve"
 
-#: js/messages.php:465 templates/designer/side_menu.phtml:49
-#: templates/designer/side_menu.phtml:52
+#: js/messages.php:465 templates/database/designer/side_menu.phtml:49
+#: templates/database/designer/side_menu.phtml:52
 #, fuzzy
 #| msgctxt "PDF"
 #| msgid "page"
@@ -2453,7 +2459,7 @@ msgstr "Zauzeće"
 msgid "Delete page"
 msgstr "Izaberi sve"
 
-#: js/messages.php:467 templates/designer/side_menu.phtml:10
+#: js/messages.php:467 templates/database/designer/side_menu.phtml:10
 msgid "Untitled"
 msgstr ""
 
@@ -2573,7 +2579,7 @@ msgstr "Linije se završavaju sa"
 msgid "cancel"
 msgstr ""
 
-#: js/messages.php:499 libraries/server_status.lib.php:271
+#: js/messages.php:499 libraries/server_status.lib.php:280
 msgid "Aborted"
 msgstr "Prekinuto"
 
@@ -3226,7 +3232,7 @@ msgstr ""
 
 #: js/messages.php:793 libraries/Message.class.php:199
 #: libraries/Util.class.php:654 libraries/core.lib.php:245
-#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1172
+#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1170
 #: tbl_operations.php:229 view_operations.php:63
 msgid "Error"
 msgstr "Greška"
@@ -3285,8 +3291,8 @@ msgstr "u sekundi"
 msgid "per minute"
 msgstr "u minuti"
 
-#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:143
-#: libraries/server_status.lib.php:228
+#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:152
+#: libraries/server_status.lib.php:237
 #: libraries/server_status_queries.lib.php:98
 msgid "per hour"
 msgstr "na sat"
@@ -3304,7 +3310,7 @@ msgstr ""
 msgid "Wrong permissions on configuration file, should not be world writable!"
 msgstr ""
 
-#: libraries/Config.class.php:1799
+#: libraries/Config.class.php:1801
 msgid "Font size"
 msgstr ""
 
@@ -3334,10 +3340,10 @@ msgstr "u upitu"
 #: libraries/server_privileges.lib.php:2890
 #: libraries/server_privileges.lib.php:3144
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4332
+#: libraries/server_privileges.lib.php:4358
 #: libraries/server_status_processes.lib.php:80
-#: templates/tbl_relation/foreign_key_row.phtml:165
-#: templates/tbl_relation/internal_relational_row.phtml:55
+#: templates/table/relation/foreign_key_row.phtml:165
+#: templates/table/relation/internal_relational_row.phtml:55
 msgid "Database"
 msgstr "Baza podataka"
 
@@ -3443,11 +3449,11 @@ msgstr "SQL istorijat"
 #: libraries/plugins/import/ImportMediawiki.class.php:60
 #: libraries/plugins/import/ImportOds.class.php:59
 #: libraries/plugins/import/ImportShp.class.php:57
-#: libraries/plugins/import/ImportSql.class.php:148
+#: libraries/plugins/import/ImportSql.class.php:51
 #: libraries/plugins/import/ImportXml.class.php:58
-#: libraries/rte/rte_routines.lib.php:833 templates/index_form.phtml:49
-#: templates/structure/row_stats_table.phtml:20
-#: templates/table/options.phtml:2
+#: libraries/rte/rte_routines.lib.php:924 templates/table/index_form.phtml:49
+#: templates/table/search/options.phtml:2
+#: templates/table/structure/row_stats_table.phtml:20
 #, fuzzy
 msgid "Options"
 msgstr "Operacije"
@@ -3491,7 +3497,8 @@ msgstr "Opadajući"
 msgid "Order:"
 msgstr ""
 
-#: libraries/Console.class.php:289 templates/table/replace_preview.phtml:17
+#: libraries/Console.class.php:289
+#: templates/table/search/replace_preview.phtml:17
 #, fuzzy
 #| msgid "Column"
 msgid "Count"
@@ -3611,9 +3618,9 @@ msgstr "Pređi na kopiranu tabelu"
 #: libraries/operations.lib.php:794 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:191
-#: templates/structure/sortable_header.phtml:21
-#: templates/structure/sortable_header.phtml:38
-#: templates/table/options.phtml:68
+#: templates/database/structure/sortable_header.phtml:21
+#: templates/database/structure/sortable_header.phtml:38
+#: templates/table/search/options.phtml:68
 msgid "Ascending"
 msgstr "Rastući"
 
@@ -3623,13 +3630,14 @@ msgstr "Rastući"
 #: libraries/operations.lib.php:797 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:188
-#: templates/structure/sortable_header.phtml:26
-#: templates/structure/sortable_header.phtml:43
-#: templates/table/options.phtml:69
+#: templates/database/structure/sortable_header.phtml:26
+#: templates/database/structure/sortable_header.phtml:43
+#: templates/table/search/options.phtml:69
 msgid "Descending"
 msgstr "Opadajući"
 
-#: libraries/DBQbe.class.php:467 templates/table/search_and_replace.phtml:6
+#: libraries/DBQbe.class.php:467
+#: templates/table/search/search_and_replace.phtml:6
 #, fuzzy
 #| msgid "Column"
 msgid "Column:"
@@ -3814,12 +3822,12 @@ msgstr[0] "%s pogodaka unutar tabele <i>%s</i>"
 msgstr[1] "%s pogodaka unutar tabele <i>%s</i>"
 
 #: libraries/DbSearch.class.php:354 libraries/Menu.class.php:311
-#: libraries/Util.class.php:3337 libraries/Util.class.php:3347
-#: libraries/Util.class.php:3623 libraries/Util.class.php:3624
-#: libraries/Util.class.php:4343 libraries/config.values.php:43
+#: libraries/Util.class.php:3343 libraries/Util.class.php:3353
+#: libraries/Util.class.php:3629 libraries/Util.class.php:3630
+#: libraries/Util.class.php:4349 libraries/config.values.php:43
 #: libraries/config.values.php:51 libraries/config.values.php:119
 #: libraries/navigation/Nodes/Node_Table.class.php:295
-#: templates/structure/check_all_table_column.phtml:5
+#: templates/table/structure/check_all_table_column.phtml:5
 msgid "Browse"
 msgstr "Pregled"
 
@@ -3839,7 +3847,8 @@ msgstr "Pretraživanje baze"
 msgid "Words or values to search for (wildcard: \"%\"):"
 msgstr "Riječi ili vrednosti koje se traže (džoker: \"%\"):"
 
-#: libraries/DbSearch.class.php:401 templates/table/search_and_replace.phtml:1
+#: libraries/DbSearch.class.php:401
+#: templates/table/search/search_and_replace.phtml:1
 msgid "Find:"
 msgstr "Traži:"
 
@@ -3892,16 +3901,16 @@ msgstr "Polja"
 msgid "Search this table"
 msgstr "Pretraživanje baze"
 
-#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2532
-#: libraries/Util.class.php:2535
+#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2538
+#: libraries/Util.class.php:2541
 #, fuzzy
 #| msgid "Begin"
 msgctxt "First page"
 msgid "Begin"
 msgstr "Početak"
 
-#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2533
-#: libraries/Util.class.php:2536 libraries/server_bin_log.lib.php:170
+#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2539
+#: libraries/Util.class.php:2542 libraries/server_bin_log.lib.php:170
 #: libraries/server_bin_log.lib.php:172
 #, fuzzy
 #| msgid "Previous"
@@ -3909,8 +3918,8 @@ msgctxt "Previous page"
 msgid "Previous"
 msgstr "Prethodna"
 
-#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2564
-#: libraries/Util.class.php:2574 libraries/server_bin_log.lib.php:204
+#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2570
+#: libraries/Util.class.php:2580 libraries/server_bin_log.lib.php:204
 #: libraries/server_bin_log.lib.php:206
 #, fuzzy
 #| msgid "Next"
@@ -3918,8 +3927,8 @@ msgctxt "Next page"
 msgid "Next"
 msgstr "Slijedeći"
 
-#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2565
-#: libraries/Util.class.php:2575
+#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2571
+#: libraries/Util.class.php:2581
 #, fuzzy
 #| msgid "End"
 msgctxt "Last page"
@@ -4007,9 +4016,9 @@ msgid "May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]."
 msgstr ""
 
 #: libraries/DisplayResults.class.php:4332 libraries/Message.class.php:180
-#: libraries/controllers/TableRelationController.class.php:258
+#: libraries/controllers/TableRelationController.class.php:259
 #: libraries/controllers/TableSearchController.class.php:655
-#: libraries/rte/rte_routines.lib.php:1332 libraries/sql_query_form.lib.php:89
+#: libraries/rte/rte_routines.lib.php:1423 libraries/sql_query_form.lib.php:89
 #: tbl_operations.php:227 tbl_row_action.php:138 view_operations.php:62
 #, fuzzy
 #| msgid "Your SQL query has been executed successfully."
@@ -4017,7 +4026,7 @@ msgid "Your SQL query has been executed successfully."
 msgstr "Vaš SQL upit je uspešno izvršen"
 
 #: libraries/DisplayResults.class.php:4660
-#: libraries/controllers/StructureController.class.php:629
+#: libraries/controllers/DatabaseStructureController.class.php:564
 #, php-format
 msgid ""
 "This view has at least this number of rows. Please refer to %sdocumentation"
@@ -4041,34 +4050,34 @@ msgstr ""
 msgid "%d total"
 msgstr "ukupno"
 
-#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1318
+#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1312
 #, fuzzy, php-format
 #| msgid "Query took %01.4f sec"
 msgid "Query took %01.4f seconds."
 msgstr "Upit je trajao %01.4f sekundi"
 
 #: libraries/DisplayResults.class.php:4807
-#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4767
-#: libraries/Util.class.php:4773 libraries/mult_submits.inc.php:50
-#: templates/structure/check_all_tables.phtml:2
-#: templates/structure/check_all_tables.phtml:9
+#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4773
+#: libraries/Util.class.php:4779 libraries/mult_submits.inc.php:50
+#: templates/database/structure/check_all_tables.phtml:2
+#: templates/database/structure/check_all_tables.phtml:9
 msgid "With selected:"
 msgstr "Označeno:"
 
 #: libraries/DisplayResults.class.php:4811
-#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4769
-#: libraries/Util.class.php:4770 libraries/server_privileges.lib.php:1174
+#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4775
+#: libraries/Util.class.php:4776 libraries/server_privileges.lib.php:1174
 #: libraries/server_privileges.lib.php:1175
 #: libraries/server_privileges.lib.php:1387
 #: libraries/server_user_groups.lib.php:231
-#: templates/structure/check_all_tables.phtml:3
-#: templates/structure/check_all_tables.phtml:4
+#: templates/database/structure/check_all_tables.phtml:3
+#: templates/database/structure/check_all_tables.phtml:4
 msgid "Check All"
 msgstr "Označi sve"
 
 #: libraries/DisplayResults.class.php:4985 libraries/Header.class.php:383
-#: templates/structure/optional_action_links.phtml:1
-#: templates/structure/print_view_data_dictionary_link.phtml:3
+#: templates/database/structure/print_view_data_dictionary_link.phtml:3
+#: templates/table/structure/optional_action_links.phtml:1
 msgid "Print view"
 msgstr "Za štampu"
 
@@ -4076,7 +4085,8 @@ msgstr "Za štampu"
 msgid "Query results operations"
 msgstr ""
 
-#: libraries/DisplayResults.class.php:5105 templates/tbl_chart.phtml:12
+#: libraries/DisplayResults.class.php:5105
+#: templates/table/chart/tbl_chart.phtml:12
 #, fuzzy
 #| msgid "Display PDF schema"
 msgid "Display chart"
@@ -4172,7 +4182,7 @@ msgid "Click on the bar to scroll to top of page"
 msgstr ""
 
 #: libraries/Header.class.php:749
-#: libraries/plugins/auth/AuthenticationCookie.class.php:152
+#: libraries/plugins/auth/AuthenticationCookie.class.php:140
 #, fuzzy
 #| msgid "Cookies must be enabled past this point."
 msgid "Javascript must be enabled past this point!"
@@ -4196,11 +4206,11 @@ msgid "Keyname"
 msgstr "Ime ključa"
 
 #: libraries/Index.class.php:697
-#: libraries/controllers/StructureController.class.php:1962
-#: libraries/controllers/StructureController.class.php:1967
+#: libraries/controllers/TableStructureController.class.php:953
+#: libraries/controllers/TableStructureController.class.php:958
 #: libraries/tracking.lib.php:973
 #: templates/columns_definitions/column_indexes.phtml:11
-#: templates/structure/check_all_table_column.phtml:26
+#: templates/table/structure/check_all_table_column.phtml:26
 msgid "Unique"
 msgstr "Jedinstveni"
 
@@ -4219,16 +4229,17 @@ msgstr "Kardinalnost"
 #: libraries/server_collations.lib.php:35 libraries/tracking.lib.php:881
 #: libraries/tracking.lib.php:977
 #: templates/columns_definitions/table_fields_definitions.phtml:33
-#: templates/structure/row_stats_table.phtml:31
-#: templates/structure/table_header.phtml:55
-#: templates/structure/table_structure_header.phtml:7
-#: templates/table/table_header.phtml:8
+#: templates/database/structure/table_header.phtml:55
+#: templates/table/search/table_header.phtml:8
+#: templates/table/structure/row_stats_table.phtml:31
+#: templates/table/structure/table_structure_header.phtml:7
 msgid "Collation"
 msgstr "Sortiranje"
 
 #: libraries/Index.class.php:703 libraries/rte/rte_events.lib.php:496
-#: libraries/rte/rte_routines.lib.php:956 libraries/tracking.lib.php:885
-#: libraries/tracking.lib.php:979 templates/structure/table_header.phtml:84
+#: libraries/rte/rte_routines.lib.php:1047 libraries/tracking.lib.php:885
+#: libraries/tracking.lib.php:979
+#: templates/database/structure/table_header.phtml:84
 #, fuzzy
 msgid "Comment"
 msgstr "Komentari"
@@ -4242,15 +4253,15 @@ msgstr "Primarni ključ je obrisan."
 msgid "Index %s has been dropped."
 msgstr "Ključ %s je obrisan."
 
-#: libraries/Index.class.php:757 libraries/Util.class.php:3630
-#: libraries/Util.class.php:3631
-#: libraries/controllers/StructureController.class.php:1958
-#: libraries/controllers/StructureController.class.php:1959
+#: libraries/Index.class.php:757 libraries/Util.class.php:3636
+#: libraries/Util.class.php:3637
+#: libraries/controllers/TableStructureController.class.php:949
+#: libraries/controllers/TableStructureController.class.php:950
 #: libraries/operations.lib.php:1607 libraries/rte/rte_list.lib.php:150
 #: libraries/server_databases.lib.php:146
-#: templates/structure/check_all_table_column.phtml:15
-#: templates/structure/check_all_tables.phtml:16
-#: templates/tbl_relation/foreign_key_row.phtml:93
+#: templates/database/structure/check_all_tables.phtml:16
+#: templates/table/relation/foreign_key_row.phtml:93
+#: templates/table/structure/check_all_table_column.phtml:15
 msgid "Drop"
 msgstr "Odbaci"
 
@@ -4279,16 +4290,16 @@ msgstr "Server"
 #: libraries/Menu.class.php:248
 #: libraries/navigation/Nodes/Node_View.class.php:32
 #: libraries/tbl_info.inc.php:63
-#: templates/structure/structure_table_row.phtml:97
-#: templates/structure/structure_table_row.phtml:159
+#: templates/database/structure/structure_table_row.phtml:97
+#: templates/database/structure/structure_table_row.phtml:159
 msgid "View"
 msgstr ""
 
 #: libraries/Menu.class.php:325 libraries/Menu.class.php:429
-#: libraries/Menu.class.php:548 libraries/Util.class.php:3334
-#: libraries/Util.class.php:3344 libraries/Util.class.php:3350
-#: libraries/Util.class.php:4313 libraries/Util.class.php:4328
-#: libraries/Util.class.php:4345 libraries/config.values.php:40
+#: libraries/Menu.class.php:548 libraries/Util.class.php:3340
+#: libraries/Util.class.php:3350 libraries/Util.class.php:3356
+#: libraries/Util.class.php:4319 libraries/Util.class.php:4334
+#: libraries/Util.class.php:4351 libraries/config.values.php:40
 #: libraries/config.values.php:48 libraries/config.values.php:110
 #: libraries/config.values.php:116 libraries/config/messages.inc.php:321
 #: libraries/navigation/Nodes/Node_Table.class.php:292
@@ -4296,19 +4307,19 @@ msgid "SQL"
 msgstr "SQL"
 
 #: libraries/Menu.class.php:328 libraries/Menu.class.php:432
-#: libraries/Util.class.php:3335 libraries/Util.class.php:3345
-#: libraries/Util.class.php:3351 libraries/Util.class.php:3625
-#: libraries/Util.class.php:3626 libraries/Util.class.php:4329
-#: libraries/Util.class.php:4346 libraries/config.values.php:41
+#: libraries/Util.class.php:3341 libraries/Util.class.php:3351
+#: libraries/Util.class.php:3357 libraries/Util.class.php:3631
+#: libraries/Util.class.php:3632 libraries/Util.class.php:4335
+#: libraries/Util.class.php:4352 libraries/config.values.php:41
 #: libraries/config.values.php:49 libraries/config.values.php:111
 #: libraries/config.values.php:117
 #: libraries/navigation/Nodes/Node_Table.class.php:286
 msgid "Search"
 msgstr "Pretraživanje"
 
-#: libraries/Menu.class.php:338 libraries/Util.class.php:3336
-#: libraries/Util.class.php:3346 libraries/Util.class.php:3627
-#: libraries/Util.class.php:3628 libraries/Util.class.php:4347
+#: libraries/Menu.class.php:338 libraries/Util.class.php:3342
+#: libraries/Util.class.php:3352 libraries/Util.class.php:3633
+#: libraries/Util.class.php:3634 libraries/Util.class.php:4353
 #: libraries/config.values.php:42 libraries/config.values.php:50
 #: libraries/config.values.php:118
 #: libraries/navigation/Nodes/Node_Table.class.php:289
@@ -4317,30 +4328,30 @@ msgid "Insert"
 msgstr "Novi zapis"
 
 #: libraries/Menu.class.php:362 libraries/Menu.class.php:467
-#: libraries/Util.class.php:4334 libraries/Util.class.php:4350
+#: libraries/Util.class.php:4340 libraries/Util.class.php:4356
 #: libraries/config.values.php:106 libraries/server_common.lib.php:51
 #: libraries/server_privileges.lib.php:2370
 #: libraries/server_privileges.lib.php:3158
-#: libraries/server_privileges.lib.php:4221
+#: libraries/server_privileges.lib.php:4247
 msgid "Privileges"
 msgstr "Privilegije"
 
 #: libraries/Menu.class.php:371 libraries/Menu.class.php:379
-#: libraries/Menu.class.php:459 libraries/Util.class.php:3338
-#: libraries/Util.class.php:3352 libraries/Util.class.php:4333
-#: libraries/Util.class.php:4351 libraries/config.values.php:112
+#: libraries/Menu.class.php:459 libraries/Util.class.php:3344
+#: libraries/Util.class.php:3358 libraries/Util.class.php:4339
+#: libraries/Util.class.php:4357 libraries/config.values.php:112
 #: view_operations.php:92
 msgid "Operations"
 msgstr "Operacije"
 
 #: libraries/Menu.class.php:384 libraries/Menu.class.php:492
-#: libraries/Util.class.php:4338 libraries/Util.class.php:4352
+#: libraries/Util.class.php:4344 libraries/Util.class.php:4358
 #: libraries/relation.lib.php:255
 msgid "Tracking"
 msgstr ""
 
 #: libraries/Menu.class.php:397 libraries/Menu.class.php:486
-#: libraries/Util.class.php:4337 libraries/Util.class.php:4353
+#: libraries/Util.class.php:4343 libraries/Util.class.php:4359
 #: libraries/navigation/Nodes/Node_Trigger_Container.class.php:24
 #: libraries/plugins/export/ExportHtmlword.class.php:557
 #: libraries/plugins/export/ExportOdt.class.php:685
@@ -4357,16 +4368,16 @@ msgstr ""
 msgid "Database seems to be empty!"
 msgstr ""
 
-#: libraries/Menu.class.php:439 libraries/Util.class.php:4330
+#: libraries/Menu.class.php:439 libraries/Util.class.php:4336
 msgid "Query"
 msgstr "Upit po primeru"
 
-#: libraries/Menu.class.php:472 libraries/Util.class.php:4335
+#: libraries/Menu.class.php:472 libraries/Util.class.php:4341
 #: libraries/rte/rte_words.lib.php:36
 msgid "Routines"
 msgstr ""
 
-#: libraries/Menu.class.php:479 libraries/Util.class.php:4336
+#: libraries/Menu.class.php:479 libraries/Util.class.php:4342
 #: libraries/navigation/Nodes/Node_Event_Container.class.php:26
 #: libraries/plugins/export/ExportSql.class.php:940
 #: libraries/plugins/export/ExportXml.class.php:107
@@ -4374,22 +4385,22 @@ msgstr ""
 msgid "Events"
 msgstr ""
 
-#: libraries/Menu.class.php:498 libraries/Util.class.php:4339
+#: libraries/Menu.class.php:498 libraries/Util.class.php:4345
 msgid "Designer"
 msgstr ""
 
-#: libraries/Menu.class.php:507 libraries/Util.class.php:4340
-#: templates/structure/check_all_tables.phtml:35
+#: libraries/Menu.class.php:507 libraries/Util.class.php:4346
+#: templates/database/structure/check_all_tables.phtml:35
 #, fuzzy
 #| msgid "Add/Delete Field Columns"
 msgid "Central columns"
 msgstr "Dodaj/obriši kolonu"
 
-#: libraries/Menu.class.php:544 libraries/Util.class.php:4312
+#: libraries/Menu.class.php:544 libraries/Util.class.php:4318
 #: libraries/config.values.php:103 libraries/config/messages.inc.php:266
 #: libraries/config/messages.inc.php:341
 #: libraries/navigation/NavigationTree.class.php:1239
-#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4332
+#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4358
 msgid "Databases"
 msgstr "Baze"
 
@@ -4400,36 +4411,36 @@ msgid "User accounts"
 msgstr "Korisnik"
 
 #: libraries/Menu.class.php:595 libraries/ServerStatusData.class.php:121
-#: libraries/Util.class.php:4319 libraries/server_common.lib.php:36
+#: libraries/Util.class.php:4325 libraries/server_common.lib.php:36
 #, fuzzy
 msgid "Binary log"
 msgstr "Binarni"
 
 #: libraries/Menu.class.php:601 libraries/ServerStatusData.class.php:126
-#: libraries/Util.class.php:4320 libraries/server_common.lib.php:42
-#: templates/structure/body_for_table_summary.phtml:10
-#: templates/structure/table_header.phtml:27
+#: libraries/Util.class.php:4326 libraries/server_common.lib.php:42
+#: templates/database/structure/body_for_table_summary.phtml:10
+#: templates/database/structure/table_header.phtml:27
 #, fuzzy
 msgid "Replication"
 msgstr "Relacije"
 
 #: libraries/Menu.class.php:606 libraries/ServerStatusData.class.php:193
-#: libraries/Util.class.php:4321 libraries/config.values.php:105
+#: libraries/Util.class.php:4327 libraries/config.values.php:105
 #: libraries/server_engines.lib.php:108 libraries/server_engines.lib.php:112
 #: libraries/sql_query_form.lib.php:421
 msgid "Variables"
 msgstr "Promjenljive"
 
-#: libraries/Menu.class.php:610 libraries/Util.class.php:4322
+#: libraries/Menu.class.php:610 libraries/Util.class.php:4328
 msgid "Charsets"
 msgstr "Kodne strane"
 
-#: libraries/Menu.class.php:615 libraries/Util.class.php:4323
+#: libraries/Menu.class.php:615 libraries/Util.class.php:4329
 #: libraries/server_common.lib.php:33 libraries/server_plugins.lib.php:27
 msgid "Plugins"
 msgstr ""
 
-#: libraries/Menu.class.php:626 libraries/Util.class.php:4324
+#: libraries/Menu.class.php:626 libraries/Util.class.php:4330
 msgid "Engines"
 msgstr ""
 
@@ -4454,7 +4465,7 @@ msgid_plural "%1$d rows inserted."
 msgstr[0] ""
 msgstr[1] ""
 
-#: libraries/PDF.class.php:70 libraries/Util.class.php:2521
+#: libraries/PDF.class.php:70 libraries/Util.class.php:2527
 #: libraries/browse_foreigners.lib.php:327
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:865
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:890
@@ -4481,7 +4492,7 @@ msgid "Could not save favorite table!"
 msgstr "Dokumentacija"
 
 #: libraries/RecentFavoriteTable.class.php:212
-#: templates/structure/favorite_anchor.phtml:12
+#: templates/database/structure/favorite_anchor.phtml:12
 #, fuzzy
 msgid "Remove from Favorites"
 msgstr "Promjeni ime tabele u "
@@ -4667,7 +4678,7 @@ msgid ""
 msgstr ""
 
 #: libraries/StorageEngine.class.php:373
-#: templates/structure/body_for_table_summary.phtml:50
+#: templates/database/structure/body_for_table_summary.phtml:50
 #, php-format
 msgid "%s is the default storage engine on this MySQL server."
 msgstr ""
@@ -5092,10 +5103,10 @@ msgstr ""
 
 #: libraries/Util.class.php:726 libraries/rte/rte_events.lib.php:110
 #: libraries/rte/rte_events.lib.php:119 libraries/rte/rte_events.lib.php:150
-#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:153
-#: libraries/rte/rte_routines.lib.php:162
-#: libraries/rte/rte_routines.lib.php:235
-#: libraries/rte/rte_routines.lib.php:1366
+#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:223
+#: libraries/rte/rte_routines.lib.php:250
+#: libraries/rte/rte_routines.lib.php:372
+#: libraries/rte/rte_routines.lib.php:1457
 #: libraries/rte/rte_triggers.lib.php:86 libraries/rte/rte_triggers.lib.php:95
 #: libraries/rte/rte_triggers.lib.php:127
 msgid "MySQL said: "
@@ -5141,78 +5152,81 @@ msgstr "Ned"
 msgid "%B %d, %Y at %I:%M %p"
 msgstr "%d. %B %Y. u %H:%M"
 
-#: libraries/Util.class.php:2019
+#: libraries/Util.class.php:2025
 #, php-format
 msgid "%s days, %s hours, %s minutes and %s seconds"
 msgstr "%s dana, %s sati, %s minuta i %s sekundi"
 
-#: libraries/Util.class.php:2112
+#: libraries/Util.class.php:2118
 #, fuzzy
 #| msgid "Add new field"
 msgid "Missing parameter:"
 msgstr "Dodaj novo polje"
 
-#: libraries/Util.class.php:2645
+#: libraries/Util.class.php:2651
 #, php-format
 msgid "Jump to database \"%s\"."
 msgstr "Pređi na bazu \"%s\"."
 
-#: libraries/Util.class.php:2670
+#: libraries/Util.class.php:2676
 #, php-format
 msgid "The %s functionality is affected by a known bug, see %s"
 msgstr ""
 
-#: libraries/Util.class.php:2881
+#: libraries/Util.class.php:2887
 msgid "Click to toggle"
 msgstr ""
 
-#: libraries/Util.class.php:3542 prefs_manage.php:248
+#: libraries/Util.class.php:3548 prefs_manage.php:248
 msgid "Browse your computer:"
 msgstr ""
 
-#: libraries/Util.class.php:3567
+#: libraries/Util.class.php:3573
 #, fuzzy, php-format
 #| msgid "web server upload directory"
 msgid "Select from the web server upload directory <b>%s</b>:"
 msgstr "direkcija za slanje web servera "
 
-#: libraries/Util.class.php:3596 libraries/insert_edit.lib.php:1173
+#: libraries/Util.class.php:3602 libraries/insert_edit.lib.php:1171
 msgid "The directory you set for upload work cannot be reached."
 msgstr "Direkcija koju ste izabrali za slanje nije dostupna."
 
-#: libraries/Util.class.php:3607
+#: libraries/Util.class.php:3613
 msgid "There are no files to upload!"
 msgstr ""
 
-#: libraries/Util.class.php:3632 libraries/Util.class.php:3633
-#: templates/structure/check_all_tables.phtml:15
+#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: templates/database/structure/check_all_tables.phtml:15
 msgid "Empty"
 msgstr "Isprazni"
 
-#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: libraries/Util.class.php:3644 libraries/Util.class.php:3645
 msgid "Execute"
 msgstr ""
 
-#: libraries/Util.class.php:4152
+#: libraries/Util.class.php:4158
 msgid "Print"
 msgstr "Štampaj"
 
-#: libraries/Util.class.php:4257 templates/structure/row_stats_table.phtml:80
-#: templates/structure/table_header.phtml:95
+#: libraries/Util.class.php:4263
+#: templates/database/structure/table_header.phtml:95
+#: templates/table/structure/row_stats_table.phtml:80
 msgid "Creation"
 msgstr "Napravljeno"
 
-#: libraries/Util.class.php:4263 templates/structure/row_stats_table.phtml:87
-#: templates/structure/table_header.phtml:106
+#: libraries/Util.class.php:4269
+#: templates/database/structure/table_header.phtml:106
+#: templates/table/structure/row_stats_table.phtml:87
 msgid "Last update"
 msgstr "Posljednja izmjena"
 
-#: libraries/Util.class.php:4269 templates/structure/row_stats_table.phtml:94
-#: templates/structure/table_header.phtml:117
+#: libraries/Util.class.php:4275
+#: templates/database/structure/table_header.phtml:117
+#: templates/table/structure/row_stats_table.phtml:94
 msgid "Last check"
 msgstr "Posljednja provjera"
 
-#: libraries/Util.class.php:4315
+#: libraries/Util.class.php:4321
 #, fuzzy
 #| msgid "User"
 msgid "Users"
@@ -5237,16 +5251,16 @@ msgid "Use this value"
 msgstr "Koristi ovu vrijednost"
 
 #: libraries/build_html_for_db.lib.php:33 libraries/import.lib.php:193
-#: templates/structure/actions_in_table_structure.phtml:113
-#: templates/structure/row_stats_table.phtml:42
-#: templates/structure/table_header.phtml:36
+#: templates/database/structure/table_header.phtml:36
+#: templates/table/structure/actions_in_table_structure.phtml:113
+#: templates/table/structure/row_stats_table.phtml:42
 msgid "Rows"
 msgstr "Redova"
 
 #: libraries/build_html_for_db.lib.php:48 libraries/engines/innodb.lib.php:171
-#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:186
-#: libraries/server_status.lib.php:298
-#: templates/structure/display_table_stats.phtml:40
+#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:195
+#: libraries/server_status.lib.php:307
+#: templates/table/structure/display_table_stats.phtml:40
 msgid "Total"
 msgstr "Ukupno"
 
@@ -5256,10 +5270,12 @@ msgid "Jump to database"
 msgstr "Baza ne postoji"
 
 #: libraries/build_html_for_db.lib.php:146
+#: templates/database/structure/structure_table_row.phtml:15
 msgid "Not replicated"
 msgstr ""
 
 #: libraries/build_html_for_db.lib.php:158
+#: templates/database/structure/structure_table_row.phtml:16
 #, fuzzy
 msgid "Replicated"
 msgstr "Relacije"
@@ -5316,17 +5332,17 @@ msgstr ""
 #: libraries/plugins/export/ExportTexytext.class.php:425
 #: libraries/plugins/export/PMA_ExportPdf.class.php:307
 #: libraries/rte/rte_list.lib.php:73 libraries/rte/rte_list.lib.php:85
-#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:830
-#: libraries/rte/rte_routines.lib.php:1492 setup/frames/index.inc.php:162
+#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:921
+#: libraries/rte/rte_routines.lib.php:1583 setup/frames/index.inc.php:162
 #: templates/columns_definitions/table_fields_definitions.phtml:8
-#: templates/structure/table_structure_header.phtml:5
-#: templates/table/create_table.phtml:11
+#: templates/database/create_table.phtml:11
+#: templates/table/structure/table_structure_header.phtml:5
 msgid "Name"
 msgstr "Ime"
 
 #: libraries/central_columns.lib.php:699
 #: libraries/central_columns.lib.php:1381
-#: libraries/rte/rte_routines.lib.php:832
+#: libraries/rte/rte_routines.lib.php:923
 #: templates/columns_definitions/table_fields_definitions.phtml:14
 msgid "Length/Values"
 msgstr "Dužina/Vrijednost*"
@@ -5349,7 +5365,7 @@ msgid "Select a table"
 msgstr "Izaberi tabele"
 
 #: libraries/central_columns.lib.php:804
-#: templates/structure/add_column.phtml:4
+#: templates/table/structure/add_column.phtml:4
 #, fuzzy
 msgid "Add column"
 msgstr "Dodaj novo polje"
@@ -5369,7 +5385,7 @@ msgstr "Dodaj novo polje"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1002
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1025
 #: templates/columns_definitions/table_fields_definitions.phtml:36
-#: templates/structure/table_structure_header.phtml:8
+#: templates/table/structure/table_structure_header.phtml:8
 msgid "Attributes"
 msgstr "Atributi"
 
@@ -5489,7 +5505,7 @@ msgid "Double click"
 msgstr ""
 
 #: libraries/config.values.php:95 libraries/config.values.php:124
-#: libraries/config/FormDisplay.tpl.php:221 libraries/relation.lib.php:97
+#: libraries/config/FormDisplay.tpl.php:232 libraries/relation.lib.php:97
 #: libraries/relation.lib.php:105
 msgid "Disabled"
 msgstr "Onemogućeno"
@@ -5679,21 +5695,21 @@ msgstr ""
 msgid "maximum %s"
 msgstr ""
 
-#: libraries/config/FormDisplay.tpl.php:219
+#: libraries/config/FormDisplay.tpl.php:230
 msgid "This setting is disabled, it will not be applied to your configuration."
 msgstr ""
 
-#: libraries/config/FormDisplay.tpl.php:313
+#: libraries/config/FormDisplay.tpl.php:324
 #, php-format
 msgid "Set value: %s"
 msgstr ""
 
-#: libraries/config/FormDisplay.tpl.php:318
+#: libraries/config/FormDisplay.tpl.php:329
 #: libraries/config/messages.inc.php:610
 msgid "Restore default value"
 msgstr ""
 
-#: libraries/config/FormDisplay.tpl.php:332
+#: libraries/config/FormDisplay.tpl.php:343
 msgid "Allow users to customize this value"
 msgstr ""
 
@@ -6128,7 +6144,7 @@ msgstr "Karakter set datoteke:"
 
 #: libraries/config/messages.inc.php:136 libraries/config/messages.inc.php:152
 #: libraries/sql_query_form.lib.php:247
-#: templates/structure/row_stats_table.phtml:7
+#: templates/table/structure/row_stats_table.phtml:7
 msgid "Format"
 msgstr "Format"
 
@@ -6686,7 +6702,7 @@ msgstr ""
 
 #: libraries/config/messages.inc.php:332
 #: libraries/plugins/export/ExportPdf.class.php:279
-#: templates/structure/secondary_tabs.phtml:8
+#: templates/table/secondary_tabs.phtml:8
 #, fuzzy
 #| msgid "Databases"
 msgid "Table structure"
@@ -8290,110 +8306,34 @@ msgstr ""
 msgid "OpenDocument Text"
 msgstr "Dokumentacija"
 
-#: libraries/controllers/StructureController.class.php:465
+#: libraries/controllers/DatabaseStructureController.class.php:405
 #: tbl_operations.php:382
 #, php-format
 msgid "Table %s has been emptied."
 msgstr "Tabela %s je ispražnjena."
 
-#: libraries/controllers/StructureController.class.php:486
+#: libraries/controllers/DatabaseStructureController.class.php:426
 #: tbl_operations.php:400 view_operations.php:119
 #, fuzzy, php-format
 msgid "View %s has been dropped."
 msgstr "Polje %s je obrisano"
 
-#: libraries/controllers/StructureController.class.php:487
+#: libraries/controllers/DatabaseStructureController.class.php:427
 #: tbl_operations.php:401
 #, fuzzy, php-format
 #| msgid "Table %s has been dropped."
 msgid "Table %s has been dropped."
 msgstr "Tabela %s je odbačena"
 
-#: libraries/controllers/StructureController.class.php:797
-#, php-format
-msgid "The name '%s' is a MySQL reserved keyword."
-msgid_plural "The names '%s' are MySQL reserved keywords."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: libraries/controllers/StructureController.class.php:875
-#, fuzzy
-#| msgid "No databases selected."
-msgid "No column selected."
-msgstr "Nije izabrana ni jedna baza."
-
-#: libraries/controllers/StructureController.class.php:1049
+#: libraries/controllers/DatabaseStructureController.class.php:733
 msgid "Favorite List is full!"
 msgstr ""
 
-#: libraries/controllers/StructureController.class.php:1272
-#, fuzzy
-#| msgid "The selected users have been deleted successfully."
-msgid "The columns have been moved successfully."
-msgstr "Izabrani korisnici su uspješno obrisani."
-
-#: libraries/controllers/StructureController.class.php:1535
-#, fuzzy, php-format
-msgid ""
-"Table %1$s has been altered successfully. Privileges have been adjusted."
-msgstr "Izabrani korisnici su uspješno obrisani."
-
-#: libraries/controllers/StructureController.class.php:1541
-#: libraries/controllers/TableIndexesController.class.php:161
-#: tbl_addfield.php:92
-#, fuzzy, php-format
-msgid "Table %1$s has been altered successfully."
-msgstr "Izabrani korisnici su uspješno obrisani."
-
-#: libraries/controllers/StructureController.class.php:1588
-#: libraries/tracking.lib.php:1094
-#, fuzzy
-#| msgid "Query type"
-msgid "Query error"
-msgstr "Vrsta upita"
-
-#: libraries/controllers/StructureController.class.php:1806
+#: libraries/controllers/DatabaseStructureController.class.php:947
 #: libraries/mysql_charsets.lib.php:366 libraries/mysql_charsets.lib.php:373
 msgid "unknown"
 msgstr "nepoznat"
 
-#: libraries/controllers/StructureController.class.php:1957
-#: templates/structure/check_all_table_column.phtml:11
-msgid "Change"
-msgstr "Promijeni"
-
-#: libraries/controllers/StructureController.class.php:1961
-#: libraries/controllers/StructureController.class.php:1966
-#: libraries/navigation/Nodes/Node_Index.class.php:30
-#: libraries/tracking.lib.php:926
-#: templates/columns_definitions/column_indexes.phtml:16
-#: templates/columns_definitions/table_fields_definitions.phtml:57
-#: templates/structure/check_all_table_column.phtml:30
-#: templates/structure/display_structure.phtml:79
-#: templates/structure/display_table_stats.phtml:19
-msgid "Index"
-msgstr "Ključ"
-
-#: libraries/controllers/StructureController.class.php:1963
-#: libraries/controllers/StructureController.class.php:1968
-#: templates/columns_definitions/column_indexes.phtml:27
-#: templates/structure/check_all_table_column.phtml:37
-msgid "Spatial"
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1964
-#: libraries/controllers/StructureController.class.php:1969
-#: templates/columns_definitions/column_indexes.phtml:22
-#: templates/structure/check_all_table_column.phtml:47
-msgid "Fulltext"
-msgstr "Tekst ključ"
-
-#: libraries/controllers/StructureController.class.php:1970
-#, fuzzy
-msgid "Distinct values"
-msgstr "Pregledaj strane vrijednosti"
-
 #: libraries/controllers/TableChartController.class.php:82
 #: libraries/controllers/TableGisVisualizationController.class.php:101
 msgid "No SQL query was set to fetch data."
@@ -8409,13 +8349,20 @@ msgstr ""
 msgid "No data to display"
 msgstr "Baza ne postoji"
 
-#: libraries/controllers/TableRelationController.class.php:217
+#: libraries/controllers/TableIndexesController.class.php:161
+#: libraries/controllers/TableStructureController.class.php:736
+#: tbl_addfield.php:92
+#, fuzzy, php-format
+msgid "Table %1$s has been altered successfully."
+msgstr "Izabrani korisnici su uspješno obrisani."
+
+#: libraries/controllers/TableRelationController.class.php:218
 #, fuzzy
 #| msgid "Thread %s was successfully killed."
 msgid "Display column was successfully updated."
 msgstr "Proces %s je uspješno prekinut."
 
-#: libraries/controllers/TableRelationController.class.php:283
+#: libraries/controllers/TableRelationController.class.php:288
 #, fuzzy
 msgid "Internal relations were successfully updated."
 msgstr "Opšte osobine relacija"
@@ -8433,11 +8380,80 @@ msgid "Zoom search"
 msgstr "Pretraživanje"
 
 #: libraries/controllers/TableSearchController.class.php:852
-#: templates/table/selection_form.phtml:59
+#: templates/table/search/selection_form.phtml:59
 #, fuzzy
 msgid "Find and replace"
 msgstr "SQL upit"
 
+#: libraries/controllers/TableStructureController.class.php:163
+#, php-format
+msgid "The name '%s' is a MySQL reserved keyword."
+msgid_plural "The names '%s' are MySQL reserved keywords."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: libraries/controllers/TableStructureController.class.php:241
+#, fuzzy
+#| msgid "No databases selected."
+msgid "No column selected."
+msgstr "Nije izabrana ni jedna baza."
+
+#: libraries/controllers/TableStructureController.class.php:467
+#, fuzzy
+#| msgid "The selected users have been deleted successfully."
+msgid "The columns have been moved successfully."
+msgstr "Izabrani korisnici su uspješno obrisani."
+
+#: libraries/controllers/TableStructureController.class.php:730
+#, fuzzy, php-format
+msgid ""
+"Table %1$s has been altered successfully. Privileges have been adjusted."
+msgstr "Izabrani korisnici su uspješno obrisani."
+
+#: libraries/controllers/TableStructureController.class.php:783
+#: libraries/tracking.lib.php:1094
+#, fuzzy
+#| msgid "Query type"
+msgid "Query error"
+msgstr "Vrsta upita"
+
+#: libraries/controllers/TableStructureController.class.php:948
+#: templates/table/structure/check_all_table_column.phtml:11
+msgid "Change"
+msgstr "Promijeni"
+
+#: libraries/controllers/TableStructureController.class.php:952
+#: libraries/controllers/TableStructureController.class.php:957
+#: libraries/navigation/Nodes/Node_Index.class.php:30
+#: libraries/tracking.lib.php:926
+#: templates/columns_definitions/column_indexes.phtml:16
+#: templates/columns_definitions/table_fields_definitions.phtml:57
+#: templates/table/structure/check_all_table_column.phtml:30
+#: templates/table/structure/display_structure.phtml:79
+#: templates/table/structure/display_table_stats.phtml:19
+msgid "Index"
+msgstr "Ključ"
+
+#: libraries/controllers/TableStructureController.class.php:954
+#: libraries/controllers/TableStructureController.class.php:959
+#: templates/columns_definitions/column_indexes.phtml:27
+#: templates/table/structure/check_all_table_column.phtml:37
+msgid "Spatial"
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:955
+#: libraries/controllers/TableStructureController.class.php:960
+#: templates/columns_definitions/column_indexes.phtml:22
+#: templates/table/structure/check_all_table_column.phtml:47
+msgid "Fulltext"
+msgstr "Tekst ključ"
+
+#: libraries/controllers/TableStructureController.class.php:963
+#, fuzzy
+msgid "Distinct values"
+msgstr "Pregledaj strane vrijednosti"
+
 #: libraries/core.lib.php:306
 #, php-format
 msgid "The %s extension is missing. Please check your PHP configuration."
@@ -8482,7 +8498,7 @@ msgid "No Password"
 msgstr "Nema lozinke"
 
 #: libraries/display_change_password.lib.php:68
-#: libraries/plugins/auth/AuthenticationCookie.class.php:199
+#: libraries/plugins/auth/AuthenticationCookie.class.php:187
 #: libraries/replication_gui.lib.php:422 libraries/replication_gui.lib.php:862
 #: libraries/server_privileges.lib.php:1640
 msgid "Password:"
@@ -9283,12 +9299,12 @@ msgid "Dump has been saved to file %s."
 msgstr "Sadržaj baze je sačuvan u fajl %s."
 
 #: libraries/import.lib.php:202 libraries/insert_edit.lib.php:124
-#: libraries/rte/rte_routines.lib.php:1353 libraries/sql.lib.php:1312
+#: libraries/rte/rte_routines.lib.php:1444 libraries/sql.lib.php:1306
 #: tbl_get_field.php:44
 msgid "MySQL returned an empty result set (i.e. zero rows)."
 msgstr "MySQL je vratio prazan rezultat (nula redova)."
 
-#: libraries/import.lib.php:265 libraries/sql.lib.php:1326
+#: libraries/import.lib.php:265 libraries/sql.lib.php:1320
 msgid "[ROLLBACK occurred.]"
 msgstr ""
 
@@ -9354,14 +9370,14 @@ msgstr "Napravi ključ na&nbsp;%s&nbsp;kolona"
 
 #: libraries/insert_edit.lib.php:233
 #: libraries/navigation/Nodes/Node_DatabaseChild.class.php:48
-#: templates/designer/table_list.phtml:40
+#: templates/database/designer/table_list.phtml:40
 msgid "Hide"
 msgstr ""
 
 #: libraries/insert_edit.lib.php:249
 #: libraries/navigation/Nodes/Node_Function.class.php:32
-#: libraries/rte/rte_routines.lib.php:1495
-#: templates/table/table_header.phtml:4
+#: libraries/rte/rte_routines.lib.php:1586
+#: templates/table/search/table_header.phtml:4
 msgid "Function"
 msgstr "Funkcija"
 
@@ -9376,87 +9392,88 @@ msgstr "Binarni"
 msgid "Because of its length,<br /> this column might not be editable."
 msgstr "Zbog njehove veličine, polje<br />možda nećete moći da izmenite"
 
-#: libraries/insert_edit.lib.php:1050
+#: libraries/insert_edit.lib.php:1048
 msgid "Binary - do not edit"
 msgstr "Binarni - ne mijenjaj"
 
-#: libraries/insert_edit.lib.php:1176 libraries/server_privileges.lib.php:470
-#: templates/table/options.phtml:36
+#: libraries/insert_edit.lib.php:1174 libraries/server_privileges.lib.php:470
+#: templates/table/search/options.phtml:36
 msgid "Or"
 msgstr "ili"
 
-#: libraries/insert_edit.lib.php:1177
+#: libraries/insert_edit.lib.php:1175
 #, fuzzy
 #| msgid "web server upload directory"
 msgid "web server upload directory:"
 msgstr "direkcija za slanje web servera"
 
-#: libraries/insert_edit.lib.php:1348 templates/table/input_box.phtml:49
+#: libraries/insert_edit.lib.php:1346
+#: templates/table/search/input_box.phtml:49
 #, fuzzy
 #| msgid "Insert"
 msgid "Edit/Insert"
 msgstr "Novi zapis"
 
-#: libraries/insert_edit.lib.php:1398
+#: libraries/insert_edit.lib.php:1396
 #, php-format
 msgid "Continue insertion with %s rows"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1428
+#: libraries/insert_edit.lib.php:1426
 msgid "and then"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1461
+#: libraries/insert_edit.lib.php:1459
 msgid "Insert as new row"
 msgstr "Unesi kao novi red"
 
-#: libraries/insert_edit.lib.php:1464
+#: libraries/insert_edit.lib.php:1462
 msgid "Insert as new row and ignore errors"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1467
+#: libraries/insert_edit.lib.php:1465
 msgid "Show insert query"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1487
+#: libraries/insert_edit.lib.php:1485
 msgid "Go back to previous page"
 msgstr "Nazad na prethodnu stranu"
 
-#: libraries/insert_edit.lib.php:1490
+#: libraries/insert_edit.lib.php:1488
 msgid "Insert another new row"
 msgstr "Dodaj još jedan novi red"
 
-#: libraries/insert_edit.lib.php:1495
+#: libraries/insert_edit.lib.php:1493
 #, fuzzy
 msgid "Go back to this page"
 msgstr "Nazad na prethodnu stranu"
 
-#: libraries/insert_edit.lib.php:1518
+#: libraries/insert_edit.lib.php:1516
 msgid "Edit next row"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1540
+#: libraries/insert_edit.lib.php:1538
 msgid ""
 "Use TAB key to move from value to value, or CTRL+arrows to move anywhere"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1577 libraries/replication_gui.lib.php:542
-#: libraries/rte/rte_routines.lib.php:1497
+#: libraries/insert_edit.lib.php:1575 libraries/replication_gui.lib.php:542
+#: libraries/rte/rte_routines.lib.php:1588
 #: libraries/server_status_variables.lib.php:220
-#: templates/designer/having_query_panel.phtml:100
-#: templates/designer/options_panel.phtml:73
-#: templates/designer/options_panel.phtml:239
-#: templates/designer/where_query_panel.phtml:69
-#: templates/table/table_header.phtml:10
-#: templates/table/zoom_result_form.phtml:35
+#: templates/database/designer/having_query_panel.phtml:100
+#: templates/database/designer/options_panel.phtml:73
+#: templates/database/designer/options_panel.phtml:239
+#: templates/database/designer/where_query_panel.phtml:69
+#: templates/table/search/table_header.phtml:10
+#: templates/table/search/zoom_result_form.phtml:35
 msgid "Value"
 msgstr "Vrijednost"
 
-#: libraries/insert_edit.lib.php:1937 libraries/sql.lib.php:1309
+#: libraries/insert_edit.lib.php:1935 libraries/sql.lib.php:1303
 msgid "Showing SQL query"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1962 libraries/sql.lib.php:1287
+#: libraries/insert_edit.lib.php:1960 libraries/sql.lib.php:1281
 #, php-format
 msgid "Inserted row id: %1$d"
 msgstr ""
@@ -9908,7 +9925,7 @@ msgstr ""
 #: libraries/navigation/Nodes/Node_View_Container.class.php:26
 #: libraries/navigation/Nodes/Node_View_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:129
-#: templates/structure/show_create.phtml:30
+#: templates/database/structure/show_create.phtml:30
 msgid "Views"
 msgstr ""
 
@@ -10213,7 +10230,7 @@ msgstr "Nije Vam dozvoljeno da budete ovdje!"
 
 #: libraries/operations.lib.php:101 libraries/operations.lib.php:249
 #: libraries/operations.lib.php:869 libraries/operations.lib.php:963
-#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:907
+#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:998
 #: templates/columns_definitions/table_fields_definitions.phtml:47
 #, fuzzy
 #| msgid "Edit Privileges"
@@ -10309,22 +10326,22 @@ msgid "Switch to copied table"
 msgstr "Pređi na kopiranu tabelu"
 
 #: libraries/operations.lib.php:1360
-#: templates/structure/check_all_tables.phtml:18
+#: templates/database/structure/check_all_tables.phtml:18
 msgid "Table maintenance"
 msgstr "Radnje na tabeli"
 
 #: libraries/operations.lib.php:1398
-#: templates/structure/check_all_tables.phtml:19
+#: templates/database/structure/check_all_tables.phtml:19
 msgid "Analyze table"
 msgstr "Analiziraj tabelu"
 
 #: libraries/operations.lib.php:1413
-#: templates/structure/check_all_tables.phtml:20
+#: templates/database/structure/check_all_tables.phtml:20
 msgid "Check table"
 msgstr "Provjeri tabelu"
 
 #: libraries/operations.lib.php:1428
-#: templates/structure/check_all_tables.phtml:22
+#: templates/database/structure/check_all_tables.phtml:22
 #, fuzzy
 #| msgid "Check table"
 msgid "Checksum table"
@@ -10346,18 +10363,19 @@ msgid "Flush the table (FLUSH)"
 msgstr "Osvježi tabelu (\"FLUSH\")"
 
 #: libraries/operations.lib.php:1477
-#: templates/structure/check_all_tables.phtml:23
-#: templates/structure/display_table_stats.phtml:56
+#: templates/database/structure/check_all_tables.phtml:23
+#: templates/table/structure/display_table_stats.phtml:56
 msgid "Optimize table"
 msgstr "Optimiziraj tabelu"
 
 #: libraries/operations.lib.php:1492
-#: templates/structure/check_all_tables.phtml:24
+#: templates/database/structure/check_all_tables.phtml:24
 msgid "Repair table"
 msgstr "Popravi tabelu"
 
 #: libraries/operations.lib.php:1538
-#: templates/structure/check_all_tables.phtml:14 view_operations.php:127
+#: templates/database/structure/check_all_tables.phtml:14
+#: view_operations.php:127
 #, fuzzy
 #| msgid "Dumping data for table"
 msgid "Delete data or table"
@@ -10489,7 +10507,7 @@ msgid "Cannot connect: invalid settings."
 msgstr ""
 
 #: libraries/plugins/auth/AuthenticationConfig.class.php:108
-#: libraries/plugins/auth/AuthenticationCookie.class.php:134
+#: libraries/plugins/auth/AuthenticationCookie.class.php:122
 #: libraries/plugins/auth/AuthenticationHttp.class.php:96
 #, php-format
 msgid "Welcome to %s"
@@ -10518,38 +10536,38 @@ msgstr ""
 msgid "Retry to connect"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:146
+#: libraries/plugins/auth/AuthenticationCookie.class.php:134
 msgid "Your session has expired. Please log in again."
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:170
+#: libraries/plugins/auth/AuthenticationCookie.class.php:158
 msgid "Log in"
 msgstr "Prijavljivanje"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:178
-#: libraries/plugins/auth/AuthenticationCookie.class.php:188
+#: libraries/plugins/auth/AuthenticationCookie.class.php:166
+#: libraries/plugins/auth/AuthenticationCookie.class.php:176
 msgid "You can enter hostname/IP address and port separated by space."
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:193
+#: libraries/plugins/auth/AuthenticationCookie.class.php:181
 msgid "Username:"
 msgstr "Korisničko ime:"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:205
+#: libraries/plugins/auth/AuthenticationCookie.class.php:193
 #, fuzzy
 #| msgid "Server Choice"
 msgid "Server Choice:"
 msgstr "Izbor servera"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:386
+#: libraries/plugins/auth/AuthenticationCookie.class.php:374
 msgid "Entered captcha is wrong, try again!"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:396
+#: libraries/plugins/auth/AuthenticationCookie.class.php:384
 msgid "Please enter correct captcha!"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:423
+#: libraries/plugins/auth/AuthenticationCookie.class.php:411
 #, fuzzy
 #| msgid "Cannot log in to the MySQL server"
 msgid "You are not allowed to log in to this MySQL server!"
@@ -10659,7 +10677,7 @@ msgstr "Poslato"
 #: libraries/plugins/export/ExportOdt.class.php:593
 #: libraries/plugins/export/ExportTexytext.class.php:428
 #: libraries/plugins/export/PMA_ExportPdf.class.php:313
-#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:984
 #: libraries/rte/rte_triggers.lib.php:377
 #, fuzzy
 #| msgid "Description"
@@ -11009,7 +11027,7 @@ msgid "Last check:"
 msgstr "Posljednja provjera"
 
 #: libraries/plugins/export/ExportSql.class.php:1399
-#: templates/structure/structure_table_row.phtml:183
+#: templates/database/structure/structure_table_row.phtml:183
 msgid "in use"
 msgstr "se koristi"
 
@@ -11207,18 +11225,14 @@ msgstr ""
 msgid "The imported file does not contain any data!"
 msgstr ""
 
-#: libraries/plugins/import/ImportSql.class.php:169
+#: libraries/plugins/import/ImportSql.class.php:72
 msgid "SQL compatibility mode:"
 msgstr ""
 
-#: libraries/plugins/import/ImportSql.class.php:181
+#: libraries/plugins/import/ImportSql.class.php:84
 msgid "Do not use <code>AUTO_INCREMENT</code> for zero values"
 msgstr ""
 
-#: libraries/plugins/import/ImportSql.class.php:195
-msgid "Read as multibytes"
-msgstr ""
-
 #: libraries/plugins/import/ImportXml.class.php:54
 msgid "XML"
 msgstr "XML"
@@ -11263,7 +11277,7 @@ msgid "Show grid"
 msgstr "Prikaži mrežu"
 
 #: libraries/plugins/schema/SchemaPdf.class.php:94
-#: templates/structure/print_view_data_dictionary_link.phtml:6
+#: templates/database/structure/print_view_data_dictionary_link.phtml:6
 msgid "Data Dictionary"
 msgstr "Rečnik podataka"
 
@@ -11295,7 +11309,7 @@ msgid "The %s table doesn't exist!"
 msgstr "Tabela \"%s\" ne postoji!"
 
 #: libraries/plugins/schema/eps/Eps_Relation_Schema.class.php:321
-#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:309
+#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:323
 #, fuzzy, php-format
 #| msgid "Schema of the \"%s\" database - Page %s"
 msgid "Schema of the %s database - Page %s"
@@ -11324,7 +11338,7 @@ msgstr "Sadržaj"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1005
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1028
 #: libraries/tracking.lib.php:884
-#: templates/structure/table_structure_header.phtml:11
+#: templates/table/structure/table_structure_header.phtml:11
 msgid "Extra"
 msgstr "Dodatno"
 
@@ -11706,51 +11720,51 @@ msgstr ""
 msgid "Create the needed tables with the <code>%screate_tables.sql</code>."
 msgstr ""
 
-#: libraries/relation.lib.php:360
+#: libraries/relation.lib.php:357
 msgid "Create a pma user and give access to these tables."
 msgstr ""
 
-#: libraries/relation.lib.php:365
+#: libraries/relation.lib.php:360
 msgid ""
 "Enable advanced features in configuration file (<code>config.inc.php</"
 "code>), for example by starting from <code>config.sample.inc.php</code>."
 msgstr ""
 
-#: libraries/relation.lib.php:373
+#: libraries/relation.lib.php:365
 msgid "Re-login to phpMyAdmin to load the updated configuration file."
 msgstr ""
 
-#: libraries/relation.lib.php:1612
+#: libraries/relation.lib.php:1607
 msgid "no description"
 msgstr "nema opisa"
 
-#: libraries/relation.lib.php:1811
+#: libraries/relation.lib.php:1806
 msgid ""
 "You do not have necessary privileges to create a database named "
 "'phpmyadmin'. You may go to 'Operations' tab of any database to set up the "
 "phpMyAdmin configuration storage there."
 msgstr ""
 
-#: libraries/relation.lib.php:1928
+#: libraries/relation.lib.php:1923
 #, php-format
 msgid ""
 "%sCreate%s a database named 'phpmyadmin' and setup the phpMyAdmin "
 "configuration storage there."
 msgstr ""
 
-#: libraries/relation.lib.php:1936
+#: libraries/relation.lib.php:1931
 #, php-format
 msgid ""
 "%sCreate%s the phpMyAdmin configuration storage in the current database."
 msgstr ""
 
-#: libraries/relation.lib.php:1944
+#: libraries/relation.lib.php:1939
 #, php-format
 msgid "%sCreate%s missing phpMyAdmin configuration storage tables."
 msgstr ""
 
 #: libraries/replication_gui.lib.php:46 libraries/replication_gui.lib.php:343
-#: libraries/server_databases.lib.php:387
+#: libraries/server_databases.lib.php:398
 msgid "Master replication"
 msgstr ""
 
@@ -11806,7 +11820,7 @@ msgid ""
 msgstr ""
 
 #: libraries/replication_gui.lib.php:141
-#: libraries/server_databases.lib.php:389
+#: libraries/server_databases.lib.php:400
 msgid "Slave replication"
 msgstr ""
 
@@ -12091,10 +12105,10 @@ msgid "Master server changed successfully to %s."
 msgstr "Privilegije su uspešno ponovo učitane."
 
 #: libraries/rte/rte_events.lib.php:106 libraries/rte/rte_events.lib.php:115
-#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:149
-#: libraries/rte/rte_routines.lib.php:158
-#: libraries/rte/rte_routines.lib.php:231
-#: libraries/rte/rte_routines.lib.php:1362
+#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:219
+#: libraries/rte/rte_routines.lib.php:246
+#: libraries/rte/rte_routines.lib.php:368
+#: libraries/rte/rte_routines.lib.php:1453
 #: libraries/rte/rte_triggers.lib.php:82 libraries/rte/rte_triggers.lib.php:91
 #: libraries/rte/rte_triggers.lib.php:123
 #, php-format
@@ -12116,7 +12130,7 @@ msgstr "Tabela %s je odbačena"
 msgid "Event %1$s has been created."
 msgstr "Tabela %s je odbačena"
 
-#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:251
+#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:266
 #: libraries/rte/rte_triggers.lib.php:144
 msgid "One or more errors have occurred while processing your request:"
 msgstr ""
@@ -12126,7 +12140,7 @@ msgstr ""
 msgid "Edit event"
 msgstr "Poslato"
 
-#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:794
+#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:885
 #: libraries/rte/rte_triggers.lib.php:323 view_create.php:180
 msgid "Details"
 msgstr ""
@@ -12141,7 +12155,7 @@ msgstr "Vrsta upita"
 msgid "Event type"
 msgstr "Vrsta upita"
 
-#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:817
+#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:908
 #, fuzzy, php-format
 #| msgid "Change"
 msgid "Change to %s"
@@ -12176,12 +12190,14 @@ msgstr "Kraj"
 msgid "On completion preserve"
 msgstr "Kompletan INSERT (sa imenima polja)"
 
-#: libraries/rte/rte_events.lib.php:491 libraries/rte/rte_routines.lib.php:930
+#: libraries/rte/rte_events.lib.php:491
+#: libraries/rte/rte_routines.lib.php:1021
 #: libraries/rte/rte_triggers.lib.php:383 view_create.php:209
 msgid "Definer"
 msgstr ""
 
-#: libraries/rte/rte_events.lib.php:535 libraries/rte/rte_routines.lib.php:997
+#: libraries/rte/rte_events.lib.php:535
+#: libraries/rte/rte_routines.lib.php:1088
 #: libraries/rte/rte_triggers.lib.php:422
 msgid "The definer must be in the \"username@hostname\" format!"
 msgstr ""
@@ -12207,9 +12223,9 @@ msgid "You must provide an event definition."
 msgstr ""
 
 #: libraries/rte/rte_export.lib.php:43 libraries/rte/rte_general.lib.php:72
-#: libraries/rte/rte_routines.lib.php:345
-#: libraries/rte/rte_routines.lib.php:1198
-#: libraries/rte/rte_routines.lib.php:1411
+#: libraries/rte/rte_routines.lib.php:153
+#: libraries/rte/rte_routines.lib.php:1289
+#: libraries/rte/rte_routines.lib.php:1502
 #, fuzzy
 #| msgid "Processes"
 msgid "Error in processing request:"
@@ -12245,134 +12261,134 @@ msgid ""
 "problems."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:110
-#: libraries/rte/rte_routines.lib.php:1006
+#: libraries/rte/rte_routines.lib.php:123
+msgid "Edit routine"
+msgstr ""
+
+#: libraries/rte/rte_routines.lib.php:200
+#: libraries/rte/rte_routines.lib.php:1097
 #, php-format
 msgid "Invalid routine type: \"%s\""
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:170
+#: libraries/rte/rte_routines.lib.php:253
+#, fuzzy, php-format
+msgid "Routine %1$s has been created."
+msgstr "Tabela %s je odbačena"
+
+#: libraries/rte/rte_routines.lib.php:380
 msgid "Sorry, we failed to restore the dropped routine."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:211
+#: libraries/rte/rte_routines.lib.php:439
 #, fuzzy, php-format
 #| msgid "Table %s has been dropped."
 msgid "Routine %1$s has been modified. Privileges have been adjusted."
 msgstr "Tabela %s je odbačena"
 
-#: libraries/rte/rte_routines.lib.php:216
+#: libraries/rte/rte_routines.lib.php:444
 #, fuzzy, php-format
 #| msgid "Table %s has been dropped."
 msgid "Routine %1$s has been modified."
 msgstr "Tabela %s je odbačena"
 
-#: libraries/rte/rte_routines.lib.php:238
-#, fuzzy, php-format
-msgid "Routine %1$s has been created."
-msgstr "Tabela %s je odbačena"
-
-#: libraries/rte/rte_routines.lib.php:315
-msgid "Edit routine"
-msgstr ""
-
-#: libraries/rte/rte_routines.lib.php:797
+#: libraries/rte/rte_routines.lib.php:888
 #, fuzzy
 #| msgid "Column names"
 msgid "Routine name"
 msgstr "Imena kolona"
 
-#: libraries/rte/rte_routines.lib.php:823
+#: libraries/rte/rte_routines.lib.php:914
 msgid "Parameters"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:829
+#: libraries/rte/rte_routines.lib.php:920
 #, fuzzy
 #| msgid "Creation"
 msgid "Direction"
 msgstr "Napravljeno"
 
-#: libraries/rte/rte_routines.lib.php:847
+#: libraries/rte/rte_routines.lib.php:938
 #, fuzzy
 #| msgid "Add new field"
 msgid "Add parameter"
 msgstr "Dodaj novo polje"
 
-#: libraries/rte/rte_routines.lib.php:851
+#: libraries/rte/rte_routines.lib.php:942
 #, fuzzy
 msgid "Remove last parameter"
 msgstr "Promjeni ime tabele u "
 
-#: libraries/rte/rte_routines.lib.php:856
+#: libraries/rte/rte_routines.lib.php:947
 msgid "Return type"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:862
+#: libraries/rte/rte_routines.lib.php:953
 #, fuzzy
 #| msgid "Length/Values"
 msgid "Return length/values"
 msgstr "Dužina/Vrijednost*"
 
-#: libraries/rte/rte_routines.lib.php:868
+#: libraries/rte/rte_routines.lib.php:959
 #, fuzzy
 #| msgid "Table options"
 msgid "Return options"
 msgstr "Opcije tabele"
 
-#: libraries/rte/rte_routines.lib.php:899
+#: libraries/rte/rte_routines.lib.php:990
 msgid "Is deterministic"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:920
+#: libraries/rte/rte_routines.lib.php:1011
 msgid ""
 "You do not have sufficient privileges to perform this operation; Please "
 "refer to the documentation for more details"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:935
+#: libraries/rte/rte_routines.lib.php:1026
 #, fuzzy
 #| msgid "Query type"
 msgid "Security type"
 msgstr "Vrsta upita"
 
-#: libraries/rte/rte_routines.lib.php:944
+#: libraries/rte/rte_routines.lib.php:1035
 msgid "SQL data access"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1013
+#: libraries/rte/rte_routines.lib.php:1104
 msgid "You must provide a routine name!"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1047
+#: libraries/rte/rte_routines.lib.php:1138
 #, php-format
 msgid "Invalid direction \"%s\" given for parameter."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1069
-#: libraries/rte/rte_routines.lib.php:1131
+#: libraries/rte/rte_routines.lib.php:1160
+#: libraries/rte/rte_routines.lib.php:1222
 msgid ""
 "You must provide length/values for routine parameters of type ENUM, SET, "
 "VARCHAR and VARBINARY."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1095
+#: libraries/rte/rte_routines.lib.php:1186
 msgid "You must provide a name and a type for each routine parameter."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1114
+#: libraries/rte/rte_routines.lib.php:1205
 msgid "You must provide a valid return type for the routine."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1174
+#: libraries/rte/rte_routines.lib.php:1265
 msgid "You must provide a routine definition."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1285
+#: libraries/rte/rte_routines.lib.php:1376
 #, php-format
 msgid "Execution results of routine %s"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1340
+#: libraries/rte/rte_routines.lib.php:1431
 #, php-format
 msgid "%d row affected by the last statement inside the procedure."
 msgid_plural "%d rows affected by the last statement inside the procedure."
@@ -12380,13 +12396,13 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: libraries/rte/rte_routines.lib.php:1398
-#: libraries/rte/rte_routines.lib.php:1406
+#: libraries/rte/rte_routines.lib.php:1489
+#: libraries/rte/rte_routines.lib.php:1497
 msgid "Execute routine"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1485
-#: libraries/rte/rte_routines.lib.php:1488
+#: libraries/rte/rte_routines.lib.php:1576
+#: libraries/rte/rte_routines.lib.php:1579
 msgid "Routine parameters"
 msgstr ""
 
@@ -12565,7 +12581,7 @@ msgid "Original position"
 msgstr ""
 
 #: libraries/server_bin_log.lib.php:133
-#: templates/structure/display_table_stats.phtml:4
+#: templates/table/structure/display_table_stats.phtml:4
 #, fuzzy
 msgid "Information"
 msgstr "Podatci o prijavi"
@@ -12604,12 +12620,12 @@ msgstr ""
 "Napomena: uključivanje statistika može prouzrokovati veliki protok podataka "
 "između web i MySQL servera."
 
-#: libraries/server_databases.lib.php:364
-#: libraries/server_databases.lib.php:365
+#: libraries/server_databases.lib.php:366
+#: libraries/server_databases.lib.php:371
 msgid "Enable Statistics"
 msgstr "Uključi statistike"
 
-#: libraries/server_databases.lib.php:481
+#: libraries/server_databases.lib.php:492
 #, fuzzy, php-format
 #| msgid "%s databases have been dropped successfully."
 msgid "%1$d database has been dropped successfully."
@@ -12998,7 +13014,7 @@ msgid "You have revoked the privileges for %s."
 msgstr "Zabranili ste privilegije za %s."
 
 #: libraries/server_privileges.lib.php:2059
-#: libraries/server_privileges.lib.php:4290
+#: libraries/server_privileges.lib.php:4316
 #, fuzzy
 #| msgid "Any user"
 msgid "Add user account"
@@ -13180,60 +13196,60 @@ msgstr "Brišem %s"
 msgid "The privileges were reloaded successfully."
 msgstr "Privilegije su uspešno ponovo učitane."
 
-#: libraries/server_privileges.lib.php:3994
+#: libraries/server_privileges.lib.php:4003
 #, php-format
 msgid "The user %s already exists!"
 msgstr "Korisnik %s već postoji!"
 
-#: libraries/server_privileges.lib.php:4232
+#: libraries/server_privileges.lib.php:4258
 #, fuzzy, php-format
 #| msgid "Privileges"
 msgid "Privileges for %s"
 msgstr "Privilegije"
 
-#: libraries/server_privileges.lib.php:4241
+#: libraries/server_privileges.lib.php:4267
 #: libraries/server_status_processes.lib.php:72
 #: libraries/server_user_groups.lib.php:39
 msgid "User"
 msgstr "Korisnik"
 
-#: libraries/server_privileges.lib.php:4282
+#: libraries/server_privileges.lib.php:4308
 msgctxt "Create new user"
 msgid "New"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4311
+#: libraries/server_privileges.lib.php:4337
 #, fuzzy
 #| msgid "Edit Privileges"
 msgid "Edit privileges:"
 msgstr "Promijeni privilegije"
 
-#: libraries/server_privileges.lib.php:4312
+#: libraries/server_privileges.lib.php:4338
 #, fuzzy
 #| msgid "User"
 msgid "User account"
 msgstr "Korisnik"
 
-#: libraries/server_privileges.lib.php:4371
+#: libraries/server_privileges.lib.php:4397
 msgid ""
 "Note: You are attempting to edit privileges of the user with which you are "
 "currently logged in."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4391 libraries/server_users.lib.php:25
+#: libraries/server_privileges.lib.php:4417 libraries/server_users.lib.php:25
 #, fuzzy
 #| msgid "User overview"
 msgid "User accounts overview"
 msgstr "Pregled korisnika"
 
-#: libraries/server_privileges.lib.php:4459
+#: libraries/server_privileges.lib.php:4485
 msgid ""
 "A user account allowing any user from localhost to connect is present. This "
 "will prevent other users from connecting if the host part of their account "
 "allows a connection from any (%) host."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4500
+#: libraries/server_privileges.lib.php:4526
 #, php-format
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
@@ -13246,7 +13262,7 @@ msgstr ""
 "server koristi ako su izvršene ručne izmjene. U tom slučaju %sponovo "
 "učitajte privilegije%s pre nego što nastavite."
 
-#: libraries/server_privileges.lib.php:4519
+#: libraries/server_privileges.lib.php:4545
 #, fuzzy
 #| msgid ""
 #| "Note: phpMyAdmin gets the users' privileges directly from MySQL's "
@@ -13265,64 +13281,64 @@ msgstr ""
 "server koristi ako su izvršene ručne izmjene. U tom slučaju %sponovo "
 "učitajte privilegije%s pre nego što nastavite."
 
-#: libraries/server_privileges.lib.php:4569
+#: libraries/server_privileges.lib.php:4595
 msgid "The selected user was not found in the privilege table."
 msgstr "Izabrani korisnik nije pronađen u tabeli privilegija."
 
-#: libraries/server_privileges.lib.php:4801
+#: libraries/server_privileges.lib.php:4827
 msgid "You have added a new user."
 msgstr "Dodali ste novog korisnika."
 
-#: libraries/server_status.lib.php:53
+#: libraries/server_status.lib.php:60
 #, php-format
 msgid "Network traffic since startup: %s"
 msgstr ""
 
-#: libraries/server_status.lib.php:66
+#: libraries/server_status.lib.php:73
 #, fuzzy, php-format
 #| msgid "This MySQL server has been running for %s. It started up on %s."
 msgid "This MySQL server has been running for %1$s. It started up on %2$s."
 msgstr "Ovaj MySQL server radi već %s. Pokrenut je %s."
 
-#: libraries/server_status.lib.php:80
+#: libraries/server_status.lib.php:94
 msgid ""
 "This MySQL server works as <b>master</b> and <b>slave</b> in <b>replication</"
 "b> process."
 msgstr ""
 
-#: libraries/server_status.lib.php:85
+#: libraries/server_status.lib.php:99
 msgid "This MySQL server works as <b>master</b> in <b>replication</b> process."
 msgstr ""
 
-#: libraries/server_status.lib.php:90
+#: libraries/server_status.lib.php:104
 msgid "This MySQL server works as <b>slave</b> in <b>replication</b> process."
 msgstr ""
 
-#: libraries/server_status.lib.php:106
+#: libraries/server_status.lib.php:116
 msgid "Replication status"
 msgstr ""
 
-#: libraries/server_status.lib.php:137
+#: libraries/server_status.lib.php:146
 msgid ""
 "On a busy server, the byte counters may overrun, so those statistics as "
 "reported by the MySQL server may be incorrect."
 msgstr ""
 
-#: libraries/server_status.lib.php:148
+#: libraries/server_status.lib.php:157
 msgid "Received"
 msgstr "Primljeno"
 
-#: libraries/server_status.lib.php:167
+#: libraries/server_status.lib.php:176
 msgid "Sent"
 msgstr "Poslato"
 
-#: libraries/server_status.lib.php:234
+#: libraries/server_status.lib.php:243
 #, fuzzy
 #| msgid "Connections"
 msgid "Max. concurrent connections"
 msgstr "Konekcije"
 
-#: libraries/server_status.lib.php:244
+#: libraries/server_status.lib.php:253
 msgid "Failed attempts"
 msgstr "Neuspelih pokušaja"
 
@@ -14303,7 +14319,7 @@ msgstr ""
 msgid "Not implemented yet."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/AlterOperation.php:193
+#: libraries/sql-parser/src/Components/AlterOperation.php:191
 msgid "Unrecognized alter operation."
 msgstr ""
 
@@ -14317,7 +14333,7 @@ msgid "An opening bracket followed by a set of values was expected."
 msgstr ""
 
 #: libraries/sql-parser/src/Components/ArrayObj.php:101
-#: libraries/sql-parser/src/Components/FieldDefinition.php:202
+#: libraries/sql-parser/src/Components/CreateDefinition.php:202
 msgid "An opening bracket was expected."
 msgstr ""
 
@@ -14325,25 +14341,35 @@ msgstr ""
 msgid "A comma or a closing bracket was expected"
 msgstr ""
 
+#: libraries/sql-parser/src/Components/CreateDefinition.php:246
+#, fuzzy
+#| msgid "No databases selected."
+msgid "A comma or a closing bracket was expected."
+msgstr "Nije izabrana ni jedna baza."
+
+#: libraries/sql-parser/src/Components/CreateDefinition.php:262
+msgid "A closing bracket was expected."
+msgstr ""
+
 #: libraries/sql-parser/src/Components/DataType.php:125
 msgid "Unrecognized data type."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:225
+#: libraries/sql-parser/src/Components/Expression.php:227
 msgid "Unexpected closing bracket."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:246
-#: libraries/sql-parser/src/Components/Expression.php:283
-#: libraries/sql-parser/src/Components/Expression.php:303
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:285
+#: libraries/sql-parser/src/Components/Expression.php:305
 msgid "An alias was previously found."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:257
+#: libraries/sql-parser/src/Components/Expression.php:259
 msgid "Unexpected dot."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:327
+#: libraries/sql-parser/src/Components/Expression.php:329
 #, fuzzy
 #| msgid "No databases selected."
 msgid "An alias was expected."
@@ -14355,16 +14381,6 @@ msgstr "Nije izabrana ni jedna baza."
 msgid "An expression was expected."
 msgstr "Nije izabrana ni jedna baza."
 
-#: libraries/sql-parser/src/Components/FieldDefinition.php:246
-#, fuzzy
-#| msgid "No databases selected."
-msgid "A comma or a closing bracket was expected."
-msgstr "Nije izabrana ni jedna baza."
-
-#: libraries/sql-parser/src/Components/FieldDefinition.php:262
-msgid "A closing bracket was expected."
-msgstr ""
-
 #: libraries/sql-parser/src/Components/Limit.php:90
 #: libraries/sql-parser/src/Components/Limit.php:112
 msgid "An offset was expected."
@@ -14406,27 +14422,27 @@ msgstr ""
 msgid "Expected delimiter."
 msgstr ""
 
-#: libraries/sql-parser/src/Lexer.php:753
+#: libraries/sql-parser/src/Lexer.php:777
 #, fuzzy, php-format
 msgid "Ending quote %1$s was expected."
 msgstr "Tabela %s je odbačena"
 
-#: libraries/sql-parser/src/Lexer.php:789
+#: libraries/sql-parser/src/Lexer.php:813
 #, fuzzy
 msgid "Variable name was expected."
 msgstr "Šablon imena datoteke"
 
-#: libraries/sql-parser/src/Parser.php:380
+#: libraries/sql-parser/src/Parser.php:391
 #, fuzzy
 #| msgid "At Beginning of Table"
 msgid "Unexpected beginning of statement."
 msgstr "Na početku tabele"
 
-#: libraries/sql-parser/src/Parser.php:399
+#: libraries/sql-parser/src/Parser.php:410
 msgid "Unrecognized statement type."
 msgstr ""
 
-#: libraries/sql-parser/src/Parser.php:479
+#: libraries/sql-parser/src/Parser.php:489
 msgid "No transaction was previously started."
 msgstr ""
 
@@ -14452,8 +14468,10 @@ msgid "The name of the entity was expected."
 msgstr ""
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:310
-msgid "At least one field definition was expected."
-msgstr ""
+#, fuzzy
+#| msgid "The row has been deleted."
+msgid "At least one column definition was expected."
+msgstr "Red je obrisan"
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:329
 msgid "A \"RETURNS\" keyword was expected."
@@ -14522,25 +14540,25 @@ msgstr ""
 msgid "Using bookmark \"%s\" as default browse query."
 msgstr ""
 
-#: libraries/sql.lib.php:1306
+#: libraries/sql.lib.php:1300
 msgid "Showing as PHP code"
 msgstr ""
 
-#: libraries/sql.lib.php:1638
+#: libraries/sql.lib.php:1632
 #, php-format
 msgid ""
 "Current selection does not contain a unique column. Grid edit, checkbox, "
 "Edit, Copy and Delete features are not available. %s"
 msgstr ""
 
-#: libraries/sql.lib.php:1649
+#: libraries/sql.lib.php:1643
 #, php-format
 msgid ""
 "Current selection does not contain a unique column. Grid edit, Edit, Copy "
 "and Delete features may result in undesired behavior. %s"
 msgstr ""
 
-#: libraries/sql.lib.php:1688
+#: libraries/sql.lib.php:1682
 #, php-format
 msgid "Problems with indexes of table `%s`"
 msgstr ""
@@ -14709,7 +14727,7 @@ msgid "Version %s snapshot (SQL code)"
 msgstr ""
 
 #: libraries/tracking.lib.php:947
-#: templates/structure/table_structure_row.phtml:33
+#: templates/table/structure/table_structure_row.phtml:33
 #, fuzzy
 #| msgid "None"
 msgctxt "None for default"
@@ -14763,19 +14781,19 @@ msgstr "Verzija servera"
 msgid "Version %1$s was created, tracking for %2$s is active."
 msgstr ""
 
-#: libraries/user_preferences.inc.php:29
+#: libraries/user_preferences.inc.php:30
 #, fuzzy
 #| msgid "General relation features"
 msgid "Manage your settings"
 msgstr "Opšte osobine relacija"
 
-#: libraries/user_preferences.inc.php:46 prefs_manage.php:307
+#: libraries/user_preferences.inc.php:54 prefs_manage.php:307
 #, fuzzy
 #| msgid "Modifications have been saved"
 msgid "Configuration has been saved."
 msgstr "Izmjene su sačuvane"
 
-#: libraries/user_preferences.inc.php:66
+#: libraries/user_preferences.inc.php:74
 #, php-format
 msgid ""
 "Your preferences will be saved for current session only. Storing them "
@@ -15173,7 +15191,7 @@ msgid "first"
 msgstr ""
 
 #: templates/columns_definitions/move_column.phtml:12
-#: templates/structure/add_column.phtml:21
+#: templates/table/structure/add_column.phtml:21
 #, fuzzy, php-format
 #| msgid "After %s"
 msgid "after %s"
@@ -15261,241 +15279,350 @@ msgstr "Tranformacije čitača"
 msgid "Input transformation options"
 msgstr "Opcije transformacije"
 
-#: templates/designer/aggregate_query_panel.phtml:22
-#: templates/designer/options_panel.phtml:100
+#: templates/database/create_table.phtml:7
+#: templates/database/designer/side_menu.phtml:77
+#: templates/database/designer/side_menu.phtml:80
+#, fuzzy
+msgid "Create table"
+msgstr "Napravi novu stranu"
+
+#: templates/database/create_table.phtml:15
+#, fuzzy
+#| msgid "Number of rows per page"
+msgid "Number of columns"
+msgstr "Broj redova po strani"
+
+#: templates/database/designer/aggregate_query_panel.phtml:22
+#: templates/database/designer/options_panel.phtml:100
 #, fuzzy
 #| msgid "Create"
 msgid "Aggregate"
 msgstr "Napravi"
 
-#: templates/designer/aggregate_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:61
-#: templates/designer/options_panel.phtml:106
-#: templates/designer/options_panel.phtml:170
-#: templates/designer/where_query_panel.phtml:30
-#: templates/table/table_header.phtml:9
+#: templates/database/designer/aggregate_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:61
+#: templates/database/designer/options_panel.phtml:106
+#: templates/database/designer/options_panel.phtml:170
+#: templates/database/designer/where_query_panel.phtml:30
+#: templates/table/search/table_header.phtml:9
 #, fuzzy
 msgid "Operator"
 msgstr "Operacije"
 
-#: templates/designer/database_tables.phtml:29
+#: templates/database/designer/database_tables.phtml:29
 msgid "Toggle"
 msgstr ""
 
-#: templates/designer/database_tables.phtml:40
+#: templates/database/designer/database_tables.phtml:40
 #, fuzzy
 #| msgid "Databases"
 msgid "See table structure"
 msgstr "Baze"
 
-#: templates/designer/delete_relation_panel.phtml:21
+#: templates/database/designer/delete_relation_panel.phtml:21
 msgid "Delete relation"
 msgstr ""
 
-#: templates/designer/edit_delete_pages.phtml:7
+#: templates/database/designer/edit_delete_pages.phtml:7
 #, fuzzy
 #| msgid "Page number:"
 msgid "Page to open"
 msgstr "Broj strane:"
 
-#: templates/designer/edit_delete_pages.phtml:7
+#: templates/database/designer/edit_delete_pages.phtml:7
 #, fuzzy
 msgid "Page to delete"
 msgstr "Relacioni pogled"
 
-#: templates/designer/having_query_panel.phtml:90
-#: templates/designer/options_panel.phtml:63
-#: templates/designer/options_panel.phtml:229
-#: templates/designer/where_query_panel.phtml:59
+#: templates/database/designer/having_query_panel.phtml:90
+#: templates/database/designer/options_panel.phtml:63
+#: templates/database/designer/options_panel.phtml:229
+#: templates/database/designer/where_query_panel.phtml:59
 #, fuzzy
 #| msgid "Export"
 msgid "Except"
 msgstr "Izvoz"
 
-#: templates/designer/having_query_panel.phtml:102
-#: templates/designer/options_panel.phtml:75
-#: templates/designer/options_panel.phtml:241
-#: templates/designer/where_query_panel.phtml:71
+#: templates/database/designer/having_query_panel.phtml:102
+#: templates/database/designer/options_panel.phtml:75
+#: templates/database/designer/options_panel.phtml:241
+#: templates/database/designer/where_query_panel.phtml:71
 #, fuzzy
 #| msgid "in query"
 msgid "subquery"
 msgstr "u upitu"
 
-#: templates/designer/new_relation_panel.phtml:22
-#: templates/designer/side_menu.phtml:84 templates/designer/side_menu.phtml:87
+#: templates/database/designer/new_relation_panel.phtml:22
+#: templates/database/designer/side_menu.phtml:84
+#: templates/database/designer/side_menu.phtml:87
 msgid "Create relation"
 msgstr ""
 
-#: templates/designer/options_panel.phtml:34
-#: templates/designer/options_panel.phtml:200
+#: templates/database/designer/options_panel.phtml:34
+#: templates/database/designer/options_panel.phtml:200
 #, fuzzy
 msgid "Relation operator"
 msgstr "Relacioni pogled"
 
-#: templates/designer/options_panel.phtml:85
-#: templates/designer/rename_to_panel.phtml:23
+#: templates/database/designer/options_panel.phtml:85
+#: templates/database/designer/rename_to_panel.phtml:23
 #, fuzzy
 msgid "Rename to"
 msgstr "Promjeni ime tabele u "
 
-#: templates/designer/options_panel.phtml:91
-#: templates/designer/rename_to_panel.phtml:31
+#: templates/database/designer/options_panel.phtml:91
+#: templates/database/designer/rename_to_panel.phtml:31
 #, fuzzy
 #| msgid "User name"
 msgid "New name"
 msgstr "Ime korisnika"
 
-#: templates/designer/page_save_as.phtml:4
+#: templates/database/designer/page_save_as.phtml:4
 #, fuzzy
 #| msgid "Import files"
 msgid "Save to selected page"
 msgstr "Uvoz fajlova"
 
-#: templates/designer/page_save_as.phtml:5
+#: templates/database/designer/page_save_as.phtml:5
 #, fuzzy
 #| msgid "Create a new index"
 msgid "Create a page and save to it"
 msgstr "Napravi novi ključ"
 
-#: templates/designer/page_save_as.phtml:26
+#: templates/database/designer/page_save_as.phtml:26
 #, fuzzy
 #| msgid "User name"
 msgid "New page name"
 msgstr "Ime korisnika"
 
-#: templates/designer/page_selector.phtml:2
+#: templates/database/designer/page_selector.phtml:2
 #, fuzzy
 #| msgid "Select All"
 msgid "Select page"
 msgstr "Izaberi sve"
 
-#: templates/designer/query_details.phtml:10
+#: templates/database/designer/query_details.phtml:10
 #, fuzzy
 #| msgid "Table options"
 msgid "Active options"
 msgstr "Opcije tabele"
 
-#: templates/designer/schema_export.phtml:4
+#: templates/database/designer/schema_export.phtml:4
 msgid "Select Export Relational Type"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:19 templates/designer/side_menu.phtml:25
+#: templates/database/designer/side_menu.phtml:19
+#: templates/database/designer/side_menu.phtml:25
 #, fuzzy
 #| msgid "Show tables"
 msgid "Show/Hide tables list"
 msgstr "Prikaži tabele"
 
-#: templates/designer/side_menu.phtml:29 templates/designer/side_menu.phtml:35
-#: templates/designer/side_menu.phtml:36
+#: templates/database/designer/side_menu.phtml:29
+#: templates/database/designer/side_menu.phtml:35
+#: templates/database/designer/side_menu.phtml:36
 msgid "View in fullscreen"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:34
+#: templates/database/designer/side_menu.phtml:34
 msgid "Exit fullscreen"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:41 templates/designer/side_menu.phtml:45
+#: templates/database/designer/side_menu.phtml:41
+#: templates/database/designer/side_menu.phtml:45
 #, fuzzy
 #| msgid "User name"
 msgid "New page"
 msgstr "Ime korisnika"
 
-#: templates/designer/side_menu.phtml:70 templates/designer/side_menu.phtml:73
+#: templates/database/designer/side_menu.phtml:70
+#: templates/database/designer/side_menu.phtml:73
 #, fuzzy
 #| msgid "Select All"
 msgid "Delete pages"
 msgstr "Izaberi sve"
 
-#: templates/designer/side_menu.phtml:77 templates/designer/side_menu.phtml:80
-#: templates/table/create_table.phtml:7
-#, fuzzy
-msgid "Create table"
-msgstr "Napravi novu stranu"
-
-#: templates/designer/side_menu.phtml:98
-#: templates/designer/side_menu.phtml:101
+#: templates/database/designer/side_menu.phtml:98
+#: templates/database/designer/side_menu.phtml:101
 msgid "Reload"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:107
-#: templates/designer/side_menu.phtml:110
+#: templates/database/designer/side_menu.phtml:107
+#: templates/database/designer/side_menu.phtml:110
 msgid "Help"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Angular links"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Direct links"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:122
-#: templates/designer/side_menu.phtml:124
+#: templates/database/designer/side_menu.phtml:122
+#: templates/database/designer/side_menu.phtml:124
 msgid "Snap to grid"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:128
-#: templates/designer/side_menu.phtml:134
+#: templates/database/designer/side_menu.phtml:128
+#: templates/database/designer/side_menu.phtml:134
 msgid "Small/Big All"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:138
-#: templates/designer/side_menu.phtml:141
+#: templates/database/designer/side_menu.phtml:138
+#: templates/database/designer/side_menu.phtml:141
 msgid "Toggle small/big"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:145
-#: templates/designer/side_menu.phtml:148
+#: templates/database/designer/side_menu.phtml:145
+#: templates/database/designer/side_menu.phtml:148
 #, fuzzy
 #| msgid "Traditional Chinese"
 msgid "Toggle relation lines"
 msgstr "Tradicionalni kineski"
 
-#: templates/designer/side_menu.phtml:153
-#: templates/designer/side_menu.phtml:156
+#: templates/database/designer/side_menu.phtml:153
+#: templates/database/designer/side_menu.phtml:156
 #, fuzzy
 #| msgid "Export"
 msgid "Export schema"
 msgstr "Izvoz"
 
-#: templates/designer/side_menu.phtml:165
-#: templates/designer/side_menu.phtml:168
+#: templates/database/designer/side_menu.phtml:165
+#: templates/database/designer/side_menu.phtml:168
 #, fuzzy
 #| msgid "Submit Query"
 msgid "Build Query"
 msgstr "Izvrši SQL upit"
 
-#: templates/designer/side_menu.phtml:173
-#: templates/designer/side_menu.phtml:177
+#: templates/database/designer/side_menu.phtml:173
+#: templates/database/designer/side_menu.phtml:177
 msgid "Move Menu"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:181
-#: templates/designer/side_menu.phtml:186
+#: templates/database/designer/side_menu.phtml:181
+#: templates/database/designer/side_menu.phtml:186
 #, fuzzy
 #| msgid "Partial Texts"
 msgid "Pin text"
 msgstr "Dio teksta"
 
-#: templates/designer/table_list.phtml:4
+#: templates/database/designer/table_list.phtml:4
 #, fuzzy
 msgid "Hide/Show all"
 msgstr "Prikaži sve"
 
-#: templates/designer/table_list.phtml:14
+#: templates/database/designer/table_list.phtml:14
 msgid "Hide/Show Tables with no relation"
 msgstr ""
 
-#: templates/designer/table_list.phtml:59
+#: templates/database/designer/table_list.phtml:59
 #, fuzzy
 #| msgid "Number of rows per page"
 msgid "Number of tables:"
 msgstr "Broj redova po strani"
 
+#: templates/database/structure/body_for_table_summary.phtml:6
+#, fuzzy, php-format
+#| msgid "%s table(s)"
+msgid "%s table"
+msgid_plural "%s tables"
+msgstr[0] "%s tabela"
+msgstr[1] "%s tabela"
+msgstr[2] ""
+
+#: templates/database/structure/body_for_table_summary.phtml:17
+msgid "Sum"
+msgstr "Ukupno"
+
+#: templates/database/structure/check_all_tables.phtml:6
+msgid "Check tables having overhead"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:10
+#, fuzzy
+#| msgid "Show color"
+msgid "Show create"
+msgstr "Prikaži boju"
+
+#: templates/database/structure/check_all_tables.phtml:27
+#, fuzzy
+#| msgid "Add new field"
+msgid "Prefix"
+msgstr "Dodaj novo polje"
+
+#: templates/database/structure/check_all_tables.phtml:28
+msgid "Add prefix to table"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:29
+#, fuzzy
+#| msgid "Replace table data with file"
+msgid "Replace table prefix"
+msgstr "Zamijeni podatke u tabeli sa podatcima iz datoteke"
+
+#: templates/database/structure/check_all_tables.phtml:30
+#, fuzzy
+#| msgid "Replace table data with file"
+msgid "Copy table with prefix"
+msgstr "Zamijeni podatke u tabeli sa podatcima iz datoteke"
+
+#: templates/database/structure/check_all_tables.phtml:36
+#, fuzzy
+msgid "Add columns to central list"
+msgstr "Dodaj novo polje"
+
+#: templates/database/structure/check_all_tables.phtml:37
+msgid "Remove columns from central list"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:38
+#, fuzzy
+msgid "Make consistent with central list"
+msgstr "Dodaj novo polje"
+
+#: templates/database/structure/favorite_anchor.phtml:12
+#, fuzzy
+msgid "Add to Favorites"
+msgstr "Dodaj novog korisnika"
+
+#: templates/database/structure/show_create.phtml:2
+#, fuzzy
+msgid "Showing create queries"
+msgstr "Prikaži kompletne upite"
+
+#: templates/database/structure/sortable_header.phtml:13
+msgid "Sort"
+msgstr "Sortiranje"
+
+#: templates/database/structure/table_header.phtml:42
+msgid ""
+"May be approximate. Click on the number to get the exact count. See "
+"[doc@faq3-11]FAQ 3.11[/doc]."
+msgstr ""
+
+#: templates/database/structure/table_header.phtml:66
+#: templates/table/index_form.phtml:127
+msgid "Size"
+msgstr "Veličina"
+
+#: templates/database/structure/table_header.phtml:74
+#: templates/table/structure/display_table_stats.phtml:27
+msgid "Overhead"
+msgstr "Prekoračenje"
+
+#: templates/database/structure/tracking_icon.phtml:4
+msgid "Tracking is active."
+msgstr ""
+
+#: templates/database/structure/tracking_icon.phtml:8
+msgid "Tracking is not active."
+msgstr ""
+
 #: templates/error/report_form.phtml:7
 msgid ""
 "phpMyAdmin has encountered an error. We have collected data about this error "
@@ -15511,68 +15638,6 @@ msgstr ""
 msgid "Please explain the steps that lead to the error:"
 msgstr ""
 
-#: templates/gis_visualization/gis_visualization.phtml:3
-msgid "Display GIS Visualization"
-msgstr ""
-
-#: templates/gis_visualization/gis_visualization.phtml:8
-#, fuzzy
-#| msgid "Add/Delete Field Columns"
-msgid "Label column"
-msgstr "Dodaj/obriši kolonu"
-
-#: templates/gis_visualization/gis_visualization.phtml:11
-msgid "-- None --"
-msgstr ""
-
-#: templates/gis_visualization/gis_visualization.phtml:19
-#, fuzzy
-#| msgid "Total"
-msgid "Spatial column"
-msgstr "Ukupno"
-
-#: templates/index_form.phtml:16
-msgid "Index name:"
-msgstr "Ime ključa :"
-
-#: templates/index_form.phtml:19
-msgid ""
-"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
-msgstr "\"PRIMARY\" <b>mora</b> biti ime <b>samo</b> primarnog ključa!"
-
-#: templates/index_form.phtml:40
-#, fuzzy
-#| msgid "Index name:"
-msgid "Index choice:"
-msgstr "Ime ključa :"
-
-#: templates/index_form.phtml:57
-msgid "Key block size:"
-msgstr ""
-
-#: templates/index_form.phtml:74
-msgid "Index type:"
-msgstr "Tip ključa :"
-
-#: templates/index_form.phtml:86
-#, fuzzy
-#| msgid "User"
-msgid "Parser:"
-msgstr "Korisnik"
-
-#: templates/index_form.phtml:102
-#, fuzzy
-msgid "Comment:"
-msgstr "Komentari"
-
-#: templates/index_form.phtml:127 templates/structure/table_header.phtml:66
-msgid "Size"
-msgstr "Veličina"
-
-#: templates/index_form.phtml:149 templates/index_form.phtml:190
-msgid "Drag to reorder"
-msgstr ""
-
 #: templates/prefs_autoload.phtml:9
 msgid ""
 "Your browser has phpMyAdmin configuration for this domain. Would you like to "
@@ -15585,480 +15650,440 @@ msgstr ""
 msgid "Start row:"
 msgstr "Sub"
 
-#: templates/structure/actions_in_table_structure.phtml:14
-#, php-format
-msgid "A primary key has been added on %s."
-msgstr "Osnovni ključ je upravo dodan %s."
-
-#: templates/structure/actions_in_table_structure.phtml:34
-#: templates/structure/actions_in_table_structure.phtml:54
-#: templates/structure/actions_in_table_structure.phtml:79
-#: templates/structure/actions_in_table_structure.phtml:101
-#, php-format
-msgid "An index has been added on %s."
-msgstr "Ključ je upravo dodan %s."
-
-#: templates/structure/actions_in_table_structure.phtml:130
-#: templates/structure/check_all_table_column.phtml:59
-#, fuzzy
-msgid "Remove from central columns"
-msgstr "Promjeni ime tabele u "
-
-#: templates/structure/actions_in_table_structure.phtml:138
-#: templates/structure/check_all_table_column.phtml:55
-#, fuzzy
-msgid "Add to central columns"
-msgstr "Dodaj novo polje"
-
-#: templates/structure/add_column.phtml:7
-#, fuzzy, php-format
-msgid "Add %s column(s)"
-msgstr "Dodaj novo polje"
-
-#: templates/structure/add_column.phtml:12
-#, fuzzy
-#| msgid "At Beginning of Table"
-msgid "at beginning of table"
-msgstr "Na početku tabele"
-
-#: templates/structure/body_for_table_summary.phtml:6
-#, fuzzy, php-format
-#| msgid "%s table(s)"
-msgid "%s table"
-msgid_plural "%s tables"
-msgstr[0] "%s tabela"
-msgstr[1] "%s tabela"
-msgstr[2] ""
-
-#: templates/structure/body_for_table_summary.phtml:17
-msgid "Sum"
-msgstr "Ukupno"
-
-#: templates/structure/check_all_tables.phtml:6
-msgid "Check tables having overhead"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:10
-#, fuzzy
-#| msgid "Show color"
-msgid "Show create"
-msgstr "Prikaži boju"
-
-#: templates/structure/check_all_tables.phtml:27
-#, fuzzy
-#| msgid "Add new field"
-msgid "Prefix"
-msgstr "Dodaj novo polje"
-
-#: templates/structure/check_all_tables.phtml:28
-msgid "Add prefix to table"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:29
-#, fuzzy
-#| msgid "Replace table data with file"
-msgid "Replace table prefix"
-msgstr "Zamijeni podatke u tabeli sa podatcima iz datoteke"
-
-#: templates/structure/check_all_tables.phtml:30
-#, fuzzy
-#| msgid "Replace table data with file"
-msgid "Copy table with prefix"
-msgstr "Zamijeni podatke u tabeli sa podatcima iz datoteke"
-
-#: templates/structure/check_all_tables.phtml:36
-#, fuzzy
-msgid "Add columns to central list"
-msgstr "Dodaj novo polje"
-
-#: templates/structure/check_all_tables.phtml:37
-msgid "Remove columns from central list"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:38
-#, fuzzy
-msgid "Make consistent with central list"
-msgstr "Dodaj novo polje"
-
-#: templates/structure/display_structure.phtml:140 view_create.php:181
-#, fuzzy
-#| msgid "Print view"
-msgid "Edit view"
-msgstr "Za štampu"
-
-#: templates/structure/display_table_stats.phtml:9
-msgid "Space usage"
-msgstr "Zauzeće"
-
-#: templates/structure/display_table_stats.phtml:27
-#: templates/structure/table_header.phtml:74
-msgid "Overhead"
-msgstr "Prekoračenje"
-
-#: templates/structure/display_table_stats.phtml:32
-msgid "Effective"
-msgstr "Efektivne"
-
-#: templates/structure/favorite_anchor.phtml:12
-#, fuzzy
-msgid "Add to Favorites"
-msgstr "Dodaj novog korisnika"
-
-#: templates/structure/move_columns_dialog.phtml:1
-#: templates/structure/optional_action_links.phtml:21
-#, fuzzy
-msgid "Move columns"
-msgstr "Dodaj novo polje"
-
-#: templates/structure/move_columns_dialog.phtml:2
-msgid "Move the columns by dragging them up and down."
-msgstr ""
-
-#: templates/structure/optional_action_links.phtml:9
-msgid "Propose table structure"
-msgstr "Predloži strukturu tabele"
-
-#: templates/structure/optional_action_links.phtml:24
-#, fuzzy
-#| msgid "Propose table structure"
-msgid "Improve table structure"
-msgstr "Predloži strukturu tabele"
-
-#: templates/structure/optional_action_links.phtml:30
-#, fuzzy
-msgid "Track view"
-msgstr "Provjeri tabelu"
-
-#: templates/structure/row_stats_table.phtml:3
-#, fuzzy
-#| msgid "Row Statistics"
-msgid "Row statistics"
-msgstr "Statistike reda"
-
-#: templates/structure/row_stats_table.phtml:9
-msgid "static"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:11
-msgid "dynamic"
-msgstr "dinamički"
-
-#: templates/structure/row_stats_table.phtml:22
-msgid "partitioned"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:54
-msgid "Row length"
-msgstr "Dužina reda"
-
-#: templates/structure/row_stats_table.phtml:66
-msgid "Row size"
-msgstr "Veličina reda"
-
-#: templates/structure/row_stats_table.phtml:73
-msgid "Next autoindex"
-msgstr ""
-
-#: templates/structure/secondary_tabs.phtml:14
-#, fuzzy
-#| msgid "Relation view"
-msgid "Relation view"
-msgstr "Relacioni pogled"
-
-#: templates/structure/show_create.phtml:2
-#, fuzzy
-msgid "Showing create queries"
-msgstr "Prikaži kompletne upite"
-
-#: templates/structure/sortable_header.phtml:13
-msgid "Sort"
-msgstr "Sortiranje"
-
-#: templates/structure/table_header.phtml:42
-msgid ""
-"May be approximate. Click on the number to get the exact count. See "
-"[doc@faq3-11]FAQ 3.11[/doc]."
-msgstr ""
-
-#: templates/structure/table_structure_row.phtml:46
-#, fuzzy, php-format
-#| msgid "Table %s has been dropped."
-msgid "Column %s has been dropped."
-msgstr "Tabela %s je odbačena"
-
-#: templates/structure/tracking_icon.phtml:4
-msgid "Tracking is active."
-msgstr ""
-
-#: templates/structure/tracking_icon.phtml:8
-msgid "Tracking is not active."
-msgstr ""
-
-#: templates/table/create_table.phtml:15
-#, fuzzy
-#| msgid "Number of rows per page"
-msgid "Number of columns"
-msgstr "Broj redova po strani"
-
-#: templates/table/options.phtml:8
-#, fuzzy
-#| msgid "Select fields (at least one):"
-msgid "Select columns (at least one):"
-msgstr "Izaberi polja (najmanje jedno)"
-
-#: templates/table/options.phtml:37
-msgid "Add search conditions (body of the \"where\" clause):"
-msgstr "Dodaj uslove pretraživanja (dio \"WHERE\" upita):"
-
-#: templates/table/options.phtml:45
-msgid "Number of rows per page"
-msgstr "Broj redova po strani"
-
-#: templates/table/options.phtml:56
-msgid "Display order:"
-msgstr "Redosled prikaza:"
-
-#: templates/table/options_zoom.phtml:6
-msgid "Use this column to label each point"
-msgstr ""
-
-#: templates/table/options_zoom.phtml:35
-msgid "Maximum rows to plot"
-msgstr ""
-
-#: templates/table/replace_preview.phtml:13
-msgid "Find and replace - preview"
-msgstr ""
-
-#: templates/table/replace_preview.phtml:18
-#, fuzzy
-#| msgid "Lines terminated by"
-msgid "Original string"
-msgstr "Linije se završavaju sa"
-
-#: templates/table/replace_preview.phtml:19
-#, fuzzy
-#| msgid "Relations"
-msgid "Replaced string"
-msgstr "Relacije"
-
-#: templates/table/replace_preview.phtml:40
-#, fuzzy
-msgid "Replace"
-msgstr "Relacije"
-
-#: templates/table/rows_zoom.phtml:16
-#, fuzzy
-msgid "Additional search criteria"
-msgstr "SQL upit"
-
-#: templates/table/search_and_replace.phtml:3
-#, fuzzy
-#| msgid "Replace NULL by"
-msgid "Replace with:"
-msgstr "Zamijeni NULL sa"
-
-#: templates/table/search_and_replace.phtml:22
-#, fuzzy
-#| msgid "as regular expression"
-msgid "Use regular expression"
-msgstr "kao regularni izraz"
-
-#: templates/table/selection_form.phtml:12
-#, fuzzy
-#| msgid "Do a \"query by example\" (wildcard: \"%\")"
-msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
-msgstr "Napravi \"upit po primjeru\" (džoker: \"%\")"
-
-#: templates/table/selection_form.phtml:34
-msgid "Do a \"query by example\" (wildcard: \"%\")"
-msgstr "Napravi \"upit po primjeru\" (džoker: \"%\")"
-
-#: templates/table/zoom_result_form.phtml:7
-msgid "Browse/Edit the points"
-msgstr ""
-
-#: templates/table/zoom_result_form.phtml:15
-msgid "How to use"
-msgstr ""
-
-#: templates/table/zoom_result_form.phtml:23
-#, fuzzy
-#| msgid "Reset"
-msgid "Reset zoom"
-msgstr "Resetuj"
-
-#: templates/tbl_chart.phtml:17
+#: templates/table/chart/tbl_chart.phtml:17
 #, fuzzy
 #| msgid "Mar"
 msgctxt "Chart type"
 msgid "Bar"
 msgstr "mar"
 
-#: templates/tbl_chart.phtml:21
+#: templates/table/chart/tbl_chart.phtml:21
 #, fuzzy
 #| msgid "Column names"
 msgctxt "Chart type"
 msgid "Column"
 msgstr "Imena kolona"
 
-#: templates/tbl_chart.phtml:25
+#: templates/table/chart/tbl_chart.phtml:25
 msgctxt "Chart type"
 msgid "Line"
 msgstr ""
 
-#: templates/tbl_chart.phtml:29
+#: templates/table/chart/tbl_chart.phtml:29
 msgctxt "Chart type"
 msgid "Spline"
 msgstr ""
 
-#: templates/tbl_chart.phtml:33
+#: templates/table/chart/tbl_chart.phtml:33
 msgctxt "Chart type"
 msgid "Area"
 msgstr ""
 
-#: templates/tbl_chart.phtml:37
+#: templates/table/chart/tbl_chart.phtml:37
 #, fuzzy
 #| msgid "PiB"
 msgctxt "Chart type"
 msgid "Pie"
 msgstr "PB"
 
-#: templates/tbl_chart.phtml:41
+#: templates/table/chart/tbl_chart.phtml:41
 #, fuzzy
 #| msgid "Time"
 msgctxt "Chart type"
 msgid "Timeline"
 msgstr "Vrijeme"
 
-#: templates/tbl_chart.phtml:45
+#: templates/table/chart/tbl_chart.phtml:45
 msgctxt "Chart type"
 msgid "Scatter"
 msgstr ""
 
-#: templates/tbl_chart.phtml:50
+#: templates/table/chart/tbl_chart.phtml:50
 msgid "Stacked"
 msgstr ""
 
-#: templates/tbl_chart.phtml:53
+#: templates/table/chart/tbl_chart.phtml:53
 #, fuzzy
 #| msgid "Import files"
 msgid "Chart title"
 msgstr "Uvoz fajlova"
 
-#: templates/tbl_chart.phtml:57
+#: templates/table/chart/tbl_chart.phtml:57
 msgid "X-Axis:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:72
+#: templates/table/chart/tbl_chart.phtml:72
 #, fuzzy
 msgid "Series:"
 msgstr "SQL upit"
 
-#: templates/tbl_chart.phtml:102
+#: templates/table/chart/tbl_chart.phtml:102
 msgid "X-Axis label:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:104
+#: templates/table/chart/tbl_chart.phtml:104
 #, fuzzy
 #| msgid "Value"
 msgid "X Values"
 msgstr "Vrijednost"
 
-#: templates/tbl_chart.phtml:107
+#: templates/table/chart/tbl_chart.phtml:107
 msgid "Y-Axis label:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:115
+#: templates/table/chart/tbl_chart.phtml:115
 msgid "Series names are in a column"
 msgstr ""
 
-#: templates/tbl_chart.phtml:118
+#: templates/table/chart/tbl_chart.phtml:118
 #, fuzzy
 #| msgid "Inside table(s):"
 msgid "Series column:"
 msgstr "Unutar tabela:"
 
-#: templates/tbl_chart.phtml:130
+#: templates/table/chart/tbl_chart.phtml:130
 #, fuzzy
 #| msgid "Number of rows per page"
 msgid "Value Column:"
 msgstr "Broj redova po strani"
 
-#: templates/tbl_chart.phtml:150
+#: templates/table/chart/tbl_chart.phtml:150
 #, fuzzy
 #| msgid "Save as file"
 msgid "Save chart as image"
 msgstr "Sačuvaj kao datoteku"
 
-#: templates/tbl_relation/common_form.phtml:7
+#: templates/table/gis_visualization/gis_visualization.phtml:3
+msgid "Display GIS Visualization"
+msgstr ""
+
+#: templates/table/gis_visualization/gis_visualization.phtml:8
+#, fuzzy
+#| msgid "Add/Delete Field Columns"
+msgid "Label column"
+msgstr "Dodaj/obriši kolonu"
+
+#: templates/table/gis_visualization/gis_visualization.phtml:11
+msgid "-- None --"
+msgstr ""
+
+#: templates/table/gis_visualization/gis_visualization.phtml:19
+#, fuzzy
+#| msgid "Total"
+msgid "Spatial column"
+msgstr "Ukupno"
+
+#: templates/table/index_form.phtml:16
+msgid "Index name:"
+msgstr "Ime ključa :"
+
+#: templates/table/index_form.phtml:19
+msgid ""
+"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
+msgstr "\"PRIMARY\" <b>mora</b> biti ime <b>samo</b> primarnog ključa!"
+
+#: templates/table/index_form.phtml:40
+#, fuzzy
+#| msgid "Index name:"
+msgid "Index choice:"
+msgstr "Ime ključa :"
+
+#: templates/table/index_form.phtml:57
+msgid "Key block size:"
+msgstr ""
+
+#: templates/table/index_form.phtml:74
+msgid "Index type:"
+msgstr "Tip ključa :"
+
+#: templates/table/index_form.phtml:86
+#, fuzzy
+#| msgid "User"
+msgid "Parser:"
+msgstr "Korisnik"
+
+#: templates/table/index_form.phtml:102
+#, fuzzy
+msgid "Comment:"
+msgstr "Komentari"
+
+#: templates/table/index_form.phtml:149 templates/table/index_form.phtml:190
+msgid "Drag to reorder"
+msgstr ""
+
+#: templates/table/relation/common_form.phtml:7
 #, fuzzy
 msgid "Internal relations"
 msgstr "Opšte osobine relacija"
 
-#: templates/tbl_relation/common_form.phtml:11
+#: templates/table/relation/common_form.phtml:11
 #, fuzzy
 msgid "Internal relation"
 msgstr "Opšte osobine relacija"
 
-#: templates/tbl_relation/common_form.phtml:14
+#: templates/table/relation/common_form.phtml:14
 msgid ""
 "An internal relation is not necessary when a corresponding FOREIGN KEY "
 "relation exists."
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:37
+#: templates/table/relation/common_form.phtml:37
 msgid "Foreign key constraints"
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:40
+#: templates/table/relation/common_form.phtml:40
 msgid "Actions"
 msgstr "Akcija"
 
-#: templates/tbl_relation/common_form.phtml:41
+#: templates/table/relation/common_form.phtml:41
 #, fuzzy
 #| msgid "Column names"
 msgid "Constraint properties"
 msgstr "Imena kolona"
 
-#: templates/tbl_relation/common_form.phtml:44
+#: templates/table/relation/common_form.phtml:44
 msgid ""
 "Only columns with index will be displayed. You can define an index below."
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:49
+#: templates/table/relation/common_form.phtml:49
 msgid "Foreign key constraint"
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:81
+#: templates/table/relation/common_form.phtml:81
 #, fuzzy
 #| msgid "Add a new User"
 msgid "+ Add constraint"
 msgstr "Dodaj novog korisnika"
 
-#: templates/tbl_relation/common_form.phtml:91
+#: templates/table/relation/common_form.phtml:91
 #, fuzzy
 #| msgid "Choose field to display"
 msgid "Choose column to display:"
 msgstr "Izaberi polja za prikaz"
 
-#: templates/tbl_relation/foreign_key_row.phtml:13
+#: templates/table/relation/foreign_key_row.phtml:13
 #, fuzzy, php-format
 #| msgid "Field %s has been dropped."
 msgid "Foreign key constraint %s has been dropped"
 msgstr "Polje %s je obrisano"
 
-#: templates/tbl_relation/foreign_key_row.phtml:102
+#: templates/table/relation/foreign_key_row.phtml:102
 #, fuzzy
 #| msgid "Column names"
 msgid "Constraint name"
 msgstr "Imena kolona"
 
-#: templates/tbl_relation/foreign_key_row.phtml:157
+#: templates/table/relation/foreign_key_row.phtml:157
 #, fuzzy
 msgid "+ Add column"
 msgstr "Dodaj novo polje"
 
+#: templates/table/search/options.phtml:8
+#, fuzzy
+#| msgid "Select fields (at least one):"
+msgid "Select columns (at least one):"
+msgstr "Izaberi polja (najmanje jedno)"
+
+#: templates/table/search/options.phtml:37
+msgid "Add search conditions (body of the \"where\" clause):"
+msgstr "Dodaj uslove pretraživanja (dio \"WHERE\" upita):"
+
+#: templates/table/search/options.phtml:45
+msgid "Number of rows per page"
+msgstr "Broj redova po strani"
+
+#: templates/table/search/options.phtml:56
+msgid "Display order:"
+msgstr "Redosled prikaza:"
+
+#: templates/table/search/options_zoom.phtml:6
+msgid "Use this column to label each point"
+msgstr ""
+
+#: templates/table/search/options_zoom.phtml:35
+msgid "Maximum rows to plot"
+msgstr ""
+
+#: templates/table/search/replace_preview.phtml:13
+msgid "Find and replace - preview"
+msgstr ""
+
+#: templates/table/search/replace_preview.phtml:18
+#, fuzzy
+#| msgid "Lines terminated by"
+msgid "Original string"
+msgstr "Linije se završavaju sa"
+
+#: templates/table/search/replace_preview.phtml:19
+#, fuzzy
+#| msgid "Relations"
+msgid "Replaced string"
+msgstr "Relacije"
+
+#: templates/table/search/replace_preview.phtml:40
+#, fuzzy
+msgid "Replace"
+msgstr "Relacije"
+
+#: templates/table/search/rows_zoom.phtml:16
+#, fuzzy
+msgid "Additional search criteria"
+msgstr "SQL upit"
+
+#: templates/table/search/search_and_replace.phtml:3
+#, fuzzy
+#| msgid "Replace NULL by"
+msgid "Replace with:"
+msgstr "Zamijeni NULL sa"
+
+#: templates/table/search/search_and_replace.phtml:22
+#, fuzzy
+#| msgid "as regular expression"
+msgid "Use regular expression"
+msgstr "kao regularni izraz"
+
+#: templates/table/search/selection_form.phtml:12
+#, fuzzy
+#| msgid "Do a \"query by example\" (wildcard: \"%\")"
+msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
+msgstr "Napravi \"upit po primjeru\" (džoker: \"%\")"
+
+#: templates/table/search/selection_form.phtml:34
+msgid "Do a \"query by example\" (wildcard: \"%\")"
+msgstr "Napravi \"upit po primjeru\" (džoker: \"%\")"
+
+#: templates/table/search/zoom_result_form.phtml:7
+msgid "Browse/Edit the points"
+msgstr ""
+
+#: templates/table/search/zoom_result_form.phtml:15
+msgid "How to use"
+msgstr ""
+
+#: templates/table/search/zoom_result_form.phtml:23
+#, fuzzy
+#| msgid "Reset"
+msgid "Reset zoom"
+msgstr "Resetuj"
+
+#: templates/table/secondary_tabs.phtml:14
+#, fuzzy
+#| msgid "Relation view"
+msgid "Relation view"
+msgstr "Relacioni pogled"
+
+#: templates/table/structure/actions_in_table_structure.phtml:14
+#, php-format
+msgid "A primary key has been added on %s."
+msgstr "Osnovni ključ je upravo dodan %s."
+
+#: templates/table/structure/actions_in_table_structure.phtml:34
+#: templates/table/structure/actions_in_table_structure.phtml:54
+#: templates/table/structure/actions_in_table_structure.phtml:79
+#: templates/table/structure/actions_in_table_structure.phtml:101
+#, php-format
+msgid "An index has been added on %s."
+msgstr "Ključ je upravo dodan %s."
+
+#: templates/table/structure/actions_in_table_structure.phtml:130
+#: templates/table/structure/check_all_table_column.phtml:59
+#, fuzzy
+msgid "Remove from central columns"
+msgstr "Promjeni ime tabele u "
+
+#: templates/table/structure/actions_in_table_structure.phtml:138
+#: templates/table/structure/check_all_table_column.phtml:55
+#, fuzzy
+msgid "Add to central columns"
+msgstr "Dodaj novo polje"
+
+#: templates/table/structure/add_column.phtml:7
+#, fuzzy, php-format
+msgid "Add %s column(s)"
+msgstr "Dodaj novo polje"
+
+#: templates/table/structure/add_column.phtml:12
+#, fuzzy
+#| msgid "At Beginning of Table"
+msgid "at beginning of table"
+msgstr "Na početku tabele"
+
+#: templates/table/structure/display_structure.phtml:140 view_create.php:181
+#, fuzzy
+#| msgid "Print view"
+msgid "Edit view"
+msgstr "Za štampu"
+
+#: templates/table/structure/display_table_stats.phtml:9
+msgid "Space usage"
+msgstr "Zauzeće"
+
+#: templates/table/structure/display_table_stats.phtml:32
+msgid "Effective"
+msgstr "Efektivne"
+
+#: templates/table/structure/move_columns_dialog.phtml:1
+#: templates/table/structure/optional_action_links.phtml:21
+#, fuzzy
+msgid "Move columns"
+msgstr "Dodaj novo polje"
+
+#: templates/table/structure/move_columns_dialog.phtml:2
+msgid "Move the columns by dragging them up and down."
+msgstr ""
+
+#: templates/table/structure/optional_action_links.phtml:9
+msgid "Propose table structure"
+msgstr "Predloži strukturu tabele"
+
+#: templates/table/structure/optional_action_links.phtml:24
+#, fuzzy
+#| msgid "Propose table structure"
+msgid "Improve table structure"
+msgstr "Predloži strukturu tabele"
+
+#: templates/table/structure/optional_action_links.phtml:30
+#, fuzzy
+msgid "Track view"
+msgstr "Provjeri tabelu"
+
+#: templates/table/structure/row_stats_table.phtml:3
+#, fuzzy
+#| msgid "Row Statistics"
+msgid "Row statistics"
+msgstr "Statistike reda"
+
+#: templates/table/structure/row_stats_table.phtml:9
+msgid "static"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:11
+msgid "dynamic"
+msgstr "dinamički"
+
+#: templates/table/structure/row_stats_table.phtml:22
+msgid "partitioned"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:54
+msgid "Row length"
+msgstr "Dužina reda"
+
+#: templates/table/structure/row_stats_table.phtml:66
+msgid "Row size"
+msgstr "Veličina reda"
+
+#: templates/table/structure/row_stats_table.phtml:73
+msgid "Next autoindex"
+msgstr ""
+
+#: templates/table/structure/table_structure_row.phtml:46
+#, fuzzy, php-format
+#| msgid "Table %s has been dropped."
+msgid "Column %s has been dropped."
+msgstr "Tabela %s je odbačena"
+
 #: themes.php:17 themes.php:22
 msgid "Theme"
 msgstr ""
diff --git a/po/ca.po b/po/ca.po
index ce0f9f3a2a..ad6c06e324 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 4.5.0-dev\n"
 "Report-Msgid-Bugs-To: developers@phpmyadmin.net\n"
-"POT-Creation-Date: 2015-08-08 13:53-0400\n"
+"POT-Creation-Date: 2015-08-12 08:10-0400\n"
 "PO-Revision-Date: 2015-08-06 11:31+0200\n"
 "Last-Translator: Xavier Navarro <xvnavarro@gmail.com>\n"
 "Language-Team: Catalan <https://hosted.weblate.org/projects/phpmyadmin/"
@@ -53,7 +53,7 @@ msgid "Table comments:"
 msgstr "Comentaris de la taula:"
 
 #: db_datadict.php:104 libraries/Index.class.php:699
-#: libraries/insert_edit.lib.php:1567
+#: libraries/insert_edit.lib.php:1565
 #: libraries/navigation/Nodes/Node_Column.class.php:30
 #: libraries/plugins/export/ExportHtmlword.class.php:280
 #: libraries/plugins/export/ExportHtmlword.class.php:375
@@ -67,13 +67,14 @@ msgstr "Comentaris de la taula:"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1023
 #: libraries/tracking.lib.php:879 libraries/tracking.lib.php:975
 #: templates/columns_definitions/column_name.phtml:18
-#: templates/index_form.phtml:124 templates/table/table_header.phtml:6
-#: templates/table/zoom_result_form.phtml:33
-#: templates/tbl_relation/common_form.phtml:10
-#: templates/tbl_relation/common_form.phtml:43
-#: templates/tbl_relation/foreign_key_row.phtml:194
-#: templates/tbl_relation/foreign_key_row.phtml:206
-#: templates/tbl_relation/internal_relational_row.phtml:71
+#: templates/table/index_form.phtml:124
+#: templates/table/relation/common_form.phtml:10
+#: templates/table/relation/common_form.phtml:43
+#: templates/table/relation/foreign_key_row.phtml:194
+#: templates/table/relation/foreign_key_row.phtml:206
+#: templates/table/relation/internal_relational_row.phtml:71
+#: templates/table/search/table_header.phtml:6
+#: templates/table/search/zoom_result_form.phtml:33
 msgid "Column"
 msgstr "Columna"
 
@@ -91,21 +92,21 @@ msgstr "Columna"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1001
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1024
 #: libraries/rte/rte_list.lib.php:75 libraries/rte/rte_list.lib.php:103
-#: libraries/rte/rte_routines.lib.php:802
-#: libraries/rte/rte_routines.lib.php:831
-#: libraries/rte/rte_routines.lib.php:1493
+#: libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_routines.lib.php:922
+#: libraries/rte/rte_routines.lib.php:1584
 #: libraries/server_privileges.lib.php:2369 libraries/tracking.lib.php:880
 #: libraries/tracking.lib.php:972
 #: templates/columns_definitions/table_fields_definitions.phtml:11
-#: templates/structure/table_header.phtml:48
-#: templates/structure/table_structure_header.phtml:6
-#: templates/table/table_header.phtml:7
+#: templates/database/structure/table_header.phtml:48
+#: templates/table/search/table_header.phtml:7
+#: templates/table/structure/table_structure_header.phtml:6
 msgid "Type"
 msgstr "Tipus"
 
 #: db_datadict.php:106 libraries/Index.class.php:702
 #: libraries/central_columns.lib.php:708
-#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1576
+#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1574
 #: libraries/plugins/export/ExportHtmlword.class.php:286
 #: libraries/plugins/export/ExportHtmlword.class.php:381
 #: libraries/plugins/export/ExportLatex.class.php:509
@@ -118,8 +119,8 @@ msgstr "Tipus"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1026
 #: libraries/tracking.lib.php:882 libraries/tracking.lib.php:978
 #: templates/columns_definitions/table_fields_definitions.phtml:39
-#: templates/structure/table_structure_header.phtml:9
-#: templates/table/zoom_result_form.phtml:34
+#: templates/table/search/zoom_result_form.phtml:34
+#: templates/table/structure/table_structure_header.phtml:9
 msgid "Null"
 msgstr "Nul"
 
@@ -137,8 +138,8 @@ msgstr "Nul"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1027
 #: libraries/replication_gui.lib.php:153 libraries/tracking.lib.php:883
 #: templates/columns_definitions/table_fields_definitions.phtml:25
-#: templates/structure/body_for_table_summary.phtml:55
-#: templates/structure/table_structure_header.phtml:10
+#: templates/database/structure/body_for_table_summary.phtml:55
+#: templates/table/structure/table_structure_header.phtml:10
 msgid "Default"
 msgstr "Defecte"
 
@@ -166,19 +167,19 @@ msgid "Comments"
 msgstr "Comentaris"
 
 #: db_datadict.php:146
-#: libraries/controllers/StructureController.class.php:1960
-#: libraries/controllers/StructureController.class.php:1965
+#: libraries/controllers/TableStructureController.class.php:951
+#: libraries/controllers/TableStructureController.class.php:956
 #: libraries/tracking.lib.php:922
 #: templates/columns_definitions/column_indexes.phtml:6
-#: templates/structure/check_all_table_column.phtml:22
-#: templates/structure/display_structure.phtml:74
+#: templates/table/structure/check_all_table_column.phtml:22
+#: templates/table/structure/display_structure.phtml:74
 msgid "Primary"
 msgstr "Principal"
 
 #: db_datadict.php:156 js/messages.php:317 libraries/Index.class.php:567
 #: libraries/Index.class.php:606 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261 libraries/mult_submits.lib.php:403
+#: libraries/config/FormDisplay.tpl.php:272 libraries/mult_submits.lib.php:403
 #: libraries/mult_submits.lib.php:417
 #: libraries/plugins/export/ExportHtmlword.class.php:630
 #: libraries/plugins/export/ExportLatex.class.php:589
@@ -194,20 +195,20 @@ msgstr "Principal"
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1010 libraries/tracking.lib.php:1015
 #: prefs_manage.php:140 templates/prefs_autoload.phtml:15
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "No"
 msgstr "No"
 
 #: db_datadict.php:156 js/messages.php:443 libraries/Index.class.php:568
 #: libraries/Index.class.php:605 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261
-#: libraries/controllers/StructureController.class.php:1344
-#: libraries/controllers/StructureController.class.php:2223
-#: libraries/controllers/StructureController.class.php:2232
-#: libraries/controllers/StructureController.class.php:2237
-#: libraries/controllers/StructureController.class.php:2242
-#: libraries/controllers/StructureController.class.php:2247
+#: libraries/config/FormDisplay.tpl.php:272
+#: libraries/controllers/TableStructureController.class.php:539
+#: libraries/controllers/TableStructureController.class.php:1201
+#: libraries/controllers/TableStructureController.class.php:1210
+#: libraries/controllers/TableStructureController.class.php:1215
+#: libraries/controllers/TableStructureController.class.php:1220
+#: libraries/controllers/TableStructureController.class.php:1225
 #: libraries/mult_submits.inc.php:82 libraries/mult_submits.inc.php:178
 #: libraries/mult_submits.lib.php:339 libraries/mult_submits.lib.php:372
 #: libraries/mult_submits.lib.php:401 libraries/mult_submits.lib.php:415
@@ -216,8 +217,8 @@ msgstr "No"
 #: libraries/plugins/export/ExportOdt.class.php:756
 #: libraries/plugins/export/ExportTexytext.class.php:567
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1077
-#: libraries/server_databases.lib.php:464
-#: libraries/server_databases.lib.php:474
+#: libraries/server_databases.lib.php:475
+#: libraries/server_databases.lib.php:485
 #: libraries/server_privileges.lib.php:2546
 #: libraries/server_privileges.lib.php:2727
 #: libraries/server_privileges.lib.php:2748
@@ -227,7 +228,7 @@ msgstr "No"
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1008 libraries/tracking.lib.php:1013
 #: prefs_manage.php:138 templates/prefs_autoload.phtml:14
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "Yes"
 msgstr "Si"
 
@@ -237,7 +238,7 @@ msgstr "Veure el bolcat (esquema) de la base de dades"
 
 #: db_export.php:37 db_tracking.php:90 export.php:382
 #: libraries/DBQbe.class.php:326
-#: libraries/controllers/StructureController.class.php:231
+#: libraries/controllers/DatabaseStructureController.class.php:170
 #: libraries/navigation/NavigationTree.class.php:897
 msgid "No tables found in database."
 msgstr "Base de dades sense taules."
@@ -248,14 +249,14 @@ msgstr "Base de dades sense taules."
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:26
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:120
-#: templates/structure/show_create.phtml:18
+#: templates/database/structure/show_create.phtml:18
 msgid "Tables"
 msgstr "Taules"
 
 #: db_export.php:52 libraries/Menu.class.php:317 libraries/Menu.class.php:425
-#: libraries/Util.class.php:3333 libraries/Util.class.php:3343
-#: libraries/Util.class.php:3349 libraries/Util.class.php:3629
-#: libraries/Util.class.php:4327 libraries/Util.class.php:4344
+#: libraries/Util.class.php:3339 libraries/Util.class.php:3349
+#: libraries/Util.class.php:3355 libraries/Util.class.php:3635
+#: libraries/Util.class.php:4333 libraries/Util.class.php:4350
 #: libraries/central_columns.lib.php:728 libraries/config.values.php:39
 #: libraries/config.values.php:47 libraries/config.values.php:109
 #: libraries/config.values.php:115 libraries/config/setup.forms.php:323
@@ -269,7 +270,7 @@ msgstr "Taules"
 #: libraries/navigation/Nodes/Node_Table.class.php:283
 #: libraries/server_privileges.lib.php:1141 libraries/tracking.lib.php:874
 #: templates/columns_definitions/table_fields_definitions.phtml:3
-#: templates/designer/table_list.phtml:28
+#: templates/database/designer/table_list.phtml:28
 msgid "Structure"
 msgstr "Estructura"
 
@@ -281,7 +282,7 @@ msgstr "Estructura"
 #: libraries/config/user_preferences.forms.php:292
 #: libraries/config/user_preferences.forms.php:297
 #: libraries/server_privileges.lib.php:1140
-#: templates/structure/display_table_stats.phtml:12
+#: templates/table/structure/display_table_stats.phtml:12
 msgid "Data"
 msgstr "Dades"
 
@@ -355,10 +356,10 @@ msgstr "Taules seguides"
 #: libraries/server_privileges.lib.php:2908
 #: libraries/server_privileges.lib.php:3145
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4346
-#: templates/structure/table_header.phtml:21
-#: templates/tbl_relation/foreign_key_row.phtml:176
-#: templates/tbl_relation/internal_relational_row.phtml:63
+#: libraries/server_privileges.lib.php:4372
+#: templates/database/structure/table_header.phtml:21
+#: templates/table/relation/foreign_key_row.phtml:176
+#: templates/table/relation/internal_relational_row.phtml:63
 msgid "Table"
 msgstr "Taula"
 
@@ -375,7 +376,7 @@ msgid "Updated"
 msgstr "Actualitzat"
 
 #: db_tracking.php:130 js/messages.php:243 libraries/Menu.class.php:552
-#: libraries/Util.class.php:4314 libraries/config.values.php:104
+#: libraries/Util.class.php:4320 libraries/config.values.php:104
 #: libraries/rte/rte_events.lib.php:393 libraries/rte/rte_list.lib.php:101
 #: libraries/server_status_processes.lib.php:92 libraries/tracking.lib.php:279
 msgid "Status"
@@ -384,14 +385,15 @@ msgstr "Estat"
 #: db_tracking.php:131 db_tracking.php:290 libraries/Index.class.php:693
 #: libraries/central_columns.lib.php:687 libraries/rte/rte_list.lib.php:74
 #: libraries/rte/rte_list.lib.php:89 libraries/rte/rte_list.lib.php:102
-#: libraries/server_databases.lib.php:398
+#: libraries/server_databases.lib.php:409
 #: libraries/server_privileges.lib.php:2372
 #: libraries/server_privileges.lib.php:3166
 #: libraries/server_privileges.lib.php:3342
 #: libraries/server_user_groups.lib.php:82
 #: libraries/server_variables.lib.php:189 libraries/tracking.lib.php:280
-#: libraries/tracking.lib.php:793 templates/structure/table_header.phtml:30
-#: templates/structure/table_structure_header.phtml:23
+#: libraries/tracking.lib.php:793
+#: templates/database/structure/table_header.phtml:30
+#: templates/table/structure/table_structure_header.phtml:23
 msgid "Action"
 msgstr "Acció"
 
@@ -433,7 +435,7 @@ msgid "Untracked tables"
 msgstr "Taules no seguides"
 
 #: db_tracking.php:305 db_tracking.php:336
-#: templates/structure/optional_action_links.phtml:17
+#: templates/table/structure/optional_action_links.phtml:17
 msgid "Track table"
 msgstr "Segueix taula"
 
@@ -488,7 +490,7 @@ msgid "Value for the column \"%s\""
 msgstr "Valor per la columna \"%s\""
 
 #: gis_data_editor.php:146
-#: templates/gis_visualization/gis_visualization.phtml:37
+#: templates/table/gis_visualization/gis_visualization.phtml:37
 msgid "Use OpenStreetMaps as Base Layer"
 msgstr "Utilitzar OpenStreetMaps com a capa base"
 
@@ -568,35 +570,35 @@ msgstr "Afegir geometria"
 #: libraries/display_change_password.lib.php:162
 #: libraries/display_export.lib.php:402 libraries/display_export.lib.php:408
 #: libraries/display_import.lib.php:392 libraries/index.lib.php:44
-#: libraries/insert_edit.lib.php:1546 libraries/insert_edit.lib.php:1583
+#: libraries/insert_edit.lib.php:1544 libraries/insert_edit.lib.php:1581
 #: libraries/normalization.lib.php:165 libraries/normalization.lib.php:821
 #: libraries/operations.lib.php:38 libraries/operations.lib.php:108
 #: libraries/operations.lib.php:263 libraries/operations.lib.php:306
 #: libraries/operations.lib.php:801 libraries/operations.lib.php:874
 #: libraries/operations.lib.php:923 libraries/operations.lib.php:1337
 #: libraries/operations.lib.php:1658
-#: libraries/plugins/auth/AuthenticationCookie.class.php:244
+#: libraries/plugins/auth/AuthenticationCookie.class.php:232
 #: libraries/replication_gui.lib.php:122 libraries/replication_gui.lib.php:161
 #: libraries/replication_gui.lib.php:324 libraries/replication_gui.lib.php:461
 #: libraries/replication_gui.lib.php:906 libraries/rte/rte_events.lib.php:509
-#: libraries/rte/rte_routines.lib.php:969
-#: libraries/rte/rte_routines.lib.php:1581
+#: libraries/rte/rte_routines.lib.php:1060
+#: libraries/rte/rte_routines.lib.php:1672
 #: libraries/rte/rte_triggers.lib.php:396 libraries/server_bin_log.lib.php:61
 #: libraries/server_privileges.lib.php:705
 #: libraries/server_privileges.lib.php:2106
 #: libraries/server_privileges.lib.php:2872
 #: libraries/server_privileges.lib.php:3553
-#: libraries/server_privileges.lib.php:4627
+#: libraries/server_privileges.lib.php:4653
 #: libraries/server_user_groups.lib.php:285
 #: libraries/sql_query_form.lib.php:369 libraries/sql_query_form.lib.php:429
 #: libraries/tracking.lib.php:533 libraries/tracking.lib.php:653
 #: prefs_manage.php:277 prefs_manage.php:355
 #: templates/columns_definitions/column_definitions_form.phtml:59
-#: templates/header_location.phtml:17 templates/index_form.phtml:238
+#: templates/database/create_table.phtml:21 templates/header_location.phtml:28
 #: templates/startAndNumberOfRowsPanel.phtml:14
-#: templates/structure/add_column.phtml:25
-#: templates/table/create_table.phtml:21
-#: templates/table/selection_form.phtml:75 view_create.php:275
+#: templates/table/index_form.phtml:238
+#: templates/table/search/selection_form.phtml:75
+#: templates/table/structure/add_column.phtml:25 view_create.php:275
 #: view_operations.php:106
 msgid "Go"
 msgstr "Executa"
@@ -688,7 +690,7 @@ msgid "Could not load import plugins, please check your installation!"
 msgstr ""
 "No es poden carregar les extensions d'importació, comprova l'instal.lació!"
 
-#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1466
+#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1460
 #, php-format
 msgid "Bookmark %s has been created."
 msgstr "%s creat com a Consulta desada."
@@ -728,11 +730,11 @@ msgstr "No es pot carregar la progressió en la importació."
 msgid "Back"
 msgstr "Enrere"
 
-#: index.php:148 libraries/Footer.class.php:70
+#: index.php:149 libraries/Footer.class.php:70
 msgid "phpMyAdmin Demo Server"
 msgstr "Servidor de demostració de phpMyAdmin"
 
-#: index.php:152
+#: index.php:153
 #, php-format
 msgid ""
 "You are using the demo server. You can do anything here, but please do not "
@@ -743,110 +745,110 @@ msgstr ""
 "però sisplau no modifiquis els usuaris root, debian-sys-maint i pma. Més "
 "informació disponible a %s."
 
-#: index.php:162
+#: index.php:163
 msgid "General Settings"
 msgstr "Paràmetres Generals"
 
-#: index.php:190 libraries/display_change_password.lib.php:50
+#: index.php:191 libraries/display_change_password.lib.php:50
 #: libraries/display_change_password.lib.php:53 user_password.php:247
 msgid "Change password"
 msgstr "Canvi de contrasenya"
 
-#: index.php:206
+#: index.php:207
 msgid "Server connection collation"
 msgstr "Ordenació de la connexió del servidor"
 
-#: index.php:228
+#: index.php:229
 msgid "Appearance Settings"
 msgstr "Paràmetres d'aparença"
 
-#: index.php:258 prefs_manage.php:285
+#: index.php:259 prefs_manage.php:285
 msgid "More settings"
 msgstr "Més paràmetres"
 
-#: index.php:279
+#: index.php:280
 msgid "Database server"
 msgstr "Servidor de base de dades"
 
-#: index.php:282 libraries/plugins/auth/AuthenticationCookie.class.php:181
+#: index.php:283 libraries/plugins/auth/AuthenticationCookie.class.php:169
 msgid "Server:"
 msgstr "Servidor:"
 
-#: index.php:286
+#: index.php:287
 msgid "Server type:"
 msgstr "Tipus de servidor:"
 
-#: index.php:290 libraries/plugins/export/ExportLatex.class.php:212
+#: index.php:291 libraries/plugins/export/ExportLatex.class.php:212
 #: libraries/plugins/export/ExportSql.class.php:687
 #: libraries/plugins/export/ExportXml.class.php:189
 msgid "Server version:"
 msgstr "Versió del servidor:"
 
-#: index.php:296
+#: index.php:297
 msgid "Protocol version:"
 msgstr "Versió del protocol:"
 
-#: index.php:300
+#: index.php:301
 msgid "User:"
 msgstr "Usuari:"
 
-#: index.php:305
+#: index.php:306
 msgid "Server charset:"
 msgstr "Joc de caràcters del servidor:"
 
-#: index.php:320
+#: index.php:321
 msgid "Web server"
 msgstr "Servidor web"
 
-#: index.php:331
+#: index.php:332
 msgid "Database client version:"
 msgstr "Versió del client de base de dades:"
 
-#: index.php:335
+#: index.php:336
 msgid "PHP extension:"
 msgstr "Extensió PHP:"
 
-#: index.php:349
+#: index.php:350
 msgid "PHP version:"
 msgstr "versió de PHP:"
 
-#: index.php:360
+#: index.php:361
 msgid "Show PHP information"
 msgstr "Mostra informació de PHP"
 
-#: index.php:383
+#: index.php:384
 msgid "Version information:"
 msgstr "Informació de la versió:"
 
-#: index.php:392 libraries/Util.class.php:432 libraries/Util.class.php:495
-#: libraries/config/FormDisplay.tpl.php:151
+#: index.php:393 libraries/Util.class.php:432 libraries/Util.class.php:495
+#: libraries/config/FormDisplay.tpl.php:162
 #: libraries/display_export.lib.php:577 libraries/engines/pbxt.lib.php:162
 #: libraries/navigation/NavigationHeader.class.php:196
 #: libraries/server_variables.lib.php:160
 msgid "Documentation"
 msgstr "Documentació"
 
-#: index.php:399
+#: index.php:400
 msgid "Wiki"
 msgstr "Wiki"
 
-#: index.php:408
+#: index.php:409
 msgid "Official Homepage"
 msgstr "Pàgina oficial del phpMyAdmin"
 
-#: index.php:415
+#: index.php:416
 msgid "Contribute"
 msgstr "Contribueix"
 
-#: index.php:422
+#: index.php:423
 msgid "Get support"
 msgstr "Obtenir suport"
 
-#: index.php:429
+#: index.php:430
 msgid "List of changes"
 msgstr "Llista de canvis"
 
-#: index.php:451
+#: index.php:452
 msgid ""
 "You are connected as 'root' with no password, which corresponds to the "
 "default MySQL privileged account. Your MySQL server is running with this "
@@ -859,7 +861,7 @@ msgstr ""
 "has de reparar urgentment aquest forat de seguretat establint una "
 "contrasenya per a l'usuari 'root'."
 
-#: index.php:468
+#: index.php:469
 msgid ""
 "You have enabled mbstring.func_overload in your PHP configuration. This "
 "option is incompatible with phpMyAdmin and might cause some data to be "
@@ -869,7 +871,7 @@ msgstr ""
 "PHP. Aquesta opció és incompatible amb phpMyAdmin i pot provocar la perdua "
 "de dades!"
 
-#: index.php:483
+#: index.php:484
 msgid ""
 "The mbstring PHP extension was not found and you seem to be using a "
 "multibyte charset. Without the mbstring extension phpMyAdmin is unable to "
@@ -879,7 +881,7 @@ msgstr ""
 "de caràcters multibyte. Sense l'extensió -mbstring-, phpMyAdmin és incapaç "
 "de dividir cadenes de text correctament i pot generar resultats inesperats."
 
-#: index.php:500
+#: index.php:501
 msgid ""
 "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini."
 "session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower than "
@@ -891,7 +893,7 @@ msgstr ""
 "que la caducitat de galetes -cookies- configurat a phpMyAdmin, degut a aixó, "
 "la vostra conenexió podria caducar abans de l'establert a phpMyAdmin."
 
-#: index.php:519
+#: index.php:520
 msgid ""
 "Login cookie store is lower than cookie validity configured in phpMyAdmin, "
 "because of this, your login will expire sooner than configured in phpMyAdmin."
@@ -900,13 +902,13 @@ msgstr ""
 "configuració a phpMyAdmin, degut a aixó, la teva sessió caducarà més aviat "
 "que el que indica la configuració de phpMyAdmin."
 
-#: index.php:535
+#: index.php:536
 msgid "The configuration file now needs a secret passphrase (blowfish_secret)."
 msgstr ""
 "L'arxiu de configuració necessita ara una frase de pas secreta "
 "(blowfish_secret)."
 
-#: index.php:548
+#: index.php:549
 msgid ""
 "Directory [code]config[/code], which is used by the setup script, still "
 "exists in your phpMyAdmin directory. It is strongly recommended to remove it "
@@ -919,7 +921,7 @@ msgstr ""
 "seguretat del teu servidor pot estar compromesa per la descàrrega de la "
 "configuració per part de persones no autoritzades."
 
-#: index.php:564
+#: index.php:565
 #, php-format
 msgid ""
 "The phpMyAdmin configuration storage is not completely configured, some "
@@ -929,14 +931,14 @@ msgstr ""
 "completa, s'han desactivat algunes característiques avançades. %sConsulta el "
 "motiu%s. "
 
-#: index.php:571
+#: index.php:572
 msgid ""
 "Or alternately go to 'Operations' tab of any database to set it up there."
 msgstr ""
 "O alternativament anar a la pestanya \"Operacions\" de qualsevol base de "
 "dades per configurar-lo allà."
 
-#: index.php:620
+#: index.php:621
 #, php-format
 msgid ""
 "Your PHP MySQL library version %s differs from your MySQL server version %s. "
@@ -945,7 +947,7 @@ msgstr ""
 "La teva llibreria MySQL de PHP MySQL versió %s és diferent del teu servidor "
 "MySQL versió %s. Aixó pot provocar comportaments inesperats."
 
-#: index.php:648
+#: index.php:649
 #, php-format
 msgid ""
 "Server running with Suhosin. Please refer to %sdocumentation%s for possible "
@@ -1090,8 +1092,8 @@ msgstr ""
 msgid "Save & Close"
 msgstr "Desa i tanca"
 
-#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:404
-#: libraries/insert_edit.lib.php:1550 prefs_manage.php:361
+#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:415
+#: libraries/insert_edit.lib.php:1548 prefs_manage.php:361
 #: prefs_manage.php:372
 msgid "Reset"
 msgstr "Reinicia"
@@ -1124,7 +1126,7 @@ msgstr "Afegir Index"
 msgid "Edit Index"
 msgstr "Editar índex"
 
-#: js/messages.php:99 templates/index_form.phtml:232
+#: js/messages.php:99 templates/table/index_form.phtml:232
 #, php-format
 msgid "Add %s column(s) to index"
 msgstr "Afegeix %s columna(es) a l'index"
@@ -1145,13 +1147,14 @@ msgstr "Composa amb:"
 msgid "Please select column(s) for the index."
 msgstr "Tria columna(es) per a l'índex."
 
-#: js/messages.php:106 templates/structure/add_column.phtml:1
+#: js/messages.php:106 templates/table/structure/add_column.phtml:1
 msgid "You have to add at least one column."
 msgstr "Has d'afegir al menys una columna."
 
-#: js/messages.php:109 libraries/insert_edit.lib.php:1548
+#: js/messages.php:109 libraries/insert_edit.lib.php:1546
 #: templates/columns_definitions/column_definitions_form.phtml:162
-#: templates/index_form.phtml:237 templates/tbl_relation/common_form.phtml:106
+#: templates/table/index_form.phtml:237
+#: templates/table/relation/common_form.phtml:106
 msgid "Preview SQL"
 msgstr "Vista prèvia de l'SQL"
 
@@ -1168,7 +1171,7 @@ msgid "SQL query:"
 msgstr "Consulta SQL:"
 
 #. l10n: Default label for the y-Axis of Charts
-#: js/messages.php:118 templates/tbl_chart.phtml:109
+#: js/messages.php:118 templates/table/chart/tbl_chart.phtml:109
 msgid "Y Values"
 msgstr "Valors Y"
 
@@ -1324,7 +1327,7 @@ msgstr "Bytes enviats"
 msgid "Bytes received"
 msgstr "Bytes rebuts"
 
-#: js/messages.php:169 libraries/server_status.lib.php:226
+#: js/messages.php:169 libraries/server_status.lib.php:235
 msgid "Connections"
 msgstr "Connexions"
 
@@ -1381,12 +1384,12 @@ msgstr "%d taula(es)"
 msgid "Questions"
 msgstr "Consultes"
 
-#: js/messages.php:184 libraries/server_status.lib.php:134
+#: js/messages.php:184 libraries/server_status.lib.php:143
 msgid "Traffic"
 msgstr "Tràfic"
 
 #: js/messages.php:185 libraries/Menu.class.php:586
-#: libraries/Util.class.php:4318 libraries/server_status_monitor.lib.php:257
+#: libraries/Util.class.php:4324 libraries/server_status_monitor.lib.php:257
 msgid "Settings"
 msgstr "Configuració"
 
@@ -1406,8 +1409,9 @@ msgstr "Afegeix al menys una variable a les series!"
 #: libraries/server_status_monitor.lib.php:236
 #: libraries/server_status_processes.lib.php:308
 #: templates/columns_definitions/transformation.phtml:4
-#: templates/designer/options_panel.phtml:178
-#: templates/table/options_zoom.phtml:12 templates/table/rows_zoom.phtml:26
+#: templates/database/designer/options_panel.phtml:178
+#: templates/table/search/options_zoom.phtml:12
+#: templates/table/search/rows_zoom.phtml:26
 msgid "None"
 msgstr "Res"
 
@@ -1700,8 +1704,8 @@ msgstr ""
 
 #: js/messages.php:270 libraries/Menu.class.php:352
 #: libraries/Menu.class.php:455 libraries/Menu.class.php:582
-#: libraries/Util.class.php:4317 libraries/Util.class.php:4332
-#: libraries/Util.class.php:4349 libraries/config/messages.inc.php:258
+#: libraries/Util.class.php:4323 libraries/Util.class.php:4338
+#: libraries/Util.class.php:4355 libraries/config/messages.inc.php:258
 #: libraries/display_import.lib.php:105
 #: libraries/server_status_monitor.lib.php:318 prefs_manage.php:238
 #: setup/frames/menu.inc.php:26
@@ -1761,13 +1765,13 @@ msgid "Formatting SQL..."
 msgstr "Donant format a l'SQL..."
 
 #: js/messages.php:293 libraries/server_variables.lib.php:157
-#: templates/designer/aggregate_query_panel.phtml:63
-#: templates/designer/delete_relation_panel.phtml:28
-#: templates/designer/having_query_panel.phtml:117
-#: templates/designer/new_relation_panel.phtml:88
-#: templates/designer/options_panel.phtml:253
-#: templates/designer/rename_to_panel.phtml:45
-#: templates/designer/where_query_panel.phtml:83
+#: templates/database/designer/aggregate_query_panel.phtml:63
+#: templates/database/designer/delete_relation_panel.phtml:28
+#: templates/database/designer/having_query_panel.phtml:117
+#: templates/database/designer/new_relation_panel.phtml:88
+#: templates/database/designer/options_panel.phtml:253
+#: templates/database/designer/rename_to_panel.phtml:45
+#: templates/database/designer/where_query_panel.phtml:83
 msgid "Cancel"
 msgstr "Cancel.lar"
 
@@ -1775,7 +1779,7 @@ msgstr "Cancel.lar"
 msgid "Page-related settings"
 msgstr "Configuració de la pàgina relacionada"
 
-#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:402
+#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:413
 msgid "Apply"
 msgstr "Aplicar"
 
@@ -1810,8 +1814,8 @@ msgstr "Codi d'error: %s"
 msgid "Error text: %s"
 msgstr "Text de l'error: %s"
 
-#: js/messages.php:307 libraries/db_common.inc.php:68
-#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:450
+#: js/messages.php:307 libraries/db_common.inc.php:69
+#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:461
 msgid "No databases selected."
 msgstr "No s'han triat bases de dades."
 
@@ -1823,12 +1827,13 @@ msgstr "Eliminació de columna"
 msgid "Adding Primary Key"
 msgstr "Afegir clau principal"
 
-#: js/messages.php:310 templates/designer/aggregate_query_panel.phtml:59
-#: templates/designer/having_query_panel.phtml:113
-#: templates/designer/new_relation_panel.phtml:87
-#: templates/designer/options_panel.phtml:252
-#: templates/designer/rename_to_panel.phtml:41
-#: templates/designer/where_query_panel.phtml:82
+#: js/messages.php:310
+#: templates/database/designer/aggregate_query_panel.phtml:59
+#: templates/database/designer/having_query_panel.phtml:113
+#: templates/database/designer/new_relation_panel.phtml:87
+#: templates/database/designer/options_panel.phtml:252
+#: templates/database/designer/rename_to_panel.phtml:41
+#: templates/database/designer/where_query_panel.phtml:82
 msgid "OK"
 msgstr "Correcte"
 
@@ -1848,7 +1853,7 @@ msgstr "Copiant base de dades"
 msgid "Changing Charset"
 msgstr "Canvi de Joc de Caràcters"
 
-#: js/messages.php:320 libraries/Util.class.php:3217
+#: js/messages.php:320 libraries/Util.class.php:3223
 msgid "Enable foreign key checks"
 msgstr "Activa les comprovacions de claus externes"
 
@@ -1884,20 +1889,21 @@ msgstr ""
 #: js/messages.php:334 libraries/DisplayResults.class.php:4834
 #: libraries/DisplayResults.class.php:5092 libraries/Menu.class.php:344
 #: libraries/Menu.class.php:446 libraries/Menu.class.php:578
-#: libraries/Util.class.php:3636 libraries/Util.class.php:3637
-#: libraries/Util.class.php:4316 libraries/Util.class.php:4331
-#: libraries/Util.class.php:4348 libraries/config/messages.inc.php:252
+#: libraries/Util.class.php:3642 libraries/Util.class.php:3643
+#: libraries/Util.class.php:4322 libraries/Util.class.php:4337
+#: libraries/Util.class.php:4354 libraries/config/messages.inc.php:252
 #: libraries/display_export.lib.php:173 libraries/rte/rte_list.lib.php:146
 #: libraries/server_privileges.lib.php:2211
 #: libraries/server_privileges.lib.php:2290
 #: libraries/server_privileges.lib.php:2632
 #: libraries/server_privileges.lib.php:3356
 #: libraries/server_status_monitor.lib.php:322 prefs_manage.php:303
-#: setup/frames/menu.inc.php:27 templates/structure/check_all_tables.phtml:11
+#: setup/frames/menu.inc.php:27
+#: templates/database/structure/check_all_tables.phtml:11
 msgid "Export"
 msgstr "Exporta"
 
-#: js/messages.php:337 libraries/rte/rte_routines.lib.php:652
+#: js/messages.php:337 libraries/rte/rte_routines.lib.php:743
 msgid "ENUM/SET editor"
 msgstr "editor de ENUM/SET"
 
@@ -1936,7 +1942,7 @@ msgstr "Mostrar quadre de consultes"
 #: libraries/Console.class.php:214 libraries/DisplayResults.class.php:3474
 #: libraries/DisplayResults.class.php:4818 libraries/Index.class.php:723
 #: libraries/Util.class.php:706 libraries/Util.class.php:1202
-#: libraries/Util.class.php:3634 libraries/Util.class.php:3635
+#: libraries/Util.class.php:3640 libraries/Util.class.php:3641
 #: libraries/central_columns.lib.php:851
 #: libraries/central_columns.lib.php:1193
 #: libraries/config/messages.inc.php:892
@@ -1954,7 +1960,7 @@ msgstr "Edita"
 #: libraries/server_user_groups.lib.php:129
 #: libraries/sql_query_form.lib.php:416 libraries/tracking.lib.php:477
 #: setup/frames/index.inc.php:183 setup/frames/index.inc.php:291
-#: templates/designer/delete_relation_panel.phtml:27
+#: templates/database/designer/delete_relation_panel.phtml:27
 msgid "Delete"
 msgstr "Esborra"
 
@@ -2125,11 +2131,11 @@ msgid "No dependencies selected!"
 msgstr "No s'han triat dependències!"
 
 #: js/messages.php:394 libraries/central_columns.lib.php:1214
-#: libraries/insert_edit.lib.php:1458 libraries/server_variables.lib.php:155
+#: libraries/insert_edit.lib.php:1456 libraries/server_variables.lib.php:155
 #: setup/frames/config.inc.php:42 setup/frames/index.inc.php:279
 #: templates/columns_definitions/column_definitions_form.phtml:165
-#: templates/gis_visualization/gis_visualization.phtml:48
-#: templates/tbl_relation/common_form.phtml:107
+#: templates/table/gis_visualization/gis_visualization.phtml:48
+#: templates/table/relation/common_form.phtml:107
 msgid "Save"
 msgstr "Desa"
 
@@ -2208,8 +2214,8 @@ msgid "Data point content"
 msgstr "Contingut del punter de dades"
 
 #: js/messages.php:430 js/messages.php:562 js/messages.php:579
-#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2573
-#: templates/index_form.phtml:154 templates/index_form.phtml:194
+#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2571
+#: templates/table/index_form.phtml:154 templates/table/index_form.phtml:194
 msgid "Ignore"
 msgstr "Ignora"
 
@@ -2270,8 +2276,8 @@ msgstr "Tria una clau externa"
 msgid "Please select the primary key or a unique key!"
 msgstr "Tria la clau principal o una clau única!"
 
-#: js/messages.php:457 templates/designer/side_menu.phtml:91
-#: templates/designer/side_menu.phtml:94
+#: js/messages.php:457 templates/database/designer/side_menu.phtml:91
+#: templates/database/designer/side_menu.phtml:94
 msgid "Choose column to display"
 msgstr "Tria la columna a mostrar"
 
@@ -2287,18 +2293,18 @@ msgstr ""
 msgid "Page name"
 msgstr "Nom de pàgina"
 
-#: js/messages.php:463 templates/designer/side_menu.phtml:56
-#: templates/designer/side_menu.phtml:59
+#: js/messages.php:463 templates/database/designer/side_menu.phtml:56
+#: templates/database/designer/side_menu.phtml:59
 msgid "Save page"
 msgstr "Desa la pàgina"
 
-#: js/messages.php:464 templates/designer/side_menu.phtml:63
-#: templates/designer/side_menu.phtml:66
+#: js/messages.php:464 templates/database/designer/side_menu.phtml:63
+#: templates/database/designer/side_menu.phtml:66
 msgid "Save page as"
 msgstr "Desa la pàgina com"
 
-#: js/messages.php:465 templates/designer/side_menu.phtml:49
-#: templates/designer/side_menu.phtml:52
+#: js/messages.php:465 templates/database/designer/side_menu.phtml:49
+#: templates/database/designer/side_menu.phtml:52
 msgid "Open page"
 msgstr "Obre la pàgina"
 
@@ -2306,7 +2312,7 @@ msgstr "Obre la pàgina"
 msgid "Delete page"
 msgstr "esborra la pàgina"
 
-#: js/messages.php:467 templates/designer/side_menu.phtml:10
+#: js/messages.php:467 templates/database/designer/side_menu.phtml:10
 msgid "Untitled"
 msgstr "Sense títol"
 
@@ -2432,7 +2438,7 @@ msgstr "Longitud inicial"
 msgid "cancel"
 msgstr "Cancel.lar"
 
-#: js/messages.php:499 libraries/server_status.lib.php:271
+#: js/messages.php:499 libraries/server_status.lib.php:280
 msgid "Aborted"
 msgstr "Avortat"
 
@@ -3000,7 +3006,7 @@ msgstr "Entra valor HEX correcte"
 
 #: js/messages.php:793 libraries/Message.class.php:199
 #: libraries/Util.class.php:654 libraries/core.lib.php:245
-#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1172
+#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1170
 #: tbl_operations.php:229 view_operations.php:63
 msgid "Error"
 msgstr "Error"
@@ -3063,8 +3069,8 @@ msgstr "per segon"
 msgid "per minute"
 msgstr "per minut"
 
-#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:143
-#: libraries/server_status.lib.php:228
+#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:152
+#: libraries/server_status.lib.php:237
 #: libraries/server_status_queries.lib.php:98
 msgid "per hour"
 msgstr "per hora"
@@ -3084,7 +3090,7 @@ msgstr ""
 "Permisos incorrectes a l'arxiu de configuració, no pot ser modificable per "
 "tothom!"
 
-#: libraries/Config.class.php:1799
+#: libraries/Config.class.php:1801
 msgid "Font size"
 msgstr "Tamany de lletra"
 
@@ -3112,10 +3118,10 @@ msgstr "Re-consulta"
 #: libraries/server_privileges.lib.php:2890
 #: libraries/server_privileges.lib.php:3144
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4332
+#: libraries/server_privileges.lib.php:4358
 #: libraries/server_status_processes.lib.php:80
-#: templates/tbl_relation/foreign_key_row.phtml:165
-#: templates/tbl_relation/internal_relational_row.phtml:55
+#: templates/table/relation/foreign_key_row.phtml:165
+#: templates/table/relation/internal_relational_row.phtml:55
 msgid "Database"
 msgstr "Base de dades"
 
@@ -3208,11 +3214,11 @@ msgstr "Historial"
 #: libraries/plugins/import/ImportMediawiki.class.php:60
 #: libraries/plugins/import/ImportOds.class.php:59
 #: libraries/plugins/import/ImportShp.class.php:57
-#: libraries/plugins/import/ImportSql.class.php:148
+#: libraries/plugins/import/ImportSql.class.php:51
 #: libraries/plugins/import/ImportXml.class.php:58
-#: libraries/rte/rte_routines.lib.php:833 templates/index_form.phtml:49
-#: templates/structure/row_stats_table.phtml:20
-#: templates/table/options.phtml:2
+#: libraries/rte/rte_routines.lib.php:924 templates/table/index_form.phtml:49
+#: templates/table/search/options.phtml:2
+#: templates/table/structure/row_stats_table.phtml:20
 msgid "Options"
 msgstr "Opcions"
 
@@ -3245,7 +3251,8 @@ msgstr "descendent"
 msgid "Order:"
 msgstr "Ordre:"
 
-#: libraries/Console.class.php:289 templates/table/replace_preview.phtml:17
+#: libraries/Console.class.php:289
+#: templates/table/search/replace_preview.phtml:17
 msgid "Count"
 msgstr "Nombre"
 
@@ -3342,9 +3349,9 @@ msgstr "Canvia al tema <<dark>>"
 #: libraries/operations.lib.php:794 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:191
-#: templates/structure/sortable_header.phtml:21
-#: templates/structure/sortable_header.phtml:38
-#: templates/table/options.phtml:68
+#: templates/database/structure/sortable_header.phtml:21
+#: templates/database/structure/sortable_header.phtml:38
+#: templates/table/search/options.phtml:68
 msgid "Ascending"
 msgstr "Ascendent"
 
@@ -3354,13 +3361,14 @@ msgstr "Ascendent"
 #: libraries/operations.lib.php:797 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:188
-#: templates/structure/sortable_header.phtml:26
-#: templates/structure/sortable_header.phtml:43
-#: templates/table/options.phtml:69
+#: templates/database/structure/sortable_header.phtml:26
+#: templates/database/structure/sortable_header.phtml:43
+#: templates/table/search/options.phtml:69
 msgid "Descending"
 msgstr "Descendent"
 
-#: libraries/DBQbe.class.php:467 templates/table/search_and_replace.phtml:6
+#: libraries/DBQbe.class.php:467
+#: templates/table/search/search_and_replace.phtml:6
 msgid "Column:"
 msgstr "Columna:"
 
@@ -3519,12 +3527,12 @@ msgstr[0] "%1$s resultat a <strong>%2$s</strong>"
 msgstr[1] "%1$s resultats a <strong>%2$s</strong>"
 
 #: libraries/DbSearch.class.php:354 libraries/Menu.class.php:311
-#: libraries/Util.class.php:3337 libraries/Util.class.php:3347
-#: libraries/Util.class.php:3623 libraries/Util.class.php:3624
-#: libraries/Util.class.php:4343 libraries/config.values.php:43
+#: libraries/Util.class.php:3343 libraries/Util.class.php:3353
+#: libraries/Util.class.php:3629 libraries/Util.class.php:3630
+#: libraries/Util.class.php:4349 libraries/config.values.php:43
 #: libraries/config.values.php:51 libraries/config.values.php:119
 #: libraries/navigation/Nodes/Node_Table.class.php:295
-#: templates/structure/check_all_table_column.phtml:5
+#: templates/table/structure/check_all_table_column.phtml:5
 msgid "Browse"
 msgstr "Navega"
 
@@ -3541,7 +3549,8 @@ msgstr "Cerca a la base de dades"
 msgid "Words or values to search for (wildcard: \"%\"):"
 msgstr "Paraules o valors a cercar (comodí: \"%\"):"
 
-#: libraries/DbSearch.class.php:401 templates/table/search_and_replace.phtml:1
+#: libraries/DbSearch.class.php:401
+#: templates/table/search/search_and_replace.phtml:1
 msgid "Find:"
 msgstr "Trobat:"
 
@@ -3585,28 +3594,28 @@ msgstr "Filtrar files"
 msgid "Search this table"
 msgstr "Cerca aquesta taula"
 
-#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2532
-#: libraries/Util.class.php:2535
+#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2538
+#: libraries/Util.class.php:2541
 msgctxt "First page"
 msgid "Begin"
 msgstr "Inici"
 
-#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2533
-#: libraries/Util.class.php:2536 libraries/server_bin_log.lib.php:170
+#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2539
+#: libraries/Util.class.php:2542 libraries/server_bin_log.lib.php:170
 #: libraries/server_bin_log.lib.php:172
 msgctxt "Previous page"
 msgid "Previous"
 msgstr "Pàgina anterior"
 
-#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2564
-#: libraries/Util.class.php:2574 libraries/server_bin_log.lib.php:204
+#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2570
+#: libraries/Util.class.php:2580 libraries/server_bin_log.lib.php:204
 #: libraries/server_bin_log.lib.php:206
 msgctxt "Next page"
 msgid "Next"
 msgstr "Pàgina següent"
 
-#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2565
-#: libraries/Util.class.php:2575
+#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2571
+#: libraries/Util.class.php:2581
 msgctxt "Last page"
 msgid "End"
 msgstr "Darrera pàgina"
@@ -3679,15 +3688,15 @@ msgid "May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]."
 msgstr "Pot ser aproximat. Veieu [doc@faq3-11]FAQ 3.11[/doc]."
 
 #: libraries/DisplayResults.class.php:4332 libraries/Message.class.php:180
-#: libraries/controllers/TableRelationController.class.php:258
+#: libraries/controllers/TableRelationController.class.php:259
 #: libraries/controllers/TableSearchController.class.php:655
-#: libraries/rte/rte_routines.lib.php:1332 libraries/sql_query_form.lib.php:89
+#: libraries/rte/rte_routines.lib.php:1423 libraries/sql_query_form.lib.php:89
 #: tbl_operations.php:227 tbl_row_action.php:138 view_operations.php:62
 msgid "Your SQL query has been executed successfully."
 msgstr "La vostra comanda SQL ha estat executada amb èxit."
 
 #: libraries/DisplayResults.class.php:4660
-#: libraries/controllers/StructureController.class.php:629
+#: libraries/controllers/DatabaseStructureController.class.php:564
 #, php-format
 msgid ""
 "This view has at least this number of rows. Please refer to %sdocumentation"
@@ -3710,33 +3719,33 @@ msgstr "%1$d en total, %2$d a la consulta"
 msgid "%d total"
 msgstr "%d total"
 
-#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1318
+#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1312
 #, php-format
 msgid "Query took %01.4f seconds."
 msgstr "La consulta tarda %01.4f segons."
 
 #: libraries/DisplayResults.class.php:4807
-#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4767
-#: libraries/Util.class.php:4773 libraries/mult_submits.inc.php:50
-#: templates/structure/check_all_tables.phtml:2
-#: templates/structure/check_all_tables.phtml:9
+#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4773
+#: libraries/Util.class.php:4779 libraries/mult_submits.inc.php:50
+#: templates/database/structure/check_all_tables.phtml:2
+#: templates/database/structure/check_all_tables.phtml:9
 msgid "With selected:"
 msgstr "Amb marca:"
 
 #: libraries/DisplayResults.class.php:4811
-#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4769
-#: libraries/Util.class.php:4770 libraries/server_privileges.lib.php:1174
+#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4775
+#: libraries/Util.class.php:4776 libraries/server_privileges.lib.php:1174
 #: libraries/server_privileges.lib.php:1175
 #: libraries/server_privileges.lib.php:1387
 #: libraries/server_user_groups.lib.php:231
-#: templates/structure/check_all_tables.phtml:3
-#: templates/structure/check_all_tables.phtml:4
+#: templates/database/structure/check_all_tables.phtml:3
+#: templates/database/structure/check_all_tables.phtml:4
 msgid "Check All"
 msgstr "Marcar-ho tot"
 
 #: libraries/DisplayResults.class.php:4985 libraries/Header.class.php:383
-#: templates/structure/optional_action_links.phtml:1
-#: templates/structure/print_view_data_dictionary_link.phtml:3
+#: templates/database/structure/print_view_data_dictionary_link.phtml:3
+#: templates/table/structure/optional_action_links.phtml:1
 msgid "Print view"
 msgstr "Imprimeix vista"
 
@@ -3744,7 +3753,8 @@ msgstr "Imprimeix vista"
 msgid "Query results operations"
 msgstr "Operacions de resultats de consultes"
 
-#: libraries/DisplayResults.class.php:5105 templates/tbl_chart.phtml:12
+#: libraries/DisplayResults.class.php:5105
+#: templates/table/chart/tbl_chart.phtml:12
 msgid "Display chart"
 msgstr "Mostra el gràfic"
 
@@ -3836,7 +3846,7 @@ msgid "Click on the bar to scroll to top of page"
 msgstr "Feu clic a la barra per desplaçar-se al principi d'aquesta pàgina"
 
 #: libraries/Header.class.php:749
-#: libraries/plugins/auth/AuthenticationCookie.class.php:152
+#: libraries/plugins/auth/AuthenticationCookie.class.php:140
 msgid "Javascript must be enabled past this point!"
 msgstr "A partir d'aquest punt és necessari tenir el javascript activat!"
 
@@ -3858,11 +3868,11 @@ msgid "Keyname"
 msgstr "Nom de clau"
 
 #: libraries/Index.class.php:697
-#: libraries/controllers/StructureController.class.php:1962
-#: libraries/controllers/StructureController.class.php:1967
+#: libraries/controllers/TableStructureController.class.php:953
+#: libraries/controllers/TableStructureController.class.php:958
 #: libraries/tracking.lib.php:973
 #: templates/columns_definitions/column_indexes.phtml:11
-#: templates/structure/check_all_table_column.phtml:26
+#: templates/table/structure/check_all_table_column.phtml:26
 msgid "Unique"
 msgstr "Única"
 
@@ -3881,16 +3891,17 @@ msgstr "Cardinalitat"
 #: libraries/server_collations.lib.php:35 libraries/tracking.lib.php:881
 #: libraries/tracking.lib.php:977
 #: templates/columns_definitions/table_fields_definitions.phtml:33
-#: templates/structure/row_stats_table.phtml:31
-#: templates/structure/table_header.phtml:55
-#: templates/structure/table_structure_header.phtml:7
-#: templates/table/table_header.phtml:8
+#: templates/database/structure/table_header.phtml:55
+#: templates/table/search/table_header.phtml:8
+#: templates/table/structure/row_stats_table.phtml:31
+#: templates/table/structure/table_structure_header.phtml:7
 msgid "Collation"
 msgstr "Ordenació"
 
 #: libraries/Index.class.php:703 libraries/rte/rte_events.lib.php:496
-#: libraries/rte/rte_routines.lib.php:956 libraries/tracking.lib.php:885
-#: libraries/tracking.lib.php:979 templates/structure/table_header.phtml:84
+#: libraries/rte/rte_routines.lib.php:1047 libraries/tracking.lib.php:885
+#: libraries/tracking.lib.php:979
+#: templates/database/structure/table_header.phtml:84
 msgid "Comment"
 msgstr "Comentari"
 
@@ -3903,15 +3914,15 @@ msgstr "S'ha esborrat la clau principal."
 msgid "Index %s has been dropped."
 msgstr "S'ha esborrat l'índex %s."
 
-#: libraries/Index.class.php:757 libraries/Util.class.php:3630
-#: libraries/Util.class.php:3631
-#: libraries/controllers/StructureController.class.php:1958
-#: libraries/controllers/StructureController.class.php:1959
+#: libraries/Index.class.php:757 libraries/Util.class.php:3636
+#: libraries/Util.class.php:3637
+#: libraries/controllers/TableStructureController.class.php:949
+#: libraries/controllers/TableStructureController.class.php:950
 #: libraries/operations.lib.php:1607 libraries/rte/rte_list.lib.php:150
 #: libraries/server_databases.lib.php:146
-#: templates/structure/check_all_table_column.phtml:15
-#: templates/structure/check_all_tables.phtml:16
-#: templates/tbl_relation/foreign_key_row.phtml:93
+#: templates/database/structure/check_all_tables.phtml:16
+#: templates/table/relation/foreign_key_row.phtml:93
+#: templates/table/structure/check_all_table_column.phtml:15
 msgid "Drop"
 msgstr "Elimina"
 
@@ -3942,16 +3953,16 @@ msgstr "Servidor"
 #: libraries/Menu.class.php:248
 #: libraries/navigation/Nodes/Node_View.class.php:32
 #: libraries/tbl_info.inc.php:63
-#: templates/structure/structure_table_row.phtml:97
-#: templates/structure/structure_table_row.phtml:159
+#: templates/database/structure/structure_table_row.phtml:97
+#: templates/database/structure/structure_table_row.phtml:159
 msgid "View"
 msgstr "Vista"
 
 #: libraries/Menu.class.php:325 libraries/Menu.class.php:429
-#: libraries/Menu.class.php:548 libraries/Util.class.php:3334
-#: libraries/Util.class.php:3344 libraries/Util.class.php:3350
-#: libraries/Util.class.php:4313 libraries/Util.class.php:4328
-#: libraries/Util.class.php:4345 libraries/config.values.php:40
+#: libraries/Menu.class.php:548 libraries/Util.class.php:3340
+#: libraries/Util.class.php:3350 libraries/Util.class.php:3356
+#: libraries/Util.class.php:4319 libraries/Util.class.php:4334
+#: libraries/Util.class.php:4351 libraries/config.values.php:40
 #: libraries/config.values.php:48 libraries/config.values.php:110
 #: libraries/config.values.php:116 libraries/config/messages.inc.php:321
 #: libraries/navigation/Nodes/Node_Table.class.php:292
@@ -3959,19 +3970,19 @@ msgid "SQL"
 msgstr "SQL"
 
 #: libraries/Menu.class.php:328 libraries/Menu.class.php:432
-#: libraries/Util.class.php:3335 libraries/Util.class.php:3345
-#: libraries/Util.class.php:3351 libraries/Util.class.php:3625
-#: libraries/Util.class.php:3626 libraries/Util.class.php:4329
-#: libraries/Util.class.php:4346 libraries/config.values.php:41
+#: libraries/Util.class.php:3341 libraries/Util.class.php:3351
+#: libraries/Util.class.php:3357 libraries/Util.class.php:3631
+#: libraries/Util.class.php:3632 libraries/Util.class.php:4335
+#: libraries/Util.class.php:4352 libraries/config.values.php:41
 #: libraries/config.values.php:49 libraries/config.values.php:111
 #: libraries/config.values.php:117
 #: libraries/navigation/Nodes/Node_Table.class.php:286
 msgid "Search"
 msgstr "Cerca"
 
-#: libraries/Menu.class.php:338 libraries/Util.class.php:3336
-#: libraries/Util.class.php:3346 libraries/Util.class.php:3627
-#: libraries/Util.class.php:3628 libraries/Util.class.php:4347
+#: libraries/Menu.class.php:338 libraries/Util.class.php:3342
+#: libraries/Util.class.php:3352 libraries/Util.class.php:3633
+#: libraries/Util.class.php:3634 libraries/Util.class.php:4353
 #: libraries/config.values.php:42 libraries/config.values.php:50
 #: libraries/config.values.php:118
 #: libraries/navigation/Nodes/Node_Table.class.php:289
@@ -3980,30 +3991,30 @@ msgid "Insert"
 msgstr "Insereix"
 
 #: libraries/Menu.class.php:362 libraries/Menu.class.php:467
-#: libraries/Util.class.php:4334 libraries/Util.class.php:4350
+#: libraries/Util.class.php:4340 libraries/Util.class.php:4356
 #: libraries/config.values.php:106 libraries/server_common.lib.php:51
 #: libraries/server_privileges.lib.php:2370
 #: libraries/server_privileges.lib.php:3158
-#: libraries/server_privileges.lib.php:4221
+#: libraries/server_privileges.lib.php:4247
 msgid "Privileges"
 msgstr "Permisos"
 
 #: libraries/Menu.class.php:371 libraries/Menu.class.php:379
-#: libraries/Menu.class.php:459 libraries/Util.class.php:3338
-#: libraries/Util.class.php:3352 libraries/Util.class.php:4333
-#: libraries/Util.class.php:4351 libraries/config.values.php:112
+#: libraries/Menu.class.php:459 libraries/Util.class.php:3344
+#: libraries/Util.class.php:3358 libraries/Util.class.php:4339
+#: libraries/Util.class.php:4357 libraries/config.values.php:112
 #: view_operations.php:92
 msgid "Operations"
 msgstr "Operacions"
 
 #: libraries/Menu.class.php:384 libraries/Menu.class.php:492
-#: libraries/Util.class.php:4338 libraries/Util.class.php:4352
+#: libraries/Util.class.php:4344 libraries/Util.class.php:4358
 #: libraries/relation.lib.php:255
 msgid "Tracking"
 msgstr "Seguiment"
 
 #: libraries/Menu.class.php:397 libraries/Menu.class.php:486
-#: libraries/Util.class.php:4337 libraries/Util.class.php:4353
+#: libraries/Util.class.php:4343 libraries/Util.class.php:4359
 #: libraries/navigation/Nodes/Node_Trigger_Container.class.php:24
 #: libraries/plugins/export/ExportHtmlword.class.php:557
 #: libraries/plugins/export/ExportOdt.class.php:685
@@ -4020,16 +4031,16 @@ msgstr "Disparadors"
 msgid "Database seems to be empty!"
 msgstr "La base de dades sembla buida!"
 
-#: libraries/Menu.class.php:439 libraries/Util.class.php:4330
+#: libraries/Menu.class.php:439 libraries/Util.class.php:4336
 msgid "Query"
 msgstr "Consulta segons exemple"
 
-#: libraries/Menu.class.php:472 libraries/Util.class.php:4335
+#: libraries/Menu.class.php:472 libraries/Util.class.php:4341
 #: libraries/rte/rte_words.lib.php:36
 msgid "Routines"
 msgstr "Rutines"
 
-#: libraries/Menu.class.php:479 libraries/Util.class.php:4336
+#: libraries/Menu.class.php:479 libraries/Util.class.php:4342
 #: libraries/navigation/Nodes/Node_Event_Container.class.php:26
 #: libraries/plugins/export/ExportSql.class.php:940
 #: libraries/plugins/export/ExportXml.class.php:107
@@ -4037,20 +4048,20 @@ msgstr "Rutines"
 msgid "Events"
 msgstr "Esdeveniments"
 
-#: libraries/Menu.class.php:498 libraries/Util.class.php:4339
+#: libraries/Menu.class.php:498 libraries/Util.class.php:4345
 msgid "Designer"
 msgstr "Dissenyador"
 
-#: libraries/Menu.class.php:507 libraries/Util.class.php:4340
-#: templates/structure/check_all_tables.phtml:35
+#: libraries/Menu.class.php:507 libraries/Util.class.php:4346
+#: templates/database/structure/check_all_tables.phtml:35
 msgid "Central columns"
 msgstr "Columnes centrals"
 
-#: libraries/Menu.class.php:544 libraries/Util.class.php:4312
+#: libraries/Menu.class.php:544 libraries/Util.class.php:4318
 #: libraries/config.values.php:103 libraries/config/messages.inc.php:266
 #: libraries/config/messages.inc.php:341
 #: libraries/navigation/NavigationTree.class.php:1239
-#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4332
+#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4358
 msgid "Databases"
 msgstr "Bases de dades"
 
@@ -4059,34 +4070,34 @@ msgid "User accounts"
 msgstr "Comptes d'usuaris"
 
 #: libraries/Menu.class.php:595 libraries/ServerStatusData.class.php:121
-#: libraries/Util.class.php:4319 libraries/server_common.lib.php:36
+#: libraries/Util.class.php:4325 libraries/server_common.lib.php:36
 msgid "Binary log"
 msgstr "Registre binari"
 
 #: libraries/Menu.class.php:601 libraries/ServerStatusData.class.php:126
-#: libraries/Util.class.php:4320 libraries/server_common.lib.php:42
-#: templates/structure/body_for_table_summary.phtml:10
-#: templates/structure/table_header.phtml:27
+#: libraries/Util.class.php:4326 libraries/server_common.lib.php:42
+#: templates/database/structure/body_for_table_summary.phtml:10
+#: templates/database/structure/table_header.phtml:27
 msgid "Replication"
 msgstr "Replicació"
 
 #: libraries/Menu.class.php:606 libraries/ServerStatusData.class.php:193
-#: libraries/Util.class.php:4321 libraries/config.values.php:105
+#: libraries/Util.class.php:4327 libraries/config.values.php:105
 #: libraries/server_engines.lib.php:108 libraries/server_engines.lib.php:112
 #: libraries/sql_query_form.lib.php:421
 msgid "Variables"
 msgstr "Variables"
 
-#: libraries/Menu.class.php:610 libraries/Util.class.php:4322
+#: libraries/Menu.class.php:610 libraries/Util.class.php:4328
 msgid "Charsets"
 msgstr "Jocs de caràcters"
 
-#: libraries/Menu.class.php:615 libraries/Util.class.php:4323
+#: libraries/Menu.class.php:615 libraries/Util.class.php:4329
 #: libraries/server_common.lib.php:33 libraries/server_plugins.lib.php:27
 msgid "Plugins"
 msgstr "Complements"
 
-#: libraries/Menu.class.php:626 libraries/Util.class.php:4324
+#: libraries/Menu.class.php:626 libraries/Util.class.php:4330
 msgid "Engines"
 msgstr "Motors"
 
@@ -4111,7 +4122,7 @@ msgid_plural "%1$d rows inserted."
 msgstr[0] "%1$d fila inserida."
 msgstr[1] "%1$d files inserides."
 
-#: libraries/PDF.class.php:70 libraries/Util.class.php:2521
+#: libraries/PDF.class.php:70 libraries/Util.class.php:2527
 #: libraries/browse_foreigners.lib.php:327
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:865
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:890
@@ -4132,7 +4143,7 @@ msgid "Could not save favorite table!"
 msgstr "No es pot desar la taula favorita!"
 
 #: libraries/RecentFavoriteTable.class.php:212
-#: templates/structure/favorite_anchor.phtml:12
+#: templates/database/structure/favorite_anchor.phtml:12
 msgid "Remove from Favorites"
 msgstr "Eliminar de favorits"
 
@@ -4299,7 +4310,7 @@ msgstr ""
 "d'emmagatzematge."
 
 #: libraries/StorageEngine.class.php:373
-#: templates/structure/body_for_table_summary.phtml:50
+#: templates/database/structure/body_for_table_summary.phtml:50
 #, php-format
 msgid "%s is the default storage engine on this MySQL server."
 msgstr "%s és el motor d'emmagatzematge per defecte en aquest servidor MySQL."
@@ -4783,10 +4794,10 @@ msgstr ""
 
 #: libraries/Util.class.php:726 libraries/rte/rte_events.lib.php:110
 #: libraries/rte/rte_events.lib.php:119 libraries/rte/rte_events.lib.php:150
-#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:153
-#: libraries/rte/rte_routines.lib.php:162
-#: libraries/rte/rte_routines.lib.php:235
-#: libraries/rte/rte_routines.lib.php:1366
+#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:223
+#: libraries/rte/rte_routines.lib.php:250
+#: libraries/rte/rte_routines.lib.php:372
+#: libraries/rte/rte_routines.lib.php:1457
 #: libraries/rte/rte_triggers.lib.php:86 libraries/rte/rte_triggers.lib.php:95
 #: libraries/rte/rte_triggers.lib.php:127
 msgid "MySQL said: "
@@ -4830,76 +4841,79 @@ msgstr "Diu"
 msgid "%B %d, %Y at %I:%M %p"
 msgstr "%d-%m-%Y a les %H:%M:%S"
 
-#: libraries/Util.class.php:2019
+#: libraries/Util.class.php:2025
 #, php-format
 msgid "%s days, %s hours, %s minutes and %s seconds"
 msgstr "%s dies, %s hores, %s minuts i %s segons"
 
-#: libraries/Util.class.php:2112
+#: libraries/Util.class.php:2118
 msgid "Missing parameter:"
 msgstr "Falta paràmetre:"
 
-#: libraries/Util.class.php:2645
+#: libraries/Util.class.php:2651
 #, php-format
 msgid "Jump to database \"%s\"."
 msgstr "Vés a la base de dades \"%s\"."
 
-#: libraries/Util.class.php:2670
+#: libraries/Util.class.php:2676
 #, php-format
 msgid "The %s functionality is affected by a known bug, see %s"
 msgstr "La funcionalitat %s es veu afectada per un error conegut, veieu %s"
 
-#: libraries/Util.class.php:2881
+#: libraries/Util.class.php:2887
 msgid "Click to toggle"
 msgstr "Prem per canviar"
 
-#: libraries/Util.class.php:3542 prefs_manage.php:248
+#: libraries/Util.class.php:3548 prefs_manage.php:248
 msgid "Browse your computer:"
 msgstr "Navega al teu ordinador:"
 
-#: libraries/Util.class.php:3567
+#: libraries/Util.class.php:3573
 #, php-format
 msgid "Select from the web server upload directory <b>%s</b>:"
 msgstr ""
 "Selecciona des del directori de pujada d'arxius del servidor web <b>%s</b>:"
 
-#: libraries/Util.class.php:3596 libraries/insert_edit.lib.php:1173
+#: libraries/Util.class.php:3602 libraries/insert_edit.lib.php:1171
 msgid "The directory you set for upload work cannot be reached."
 msgstr "No està disponible el directori indicat per pujar arxius."
 
-#: libraries/Util.class.php:3607
+#: libraries/Util.class.php:3613
 msgid "There are no files to upload!"
 msgstr "No hi ha files per pujar!"
 
-#: libraries/Util.class.php:3632 libraries/Util.class.php:3633
-#: templates/structure/check_all_tables.phtml:15
+#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: templates/database/structure/check_all_tables.phtml:15
 msgid "Empty"
 msgstr "Buida"
 
-#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: libraries/Util.class.php:3644 libraries/Util.class.php:3645
 msgid "Execute"
 msgstr "Executar"
 
-#: libraries/Util.class.php:4152
+#: libraries/Util.class.php:4158
 msgid "Print"
 msgstr "Imprimeix"
 
-#: libraries/Util.class.php:4257 templates/structure/row_stats_table.phtml:80
-#: templates/structure/table_header.phtml:95
+#: libraries/Util.class.php:4263
+#: templates/database/structure/table_header.phtml:95
+#: templates/table/structure/row_stats_table.phtml:80
 msgid "Creation"
 msgstr "Creació"
 
-#: libraries/Util.class.php:4263 templates/structure/row_stats_table.phtml:87
-#: templates/structure/table_header.phtml:106
+#: libraries/Util.class.php:4269
+#: templates/database/structure/table_header.phtml:106
+#: templates/table/structure/row_stats_table.phtml:87
 msgid "Last update"
 msgstr "Darrera actualització"
 
-#: libraries/Util.class.php:4269 templates/structure/row_stats_table.phtml:94
-#: templates/structure/table_header.phtml:117
+#: libraries/Util.class.php:4275
+#: templates/database/structure/table_header.phtml:117
+#: templates/table/structure/row_stats_table.phtml:94
 msgid "Last check"
 msgstr "Darrera comprovació"
 
-#: libraries/Util.class.php:4315
+#: libraries/Util.class.php:4321
 msgid "Users"
 msgstr "Usuaris"
 
@@ -4920,16 +4934,16 @@ msgid "Use this value"
 msgstr "Fes servir aquest valor"
 
 #: libraries/build_html_for_db.lib.php:33 libraries/import.lib.php:193
-#: templates/structure/actions_in_table_structure.phtml:113
-#: templates/structure/row_stats_table.phtml:42
-#: templates/structure/table_header.phtml:36
+#: templates/database/structure/table_header.phtml:36
+#: templates/table/structure/actions_in_table_structure.phtml:113
+#: templates/table/structure/row_stats_table.phtml:42
 msgid "Rows"
 msgstr "Fila"
 
 #: libraries/build_html_for_db.lib.php:48 libraries/engines/innodb.lib.php:171
-#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:186
-#: libraries/server_status.lib.php:298
-#: templates/structure/display_table_stats.phtml:40
+#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:195
+#: libraries/server_status.lib.php:307
+#: templates/table/structure/display_table_stats.phtml:40
 msgid "Total"
 msgstr "Total"
 
@@ -4938,10 +4952,12 @@ msgid "Jump to database"
 msgstr "Vés a la base de dades"
 
 #: libraries/build_html_for_db.lib.php:146
+#: templates/database/structure/structure_table_row.phtml:15
 msgid "Not replicated"
 msgstr "No replicat"
 
 #: libraries/build_html_for_db.lib.php:158
+#: templates/database/structure/structure_table_row.phtml:16
 msgid "Replicated"
 msgstr "Replicat"
 
@@ -4998,17 +5014,17 @@ msgstr "NO"
 #: libraries/plugins/export/ExportTexytext.class.php:425
 #: libraries/plugins/export/PMA_ExportPdf.class.php:307
 #: libraries/rte/rte_list.lib.php:73 libraries/rte/rte_list.lib.php:85
-#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:830
-#: libraries/rte/rte_routines.lib.php:1492 setup/frames/index.inc.php:162
+#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:921
+#: libraries/rte/rte_routines.lib.php:1583 setup/frames/index.inc.php:162
 #: templates/columns_definitions/table_fields_definitions.phtml:8
-#: templates/structure/table_structure_header.phtml:5
-#: templates/table/create_table.phtml:11
+#: templates/database/create_table.phtml:11
+#: templates/table/structure/table_structure_header.phtml:5
 msgid "Name"
 msgstr "Nom"
 
 #: libraries/central_columns.lib.php:699
 #: libraries/central_columns.lib.php:1381
-#: libraries/rte/rte_routines.lib.php:832
+#: libraries/rte/rte_routines.lib.php:923
 #: templates/columns_definitions/table_fields_definitions.phtml:14
 msgid "Length/Values"
 msgstr "Longitud/Valors*"
@@ -5027,7 +5043,7 @@ msgid "Select a table"
 msgstr "Tria una taula"
 
 #: libraries/central_columns.lib.php:804
-#: templates/structure/add_column.phtml:4
+#: templates/table/structure/add_column.phtml:4
 msgid "Add column"
 msgstr "Afegeix columna(es)"
 
@@ -5043,7 +5059,7 @@ msgstr "Afegir una nova columna"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1002
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1025
 #: templates/columns_definitions/table_fields_definitions.phtml:36
-#: templates/structure/table_structure_header.phtml:8
+#: templates/table/structure/table_structure_header.phtml:8
 msgid "Attributes"
 msgstr "Atributs"
 
@@ -5161,7 +5177,7 @@ msgid "Double click"
 msgstr "Doble clic"
 
 #: libraries/config.values.php:95 libraries/config.values.php:124
-#: libraries/config/FormDisplay.tpl.php:221 libraries/relation.lib.php:97
+#: libraries/config/FormDisplay.tpl.php:232 libraries/relation.lib.php:97
 #: libraries/relation.lib.php:105
 msgid "Disabled"
 msgstr "Desactivat"
@@ -5331,21 +5347,21 @@ msgstr "L'exportació comprimida no funciona perquè falta la funció (%s)."
 msgid "maximum %s"
 msgstr "màxim %s"
 
-#: libraries/config/FormDisplay.tpl.php:219
+#: libraries/config/FormDisplay.tpl.php:230
 msgid "This setting is disabled, it will not be applied to your configuration."
 msgstr "Aquesta opció està desactivada, no s'aplicarà a la teva configuració."
 
-#: libraries/config/FormDisplay.tpl.php:313
+#: libraries/config/FormDisplay.tpl.php:324
 #, php-format
 msgid "Set value: %s"
 msgstr "Estableix valor: %s"
 
-#: libraries/config/FormDisplay.tpl.php:318
+#: libraries/config/FormDisplay.tpl.php:329
 #: libraries/config/messages.inc.php:610
 msgid "Restore default value"
 msgstr "Restaura el valor per defecte"
 
-#: libraries/config/FormDisplay.tpl.php:332
+#: libraries/config/FormDisplay.tpl.php:343
 msgid "Allow users to customize this value"
 msgstr "Permet als usuaris configurar aquest valor"
 
@@ -5834,7 +5850,7 @@ msgstr "Joc de caràcters de l'arxiu"
 
 #: libraries/config/messages.inc.php:136 libraries/config/messages.inc.php:152
 #: libraries/sql_query_form.lib.php:247
-#: templates/structure/row_stats_table.phtml:7
+#: templates/table/structure/row_stats_table.phtml:7
 msgid "Format"
 msgstr "Format"
 
@@ -6350,7 +6366,7 @@ msgstr ""
 
 #: libraries/config/messages.inc.php:332
 #: libraries/plugins/export/ExportPdf.class.php:279
-#: templates/structure/secondary_tabs.phtml:8
+#: templates/table/secondary_tabs.phtml:8
 msgid "Table structure"
 msgstr "Estructura de taula"
 
@@ -8067,102 +8083,33 @@ msgstr "Microsoft Word 2000"
 msgid "OpenDocument Text"
 msgstr "Texte OpenDocument"
 
-#: libraries/controllers/StructureController.class.php:465
+#: libraries/controllers/DatabaseStructureController.class.php:405
 #: tbl_operations.php:382
 #, php-format
 msgid "Table %s has been emptied."
 msgstr "S'ha buidat la taula %s."
 
-#: libraries/controllers/StructureController.class.php:486
+#: libraries/controllers/DatabaseStructureController.class.php:426
 #: tbl_operations.php:400 view_operations.php:119
 #, php-format
 msgid "View %s has been dropped."
 msgstr "Vista %s esborrada."
 
-#: libraries/controllers/StructureController.class.php:487
+#: libraries/controllers/DatabaseStructureController.class.php:427
 #: tbl_operations.php:401
 #, php-format
 msgid "Table %s has been dropped."
 msgstr "S'ha esborrat la taula %s."
 
-#: libraries/controllers/StructureController.class.php:797
-#, php-format
-msgid "The name '%s' is a MySQL reserved keyword."
-msgid_plural "The names '%s' are MySQL reserved keywords."
-msgstr[0] "El nom '%s' és una paraula clau reservada de MySQL."
-msgstr[1] "Els noms '%s' són paraules clau reservades de MySQL."
-
-#: libraries/controllers/StructureController.class.php:875
-msgid "No column selected."
-msgstr "No s'han triat columnes."
-
-#: libraries/controllers/StructureController.class.php:1049
+#: libraries/controllers/DatabaseStructureController.class.php:733
 msgid "Favorite List is full!"
 msgstr "La llista de preferits és plena!"
 
-#: libraries/controllers/StructureController.class.php:1272
-msgid "The columns have been moved successfully."
-msgstr "Les columnes s'han mogut correctament."
-
-#: libraries/controllers/StructureController.class.php:1535
-#, fuzzy, php-format
-#| msgid "Table %1$s has been altered successfully."
-msgid ""
-"Table %1$s has been altered successfully. Privileges have been adjusted."
-msgstr "S'ha modificat la taula %1$s correctament."
-
-#: libraries/controllers/StructureController.class.php:1541
-#: libraries/controllers/TableIndexesController.class.php:161
-#: tbl_addfield.php:92
-#, php-format
-msgid "Table %1$s has been altered successfully."
-msgstr "S'ha modificat la taula %1$s correctament."
-
-#: libraries/controllers/StructureController.class.php:1588
-#: libraries/tracking.lib.php:1094
-msgid "Query error"
-msgstr "Error de consulta"
-
-#: libraries/controllers/StructureController.class.php:1806
+#: libraries/controllers/DatabaseStructureController.class.php:947
 #: libraries/mysql_charsets.lib.php:366 libraries/mysql_charsets.lib.php:373
 msgid "unknown"
 msgstr "desconegut"
 
-#: libraries/controllers/StructureController.class.php:1957
-#: templates/structure/check_all_table_column.phtml:11
-msgid "Change"
-msgstr "Canvi"
-
-#: libraries/controllers/StructureController.class.php:1961
-#: libraries/controllers/StructureController.class.php:1966
-#: libraries/navigation/Nodes/Node_Index.class.php:30
-#: libraries/tracking.lib.php:926
-#: templates/columns_definitions/column_indexes.phtml:16
-#: templates/columns_definitions/table_fields_definitions.phtml:57
-#: templates/structure/check_all_table_column.phtml:30
-#: templates/structure/display_structure.phtml:79
-#: templates/structure/display_table_stats.phtml:19
-msgid "Index"
-msgstr "Índex"
-
-#: libraries/controllers/StructureController.class.php:1963
-#: libraries/controllers/StructureController.class.php:1968
-#: templates/columns_definitions/column_indexes.phtml:27
-#: templates/structure/check_all_table_column.phtml:37
-msgid "Spatial"
-msgstr "Espacial"
-
-#: libraries/controllers/StructureController.class.php:1964
-#: libraries/controllers/StructureController.class.php:1969
-#: templates/columns_definitions/column_indexes.phtml:22
-#: templates/structure/check_all_table_column.phtml:47
-msgid "Fulltext"
-msgstr "Text sencer"
-
-#: libraries/controllers/StructureController.class.php:1970
-msgid "Distinct values"
-msgstr "Valors diferents"
-
 #: libraries/controllers/TableChartController.class.php:82
 #: libraries/controllers/TableGisVisualizationController.class.php:101
 msgid "No SQL query was set to fetch data."
@@ -8176,11 +8123,18 @@ msgstr "No existeixen columnes numèriques a la taula per fer el gràfic."
 msgid "No data to display"
 msgstr "No hi ha dades per mostrar"
 
-#: libraries/controllers/TableRelationController.class.php:217
+#: libraries/controllers/TableIndexesController.class.php:161
+#: libraries/controllers/TableStructureController.class.php:736
+#: tbl_addfield.php:92
+#, php-format
+msgid "Table %1$s has been altered successfully."
+msgstr "S'ha modificat la taula %1$s correctament."
+
+#: libraries/controllers/TableRelationController.class.php:218
 msgid "Display column was successfully updated."
 msgstr "Columna de visualització actualitzada correctament."
 
-#: libraries/controllers/TableRelationController.class.php:283
+#: libraries/controllers/TableRelationController.class.php:288
 msgid "Internal relations were successfully updated."
 msgstr "Relacions internes actualitzades correctament."
 
@@ -8193,10 +8147,72 @@ msgid "Zoom search"
 msgstr "Cerca de zoom"
 
 #: libraries/controllers/TableSearchController.class.php:852
-#: templates/table/selection_form.phtml:59
+#: templates/table/search/selection_form.phtml:59
 msgid "Find and replace"
 msgstr "Troba i substitueix"
 
+#: libraries/controllers/TableStructureController.class.php:163
+#, php-format
+msgid "The name '%s' is a MySQL reserved keyword."
+msgid_plural "The names '%s' are MySQL reserved keywords."
+msgstr[0] "El nom '%s' és una paraula clau reservada de MySQL."
+msgstr[1] "Els noms '%s' són paraules clau reservades de MySQL."
+
+#: libraries/controllers/TableStructureController.class.php:241
+msgid "No column selected."
+msgstr "No s'han triat columnes."
+
+#: libraries/controllers/TableStructureController.class.php:467
+msgid "The columns have been moved successfully."
+msgstr "Les columnes s'han mogut correctament."
+
+#: libraries/controllers/TableStructureController.class.php:730
+#, fuzzy, php-format
+#| msgid "Table %1$s has been altered successfully."
+msgid ""
+"Table %1$s has been altered successfully. Privileges have been adjusted."
+msgstr "S'ha modificat la taula %1$s correctament."
+
+#: libraries/controllers/TableStructureController.class.php:783
+#: libraries/tracking.lib.php:1094
+msgid "Query error"
+msgstr "Error de consulta"
+
+#: libraries/controllers/TableStructureController.class.php:948
+#: templates/table/structure/check_all_table_column.phtml:11
+msgid "Change"
+msgstr "Canvi"
+
+#: libraries/controllers/TableStructureController.class.php:952
+#: libraries/controllers/TableStructureController.class.php:957
+#: libraries/navigation/Nodes/Node_Index.class.php:30
+#: libraries/tracking.lib.php:926
+#: templates/columns_definitions/column_indexes.phtml:16
+#: templates/columns_definitions/table_fields_definitions.phtml:57
+#: templates/table/structure/check_all_table_column.phtml:30
+#: templates/table/structure/display_structure.phtml:79
+#: templates/table/structure/display_table_stats.phtml:19
+msgid "Index"
+msgstr "Índex"
+
+#: libraries/controllers/TableStructureController.class.php:954
+#: libraries/controllers/TableStructureController.class.php:959
+#: templates/columns_definitions/column_indexes.phtml:27
+#: templates/table/structure/check_all_table_column.phtml:37
+msgid "Spatial"
+msgstr "Espacial"
+
+#: libraries/controllers/TableStructureController.class.php:955
+#: libraries/controllers/TableStructureController.class.php:960
+#: templates/columns_definitions/column_indexes.phtml:22
+#: templates/table/structure/check_all_table_column.phtml:47
+msgid "Fulltext"
+msgstr "Text sencer"
+
+#: libraries/controllers/TableStructureController.class.php:963
+msgid "Distinct values"
+msgstr "Valors diferents"
+
 #: libraries/core.lib.php:306
 #, php-format
 msgid "The %s extension is missing. Please check your PHP configuration."
@@ -8248,7 +8264,7 @@ msgid "No Password"
 msgstr "Sense contrasenya"
 
 #: libraries/display_change_password.lib.php:68
-#: libraries/plugins/auth/AuthenticationCookie.class.php:199
+#: libraries/plugins/auth/AuthenticationCookie.class.php:187
 #: libraries/replication_gui.lib.php:422 libraries/replication_gui.lib.php:862
 #: libraries/server_privileges.lib.php:1640
 msgid "Password:"
@@ -9064,12 +9080,12 @@ msgid "Dump has been saved to file %s."
 msgstr "El bolcat s'ha desat amb el nom d'arxiu %s."
 
 #: libraries/import.lib.php:202 libraries/insert_edit.lib.php:124
-#: libraries/rte/rte_routines.lib.php:1353 libraries/sql.lib.php:1312
+#: libraries/rte/rte_routines.lib.php:1444 libraries/sql.lib.php:1306
 #: tbl_get_field.php:44
 msgid "MySQL returned an empty result set (i.e. zero rows)."
 msgstr "MySQL ha retornat un conjunt buit (p.e. cap fila)."
 
-#: libraries/import.lib.php:265 libraries/sql.lib.php:1326
+#: libraries/import.lib.php:265 libraries/sql.lib.php:1320
 msgid "[ROLLBACK occurred.]"
 msgstr "[S'ha produït un ROLLBACK.]"
 
@@ -9137,14 +9153,14 @@ msgstr "Crea un índex de&nbsp;%s&nbsp;columnes"
 
 #: libraries/insert_edit.lib.php:233
 #: libraries/navigation/Nodes/Node_DatabaseChild.class.php:48
-#: templates/designer/table_list.phtml:40
+#: templates/database/designer/table_list.phtml:40
 msgid "Hide"
 msgstr "Amaga"
 
 #: libraries/insert_edit.lib.php:249
 #: libraries/navigation/Nodes/Node_Function.class.php:32
-#: libraries/rte/rte_routines.lib.php:1495
-#: templates/table/table_header.phtml:4
+#: libraries/rte/rte_routines.lib.php:1586
+#: templates/table/search/table_header.phtml:4
 msgid "Function"
 msgstr "Funció"
 
@@ -9158,84 +9174,85 @@ msgid "Because of its length,<br /> this column might not be editable."
 msgstr ""
 "A causa de la seva longitud,<br /> aquesta columna podria no ser editable."
 
-#: libraries/insert_edit.lib.php:1050
+#: libraries/insert_edit.lib.php:1048
 msgid "Binary - do not edit"
 msgstr "Binari - no editeu"
 
-#: libraries/insert_edit.lib.php:1176 libraries/server_privileges.lib.php:470
-#: templates/table/options.phtml:36
+#: libraries/insert_edit.lib.php:1174 libraries/server_privileges.lib.php:470
+#: templates/table/search/options.phtml:36
 msgid "Or"
 msgstr "O"
 
-#: libraries/insert_edit.lib.php:1177
+#: libraries/insert_edit.lib.php:1175
 msgid "web server upload directory:"
 msgstr "directori de pujada d'arxius del servidor web:"
 
-#: libraries/insert_edit.lib.php:1348 templates/table/input_box.phtml:49
+#: libraries/insert_edit.lib.php:1346
+#: templates/table/search/input_box.phtml:49
 msgid "Edit/Insert"
 msgstr "Edita/Insereix"
 
-#: libraries/insert_edit.lib.php:1398
+#: libraries/insert_edit.lib.php:1396
 #, php-format
 msgid "Continue insertion with %s rows"
 msgstr "Continua l'inserció amb %s files"
 
-#: libraries/insert_edit.lib.php:1428
+#: libraries/insert_edit.lib.php:1426
 msgid "and then"
 msgstr "i llavors"
 
-#: libraries/insert_edit.lib.php:1461
+#: libraries/insert_edit.lib.php:1459
 msgid "Insert as new row"
 msgstr "Insereix com a nova fila"
 
-#: libraries/insert_edit.lib.php:1464
+#: libraries/insert_edit.lib.php:1462
 msgid "Insert as new row and ignore errors"
 msgstr "Insereix com a nova fila i ignora els errors"
 
-#: libraries/insert_edit.lib.php:1467
+#: libraries/insert_edit.lib.php:1465
 msgid "Show insert query"
 msgstr "Mostra la consulta d'inserció"
 
-#: libraries/insert_edit.lib.php:1487
+#: libraries/insert_edit.lib.php:1485
 msgid "Go back to previous page"
 msgstr "Torna"
 
-#: libraries/insert_edit.lib.php:1490
+#: libraries/insert_edit.lib.php:1488
 msgid "Insert another new row"
 msgstr "Insereix un nou registre"
 
-#: libraries/insert_edit.lib.php:1495
+#: libraries/insert_edit.lib.php:1493
 msgid "Go back to this page"
 msgstr "Torna a aquesta pàgina"
 
-#: libraries/insert_edit.lib.php:1518
+#: libraries/insert_edit.lib.php:1516
 msgid "Edit next row"
 msgstr "Edita el següent registre"
 
-#: libraries/insert_edit.lib.php:1540
+#: libraries/insert_edit.lib.php:1538
 msgid ""
 "Use TAB key to move from value to value, or CTRL+arrows to move anywhere"
 msgstr ""
 "Usa la tecla TAB per moure't de valor en valor, o CTRL+fletxes per moure't "
 "on vulguis"
 
-#: libraries/insert_edit.lib.php:1577 libraries/replication_gui.lib.php:542
-#: libraries/rte/rte_routines.lib.php:1497
+#: libraries/insert_edit.lib.php:1575 libraries/replication_gui.lib.php:542
+#: libraries/rte/rte_routines.lib.php:1588
 #: libraries/server_status_variables.lib.php:220
-#: templates/designer/having_query_panel.phtml:100
-#: templates/designer/options_panel.phtml:73
-#: templates/designer/options_panel.phtml:239
-#: templates/designer/where_query_panel.phtml:69
-#: templates/table/table_header.phtml:10
-#: templates/table/zoom_result_form.phtml:35
+#: templates/database/designer/having_query_panel.phtml:100
+#: templates/database/designer/options_panel.phtml:73
+#: templates/database/designer/options_panel.phtml:239
+#: templates/database/designer/where_query_panel.phtml:69
+#: templates/table/search/table_header.phtml:10
+#: templates/table/search/zoom_result_form.phtml:35
 msgid "Value"
 msgstr "Valor"
 
-#: libraries/insert_edit.lib.php:1937 libraries/sql.lib.php:1309
+#: libraries/insert_edit.lib.php:1935 libraries/sql.lib.php:1303
 msgid "Showing SQL query"
 msgstr "Mostrant consulta SQL"
 
-#: libraries/insert_edit.lib.php:1962 libraries/sql.lib.php:1287
+#: libraries/insert_edit.lib.php:1960 libraries/sql.lib.php:1281
 #, php-format
 msgid "Inserted row id: %1$d"
 msgstr "Id de la fila inserida: %1$d"
@@ -9652,7 +9669,7 @@ msgstr "Nou"
 #: libraries/navigation/Nodes/Node_View_Container.class.php:26
 #: libraries/navigation/Nodes/Node_View_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:129
-#: templates/structure/show_create.phtml:30
+#: templates/database/structure/show_create.phtml:30
 msgid "Views"
 msgstr "Vistes"
 
@@ -9988,7 +10005,7 @@ msgstr "No tens prou permisos per visualitzar aquesta informació!"
 
 #: libraries/operations.lib.php:101 libraries/operations.lib.php:249
 #: libraries/operations.lib.php:869 libraries/operations.lib.php:963
-#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:907
+#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:998
 #: templates/columns_definitions/table_fields_definitions.phtml:47
 #, fuzzy
 #| msgid "Edit Privileges"
@@ -10082,22 +10099,22 @@ msgid "Switch to copied table"
 msgstr "Canvia a una taula copiada"
 
 #: libraries/operations.lib.php:1360
-#: templates/structure/check_all_tables.phtml:18
+#: templates/database/structure/check_all_tables.phtml:18
 msgid "Table maintenance"
 msgstr "Manteniment de la taula"
 
 #: libraries/operations.lib.php:1398
-#: templates/structure/check_all_tables.phtml:19
+#: templates/database/structure/check_all_tables.phtml:19
 msgid "Analyze table"
 msgstr "Analitza la taula"
 
 #: libraries/operations.lib.php:1413
-#: templates/structure/check_all_tables.phtml:20
+#: templates/database/structure/check_all_tables.phtml:20
 msgid "Check table"
 msgstr "Verifica la taula"
 
 #: libraries/operations.lib.php:1428
-#: templates/structure/check_all_tables.phtml:22
+#: templates/database/structure/check_all_tables.phtml:22
 #, fuzzy
 #| msgid "Check table"
 msgid "Checksum table"
@@ -10117,18 +10134,19 @@ msgid "Flush the table (FLUSH)"
 msgstr "Buida la memòria cau de la taula (FLUSH)"
 
 #: libraries/operations.lib.php:1477
-#: templates/structure/check_all_tables.phtml:23
-#: templates/structure/display_table_stats.phtml:56
+#: templates/database/structure/check_all_tables.phtml:23
+#: templates/table/structure/display_table_stats.phtml:56
 msgid "Optimize table"
 msgstr "Optimitza la taula"
 
 #: libraries/operations.lib.php:1492
-#: templates/structure/check_all_tables.phtml:24
+#: templates/database/structure/check_all_tables.phtml:24
 msgid "Repair table"
 msgstr "Repara la taula"
 
 #: libraries/operations.lib.php:1538
-#: templates/structure/check_all_tables.phtml:14 view_operations.php:127
+#: templates/database/structure/check_all_tables.phtml:14
+#: view_operations.php:127
 msgid "Delete data or table"
 msgstr "Esborra les dades o la taula"
 
@@ -10255,7 +10273,7 @@ msgid "Cannot connect: invalid settings."
 msgstr "No puc connectar: paràmetres incorrectes."
 
 #: libraries/plugins/auth/AuthenticationConfig.class.php:108
-#: libraries/plugins/auth/AuthenticationCookie.class.php:134
+#: libraries/plugins/auth/AuthenticationCookie.class.php:122
 #: libraries/plugins/auth/AuthenticationHttp.class.php:96
 #, php-format
 msgid "Welcome to %s"
@@ -10286,36 +10304,36 @@ msgstr ""
 msgid "Retry to connect"
 msgstr "Reintentar connexió"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:146
+#: libraries/plugins/auth/AuthenticationCookie.class.php:134
 msgid "Your session has expired. Please log in again."
 msgstr "La seva sessió ha caducat. Si us plau, accedeixi de nou."
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:170
+#: libraries/plugins/auth/AuthenticationCookie.class.php:158
 msgid "Log in"
 msgstr "Identificació"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:178
-#: libraries/plugins/auth/AuthenticationCookie.class.php:188
+#: libraries/plugins/auth/AuthenticationCookie.class.php:166
+#: libraries/plugins/auth/AuthenticationCookie.class.php:176
 msgid "You can enter hostname/IP address and port separated by space."
 msgstr "Pots entrar un nom d'amfitrió/adreça IP i port separat per espai."
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:193
+#: libraries/plugins/auth/AuthenticationCookie.class.php:181
 msgid "Username:"
 msgstr "Nom d'usuari:"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:205
+#: libraries/plugins/auth/AuthenticationCookie.class.php:193
 msgid "Server Choice:"
 msgstr "Elecció de Servidor:"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:386
+#: libraries/plugins/auth/AuthenticationCookie.class.php:374
 msgid "Entered captcha is wrong, try again!"
 msgstr "El captcha entrat és incorrecte, intenta de nou!"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:396
+#: libraries/plugins/auth/AuthenticationCookie.class.php:384
 msgid "Please enter correct captcha!"
 msgstr "Entra el captcha correcte!"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:423
+#: libraries/plugins/auth/AuthenticationCookie.class.php:411
 msgid "You are not allowed to log in to this MySQL server!"
 msgstr "No tens permés connectar amb aquest servidor MySQL!"
 
@@ -10411,7 +10429,7 @@ msgstr "Esdeveniment"
 #: libraries/plugins/export/ExportOdt.class.php:593
 #: libraries/plugins/export/ExportTexytext.class.php:428
 #: libraries/plugins/export/PMA_ExportPdf.class.php:313
-#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:984
 #: libraries/rte/rte_triggers.lib.php:377
 msgid "Definition"
 msgstr "Definició"
@@ -10733,7 +10751,7 @@ msgid "Last check:"
 msgstr "Darrera comprovació:"
 
 #: libraries/plugins/export/ExportSql.class.php:1399
-#: templates/structure/structure_table_row.phtml:183
+#: templates/database/structure/structure_table_row.phtml:183
 msgid "in use"
 msgstr "en ús"
 
@@ -10926,18 +10944,14 @@ msgstr "La extensió espacial MySQL no és compatible amb el tipus ESRI \"%s\"."
 msgid "The imported file does not contain any data!"
 msgstr "L'arxiu importat no té dades!"
 
-#: libraries/plugins/import/ImportSql.class.php:169
+#: libraries/plugins/import/ImportSql.class.php:72
 msgid "SQL compatibility mode:"
 msgstr "Modus de compatibilitat SQL:"
 
-#: libraries/plugins/import/ImportSql.class.php:181
+#: libraries/plugins/import/ImportSql.class.php:84
 msgid "Do not use <code>AUTO_INCREMENT</code> for zero values"
 msgstr "No feu servir <code>AUTO_INCREMENT</code> per a valors zero"
 
-#: libraries/plugins/import/ImportSql.class.php:195
-msgid "Read as multibytes"
-msgstr "Llegir com a multibytes"
-
 #: libraries/plugins/import/ImportXml.class.php:54
 msgid "XML"
 msgstr "XML"
@@ -10980,7 +10994,7 @@ msgid "Show grid"
 msgstr "Mostra graella"
 
 #: libraries/plugins/schema/SchemaPdf.class.php:94
-#: templates/structure/print_view_data_dictionary_link.phtml:6
+#: templates/database/structure/print_view_data_dictionary_link.phtml:6
 msgid "Data Dictionary"
 msgstr "Diccionari de Dades"
 
@@ -11005,7 +11019,7 @@ msgid "The %s table doesn't exist!"
 msgstr "La taula %s no existeix!"
 
 #: libraries/plugins/schema/eps/Eps_Relation_Schema.class.php:321
-#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:309
+#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:323
 #, php-format
 msgid "Schema of the %s database - Page %s"
 msgstr "Esquema de la base de dades %s - Pàgina %s"
@@ -11031,7 +11045,7 @@ msgstr "Taula de continguts"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1005
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1028
 #: libraries/tracking.lib.php:884
-#: templates/structure/table_structure_header.phtml:11
+#: templates/table/structure/table_structure_header.phtml:11
 msgid "Extra"
 msgstr "Extra"
 
@@ -11405,11 +11419,11 @@ msgstr "Passos ràpids per a activar les característiques avançades:"
 msgid "Create the needed tables with the <code>%screate_tables.sql</code>."
 msgstr "Crea les taules necessàries amb <code>%screate_tables.sql</code>."
 
-#: libraries/relation.lib.php:360
+#: libraries/relation.lib.php:357
 msgid "Create a pma user and give access to these tables."
 msgstr "Crea un usuari pma i dona-li accés a aquestes taules."
 
-#: libraries/relation.lib.php:365
+#: libraries/relation.lib.php:360
 msgid ""
 "Enable advanced features in configuration file (<code>config.inc.php</"
 "code>), for example by starting from <code>config.sample.inc.php</code>."
@@ -11418,16 +11432,16 @@ msgstr ""
 "(<code>config.inc.php</code>), partint, per exemple, de l'arxiu <code>config."
 "sample.inc.php</code>."
 
-#: libraries/relation.lib.php:373
+#: libraries/relation.lib.php:365
 msgid "Re-login to phpMyAdmin to load the updated configuration file."
 msgstr ""
 "Re-entra a phpMyAdmin per a carregar l'arxiu de configuració actualitzat."
 
-#: libraries/relation.lib.php:1612
+#: libraries/relation.lib.php:1607
 msgid "no description"
 msgstr "sense descripció"
 
-#: libraries/relation.lib.php:1811
+#: libraries/relation.lib.php:1806
 msgid ""
 "You do not have necessary privileges to create a database named "
 "'phpmyadmin'. You may go to 'Operations' tab of any database to set up the "
@@ -11437,7 +11451,7 @@ msgstr ""
 "d'anar a la pestanya 'Operacions' de qualsevol base de dades per establir la "
 "configuració d'enmagatzemament de phpMyAdmin allí."
 
-#: libraries/relation.lib.php:1928
+#: libraries/relation.lib.php:1923
 #, php-format
 msgid ""
 "%sCreate%s a database named 'phpmyadmin' and setup the phpMyAdmin "
@@ -11446,7 +11460,7 @@ msgstr ""
 "%sCrea%s una base de dades de nom 'phpmyadmin' i estableix la configuració "
 "d'enmagatzemament de phpMyAdmin aqui."
 
-#: libraries/relation.lib.php:1936
+#: libraries/relation.lib.php:1931
 #, php-format
 msgid ""
 "%sCreate%s the phpMyAdmin configuration storage in the current database."
@@ -11454,7 +11468,7 @@ msgstr ""
 "%sCrea%s la configuració d'enmagatzemamant de phpMyAdmin a la base de dades "
 "actual."
 
-#: libraries/relation.lib.php:1944
+#: libraries/relation.lib.php:1939
 #, php-format
 msgid "%sCreate%s missing phpMyAdmin configuration storage tables."
 msgstr ""
@@ -11462,7 +11476,7 @@ msgstr ""
 "falten."
 
 #: libraries/replication_gui.lib.php:46 libraries/replication_gui.lib.php:343
-#: libraries/server_databases.lib.php:387
+#: libraries/server_databases.lib.php:398
 msgid "Master replication"
 msgstr "Replicació del mestre"
 
@@ -11535,7 +11549,7 @@ msgstr ""
 "configurat com a mestre."
 
 #: libraries/replication_gui.lib.php:141
-#: libraries/server_databases.lib.php:389
+#: libraries/server_databases.lib.php:400
 msgid "Slave replication"
 msgstr "Replicació de l'esclau"
 
@@ -11810,10 +11824,10 @@ msgid "Master server changed successfully to %s."
 msgstr "S'ha canviat correctament el servidor mestre a %s."
 
 #: libraries/rte/rte_events.lib.php:106 libraries/rte/rte_events.lib.php:115
-#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:149
-#: libraries/rte/rte_routines.lib.php:158
-#: libraries/rte/rte_routines.lib.php:231
-#: libraries/rte/rte_routines.lib.php:1362
+#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:219
+#: libraries/rte/rte_routines.lib.php:246
+#: libraries/rte/rte_routines.lib.php:368
+#: libraries/rte/rte_routines.lib.php:1453
 #: libraries/rte/rte_triggers.lib.php:82 libraries/rte/rte_triggers.lib.php:91
 #: libraries/rte/rte_triggers.lib.php:123
 #, php-format
@@ -11834,7 +11848,7 @@ msgstr "S'ha modificat l'esdeveniment %1$s."
 msgid "Event %1$s has been created."
 msgstr "S'ha creat l'esdeveniment %1$s."
 
-#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:251
+#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:266
 #: libraries/rte/rte_triggers.lib.php:144
 msgid "One or more errors have occurred while processing your request:"
 msgstr "S'han produït un o més errors al processar la teva sol.licitud:"
@@ -11843,7 +11857,7 @@ msgstr "S'han produït un o més errors al processar la teva sol.licitud:"
 msgid "Edit event"
 msgstr "Editar esdeveniment"
 
-#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:794
+#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:885
 #: libraries/rte/rte_triggers.lib.php:323 view_create.php:180
 msgid "Details"
 msgstr "Detalls"
@@ -11856,7 +11870,7 @@ msgstr "Nom d'esdeveniment"
 msgid "Event type"
 msgstr "Tipus d'event"
 
-#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:817
+#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:908
 #, php-format
 msgid "Change to %s"
 msgstr "Canviar a %s"
@@ -11883,12 +11897,14 @@ msgstr "Final"
 msgid "On completion preserve"
 msgstr "Preservar al completar"
 
-#: libraries/rte/rte_events.lib.php:491 libraries/rte/rte_routines.lib.php:930
+#: libraries/rte/rte_events.lib.php:491
+#: libraries/rte/rte_routines.lib.php:1021
 #: libraries/rte/rte_triggers.lib.php:383 view_create.php:209
 msgid "Definer"
 msgstr "Definidor"
 
-#: libraries/rte/rte_events.lib.php:535 libraries/rte/rte_routines.lib.php:997
+#: libraries/rte/rte_events.lib.php:535
+#: libraries/rte/rte_routines.lib.php:1088
 #: libraries/rte/rte_triggers.lib.php:422
 msgid "The definer must be in the \"username@hostname\" format!"
 msgstr "El definidor ha d'estar en el format \"usuari@servidor\"!"
@@ -11914,9 +11930,9 @@ msgid "You must provide an event definition."
 msgstr "Has de proporcionar una definició d'esdeveniment."
 
 #: libraries/rte/rte_export.lib.php:43 libraries/rte/rte_general.lib.php:72
-#: libraries/rte/rte_routines.lib.php:345
-#: libraries/rte/rte_routines.lib.php:1198
-#: libraries/rte/rte_routines.lib.php:1411
+#: libraries/rte/rte_routines.lib.php:153
+#: libraries/rte/rte_routines.lib.php:1289
+#: libraries/rte/rte_routines.lib.php:1502
 msgid "Error in processing request:"
 msgstr "Error processant a la petició:"
 
@@ -11952,97 +11968,97 @@ msgstr ""
 "emmagatzemats pot fallar![/strong] Utilitza l'extensió millorada 'mysqli' "
 "per evitar qualsevol problema."
 
-#: libraries/rte/rte_routines.lib.php:110
-#: libraries/rte/rte_routines.lib.php:1006
+#: libraries/rte/rte_routines.lib.php:123
+msgid "Edit routine"
+msgstr "Editar rutina"
+
+#: libraries/rte/rte_routines.lib.php:200
+#: libraries/rte/rte_routines.lib.php:1097
 #, php-format
 msgid "Invalid routine type: \"%s\""
 msgstr "tipus de rutina invàlid: \"%s\""
 
-#: libraries/rte/rte_routines.lib.php:170
+#: libraries/rte/rte_routines.lib.php:253
+#, php-format
+msgid "Routine %1$s has been created."
+msgstr "S'ha creat la rutina %1$s."
+
+#: libraries/rte/rte_routines.lib.php:380
 msgid "Sorry, we failed to restore the dropped routine."
 msgstr "Malauradament, no hem pogut recuperar la rutina eliminada."
 
-#: libraries/rte/rte_routines.lib.php:211
+#: libraries/rte/rte_routines.lib.php:439
 #, fuzzy, php-format
 #| msgid "Routine %1$s has been modified."
 msgid "Routine %1$s has been modified. Privileges have been adjusted."
 msgstr "S'ha modificat la rutina %1$s."
 
-#: libraries/rte/rte_routines.lib.php:216
+#: libraries/rte/rte_routines.lib.php:444
 #, php-format
 msgid "Routine %1$s has been modified."
 msgstr "S'ha modificat la rutina %1$s."
 
-#: libraries/rte/rte_routines.lib.php:238
-#, php-format
-msgid "Routine %1$s has been created."
-msgstr "S'ha creat la rutina %1$s."
-
-#: libraries/rte/rte_routines.lib.php:315
-msgid "Edit routine"
-msgstr "Editar rutina"
-
-#: libraries/rte/rte_routines.lib.php:797
+#: libraries/rte/rte_routines.lib.php:888
 msgid "Routine name"
 msgstr "Nom de rutina"
 
-#: libraries/rte/rte_routines.lib.php:823
+#: libraries/rte/rte_routines.lib.php:914
 msgid "Parameters"
 msgstr "Paràmetres"
 
-#: libraries/rte/rte_routines.lib.php:829
+#: libraries/rte/rte_routines.lib.php:920
 msgid "Direction"
 msgstr "Direcció"
 
-#: libraries/rte/rte_routines.lib.php:847
+#: libraries/rte/rte_routines.lib.php:938
 msgid "Add parameter"
 msgstr "Afegir paràmetre"
 
-#: libraries/rte/rte_routines.lib.php:851
+#: libraries/rte/rte_routines.lib.php:942
 msgid "Remove last parameter"
 msgstr "Elimina el darrer paràmetre"
 
-#: libraries/rte/rte_routines.lib.php:856
+#: libraries/rte/rte_routines.lib.php:947
 msgid "Return type"
 msgstr "Tipus de retorn"
 
-#: libraries/rte/rte_routines.lib.php:862
+#: libraries/rte/rte_routines.lib.php:953
 msgid "Return length/values"
 msgstr "Retornar Longitud/Valors"
 
-#: libraries/rte/rte_routines.lib.php:868
+#: libraries/rte/rte_routines.lib.php:959
 msgid "Return options"
 msgstr "Retornar opcions"
 
-#: libraries/rte/rte_routines.lib.php:899
+#: libraries/rte/rte_routines.lib.php:990
 msgid "Is deterministic"
 msgstr "És deterministic"
 
-#: libraries/rte/rte_routines.lib.php:920
+#: libraries/rte/rte_routines.lib.php:1011
 msgid ""
 "You do not have sufficient privileges to perform this operation; Please "
 "refer to the documentation for more details"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:935
+#: libraries/rte/rte_routines.lib.php:1026
 msgid "Security type"
 msgstr "Tipus de seguretat"
 
-#: libraries/rte/rte_routines.lib.php:944
+#: libraries/rte/rte_routines.lib.php:1035
 msgid "SQL data access"
 msgstr "Accés de dades SQL"
 
-#: libraries/rte/rte_routines.lib.php:1013
+#: libraries/rte/rte_routines.lib.php:1104
 msgid "You must provide a routine name!"
 msgstr "Has de proporcionar un nom de rutina!"
 
-#: libraries/rte/rte_routines.lib.php:1047
+#: libraries/rte/rte_routines.lib.php:1138
 #, php-format
 msgid "Invalid direction \"%s\" given for parameter."
 msgstr "Direcció \"%s\" no vàlida donada per al paràmetre."
 
-#: libraries/rte/rte_routines.lib.php:1069
-#: libraries/rte/rte_routines.lib.php:1131
+#: libraries/rte/rte_routines.lib.php:1160
+#: libraries/rte/rte_routines.lib.php:1222
 msgid ""
 "You must provide length/values for routine parameters of type ENUM, SET, "
 "VARCHAR and VARBINARY."
@@ -12050,38 +12066,38 @@ msgstr ""
 "Has de proporcionar la longitud/valors dels paràmetres de tipus ENUM, SET, "
 "VARCHAR i VARBINARY."
 
-#: libraries/rte/rte_routines.lib.php:1095
+#: libraries/rte/rte_routines.lib.php:1186
 msgid "You must provide a name and a type for each routine parameter."
 msgstr ""
 "Has de proporcionar un nom i un tipus per a cada paràmetre de la rutina."
 
-#: libraries/rte/rte_routines.lib.php:1114
+#: libraries/rte/rte_routines.lib.php:1205
 msgid "You must provide a valid return type for the routine."
 msgstr "Has de proporcionar un tipus de resposta vàlida per a la rutina."
 
-#: libraries/rte/rte_routines.lib.php:1174
+#: libraries/rte/rte_routines.lib.php:1265
 msgid "You must provide a routine definition."
 msgstr "Has de proporcionar una definició de la rutina."
 
-#: libraries/rte/rte_routines.lib.php:1285
+#: libraries/rte/rte_routines.lib.php:1376
 #, php-format
 msgid "Execution results of routine %s"
 msgstr "Resultats de l'execució de la rutina %s"
 
-#: libraries/rte/rte_routines.lib.php:1340
+#: libraries/rte/rte_routines.lib.php:1431
 #, php-format
 msgid "%d row affected by the last statement inside the procedure."
 msgid_plural "%d rows affected by the last statement inside the procedure."
 msgstr[0] "%d fila afectada per l'última sentència dins el procediment."
 msgstr[1] "%d files afectades per l'última sentència dins el procediment."
 
-#: libraries/rte/rte_routines.lib.php:1398
-#: libraries/rte/rte_routines.lib.php:1406
+#: libraries/rte/rte_routines.lib.php:1489
+#: libraries/rte/rte_routines.lib.php:1497
 msgid "Execute routine"
 msgstr "Executar rutina"
 
-#: libraries/rte/rte_routines.lib.php:1485
-#: libraries/rte/rte_routines.lib.php:1488
+#: libraries/rte/rte_routines.lib.php:1576
+#: libraries/rte/rte_routines.lib.php:1579
 msgid "Routine parameters"
 msgstr "Paràmetres de rutina"
 
@@ -12235,7 +12251,7 @@ msgid "Original position"
 msgstr "Posició original"
 
 #: libraries/server_bin_log.lib.php:133
-#: templates/structure/display_table_stats.phtml:4
+#: templates/table/structure/display_table_stats.phtml:4
 msgid "Information"
 msgstr "Informació"
 
@@ -12273,12 +12289,12 @@ msgstr ""
 "Nota: Activant les estadístiques de Base de Dades aqui pot provocar elevat "
 "tràfic entre el servidor Web i el de MySQL."
 
-#: libraries/server_databases.lib.php:364
-#: libraries/server_databases.lib.php:365
+#: libraries/server_databases.lib.php:366
+#: libraries/server_databases.lib.php:371
 msgid "Enable Statistics"
 msgstr "Activa Estadístiques"
 
-#: libraries/server_databases.lib.php:481
+#: libraries/server_databases.lib.php:492
 #, php-format
 msgid "%1$d database has been dropped successfully."
 msgid_plural "%1$d databases have been dropped successfully."
@@ -12656,7 +12672,7 @@ msgid "You have revoked the privileges for %s."
 msgstr "Has tret els permisos per %s."
 
 #: libraries/server_privileges.lib.php:2059
-#: libraries/server_privileges.lib.php:4290
+#: libraries/server_privileges.lib.php:4316
 #, fuzzy
 #| msgid "Add user group"
 msgid "Add user account"
@@ -12832,40 +12848,40 @@ msgstr "Esborrant %s"
 msgid "The privileges were reloaded successfully."
 msgstr "Els permisos s'han recarregat correctament."
 
-#: libraries/server_privileges.lib.php:3994
+#: libraries/server_privileges.lib.php:4003
 #, php-format
 msgid "The user %s already exists!"
 msgstr "L'usuari %s ja existeix!"
 
-#: libraries/server_privileges.lib.php:4232
+#: libraries/server_privileges.lib.php:4258
 #, php-format
 msgid "Privileges for %s"
 msgstr "Permisos per a %s"
 
-#: libraries/server_privileges.lib.php:4241
+#: libraries/server_privileges.lib.php:4267
 #: libraries/server_status_processes.lib.php:72
 #: libraries/server_user_groups.lib.php:39
 msgid "User"
 msgstr "Usuari"
 
-#: libraries/server_privileges.lib.php:4282
+#: libraries/server_privileges.lib.php:4308
 msgctxt "Create new user"
 msgid "New"
 msgstr "Nou"
 
-#: libraries/server_privileges.lib.php:4311
+#: libraries/server_privileges.lib.php:4337
 #, fuzzy
 #| msgid "Edit Privileges:"
 msgid "Edit privileges:"
 msgstr "Edita permisos:"
 
-#: libraries/server_privileges.lib.php:4312
+#: libraries/server_privileges.lib.php:4338
 #, fuzzy
 #| msgid "User group"
 msgid "User account"
 msgstr "Grup d'usuari"
 
-#: libraries/server_privileges.lib.php:4371
+#: libraries/server_privileges.lib.php:4397
 msgid ""
 "Note: You are attempting to edit privileges of the user with which you are "
 "currently logged in."
@@ -12873,20 +12889,20 @@ msgstr ""
 "Nota: estàs intentant editar els permisos de l'usuari amb el que has iniciat "
 "la sessió actual."
 
-#: libraries/server_privileges.lib.php:4391 libraries/server_users.lib.php:25
+#: libraries/server_privileges.lib.php:4417 libraries/server_users.lib.php:25
 #, fuzzy
 #| msgid "Users overview"
 msgid "User accounts overview"
 msgstr "Vista global d'usuaris"
 
-#: libraries/server_privileges.lib.php:4459
+#: libraries/server_privileges.lib.php:4485
 msgid ""
 "A user account allowing any user from localhost to connect is present. This "
 "will prevent other users from connecting if the host part of their account "
 "allows a connection from any (%) host."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4500
+#: libraries/server_privileges.lib.php:4526
 #, php-format
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
@@ -12899,7 +12915,7 @@ msgstr ""
 "permisos que utilitza el servidor si s'han fet canvis manualment. En aquest "
 "cas, es necessari %srecarregar els permisos%s abans de continuar."
 
-#: libraries/server_privileges.lib.php:4519
+#: libraries/server_privileges.lib.php:4545
 #, fuzzy
 #| msgid ""
 #| "Note: phpMyAdmin gets the users' privileges directly from MySQL's "
@@ -12918,26 +12934,26 @@ msgstr ""
 "permisos que utilitza el servidor si s'han fet canvis manualment. En aquest "
 "cas, es necessari %srecarregar els permisos%s abans de continuar."
 
-#: libraries/server_privileges.lib.php:4569
+#: libraries/server_privileges.lib.php:4595
 msgid "The selected user was not found in the privilege table."
 msgstr "No s'ha trobat l'usuari triat a la taula de permisos."
 
-#: libraries/server_privileges.lib.php:4801
+#: libraries/server_privileges.lib.php:4827
 msgid "You have added a new user."
 msgstr "Has afegit un usuari nou."
 
-#: libraries/server_status.lib.php:53
+#: libraries/server_status.lib.php:60
 #, php-format
 msgid "Network traffic since startup: %s"
 msgstr "tràfic de xarxa des de l'inici: %s"
 
-#: libraries/server_status.lib.php:66
+#: libraries/server_status.lib.php:73
 #, php-format
 msgid "This MySQL server has been running for %1$s. It started up on %2$s."
 msgstr ""
 "Aquest servidor MySQL ha estat actiu durant %1$s. Es va iniciar el %2$s."
 
-#: libraries/server_status.lib.php:80
+#: libraries/server_status.lib.php:94
 msgid ""
 "This MySQL server works as <b>master</b> and <b>slave</b> in <b>replication</"
 "b> process."
@@ -12945,23 +12961,23 @@ msgstr ""
 "Aquest servidor MySQL treballa com a <b>mestre</b> i <b>esclau</b> en un "
 "procés de <b>replicació</b> ."
 
-#: libraries/server_status.lib.php:85
+#: libraries/server_status.lib.php:99
 msgid "This MySQL server works as <b>master</b> in <b>replication</b> process."
 msgstr ""
 "Aquest servidor MySQL treballa com a <b>mestre</b> en un procés de "
 "<b>replicació</b> ."
 
-#: libraries/server_status.lib.php:90
+#: libraries/server_status.lib.php:104
 msgid "This MySQL server works as <b>slave</b> in <b>replication</b> process."
 msgstr ""
 "Aquest servidor MySQL treballa com a <b>esclau</b> en un procés de "
 "<b>replicació</b> ."
 
-#: libraries/server_status.lib.php:106
+#: libraries/server_status.lib.php:116
 msgid "Replication status"
 msgstr "Estat de la replicació"
 
-#: libraries/server_status.lib.php:137
+#: libraries/server_status.lib.php:146
 msgid ""
 "On a busy server, the byte counters may overrun, so those statistics as "
 "reported by the MySQL server may be incorrect."
@@ -12969,21 +12985,21 @@ msgstr ""
 "En un servidor ocupat, els comptadors de bytes poden excedir el seu tamany, "
 "llavors les estadístiques donades pel servidor MySQL poden ser incorrectes."
 
-#: libraries/server_status.lib.php:148
+#: libraries/server_status.lib.php:157
 msgid "Received"
 msgstr "Rebut"
 
-#: libraries/server_status.lib.php:167
+#: libraries/server_status.lib.php:176
 msgid "Sent"
 msgstr "Enviat"
 
-#: libraries/server_status.lib.php:234
+#: libraries/server_status.lib.php:243
 #, fuzzy
 #| msgid "max. concurrent connections"
 msgid "Max. concurrent connections"
 msgstr "max. connexions a la vegada"
 
-#: libraries/server_status.lib.php:244
+#: libraries/server_status.lib.php:253
 msgid "Failed attempts"
 msgstr "Intents erronis"
 
@@ -14069,7 +14085,7 @@ msgstr ""
 msgid "Not implemented yet."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/AlterOperation.php:193
+#: libraries/sql-parser/src/Components/AlterOperation.php:191
 #, fuzzy
 #| msgid "Iconic table operations"
 msgid "Unrecognized alter operation."
@@ -14085,7 +14101,7 @@ msgid "An opening bracket followed by a set of values was expected."
 msgstr ""
 
 #: libraries/sql-parser/src/Components/ArrayObj.php:101
-#: libraries/sql-parser/src/Components/FieldDefinition.php:202
+#: libraries/sql-parser/src/Components/CreateDefinition.php:202
 msgid "An opening bracket was expected."
 msgstr ""
 
@@ -14093,25 +14109,35 @@ msgstr ""
 msgid "A comma or a closing bracket was expected"
 msgstr ""
 
+#: libraries/sql-parser/src/Components/CreateDefinition.php:246
+#, fuzzy
+#| msgid "No tables selected."
+msgid "A comma or a closing bracket was expected."
+msgstr "No s'han triat taules."
+
+#: libraries/sql-parser/src/Components/CreateDefinition.php:262
+msgid "A closing bracket was expected."
+msgstr ""
+
 #: libraries/sql-parser/src/Components/DataType.php:125
 msgid "Unrecognized data type."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:225
+#: libraries/sql-parser/src/Components/Expression.php:227
 msgid "Unexpected closing bracket."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:246
-#: libraries/sql-parser/src/Components/Expression.php:283
-#: libraries/sql-parser/src/Components/Expression.php:303
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:285
+#: libraries/sql-parser/src/Components/Expression.php:305
 msgid "An alias was previously found."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:257
+#: libraries/sql-parser/src/Components/Expression.php:259
 msgid "Unexpected dot."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:327
+#: libraries/sql-parser/src/Components/Expression.php:329
 #, fuzzy
 #| msgid "No tables selected."
 msgid "An alias was expected."
@@ -14123,16 +14149,6 @@ msgstr "No s'han triat taules."
 msgid "An expression was expected."
 msgstr "No s'han triat versions."
 
-#: libraries/sql-parser/src/Components/FieldDefinition.php:246
-#, fuzzy
-#| msgid "No tables selected."
-msgid "A comma or a closing bracket was expected."
-msgstr "No s'han triat taules."
-
-#: libraries/sql-parser/src/Components/FieldDefinition.php:262
-msgid "A closing bracket was expected."
-msgstr ""
-
 #: libraries/sql-parser/src/Components/Limit.php:90
 #: libraries/sql-parser/src/Components/Limit.php:112
 msgid "An offset was expected."
@@ -14180,29 +14196,29 @@ msgstr ""
 msgid "Expected delimiter."
 msgstr ""
 
-#: libraries/sql-parser/src/Lexer.php:753
+#: libraries/sql-parser/src/Lexer.php:777
 #, fuzzy, php-format
 #| msgid "Event %1$s has been created."
 msgid "Ending quote %1$s was expected."
 msgstr "S'ha creat l'esdeveniment %1$s."
 
-#: libraries/sql-parser/src/Lexer.php:789
+#: libraries/sql-parser/src/Lexer.php:813
 #, fuzzy
 #| msgid "Table name template"
 msgid "Variable name was expected."
 msgstr "Plantilla de nom de taula"
 
-#: libraries/sql-parser/src/Parser.php:380
+#: libraries/sql-parser/src/Parser.php:391
 #, fuzzy
 #| msgid "at beginning of table"
 msgid "Unexpected beginning of statement."
 msgstr "a l'inici de la taula"
 
-#: libraries/sql-parser/src/Parser.php:399
+#: libraries/sql-parser/src/Parser.php:410
 msgid "Unrecognized statement type."
 msgstr ""
 
-#: libraries/sql-parser/src/Parser.php:479
+#: libraries/sql-parser/src/Parser.php:489
 msgid "No transaction was previously started."
 msgstr ""
 
@@ -14232,8 +14248,10 @@ msgid "The name of the entity was expected."
 msgstr "El nombre de taules que estàn obertes."
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:310
-msgid "At least one field definition was expected."
-msgstr ""
+#, fuzzy
+#| msgid "Template was deleted."
+msgid "At least one column definition was expected."
+msgstr "S'ha esborrat la plantilla."
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:329
 msgid "A \"RETURNS\" keyword was expected."
@@ -14292,11 +14310,11 @@ msgstr "No s'ha creat el marcador!"
 msgid "Using bookmark \"%s\" as default browse query."
 msgstr "Usar el preferit \"%s\" com a pàgina de cerca per defecte."
 
-#: libraries/sql.lib.php:1306
+#: libraries/sql.lib.php:1300
 msgid "Showing as PHP code"
 msgstr "Mostrant com a codi PHP"
 
-#: libraries/sql.lib.php:1638
+#: libraries/sql.lib.php:1632
 #, fuzzy, php-format
 #| msgid ""
 #| "Current selection does not contain a unique column. Grid edit, checkbox, "
@@ -14309,7 +14327,7 @@ msgstr ""
 "de graella, checkbox, Editar, Copiar i Esborrar enllaços no estàn "
 "disponibles."
 
-#: libraries/sql.lib.php:1649
+#: libraries/sql.lib.php:1643
 #, fuzzy, php-format
 #| msgid ""
 #| "Current selection does not contain a unique column. Grid edit, checkbox, "
@@ -14322,7 +14340,7 @@ msgstr ""
 "de graella, checkbox, Editar, Copiar i Esborrar enllaços no estàn "
 "disponibles."
 
-#: libraries/sql.lib.php:1688
+#: libraries/sql.lib.php:1682
 #, php-format
 msgid "Problems with indexes of table `%s`"
 msgstr "Problemes amb els indexs de la taula `%s`"
@@ -14481,7 +14499,7 @@ msgid "Version %s snapshot (SQL code)"
 msgstr "Instantània de la versió %s (codi SQL)"
 
 #: libraries/tracking.lib.php:947
-#: templates/structure/table_structure_row.phtml:33
+#: templates/table/structure/table_structure_row.phtml:33
 msgctxt "None for default"
 msgid "None"
 msgstr "Cap"
@@ -14535,15 +14553,15 @@ msgstr "Versió %1$s de %2$s esborrada."
 msgid "Version %1$s was created, tracking for %2$s is active."
 msgstr "S'ha creat la versió %1$s, activat el seguiment per %2$s."
 
-#: libraries/user_preferences.inc.php:29
+#: libraries/user_preferences.inc.php:30
 msgid "Manage your settings"
 msgstr "Gestiona els teus paràmetres"
 
-#: libraries/user_preferences.inc.php:46 prefs_manage.php:307
+#: libraries/user_preferences.inc.php:54 prefs_manage.php:307
 msgid "Configuration has been saved."
 msgstr "S'a desat la configuració."
 
-#: libraries/user_preferences.inc.php:66
+#: libraries/user_preferences.inc.php:74
 #, php-format
 msgid ""
 "Your preferences will be saved for current session only. Storing them "
@@ -14943,7 +14961,7 @@ msgid "first"
 msgstr "primer"
 
 #: templates/columns_definitions/move_column.phtml:12
-#: templates/structure/add_column.phtml:21
+#: templates/table/structure/add_column.phtml:21
 #, php-format
 msgid "after %s"
 msgstr "Després de %s"
@@ -15012,197 +15030,294 @@ msgstr "Transformació d'entrada"
 msgid "Input transformation options"
 msgstr "Opcions de transformació d'entrada"
 
-#: templates/designer/aggregate_query_panel.phtml:22
-#: templates/designer/options_panel.phtml:100
-msgid "Aggregate"
-msgstr "Agrega"
-
-#: templates/designer/aggregate_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:61
-#: templates/designer/options_panel.phtml:106
-#: templates/designer/options_panel.phtml:170
-#: templates/designer/where_query_panel.phtml:30
-#: templates/table/table_header.phtml:9
-msgid "Operator"
-msgstr "Operador"
-
-#: templates/designer/database_tables.phtml:29
-msgid "Toggle"
-msgstr "Canvia"
-
-#: templates/designer/database_tables.phtml:40
-msgid "See table structure"
-msgstr "Veure l'estructura de taula"
-
-#: templates/designer/delete_relation_panel.phtml:21
-msgid "Delete relation"
-msgstr "Esborra la relació"
-
-#: templates/designer/edit_delete_pages.phtml:7
-msgid "Page to open"
-msgstr "Pàgina a obrir"
-
-#: templates/designer/edit_delete_pages.phtml:7
-msgid "Page to delete"
-msgstr "Pàgina a esborrar"
-
-#: templates/designer/having_query_panel.phtml:90
-#: templates/designer/options_panel.phtml:63
-#: templates/designer/options_panel.phtml:229
-#: templates/designer/where_query_panel.phtml:59
-msgid "Except"
-msgstr "Excepte"
-
-#: templates/designer/having_query_panel.phtml:102
-#: templates/designer/options_panel.phtml:75
-#: templates/designer/options_panel.phtml:241
-#: templates/designer/where_query_panel.phtml:71
-msgid "subquery"
-msgstr "subconsulta"
-
-#: templates/designer/new_relation_panel.phtml:22
-#: templates/designer/side_menu.phtml:84 templates/designer/side_menu.phtml:87
-msgid "Create relation"
-msgstr "Crea una relació"
-
-#: templates/designer/options_panel.phtml:34
-#: templates/designer/options_panel.phtml:200
-msgid "Relation operator"
-msgstr "Operador de relació"
-
-#: templates/designer/options_panel.phtml:85
-#: templates/designer/rename_to_panel.phtml:23
-msgid "Rename to"
-msgstr "Reanomena a"
-
-#: templates/designer/options_panel.phtml:91
-#: templates/designer/rename_to_panel.phtml:31
-msgid "New name"
-msgstr "Nou nom"
-
-#: templates/designer/page_save_as.phtml:4
-msgid "Save to selected page"
-msgstr "Desar a la pàgina seleccionada"
-
-#: templates/designer/page_save_as.phtml:5
-msgid "Create a page and save to it"
-msgstr "Crea una pàgina i desar-la"
-
-#: templates/designer/page_save_as.phtml:26
-msgid "New page name"
-msgstr "Nou nom de pàgina"
-
-#: templates/designer/page_selector.phtml:2
-msgid "Select page"
-msgstr "Selecciona la pàgina"
-
-#: templates/designer/query_details.phtml:10
-msgid "Active options"
-msgstr "Opcions actives"
-
-#: templates/designer/schema_export.phtml:4
-msgid "Select Export Relational Type"
-msgstr "Selecciona el tipus d'Exportació Relacional"
-
-#: templates/designer/side_menu.phtml:19 templates/designer/side_menu.phtml:25
-msgid "Show/Hide tables list"
-msgstr "Mostra/Amaga la llista de taules"
-
-#: templates/designer/side_menu.phtml:29 templates/designer/side_menu.phtml:35
-#: templates/designer/side_menu.phtml:36
-msgid "View in fullscreen"
-msgstr "Veure a pantalla completa"
-
-#: templates/designer/side_menu.phtml:34
-msgid "Exit fullscreen"
-msgstr "Sortir de pantalla completa"
-
-#: templates/designer/side_menu.phtml:41 templates/designer/side_menu.phtml:45
-msgid "New page"
-msgstr "Nova pàgina"
-
-#: templates/designer/side_menu.phtml:70 templates/designer/side_menu.phtml:73
-msgid "Delete pages"
-msgstr "Esborra pàgines"
-
-#: templates/designer/side_menu.phtml:77 templates/designer/side_menu.phtml:80
-#: templates/table/create_table.phtml:7
+#: templates/database/create_table.phtml:7
+#: templates/database/designer/side_menu.phtml:77
+#: templates/database/designer/side_menu.phtml:80
 msgid "Create table"
 msgstr "Crea una taula"
 
-#: templates/designer/side_menu.phtml:98
-#: templates/designer/side_menu.phtml:101
+#: templates/database/create_table.phtml:15
+msgid "Number of columns"
+msgstr "Nombre de columnes"
+
+#: templates/database/designer/aggregate_query_panel.phtml:22
+#: templates/database/designer/options_panel.phtml:100
+msgid "Aggregate"
+msgstr "Agrega"
+
+#: templates/database/designer/aggregate_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:61
+#: templates/database/designer/options_panel.phtml:106
+#: templates/database/designer/options_panel.phtml:170
+#: templates/database/designer/where_query_panel.phtml:30
+#: templates/table/search/table_header.phtml:9
+msgid "Operator"
+msgstr "Operador"
+
+#: templates/database/designer/database_tables.phtml:29
+msgid "Toggle"
+msgstr "Canvia"
+
+#: templates/database/designer/database_tables.phtml:40
+msgid "See table structure"
+msgstr "Veure l'estructura de taula"
+
+#: templates/database/designer/delete_relation_panel.phtml:21
+msgid "Delete relation"
+msgstr "Esborra la relació"
+
+#: templates/database/designer/edit_delete_pages.phtml:7
+msgid "Page to open"
+msgstr "Pàgina a obrir"
+
+#: templates/database/designer/edit_delete_pages.phtml:7
+msgid "Page to delete"
+msgstr "Pàgina a esborrar"
+
+#: templates/database/designer/having_query_panel.phtml:90
+#: templates/database/designer/options_panel.phtml:63
+#: templates/database/designer/options_panel.phtml:229
+#: templates/database/designer/where_query_panel.phtml:59
+msgid "Except"
+msgstr "Excepte"
+
+#: templates/database/designer/having_query_panel.phtml:102
+#: templates/database/designer/options_panel.phtml:75
+#: templates/database/designer/options_panel.phtml:241
+#: templates/database/designer/where_query_panel.phtml:71
+msgid "subquery"
+msgstr "subconsulta"
+
+#: templates/database/designer/new_relation_panel.phtml:22
+#: templates/database/designer/side_menu.phtml:84
+#: templates/database/designer/side_menu.phtml:87
+msgid "Create relation"
+msgstr "Crea una relació"
+
+#: templates/database/designer/options_panel.phtml:34
+#: templates/database/designer/options_panel.phtml:200
+msgid "Relation operator"
+msgstr "Operador de relació"
+
+#: templates/database/designer/options_panel.phtml:85
+#: templates/database/designer/rename_to_panel.phtml:23
+msgid "Rename to"
+msgstr "Reanomena a"
+
+#: templates/database/designer/options_panel.phtml:91
+#: templates/database/designer/rename_to_panel.phtml:31
+msgid "New name"
+msgstr "Nou nom"
+
+#: templates/database/designer/page_save_as.phtml:4
+msgid "Save to selected page"
+msgstr "Desar a la pàgina seleccionada"
+
+#: templates/database/designer/page_save_as.phtml:5
+msgid "Create a page and save to it"
+msgstr "Crea una pàgina i desar-la"
+
+#: templates/database/designer/page_save_as.phtml:26
+msgid "New page name"
+msgstr "Nou nom de pàgina"
+
+#: templates/database/designer/page_selector.phtml:2
+msgid "Select page"
+msgstr "Selecciona la pàgina"
+
+#: templates/database/designer/query_details.phtml:10
+msgid "Active options"
+msgstr "Opcions actives"
+
+#: templates/database/designer/schema_export.phtml:4
+msgid "Select Export Relational Type"
+msgstr "Selecciona el tipus d'Exportació Relacional"
+
+#: templates/database/designer/side_menu.phtml:19
+#: templates/database/designer/side_menu.phtml:25
+msgid "Show/Hide tables list"
+msgstr "Mostra/Amaga la llista de taules"
+
+#: templates/database/designer/side_menu.phtml:29
+#: templates/database/designer/side_menu.phtml:35
+#: templates/database/designer/side_menu.phtml:36
+msgid "View in fullscreen"
+msgstr "Veure a pantalla completa"
+
+#: templates/database/designer/side_menu.phtml:34
+msgid "Exit fullscreen"
+msgstr "Sortir de pantalla completa"
+
+#: templates/database/designer/side_menu.phtml:41
+#: templates/database/designer/side_menu.phtml:45
+msgid "New page"
+msgstr "Nova pàgina"
+
+#: templates/database/designer/side_menu.phtml:70
+#: templates/database/designer/side_menu.phtml:73
+msgid "Delete pages"
+msgstr "Esborra pàgines"
+
+#: templates/database/designer/side_menu.phtml:98
+#: templates/database/designer/side_menu.phtml:101
 msgid "Reload"
 msgstr "Recarrega"
 
-#: templates/designer/side_menu.phtml:107
-#: templates/designer/side_menu.phtml:110
+#: templates/database/designer/side_menu.phtml:107
+#: templates/database/designer/side_menu.phtml:110
 msgid "Help"
 msgstr "Ajuda"
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Angular links"
 msgstr "Enllaços angulars"
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Direct links"
 msgstr "Enllaços directes"
 
-#: templates/designer/side_menu.phtml:122
-#: templates/designer/side_menu.phtml:124
+#: templates/database/designer/side_menu.phtml:122
+#: templates/database/designer/side_menu.phtml:124
 msgid "Snap to grid"
 msgstr "Alinia a la graella"
 
-#: templates/designer/side_menu.phtml:128
-#: templates/designer/side_menu.phtml:134
+#: templates/database/designer/side_menu.phtml:128
+#: templates/database/designer/side_menu.phtml:134
 msgid "Small/Big All"
 msgstr "Tot Petit/Gran"
 
-#: templates/designer/side_menu.phtml:138
-#: templates/designer/side_menu.phtml:141
+#: templates/database/designer/side_menu.phtml:138
+#: templates/database/designer/side_menu.phtml:141
 msgid "Toggle small/big"
 msgstr "Canviar petit/gran"
 
-#: templates/designer/side_menu.phtml:145
-#: templates/designer/side_menu.phtml:148
+#: templates/database/designer/side_menu.phtml:145
+#: templates/database/designer/side_menu.phtml:148
 msgid "Toggle relation lines"
 msgstr "Canviar línies de relació"
 
-#: templates/designer/side_menu.phtml:153
-#: templates/designer/side_menu.phtml:156
+#: templates/database/designer/side_menu.phtml:153
+#: templates/database/designer/side_menu.phtml:156
 msgid "Export schema"
 msgstr "Exporta esquema"
 
-#: templates/designer/side_menu.phtml:165
-#: templates/designer/side_menu.phtml:168
+#: templates/database/designer/side_menu.phtml:165
+#: templates/database/designer/side_menu.phtml:168
 msgid "Build Query"
 msgstr "Construeix una consulta"
 
-#: templates/designer/side_menu.phtml:173
-#: templates/designer/side_menu.phtml:177
+#: templates/database/designer/side_menu.phtml:173
+#: templates/database/designer/side_menu.phtml:177
 msgid "Move Menu"
 msgstr "Menú Mou"
 
-#: templates/designer/side_menu.phtml:181
-#: templates/designer/side_menu.phtml:186
+#: templates/database/designer/side_menu.phtml:181
+#: templates/database/designer/side_menu.phtml:186
 msgid "Pin text"
 msgstr "FIxa text"
 
-#: templates/designer/table_list.phtml:4
+#: templates/database/designer/table_list.phtml:4
 msgid "Hide/Show all"
 msgstr "Amaga/Mostra tot"
 
-#: templates/designer/table_list.phtml:14
+#: templates/database/designer/table_list.phtml:14
 msgid "Hide/Show Tables with no relation"
 msgstr "Amaga/Mostra taules sense relacions"
 
-#: templates/designer/table_list.phtml:59
+#: templates/database/designer/table_list.phtml:59
 msgid "Number of tables:"
 msgstr "Nombre de taules:"
 
+#: templates/database/structure/body_for_table_summary.phtml:6
+#, php-format
+msgid "%s table"
+msgid_plural "%s tables"
+msgstr[0] "%s taula"
+msgstr[1] "%s taules"
+
+#: templates/database/structure/body_for_table_summary.phtml:17
+msgid "Sum"
+msgstr "Suma"
+
+#: templates/database/structure/check_all_tables.phtml:6
+msgid "Check tables having overhead"
+msgstr "Comprova taules desfragmentades"
+
+#: templates/database/structure/check_all_tables.phtml:10
+msgid "Show create"
+msgstr "Mostra creació"
+
+#: templates/database/structure/check_all_tables.phtml:27
+#, fuzzy
+#| msgid "Add prefix"
+msgid "Prefix"
+msgstr "Afegir prefix"
+
+#: templates/database/structure/check_all_tables.phtml:28
+msgid "Add prefix to table"
+msgstr "Afegeix un prefix a la taula"
+
+#: templates/database/structure/check_all_tables.phtml:29
+msgid "Replace table prefix"
+msgstr "Canvia el prefix de la taula"
+
+#: templates/database/structure/check_all_tables.phtml:30
+msgid "Copy table with prefix"
+msgstr "Copia la taula amb prefix"
+
+#: templates/database/structure/check_all_tables.phtml:36
+msgid "Add columns to central list"
+msgstr "Afegir columnes a la llista central"
+
+#: templates/database/structure/check_all_tables.phtml:37
+msgid "Remove columns from central list"
+msgstr "Eliminar columnes de la llista central"
+
+#: templates/database/structure/check_all_tables.phtml:38
+msgid "Make consistent with central list"
+msgstr "Fer consistent amb la llista central"
+
+#: templates/database/structure/favorite_anchor.phtml:12
+msgid "Add to Favorites"
+msgstr "Afegir a marcadors"
+
+#: templates/database/structure/show_create.phtml:2
+msgid "Showing create queries"
+msgstr "Mostrant consultes de creació"
+
+#: templates/database/structure/sortable_header.phtml:13
+msgid "Sort"
+msgstr "Classificació"
+
+#: templates/database/structure/table_header.phtml:42
+msgid ""
+"May be approximate. Click on the number to get the exact count. See "
+"[doc@faq3-11]FAQ 3.11[/doc]."
+msgstr ""
+"Pot ser aproximat. Premeu en el numero per obtenir la quantitat exacta. "
+"Veieu [doc@faq3-11]PCF -FAQ- 3.11[/doc]."
+
+#: templates/database/structure/table_header.phtml:66
+#: templates/table/index_form.phtml:127
+msgid "Size"
+msgstr "Mida"
+
+#: templates/database/structure/table_header.phtml:74
+#: templates/table/structure/display_table_stats.phtml:27
+msgid "Overhead"
+msgstr "Defragmentat"
+
+#: templates/database/structure/tracking_icon.phtml:4
+msgid "Tracking is active."
+msgstr "El seguiment està actiu."
+
+#: templates/database/structure/tracking_icon.phtml:8
+msgid "Tracking is not active."
+msgstr "El seguiment no està actiu."
+
 #: templates/error/report_form.phtml:7
 msgid ""
 "phpMyAdmin has encountered an error. We have collected data about this error "
@@ -15221,61 +15336,6 @@ msgstr "Pots examinar les dades a l'informe d'error:"
 msgid "Please explain the steps that lead to the error:"
 msgstr "Explica les passes que porten a l'error:"
 
-#: templates/gis_visualization/gis_visualization.phtml:3
-msgid "Display GIS Visualization"
-msgstr "Mostra visualització GIS"
-
-#: templates/gis_visualization/gis_visualization.phtml:8
-msgid "Label column"
-msgstr "Etiqueta de columna"
-
-#: templates/gis_visualization/gis_visualization.phtml:11
-msgid "-- None --"
-msgstr "-- cap --"
-
-#: templates/gis_visualization/gis_visualization.phtml:19
-msgid "Spatial column"
-msgstr "Columna espacial"
-
-#: templates/index_form.phtml:16
-msgid "Index name:"
-msgstr "Nom d'índex:"
-
-#: templates/index_form.phtml:19
-msgid ""
-"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
-msgstr ""
-"\"PRIMARY\" <b>ha de ser</b> el nom i <b>només</b> el nom de la clau "
-"principal!"
-
-#: templates/index_form.phtml:40
-msgid "Index choice:"
-msgstr "Tria de l'índex:"
-
-#: templates/index_form.phtml:57
-msgid "Key block size:"
-msgstr "Mida del bloc de clau:"
-
-#: templates/index_form.phtml:74
-msgid "Index type:"
-msgstr "Tipus d'índex:"
-
-#: templates/index_form.phtml:86
-msgid "Parser:"
-msgstr "Analitzador:"
-
-#: templates/index_form.phtml:102
-msgid "Comment:"
-msgstr "Comentari:"
-
-#: templates/index_form.phtml:127 templates/structure/table_header.phtml:66
-msgid "Size"
-msgstr "Mida"
-
-#: templates/index_form.phtml:149 templates/index_form.phtml:190
-msgid "Drag to reorder"
-msgstr "Arrossega per reordenar"
-
 #: templates/prefs_autoload.phtml:9
 msgid ""
 "Your browser has phpMyAdmin configuration for this domain. Would you like to "
@@ -15288,363 +15348,152 @@ msgstr ""
 msgid "Start row:"
 msgstr "Fila d'inici:"
 
-#: templates/structure/actions_in_table_structure.phtml:14
-#, php-format
-msgid "A primary key has been added on %s."
-msgstr "S'ha afegit una clau principal a %s."
-
-#: templates/structure/actions_in_table_structure.phtml:34
-#: templates/structure/actions_in_table_structure.phtml:54
-#: templates/structure/actions_in_table_structure.phtml:79
-#: templates/structure/actions_in_table_structure.phtml:101
-#, php-format
-msgid "An index has been added on %s."
-msgstr "S'ha afegit un índex a %s."
-
-#: templates/structure/actions_in_table_structure.phtml:130
-#: templates/structure/check_all_table_column.phtml:59
-msgid "Remove from central columns"
-msgstr "Treure de les columnes centrals"
-
-#: templates/structure/actions_in_table_structure.phtml:138
-#: templates/structure/check_all_table_column.phtml:55
-msgid "Add to central columns"
-msgstr "Afegir a les columnes centrals"
-
-#: templates/structure/add_column.phtml:7
-#, php-format
-msgid "Add %s column(s)"
-msgstr "Afegeix %s columna(es)"
-
-#: templates/structure/add_column.phtml:12
-msgid "at beginning of table"
-msgstr "a l'inici de la taula"
-
-#: templates/structure/body_for_table_summary.phtml:6
-#, php-format
-msgid "%s table"
-msgid_plural "%s tables"
-msgstr[0] "%s taula"
-msgstr[1] "%s taules"
-
-#: templates/structure/body_for_table_summary.phtml:17
-msgid "Sum"
-msgstr "Suma"
-
-#: templates/structure/check_all_tables.phtml:6
-msgid "Check tables having overhead"
-msgstr "Comprova taules desfragmentades"
-
-#: templates/structure/check_all_tables.phtml:10
-msgid "Show create"
-msgstr "Mostra creació"
-
-#: templates/structure/check_all_tables.phtml:27
-#, fuzzy
-#| msgid "Add prefix"
-msgid "Prefix"
-msgstr "Afegir prefix"
-
-#: templates/structure/check_all_tables.phtml:28
-msgid "Add prefix to table"
-msgstr "Afegeix un prefix a la taula"
-
-#: templates/structure/check_all_tables.phtml:29
-msgid "Replace table prefix"
-msgstr "Canvia el prefix de la taula"
-
-#: templates/structure/check_all_tables.phtml:30
-msgid "Copy table with prefix"
-msgstr "Copia la taula amb prefix"
-
-#: templates/structure/check_all_tables.phtml:36
-msgid "Add columns to central list"
-msgstr "Afegir columnes a la llista central"
-
-#: templates/structure/check_all_tables.phtml:37
-msgid "Remove columns from central list"
-msgstr "Eliminar columnes de la llista central"
-
-#: templates/structure/check_all_tables.phtml:38
-msgid "Make consistent with central list"
-msgstr "Fer consistent amb la llista central"
-
-#: templates/structure/display_structure.phtml:140 view_create.php:181
-msgid "Edit view"
-msgstr "Editar vista"
-
-#: templates/structure/display_table_stats.phtml:9
-msgid "Space usage"
-msgstr "Utilització d'espai"
-
-#: templates/structure/display_table_stats.phtml:27
-#: templates/structure/table_header.phtml:74
-msgid "Overhead"
-msgstr "Defragmentat"
-
-#: templates/structure/display_table_stats.phtml:32
-msgid "Effective"
-msgstr "Efectiu"
-
-#: templates/structure/favorite_anchor.phtml:12
-msgid "Add to Favorites"
-msgstr "Afegir a marcadors"
-
-#: templates/structure/move_columns_dialog.phtml:1
-#: templates/structure/optional_action_links.phtml:21
-msgid "Move columns"
-msgstr "Moure columnes"
-
-#: templates/structure/move_columns_dialog.phtml:2
-msgid "Move the columns by dragging them up and down."
-msgstr "Mou les columnes arrossegant amunt i avall."
-
-#: templates/structure/optional_action_links.phtml:9
-msgid "Propose table structure"
-msgstr "Proposa una estructura de taula"
-
-#: templates/structure/optional_action_links.phtml:24
-msgid "Improve table structure"
-msgstr "Millorar l'estructura de taula"
-
-#: templates/structure/optional_action_links.phtml:30
-msgid "Track view"
-msgstr "Vista de seguiment"
-
-#: templates/structure/row_stats_table.phtml:3
-msgid "Row statistics"
-msgstr "Estadística de la fila"
-
-#: templates/structure/row_stats_table.phtml:9
-msgid "static"
-msgstr "estàtic"
-
-#: templates/structure/row_stats_table.phtml:11
-msgid "dynamic"
-msgstr "dinàmic"
-
-#: templates/structure/row_stats_table.phtml:22
-msgid "partitioned"
-msgstr "particionat"
-
-#: templates/structure/row_stats_table.phtml:54
-msgid "Row length"
-msgstr "Tamany de fila"
-
-#: templates/structure/row_stats_table.phtml:66
-msgid "Row size"
-msgstr "Mida de fila"
-
-#: templates/structure/row_stats_table.phtml:73
-msgid "Next autoindex"
-msgstr "AUTOINDEX Següent"
-
-#: templates/structure/secondary_tabs.phtml:14
-msgid "Relation view"
-msgstr "Vista de relacions"
-
-#: templates/structure/show_create.phtml:2
-msgid "Showing create queries"
-msgstr "Mostrant consultes de creació"
-
-#: templates/structure/sortable_header.phtml:13
-msgid "Sort"
-msgstr "Classificació"
-
-#: templates/structure/table_header.phtml:42
-msgid ""
-"May be approximate. Click on the number to get the exact count. See "
-"[doc@faq3-11]FAQ 3.11[/doc]."
-msgstr ""
-"Pot ser aproximat. Premeu en el numero per obtenir la quantitat exacta. "
-"Veieu [doc@faq3-11]PCF -FAQ- 3.11[/doc]."
-
-#: templates/structure/table_structure_row.phtml:46
-#, php-format
-msgid "Column %s has been dropped."
-msgstr "S'ha esborrat la columna %s."
-
-#: templates/structure/tracking_icon.phtml:4
-msgid "Tracking is active."
-msgstr "El seguiment està actiu."
-
-#: templates/structure/tracking_icon.phtml:8
-msgid "Tracking is not active."
-msgstr "El seguiment no està actiu."
-
-#: templates/table/create_table.phtml:15
-msgid "Number of columns"
-msgstr "Nombre de columnes"
-
-#: templates/table/options.phtml:8
-msgid "Select columns (at least one):"
-msgstr "Tria les columnes (una com a mínim):"
-
-#: templates/table/options.phtml:37
-msgid "Add search conditions (body of the \"where\" clause):"
-msgstr "Afegeix condicions de recerca (cos de la clàusula \"where\" ):"
-
-#: templates/table/options.phtml:45
-msgid "Number of rows per page"
-msgstr "Número de registres per pàgina"
-
-#: templates/table/options.phtml:56
-msgid "Display order:"
-msgstr "Ordre del llistat:"
-
-#: templates/table/options_zoom.phtml:6
-msgid "Use this column to label each point"
-msgstr "Utilitza aquesta columna per etiquetar cada punt"
-
-#: templates/table/options_zoom.phtml:35
-msgid "Maximum rows to plot"
-msgstr "Màxim nombre de files a dibuixar"
-
-#: templates/table/replace_preview.phtml:13
-msgid "Find and replace - preview"
-msgstr "Troba i substitueix - vista prèvia"
-
-#: templates/table/replace_preview.phtml:18
-msgid "Original string"
-msgstr "String original"
-
-#: templates/table/replace_preview.phtml:19
-msgid "Replaced string"
-msgstr "String reemplaçat"
-
-#: templates/table/replace_preview.phtml:40
-msgid "Replace"
-msgstr "Reemplaça"
-
-#: templates/table/rows_zoom.phtml:16
-msgid "Additional search criteria"
-msgstr "Criteri de cerca addicionals"
-
-#: templates/table/search_and_replace.phtml:3
-msgid "Replace with:"
-msgstr "Reemplaça NULL amb:"
-
-#: templates/table/search_and_replace.phtml:22
-msgid "Use regular expression"
-msgstr "Usar expressió regular"
-
-#: templates/table/selection_form.phtml:12
-msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
-msgstr ""
-"Fer una \"consulta segons exemple\" (comodí: \"%\") per a dos columnes "
-"diferents"
-
-#: templates/table/selection_form.phtml:34
-msgid "Do a \"query by example\" (wildcard: \"%\")"
-msgstr "Fer una \"petició segons exemple\" (comodí: \"%\")"
-
-#: templates/table/zoom_result_form.phtml:7
-msgid "Browse/Edit the points"
-msgstr "Veure / editar els punts"
-
-#: templates/table/zoom_result_form.phtml:15
-msgid "How to use"
-msgstr "Cóm utilitzar"
-
-#: templates/table/zoom_result_form.phtml:23
-msgid "Reset zoom"
-msgstr "Reinicia l'ampliació"
-
-#: templates/tbl_chart.phtml:17
+#: templates/table/chart/tbl_chart.phtml:17
 msgctxt "Chart type"
 msgid "Bar"
 msgstr "Barra"
 
-#: templates/tbl_chart.phtml:21
+#: templates/table/chart/tbl_chart.phtml:21
 msgctxt "Chart type"
 msgid "Column"
 msgstr "Columna"
 
-#: templates/tbl_chart.phtml:25
+#: templates/table/chart/tbl_chart.phtml:25
 msgctxt "Chart type"
 msgid "Line"
 msgstr "Línia"
 
-#: templates/tbl_chart.phtml:29
+#: templates/table/chart/tbl_chart.phtml:29
 msgctxt "Chart type"
 msgid "Spline"
 msgstr "Ranures"
 
-#: templates/tbl_chart.phtml:33
+#: templates/table/chart/tbl_chart.phtml:33
 msgctxt "Chart type"
 msgid "Area"
 msgstr "Àrea"
 
-#: templates/tbl_chart.phtml:37
+#: templates/table/chart/tbl_chart.phtml:37
 msgctxt "Chart type"
 msgid "Pie"
 msgstr "Pastis"
 
-#: templates/tbl_chart.phtml:41
+#: templates/table/chart/tbl_chart.phtml:41
 msgctxt "Chart type"
 msgid "Timeline"
 msgstr "Línia temporal"
 
-#: templates/tbl_chart.phtml:45
+#: templates/table/chart/tbl_chart.phtml:45
 msgctxt "Chart type"
 msgid "Scatter"
 msgstr "Dispersió"
 
-#: templates/tbl_chart.phtml:50
+#: templates/table/chart/tbl_chart.phtml:50
 msgid "Stacked"
 msgstr "Apilat"
 
-#: templates/tbl_chart.phtml:53
+#: templates/table/chart/tbl_chart.phtml:53
 msgid "Chart title"
 msgstr "Títol del gràfic"
 
-#: templates/tbl_chart.phtml:57
+#: templates/table/chart/tbl_chart.phtml:57
 msgid "X-Axis:"
 msgstr "Eix X:"
 
-#: templates/tbl_chart.phtml:72
+#: templates/table/chart/tbl_chart.phtml:72
 msgid "Series:"
 msgstr "Series:"
 
-#: templates/tbl_chart.phtml:102
+#: templates/table/chart/tbl_chart.phtml:102
 msgid "X-Axis label:"
 msgstr "Etiqueta de l'eix X:"
 
-#: templates/tbl_chart.phtml:104
+#: templates/table/chart/tbl_chart.phtml:104
 msgid "X Values"
 msgstr "Valors X"
 
-#: templates/tbl_chart.phtml:107
+#: templates/table/chart/tbl_chart.phtml:107
 msgid "Y-Axis label:"
 msgstr "Etiqueta de l'eix Y:"
 
-#: templates/tbl_chart.phtml:115
+#: templates/table/chart/tbl_chart.phtml:115
 msgid "Series names are in a column"
 msgstr "Els noms de les series hi són en una columna"
 
-#: templates/tbl_chart.phtml:118
+#: templates/table/chart/tbl_chart.phtml:118
 msgid "Series column:"
 msgstr "Columna de series:"
 
-#: templates/tbl_chart.phtml:130
+#: templates/table/chart/tbl_chart.phtml:130
 #, fuzzy
 #| msgid "Value column:"
 msgid "Value Column:"
 msgstr "Columna de valors:"
 
-#: templates/tbl_chart.phtml:150
+#: templates/table/chart/tbl_chart.phtml:150
 msgid "Save chart as image"
 msgstr "Desa el gràfic com a imatge"
 
-#: templates/tbl_relation/common_form.phtml:7
+#: templates/table/gis_visualization/gis_visualization.phtml:3
+msgid "Display GIS Visualization"
+msgstr "Mostra visualització GIS"
+
+#: templates/table/gis_visualization/gis_visualization.phtml:8
+msgid "Label column"
+msgstr "Etiqueta de columna"
+
+#: templates/table/gis_visualization/gis_visualization.phtml:11
+msgid "-- None --"
+msgstr "-- cap --"
+
+#: templates/table/gis_visualization/gis_visualization.phtml:19
+msgid "Spatial column"
+msgstr "Columna espacial"
+
+#: templates/table/index_form.phtml:16
+msgid "Index name:"
+msgstr "Nom d'índex:"
+
+#: templates/table/index_form.phtml:19
+msgid ""
+"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
+msgstr ""
+"\"PRIMARY\" <b>ha de ser</b> el nom i <b>només</b> el nom de la clau "
+"principal!"
+
+#: templates/table/index_form.phtml:40
+msgid "Index choice:"
+msgstr "Tria de l'índex:"
+
+#: templates/table/index_form.phtml:57
+msgid "Key block size:"
+msgstr "Mida del bloc de clau:"
+
+#: templates/table/index_form.phtml:74
+msgid "Index type:"
+msgstr "Tipus d'índex:"
+
+#: templates/table/index_form.phtml:86
+msgid "Parser:"
+msgstr "Analitzador:"
+
+#: templates/table/index_form.phtml:102
+msgid "Comment:"
+msgstr "Comentari:"
+
+#: templates/table/index_form.phtml:149 templates/table/index_form.phtml:190
+msgid "Drag to reorder"
+msgstr "Arrossega per reordenar"
+
+#: templates/table/relation/common_form.phtml:7
 msgid "Internal relations"
 msgstr "Relacions internes"
 
-#: templates/tbl_relation/common_form.phtml:11
+#: templates/table/relation/common_form.phtml:11
 msgid "Internal relation"
 msgstr "Relació interna"
 
-#: templates/tbl_relation/common_form.phtml:14
+#: templates/table/relation/common_form.phtml:14
 msgid ""
 "An internal relation is not necessary when a corresponding FOREIGN KEY "
 "relation exists."
@@ -15652,48 +15501,224 @@ msgstr ""
 "No es necessita una relació interna quan existeix una relació corresponent "
 "de FOREIGN KEY."
 
-#: templates/tbl_relation/common_form.phtml:37
+#: templates/table/relation/common_form.phtml:37
 msgid "Foreign key constraints"
 msgstr "Restriccions de clau externa"
 
-#: templates/tbl_relation/common_form.phtml:40
+#: templates/table/relation/common_form.phtml:40
 msgid "Actions"
 msgstr "Accions"
 
-#: templates/tbl_relation/common_form.phtml:41
+#: templates/table/relation/common_form.phtml:41
 msgid "Constraint properties"
 msgstr "Propietats de la restricció"
 
-#: templates/tbl_relation/common_form.phtml:44
+#: templates/table/relation/common_form.phtml:44
 msgid ""
 "Only columns with index will be displayed. You can define an index below."
 msgstr "Només es mostraran columnes amb índex. Pots definir un índex a sota."
 
-#: templates/tbl_relation/common_form.phtml:49
+#: templates/table/relation/common_form.phtml:49
 msgid "Foreign key constraint"
 msgstr "Límit de clau externa"
 
-#: templates/tbl_relation/common_form.phtml:81
+#: templates/table/relation/common_form.phtml:81
 msgid "+ Add constraint"
 msgstr "+ Afegeix restricció"
 
-#: templates/tbl_relation/common_form.phtml:91
+#: templates/table/relation/common_form.phtml:91
 msgid "Choose column to display:"
 msgstr "Tria la columna a mostrar:"
 
-#: templates/tbl_relation/foreign_key_row.phtml:13
+#: templates/table/relation/foreign_key_row.phtml:13
 #, php-format
 msgid "Foreign key constraint %s has been dropped"
 msgstr "S'ha eliminat la restricció %s de la clau externa"
 
-#: templates/tbl_relation/foreign_key_row.phtml:102
+#: templates/table/relation/foreign_key_row.phtml:102
 msgid "Constraint name"
 msgstr "Nom de la restricció"
 
-#: templates/tbl_relation/foreign_key_row.phtml:157
+#: templates/table/relation/foreign_key_row.phtml:157
 msgid "+ Add column"
 msgstr "+ Afegeix columna"
 
+#: templates/table/search/options.phtml:8
+msgid "Select columns (at least one):"
+msgstr "Tria les columnes (una com a mínim):"
+
+#: templates/table/search/options.phtml:37
+msgid "Add search conditions (body of the \"where\" clause):"
+msgstr "Afegeix condicions de recerca (cos de la clàusula \"where\" ):"
+
+#: templates/table/search/options.phtml:45
+msgid "Number of rows per page"
+msgstr "Número de registres per pàgina"
+
+#: templates/table/search/options.phtml:56
+msgid "Display order:"
+msgstr "Ordre del llistat:"
+
+#: templates/table/search/options_zoom.phtml:6
+msgid "Use this column to label each point"
+msgstr "Utilitza aquesta columna per etiquetar cada punt"
+
+#: templates/table/search/options_zoom.phtml:35
+msgid "Maximum rows to plot"
+msgstr "Màxim nombre de files a dibuixar"
+
+#: templates/table/search/replace_preview.phtml:13
+msgid "Find and replace - preview"
+msgstr "Troba i substitueix - vista prèvia"
+
+#: templates/table/search/replace_preview.phtml:18
+msgid "Original string"
+msgstr "String original"
+
+#: templates/table/search/replace_preview.phtml:19
+msgid "Replaced string"
+msgstr "String reemplaçat"
+
+#: templates/table/search/replace_preview.phtml:40
+msgid "Replace"
+msgstr "Reemplaça"
+
+#: templates/table/search/rows_zoom.phtml:16
+msgid "Additional search criteria"
+msgstr "Criteri de cerca addicionals"
+
+#: templates/table/search/search_and_replace.phtml:3
+msgid "Replace with:"
+msgstr "Reemplaça NULL amb:"
+
+#: templates/table/search/search_and_replace.phtml:22
+msgid "Use regular expression"
+msgstr "Usar expressió regular"
+
+#: templates/table/search/selection_form.phtml:12
+msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
+msgstr ""
+"Fer una \"consulta segons exemple\" (comodí: \"%\") per a dos columnes "
+"diferents"
+
+#: templates/table/search/selection_form.phtml:34
+msgid "Do a \"query by example\" (wildcard: \"%\")"
+msgstr "Fer una \"petició segons exemple\" (comodí: \"%\")"
+
+#: templates/table/search/zoom_result_form.phtml:7
+msgid "Browse/Edit the points"
+msgstr "Veure / editar els punts"
+
+#: templates/table/search/zoom_result_form.phtml:15
+msgid "How to use"
+msgstr "Cóm utilitzar"
+
+#: templates/table/search/zoom_result_form.phtml:23
+msgid "Reset zoom"
+msgstr "Reinicia l'ampliació"
+
+#: templates/table/secondary_tabs.phtml:14
+msgid "Relation view"
+msgstr "Vista de relacions"
+
+#: templates/table/structure/actions_in_table_structure.phtml:14
+#, php-format
+msgid "A primary key has been added on %s."
+msgstr "S'ha afegit una clau principal a %s."
+
+#: templates/table/structure/actions_in_table_structure.phtml:34
+#: templates/table/structure/actions_in_table_structure.phtml:54
+#: templates/table/structure/actions_in_table_structure.phtml:79
+#: templates/table/structure/actions_in_table_structure.phtml:101
+#, php-format
+msgid "An index has been added on %s."
+msgstr "S'ha afegit un índex a %s."
+
+#: templates/table/structure/actions_in_table_structure.phtml:130
+#: templates/table/structure/check_all_table_column.phtml:59
+msgid "Remove from central columns"
+msgstr "Treure de les columnes centrals"
+
+#: templates/table/structure/actions_in_table_structure.phtml:138
+#: templates/table/structure/check_all_table_column.phtml:55
+msgid "Add to central columns"
+msgstr "Afegir a les columnes centrals"
+
+#: templates/table/structure/add_column.phtml:7
+#, php-format
+msgid "Add %s column(s)"
+msgstr "Afegeix %s columna(es)"
+
+#: templates/table/structure/add_column.phtml:12
+msgid "at beginning of table"
+msgstr "a l'inici de la taula"
+
+#: templates/table/structure/display_structure.phtml:140 view_create.php:181
+msgid "Edit view"
+msgstr "Editar vista"
+
+#: templates/table/structure/display_table_stats.phtml:9
+msgid "Space usage"
+msgstr "Utilització d'espai"
+
+#: templates/table/structure/display_table_stats.phtml:32
+msgid "Effective"
+msgstr "Efectiu"
+
+#: templates/table/structure/move_columns_dialog.phtml:1
+#: templates/table/structure/optional_action_links.phtml:21
+msgid "Move columns"
+msgstr "Moure columnes"
+
+#: templates/table/structure/move_columns_dialog.phtml:2
+msgid "Move the columns by dragging them up and down."
+msgstr "Mou les columnes arrossegant amunt i avall."
+
+#: templates/table/structure/optional_action_links.phtml:9
+msgid "Propose table structure"
+msgstr "Proposa una estructura de taula"
+
+#: templates/table/structure/optional_action_links.phtml:24
+msgid "Improve table structure"
+msgstr "Millorar l'estructura de taula"
+
+#: templates/table/structure/optional_action_links.phtml:30
+msgid "Track view"
+msgstr "Vista de seguiment"
+
+#: templates/table/structure/row_stats_table.phtml:3
+msgid "Row statistics"
+msgstr "Estadística de la fila"
+
+#: templates/table/structure/row_stats_table.phtml:9
+msgid "static"
+msgstr "estàtic"
+
+#: templates/table/structure/row_stats_table.phtml:11
+msgid "dynamic"
+msgstr "dinàmic"
+
+#: templates/table/structure/row_stats_table.phtml:22
+msgid "partitioned"
+msgstr "particionat"
+
+#: templates/table/structure/row_stats_table.phtml:54
+msgid "Row length"
+msgstr "Tamany de fila"
+
+#: templates/table/structure/row_stats_table.phtml:66
+msgid "Row size"
+msgstr "Mida de fila"
+
+#: templates/table/structure/row_stats_table.phtml:73
+msgid "Next autoindex"
+msgstr "AUTOINDEX Següent"
+
+#: templates/table/structure/table_structure_row.phtml:46
+#, php-format
+msgid "Column %s has been dropped."
+msgstr "S'ha esborrat la columna %s."
+
 #: themes.php:17 themes.php:22
 msgid "Theme"
 msgstr "Tema"
@@ -17057,6 +17082,9 @@ msgstr ""
 msgid "concurrent_insert is set to 0"
 msgstr "{concurrent_insert} està establert a 0"
 
+#~ msgid "Read as multibytes"
+#~ msgstr "Llegir com a multibytes"
+
 #~ msgid "Relational display column"
 #~ msgstr "Columna relacional a mostrar"
 
diff --git a/po/ckb.po b/po/ckb.po
index df5952c900..6103c23cc7 100644
--- a/po/ckb.po
+++ b/po/ckb.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 4.5.0-dev\n"
 "Report-Msgid-Bugs-To: developers@phpmyadmin.net\n"
-"POT-Creation-Date: 2015-08-08 13:53-0400\n"
+"POT-Creation-Date: 2015-08-12 08:10-0400\n"
 "PO-Revision-Date: 2015-06-22 11:43+0200\n"
 "Last-Translator: Zrng Abdulla <zhyarabdulla94@gmail.com>\n"
 "Language-Team: Kurdish Sorani <https://hosted.weblate.org/projects/"
@@ -57,7 +57,7 @@ msgid "Table comments:"
 msgstr "تێبینیەکانی خشتە:"
 
 #: db_datadict.php:104 libraries/Index.class.php:699
-#: libraries/insert_edit.lib.php:1567
+#: libraries/insert_edit.lib.php:1565
 #: libraries/navigation/Nodes/Node_Column.class.php:30
 #: libraries/plugins/export/ExportHtmlword.class.php:280
 #: libraries/plugins/export/ExportHtmlword.class.php:375
@@ -71,13 +71,14 @@ msgstr "تێبینیەکانی خشتە:"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1023
 #: libraries/tracking.lib.php:879 libraries/tracking.lib.php:975
 #: templates/columns_definitions/column_name.phtml:18
-#: templates/index_form.phtml:124 templates/table/table_header.phtml:6
-#: templates/table/zoom_result_form.phtml:33
-#: templates/tbl_relation/common_form.phtml:10
-#: templates/tbl_relation/common_form.phtml:43
-#: templates/tbl_relation/foreign_key_row.phtml:194
-#: templates/tbl_relation/foreign_key_row.phtml:206
-#: templates/tbl_relation/internal_relational_row.phtml:71
+#: templates/table/index_form.phtml:124
+#: templates/table/relation/common_form.phtml:10
+#: templates/table/relation/common_form.phtml:43
+#: templates/table/relation/foreign_key_row.phtml:194
+#: templates/table/relation/foreign_key_row.phtml:206
+#: templates/table/relation/internal_relational_row.phtml:71
+#: templates/table/search/table_header.phtml:6
+#: templates/table/search/zoom_result_form.phtml:33
 msgid "Column"
 msgstr "ستون"
 
@@ -95,21 +96,21 @@ msgstr "ستون"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1001
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1024
 #: libraries/rte/rte_list.lib.php:75 libraries/rte/rte_list.lib.php:103
-#: libraries/rte/rte_routines.lib.php:802
-#: libraries/rte/rte_routines.lib.php:831
-#: libraries/rte/rte_routines.lib.php:1493
+#: libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_routines.lib.php:922
+#: libraries/rte/rte_routines.lib.php:1584
 #: libraries/server_privileges.lib.php:2369 libraries/tracking.lib.php:880
 #: libraries/tracking.lib.php:972
 #: templates/columns_definitions/table_fields_definitions.phtml:11
-#: templates/structure/table_header.phtml:48
-#: templates/structure/table_structure_header.phtml:6
-#: templates/table/table_header.phtml:7
+#: templates/database/structure/table_header.phtml:48
+#: templates/table/search/table_header.phtml:7
+#: templates/table/structure/table_structure_header.phtml:6
 msgid "Type"
 msgstr "جۆر"
 
 #: db_datadict.php:106 libraries/Index.class.php:702
 #: libraries/central_columns.lib.php:708
-#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1576
+#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1574
 #: libraries/plugins/export/ExportHtmlword.class.php:286
 #: libraries/plugins/export/ExportHtmlword.class.php:381
 #: libraries/plugins/export/ExportLatex.class.php:509
@@ -122,8 +123,8 @@ msgstr "جۆر"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1026
 #: libraries/tracking.lib.php:882 libraries/tracking.lib.php:978
 #: templates/columns_definitions/table_fields_definitions.phtml:39
-#: templates/structure/table_structure_header.phtml:9
-#: templates/table/zoom_result_form.phtml:34
+#: templates/table/search/zoom_result_form.phtml:34
+#: templates/table/structure/table_structure_header.phtml:9
 msgid "Null"
 msgstr "بەتاڵ"
 
@@ -141,8 +142,8 @@ msgstr "بەتاڵ"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1027
 #: libraries/replication_gui.lib.php:153 libraries/tracking.lib.php:883
 #: templates/columns_definitions/table_fields_definitions.phtml:25
-#: templates/structure/body_for_table_summary.phtml:55
-#: templates/structure/table_structure_header.phtml:10
+#: templates/database/structure/body_for_table_summary.phtml:55
+#: templates/table/structure/table_structure_header.phtml:10
 msgid "Default"
 msgstr "بنەڕەت"
 
@@ -170,19 +171,19 @@ msgid "Comments"
 msgstr "بۆچوون"
 
 #: db_datadict.php:146
-#: libraries/controllers/StructureController.class.php:1960
-#: libraries/controllers/StructureController.class.php:1965
+#: libraries/controllers/TableStructureController.class.php:951
+#: libraries/controllers/TableStructureController.class.php:956
 #: libraries/tracking.lib.php:922
 #: templates/columns_definitions/column_indexes.phtml:6
-#: templates/structure/check_all_table_column.phtml:22
-#: templates/structure/display_structure.phtml:74
+#: templates/table/structure/check_all_table_column.phtml:22
+#: templates/table/structure/display_structure.phtml:74
 msgid "Primary"
 msgstr "سەرەکی"
 
 #: db_datadict.php:156 js/messages.php:317 libraries/Index.class.php:567
 #: libraries/Index.class.php:606 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261 libraries/mult_submits.lib.php:403
+#: libraries/config/FormDisplay.tpl.php:272 libraries/mult_submits.lib.php:403
 #: libraries/mult_submits.lib.php:417
 #: libraries/plugins/export/ExportHtmlword.class.php:630
 #: libraries/plugins/export/ExportLatex.class.php:589
@@ -198,20 +199,20 @@ msgstr "سەرەکی"
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1010 libraries/tracking.lib.php:1015
 #: prefs_manage.php:140 templates/prefs_autoload.phtml:15
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "No"
 msgstr "نەخێر"
 
 #: db_datadict.php:156 js/messages.php:443 libraries/Index.class.php:568
 #: libraries/Index.class.php:605 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261
-#: libraries/controllers/StructureController.class.php:1344
-#: libraries/controllers/StructureController.class.php:2223
-#: libraries/controllers/StructureController.class.php:2232
-#: libraries/controllers/StructureController.class.php:2237
-#: libraries/controllers/StructureController.class.php:2242
-#: libraries/controllers/StructureController.class.php:2247
+#: libraries/config/FormDisplay.tpl.php:272
+#: libraries/controllers/TableStructureController.class.php:539
+#: libraries/controllers/TableStructureController.class.php:1201
+#: libraries/controllers/TableStructureController.class.php:1210
+#: libraries/controllers/TableStructureController.class.php:1215
+#: libraries/controllers/TableStructureController.class.php:1220
+#: libraries/controllers/TableStructureController.class.php:1225
 #: libraries/mult_submits.inc.php:82 libraries/mult_submits.inc.php:178
 #: libraries/mult_submits.lib.php:339 libraries/mult_submits.lib.php:372
 #: libraries/mult_submits.lib.php:401 libraries/mult_submits.lib.php:415
@@ -220,8 +221,8 @@ msgstr "نەخێر"
 #: libraries/plugins/export/ExportOdt.class.php:756
 #: libraries/plugins/export/ExportTexytext.class.php:567
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1077
-#: libraries/server_databases.lib.php:464
-#: libraries/server_databases.lib.php:474
+#: libraries/server_databases.lib.php:475
+#: libraries/server_databases.lib.php:485
 #: libraries/server_privileges.lib.php:2546
 #: libraries/server_privileges.lib.php:2727
 #: libraries/server_privileges.lib.php:2748
@@ -231,7 +232,7 @@ msgstr "نەخێر"
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1008 libraries/tracking.lib.php:1013
 #: prefs_manage.php:138 templates/prefs_autoload.phtml:14
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "Yes"
 msgstr "بەڵێ"
 
@@ -241,7 +242,7 @@ msgstr "نیشاندانى بۆشایى (هێڵکارى) لە بنکەى درا
 
 #: db_export.php:37 db_tracking.php:90 export.php:382
 #: libraries/DBQbe.class.php:326
-#: libraries/controllers/StructureController.class.php:231
+#: libraries/controllers/DatabaseStructureController.class.php:170
 #: libraries/navigation/NavigationTree.class.php:897
 msgid "No tables found in database."
 msgstr "هیچ خشتەیەک نەدۆزرایەوە لەناو بنکەدراو."
@@ -252,14 +253,14 @@ msgstr "هیچ خشتەیەک نەدۆزرایەوە لەناو بنکەدراو
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:26
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:120
-#: templates/structure/show_create.phtml:18
+#: templates/database/structure/show_create.phtml:18
 msgid "Tables"
 msgstr ""
 
 #: db_export.php:52 libraries/Menu.class.php:317 libraries/Menu.class.php:425
-#: libraries/Util.class.php:3333 libraries/Util.class.php:3343
-#: libraries/Util.class.php:3349 libraries/Util.class.php:3629
-#: libraries/Util.class.php:4327 libraries/Util.class.php:4344
+#: libraries/Util.class.php:3339 libraries/Util.class.php:3349
+#: libraries/Util.class.php:3355 libraries/Util.class.php:3635
+#: libraries/Util.class.php:4333 libraries/Util.class.php:4350
 #: libraries/central_columns.lib.php:728 libraries/config.values.php:39
 #: libraries/config.values.php:47 libraries/config.values.php:109
 #: libraries/config.values.php:115 libraries/config/setup.forms.php:323
@@ -273,7 +274,7 @@ msgstr ""
 #: libraries/navigation/Nodes/Node_Table.class.php:283
 #: libraries/server_privileges.lib.php:1141 libraries/tracking.lib.php:874
 #: templates/columns_definitions/table_fields_definitions.phtml:3
-#: templates/designer/table_list.phtml:28
+#: templates/database/designer/table_list.phtml:28
 msgid "Structure"
 msgstr "پێکهاتە"
 
@@ -285,7 +286,7 @@ msgstr "پێکهاتە"
 #: libraries/config/user_preferences.forms.php:292
 #: libraries/config/user_preferences.forms.php:297
 #: libraries/server_privileges.lib.php:1140
-#: templates/structure/display_table_stats.phtml:12
+#: templates/table/structure/display_table_stats.phtml:12
 msgid "Data"
 msgstr ""
 
@@ -358,10 +359,10 @@ msgstr "شوێنکەوتەی خشتە"
 #: libraries/server_privileges.lib.php:2908
 #: libraries/server_privileges.lib.php:3145
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4346
-#: templates/structure/table_header.phtml:21
-#: templates/tbl_relation/foreign_key_row.phtml:176
-#: templates/tbl_relation/internal_relational_row.phtml:63
+#: libraries/server_privileges.lib.php:4372
+#: templates/database/structure/table_header.phtml:21
+#: templates/table/relation/foreign_key_row.phtml:176
+#: templates/table/relation/internal_relational_row.phtml:63
 msgid "Table"
 msgstr "خشتە"
 
@@ -378,7 +379,7 @@ msgid "Updated"
 msgstr "بارکراوە"
 
 #: db_tracking.php:130 js/messages.php:243 libraries/Menu.class.php:552
-#: libraries/Util.class.php:4314 libraries/config.values.php:104
+#: libraries/Util.class.php:4320 libraries/config.values.php:104
 #: libraries/rte/rte_events.lib.php:393 libraries/rte/rte_list.lib.php:101
 #: libraries/server_status_processes.lib.php:92 libraries/tracking.lib.php:279
 msgid "Status"
@@ -387,14 +388,15 @@ msgstr "ڕەوش"
 #: db_tracking.php:131 db_tracking.php:290 libraries/Index.class.php:693
 #: libraries/central_columns.lib.php:687 libraries/rte/rte_list.lib.php:74
 #: libraries/rte/rte_list.lib.php:89 libraries/rte/rte_list.lib.php:102
-#: libraries/server_databases.lib.php:398
+#: libraries/server_databases.lib.php:409
 #: libraries/server_privileges.lib.php:2372
 #: libraries/server_privileges.lib.php:3166
 #: libraries/server_privileges.lib.php:3342
 #: libraries/server_user_groups.lib.php:82
 #: libraries/server_variables.lib.php:189 libraries/tracking.lib.php:280
-#: libraries/tracking.lib.php:793 templates/structure/table_header.phtml:30
-#: templates/structure/table_structure_header.phtml:23
+#: libraries/tracking.lib.php:793
+#: templates/database/structure/table_header.phtml:30
+#: templates/table/structure/table_structure_header.phtml:23
 msgid "Action"
 msgstr "کردار"
 
@@ -436,7 +438,7 @@ msgid "Untracked tables"
 msgstr "خشتە شوێن نەکەوتوەکان"
 
 #: db_tracking.php:305 db_tracking.php:336
-#: templates/structure/optional_action_links.phtml:17
+#: templates/table/structure/optional_action_links.phtml:17
 msgid "Track table"
 msgstr "شوێنکەوتنی خشتە"
 
@@ -487,7 +489,7 @@ msgid "Value for the column \"%s\""
 msgstr "نرخی ستوون \"%s\""
 
 #: gis_data_editor.php:146
-#: templates/gis_visualization/gis_visualization.phtml:37
+#: templates/table/gis_visualization/gis_visualization.phtml:37
 msgid "Use OpenStreetMaps as Base Layer"
 msgstr "بەکارهێنانی بە ڕێگایەکی کراوەی نەخشەی وەک خەتكی سادە"
 
@@ -567,35 +569,35 @@ msgstr "زیادکردنی ئەندازەگەری"
 #: libraries/display_change_password.lib.php:162
 #: libraries/display_export.lib.php:402 libraries/display_export.lib.php:408
 #: libraries/display_import.lib.php:392 libraries/index.lib.php:44
-#: libraries/insert_edit.lib.php:1546 libraries/insert_edit.lib.php:1583
+#: libraries/insert_edit.lib.php:1544 libraries/insert_edit.lib.php:1581
 #: libraries/normalization.lib.php:165 libraries/normalization.lib.php:821
 #: libraries/operations.lib.php:38 libraries/operations.lib.php:108
 #: libraries/operations.lib.php:263 libraries/operations.lib.php:306
 #: libraries/operations.lib.php:801 libraries/operations.lib.php:874
 #: libraries/operations.lib.php:923 libraries/operations.lib.php:1337
 #: libraries/operations.lib.php:1658
-#: libraries/plugins/auth/AuthenticationCookie.class.php:244
+#: libraries/plugins/auth/AuthenticationCookie.class.php:232
 #: libraries/replication_gui.lib.php:122 libraries/replication_gui.lib.php:161
 #: libraries/replication_gui.lib.php:324 libraries/replication_gui.lib.php:461
 #: libraries/replication_gui.lib.php:906 libraries/rte/rte_events.lib.php:509
-#: libraries/rte/rte_routines.lib.php:969
-#: libraries/rte/rte_routines.lib.php:1581
+#: libraries/rte/rte_routines.lib.php:1060
+#: libraries/rte/rte_routines.lib.php:1672
 #: libraries/rte/rte_triggers.lib.php:396 libraries/server_bin_log.lib.php:61
 #: libraries/server_privileges.lib.php:705
 #: libraries/server_privileges.lib.php:2106
 #: libraries/server_privileges.lib.php:2872
 #: libraries/server_privileges.lib.php:3553
-#: libraries/server_privileges.lib.php:4627
+#: libraries/server_privileges.lib.php:4653
 #: libraries/server_user_groups.lib.php:285
 #: libraries/sql_query_form.lib.php:369 libraries/sql_query_form.lib.php:429
 #: libraries/tracking.lib.php:533 libraries/tracking.lib.php:653
 #: prefs_manage.php:277 prefs_manage.php:355
 #: templates/columns_definitions/column_definitions_form.phtml:59
-#: templates/header_location.phtml:17 templates/index_form.phtml:238
+#: templates/database/create_table.phtml:21 templates/header_location.phtml:28
 #: templates/startAndNumberOfRowsPanel.phtml:14
-#: templates/structure/add_column.phtml:25
-#: templates/table/create_table.phtml:21
-#: templates/table/selection_form.phtml:75 view_create.php:275
+#: templates/table/index_form.phtml:238
+#: templates/table/search/selection_form.phtml:75
+#: templates/table/structure/add_column.phtml:25 view_create.php:275
 #: view_operations.php:106
 msgid "Go"
 msgstr "بڕۆ"
@@ -683,7 +685,7 @@ msgstr "ناکرێت فایلەکانی نوسە بگۆڕدرێن بە بێ نو
 msgid "Could not load import plugins, please check your installation!"
 msgstr "هەڵە لە بارکردنی پێوەکراەکان, تکایە فۆناغەکانی دامەزراندن بپشکنن!"
 
-#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1466
+#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1460
 #, php-format
 msgid "Bookmark %s has been created."
 msgstr "شوێندۆز  %s دروستکرا."
@@ -723,11 +725,11 @@ msgstr "هەڵە لە بارکردنی ڕەوتی هاوردن"
 msgid "Back"
 msgstr "گەڕانەوە"
 
-#: index.php:148 libraries/Footer.class.php:70
+#: index.php:149 libraries/Footer.class.php:70
 msgid "phpMyAdmin Demo Server"
 msgstr "سێرڤەری نمایشی phpMyAdmin"
 
-#: index.php:152
+#: index.php:153
 #, php-format
 msgid ""
 "You are using the demo server. You can do anything here, but please do not "
@@ -738,110 +740,110 @@ msgstr ""
 "root، debian-sys-maint و بەکارهێنەرەکانی pma مەگۆڕە. زانیاری زیاتر "
 "دەستدەکەوێت لە %s."
 
-#: index.php:162
+#: index.php:163
 msgid "General Settings"
 msgstr "ڕێکخستنە گشتیەکان"
 
-#: index.php:190 libraries/display_change_password.lib.php:50
+#: index.php:191 libraries/display_change_password.lib.php:50
 #: libraries/display_change_password.lib.php:53 user_password.php:247
 msgid "Change password"
 msgstr "گۆڕینی وشەی نهێنی"
 
-#: index.php:206
+#: index.php:207
 msgid "Server connection collation"
 msgstr "ڕێکخستنی پەیوەندی ڕاژەکار"
 
-#: index.php:228
+#: index.php:229
 msgid "Appearance Settings"
 msgstr "ڕێکخستنی دەرکەوتنەکان"
 
-#: index.php:258 prefs_manage.php:285
+#: index.php:259 prefs_manage.php:285
 msgid "More settings"
 msgstr "ڕێکخستنی تر"
 
-#: index.php:279
+#: index.php:280
 msgid "Database server"
 msgstr "ڕاژەکاری بکنەی دراوە"
 
-#: index.php:282 libraries/plugins/auth/AuthenticationCookie.class.php:181
+#: index.php:283 libraries/plugins/auth/AuthenticationCookie.class.php:169
 msgid "Server:"
 msgstr "ڕاژە:"
 
-#: index.php:286
+#: index.php:287
 msgid "Server type:"
 msgstr "جۆری ڕاژە:"
 
-#: index.php:290 libraries/plugins/export/ExportLatex.class.php:212
+#: index.php:291 libraries/plugins/export/ExportLatex.class.php:212
 #: libraries/plugins/export/ExportSql.class.php:687
 #: libraries/plugins/export/ExportXml.class.php:189
 msgid "Server version:"
 msgstr "وەشانی ڕاژە:"
 
-#: index.php:296
+#: index.php:297
 msgid "Protocol version:"
 msgstr "وەشانی پڕۆتۆکۆڵ:"
 
-#: index.php:300
+#: index.php:301
 msgid "User:"
 msgstr "بەکارهێنەر:"
 
-#: index.php:305
+#: index.php:306
 msgid "Server charset:"
 msgstr "پیتەکانی ڕاژەکار:"
 
-#: index.php:320
+#: index.php:321
 msgid "Web server"
 msgstr "ڕاژەکاری وێب"
 
-#: index.php:331
+#: index.php:332
 msgid "Database client version:"
 msgstr "وەشانی ڕاژەخوازی بنکەدراو:"
 
-#: index.php:335
+#: index.php:336
 msgid "PHP extension:"
 msgstr "پێوەکراوەکانی php:"
 
-#: index.php:349
+#: index.php:350
 msgid "PHP version:"
 msgstr "وەشانی PHP:"
 
-#: index.php:360
+#: index.php:361
 msgid "Show PHP information"
 msgstr "پێشاندانی زانیاری php"
 
-#: index.php:383
+#: index.php:384
 msgid "Version information:"
 msgstr "زانیاری وەشان:"
 
-#: index.php:392 libraries/Util.class.php:432 libraries/Util.class.php:495
-#: libraries/config/FormDisplay.tpl.php:151
+#: index.php:393 libraries/Util.class.php:432 libraries/Util.class.php:495
+#: libraries/config/FormDisplay.tpl.php:162
 #: libraries/display_export.lib.php:577 libraries/engines/pbxt.lib.php:162
 #: libraries/navigation/NavigationHeader.class.php:196
 #: libraries/server_variables.lib.php:160
 msgid "Documentation"
 msgstr "به‌ڵگه‌سازی"
 
-#: index.php:399
+#: index.php:400
 msgid "Wiki"
 msgstr "wiki"
 
-#: index.php:408
+#: index.php:409
 msgid "Official Homepage"
 msgstr "پەڕەی سەرەکی"
 
-#: index.php:415
+#: index.php:416
 msgid "Contribute"
 msgstr "بەشداری کردن"
 
-#: index.php:422
+#: index.php:423
 msgid "Get support"
 msgstr "پاڵپشتی کردن"
 
-#: index.php:429
+#: index.php:430
 msgid "List of changes"
 msgstr "خشتەی گۆڕانکارییەکان"
 
-#: index.php:451
+#: index.php:452
 msgid ""
 "You are connected as 'root' with no password, which corresponds to the "
 "default MySQL privileged account. Your MySQL server is running with this "
@@ -853,7 +855,7 @@ msgstr ""
 "دواتر پەیوەندییەکە درووست بکەیتەوە بۆ کەمکردنەوەی ئەگەری درووستبوونی "
 "کێشەیەکی پاراستن."
 
-#: index.php:468
+#: index.php:469
 msgid ""
 "You have enabled mbstring.func_overload in your PHP configuration. This "
 "option is incompatible with phpMyAdmin and might cause some data to be "
@@ -863,14 +865,14 @@ msgstr ""
 "درووستی لەگەڵ PhpMyAdmin کار ناکات و لەوانەیە ببێتە هۆکاری تێکچوونی هەندێک "
 "داتای بنکەی دراوە!"
 
-#: index.php:483
+#: index.php:484
 msgid ""
 "The mbstring PHP extension was not found and you seem to be using a "
 "multibyte charset. Without the mbstring extension phpMyAdmin is unable to "
 "split strings correctly and it may result in unexpected results."
 msgstr ""
 
-#: index.php:500
+#: index.php:501
 msgid ""
 "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini."
 "session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower than "
@@ -878,18 +880,18 @@ msgid ""
 "expire sooner than configured in phpMyAdmin."
 msgstr ""
 
-#: index.php:519
+#: index.php:520
 msgid ""
 "Login cookie store is lower than cookie validity configured in phpMyAdmin, "
 "because of this, your login will expire sooner than configured in phpMyAdmin."
 msgstr ""
 
-#: index.php:535
+#: index.php:536
 msgid "The configuration file now needs a secret passphrase (blowfish_secret)."
 msgstr ""
 "پەڕگەی ڕێکخستنەکان ئێستا پێویستی بە وشەیەکی نهێنی هەیە (blowfish_secret)."
 
-#: index.php:548
+#: index.php:549
 msgid ""
 "Directory [code]config[/code], which is used by the setup script, still "
 "exists in your phpMyAdmin directory. It is strongly recommended to remove it "
@@ -902,7 +904,7 @@ msgstr ""
 "تکایە بوخچەی ناوبراو بسڕنەوە ئەگەر دامەزراندنی PhpMyAdmin بە سەرکەوتوویی "
 "کۆتایی هاتووە."
 
-#: index.php:564
+#: index.php:565
 #, fuzzy, php-format
 #| msgid ""
 #| "The phpMyAdmin configuration storage has been deactivated. To find out "
@@ -914,12 +916,12 @@ msgstr ""
 "ڕێکخستنەکانی بیرگەی phpMyAdmin ناچالاک کراوە. بۆ دۆزینەوەی کلیک لەمە بکە "
 "%shere%s."
 
-#: index.php:571
+#: index.php:572
 msgid ""
 "Or alternately go to 'Operations' tab of any database to set it up there."
 msgstr "یان دەتوانیت لە تابی کرداری هەر بنکەی دراوەیەکدا ڕێکی بخەیت"
 
-#: index.php:620
+#: index.php:621
 #, php-format
 msgid ""
 "Your PHP MySQL library version %s differs from your MySQL server version %s. "
@@ -928,7 +930,7 @@ msgstr ""
 "وەشانی MySQL ی تایبەت بە PHP ڕاژەکارەکەت  %s جیاوازیی هەیە لەگەڵ وەشانی "
 "ڕاژەکاری MySQL %s. ئەوەش لەوانەیە ببێتە هۆکاری ناسەقامگیری لە کارەکاندا."
 
-#: index.php:648
+#: index.php:649
 #, php-format
 msgid ""
 "Server running with Suhosin. Please refer to %sdocumentation%s for possible "
@@ -1080,8 +1082,8 @@ msgstr ""
 msgid "Save & Close"
 msgstr "پاشەکەوتکردن و داخستن"
 
-#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:404
-#: libraries/insert_edit.lib.php:1550 prefs_manage.php:361
+#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:415
+#: libraries/insert_edit.lib.php:1548 prefs_manage.php:361
 #: prefs_manage.php:372
 msgid "Reset"
 msgstr "سەرلەنوێ"
@@ -1114,7 +1116,7 @@ msgstr "زیادکردنی نیشاندەر"
 msgid "Edit Index"
 msgstr "چاکردنی نیشاندەر"
 
-#: js/messages.php:99 templates/index_form.phtml:232
+#: js/messages.php:99 templates/table/index_form.phtml:232
 #, php-format
 msgid "Add %s column(s) to index"
 msgstr "خانەکانی %s زۆر بکە بۆ پێڕست"
@@ -1135,13 +1137,14 @@ msgstr ""
 msgid "Please select column(s) for the index."
 msgstr "خانە هەڵبژێرە بۆ پێڕست."
 
-#: js/messages.php:106 templates/structure/add_column.phtml:1
+#: js/messages.php:106 templates/table/structure/add_column.phtml:1
 msgid "You have to add at least one column."
 msgstr "پێویستە بە لانی کەم یەک خانە درووست بکەیت."
 
-#: js/messages.php:109 libraries/insert_edit.lib.php:1548
+#: js/messages.php:109 libraries/insert_edit.lib.php:1546
 #: templates/columns_definitions/column_definitions_form.phtml:162
-#: templates/index_form.phtml:237 templates/tbl_relation/common_form.phtml:106
+#: templates/table/index_form.phtml:237
+#: templates/table/relation/common_form.phtml:106
 msgid "Preview SQL"
 msgstr "پێشاندانی SQL"
 
@@ -1162,7 +1165,7 @@ msgid "SQL query:"
 msgstr "داواکاری سیكوێڵ"
 
 #. l10n: Default label for the y-Axis of Charts
-#: js/messages.php:118 templates/tbl_chart.phtml:109
+#: js/messages.php:118 templates/table/chart/tbl_chart.phtml:109
 msgid "Y Values"
 msgstr "نرخەکانی Y"
 
@@ -1317,7 +1320,7 @@ msgstr "بایت نێردرا"
 msgid "Bytes received"
 msgstr "بایت وەرگیرا"
 
-#: js/messages.php:169 libraries/server_status.lib.php:226
+#: js/messages.php:169 libraries/server_status.lib.php:235
 msgid "Connections"
 msgstr "بەستنەکان"
 
@@ -1374,12 +1377,12 @@ msgstr "%d خشتە(کان)"
 msgid "Questions"
 msgstr "پرسیارەکان"
 
-#: js/messages.php:184 libraries/server_status.lib.php:134
+#: js/messages.php:184 libraries/server_status.lib.php:143
 msgid "Traffic"
 msgstr "هاتووچوو"
 
 #: js/messages.php:185 libraries/Menu.class.php:586
-#: libraries/Util.class.php:4318 libraries/server_status_monitor.lib.php:257
+#: libraries/Util.class.php:4324 libraries/server_status_monitor.lib.php:257
 msgid "Settings"
 msgstr "ڕێکخستنەکان"
 
@@ -1401,8 +1404,9 @@ msgstr "تکایە لانی کەم یەک گۆڕاو بۆ زنجیرەکە زی
 #: libraries/server_status_monitor.lib.php:236
 #: libraries/server_status_processes.lib.php:308
 #: templates/columns_definitions/transformation.phtml:4
-#: templates/designer/options_panel.phtml:178
-#: templates/table/options_zoom.phtml:12 templates/table/rows_zoom.phtml:26
+#: templates/database/designer/options_panel.phtml:178
+#: templates/table/search/options_zoom.phtml:12
+#: templates/table/search/rows_zoom.phtml:26
 msgid "None"
 msgstr "هیچ"
 
@@ -1677,8 +1681,8 @@ msgstr ""
 
 #: js/messages.php:270 libraries/Menu.class.php:352
 #: libraries/Menu.class.php:455 libraries/Menu.class.php:582
-#: libraries/Util.class.php:4317 libraries/Util.class.php:4332
-#: libraries/Util.class.php:4349 libraries/config/messages.inc.php:258
+#: libraries/Util.class.php:4323 libraries/Util.class.php:4338
+#: libraries/Util.class.php:4355 libraries/config/messages.inc.php:258
 #: libraries/display_import.lib.php:105
 #: libraries/server_status_monitor.lib.php:318 prefs_manage.php:238
 #: setup/frames/menu.inc.php:26
@@ -1738,13 +1742,13 @@ msgid "Formatting SQL..."
 msgstr ""
 
 #: js/messages.php:293 libraries/server_variables.lib.php:157
-#: templates/designer/aggregate_query_panel.phtml:63
-#: templates/designer/delete_relation_panel.phtml:28
-#: templates/designer/having_query_panel.phtml:117
-#: templates/designer/new_relation_panel.phtml:88
-#: templates/designer/options_panel.phtml:253
-#: templates/designer/rename_to_panel.phtml:45
-#: templates/designer/where_query_panel.phtml:83
+#: templates/database/designer/aggregate_query_panel.phtml:63
+#: templates/database/designer/delete_relation_panel.phtml:28
+#: templates/database/designer/having_query_panel.phtml:117
+#: templates/database/designer/new_relation_panel.phtml:88
+#: templates/database/designer/options_panel.phtml:253
+#: templates/database/designer/rename_to_panel.phtml:45
+#: templates/database/designer/where_query_panel.phtml:83
 msgid "Cancel"
 msgstr "لابردن"
 
@@ -1754,7 +1758,7 @@ msgstr "لابردن"
 msgid "Page-related settings"
 msgstr "گۆڕینی ڕێکخستنەکان"
 
-#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:402
+#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:413
 msgid "Apply"
 msgstr ""
 
@@ -1789,8 +1793,8 @@ msgstr "هەڵەی کۆد: %s"
 msgid "Error text: %s"
 msgstr "هەڵەی نوسین: %s"
 
-#: js/messages.php:307 libraries/db_common.inc.php:68
-#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:450
+#: js/messages.php:307 libraries/db_common.inc.php:69
+#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:461
 msgid "No databases selected."
 msgstr "هیچ بنکەیەکی زانیاری هەڵنەبژێراوە."
 
@@ -1802,12 +1806,13 @@ msgstr "ستونە سڕێنراوەکان"
 msgid "Adding Primary Key"
 msgstr "زیادکردنی کلیلی سەرەکی"
 
-#: js/messages.php:310 templates/designer/aggregate_query_panel.phtml:59
-#: templates/designer/having_query_panel.phtml:113
-#: templates/designer/new_relation_panel.phtml:87
-#: templates/designer/options_panel.phtml:252
-#: templates/designer/rename_to_panel.phtml:41
-#: templates/designer/where_query_panel.phtml:82
+#: js/messages.php:310
+#: templates/database/designer/aggregate_query_panel.phtml:59
+#: templates/database/designer/having_query_panel.phtml:113
+#: templates/database/designer/new_relation_panel.phtml:87
+#: templates/database/designer/options_panel.phtml:252
+#: templates/database/designer/rename_to_panel.phtml:41
+#: templates/database/designer/where_query_panel.phtml:82
 msgid "OK"
 msgstr "باشە"
 
@@ -1827,7 +1832,7 @@ msgstr "لەبەرگرتنەوەی بنکەی دراو"
 msgid "Changing Charset"
 msgstr "گۆڕینی گورزەپیت"
 
-#: js/messages.php:320 libraries/Util.class.php:3217
+#: js/messages.php:320 libraries/Util.class.php:3223
 msgid "Enable foreign key checks"
 msgstr ""
 
@@ -1862,20 +1867,21 @@ msgstr "پێناسەی فرمانی پاشەکەوتکراو پێویستە دە
 #: js/messages.php:334 libraries/DisplayResults.class.php:4834
 #: libraries/DisplayResults.class.php:5092 libraries/Menu.class.php:344
 #: libraries/Menu.class.php:446 libraries/Menu.class.php:578
-#: libraries/Util.class.php:3636 libraries/Util.class.php:3637
-#: libraries/Util.class.php:4316 libraries/Util.class.php:4331
-#: libraries/Util.class.php:4348 libraries/config/messages.inc.php:252
+#: libraries/Util.class.php:3642 libraries/Util.class.php:3643
+#: libraries/Util.class.php:4322 libraries/Util.class.php:4337
+#: libraries/Util.class.php:4354 libraries/config/messages.inc.php:252
 #: libraries/display_export.lib.php:173 libraries/rte/rte_list.lib.php:146
 #: libraries/server_privileges.lib.php:2211
 #: libraries/server_privileges.lib.php:2290
 #: libraries/server_privileges.lib.php:2632
 #: libraries/server_privileges.lib.php:3356
 #: libraries/server_status_monitor.lib.php:322 prefs_manage.php:303
-#: setup/frames/menu.inc.php:27 templates/structure/check_all_tables.phtml:11
+#: setup/frames/menu.inc.php:27
+#: templates/database/structure/check_all_tables.phtml:11
 msgid "Export"
 msgstr "هەناردن"
 
-#: js/messages.php:337 libraries/rte/rte_routines.lib.php:652
+#: js/messages.php:337 libraries/rte/rte_routines.lib.php:743
 msgid "ENUM/SET editor"
 msgstr "گۆڕەری ENUM/SET"
 
@@ -1916,7 +1922,7 @@ msgstr "پێشاندانی سندوقی داواکاری"
 #: libraries/Console.class.php:214 libraries/DisplayResults.class.php:3474
 #: libraries/DisplayResults.class.php:4818 libraries/Index.class.php:723
 #: libraries/Util.class.php:706 libraries/Util.class.php:1202
-#: libraries/Util.class.php:3634 libraries/Util.class.php:3635
+#: libraries/Util.class.php:3640 libraries/Util.class.php:3641
 #: libraries/central_columns.lib.php:851
 #: libraries/central_columns.lib.php:1193
 #: libraries/config/messages.inc.php:892
@@ -1934,7 +1940,7 @@ msgstr "چاکردن"
 #: libraries/server_user_groups.lib.php:129
 #: libraries/sql_query_form.lib.php:416 libraries/tracking.lib.php:477
 #: setup/frames/index.inc.php:183 setup/frames/index.inc.php:291
-#: templates/designer/delete_relation_panel.phtml:27
+#: templates/database/designer/delete_relation_panel.phtml:27
 msgid "Delete"
 msgstr "سڕینەوە"
 
@@ -2100,11 +2106,11 @@ msgid "No dependencies selected!"
 msgstr "هیچ بنکەیەکی زانیاری هەڵنەبژێراوە."
 
 #: js/messages.php:394 libraries/central_columns.lib.php:1214
-#: libraries/insert_edit.lib.php:1458 libraries/server_variables.lib.php:155
+#: libraries/insert_edit.lib.php:1456 libraries/server_variables.lib.php:155
 #: setup/frames/config.inc.php:42 setup/frames/index.inc.php:279
 #: templates/columns_definitions/column_definitions_form.phtml:165
-#: templates/gis_visualization/gis_visualization.phtml:48
-#: templates/tbl_relation/common_form.phtml:107
+#: templates/table/gis_visualization/gis_visualization.phtml:48
+#: templates/table/relation/common_form.phtml:107
 msgid "Save"
 msgstr "پاشەکەوتکردن"
 
@@ -2191,8 +2197,8 @@ msgid "Data point content"
 msgstr "ناوەڕۆکی زانیاری خاڵ"
 
 #: js/messages.php:430 js/messages.php:562 js/messages.php:579
-#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2573
-#: templates/index_form.phtml:154 templates/index_form.phtml:194
+#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2571
+#: templates/table/index_form.phtml:154 templates/table/index_form.phtml:194
 msgid "Ignore"
 msgstr "فەرامۆشکردن"
 
@@ -2251,8 +2257,8 @@ msgstr ""
 msgid "Please select the primary key or a unique key!"
 msgstr ""
 
-#: js/messages.php:457 templates/designer/side_menu.phtml:91
-#: templates/designer/side_menu.phtml:94
+#: js/messages.php:457 templates/database/designer/side_menu.phtml:91
+#: templates/database/designer/side_menu.phtml:94
 msgid "Choose column to display"
 msgstr ""
 
@@ -2266,20 +2272,20 @@ msgstr ""
 msgid "Page name"
 msgstr ""
 
-#: js/messages.php:463 templates/designer/side_menu.phtml:56
-#: templates/designer/side_menu.phtml:59
+#: js/messages.php:463 templates/database/designer/side_menu.phtml:56
+#: templates/database/designer/side_menu.phtml:59
 msgid "Save page"
 msgstr "پاشەکەوتکردنی پەڕە"
 
-#: js/messages.php:464 templates/designer/side_menu.phtml:63
-#: templates/designer/side_menu.phtml:66
+#: js/messages.php:464 templates/database/designer/side_menu.phtml:63
+#: templates/database/designer/side_menu.phtml:66
 #, fuzzy
 #| msgid "Save"
 msgid "Save page as"
 msgstr "پاشەکەوتکردن"
 
-#: js/messages.php:465 templates/designer/side_menu.phtml:49
-#: templates/designer/side_menu.phtml:52
+#: js/messages.php:465 templates/database/designer/side_menu.phtml:49
+#: templates/database/designer/side_menu.phtml:52
 msgid "Open page"
 msgstr "کردنەوەی پەڕە"
 
@@ -2287,7 +2293,7 @@ msgstr "کردنەوەی پەڕە"
 msgid "Delete page"
 msgstr "سڕینەوەی پەڕە"
 
-#: js/messages.php:467 templates/designer/side_menu.phtml:10
+#: js/messages.php:467 templates/database/designer/side_menu.phtml:10
 msgid "Untitled"
 msgstr "بێناو"
 
@@ -2404,7 +2410,7 @@ msgstr "ڕیزبه‌ندی هێڵی"
 msgid "cancel"
 msgstr "واژلێهێنان"
 
-#: js/messages.php:499 libraries/server_status.lib.php:271
+#: js/messages.php:499 libraries/server_status.lib.php:280
 msgid "Aborted"
 msgstr "پووچەڵ کرایەوە"
 
@@ -3006,7 +3012,7 @@ msgstr "%d ژمارەی ڕیزی نادروستە."
 
 #: js/messages.php:793 libraries/Message.class.php:199
 #: libraries/Util.class.php:654 libraries/core.lib.php:245
-#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1172
+#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1170
 #: tbl_operations.php:229 view_operations.php:63
 msgid "Error"
 msgstr "هەڵە"
@@ -3065,8 +3071,8 @@ msgstr "لە چرکەیەک دا"
 msgid "per minute"
 msgstr "لە خولەکێک دا"
 
-#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:143
-#: libraries/server_status.lib.php:228
+#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:152
+#: libraries/server_status.lib.php:237
 #: libraries/server_status_queries.lib.php:98
 msgid "per hour"
 msgstr "لە کاتژمێرێکدا"
@@ -3084,7 +3090,7 @@ msgstr ""
 msgid "Wrong permissions on configuration file, should not be world writable!"
 msgstr ""
 
-#: libraries/Config.class.php:1799
+#: libraries/Config.class.php:1801
 msgid "Font size"
 msgstr "قەبارەی فۆنت"
 
@@ -3114,10 +3120,10 @@ msgstr "داواکاری"
 #: libraries/server_privileges.lib.php:2890
 #: libraries/server_privileges.lib.php:3144
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4332
+#: libraries/server_privileges.lib.php:4358
 #: libraries/server_status_processes.lib.php:80
-#: templates/tbl_relation/foreign_key_row.phtml:165
-#: templates/tbl_relation/internal_relational_row.phtml:55
+#: templates/table/relation/foreign_key_row.phtml:165
+#: templates/table/relation/internal_relational_row.phtml:55
 msgid "Database"
 msgstr "بنکەی دراو"
 
@@ -3224,11 +3230,11 @@ msgstr ""
 #: libraries/plugins/import/ImportMediawiki.class.php:60
 #: libraries/plugins/import/ImportOds.class.php:59
 #: libraries/plugins/import/ImportShp.class.php:57
-#: libraries/plugins/import/ImportSql.class.php:148
+#: libraries/plugins/import/ImportSql.class.php:51
 #: libraries/plugins/import/ImportXml.class.php:58
-#: libraries/rte/rte_routines.lib.php:833 templates/index_form.phtml:49
-#: templates/structure/row_stats_table.phtml:20
-#: templates/table/options.phtml:2
+#: libraries/rte/rte_routines.lib.php:924 templates/table/index_form.phtml:49
+#: templates/table/search/options.phtml:2
+#: templates/table/structure/row_stats_table.phtml:20
 msgid "Options"
 msgstr "هەڵبژاردنەکان"
 
@@ -3273,7 +3279,8 @@ msgstr "لە کۆتایی بۆ سەرەتا"
 msgid "Order:"
 msgstr "هیتر"
 
-#: libraries/Console.class.php:289 templates/table/replace_preview.phtml:17
+#: libraries/Console.class.php:289
+#: templates/table/search/replace_preview.phtml:17
 #, fuzzy
 #| msgid "Column"
 msgid "Count"
@@ -3391,9 +3398,9 @@ msgstr "بڕۆ بۆ بنکەی دراوەی ڕوونووس کراو"
 #: libraries/operations.lib.php:794 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:191
-#: templates/structure/sortable_header.phtml:21
-#: templates/structure/sortable_header.phtml:38
-#: templates/table/options.phtml:68
+#: templates/database/structure/sortable_header.phtml:21
+#: templates/database/structure/sortable_header.phtml:38
+#: templates/table/search/options.phtml:68
 msgid "Ascending"
 msgstr "لە سەرەتاوە بۆ کۆتایی"
 
@@ -3403,13 +3410,14 @@ msgstr "لە سەرەتاوە بۆ کۆتایی"
 #: libraries/operations.lib.php:797 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:188
-#: templates/structure/sortable_header.phtml:26
-#: templates/structure/sortable_header.phtml:43
-#: templates/table/options.phtml:69
+#: templates/database/structure/sortable_header.phtml:26
+#: templates/database/structure/sortable_header.phtml:43
+#: templates/table/search/options.phtml:69
 msgid "Descending"
 msgstr "لە کۆتایی بۆ سەرەتا"
 
-#: libraries/DBQbe.class.php:467 templates/table/search_and_replace.phtml:6
+#: libraries/DBQbe.class.php:467
+#: templates/table/search/search_and_replace.phtml:6
 #, fuzzy
 #| msgid "Column"
 msgid "Column:"
@@ -3588,12 +3596,12 @@ msgstr[0] ""
 msgstr[1] ""
 
 #: libraries/DbSearch.class.php:354 libraries/Menu.class.php:311
-#: libraries/Util.class.php:3337 libraries/Util.class.php:3347
-#: libraries/Util.class.php:3623 libraries/Util.class.php:3624
-#: libraries/Util.class.php:4343 libraries/config.values.php:43
+#: libraries/Util.class.php:3343 libraries/Util.class.php:3353
+#: libraries/Util.class.php:3629 libraries/Util.class.php:3630
+#: libraries/Util.class.php:4349 libraries/config.values.php:43
 #: libraries/config.values.php:51 libraries/config.values.php:119
 #: libraries/navigation/Nodes/Node_Table.class.php:295
-#: templates/structure/check_all_table_column.phtml:5
+#: templates/table/structure/check_all_table_column.phtml:5
 msgid "Browse"
 msgstr "گەڕۆک"
 
@@ -3610,7 +3618,8 @@ msgstr "گەڕان لە بنکەی دراو"
 msgid "Words or values to search for (wildcard: \"%\"):"
 msgstr ""
 
-#: libraries/DbSearch.class.php:401 templates/table/search_and_replace.phtml:1
+#: libraries/DbSearch.class.php:401
+#: templates/table/search/search_and_replace.phtml:1
 msgid "Find:"
 msgstr "دۆزینەوە:"
 
@@ -3659,28 +3668,28 @@ msgstr "پاڵێو"
 msgid "Search this table"
 msgstr "گەڕان لە بنکەی دراو"
 
-#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2532
-#: libraries/Util.class.php:2535
+#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2538
+#: libraries/Util.class.php:2541
 msgctxt "First page"
 msgid "Begin"
 msgstr "دەسپێکردن"
 
-#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2533
-#: libraries/Util.class.php:2536 libraries/server_bin_log.lib.php:170
+#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2539
+#: libraries/Util.class.php:2542 libraries/server_bin_log.lib.php:170
 #: libraries/server_bin_log.lib.php:172
 msgctxt "Previous page"
 msgid "Previous"
 msgstr "پێشتر"
 
-#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2564
-#: libraries/Util.class.php:2574 libraries/server_bin_log.lib.php:204
+#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2570
+#: libraries/Util.class.php:2580 libraries/server_bin_log.lib.php:204
 #: libraries/server_bin_log.lib.php:206
 msgctxt "Next page"
 msgid "Next"
 msgstr "دواتر"
 
-#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2565
-#: libraries/Util.class.php:2575
+#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2571
+#: libraries/Util.class.php:2581
 msgctxt "Last page"
 msgid "End"
 msgstr "کۆتایی"
@@ -3757,9 +3766,9 @@ msgid "May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]."
 msgstr ""
 
 #: libraries/DisplayResults.class.php:4332 libraries/Message.class.php:180
-#: libraries/controllers/TableRelationController.class.php:258
+#: libraries/controllers/TableRelationController.class.php:259
 #: libraries/controllers/TableSearchController.class.php:655
-#: libraries/rte/rte_routines.lib.php:1332 libraries/sql_query_form.lib.php:89
+#: libraries/rte/rte_routines.lib.php:1423 libraries/sql_query_form.lib.php:89
 #: tbl_operations.php:227 tbl_row_action.php:138 view_operations.php:62
 #, fuzzy
 #| msgid "Your SQL query has been executed successfully."
@@ -3767,7 +3776,7 @@ msgid "Your SQL query has been executed successfully."
 msgstr "سیكوێڵ کیوریەکەت بەسەرکەوتوویی ئەنجامدرا"
 
 #: libraries/DisplayResults.class.php:4660
-#: libraries/controllers/StructureController.class.php:629
+#: libraries/controllers/DatabaseStructureController.class.php:564
 #, php-format
 msgid ""
 "This view has at least this number of rows. Please refer to %sdocumentation"
@@ -3793,34 +3802,34 @@ msgstr ""
 msgid "%d total"
 msgstr "سەرجەم"
 
-#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1318
+#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1312
 #, fuzzy, php-format
 #| msgid "Query took %01.4f sec"
 msgid "Query took %01.4f seconds."
 msgstr "داواکاریەکە %01.4f چرکەی خایاند"
 
 #: libraries/DisplayResults.class.php:4807
-#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4767
-#: libraries/Util.class.php:4773 libraries/mult_submits.inc.php:50
-#: templates/structure/check_all_tables.phtml:2
-#: templates/structure/check_all_tables.phtml:9
+#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4773
+#: libraries/Util.class.php:4779 libraries/mult_submits.inc.php:50
+#: templates/database/structure/check_all_tables.phtml:2
+#: templates/database/structure/check_all_tables.phtml:9
 msgid "With selected:"
 msgstr "لەگەڵ پەڕگەی دەستنیشانکراو:"
 
 #: libraries/DisplayResults.class.php:4811
-#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4769
-#: libraries/Util.class.php:4770 libraries/server_privileges.lib.php:1174
+#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4775
+#: libraries/Util.class.php:4776 libraries/server_privileges.lib.php:1174
 #: libraries/server_privileges.lib.php:1175
 #: libraries/server_privileges.lib.php:1387
 #: libraries/server_user_groups.lib.php:231
-#: templates/structure/check_all_tables.phtml:3
-#: templates/structure/check_all_tables.phtml:4
+#: templates/database/structure/check_all_tables.phtml:3
+#: templates/database/structure/check_all_tables.phtml:4
 msgid "Check All"
 msgstr "هەڵبژاردنی هەموو"
 
 #: libraries/DisplayResults.class.php:4985 libraries/Header.class.php:383
-#: templates/structure/optional_action_links.phtml:1
-#: templates/structure/print_view_data_dictionary_link.phtml:3
+#: templates/database/structure/print_view_data_dictionary_link.phtml:3
+#: templates/table/structure/optional_action_links.phtml:1
 msgid "Print view"
 msgstr "پێشاندان بۆ چاپکردن"
 
@@ -3828,7 +3837,8 @@ msgstr "پێشاندان بۆ چاپکردن"
 msgid "Query results operations"
 msgstr "کردارەکانی ئەنجامی داواکاری"
 
-#: libraries/DisplayResults.class.php:5105 templates/tbl_chart.phtml:12
+#: libraries/DisplayResults.class.php:5105
+#: templates/table/chart/tbl_chart.phtml:12
 msgid "Display chart"
 msgstr "پێشاندانی هێلکاری"
 
@@ -3925,7 +3935,7 @@ msgid "Click on the bar to scroll to top of page"
 msgstr ""
 
 #: libraries/Header.class.php:749
-#: libraries/plugins/auth/AuthenticationCookie.class.php:152
+#: libraries/plugins/auth/AuthenticationCookie.class.php:140
 msgid "Javascript must be enabled past this point!"
 msgstr ""
 
@@ -3947,11 +3957,11 @@ msgid "Keyname"
 msgstr "کلیلەناو"
 
 #: libraries/Index.class.php:697
-#: libraries/controllers/StructureController.class.php:1962
-#: libraries/controllers/StructureController.class.php:1967
+#: libraries/controllers/TableStructureController.class.php:953
+#: libraries/controllers/TableStructureController.class.php:958
 #: libraries/tracking.lib.php:973
 #: templates/columns_definitions/column_indexes.phtml:11
-#: templates/structure/check_all_table_column.phtml:26
+#: templates/table/structure/check_all_table_column.phtml:26
 msgid "Unique"
 msgstr "بێهاوتا"
 
@@ -3970,16 +3980,17 @@ msgstr ""
 #: libraries/server_collations.lib.php:35 libraries/tracking.lib.php:881
 #: libraries/tracking.lib.php:977
 #: templates/columns_definitions/table_fields_definitions.phtml:33
-#: templates/structure/row_stats_table.phtml:31
-#: templates/structure/table_header.phtml:55
-#: templates/structure/table_structure_header.phtml:7
-#: templates/table/table_header.phtml:8
+#: templates/database/structure/table_header.phtml:55
+#: templates/table/search/table_header.phtml:8
+#: templates/table/structure/row_stats_table.phtml:31
+#: templates/table/structure/table_structure_header.phtml:7
 msgid "Collation"
 msgstr "ڕێکخستن"
 
 #: libraries/Index.class.php:703 libraries/rte/rte_events.lib.php:496
-#: libraries/rte/rte_routines.lib.php:956 libraries/tracking.lib.php:885
-#: libraries/tracking.lib.php:979 templates/structure/table_header.phtml:84
+#: libraries/rte/rte_routines.lib.php:1047 libraries/tracking.lib.php:885
+#: libraries/tracking.lib.php:979
+#: templates/database/structure/table_header.phtml:84
 msgid "Comment"
 msgstr "لێدوان"
 
@@ -3992,15 +4003,15 @@ msgstr ""
 msgid "Index %s has been dropped."
 msgstr ""
 
-#: libraries/Index.class.php:757 libraries/Util.class.php:3630
-#: libraries/Util.class.php:3631
-#: libraries/controllers/StructureController.class.php:1958
-#: libraries/controllers/StructureController.class.php:1959
+#: libraries/Index.class.php:757 libraries/Util.class.php:3636
+#: libraries/Util.class.php:3637
+#: libraries/controllers/TableStructureController.class.php:949
+#: libraries/controllers/TableStructureController.class.php:950
 #: libraries/operations.lib.php:1607 libraries/rte/rte_list.lib.php:150
 #: libraries/server_databases.lib.php:146
-#: templates/structure/check_all_table_column.phtml:15
-#: templates/structure/check_all_tables.phtml:16
-#: templates/tbl_relation/foreign_key_row.phtml:93
+#: templates/database/structure/check_all_tables.phtml:16
+#: templates/table/relation/foreign_key_row.phtml:93
+#: templates/table/structure/check_all_table_column.phtml:15
 msgid "Drop"
 msgstr "فڕیدان"
 
@@ -4029,16 +4040,16 @@ msgstr "سێرڤەر"
 #: libraries/Menu.class.php:248
 #: libraries/navigation/Nodes/Node_View.class.php:32
 #: libraries/tbl_info.inc.php:63
-#: templates/structure/structure_table_row.phtml:97
-#: templates/structure/structure_table_row.phtml:159
+#: templates/database/structure/structure_table_row.phtml:97
+#: templates/database/structure/structure_table_row.phtml:159
 msgid "View"
 msgstr "نیشاندان"
 
 #: libraries/Menu.class.php:325 libraries/Menu.class.php:429
-#: libraries/Menu.class.php:548 libraries/Util.class.php:3334
-#: libraries/Util.class.php:3344 libraries/Util.class.php:3350
-#: libraries/Util.class.php:4313 libraries/Util.class.php:4328
-#: libraries/Util.class.php:4345 libraries/config.values.php:40
+#: libraries/Menu.class.php:548 libraries/Util.class.php:3340
+#: libraries/Util.class.php:3350 libraries/Util.class.php:3356
+#: libraries/Util.class.php:4319 libraries/Util.class.php:4334
+#: libraries/Util.class.php:4351 libraries/config.values.php:40
 #: libraries/config.values.php:48 libraries/config.values.php:110
 #: libraries/config.values.php:116 libraries/config/messages.inc.php:321
 #: libraries/navigation/Nodes/Node_Table.class.php:292
@@ -4046,19 +4057,19 @@ msgid "SQL"
 msgstr "سیكوێڵ"
 
 #: libraries/Menu.class.php:328 libraries/Menu.class.php:432
-#: libraries/Util.class.php:3335 libraries/Util.class.php:3345
-#: libraries/Util.class.php:3351 libraries/Util.class.php:3625
-#: libraries/Util.class.php:3626 libraries/Util.class.php:4329
-#: libraries/Util.class.php:4346 libraries/config.values.php:41
+#: libraries/Util.class.php:3341 libraries/Util.class.php:3351
+#: libraries/Util.class.php:3357 libraries/Util.class.php:3631
+#: libraries/Util.class.php:3632 libraries/Util.class.php:4335
+#: libraries/Util.class.php:4352 libraries/config.values.php:41
 #: libraries/config.values.php:49 libraries/config.values.php:111
 #: libraries/config.values.php:117
 #: libraries/navigation/Nodes/Node_Table.class.php:286
 msgid "Search"
 msgstr "گەڕان"
 
-#: libraries/Menu.class.php:338 libraries/Util.class.php:3336
-#: libraries/Util.class.php:3346 libraries/Util.class.php:3627
-#: libraries/Util.class.php:3628 libraries/Util.class.php:4347
+#: libraries/Menu.class.php:338 libraries/Util.class.php:3342
+#: libraries/Util.class.php:3352 libraries/Util.class.php:3633
+#: libraries/Util.class.php:3634 libraries/Util.class.php:4353
 #: libraries/config.values.php:42 libraries/config.values.php:50
 #: libraries/config.values.php:118
 #: libraries/navigation/Nodes/Node_Table.class.php:289
@@ -4067,30 +4078,30 @@ msgid "Insert"
 msgstr "تێخستن"
 
 #: libraries/Menu.class.php:362 libraries/Menu.class.php:467
-#: libraries/Util.class.php:4334 libraries/Util.class.php:4350
+#: libraries/Util.class.php:4340 libraries/Util.class.php:4356
 #: libraries/config.values.php:106 libraries/server_common.lib.php:51
 #: libraries/server_privileges.lib.php:2370
 #: libraries/server_privileges.lib.php:3158
-#: libraries/server_privileges.lib.php:4221
+#: libraries/server_privileges.lib.php:4247
 msgid "Privileges"
 msgstr "تایبەتمەندێتیەکان"
 
 #: libraries/Menu.class.php:371 libraries/Menu.class.php:379
-#: libraries/Menu.class.php:459 libraries/Util.class.php:3338
-#: libraries/Util.class.php:3352 libraries/Util.class.php:4333
-#: libraries/Util.class.php:4351 libraries/config.values.php:112
+#: libraries/Menu.class.php:459 libraries/Util.class.php:3344
+#: libraries/Util.class.php:3358 libraries/Util.class.php:4339
+#: libraries/Util.class.php:4357 libraries/config.values.php:112
 #: view_operations.php:92
 msgid "Operations"
 msgstr "کارەکان"
 
 #: libraries/Menu.class.php:384 libraries/Menu.class.php:492
-#: libraries/Util.class.php:4338 libraries/Util.class.php:4352
+#: libraries/Util.class.php:4344 libraries/Util.class.php:4358
 #: libraries/relation.lib.php:255
 msgid "Tracking"
 msgstr ""
 
 #: libraries/Menu.class.php:397 libraries/Menu.class.php:486
-#: libraries/Util.class.php:4337 libraries/Util.class.php:4353
+#: libraries/Util.class.php:4343 libraries/Util.class.php:4359
 #: libraries/navigation/Nodes/Node_Trigger_Container.class.php:24
 #: libraries/plugins/export/ExportHtmlword.class.php:557
 #: libraries/plugins/export/ExportOdt.class.php:685
@@ -4107,16 +4118,16 @@ msgstr ""
 msgid "Database seems to be empty!"
 msgstr "پێدەچێت بنکە زانیاریەکە بەتاڵ بێت!"
 
-#: libraries/Menu.class.php:439 libraries/Util.class.php:4330
+#: libraries/Menu.class.php:439 libraries/Util.class.php:4336
 msgid "Query"
 msgstr "داواکاری"
 
-#: libraries/Menu.class.php:472 libraries/Util.class.php:4335
+#: libraries/Menu.class.php:472 libraries/Util.class.php:4341
 #: libraries/rte/rte_words.lib.php:36
 msgid "Routines"
 msgstr "ڕۆتینەکان"
 
-#: libraries/Menu.class.php:479 libraries/Util.class.php:4336
+#: libraries/Menu.class.php:479 libraries/Util.class.php:4342
 #: libraries/navigation/Nodes/Node_Event_Container.class.php:26
 #: libraries/plugins/export/ExportSql.class.php:940
 #: libraries/plugins/export/ExportXml.class.php:107
@@ -4124,22 +4135,22 @@ msgstr "ڕۆتینەکان"
 msgid "Events"
 msgstr "چالاکیەکان"
 
-#: libraries/Menu.class.php:498 libraries/Util.class.php:4339
+#: libraries/Menu.class.php:498 libraries/Util.class.php:4345
 msgid "Designer"
 msgstr "شێوەساز"
 
-#: libraries/Menu.class.php:507 libraries/Util.class.php:4340
-#: templates/structure/check_all_tables.phtml:35
+#: libraries/Menu.class.php:507 libraries/Util.class.php:4346
+#: templates/database/structure/check_all_tables.phtml:35
 #, fuzzy
 #| msgid "Add columns"
 msgid "Central columns"
 msgstr "ستونەکان زیادبکە"
 
-#: libraries/Menu.class.php:544 libraries/Util.class.php:4312
+#: libraries/Menu.class.php:544 libraries/Util.class.php:4318
 #: libraries/config.values.php:103 libraries/config/messages.inc.php:266
 #: libraries/config/messages.inc.php:341
 #: libraries/navigation/NavigationTree.class.php:1239
-#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4332
+#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4358
 msgid "Databases"
 msgstr "بنکە زانیاریەکان"
 
@@ -4150,34 +4161,34 @@ msgid "User accounts"
 msgstr "بەکارهێنەرەکان"
 
 #: libraries/Menu.class.php:595 libraries/ServerStatusData.class.php:121
-#: libraries/Util.class.php:4319 libraries/server_common.lib.php:36
+#: libraries/Util.class.php:4325 libraries/server_common.lib.php:36
 msgid "Binary log"
 msgstr "تۆماری دوودانەیی"
 
 #: libraries/Menu.class.php:601 libraries/ServerStatusData.class.php:126
-#: libraries/Util.class.php:4320 libraries/server_common.lib.php:42
-#: templates/structure/body_for_table_summary.phtml:10
-#: templates/structure/table_header.phtml:27
+#: libraries/Util.class.php:4326 libraries/server_common.lib.php:42
+#: templates/database/structure/body_for_table_summary.phtml:10
+#: templates/database/structure/table_header.phtml:27
 msgid "Replication"
 msgstr "دووپاتکاری"
 
 #: libraries/Menu.class.php:606 libraries/ServerStatusData.class.php:193
-#: libraries/Util.class.php:4321 libraries/config.values.php:105
+#: libraries/Util.class.php:4327 libraries/config.values.php:105
 #: libraries/server_engines.lib.php:108 libraries/server_engines.lib.php:112
 #: libraries/sql_query_form.lib.php:421
 msgid "Variables"
 msgstr "گۆڕاوەکان"
 
-#: libraries/Menu.class.php:610 libraries/Util.class.php:4322
+#: libraries/Menu.class.php:610 libraries/Util.class.php:4328
 msgid "Charsets"
 msgstr "گورزەپیتەکان"
 
-#: libraries/Menu.class.php:615 libraries/Util.class.php:4323
+#: libraries/Menu.class.php:615 libraries/Util.class.php:4329
 #: libraries/server_common.lib.php:33 libraries/server_plugins.lib.php:27
 msgid "Plugins"
 msgstr "پێوەکراوەکان"
 
-#: libraries/Menu.class.php:626 libraries/Util.class.php:4324
+#: libraries/Menu.class.php:626 libraries/Util.class.php:4330
 msgid "Engines"
 msgstr "بزوێنەرەکان"
 
@@ -4202,7 +4213,7 @@ msgid_plural "%1$d rows inserted."
 msgstr[0] ""
 msgstr[1] ""
 
-#: libraries/PDF.class.php:70 libraries/Util.class.php:2521
+#: libraries/PDF.class.php:70 libraries/Util.class.php:2527
 #: libraries/browse_foreigners.lib.php:327
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:865
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:890
@@ -4227,7 +4238,7 @@ msgid "Could not save favorite table!"
 msgstr "نەتوانرا خشتە تازەکە پاشەکەوت بکرێت"
 
 #: libraries/RecentFavoriteTable.class.php:212
-#: templates/structure/favorite_anchor.phtml:12
+#: templates/database/structure/favorite_anchor.phtml:12
 #, fuzzy
 #| msgid "Remove chart"
 msgid "Remove from Favorites"
@@ -4406,7 +4417,7 @@ msgid ""
 msgstr ""
 
 #: libraries/StorageEngine.class.php:373
-#: templates/structure/body_for_table_summary.phtml:50
+#: templates/database/structure/body_for_table_summary.phtml:50
 #, php-format
 msgid "%s is the default storage engine on this MySQL server."
 msgstr "%s بیرگەی بزوێنەری سەرەکییە لەسەر ڕاژەکاری MySQL."
@@ -4827,10 +4838,10 @@ msgstr ""
 
 #: libraries/Util.class.php:726 libraries/rte/rte_events.lib.php:110
 #: libraries/rte/rte_events.lib.php:119 libraries/rte/rte_events.lib.php:150
-#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:153
-#: libraries/rte/rte_routines.lib.php:162
-#: libraries/rte/rte_routines.lib.php:235
-#: libraries/rte/rte_routines.lib.php:1366
+#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:223
+#: libraries/rte/rte_routines.lib.php:250
+#: libraries/rte/rte_routines.lib.php:372
+#: libraries/rte/rte_routines.lib.php:1457
 #: libraries/rte/rte_triggers.lib.php:86 libraries/rte/rte_triggers.lib.php:95
 #: libraries/rte/rte_triggers.lib.php:127
 msgid "MySQL said: "
@@ -4876,77 +4887,80 @@ msgstr ""
 msgid "%B %d, %Y at %I:%M %p"
 msgstr ""
 
-#: libraries/Util.class.php:2019
+#: libraries/Util.class.php:2025
 #, php-format
 msgid "%s days, %s hours, %s minutes and %s seconds"
 msgstr ""
 
-#: libraries/Util.class.php:2112
+#: libraries/Util.class.php:2118
 msgid "Missing parameter:"
 msgstr "ڕادەی لەدەستچوو:"
 
-#: libraries/Util.class.php:2645
+#: libraries/Util.class.php:2651
 #, php-format
 msgid "Jump to database \"%s\"."
 msgstr ""
 
-#: libraries/Util.class.php:2670
+#: libraries/Util.class.php:2676
 #, php-format
 msgid "The %s functionality is affected by a known bug, see %s"
 msgstr ""
 
-#: libraries/Util.class.php:2881
+#: libraries/Util.class.php:2887
 msgid "Click to toggle"
 msgstr ""
 
-#: libraries/Util.class.php:3542 prefs_manage.php:248
+#: libraries/Util.class.php:3548 prefs_manage.php:248
 msgid "Browse your computer:"
 msgstr ""
 
-#: libraries/Util.class.php:3567
+#: libraries/Util.class.php:3573
 #, php-format
 msgid "Select from the web server upload directory <b>%s</b>:"
 msgstr ""
 
-#: libraries/Util.class.php:3596 libraries/insert_edit.lib.php:1173
+#: libraries/Util.class.php:3602 libraries/insert_edit.lib.php:1171
 msgid "The directory you set for upload work cannot be reached."
 msgstr ""
 
-#: libraries/Util.class.php:3607
+#: libraries/Util.class.php:3613
 #, fuzzy
 #| msgid "There are no recent tables"
 msgid "There are no files to upload!"
 msgstr "هیچ خشتەیەکی تازە نیە"
 
-#: libraries/Util.class.php:3632 libraries/Util.class.php:3633
-#: templates/structure/check_all_tables.phtml:15
+#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: templates/database/structure/check_all_tables.phtml:15
 msgid "Empty"
 msgstr "بەتاڵ"
 
-#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: libraries/Util.class.php:3644 libraries/Util.class.php:3645
 msgid "Execute"
 msgstr ""
 
-#: libraries/Util.class.php:4152
+#: libraries/Util.class.php:4158
 msgid "Print"
 msgstr ""
 
-#: libraries/Util.class.php:4257 templates/structure/row_stats_table.phtml:80
-#: templates/structure/table_header.phtml:95
+#: libraries/Util.class.php:4263
+#: templates/database/structure/table_header.phtml:95
+#: templates/table/structure/row_stats_table.phtml:80
 msgid "Creation"
 msgstr "درووستکردن"
 
-#: libraries/Util.class.php:4263 templates/structure/row_stats_table.phtml:87
-#: templates/structure/table_header.phtml:106
+#: libraries/Util.class.php:4269
+#: templates/database/structure/table_header.phtml:106
+#: templates/table/structure/row_stats_table.phtml:87
 msgid "Last update"
 msgstr "دواترین نوێکردنەوە"
 
-#: libraries/Util.class.php:4269 templates/structure/row_stats_table.phtml:94
-#: templates/structure/table_header.phtml:117
+#: libraries/Util.class.php:4275
+#: templates/database/structure/table_header.phtml:117
+#: templates/table/structure/row_stats_table.phtml:94
 msgid "Last check"
 msgstr "دواترین پشکنین"
 
-#: libraries/Util.class.php:4315
+#: libraries/Util.class.php:4321
 msgid "Users"
 msgstr "بەکارهێنەرەکان"
 
@@ -4967,16 +4981,16 @@ msgid "Use this value"
 msgstr "ئەم نرخە هەڵبژێرە"
 
 #: libraries/build_html_for_db.lib.php:33 libraries/import.lib.php:193
-#: templates/structure/actions_in_table_structure.phtml:113
-#: templates/structure/row_stats_table.phtml:42
-#: templates/structure/table_header.phtml:36
+#: templates/database/structure/table_header.phtml:36
+#: templates/table/structure/actions_in_table_structure.phtml:113
+#: templates/table/structure/row_stats_table.phtml:42
 msgid "Rows"
 msgstr "خانە"
 
 #: libraries/build_html_for_db.lib.php:48 libraries/engines/innodb.lib.php:171
-#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:186
-#: libraries/server_status.lib.php:298
-#: templates/structure/display_table_stats.phtml:40
+#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:195
+#: libraries/server_status.lib.php:307
+#: templates/table/structure/display_table_stats.phtml:40
 msgid "Total"
 msgstr "سەرجەم"
 
@@ -4985,10 +4999,12 @@ msgid "Jump to database"
 msgstr ""
 
 #: libraries/build_html_for_db.lib.php:146
+#: templates/database/structure/structure_table_row.phtml:15
 msgid "Not replicated"
 msgstr ""
 
 #: libraries/build_html_for_db.lib.php:158
+#: templates/database/structure/structure_table_row.phtml:16
 msgid "Replicated"
 msgstr ""
 
@@ -5045,17 +5061,17 @@ msgstr ""
 #: libraries/plugins/export/ExportTexytext.class.php:425
 #: libraries/plugins/export/PMA_ExportPdf.class.php:307
 #: libraries/rte/rte_list.lib.php:73 libraries/rte/rte_list.lib.php:85
-#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:830
-#: libraries/rte/rte_routines.lib.php:1492 setup/frames/index.inc.php:162
+#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:921
+#: libraries/rte/rte_routines.lib.php:1583 setup/frames/index.inc.php:162
 #: templates/columns_definitions/table_fields_definitions.phtml:8
-#: templates/structure/table_structure_header.phtml:5
-#: templates/table/create_table.phtml:11
+#: templates/database/create_table.phtml:11
+#: templates/table/structure/table_structure_header.phtml:5
 msgid "Name"
 msgstr ""
 
 #: libraries/central_columns.lib.php:699
 #: libraries/central_columns.lib.php:1381
-#: libraries/rte/rte_routines.lib.php:832
+#: libraries/rte/rte_routines.lib.php:923
 #: templates/columns_definitions/table_fields_definitions.phtml:14
 msgid "Length/Values"
 msgstr ""
@@ -5078,7 +5094,7 @@ msgid "Select a table"
 msgstr "هەڵبژاردنی هەموو"
 
 #: libraries/central_columns.lib.php:804
-#: templates/structure/add_column.phtml:4
+#: templates/table/structure/add_column.phtml:4
 msgid "Add column"
 msgstr ""
 
@@ -5098,7 +5114,7 @@ msgstr "زیادکردن/سڕینەوەی ستونەکان"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1002
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1025
 #: templates/columns_definitions/table_fields_definitions.phtml:36
-#: templates/structure/table_structure_header.phtml:8
+#: templates/table/structure/table_structure_header.phtml:8
 msgid "Attributes"
 msgstr ""
 
@@ -5214,7 +5230,7 @@ msgid "Double click"
 msgstr ""
 
 #: libraries/config.values.php:95 libraries/config.values.php:124
-#: libraries/config/FormDisplay.tpl.php:221 libraries/relation.lib.php:97
+#: libraries/config/FormDisplay.tpl.php:232 libraries/relation.lib.php:97
 #: libraries/relation.lib.php:105
 msgid "Disabled"
 msgstr ""
@@ -5394,21 +5410,21 @@ msgstr ""
 msgid "maximum %s"
 msgstr ""
 
-#: libraries/config/FormDisplay.tpl.php:219
+#: libraries/config/FormDisplay.tpl.php:230
 msgid "This setting is disabled, it will not be applied to your configuration."
 msgstr ""
 
-#: libraries/config/FormDisplay.tpl.php:313
+#: libraries/config/FormDisplay.tpl.php:324
 #, php-format
 msgid "Set value: %s"
 msgstr ""
 
-#: libraries/config/FormDisplay.tpl.php:318
+#: libraries/config/FormDisplay.tpl.php:329
 #: libraries/config/messages.inc.php:610
 msgid "Restore default value"
 msgstr ""
 
-#: libraries/config/FormDisplay.tpl.php:332
+#: libraries/config/FormDisplay.tpl.php:343
 msgid "Allow users to customize this value"
 msgstr ""
 
@@ -5830,7 +5846,7 @@ msgstr ""
 
 #: libraries/config/messages.inc.php:136 libraries/config/messages.inc.php:152
 #: libraries/sql_query_form.lib.php:247
-#: templates/structure/row_stats_table.phtml:7
+#: templates/table/structure/row_stats_table.phtml:7
 msgid "Format"
 msgstr ""
 
@@ -6347,7 +6363,7 @@ msgstr ""
 
 #: libraries/config/messages.inc.php:332
 #: libraries/plugins/export/ExportPdf.class.php:279
-#: templates/structure/secondary_tabs.phtml:8
+#: templates/table/secondary_tabs.phtml:8
 msgid "Table structure"
 msgstr ""
 
@@ -7894,105 +7910,35 @@ msgstr "Microsoft Word 2000"
 msgid "OpenDocument Text"
 msgstr "به‌ڵگه‌سازی"
 
-#: libraries/controllers/StructureController.class.php:465
+#: libraries/controllers/DatabaseStructureController.class.php:405
 #: tbl_operations.php:382
 #, php-format
 msgid "Table %s has been emptied."
 msgstr "خشتەی %s خاڵی کرا."
 
-#: libraries/controllers/StructureController.class.php:486
+#: libraries/controllers/DatabaseStructureController.class.php:426
 #: tbl_operations.php:400 view_operations.php:119
 #, fuzzy, php-format
 #| msgid "View %s has been dropped."
 msgid "View %s has been dropped."
 msgstr "%s سڕایەوە"
 
-#: libraries/controllers/StructureController.class.php:487
+#: libraries/controllers/DatabaseStructureController.class.php:427
 #: tbl_operations.php:401
 #, fuzzy, php-format
 #| msgid "Table %s has been dropped."
 msgid "Table %s has been dropped."
 msgstr "خشتەی %s سڕایەوە"
 
-#: libraries/controllers/StructureController.class.php:797
-#, php-format
-msgid "The name '%s' is a MySQL reserved keyword."
-msgid_plural "The names '%s' are MySQL reserved keywords."
-msgstr[0] ""
-msgstr[1] ""
-
-#: libraries/controllers/StructureController.class.php:875
-#, fuzzy
-#| msgid "No rows selected"
-msgid "No column selected."
-msgstr "هیچ ڕیزێک هەڵنەبژێراوە"
-
-#: libraries/controllers/StructureController.class.php:1049
+#: libraries/controllers/DatabaseStructureController.class.php:733
 msgid "Favorite List is full!"
 msgstr "لیستی دڵخوازەکان پڕە!"
 
-#: libraries/controllers/StructureController.class.php:1272
-msgid "The columns have been moved successfully."
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1535
-#, php-format
-msgid ""
-"Table %1$s has been altered successfully. Privileges have been adjusted."
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1541
-#: libraries/controllers/TableIndexesController.class.php:161
-#: tbl_addfield.php:92
-#, php-format
-msgid "Table %1$s has been altered successfully."
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1588
-#: libraries/tracking.lib.php:1094
-msgid "Query error"
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1806
+#: libraries/controllers/DatabaseStructureController.class.php:947
 #: libraries/mysql_charsets.lib.php:366 libraries/mysql_charsets.lib.php:373
 msgid "unknown"
 msgstr "نەناسراوە"
 
-#: libraries/controllers/StructureController.class.php:1957
-#: templates/structure/check_all_table_column.phtml:11
-msgid "Change"
-msgstr "گۆڕین"
-
-#: libraries/controllers/StructureController.class.php:1961
-#: libraries/controllers/StructureController.class.php:1966
-#: libraries/navigation/Nodes/Node_Index.class.php:30
-#: libraries/tracking.lib.php:926
-#: templates/columns_definitions/column_indexes.phtml:16
-#: templates/columns_definitions/table_fields_definitions.phtml:57
-#: templates/structure/check_all_table_column.phtml:30
-#: templates/structure/display_structure.phtml:79
-#: templates/structure/display_table_stats.phtml:19
-msgid "Index"
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1963
-#: libraries/controllers/StructureController.class.php:1968
-#: templates/columns_definitions/column_indexes.phtml:27
-#: templates/structure/check_all_table_column.phtml:37
-msgid "Spatial"
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1964
-#: libraries/controllers/StructureController.class.php:1969
-#: templates/columns_definitions/column_indexes.phtml:22
-#: templates/structure/check_all_table_column.phtml:47
-msgid "Fulltext"
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1970
-msgid "Distinct values"
-msgstr ""
-
 #: libraries/controllers/TableChartController.class.php:82
 #: libraries/controllers/TableGisVisualizationController.class.php:101
 msgid "No SQL query was set to fetch data."
@@ -8008,11 +7954,18 @@ msgstr ""
 msgid "No data to display"
 msgstr "هیچ زانیاریەک نەدۆزراوە"
 
-#: libraries/controllers/TableRelationController.class.php:217
+#: libraries/controllers/TableIndexesController.class.php:161
+#: libraries/controllers/TableStructureController.class.php:736
+#: tbl_addfield.php:92
+#, php-format
+msgid "Table %1$s has been altered successfully."
+msgstr ""
+
+#: libraries/controllers/TableRelationController.class.php:218
 msgid "Display column was successfully updated."
 msgstr ""
 
-#: libraries/controllers/TableRelationController.class.php:283
+#: libraries/controllers/TableRelationController.class.php:288
 #, fuzzy
 #| msgid "The row has been deleted."
 msgid "Internal relations were successfully updated."
@@ -8031,12 +7984,75 @@ msgid "Zoom search"
 msgstr "زوومکردنی گەڕان"
 
 #: libraries/controllers/TableSearchController.class.php:852
-#: templates/table/selection_form.phtml:59
+#: templates/table/search/selection_form.phtml:59
 #, fuzzy
 #| msgid "Hide search criteria"
 msgid "Find and replace"
 msgstr "شاردنەوەی پێوانەکانی گەڕان"
 
+#: libraries/controllers/TableStructureController.class.php:163
+#, php-format
+msgid "The name '%s' is a MySQL reserved keyword."
+msgid_plural "The names '%s' are MySQL reserved keywords."
+msgstr[0] ""
+msgstr[1] ""
+
+#: libraries/controllers/TableStructureController.class.php:241
+#, fuzzy
+#| msgid "No rows selected"
+msgid "No column selected."
+msgstr "هیچ ڕیزێک هەڵنەبژێراوە"
+
+#: libraries/controllers/TableStructureController.class.php:467
+msgid "The columns have been moved successfully."
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:730
+#, php-format
+msgid ""
+"Table %1$s has been altered successfully. Privileges have been adjusted."
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:783
+#: libraries/tracking.lib.php:1094
+msgid "Query error"
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:948
+#: templates/table/structure/check_all_table_column.phtml:11
+msgid "Change"
+msgstr "گۆڕین"
+
+#: libraries/controllers/TableStructureController.class.php:952
+#: libraries/controllers/TableStructureController.class.php:957
+#: libraries/navigation/Nodes/Node_Index.class.php:30
+#: libraries/tracking.lib.php:926
+#: templates/columns_definitions/column_indexes.phtml:16
+#: templates/columns_definitions/table_fields_definitions.phtml:57
+#: templates/table/structure/check_all_table_column.phtml:30
+#: templates/table/structure/display_structure.phtml:79
+#: templates/table/structure/display_table_stats.phtml:19
+msgid "Index"
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:954
+#: libraries/controllers/TableStructureController.class.php:959
+#: templates/columns_definitions/column_indexes.phtml:27
+#: templates/table/structure/check_all_table_column.phtml:37
+msgid "Spatial"
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:955
+#: libraries/controllers/TableStructureController.class.php:960
+#: templates/columns_definitions/column_indexes.phtml:22
+#: templates/table/structure/check_all_table_column.phtml:47
+msgid "Fulltext"
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:963
+msgid "Distinct values"
+msgstr ""
+
 #: libraries/core.lib.php:306
 #, php-format
 msgid "The %s extension is missing. Please check your PHP configuration."
@@ -8083,7 +8099,7 @@ msgid "No Password"
 msgstr ""
 
 #: libraries/display_change_password.lib.php:68
-#: libraries/plugins/auth/AuthenticationCookie.class.php:199
+#: libraries/plugins/auth/AuthenticationCookie.class.php:187
 #: libraries/replication_gui.lib.php:422 libraries/replication_gui.lib.php:862
 #: libraries/server_privileges.lib.php:1640
 msgid "Password:"
@@ -8839,12 +8855,12 @@ msgid "Dump has been saved to file %s."
 msgstr "زانیاری وەدەست هاتوو لە فایلی %s پاشەکەوت کرا."
 
 #: libraries/import.lib.php:202 libraries/insert_edit.lib.php:124
-#: libraries/rte/rte_routines.lib.php:1353 libraries/sql.lib.php:1312
+#: libraries/rte/rte_routines.lib.php:1444 libraries/sql.lib.php:1306
 #: tbl_get_field.php:44
 msgid "MySQL returned an empty result set (i.e. zero rows)."
 msgstr ""
 
-#: libraries/import.lib.php:265 libraries/sql.lib.php:1326
+#: libraries/import.lib.php:265 libraries/sql.lib.php:1320
 msgid "[ROLLBACK occurred.]"
 msgstr ""
 
@@ -8908,14 +8924,14 @@ msgstr ""
 
 #: libraries/insert_edit.lib.php:233
 #: libraries/navigation/Nodes/Node_DatabaseChild.class.php:48
-#: templates/designer/table_list.phtml:40
+#: templates/database/designer/table_list.phtml:40
 msgid "Hide"
 msgstr ""
 
 #: libraries/insert_edit.lib.php:249
 #: libraries/navigation/Nodes/Node_Function.class.php:32
-#: libraries/rte/rte_routines.lib.php:1495
-#: templates/table/table_header.phtml:4
+#: libraries/rte/rte_routines.lib.php:1586
+#: templates/table/search/table_header.phtml:4
 msgid "Function"
 msgstr "فرمان"
 
@@ -8928,82 +8944,83 @@ msgstr ""
 msgid "Because of its length,<br /> this column might not be editable."
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1050
+#: libraries/insert_edit.lib.php:1048
 msgid "Binary - do not edit"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1176 libraries/server_privileges.lib.php:470
-#: templates/table/options.phtml:36
+#: libraries/insert_edit.lib.php:1174 libraries/server_privileges.lib.php:470
+#: templates/table/search/options.phtml:36
 msgid "Or"
 msgstr "یان"
 
-#: libraries/insert_edit.lib.php:1177
+#: libraries/insert_edit.lib.php:1175
 msgid "web server upload directory:"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1348 templates/table/input_box.phtml:49
+#: libraries/insert_edit.lib.php:1346
+#: templates/table/search/input_box.phtml:49
 msgid "Edit/Insert"
 msgstr "گۆڕین/تێخستن"
 
-#: libraries/insert_edit.lib.php:1398
+#: libraries/insert_edit.lib.php:1396
 #, php-format
 msgid "Continue insertion with %s rows"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1428
+#: libraries/insert_edit.lib.php:1426
 msgid "and then"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1461
+#: libraries/insert_edit.lib.php:1459
 msgid "Insert as new row"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1464
+#: libraries/insert_edit.lib.php:1462
 msgid "Insert as new row and ignore errors"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1467
+#: libraries/insert_edit.lib.php:1465
 msgid "Show insert query"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1487
+#: libraries/insert_edit.lib.php:1485
 msgid "Go back to previous page"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1490
+#: libraries/insert_edit.lib.php:1488
 msgid "Insert another new row"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1495
+#: libraries/insert_edit.lib.php:1493
 msgid "Go back to this page"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1518
+#: libraries/insert_edit.lib.php:1516
 msgid "Edit next row"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1540
+#: libraries/insert_edit.lib.php:1538
 msgid ""
 "Use TAB key to move from value to value, or CTRL+arrows to move anywhere"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1577 libraries/replication_gui.lib.php:542
-#: libraries/rte/rte_routines.lib.php:1497
+#: libraries/insert_edit.lib.php:1575 libraries/replication_gui.lib.php:542
+#: libraries/rte/rte_routines.lib.php:1588
 #: libraries/server_status_variables.lib.php:220
-#: templates/designer/having_query_panel.phtml:100
-#: templates/designer/options_panel.phtml:73
-#: templates/designer/options_panel.phtml:239
-#: templates/designer/where_query_panel.phtml:69
-#: templates/table/table_header.phtml:10
-#: templates/table/zoom_result_form.phtml:35
+#: templates/database/designer/having_query_panel.phtml:100
+#: templates/database/designer/options_panel.phtml:73
+#: templates/database/designer/options_panel.phtml:239
+#: templates/database/designer/where_query_panel.phtml:69
+#: templates/table/search/table_header.phtml:10
+#: templates/table/search/zoom_result_form.phtml:35
 msgid "Value"
 msgstr "نرخ"
 
-#: libraries/insert_edit.lib.php:1937 libraries/sql.lib.php:1309
+#: libraries/insert_edit.lib.php:1935 libraries/sql.lib.php:1303
 msgid "Showing SQL query"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1962 libraries/sql.lib.php:1287
+#: libraries/insert_edit.lib.php:1960 libraries/sql.lib.php:1281
 #, php-format
 msgid "Inserted row id: %1$d"
 msgstr ""
@@ -9442,7 +9459,7 @@ msgstr ""
 #: libraries/navigation/Nodes/Node_View_Container.class.php:26
 #: libraries/navigation/Nodes/Node_View_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:129
-#: templates/structure/show_create.phtml:30
+#: templates/database/structure/show_create.phtml:30
 msgid "Views"
 msgstr ""
 
@@ -9744,7 +9761,7 @@ msgstr ""
 
 #: libraries/operations.lib.php:101 libraries/operations.lib.php:249
 #: libraries/operations.lib.php:869 libraries/operations.lib.php:963
-#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:907
+#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:998
 #: templates/columns_definitions/table_fields_definitions.phtml:47
 #, fuzzy
 #| msgid "Privileges"
@@ -9838,22 +9855,22 @@ msgid "Switch to copied table"
 msgstr ""
 
 #: libraries/operations.lib.php:1360
-#: templates/structure/check_all_tables.phtml:18
+#: templates/database/structure/check_all_tables.phtml:18
 msgid "Table maintenance"
 msgstr ""
 
 #: libraries/operations.lib.php:1398
-#: templates/structure/check_all_tables.phtml:19
+#: templates/database/structure/check_all_tables.phtml:19
 msgid "Analyze table"
 msgstr "شیکردنەوەى خشتە"
 
 #: libraries/operations.lib.php:1413
-#: templates/structure/check_all_tables.phtml:20
+#: templates/database/structure/check_all_tables.phtml:20
 msgid "Check table"
 msgstr "پشکنینی خشتە"
 
 #: libraries/operations.lib.php:1428
-#: templates/structure/check_all_tables.phtml:22
+#: templates/database/structure/check_all_tables.phtml:22
 #, fuzzy
 #| msgid "Check table"
 msgid "Checksum table"
@@ -9873,18 +9890,19 @@ msgid "Flush the table (FLUSH)"
 msgstr ""
 
 #: libraries/operations.lib.php:1477
-#: templates/structure/check_all_tables.phtml:23
-#: templates/structure/display_table_stats.phtml:56
+#: templates/database/structure/check_all_tables.phtml:23
+#: templates/table/structure/display_table_stats.phtml:56
 msgid "Optimize table"
 msgstr "چاکسازی خشتە"
 
 #: libraries/operations.lib.php:1492
-#: templates/structure/check_all_tables.phtml:24
+#: templates/database/structure/check_all_tables.phtml:24
 msgid "Repair table"
 msgstr "چاکردنی خشتە"
 
 #: libraries/operations.lib.php:1538
-#: templates/structure/check_all_tables.phtml:14 view_operations.php:127
+#: templates/database/structure/check_all_tables.phtml:14
+#: view_operations.php:127
 msgid "Delete data or table"
 msgstr ""
 
@@ -10007,7 +10025,7 @@ msgid "Cannot connect: invalid settings."
 msgstr ""
 
 #: libraries/plugins/auth/AuthenticationConfig.class.php:108
-#: libraries/plugins/auth/AuthenticationCookie.class.php:134
+#: libraries/plugins/auth/AuthenticationCookie.class.php:122
 #: libraries/plugins/auth/AuthenticationHttp.class.php:96
 #, php-format
 msgid "Welcome to %s"
@@ -10032,38 +10050,38 @@ msgstr ""
 msgid "Retry to connect"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:146
+#: libraries/plugins/auth/AuthenticationCookie.class.php:134
 msgid "Your session has expired. Please log in again."
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:170
+#: libraries/plugins/auth/AuthenticationCookie.class.php:158
 msgid "Log in"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:178
-#: libraries/plugins/auth/AuthenticationCookie.class.php:188
+#: libraries/plugins/auth/AuthenticationCookie.class.php:166
+#: libraries/plugins/auth/AuthenticationCookie.class.php:176
 msgid "You can enter hostname/IP address and port separated by space."
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:193
+#: libraries/plugins/auth/AuthenticationCookie.class.php:181
 msgid "Username:"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:205
+#: libraries/plugins/auth/AuthenticationCookie.class.php:193
 #, fuzzy
 #| msgid "Server charset"
 msgid "Server Choice:"
 msgstr "پیتەکانی ڕاژەکار"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:386
+#: libraries/plugins/auth/AuthenticationCookie.class.php:374
 msgid "Entered captcha is wrong, try again!"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:396
+#: libraries/plugins/auth/AuthenticationCookie.class.php:384
 msgid "Please enter correct captcha!"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:423
+#: libraries/plugins/auth/AuthenticationCookie.class.php:411
 #, fuzzy
 #| msgid "Allow login to any MySQL server"
 msgid "You are not allowed to log in to this MySQL server!"
@@ -10161,7 +10179,7 @@ msgstr ""
 #: libraries/plugins/export/ExportOdt.class.php:593
 #: libraries/plugins/export/ExportTexytext.class.php:428
 #: libraries/plugins/export/PMA_ExportPdf.class.php:313
-#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:984
 #: libraries/rte/rte_triggers.lib.php:377
 msgid "Definition"
 msgstr ""
@@ -10476,7 +10494,7 @@ msgid "Last check:"
 msgstr "دواین پشکنین:"
 
 #: libraries/plugins/export/ExportSql.class.php:1399
-#: templates/structure/structure_table_row.phtml:183
+#: templates/database/structure/structure_table_row.phtml:183
 msgid "in use"
 msgstr "بەکار دەبرێت"
 
@@ -10666,18 +10684,14 @@ msgstr ""
 msgid "The imported file does not contain any data!"
 msgstr ""
 
-#: libraries/plugins/import/ImportSql.class.php:169
+#: libraries/plugins/import/ImportSql.class.php:72
 msgid "SQL compatibility mode:"
 msgstr ""
 
-#: libraries/plugins/import/ImportSql.class.php:181
+#: libraries/plugins/import/ImportSql.class.php:84
 msgid "Do not use <code>AUTO_INCREMENT</code> for zero values"
 msgstr ""
 
-#: libraries/plugins/import/ImportSql.class.php:195
-msgid "Read as multibytes"
-msgstr ""
-
 #: libraries/plugins/import/ImportXml.class.php:54
 msgid "XML"
 msgstr ""
@@ -10722,7 +10736,7 @@ msgid "Show grid"
 msgstr ""
 
 #: libraries/plugins/schema/SchemaPdf.class.php:94
-#: templates/structure/print_view_data_dictionary_link.phtml:6
+#: templates/database/structure/print_view_data_dictionary_link.phtml:6
 msgid "Data Dictionary"
 msgstr "فەرهەنگی زانیاریەکان"
 
@@ -10753,7 +10767,7 @@ msgid "The %s table doesn't exist!"
 msgstr ""
 
 #: libraries/plugins/schema/eps/Eps_Relation_Schema.class.php:321
-#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:309
+#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:323
 #, php-format
 msgid "Schema of the %s database - Page %s"
 msgstr ""
@@ -10782,7 +10796,7 @@ msgstr ""
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1005
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1028
 #: libraries/tracking.lib.php:884
-#: templates/structure/table_structure_header.phtml:11
+#: templates/table/structure/table_structure_header.phtml:11
 msgid "Extra"
 msgstr ""
 
@@ -11105,51 +11119,51 @@ msgstr ""
 msgid "Create the needed tables with the <code>%screate_tables.sql</code>."
 msgstr ""
 
-#: libraries/relation.lib.php:360
+#: libraries/relation.lib.php:357
 msgid "Create a pma user and give access to these tables."
 msgstr ""
 
-#: libraries/relation.lib.php:365
+#: libraries/relation.lib.php:360
 msgid ""
 "Enable advanced features in configuration file (<code>config.inc.php</"
 "code>), for example by starting from <code>config.sample.inc.php</code>."
 msgstr ""
 
-#: libraries/relation.lib.php:373
+#: libraries/relation.lib.php:365
 msgid "Re-login to phpMyAdmin to load the updated configuration file."
 msgstr ""
 
-#: libraries/relation.lib.php:1612
+#: libraries/relation.lib.php:1607
 msgid "no description"
 msgstr ""
 
-#: libraries/relation.lib.php:1811
+#: libraries/relation.lib.php:1806
 msgid ""
 "You do not have necessary privileges to create a database named "
 "'phpmyadmin'. You may go to 'Operations' tab of any database to set up the "
 "phpMyAdmin configuration storage there."
 msgstr ""
 
-#: libraries/relation.lib.php:1928
+#: libraries/relation.lib.php:1923
 #, php-format
 msgid ""
 "%sCreate%s a database named 'phpmyadmin' and setup the phpMyAdmin "
 "configuration storage there."
 msgstr ""
 
-#: libraries/relation.lib.php:1936
+#: libraries/relation.lib.php:1931
 #, php-format
 msgid ""
 "%sCreate%s the phpMyAdmin configuration storage in the current database."
 msgstr ""
 
-#: libraries/relation.lib.php:1944
+#: libraries/relation.lib.php:1939
 #, php-format
 msgid "%sCreate%s missing phpMyAdmin configuration storage tables."
 msgstr ""
 
 #: libraries/replication_gui.lib.php:46 libraries/replication_gui.lib.php:343
-#: libraries/server_databases.lib.php:387
+#: libraries/server_databases.lib.php:398
 msgid "Master replication"
 msgstr ""
 
@@ -11204,7 +11218,7 @@ msgid ""
 msgstr ""
 
 #: libraries/replication_gui.lib.php:141
-#: libraries/server_databases.lib.php:389
+#: libraries/server_databases.lib.php:400
 msgid "Slave replication"
 msgstr ""
 
@@ -11473,10 +11487,10 @@ msgid "Master server changed successfully to %s."
 msgstr ""
 
 #: libraries/rte/rte_events.lib.php:106 libraries/rte/rte_events.lib.php:115
-#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:149
-#: libraries/rte/rte_routines.lib.php:158
-#: libraries/rte/rte_routines.lib.php:231
-#: libraries/rte/rte_routines.lib.php:1362
+#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:219
+#: libraries/rte/rte_routines.lib.php:246
+#: libraries/rte/rte_routines.lib.php:368
+#: libraries/rte/rte_routines.lib.php:1453
 #: libraries/rte/rte_triggers.lib.php:82 libraries/rte/rte_triggers.lib.php:91
 #: libraries/rte/rte_triggers.lib.php:123
 #, php-format
@@ -11497,7 +11511,7 @@ msgstr ""
 msgid "Event %1$s has been created."
 msgstr ""
 
-#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:251
+#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:266
 #: libraries/rte/rte_triggers.lib.php:144
 msgid "One or more errors have occurred while processing your request:"
 msgstr ""
@@ -11506,7 +11520,7 @@ msgstr ""
 msgid "Edit event"
 msgstr ""
 
-#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:794
+#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:885
 #: libraries/rte/rte_triggers.lib.php:323 view_create.php:180
 msgid "Details"
 msgstr ""
@@ -11519,7 +11533,7 @@ msgstr ""
 msgid "Event type"
 msgstr ""
 
-#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:817
+#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:908
 #, php-format
 msgid "Change to %s"
 msgstr ""
@@ -11546,12 +11560,14 @@ msgstr ""
 msgid "On completion preserve"
 msgstr ""
 
-#: libraries/rte/rte_events.lib.php:491 libraries/rte/rte_routines.lib.php:930
+#: libraries/rte/rte_events.lib.php:491
+#: libraries/rte/rte_routines.lib.php:1021
 #: libraries/rte/rte_triggers.lib.php:383 view_create.php:209
 msgid "Definer"
 msgstr ""
 
-#: libraries/rte/rte_events.lib.php:535 libraries/rte/rte_routines.lib.php:997
+#: libraries/rte/rte_events.lib.php:535
+#: libraries/rte/rte_routines.lib.php:1088
 #: libraries/rte/rte_triggers.lib.php:422
 msgid "The definer must be in the \"username@hostname\" format!"
 msgstr ""
@@ -11577,9 +11593,9 @@ msgid "You must provide an event definition."
 msgstr ""
 
 #: libraries/rte/rte_export.lib.php:43 libraries/rte/rte_general.lib.php:72
-#: libraries/rte/rte_routines.lib.php:345
-#: libraries/rte/rte_routines.lib.php:1198
-#: libraries/rte/rte_routines.lib.php:1411
+#: libraries/rte/rte_routines.lib.php:153
+#: libraries/rte/rte_routines.lib.php:1289
+#: libraries/rte/rte_routines.lib.php:1502
 #, fuzzy
 #| msgid "Error in Processing Request"
 msgid "Error in processing request:"
@@ -11613,132 +11629,132 @@ msgid ""
 "problems."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:110
-#: libraries/rte/rte_routines.lib.php:1006
+#: libraries/rte/rte_routines.lib.php:123
+msgid "Edit routine"
+msgstr ""
+
+#: libraries/rte/rte_routines.lib.php:200
+#: libraries/rte/rte_routines.lib.php:1097
 #, php-format
 msgid "Invalid routine type: \"%s\""
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:170
-msgid "Sorry, we failed to restore the dropped routine."
-msgstr ""
-
-#: libraries/rte/rte_routines.lib.php:211
-#, php-format
-msgid "Routine %1$s has been modified. Privileges have been adjusted."
-msgstr ""
-
-#: libraries/rte/rte_routines.lib.php:216
-#, php-format
-msgid "Routine %1$s has been modified."
-msgstr ""
-
-#: libraries/rte/rte_routines.lib.php:238
+#: libraries/rte/rte_routines.lib.php:253
 #, php-format
 msgid "Routine %1$s has been created."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:315
-msgid "Edit routine"
+#: libraries/rte/rte_routines.lib.php:380
+msgid "Sorry, we failed to restore the dropped routine."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:797
+#: libraries/rte/rte_routines.lib.php:439
+#, php-format
+msgid "Routine %1$s has been modified. Privileges have been adjusted."
+msgstr ""
+
+#: libraries/rte/rte_routines.lib.php:444
+#, php-format
+msgid "Routine %1$s has been modified."
+msgstr ""
+
+#: libraries/rte/rte_routines.lib.php:888
 msgid "Routine name"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:823
+#: libraries/rte/rte_routines.lib.php:914
 msgid "Parameters"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:829
+#: libraries/rte/rte_routines.lib.php:920
 msgid "Direction"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:847
+#: libraries/rte/rte_routines.lib.php:938
 msgid "Add parameter"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:851
+#: libraries/rte/rte_routines.lib.php:942
 msgid "Remove last parameter"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:856
+#: libraries/rte/rte_routines.lib.php:947
 msgid "Return type"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:862
+#: libraries/rte/rte_routines.lib.php:953
 msgid "Return length/values"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:868
+#: libraries/rte/rte_routines.lib.php:959
 msgid "Return options"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:899
+#: libraries/rte/rte_routines.lib.php:990
 msgid "Is deterministic"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:920
+#: libraries/rte/rte_routines.lib.php:1011
 msgid ""
 "You do not have sufficient privileges to perform this operation; Please "
 "refer to the documentation for more details"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:935
+#: libraries/rte/rte_routines.lib.php:1026
 msgid "Security type"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:944
+#: libraries/rte/rte_routines.lib.php:1035
 msgid "SQL data access"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1013
+#: libraries/rte/rte_routines.lib.php:1104
 msgid "You must provide a routine name!"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1047
+#: libraries/rte/rte_routines.lib.php:1138
 #, php-format
 msgid "Invalid direction \"%s\" given for parameter."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1069
-#: libraries/rte/rte_routines.lib.php:1131
+#: libraries/rte/rte_routines.lib.php:1160
+#: libraries/rte/rte_routines.lib.php:1222
 msgid ""
 "You must provide length/values for routine parameters of type ENUM, SET, "
 "VARCHAR and VARBINARY."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1095
+#: libraries/rte/rte_routines.lib.php:1186
 msgid "You must provide a name and a type for each routine parameter."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1114
+#: libraries/rte/rte_routines.lib.php:1205
 msgid "You must provide a valid return type for the routine."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1174
+#: libraries/rte/rte_routines.lib.php:1265
 msgid "You must provide a routine definition."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1285
+#: libraries/rte/rte_routines.lib.php:1376
 #, php-format
 msgid "Execution results of routine %s"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1340
+#: libraries/rte/rte_routines.lib.php:1431
 #, php-format
 msgid "%d row affected by the last statement inside the procedure."
 msgid_plural "%d rows affected by the last statement inside the procedure."
 msgstr[0] ""
 msgstr[1] ""
 
-#: libraries/rte/rte_routines.lib.php:1398
-#: libraries/rte/rte_routines.lib.php:1406
+#: libraries/rte/rte_routines.lib.php:1489
+#: libraries/rte/rte_routines.lib.php:1497
 msgid "Execute routine"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1485
-#: libraries/rte/rte_routines.lib.php:1488
+#: libraries/rte/rte_routines.lib.php:1576
+#: libraries/rte/rte_routines.lib.php:1579
 msgid "Routine parameters"
 msgstr ""
 
@@ -11894,7 +11910,7 @@ msgid "Original position"
 msgstr ""
 
 #: libraries/server_bin_log.lib.php:133
-#: templates/structure/display_table_stats.phtml:4
+#: templates/table/structure/display_table_stats.phtml:4
 msgid "Information"
 msgstr ""
 
@@ -11930,12 +11946,12 @@ msgid ""
 "between the web server and the MySQL server."
 msgstr ""
 
-#: libraries/server_databases.lib.php:364
-#: libraries/server_databases.lib.php:365
+#: libraries/server_databases.lib.php:366
+#: libraries/server_databases.lib.php:371
 msgid "Enable Statistics"
 msgstr ""
 
-#: libraries/server_databases.lib.php:481
+#: libraries/server_databases.lib.php:492
 #, php-format
 msgid "%1$d database has been dropped successfully."
 msgid_plural "%1$d databases have been dropped successfully."
@@ -12299,7 +12315,7 @@ msgid "You have revoked the privileges for %s."
 msgstr ""
 
 #: libraries/server_privileges.lib.php:2059
-#: libraries/server_privileges.lib.php:4290
+#: libraries/server_privileges.lib.php:4316
 #, fuzzy
 #| msgid "Add user"
 msgid "Add user account"
@@ -12468,57 +12484,57 @@ msgstr ""
 msgid "The privileges were reloaded successfully."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:3994
+#: libraries/server_privileges.lib.php:4003
 #, php-format
 msgid "The user %s already exists!"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4232
+#: libraries/server_privileges.lib.php:4258
 #, php-format
 msgid "Privileges for %s"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4241
+#: libraries/server_privileges.lib.php:4267
 #: libraries/server_status_processes.lib.php:72
 #: libraries/server_user_groups.lib.php:39
 msgid "User"
 msgstr "بەکارهێنەر"
 
-#: libraries/server_privileges.lib.php:4282
+#: libraries/server_privileges.lib.php:4308
 msgctxt "Create new user"
 msgid "New"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4311
+#: libraries/server_privileges.lib.php:4337
 #, fuzzy
 #| msgid "Privileges"
 msgid "Edit privileges:"
 msgstr "تایبەتمەندێتیەکان"
 
-#: libraries/server_privileges.lib.php:4312
+#: libraries/server_privileges.lib.php:4338
 #, fuzzy
 #| msgid "Users"
 msgid "User account"
 msgstr "بەکارهێنەرەکان"
 
-#: libraries/server_privileges.lib.php:4371
+#: libraries/server_privileges.lib.php:4397
 msgid ""
 "Note: You are attempting to edit privileges of the user with which you are "
 "currently logged in."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4391 libraries/server_users.lib.php:25
+#: libraries/server_privileges.lib.php:4417 libraries/server_users.lib.php:25
 msgid "User accounts overview"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4459
+#: libraries/server_privileges.lib.php:4485
 msgid ""
 "A user account allowing any user from localhost to connect is present. This "
 "will prevent other users from connecting if the host part of their account "
 "allows a connection from any (%) host."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4500
+#: libraries/server_privileges.lib.php:4526
 #, php-format
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
@@ -12527,7 +12543,7 @@ msgid ""
 "%sreload the privileges%s before you continue."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4519
+#: libraries/server_privileges.lib.php:4545
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
 "tables. The content of these tables may differ from the privileges the "
@@ -12536,63 +12552,63 @@ msgid ""
 "privilege."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4569
+#: libraries/server_privileges.lib.php:4595
 msgid "The selected user was not found in the privilege table."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4801
+#: libraries/server_privileges.lib.php:4827
 msgid "You have added a new user."
 msgstr ""
 
-#: libraries/server_status.lib.php:53
+#: libraries/server_status.lib.php:60
 #, php-format
 msgid "Network traffic since startup: %s"
 msgstr ""
 
-#: libraries/server_status.lib.php:66
+#: libraries/server_status.lib.php:73
 #, php-format
 msgid "This MySQL server has been running for %1$s. It started up on %2$s."
 msgstr ""
 
-#: libraries/server_status.lib.php:80
+#: libraries/server_status.lib.php:94
 msgid ""
 "This MySQL server works as <b>master</b> and <b>slave</b> in <b>replication</"
 "b> process."
 msgstr ""
 
-#: libraries/server_status.lib.php:85
+#: libraries/server_status.lib.php:99
 msgid "This MySQL server works as <b>master</b> in <b>replication</b> process."
 msgstr ""
 
-#: libraries/server_status.lib.php:90
+#: libraries/server_status.lib.php:104
 msgid "This MySQL server works as <b>slave</b> in <b>replication</b> process."
 msgstr ""
 
-#: libraries/server_status.lib.php:106
+#: libraries/server_status.lib.php:116
 msgid "Replication status"
 msgstr ""
 
-#: libraries/server_status.lib.php:137
+#: libraries/server_status.lib.php:146
 msgid ""
 "On a busy server, the byte counters may overrun, so those statistics as "
 "reported by the MySQL server may be incorrect."
 msgstr ""
 
-#: libraries/server_status.lib.php:148
+#: libraries/server_status.lib.php:157
 msgid "Received"
 msgstr ""
 
-#: libraries/server_status.lib.php:167
+#: libraries/server_status.lib.php:176
 msgid "Sent"
 msgstr ""
 
-#: libraries/server_status.lib.php:234
+#: libraries/server_status.lib.php:243
 #, fuzzy
 #| msgid "Compress connection"
 msgid "Max. concurrent connections"
 msgstr "پەستانی پەیوەندی"
 
-#: libraries/server_status.lib.php:244
+#: libraries/server_status.lib.php:253
 msgid "Failed attempts"
 msgstr ""
 
@@ -13540,7 +13556,7 @@ msgstr ""
 msgid "Not implemented yet."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/AlterOperation.php:193
+#: libraries/sql-parser/src/Components/AlterOperation.php:191
 msgid "Unrecognized alter operation."
 msgstr ""
 
@@ -13554,7 +13570,7 @@ msgid "An opening bracket followed by a set of values was expected."
 msgstr ""
 
 #: libraries/sql-parser/src/Components/ArrayObj.php:101
-#: libraries/sql-parser/src/Components/FieldDefinition.php:202
+#: libraries/sql-parser/src/Components/CreateDefinition.php:202
 msgid "An opening bracket was expected."
 msgstr ""
 
@@ -13562,25 +13578,35 @@ msgstr ""
 msgid "A comma or a closing bracket was expected"
 msgstr ""
 
+#: libraries/sql-parser/src/Components/CreateDefinition.php:246
+#, fuzzy
+#| msgid "No tables selected."
+msgid "A comma or a closing bracket was expected."
+msgstr "هیچ خشتەیەک هەڵنەبژێردراوە."
+
+#: libraries/sql-parser/src/Components/CreateDefinition.php:262
+msgid "A closing bracket was expected."
+msgstr ""
+
 #: libraries/sql-parser/src/Components/DataType.php:125
 msgid "Unrecognized data type."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:225
+#: libraries/sql-parser/src/Components/Expression.php:227
 msgid "Unexpected closing bracket."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:246
-#: libraries/sql-parser/src/Components/Expression.php:283
-#: libraries/sql-parser/src/Components/Expression.php:303
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:285
+#: libraries/sql-parser/src/Components/Expression.php:305
 msgid "An alias was previously found."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:257
+#: libraries/sql-parser/src/Components/Expression.php:259
 msgid "Unexpected dot."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:327
+#: libraries/sql-parser/src/Components/Expression.php:329
 #, fuzzy
 #| msgid "No tables selected."
 msgid "An alias was expected."
@@ -13592,16 +13618,6 @@ msgstr "هیچ خشتەیەک هەڵنەبژێردراوە."
 msgid "An expression was expected."
 msgstr "هیچ ڕیزێک هەڵنەبژێراوە"
 
-#: libraries/sql-parser/src/Components/FieldDefinition.php:246
-#, fuzzy
-#| msgid "No tables selected."
-msgid "A comma or a closing bracket was expected."
-msgstr "هیچ خشتەیەک هەڵنەبژێردراوە."
-
-#: libraries/sql-parser/src/Components/FieldDefinition.php:262
-msgid "A closing bracket was expected."
-msgstr ""
-
 #: libraries/sql-parser/src/Components/Limit.php:90
 #: libraries/sql-parser/src/Components/Limit.php:112
 msgid "An offset was expected."
@@ -13643,26 +13659,26 @@ msgstr ""
 msgid "Expected delimiter."
 msgstr ""
 
-#: libraries/sql-parser/src/Lexer.php:753
+#: libraries/sql-parser/src/Lexer.php:777
 #, php-format
 msgid "Ending quote %1$s was expected."
 msgstr ""
 
-#: libraries/sql-parser/src/Lexer.php:789
+#: libraries/sql-parser/src/Lexer.php:813
 msgid "Variable name was expected."
 msgstr ""
 
-#: libraries/sql-parser/src/Parser.php:380
+#: libraries/sql-parser/src/Parser.php:391
 #, fuzzy
 #| msgid "Number of rows"
 msgid "Unexpected beginning of statement."
 msgstr "ژمارەی ڕیزەکان"
 
-#: libraries/sql-parser/src/Parser.php:399
+#: libraries/sql-parser/src/Parser.php:410
 msgid "Unrecognized statement type."
 msgstr ""
 
-#: libraries/sql-parser/src/Parser.php:479
+#: libraries/sql-parser/src/Parser.php:489
 msgid "No transaction was previously started."
 msgstr ""
 
@@ -13688,8 +13704,10 @@ msgid "The name of the entity was expected."
 msgstr ""
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:310
-msgid "At least one field definition was expected."
-msgstr ""
+#, fuzzy
+#| msgid "The row has been deleted."
+msgid "At least one column definition was expected."
+msgstr "ڕیزەکە سڕایەوە"
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:329
 msgid "A \"RETURNS\" keyword was expected."
@@ -13762,25 +13780,25 @@ msgstr "شوێندۆز  %s دروستکرا"
 msgid "Using bookmark \"%s\" as default browse query."
 msgstr ""
 
-#: libraries/sql.lib.php:1306
+#: libraries/sql.lib.php:1300
 msgid "Showing as PHP code"
 msgstr ""
 
-#: libraries/sql.lib.php:1638
+#: libraries/sql.lib.php:1632
 #, php-format
 msgid ""
 "Current selection does not contain a unique column. Grid edit, checkbox, "
 "Edit, Copy and Delete features are not available. %s"
 msgstr ""
 
-#: libraries/sql.lib.php:1649
+#: libraries/sql.lib.php:1643
 #, php-format
 msgid ""
 "Current selection does not contain a unique column. Grid edit, Edit, Copy "
 "and Delete features may result in undesired behavior. %s"
 msgstr ""
 
-#: libraries/sql.lib.php:1688
+#: libraries/sql.lib.php:1682
 #, php-format
 msgid "Problems with indexes of table `%s`"
 msgstr ""
@@ -13942,7 +13960,7 @@ msgid "Version %s snapshot (SQL code)"
 msgstr ""
 
 #: libraries/tracking.lib.php:947
-#: templates/structure/table_structure_row.phtml:33
+#: templates/table/structure/table_structure_row.phtml:33
 msgctxt "None for default"
 msgid "None"
 msgstr ""
@@ -13994,15 +14012,15 @@ msgstr ""
 msgid "Version %1$s was created, tracking for %2$s is active."
 msgstr ""
 
-#: libraries/user_preferences.inc.php:29
+#: libraries/user_preferences.inc.php:30
 msgid "Manage your settings"
 msgstr ""
 
-#: libraries/user_preferences.inc.php:46 prefs_manage.php:307
+#: libraries/user_preferences.inc.php:54 prefs_manage.php:307
 msgid "Configuration has been saved."
 msgstr ""
 
-#: libraries/user_preferences.inc.php:66
+#: libraries/user_preferences.inc.php:74
 #, php-format
 msgid ""
 "Your preferences will be saved for current session only. Storing them "
@@ -14386,7 +14404,7 @@ msgid "first"
 msgstr ""
 
 #: templates/columns_definitions/move_column.phtml:12
-#: templates/structure/add_column.phtml:21
+#: templates/table/structure/add_column.phtml:21
 #, php-format
 msgid "after %s"
 msgstr ""
@@ -14447,215 +14465,315 @@ msgstr "زانیاری وەشان"
 msgid "Input transformation options"
 msgstr ""
 
-#: templates/designer/aggregate_query_panel.phtml:22
-#: templates/designer/options_panel.phtml:100
+#: templates/database/create_table.phtml:7
+#: templates/database/designer/side_menu.phtml:77
+#: templates/database/designer/side_menu.phtml:80
+msgid "Create table"
+msgstr ""
+
+#: templates/database/create_table.phtml:15
+msgid "Number of columns"
+msgstr ""
+
+#: templates/database/designer/aggregate_query_panel.phtml:22
+#: templates/database/designer/options_panel.phtml:100
 msgid "Aggregate"
 msgstr ""
 
-#: templates/designer/aggregate_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:61
-#: templates/designer/options_panel.phtml:106
-#: templates/designer/options_panel.phtml:170
-#: templates/designer/where_query_panel.phtml:30
-#: templates/table/table_header.phtml:9
+#: templates/database/designer/aggregate_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:61
+#: templates/database/designer/options_panel.phtml:106
+#: templates/database/designer/options_panel.phtml:170
+#: templates/database/designer/where_query_panel.phtml:30
+#: templates/table/search/table_header.phtml:9
 msgid "Operator"
 msgstr "كرده‌هێما"
 
-#: templates/designer/database_tables.phtml:29
+#: templates/database/designer/database_tables.phtml:29
 msgid "Toggle"
 msgstr ""
 
-#: templates/designer/database_tables.phtml:40
+#: templates/database/designer/database_tables.phtml:40
 #, fuzzy
 #| msgid "Structure"
 msgid "See table structure"
 msgstr "پێکهاتە"
 
-#: templates/designer/delete_relation_panel.phtml:21
+#: templates/database/designer/delete_relation_panel.phtml:21
 msgid "Delete relation"
 msgstr ""
 
-#: templates/designer/edit_delete_pages.phtml:7
+#: templates/database/designer/edit_delete_pages.phtml:7
 #, fuzzy
 #| msgid "Replace table prefix"
 msgid "Page to open"
 msgstr "گۆڕینی پێشگری خشتە"
 
-#: templates/designer/edit_delete_pages.phtml:7
+#: templates/database/designer/edit_delete_pages.phtml:7
 msgid "Page to delete"
 msgstr ""
 
-#: templates/designer/having_query_panel.phtml:90
-#: templates/designer/options_panel.phtml:63
-#: templates/designer/options_panel.phtml:229
-#: templates/designer/where_query_panel.phtml:59
+#: templates/database/designer/having_query_panel.phtml:90
+#: templates/database/designer/options_panel.phtml:63
+#: templates/database/designer/options_panel.phtml:229
+#: templates/database/designer/where_query_panel.phtml:59
 msgid "Except"
 msgstr ""
 
-#: templates/designer/having_query_panel.phtml:102
-#: templates/designer/options_panel.phtml:75
-#: templates/designer/options_panel.phtml:241
-#: templates/designer/where_query_panel.phtml:71
+#: templates/database/designer/having_query_panel.phtml:102
+#: templates/database/designer/options_panel.phtml:75
+#: templates/database/designer/options_panel.phtml:241
+#: templates/database/designer/where_query_panel.phtml:71
 msgid "subquery"
 msgstr ""
 
-#: templates/designer/new_relation_panel.phtml:22
-#: templates/designer/side_menu.phtml:84 templates/designer/side_menu.phtml:87
+#: templates/database/designer/new_relation_panel.phtml:22
+#: templates/database/designer/side_menu.phtml:84
+#: templates/database/designer/side_menu.phtml:87
 msgid "Create relation"
 msgstr ""
 
-#: templates/designer/options_panel.phtml:34
-#: templates/designer/options_panel.phtml:200
+#: templates/database/designer/options_panel.phtml:34
+#: templates/database/designer/options_panel.phtml:200
 msgid "Relation operator"
 msgstr ""
 
-#: templates/designer/options_panel.phtml:85
-#: templates/designer/rename_to_panel.phtml:23
+#: templates/database/designer/options_panel.phtml:85
+#: templates/database/designer/rename_to_panel.phtml:23
 msgid "Rename to"
 msgstr ""
 
-#: templates/designer/options_panel.phtml:91
-#: templates/designer/rename_to_panel.phtml:31
+#: templates/database/designer/options_panel.phtml:91
+#: templates/database/designer/rename_to_panel.phtml:31
 msgid "New name"
 msgstr ""
 
-#: templates/designer/page_save_as.phtml:4
+#: templates/database/designer/page_save_as.phtml:4
 #, fuzzy
 #| msgid "No rows selected"
 msgid "Save to selected page"
 msgstr "هیچ ڕیزێک هەڵنەبژێراوە"
 
-#: templates/designer/page_save_as.phtml:5
+#: templates/database/designer/page_save_as.phtml:5
 msgid "Create a page and save to it"
 msgstr ""
 
-#: templates/designer/page_save_as.phtml:26
+#: templates/database/designer/page_save_as.phtml:26
 msgid "New page name"
 msgstr ""
 
-#: templates/designer/page_selector.phtml:2
+#: templates/database/designer/page_selector.phtml:2
 msgid "Select page"
 msgstr ""
 
-#: templates/designer/query_details.phtml:10
+#: templates/database/designer/query_details.phtml:10
 msgid "Active options"
 msgstr ""
 
-#: templates/designer/schema_export.phtml:4
+#: templates/database/designer/schema_export.phtml:4
 msgid "Select Export Relational Type"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:19 templates/designer/side_menu.phtml:25
+#: templates/database/designer/side_menu.phtml:19
+#: templates/database/designer/side_menu.phtml:25
 #, fuzzy
 #| msgid "Showing rows"
 msgid "Show/Hide tables list"
 msgstr "ڕیزە پێشاندراوەکان"
 
-#: templates/designer/side_menu.phtml:29 templates/designer/side_menu.phtml:35
-#: templates/designer/side_menu.phtml:36
+#: templates/database/designer/side_menu.phtml:29
+#: templates/database/designer/side_menu.phtml:35
+#: templates/database/designer/side_menu.phtml:36
 msgid "View in fullscreen"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:34
+#: templates/database/designer/side_menu.phtml:34
 msgid "Exit fullscreen"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:41 templates/designer/side_menu.phtml:45
+#: templates/database/designer/side_menu.phtml:41
+#: templates/database/designer/side_menu.phtml:45
 #, fuzzy
 #| msgid "Reload page"
 msgid "New page"
 msgstr "بارکردنەوەى پەڕە"
 
-#: templates/designer/side_menu.phtml:70 templates/designer/side_menu.phtml:73
+#: templates/database/designer/side_menu.phtml:70
+#: templates/database/designer/side_menu.phtml:73
 #, fuzzy
 #| msgid "Delete"
 msgid "Delete pages"
 msgstr "سڕینەوە"
 
-#: templates/designer/side_menu.phtml:77 templates/designer/side_menu.phtml:80
-#: templates/table/create_table.phtml:7
-msgid "Create table"
-msgstr ""
-
-#: templates/designer/side_menu.phtml:98
-#: templates/designer/side_menu.phtml:101
+#: templates/database/designer/side_menu.phtml:98
+#: templates/database/designer/side_menu.phtml:101
 msgid "Reload"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:107
-#: templates/designer/side_menu.phtml:110
+#: templates/database/designer/side_menu.phtml:107
+#: templates/database/designer/side_menu.phtml:110
 msgid "Help"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Angular links"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Direct links"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:122
-#: templates/designer/side_menu.phtml:124
+#: templates/database/designer/side_menu.phtml:122
+#: templates/database/designer/side_menu.phtml:124
 msgid "Snap to grid"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:128
-#: templates/designer/side_menu.phtml:134
+#: templates/database/designer/side_menu.phtml:128
+#: templates/database/designer/side_menu.phtml:134
 msgid "Small/Big All"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:138
-#: templates/designer/side_menu.phtml:141
+#: templates/database/designer/side_menu.phtml:138
+#: templates/database/designer/side_menu.phtml:141
 msgid "Toggle small/big"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:145
-#: templates/designer/side_menu.phtml:148
+#: templates/database/designer/side_menu.phtml:145
+#: templates/database/designer/side_menu.phtml:148
 msgid "Toggle relation lines"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:153
-#: templates/designer/side_menu.phtml:156
+#: templates/database/designer/side_menu.phtml:153
+#: templates/database/designer/side_menu.phtml:156
 #, fuzzy
 #| msgid "Export"
 msgid "Export schema"
 msgstr "هەناردن"
 
-#: templates/designer/side_menu.phtml:165
-#: templates/designer/side_menu.phtml:168
+#: templates/database/designer/side_menu.phtml:165
+#: templates/database/designer/side_menu.phtml:168
 msgid "Build Query"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:173
-#: templates/designer/side_menu.phtml:177
+#: templates/database/designer/side_menu.phtml:173
+#: templates/database/designer/side_menu.phtml:177
 msgid "Move Menu"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:181
-#: templates/designer/side_menu.phtml:186
+#: templates/database/designer/side_menu.phtml:181
+#: templates/database/designer/side_menu.phtml:186
 #, fuzzy
 #| msgid "Partial texts"
 msgid "Pin text"
 msgstr "تێکستە لاوەکیەکان"
 
-#: templates/designer/table_list.phtml:4
+#: templates/database/designer/table_list.phtml:4
 msgid "Hide/Show all"
 msgstr ""
 
-#: templates/designer/table_list.phtml:14
+#: templates/database/designer/table_list.phtml:14
 msgid "Hide/Show Tables with no relation"
 msgstr ""
 
-#: templates/designer/table_list.phtml:59
+#: templates/database/designer/table_list.phtml:59
 #, fuzzy
 #| msgid "Number of rows"
 msgid "Number of tables:"
 msgstr "ژمارەی ڕیزەکان"
 
+#: templates/database/structure/body_for_table_summary.phtml:6
+#, php-format
+msgid "%s table"
+msgid_plural "%s tables"
+msgstr[0] "%s خشتە"
+msgstr[1] "%s خشتەکان"
+
+#: templates/database/structure/body_for_table_summary.phtml:17
+msgid "Sum"
+msgstr "سەرجەم"
+
+#: templates/database/structure/check_all_tables.phtml:6
+msgid "Check tables having overhead"
+msgstr "پشکنین بۆ ئەو خشتانە بکە کە ژوورسەریان هەیە"
+
+#: templates/database/structure/check_all_tables.phtml:10
+#, fuzzy
+#| msgid "Show all"
+msgid "Show create"
+msgstr "هەمووی پێشاندە"
+
+#: templates/database/structure/check_all_tables.phtml:27
+msgid "Prefix"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:28
+msgid "Add prefix to table"
+msgstr "زیادکردنی پێشگر بۆ خشتە"
+
+#: templates/database/structure/check_all_tables.phtml:29
+msgid "Replace table prefix"
+msgstr "گۆڕینی پێشگری خشتە"
+
+#: templates/database/structure/check_all_tables.phtml:30
+msgid "Copy table with prefix"
+msgstr "لەبەرگرتنەوەی خشتە لەگەڵ پێشگر"
+
+#: templates/database/structure/check_all_tables.phtml:36
+#, fuzzy
+#| msgid "Add columns"
+msgid "Add columns to central list"
+msgstr "ستونەکان زیادبکە"
+
+#: templates/database/structure/check_all_tables.phtml:37
+msgid "Remove columns from central list"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:38
+#, fuzzy
+#| msgid "Add columns"
+msgid "Make consistent with central list"
+msgstr "ستونەکان زیادبکە"
+
+#: templates/database/structure/favorite_anchor.phtml:12
+msgid "Add to Favorites"
+msgstr ""
+
+#: templates/database/structure/show_create.phtml:2
+#, fuzzy
+msgid "Showing create queries"
+msgstr "نیشاندانی پرسگەی SQL"
+
+#: templates/database/structure/sortable_header.phtml:13
+msgid "Sort"
+msgstr "ڕیزکردن"
+
+#: templates/database/structure/table_header.phtml:42
+msgid ""
+"May be approximate. Click on the number to get the exact count. See "
+"[doc@faq3-11]FAQ 3.11[/doc]."
+msgstr ""
+
+#: templates/database/structure/table_header.phtml:66
+#: templates/table/index_form.phtml:127
+msgid "Size"
+msgstr "قەبارە"
+
+#: templates/database/structure/table_header.phtml:74
+#: templates/table/structure/display_table_stats.phtml:27
+msgid "Overhead"
+msgstr ""
+
+#: templates/database/structure/tracking_icon.phtml:4
+msgid "Tracking is active."
+msgstr "بەدواچوونەوە چالاکە."
+
+#: templates/database/structure/tracking_icon.phtml:8
+msgid "Tracking is not active."
+msgstr "بەدواچوونەوە ناچالاکە."
+
 #: templates/error/report_form.phtml:7
 msgid ""
 "phpMyAdmin has encountered an error. We have collected data about this error "
@@ -14671,67 +14789,6 @@ msgstr ""
 msgid "Please explain the steps that lead to the error:"
 msgstr ""
 
-#: templates/gis_visualization/gis_visualization.phtml:3
-msgid "Display GIS Visualization"
-msgstr ""
-
-#: templates/gis_visualization/gis_visualization.phtml:8
-msgid "Label column"
-msgstr ""
-
-#: templates/gis_visualization/gis_visualization.phtml:11
-msgid "-- None --"
-msgstr ""
-
-#: templates/gis_visualization/gis_visualization.phtml:19
-msgid "Spatial column"
-msgstr ""
-
-#: templates/index_form.phtml:16
-msgid "Index name:"
-msgstr ""
-
-#: templates/index_form.phtml:19
-msgid ""
-"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
-msgstr ""
-
-#: templates/index_form.phtml:40
-#, fuzzy
-#| msgid "Indexes"
-msgid "Index choice:"
-msgstr "نیشاندەرەکان"
-
-#: templates/index_form.phtml:57
-msgid "Key block size:"
-msgstr ""
-
-#: templates/index_form.phtml:74
-msgid "Index type:"
-msgstr ""
-
-#: templates/index_form.phtml:86
-#, fuzzy
-#| msgid "User:"
-msgid "Parser:"
-msgstr "بەکارهێنەر:"
-
-#: templates/index_form.phtml:102
-#, fuzzy
-#| msgid "Comment"
-msgid "Comment:"
-msgstr "لێدوان"
-
-#: templates/index_form.phtml:127 templates/structure/table_header.phtml:66
-msgid "Size"
-msgstr "قەبارە"
-
-#: templates/index_form.phtml:149 templates/index_form.phtml:190
-#, fuzzy
-#| msgid "Drag to reorder"
-msgid "Drag to reorder"
-msgstr "ڕایکێشە بۆ ڕیزکردنەوە"
-
 #: templates/prefs_autoload.phtml:9
 msgid ""
 "Your browser has phpMyAdmin configuration for this domain. Would you like to "
@@ -14744,450 +14801,418 @@ msgstr ""
 msgid "Start row:"
 msgstr "ڕیزی سەرەتا"
 
-#: templates/structure/actions_in_table_structure.phtml:14
-#, php-format
-msgid "A primary key has been added on %s."
-msgstr ""
-
-#: templates/structure/actions_in_table_structure.phtml:34
-#: templates/structure/actions_in_table_structure.phtml:54
-#: templates/structure/actions_in_table_structure.phtml:79
-#: templates/structure/actions_in_table_structure.phtml:101
-#, php-format
-msgid "An index has been added on %s."
-msgstr ""
-
-#: templates/structure/actions_in_table_structure.phtml:130
-#: templates/structure/check_all_table_column.phtml:59
-#, fuzzy
-#| msgid "Remove chart"
-msgid "Remove from central columns"
-msgstr "سڕینەوەی هێلکاری"
-
-#: templates/structure/actions_in_table_structure.phtml:138
-#: templates/structure/check_all_table_column.phtml:55
-#, fuzzy
-#| msgid "Add columns"
-msgid "Add to central columns"
-msgstr "ستونەکان زیادبکە"
-
-#: templates/structure/add_column.phtml:7
-#, php-format
-msgid "Add %s column(s)"
-msgstr ""
-
-#: templates/structure/add_column.phtml:12
-#, fuzzy
-#| msgid "Number of rows"
-msgid "at beginning of table"
-msgstr "ژمارەی ڕیزەکان"
-
-#: templates/structure/body_for_table_summary.phtml:6
-#, php-format
-msgid "%s table"
-msgid_plural "%s tables"
-msgstr[0] "%s خشتە"
-msgstr[1] "%s خشتەکان"
-
-#: templates/structure/body_for_table_summary.phtml:17
-msgid "Sum"
-msgstr "سەرجەم"
-
-#: templates/structure/check_all_tables.phtml:6
-msgid "Check tables having overhead"
-msgstr "پشکنین بۆ ئەو خشتانە بکە کە ژوورسەریان هەیە"
-
-#: templates/structure/check_all_tables.phtml:10
-#, fuzzy
-#| msgid "Show all"
-msgid "Show create"
-msgstr "هەمووی پێشاندە"
-
-#: templates/structure/check_all_tables.phtml:27
-msgid "Prefix"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:28
-msgid "Add prefix to table"
-msgstr "زیادکردنی پێشگر بۆ خشتە"
-
-#: templates/structure/check_all_tables.phtml:29
-msgid "Replace table prefix"
-msgstr "گۆڕینی پێشگری خشتە"
-
-#: templates/structure/check_all_tables.phtml:30
-msgid "Copy table with prefix"
-msgstr "لەبەرگرتنەوەی خشتە لەگەڵ پێشگر"
-
-#: templates/structure/check_all_tables.phtml:36
-#, fuzzy
-#| msgid "Add columns"
-msgid "Add columns to central list"
-msgstr "ستونەکان زیادبکە"
-
-#: templates/structure/check_all_tables.phtml:37
-msgid "Remove columns from central list"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:38
-#, fuzzy
-#| msgid "Add columns"
-msgid "Make consistent with central list"
-msgstr "ستونەکان زیادبکە"
-
-#: templates/structure/display_structure.phtml:140 view_create.php:181
-msgid "Edit view"
-msgstr ""
-
-#: templates/structure/display_table_stats.phtml:9
-msgid "Space usage"
-msgstr ""
-
-#: templates/structure/display_table_stats.phtml:27
-#: templates/structure/table_header.phtml:74
-msgid "Overhead"
-msgstr ""
-
-#: templates/structure/display_table_stats.phtml:32
-msgid "Effective"
-msgstr ""
-
-#: templates/structure/favorite_anchor.phtml:12
-msgid "Add to Favorites"
-msgstr ""
-
-#: templates/structure/move_columns_dialog.phtml:1
-#: templates/structure/optional_action_links.phtml:21
-msgid "Move columns"
-msgstr ""
-
-#: templates/structure/move_columns_dialog.phtml:2
-msgid "Move the columns by dragging them up and down."
-msgstr ""
-
-#: templates/structure/optional_action_links.phtml:9
-msgid "Propose table structure"
-msgstr ""
-
-#: templates/structure/optional_action_links.phtml:24
-msgid "Improve table structure"
-msgstr ""
-
-#: templates/structure/optional_action_links.phtml:30
-#, fuzzy
-#| msgid "Track table"
-msgid "Track view"
-msgstr "شوێنکەوتنی خشتە"
-
-#: templates/structure/row_stats_table.phtml:3
-#, fuzzy
-#| msgid "Show statistics"
-msgid "Row statistics"
-msgstr "نیشاندانی سەرژمێری"
-
-#: templates/structure/row_stats_table.phtml:9
-msgid "static"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:11
-msgid "dynamic"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:22
-msgid "partitioned"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:54
-msgid "Row length"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:66
-msgid "Row size"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:73
-msgid "Next autoindex"
-msgstr ""
-
-#: templates/structure/secondary_tabs.phtml:14
-#, fuzzy
-#| msgid "Replication"
-msgid "Relation view"
-msgstr "دووپاتکاری"
-
-#: templates/structure/show_create.phtml:2
-#, fuzzy
-msgid "Showing create queries"
-msgstr "نیشاندانی پرسگەی SQL"
-
-#: templates/structure/sortable_header.phtml:13
-msgid "Sort"
-msgstr "ڕیزکردن"
-
-#: templates/structure/table_header.phtml:42
-msgid ""
-"May be approximate. Click on the number to get the exact count. See "
-"[doc@faq3-11]FAQ 3.11[/doc]."
-msgstr ""
-
-#: templates/structure/table_structure_row.phtml:46
-#, php-format
-msgid "Column %s has been dropped."
-msgstr ""
-
-#: templates/structure/tracking_icon.phtml:4
-msgid "Tracking is active."
-msgstr "بەدواچوونەوە چالاکە."
-
-#: templates/structure/tracking_icon.phtml:8
-msgid "Tracking is not active."
-msgstr "بەدواچوونەوە ناچالاکە."
-
-#: templates/table/create_table.phtml:15
-msgid "Number of columns"
-msgstr ""
-
-#: templates/table/options.phtml:8
-msgid "Select columns (at least one):"
-msgstr "ستونەکان هەڵبژێرە (لانی کەم یەک):"
-
-#: templates/table/options.phtml:37
-msgid "Add search conditions (body of the \"where\" clause):"
-msgstr ""
-
-#: templates/table/options.phtml:45
-msgid "Number of rows per page"
-msgstr "ژمارەی ڕیزەکان لە هەر پەڕێک"
-
-#: templates/table/options.phtml:56
-msgid "Display order:"
-msgstr "پێشاندانی ڕێزبەندی:"
-
-#: templates/table/options_zoom.phtml:6
-msgid "Use this column to label each point"
-msgstr ""
-
-#: templates/table/options_zoom.phtml:35
-msgid "Maximum rows to plot"
-msgstr ""
-
-#: templates/table/replace_preview.phtml:13
-msgid "Find and replace - preview"
-msgstr ""
-
-#: templates/table/replace_preview.phtml:18
-#, fuzzy
-#| msgid "Linestring"
-msgid "Original string"
-msgstr "ڕیزبه‌ندی هێڵی"
-
-#: templates/table/replace_preview.phtml:19
-#, fuzzy
-#| msgid "Replace table prefix"
-msgid "Replaced string"
-msgstr "گۆڕینی پێشگری خشتە"
-
-#: templates/table/replace_preview.phtml:40
-msgid "Replace"
-msgstr ""
-
-#: templates/table/rows_zoom.phtml:16
-msgid "Additional search criteria"
-msgstr "مەرجی گەڕانی زیاتر"
-
-#: templates/table/search_and_replace.phtml:3
-#, fuzzy
-#| msgid "Replace table prefix"
-msgid "Replace with:"
-msgstr "گۆڕینی پێشگری خشتە"
-
-#: templates/table/search_and_replace.phtml:22
-msgid "Use regular expression"
-msgstr ""
-
-#: templates/table/selection_form.phtml:12
-msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
-msgstr ""
-
-#: templates/table/selection_form.phtml:34
-msgid "Do a \"query by example\" (wildcard: \"%\")"
-msgstr ""
-
-#: templates/table/zoom_result_form.phtml:7
-msgid "Browse/Edit the points"
-msgstr ""
-
-#: templates/table/zoom_result_form.phtml:15
-msgid "How to use"
-msgstr "چۆنیەتی بەکارهێنان"
-
-#: templates/table/zoom_result_form.phtml:23
-msgid "Reset zoom"
-msgstr "ڕێکخستنەوەی زووم"
-
-#: templates/tbl_chart.phtml:17
+#: templates/table/chart/tbl_chart.phtml:17
 msgctxt "Chart type"
 msgid "Bar"
 msgstr ""
 
-#: templates/tbl_chart.phtml:21
+#: templates/table/chart/tbl_chart.phtml:21
 msgctxt "Chart type"
 msgid "Column"
 msgstr ""
 
-#: templates/tbl_chart.phtml:25
+#: templates/table/chart/tbl_chart.phtml:25
 msgctxt "Chart type"
 msgid "Line"
 msgstr ""
 
-#: templates/tbl_chart.phtml:29
+#: templates/table/chart/tbl_chart.phtml:29
 msgctxt "Chart type"
 msgid "Spline"
 msgstr ""
 
-#: templates/tbl_chart.phtml:33
+#: templates/table/chart/tbl_chart.phtml:33
 msgctxt "Chart type"
 msgid "Area"
 msgstr ""
 
-#: templates/tbl_chart.phtml:37
+#: templates/table/chart/tbl_chart.phtml:37
 msgctxt "Chart type"
 msgid "Pie"
 msgstr ""
 
-#: templates/tbl_chart.phtml:41
+#: templates/table/chart/tbl_chart.phtml:41
 #, fuzzy
 #| msgid "Time"
 msgctxt "Chart type"
 msgid "Timeline"
 msgstr "کات"
 
-#: templates/tbl_chart.phtml:45
+#: templates/table/chart/tbl_chart.phtml:45
 msgctxt "Chart type"
 msgid "Scatter"
 msgstr ""
 
-#: templates/tbl_chart.phtml:50
+#: templates/table/chart/tbl_chart.phtml:50
 msgid "Stacked"
 msgstr ""
 
-#: templates/tbl_chart.phtml:53
+#: templates/table/chart/tbl_chart.phtml:53
 msgid "Chart title"
 msgstr ""
 
-#: templates/tbl_chart.phtml:57
+#: templates/table/chart/tbl_chart.phtml:57
 msgid "X-Axis:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:72
+#: templates/table/chart/tbl_chart.phtml:72
 msgid "Series:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:102
+#: templates/table/chart/tbl_chart.phtml:102
 msgid "X-Axis label:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:104
+#: templates/table/chart/tbl_chart.phtml:104
 msgid "X Values"
 msgstr ""
 
-#: templates/tbl_chart.phtml:107
+#: templates/table/chart/tbl_chart.phtml:107
 msgid "Y-Axis label:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:115
+#: templates/table/chart/tbl_chart.phtml:115
 msgid "Series names are in a column"
 msgstr ""
 
-#: templates/tbl_chart.phtml:118
+#: templates/table/chart/tbl_chart.phtml:118
 #, fuzzy
 #| msgid "Inside column:"
 msgid "Series column:"
 msgstr "لە نێو خشتەی:"
 
-#: templates/tbl_chart.phtml:130
+#: templates/table/chart/tbl_chart.phtml:130
 #, fuzzy
 #| msgid "Values for column %s"
 msgid "Value Column:"
 msgstr "نرخەکانی ستونی %s"
 
-#: templates/tbl_chart.phtml:150
+#: templates/table/chart/tbl_chart.phtml:150
 msgid "Save chart as image"
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:7
+#: templates/table/gis_visualization/gis_visualization.phtml:3
+msgid "Display GIS Visualization"
+msgstr ""
+
+#: templates/table/gis_visualization/gis_visualization.phtml:8
+msgid "Label column"
+msgstr ""
+
+#: templates/table/gis_visualization/gis_visualization.phtml:11
+msgid "-- None --"
+msgstr ""
+
+#: templates/table/gis_visualization/gis_visualization.phtml:19
+msgid "Spatial column"
+msgstr ""
+
+#: templates/table/index_form.phtml:16
+msgid "Index name:"
+msgstr ""
+
+#: templates/table/index_form.phtml:19
+msgid ""
+"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
+msgstr ""
+
+#: templates/table/index_form.phtml:40
+#, fuzzy
+#| msgid "Indexes"
+msgid "Index choice:"
+msgstr "نیشاندەرەکان"
+
+#: templates/table/index_form.phtml:57
+msgid "Key block size:"
+msgstr ""
+
+#: templates/table/index_form.phtml:74
+msgid "Index type:"
+msgstr ""
+
+#: templates/table/index_form.phtml:86
+#, fuzzy
+#| msgid "User:"
+msgid "Parser:"
+msgstr "بەکارهێنەر:"
+
+#: templates/table/index_form.phtml:102
+#, fuzzy
+#| msgid "Comment"
+msgid "Comment:"
+msgstr "لێدوان"
+
+#: templates/table/index_form.phtml:149 templates/table/index_form.phtml:190
+#, fuzzy
+#| msgid "Drag to reorder"
+msgid "Drag to reorder"
+msgstr "ڕایکێشە بۆ ڕیزکردنەوە"
+
+#: templates/table/relation/common_form.phtml:7
 #, fuzzy
 #| msgid "The row has been deleted."
 msgid "Internal relations"
 msgstr "ڕیزەکە سڕایەوە"
 
-#: templates/tbl_relation/common_form.phtml:11
+#: templates/table/relation/common_form.phtml:11
 msgid "Internal relation"
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:14
+#: templates/table/relation/common_form.phtml:14
 msgid ""
 "An internal relation is not necessary when a corresponding FOREIGN KEY "
 "relation exists."
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:37
+#: templates/table/relation/common_form.phtml:37
 #, fuzzy
 #| msgid "Add constraints"
 msgid "Foreign key constraints"
 msgstr "زیادکردنی مەرج"
 
-#: templates/tbl_relation/common_form.phtml:40
+#: templates/table/relation/common_form.phtml:40
 #, fuzzy
 #| msgid "Action"
 msgid "Actions"
 msgstr "کردار"
 
-#: templates/tbl_relation/common_form.phtml:41
+#: templates/table/relation/common_form.phtml:41
 #, fuzzy
 #| msgid "Contribute"
 msgid "Constraint properties"
 msgstr "بەشداری کردن"
 
-#: templates/tbl_relation/common_form.phtml:44
+#: templates/table/relation/common_form.phtml:44
 msgid ""
 "Only columns with index will be displayed. You can define an index below."
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:49
+#: templates/table/relation/common_form.phtml:49
 msgid "Foreign key constraint"
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:81
+#: templates/table/relation/common_form.phtml:81
 #, fuzzy
 #| msgid "Add constraints"
 msgid "+ Add constraint"
 msgstr "زیادکردنی مەرج"
 
-#: templates/tbl_relation/common_form.phtml:91
+#: templates/table/relation/common_form.phtml:91
 #, fuzzy
 #| msgid "You have to choose at least one column to display"
 msgid "Choose column to display:"
 msgstr "دەبێت لانیکەم ١ خانە هەڵبژێریت بۆ پیشاندان"
 
-#: templates/tbl_relation/foreign_key_row.phtml:13
+#: templates/table/relation/foreign_key_row.phtml:13
 #, fuzzy, php-format
 #| msgid "Add constraints"
 msgid "Foreign key constraint %s has been dropped"
 msgstr "زیادکردنی مەرج"
 
-#: templates/tbl_relation/foreign_key_row.phtml:102
+#: templates/table/relation/foreign_key_row.phtml:102
 #, fuzzy
 #| msgid "Contribute"
 msgid "Constraint name"
 msgstr "بەشداری کردن"
 
-#: templates/tbl_relation/foreign_key_row.phtml:157
+#: templates/table/relation/foreign_key_row.phtml:157
 #, fuzzy
 #| msgid "Add/Delete columns"
 msgid "+ Add column"
 msgstr "زیادکردن/سڕینەوەی ستونەکان"
 
+#: templates/table/search/options.phtml:8
+msgid "Select columns (at least one):"
+msgstr "ستونەکان هەڵبژێرە (لانی کەم یەک):"
+
+#: templates/table/search/options.phtml:37
+msgid "Add search conditions (body of the \"where\" clause):"
+msgstr ""
+
+#: templates/table/search/options.phtml:45
+msgid "Number of rows per page"
+msgstr "ژمارەی ڕیزەکان لە هەر پەڕێک"
+
+#: templates/table/search/options.phtml:56
+msgid "Display order:"
+msgstr "پێشاندانی ڕێزبەندی:"
+
+#: templates/table/search/options_zoom.phtml:6
+msgid "Use this column to label each point"
+msgstr ""
+
+#: templates/table/search/options_zoom.phtml:35
+msgid "Maximum rows to plot"
+msgstr ""
+
+#: templates/table/search/replace_preview.phtml:13
+msgid "Find and replace - preview"
+msgstr ""
+
+#: templates/table/search/replace_preview.phtml:18
+#, fuzzy
+#| msgid "Linestring"
+msgid "Original string"
+msgstr "ڕیزبه‌ندی هێڵی"
+
+#: templates/table/search/replace_preview.phtml:19
+#, fuzzy
+#| msgid "Replace table prefix"
+msgid "Replaced string"
+msgstr "گۆڕینی پێشگری خشتە"
+
+#: templates/table/search/replace_preview.phtml:40
+msgid "Replace"
+msgstr ""
+
+#: templates/table/search/rows_zoom.phtml:16
+msgid "Additional search criteria"
+msgstr "مەرجی گەڕانی زیاتر"
+
+#: templates/table/search/search_and_replace.phtml:3
+#, fuzzy
+#| msgid "Replace table prefix"
+msgid "Replace with:"
+msgstr "گۆڕینی پێشگری خشتە"
+
+#: templates/table/search/search_and_replace.phtml:22
+msgid "Use regular expression"
+msgstr ""
+
+#: templates/table/search/selection_form.phtml:12
+msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
+msgstr ""
+
+#: templates/table/search/selection_form.phtml:34
+msgid "Do a \"query by example\" (wildcard: \"%\")"
+msgstr ""
+
+#: templates/table/search/zoom_result_form.phtml:7
+msgid "Browse/Edit the points"
+msgstr ""
+
+#: templates/table/search/zoom_result_form.phtml:15
+msgid "How to use"
+msgstr "چۆنیەتی بەکارهێنان"
+
+#: templates/table/search/zoom_result_form.phtml:23
+msgid "Reset zoom"
+msgstr "ڕێکخستنەوەی زووم"
+
+#: templates/table/secondary_tabs.phtml:14
+#, fuzzy
+#| msgid "Replication"
+msgid "Relation view"
+msgstr "دووپاتکاری"
+
+#: templates/table/structure/actions_in_table_structure.phtml:14
+#, php-format
+msgid "A primary key has been added on %s."
+msgstr ""
+
+#: templates/table/structure/actions_in_table_structure.phtml:34
+#: templates/table/structure/actions_in_table_structure.phtml:54
+#: templates/table/structure/actions_in_table_structure.phtml:79
+#: templates/table/structure/actions_in_table_structure.phtml:101
+#, php-format
+msgid "An index has been added on %s."
+msgstr ""
+
+#: templates/table/structure/actions_in_table_structure.phtml:130
+#: templates/table/structure/check_all_table_column.phtml:59
+#, fuzzy
+#| msgid "Remove chart"
+msgid "Remove from central columns"
+msgstr "سڕینەوەی هێلکاری"
+
+#: templates/table/structure/actions_in_table_structure.phtml:138
+#: templates/table/structure/check_all_table_column.phtml:55
+#, fuzzy
+#| msgid "Add columns"
+msgid "Add to central columns"
+msgstr "ستونەکان زیادبکە"
+
+#: templates/table/structure/add_column.phtml:7
+#, php-format
+msgid "Add %s column(s)"
+msgstr ""
+
+#: templates/table/structure/add_column.phtml:12
+#, fuzzy
+#| msgid "Number of rows"
+msgid "at beginning of table"
+msgstr "ژمارەی ڕیزەکان"
+
+#: templates/table/structure/display_structure.phtml:140 view_create.php:181
+msgid "Edit view"
+msgstr ""
+
+#: templates/table/structure/display_table_stats.phtml:9
+msgid "Space usage"
+msgstr ""
+
+#: templates/table/structure/display_table_stats.phtml:32
+msgid "Effective"
+msgstr ""
+
+#: templates/table/structure/move_columns_dialog.phtml:1
+#: templates/table/structure/optional_action_links.phtml:21
+msgid "Move columns"
+msgstr ""
+
+#: templates/table/structure/move_columns_dialog.phtml:2
+msgid "Move the columns by dragging them up and down."
+msgstr ""
+
+#: templates/table/structure/optional_action_links.phtml:9
+msgid "Propose table structure"
+msgstr ""
+
+#: templates/table/structure/optional_action_links.phtml:24
+msgid "Improve table structure"
+msgstr ""
+
+#: templates/table/structure/optional_action_links.phtml:30
+#, fuzzy
+#| msgid "Track table"
+msgid "Track view"
+msgstr "شوێنکەوتنی خشتە"
+
+#: templates/table/structure/row_stats_table.phtml:3
+#, fuzzy
+#| msgid "Show statistics"
+msgid "Row statistics"
+msgstr "نیشاندانی سەرژمێری"
+
+#: templates/table/structure/row_stats_table.phtml:9
+msgid "static"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:11
+msgid "dynamic"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:22
+msgid "partitioned"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:54
+msgid "Row length"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:66
+msgid "Row size"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:73
+msgid "Next autoindex"
+msgstr ""
+
+#: templates/table/structure/table_structure_row.phtml:46
+#, php-format
+msgid "Column %s has been dropped."
+msgstr ""
+
 #: themes.php:17 themes.php:22
 msgid "Theme"
 msgstr ""
diff --git a/po/cs.po b/po/cs.po
index ccf02935c8..0e8d734486 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -4,12 +4,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 4.5.0-dev\n"
-"Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
-"POT-Creation-Date: 2015-08-08 13:53-0400\n"
+"Report-Msgid-Bugs-To: developers@phpmyadmin.net\n"
+"POT-Creation-Date: 2015-08-12 08:10-0400\n"
 "PO-Revision-Date: 2015-08-12 09:44+0200\n"
 "Last-Translator: Michal Čihař <michal@cihar.com>\n"
-"Language-Team: Czech "
-"<https://hosted.weblate.org/projects/phpmyadmin/master/cs/>\n"
+"Language-Team: Czech <https://hosted.weblate.org/projects/phpmyadmin/master/"
+"cs/>\n"
 "Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -55,7 +55,7 @@ msgid "Table comments:"
 msgstr "Komentář k tabulce:"
 
 #: db_datadict.php:104 libraries/Index.class.php:699
-#: libraries/insert_edit.lib.php:1567
+#: libraries/insert_edit.lib.php:1565
 #: libraries/navigation/Nodes/Node_Column.class.php:30
 #: libraries/plugins/export/ExportHtmlword.class.php:280
 #: libraries/plugins/export/ExportHtmlword.class.php:375
@@ -69,13 +69,14 @@ msgstr "Komentář k tabulce:"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1023
 #: libraries/tracking.lib.php:879 libraries/tracking.lib.php:975
 #: templates/columns_definitions/column_name.phtml:18
-#: templates/index_form.phtml:124 templates/table/table_header.phtml:6
-#: templates/table/zoom_result_form.phtml:33
-#: templates/tbl_relation/common_form.phtml:10
-#: templates/tbl_relation/common_form.phtml:43
-#: templates/tbl_relation/foreign_key_row.phtml:194
-#: templates/tbl_relation/foreign_key_row.phtml:206
-#: templates/tbl_relation/internal_relational_row.phtml:71
+#: templates/table/index_form.phtml:124
+#: templates/table/relation/common_form.phtml:10
+#: templates/table/relation/common_form.phtml:43
+#: templates/table/relation/foreign_key_row.phtml:194
+#: templates/table/relation/foreign_key_row.phtml:206
+#: templates/table/relation/internal_relational_row.phtml:71
+#: templates/table/search/table_header.phtml:6
+#: templates/table/search/zoom_result_form.phtml:33
 msgid "Column"
 msgstr "Pole"
 
@@ -93,21 +94,21 @@ msgstr "Pole"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1001
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1024
 #: libraries/rte/rte_list.lib.php:75 libraries/rte/rte_list.lib.php:103
-#: libraries/rte/rte_routines.lib.php:802
-#: libraries/rte/rte_routines.lib.php:831
-#: libraries/rte/rte_routines.lib.php:1493
+#: libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_routines.lib.php:922
+#: libraries/rte/rte_routines.lib.php:1584
 #: libraries/server_privileges.lib.php:2369 libraries/tracking.lib.php:880
 #: libraries/tracking.lib.php:972
 #: templates/columns_definitions/table_fields_definitions.phtml:11
-#: templates/structure/table_header.phtml:48
-#: templates/structure/table_structure_header.phtml:6
-#: templates/table/table_header.phtml:7
+#: templates/database/structure/table_header.phtml:48
+#: templates/table/search/table_header.phtml:7
+#: templates/table/structure/table_structure_header.phtml:6
 msgid "Type"
 msgstr "Typ"
 
 #: db_datadict.php:106 libraries/Index.class.php:702
 #: libraries/central_columns.lib.php:708
-#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1576
+#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1574
 #: libraries/plugins/export/ExportHtmlword.class.php:286
 #: libraries/plugins/export/ExportHtmlword.class.php:381
 #: libraries/plugins/export/ExportLatex.class.php:509
@@ -120,8 +121,8 @@ msgstr "Typ"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1026
 #: libraries/tracking.lib.php:882 libraries/tracking.lib.php:978
 #: templates/columns_definitions/table_fields_definitions.phtml:39
-#: templates/structure/table_structure_header.phtml:9
-#: templates/table/zoom_result_form.phtml:34
+#: templates/table/search/zoom_result_form.phtml:34
+#: templates/table/structure/table_structure_header.phtml:9
 msgid "Null"
 msgstr "Nulový"
 
@@ -139,8 +140,8 @@ msgstr "Nulový"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1027
 #: libraries/replication_gui.lib.php:153 libraries/tracking.lib.php:883
 #: templates/columns_definitions/table_fields_definitions.phtml:25
-#: templates/structure/body_for_table_summary.phtml:55
-#: templates/structure/table_structure_header.phtml:10
+#: templates/database/structure/body_for_table_summary.phtml:55
+#: templates/table/structure/table_structure_header.phtml:10
 msgid "Default"
 msgstr "Výchozí"
 
@@ -168,19 +169,19 @@ msgid "Comments"
 msgstr "Komentáře"
 
 #: db_datadict.php:146
-#: libraries/controllers/StructureController.class.php:1960
-#: libraries/controllers/StructureController.class.php:1965
+#: libraries/controllers/TableStructureController.class.php:951
+#: libraries/controllers/TableStructureController.class.php:956
 #: libraries/tracking.lib.php:922
 #: templates/columns_definitions/column_indexes.phtml:6
-#: templates/structure/check_all_table_column.phtml:22
-#: templates/structure/display_structure.phtml:74
+#: templates/table/structure/check_all_table_column.phtml:22
+#: templates/table/structure/display_structure.phtml:74
 msgid "Primary"
 msgstr "Primární"
 
 #: db_datadict.php:156 js/messages.php:317 libraries/Index.class.php:567
 #: libraries/Index.class.php:606 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261 libraries/mult_submits.lib.php:403
+#: libraries/config/FormDisplay.tpl.php:272 libraries/mult_submits.lib.php:403
 #: libraries/mult_submits.lib.php:417
 #: libraries/plugins/export/ExportHtmlword.class.php:630
 #: libraries/plugins/export/ExportLatex.class.php:589
@@ -196,20 +197,20 @@ msgstr "Primární"
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1010 libraries/tracking.lib.php:1015
 #: prefs_manage.php:140 templates/prefs_autoload.phtml:15
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "No"
 msgstr "Ne"
 
 #: db_datadict.php:156 js/messages.php:443 libraries/Index.class.php:568
 #: libraries/Index.class.php:605 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261
-#: libraries/controllers/StructureController.class.php:1344
-#: libraries/controllers/StructureController.class.php:2223
-#: libraries/controllers/StructureController.class.php:2232
-#: libraries/controllers/StructureController.class.php:2237
-#: libraries/controllers/StructureController.class.php:2242
-#: libraries/controllers/StructureController.class.php:2247
+#: libraries/config/FormDisplay.tpl.php:272
+#: libraries/controllers/TableStructureController.class.php:539
+#: libraries/controllers/TableStructureController.class.php:1201
+#: libraries/controllers/TableStructureController.class.php:1210
+#: libraries/controllers/TableStructureController.class.php:1215
+#: libraries/controllers/TableStructureController.class.php:1220
+#: libraries/controllers/TableStructureController.class.php:1225
 #: libraries/mult_submits.inc.php:82 libraries/mult_submits.inc.php:178
 #: libraries/mult_submits.lib.php:339 libraries/mult_submits.lib.php:372
 #: libraries/mult_submits.lib.php:401 libraries/mult_submits.lib.php:415
@@ -218,8 +219,8 @@ msgstr "Ne"
 #: libraries/plugins/export/ExportOdt.class.php:756
 #: libraries/plugins/export/ExportTexytext.class.php:567
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1077
-#: libraries/server_databases.lib.php:464
-#: libraries/server_databases.lib.php:474
+#: libraries/server_databases.lib.php:475
+#: libraries/server_databases.lib.php:485
 #: libraries/server_privileges.lib.php:2546
 #: libraries/server_privileges.lib.php:2727
 #: libraries/server_privileges.lib.php:2748
@@ -229,7 +230,7 @@ msgstr "Ne"
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1008 libraries/tracking.lib.php:1013
 #: prefs_manage.php:138 templates/prefs_autoload.phtml:14
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "Yes"
 msgstr "Ano"
 
@@ -239,7 +240,7 @@ msgstr "Zobrazit výpis (schéma) databáze"
 
 #: db_export.php:37 db_tracking.php:90 export.php:382
 #: libraries/DBQbe.class.php:326
-#: libraries/controllers/StructureController.class.php:231
+#: libraries/controllers/DatabaseStructureController.class.php:170
 #: libraries/navigation/NavigationTree.class.php:897
 msgid "No tables found in database."
 msgstr "V databázi nebyly nalezeny žádné tabulky."
@@ -250,14 +251,14 @@ msgstr "V databázi nebyly nalezeny žádné tabulky."
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:26
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:120
-#: templates/structure/show_create.phtml:18
+#: templates/database/structure/show_create.phtml:18
 msgid "Tables"
 msgstr "Tabulky"
 
 #: db_export.php:52 libraries/Menu.class.php:317 libraries/Menu.class.php:425
-#: libraries/Util.class.php:3333 libraries/Util.class.php:3343
-#: libraries/Util.class.php:3349 libraries/Util.class.php:3629
-#: libraries/Util.class.php:4327 libraries/Util.class.php:4344
+#: libraries/Util.class.php:3339 libraries/Util.class.php:3349
+#: libraries/Util.class.php:3355 libraries/Util.class.php:3635
+#: libraries/Util.class.php:4333 libraries/Util.class.php:4350
 #: libraries/central_columns.lib.php:728 libraries/config.values.php:39
 #: libraries/config.values.php:47 libraries/config.values.php:109
 #: libraries/config.values.php:115 libraries/config/setup.forms.php:323
@@ -271,7 +272,7 @@ msgstr "Tabulky"
 #: libraries/navigation/Nodes/Node_Table.class.php:283
 #: libraries/server_privileges.lib.php:1141 libraries/tracking.lib.php:874
 #: templates/columns_definitions/table_fields_definitions.phtml:3
-#: templates/designer/table_list.phtml:28
+#: templates/database/designer/table_list.phtml:28
 msgid "Structure"
 msgstr "Struktura"
 
@@ -283,7 +284,7 @@ msgstr "Struktura"
 #: libraries/config/user_preferences.forms.php:292
 #: libraries/config/user_preferences.forms.php:297
 #: libraries/server_privileges.lib.php:1140
-#: templates/structure/display_table_stats.phtml:12
+#: templates/table/structure/display_table_stats.phtml:12
 msgid "Data"
 msgstr "Data"
 
@@ -355,10 +356,10 @@ msgstr "Sledované tabulky"
 #: libraries/server_privileges.lib.php:2908
 #: libraries/server_privileges.lib.php:3145
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4346
-#: templates/structure/table_header.phtml:21
-#: templates/tbl_relation/foreign_key_row.phtml:176
-#: templates/tbl_relation/internal_relational_row.phtml:63
+#: libraries/server_privileges.lib.php:4372
+#: templates/database/structure/table_header.phtml:21
+#: templates/table/relation/foreign_key_row.phtml:176
+#: templates/table/relation/internal_relational_row.phtml:63
 msgid "Table"
 msgstr "Tabulka"
 
@@ -375,7 +376,7 @@ msgid "Updated"
 msgstr "Aktualizováno"
 
 #: db_tracking.php:130 js/messages.php:243 libraries/Menu.class.php:552
-#: libraries/Util.class.php:4314 libraries/config.values.php:104
+#: libraries/Util.class.php:4320 libraries/config.values.php:104
 #: libraries/rte/rte_events.lib.php:393 libraries/rte/rte_list.lib.php:101
 #: libraries/server_status_processes.lib.php:92 libraries/tracking.lib.php:279
 msgid "Status"
@@ -384,14 +385,15 @@ msgstr "Stav"
 #: db_tracking.php:131 db_tracking.php:290 libraries/Index.class.php:693
 #: libraries/central_columns.lib.php:687 libraries/rte/rte_list.lib.php:74
 #: libraries/rte/rte_list.lib.php:89 libraries/rte/rte_list.lib.php:102
-#: libraries/server_databases.lib.php:398
+#: libraries/server_databases.lib.php:409
 #: libraries/server_privileges.lib.php:2372
 #: libraries/server_privileges.lib.php:3166
 #: libraries/server_privileges.lib.php:3342
 #: libraries/server_user_groups.lib.php:82
 #: libraries/server_variables.lib.php:189 libraries/tracking.lib.php:280
-#: libraries/tracking.lib.php:793 templates/structure/table_header.phtml:30
-#: templates/structure/table_structure_header.phtml:23
+#: libraries/tracking.lib.php:793
+#: templates/database/structure/table_header.phtml:30
+#: templates/table/structure/table_structure_header.phtml:23
 msgid "Action"
 msgstr "Operace"
 
@@ -433,7 +435,7 @@ msgid "Untracked tables"
 msgstr "Nesledované tabulky"
 
 #: db_tracking.php:305 db_tracking.php:336
-#: templates/structure/optional_action_links.phtml:17
+#: templates/table/structure/optional_action_links.phtml:17
 msgid "Track table"
 msgstr "Sledovat tabulku"
 
@@ -485,7 +487,7 @@ msgid "Value for the column \"%s\""
 msgstr "Hodnota pro sloupec „%s“"
 
 #: gis_data_editor.php:146
-#: templates/gis_visualization/gis_visualization.phtml:37
+#: templates/table/gis_visualization/gis_visualization.phtml:37
 msgid "Use OpenStreetMaps as Base Layer"
 msgstr "Použít OpenStreetMap jako základní vrstvu"
 
@@ -565,35 +567,35 @@ msgstr "Přidat geometrii"
 #: libraries/display_change_password.lib.php:162
 #: libraries/display_export.lib.php:402 libraries/display_export.lib.php:408
 #: libraries/display_import.lib.php:392 libraries/index.lib.php:44
-#: libraries/insert_edit.lib.php:1546 libraries/insert_edit.lib.php:1583
+#: libraries/insert_edit.lib.php:1544 libraries/insert_edit.lib.php:1581
 #: libraries/normalization.lib.php:165 libraries/normalization.lib.php:821
 #: libraries/operations.lib.php:38 libraries/operations.lib.php:108
 #: libraries/operations.lib.php:263 libraries/operations.lib.php:306
 #: libraries/operations.lib.php:801 libraries/operations.lib.php:874
 #: libraries/operations.lib.php:923 libraries/operations.lib.php:1337
 #: libraries/operations.lib.php:1658
-#: libraries/plugins/auth/AuthenticationCookie.class.php:244
+#: libraries/plugins/auth/AuthenticationCookie.class.php:232
 #: libraries/replication_gui.lib.php:122 libraries/replication_gui.lib.php:161
 #: libraries/replication_gui.lib.php:324 libraries/replication_gui.lib.php:461
 #: libraries/replication_gui.lib.php:906 libraries/rte/rte_events.lib.php:509
-#: libraries/rte/rte_routines.lib.php:969
-#: libraries/rte/rte_routines.lib.php:1581
+#: libraries/rte/rte_routines.lib.php:1060
+#: libraries/rte/rte_routines.lib.php:1672
 #: libraries/rte/rte_triggers.lib.php:396 libraries/server_bin_log.lib.php:61
 #: libraries/server_privileges.lib.php:705
 #: libraries/server_privileges.lib.php:2106
 #: libraries/server_privileges.lib.php:2872
 #: libraries/server_privileges.lib.php:3553
-#: libraries/server_privileges.lib.php:4627
+#: libraries/server_privileges.lib.php:4653
 #: libraries/server_user_groups.lib.php:285
 #: libraries/sql_query_form.lib.php:369 libraries/sql_query_form.lib.php:429
 #: libraries/tracking.lib.php:533 libraries/tracking.lib.php:653
 #: prefs_manage.php:277 prefs_manage.php:355
 #: templates/columns_definitions/column_definitions_form.phtml:59
-#: templates/header_location.phtml:17 templates/index_form.phtml:238
+#: templates/database/create_table.phtml:21 templates/header_location.phtml:28
 #: templates/startAndNumberOfRowsPanel.phtml:14
-#: templates/structure/add_column.phtml:25
-#: templates/table/create_table.phtml:21
-#: templates/table/selection_form.phtml:75 view_create.php:275
+#: templates/table/index_form.phtml:238
+#: templates/table/search/selection_form.phtml:75
+#: templates/table/structure/add_column.phtml:25 view_create.php:275
 #: view_operations.php:106
 msgid "Go"
 msgstr "Proveď"
@@ -682,7 +684,7 @@ msgid "Could not load import plugins, please check your installation!"
 msgstr ""
 "Nepodařilo se nahrát pluginy pro import, zkontrolujte prosím vaší instalaci!"
 
-#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1466
+#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1460
 #, php-format
 msgid "Bookmark %s has been created."
 msgstr "Byl vytvořen oblíbený dotaz %s."
@@ -721,11 +723,11 @@ msgstr "Nelze zjistit průběh importu."
 msgid "Back"
 msgstr "Zpět"
 
-#: index.php:148 libraries/Footer.class.php:70
+#: index.php:149 libraries/Footer.class.php:70
 msgid "phpMyAdmin Demo Server"
 msgstr "Demo server phpMyAdmina"
 
-#: index.php:152
+#: index.php:153
 #, php-format
 msgid ""
 "You are using the demo server. You can do anything here, but please do not "
@@ -735,110 +737,110 @@ msgstr ""
 "Používáte demo server. Můžete zde provádět cokoliv, ale prosím neměňtě "
 "uživatele root, debian-sys-maint a pma. Více informací naleznete na %s."
 
-#: index.php:162
+#: index.php:163
 msgid "General Settings"
 msgstr "Obecná nastavení"
 
-#: index.php:190 libraries/display_change_password.lib.php:50
+#: index.php:191 libraries/display_change_password.lib.php:50
 #: libraries/display_change_password.lib.php:53 user_password.php:247
 msgid "Change password"
 msgstr "Změnit heslo"
 
-#: index.php:206
+#: index.php:207
 msgid "Server connection collation"
 msgstr "Porovnávání pro toto připojení k serveru"
 
-#: index.php:228
+#: index.php:229
 msgid "Appearance Settings"
 msgstr "Nastavení vzhledu"
 
-#: index.php:258 prefs_manage.php:285
+#: index.php:259 prefs_manage.php:285
 msgid "More settings"
 msgstr "Více nastavení"
 
-#: index.php:279
+#: index.php:280
 msgid "Database server"
 msgstr "Databázový server"
 
-#: index.php:282 libraries/plugins/auth/AuthenticationCookie.class.php:181
+#: index.php:283 libraries/plugins/auth/AuthenticationCookie.class.php:169
 msgid "Server:"
 msgstr "Server:"
 
-#: index.php:286
+#: index.php:287
 msgid "Server type:"
 msgstr "Typ serveru:"
 
-#: index.php:290 libraries/plugins/export/ExportLatex.class.php:212
+#: index.php:291 libraries/plugins/export/ExportLatex.class.php:212
 #: libraries/plugins/export/ExportSql.class.php:687
 #: libraries/plugins/export/ExportXml.class.php:189
 msgid "Server version:"
 msgstr "Verze serveru:"
 
-#: index.php:296
+#: index.php:297
 msgid "Protocol version:"
 msgstr "Verze protokolu:"
 
-#: index.php:300
+#: index.php:301
 msgid "User:"
 msgstr "Uživatel:"
 
-#: index.php:305
+#: index.php:306
 msgid "Server charset:"
 msgstr "Znaková sada:"
 
-#: index.php:320
+#: index.php:321
 msgid "Web server"
 msgstr "Webový server"
 
-#: index.php:331
+#: index.php:332
 msgid "Database client version:"
 msgstr "Verze databázového klienta:"
 
-#: index.php:335
+#: index.php:336
 msgid "PHP extension:"
 msgstr "Rozšíření PHP:"
 
-#: index.php:349
+#: index.php:350
 msgid "PHP version:"
 msgstr "Verze PHP:"
 
-#: index.php:360
+#: index.php:361
 msgid "Show PHP information"
 msgstr "Zobrazit informace o PHP"
 
-#: index.php:383
+#: index.php:384
 msgid "Version information:"
 msgstr "Informace o verzi:"
 
-#: index.php:392 libraries/Util.class.php:432 libraries/Util.class.php:495
-#: libraries/config/FormDisplay.tpl.php:151
+#: index.php:393 libraries/Util.class.php:432 libraries/Util.class.php:495
+#: libraries/config/FormDisplay.tpl.php:162
 #: libraries/display_export.lib.php:577 libraries/engines/pbxt.lib.php:162
 #: libraries/navigation/NavigationHeader.class.php:196
 #: libraries/server_variables.lib.php:160
 msgid "Documentation"
 msgstr "Dokumentace"
 
-#: index.php:399
+#: index.php:400
 msgid "Wiki"
 msgstr "Wiki"
 
-#: index.php:408
+#: index.php:409
 msgid "Official Homepage"
 msgstr "Oficiální stránka phpMyAdmina"
 
-#: index.php:415
+#: index.php:416
 msgid "Contribute"
 msgstr "Přispějte"
 
-#: index.php:422
+#: index.php:423
 msgid "Get support"
 msgstr "Získejte podporu"
 
-#: index.php:429
+#: index.php:430
 msgid "List of changes"
 msgstr "Seznam změn"
 
-#: index.php:451
+#: index.php:452
 msgid ""
 "You are connected as 'root' with no password, which corresponds to the "
 "default MySQL privileged account. Your MySQL server is running with this "
@@ -849,7 +851,7 @@ msgstr ""
 "privilegovaného uživatele v MySQL. Doporučujeme nastavit heslo pro uživatele "
 "„root“ a tím podstatně zvýšit zabezpečení vašeho serveru."
 
-#: index.php:468
+#: index.php:469
 msgid ""
 "You have enabled mbstring.func_overload in your PHP configuration. This "
 "option is incompatible with phpMyAdmin and might cause some data to be "
@@ -858,7 +860,7 @@ msgstr ""
 "V nastavení PHP máte zapnuto mbstring.func_overload. Toto nastavení není "
 "kompatibilní s phpMyAdminem a může způsobit poškození dat!"
 
-#: index.php:483
+#: index.php:484
 msgid ""
 "The mbstring PHP extension was not found and you seem to be using a "
 "multibyte charset. Without the mbstring extension phpMyAdmin is unable to "
@@ -868,7 +870,7 @@ msgstr ""
 "bajtovou znakovou sadu. Bez rozšíření mbstring neumí phpMyAdmin správně "
 "rozdělovat řetězce a proto to může mít nečekané následky."
 
-#: index.php:500
+#: index.php:501
 msgid ""
 "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini."
 "session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower than "
@@ -880,7 +882,7 @@ msgstr ""
 "než platnost cookie nastavená v phpMyAdminovi. Z tohoto důvodu bude vaše "
 "přilášení neplatné dříve, než jak je nastaveno v phpMyAdminovi."
 
-#: index.php:519
+#: index.php:520
 msgid ""
 "Login cookie store is lower than cookie validity configured in phpMyAdmin, "
 "because of this, your login will expire sooner than configured in phpMyAdmin."
@@ -889,13 +891,13 @@ msgstr ""
 "phpMyAdminovi. Z tohoto důvodu vaše přihlášení vyprší dříve než je nastavené "
 "v phpMyAdminovi."
 
-#: index.php:535
+#: index.php:536
 msgid "The configuration file now needs a secret passphrase (blowfish_secret)."
 msgstr ""
 "Nastavte klíč pro šifrování cookies (blowfish_secret) v konfiguračním "
 "souboru (config.inc.php)."
 
-#: index.php:548
+#: index.php:549
 msgid ""
 "Directory [code]config[/code], which is used by the setup script, still "
 "exists in your phpMyAdmin directory. It is strongly recommended to remove it "
@@ -907,7 +909,7 @@ msgstr ""
 "phpMyAdmin nastaven. Pokud tak neučiníte, může být váš server ohrožen cizími "
 "lidmi přistupujícími k vašemu nastavení."
 
-#: index.php:564
+#: index.php:565
 #, php-format
 msgid ""
 "The phpMyAdmin configuration storage is not completely configured, some "
@@ -916,14 +918,14 @@ msgstr ""
 "Úložiště nastavení phpMyAdmina není plně dostupné, některé z rozšířených "
 "funkcí phpMyAdmina nelze používat. %sZjistěte proč%s. "
 
-#: index.php:571
+#: index.php:572
 msgid ""
 "Or alternately go to 'Operations' tab of any database to set it up there."
 msgstr ""
 "Nebo alternativně jděte do oddílu 'Operace' u jakékoli databáze, kde je "
 "možné rovněž toto nastavit."
 
-#: index.php:620
+#: index.php:621
 #, php-format
 msgid ""
 "Your PHP MySQL library version %s differs from your MySQL server version %s. "
@@ -932,7 +934,7 @@ msgstr ""
 "Používaný MySQL modul v PHP je kompilován pro MySQL %s a server používá "
 "verzi %s. Používání různých verzí může způsobit problémy."
 
-#: index.php:648
+#: index.php:649
 #, php-format
 msgid ""
 "Server running with Suhosin. Please refer to %sdocumentation%s for possible "
@@ -1084,8 +1086,8 @@ msgstr "Opravdu chcete změnit řazení ve všech sloupcích a zkonvertovat data
 msgid "Save & Close"
 msgstr "Uložit a zavřít"
 
-#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:404
-#: libraries/insert_edit.lib.php:1550 prefs_manage.php:361
+#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:415
+#: libraries/insert_edit.lib.php:1548 prefs_manage.php:361
 #: prefs_manage.php:372
 msgid "Reset"
 msgstr "Původní"
@@ -1118,7 +1120,7 @@ msgstr "Přidat klíč"
 msgid "Edit Index"
 msgstr "Upravit klíč"
 
-#: js/messages.php:99 templates/index_form.phtml:232
+#: js/messages.php:99 templates/table/index_form.phtml:232
 #, php-format
 msgid "Add %s column(s) to index"
 msgstr "Přidat %s polí do klíče"
@@ -1139,13 +1141,14 @@ msgstr "Složit s:"
 msgid "Please select column(s) for the index."
 msgstr "Prosím zvolte které pole chcete přidat do klíče."
 
-#: js/messages.php:106 templates/structure/add_column.phtml:1
+#: js/messages.php:106 templates/table/structure/add_column.phtml:1
 msgid "You have to add at least one column."
 msgstr "Musíte přidat alespoň jedno pole."
 
-#: js/messages.php:109 libraries/insert_edit.lib.php:1548
+#: js/messages.php:109 libraries/insert_edit.lib.php:1546
 #: templates/columns_definitions/column_definitions_form.phtml:162
-#: templates/index_form.phtml:237 templates/tbl_relation/common_form.phtml:106
+#: templates/table/index_form.phtml:237
+#: templates/table/relation/common_form.phtml:106
 msgid "Preview SQL"
 msgstr "Náhled SQL"
 
@@ -1162,7 +1165,7 @@ msgid "SQL query:"
 msgstr "SQL dotaz:"
 
 #. l10n: Default label for the y-Axis of Charts
-#: js/messages.php:118 templates/tbl_chart.phtml:109
+#: js/messages.php:118 templates/table/chart/tbl_chart.phtml:109
 msgid "Y Values"
 msgstr "Hodnoty Y"
 
@@ -1316,7 +1319,7 @@ msgstr "Odesláno bajtů"
 msgid "Bytes received"
 msgstr "Přijato bajtů"
 
-#: js/messages.php:169 libraries/server_status.lib.php:226
+#: js/messages.php:169 libraries/server_status.lib.php:235
 msgid "Connections"
 msgstr "Připojení"
 
@@ -1373,12 +1376,12 @@ msgstr "%d tabulek"
 msgid "Questions"
 msgstr "Dotazy"
 
-#: js/messages.php:184 libraries/server_status.lib.php:134
+#: js/messages.php:184 libraries/server_status.lib.php:143
 msgid "Traffic"
 msgstr "Provoz"
 
 #: js/messages.php:185 libraries/Menu.class.php:586
-#: libraries/Util.class.php:4318 libraries/server_status_monitor.lib.php:257
+#: libraries/Util.class.php:4324 libraries/server_status_monitor.lib.php:257
 msgid "Settings"
 msgstr "Nastavení"
 
@@ -1398,8 +1401,9 @@ msgstr "Prosím přidejte do série alespoň jednu hodnotu!"
 #: libraries/server_status_monitor.lib.php:236
 #: libraries/server_status_processes.lib.php:308
 #: templates/columns_definitions/transformation.phtml:4
-#: templates/designer/options_panel.phtml:178
-#: templates/table/options_zoom.phtml:12 templates/table/rows_zoom.phtml:26
+#: templates/database/designer/options_panel.phtml:178
+#: templates/table/search/options_zoom.phtml:12
+#: templates/table/search/rows_zoom.phtml:26
 msgid "None"
 msgstr "Žádná"
 
@@ -1688,8 +1692,8 @@ msgstr ""
 
 #: js/messages.php:270 libraries/Menu.class.php:352
 #: libraries/Menu.class.php:455 libraries/Menu.class.php:582
-#: libraries/Util.class.php:4317 libraries/Util.class.php:4332
-#: libraries/Util.class.php:4349 libraries/config/messages.inc.php:258
+#: libraries/Util.class.php:4323 libraries/Util.class.php:4338
+#: libraries/Util.class.php:4355 libraries/config/messages.inc.php:258
 #: libraries/display_import.lib.php:105
 #: libraries/server_status_monitor.lib.php:318 prefs_manage.php:238
 #: setup/frames/menu.inc.php:26
@@ -1749,13 +1753,13 @@ msgid "Formatting SQL..."
 msgstr "Formátuji SQL..."
 
 #: js/messages.php:293 libraries/server_variables.lib.php:157
-#: templates/designer/aggregate_query_panel.phtml:63
-#: templates/designer/delete_relation_panel.phtml:28
-#: templates/designer/having_query_panel.phtml:117
-#: templates/designer/new_relation_panel.phtml:88
-#: templates/designer/options_panel.phtml:253
-#: templates/designer/rename_to_panel.phtml:45
-#: templates/designer/where_query_panel.phtml:83
+#: templates/database/designer/aggregate_query_panel.phtml:63
+#: templates/database/designer/delete_relation_panel.phtml:28
+#: templates/database/designer/having_query_panel.phtml:117
+#: templates/database/designer/new_relation_panel.phtml:88
+#: templates/database/designer/options_panel.phtml:253
+#: templates/database/designer/rename_to_panel.phtml:45
+#: templates/database/designer/where_query_panel.phtml:83
 msgid "Cancel"
 msgstr "Zrušit"
 
@@ -1763,7 +1767,7 @@ msgstr "Zrušit"
 msgid "Page-related settings"
 msgstr "Nastavení stránky"
 
-#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:402
+#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:413
 msgid "Apply"
 msgstr "Použít"
 
@@ -1798,8 +1802,8 @@ msgstr "Číslo chyby: %s"
 msgid "Error text: %s"
 msgstr "Popis chyby: %s"
 
-#: js/messages.php:307 libraries/db_common.inc.php:68
-#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:450
+#: js/messages.php:307 libraries/db_common.inc.php:69
+#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:461
 msgid "No databases selected."
 msgstr "Nebyla vybrána žádná databáze."
 
@@ -1811,12 +1815,13 @@ msgstr "Odstraňuji sloupec"
 msgid "Adding Primary Key"
 msgstr "Přidávám primární klíč"
 
-#: js/messages.php:310 templates/designer/aggregate_query_panel.phtml:59
-#: templates/designer/having_query_panel.phtml:113
-#: templates/designer/new_relation_panel.phtml:87
-#: templates/designer/options_panel.phtml:252
-#: templates/designer/rename_to_panel.phtml:41
-#: templates/designer/where_query_panel.phtml:82
+#: js/messages.php:310
+#: templates/database/designer/aggregate_query_panel.phtml:59
+#: templates/database/designer/having_query_panel.phtml:113
+#: templates/database/designer/new_relation_panel.phtml:87
+#: templates/database/designer/options_panel.phtml:252
+#: templates/database/designer/rename_to_panel.phtml:41
+#: templates/database/designer/where_query_panel.phtml:82
 msgid "OK"
 msgstr "OK"
 
@@ -1836,7 +1841,7 @@ msgstr "Kopíruji databázi"
 msgid "Changing Charset"
 msgstr "Měním znakovou sadu"
 
-#: js/messages.php:320 libraries/Util.class.php:3217
+#: js/messages.php:320 libraries/Util.class.php:3223
 msgid "Enable foreign key checks"
 msgstr "Zapnout kontrolu cizích klíčů"
 
@@ -1871,20 +1876,21 @@ msgstr "Definice uložené funkce musí obsahovat příkaz RETURN!"
 #: js/messages.php:334 libraries/DisplayResults.class.php:4834
 #: libraries/DisplayResults.class.php:5092 libraries/Menu.class.php:344
 #: libraries/Menu.class.php:446 libraries/Menu.class.php:578
-#: libraries/Util.class.php:3636 libraries/Util.class.php:3637
-#: libraries/Util.class.php:4316 libraries/Util.class.php:4331
-#: libraries/Util.class.php:4348 libraries/config/messages.inc.php:252
+#: libraries/Util.class.php:3642 libraries/Util.class.php:3643
+#: libraries/Util.class.php:4322 libraries/Util.class.php:4337
+#: libraries/Util.class.php:4354 libraries/config/messages.inc.php:252
 #: libraries/display_export.lib.php:173 libraries/rte/rte_list.lib.php:146
 #: libraries/server_privileges.lib.php:2211
 #: libraries/server_privileges.lib.php:2290
 #: libraries/server_privileges.lib.php:2632
 #: libraries/server_privileges.lib.php:3356
 #: libraries/server_status_monitor.lib.php:322 prefs_manage.php:303
-#: setup/frames/menu.inc.php:27 templates/structure/check_all_tables.phtml:11
+#: setup/frames/menu.inc.php:27
+#: templates/database/structure/check_all_tables.phtml:11
 msgid "Export"
 msgstr "Export"
 
-#: js/messages.php:337 libraries/rte/rte_routines.lib.php:652
+#: js/messages.php:337 libraries/rte/rte_routines.lib.php:743
 msgid "ENUM/SET editor"
 msgstr "Upravit ENUM/SET"
 
@@ -1923,7 +1929,7 @@ msgstr "Zobrazit pole pro dotaz"
 #: libraries/Console.class.php:214 libraries/DisplayResults.class.php:3474
 #: libraries/DisplayResults.class.php:4818 libraries/Index.class.php:723
 #: libraries/Util.class.php:706 libraries/Util.class.php:1202
-#: libraries/Util.class.php:3634 libraries/Util.class.php:3635
+#: libraries/Util.class.php:3640 libraries/Util.class.php:3641
 #: libraries/central_columns.lib.php:851
 #: libraries/central_columns.lib.php:1193
 #: libraries/config/messages.inc.php:892
@@ -1941,7 +1947,7 @@ msgstr "Upravit"
 #: libraries/server_user_groups.lib.php:129
 #: libraries/sql_query_form.lib.php:416 libraries/tracking.lib.php:477
 #: setup/frames/index.inc.php:183 setup/frames/index.inc.php:291
-#: templates/designer/delete_relation_panel.phtml:27
+#: templates/database/designer/delete_relation_panel.phtml:27
 msgid "Delete"
 msgstr "Odstranit"
 
@@ -2110,11 +2116,11 @@ msgid "No dependencies selected!"
 msgstr "Nebyly vybrány žádné závislosti!"
 
 #: js/messages.php:394 libraries/central_columns.lib.php:1214
-#: libraries/insert_edit.lib.php:1458 libraries/server_variables.lib.php:155
+#: libraries/insert_edit.lib.php:1456 libraries/server_variables.lib.php:155
 #: setup/frames/config.inc.php:42 setup/frames/index.inc.php:279
 #: templates/columns_definitions/column_definitions_form.phtml:165
-#: templates/gis_visualization/gis_visualization.phtml:48
-#: templates/tbl_relation/common_form.phtml:107
+#: templates/table/gis_visualization/gis_visualization.phtml:48
+#: templates/table/relation/common_form.phtml:107
 msgid "Save"
 msgstr "Uložit"
 
@@ -2191,8 +2197,8 @@ msgid "Data point content"
 msgstr "Obsah datového bodu"
 
 #: js/messages.php:430 js/messages.php:562 js/messages.php:579
-#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2573
-#: templates/index_form.phtml:154 templates/index_form.phtml:194
+#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2571
+#: templates/table/index_form.phtml:154 templates/table/index_form.phtml:194
 msgid "Ignore"
 msgstr "Ignorovat"
 
@@ -2253,8 +2259,8 @@ msgstr "Zvolte cizí klíč"
 msgid "Please select the primary key or a unique key!"
 msgstr "Prosím zvolte primární nebo unikátní klíč!"
 
-#: js/messages.php:457 templates/designer/side_menu.phtml:91
-#: templates/designer/side_menu.phtml:94
+#: js/messages.php:457 templates/database/designer/side_menu.phtml:91
+#: templates/database/designer/side_menu.phtml:94
 msgid "Choose column to display"
 msgstr "Zvolte která pole zobrazit"
 
@@ -2270,18 +2276,18 @@ msgstr ""
 msgid "Page name"
 msgstr "Jméno stránky"
 
-#: js/messages.php:463 templates/designer/side_menu.phtml:56
-#: templates/designer/side_menu.phtml:59
+#: js/messages.php:463 templates/database/designer/side_menu.phtml:56
+#: templates/database/designer/side_menu.phtml:59
 msgid "Save page"
 msgstr "Uložit stránku"
 
-#: js/messages.php:464 templates/designer/side_menu.phtml:63
-#: templates/designer/side_menu.phtml:66
+#: js/messages.php:464 templates/database/designer/side_menu.phtml:63
+#: templates/database/designer/side_menu.phtml:66
 msgid "Save page as"
 msgstr "Uložit stránku jako"
 
-#: js/messages.php:465 templates/designer/side_menu.phtml:49
-#: templates/designer/side_menu.phtml:52
+#: js/messages.php:465 templates/database/designer/side_menu.phtml:49
+#: templates/database/designer/side_menu.phtml:52
 msgid "Open page"
 msgstr "Otevřít stránku"
 
@@ -2289,7 +2295,7 @@ msgstr "Otevřít stránku"
 msgid "Delete page"
 msgstr "Odstranit stránku"
 
-#: js/messages.php:467 templates/designer/side_menu.phtml:10
+#: js/messages.php:467 templates/database/designer/side_menu.phtml:10
 msgid "Untitled"
 msgstr "Beze jména"
 
@@ -2409,7 +2415,7 @@ msgstr "Původní délka"
 msgid "cancel"
 msgstr "zrušit"
 
-#: js/messages.php:499 libraries/server_status.lib.php:271
+#: js/messages.php:499 libraries/server_status.lib.php:280
 msgid "Aborted"
 msgstr "Přerušené"
 
@@ -2972,7 +2978,7 @@ msgstr "Prosím zadejte platné hexadecimalní číslo"
 
 #: js/messages.php:793 libraries/Message.class.php:199
 #: libraries/Util.class.php:654 libraries/core.lib.php:245
-#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1172
+#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1170
 #: tbl_operations.php:229 view_operations.php:63
 msgid "Error"
 msgstr "Chyba"
@@ -3034,8 +3040,8 @@ msgstr "za sekundu"
 msgid "per minute"
 msgstr "za minutu"
 
-#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:143
-#: libraries/server_status.lib.php:228
+#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:152
+#: libraries/server_status.lib.php:237
 #: libraries/server_status_queries.lib.php:98
 msgid "per hour"
 msgstr "za hodinu"
@@ -3055,7 +3061,7 @@ msgstr ""
 "Chybná přístupová práva konfiguračního souboru, neměl by být zapisovatelný "
 "pro všechny!"
 
-#: libraries/Config.class.php:1799
+#: libraries/Config.class.php:1801
 msgid "Font size"
 msgstr "Velikost písma"
 
@@ -3083,10 +3089,10 @@ msgstr "Znovu"
 #: libraries/server_privileges.lib.php:2890
 #: libraries/server_privileges.lib.php:3144
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4332
+#: libraries/server_privileges.lib.php:4358
 #: libraries/server_status_processes.lib.php:80
-#: templates/tbl_relation/foreign_key_row.phtml:165
-#: templates/tbl_relation/internal_relational_row.phtml:55
+#: templates/table/relation/foreign_key_row.phtml:165
+#: templates/table/relation/internal_relational_row.phtml:55
 msgid "Database"
 msgstr "Databáze"
 
@@ -3180,11 +3186,11 @@ msgstr "Historie"
 #: libraries/plugins/import/ImportMediawiki.class.php:60
 #: libraries/plugins/import/ImportOds.class.php:59
 #: libraries/plugins/import/ImportShp.class.php:57
-#: libraries/plugins/import/ImportSql.class.php:148
+#: libraries/plugins/import/ImportSql.class.php:51
 #: libraries/plugins/import/ImportXml.class.php:58
-#: libraries/rte/rte_routines.lib.php:833 templates/index_form.phtml:49
-#: templates/structure/row_stats_table.phtml:20
-#: templates/table/options.phtml:2
+#: libraries/rte/rte_routines.lib.php:924 templates/table/index_form.phtml:49
+#: templates/table/search/options.phtml:2
+#: templates/table/structure/row_stats_table.phtml:20
 msgid "Options"
 msgstr "Nastavení"
 
@@ -3217,7 +3223,8 @@ msgstr "sestupně"
 msgid "Order:"
 msgstr "Pořadí:"
 
-#: libraries/Console.class.php:289 templates/table/replace_preview.phtml:17
+#: libraries/Console.class.php:289
+#: templates/table/search/replace_preview.phtml:17
 msgid "Count"
 msgstr "Počet"
 
@@ -3314,9 +3321,9 @@ msgstr "Přepnout na tmavý motiv"
 #: libraries/operations.lib.php:794 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:191
-#: templates/structure/sortable_header.phtml:21
-#: templates/structure/sortable_header.phtml:38
-#: templates/table/options.phtml:68
+#: templates/database/structure/sortable_header.phtml:21
+#: templates/database/structure/sortable_header.phtml:38
+#: templates/table/search/options.phtml:68
 msgid "Ascending"
 msgstr "Vzestupně"
 
@@ -3326,13 +3333,14 @@ msgstr "Vzestupně"
 #: libraries/operations.lib.php:797 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:188
-#: templates/structure/sortable_header.phtml:26
-#: templates/structure/sortable_header.phtml:43
-#: templates/table/options.phtml:69
+#: templates/database/structure/sortable_header.phtml:26
+#: templates/database/structure/sortable_header.phtml:43
+#: templates/table/search/options.phtml:69
 msgid "Descending"
 msgstr "Sestupně"
 
-#: libraries/DBQbe.class.php:467 templates/table/search_and_replace.phtml:6
+#: libraries/DBQbe.class.php:467
+#: templates/table/search/search_and_replace.phtml:6
 msgid "Column:"
 msgstr "Pole:"
 
@@ -3494,12 +3502,12 @@ msgstr[1] "%1$s odpovídající záznamy v <strong>%2$s</strong>"
 msgstr[2] "%1$s odpovídajících záznamů v <strong>%2$s</strong>"
 
 #: libraries/DbSearch.class.php:354 libraries/Menu.class.php:311
-#: libraries/Util.class.php:3337 libraries/Util.class.php:3347
-#: libraries/Util.class.php:3623 libraries/Util.class.php:3624
-#: libraries/Util.class.php:4343 libraries/config.values.php:43
+#: libraries/Util.class.php:3343 libraries/Util.class.php:3353
+#: libraries/Util.class.php:3629 libraries/Util.class.php:3630
+#: libraries/Util.class.php:4349 libraries/config.values.php:43
 #: libraries/config.values.php:51 libraries/config.values.php:119
 #: libraries/navigation/Nodes/Node_Table.class.php:295
-#: templates/structure/check_all_table_column.phtml:5
+#: templates/table/structure/check_all_table_column.phtml:5
 msgid "Browse"
 msgstr "Projít"
 
@@ -3516,7 +3524,8 @@ msgstr "Vyhledávání v databázi"
 msgid "Words or values to search for (wildcard: \"%\"):"
 msgstr "Slova nebo hodnoty, které si přejete vyhledat (zástupný znak: „%“):"
 
-#: libraries/DbSearch.class.php:401 templates/table/search_and_replace.phtml:1
+#: libraries/DbSearch.class.php:401
+#: templates/table/search/search_and_replace.phtml:1
 msgid "Find:"
 msgstr "Najít:"
 
@@ -3560,28 +3569,28 @@ msgstr "Filtrovat řádky"
 msgid "Search this table"
 msgstr "Vyhledávání v této tabulce"
 
-#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2532
-#: libraries/Util.class.php:2535
+#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2538
+#: libraries/Util.class.php:2541
 msgctxt "First page"
 msgid "Begin"
 msgstr "První"
 
-#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2533
-#: libraries/Util.class.php:2536 libraries/server_bin_log.lib.php:170
+#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2539
+#: libraries/Util.class.php:2542 libraries/server_bin_log.lib.php:170
 #: libraries/server_bin_log.lib.php:172
 msgctxt "Previous page"
 msgid "Previous"
 msgstr "Předchozí"
 
-#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2564
-#: libraries/Util.class.php:2574 libraries/server_bin_log.lib.php:204
+#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2570
+#: libraries/Util.class.php:2580 libraries/server_bin_log.lib.php:204
 #: libraries/server_bin_log.lib.php:206
 msgctxt "Next page"
 msgid "Next"
 msgstr "Následující"
 
-#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2565
-#: libraries/Util.class.php:2575
+#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2571
+#: libraries/Util.class.php:2581
 msgctxt "Last page"
 msgid "End"
 msgstr "Poslední"
@@ -3656,15 +3665,15 @@ msgid "May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]."
 msgstr "Počet nemusí být přesný, viz [doc@faq3-11]FAQ 3.11[/doc]."
 
 #: libraries/DisplayResults.class.php:4332 libraries/Message.class.php:180
-#: libraries/controllers/TableRelationController.class.php:258
+#: libraries/controllers/TableRelationController.class.php:259
 #: libraries/controllers/TableSearchController.class.php:655
-#: libraries/rte/rte_routines.lib.php:1332 libraries/sql_query_form.lib.php:89
+#: libraries/rte/rte_routines.lib.php:1423 libraries/sql_query_form.lib.php:89
 #: tbl_operations.php:227 tbl_row_action.php:138 view_operations.php:62
 msgid "Your SQL query has been executed successfully."
 msgstr "Váš SQL-dotaz byl úspěšně vykonán."
 
 #: libraries/DisplayResults.class.php:4660
-#: libraries/controllers/StructureController.class.php:629
+#: libraries/controllers/DatabaseStructureController.class.php:564
 #, php-format
 msgid ""
 "This view has at least this number of rows. Please refer to %sdocumentation"
@@ -3687,33 +3696,33 @@ msgstr "%1$d celkem, %2$d v dotazu"
 msgid "%d total"
 msgstr "%d celkem"
 
-#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1318
+#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1312
 #, php-format
 msgid "Query took %01.4f seconds."
 msgstr "Dotaz trval %01.4f sekund."
 
 #: libraries/DisplayResults.class.php:4807
-#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4767
-#: libraries/Util.class.php:4773 libraries/mult_submits.inc.php:50
-#: templates/structure/check_all_tables.phtml:2
-#: templates/structure/check_all_tables.phtml:9
+#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4773
+#: libraries/Util.class.php:4779 libraries/mult_submits.inc.php:50
+#: templates/database/structure/check_all_tables.phtml:2
+#: templates/database/structure/check_all_tables.phtml:9
 msgid "With selected:"
 msgstr "Zaškrtnuté:"
 
 #: libraries/DisplayResults.class.php:4811
-#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4769
-#: libraries/Util.class.php:4770 libraries/server_privileges.lib.php:1174
+#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4775
+#: libraries/Util.class.php:4776 libraries/server_privileges.lib.php:1174
 #: libraries/server_privileges.lib.php:1175
 #: libraries/server_privileges.lib.php:1387
 #: libraries/server_user_groups.lib.php:231
-#: templates/structure/check_all_tables.phtml:3
-#: templates/structure/check_all_tables.phtml:4
+#: templates/database/structure/check_all_tables.phtml:3
+#: templates/database/structure/check_all_tables.phtml:4
 msgid "Check All"
 msgstr "Zaškrtnout vše"
 
 #: libraries/DisplayResults.class.php:4985 libraries/Header.class.php:383
-#: templates/structure/optional_action_links.phtml:1
-#: templates/structure/print_view_data_dictionary_link.phtml:3
+#: templates/database/structure/print_view_data_dictionary_link.phtml:3
+#: templates/table/structure/optional_action_links.phtml:1
 msgid "Print view"
 msgstr "Náhled pro tisk"
 
@@ -3721,7 +3730,8 @@ msgstr "Náhled pro tisk"
 msgid "Query results operations"
 msgstr "Operace s výsledky dotazu"
 
-#: libraries/DisplayResults.class.php:5105 templates/tbl_chart.phtml:12
+#: libraries/DisplayResults.class.php:5105
+#: templates/table/chart/tbl_chart.phtml:12
 msgid "Display chart"
 msgstr "Zobrazit graf"
 
@@ -3816,7 +3826,7 @@ msgid "Click on the bar to scroll to top of page"
 msgstr "Klikněte na pruh pro posunutí stránky nahoru"
 
 #: libraries/Header.class.php:749
-#: libraries/plugins/auth/AuthenticationCookie.class.php:152
+#: libraries/plugins/auth/AuthenticationCookie.class.php:140
 msgid "Javascript must be enabled past this point!"
 msgstr "Pro použití phpMyAdmina musíte mít zapnutý Javascript!"
 
@@ -3838,11 +3848,11 @@ msgid "Keyname"
 msgstr "Název klíče"
 
 #: libraries/Index.class.php:697
-#: libraries/controllers/StructureController.class.php:1962
-#: libraries/controllers/StructureController.class.php:1967
+#: libraries/controllers/TableStructureController.class.php:953
+#: libraries/controllers/TableStructureController.class.php:958
 #: libraries/tracking.lib.php:973
 #: templates/columns_definitions/column_indexes.phtml:11
-#: templates/structure/check_all_table_column.phtml:26
+#: templates/table/structure/check_all_table_column.phtml:26
 msgid "Unique"
 msgstr "Unikátní"
 
@@ -3861,16 +3871,17 @@ msgstr "Mohutnost"
 #: libraries/server_collations.lib.php:35 libraries/tracking.lib.php:881
 #: libraries/tracking.lib.php:977
 #: templates/columns_definitions/table_fields_definitions.phtml:33
-#: templates/structure/row_stats_table.phtml:31
-#: templates/structure/table_header.phtml:55
-#: templates/structure/table_structure_header.phtml:7
-#: templates/table/table_header.phtml:8
+#: templates/database/structure/table_header.phtml:55
+#: templates/table/search/table_header.phtml:8
+#: templates/table/structure/row_stats_table.phtml:31
+#: templates/table/structure/table_structure_header.phtml:7
 msgid "Collation"
 msgstr "Porovnávání"
 
 #: libraries/Index.class.php:703 libraries/rte/rte_events.lib.php:496
-#: libraries/rte/rte_routines.lib.php:956 libraries/tracking.lib.php:885
-#: libraries/tracking.lib.php:979 templates/structure/table_header.phtml:84
+#: libraries/rte/rte_routines.lib.php:1047 libraries/tracking.lib.php:885
+#: libraries/tracking.lib.php:979
+#: templates/database/structure/table_header.phtml:84
 msgid "Comment"
 msgstr "Komentář"
 
@@ -3883,15 +3894,15 @@ msgstr "Primární klíč byl odstraněn."
 msgid "Index %s has been dropped."
 msgstr "Klíč %s byl odstraněn."
 
-#: libraries/Index.class.php:757 libraries/Util.class.php:3630
-#: libraries/Util.class.php:3631
-#: libraries/controllers/StructureController.class.php:1958
-#: libraries/controllers/StructureController.class.php:1959
+#: libraries/Index.class.php:757 libraries/Util.class.php:3636
+#: libraries/Util.class.php:3637
+#: libraries/controllers/TableStructureController.class.php:949
+#: libraries/controllers/TableStructureController.class.php:950
 #: libraries/operations.lib.php:1607 libraries/rte/rte_list.lib.php:150
 #: libraries/server_databases.lib.php:146
-#: templates/structure/check_all_table_column.phtml:15
-#: templates/structure/check_all_tables.phtml:16
-#: templates/tbl_relation/foreign_key_row.phtml:93
+#: templates/database/structure/check_all_tables.phtml:16
+#: templates/table/relation/foreign_key_row.phtml:93
+#: templates/table/structure/check_all_table_column.phtml:15
 msgid "Drop"
 msgstr "Odstranit"
 
@@ -3922,16 +3933,16 @@ msgstr "Server"
 #: libraries/Menu.class.php:248
 #: libraries/navigation/Nodes/Node_View.class.php:32
 #: libraries/tbl_info.inc.php:63
-#: templates/structure/structure_table_row.phtml:97
-#: templates/structure/structure_table_row.phtml:159
+#: templates/database/structure/structure_table_row.phtml:97
+#: templates/database/structure/structure_table_row.phtml:159
 msgid "View"
 msgstr "Pohled"
 
 #: libraries/Menu.class.php:325 libraries/Menu.class.php:429
-#: libraries/Menu.class.php:548 libraries/Util.class.php:3334
-#: libraries/Util.class.php:3344 libraries/Util.class.php:3350
-#: libraries/Util.class.php:4313 libraries/Util.class.php:4328
-#: libraries/Util.class.php:4345 libraries/config.values.php:40
+#: libraries/Menu.class.php:548 libraries/Util.class.php:3340
+#: libraries/Util.class.php:3350 libraries/Util.class.php:3356
+#: libraries/Util.class.php:4319 libraries/Util.class.php:4334
+#: libraries/Util.class.php:4351 libraries/config.values.php:40
 #: libraries/config.values.php:48 libraries/config.values.php:110
 #: libraries/config.values.php:116 libraries/config/messages.inc.php:321
 #: libraries/navigation/Nodes/Node_Table.class.php:292
@@ -3939,19 +3950,19 @@ msgid "SQL"
 msgstr "SQL"
 
 #: libraries/Menu.class.php:328 libraries/Menu.class.php:432
-#: libraries/Util.class.php:3335 libraries/Util.class.php:3345
-#: libraries/Util.class.php:3351 libraries/Util.class.php:3625
-#: libraries/Util.class.php:3626 libraries/Util.class.php:4329
-#: libraries/Util.class.php:4346 libraries/config.values.php:41
+#: libraries/Util.class.php:3341 libraries/Util.class.php:3351
+#: libraries/Util.class.php:3357 libraries/Util.class.php:3631
+#: libraries/Util.class.php:3632 libraries/Util.class.php:4335
+#: libraries/Util.class.php:4352 libraries/config.values.php:41
 #: libraries/config.values.php:49 libraries/config.values.php:111
 #: libraries/config.values.php:117
 #: libraries/navigation/Nodes/Node_Table.class.php:286
 msgid "Search"
 msgstr "Vyhledávání"
 
-#: libraries/Menu.class.php:338 libraries/Util.class.php:3336
-#: libraries/Util.class.php:3346 libraries/Util.class.php:3627
-#: libraries/Util.class.php:3628 libraries/Util.class.php:4347
+#: libraries/Menu.class.php:338 libraries/Util.class.php:3342
+#: libraries/Util.class.php:3352 libraries/Util.class.php:3633
+#: libraries/Util.class.php:3634 libraries/Util.class.php:4353
 #: libraries/config.values.php:42 libraries/config.values.php:50
 #: libraries/config.values.php:118
 #: libraries/navigation/Nodes/Node_Table.class.php:289
@@ -3960,30 +3971,30 @@ msgid "Insert"
 msgstr "Vložit"
 
 #: libraries/Menu.class.php:362 libraries/Menu.class.php:467
-#: libraries/Util.class.php:4334 libraries/Util.class.php:4350
+#: libraries/Util.class.php:4340 libraries/Util.class.php:4356
 #: libraries/config.values.php:106 libraries/server_common.lib.php:51
 #: libraries/server_privileges.lib.php:2370
 #: libraries/server_privileges.lib.php:3158
-#: libraries/server_privileges.lib.php:4221
+#: libraries/server_privileges.lib.php:4247
 msgid "Privileges"
 msgstr "Oprávnění"
 
 #: libraries/Menu.class.php:371 libraries/Menu.class.php:379
-#: libraries/Menu.class.php:459 libraries/Util.class.php:3338
-#: libraries/Util.class.php:3352 libraries/Util.class.php:4333
-#: libraries/Util.class.php:4351 libraries/config.values.php:112
+#: libraries/Menu.class.php:459 libraries/Util.class.php:3344
+#: libraries/Util.class.php:3358 libraries/Util.class.php:4339
+#: libraries/Util.class.php:4357 libraries/config.values.php:112
 #: view_operations.php:92
 msgid "Operations"
 msgstr "Úpravy"
 
 #: libraries/Menu.class.php:384 libraries/Menu.class.php:492
-#: libraries/Util.class.php:4338 libraries/Util.class.php:4352
+#: libraries/Util.class.php:4344 libraries/Util.class.php:4358
 #: libraries/relation.lib.php:255
 msgid "Tracking"
 msgstr "Sledování"
 
 #: libraries/Menu.class.php:397 libraries/Menu.class.php:486
-#: libraries/Util.class.php:4337 libraries/Util.class.php:4353
+#: libraries/Util.class.php:4343 libraries/Util.class.php:4359
 #: libraries/navigation/Nodes/Node_Trigger_Container.class.php:24
 #: libraries/plugins/export/ExportHtmlword.class.php:557
 #: libraries/plugins/export/ExportOdt.class.php:685
@@ -4000,16 +4011,16 @@ msgstr "Spouště"
 msgid "Database seems to be empty!"
 msgstr "Databáze se zdá být prázdná!"
 
-#: libraries/Menu.class.php:439 libraries/Util.class.php:4330
+#: libraries/Menu.class.php:439 libraries/Util.class.php:4336
 msgid "Query"
 msgstr "Dotaz"
 
-#: libraries/Menu.class.php:472 libraries/Util.class.php:4335
+#: libraries/Menu.class.php:472 libraries/Util.class.php:4341
 #: libraries/rte/rte_words.lib.php:36
 msgid "Routines"
 msgstr "Rutiny"
 
-#: libraries/Menu.class.php:479 libraries/Util.class.php:4336
+#: libraries/Menu.class.php:479 libraries/Util.class.php:4342
 #: libraries/navigation/Nodes/Node_Event_Container.class.php:26
 #: libraries/plugins/export/ExportSql.class.php:940
 #: libraries/plugins/export/ExportXml.class.php:107
@@ -4017,20 +4028,20 @@ msgstr "Rutiny"
 msgid "Events"
 msgstr "Události"
 
-#: libraries/Menu.class.php:498 libraries/Util.class.php:4339
+#: libraries/Menu.class.php:498 libraries/Util.class.php:4345
 msgid "Designer"
 msgstr "Návrhář"
 
-#: libraries/Menu.class.php:507 libraries/Util.class.php:4340
-#: templates/structure/check_all_tables.phtml:35
+#: libraries/Menu.class.php:507 libraries/Util.class.php:4346
+#: templates/database/structure/check_all_tables.phtml:35
 msgid "Central columns"
 msgstr "Centrální sloupce"
 
-#: libraries/Menu.class.php:544 libraries/Util.class.php:4312
+#: libraries/Menu.class.php:544 libraries/Util.class.php:4318
 #: libraries/config.values.php:103 libraries/config/messages.inc.php:266
 #: libraries/config/messages.inc.php:341
 #: libraries/navigation/NavigationTree.class.php:1239
-#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4332
+#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4358
 msgid "Databases"
 msgstr "Databáze"
 
@@ -4039,34 +4050,34 @@ msgid "User accounts"
 msgstr "Uživatelské účty"
 
 #: libraries/Menu.class.php:595 libraries/ServerStatusData.class.php:121
-#: libraries/Util.class.php:4319 libraries/server_common.lib.php:36
+#: libraries/Util.class.php:4325 libraries/server_common.lib.php:36
 msgid "Binary log"
 msgstr "Binární log"
 
 #: libraries/Menu.class.php:601 libraries/ServerStatusData.class.php:126
-#: libraries/Util.class.php:4320 libraries/server_common.lib.php:42
-#: templates/structure/body_for_table_summary.phtml:10
-#: templates/structure/table_header.phtml:27
+#: libraries/Util.class.php:4326 libraries/server_common.lib.php:42
+#: templates/database/structure/body_for_table_summary.phtml:10
+#: templates/database/structure/table_header.phtml:27
 msgid "Replication"
 msgstr "Replikace"
 
 #: libraries/Menu.class.php:606 libraries/ServerStatusData.class.php:193
-#: libraries/Util.class.php:4321 libraries/config.values.php:105
+#: libraries/Util.class.php:4327 libraries/config.values.php:105
 #: libraries/server_engines.lib.php:108 libraries/server_engines.lib.php:112
 #: libraries/sql_query_form.lib.php:421
 msgid "Variables"
 msgstr "Proměnné"
 
-#: libraries/Menu.class.php:610 libraries/Util.class.php:4322
+#: libraries/Menu.class.php:610 libraries/Util.class.php:4328
 msgid "Charsets"
 msgstr "Znakové sady"
 
-#: libraries/Menu.class.php:615 libraries/Util.class.php:4323
+#: libraries/Menu.class.php:615 libraries/Util.class.php:4329
 #: libraries/server_common.lib.php:33 libraries/server_plugins.lib.php:27
 msgid "Plugins"
 msgstr "Rozšíření"
 
-#: libraries/Menu.class.php:626 libraries/Util.class.php:4324
+#: libraries/Menu.class.php:626 libraries/Util.class.php:4330
 msgid "Engines"
 msgstr "Úložiště"
 
@@ -4094,7 +4105,7 @@ msgstr[0] "Byl vložen %1$d řádek."
 msgstr[1] "Byly vloženy %1$d řádky."
 msgstr[2] "Bylo vloženo %1$d řádků."
 
-#: libraries/PDF.class.php:70 libraries/Util.class.php:2521
+#: libraries/PDF.class.php:70 libraries/Util.class.php:2527
 #: libraries/browse_foreigners.lib.php:327
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:865
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:890
@@ -4115,7 +4126,7 @@ msgid "Could not save favorite table!"
 msgstr "Nepodařilo se uložit oblíbenou tabulku!"
 
 #: libraries/RecentFavoriteTable.class.php:212
-#: templates/structure/favorite_anchor.phtml:12
+#: templates/database/structure/favorite_anchor.phtml:12
 msgid "Remove from Favorites"
 msgstr "Odstranit z oblíbených"
 
@@ -4282,7 +4293,7 @@ msgid ""
 msgstr "Nejsou dostupné podrobnější informace o tomto úložišti."
 
 #: libraries/StorageEngine.class.php:373
-#: templates/structure/body_for_table_summary.phtml:50
+#: templates/database/structure/body_for_table_summary.phtml:50
 #, php-format
 msgid "%s is the default storage engine on this MySQL server."
 msgstr "%s je výchozí úložiště na tomto MySQL serveru."
@@ -4746,10 +4757,10 @@ msgstr "Při analýze bylo nalezeno %d chyb."
 
 #: libraries/Util.class.php:726 libraries/rte/rte_events.lib.php:110
 #: libraries/rte/rte_events.lib.php:119 libraries/rte/rte_events.lib.php:150
-#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:153
-#: libraries/rte/rte_routines.lib.php:162
-#: libraries/rte/rte_routines.lib.php:235
-#: libraries/rte/rte_routines.lib.php:1366
+#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:223
+#: libraries/rte/rte_routines.lib.php:250
+#: libraries/rte/rte_routines.lib.php:372
+#: libraries/rte/rte_routines.lib.php:1457
 #: libraries/rte/rte_triggers.lib.php:86 libraries/rte/rte_triggers.lib.php:95
 #: libraries/rte/rte_triggers.lib.php:127
 msgid "MySQL said: "
@@ -4793,75 +4804,78 @@ msgstr "Ned"
 msgid "%B %d, %Y at %I:%M %p"
 msgstr "%a %d. %b %Y, %H:%M"
 
-#: libraries/Util.class.php:2019
+#: libraries/Util.class.php:2025
 #, php-format
 msgid "%s days, %s hours, %s minutes and %s seconds"
 msgstr "%s dnů, %s hodin, %s minut a %s sekund"
 
-#: libraries/Util.class.php:2112
+#: libraries/Util.class.php:2118
 msgid "Missing parameter:"
 msgstr "Chybějící parametr:"
 
-#: libraries/Util.class.php:2645
+#: libraries/Util.class.php:2651
 #, php-format
 msgid "Jump to database \"%s\"."
 msgstr "Přejít na databázi „%s“."
 
-#: libraries/Util.class.php:2670
+#: libraries/Util.class.php:2676
 #, php-format
 msgid "The %s functionality is affected by a known bug, see %s"
 msgstr "Funkčnost %s je omezena známou chybou, viz %s"
 
-#: libraries/Util.class.php:2881
+#: libraries/Util.class.php:2887
 msgid "Click to toggle"
 msgstr "Klikněte pro přepnutí"
 
-#: libraries/Util.class.php:3542 prefs_manage.php:248
+#: libraries/Util.class.php:3548 prefs_manage.php:248
 msgid "Browse your computer:"
 msgstr "Procházet váš počítač:"
 
-#: libraries/Util.class.php:3567
+#: libraries/Util.class.php:3573
 #, php-format
 msgid "Select from the web server upload directory <b>%s</b>:"
 msgstr "Zvolte soubor z adresáře pro upload na serveru <b>%s</b>:"
 
-#: libraries/Util.class.php:3596 libraries/insert_edit.lib.php:1173
+#: libraries/Util.class.php:3602 libraries/insert_edit.lib.php:1171
 msgid "The directory you set for upload work cannot be reached."
 msgstr "Adresář určený pro upload souborů nemohl být otevřen."
 
-#: libraries/Util.class.php:3607
+#: libraries/Util.class.php:3613
 msgid "There are no files to upload!"
 msgstr "Nebyl zvolen žádný soubor pro nahrání!"
 
-#: libraries/Util.class.php:3632 libraries/Util.class.php:3633
-#: templates/structure/check_all_tables.phtml:15
+#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: templates/database/structure/check_all_tables.phtml:15
 msgid "Empty"
 msgstr "Vyprázdnit"
 
-#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: libraries/Util.class.php:3644 libraries/Util.class.php:3645
 msgid "Execute"
 msgstr "Spustit"
 
-#: libraries/Util.class.php:4152
+#: libraries/Util.class.php:4158
 msgid "Print"
 msgstr "Vytisknout"
 
-#: libraries/Util.class.php:4257 templates/structure/row_stats_table.phtml:80
-#: templates/structure/table_header.phtml:95
+#: libraries/Util.class.php:4263
+#: templates/database/structure/table_header.phtml:95
+#: templates/table/structure/row_stats_table.phtml:80
 msgid "Creation"
 msgstr "Vytvořeno"
 
-#: libraries/Util.class.php:4263 templates/structure/row_stats_table.phtml:87
-#: templates/structure/table_header.phtml:106
+#: libraries/Util.class.php:4269
+#: templates/database/structure/table_header.phtml:106
+#: templates/table/structure/row_stats_table.phtml:87
 msgid "Last update"
 msgstr "Poslední změna"
 
-#: libraries/Util.class.php:4269 templates/structure/row_stats_table.phtml:94
-#: templates/structure/table_header.phtml:117
+#: libraries/Util.class.php:4275
+#: templates/database/structure/table_header.phtml:117
+#: templates/table/structure/row_stats_table.phtml:94
 msgid "Last check"
 msgstr "Poslední kontrola"
 
-#: libraries/Util.class.php:4315
+#: libraries/Util.class.php:4321
 msgid "Users"
 msgstr "Uživatelé"
 
@@ -4882,16 +4896,16 @@ msgid "Use this value"
 msgstr "Použít tuto hodnotu"
 
 #: libraries/build_html_for_db.lib.php:33 libraries/import.lib.php:193
-#: templates/structure/actions_in_table_structure.phtml:113
-#: templates/structure/row_stats_table.phtml:42
-#: templates/structure/table_header.phtml:36
+#: templates/database/structure/table_header.phtml:36
+#: templates/table/structure/actions_in_table_structure.phtml:113
+#: templates/table/structure/row_stats_table.phtml:42
 msgid "Rows"
 msgstr "Řádků"
 
 #: libraries/build_html_for_db.lib.php:48 libraries/engines/innodb.lib.php:171
-#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:186
-#: libraries/server_status.lib.php:298
-#: templates/structure/display_table_stats.phtml:40
+#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:195
+#: libraries/server_status.lib.php:307
+#: templates/table/structure/display_table_stats.phtml:40
 msgid "Total"
 msgstr "Celkem"
 
@@ -4900,10 +4914,12 @@ msgid "Jump to database"
 msgstr "Přejít na databázi"
 
 #: libraries/build_html_for_db.lib.php:146
+#: templates/database/structure/structure_table_row.phtml:15
 msgid "Not replicated"
 msgstr "Není replikováno"
 
 #: libraries/build_html_for_db.lib.php:158
+#: templates/database/structure/structure_table_row.phtml:16
 msgid "Replicated"
 msgstr "Replikováno"
 
@@ -4958,17 +4974,17 @@ msgstr "NE"
 #: libraries/plugins/export/ExportTexytext.class.php:425
 #: libraries/plugins/export/PMA_ExportPdf.class.php:307
 #: libraries/rte/rte_list.lib.php:73 libraries/rte/rte_list.lib.php:85
-#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:830
-#: libraries/rte/rte_routines.lib.php:1492 setup/frames/index.inc.php:162
+#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:921
+#: libraries/rte/rte_routines.lib.php:1583 setup/frames/index.inc.php:162
 #: templates/columns_definitions/table_fields_definitions.phtml:8
-#: templates/structure/table_structure_header.phtml:5
-#: templates/table/create_table.phtml:11
+#: templates/database/create_table.phtml:11
+#: templates/table/structure/table_structure_header.phtml:5
 msgid "Name"
 msgstr "Název"
 
 #: libraries/central_columns.lib.php:699
 #: libraries/central_columns.lib.php:1381
-#: libraries/rte/rte_routines.lib.php:832
+#: libraries/rte/rte_routines.lib.php:923
 #: templates/columns_definitions/table_fields_definitions.phtml:14
 msgid "Length/Values"
 msgstr "Délka/Množina"
@@ -4987,7 +5003,7 @@ msgid "Select a table"
 msgstr "Zvolte tabulku"
 
 #: libraries/central_columns.lib.php:804
-#: templates/structure/add_column.phtml:4
+#: templates/table/structure/add_column.phtml:4
 msgid "Add column"
 msgstr "Přidat sloupec"
 
@@ -5003,7 +5019,7 @@ msgstr "Přidat nový sloupec"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1002
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1025
 #: templates/columns_definitions/table_fields_definitions.phtml:36
-#: templates/structure/table_structure_header.phtml:8
+#: templates/table/structure/table_structure_header.phtml:8
 msgid "Attributes"
 msgstr "Vlastnosti"
 
@@ -5119,7 +5135,7 @@ msgid "Double click"
 msgstr "Dvojklik"
 
 #: libraries/config.values.php:95 libraries/config.values.php:124
-#: libraries/config/FormDisplay.tpl.php:221 libraries/relation.lib.php:97
+#: libraries/config/FormDisplay.tpl.php:232 libraries/relation.lib.php:97
 #: libraries/relation.lib.php:105
 msgid "Disabled"
 msgstr "Vypnuto"
@@ -5289,21 +5305,21 @@ msgstr "Komprimovaný export nebude fungovat kvůli chybějící funkci %s."
 msgid "maximum %s"
 msgstr "maximálně %s"
 
-#: libraries/config/FormDisplay.tpl.php:219
+#: libraries/config/FormDisplay.tpl.php:230
 msgid "This setting is disabled, it will not be applied to your configuration."
 msgstr "Tato volba není přístupná, nebude použita ve vašich nastaveních."
 
-#: libraries/config/FormDisplay.tpl.php:313
+#: libraries/config/FormDisplay.tpl.php:324
 #, php-format
 msgid "Set value: %s"
 msgstr "Nastavena hodnota: %s"
 
-#: libraries/config/FormDisplay.tpl.php:318
+#: libraries/config/FormDisplay.tpl.php:329
 #: libraries/config/messages.inc.php:610
 msgid "Restore default value"
 msgstr "Obnovit výchozí hodnotu"
 
-#: libraries/config/FormDisplay.tpl.php:332
+#: libraries/config/FormDisplay.tpl.php:343
 msgid "Allow users to customize this value"
 msgstr "Povolit uživatelům změnit tuto hodnotu"
 
@@ -5790,7 +5806,7 @@ msgstr "Znaková sada souboru"
 
 #: libraries/config/messages.inc.php:136 libraries/config/messages.inc.php:152
 #: libraries/sql_query_form.lib.php:247
-#: templates/structure/row_stats_table.phtml:7
+#: templates/table/structure/row_stats_table.phtml:7
 msgid "Format"
 msgstr "Formát"
 
@@ -6302,7 +6318,7 @@ msgstr ""
 
 #: libraries/config/messages.inc.php:332
 #: libraries/plugins/export/ExportPdf.class.php:279
-#: templates/structure/secondary_tabs.phtml:8
+#: templates/table/secondary_tabs.phtml:8
 msgid "Table structure"
 msgstr "Struktura tabulky"
 
@@ -7990,102 +8006,33 @@ msgstr "Microsoft Word 2000"
 msgid "OpenDocument Text"
 msgstr "Text OpenDocument"
 
-#: libraries/controllers/StructureController.class.php:465
+#: libraries/controllers/DatabaseStructureController.class.php:405
 #: tbl_operations.php:382
 #, php-format
 msgid "Table %s has been emptied."
 msgstr "Tabulka %s byla vyprázdněna."
 
-#: libraries/controllers/StructureController.class.php:486
+#: libraries/controllers/DatabaseStructureController.class.php:426
 #: tbl_operations.php:400 view_operations.php:119
 #, php-format
 msgid "View %s has been dropped."
 msgstr "Pohled %s byl odstraněn."
 
-#: libraries/controllers/StructureController.class.php:487
+#: libraries/controllers/DatabaseStructureController.class.php:427
 #: tbl_operations.php:401
 #, php-format
 msgid "Table %s has been dropped."
 msgstr "Tabulka %s byla odstraněna."
 
-#: libraries/controllers/StructureController.class.php:797
-#, php-format
-msgid "The name '%s' is a MySQL reserved keyword."
-msgid_plural "The names '%s' are MySQL reserved keywords."
-msgstr[0] "Název \"%s\" je rezervovaným klíčovým slovem MySQL."
-msgstr[1] "Názvy \"%s\" jsou rezervovaným klíčovým slovem MySQL."
-msgstr[2] "Názvy \"%s\" jsou rezervovaným klíčovým slovem MySQL."
-
-#: libraries/controllers/StructureController.class.php:875
-msgid "No column selected."
-msgstr "Nebyl vybrán žádný sloupec."
-
-#: libraries/controllers/StructureController.class.php:1049
+#: libraries/controllers/DatabaseStructureController.class.php:733
 msgid "Favorite List is full!"
 msgstr "Seznam oblíbených je plný!"
 
-#: libraries/controllers/StructureController.class.php:1272
-msgid "The columns have been moved successfully."
-msgstr "Vybraná pole byla úspěšně přesunuta."
-
-#: libraries/controllers/StructureController.class.php:1535
-#, php-format
-msgid ""
-"Table %1$s has been altered successfully. Privileges have been adjusted."
-msgstr "Tabulka %1$s byla úspěšně změněna. Práva byla upravena."
-
-#: libraries/controllers/StructureController.class.php:1541
-#: libraries/controllers/TableIndexesController.class.php:161
-#: tbl_addfield.php:92
-#, php-format
-msgid "Table %1$s has been altered successfully."
-msgstr "Tabulka %1$s byla úspěšně změněna."
-
-#: libraries/controllers/StructureController.class.php:1588
-#: libraries/tracking.lib.php:1094
-msgid "Query error"
-msgstr "Chyba dotazu"
-
-#: libraries/controllers/StructureController.class.php:1806
+#: libraries/controllers/DatabaseStructureController.class.php:947
 #: libraries/mysql_charsets.lib.php:366 libraries/mysql_charsets.lib.php:373
 msgid "unknown"
 msgstr "neznámý"
 
-#: libraries/controllers/StructureController.class.php:1957
-#: templates/structure/check_all_table_column.phtml:11
-msgid "Change"
-msgstr "Změnit"
-
-#: libraries/controllers/StructureController.class.php:1961
-#: libraries/controllers/StructureController.class.php:1966
-#: libraries/navigation/Nodes/Node_Index.class.php:30
-#: libraries/tracking.lib.php:926
-#: templates/columns_definitions/column_indexes.phtml:16
-#: templates/columns_definitions/table_fields_definitions.phtml:57
-#: templates/structure/check_all_table_column.phtml:30
-#: templates/structure/display_structure.phtml:79
-#: templates/structure/display_table_stats.phtml:19
-msgid "Index"
-msgstr "Klíč"
-
-#: libraries/controllers/StructureController.class.php:1963
-#: libraries/controllers/StructureController.class.php:1968
-#: templates/columns_definitions/column_indexes.phtml:27
-#: templates/structure/check_all_table_column.phtml:37
-msgid "Spatial"
-msgstr "Prostorový"
-
-#: libraries/controllers/StructureController.class.php:1964
-#: libraries/controllers/StructureController.class.php:1969
-#: templates/columns_definitions/column_indexes.phtml:22
-#: templates/structure/check_all_table_column.phtml:47
-msgid "Fulltext"
-msgstr "Fulltext"
-
-#: libraries/controllers/StructureController.class.php:1970
-msgid "Distinct values"
-msgstr "Odlišné hodnoty"
-
 #: libraries/controllers/TableChartController.class.php:82
 #: libraries/controllers/TableGisVisualizationController.class.php:101
 msgid "No SQL query was set to fetch data."
@@ -8099,11 +8046,18 @@ msgstr "Ve zvolené tabulce nejsou žádná číselná pole pro vykreslení do g
 msgid "No data to display"
 msgstr "Nebyla nalezena žádná data"
 
-#: libraries/controllers/TableRelationController.class.php:217
+#: libraries/controllers/TableIndexesController.class.php:161
+#: libraries/controllers/TableStructureController.class.php:736
+#: tbl_addfield.php:92
+#, php-format
+msgid "Table %1$s has been altered successfully."
+msgstr "Tabulka %1$s byla úspěšně změněna."
+
+#: libraries/controllers/TableRelationController.class.php:218
 msgid "Display column was successfully updated."
 msgstr "Zobrazený sloupec byl aktualizován."
 
-#: libraries/controllers/TableRelationController.class.php:283
+#: libraries/controllers/TableRelationController.class.php:288
 msgid "Internal relations were successfully updated."
 msgstr "Interní relace byla úspěšně změněna."
 
@@ -8116,10 +8070,72 @@ msgid "Zoom search"
 msgstr "Zoom vyhledávání"
 
 #: libraries/controllers/TableSearchController.class.php:852
-#: templates/table/selection_form.phtml:59
+#: templates/table/search/selection_form.phtml:59
 msgid "Find and replace"
 msgstr "Vyhledat a nahradit"
 
+#: libraries/controllers/TableStructureController.class.php:163
+#, php-format
+msgid "The name '%s' is a MySQL reserved keyword."
+msgid_plural "The names '%s' are MySQL reserved keywords."
+msgstr[0] "Název \"%s\" je rezervovaným klíčovým slovem MySQL."
+msgstr[1] "Názvy \"%s\" jsou rezervovaným klíčovým slovem MySQL."
+msgstr[2] "Názvy \"%s\" jsou rezervovaným klíčovým slovem MySQL."
+
+#: libraries/controllers/TableStructureController.class.php:241
+msgid "No column selected."
+msgstr "Nebyl vybrán žádný sloupec."
+
+#: libraries/controllers/TableStructureController.class.php:467
+msgid "The columns have been moved successfully."
+msgstr "Vybraná pole byla úspěšně přesunuta."
+
+#: libraries/controllers/TableStructureController.class.php:730
+#, php-format
+msgid ""
+"Table %1$s has been altered successfully. Privileges have been adjusted."
+msgstr "Tabulka %1$s byla úspěšně změněna. Práva byla upravena."
+
+#: libraries/controllers/TableStructureController.class.php:783
+#: libraries/tracking.lib.php:1094
+msgid "Query error"
+msgstr "Chyba dotazu"
+
+#: libraries/controllers/TableStructureController.class.php:948
+#: templates/table/structure/check_all_table_column.phtml:11
+msgid "Change"
+msgstr "Změnit"
+
+#: libraries/controllers/TableStructureController.class.php:952
+#: libraries/controllers/TableStructureController.class.php:957
+#: libraries/navigation/Nodes/Node_Index.class.php:30
+#: libraries/tracking.lib.php:926
+#: templates/columns_definitions/column_indexes.phtml:16
+#: templates/columns_definitions/table_fields_definitions.phtml:57
+#: templates/table/structure/check_all_table_column.phtml:30
+#: templates/table/structure/display_structure.phtml:79
+#: templates/table/structure/display_table_stats.phtml:19
+msgid "Index"
+msgstr "Klíč"
+
+#: libraries/controllers/TableStructureController.class.php:954
+#: libraries/controllers/TableStructureController.class.php:959
+#: templates/columns_definitions/column_indexes.phtml:27
+#: templates/table/structure/check_all_table_column.phtml:37
+msgid "Spatial"
+msgstr "Prostorový"
+
+#: libraries/controllers/TableStructureController.class.php:955
+#: libraries/controllers/TableStructureController.class.php:960
+#: templates/columns_definitions/column_indexes.phtml:22
+#: templates/table/structure/check_all_table_column.phtml:47
+msgid "Fulltext"
+msgstr "Fulltext"
+
+#: libraries/controllers/TableStructureController.class.php:963
+msgid "Distinct values"
+msgstr "Odlišné hodnoty"
+
 #: libraries/core.lib.php:306
 #, php-format
 msgid "The %s extension is missing. Please check your PHP configuration."
@@ -8167,7 +8183,7 @@ msgid "No Password"
 msgstr "Žádné heslo"
 
 #: libraries/display_change_password.lib.php:68
-#: libraries/plugins/auth/AuthenticationCookie.class.php:199
+#: libraries/plugins/auth/AuthenticationCookie.class.php:187
 #: libraries/replication_gui.lib.php:422 libraries/replication_gui.lib.php:862
 #: libraries/server_privileges.lib.php:1640
 msgid "Password:"
@@ -8952,12 +8968,12 @@ msgid "Dump has been saved to file %s."
 msgstr "Výpis byl uložen do souboru %s."
 
 #: libraries/import.lib.php:202 libraries/insert_edit.lib.php:124
-#: libraries/rte/rte_routines.lib.php:1353 libraries/sql.lib.php:1312
+#: libraries/rte/rte_routines.lib.php:1444 libraries/sql.lib.php:1306
 #: tbl_get_field.php:44
 msgid "MySQL returned an empty result set (i.e. zero rows)."
 msgstr "MySQL vrátil prázdný výsledek (tj. nulový počet řádků)."
 
-#: libraries/import.lib.php:265 libraries/sql.lib.php:1326
+#: libraries/import.lib.php:265 libraries/sql.lib.php:1320
 msgid "[ROLLBACK occurred.]"
 msgstr "[ROLLBACK nastal]"
 
@@ -9023,14 +9039,14 @@ msgstr "Vytvořit klíč na &nbsp;%s&nbsp;polích"
 
 #: libraries/insert_edit.lib.php:233
 #: libraries/navigation/Nodes/Node_DatabaseChild.class.php:48
-#: templates/designer/table_list.phtml:40
+#: templates/database/designer/table_list.phtml:40
 msgid "Hide"
 msgstr "Skrýt"
 
 #: libraries/insert_edit.lib.php:249
 #: libraries/navigation/Nodes/Node_Function.class.php:32
-#: libraries/rte/rte_routines.lib.php:1495
-#: templates/table/table_header.phtml:4
+#: libraries/rte/rte_routines.lib.php:1586
+#: templates/table/search/table_header.phtml:4
 msgid "Function"
 msgstr "Funkce"
 
@@ -9043,84 +9059,85 @@ msgstr "Binární"
 msgid "Because of its length,<br /> this column might not be editable."
 msgstr "Toto pole možná nepůjde <br />kvůli délce upravit."
 
-#: libraries/insert_edit.lib.php:1050
+#: libraries/insert_edit.lib.php:1048
 msgid "Binary - do not edit"
 msgstr "Binární - neupravujte"
 
-#: libraries/insert_edit.lib.php:1176 libraries/server_privileges.lib.php:470
-#: templates/table/options.phtml:36
+#: libraries/insert_edit.lib.php:1174 libraries/server_privileges.lib.php:470
+#: templates/table/search/options.phtml:36
 msgid "Or"
 msgstr "Nebo"
 
-#: libraries/insert_edit.lib.php:1177
+#: libraries/insert_edit.lib.php:1175
 msgid "web server upload directory:"
 msgstr "soubor z adresáře pro upload:"
 
-#: libraries/insert_edit.lib.php:1348 templates/table/input_box.phtml:49
+#: libraries/insert_edit.lib.php:1346
+#: templates/table/search/input_box.phtml:49
 msgid "Edit/Insert"
 msgstr "Upravit/Vložit"
 
-#: libraries/insert_edit.lib.php:1398
+#: libraries/insert_edit.lib.php:1396
 #, php-format
 msgid "Continue insertion with %s rows"
 msgstr "Pokračovat ve vkládání s %s řádky"
 
-#: libraries/insert_edit.lib.php:1428
+#: libraries/insert_edit.lib.php:1426
 msgid "and then"
 msgstr "a poté"
 
-#: libraries/insert_edit.lib.php:1461
+#: libraries/insert_edit.lib.php:1459
 msgid "Insert as new row"
 msgstr "Vložit jako nový řádek"
 
-#: libraries/insert_edit.lib.php:1464
+#: libraries/insert_edit.lib.php:1462
 msgid "Insert as new row and ignore errors"
 msgstr "Vložit jako nový řádek a ignorovat chyby"
 
-#: libraries/insert_edit.lib.php:1467
+#: libraries/insert_edit.lib.php:1465
 msgid "Show insert query"
 msgstr "Zobrazit dotaz pro vložení"
 
-#: libraries/insert_edit.lib.php:1487
+#: libraries/insert_edit.lib.php:1485
 msgid "Go back to previous page"
 msgstr "Návrat na předchozí stránku"
 
-#: libraries/insert_edit.lib.php:1490
+#: libraries/insert_edit.lib.php:1488
 msgid "Insert another new row"
 msgstr "Vložit další řádek"
 
-#: libraries/insert_edit.lib.php:1495
+#: libraries/insert_edit.lib.php:1493
 msgid "Go back to this page"
 msgstr "Návrat na tuto stránku"
 
-#: libraries/insert_edit.lib.php:1518
+#: libraries/insert_edit.lib.php:1516
 msgid "Edit next row"
 msgstr "Upravit následující řádek"
 
-#: libraries/insert_edit.lib.php:1540
+#: libraries/insert_edit.lib.php:1538
 msgid ""
 "Use TAB key to move from value to value, or CTRL+arrows to move anywhere"
 msgstr ""
 "Použijte klávesu TAB pro pohyb mezi hodnotami nebo CTRL+šipky po pohyb všemi "
 "směry"
 
-#: libraries/insert_edit.lib.php:1577 libraries/replication_gui.lib.php:542
-#: libraries/rte/rte_routines.lib.php:1497
+#: libraries/insert_edit.lib.php:1575 libraries/replication_gui.lib.php:542
+#: libraries/rte/rte_routines.lib.php:1588
 #: libraries/server_status_variables.lib.php:220
-#: templates/designer/having_query_panel.phtml:100
-#: templates/designer/options_panel.phtml:73
-#: templates/designer/options_panel.phtml:239
-#: templates/designer/where_query_panel.phtml:69
-#: templates/table/table_header.phtml:10
-#: templates/table/zoom_result_form.phtml:35
+#: templates/database/designer/having_query_panel.phtml:100
+#: templates/database/designer/options_panel.phtml:73
+#: templates/database/designer/options_panel.phtml:239
+#: templates/database/designer/where_query_panel.phtml:69
+#: templates/table/search/table_header.phtml:10
+#: templates/table/search/zoom_result_form.phtml:35
 msgid "Value"
 msgstr "Hodnota"
 
-#: libraries/insert_edit.lib.php:1937 libraries/sql.lib.php:1309
+#: libraries/insert_edit.lib.php:1935 libraries/sql.lib.php:1303
 msgid "Showing SQL query"
 msgstr "Zobrazuji SQL dotaz"
 
-#: libraries/insert_edit.lib.php:1962 libraries/sql.lib.php:1287
+#: libraries/insert_edit.lib.php:1960 libraries/sql.lib.php:1281
 #, php-format
 msgid "Inserted row id: %1$d"
 msgstr "ID vloženého řádku: %1$d"
@@ -9530,7 +9547,7 @@ msgstr "Nová"
 #: libraries/navigation/Nodes/Node_View_Container.class.php:26
 #: libraries/navigation/Nodes/Node_View_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:129
-#: templates/structure/show_create.phtml:30
+#: templates/database/structure/show_create.phtml:30
 msgid "Views"
 msgstr "Pohledy"
 
@@ -9846,7 +9863,7 @@ msgstr "Nemáte dostatečná práva na provedení této akce!"
 
 #: libraries/operations.lib.php:101 libraries/operations.lib.php:249
 #: libraries/operations.lib.php:869 libraries/operations.lib.php:963
-#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:907
+#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:998
 #: templates/columns_definitions/table_fields_definitions.phtml:47
 msgid "Adjust Privileges"
 msgstr "Upravit oprávnění"
@@ -9938,22 +9955,22 @@ msgid "Switch to copied table"
 msgstr "Přepnout na zkopírovanou tabulku"
 
 #: libraries/operations.lib.php:1360
-#: templates/structure/check_all_tables.phtml:18
+#: templates/database/structure/check_all_tables.phtml:18
 msgid "Table maintenance"
 msgstr "Údržba tabulky"
 
 #: libraries/operations.lib.php:1398
-#: templates/structure/check_all_tables.phtml:19
+#: templates/database/structure/check_all_tables.phtml:19
 msgid "Analyze table"
 msgstr "Analyzovat tabulku"
 
 #: libraries/operations.lib.php:1413
-#: templates/structure/check_all_tables.phtml:20
+#: templates/database/structure/check_all_tables.phtml:20
 msgid "Check table"
 msgstr "Zkontrolovat tabulku"
 
 #: libraries/operations.lib.php:1428
-#: templates/structure/check_all_tables.phtml:22
+#: templates/database/structure/check_all_tables.phtml:22
 #, fuzzy
 #| msgid "Check table"
 msgid "Checksum table"
@@ -9973,18 +9990,19 @@ msgid "Flush the table (FLUSH)"
 msgstr "Vyprázdnit vyrovnávací paměť pro tabulku („FLUSH“)"
 
 #: libraries/operations.lib.php:1477
-#: templates/structure/check_all_tables.phtml:23
-#: templates/structure/display_table_stats.phtml:56
+#: templates/database/structure/check_all_tables.phtml:23
+#: templates/table/structure/display_table_stats.phtml:56
 msgid "Optimize table"
 msgstr "Optimalizovat tabulku"
 
 #: libraries/operations.lib.php:1492
-#: templates/structure/check_all_tables.phtml:24
+#: templates/database/structure/check_all_tables.phtml:24
 msgid "Repair table"
 msgstr "Opravit tabulku"
 
 #: libraries/operations.lib.php:1538
-#: templates/structure/check_all_tables.phtml:14 view_operations.php:127
+#: templates/database/structure/check_all_tables.phtml:14
+#: view_operations.php:127
 msgid "Delete data or table"
 msgstr "Odstranit data nebo tabulku"
 
@@ -10109,7 +10127,7 @@ msgid "Cannot connect: invalid settings."
 msgstr "Nepodařilo se připojit: chybné nastavení."
 
 #: libraries/plugins/auth/AuthenticationConfig.class.php:108
-#: libraries/plugins/auth/AuthenticationCookie.class.php:134
+#: libraries/plugins/auth/AuthenticationCookie.class.php:122
 #: libraries/plugins/auth/AuthenticationHttp.class.php:96
 #, php-format
 msgid "Welcome to %s"
@@ -10140,36 +10158,36 @@ msgstr ""
 msgid "Retry to connect"
 msgstr "Zkusit se připojit znovu"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:146
+#: libraries/plugins/auth/AuthenticationCookie.class.php:134
 msgid "Your session has expired. Please log in again."
 msgstr "Vaše sezení vypršelo, prosím přihlaste se znovu."
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:170
+#: libraries/plugins/auth/AuthenticationCookie.class.php:158
 msgid "Log in"
 msgstr "Přihlášení"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:178
-#: libraries/plugins/auth/AuthenticationCookie.class.php:188
+#: libraries/plugins/auth/AuthenticationCookie.class.php:166
+#: libraries/plugins/auth/AuthenticationCookie.class.php:176
 msgid "You can enter hostname/IP address and port separated by space."
 msgstr "Můžete zadat jméno počítače nebo IP adresu a port oddělené mezerou."
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:193
+#: libraries/plugins/auth/AuthenticationCookie.class.php:181
 msgid "Username:"
 msgstr "Jméno:"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:205
+#: libraries/plugins/auth/AuthenticationCookie.class.php:193
 msgid "Server Choice:"
 msgstr "Volba serveru:"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:386
+#: libraries/plugins/auth/AuthenticationCookie.class.php:374
 msgid "Entered captcha is wrong, try again!"
 msgstr "Zadaný kód nebyl správný, zkuste to znovu!"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:396
+#: libraries/plugins/auth/AuthenticationCookie.class.php:384
 msgid "Please enter correct captcha!"
 msgstr "Zadejte, prosím, správný kód!"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:423
+#: libraries/plugins/auth/AuthenticationCookie.class.php:411
 msgid "You are not allowed to log in to this MySQL server!"
 msgstr "Nemáte povolení se přihlásit k tomuto MySQL serveru!"
 
@@ -10265,7 +10283,7 @@ msgstr "Událost"
 #: libraries/plugins/export/ExportOdt.class.php:593
 #: libraries/plugins/export/ExportTexytext.class.php:428
 #: libraries/plugins/export/PMA_ExportPdf.class.php:313
-#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:984
 #: libraries/rte/rte_triggers.lib.php:377
 msgid "Definition"
 msgstr "Definice"
@@ -10584,7 +10602,7 @@ msgid "Last check:"
 msgstr "Poslední kontrola:"
 
 #: libraries/plugins/export/ExportSql.class.php:1399
-#: templates/structure/structure_table_row.phtml:183
+#: templates/database/structure/structure_table_row.phtml:183
 msgid "in use"
 msgstr "právě se používá"
 
@@ -10776,20 +10794,14 @@ msgstr "Prostorové rozšíření MySQL nepodporuje ESRI typ „%s“."
 msgid "The imported file does not contain any data!"
 msgstr "Nahraný soubor neobsahuje žádná data!"
 
-#: libraries/plugins/import/ImportSql.class.php:169
+#: libraries/plugins/import/ImportSql.class.php:72
 msgid "SQL compatibility mode:"
 msgstr "Režim kompatibility SQL:"
 
-#: libraries/plugins/import/ImportSql.class.php:181
+#: libraries/plugins/import/ImportSql.class.php:84
 msgid "Do not use <code>AUTO_INCREMENT</code> for zero values"
 msgstr "Nepoužívat <code>AUTO_INCREMENT</code> pro nulové hodnoty"
 
-#: libraries/plugins/import/ImportSql.class.php:195
-#, fuzzy
-#| msgid "Read misses"
-msgid "Read as multibytes"
-msgstr "Výpadků při čtení"
-
 #: libraries/plugins/import/ImportXml.class.php:54
 msgid "XML"
 msgstr "XML"
@@ -10832,7 +10844,7 @@ msgid "Show grid"
 msgstr "Zobrazit mřížku"
 
 #: libraries/plugins/schema/SchemaPdf.class.php:94
-#: templates/structure/print_view_data_dictionary_link.phtml:6
+#: templates/database/structure/print_view_data_dictionary_link.phtml:6
 msgid "Data Dictionary"
 msgstr "Datový slovník"
 
@@ -10857,7 +10869,7 @@ msgid "The %s table doesn't exist!"
 msgstr "Tabulka %s neexistuje!"
 
 #: libraries/plugins/schema/eps/Eps_Relation_Schema.class.php:321
-#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:309
+#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:323
 #, php-format
 msgid "Schema of the %s database - Page %s"
 msgstr "Schéma databáze %s - Strana %s"
@@ -10883,7 +10895,7 @@ msgstr "Obsah"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1005
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1028
 #: libraries/tracking.lib.php:884
-#: templates/structure/table_structure_header.phtml:11
+#: templates/table/structure/table_structure_header.phtml:11
 msgid "Extra"
 msgstr "Další"
 
@@ -11236,11 +11248,11 @@ msgid "Create the needed tables with the <code>%screate_tables.sql</code>."
 msgstr ""
 "Vytvořte potřebné tabulky pomocí skriptu <code>%screate_tables.sql</code>."
 
-#: libraries/relation.lib.php:360
+#: libraries/relation.lib.php:357
 msgid "Create a pma user and give access to these tables."
 msgstr "Vytvořte uživatele pma a přidělte mu oprávnění na tyto tabulky."
 
-#: libraries/relation.lib.php:365
+#: libraries/relation.lib.php:360
 msgid ""
 "Enable advanced features in configuration file (<code>config.inc.php</"
 "code>), for example by starting from <code>config.sample.inc.php</code>."
@@ -11248,23 +11260,23 @@ msgstr ""
 "Zapněte rozšířené funkce v konfiguračním souboru (<code>config.inc.php</"
 "code>), můžete se inspirovat v <code>config.sample.inc.php</code>."
 
-#: libraries/relation.lib.php:373
+#: libraries/relation.lib.php:365
 msgid "Re-login to phpMyAdmin to load the updated configuration file."
 msgstr ""
 "Prosím přihlašte se znovu , aby se projevily změny v konfiguračním souboru."
 
-#: libraries/relation.lib.php:1612
+#: libraries/relation.lib.php:1607
 msgid "no description"
 msgstr "žádný popisek"
 
-#: libraries/relation.lib.php:1811
+#: libraries/relation.lib.php:1806
 msgid ""
 "You do not have necessary privileges to create a database named "
 "'phpmyadmin'. You may go to 'Operations' tab of any database to set up the "
 "phpMyAdmin configuration storage there."
 msgstr ""
 
-#: libraries/relation.lib.php:1928
+#: libraries/relation.lib.php:1923
 #, fuzzy, php-format
 #| msgid "Missing phpMyAdmin configuration storage tables"
 msgid ""
@@ -11272,21 +11284,21 @@ msgid ""
 "configuration storage there."
 msgstr "Chybějící tabulky v úložišti nastavení phpMyAdmina"
 
-#: libraries/relation.lib.php:1936
+#: libraries/relation.lib.php:1931
 #, fuzzy, php-format
 #| msgid "Missing phpMyAdmin configuration storage tables"
 msgid ""
 "%sCreate%s the phpMyAdmin configuration storage in the current database."
 msgstr "Chybějící tabulky v úložišti nastavení phpMyAdmina"
 
-#: libraries/relation.lib.php:1944
+#: libraries/relation.lib.php:1939
 #, fuzzy, php-format
 #| msgid "Missing phpMyAdmin configuration storage tables"
 msgid "%sCreate%s missing phpMyAdmin configuration storage tables."
 msgstr "Chybějící tabulky v úložišti nastavení phpMyAdmina"
 
 #: libraries/replication_gui.lib.php:46 libraries/replication_gui.lib.php:343
-#: libraries/server_databases.lib.php:387
+#: libraries/server_databases.lib.php:398
 msgid "Master replication"
 msgstr "Replikace nadřízeného"
 
@@ -11356,7 +11368,7 @@ msgstr ""
 "vidět zprávu informující vás že server <b>je</b> nastaven jako nadřízený."
 
 #: libraries/replication_gui.lib.php:141
-#: libraries/server_databases.lib.php:389
+#: libraries/server_databases.lib.php:400
 msgid "Slave replication"
 msgstr "Replikace podřízeného"
 
@@ -11633,10 +11645,10 @@ msgid "Master server changed successfully to %s."
 msgstr "Nadřízený server bych úspěšně změněn na %s."
 
 #: libraries/rte/rte_events.lib.php:106 libraries/rte/rte_events.lib.php:115
-#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:149
-#: libraries/rte/rte_routines.lib.php:158
-#: libraries/rte/rte_routines.lib.php:231
-#: libraries/rte/rte_routines.lib.php:1362
+#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:219
+#: libraries/rte/rte_routines.lib.php:246
+#: libraries/rte/rte_routines.lib.php:368
+#: libraries/rte/rte_routines.lib.php:1453
 #: libraries/rte/rte_triggers.lib.php:82 libraries/rte/rte_triggers.lib.php:91
 #: libraries/rte/rte_triggers.lib.php:123
 #, php-format
@@ -11657,7 +11669,7 @@ msgstr "Byla změněna událost %1$s."
 msgid "Event %1$s has been created."
 msgstr "Byla vytvořena událost %1$s."
 
-#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:251
+#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:266
 #: libraries/rte/rte_triggers.lib.php:144
 msgid "One or more errors have occurred while processing your request:"
 msgstr "Při zpracování požadavku došlo k několika chybám:"
@@ -11666,7 +11678,7 @@ msgstr "Při zpracování požadavku došlo k několika chybám:"
 msgid "Edit event"
 msgstr "Upravit událost"
 
-#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:794
+#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:885
 #: libraries/rte/rte_triggers.lib.php:323 view_create.php:180
 msgid "Details"
 msgstr "Podrobnosti"
@@ -11679,7 +11691,7 @@ msgstr "Název události"
 msgid "Event type"
 msgstr "Typ události"
 
-#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:817
+#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:908
 #, php-format
 msgid "Change to %s"
 msgstr "Změnit na %s"
@@ -11706,12 +11718,14 @@ msgstr "Konec"
 msgid "On completion preserve"
 msgstr "Při dokončení zachovat"
 
-#: libraries/rte/rte_events.lib.php:491 libraries/rte/rte_routines.lib.php:930
+#: libraries/rte/rte_events.lib.php:491
+#: libraries/rte/rte_routines.lib.php:1021
 #: libraries/rte/rte_triggers.lib.php:383 view_create.php:209
 msgid "Definer"
 msgstr "Zadavatel"
 
-#: libraries/rte/rte_events.lib.php:535 libraries/rte/rte_routines.lib.php:997
+#: libraries/rte/rte_events.lib.php:535
+#: libraries/rte/rte_routines.lib.php:1088
 #: libraries/rte/rte_triggers.lib.php:422
 msgid "The definer must be in the \"username@hostname\" format!"
 msgstr "Zadavatel musí být ve tvaru \"uživatel@počítač\"!"
@@ -11737,9 +11751,9 @@ msgid "You must provide an event definition."
 msgstr "Musíte zadat definici události."
 
 #: libraries/rte/rte_export.lib.php:43 libraries/rte/rte_general.lib.php:72
-#: libraries/rte/rte_routines.lib.php:345
-#: libraries/rte/rte_routines.lib.php:1198
-#: libraries/rte/rte_routines.lib.php:1411
+#: libraries/rte/rte_routines.lib.php:153
+#: libraries/rte/rte_routines.lib.php:1289
+#: libraries/rte/rte_routines.lib.php:1502
 msgid "Error in processing request:"
 msgstr "Chyba při zpracování požadavku:"
 
@@ -11775,96 +11789,96 @@ msgstr ""
 "přejete se těmto problémům vyhnout, začněte, prosím, používat nové rozšíření "
 "„mysqli“."
 
-#: libraries/rte/rte_routines.lib.php:110
-#: libraries/rte/rte_routines.lib.php:1006
+#: libraries/rte/rte_routines.lib.php:123
+msgid "Edit routine"
+msgstr "Upravit rutinu"
+
+#: libraries/rte/rte_routines.lib.php:200
+#: libraries/rte/rte_routines.lib.php:1097
 #, php-format
 msgid "Invalid routine type: \"%s\""
 msgstr "Chybný typ rutiny: „%s“"
 
-#: libraries/rte/rte_routines.lib.php:170
-msgid "Sorry, we failed to restore the dropped routine."
-msgstr "Bohužel se nepodařilo obnovit odstraněnou rutinu."
-
-#: libraries/rte/rte_routines.lib.php:211
-#, php-format
-msgid "Routine %1$s has been modified. Privileges have been adjusted."
-msgstr "Byla změněna rutina %1$s. Práva byla upravena."
-
-#: libraries/rte/rte_routines.lib.php:216
-#, php-format
-msgid "Routine %1$s has been modified."
-msgstr "Byla změněna rutina %1$s."
-
-#: libraries/rte/rte_routines.lib.php:238
+#: libraries/rte/rte_routines.lib.php:253
 #, php-format
 msgid "Routine %1$s has been created."
 msgstr "Byla vytvořena rutina %1$s."
 
-#: libraries/rte/rte_routines.lib.php:315
-msgid "Edit routine"
-msgstr "Upravit rutinu"
+#: libraries/rte/rte_routines.lib.php:380
+msgid "Sorry, we failed to restore the dropped routine."
+msgstr "Bohužel se nepodařilo obnovit odstraněnou rutinu."
 
-#: libraries/rte/rte_routines.lib.php:797
+#: libraries/rte/rte_routines.lib.php:439
+#, php-format
+msgid "Routine %1$s has been modified. Privileges have been adjusted."
+msgstr "Byla změněna rutina %1$s. Práva byla upravena."
+
+#: libraries/rte/rte_routines.lib.php:444
+#, php-format
+msgid "Routine %1$s has been modified."
+msgstr "Byla změněna rutina %1$s."
+
+#: libraries/rte/rte_routines.lib.php:888
 msgid "Routine name"
 msgstr "Jméno rutiny"
 
-#: libraries/rte/rte_routines.lib.php:823
+#: libraries/rte/rte_routines.lib.php:914
 msgid "Parameters"
 msgstr "Parametry"
 
-#: libraries/rte/rte_routines.lib.php:829
+#: libraries/rte/rte_routines.lib.php:920
 msgid "Direction"
 msgstr "Směr"
 
-#: libraries/rte/rte_routines.lib.php:847
+#: libraries/rte/rte_routines.lib.php:938
 msgid "Add parameter"
 msgstr "Přidat parametr"
 
-#: libraries/rte/rte_routines.lib.php:851
+#: libraries/rte/rte_routines.lib.php:942
 msgid "Remove last parameter"
 msgstr "Odstranit poslední parametr"
 
-#: libraries/rte/rte_routines.lib.php:856
+#: libraries/rte/rte_routines.lib.php:947
 msgid "Return type"
 msgstr "Návratový typ"
 
-#: libraries/rte/rte_routines.lib.php:862
+#: libraries/rte/rte_routines.lib.php:953
 msgid "Return length/values"
 msgstr "Návratová délka/hodnoty"
 
-#: libraries/rte/rte_routines.lib.php:868
+#: libraries/rte/rte_routines.lib.php:959
 msgid "Return options"
 msgstr "Možnosti návratové hodnoty"
 
-#: libraries/rte/rte_routines.lib.php:899
+#: libraries/rte/rte_routines.lib.php:990
 msgid "Is deterministic"
 msgstr "Je deterministická"
 
-#: libraries/rte/rte_routines.lib.php:920
+#: libraries/rte/rte_routines.lib.php:1011
 msgid ""
 "You do not have sufficient privileges to perform this operation; Please "
 "refer to the documentation for more details"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:935
+#: libraries/rte/rte_routines.lib.php:1026
 msgid "Security type"
 msgstr "Typ zabezpečení"
 
-#: libraries/rte/rte_routines.lib.php:944
+#: libraries/rte/rte_routines.lib.php:1035
 msgid "SQL data access"
 msgstr "Přístup k SQL datům"
 
-#: libraries/rte/rte_routines.lib.php:1013
+#: libraries/rte/rte_routines.lib.php:1104
 msgid "You must provide a routine name!"
 msgstr "Musíte zadat jméno rutiny!"
 
-#: libraries/rte/rte_routines.lib.php:1047
+#: libraries/rte/rte_routines.lib.php:1138
 #, php-format
 msgid "Invalid direction \"%s\" given for parameter."
 msgstr "„%s“ je chybný směr parametru."
 
-#: libraries/rte/rte_routines.lib.php:1069
-#: libraries/rte/rte_routines.lib.php:1131
+#: libraries/rte/rte_routines.lib.php:1160
+#: libraries/rte/rte_routines.lib.php:1222
 msgid ""
 "You must provide length/values for routine parameters of type ENUM, SET, "
 "VARCHAR and VARBINARY."
@@ -11872,24 +11886,24 @@ msgstr ""
 "Musíte zadat parametr „Délka/Hodnoty“ pro parametry typu ENUM, SET, VARCHAR "
 "nebo VARBINARY."
 
-#: libraries/rte/rte_routines.lib.php:1095
+#: libraries/rte/rte_routines.lib.php:1186
 msgid "You must provide a name and a type for each routine parameter."
 msgstr "Pro každý parametr musíte zadat jeho jméno a typ."
 
-#: libraries/rte/rte_routines.lib.php:1114
+#: libraries/rte/rte_routines.lib.php:1205
 msgid "You must provide a valid return type for the routine."
 msgstr "Musíte zadat platný návratový typ rutiny."
 
-#: libraries/rte/rte_routines.lib.php:1174
+#: libraries/rte/rte_routines.lib.php:1265
 msgid "You must provide a routine definition."
 msgstr "Musíte zadat definici rutiny."
 
-#: libraries/rte/rte_routines.lib.php:1285
+#: libraries/rte/rte_routines.lib.php:1376
 #, php-format
 msgid "Execution results of routine %s"
 msgstr "Výsledek spuštění rutiny %s"
 
-#: libraries/rte/rte_routines.lib.php:1340
+#: libraries/rte/rte_routines.lib.php:1431
 #, php-format
 msgid "%d row affected by the last statement inside the procedure."
 msgid_plural "%d rows affected by the last statement inside the procedure."
@@ -11897,13 +11911,13 @@ msgstr[0] "Posledním příkazem v proceduře byla ovlivněna %d řádka."
 msgstr[1] "Posledním příkazem v proceduře byly ovlivněny %d řádky."
 msgstr[2] "Posledním příkazem v proceduře bylo ovlivněno %d řádků."
 
-#: libraries/rte/rte_routines.lib.php:1398
-#: libraries/rte/rte_routines.lib.php:1406
+#: libraries/rte/rte_routines.lib.php:1489
+#: libraries/rte/rte_routines.lib.php:1497
 msgid "Execute routine"
 msgstr "Spustit rutinu"
 
-#: libraries/rte/rte_routines.lib.php:1485
-#: libraries/rte/rte_routines.lib.php:1488
+#: libraries/rte/rte_routines.lib.php:1576
+#: libraries/rte/rte_routines.lib.php:1579
 msgid "Routine parameters"
 msgstr "Parametry rutiny"
 
@@ -12057,7 +12071,7 @@ msgid "Original position"
 msgstr "Původní pozice"
 
 #: libraries/server_bin_log.lib.php:133
-#: templates/structure/display_table_stats.phtml:4
+#: templates/table/structure/display_table_stats.phtml:4
 msgid "Information"
 msgstr "Informace"
 
@@ -12095,12 +12109,12 @@ msgstr ""
 "Poznámka: Zobrazení podrobností o databázích může způsobit značné zvýšení "
 "provozu mezi webserverem a MySQL serverem."
 
-#: libraries/server_databases.lib.php:364
-#: libraries/server_databases.lib.php:365
+#: libraries/server_databases.lib.php:366
+#: libraries/server_databases.lib.php:371
 msgid "Enable Statistics"
 msgstr "Zobrazit podrobnosti"
 
-#: libraries/server_databases.lib.php:481
+#: libraries/server_databases.lib.php:492
 #, php-format
 msgid "%1$d database has been dropped successfully."
 msgid_plural "%1$d databases have been dropped successfully."
@@ -12474,7 +12488,7 @@ msgid "You have revoked the privileges for %s."
 msgstr "Byla zrušena práva pro %s."
 
 #: libraries/server_privileges.lib.php:2059
-#: libraries/server_privileges.lib.php:4290
+#: libraries/server_privileges.lib.php:4316
 msgid "Add user account"
 msgstr "Přidat uživatele"
 
@@ -12639,53 +12653,53 @@ msgstr "Odstraňuji %s"
 msgid "The privileges were reloaded successfully."
 msgstr "Oprávnění byla načtena úspěšně."
 
-#: libraries/server_privileges.lib.php:3994
+#: libraries/server_privileges.lib.php:4003
 #, php-format
 msgid "The user %s already exists!"
 msgstr "Uživatel %s již existuje!"
 
-#: libraries/server_privileges.lib.php:4232
+#: libraries/server_privileges.lib.php:4258
 #, php-format
 msgid "Privileges for %s"
 msgstr "Oprávnění pro %s"
 
-#: libraries/server_privileges.lib.php:4241
+#: libraries/server_privileges.lib.php:4267
 #: libraries/server_status_processes.lib.php:72
 #: libraries/server_user_groups.lib.php:39
 msgid "User"
 msgstr "Uživatel"
 
-#: libraries/server_privileges.lib.php:4282
+#: libraries/server_privileges.lib.php:4308
 msgctxt "Create new user"
 msgid "New"
 msgstr "Nový"
 
-#: libraries/server_privileges.lib.php:4311
+#: libraries/server_privileges.lib.php:4337
 msgid "Edit privileges:"
 msgstr "Upravit oprávnění:"
 
-#: libraries/server_privileges.lib.php:4312
+#: libraries/server_privileges.lib.php:4338
 msgid "User account"
 msgstr "Uživatel"
 
-#: libraries/server_privileges.lib.php:4371
+#: libraries/server_privileges.lib.php:4397
 msgid ""
 "Note: You are attempting to edit privileges of the user with which you are "
 "currently logged in."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4391 libraries/server_users.lib.php:25
+#: libraries/server_privileges.lib.php:4417 libraries/server_users.lib.php:25
 msgid "User accounts overview"
 msgstr "Přehled uživatelů"
 
-#: libraries/server_privileges.lib.php:4459
+#: libraries/server_privileges.lib.php:4485
 msgid ""
 "A user account allowing any user from localhost to connect is present. This "
 "will prevent other users from connecting if the host part of their account "
 "allows a connection from any (%) host."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4500
+#: libraries/server_privileges.lib.php:4526
 #, php-format
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
@@ -12698,7 +12712,7 @@ msgstr ""
 "tyto tabulky upravovány. V tomto případě je vhodné provést %snové načtení "
 "oprávnění%s před pokračováním."
 
-#: libraries/server_privileges.lib.php:4519
+#: libraries/server_privileges.lib.php:4545
 #, fuzzy
 #| msgid ""
 #| "Note: phpMyAdmin gets the users' privileges directly from MySQL's "
@@ -12717,25 +12731,25 @@ msgstr ""
 "tyto tabulky upravovány. V tomto případě je vhodné provést %snové načtení "
 "oprávnění%s před pokračováním."
 
-#: libraries/server_privileges.lib.php:4569
+#: libraries/server_privileges.lib.php:4595
 msgid "The selected user was not found in the privilege table."
 msgstr "Zvolený uživatel nebyl nalezen v tabulce oprávnění."
 
-#: libraries/server_privileges.lib.php:4801
+#: libraries/server_privileges.lib.php:4827
 msgid "You have added a new user."
 msgstr "Uživatel byl přidán."
 
-#: libraries/server_status.lib.php:53
+#: libraries/server_status.lib.php:60
 #, php-format
 msgid "Network traffic since startup: %s"
 msgstr "Síťový provoz od spuštění: %s"
 
-#: libraries/server_status.lib.php:66
+#: libraries/server_status.lib.php:73
 #, php-format
 msgid "This MySQL server has been running for %1$s. It started up on %2$s."
 msgstr "Tento MySQL server běží %1$s. Čas spuštění: %2$s."
 
-#: libraries/server_status.lib.php:80
+#: libraries/server_status.lib.php:94
 msgid ""
 "This MySQL server works as <b>master</b> and <b>slave</b> in <b>replication</"
 "b> process."
@@ -12743,21 +12757,21 @@ msgstr ""
 "Tento server pracuje jako <b>nadřízený</b> i <b>podřízený</b> v "
 "<b>replikačním</b> procesu."
 
-#: libraries/server_status.lib.php:85
+#: libraries/server_status.lib.php:99
 msgid "This MySQL server works as <b>master</b> in <b>replication</b> process."
 msgstr ""
 "Tento server pracuje jako <b>nadřízený</b> v <b>replikačním</b> procesu."
 
-#: libraries/server_status.lib.php:90
+#: libraries/server_status.lib.php:104
 msgid "This MySQL server works as <b>slave</b> in <b>replication</b> process."
 msgstr ""
 "Tento server pracuje jako <b>podřízený</b> v <b>replikačním</b> procesu."
 
-#: libraries/server_status.lib.php:106
+#: libraries/server_status.lib.php:116
 msgid "Replication status"
 msgstr "Stav replikace"
 
-#: libraries/server_status.lib.php:137
+#: libraries/server_status.lib.php:146
 msgid ""
 "On a busy server, the byte counters may overrun, so those statistics as "
 "reported by the MySQL server may be incorrect."
@@ -12765,19 +12779,19 @@ msgstr ""
 "Na hodně zatíženém serveru mohou čítače přetéct, takže statistiky MySQL "
 "serveru mohou být nepřesné."
 
-#: libraries/server_status.lib.php:148
+#: libraries/server_status.lib.php:157
 msgid "Received"
 msgstr "Přijato"
 
-#: libraries/server_status.lib.php:167
+#: libraries/server_status.lib.php:176
 msgid "Sent"
 msgstr "Odesláno"
 
-#: libraries/server_status.lib.php:234
+#: libraries/server_status.lib.php:243
 msgid "Max. concurrent connections"
 msgstr "Maximum současných připojení"
 
-#: libraries/server_status.lib.php:244
+#: libraries/server_status.lib.php:253
 msgid "Failed attempts"
 msgstr "Nepovedených pokusů"
 
@@ -13831,7 +13845,7 @@ msgstr ""
 msgid "Not implemented yet."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/AlterOperation.php:193
+#: libraries/sql-parser/src/Components/AlterOperation.php:191
 #, fuzzy
 #| msgid "Iconic table operations"
 msgid "Unrecognized alter operation."
@@ -13847,7 +13861,7 @@ msgid "An opening bracket followed by a set of values was expected."
 msgstr ""
 
 #: libraries/sql-parser/src/Components/ArrayObj.php:101
-#: libraries/sql-parser/src/Components/FieldDefinition.php:202
+#: libraries/sql-parser/src/Components/CreateDefinition.php:202
 msgid "An opening bracket was expected."
 msgstr ""
 
@@ -13855,25 +13869,35 @@ msgstr ""
 msgid "A comma or a closing bracket was expected"
 msgstr ""
 
+#: libraries/sql-parser/src/Components/CreateDefinition.php:246
+#, fuzzy
+#| msgid "No tables selected."
+msgid "A comma or a closing bracket was expected."
+msgstr "Nebyly vybrány žádné tabulky."
+
+#: libraries/sql-parser/src/Components/CreateDefinition.php:262
+msgid "A closing bracket was expected."
+msgstr ""
+
 #: libraries/sql-parser/src/Components/DataType.php:125
 msgid "Unrecognized data type."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:225
+#: libraries/sql-parser/src/Components/Expression.php:227
 msgid "Unexpected closing bracket."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:246
-#: libraries/sql-parser/src/Components/Expression.php:283
-#: libraries/sql-parser/src/Components/Expression.php:303
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:285
+#: libraries/sql-parser/src/Components/Expression.php:305
 msgid "An alias was previously found."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:257
+#: libraries/sql-parser/src/Components/Expression.php:259
 msgid "Unexpected dot."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:327
+#: libraries/sql-parser/src/Components/Expression.php:329
 #, fuzzy
 #| msgid "No tables selected."
 msgid "An alias was expected."
@@ -13885,16 +13909,6 @@ msgstr "Nebyly vybrány žádné tabulky."
 msgid "An expression was expected."
 msgstr "Nebyly vybrány žádné verze."
 
-#: libraries/sql-parser/src/Components/FieldDefinition.php:246
-#, fuzzy
-#| msgid "No tables selected."
-msgid "A comma or a closing bracket was expected."
-msgstr "Nebyly vybrány žádné tabulky."
-
-#: libraries/sql-parser/src/Components/FieldDefinition.php:262
-msgid "A closing bracket was expected."
-msgstr ""
-
 #: libraries/sql-parser/src/Components/Limit.php:90
 #: libraries/sql-parser/src/Components/Limit.php:112
 msgid "An offset was expected."
@@ -13942,29 +13956,29 @@ msgstr ""
 msgid "Expected delimiter."
 msgstr ""
 
-#: libraries/sql-parser/src/Lexer.php:753
+#: libraries/sql-parser/src/Lexer.php:777
 #, fuzzy, php-format
 #| msgid "Event %1$s has been created."
 msgid "Ending quote %1$s was expected."
 msgstr "Byla vytvořena událost %1$s."
 
-#: libraries/sql-parser/src/Lexer.php:789
+#: libraries/sql-parser/src/Lexer.php:813
 #, fuzzy
 #| msgid "Table name template"
 msgid "Variable name was expected."
 msgstr "Vzor pro jméno tabulky"
 
-#: libraries/sql-parser/src/Parser.php:380
+#: libraries/sql-parser/src/Parser.php:391
 #, fuzzy
 #| msgid "at beginning of table"
 msgid "Unexpected beginning of statement."
 msgstr "na začátku tabulky"
 
-#: libraries/sql-parser/src/Parser.php:399
+#: libraries/sql-parser/src/Parser.php:410
 msgid "Unrecognized statement type."
 msgstr ""
 
-#: libraries/sql-parser/src/Parser.php:479
+#: libraries/sql-parser/src/Parser.php:489
 msgid "No transaction was previously started."
 msgstr ""
 
@@ -13994,8 +14008,10 @@ msgid "The name of the entity was expected."
 msgstr "Počet aktuálně otevřených tabulek."
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:310
-msgid "At least one field definition was expected."
-msgstr ""
+#, fuzzy
+#| msgid "Template was deleted."
+msgid "At least one column definition was expected."
+msgstr "Šablona byla smazána."
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:329
 msgid "A \"RETURNS\" keyword was expected."
@@ -14054,11 +14070,11 @@ msgstr "Nepodařilo se uložit oblíbený dotaz!"
 msgid "Using bookmark \"%s\" as default browse query."
 msgstr "Pro procházení databáze je použit oblíbený dotaz „%s\"."
 
-#: libraries/sql.lib.php:1306
+#: libraries/sql.lib.php:1300
 msgid "Showing as PHP code"
 msgstr "Zobrazuji jako PHP kód"
 
-#: libraries/sql.lib.php:1638
+#: libraries/sql.lib.php:1632
 #, php-format
 msgid ""
 "Current selection does not contain a unique column. Grid edit, checkbox, "
@@ -14067,7 +14083,7 @@ msgstr ""
 "Aktuální výběr neobsahuje unikátní klíč. Editování v mřížce, zaškrtávací "
 "políčka nebo odkazy na editaci a mazání proto nejsou k dispozici. %s"
 
-#: libraries/sql.lib.php:1649
+#: libraries/sql.lib.php:1643
 #, php-format
 msgid ""
 "Current selection does not contain a unique column. Grid edit, Edit, Copy "
@@ -14076,7 +14092,7 @@ msgstr ""
 "Aktuální výběr neobsahuje unikátní klíč. Editování v mřížce může vést na "
 "nežádoucí chování. %s"
 
-#: libraries/sql.lib.php:1688
+#: libraries/sql.lib.php:1682
 #, php-format
 msgid "Problems with indexes of table `%s`"
 msgstr "Problémy s klíči v tabulce „%s\""
@@ -14233,7 +14249,7 @@ msgid "Version %s snapshot (SQL code)"
 msgstr "Snímek verze %s (SQL kód)"
 
 #: libraries/tracking.lib.php:947
-#: templates/structure/table_structure_row.phtml:33
+#: templates/table/structure/table_structure_row.phtml:33
 msgctxt "None for default"
 msgid "None"
 msgstr "Žádná"
@@ -14288,15 +14304,15 @@ msgstr "Verze %1$s z %2$s byla odstraněna."
 msgid "Version %1$s was created, tracking for %2$s is active."
 msgstr "Verze %1$s vytvořena, sledování pro %2$s je zapnuté."
 
-#: libraries/user_preferences.inc.php:29
+#: libraries/user_preferences.inc.php:30
 msgid "Manage your settings"
 msgstr "Spravujte svoje nastavení"
 
-#: libraries/user_preferences.inc.php:46 prefs_manage.php:307
+#: libraries/user_preferences.inc.php:54 prefs_manage.php:307
 msgid "Configuration has been saved."
 msgstr "Nastavení bylo uloženo."
 
-#: libraries/user_preferences.inc.php:66
+#: libraries/user_preferences.inc.php:74
 #, php-format
 msgid ""
 "Your preferences will be saved for current session only. Storing them "
@@ -14699,7 +14715,7 @@ msgid "first"
 msgstr "první"
 
 #: templates/columns_definitions/move_column.phtml:12
-#: templates/structure/add_column.phtml:21
+#: templates/table/structure/add_column.phtml:21
 #, php-format
 msgid "after %s"
 msgstr "po %s"
@@ -14768,197 +14784,297 @@ msgstr "Transformace při zadávání"
 msgid "Input transformation options"
 msgstr "Parametry vstupní transformace"
 
-#: templates/designer/aggregate_query_panel.phtml:22
-#: templates/designer/options_panel.phtml:100
-msgid "Aggregate"
-msgstr "Sloučit"
-
-#: templates/designer/aggregate_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:61
-#: templates/designer/options_panel.phtml:106
-#: templates/designer/options_panel.phtml:170
-#: templates/designer/where_query_panel.phtml:30
-#: templates/table/table_header.phtml:9
-msgid "Operator"
-msgstr "Operátor"
-
-#: templates/designer/database_tables.phtml:29
-msgid "Toggle"
-msgstr "Přepnout"
-
-#: templates/designer/database_tables.phtml:40
-msgid "See table structure"
-msgstr "Zobrazit strukturu tabulky"
-
-#: templates/designer/delete_relation_panel.phtml:21
-msgid "Delete relation"
-msgstr "Odstranit relaci"
-
-#: templates/designer/edit_delete_pages.phtml:7
-msgid "Page to open"
-msgstr "Stránka k otevření"
-
-#: templates/designer/edit_delete_pages.phtml:7
-msgid "Page to delete"
-msgstr "Stránka ke smazání"
-
-#: templates/designer/having_query_panel.phtml:90
-#: templates/designer/options_panel.phtml:63
-#: templates/designer/options_panel.phtml:229
-#: templates/designer/where_query_panel.phtml:59
-msgid "Except"
-msgstr "Kromě"
-
-#: templates/designer/having_query_panel.phtml:102
-#: templates/designer/options_panel.phtml:75
-#: templates/designer/options_panel.phtml:241
-#: templates/designer/where_query_panel.phtml:71
-msgid "subquery"
-msgstr "poddotaz"
-
-#: templates/designer/new_relation_panel.phtml:22
-#: templates/designer/side_menu.phtml:84 templates/designer/side_menu.phtml:87
-msgid "Create relation"
-msgstr "Vytvořit relaci"
-
-#: templates/designer/options_panel.phtml:34
-#: templates/designer/options_panel.phtml:200
-msgid "Relation operator"
-msgstr "Relační operátor"
-
-#: templates/designer/options_panel.phtml:85
-#: templates/designer/rename_to_panel.phtml:23
-msgid "Rename to"
-msgstr "Přejmenovat na"
-
-#: templates/designer/options_panel.phtml:91
-#: templates/designer/rename_to_panel.phtml:31
-msgid "New name"
-msgstr "Nové jméno"
-
-#: templates/designer/page_save_as.phtml:4
-msgid "Save to selected page"
-msgstr "Uložit k vybrané stránce"
-
-#: templates/designer/page_save_as.phtml:5
-msgid "Create a page and save to it"
-msgstr "Vytvořit stránku a uložit do ní"
-
-#: templates/designer/page_save_as.phtml:26
-msgid "New page name"
-msgstr "Název nové stránky"
-
-#: templates/designer/page_selector.phtml:2
-msgid "Select page"
-msgstr "Zvolte stránku"
-
-#: templates/designer/query_details.phtml:10
-msgid "Active options"
-msgstr "Zapnuté parametry"
-
-#: templates/designer/schema_export.phtml:4
-msgid "Select Export Relational Type"
-msgstr "Zvolte typ výstupu relací"
-
-#: templates/designer/side_menu.phtml:19 templates/designer/side_menu.phtml:25
-msgid "Show/Hide tables list"
-msgstr "Zobrazit/Skrýt seznam tabulek"
-
-#: templates/designer/side_menu.phtml:29 templates/designer/side_menu.phtml:35
-#: templates/designer/side_menu.phtml:36
-msgid "View in fullscreen"
-msgstr "Zobrazit na celé obrazovce"
-
-#: templates/designer/side_menu.phtml:34
-msgid "Exit fullscreen"
-msgstr "Ukončit režim na celou obrazovku"
-
-#: templates/designer/side_menu.phtml:41 templates/designer/side_menu.phtml:45
-msgid "New page"
-msgstr "Nová stránka"
-
-#: templates/designer/side_menu.phtml:70 templates/designer/side_menu.phtml:73
-msgid "Delete pages"
-msgstr "Odstranit stránky"
-
-#: templates/designer/side_menu.phtml:77 templates/designer/side_menu.phtml:80
-#: templates/table/create_table.phtml:7
+#: templates/database/create_table.phtml:7
+#: templates/database/designer/side_menu.phtml:77
+#: templates/database/designer/side_menu.phtml:80
 msgid "Create table"
 msgstr "Vytvořit tabulku"
 
-#: templates/designer/side_menu.phtml:98
-#: templates/designer/side_menu.phtml:101
+#: templates/database/create_table.phtml:15
+msgid "Number of columns"
+msgstr "Počet polí"
+
+#: templates/database/designer/aggregate_query_panel.phtml:22
+#: templates/database/designer/options_panel.phtml:100
+msgid "Aggregate"
+msgstr "Sloučit"
+
+#: templates/database/designer/aggregate_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:61
+#: templates/database/designer/options_panel.phtml:106
+#: templates/database/designer/options_panel.phtml:170
+#: templates/database/designer/where_query_panel.phtml:30
+#: templates/table/search/table_header.phtml:9
+msgid "Operator"
+msgstr "Operátor"
+
+#: templates/database/designer/database_tables.phtml:29
+msgid "Toggle"
+msgstr "Přepnout"
+
+#: templates/database/designer/database_tables.phtml:40
+msgid "See table structure"
+msgstr "Zobrazit strukturu tabulky"
+
+#: templates/database/designer/delete_relation_panel.phtml:21
+msgid "Delete relation"
+msgstr "Odstranit relaci"
+
+#: templates/database/designer/edit_delete_pages.phtml:7
+msgid "Page to open"
+msgstr "Stránka k otevření"
+
+#: templates/database/designer/edit_delete_pages.phtml:7
+msgid "Page to delete"
+msgstr "Stránka ke smazání"
+
+#: templates/database/designer/having_query_panel.phtml:90
+#: templates/database/designer/options_panel.phtml:63
+#: templates/database/designer/options_panel.phtml:229
+#: templates/database/designer/where_query_panel.phtml:59
+msgid "Except"
+msgstr "Kromě"
+
+#: templates/database/designer/having_query_panel.phtml:102
+#: templates/database/designer/options_panel.phtml:75
+#: templates/database/designer/options_panel.phtml:241
+#: templates/database/designer/where_query_panel.phtml:71
+msgid "subquery"
+msgstr "poddotaz"
+
+#: templates/database/designer/new_relation_panel.phtml:22
+#: templates/database/designer/side_menu.phtml:84
+#: templates/database/designer/side_menu.phtml:87
+msgid "Create relation"
+msgstr "Vytvořit relaci"
+
+#: templates/database/designer/options_panel.phtml:34
+#: templates/database/designer/options_panel.phtml:200
+msgid "Relation operator"
+msgstr "Relační operátor"
+
+#: templates/database/designer/options_panel.phtml:85
+#: templates/database/designer/rename_to_panel.phtml:23
+msgid "Rename to"
+msgstr "Přejmenovat na"
+
+#: templates/database/designer/options_panel.phtml:91
+#: templates/database/designer/rename_to_panel.phtml:31
+msgid "New name"
+msgstr "Nové jméno"
+
+#: templates/database/designer/page_save_as.phtml:4
+msgid "Save to selected page"
+msgstr "Uložit k vybrané stránce"
+
+#: templates/database/designer/page_save_as.phtml:5
+msgid "Create a page and save to it"
+msgstr "Vytvořit stránku a uložit do ní"
+
+#: templates/database/designer/page_save_as.phtml:26
+msgid "New page name"
+msgstr "Název nové stránky"
+
+#: templates/database/designer/page_selector.phtml:2
+msgid "Select page"
+msgstr "Zvolte stránku"
+
+#: templates/database/designer/query_details.phtml:10
+msgid "Active options"
+msgstr "Zapnuté parametry"
+
+#: templates/database/designer/schema_export.phtml:4
+msgid "Select Export Relational Type"
+msgstr "Zvolte typ výstupu relací"
+
+#: templates/database/designer/side_menu.phtml:19
+#: templates/database/designer/side_menu.phtml:25
+msgid "Show/Hide tables list"
+msgstr "Zobrazit/Skrýt seznam tabulek"
+
+#: templates/database/designer/side_menu.phtml:29
+#: templates/database/designer/side_menu.phtml:35
+#: templates/database/designer/side_menu.phtml:36
+msgid "View in fullscreen"
+msgstr "Zobrazit na celé obrazovce"
+
+#: templates/database/designer/side_menu.phtml:34
+msgid "Exit fullscreen"
+msgstr "Ukončit režim na celou obrazovku"
+
+#: templates/database/designer/side_menu.phtml:41
+#: templates/database/designer/side_menu.phtml:45
+msgid "New page"
+msgstr "Nová stránka"
+
+#: templates/database/designer/side_menu.phtml:70
+#: templates/database/designer/side_menu.phtml:73
+msgid "Delete pages"
+msgstr "Odstranit stránky"
+
+#: templates/database/designer/side_menu.phtml:98
+#: templates/database/designer/side_menu.phtml:101
 msgid "Reload"
 msgstr "Znovu načíst"
 
-#: templates/designer/side_menu.phtml:107
-#: templates/designer/side_menu.phtml:110
+#: templates/database/designer/side_menu.phtml:107
+#: templates/database/designer/side_menu.phtml:110
 msgid "Help"
 msgstr "Nápověda"
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Angular links"
 msgstr "Pravoúhlé spoje"
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Direct links"
 msgstr "Přímé spoje"
 
-#: templates/designer/side_menu.phtml:122
-#: templates/designer/side_menu.phtml:124
+#: templates/database/designer/side_menu.phtml:122
+#: templates/database/designer/side_menu.phtml:124
 msgid "Snap to grid"
 msgstr "Zachytávat na mřížku"
 
-#: templates/designer/side_menu.phtml:128
-#: templates/designer/side_menu.phtml:134
+#: templates/database/designer/side_menu.phtml:128
+#: templates/database/designer/side_menu.phtml:134
 msgid "Small/Big All"
 msgstr "Vše malé/velké"
 
-#: templates/designer/side_menu.phtml:138
-#: templates/designer/side_menu.phtml:141
+#: templates/database/designer/side_menu.phtml:138
+#: templates/database/designer/side_menu.phtml:141
 msgid "Toggle small/big"
 msgstr "Přepnout malé/velké"
 
-#: templates/designer/side_menu.phtml:145
-#: templates/designer/side_menu.phtml:148
+#: templates/database/designer/side_menu.phtml:145
+#: templates/database/designer/side_menu.phtml:148
 msgid "Toggle relation lines"
 msgstr "Přepnout zobrazení relací"
 
-#: templates/designer/side_menu.phtml:153
-#: templates/designer/side_menu.phtml:156
+#: templates/database/designer/side_menu.phtml:153
+#: templates/database/designer/side_menu.phtml:156
 msgid "Export schema"
 msgstr "Exportovat schéma"
 
-#: templates/designer/side_menu.phtml:165
-#: templates/designer/side_menu.phtml:168
+#: templates/database/designer/side_menu.phtml:165
+#: templates/database/designer/side_menu.phtml:168
 msgid "Build Query"
 msgstr "Vytvořit dotaz"
 
-#: templates/designer/side_menu.phtml:173
-#: templates/designer/side_menu.phtml:177
+#: templates/database/designer/side_menu.phtml:173
+#: templates/database/designer/side_menu.phtml:177
 msgid "Move Menu"
 msgstr "Přesun menu"
 
-#: templates/designer/side_menu.phtml:181
-#: templates/designer/side_menu.phtml:186
+#: templates/database/designer/side_menu.phtml:181
+#: templates/database/designer/side_menu.phtml:186
 msgid "Pin text"
 msgstr "Připíchnout text"
 
-#: templates/designer/table_list.phtml:4
+#: templates/database/designer/table_list.phtml:4
 msgid "Hide/Show all"
 msgstr "Skrýt/Zobrazit vše"
 
-#: templates/designer/table_list.phtml:14
+#: templates/database/designer/table_list.phtml:14
 msgid "Hide/Show Tables with no relation"
 msgstr "Skrýt/Zobrazit tabulky bez relací"
 
-#: templates/designer/table_list.phtml:59
+#: templates/database/designer/table_list.phtml:59
 msgid "Number of tables:"
 msgstr "Počet tabulek:"
 
+#: templates/database/structure/body_for_table_summary.phtml:6
+#, php-format
+msgid "%s table"
+msgid_plural "%s tables"
+msgstr[0] "%s tabulka"
+msgstr[1] "%s tabulky"
+msgstr[2] "%s tabulek"
+
+#: templates/database/structure/body_for_table_summary.phtml:17
+msgid "Sum"
+msgstr "Celkem"
+
+#: templates/database/structure/check_all_tables.phtml:6
+msgid "Check tables having overhead"
+msgstr "Zaškrtnout neoptimální"
+
+#: templates/database/structure/check_all_tables.phtml:10
+msgid "Show create"
+msgstr "Zobrazit SQL pro vytvoření"
+
+#: templates/database/structure/check_all_tables.phtml:27
+msgid "Prefix"
+msgstr "Předpona"
+
+#: templates/database/structure/check_all_tables.phtml:28
+msgid "Add prefix to table"
+msgstr "Přidat tabulce předponu"
+
+#: templates/database/structure/check_all_tables.phtml:29
+msgid "Replace table prefix"
+msgstr "Změnit tabulce předponu"
+
+#: templates/database/structure/check_all_tables.phtml:30
+msgid "Copy table with prefix"
+msgstr "Zkopírovat tabulku s předponou"
+
+#: templates/database/structure/check_all_tables.phtml:36
+#, fuzzy
+#| msgid "CHAR textarea columns"
+msgid "Add columns to central list"
+msgstr "Sloupce pro textové oblasti typu CHAR"
+
+#: templates/database/structure/check_all_tables.phtml:37
+msgid "Remove columns from central list"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:38
+#, fuzzy
+#| msgid "CHAR textarea columns"
+msgid "Make consistent with central list"
+msgstr "Sloupce pro textové oblasti typu CHAR"
+
+#: templates/database/structure/favorite_anchor.phtml:12
+msgid "Add to Favorites"
+msgstr "Přidat do oblíbených"
+
+#: templates/database/structure/show_create.phtml:2
+msgid "Showing create queries"
+msgstr "Zobrazuji SQL dotaz pro vytvoření"
+
+#: templates/database/structure/sortable_header.phtml:13
+msgid "Sort"
+msgstr "Řadit"
+
+#: templates/database/structure/table_header.phtml:42
+msgid ""
+"May be approximate. Click on the number to get the exact count. See "
+"[doc@faq3-11]FAQ 3.11[/doc]."
+msgstr ""
+"Počet nemusí být přesný, pro přesný klikněte na číslo. Více informací viz "
+"[doc@faq3-11]FAQ 3.11[/doc]."
+
+#: templates/database/structure/table_header.phtml:66
+#: templates/table/index_form.phtml:127
+msgid "Size"
+msgstr "Velikost"
+
+#: templates/database/structure/table_header.phtml:74
+#: templates/table/structure/display_table_stats.phtml:27
+msgid "Overhead"
+msgstr "Navíc"
+
+#: templates/database/structure/tracking_icon.phtml:4
+msgid "Tracking is active."
+msgstr "Sledování je zapnuté."
+
+#: templates/database/structure/tracking_icon.phtml:8
+msgid "Tracking is not active."
+msgstr "Sledování není zapnuté."
+
 #: templates/error/report_form.phtml:7
 msgid ""
 "phpMyAdmin has encountered an error. We have collected data about this error "
@@ -14977,59 +15093,6 @@ msgstr "Prohlédněte si informace v hlášení:"
 msgid "Please explain the steps that lead to the error:"
 msgstr "Prosím popište co předcházelo této chybě:"
 
-#: templates/gis_visualization/gis_visualization.phtml:3
-msgid "Display GIS Visualization"
-msgstr "Zobrazit GIS data"
-
-#: templates/gis_visualization/gis_visualization.phtml:8
-msgid "Label column"
-msgstr "Název sloupce"
-
-#: templates/gis_visualization/gis_visualization.phtml:11
-msgid "-- None --"
-msgstr "-- Žádný --"
-
-#: templates/gis_visualization/gis_visualization.phtml:19
-msgid "Spatial column"
-msgstr "Prostorový sloupec"
-
-#: templates/index_form.phtml:16
-msgid "Index name:"
-msgstr "Jméno klíče:"
-
-#: templates/index_form.phtml:19
-msgid ""
-"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
-msgstr "„PRIMARY“ <b>musí</b> být jméno <b>pouze</b> primárního klíče!"
-
-#: templates/index_form.phtml:40
-msgid "Index choice:"
-msgstr "Výběr indexu:"
-
-#: templates/index_form.phtml:57
-msgid "Key block size:"
-msgstr ""
-
-#: templates/index_form.phtml:74
-msgid "Index type:"
-msgstr "Typ klíče:"
-
-#: templates/index_form.phtml:86
-msgid "Parser:"
-msgstr "Syntaktický analyzátor:"
-
-#: templates/index_form.phtml:102
-msgid "Comment:"
-msgstr "Komentář:"
-
-#: templates/index_form.phtml:127 templates/structure/table_header.phtml:66
-msgid "Size"
-msgstr "Velikost"
-
-#: templates/index_form.phtml:149 templates/index_form.phtml:190
-msgid "Drag to reorder"
-msgstr "Uspořádejte přetažením"
-
 #: templates/prefs_autoload.phtml:9
 msgid ""
 "Your browser has phpMyAdmin configuration for this domain. Would you like to "
@@ -15042,421 +15105,381 @@ msgstr ""
 msgid "Start row:"
 msgstr "Počáteční řádek:"
 
-#: templates/structure/actions_in_table_structure.phtml:14
-#, php-format
-msgid "A primary key has been added on %s."
-msgstr "Na poli %s byl vytvořen primární klíč."
-
-#: templates/structure/actions_in_table_structure.phtml:34
-#: templates/structure/actions_in_table_structure.phtml:54
-#: templates/structure/actions_in_table_structure.phtml:79
-#: templates/structure/actions_in_table_structure.phtml:101
-#, php-format
-msgid "An index has been added on %s."
-msgstr "Na poli %s byl vytvořen klíč."
-
-#: templates/structure/actions_in_table_structure.phtml:130
-#: templates/structure/check_all_table_column.phtml:59
-#, fuzzy
-#| msgid "Remove column(s)"
-msgid "Remove from central columns"
-msgstr "Odstranit pole"
-
-#: templates/structure/actions_in_table_structure.phtml:138
-#: templates/structure/check_all_table_column.phtml:55
-#, fuzzy
-#| msgid "CHAR textarea columns"
-msgid "Add to central columns"
-msgstr "Sloupce pro textové oblasti typu CHAR"
-
-#: templates/structure/add_column.phtml:7
-#, php-format
-msgid "Add %s column(s)"
-msgstr "Přidat %s polí"
-
-#: templates/structure/add_column.phtml:12
-msgid "at beginning of table"
-msgstr "na začátku tabulky"
-
-#: templates/structure/body_for_table_summary.phtml:6
-#, php-format
-msgid "%s table"
-msgid_plural "%s tables"
-msgstr[0] "%s tabulka"
-msgstr[1] "%s tabulky"
-msgstr[2] "%s tabulek"
-
-#: templates/structure/body_for_table_summary.phtml:17
-msgid "Sum"
-msgstr "Celkem"
-
-#: templates/structure/check_all_tables.phtml:6
-msgid "Check tables having overhead"
-msgstr "Zaškrtnout neoptimální"
-
-#: templates/structure/check_all_tables.phtml:10
-msgid "Show create"
-msgstr "Zobrazit SQL pro vytvoření"
-
-#: templates/structure/check_all_tables.phtml:27
-msgid "Prefix"
-msgstr "Předpona"
-
-#: templates/structure/check_all_tables.phtml:28
-msgid "Add prefix to table"
-msgstr "Přidat tabulce předponu"
-
-#: templates/structure/check_all_tables.phtml:29
-msgid "Replace table prefix"
-msgstr "Změnit tabulce předponu"
-
-#: templates/structure/check_all_tables.phtml:30
-msgid "Copy table with prefix"
-msgstr "Zkopírovat tabulku s předponou"
-
-#: templates/structure/check_all_tables.phtml:36
-#, fuzzy
-#| msgid "CHAR textarea columns"
-msgid "Add columns to central list"
-msgstr "Sloupce pro textové oblasti typu CHAR"
-
-#: templates/structure/check_all_tables.phtml:37
-msgid "Remove columns from central list"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:38
-#, fuzzy
-#| msgid "CHAR textarea columns"
-msgid "Make consistent with central list"
-msgstr "Sloupce pro textové oblasti typu CHAR"
-
-#: templates/structure/display_structure.phtml:140 view_create.php:181
-msgid "Edit view"
-msgstr "Upravit pohled"
-
-#: templates/structure/display_table_stats.phtml:9
-msgid "Space usage"
-msgstr "Využití místa"
-
-#: templates/structure/display_table_stats.phtml:27
-#: templates/structure/table_header.phtml:74
-msgid "Overhead"
-msgstr "Navíc"
-
-#: templates/structure/display_table_stats.phtml:32
-msgid "Effective"
-msgstr "Efektivní"
-
-#: templates/structure/favorite_anchor.phtml:12
-msgid "Add to Favorites"
-msgstr "Přidat do oblíbených"
-
-#: templates/structure/move_columns_dialog.phtml:1
-#: templates/structure/optional_action_links.phtml:21
-msgid "Move columns"
-msgstr "Přesunout pole"
-
-#: templates/structure/move_columns_dialog.phtml:2
-msgid "Move the columns by dragging them up and down."
-msgstr "Přesuňte sloupce tažením nahoru nebo dolů."
-
-#: templates/structure/optional_action_links.phtml:9
-msgid "Propose table structure"
-msgstr "Navrhnout strukturu tabulky"
-
-#: templates/structure/optional_action_links.phtml:24
-msgid "Improve table structure"
-msgstr "Vylepšit strukturu tabulky"
-
-#: templates/structure/optional_action_links.phtml:30
-msgid "Track view"
-msgstr "Sledovat pohled"
-
-#: templates/structure/row_stats_table.phtml:3
-msgid "Row statistics"
-msgstr "Statistika řádků"
-
-#: templates/structure/row_stats_table.phtml:9
-msgid "static"
-msgstr "statický"
-
-#: templates/structure/row_stats_table.phtml:11
-msgid "dynamic"
-msgstr "dynamický"
-
-#: templates/structure/row_stats_table.phtml:22
-msgid "partitioned"
-msgstr "používá oddíly"
-
-#: templates/structure/row_stats_table.phtml:54
-msgid "Row length"
-msgstr "Délka řádku"
-
-#: templates/structure/row_stats_table.phtml:66
-msgid "Row size"
-msgstr "Velikost řádku"
-
-#: templates/structure/row_stats_table.phtml:73
-msgid "Next autoindex"
-msgstr "Další automatický klíč"
-
-#: templates/structure/secondary_tabs.phtml:14
-msgid "Relation view"
-msgstr "Zobrazení relací"
-
-#: templates/structure/show_create.phtml:2
-msgid "Showing create queries"
-msgstr "Zobrazuji SQL dotaz pro vytvoření"
-
-#: templates/structure/sortable_header.phtml:13
-msgid "Sort"
-msgstr "Řadit"
-
-#: templates/structure/table_header.phtml:42
-msgid ""
-"May be approximate. Click on the number to get the exact count. See "
-"[doc@faq3-11]FAQ 3.11[/doc]."
-msgstr ""
-"Počet nemusí být přesný, pro přesný klikněte na číslo. Více informací viz "
-"[doc@faq3-11]FAQ 3.11[/doc]."
-
-#: templates/structure/table_structure_row.phtml:46
-#, php-format
-msgid "Column %s has been dropped."
-msgstr "Pole %s bylo odstraněno."
-
-#: templates/structure/tracking_icon.phtml:4
-msgid "Tracking is active."
-msgstr "Sledování je zapnuté."
-
-#: templates/structure/tracking_icon.phtml:8
-msgid "Tracking is not active."
-msgstr "Sledování není zapnuté."
-
-#: templates/table/create_table.phtml:15
-msgid "Number of columns"
-msgstr "Počet polí"
-
-#: templates/table/options.phtml:8
-msgid "Select columns (at least one):"
-msgstr "Zvolte pole (alespoň jedno):"
-
-#: templates/table/options.phtml:37
-msgid "Add search conditions (body of the \"where\" clause):"
-msgstr "Přidat vyhledávací parametry (část dotazu po příkazu „WHERE“):"
-
-#: templates/table/options.phtml:45
-msgid "Number of rows per page"
-msgstr "Záznamů na stránku"
-
-#: templates/table/options.phtml:56
-msgid "Display order:"
-msgstr "Seřadit podle:"
-
-#: templates/table/options_zoom.phtml:6
-msgid "Use this column to label each point"
-msgstr "Použít tento sloupec pro přiřazení názvu každému bodu"
-
-#: templates/table/options_zoom.phtml:35
-msgid "Maximum rows to plot"
-msgstr "Nejvyšší počet vykreslených řádků"
-
-#: templates/table/replace_preview.phtml:13
-msgid "Find and replace - preview"
-msgstr "Náhled nahrazování"
-
-#: templates/table/replace_preview.phtml:18
-msgid "Original string"
-msgstr "Původní řetězec"
-
-#: templates/table/replace_preview.phtml:19
-msgid "Replaced string"
-msgstr "Nahrazený řetězec"
-
-#: templates/table/replace_preview.phtml:40
-msgid "Replace"
-msgstr "Nahradit"
-
-#: templates/table/rows_zoom.phtml:16
-msgid "Additional search criteria"
-msgstr "Další parametr vyhledávání"
-
-#: templates/table/search_and_replace.phtml:3
-msgid "Replace with:"
-msgstr "Nahradit hodnotou:"
-
-#: templates/table/search_and_replace.phtml:22
-msgid "Use regular expression"
-msgstr "Použít regulární výraz"
-
-#: templates/table/selection_form.phtml:12
-msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
-msgstr ""
-"Provést „dotaz podle příkladu“ (zástupný znak: „%“) pro dva různé sloupce"
-
-#: templates/table/selection_form.phtml:34
-msgid "Do a \"query by example\" (wildcard: \"%\")"
-msgstr "Provést „dotaz podle příkladu“ (zástupný znak: „%“)"
-
-#: templates/table/zoom_result_form.phtml:7
-msgid "Browse/Edit the points"
-msgstr "Projít/Upravit body"
-
-#: templates/table/zoom_result_form.phtml:15
-msgid "How to use"
-msgstr "Návod k použití"
-
-#: templates/table/zoom_result_form.phtml:23
-msgid "Reset zoom"
-msgstr "Obnovit zvětšení"
-
-#: templates/tbl_chart.phtml:17
+#: templates/table/chart/tbl_chart.phtml:17
 msgctxt "Chart type"
 msgid "Bar"
 msgstr "Pruhový"
 
-#: templates/tbl_chart.phtml:21
+#: templates/table/chart/tbl_chart.phtml:21
 msgctxt "Chart type"
 msgid "Column"
 msgstr "Sloupcový"
 
-#: templates/tbl_chart.phtml:25
+#: templates/table/chart/tbl_chart.phtml:25
 msgctxt "Chart type"
 msgid "Line"
 msgstr "Čárový"
 
-#: templates/tbl_chart.phtml:29
+#: templates/table/chart/tbl_chart.phtml:29
 msgctxt "Chart type"
 msgid "Spline"
 msgstr "Křivkový"
 
-#: templates/tbl_chart.phtml:33
+#: templates/table/chart/tbl_chart.phtml:33
 msgctxt "Chart type"
 msgid "Area"
 msgstr "Plošný"
 
-#: templates/tbl_chart.phtml:37
+#: templates/table/chart/tbl_chart.phtml:37
 msgctxt "Chart type"
 msgid "Pie"
 msgstr "Koláčový"
 
-#: templates/tbl_chart.phtml:41
+#: templates/table/chart/tbl_chart.phtml:41
 msgctxt "Chart type"
 msgid "Timeline"
 msgstr "Časový"
 
-#: templates/tbl_chart.phtml:45
+#: templates/table/chart/tbl_chart.phtml:45
 msgctxt "Chart type"
 msgid "Scatter"
 msgstr "Bodový"
 
-#: templates/tbl_chart.phtml:50
+#: templates/table/chart/tbl_chart.phtml:50
 msgid "Stacked"
 msgstr "Složený"
 
-#: templates/tbl_chart.phtml:53
+#: templates/table/chart/tbl_chart.phtml:53
 msgid "Chart title"
 msgstr "Název grafu"
 
-#: templates/tbl_chart.phtml:57
+#: templates/table/chart/tbl_chart.phtml:57
 msgid "X-Axis:"
 msgstr "Osa X:"
 
-#: templates/tbl_chart.phtml:72
+#: templates/table/chart/tbl_chart.phtml:72
 msgid "Series:"
 msgstr "Série:"
 
-#: templates/tbl_chart.phtml:102
+#: templates/table/chart/tbl_chart.phtml:102
 msgid "X-Axis label:"
 msgstr "Popis osy X:"
 
-#: templates/tbl_chart.phtml:104
+#: templates/table/chart/tbl_chart.phtml:104
 msgid "X Values"
 msgstr "Hodnoty X"
 
-#: templates/tbl_chart.phtml:107
+#: templates/table/chart/tbl_chart.phtml:107
 msgid "Y-Axis label:"
 msgstr "Popis osy Y:"
 
-#: templates/tbl_chart.phtml:115
+#: templates/table/chart/tbl_chart.phtml:115
 msgid "Series names are in a column"
 msgstr ""
 
-#: templates/tbl_chart.phtml:118
+#: templates/table/chart/tbl_chart.phtml:118
 #, fuzzy
 #| msgid "Inside column:"
 msgid "Series column:"
 msgstr "Uvnitř pole:"
 
-#: templates/tbl_chart.phtml:130
+#: templates/table/chart/tbl_chart.phtml:130
 #, fuzzy
 #| msgid "Values for column %s"
 msgid "Value Column:"
 msgstr "Hodnoty pro sloupec %s"
 
-#: templates/tbl_chart.phtml:150
+#: templates/table/chart/tbl_chart.phtml:150
 msgid "Save chart as image"
 msgstr "Uložit graf jako obrázek"
 
-#: templates/tbl_relation/common_form.phtml:7
+#: templates/table/gis_visualization/gis_visualization.phtml:3
+msgid "Display GIS Visualization"
+msgstr "Zobrazit GIS data"
+
+#: templates/table/gis_visualization/gis_visualization.phtml:8
+msgid "Label column"
+msgstr "Název sloupce"
+
+#: templates/table/gis_visualization/gis_visualization.phtml:11
+msgid "-- None --"
+msgstr "-- Žádný --"
+
+#: templates/table/gis_visualization/gis_visualization.phtml:19
+msgid "Spatial column"
+msgstr "Prostorový sloupec"
+
+#: templates/table/index_form.phtml:16
+msgid "Index name:"
+msgstr "Jméno klíče:"
+
+#: templates/table/index_form.phtml:19
+msgid ""
+"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
+msgstr "„PRIMARY“ <b>musí</b> být jméno <b>pouze</b> primárního klíče!"
+
+#: templates/table/index_form.phtml:40
+msgid "Index choice:"
+msgstr "Výběr indexu:"
+
+#: templates/table/index_form.phtml:57
+msgid "Key block size:"
+msgstr ""
+
+#: templates/table/index_form.phtml:74
+msgid "Index type:"
+msgstr "Typ klíče:"
+
+#: templates/table/index_form.phtml:86
+msgid "Parser:"
+msgstr "Syntaktický analyzátor:"
+
+#: templates/table/index_form.phtml:102
+msgid "Comment:"
+msgstr "Komentář:"
+
+#: templates/table/index_form.phtml:149 templates/table/index_form.phtml:190
+msgid "Drag to reorder"
+msgstr "Uspořádejte přetažením"
+
+#: templates/table/relation/common_form.phtml:7
 msgid "Internal relations"
 msgstr "interních relací"
 
-#: templates/tbl_relation/common_form.phtml:11
+#: templates/table/relation/common_form.phtml:11
 msgid "Internal relation"
 msgstr "Interní relace"
 
-#: templates/tbl_relation/common_form.phtml:14
+#: templates/table/relation/common_form.phtml:14
 msgid ""
 "An internal relation is not necessary when a corresponding FOREIGN KEY "
 "relation exists."
 msgstr ""
 "Interní relace není potřebná pokud existuje stejná relace pomocí FOREIGN KEY."
 
-#: templates/tbl_relation/common_form.phtml:37
+#: templates/table/relation/common_form.phtml:37
 #, fuzzy
 #| msgid "Foreign key constraint"
 msgid "Foreign key constraints"
 msgstr "Omezení cizího klíče"
 
-#: templates/tbl_relation/common_form.phtml:40
+#: templates/table/relation/common_form.phtml:40
 msgid "Actions"
 msgstr "Akce"
 
-#: templates/tbl_relation/common_form.phtml:41
+#: templates/table/relation/common_form.phtml:41
 msgid "Constraint properties"
 msgstr "Vlastnosti omezení"
 
-#: templates/tbl_relation/common_form.phtml:44
+#: templates/table/relation/common_form.phtml:44
 msgid ""
 "Only columns with index will be displayed. You can define an index below."
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:49
+#: templates/table/relation/common_form.phtml:49
 msgid "Foreign key constraint"
 msgstr "Omezení cizího klíče"
 
-#: templates/tbl_relation/common_form.phtml:81
+#: templates/table/relation/common_form.phtml:81
 msgid "+ Add constraint"
 msgstr "+ Přidat omezení"
 
-#: templates/tbl_relation/common_form.phtml:91
+#: templates/table/relation/common_form.phtml:91
 msgid "Choose column to display:"
 msgstr "Zvolte která pole zobrazit:"
 
-#: templates/tbl_relation/foreign_key_row.phtml:13
+#: templates/table/relation/foreign_key_row.phtml:13
 #, php-format
 msgid "Foreign key constraint %s has been dropped"
 msgstr "Omezení cizího klíče %s bylo odstraněno"
 
-#: templates/tbl_relation/foreign_key_row.phtml:102
+#: templates/table/relation/foreign_key_row.phtml:102
 msgid "Constraint name"
 msgstr "Jméno omezení"
 
-#: templates/tbl_relation/foreign_key_row.phtml:157
+#: templates/table/relation/foreign_key_row.phtml:157
 msgid "+ Add column"
 msgstr "+ Přidat sloupec"
 
+#: templates/table/search/options.phtml:8
+msgid "Select columns (at least one):"
+msgstr "Zvolte pole (alespoň jedno):"
+
+#: templates/table/search/options.phtml:37
+msgid "Add search conditions (body of the \"where\" clause):"
+msgstr "Přidat vyhledávací parametry (část dotazu po příkazu „WHERE“):"
+
+#: templates/table/search/options.phtml:45
+msgid "Number of rows per page"
+msgstr "Záznamů na stránku"
+
+#: templates/table/search/options.phtml:56
+msgid "Display order:"
+msgstr "Seřadit podle:"
+
+#: templates/table/search/options_zoom.phtml:6
+msgid "Use this column to label each point"
+msgstr "Použít tento sloupec pro přiřazení názvu každému bodu"
+
+#: templates/table/search/options_zoom.phtml:35
+msgid "Maximum rows to plot"
+msgstr "Nejvyšší počet vykreslených řádků"
+
+#: templates/table/search/replace_preview.phtml:13
+msgid "Find and replace - preview"
+msgstr "Náhled nahrazování"
+
+#: templates/table/search/replace_preview.phtml:18
+msgid "Original string"
+msgstr "Původní řetězec"
+
+#: templates/table/search/replace_preview.phtml:19
+msgid "Replaced string"
+msgstr "Nahrazený řetězec"
+
+#: templates/table/search/replace_preview.phtml:40
+msgid "Replace"
+msgstr "Nahradit"
+
+#: templates/table/search/rows_zoom.phtml:16
+msgid "Additional search criteria"
+msgstr "Další parametr vyhledávání"
+
+#: templates/table/search/search_and_replace.phtml:3
+msgid "Replace with:"
+msgstr "Nahradit hodnotou:"
+
+#: templates/table/search/search_and_replace.phtml:22
+msgid "Use regular expression"
+msgstr "Použít regulární výraz"
+
+#: templates/table/search/selection_form.phtml:12
+msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
+msgstr ""
+"Provést „dotaz podle příkladu“ (zástupný znak: „%“) pro dva různé sloupce"
+
+#: templates/table/search/selection_form.phtml:34
+msgid "Do a \"query by example\" (wildcard: \"%\")"
+msgstr "Provést „dotaz podle příkladu“ (zástupný znak: „%“)"
+
+#: templates/table/search/zoom_result_form.phtml:7
+msgid "Browse/Edit the points"
+msgstr "Projít/Upravit body"
+
+#: templates/table/search/zoom_result_form.phtml:15
+msgid "How to use"
+msgstr "Návod k použití"
+
+#: templates/table/search/zoom_result_form.phtml:23
+msgid "Reset zoom"
+msgstr "Obnovit zvětšení"
+
+#: templates/table/secondary_tabs.phtml:14
+msgid "Relation view"
+msgstr "Zobrazení relací"
+
+#: templates/table/structure/actions_in_table_structure.phtml:14
+#, php-format
+msgid "A primary key has been added on %s."
+msgstr "Na poli %s byl vytvořen primární klíč."
+
+#: templates/table/structure/actions_in_table_structure.phtml:34
+#: templates/table/structure/actions_in_table_structure.phtml:54
+#: templates/table/structure/actions_in_table_structure.phtml:79
+#: templates/table/structure/actions_in_table_structure.phtml:101
+#, php-format
+msgid "An index has been added on %s."
+msgstr "Na poli %s byl vytvořen klíč."
+
+#: templates/table/structure/actions_in_table_structure.phtml:130
+#: templates/table/structure/check_all_table_column.phtml:59
+#, fuzzy
+#| msgid "Remove column(s)"
+msgid "Remove from central columns"
+msgstr "Odstranit pole"
+
+#: templates/table/structure/actions_in_table_structure.phtml:138
+#: templates/table/structure/check_all_table_column.phtml:55
+#, fuzzy
+#| msgid "CHAR textarea columns"
+msgid "Add to central columns"
+msgstr "Sloupce pro textové oblasti typu CHAR"
+
+#: templates/table/structure/add_column.phtml:7
+#, php-format
+msgid "Add %s column(s)"
+msgstr "Přidat %s polí"
+
+#: templates/table/structure/add_column.phtml:12
+msgid "at beginning of table"
+msgstr "na začátku tabulky"
+
+#: templates/table/structure/display_structure.phtml:140 view_create.php:181
+msgid "Edit view"
+msgstr "Upravit pohled"
+
+#: templates/table/structure/display_table_stats.phtml:9
+msgid "Space usage"
+msgstr "Využití místa"
+
+#: templates/table/structure/display_table_stats.phtml:32
+msgid "Effective"
+msgstr "Efektivní"
+
+#: templates/table/structure/move_columns_dialog.phtml:1
+#: templates/table/structure/optional_action_links.phtml:21
+msgid "Move columns"
+msgstr "Přesunout pole"
+
+#: templates/table/structure/move_columns_dialog.phtml:2
+msgid "Move the columns by dragging them up and down."
+msgstr "Přesuňte sloupce tažením nahoru nebo dolů."
+
+#: templates/table/structure/optional_action_links.phtml:9
+msgid "Propose table structure"
+msgstr "Navrhnout strukturu tabulky"
+
+#: templates/table/structure/optional_action_links.phtml:24
+msgid "Improve table structure"
+msgstr "Vylepšit strukturu tabulky"
+
+#: templates/table/structure/optional_action_links.phtml:30
+msgid "Track view"
+msgstr "Sledovat pohled"
+
+#: templates/table/structure/row_stats_table.phtml:3
+msgid "Row statistics"
+msgstr "Statistika řádků"
+
+#: templates/table/structure/row_stats_table.phtml:9
+msgid "static"
+msgstr "statický"
+
+#: templates/table/structure/row_stats_table.phtml:11
+msgid "dynamic"
+msgstr "dynamický"
+
+#: templates/table/structure/row_stats_table.phtml:22
+msgid "partitioned"
+msgstr "používá oddíly"
+
+#: templates/table/structure/row_stats_table.phtml:54
+msgid "Row length"
+msgstr "Délka řádku"
+
+#: templates/table/structure/row_stats_table.phtml:66
+msgid "Row size"
+msgstr "Velikost řádku"
+
+#: templates/table/structure/row_stats_table.phtml:73
+msgid "Next autoindex"
+msgstr "Další automatický klíč"
+
+#: templates/table/structure/table_structure_row.phtml:46
+#, php-format
+msgid "Column %s has been dropped."
+msgstr "Pole %s bylo odstraněno."
+
 #: themes.php:17 themes.php:22
 msgid "Theme"
 msgstr "Vzhled"
@@ -16760,6 +16783,11 @@ msgstr ""
 msgid "concurrent_insert is set to 0"
 msgstr "concurrent_insert je nastaveno na 0"
 
+#, fuzzy
+#~| msgid "Read misses"
+#~ msgid "Read as multibytes"
+#~ msgstr "Výpadků při čtení"
+
 #~ msgid "Relational display column"
 #~ msgstr "Pole pro zobrazení v relacích"
 
diff --git a/po/cy.po b/po/cy.po
index 4c27aaf6da..61d77e4371 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 4.5.0-dev\n"
 "Report-Msgid-Bugs-To: developers@phpmyadmin.net\n"
-"POT-Creation-Date: 2015-08-08 13:53-0400\n"
+"POT-Creation-Date: 2015-08-12 08:10-0400\n"
 "PO-Revision-Date: 2014-11-14 19:10+0200\n"
 "Last-Translator: Michal Čihař <michal@cihar.com>\n"
 "Language-Team: Welsh <https://hosted.weblate.org/projects/phpmyadmin/master/"
@@ -62,7 +62,7 @@ msgid "Table comments:"
 msgstr "Sylwadau tabl"
 
 #: db_datadict.php:104 libraries/Index.class.php:699
-#: libraries/insert_edit.lib.php:1567
+#: libraries/insert_edit.lib.php:1565
 #: libraries/navigation/Nodes/Node_Column.class.php:30
 #: libraries/plugins/export/ExportHtmlword.class.php:280
 #: libraries/plugins/export/ExportHtmlword.class.php:375
@@ -76,13 +76,14 @@ msgstr "Sylwadau tabl"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1023
 #: libraries/tracking.lib.php:879 libraries/tracking.lib.php:975
 #: templates/columns_definitions/column_name.phtml:18
-#: templates/index_form.phtml:124 templates/table/table_header.phtml:6
-#: templates/table/zoom_result_form.phtml:33
-#: templates/tbl_relation/common_form.phtml:10
-#: templates/tbl_relation/common_form.phtml:43
-#: templates/tbl_relation/foreign_key_row.phtml:194
-#: templates/tbl_relation/foreign_key_row.phtml:206
-#: templates/tbl_relation/internal_relational_row.phtml:71
+#: templates/table/index_form.phtml:124
+#: templates/table/relation/common_form.phtml:10
+#: templates/table/relation/common_form.phtml:43
+#: templates/table/relation/foreign_key_row.phtml:194
+#: templates/table/relation/foreign_key_row.phtml:206
+#: templates/table/relation/internal_relational_row.phtml:71
+#: templates/table/search/table_header.phtml:6
+#: templates/table/search/zoom_result_form.phtml:33
 msgid "Column"
 msgstr "Colofn"
 
@@ -100,21 +101,21 @@ msgstr "Colofn"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1001
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1024
 #: libraries/rte/rte_list.lib.php:75 libraries/rte/rte_list.lib.php:103
-#: libraries/rte/rte_routines.lib.php:802
-#: libraries/rte/rte_routines.lib.php:831
-#: libraries/rte/rte_routines.lib.php:1493
+#: libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_routines.lib.php:922
+#: libraries/rte/rte_routines.lib.php:1584
 #: libraries/server_privileges.lib.php:2369 libraries/tracking.lib.php:880
 #: libraries/tracking.lib.php:972
 #: templates/columns_definitions/table_fields_definitions.phtml:11
-#: templates/structure/table_header.phtml:48
-#: templates/structure/table_structure_header.phtml:6
-#: templates/table/table_header.phtml:7
+#: templates/database/structure/table_header.phtml:48
+#: templates/table/search/table_header.phtml:7
+#: templates/table/structure/table_structure_header.phtml:6
 msgid "Type"
 msgstr "Math"
 
 #: db_datadict.php:106 libraries/Index.class.php:702
 #: libraries/central_columns.lib.php:708
-#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1576
+#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1574
 #: libraries/plugins/export/ExportHtmlword.class.php:286
 #: libraries/plugins/export/ExportHtmlword.class.php:381
 #: libraries/plugins/export/ExportLatex.class.php:509
@@ -127,8 +128,8 @@ msgstr "Math"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1026
 #: libraries/tracking.lib.php:882 libraries/tracking.lib.php:978
 #: templates/columns_definitions/table_fields_definitions.phtml:39
-#: templates/structure/table_structure_header.phtml:9
-#: templates/table/zoom_result_form.phtml:34
+#: templates/table/search/zoom_result_form.phtml:34
+#: templates/table/structure/table_structure_header.phtml:9
 msgid "Null"
 msgstr "Null"
 
@@ -146,8 +147,8 @@ msgstr "Null"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1027
 #: libraries/replication_gui.lib.php:153 libraries/tracking.lib.php:883
 #: templates/columns_definitions/table_fields_definitions.phtml:25
-#: templates/structure/body_for_table_summary.phtml:55
-#: templates/structure/table_structure_header.phtml:10
+#: templates/database/structure/body_for_table_summary.phtml:55
+#: templates/table/structure/table_structure_header.phtml:10
 msgid "Default"
 msgstr "Diofyn"
 
@@ -175,19 +176,19 @@ msgid "Comments"
 msgstr "Sylwadau"
 
 #: db_datadict.php:146
-#: libraries/controllers/StructureController.class.php:1960
-#: libraries/controllers/StructureController.class.php:1965
+#: libraries/controllers/TableStructureController.class.php:951
+#: libraries/controllers/TableStructureController.class.php:956
 #: libraries/tracking.lib.php:922
 #: templates/columns_definitions/column_indexes.phtml:6
-#: templates/structure/check_all_table_column.phtml:22
-#: templates/structure/display_structure.phtml:74
+#: templates/table/structure/check_all_table_column.phtml:22
+#: templates/table/structure/display_structure.phtml:74
 msgid "Primary"
 msgstr "Cynradd"
 
 #: db_datadict.php:156 js/messages.php:317 libraries/Index.class.php:567
 #: libraries/Index.class.php:606 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261 libraries/mult_submits.lib.php:403
+#: libraries/config/FormDisplay.tpl.php:272 libraries/mult_submits.lib.php:403
 #: libraries/mult_submits.lib.php:417
 #: libraries/plugins/export/ExportHtmlword.class.php:630
 #: libraries/plugins/export/ExportLatex.class.php:589
@@ -203,20 +204,20 @@ msgstr "Cynradd"
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1010 libraries/tracking.lib.php:1015
 #: prefs_manage.php:140 templates/prefs_autoload.phtml:15
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "No"
 msgstr "Na"
 
 #: db_datadict.php:156 js/messages.php:443 libraries/Index.class.php:568
 #: libraries/Index.class.php:605 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261
-#: libraries/controllers/StructureController.class.php:1344
-#: libraries/controllers/StructureController.class.php:2223
-#: libraries/controllers/StructureController.class.php:2232
-#: libraries/controllers/StructureController.class.php:2237
-#: libraries/controllers/StructureController.class.php:2242
-#: libraries/controllers/StructureController.class.php:2247
+#: libraries/config/FormDisplay.tpl.php:272
+#: libraries/controllers/TableStructureController.class.php:539
+#: libraries/controllers/TableStructureController.class.php:1201
+#: libraries/controllers/TableStructureController.class.php:1210
+#: libraries/controllers/TableStructureController.class.php:1215
+#: libraries/controllers/TableStructureController.class.php:1220
+#: libraries/controllers/TableStructureController.class.php:1225
 #: libraries/mult_submits.inc.php:82 libraries/mult_submits.inc.php:178
 #: libraries/mult_submits.lib.php:339 libraries/mult_submits.lib.php:372
 #: libraries/mult_submits.lib.php:401 libraries/mult_submits.lib.php:415
@@ -225,8 +226,8 @@ msgstr "Na"
 #: libraries/plugins/export/ExportOdt.class.php:756
 #: libraries/plugins/export/ExportTexytext.class.php:567
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1077
-#: libraries/server_databases.lib.php:464
-#: libraries/server_databases.lib.php:474
+#: libraries/server_databases.lib.php:475
+#: libraries/server_databases.lib.php:485
 #: libraries/server_privileges.lib.php:2546
 #: libraries/server_privileges.lib.php:2727
 #: libraries/server_privileges.lib.php:2748
@@ -236,7 +237,7 @@ msgstr "Na"
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1008 libraries/tracking.lib.php:1013
 #: prefs_manage.php:138 templates/prefs_autoload.phtml:14
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "Yes"
 msgstr "Ie"
 
@@ -246,7 +247,7 @@ msgstr "Dangos dadlwythiad (sgema) y gronfa ddata"
 
 #: db_export.php:37 db_tracking.php:90 export.php:382
 #: libraries/DBQbe.class.php:326
-#: libraries/controllers/StructureController.class.php:231
+#: libraries/controllers/DatabaseStructureController.class.php:170
 #: libraries/navigation/NavigationTree.class.php:897
 msgid "No tables found in database."
 msgstr "Dim tablau wedi'u darganfod yn y gronfa ddata."
@@ -257,14 +258,14 @@ msgstr "Dim tablau wedi'u darganfod yn y gronfa ddata."
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:26
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:120
-#: templates/structure/show_create.phtml:18
+#: templates/database/structure/show_create.phtml:18
 msgid "Tables"
 msgstr "Tablau"
 
 #: db_export.php:52 libraries/Menu.class.php:317 libraries/Menu.class.php:425
-#: libraries/Util.class.php:3333 libraries/Util.class.php:3343
-#: libraries/Util.class.php:3349 libraries/Util.class.php:3629
-#: libraries/Util.class.php:4327 libraries/Util.class.php:4344
+#: libraries/Util.class.php:3339 libraries/Util.class.php:3349
+#: libraries/Util.class.php:3355 libraries/Util.class.php:3635
+#: libraries/Util.class.php:4333 libraries/Util.class.php:4350
 #: libraries/central_columns.lib.php:728 libraries/config.values.php:39
 #: libraries/config.values.php:47 libraries/config.values.php:109
 #: libraries/config.values.php:115 libraries/config/setup.forms.php:323
@@ -278,7 +279,7 @@ msgstr "Tablau"
 #: libraries/navigation/Nodes/Node_Table.class.php:283
 #: libraries/server_privileges.lib.php:1141 libraries/tracking.lib.php:874
 #: templates/columns_definitions/table_fields_definitions.phtml:3
-#: templates/designer/table_list.phtml:28
+#: templates/database/designer/table_list.phtml:28
 msgid "Structure"
 msgstr "Strwythur"
 
@@ -290,7 +291,7 @@ msgstr "Strwythur"
 #: libraries/config/user_preferences.forms.php:292
 #: libraries/config/user_preferences.forms.php:297
 #: libraries/server_privileges.lib.php:1140
-#: templates/structure/display_table_stats.phtml:12
+#: templates/table/structure/display_table_stats.phtml:12
 msgid "Data"
 msgstr "Data"
 
@@ -375,10 +376,10 @@ msgstr "Tablau a draciwyd"
 #: libraries/server_privileges.lib.php:2908
 #: libraries/server_privileges.lib.php:3145
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4346
-#: templates/structure/table_header.phtml:21
-#: templates/tbl_relation/foreign_key_row.phtml:176
-#: templates/tbl_relation/internal_relational_row.phtml:63
+#: libraries/server_privileges.lib.php:4372
+#: templates/database/structure/table_header.phtml:21
+#: templates/table/relation/foreign_key_row.phtml:176
+#: templates/table/relation/internal_relational_row.phtml:63
 msgid "Table"
 msgstr "Tabl"
 
@@ -395,7 +396,7 @@ msgid "Updated"
 msgstr "Diweddarwyd"
 
 #: db_tracking.php:130 js/messages.php:243 libraries/Menu.class.php:552
-#: libraries/Util.class.php:4314 libraries/config.values.php:104
+#: libraries/Util.class.php:4320 libraries/config.values.php:104
 #: libraries/rte/rte_events.lib.php:393 libraries/rte/rte_list.lib.php:101
 #: libraries/server_status_processes.lib.php:92 libraries/tracking.lib.php:279
 msgid "Status"
@@ -404,14 +405,15 @@ msgstr "Statws"
 #: db_tracking.php:131 db_tracking.php:290 libraries/Index.class.php:693
 #: libraries/central_columns.lib.php:687 libraries/rte/rte_list.lib.php:74
 #: libraries/rte/rte_list.lib.php:89 libraries/rte/rte_list.lib.php:102
-#: libraries/server_databases.lib.php:398
+#: libraries/server_databases.lib.php:409
 #: libraries/server_privileges.lib.php:2372
 #: libraries/server_privileges.lib.php:3166
 #: libraries/server_privileges.lib.php:3342
 #: libraries/server_user_groups.lib.php:82
 #: libraries/server_variables.lib.php:189 libraries/tracking.lib.php:280
-#: libraries/tracking.lib.php:793 templates/structure/table_header.phtml:30
-#: templates/structure/table_structure_header.phtml:23
+#: libraries/tracking.lib.php:793
+#: templates/database/structure/table_header.phtml:30
+#: templates/table/structure/table_structure_header.phtml:23
 msgid "Action"
 msgstr "Gweithred"
 
@@ -455,7 +457,7 @@ msgid "Untracked tables"
 msgstr "Tablau heb dracio"
 
 #: db_tracking.php:305 db_tracking.php:336
-#: templates/structure/optional_action_links.phtml:17
+#: templates/table/structure/optional_action_links.phtml:17
 msgid "Track table"
 msgstr "Tracio tabl"
 
@@ -511,7 +513,7 @@ msgid "Value for the column \"%s\""
 msgstr ""
 
 #: gis_data_editor.php:146
-#: templates/gis_visualization/gis_visualization.phtml:37
+#: templates/table/gis_visualization/gis_visualization.phtml:37
 msgid "Use OpenStreetMaps as Base Layer"
 msgstr ""
 
@@ -600,35 +602,35 @@ msgstr "Ychwanegwch weinydd newydd"
 #: libraries/display_change_password.lib.php:162
 #: libraries/display_export.lib.php:402 libraries/display_export.lib.php:408
 #: libraries/display_import.lib.php:392 libraries/index.lib.php:44
-#: libraries/insert_edit.lib.php:1546 libraries/insert_edit.lib.php:1583
+#: libraries/insert_edit.lib.php:1544 libraries/insert_edit.lib.php:1581
 #: libraries/normalization.lib.php:165 libraries/normalization.lib.php:821
 #: libraries/operations.lib.php:38 libraries/operations.lib.php:108
 #: libraries/operations.lib.php:263 libraries/operations.lib.php:306
 #: libraries/operations.lib.php:801 libraries/operations.lib.php:874
 #: libraries/operations.lib.php:923 libraries/operations.lib.php:1337
 #: libraries/operations.lib.php:1658
-#: libraries/plugins/auth/AuthenticationCookie.class.php:244
+#: libraries/plugins/auth/AuthenticationCookie.class.php:232
 #: libraries/replication_gui.lib.php:122 libraries/replication_gui.lib.php:161
 #: libraries/replication_gui.lib.php:324 libraries/replication_gui.lib.php:461
 #: libraries/replication_gui.lib.php:906 libraries/rte/rte_events.lib.php:509
-#: libraries/rte/rte_routines.lib.php:969
-#: libraries/rte/rte_routines.lib.php:1581
+#: libraries/rte/rte_routines.lib.php:1060
+#: libraries/rte/rte_routines.lib.php:1672
 #: libraries/rte/rte_triggers.lib.php:396 libraries/server_bin_log.lib.php:61
 #: libraries/server_privileges.lib.php:705
 #: libraries/server_privileges.lib.php:2106
 #: libraries/server_privileges.lib.php:2872
 #: libraries/server_privileges.lib.php:3553
-#: libraries/server_privileges.lib.php:4627
+#: libraries/server_privileges.lib.php:4653
 #: libraries/server_user_groups.lib.php:285
 #: libraries/sql_query_form.lib.php:369 libraries/sql_query_form.lib.php:429
 #: libraries/tracking.lib.php:533 libraries/tracking.lib.php:653
 #: prefs_manage.php:277 prefs_manage.php:355
 #: templates/columns_definitions/column_definitions_form.phtml:59
-#: templates/header_location.phtml:17 templates/index_form.phtml:238
+#: templates/database/create_table.phtml:21 templates/header_location.phtml:28
 #: templates/startAndNumberOfRowsPanel.phtml:14
-#: templates/structure/add_column.phtml:25
-#: templates/table/create_table.phtml:21
-#: templates/table/selection_form.phtml:75 view_create.php:275
+#: templates/table/index_form.phtml:238
+#: templates/table/search/selection_form.phtml:75
+#: templates/table/structure/add_column.phtml:25 view_create.php:275
 #: view_operations.php:106
 msgid "Go"
 msgstr "Ewch"
@@ -720,7 +722,7 @@ msgstr ""
 msgid "Could not load import plugins, please check your installation!"
 msgstr "Nid oedd modd llwytho ategynnau mewnforio, gwiriwch eich arsefydliad!"
 
-#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1466
+#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1460
 #, fuzzy, php-format
 #| msgid "Bookmark %s created"
 msgid "Bookmark %s has been created."
@@ -756,13 +758,13 @@ msgstr ""
 msgid "Back"
 msgstr "Nôl"
 
-#: index.php:148 libraries/Footer.class.php:70
+#: index.php:149 libraries/Footer.class.php:70
 #, fuzzy
 #| msgid "phpMyAdmin homepage"
 msgid "phpMyAdmin Demo Server"
 msgstr "hafan phpMyAdmin"
 
-#: index.php:152
+#: index.php:153
 #, php-format
 msgid ""
 "You are using the demo server. You can do anything here, but please do not "
@@ -770,50 +772,50 @@ msgid ""
 "at %s."
 msgstr ""
 
-#: index.php:162
+#: index.php:163
 #, fuzzy
 #| msgid "General relation features"
 msgid "General Settings"
 msgstr "Nodweddion perthynas cyffredinol"
 
-#: index.php:190 libraries/display_change_password.lib.php:50
+#: index.php:191 libraries/display_change_password.lib.php:50
 #: libraries/display_change_password.lib.php:53 user_password.php:247
 msgid "Change password"
 msgstr "Newid cyfrinair"
 
-#: index.php:206
+#: index.php:207
 #, fuzzy
 #| msgid "MySQL connection collation"
 msgid "Server connection collation"
 msgstr "Coladiad cysylltiad MySQL"
 
-#: index.php:228
+#: index.php:229
 msgid "Appearance Settings"
 msgstr ""
 
-#: index.php:258 prefs_manage.php:285
+#: index.php:259 prefs_manage.php:285
 #, fuzzy
 #| msgid "General relation features"
 msgid "More settings"
 msgstr "Nodweddion perthynas cyffredinol"
 
-#: index.php:279
+#: index.php:280
 #, fuzzy
 #| msgid "Databases"
 msgid "Database server"
 msgstr "Cronfeydd Data"
 
-#: index.php:282 libraries/plugins/auth/AuthenticationCookie.class.php:181
+#: index.php:283 libraries/plugins/auth/AuthenticationCookie.class.php:169
 msgid "Server:"
 msgstr "Gweinydd:"
 
-#: index.php:286
+#: index.php:287
 #, fuzzy
 #| msgid "Server"
 msgid "Server type:"
 msgstr "Gweinydd"
 
-#: index.php:290 libraries/plugins/export/ExportLatex.class.php:212
+#: index.php:291 libraries/plugins/export/ExportLatex.class.php:212
 #: libraries/plugins/export/ExportSql.class.php:687
 #: libraries/plugins/export/ExportXml.class.php:189
 #, fuzzy
@@ -821,87 +823,87 @@ msgstr "Gweinydd"
 msgid "Server version:"
 msgstr "Fersiwn y gweinydd"
 
-#: index.php:296
+#: index.php:297
 #, fuzzy
 #| msgid "Protocol version"
 msgid "Protocol version:"
 msgstr "Fersiwn protocol"
 
-#: index.php:300
+#: index.php:301
 #, fuzzy
 #| msgid "User"
 msgid "User:"
 msgstr "Defnyddiwr"
 
-#: index.php:305
+#: index.php:306
 #, fuzzy
 #| msgid "Server socket"
 msgid "Server charset:"
 msgstr "Soced gweinydd"
 
-#: index.php:320
+#: index.php:321
 msgid "Web server"
 msgstr "Gweinydd gwe"
 
-#: index.php:331
+#: index.php:332
 #, fuzzy
 #| msgid "MySQL client version"
 msgid "Database client version:"
 msgstr "Fersiwn cleient MySQL"
 
-#: index.php:335
+#: index.php:336
 #, fuzzy
 #| msgid "PHP extension"
 msgid "PHP extension:"
 msgstr "Estyniad PHP"
 
-#: index.php:349
+#: index.php:350
 #, fuzzy
 #| msgid "PHP Version"
 msgid "PHP version:"
 msgstr "Fersiwn PHP"
 
-#: index.php:360
+#: index.php:361
 msgid "Show PHP information"
 msgstr "Dangos gwybodaeth PHP"
 
-#: index.php:383
+#: index.php:384
 #, fuzzy
 #| msgid "Version information"
 msgid "Version information:"
 msgstr "Gwybodaeth y fersiwn"
 
-#: index.php:392 libraries/Util.class.php:432 libraries/Util.class.php:495
-#: libraries/config/FormDisplay.tpl.php:151
+#: index.php:393 libraries/Util.class.php:432 libraries/Util.class.php:495
+#: libraries/config/FormDisplay.tpl.php:162
 #: libraries/display_export.lib.php:577 libraries/engines/pbxt.lib.php:162
 #: libraries/navigation/NavigationHeader.class.php:196
 #: libraries/server_variables.lib.php:160
 msgid "Documentation"
 msgstr "Dogfennaeth"
 
-#: index.php:399
+#: index.php:400
 msgid "Wiki"
 msgstr "Wici"
 
-#: index.php:408
+#: index.php:409
 msgid "Official Homepage"
 msgstr "Hafan Swyddogol"
 
-#: index.php:415
+#: index.php:416
 msgid "Contribute"
 msgstr ""
 
-#: index.php:422
+#: index.php:423
 msgid "Get support"
 msgstr ""
 
-#: index.php:429
+#: index.php:430
 #, fuzzy
 #| msgid "No change"
 msgid "List of changes"
 msgstr "Dim newid"
 
-#: index.php:451
+#: index.php:452
 msgid ""
 "You are connected as 'root' with no password, which corresponds to the "
 "default MySQL privileged account. Your MySQL server is running with this "
@@ -909,21 +911,21 @@ msgid ""
 "by setting a password for user 'root'."
 msgstr ""
 
-#: index.php:468
+#: index.php:469
 msgid ""
 "You have enabled mbstring.func_overload in your PHP configuration. This "
 "option is incompatible with phpMyAdmin and might cause some data to be "
 "corrupted!"
 msgstr ""
 
-#: index.php:483
+#: index.php:484
 msgid ""
 "The mbstring PHP extension was not found and you seem to be using a "
 "multibyte charset. Without the mbstring extension phpMyAdmin is unable to "
 "split strings correctly and it may result in unexpected results."
 msgstr ""
 
-#: index.php:500
+#: index.php:501
 msgid ""
 "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini."
 "session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower than "
@@ -931,17 +933,17 @@ msgid ""
 "expire sooner than configured in phpMyAdmin."
 msgstr ""
 
-#: index.php:519
+#: index.php:520
 msgid ""
 "Login cookie store is lower than cookie validity configured in phpMyAdmin, "
 "because of this, your login will expire sooner than configured in phpMyAdmin."
 msgstr ""
 
-#: index.php:535
+#: index.php:536
 msgid "The configuration file now needs a secret passphrase (blowfish_secret)."
 msgstr ""
 
-#: index.php:548
+#: index.php:549
 msgid ""
 "Directory [code]config[/code], which is used by the setup script, still "
 "exists in your phpMyAdmin directory. It is strongly recommended to remove it "
@@ -949,7 +951,7 @@ msgid ""
 "may be compromised by unauthorized people downloading your configuration."
 msgstr ""
 
-#: index.php:564
+#: index.php:565
 #, fuzzy, php-format
 #| msgid ""
 #| "ditional features for working with linked tables have been ctivated. To d "
@@ -961,19 +963,19 @@ msgstr ""
 "Mae'r nodweddion ar gyfer gweithio gyda thablau sydd wedi cysylltu wedi'u "
 "hanalluogi. Pwyswch %syma%s i ddarganfod pam."
 
-#: index.php:571
+#: index.php:572
 msgid ""
 "Or alternately go to 'Operations' tab of any database to set it up there."
 msgstr ""
 
-#: index.php:620
+#: index.php:621
 #, php-format
 msgid ""
 "Your PHP MySQL library version %s differs from your MySQL server version %s. "
 "This may cause unpredictable behavior."
 msgstr ""
 
-#: index.php:648
+#: index.php:649
 #, php-format
 msgid ""
 "Server running with Suhosin. Please refer to %sdocumentation%s for possible "
@@ -1145,8 +1147,8 @@ msgstr ""
 msgid "Save & Close"
 msgstr "Cadw fel ffeil"
 
-#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:404
-#: libraries/insert_edit.lib.php:1550 prefs_manage.php:361
+#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:415
+#: libraries/insert_edit.lib.php:1548 prefs_manage.php:361
 #: prefs_manage.php:372
 msgid "Reset"
 msgstr "Ailosod"
@@ -1191,7 +1193,7 @@ msgstr "Indecs"
 msgid "Edit Index"
 msgstr "Golygu'r rhes nesaf"
 
-#: js/messages.php:99 templates/index_form.phtml:232
+#: js/messages.php:99 templates/table/index_form.phtml:232
 #, fuzzy, php-format
 #| msgid "Add %s column(s)"
 msgid "Add %s column(s) to index"
@@ -1221,13 +1223,14 @@ msgstr "Amgaewyd colofnau gan"
 msgid "Please select column(s) for the index."
 msgstr "Ychwanegwch %s colofn"
 
-#: js/messages.php:106 templates/structure/add_column.phtml:1
+#: js/messages.php:106 templates/table/structure/add_column.phtml:1
 msgid "You have to add at least one column."
 msgstr "Rydych chi wedi ychwanegu o leiaf un golofn."
 
-#: js/messages.php:109 libraries/insert_edit.lib.php:1548
+#: js/messages.php:109 libraries/insert_edit.lib.php:1546
 #: templates/columns_definitions/column_definitions_form.phtml:162
-#: templates/index_form.phtml:237 templates/tbl_relation/common_form.phtml:106
+#: templates/table/index_form.phtml:237
+#: templates/table/relation/common_form.phtml:106
 msgid "Preview SQL"
 msgstr ""
 
@@ -1250,7 +1253,7 @@ msgid "SQL query:"
 msgstr "Ymholiad SQL"
 
 #. l10n: Default label for the y-Axis of Charts
-#: js/messages.php:118 templates/tbl_chart.phtml:109
+#: js/messages.php:118 templates/table/chart/tbl_chart.phtml:109
 #, fuzzy
 #| msgid "Value"
 msgid "Y Values"
@@ -1424,7 +1427,7 @@ msgstr ""
 msgid "Bytes received"
 msgstr ""
 
-#: js/messages.php:169 libraries/server_status.lib.php:226
+#: js/messages.php:169 libraries/server_status.lib.php:235
 msgid "Connections"
 msgstr ""
 
@@ -1485,12 +1488,12 @@ msgstr "%s tabl"
 msgid "Questions"
 msgstr "Fersiynau"
 
-#: js/messages.php:184 libraries/server_status.lib.php:134
+#: js/messages.php:184 libraries/server_status.lib.php:143
 msgid "Traffic"
 msgstr ""
 
 #: js/messages.php:185 libraries/Menu.class.php:586
-#: libraries/Util.class.php:4318 libraries/server_status_monitor.lib.php:257
+#: libraries/Util.class.php:4324 libraries/server_status_monitor.lib.php:257
 #, fuzzy
 #| msgid "General relation features"
 msgid "Settings"
@@ -1514,8 +1517,9 @@ msgstr ""
 #: libraries/server_status_monitor.lib.php:236
 #: libraries/server_status_processes.lib.php:308
 #: templates/columns_definitions/transformation.phtml:4
-#: templates/designer/options_panel.phtml:178
-#: templates/table/options_zoom.phtml:12 templates/table/rows_zoom.phtml:26
+#: templates/database/designer/options_panel.phtml:178
+#: templates/table/search/options_zoom.phtml:12
+#: templates/table/search/rows_zoom.phtml:26
 msgid "None"
 msgstr "Dim"
 
@@ -1826,8 +1830,8 @@ msgstr ""
 
 #: js/messages.php:270 libraries/Menu.class.php:352
 #: libraries/Menu.class.php:455 libraries/Menu.class.php:582
-#: libraries/Util.class.php:4317 libraries/Util.class.php:4332
-#: libraries/Util.class.php:4349 libraries/config/messages.inc.php:258
+#: libraries/Util.class.php:4323 libraries/Util.class.php:4338
+#: libraries/Util.class.php:4355 libraries/config/messages.inc.php:258
 #: libraries/display_import.lib.php:105
 #: libraries/server_status_monitor.lib.php:318 prefs_manage.php:238
 #: setup/frames/menu.inc.php:26
@@ -1897,13 +1901,13 @@ msgid "Formatting SQL..."
 msgstr ""
 
 #: js/messages.php:293 libraries/server_variables.lib.php:157
-#: templates/designer/aggregate_query_panel.phtml:63
-#: templates/designer/delete_relation_panel.phtml:28
-#: templates/designer/having_query_panel.phtml:117
-#: templates/designer/new_relation_panel.phtml:88
-#: templates/designer/options_panel.phtml:253
-#: templates/designer/rename_to_panel.phtml:45
-#: templates/designer/where_query_panel.phtml:83
+#: templates/database/designer/aggregate_query_panel.phtml:63
+#: templates/database/designer/delete_relation_panel.phtml:28
+#: templates/database/designer/having_query_panel.phtml:117
+#: templates/database/designer/new_relation_panel.phtml:88
+#: templates/database/designer/options_panel.phtml:253
+#: templates/database/designer/rename_to_panel.phtml:45
+#: templates/database/designer/where_query_panel.phtml:83
 msgid "Cancel"
 msgstr "Diddymu"
 
@@ -1913,7 +1917,7 @@ msgstr "Diddymu"
 msgid "Page-related settings"
 msgstr "Nodweddion perthynas cyffredinol"
 
-#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:402
+#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:413
 msgid "Apply"
 msgstr ""
 
@@ -1952,8 +1956,8 @@ msgstr ""
 msgid "Error text: %s"
 msgstr ""
 
-#: js/messages.php:307 libraries/db_common.inc.php:68
-#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:450
+#: js/messages.php:307 libraries/db_common.inc.php:69
+#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:461
 msgid "No databases selected."
 msgstr "Dim cronfeydd data wedi'u dewis."
 
@@ -1965,12 +1969,13 @@ msgstr ""
 msgid "Adding Primary Key"
 msgstr ""
 
-#: js/messages.php:310 templates/designer/aggregate_query_panel.phtml:59
-#: templates/designer/having_query_panel.phtml:113
-#: templates/designer/new_relation_panel.phtml:87
-#: templates/designer/options_panel.phtml:252
-#: templates/designer/rename_to_panel.phtml:41
-#: templates/designer/where_query_panel.phtml:82
+#: js/messages.php:310
+#: templates/database/designer/aggregate_query_panel.phtml:59
+#: templates/database/designer/having_query_panel.phtml:113
+#: templates/database/designer/new_relation_panel.phtml:87
+#: templates/database/designer/options_panel.phtml:252
+#: templates/database/designer/rename_to_panel.phtml:41
+#: templates/database/designer/where_query_panel.phtml:82
 msgid "OK"
 msgstr ""
 
@@ -1996,7 +2001,7 @@ msgstr "Copïwch y gronfa ddata i"
 msgid "Changing Charset"
 msgstr "Set nodau"
 
-#: js/messages.php:320 libraries/Util.class.php:3217
+#: js/messages.php:320 libraries/Util.class.php:3223
 #, fuzzy
 #| msgid "Select Foreign Key"
 msgid "Enable foreign key checks"
@@ -2045,20 +2050,21 @@ msgstr ""
 #: js/messages.php:334 libraries/DisplayResults.class.php:4834
 #: libraries/DisplayResults.class.php:5092 libraries/Menu.class.php:344
 #: libraries/Menu.class.php:446 libraries/Menu.class.php:578
-#: libraries/Util.class.php:3636 libraries/Util.class.php:3637
-#: libraries/Util.class.php:4316 libraries/Util.class.php:4331
-#: libraries/Util.class.php:4348 libraries/config/messages.inc.php:252
+#: libraries/Util.class.php:3642 libraries/Util.class.php:3643
+#: libraries/Util.class.php:4322 libraries/Util.class.php:4337
+#: libraries/Util.class.php:4354 libraries/config/messages.inc.php:252
 #: libraries/display_export.lib.php:173 libraries/rte/rte_list.lib.php:146
 #: libraries/server_privileges.lib.php:2211
 #: libraries/server_privileges.lib.php:2290
 #: libraries/server_privileges.lib.php:2632
 #: libraries/server_privileges.lib.php:3356
 #: libraries/server_status_monitor.lib.php:322 prefs_manage.php:303
-#: setup/frames/menu.inc.php:27 templates/structure/check_all_tables.phtml:11
+#: setup/frames/menu.inc.php:27
+#: templates/database/structure/check_all_tables.phtml:11
 msgid "Export"
 msgstr "Allforio"
 
-#: js/messages.php:337 libraries/rte/rte_routines.lib.php:652
+#: js/messages.php:337 libraries/rte/rte_routines.lib.php:743
 msgid "ENUM/SET editor"
 msgstr ""
 
@@ -2103,7 +2109,7 @@ msgstr "Dangos ymholiad mewnosod"
 #: libraries/Console.class.php:214 libraries/DisplayResults.class.php:3474
 #: libraries/DisplayResults.class.php:4818 libraries/Index.class.php:723
 #: libraries/Util.class.php:706 libraries/Util.class.php:1202
-#: libraries/Util.class.php:3634 libraries/Util.class.php:3635
+#: libraries/Util.class.php:3640 libraries/Util.class.php:3641
 #: libraries/central_columns.lib.php:851
 #: libraries/central_columns.lib.php:1193
 #: libraries/config/messages.inc.php:892
@@ -2121,7 +2127,7 @@ msgstr "Golygu"
 #: libraries/server_user_groups.lib.php:129
 #: libraries/sql_query_form.lib.php:416 libraries/tracking.lib.php:477
 #: setup/frames/index.inc.php:183 setup/frames/index.inc.php:291
-#: templates/designer/delete_relation_panel.phtml:27
+#: templates/database/designer/delete_relation_panel.phtml:27
 msgid "Delete"
 msgstr "Dileu"
 
@@ -2301,11 +2307,11 @@ msgid "No dependencies selected!"
 msgstr "Dim cronfeydd data wedi'u dewis."
 
 #: js/messages.php:394 libraries/central_columns.lib.php:1214
-#: libraries/insert_edit.lib.php:1458 libraries/server_variables.lib.php:155
+#: libraries/insert_edit.lib.php:1456 libraries/server_variables.lib.php:155
 #: setup/frames/config.inc.php:42 setup/frames/index.inc.php:279
 #: templates/columns_definitions/column_definitions_form.phtml:165
-#: templates/gis_visualization/gis_visualization.phtml:48
-#: templates/tbl_relation/common_form.phtml:107
+#: templates/table/gis_visualization/gis_visualization.phtml:48
+#: templates/table/relation/common_form.phtml:107
 msgid "Save"
 msgstr "Cadw"
 
@@ -2400,8 +2406,8 @@ msgid "Data point content"
 msgstr "Datganiad diffiniad data"
 
 #: js/messages.php:430 js/messages.php:562 js/messages.php:579
-#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2573
-#: templates/index_form.phtml:154 templates/index_form.phtml:194
+#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2571
+#: templates/table/index_form.phtml:154 templates/table/index_form.phtml:194
 msgid "Ignore"
 msgstr "Anwybyddu"
 
@@ -2462,8 +2468,8 @@ msgstr "Dewis Allwedd Estron"
 msgid "Please select the primary key or a unique key!"
 msgstr ""
 
-#: js/messages.php:457 templates/designer/side_menu.phtml:91
-#: templates/designer/side_menu.phtml:94
+#: js/messages.php:457 templates/database/designer/side_menu.phtml:91
+#: templates/database/designer/side_menu.phtml:94
 msgid "Choose column to display"
 msgstr "Dewis colofn i'w dangos"
 
@@ -2477,22 +2483,22 @@ msgstr ""
 msgid "Page name"
 msgstr "Enw'r dudalen"
 
-#: js/messages.php:463 templates/designer/side_menu.phtml:56
-#: templates/designer/side_menu.phtml:59
+#: js/messages.php:463 templates/database/designer/side_menu.phtml:56
+#: templates/database/designer/side_menu.phtml:59
 #, fuzzy
 #| msgid "Select Tables"
 msgid "Save page"
 msgstr "Dewis Tablau"
 
-#: js/messages.php:464 templates/designer/side_menu.phtml:63
-#: templates/designer/side_menu.phtml:66
+#: js/messages.php:464 templates/database/designer/side_menu.phtml:63
+#: templates/database/designer/side_menu.phtml:66
 #, fuzzy
 #| msgid "Select Tables"
 msgid "Save page as"
 msgstr "Dewis Tablau"
 
-#: js/messages.php:465 templates/designer/side_menu.phtml:49
-#: templates/designer/side_menu.phtml:52
+#: js/messages.php:465 templates/database/designer/side_menu.phtml:49
+#: templates/database/designer/side_menu.phtml:52
 #, fuzzy
 #| msgid "Free pages"
 msgid "Open page"
@@ -2504,7 +2510,7 @@ msgstr "Tudalennau rhydd"
 msgid "Delete page"
 msgstr "Dewis Tablau"
 
-#: js/messages.php:467 templates/designer/side_menu.phtml:10
+#: js/messages.php:467 templates/database/designer/side_menu.phtml:10
 msgid "Untitled"
 msgstr ""
 
@@ -2628,7 +2634,7 @@ msgstr "Safle gwreiddiol"
 msgid "cancel"
 msgstr "Diddymu"
 
-#: js/messages.php:499 libraries/server_status.lib.php:271
+#: js/messages.php:499 libraries/server_status.lib.php:280
 msgid "Aborted"
 msgstr ""
 
@@ -3274,7 +3280,7 @@ msgstr "Nid yn rhif porth ddilys"
 
 #: js/messages.php:793 libraries/Message.class.php:199
 #: libraries/Util.class.php:654 libraries/core.lib.php:245
-#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1172
+#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1170
 #: tbl_operations.php:229 view_operations.php:63
 msgid "Error"
 msgstr "Gwall"
@@ -3334,8 +3340,8 @@ msgstr ""
 msgid "per minute"
 msgstr ""
 
-#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:143
-#: libraries/server_status.lib.php:228
+#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:152
+#: libraries/server_status.lib.php:237
 #: libraries/server_status_queries.lib.php:98
 msgid "per hour"
 msgstr ""
@@ -3353,7 +3359,7 @@ msgstr ""
 msgid "Wrong permissions on configuration file, should not be world writable!"
 msgstr ""
 
-#: libraries/Config.class.php:1799
+#: libraries/Config.class.php:1801
 msgid "Font size"
 msgstr "Maint ffont"
 
@@ -3383,10 +3389,10 @@ msgstr "mewn ymholiad"
 #: libraries/server_privileges.lib.php:2890
 #: libraries/server_privileges.lib.php:3144
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4332
+#: libraries/server_privileges.lib.php:4358
 #: libraries/server_status_processes.lib.php:80
-#: templates/tbl_relation/foreign_key_row.phtml:165
-#: templates/tbl_relation/internal_relational_row.phtml:55
+#: templates/table/relation/foreign_key_row.phtml:165
+#: templates/table/relation/internal_relational_row.phtml:55
 msgid "Database"
 msgstr "Cronfa ddata"
 
@@ -3495,11 +3501,11 @@ msgstr "Sgipio Dilysu SQL"
 #: libraries/plugins/import/ImportMediawiki.class.php:60
 #: libraries/plugins/import/ImportOds.class.php:59
 #: libraries/plugins/import/ImportShp.class.php:57
-#: libraries/plugins/import/ImportSql.class.php:148
+#: libraries/plugins/import/ImportSql.class.php:51
 #: libraries/plugins/import/ImportXml.class.php:58
-#: libraries/rte/rte_routines.lib.php:833 templates/index_form.phtml:49
-#: templates/structure/row_stats_table.phtml:20
-#: templates/table/options.phtml:2
+#: libraries/rte/rte_routines.lib.php:924 templates/table/index_form.phtml:49
+#: templates/table/search/options.phtml:2
+#: templates/table/structure/row_stats_table.phtml:20
 msgid "Options"
 msgstr "Opsiynau"
 
@@ -3542,7 +3548,8 @@ msgstr "Disgynnol"
 msgid "Order:"
 msgstr ""
 
-#: libraries/Console.class.php:289 templates/table/replace_preview.phtml:17
+#: libraries/Console.class.php:289
+#: templates/table/search/replace_preview.phtml:17
 #, fuzzy
 #| msgid "Column"
 msgid "Count"
@@ -3665,9 +3672,9 @@ msgstr "Newidiwch i'r gronfa ddata a gopïwyd"
 #: libraries/operations.lib.php:794 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:191
-#: templates/structure/sortable_header.phtml:21
-#: templates/structure/sortable_header.phtml:38
-#: templates/table/options.phtml:68
+#: templates/database/structure/sortable_header.phtml:21
+#: templates/database/structure/sortable_header.phtml:38
+#: templates/table/search/options.phtml:68
 msgid "Ascending"
 msgstr "Esgynnol"
 
@@ -3677,13 +3684,14 @@ msgstr "Esgynnol"
 #: libraries/operations.lib.php:797 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:188
-#: templates/structure/sortable_header.phtml:26
-#: templates/structure/sortable_header.phtml:43
-#: templates/table/options.phtml:69
+#: templates/database/structure/sortable_header.phtml:26
+#: templates/database/structure/sortable_header.phtml:43
+#: templates/table/search/options.phtml:69
 msgid "Descending"
 msgstr "Disgynnol"
 
-#: libraries/DBQbe.class.php:467 templates/table/search_and_replace.phtml:6
+#: libraries/DBQbe.class.php:467
+#: templates/table/search/search_and_replace.phtml:6
 #, fuzzy
 #| msgid "Column"
 msgid "Column:"
@@ -3867,12 +3875,12 @@ msgstr[0] "%s ergyd mewn tabl <i>%s</i>"
 msgstr[1] "%s ergyd mewn tabl <i>%s</i>"
 
 #: libraries/DbSearch.class.php:354 libraries/Menu.class.php:311
-#: libraries/Util.class.php:3337 libraries/Util.class.php:3347
-#: libraries/Util.class.php:3623 libraries/Util.class.php:3624
-#: libraries/Util.class.php:4343 libraries/config.values.php:43
+#: libraries/Util.class.php:3343 libraries/Util.class.php:3353
+#: libraries/Util.class.php:3629 libraries/Util.class.php:3630
+#: libraries/Util.class.php:4349 libraries/config.values.php:43
 #: libraries/config.values.php:51 libraries/config.values.php:119
 #: libraries/navigation/Nodes/Node_Table.class.php:295
-#: templates/structure/check_all_table_column.phtml:5
+#: templates/table/structure/check_all_table_column.phtml:5
 msgid "Browse"
 msgstr "Pori"
 
@@ -3891,7 +3899,8 @@ msgstr "Chwilio yn y gronfa ddata"
 msgid "Words or values to search for (wildcard: \"%\"):"
 msgstr "Geiriau neu werthoedd i'w chwilio amdanyn nhw (nod-chwiliwr: \"%\"):"
 
-#: libraries/DbSearch.class.php:401 templates/table/search_and_replace.phtml:1
+#: libraries/DbSearch.class.php:401
+#: templates/table/search/search_and_replace.phtml:1
 msgid "Find:"
 msgstr "Darganfod:"
 
@@ -3942,16 +3951,16 @@ msgstr "Hidlydd"
 msgid "Search this table"
 msgstr "Chwilio yn y gronfa ddata"
 
-#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2532
-#: libraries/Util.class.php:2535
+#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2538
+#: libraries/Util.class.php:2541
 #, fuzzy
 #| msgid "Begin"
 msgctxt "First page"
 msgid "Begin"
 msgstr "Dechrau"
 
-#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2533
-#: libraries/Util.class.php:2536 libraries/server_bin_log.lib.php:170
+#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2539
+#: libraries/Util.class.php:2542 libraries/server_bin_log.lib.php:170
 #: libraries/server_bin_log.lib.php:172
 #, fuzzy
 #| msgid "Previous"
@@ -3959,8 +3968,8 @@ msgctxt "Previous page"
 msgid "Previous"
 msgstr "Cynt"
 
-#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2564
-#: libraries/Util.class.php:2574 libraries/server_bin_log.lib.php:204
+#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2570
+#: libraries/Util.class.php:2580 libraries/server_bin_log.lib.php:204
 #: libraries/server_bin_log.lib.php:206
 #, fuzzy
 #| msgid "Next"
@@ -3968,8 +3977,8 @@ msgctxt "Next page"
 msgid "Next"
 msgstr "Nesaf"
 
-#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2565
-#: libraries/Util.class.php:2575
+#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2571
+#: libraries/Util.class.php:2581
 #, fuzzy
 #| msgid "End"
 msgctxt "Last page"
@@ -4056,9 +4065,9 @@ msgid "May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]."
 msgstr ""
 
 #: libraries/DisplayResults.class.php:4332 libraries/Message.class.php:180
-#: libraries/controllers/TableRelationController.class.php:258
+#: libraries/controllers/TableRelationController.class.php:259
 #: libraries/controllers/TableSearchController.class.php:655
-#: libraries/rte/rte_routines.lib.php:1332 libraries/sql_query_form.lib.php:89
+#: libraries/rte/rte_routines.lib.php:1423 libraries/sql_query_form.lib.php:89
 #: tbl_operations.php:227 tbl_row_action.php:138 view_operations.php:62
 #, fuzzy
 #| msgid "Your SQL query has been executed successfully."
@@ -4066,7 +4075,7 @@ msgid "Your SQL query has been executed successfully."
 msgstr "Cafodd eich ymholiad SQL ei gweithredu'n llwyddiannus"
 
 #: libraries/DisplayResults.class.php:4660
-#: libraries/controllers/StructureController.class.php:629
+#: libraries/controllers/DatabaseStructureController.class.php:564
 #, php-format
 msgid ""
 "This view has at least this number of rows. Please refer to %sdocumentation"
@@ -4091,34 +4100,34 @@ msgstr ""
 msgid "%d total"
 msgstr "cyfanswm"
 
-#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1318
+#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1312
 #, fuzzy, php-format
 #| msgid "Query took %01.4f sec"
 msgid "Query took %01.4f seconds."
 msgstr "Cymerodd yr ymholiad %01.4f eiliad"
 
 #: libraries/DisplayResults.class.php:4807
-#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4767
-#: libraries/Util.class.php:4773 libraries/mult_submits.inc.php:50
-#: templates/structure/check_all_tables.phtml:2
-#: templates/structure/check_all_tables.phtml:9
+#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4773
+#: libraries/Util.class.php:4779 libraries/mult_submits.inc.php:50
+#: templates/database/structure/check_all_tables.phtml:2
+#: templates/database/structure/check_all_tables.phtml:9
 msgid "With selected:"
 msgstr "Gyda'r dewis:"
 
 #: libraries/DisplayResults.class.php:4811
-#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4769
-#: libraries/Util.class.php:4770 libraries/server_privileges.lib.php:1174
+#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4775
+#: libraries/Util.class.php:4776 libraries/server_privileges.lib.php:1174
 #: libraries/server_privileges.lib.php:1175
 #: libraries/server_privileges.lib.php:1387
 #: libraries/server_user_groups.lib.php:231
-#: templates/structure/check_all_tables.phtml:3
-#: templates/structure/check_all_tables.phtml:4
+#: templates/database/structure/check_all_tables.phtml:3
+#: templates/database/structure/check_all_tables.phtml:4
 msgid "Check All"
 msgstr "Dewis Pob"
 
 #: libraries/DisplayResults.class.php:4985 libraries/Header.class.php:383
-#: templates/structure/optional_action_links.phtml:1
-#: templates/structure/print_view_data_dictionary_link.phtml:3
+#: templates/database/structure/print_view_data_dictionary_link.phtml:3
+#: templates/table/structure/optional_action_links.phtml:1
 msgid "Print view"
 msgstr "Argraffu golwg"
 
@@ -4126,7 +4135,8 @@ msgstr "Argraffu golwg"
 msgid "Query results operations"
 msgstr "Gweithrediadau canlyniadau ymholiad"
 
-#: libraries/DisplayResults.class.php:5105 templates/tbl_chart.phtml:12
+#: libraries/DisplayResults.class.php:5105
+#: templates/table/chart/tbl_chart.phtml:12
 #, fuzzy
 #| msgid "Display PDF schema"
 msgid "Display chart"
@@ -4223,7 +4233,7 @@ msgid "Click on the bar to scroll to top of page"
 msgstr ""
 
 #: libraries/Header.class.php:749
-#: libraries/plugins/auth/AuthenticationCookie.class.php:152
+#: libraries/plugins/auth/AuthenticationCookie.class.php:140
 #, fuzzy
 #| msgid "Cookies must be enabled past this point."
 msgid "Javascript must be enabled past this point!"
@@ -4247,11 +4257,11 @@ msgid "Keyname"
 msgstr "Enw allweddol"
 
 #: libraries/Index.class.php:697
-#: libraries/controllers/StructureController.class.php:1962
-#: libraries/controllers/StructureController.class.php:1967
+#: libraries/controllers/TableStructureController.class.php:953
+#: libraries/controllers/TableStructureController.class.php:958
 #: libraries/tracking.lib.php:973
 #: templates/columns_definitions/column_indexes.phtml:11
-#: templates/structure/check_all_table_column.phtml:26
+#: templates/table/structure/check_all_table_column.phtml:26
 msgid "Unique"
 msgstr "Unigryw"
 
@@ -4270,16 +4280,17 @@ msgstr ""
 #: libraries/server_collations.lib.php:35 libraries/tracking.lib.php:881
 #: libraries/tracking.lib.php:977
 #: templates/columns_definitions/table_fields_definitions.phtml:33
-#: templates/structure/row_stats_table.phtml:31
-#: templates/structure/table_header.phtml:55
-#: templates/structure/table_structure_header.phtml:7
-#: templates/table/table_header.phtml:8
+#: templates/database/structure/table_header.phtml:55
+#: templates/table/search/table_header.phtml:8
+#: templates/table/structure/row_stats_table.phtml:31
+#: templates/table/structure/table_structure_header.phtml:7
 msgid "Collation"
 msgstr "Coladiad"
 
 #: libraries/Index.class.php:703 libraries/rte/rte_events.lib.php:496
-#: libraries/rte/rte_routines.lib.php:956 libraries/tracking.lib.php:885
-#: libraries/tracking.lib.php:979 templates/structure/table_header.phtml:84
+#: libraries/rte/rte_routines.lib.php:1047 libraries/tracking.lib.php:885
+#: libraries/tracking.lib.php:979
+#: templates/database/structure/table_header.phtml:84
 msgid "Comment"
 msgstr "Sylw"
 
@@ -4292,15 +4303,15 @@ msgstr "Cafodd yr allwedd gynradd ei gollwng."
 msgid "Index %s has been dropped."
 msgstr "Cafodd indecs %s ei ollwng."
 
-#: libraries/Index.class.php:757 libraries/Util.class.php:3630
-#: libraries/Util.class.php:3631
-#: libraries/controllers/StructureController.class.php:1958
-#: libraries/controllers/StructureController.class.php:1959
+#: libraries/Index.class.php:757 libraries/Util.class.php:3636
+#: libraries/Util.class.php:3637
+#: libraries/controllers/TableStructureController.class.php:949
+#: libraries/controllers/TableStructureController.class.php:950
 #: libraries/operations.lib.php:1607 libraries/rte/rte_list.lib.php:150
 #: libraries/server_databases.lib.php:146
-#: templates/structure/check_all_table_column.phtml:15
-#: templates/structure/check_all_tables.phtml:16
-#: templates/tbl_relation/foreign_key_row.phtml:93
+#: templates/database/structure/check_all_tables.phtml:16
+#: templates/table/relation/foreign_key_row.phtml:93
+#: templates/table/structure/check_all_table_column.phtml:15
 msgid "Drop"
 msgstr "Gollwng"
 
@@ -4331,16 +4342,16 @@ msgstr "Gweinydd"
 #: libraries/Menu.class.php:248
 #: libraries/navigation/Nodes/Node_View.class.php:32
 #: libraries/tbl_info.inc.php:63
-#: templates/structure/structure_table_row.phtml:97
-#: templates/structure/structure_table_row.phtml:159
+#: templates/database/structure/structure_table_row.phtml:97
+#: templates/database/structure/structure_table_row.phtml:159
 msgid "View"
 msgstr "Dangos"
 
 #: libraries/Menu.class.php:325 libraries/Menu.class.php:429
-#: libraries/Menu.class.php:548 libraries/Util.class.php:3334
-#: libraries/Util.class.php:3344 libraries/Util.class.php:3350
-#: libraries/Util.class.php:4313 libraries/Util.class.php:4328
-#: libraries/Util.class.php:4345 libraries/config.values.php:40
+#: libraries/Menu.class.php:548 libraries/Util.class.php:3340
+#: libraries/Util.class.php:3350 libraries/Util.class.php:3356
+#: libraries/Util.class.php:4319 libraries/Util.class.php:4334
+#: libraries/Util.class.php:4351 libraries/config.values.php:40
 #: libraries/config.values.php:48 libraries/config.values.php:110
 #: libraries/config.values.php:116 libraries/config/messages.inc.php:321
 #: libraries/navigation/Nodes/Node_Table.class.php:292
@@ -4348,19 +4359,19 @@ msgid "SQL"
 msgstr "SQL"
 
 #: libraries/Menu.class.php:328 libraries/Menu.class.php:432
-#: libraries/Util.class.php:3335 libraries/Util.class.php:3345
-#: libraries/Util.class.php:3351 libraries/Util.class.php:3625
-#: libraries/Util.class.php:3626 libraries/Util.class.php:4329
-#: libraries/Util.class.php:4346 libraries/config.values.php:41
+#: libraries/Util.class.php:3341 libraries/Util.class.php:3351
+#: libraries/Util.class.php:3357 libraries/Util.class.php:3631
+#: libraries/Util.class.php:3632 libraries/Util.class.php:4335
+#: libraries/Util.class.php:4352 libraries/config.values.php:41
 #: libraries/config.values.php:49 libraries/config.values.php:111
 #: libraries/config.values.php:117
 #: libraries/navigation/Nodes/Node_Table.class.php:286
 msgid "Search"
 msgstr "Chwilio"
 
-#: libraries/Menu.class.php:338 libraries/Util.class.php:3336
-#: libraries/Util.class.php:3346 libraries/Util.class.php:3627
-#: libraries/Util.class.php:3628 libraries/Util.class.php:4347
+#: libraries/Menu.class.php:338 libraries/Util.class.php:3342
+#: libraries/Util.class.php:3352 libraries/Util.class.php:3633
+#: libraries/Util.class.php:3634 libraries/Util.class.php:4353
 #: libraries/config.values.php:42 libraries/config.values.php:50
 #: libraries/config.values.php:118
 #: libraries/navigation/Nodes/Node_Table.class.php:289
@@ -4369,30 +4380,30 @@ msgid "Insert"
 msgstr "Mewnosod"
 
 #: libraries/Menu.class.php:362 libraries/Menu.class.php:467
-#: libraries/Util.class.php:4334 libraries/Util.class.php:4350
+#: libraries/Util.class.php:4340 libraries/Util.class.php:4356
 #: libraries/config.values.php:106 libraries/server_common.lib.php:51
 #: libraries/server_privileges.lib.php:2370
 #: libraries/server_privileges.lib.php:3158
-#: libraries/server_privileges.lib.php:4221
+#: libraries/server_privileges.lib.php:4247
 msgid "Privileges"
 msgstr "Breintiau"
 
 #: libraries/Menu.class.php:371 libraries/Menu.class.php:379
-#: libraries/Menu.class.php:459 libraries/Util.class.php:3338
-#: libraries/Util.class.php:3352 libraries/Util.class.php:4333
-#: libraries/Util.class.php:4351 libraries/config.values.php:112
+#: libraries/Menu.class.php:459 libraries/Util.class.php:3344
+#: libraries/Util.class.php:3358 libraries/Util.class.php:4339
+#: libraries/Util.class.php:4357 libraries/config.values.php:112
 #: view_operations.php:92
 msgid "Operations"
 msgstr "Gweithrediadau"
 
 #: libraries/Menu.class.php:384 libraries/Menu.class.php:492
-#: libraries/Util.class.php:4338 libraries/Util.class.php:4352
+#: libraries/Util.class.php:4344 libraries/Util.class.php:4358
 #: libraries/relation.lib.php:255
 msgid "Tracking"
 msgstr "Tracio"
 
 #: libraries/Menu.class.php:397 libraries/Menu.class.php:486
-#: libraries/Util.class.php:4337 libraries/Util.class.php:4353
+#: libraries/Util.class.php:4343 libraries/Util.class.php:4359
 #: libraries/navigation/Nodes/Node_Trigger_Container.class.php:24
 #: libraries/plugins/export/ExportHtmlword.class.php:557
 #: libraries/plugins/export/ExportOdt.class.php:685
@@ -4409,16 +4420,16 @@ msgstr ""
 msgid "Database seems to be empty!"
 msgstr "Mae'r gronfa ddata yn ymddangos yn wag!"
 
-#: libraries/Menu.class.php:439 libraries/Util.class.php:4330
+#: libraries/Menu.class.php:439 libraries/Util.class.php:4336
 msgid "Query"
 msgstr "Ymholiad"
 
-#: libraries/Menu.class.php:472 libraries/Util.class.php:4335
+#: libraries/Menu.class.php:472 libraries/Util.class.php:4341
 #: libraries/rte/rte_words.lib.php:36
 msgid "Routines"
 msgstr "Rheolweithiau"
 
-#: libraries/Menu.class.php:479 libraries/Util.class.php:4336
+#: libraries/Menu.class.php:479 libraries/Util.class.php:4342
 #: libraries/navigation/Nodes/Node_Event_Container.class.php:26
 #: libraries/plugins/export/ExportSql.class.php:940
 #: libraries/plugins/export/ExportXml.class.php:107
@@ -4426,22 +4437,22 @@ msgstr "Rheolweithiau"
 msgid "Events"
 msgstr "Digwyddiadau"
 
-#: libraries/Menu.class.php:498 libraries/Util.class.php:4339
+#: libraries/Menu.class.php:498 libraries/Util.class.php:4345
 msgid "Designer"
 msgstr "Dyluniwr"
 
-#: libraries/Menu.class.php:507 libraries/Util.class.php:4340
-#: templates/structure/check_all_tables.phtml:35
+#: libraries/Menu.class.php:507 libraries/Util.class.php:4346
+#: templates/database/structure/check_all_tables.phtml:35
 #, fuzzy
 #| msgid "Add/Delete columns"
 msgid "Central columns"
 msgstr "Ychwanegu/Dileu colofnau"
 
-#: libraries/Menu.class.php:544 libraries/Util.class.php:4312
+#: libraries/Menu.class.php:544 libraries/Util.class.php:4318
 #: libraries/config.values.php:103 libraries/config/messages.inc.php:266
 #: libraries/config/messages.inc.php:341
 #: libraries/navigation/NavigationTree.class.php:1239
-#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4332
+#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4358
 msgid "Databases"
 msgstr "Cronfeydd Data"
 
@@ -4452,34 +4463,34 @@ msgid "User accounts"
 msgstr "Defnyddiwr"
 
 #: libraries/Menu.class.php:595 libraries/ServerStatusData.class.php:121
-#: libraries/Util.class.php:4319 libraries/server_common.lib.php:36
+#: libraries/Util.class.php:4325 libraries/server_common.lib.php:36
 msgid "Binary log"
 msgstr "Log deuaidd"
 
 #: libraries/Menu.class.php:601 libraries/ServerStatusData.class.php:126
-#: libraries/Util.class.php:4320 libraries/server_common.lib.php:42
-#: templates/structure/body_for_table_summary.phtml:10
-#: templates/structure/table_header.phtml:27
+#: libraries/Util.class.php:4326 libraries/server_common.lib.php:42
+#: templates/database/structure/body_for_table_summary.phtml:10
+#: templates/database/structure/table_header.phtml:27
 msgid "Replication"
 msgstr "Dyblygiad"
 
 #: libraries/Menu.class.php:606 libraries/ServerStatusData.class.php:193
-#: libraries/Util.class.php:4321 libraries/config.values.php:105
+#: libraries/Util.class.php:4327 libraries/config.values.php:105
 #: libraries/server_engines.lib.php:108 libraries/server_engines.lib.php:112
 #: libraries/sql_query_form.lib.php:421
 msgid "Variables"
 msgstr "Newidynnau"
 
-#: libraries/Menu.class.php:610 libraries/Util.class.php:4322
+#: libraries/Menu.class.php:610 libraries/Util.class.php:4328
 msgid "Charsets"
 msgstr "Setiau nod"
 
-#: libraries/Menu.class.php:615 libraries/Util.class.php:4323
+#: libraries/Menu.class.php:615 libraries/Util.class.php:4329
 #: libraries/server_common.lib.php:33 libraries/server_plugins.lib.php:27
 msgid "Plugins"
 msgstr ""
 
-#: libraries/Menu.class.php:626 libraries/Util.class.php:4324
+#: libraries/Menu.class.php:626 libraries/Util.class.php:4330
 msgid "Engines"
 msgstr "Peiriannau"
 
@@ -4510,7 +4521,7 @@ msgstr[1] "%1$d rhes wedi'u hychwanegu."
 msgstr[2] ""
 msgstr[3] ""
 
-#: libraries/PDF.class.php:70 libraries/Util.class.php:2521
+#: libraries/PDF.class.php:70 libraries/Util.class.php:2527
 #: libraries/browse_foreigners.lib.php:327
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:865
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:890
@@ -4535,7 +4546,7 @@ msgid "Could not save favorite table!"
 msgstr "Taenlen Open Document"
 
 #: libraries/RecentFavoriteTable.class.php:212
-#: templates/structure/favorite_anchor.phtml:12
+#: templates/database/structure/favorite_anchor.phtml:12
 #, fuzzy
 #| msgid "Remove database"
 msgid "Remove from Favorites"
@@ -4722,7 +4733,7 @@ msgstr ""
 "Does dim gwybodaeth statws fanwl ar gael ar gyfer y peiriant storio hwn."
 
 #: libraries/StorageEngine.class.php:373
-#: templates/structure/body_for_table_summary.phtml:50
+#: templates/database/structure/body_for_table_summary.phtml:50
 #, php-format
 msgid "%s is the default storage engine on this MySQL server."
 msgstr "%s yw'r peiriant storio diofyn ar y gweinydd MySQL hwn."
@@ -5152,10 +5163,10 @@ msgstr ""
 
 #: libraries/Util.class.php:726 libraries/rte/rte_events.lib.php:110
 #: libraries/rte/rte_events.lib.php:119 libraries/rte/rte_events.lib.php:150
-#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:153
-#: libraries/rte/rte_routines.lib.php:162
-#: libraries/rte/rte_routines.lib.php:235
-#: libraries/rte/rte_routines.lib.php:1366
+#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:223
+#: libraries/rte/rte_routines.lib.php:250
+#: libraries/rte/rte_routines.lib.php:372
+#: libraries/rte/rte_routines.lib.php:1457
 #: libraries/rte/rte_triggers.lib.php:86 libraries/rte/rte_triggers.lib.php:95
 #: libraries/rte/rte_triggers.lib.php:127
 msgid "MySQL said: "
@@ -5201,84 +5212,87 @@ msgstr "Sul"
 msgid "%B %d, %Y at %I:%M %p"
 msgstr "%B %d, %Y am %I:%M %p"
 
-#: libraries/Util.class.php:2019
+#: libraries/Util.class.php:2025
 #, php-format
 msgid "%s days, %s hours, %s minutes and %s seconds"
 msgstr "%s diwrnod, %s awr, %s munud a %s eiliad"
 
-#: libraries/Util.class.php:2112
+#: libraries/Util.class.php:2118
 #, fuzzy
 #| msgid "Routines"
 msgid "Missing parameter:"
 msgstr "Rheolweithiau"
 
-#: libraries/Util.class.php:2645
+#: libraries/Util.class.php:2651
 #, php-format
 msgid "Jump to database \"%s\"."
 msgstr "Neidio  i gronfa ddata \"%s\"."
 
-#: libraries/Util.class.php:2670
+#: libraries/Util.class.php:2676
 #, php-format
 msgid "The %s functionality is affected by a known bug, see %s"
 msgstr ""
 
-#: libraries/Util.class.php:2881
+#: libraries/Util.class.php:2887
 #, fuzzy
 #| msgid "Click to select"
 msgid "Click to toggle"
 msgstr "Pwyso i ddewis"
 
-#: libraries/Util.class.php:3542 prefs_manage.php:248
+#: libraries/Util.class.php:3548 prefs_manage.php:248
 msgid "Browse your computer:"
 msgstr ""
 
-#: libraries/Util.class.php:3567
+#: libraries/Util.class.php:3573
 #, fuzzy, php-format
 #| msgid "web server upload directory"
 msgid "Select from the web server upload directory <b>%s</b>:"
 msgstr "cyfeiriadur lanlwytho y gweinydd gwe"
 
-#: libraries/Util.class.php:3596 libraries/insert_edit.lib.php:1173
+#: libraries/Util.class.php:3602 libraries/insert_edit.lib.php:1171
 msgid "The directory you set for upload work cannot be reached."
 msgstr ""
 "Does dim modd cyrraedd y cyfeiriadur a osodoch chi ar gyfer gwaith a "
 "lanwlythwyd."
 
-#: libraries/Util.class.php:3607
+#: libraries/Util.class.php:3613
 #, fuzzy
 #| msgid "There are no configured servers"
 msgid "There are no files to upload!"
 msgstr "Nid oes unrhyw gweinyddion a ffurfweddwyd"
 
-#: libraries/Util.class.php:3632 libraries/Util.class.php:3633
-#: templates/structure/check_all_tables.phtml:15
+#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: templates/database/structure/check_all_tables.phtml:15
 msgid "Empty"
 msgstr "Gwagu"
 
-#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: libraries/Util.class.php:3644 libraries/Util.class.php:3645
 msgid "Execute"
 msgstr ""
 
-#: libraries/Util.class.php:4152
+#: libraries/Util.class.php:4158
 msgid "Print"
 msgstr "Argraffu"
 
-#: libraries/Util.class.php:4257 templates/structure/row_stats_table.phtml:80
-#: templates/structure/table_header.phtml:95
+#: libraries/Util.class.php:4263
+#: templates/database/structure/table_header.phtml:95
+#: templates/table/structure/row_stats_table.phtml:80
 msgid "Creation"
 msgstr "Cread"
 
-#: libraries/Util.class.php:4263 templates/structure/row_stats_table.phtml:87
-#: templates/structure/table_header.phtml:106
+#: libraries/Util.class.php:4269
+#: templates/database/structure/table_header.phtml:106
+#: templates/table/structure/row_stats_table.phtml:87
 msgid "Last update"
 msgstr "Diweddariad diwethaf"
 
-#: libraries/Util.class.php:4269 templates/structure/row_stats_table.phtml:94
-#: templates/structure/table_header.phtml:117
+#: libraries/Util.class.php:4275
+#: templates/database/structure/table_header.phtml:117
+#: templates/table/structure/row_stats_table.phtml:94
 msgid "Last check"
 msgstr "Gwiriad diwethaf"
 
-#: libraries/Util.class.php:4315
+#: libraries/Util.class.php:4321
 #, fuzzy
 #| msgid "User"
 msgid "Users"
@@ -5303,16 +5317,16 @@ msgid "Use this value"
 msgstr "Defnyddiwch y gwerth hwn"
 
 #: libraries/build_html_for_db.lib.php:33 libraries/import.lib.php:193
-#: templates/structure/actions_in_table_structure.phtml:113
-#: templates/structure/row_stats_table.phtml:42
-#: templates/structure/table_header.phtml:36
+#: templates/database/structure/table_header.phtml:36
+#: templates/table/structure/actions_in_table_structure.phtml:113
+#: templates/table/structure/row_stats_table.phtml:42
 msgid "Rows"
 msgstr "Rhesi"
 
 #: libraries/build_html_for_db.lib.php:48 libraries/engines/innodb.lib.php:171
-#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:186
-#: libraries/server_status.lib.php:298
-#: templates/structure/display_table_stats.phtml:40
+#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:195
+#: libraries/server_status.lib.php:307
+#: templates/table/structure/display_table_stats.phtml:40
 msgid "Total"
 msgstr "Cyfanswm"
 
@@ -5321,10 +5335,12 @@ msgid "Jump to database"
 msgstr "Neidiwch i'r gronfa ddata"
 
 #: libraries/build_html_for_db.lib.php:146
+#: templates/database/structure/structure_table_row.phtml:15
 msgid "Not replicated"
 msgstr ""
 
 #: libraries/build_html_for_db.lib.php:158
+#: templates/database/structure/structure_table_row.phtml:16
 #, fuzzy
 #| msgid "Replication"
 msgid "Replicated"
@@ -5383,17 +5399,17 @@ msgstr ""
 #: libraries/plugins/export/ExportTexytext.class.php:425
 #: libraries/plugins/export/PMA_ExportPdf.class.php:307
 #: libraries/rte/rte_list.lib.php:73 libraries/rte/rte_list.lib.php:85
-#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:830
-#: libraries/rte/rte_routines.lib.php:1492 setup/frames/index.inc.php:162
+#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:921
+#: libraries/rte/rte_routines.lib.php:1583 setup/frames/index.inc.php:162
 #: templates/columns_definitions/table_fields_definitions.phtml:8
-#: templates/structure/table_structure_header.phtml:5
-#: templates/table/create_table.phtml:11
+#: templates/database/create_table.phtml:11
+#: templates/table/structure/table_structure_header.phtml:5
 msgid "Name"
 msgstr "Enw"
 
 #: libraries/central_columns.lib.php:699
 #: libraries/central_columns.lib.php:1381
-#: libraries/rte/rte_routines.lib.php:832
+#: libraries/rte/rte_routines.lib.php:923
 #: templates/columns_definitions/table_fields_definitions.phtml:14
 msgid "Length/Values"
 msgstr ""
@@ -5414,7 +5430,7 @@ msgid "Select a table"
 msgstr "Dewis Tablau"
 
 #: libraries/central_columns.lib.php:804
-#: templates/structure/add_column.phtml:4
+#: templates/table/structure/add_column.phtml:4
 msgid "Add column"
 msgstr ""
 
@@ -5434,7 +5450,7 @@ msgstr "Ychwanegwch %s colofn"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1002
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1025
 #: templates/columns_definitions/table_fields_definitions.phtml:36
-#: templates/structure/table_structure_header.phtml:8
+#: templates/table/structure/table_structure_header.phtml:8
 msgid "Attributes"
 msgstr ""
 
@@ -5551,7 +5567,7 @@ msgid "Double click"
 msgstr ""
 
 #: libraries/config.values.php:95 libraries/config.values.php:124
-#: libraries/config/FormDisplay.tpl.php:221 libraries/relation.lib.php:97
+#: libraries/config/FormDisplay.tpl.php:232 libraries/relation.lib.php:97
 #: libraries/relation.lib.php:105
 msgid "Disabled"
 msgstr "Analluogwyd"
@@ -5748,21 +5764,21 @@ msgstr ""
 msgid "maximum %s"
 msgstr ""
 
-#: libraries/config/FormDisplay.tpl.php:219
+#: libraries/config/FormDisplay.tpl.php:230
 msgid "This setting is disabled, it will not be applied to your configuration."
 msgstr ""
 
-#: libraries/config/FormDisplay.tpl.php:313
+#: libraries/config/FormDisplay.tpl.php:324
 #, php-format
 msgid "Set value: %s"
 msgstr "Gosod gwerth: %s"
 
-#: libraries/config/FormDisplay.tpl.php:318
+#: libraries/config/FormDisplay.tpl.php:329
 #: libraries/config/messages.inc.php:610
 msgid "Restore default value"
 msgstr "Adfer gwerth diofyn"
 
-#: libraries/config/FormDisplay.tpl.php:332
+#: libraries/config/FormDisplay.tpl.php:343
 msgid "Allow users to customize this value"
 msgstr ""
 
@@ -6210,7 +6226,7 @@ msgstr "Set nodau y ffeil"
 
 #: libraries/config/messages.inc.php:136 libraries/config/messages.inc.php:152
 #: libraries/sql_query_form.lib.php:247
-#: templates/structure/row_stats_table.phtml:7
+#: templates/table/structure/row_stats_table.phtml:7
 msgid "Format"
 msgstr "Fformat"
 
@@ -6780,7 +6796,7 @@ msgstr ""
 
 #: libraries/config/messages.inc.php:332
 #: libraries/plugins/export/ExportPdf.class.php:279
-#: templates/structure/secondary_tabs.phtml:8
+#: templates/table/secondary_tabs.phtml:8
 #, fuzzy
 #| msgid "Databases"
 msgid "Table structure"
@@ -8417,116 +8433,35 @@ msgstr "Microsoft Word 2000"
 msgid "OpenDocument Text"
 msgstr "Testun Open Document"
 
-#: libraries/controllers/StructureController.class.php:465
+#: libraries/controllers/DatabaseStructureController.class.php:405
 #: tbl_operations.php:382
 #, php-format
 msgid "Table %s has been emptied."
 msgstr "Cafodd tabl %s ei wagu."
 
-#: libraries/controllers/StructureController.class.php:486
+#: libraries/controllers/DatabaseStructureController.class.php:426
 #: tbl_operations.php:400 view_operations.php:119
 #, fuzzy, php-format
 #| msgid "View %s has been dropped."
 msgid "View %s has been dropped."
 msgstr "Cafodd golwg %s ei ollwng"
 
-#: libraries/controllers/StructureController.class.php:487
+#: libraries/controllers/DatabaseStructureController.class.php:427
 #: tbl_operations.php:401
 #, fuzzy, php-format
 #| msgid "Table %s has been dropped."
 msgid "Table %s has been dropped."
 msgstr "Cafodd tabl %s ei ollwng"
 
-#: libraries/controllers/StructureController.class.php:797
-#, php-format
-msgid "The name '%s' is a MySQL reserved keyword."
-msgid_plural "The names '%s' are MySQL reserved keywords."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-msgstr[4] ""
-msgstr[5] ""
-
-#: libraries/controllers/StructureController.class.php:875
-#, fuzzy
-#| msgid "No databases selected."
-msgid "No column selected."
-msgstr "Dim cronfeydd data wedi'u dewis."
-
-#: libraries/controllers/StructureController.class.php:1049
+#: libraries/controllers/DatabaseStructureController.class.php:733
 msgid "Favorite List is full!"
 msgstr ""
 
-#: libraries/controllers/StructureController.class.php:1272
-#, fuzzy
-#| msgid "Database %s has been dropped."
-msgid "The columns have been moved successfully."
-msgstr "Cafodd cronfa ddata %s ei gollwng."
-
-#: libraries/controllers/StructureController.class.php:1535
-#, fuzzy, php-format
-#| msgid "View %s has been dropped."
-msgid ""
-"Table %1$s has been altered successfully. Privileges have been adjusted."
-msgstr "Cafodd golwg %s ei ollwng"
-
-#: libraries/controllers/StructureController.class.php:1541
-#: libraries/controllers/TableIndexesController.class.php:161
-#: tbl_addfield.php:92
-#, php-format
-msgid "Table %1$s has been altered successfully."
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1588
-#: libraries/tracking.lib.php:1094
-#, fuzzy
-#| msgid "Query"
-msgid "Query error"
-msgstr "Ymholiad"
-
-#: libraries/controllers/StructureController.class.php:1806
+#: libraries/controllers/DatabaseStructureController.class.php:947
 #: libraries/mysql_charsets.lib.php:366 libraries/mysql_charsets.lib.php:373
 msgid "unknown"
 msgstr "anhysbys"
 
-#: libraries/controllers/StructureController.class.php:1957
-#: templates/structure/check_all_table_column.phtml:11
-msgid "Change"
-msgstr "Newid"
-
-#: libraries/controllers/StructureController.class.php:1961
-#: libraries/controllers/StructureController.class.php:1966
-#: libraries/navigation/Nodes/Node_Index.class.php:30
-#: libraries/tracking.lib.php:926
-#: templates/columns_definitions/column_indexes.phtml:16
-#: templates/columns_definitions/table_fields_definitions.phtml:57
-#: templates/structure/check_all_table_column.phtml:30
-#: templates/structure/display_structure.phtml:79
-#: templates/structure/display_table_stats.phtml:19
-msgid "Index"
-msgstr "Indecs"
-
-#: libraries/controllers/StructureController.class.php:1963
-#: libraries/controllers/StructureController.class.php:1968
-#: templates/columns_definitions/column_indexes.phtml:27
-#: templates/structure/check_all_table_column.phtml:37
-msgid "Spatial"
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1964
-#: libraries/controllers/StructureController.class.php:1969
-#: templates/columns_definitions/column_indexes.phtml:22
-#: templates/structure/check_all_table_column.phtml:47
-msgid "Fulltext"
-msgstr "Testunllawn"
-
-#: libraries/controllers/StructureController.class.php:1970
-#, fuzzy
-#| msgid "Use this value"
-msgid "Distinct values"
-msgstr "Defnyddiwch y gwerth hwn"
-
 #: libraries/controllers/TableChartController.class.php:82
 #: libraries/controllers/TableGisVisualizationController.class.php:101
 msgid "No SQL query was set to fetch data."
@@ -8542,11 +8477,18 @@ msgstr ""
 msgid "No data to display"
 msgstr "Dim cronfeydd data"
 
-#: libraries/controllers/TableRelationController.class.php:217
+#: libraries/controllers/TableIndexesController.class.php:161
+#: libraries/controllers/TableStructureController.class.php:736
+#: tbl_addfield.php:92
+#, php-format
+msgid "Table %1$s has been altered successfully."
+msgstr ""
+
+#: libraries/controllers/TableRelationController.class.php:218
 msgid "Display column was successfully updated."
 msgstr ""
 
-#: libraries/controllers/TableRelationController.class.php:283
+#: libraries/controllers/TableRelationController.class.php:288
 #, fuzzy
 #| msgid "Internal relation added"
 msgid "Internal relations were successfully updated."
@@ -8565,12 +8507,86 @@ msgid "Zoom search"
 msgstr "Chwilio"
 
 #: libraries/controllers/TableSearchController.class.php:852
-#: templates/table/selection_form.phtml:59
+#: templates/table/search/selection_form.phtml:59
 #, fuzzy
 #| msgid "in query"
 msgid "Find and replace"
 msgstr "mewn ymholiad"
 
+#: libraries/controllers/TableStructureController.class.php:163
+#, php-format
+msgid "The name '%s' is a MySQL reserved keyword."
+msgid_plural "The names '%s' are MySQL reserved keywords."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
+msgstr[5] ""
+
+#: libraries/controllers/TableStructureController.class.php:241
+#, fuzzy
+#| msgid "No databases selected."
+msgid "No column selected."
+msgstr "Dim cronfeydd data wedi'u dewis."
+
+#: libraries/controllers/TableStructureController.class.php:467
+#, fuzzy
+#| msgid "Database %s has been dropped."
+msgid "The columns have been moved successfully."
+msgstr "Cafodd cronfa ddata %s ei gollwng."
+
+#: libraries/controllers/TableStructureController.class.php:730
+#, fuzzy, php-format
+#| msgid "View %s has been dropped."
+msgid ""
+"Table %1$s has been altered successfully. Privileges have been adjusted."
+msgstr "Cafodd golwg %s ei ollwng"
+
+#: libraries/controllers/TableStructureController.class.php:783
+#: libraries/tracking.lib.php:1094
+#, fuzzy
+#| msgid "Query"
+msgid "Query error"
+msgstr "Ymholiad"
+
+#: libraries/controllers/TableStructureController.class.php:948
+#: templates/table/structure/check_all_table_column.phtml:11
+msgid "Change"
+msgstr "Newid"
+
+#: libraries/controllers/TableStructureController.class.php:952
+#: libraries/controllers/TableStructureController.class.php:957
+#: libraries/navigation/Nodes/Node_Index.class.php:30
+#: libraries/tracking.lib.php:926
+#: templates/columns_definitions/column_indexes.phtml:16
+#: templates/columns_definitions/table_fields_definitions.phtml:57
+#: templates/table/structure/check_all_table_column.phtml:30
+#: templates/table/structure/display_structure.phtml:79
+#: templates/table/structure/display_table_stats.phtml:19
+msgid "Index"
+msgstr "Indecs"
+
+#: libraries/controllers/TableStructureController.class.php:954
+#: libraries/controllers/TableStructureController.class.php:959
+#: templates/columns_definitions/column_indexes.phtml:27
+#: templates/table/structure/check_all_table_column.phtml:37
+msgid "Spatial"
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:955
+#: libraries/controllers/TableStructureController.class.php:960
+#: templates/columns_definitions/column_indexes.phtml:22
+#: templates/table/structure/check_all_table_column.phtml:47
+msgid "Fulltext"
+msgstr "Testunllawn"
+
+#: libraries/controllers/TableStructureController.class.php:963
+#, fuzzy
+#| msgid "Use this value"
+msgid "Distinct values"
+msgstr "Defnyddiwch y gwerth hwn"
+
 #: libraries/core.lib.php:306
 #, php-format
 msgid "The %s extension is missing. Please check your PHP configuration."
@@ -8617,7 +8633,7 @@ msgid "No Password"
 msgstr "Dim Cyfrinair"
 
 #: libraries/display_change_password.lib.php:68
-#: libraries/plugins/auth/AuthenticationCookie.class.php:199
+#: libraries/plugins/auth/AuthenticationCookie.class.php:187
 #: libraries/replication_gui.lib.php:422 libraries/replication_gui.lib.php:862
 #: libraries/server_privileges.lib.php:1640
 msgid "Password:"
@@ -9427,12 +9443,12 @@ msgid "Dump has been saved to file %s."
 msgstr "Dadlwythiad wedi'i gadw i'r ffeil %s."
 
 #: libraries/import.lib.php:202 libraries/insert_edit.lib.php:124
-#: libraries/rte/rte_routines.lib.php:1353 libraries/sql.lib.php:1312
+#: libraries/rte/rte_routines.lib.php:1444 libraries/sql.lib.php:1306
 #: tbl_get_field.php:44
 msgid "MySQL returned an empty result set (i.e. zero rows)."
 msgstr ""
 
-#: libraries/import.lib.php:265 libraries/sql.lib.php:1326
+#: libraries/import.lib.php:265 libraries/sql.lib.php:1320
 msgid "[ROLLBACK occurred.]"
 msgstr ""
 
@@ -9500,14 +9516,14 @@ msgstr ""
 
 #: libraries/insert_edit.lib.php:233
 #: libraries/navigation/Nodes/Node_DatabaseChild.class.php:48
-#: templates/designer/table_list.phtml:40
+#: templates/database/designer/table_list.phtml:40
 msgid "Hide"
 msgstr "Cuddio"
 
 #: libraries/insert_edit.lib.php:249
 #: libraries/navigation/Nodes/Node_Function.class.php:32
-#: libraries/rte/rte_routines.lib.php:1495
-#: templates/table/table_header.phtml:4
+#: libraries/rte/rte_routines.lib.php:1586
+#: templates/table/search/table_header.phtml:4
 msgid "Function"
 msgstr "Swyddogaeth"
 
@@ -9520,88 +9536,89 @@ msgstr "Deuaidd"
 msgid "Because of its length,<br /> this column might not be editable."
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1050
+#: libraries/insert_edit.lib.php:1048
 msgid "Binary - do not edit"
 msgstr "Deuaidd - peidiwch â golygu"
 
-#: libraries/insert_edit.lib.php:1176 libraries/server_privileges.lib.php:470
-#: templates/table/options.phtml:36
+#: libraries/insert_edit.lib.php:1174 libraries/server_privileges.lib.php:470
+#: templates/table/search/options.phtml:36
 msgid "Or"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1177
+#: libraries/insert_edit.lib.php:1175
 #, fuzzy
 #| msgid "web server upload directory"
 msgid "web server upload directory:"
 msgstr "cyfeiriadur lanlwytho y gweinydd gwe"
 
-#: libraries/insert_edit.lib.php:1348 templates/table/input_box.phtml:49
+#: libraries/insert_edit.lib.php:1346
+#: templates/table/search/input_box.phtml:49
 #, fuzzy
 #| msgid "Insert"
 msgid "Edit/Insert"
 msgstr "Mewnosod"
 
-#: libraries/insert_edit.lib.php:1398
+#: libraries/insert_edit.lib.php:1396
 #, php-format
 msgid "Continue insertion with %s rows"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1428
+#: libraries/insert_edit.lib.php:1426
 msgid "and then"
 msgstr "ac yna"
 
-#: libraries/insert_edit.lib.php:1461
+#: libraries/insert_edit.lib.php:1459
 msgid "Insert as new row"
 msgstr "Mewnosod fel rhes newydd"
 
-#: libraries/insert_edit.lib.php:1464
+#: libraries/insert_edit.lib.php:1462
 msgid "Insert as new row and ignore errors"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1467
+#: libraries/insert_edit.lib.php:1465
 msgid "Show insert query"
 msgstr "Dangos ymholiad mewnosod"
 
-#: libraries/insert_edit.lib.php:1487
+#: libraries/insert_edit.lib.php:1485
 msgid "Go back to previous page"
 msgstr "Dychwelyd i'r dudalen flaenorol"
 
-#: libraries/insert_edit.lib.php:1490
+#: libraries/insert_edit.lib.php:1488
 msgid "Insert another new row"
 msgstr "Mewnosod rhes newydd arall"
 
-#: libraries/insert_edit.lib.php:1495
+#: libraries/insert_edit.lib.php:1493
 msgid "Go back to this page"
 msgstr "Dychwelyd i'r dudalen hon"
 
-#: libraries/insert_edit.lib.php:1518
+#: libraries/insert_edit.lib.php:1516
 msgid "Edit next row"
 msgstr "Golygu'r rhes nesaf"
 
-#: libraries/insert_edit.lib.php:1540
+#: libraries/insert_edit.lib.php:1538
 msgid ""
 "Use TAB key to move from value to value, or CTRL+arrows to move anywhere"
 msgstr ""
 "Defnyddiwch y bysell TAB i symud o un gwerth i'r llall, neu CTRL + saethau i "
 "symud unrhyw le"
 
-#: libraries/insert_edit.lib.php:1577 libraries/replication_gui.lib.php:542
-#: libraries/rte/rte_routines.lib.php:1497
+#: libraries/insert_edit.lib.php:1575 libraries/replication_gui.lib.php:542
+#: libraries/rte/rte_routines.lib.php:1588
 #: libraries/server_status_variables.lib.php:220
-#: templates/designer/having_query_panel.phtml:100
-#: templates/designer/options_panel.phtml:73
-#: templates/designer/options_panel.phtml:239
-#: templates/designer/where_query_panel.phtml:69
-#: templates/table/table_header.phtml:10
-#: templates/table/zoom_result_form.phtml:35
+#: templates/database/designer/having_query_panel.phtml:100
+#: templates/database/designer/options_panel.phtml:73
+#: templates/database/designer/options_panel.phtml:239
+#: templates/database/designer/where_query_panel.phtml:69
+#: templates/table/search/table_header.phtml:10
+#: templates/table/search/zoom_result_form.phtml:35
 msgid "Value"
 msgstr "Gwerth"
 
-#: libraries/insert_edit.lib.php:1937 libraries/sql.lib.php:1309
+#: libraries/insert_edit.lib.php:1935 libraries/sql.lib.php:1303
 msgid "Showing SQL query"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1962 libraries/sql.lib.php:1287
+#: libraries/insert_edit.lib.php:1960 libraries/sql.lib.php:1281
 #, php-format
 msgid "Inserted row id: %1$d"
 msgstr ""
@@ -10052,7 +10069,7 @@ msgstr ""
 #: libraries/navigation/Nodes/Node_View_Container.class.php:26
 #: libraries/navigation/Nodes/Node_View_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:129
-#: templates/structure/show_create.phtml:30
+#: templates/database/structure/show_create.phtml:30
 #, fuzzy
 #| msgid "View"
 msgid "Views"
@@ -10362,7 +10379,7 @@ msgstr ""
 
 #: libraries/operations.lib.php:101 libraries/operations.lib.php:249
 #: libraries/operations.lib.php:869 libraries/operations.lib.php:963
-#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:907
+#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:998
 #: templates/columns_definitions/table_fields_definitions.phtml:47
 #, fuzzy
 #| msgid "Privileges"
@@ -10456,22 +10473,22 @@ msgid "Switch to copied table"
 msgstr ""
 
 #: libraries/operations.lib.php:1360
-#: templates/structure/check_all_tables.phtml:18
+#: templates/database/structure/check_all_tables.phtml:18
 msgid "Table maintenance"
 msgstr ""
 
 #: libraries/operations.lib.php:1398
-#: templates/structure/check_all_tables.phtml:19
+#: templates/database/structure/check_all_tables.phtml:19
 msgid "Analyze table"
 msgstr "Dadansoddi tabl"
 
 #: libraries/operations.lib.php:1413
-#: templates/structure/check_all_tables.phtml:20
+#: templates/database/structure/check_all_tables.phtml:20
 msgid "Check table"
 msgstr "Gwirio tabl"
 
 #: libraries/operations.lib.php:1428
-#: templates/structure/check_all_tables.phtml:22
+#: templates/database/structure/check_all_tables.phtml:22
 #, fuzzy
 #| msgid "Check table"
 msgid "Checksum table"
@@ -10491,18 +10508,19 @@ msgid "Flush the table (FLUSH)"
 msgstr ""
 
 #: libraries/operations.lib.php:1477
-#: templates/structure/check_all_tables.phtml:23
-#: templates/structure/display_table_stats.phtml:56
+#: templates/database/structure/check_all_tables.phtml:23
+#: templates/table/structure/display_table_stats.phtml:56
 msgid "Optimize table"
 msgstr "Optimeiddio tabl"
 
 #: libraries/operations.lib.php:1492
-#: templates/structure/check_all_tables.phtml:24
+#: templates/database/structure/check_all_tables.phtml:24
 msgid "Repair table"
 msgstr "Trwsio tabl"
 
 #: libraries/operations.lib.php:1538
-#: templates/structure/check_all_tables.phtml:14 view_operations.php:127
+#: templates/database/structure/check_all_tables.phtml:14
+#: view_operations.php:127
 #, fuzzy
 #| msgid "Delete tracking data for this table"
 msgid "Delete data or table"
@@ -10633,7 +10651,7 @@ msgid "Cannot connect: invalid settings."
 msgstr "Methu â chysylltu: gosodiadau annilys."
 
 #: libraries/plugins/auth/AuthenticationConfig.class.php:108
-#: libraries/plugins/auth/AuthenticationCookie.class.php:134
+#: libraries/plugins/auth/AuthenticationCookie.class.php:122
 #: libraries/plugins/auth/AuthenticationHttp.class.php:96
 #, php-format
 msgid "Welcome to %s"
@@ -10664,40 +10682,40 @@ msgstr ""
 msgid "Retry to connect"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:146
+#: libraries/plugins/auth/AuthenticationCookie.class.php:134
 msgid "Your session has expired. Please log in again."
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:170
+#: libraries/plugins/auth/AuthenticationCookie.class.php:158
 msgid "Log in"
 msgstr "Mewngofnodwch"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:178
-#: libraries/plugins/auth/AuthenticationCookie.class.php:188
+#: libraries/plugins/auth/AuthenticationCookie.class.php:166
+#: libraries/plugins/auth/AuthenticationCookie.class.php:176
 msgid "You can enter hostname/IP address and port separated by space."
 msgstr ""
 "Gallwch gyflwyno enw'r gwesteiwr / cyfeiriad IP a'r porth gan eu gwahanu gan "
 "fwlch."
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:193
+#: libraries/plugins/auth/AuthenticationCookie.class.php:181
 msgid "Username:"
 msgstr "Enw defnyddiwr:"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:205
+#: libraries/plugins/auth/AuthenticationCookie.class.php:193
 #, fuzzy
 #| msgid "Server Choice"
 msgid "Server Choice:"
 msgstr "Dewis Gweinydd"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:386
+#: libraries/plugins/auth/AuthenticationCookie.class.php:374
 msgid "Entered captcha is wrong, try again!"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:396
+#: libraries/plugins/auth/AuthenticationCookie.class.php:384
 msgid "Please enter correct captcha!"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:423
+#: libraries/plugins/auth/AuthenticationCookie.class.php:411
 #, fuzzy
 #| msgid "Cannot log in to the MySQL server"
 msgid "You are not allowed to log in to this MySQL server!"
@@ -10811,7 +10829,7 @@ msgstr "Digwyddiad"
 #: libraries/plugins/export/ExportOdt.class.php:593
 #: libraries/plugins/export/ExportTexytext.class.php:428
 #: libraries/plugins/export/PMA_ExportPdf.class.php:313
-#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:984
 #: libraries/rte/rte_triggers.lib.php:377
 #, fuzzy
 #| msgid "Description"
@@ -11163,7 +11181,7 @@ msgid "Last check:"
 msgstr "Gwiriad diwethaf"
 
 #: libraries/plugins/export/ExportSql.class.php:1399
-#: templates/structure/structure_table_row.phtml:183
+#: templates/database/structure/structure_table_row.phtml:183
 msgid "in use"
 msgstr "ar ddefnydd"
 
@@ -11361,22 +11379,16 @@ msgstr ""
 msgid "The imported file does not contain any data!"
 msgstr "Nid yw ffeil %s yn cynnwys unrhyw id allwedd"
 
-#: libraries/plugins/import/ImportSql.class.php:169
+#: libraries/plugins/import/ImportSql.class.php:72
 #, fuzzy
 #| msgid "SQL compatibility mode"
 msgid "SQL compatibility mode:"
 msgstr "Modd cytunedd SQL"
 
-#: libraries/plugins/import/ImportSql.class.php:181
+#: libraries/plugins/import/ImportSql.class.php:84
 msgid "Do not use <code>AUTO_INCREMENT</code> for zero values"
 msgstr ""
 
-#: libraries/plugins/import/ImportSql.class.php:195
-#, fuzzy
-#| msgid "Read misses"
-msgid "Read as multibytes"
-msgstr "Colledion darllen"
-
 #: libraries/plugins/import/ImportXml.class.php:54
 msgid "XML"
 msgstr ""
@@ -11421,7 +11433,7 @@ msgid "Show grid"
 msgstr "Dangos grid"
 
 #: libraries/plugins/schema/SchemaPdf.class.php:94
-#: templates/structure/print_view_data_dictionary_link.phtml:6
+#: templates/database/structure/print_view_data_dictionary_link.phtml:6
 msgid "Data Dictionary"
 msgstr "Geiriadur Data"
 
@@ -11452,7 +11464,7 @@ msgid "The %s table doesn't exist!"
 msgstr ""
 
 #: libraries/plugins/schema/eps/Eps_Relation_Schema.class.php:321
-#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:309
+#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:323
 #, php-format
 msgid "Schema of the %s database - Page %s"
 msgstr ""
@@ -11481,7 +11493,7 @@ msgstr "Tabl cynnwys"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1005
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1028
 #: libraries/tracking.lib.php:884
-#: templates/structure/table_structure_header.phtml:11
+#: templates/table/structure/table_structure_header.phtml:11
 msgid "Extra"
 msgstr "Ychwanegol"
 
@@ -11814,51 +11826,51 @@ msgstr ""
 msgid "Create the needed tables with the <code>%screate_tables.sql</code>."
 msgstr ""
 
-#: libraries/relation.lib.php:360
+#: libraries/relation.lib.php:357
 msgid "Create a pma user and give access to these tables."
 msgstr ""
 
-#: libraries/relation.lib.php:365
+#: libraries/relation.lib.php:360
 msgid ""
 "Enable advanced features in configuration file (<code>config.inc.php</"
 "code>), for example by starting from <code>config.sample.inc.php</code>."
 msgstr ""
 
-#: libraries/relation.lib.php:373
+#: libraries/relation.lib.php:365
 msgid "Re-login to phpMyAdmin to load the updated configuration file."
 msgstr ""
 
-#: libraries/relation.lib.php:1612
+#: libraries/relation.lib.php:1607
 msgid "no description"
 msgstr ""
 
-#: libraries/relation.lib.php:1811
+#: libraries/relation.lib.php:1806
 msgid ""
 "You do not have necessary privileges to create a database named "
 "'phpmyadmin'. You may go to 'Operations' tab of any database to set up the "
 "phpMyAdmin configuration storage there."
 msgstr ""
 
-#: libraries/relation.lib.php:1928
+#: libraries/relation.lib.php:1923
 #, php-format
 msgid ""
 "%sCreate%s a database named 'phpmyadmin' and setup the phpMyAdmin "
 "configuration storage there."
 msgstr ""
 
-#: libraries/relation.lib.php:1936
+#: libraries/relation.lib.php:1931
 #, php-format
 msgid ""
 "%sCreate%s the phpMyAdmin configuration storage in the current database."
 msgstr ""
 
-#: libraries/relation.lib.php:1944
+#: libraries/relation.lib.php:1939
 #, php-format
 msgid "%sCreate%s missing phpMyAdmin configuration storage tables."
 msgstr ""
 
 #: libraries/replication_gui.lib.php:46 libraries/replication_gui.lib.php:343
-#: libraries/server_databases.lib.php:387
+#: libraries/server_databases.lib.php:398
 msgid "Master replication"
 msgstr ""
 
@@ -11913,7 +11925,7 @@ msgid ""
 msgstr ""
 
 #: libraries/replication_gui.lib.php:141
-#: libraries/server_databases.lib.php:389
+#: libraries/server_databases.lib.php:400
 msgid "Slave replication"
 msgstr ""
 
@@ -12190,10 +12202,10 @@ msgid "Master server changed successfully to %s."
 msgstr ""
 
 #: libraries/rte/rte_events.lib.php:106 libraries/rte/rte_events.lib.php:115
-#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:149
-#: libraries/rte/rte_routines.lib.php:158
-#: libraries/rte/rte_routines.lib.php:231
-#: libraries/rte/rte_routines.lib.php:1362
+#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:219
+#: libraries/rte/rte_routines.lib.php:246
+#: libraries/rte/rte_routines.lib.php:368
+#: libraries/rte/rte_routines.lib.php:1453
 #: libraries/rte/rte_triggers.lib.php:82 libraries/rte/rte_triggers.lib.php:91
 #: libraries/rte/rte_triggers.lib.php:123
 #, php-format
@@ -12216,7 +12228,7 @@ msgstr "Cafodd golwg %s ei ollwng"
 msgid "Event %1$s has been created."
 msgstr "Cafodd y gronfa ddata %1$s ei chreu."
 
-#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:251
+#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:266
 #: libraries/rte/rte_triggers.lib.php:144
 msgid "One or more errors have occurred while processing your request:"
 msgstr ""
@@ -12227,7 +12239,7 @@ msgstr ""
 msgid "Edit event"
 msgstr "Golygu gweinydd"
 
-#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:794
+#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:885
 #: libraries/rte/rte_triggers.lib.php:323 view_create.php:180
 #, fuzzy
 #| msgid "Details…"
@@ -12244,7 +12256,7 @@ msgstr "Math y digwyddiad"
 msgid "Event type"
 msgstr "Math y digwyddiad"
 
-#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:817
+#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:908
 #, fuzzy, php-format
 #| msgid "Change"
 msgid "Change to %s"
@@ -12276,12 +12288,14 @@ msgstr "Diwedd"
 msgid "On completion preserve"
 msgstr ""
 
-#: libraries/rte/rte_events.lib.php:491 libraries/rte/rte_routines.lib.php:930
+#: libraries/rte/rte_events.lib.php:491
+#: libraries/rte/rte_routines.lib.php:1021
 #: libraries/rte/rte_triggers.lib.php:383 view_create.php:209
 msgid "Definer"
 msgstr ""
 
-#: libraries/rte/rte_events.lib.php:535 libraries/rte/rte_routines.lib.php:997
+#: libraries/rte/rte_events.lib.php:535
+#: libraries/rte/rte_routines.lib.php:1088
 #: libraries/rte/rte_triggers.lib.php:422
 msgid "The definer must be in the \"username@hostname\" format!"
 msgstr ""
@@ -12309,9 +12323,9 @@ msgid "You must provide an event definition."
 msgstr ""
 
 #: libraries/rte/rte_export.lib.php:43 libraries/rte/rte_general.lib.php:72
-#: libraries/rte/rte_routines.lib.php:345
-#: libraries/rte/rte_routines.lib.php:1198
-#: libraries/rte/rte_routines.lib.php:1411
+#: libraries/rte/rte_routines.lib.php:153
+#: libraries/rte/rte_routines.lib.php:1289
+#: libraries/rte/rte_routines.lib.php:1502
 #, fuzzy
 #| msgid "Processes"
 msgid "Error in processing request:"
@@ -12347,150 +12361,150 @@ msgid ""
 "problems."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:110
-#: libraries/rte/rte_routines.lib.php:1006
-#, fuzzy, php-format
-#| msgid "Invalid server index: %s"
-msgid "Invalid routine type: \"%s\""
-msgstr "Indecs gweinydd annilys: %s"
-
-#: libraries/rte/rte_routines.lib.php:170
-msgid "Sorry, we failed to restore the dropped routine."
-msgstr ""
-
-#: libraries/rte/rte_routines.lib.php:211
-#, fuzzy, php-format
-#| msgid "View %s has been dropped."
-msgid "Routine %1$s has been modified. Privileges have been adjusted."
-msgstr "Cafodd golwg %s ei ollwng"
-
-#: libraries/rte/rte_routines.lib.php:216
-#, fuzzy, php-format
-#| msgid "View %s has been dropped."
-msgid "Routine %1$s has been modified."
-msgstr "Cafodd golwg %s ei ollwng"
-
-#: libraries/rte/rte_routines.lib.php:238
-#, fuzzy, php-format
-#| msgid "Database %1$s has been created."
-msgid "Routine %1$s has been created."
-msgstr "Cafodd y gronfa ddata %1$s ei chreu."
-
-#: libraries/rte/rte_routines.lib.php:315
+#: libraries/rte/rte_routines.lib.php:123
 #, fuzzy
 #| msgid "Edit server"
 msgid "Edit routine"
 msgstr "Golygu gweinydd"
 
-#: libraries/rte/rte_routines.lib.php:797
+#: libraries/rte/rte_routines.lib.php:200
+#: libraries/rte/rte_routines.lib.php:1097
+#, fuzzy, php-format
+#| msgid "Invalid server index: %s"
+msgid "Invalid routine type: \"%s\""
+msgstr "Indecs gweinydd annilys: %s"
+
+#: libraries/rte/rte_routines.lib.php:253
+#, fuzzy, php-format
+#| msgid "Database %1$s has been created."
+msgid "Routine %1$s has been created."
+msgstr "Cafodd y gronfa ddata %1$s ei chreu."
+
+#: libraries/rte/rte_routines.lib.php:380
+msgid "Sorry, we failed to restore the dropped routine."
+msgstr ""
+
+#: libraries/rte/rte_routines.lib.php:439
+#, fuzzy, php-format
+#| msgid "View %s has been dropped."
+msgid "Routine %1$s has been modified. Privileges have been adjusted."
+msgstr "Cafodd golwg %s ei ollwng"
+
+#: libraries/rte/rte_routines.lib.php:444
+#, fuzzy, php-format
+#| msgid "View %s has been dropped."
+msgid "Routine %1$s has been modified."
+msgstr "Cafodd golwg %s ei ollwng"
+
+#: libraries/rte/rte_routines.lib.php:888
 #, fuzzy
 #| msgid "Routines"
 msgid "Routine name"
 msgstr "Rheolweithiau"
 
-#: libraries/rte/rte_routines.lib.php:823
+#: libraries/rte/rte_routines.lib.php:914
 msgid "Parameters"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:829
+#: libraries/rte/rte_routines.lib.php:920
 #, fuzzy
 #| msgid "Direct links"
 msgid "Direction"
 msgstr "Cysylltiadau uniongyrchol"
 
-#: libraries/rte/rte_routines.lib.php:847
+#: libraries/rte/rte_routines.lib.php:938
 msgid "Add parameter"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:851
+#: libraries/rte/rte_routines.lib.php:942
 #, fuzzy
 #| msgid "Remove database"
 msgid "Remove last parameter"
 msgstr "Tynnwch y gronfa ddata"
 
-#: libraries/rte/rte_routines.lib.php:856
+#: libraries/rte/rte_routines.lib.php:947
 msgid "Return type"
 msgstr "Dychwelyd math"
 
-#: libraries/rte/rte_routines.lib.php:862
+#: libraries/rte/rte_routines.lib.php:953
 msgid "Return length/values"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:868
+#: libraries/rte/rte_routines.lib.php:959
 #, fuzzy
 #| msgid "Actions"
 msgid "Return options"
 msgstr "Gweithredoedd"
 
-#: libraries/rte/rte_routines.lib.php:899
+#: libraries/rte/rte_routines.lib.php:990
 msgid "Is deterministic"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:920
+#: libraries/rte/rte_routines.lib.php:1011
 msgid ""
 "You do not have sufficient privileges to perform this operation; Please "
 "refer to the documentation for more details"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:935
+#: libraries/rte/rte_routines.lib.php:1026
 #, fuzzy
 #| msgid "Return type"
 msgid "Security type"
 msgstr "Dychwelyd math"
 
-#: libraries/rte/rte_routines.lib.php:944
+#: libraries/rte/rte_routines.lib.php:1035
 msgid "SQL data access"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1013
+#: libraries/rte/rte_routines.lib.php:1104
 #, fuzzy
 #| msgid "Invalid table name"
 msgid "You must provide a routine name!"
 msgstr "Enw tabl annilys"
 
-#: libraries/rte/rte_routines.lib.php:1047
+#: libraries/rte/rte_routines.lib.php:1138
 #, php-format
 msgid "Invalid direction \"%s\" given for parameter."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1069
-#: libraries/rte/rte_routines.lib.php:1131
+#: libraries/rte/rte_routines.lib.php:1160
+#: libraries/rte/rte_routines.lib.php:1222
 msgid ""
 "You must provide length/values for routine parameters of type ENUM, SET, "
 "VARCHAR and VARBINARY."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1095
+#: libraries/rte/rte_routines.lib.php:1186
 msgid "You must provide a name and a type for each routine parameter."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1114
+#: libraries/rte/rte_routines.lib.php:1205
 msgid "You must provide a valid return type for the routine."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1174
+#: libraries/rte/rte_routines.lib.php:1265
 msgid "You must provide a routine definition."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1285
+#: libraries/rte/rte_routines.lib.php:1376
 #, php-format
 msgid "Execution results of routine %s"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1340
+#: libraries/rte/rte_routines.lib.php:1431
 #, php-format
 msgid "%d row affected by the last statement inside the procedure."
 msgid_plural "%d rows affected by the last statement inside the procedure."
 msgstr[0] ""
 msgstr[1] ""
 
-#: libraries/rte/rte_routines.lib.php:1398
-#: libraries/rte/rte_routines.lib.php:1406
+#: libraries/rte/rte_routines.lib.php:1489
+#: libraries/rte/rte_routines.lib.php:1497
 msgid "Execute routine"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1485
-#: libraries/rte/rte_routines.lib.php:1488
+#: libraries/rte/rte_routines.lib.php:1576
+#: libraries/rte/rte_routines.lib.php:1579
 #, fuzzy
 #| msgid "Routines"
 msgid "Routine parameters"
@@ -12688,7 +12702,7 @@ msgid "Original position"
 msgstr "Safle gwreiddiol"
 
 #: libraries/server_bin_log.lib.php:133
-#: templates/structure/display_table_stats.phtml:4
+#: templates/table/structure/display_table_stats.phtml:4
 msgid "Information"
 msgstr "Gwybodaeth"
 
@@ -12724,12 +12738,12 @@ msgid ""
 "between the web server and the MySQL server."
 msgstr ""
 
-#: libraries/server_databases.lib.php:364
-#: libraries/server_databases.lib.php:365
+#: libraries/server_databases.lib.php:366
+#: libraries/server_databases.lib.php:371
 msgid "Enable Statistics"
 msgstr "Galluogi Ystadegau"
 
-#: libraries/server_databases.lib.php:481
+#: libraries/server_databases.lib.php:492
 #, fuzzy, php-format
 #| msgid "Database %s has been dropped."
 msgid "%1$d database has been dropped successfully."
@@ -13096,7 +13110,7 @@ msgid "You have revoked the privileges for %s."
 msgstr ""
 
 #: libraries/server_privileges.lib.php:2059
-#: libraries/server_privileges.lib.php:4290
+#: libraries/server_privileges.lib.php:4316
 #, fuzzy
 #| msgid "Any user"
 msgid "Add user account"
@@ -13269,60 +13283,60 @@ msgstr ""
 msgid "The privileges were reloaded successfully."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:3994
+#: libraries/server_privileges.lib.php:4003
 #, php-format
 msgid "The user %s already exists!"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4232
+#: libraries/server_privileges.lib.php:4258
 #, fuzzy, php-format
 #| msgid "Privileges"
 msgid "Privileges for %s"
 msgstr "Breintiau"
 
-#: libraries/server_privileges.lib.php:4241
+#: libraries/server_privileges.lib.php:4267
 #: libraries/server_status_processes.lib.php:72
 #: libraries/server_user_groups.lib.php:39
 msgid "User"
 msgstr "Defnyddiwr"
 
-#: libraries/server_privileges.lib.php:4282
+#: libraries/server_privileges.lib.php:4308
 msgctxt "Create new user"
 msgid "New"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4311
+#: libraries/server_privileges.lib.php:4337
 #, fuzzy
 #| msgid "Privileges"
 msgid "Edit privileges:"
 msgstr "Breintiau"
 
-#: libraries/server_privileges.lib.php:4312
+#: libraries/server_privileges.lib.php:4338
 #, fuzzy
 #| msgid "User"
 msgid "User account"
 msgstr "Defnyddiwr"
 
-#: libraries/server_privileges.lib.php:4371
+#: libraries/server_privileges.lib.php:4397
 msgid ""
 "Note: You are attempting to edit privileges of the user with which you are "
 "currently logged in."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4391 libraries/server_users.lib.php:25
+#: libraries/server_privileges.lib.php:4417 libraries/server_users.lib.php:25
 #, fuzzy
 #| msgid "Overview"
 msgid "User accounts overview"
 msgstr "Gorolwg"
 
-#: libraries/server_privileges.lib.php:4459
+#: libraries/server_privileges.lib.php:4485
 msgid ""
 "A user account allowing any user from localhost to connect is present. This "
 "will prevent other users from connecting if the host part of their account "
 "allows a connection from any (%) host."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4500
+#: libraries/server_privileges.lib.php:4526
 #, php-format
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
@@ -13331,7 +13345,7 @@ msgid ""
 "%sreload the privileges%s before you continue."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4519
+#: libraries/server_privileges.lib.php:4545
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
 "tables. The content of these tables may differ from the privileges the "
@@ -13340,63 +13354,63 @@ msgid ""
 "privilege."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4569
+#: libraries/server_privileges.lib.php:4595
 msgid "The selected user was not found in the privilege table."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4801
+#: libraries/server_privileges.lib.php:4827
 msgid "You have added a new user."
 msgstr ""
 
-#: libraries/server_status.lib.php:53
+#: libraries/server_status.lib.php:60
 #, php-format
 msgid "Network traffic since startup: %s"
 msgstr ""
 
-#: libraries/server_status.lib.php:66
+#: libraries/server_status.lib.php:73
 #, php-format
 msgid "This MySQL server has been running for %1$s. It started up on %2$s."
 msgstr ""
 
-#: libraries/server_status.lib.php:80
+#: libraries/server_status.lib.php:94
 msgid ""
 "This MySQL server works as <b>master</b> and <b>slave</b> in <b>replication</"
 "b> process."
 msgstr ""
 
-#: libraries/server_status.lib.php:85
+#: libraries/server_status.lib.php:99
 msgid "This MySQL server works as <b>master</b> in <b>replication</b> process."
 msgstr ""
 
-#: libraries/server_status.lib.php:90
+#: libraries/server_status.lib.php:104
 msgid "This MySQL server works as <b>slave</b> in <b>replication</b> process."
 msgstr ""
 
-#: libraries/server_status.lib.php:106
+#: libraries/server_status.lib.php:116
 msgid "Replication status"
 msgstr ""
 
-#: libraries/server_status.lib.php:137
+#: libraries/server_status.lib.php:146
 msgid ""
 "On a busy server, the byte counters may overrun, so those statistics as "
 "reported by the MySQL server may be incorrect."
 msgstr ""
 
-#: libraries/server_status.lib.php:148
+#: libraries/server_status.lib.php:157
 msgid "Received"
 msgstr ""
 
-#: libraries/server_status.lib.php:167
+#: libraries/server_status.lib.php:176
 msgid "Sent"
 msgstr ""
 
-#: libraries/server_status.lib.php:234
+#: libraries/server_status.lib.php:243
 #, fuzzy
 #| msgid "Format of imported file"
 msgid "Max. concurrent connections"
 msgstr "Fformat y ffeil a mewnforiwyd"
 
-#: libraries/server_status.lib.php:244
+#: libraries/server_status.lib.php:253
 msgid "Failed attempts"
 msgstr ""
 
@@ -14380,7 +14394,7 @@ msgstr ""
 msgid "Not implemented yet."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/AlterOperation.php:193
+#: libraries/sql-parser/src/Components/AlterOperation.php:191
 msgid "Unrecognized alter operation."
 msgstr ""
 
@@ -14394,7 +14408,7 @@ msgid "An opening bracket followed by a set of values was expected."
 msgstr ""
 
 #: libraries/sql-parser/src/Components/ArrayObj.php:101
-#: libraries/sql-parser/src/Components/FieldDefinition.php:202
+#: libraries/sql-parser/src/Components/CreateDefinition.php:202
 msgid "An opening bracket was expected."
 msgstr ""
 
@@ -14402,25 +14416,35 @@ msgstr ""
 msgid "A comma or a closing bracket was expected"
 msgstr ""
 
+#: libraries/sql-parser/src/Components/CreateDefinition.php:246
+#, fuzzy
+#| msgid "No databases selected."
+msgid "A comma or a closing bracket was expected."
+msgstr "Dim cronfeydd data wedi'u dewis."
+
+#: libraries/sql-parser/src/Components/CreateDefinition.php:262
+msgid "A closing bracket was expected."
+msgstr ""
+
 #: libraries/sql-parser/src/Components/DataType.php:125
 msgid "Unrecognized data type."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:225
+#: libraries/sql-parser/src/Components/Expression.php:227
 msgid "Unexpected closing bracket."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:246
-#: libraries/sql-parser/src/Components/Expression.php:283
-#: libraries/sql-parser/src/Components/Expression.php:303
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:285
+#: libraries/sql-parser/src/Components/Expression.php:305
 msgid "An alias was previously found."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:257
+#: libraries/sql-parser/src/Components/Expression.php:259
 msgid "Unexpected dot."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:327
+#: libraries/sql-parser/src/Components/Expression.php:329
 #, fuzzy
 #| msgid "No databases selected."
 msgid "An alias was expected."
@@ -14432,16 +14456,6 @@ msgstr "Dim cronfeydd data wedi'u dewis."
 msgid "An expression was expected."
 msgstr "Dim cronfeydd data wedi'u dewis."
 
-#: libraries/sql-parser/src/Components/FieldDefinition.php:246
-#, fuzzy
-#| msgid "No databases selected."
-msgid "A comma or a closing bracket was expected."
-msgstr "Dim cronfeydd data wedi'u dewis."
-
-#: libraries/sql-parser/src/Components/FieldDefinition.php:262
-msgid "A closing bracket was expected."
-msgstr ""
-
 #: libraries/sql-parser/src/Components/Limit.php:90
 #: libraries/sql-parser/src/Components/Limit.php:112
 msgid "An offset was expected."
@@ -14483,29 +14497,29 @@ msgstr ""
 msgid "Expected delimiter."
 msgstr ""
 
-#: libraries/sql-parser/src/Lexer.php:753
+#: libraries/sql-parser/src/Lexer.php:777
 #, fuzzy, php-format
 #| msgid "Database %1$s has been created."
 msgid "Ending quote %1$s was expected."
 msgstr "Cafodd y gronfa ddata %1$s ei chreu."
 
-#: libraries/sql-parser/src/Lexer.php:789
+#: libraries/sql-parser/src/Lexer.php:813
 #, fuzzy
 #| msgid "Table name template"
 msgid "Variable name was expected."
 msgstr "Templed enw tabl"
 
-#: libraries/sql-parser/src/Parser.php:380
+#: libraries/sql-parser/src/Parser.php:391
 #, fuzzy
 #| msgid "Show dimension of tables"
 msgid "Unexpected beginning of statement."
 msgstr "Dangos dimensiynau'r tabl"
 
-#: libraries/sql-parser/src/Parser.php:399
+#: libraries/sql-parser/src/Parser.php:410
 msgid "Unrecognized statement type."
 msgstr ""
 
-#: libraries/sql-parser/src/Parser.php:479
+#: libraries/sql-parser/src/Parser.php:489
 msgid "No transaction was previously started."
 msgstr ""
 
@@ -14531,8 +14545,10 @@ msgid "The name of the entity was expected."
 msgstr ""
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:310
-msgid "At least one field definition was expected."
-msgstr ""
+#, fuzzy
+#| msgid "The row has been deleted."
+msgid "At least one column definition was expected."
+msgstr "Cafodd y rhes ei dileu"
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:329
 msgid "A \"RETURNS\" keyword was expected."
@@ -14607,25 +14623,25 @@ msgstr "Clustnodi %s a grëwyd"
 msgid "Using bookmark \"%s\" as default browse query."
 msgstr ""
 
-#: libraries/sql.lib.php:1306
+#: libraries/sql.lib.php:1300
 msgid "Showing as PHP code"
 msgstr ""
 
-#: libraries/sql.lib.php:1638
+#: libraries/sql.lib.php:1632
 #, php-format
 msgid ""
 "Current selection does not contain a unique column. Grid edit, checkbox, "
 "Edit, Copy and Delete features are not available. %s"
 msgstr ""
 
-#: libraries/sql.lib.php:1649
+#: libraries/sql.lib.php:1643
 #, php-format
 msgid ""
 "Current selection does not contain a unique column. Grid edit, Edit, Copy "
 "and Delete features may result in undesired behavior. %s"
 msgstr ""
 
-#: libraries/sql.lib.php:1688
+#: libraries/sql.lib.php:1682
 #, php-format
 msgid "Problems with indexes of table `%s`"
 msgstr ""
@@ -14796,7 +14812,7 @@ msgid "Version %s snapshot (SQL code)"
 msgstr "Ciplun fersiwn %s (cod SQL)"
 
 #: libraries/tracking.lib.php:947
-#: templates/structure/table_structure_row.phtml:33
+#: templates/table/structure/table_structure_row.phtml:33
 msgctxt "None for default"
 msgid "None"
 msgstr ""
@@ -14855,19 +14871,19 @@ msgstr "Crëwch fersiwn %s o %s.%s"
 msgid "Version %1$s was created, tracking for %2$s is active."
 msgstr ""
 
-#: libraries/user_preferences.inc.php:29
+#: libraries/user_preferences.inc.php:30
 #, fuzzy
 #| msgid "General relation features"
 msgid "Manage your settings"
 msgstr "Nodweddion perthynas cyffredinol"
 
-#: libraries/user_preferences.inc.php:46 prefs_manage.php:307
+#: libraries/user_preferences.inc.php:54 prefs_manage.php:307
 #, fuzzy
 #| msgid "Modifications have been saved"
 msgid "Configuration has been saved."
 msgstr "Cafodd yr addasiadau eu cadw"
 
-#: libraries/user_preferences.inc.php:66
+#: libraries/user_preferences.inc.php:74
 #, php-format
 msgid ""
 "Your preferences will be saved for current session only. Storing them "
@@ -15266,7 +15282,7 @@ msgid "first"
 msgstr ""
 
 #: templates/columns_definitions/move_column.phtml:12
-#: templates/structure/add_column.phtml:21
+#: templates/table/structure/add_column.phtml:21
 #, php-format
 msgid "after %s"
 msgstr ""
@@ -15335,241 +15351,348 @@ msgstr "Trawsffurfiad porwr"
 msgid "Input transformation options"
 msgstr "Ystadegau cronfeydd data"
 
-#: templates/designer/aggregate_query_panel.phtml:22
-#: templates/designer/options_panel.phtml:100
+#: templates/database/create_table.phtml:7
+#: templates/database/designer/side_menu.phtml:77
+#: templates/database/designer/side_menu.phtml:80
+msgid "Create table"
+msgstr "Crëwch dabl"
+
+#: templates/database/create_table.phtml:15
+msgid "Number of columns"
+msgstr "Nifer y colofnau"
+
+#: templates/database/designer/aggregate_query_panel.phtml:22
+#: templates/database/designer/options_panel.phtml:100
 #, fuzzy
 #| msgid "Create"
 msgid "Aggregate"
 msgstr "Creu"
 
-#: templates/designer/aggregate_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:61
-#: templates/designer/options_panel.phtml:106
-#: templates/designer/options_panel.phtml:170
-#: templates/designer/where_query_panel.phtml:30
-#: templates/table/table_header.phtml:9
+#: templates/database/designer/aggregate_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:61
+#: templates/database/designer/options_panel.phtml:106
+#: templates/database/designer/options_panel.phtml:170
+#: templates/database/designer/where_query_panel.phtml:30
+#: templates/table/search/table_header.phtml:9
 msgid "Operator"
 msgstr ""
 
-#: templates/designer/database_tables.phtml:29
+#: templates/database/designer/database_tables.phtml:29
 msgid "Toggle"
 msgstr ""
 
-#: templates/designer/database_tables.phtml:40
+#: templates/database/designer/database_tables.phtml:40
 #, fuzzy
 #| msgid "Databases"
 msgid "See table structure"
 msgstr "Cronfeydd Data"
 
-#: templates/designer/delete_relation_panel.phtml:21
+#: templates/database/designer/delete_relation_panel.phtml:21
 msgid "Delete relation"
 msgstr "Dilëwch berthynas"
 
-#: templates/designer/edit_delete_pages.phtml:7
+#: templates/database/designer/edit_delete_pages.phtml:7
 #, fuzzy
 #| msgid "Page name"
 msgid "Page to open"
 msgstr "Enw'r dudalen"
 
-#: templates/designer/edit_delete_pages.phtml:7
+#: templates/database/designer/edit_delete_pages.phtml:7
 #, fuzzy
 #| msgid "Relation deleted"
 msgid "Page to delete"
 msgstr "Perthynas wedi'i ddileu"
 
-#: templates/designer/having_query_panel.phtml:90
-#: templates/designer/options_panel.phtml:63
-#: templates/designer/options_panel.phtml:229
-#: templates/designer/where_query_panel.phtml:59
+#: templates/database/designer/having_query_panel.phtml:90
+#: templates/database/designer/options_panel.phtml:63
+#: templates/database/designer/options_panel.phtml:229
+#: templates/database/designer/where_query_panel.phtml:59
 #, fuzzy
 #| msgid "Export"
 msgid "Except"
 msgstr "Allforio"
 
-#: templates/designer/having_query_panel.phtml:102
-#: templates/designer/options_panel.phtml:75
-#: templates/designer/options_panel.phtml:241
-#: templates/designer/where_query_panel.phtml:71
+#: templates/database/designer/having_query_panel.phtml:102
+#: templates/database/designer/options_panel.phtml:75
+#: templates/database/designer/options_panel.phtml:241
+#: templates/database/designer/where_query_panel.phtml:71
 #, fuzzy
 #| msgid "in query"
 msgid "subquery"
 msgstr "mewn ymholiad"
 
-#: templates/designer/new_relation_panel.phtml:22
-#: templates/designer/side_menu.phtml:84 templates/designer/side_menu.phtml:87
+#: templates/database/designer/new_relation_panel.phtml:22
+#: templates/database/designer/side_menu.phtml:84
+#: templates/database/designer/side_menu.phtml:87
 msgid "Create relation"
 msgstr "Crëwch berthynas"
 
-#: templates/designer/options_panel.phtml:34
-#: templates/designer/options_panel.phtml:200
+#: templates/database/designer/options_panel.phtml:34
+#: templates/database/designer/options_panel.phtml:200
 #, fuzzy
 #| msgid "Relation deleted"
 msgid "Relation operator"
 msgstr "Perthynas wedi'i ddileu"
 
-#: templates/designer/options_panel.phtml:85
-#: templates/designer/rename_to_panel.phtml:23
+#: templates/database/designer/options_panel.phtml:85
+#: templates/database/designer/rename_to_panel.phtml:23
 #, fuzzy
 #| msgid "Rename view to"
 msgid "Rename to"
 msgstr "Ailenwch golwg i"
 
-#: templates/designer/options_panel.phtml:91
-#: templates/designer/rename_to_panel.phtml:31
+#: templates/database/designer/options_panel.phtml:91
+#: templates/database/designer/rename_to_panel.phtml:31
 #, fuzzy
 #| msgid "Page name"
 msgid "New name"
 msgstr "Enw'r dudalen"
 
-#: templates/designer/page_save_as.phtml:4
+#: templates/database/designer/page_save_as.phtml:4
 #, fuzzy
 #| msgid "Import files"
 msgid "Save to selected page"
 msgstr "Mewnforiwch ffeiliau"
 
-#: templates/designer/page_save_as.phtml:5
+#: templates/database/designer/page_save_as.phtml:5
 #, fuzzy
 #| msgid "Create a page"
 msgid "Create a page and save to it"
 msgstr "Crëwch dudalen"
 
-#: templates/designer/page_save_as.phtml:26
+#: templates/database/designer/page_save_as.phtml:26
 #, fuzzy
 #| msgid "Page name"
 msgid "New page name"
 msgstr "Enw'r dudalen"
 
-#: templates/designer/page_selector.phtml:2
+#: templates/database/designer/page_selector.phtml:2
 #, fuzzy
 #| msgid "Select Tables"
 msgid "Select page"
 msgstr "Dewis Tablau"
 
-#: templates/designer/query_details.phtml:10
+#: templates/database/designer/query_details.phtml:10
 #, fuzzy
 #| msgid "Actions"
 msgid "Active options"
 msgstr "Gweithredoedd"
 
-#: templates/designer/schema_export.phtml:4
+#: templates/database/designer/schema_export.phtml:4
 msgid "Select Export Relational Type"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:19 templates/designer/side_menu.phtml:25
+#: templates/database/designer/side_menu.phtml:19
+#: templates/database/designer/side_menu.phtml:25
 #, fuzzy
 #| msgid "No tables"
 msgid "Show/Hide tables list"
 msgstr "Dim tablau"
 
-#: templates/designer/side_menu.phtml:29 templates/designer/side_menu.phtml:35
-#: templates/designer/side_menu.phtml:36
+#: templates/database/designer/side_menu.phtml:29
+#: templates/database/designer/side_menu.phtml:35
+#: templates/database/designer/side_menu.phtml:36
 msgid "View in fullscreen"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:34
+#: templates/database/designer/side_menu.phtml:34
 msgid "Exit fullscreen"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:41 templates/designer/side_menu.phtml:45
+#: templates/database/designer/side_menu.phtml:41
+#: templates/database/designer/side_menu.phtml:45
 #, fuzzy
 #| msgid "Page name"
 msgid "New page"
 msgstr "Enw'r dudalen"
 
-#: templates/designer/side_menu.phtml:70 templates/designer/side_menu.phtml:73
+#: templates/database/designer/side_menu.phtml:70
+#: templates/database/designer/side_menu.phtml:73
 #, fuzzy
 #| msgid "Select Tables"
 msgid "Delete pages"
 msgstr "Dewis Tablau"
 
-#: templates/designer/side_menu.phtml:77 templates/designer/side_menu.phtml:80
-#: templates/table/create_table.phtml:7
-msgid "Create table"
-msgstr "Crëwch dabl"
-
-#: templates/designer/side_menu.phtml:98
-#: templates/designer/side_menu.phtml:101
+#: templates/database/designer/side_menu.phtml:98
+#: templates/database/designer/side_menu.phtml:101
 msgid "Reload"
 msgstr "Ail-lwytho"
 
-#: templates/designer/side_menu.phtml:107
-#: templates/designer/side_menu.phtml:110
+#: templates/database/designer/side_menu.phtml:107
+#: templates/database/designer/side_menu.phtml:110
 msgid "Help"
 msgstr "Cymorth"
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Angular links"
 msgstr "Cysylltiadau onglog"
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Direct links"
 msgstr "Cysylltiadau uniongyrchol"
 
-#: templates/designer/side_menu.phtml:122
-#: templates/designer/side_menu.phtml:124
+#: templates/database/designer/side_menu.phtml:122
+#: templates/database/designer/side_menu.phtml:124
 msgid "Snap to grid"
 msgstr "Snap i'r grid"
 
-#: templates/designer/side_menu.phtml:128
-#: templates/designer/side_menu.phtml:134
+#: templates/database/designer/side_menu.phtml:128
+#: templates/database/designer/side_menu.phtml:134
 msgid "Small/Big All"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:138
-#: templates/designer/side_menu.phtml:141
+#: templates/database/designer/side_menu.phtml:138
+#: templates/database/designer/side_menu.phtml:141
 msgid "Toggle small/big"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:145
-#: templates/designer/side_menu.phtml:148
+#: templates/database/designer/side_menu.phtml:145
+#: templates/database/designer/side_menu.phtml:148
 #, fuzzy
 #| msgid "Delete relation"
 msgid "Toggle relation lines"
 msgstr "Dilëwch berthynas"
 
-#: templates/designer/side_menu.phtml:153
-#: templates/designer/side_menu.phtml:156
+#: templates/database/designer/side_menu.phtml:153
+#: templates/database/designer/side_menu.phtml:156
 #, fuzzy
 #| msgid "Export"
 msgid "Export schema"
 msgstr "Allforio"
 
-#: templates/designer/side_menu.phtml:165
-#: templates/designer/side_menu.phtml:168
+#: templates/database/designer/side_menu.phtml:165
+#: templates/database/designer/side_menu.phtml:168
 #, fuzzy
 #| msgid "Submit Query"
 msgid "Build Query"
 msgstr "Cyflwynwch yr Ymholiad"
 
-#: templates/designer/side_menu.phtml:173
-#: templates/designer/side_menu.phtml:177
+#: templates/database/designer/side_menu.phtml:173
+#: templates/database/designer/side_menu.phtml:177
 msgid "Move Menu"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:181
-#: templates/designer/side_menu.phtml:186
+#: templates/database/designer/side_menu.phtml:181
+#: templates/database/designer/side_menu.phtml:186
 #, fuzzy
 #| msgid "Partial Texts"
 msgid "Pin text"
 msgstr "Testunau Rhannol"
 
-#: templates/designer/table_list.phtml:4
+#: templates/database/designer/table_list.phtml:4
 msgid "Hide/Show all"
 msgstr "Cuddio/Dangos pob"
 
-#: templates/designer/table_list.phtml:14
+#: templates/database/designer/table_list.phtml:14
 msgid "Hide/Show Tables with no relation"
 msgstr "Cuddio/Dangos Tablau heb berthynas"
 
-#: templates/designer/table_list.phtml:59
+#: templates/database/designer/table_list.phtml:59
 #, fuzzy
 #| msgid "Number of tables"
 msgid "Number of tables:"
 msgstr "Nifer y tablau"
 
+#: templates/database/structure/body_for_table_summary.phtml:6
+#, fuzzy, php-format
+msgid "%s table"
+msgid_plural "%s tables"
+msgstr[0] "%s tabl"
+msgstr[1] "%s tabl"
+msgstr[2] ""
+msgstr[3] ""
+
+#: templates/database/structure/body_for_table_summary.phtml:17
+msgid "Sum"
+msgstr "Swm"
+
+#: templates/database/structure/check_all_tables.phtml:6
+msgid "Check tables having overhead"
+msgstr "Gwiriwch dablau â gorbenion"
+
+#: templates/database/structure/check_all_tables.phtml:10
+#, fuzzy
+#| msgid "Show color"
+msgid "Show create"
+msgstr "Dangos lliw"
+
+#: templates/database/structure/check_all_tables.phtml:27
+msgid "Prefix"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:28
+msgid "Add prefix to table"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:29
+#, fuzzy
+#| msgid "Rename table to"
+msgid "Replace table prefix"
+msgstr "Ailenwi tabl i"
+
+#: templates/database/structure/check_all_tables.phtml:30
+msgid "Copy table with prefix"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:36
+#, fuzzy
+#| msgid "Add %s column(s)"
+msgid "Add columns to central list"
+msgstr "Ychwanegwch %s colofn"
+
+#: templates/database/structure/check_all_tables.phtml:37
+msgid "Remove columns from central list"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:38
+#, fuzzy
+#| msgid "Add %s column(s)"
+msgid "Make consistent with central list"
+msgstr "Ychwanegwch %s colofn"
+
+#: templates/database/structure/favorite_anchor.phtml:12
+#, fuzzy
+#| msgid "Add a new server"
+msgid "Add to Favorites"
+msgstr "Ychwanegwch weinydd newydd"
+
+#: templates/database/structure/show_create.phtml:2
+#, fuzzy
+#| msgid "Show SQL queries"
+msgid "Showing create queries"
+msgstr "Dangos ymholiadau SQL"
+
+#: templates/database/structure/sortable_header.phtml:13
+msgid "Sort"
+msgstr "Trefnu"
+
+#: templates/database/structure/table_header.phtml:42
+msgid ""
+"May be approximate. Click on the number to get the exact count. See "
+"[doc@faq3-11]FAQ 3.11[/doc]."
+msgstr ""
+
+#: templates/database/structure/table_header.phtml:66
+#: templates/table/index_form.phtml:127
+msgid "Size"
+msgstr "Maint"
+
+#: templates/database/structure/table_header.phtml:74
+#: templates/table/structure/display_table_stats.phtml:27
+msgid "Overhead"
+msgstr "Gorbenion"
+
+#: templates/database/structure/tracking_icon.phtml:4
+msgid "Tracking is active."
+msgstr "Mae tracio'n weithredol."
+
+#: templates/database/structure/tracking_icon.phtml:8
+msgid "Tracking is not active."
+msgstr "Nid yw tracio'n weithredol."
+
 #: templates/error/report_form.phtml:7
 msgid ""
 "phpMyAdmin has encountered an error. We have collected data about this error "
@@ -15585,71 +15708,6 @@ msgstr ""
 msgid "Please explain the steps that lead to the error:"
 msgstr ""
 
-#: templates/gis_visualization/gis_visualization.phtml:3
-msgid "Display GIS Visualization"
-msgstr ""
-
-#: templates/gis_visualization/gis_visualization.phtml:8
-#, fuzzy
-#| msgid "Add/Delete columns"
-msgid "Label column"
-msgstr "Ychwanegu/Dileu colofnau"
-
-#: templates/gis_visualization/gis_visualization.phtml:11
-#, fuzzy
-#| msgid "- none -"
-msgid "-- None --"
-msgstr "-dim-"
-
-#: templates/gis_visualization/gis_visualization.phtml:19
-#, fuzzy
-#| msgid "Log file count"
-msgid "Spatial column"
-msgstr "Cyfrif ffeiliau log"
-
-#: templates/index_form.phtml:16
-msgid "Index name:"
-msgstr ""
-
-#: templates/index_form.phtml:19
-msgid ""
-"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
-msgstr ""
-
-#: templates/index_form.phtml:40
-#, fuzzy
-#| msgid "Index cache size"
-msgid "Index choice:"
-msgstr "Maint yr ystorfa indecs"
-
-#: templates/index_form.phtml:57
-msgid "Key block size:"
-msgstr ""
-
-#: templates/index_form.phtml:74
-msgid "Index type:"
-msgstr ""
-
-#: templates/index_form.phtml:86
-#, fuzzy
-#| msgid "User"
-msgid "Parser:"
-msgstr "Defnyddiwr"
-
-#: templates/index_form.phtml:102
-#, fuzzy
-#| msgid "Comment"
-msgid "Comment:"
-msgstr "Sylw"
-
-#: templates/index_form.phtml:127 templates/structure/table_header.phtml:66
-msgid "Size"
-msgstr "Maint"
-
-#: templates/index_form.phtml:149 templates/index_form.phtml:190
-msgid "Drag to reorder"
-msgstr ""
-
 #: templates/prefs_autoload.phtml:9
 msgid ""
 "Your browser has phpMyAdmin configuration for this domain. Would you like to "
@@ -15662,487 +15720,452 @@ msgstr ""
 msgid "Start row:"
 msgstr "Yn dangos rhesi"
 
-#: templates/structure/actions_in_table_structure.phtml:14
-#, php-format
-msgid "A primary key has been added on %s."
-msgstr ""
-
-#: templates/structure/actions_in_table_structure.phtml:34
-#: templates/structure/actions_in_table_structure.phtml:54
-#: templates/structure/actions_in_table_structure.phtml:79
-#: templates/structure/actions_in_table_structure.phtml:101
-#, php-format
-msgid "An index has been added on %s."
-msgstr ""
-
-#: templates/structure/actions_in_table_structure.phtml:130
-#: templates/structure/check_all_table_column.phtml:59
-#, fuzzy
-#| msgid "Remove database"
-msgid "Remove from central columns"
-msgstr "Tynnwch y gronfa ddata"
-
-#: templates/structure/actions_in_table_structure.phtml:138
-#: templates/structure/check_all_table_column.phtml:55
-#, fuzzy
-#| msgid "Add %s column(s)"
-msgid "Add to central columns"
-msgstr "Ychwanegwch %s colofn"
-
-#: templates/structure/add_column.phtml:7
-#, php-format
-msgid "Add %s column(s)"
-msgstr "Ychwanegwch %s colofn"
-
-#: templates/structure/add_column.phtml:12
-#, fuzzy
-#| msgid "Show dimension of tables"
-msgid "at beginning of table"
-msgstr "Dangos dimensiynau'r tabl"
-
-#: templates/structure/body_for_table_summary.phtml:6
-#, fuzzy, php-format
-msgid "%s table"
-msgid_plural "%s tables"
-msgstr[0] "%s tabl"
-msgstr[1] "%s tabl"
-msgstr[2] ""
-msgstr[3] ""
-
-#: templates/structure/body_for_table_summary.phtml:17
-msgid "Sum"
-msgstr "Swm"
-
-#: templates/structure/check_all_tables.phtml:6
-msgid "Check tables having overhead"
-msgstr "Gwiriwch dablau â gorbenion"
-
-#: templates/structure/check_all_tables.phtml:10
-#, fuzzy
-#| msgid "Show color"
-msgid "Show create"
-msgstr "Dangos lliw"
-
-#: templates/structure/check_all_tables.phtml:27
-msgid "Prefix"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:28
-msgid "Add prefix to table"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:29
-#, fuzzy
-#| msgid "Rename table to"
-msgid "Replace table prefix"
-msgstr "Ailenwi tabl i"
-
-#: templates/structure/check_all_tables.phtml:30
-msgid "Copy table with prefix"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:36
-#, fuzzy
-#| msgid "Add %s column(s)"
-msgid "Add columns to central list"
-msgstr "Ychwanegwch %s colofn"
-
-#: templates/structure/check_all_tables.phtml:37
-msgid "Remove columns from central list"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:38
-#, fuzzy
-#| msgid "Add %s column(s)"
-msgid "Make consistent with central list"
-msgstr "Ychwanegwch %s colofn"
-
-#: templates/structure/display_structure.phtml:140 view_create.php:181
-#, fuzzy
-#| msgid "Print view"
-msgid "Edit view"
-msgstr "Argraffu golwg"
-
-#: templates/structure/display_table_stats.phtml:9
-msgid "Space usage"
-msgstr ""
-
-#: templates/structure/display_table_stats.phtml:27
-#: templates/structure/table_header.phtml:74
-msgid "Overhead"
-msgstr "Gorbenion"
-
-#: templates/structure/display_table_stats.phtml:32
-msgid "Effective"
-msgstr ""
-
-#: templates/structure/favorite_anchor.phtml:12
-#, fuzzy
-#| msgid "Add a new server"
-msgid "Add to Favorites"
-msgstr "Ychwanegwch weinydd newydd"
-
-#: templates/structure/move_columns_dialog.phtml:1
-#: templates/structure/optional_action_links.phtml:21
-#, fuzzy
-#| msgid "Add %s column(s)"
-msgid "Move columns"
-msgstr "Ychwanegwch %s colofn"
-
-#: templates/structure/move_columns_dialog.phtml:2
-msgid "Move the columns by dragging them up and down."
-msgstr ""
-
-#: templates/structure/optional_action_links.phtml:9
-msgid "Propose table structure"
-msgstr ""
-
-#: templates/structure/optional_action_links.phtml:24
-#, fuzzy
-#| msgid "Databases"
-msgid "Improve table structure"
-msgstr "Cronfeydd Data"
-
-#: templates/structure/optional_action_links.phtml:30
-#, fuzzy
-#| msgid "Track table"
-msgid "Track view"
-msgstr "Tracio tabl"
-
-#: templates/structure/row_stats_table.phtml:3
-#, fuzzy
-#| msgid "Show statistics"
-msgid "Row statistics"
-msgstr "Dangos ystadegau"
-
-#: templates/structure/row_stats_table.phtml:9
-msgid "static"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:11
-msgid "dynamic"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:22
-msgid "partitioned"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:54
-msgid "Row length"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:66
-msgid "Row size"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:73
-msgid "Next autoindex"
-msgstr ""
-
-#: templates/structure/secondary_tabs.phtml:14
-#, fuzzy
-#| msgid "Relational key"
-msgid "Relation view"
-msgstr "Allwedd perthynol"
-
-#: templates/structure/show_create.phtml:2
-#, fuzzy
-#| msgid "Show SQL queries"
-msgid "Showing create queries"
-msgstr "Dangos ymholiadau SQL"
-
-#: templates/structure/sortable_header.phtml:13
-msgid "Sort"
-msgstr "Trefnu"
-
-#: templates/structure/table_header.phtml:42
-msgid ""
-"May be approximate. Click on the number to get the exact count. See "
-"[doc@faq3-11]FAQ 3.11[/doc]."
-msgstr ""
-
-#: templates/structure/table_structure_row.phtml:46
-#, php-format
-msgid "Column %s has been dropped."
-msgstr ""
-
-#: templates/structure/tracking_icon.phtml:4
-msgid "Tracking is active."
-msgstr "Mae tracio'n weithredol."
-
-#: templates/structure/tracking_icon.phtml:8
-msgid "Tracking is not active."
-msgstr "Nid yw tracio'n weithredol."
-
-#: templates/table/create_table.phtml:15
-msgid "Number of columns"
-msgstr "Nifer y colofnau"
-
-#: templates/table/options.phtml:8
-msgid "Select columns (at least one):"
-msgstr ""
-
-#: templates/table/options.phtml:37
-msgid "Add search conditions (body of the \"where\" clause):"
-msgstr ""
-
-#: templates/table/options.phtml:45
-msgid "Number of rows per page"
-msgstr ""
-
-#: templates/table/options.phtml:56
-msgid "Display order:"
-msgstr ""
-
-#: templates/table/options_zoom.phtml:6
-msgid "Use this column to label each point"
-msgstr ""
-
-#: templates/table/options_zoom.phtml:35
-msgid "Maximum rows to plot"
-msgstr ""
-
-#: templates/table/replace_preview.phtml:13
-msgid "Find and replace - preview"
-msgstr ""
-
-#: templates/table/replace_preview.phtml:18
-#, fuzzy
-#| msgid "Original position"
-msgid "Original string"
-msgstr "Safle gwreiddiol"
-
-#: templates/table/replace_preview.phtml:19
-#, fuzzy
-#| msgid "Relations"
-msgid "Replaced string"
-msgstr "Perthnasau"
-
-#: templates/table/replace_preview.phtml:40
-#, fuzzy
-#| msgid "Replication"
-msgid "Replace"
-msgstr "Dyblygiad"
-
-#: templates/table/rows_zoom.phtml:16
-#, fuzzy
-#| msgid "in query"
-msgid "Additional search criteria"
-msgstr "mewn ymholiad"
-
-#: templates/table/search_and_replace.phtml:3
-#, fuzzy
-#| msgid "Replace NULL by"
-msgid "Replace with:"
-msgstr "Amnewid NULL gan"
-
-#: templates/table/search_and_replace.phtml:22
-#, fuzzy
-#| msgid "as regular expression"
-msgid "Use regular expression"
-msgstr "fel mynegiad arferol (regular expression)"
-
-#: templates/table/selection_form.phtml:12
-msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
-msgstr ""
-
-#: templates/table/selection_form.phtml:34
-msgid "Do a \"query by example\" (wildcard: \"%\")"
-msgstr ""
-
-#: templates/table/zoom_result_form.phtml:7
-msgid "Browse/Edit the points"
-msgstr ""
-
-#: templates/table/zoom_result_form.phtml:15
-#, fuzzy
-#| msgid "PHP extension to use"
-msgid "How to use"
-msgstr "Estyniad PHP i'w ddefnyddio"
-
-#: templates/table/zoom_result_form.phtml:23
-#, fuzzy
-#| msgid "Reset"
-msgid "Reset zoom"
-msgstr "Ailosod"
-
-#: templates/tbl_chart.phtml:17
+#: templates/table/chart/tbl_chart.phtml:17
 #, fuzzy
 #| msgid "Mar"
 msgctxt "Chart type"
 msgid "Bar"
 msgstr "Maw"
 
-#: templates/tbl_chart.phtml:21
+#: templates/table/chart/tbl_chart.phtml:21
 #, fuzzy
 #| msgid "Column"
 msgctxt "Chart type"
 msgid "Column"
 msgstr "Colofn"
 
-#: templates/tbl_chart.phtml:25
+#: templates/table/chart/tbl_chart.phtml:25
 msgctxt "Chart type"
 msgid "Line"
 msgstr ""
 
-#: templates/tbl_chart.phtml:29
+#: templates/table/chart/tbl_chart.phtml:29
 #, fuzzy
 #| msgid "Inline"
 msgctxt "Chart type"
 msgid "Spline"
 msgstr "Mewnol"
 
-#: templates/tbl_chart.phtml:33
+#: templates/table/chart/tbl_chart.phtml:33
 msgctxt "Chart type"
 msgid "Area"
 msgstr ""
 
-#: templates/tbl_chart.phtml:37
+#: templates/table/chart/tbl_chart.phtml:37
 #, fuzzy
 #| msgid "PiB"
 msgctxt "Chart type"
 msgid "Pie"
 msgstr "PiB"
 
-#: templates/tbl_chart.phtml:41
+#: templates/table/chart/tbl_chart.phtml:41
 #, fuzzy
 #| msgid "Time"
 msgctxt "Chart type"
 msgid "Timeline"
 msgstr "Amser"
 
-#: templates/tbl_chart.phtml:45
+#: templates/table/chart/tbl_chart.phtml:45
 msgctxt "Chart type"
 msgid "Scatter"
 msgstr ""
 
-#: templates/tbl_chart.phtml:50
+#: templates/table/chart/tbl_chart.phtml:50
 #, fuzzy
 #| msgid "Packed"
 msgid "Stacked"
 msgstr "Paciwyd"
 
-#: templates/tbl_chart.phtml:53
+#: templates/table/chart/tbl_chart.phtml:53
 #, fuzzy
 #| msgid "Report title"
 msgid "Chart title"
 msgstr "Teitl yr adroddiad"
 
-#: templates/tbl_chart.phtml:57
+#: templates/table/chart/tbl_chart.phtml:57
 msgid "X-Axis:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:72
+#: templates/table/chart/tbl_chart.phtml:72
 msgid "Series:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:102
+#: templates/table/chart/tbl_chart.phtml:102
 msgid "X-Axis label:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:104
+#: templates/table/chart/tbl_chart.phtml:104
 #, fuzzy
 #| msgid "Value"
 msgid "X Values"
 msgstr "Gwerth"
 
-#: templates/tbl_chart.phtml:107
+#: templates/table/chart/tbl_chart.phtml:107
 msgid "Y-Axis label:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:115
+#: templates/table/chart/tbl_chart.phtml:115
 msgid "Series names are in a column"
 msgstr ""
 
-#: templates/tbl_chart.phtml:118
+#: templates/table/chart/tbl_chart.phtml:118
 #, fuzzy
 #| msgid "Inside column:"
 msgid "Series column:"
 msgstr "Tu fewn colofn:"
 
-#: templates/tbl_chart.phtml:130
+#: templates/table/chart/tbl_chart.phtml:130
 #, fuzzy
 #| msgid "Number of columns"
 msgid "Value Column:"
 msgstr "Nifer y colofnau"
 
-#: templates/tbl_chart.phtml:150
+#: templates/table/chart/tbl_chart.phtml:150
 #, fuzzy
 #| msgid "Save as file"
 msgid "Save chart as image"
 msgstr "Cadw fel ffeil"
 
-#: templates/tbl_relation/common_form.phtml:7
+#: templates/table/gis_visualization/gis_visualization.phtml:3
+msgid "Display GIS Visualization"
+msgstr ""
+
+#: templates/table/gis_visualization/gis_visualization.phtml:8
+#, fuzzy
+#| msgid "Add/Delete columns"
+msgid "Label column"
+msgstr "Ychwanegu/Dileu colofnau"
+
+#: templates/table/gis_visualization/gis_visualization.phtml:11
+#, fuzzy
+#| msgid "- none -"
+msgid "-- None --"
+msgstr "-dim-"
+
+#: templates/table/gis_visualization/gis_visualization.phtml:19
+#, fuzzy
+#| msgid "Log file count"
+msgid "Spatial column"
+msgstr "Cyfrif ffeiliau log"
+
+#: templates/table/index_form.phtml:16
+msgid "Index name:"
+msgstr ""
+
+#: templates/table/index_form.phtml:19
+msgid ""
+"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
+msgstr ""
+
+#: templates/table/index_form.phtml:40
+#, fuzzy
+#| msgid "Index cache size"
+msgid "Index choice:"
+msgstr "Maint yr ystorfa indecs"
+
+#: templates/table/index_form.phtml:57
+msgid "Key block size:"
+msgstr ""
+
+#: templates/table/index_form.phtml:74
+msgid "Index type:"
+msgstr ""
+
+#: templates/table/index_form.phtml:86
+#, fuzzy
+#| msgid "User"
+msgid "Parser:"
+msgstr "Defnyddiwr"
+
+#: templates/table/index_form.phtml:102
+#, fuzzy
+#| msgid "Comment"
+msgid "Comment:"
+msgstr "Sylw"
+
+#: templates/table/index_form.phtml:149 templates/table/index_form.phtml:190
+msgid "Drag to reorder"
+msgstr ""
+
+#: templates/table/relation/common_form.phtml:7
 msgid "Internal relations"
 msgstr "Perthnasau mewnol"
 
-#: templates/tbl_relation/common_form.phtml:11
+#: templates/table/relation/common_form.phtml:11
 msgid "Internal relation"
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:14
+#: templates/table/relation/common_form.phtml:14
 msgid ""
 "An internal relation is not necessary when a corresponding FOREIGN KEY "
 "relation exists."
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:37
+#: templates/table/relation/common_form.phtml:37
 #, fuzzy
 #| msgid "Add constraints"
 msgid "Foreign key constraints"
 msgstr "Ychwanegwch cyfyngiadau"
 
-#: templates/tbl_relation/common_form.phtml:40
+#: templates/table/relation/common_form.phtml:40
 #, fuzzy
 #| msgid "Action"
 msgid "Actions"
 msgstr "Gweithred"
 
-#: templates/tbl_relation/common_form.phtml:41
+#: templates/table/relation/common_form.phtml:41
 #, fuzzy
 #| msgid "Routines"
 msgid "Constraint properties"
 msgstr "Rheolweithiau"
 
-#: templates/tbl_relation/common_form.phtml:44
+#: templates/table/relation/common_form.phtml:44
 msgid ""
 "Only columns with index will be displayed. You can define an index below."
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:49
+#: templates/table/relation/common_form.phtml:49
 msgid "Foreign key constraint"
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:81
+#: templates/table/relation/common_form.phtml:81
 #, fuzzy
 #| msgid "Add constraints"
 msgid "+ Add constraint"
 msgstr "Ychwanegwch cyfyngiadau"
 
-#: templates/tbl_relation/common_form.phtml:91
+#: templates/table/relation/common_form.phtml:91
 #, fuzzy
 #| msgid "Choose column to display"
 msgid "Choose column to display:"
 msgstr "Dewis colofn i'w dangos"
 
-#: templates/tbl_relation/foreign_key_row.phtml:13
+#: templates/table/relation/foreign_key_row.phtml:13
 #, fuzzy, php-format
 #| msgid "Add constraints"
 msgid "Foreign key constraint %s has been dropped"
 msgstr "Ychwanegwch cyfyngiadau"
 
-#: templates/tbl_relation/foreign_key_row.phtml:102
+#: templates/table/relation/foreign_key_row.phtml:102
 #, fuzzy
 #| msgid "Routines"
 msgid "Constraint name"
 msgstr "Rheolweithiau"
 
-#: templates/tbl_relation/foreign_key_row.phtml:157
+#: templates/table/relation/foreign_key_row.phtml:157
 #, fuzzy
 #| msgid "Add %s column(s)"
 msgid "+ Add column"
 msgstr "Ychwanegwch %s colofn"
 
+#: templates/table/search/options.phtml:8
+msgid "Select columns (at least one):"
+msgstr ""
+
+#: templates/table/search/options.phtml:37
+msgid "Add search conditions (body of the \"where\" clause):"
+msgstr ""
+
+#: templates/table/search/options.phtml:45
+msgid "Number of rows per page"
+msgstr ""
+
+#: templates/table/search/options.phtml:56
+msgid "Display order:"
+msgstr ""
+
+#: templates/table/search/options_zoom.phtml:6
+msgid "Use this column to label each point"
+msgstr ""
+
+#: templates/table/search/options_zoom.phtml:35
+msgid "Maximum rows to plot"
+msgstr ""
+
+#: templates/table/search/replace_preview.phtml:13
+msgid "Find and replace - preview"
+msgstr ""
+
+#: templates/table/search/replace_preview.phtml:18
+#, fuzzy
+#| msgid "Original position"
+msgid "Original string"
+msgstr "Safle gwreiddiol"
+
+#: templates/table/search/replace_preview.phtml:19
+#, fuzzy
+#| msgid "Relations"
+msgid "Replaced string"
+msgstr "Perthnasau"
+
+#: templates/table/search/replace_preview.phtml:40
+#, fuzzy
+#| msgid "Replication"
+msgid "Replace"
+msgstr "Dyblygiad"
+
+#: templates/table/search/rows_zoom.phtml:16
+#, fuzzy
+#| msgid "in query"
+msgid "Additional search criteria"
+msgstr "mewn ymholiad"
+
+#: templates/table/search/search_and_replace.phtml:3
+#, fuzzy
+#| msgid "Replace NULL by"
+msgid "Replace with:"
+msgstr "Amnewid NULL gan"
+
+#: templates/table/search/search_and_replace.phtml:22
+#, fuzzy
+#| msgid "as regular expression"
+msgid "Use regular expression"
+msgstr "fel mynegiad arferol (regular expression)"
+
+#: templates/table/search/selection_form.phtml:12
+msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
+msgstr ""
+
+#: templates/table/search/selection_form.phtml:34
+msgid "Do a \"query by example\" (wildcard: \"%\")"
+msgstr ""
+
+#: templates/table/search/zoom_result_form.phtml:7
+msgid "Browse/Edit the points"
+msgstr ""
+
+#: templates/table/search/zoom_result_form.phtml:15
+#, fuzzy
+#| msgid "PHP extension to use"
+msgid "How to use"
+msgstr "Estyniad PHP i'w ddefnyddio"
+
+#: templates/table/search/zoom_result_form.phtml:23
+#, fuzzy
+#| msgid "Reset"
+msgid "Reset zoom"
+msgstr "Ailosod"
+
+#: templates/table/secondary_tabs.phtml:14
+#, fuzzy
+#| msgid "Relational key"
+msgid "Relation view"
+msgstr "Allwedd perthynol"
+
+#: templates/table/structure/actions_in_table_structure.phtml:14
+#, php-format
+msgid "A primary key has been added on %s."
+msgstr ""
+
+#: templates/table/structure/actions_in_table_structure.phtml:34
+#: templates/table/structure/actions_in_table_structure.phtml:54
+#: templates/table/structure/actions_in_table_structure.phtml:79
+#: templates/table/structure/actions_in_table_structure.phtml:101
+#, php-format
+msgid "An index has been added on %s."
+msgstr ""
+
+#: templates/table/structure/actions_in_table_structure.phtml:130
+#: templates/table/structure/check_all_table_column.phtml:59
+#, fuzzy
+#| msgid "Remove database"
+msgid "Remove from central columns"
+msgstr "Tynnwch y gronfa ddata"
+
+#: templates/table/structure/actions_in_table_structure.phtml:138
+#: templates/table/structure/check_all_table_column.phtml:55
+#, fuzzy
+#| msgid "Add %s column(s)"
+msgid "Add to central columns"
+msgstr "Ychwanegwch %s colofn"
+
+#: templates/table/structure/add_column.phtml:7
+#, php-format
+msgid "Add %s column(s)"
+msgstr "Ychwanegwch %s colofn"
+
+#: templates/table/structure/add_column.phtml:12
+#, fuzzy
+#| msgid "Show dimension of tables"
+msgid "at beginning of table"
+msgstr "Dangos dimensiynau'r tabl"
+
+#: templates/table/structure/display_structure.phtml:140 view_create.php:181
+#, fuzzy
+#| msgid "Print view"
+msgid "Edit view"
+msgstr "Argraffu golwg"
+
+#: templates/table/structure/display_table_stats.phtml:9
+msgid "Space usage"
+msgstr ""
+
+#: templates/table/structure/display_table_stats.phtml:32
+msgid "Effective"
+msgstr ""
+
+#: templates/table/structure/move_columns_dialog.phtml:1
+#: templates/table/structure/optional_action_links.phtml:21
+#, fuzzy
+#| msgid "Add %s column(s)"
+msgid "Move columns"
+msgstr "Ychwanegwch %s colofn"
+
+#: templates/table/structure/move_columns_dialog.phtml:2
+msgid "Move the columns by dragging them up and down."
+msgstr ""
+
+#: templates/table/structure/optional_action_links.phtml:9
+msgid "Propose table structure"
+msgstr ""
+
+#: templates/table/structure/optional_action_links.phtml:24
+#, fuzzy
+#| msgid "Databases"
+msgid "Improve table structure"
+msgstr "Cronfeydd Data"
+
+#: templates/table/structure/optional_action_links.phtml:30
+#, fuzzy
+#| msgid "Track table"
+msgid "Track view"
+msgstr "Tracio tabl"
+
+#: templates/table/structure/row_stats_table.phtml:3
+#, fuzzy
+#| msgid "Show statistics"
+msgid "Row statistics"
+msgstr "Dangos ystadegau"
+
+#: templates/table/structure/row_stats_table.phtml:9
+msgid "static"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:11
+msgid "dynamic"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:22
+msgid "partitioned"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:54
+msgid "Row length"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:66
+msgid "Row size"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:73
+msgid "Next autoindex"
+msgstr ""
+
+#: templates/table/structure/table_structure_row.phtml:46
+#, php-format
+msgid "Column %s has been dropped."
+msgstr ""
+
 #: themes.php:17 themes.php:22
 msgid "Theme"
 msgstr ""
@@ -17394,6 +17417,11 @@ msgstr ""
 msgid "concurrent_insert is set to 0"
 msgstr ""
 
+#, fuzzy
+#~| msgid "Read misses"
+#~ msgid "Read as multibytes"
+#~ msgstr "Colledion darllen"
+
 #~ msgid "Relational display column"
 #~ msgstr "Colofn dangosydd perthynol"
 
diff --git a/po/da.po b/po/da.po
index 835f47579d..6152552e47 100644
--- a/po/da.po
+++ b/po/da.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 4.5.0-dev\n"
 "Report-Msgid-Bugs-To: developers@phpmyadmin.net\n"
-"POT-Creation-Date: 2015-08-08 13:53-0400\n"
+"POT-Creation-Date: 2015-08-12 08:10-0400\n"
 "PO-Revision-Date: 2015-06-10 23:07+0200\n"
 "Last-Translator: Aputsiaĸ Niels Janussen <aj@isit.gl>\n"
 "Language-Team: Danish <https://hosted.weblate.org/projects/phpmyadmin/master/"
@@ -52,7 +52,7 @@ msgid "Table comments:"
 msgstr "Tabelkommentarer:"
 
 #: db_datadict.php:104 libraries/Index.class.php:699
-#: libraries/insert_edit.lib.php:1567
+#: libraries/insert_edit.lib.php:1565
 #: libraries/navigation/Nodes/Node_Column.class.php:30
 #: libraries/plugins/export/ExportHtmlword.class.php:280
 #: libraries/plugins/export/ExportHtmlword.class.php:375
@@ -66,13 +66,14 @@ msgstr "Tabelkommentarer:"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1023
 #: libraries/tracking.lib.php:879 libraries/tracking.lib.php:975
 #: templates/columns_definitions/column_name.phtml:18
-#: templates/index_form.phtml:124 templates/table/table_header.phtml:6
-#: templates/table/zoom_result_form.phtml:33
-#: templates/tbl_relation/common_form.phtml:10
-#: templates/tbl_relation/common_form.phtml:43
-#: templates/tbl_relation/foreign_key_row.phtml:194
-#: templates/tbl_relation/foreign_key_row.phtml:206
-#: templates/tbl_relation/internal_relational_row.phtml:71
+#: templates/table/index_form.phtml:124
+#: templates/table/relation/common_form.phtml:10
+#: templates/table/relation/common_form.phtml:43
+#: templates/table/relation/foreign_key_row.phtml:194
+#: templates/table/relation/foreign_key_row.phtml:206
+#: templates/table/relation/internal_relational_row.phtml:71
+#: templates/table/search/table_header.phtml:6
+#: templates/table/search/zoom_result_form.phtml:33
 msgid "Column"
 msgstr "Kolonnenavn"
 
@@ -90,21 +91,21 @@ msgstr "Kolonnenavn"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1001
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1024
 #: libraries/rte/rte_list.lib.php:75 libraries/rte/rte_list.lib.php:103
-#: libraries/rte/rte_routines.lib.php:802
-#: libraries/rte/rte_routines.lib.php:831
-#: libraries/rte/rte_routines.lib.php:1493
+#: libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_routines.lib.php:922
+#: libraries/rte/rte_routines.lib.php:1584
 #: libraries/server_privileges.lib.php:2369 libraries/tracking.lib.php:880
 #: libraries/tracking.lib.php:972
 #: templates/columns_definitions/table_fields_definitions.phtml:11
-#: templates/structure/table_header.phtml:48
-#: templates/structure/table_structure_header.phtml:6
-#: templates/table/table_header.phtml:7
+#: templates/database/structure/table_header.phtml:48
+#: templates/table/search/table_header.phtml:7
+#: templates/table/structure/table_structure_header.phtml:6
 msgid "Type"
 msgstr "Datatype"
 
 #: db_datadict.php:106 libraries/Index.class.php:702
 #: libraries/central_columns.lib.php:708
-#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1576
+#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1574
 #: libraries/plugins/export/ExportHtmlword.class.php:286
 #: libraries/plugins/export/ExportHtmlword.class.php:381
 #: libraries/plugins/export/ExportLatex.class.php:509
@@ -117,8 +118,8 @@ msgstr "Datatype"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1026
 #: libraries/tracking.lib.php:882 libraries/tracking.lib.php:978
 #: templates/columns_definitions/table_fields_definitions.phtml:39
-#: templates/structure/table_structure_header.phtml:9
-#: templates/table/zoom_result_form.phtml:34
+#: templates/table/search/zoom_result_form.phtml:34
+#: templates/table/structure/table_structure_header.phtml:9
 msgid "Null"
 msgstr "Nulværdi"
 
@@ -136,8 +137,8 @@ msgstr "Nulværdi"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1027
 #: libraries/replication_gui.lib.php:153 libraries/tracking.lib.php:883
 #: templates/columns_definitions/table_fields_definitions.phtml:25
-#: templates/structure/body_for_table_summary.phtml:55
-#: templates/structure/table_structure_header.phtml:10
+#: templates/database/structure/body_for_table_summary.phtml:55
+#: templates/table/structure/table_structure_header.phtml:10
 msgid "Default"
 msgstr "Standardværdi"
 
@@ -165,19 +166,19 @@ msgid "Comments"
 msgstr "Kommentarer"
 
 #: db_datadict.php:146
-#: libraries/controllers/StructureController.class.php:1960
-#: libraries/controllers/StructureController.class.php:1965
+#: libraries/controllers/TableStructureController.class.php:951
+#: libraries/controllers/TableStructureController.class.php:956
 #: libraries/tracking.lib.php:922
 #: templates/columns_definitions/column_indexes.phtml:6
-#: templates/structure/check_all_table_column.phtml:22
-#: templates/structure/display_structure.phtml:74
+#: templates/table/structure/check_all_table_column.phtml:22
+#: templates/table/structure/display_structure.phtml:74
 msgid "Primary"
 msgstr "Primær"
 
 #: db_datadict.php:156 js/messages.php:317 libraries/Index.class.php:567
 #: libraries/Index.class.php:606 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261 libraries/mult_submits.lib.php:403
+#: libraries/config/FormDisplay.tpl.php:272 libraries/mult_submits.lib.php:403
 #: libraries/mult_submits.lib.php:417
 #: libraries/plugins/export/ExportHtmlword.class.php:630
 #: libraries/plugins/export/ExportLatex.class.php:589
@@ -193,20 +194,20 @@ msgstr "Primær"
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1010 libraries/tracking.lib.php:1015
 #: prefs_manage.php:140 templates/prefs_autoload.phtml:15
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "No"
 msgstr "Nej"
 
 #: db_datadict.php:156 js/messages.php:443 libraries/Index.class.php:568
 #: libraries/Index.class.php:605 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261
-#: libraries/controllers/StructureController.class.php:1344
-#: libraries/controllers/StructureController.class.php:2223
-#: libraries/controllers/StructureController.class.php:2232
-#: libraries/controllers/StructureController.class.php:2237
-#: libraries/controllers/StructureController.class.php:2242
-#: libraries/controllers/StructureController.class.php:2247
+#: libraries/config/FormDisplay.tpl.php:272
+#: libraries/controllers/TableStructureController.class.php:539
+#: libraries/controllers/TableStructureController.class.php:1201
+#: libraries/controllers/TableStructureController.class.php:1210
+#: libraries/controllers/TableStructureController.class.php:1215
+#: libraries/controllers/TableStructureController.class.php:1220
+#: libraries/controllers/TableStructureController.class.php:1225
 #: libraries/mult_submits.inc.php:82 libraries/mult_submits.inc.php:178
 #: libraries/mult_submits.lib.php:339 libraries/mult_submits.lib.php:372
 #: libraries/mult_submits.lib.php:401 libraries/mult_submits.lib.php:415
@@ -215,8 +216,8 @@ msgstr "Nej"
 #: libraries/plugins/export/ExportOdt.class.php:756
 #: libraries/plugins/export/ExportTexytext.class.php:567
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1077
-#: libraries/server_databases.lib.php:464
-#: libraries/server_databases.lib.php:474
+#: libraries/server_databases.lib.php:475
+#: libraries/server_databases.lib.php:485
 #: libraries/server_privileges.lib.php:2546
 #: libraries/server_privileges.lib.php:2727
 #: libraries/server_privileges.lib.php:2748
@@ -226,7 +227,7 @@ msgstr "Nej"
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1008 libraries/tracking.lib.php:1013
 #: prefs_manage.php:138 templates/prefs_autoload.phtml:14
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "Yes"
 msgstr "Ja"
 
@@ -236,7 +237,7 @@ msgstr "Vis dump (skema) af database"
 
 #: db_export.php:37 db_tracking.php:90 export.php:382
 #: libraries/DBQbe.class.php:326
-#: libraries/controllers/StructureController.class.php:231
+#: libraries/controllers/DatabaseStructureController.class.php:170
 #: libraries/navigation/NavigationTree.class.php:897
 msgid "No tables found in database."
 msgstr "Ingen tabeller fundet i databasen."
@@ -247,14 +248,14 @@ msgstr "Ingen tabeller fundet i databasen."
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:26
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:120
-#: templates/structure/show_create.phtml:18
+#: templates/database/structure/show_create.phtml:18
 msgid "Tables"
 msgstr "Tabeller"
 
 #: db_export.php:52 libraries/Menu.class.php:317 libraries/Menu.class.php:425
-#: libraries/Util.class.php:3333 libraries/Util.class.php:3343
-#: libraries/Util.class.php:3349 libraries/Util.class.php:3629
-#: libraries/Util.class.php:4327 libraries/Util.class.php:4344
+#: libraries/Util.class.php:3339 libraries/Util.class.php:3349
+#: libraries/Util.class.php:3355 libraries/Util.class.php:3635
+#: libraries/Util.class.php:4333 libraries/Util.class.php:4350
 #: libraries/central_columns.lib.php:728 libraries/config.values.php:39
 #: libraries/config.values.php:47 libraries/config.values.php:109
 #: libraries/config.values.php:115 libraries/config/setup.forms.php:323
@@ -268,7 +269,7 @@ msgstr "Tabeller"
 #: libraries/navigation/Nodes/Node_Table.class.php:283
 #: libraries/server_privileges.lib.php:1141 libraries/tracking.lib.php:874
 #: templates/columns_definitions/table_fields_definitions.phtml:3
-#: templates/designer/table_list.phtml:28
+#: templates/database/designer/table_list.phtml:28
 msgid "Structure"
 msgstr "Struktur"
 
@@ -280,7 +281,7 @@ msgstr "Struktur"
 #: libraries/config/user_preferences.forms.php:292
 #: libraries/config/user_preferences.forms.php:297
 #: libraries/server_privileges.lib.php:1140
-#: templates/structure/display_table_stats.phtml:12
+#: templates/table/structure/display_table_stats.phtml:12
 msgid "Data"
 msgstr "Data"
 
@@ -355,10 +356,10 @@ msgstr "Sporede tabeller"
 #: libraries/server_privileges.lib.php:2908
 #: libraries/server_privileges.lib.php:3145
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4346
-#: templates/structure/table_header.phtml:21
-#: templates/tbl_relation/foreign_key_row.phtml:176
-#: templates/tbl_relation/internal_relational_row.phtml:63
+#: libraries/server_privileges.lib.php:4372
+#: templates/database/structure/table_header.phtml:21
+#: templates/table/relation/foreign_key_row.phtml:176
+#: templates/table/relation/internal_relational_row.phtml:63
 msgid "Table"
 msgstr "Tabel"
 
@@ -375,7 +376,7 @@ msgid "Updated"
 msgstr "Opdateret"
 
 #: db_tracking.php:130 js/messages.php:243 libraries/Menu.class.php:552
-#: libraries/Util.class.php:4314 libraries/config.values.php:104
+#: libraries/Util.class.php:4320 libraries/config.values.php:104
 #: libraries/rte/rte_events.lib.php:393 libraries/rte/rte_list.lib.php:101
 #: libraries/server_status_processes.lib.php:92 libraries/tracking.lib.php:279
 msgid "Status"
@@ -384,14 +385,15 @@ msgstr "Status"
 #: db_tracking.php:131 db_tracking.php:290 libraries/Index.class.php:693
 #: libraries/central_columns.lib.php:687 libraries/rte/rte_list.lib.php:74
 #: libraries/rte/rte_list.lib.php:89 libraries/rte/rte_list.lib.php:102
-#: libraries/server_databases.lib.php:398
+#: libraries/server_databases.lib.php:409
 #: libraries/server_privileges.lib.php:2372
 #: libraries/server_privileges.lib.php:3166
 #: libraries/server_privileges.lib.php:3342
 #: libraries/server_user_groups.lib.php:82
 #: libraries/server_variables.lib.php:189 libraries/tracking.lib.php:280
-#: libraries/tracking.lib.php:793 templates/structure/table_header.phtml:30
-#: templates/structure/table_structure_header.phtml:23
+#: libraries/tracking.lib.php:793
+#: templates/database/structure/table_header.phtml:30
+#: templates/table/structure/table_structure_header.phtml:23
 msgid "Action"
 msgstr "Handling"
 
@@ -433,7 +435,7 @@ msgid "Untracked tables"
 msgstr "Ikke-sporede tabeller"
 
 #: db_tracking.php:305 db_tracking.php:336
-#: templates/structure/optional_action_links.phtml:17
+#: templates/table/structure/optional_action_links.phtml:17
 msgid "Track table"
 msgstr "Sporingstabel"
 
@@ -488,7 +490,7 @@ msgid "Value for the column \"%s\""
 msgstr "Værdi for kolonnen \"%s\""
 
 #: gis_data_editor.php:146
-#: templates/gis_visualization/gis_visualization.phtml:37
+#: templates/table/gis_visualization/gis_visualization.phtml:37
 msgid "Use OpenStreetMaps as Base Layer"
 msgstr "Brug OpenStreetMaps som basislag"
 
@@ -568,35 +570,35 @@ msgstr "Tilføj geometri"
 #: libraries/display_change_password.lib.php:162
 #: libraries/display_export.lib.php:402 libraries/display_export.lib.php:408
 #: libraries/display_import.lib.php:392 libraries/index.lib.php:44
-#: libraries/insert_edit.lib.php:1546 libraries/insert_edit.lib.php:1583
+#: libraries/insert_edit.lib.php:1544 libraries/insert_edit.lib.php:1581
 #: libraries/normalization.lib.php:165 libraries/normalization.lib.php:821
 #: libraries/operations.lib.php:38 libraries/operations.lib.php:108
 #: libraries/operations.lib.php:263 libraries/operations.lib.php:306
 #: libraries/operations.lib.php:801 libraries/operations.lib.php:874
 #: libraries/operations.lib.php:923 libraries/operations.lib.php:1337
 #: libraries/operations.lib.php:1658
-#: libraries/plugins/auth/AuthenticationCookie.class.php:244
+#: libraries/plugins/auth/AuthenticationCookie.class.php:232
 #: libraries/replication_gui.lib.php:122 libraries/replication_gui.lib.php:161
 #: libraries/replication_gui.lib.php:324 libraries/replication_gui.lib.php:461
 #: libraries/replication_gui.lib.php:906 libraries/rte/rte_events.lib.php:509
-#: libraries/rte/rte_routines.lib.php:969
-#: libraries/rte/rte_routines.lib.php:1581
+#: libraries/rte/rte_routines.lib.php:1060
+#: libraries/rte/rte_routines.lib.php:1672
 #: libraries/rte/rte_triggers.lib.php:396 libraries/server_bin_log.lib.php:61
 #: libraries/server_privileges.lib.php:705
 #: libraries/server_privileges.lib.php:2106
 #: libraries/server_privileges.lib.php:2872
 #: libraries/server_privileges.lib.php:3553
-#: libraries/server_privileges.lib.php:4627
+#: libraries/server_privileges.lib.php:4653
 #: libraries/server_user_groups.lib.php:285
 #: libraries/sql_query_form.lib.php:369 libraries/sql_query_form.lib.php:429
 #: libraries/tracking.lib.php:533 libraries/tracking.lib.php:653
 #: prefs_manage.php:277 prefs_manage.php:355
 #: templates/columns_definitions/column_definitions_form.phtml:59
-#: templates/header_location.phtml:17 templates/index_form.phtml:238
+#: templates/database/create_table.phtml:21 templates/header_location.phtml:28
 #: templates/startAndNumberOfRowsPanel.phtml:14
-#: templates/structure/add_column.phtml:25
-#: templates/table/create_table.phtml:21
-#: templates/table/selection_form.phtml:75 view_create.php:275
+#: templates/table/index_form.phtml:238
+#: templates/table/search/selection_form.phtml:75
+#: templates/table/structure/add_column.phtml:25 view_create.php:275
 #: view_operations.php:106
 msgid "Go"
 msgstr "Udfør"
@@ -687,7 +689,7 @@ msgstr ""
 msgid "Could not load import plugins, please check your installation!"
 msgstr "Kunne ikke indlæse importplugins, tjek venligst din installation!"
 
-#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1466
+#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1460
 #, php-format
 msgid "Bookmark %s has been created."
 msgstr "Bogmærket %s er blevet oprettet."
@@ -726,11 +728,11 @@ msgstr "Kunne ikke indlæse hvor langt importen er nået."
 msgid "Back"
 msgstr "Tilbage"
 
-#: index.php:148 libraries/Footer.class.php:70
+#: index.php:149 libraries/Footer.class.php:70
 msgid "phpMyAdmin Demo Server"
 msgstr "phpMyAdmin - demoserver"
 
-#: index.php:152
+#: index.php:153
 #, php-format
 msgid ""
 "You are using the demo server. You can do anything here, but please do not "
@@ -740,110 +742,110 @@ msgstr ""
 "Du anvender demoserveren. Du kan foretage alt her, men undlad venligst at "
 "rette root, debian-sys-maint og pma-brugere. Mere information fås på %s."
 
-#: index.php:162
+#: index.php:163
 msgid "General Settings"
 msgstr "Generelle indstillinger"
 
-#: index.php:190 libraries/display_change_password.lib.php:50
+#: index.php:191 libraries/display_change_password.lib.php:50
 #: libraries/display_change_password.lib.php:53 user_password.php:247
 msgid "Change password"
 msgstr "Skift adgangskode"
 
-#: index.php:206
+#: index.php:207
 msgid "Server connection collation"
 msgstr "Servers forbindelsestegnsæt"
 
-#: index.php:228
+#: index.php:229
 msgid "Appearance Settings"
 msgstr "Indstillinger for udseende"
 
-#: index.php:258 prefs_manage.php:285
+#: index.php:259 prefs_manage.php:285
 msgid "More settings"
 msgstr "Flere indstillinger"
 
-#: index.php:279
+#: index.php:280
 msgid "Database server"
 msgstr "Database-server"
 
-#: index.php:282 libraries/plugins/auth/AuthenticationCookie.class.php:181
+#: index.php:283 libraries/plugins/auth/AuthenticationCookie.class.php:169
 msgid "Server:"
 msgstr "Server:"
 
-#: index.php:286
+#: index.php:287
 msgid "Server type:"
 msgstr "Servertype:"
 
-#: index.php:290 libraries/plugins/export/ExportLatex.class.php:212
+#: index.php:291 libraries/plugins/export/ExportLatex.class.php:212
 #: libraries/plugins/export/ExportSql.class.php:687
 #: libraries/plugins/export/ExportXml.class.php:189
 msgid "Server version:"
 msgstr "Serverversion:"
 
-#: index.php:296
+#: index.php:297
 msgid "Protocol version:"
 msgstr "Protokolversion:"
 
-#: index.php:300
+#: index.php:301
 msgid "User:"
 msgstr "Bruger:"
 
-#: index.php:305
+#: index.php:306
 msgid "Server charset:"
 msgstr "Servers tegnsæt:"
 
-#: index.php:320
+#: index.php:321
 msgid "Web server"
 msgstr "Webserver"
 
-#: index.php:331
+#: index.php:332
 msgid "Database client version:"
 msgstr "Databaseklientversion:"
 
-#: index.php:335
+#: index.php:336
 msgid "PHP extension:"
 msgstr "PHP-udvidelse:"
 
-#: index.php:349
+#: index.php:350
 msgid "PHP version:"
 msgstr "PHP-version:"
 
-#: index.php:360
+#: index.php:361
 msgid "Show PHP information"
 msgstr "Vis PHP-information"
 
-#: index.php:383
+#: index.php:384
 msgid "Version information:"
 msgstr "Versionsinformation:"
 
-#: index.php:392 libraries/Util.class.php:432 libraries/Util.class.php:495
-#: libraries/config/FormDisplay.tpl.php:151
+#: index.php:393 libraries/Util.class.php:432 libraries/Util.class.php:495
+#: libraries/config/FormDisplay.tpl.php:162
 #: libraries/display_export.lib.php:577 libraries/engines/pbxt.lib.php:162
 #: libraries/navigation/NavigationHeader.class.php:196
 #: libraries/server_variables.lib.php:160
 msgid "Documentation"
 msgstr "Dokumentation"
 
-#: index.php:399
+#: index.php:400
 msgid "Wiki"
 msgstr "Wiki"
 
-#: index.php:408
+#: index.php:409
 msgid "Official Homepage"
 msgstr "Officiel phpMyAdmin hjemmeside"
 
-#: index.php:415
+#: index.php:416
 msgid "Contribute"
 msgstr "Deltag"
 
-#: index.php:422
+#: index.php:423
 msgid "Get support"
 msgstr "Få support"
 
-#: index.php:429
+#: index.php:430
 msgid "List of changes"
 msgstr "Liste over ændringer"
 
-#: index.php:451
+#: index.php:452
 msgid ""
 "You are connected as 'root' with no password, which corresponds to the "
 "default MySQL privileged account. Your MySQL server is running with this "
@@ -856,7 +858,7 @@ msgstr ""
 "gøre noget ved dette sikkerhedshul, ved at sætte et kodeord til brugeren "
 "\"root\"."
 
-#: index.php:468
+#: index.php:469
 msgid ""
 "You have enabled mbstring.func_overload in your PHP configuration. This "
 "option is incompatible with phpMyAdmin and might cause some data to be "
@@ -866,7 +868,7 @@ msgstr ""
 "indstilling er ikke kompatibel med phpMyAdmin og kan forårsage ødelæggelse "
 "af nogle data!"
 
-#: index.php:483
+#: index.php:484
 msgid ""
 "The mbstring PHP extension was not found and you seem to be using a "
 "multibyte charset. Without the mbstring extension phpMyAdmin is unable to "
@@ -876,7 +878,7 @@ msgstr ""
 "multibyte tegnsæt. Uden mbstring-udvidelsen er phpMyAdmin ude af stand til "
 "at opdele strenge korrekt og dette kan forårsage uventede resultater."
 
-#: index.php:500
+#: index.php:501
 msgid ""
 "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini."
 "session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower than "
@@ -888,7 +890,7 @@ msgstr ""
 "cookie-gyldigheden konfigureret i phpMyAdmin; på grund af dette kan din "
 "logind-session udløbe tidligere end det som er konfigureret i phpMyAdmin."
 
-#: index.php:519
+#: index.php:520
 msgid ""
 "Login cookie store is lower than cookie validity configured in phpMyAdmin, "
 "because of this, your login will expire sooner than configured in phpMyAdmin."
@@ -897,12 +899,12 @@ msgstr ""
 "phpMyAdmin. På grund af dette, vil din login udløbe tidligere end "
 "konfigureret i phpMyAdmin."
 
-#: index.php:535
+#: index.php:536
 msgid "The configuration file now needs a secret passphrase (blowfish_secret)."
 msgstr ""
 "Konfigurationsfilen skal nu bruge et hemmeligt kodeord (blowfish_secret)."
 
-#: index.php:548
+#: index.php:549
 msgid ""
 "Directory [code]config[/code], which is used by the setup script, still "
 "exists in your phpMyAdmin directory. It is strongly recommended to remove it "
@@ -915,7 +917,7 @@ msgstr ""
 "din server kompromitteres, ved at personer uden adgangstilladelse henter din "
 "konfiguration."
 
-#: index.php:564
+#: index.php:565
 #, php-format
 msgid ""
 "The phpMyAdmin configuration storage is not completely configured, some "
@@ -924,14 +926,14 @@ msgstr ""
 "phpMyAdmin configuration storage er ikke fuldstændigt konfigureret; nogle "
 "udvidede funktioner er blevet deaktiverede. %sFind ud af hvorfor%s. "
 
-#: index.php:571
+#: index.php:572
 msgid ""
 "Or alternately go to 'Operations' tab of any database to set it up there."
 msgstr ""
 "Gå eventuelt til fanen 'Handlinger' tilhørende enhver database for at "
 "opsætte den dér."
 
-#: index.php:620
+#: index.php:621
 #, php-format
 msgid ""
 "Your PHP MySQL library version %s differs from your MySQL server version %s. "
@@ -940,7 +942,7 @@ msgstr ""
 "Din PHP MySQL-biblioteks version %s afviger fra din MySQL server version %s. "
 "Dette kan forårsage uforudsigelige resultater."
 
-#: index.php:648
+#: index.php:649
 #, php-format
 msgid ""
 "Server running with Suhosin. Please refer to %sdocumentation%s for possible "
@@ -1097,8 +1099,8 @@ msgstr ""
 msgid "Save & Close"
 msgstr "Gem & luk"
 
-#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:404
-#: libraries/insert_edit.lib.php:1550 prefs_manage.php:361
+#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:415
+#: libraries/insert_edit.lib.php:1548 prefs_manage.php:361
 #: prefs_manage.php:372
 msgid "Reset"
 msgstr "Nulstil"
@@ -1131,7 +1133,7 @@ msgstr "Tilføj indeks"
 msgid "Edit Index"
 msgstr "Redigér indeks"
 
-#: js/messages.php:99 templates/index_form.phtml:232
+#: js/messages.php:99 templates/table/index_form.phtml:232
 #, php-format
 msgid "Add %s column(s) to index"
 msgstr "Tilføj %s kolonne(r) til indeks"
@@ -1152,13 +1154,14 @@ msgstr "Sammensat af:"
 msgid "Please select column(s) for the index."
 msgstr "Tilføj venligst kolonne(r) til indekset."
 
-#: js/messages.php:106 templates/structure/add_column.phtml:1
+#: js/messages.php:106 templates/table/structure/add_column.phtml:1
 msgid "You have to add at least one column."
 msgstr "Du skal tilføje mindst en kolonne."
 
-#: js/messages.php:109 libraries/insert_edit.lib.php:1548
+#: js/messages.php:109 libraries/insert_edit.lib.php:1546
 #: templates/columns_definitions/column_definitions_form.phtml:162
-#: templates/index_form.phtml:237 templates/tbl_relation/common_form.phtml:106
+#: templates/table/index_form.phtml:237
+#: templates/table/relation/common_form.phtml:106
 msgid "Preview SQL"
 msgstr "Forhåndsvis SQL"
 
@@ -1175,7 +1178,7 @@ msgid "SQL query:"
 msgstr "SQL-forespørgsel:"
 
 #. l10n: Default label for the y-Axis of Charts
-#: js/messages.php:118 templates/tbl_chart.phtml:109
+#: js/messages.php:118 templates/table/chart/tbl_chart.phtml:109
 msgid "Y Values"
 msgstr "Y-værdier"
 
@@ -1336,7 +1339,7 @@ msgstr "Bytes sendt"
 msgid "Bytes received"
 msgstr "Bytes modtaget"
 
-#: js/messages.php:169 libraries/server_status.lib.php:226
+#: js/messages.php:169 libraries/server_status.lib.php:235
 msgid "Connections"
 msgstr "Forbindelser"
 
@@ -1393,12 +1396,12 @@ msgstr "%d tabel(ler)"
 msgid "Questions"
 msgstr "Spørgsmål"
 
-#: js/messages.php:184 libraries/server_status.lib.php:134
+#: js/messages.php:184 libraries/server_status.lib.php:143
 msgid "Traffic"
 msgstr "Trafik"
 
 #: js/messages.php:185 libraries/Menu.class.php:586
-#: libraries/Util.class.php:4318 libraries/server_status_monitor.lib.php:257
+#: libraries/Util.class.php:4324 libraries/server_status_monitor.lib.php:257
 msgid "Settings"
 msgstr "Indstillinger"
 
@@ -1418,8 +1421,9 @@ msgstr "Tilføj mindst en variabel til serien!"
 #: libraries/server_status_monitor.lib.php:236
 #: libraries/server_status_processes.lib.php:308
 #: templates/columns_definitions/transformation.phtml:4
-#: templates/designer/options_panel.phtml:178
-#: templates/table/options_zoom.phtml:12 templates/table/rows_zoom.phtml:26
+#: templates/database/designer/options_panel.phtml:178
+#: templates/table/search/options_zoom.phtml:12
+#: templates/table/search/rows_zoom.phtml:26
 msgid "None"
 msgstr "Ingen"
 
@@ -1708,8 +1712,8 @@ msgstr ""
 
 #: js/messages.php:270 libraries/Menu.class.php:352
 #: libraries/Menu.class.php:455 libraries/Menu.class.php:582
-#: libraries/Util.class.php:4317 libraries/Util.class.php:4332
-#: libraries/Util.class.php:4349 libraries/config/messages.inc.php:258
+#: libraries/Util.class.php:4323 libraries/Util.class.php:4338
+#: libraries/Util.class.php:4355 libraries/config/messages.inc.php:258
 #: libraries/display_import.lib.php:105
 #: libraries/server_status_monitor.lib.php:318 prefs_manage.php:238
 #: setup/frames/menu.inc.php:26
@@ -1769,13 +1773,13 @@ msgid "Formatting SQL..."
 msgstr "Formatterer SQL ..."
 
 #: js/messages.php:293 libraries/server_variables.lib.php:157
-#: templates/designer/aggregate_query_panel.phtml:63
-#: templates/designer/delete_relation_panel.phtml:28
-#: templates/designer/having_query_panel.phtml:117
-#: templates/designer/new_relation_panel.phtml:88
-#: templates/designer/options_panel.phtml:253
-#: templates/designer/rename_to_panel.phtml:45
-#: templates/designer/where_query_panel.phtml:83
+#: templates/database/designer/aggregate_query_panel.phtml:63
+#: templates/database/designer/delete_relation_panel.phtml:28
+#: templates/database/designer/having_query_panel.phtml:117
+#: templates/database/designer/new_relation_panel.phtml:88
+#: templates/database/designer/options_panel.phtml:253
+#: templates/database/designer/rename_to_panel.phtml:45
+#: templates/database/designer/where_query_panel.phtml:83
 msgid "Cancel"
 msgstr "Annuller"
 
@@ -1783,7 +1787,7 @@ msgstr "Annuller"
 msgid "Page-related settings"
 msgstr "Siderelaterede indstillinger"
 
-#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:402
+#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:413
 msgid "Apply"
 msgstr "Anvend"
 
@@ -1818,8 +1822,8 @@ msgstr "Fejlkode: %s"
 msgid "Error text: %s"
 msgstr "Fejltekst: %s"
 
-#: js/messages.php:307 libraries/db_common.inc.php:68
-#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:450
+#: js/messages.php:307 libraries/db_common.inc.php:69
+#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:461
 msgid "No databases selected."
 msgstr "Ingen databaser valgt."
 
@@ -1831,12 +1835,13 @@ msgstr "Sletter kolonne"
 msgid "Adding Primary Key"
 msgstr "Tilføjer primær nøgle"
 
-#: js/messages.php:310 templates/designer/aggregate_query_panel.phtml:59
-#: templates/designer/having_query_panel.phtml:113
-#: templates/designer/new_relation_panel.phtml:87
-#: templates/designer/options_panel.phtml:252
-#: templates/designer/rename_to_panel.phtml:41
-#: templates/designer/where_query_panel.phtml:82
+#: js/messages.php:310
+#: templates/database/designer/aggregate_query_panel.phtml:59
+#: templates/database/designer/having_query_panel.phtml:113
+#: templates/database/designer/new_relation_panel.phtml:87
+#: templates/database/designer/options_panel.phtml:252
+#: templates/database/designer/rename_to_panel.phtml:41
+#: templates/database/designer/where_query_panel.phtml:82
 msgid "OK"
 msgstr "OK"
 
@@ -1856,7 +1861,7 @@ msgstr "Kopierer database til"
 msgid "Changing Charset"
 msgstr "Ændrer tegnsæt"
 
-#: js/messages.php:320 libraries/Util.class.php:3217
+#: js/messages.php:320 libraries/Util.class.php:3223
 msgid "Enable foreign key checks"
 msgstr "Slå fremmednøgle-checks til"
 
@@ -1893,20 +1898,21 @@ msgstr ""
 #: js/messages.php:334 libraries/DisplayResults.class.php:4834
 #: libraries/DisplayResults.class.php:5092 libraries/Menu.class.php:344
 #: libraries/Menu.class.php:446 libraries/Menu.class.php:578
-#: libraries/Util.class.php:3636 libraries/Util.class.php:3637
-#: libraries/Util.class.php:4316 libraries/Util.class.php:4331
-#: libraries/Util.class.php:4348 libraries/config/messages.inc.php:252
+#: libraries/Util.class.php:3642 libraries/Util.class.php:3643
+#: libraries/Util.class.php:4322 libraries/Util.class.php:4337
+#: libraries/Util.class.php:4354 libraries/config/messages.inc.php:252
 #: libraries/display_export.lib.php:173 libraries/rte/rte_list.lib.php:146
 #: libraries/server_privileges.lib.php:2211
 #: libraries/server_privileges.lib.php:2290
 #: libraries/server_privileges.lib.php:2632
 #: libraries/server_privileges.lib.php:3356
 #: libraries/server_status_monitor.lib.php:322 prefs_manage.php:303
-#: setup/frames/menu.inc.php:27 templates/structure/check_all_tables.phtml:11
+#: setup/frames/menu.inc.php:27
+#: templates/database/structure/check_all_tables.phtml:11
 msgid "Export"
 msgstr "Eksportér"
 
-#: js/messages.php:337 libraries/rte/rte_routines.lib.php:652
+#: js/messages.php:337 libraries/rte/rte_routines.lib.php:743
 msgid "ENUM/SET editor"
 msgstr "ENUM/SET-redigeringsværktøj"
 
@@ -1946,7 +1952,7 @@ msgstr "Vis forespørgselsbox"
 #: libraries/Console.class.php:214 libraries/DisplayResults.class.php:3474
 #: libraries/DisplayResults.class.php:4818 libraries/Index.class.php:723
 #: libraries/Util.class.php:706 libraries/Util.class.php:1202
-#: libraries/Util.class.php:3634 libraries/Util.class.php:3635
+#: libraries/Util.class.php:3640 libraries/Util.class.php:3641
 #: libraries/central_columns.lib.php:851
 #: libraries/central_columns.lib.php:1193
 #: libraries/config/messages.inc.php:892
@@ -1964,7 +1970,7 @@ msgstr "Ret"
 #: libraries/server_user_groups.lib.php:129
 #: libraries/sql_query_form.lib.php:416 libraries/tracking.lib.php:477
 #: setup/frames/index.inc.php:183 setup/frames/index.inc.php:291
-#: templates/designer/delete_relation_panel.phtml:27
+#: templates/database/designer/delete_relation_panel.phtml:27
 msgid "Delete"
 msgstr "Slet"
 
@@ -2133,11 +2139,11 @@ msgid "No dependencies selected!"
 msgstr "Der er ikke valgt afhængigheder!"
 
 #: js/messages.php:394 libraries/central_columns.lib.php:1214
-#: libraries/insert_edit.lib.php:1458 libraries/server_variables.lib.php:155
+#: libraries/insert_edit.lib.php:1456 libraries/server_variables.lib.php:155
 #: setup/frames/config.inc.php:42 setup/frames/index.inc.php:279
 #: templates/columns_definitions/column_definitions_form.phtml:165
-#: templates/gis_visualization/gis_visualization.phtml:48
-#: templates/tbl_relation/common_form.phtml:107
+#: templates/table/gis_visualization/gis_visualization.phtml:48
+#: templates/table/relation/common_form.phtml:107
 msgid "Save"
 msgstr "Gem"
 
@@ -2217,8 +2223,8 @@ msgid "Data point content"
 msgstr "Datapunkt-indhold"
 
 #: js/messages.php:430 js/messages.php:562 js/messages.php:579
-#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2573
-#: templates/index_form.phtml:154 templates/index_form.phtml:194
+#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2571
+#: templates/table/index_form.phtml:154 templates/table/index_form.phtml:194
 msgid "Ignore"
 msgstr "Ignorer"
 
@@ -2279,8 +2285,8 @@ msgstr "Vælg fremmednøgle"
 msgid "Please select the primary key or a unique key!"
 msgstr "Vælg venligst den primære nøgle eller en unik nøgle!"
 
-#: js/messages.php:457 templates/designer/side_menu.phtml:91
-#: templates/designer/side_menu.phtml:94
+#: js/messages.php:457 templates/database/designer/side_menu.phtml:91
+#: templates/database/designer/side_menu.phtml:94
 msgid "Choose column to display"
 msgstr "Vælg kolonne til visning"
 
@@ -2296,18 +2302,18 @@ msgstr ""
 msgid "Page name"
 msgstr "Sidenavn"
 
-#: js/messages.php:463 templates/designer/side_menu.phtml:56
-#: templates/designer/side_menu.phtml:59
+#: js/messages.php:463 templates/database/designer/side_menu.phtml:56
+#: templates/database/designer/side_menu.phtml:59
 msgid "Save page"
 msgstr "Gem side"
 
-#: js/messages.php:464 templates/designer/side_menu.phtml:63
-#: templates/designer/side_menu.phtml:66
+#: js/messages.php:464 templates/database/designer/side_menu.phtml:63
+#: templates/database/designer/side_menu.phtml:66
 msgid "Save page as"
 msgstr "Gem side som"
 
-#: js/messages.php:465 templates/designer/side_menu.phtml:49
-#: templates/designer/side_menu.phtml:52
+#: js/messages.php:465 templates/database/designer/side_menu.phtml:49
+#: templates/database/designer/side_menu.phtml:52
 msgid "Open page"
 msgstr "Åbn side"
 
@@ -2315,7 +2321,7 @@ msgstr "Åbn side"
 msgid "Delete page"
 msgstr "Slet side"
 
-#: js/messages.php:467 templates/designer/side_menu.phtml:10
+#: js/messages.php:467 templates/database/designer/side_menu.phtml:10
 msgid "Untitled"
 msgstr "Unavngivet"
 
@@ -2436,7 +2442,7 @@ msgstr "Oprindelige længde"
 msgid "cancel"
 msgstr "annullér"
 
-#: js/messages.php:499 libraries/server_status.lib.php:271
+#: js/messages.php:499 libraries/server_status.lib.php:280
 msgid "Aborted"
 msgstr "Afbrudt"
 
@@ -3021,7 +3027,7 @@ msgstr "Angiv venligst et gyldigt nummer!"
 
 #: js/messages.php:793 libraries/Message.class.php:199
 #: libraries/Util.class.php:654 libraries/core.lib.php:245
-#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1172
+#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1170
 #: tbl_operations.php:229 view_operations.php:63
 msgid "Error"
 msgstr "Fejl"
@@ -3082,8 +3088,8 @@ msgstr "pr. sekund"
 msgid "per minute"
 msgstr "pr. minut"
 
-#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:143
-#: libraries/server_status.lib.php:228
+#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:152
+#: libraries/server_status.lib.php:237
 #: libraries/server_status_queries.lib.php:98
 msgid "per hour"
 msgstr "pr. time"
@@ -3102,7 +3108,7 @@ msgid "Wrong permissions on configuration file, should not be world writable!"
 msgstr ""
 "Forkerte rettigheder på konfigurationsfil. Må ikke være skrivbar af alle!"
 
-#: libraries/Config.class.php:1799
+#: libraries/Config.class.php:1801
 msgid "Font size"
 msgstr "Skriftstørrelse"
 
@@ -3130,10 +3136,10 @@ msgstr "Genforespørg"
 #: libraries/server_privileges.lib.php:2890
 #: libraries/server_privileges.lib.php:3144
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4332
+#: libraries/server_privileges.lib.php:4358
 #: libraries/server_status_processes.lib.php:80
-#: templates/tbl_relation/foreign_key_row.phtml:165
-#: templates/tbl_relation/internal_relational_row.phtml:55
+#: templates/table/relation/foreign_key_row.phtml:165
+#: templates/table/relation/internal_relational_row.phtml:55
 msgid "Database"
 msgstr "Database"
 
@@ -3226,11 +3232,11 @@ msgstr "Historik"
 #: libraries/plugins/import/ImportMediawiki.class.php:60
 #: libraries/plugins/import/ImportOds.class.php:59
 #: libraries/plugins/import/ImportShp.class.php:57
-#: libraries/plugins/import/ImportSql.class.php:148
+#: libraries/plugins/import/ImportSql.class.php:51
 #: libraries/plugins/import/ImportXml.class.php:58
-#: libraries/rte/rte_routines.lib.php:833 templates/index_form.phtml:49
-#: templates/structure/row_stats_table.phtml:20
-#: templates/table/options.phtml:2
+#: libraries/rte/rte_routines.lib.php:924 templates/table/index_form.phtml:49
+#: templates/table/search/options.phtml:2
+#: templates/table/structure/row_stats_table.phtml:20
 msgid "Options"
 msgstr "Indstillinger"
 
@@ -3269,7 +3275,8 @@ msgstr "Faldende"
 msgid "Order:"
 msgstr "Rækkefølge"
 
-#: libraries/Console.class.php:289 templates/table/replace_preview.phtml:17
+#: libraries/Console.class.php:289
+#: templates/table/search/replace_preview.phtml:17
 msgid "Count"
 msgstr "Antal"
 
@@ -3380,9 +3387,9 @@ msgstr "Skift til den kopierede tabel"
 #: libraries/operations.lib.php:794 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:191
-#: templates/structure/sortable_header.phtml:21
-#: templates/structure/sortable_header.phtml:38
-#: templates/table/options.phtml:68
+#: templates/database/structure/sortable_header.phtml:21
+#: templates/database/structure/sortable_header.phtml:38
+#: templates/table/search/options.phtml:68
 msgid "Ascending"
 msgstr "Stigende"
 
@@ -3392,13 +3399,14 @@ msgstr "Stigende"
 #: libraries/operations.lib.php:797 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:188
-#: templates/structure/sortable_header.phtml:26
-#: templates/structure/sortable_header.phtml:43
-#: templates/table/options.phtml:69
+#: templates/database/structure/sortable_header.phtml:26
+#: templates/database/structure/sortable_header.phtml:43
+#: templates/table/search/options.phtml:69
 msgid "Descending"
 msgstr "Faldende"
 
-#: libraries/DBQbe.class.php:467 templates/table/search_and_replace.phtml:6
+#: libraries/DBQbe.class.php:467
+#: templates/table/search/search_and_replace.phtml:6
 msgid "Column:"
 msgstr "Kolonne:"
 
@@ -3558,12 +3566,12 @@ msgstr[0] "%1$s sammenfald i <strong>%2$s</strong>"
 msgstr[1] "%1$s sammenfald i <strong>%2$s</strong>"
 
 #: libraries/DbSearch.class.php:354 libraries/Menu.class.php:311
-#: libraries/Util.class.php:3337 libraries/Util.class.php:3347
-#: libraries/Util.class.php:3623 libraries/Util.class.php:3624
-#: libraries/Util.class.php:4343 libraries/config.values.php:43
+#: libraries/Util.class.php:3343 libraries/Util.class.php:3353
+#: libraries/Util.class.php:3629 libraries/Util.class.php:3630
+#: libraries/Util.class.php:4349 libraries/config.values.php:43
 #: libraries/config.values.php:51 libraries/config.values.php:119
 #: libraries/navigation/Nodes/Node_Table.class.php:295
-#: templates/structure/check_all_table_column.phtml:5
+#: templates/table/structure/check_all_table_column.phtml:5
 msgid "Browse"
 msgstr "Vis"
 
@@ -3580,7 +3588,8 @@ msgstr "Søg i databasen"
 msgid "Words or values to search for (wildcard: \"%\"):"
 msgstr "Ord eller værdier til at søge efter (jokertegn: \"%\"):"
 
-#: libraries/DbSearch.class.php:401 templates/table/search_and_replace.phtml:1
+#: libraries/DbSearch.class.php:401
+#: templates/table/search/search_and_replace.phtml:1
 msgid "Find:"
 msgstr "Find:"
 
@@ -3624,28 +3633,28 @@ msgstr "Filtrer rækker"
 msgid "Search this table"
 msgstr "Søg i denne tabel"
 
-#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2532
-#: libraries/Util.class.php:2535
+#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2538
+#: libraries/Util.class.php:2541
 msgctxt "First page"
 msgid "Begin"
 msgstr "Start"
 
-#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2533
-#: libraries/Util.class.php:2536 libraries/server_bin_log.lib.php:170
+#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2539
+#: libraries/Util.class.php:2542 libraries/server_bin_log.lib.php:170
 #: libraries/server_bin_log.lib.php:172
 msgctxt "Previous page"
 msgid "Previous"
 msgstr "Forrige"
 
-#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2564
-#: libraries/Util.class.php:2574 libraries/server_bin_log.lib.php:204
+#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2570
+#: libraries/Util.class.php:2580 libraries/server_bin_log.lib.php:204
 #: libraries/server_bin_log.lib.php:206
 msgctxt "Next page"
 msgid "Next"
 msgstr "Næste"
 
-#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2565
-#: libraries/Util.class.php:2575
+#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2571
+#: libraries/Util.class.php:2581
 msgctxt "Last page"
 msgid "End"
 msgstr "Slut"
@@ -3720,15 +3729,15 @@ msgid "May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]."
 msgstr "Kan være anslået. Se [doc@faq3-11] FAQ 3.11[/doc]."
 
 #: libraries/DisplayResults.class.php:4332 libraries/Message.class.php:180
-#: libraries/controllers/TableRelationController.class.php:258
+#: libraries/controllers/TableRelationController.class.php:259
 #: libraries/controllers/TableSearchController.class.php:655
-#: libraries/rte/rte_routines.lib.php:1332 libraries/sql_query_form.lib.php:89
+#: libraries/rte/rte_routines.lib.php:1423 libraries/sql_query_form.lib.php:89
 #: tbl_operations.php:227 tbl_row_action.php:138 view_operations.php:62
 msgid "Your SQL query has been executed successfully."
 msgstr "Din SQL-forespørgsel blev udført korrekt."
 
 #: libraries/DisplayResults.class.php:4660
-#: libraries/controllers/StructureController.class.php:629
+#: libraries/controllers/DatabaseStructureController.class.php:564
 #, php-format
 msgid ""
 "This view has at least this number of rows. Please refer to %sdocumentation"
@@ -3751,33 +3760,33 @@ msgstr "%1$d i alt, %2$d i forespørgsel"
 msgid "%d total"
 msgstr "%d i alt"
 
-#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1318
+#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1312
 #, php-format
 msgid "Query took %01.4f seconds."
 msgstr "Forespørgsel tog %01.4f sekunder."
 
 #: libraries/DisplayResults.class.php:4807
-#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4767
-#: libraries/Util.class.php:4773 libraries/mult_submits.inc.php:50
-#: templates/structure/check_all_tables.phtml:2
-#: templates/structure/check_all_tables.phtml:9
+#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4773
+#: libraries/Util.class.php:4779 libraries/mult_submits.inc.php:50
+#: templates/database/structure/check_all_tables.phtml:2
+#: templates/database/structure/check_all_tables.phtml:9
 msgid "With selected:"
 msgstr "Med det markerede:"
 
 #: libraries/DisplayResults.class.php:4811
-#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4769
-#: libraries/Util.class.php:4770 libraries/server_privileges.lib.php:1174
+#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4775
+#: libraries/Util.class.php:4776 libraries/server_privileges.lib.php:1174
 #: libraries/server_privileges.lib.php:1175
 #: libraries/server_privileges.lib.php:1387
 #: libraries/server_user_groups.lib.php:231
-#: templates/structure/check_all_tables.phtml:3
-#: templates/structure/check_all_tables.phtml:4
+#: templates/database/structure/check_all_tables.phtml:3
+#: templates/database/structure/check_all_tables.phtml:4
 msgid "Check All"
 msgstr "Vælg alle"
 
 #: libraries/DisplayResults.class.php:4985 libraries/Header.class.php:383
-#: templates/structure/optional_action_links.phtml:1
-#: templates/structure/print_view_data_dictionary_link.phtml:3
+#: templates/database/structure/print_view_data_dictionary_link.phtml:3
+#: templates/table/structure/optional_action_links.phtml:1
 msgid "Print view"
 msgstr "Udskriv"
 
@@ -3785,7 +3794,8 @@ msgstr "Udskriv"
 msgid "Query results operations"
 msgstr "Forespørgselsresultat operationer"
 
-#: libraries/DisplayResults.class.php:5105 templates/tbl_chart.phtml:12
+#: libraries/DisplayResults.class.php:5105
+#: templates/table/chart/tbl_chart.phtml:12
 msgid "Display chart"
 msgstr "Vis diagram"
 
@@ -3879,7 +3889,7 @@ msgid "Click on the bar to scroll to top of page"
 msgstr "Klik på bjælken for at rulle til sidens top"
 
 #: libraries/Header.class.php:749
-#: libraries/plugins/auth/AuthenticationCookie.class.php:152
+#: libraries/plugins/auth/AuthenticationCookie.class.php:140
 msgid "Javascript must be enabled past this point!"
 msgstr "Herefter skal JavaScript være slået til!"
 
@@ -3901,11 +3911,11 @@ msgid "Keyname"
 msgstr "Nøglenavn"
 
 #: libraries/Index.class.php:697
-#: libraries/controllers/StructureController.class.php:1962
-#: libraries/controllers/StructureController.class.php:1967
+#: libraries/controllers/TableStructureController.class.php:953
+#: libraries/controllers/TableStructureController.class.php:958
 #: libraries/tracking.lib.php:973
 #: templates/columns_definitions/column_indexes.phtml:11
-#: templates/structure/check_all_table_column.phtml:26
+#: templates/table/structure/check_all_table_column.phtml:26
 msgid "Unique"
 msgstr "Unik"
 
@@ -3924,16 +3934,17 @@ msgstr "Kardinalitet"
 #: libraries/server_collations.lib.php:35 libraries/tracking.lib.php:881
 #: libraries/tracking.lib.php:977
 #: templates/columns_definitions/table_fields_definitions.phtml:33
-#: templates/structure/row_stats_table.phtml:31
-#: templates/structure/table_header.phtml:55
-#: templates/structure/table_structure_header.phtml:7
-#: templates/table/table_header.phtml:8
+#: templates/database/structure/table_header.phtml:55
+#: templates/table/search/table_header.phtml:8
+#: templates/table/structure/row_stats_table.phtml:31
+#: templates/table/structure/table_structure_header.phtml:7
 msgid "Collation"
 msgstr "Tegnsæt (sortering)"
 
 #: libraries/Index.class.php:703 libraries/rte/rte_events.lib.php:496
-#: libraries/rte/rte_routines.lib.php:956 libraries/tracking.lib.php:885
-#: libraries/tracking.lib.php:979 templates/structure/table_header.phtml:84
+#: libraries/rte/rte_routines.lib.php:1047 libraries/tracking.lib.php:885
+#: libraries/tracking.lib.php:979
+#: templates/database/structure/table_header.phtml:84
 msgid "Comment"
 msgstr "Kommentar"
 
@@ -3946,15 +3957,15 @@ msgstr "Primærnøglen er slettet."
 msgid "Index %s has been dropped."
 msgstr "Indeks %s er blevet slettet."
 
-#: libraries/Index.class.php:757 libraries/Util.class.php:3630
-#: libraries/Util.class.php:3631
-#: libraries/controllers/StructureController.class.php:1958
-#: libraries/controllers/StructureController.class.php:1959
+#: libraries/Index.class.php:757 libraries/Util.class.php:3636
+#: libraries/Util.class.php:3637
+#: libraries/controllers/TableStructureController.class.php:949
+#: libraries/controllers/TableStructureController.class.php:950
 #: libraries/operations.lib.php:1607 libraries/rte/rte_list.lib.php:150
 #: libraries/server_databases.lib.php:146
-#: templates/structure/check_all_table_column.phtml:15
-#: templates/structure/check_all_tables.phtml:16
-#: templates/tbl_relation/foreign_key_row.phtml:93
+#: templates/database/structure/check_all_tables.phtml:16
+#: templates/table/relation/foreign_key_row.phtml:93
+#: templates/table/structure/check_all_table_column.phtml:15
 msgid "Drop"
 msgstr "Slet"
 
@@ -3985,16 +3996,16 @@ msgstr "Server"
 #: libraries/Menu.class.php:248
 #: libraries/navigation/Nodes/Node_View.class.php:32
 #: libraries/tbl_info.inc.php:63
-#: templates/structure/structure_table_row.phtml:97
-#: templates/structure/structure_table_row.phtml:159
+#: templates/database/structure/structure_table_row.phtml:97
+#: templates/database/structure/structure_table_row.phtml:159
 msgid "View"
 msgstr "Visning"
 
 #: libraries/Menu.class.php:325 libraries/Menu.class.php:429
-#: libraries/Menu.class.php:548 libraries/Util.class.php:3334
-#: libraries/Util.class.php:3344 libraries/Util.class.php:3350
-#: libraries/Util.class.php:4313 libraries/Util.class.php:4328
-#: libraries/Util.class.php:4345 libraries/config.values.php:40
+#: libraries/Menu.class.php:548 libraries/Util.class.php:3340
+#: libraries/Util.class.php:3350 libraries/Util.class.php:3356
+#: libraries/Util.class.php:4319 libraries/Util.class.php:4334
+#: libraries/Util.class.php:4351 libraries/config.values.php:40
 #: libraries/config.values.php:48 libraries/config.values.php:110
 #: libraries/config.values.php:116 libraries/config/messages.inc.php:321
 #: libraries/navigation/Nodes/Node_Table.class.php:292
@@ -4002,19 +4013,19 @@ msgid "SQL"
 msgstr "SQL"
 
 #: libraries/Menu.class.php:328 libraries/Menu.class.php:432
-#: libraries/Util.class.php:3335 libraries/Util.class.php:3345
-#: libraries/Util.class.php:3351 libraries/Util.class.php:3625
-#: libraries/Util.class.php:3626 libraries/Util.class.php:4329
-#: libraries/Util.class.php:4346 libraries/config.values.php:41
+#: libraries/Util.class.php:3341 libraries/Util.class.php:3351
+#: libraries/Util.class.php:3357 libraries/Util.class.php:3631
+#: libraries/Util.class.php:3632 libraries/Util.class.php:4335
+#: libraries/Util.class.php:4352 libraries/config.values.php:41
 #: libraries/config.values.php:49 libraries/config.values.php:111
 #: libraries/config.values.php:117
 #: libraries/navigation/Nodes/Node_Table.class.php:286
 msgid "Search"
 msgstr "Søg"
 
-#: libraries/Menu.class.php:338 libraries/Util.class.php:3336
-#: libraries/Util.class.php:3346 libraries/Util.class.php:3627
-#: libraries/Util.class.php:3628 libraries/Util.class.php:4347
+#: libraries/Menu.class.php:338 libraries/Util.class.php:3342
+#: libraries/Util.class.php:3352 libraries/Util.class.php:3633
+#: libraries/Util.class.php:3634 libraries/Util.class.php:4353
 #: libraries/config.values.php:42 libraries/config.values.php:50
 #: libraries/config.values.php:118
 #: libraries/navigation/Nodes/Node_Table.class.php:289
@@ -4023,30 +4034,30 @@ msgid "Insert"
 msgstr "Indsæt"
 
 #: libraries/Menu.class.php:362 libraries/Menu.class.php:467
-#: libraries/Util.class.php:4334 libraries/Util.class.php:4350
+#: libraries/Util.class.php:4340 libraries/Util.class.php:4356
 #: libraries/config.values.php:106 libraries/server_common.lib.php:51
 #: libraries/server_privileges.lib.php:2370
 #: libraries/server_privileges.lib.php:3158
-#: libraries/server_privileges.lib.php:4221
+#: libraries/server_privileges.lib.php:4247
 msgid "Privileges"
 msgstr "Privilegier"
 
 #: libraries/Menu.class.php:371 libraries/Menu.class.php:379
-#: libraries/Menu.class.php:459 libraries/Util.class.php:3338
-#: libraries/Util.class.php:3352 libraries/Util.class.php:4333
-#: libraries/Util.class.php:4351 libraries/config.values.php:112
+#: libraries/Menu.class.php:459 libraries/Util.class.php:3344
+#: libraries/Util.class.php:3358 libraries/Util.class.php:4339
+#: libraries/Util.class.php:4357 libraries/config.values.php:112
 #: view_operations.php:92
 msgid "Operations"
 msgstr "Operationer"
 
 #: libraries/Menu.class.php:384 libraries/Menu.class.php:492
-#: libraries/Util.class.php:4338 libraries/Util.class.php:4352
+#: libraries/Util.class.php:4344 libraries/Util.class.php:4358
 #: libraries/relation.lib.php:255
 msgid "Tracking"
 msgstr "Sporing"
 
 #: libraries/Menu.class.php:397 libraries/Menu.class.php:486
-#: libraries/Util.class.php:4337 libraries/Util.class.php:4353
+#: libraries/Util.class.php:4343 libraries/Util.class.php:4359
 #: libraries/navigation/Nodes/Node_Trigger_Container.class.php:24
 #: libraries/plugins/export/ExportHtmlword.class.php:557
 #: libraries/plugins/export/ExportOdt.class.php:685
@@ -4063,16 +4074,16 @@ msgstr "Triggers/udløsere"
 msgid "Database seems to be empty!"
 msgstr "Database ser ud til at være tom!"
 
-#: libraries/Menu.class.php:439 libraries/Util.class.php:4330
+#: libraries/Menu.class.php:439 libraries/Util.class.php:4336
 msgid "Query"
 msgstr "Foresp. via eks"
 
-#: libraries/Menu.class.php:472 libraries/Util.class.php:4335
+#: libraries/Menu.class.php:472 libraries/Util.class.php:4341
 #: libraries/rte/rte_words.lib.php:36
 msgid "Routines"
 msgstr "Rutiner"
 
-#: libraries/Menu.class.php:479 libraries/Util.class.php:4336
+#: libraries/Menu.class.php:479 libraries/Util.class.php:4342
 #: libraries/navigation/Nodes/Node_Event_Container.class.php:26
 #: libraries/plugins/export/ExportSql.class.php:940
 #: libraries/plugins/export/ExportXml.class.php:107
@@ -4080,20 +4091,20 @@ msgstr "Rutiner"
 msgid "Events"
 msgstr "Hændelser"
 
-#: libraries/Menu.class.php:498 libraries/Util.class.php:4339
+#: libraries/Menu.class.php:498 libraries/Util.class.php:4345
 msgid "Designer"
 msgstr "Designer"
 
-#: libraries/Menu.class.php:507 libraries/Util.class.php:4340
-#: templates/structure/check_all_tables.phtml:35
+#: libraries/Menu.class.php:507 libraries/Util.class.php:4346
+#: templates/database/structure/check_all_tables.phtml:35
 msgid "Central columns"
 msgstr "Centerkolonner"
 
-#: libraries/Menu.class.php:544 libraries/Util.class.php:4312
+#: libraries/Menu.class.php:544 libraries/Util.class.php:4318
 #: libraries/config.values.php:103 libraries/config/messages.inc.php:266
 #: libraries/config/messages.inc.php:341
 #: libraries/navigation/NavigationTree.class.php:1239
-#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4332
+#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4358
 msgid "Databases"
 msgstr "Databaser"
 
@@ -4104,34 +4115,34 @@ msgid "User accounts"
 msgstr "Brugergrupper"
 
 #: libraries/Menu.class.php:595 libraries/ServerStatusData.class.php:121
-#: libraries/Util.class.php:4319 libraries/server_common.lib.php:36
+#: libraries/Util.class.php:4325 libraries/server_common.lib.php:36
 msgid "Binary log"
 msgstr "Binær log"
 
 #: libraries/Menu.class.php:601 libraries/ServerStatusData.class.php:126
-#: libraries/Util.class.php:4320 libraries/server_common.lib.php:42
-#: templates/structure/body_for_table_summary.phtml:10
-#: templates/structure/table_header.phtml:27
+#: libraries/Util.class.php:4326 libraries/server_common.lib.php:42
+#: templates/database/structure/body_for_table_summary.phtml:10
+#: templates/database/structure/table_header.phtml:27
 msgid "Replication"
 msgstr "Replikation"
 
 #: libraries/Menu.class.php:606 libraries/ServerStatusData.class.php:193
-#: libraries/Util.class.php:4321 libraries/config.values.php:105
+#: libraries/Util.class.php:4327 libraries/config.values.php:105
 #: libraries/server_engines.lib.php:108 libraries/server_engines.lib.php:112
 #: libraries/sql_query_form.lib.php:421
 msgid "Variables"
 msgstr "Variable"
 
-#: libraries/Menu.class.php:610 libraries/Util.class.php:4322
+#: libraries/Menu.class.php:610 libraries/Util.class.php:4328
 msgid "Charsets"
 msgstr "Tegnsæt"
 
-#: libraries/Menu.class.php:615 libraries/Util.class.php:4323
+#: libraries/Menu.class.php:615 libraries/Util.class.php:4329
 #: libraries/server_common.lib.php:33 libraries/server_plugins.lib.php:27
 msgid "Plugins"
 msgstr "Udvidelsesmoduler"
 
-#: libraries/Menu.class.php:626 libraries/Util.class.php:4324
+#: libraries/Menu.class.php:626 libraries/Util.class.php:4330
 msgid "Engines"
 msgstr "Lagring"
 
@@ -4156,7 +4167,7 @@ msgid_plural "%1$d rows inserted."
 msgstr[0] "%1$d række sat ind."
 msgstr[1] "%1$d rækker sat ind."
 
-#: libraries/PDF.class.php:70 libraries/Util.class.php:2521
+#: libraries/PDF.class.php:70 libraries/Util.class.php:2527
 #: libraries/browse_foreigners.lib.php:327
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:865
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:890
@@ -4177,7 +4188,7 @@ msgid "Could not save favorite table!"
 msgstr "Kunne ikke gemme favorit tabel!"
 
 #: libraries/RecentFavoriteTable.class.php:212
-#: templates/structure/favorite_anchor.phtml:12
+#: templates/database/structure/favorite_anchor.phtml:12
 msgid "Remove from Favorites"
 msgstr "Fjern fra Favoritter"
 
@@ -4344,7 +4355,7 @@ msgstr ""
 "datalager."
 
 #: libraries/StorageEngine.class.php:373
-#: templates/structure/body_for_table_summary.phtml:50
+#: templates/database/structure/body_for_table_summary.phtml:50
 #, php-format
 msgid "%s is the default storage engine on this MySQL server."
 msgstr "%s er standard datalageret på denne MySQL-server."
@@ -4824,10 +4835,10 @@ msgstr ""
 
 #: libraries/Util.class.php:726 libraries/rte/rte_events.lib.php:110
 #: libraries/rte/rte_events.lib.php:119 libraries/rte/rte_events.lib.php:150
-#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:153
-#: libraries/rte/rte_routines.lib.php:162
-#: libraries/rte/rte_routines.lib.php:235
-#: libraries/rte/rte_routines.lib.php:1366
+#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:223
+#: libraries/rte/rte_routines.lib.php:250
+#: libraries/rte/rte_routines.lib.php:372
+#: libraries/rte/rte_routines.lib.php:1457
 #: libraries/rte/rte_triggers.lib.php:86 libraries/rte/rte_triggers.lib.php:95
 #: libraries/rte/rte_triggers.lib.php:127
 msgid "MySQL said: "
@@ -4871,77 +4882,80 @@ msgstr "søn"
 msgid "%B %d, %Y at %I:%M %p"
 msgstr "%d. %m %Y kl. %H:%M:%S"
 
-#: libraries/Util.class.php:2019
+#: libraries/Util.class.php:2025
 #, php-format
 msgid "%s days, %s hours, %s minutes and %s seconds"
 msgstr "%s dage, %s timer, %s minutter og %s sekunder"
 
-#: libraries/Util.class.php:2112
+#: libraries/Util.class.php:2118
 msgid "Missing parameter:"
 msgstr "Manglende parameter:"
 
-#: libraries/Util.class.php:2645
+#: libraries/Util.class.php:2651
 #, php-format
 msgid "Jump to database \"%s\"."
 msgstr "Hop til database \"%s\"."
 
-#: libraries/Util.class.php:2670
+#: libraries/Util.class.php:2676
 #, php-format
 msgid "The %s functionality is affected by a known bug, see %s"
 msgstr "Funktionaliteten af %s er påvirket af en kendt fejl, se %s"
 
-#: libraries/Util.class.php:2881
+#: libraries/Util.class.php:2887
 msgid "Click to toggle"
 msgstr "Klik for at skifte"
 
-#: libraries/Util.class.php:3542 prefs_manage.php:248
+#: libraries/Util.class.php:3548 prefs_manage.php:248
 msgid "Browse your computer:"
 msgstr "Gennemse din computer:"
 
-#: libraries/Util.class.php:3567
+#: libraries/Util.class.php:3573
 #, php-format
 msgid "Select from the web server upload directory <b>%s</b>:"
 msgstr "Vælg fra <b>%s</b> - webserverens upload-mappe:"
 
-#: libraries/Util.class.php:3596 libraries/insert_edit.lib.php:1173
+#: libraries/Util.class.php:3602 libraries/insert_edit.lib.php:1171
 msgid "The directory you set for upload work cannot be reached."
 msgstr "Mappen du har sat til upload-arbejde kan ikke findes."
 
-#: libraries/Util.class.php:3607
+#: libraries/Util.class.php:3613
 msgid "There are no files to upload!"
 msgstr "Der er ikke nogen filer at uploade!"
 
 # By "Empty", if this is an action, it should translate to "Tøm" but if it's a
 # state it should translate to "Tom".
-#: libraries/Util.class.php:3632 libraries/Util.class.php:3633
-#: templates/structure/check_all_tables.phtml:15
+#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: templates/database/structure/check_all_tables.phtml:15
 msgid "Empty"
 msgstr "Tøm"
 
-#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: libraries/Util.class.php:3644 libraries/Util.class.php:3645
 msgid "Execute"
 msgstr "Udfør"
 
-#: libraries/Util.class.php:4152
+#: libraries/Util.class.php:4158
 msgid "Print"
 msgstr "Udskriv"
 
-#: libraries/Util.class.php:4257 templates/structure/row_stats_table.phtml:80
-#: templates/structure/table_header.phtml:95
+#: libraries/Util.class.php:4263
+#: templates/database/structure/table_header.phtml:95
+#: templates/table/structure/row_stats_table.phtml:80
 msgid "Creation"
 msgstr "Oprettelse"
 
-#: libraries/Util.class.php:4263 templates/structure/row_stats_table.phtml:87
-#: templates/structure/table_header.phtml:106
+#: libraries/Util.class.php:4269
+#: templates/database/structure/table_header.phtml:106
+#: templates/table/structure/row_stats_table.phtml:87
 msgid "Last update"
 msgstr "Sidste opdatering"
 
-#: libraries/Util.class.php:4269 templates/structure/row_stats_table.phtml:94
-#: templates/structure/table_header.phtml:117
+#: libraries/Util.class.php:4275
+#: templates/database/structure/table_header.phtml:117
+#: templates/table/structure/row_stats_table.phtml:94
 msgid "Last check"
 msgstr "Seneste tjek"
 
-#: libraries/Util.class.php:4315
+#: libraries/Util.class.php:4321
 msgid "Users"
 msgstr "Brugere"
 
@@ -4962,16 +4976,16 @@ msgid "Use this value"
 msgstr "Brug denne værdi"
 
 #: libraries/build_html_for_db.lib.php:33 libraries/import.lib.php:193
-#: templates/structure/actions_in_table_structure.phtml:113
-#: templates/structure/row_stats_table.phtml:42
-#: templates/structure/table_header.phtml:36
+#: templates/database/structure/table_header.phtml:36
+#: templates/table/structure/actions_in_table_structure.phtml:113
+#: templates/table/structure/row_stats_table.phtml:42
 msgid "Rows"
 msgstr "Rækker"
 
 #: libraries/build_html_for_db.lib.php:48 libraries/engines/innodb.lib.php:171
-#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:186
-#: libraries/server_status.lib.php:298
-#: templates/structure/display_table_stats.phtml:40
+#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:195
+#: libraries/server_status.lib.php:307
+#: templates/table/structure/display_table_stats.phtml:40
 msgid "Total"
 msgstr "Total"
 
@@ -4980,10 +4994,12 @@ msgid "Jump to database"
 msgstr "Gå til database"
 
 #: libraries/build_html_for_db.lib.php:146
+#: templates/database/structure/structure_table_row.phtml:15
 msgid "Not replicated"
 msgstr "Ikke replikeret"
 
 #: libraries/build_html_for_db.lib.php:158
+#: templates/database/structure/structure_table_row.phtml:16
 msgid "Replicated"
 msgstr "Replikeret"
 
@@ -5038,17 +5054,17 @@ msgstr "NEJ"
 #: libraries/plugins/export/ExportTexytext.class.php:425
 #: libraries/plugins/export/PMA_ExportPdf.class.php:307
 #: libraries/rte/rte_list.lib.php:73 libraries/rte/rte_list.lib.php:85
-#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:830
-#: libraries/rte/rte_routines.lib.php:1492 setup/frames/index.inc.php:162
+#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:921
+#: libraries/rte/rte_routines.lib.php:1583 setup/frames/index.inc.php:162
 #: templates/columns_definitions/table_fields_definitions.phtml:8
-#: templates/structure/table_structure_header.phtml:5
-#: templates/table/create_table.phtml:11
+#: templates/database/create_table.phtml:11
+#: templates/table/structure/table_structure_header.phtml:5
 msgid "Name"
 msgstr "Navn"
 
 #: libraries/central_columns.lib.php:699
 #: libraries/central_columns.lib.php:1381
-#: libraries/rte/rte_routines.lib.php:832
+#: libraries/rte/rte_routines.lib.php:923
 #: templates/columns_definitions/table_fields_definitions.phtml:14
 msgid "Length/Values"
 msgstr "Længde/Værdi*"
@@ -5067,7 +5083,7 @@ msgid "Select a table"
 msgstr "Vælg en tabel"
 
 #: libraries/central_columns.lib.php:804
-#: templates/structure/add_column.phtml:4
+#: templates/table/structure/add_column.phtml:4
 msgid "Add column"
 msgstr "Tilføj kolonne"
 
@@ -5083,7 +5099,7 @@ msgstr "Tilføj ny kolonne"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1002
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1025
 #: templates/columns_definitions/table_fields_definitions.phtml:36
-#: templates/structure/table_structure_header.phtml:8
+#: templates/table/structure/table_structure_header.phtml:8
 msgid "Attributes"
 msgstr "Attributter"
 
@@ -5200,7 +5216,7 @@ msgid "Double click"
 msgstr "Dobbelt-klik"
 
 #: libraries/config.values.php:95 libraries/config.values.php:124
-#: libraries/config/FormDisplay.tpl.php:221 libraries/relation.lib.php:97
+#: libraries/config/FormDisplay.tpl.php:232 libraries/relation.lib.php:97
 #: libraries/relation.lib.php:105
 msgid "Disabled"
 msgstr "Slået fra"
@@ -5380,23 +5396,23 @@ msgstr "Den komprimerede eksport vil ikke fungere, da funktionen %s mangler."
 msgid "maximum %s"
 msgstr "maksimum %s"
 
-#: libraries/config/FormDisplay.tpl.php:219
+#: libraries/config/FormDisplay.tpl.php:230
 msgid "This setting is disabled, it will not be applied to your configuration."
 msgstr ""
 "Denne indstilling er deaktiveret og vil ikke blive anvendt i din "
 "konfiguration."
 
-#: libraries/config/FormDisplay.tpl.php:313
+#: libraries/config/FormDisplay.tpl.php:324
 #, php-format
 msgid "Set value: %s"
 msgstr "Indstil værdien %s"
 
-#: libraries/config/FormDisplay.tpl.php:318
+#: libraries/config/FormDisplay.tpl.php:329
 #: libraries/config/messages.inc.php:610
 msgid "Restore default value"
 msgstr "Gendan standardværdi"
 
-#: libraries/config/FormDisplay.tpl.php:332
+#: libraries/config/FormDisplay.tpl.php:343
 msgid "Allow users to customize this value"
 msgstr "Tillad brugerdefinerede indstillinger for værdien"
 
@@ -5889,7 +5905,7 @@ msgstr "Filens tegnsæt"
 
 #: libraries/config/messages.inc.php:136 libraries/config/messages.inc.php:152
 #: libraries/sql_query_form.lib.php:247
-#: templates/structure/row_stats_table.phtml:7
+#: templates/table/structure/row_stats_table.phtml:7
 msgid "Format"
 msgstr "Format"
 
@@ -6416,7 +6432,7 @@ msgstr ""
 
 #: libraries/config/messages.inc.php:332
 #: libraries/plugins/export/ExportPdf.class.php:279
-#: templates/structure/secondary_tabs.phtml:8
+#: templates/table/secondary_tabs.phtml:8
 msgid "Table structure"
 msgstr "Tabel-struktur"
 
@@ -8127,102 +8143,33 @@ msgstr "Microsoft Word 2000"
 msgid "OpenDocument Text"
 msgstr "OpenDocument tekst"
 
-#: libraries/controllers/StructureController.class.php:465
+#: libraries/controllers/DatabaseStructureController.class.php:405
 #: tbl_operations.php:382
 #, php-format
 msgid "Table %s has been emptied."
 msgstr "Tabel %s blev tømt."
 
-#: libraries/controllers/StructureController.class.php:486
+#: libraries/controllers/DatabaseStructureController.class.php:426
 #: tbl_operations.php:400 view_operations.php:119
 #, php-format
 msgid "View %s has been dropped."
 msgstr "Visning %s er blevet slettet."
 
-#: libraries/controllers/StructureController.class.php:487
+#: libraries/controllers/DatabaseStructureController.class.php:427
 #: tbl_operations.php:401
 #, php-format
 msgid "Table %s has been dropped."
 msgstr "Tabel %s blev slettet."
 
-#: libraries/controllers/StructureController.class.php:797
-#, php-format
-msgid "The name '%s' is a MySQL reserved keyword."
-msgid_plural "The names '%s' are MySQL reserved keywords."
-msgstr[0] "Navnet '%s' er et nøgleord, der er reserveret af MySQL."
-msgstr[1] "Navnene '%s' er nøgleord, der er reserveret af MySQL."
-
-#: libraries/controllers/StructureController.class.php:875
-msgid "No column selected."
-msgstr "Der er ikke valgt kolonner."
-
-#: libraries/controllers/StructureController.class.php:1049
+#: libraries/controllers/DatabaseStructureController.class.php:733
 msgid "Favorite List is full!"
 msgstr "Favoritliste er fyldt!"
 
-#: libraries/controllers/StructureController.class.php:1272
-msgid "The columns have been moved successfully."
-msgstr "Flytning af kolonnen er blevet fuldført."
-
-#: libraries/controllers/StructureController.class.php:1535
-#, fuzzy, php-format
-#| msgid "Table %1$s has been altered successfully."
-msgid ""
-"Table %1$s has been altered successfully. Privileges have been adjusted."
-msgstr "Tabel %1$s er blevet ændret."
-
-#: libraries/controllers/StructureController.class.php:1541
-#: libraries/controllers/TableIndexesController.class.php:161
-#: tbl_addfield.php:92
-#, php-format
-msgid "Table %1$s has been altered successfully."
-msgstr "Tabel %1$s er blevet ændret."
-
-#: libraries/controllers/StructureController.class.php:1588
-#: libraries/tracking.lib.php:1094
-msgid "Query error"
-msgstr "Forespørgselsfejl"
-
-#: libraries/controllers/StructureController.class.php:1806
+#: libraries/controllers/DatabaseStructureController.class.php:947
 #: libraries/mysql_charsets.lib.php:366 libraries/mysql_charsets.lib.php:373
 msgid "unknown"
 msgstr "ukendt"
 
-#: libraries/controllers/StructureController.class.php:1957
-#: templates/structure/check_all_table_column.phtml:11
-msgid "Change"
-msgstr "Ret"
-
-#: libraries/controllers/StructureController.class.php:1961
-#: libraries/controllers/StructureController.class.php:1966
-#: libraries/navigation/Nodes/Node_Index.class.php:30
-#: libraries/tracking.lib.php:926
-#: templates/columns_definitions/column_indexes.phtml:16
-#: templates/columns_definitions/table_fields_definitions.phtml:57
-#: templates/structure/check_all_table_column.phtml:30
-#: templates/structure/display_structure.phtml:79
-#: templates/structure/display_table_stats.phtml:19
-msgid "Index"
-msgstr "Indeks"
-
-#: libraries/controllers/StructureController.class.php:1963
-#: libraries/controllers/StructureController.class.php:1968
-#: templates/columns_definitions/column_indexes.phtml:27
-#: templates/structure/check_all_table_column.phtml:37
-msgid "Spatial"
-msgstr "Spatial"
-
-#: libraries/controllers/StructureController.class.php:1964
-#: libraries/controllers/StructureController.class.php:1969
-#: templates/columns_definitions/column_indexes.phtml:22
-#: templates/structure/check_all_table_column.phtml:47
-msgid "Fulltext"
-msgstr "Fuldtekst"
-
-#: libraries/controllers/StructureController.class.php:1970
-msgid "Distinct values"
-msgstr "Distinkte værdier"
-
 #: libraries/controllers/TableChartController.class.php:82
 #: libraries/controllers/TableGisVisualizationController.class.php:101
 msgid "No SQL query was set to fetch data."
@@ -8236,11 +8183,18 @@ msgstr "Ingen numeriske kolonner tilstede i tabellen til plotning."
 msgid "No data to display"
 msgstr "Ingen data til visning"
 
-#: libraries/controllers/TableRelationController.class.php:217
+#: libraries/controllers/TableIndexesController.class.php:161
+#: libraries/controllers/TableStructureController.class.php:736
+#: tbl_addfield.php:92
+#, php-format
+msgid "Table %1$s has been altered successfully."
+msgstr "Tabel %1$s er blevet ændret."
+
+#: libraries/controllers/TableRelationController.class.php:218
 msgid "Display column was successfully updated."
 msgstr "Opdatering af vist kolonne blev gennemført."
 
-#: libraries/controllers/TableRelationController.class.php:283
+#: libraries/controllers/TableRelationController.class.php:288
 msgid "Internal relations were successfully updated."
 msgstr "Opdateringen af de interne relationer blev gennemført."
 
@@ -8253,10 +8207,72 @@ msgid "Zoom search"
 msgstr "Forstør søgning"
 
 #: libraries/controllers/TableSearchController.class.php:852
-#: templates/table/selection_form.phtml:59
+#: templates/table/search/selection_form.phtml:59
 msgid "Find and replace"
 msgstr "Søg og erstat"
 
+#: libraries/controllers/TableStructureController.class.php:163
+#, php-format
+msgid "The name '%s' is a MySQL reserved keyword."
+msgid_plural "The names '%s' are MySQL reserved keywords."
+msgstr[0] "Navnet '%s' er et nøgleord, der er reserveret af MySQL."
+msgstr[1] "Navnene '%s' er nøgleord, der er reserveret af MySQL."
+
+#: libraries/controllers/TableStructureController.class.php:241
+msgid "No column selected."
+msgstr "Der er ikke valgt kolonner."
+
+#: libraries/controllers/TableStructureController.class.php:467
+msgid "The columns have been moved successfully."
+msgstr "Flytning af kolonnen er blevet fuldført."
+
+#: libraries/controllers/TableStructureController.class.php:730
+#, fuzzy, php-format
+#| msgid "Table %1$s has been altered successfully."
+msgid ""
+"Table %1$s has been altered successfully. Privileges have been adjusted."
+msgstr "Tabel %1$s er blevet ændret."
+
+#: libraries/controllers/TableStructureController.class.php:783
+#: libraries/tracking.lib.php:1094
+msgid "Query error"
+msgstr "Forespørgselsfejl"
+
+#: libraries/controllers/TableStructureController.class.php:948
+#: templates/table/structure/check_all_table_column.phtml:11
+msgid "Change"
+msgstr "Ret"
+
+#: libraries/controllers/TableStructureController.class.php:952
+#: libraries/controllers/TableStructureController.class.php:957
+#: libraries/navigation/Nodes/Node_Index.class.php:30
+#: libraries/tracking.lib.php:926
+#: templates/columns_definitions/column_indexes.phtml:16
+#: templates/columns_definitions/table_fields_definitions.phtml:57
+#: templates/table/structure/check_all_table_column.phtml:30
+#: templates/table/structure/display_structure.phtml:79
+#: templates/table/structure/display_table_stats.phtml:19
+msgid "Index"
+msgstr "Indeks"
+
+#: libraries/controllers/TableStructureController.class.php:954
+#: libraries/controllers/TableStructureController.class.php:959
+#: templates/columns_definitions/column_indexes.phtml:27
+#: templates/table/structure/check_all_table_column.phtml:37
+msgid "Spatial"
+msgstr "Spatial"
+
+#: libraries/controllers/TableStructureController.class.php:955
+#: libraries/controllers/TableStructureController.class.php:960
+#: templates/columns_definitions/column_indexes.phtml:22
+#: templates/table/structure/check_all_table_column.phtml:47
+msgid "Fulltext"
+msgstr "Fuldtekst"
+
+#: libraries/controllers/TableStructureController.class.php:963
+msgid "Distinct values"
+msgstr "Distinkte værdier"
+
 #: libraries/core.lib.php:306
 #, php-format
 msgid "The %s extension is missing. Please check your PHP configuration."
@@ -8303,7 +8319,7 @@ msgid "No Password"
 msgstr "Ingen adgangskode"
 
 #: libraries/display_change_password.lib.php:68
-#: libraries/plugins/auth/AuthenticationCookie.class.php:199
+#: libraries/plugins/auth/AuthenticationCookie.class.php:187
 #: libraries/replication_gui.lib.php:422 libraries/replication_gui.lib.php:862
 #: libraries/server_privileges.lib.php:1640
 msgid "Password:"
@@ -9112,12 +9128,12 @@ msgid "Dump has been saved to file %s."
 msgstr "Dump er blevet gemt i filen %s."
 
 #: libraries/import.lib.php:202 libraries/insert_edit.lib.php:124
-#: libraries/rte/rte_routines.lib.php:1353 libraries/sql.lib.php:1312
+#: libraries/rte/rte_routines.lib.php:1444 libraries/sql.lib.php:1306
 #: tbl_get_field.php:44
 msgid "MySQL returned an empty result set (i.e. zero rows)."
 msgstr "MySQL returnerede ingen data (fx ingen rækker)."
 
-#: libraries/import.lib.php:265 libraries/sql.lib.php:1326
+#: libraries/import.lib.php:265 libraries/sql.lib.php:1320
 msgid "[ROLLBACK occurred.]"
 msgstr "[ROLLBACK opstod.]"
 
@@ -9186,14 +9202,14 @@ msgstr "Opret et indeks på &nbsp;%s&nbsp; kolonner"
 
 #: libraries/insert_edit.lib.php:233
 #: libraries/navigation/Nodes/Node_DatabaseChild.class.php:48
-#: templates/designer/table_list.phtml:40
+#: templates/database/designer/table_list.phtml:40
 msgid "Hide"
 msgstr "Skjul"
 
 #: libraries/insert_edit.lib.php:249
 #: libraries/navigation/Nodes/Node_Function.class.php:32
-#: libraries/rte/rte_routines.lib.php:1495
-#: templates/table/table_header.phtml:4
+#: libraries/rte/rte_routines.lib.php:1586
+#: templates/table/search/table_header.phtml:4
 msgid "Function"
 msgstr "Funktion"
 
@@ -9206,84 +9222,85 @@ msgstr "Binært"
 msgid "Because of its length,<br /> this column might not be editable."
 msgstr "På grund af feltets længde,<br /> kan det muligvis ikke ændres."
 
-#: libraries/insert_edit.lib.php:1050
+#: libraries/insert_edit.lib.php:1048
 msgid "Binary - do not edit"
 msgstr "Binært - må ikke ændres"
 
-#: libraries/insert_edit.lib.php:1176 libraries/server_privileges.lib.php:470
-#: templates/table/options.phtml:36
+#: libraries/insert_edit.lib.php:1174 libraries/server_privileges.lib.php:470
+#: templates/table/search/options.phtml:36
 msgid "Or"
 msgstr "Eller"
 
-#: libraries/insert_edit.lib.php:1177
+#: libraries/insert_edit.lib.php:1175
 msgid "web server upload directory:"
 msgstr "webserver upload-mappe:"
 
-#: libraries/insert_edit.lib.php:1348 templates/table/input_box.phtml:49
+#: libraries/insert_edit.lib.php:1346
+#: templates/table/search/input_box.phtml:49
 msgid "Edit/Insert"
 msgstr "Rediger/Indsæt"
 
-#: libraries/insert_edit.lib.php:1398
+#: libraries/insert_edit.lib.php:1396
 #, php-format
 msgid "Continue insertion with %s rows"
 msgstr "Fortsæt indsættelse med %s rækker"
 
-#: libraries/insert_edit.lib.php:1428
+#: libraries/insert_edit.lib.php:1426
 msgid "and then"
 msgstr "og derefter"
 
-#: libraries/insert_edit.lib.php:1461
+#: libraries/insert_edit.lib.php:1459
 msgid "Insert as new row"
 msgstr "Indsæt som ny række"
 
-#: libraries/insert_edit.lib.php:1464
+#: libraries/insert_edit.lib.php:1462
 msgid "Insert as new row and ignore errors"
 msgstr "Indsæt som ny række og ignorer fejl"
 
-#: libraries/insert_edit.lib.php:1467
+#: libraries/insert_edit.lib.php:1465
 msgid "Show insert query"
 msgstr "Vis indsættelsesforespørgsel"
 
-#: libraries/insert_edit.lib.php:1487
+#: libraries/insert_edit.lib.php:1485
 msgid "Go back to previous page"
 msgstr "Tilbage til foregående side"
 
-#: libraries/insert_edit.lib.php:1490
+#: libraries/insert_edit.lib.php:1488
 msgid "Insert another new row"
 msgstr "Indsæt endnu en ny række"
 
-#: libraries/insert_edit.lib.php:1495
+#: libraries/insert_edit.lib.php:1493
 msgid "Go back to this page"
 msgstr "Gå tilbage til denne side"
 
-#: libraries/insert_edit.lib.php:1518
+#: libraries/insert_edit.lib.php:1516
 msgid "Edit next row"
 msgstr "Rediger næste række"
 
-#: libraries/insert_edit.lib.php:1540
+#: libraries/insert_edit.lib.php:1538
 msgid ""
 "Use TAB key to move from value to value, or CTRL+arrows to move anywhere"
 msgstr ""
 "Brug TAB-tasten for at flytte dig fra værdi til værdi, eller CTRL"
 "+piletasterne til at flytte frit omkring"
 
-#: libraries/insert_edit.lib.php:1577 libraries/replication_gui.lib.php:542
-#: libraries/rte/rte_routines.lib.php:1497
+#: libraries/insert_edit.lib.php:1575 libraries/replication_gui.lib.php:542
+#: libraries/rte/rte_routines.lib.php:1588
 #: libraries/server_status_variables.lib.php:220
-#: templates/designer/having_query_panel.phtml:100
-#: templates/designer/options_panel.phtml:73
-#: templates/designer/options_panel.phtml:239
-#: templates/designer/where_query_panel.phtml:69
-#: templates/table/table_header.phtml:10
-#: templates/table/zoom_result_form.phtml:35
+#: templates/database/designer/having_query_panel.phtml:100
+#: templates/database/designer/options_panel.phtml:73
+#: templates/database/designer/options_panel.phtml:239
+#: templates/database/designer/where_query_panel.phtml:69
+#: templates/table/search/table_header.phtml:10
+#: templates/table/search/zoom_result_form.phtml:35
 msgid "Value"
 msgstr "Værdi"
 
-#: libraries/insert_edit.lib.php:1937 libraries/sql.lib.php:1309
+#: libraries/insert_edit.lib.php:1935 libraries/sql.lib.php:1303
 msgid "Showing SQL query"
 msgstr "Viser SQL-forespørgsel"
 
-#: libraries/insert_edit.lib.php:1962 libraries/sql.lib.php:1287
+#: libraries/insert_edit.lib.php:1960 libraries/sql.lib.php:1281
 #, php-format
 msgid "Inserted row id: %1$d"
 msgstr "Indsatte række id: %1$d"
@@ -9699,7 +9716,7 @@ msgstr "Ny"
 #: libraries/navigation/Nodes/Node_View_Container.class.php:26
 #: libraries/navigation/Nodes/Node_View_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:129
-#: templates/structure/show_create.phtml:30
+#: templates/database/structure/show_create.phtml:30
 msgid "Views"
 msgstr "Views"
 
@@ -10033,7 +10050,7 @@ msgstr "Du har ikke tilstrækkelige rettigheder til at være her!"
 
 #: libraries/operations.lib.php:101 libraries/operations.lib.php:249
 #: libraries/operations.lib.php:869 libraries/operations.lib.php:963
-#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:907
+#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:998
 #: templates/columns_definitions/table_fields_definitions.phtml:47
 #, fuzzy
 #| msgid "Edit Privileges"
@@ -10127,22 +10144,22 @@ msgid "Switch to copied table"
 msgstr "Skift til den kopierede tabel"
 
 #: libraries/operations.lib.php:1360
-#: templates/structure/check_all_tables.phtml:18
+#: templates/database/structure/check_all_tables.phtml:18
 msgid "Table maintenance"
 msgstr "Tabelvedligeholdelse"
 
 #: libraries/operations.lib.php:1398
-#: templates/structure/check_all_tables.phtml:19
+#: templates/database/structure/check_all_tables.phtml:19
 msgid "Analyze table"
 msgstr "Analyser tabel"
 
 #: libraries/operations.lib.php:1413
-#: templates/structure/check_all_tables.phtml:20
+#: templates/database/structure/check_all_tables.phtml:20
 msgid "Check table"
 msgstr "Tjek tabel"
 
 #: libraries/operations.lib.php:1428
-#: templates/structure/check_all_tables.phtml:22
+#: templates/database/structure/check_all_tables.phtml:22
 #, fuzzy
 #| msgid "Check table"
 msgid "Checksum table"
@@ -10162,18 +10179,19 @@ msgid "Flush the table (FLUSH)"
 msgstr "Udskriv tabellen (\"FLUSH\")"
 
 #: libraries/operations.lib.php:1477
-#: templates/structure/check_all_tables.phtml:23
-#: templates/structure/display_table_stats.phtml:56
+#: templates/database/structure/check_all_tables.phtml:23
+#: templates/table/structure/display_table_stats.phtml:56
 msgid "Optimize table"
 msgstr "Optimer tabel"
 
 #: libraries/operations.lib.php:1492
-#: templates/structure/check_all_tables.phtml:24
+#: templates/database/structure/check_all_tables.phtml:24
 msgid "Repair table"
 msgstr "Reparer tabel"
 
 #: libraries/operations.lib.php:1538
-#: templates/structure/check_all_tables.phtml:14 view_operations.php:127
+#: templates/database/structure/check_all_tables.phtml:14
+#: view_operations.php:127
 msgid "Delete data or table"
 msgstr "Slet data eller tabel"
 
@@ -10301,7 +10319,7 @@ msgid "Cannot connect: invalid settings."
 msgstr "Kan ikke forbinde: ugyldige indstillinger."
 
 #: libraries/plugins/auth/AuthenticationConfig.class.php:108
-#: libraries/plugins/auth/AuthenticationCookie.class.php:134
+#: libraries/plugins/auth/AuthenticationCookie.class.php:122
 #: libraries/plugins/auth/AuthenticationHttp.class.php:96
 #, php-format
 msgid "Welcome to %s"
@@ -10332,38 +10350,38 @@ msgstr ""
 msgid "Retry to connect"
 msgstr "Forsøg at tilslutte igen"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:146
+#: libraries/plugins/auth/AuthenticationCookie.class.php:134
 msgid "Your session has expired. Please log in again."
 msgstr "Din session er udløbet. Log venligst ind igen."
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:170
+#: libraries/plugins/auth/AuthenticationCookie.class.php:158
 msgid "Log in"
 msgstr "Login"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:178
-#: libraries/plugins/auth/AuthenticationCookie.class.php:188
+#: libraries/plugins/auth/AuthenticationCookie.class.php:166
+#: libraries/plugins/auth/AuthenticationCookie.class.php:176
 msgid "You can enter hostname/IP address and port separated by space."
 msgstr ""
 "Du kan angive værtsnavn/IP adresse og port ved at adskille dem med et "
 "mellemrum."
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:193
+#: libraries/plugins/auth/AuthenticationCookie.class.php:181
 msgid "Username:"
 msgstr "Brugernavn:"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:205
+#: libraries/plugins/auth/AuthenticationCookie.class.php:193
 msgid "Server Choice:"
 msgstr "Servervalg:"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:386
+#: libraries/plugins/auth/AuthenticationCookie.class.php:374
 msgid "Entered captcha is wrong, try again!"
 msgstr "Den angivne captcha er forkert, prøv igen!"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:396
+#: libraries/plugins/auth/AuthenticationCookie.class.php:384
 msgid "Please enter correct captcha!"
 msgstr "Angiv venligst korrekt captcha!"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:423
+#: libraries/plugins/auth/AuthenticationCookie.class.php:411
 msgid "You are not allowed to log in to this MySQL server!"
 msgstr "Du har ikke tilladelse til at logge ind på denne MySQL server!"
 
@@ -10459,7 +10477,7 @@ msgstr "Hændelse"
 #: libraries/plugins/export/ExportOdt.class.php:593
 #: libraries/plugins/export/ExportTexytext.class.php:428
 #: libraries/plugins/export/PMA_ExportPdf.class.php:313
-#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:984
 #: libraries/rte/rte_triggers.lib.php:377
 msgid "Definition"
 msgstr "Definition"
@@ -10789,7 +10807,7 @@ msgid "Last check:"
 msgstr "Seneste tjek:"
 
 #: libraries/plugins/export/ExportSql.class.php:1399
-#: templates/structure/structure_table_row.phtml:183
+#: templates/database/structure/structure_table_row.phtml:183
 msgid "in use"
 msgstr "i brug"
 
@@ -10983,18 +11001,14 @@ msgstr "MySQL Spatial Extension understøtter ikke ESRI type \"%s\"."
 msgid "The imported file does not contain any data!"
 msgstr "Den importerede fil indeholder ingen data!"
 
-#: libraries/plugins/import/ImportSql.class.php:169
+#: libraries/plugins/import/ImportSql.class.php:72
 msgid "SQL compatibility mode:"
 msgstr "SQL-kompatibilitetsmodus:"
 
-#: libraries/plugins/import/ImportSql.class.php:181
+#: libraries/plugins/import/ImportSql.class.php:84
 msgid "Do not use <code>AUTO_INCREMENT</code> for zero values"
 msgstr "Brug ikke <code>AUTO_INCREMENT</code> for nulværdier"
 
-#: libraries/plugins/import/ImportSql.class.php:195
-msgid "Read as multibytes"
-msgstr "Læs som multibytes"
-
 #: libraries/plugins/import/ImportXml.class.php:54
 msgid "XML"
 msgstr "XML"
@@ -11037,7 +11051,7 @@ msgid "Show grid"
 msgstr "Vis gitter"
 
 #: libraries/plugins/schema/SchemaPdf.class.php:94
-#: templates/structure/print_view_data_dictionary_link.phtml:6
+#: templates/database/structure/print_view_data_dictionary_link.phtml:6
 msgid "Data Dictionary"
 msgstr "Dataordbog"
 
@@ -11068,7 +11082,7 @@ msgid "The %s table doesn't exist!"
 msgstr "Tabellen \"%s\" findes ikke!"
 
 #: libraries/plugins/schema/eps/Eps_Relation_Schema.class.php:321
-#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:309
+#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:323
 #, php-format
 msgid "Schema of the %s database - Page %s"
 msgstr "Skema for databasen \"%s\" - Side %s"
@@ -11094,7 +11108,7 @@ msgstr "Indholdsfortegnelse"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1005
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1028
 #: libraries/tracking.lib.php:884
-#: templates/structure/table_structure_header.phtml:11
+#: templates/table/structure/table_structure_header.phtml:11
 msgid "Extra"
 msgstr "Ekstra"
 
@@ -11468,11 +11482,11 @@ msgstr "Hurtige trin for at opsætte avancerede muligheder:"
 msgid "Create the needed tables with the <code>%screate_tables.sql</code>."
 msgstr "Opret de nødvendige tabeller med <code>%screate_tables.sql</code>."
 
-#: libraries/relation.lib.php:360
+#: libraries/relation.lib.php:357
 msgid "Create a pma user and give access to these tables."
 msgstr "Opret en pma bruger og giv adgang til disse tabeller."
 
-#: libraries/relation.lib.php:365
+#: libraries/relation.lib.php:360
 msgid ""
 "Enable advanced features in configuration file (<code>config.inc.php</"
 "code>), for example by starting from <code>config.sample.inc.php</code>."
@@ -11480,23 +11494,23 @@ msgstr ""
 "Aktivér avancerede muligheder i konfigurationfilen (<code>config.inc.php</"
 "code>), fx ved at starte med <code>config.sample.inc.php</code>."
 
-#: libraries/relation.lib.php:373
+#: libraries/relation.lib.php:365
 msgid "Re-login to phpMyAdmin to load the updated configuration file."
 msgstr ""
 "Re-login til phpMyAdmin for at indlæse den opdaterede konfigurationsfil."
 
-#: libraries/relation.lib.php:1612
+#: libraries/relation.lib.php:1607
 msgid "no description"
 msgstr "ingen beskrivelse"
 
-#: libraries/relation.lib.php:1811
+#: libraries/relation.lib.php:1806
 msgid ""
 "You do not have necessary privileges to create a database named "
 "'phpmyadmin'. You may go to 'Operations' tab of any database to set up the "
 "phpMyAdmin configuration storage there."
 msgstr ""
 
-#: libraries/relation.lib.php:1928
+#: libraries/relation.lib.php:1923
 #, fuzzy, php-format
 #| msgid "%sCreate%s missing phpMyAdmin configuration storage tables."
 msgid ""
@@ -11504,19 +11518,19 @@ msgid ""
 "configuration storage there."
 msgstr "%sOpret%s manglende tabeller for phpMyAdmin-konfigurationslager."
 
-#: libraries/relation.lib.php:1936
+#: libraries/relation.lib.php:1931
 #, php-format
 msgid ""
 "%sCreate%s the phpMyAdmin configuration storage in the current database."
 msgstr "%sOpret%s phpMyAdmin-konfigurationslageret i den aktuelle database."
 
-#: libraries/relation.lib.php:1944
+#: libraries/relation.lib.php:1939
 #, php-format
 msgid "%sCreate%s missing phpMyAdmin configuration storage tables."
 msgstr "%sOpret%s manglende tabeller for phpMyAdmin-konfigurationslager."
 
 #: libraries/replication_gui.lib.php:46 libraries/replication_gui.lib.php:343
-#: libraries/server_databases.lib.php:387
+#: libraries/server_databases.lib.php:398
 msgid "Master replication"
 msgstr "Master replikation"
 
@@ -11588,7 +11602,7 @@ msgstr ""
 "master."
 
 #: libraries/replication_gui.lib.php:141
-#: libraries/server_databases.lib.php:389
+#: libraries/server_databases.lib.php:400
 msgid "Slave replication"
 msgstr "Slave replikation"
 
@@ -11858,10 +11872,10 @@ msgid "Master server changed successfully to %s."
 msgstr "Master server ændret til %s."
 
 #: libraries/rte/rte_events.lib.php:106 libraries/rte/rte_events.lib.php:115
-#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:149
-#: libraries/rte/rte_routines.lib.php:158
-#: libraries/rte/rte_routines.lib.php:231
-#: libraries/rte/rte_routines.lib.php:1362
+#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:219
+#: libraries/rte/rte_routines.lib.php:246
+#: libraries/rte/rte_routines.lib.php:368
+#: libraries/rte/rte_routines.lib.php:1453
 #: libraries/rte/rte_triggers.lib.php:82 libraries/rte/rte_triggers.lib.php:91
 #: libraries/rte/rte_triggers.lib.php:123
 #, php-format
@@ -11882,7 +11896,7 @@ msgstr "Hændelse \"%1$s\" er blevet ændret."
 msgid "Event %1$s has been created."
 msgstr "Hændelse %1$s er oprettet."
 
-#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:251
+#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:266
 #: libraries/rte/rte_triggers.lib.php:144
 msgid "One or more errors have occurred while processing your request:"
 msgstr "Der er opstået fejl under behandling af anmodningen:"
@@ -11891,7 +11905,7 @@ msgstr "Der er opstået fejl under behandling af anmodningen:"
 msgid "Edit event"
 msgstr "Rediger hændelse"
 
-#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:794
+#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:885
 #: libraries/rte/rte_triggers.lib.php:323 view_create.php:180
 msgid "Details"
 msgstr "Detaljer"
@@ -11904,7 +11918,7 @@ msgstr "Hændelsesnavn"
 msgid "Event type"
 msgstr "Hændelsestype"
 
-#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:817
+#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:908
 #, php-format
 msgid "Change to %s"
 msgstr "Ændr til %s"
@@ -11931,12 +11945,14 @@ msgstr "Slut"
 msgid "On completion preserve"
 msgstr "Efter udførsel bevar"
 
-#: libraries/rte/rte_events.lib.php:491 libraries/rte/rte_routines.lib.php:930
+#: libraries/rte/rte_events.lib.php:491
+#: libraries/rte/rte_routines.lib.php:1021
 #: libraries/rte/rte_triggers.lib.php:383 view_create.php:209
 msgid "Definer"
 msgstr "Opretter"
 
-#: libraries/rte/rte_events.lib.php:535 libraries/rte/rte_routines.lib.php:997
+#: libraries/rte/rte_events.lib.php:535
+#: libraries/rte/rte_routines.lib.php:1088
 #: libraries/rte/rte_triggers.lib.php:422
 msgid "The definer must be in the \"username@hostname\" format!"
 msgstr "Opretter skal være i formatet \"brugernavn@værtsnavn\"!"
@@ -11962,9 +11978,9 @@ msgid "You must provide an event definition."
 msgstr "Du skal angive en hændelsesdefinition."
 
 #: libraries/rte/rte_export.lib.php:43 libraries/rte/rte_general.lib.php:72
-#: libraries/rte/rte_routines.lib.php:345
-#: libraries/rte/rte_routines.lib.php:1198
-#: libraries/rte/rte_routines.lib.php:1411
+#: libraries/rte/rte_routines.lib.php:153
+#: libraries/rte/rte_routines.lib.php:1289
+#: libraries/rte/rte_routines.lib.php:1502
 msgid "Error in processing request:"
 msgstr "Fejl i udførsel af forespørgsel:"
 
@@ -12000,97 +12016,97 @@ msgstr ""
 "kan mislykkes![/strong] Brug den forbedrede 'mysqli'-udvidelse for at undgå "
 "eventuelle problemer."
 
-#: libraries/rte/rte_routines.lib.php:110
-#: libraries/rte/rte_routines.lib.php:1006
+#: libraries/rte/rte_routines.lib.php:123
+msgid "Edit routine"
+msgstr "Rediger rutine"
+
+#: libraries/rte/rte_routines.lib.php:200
+#: libraries/rte/rte_routines.lib.php:1097
 #, php-format
 msgid "Invalid routine type: \"%s\""
 msgstr "Invalid rutinetype: \"%s\""
 
-#: libraries/rte/rte_routines.lib.php:170
+#: libraries/rte/rte_routines.lib.php:253
+#, php-format
+msgid "Routine %1$s has been created."
+msgstr "Rutine %1$s er oprettet."
+
+#: libraries/rte/rte_routines.lib.php:380
 msgid "Sorry, we failed to restore the dropped routine."
 msgstr "Beklager, det lykkedes ikke at genetablere den slettede rutine."
 
-#: libraries/rte/rte_routines.lib.php:211
+#: libraries/rte/rte_routines.lib.php:439
 #, fuzzy, php-format
 #| msgid "Routine %1$s has been modified."
 msgid "Routine %1$s has been modified. Privileges have been adjusted."
 msgstr "Rutine \"%1$s\" er blevet ændret."
 
-#: libraries/rte/rte_routines.lib.php:216
+#: libraries/rte/rte_routines.lib.php:444
 #, php-format
 msgid "Routine %1$s has been modified."
 msgstr "Rutine \"%1$s\" er blevet ændret."
 
-#: libraries/rte/rte_routines.lib.php:238
-#, php-format
-msgid "Routine %1$s has been created."
-msgstr "Rutine %1$s er oprettet."
-
-#: libraries/rte/rte_routines.lib.php:315
-msgid "Edit routine"
-msgstr "Rediger rutine"
-
-#: libraries/rte/rte_routines.lib.php:797
+#: libraries/rte/rte_routines.lib.php:888
 msgid "Routine name"
 msgstr "Rutinenavn"
 
-#: libraries/rte/rte_routines.lib.php:823
+#: libraries/rte/rte_routines.lib.php:914
 msgid "Parameters"
 msgstr "Parametre"
 
-#: libraries/rte/rte_routines.lib.php:829
+#: libraries/rte/rte_routines.lib.php:920
 msgid "Direction"
 msgstr "Retning"
 
-#: libraries/rte/rte_routines.lib.php:847
+#: libraries/rte/rte_routines.lib.php:938
 msgid "Add parameter"
 msgstr "Tilføj parameter"
 
-#: libraries/rte/rte_routines.lib.php:851
+#: libraries/rte/rte_routines.lib.php:942
 msgid "Remove last parameter"
 msgstr "Fjern den sidste parameter"
 
-#: libraries/rte/rte_routines.lib.php:856
+#: libraries/rte/rte_routines.lib.php:947
 msgid "Return type"
 msgstr "Retur type"
 
-#: libraries/rte/rte_routines.lib.php:862
+#: libraries/rte/rte_routines.lib.php:953
 msgid "Return length/values"
 msgstr "Retur-længde/-værdier"
 
-#: libraries/rte/rte_routines.lib.php:868
+#: libraries/rte/rte_routines.lib.php:959
 msgid "Return options"
 msgstr "Retur-indstillinger"
 
-#: libraries/rte/rte_routines.lib.php:899
+#: libraries/rte/rte_routines.lib.php:990
 msgid "Is deterministic"
 msgstr "Er deterministisk"
 
-#: libraries/rte/rte_routines.lib.php:920
+#: libraries/rte/rte_routines.lib.php:1011
 msgid ""
 "You do not have sufficient privileges to perform this operation; Please "
 "refer to the documentation for more details"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:935
+#: libraries/rte/rte_routines.lib.php:1026
 msgid "Security type"
 msgstr "Sikkerhedstype"
 
-#: libraries/rte/rte_routines.lib.php:944
+#: libraries/rte/rte_routines.lib.php:1035
 msgid "SQL data access"
 msgstr "SQL dataadgang"
 
-#: libraries/rte/rte_routines.lib.php:1013
+#: libraries/rte/rte_routines.lib.php:1104
 msgid "You must provide a routine name!"
 msgstr "Du skal angive et rutinenavn!"
 
-#: libraries/rte/rte_routines.lib.php:1047
+#: libraries/rte/rte_routines.lib.php:1138
 #, php-format
 msgid "Invalid direction \"%s\" given for parameter."
 msgstr "Ugyldig retning \"%s\" givet for parameter."
 
-#: libraries/rte/rte_routines.lib.php:1069
-#: libraries/rte/rte_routines.lib.php:1131
+#: libraries/rte/rte_routines.lib.php:1160
+#: libraries/rte/rte_routines.lib.php:1222
 msgid ""
 "You must provide length/values for routine parameters of type ENUM, SET, "
 "VARCHAR and VARBINARY."
@@ -12098,37 +12114,37 @@ msgstr ""
 "Du skal angive længde/værdier for rutineparametre af typen ENUM, SET, "
 "VARCHAR og VARBINARY."
 
-#: libraries/rte/rte_routines.lib.php:1095
+#: libraries/rte/rte_routines.lib.php:1186
 msgid "You must provide a name and a type for each routine parameter."
 msgstr "Du skal angive et navn og en type for hver rutineparameter."
 
-#: libraries/rte/rte_routines.lib.php:1114
+#: libraries/rte/rte_routines.lib.php:1205
 msgid "You must provide a valid return type for the routine."
 msgstr "Du skal angive en gyldig returtype for rutinen."
 
-#: libraries/rte/rte_routines.lib.php:1174
+#: libraries/rte/rte_routines.lib.php:1265
 msgid "You must provide a routine definition."
 msgstr "Du skal angive en rutinedefinition."
 
-#: libraries/rte/rte_routines.lib.php:1285
+#: libraries/rte/rte_routines.lib.php:1376
 #, php-format
 msgid "Execution results of routine %s"
 msgstr "Udførelsesresultater af rutine %s"
 
-#: libraries/rte/rte_routines.lib.php:1340
+#: libraries/rte/rte_routines.lib.php:1431
 #, php-format
 msgid "%d row affected by the last statement inside the procedure."
 msgid_plural "%d rows affected by the last statement inside the procedure."
 msgstr[0] "%d række påvirket af den sidste SQL-sætning inde i proceduren."
 msgstr[1] "%d række(r) påvirket af den sidste SQL-sætning inde i proceduren."
 
-#: libraries/rte/rte_routines.lib.php:1398
-#: libraries/rte/rte_routines.lib.php:1406
+#: libraries/rte/rte_routines.lib.php:1489
+#: libraries/rte/rte_routines.lib.php:1497
 msgid "Execute routine"
 msgstr "Udfør rutine"
 
-#: libraries/rte/rte_routines.lib.php:1485
-#: libraries/rte/rte_routines.lib.php:1488
+#: libraries/rte/rte_routines.lib.php:1576
+#: libraries/rte/rte_routines.lib.php:1579
 msgid "Routine parameters"
 msgstr "Rutineparametre"
 
@@ -12282,7 +12298,7 @@ msgid "Original position"
 msgstr "Oprindelig placering"
 
 #: libraries/server_bin_log.lib.php:133
-#: templates/structure/display_table_stats.phtml:4
+#: templates/table/structure/display_table_stats.phtml:4
 msgid "Information"
 msgstr "Information"
 
@@ -12320,12 +12336,12 @@ msgstr ""
 "Bemærk: Aktivering af databasestatistikkerne her kan forårsage tung trafik "
 "mellem webserveren og MySQL-serveren."
 
-#: libraries/server_databases.lib.php:364
-#: libraries/server_databases.lib.php:365
+#: libraries/server_databases.lib.php:366
+#: libraries/server_databases.lib.php:371
 msgid "Enable Statistics"
 msgstr "Slå statistikker til"
 
-#: libraries/server_databases.lib.php:481
+#: libraries/server_databases.lib.php:492
 #, php-format
 msgid "%1$d database has been dropped successfully."
 msgid_plural "%1$d databases have been dropped successfully."
@@ -12698,7 +12714,7 @@ msgid "You have revoked the privileges for %s."
 msgstr "Du har tilbagekaldt privilegierne for %s."
 
 #: libraries/server_privileges.lib.php:2059
-#: libraries/server_privileges.lib.php:4290
+#: libraries/server_privileges.lib.php:4316
 #, fuzzy
 #| msgid "Add user group"
 msgid "Add user account"
@@ -12877,40 +12893,40 @@ msgstr "Sletter %s"
 msgid "The privileges were reloaded successfully."
 msgstr "Privilegierne blev korrekt genindlæst."
 
-#: libraries/server_privileges.lib.php:3994
+#: libraries/server_privileges.lib.php:4003
 #, php-format
 msgid "The user %s already exists!"
 msgstr "Brugeren %s findes i forvejen!"
 
-#: libraries/server_privileges.lib.php:4232
+#: libraries/server_privileges.lib.php:4258
 #, php-format
 msgid "Privileges for %s"
 msgstr "Privilegier for %s"
 
-#: libraries/server_privileges.lib.php:4241
+#: libraries/server_privileges.lib.php:4267
 #: libraries/server_status_processes.lib.php:72
 #: libraries/server_user_groups.lib.php:39
 msgid "User"
 msgstr "Bruger"
 
-#: libraries/server_privileges.lib.php:4282
+#: libraries/server_privileges.lib.php:4308
 msgctxt "Create new user"
 msgid "New"
 msgstr "Ny"
 
-#: libraries/server_privileges.lib.php:4311
+#: libraries/server_privileges.lib.php:4337
 #, fuzzy
 #| msgid "Edit Privileges:"
 msgid "Edit privileges:"
 msgstr "Ret privilegier:"
 
-#: libraries/server_privileges.lib.php:4312
+#: libraries/server_privileges.lib.php:4338
 #, fuzzy
 #| msgid "User group"
 msgid "User account"
 msgstr "Brugergruppe"
 
-#: libraries/server_privileges.lib.php:4371
+#: libraries/server_privileges.lib.php:4397
 msgid ""
 "Note: You are attempting to edit privileges of the user with which you are "
 "currently logged in."
@@ -12918,20 +12934,20 @@ msgstr ""
 "Bemærk: Du forsøger at redigere privilegier for brugeren som du aktuelt er "
 "logget ind som."
 
-#: libraries/server_privileges.lib.php:4391 libraries/server_users.lib.php:25
+#: libraries/server_privileges.lib.php:4417 libraries/server_users.lib.php:25
 #, fuzzy
 #| msgid "Users overview"
 msgid "User accounts overview"
 msgstr "Oversigt over brugere"
 
-#: libraries/server_privileges.lib.php:4459
+#: libraries/server_privileges.lib.php:4485
 msgid ""
 "A user account allowing any user from localhost to connect is present. This "
 "will prevent other users from connecting if the host part of their account "
 "allows a connection from any (%) host."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4500
+#: libraries/server_privileges.lib.php:4526
 #, php-format
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
@@ -12945,7 +12961,7 @@ msgstr ""
 "ændringer i den. Hvis dette er tilfældet, bør du %sgenindlæse privilegierne"
 "%s før du fortsætter."
 
-#: libraries/server_privileges.lib.php:4519
+#: libraries/server_privileges.lib.php:4545
 #, fuzzy
 #| msgid ""
 #| "Note: phpMyAdmin gets the users' privileges directly from MySQL's "
@@ -12965,25 +12981,25 @@ msgstr ""
 "ændringer i den. Hvis dette er tilfældet, bør du %sgenindlæse privilegierne"
 "%s før du fortsætter."
 
-#: libraries/server_privileges.lib.php:4569
+#: libraries/server_privileges.lib.php:4595
 msgid "The selected user was not found in the privilege table."
 msgstr "Den valgte bruger blev ikke fundet i privilegietabellen."
 
-#: libraries/server_privileges.lib.php:4801
+#: libraries/server_privileges.lib.php:4827
 msgid "You have added a new user."
 msgstr "Du har tilføjet en ny bruger."
 
-#: libraries/server_status.lib.php:53
+#: libraries/server_status.lib.php:60
 #, php-format
 msgid "Network traffic since startup: %s"
 msgstr "Netværkstrafik siden opstart: %s"
 
-#: libraries/server_status.lib.php:66
+#: libraries/server_status.lib.php:73
 #, php-format
 msgid "This MySQL server has been running for %1$s. It started up on %2$s."
 msgstr "Denne MySQL-server har kørt i %1$s. Den startede op den %2$s."
 
-#: libraries/server_status.lib.php:80
+#: libraries/server_status.lib.php:94
 msgid ""
 "This MySQL server works as <b>master</b> and <b>slave</b> in <b>replication</"
 "b> process."
@@ -12991,21 +13007,21 @@ msgstr ""
 "Denne MySQL server fungerer som <b>master</b> og <b>slave</b> i en "
 "<b>replikation</b>sproces."
 
-#: libraries/server_status.lib.php:85
+#: libraries/server_status.lib.php:99
 msgid "This MySQL server works as <b>master</b> in <b>replication</b> process."
 msgstr ""
 "Denne MySQL server fungerer som <b>master</b> i en <b>replikation</b>sproces."
 
-#: libraries/server_status.lib.php:90
+#: libraries/server_status.lib.php:104
 msgid "This MySQL server works as <b>slave</b> in <b>replication</b> process."
 msgstr ""
 "Denne MySQL server fungerer som <b>slave</b> i en <b>replikation</b>sproces."
 
-#: libraries/server_status.lib.php:106
+#: libraries/server_status.lib.php:116
 msgid "Replication status"
 msgstr "Status for replikation"
 
-#: libraries/server_status.lib.php:137
+#: libraries/server_status.lib.php:146
 msgid ""
 "On a busy server, the byte counters may overrun, so those statistics as "
 "reported by the MySQL server may be incorrect."
@@ -13013,21 +13029,21 @@ msgstr ""
 "På en travl server er der risiko for at bytetællerne løber over, så disse "
 "statistikker som rapporteret af MySQL-serveren kan være forkerte."
 
-#: libraries/server_status.lib.php:148
+#: libraries/server_status.lib.php:157
 msgid "Received"
 msgstr "Modtaget"
 
-#: libraries/server_status.lib.php:167
+#: libraries/server_status.lib.php:176
 msgid "Sent"
 msgstr "Sendt"
 
-#: libraries/server_status.lib.php:234
+#: libraries/server_status.lib.php:243
 #, fuzzy
 #| msgid "max. concurrent connections"
 msgid "Max. concurrent connections"
 msgstr "Maks. samtidige forbindelser"
 
-#: libraries/server_status.lib.php:244
+#: libraries/server_status.lib.php:253
 msgid "Failed attempts"
 msgstr "Mislykkede forsøg"
 
@@ -14104,7 +14120,7 @@ msgstr ""
 msgid "Not implemented yet."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/AlterOperation.php:193
+#: libraries/sql-parser/src/Components/AlterOperation.php:191
 #, fuzzy
 #| msgid "Iconic table operations"
 msgid "Unrecognized alter operation."
@@ -14120,7 +14136,7 @@ msgid "An opening bracket followed by a set of values was expected."
 msgstr ""
 
 #: libraries/sql-parser/src/Components/ArrayObj.php:101
-#: libraries/sql-parser/src/Components/FieldDefinition.php:202
+#: libraries/sql-parser/src/Components/CreateDefinition.php:202
 msgid "An opening bracket was expected."
 msgstr ""
 
@@ -14128,25 +14144,35 @@ msgstr ""
 msgid "A comma or a closing bracket was expected"
 msgstr ""
 
+#: libraries/sql-parser/src/Components/CreateDefinition.php:246
+#, fuzzy
+#| msgid "No tables selected."
+msgid "A comma or a closing bracket was expected."
+msgstr "Ingen tabeller valgt."
+
+#: libraries/sql-parser/src/Components/CreateDefinition.php:262
+msgid "A closing bracket was expected."
+msgstr ""
+
 #: libraries/sql-parser/src/Components/DataType.php:125
 msgid "Unrecognized data type."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:225
+#: libraries/sql-parser/src/Components/Expression.php:227
 msgid "Unexpected closing bracket."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:246
-#: libraries/sql-parser/src/Components/Expression.php:283
-#: libraries/sql-parser/src/Components/Expression.php:303
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:285
+#: libraries/sql-parser/src/Components/Expression.php:305
 msgid "An alias was previously found."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:257
+#: libraries/sql-parser/src/Components/Expression.php:259
 msgid "Unexpected dot."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:327
+#: libraries/sql-parser/src/Components/Expression.php:329
 #, fuzzy
 #| msgid "No tables selected."
 msgid "An alias was expected."
@@ -14158,16 +14184,6 @@ msgstr "Ingen tabeller valgt."
 msgid "An expression was expected."
 msgstr "Der er ikke valgt versioner."
 
-#: libraries/sql-parser/src/Components/FieldDefinition.php:246
-#, fuzzy
-#| msgid "No tables selected."
-msgid "A comma or a closing bracket was expected."
-msgstr "Ingen tabeller valgt."
-
-#: libraries/sql-parser/src/Components/FieldDefinition.php:262
-msgid "A closing bracket was expected."
-msgstr ""
-
 #: libraries/sql-parser/src/Components/Limit.php:90
 #: libraries/sql-parser/src/Components/Limit.php:112
 msgid "An offset was expected."
@@ -14215,29 +14231,29 @@ msgstr ""
 msgid "Expected delimiter."
 msgstr ""
 
-#: libraries/sql-parser/src/Lexer.php:753
+#: libraries/sql-parser/src/Lexer.php:777
 #, fuzzy, php-format
 #| msgid "Event %1$s has been created."
 msgid "Ending quote %1$s was expected."
 msgstr "Hændelse %1$s er oprettet."
 
-#: libraries/sql-parser/src/Lexer.php:789
+#: libraries/sql-parser/src/Lexer.php:813
 #, fuzzy
 #| msgid "Table name template"
 msgid "Variable name was expected."
 msgstr "Skabelon for tabelnavn"
 
-#: libraries/sql-parser/src/Parser.php:380
+#: libraries/sql-parser/src/Parser.php:391
 #, fuzzy
 #| msgid "at beginning of table"
 msgid "Unexpected beginning of statement."
 msgstr "i begyndelsen af tabellen"
 
-#: libraries/sql-parser/src/Parser.php:399
+#: libraries/sql-parser/src/Parser.php:410
 msgid "Unrecognized statement type."
 msgstr ""
 
-#: libraries/sql-parser/src/Parser.php:479
+#: libraries/sql-parser/src/Parser.php:489
 msgid "No transaction was previously started."
 msgstr ""
 
@@ -14267,8 +14283,10 @@ msgid "The name of the entity was expected."
 msgstr "Antallet af tabeller der er åbne."
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:310
-msgid "At least one field definition was expected."
-msgstr ""
+#, fuzzy
+#| msgid "The row has been deleted."
+msgid "At least one column definition was expected."
+msgstr "Rækken er slettet."
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:329
 msgid "A \"RETURNS\" keyword was expected."
@@ -14327,11 +14345,11 @@ msgstr "Bogmærke blev ikke oprettet!"
 msgid "Using bookmark \"%s\" as default browse query."
 msgstr "Bruger bogmærket \"%s\" som standard-forespørgsel til gennemsyn."
 
-#: libraries/sql.lib.php:1306
+#: libraries/sql.lib.php:1300
 msgid "Showing as PHP code"
 msgstr "Viser som PHP-kode"
 
-#: libraries/sql.lib.php:1638
+#: libraries/sql.lib.php:1632
 #, fuzzy, php-format
 #| msgid ""
 #| "Current selection does not contain a unique column. Grid edit, checkbox, "
@@ -14343,7 +14361,7 @@ msgstr ""
 "Den nuværende markering indeholder ikke en unik kolonne. Redigering af "
 "gitter, afkrydsningsfelt, redigering og sletning er ikke tilgængelige."
 
-#: libraries/sql.lib.php:1649
+#: libraries/sql.lib.php:1643
 #, fuzzy, php-format
 #| msgid ""
 #| "Current selection does not contain a unique column. Grid edit, checkbox, "
@@ -14355,7 +14373,7 @@ msgstr ""
 "Den nuværende markering indeholder ikke en unik kolonne. Redigering af "
 "gitter, afkrydsningsfelt, redigering og sletning er ikke tilgængelige."
 
-#: libraries/sql.lib.php:1688
+#: libraries/sql.lib.php:1682
 #, php-format
 msgid "Problems with indexes of table `%s`"
 msgstr "Problemer med indeksene på tabel `%s`"
@@ -14514,7 +14532,7 @@ msgid "Version %s snapshot (SQL code)"
 msgstr "Version %s snapshot (SQL kode)"
 
 #: libraries/tracking.lib.php:947
-#: templates/structure/table_structure_row.phtml:33
+#: templates/table/structure/table_structure_row.phtml:33
 msgctxt "None for default"
 msgid "None"
 msgstr "Ingen"
@@ -14568,15 +14586,15 @@ msgstr "Version %1$s af %2$s blev slettet."
 msgid "Version %1$s was created, tracking for %2$s is active."
 msgstr "Version %1$s blev oprettet, sporing af %2$s er aktiv."
 
-#: libraries/user_preferences.inc.php:29
+#: libraries/user_preferences.inc.php:30
 msgid "Manage your settings"
 msgstr "Administrer dine indstillinger"
 
-#: libraries/user_preferences.inc.php:46 prefs_manage.php:307
+#: libraries/user_preferences.inc.php:54 prefs_manage.php:307
 msgid "Configuration has been saved."
 msgstr "Konfigurationen er gemt."
 
-#: libraries/user_preferences.inc.php:66
+#: libraries/user_preferences.inc.php:74
 #, php-format
 msgid ""
 "Your preferences will be saved for current session only. Storing them "
@@ -14972,7 +14990,7 @@ msgid "first"
 msgstr "første"
 
 #: templates/columns_definitions/move_column.phtml:12
-#: templates/structure/add_column.phtml:21
+#: templates/table/structure/add_column.phtml:21
 #, php-format
 msgid "after %s"
 msgstr "efter %s"
@@ -15041,199 +15059,296 @@ msgstr "Input-transformation"
 msgid "Input transformation options"
 msgstr "Tilvalg for input-transformation"
 
-#: templates/designer/aggregate_query_panel.phtml:22
-#: templates/designer/options_panel.phtml:100
+#: templates/database/create_table.phtml:7
+#: templates/database/designer/side_menu.phtml:77
+#: templates/database/designer/side_menu.phtml:80
+msgid "Create table"
+msgstr "Opret tabel"
+
+#: templates/database/create_table.phtml:15
+msgid "Number of columns"
+msgstr "Antal kolonner"
+
+#: templates/database/designer/aggregate_query_panel.phtml:22
+#: templates/database/designer/options_panel.phtml:100
 msgid "Aggregate"
 msgstr "Sammenstil"
 
-#: templates/designer/aggregate_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:61
-#: templates/designer/options_panel.phtml:106
-#: templates/designer/options_panel.phtml:170
-#: templates/designer/where_query_panel.phtml:30
-#: templates/table/table_header.phtml:9
+#: templates/database/designer/aggregate_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:61
+#: templates/database/designer/options_panel.phtml:106
+#: templates/database/designer/options_panel.phtml:170
+#: templates/database/designer/where_query_panel.phtml:30
+#: templates/table/search/table_header.phtml:9
 msgid "Operator"
 msgstr "Operatør"
 
-#: templates/designer/database_tables.phtml:29
+#: templates/database/designer/database_tables.phtml:29
 msgid "Toggle"
 msgstr ""
 
-#: templates/designer/database_tables.phtml:40
+#: templates/database/designer/database_tables.phtml:40
 #, fuzzy
 #| msgid "Table structure"
 msgid "See table structure"
 msgstr "Tabel-struktur"
 
-#: templates/designer/delete_relation_panel.phtml:21
+#: templates/database/designer/delete_relation_panel.phtml:21
 msgid "Delete relation"
 msgstr "Slet relation"
 
-#: templates/designer/edit_delete_pages.phtml:7
+#: templates/database/designer/edit_delete_pages.phtml:7
 msgid "Page to open"
 msgstr "Side som skal åbnes"
 
-#: templates/designer/edit_delete_pages.phtml:7
+#: templates/database/designer/edit_delete_pages.phtml:7
 msgid "Page to delete"
 msgstr "Side som skal slettes"
 
-#: templates/designer/having_query_panel.phtml:90
-#: templates/designer/options_panel.phtml:63
-#: templates/designer/options_panel.phtml:229
-#: templates/designer/where_query_panel.phtml:59
+#: templates/database/designer/having_query_panel.phtml:90
+#: templates/database/designer/options_panel.phtml:63
+#: templates/database/designer/options_panel.phtml:229
+#: templates/database/designer/where_query_panel.phtml:59
 msgid "Except"
 msgstr "Undtagen"
 
-#: templates/designer/having_query_panel.phtml:102
-#: templates/designer/options_panel.phtml:75
-#: templates/designer/options_panel.phtml:241
-#: templates/designer/where_query_panel.phtml:71
+#: templates/database/designer/having_query_panel.phtml:102
+#: templates/database/designer/options_panel.phtml:75
+#: templates/database/designer/options_panel.phtml:241
+#: templates/database/designer/where_query_panel.phtml:71
 msgid "subquery"
 msgstr "underforespørgsel"
 
-#: templates/designer/new_relation_panel.phtml:22
-#: templates/designer/side_menu.phtml:84 templates/designer/side_menu.phtml:87
+#: templates/database/designer/new_relation_panel.phtml:22
+#: templates/database/designer/side_menu.phtml:84
+#: templates/database/designer/side_menu.phtml:87
 msgid "Create relation"
 msgstr "Opret relation"
 
-#: templates/designer/options_panel.phtml:34
-#: templates/designer/options_panel.phtml:200
+#: templates/database/designer/options_panel.phtml:34
+#: templates/database/designer/options_panel.phtml:200
 msgid "Relation operator"
 msgstr "Relationsoperator"
 
-#: templates/designer/options_panel.phtml:85
-#: templates/designer/rename_to_panel.phtml:23
+#: templates/database/designer/options_panel.phtml:85
+#: templates/database/designer/rename_to_panel.phtml:23
 msgid "Rename to"
 msgstr "Omdøb til"
 
-#: templates/designer/options_panel.phtml:91
-#: templates/designer/rename_to_panel.phtml:31
+#: templates/database/designer/options_panel.phtml:91
+#: templates/database/designer/rename_to_panel.phtml:31
 msgid "New name"
 msgstr "Nyt navn"
 
-#: templates/designer/page_save_as.phtml:4
+#: templates/database/designer/page_save_as.phtml:4
 msgid "Save to selected page"
 msgstr "Gem til valgte side"
 
-#: templates/designer/page_save_as.phtml:5
+#: templates/database/designer/page_save_as.phtml:5
 msgid "Create a page and save to it"
 msgstr "Opret en side og gem i denne"
 
-#: templates/designer/page_save_as.phtml:26
+#: templates/database/designer/page_save_as.phtml:26
 msgid "New page name"
 msgstr "Nyt sidenavn"
 
-#: templates/designer/page_selector.phtml:2
+#: templates/database/designer/page_selector.phtml:2
 msgid "Select page"
 msgstr "Vælg side"
 
-#: templates/designer/query_details.phtml:10
+#: templates/database/designer/query_details.phtml:10
 msgid "Active options"
 msgstr "Aktive indstillinger"
 
-#: templates/designer/schema_export.phtml:4
+#: templates/database/designer/schema_export.phtml:4
 msgid "Select Export Relational Type"
 msgstr "Vælg Export Relational Type"
 
-#: templates/designer/side_menu.phtml:19 templates/designer/side_menu.phtml:25
+#: templates/database/designer/side_menu.phtml:19
+#: templates/database/designer/side_menu.phtml:25
 msgid "Show/Hide tables list"
 msgstr "Vis/skjul tabelliste"
 
-#: templates/designer/side_menu.phtml:29 templates/designer/side_menu.phtml:35
-#: templates/designer/side_menu.phtml:36
+#: templates/database/designer/side_menu.phtml:29
+#: templates/database/designer/side_menu.phtml:35
+#: templates/database/designer/side_menu.phtml:36
 msgid "View in fullscreen"
 msgstr "Vis i fuldskærmsvisning"
 
-#: templates/designer/side_menu.phtml:34
+#: templates/database/designer/side_menu.phtml:34
 msgid "Exit fullscreen"
 msgstr "Afslut fuldskærmsvisning"
 
-#: templates/designer/side_menu.phtml:41 templates/designer/side_menu.phtml:45
+#: templates/database/designer/side_menu.phtml:41
+#: templates/database/designer/side_menu.phtml:45
 msgid "New page"
 msgstr "Nyt side"
 
-#: templates/designer/side_menu.phtml:70 templates/designer/side_menu.phtml:73
+#: templates/database/designer/side_menu.phtml:70
+#: templates/database/designer/side_menu.phtml:73
 msgid "Delete pages"
 msgstr "Slet sider"
 
-#: templates/designer/side_menu.phtml:77 templates/designer/side_menu.phtml:80
-#: templates/table/create_table.phtml:7
-msgid "Create table"
-msgstr "Opret tabel"
-
-#: templates/designer/side_menu.phtml:98
-#: templates/designer/side_menu.phtml:101
+#: templates/database/designer/side_menu.phtml:98
+#: templates/database/designer/side_menu.phtml:101
 msgid "Reload"
 msgstr "Genindlæs"
 
-#: templates/designer/side_menu.phtml:107
-#: templates/designer/side_menu.phtml:110
+#: templates/database/designer/side_menu.phtml:107
+#: templates/database/designer/side_menu.phtml:110
 msgid "Help"
 msgstr "Hjælp"
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Angular links"
 msgstr "Angulære links"
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Direct links"
 msgstr "Direkte links"
 
-#: templates/designer/side_menu.phtml:122
-#: templates/designer/side_menu.phtml:124
+#: templates/database/designer/side_menu.phtml:122
+#: templates/database/designer/side_menu.phtml:124
 msgid "Snap to grid"
 msgstr "Snap til gitter"
 
-#: templates/designer/side_menu.phtml:128
-#: templates/designer/side_menu.phtml:134
+#: templates/database/designer/side_menu.phtml:128
+#: templates/database/designer/side_menu.phtml:134
 msgid "Small/Big All"
 msgstr "Små/store alle"
 
-#: templates/designer/side_menu.phtml:138
-#: templates/designer/side_menu.phtml:141
+#: templates/database/designer/side_menu.phtml:138
+#: templates/database/designer/side_menu.phtml:141
 msgid "Toggle small/big"
 msgstr "Skift mellem små/store"
 
-#: templates/designer/side_menu.phtml:145
-#: templates/designer/side_menu.phtml:148
+#: templates/database/designer/side_menu.phtml:145
+#: templates/database/designer/side_menu.phtml:148
 msgid "Toggle relation lines"
 msgstr "Slå relationslinjer til eller fra"
 
-#: templates/designer/side_menu.phtml:153
-#: templates/designer/side_menu.phtml:156
+#: templates/database/designer/side_menu.phtml:153
+#: templates/database/designer/side_menu.phtml:156
 msgid "Export schema"
 msgstr "Eksportér skema"
 
-#: templates/designer/side_menu.phtml:165
-#: templates/designer/side_menu.phtml:168
+#: templates/database/designer/side_menu.phtml:165
+#: templates/database/designer/side_menu.phtml:168
 msgid "Build Query"
 msgstr "Opret forespørgsel"
 
-#: templates/designer/side_menu.phtml:173
-#: templates/designer/side_menu.phtml:177
+#: templates/database/designer/side_menu.phtml:173
+#: templates/database/designer/side_menu.phtml:177
 msgid "Move Menu"
 msgstr "Flyt Menu"
 
-#: templates/designer/side_menu.phtml:181
-#: templates/designer/side_menu.phtml:186
+#: templates/database/designer/side_menu.phtml:181
+#: templates/database/designer/side_menu.phtml:186
 msgid "Pin text"
 msgstr "Fastgør tekst"
 
-#: templates/designer/table_list.phtml:4
+#: templates/database/designer/table_list.phtml:4
 msgid "Hide/Show all"
 msgstr "Skjul/Vis alle"
 
-#: templates/designer/table_list.phtml:14
+#: templates/database/designer/table_list.phtml:14
 msgid "Hide/Show Tables with no relation"
 msgstr "Skjul/Vis tabeller uden relation"
 
-#: templates/designer/table_list.phtml:59
+#: templates/database/designer/table_list.phtml:59
 msgid "Number of tables:"
 msgstr "Antal tabeller:"
 
+#: templates/database/structure/body_for_table_summary.phtml:6
+#, php-format
+msgid "%s table"
+msgid_plural "%s tables"
+msgstr[0] "%s tabel"
+msgstr[1] "%s tabeller"
+
+#: templates/database/structure/body_for_table_summary.phtml:17
+msgid "Sum"
+msgstr "Sum"
+
+#: templates/database/structure/check_all_tables.phtml:6
+msgid "Check tables having overhead"
+msgstr "Tjek tabeller der har overhead"
+
+#: templates/database/structure/check_all_tables.phtml:10
+msgid "Show create"
+msgstr "Vis opret"
+
+#: templates/database/structure/check_all_tables.phtml:27
+#, fuzzy
+#| msgid "Add prefix"
+msgid "Prefix"
+msgstr "Tilføj præfiks"
+
+#: templates/database/structure/check_all_tables.phtml:28
+msgid "Add prefix to table"
+msgstr "Tilføj præfiks til tabel"
+
+#: templates/database/structure/check_all_tables.phtml:29
+msgid "Replace table prefix"
+msgstr "Erstat tabel præfiks"
+
+#: templates/database/structure/check_all_tables.phtml:30
+msgid "Copy table with prefix"
+msgstr "Kopier tabel med præfiks"
+
+#: templates/database/structure/check_all_tables.phtml:36
+msgid "Add columns to central list"
+msgstr "Tilføj kolnner til centerliste"
+
+#: templates/database/structure/check_all_tables.phtml:37
+msgid "Remove columns from central list"
+msgstr "Fjern kolonner fra centerliste"
+
+#: templates/database/structure/check_all_tables.phtml:38
+msgid "Make consistent with central list"
+msgstr "Gør konsistent med central liste"
+
+#: templates/database/structure/favorite_anchor.phtml:12
+msgid "Add to Favorites"
+msgstr "Tilføj til Favoritter"
+
+#: templates/database/structure/show_create.phtml:2
+msgid "Showing create queries"
+msgstr "Vis oprettelses SQL-forespørgsler"
+
+#: templates/database/structure/sortable_header.phtml:13
+msgid "Sort"
+msgstr "Sortér"
+
+#: templates/database/structure/table_header.phtml:42
+msgid ""
+"May be approximate. Click on the number to get the exact count. See "
+"[doc@faq3-11]FAQ 3.11[/doc]."
+msgstr ""
+"Kan være anslået. Klik på tallet for at få korrekt antal. Se [doc@faq3-11] "
+"FAQ 3.11[/doc]."
+
+#: templates/database/structure/table_header.phtml:66
+#: templates/table/index_form.phtml:127
+msgid "Size"
+msgstr "Størrelse"
+
+#: templates/database/structure/table_header.phtml:74
+#: templates/table/structure/display_table_stats.phtml:27
+msgid "Overhead"
+msgstr "Overhead"
+
+#: templates/database/structure/tracking_icon.phtml:4
+msgid "Tracking is active."
+msgstr "Sporing er aktiv."
+
+#: templates/database/structure/tracking_icon.phtml:8
+msgid "Tracking is not active."
+msgstr "Sporing er ikke aktiv."
+
 #: templates/error/report_form.phtml:7
 msgid ""
 "phpMyAdmin has encountered an error. We have collected data about this error "
@@ -15252,60 +15367,6 @@ msgstr "Du kan gennemse indholdet i fejlrapporten:"
 msgid "Please explain the steps that lead to the error:"
 msgstr "Forklar venligst de trin som førte til fejlen:"
 
-#: templates/gis_visualization/gis_visualization.phtml:3
-msgid "Display GIS Visualization"
-msgstr "Vis GIS visualisering"
-
-#: templates/gis_visualization/gis_visualization.phtml:8
-msgid "Label column"
-msgstr "Tekst for kolonne"
-
-#: templates/gis_visualization/gis_visualization.phtml:11
-msgid "-- None --"
-msgstr "-- Ingen --"
-
-#: templates/gis_visualization/gis_visualization.phtml:19
-msgid "Spatial column"
-msgstr "Spatial kolonne"
-
-#: templates/index_form.phtml:16
-msgid "Index name:"
-msgstr "Indeksnavn;:"
-
-#: templates/index_form.phtml:19
-msgid ""
-"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
-msgstr ""
-"\"PRIMARY\" <b>skal</b> være navnet på og <b>kun på</b> en primær nøgle!"
-
-#: templates/index_form.phtml:40
-msgid "Index choice:"
-msgstr "Indeksvalg:"
-
-#: templates/index_form.phtml:57
-msgid "Key block size:"
-msgstr "Blokstørrelse på nøgle:"
-
-#: templates/index_form.phtml:74
-msgid "Index type:"
-msgstr "Indekstype:"
-
-#: templates/index_form.phtml:86
-msgid "Parser:"
-msgstr "Fortolker:"
-
-#: templates/index_form.phtml:102
-msgid "Comment:"
-msgstr "Kommentar:"
-
-#: templates/index_form.phtml:127 templates/structure/table_header.phtml:66
-msgid "Size"
-msgstr "Størrelse"
-
-#: templates/index_form.phtml:149 templates/index_form.phtml:190
-msgid "Drag to reorder"
-msgstr "Træk for at ændre rækkefølge"
-
 #: templates/prefs_autoload.phtml:9
 msgid ""
 "Your browser has phpMyAdmin configuration for this domain. Would you like to "
@@ -15318,363 +15379,151 @@ msgstr ""
 msgid "Start row:"
 msgstr "Startrække:"
 
-#: templates/structure/actions_in_table_structure.phtml:14
-#, php-format
-msgid "A primary key has been added on %s."
-msgstr "En primær nøgle er blevet tilføjet til %s."
-
-#: templates/structure/actions_in_table_structure.phtml:34
-#: templates/structure/actions_in_table_structure.phtml:54
-#: templates/structure/actions_in_table_structure.phtml:79
-#: templates/structure/actions_in_table_structure.phtml:101
-#, php-format
-msgid "An index has been added on %s."
-msgstr "Der er tilføjet et indeks til %s."
-
-#: templates/structure/actions_in_table_structure.phtml:130
-#: templates/structure/check_all_table_column.phtml:59
-msgid "Remove from central columns"
-msgstr "Fjern kolonner"
-
-#: templates/structure/actions_in_table_structure.phtml:138
-#: templates/structure/check_all_table_column.phtml:55
-msgid "Add to central columns"
-msgstr "Tilføj kolonner"
-
-#: templates/structure/add_column.phtml:7
-#, php-format
-msgid "Add %s column(s)"
-msgstr "Tilføj %s kolonne(r)"
-
-#: templates/structure/add_column.phtml:12
-msgid "at beginning of table"
-msgstr "i begyndelsen af tabellen"
-
-#: templates/structure/body_for_table_summary.phtml:6
-#, php-format
-msgid "%s table"
-msgid_plural "%s tables"
-msgstr[0] "%s tabel"
-msgstr[1] "%s tabeller"
-
-#: templates/structure/body_for_table_summary.phtml:17
-msgid "Sum"
-msgstr "Sum"
-
-#: templates/structure/check_all_tables.phtml:6
-msgid "Check tables having overhead"
-msgstr "Tjek tabeller der har overhead"
-
-#: templates/structure/check_all_tables.phtml:10
-msgid "Show create"
-msgstr "Vis opret"
-
-#: templates/structure/check_all_tables.phtml:27
-#, fuzzy
-#| msgid "Add prefix"
-msgid "Prefix"
-msgstr "Tilføj præfiks"
-
-#: templates/structure/check_all_tables.phtml:28
-msgid "Add prefix to table"
-msgstr "Tilføj præfiks til tabel"
-
-#: templates/structure/check_all_tables.phtml:29
-msgid "Replace table prefix"
-msgstr "Erstat tabel præfiks"
-
-#: templates/structure/check_all_tables.phtml:30
-msgid "Copy table with prefix"
-msgstr "Kopier tabel med præfiks"
-
-#: templates/structure/check_all_tables.phtml:36
-msgid "Add columns to central list"
-msgstr "Tilføj kolnner til centerliste"
-
-#: templates/structure/check_all_tables.phtml:37
-msgid "Remove columns from central list"
-msgstr "Fjern kolonner fra centerliste"
-
-#: templates/structure/check_all_tables.phtml:38
-msgid "Make consistent with central list"
-msgstr "Gør konsistent med central liste"
-
-#: templates/structure/display_structure.phtml:140 view_create.php:181
-msgid "Edit view"
-msgstr "Rediger view"
-
-#: templates/structure/display_table_stats.phtml:9
-msgid "Space usage"
-msgstr "Pladsforbrug"
-
-#: templates/structure/display_table_stats.phtml:27
-#: templates/structure/table_header.phtml:74
-msgid "Overhead"
-msgstr "Overhead"
-
-#: templates/structure/display_table_stats.phtml:32
-msgid "Effective"
-msgstr "Effektiv"
-
-#: templates/structure/favorite_anchor.phtml:12
-msgid "Add to Favorites"
-msgstr "Tilføj til Favoritter"
-
-#: templates/structure/move_columns_dialog.phtml:1
-#: templates/structure/optional_action_links.phtml:21
-msgid "Move columns"
-msgstr "Flyt kolonner"
-
-#: templates/structure/move_columns_dialog.phtml:2
-msgid "Move the columns by dragging them up and down."
-msgstr "Flyt kolonnerne ved at trække dem op og ned."
-
-#: templates/structure/optional_action_links.phtml:9
-msgid "Propose table structure"
-msgstr "Foreslå tabelstruktur"
-
-#: templates/structure/optional_action_links.phtml:24
-msgid "Improve table structure"
-msgstr "Forbedring af tabelstruktur"
-
-#: templates/structure/optional_action_links.phtml:30
-msgid "Track view"
-msgstr "Spor visning"
-
-#: templates/structure/row_stats_table.phtml:3
-msgid "Row statistics"
-msgstr "Rækkestatistik"
-
-#: templates/structure/row_stats_table.phtml:9
-msgid "static"
-msgstr "statisk"
-
-#: templates/structure/row_stats_table.phtml:11
-msgid "dynamic"
-msgstr "dynamisk"
-
-#: templates/structure/row_stats_table.phtml:22
-msgid "partitioned"
-msgstr "partitioneret"
-
-#: templates/structure/row_stats_table.phtml:54
-msgid "Row length"
-msgstr "Rækkelængde"
-
-#: templates/structure/row_stats_table.phtml:66
-msgid "Row size"
-msgstr "Rækkestørrelse"
-
-#: templates/structure/row_stats_table.phtml:73
-msgid "Next autoindex"
-msgstr "Næste autoindeks"
-
-#: templates/structure/secondary_tabs.phtml:14
-msgid "Relation view"
-msgstr "Visning af relation"
-
-#: templates/structure/show_create.phtml:2
-msgid "Showing create queries"
-msgstr "Vis oprettelses SQL-forespørgsler"
-
-#: templates/structure/sortable_header.phtml:13
-msgid "Sort"
-msgstr "Sortér"
-
-#: templates/structure/table_header.phtml:42
-msgid ""
-"May be approximate. Click on the number to get the exact count. See "
-"[doc@faq3-11]FAQ 3.11[/doc]."
-msgstr ""
-"Kan være anslået. Klik på tallet for at få korrekt antal. Se [doc@faq3-11] "
-"FAQ 3.11[/doc]."
-
-#: templates/structure/table_structure_row.phtml:46
-#, php-format
-msgid "Column %s has been dropped."
-msgstr "Kolonne %s er slettet."
-
-#: templates/structure/tracking_icon.phtml:4
-msgid "Tracking is active."
-msgstr "Sporing er aktiv."
-
-#: templates/structure/tracking_icon.phtml:8
-msgid "Tracking is not active."
-msgstr "Sporing er ikke aktiv."
-
-#: templates/table/create_table.phtml:15
-msgid "Number of columns"
-msgstr "Antal kolonner"
-
-#: templates/table/options.phtml:8
-msgid "Select columns (at least one):"
-msgstr "Vælg kolonner (mindst én):"
-
-#: templates/table/options.phtml:37
-msgid "Add search conditions (body of the \"where\" clause):"
-msgstr "Tilføj søgekriterier (kroppen af \"where\" sætningen):"
-
-#: templates/table/options.phtml:45
-msgid "Number of rows per page"
-msgstr "Rækker pr. side"
-
-#: templates/table/options.phtml:56
-msgid "Display order:"
-msgstr "Rækkefølge af visning:"
-
-#: templates/table/options_zoom.phtml:6
-msgid "Use this column to label each point"
-msgstr "Brug denne kolonne til at navngive hvert punkt"
-
-#: templates/table/options_zoom.phtml:35
-msgid "Maximum rows to plot"
-msgstr "Maksimalt antal plottede rækker"
-
-#: templates/table/replace_preview.phtml:13
-msgid "Find and replace - preview"
-msgstr "Søg og erstat - forhåndsvisning"
-
-#: templates/table/replace_preview.phtml:18
-msgid "Original string"
-msgstr "Original tekststreng"
-
-#: templates/table/replace_preview.phtml:19
-msgid "Replaced string"
-msgstr "Erstattet tekststreng"
-
-#: templates/table/replace_preview.phtml:40
-msgid "Replace"
-msgstr "Erstat"
-
-#: templates/table/rows_zoom.phtml:16
-msgid "Additional search criteria"
-msgstr "Ekstra søgekriterium"
-
-#: templates/table/search_and_replace.phtml:3
-msgid "Replace with:"
-msgstr "Erstat med:"
-
-#: templates/table/search_and_replace.phtml:22
-msgid "Use regular expression"
-msgstr "Brug regulært udtryk"
-
-#: templates/table/selection_form.phtml:12
-msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
-msgstr ""
-"Kør en \"forespørgsel ved eksempel\" (jokertegn: \"%\") for to forskellige "
-"kolonner"
-
-#: templates/table/selection_form.phtml:34
-msgid "Do a \"query by example\" (wildcard: \"%\")"
-msgstr "Kør en forespørgsel på felter (jokertegn: \"%\")"
-
-#: templates/table/zoom_result_form.phtml:7
-msgid "Browse/Edit the points"
-msgstr "Bladr gennem/rediger punkterne"
-
-#: templates/table/zoom_result_form.phtml:15
-msgid "How to use"
-msgstr "Hvordan man bruger"
-
-#: templates/table/zoom_result_form.phtml:23
-msgid "Reset zoom"
-msgstr "Nulstil zoom"
-
-#: templates/tbl_chart.phtml:17
+#: templates/table/chart/tbl_chart.phtml:17
 msgctxt "Chart type"
 msgid "Bar"
 msgstr "Bjælke"
 
-#: templates/tbl_chart.phtml:21
+#: templates/table/chart/tbl_chart.phtml:21
 msgctxt "Chart type"
 msgid "Column"
 msgstr "Kolonne"
 
-#: templates/tbl_chart.phtml:25
+#: templates/table/chart/tbl_chart.phtml:25
 msgctxt "Chart type"
 msgid "Line"
 msgstr "Linje"
 
-#: templates/tbl_chart.phtml:29
+#: templates/table/chart/tbl_chart.phtml:29
 msgctxt "Chart type"
 msgid "Spline"
 msgstr "Spline"
 
-#: templates/tbl_chart.phtml:33
+#: templates/table/chart/tbl_chart.phtml:33
 msgctxt "Chart type"
 msgid "Area"
 msgstr "Område"
 
-#: templates/tbl_chart.phtml:37
+#: templates/table/chart/tbl_chart.phtml:37
 msgctxt "Chart type"
 msgid "Pie"
 msgstr "Cirkel"
 
-#: templates/tbl_chart.phtml:41
+#: templates/table/chart/tbl_chart.phtml:41
 msgctxt "Chart type"
 msgid "Timeline"
 msgstr "Tidslinje"
 
-#: templates/tbl_chart.phtml:45
+#: templates/table/chart/tbl_chart.phtml:45
 msgctxt "Chart type"
 msgid "Scatter"
 msgstr "Spredning"
 
-#: templates/tbl_chart.phtml:50
+#: templates/table/chart/tbl_chart.phtml:50
 msgid "Stacked"
 msgstr "Stak"
 
-#: templates/tbl_chart.phtml:53
+#: templates/table/chart/tbl_chart.phtml:53
 msgid "Chart title"
 msgstr "Diagramtitel"
 
-#: templates/tbl_chart.phtml:57
+#: templates/table/chart/tbl_chart.phtml:57
 msgid "X-Axis:"
 msgstr "X-akse:"
 
-#: templates/tbl_chart.phtml:72
+#: templates/table/chart/tbl_chart.phtml:72
 msgid "Series:"
 msgstr "Serie:"
 
-#: templates/tbl_chart.phtml:102
+#: templates/table/chart/tbl_chart.phtml:102
 msgid "X-Axis label:"
 msgstr "X-akse betegnelse:"
 
-#: templates/tbl_chart.phtml:104
+#: templates/table/chart/tbl_chart.phtml:104
 msgid "X Values"
 msgstr "X værdier"
 
-#: templates/tbl_chart.phtml:107
+#: templates/table/chart/tbl_chart.phtml:107
 msgid "Y-Axis label:"
 msgstr "Y-akse betegnelse:"
 
-#: templates/tbl_chart.phtml:115
+#: templates/table/chart/tbl_chart.phtml:115
 msgid "Series names are in a column"
 msgstr "Navne i en kolonne"
 
-#: templates/tbl_chart.phtml:118
+#: templates/table/chart/tbl_chart.phtml:118
 msgid "Series column:"
 msgstr "Seriekolonne:"
 
-#: templates/tbl_chart.phtml:130
+#: templates/table/chart/tbl_chart.phtml:130
 #, fuzzy
 #| msgid "Value column:"
 msgid "Value Column:"
 msgstr "Værdier for kolonnen %s:"
 
-#: templates/tbl_chart.phtml:150
+#: templates/table/chart/tbl_chart.phtml:150
 msgid "Save chart as image"
 msgstr "Gem tabel som billede"
 
-#: templates/tbl_relation/common_form.phtml:7
+#: templates/table/gis_visualization/gis_visualization.phtml:3
+msgid "Display GIS Visualization"
+msgstr "Vis GIS visualisering"
+
+#: templates/table/gis_visualization/gis_visualization.phtml:8
+msgid "Label column"
+msgstr "Tekst for kolonne"
+
+#: templates/table/gis_visualization/gis_visualization.phtml:11
+msgid "-- None --"
+msgstr "-- Ingen --"
+
+#: templates/table/gis_visualization/gis_visualization.phtml:19
+msgid "Spatial column"
+msgstr "Spatial kolonne"
+
+#: templates/table/index_form.phtml:16
+msgid "Index name:"
+msgstr "Indeksnavn;:"
+
+#: templates/table/index_form.phtml:19
+msgid ""
+"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
+msgstr ""
+"\"PRIMARY\" <b>skal</b> være navnet på og <b>kun på</b> en primær nøgle!"
+
+#: templates/table/index_form.phtml:40
+msgid "Index choice:"
+msgstr "Indeksvalg:"
+
+#: templates/table/index_form.phtml:57
+msgid "Key block size:"
+msgstr "Blokstørrelse på nøgle:"
+
+#: templates/table/index_form.phtml:74
+msgid "Index type:"
+msgstr "Indekstype:"
+
+#: templates/table/index_form.phtml:86
+msgid "Parser:"
+msgstr "Fortolker:"
+
+#: templates/table/index_form.phtml:102
+msgid "Comment:"
+msgstr "Kommentar:"
+
+#: templates/table/index_form.phtml:149 templates/table/index_form.phtml:190
+msgid "Drag to reorder"
+msgstr "Træk for at ændre rækkefølge"
+
+#: templates/table/relation/common_form.phtml:7
 msgid "Internal relations"
 msgstr "Interne relationer"
 
-#: templates/tbl_relation/common_form.phtml:11
+#: templates/table/relation/common_form.phtml:11
 msgid "Internal relation"
 msgstr "Intern relation"
 
-#: templates/tbl_relation/common_form.phtml:14
+#: templates/table/relation/common_form.phtml:14
 msgid ""
 "An internal relation is not necessary when a corresponding FOREIGN KEY "
 "relation exists."
@@ -15682,50 +15531,226 @@ msgstr ""
 "En intern relation er ikke nødvendig, når en tilsvarende FOREIGN KEY "
 "relation findes."
 
-#: templates/tbl_relation/common_form.phtml:37
+#: templates/table/relation/common_form.phtml:37
 msgid "Foreign key constraints"
 msgstr "Begrænsning på fremmednøgle"
 
-#: templates/tbl_relation/common_form.phtml:40
+#: templates/table/relation/common_form.phtml:40
 msgid "Actions"
 msgstr "Handlinger"
 
-#: templates/tbl_relation/common_form.phtml:41
+#: templates/table/relation/common_form.phtml:41
 msgid "Constraint properties"
 msgstr "Begrænsninger for egenskaber"
 
-#: templates/tbl_relation/common_form.phtml:44
+#: templates/table/relation/common_form.phtml:44
 msgid ""
 "Only columns with index will be displayed. You can define an index below."
 msgstr ""
 "Det er blot kolonner med indeks, der bliver vist. Du kan definere et indeks "
 "nedenfor."
 
-#: templates/tbl_relation/common_form.phtml:49
+#: templates/table/relation/common_form.phtml:49
 msgid "Foreign key constraint"
 msgstr "Begrænsning på fremmednøgle"
 
-#: templates/tbl_relation/common_form.phtml:81
+#: templates/table/relation/common_form.phtml:81
 msgid "+ Add constraint"
 msgstr "+ Tilføj begrænsning"
 
-#: templates/tbl_relation/common_form.phtml:91
+#: templates/table/relation/common_form.phtml:91
 msgid "Choose column to display:"
 msgstr "Vælg kolonne til visning:"
 
-#: templates/tbl_relation/foreign_key_row.phtml:13
+#: templates/table/relation/foreign_key_row.phtml:13
 #, php-format
 msgid "Foreign key constraint %s has been dropped"
 msgstr "Begrænsning på fremmednøglen %s er blevet droppet"
 
-#: templates/tbl_relation/foreign_key_row.phtml:102
+#: templates/table/relation/foreign_key_row.phtml:102
 msgid "Constraint name"
 msgstr "Navnebegrænsning"
 
-#: templates/tbl_relation/foreign_key_row.phtml:157
+#: templates/table/relation/foreign_key_row.phtml:157
 msgid "+ Add column"
 msgstr "+ Tilføj kolonne"
 
+#: templates/table/search/options.phtml:8
+msgid "Select columns (at least one):"
+msgstr "Vælg kolonner (mindst én):"
+
+#: templates/table/search/options.phtml:37
+msgid "Add search conditions (body of the \"where\" clause):"
+msgstr "Tilføj søgekriterier (kroppen af \"where\" sætningen):"
+
+#: templates/table/search/options.phtml:45
+msgid "Number of rows per page"
+msgstr "Rækker pr. side"
+
+#: templates/table/search/options.phtml:56
+msgid "Display order:"
+msgstr "Rækkefølge af visning:"
+
+#: templates/table/search/options_zoom.phtml:6
+msgid "Use this column to label each point"
+msgstr "Brug denne kolonne til at navngive hvert punkt"
+
+#: templates/table/search/options_zoom.phtml:35
+msgid "Maximum rows to plot"
+msgstr "Maksimalt antal plottede rækker"
+
+#: templates/table/search/replace_preview.phtml:13
+msgid "Find and replace - preview"
+msgstr "Søg og erstat - forhåndsvisning"
+
+#: templates/table/search/replace_preview.phtml:18
+msgid "Original string"
+msgstr "Original tekststreng"
+
+#: templates/table/search/replace_preview.phtml:19
+msgid "Replaced string"
+msgstr "Erstattet tekststreng"
+
+#: templates/table/search/replace_preview.phtml:40
+msgid "Replace"
+msgstr "Erstat"
+
+#: templates/table/search/rows_zoom.phtml:16
+msgid "Additional search criteria"
+msgstr "Ekstra søgekriterium"
+
+#: templates/table/search/search_and_replace.phtml:3
+msgid "Replace with:"
+msgstr "Erstat med:"
+
+#: templates/table/search/search_and_replace.phtml:22
+msgid "Use regular expression"
+msgstr "Brug regulært udtryk"
+
+#: templates/table/search/selection_form.phtml:12
+msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
+msgstr ""
+"Kør en \"forespørgsel ved eksempel\" (jokertegn: \"%\") for to forskellige "
+"kolonner"
+
+#: templates/table/search/selection_form.phtml:34
+msgid "Do a \"query by example\" (wildcard: \"%\")"
+msgstr "Kør en forespørgsel på felter (jokertegn: \"%\")"
+
+#: templates/table/search/zoom_result_form.phtml:7
+msgid "Browse/Edit the points"
+msgstr "Bladr gennem/rediger punkterne"
+
+#: templates/table/search/zoom_result_form.phtml:15
+msgid "How to use"
+msgstr "Hvordan man bruger"
+
+#: templates/table/search/zoom_result_form.phtml:23
+msgid "Reset zoom"
+msgstr "Nulstil zoom"
+
+#: templates/table/secondary_tabs.phtml:14
+msgid "Relation view"
+msgstr "Visning af relation"
+
+#: templates/table/structure/actions_in_table_structure.phtml:14
+#, php-format
+msgid "A primary key has been added on %s."
+msgstr "En primær nøgle er blevet tilføjet til %s."
+
+#: templates/table/structure/actions_in_table_structure.phtml:34
+#: templates/table/structure/actions_in_table_structure.phtml:54
+#: templates/table/structure/actions_in_table_structure.phtml:79
+#: templates/table/structure/actions_in_table_structure.phtml:101
+#, php-format
+msgid "An index has been added on %s."
+msgstr "Der er tilføjet et indeks til %s."
+
+#: templates/table/structure/actions_in_table_structure.phtml:130
+#: templates/table/structure/check_all_table_column.phtml:59
+msgid "Remove from central columns"
+msgstr "Fjern kolonner"
+
+#: templates/table/structure/actions_in_table_structure.phtml:138
+#: templates/table/structure/check_all_table_column.phtml:55
+msgid "Add to central columns"
+msgstr "Tilføj kolonner"
+
+#: templates/table/structure/add_column.phtml:7
+#, php-format
+msgid "Add %s column(s)"
+msgstr "Tilføj %s kolonne(r)"
+
+#: templates/table/structure/add_column.phtml:12
+msgid "at beginning of table"
+msgstr "i begyndelsen af tabellen"
+
+#: templates/table/structure/display_structure.phtml:140 view_create.php:181
+msgid "Edit view"
+msgstr "Rediger view"
+
+#: templates/table/structure/display_table_stats.phtml:9
+msgid "Space usage"
+msgstr "Pladsforbrug"
+
+#: templates/table/structure/display_table_stats.phtml:32
+msgid "Effective"
+msgstr "Effektiv"
+
+#: templates/table/structure/move_columns_dialog.phtml:1
+#: templates/table/structure/optional_action_links.phtml:21
+msgid "Move columns"
+msgstr "Flyt kolonner"
+
+#: templates/table/structure/move_columns_dialog.phtml:2
+msgid "Move the columns by dragging them up and down."
+msgstr "Flyt kolonnerne ved at trække dem op og ned."
+
+#: templates/table/structure/optional_action_links.phtml:9
+msgid "Propose table structure"
+msgstr "Foreslå tabelstruktur"
+
+#: templates/table/structure/optional_action_links.phtml:24
+msgid "Improve table structure"
+msgstr "Forbedring af tabelstruktur"
+
+#: templates/table/structure/optional_action_links.phtml:30
+msgid "Track view"
+msgstr "Spor visning"
+
+#: templates/table/structure/row_stats_table.phtml:3
+msgid "Row statistics"
+msgstr "Rækkestatistik"
+
+#: templates/table/structure/row_stats_table.phtml:9
+msgid "static"
+msgstr "statisk"
+
+#: templates/table/structure/row_stats_table.phtml:11
+msgid "dynamic"
+msgstr "dynamisk"
+
+#: templates/table/structure/row_stats_table.phtml:22
+msgid "partitioned"
+msgstr "partitioneret"
+
+#: templates/table/structure/row_stats_table.phtml:54
+msgid "Row length"
+msgstr "Rækkelængde"
+
+#: templates/table/structure/row_stats_table.phtml:66
+msgid "Row size"
+msgstr "Rækkestørrelse"
+
+#: templates/table/structure/row_stats_table.phtml:73
+msgid "Next autoindex"
+msgstr "Næste autoindeks"
+
+#: templates/table/structure/table_structure_row.phtml:46
+#, php-format
+msgid "Column %s has been dropped."
+msgstr "Kolonne %s er slettet."
+
 #: themes.php:17 themes.php:22
 msgid "Theme"
 msgstr "Tema"
@@ -17075,6 +17100,9 @@ msgstr ""
 msgid "concurrent_insert is set to 0"
 msgstr "concurrent_insert er sat til 0"
 
+#~ msgid "Read as multibytes"
+#~ msgstr "Læs som multibytes"
+
 #~ msgid "Relational display column"
 #~ msgstr "Relationel visningskolonne"
 
diff --git a/po/de.po b/po/de.po
index f65bb0fab1..0e1c05da7e 100644
--- a/po/de.po
+++ b/po/de.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin-docs 4.0.0-dev\n"
 "Report-Msgid-Bugs-To: developers@phpmyadmin.net\n"
-"POT-Creation-Date: 2015-08-08 13:53-0400\n"
+"POT-Creation-Date: 2015-08-12 08:10-0400\n"
 "PO-Revision-Date: 2015-07-27 03:36+0200\n"
 "Last-Translator: Hauke Henningsen <sqrt@entless.org>\n"
 "Language-Team: German <https://hosted.weblate.org/projects/phpmyadmin/master/"
@@ -53,7 +53,7 @@ msgid "Table comments:"
 msgstr "Tabellenkommentar:"
 
 #: db_datadict.php:104 libraries/Index.class.php:699
-#: libraries/insert_edit.lib.php:1567
+#: libraries/insert_edit.lib.php:1565
 #: libraries/navigation/Nodes/Node_Column.class.php:30
 #: libraries/plugins/export/ExportHtmlword.class.php:280
 #: libraries/plugins/export/ExportHtmlword.class.php:375
@@ -67,13 +67,14 @@ msgstr "Tabellenkommentar:"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1023
 #: libraries/tracking.lib.php:879 libraries/tracking.lib.php:975
 #: templates/columns_definitions/column_name.phtml:18
-#: templates/index_form.phtml:124 templates/table/table_header.phtml:6
-#: templates/table/zoom_result_form.phtml:33
-#: templates/tbl_relation/common_form.phtml:10
-#: templates/tbl_relation/common_form.phtml:43
-#: templates/tbl_relation/foreign_key_row.phtml:194
-#: templates/tbl_relation/foreign_key_row.phtml:206
-#: templates/tbl_relation/internal_relational_row.phtml:71
+#: templates/table/index_form.phtml:124
+#: templates/table/relation/common_form.phtml:10
+#: templates/table/relation/common_form.phtml:43
+#: templates/table/relation/foreign_key_row.phtml:194
+#: templates/table/relation/foreign_key_row.phtml:206
+#: templates/table/relation/internal_relational_row.phtml:71
+#: templates/table/search/table_header.phtml:6
+#: templates/table/search/zoom_result_form.phtml:33
 msgid "Column"
 msgstr "Spalte"
 
@@ -91,21 +92,21 @@ msgstr "Spalte"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1001
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1024
 #: libraries/rte/rte_list.lib.php:75 libraries/rte/rte_list.lib.php:103
-#: libraries/rte/rte_routines.lib.php:802
-#: libraries/rte/rte_routines.lib.php:831
-#: libraries/rte/rte_routines.lib.php:1493
+#: libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_routines.lib.php:922
+#: libraries/rte/rte_routines.lib.php:1584
 #: libraries/server_privileges.lib.php:2369 libraries/tracking.lib.php:880
 #: libraries/tracking.lib.php:972
 #: templates/columns_definitions/table_fields_definitions.phtml:11
-#: templates/structure/table_header.phtml:48
-#: templates/structure/table_structure_header.phtml:6
-#: templates/table/table_header.phtml:7
+#: templates/database/structure/table_header.phtml:48
+#: templates/table/search/table_header.phtml:7
+#: templates/table/structure/table_structure_header.phtml:6
 msgid "Type"
 msgstr "Typ"
 
 #: db_datadict.php:106 libraries/Index.class.php:702
 #: libraries/central_columns.lib.php:708
-#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1576
+#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1574
 #: libraries/plugins/export/ExportHtmlword.class.php:286
 #: libraries/plugins/export/ExportHtmlword.class.php:381
 #: libraries/plugins/export/ExportLatex.class.php:509
@@ -118,8 +119,8 @@ msgstr "Typ"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1026
 #: libraries/tracking.lib.php:882 libraries/tracking.lib.php:978
 #: templates/columns_definitions/table_fields_definitions.phtml:39
-#: templates/structure/table_structure_header.phtml:9
-#: templates/table/zoom_result_form.phtml:34
+#: templates/table/search/zoom_result_form.phtml:34
+#: templates/table/structure/table_structure_header.phtml:9
 msgid "Null"
 msgstr "Null"
 
@@ -137,8 +138,8 @@ msgstr "Null"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1027
 #: libraries/replication_gui.lib.php:153 libraries/tracking.lib.php:883
 #: templates/columns_definitions/table_fields_definitions.phtml:25
-#: templates/structure/body_for_table_summary.phtml:55
-#: templates/structure/table_structure_header.phtml:10
+#: templates/database/structure/body_for_table_summary.phtml:55
+#: templates/table/structure/table_structure_header.phtml:10
 msgid "Default"
 msgstr "Standard"
 
@@ -166,19 +167,19 @@ msgid "Comments"
 msgstr "Kommentare"
 
 #: db_datadict.php:146
-#: libraries/controllers/StructureController.class.php:1960
-#: libraries/controllers/StructureController.class.php:1965
+#: libraries/controllers/TableStructureController.class.php:951
+#: libraries/controllers/TableStructureController.class.php:956
 #: libraries/tracking.lib.php:922
 #: templates/columns_definitions/column_indexes.phtml:6
-#: templates/structure/check_all_table_column.phtml:22
-#: templates/structure/display_structure.phtml:74
+#: templates/table/structure/check_all_table_column.phtml:22
+#: templates/table/structure/display_structure.phtml:74
 msgid "Primary"
 msgstr "Primärschlüssel"
 
 #: db_datadict.php:156 js/messages.php:317 libraries/Index.class.php:567
 #: libraries/Index.class.php:606 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261 libraries/mult_submits.lib.php:403
+#: libraries/config/FormDisplay.tpl.php:272 libraries/mult_submits.lib.php:403
 #: libraries/mult_submits.lib.php:417
 #: libraries/plugins/export/ExportHtmlword.class.php:630
 #: libraries/plugins/export/ExportLatex.class.php:589
@@ -194,20 +195,20 @@ msgstr "Primärschlüssel"
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1010 libraries/tracking.lib.php:1015
 #: prefs_manage.php:140 templates/prefs_autoload.phtml:15
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "No"
 msgstr "Nein"
 
 #: db_datadict.php:156 js/messages.php:443 libraries/Index.class.php:568
 #: libraries/Index.class.php:605 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261
-#: libraries/controllers/StructureController.class.php:1344
-#: libraries/controllers/StructureController.class.php:2223
-#: libraries/controllers/StructureController.class.php:2232
-#: libraries/controllers/StructureController.class.php:2237
-#: libraries/controllers/StructureController.class.php:2242
-#: libraries/controllers/StructureController.class.php:2247
+#: libraries/config/FormDisplay.tpl.php:272
+#: libraries/controllers/TableStructureController.class.php:539
+#: libraries/controllers/TableStructureController.class.php:1201
+#: libraries/controllers/TableStructureController.class.php:1210
+#: libraries/controllers/TableStructureController.class.php:1215
+#: libraries/controllers/TableStructureController.class.php:1220
+#: libraries/controllers/TableStructureController.class.php:1225
 #: libraries/mult_submits.inc.php:82 libraries/mult_submits.inc.php:178
 #: libraries/mult_submits.lib.php:339 libraries/mult_submits.lib.php:372
 #: libraries/mult_submits.lib.php:401 libraries/mult_submits.lib.php:415
@@ -216,8 +217,8 @@ msgstr "Nein"
 #: libraries/plugins/export/ExportOdt.class.php:756
 #: libraries/plugins/export/ExportTexytext.class.php:567
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1077
-#: libraries/server_databases.lib.php:464
-#: libraries/server_databases.lib.php:474
+#: libraries/server_databases.lib.php:475
+#: libraries/server_databases.lib.php:485
 #: libraries/server_privileges.lib.php:2546
 #: libraries/server_privileges.lib.php:2727
 #: libraries/server_privileges.lib.php:2748
@@ -227,7 +228,7 @@ msgstr "Nein"
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1008 libraries/tracking.lib.php:1013
 #: prefs_manage.php:138 templates/prefs_autoload.phtml:14
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "Yes"
 msgstr "Ja"
 
@@ -237,7 +238,7 @@ msgstr "Dump (Schema) der Datenbank anzeigen"
 
 #: db_export.php:37 db_tracking.php:90 export.php:382
 #: libraries/DBQbe.class.php:326
-#: libraries/controllers/StructureController.class.php:231
+#: libraries/controllers/DatabaseStructureController.class.php:170
 #: libraries/navigation/NavigationTree.class.php:897
 msgid "No tables found in database."
 msgstr "Es wurden keine Tabellen in der Datenbank gefunden."
@@ -248,14 +249,14 @@ msgstr "Es wurden keine Tabellen in der Datenbank gefunden."
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:26
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:120
-#: templates/structure/show_create.phtml:18
+#: templates/database/structure/show_create.phtml:18
 msgid "Tables"
 msgstr "Tabellen"
 
 #: db_export.php:52 libraries/Menu.class.php:317 libraries/Menu.class.php:425
-#: libraries/Util.class.php:3333 libraries/Util.class.php:3343
-#: libraries/Util.class.php:3349 libraries/Util.class.php:3629
-#: libraries/Util.class.php:4327 libraries/Util.class.php:4344
+#: libraries/Util.class.php:3339 libraries/Util.class.php:3349
+#: libraries/Util.class.php:3355 libraries/Util.class.php:3635
+#: libraries/Util.class.php:4333 libraries/Util.class.php:4350
 #: libraries/central_columns.lib.php:728 libraries/config.values.php:39
 #: libraries/config.values.php:47 libraries/config.values.php:109
 #: libraries/config.values.php:115 libraries/config/setup.forms.php:323
@@ -269,7 +270,7 @@ msgstr "Tabellen"
 #: libraries/navigation/Nodes/Node_Table.class.php:283
 #: libraries/server_privileges.lib.php:1141 libraries/tracking.lib.php:874
 #: templates/columns_definitions/table_fields_definitions.phtml:3
-#: templates/designer/table_list.phtml:28
+#: templates/database/designer/table_list.phtml:28
 msgid "Structure"
 msgstr "Struktur"
 
@@ -281,7 +282,7 @@ msgstr "Struktur"
 #: libraries/config/user_preferences.forms.php:292
 #: libraries/config/user_preferences.forms.php:297
 #: libraries/server_privileges.lib.php:1140
-#: templates/structure/display_table_stats.phtml:12
+#: templates/table/structure/display_table_stats.phtml:12
 msgid "Data"
 msgstr "Daten"
 
@@ -355,10 +356,10 @@ msgstr "Verfolgte Tabellen"
 #: libraries/server_privileges.lib.php:2908
 #: libraries/server_privileges.lib.php:3145
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4346
-#: templates/structure/table_header.phtml:21
-#: templates/tbl_relation/foreign_key_row.phtml:176
-#: templates/tbl_relation/internal_relational_row.phtml:63
+#: libraries/server_privileges.lib.php:4372
+#: templates/database/structure/table_header.phtml:21
+#: templates/table/relation/foreign_key_row.phtml:176
+#: templates/table/relation/internal_relational_row.phtml:63
 msgid "Table"
 msgstr "Tabelle"
 
@@ -375,7 +376,7 @@ msgid "Updated"
 msgstr "Aktualisiert"
 
 #: db_tracking.php:130 js/messages.php:243 libraries/Menu.class.php:552
-#: libraries/Util.class.php:4314 libraries/config.values.php:104
+#: libraries/Util.class.php:4320 libraries/config.values.php:104
 #: libraries/rte/rte_events.lib.php:393 libraries/rte/rte_list.lib.php:101
 #: libraries/server_status_processes.lib.php:92 libraries/tracking.lib.php:279
 msgid "Status"
@@ -384,14 +385,15 @@ msgstr "Status"
 #: db_tracking.php:131 db_tracking.php:290 libraries/Index.class.php:693
 #: libraries/central_columns.lib.php:687 libraries/rte/rte_list.lib.php:74
 #: libraries/rte/rte_list.lib.php:89 libraries/rte/rte_list.lib.php:102
-#: libraries/server_databases.lib.php:398
+#: libraries/server_databases.lib.php:409
 #: libraries/server_privileges.lib.php:2372
 #: libraries/server_privileges.lib.php:3166
 #: libraries/server_privileges.lib.php:3342
 #: libraries/server_user_groups.lib.php:82
 #: libraries/server_variables.lib.php:189 libraries/tracking.lib.php:280
-#: libraries/tracking.lib.php:793 templates/structure/table_header.phtml:30
-#: templates/structure/table_structure_header.phtml:23
+#: libraries/tracking.lib.php:793
+#: templates/database/structure/table_header.phtml:30
+#: templates/table/structure/table_structure_header.phtml:23
 msgid "Action"
 msgstr "Aktion"
 
@@ -433,7 +435,7 @@ msgid "Untracked tables"
 msgstr "Nicht verfolgte Tabellen"
 
 #: db_tracking.php:305 db_tracking.php:336
-#: templates/structure/optional_action_links.phtml:17
+#: templates/table/structure/optional_action_links.phtml:17
 msgid "Track table"
 msgstr "Tabelle verfolgen"
 
@@ -489,7 +491,7 @@ msgid "Value for the column \"%s\""
 msgstr "Wert für die Spalte \"%s\""
 
 #: gis_data_editor.php:146
-#: templates/gis_visualization/gis_visualization.phtml:37
+#: templates/table/gis_visualization/gis_visualization.phtml:37
 msgid "Use OpenStreetMaps as Base Layer"
 msgstr "Verwende OpenStreetMaps als Basis-Satz"
 
@@ -569,35 +571,35 @@ msgstr "Geometrie hinzufügen"
 #: libraries/display_change_password.lib.php:162
 #: libraries/display_export.lib.php:402 libraries/display_export.lib.php:408
 #: libraries/display_import.lib.php:392 libraries/index.lib.php:44
-#: libraries/insert_edit.lib.php:1546 libraries/insert_edit.lib.php:1583
+#: libraries/insert_edit.lib.php:1544 libraries/insert_edit.lib.php:1581
 #: libraries/normalization.lib.php:165 libraries/normalization.lib.php:821
 #: libraries/operations.lib.php:38 libraries/operations.lib.php:108
 #: libraries/operations.lib.php:263 libraries/operations.lib.php:306
 #: libraries/operations.lib.php:801 libraries/operations.lib.php:874
 #: libraries/operations.lib.php:923 libraries/operations.lib.php:1337
 #: libraries/operations.lib.php:1658
-#: libraries/plugins/auth/AuthenticationCookie.class.php:244
+#: libraries/plugins/auth/AuthenticationCookie.class.php:232
 #: libraries/replication_gui.lib.php:122 libraries/replication_gui.lib.php:161
 #: libraries/replication_gui.lib.php:324 libraries/replication_gui.lib.php:461
 #: libraries/replication_gui.lib.php:906 libraries/rte/rte_events.lib.php:509
-#: libraries/rte/rte_routines.lib.php:969
-#: libraries/rte/rte_routines.lib.php:1581
+#: libraries/rte/rte_routines.lib.php:1060
+#: libraries/rte/rte_routines.lib.php:1672
 #: libraries/rte/rte_triggers.lib.php:396 libraries/server_bin_log.lib.php:61
 #: libraries/server_privileges.lib.php:705
 #: libraries/server_privileges.lib.php:2106
 #: libraries/server_privileges.lib.php:2872
 #: libraries/server_privileges.lib.php:3553
-#: libraries/server_privileges.lib.php:4627
+#: libraries/server_privileges.lib.php:4653
 #: libraries/server_user_groups.lib.php:285
 #: libraries/sql_query_form.lib.php:369 libraries/sql_query_form.lib.php:429
 #: libraries/tracking.lib.php:533 libraries/tracking.lib.php:653
 #: prefs_manage.php:277 prefs_manage.php:355
 #: templates/columns_definitions/column_definitions_form.phtml:59
-#: templates/header_location.phtml:17 templates/index_form.phtml:238
+#: templates/database/create_table.phtml:21 templates/header_location.phtml:28
 #: templates/startAndNumberOfRowsPanel.phtml:14
-#: templates/structure/add_column.phtml:25
-#: templates/table/create_table.phtml:21
-#: templates/table/selection_form.phtml:75 view_create.php:275
+#: templates/table/index_form.phtml:238
+#: templates/table/search/selection_form.phtml:75
+#: templates/table/structure/add_column.phtml:25 view_create.php:275
 #: view_operations.php:106
 msgid "Go"
 msgstr "OK"
@@ -692,7 +694,7 @@ msgstr ""
 "Die Import-Plugins konnten nicht geladen werden, bitte überprüfen Sie Ihre "
 "phpMyAdmin-Installation!"
 
-#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1466
+#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1460
 #, php-format
 msgid "Bookmark %s has been created."
 msgstr "Lesezeichen %s wurde erstellt."
@@ -732,11 +734,11 @@ msgstr "Der Fortschritt des Imports konnte nicht geladen werden."
 msgid "Back"
 msgstr "Zurück"
 
-#: index.php:148 libraries/Footer.class.php:70
+#: index.php:149 libraries/Footer.class.php:70
 msgid "phpMyAdmin Demo Server"
 msgstr "phpMyAdmin Demo Server"
 
-#: index.php:152
+#: index.php:153
 #, php-format
 msgid ""
 "You are using the demo server. You can do anything here, but please do not "
@@ -747,110 +749,110 @@ msgstr ""
 "nicht die Benutzer root, debian-sys-maint und pma. Mehr Informationen ist "
 "unter %s verfügbar."
 
-#: index.php:162
+#: index.php:163
 msgid "General Settings"
 msgstr "Allgemeine Einstellungen"
 
-#: index.php:190 libraries/display_change_password.lib.php:50
+#: index.php:191 libraries/display_change_password.lib.php:50
 #: libraries/display_change_password.lib.php:53 user_password.php:247
 msgid "Change password"
 msgstr "Passwort ändern"
 
-#: index.php:206
+#: index.php:207
 msgid "Server connection collation"
 msgstr "Zeichensatz/Kollation der MySQL-Verbindung"
 
-#: index.php:228
+#: index.php:229
 msgid "Appearance Settings"
 msgstr "Anzeige-Einstellungen"
 
-#: index.php:258 prefs_manage.php:285
+#: index.php:259 prefs_manage.php:285
 msgid "More settings"
 msgstr "Weitere Einstellungen"
 
-#: index.php:279
+#: index.php:280
 msgid "Database server"
 msgstr "Datenbank-Server"
 
-#: index.php:282 libraries/plugins/auth/AuthenticationCookie.class.php:181
+#: index.php:283 libraries/plugins/auth/AuthenticationCookie.class.php:169
 msgid "Server:"
 msgstr "Server:"
 
-#: index.php:286
+#: index.php:287
 msgid "Server type:"
 msgstr "Server-Typ:"
 
-#: index.php:290 libraries/plugins/export/ExportLatex.class.php:212
+#: index.php:291 libraries/plugins/export/ExportLatex.class.php:212
 #: libraries/plugins/export/ExportSql.class.php:687
 #: libraries/plugins/export/ExportXml.class.php:189
 msgid "Server version:"
 msgstr "Server-Version:"
 
-#: index.php:296
+#: index.php:297
 msgid "Protocol version:"
 msgstr "Protokoll-Version:"
 
-#: index.php:300
+#: index.php:301
 msgid "User:"
 msgstr "Benutzer:"
 
-#: index.php:305
+#: index.php:306
 msgid "Server charset:"
 msgstr "Server-Zeichensatz:"
 
-#: index.php:320
+#: index.php:321
 msgid "Web server"
 msgstr "Webserver"
 
-#: index.php:331
+#: index.php:332
 msgid "Database client version:"
 msgstr "Datenbank-Client Version:"
 
-#: index.php:335
+#: index.php:336
 msgid "PHP extension:"
 msgstr "PHP-Erweiterung:"
 
-#: index.php:349
+#: index.php:350
 msgid "PHP version:"
 msgstr "PHP-Version:"
 
-#: index.php:360
+#: index.php:361
 msgid "Show PHP information"
 msgstr "PHP-Informationen anzeigen"
 
-#: index.php:383
+#: index.php:384
 msgid "Version information:"
 msgstr "Versionsinformationen:"
 
-#: index.php:392 libraries/Util.class.php:432 libraries/Util.class.php:495
-#: libraries/config/FormDisplay.tpl.php:151
+#: index.php:393 libraries/Util.class.php:432 libraries/Util.class.php:495
+#: libraries/config/FormDisplay.tpl.php:162
 #: libraries/display_export.lib.php:577 libraries/engines/pbxt.lib.php:162
 #: libraries/navigation/NavigationHeader.class.php:196
 #: libraries/server_variables.lib.php:160
 msgid "Documentation"
 msgstr "Dokumentation"
 
-#: index.php:399
+#: index.php:400
 msgid "Wiki"
 msgstr "Wiki"
 
-#: index.php:408
+#: index.php:409
 msgid "Official Homepage"
 msgstr "Offizielle Homepage"
 
-#: index.php:415
+#: index.php:416
 msgid "Contribute"
 msgstr "Mitmachen"
 
-#: index.php:422
+#: index.php:423
 msgid "Get support"
 msgstr "Unterstützung erhalten"
 
-#: index.php:429
+#: index.php:430
 msgid "List of changes"
 msgstr "Liste der Änderungen"
 
-#: index.php:451
+#: index.php:452
 msgid ""
 "You are connected as 'root' with no password, which corresponds to the "
 "default MySQL privileged account. Your MySQL server is running with this "
@@ -863,7 +865,7 @@ msgstr ""
 "Sicherheitslücke unbedingt durch das Setze eines Passworts für den Benutzer "
 "'root' schließen."
 
-#: index.php:468
+#: index.php:469
 msgid ""
 "You have enabled mbstring.func_overload in your PHP configuration. This "
 "option is incompatible with phpMyAdmin and might cause some data to be "
@@ -873,7 +875,7 @@ msgstr ""
 "aktiviert. Diese ist nicht kompatibel zu phpMyAdmin, weshalb es zu Problemen "
 "und Datenverlust kommen kann!"
 
-#: index.php:483
+#: index.php:484
 msgid ""
 "The mbstring PHP extension was not found and you seem to be using a "
 "multibyte charset. Without the mbstring extension phpMyAdmin is unable to "
@@ -884,7 +886,7 @@ msgstr ""
 "phpMyAdmin nicht in der Lage Zeichenketten zu trennen, was zu unerwarteten "
 "Ergebnissen führen kann."
 
-#: index.php:500
+#: index.php:501
 msgid ""
 "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini."
 "session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower than "
@@ -896,7 +898,7 @@ msgstr ""
 "niedriger als die in phpMyAdmin konfigurierte Cookiegültigkeit, deshalb kann "
 "Ihre Anmeldung eher ablaufen als in phpMyAdmin konfiguriert."
 
-#: index.php:519
+#: index.php:520
 msgid ""
 "Login cookie store is lower than cookie validity configured in phpMyAdmin, "
 "because of this, your login will expire sooner than configured in phpMyAdmin."
@@ -905,13 +907,13 @@ msgstr ""
 "phpMyAdmin eingestellt ist, daher wird Ihre Anmeldung eher ablaufen als in "
 "phpMyAdmin konfiguriert."
 
-#: index.php:535
+#: index.php:536
 msgid "The configuration file now needs a secret passphrase (blowfish_secret)."
 msgstr ""
 "Ab sofort muss ein geheimes Passwort zur Verschlüsselung in der "
 "Konfigurationsdatei gesetzt werden (blowfish_secret)."
 
-#: index.php:548
+#: index.php:549
 msgid ""
 "Directory [code]config[/code], which is used by the setup script, still "
 "exists in your phpMyAdmin directory. It is strongly recommended to remove it "
@@ -923,7 +925,7 @@ msgstr ""
 "löschen. Andernfalls könnte die Sicherheit Ihres Servers gefährdet sein und "
 "unautorisierte Personen könnten die Konfiguration herunterladen."
 
-#: index.php:564
+#: index.php:565
 #, php-format
 msgid ""
 "The phpMyAdmin configuration storage is not completely configured, some "
@@ -933,14 +935,14 @@ msgstr ""
 "einige erweiterte Funktionen wurden deaktiviert. %sFinden Sie heraus warum"
 "%s. "
 
-#: index.php:571
+#: index.php:572
 msgid ""
 "Or alternately go to 'Operations' tab of any database to set it up there."
 msgstr ""
 "Oder wechseln Sie in einer beliebigen Datenbank zum Tab „Operationen“, um "
 "die Einstellung dort vorzunehmen."
 
-#: index.php:620
+#: index.php:621
 #, php-format
 msgid ""
 "Your PHP MySQL library version %s differs from your MySQL server version %s. "
@@ -949,7 +951,7 @@ msgstr ""
 "Die Version der verwendeten PHP-MySQL-Bibliothek %s unterscheidet sich von "
 "der Version des MySQL-Servers %s. Dies kann zu unerwartetem Verhalten führen."
 
-#: index.php:648
+#: index.php:649
 #, php-format
 msgid ""
 "Server running with Suhosin. Please refer to %sdocumentation%s for possible "
@@ -1113,8 +1115,8 @@ msgstr ""
 msgid "Save & Close"
 msgstr "Speichern & Schließen"
 
-#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:404
-#: libraries/insert_edit.lib.php:1550 prefs_manage.php:361
+#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:415
+#: libraries/insert_edit.lib.php:1548 prefs_manage.php:361
 #: prefs_manage.php:372
 msgid "Reset"
 msgstr "Zurücksetzen"
@@ -1147,7 +1149,7 @@ msgstr "Index hinzufügen"
 msgid "Edit Index"
 msgstr "Index bearbeiten"
 
-#: js/messages.php:99 templates/index_form.phtml:232
+#: js/messages.php:99 templates/table/index_form.phtml:232
 #, php-format
 msgid "Add %s column(s) to index"
 msgstr "%s Spalte(n) zum Index hinzufügen"
@@ -1168,13 +1170,14 @@ msgstr "Zusammenfügen mit:"
 msgid "Please select column(s) for the index."
 msgstr "Bitte wählen Sie %s Spalte(n) für den Index."
 
-#: js/messages.php:106 templates/structure/add_column.phtml:1
+#: js/messages.php:106 templates/table/structure/add_column.phtml:1
 msgid "You have to add at least one column."
 msgstr "Sie müssen mindestens eine Spalte hinzufügen."
 
-#: js/messages.php:109 libraries/insert_edit.lib.php:1548
+#: js/messages.php:109 libraries/insert_edit.lib.php:1546
 #: templates/columns_definitions/column_definitions_form.phtml:162
-#: templates/index_form.phtml:237 templates/tbl_relation/common_form.phtml:106
+#: templates/table/index_form.phtml:237
+#: templates/table/relation/common_form.phtml:106
 msgid "Preview SQL"
 msgstr "SQL Vorschau"
 
@@ -1191,7 +1194,7 @@ msgid "SQL query:"
 msgstr "SQL-Befehl:"
 
 #. l10n: Default label for the y-Axis of Charts
-#: js/messages.php:118 templates/tbl_chart.phtml:109
+#: js/messages.php:118 templates/table/chart/tbl_chart.phtml:109
 msgid "Y Values"
 msgstr "Y-Werte"
 
@@ -1347,7 +1350,7 @@ msgstr "Bytes gesendet"
 msgid "Bytes received"
 msgstr "Bytes empfangen"
 
-#: js/messages.php:169 libraries/server_status.lib.php:226
+#: js/messages.php:169 libraries/server_status.lib.php:235
 msgid "Connections"
 msgstr "Verbindungen"
 
@@ -1404,12 +1407,12 @@ msgstr "%d Tabelle(n)"
 msgid "Questions"
 msgstr "Anfragen"
 
-#: js/messages.php:184 libraries/server_status.lib.php:134
+#: js/messages.php:184 libraries/server_status.lib.php:143
 msgid "Traffic"
 msgstr "Netzwerkverkehr"
 
 #: js/messages.php:185 libraries/Menu.class.php:586
-#: libraries/Util.class.php:4318 libraries/server_status_monitor.lib.php:257
+#: libraries/Util.class.php:4324 libraries/server_status_monitor.lib.php:257
 msgid "Settings"
 msgstr "Einstellungen"
 
@@ -1429,8 +1432,9 @@ msgstr "Bitte fügen Sie mindestens eine Variable der Serie hinzu!"
 #: libraries/server_status_monitor.lib.php:236
 #: libraries/server_status_processes.lib.php:308
 #: templates/columns_definitions/transformation.phtml:4
-#: templates/designer/options_panel.phtml:178
-#: templates/table/options_zoom.phtml:12 templates/table/rows_zoom.phtml:26
+#: templates/database/designer/options_panel.phtml:178
+#: templates/table/search/options_zoom.phtml:12
+#: templates/table/search/rows_zoom.phtml:26
 msgid "None"
 msgstr "keine"
 
@@ -1723,8 +1727,8 @@ msgstr ""
 
 #: js/messages.php:270 libraries/Menu.class.php:352
 #: libraries/Menu.class.php:455 libraries/Menu.class.php:582
-#: libraries/Util.class.php:4317 libraries/Util.class.php:4332
-#: libraries/Util.class.php:4349 libraries/config/messages.inc.php:258
+#: libraries/Util.class.php:4323 libraries/Util.class.php:4338
+#: libraries/Util.class.php:4355 libraries/config/messages.inc.php:258
 #: libraries/display_import.lib.php:105
 #: libraries/server_status_monitor.lib.php:318 prefs_manage.php:238
 #: setup/frames/menu.inc.php:26
@@ -1784,13 +1788,13 @@ msgid "Formatting SQL..."
 msgstr "SQL wird formatiert ...."
 
 #: js/messages.php:293 libraries/server_variables.lib.php:157
-#: templates/designer/aggregate_query_panel.phtml:63
-#: templates/designer/delete_relation_panel.phtml:28
-#: templates/designer/having_query_panel.phtml:117
-#: templates/designer/new_relation_panel.phtml:88
-#: templates/designer/options_panel.phtml:253
-#: templates/designer/rename_to_panel.phtml:45
-#: templates/designer/where_query_panel.phtml:83
+#: templates/database/designer/aggregate_query_panel.phtml:63
+#: templates/database/designer/delete_relation_panel.phtml:28
+#: templates/database/designer/having_query_panel.phtml:117
+#: templates/database/designer/new_relation_panel.phtml:88
+#: templates/database/designer/options_panel.phtml:253
+#: templates/database/designer/rename_to_panel.phtml:45
+#: templates/database/designer/where_query_panel.phtml:83
 msgid "Cancel"
 msgstr "Abbrechen"
 
@@ -1798,7 +1802,7 @@ msgstr "Abbrechen"
 msgid "Page-related settings"
 msgstr "Seitenbezogene Einstellungen"
 
-#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:402
+#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:413
 msgid "Apply"
 msgstr "Übernehmen"
 
@@ -1833,8 +1837,8 @@ msgstr "Fehlercode: %s"
 msgid "Error text: %s"
 msgstr "Fehlertext: %s"
 
-#: js/messages.php:307 libraries/db_common.inc.php:68
-#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:450
+#: js/messages.php:307 libraries/db_common.inc.php:69
+#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:461
 msgid "No databases selected."
 msgstr "Es wurden keine Datenbanken ausgewählt."
 
@@ -1846,12 +1850,13 @@ msgstr "Spalte wird gelöscht"
 msgid "Adding Primary Key"
 msgstr "Primärschlüssel wird hinzugefügt"
 
-#: js/messages.php:310 templates/designer/aggregate_query_panel.phtml:59
-#: templates/designer/having_query_panel.phtml:113
-#: templates/designer/new_relation_panel.phtml:87
-#: templates/designer/options_panel.phtml:252
-#: templates/designer/rename_to_panel.phtml:41
-#: templates/designer/where_query_panel.phtml:82
+#: js/messages.php:310
+#: templates/database/designer/aggregate_query_panel.phtml:59
+#: templates/database/designer/having_query_panel.phtml:113
+#: templates/database/designer/new_relation_panel.phtml:87
+#: templates/database/designer/options_panel.phtml:252
+#: templates/database/designer/rename_to_panel.phtml:41
+#: templates/database/designer/where_query_panel.phtml:82
 msgid "OK"
 msgstr "OK"
 
@@ -1871,7 +1876,7 @@ msgstr "Datenbank wird kopiert"
 msgid "Changing Charset"
 msgstr "Zeichensatz wird geändert"
 
-#: js/messages.php:320 libraries/Util.class.php:3217
+#: js/messages.php:320 libraries/Util.class.php:3223
 msgid "Enable foreign key checks"
 msgstr "Fremdschlüsselüberprüfung aktivieren"
 
@@ -1908,20 +1913,21 @@ msgstr ""
 #: js/messages.php:334 libraries/DisplayResults.class.php:4834
 #: libraries/DisplayResults.class.php:5092 libraries/Menu.class.php:344
 #: libraries/Menu.class.php:446 libraries/Menu.class.php:578
-#: libraries/Util.class.php:3636 libraries/Util.class.php:3637
-#: libraries/Util.class.php:4316 libraries/Util.class.php:4331
-#: libraries/Util.class.php:4348 libraries/config/messages.inc.php:252
+#: libraries/Util.class.php:3642 libraries/Util.class.php:3643
+#: libraries/Util.class.php:4322 libraries/Util.class.php:4337
+#: libraries/Util.class.php:4354 libraries/config/messages.inc.php:252
 #: libraries/display_export.lib.php:173 libraries/rte/rte_list.lib.php:146
 #: libraries/server_privileges.lib.php:2211
 #: libraries/server_privileges.lib.php:2290
 #: libraries/server_privileges.lib.php:2632
 #: libraries/server_privileges.lib.php:3356
 #: libraries/server_status_monitor.lib.php:322 prefs_manage.php:303
-#: setup/frames/menu.inc.php:27 templates/structure/check_all_tables.phtml:11
+#: setup/frames/menu.inc.php:27
+#: templates/database/structure/check_all_tables.phtml:11
 msgid "Export"
 msgstr "Exportieren"
 
-#: js/messages.php:337 libraries/rte/rte_routines.lib.php:652
+#: js/messages.php:337 libraries/rte/rte_routines.lib.php:743
 msgid "ENUM/SET editor"
 msgstr "ENUM/SET Editor"
 
@@ -1962,7 +1968,7 @@ msgstr "SQL-Querybox anzeigen"
 #: libraries/Console.class.php:214 libraries/DisplayResults.class.php:3474
 #: libraries/DisplayResults.class.php:4818 libraries/Index.class.php:723
 #: libraries/Util.class.php:706 libraries/Util.class.php:1202
-#: libraries/Util.class.php:3634 libraries/Util.class.php:3635
+#: libraries/Util.class.php:3640 libraries/Util.class.php:3641
 #: libraries/central_columns.lib.php:851
 #: libraries/central_columns.lib.php:1193
 #: libraries/config/messages.inc.php:892
@@ -1980,7 +1986,7 @@ msgstr "Bearbeiten"
 #: libraries/server_user_groups.lib.php:129
 #: libraries/sql_query_form.lib.php:416 libraries/tracking.lib.php:477
 #: setup/frames/index.inc.php:183 setup/frames/index.inc.php:291
-#: templates/designer/delete_relation_panel.phtml:27
+#: templates/database/designer/delete_relation_panel.phtml:27
 msgid "Delete"
 msgstr "Löschen"
 
@@ -2153,11 +2159,11 @@ msgid "No dependencies selected!"
 msgstr "Es wurden keine Anhängigkeiten ausgewählt!"
 
 #: js/messages.php:394 libraries/central_columns.lib.php:1214
-#: libraries/insert_edit.lib.php:1458 libraries/server_variables.lib.php:155
+#: libraries/insert_edit.lib.php:1456 libraries/server_variables.lib.php:155
 #: setup/frames/config.inc.php:42 setup/frames/index.inc.php:279
 #: templates/columns_definitions/column_definitions_form.phtml:165
-#: templates/gis_visualization/gis_visualization.phtml:48
-#: templates/tbl_relation/common_form.phtml:107
+#: templates/table/gis_visualization/gis_visualization.phtml:48
+#: templates/table/relation/common_form.phtml:107
 msgid "Save"
 msgstr "Speichern"
 
@@ -2239,8 +2245,8 @@ msgid "Data point content"
 msgstr "Datenpunkt-Inhalt"
 
 #: js/messages.php:430 js/messages.php:562 js/messages.php:579
-#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2573
-#: templates/index_form.phtml:154 templates/index_form.phtml:194
+#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2571
+#: templates/table/index_form.phtml:154 templates/table/index_form.phtml:194
 msgid "Ignore"
 msgstr "Ignorieren"
 
@@ -2305,8 +2311,8 @@ msgstr "Wähle Fremdschlüssel"
 msgid "Please select the primary key or a unique key!"
 msgstr "Bitte den PRIMARY KEY oder einen UNIQUE KEY wählen!"
 
-#: js/messages.php:457 templates/designer/side_menu.phtml:91
-#: templates/designer/side_menu.phtml:94
+#: js/messages.php:457 templates/database/designer/side_menu.phtml:91
+#: templates/database/designer/side_menu.phtml:94
 msgid "Choose column to display"
 msgstr "Anzuzeigende Spalte auswählen"
 
@@ -2322,18 +2328,18 @@ msgstr ""
 msgid "Page name"
 msgstr "Seitenname"
 
-#: js/messages.php:463 templates/designer/side_menu.phtml:56
-#: templates/designer/side_menu.phtml:59
+#: js/messages.php:463 templates/database/designer/side_menu.phtml:56
+#: templates/database/designer/side_menu.phtml:59
 msgid "Save page"
 msgstr "Seite speichern"
 
-#: js/messages.php:464 templates/designer/side_menu.phtml:63
-#: templates/designer/side_menu.phtml:66
+#: js/messages.php:464 templates/database/designer/side_menu.phtml:63
+#: templates/database/designer/side_menu.phtml:66
 msgid "Save page as"
 msgstr "Seite speichern als"
 
-#: js/messages.php:465 templates/designer/side_menu.phtml:49
-#: templates/designer/side_menu.phtml:52
+#: js/messages.php:465 templates/database/designer/side_menu.phtml:49
+#: templates/database/designer/side_menu.phtml:52
 msgid "Open page"
 msgstr "Öffne Seite"
 
@@ -2341,7 +2347,7 @@ msgstr "Öffne Seite"
 msgid "Delete page"
 msgstr "Seite löschen"
 
-#: js/messages.php:467 templates/designer/side_menu.phtml:10
+#: js/messages.php:467 templates/database/designer/side_menu.phtml:10
 msgid "Untitled"
 msgstr "Unbenannt"
 
@@ -2467,7 +2473,7 @@ msgstr "Ursprüngliche Länge"
 msgid "cancel"
 msgstr "abbrechen"
 
-#: js/messages.php:499 libraries/server_status.lib.php:271
+#: js/messages.php:499 libraries/server_status.lib.php:280
 msgid "Aborted"
 msgstr "Abgebrochen"
 
@@ -3041,7 +3047,7 @@ msgstr "Bitte geben Sie einen gültige hexadezimale Eingabe ein"
 
 #: js/messages.php:793 libraries/Message.class.php:199
 #: libraries/Util.class.php:654 libraries/core.lib.php:245
-#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1172
+#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1170
 #: tbl_operations.php:229 view_operations.php:63
 msgid "Error"
 msgstr "Fehler"
@@ -3103,8 +3109,8 @@ msgstr "pro Sekunde"
 msgid "per minute"
 msgstr "pro Minute"
 
-#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:143
-#: libraries/server_status.lib.php:228
+#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:152
+#: libraries/server_status.lib.php:237
 #: libraries/server_status_queries.lib.php:98
 msgid "per hour"
 msgstr "pro Stunde"
@@ -3124,7 +3130,7 @@ msgstr ""
 "Falsche Zugriffsrechte auf die Konfigurationsdatei. Schreibzugriff sollte "
 "nicht für alle möglich sein!"
 
-#: libraries/Config.class.php:1799
+#: libraries/Config.class.php:1801
 msgid "Font size"
 msgstr "Schriftgröße"
 
@@ -3152,10 +3158,10 @@ msgstr "Erneut abfragen"
 #: libraries/server_privileges.lib.php:2890
 #: libraries/server_privileges.lib.php:3144
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4332
+#: libraries/server_privileges.lib.php:4358
 #: libraries/server_status_processes.lib.php:80
-#: templates/tbl_relation/foreign_key_row.phtml:165
-#: templates/tbl_relation/internal_relational_row.phtml:55
+#: templates/table/relation/foreign_key_row.phtml:165
+#: templates/table/relation/internal_relational_row.phtml:55
 msgid "Database"
 msgstr "Datenbank"
 
@@ -3248,11 +3254,11 @@ msgstr "Verlaufsprotokoll"
 #: libraries/plugins/import/ImportMediawiki.class.php:60
 #: libraries/plugins/import/ImportOds.class.php:59
 #: libraries/plugins/import/ImportShp.class.php:57
-#: libraries/plugins/import/ImportSql.class.php:148
+#: libraries/plugins/import/ImportSql.class.php:51
 #: libraries/plugins/import/ImportXml.class.php:58
-#: libraries/rte/rte_routines.lib.php:833 templates/index_form.phtml:49
-#: templates/structure/row_stats_table.phtml:20
-#: templates/table/options.phtml:2
+#: libraries/rte/rte_routines.lib.php:924 templates/table/index_form.phtml:49
+#: templates/table/search/options.phtml:2
+#: templates/table/structure/row_stats_table.phtml:20
 msgid "Options"
 msgstr "Optionen"
 
@@ -3285,7 +3291,8 @@ msgstr "absteigend"
 msgid "Order:"
 msgstr "Reihenfolge:"
 
-#: libraries/Console.class.php:289 templates/table/replace_preview.phtml:17
+#: libraries/Console.class.php:289
+#: templates/table/search/replace_preview.phtml:17
 msgid "Count"
 msgstr "Zähler"
 
@@ -3382,9 +3389,9 @@ msgstr "Zum dunklen Motiv wechseln"
 #: libraries/operations.lib.php:794 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:191
-#: templates/structure/sortable_header.phtml:21
-#: templates/structure/sortable_header.phtml:38
-#: templates/table/options.phtml:68
+#: templates/database/structure/sortable_header.phtml:21
+#: templates/database/structure/sortable_header.phtml:38
+#: templates/table/search/options.phtml:68
 msgid "Ascending"
 msgstr "Aufsteigend"
 
@@ -3394,13 +3401,14 @@ msgstr "Aufsteigend"
 #: libraries/operations.lib.php:797 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:188
-#: templates/structure/sortable_header.phtml:26
-#: templates/structure/sortable_header.phtml:43
-#: templates/table/options.phtml:69
+#: templates/database/structure/sortable_header.phtml:26
+#: templates/database/structure/sortable_header.phtml:43
+#: templates/table/search/options.phtml:69
 msgid "Descending"
 msgstr "Absteigend"
 
-#: libraries/DBQbe.class.php:467 templates/table/search_and_replace.phtml:6
+#: libraries/DBQbe.class.php:467
+#: templates/table/search/search_and_replace.phtml:6
 msgid "Column:"
 msgstr "Spalte:"
 
@@ -3561,12 +3569,12 @@ msgstr[0] "%1$s Treffer in <strong>%2$s</strong>"
 msgstr[1] "%1$s Treffer in <strong>%2$s</strong>"
 
 #: libraries/DbSearch.class.php:354 libraries/Menu.class.php:311
-#: libraries/Util.class.php:3337 libraries/Util.class.php:3347
-#: libraries/Util.class.php:3623 libraries/Util.class.php:3624
-#: libraries/Util.class.php:4343 libraries/config.values.php:43
+#: libraries/Util.class.php:3343 libraries/Util.class.php:3353
+#: libraries/Util.class.php:3629 libraries/Util.class.php:3630
+#: libraries/Util.class.php:4349 libraries/config.values.php:43
 #: libraries/config.values.php:51 libraries/config.values.php:119
 #: libraries/navigation/Nodes/Node_Table.class.php:295
-#: templates/structure/check_all_table_column.phtml:5
+#: templates/table/structure/check_all_table_column.phtml:5
 msgid "Browse"
 msgstr "Anzeigen"
 
@@ -3583,7 +3591,8 @@ msgstr "Durchsuche die Datenbank"
 msgid "Words or values to search for (wildcard: \"%\"):"
 msgstr "Zu suchende Wörter oder Werte (Platzhalter: \"%\"):"
 
-#: libraries/DbSearch.class.php:401 templates/table/search_and_replace.phtml:1
+#: libraries/DbSearch.class.php:401
+#: templates/table/search/search_and_replace.phtml:1
 msgid "Find:"
 msgstr "Finde:"
 
@@ -3627,28 +3636,28 @@ msgstr "Zeilen filtern"
 msgid "Search this table"
 msgstr "Diese Tabelle durchsuchen"
 
-#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2532
-#: libraries/Util.class.php:2535
+#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2538
+#: libraries/Util.class.php:2541
 msgctxt "First page"
 msgid "Begin"
 msgstr "Anfang"
 
-#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2533
-#: libraries/Util.class.php:2536 libraries/server_bin_log.lib.php:170
+#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2539
+#: libraries/Util.class.php:2542 libraries/server_bin_log.lib.php:170
 #: libraries/server_bin_log.lib.php:172
 msgctxt "Previous page"
 msgid "Previous"
 msgstr "Vorherige"
 
-#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2564
-#: libraries/Util.class.php:2574 libraries/server_bin_log.lib.php:204
+#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2570
+#: libraries/Util.class.php:2580 libraries/server_bin_log.lib.php:204
 #: libraries/server_bin_log.lib.php:206
 msgctxt "Next page"
 msgid "Next"
 msgstr "Nächste"
 
-#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2565
-#: libraries/Util.class.php:2575
+#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2571
+#: libraries/Util.class.php:2581
 msgctxt "Last page"
 msgid "End"
 msgstr "Ende"
@@ -3725,15 +3734,15 @@ msgstr ""
 "[doc@faq3-11]FAQ 3.11[/doc]."
 
 #: libraries/DisplayResults.class.php:4332 libraries/Message.class.php:180
-#: libraries/controllers/TableRelationController.class.php:258
+#: libraries/controllers/TableRelationController.class.php:259
 #: libraries/controllers/TableSearchController.class.php:655
-#: libraries/rte/rte_routines.lib.php:1332 libraries/sql_query_form.lib.php:89
+#: libraries/rte/rte_routines.lib.php:1423 libraries/sql_query_form.lib.php:89
 #: tbl_operations.php:227 tbl_row_action.php:138 view_operations.php:62
 msgid "Your SQL query has been executed successfully."
 msgstr "Ihr SQL-Befehl wurde erfolgreich ausgeführt."
 
 #: libraries/DisplayResults.class.php:4660
-#: libraries/controllers/StructureController.class.php:629
+#: libraries/controllers/DatabaseStructureController.class.php:564
 #, php-format
 msgid ""
 "This view has at least this number of rows. Please refer to %sdocumentation"
@@ -3759,33 +3768,33 @@ msgstr "%d insgesamt"
 
 # (s is the abbreviation of "Sekunde", sec is it not (according to
 # International System of Units), so we wrote the complete one.)
-#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1318
+#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1312
 #, php-format
 msgid "Query took %01.4f seconds."
 msgstr "Die Abfrage dauerte %01.4f Sekunden."
 
 #: libraries/DisplayResults.class.php:4807
-#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4767
-#: libraries/Util.class.php:4773 libraries/mult_submits.inc.php:50
-#: templates/structure/check_all_tables.phtml:2
-#: templates/structure/check_all_tables.phtml:9
+#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4773
+#: libraries/Util.class.php:4779 libraries/mult_submits.inc.php:50
+#: templates/database/structure/check_all_tables.phtml:2
+#: templates/database/structure/check_all_tables.phtml:9
 msgid "With selected:"
 msgstr "markierte:"
 
 #: libraries/DisplayResults.class.php:4811
-#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4769
-#: libraries/Util.class.php:4770 libraries/server_privileges.lib.php:1174
+#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4775
+#: libraries/Util.class.php:4776 libraries/server_privileges.lib.php:1174
 #: libraries/server_privileges.lib.php:1175
 #: libraries/server_privileges.lib.php:1387
 #: libraries/server_user_groups.lib.php:231
-#: templates/structure/check_all_tables.phtml:3
-#: templates/structure/check_all_tables.phtml:4
+#: templates/database/structure/check_all_tables.phtml:3
+#: templates/database/structure/check_all_tables.phtml:4
 msgid "Check All"
 msgstr "Alle auswählen"
 
 #: libraries/DisplayResults.class.php:4985 libraries/Header.class.php:383
-#: templates/structure/optional_action_links.phtml:1
-#: templates/structure/print_view_data_dictionary_link.phtml:3
+#: templates/database/structure/print_view_data_dictionary_link.phtml:3
+#: templates/table/structure/optional_action_links.phtml:1
 msgid "Print view"
 msgstr "Druckansicht"
 
@@ -3793,7 +3802,8 @@ msgstr "Druckansicht"
 msgid "Query results operations"
 msgstr "Operationen für das Abfrageergebnis"
 
-#: libraries/DisplayResults.class.php:5105 templates/tbl_chart.phtml:12
+#: libraries/DisplayResults.class.php:5105
+#: templates/table/chart/tbl_chart.phtml:12
 msgid "Display chart"
 msgstr "Diagramm anzeigen"
 
@@ -3890,7 +3900,7 @@ msgid "Click on the bar to scroll to top of page"
 msgstr "Klicken Sie auf die Leiste, um zum Anfang der Seite zu scrollen"
 
 #: libraries/Header.class.php:749
-#: libraries/plugins/auth/AuthenticationCookie.class.php:152
+#: libraries/plugins/auth/AuthenticationCookie.class.php:140
 msgid "Javascript must be enabled past this point!"
 msgstr "Javascript muss ab hier aktiviert sein!"
 
@@ -3912,11 +3922,11 @@ msgid "Keyname"
 msgstr "Schlüsselname"
 
 #: libraries/Index.class.php:697
-#: libraries/controllers/StructureController.class.php:1962
-#: libraries/controllers/StructureController.class.php:1967
+#: libraries/controllers/TableStructureController.class.php:953
+#: libraries/controllers/TableStructureController.class.php:958
 #: libraries/tracking.lib.php:973
 #: templates/columns_definitions/column_indexes.phtml:11
-#: templates/structure/check_all_table_column.phtml:26
+#: templates/table/structure/check_all_table_column.phtml:26
 msgid "Unique"
 msgstr "Unique"
 
@@ -3935,16 +3945,17 @@ msgstr "Kardinalität"
 #: libraries/server_collations.lib.php:35 libraries/tracking.lib.php:881
 #: libraries/tracking.lib.php:977
 #: templates/columns_definitions/table_fields_definitions.phtml:33
-#: templates/structure/row_stats_table.phtml:31
-#: templates/structure/table_header.phtml:55
-#: templates/structure/table_structure_header.phtml:7
-#: templates/table/table_header.phtml:8
+#: templates/database/structure/table_header.phtml:55
+#: templates/table/search/table_header.phtml:8
+#: templates/table/structure/row_stats_table.phtml:31
+#: templates/table/structure/table_structure_header.phtml:7
 msgid "Collation"
 msgstr "Kollation"
 
 #: libraries/Index.class.php:703 libraries/rte/rte_events.lib.php:496
-#: libraries/rte/rte_routines.lib.php:956 libraries/tracking.lib.php:885
-#: libraries/tracking.lib.php:979 templates/structure/table_header.phtml:84
+#: libraries/rte/rte_routines.lib.php:1047 libraries/tracking.lib.php:885
+#: libraries/tracking.lib.php:979
+#: templates/database/structure/table_header.phtml:84
 msgid "Comment"
 msgstr "Kommentar"
 
@@ -3957,15 +3968,15 @@ msgstr "Der Primärschlüssel wurde gelöscht."
 msgid "Index %s has been dropped."
 msgstr "Index %s wurde entfernt."
 
-#: libraries/Index.class.php:757 libraries/Util.class.php:3630
-#: libraries/Util.class.php:3631
-#: libraries/controllers/StructureController.class.php:1958
-#: libraries/controllers/StructureController.class.php:1959
+#: libraries/Index.class.php:757 libraries/Util.class.php:3636
+#: libraries/Util.class.php:3637
+#: libraries/controllers/TableStructureController.class.php:949
+#: libraries/controllers/TableStructureController.class.php:950
 #: libraries/operations.lib.php:1607 libraries/rte/rte_list.lib.php:150
 #: libraries/server_databases.lib.php:146
-#: templates/structure/check_all_table_column.phtml:15
-#: templates/structure/check_all_tables.phtml:16
-#: templates/tbl_relation/foreign_key_row.phtml:93
+#: templates/database/structure/check_all_tables.phtml:16
+#: templates/table/relation/foreign_key_row.phtml:93
+#: templates/table/structure/check_all_table_column.phtml:15
 msgid "Drop"
 msgstr "Löschen"
 
@@ -3998,16 +4009,16 @@ msgstr "Server"
 #: libraries/Menu.class.php:248
 #: libraries/navigation/Nodes/Node_View.class.php:32
 #: libraries/tbl_info.inc.php:63
-#: templates/structure/structure_table_row.phtml:97
-#: templates/structure/structure_table_row.phtml:159
+#: templates/database/structure/structure_table_row.phtml:97
+#: templates/database/structure/structure_table_row.phtml:159
 msgid "View"
 msgstr "Ansicht"
 
 #: libraries/Menu.class.php:325 libraries/Menu.class.php:429
-#: libraries/Menu.class.php:548 libraries/Util.class.php:3334
-#: libraries/Util.class.php:3344 libraries/Util.class.php:3350
-#: libraries/Util.class.php:4313 libraries/Util.class.php:4328
-#: libraries/Util.class.php:4345 libraries/config.values.php:40
+#: libraries/Menu.class.php:548 libraries/Util.class.php:3340
+#: libraries/Util.class.php:3350 libraries/Util.class.php:3356
+#: libraries/Util.class.php:4319 libraries/Util.class.php:4334
+#: libraries/Util.class.php:4351 libraries/config.values.php:40
 #: libraries/config.values.php:48 libraries/config.values.php:110
 #: libraries/config.values.php:116 libraries/config/messages.inc.php:321
 #: libraries/navigation/Nodes/Node_Table.class.php:292
@@ -4015,19 +4026,19 @@ msgid "SQL"
 msgstr "SQL"
 
 #: libraries/Menu.class.php:328 libraries/Menu.class.php:432
-#: libraries/Util.class.php:3335 libraries/Util.class.php:3345
-#: libraries/Util.class.php:3351 libraries/Util.class.php:3625
-#: libraries/Util.class.php:3626 libraries/Util.class.php:4329
-#: libraries/Util.class.php:4346 libraries/config.values.php:41
+#: libraries/Util.class.php:3341 libraries/Util.class.php:3351
+#: libraries/Util.class.php:3357 libraries/Util.class.php:3631
+#: libraries/Util.class.php:3632 libraries/Util.class.php:4335
+#: libraries/Util.class.php:4352 libraries/config.values.php:41
 #: libraries/config.values.php:49 libraries/config.values.php:111
 #: libraries/config.values.php:117
 #: libraries/navigation/Nodes/Node_Table.class.php:286
 msgid "Search"
 msgstr "Suche"
 
-#: libraries/Menu.class.php:338 libraries/Util.class.php:3336
-#: libraries/Util.class.php:3346 libraries/Util.class.php:3627
-#: libraries/Util.class.php:3628 libraries/Util.class.php:4347
+#: libraries/Menu.class.php:338 libraries/Util.class.php:3342
+#: libraries/Util.class.php:3352 libraries/Util.class.php:3633
+#: libraries/Util.class.php:3634 libraries/Util.class.php:4353
 #: libraries/config.values.php:42 libraries/config.values.php:50
 #: libraries/config.values.php:118
 #: libraries/navigation/Nodes/Node_Table.class.php:289
@@ -4036,30 +4047,30 @@ msgid "Insert"
 msgstr "Einfügen"
 
 #: libraries/Menu.class.php:362 libraries/Menu.class.php:467
-#: libraries/Util.class.php:4334 libraries/Util.class.php:4350
+#: libraries/Util.class.php:4340 libraries/Util.class.php:4356
 #: libraries/config.values.php:106 libraries/server_common.lib.php:51
 #: libraries/server_privileges.lib.php:2370
 #: libraries/server_privileges.lib.php:3158
-#: libraries/server_privileges.lib.php:4221
+#: libraries/server_privileges.lib.php:4247
 msgid "Privileges"
 msgstr "Rechte"
 
 #: libraries/Menu.class.php:371 libraries/Menu.class.php:379
-#: libraries/Menu.class.php:459 libraries/Util.class.php:3338
-#: libraries/Util.class.php:3352 libraries/Util.class.php:4333
-#: libraries/Util.class.php:4351 libraries/config.values.php:112
+#: libraries/Menu.class.php:459 libraries/Util.class.php:3344
+#: libraries/Util.class.php:3358 libraries/Util.class.php:4339
+#: libraries/Util.class.php:4357 libraries/config.values.php:112
 #: view_operations.php:92
 msgid "Operations"
 msgstr "Operationen"
 
 #: libraries/Menu.class.php:384 libraries/Menu.class.php:492
-#: libraries/Util.class.php:4338 libraries/Util.class.php:4352
+#: libraries/Util.class.php:4344 libraries/Util.class.php:4358
 #: libraries/relation.lib.php:255
 msgid "Tracking"
 msgstr "Nachverfolgung"
 
 #: libraries/Menu.class.php:397 libraries/Menu.class.php:486
-#: libraries/Util.class.php:4337 libraries/Util.class.php:4353
+#: libraries/Util.class.php:4343 libraries/Util.class.php:4359
 #: libraries/navigation/Nodes/Node_Trigger_Container.class.php:24
 #: libraries/plugins/export/ExportHtmlword.class.php:557
 #: libraries/plugins/export/ExportOdt.class.php:685
@@ -4076,16 +4087,16 @@ msgstr "Trigger"
 msgid "Database seems to be empty!"
 msgstr "Die Datenbank scheint leer zu sein!"
 
-#: libraries/Menu.class.php:439 libraries/Util.class.php:4330
+#: libraries/Menu.class.php:439 libraries/Util.class.php:4336
 msgid "Query"
 msgstr "Abfrage"
 
-#: libraries/Menu.class.php:472 libraries/Util.class.php:4335
+#: libraries/Menu.class.php:472 libraries/Util.class.php:4341
 #: libraries/rte/rte_words.lib.php:36
 msgid "Routines"
 msgstr "Routinen"
 
-#: libraries/Menu.class.php:479 libraries/Util.class.php:4336
+#: libraries/Menu.class.php:479 libraries/Util.class.php:4342
 #: libraries/navigation/Nodes/Node_Event_Container.class.php:26
 #: libraries/plugins/export/ExportSql.class.php:940
 #: libraries/plugins/export/ExportXml.class.php:107
@@ -4093,20 +4104,20 @@ msgstr "Routinen"
 msgid "Events"
 msgstr "Ereignisse"
 
-#: libraries/Menu.class.php:498 libraries/Util.class.php:4339
+#: libraries/Menu.class.php:498 libraries/Util.class.php:4345
 msgid "Designer"
 msgstr "Designer"
 
-#: libraries/Menu.class.php:507 libraries/Util.class.php:4340
-#: templates/structure/check_all_tables.phtml:35
+#: libraries/Menu.class.php:507 libraries/Util.class.php:4346
+#: templates/database/structure/check_all_tables.phtml:35
 msgid "Central columns"
 msgstr "Zentrale Spalten"
 
-#: libraries/Menu.class.php:544 libraries/Util.class.php:4312
+#: libraries/Menu.class.php:544 libraries/Util.class.php:4318
 #: libraries/config.values.php:103 libraries/config/messages.inc.php:266
 #: libraries/config/messages.inc.php:341
 #: libraries/navigation/NavigationTree.class.php:1239
-#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4332
+#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4358
 msgid "Databases"
 msgstr "Datenbanken"
 
@@ -4115,34 +4126,34 @@ msgid "User accounts"
 msgstr "Benutzerkonten"
 
 #: libraries/Menu.class.php:595 libraries/ServerStatusData.class.php:121
-#: libraries/Util.class.php:4319 libraries/server_common.lib.php:36
+#: libraries/Util.class.php:4325 libraries/server_common.lib.php:36
 msgid "Binary log"
 msgstr "Binäres Protokoll"
 
 #: libraries/Menu.class.php:601 libraries/ServerStatusData.class.php:126
-#: libraries/Util.class.php:4320 libraries/server_common.lib.php:42
-#: templates/structure/body_for_table_summary.phtml:10
-#: templates/structure/table_header.phtml:27
+#: libraries/Util.class.php:4326 libraries/server_common.lib.php:42
+#: templates/database/structure/body_for_table_summary.phtml:10
+#: templates/database/structure/table_header.phtml:27
 msgid "Replication"
 msgstr "Replikation"
 
 #: libraries/Menu.class.php:606 libraries/ServerStatusData.class.php:193
-#: libraries/Util.class.php:4321 libraries/config.values.php:105
+#: libraries/Util.class.php:4327 libraries/config.values.php:105
 #: libraries/server_engines.lib.php:108 libraries/server_engines.lib.php:112
 #: libraries/sql_query_form.lib.php:421
 msgid "Variables"
 msgstr "Variablen"
 
-#: libraries/Menu.class.php:610 libraries/Util.class.php:4322
+#: libraries/Menu.class.php:610 libraries/Util.class.php:4328
 msgid "Charsets"
 msgstr "Zeichensätze"
 
-#: libraries/Menu.class.php:615 libraries/Util.class.php:4323
+#: libraries/Menu.class.php:615 libraries/Util.class.php:4329
 #: libraries/server_common.lib.php:33 libraries/server_plugins.lib.php:27
 msgid "Plugins"
 msgstr "Erweiterungen"
 
-#: libraries/Menu.class.php:626 libraries/Util.class.php:4324
+#: libraries/Menu.class.php:626 libraries/Util.class.php:4330
 msgid "Engines"
 msgstr "Formate"
 
@@ -4167,7 +4178,7 @@ msgid_plural "%1$d rows inserted."
 msgstr[0] "%1$d Datensatz eingefügt."
 msgstr[1] "%1$d Datensätze eingefügt."
 
-#: libraries/PDF.class.php:70 libraries/Util.class.php:2521
+#: libraries/PDF.class.php:70 libraries/Util.class.php:2527
 #: libraries/browse_foreigners.lib.php:327
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:865
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:890
@@ -4188,7 +4199,7 @@ msgid "Could not save favorite table!"
 msgstr "Konnte die Favoriten-Tabelle nicht speichern!"
 
 #: libraries/RecentFavoriteTable.class.php:212
-#: templates/structure/favorite_anchor.phtml:12
+#: templates/database/structure/favorite_anchor.phtml:12
 msgid "Remove from Favorites"
 msgstr "Aus Favoriten entfernen"
 
@@ -4353,7 +4364,7 @@ msgid ""
 msgstr "Für dieses Tabellenformat sind keine Statusinformationen verfügbar."
 
 #: libraries/StorageEngine.class.php:373
-#: templates/structure/body_for_table_summary.phtml:50
+#: templates/database/structure/body_for_table_summary.phtml:50
 #, php-format
 msgid "%s is the default storage engine on this MySQL server."
 msgstr "%s ist die Standard Storage-Engine dieses MySQL-Servers."
@@ -4841,10 +4852,10 @@ msgstr "%d Fehler wurden während der Analyse gefunden."
 
 #: libraries/Util.class.php:726 libraries/rte/rte_events.lib.php:110
 #: libraries/rte/rte_events.lib.php:119 libraries/rte/rte_events.lib.php:150
-#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:153
-#: libraries/rte/rte_routines.lib.php:162
-#: libraries/rte/rte_routines.lib.php:235
-#: libraries/rte/rte_routines.lib.php:1366
+#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:223
+#: libraries/rte/rte_routines.lib.php:250
+#: libraries/rte/rte_routines.lib.php:372
+#: libraries/rte/rte_routines.lib.php:1457
 #: libraries/rte/rte_triggers.lib.php:86 libraries/rte/rte_triggers.lib.php:95
 #: libraries/rte/rte_triggers.lib.php:127
 msgid "MySQL said: "
@@ -4888,76 +4899,79 @@ msgstr "So"
 msgid "%B %d, %Y at %I:%M %p"
 msgstr "%d. %B %Y um %H:%M"
 
-#: libraries/Util.class.php:2019
+#: libraries/Util.class.php:2025
 #, php-format
 msgid "%s days, %s hours, %s minutes and %s seconds"
 msgstr "%s Tage, %s Stunden, %s Minuten und %s Sekunden"
 
-#: libraries/Util.class.php:2112
+#: libraries/Util.class.php:2118
 msgid "Missing parameter:"
 msgstr "Fehlende(r) Parameter:"
 
-#: libraries/Util.class.php:2645
+#: libraries/Util.class.php:2651
 #, php-format
 msgid "Jump to database \"%s\"."
 msgstr "Zur Datenbank \"%s\" springen."
 
-#: libraries/Util.class.php:2670
+#: libraries/Util.class.php:2676
 #, php-format
 msgid "The %s functionality is affected by a known bug, see %s"
 msgstr ""
 "Die Funktion %s wird durch einen bekannten Fehler beeinträchtigt, siehe %s"
 
-#: libraries/Util.class.php:2881
+#: libraries/Util.class.php:2887
 msgid "Click to toggle"
 msgstr "Zum Umschalten anklicken"
 
-#: libraries/Util.class.php:3542 prefs_manage.php:248
+#: libraries/Util.class.php:3548 prefs_manage.php:248
 msgid "Browse your computer:"
 msgstr "Durchsuchen Sie Ihren Computer:"
 
-#: libraries/Util.class.php:3567
+#: libraries/Util.class.php:3573
 #, php-format
 msgid "Select from the web server upload directory <b>%s</b>:"
 msgstr "Wählen Sie vom Webserver-Uploadverzeichnis <b>%s</b>:"
 
-#: libraries/Util.class.php:3596 libraries/insert_edit.lib.php:1173
+#: libraries/Util.class.php:3602 libraries/insert_edit.lib.php:1171
 msgid "The directory you set for upload work cannot be reached."
 msgstr "Auf das festgelegte Upload-Verzeichnis kann nicht zugegriffen werden."
 
-#: libraries/Util.class.php:3607
+#: libraries/Util.class.php:3613
 msgid "There are no files to upload!"
 msgstr "Es sind keine Dateien zum Hochladen vorhanden!"
 
-#: libraries/Util.class.php:3632 libraries/Util.class.php:3633
-#: templates/structure/check_all_tables.phtml:15
+#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: templates/database/structure/check_all_tables.phtml:15
 msgid "Empty"
 msgstr "Leeren"
 
-#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: libraries/Util.class.php:3644 libraries/Util.class.php:3645
 msgid "Execute"
 msgstr "Ausführen"
 
-#: libraries/Util.class.php:4152
+#: libraries/Util.class.php:4158
 msgid "Print"
 msgstr "Drucken"
 
-#: libraries/Util.class.php:4257 templates/structure/row_stats_table.phtml:80
-#: templates/structure/table_header.phtml:95
+#: libraries/Util.class.php:4263
+#: templates/database/structure/table_header.phtml:95
+#: templates/table/structure/row_stats_table.phtml:80
 msgid "Creation"
 msgstr "Erzeugt am"
 
-#: libraries/Util.class.php:4263 templates/structure/row_stats_table.phtml:87
-#: templates/structure/table_header.phtml:106
+#: libraries/Util.class.php:4269
+#: templates/database/structure/table_header.phtml:106
+#: templates/table/structure/row_stats_table.phtml:87
 msgid "Last update"
 msgstr "Aktualisiert am"
 
-#: libraries/Util.class.php:4269 templates/structure/row_stats_table.phtml:94
-#: templates/structure/table_header.phtml:117
+#: libraries/Util.class.php:4275
+#: templates/database/structure/table_header.phtml:117
+#: templates/table/structure/row_stats_table.phtml:94
 msgid "Last check"
 msgstr "Letzter Check am"
 
-#: libraries/Util.class.php:4315
+#: libraries/Util.class.php:4321
 msgid "Users"
 msgstr "Benutzer"
 
@@ -4978,16 +4992,16 @@ msgid "Use this value"
 msgstr "Diesen Wert verwenden"
 
 #: libraries/build_html_for_db.lib.php:33 libraries/import.lib.php:193
-#: templates/structure/actions_in_table_structure.phtml:113
-#: templates/structure/row_stats_table.phtml:42
-#: templates/structure/table_header.phtml:36
+#: templates/database/structure/table_header.phtml:36
+#: templates/table/structure/actions_in_table_structure.phtml:113
+#: templates/table/structure/row_stats_table.phtml:42
 msgid "Rows"
 msgstr "Datensätze"
 
 #: libraries/build_html_for_db.lib.php:48 libraries/engines/innodb.lib.php:171
-#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:186
-#: libraries/server_status.lib.php:298
-#: templates/structure/display_table_stats.phtml:40
+#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:195
+#: libraries/server_status.lib.php:307
+#: templates/table/structure/display_table_stats.phtml:40
 msgid "Total"
 msgstr "Insgesamt"
 
@@ -4996,10 +5010,12 @@ msgid "Jump to database"
 msgstr "Springe zu Datenbank"
 
 #: libraries/build_html_for_db.lib.php:146
+#: templates/database/structure/structure_table_row.phtml:15
 msgid "Not replicated"
 msgstr "Nicht repliziert"
 
 #: libraries/build_html_for_db.lib.php:158
+#: templates/database/structure/structure_table_row.phtml:16
 msgid "Replicated"
 msgstr "Repliziert"
 
@@ -5058,17 +5074,17 @@ msgstr "NEIN"
 #: libraries/plugins/export/ExportTexytext.class.php:425
 #: libraries/plugins/export/PMA_ExportPdf.class.php:307
 #: libraries/rte/rte_list.lib.php:73 libraries/rte/rte_list.lib.php:85
-#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:830
-#: libraries/rte/rte_routines.lib.php:1492 setup/frames/index.inc.php:162
+#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:921
+#: libraries/rte/rte_routines.lib.php:1583 setup/frames/index.inc.php:162
 #: templates/columns_definitions/table_fields_definitions.phtml:8
-#: templates/structure/table_structure_header.phtml:5
-#: templates/table/create_table.phtml:11
+#: templates/database/create_table.phtml:11
+#: templates/table/structure/table_structure_header.phtml:5
 msgid "Name"
 msgstr "Name"
 
 #: libraries/central_columns.lib.php:699
 #: libraries/central_columns.lib.php:1381
-#: libraries/rte/rte_routines.lib.php:832
+#: libraries/rte/rte_routines.lib.php:923
 #: templates/columns_definitions/table_fields_definitions.phtml:14
 msgid "Length/Values"
 msgstr "Länge/Werte"
@@ -5087,7 +5103,7 @@ msgid "Select a table"
 msgstr "Eine Tabelle auswählen"
 
 #: libraries/central_columns.lib.php:804
-#: templates/structure/add_column.phtml:4
+#: templates/table/structure/add_column.phtml:4
 msgid "Add column"
 msgstr "Spalte hinzufügen"
 
@@ -5103,7 +5119,7 @@ msgstr "Neue Spalte hinzufügen"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1002
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1025
 #: templates/columns_definitions/table_fields_definitions.phtml:36
-#: templates/structure/table_structure_header.phtml:8
+#: templates/table/structure/table_structure_header.phtml:8
 msgid "Attributes"
 msgstr "Attribute"
 
@@ -5222,7 +5238,7 @@ msgid "Double click"
 msgstr "Doppelklick"
 
 #: libraries/config.values.php:95 libraries/config.values.php:124
-#: libraries/config/FormDisplay.tpl.php:221 libraries/relation.lib.php:97
+#: libraries/config/FormDisplay.tpl.php:232 libraries/relation.lib.php:97
 #: libraries/relation.lib.php:105
 msgid "Disabled"
 msgstr "Deaktiviert"
@@ -5394,21 +5410,21 @@ msgstr ""
 msgid "maximum %s"
 msgstr "Maximum %s"
 
-#: libraries/config/FormDisplay.tpl.php:219
+#: libraries/config/FormDisplay.tpl.php:230
 msgid "This setting is disabled, it will not be applied to your configuration."
 msgstr "Diese Einstellung ist deaktiviert, sie wird nicht angewandt."
 
-#: libraries/config/FormDisplay.tpl.php:313
+#: libraries/config/FormDisplay.tpl.php:324
 #, php-format
 msgid "Set value: %s"
 msgstr "Setze Wert: %s"
 
-#: libraries/config/FormDisplay.tpl.php:318
+#: libraries/config/FormDisplay.tpl.php:329
 #: libraries/config/messages.inc.php:610
 msgid "Restore default value"
 msgstr "Voreingestellten Wert wiederherstellen"
 
-#: libraries/config/FormDisplay.tpl.php:332
+#: libraries/config/FormDisplay.tpl.php:343
 msgid "Allow users to customize this value"
 msgstr "Erlaube den Benutzern diesen Wert anzupassen"
 
@@ -5918,7 +5934,7 @@ msgstr "Zeichensatz der Datei"
 
 #: libraries/config/messages.inc.php:136 libraries/config/messages.inc.php:152
 #: libraries/sql_query_form.lib.php:247
-#: templates/structure/row_stats_table.phtml:7
+#: templates/table/structure/row_stats_table.phtml:7
 msgid "Format"
 msgstr "Format"
 
@@ -6432,7 +6448,7 @@ msgstr ""
 
 #: libraries/config/messages.inc.php:332
 #: libraries/plugins/export/ExportPdf.class.php:279
-#: templates/structure/secondary_tabs.phtml:8
+#: templates/table/secondary_tabs.phtml:8
 msgid "Table structure"
 msgstr "Tabellenstruktur"
 
@@ -8138,103 +8154,33 @@ msgstr "Microsoft Word 2000"
 msgid "OpenDocument Text"
 msgstr "OpenDocument-Text"
 
-#: libraries/controllers/StructureController.class.php:465
+#: libraries/controllers/DatabaseStructureController.class.php:405
 #: tbl_operations.php:382
 #, php-format
 msgid "Table %s has been emptied."
 msgstr "Die Tabelle %s wurde geleert."
 
-#: libraries/controllers/StructureController.class.php:486
+#: libraries/controllers/DatabaseStructureController.class.php:426
 #: tbl_operations.php:400 view_operations.php:119
 #, php-format
 msgid "View %s has been dropped."
 msgstr "Die Ansicht %s wurde gelöscht."
 
-#: libraries/controllers/StructureController.class.php:487
+#: libraries/controllers/DatabaseStructureController.class.php:427
 #: tbl_operations.php:401
 #, php-format
 msgid "Table %s has been dropped."
 msgstr "Die Tabelle %s wurde gelöscht."
 
-#: libraries/controllers/StructureController.class.php:797
-#, php-format
-msgid "The name '%s' is a MySQL reserved keyword."
-msgid_plural "The names '%s' are MySQL reserved keywords."
-msgstr[0] "Der Name '%s' ist ein reserviertes MySQL-Schlüsselwort."
-msgstr[1] "Die Namen '%s' sind reservierte MySQL-Schlüsselwörter."
-
-#: libraries/controllers/StructureController.class.php:875
-msgid "No column selected."
-msgstr "Es wurden keine Datensätze ausgewählt."
-
-#: libraries/controllers/StructureController.class.php:1049
+#: libraries/controllers/DatabaseStructureController.class.php:733
 msgid "Favorite List is full!"
 msgstr "Favoriten-Liste ist voll!"
 
-#: libraries/controllers/StructureController.class.php:1272
-msgid "The columns have been moved successfully."
-msgstr "Die Spalten wurden erfolgreich verschoben."
-
-#: libraries/controllers/StructureController.class.php:1535
-#, php-format
-msgid ""
-"Table %1$s has been altered successfully. Privileges have been adjusted."
-msgstr ""
-"Die Tabelle %1$s wurde erfolgreich geändert. Die Privilegien wurden "
-"angepasst."
-
-#: libraries/controllers/StructureController.class.php:1541
-#: libraries/controllers/TableIndexesController.class.php:161
-#: tbl_addfield.php:92
-#, php-format
-msgid "Table %1$s has been altered successfully."
-msgstr "Die Tabelle %1$s wurde erfolgreich geändert."
-
-#: libraries/controllers/StructureController.class.php:1588
-#: libraries/tracking.lib.php:1094
-msgid "Query error"
-msgstr "Abfrage-Fehler"
-
-#: libraries/controllers/StructureController.class.php:1806
+#: libraries/controllers/DatabaseStructureController.class.php:947
 #: libraries/mysql_charsets.lib.php:366 libraries/mysql_charsets.lib.php:373
 msgid "unknown"
 msgstr "unbekannt"
 
-#: libraries/controllers/StructureController.class.php:1957
-#: templates/structure/check_all_table_column.phtml:11
-msgid "Change"
-msgstr "Bearbeiten"
-
-#: libraries/controllers/StructureController.class.php:1961
-#: libraries/controllers/StructureController.class.php:1966
-#: libraries/navigation/Nodes/Node_Index.class.php:30
-#: libraries/tracking.lib.php:926
-#: templates/columns_definitions/column_indexes.phtml:16
-#: templates/columns_definitions/table_fields_definitions.phtml:57
-#: templates/structure/check_all_table_column.phtml:30
-#: templates/structure/display_structure.phtml:79
-#: templates/structure/display_table_stats.phtml:19
-msgid "Index"
-msgstr "Index"
-
-#: libraries/controllers/StructureController.class.php:1963
-#: libraries/controllers/StructureController.class.php:1968
-#: templates/columns_definitions/column_indexes.phtml:27
-#: templates/structure/check_all_table_column.phtml:37
-msgid "Spatial"
-msgstr "Räumlich"
-
-#: libraries/controllers/StructureController.class.php:1964
-#: libraries/controllers/StructureController.class.php:1969
-#: templates/columns_definitions/column_indexes.phtml:22
-#: templates/structure/check_all_table_column.phtml:47
-msgid "Fulltext"
-msgstr "Volltext"
-
-#: libraries/controllers/StructureController.class.php:1970
-msgid "Distinct values"
-msgstr "Unterschiedliche Werte"
-
 #: libraries/controllers/TableChartController.class.php:82
 #: libraries/controllers/TableGisVisualizationController.class.php:101
 msgid "No SQL query was set to fetch data."
@@ -8249,11 +8195,18 @@ msgstr ""
 msgid "No data to display"
 msgstr "Keine Daten zum Anzeigen"
 
-#: libraries/controllers/TableRelationController.class.php:217
+#: libraries/controllers/TableIndexesController.class.php:161
+#: libraries/controllers/TableStructureController.class.php:736
+#: tbl_addfield.php:92
+#, php-format
+msgid "Table %1$s has been altered successfully."
+msgstr "Die Tabelle %1$s wurde erfolgreich geändert."
+
+#: libraries/controllers/TableRelationController.class.php:218
 msgid "Display column was successfully updated."
 msgstr "Spaltendarstellung erfolgreich aktualisiert."
 
-#: libraries/controllers/TableRelationController.class.php:283
+#: libraries/controllers/TableRelationController.class.php:288
 msgid "Internal relations were successfully updated."
 msgstr "Interne Verknüpfungen wurden erfolgreich aktualisiert."
 
@@ -8266,10 +8219,73 @@ msgid "Zoom search"
 msgstr "Suche zoomen"
 
 #: libraries/controllers/TableSearchController.class.php:852
-#: templates/table/selection_form.phtml:59
+#: templates/table/search/selection_form.phtml:59
 msgid "Find and replace"
 msgstr "Suchen und Ersetzen"
 
+#: libraries/controllers/TableStructureController.class.php:163
+#, php-format
+msgid "The name '%s' is a MySQL reserved keyword."
+msgid_plural "The names '%s' are MySQL reserved keywords."
+msgstr[0] "Der Name '%s' ist ein reserviertes MySQL-Schlüsselwort."
+msgstr[1] "Die Namen '%s' sind reservierte MySQL-Schlüsselwörter."
+
+#: libraries/controllers/TableStructureController.class.php:241
+msgid "No column selected."
+msgstr "Es wurden keine Datensätze ausgewählt."
+
+#: libraries/controllers/TableStructureController.class.php:467
+msgid "The columns have been moved successfully."
+msgstr "Die Spalten wurden erfolgreich verschoben."
+
+#: libraries/controllers/TableStructureController.class.php:730
+#, php-format
+msgid ""
+"Table %1$s has been altered successfully. Privileges have been adjusted."
+msgstr ""
+"Die Tabelle %1$s wurde erfolgreich geändert. Die Privilegien wurden "
+"angepasst."
+
+#: libraries/controllers/TableStructureController.class.php:783
+#: libraries/tracking.lib.php:1094
+msgid "Query error"
+msgstr "Abfrage-Fehler"
+
+#: libraries/controllers/TableStructureController.class.php:948
+#: templates/table/structure/check_all_table_column.phtml:11
+msgid "Change"
+msgstr "Bearbeiten"
+
+#: libraries/controllers/TableStructureController.class.php:952
+#: libraries/controllers/TableStructureController.class.php:957
+#: libraries/navigation/Nodes/Node_Index.class.php:30
+#: libraries/tracking.lib.php:926
+#: templates/columns_definitions/column_indexes.phtml:16
+#: templates/columns_definitions/table_fields_definitions.phtml:57
+#: templates/table/structure/check_all_table_column.phtml:30
+#: templates/table/structure/display_structure.phtml:79
+#: templates/table/structure/display_table_stats.phtml:19
+msgid "Index"
+msgstr "Index"
+
+#: libraries/controllers/TableStructureController.class.php:954
+#: libraries/controllers/TableStructureController.class.php:959
+#: templates/columns_definitions/column_indexes.phtml:27
+#: templates/table/structure/check_all_table_column.phtml:37
+msgid "Spatial"
+msgstr "Räumlich"
+
+#: libraries/controllers/TableStructureController.class.php:955
+#: libraries/controllers/TableStructureController.class.php:960
+#: templates/columns_definitions/column_indexes.phtml:22
+#: templates/table/structure/check_all_table_column.phtml:47
+msgid "Fulltext"
+msgstr "Volltext"
+
+#: libraries/controllers/TableStructureController.class.php:963
+msgid "Distinct values"
+msgstr "Unterschiedliche Werte"
+
 #: libraries/core.lib.php:306
 #, php-format
 msgid "The %s extension is missing. Please check your PHP configuration."
@@ -8318,7 +8334,7 @@ msgid "No Password"
 msgstr "Kein Passwort"
 
 #: libraries/display_change_password.lib.php:68
-#: libraries/plugins/auth/AuthenticationCookie.class.php:199
+#: libraries/plugins/auth/AuthenticationCookie.class.php:187
 #: libraries/replication_gui.lib.php:422 libraries/replication_gui.lib.php:862
 #: libraries/server_privileges.lib.php:1640
 msgid "Password:"
@@ -9117,12 +9133,12 @@ msgid "Dump has been saved to file %s."
 msgstr "Auflistung wurde in Datei %s gespeichert."
 
 #: libraries/import.lib.php:202 libraries/insert_edit.lib.php:124
-#: libraries/rte/rte_routines.lib.php:1353 libraries/sql.lib.php:1312
+#: libraries/rte/rte_routines.lib.php:1444 libraries/sql.lib.php:1306
 #: tbl_get_field.php:44
 msgid "MySQL returned an empty result set (i.e. zero rows)."
 msgstr "MySQL lieferte ein leeres Resultat zurück (d.h. null Datensätze)."
 
-#: libraries/import.lib.php:265 libraries/sql.lib.php:1326
+#: libraries/import.lib.php:265 libraries/sql.lib.php:1320
 msgid "[ROLLBACK occurred.]"
 msgstr "[ROLLBACK aufgetreten.]"
 
@@ -9194,14 +9210,14 @@ msgstr "Index über&nbsp;%s&nbsp;Spalten anlegen"
 # Hide heist im deutschen in der EDV ausblenden
 #: libraries/insert_edit.lib.php:233
 #: libraries/navigation/Nodes/Node_DatabaseChild.class.php:48
-#: templates/designer/table_list.phtml:40
+#: templates/database/designer/table_list.phtml:40
 msgid "Hide"
 msgstr "Verstecken"
 
 #: libraries/insert_edit.lib.php:249
 #: libraries/navigation/Nodes/Node_Function.class.php:32
-#: libraries/rte/rte_routines.lib.php:1495
-#: templates/table/table_header.phtml:4
+#: libraries/rte/rte_routines.lib.php:1586
+#: templates/table/search/table_header.phtml:4
 msgid "Function"
 msgstr "Funktion"
 
@@ -9214,84 +9230,85 @@ msgstr "Binär"
 msgid "Because of its length,<br /> this column might not be editable."
 msgstr "Wegen seiner Länge ist dieses<br />Feld vielleicht nicht editierbar."
 
-#: libraries/insert_edit.lib.php:1050
+#: libraries/insert_edit.lib.php:1048
 msgid "Binary - do not edit"
 msgstr "Binär - nicht editierbar"
 
-#: libraries/insert_edit.lib.php:1176 libraries/server_privileges.lib.php:470
-#: templates/table/options.phtml:36
+#: libraries/insert_edit.lib.php:1174 libraries/server_privileges.lib.php:470
+#: templates/table/search/options.phtml:36
 msgid "Or"
 msgstr "Oder"
 
-#: libraries/insert_edit.lib.php:1177
+#: libraries/insert_edit.lib.php:1175
 msgid "web server upload directory:"
 msgstr "Upload-Verzeichnis auf dem Webserver:"
 
-#: libraries/insert_edit.lib.php:1348 templates/table/input_box.phtml:49
+#: libraries/insert_edit.lib.php:1346
+#: templates/table/search/input_box.phtml:49
 msgid "Edit/Insert"
 msgstr "Bearbeiten/Einfügen"
 
-#: libraries/insert_edit.lib.php:1398
+#: libraries/insert_edit.lib.php:1396
 #, php-format
 msgid "Continue insertion with %s rows"
 msgstr "Einfügen mit %s Datensätzen fortfahren"
 
-#: libraries/insert_edit.lib.php:1428
+#: libraries/insert_edit.lib.php:1426
 msgid "and then"
 msgstr "und dann"
 
-#: libraries/insert_edit.lib.php:1461
+#: libraries/insert_edit.lib.php:1459
 msgid "Insert as new row"
 msgstr "Als neuen Datensatz speichern"
 
-#: libraries/insert_edit.lib.php:1464
+#: libraries/insert_edit.lib.php:1462
 msgid "Insert as new row and ignore errors"
 msgstr "Als neue Zeile einfügen und Fehler ignorieren"
 
-#: libraries/insert_edit.lib.php:1467
+#: libraries/insert_edit.lib.php:1465
 msgid "Show insert query"
 msgstr "Zeige insert Abfrage"
 
-#: libraries/insert_edit.lib.php:1487
+#: libraries/insert_edit.lib.php:1485
 msgid "Go back to previous page"
 msgstr "zurück"
 
-#: libraries/insert_edit.lib.php:1490
+#: libraries/insert_edit.lib.php:1488
 msgid "Insert another new row"
 msgstr "anschließend einen weiteren Datensatz einfügen"
 
-#: libraries/insert_edit.lib.php:1495
+#: libraries/insert_edit.lib.php:1493
 msgid "Go back to this page"
 msgstr "Zurück zu dieser Seite"
 
-#: libraries/insert_edit.lib.php:1518
+#: libraries/insert_edit.lib.php:1516
 msgid "Edit next row"
 msgstr "nächste Zeile bearbeiten"
 
-#: libraries/insert_edit.lib.php:1540
+#: libraries/insert_edit.lib.php:1538
 msgid ""
 "Use TAB key to move from value to value, or CTRL+arrows to move anywhere"
 msgstr ""
 "Mittels TAB-Taste von Feld zu Feld springen, oder mit STRG+Pfeiltasten "
 "beliebig bewegen"
 
-#: libraries/insert_edit.lib.php:1577 libraries/replication_gui.lib.php:542
-#: libraries/rte/rte_routines.lib.php:1497
+#: libraries/insert_edit.lib.php:1575 libraries/replication_gui.lib.php:542
+#: libraries/rte/rte_routines.lib.php:1588
 #: libraries/server_status_variables.lib.php:220
-#: templates/designer/having_query_panel.phtml:100
-#: templates/designer/options_panel.phtml:73
-#: templates/designer/options_panel.phtml:239
-#: templates/designer/where_query_panel.phtml:69
-#: templates/table/table_header.phtml:10
-#: templates/table/zoom_result_form.phtml:35
+#: templates/database/designer/having_query_panel.phtml:100
+#: templates/database/designer/options_panel.phtml:73
+#: templates/database/designer/options_panel.phtml:239
+#: templates/database/designer/where_query_panel.phtml:69
+#: templates/table/search/table_header.phtml:10
+#: templates/table/search/zoom_result_form.phtml:35
 msgid "Value"
 msgstr "Wert"
 
-#: libraries/insert_edit.lib.php:1937 libraries/sql.lib.php:1309
+#: libraries/insert_edit.lib.php:1935 libraries/sql.lib.php:1303
 msgid "Showing SQL query"
 msgstr "Ansicht als SQL Abfrage"
 
-#: libraries/insert_edit.lib.php:1962 libraries/sql.lib.php:1287
+#: libraries/insert_edit.lib.php:1960 libraries/sql.lib.php:1281
 #, php-format
 msgid "Inserted row id: %1$d"
 msgstr "ID der eingefügten Zeile: %1$d"
@@ -9703,7 +9720,7 @@ msgstr "Neu"
 #: libraries/navigation/Nodes/Node_View_Container.class.php:26
 #: libraries/navigation/Nodes/Node_View_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:129
-#: templates/structure/show_create.phtml:30
+#: templates/database/structure/show_create.phtml:30
 msgid "Views"
 msgstr "Ansichten"
 
@@ -10045,7 +10062,7 @@ msgstr ""
 
 #: libraries/operations.lib.php:101 libraries/operations.lib.php:249
 #: libraries/operations.lib.php:869 libraries/operations.lib.php:963
-#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:907
+#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:998
 #: templates/columns_definitions/table_fields_definitions.phtml:47
 msgid "Adjust Privileges"
 msgstr "Rechte anpassen"
@@ -10135,22 +10152,22 @@ msgid "Switch to copied table"
 msgstr "Zur kopierten Tabelle wechseln"
 
 #: libraries/operations.lib.php:1360
-#: templates/structure/check_all_tables.phtml:18
+#: templates/database/structure/check_all_tables.phtml:18
 msgid "Table maintenance"
 msgstr "Hilfsmittel"
 
 #: libraries/operations.lib.php:1398
-#: templates/structure/check_all_tables.phtml:19
+#: templates/database/structure/check_all_tables.phtml:19
 msgid "Analyze table"
 msgstr "Analysiere Tabelle"
 
 #: libraries/operations.lib.php:1413
-#: templates/structure/check_all_tables.phtml:20
+#: templates/database/structure/check_all_tables.phtml:20
 msgid "Check table"
 msgstr "Überprüfe Tabelle"
 
 #: libraries/operations.lib.php:1428
-#: templates/structure/check_all_tables.phtml:22
+#: templates/database/structure/check_all_tables.phtml:22
 msgid "Checksum table"
 msgstr "Prüfsummentabelle"
 
@@ -10169,18 +10186,19 @@ msgid "Flush the table (FLUSH)"
 msgstr "Leeren des Tabellenzwischenspeichers (FLUSH)"
 
 #: libraries/operations.lib.php:1477
-#: templates/structure/check_all_tables.phtml:23
-#: templates/structure/display_table_stats.phtml:56
+#: templates/database/structure/check_all_tables.phtml:23
+#: templates/table/structure/display_table_stats.phtml:56
 msgid "Optimize table"
 msgstr "Optimiere Tabelle"
 
 #: libraries/operations.lib.php:1492
-#: templates/structure/check_all_tables.phtml:24
+#: templates/database/structure/check_all_tables.phtml:24
 msgid "Repair table"
 msgstr "Repariere Tabelle"
 
 #: libraries/operations.lib.php:1538
-#: templates/structure/check_all_tables.phtml:14 view_operations.php:127
+#: templates/database/structure/check_all_tables.phtml:14
+#: view_operations.php:127
 msgid "Delete data or table"
 msgstr "Daten oder Tabelle löschen"
 
@@ -10306,7 +10324,7 @@ msgstr ""
 "hergestellt werden."
 
 #: libraries/plugins/auth/AuthenticationConfig.class.php:108
-#: libraries/plugins/auth/AuthenticationCookie.class.php:134
+#: libraries/plugins/auth/AuthenticationCookie.class.php:122
 #: libraries/plugins/auth/AuthenticationHttp.class.php:96
 #, php-format
 msgid "Welcome to %s"
@@ -10338,38 +10356,38 @@ msgstr ""
 msgid "Retry to connect"
 msgstr "Versuche einen neuen Verbindungsaufbau"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:146
+#: libraries/plugins/auth/AuthenticationCookie.class.php:134
 msgid "Your session has expired. Please log in again."
 msgstr "Ihre Sitzung ist abgelaufen. Bitte melden Sie sich erneut an."
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:170
+#: libraries/plugins/auth/AuthenticationCookie.class.php:158
 msgid "Log in"
 msgstr "Anmeldung"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:178
-#: libraries/plugins/auth/AuthenticationCookie.class.php:188
+#: libraries/plugins/auth/AuthenticationCookie.class.php:166
+#: libraries/plugins/auth/AuthenticationCookie.class.php:176
 msgid "You can enter hostname/IP address and port separated by space."
 msgstr ""
 "Sie können einen Rechnernamen oder eine IP Adresse und einen Port durch "
 "Leerzeichen getrennt eingeben."
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:193
+#: libraries/plugins/auth/AuthenticationCookie.class.php:181
 msgid "Username:"
 msgstr "Benutzername:"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:205
+#: libraries/plugins/auth/AuthenticationCookie.class.php:193
 msgid "Server Choice:"
 msgstr "Server auswählen:"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:386
+#: libraries/plugins/auth/AuthenticationCookie.class.php:374
 msgid "Entered captcha is wrong, try again!"
 msgstr "Das eingegebene Captcha ist falsch, bitte erneut versuchen!"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:396
+#: libraries/plugins/auth/AuthenticationCookie.class.php:384
 msgid "Please enter correct captcha!"
 msgstr "Bitte korrektes Captcha eingeben!"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:423
+#: libraries/plugins/auth/AuthenticationCookie.class.php:411
 msgid "You are not allowed to log in to this MySQL server!"
 msgstr "Sie sind nicht berechtigt, sich an diesem MySQL-Server anzumelden!"
 
@@ -10465,7 +10483,7 @@ msgstr "Ereignis"
 #: libraries/plugins/export/ExportOdt.class.php:593
 #: libraries/plugins/export/ExportTexytext.class.php:428
 #: libraries/plugins/export/PMA_ExportPdf.class.php:313
-#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:984
 #: libraries/rte/rte_triggers.lib.php:377
 msgid "Definition"
 msgstr "Definition"
@@ -10790,7 +10808,7 @@ msgid "Last check:"
 msgstr "Letzte Prüfung:"
 
 #: libraries/plugins/export/ExportSql.class.php:1399
-#: templates/structure/structure_table_row.phtml:183
+#: templates/database/structure/structure_table_row.phtml:183
 msgid "in use"
 msgstr "in Benutzung"
 
@@ -10989,18 +11007,14 @@ msgstr ""
 msgid "The imported file does not contain any data!"
 msgstr "Die importierte Datei enthält keine Daten!"
 
-#: libraries/plugins/import/ImportSql.class.php:169
+#: libraries/plugins/import/ImportSql.class.php:72
 msgid "SQL compatibility mode:"
 msgstr "SQL-Kompatibilitätsmodus:"
 
-#: libraries/plugins/import/ImportSql.class.php:181
+#: libraries/plugins/import/ImportSql.class.php:84
 msgid "Do not use <code>AUTO_INCREMENT</code> for zero values"
 msgstr "<code>AUTO_INCREMENT</code> nicht für Nullwerte verwenden"
 
-#: libraries/plugins/import/ImportSql.class.php:195
-msgid "Read as multibytes"
-msgstr "Als Multibyte lesen"
-
 #: libraries/plugins/import/ImportXml.class.php:54
 msgid "XML"
 msgstr "XML"
@@ -11043,7 +11057,7 @@ msgid "Show grid"
 msgstr "Gitterlinien anzeigen"
 
 #: libraries/plugins/schema/SchemaPdf.class.php:94
-#: templates/structure/print_view_data_dictionary_link.phtml:6
+#: templates/database/structure/print_view_data_dictionary_link.phtml:6
 msgid "Data Dictionary"
 msgstr "Strukturverzeichnis"
 
@@ -11068,7 +11082,7 @@ msgid "The %s table doesn't exist!"
 msgstr "Die Tabelle %s existiert nicht!"
 
 #: libraries/plugins/schema/eps/Eps_Relation_Schema.class.php:321
-#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:309
+#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:323
 #, php-format
 msgid "Schema of the %s database - Page %s"
 msgstr "Schema der Datenbank %s - Seite %s"
@@ -11094,7 +11108,7 @@ msgstr "Inhalt"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1005
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1028
 #: libraries/tracking.lib.php:884
-#: templates/structure/table_structure_header.phtml:11
+#: templates/table/structure/table_structure_header.phtml:11
 msgid "Extra"
 msgstr "Extra"
 
@@ -11468,11 +11482,11 @@ msgid "Create the needed tables with the <code>%screate_tables.sql</code>."
 msgstr ""
 "Erstellen der benötigten Tabellen mittels <code>%screate_tables.sql</code>."
 
-#: libraries/relation.lib.php:360
+#: libraries/relation.lib.php:357
 msgid "Create a pma user and give access to these tables."
 msgstr "Den Benutzer pma einrichten und Zugriff auf diese Tabellen geben."
 
-#: libraries/relation.lib.php:365
+#: libraries/relation.lib.php:360
 msgid ""
 "Enable advanced features in configuration file (<code>config.inc.php</"
 "code>), for example by starting from <code>config.sample.inc.php</code>."
@@ -11481,16 +11495,16 @@ msgstr ""
 "php</code>) aktiviert werden. Beispiele finden sich in der <code>config."
 "sample.inc.php</code>."
 
-#: libraries/relation.lib.php:373
+#: libraries/relation.lib.php:365
 msgid "Re-login to phpMyAdmin to load the updated configuration file."
 msgstr ""
 "Erneut in phpMyAdmin anmelden um die neue Konfigurationsdatei zu laden."
 
-#: libraries/relation.lib.php:1612
+#: libraries/relation.lib.php:1607
 msgid "no description"
 msgstr "keine Beschreibung"
 
-#: libraries/relation.lib.php:1811
+#: libraries/relation.lib.php:1806
 msgid ""
 "You do not have necessary privileges to create a database named "
 "'phpmyadmin'. You may go to 'Operations' tab of any database to set up the "
@@ -11500,7 +11514,7 @@ msgstr ""
 "anzulegen. Sie können zum „Operationen“-Tab einer beliebigen Datenbank "
 "gehen, um in dieser den phpMyAdmin-Konfigurationsspeicher einzurichten."
 
-#: libraries/relation.lib.php:1928
+#: libraries/relation.lib.php:1923
 #, php-format
 msgid ""
 "%sCreate%s a database named 'phpmyadmin' and setup the phpMyAdmin "
@@ -11509,7 +11523,7 @@ msgstr ""
 "Eine Datenbank mit Namen „phpmyadmin“ %sanlegen%s und dort die phpMyAdmin-"
 "Konfigurationsspeicher-Tabellen einrichten."
 
-#: libraries/relation.lib.php:1936
+#: libraries/relation.lib.php:1931
 #, php-format
 msgid ""
 "%sCreate%s the phpMyAdmin configuration storage in the current database."
@@ -11517,13 +11531,13 @@ msgstr ""
 "%sErzeuge%s die PhpMyAdmin-Konfigurationsspeicherung in der aktuellen "
 "Datenbank."
 
-#: libraries/relation.lib.php:1944
+#: libraries/relation.lib.php:1939
 #, php-format
 msgid "%sCreate%s missing phpMyAdmin configuration storage tables."
 msgstr "Fehlende phpMyAdmin-Konfigurationsspeicher-Tabellen %sanlegen%s."
 
 #: libraries/replication_gui.lib.php:46 libraries/replication_gui.lib.php:343
-#: libraries/server_databases.lib.php:387
+#: libraries/server_databases.lib.php:398
 msgid "Master replication"
 msgstr "Master Replikation"
 
@@ -11597,7 +11611,7 @@ msgstr ""
 "konfiguriert <b>ist</b>."
 
 #: libraries/replication_gui.lib.php:141
-#: libraries/server_databases.lib.php:389
+#: libraries/server_databases.lib.php:400
 msgid "Slave replication"
 msgstr "Slave Replikation"
 
@@ -11875,10 +11889,10 @@ msgid "Master server changed successfully to %s."
 msgstr "Master-Server wurde erfolgreich auf %s geändert."
 
 #: libraries/rte/rte_events.lib.php:106 libraries/rte/rte_events.lib.php:115
-#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:149
-#: libraries/rte/rte_routines.lib.php:158
-#: libraries/rte/rte_routines.lib.php:231
-#: libraries/rte/rte_routines.lib.php:1362
+#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:219
+#: libraries/rte/rte_routines.lib.php:246
+#: libraries/rte/rte_routines.lib.php:368
+#: libraries/rte/rte_routines.lib.php:1453
 #: libraries/rte/rte_triggers.lib.php:82 libraries/rte/rte_triggers.lib.php:91
 #: libraries/rte/rte_triggers.lib.php:123
 #, php-format
@@ -11899,7 +11913,7 @@ msgstr "Ereignis %1$s wurde geändert."
 msgid "Event %1$s has been created."
 msgstr "Ereignis %1$s wurde erzeugt."
 
-#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:251
+#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:266
 #: libraries/rte/rte_triggers.lib.php:144
 msgid "One or more errors have occurred while processing your request:"
 msgstr ""
@@ -11910,7 +11924,7 @@ msgstr ""
 msgid "Edit event"
 msgstr "Event bearbeiten"
 
-#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:794
+#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:885
 #: libraries/rte/rte_triggers.lib.php:323 view_create.php:180
 msgid "Details"
 msgstr "Details"
@@ -11923,7 +11937,7 @@ msgstr "Ereignis-Name"
 msgid "Event type"
 msgstr "Ereignistyp"
 
-#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:817
+#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:908
 #, php-format
 msgid "Change to %s"
 msgstr "Wechseln zu %s"
@@ -11950,12 +11964,14 @@ msgstr "Ende"
 msgid "On completion preserve"
 msgstr "Nach Abschluss erhalten"
 
-#: libraries/rte/rte_events.lib.php:491 libraries/rte/rte_routines.lib.php:930
+#: libraries/rte/rte_events.lib.php:491
+#: libraries/rte/rte_routines.lib.php:1021
 #: libraries/rte/rte_triggers.lib.php:383 view_create.php:209
 msgid "Definer"
 msgstr "Ersteller"
 
-#: libraries/rte/rte_events.lib.php:535 libraries/rte/rte_routines.lib.php:997
+#: libraries/rte/rte_events.lib.php:535
+#: libraries/rte/rte_routines.lib.php:1088
 #: libraries/rte/rte_triggers.lib.php:422
 msgid "The definer must be in the \"username@hostname\" format!"
 msgstr "Der Ersteller muss im \"benutzername@hostname\" Format sein!"
@@ -11981,9 +11997,9 @@ msgid "You must provide an event definition."
 msgstr "Sie müssen die Definition des Ereignisses angeben."
 
 #: libraries/rte/rte_export.lib.php:43 libraries/rte/rte_general.lib.php:72
-#: libraries/rte/rte_routines.lib.php:345
-#: libraries/rte/rte_routines.lib.php:1198
-#: libraries/rte/rte_routines.lib.php:1411
+#: libraries/rte/rte_routines.lib.php:153
+#: libraries/rte/rte_routines.lib.php:1289
+#: libraries/rte/rte_routines.lib.php:1502
 msgid "Error in processing request:"
 msgstr "Fehler beim Bearbeiten der Anfrage:"
 
@@ -12020,72 +12036,72 @@ msgstr ""
 "strong] Bitte verwenden Sie die neuere 'mysqli'-Erweiterung, um Probleme zu "
 "vermeiden."
 
-#: libraries/rte/rte_routines.lib.php:110
-#: libraries/rte/rte_routines.lib.php:1006
+#: libraries/rte/rte_routines.lib.php:123
+msgid "Edit routine"
+msgstr "Bearbeite Prozedur"
+
+#: libraries/rte/rte_routines.lib.php:200
+#: libraries/rte/rte_routines.lib.php:1097
 #, php-format
 msgid "Invalid routine type: \"%s\""
 msgstr "Ungültiger Prozeduren-Typ: \"%s\""
 
-#: libraries/rte/rte_routines.lib.php:170
-msgid "Sorry, we failed to restore the dropped routine."
-msgstr "Das wiederherstellen der gelöschten Prozedur schlug fehl."
-
-#: libraries/rte/rte_routines.lib.php:211
-#, php-format
-msgid "Routine %1$s has been modified. Privileges have been adjusted."
-msgstr "Prozedur %1$s wurde geändert. Die Privilegien wurden angepasst."
-
-#: libraries/rte/rte_routines.lib.php:216
-#, php-format
-msgid "Routine %1$s has been modified."
-msgstr "Prozedur %1$s wurde geändert."
-
-#: libraries/rte/rte_routines.lib.php:238
+#: libraries/rte/rte_routines.lib.php:253
 #, php-format
 msgid "Routine %1$s has been created."
 msgstr "Die Prozedur %1$s wurde erstellt."
 
-#: libraries/rte/rte_routines.lib.php:315
-msgid "Edit routine"
-msgstr "Bearbeite Prozedur"
+#: libraries/rte/rte_routines.lib.php:380
+msgid "Sorry, we failed to restore the dropped routine."
+msgstr "Das wiederherstellen der gelöschten Prozedur schlug fehl."
 
-#: libraries/rte/rte_routines.lib.php:797
+#: libraries/rte/rte_routines.lib.php:439
+#, php-format
+msgid "Routine %1$s has been modified. Privileges have been adjusted."
+msgstr "Prozedur %1$s wurde geändert. Die Privilegien wurden angepasst."
+
+#: libraries/rte/rte_routines.lib.php:444
+#, php-format
+msgid "Routine %1$s has been modified."
+msgstr "Prozedur %1$s wurde geändert."
+
+#: libraries/rte/rte_routines.lib.php:888
 msgid "Routine name"
 msgstr "Prozeduren-Name"
 
-#: libraries/rte/rte_routines.lib.php:823
+#: libraries/rte/rte_routines.lib.php:914
 msgid "Parameters"
 msgstr "Parameter"
 
-#: libraries/rte/rte_routines.lib.php:829
+#: libraries/rte/rte_routines.lib.php:920
 msgid "Direction"
 msgstr "Richtung"
 
-#: libraries/rte/rte_routines.lib.php:847
+#: libraries/rte/rte_routines.lib.php:938
 msgid "Add parameter"
 msgstr "Parameter hinzufügen"
 
-#: libraries/rte/rte_routines.lib.php:851
+#: libraries/rte/rte_routines.lib.php:942
 msgid "Remove last parameter"
 msgstr "Letzten Parameter entfernen"
 
-#: libraries/rte/rte_routines.lib.php:856
+#: libraries/rte/rte_routines.lib.php:947
 msgid "Return type"
 msgstr "Rückgabe-Typ"
 
-#: libraries/rte/rte_routines.lib.php:862
+#: libraries/rte/rte_routines.lib.php:953
 msgid "Return length/values"
 msgstr "Rückgabe Länge/Werte"
 
-#: libraries/rte/rte_routines.lib.php:868
+#: libraries/rte/rte_routines.lib.php:959
 msgid "Return options"
 msgstr "Rückgabe der Optionen"
 
-#: libraries/rte/rte_routines.lib.php:899
+#: libraries/rte/rte_routines.lib.php:990
 msgid "Is deterministic"
 msgstr "Ist plangesteuert"
 
-#: libraries/rte/rte_routines.lib.php:920
+#: libraries/rte/rte_routines.lib.php:1011
 msgid ""
 "You do not have sufficient privileges to perform this operation; Please "
 "refer to the documentation for more details"
@@ -12093,25 +12109,25 @@ msgstr ""
 "Sie haben nicht genug Rechte um fortzufahren; Bitte wenden Sie sich für mehr "
 "Details an die Dokumentation"
 
-#: libraries/rte/rte_routines.lib.php:935
+#: libraries/rte/rte_routines.lib.php:1026
 msgid "Security type"
 msgstr "Sicherheits-Typ"
 
-#: libraries/rte/rte_routines.lib.php:944
+#: libraries/rte/rte_routines.lib.php:1035
 msgid "SQL data access"
 msgstr "SQL-Datenzugriff"
 
-#: libraries/rte/rte_routines.lib.php:1013
+#: libraries/rte/rte_routines.lib.php:1104
 msgid "You must provide a routine name!"
 msgstr "Sie müssen einen Prozeduren-Namen angeben!"
 
-#: libraries/rte/rte_routines.lib.php:1047
+#: libraries/rte/rte_routines.lib.php:1138
 #, php-format
 msgid "Invalid direction \"%s\" given for parameter."
 msgstr "Ungültige Richtung \"%s\" für Parameter angegeben."
 
-#: libraries/rte/rte_routines.lib.php:1069
-#: libraries/rte/rte_routines.lib.php:1131
+#: libraries/rte/rte_routines.lib.php:1160
+#: libraries/rte/rte_routines.lib.php:1222
 msgid ""
 "You must provide length/values for routine parameters of type ENUM, SET, "
 "VARCHAR and VARBINARY."
@@ -12119,26 +12135,26 @@ msgstr ""
 "Sie müssen Länge/Werte Angaben für Prozeduren Parameter des Typs ENUM, SET, "
 "VARCHAR und VARBINARY angeben."
 
-#: libraries/rte/rte_routines.lib.php:1095
+#: libraries/rte/rte_routines.lib.php:1186
 msgid "You must provide a name and a type for each routine parameter."
 msgstr ""
 "Sie müssen einen Namen und einen Typ für jeden Prozeduren-Parameter angeben."
 
-#: libraries/rte/rte_routines.lib.php:1114
+#: libraries/rte/rte_routines.lib.php:1205
 msgid "You must provide a valid return type for the routine."
 msgstr ""
 "Sie müssen einen Namen und einen Typ für jeden Prozeduren-Parameter angeben."
 
-#: libraries/rte/rte_routines.lib.php:1174
+#: libraries/rte/rte_routines.lib.php:1265
 msgid "You must provide a routine definition."
 msgstr "Sie müssen die Definition der Prozedur angeben."
 
-#: libraries/rte/rte_routines.lib.php:1285
+#: libraries/rte/rte_routines.lib.php:1376
 #, php-format
 msgid "Execution results of routine %s"
 msgstr "Ergebnisse der ausgeführten Prozedur %s"
 
-#: libraries/rte/rte_routines.lib.php:1340
+#: libraries/rte/rte_routines.lib.php:1431
 #, php-format
 msgid "%d row affected by the last statement inside the procedure."
 msgid_plural "%d rows affected by the last statement inside the procedure."
@@ -12147,13 +12163,13 @@ msgstr[0] ""
 msgstr[1] ""
 "%d Datensätze betroffen aufgrund des letzten Befehls innerhalb der Prozedur."
 
-#: libraries/rte/rte_routines.lib.php:1398
-#: libraries/rte/rte_routines.lib.php:1406
+#: libraries/rte/rte_routines.lib.php:1489
+#: libraries/rte/rte_routines.lib.php:1497
 msgid "Execute routine"
 msgstr "Führe Prozedur aus"
 
-#: libraries/rte/rte_routines.lib.php:1485
-#: libraries/rte/rte_routines.lib.php:1488
+#: libraries/rte/rte_routines.lib.php:1576
+#: libraries/rte/rte_routines.lib.php:1579
 msgid "Routine parameters"
 msgstr "Prozeduren-Parameter"
 
@@ -12311,7 +12327,7 @@ msgid "Original position"
 msgstr "Ursprungsposition"
 
 #: libraries/server_bin_log.lib.php:133
-#: templates/structure/display_table_stats.phtml:4
+#: templates/table/structure/display_table_stats.phtml:4
 msgid "Information"
 msgstr "Information"
 
@@ -12349,12 +12365,12 @@ msgstr ""
 "Bitte beachten Sie: Das Aktivieren der Datenbankstatistiken kann starken "
 "Traffic zwischen dem Web- und dem MySQL-Server zur Folge haben."
 
-#: libraries/server_databases.lib.php:364
-#: libraries/server_databases.lib.php:365
+#: libraries/server_databases.lib.php:366
+#: libraries/server_databases.lib.php:371
 msgid "Enable Statistics"
 msgstr "Datenbankstatistiken aktivieren"
 
-#: libraries/server_databases.lib.php:481
+#: libraries/server_databases.lib.php:492
 #, php-format
 msgid "%1$d database has been dropped successfully."
 msgid_plural "%1$d databases have been dropped successfully."
@@ -12736,7 +12752,7 @@ msgid "You have revoked the privileges for %s."
 msgstr "Sie haben die Rechte für %s widerrufen."
 
 #: libraries/server_privileges.lib.php:2059
-#: libraries/server_privileges.lib.php:4290
+#: libraries/server_privileges.lib.php:4316
 msgid "Add user account"
 msgstr "Benutzerkonto hinzufügen"
 
@@ -12905,36 +12921,36 @@ msgstr "Lösche %s"
 msgid "The privileges were reloaded successfully."
 msgstr "Die Benutzerprofile wurden neu geladen."
 
-#: libraries/server_privileges.lib.php:3994
+#: libraries/server_privileges.lib.php:4003
 #, php-format
 msgid "The user %s already exists!"
 msgstr "Der Benutzer %s existiert bereits!"
 
-#: libraries/server_privileges.lib.php:4232
+#: libraries/server_privileges.lib.php:4258
 #, php-format
 msgid "Privileges for %s"
 msgstr "Rechte für %s"
 
-#: libraries/server_privileges.lib.php:4241
+#: libraries/server_privileges.lib.php:4267
 #: libraries/server_status_processes.lib.php:72
 #: libraries/server_user_groups.lib.php:39
 msgid "User"
 msgstr "Benutzer"
 
-#: libraries/server_privileges.lib.php:4282
+#: libraries/server_privileges.lib.php:4308
 msgctxt "Create new user"
 msgid "New"
 msgstr "Neu"
 
-#: libraries/server_privileges.lib.php:4311
+#: libraries/server_privileges.lib.php:4337
 msgid "Edit privileges:"
 msgstr "Rechte ändern:"
 
-#: libraries/server_privileges.lib.php:4312
+#: libraries/server_privileges.lib.php:4338
 msgid "User account"
 msgstr "Benutzerkonto"
 
-#: libraries/server_privileges.lib.php:4371
+#: libraries/server_privileges.lib.php:4397
 msgid ""
 "Note: You are attempting to edit privileges of the user with which you are "
 "currently logged in."
@@ -12942,11 +12958,11 @@ msgstr ""
 "Hinweis: Sie versuchen, die Berechtigungen des Benutzers zu bearbeiten, mit "
 "dem Sie aktuell angemeldet sind."
 
-#: libraries/server_privileges.lib.php:4391 libraries/server_users.lib.php:25
+#: libraries/server_privileges.lib.php:4417 libraries/server_users.lib.php:25
 msgid "User accounts overview"
 msgstr "Benutzerkontenübersicht"
 
-#: libraries/server_privileges.lib.php:4459
+#: libraries/server_privileges.lib.php:4485
 msgid ""
 "A user account allowing any user from localhost to connect is present. This "
 "will prevent other users from connecting if the host part of their account "
@@ -12956,7 +12972,7 @@ msgstr ""
 "vorhanden. Dies wird Benutzer vom Verbinden abhalten, falls der Host-Teil "
 "ihres Kontos eine Verbindung von jedem Host (%) erlaubt."
 
-#: libraries/server_privileges.lib.php:4500
+#: libraries/server_privileges.lib.php:4526
 #, php-format
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
@@ -12970,7 +12986,7 @@ msgstr ""
 "Änderungen vorgenommen wurden. In diesem Fall sollten Sie %sdie "
 "Benutzerprofile neu laden%s bevor Sie fortfahren."
 
-#: libraries/server_privileges.lib.php:4519
+#: libraries/server_privileges.lib.php:4545
 #, fuzzy
 #| msgid ""
 #| "Note: phpMyAdmin gets the users' privileges directly from MySQL's "
@@ -12990,25 +13006,25 @@ msgstr ""
 "Änderungen vorgenommen wurden. In diesem Fall sollten Sie %sdie "
 "Benutzerprofile neu laden%s bevor Sie fortfahren."
 
-#: libraries/server_privileges.lib.php:4569
+#: libraries/server_privileges.lib.php:4595
 msgid "The selected user was not found in the privilege table."
 msgstr "Der gewählte Benutzer wurde in der Benutzertabelle nicht gefunden."
 
-#: libraries/server_privileges.lib.php:4801
+#: libraries/server_privileges.lib.php:4827
 msgid "You have added a new user."
 msgstr "Der Benutzer wurde hinzugefügt."
 
-#: libraries/server_status.lib.php:53
+#: libraries/server_status.lib.php:60
 #, php-format
 msgid "Network traffic since startup: %s"
 msgstr "Netzwerk-Datenverkehr seit Start: %s"
 
-#: libraries/server_status.lib.php:66
+#: libraries/server_status.lib.php:73
 #, php-format
 msgid "This MySQL server has been running for %1$s. It started up on %2$s."
 msgstr "Dieser MySQL-Server läuft bereits %1$s. Er wurde am %2$s gestartet."
 
-#: libraries/server_status.lib.php:80
+#: libraries/server_status.lib.php:94
 msgid ""
 "This MySQL server works as <b>master</b> and <b>slave</b> in <b>replication</"
 "b> process."
@@ -13016,22 +13032,22 @@ msgstr ""
 "Dieser MySQL Server arbeitet als <b>Master</b> und <b>Slave</b> im "
 "<b>Replikations</b>-Prozess."
 
-#: libraries/server_status.lib.php:85
+#: libraries/server_status.lib.php:99
 msgid "This MySQL server works as <b>master</b> in <b>replication</b> process."
 msgstr ""
 "Dieser MySQL Server arbeitet als <b>Master</b> im <b>Replikations</b>-"
 "Prozess."
 
-#: libraries/server_status.lib.php:90
+#: libraries/server_status.lib.php:104
 msgid "This MySQL server works as <b>slave</b> in <b>replication</b> process."
 msgstr ""
 "Dieser MySQL Server arbeitet als <b>Slave</b> im <b>Replikations</b>-Prozess."
 
-#: libraries/server_status.lib.php:106
+#: libraries/server_status.lib.php:116
 msgid "Replication status"
 msgstr "Replikations-Status"
 
-#: libraries/server_status.lib.php:137
+#: libraries/server_status.lib.php:146
 msgid ""
 "On a busy server, the byte counters may overrun, so those statistics as "
 "reported by the MySQL server may be incorrect."
@@ -13040,19 +13056,19 @@ msgstr ""
 "wieder bei 0 beginnen, deshalb können diese Werte, wie sie vom MySQL Server "
 "ausgegeben werden, falsch sein."
 
-#: libraries/server_status.lib.php:148
+#: libraries/server_status.lib.php:157
 msgid "Received"
 msgstr "Empfangen"
 
-#: libraries/server_status.lib.php:167
+#: libraries/server_status.lib.php:176
 msgid "Sent"
 msgstr "Gesendet"
 
-#: libraries/server_status.lib.php:234
+#: libraries/server_status.lib.php:243
 msgid "Max. concurrent connections"
 msgstr "Max. gleichzeitige Verbindungen"
 
-#: libraries/server_status.lib.php:244
+#: libraries/server_status.lib.php:253
 msgid "Failed attempts"
 msgstr "Fehlversuche"
 
@@ -14164,7 +14180,7 @@ msgstr "Diese Variable kann nicht verändert werden"
 msgid "Not implemented yet."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/AlterOperation.php:193
+#: libraries/sql-parser/src/Components/AlterOperation.php:191
 msgid "Unrecognized alter operation."
 msgstr "Unerkannte ALTER-Operation."
 
@@ -14179,7 +14195,7 @@ msgstr ""
 "Eine öffnende Klammer, gefolgt von einer Liste von Werten, wurde erwartet."
 
 #: libraries/sql-parser/src/Components/ArrayObj.php:101
-#: libraries/sql-parser/src/Components/FieldDefinition.php:202
+#: libraries/sql-parser/src/Components/CreateDefinition.php:202
 msgid "An opening bracket was expected."
 msgstr "Eine öffnende Klammer wurde erwartet."
 
@@ -14187,25 +14203,35 @@ msgstr "Eine öffnende Klammer wurde erwartet."
 msgid "A comma or a closing bracket was expected"
 msgstr "Ein Komma oder eine schließende Klammer wurde erwartet"
 
+#: libraries/sql-parser/src/Components/CreateDefinition.php:246
+#, fuzzy
+#| msgid "A comma or a closing bracket was expected"
+msgid "A comma or a closing bracket was expected."
+msgstr "Ein Komma oder eine schließende Klammer wurde erwartet"
+
+#: libraries/sql-parser/src/Components/CreateDefinition.php:262
+msgid "A closing bracket was expected."
+msgstr "Eine schließende Klammer wurde erwartet."
+
 #: libraries/sql-parser/src/Components/DataType.php:125
 msgid "Unrecognized data type."
 msgstr "Unerkannter Datentyp."
 
-#: libraries/sql-parser/src/Components/Expression.php:225
+#: libraries/sql-parser/src/Components/Expression.php:227
 msgid "Unexpected closing bracket."
 msgstr "Unerwartete schließende Klammer."
 
-#: libraries/sql-parser/src/Components/Expression.php:246
-#: libraries/sql-parser/src/Components/Expression.php:283
-#: libraries/sql-parser/src/Components/Expression.php:303
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:285
+#: libraries/sql-parser/src/Components/Expression.php:305
 msgid "An alias was previously found."
 msgstr "Ein Alias wurde zuvor gefunden."
 
-#: libraries/sql-parser/src/Components/Expression.php:257
+#: libraries/sql-parser/src/Components/Expression.php:259
 msgid "Unexpected dot."
 msgstr "Unerwarteter Punkt."
 
-#: libraries/sql-parser/src/Components/Expression.php:327
+#: libraries/sql-parser/src/Components/Expression.php:329
 msgid "An alias was expected."
 msgstr "Ein Alias wurde erwartet."
 
@@ -14213,16 +14239,6 @@ msgstr "Ein Alias wurde erwartet."
 msgid "An expression was expected."
 msgstr "Ein Ausdruck wurde erwartet."
 
-#: libraries/sql-parser/src/Components/FieldDefinition.php:246
-#, fuzzy
-#| msgid "A comma or a closing bracket was expected"
-msgid "A comma or a closing bracket was expected."
-msgstr "Ein Komma oder eine schließende Klammer wurde erwartet"
-
-#: libraries/sql-parser/src/Components/FieldDefinition.php:262
-msgid "A closing bracket was expected."
-msgstr "Eine schließende Klammer wurde erwartet."
-
 #: libraries/sql-parser/src/Components/Limit.php:90
 #: libraries/sql-parser/src/Components/Limit.php:112
 msgid "An offset was expected."
@@ -14262,24 +14278,24 @@ msgstr "Erwartete Whitespace vor dem Trennzeichen."
 msgid "Expected delimiter."
 msgstr "Erwartete Trennzeichen."
 
-#: libraries/sql-parser/src/Lexer.php:753
+#: libraries/sql-parser/src/Lexer.php:777
 #, php-format
 msgid "Ending quote %1$s was expected."
 msgstr "Schließendes Anführungszeichen %1$s wurde erzeugt."
 
-#: libraries/sql-parser/src/Lexer.php:789
+#: libraries/sql-parser/src/Lexer.php:813
 msgid "Variable name was expected."
 msgstr "Variablenname wurde erwartet."
 
-#: libraries/sql-parser/src/Parser.php:380
+#: libraries/sql-parser/src/Parser.php:391
 msgid "Unexpected beginning of statement."
 msgstr "Unerwarteter Statement-Anfang."
 
-#: libraries/sql-parser/src/Parser.php:399
+#: libraries/sql-parser/src/Parser.php:410
 msgid "Unrecognized statement type."
 msgstr "Unerkannte Statement-Typ."
 
-#: libraries/sql-parser/src/Parser.php:479
+#: libraries/sql-parser/src/Parser.php:489
 #, fuzzy
 #| msgid "An alias was previously found."
 msgid "No transaction was previously started."
@@ -14309,7 +14325,9 @@ msgid "The name of the entity was expected."
 msgstr "Der Name der Entität wurde erwartet."
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:310
-msgid "At least one field definition was expected."
+#, fuzzy
+#| msgid "At least one field definition was expected."
+msgid "At least one column definition was expected."
 msgstr "Mindestens eine Felddefinition wurde erwartet."
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:329
@@ -14369,11 +14387,11 @@ msgstr "Bookmark nicht erstellt!"
 msgid "Using bookmark \"%s\" as default browse query."
 msgstr "Lesezeichen \"%s\" wird als Standard-Anzeigeabfrage verwendet."
 
-#: libraries/sql.lib.php:1306
+#: libraries/sql.lib.php:1300
 msgid "Showing as PHP code"
 msgstr "Ansicht als PHP-Code"
 
-#: libraries/sql.lib.php:1638
+#: libraries/sql.lib.php:1632
 #, php-format
 msgid ""
 "Current selection does not contain a unique column. Grid edit, checkbox, "
@@ -14383,7 +14401,7 @@ msgstr ""
 "Bearbeitungsfunktion, Kontrollkästchen, Bearbeiten, Kopieren und Löschen von "
 "Links sind nicht verfügbar. %s"
 
-#: libraries/sql.lib.php:1649
+#: libraries/sql.lib.php:1643
 #, php-format
 msgid ""
 "Current selection does not contain a unique column. Grid edit, Edit, Copy "
@@ -14393,7 +14411,7 @@ msgstr ""
 "Bearbeitungsfunktion, Bearbeiten, Kopieren und Löschen können zu ungewollten "
 "Ergebnissen führen. %s"
 
-#: libraries/sql.lib.php:1688
+#: libraries/sql.lib.php:1682
 #, php-format
 msgid "Problems with indexes of table `%s`"
 msgstr "Warnungen bei den Indizes der Tabelle `%s`"
@@ -14549,7 +14567,7 @@ msgid "Version %s snapshot (SQL code)"
 msgstr "Version %s Schnappschuss (SQL code)"
 
 #: libraries/tracking.lib.php:947
-#: templates/structure/table_structure_row.phtml:33
+#: templates/table/structure/table_structure_row.phtml:33
 msgctxt "None for default"
 msgid "None"
 msgstr "kein(e)"
@@ -14605,15 +14623,15 @@ msgstr "Version %1$s von %2$s wurde gelöscht."
 msgid "Version %1$s was created, tracking for %2$s is active."
 msgstr "Version %1$s wurde erstellt, Tracking von %2$s ist aktiviert."
 
-#: libraries/user_preferences.inc.php:29
+#: libraries/user_preferences.inc.php:30
 msgid "Manage your settings"
 msgstr "Einstellungen verwalten"
 
-#: libraries/user_preferences.inc.php:46 prefs_manage.php:307
+#: libraries/user_preferences.inc.php:54 prefs_manage.php:307
 msgid "Configuration has been saved."
 msgstr "Die Konfiguration wurde gespeichert."
 
-#: libraries/user_preferences.inc.php:66
+#: libraries/user_preferences.inc.php:74
 #, php-format
 msgid ""
 "Your preferences will be saved for current session only. Storing them "
@@ -15011,7 +15029,7 @@ msgid "first"
 msgstr "an den Anfang"
 
 #: templates/columns_definitions/move_column.phtml:12
-#: templates/structure/add_column.phtml:21
+#: templates/table/structure/add_column.phtml:21
 #, php-format
 msgid "after %s"
 msgstr "nach %s"
@@ -15080,197 +15098,293 @@ msgstr "Eingabeumwandlung"
 msgid "Input transformation options"
 msgstr "Eingabeumwandlungsoptionen"
 
-#: templates/designer/aggregate_query_panel.phtml:22
-#: templates/designer/options_panel.phtml:100
-msgid "Aggregate"
-msgstr "Anlegen"
-
-#: templates/designer/aggregate_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:61
-#: templates/designer/options_panel.phtml:106
-#: templates/designer/options_panel.phtml:170
-#: templates/designer/where_query_panel.phtml:30
-#: templates/table/table_header.phtml:9
-msgid "Operator"
-msgstr "Operator"
-
-#: templates/designer/database_tables.phtml:29
-msgid "Toggle"
-msgstr "Umschalten"
-
-#: templates/designer/database_tables.phtml:40
-msgid "See table structure"
-msgstr "Tabellenstruktur ansehen"
-
-#: templates/designer/delete_relation_panel.phtml:21
-msgid "Delete relation"
-msgstr "Verknüpfung löschen"
-
-#: templates/designer/edit_delete_pages.phtml:7
-msgid "Page to open"
-msgstr "Zu öffnende Seite"
-
-#: templates/designer/edit_delete_pages.phtml:7
-msgid "Page to delete"
-msgstr "Zu löschende Seite"
-
-#: templates/designer/having_query_panel.phtml:90
-#: templates/designer/options_panel.phtml:63
-#: templates/designer/options_panel.phtml:229
-#: templates/designer/where_query_panel.phtml:59
-msgid "Except"
-msgstr "Ausnahme"
-
-#: templates/designer/having_query_panel.phtml:102
-#: templates/designer/options_panel.phtml:75
-#: templates/designer/options_panel.phtml:241
-#: templates/designer/where_query_panel.phtml:71
-msgid "subquery"
-msgstr "Unterabfrage"
-
-#: templates/designer/new_relation_panel.phtml:22
-#: templates/designer/side_menu.phtml:84 templates/designer/side_menu.phtml:87
-msgid "Create relation"
-msgstr "Erzeuge Verknüpfung"
-
-#: templates/designer/options_panel.phtml:34
-#: templates/designer/options_panel.phtml:200
-msgid "Relation operator"
-msgstr "Beziehungsoperator"
-
-#: templates/designer/options_panel.phtml:85
-#: templates/designer/rename_to_panel.phtml:23
-msgid "Rename to"
-msgstr "Umbenennen nach"
-
-#: templates/designer/options_panel.phtml:91
-#: templates/designer/rename_to_panel.phtml:31
-msgid "New name"
-msgstr "Neuer Name"
-
-#: templates/designer/page_save_as.phtml:4
-msgid "Save to selected page"
-msgstr "Speichern der ausgewählten Seite"
-
-#: templates/designer/page_save_as.phtml:5
-msgid "Create a page and save to it"
-msgstr "Eine Seite anlegen und dahin speichern"
-
-#: templates/designer/page_save_as.phtml:26
-msgid "New page name"
-msgstr "Name der neuen Seite"
-
-#: templates/designer/page_selector.phtml:2
-msgid "Select page"
-msgstr "Seite auswählen"
-
-#: templates/designer/query_details.phtml:10
-msgid "Active options"
-msgstr "Aktive Optionen"
-
-#: templates/designer/schema_export.phtml:4
-msgid "Select Export Relational Type"
-msgstr "Beziehungsschema exportieren auswählen"
-
-#: templates/designer/side_menu.phtml:19 templates/designer/side_menu.phtml:25
-msgid "Show/Hide tables list"
-msgstr "Tabellen-Liste anzeigen/ausblenden"
-
-#: templates/designer/side_menu.phtml:29 templates/designer/side_menu.phtml:35
-#: templates/designer/side_menu.phtml:36
-msgid "View in fullscreen"
-msgstr "Zeige als Vollbild"
-
-#: templates/designer/side_menu.phtml:34
-msgid "Exit fullscreen"
-msgstr "Beende Vollbild"
-
-#: templates/designer/side_menu.phtml:41 templates/designer/side_menu.phtml:45
-msgid "New page"
-msgstr "Neue Seite"
-
-#: templates/designer/side_menu.phtml:70 templates/designer/side_menu.phtml:73
-msgid "Delete pages"
-msgstr "Seiten löschen"
-
-#: templates/designer/side_menu.phtml:77 templates/designer/side_menu.phtml:80
-#: templates/table/create_table.phtml:7
+#: templates/database/create_table.phtml:7
+#: templates/database/designer/side_menu.phtml:77
+#: templates/database/designer/side_menu.phtml:80
 msgid "Create table"
 msgstr "Erzeuge Tabelle"
 
-#: templates/designer/side_menu.phtml:98
-#: templates/designer/side_menu.phtml:101
+#: templates/database/create_table.phtml:15
+msgid "Number of columns"
+msgstr "Anzahl der Spalten"
+
+#: templates/database/designer/aggregate_query_panel.phtml:22
+#: templates/database/designer/options_panel.phtml:100
+msgid "Aggregate"
+msgstr "Anlegen"
+
+#: templates/database/designer/aggregate_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:61
+#: templates/database/designer/options_panel.phtml:106
+#: templates/database/designer/options_panel.phtml:170
+#: templates/database/designer/where_query_panel.phtml:30
+#: templates/table/search/table_header.phtml:9
+msgid "Operator"
+msgstr "Operator"
+
+#: templates/database/designer/database_tables.phtml:29
+msgid "Toggle"
+msgstr "Umschalten"
+
+#: templates/database/designer/database_tables.phtml:40
+msgid "See table structure"
+msgstr "Tabellenstruktur ansehen"
+
+#: templates/database/designer/delete_relation_panel.phtml:21
+msgid "Delete relation"
+msgstr "Verknüpfung löschen"
+
+#: templates/database/designer/edit_delete_pages.phtml:7
+msgid "Page to open"
+msgstr "Zu öffnende Seite"
+
+#: templates/database/designer/edit_delete_pages.phtml:7
+msgid "Page to delete"
+msgstr "Zu löschende Seite"
+
+#: templates/database/designer/having_query_panel.phtml:90
+#: templates/database/designer/options_panel.phtml:63
+#: templates/database/designer/options_panel.phtml:229
+#: templates/database/designer/where_query_panel.phtml:59
+msgid "Except"
+msgstr "Ausnahme"
+
+#: templates/database/designer/having_query_panel.phtml:102
+#: templates/database/designer/options_panel.phtml:75
+#: templates/database/designer/options_panel.phtml:241
+#: templates/database/designer/where_query_panel.phtml:71
+msgid "subquery"
+msgstr "Unterabfrage"
+
+#: templates/database/designer/new_relation_panel.phtml:22
+#: templates/database/designer/side_menu.phtml:84
+#: templates/database/designer/side_menu.phtml:87
+msgid "Create relation"
+msgstr "Erzeuge Verknüpfung"
+
+#: templates/database/designer/options_panel.phtml:34
+#: templates/database/designer/options_panel.phtml:200
+msgid "Relation operator"
+msgstr "Beziehungsoperator"
+
+#: templates/database/designer/options_panel.phtml:85
+#: templates/database/designer/rename_to_panel.phtml:23
+msgid "Rename to"
+msgstr "Umbenennen nach"
+
+#: templates/database/designer/options_panel.phtml:91
+#: templates/database/designer/rename_to_panel.phtml:31
+msgid "New name"
+msgstr "Neuer Name"
+
+#: templates/database/designer/page_save_as.phtml:4
+msgid "Save to selected page"
+msgstr "Speichern der ausgewählten Seite"
+
+#: templates/database/designer/page_save_as.phtml:5
+msgid "Create a page and save to it"
+msgstr "Eine Seite anlegen und dahin speichern"
+
+#: templates/database/designer/page_save_as.phtml:26
+msgid "New page name"
+msgstr "Name der neuen Seite"
+
+#: templates/database/designer/page_selector.phtml:2
+msgid "Select page"
+msgstr "Seite auswählen"
+
+#: templates/database/designer/query_details.phtml:10
+msgid "Active options"
+msgstr "Aktive Optionen"
+
+#: templates/database/designer/schema_export.phtml:4
+msgid "Select Export Relational Type"
+msgstr "Beziehungsschema exportieren auswählen"
+
+#: templates/database/designer/side_menu.phtml:19
+#: templates/database/designer/side_menu.phtml:25
+msgid "Show/Hide tables list"
+msgstr "Tabellen-Liste anzeigen/ausblenden"
+
+#: templates/database/designer/side_menu.phtml:29
+#: templates/database/designer/side_menu.phtml:35
+#: templates/database/designer/side_menu.phtml:36
+msgid "View in fullscreen"
+msgstr "Zeige als Vollbild"
+
+#: templates/database/designer/side_menu.phtml:34
+msgid "Exit fullscreen"
+msgstr "Beende Vollbild"
+
+#: templates/database/designer/side_menu.phtml:41
+#: templates/database/designer/side_menu.phtml:45
+msgid "New page"
+msgstr "Neue Seite"
+
+#: templates/database/designer/side_menu.phtml:70
+#: templates/database/designer/side_menu.phtml:73
+msgid "Delete pages"
+msgstr "Seiten löschen"
+
+#: templates/database/designer/side_menu.phtml:98
+#: templates/database/designer/side_menu.phtml:101
 msgid "Reload"
 msgstr "Neuladen"
 
-#: templates/designer/side_menu.phtml:107
-#: templates/designer/side_menu.phtml:110
+#: templates/database/designer/side_menu.phtml:107
+#: templates/database/designer/side_menu.phtml:110
 msgid "Help"
 msgstr "Hilfe"
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Angular links"
 msgstr "Winklige Verbindung"
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Direct links"
 msgstr "Direkte Verbindung"
 
-#: templates/designer/side_menu.phtml:122
-#: templates/designer/side_menu.phtml:124
+#: templates/database/designer/side_menu.phtml:122
+#: templates/database/designer/side_menu.phtml:124
 msgid "Snap to grid"
 msgstr "Am Gitter anordnen"
 
-#: templates/designer/side_menu.phtml:128
-#: templates/designer/side_menu.phtml:134
+#: templates/database/designer/side_menu.phtml:128
+#: templates/database/designer/side_menu.phtml:134
 msgid "Small/Big All"
 msgstr "Alles klein/groß"
 
-#: templates/designer/side_menu.phtml:138
-#: templates/designer/side_menu.phtml:141
+#: templates/database/designer/side_menu.phtml:138
+#: templates/database/designer/side_menu.phtml:141
 msgid "Toggle small/big"
 msgstr "Wechseln klein/groß"
 
-#: templates/designer/side_menu.phtml:145
-#: templates/designer/side_menu.phtml:148
+#: templates/database/designer/side_menu.phtml:145
+#: templates/database/designer/side_menu.phtml:148
 msgid "Toggle relation lines"
 msgstr "Beziehungen anzeigen an/aus"
 
-#: templates/designer/side_menu.phtml:153
-#: templates/designer/side_menu.phtml:156
+#: templates/database/designer/side_menu.phtml:153
+#: templates/database/designer/side_menu.phtml:156
 msgid "Export schema"
 msgstr "Schema exportieren"
 
-#: templates/designer/side_menu.phtml:165
-#: templates/designer/side_menu.phtml:168
+#: templates/database/designer/side_menu.phtml:165
+#: templates/database/designer/side_menu.phtml:168
 msgid "Build Query"
 msgstr "Abfrage erstellen"
 
-#: templates/designer/side_menu.phtml:173
-#: templates/designer/side_menu.phtml:177
+#: templates/database/designer/side_menu.phtml:173
+#: templates/database/designer/side_menu.phtml:177
 msgid "Move Menu"
 msgstr "Verschiebe Menü"
 
-#: templates/designer/side_menu.phtml:181
-#: templates/designer/side_menu.phtml:186
+#: templates/database/designer/side_menu.phtml:181
+#: templates/database/designer/side_menu.phtml:186
 msgid "Pin text"
 msgstr "Text anheften"
 
-#: templates/designer/table_list.phtml:4
+#: templates/database/designer/table_list.phtml:4
 msgid "Hide/Show all"
 msgstr "Alles ein-/ausblenden"
 
-#: templates/designer/table_list.phtml:14
+#: templates/database/designer/table_list.phtml:14
 msgid "Hide/Show Tables with no relation"
 msgstr "Tabellen ohne Verknüpfung aus-/einblenden"
 
-#: templates/designer/table_list.phtml:59
+#: templates/database/designer/table_list.phtml:59
 msgid "Number of tables:"
 msgstr "Anzahl Tabellen:"
 
+#: templates/database/structure/body_for_table_summary.phtml:6
+#, php-format
+msgid "%s table"
+msgid_plural "%s tables"
+msgstr[0] "%s Tabelle"
+msgstr[1] "%s Tabellen"
+
+#: templates/database/structure/body_for_table_summary.phtml:17
+msgid "Sum"
+msgstr "Gesamt"
+
+#: templates/database/structure/check_all_tables.phtml:6
+msgid "Check tables having overhead"
+msgstr "Tabellen mit Überhang auswählen"
+
+#: templates/database/structure/check_all_tables.phtml:10
+msgid "Show create"
+msgstr "Erzeugung anzeigen"
+
+#: templates/database/structure/check_all_tables.phtml:27
+msgid "Prefix"
+msgstr "Präfix"
+
+#: templates/database/structure/check_all_tables.phtml:28
+msgid "Add prefix to table"
+msgstr "Prefix der Tabelle voranstellen"
+
+#: templates/database/structure/check_all_tables.phtml:29
+msgid "Replace table prefix"
+msgstr "Tabellenprefix ersetzen"
+
+#: templates/database/structure/check_all_tables.phtml:30
+msgid "Copy table with prefix"
+msgstr "Tabelle mit Prefix kopieren"
+
+#: templates/database/structure/check_all_tables.phtml:36
+msgid "Add columns to central list"
+msgstr "Spalten zur zentralen Liste hinzufügen"
+
+#: templates/database/structure/check_all_tables.phtml:37
+msgid "Remove columns from central list"
+msgstr "Entfernen von Spalten aus der zentralen Liste"
+
+#: templates/database/structure/check_all_tables.phtml:38
+msgid "Make consistent with central list"
+msgstr "Konsistent mit zentraler Liste machen"
+
+#: templates/database/structure/favorite_anchor.phtml:12
+msgid "Add to Favorites"
+msgstr "Zu den Favoriten hinzufügen"
+
+#: templates/database/structure/show_create.phtml:2
+msgid "Showing create queries"
+msgstr "Zeige Erzeugungsabfrage"
+
+#: templates/database/structure/sortable_header.phtml:13
+msgid "Sort"
+msgstr "Sortierung"
+
+#: templates/database/structure/table_header.phtml:42
+msgid ""
+"May be approximate. Click on the number to get the exact count. See "
+"[doc@faq3-11]FAQ 3.11[/doc]."
+msgstr ""
+"Es kann sich hierbei um Näherungswerte handeln. Klicken Sie auf die Nummer "
+"um eine exakte Anzahl zu bekommen. Bitte lesen Sie auch [doc@faq3-11]FAQ "
+"3.11[/doc]."
+
+#: templates/database/structure/table_header.phtml:66
+#: templates/table/index_form.phtml:127
+msgid "Size"
+msgstr "Größe"
+
+#: templates/database/structure/table_header.phtml:74
+#: templates/table/structure/display_table_stats.phtml:27
+msgid "Overhead"
+msgstr "Überhang"
+
+#: templates/database/structure/tracking_icon.phtml:4
+msgid "Tracking is active."
+msgstr "Tracking ist aktiviert."
+
+#: templates/database/structure/tracking_icon.phtml:8
+msgid "Tracking is not active."
+msgstr "Tracking ist nicht aktiviert."
+
 #: templates/error/report_form.phtml:7
 msgid ""
 "phpMyAdmin has encountered an error. We have collected data about this error "
@@ -15289,61 +15403,6 @@ msgstr "Sie können einen Blick auf die Daten im Fehlerbericht werfen:"
 msgid "Please explain the steps that lead to the error:"
 msgstr "Bitte erklären Sie die Schritte, die zu dem Fehler führen:"
 
-#: templates/gis_visualization/gis_visualization.phtml:3
-msgid "Display GIS Visualization"
-msgstr "GIS-Darstellung anzeigen"
-
-#: templates/gis_visualization/gis_visualization.phtml:8
-msgid "Label column"
-msgstr "Spaltenbeschriftung"
-
-#: templates/gis_visualization/gis_visualization.phtml:11
-msgid "-- None --"
-msgstr "-- Kein --"
-
-#: templates/gis_visualization/gis_visualization.phtml:19
-msgid "Spatial column"
-msgstr "Räumliche Spalte"
-
-#: templates/index_form.phtml:16
-msgid "Index name:"
-msgstr "Indexname:"
-
-#: templates/index_form.phtml:19
-msgid ""
-"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
-msgstr ""
-"Nur der Name des Primärschlüssels <b>darf</b> und <b>muss</b> \"PRIMARY\" "
-"lauten!"
-
-#: templates/index_form.phtml:40
-msgid "Index choice:"
-msgstr "Index Auswahl:"
-
-#: templates/index_form.phtml:57
-msgid "Key block size:"
-msgstr "Schlüsselblockgröße:"
-
-#: templates/index_form.phtml:74
-msgid "Index type:"
-msgstr "Indextyp:"
-
-#: templates/index_form.phtml:86
-msgid "Parser:"
-msgstr "Parser:"
-
-#: templates/index_form.phtml:102
-msgid "Comment:"
-msgstr "Kommentar:"
-
-#: templates/index_form.phtml:127 templates/structure/table_header.phtml:66
-msgid "Size"
-msgstr "Größe"
-
-#: templates/index_form.phtml:149 templates/index_form.phtml:190
-msgid "Drag to reorder"
-msgstr "Zur Umsortierung ziehen"
-
 #: templates/prefs_autoload.phtml:9
 msgid ""
 "Your browser has phpMyAdmin configuration for this domain. Would you like to "
@@ -15356,360 +15415,150 @@ msgstr ""
 msgid "Start row:"
 msgstr "Anfangs-Datensatz:"
 
-#: templates/structure/actions_in_table_structure.phtml:14
-#, php-format
-msgid "A primary key has been added on %s."
-msgstr "Ein Primärschlüssel wurde in %s erzeugt."
-
-#: templates/structure/actions_in_table_structure.phtml:34
-#: templates/structure/actions_in_table_structure.phtml:54
-#: templates/structure/actions_in_table_structure.phtml:79
-#: templates/structure/actions_in_table_structure.phtml:101
-#, php-format
-msgid "An index has been added on %s."
-msgstr "Ein Index wurde in %s erzeugt."
-
-#: templates/structure/actions_in_table_structure.phtml:130
-#: templates/structure/check_all_table_column.phtml:59
-msgid "Remove from central columns"
-msgstr "Zentrale Spalten entfernen"
-
-#: templates/structure/actions_in_table_structure.phtml:138
-#: templates/structure/check_all_table_column.phtml:55
-msgid "Add to central columns"
-msgstr "Zu zentralen Spalten hinzufügen"
-
-#: templates/structure/add_column.phtml:7
-#, php-format
-msgid "Add %s column(s)"
-msgstr "%s Spalte(n) einfügen"
-
-#: templates/structure/add_column.phtml:12
-msgid "at beginning of table"
-msgstr "am Tabellenanfang"
-
-#: templates/structure/body_for_table_summary.phtml:6
-#, php-format
-msgid "%s table"
-msgid_plural "%s tables"
-msgstr[0] "%s Tabelle"
-msgstr[1] "%s Tabellen"
-
-#: templates/structure/body_for_table_summary.phtml:17
-msgid "Sum"
-msgstr "Gesamt"
-
-#: templates/structure/check_all_tables.phtml:6
-msgid "Check tables having overhead"
-msgstr "Tabellen mit Überhang auswählen"
-
-#: templates/structure/check_all_tables.phtml:10
-msgid "Show create"
-msgstr "Erzeugung anzeigen"
-
-#: templates/structure/check_all_tables.phtml:27
-msgid "Prefix"
-msgstr "Präfix"
-
-#: templates/structure/check_all_tables.phtml:28
-msgid "Add prefix to table"
-msgstr "Prefix der Tabelle voranstellen"
-
-#: templates/structure/check_all_tables.phtml:29
-msgid "Replace table prefix"
-msgstr "Tabellenprefix ersetzen"
-
-#: templates/structure/check_all_tables.phtml:30
-msgid "Copy table with prefix"
-msgstr "Tabelle mit Prefix kopieren"
-
-#: templates/structure/check_all_tables.phtml:36
-msgid "Add columns to central list"
-msgstr "Spalten zur zentralen Liste hinzufügen"
-
-#: templates/structure/check_all_tables.phtml:37
-msgid "Remove columns from central list"
-msgstr "Entfernen von Spalten aus der zentralen Liste"
-
-#: templates/structure/check_all_tables.phtml:38
-msgid "Make consistent with central list"
-msgstr "Konsistent mit zentraler Liste machen"
-
-#: templates/structure/display_structure.phtml:140 view_create.php:181
-msgid "Edit view"
-msgstr "View/Ansicht bearbeiten"
-
-#: templates/structure/display_table_stats.phtml:9
-msgid "Space usage"
-msgstr "Speicherplatzverbrauch"
-
-#: templates/structure/display_table_stats.phtml:27
-#: templates/structure/table_header.phtml:74
-msgid "Overhead"
-msgstr "Überhang"
-
-#: templates/structure/display_table_stats.phtml:32
-msgid "Effective"
-msgstr "Effektiv"
-
-#: templates/structure/favorite_anchor.phtml:12
-msgid "Add to Favorites"
-msgstr "Zu den Favoriten hinzufügen"
-
-#: templates/structure/move_columns_dialog.phtml:1
-#: templates/structure/optional_action_links.phtml:21
-msgid "Move columns"
-msgstr "Spalten verschieben"
-
-#: templates/structure/move_columns_dialog.phtml:2
-msgid "Move the columns by dragging them up and down."
-msgstr "Verschieben Sie die Spalten, indem Sie sie nach oben und unten ziehen."
-
-#: templates/structure/optional_action_links.phtml:9
-msgid "Propose table structure"
-msgstr "Tabellenstruktur analysieren"
-
-#: templates/structure/optional_action_links.phtml:24
-msgid "Improve table structure"
-msgstr "Tabellenstruktur verbessern"
-
-#: templates/structure/optional_action_links.phtml:30
-msgid "Track view"
-msgstr "Verfolge Ansicht"
-
-#: templates/structure/row_stats_table.phtml:3
-msgid "Row statistics"
-msgstr "Datensatz-Statistiken"
-
-#: templates/structure/row_stats_table.phtml:9
-msgid "static"
-msgstr "statisch"
-
-#: templates/structure/row_stats_table.phtml:11
-msgid "dynamic"
-msgstr "dynamisch"
-
-#: templates/structure/row_stats_table.phtml:22
-msgid "partitioned"
-msgstr "partitioniert"
-
-#: templates/structure/row_stats_table.phtml:54
-msgid "Row length"
-msgstr "Zeilenlänge"
-
-#: templates/structure/row_stats_table.phtml:66
-msgid "Row size"
-msgstr "Zeilengröße"
-
-#: templates/structure/row_stats_table.phtml:73
-msgid "Next autoindex"
-msgstr "Nächster Autoindex"
-
-#: templates/structure/secondary_tabs.phtml:14
-msgid "Relation view"
-msgstr "Beziehungsansicht"
-
-#: templates/structure/show_create.phtml:2
-msgid "Showing create queries"
-msgstr "Zeige Erzeugungsabfrage"
-
-#: templates/structure/sortable_header.phtml:13
-msgid "Sort"
-msgstr "Sortierung"
-
-#: templates/structure/table_header.phtml:42
-msgid ""
-"May be approximate. Click on the number to get the exact count. See "
-"[doc@faq3-11]FAQ 3.11[/doc]."
-msgstr ""
-"Es kann sich hierbei um Näherungswerte handeln. Klicken Sie auf die Nummer "
-"um eine exakte Anzahl zu bekommen. Bitte lesen Sie auch [doc@faq3-11]FAQ "
-"3.11[/doc]."
-
-#: templates/structure/table_structure_row.phtml:46
-#, php-format
-msgid "Column %s has been dropped."
-msgstr "Spalte %s wurde gelöscht."
-
-#: templates/structure/tracking_icon.phtml:4
-msgid "Tracking is active."
-msgstr "Tracking ist aktiviert."
-
-#: templates/structure/tracking_icon.phtml:8
-msgid "Tracking is not active."
-msgstr "Tracking ist nicht aktiviert."
-
-#: templates/table/create_table.phtml:15
-msgid "Number of columns"
-msgstr "Anzahl der Spalten"
-
-#: templates/table/options.phtml:8
-msgid "Select columns (at least one):"
-msgstr "Spalten auswählen (min. eines):"
-
-#: templates/table/options.phtml:37
-msgid "Add search conditions (body of the \"where\" clause):"
-msgstr "Eigenes Filterkriterium (Argumente für den \"WHERE\"-Ausdruck):"
-
-#: templates/table/options.phtml:45
-msgid "Number of rows per page"
-msgstr "Einträge pro Seite"
-
-#: templates/table/options.phtml:56
-msgid "Display order:"
-msgstr "Sortierung nach:"
-
-#: templates/table/options_zoom.phtml:6
-msgid "Use this column to label each point"
-msgstr "Diese Spalte verwenden, um jeden Punkt zu benennen"
-
-#: templates/table/options_zoom.phtml:35
-msgid "Maximum rows to plot"
-msgstr "Maximale Anzahl der darzustellenden Datensätze"
-
-#: templates/table/replace_preview.phtml:13
-msgid "Find and replace - preview"
-msgstr "Suchen und Ersetzen – Vorschau"
-
-#: templates/table/replace_preview.phtml:18
-msgid "Original string"
-msgstr "Ursprungstext"
-
-#: templates/table/replace_preview.phtml:19
-msgid "Replaced string"
-msgstr "ersetzter Text"
-
-#: templates/table/replace_preview.phtml:40
-msgid "Replace"
-msgstr "Ersetzen"
-
-#: templates/table/rows_zoom.phtml:16
-msgid "Additional search criteria"
-msgstr "Zusätzliche Suchkriterien"
-
-#: templates/table/search_and_replace.phtml:3
-msgid "Replace with:"
-msgstr "Ersetze durch:"
-
-#: templates/table/search_and_replace.phtml:22
-msgid "Use regular expression"
-msgstr "Regulären Ausdruck benutzen"
-
-#: templates/table/selection_form.phtml:12
-msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
-msgstr ""
-"Suche über Beispielwerte (\"query by example\") (Platzhalter: \"%\") für "
-"zwei unterschiedliche Spalten"
-
-#: templates/table/selection_form.phtml:34
-msgid "Do a \"query by example\" (wildcard: \"%\")"
-msgstr "Suche über Beispielwerte (\"query by example\") (Platzhalter: \"%\")"
-
-#: templates/table/zoom_result_form.phtml:7
-msgid "Browse/Edit the points"
-msgstr "Punkte anzeigen/bearbeiten"
-
-#: templates/table/zoom_result_form.phtml:15
-msgid "How to use"
-msgstr "Anleitung"
-
-#: templates/table/zoom_result_form.phtml:23
-msgid "Reset zoom"
-msgstr "Zoom zurücksetzen"
-
-#: templates/tbl_chart.phtml:17
+#: templates/table/chart/tbl_chart.phtml:17
 msgctxt "Chart type"
 msgid "Bar"
 msgstr "Säule"
 
-#: templates/tbl_chart.phtml:21
+#: templates/table/chart/tbl_chart.phtml:21
 msgctxt "Chart type"
 msgid "Column"
 msgstr "Spalte"
 
-#: templates/tbl_chart.phtml:25
+#: templates/table/chart/tbl_chart.phtml:25
 msgctxt "Chart type"
 msgid "Line"
 msgstr "Linie"
 
-#: templates/tbl_chart.phtml:29
+#: templates/table/chart/tbl_chart.phtml:29
 msgctxt "Chart type"
 msgid "Spline"
 msgstr "Profil"
 
-#: templates/tbl_chart.phtml:33
+#: templates/table/chart/tbl_chart.phtml:33
 msgctxt "Chart type"
 msgid "Area"
 msgstr "Bereich"
 
-#: templates/tbl_chart.phtml:37
+#: templates/table/chart/tbl_chart.phtml:37
 msgctxt "Chart type"
 msgid "Pie"
 msgstr "Torte"
 
-#: templates/tbl_chart.phtml:41
+#: templates/table/chart/tbl_chart.phtml:41
 msgctxt "Chart type"
 msgid "Timeline"
 msgstr "Zeitleiste"
 
-#: templates/tbl_chart.phtml:45
+#: templates/table/chart/tbl_chart.phtml:45
 msgctxt "Chart type"
 msgid "Scatter"
 msgstr "Punkte"
 
-#: templates/tbl_chart.phtml:50
+#: templates/table/chart/tbl_chart.phtml:50
 msgid "Stacked"
 msgstr "Gestapelt"
 
-#: templates/tbl_chart.phtml:53
+#: templates/table/chart/tbl_chart.phtml:53
 msgid "Chart title"
 msgstr "Titel des Reports"
 
-#: templates/tbl_chart.phtml:57
+#: templates/table/chart/tbl_chart.phtml:57
 msgid "X-Axis:"
 msgstr "X-Achse:"
 
-#: templates/tbl_chart.phtml:72
+#: templates/table/chart/tbl_chart.phtml:72
 msgid "Series:"
 msgstr "Reihe:"
 
-#: templates/tbl_chart.phtml:102
+#: templates/table/chart/tbl_chart.phtml:102
 msgid "X-Axis label:"
 msgstr "Beschriftung X-Achse:"
 
-#: templates/tbl_chart.phtml:104
+#: templates/table/chart/tbl_chart.phtml:104
 msgid "X Values"
 msgstr "X-Werte"
 
-#: templates/tbl_chart.phtml:107
+#: templates/table/chart/tbl_chart.phtml:107
 msgid "Y-Axis label:"
 msgstr "Beschriftung Y-Achse:"
 
-#: templates/tbl_chart.phtml:115
+#: templates/table/chart/tbl_chart.phtml:115
 msgid "Series names are in a column"
 msgstr "Wertenamen in einer Spalte"
 
-#: templates/tbl_chart.phtml:118
+#: templates/table/chart/tbl_chart.phtml:118
 msgid "Series column:"
 msgstr "Wertespalten:"
 
-#: templates/tbl_chart.phtml:130
+#: templates/table/chart/tbl_chart.phtml:130
 msgid "Value Column:"
 msgstr "Wertspalte:"
 
-#: templates/tbl_chart.phtml:150
+#: templates/table/chart/tbl_chart.phtml:150
 msgid "Save chart as image"
 msgstr "Diagramm als Bild speichern"
 
-#: templates/tbl_relation/common_form.phtml:7
+#: templates/table/gis_visualization/gis_visualization.phtml:3
+msgid "Display GIS Visualization"
+msgstr "GIS-Darstellung anzeigen"
+
+#: templates/table/gis_visualization/gis_visualization.phtml:8
+msgid "Label column"
+msgstr "Spaltenbeschriftung"
+
+#: templates/table/gis_visualization/gis_visualization.phtml:11
+msgid "-- None --"
+msgstr "-- Kein --"
+
+#: templates/table/gis_visualization/gis_visualization.phtml:19
+msgid "Spatial column"
+msgstr "Räumliche Spalte"
+
+#: templates/table/index_form.phtml:16
+msgid "Index name:"
+msgstr "Indexname:"
+
+#: templates/table/index_form.phtml:19
+msgid ""
+"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
+msgstr ""
+"Nur der Name des Primärschlüssels <b>darf</b> und <b>muss</b> \"PRIMARY\" "
+"lauten!"
+
+#: templates/table/index_form.phtml:40
+msgid "Index choice:"
+msgstr "Index Auswahl:"
+
+#: templates/table/index_form.phtml:57
+msgid "Key block size:"
+msgstr "Schlüsselblockgröße:"
+
+#: templates/table/index_form.phtml:74
+msgid "Index type:"
+msgstr "Indextyp:"
+
+#: templates/table/index_form.phtml:86
+msgid "Parser:"
+msgstr "Parser:"
+
+#: templates/table/index_form.phtml:102
+msgid "Comment:"
+msgstr "Kommentar:"
+
+#: templates/table/index_form.phtml:149 templates/table/index_form.phtml:190
+msgid "Drag to reorder"
+msgstr "Zur Umsortierung ziehen"
+
+#: templates/table/relation/common_form.phtml:7
 msgid "Internal relations"
 msgstr "Interne Beziehungen"
 
-#: templates/tbl_relation/common_form.phtml:11
+#: templates/table/relation/common_form.phtml:11
 msgid "Internal relation"
 msgstr "Interne Beziehung"
 
-#: templates/tbl_relation/common_form.phtml:14
+#: templates/table/relation/common_form.phtml:14
 msgid ""
 "An internal relation is not necessary when a corresponding FOREIGN KEY "
 "relation exists."
@@ -15717,50 +15566,226 @@ msgstr ""
 "Eine interne Beziehung ist nicht notwendig, wenn eine entsprechende "
 "Fremdschlüssel-Beziehung existiert."
 
-#: templates/tbl_relation/common_form.phtml:37
+#: templates/table/relation/common_form.phtml:37
 msgid "Foreign key constraints"
 msgstr "Beschränkungen durch Fremdschlüssel"
 
-#: templates/tbl_relation/common_form.phtml:40
+#: templates/table/relation/common_form.phtml:40
 msgid "Actions"
 msgstr "Aktionen"
 
-#: templates/tbl_relation/common_form.phtml:41
+#: templates/table/relation/common_form.phtml:41
 msgid "Constraint properties"
 msgstr "Constrainteigenschaften"
 
-#: templates/tbl_relation/common_form.phtml:44
+#: templates/table/relation/common_form.phtml:44
 msgid ""
 "Only columns with index will be displayed. You can define an index below."
 msgstr ""
 "Nur Spalten mit Index werden angezeigt. Sie können einen Index unten "
 "definieren."
 
-#: templates/tbl_relation/common_form.phtml:49
+#: templates/table/relation/common_form.phtml:49
 msgid "Foreign key constraint"
 msgstr "Beschränkung für auswärtige Schlüssel"
 
-#: templates/tbl_relation/common_form.phtml:81
+#: templates/table/relation/common_form.phtml:81
 msgid "+ Add constraint"
 msgstr "+ Constraint hinzufügen"
 
-#: templates/tbl_relation/common_form.phtml:91
+#: templates/table/relation/common_form.phtml:91
 msgid "Choose column to display:"
 msgstr "Anzuzeigende Spalte auswählen:"
 
-#: templates/tbl_relation/foreign_key_row.phtml:13
+#: templates/table/relation/foreign_key_row.phtml:13
 #, php-format
 msgid "Foreign key constraint %s has been dropped"
 msgstr "Die Fremdschlüssel-Beschränkung %s wurde aufgehoben"
 
-#: templates/tbl_relation/foreign_key_row.phtml:102
+#: templates/table/relation/foreign_key_row.phtml:102
 msgid "Constraint name"
 msgstr "Constraint-Name"
 
-#: templates/tbl_relation/foreign_key_row.phtml:157
+#: templates/table/relation/foreign_key_row.phtml:157
 msgid "+ Add column"
 msgstr "+ Spalte hinzufügen"
 
+#: templates/table/search/options.phtml:8
+msgid "Select columns (at least one):"
+msgstr "Spalten auswählen (min. eines):"
+
+#: templates/table/search/options.phtml:37
+msgid "Add search conditions (body of the \"where\" clause):"
+msgstr "Eigenes Filterkriterium (Argumente für den \"WHERE\"-Ausdruck):"
+
+#: templates/table/search/options.phtml:45
+msgid "Number of rows per page"
+msgstr "Einträge pro Seite"
+
+#: templates/table/search/options.phtml:56
+msgid "Display order:"
+msgstr "Sortierung nach:"
+
+#: templates/table/search/options_zoom.phtml:6
+msgid "Use this column to label each point"
+msgstr "Diese Spalte verwenden, um jeden Punkt zu benennen"
+
+#: templates/table/search/options_zoom.phtml:35
+msgid "Maximum rows to plot"
+msgstr "Maximale Anzahl der darzustellenden Datensätze"
+
+#: templates/table/search/replace_preview.phtml:13
+msgid "Find and replace - preview"
+msgstr "Suchen und Ersetzen – Vorschau"
+
+#: templates/table/search/replace_preview.phtml:18
+msgid "Original string"
+msgstr "Ursprungstext"
+
+#: templates/table/search/replace_preview.phtml:19
+msgid "Replaced string"
+msgstr "ersetzter Text"
+
+#: templates/table/search/replace_preview.phtml:40
+msgid "Replace"
+msgstr "Ersetzen"
+
+#: templates/table/search/rows_zoom.phtml:16
+msgid "Additional search criteria"
+msgstr "Zusätzliche Suchkriterien"
+
+#: templates/table/search/search_and_replace.phtml:3
+msgid "Replace with:"
+msgstr "Ersetze durch:"
+
+#: templates/table/search/search_and_replace.phtml:22
+msgid "Use regular expression"
+msgstr "Regulären Ausdruck benutzen"
+
+#: templates/table/search/selection_form.phtml:12
+msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
+msgstr ""
+"Suche über Beispielwerte (\"query by example\") (Platzhalter: \"%\") für "
+"zwei unterschiedliche Spalten"
+
+#: templates/table/search/selection_form.phtml:34
+msgid "Do a \"query by example\" (wildcard: \"%\")"
+msgstr "Suche über Beispielwerte (\"query by example\") (Platzhalter: \"%\")"
+
+#: templates/table/search/zoom_result_form.phtml:7
+msgid "Browse/Edit the points"
+msgstr "Punkte anzeigen/bearbeiten"
+
+#: templates/table/search/zoom_result_form.phtml:15
+msgid "How to use"
+msgstr "Anleitung"
+
+#: templates/table/search/zoom_result_form.phtml:23
+msgid "Reset zoom"
+msgstr "Zoom zurücksetzen"
+
+#: templates/table/secondary_tabs.phtml:14
+msgid "Relation view"
+msgstr "Beziehungsansicht"
+
+#: templates/table/structure/actions_in_table_structure.phtml:14
+#, php-format
+msgid "A primary key has been added on %s."
+msgstr "Ein Primärschlüssel wurde in %s erzeugt."
+
+#: templates/table/structure/actions_in_table_structure.phtml:34
+#: templates/table/structure/actions_in_table_structure.phtml:54
+#: templates/table/structure/actions_in_table_structure.phtml:79
+#: templates/table/structure/actions_in_table_structure.phtml:101
+#, php-format
+msgid "An index has been added on %s."
+msgstr "Ein Index wurde in %s erzeugt."
+
+#: templates/table/structure/actions_in_table_structure.phtml:130
+#: templates/table/structure/check_all_table_column.phtml:59
+msgid "Remove from central columns"
+msgstr "Zentrale Spalten entfernen"
+
+#: templates/table/structure/actions_in_table_structure.phtml:138
+#: templates/table/structure/check_all_table_column.phtml:55
+msgid "Add to central columns"
+msgstr "Zu zentralen Spalten hinzufügen"
+
+#: templates/table/structure/add_column.phtml:7
+#, php-format
+msgid "Add %s column(s)"
+msgstr "%s Spalte(n) einfügen"
+
+#: templates/table/structure/add_column.phtml:12
+msgid "at beginning of table"
+msgstr "am Tabellenanfang"
+
+#: templates/table/structure/display_structure.phtml:140 view_create.php:181
+msgid "Edit view"
+msgstr "View/Ansicht bearbeiten"
+
+#: templates/table/structure/display_table_stats.phtml:9
+msgid "Space usage"
+msgstr "Speicherplatzverbrauch"
+
+#: templates/table/structure/display_table_stats.phtml:32
+msgid "Effective"
+msgstr "Effektiv"
+
+#: templates/table/structure/move_columns_dialog.phtml:1
+#: templates/table/structure/optional_action_links.phtml:21
+msgid "Move columns"
+msgstr "Spalten verschieben"
+
+#: templates/table/structure/move_columns_dialog.phtml:2
+msgid "Move the columns by dragging them up and down."
+msgstr "Verschieben Sie die Spalten, indem Sie sie nach oben und unten ziehen."
+
+#: templates/table/structure/optional_action_links.phtml:9
+msgid "Propose table structure"
+msgstr "Tabellenstruktur analysieren"
+
+#: templates/table/structure/optional_action_links.phtml:24
+msgid "Improve table structure"
+msgstr "Tabellenstruktur verbessern"
+
+#: templates/table/structure/optional_action_links.phtml:30
+msgid "Track view"
+msgstr "Verfolge Ansicht"
+
+#: templates/table/structure/row_stats_table.phtml:3
+msgid "Row statistics"
+msgstr "Datensatz-Statistiken"
+
+#: templates/table/structure/row_stats_table.phtml:9
+msgid "static"
+msgstr "statisch"
+
+#: templates/table/structure/row_stats_table.phtml:11
+msgid "dynamic"
+msgstr "dynamisch"
+
+#: templates/table/structure/row_stats_table.phtml:22
+msgid "partitioned"
+msgstr "partitioniert"
+
+#: templates/table/structure/row_stats_table.phtml:54
+msgid "Row length"
+msgstr "Zeilenlänge"
+
+#: templates/table/structure/row_stats_table.phtml:66
+msgid "Row size"
+msgstr "Zeilengröße"
+
+#: templates/table/structure/row_stats_table.phtml:73
+msgid "Next autoindex"
+msgstr "Nächster Autoindex"
+
+#: templates/table/structure/table_structure_row.phtml:46
+#, php-format
+msgid "Column %s has been dropped."
+msgstr "Spalte %s wurde gelöscht."
+
 #: themes.php:17 themes.php:22
 msgid "Theme"
 msgstr "Oberflächendesign"
@@ -17127,6 +17152,9 @@ msgstr ""
 msgid "concurrent_insert is set to 0"
 msgstr "concurrent_insert ist auf 0 gesetzt"
 
+#~ msgid "Read as multibytes"
+#~ msgstr "Als Multibyte lesen"
+
 #~ msgid "Relational display column"
 #~ msgstr "Relationale Anzeigespalte"
 
diff --git a/po/el.po b/po/el.po
index c23829b27e..8b42d28082 100644
--- a/po/el.po
+++ b/po/el.po
@@ -3,8 +3,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 4.5.0-dev\n"
 "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
-"POT-Creation-Date: 2015-08-08 13:53-0400\n"
-"PO-Revision-Date: 2015-08-10 12:21+0200\n"
+"POT-Creation-Date: 2015-08-12 08:10-0400\n"
+"PO-Revision-Date: 2015-08-12 21:31+0200\n"
 "Last-Translator: Παναγιώτης Παπάζογλου <papaz_p@yahoo.com>\n"
 "Language-Team: Greek "
 "<https://hosted.weblate.org/projects/phpmyadmin/master/el/>\n"
@@ -53,7 +53,7 @@ msgid "Table comments:"
 msgstr "Σχόλια πίνακα:"
 
 #: db_datadict.php:104 libraries/Index.class.php:699
-#: libraries/insert_edit.lib.php:1567
+#: libraries/insert_edit.lib.php:1565
 #: libraries/navigation/Nodes/Node_Column.class.php:30
 #: libraries/plugins/export/ExportHtmlword.class.php:280
 #: libraries/plugins/export/ExportHtmlword.class.php:375
@@ -67,13 +67,14 @@ msgstr "Σχόλια πίνακα:"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1023
 #: libraries/tracking.lib.php:879 libraries/tracking.lib.php:975
 #: templates/columns_definitions/column_name.phtml:18
-#: templates/index_form.phtml:124 templates/table/table_header.phtml:6
-#: templates/table/zoom_result_form.phtml:33
-#: templates/tbl_relation/common_form.phtml:10
-#: templates/tbl_relation/common_form.phtml:43
-#: templates/tbl_relation/foreign_key_row.phtml:194
-#: templates/tbl_relation/foreign_key_row.phtml:206
-#: templates/tbl_relation/internal_relational_row.phtml:71
+#: templates/table/index_form.phtml:124
+#: templates/table/relation/common_form.phtml:10
+#: templates/table/relation/common_form.phtml:43
+#: templates/table/relation/foreign_key_row.phtml:194
+#: templates/table/relation/foreign_key_row.phtml:206
+#: templates/table/relation/internal_relational_row.phtml:71
+#: templates/table/search/table_header.phtml:6
+#: templates/table/search/zoom_result_form.phtml:33
 msgid "Column"
 msgstr "Στήλη"
 
@@ -91,21 +92,21 @@ msgstr "Στήλη"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1001
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1024
 #: libraries/rte/rte_list.lib.php:75 libraries/rte/rte_list.lib.php:103
-#: libraries/rte/rte_routines.lib.php:802
-#: libraries/rte/rte_routines.lib.php:831
-#: libraries/rte/rte_routines.lib.php:1493
+#: libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_routines.lib.php:922
+#: libraries/rte/rte_routines.lib.php:1584
 #: libraries/server_privileges.lib.php:2369 libraries/tracking.lib.php:880
 #: libraries/tracking.lib.php:972
 #: templates/columns_definitions/table_fields_definitions.phtml:11
-#: templates/structure/table_header.phtml:48
-#: templates/structure/table_structure_header.phtml:6
-#: templates/table/table_header.phtml:7
+#: templates/database/structure/table_header.phtml:48
+#: templates/table/search/table_header.phtml:7
+#: templates/table/structure/table_structure_header.phtml:6
 msgid "Type"
 msgstr "Τύπος"
 
 #: db_datadict.php:106 libraries/Index.class.php:702
 #: libraries/central_columns.lib.php:708
-#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1576
+#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1574
 #: libraries/plugins/export/ExportHtmlword.class.php:286
 #: libraries/plugins/export/ExportHtmlword.class.php:381
 #: libraries/plugins/export/ExportLatex.class.php:509
@@ -118,8 +119,8 @@ msgstr "Τύπος"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1026
 #: libraries/tracking.lib.php:882 libraries/tracking.lib.php:978
 #: templates/columns_definitions/table_fields_definitions.phtml:39
-#: templates/structure/table_structure_header.phtml:9
-#: templates/table/zoom_result_form.phtml:34
+#: templates/table/search/zoom_result_form.phtml:34
+#: templates/table/structure/table_structure_header.phtml:9
 msgid "Null"
 msgstr "Κενό"
 
@@ -137,8 +138,8 @@ msgstr "Κενό"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1027
 #: libraries/replication_gui.lib.php:153 libraries/tracking.lib.php:883
 #: templates/columns_definitions/table_fields_definitions.phtml:25
-#: templates/structure/body_for_table_summary.phtml:55
-#: templates/structure/table_structure_header.phtml:10
+#: templates/database/structure/body_for_table_summary.phtml:55
+#: templates/table/structure/table_structure_header.phtml:10
 msgid "Default"
 msgstr "Προεπιλογή"
 
@@ -166,19 +167,19 @@ msgid "Comments"
 msgstr "Σχόλια"
 
 #: db_datadict.php:146
-#: libraries/controllers/StructureController.class.php:1960
-#: libraries/controllers/StructureController.class.php:1965
+#: libraries/controllers/TableStructureController.class.php:951
+#: libraries/controllers/TableStructureController.class.php:956
 #: libraries/tracking.lib.php:922
 #: templates/columns_definitions/column_indexes.phtml:6
-#: templates/structure/check_all_table_column.phtml:22
-#: templates/structure/display_structure.phtml:74
+#: templates/table/structure/check_all_table_column.phtml:22
+#: templates/table/structure/display_structure.phtml:74
 msgid "Primary"
 msgstr "Πρωτεύον"
 
 #: db_datadict.php:156 js/messages.php:317 libraries/Index.class.php:567
 #: libraries/Index.class.php:606 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261 libraries/mult_submits.lib.php:403
+#: libraries/config/FormDisplay.tpl.php:272 libraries/mult_submits.lib.php:403
 #: libraries/mult_submits.lib.php:417
 #: libraries/plugins/export/ExportHtmlword.class.php:630
 #: libraries/plugins/export/ExportLatex.class.php:589
@@ -194,20 +195,20 @@ msgstr "Πρωτεύον"
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1010 libraries/tracking.lib.php:1015
 #: prefs_manage.php:140 templates/prefs_autoload.phtml:15
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "No"
 msgstr "Όχι"
 
 #: db_datadict.php:156 js/messages.php:443 libraries/Index.class.php:568
 #: libraries/Index.class.php:605 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261
-#: libraries/controllers/StructureController.class.php:1344
-#: libraries/controllers/StructureController.class.php:2223
-#: libraries/controllers/StructureController.class.php:2232
-#: libraries/controllers/StructureController.class.php:2237
-#: libraries/controllers/StructureController.class.php:2242
-#: libraries/controllers/StructureController.class.php:2247
+#: libraries/config/FormDisplay.tpl.php:272
+#: libraries/controllers/TableStructureController.class.php:539
+#: libraries/controllers/TableStructureController.class.php:1201
+#: libraries/controllers/TableStructureController.class.php:1210
+#: libraries/controllers/TableStructureController.class.php:1215
+#: libraries/controllers/TableStructureController.class.php:1220
+#: libraries/controllers/TableStructureController.class.php:1225
 #: libraries/mult_submits.inc.php:82 libraries/mult_submits.inc.php:178
 #: libraries/mult_submits.lib.php:339 libraries/mult_submits.lib.php:372
 #: libraries/mult_submits.lib.php:401 libraries/mult_submits.lib.php:415
@@ -216,8 +217,8 @@ msgstr "Όχι"
 #: libraries/plugins/export/ExportOdt.class.php:756
 #: libraries/plugins/export/ExportTexytext.class.php:567
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1077
-#: libraries/server_databases.lib.php:464
-#: libraries/server_databases.lib.php:474
+#: libraries/server_databases.lib.php:475
+#: libraries/server_databases.lib.php:485
 #: libraries/server_privileges.lib.php:2546
 #: libraries/server_privileges.lib.php:2727
 #: libraries/server_privileges.lib.php:2748
@@ -227,7 +228,7 @@ msgstr "Όχι"
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1008 libraries/tracking.lib.php:1013
 #: prefs_manage.php:138 templates/prefs_autoload.phtml:14
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "Yes"
 msgstr "Ναι"
 
@@ -237,7 +238,7 @@ msgstr "Εμφάνιση σκαριφήματος (σχήματος) της βά
 
 #: db_export.php:37 db_tracking.php:90 export.php:382
 #: libraries/DBQbe.class.php:326
-#: libraries/controllers/StructureController.class.php:231
+#: libraries/controllers/DatabaseStructureController.class.php:170
 #: libraries/navigation/NavigationTree.class.php:897
 msgid "No tables found in database."
 msgstr "Δεν βρέθηκαν πίνακες στη βάση δεδομένων."
@@ -248,14 +249,14 @@ msgstr "Δεν βρέθηκαν πίνακες στη βάση δεδομένω
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:26
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:120
-#: templates/structure/show_create.phtml:18
+#: templates/database/structure/show_create.phtml:18
 msgid "Tables"
 msgstr "Πίνακες"
 
 #: db_export.php:52 libraries/Menu.class.php:317 libraries/Menu.class.php:425
-#: libraries/Util.class.php:3333 libraries/Util.class.php:3343
-#: libraries/Util.class.php:3349 libraries/Util.class.php:3629
-#: libraries/Util.class.php:4327 libraries/Util.class.php:4344
+#: libraries/Util.class.php:3339 libraries/Util.class.php:3349
+#: libraries/Util.class.php:3355 libraries/Util.class.php:3635
+#: libraries/Util.class.php:4333 libraries/Util.class.php:4350
 #: libraries/central_columns.lib.php:728 libraries/config.values.php:39
 #: libraries/config.values.php:47 libraries/config.values.php:109
 #: libraries/config.values.php:115 libraries/config/setup.forms.php:323
@@ -269,7 +270,7 @@ msgstr "Πίνακες"
 #: libraries/navigation/Nodes/Node_Table.class.php:283
 #: libraries/server_privileges.lib.php:1141 libraries/tracking.lib.php:874
 #: templates/columns_definitions/table_fields_definitions.phtml:3
-#: templates/designer/table_list.phtml:28
+#: templates/database/designer/table_list.phtml:28
 msgid "Structure"
 msgstr "Δομή"
 
@@ -281,7 +282,7 @@ msgstr "Δομή"
 #: libraries/config/user_preferences.forms.php:292
 #: libraries/config/user_preferences.forms.php:297
 #: libraries/server_privileges.lib.php:1140
-#: templates/structure/display_table_stats.phtml:12
+#: templates/table/structure/display_table_stats.phtml:12
 msgid "Data"
 msgstr "Δεδομένα"
 
@@ -355,10 +356,10 @@ msgstr "Παρακολουθούμενοι πίνακες"
 #: libraries/server_privileges.lib.php:2908
 #: libraries/server_privileges.lib.php:3145
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4346
-#: templates/structure/table_header.phtml:21
-#: templates/tbl_relation/foreign_key_row.phtml:176
-#: templates/tbl_relation/internal_relational_row.phtml:63
+#: libraries/server_privileges.lib.php:4372
+#: templates/database/structure/table_header.phtml:21
+#: templates/table/relation/foreign_key_row.phtml:176
+#: templates/table/relation/internal_relational_row.phtml:63
 msgid "Table"
 msgstr "Πίνακας"
 
@@ -375,7 +376,7 @@ msgid "Updated"
 msgstr "Ενημερώθηκε"
 
 #: db_tracking.php:130 js/messages.php:243 libraries/Menu.class.php:552
-#: libraries/Util.class.php:4314 libraries/config.values.php:104
+#: libraries/Util.class.php:4320 libraries/config.values.php:104
 #: libraries/rte/rte_events.lib.php:393 libraries/rte/rte_list.lib.php:101
 #: libraries/server_status_processes.lib.php:92 libraries/tracking.lib.php:279
 msgid "Status"
@@ -384,14 +385,15 @@ msgstr "Κατάσταση"
 #: db_tracking.php:131 db_tracking.php:290 libraries/Index.class.php:693
 #: libraries/central_columns.lib.php:687 libraries/rte/rte_list.lib.php:74
 #: libraries/rte/rte_list.lib.php:89 libraries/rte/rte_list.lib.php:102
-#: libraries/server_databases.lib.php:398
+#: libraries/server_databases.lib.php:409
 #: libraries/server_privileges.lib.php:2372
 #: libraries/server_privileges.lib.php:3166
 #: libraries/server_privileges.lib.php:3342
 #: libraries/server_user_groups.lib.php:82
 #: libraries/server_variables.lib.php:189 libraries/tracking.lib.php:280
-#: libraries/tracking.lib.php:793 templates/structure/table_header.phtml:30
-#: templates/structure/table_structure_header.phtml:23
+#: libraries/tracking.lib.php:793
+#: templates/database/structure/table_header.phtml:30
+#: templates/table/structure/table_structure_header.phtml:23
 msgid "Action"
 msgstr "Ενέργεια"
 
@@ -433,7 +435,7 @@ msgid "Untracked tables"
 msgstr "Μη παρακολουθούμενοι πίνακες"
 
 #: db_tracking.php:305 db_tracking.php:336
-#: templates/structure/optional_action_links.phtml:17
+#: templates/table/structure/optional_action_links.phtml:17
 msgid "Track table"
 msgstr "Προβολή παρακολούθησης πίνακα"
 
@@ -489,7 +491,7 @@ msgid "Value for the column \"%s\""
 msgstr "Τιμή για τη στήλη «%s»"
 
 #: gis_data_editor.php:146
-#: templates/gis_visualization/gis_visualization.phtml:37
+#: templates/table/gis_visualization/gis_visualization.phtml:37
 msgid "Use OpenStreetMaps as Base Layer"
 msgstr "Χρήση του OpenStreetMaps ως Βασικό Επίπεδο"
 
@@ -569,35 +571,35 @@ msgstr "Προσθήκη γεωμετρίας"
 #: libraries/display_change_password.lib.php:162
 #: libraries/display_export.lib.php:402 libraries/display_export.lib.php:408
 #: libraries/display_import.lib.php:392 libraries/index.lib.php:44
-#: libraries/insert_edit.lib.php:1546 libraries/insert_edit.lib.php:1583
+#: libraries/insert_edit.lib.php:1544 libraries/insert_edit.lib.php:1581
 #: libraries/normalization.lib.php:165 libraries/normalization.lib.php:821
 #: libraries/operations.lib.php:38 libraries/operations.lib.php:108
 #: libraries/operations.lib.php:263 libraries/operations.lib.php:306
 #: libraries/operations.lib.php:801 libraries/operations.lib.php:874
 #: libraries/operations.lib.php:923 libraries/operations.lib.php:1337
 #: libraries/operations.lib.php:1658
-#: libraries/plugins/auth/AuthenticationCookie.class.php:244
+#: libraries/plugins/auth/AuthenticationCookie.class.php:232
 #: libraries/replication_gui.lib.php:122 libraries/replication_gui.lib.php:161
 #: libraries/replication_gui.lib.php:324 libraries/replication_gui.lib.php:461
 #: libraries/replication_gui.lib.php:906 libraries/rte/rte_events.lib.php:509
-#: libraries/rte/rte_routines.lib.php:969
-#: libraries/rte/rte_routines.lib.php:1581
+#: libraries/rte/rte_routines.lib.php:1060
+#: libraries/rte/rte_routines.lib.php:1672
 #: libraries/rte/rte_triggers.lib.php:396 libraries/server_bin_log.lib.php:61
 #: libraries/server_privileges.lib.php:705
 #: libraries/server_privileges.lib.php:2106
 #: libraries/server_privileges.lib.php:2872
 #: libraries/server_privileges.lib.php:3553
-#: libraries/server_privileges.lib.php:4627
+#: libraries/server_privileges.lib.php:4653
 #: libraries/server_user_groups.lib.php:285
 #: libraries/sql_query_form.lib.php:369 libraries/sql_query_form.lib.php:429
 #: libraries/tracking.lib.php:533 libraries/tracking.lib.php:653
 #: prefs_manage.php:277 prefs_manage.php:355
 #: templates/columns_definitions/column_definitions_form.phtml:59
-#: templates/header_location.phtml:17 templates/index_form.phtml:238
+#: templates/database/create_table.phtml:21 templates/header_location.phtml:28
 #: templates/startAndNumberOfRowsPanel.phtml:14
-#: templates/structure/add_column.phtml:25
-#: templates/table/create_table.phtml:21
-#: templates/table/selection_form.phtml:75 view_create.php:275
+#: templates/table/index_form.phtml:238
+#: templates/table/search/selection_form.phtml:75
+#: templates/table/structure/add_column.phtml:25 view_create.php:275
 #: view_operations.php:106
 msgid "Go"
 msgstr "Εκτέλεση"
@@ -691,7 +693,7 @@ msgid "Could not load import plugins, please check your installation!"
 msgstr ""
 "Αδύνατη η φόρτωση προσθέτων εισαγωγής, για αυτό ελέξτε την εγκατάστασή σας!"
 
-#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1466
+#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1460
 #, php-format
 msgid "Bookmark %s has been created."
 msgstr "Ο σελιδοδείκτης %s έχει δημιουργηθεί."
@@ -730,11 +732,11 @@ msgstr "Αδύνατη η φόρτωση της διαδικασίας της ε
 msgid "Back"
 msgstr "Επιστροφή"
 
-#: index.php:148 libraries/Footer.class.php:70
+#: index.php:149 libraries/Footer.class.php:70
 msgid "phpMyAdmin Demo Server"
 msgstr "Διακομιστής Δοκιμών phpMyAdmin"
 
-#: index.php:152
+#: index.php:153
 #, php-format
 msgid ""
 "You are using the demo server. You can do anything here, but please do not "
@@ -745,110 +747,110 @@ msgstr ""
 "αλλά μην αλλάξετε τους χρήστες root, debian-sys-maint και pma. Περισσότερες "
 "πληροφορίες είναι διαθέσιμες στο %s."
 
-#: index.php:162
+#: index.php:163
 msgid "General Settings"
 msgstr "Γενικές Ρυθμίσεις"
 
-#: index.php:190 libraries/display_change_password.lib.php:50
+#: index.php:191 libraries/display_change_password.lib.php:50
 #: libraries/display_change_password.lib.php:53 user_password.php:247
 msgid "Change password"
 msgstr "Αλλαγή κωδικού πρόσβασης"
 
-#: index.php:206
+#: index.php:207
 msgid "Server connection collation"
 msgstr "Σύνθεση σύνδεσης διακομιστή"
 
-#: index.php:228
+#: index.php:229
 msgid "Appearance Settings"
 msgstr "Ρυθμίσεις εμφάνισης"
 
-#: index.php:258 prefs_manage.php:285
+#: index.php:259 prefs_manage.php:285
 msgid "More settings"
 msgstr "Περισσότερες ρυθμίσεις"
 
-#: index.php:279
+#: index.php:280
 msgid "Database server"
 msgstr "Διακομιστής βάσης δεδομένων"
 
-#: index.php:282 libraries/plugins/auth/AuthenticationCookie.class.php:181
+#: index.php:283 libraries/plugins/auth/AuthenticationCookie.class.php:169
 msgid "Server:"
 msgstr "Διακομιστής:"
 
-#: index.php:286
+#: index.php:287
 msgid "Server type:"
 msgstr "Τύπος διακομιστή:"
 
-#: index.php:290 libraries/plugins/export/ExportLatex.class.php:212
+#: index.php:291 libraries/plugins/export/ExportLatex.class.php:212
 #: libraries/plugins/export/ExportSql.class.php:687
 #: libraries/plugins/export/ExportXml.class.php:189
 msgid "Server version:"
 msgstr "Έκδοση διακομιστή:"
 
-#: index.php:296
+#: index.php:297
 msgid "Protocol version:"
 msgstr "Έκδοση πρωτοκόλλου:"
 
-#: index.php:300
+#: index.php:301
 msgid "User:"
 msgstr "Χρήστης:"
 
-#: index.php:305
+#: index.php:306
 msgid "Server charset:"
 msgstr "Κωδικοποιήση διακομιστή:"
 
-#: index.php:320
+#: index.php:321
 msgid "Web server"
 msgstr "Διακομιστής ιστού"
 
-#: index.php:331
+#: index.php:332
 msgid "Database client version:"
 msgstr "Έκδοση πελάτη βάσης δεδομένων:"
 
-#: index.php:335
+#: index.php:336
 msgid "PHP extension:"
 msgstr "Επέκταση PHP:"
 
-#: index.php:349
+#: index.php:350
 msgid "PHP version:"
 msgstr "Έκδοση PHP:"
 
-#: index.php:360
+#: index.php:361
 msgid "Show PHP information"
 msgstr "Εμφάνιση πληροφοριών της PHP"
 
-#: index.php:383
+#: index.php:384
 msgid "Version information:"
 msgstr "Πληροφορίες έκδοσης:"
 
-#: index.php:392 libraries/Util.class.php:432 libraries/Util.class.php:495
-#: libraries/config/FormDisplay.tpl.php:151
+#: index.php:393 libraries/Util.class.php:432 libraries/Util.class.php:495
+#: libraries/config/FormDisplay.tpl.php:162
 #: libraries/display_export.lib.php:577 libraries/engines/pbxt.lib.php:162
 #: libraries/navigation/NavigationHeader.class.php:196
 #: libraries/server_variables.lib.php:160
 msgid "Documentation"
 msgstr "Τεκμηρίωση"
 
-#: index.php:399
+#: index.php:400
 msgid "Wiki"
 msgstr "Wiki"
 
-#: index.php:408
+#: index.php:409
 msgid "Official Homepage"
 msgstr "Επίσημη σελίδα του phpMyAdmin"
 
-#: index.php:415
+#: index.php:416
 msgid "Contribute"
 msgstr "Συνεισφορά"
 
-#: index.php:422
+#: index.php:423
 msgid "Get support"
 msgstr "Υποστήριξη"
 
-#: index.php:429
+#: index.php:430
 msgid "List of changes"
 msgstr "Λίστα αλλαγών"
 
-#: index.php:451
+#: index.php:452
 msgid ""
 "You are connected as 'root' with no password, which corresponds to the "
 "default MySQL privileged account. Your MySQL server is running with this "
@@ -860,7 +862,7 @@ msgstr ""
 "αυτή τη ρύθμιση, είναι ανοιχτός σε επιθέσεις και θα πρέπει να διορθώσετε το "
 "πρόβλημα εισάγωντας κωδικό πρόσβασης για το χρήστη «root»."
 
-#: index.php:468
+#: index.php:469
 msgid ""
 "You have enabled mbstring.func_overload in your PHP configuration. This "
 "option is incompatible with phpMyAdmin and might cause some data to be "
@@ -870,7 +872,7 @@ msgstr ""
 "επιλογή είναι ασύμβατη με το phpMyAdmin και ίσως προκαλέσει πρόβλημα με "
 "μερικά δεδομένα!"
 
-#: index.php:483
+#: index.php:484
 msgid ""
 "The mbstring PHP extension was not found and you seem to be using a "
 "multibyte charset. Without the mbstring extension phpMyAdmin is unable to "
@@ -881,7 +883,7 @@ msgstr ""
 "μπορεί να χωρίσει συμβολοσειρές σωστά και ίσως προκύψουν μη αναμενόμενα "
 "αποτελέσματα."
 
-#: index.php:500
+#: index.php:501
 msgid ""
 "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini."
 "session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower than "
@@ -893,7 +895,7 @@ msgstr ""
 "την ρυθμισμένη εγκυρότητα cookie στο phpMyAdmin. Εξαιτίας αυτού, η σύνδεσή "
 "σας ίσως λήξει νωρίτερα από ό,τι ρυθμίστηκε στο phpMyAdmin."
 
-#: index.php:519
+#: index.php:520
 msgid ""
 "Login cookie store is lower than cookie validity configured in phpMyAdmin, "
 "because of this, your login will expire sooner than configured in phpMyAdmin."
@@ -902,13 +904,13 @@ msgstr ""
 "που ορίστηκε στο phpMyAdmin, για αυτό, η σύνδεσή σας θα λήξει συντομότερα "
 "από τη ρύθμιση του phpMyAdmin."
 
-#: index.php:535
+#: index.php:536
 msgid "The configuration file now needs a secret passphrase (blowfish_secret)."
 msgstr ""
 "Το αρχείο ρυθμίσεων χρειάζεται τώρα μία μυστική φράση-κλειδί "
 "(blowfish_secret)."
 
-#: index.php:548
+#: index.php:549
 msgid ""
 "Directory [code]config[/code], which is used by the setup script, still "
 "exists in your phpMyAdmin directory. It is strongly recommended to remove it "
@@ -921,7 +923,7 @@ msgstr ""
 "του διακομιστή σας μπορεί να προσβηθεί από μη αδειοδοτημένους χρήστες που "
 "μπορούν να λάβουν τη ρύθμισή σας."
 
-#: index.php:564
+#: index.php:565
 #, php-format
 msgid ""
 "The phpMyAdmin configuration storage is not completely configured, some "
@@ -930,14 +932,14 @@ msgstr ""
 "Η αποθήκευση ρυθμίσεων του phpMyAdmin δεν έχει ρυθμιστεί πλήρως. Μερικά "
 "εκτεταμένα χαρακτηριστικά έχουν απενεργοποιηθεί. %sΜάθετε γιατί%s. "
 
-#: index.php:571
+#: index.php:572
 msgid ""
 "Or alternately go to 'Operations' tab of any database to set it up there."
 msgstr ""
 "Ή εναλλακτικά μεταβείτε στην καρτέλα «Λειτουργίες» οποιασδήποτε βάσης "
 "δεδομένων για να το ορίσετε εκεί."
 
-#: index.php:620
+#: index.php:621
 #, php-format
 msgid ""
 "Your PHP MySQL library version %s differs from your MySQL server version %s. "
@@ -946,7 +948,7 @@ msgstr ""
 "Η έκδοση της βιβλιοθήκης PHP MySQL %s διαφέρει από την έκδοση του διακομιστή "
 "MySQL %s. Αυτό ίσως έχει μη προβλέψιμα αποτελέσματα."
 
-#: index.php:648
+#: index.php:649
 #, php-format
 msgid ""
 "Server running with Suhosin. Please refer to %sdocumentation%s for possible "
@@ -1108,8 +1110,8 @@ msgstr ""
 msgid "Save & Close"
 msgstr "Αποθήκευση & Κλείσιμο"
 
-#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:404
-#: libraries/insert_edit.lib.php:1550 prefs_manage.php:361
+#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:415
+#: libraries/insert_edit.lib.php:1548 prefs_manage.php:361
 #: prefs_manage.php:372
 msgid "Reset"
 msgstr "Επαναφορά"
@@ -1142,7 +1144,7 @@ msgstr "Προσθήκη Ευρετηρίου"
 msgid "Edit Index"
 msgstr "Επεξεργασία ευρετηρίου"
 
-#: js/messages.php:99 templates/index_form.phtml:232
+#: js/messages.php:99 templates/table/index_form.phtml:232
 #, php-format
 msgid "Add %s column(s) to index"
 msgstr "Προσθήκη %s στήλης(ών) στο ευρετήριο"
@@ -1163,13 +1165,14 @@ msgstr "Σύνθεση με:"
 msgid "Please select column(s) for the index."
 msgstr "Επιλέξτε στήλη(ες) για το ευρετήριο."
 
-#: js/messages.php:106 templates/structure/add_column.phtml:1
+#: js/messages.php:106 templates/table/structure/add_column.phtml:1
 msgid "You have to add at least one column."
 msgstr "Πρέπει να προσθέσετε τουλάχιστον ένα πεδίο."
 
-#: js/messages.php:109 libraries/insert_edit.lib.php:1548
+#: js/messages.php:109 libraries/insert_edit.lib.php:1546
 #: templates/columns_definitions/column_definitions_form.phtml:162
-#: templates/index_form.phtml:237 templates/tbl_relation/common_form.phtml:106
+#: templates/table/index_form.phtml:237
+#: templates/table/relation/common_form.phtml:106
 msgid "Preview SQL"
 msgstr "Προεπισκόπηση SQL"
 
@@ -1186,7 +1189,7 @@ msgid "SQL query:"
 msgstr "Εντολή SQL:"
 
 #. l10n: Default label for the y-Axis of Charts
-#: js/messages.php:118 templates/tbl_chart.phtml:109
+#: js/messages.php:118 templates/table/chart/tbl_chart.phtml:109
 msgid "Y Values"
 msgstr "Τιμές Υ"
 
@@ -1341,7 +1344,7 @@ msgstr "Σταλθέντα Bytes"
 msgid "Bytes received"
 msgstr "Ληφθέντα Bytes"
 
-#: js/messages.php:169 libraries/server_status.lib.php:226
+#: js/messages.php:169 libraries/server_status.lib.php:235
 msgid "Connections"
 msgstr "Συνδέσεις"
 
@@ -1398,12 +1401,12 @@ msgstr "%d πίνακας(ες)"
 msgid "Questions"
 msgstr "Ερωτήσεις"
 
-#: js/messages.php:184 libraries/server_status.lib.php:134
+#: js/messages.php:184 libraries/server_status.lib.php:143
 msgid "Traffic"
 msgstr "Κίνηση"
 
 #: js/messages.php:185 libraries/Menu.class.php:586
-#: libraries/Util.class.php:4318 libraries/server_status_monitor.lib.php:257
+#: libraries/Util.class.php:4324 libraries/server_status_monitor.lib.php:257
 msgid "Settings"
 msgstr "Ρυθμίσεις"
 
@@ -1423,8 +1426,9 @@ msgstr "Εισάγετε τουλάχιστον μια μεταβλητή στι
 #: libraries/server_status_monitor.lib.php:236
 #: libraries/server_status_processes.lib.php:308
 #: templates/columns_definitions/transformation.phtml:4
-#: templates/designer/options_panel.phtml:178
-#: templates/table/options_zoom.phtml:12 templates/table/rows_zoom.phtml:26
+#: templates/database/designer/options_panel.phtml:178
+#: templates/table/search/options_zoom.phtml:12
+#: templates/table/search/rows_zoom.phtml:26
 msgid "None"
 msgstr "Καμία"
 
@@ -1720,8 +1724,8 @@ msgstr ""
 
 #: js/messages.php:270 libraries/Menu.class.php:352
 #: libraries/Menu.class.php:455 libraries/Menu.class.php:582
-#: libraries/Util.class.php:4317 libraries/Util.class.php:4332
-#: libraries/Util.class.php:4349 libraries/config/messages.inc.php:258
+#: libraries/Util.class.php:4323 libraries/Util.class.php:4338
+#: libraries/Util.class.php:4355 libraries/config/messages.inc.php:258
 #: libraries/display_import.lib.php:105
 #: libraries/server_status_monitor.lib.php:318 prefs_manage.php:238
 #: setup/frames/menu.inc.php:26
@@ -1781,13 +1785,13 @@ msgid "Formatting SQL..."
 msgstr "Διαμόρφωση SQL…"
 
 #: js/messages.php:293 libraries/server_variables.lib.php:157
-#: templates/designer/aggregate_query_panel.phtml:63
-#: templates/designer/delete_relation_panel.phtml:28
-#: templates/designer/having_query_panel.phtml:117
-#: templates/designer/new_relation_panel.phtml:88
-#: templates/designer/options_panel.phtml:253
-#: templates/designer/rename_to_panel.phtml:45
-#: templates/designer/where_query_panel.phtml:83
+#: templates/database/designer/aggregate_query_panel.phtml:63
+#: templates/database/designer/delete_relation_panel.phtml:28
+#: templates/database/designer/having_query_panel.phtml:117
+#: templates/database/designer/new_relation_panel.phtml:88
+#: templates/database/designer/options_panel.phtml:253
+#: templates/database/designer/rename_to_panel.phtml:45
+#: templates/database/designer/where_query_panel.phtml:83
 msgid "Cancel"
 msgstr "Άκυρο"
 
@@ -1795,7 +1799,7 @@ msgstr "Άκυρο"
 msgid "Page-related settings"
 msgstr "Ρυθμίσεις σχετισμένες με σελίδα"
 
-#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:402
+#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:413
 msgid "Apply"
 msgstr "Εφαρμογή"
 
@@ -1830,8 +1834,8 @@ msgstr "Κωδικός σφάλματος: %s"
 msgid "Error text: %s"
 msgstr "Κείμενο σφάλματος: %s"
 
-#: js/messages.php:307 libraries/db_common.inc.php:68
-#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:450
+#: js/messages.php:307 libraries/db_common.inc.php:69
+#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:461
 msgid "No databases selected."
 msgstr "Δεν έχετε επιλέξει βάσεις δεδομένων."
 
@@ -1843,12 +1847,13 @@ msgstr "Διαγραφή Στήλης"
 msgid "Adding Primary Key"
 msgstr "Προσθήκη Πρωτεύοντος Κλειδιού"
 
-#: js/messages.php:310 templates/designer/aggregate_query_panel.phtml:59
-#: templates/designer/having_query_panel.phtml:113
-#: templates/designer/new_relation_panel.phtml:87
-#: templates/designer/options_panel.phtml:252
-#: templates/designer/rename_to_panel.phtml:41
-#: templates/designer/where_query_panel.phtml:82
+#: js/messages.php:310
+#: templates/database/designer/aggregate_query_panel.phtml:59
+#: templates/database/designer/having_query_panel.phtml:113
+#: templates/database/designer/new_relation_panel.phtml:87
+#: templates/database/designer/options_panel.phtml:252
+#: templates/database/designer/rename_to_panel.phtml:41
+#: templates/database/designer/where_query_panel.phtml:82
 msgid "OK"
 msgstr "Εντάξει"
 
@@ -1868,7 +1873,7 @@ msgstr "Αντιγραφή βάσης δεδομένων"
 msgid "Changing Charset"
 msgstr "Αλλαγή Συνόλου χαρακτήρων"
 
-#: js/messages.php:320 libraries/Util.class.php:3217
+#: js/messages.php:320 libraries/Util.class.php:3223
 msgid "Enable foreign key checks"
 msgstr "Ενεργοποίηση ελέγχων μη διακριτών κλειδιών"
 
@@ -1904,20 +1909,21 @@ msgstr ""
 #: js/messages.php:334 libraries/DisplayResults.class.php:4834
 #: libraries/DisplayResults.class.php:5092 libraries/Menu.class.php:344
 #: libraries/Menu.class.php:446 libraries/Menu.class.php:578
-#: libraries/Util.class.php:3636 libraries/Util.class.php:3637
-#: libraries/Util.class.php:4316 libraries/Util.class.php:4331
-#: libraries/Util.class.php:4348 libraries/config/messages.inc.php:252
+#: libraries/Util.class.php:3642 libraries/Util.class.php:3643
+#: libraries/Util.class.php:4322 libraries/Util.class.php:4337
+#: libraries/Util.class.php:4354 libraries/config/messages.inc.php:252
 #: libraries/display_export.lib.php:173 libraries/rte/rte_list.lib.php:146
 #: libraries/server_privileges.lib.php:2211
 #: libraries/server_privileges.lib.php:2290
 #: libraries/server_privileges.lib.php:2632
 #: libraries/server_privileges.lib.php:3356
 #: libraries/server_status_monitor.lib.php:322 prefs_manage.php:303
-#: setup/frames/menu.inc.php:27 templates/structure/check_all_tables.phtml:11
+#: setup/frames/menu.inc.php:27
+#: templates/database/structure/check_all_tables.phtml:11
 msgid "Export"
 msgstr "Εξαγωγή"
 
-#: js/messages.php:337 libraries/rte/rte_routines.lib.php:652
+#: js/messages.php:337 libraries/rte/rte_routines.lib.php:743
 msgid "ENUM/SET editor"
 msgstr "Επεξεργαστής ENUM/SET"
 
@@ -1956,7 +1962,7 @@ msgstr "Προβολή παραθύρου ερωτήματος"
 #: libraries/Console.class.php:214 libraries/DisplayResults.class.php:3474
 #: libraries/DisplayResults.class.php:4818 libraries/Index.class.php:723
 #: libraries/Util.class.php:706 libraries/Util.class.php:1202
-#: libraries/Util.class.php:3634 libraries/Util.class.php:3635
+#: libraries/Util.class.php:3640 libraries/Util.class.php:3641
 #: libraries/central_columns.lib.php:851
 #: libraries/central_columns.lib.php:1193
 #: libraries/config/messages.inc.php:892
@@ -1974,7 +1980,7 @@ msgstr "Επεξεργασία"
 #: libraries/server_user_groups.lib.php:129
 #: libraries/sql_query_form.lib.php:416 libraries/tracking.lib.php:477
 #: setup/frames/index.inc.php:183 setup/frames/index.inc.php:291
-#: templates/designer/delete_relation_panel.phtml:27
+#: templates/database/designer/delete_relation_panel.phtml:27
 msgid "Delete"
 msgstr "Διαγραφή"
 
@@ -2144,11 +2150,11 @@ msgid "No dependencies selected!"
 msgstr "Δεν έχετε επιλέξει εξαρτήσεις!"
 
 #: js/messages.php:394 libraries/central_columns.lib.php:1214
-#: libraries/insert_edit.lib.php:1458 libraries/server_variables.lib.php:155
+#: libraries/insert_edit.lib.php:1456 libraries/server_variables.lib.php:155
 #: setup/frames/config.inc.php:42 setup/frames/index.inc.php:279
 #: templates/columns_definitions/column_definitions_form.phtml:165
-#: templates/gis_visualization/gis_visualization.phtml:48
-#: templates/tbl_relation/common_form.phtml:107
+#: templates/table/gis_visualization/gis_visualization.phtml:48
+#: templates/table/relation/common_form.phtml:107
 msgid "Save"
 msgstr "Αποθήκευση"
 
@@ -2230,8 +2236,8 @@ msgid "Data point content"
 msgstr "Περιεχόμενο δείκτη δεδομένων"
 
 #: js/messages.php:430 js/messages.php:562 js/messages.php:579
-#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2573
-#: templates/index_form.phtml:154 templates/index_form.phtml:194
+#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2571
+#: templates/table/index_form.phtml:154 templates/table/index_form.phtml:194
 msgid "Ignore"
 msgstr "Παράληψη"
 
@@ -2292,8 +2298,8 @@ msgstr "Επιλέξτε Μη Διακριτό Κλειδί"
 msgid "Please select the primary key or a unique key!"
 msgstr "Επιλέξτε το πρωτεύον κλειδί ή ένα μοναδικό κλειδί!"
 
-#: js/messages.php:457 templates/designer/side_menu.phtml:91
-#: templates/designer/side_menu.phtml:94
+#: js/messages.php:457 templates/database/designer/side_menu.phtml:91
+#: templates/database/designer/side_menu.phtml:94
 msgid "Choose column to display"
 msgstr "Επιλέξτε στήλη για εμφάνιση"
 
@@ -2309,18 +2315,18 @@ msgstr ""
 msgid "Page name"
 msgstr "Όνομα σελίδας"
 
-#: js/messages.php:463 templates/designer/side_menu.phtml:56
-#: templates/designer/side_menu.phtml:59
+#: js/messages.php:463 templates/database/designer/side_menu.phtml:56
+#: templates/database/designer/side_menu.phtml:59
 msgid "Save page"
 msgstr "Αποθήκευση σελίδας"
 
-#: js/messages.php:464 templates/designer/side_menu.phtml:63
-#: templates/designer/side_menu.phtml:66
+#: js/messages.php:464 templates/database/designer/side_menu.phtml:63
+#: templates/database/designer/side_menu.phtml:66
 msgid "Save page as"
 msgstr "Αποθήκευση σελίδας ως"
 
-#: js/messages.php:465 templates/designer/side_menu.phtml:49
-#: templates/designer/side_menu.phtml:52
+#: js/messages.php:465 templates/database/designer/side_menu.phtml:49
+#: templates/database/designer/side_menu.phtml:52
 msgid "Open page"
 msgstr "Άνοιγμα σελίδας"
 
@@ -2328,7 +2334,7 @@ msgstr "Άνοιγμα σελίδας"
 msgid "Delete page"
 msgstr "Διαγραφή σελίδας"
 
-#: js/messages.php:467 templates/designer/side_menu.phtml:10
+#: js/messages.php:467 templates/database/designer/side_menu.phtml:10
 msgid "Untitled"
 msgstr "Χωρίς τίτλο"
 
@@ -2450,7 +2456,7 @@ msgstr "Αρχικό μήκος"
 msgid "cancel"
 msgstr "άκυρο"
 
-#: js/messages.php:499 libraries/server_status.lib.php:271
+#: js/messages.php:499 libraries/server_status.lib.php:280
 msgid "Aborted"
 msgstr "Ακυρωμένες συνδέσεις"
 
@@ -3019,7 +3025,7 @@ msgstr "Εισάγετε μια έγκυρη ΔΕΚΑΕΞΑΔΙΚΗ εισαγω
 
 #: js/messages.php:793 libraries/Message.class.php:199
 #: libraries/Util.class.php:654 libraries/core.lib.php:245
-#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1172
+#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1170
 #: tbl_operations.php:229 view_operations.php:63
 msgid "Error"
 msgstr "Λάθος"
@@ -3082,8 +3088,8 @@ msgstr "ανά δευτερόλεπτο"
 msgid "per minute"
 msgstr "ανά λεπτό"
 
-#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:143
-#: libraries/server_status.lib.php:228
+#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:152
+#: libraries/server_status.lib.php:237
 #: libraries/server_status_queries.lib.php:98
 msgid "per hour"
 msgstr "ανά ώρα"
@@ -3103,7 +3109,7 @@ msgstr ""
 "Εσφαλμένα δικαιώματα στο αρχείο ρυθμίσεων, δεν πρέπει να είναι καθολικά "
 "εγγράψιμο!"
 
-#: libraries/Config.class.php:1799
+#: libraries/Config.class.php:1801
 msgid "Font size"
 msgstr "Μέγεθος γραμματοσειράς"
 
@@ -3131,10 +3137,10 @@ msgstr "Επανερώτημα"
 #: libraries/server_privileges.lib.php:2890
 #: libraries/server_privileges.lib.php:3144
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4332
+#: libraries/server_privileges.lib.php:4358
 #: libraries/server_status_processes.lib.php:80
-#: templates/tbl_relation/foreign_key_row.phtml:165
-#: templates/tbl_relation/internal_relational_row.phtml:55
+#: templates/table/relation/foreign_key_row.phtml:165
+#: templates/table/relation/internal_relational_row.phtml:55
 msgid "Database"
 msgstr "Βάση"
 
@@ -3227,11 +3233,11 @@ msgstr "Ιστορικό"
 #: libraries/plugins/import/ImportMediawiki.class.php:60
 #: libraries/plugins/import/ImportOds.class.php:59
 #: libraries/plugins/import/ImportShp.class.php:57
-#: libraries/plugins/import/ImportSql.class.php:148
+#: libraries/plugins/import/ImportSql.class.php:51
 #: libraries/plugins/import/ImportXml.class.php:58
-#: libraries/rte/rte_routines.lib.php:833 templates/index_form.phtml:49
-#: templates/structure/row_stats_table.phtml:20
-#: templates/table/options.phtml:2
+#: libraries/rte/rte_routines.lib.php:924 templates/table/index_form.phtml:49
+#: templates/table/search/options.phtml:2
+#: templates/table/structure/row_stats_table.phtml:20
 msgid "Options"
 msgstr "Επιλογές"
 
@@ -3264,7 +3270,8 @@ msgstr "φθίνουσα"
 msgid "Order:"
 msgstr "Ταξινόμηση:"
 
-#: libraries/Console.class.php:289 templates/table/replace_preview.phtml:17
+#: libraries/Console.class.php:289
+#: templates/table/search/replace_preview.phtml:17
 msgid "Count"
 msgstr "Μέτρηση"
 
@@ -3361,9 +3368,9 @@ msgstr "Αλλαγή σε σκοτεινό θέμα"
 #: libraries/operations.lib.php:794 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:191
-#: templates/structure/sortable_header.phtml:21
-#: templates/structure/sortable_header.phtml:38
-#: templates/table/options.phtml:68
+#: templates/database/structure/sortable_header.phtml:21
+#: templates/database/structure/sortable_header.phtml:38
+#: templates/table/search/options.phtml:68
 msgid "Ascending"
 msgstr "Αύξουσα"
 
@@ -3373,13 +3380,14 @@ msgstr "Αύξουσα"
 #: libraries/operations.lib.php:797 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:188
-#: templates/structure/sortable_header.phtml:26
-#: templates/structure/sortable_header.phtml:43
-#: templates/table/options.phtml:69
+#: templates/database/structure/sortable_header.phtml:26
+#: templates/database/structure/sortable_header.phtml:43
+#: templates/table/search/options.phtml:69
 msgid "Descending"
 msgstr "Φθίνουσα"
 
-#: libraries/DBQbe.class.php:467 templates/table/search_and_replace.phtml:6
+#: libraries/DBQbe.class.php:467
+#: templates/table/search/search_and_replace.phtml:6
 msgid "Column:"
 msgstr "Στήλη:"
 
@@ -3536,12 +3544,12 @@ msgstr[0] "%1$s απατέλεσμα στο <strong>%2$s</strong>"
 msgstr[1] "%1$s αποτελέσματα στο <strong>%2$s</strong>"
 
 #: libraries/DbSearch.class.php:354 libraries/Menu.class.php:311
-#: libraries/Util.class.php:3337 libraries/Util.class.php:3347
-#: libraries/Util.class.php:3623 libraries/Util.class.php:3624
-#: libraries/Util.class.php:4343 libraries/config.values.php:43
+#: libraries/Util.class.php:3343 libraries/Util.class.php:3353
+#: libraries/Util.class.php:3629 libraries/Util.class.php:3630
+#: libraries/Util.class.php:4349 libraries/config.values.php:43
 #: libraries/config.values.php:51 libraries/config.values.php:119
 #: libraries/navigation/Nodes/Node_Table.class.php:295
-#: templates/structure/check_all_table_column.phtml:5
+#: templates/table/structure/check_all_table_column.phtml:5
 msgid "Browse"
 msgstr "Περιήγηση"
 
@@ -3558,7 +3566,8 @@ msgstr "Αναζήτηση στη βάση δεδπμένων"
 msgid "Words or values to search for (wildcard: \"%\"):"
 msgstr "Λέξεις ή τιμές για αναζήτηση (μπαλαντέρ: «%»):"
 
-#: libraries/DbSearch.class.php:401 templates/table/search_and_replace.phtml:1
+#: libraries/DbSearch.class.php:401
+#: templates/table/search/search_and_replace.phtml:1
 msgid "Find:"
 msgstr "Έυρεση:"
 
@@ -3602,28 +3611,28 @@ msgstr "Φιλτράρισμα εγγραφών"
 msgid "Search this table"
 msgstr "Αναζήτηση σε αυτόν τον πίνακα"
 
-#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2532
-#: libraries/Util.class.php:2535
+#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2538
+#: libraries/Util.class.php:2541
 msgctxt "First page"
 msgid "Begin"
 msgstr "Αρχή"
 
-#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2533
-#: libraries/Util.class.php:2536 libraries/server_bin_log.lib.php:170
+#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2539
+#: libraries/Util.class.php:2542 libraries/server_bin_log.lib.php:170
 #: libraries/server_bin_log.lib.php:172
 msgctxt "Previous page"
 msgid "Previous"
 msgstr "Προηγούμενη"
 
-#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2564
-#: libraries/Util.class.php:2574 libraries/server_bin_log.lib.php:204
+#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2570
+#: libraries/Util.class.php:2580 libraries/server_bin_log.lib.php:204
 #: libraries/server_bin_log.lib.php:206
 msgctxt "Next page"
 msgid "Next"
 msgstr "Επόμενη"
 
-#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2565
-#: libraries/Util.class.php:2575
+#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2571
+#: libraries/Util.class.php:2581
 msgctxt "Last page"
 msgid "End"
 msgstr "Τέλος"
@@ -3657,7 +3666,6 @@ msgid "Relational key"
 msgstr "Κλειδί συσχέτισης"
 
 #: libraries/DisplayResults.class.php:1744
-#| msgid "Display foreign key relationships"
 msgid "Display column for relations"
 msgstr "Προβολή στήλης για σχέσεις"
 
@@ -3697,15 +3705,15 @@ msgid "May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]."
 msgstr "Ίσως είναι κατά προσέγγιση. Δείτε τις [doc@faq3-11]ΣΑΕ 3.11[/doc]."
 
 #: libraries/DisplayResults.class.php:4332 libraries/Message.class.php:180
-#: libraries/controllers/TableRelationController.class.php:258
+#: libraries/controllers/TableRelationController.class.php:259
 #: libraries/controllers/TableSearchController.class.php:655
-#: libraries/rte/rte_routines.lib.php:1332 libraries/sql_query_form.lib.php:89
+#: libraries/rte/rte_routines.lib.php:1423 libraries/sql_query_form.lib.php:89
 #: tbl_operations.php:227 tbl_row_action.php:138 view_operations.php:62
 msgid "Your SQL query has been executed successfully."
 msgstr "Η εντολή SQL εκτελέσθηκε επιτυχώς."
 
 #: libraries/DisplayResults.class.php:4660
-#: libraries/controllers/StructureController.class.php:629
+#: libraries/controllers/DatabaseStructureController.class.php:564
 #, php-format
 msgid ""
 "This view has at least this number of rows. Please refer to %sdocumentation"
@@ -3729,33 +3737,33 @@ msgstr "%1$d σύνολο, %2$d στο ερώτημα"
 msgid "%d total"
 msgstr "%d συνολικά"
 
-#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1318
+#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1312
 #, php-format
 msgid "Query took %01.4f seconds."
 msgstr "Το ερώτημα χρειάστηκε %01.4f δευτερόλεπτα."
 
 #: libraries/DisplayResults.class.php:4807
-#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4767
-#: libraries/Util.class.php:4773 libraries/mult_submits.inc.php:50
-#: templates/structure/check_all_tables.phtml:2
-#: templates/structure/check_all_tables.phtml:9
+#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4773
+#: libraries/Util.class.php:4779 libraries/mult_submits.inc.php:50
+#: templates/database/structure/check_all_tables.phtml:2
+#: templates/database/structure/check_all_tables.phtml:9
 msgid "With selected:"
 msgstr "Με τους επιλεγμένους:"
 
 #: libraries/DisplayResults.class.php:4811
-#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4769
-#: libraries/Util.class.php:4770 libraries/server_privileges.lib.php:1174
+#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4775
+#: libraries/Util.class.php:4776 libraries/server_privileges.lib.php:1174
 #: libraries/server_privileges.lib.php:1175
 #: libraries/server_privileges.lib.php:1387
 #: libraries/server_user_groups.lib.php:231
-#: templates/structure/check_all_tables.phtml:3
-#: templates/structure/check_all_tables.phtml:4
+#: templates/database/structure/check_all_tables.phtml:3
+#: templates/database/structure/check_all_tables.phtml:4
 msgid "Check All"
 msgstr "Επιλογή όλων"
 
 #: libraries/DisplayResults.class.php:4985 libraries/Header.class.php:383
-#: templates/structure/optional_action_links.phtml:1
-#: templates/structure/print_view_data_dictionary_link.phtml:3
+#: templates/database/structure/print_view_data_dictionary_link.phtml:3
+#: templates/table/structure/optional_action_links.phtml:1
 msgid "Print view"
 msgstr "Εμφάνιση για εκτύπωση"
 
@@ -3763,7 +3771,8 @@ msgstr "Εμφάνιση για εκτύπωση"
 msgid "Query results operations"
 msgstr "Λειτουργίες αποτελεσμάτων ερωτήματος"
 
-#: libraries/DisplayResults.class.php:5105 templates/tbl_chart.phtml:12
+#: libraries/DisplayResults.class.php:5105
+#: templates/table/chart/tbl_chart.phtml:12
 msgid "Display chart"
 msgstr "Εμφάνιση διαγράμματος"
 
@@ -3836,7 +3845,6 @@ msgid "Error while moving uploaded file."
 msgstr "Σφάλμα κατά τη μετακίνηση αρχείου αποστολής."
 
 #: libraries/File.class.php:487
-#| msgid "Cannot read (moved) upload file."
 msgid "Cannot read uploaded file."
 msgstr "Αδύνατη η ανάγνωση του αποσταλμένου αρχείου."
 
@@ -3859,7 +3867,7 @@ msgid "Click on the bar to scroll to top of page"
 msgstr "Πατήστε στη γραμμή για να μεταβείτε στην κορυφή της σελίδας"
 
 #: libraries/Header.class.php:749
-#: libraries/plugins/auth/AuthenticationCookie.class.php:152
+#: libraries/plugins/auth/AuthenticationCookie.class.php:140
 msgid "Javascript must be enabled past this point!"
 msgstr "Από αυτό το σημείο πρέπει να έχετε ενεργοποιημένη την Javascript!"
 
@@ -3881,11 +3889,11 @@ msgid "Keyname"
 msgstr "Όνομα κλειδιού"
 
 #: libraries/Index.class.php:697
-#: libraries/controllers/StructureController.class.php:1962
-#: libraries/controllers/StructureController.class.php:1967
+#: libraries/controllers/TableStructureController.class.php:953
+#: libraries/controllers/TableStructureController.class.php:958
 #: libraries/tracking.lib.php:973
 #: templates/columns_definitions/column_indexes.phtml:11
-#: templates/structure/check_all_table_column.phtml:26
+#: templates/table/structure/check_all_table_column.phtml:26
 msgid "Unique"
 msgstr "Μοναδικό"
 
@@ -3904,16 +3912,17 @@ msgstr "Μοναδικότητα"
 #: libraries/server_collations.lib.php:35 libraries/tracking.lib.php:881
 #: libraries/tracking.lib.php:977
 #: templates/columns_definitions/table_fields_definitions.phtml:33
-#: templates/structure/row_stats_table.phtml:31
-#: templates/structure/table_header.phtml:55
-#: templates/structure/table_structure_header.phtml:7
-#: templates/table/table_header.phtml:8
+#: templates/database/structure/table_header.phtml:55
+#: templates/table/search/table_header.phtml:8
+#: templates/table/structure/row_stats_table.phtml:31
+#: templates/table/structure/table_structure_header.phtml:7
 msgid "Collation"
 msgstr "Σύνθεση"
 
 #: libraries/Index.class.php:703 libraries/rte/rte_events.lib.php:496
-#: libraries/rte/rte_routines.lib.php:956 libraries/tracking.lib.php:885
-#: libraries/tracking.lib.php:979 templates/structure/table_header.phtml:84
+#: libraries/rte/rte_routines.lib.php:1047 libraries/tracking.lib.php:885
+#: libraries/tracking.lib.php:979
+#: templates/database/structure/table_header.phtml:84
 msgid "Comment"
 msgstr "Σχόλιο"
 
@@ -3926,15 +3935,15 @@ msgstr "Το πρωτεύον κλειδί διεγράφη."
 msgid "Index %s has been dropped."
 msgstr "Το ευρετήριο %s έχει διαγραφεί."
 
-#: libraries/Index.class.php:757 libraries/Util.class.php:3630
-#: libraries/Util.class.php:3631
-#: libraries/controllers/StructureController.class.php:1958
-#: libraries/controllers/StructureController.class.php:1959
+#: libraries/Index.class.php:757 libraries/Util.class.php:3636
+#: libraries/Util.class.php:3637
+#: libraries/controllers/TableStructureController.class.php:949
+#: libraries/controllers/TableStructureController.class.php:950
 #: libraries/operations.lib.php:1607 libraries/rte/rte_list.lib.php:150
 #: libraries/server_databases.lib.php:146
-#: templates/structure/check_all_table_column.phtml:15
-#: templates/structure/check_all_tables.phtml:16
-#: templates/tbl_relation/foreign_key_row.phtml:93
+#: templates/database/structure/check_all_tables.phtml:16
+#: templates/table/relation/foreign_key_row.phtml:93
+#: templates/table/structure/check_all_table_column.phtml:15
 msgid "Drop"
 msgstr "Διαγραφή"
 
@@ -3967,16 +3976,16 @@ msgstr "Διακομιστής"
 #: libraries/Menu.class.php:248
 #: libraries/navigation/Nodes/Node_View.class.php:32
 #: libraries/tbl_info.inc.php:63
-#: templates/structure/structure_table_row.phtml:97
-#: templates/structure/structure_table_row.phtml:159
+#: templates/database/structure/structure_table_row.phtml:97
+#: templates/database/structure/structure_table_row.phtml:159
 msgid "View"
 msgstr "Προβολή"
 
 #: libraries/Menu.class.php:325 libraries/Menu.class.php:429
-#: libraries/Menu.class.php:548 libraries/Util.class.php:3334
-#: libraries/Util.class.php:3344 libraries/Util.class.php:3350
-#: libraries/Util.class.php:4313 libraries/Util.class.php:4328
-#: libraries/Util.class.php:4345 libraries/config.values.php:40
+#: libraries/Menu.class.php:548 libraries/Util.class.php:3340
+#: libraries/Util.class.php:3350 libraries/Util.class.php:3356
+#: libraries/Util.class.php:4319 libraries/Util.class.php:4334
+#: libraries/Util.class.php:4351 libraries/config.values.php:40
 #: libraries/config.values.php:48 libraries/config.values.php:110
 #: libraries/config.values.php:116 libraries/config/messages.inc.php:321
 #: libraries/navigation/Nodes/Node_Table.class.php:292
@@ -3984,19 +3993,19 @@ msgid "SQL"
 msgstr "Κώδικας SQL"
 
 #: libraries/Menu.class.php:328 libraries/Menu.class.php:432
-#: libraries/Util.class.php:3335 libraries/Util.class.php:3345
-#: libraries/Util.class.php:3351 libraries/Util.class.php:3625
-#: libraries/Util.class.php:3626 libraries/Util.class.php:4329
-#: libraries/Util.class.php:4346 libraries/config.values.php:41
+#: libraries/Util.class.php:3341 libraries/Util.class.php:3351
+#: libraries/Util.class.php:3357 libraries/Util.class.php:3631
+#: libraries/Util.class.php:3632 libraries/Util.class.php:4335
+#: libraries/Util.class.php:4352 libraries/config.values.php:41
 #: libraries/config.values.php:49 libraries/config.values.php:111
 #: libraries/config.values.php:117
 #: libraries/navigation/Nodes/Node_Table.class.php:286
 msgid "Search"
 msgstr "Αναζήτηση"
 
-#: libraries/Menu.class.php:338 libraries/Util.class.php:3336
-#: libraries/Util.class.php:3346 libraries/Util.class.php:3627
-#: libraries/Util.class.php:3628 libraries/Util.class.php:4347
+#: libraries/Menu.class.php:338 libraries/Util.class.php:3342
+#: libraries/Util.class.php:3352 libraries/Util.class.php:3633
+#: libraries/Util.class.php:3634 libraries/Util.class.php:4353
 #: libraries/config.values.php:42 libraries/config.values.php:50
 #: libraries/config.values.php:118
 #: libraries/navigation/Nodes/Node_Table.class.php:289
@@ -4005,30 +4014,30 @@ msgid "Insert"
 msgstr "Προσθήκη"
 
 #: libraries/Menu.class.php:362 libraries/Menu.class.php:467
-#: libraries/Util.class.php:4334 libraries/Util.class.php:4350
+#: libraries/Util.class.php:4340 libraries/Util.class.php:4356
 #: libraries/config.values.php:106 libraries/server_common.lib.php:51
 #: libraries/server_privileges.lib.php:2370
 #: libraries/server_privileges.lib.php:3158
-#: libraries/server_privileges.lib.php:4221
+#: libraries/server_privileges.lib.php:4247
 msgid "Privileges"
 msgstr "Δικαιώματα"
 
 #: libraries/Menu.class.php:371 libraries/Menu.class.php:379
-#: libraries/Menu.class.php:459 libraries/Util.class.php:3338
-#: libraries/Util.class.php:3352 libraries/Util.class.php:4333
-#: libraries/Util.class.php:4351 libraries/config.values.php:112
+#: libraries/Menu.class.php:459 libraries/Util.class.php:3344
+#: libraries/Util.class.php:3358 libraries/Util.class.php:4339
+#: libraries/Util.class.php:4357 libraries/config.values.php:112
 #: view_operations.php:92
 msgid "Operations"
 msgstr "Λειτουργίες"
 
 #: libraries/Menu.class.php:384 libraries/Menu.class.php:492
-#: libraries/Util.class.php:4338 libraries/Util.class.php:4352
+#: libraries/Util.class.php:4344 libraries/Util.class.php:4358
 #: libraries/relation.lib.php:255
 msgid "Tracking"
 msgstr "Παρακολούθηση"
 
 #: libraries/Menu.class.php:397 libraries/Menu.class.php:486
-#: libraries/Util.class.php:4337 libraries/Util.class.php:4353
+#: libraries/Util.class.php:4343 libraries/Util.class.php:4359
 #: libraries/navigation/Nodes/Node_Trigger_Container.class.php:24
 #: libraries/plugins/export/ExportHtmlword.class.php:557
 #: libraries/plugins/export/ExportOdt.class.php:685
@@ -4045,16 +4054,16 @@ msgstr "Δείκτες"
 msgid "Database seems to be empty!"
 msgstr "Η βάση δεδομένων φαίνεται να είναι άδεια!"
 
-#: libraries/Menu.class.php:439 libraries/Util.class.php:4330
+#: libraries/Menu.class.php:439 libraries/Util.class.php:4336
 msgid "Query"
 msgstr "Επερώτημα κατά παράδειγμα"
 
-#: libraries/Menu.class.php:472 libraries/Util.class.php:4335
+#: libraries/Menu.class.php:472 libraries/Util.class.php:4341
 #: libraries/rte/rte_words.lib.php:36
 msgid "Routines"
 msgstr "Εργασίες"
 
-#: libraries/Menu.class.php:479 libraries/Util.class.php:4336
+#: libraries/Menu.class.php:479 libraries/Util.class.php:4342
 #: libraries/navigation/Nodes/Node_Event_Container.class.php:26
 #: libraries/plugins/export/ExportSql.class.php:940
 #: libraries/plugins/export/ExportXml.class.php:107
@@ -4062,20 +4071,20 @@ msgstr "Εργασίες"
 msgid "Events"
 msgstr "Συμβάντα"
 
-#: libraries/Menu.class.php:498 libraries/Util.class.php:4339
+#: libraries/Menu.class.php:498 libraries/Util.class.php:4345
 msgid "Designer"
 msgstr "Σχεδιαστής"
 
-#: libraries/Menu.class.php:507 libraries/Util.class.php:4340
-#: templates/structure/check_all_tables.phtml:35
+#: libraries/Menu.class.php:507 libraries/Util.class.php:4346
+#: templates/database/structure/check_all_tables.phtml:35
 msgid "Central columns"
 msgstr "Κεντρικές στήλες"
 
-#: libraries/Menu.class.php:544 libraries/Util.class.php:4312
+#: libraries/Menu.class.php:544 libraries/Util.class.php:4318
 #: libraries/config.values.php:103 libraries/config/messages.inc.php:266
 #: libraries/config/messages.inc.php:341
 #: libraries/navigation/NavigationTree.class.php:1239
-#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4332
+#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4358
 msgid "Databases"
 msgstr "Βάσεις δεδομένων"
 
@@ -4084,34 +4093,34 @@ msgid "User accounts"
 msgstr "Λογαριασμοί χρήστη"
 
 #: libraries/Menu.class.php:595 libraries/ServerStatusData.class.php:121
-#: libraries/Util.class.php:4319 libraries/server_common.lib.php:36
+#: libraries/Util.class.php:4325 libraries/server_common.lib.php:36
 msgid "Binary log"
 msgstr "Δυαδικό αρχείο καταγραφής"
 
 #: libraries/Menu.class.php:601 libraries/ServerStatusData.class.php:126
-#: libraries/Util.class.php:4320 libraries/server_common.lib.php:42
-#: templates/structure/body_for_table_summary.phtml:10
-#: templates/structure/table_header.phtml:27
+#: libraries/Util.class.php:4326 libraries/server_common.lib.php:42
+#: templates/database/structure/body_for_table_summary.phtml:10
+#: templates/database/structure/table_header.phtml:27
 msgid "Replication"
 msgstr "Αναπαραγωγή"
 
 #: libraries/Menu.class.php:606 libraries/ServerStatusData.class.php:193
-#: libraries/Util.class.php:4321 libraries/config.values.php:105
+#: libraries/Util.class.php:4327 libraries/config.values.php:105
 #: libraries/server_engines.lib.php:108 libraries/server_engines.lib.php:112
 #: libraries/sql_query_form.lib.php:421
 msgid "Variables"
 msgstr "Μεταβλητές"
 
-#: libraries/Menu.class.php:610 libraries/Util.class.php:4322
+#: libraries/Menu.class.php:610 libraries/Util.class.php:4328
 msgid "Charsets"
 msgstr "Σύνολο χαρακτήρων"
 
-#: libraries/Menu.class.php:615 libraries/Util.class.php:4323
+#: libraries/Menu.class.php:615 libraries/Util.class.php:4329
 #: libraries/server_common.lib.php:33 libraries/server_plugins.lib.php:27
 msgid "Plugins"
 msgstr "Πρόσθετα"
 
-#: libraries/Menu.class.php:626 libraries/Util.class.php:4324
+#: libraries/Menu.class.php:626 libraries/Util.class.php:4330
 msgid "Engines"
 msgstr "Μηχανές"
 
@@ -4136,7 +4145,7 @@ msgid_plural "%1$d rows inserted."
 msgstr[0] "Εισήχθηκε %1$d γραμμή."
 msgstr[1] "Εισήχθηκαν %1$d γραμμές."
 
-#: libraries/PDF.class.php:70 libraries/Util.class.php:2521
+#: libraries/PDF.class.php:70 libraries/Util.class.php:2527
 #: libraries/browse_foreigners.lib.php:327
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:865
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:890
@@ -4157,7 +4166,7 @@ msgid "Could not save favorite table!"
 msgstr "Αδύνατη η αποθήκευση αγαπημένου πίνακα!"
 
 #: libraries/RecentFavoriteTable.class.php:212
-#: templates/structure/favorite_anchor.phtml:12
+#: templates/database/structure/favorite_anchor.phtml:12
 msgid "Remove from Favorites"
 msgstr "Απομάκρυνση από τα Αγαπημένα"
 
@@ -4325,7 +4334,7 @@ msgstr ""
 "αποθήκευσης."
 
 #: libraries/StorageEngine.class.php:373
-#: templates/structure/body_for_table_summary.phtml:50
+#: templates/database/structure/body_for_table_summary.phtml:50
 #, php-format
 msgid "%s is the default storage engine on this MySQL server."
 msgstr ""
@@ -4811,10 +4820,10 @@ msgstr "%d σφάλματα βρέθηκαν κατά την ανάλυση."
 
 #: libraries/Util.class.php:726 libraries/rte/rte_events.lib.php:110
 #: libraries/rte/rte_events.lib.php:119 libraries/rte/rte_events.lib.php:150
-#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:153
-#: libraries/rte/rte_routines.lib.php:162
-#: libraries/rte/rte_routines.lib.php:235
-#: libraries/rte/rte_routines.lib.php:1366
+#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:223
+#: libraries/rte/rte_routines.lib.php:250
+#: libraries/rte/rte_routines.lib.php:372
+#: libraries/rte/rte_routines.lib.php:1457
 #: libraries/rte/rte_triggers.lib.php:86 libraries/rte/rte_triggers.lib.php:95
 #: libraries/rte/rte_triggers.lib.php:127
 msgid "MySQL said: "
@@ -4858,77 +4867,80 @@ msgstr "Κυρ"
 msgid "%B %d, %Y at %I:%M %p"
 msgstr "%d %B %Y στις %H:%M:%S"
 
-#: libraries/Util.class.php:2019
+#: libraries/Util.class.php:2025
 #, php-format
 msgid "%s days, %s hours, %s minutes and %s seconds"
 msgstr "%s μέρες, %s ώρες, %s λεπτά %s δευτερόλεπτα"
 
-#: libraries/Util.class.php:2112
+#: libraries/Util.class.php:2118
 msgid "Missing parameter:"
 msgstr "Απολεσθείσα παράμετρος:"
 
-#: libraries/Util.class.php:2645
+#: libraries/Util.class.php:2651
 #, php-format
 msgid "Jump to database \"%s\"."
 msgstr "Μεταπήδηση στην βάση «%s»."
 
-#: libraries/Util.class.php:2670
+#: libraries/Util.class.php:2676
 #, php-format
 msgid "The %s functionality is affected by a known bug, see %s"
 msgstr ""
 "Η λειτουργία %s έχει επηρρεαστεί από ένα γνωστό σφάλμα, για αυτό δείτε %s"
 
-#: libraries/Util.class.php:2881
+#: libraries/Util.class.php:2887
 msgid "Click to toggle"
 msgstr "Πατήστε για εναλλαγή"
 
-#: libraries/Util.class.php:3542 prefs_manage.php:248
+#: libraries/Util.class.php:3548 prefs_manage.php:248
 msgid "Browse your computer:"
 msgstr "Περιηγηθείτε στον υπολογιστή σας:"
 
-#: libraries/Util.class.php:3567
+#: libraries/Util.class.php:3573
 #, php-format
 msgid "Select from the web server upload directory <b>%s</b>:"
 msgstr "Επιλογή από το φάκελο αποστολής του διακομίστή ιστού <b>%s</b>:"
 
-#: libraries/Util.class.php:3596 libraries/insert_edit.lib.php:1173
+#: libraries/Util.class.php:3602 libraries/insert_edit.lib.php:1171
 msgid "The directory you set for upload work cannot be reached."
 msgstr ""
 "Ο φάκελος που ορίσατε για την αποθήκευση αρχείων δεν μπόρεσε να βρεθεί."
 
-#: libraries/Util.class.php:3607
+#: libraries/Util.class.php:3613
 msgid "There are no files to upload!"
 msgstr "Δεν υπάρχουν αρχεία προς αποστολή!"
 
-#: libraries/Util.class.php:3632 libraries/Util.class.php:3633
-#: templates/structure/check_all_tables.phtml:15
+#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: templates/database/structure/check_all_tables.phtml:15
 msgid "Empty"
 msgstr "Άδειασμα"
 
-#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: libraries/Util.class.php:3644 libraries/Util.class.php:3645
 msgid "Execute"
 msgstr "Εκτέλεση"
 
-#: libraries/Util.class.php:4152
+#: libraries/Util.class.php:4158
 msgid "Print"
 msgstr "Εκτύπωση"
 
-#: libraries/Util.class.php:4257 templates/structure/row_stats_table.phtml:80
-#: templates/structure/table_header.phtml:95
+#: libraries/Util.class.php:4263
+#: templates/database/structure/table_header.phtml:95
+#: templates/table/structure/row_stats_table.phtml:80
 msgid "Creation"
 msgstr "Δημιουργία"
 
-#: libraries/Util.class.php:4263 templates/structure/row_stats_table.phtml:87
-#: templates/structure/table_header.phtml:106
+#: libraries/Util.class.php:4269
+#: templates/database/structure/table_header.phtml:106
+#: templates/table/structure/row_stats_table.phtml:87
 msgid "Last update"
 msgstr "Τελευταία ενημέρωση"
 
-#: libraries/Util.class.php:4269 templates/structure/row_stats_table.phtml:94
-#: templates/structure/table_header.phtml:117
+#: libraries/Util.class.php:4275
+#: templates/database/structure/table_header.phtml:117
+#: templates/table/structure/row_stats_table.phtml:94
 msgid "Last check"
 msgstr "Tελευταίος έλεγχος"
 
-#: libraries/Util.class.php:4315
+#: libraries/Util.class.php:4321
 msgid "Users"
 msgstr "Χρήστες"
 
@@ -4949,16 +4961,16 @@ msgid "Use this value"
 msgstr "Χρήση αυτής της τιμής"
 
 #: libraries/build_html_for_db.lib.php:33 libraries/import.lib.php:193
-#: templates/structure/actions_in_table_structure.phtml:113
-#: templates/structure/row_stats_table.phtml:42
-#: templates/structure/table_header.phtml:36
+#: templates/database/structure/table_header.phtml:36
+#: templates/table/structure/actions_in_table_structure.phtml:113
+#: templates/table/structure/row_stats_table.phtml:42
 msgid "Rows"
 msgstr "Εγγραφές"
 
 #: libraries/build_html_for_db.lib.php:48 libraries/engines/innodb.lib.php:171
-#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:186
-#: libraries/server_status.lib.php:298
-#: templates/structure/display_table_stats.phtml:40
+#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:195
+#: libraries/server_status.lib.php:307
+#: templates/table/structure/display_table_stats.phtml:40
 msgid "Total"
 msgstr "Σύνολο"
 
@@ -4967,10 +4979,12 @@ msgid "Jump to database"
 msgstr "Μετάβαση στη βάση δεδομένων"
 
 #: libraries/build_html_for_db.lib.php:146
+#: templates/database/structure/structure_table_row.phtml:15
 msgid "Not replicated"
 msgstr "Χωρίς αναπαραγωγή"
 
 #: libraries/build_html_for_db.lib.php:158
+#: templates/database/structure/structure_table_row.phtml:16
 msgid "Replicated"
 msgstr "Αναπαραγμένο"
 
@@ -5027,17 +5041,17 @@ msgstr "ΌΧΙ"
 #: libraries/plugins/export/ExportTexytext.class.php:425
 #: libraries/plugins/export/PMA_ExportPdf.class.php:307
 #: libraries/rte/rte_list.lib.php:73 libraries/rte/rte_list.lib.php:85
-#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:830
-#: libraries/rte/rte_routines.lib.php:1492 setup/frames/index.inc.php:162
+#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:921
+#: libraries/rte/rte_routines.lib.php:1583 setup/frames/index.inc.php:162
 #: templates/columns_definitions/table_fields_definitions.phtml:8
-#: templates/structure/table_structure_header.phtml:5
-#: templates/table/create_table.phtml:11
+#: templates/database/create_table.phtml:11
+#: templates/table/structure/table_structure_header.phtml:5
 msgid "Name"
 msgstr "Όνομα"
 
 #: libraries/central_columns.lib.php:699
 #: libraries/central_columns.lib.php:1381
-#: libraries/rte/rte_routines.lib.php:832
+#: libraries/rte/rte_routines.lib.php:923
 #: templates/columns_definitions/table_fields_definitions.phtml:14
 msgid "Length/Values"
 msgstr "Μήκος/Τιμές*"
@@ -5056,7 +5070,7 @@ msgid "Select a table"
 msgstr "Επιλογή ενός πίνακα"
 
 #: libraries/central_columns.lib.php:804
-#: templates/structure/add_column.phtml:4
+#: templates/table/structure/add_column.phtml:4
 msgid "Add column"
 msgstr "Προσθήκη στήλης"
 
@@ -5072,7 +5086,7 @@ msgstr "Προσθήκη νέας στήλης"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1002
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1025
 #: templates/columns_definitions/table_fields_definitions.phtml:36
-#: templates/structure/table_structure_header.phtml:8
+#: templates/table/structure/table_structure_header.phtml:8
 msgid "Attributes"
 msgstr "Χαρακτηριστικά"
 
@@ -5191,7 +5205,7 @@ msgid "Double click"
 msgstr "Διπλό πάτημα"
 
 #: libraries/config.values.php:95 libraries/config.values.php:124
-#: libraries/config/FormDisplay.tpl.php:221 libraries/relation.lib.php:97
+#: libraries/config/FormDisplay.tpl.php:232 libraries/relation.lib.php:97
 #: libraries/relation.lib.php:105
 msgid "Disabled"
 msgstr "Απενεργοποιημένη"
@@ -5363,23 +5377,23 @@ msgstr "Η συμπιεσμένη εξαγωγή δεν θα λειτουργή
 msgid "maximum %s"
 msgstr "μέγιστος αριθμός %s"
 
-#: libraries/config/FormDisplay.tpl.php:219
+#: libraries/config/FormDisplay.tpl.php:230
 msgid "This setting is disabled, it will not be applied to your configuration."
 msgstr ""
 "Αυτή η ρύθμιση είναι απενεργοποιημένη και δεν θα εφαρμοστεί στις ρυθμίσεις "
 "σας."
 
-#: libraries/config/FormDisplay.tpl.php:313
+#: libraries/config/FormDisplay.tpl.php:324
 #, php-format
 msgid "Set value: %s"
 msgstr "Ορισμός τιμής: %s"
 
-#: libraries/config/FormDisplay.tpl.php:318
+#: libraries/config/FormDisplay.tpl.php:329
 #: libraries/config/messages.inc.php:610
 msgid "Restore default value"
 msgstr "Επαναφορά προεπιλεγμένης τιμής"
 
-#: libraries/config/FormDisplay.tpl.php:332
+#: libraries/config/FormDisplay.tpl.php:343
 msgid "Allow users to customize this value"
 msgstr "Επιτρέπεται στους χρήστες να προσαρμόσουν αυτή την τιμή"
 
@@ -5884,7 +5898,7 @@ msgstr "Σύνολο χαρακτήρων αρχείου"
 
 #: libraries/config/messages.inc.php:136 libraries/config/messages.inc.php:152
 #: libraries/sql_query_form.lib.php:247
-#: templates/structure/row_stats_table.phtml:7
+#: templates/table/structure/row_stats_table.phtml:7
 msgid "Format"
 msgstr "Μορφοποίηση"
 
@@ -6396,7 +6410,7 @@ msgstr ""
 
 #: libraries/config/messages.inc.php:332
 #: libraries/plugins/export/ExportPdf.class.php:279
-#: templates/structure/secondary_tabs.phtml:8
+#: templates/table/secondary_tabs.phtml:8
 msgid "Table structure"
 msgstr "Δομή πίνακα"
 
@@ -7607,10 +7621,6 @@ msgid "User preferences storage table"
 msgstr "Πίνακας αποθήκευσης προτιμήσεων χρήστη"
 
 #: libraries/config/messages.inc.php:809
-#| msgid ""
-#| "Both this table and the user groups table are required to enable the "
-#| "configurable menus feature; leaving either one of them blank will disable "
-#| "this feature, suggested: [kbd]pma__users[/kbd]."
 msgid ""
 "Both this table and the user groups table are required to enable the "
 "configurable menus feature; leaving either one of them blank will disable\n"
@@ -8122,101 +8132,33 @@ msgstr "Έγγραφο Microsoft Word 2000"
 msgid "OpenDocument Text"
 msgstr "Έγγραφο Κειμένου Ανοιχτού Κώδικα - ODΤ"
 
-#: libraries/controllers/StructureController.class.php:465
+#: libraries/controllers/DatabaseStructureController.class.php:405
 #: tbl_operations.php:382
 #, php-format
 msgid "Table %s has been emptied."
 msgstr "Ο πίνακας %s άδειασε."
 
-#: libraries/controllers/StructureController.class.php:486
+#: libraries/controllers/DatabaseStructureController.class.php:426
 #: tbl_operations.php:400 view_operations.php:119
 #, php-format
 msgid "View %s has been dropped."
 msgstr "Η προβολή %s διαγράφτηκε."
 
-#: libraries/controllers/StructureController.class.php:487
+#: libraries/controllers/DatabaseStructureController.class.php:427
 #: tbl_operations.php:401
 #, php-format
 msgid "Table %s has been dropped."
 msgstr "Ο πίνακας %s έχει διαγραφεί."
 
-#: libraries/controllers/StructureController.class.php:797
-#, php-format
-msgid "The name '%s' is a MySQL reserved keyword."
-msgid_plural "The names '%s' are MySQL reserved keywords."
-msgstr[0] "Το όνομα «%s» είναι δεσμευμένη λέξη-κλειδί MySQL."
-msgstr[1] "Τα ονόματα «%s» είναι δεσμευμένες λέξεις-κλειδία MySQL."
-
-#: libraries/controllers/StructureController.class.php:875
-msgid "No column selected."
-msgstr "Δεν επιλέχθηκε στήλη."
-
-#: libraries/controllers/StructureController.class.php:1049
+#: libraries/controllers/DatabaseStructureController.class.php:733
 msgid "Favorite List is full!"
 msgstr "Η Λίστα Αγαπημένων είναι πλήρης!"
 
-#: libraries/controllers/StructureController.class.php:1272
-msgid "The columns have been moved successfully."
-msgstr "Οι στήλες μετακινήθηκαν επιτυχώς."
-
-#: libraries/controllers/StructureController.class.php:1535
-#, php-format
-msgid ""
-"Table %1$s has been altered successfully. Privileges have been adjusted."
-msgstr "Ο πίνακας %1$s αλλάχτηκε επιτυχώς. Τα προνόμια έχουν προσαρμοστεί."
-
-#: libraries/controllers/StructureController.class.php:1541
-#: libraries/controllers/TableIndexesController.class.php:161
-#: tbl_addfield.php:92
-#, php-format
-msgid "Table %1$s has been altered successfully."
-msgstr "Ο πίνακας %1$s αλλάχτηκε επιτυχώς."
-
-#: libraries/controllers/StructureController.class.php:1588
-#: libraries/tracking.lib.php:1094
-msgid "Query error"
-msgstr "Σφάλμα ερωτήματος"
-
-#: libraries/controllers/StructureController.class.php:1806
+#: libraries/controllers/DatabaseStructureController.class.php:947
 #: libraries/mysql_charsets.lib.php:366 libraries/mysql_charsets.lib.php:373
 msgid "unknown"
 msgstr "άγνωστο"
 
-#: libraries/controllers/StructureController.class.php:1957
-#: templates/structure/check_all_table_column.phtml:11
-msgid "Change"
-msgstr "Αλλαγή"
-
-#: libraries/controllers/StructureController.class.php:1961
-#: libraries/controllers/StructureController.class.php:1966
-#: libraries/navigation/Nodes/Node_Index.class.php:30
-#: libraries/tracking.lib.php:926
-#: templates/columns_definitions/column_indexes.phtml:16
-#: templates/columns_definitions/table_fields_definitions.phtml:57
-#: templates/structure/check_all_table_column.phtml:30
-#: templates/structure/display_structure.phtml:79
-#: templates/structure/display_table_stats.phtml:19
-msgid "Index"
-msgstr "Ευρετήριο"
-
-#: libraries/controllers/StructureController.class.php:1963
-#: libraries/controllers/StructureController.class.php:1968
-#: templates/columns_definitions/column_indexes.phtml:27
-#: templates/structure/check_all_table_column.phtml:37
-msgid "Spatial"
-msgstr "Χωρική"
-
-#: libraries/controllers/StructureController.class.php:1964
-#: libraries/controllers/StructureController.class.php:1969
-#: templates/columns_definitions/column_indexes.phtml:22
-#: templates/structure/check_all_table_column.phtml:47
-msgid "Fulltext"
-msgstr "Πλήρες κείμενο"
-
-#: libraries/controllers/StructureController.class.php:1970
-msgid "Distinct values"
-msgstr "Διακριτές τιμές"
-
 #: libraries/controllers/TableChartController.class.php:82
 #: libraries/controllers/TableGisVisualizationController.class.php:101
 msgid "No SQL query was set to fetch data."
@@ -8230,11 +8172,18 @@ msgstr "Καμία αριθμητική στήλη παρούσα στον πί
 msgid "No data to display"
 msgstr "Κανένα δεδομένο για προβολή"
 
-#: libraries/controllers/TableRelationController.class.php:217
+#: libraries/controllers/TableIndexesController.class.php:161
+#: libraries/controllers/TableStructureController.class.php:736
+#: tbl_addfield.php:92
+#, php-format
+msgid "Table %1$s has been altered successfully."
+msgstr "Ο πίνακας %1$s αλλάχτηκε επιτυχώς."
+
+#: libraries/controllers/TableRelationController.class.php:218
 msgid "Display column was successfully updated."
 msgstr "Η προβολή της στήλης ενημερώθηκε επιτυχώς."
 
-#: libraries/controllers/TableRelationController.class.php:283
+#: libraries/controllers/TableRelationController.class.php:288
 msgid "Internal relations were successfully updated."
 msgstr "Οι εσωτερικές συσχετίσεις έχουν ενημερωθεί επιτυχώς."
 
@@ -8247,10 +8196,71 @@ msgid "Zoom search"
 msgstr "Αναζήτηση εστίασης"
 
 #: libraries/controllers/TableSearchController.class.php:852
-#: templates/table/selection_form.phtml:59
+#: templates/table/search/selection_form.phtml:59
 msgid "Find and replace"
 msgstr "Εύρεση και αντικατάσταση"
 
+#: libraries/controllers/TableStructureController.class.php:163
+#, php-format
+msgid "The name '%s' is a MySQL reserved keyword."
+msgid_plural "The names '%s' are MySQL reserved keywords."
+msgstr[0] "Το όνομα «%s» είναι δεσμευμένη λέξη-κλειδί MySQL."
+msgstr[1] "Τα ονόματα «%s» είναι δεσμευμένες λέξεις-κλειδία MySQL."
+
+#: libraries/controllers/TableStructureController.class.php:241
+msgid "No column selected."
+msgstr "Δεν επιλέχθηκε στήλη."
+
+#: libraries/controllers/TableStructureController.class.php:467
+msgid "The columns have been moved successfully."
+msgstr "Οι στήλες μετακινήθηκαν επιτυχώς."
+
+#: libraries/controllers/TableStructureController.class.php:730
+#, php-format
+msgid ""
+"Table %1$s has been altered successfully. Privileges have been adjusted."
+msgstr "Ο πίνακας %1$s αλλάχτηκε επιτυχώς. Τα προνόμια έχουν προσαρμοστεί."
+
+#: libraries/controllers/TableStructureController.class.php:783
+#: libraries/tracking.lib.php:1094
+msgid "Query error"
+msgstr "Σφάλμα ερωτήματος"
+
+#: libraries/controllers/TableStructureController.class.php:948
+#: templates/table/structure/check_all_table_column.phtml:11
+msgid "Change"
+msgstr "Αλλαγή"
+
+#: libraries/controllers/TableStructureController.class.php:952
+#: libraries/controllers/TableStructureController.class.php:957
+#: libraries/navigation/Nodes/Node_Index.class.php:30
+#: libraries/tracking.lib.php:926
+#: templates/columns_definitions/column_indexes.phtml:16
+#: templates/columns_definitions/table_fields_definitions.phtml:57
+#: templates/table/structure/check_all_table_column.phtml:30
+#: templates/table/structure/display_structure.phtml:79
+#: templates/table/structure/display_table_stats.phtml:19
+msgid "Index"
+msgstr "Ευρετήριο"
+
+#: libraries/controllers/TableStructureController.class.php:954
+#: libraries/controllers/TableStructureController.class.php:959
+#: templates/columns_definitions/column_indexes.phtml:27
+#: templates/table/structure/check_all_table_column.phtml:37
+msgid "Spatial"
+msgstr "Χωρική"
+
+#: libraries/controllers/TableStructureController.class.php:955
+#: libraries/controllers/TableStructureController.class.php:960
+#: templates/columns_definitions/column_indexes.phtml:22
+#: templates/table/structure/check_all_table_column.phtml:47
+msgid "Fulltext"
+msgstr "Πλήρες κείμενο"
+
+#: libraries/controllers/TableStructureController.class.php:963
+msgid "Distinct values"
+msgstr "Διακριτές τιμές"
+
 #: libraries/core.lib.php:306
 #, php-format
 msgid "The %s extension is missing. Please check your PHP configuration."
@@ -8299,7 +8309,7 @@ msgid "No Password"
 msgstr "Χωρίς Κωδικό Πρόσβασης"
 
 #: libraries/display_change_password.lib.php:68
-#: libraries/plugins/auth/AuthenticationCookie.class.php:199
+#: libraries/plugins/auth/AuthenticationCookie.class.php:187
 #: libraries/replication_gui.lib.php:422 libraries/replication_gui.lib.php:862
 #: libraries/server_privileges.lib.php:1640
 msgid "Password:"
@@ -8319,13 +8329,11 @@ msgstr "Μείγμα κωδικού πρόσβασης:"
 
 #: libraries/display_change_password.lib.php:96
 #: libraries/server_privileges.lib.php:1700
-#| msgid "Generate password"
 msgid "MySQL native password"
 msgstr "Εγγενής κωδικός πρόσβασης MySQL"
 
 #: libraries/display_change_password.lib.php:110
 #: libraries/server_privileges.lib.php:1706
-#| msgid "Change password"
 msgid "SHA256 password"
 msgstr "Αλλαγή κωδικού πρόσβασης SHA256"
 
@@ -8341,8 +8349,8 @@ msgid ""
 "the server."
 msgstr ""
 "Αυτή η μέθοδος απαιτεί τη χρήση μιας «<i>σύνδεσης SSL</i>» ή μιας «<i>μη "
-"κρυπτογραμμένης σύνδεσης που κρυπτογραφεί τον κωδικό πρόσβασης με χρήση "
-"RSA</i>», κατά τη σύνδεση στο διακομιστή."
+"κρυπτογραμμένης σύνδεσης που κρυπτογραφεί τον κωδικό πρόσβασης με χρήση RSA</"
+"i>», κατά τη σύνδεση στο διακομιστή."
 
 #: libraries/display_create_database.lib.php:23
 msgid "Create database"
@@ -9100,13 +9108,13 @@ msgid "Dump has been saved to file %s."
 msgstr "Το αρχείο εξόδου αποθηκεύτηκε ως %s."
 
 #: libraries/import.lib.php:202 libraries/insert_edit.lib.php:124
-#: libraries/rte/rte_routines.lib.php:1353 libraries/sql.lib.php:1312
+#: libraries/rte/rte_routines.lib.php:1444 libraries/sql.lib.php:1306
 #: tbl_get_field.php:44
 msgid "MySQL returned an empty result set (i.e. zero rows)."
 msgstr ""
 "Η MySQL επέστρεψε ένα άδειο σύνολο αποτελεσμάτων (π.χ. καμμία εγγραφή)."
 
-#: libraries/import.lib.php:265 libraries/sql.lib.php:1326
+#: libraries/import.lib.php:265 libraries/sql.lib.php:1320
 msgid "[ROLLBACK occurred.]"
 msgstr "[συνέβει ROLLBACK.]"
 
@@ -9172,14 +9180,14 @@ msgstr "Δημιουργία ευρετηρίου σε &nbsp;%s&nbsp; στήλε
 
 #: libraries/insert_edit.lib.php:233
 #: libraries/navigation/Nodes/Node_DatabaseChild.class.php:48
-#: templates/designer/table_list.phtml:40
+#: templates/database/designer/table_list.phtml:40
 msgid "Hide"
 msgstr "Απόκρυψη"
 
 #: libraries/insert_edit.lib.php:249
 #: libraries/navigation/Nodes/Node_Function.class.php:32
-#: libraries/rte/rte_routines.lib.php:1495
-#: templates/table/table_header.phtml:4
+#: libraries/rte/rte_routines.lib.php:1586
+#: templates/table/search/table_header.phtml:4
 msgid "Function"
 msgstr "Συνάρτηση"
 
@@ -9193,84 +9201,85 @@ msgid "Because of its length,<br /> this column might not be editable."
 msgstr ""
 "Εξαιτίας του μεγέθος του,<br /> αυτό το πεδίο ίσως να μη μπορεί να διορθωθεί."
 
-#: libraries/insert_edit.lib.php:1050
+#: libraries/insert_edit.lib.php:1048
 msgid "Binary - do not edit"
 msgstr "Δυαδικό - χωρίς δυνατότητα επεξεργασίας"
 
-#: libraries/insert_edit.lib.php:1176 libraries/server_privileges.lib.php:470
-#: templates/table/options.phtml:36
+#: libraries/insert_edit.lib.php:1174 libraries/server_privileges.lib.php:470
+#: templates/table/search/options.phtml:36
 msgid "Or"
 msgstr "Ενωση"
 
-#: libraries/insert_edit.lib.php:1177
+#: libraries/insert_edit.lib.php:1175
 msgid "web server upload directory:"
 msgstr "κατάλογος αποθήκευσης αρχείων διακομιστή:"
 
-#: libraries/insert_edit.lib.php:1348 templates/table/input_box.phtml:49
+#: libraries/insert_edit.lib.php:1346
+#: templates/table/search/input_box.phtml:49
 msgid "Edit/Insert"
 msgstr "Επεξεργασία/Προσθήκη"
 
-#: libraries/insert_edit.lib.php:1398
+#: libraries/insert_edit.lib.php:1396
 #, php-format
 msgid "Continue insertion with %s rows"
 msgstr "Συνέχιση εισαγωγής με %s εγγραφές"
 
-#: libraries/insert_edit.lib.php:1428
+#: libraries/insert_edit.lib.php:1426
 msgid "and then"
 msgstr "και μετά"
 
-#: libraries/insert_edit.lib.php:1461
+#: libraries/insert_edit.lib.php:1459
 msgid "Insert as new row"
 msgstr "Εισαγωγή ως νέα εγγραφή"
 
-#: libraries/insert_edit.lib.php:1464
+#: libraries/insert_edit.lib.php:1462
 msgid "Insert as new row and ignore errors"
 msgstr "Εισαγωγή ως νέα γραμμή και παράβλεψη σφαλμάτων"
 
-#: libraries/insert_edit.lib.php:1467
+#: libraries/insert_edit.lib.php:1465
 msgid "Show insert query"
 msgstr "Εμφάνιση ερωτήματος εισαγωγής"
 
-#: libraries/insert_edit.lib.php:1487
+#: libraries/insert_edit.lib.php:1485
 msgid "Go back to previous page"
 msgstr "Επιστροφή"
 
-#: libraries/insert_edit.lib.php:1490
+#: libraries/insert_edit.lib.php:1488
 msgid "Insert another new row"
 msgstr "Εισαγωγή νέας εγγραφής"
 
-#: libraries/insert_edit.lib.php:1495
+#: libraries/insert_edit.lib.php:1493
 msgid "Go back to this page"
 msgstr "Επιστροφή σε αυτή τη σελίδα"
 
-#: libraries/insert_edit.lib.php:1518
+#: libraries/insert_edit.lib.php:1516
 msgid "Edit next row"
 msgstr "Επεξεργασία επόμενης γραμμής"
 
-#: libraries/insert_edit.lib.php:1540
+#: libraries/insert_edit.lib.php:1538
 msgid ""
 "Use TAB key to move from value to value, or CTRL+arrows to move anywhere"
 msgstr ""
 "Χρήση του πλήκτρου TAB για μετακίνηση από τιμή σε τιμή ή CTRL+βέλη για "
 "μετακίνηση παντού"
 
-#: libraries/insert_edit.lib.php:1577 libraries/replication_gui.lib.php:542
-#: libraries/rte/rte_routines.lib.php:1497
+#: libraries/insert_edit.lib.php:1575 libraries/replication_gui.lib.php:542
+#: libraries/rte/rte_routines.lib.php:1588
 #: libraries/server_status_variables.lib.php:220
-#: templates/designer/having_query_panel.phtml:100
-#: templates/designer/options_panel.phtml:73
-#: templates/designer/options_panel.phtml:239
-#: templates/designer/where_query_panel.phtml:69
-#: templates/table/table_header.phtml:10
-#: templates/table/zoom_result_form.phtml:35
+#: templates/database/designer/having_query_panel.phtml:100
+#: templates/database/designer/options_panel.phtml:73
+#: templates/database/designer/options_panel.phtml:239
+#: templates/database/designer/where_query_panel.phtml:69
+#: templates/table/search/table_header.phtml:10
+#: templates/table/search/zoom_result_form.phtml:35
 msgid "Value"
 msgstr "Τιμή"
 
-#: libraries/insert_edit.lib.php:1937 libraries/sql.lib.php:1309
+#: libraries/insert_edit.lib.php:1935 libraries/sql.lib.php:1303
 msgid "Showing SQL query"
 msgstr "Εμφάνιση ερωτήματος SQL"
 
-#: libraries/insert_edit.lib.php:1962 libraries/sql.lib.php:1287
+#: libraries/insert_edit.lib.php:1960 libraries/sql.lib.php:1281
 #, php-format
 msgid "Inserted row id: %1$d"
 msgstr "Ταυτότητα εισερχόμενης εγγραφής: %1$d"
@@ -9680,7 +9689,7 @@ msgstr "Νέα"
 #: libraries/navigation/Nodes/Node_View_Container.class.php:26
 #: libraries/navigation/Nodes/Node_View_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:129
-#: templates/structure/show_create.phtml:30
+#: templates/database/structure/show_create.phtml:30
 msgid "Views"
 msgstr "Προβολές"
 
@@ -10018,7 +10027,7 @@ msgstr ""
 
 #: libraries/operations.lib.php:101 libraries/operations.lib.php:249
 #: libraries/operations.lib.php:869 libraries/operations.lib.php:963
-#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:907
+#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:998
 #: templates/columns_definitions/table_fields_definitions.phtml:47
 msgid "Adjust Privileges"
 msgstr "Προσαρμογή Δικαιωμάτων"
@@ -10108,22 +10117,22 @@ msgid "Switch to copied table"
 msgstr "Μεταφορά στον αντεγραμμένο πίνακα"
 
 #: libraries/operations.lib.php:1360
-#: templates/structure/check_all_tables.phtml:18
+#: templates/database/structure/check_all_tables.phtml:18
 msgid "Table maintenance"
 msgstr "Συντήρηση πίνακα"
 
 #: libraries/operations.lib.php:1398
-#: templates/structure/check_all_tables.phtml:19
+#: templates/database/structure/check_all_tables.phtml:19
 msgid "Analyze table"
 msgstr "Ανάλυση πίνακα"
 
 #: libraries/operations.lib.php:1413
-#: templates/structure/check_all_tables.phtml:20
+#: templates/database/structure/check_all_tables.phtml:20
 msgid "Check table"
 msgstr "Έλεγχος πίνακα"
 
 #: libraries/operations.lib.php:1428
-#: templates/structure/check_all_tables.phtml:22
+#: templates/database/structure/check_all_tables.phtml:22
 msgid "Checksum table"
 msgstr "Πίνακας αθροίσματος ελέγχου"
 
@@ -10141,18 +10150,19 @@ msgid "Flush the table (FLUSH)"
 msgstr "Εκκαθάριση («FLUSH») πίνακα"
 
 #: libraries/operations.lib.php:1477
-#: templates/structure/check_all_tables.phtml:23
-#: templates/structure/display_table_stats.phtml:56
+#: templates/database/structure/check_all_tables.phtml:23
+#: templates/table/structure/display_table_stats.phtml:56
 msgid "Optimize table"
 msgstr "Βελτιστοποίηση πίνακα"
 
 #: libraries/operations.lib.php:1492
-#: templates/structure/check_all_tables.phtml:24
+#: templates/database/structure/check_all_tables.phtml:24
 msgid "Repair table"
 msgstr "Επιδιόρθωση πίνακα"
 
 #: libraries/operations.lib.php:1538
-#: templates/structure/check_all_tables.phtml:14 view_operations.php:127
+#: templates/database/structure/check_all_tables.phtml:14
+#: view_operations.php:127
 msgid "Delete data or table"
 msgstr "Διαγραφή δεδομένων ή πίνακα"
 
@@ -10277,7 +10287,7 @@ msgid "Cannot connect: invalid settings."
 msgstr "Αδύνατη η σύνδεση: άκυρες ρυθμίσεις."
 
 #: libraries/plugins/auth/AuthenticationConfig.class.php:108
-#: libraries/plugins/auth/AuthenticationCookie.class.php:134
+#: libraries/plugins/auth/AuthenticationCookie.class.php:122
 #: libraries/plugins/auth/AuthenticationHttp.class.php:96
 #, php-format
 msgid "Welcome to %s"
@@ -10309,38 +10319,38 @@ msgstr ""
 msgid "Retry to connect"
 msgstr "Επαναπροσπάθεια για σύνδεση"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:146
+#: libraries/plugins/auth/AuthenticationCookie.class.php:134
 msgid "Your session has expired. Please log in again."
 msgstr "Η συνεδρία σας έληξε. Συνδεθείτε ξανά."
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:170
+#: libraries/plugins/auth/AuthenticationCookie.class.php:158
 msgid "Log in"
 msgstr "Σύνδεση"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:178
-#: libraries/plugins/auth/AuthenticationCookie.class.php:188
+#: libraries/plugins/auth/AuthenticationCookie.class.php:166
+#: libraries/plugins/auth/AuthenticationCookie.class.php:176
 msgid "You can enter hostname/IP address and port separated by space."
 msgstr ""
 "Μπορείτε να εισάγετε όνομα διακομιστή/διεύθυνση ΙΡ και θύρα χωρισμένα με "
 "κενό."
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:193
+#: libraries/plugins/auth/AuthenticationCookie.class.php:181
 msgid "Username:"
 msgstr "Όνομα χρήστη:"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:205
+#: libraries/plugins/auth/AuthenticationCookie.class.php:193
 msgid "Server Choice:"
 msgstr "Επιλογή Διακομιστή:"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:386
+#: libraries/plugins/auth/AuthenticationCookie.class.php:374
 msgid "Entered captcha is wrong, try again!"
 msgstr "Το captcha που εισάγατε είναι λανθασμένο, δοκιμάστε ξανά!"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:396
+#: libraries/plugins/auth/AuthenticationCookie.class.php:384
 msgid "Please enter correct captcha!"
 msgstr "Εισάγετε το σωστό captcha!"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:423
+#: libraries/plugins/auth/AuthenticationCookie.class.php:411
 msgid "You are not allowed to log in to this MySQL server!"
 msgstr "Δεν επιτρέπεται να συνδεθείτε στον διακομιστή MySQL!"
 
@@ -10436,7 +10446,7 @@ msgstr "Συμβάν"
 #: libraries/plugins/export/ExportOdt.class.php:593
 #: libraries/plugins/export/ExportTexytext.class.php:428
 #: libraries/plugins/export/PMA_ExportPdf.class.php:313
-#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:984
 #: libraries/rte/rte_triggers.lib.php:377
 msgid "Definition"
 msgstr "Προσδιορισμός"
@@ -10759,7 +10769,7 @@ msgid "Last check:"
 msgstr "Tελευταίος έλεγχος:"
 
 #: libraries/plugins/export/ExportSql.class.php:1399
-#: templates/structure/structure_table_row.phtml:183
+#: templates/database/structure/structure_table_row.phtml:183
 msgid "in use"
 msgstr "σε χρήση"
 
@@ -10952,18 +10962,14 @@ msgstr "Η Χωρική Επέκταση της MySQL δεν υποστηρίζ
 msgid "The imported file does not contain any data!"
 msgstr "Το εισαγόμενο αρχείο δεν περιέχει δεδομένα!"
 
-#: libraries/plugins/import/ImportSql.class.php:169
+#: libraries/plugins/import/ImportSql.class.php:72
 msgid "SQL compatibility mode:"
 msgstr "Κατάσταση συμβατότητας SQL:"
 
-#: libraries/plugins/import/ImportSql.class.php:181
+#: libraries/plugins/import/ImportSql.class.php:84
 msgid "Do not use <code>AUTO_INCREMENT</code> for zero values"
 msgstr "Να μην γίνεται <code>AUTO_INCREMENT</code> σε μηδενικές τιμές"
 
-#: libraries/plugins/import/ImportSql.class.php:195
-msgid "Read as multibytes"
-msgstr "Ανάγνωση ως πολλαπλών bytes"
-
 #: libraries/plugins/import/ImportXml.class.php:54
 msgid "XML"
 msgstr "Κώδικας XML"
@@ -11006,7 +11012,7 @@ msgid "Show grid"
 msgstr "Εμφάνιση πλέγματος"
 
 #: libraries/plugins/schema/SchemaPdf.class.php:94
-#: templates/structure/print_view_data_dictionary_link.phtml:6
+#: templates/database/structure/print_view_data_dictionary_link.phtml:6
 msgid "Data Dictionary"
 msgstr "Περιληπτικός πίνακας δεδομένων"
 
@@ -11031,7 +11037,7 @@ msgid "The %s table doesn't exist!"
 msgstr "Ο πίνακας «%s» δεν υπάρχει!"
 
 #: libraries/plugins/schema/eps/Eps_Relation_Schema.class.php:321
-#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:309
+#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:323
 #, php-format
 msgid "Schema of the %s database - Page %s"
 msgstr "Σχήμα της βάσης δεδομένων %s - Σελίδα %s"
@@ -11057,7 +11063,7 @@ msgstr "Πίνακας περιεχομένων"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1005
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1028
 #: libraries/tracking.lib.php:884
-#: templates/structure/table_structure_header.phtml:11
+#: templates/table/structure/table_structure_header.phtml:11
 msgid "Extra"
 msgstr "Πρόσθετα"
 
@@ -11425,11 +11431,11 @@ msgstr ""
 "Δημιουργία των απαραίτητων πινάκων με το αρχείο <code>%screate_tables.sql</"
 "code>."
 
-#: libraries/relation.lib.php:360
+#: libraries/relation.lib.php:357
 msgid "Create a pma user and give access to these tables."
 msgstr "Δημιουργήστε έναν χρήστη pma και δώστε πρόσβαση σε αυτούς του πίνακες."
 
-#: libraries/relation.lib.php:365
+#: libraries/relation.lib.php:360
 msgid ""
 "Enable advanced features in configuration file (<code>config.inc.php</"
 "code>), for example by starting from <code>config.sample.inc.php</code>."
@@ -11438,17 +11444,17 @@ msgstr ""
 "(<code>config.inc.php</code>), για παράδειγμα ξεκινήστε με το αρχείο "
 "<code>config.sample.inc.php</code>."
 
-#: libraries/relation.lib.php:373
+#: libraries/relation.lib.php:365
 msgid "Re-login to phpMyAdmin to load the updated configuration file."
 msgstr ""
 "Επανασυνδεθείτε στο phpMyAdmin για να φορτωθεί το ενημερωμένο αρχείο "
 "ρυθμίσεων."
 
-#: libraries/relation.lib.php:1612
+#: libraries/relation.lib.php:1607
 msgid "no description"
 msgstr "χωρίς περιγραφή"
 
-#: libraries/relation.lib.php:1811
+#: libraries/relation.lib.php:1806
 msgid ""
 "You do not have necessary privileges to create a database named "
 "'phpmyadmin'. You may go to 'Operations' tab of any database to set up the "
@@ -11459,7 +11465,7 @@ msgstr ""
 "οποιασδήποτε βάσης δεδομένων για να ορίσετε την αποθήκευση ρυθμίσεων του "
 "phpMyAdmin εκεί."
 
-#: libraries/relation.lib.php:1928
+#: libraries/relation.lib.php:1923
 #, php-format
 msgid ""
 "%sCreate%s a database named 'phpmyadmin' and setup the phpMyAdmin "
@@ -11468,7 +11474,7 @@ msgstr ""
 "%sΔημιουργία%s μιας βάσης δεδομένων με το όνομα «phpmyadmin» και εγκατάσταση "
 "της αποθήκευσης ρυθμίσεων του phpMyAdmin εκεί."
 
-#: libraries/relation.lib.php:1936
+#: libraries/relation.lib.php:1931
 #, php-format
 msgid ""
 "%sCreate%s the phpMyAdmin configuration storage in the current database."
@@ -11476,14 +11482,14 @@ msgstr ""
 "%sΔημιουργία%s του τρέχοντος χώρου αποθήκευσης ρυθμίσεων του phpMyAdmin στην "
 "τρέχουσα βάση δεδομένων."
 
-#: libraries/relation.lib.php:1944
+#: libraries/relation.lib.php:1939
 #, php-format
 msgid "%sCreate%s missing phpMyAdmin configuration storage tables."
 msgstr ""
 "%sΔημιουργία%s των πινάκων αποθήκευσης ρυθμίσεων του phpMyAdmin που λείπουν."
 
 #: libraries/replication_gui.lib.php:46 libraries/replication_gui.lib.php:343
-#: libraries/server_databases.lib.php:387
+#: libraries/server_databases.lib.php:398
 msgid "Master replication"
 msgstr "Πρωτεύουσα αναπαραγωγή"
 
@@ -11506,12 +11512,6 @@ msgid "Master configuration"
 msgstr "Ρύθμιση πρωτεύοντος"
 
 #: libraries/replication_gui.lib.php:90
-#| msgid ""
-#| "This server is not configured as master server in a replication process. "
-#| "You can choose from either replicating all databases and ignoring certain "
-#| "(useful if you want to replicate majority of databases) or you can choose "
-#| "to ignore all databases by default and allow only certain databases to be "
-#| "replicated. Please select the mode:"
 msgid ""
 "This server is not configured as a master server in a replication process. "
 "You can choose from either replicating all databases and ignoring some of "
@@ -11557,7 +11557,7 @@ msgstr ""
 "<b>έχει</b> ρυθμιστεί ως πρωτεύων."
 
 #: libraries/replication_gui.lib.php:141
-#: libraries/server_databases.lib.php:389
+#: libraries/server_databases.lib.php:400
 msgid "Slave replication"
 msgstr "Δευτερεύουσα αναπαραγωγή"
 
@@ -11834,10 +11834,10 @@ msgid "Master server changed successfully to %s."
 msgstr "Ο πρωτεύων διακομιστής άλλαξε επιτυχώς σε %s."
 
 #: libraries/rte/rte_events.lib.php:106 libraries/rte/rte_events.lib.php:115
-#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:149
-#: libraries/rte/rte_routines.lib.php:158
-#: libraries/rte/rte_routines.lib.php:231
-#: libraries/rte/rte_routines.lib.php:1362
+#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:219
+#: libraries/rte/rte_routines.lib.php:246
+#: libraries/rte/rte_routines.lib.php:368
+#: libraries/rte/rte_routines.lib.php:1453
 #: libraries/rte/rte_triggers.lib.php:82 libraries/rte/rte_triggers.lib.php:91
 #: libraries/rte/rte_triggers.lib.php:123
 #, php-format
@@ -11858,7 +11858,7 @@ msgstr "Το συμβάν %1$s έχει αλλαχτεί."
 msgid "Event %1$s has been created."
 msgstr "Το συμβάν %1$s έχει δημιουργηθεί."
 
-#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:251
+#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:266
 #: libraries/rte/rte_triggers.lib.php:144
 msgid "One or more errors have occurred while processing your request:"
 msgstr ""
@@ -11868,7 +11868,7 @@ msgstr ""
 msgid "Edit event"
 msgstr "Επεξεργασία συμβάντος"
 
-#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:794
+#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:885
 #: libraries/rte/rte_triggers.lib.php:323 view_create.php:180
 msgid "Details"
 msgstr "Λεπτομέρειες"
@@ -11881,7 +11881,7 @@ msgstr "Όνομα συμβάντος"
 msgid "Event type"
 msgstr "Τύπος συμβάντος"
 
-#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:817
+#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:908
 #, php-format
 msgid "Change to %s"
 msgstr "Αλλαγή σε %s"
@@ -11908,12 +11908,14 @@ msgstr "Λήξη"
 msgid "On completion preserve"
 msgstr "Διατήρηση με την ολοκλήρωση"
 
-#: libraries/rte/rte_events.lib.php:491 libraries/rte/rte_routines.lib.php:930
+#: libraries/rte/rte_events.lib.php:491
+#: libraries/rte/rte_routines.lib.php:1021
 #: libraries/rte/rte_triggers.lib.php:383 view_create.php:209
 msgid "Definer"
 msgstr "Προσδιοριστής"
 
-#: libraries/rte/rte_events.lib.php:535 libraries/rte/rte_routines.lib.php:997
+#: libraries/rte/rte_events.lib.php:535
+#: libraries/rte/rte_routines.lib.php:1088
 #: libraries/rte/rte_triggers.lib.php:422
 msgid "The definer must be in the \"username@hostname\" format!"
 msgstr "Ο οριστής πρέπει να είναι της μορφής «username@hostname»!"
@@ -11939,9 +11941,9 @@ msgid "You must provide an event definition."
 msgstr "Πρέπει να δώσετε έναν προσδιορισμό συμβάντος."
 
 #: libraries/rte/rte_export.lib.php:43 libraries/rte/rte_general.lib.php:72
-#: libraries/rte/rte_routines.lib.php:345
-#: libraries/rte/rte_routines.lib.php:1198
-#: libraries/rte/rte_routines.lib.php:1411
+#: libraries/rte/rte_routines.lib.php:153
+#: libraries/rte/rte_routines.lib.php:1289
+#: libraries/rte/rte_routines.lib.php:1502
 msgid "Error in processing request:"
 msgstr "Σφάλμα στην προώθηση αιτημάτος:"
 
@@ -11977,72 +11979,72 @@ msgstr ""
 "αποθηκευμένων ερωτημάτων ίσως αποτύχουν![/strong] Χρησιμοποιήστε τη "
 "βελτιωμένη επέκταση «mysqli» για να αποφύγετε προβλήματα."
 
-#: libraries/rte/rte_routines.lib.php:110
-#: libraries/rte/rte_routines.lib.php:1006
+#: libraries/rte/rte_routines.lib.php:123
+msgid "Edit routine"
+msgstr "Επεξεργασία ρουτίνας"
+
+#: libraries/rte/rte_routines.lib.php:200
+#: libraries/rte/rte_routines.lib.php:1097
 #, php-format
 msgid "Invalid routine type: \"%s\""
 msgstr "Μη έγκυρος τύπος ρουτίνας: «%s»"
 
-#: libraries/rte/rte_routines.lib.php:170
-msgid "Sorry, we failed to restore the dropped routine."
-msgstr "Συγνώμη, αποτύχαμε να επαναφέρουμε τη διαγραμμένη ρουτίνα."
-
-#: libraries/rte/rte_routines.lib.php:211
-#, php-format
-msgid "Routine %1$s has been modified. Privileges have been adjusted."
-msgstr "Η ρουτίνα %1$s έχει αλλαχτεί. Τα προνόμια έχουν προσαρμοστει."
-
-#: libraries/rte/rte_routines.lib.php:216
-#, php-format
-msgid "Routine %1$s has been modified."
-msgstr "Η ρουτίνα %1$s έχει αλλαχτεί."
-
-#: libraries/rte/rte_routines.lib.php:238
+#: libraries/rte/rte_routines.lib.php:253
 #, php-format
 msgid "Routine %1$s has been created."
 msgstr "Η ρουτίνα %1$s έχει δημιουργηθεί."
 
-#: libraries/rte/rte_routines.lib.php:315
-msgid "Edit routine"
-msgstr "Επεξεργασία ρουτίνας"
+#: libraries/rte/rte_routines.lib.php:380
+msgid "Sorry, we failed to restore the dropped routine."
+msgstr "Συγνώμη, αποτύχαμε να επαναφέρουμε τη διαγραμμένη ρουτίνα."
 
-#: libraries/rte/rte_routines.lib.php:797
+#: libraries/rte/rte_routines.lib.php:439
+#, php-format
+msgid "Routine %1$s has been modified. Privileges have been adjusted."
+msgstr "Η ρουτίνα %1$s έχει αλλαχτεί. Τα προνόμια έχουν προσαρμοστει."
+
+#: libraries/rte/rte_routines.lib.php:444
+#, php-format
+msgid "Routine %1$s has been modified."
+msgstr "Η ρουτίνα %1$s έχει αλλαχτεί."
+
+#: libraries/rte/rte_routines.lib.php:888
 msgid "Routine name"
 msgstr "Όνομα ρουτίνας"
 
-#: libraries/rte/rte_routines.lib.php:823
+#: libraries/rte/rte_routines.lib.php:914
 msgid "Parameters"
 msgstr "Παράμετροι"
 
-#: libraries/rte/rte_routines.lib.php:829
+#: libraries/rte/rte_routines.lib.php:920
 msgid "Direction"
 msgstr "Κατεύθυνση"
 
-#: libraries/rte/rte_routines.lib.php:847
+#: libraries/rte/rte_routines.lib.php:938
 msgid "Add parameter"
 msgstr "Προσθήκη παραμέτρου"
 
-#: libraries/rte/rte_routines.lib.php:851
+#: libraries/rte/rte_routines.lib.php:942
 msgid "Remove last parameter"
 msgstr "Μετακίνηση τελευταίας παραμέτρου"
 
-#: libraries/rte/rte_routines.lib.php:856
+#: libraries/rte/rte_routines.lib.php:947
 msgid "Return type"
 msgstr "Τύπος επιστροφής"
 
-#: libraries/rte/rte_routines.lib.php:862
+#: libraries/rte/rte_routines.lib.php:953
 msgid "Return length/values"
 msgstr "Επιστροφή μήκους/τιμών"
 
-#: libraries/rte/rte_routines.lib.php:868
+#: libraries/rte/rte_routines.lib.php:959
 msgid "Return options"
 msgstr "Επιλογές επιστροφής"
 
-#: libraries/rte/rte_routines.lib.php:899
+#: libraries/rte/rte_routines.lib.php:990
 msgid "Is deterministic"
 msgstr "Είναι προσδιοριστικό"
 
-#: libraries/rte/rte_routines.lib.php:920
+#: libraries/rte/rte_routines.lib.php:1011
 msgid ""
 "You do not have sufficient privileges to perform this operation; Please "
 "refer to the documentation for more details"
@@ -12050,25 +12052,25 @@ msgstr ""
 "Δεν έχετε επαρκή δικαιώματα για εκτέλεση αυτή της λειτουργίας. Δείτε την "
 "τεκμηρίωση για περισσότερες λεπτομέρειες"
 
-#: libraries/rte/rte_routines.lib.php:935
+#: libraries/rte/rte_routines.lib.php:1026
 msgid "Security type"
 msgstr "Τύπος ασφάλειας"
 
-#: libraries/rte/rte_routines.lib.php:944
+#: libraries/rte/rte_routines.lib.php:1035
 msgid "SQL data access"
 msgstr "Πρόσβαση δεδομένων SQL"
 
-#: libraries/rte/rte_routines.lib.php:1013
+#: libraries/rte/rte_routines.lib.php:1104
 msgid "You must provide a routine name!"
 msgstr "Πρέπει να δώσετε ένα όνομα στη ρουτίνα!"
 
-#: libraries/rte/rte_routines.lib.php:1047
+#: libraries/rte/rte_routines.lib.php:1138
 #, php-format
 msgid "Invalid direction \"%s\" given for parameter."
 msgstr "Εσφαλμένη κατεύθυνση «%s» δόθηκε για την παράμετρο."
 
-#: libraries/rte/rte_routines.lib.php:1069
-#: libraries/rte/rte_routines.lib.php:1131
+#: libraries/rte/rte_routines.lib.php:1160
+#: libraries/rte/rte_routines.lib.php:1222
 msgid ""
 "You must provide length/values for routine parameters of type ENUM, SET, "
 "VARCHAR and VARBINARY."
@@ -12076,25 +12078,25 @@ msgstr ""
 "Πρέπει να δώσετε μήκος/τιμές για τις παραμέτρους της ρουτίνας του τύπου "
 "ENUM, SET, VARCHAR και VARBINARY."
 
-#: libraries/rte/rte_routines.lib.php:1095
+#: libraries/rte/rte_routines.lib.php:1186
 msgid "You must provide a name and a type for each routine parameter."
 msgstr ""
 "Πρέπει να δώσετε ένα όνομα και ένα τύπο για κάθε παράμετρος της ρουτίνας."
 
-#: libraries/rte/rte_routines.lib.php:1114
+#: libraries/rte/rte_routines.lib.php:1205
 msgid "You must provide a valid return type for the routine."
 msgstr "Πρέπει να δώσετε ένα έγκυρο τύπο επιστροφής για τη ρουτίνα."
 
-#: libraries/rte/rte_routines.lib.php:1174
+#: libraries/rte/rte_routines.lib.php:1265
 msgid "You must provide a routine definition."
 msgstr "Πρέπει να δώσετε ένα προσδιορισμό ρουτίνας."
 
-#: libraries/rte/rte_routines.lib.php:1285
+#: libraries/rte/rte_routines.lib.php:1376
 #, php-format
 msgid "Execution results of routine %s"
 msgstr "Αποτελέσματα εκτέλεσης της ρουτίνας %s"
 
-#: libraries/rte/rte_routines.lib.php:1340
+#: libraries/rte/rte_routines.lib.php:1431
 #, php-format
 msgid "%d row affected by the last statement inside the procedure."
 msgid_plural "%d rows affected by the last statement inside the procedure."
@@ -12103,13 +12105,13 @@ msgstr[0] ""
 msgstr[1] ""
 "%d εγγραφές επηρεάστηκαν από την τελευταία δήλωση μέσα στη διαδικασία."
 
-#: libraries/rte/rte_routines.lib.php:1398
-#: libraries/rte/rte_routines.lib.php:1406
+#: libraries/rte/rte_routines.lib.php:1489
+#: libraries/rte/rte_routines.lib.php:1497
 msgid "Execute routine"
 msgstr "Εκτέλεση ρουτίνας"
 
-#: libraries/rte/rte_routines.lib.php:1485
-#: libraries/rte/rte_routines.lib.php:1488
+#: libraries/rte/rte_routines.lib.php:1576
+#: libraries/rte/rte_routines.lib.php:1579
 msgid "Routine parameters"
 msgstr "Παράμετροι ρουτίνας"
 
@@ -12264,7 +12266,7 @@ msgid "Original position"
 msgstr "Αρχική θέση"
 
 #: libraries/server_bin_log.lib.php:133
-#: templates/structure/display_table_stats.phtml:4
+#: templates/table/structure/display_table_stats.phtml:4
 msgid "Information"
 msgstr "Πληροφορία"
 
@@ -12302,12 +12304,12 @@ msgstr ""
 "Σημείωση: Η ενεργοποίηση στατιστικών μπορεί να προκαλέσει μεγάλη μεταφορά "
 "δεδομένων μεταξύ του διακομιστή ιστού και του διακομιστή MySQL."
 
-#: libraries/server_databases.lib.php:364
-#: libraries/server_databases.lib.php:365
+#: libraries/server_databases.lib.php:366
+#: libraries/server_databases.lib.php:371
 msgid "Enable Statistics"
 msgstr "Ενεργοποίηση Στατιστικών"
 
-#: libraries/server_databases.lib.php:481
+#: libraries/server_databases.lib.php:492
 #, php-format
 msgid "%1$d database has been dropped successfully."
 msgid_plural "%1$d databases have been dropped successfully."
@@ -12673,7 +12675,6 @@ msgstr "Διατήρηση κωδικού πρόσβασης"
 
 #: libraries/server_privileges.lib.php:1694
 #: libraries/server_privileges.lib.php:1697
-#| msgid "Authentication"
 msgid "Authentication Plugin"
 msgstr "Πρόσθετο Πιστοποιίησης"
 
@@ -12688,7 +12689,7 @@ msgid "You have revoked the privileges for %s."
 msgstr "Ανακαλέσατε τα δικαιώματα για %s."
 
 #: libraries/server_privileges.lib.php:2059
-#: libraries/server_privileges.lib.php:4290
+#: libraries/server_privileges.lib.php:4316
 msgid "Add user account"
 msgstr "Προσθήκη λογαριασμού χρήστη"
 
@@ -12857,36 +12858,36 @@ msgstr "Διαγραφή %s"
 msgid "The privileges were reloaded successfully."
 msgstr "Τα δικαιώματα επαναφορτώθηκαν επιτυχώς."
 
-#: libraries/server_privileges.lib.php:3994
+#: libraries/server_privileges.lib.php:4003
 #, php-format
 msgid "The user %s already exists!"
 msgstr "Ο χρήστης %s υπάρχει ήδη!"
 
-#: libraries/server_privileges.lib.php:4232
+#: libraries/server_privileges.lib.php:4258
 #, php-format
 msgid "Privileges for %s"
 msgstr "Δικαιώματα για %s"
 
-#: libraries/server_privileges.lib.php:4241
+#: libraries/server_privileges.lib.php:4267
 #: libraries/server_status_processes.lib.php:72
 #: libraries/server_user_groups.lib.php:39
 msgid "User"
 msgstr "Χρήστης"
 
-#: libraries/server_privileges.lib.php:4282
+#: libraries/server_privileges.lib.php:4308
 msgctxt "Create new user"
 msgid "New"
 msgstr "Νέος"
 
-#: libraries/server_privileges.lib.php:4311
+#: libraries/server_privileges.lib.php:4337
 msgid "Edit privileges:"
 msgstr "Επεξεργασία δικαιωμάτων:"
 
-#: libraries/server_privileges.lib.php:4312
+#: libraries/server_privileges.lib.php:4338
 msgid "User account"
 msgstr "Λογαριασμός χρήστη"
 
-#: libraries/server_privileges.lib.php:4371
+#: libraries/server_privileges.lib.php:4397
 msgid ""
 "Note: You are attempting to edit privileges of the user with which you are "
 "currently logged in."
@@ -12894,11 +12895,11 @@ msgstr ""
 "Σημείωση: Προσπαθείτε να επεξεργαστείτε δικαιώματα του χρήστη με τον οποίο "
 "έχετε συνδεθεί."
 
-#: libraries/server_privileges.lib.php:4391 libraries/server_users.lib.php:25
+#: libraries/server_privileges.lib.php:4417 libraries/server_users.lib.php:25
 msgid "User accounts overview"
 msgstr "Επισκόπηση λογαριασμών χρηστών"
 
-#: libraries/server_privileges.lib.php:4459
+#: libraries/server_privileges.lib.php:4485
 msgid ""
 "A user account allowing any user from localhost to connect is present. This "
 "will prevent other users from connecting if the host part of their account "
@@ -12909,7 +12910,7 @@ msgstr ""
 "φιλοξενίας του λογαριασμού τους επιτρέπει μια σύνδεση από οποιαδήποτε (%) "
 "φιλοξενία."
 
-#: libraries/server_privileges.lib.php:4500
+#: libraries/server_privileges.lib.php:4526
 #, php-format
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
@@ -12923,12 +12924,7 @@ msgstr ""
 "αλλαγές χειροκίνητα. Σε αυτήν την περίπτωση, θα πρέπει να %sεπαναφορτώσετε "
 "τα δικαιώματα%s πριν συνεχίσετε."
 
-#: libraries/server_privileges.lib.php:4519
-#| msgid ""
-#| "Note: phpMyAdmin gets the users' privileges directly from MySQL's "
-#| "privilege tables. The content of these tables may differ from the "
-#| "privileges the server uses, if they have been changed manually. In this "
-#| "case, you should %sreload the privileges%s before you continue."
+#: libraries/server_privileges.lib.php:4545
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
 "tables. The content of these tables may differ from the privileges the "
@@ -12942,25 +12938,25 @@ msgstr ""
 "αλλαγές χειροκίνητα. Σε αυτήν την περίπτωση, τα δικαιώματα πρέπει να "
 "επαναφορτωθούν αλλά προς το παρόν, δεν έχετε το δικαίωμα RELOAD."
 
-#: libraries/server_privileges.lib.php:4569
+#: libraries/server_privileges.lib.php:4595
 msgid "The selected user was not found in the privilege table."
 msgstr "Ο επιλεγμένος χρήστης δεν βρέθηκε στον πίνακα δικαιωμάτων."
 
-#: libraries/server_privileges.lib.php:4801
+#: libraries/server_privileges.lib.php:4827
 msgid "You have added a new user."
 msgstr "Προσθέσατε ένα νέο χρήστη."
 
-#: libraries/server_status.lib.php:53
+#: libraries/server_status.lib.php:60
 #, php-format
 msgid "Network traffic since startup: %s"
 msgstr "Κυκλοφορία δικτύου από την εκκίνηση: %s"
 
-#: libraries/server_status.lib.php:66
+#: libraries/server_status.lib.php:73
 #, php-format
 msgid "This MySQL server has been running for %1$s. It started up on %2$s."
 msgstr "Αυτός ο διακομιστής MySQL λειτουργεί για %1$s. Ξεκίνησε στις %2$s."
 
-#: libraries/server_status.lib.php:80
+#: libraries/server_status.lib.php:94
 msgid ""
 "This MySQL server works as <b>master</b> and <b>slave</b> in <b>replication</"
 "b> process."
@@ -12968,23 +12964,23 @@ msgstr ""
 "Αυτός ο διακομιστής λειτουργεί ως <b>πρωτεύων</b> και <b>δευτερεύων</b> σε "
 "μια <b>αναπαραγωγική</b> διαδικασία."
 
-#: libraries/server_status.lib.php:85
+#: libraries/server_status.lib.php:99
 msgid "This MySQL server works as <b>master</b> in <b>replication</b> process."
 msgstr ""
 "Αυτός ο διακομιστής λειτουργεί ως <b>πρωτεύων</b> σε μια <b>αναπαραγωγική</"
 "b> διαδικασία."
 
-#: libraries/server_status.lib.php:90
+#: libraries/server_status.lib.php:104
 msgid "This MySQL server works as <b>slave</b> in <b>replication</b> process."
 msgstr ""
 "Αυτός ο διακομιστής έχει ρυθμιστεί ως <b>πρωτεύων</b> σε μια "
 "<b>αναπαραγωγική</b> διαδικασία."
 
-#: libraries/server_status.lib.php:106
+#: libraries/server_status.lib.php:116
 msgid "Replication status"
 msgstr "Κατάσταση αναπαραγωγής"
 
-#: libraries/server_status.lib.php:137
+#: libraries/server_status.lib.php:146
 msgid ""
 "On a busy server, the byte counters may overrun, so those statistics as "
 "reported by the MySQL server may be incorrect."
@@ -12993,19 +12989,19 @@ msgstr ""
 "έτσι αυτές οι στατιστικές όπως αναφέρονται από τον διακομιστή μπορεί να "
 "είναι εσφαλμένες."
 
-#: libraries/server_status.lib.php:148
+#: libraries/server_status.lib.php:157
 msgid "Received"
 msgstr "Ελήφθησαν"
 
-#: libraries/server_status.lib.php:167
+#: libraries/server_status.lib.php:176
 msgid "Sent"
 msgstr "Εστάλησαν"
 
-#: libraries/server_status.lib.php:234
+#: libraries/server_status.lib.php:243
 msgid "Max. concurrent connections"
 msgstr "Μέγιστος αριθμός ταυτόχρονων συνδέσεων"
 
-#: libraries/server_status.lib.php:244
+#: libraries/server_status.lib.php:253
 msgid "Failed attempts"
 msgstr "Αποτυχημένες προσπάθειες"
 
@@ -14121,7 +14117,7 @@ msgstr ""
 msgid "Not implemented yet."
 msgstr "Δεν εφαρμόστηκε ακόμα."
 
-#: libraries/sql-parser/src/Components/AlterOperation.php:193
+#: libraries/sql-parser/src/Components/AlterOperation.php:191
 msgid "Unrecognized alter operation."
 msgstr "Μη αναγνωρισμένη λειτουργία αλλαγής."
 
@@ -14135,7 +14131,7 @@ msgid "An opening bracket followed by a set of values was expected."
 msgstr "Αναμενόταν μια ανοιχτή αγκύλη ακολουθούμενη από ένα σύνολο τιμών."
 
 #: libraries/sql-parser/src/Components/ArrayObj.php:101
-#: libraries/sql-parser/src/Components/FieldDefinition.php:202
+#: libraries/sql-parser/src/Components/CreateDefinition.php:202
 msgid "An opening bracket was expected."
 msgstr "Αναμενόταν μια ανοιχτή αγκύλη."
 
@@ -14143,42 +14139,40 @@ msgstr "Αναμενόταν μια ανοιχτή αγκύλη."
 msgid "A comma or a closing bracket was expected"
 msgstr "Αναμενόταν ένα κόμμα ή μια κλειστή αγκύλη"
 
+#: libraries/sql-parser/src/Components/CreateDefinition.php:246
+msgid "A comma or a closing bracket was expected."
+msgstr "Αναμενόταν ένα κόμμα ή μια κλειστή αγκύλη."
+
+#: libraries/sql-parser/src/Components/CreateDefinition.php:262
+msgid "A closing bracket was expected."
+msgstr "Αναμενόταν κλείσιμο αγκύλης."
+
 #: libraries/sql-parser/src/Components/DataType.php:125
 msgid "Unrecognized data type."
 msgstr "Μη αναγνωρισμένος τύπος δεδομένων."
 
-#: libraries/sql-parser/src/Components/Expression.php:225
+#: libraries/sql-parser/src/Components/Expression.php:227
 msgid "Unexpected closing bracket."
 msgstr "Μη αναμενόμενο κλείσιμο αγκύλης."
 
-#: libraries/sql-parser/src/Components/Expression.php:246
-#: libraries/sql-parser/src/Components/Expression.php:283
-#: libraries/sql-parser/src/Components/Expression.php:303
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:285
+#: libraries/sql-parser/src/Components/Expression.php:305
 msgid "An alias was previously found."
 msgstr "Βρέθηκε μια ετικέτα προηγουμένως."
 
-#: libraries/sql-parser/src/Components/Expression.php:257
+#: libraries/sql-parser/src/Components/Expression.php:259
 msgid "Unexpected dot."
 msgstr "Μη αναμενόμενη τελεία."
 
-#: libraries/sql-parser/src/Components/Expression.php:327
+#: libraries/sql-parser/src/Components/Expression.php:329
 msgid "An alias was expected."
 msgstr "Αναμενόταν μια ετικέτα."
 
 #: libraries/sql-parser/src/Components/ExpressionArray.php:96
-#| msgid "No versions selected."
 msgid "An expression was expected."
 msgstr "Αναμενόταν μια έκφραση."
 
-#: libraries/sql-parser/src/Components/FieldDefinition.php:246
-#| msgid "A comma or a closing bracket was expected"
-msgid "A comma or a closing bracket was expected."
-msgstr "Αναμενόταν ένα κόμμα ή μια κλειστή αγκύλη."
-
-#: libraries/sql-parser/src/Components/FieldDefinition.php:262
-msgid "A closing bracket was expected."
-msgstr "Αναμενόταν κλείσιμο αγκύλης."
-
 #: libraries/sql-parser/src/Components/Limit.php:90
 #: libraries/sql-parser/src/Components/Limit.php:112
 msgid "An offset was expected."
@@ -14218,25 +14212,24 @@ msgstr "Αναμενόταν λευκό(ά) διάστημα(τα) πριν το
 msgid "Expected delimiter."
 msgstr "Αναμενόταν διαχωριστής."
 
-#: libraries/sql-parser/src/Lexer.php:753
+#: libraries/sql-parser/src/Lexer.php:777
 #, php-format
 msgid "Ending quote %1$s was expected."
 msgstr "Αναμενόταν τελικό εισαγωγικό %1$s."
 
-#: libraries/sql-parser/src/Lexer.php:789
+#: libraries/sql-parser/src/Lexer.php:813
 msgid "Variable name was expected."
 msgstr "Αναμενόταν όνομα μεταβλητής."
 
-#: libraries/sql-parser/src/Parser.php:380
+#: libraries/sql-parser/src/Parser.php:391
 msgid "Unexpected beginning of statement."
 msgstr "Μη αναμενόμενη έναρξη δήλωσης."
 
-#: libraries/sql-parser/src/Parser.php:399
+#: libraries/sql-parser/src/Parser.php:410
 msgid "Unrecognized statement type."
 msgstr "Μη αναγνωρισμένος τύπος δήλωσης."
 
-#: libraries/sql-parser/src/Parser.php:479
-#| msgid "An alias was previously found."
+#: libraries/sql-parser/src/Parser.php:489
 msgid "No transaction was previously started."
 msgstr "Καμιά συναλλαγή δεν ξεκίνησε προηγουμένως."
 
@@ -14245,7 +14238,6 @@ msgid "Unexpected token."
 msgstr "Μη αναμενόμενο τεκμήριο."
 
 #: libraries/sql-parser/src/Statement.php:238
-#| msgid "An alias was previously found."
 msgid "This type of clause was previously parsed."
 msgstr "Αυτός ο τύπος ρύτρας έχει αναλυθεί προηγουμένως."
 
@@ -14265,7 +14257,8 @@ msgid "The name of the entity was expected."
 msgstr "Αναμενόταν το όνομα της οντότητας."
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:310
-msgid "At least one field definition was expected."
+#| msgid "At least one field definition was expected."
+msgid "At least one column definition was expected."
 msgstr "Αναμενόταν τουλάχιστον ένας ορισμός πεδίου."
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:329
@@ -14325,11 +14318,11 @@ msgstr "Ο σελιδοδείκτης δεν δημιουργήθηκε!"
 msgid "Using bookmark \"%s\" as default browse query."
 msgstr "Χρήση του σελιδοδείκτη «%s» ως προεπιλεγμένο ερώτημα φυλλομετρητή."
 
-#: libraries/sql.lib.php:1306
+#: libraries/sql.lib.php:1300
 msgid "Showing as PHP code"
 msgstr "Εμφάνιση ως κώδικά PHP"
 
-#: libraries/sql.lib.php:1638
+#: libraries/sql.lib.php:1632
 #, php-format
 msgid ""
 "Current selection does not contain a unique column. Grid edit, checkbox, "
@@ -14339,7 +14332,7 @@ msgstr ""
 "επεξεργασίας πλέγματος, πλαίσια ελέγχου, Επεξεργασίας, Αντιγραφής και "
 "Διαγραφής δεν είναι διαθέσιμα. %s"
 
-#: libraries/sql.lib.php:1649
+#: libraries/sql.lib.php:1643
 #, php-format
 msgid ""
 "Current selection does not contain a unique column. Grid edit, Edit, Copy "
@@ -14349,7 +14342,7 @@ msgstr ""
 "επεξεργασίας πλέγματος, Επεξεργασίας, Αντιγραφής και Διαγραφής ίσως έχουν "
 "αποτέλεσμα μη επιθυμητής συμπεριφοράς. %s"
 
-#: libraries/sql.lib.php:1688
+#: libraries/sql.lib.php:1682
 #, php-format
 msgid "Problems with indexes of table `%s`"
 msgstr "Προβλήματα με τα ευρετήρια στον πίνακα «%s»"
@@ -14506,7 +14499,7 @@ msgid "Version %s snapshot (SQL code)"
 msgstr "Στιγμιότυπο έκδοσης %s (κώδικας SQL)"
 
 #: libraries/tracking.lib.php:947
-#: templates/structure/table_structure_row.phtml:33
+#: templates/table/structure/table_structure_row.phtml:33
 msgctxt "None for default"
 msgid "None"
 msgstr "Καμία"
@@ -14560,15 +14553,15 @@ msgstr "Η έκδοση %1$s από %2$s διαγράφτηκε."
 msgid "Version %1$s was created, tracking for %2$s is active."
 msgstr "Η έκδοση %1$s δημιουργήθηκε, η παρακολούθηση του %2$s ενεργοποιήθηκε."
 
-#: libraries/user_preferences.inc.php:29
+#: libraries/user_preferences.inc.php:30
 msgid "Manage your settings"
 msgstr "Διαχειριστείτε τις ρυθμίσεις σας"
 
-#: libraries/user_preferences.inc.php:46 prefs_manage.php:307
+#: libraries/user_preferences.inc.php:54 prefs_manage.php:307
 msgid "Configuration has been saved."
 msgstr "Οι ρυθμίσεις αποθηκεύτηκαν."
 
-#: libraries/user_preferences.inc.php:66
+#: libraries/user_preferences.inc.php:74
 #, php-format
 msgid ""
 "Your preferences will be saved for current session only. Storing them "
@@ -14893,7 +14886,6 @@ msgid "Row: %1$s, Column: %2$s, Error: %3$s"
 msgstr "Γραμμή: %1$s, Στήλη: %2$s, Σφάλμα: %3$s"
 
 #: tbl_row_action.php:70
-#| msgid "No versions selected."
 msgid "No row selected."
 msgstr "Δεν επιλέχθηκε εγγραφή."
 
@@ -14969,7 +14961,7 @@ msgid "first"
 msgstr "πρώτη"
 
 #: templates/columns_definitions/move_column.phtml:12
-#: templates/structure/add_column.phtml:21
+#: templates/table/structure/add_column.phtml:21
 #, php-format
 msgid "after %s"
 msgstr "μετά το %s"
@@ -15038,197 +15030,292 @@ msgstr "Μετατροπή εισαγωγής"
 msgid "Input transformation options"
 msgstr "Επιλογές μετατροπής εισαγωγής"
 
-#: templates/designer/aggregate_query_panel.phtml:22
-#: templates/designer/options_panel.phtml:100
-msgid "Aggregate"
-msgstr "Άθροιση"
-
-#: templates/designer/aggregate_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:61
-#: templates/designer/options_panel.phtml:106
-#: templates/designer/options_panel.phtml:170
-#: templates/designer/where_query_panel.phtml:30
-#: templates/table/table_header.phtml:9
-msgid "Operator"
-msgstr "Τελεστής"
-
-#: templates/designer/database_tables.phtml:29
-msgid "Toggle"
-msgstr "Εναλλαγή"
-
-#: templates/designer/database_tables.phtml:40
-msgid "See table structure"
-msgstr "Προβολή δομής πίνακα"
-
-#: templates/designer/delete_relation_panel.phtml:21
-msgid "Delete relation"
-msgstr "Διαγραφή συσχέτισης"
-
-#: templates/designer/edit_delete_pages.phtml:7
-msgid "Page to open"
-msgstr "Σελίδα για άνοιγμα"
-
-#: templates/designer/edit_delete_pages.phtml:7
-msgid "Page to delete"
-msgstr "Σελίδα για διαγραφή"
-
-#: templates/designer/having_query_panel.phtml:90
-#: templates/designer/options_panel.phtml:63
-#: templates/designer/options_panel.phtml:229
-#: templates/designer/where_query_panel.phtml:59
-msgid "Except"
-msgstr "Εξαίρεση"
-
-#: templates/designer/having_query_panel.phtml:102
-#: templates/designer/options_panel.phtml:75
-#: templates/designer/options_panel.phtml:241
-#: templates/designer/where_query_panel.phtml:71
-msgid "subquery"
-msgstr "υποερώτημα"
-
-#: templates/designer/new_relation_panel.phtml:22
-#: templates/designer/side_menu.phtml:84 templates/designer/side_menu.phtml:87
-msgid "Create relation"
-msgstr "Δημιουργία συσχέτισης"
-
-#: templates/designer/options_panel.phtml:34
-#: templates/designer/options_panel.phtml:200
-msgid "Relation operator"
-msgstr "Λειτουργός συσχέτισης"
-
-#: templates/designer/options_panel.phtml:85
-#: templates/designer/rename_to_panel.phtml:23
-msgid "Rename to"
-msgstr "Μετονομασία σε"
-
-#: templates/designer/options_panel.phtml:91
-#: templates/designer/rename_to_panel.phtml:31
-msgid "New name"
-msgstr "Νέο όνομα"
-
-#: templates/designer/page_save_as.phtml:4
-msgid "Save to selected page"
-msgstr "Αποθήκευση στην επιλεγμένη σελίδα"
-
-#: templates/designer/page_save_as.phtml:5
-msgid "Create a page and save to it"
-msgstr "Δημιουργία μιας σελίδας και αποθήκευση σε αυτή"
-
-#: templates/designer/page_save_as.phtml:26
-msgid "New page name"
-msgstr "Νέο όνομα σελίδα"
-
-#: templates/designer/page_selector.phtml:2
-msgid "Select page"
-msgstr "Επιλογή σελίδας"
-
-#: templates/designer/query_details.phtml:10
-msgid "Active options"
-msgstr "Ενεργές επιλογές"
-
-#: templates/designer/schema_export.phtml:4
-msgid "Select Export Relational Type"
-msgstr "Επιλογή Τύπου Συσχέτισης Εξαγωγής"
-
-#: templates/designer/side_menu.phtml:19 templates/designer/side_menu.phtml:25
-msgid "Show/Hide tables list"
-msgstr "Εμφάνιση/Απόκρυψη λίστας πινάκων"
-
-#: templates/designer/side_menu.phtml:29 templates/designer/side_menu.phtml:35
-#: templates/designer/side_menu.phtml:36
-msgid "View in fullscreen"
-msgstr "Προβολή σε πλήρη οθόνη"
-
-#: templates/designer/side_menu.phtml:34
-msgid "Exit fullscreen"
-msgstr "Έξοδος από πλήρη οθόνη"
-
-#: templates/designer/side_menu.phtml:41 templates/designer/side_menu.phtml:45
-msgid "New page"
-msgstr "Νέα σελίδα"
-
-#: templates/designer/side_menu.phtml:70 templates/designer/side_menu.phtml:73
-msgid "Delete pages"
-msgstr "Διαγραφή σελίδων"
-
-#: templates/designer/side_menu.phtml:77 templates/designer/side_menu.phtml:80
-#: templates/table/create_table.phtml:7
+#: templates/database/create_table.phtml:7
+#: templates/database/designer/side_menu.phtml:77
+#: templates/database/designer/side_menu.phtml:80
 msgid "Create table"
 msgstr "Δημιουργία πίνακα"
 
-#: templates/designer/side_menu.phtml:98
-#: templates/designer/side_menu.phtml:101
+#: templates/database/create_table.phtml:15
+msgid "Number of columns"
+msgstr "Αριθμός στηλών"
+
+#: templates/database/designer/aggregate_query_panel.phtml:22
+#: templates/database/designer/options_panel.phtml:100
+msgid "Aggregate"
+msgstr "Άθροιση"
+
+#: templates/database/designer/aggregate_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:61
+#: templates/database/designer/options_panel.phtml:106
+#: templates/database/designer/options_panel.phtml:170
+#: templates/database/designer/where_query_panel.phtml:30
+#: templates/table/search/table_header.phtml:9
+msgid "Operator"
+msgstr "Τελεστής"
+
+#: templates/database/designer/database_tables.phtml:29
+msgid "Toggle"
+msgstr "Εναλλαγή"
+
+#: templates/database/designer/database_tables.phtml:40
+msgid "See table structure"
+msgstr "Προβολή δομής πίνακα"
+
+#: templates/database/designer/delete_relation_panel.phtml:21
+msgid "Delete relation"
+msgstr "Διαγραφή συσχέτισης"
+
+#: templates/database/designer/edit_delete_pages.phtml:7
+msgid "Page to open"
+msgstr "Σελίδα για άνοιγμα"
+
+#: templates/database/designer/edit_delete_pages.phtml:7
+msgid "Page to delete"
+msgstr "Σελίδα για διαγραφή"
+
+#: templates/database/designer/having_query_panel.phtml:90
+#: templates/database/designer/options_panel.phtml:63
+#: templates/database/designer/options_panel.phtml:229
+#: templates/database/designer/where_query_panel.phtml:59
+msgid "Except"
+msgstr "Εξαίρεση"
+
+#: templates/database/designer/having_query_panel.phtml:102
+#: templates/database/designer/options_panel.phtml:75
+#: templates/database/designer/options_panel.phtml:241
+#: templates/database/designer/where_query_panel.phtml:71
+msgid "subquery"
+msgstr "υποερώτημα"
+
+#: templates/database/designer/new_relation_panel.phtml:22
+#: templates/database/designer/side_menu.phtml:84
+#: templates/database/designer/side_menu.phtml:87
+msgid "Create relation"
+msgstr "Δημιουργία συσχέτισης"
+
+#: templates/database/designer/options_panel.phtml:34
+#: templates/database/designer/options_panel.phtml:200
+msgid "Relation operator"
+msgstr "Λειτουργός συσχέτισης"
+
+#: templates/database/designer/options_panel.phtml:85
+#: templates/database/designer/rename_to_panel.phtml:23
+msgid "Rename to"
+msgstr "Μετονομασία σε"
+
+#: templates/database/designer/options_panel.phtml:91
+#: templates/database/designer/rename_to_panel.phtml:31
+msgid "New name"
+msgstr "Νέο όνομα"
+
+#: templates/database/designer/page_save_as.phtml:4
+msgid "Save to selected page"
+msgstr "Αποθήκευση στην επιλεγμένη σελίδα"
+
+#: templates/database/designer/page_save_as.phtml:5
+msgid "Create a page and save to it"
+msgstr "Δημιουργία μιας σελίδας και αποθήκευση σε αυτή"
+
+#: templates/database/designer/page_save_as.phtml:26
+msgid "New page name"
+msgstr "Νέο όνομα σελίδα"
+
+#: templates/database/designer/page_selector.phtml:2
+msgid "Select page"
+msgstr "Επιλογή σελίδας"
+
+#: templates/database/designer/query_details.phtml:10
+msgid "Active options"
+msgstr "Ενεργές επιλογές"
+
+#: templates/database/designer/schema_export.phtml:4
+msgid "Select Export Relational Type"
+msgstr "Επιλογή Τύπου Συσχέτισης Εξαγωγής"
+
+#: templates/database/designer/side_menu.phtml:19
+#: templates/database/designer/side_menu.phtml:25
+msgid "Show/Hide tables list"
+msgstr "Εμφάνιση/Απόκρυψη λίστας πινάκων"
+
+#: templates/database/designer/side_menu.phtml:29
+#: templates/database/designer/side_menu.phtml:35
+#: templates/database/designer/side_menu.phtml:36
+msgid "View in fullscreen"
+msgstr "Προβολή σε πλήρη οθόνη"
+
+#: templates/database/designer/side_menu.phtml:34
+msgid "Exit fullscreen"
+msgstr "Έξοδος από πλήρη οθόνη"
+
+#: templates/database/designer/side_menu.phtml:41
+#: templates/database/designer/side_menu.phtml:45
+msgid "New page"
+msgstr "Νέα σελίδα"
+
+#: templates/database/designer/side_menu.phtml:70
+#: templates/database/designer/side_menu.phtml:73
+msgid "Delete pages"
+msgstr "Διαγραφή σελίδων"
+
+#: templates/database/designer/side_menu.phtml:98
+#: templates/database/designer/side_menu.phtml:101
 msgid "Reload"
 msgstr "Επαναφόρτωση"
 
-#: templates/designer/side_menu.phtml:107
-#: templates/designer/side_menu.phtml:110
+#: templates/database/designer/side_menu.phtml:107
+#: templates/database/designer/side_menu.phtml:110
 msgid "Help"
 msgstr "Βοήθεια"
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Angular links"
 msgstr "Γωνιακοί σύνδεσμοι"
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Direct links"
 msgstr "Άμεσοι σύνδεσμοι"
 
-#: templates/designer/side_menu.phtml:122
-#: templates/designer/side_menu.phtml:124
+#: templates/database/designer/side_menu.phtml:122
+#: templates/database/designer/side_menu.phtml:124
 msgid "Snap to grid"
 msgstr "Συγκράτηση στο πλέγμα"
 
-#: templates/designer/side_menu.phtml:128
-#: templates/designer/side_menu.phtml:134
+#: templates/database/designer/side_menu.phtml:128
+#: templates/database/designer/side_menu.phtml:134
 msgid "Small/Big All"
 msgstr "Όλα Μικρά/Μεγάλα"
 
-#: templates/designer/side_menu.phtml:138
-#: templates/designer/side_menu.phtml:141
+#: templates/database/designer/side_menu.phtml:138
+#: templates/database/designer/side_menu.phtml:141
 msgid "Toggle small/big"
 msgstr "Εναλλαγή μικρά/μεγάλα"
 
-#: templates/designer/side_menu.phtml:145
-#: templates/designer/side_menu.phtml:148
+#: templates/database/designer/side_menu.phtml:145
+#: templates/database/designer/side_menu.phtml:148
 msgid "Toggle relation lines"
 msgstr "Εναλλαγή γραμμών συσχέτισης"
 
-#: templates/designer/side_menu.phtml:153
-#: templates/designer/side_menu.phtml:156
+#: templates/database/designer/side_menu.phtml:153
+#: templates/database/designer/side_menu.phtml:156
 msgid "Export schema"
 msgstr "Εξαγωγή σχήματος"
 
-#: templates/designer/side_menu.phtml:165
-#: templates/designer/side_menu.phtml:168
+#: templates/database/designer/side_menu.phtml:165
+#: templates/database/designer/side_menu.phtml:168
 msgid "Build Query"
 msgstr "Δημιουργία ερωτήματος"
 
-#: templates/designer/side_menu.phtml:173
-#: templates/designer/side_menu.phtml:177
+#: templates/database/designer/side_menu.phtml:173
+#: templates/database/designer/side_menu.phtml:177
 msgid "Move Menu"
 msgstr "Μενου μετακίνησης"
 
-#: templates/designer/side_menu.phtml:181
-#: templates/designer/side_menu.phtml:186
+#: templates/database/designer/side_menu.phtml:181
+#: templates/database/designer/side_menu.phtml:186
 msgid "Pin text"
 msgstr "Καρφίτσωμα κειμένου"
 
-#: templates/designer/table_list.phtml:4
+#: templates/database/designer/table_list.phtml:4
 msgid "Hide/Show all"
 msgstr "Απόκρυψη/Προβολή όλων"
 
-#: templates/designer/table_list.phtml:14
+#: templates/database/designer/table_list.phtml:14
 msgid "Hide/Show Tables with no relation"
 msgstr "Απόκρυψη/Εμφάνιση Πινάκων χωρίς συσχέτιση"
 
-#: templates/designer/table_list.phtml:59
+#: templates/database/designer/table_list.phtml:59
 msgid "Number of tables:"
 msgstr "Αριθμός πινάκων:"
 
+#: templates/database/structure/body_for_table_summary.phtml:6
+#, php-format
+msgid "%s table"
+msgid_plural "%s tables"
+msgstr[0] "%s πίνακας"
+msgstr[1] "%s πίνακες"
+
+#: templates/database/structure/body_for_table_summary.phtml:17
+msgid "Sum"
+msgstr "Σύνολο"
+
+#: templates/database/structure/check_all_tables.phtml:6
+msgid "Check tables having overhead"
+msgstr "Επιλογή πινάκων με περίσσεια"
+
+#: templates/database/structure/check_all_tables.phtml:10
+msgid "Show create"
+msgstr "Εμφάνιση δημιουργίας"
+
+#: templates/database/structure/check_all_tables.phtml:27
+msgid "Prefix"
+msgstr "Πρόθεμα"
+
+#: templates/database/structure/check_all_tables.phtml:28
+msgid "Add prefix to table"
+msgstr "Προσθήκη προθέματος στον πίνακα"
+
+#: templates/database/structure/check_all_tables.phtml:29
+msgid "Replace table prefix"
+msgstr "Αντικατάσταση προθέματος πίνακα"
+
+#: templates/database/structure/check_all_tables.phtml:30
+msgid "Copy table with prefix"
+msgstr "Αντιγραφή πίνακα με πρόθεμα"
+
+#: templates/database/structure/check_all_tables.phtml:36
+msgid "Add columns to central list"
+msgstr "Προσθήκη στηλών στη κεντρική λίστα"
+
+#: templates/database/structure/check_all_tables.phtml:37
+msgid "Remove columns from central list"
+msgstr "Απομάκρυνση στηλών από την κεντρική λίστα"
+
+#: templates/database/structure/check_all_tables.phtml:38
+msgid "Make consistent with central list"
+msgstr "Συνέπεια με την κεντρική λίστα"
+
+#: templates/database/structure/favorite_anchor.phtml:12
+msgid "Add to Favorites"
+msgstr "Προσθήκη στα Αγαπημένα"
+
+#: templates/database/structure/show_create.phtml:2
+msgid "Showing create queries"
+msgstr "Εμφάνιση ερωτημάτων δημιουργίας"
+
+#: templates/database/structure/sortable_header.phtml:13
+msgid "Sort"
+msgstr "Ταξινόμηση"
+
+#: templates/database/structure/table_header.phtml:42
+msgid ""
+"May be approximate. Click on the number to get the exact count. See "
+"[doc@faq3-11]FAQ 3.11[/doc]."
+msgstr ""
+"Ίσως είναι κατά προσέγγιση. Πατείστε στον αριθμό για να λάβετε το ακριβές "
+"ποσό. Δείτε τις [doc@faq3-11]ΣΑΕ 3.11[/doc]."
+
+#: templates/database/structure/table_header.phtml:66
+#: templates/table/index_form.phtml:127
+msgid "Size"
+msgstr "Μέγεθος"
+
+#: templates/database/structure/table_header.phtml:74
+#: templates/table/structure/display_table_stats.phtml:27
+msgid "Overhead"
+msgstr "Περίσσεια"
+
+#: templates/database/structure/tracking_icon.phtml:4
+msgid "Tracking is active."
+msgstr "Η παρακολούθηση είναι ενεργοποιημένη."
+
+#: templates/database/structure/tracking_icon.phtml:8
+msgid "Tracking is not active."
+msgstr "Η παρακολούθηση δεν είναι ενεργοποιημένη."
+
 #: templates/error/report_form.phtml:7
 msgid ""
 "phpMyAdmin has encountered an error. We have collected data about this error "
@@ -15247,61 +15334,6 @@ msgstr "Μπορείτε να εξετάστε τα δεδομένα στην α
 msgid "Please explain the steps that lead to the error:"
 msgstr "Εξηγείστε τα βήματα που οδήγησαν στο σφάλμα:"
 
-#: templates/gis_visualization/gis_visualization.phtml:3
-msgid "Display GIS Visualization"
-msgstr "Εμφάνιση Οπτικοποίησης GIS"
-
-#: templates/gis_visualization/gis_visualization.phtml:8
-msgid "Label column"
-msgstr "Στήλη ετικέτας"
-
-#: templates/gis_visualization/gis_visualization.phtml:11
-msgid "-- None --"
-msgstr "-- Τίποτα --"
-
-#: templates/gis_visualization/gis_visualization.phtml:19
-msgid "Spatial column"
-msgstr "Χωρική στήλη"
-
-#: templates/index_form.phtml:16
-msgid "Index name:"
-msgstr "Όνομα ευρετηρίου:"
-
-#: templates/index_form.phtml:19
-msgid ""
-"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
-msgstr ""
-"«PRIMARY» <b>πρέπει</b> να είναι το όνομα του πρωτεύοντος κλειδιού και "
-"<b>μόνο αυτού</b>!"
-
-#: templates/index_form.phtml:40
-msgid "Index choice:"
-msgstr "Επιλογή ευρετηρίου:"
-
-#: templates/index_form.phtml:57
-msgid "Key block size:"
-msgstr "Μέγεθος μπλοκ κλειδιού:"
-
-#: templates/index_form.phtml:74
-msgid "Index type:"
-msgstr "Τύπος ευρετηρίου:"
-
-#: templates/index_form.phtml:86
-msgid "Parser:"
-msgstr "Μεταφραστής:"
-
-#: templates/index_form.phtml:102
-msgid "Comment:"
-msgstr "Σχόλιο:"
-
-#: templates/index_form.phtml:127 templates/structure/table_header.phtml:66
-msgid "Size"
-msgstr "Μέγεθος"
-
-#: templates/index_form.phtml:149 templates/index_form.phtml:190
-msgid "Drag to reorder"
-msgstr "Σύρτε για ανακατανομή"
-
 #: templates/prefs_autoload.phtml:9
 msgid ""
 "Your browser has phpMyAdmin configuration for this domain. Would you like to "
@@ -15314,359 +15346,150 @@ msgstr ""
 msgid "Start row:"
 msgstr "Εγγραφή έναρξης:"
 
-#: templates/structure/actions_in_table_structure.phtml:14
-#, php-format
-msgid "A primary key has been added on %s."
-msgstr "Ένα πρωτεύον κλειδί προστέθηκε στο %s."
-
-#: templates/structure/actions_in_table_structure.phtml:34
-#: templates/structure/actions_in_table_structure.phtml:54
-#: templates/structure/actions_in_table_structure.phtml:79
-#: templates/structure/actions_in_table_structure.phtml:101
-#, php-format
-msgid "An index has been added on %s."
-msgstr "Ένα ευρετήριο προστέθηκε στο %s."
-
-#: templates/structure/actions_in_table_structure.phtml:130
-#: templates/structure/check_all_table_column.phtml:59
-msgid "Remove from central columns"
-msgstr "Απομάκρυνση από κεντρικές στήλες"
-
-#: templates/structure/actions_in_table_structure.phtml:138
-#: templates/structure/check_all_table_column.phtml:55
-msgid "Add to central columns"
-msgstr "Προσθήκη στις κεντρικές στήλες"
-
-#: templates/structure/add_column.phtml:7
-#, php-format
-msgid "Add %s column(s)"
-msgstr "Προσθήκη %s στήλης(ών)"
-
-#: templates/structure/add_column.phtml:12
-msgid "at beginning of table"
-msgstr "στην αρχή του πίνακα"
-
-#: templates/structure/body_for_table_summary.phtml:6
-#, php-format
-msgid "%s table"
-msgid_plural "%s tables"
-msgstr[0] "%s πίνακας"
-msgstr[1] "%s πίνακες"
-
-#: templates/structure/body_for_table_summary.phtml:17
-msgid "Sum"
-msgstr "Σύνολο"
-
-#: templates/structure/check_all_tables.phtml:6
-msgid "Check tables having overhead"
-msgstr "Επιλογή πινάκων με περίσσεια"
-
-#: templates/structure/check_all_tables.phtml:10
-msgid "Show create"
-msgstr "Εμφάνιση δημιουργίας"
-
-#: templates/structure/check_all_tables.phtml:27
-msgid "Prefix"
-msgstr "Πρόθεμα"
-
-#: templates/structure/check_all_tables.phtml:28
-msgid "Add prefix to table"
-msgstr "Προσθήκη προθέματος στον πίνακα"
-
-#: templates/structure/check_all_tables.phtml:29
-msgid "Replace table prefix"
-msgstr "Αντικατάσταση προθέματος πίνακα"
-
-#: templates/structure/check_all_tables.phtml:30
-msgid "Copy table with prefix"
-msgstr "Αντιγραφή πίνακα με πρόθεμα"
-
-#: templates/structure/check_all_tables.phtml:36
-msgid "Add columns to central list"
-msgstr "Προσθήκη στηλών στη κεντρική λίστα"
-
-#: templates/structure/check_all_tables.phtml:37
-msgid "Remove columns from central list"
-msgstr "Απομάκρυνση στηλών από την κεντρική λίστα"
-
-#: templates/structure/check_all_tables.phtml:38
-msgid "Make consistent with central list"
-msgstr "Συνέπεια με την κεντρική λίστα"
-
-#: templates/structure/display_structure.phtml:140 view_create.php:181
-msgid "Edit view"
-msgstr "Επεξεργασία εμφάνισης"
-
-#: templates/structure/display_table_stats.phtml:9
-msgid "Space usage"
-msgstr "Χρήση χώρου"
-
-#: templates/structure/display_table_stats.phtml:27
-#: templates/structure/table_header.phtml:74
-msgid "Overhead"
-msgstr "Περίσσεια"
-
-#: templates/structure/display_table_stats.phtml:32
-msgid "Effective"
-msgstr "Αποτελεσματικός"
-
-#: templates/structure/favorite_anchor.phtml:12
-msgid "Add to Favorites"
-msgstr "Προσθήκη στα Αγαπημένα"
-
-#: templates/structure/move_columns_dialog.phtml:1
-#: templates/structure/optional_action_links.phtml:21
-msgid "Move columns"
-msgstr "Απομάκρυνση στήλης"
-
-#: templates/structure/move_columns_dialog.phtml:2
-msgid "Move the columns by dragging them up and down."
-msgstr "Μετακινήστε τις στήλες, σύροντας τες επάνω και κάτω."
-
-#: templates/structure/optional_action_links.phtml:9
-msgid "Propose table structure"
-msgstr "Προτεινόμενη δομή πίνακα"
-
-#: templates/structure/optional_action_links.phtml:24
-msgid "Improve table structure"
-msgstr "Βελτίωση δομής πίνακα"
-
-#: templates/structure/optional_action_links.phtml:30
-msgid "Track view"
-msgstr "Προβολή παρακολούθησης"
-
-#: templates/structure/row_stats_table.phtml:3
-msgid "Row statistics"
-msgstr "Στατιστικά εγγραφών"
-
-#: templates/structure/row_stats_table.phtml:9
-msgid "static"
-msgstr "στατικό"
-
-#: templates/structure/row_stats_table.phtml:11
-msgid "dynamic"
-msgstr "δυναμικά"
-
-#: templates/structure/row_stats_table.phtml:22
-msgid "partitioned"
-msgstr "κατατμήθηκε"
-
-#: templates/structure/row_stats_table.phtml:54
-msgid "Row length"
-msgstr "Μέγεθος γραμμής"
-
-#: templates/structure/row_stats_table.phtml:66
-msgid "Row size"
-msgstr "Μέγεθος εγγραφής"
-
-#: templates/structure/row_stats_table.phtml:73
-msgid "Next autoindex"
-msgstr "Επόμενη αυτόματη αρίθμηση"
-
-#: templates/structure/secondary_tabs.phtml:14
-msgid "Relation view"
-msgstr "Εμφάνιση συσχετίσεων"
-
-#: templates/structure/show_create.phtml:2
-msgid "Showing create queries"
-msgstr "Εμφάνιση ερωτημάτων δημιουργίας"
-
-#: templates/structure/sortable_header.phtml:13
-msgid "Sort"
-msgstr "Ταξινόμηση"
-
-#: templates/structure/table_header.phtml:42
-msgid ""
-"May be approximate. Click on the number to get the exact count. See "
-"[doc@faq3-11]FAQ 3.11[/doc]."
-msgstr ""
-"Ίσως είναι κατά προσέγγιση. Πατείστε στον αριθμό για να λάβετε το ακριβές "
-"ποσό. Δείτε τις [doc@faq3-11]ΣΑΕ 3.11[/doc]."
-
-#: templates/structure/table_structure_row.phtml:46
-#, php-format
-msgid "Column %s has been dropped."
-msgstr "Η στήλη %s διεγράφη."
-
-#: templates/structure/tracking_icon.phtml:4
-msgid "Tracking is active."
-msgstr "Η παρακολούθηση είναι ενεργοποιημένη."
-
-#: templates/structure/tracking_icon.phtml:8
-msgid "Tracking is not active."
-msgstr "Η παρακολούθηση δεν είναι ενεργοποιημένη."
-
-#: templates/table/create_table.phtml:15
-msgid "Number of columns"
-msgstr "Αριθμός στηλών"
-
-#: templates/table/options.phtml:8
-msgid "Select columns (at least one):"
-msgstr "Επιλογή πεδίων (τουλάχιστον ένα):"
-
-#: templates/table/options.phtml:37
-msgid "Add search conditions (body of the \"where\" clause):"
-msgstr "Προσθήκη νέου όρου (σώμα της πρότασης «where» πρότασης):"
-
-#: templates/table/options.phtml:45
-msgid "Number of rows per page"
-msgstr "Εγγραφές ανά σελίδα"
-
-#: templates/table/options.phtml:56
-msgid "Display order:"
-msgstr "Σειρά εμφάνισης:"
-
-#: templates/table/options_zoom.phtml:6
-msgid "Use this column to label each point"
-msgstr "Χρησιμοποιήστε αυτή τη στήλη για την ετικέτα κάθε σημείου"
-
-#: templates/table/options_zoom.phtml:35
-msgid "Maximum rows to plot"
-msgstr "Μέγιστος αριθμός γραμμών για εκτύπωση"
-
-#: templates/table/replace_preview.phtml:13
-msgid "Find and replace - preview"
-msgstr "Εύρεση και αντικατάσταση - προεπισκόπηση"
-
-#: templates/table/replace_preview.phtml:18
-msgid "Original string"
-msgstr "Αρχικό κείμενο"
-
-#: templates/table/replace_preview.phtml:19
-msgid "Replaced string"
-msgstr "Αντικατεστημένο κείμενο"
-
-#: templates/table/replace_preview.phtml:40
-msgid "Replace"
-msgstr "Αντικατάσταση"
-
-#: templates/table/rows_zoom.phtml:16
-msgid "Additional search criteria"
-msgstr "Πρόσθετα κριτήρια αναζήτησης"
-
-#: templates/table/search_and_replace.phtml:3
-msgid "Replace with:"
-msgstr "Αντικατάσταση με:"
-
-#: templates/table/search_and_replace.phtml:22
-msgid "Use regular expression"
-msgstr "Χρήση κανονικής έκφρασης"
-
-#: templates/table/selection_form.phtml:12
-msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
-msgstr ""
-"Εκτέλεσε ένα «επερώτημα ανά παράδειγμα» (χαρακτήρας μπαλαντέρ «%») για δύο "
-"διαφρετικές στήλες"
-
-#: templates/table/selection_form.phtml:34
-msgid "Do a \"query by example\" (wildcard: \"%\")"
-msgstr "Εκτέλεσε ένα «επερώτημα κατά παράδειγμα» (χαρακτήρας μπαλαντέρ «%»)"
-
-#: templates/table/zoom_result_form.phtml:7
-msgid "Browse/Edit the points"
-msgstr "Αναζήτηση/Επεξεργασία των σημείων"
-
-#: templates/table/zoom_result_form.phtml:15
-msgid "How to use"
-msgstr "Πως να το χρησιμοποιήσετε"
-
-#: templates/table/zoom_result_form.phtml:23
-msgid "Reset zoom"
-msgstr "Επανφορά εστίασης"
-
-#: templates/tbl_chart.phtml:17
+#: templates/table/chart/tbl_chart.phtml:17
 msgctxt "Chart type"
 msgid "Bar"
 msgstr "Μπάρα"
 
-#: templates/tbl_chart.phtml:21
+#: templates/table/chart/tbl_chart.phtml:21
 msgctxt "Chart type"
 msgid "Column"
 msgstr "Στήλη"
 
-#: templates/tbl_chart.phtml:25
+#: templates/table/chart/tbl_chart.phtml:25
 msgctxt "Chart type"
 msgid "Line"
 msgstr "Γραμμή"
 
-#: templates/tbl_chart.phtml:29
+#: templates/table/chart/tbl_chart.phtml:29
 msgctxt "Chart type"
 msgid "Spline"
 msgstr "Καμπύλη γραμμή"
 
-#: templates/tbl_chart.phtml:33
+#: templates/table/chart/tbl_chart.phtml:33
 msgctxt "Chart type"
 msgid "Area"
 msgstr "Επιφάνεια"
 
-#: templates/tbl_chart.phtml:37
+#: templates/table/chart/tbl_chart.phtml:37
 msgctxt "Chart type"
 msgid "Pie"
 msgstr "Πίτα"
 
-#: templates/tbl_chart.phtml:41
+#: templates/table/chart/tbl_chart.phtml:41
 msgctxt "Chart type"
 msgid "Timeline"
 msgstr "Χρονολόγιο"
 
-#: templates/tbl_chart.phtml:45
+#: templates/table/chart/tbl_chart.phtml:45
 msgctxt "Chart type"
 msgid "Scatter"
 msgstr "Διασπορά"
 
-#: templates/tbl_chart.phtml:50
+#: templates/table/chart/tbl_chart.phtml:50
 msgid "Stacked"
 msgstr "Σταθεροποιημένο"
 
-#: templates/tbl_chart.phtml:53
+#: templates/table/chart/tbl_chart.phtml:53
 msgid "Chart title"
 msgstr "Τίτλος διαγράμματος"
 
-#: templates/tbl_chart.phtml:57
+#: templates/table/chart/tbl_chart.phtml:57
 msgid "X-Axis:"
 msgstr "Άξονας Χ:"
 
-#: templates/tbl_chart.phtml:72
+#: templates/table/chart/tbl_chart.phtml:72
 msgid "Series:"
 msgstr "Σειρές:"
 
-#: templates/tbl_chart.phtml:102
+#: templates/table/chart/tbl_chart.phtml:102
 msgid "X-Axis label:"
 msgstr "Ετικέτα άξονα Χ:"
 
-#: templates/tbl_chart.phtml:104
+#: templates/table/chart/tbl_chart.phtml:104
 msgid "X Values"
 msgstr "Τιμές Χ"
 
-#: templates/tbl_chart.phtml:107
+#: templates/table/chart/tbl_chart.phtml:107
 msgid "Y-Axis label:"
 msgstr "Ετικέτα άξονα Υ:"
 
-#: templates/tbl_chart.phtml:115
+#: templates/table/chart/tbl_chart.phtml:115
 msgid "Series names are in a column"
 msgstr "Τα ονόματα σειρών είναι σε μια στήλη"
 
-#: templates/tbl_chart.phtml:118
+#: templates/table/chart/tbl_chart.phtml:118
 msgid "Series column:"
 msgstr "Στήλη σειρών:"
 
-#: templates/tbl_chart.phtml:130
+#: templates/table/chart/tbl_chart.phtml:130
 msgid "Value Column:"
 msgstr "Στήλη Τιμής:"
 
-#: templates/tbl_chart.phtml:150
+#: templates/table/chart/tbl_chart.phtml:150
 msgid "Save chart as image"
 msgstr "Αποθήκευση διαγράμματος ως εικόνα"
 
-#: templates/tbl_relation/common_form.phtml:7
+#: templates/table/gis_visualization/gis_visualization.phtml:3
+msgid "Display GIS Visualization"
+msgstr "Εμφάνιση Οπτικοποίησης GIS"
+
+#: templates/table/gis_visualization/gis_visualization.phtml:8
+msgid "Label column"
+msgstr "Στήλη ετικέτας"
+
+#: templates/table/gis_visualization/gis_visualization.phtml:11
+msgid "-- None --"
+msgstr "-- Τίποτα --"
+
+#: templates/table/gis_visualization/gis_visualization.phtml:19
+msgid "Spatial column"
+msgstr "Χωρική στήλη"
+
+#: templates/table/index_form.phtml:16
+msgid "Index name:"
+msgstr "Όνομα ευρετηρίου:"
+
+#: templates/table/index_form.phtml:19
+msgid ""
+"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
+msgstr ""
+"«PRIMARY» <b>πρέπει</b> να είναι το όνομα του πρωτεύοντος κλειδιού και "
+"<b>μόνο αυτού</b>!"
+
+#: templates/table/index_form.phtml:40
+msgid "Index choice:"
+msgstr "Επιλογή ευρετηρίου:"
+
+#: templates/table/index_form.phtml:57
+msgid "Key block size:"
+msgstr "Μέγεθος μπλοκ κλειδιού:"
+
+#: templates/table/index_form.phtml:74
+msgid "Index type:"
+msgstr "Τύπος ευρετηρίου:"
+
+#: templates/table/index_form.phtml:86
+msgid "Parser:"
+msgstr "Μεταφραστής:"
+
+#: templates/table/index_form.phtml:102
+msgid "Comment:"
+msgstr "Σχόλιο:"
+
+#: templates/table/index_form.phtml:149 templates/table/index_form.phtml:190
+msgid "Drag to reorder"
+msgstr "Σύρτε για ανακατανομή"
+
+#: templates/table/relation/common_form.phtml:7
 msgid "Internal relations"
 msgstr "Εσωτερικές συσχετίσεις"
 
-#: templates/tbl_relation/common_form.phtml:11
+#: templates/table/relation/common_form.phtml:11
 msgid "Internal relation"
 msgstr "Εσωτερική συσχέτιση"
 
-#: templates/tbl_relation/common_form.phtml:14
+#: templates/table/relation/common_form.phtml:14
 msgid ""
 "An internal relation is not necessary when a corresponding FOREIGN KEY "
 "relation exists."
@@ -15674,50 +15497,226 @@ msgstr ""
 "Μια εσωτερική συσχέτιση δεν είναι απαραίτητη όταν υπάρχει μια αντίστοιχη "
 "συσχέτιση FOREIGN KEY."
 
-#: templates/tbl_relation/common_form.phtml:37
+#: templates/table/relation/common_form.phtml:37
 msgid "Foreign key constraints"
 msgstr "Περιορισμοί ξένου κλειδιού"
 
-#: templates/tbl_relation/common_form.phtml:40
+#: templates/table/relation/common_form.phtml:40
 msgid "Actions"
 msgstr "Ενέργειες"
 
-#: templates/tbl_relation/common_form.phtml:41
+#: templates/table/relation/common_form.phtml:41
 msgid "Constraint properties"
 msgstr "Ιδιότητες περιορισμών"
 
-#: templates/tbl_relation/common_form.phtml:44
+#: templates/table/relation/common_form.phtml:44
 msgid ""
 "Only columns with index will be displayed. You can define an index below."
 msgstr ""
 "Μόνο στήλες με ευρετήριο θα εμφανίζονται. Μπορείτε να ορίσετε ευρετήριο "
 "παρακάτω."
 
-#: templates/tbl_relation/common_form.phtml:49
+#: templates/table/relation/common_form.phtml:49
 msgid "Foreign key constraint"
 msgstr "Όριο μη διακριτού κλειδιού"
 
-#: templates/tbl_relation/common_form.phtml:81
+#: templates/table/relation/common_form.phtml:81
 msgid "+ Add constraint"
 msgstr "+Προσθήκη περιορισμού"
 
-#: templates/tbl_relation/common_form.phtml:91
+#: templates/table/relation/common_form.phtml:91
 msgid "Choose column to display:"
 msgstr "Επιλέξτε στήλη για εμφάνιση:"
 
-#: templates/tbl_relation/foreign_key_row.phtml:13
+#: templates/table/relation/foreign_key_row.phtml:13
 #, php-format
 msgid "Foreign key constraint %s has been dropped"
 msgstr "Ο περιορισμός ξένου κλειδιού %s έχει διαγραφεί"
 
-#: templates/tbl_relation/foreign_key_row.phtml:102
+#: templates/table/relation/foreign_key_row.phtml:102
 msgid "Constraint name"
 msgstr "Όνομα μεταβλητής"
 
-#: templates/tbl_relation/foreign_key_row.phtml:157
+#: templates/table/relation/foreign_key_row.phtml:157
 msgid "+ Add column"
 msgstr "+ Προσθήκη στήλης"
 
+#: templates/table/search/options.phtml:8
+msgid "Select columns (at least one):"
+msgstr "Επιλογή πεδίων (τουλάχιστον ένα):"
+
+#: templates/table/search/options.phtml:37
+msgid "Add search conditions (body of the \"where\" clause):"
+msgstr "Προσθήκη νέου όρου (σώμα της πρότασης «where» πρότασης):"
+
+#: templates/table/search/options.phtml:45
+msgid "Number of rows per page"
+msgstr "Εγγραφές ανά σελίδα"
+
+#: templates/table/search/options.phtml:56
+msgid "Display order:"
+msgstr "Σειρά εμφάνισης:"
+
+#: templates/table/search/options_zoom.phtml:6
+msgid "Use this column to label each point"
+msgstr "Χρησιμοποιήστε αυτή τη στήλη για την ετικέτα κάθε σημείου"
+
+#: templates/table/search/options_zoom.phtml:35
+msgid "Maximum rows to plot"
+msgstr "Μέγιστος αριθμός γραμμών για εκτύπωση"
+
+#: templates/table/search/replace_preview.phtml:13
+msgid "Find and replace - preview"
+msgstr "Εύρεση και αντικατάσταση - προεπισκόπηση"
+
+#: templates/table/search/replace_preview.phtml:18
+msgid "Original string"
+msgstr "Αρχικό κείμενο"
+
+#: templates/table/search/replace_preview.phtml:19
+msgid "Replaced string"
+msgstr "Αντικατεστημένο κείμενο"
+
+#: templates/table/search/replace_preview.phtml:40
+msgid "Replace"
+msgstr "Αντικατάσταση"
+
+#: templates/table/search/rows_zoom.phtml:16
+msgid "Additional search criteria"
+msgstr "Πρόσθετα κριτήρια αναζήτησης"
+
+#: templates/table/search/search_and_replace.phtml:3
+msgid "Replace with:"
+msgstr "Αντικατάσταση με:"
+
+#: templates/table/search/search_and_replace.phtml:22
+msgid "Use regular expression"
+msgstr "Χρήση κανονικής έκφρασης"
+
+#: templates/table/search/selection_form.phtml:12
+msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
+msgstr ""
+"Εκτέλεσε ένα «επερώτημα ανά παράδειγμα» (χαρακτήρας μπαλαντέρ «%») για δύο "
+"διαφρετικές στήλες"
+
+#: templates/table/search/selection_form.phtml:34
+msgid "Do a \"query by example\" (wildcard: \"%\")"
+msgstr "Εκτέλεσε ένα «επερώτημα κατά παράδειγμα» (χαρακτήρας μπαλαντέρ «%»)"
+
+#: templates/table/search/zoom_result_form.phtml:7
+msgid "Browse/Edit the points"
+msgstr "Αναζήτηση/Επεξεργασία των σημείων"
+
+#: templates/table/search/zoom_result_form.phtml:15
+msgid "How to use"
+msgstr "Πως να το χρησιμοποιήσετε"
+
+#: templates/table/search/zoom_result_form.phtml:23
+msgid "Reset zoom"
+msgstr "Επανφορά εστίασης"
+
+#: templates/table/secondary_tabs.phtml:14
+msgid "Relation view"
+msgstr "Εμφάνιση συσχετίσεων"
+
+#: templates/table/structure/actions_in_table_structure.phtml:14
+#, php-format
+msgid "A primary key has been added on %s."
+msgstr "Ένα πρωτεύον κλειδί προστέθηκε στο %s."
+
+#: templates/table/structure/actions_in_table_structure.phtml:34
+#: templates/table/structure/actions_in_table_structure.phtml:54
+#: templates/table/structure/actions_in_table_structure.phtml:79
+#: templates/table/structure/actions_in_table_structure.phtml:101
+#, php-format
+msgid "An index has been added on %s."
+msgstr "Ένα ευρετήριο προστέθηκε στο %s."
+
+#: templates/table/structure/actions_in_table_structure.phtml:130
+#: templates/table/structure/check_all_table_column.phtml:59
+msgid "Remove from central columns"
+msgstr "Απομάκρυνση από κεντρικές στήλες"
+
+#: templates/table/structure/actions_in_table_structure.phtml:138
+#: templates/table/structure/check_all_table_column.phtml:55
+msgid "Add to central columns"
+msgstr "Προσθήκη στις κεντρικές στήλες"
+
+#: templates/table/structure/add_column.phtml:7
+#, php-format
+msgid "Add %s column(s)"
+msgstr "Προσθήκη %s στήλης(ών)"
+
+#: templates/table/structure/add_column.phtml:12
+msgid "at beginning of table"
+msgstr "στην αρχή του πίνακα"
+
+#: templates/table/structure/display_structure.phtml:140 view_create.php:181
+msgid "Edit view"
+msgstr "Επεξεργασία εμφάνισης"
+
+#: templates/table/structure/display_table_stats.phtml:9
+msgid "Space usage"
+msgstr "Χρήση χώρου"
+
+#: templates/table/structure/display_table_stats.phtml:32
+msgid "Effective"
+msgstr "Αποτελεσματικός"
+
+#: templates/table/structure/move_columns_dialog.phtml:1
+#: templates/table/structure/optional_action_links.phtml:21
+msgid "Move columns"
+msgstr "Απομάκρυνση στήλης"
+
+#: templates/table/structure/move_columns_dialog.phtml:2
+msgid "Move the columns by dragging them up and down."
+msgstr "Μετακινήστε τις στήλες, σύροντας τες επάνω και κάτω."
+
+#: templates/table/structure/optional_action_links.phtml:9
+msgid "Propose table structure"
+msgstr "Προτεινόμενη δομή πίνακα"
+
+#: templates/table/structure/optional_action_links.phtml:24
+msgid "Improve table structure"
+msgstr "Βελτίωση δομής πίνακα"
+
+#: templates/table/structure/optional_action_links.phtml:30
+msgid "Track view"
+msgstr "Προβολή παρακολούθησης"
+
+#: templates/table/structure/row_stats_table.phtml:3
+msgid "Row statistics"
+msgstr "Στατιστικά εγγραφών"
+
+#: templates/table/structure/row_stats_table.phtml:9
+msgid "static"
+msgstr "στατικό"
+
+#: templates/table/structure/row_stats_table.phtml:11
+msgid "dynamic"
+msgstr "δυναμικά"
+
+#: templates/table/structure/row_stats_table.phtml:22
+msgid "partitioned"
+msgstr "κατατμήθηκε"
+
+#: templates/table/structure/row_stats_table.phtml:54
+msgid "Row length"
+msgstr "Μέγεθος γραμμής"
+
+#: templates/table/structure/row_stats_table.phtml:66
+msgid "Row size"
+msgstr "Μέγεθος εγγραφής"
+
+#: templates/table/structure/row_stats_table.phtml:73
+msgid "Next autoindex"
+msgstr "Επόμενη αυτόματη αρίθμηση"
+
+#: templates/table/structure/table_structure_row.phtml:46
+#, php-format
+msgid "Column %s has been dropped."
+msgstr "Η στήλη %s διεγράφη."
+
 #: themes.php:17 themes.php:22
 msgid "Theme"
 msgstr "Θέμα"
@@ -17102,6 +17101,9 @@ msgstr ""
 msgid "concurrent_insert is set to 0"
 msgstr "Το concurrent_insert έχει οριστεί στο 0"
 
+#~ msgid "Read as multibytes"
+#~ msgstr "Ανάγνωση ως πολλαπλών bytes"
+
 #~ msgid "Relational display column"
 #~ msgstr "Στήλη προβολής συσχέτισης"
 
diff --git a/po/en_GB.po b/po/en_GB.po
index 8e37026f5b..9996bec928 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 4.5.0-dev\n"
 "Report-Msgid-Bugs-To: developers@phpmyadmin.net\n"
-"POT-Creation-Date: 2015-08-08 13:53-0400\n"
+"POT-Creation-Date: 2015-08-12 08:10-0400\n"
 "PO-Revision-Date: 2015-08-02 20:09+0200\n"
 "Last-Translator: Marek Tomaštík <tomastik.m@gmail.com>\n"
 "Language-Team: English (United Kingdom) <https://hosted.weblate.org/projects/"
@@ -55,7 +55,7 @@ msgid "Table comments:"
 msgstr "Table comments:"
 
 #: db_datadict.php:104 libraries/Index.class.php:699
-#: libraries/insert_edit.lib.php:1567
+#: libraries/insert_edit.lib.php:1565
 #: libraries/navigation/Nodes/Node_Column.class.php:30
 #: libraries/plugins/export/ExportHtmlword.class.php:280
 #: libraries/plugins/export/ExportHtmlword.class.php:375
@@ -69,13 +69,14 @@ msgstr "Table comments:"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1023
 #: libraries/tracking.lib.php:879 libraries/tracking.lib.php:975
 #: templates/columns_definitions/column_name.phtml:18
-#: templates/index_form.phtml:124 templates/table/table_header.phtml:6
-#: templates/table/zoom_result_form.phtml:33
-#: templates/tbl_relation/common_form.phtml:10
-#: templates/tbl_relation/common_form.phtml:43
-#: templates/tbl_relation/foreign_key_row.phtml:194
-#: templates/tbl_relation/foreign_key_row.phtml:206
-#: templates/tbl_relation/internal_relational_row.phtml:71
+#: templates/table/index_form.phtml:124
+#: templates/table/relation/common_form.phtml:10
+#: templates/table/relation/common_form.phtml:43
+#: templates/table/relation/foreign_key_row.phtml:194
+#: templates/table/relation/foreign_key_row.phtml:206
+#: templates/table/relation/internal_relational_row.phtml:71
+#: templates/table/search/table_header.phtml:6
+#: templates/table/search/zoom_result_form.phtml:33
 msgid "Column"
 msgstr "Column"
 
@@ -93,21 +94,21 @@ msgstr "Column"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1001
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1024
 #: libraries/rte/rte_list.lib.php:75 libraries/rte/rte_list.lib.php:103
-#: libraries/rte/rte_routines.lib.php:802
-#: libraries/rte/rte_routines.lib.php:831
-#: libraries/rte/rte_routines.lib.php:1493
+#: libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_routines.lib.php:922
+#: libraries/rte/rte_routines.lib.php:1584
 #: libraries/server_privileges.lib.php:2369 libraries/tracking.lib.php:880
 #: libraries/tracking.lib.php:972
 #: templates/columns_definitions/table_fields_definitions.phtml:11
-#: templates/structure/table_header.phtml:48
-#: templates/structure/table_structure_header.phtml:6
-#: templates/table/table_header.phtml:7
+#: templates/database/structure/table_header.phtml:48
+#: templates/table/search/table_header.phtml:7
+#: templates/table/structure/table_structure_header.phtml:6
 msgid "Type"
 msgstr "Type"
 
 #: db_datadict.php:106 libraries/Index.class.php:702
 #: libraries/central_columns.lib.php:708
-#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1576
+#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1574
 #: libraries/plugins/export/ExportHtmlword.class.php:286
 #: libraries/plugins/export/ExportHtmlword.class.php:381
 #: libraries/plugins/export/ExportLatex.class.php:509
@@ -120,8 +121,8 @@ msgstr "Type"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1026
 #: libraries/tracking.lib.php:882 libraries/tracking.lib.php:978
 #: templates/columns_definitions/table_fields_definitions.phtml:39
-#: templates/structure/table_structure_header.phtml:9
-#: templates/table/zoom_result_form.phtml:34
+#: templates/table/search/zoom_result_form.phtml:34
+#: templates/table/structure/table_structure_header.phtml:9
 msgid "Null"
 msgstr "Null"
 
@@ -139,8 +140,8 @@ msgstr "Null"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1027
 #: libraries/replication_gui.lib.php:153 libraries/tracking.lib.php:883
 #: templates/columns_definitions/table_fields_definitions.phtml:25
-#: templates/structure/body_for_table_summary.phtml:55
-#: templates/structure/table_structure_header.phtml:10
+#: templates/database/structure/body_for_table_summary.phtml:55
+#: templates/table/structure/table_structure_header.phtml:10
 msgid "Default"
 msgstr "Default"
 
@@ -168,19 +169,19 @@ msgid "Comments"
 msgstr "Comments"
 
 #: db_datadict.php:146
-#: libraries/controllers/StructureController.class.php:1960
-#: libraries/controllers/StructureController.class.php:1965
+#: libraries/controllers/TableStructureController.class.php:951
+#: libraries/controllers/TableStructureController.class.php:956
 #: libraries/tracking.lib.php:922
 #: templates/columns_definitions/column_indexes.phtml:6
-#: templates/structure/check_all_table_column.phtml:22
-#: templates/structure/display_structure.phtml:74
+#: templates/table/structure/check_all_table_column.phtml:22
+#: templates/table/structure/display_structure.phtml:74
 msgid "Primary"
 msgstr "Primary"
 
 #: db_datadict.php:156 js/messages.php:317 libraries/Index.class.php:567
 #: libraries/Index.class.php:606 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261 libraries/mult_submits.lib.php:403
+#: libraries/config/FormDisplay.tpl.php:272 libraries/mult_submits.lib.php:403
 #: libraries/mult_submits.lib.php:417
 #: libraries/plugins/export/ExportHtmlword.class.php:630
 #: libraries/plugins/export/ExportLatex.class.php:589
@@ -196,20 +197,20 @@ msgstr "Primary"
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1010 libraries/tracking.lib.php:1015
 #: prefs_manage.php:140 templates/prefs_autoload.phtml:15
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "No"
 msgstr "No"
 
 #: db_datadict.php:156 js/messages.php:443 libraries/Index.class.php:568
 #: libraries/Index.class.php:605 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261
-#: libraries/controllers/StructureController.class.php:1344
-#: libraries/controllers/StructureController.class.php:2223
-#: libraries/controllers/StructureController.class.php:2232
-#: libraries/controllers/StructureController.class.php:2237
-#: libraries/controllers/StructureController.class.php:2242
-#: libraries/controllers/StructureController.class.php:2247
+#: libraries/config/FormDisplay.tpl.php:272
+#: libraries/controllers/TableStructureController.class.php:539
+#: libraries/controllers/TableStructureController.class.php:1201
+#: libraries/controllers/TableStructureController.class.php:1210
+#: libraries/controllers/TableStructureController.class.php:1215
+#: libraries/controllers/TableStructureController.class.php:1220
+#: libraries/controllers/TableStructureController.class.php:1225
 #: libraries/mult_submits.inc.php:82 libraries/mult_submits.inc.php:178
 #: libraries/mult_submits.lib.php:339 libraries/mult_submits.lib.php:372
 #: libraries/mult_submits.lib.php:401 libraries/mult_submits.lib.php:415
@@ -218,8 +219,8 @@ msgstr "No"
 #: libraries/plugins/export/ExportOdt.class.php:756
 #: libraries/plugins/export/ExportTexytext.class.php:567
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1077
-#: libraries/server_databases.lib.php:464
-#: libraries/server_databases.lib.php:474
+#: libraries/server_databases.lib.php:475
+#: libraries/server_databases.lib.php:485
 #: libraries/server_privileges.lib.php:2546
 #: libraries/server_privileges.lib.php:2727
 #: libraries/server_privileges.lib.php:2748
@@ -229,7 +230,7 @@ msgstr "No"
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1008 libraries/tracking.lib.php:1013
 #: prefs_manage.php:138 templates/prefs_autoload.phtml:14
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "Yes"
 msgstr "Yes"
 
@@ -239,7 +240,7 @@ msgstr "View dump (schema) of database"
 
 #: db_export.php:37 db_tracking.php:90 export.php:382
 #: libraries/DBQbe.class.php:326
-#: libraries/controllers/StructureController.class.php:231
+#: libraries/controllers/DatabaseStructureController.class.php:170
 #: libraries/navigation/NavigationTree.class.php:897
 msgid "No tables found in database."
 msgstr "No tables found in database."
@@ -250,14 +251,14 @@ msgstr "No tables found in database."
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:26
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:120
-#: templates/structure/show_create.phtml:18
+#: templates/database/structure/show_create.phtml:18
 msgid "Tables"
 msgstr "Tables"
 
 #: db_export.php:52 libraries/Menu.class.php:317 libraries/Menu.class.php:425
-#: libraries/Util.class.php:3333 libraries/Util.class.php:3343
-#: libraries/Util.class.php:3349 libraries/Util.class.php:3629
-#: libraries/Util.class.php:4327 libraries/Util.class.php:4344
+#: libraries/Util.class.php:3339 libraries/Util.class.php:3349
+#: libraries/Util.class.php:3355 libraries/Util.class.php:3635
+#: libraries/Util.class.php:4333 libraries/Util.class.php:4350
 #: libraries/central_columns.lib.php:728 libraries/config.values.php:39
 #: libraries/config.values.php:47 libraries/config.values.php:109
 #: libraries/config.values.php:115 libraries/config/setup.forms.php:323
@@ -271,7 +272,7 @@ msgstr "Tables"
 #: libraries/navigation/Nodes/Node_Table.class.php:283
 #: libraries/server_privileges.lib.php:1141 libraries/tracking.lib.php:874
 #: templates/columns_definitions/table_fields_definitions.phtml:3
-#: templates/designer/table_list.phtml:28
+#: templates/database/designer/table_list.phtml:28
 msgid "Structure"
 msgstr "Structure"
 
@@ -283,7 +284,7 @@ msgstr "Structure"
 #: libraries/config/user_preferences.forms.php:292
 #: libraries/config/user_preferences.forms.php:297
 #: libraries/server_privileges.lib.php:1140
-#: templates/structure/display_table_stats.phtml:12
+#: templates/table/structure/display_table_stats.phtml:12
 msgid "Data"
 msgstr "Data"
 
@@ -359,10 +360,10 @@ msgstr "Tracked tables"
 #: libraries/server_privileges.lib.php:2908
 #: libraries/server_privileges.lib.php:3145
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4346
-#: templates/structure/table_header.phtml:21
-#: templates/tbl_relation/foreign_key_row.phtml:176
-#: templates/tbl_relation/internal_relational_row.phtml:63
+#: libraries/server_privileges.lib.php:4372
+#: templates/database/structure/table_header.phtml:21
+#: templates/table/relation/foreign_key_row.phtml:176
+#: templates/table/relation/internal_relational_row.phtml:63
 msgid "Table"
 msgstr "Table"
 
@@ -379,7 +380,7 @@ msgid "Updated"
 msgstr "Updated"
 
 #: db_tracking.php:130 js/messages.php:243 libraries/Menu.class.php:552
-#: libraries/Util.class.php:4314 libraries/config.values.php:104
+#: libraries/Util.class.php:4320 libraries/config.values.php:104
 #: libraries/rte/rte_events.lib.php:393 libraries/rte/rte_list.lib.php:101
 #: libraries/server_status_processes.lib.php:92 libraries/tracking.lib.php:279
 msgid "Status"
@@ -388,14 +389,15 @@ msgstr "Status"
 #: db_tracking.php:131 db_tracking.php:290 libraries/Index.class.php:693
 #: libraries/central_columns.lib.php:687 libraries/rte/rte_list.lib.php:74
 #: libraries/rte/rte_list.lib.php:89 libraries/rte/rte_list.lib.php:102
-#: libraries/server_databases.lib.php:398
+#: libraries/server_databases.lib.php:409
 #: libraries/server_privileges.lib.php:2372
 #: libraries/server_privileges.lib.php:3166
 #: libraries/server_privileges.lib.php:3342
 #: libraries/server_user_groups.lib.php:82
 #: libraries/server_variables.lib.php:189 libraries/tracking.lib.php:280
-#: libraries/tracking.lib.php:793 templates/structure/table_header.phtml:30
-#: templates/structure/table_structure_header.phtml:23
+#: libraries/tracking.lib.php:793
+#: templates/database/structure/table_header.phtml:30
+#: templates/table/structure/table_structure_header.phtml:23
 msgid "Action"
 msgstr "Action"
 
@@ -439,7 +441,7 @@ msgid "Untracked tables"
 msgstr "Untracked tables"
 
 #: db_tracking.php:305 db_tracking.php:336
-#: templates/structure/optional_action_links.phtml:17
+#: templates/table/structure/optional_action_links.phtml:17
 msgid "Track table"
 msgstr "Track table"
 
@@ -493,7 +495,7 @@ msgid "Value for the column \"%s\""
 msgstr "Value for the column \"%s\""
 
 #: gis_data_editor.php:146
-#: templates/gis_visualization/gis_visualization.phtml:37
+#: templates/table/gis_visualization/gis_visualization.phtml:37
 msgid "Use OpenStreetMaps as Base Layer"
 msgstr "Use OpenStreetMaps as Base Layer"
 
@@ -573,35 +575,35 @@ msgstr "Add geometry"
 #: libraries/display_change_password.lib.php:162
 #: libraries/display_export.lib.php:402 libraries/display_export.lib.php:408
 #: libraries/display_import.lib.php:392 libraries/index.lib.php:44
-#: libraries/insert_edit.lib.php:1546 libraries/insert_edit.lib.php:1583
+#: libraries/insert_edit.lib.php:1544 libraries/insert_edit.lib.php:1581
 #: libraries/normalization.lib.php:165 libraries/normalization.lib.php:821
 #: libraries/operations.lib.php:38 libraries/operations.lib.php:108
 #: libraries/operations.lib.php:263 libraries/operations.lib.php:306
 #: libraries/operations.lib.php:801 libraries/operations.lib.php:874
 #: libraries/operations.lib.php:923 libraries/operations.lib.php:1337
 #: libraries/operations.lib.php:1658
-#: libraries/plugins/auth/AuthenticationCookie.class.php:244
+#: libraries/plugins/auth/AuthenticationCookie.class.php:232
 #: libraries/replication_gui.lib.php:122 libraries/replication_gui.lib.php:161
 #: libraries/replication_gui.lib.php:324 libraries/replication_gui.lib.php:461
 #: libraries/replication_gui.lib.php:906 libraries/rte/rte_events.lib.php:509
-#: libraries/rte/rte_routines.lib.php:969
-#: libraries/rte/rte_routines.lib.php:1581
+#: libraries/rte/rte_routines.lib.php:1060
+#: libraries/rte/rte_routines.lib.php:1672
 #: libraries/rte/rte_triggers.lib.php:396 libraries/server_bin_log.lib.php:61
 #: libraries/server_privileges.lib.php:705
 #: libraries/server_privileges.lib.php:2106
 #: libraries/server_privileges.lib.php:2872
 #: libraries/server_privileges.lib.php:3553
-#: libraries/server_privileges.lib.php:4627
+#: libraries/server_privileges.lib.php:4653
 #: libraries/server_user_groups.lib.php:285
 #: libraries/sql_query_form.lib.php:369 libraries/sql_query_form.lib.php:429
 #: libraries/tracking.lib.php:533 libraries/tracking.lib.php:653
 #: prefs_manage.php:277 prefs_manage.php:355
 #: templates/columns_definitions/column_definitions_form.phtml:59
-#: templates/header_location.phtml:17 templates/index_form.phtml:238
+#: templates/database/create_table.phtml:21 templates/header_location.phtml:28
 #: templates/startAndNumberOfRowsPanel.phtml:14
-#: templates/structure/add_column.phtml:25
-#: templates/table/create_table.phtml:21
-#: templates/table/selection_form.phtml:75 view_create.php:275
+#: templates/table/index_form.phtml:238
+#: templates/table/search/selection_form.phtml:75
+#: templates/table/structure/add_column.phtml:25 view_create.php:275
 #: view_operations.php:106
 msgid "Go"
 msgstr "Go"
@@ -695,7 +697,7 @@ msgstr ""
 msgid "Could not load import plugins, please check your installation!"
 msgstr "Could not load import plug-ins, please check your installation!"
 
-#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1466
+#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1460
 #, php-format
 msgid "Bookmark %s has been created."
 msgstr "Bookmark %s created."
@@ -736,11 +738,11 @@ msgstr ""
 msgid "Back"
 msgstr "Back"
 
-#: index.php:148 libraries/Footer.class.php:70
+#: index.php:149 libraries/Footer.class.php:70
 msgid "phpMyAdmin Demo Server"
 msgstr "phpMyAdmin Demo Server"
 
-#: index.php:152
+#: index.php:153
 #, php-format
 msgid ""
 "You are using the demo server. You can do anything here, but please do not "
@@ -751,112 +753,112 @@ msgstr ""
 "change root, debian-sys-maint and pma users. More information is available "
 "at %s."
 
-#: index.php:162
+#: index.php:163
 msgid "General Settings"
 msgstr "General Settings"
 
-#: index.php:190 libraries/display_change_password.lib.php:50
+#: index.php:191 libraries/display_change_password.lib.php:50
 #: libraries/display_change_password.lib.php:53 user_password.php:247
 msgid "Change password"
 msgstr "Change password"
 
-#: index.php:206
+#: index.php:207
 msgid "Server connection collation"
 msgstr "Server connection collation"
 
-#: index.php:228
+#: index.php:229
 msgid "Appearance Settings"
 msgstr "Appearance Settings"
 
-#: index.php:258 prefs_manage.php:285
+#: index.php:259 prefs_manage.php:285
 msgid "More settings"
 msgstr "More settings"
 
-#: index.php:279
+#: index.php:280
 msgid "Database server"
 msgstr "Database server"
 
-#: index.php:282 libraries/plugins/auth/AuthenticationCookie.class.php:181
+#: index.php:283 libraries/plugins/auth/AuthenticationCookie.class.php:169
 msgid "Server:"
 msgstr "Server:"
 
-#: index.php:286
+#: index.php:287
 msgid "Server type:"
 msgstr "Server type:"
 
-#: index.php:290 libraries/plugins/export/ExportLatex.class.php:212
+#: index.php:291 libraries/plugins/export/ExportLatex.class.php:212
 #: libraries/plugins/export/ExportSql.class.php:687
 #: libraries/plugins/export/ExportXml.class.php:189
 msgid "Server version:"
 msgstr "Server version:"
 
-#: index.php:296
+#: index.php:297
 msgid "Protocol version:"
 msgstr "Protocol version:"
 
-#: index.php:300
+#: index.php:301
 msgid "User:"
 msgstr "User:"
 
-#: index.php:305
+#: index.php:306
 msgid "Server charset:"
 msgstr "Server charset:"
 
-#: index.php:320
+#: index.php:321
 msgid "Web server"
 msgstr "Web server"
 
-#: index.php:331
+#: index.php:332
 msgid "Database client version:"
 msgstr "Database client version:"
 
-#: index.php:335
+#: index.php:336
 msgid "PHP extension:"
 msgstr "PHP extension:"
 
-#: index.php:349
+#: index.php:350
 #, fuzzy
 #| msgid "PHP Version:"
 msgid "PHP version:"
 msgstr "PHP Version:"
 
-#: index.php:360
+#: index.php:361
 msgid "Show PHP information"
 msgstr "Show PHP information"
 
-#: index.php:383
+#: index.php:384
 msgid "Version information:"
 msgstr "Version information:"
 
-#: index.php:392 libraries/Util.class.php:432 libraries/Util.class.php:495
-#: libraries/config/FormDisplay.tpl.php:151
+#: index.php:393 libraries/Util.class.php:432 libraries/Util.class.php:495
+#: libraries/config/FormDisplay.tpl.php:162
 #: libraries/display_export.lib.php:577 libraries/engines/pbxt.lib.php:162
 #: libraries/navigation/NavigationHeader.class.php:196
 #: libraries/server_variables.lib.php:160
 msgid "Documentation"
 msgstr "Documentation"
 
-#: index.php:399
+#: index.php:400
 msgid "Wiki"
 msgstr "Wiki"
 
-#: index.php:408
+#: index.php:409
 msgid "Official Homepage"
 msgstr "Official Homepage"
 
-#: index.php:415
+#: index.php:416
 msgid "Contribute"
 msgstr "Contribute"
 
-#: index.php:422
+#: index.php:423
 msgid "Get support"
 msgstr "Get support"
 
-#: index.php:429
+#: index.php:430
 msgid "List of changes"
 msgstr "List of changes"
 
-#: index.php:451
+#: index.php:452
 #, fuzzy
 #| msgid ""
 #| "Your configuration file contains settings (root with no password) that "
@@ -874,7 +876,7 @@ msgstr ""
 "running with this default, is open to intrusion, and you really should fix "
 "this security hole by setting a password for user 'root'."
 
-#: index.php:468
+#: index.php:469
 msgid ""
 "You have enabled mbstring.func_overload in your PHP configuration. This "
 "option is incompatible with phpMyAdmin and might cause some data to be "
@@ -884,7 +886,7 @@ msgstr ""
 "option is incompatible with phpMyAdmin and might cause some data to be "
 "corrupted!"
 
-#: index.php:483
+#: index.php:484
 msgid ""
 "The mbstring PHP extension was not found and you seem to be using a "
 "multibyte charset. Without the mbstring extension phpMyAdmin is unable to "
@@ -894,7 +896,7 @@ msgstr ""
 "multibyte charset. Without the mbstring extension phpMyAdmin is unable to "
 "split strings correctly and it may result in unexpected results."
 
-#: index.php:500
+#: index.php:501
 #, fuzzy
 #| msgid ""
 #| "Your PHP parameter [a@http://php.net/manual/en/session.configuration."
@@ -912,7 +914,7 @@ msgstr ""
 "cookie validity configured in phpMyAdmin, because of this, your login will "
 "expire sooner than configured in phpMyAdmin."
 
-#: index.php:519
+#: index.php:520
 msgid ""
 "Login cookie store is lower than cookie validity configured in phpMyAdmin, "
 "because of this, your login will expire sooner than configured in phpMyAdmin."
@@ -920,12 +922,12 @@ msgstr ""
 "Login cookie store is lower than cookie validity configured in phpMyAdmin, "
 "because of this, your login will expire sooner than configured in phpMyAdmin."
 
-#: index.php:535
+#: index.php:536
 msgid "The configuration file now needs a secret passphrase (blowfish_secret)."
 msgstr ""
 "The configuration file now needs a secret passphrase (blowfish_secret)."
 
-#: index.php:548
+#: index.php:549
 msgid ""
 "Directory [code]config[/code], which is used by the setup script, still "
 "exists in your phpMyAdmin directory. It is strongly recommended to remove it "
@@ -937,7 +939,7 @@ msgstr ""
 "once phpMyAdmin has been configured. Otherwise the security of your server "
 "may be compromised by unauthorised people downloading your configuration."
 
-#: index.php:564
+#: index.php:565
 #, fuzzy, php-format
 #| msgid ""
 #| "The phpMyAdmin configuration storage is not completely configured, some "
@@ -949,12 +951,12 @@ msgstr ""
 "The phpMyAdmin configuration storage is not completely configured, some "
 "extended features have been deactivated. To find out why click %shere%s."
 
-#: index.php:571
+#: index.php:572
 msgid ""
 "Or alternately go to 'Operations' tab of any database to set it up there."
 msgstr ""
 
-#: index.php:620
+#: index.php:621
 #, php-format
 msgid ""
 "Your PHP MySQL library version %s differs from your MySQL server version %s. "
@@ -963,7 +965,7 @@ msgstr ""
 "Your PHP MySQL library version %s differs from your MySQL server version %s. "
 "This may cause unpredictable behaviour."
 
-#: index.php:648
+#: index.php:649
 #, php-format
 msgid ""
 "Server running with Suhosin. Please refer to %sdocumentation%s for possible "
@@ -1134,8 +1136,8 @@ msgstr ""
 msgid "Save & Close"
 msgstr "Save as file"
 
-#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:404
-#: libraries/insert_edit.lib.php:1550 prefs_manage.php:361
+#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:415
+#: libraries/insert_edit.lib.php:1548 prefs_manage.php:361
 #: prefs_manage.php:372
 msgid "Reset"
 msgstr "Reset"
@@ -1170,7 +1172,7 @@ msgstr "Add Index"
 msgid "Edit Index"
 msgstr "Edit Index"
 
-#: js/messages.php:99 templates/index_form.phtml:232
+#: js/messages.php:99 templates/table/index_form.phtml:232
 #, php-format
 msgid "Add %s column(s) to index"
 msgstr "Add %s column(s) to index"
@@ -1199,13 +1201,14 @@ msgstr "Columns enclosed with:"
 msgid "Please select column(s) for the index."
 msgstr "Add %s column(s) to index"
 
-#: js/messages.php:106 templates/structure/add_column.phtml:1
+#: js/messages.php:106 templates/table/structure/add_column.phtml:1
 msgid "You have to add at least one column."
 msgstr "You have to add at least one column."
 
-#: js/messages.php:109 libraries/insert_edit.lib.php:1548
+#: js/messages.php:109 libraries/insert_edit.lib.php:1546
 #: templates/columns_definitions/column_definitions_form.phtml:162
-#: templates/index_form.phtml:237 templates/tbl_relation/common_form.phtml:106
+#: templates/table/index_form.phtml:237
+#: templates/table/relation/common_form.phtml:106
 msgid "Preview SQL"
 msgstr ""
 
@@ -1226,7 +1229,7 @@ msgid "SQL query:"
 msgstr "SQL query:"
 
 #. l10n: Default label for the y-Axis of Charts
-#: js/messages.php:118 templates/tbl_chart.phtml:109
+#: js/messages.php:118 templates/table/chart/tbl_chart.phtml:109
 msgid "Y Values"
 msgstr "Y Values"
 
@@ -1387,7 +1390,7 @@ msgstr "Bytes sent"
 msgid "Bytes received"
 msgstr "Bytes received"
 
-#: js/messages.php:169 libraries/server_status.lib.php:226
+#: js/messages.php:169 libraries/server_status.lib.php:235
 msgid "Connections"
 msgstr "Connections"
 
@@ -1444,12 +1447,12 @@ msgstr "%d table(s)"
 msgid "Questions"
 msgstr "Questions"
 
-#: js/messages.php:184 libraries/server_status.lib.php:134
+#: js/messages.php:184 libraries/server_status.lib.php:143
 msgid "Traffic"
 msgstr "Traffic"
 
 #: js/messages.php:185 libraries/Menu.class.php:586
-#: libraries/Util.class.php:4318 libraries/server_status_monitor.lib.php:257
+#: libraries/Util.class.php:4324 libraries/server_status_monitor.lib.php:257
 msgid "Settings"
 msgstr "Settings"
 
@@ -1469,8 +1472,9 @@ msgstr "Please add at least one variable to the series!"
 #: libraries/server_status_monitor.lib.php:236
 #: libraries/server_status_processes.lib.php:308
 #: templates/columns_definitions/transformation.phtml:4
-#: templates/designer/options_panel.phtml:178
-#: templates/table/options_zoom.phtml:12 templates/table/rows_zoom.phtml:26
+#: templates/database/designer/options_panel.phtml:178
+#: templates/table/search/options_zoom.phtml:12
+#: templates/table/search/rows_zoom.phtml:26
 msgid "None"
 msgstr "None"
 
@@ -1755,8 +1759,8 @@ msgstr ""
 
 #: js/messages.php:270 libraries/Menu.class.php:352
 #: libraries/Menu.class.php:455 libraries/Menu.class.php:582
-#: libraries/Util.class.php:4317 libraries/Util.class.php:4332
-#: libraries/Util.class.php:4349 libraries/config/messages.inc.php:258
+#: libraries/Util.class.php:4323 libraries/Util.class.php:4338
+#: libraries/Util.class.php:4355 libraries/config/messages.inc.php:258
 #: libraries/display_import.lib.php:105
 #: libraries/server_status_monitor.lib.php:318 prefs_manage.php:238
 #: setup/frames/menu.inc.php:26
@@ -1816,13 +1820,13 @@ msgid "Formatting SQL..."
 msgstr ""
 
 #: js/messages.php:293 libraries/server_variables.lib.php:157
-#: templates/designer/aggregate_query_panel.phtml:63
-#: templates/designer/delete_relation_panel.phtml:28
-#: templates/designer/having_query_panel.phtml:117
-#: templates/designer/new_relation_panel.phtml:88
-#: templates/designer/options_panel.phtml:253
-#: templates/designer/rename_to_panel.phtml:45
-#: templates/designer/where_query_panel.phtml:83
+#: templates/database/designer/aggregate_query_panel.phtml:63
+#: templates/database/designer/delete_relation_panel.phtml:28
+#: templates/database/designer/having_query_panel.phtml:117
+#: templates/database/designer/new_relation_panel.phtml:88
+#: templates/database/designer/options_panel.phtml:253
+#: templates/database/designer/rename_to_panel.phtml:45
+#: templates/database/designer/where_query_panel.phtml:83
 msgid "Cancel"
 msgstr "Cancel"
 
@@ -1832,7 +1836,7 @@ msgstr "Cancel"
 msgid "Page-related settings"
 msgstr "Change settings"
 
-#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:402
+#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:413
 msgid "Apply"
 msgstr "Apply"
 
@@ -1869,8 +1873,8 @@ msgstr "Error code: %s"
 msgid "Error text: %s"
 msgstr "Error text: %s"
 
-#: js/messages.php:307 libraries/db_common.inc.php:68
-#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:450
+#: js/messages.php:307 libraries/db_common.inc.php:69
+#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:461
 msgid "No databases selected."
 msgstr "No databases selected."
 
@@ -1882,12 +1886,13 @@ msgstr "Dropping Column"
 msgid "Adding Primary Key"
 msgstr "Adding Primary Key"
 
-#: js/messages.php:310 templates/designer/aggregate_query_panel.phtml:59
-#: templates/designer/having_query_panel.phtml:113
-#: templates/designer/new_relation_panel.phtml:87
-#: templates/designer/options_panel.phtml:252
-#: templates/designer/rename_to_panel.phtml:41
-#: templates/designer/where_query_panel.phtml:82
+#: js/messages.php:310
+#: templates/database/designer/aggregate_query_panel.phtml:59
+#: templates/database/designer/having_query_panel.phtml:113
+#: templates/database/designer/new_relation_panel.phtml:87
+#: templates/database/designer/options_panel.phtml:252
+#: templates/database/designer/rename_to_panel.phtml:41
+#: templates/database/designer/where_query_panel.phtml:82
 msgid "OK"
 msgstr "OK"
 
@@ -1907,7 +1912,7 @@ msgstr "Copying Database"
 msgid "Changing Charset"
 msgstr "Changing Charset"
 
-#: js/messages.php:320 libraries/Util.class.php:3217
+#: js/messages.php:320 libraries/Util.class.php:3223
 #, fuzzy
 #| msgid "Disable foreign key checks"
 msgid "Enable foreign key checks"
@@ -1946,20 +1951,21 @@ msgstr "The definition of a stored function must contain a RETURN statement!"
 #: js/messages.php:334 libraries/DisplayResults.class.php:4834
 #: libraries/DisplayResults.class.php:5092 libraries/Menu.class.php:344
 #: libraries/Menu.class.php:446 libraries/Menu.class.php:578
-#: libraries/Util.class.php:3636 libraries/Util.class.php:3637
-#: libraries/Util.class.php:4316 libraries/Util.class.php:4331
-#: libraries/Util.class.php:4348 libraries/config/messages.inc.php:252
+#: libraries/Util.class.php:3642 libraries/Util.class.php:3643
+#: libraries/Util.class.php:4322 libraries/Util.class.php:4337
+#: libraries/Util.class.php:4354 libraries/config/messages.inc.php:252
 #: libraries/display_export.lib.php:173 libraries/rte/rte_list.lib.php:146
 #: libraries/server_privileges.lib.php:2211
 #: libraries/server_privileges.lib.php:2290
 #: libraries/server_privileges.lib.php:2632
 #: libraries/server_privileges.lib.php:3356
 #: libraries/server_status_monitor.lib.php:322 prefs_manage.php:303
-#: setup/frames/menu.inc.php:27 templates/structure/check_all_tables.phtml:11
+#: setup/frames/menu.inc.php:27
+#: templates/database/structure/check_all_tables.phtml:11
 msgid "Export"
 msgstr "Export"
 
-#: js/messages.php:337 libraries/rte/rte_routines.lib.php:652
+#: js/messages.php:337 libraries/rte/rte_routines.lib.php:743
 msgid "ENUM/SET editor"
 msgstr "ENUM/SET editor"
 
@@ -1999,7 +2005,7 @@ msgstr "Show query box"
 #: libraries/Console.class.php:214 libraries/DisplayResults.class.php:3474
 #: libraries/DisplayResults.class.php:4818 libraries/Index.class.php:723
 #: libraries/Util.class.php:706 libraries/Util.class.php:1202
-#: libraries/Util.class.php:3634 libraries/Util.class.php:3635
+#: libraries/Util.class.php:3640 libraries/Util.class.php:3641
 #: libraries/central_columns.lib.php:851
 #: libraries/central_columns.lib.php:1193
 #: libraries/config/messages.inc.php:892
@@ -2017,7 +2023,7 @@ msgstr "Edit"
 #: libraries/server_user_groups.lib.php:129
 #: libraries/sql_query_form.lib.php:416 libraries/tracking.lib.php:477
 #: setup/frames/index.inc.php:183 setup/frames/index.inc.php:291
-#: templates/designer/delete_relation_panel.phtml:27
+#: templates/database/designer/delete_relation_panel.phtml:27
 msgid "Delete"
 msgstr "Delete"
 
@@ -2201,11 +2207,11 @@ msgid "No dependencies selected!"
 msgstr "No databases selected."
 
 #: js/messages.php:394 libraries/central_columns.lib.php:1214
-#: libraries/insert_edit.lib.php:1458 libraries/server_variables.lib.php:155
+#: libraries/insert_edit.lib.php:1456 libraries/server_variables.lib.php:155
 #: setup/frames/config.inc.php:42 setup/frames/index.inc.php:279
 #: templates/columns_definitions/column_definitions_form.phtml:165
-#: templates/gis_visualization/gis_visualization.phtml:48
-#: templates/tbl_relation/common_form.phtml:107
+#: templates/table/gis_visualization/gis_visualization.phtml:48
+#: templates/table/relation/common_form.phtml:107
 msgid "Save"
 msgstr "Save"
 
@@ -2292,8 +2298,8 @@ msgid "Data point content"
 msgstr "Data point content"
 
 #: js/messages.php:430 js/messages.php:562 js/messages.php:579
-#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2573
-#: templates/index_form.phtml:154 templates/index_form.phtml:194
+#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2571
+#: templates/table/index_form.phtml:154 templates/table/index_form.phtml:194
 msgid "Ignore"
 msgstr "Ignore"
 
@@ -2352,8 +2358,8 @@ msgstr "Select Foreign Key"
 msgid "Please select the primary key or a unique key!"
 msgstr "Please select the primary key or a unique key!"
 
-#: js/messages.php:457 templates/designer/side_menu.phtml:91
-#: templates/designer/side_menu.phtml:94
+#: js/messages.php:457 templates/database/designer/side_menu.phtml:91
+#: templates/database/designer/side_menu.phtml:94
 msgid "Choose column to display"
 msgstr "Choose column to display"
 
@@ -2369,22 +2375,22 @@ msgstr ""
 msgid "Page name"
 msgstr "Page name"
 
-#: js/messages.php:463 templates/designer/side_menu.phtml:56
-#: templates/designer/side_menu.phtml:59
+#: js/messages.php:463 templates/database/designer/side_menu.phtml:56
+#: templates/database/designer/side_menu.phtml:59
 #, fuzzy
 #| msgid "Select page"
 msgid "Save page"
 msgstr "Select page"
 
-#: js/messages.php:464 templates/designer/side_menu.phtml:63
-#: templates/designer/side_menu.phtml:66
+#: js/messages.php:464 templates/database/designer/side_menu.phtml:63
+#: templates/database/designer/side_menu.phtml:66
 #, fuzzy
 #| msgid "Select page"
 msgid "Save page as"
 msgstr "Select page"
 
-#: js/messages.php:465 templates/designer/side_menu.phtml:49
-#: templates/designer/side_menu.phtml:52
+#: js/messages.php:465 templates/database/designer/side_menu.phtml:49
+#: templates/database/designer/side_menu.phtml:52
 #, fuzzy
 #| msgid "Free pages"
 msgid "Open page"
@@ -2396,7 +2402,7 @@ msgstr "Free pages"
 msgid "Delete page"
 msgstr "Select page"
 
-#: js/messages.php:467 templates/designer/side_menu.phtml:10
+#: js/messages.php:467 templates/database/designer/side_menu.phtml:10
 #, fuzzy
 #| msgid "Unit"
 msgid "Untitled"
@@ -2529,7 +2535,7 @@ msgstr "Original string"
 msgid "cancel"
 msgstr "Cancel"
 
-#: js/messages.php:499 libraries/server_status.lib.php:271
+#: js/messages.php:499 libraries/server_status.lib.php:280
 msgid "Aborted"
 msgstr "Aborted"
 
@@ -3151,7 +3157,7 @@ msgstr "Please enter a valid number!"
 
 #: js/messages.php:793 libraries/Message.class.php:199
 #: libraries/Util.class.php:654 libraries/core.lib.php:245
-#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1172
+#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1170
 #: tbl_operations.php:229 view_operations.php:63
 msgid "Error"
 msgstr "Error"
@@ -3211,8 +3217,8 @@ msgstr "per second"
 msgid "per minute"
 msgstr "per minute"
 
-#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:143
-#: libraries/server_status.lib.php:228
+#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:152
+#: libraries/server_status.lib.php:237
 #: libraries/server_status_queries.lib.php:98
 msgid "per hour"
 msgstr "per hour"
@@ -3231,7 +3237,7 @@ msgid "Wrong permissions on configuration file, should not be world writable!"
 msgstr ""
 "Wrong permissions on configuration file, should not be world writeable!"
 
-#: libraries/Config.class.php:1799
+#: libraries/Config.class.php:1801
 msgid "Font size"
 msgstr "Font size"
 
@@ -3261,10 +3267,10 @@ msgstr "subquery"
 #: libraries/server_privileges.lib.php:2890
 #: libraries/server_privileges.lib.php:3144
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4332
+#: libraries/server_privileges.lib.php:4358
 #: libraries/server_status_processes.lib.php:80
-#: templates/tbl_relation/foreign_key_row.phtml:165
-#: templates/tbl_relation/internal_relational_row.phtml:55
+#: templates/table/relation/foreign_key_row.phtml:165
+#: templates/table/relation/internal_relational_row.phtml:55
 msgid "Database"
 msgstr "Database"
 
@@ -3375,11 +3381,11 @@ msgstr "SQL history"
 #: libraries/plugins/import/ImportMediawiki.class.php:60
 #: libraries/plugins/import/ImportOds.class.php:59
 #: libraries/plugins/import/ImportShp.class.php:57
-#: libraries/plugins/import/ImportSql.class.php:148
+#: libraries/plugins/import/ImportSql.class.php:51
 #: libraries/plugins/import/ImportXml.class.php:58
-#: libraries/rte/rte_routines.lib.php:833 templates/index_form.phtml:49
-#: templates/structure/row_stats_table.phtml:20
-#: templates/table/options.phtml:2
+#: libraries/rte/rte_routines.lib.php:924 templates/table/index_form.phtml:49
+#: templates/table/search/options.phtml:2
+#: templates/table/structure/row_stats_table.phtml:20
 msgid "Options"
 msgstr "Options"
 
@@ -3424,7 +3430,8 @@ msgstr "Descending"
 msgid "Order:"
 msgstr "Order"
 
-#: libraries/Console.class.php:289 templates/table/replace_preview.phtml:17
+#: libraries/Console.class.php:289
+#: templates/table/search/replace_preview.phtml:17
 msgid "Count"
 msgstr "Count"
 
@@ -3549,9 +3556,9 @@ msgstr "Switch to copied table"
 #: libraries/operations.lib.php:794 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:191
-#: templates/structure/sortable_header.phtml:21
-#: templates/structure/sortable_header.phtml:38
-#: templates/table/options.phtml:68
+#: templates/database/structure/sortable_header.phtml:21
+#: templates/database/structure/sortable_header.phtml:38
+#: templates/table/search/options.phtml:68
 msgid "Ascending"
 msgstr "Ascending"
 
@@ -3561,13 +3568,14 @@ msgstr "Ascending"
 #: libraries/operations.lib.php:797 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:188
-#: templates/structure/sortable_header.phtml:26
-#: templates/structure/sortable_header.phtml:43
-#: templates/table/options.phtml:69
+#: templates/database/structure/sortable_header.phtml:26
+#: templates/database/structure/sortable_header.phtml:43
+#: templates/table/search/options.phtml:69
 msgid "Descending"
 msgstr "Descending"
 
-#: libraries/DBQbe.class.php:467 templates/table/search_and_replace.phtml:6
+#: libraries/DBQbe.class.php:467
+#: templates/table/search/search_and_replace.phtml:6
 msgid "Column:"
 msgstr "Column:"
 
@@ -3726,12 +3734,12 @@ msgstr[0] "%1$s match in <strong>%2$s</strong>"
 msgstr[1] "%1$s matches in <strong>%2$s</strong>"
 
 #: libraries/DbSearch.class.php:354 libraries/Menu.class.php:311
-#: libraries/Util.class.php:3337 libraries/Util.class.php:3347
-#: libraries/Util.class.php:3623 libraries/Util.class.php:3624
-#: libraries/Util.class.php:4343 libraries/config.values.php:43
+#: libraries/Util.class.php:3343 libraries/Util.class.php:3353
+#: libraries/Util.class.php:3629 libraries/Util.class.php:3630
+#: libraries/Util.class.php:4349 libraries/config.values.php:43
 #: libraries/config.values.php:51 libraries/config.values.php:119
 #: libraries/navigation/Nodes/Node_Table.class.php:295
-#: templates/structure/check_all_table_column.phtml:5
+#: templates/table/structure/check_all_table_column.phtml:5
 msgid "Browse"
 msgstr "Browse"
 
@@ -3748,7 +3756,8 @@ msgstr "Search in database"
 msgid "Words or values to search for (wildcard: \"%\"):"
 msgstr "Words or values to search for (wildcard: \"%\"):"
 
-#: libraries/DbSearch.class.php:401 templates/table/search_and_replace.phtml:1
+#: libraries/DbSearch.class.php:401
+#: templates/table/search/search_and_replace.phtml:1
 msgid "Find:"
 msgstr "Find:"
 
@@ -3792,28 +3801,28 @@ msgstr "Filter rows"
 msgid "Search this table"
 msgstr "Search this table"
 
-#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2532
-#: libraries/Util.class.php:2535
+#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2538
+#: libraries/Util.class.php:2541
 msgctxt "First page"
 msgid "Begin"
 msgstr "Begin"
 
-#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2533
-#: libraries/Util.class.php:2536 libraries/server_bin_log.lib.php:170
+#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2539
+#: libraries/Util.class.php:2542 libraries/server_bin_log.lib.php:170
 #: libraries/server_bin_log.lib.php:172
 msgctxt "Previous page"
 msgid "Previous"
 msgstr "Previous"
 
-#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2564
-#: libraries/Util.class.php:2574 libraries/server_bin_log.lib.php:204
+#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2570
+#: libraries/Util.class.php:2580 libraries/server_bin_log.lib.php:204
 #: libraries/server_bin_log.lib.php:206
 msgctxt "Next page"
 msgid "Next"
 msgstr "Next"
 
-#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2565
-#: libraries/Util.class.php:2575
+#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2571
+#: libraries/Util.class.php:2581
 msgctxt "Last page"
 msgid "End"
 msgstr "End"
@@ -3888,15 +3897,15 @@ msgid "May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]."
 msgstr "May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]."
 
 #: libraries/DisplayResults.class.php:4332 libraries/Message.class.php:180
-#: libraries/controllers/TableRelationController.class.php:258
+#: libraries/controllers/TableRelationController.class.php:259
 #: libraries/controllers/TableSearchController.class.php:655
-#: libraries/rte/rte_routines.lib.php:1332 libraries/sql_query_form.lib.php:89
+#: libraries/rte/rte_routines.lib.php:1423 libraries/sql_query_form.lib.php:89
 #: tbl_operations.php:227 tbl_row_action.php:138 view_operations.php:62
 msgid "Your SQL query has been executed successfully."
 msgstr "Your SQL query has been executed successfully."
 
 #: libraries/DisplayResults.class.php:4660
-#: libraries/controllers/StructureController.class.php:629
+#: libraries/controllers/DatabaseStructureController.class.php:564
 #, php-format
 msgid ""
 "This view has at least this number of rows. Please refer to %sdocumentation"
@@ -3920,33 +3929,33 @@ msgstr "%1$d total, %2$d in query"
 msgid "%d total"
 msgstr "%d total"
 
-#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1318
+#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1312
 #, php-format
 msgid "Query took %01.4f seconds."
 msgstr "Query took %01.4f seconds."
 
 #: libraries/DisplayResults.class.php:4807
-#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4767
-#: libraries/Util.class.php:4773 libraries/mult_submits.inc.php:50
-#: templates/structure/check_all_tables.phtml:2
-#: templates/structure/check_all_tables.phtml:9
+#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4773
+#: libraries/Util.class.php:4779 libraries/mult_submits.inc.php:50
+#: templates/database/structure/check_all_tables.phtml:2
+#: templates/database/structure/check_all_tables.phtml:9
 msgid "With selected:"
 msgstr "With selected:"
 
 #: libraries/DisplayResults.class.php:4811
-#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4769
-#: libraries/Util.class.php:4770 libraries/server_privileges.lib.php:1174
+#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4775
+#: libraries/Util.class.php:4776 libraries/server_privileges.lib.php:1174
 #: libraries/server_privileges.lib.php:1175
 #: libraries/server_privileges.lib.php:1387
 #: libraries/server_user_groups.lib.php:231
-#: templates/structure/check_all_tables.phtml:3
-#: templates/structure/check_all_tables.phtml:4
+#: templates/database/structure/check_all_tables.phtml:3
+#: templates/database/structure/check_all_tables.phtml:4
 msgid "Check All"
 msgstr "Check All"
 
 #: libraries/DisplayResults.class.php:4985 libraries/Header.class.php:383
-#: templates/structure/optional_action_links.phtml:1
-#: templates/structure/print_view_data_dictionary_link.phtml:3
+#: templates/database/structure/print_view_data_dictionary_link.phtml:3
+#: templates/table/structure/optional_action_links.phtml:1
 msgid "Print view"
 msgstr "Print view"
 
@@ -3954,7 +3963,8 @@ msgstr "Print view"
 msgid "Query results operations"
 msgstr "Query results operations"
 
-#: libraries/DisplayResults.class.php:5105 templates/tbl_chart.phtml:12
+#: libraries/DisplayResults.class.php:5105
+#: templates/table/chart/tbl_chart.phtml:12
 msgid "Display chart"
 msgstr "Display chart"
 
@@ -4050,7 +4060,7 @@ msgid "Click on the bar to scroll to top of page"
 msgstr "Click on the bar to scroll to top of page"
 
 #: libraries/Header.class.php:749
-#: libraries/plugins/auth/AuthenticationCookie.class.php:152
+#: libraries/plugins/auth/AuthenticationCookie.class.php:140
 msgid "Javascript must be enabled past this point!"
 msgstr "Javascript must be enabled past this point!"
 
@@ -4072,11 +4082,11 @@ msgid "Keyname"
 msgstr "Keyname"
 
 #: libraries/Index.class.php:697
-#: libraries/controllers/StructureController.class.php:1962
-#: libraries/controllers/StructureController.class.php:1967
+#: libraries/controllers/TableStructureController.class.php:953
+#: libraries/controllers/TableStructureController.class.php:958
 #: libraries/tracking.lib.php:973
 #: templates/columns_definitions/column_indexes.phtml:11
-#: templates/structure/check_all_table_column.phtml:26
+#: templates/table/structure/check_all_table_column.phtml:26
 msgid "Unique"
 msgstr "Unique"
 
@@ -4095,16 +4105,17 @@ msgstr "Cardinality"
 #: libraries/server_collations.lib.php:35 libraries/tracking.lib.php:881
 #: libraries/tracking.lib.php:977
 #: templates/columns_definitions/table_fields_definitions.phtml:33
-#: templates/structure/row_stats_table.phtml:31
-#: templates/structure/table_header.phtml:55
-#: templates/structure/table_structure_header.phtml:7
-#: templates/table/table_header.phtml:8
+#: templates/database/structure/table_header.phtml:55
+#: templates/table/search/table_header.phtml:8
+#: templates/table/structure/row_stats_table.phtml:31
+#: templates/table/structure/table_structure_header.phtml:7
 msgid "Collation"
 msgstr "Collation"
 
 #: libraries/Index.class.php:703 libraries/rte/rte_events.lib.php:496
-#: libraries/rte/rte_routines.lib.php:956 libraries/tracking.lib.php:885
-#: libraries/tracking.lib.php:979 templates/structure/table_header.phtml:84
+#: libraries/rte/rte_routines.lib.php:1047 libraries/tracking.lib.php:885
+#: libraries/tracking.lib.php:979
+#: templates/database/structure/table_header.phtml:84
 msgid "Comment"
 msgstr "Comment"
 
@@ -4117,15 +4128,15 @@ msgstr "The primary key has been dropped."
 msgid "Index %s has been dropped."
 msgstr "Index %s has been dropped."
 
-#: libraries/Index.class.php:757 libraries/Util.class.php:3630
-#: libraries/Util.class.php:3631
-#: libraries/controllers/StructureController.class.php:1958
-#: libraries/controllers/StructureController.class.php:1959
+#: libraries/Index.class.php:757 libraries/Util.class.php:3636
+#: libraries/Util.class.php:3637
+#: libraries/controllers/TableStructureController.class.php:949
+#: libraries/controllers/TableStructureController.class.php:950
 #: libraries/operations.lib.php:1607 libraries/rte/rte_list.lib.php:150
 #: libraries/server_databases.lib.php:146
-#: templates/structure/check_all_table_column.phtml:15
-#: templates/structure/check_all_tables.phtml:16
-#: templates/tbl_relation/foreign_key_row.phtml:93
+#: templates/database/structure/check_all_tables.phtml:16
+#: templates/table/relation/foreign_key_row.phtml:93
+#: templates/table/structure/check_all_table_column.phtml:15
 msgid "Drop"
 msgstr "Drop"
 
@@ -4156,16 +4167,16 @@ msgstr "Server"
 #: libraries/Menu.class.php:248
 #: libraries/navigation/Nodes/Node_View.class.php:32
 #: libraries/tbl_info.inc.php:63
-#: templates/structure/structure_table_row.phtml:97
-#: templates/structure/structure_table_row.phtml:159
+#: templates/database/structure/structure_table_row.phtml:97
+#: templates/database/structure/structure_table_row.phtml:159
 msgid "View"
 msgstr "View"
 
 #: libraries/Menu.class.php:325 libraries/Menu.class.php:429
-#: libraries/Menu.class.php:548 libraries/Util.class.php:3334
-#: libraries/Util.class.php:3344 libraries/Util.class.php:3350
-#: libraries/Util.class.php:4313 libraries/Util.class.php:4328
-#: libraries/Util.class.php:4345 libraries/config.values.php:40
+#: libraries/Menu.class.php:548 libraries/Util.class.php:3340
+#: libraries/Util.class.php:3350 libraries/Util.class.php:3356
+#: libraries/Util.class.php:4319 libraries/Util.class.php:4334
+#: libraries/Util.class.php:4351 libraries/config.values.php:40
 #: libraries/config.values.php:48 libraries/config.values.php:110
 #: libraries/config.values.php:116 libraries/config/messages.inc.php:321
 #: libraries/navigation/Nodes/Node_Table.class.php:292
@@ -4173,19 +4184,19 @@ msgid "SQL"
 msgstr "SQL"
 
 #: libraries/Menu.class.php:328 libraries/Menu.class.php:432
-#: libraries/Util.class.php:3335 libraries/Util.class.php:3345
-#: libraries/Util.class.php:3351 libraries/Util.class.php:3625
-#: libraries/Util.class.php:3626 libraries/Util.class.php:4329
-#: libraries/Util.class.php:4346 libraries/config.values.php:41
+#: libraries/Util.class.php:3341 libraries/Util.class.php:3351
+#: libraries/Util.class.php:3357 libraries/Util.class.php:3631
+#: libraries/Util.class.php:3632 libraries/Util.class.php:4335
+#: libraries/Util.class.php:4352 libraries/config.values.php:41
 #: libraries/config.values.php:49 libraries/config.values.php:111
 #: libraries/config.values.php:117
 #: libraries/navigation/Nodes/Node_Table.class.php:286
 msgid "Search"
 msgstr "Search"
 
-#: libraries/Menu.class.php:338 libraries/Util.class.php:3336
-#: libraries/Util.class.php:3346 libraries/Util.class.php:3627
-#: libraries/Util.class.php:3628 libraries/Util.class.php:4347
+#: libraries/Menu.class.php:338 libraries/Util.class.php:3342
+#: libraries/Util.class.php:3352 libraries/Util.class.php:3633
+#: libraries/Util.class.php:3634 libraries/Util.class.php:4353
 #: libraries/config.values.php:42 libraries/config.values.php:50
 #: libraries/config.values.php:118
 #: libraries/navigation/Nodes/Node_Table.class.php:289
@@ -4194,30 +4205,30 @@ msgid "Insert"
 msgstr "Insert"
 
 #: libraries/Menu.class.php:362 libraries/Menu.class.php:467
-#: libraries/Util.class.php:4334 libraries/Util.class.php:4350
+#: libraries/Util.class.php:4340 libraries/Util.class.php:4356
 #: libraries/config.values.php:106 libraries/server_common.lib.php:51
 #: libraries/server_privileges.lib.php:2370
 #: libraries/server_privileges.lib.php:3158
-#: libraries/server_privileges.lib.php:4221
+#: libraries/server_privileges.lib.php:4247
 msgid "Privileges"
 msgstr "Privileges"
 
 #: libraries/Menu.class.php:371 libraries/Menu.class.php:379
-#: libraries/Menu.class.php:459 libraries/Util.class.php:3338
-#: libraries/Util.class.php:3352 libraries/Util.class.php:4333
-#: libraries/Util.class.php:4351 libraries/config.values.php:112
+#: libraries/Menu.class.php:459 libraries/Util.class.php:3344
+#: libraries/Util.class.php:3358 libraries/Util.class.php:4339
+#: libraries/Util.class.php:4357 libraries/config.values.php:112
 #: view_operations.php:92
 msgid "Operations"
 msgstr "Operations"
 
 #: libraries/Menu.class.php:384 libraries/Menu.class.php:492
-#: libraries/Util.class.php:4338 libraries/Util.class.php:4352
+#: libraries/Util.class.php:4344 libraries/Util.class.php:4358
 #: libraries/relation.lib.php:255
 msgid "Tracking"
 msgstr "Tracking"
 
 #: libraries/Menu.class.php:397 libraries/Menu.class.php:486
-#: libraries/Util.class.php:4337 libraries/Util.class.php:4353
+#: libraries/Util.class.php:4343 libraries/Util.class.php:4359
 #: libraries/navigation/Nodes/Node_Trigger_Container.class.php:24
 #: libraries/plugins/export/ExportHtmlword.class.php:557
 #: libraries/plugins/export/ExportOdt.class.php:685
@@ -4234,16 +4245,16 @@ msgstr "Triggers"
 msgid "Database seems to be empty!"
 msgstr "Database seems to be empty!"
 
-#: libraries/Menu.class.php:439 libraries/Util.class.php:4330
+#: libraries/Menu.class.php:439 libraries/Util.class.php:4336
 msgid "Query"
 msgstr "Query"
 
-#: libraries/Menu.class.php:472 libraries/Util.class.php:4335
+#: libraries/Menu.class.php:472 libraries/Util.class.php:4341
 #: libraries/rte/rte_words.lib.php:36
 msgid "Routines"
 msgstr "Routines"
 
-#: libraries/Menu.class.php:479 libraries/Util.class.php:4336
+#: libraries/Menu.class.php:479 libraries/Util.class.php:4342
 #: libraries/navigation/Nodes/Node_Event_Container.class.php:26
 #: libraries/plugins/export/ExportSql.class.php:940
 #: libraries/plugins/export/ExportXml.class.php:107
@@ -4251,22 +4262,22 @@ msgstr "Routines"
 msgid "Events"
 msgstr "Events"
 
-#: libraries/Menu.class.php:498 libraries/Util.class.php:4339
+#: libraries/Menu.class.php:498 libraries/Util.class.php:4345
 msgid "Designer"
 msgstr "Designer"
 
-#: libraries/Menu.class.php:507 libraries/Util.class.php:4340
-#: templates/structure/check_all_tables.phtml:35
+#: libraries/Menu.class.php:507 libraries/Util.class.php:4346
+#: templates/database/structure/check_all_tables.phtml:35
 #, fuzzy
 #| msgid "Textarea columns"
 msgid "Central columns"
 msgstr "Textarea columns"
 
-#: libraries/Menu.class.php:544 libraries/Util.class.php:4312
+#: libraries/Menu.class.php:544 libraries/Util.class.php:4318
 #: libraries/config.values.php:103 libraries/config/messages.inc.php:266
 #: libraries/config/messages.inc.php:341
 #: libraries/navigation/NavigationTree.class.php:1239
-#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4332
+#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4358
 msgid "Databases"
 msgstr "Databases"
 
@@ -4277,34 +4288,34 @@ msgid "User accounts"
 msgstr "User groups"
 
 #: libraries/Menu.class.php:595 libraries/ServerStatusData.class.php:121
-#: libraries/Util.class.php:4319 libraries/server_common.lib.php:36
+#: libraries/Util.class.php:4325 libraries/server_common.lib.php:36
 msgid "Binary log"
 msgstr "Binary log"
 
 #: libraries/Menu.class.php:601 libraries/ServerStatusData.class.php:126
-#: libraries/Util.class.php:4320 libraries/server_common.lib.php:42
-#: templates/structure/body_for_table_summary.phtml:10
-#: templates/structure/table_header.phtml:27
+#: libraries/Util.class.php:4326 libraries/server_common.lib.php:42
+#: templates/database/structure/body_for_table_summary.phtml:10
+#: templates/database/structure/table_header.phtml:27
 msgid "Replication"
 msgstr "Replication"
 
 #: libraries/Menu.class.php:606 libraries/ServerStatusData.class.php:193
-#: libraries/Util.class.php:4321 libraries/config.values.php:105
+#: libraries/Util.class.php:4327 libraries/config.values.php:105
 #: libraries/server_engines.lib.php:108 libraries/server_engines.lib.php:112
 #: libraries/sql_query_form.lib.php:421
 msgid "Variables"
 msgstr "Variables"
 
-#: libraries/Menu.class.php:610 libraries/Util.class.php:4322
+#: libraries/Menu.class.php:610 libraries/Util.class.php:4328
 msgid "Charsets"
 msgstr "Charsets"
 
-#: libraries/Menu.class.php:615 libraries/Util.class.php:4323
+#: libraries/Menu.class.php:615 libraries/Util.class.php:4329
 #: libraries/server_common.lib.php:33 libraries/server_plugins.lib.php:27
 msgid "Plugins"
 msgstr "Plug-ins"
 
-#: libraries/Menu.class.php:626 libraries/Util.class.php:4324
+#: libraries/Menu.class.php:626 libraries/Util.class.php:4330
 msgid "Engines"
 msgstr "Engines"
 
@@ -4329,7 +4340,7 @@ msgid_plural "%1$d rows inserted."
 msgstr[0] "%1$d row inserted."
 msgstr[1] "%1$d rows inserted."
 
-#: libraries/PDF.class.php:70 libraries/Util.class.php:2521
+#: libraries/PDF.class.php:70 libraries/Util.class.php:2527
 #: libraries/browse_foreigners.lib.php:327
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:865
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:890
@@ -4350,7 +4361,7 @@ msgid "Could not save favorite table!"
 msgstr "Could not save favourite table!"
 
 #: libraries/RecentFavoriteTable.class.php:212
-#: templates/structure/favorite_anchor.phtml:12
+#: templates/database/structure/favorite_anchor.phtml:12
 msgid "Remove from Favorites"
 msgstr "Remove from Favourites"
 
@@ -4516,7 +4527,7 @@ msgstr ""
 "There is no detailed status information available for this storage engine."
 
 #: libraries/StorageEngine.class.php:373
-#: templates/structure/body_for_table_summary.phtml:50
+#: templates/database/structure/body_for_table_summary.phtml:50
 #, php-format
 msgid "%s is the default storage engine on this MySQL server."
 msgstr "%s is the default storage engine on this MySQL server."
@@ -4994,10 +5005,10 @@ msgstr ""
 
 #: libraries/Util.class.php:726 libraries/rte/rte_events.lib.php:110
 #: libraries/rte/rte_events.lib.php:119 libraries/rte/rte_events.lib.php:150
-#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:153
-#: libraries/rte/rte_routines.lib.php:162
-#: libraries/rte/rte_routines.lib.php:235
-#: libraries/rte/rte_routines.lib.php:1366
+#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:223
+#: libraries/rte/rte_routines.lib.php:250
+#: libraries/rte/rte_routines.lib.php:372
+#: libraries/rte/rte_routines.lib.php:1457
 #: libraries/rte/rte_triggers.lib.php:86 libraries/rte/rte_triggers.lib.php:95
 #: libraries/rte/rte_triggers.lib.php:127
 msgid "MySQL said: "
@@ -5043,75 +5054,78 @@ msgstr "Sun"
 msgid "%B %d, %Y at %I:%M %p"
 msgstr "%B %d, %Y at %I:%M %p"
 
-#: libraries/Util.class.php:2019
+#: libraries/Util.class.php:2025
 #, php-format
 msgid "%s days, %s hours, %s minutes and %s seconds"
 msgstr "%s days, %s hours, %s minutes and %s seconds"
 
-#: libraries/Util.class.php:2112
+#: libraries/Util.class.php:2118
 msgid "Missing parameter:"
 msgstr "Missing parameter:"
 
-#: libraries/Util.class.php:2645
+#: libraries/Util.class.php:2651
 #, php-format
 msgid "Jump to database \"%s\"."
 msgstr "Jump to database \"%s\"."
 
-#: libraries/Util.class.php:2670
+#: libraries/Util.class.php:2676
 #, php-format
 msgid "The %s functionality is affected by a known bug, see %s"
 msgstr "The %s functionality is affected by a known bug, see %s"
 
-#: libraries/Util.class.php:2881
+#: libraries/Util.class.php:2887
 msgid "Click to toggle"
 msgstr "Click to toggle"
 
-#: libraries/Util.class.php:3542 prefs_manage.php:248
+#: libraries/Util.class.php:3548 prefs_manage.php:248
 msgid "Browse your computer:"
 msgstr "Browse your computer:"
 
-#: libraries/Util.class.php:3567
+#: libraries/Util.class.php:3573
 #, php-format
 msgid "Select from the web server upload directory <b>%s</b>:"
 msgstr "Select from the web server upload directory <b>%s</b>:"
 
-#: libraries/Util.class.php:3596 libraries/insert_edit.lib.php:1173
+#: libraries/Util.class.php:3602 libraries/insert_edit.lib.php:1171
 msgid "The directory you set for upload work cannot be reached."
 msgstr "The directory you set for upload work cannot be reached."
 
-#: libraries/Util.class.php:3607
+#: libraries/Util.class.php:3613
 msgid "There are no files to upload!"
 msgstr "There are no files to upload!"
 
-#: libraries/Util.class.php:3632 libraries/Util.class.php:3633
-#: templates/structure/check_all_tables.phtml:15
+#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: templates/database/structure/check_all_tables.phtml:15
 msgid "Empty"
 msgstr "Empty"
 
-#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: libraries/Util.class.php:3644 libraries/Util.class.php:3645
 msgid "Execute"
 msgstr "Execute"
 
-#: libraries/Util.class.php:4152
+#: libraries/Util.class.php:4158
 msgid "Print"
 msgstr "Print"
 
-#: libraries/Util.class.php:4257 templates/structure/row_stats_table.phtml:80
-#: templates/structure/table_header.phtml:95
+#: libraries/Util.class.php:4263
+#: templates/database/structure/table_header.phtml:95
+#: templates/table/structure/row_stats_table.phtml:80
 msgid "Creation"
 msgstr "Creation"
 
-#: libraries/Util.class.php:4263 templates/structure/row_stats_table.phtml:87
-#: templates/structure/table_header.phtml:106
+#: libraries/Util.class.php:4269
+#: templates/database/structure/table_header.phtml:106
+#: templates/table/structure/row_stats_table.phtml:87
 msgid "Last update"
 msgstr "Last update"
 
-#: libraries/Util.class.php:4269 templates/structure/row_stats_table.phtml:94
-#: templates/structure/table_header.phtml:117
+#: libraries/Util.class.php:4275
+#: templates/database/structure/table_header.phtml:117
+#: templates/table/structure/row_stats_table.phtml:94
 msgid "Last check"
 msgstr "Last check"
 
-#: libraries/Util.class.php:4315
+#: libraries/Util.class.php:4321
 msgid "Users"
 msgstr "Users"
 
@@ -5132,16 +5146,16 @@ msgid "Use this value"
 msgstr "Use this value"
 
 #: libraries/build_html_for_db.lib.php:33 libraries/import.lib.php:193
-#: templates/structure/actions_in_table_structure.phtml:113
-#: templates/structure/row_stats_table.phtml:42
-#: templates/structure/table_header.phtml:36
+#: templates/database/structure/table_header.phtml:36
+#: templates/table/structure/actions_in_table_structure.phtml:113
+#: templates/table/structure/row_stats_table.phtml:42
 msgid "Rows"
 msgstr "Rows"
 
 #: libraries/build_html_for_db.lib.php:48 libraries/engines/innodb.lib.php:171
-#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:186
-#: libraries/server_status.lib.php:298
-#: templates/structure/display_table_stats.phtml:40
+#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:195
+#: libraries/server_status.lib.php:307
+#: templates/table/structure/display_table_stats.phtml:40
 msgid "Total"
 msgstr "Total"
 
@@ -5150,10 +5164,12 @@ msgid "Jump to database"
 msgstr "Jump to database"
 
 #: libraries/build_html_for_db.lib.php:146
+#: templates/database/structure/structure_table_row.phtml:15
 msgid "Not replicated"
 msgstr "Not replicated"
 
 #: libraries/build_html_for_db.lib.php:158
+#: templates/database/structure/structure_table_row.phtml:16
 msgid "Replicated"
 msgstr "Replicated"
 
@@ -5210,17 +5226,17 @@ msgstr ""
 #: libraries/plugins/export/ExportTexytext.class.php:425
 #: libraries/plugins/export/PMA_ExportPdf.class.php:307
 #: libraries/rte/rte_list.lib.php:73 libraries/rte/rte_list.lib.php:85
-#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:830
-#: libraries/rte/rte_routines.lib.php:1492 setup/frames/index.inc.php:162
+#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:921
+#: libraries/rte/rte_routines.lib.php:1583 setup/frames/index.inc.php:162
 #: templates/columns_definitions/table_fields_definitions.phtml:8
-#: templates/structure/table_structure_header.phtml:5
-#: templates/table/create_table.phtml:11
+#: templates/database/create_table.phtml:11
+#: templates/table/structure/table_structure_header.phtml:5
 msgid "Name"
 msgstr "Name"
 
 #: libraries/central_columns.lib.php:699
 #: libraries/central_columns.lib.php:1381
-#: libraries/rte/rte_routines.lib.php:832
+#: libraries/rte/rte_routines.lib.php:923
 #: templates/columns_definitions/table_fields_definitions.phtml:14
 msgid "Length/Values"
 msgstr "Length/Values"
@@ -5243,7 +5259,7 @@ msgid "Select a table"
 msgstr "Select Tables"
 
 #: libraries/central_columns.lib.php:804
-#: templates/structure/add_column.phtml:4
+#: templates/table/structure/add_column.phtml:4
 msgid "Add column"
 msgstr "Add column"
 
@@ -5263,7 +5279,7 @@ msgstr "Add column"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1002
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1025
 #: templates/columns_definitions/table_fields_definitions.phtml:36
-#: templates/structure/table_structure_header.phtml:8
+#: templates/table/structure/table_structure_header.phtml:8
 msgid "Attributes"
 msgstr "Attributes"
 
@@ -5376,7 +5392,7 @@ msgid "Double click"
 msgstr "Double click"
 
 #: libraries/config.values.php:95 libraries/config.values.php:124
-#: libraries/config/FormDisplay.tpl.php:221 libraries/relation.lib.php:97
+#: libraries/config/FormDisplay.tpl.php:232 libraries/relation.lib.php:97
 #: libraries/relation.lib.php:105
 msgid "Disabled"
 msgstr "Disabled"
@@ -5556,22 +5572,22 @@ msgstr "Compressed export will not work due to missing function %s."
 msgid "maximum %s"
 msgstr "maximum %s"
 
-#: libraries/config/FormDisplay.tpl.php:219
+#: libraries/config/FormDisplay.tpl.php:230
 msgid "This setting is disabled, it will not be applied to your configuration."
 msgstr ""
 "This setting is disabled, it will not be applied to your configuration."
 
-#: libraries/config/FormDisplay.tpl.php:313
+#: libraries/config/FormDisplay.tpl.php:324
 #, php-format
 msgid "Set value: %s"
 msgstr "Set value: %s"
 
-#: libraries/config/FormDisplay.tpl.php:318
+#: libraries/config/FormDisplay.tpl.php:329
 #: libraries/config/messages.inc.php:610
 msgid "Restore default value"
 msgstr "Restore default value"
 
-#: libraries/config/FormDisplay.tpl.php:332
+#: libraries/config/FormDisplay.tpl.php:343
 msgid "Allow users to customize this value"
 msgstr "Allow users to customise this value"
 
@@ -6064,7 +6080,7 @@ msgstr "Character set of the file"
 
 #: libraries/config/messages.inc.php:136 libraries/config/messages.inc.php:152
 #: libraries/sql_query_form.lib.php:247
-#: templates/structure/row_stats_table.phtml:7
+#: templates/table/structure/row_stats_table.phtml:7
 msgid "Format"
 msgstr "Format"
 
@@ -6589,7 +6605,7 @@ msgstr ""
 
 #: libraries/config/messages.inc.php:332
 #: libraries/plugins/export/ExportPdf.class.php:279
-#: templates/structure/secondary_tabs.phtml:8
+#: templates/table/secondary_tabs.phtml:8
 msgid "Table structure"
 msgstr "Table structure"
 
@@ -8323,103 +8339,33 @@ msgstr "Microsoft Word 2000"
 msgid "OpenDocument Text"
 msgstr "Open-Document Text"
 
-#: libraries/controllers/StructureController.class.php:465
+#: libraries/controllers/DatabaseStructureController.class.php:405
 #: tbl_operations.php:382
 #, php-format
 msgid "Table %s has been emptied."
 msgstr "Table %s has been emptied."
 
-#: libraries/controllers/StructureController.class.php:486
+#: libraries/controllers/DatabaseStructureController.class.php:426
 #: tbl_operations.php:400 view_operations.php:119
 #, php-format
 msgid "View %s has been dropped."
 msgstr "View %s has been dropped."
 
-#: libraries/controllers/StructureController.class.php:487
+#: libraries/controllers/DatabaseStructureController.class.php:427
 #: tbl_operations.php:401
 #, php-format
 msgid "Table %s has been dropped."
 msgstr "Table %s has been dropped."
 
-#: libraries/controllers/StructureController.class.php:797
-#, fuzzy, php-format
-#| msgid "The column name '%s' is a MySQL reserved keyword."
-msgid "The name '%s' is a MySQL reserved keyword."
-msgid_plural "The names '%s' are MySQL reserved keywords."
-msgstr[0] "The column name '%s' is a MySQL reserved keyword."
-msgstr[1] "The column name '%s' is a MySQL reserved keyword."
-
-#: libraries/controllers/StructureController.class.php:875
-msgid "No column selected."
-msgstr "No column selected."
-
-#: libraries/controllers/StructureController.class.php:1049
+#: libraries/controllers/DatabaseStructureController.class.php:733
 msgid "Favorite List is full!"
 msgstr "Favourite List is full!"
 
-#: libraries/controllers/StructureController.class.php:1272
-msgid "The columns have been moved successfully."
-msgstr "The columns have been moved successfully."
-
-#: libraries/controllers/StructureController.class.php:1535
-#, fuzzy, php-format
-#| msgid "Table %1$s has been altered successfully."
-msgid ""
-"Table %1$s has been altered successfully. Privileges have been adjusted."
-msgstr "Table %1$s has been altered successfully."
-
-#: libraries/controllers/StructureController.class.php:1541
-#: libraries/controllers/TableIndexesController.class.php:161
-#: tbl_addfield.php:92
-#, php-format
-msgid "Table %1$s has been altered successfully."
-msgstr "Table %1$s has been altered successfully."
-
-#: libraries/controllers/StructureController.class.php:1588
-#: libraries/tracking.lib.php:1094
-msgid "Query error"
-msgstr "Query error"
-
-#: libraries/controllers/StructureController.class.php:1806
+#: libraries/controllers/DatabaseStructureController.class.php:947
 #: libraries/mysql_charsets.lib.php:366 libraries/mysql_charsets.lib.php:373
 msgid "unknown"
 msgstr "unknown"
 
-#: libraries/controllers/StructureController.class.php:1957
-#: templates/structure/check_all_table_column.phtml:11
-msgid "Change"
-msgstr "Change"
-
-#: libraries/controllers/StructureController.class.php:1961
-#: libraries/controllers/StructureController.class.php:1966
-#: libraries/navigation/Nodes/Node_Index.class.php:30
-#: libraries/tracking.lib.php:926
-#: templates/columns_definitions/column_indexes.phtml:16
-#: templates/columns_definitions/table_fields_definitions.phtml:57
-#: templates/structure/check_all_table_column.phtml:30
-#: templates/structure/display_structure.phtml:79
-#: templates/structure/display_table_stats.phtml:19
-msgid "Index"
-msgstr "Index"
-
-#: libraries/controllers/StructureController.class.php:1963
-#: libraries/controllers/StructureController.class.php:1968
-#: templates/columns_definitions/column_indexes.phtml:27
-#: templates/structure/check_all_table_column.phtml:37
-msgid "Spatial"
-msgstr "Spatial"
-
-#: libraries/controllers/StructureController.class.php:1964
-#: libraries/controllers/StructureController.class.php:1969
-#: templates/columns_definitions/column_indexes.phtml:22
-#: templates/structure/check_all_table_column.phtml:47
-msgid "Fulltext"
-msgstr "Fulltext"
-
-#: libraries/controllers/StructureController.class.php:1970
-msgid "Distinct values"
-msgstr "Distinct values"
-
 #: libraries/controllers/TableChartController.class.php:82
 #: libraries/controllers/TableGisVisualizationController.class.php:101
 msgid "No SQL query was set to fetch data."
@@ -8433,13 +8379,20 @@ msgstr "No numeric columns present in the table to plot."
 msgid "No data to display"
 msgstr "No data to display"
 
-#: libraries/controllers/TableRelationController.class.php:217
+#: libraries/controllers/TableIndexesController.class.php:161
+#: libraries/controllers/TableStructureController.class.php:736
+#: tbl_addfield.php:92
+#, php-format
+msgid "Table %1$s has been altered successfully."
+msgstr "Table %1$s has been altered successfully."
+
+#: libraries/controllers/TableRelationController.class.php:218
 #, fuzzy
 #| msgid "Thread %s was successfully killed."
 msgid "Display column was successfully updated."
 msgstr "Thread %s was successfully killed."
 
-#: libraries/controllers/TableRelationController.class.php:283
+#: libraries/controllers/TableRelationController.class.php:288
 #, fuzzy
 #| msgid "Internal relation has been added."
 msgid "Internal relations were successfully updated."
@@ -8456,12 +8409,75 @@ msgid "Zoom search"
 msgstr "Zoom search"
 
 #: libraries/controllers/TableSearchController.class.php:852
-#: templates/table/selection_form.phtml:59
+#: templates/table/search/selection_form.phtml:59
 #, fuzzy
 #| msgid "Find and Replace"
 msgid "Find and replace"
 msgstr "Find and Replace"
 
+#: libraries/controllers/TableStructureController.class.php:163
+#, fuzzy, php-format
+#| msgid "The column name '%s' is a MySQL reserved keyword."
+msgid "The name '%s' is a MySQL reserved keyword."
+msgid_plural "The names '%s' are MySQL reserved keywords."
+msgstr[0] "The column name '%s' is a MySQL reserved keyword."
+msgstr[1] "The column name '%s' is a MySQL reserved keyword."
+
+#: libraries/controllers/TableStructureController.class.php:241
+msgid "No column selected."
+msgstr "No column selected."
+
+#: libraries/controllers/TableStructureController.class.php:467
+msgid "The columns have been moved successfully."
+msgstr "The columns have been moved successfully."
+
+#: libraries/controllers/TableStructureController.class.php:730
+#, fuzzy, php-format
+#| msgid "Table %1$s has been altered successfully."
+msgid ""
+"Table %1$s has been altered successfully. Privileges have been adjusted."
+msgstr "Table %1$s has been altered successfully."
+
+#: libraries/controllers/TableStructureController.class.php:783
+#: libraries/tracking.lib.php:1094
+msgid "Query error"
+msgstr "Query error"
+
+#: libraries/controllers/TableStructureController.class.php:948
+#: templates/table/structure/check_all_table_column.phtml:11
+msgid "Change"
+msgstr "Change"
+
+#: libraries/controllers/TableStructureController.class.php:952
+#: libraries/controllers/TableStructureController.class.php:957
+#: libraries/navigation/Nodes/Node_Index.class.php:30
+#: libraries/tracking.lib.php:926
+#: templates/columns_definitions/column_indexes.phtml:16
+#: templates/columns_definitions/table_fields_definitions.phtml:57
+#: templates/table/structure/check_all_table_column.phtml:30
+#: templates/table/structure/display_structure.phtml:79
+#: templates/table/structure/display_table_stats.phtml:19
+msgid "Index"
+msgstr "Index"
+
+#: libraries/controllers/TableStructureController.class.php:954
+#: libraries/controllers/TableStructureController.class.php:959
+#: templates/columns_definitions/column_indexes.phtml:27
+#: templates/table/structure/check_all_table_column.phtml:37
+msgid "Spatial"
+msgstr "Spatial"
+
+#: libraries/controllers/TableStructureController.class.php:955
+#: libraries/controllers/TableStructureController.class.php:960
+#: templates/columns_definitions/column_indexes.phtml:22
+#: templates/table/structure/check_all_table_column.phtml:47
+msgid "Fulltext"
+msgstr "Fulltext"
+
+#: libraries/controllers/TableStructureController.class.php:963
+msgid "Distinct values"
+msgstr "Distinct values"
+
 #: libraries/core.lib.php:306
 #, php-format
 msgid "The %s extension is missing. Please check your PHP configuration."
@@ -8510,7 +8526,7 @@ msgid "No Password"
 msgstr "No Password"
 
 #: libraries/display_change_password.lib.php:68
-#: libraries/plugins/auth/AuthenticationCookie.class.php:199
+#: libraries/plugins/auth/AuthenticationCookie.class.php:187
 #: libraries/replication_gui.lib.php:422 libraries/replication_gui.lib.php:862
 #: libraries/server_privileges.lib.php:1640
 msgid "Password:"
@@ -9331,12 +9347,12 @@ msgid "Dump has been saved to file %s."
 msgstr "Dump has been saved to file %s."
 
 #: libraries/import.lib.php:202 libraries/insert_edit.lib.php:124
-#: libraries/rte/rte_routines.lib.php:1353 libraries/sql.lib.php:1312
+#: libraries/rte/rte_routines.lib.php:1444 libraries/sql.lib.php:1306
 #: tbl_get_field.php:44
 msgid "MySQL returned an empty result set (i.e. zero rows)."
 msgstr "MySQL returned an empty result set (i.e. zero rows)."
 
-#: libraries/import.lib.php:265 libraries/sql.lib.php:1326
+#: libraries/import.lib.php:265 libraries/sql.lib.php:1320
 msgid "[ROLLBACK occurred.]"
 msgstr ""
 
@@ -9402,14 +9418,14 @@ msgstr "Create an index on &nbsp;%s&nbsp;columns"
 
 #: libraries/insert_edit.lib.php:233
 #: libraries/navigation/Nodes/Node_DatabaseChild.class.php:48
-#: templates/designer/table_list.phtml:40
+#: templates/database/designer/table_list.phtml:40
 msgid "Hide"
 msgstr "Hide"
 
 #: libraries/insert_edit.lib.php:249
 #: libraries/navigation/Nodes/Node_Function.class.php:32
-#: libraries/rte/rte_routines.lib.php:1495
-#: templates/table/table_header.phtml:4
+#: libraries/rte/rte_routines.lib.php:1586
+#: templates/table/search/table_header.phtml:4
 msgid "Function"
 msgstr "Function"
 
@@ -9422,83 +9438,84 @@ msgstr "Binary"
 msgid "Because of its length,<br /> this column might not be editable."
 msgstr "Because of its length,<br /> this column might not be editable."
 
-#: libraries/insert_edit.lib.php:1050
+#: libraries/insert_edit.lib.php:1048
 msgid "Binary - do not edit"
 msgstr "Binary - do not edit"
 
-#: libraries/insert_edit.lib.php:1176 libraries/server_privileges.lib.php:470
-#: templates/table/options.phtml:36
+#: libraries/insert_edit.lib.php:1174 libraries/server_privileges.lib.php:470
+#: templates/table/search/options.phtml:36
 msgid "Or"
 msgstr "Or"
 
-#: libraries/insert_edit.lib.php:1177
+#: libraries/insert_edit.lib.php:1175
 msgid "web server upload directory:"
 msgstr "web server upload directory:"
 
-#: libraries/insert_edit.lib.php:1348 templates/table/input_box.phtml:49
+#: libraries/insert_edit.lib.php:1346
+#: templates/table/search/input_box.phtml:49
 msgid "Edit/Insert"
 msgstr "Edit/Insert"
 
-#: libraries/insert_edit.lib.php:1398
+#: libraries/insert_edit.lib.php:1396
 #, php-format
 msgid "Continue insertion with %s rows"
 msgstr "Continue insertion with %s rows"
 
-#: libraries/insert_edit.lib.php:1428
+#: libraries/insert_edit.lib.php:1426
 msgid "and then"
 msgstr "and then"
 
-#: libraries/insert_edit.lib.php:1461
+#: libraries/insert_edit.lib.php:1459
 msgid "Insert as new row"
 msgstr "Insert as new row"
 
-#: libraries/insert_edit.lib.php:1464
+#: libraries/insert_edit.lib.php:1462
 msgid "Insert as new row and ignore errors"
 msgstr "Insert as new row and ignore errors"
 
-#: libraries/insert_edit.lib.php:1467
+#: libraries/insert_edit.lib.php:1465
 msgid "Show insert query"
 msgstr "Show insert query"
 
-#: libraries/insert_edit.lib.php:1487
+#: libraries/insert_edit.lib.php:1485
 msgid "Go back to previous page"
 msgstr "Go back to previous page"
 
-#: libraries/insert_edit.lib.php:1490
+#: libraries/insert_edit.lib.php:1488
 msgid "Insert another new row"
 msgstr "Insert another new row"
 
-#: libraries/insert_edit.lib.php:1495
+#: libraries/insert_edit.lib.php:1493
 msgid "Go back to this page"
 msgstr "Go back to this page"
 
-#: libraries/insert_edit.lib.php:1518
+#: libraries/insert_edit.lib.php:1516
 msgid "Edit next row"
 msgstr "Edit next row"
 
-#: libraries/insert_edit.lib.php:1540
+#: libraries/insert_edit.lib.php:1538
 msgid ""
 "Use TAB key to move from value to value, or CTRL+arrows to move anywhere"
 msgstr ""
 "Use TAB key to move from value to value, or CTRL+arrows to move anywhere"
 
-#: libraries/insert_edit.lib.php:1577 libraries/replication_gui.lib.php:542
-#: libraries/rte/rte_routines.lib.php:1497
+#: libraries/insert_edit.lib.php:1575 libraries/replication_gui.lib.php:542
+#: libraries/rte/rte_routines.lib.php:1588
 #: libraries/server_status_variables.lib.php:220
-#: templates/designer/having_query_panel.phtml:100
-#: templates/designer/options_panel.phtml:73
-#: templates/designer/options_panel.phtml:239
-#: templates/designer/where_query_panel.phtml:69
-#: templates/table/table_header.phtml:10
-#: templates/table/zoom_result_form.phtml:35
+#: templates/database/designer/having_query_panel.phtml:100
+#: templates/database/designer/options_panel.phtml:73
+#: templates/database/designer/options_panel.phtml:239
+#: templates/database/designer/where_query_panel.phtml:69
+#: templates/table/search/table_header.phtml:10
+#: templates/table/search/zoom_result_form.phtml:35
 msgid "Value"
 msgstr "Value"
 
-#: libraries/insert_edit.lib.php:1937 libraries/sql.lib.php:1309
+#: libraries/insert_edit.lib.php:1935 libraries/sql.lib.php:1303
 msgid "Showing SQL query"
 msgstr "Showing SQL query"
 
-#: libraries/insert_edit.lib.php:1962 libraries/sql.lib.php:1287
+#: libraries/insert_edit.lib.php:1960 libraries/sql.lib.php:1281
 #, php-format
 msgid "Inserted row id: %1$d"
 msgstr "Inserted row id: %1$d"
@@ -9915,7 +9932,7 @@ msgstr "New"
 #: libraries/navigation/Nodes/Node_View_Container.class.php:26
 #: libraries/navigation/Nodes/Node_View_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:129
-#: templates/structure/show_create.phtml:30
+#: templates/database/structure/show_create.phtml:30
 msgid "Views"
 msgstr "Views"
 
@@ -10226,7 +10243,7 @@ msgstr "You don't have sufficient privileges to be here right now!"
 
 #: libraries/operations.lib.php:101 libraries/operations.lib.php:249
 #: libraries/operations.lib.php:869 libraries/operations.lib.php:963
-#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:907
+#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:998
 #: templates/columns_definitions/table_fields_definitions.phtml:47
 #, fuzzy
 #| msgid "Edit Privileges"
@@ -10318,22 +10335,22 @@ msgid "Switch to copied table"
 msgstr "Switch to copied table"
 
 #: libraries/operations.lib.php:1360
-#: templates/structure/check_all_tables.phtml:18
+#: templates/database/structure/check_all_tables.phtml:18
 msgid "Table maintenance"
 msgstr "Table maintenance"
 
 #: libraries/operations.lib.php:1398
-#: templates/structure/check_all_tables.phtml:19
+#: templates/database/structure/check_all_tables.phtml:19
 msgid "Analyze table"
 msgstr "Analyse table"
 
 #: libraries/operations.lib.php:1413
-#: templates/structure/check_all_tables.phtml:20
+#: templates/database/structure/check_all_tables.phtml:20
 msgid "Check table"
 msgstr "Check table"
 
 #: libraries/operations.lib.php:1428
-#: templates/structure/check_all_tables.phtml:22
+#: templates/database/structure/check_all_tables.phtml:22
 #, fuzzy
 #| msgid "Check table"
 msgid "Checksum table"
@@ -10353,18 +10370,19 @@ msgid "Flush the table (FLUSH)"
 msgstr "Flush the table (FLUSH)"
 
 #: libraries/operations.lib.php:1477
-#: templates/structure/check_all_tables.phtml:23
-#: templates/structure/display_table_stats.phtml:56
+#: templates/database/structure/check_all_tables.phtml:23
+#: templates/table/structure/display_table_stats.phtml:56
 msgid "Optimize table"
 msgstr "Optimise table"
 
 #: libraries/operations.lib.php:1492
-#: templates/structure/check_all_tables.phtml:24
+#: templates/database/structure/check_all_tables.phtml:24
 msgid "Repair table"
 msgstr "Repair table"
 
 #: libraries/operations.lib.php:1538
-#: templates/structure/check_all_tables.phtml:14 view_operations.php:127
+#: templates/database/structure/check_all_tables.phtml:14
+#: view_operations.php:127
 msgid "Delete data or table"
 msgstr "Delete data or table"
 
@@ -10490,7 +10508,7 @@ msgid "Cannot connect: invalid settings."
 msgstr "Cannot connect: invalid settings."
 
 #: libraries/plugins/auth/AuthenticationConfig.class.php:108
-#: libraries/plugins/auth/AuthenticationCookie.class.php:134
+#: libraries/plugins/auth/AuthenticationCookie.class.php:122
 #: libraries/plugins/auth/AuthenticationHttp.class.php:96
 #, php-format
 msgid "Welcome to %s"
@@ -10521,36 +10539,36 @@ msgstr ""
 msgid "Retry to connect"
 msgstr "Retry to connect"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:146
+#: libraries/plugins/auth/AuthenticationCookie.class.php:134
 msgid "Your session has expired. Please log in again."
 msgstr "Your session has expired. Please log in again."
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:170
+#: libraries/plugins/auth/AuthenticationCookie.class.php:158
 msgid "Log in"
 msgstr "Log in"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:178
-#: libraries/plugins/auth/AuthenticationCookie.class.php:188
+#: libraries/plugins/auth/AuthenticationCookie.class.php:166
+#: libraries/plugins/auth/AuthenticationCookie.class.php:176
 msgid "You can enter hostname/IP address and port separated by space."
 msgstr "You can enter hostname/IP address and port separated by space."
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:193
+#: libraries/plugins/auth/AuthenticationCookie.class.php:181
 msgid "Username:"
 msgstr "Username:"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:205
+#: libraries/plugins/auth/AuthenticationCookie.class.php:193
 msgid "Server Choice:"
 msgstr "Server Choice:"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:386
+#: libraries/plugins/auth/AuthenticationCookie.class.php:374
 msgid "Entered captcha is wrong, try again!"
 msgstr "Entered captcha is wrong, try again!"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:396
+#: libraries/plugins/auth/AuthenticationCookie.class.php:384
 msgid "Please enter correct captcha!"
 msgstr "Please enter correct captcha!"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:423
+#: libraries/plugins/auth/AuthenticationCookie.class.php:411
 #, fuzzy
 #| msgid "Cannot log in to the MySQL server"
 msgid "You are not allowed to log in to this MySQL server!"
@@ -10648,7 +10666,7 @@ msgstr "Event"
 #: libraries/plugins/export/ExportOdt.class.php:593
 #: libraries/plugins/export/ExportTexytext.class.php:428
 #: libraries/plugins/export/PMA_ExportPdf.class.php:313
-#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:984
 #: libraries/rte/rte_triggers.lib.php:377
 msgid "Definition"
 msgstr "Definition"
@@ -10981,7 +10999,7 @@ msgid "Last check:"
 msgstr "Last check:"
 
 #: libraries/plugins/export/ExportSql.class.php:1399
-#: templates/structure/structure_table_row.phtml:183
+#: templates/database/structure/structure_table_row.phtml:183
 msgid "in use"
 msgstr "in use"
 
@@ -11174,20 +11192,14 @@ msgstr "MySQL Spatial Extension does not support ESRI type \"%s\"."
 msgid "The imported file does not contain any data!"
 msgstr "The imported file does not contain any data!"
 
-#: libraries/plugins/import/ImportSql.class.php:169
+#: libraries/plugins/import/ImportSql.class.php:72
 msgid "SQL compatibility mode:"
 msgstr "SQL compatibility mode:"
 
-#: libraries/plugins/import/ImportSql.class.php:181
+#: libraries/plugins/import/ImportSql.class.php:84
 msgid "Do not use <code>AUTO_INCREMENT</code> for zero values"
 msgstr "Do not use <code>AUTO_INCREMENT</code> for zero values"
 
-#: libraries/plugins/import/ImportSql.class.php:195
-#, fuzzy
-#| msgid "Read misses"
-msgid "Read as multibytes"
-msgstr "Read misses"
-
 #: libraries/plugins/import/ImportXml.class.php:54
 msgid "XML"
 msgstr "XML"
@@ -11230,7 +11242,7 @@ msgid "Show grid"
 msgstr "Show grid"
 
 #: libraries/plugins/schema/SchemaPdf.class.php:94
-#: templates/structure/print_view_data_dictionary_link.phtml:6
+#: templates/database/structure/print_view_data_dictionary_link.phtml:6
 msgid "Data Dictionary"
 msgstr "Data Dictionary"
 
@@ -11261,7 +11273,7 @@ msgid "The %s table doesn't exist!"
 msgstr "The %s table doesn't exist!"
 
 #: libraries/plugins/schema/eps/Eps_Relation_Schema.class.php:321
-#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:309
+#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:323
 #, php-format
 msgid "Schema of the %s database - Page %s"
 msgstr "Schema of the %s database - Page %s"
@@ -11290,7 +11302,7 @@ msgstr "Table of contents"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1005
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1028
 #: libraries/tracking.lib.php:884
-#: templates/structure/table_structure_header.phtml:11
+#: templates/table/structure/table_structure_header.phtml:11
 msgid "Extra"
 msgstr "Extra"
 
@@ -11696,11 +11708,11 @@ msgid "Create the needed tables with the <code>%screate_tables.sql</code>."
 msgstr ""
 "Create the needed tables with the <code>examples/create_tables.sql</code>."
 
-#: libraries/relation.lib.php:360
+#: libraries/relation.lib.php:357
 msgid "Create a pma user and give access to these tables."
 msgstr "Create a pma user and give access to these tables."
 
-#: libraries/relation.lib.php:365
+#: libraries/relation.lib.php:360
 msgid ""
 "Enable advanced features in configuration file (<code>config.inc.php</"
 "code>), for example by starting from <code>config.sample.inc.php</code>."
@@ -11708,22 +11720,22 @@ msgstr ""
 "Enable advanced features in configuration file (<code>config.inc.php</"
 "code>), for example by starting from <code>config.sample.inc.php</code>."
 
-#: libraries/relation.lib.php:373
+#: libraries/relation.lib.php:365
 msgid "Re-login to phpMyAdmin to load the updated configuration file."
 msgstr "Re-login to phpMyAdmin to load the updated configuration file."
 
-#: libraries/relation.lib.php:1612
+#: libraries/relation.lib.php:1607
 msgid "no description"
 msgstr "no description"
 
-#: libraries/relation.lib.php:1811
+#: libraries/relation.lib.php:1806
 msgid ""
 "You do not have necessary privileges to create a database named "
 "'phpmyadmin'. You may go to 'Operations' tab of any database to set up the "
 "phpMyAdmin configuration storage there."
 msgstr ""
 
-#: libraries/relation.lib.php:1928
+#: libraries/relation.lib.php:1923
 #, fuzzy, php-format
 #| msgid "Missing phpMyAdmin configuration storage tables"
 msgid ""
@@ -11731,21 +11743,21 @@ msgid ""
 "configuration storage there."
 msgstr "Missing phpMyAdmin configuration storage tables"
 
-#: libraries/relation.lib.php:1936
+#: libraries/relation.lib.php:1931
 #, fuzzy, php-format
 #| msgid "Missing phpMyAdmin configuration storage tables"
 msgid ""
 "%sCreate%s the phpMyAdmin configuration storage in the current database."
 msgstr "Missing phpMyAdmin configuration storage tables"
 
-#: libraries/relation.lib.php:1944
+#: libraries/relation.lib.php:1939
 #, fuzzy, php-format
 #| msgid "Missing phpMyAdmin configuration storage tables"
 msgid "%sCreate%s missing phpMyAdmin configuration storage tables."
 msgstr "Missing phpMyAdmin configuration storage tables"
 
 #: libraries/replication_gui.lib.php:46 libraries/replication_gui.lib.php:343
-#: libraries/server_databases.lib.php:387
+#: libraries/server_databases.lib.php:398
 msgid "Master replication"
 msgstr "Master replication"
 
@@ -11817,7 +11829,7 @@ msgstr ""
 "master."
 
 #: libraries/replication_gui.lib.php:141
-#: libraries/server_databases.lib.php:389
+#: libraries/server_databases.lib.php:400
 msgid "Slave replication"
 msgstr "Slave replication"
 
@@ -12092,10 +12104,10 @@ msgid "Master server changed successfully to %s."
 msgstr "Master server changed successfully to %s."
 
 #: libraries/rte/rte_events.lib.php:106 libraries/rte/rte_events.lib.php:115
-#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:149
-#: libraries/rte/rte_routines.lib.php:158
-#: libraries/rte/rte_routines.lib.php:231
-#: libraries/rte/rte_routines.lib.php:1362
+#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:219
+#: libraries/rte/rte_routines.lib.php:246
+#: libraries/rte/rte_routines.lib.php:368
+#: libraries/rte/rte_routines.lib.php:1453
 #: libraries/rte/rte_triggers.lib.php:82 libraries/rte/rte_triggers.lib.php:91
 #: libraries/rte/rte_triggers.lib.php:123
 #, php-format
@@ -12116,7 +12128,7 @@ msgstr "Event %1$s has been modified."
 msgid "Event %1$s has been created."
 msgstr "Event %1$s has been created."
 
-#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:251
+#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:266
 #: libraries/rte/rte_triggers.lib.php:144
 msgid "One or more errors have occurred while processing your request:"
 msgstr "One or more errors have occurred while processing your request:"
@@ -12125,7 +12137,7 @@ msgstr "One or more errors have occurred while processing your request:"
 msgid "Edit event"
 msgstr "Edit event"
 
-#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:794
+#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:885
 #: libraries/rte/rte_triggers.lib.php:323 view_create.php:180
 msgid "Details"
 msgstr "Details"
@@ -12138,7 +12150,7 @@ msgstr "Event name"
 msgid "Event type"
 msgstr "Event type"
 
-#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:817
+#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:908
 #, php-format
 msgid "Change to %s"
 msgstr "Change to %s"
@@ -12165,12 +12177,14 @@ msgstr "End"
 msgid "On completion preserve"
 msgstr "On completion preserve"
 
-#: libraries/rte/rte_events.lib.php:491 libraries/rte/rte_routines.lib.php:930
+#: libraries/rte/rte_events.lib.php:491
+#: libraries/rte/rte_routines.lib.php:1021
 #: libraries/rte/rte_triggers.lib.php:383 view_create.php:209
 msgid "Definer"
 msgstr "Definer"
 
-#: libraries/rte/rte_events.lib.php:535 libraries/rte/rte_routines.lib.php:997
+#: libraries/rte/rte_events.lib.php:535
+#: libraries/rte/rte_routines.lib.php:1088
 #: libraries/rte/rte_triggers.lib.php:422
 msgid "The definer must be in the \"username@hostname\" format!"
 msgstr "The definer must be in the \"username@hostname\" format!"
@@ -12196,9 +12210,9 @@ msgid "You must provide an event definition."
 msgstr "You must provide an event definition."
 
 #: libraries/rte/rte_export.lib.php:43 libraries/rte/rte_general.lib.php:72
-#: libraries/rte/rte_routines.lib.php:345
-#: libraries/rte/rte_routines.lib.php:1198
-#: libraries/rte/rte_routines.lib.php:1411
+#: libraries/rte/rte_routines.lib.php:153
+#: libraries/rte/rte_routines.lib.php:1289
+#: libraries/rte/rte_routines.lib.php:1502
 msgid "Error in processing request:"
 msgstr "Error in processing request:"
 
@@ -12234,97 +12248,97 @@ msgstr ""
 "fail![/strong] Please use the improved 'mysqli' extension to avoid any "
 "problems."
 
-#: libraries/rte/rte_routines.lib.php:110
-#: libraries/rte/rte_routines.lib.php:1006
+#: libraries/rte/rte_routines.lib.php:123
+msgid "Edit routine"
+msgstr "Edit routine"
+
+#: libraries/rte/rte_routines.lib.php:200
+#: libraries/rte/rte_routines.lib.php:1097
 #, php-format
 msgid "Invalid routine type: \"%s\""
 msgstr "Invalid routine type: \"%s\""
 
-#: libraries/rte/rte_routines.lib.php:170
+#: libraries/rte/rte_routines.lib.php:253
+#, php-format
+msgid "Routine %1$s has been created."
+msgstr "Routine %1$s has been created."
+
+#: libraries/rte/rte_routines.lib.php:380
 msgid "Sorry, we failed to restore the dropped routine."
 msgstr "Sorry, we failed to restore the dropped routine."
 
-#: libraries/rte/rte_routines.lib.php:211
+#: libraries/rte/rte_routines.lib.php:439
 #, fuzzy, php-format
 #| msgid "Routine %1$s has been modified."
 msgid "Routine %1$s has been modified. Privileges have been adjusted."
 msgstr "Routine %1$s has been modified."
 
-#: libraries/rte/rte_routines.lib.php:216
+#: libraries/rte/rte_routines.lib.php:444
 #, php-format
 msgid "Routine %1$s has been modified."
 msgstr "Routine %1$s has been modified."
 
-#: libraries/rte/rte_routines.lib.php:238
-#, php-format
-msgid "Routine %1$s has been created."
-msgstr "Routine %1$s has been created."
-
-#: libraries/rte/rte_routines.lib.php:315
-msgid "Edit routine"
-msgstr "Edit routine"
-
-#: libraries/rte/rte_routines.lib.php:797
+#: libraries/rte/rte_routines.lib.php:888
 msgid "Routine name"
 msgstr "Routine name"
 
-#: libraries/rte/rte_routines.lib.php:823
+#: libraries/rte/rte_routines.lib.php:914
 msgid "Parameters"
 msgstr "Parameters"
 
-#: libraries/rte/rte_routines.lib.php:829
+#: libraries/rte/rte_routines.lib.php:920
 msgid "Direction"
 msgstr "Direction"
 
-#: libraries/rte/rte_routines.lib.php:847
+#: libraries/rte/rte_routines.lib.php:938
 msgid "Add parameter"
 msgstr "Add parameter"
 
-#: libraries/rte/rte_routines.lib.php:851
+#: libraries/rte/rte_routines.lib.php:942
 msgid "Remove last parameter"
 msgstr "Remove last parameter"
 
-#: libraries/rte/rte_routines.lib.php:856
+#: libraries/rte/rte_routines.lib.php:947
 msgid "Return type"
 msgstr "Return type"
 
-#: libraries/rte/rte_routines.lib.php:862
+#: libraries/rte/rte_routines.lib.php:953
 msgid "Return length/values"
 msgstr "Return length/values"
 
-#: libraries/rte/rte_routines.lib.php:868
+#: libraries/rte/rte_routines.lib.php:959
 msgid "Return options"
 msgstr "Return options"
 
-#: libraries/rte/rte_routines.lib.php:899
+#: libraries/rte/rte_routines.lib.php:990
 msgid "Is deterministic"
 msgstr "Is deterministic"
 
-#: libraries/rte/rte_routines.lib.php:920
+#: libraries/rte/rte_routines.lib.php:1011
 msgid ""
 "You do not have sufficient privileges to perform this operation; Please "
 "refer to the documentation for more details"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:935
+#: libraries/rte/rte_routines.lib.php:1026
 msgid "Security type"
 msgstr "Security type"
 
-#: libraries/rte/rte_routines.lib.php:944
+#: libraries/rte/rte_routines.lib.php:1035
 msgid "SQL data access"
 msgstr "SQL data access"
 
-#: libraries/rte/rte_routines.lib.php:1013
+#: libraries/rte/rte_routines.lib.php:1104
 msgid "You must provide a routine name!"
 msgstr "You must provide a routine name!"
 
-#: libraries/rte/rte_routines.lib.php:1047
+#: libraries/rte/rte_routines.lib.php:1138
 #, php-format
 msgid "Invalid direction \"%s\" given for parameter."
 msgstr "Invalid direction \"%s\" given for parameter."
 
-#: libraries/rte/rte_routines.lib.php:1069
-#: libraries/rte/rte_routines.lib.php:1131
+#: libraries/rte/rte_routines.lib.php:1160
+#: libraries/rte/rte_routines.lib.php:1222
 msgid ""
 "You must provide length/values for routine parameters of type ENUM, SET, "
 "VARCHAR and VARBINARY."
@@ -12332,37 +12346,37 @@ msgstr ""
 "You must provide length/values for routine parameters of type ENUM, SET, "
 "VARCHAR and VARBINARY."
 
-#: libraries/rte/rte_routines.lib.php:1095
+#: libraries/rte/rte_routines.lib.php:1186
 msgid "You must provide a name and a type for each routine parameter."
 msgstr "You must provide a name and a type for each routine parameter."
 
-#: libraries/rte/rte_routines.lib.php:1114
+#: libraries/rte/rte_routines.lib.php:1205
 msgid "You must provide a valid return type for the routine."
 msgstr "You must provide a valid return type for the routine."
 
-#: libraries/rte/rte_routines.lib.php:1174
+#: libraries/rte/rte_routines.lib.php:1265
 msgid "You must provide a routine definition."
 msgstr "You must provide a routine definition."
 
-#: libraries/rte/rte_routines.lib.php:1285
+#: libraries/rte/rte_routines.lib.php:1376
 #, php-format
 msgid "Execution results of routine %s"
 msgstr "Execution results of routine %s"
 
-#: libraries/rte/rte_routines.lib.php:1340
+#: libraries/rte/rte_routines.lib.php:1431
 #, php-format
 msgid "%d row affected by the last statement inside the procedure."
 msgid_plural "%d rows affected by the last statement inside the procedure."
 msgstr[0] "%d row affected by the last statement inside the procedure."
 msgstr[1] "%d rows affected by the last statement inside the procedure."
 
-#: libraries/rte/rte_routines.lib.php:1398
-#: libraries/rte/rte_routines.lib.php:1406
+#: libraries/rte/rte_routines.lib.php:1489
+#: libraries/rte/rte_routines.lib.php:1497
 msgid "Execute routine"
 msgstr "Execute routine"
 
-#: libraries/rte/rte_routines.lib.php:1485
-#: libraries/rte/rte_routines.lib.php:1488
+#: libraries/rte/rte_routines.lib.php:1576
+#: libraries/rte/rte_routines.lib.php:1579
 msgid "Routine parameters"
 msgstr "Routine parameters"
 
@@ -12516,7 +12530,7 @@ msgid "Original position"
 msgstr "Original position"
 
 #: libraries/server_bin_log.lib.php:133
-#: templates/structure/display_table_stats.phtml:4
+#: templates/table/structure/display_table_stats.phtml:4
 msgid "Information"
 msgstr "Information"
 
@@ -12554,12 +12568,12 @@ msgstr ""
 "Note: Enabling the database statistics here might cause heavy traffic "
 "between the web server and the MySQL server."
 
-#: libraries/server_databases.lib.php:364
-#: libraries/server_databases.lib.php:365
+#: libraries/server_databases.lib.php:366
+#: libraries/server_databases.lib.php:371
 msgid "Enable Statistics"
 msgstr "Enable Statistics"
 
-#: libraries/server_databases.lib.php:481
+#: libraries/server_databases.lib.php:492
 #, php-format
 msgid "%1$d database has been dropped successfully."
 msgid_plural "%1$d databases have been dropped successfully."
@@ -12931,7 +12945,7 @@ msgid "You have revoked the privileges for %s."
 msgstr "You have revoked the privileges for %s."
 
 #: libraries/server_privileges.lib.php:2059
-#: libraries/server_privileges.lib.php:4290
+#: libraries/server_privileges.lib.php:4316
 #, fuzzy
 #| msgid "Add user group"
 msgid "Add user account"
@@ -13110,59 +13124,59 @@ msgstr "Deleting %s"
 msgid "The privileges were reloaded successfully."
 msgstr "The privileges were reloaded successfully."
 
-#: libraries/server_privileges.lib.php:3994
+#: libraries/server_privileges.lib.php:4003
 #, php-format
 msgid "The user %s already exists!"
 msgstr "The user %s already exists!"
 
-#: libraries/server_privileges.lib.php:4232
+#: libraries/server_privileges.lib.php:4258
 #, php-format
 msgid "Privileges for %s"
 msgstr "Privileges for %s"
 
-#: libraries/server_privileges.lib.php:4241
+#: libraries/server_privileges.lib.php:4267
 #: libraries/server_status_processes.lib.php:72
 #: libraries/server_user_groups.lib.php:39
 msgid "User"
 msgstr "User"
 
-#: libraries/server_privileges.lib.php:4282
+#: libraries/server_privileges.lib.php:4308
 msgctxt "Create new user"
 msgid "New"
 msgstr "New"
 
-#: libraries/server_privileges.lib.php:4311
+#: libraries/server_privileges.lib.php:4337
 #, fuzzy
 #| msgid "Edit Privileges:"
 msgid "Edit privileges:"
 msgstr "Edit Privileges:"
 
-#: libraries/server_privileges.lib.php:4312
+#: libraries/server_privileges.lib.php:4338
 #, fuzzy
 #| msgid "User group"
 msgid "User account"
 msgstr "User group"
 
-#: libraries/server_privileges.lib.php:4371
+#: libraries/server_privileges.lib.php:4397
 msgid ""
 "Note: You are attempting to edit privileges of the user with which you are "
 "currently logged in."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4391 libraries/server_users.lib.php:25
+#: libraries/server_privileges.lib.php:4417 libraries/server_users.lib.php:25
 #, fuzzy
 #| msgid "Users overview"
 msgid "User accounts overview"
 msgstr "Users overview"
 
-#: libraries/server_privileges.lib.php:4459
+#: libraries/server_privileges.lib.php:4485
 msgid ""
 "A user account allowing any user from localhost to connect is present. This "
 "will prevent other users from connecting if the host part of their account "
 "allows a connection from any (%) host."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4500
+#: libraries/server_privileges.lib.php:4526
 #, php-format
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
@@ -13175,7 +13189,7 @@ msgstr ""
 "server uses, if they have been changed manually. In this case, you should "
 "%sreload the privileges%s before you continue."
 
-#: libraries/server_privileges.lib.php:4519
+#: libraries/server_privileges.lib.php:4545
 #, fuzzy
 #| msgid ""
 #| "Note: phpMyAdmin gets the users' privileges directly from MySQL's "
@@ -13194,25 +13208,25 @@ msgstr ""
 "server uses, if they have been changed manually. In this case, you should "
 "%sreload the privileges%s before you continue."
 
-#: libraries/server_privileges.lib.php:4569
+#: libraries/server_privileges.lib.php:4595
 msgid "The selected user was not found in the privilege table."
 msgstr "The selected user was not found in the privilege table."
 
-#: libraries/server_privileges.lib.php:4801
+#: libraries/server_privileges.lib.php:4827
 msgid "You have added a new user."
 msgstr "You have added a new user."
 
-#: libraries/server_status.lib.php:53
+#: libraries/server_status.lib.php:60
 #, php-format
 msgid "Network traffic since startup: %s"
 msgstr "Network traffic since startup: %s"
 
-#: libraries/server_status.lib.php:66
+#: libraries/server_status.lib.php:73
 #, php-format
 msgid "This MySQL server has been running for %1$s. It started up on %2$s."
 msgstr "This MySQL server has been running for %1$s. It started up on %2$s."
 
-#: libraries/server_status.lib.php:80
+#: libraries/server_status.lib.php:94
 msgid ""
 "This MySQL server works as <b>master</b> and <b>slave</b> in <b>replication</"
 "b> process."
@@ -13220,20 +13234,20 @@ msgstr ""
 "This MySQL server works as <b>master</b> and <b>slave</b> in <b>replication</"
 "b> process."
 
-#: libraries/server_status.lib.php:85
+#: libraries/server_status.lib.php:99
 msgid "This MySQL server works as <b>master</b> in <b>replication</b> process."
 msgstr ""
 "This MySQL server works as <b>master</b> in <b>replication</b> process."
 
-#: libraries/server_status.lib.php:90
+#: libraries/server_status.lib.php:104
 msgid "This MySQL server works as <b>slave</b> in <b>replication</b> process."
 msgstr "This MySQL server works as <b>slave</b> in <b>replication</b> process."
 
-#: libraries/server_status.lib.php:106
+#: libraries/server_status.lib.php:116
 msgid "Replication status"
 msgstr "Replication status"
 
-#: libraries/server_status.lib.php:137
+#: libraries/server_status.lib.php:146
 msgid ""
 "On a busy server, the byte counters may overrun, so those statistics as "
 "reported by the MySQL server may be incorrect."
@@ -13241,21 +13255,21 @@ msgstr ""
 "On a busy server, the byte counters may overrun, so those statistics as "
 "reported by the MySQL server may be incorrect."
 
-#: libraries/server_status.lib.php:148
+#: libraries/server_status.lib.php:157
 msgid "Received"
 msgstr "Received"
 
-#: libraries/server_status.lib.php:167
+#: libraries/server_status.lib.php:176
 msgid "Sent"
 msgstr "Sent"
 
-#: libraries/server_status.lib.php:234
+#: libraries/server_status.lib.php:243
 #, fuzzy
 #| msgid "max. concurrent connections"
 msgid "Max. concurrent connections"
 msgstr "max. concurrent connections"
 
-#: libraries/server_status.lib.php:244
+#: libraries/server_status.lib.php:253
 msgid "Failed attempts"
 msgstr "Failed attempts"
 
@@ -14326,7 +14340,7 @@ msgstr ""
 msgid "Not implemented yet."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/AlterOperation.php:193
+#: libraries/sql-parser/src/Components/AlterOperation.php:191
 #, fuzzy
 #| msgid "Iconic table operations"
 msgid "Unrecognized alter operation."
@@ -14342,7 +14356,7 @@ msgid "An opening bracket followed by a set of values was expected."
 msgstr ""
 
 #: libraries/sql-parser/src/Components/ArrayObj.php:101
-#: libraries/sql-parser/src/Components/FieldDefinition.php:202
+#: libraries/sql-parser/src/Components/CreateDefinition.php:202
 msgid "An opening bracket was expected."
 msgstr ""
 
@@ -14350,25 +14364,35 @@ msgstr ""
 msgid "A comma or a closing bracket was expected"
 msgstr ""
 
+#: libraries/sql-parser/src/Components/CreateDefinition.php:246
+#, fuzzy
+#| msgid "No databases selected."
+msgid "A comma or a closing bracket was expected."
+msgstr "No databases selected."
+
+#: libraries/sql-parser/src/Components/CreateDefinition.php:262
+msgid "A closing bracket was expected."
+msgstr ""
+
 #: libraries/sql-parser/src/Components/DataType.php:125
 msgid "Unrecognized data type."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:225
+#: libraries/sql-parser/src/Components/Expression.php:227
 msgid "Unexpected closing bracket."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:246
-#: libraries/sql-parser/src/Components/Expression.php:283
-#: libraries/sql-parser/src/Components/Expression.php:303
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:285
+#: libraries/sql-parser/src/Components/Expression.php:305
 msgid "An alias was previously found."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:257
+#: libraries/sql-parser/src/Components/Expression.php:259
 msgid "Unexpected dot."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:327
+#: libraries/sql-parser/src/Components/Expression.php:329
 #, fuzzy
 #| msgid "No databases selected."
 msgid "An alias was expected."
@@ -14380,16 +14404,6 @@ msgstr "No databases selected."
 msgid "An expression was expected."
 msgstr "No rows selected"
 
-#: libraries/sql-parser/src/Components/FieldDefinition.php:246
-#, fuzzy
-#| msgid "No databases selected."
-msgid "A comma or a closing bracket was expected."
-msgstr "No databases selected."
-
-#: libraries/sql-parser/src/Components/FieldDefinition.php:262
-msgid "A closing bracket was expected."
-msgstr ""
-
 #: libraries/sql-parser/src/Components/Limit.php:90
 #: libraries/sql-parser/src/Components/Limit.php:112
 msgid "An offset was expected."
@@ -14437,29 +14451,29 @@ msgstr ""
 msgid "Expected delimiter."
 msgstr ""
 
-#: libraries/sql-parser/src/Lexer.php:753
+#: libraries/sql-parser/src/Lexer.php:777
 #, fuzzy, php-format
 #| msgid "Event %1$s has been created."
 msgid "Ending quote %1$s was expected."
 msgstr "Event %1$s has been created."
 
-#: libraries/sql-parser/src/Lexer.php:789
+#: libraries/sql-parser/src/Lexer.php:813
 #, fuzzy
 #| msgid "Table name template"
 msgid "Variable name was expected."
 msgstr "Table name template"
 
-#: libraries/sql-parser/src/Parser.php:380
+#: libraries/sql-parser/src/Parser.php:391
 #, fuzzy
 #| msgid "At Beginning of Table"
 msgid "Unexpected beginning of statement."
 msgstr "At Beginning of Table"
 
-#: libraries/sql-parser/src/Parser.php:399
+#: libraries/sql-parser/src/Parser.php:410
 msgid "Unrecognized statement type."
 msgstr ""
 
-#: libraries/sql-parser/src/Parser.php:479
+#: libraries/sql-parser/src/Parser.php:489
 msgid "No transaction was previously started."
 msgstr ""
 
@@ -14489,8 +14503,10 @@ msgid "The name of the entity was expected."
 msgstr "The number of tables that are open."
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:310
-msgid "At least one field definition was expected."
-msgstr ""
+#, fuzzy
+#| msgid "The row has been deleted."
+msgid "At least one column definition was expected."
+msgstr "The row has been deleted."
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:329
 msgid "A \"RETURNS\" keyword was expected."
@@ -14549,11 +14565,11 @@ msgstr "Bookmark not created!"
 msgid "Using bookmark \"%s\" as default browse query."
 msgstr "Using bookmark \"%s\" as default browse query."
 
-#: libraries/sql.lib.php:1306
+#: libraries/sql.lib.php:1300
 msgid "Showing as PHP code"
 msgstr "Showing as PHP code"
 
-#: libraries/sql.lib.php:1638
+#: libraries/sql.lib.php:1632
 #, fuzzy, php-format
 #| msgid ""
 #| "Current selection does not contain a unique column. Grid edit, checkbox, "
@@ -14565,7 +14581,7 @@ msgstr ""
 "Current selection does not contain a unique column. Grid edit, checkbox, "
 "Edit, Copy and Delete features are not available."
 
-#: libraries/sql.lib.php:1649
+#: libraries/sql.lib.php:1643
 #, fuzzy, php-format
 #| msgid ""
 #| "Current selection does not contain a unique column. Grid edit, checkbox, "
@@ -14577,7 +14593,7 @@ msgstr ""
 "Current selection does not contain a unique column. Grid edit, checkbox, "
 "Edit, Copy and Delete features are not available."
 
-#: libraries/sql.lib.php:1688
+#: libraries/sql.lib.php:1682
 #, php-format
 msgid "Problems with indexes of table `%s`"
 msgstr "Problems with indexes of table `%s`"
@@ -14739,7 +14755,7 @@ msgid "Version %s snapshot (SQL code)"
 msgstr "Version %s snapshot (SQL code)"
 
 #: libraries/tracking.lib.php:947
-#: templates/structure/table_structure_row.phtml:33
+#: templates/table/structure/table_structure_row.phtml:33
 msgctxt "None for default"
 msgid "None"
 msgstr "None"
@@ -14794,15 +14810,15 @@ msgstr "Create version %1$s of %2$s"
 msgid "Version %1$s was created, tracking for %2$s is active."
 msgstr "Version %1$s was created, tracking for %2$s is active."
 
-#: libraries/user_preferences.inc.php:29
+#: libraries/user_preferences.inc.php:30
 msgid "Manage your settings"
 msgstr "Manage your settings"
 
-#: libraries/user_preferences.inc.php:46 prefs_manage.php:307
+#: libraries/user_preferences.inc.php:54 prefs_manage.php:307
 msgid "Configuration has been saved."
 msgstr "Configuration has been saved."
 
-#: libraries/user_preferences.inc.php:66
+#: libraries/user_preferences.inc.php:74
 #, php-format
 msgid ""
 "Your preferences will be saved for current session only. Storing them "
@@ -15204,7 +15220,7 @@ msgid "first"
 msgstr "first"
 
 #: templates/columns_definitions/move_column.phtml:12
-#: templates/structure/add_column.phtml:21
+#: templates/table/structure/add_column.phtml:21
 #, php-format
 msgid "after %s"
 msgstr "after %s"
@@ -15281,219 +15297,324 @@ msgstr "Browser transformation"
 msgid "Input transformation options"
 msgstr "Transformation options"
 
-#: templates/designer/aggregate_query_panel.phtml:22
-#: templates/designer/options_panel.phtml:100
+#: templates/database/create_table.phtml:7
+#: templates/database/designer/side_menu.phtml:77
+#: templates/database/designer/side_menu.phtml:80
+msgid "Create table"
+msgstr "Create table"
+
+#: templates/database/create_table.phtml:15
+msgid "Number of columns"
+msgstr "Number of columns"
+
+#: templates/database/designer/aggregate_query_panel.phtml:22
+#: templates/database/designer/options_panel.phtml:100
 msgid "Aggregate"
 msgstr "Aggregate"
 
-#: templates/designer/aggregate_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:61
-#: templates/designer/options_panel.phtml:106
-#: templates/designer/options_panel.phtml:170
-#: templates/designer/where_query_panel.phtml:30
-#: templates/table/table_header.phtml:9
+#: templates/database/designer/aggregate_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:61
+#: templates/database/designer/options_panel.phtml:106
+#: templates/database/designer/options_panel.phtml:170
+#: templates/database/designer/where_query_panel.phtml:30
+#: templates/table/search/table_header.phtml:9
 msgid "Operator"
 msgstr "Operator"
 
-#: templates/designer/database_tables.phtml:29
+#: templates/database/designer/database_tables.phtml:29
 msgid "Toggle"
 msgstr ""
 
-#: templates/designer/database_tables.phtml:40
+#: templates/database/designer/database_tables.phtml:40
 #, fuzzy
 #| msgid "Table structure"
 msgid "See table structure"
 msgstr "Table structure"
 
-#: templates/designer/delete_relation_panel.phtml:21
+#: templates/database/designer/delete_relation_panel.phtml:21
 msgid "Delete relation"
 msgstr "Delete relation"
 
-#: templates/designer/edit_delete_pages.phtml:7
+#: templates/database/designer/edit_delete_pages.phtml:7
 #, fuzzy
 #| msgid "Page titles"
 msgid "Page to open"
 msgstr "Page titles"
 
-#: templates/designer/edit_delete_pages.phtml:7
+#: templates/database/designer/edit_delete_pages.phtml:7
 #, fuzzy
 #| msgid "Relation deleted"
 msgid "Page to delete"
 msgstr "Relation deleted"
 
-#: templates/designer/having_query_panel.phtml:90
-#: templates/designer/options_panel.phtml:63
-#: templates/designer/options_panel.phtml:229
-#: templates/designer/where_query_panel.phtml:59
+#: templates/database/designer/having_query_panel.phtml:90
+#: templates/database/designer/options_panel.phtml:63
+#: templates/database/designer/options_panel.phtml:229
+#: templates/database/designer/where_query_panel.phtml:59
 msgid "Except"
 msgstr "Except"
 
-#: templates/designer/having_query_panel.phtml:102
-#: templates/designer/options_panel.phtml:75
-#: templates/designer/options_panel.phtml:241
-#: templates/designer/where_query_panel.phtml:71
+#: templates/database/designer/having_query_panel.phtml:102
+#: templates/database/designer/options_panel.phtml:75
+#: templates/database/designer/options_panel.phtml:241
+#: templates/database/designer/where_query_panel.phtml:71
 msgid "subquery"
 msgstr "subquery"
 
-#: templates/designer/new_relation_panel.phtml:22
-#: templates/designer/side_menu.phtml:84 templates/designer/side_menu.phtml:87
+#: templates/database/designer/new_relation_panel.phtml:22
+#: templates/database/designer/side_menu.phtml:84
+#: templates/database/designer/side_menu.phtml:87
 msgid "Create relation"
 msgstr "Create relation"
 
-#: templates/designer/options_panel.phtml:34
-#: templates/designer/options_panel.phtml:200
+#: templates/database/designer/options_panel.phtml:34
+#: templates/database/designer/options_panel.phtml:200
 msgid "Relation operator"
 msgstr "Relation operator"
 
-#: templates/designer/options_panel.phtml:85
-#: templates/designer/rename_to_panel.phtml:23
+#: templates/database/designer/options_panel.phtml:85
+#: templates/database/designer/rename_to_panel.phtml:23
 msgid "Rename to"
 msgstr "Rename to"
 
-#: templates/designer/options_panel.phtml:91
-#: templates/designer/rename_to_panel.phtml:31
+#: templates/database/designer/options_panel.phtml:91
+#: templates/database/designer/rename_to_panel.phtml:31
 msgid "New name"
 msgstr "New name"
 
-#: templates/designer/page_save_as.phtml:4
+#: templates/database/designer/page_save_as.phtml:4
 #, fuzzy
 #| msgid "Export to selected page"
 msgid "Save to selected page"
 msgstr "Export to selected page"
 
-#: templates/designer/page_save_as.phtml:5
+#: templates/database/designer/page_save_as.phtml:5
 #, fuzzy
 #| msgid "Create a page and export to it"
 msgid "Create a page and save to it"
 msgstr "Create a page and export to it"
 
-#: templates/designer/page_save_as.phtml:26
+#: templates/database/designer/page_save_as.phtml:26
 #, fuzzy
 #| msgid "New page name: "
 msgid "New page name"
 msgstr "New page name: "
 
-#: templates/designer/page_selector.phtml:2
+#: templates/database/designer/page_selector.phtml:2
 msgid "Select page"
 msgstr "Select page"
 
-#: templates/designer/query_details.phtml:10
+#: templates/database/designer/query_details.phtml:10
 msgid "Active options"
 msgstr "Active options"
 
-#: templates/designer/schema_export.phtml:4
+#: templates/database/designer/schema_export.phtml:4
 msgid "Select Export Relational Type"
 msgstr "Select Export Relational Type"
 
-#: templates/designer/side_menu.phtml:19 templates/designer/side_menu.phtml:25
+#: templates/database/designer/side_menu.phtml:19
+#: templates/database/designer/side_menu.phtml:25
 #, fuzzy
 #| msgid "Showing tables:"
 msgid "Show/Hide tables list"
 msgstr "Showing tables:"
 
-#: templates/designer/side_menu.phtml:29 templates/designer/side_menu.phtml:35
-#: templates/designer/side_menu.phtml:36
+#: templates/database/designer/side_menu.phtml:29
+#: templates/database/designer/side_menu.phtml:35
+#: templates/database/designer/side_menu.phtml:36
 msgid "View in fullscreen"
 msgstr "View in full-screen"
 
-#: templates/designer/side_menu.phtml:34
+#: templates/database/designer/side_menu.phtml:34
 msgid "Exit fullscreen"
 msgstr "Exit full-screen"
 
-#: templates/designer/side_menu.phtml:41 templates/designer/side_menu.phtml:45
+#: templates/database/designer/side_menu.phtml:41
+#: templates/database/designer/side_menu.phtml:45
 #, fuzzy
 #| msgid "New name"
 msgid "New page"
 msgstr "New name"
 
-#: templates/designer/side_menu.phtml:70 templates/designer/side_menu.phtml:73
+#: templates/database/designer/side_menu.phtml:70
+#: templates/database/designer/side_menu.phtml:73
 #, fuzzy
 #| msgid "Select page"
 msgid "Delete pages"
 msgstr "Select page"
 
-#: templates/designer/side_menu.phtml:77 templates/designer/side_menu.phtml:80
-#: templates/table/create_table.phtml:7
-msgid "Create table"
-msgstr "Create table"
-
-#: templates/designer/side_menu.phtml:98
-#: templates/designer/side_menu.phtml:101
+#: templates/database/designer/side_menu.phtml:98
+#: templates/database/designer/side_menu.phtml:101
 msgid "Reload"
 msgstr "Reload"
 
-#: templates/designer/side_menu.phtml:107
-#: templates/designer/side_menu.phtml:110
+#: templates/database/designer/side_menu.phtml:107
+#: templates/database/designer/side_menu.phtml:110
 msgid "Help"
 msgstr "Help"
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Angular links"
 msgstr "Angular links"
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Direct links"
 msgstr "Direct links"
 
-#: templates/designer/side_menu.phtml:122
-#: templates/designer/side_menu.phtml:124
+#: templates/database/designer/side_menu.phtml:122
+#: templates/database/designer/side_menu.phtml:124
 msgid "Snap to grid"
 msgstr "Snap to grid"
 
-#: templates/designer/side_menu.phtml:128
-#: templates/designer/side_menu.phtml:134
+#: templates/database/designer/side_menu.phtml:128
+#: templates/database/designer/side_menu.phtml:134
 msgid "Small/Big All"
 msgstr "Small/Big All"
 
-#: templates/designer/side_menu.phtml:138
-#: templates/designer/side_menu.phtml:141
+#: templates/database/designer/side_menu.phtml:138
+#: templates/database/designer/side_menu.phtml:141
 msgid "Toggle small/big"
 msgstr "Toggle small/big"
 
-#: templates/designer/side_menu.phtml:145
-#: templates/designer/side_menu.phtml:148
+#: templates/database/designer/side_menu.phtml:145
+#: templates/database/designer/side_menu.phtml:148
 msgid "Toggle relation lines"
 msgstr "Toggle relation lines"
 
-#: templates/designer/side_menu.phtml:153
-#: templates/designer/side_menu.phtml:156
+#: templates/database/designer/side_menu.phtml:153
+#: templates/database/designer/side_menu.phtml:156
 #, fuzzy
 #| msgid "Export all"
 msgid "Export schema"
 msgstr "Export all"
 
-#: templates/designer/side_menu.phtml:165
-#: templates/designer/side_menu.phtml:168
+#: templates/database/designer/side_menu.phtml:165
+#: templates/database/designer/side_menu.phtml:168
 msgid "Build Query"
 msgstr "Build Query"
 
-#: templates/designer/side_menu.phtml:173
-#: templates/designer/side_menu.phtml:177
+#: templates/database/designer/side_menu.phtml:173
+#: templates/database/designer/side_menu.phtml:177
 msgid "Move Menu"
 msgstr "Move Menu"
 
-#: templates/designer/side_menu.phtml:181
-#: templates/designer/side_menu.phtml:186
+#: templates/database/designer/side_menu.phtml:181
+#: templates/database/designer/side_menu.phtml:186
 #, fuzzy
 #| msgid "Partial texts"
 msgid "Pin text"
 msgstr "Partial texts"
 
-#: templates/designer/table_list.phtml:4
+#: templates/database/designer/table_list.phtml:4
 msgid "Hide/Show all"
 msgstr "Hide/Show all"
 
-#: templates/designer/table_list.phtml:14
+#: templates/database/designer/table_list.phtml:14
 msgid "Hide/Show Tables with no relation"
 msgstr "Hide/Show Tables with no relation"
 
-#: templates/designer/table_list.phtml:59
+#: templates/database/designer/table_list.phtml:59
 msgid "Number of tables:"
 msgstr "Number of tables:"
 
+#: templates/database/structure/body_for_table_summary.phtml:6
+#, php-format
+msgid "%s table"
+msgid_plural "%s tables"
+msgstr[0] "%s table"
+msgstr[1] "%s tables"
+
+#: templates/database/structure/body_for_table_summary.phtml:17
+msgid "Sum"
+msgstr "Sum"
+
+#: templates/database/structure/check_all_tables.phtml:6
+msgid "Check tables having overhead"
+msgstr "Check tables having overhead"
+
+#: templates/database/structure/check_all_tables.phtml:10
+#, fuzzy
+#| msgid "Show color"
+msgid "Show create"
+msgstr "Show colour"
+
+#: templates/database/structure/check_all_tables.phtml:27
+#, fuzzy
+#| msgid "Add prefix"
+msgid "Prefix"
+msgstr "Add prefix"
+
+#: templates/database/structure/check_all_tables.phtml:28
+msgid "Add prefix to table"
+msgstr "Add prefix to table"
+
+#: templates/database/structure/check_all_tables.phtml:29
+msgid "Replace table prefix"
+msgstr "Replace table prefix"
+
+#: templates/database/structure/check_all_tables.phtml:30
+msgid "Copy table with prefix"
+msgstr "Copy table with prefix"
+
+#: templates/database/structure/check_all_tables.phtml:36
+#, fuzzy
+#| msgid "CHAR textarea columns"
+msgid "Add columns to central list"
+msgstr "CHAR textarea columns"
+
+#: templates/database/structure/check_all_tables.phtml:37
+msgid "Remove columns from central list"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:38
+#, fuzzy
+#| msgid "CHAR textarea columns"
+msgid "Make consistent with central list"
+msgstr "CHAR textarea columns"
+
+#: templates/database/structure/favorite_anchor.phtml:12
+msgid "Add to Favorites"
+msgstr "Add to Favourites"
+
+#: templates/database/structure/show_create.phtml:2
+#, fuzzy
+#| msgid "Show SQL queries"
+msgid "Showing create queries"
+msgstr "Show SQL queries"
+
+#: templates/database/structure/sortable_header.phtml:13
+msgid "Sort"
+msgstr "Sort"
+
+#: templates/database/structure/table_header.phtml:42
+#, fuzzy
+#| msgid "May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]"
+msgid ""
+"May be approximate. Click on the number to get the exact count. See "
+"[doc@faq3-11]FAQ 3.11[/doc]."
+msgstr "May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]"
+
+#: templates/database/structure/table_header.phtml:66
+#: templates/table/index_form.phtml:127
+msgid "Size"
+msgstr "Size"
+
+#: templates/database/structure/table_header.phtml:74
+#: templates/table/structure/display_table_stats.phtml:27
+msgid "Overhead"
+msgstr "Overhead"
+
+#: templates/database/structure/tracking_icon.phtml:4
+msgid "Tracking is active."
+msgstr "Tracking is active."
+
+#: templates/database/structure/tracking_icon.phtml:8
+msgid "Tracking is not active."
+msgstr "Tracking is not active."
+
 #: templates/error/report_form.phtml:7
 msgid ""
 "phpMyAdmin has encountered an error. We have collected data about this error "
@@ -15512,66 +15633,6 @@ msgstr "You may examine the data in the error report:"
 msgid "Please explain the steps that lead to the error:"
 msgstr "Please explain the steps that lead to the error:"
 
-#: templates/gis_visualization/gis_visualization.phtml:3
-msgid "Display GIS Visualization"
-msgstr "Display GIS Visualisation"
-
-#: templates/gis_visualization/gis_visualization.phtml:8
-msgid "Label column"
-msgstr "Label column"
-
-#: templates/gis_visualization/gis_visualization.phtml:11
-msgid "-- None --"
-msgstr "-- None --"
-
-#: templates/gis_visualization/gis_visualization.phtml:19
-msgid "Spatial column"
-msgstr "Spatial column"
-
-#: templates/index_form.phtml:16
-msgid "Index name:"
-msgstr "Index name:"
-
-#: templates/index_form.phtml:19
-msgid ""
-"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
-msgstr ""
-"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
-
-#: templates/index_form.phtml:40
-#, fuzzy
-#| msgid "Index cache size"
-msgid "Index choice:"
-msgstr "Index cache size"
-
-#: templates/index_form.phtml:57
-msgid "Key block size:"
-msgstr ""
-
-#: templates/index_form.phtml:74
-msgid "Index type:"
-msgstr "Index type:"
-
-#: templates/index_form.phtml:86
-#, fuzzy
-#| msgid "User:"
-msgid "Parser:"
-msgstr "User:"
-
-#: templates/index_form.phtml:102
-msgid "Comment:"
-msgstr "Comment:"
-
-#: templates/index_form.phtml:127 templates/structure/table_header.phtml:66
-msgid "Size"
-msgstr "Size"
-
-#: templates/index_form.phtml:149 templates/index_form.phtml:190
-#, fuzzy
-#| msgid "Drag to reorder"
-msgid "Drag to reorder"
-msgstr "Drag to reorder"
-
 #: templates/prefs_autoload.phtml:9
 msgid ""
 "Your browser has phpMyAdmin configuration for this domain. Would you like to "
@@ -15584,387 +15645,161 @@ msgstr ""
 msgid "Start row:"
 msgstr "Start row:"
 
-#: templates/structure/actions_in_table_structure.phtml:14
-#, php-format
-msgid "A primary key has been added on %s."
-msgstr "A primary key has been added on %s."
-
-#: templates/structure/actions_in_table_structure.phtml:34
-#: templates/structure/actions_in_table_structure.phtml:54
-#: templates/structure/actions_in_table_structure.phtml:79
-#: templates/structure/actions_in_table_structure.phtml:101
-#, php-format
-msgid "An index has been added on %s."
-msgstr "An index has been added on %s."
-
-#: templates/structure/actions_in_table_structure.phtml:130
-#: templates/structure/check_all_table_column.phtml:59
-#, fuzzy
-#| msgid "Remove column(s)"
-msgid "Remove from central columns"
-msgstr "Remove column(s)"
-
-#: templates/structure/actions_in_table_structure.phtml:138
-#: templates/structure/check_all_table_column.phtml:55
-#, fuzzy
-#| msgid "CHAR textarea columns"
-msgid "Add to central columns"
-msgstr "CHAR textarea columns"
-
-#: templates/structure/add_column.phtml:7
-#, php-format
-msgid "Add %s column(s)"
-msgstr "Add %s column(s)"
-
-#: templates/structure/add_column.phtml:12
-#, fuzzy
-#| msgid "At Beginning of Table"
-msgid "at beginning of table"
-msgstr "At Beginning of Table"
-
-#: templates/structure/body_for_table_summary.phtml:6
-#, php-format
-msgid "%s table"
-msgid_plural "%s tables"
-msgstr[0] "%s table"
-msgstr[1] "%s tables"
-
-#: templates/structure/body_for_table_summary.phtml:17
-msgid "Sum"
-msgstr "Sum"
-
-#: templates/structure/check_all_tables.phtml:6
-msgid "Check tables having overhead"
-msgstr "Check tables having overhead"
-
-#: templates/structure/check_all_tables.phtml:10
-#, fuzzy
-#| msgid "Show color"
-msgid "Show create"
-msgstr "Show colour"
-
-#: templates/structure/check_all_tables.phtml:27
-#, fuzzy
-#| msgid "Add prefix"
-msgid "Prefix"
-msgstr "Add prefix"
-
-#: templates/structure/check_all_tables.phtml:28
-msgid "Add prefix to table"
-msgstr "Add prefix to table"
-
-#: templates/structure/check_all_tables.phtml:29
-msgid "Replace table prefix"
-msgstr "Replace table prefix"
-
-#: templates/structure/check_all_tables.phtml:30
-msgid "Copy table with prefix"
-msgstr "Copy table with prefix"
-
-#: templates/structure/check_all_tables.phtml:36
-#, fuzzy
-#| msgid "CHAR textarea columns"
-msgid "Add columns to central list"
-msgstr "CHAR textarea columns"
-
-#: templates/structure/check_all_tables.phtml:37
-msgid "Remove columns from central list"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:38
-#, fuzzy
-#| msgid "CHAR textarea columns"
-msgid "Make consistent with central list"
-msgstr "CHAR textarea columns"
-
-#: templates/structure/display_structure.phtml:140 view_create.php:181
-msgid "Edit view"
-msgstr "Edit view"
-
-#: templates/structure/display_table_stats.phtml:9
-msgid "Space usage"
-msgstr "Space usage"
-
-#: templates/structure/display_table_stats.phtml:27
-#: templates/structure/table_header.phtml:74
-msgid "Overhead"
-msgstr "Overhead"
-
-#: templates/structure/display_table_stats.phtml:32
-msgid "Effective"
-msgstr "Effective"
-
-#: templates/structure/favorite_anchor.phtml:12
-msgid "Add to Favorites"
-msgstr "Add to Favourites"
-
-#: templates/structure/move_columns_dialog.phtml:1
-#: templates/structure/optional_action_links.phtml:21
-msgid "Move columns"
-msgstr "Move columns"
-
-#: templates/structure/move_columns_dialog.phtml:2
-msgid "Move the columns by dragging them up and down."
-msgstr "Move the columns by dragging them up and down."
-
-#: templates/structure/optional_action_links.phtml:9
-msgid "Propose table structure"
-msgstr "Propose table structure"
-
-#: templates/structure/optional_action_links.phtml:24
-#, fuzzy
-#| msgid "Propose table structure"
-msgid "Improve table structure"
-msgstr "Propose table structure"
-
-#: templates/structure/optional_action_links.phtml:30
-#, fuzzy
-#| msgid "Track table"
-msgid "Track view"
-msgstr "Track table"
-
-#: templates/structure/row_stats_table.phtml:3
-msgid "Row statistics"
-msgstr "Row statistics"
-
-#: templates/structure/row_stats_table.phtml:9
-msgid "static"
-msgstr "static"
-
-#: templates/structure/row_stats_table.phtml:11
-msgid "dynamic"
-msgstr "dynamic"
-
-#: templates/structure/row_stats_table.phtml:22
-msgid "partitioned"
-msgstr "partitioned"
-
-#: templates/structure/row_stats_table.phtml:54
-msgid "Row length"
-msgstr "Row length"
-
-#: templates/structure/row_stats_table.phtml:66
-msgid "Row size"
-msgstr "Row size"
-
-#: templates/structure/row_stats_table.phtml:73
-msgid "Next autoindex"
-msgstr "Next autoindex"
-
-#: templates/structure/secondary_tabs.phtml:14
-#, fuzzy
-#| msgid "Relation view"
-msgid "Relation view"
-msgstr "Relation view"
-
-#: templates/structure/show_create.phtml:2
-#, fuzzy
-#| msgid "Show SQL queries"
-msgid "Showing create queries"
-msgstr "Show SQL queries"
-
-#: templates/structure/sortable_header.phtml:13
-msgid "Sort"
-msgstr "Sort"
-
-#: templates/structure/table_header.phtml:42
-#, fuzzy
-#| msgid "May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]"
-msgid ""
-"May be approximate. Click on the number to get the exact count. See "
-"[doc@faq3-11]FAQ 3.11[/doc]."
-msgstr "May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]"
-
-#: templates/structure/table_structure_row.phtml:46
-#, php-format
-msgid "Column %s has been dropped."
-msgstr "Column %s has been dropped."
-
-#: templates/structure/tracking_icon.phtml:4
-msgid "Tracking is active."
-msgstr "Tracking is active."
-
-#: templates/structure/tracking_icon.phtml:8
-msgid "Tracking is not active."
-msgstr "Tracking is not active."
-
-#: templates/table/create_table.phtml:15
-msgid "Number of columns"
-msgstr "Number of columns"
-
-#: templates/table/options.phtml:8
-msgid "Select columns (at least one):"
-msgstr "Select columns (at least one):"
-
-#: templates/table/options.phtml:37
-msgid "Add search conditions (body of the \"where\" clause):"
-msgstr "Add search conditions (body of the \"where\" clause):"
-
-#: templates/table/options.phtml:45
-msgid "Number of rows per page"
-msgstr "Number of rows per page"
-
-#: templates/table/options.phtml:56
-msgid "Display order:"
-msgstr "Display order:"
-
-#: templates/table/options_zoom.phtml:6
-msgid "Use this column to label each point"
-msgstr "Use this column to label each point"
-
-#: templates/table/options_zoom.phtml:35
-msgid "Maximum rows to plot"
-msgstr "Maximum rows to plot"
-
-#: templates/table/replace_preview.phtml:13
-msgid "Find and replace - preview"
-msgstr "Find and replace - preview"
-
-#: templates/table/replace_preview.phtml:18
-msgid "Original string"
-msgstr "Original string"
-
-#: templates/table/replace_preview.phtml:19
-msgid "Replaced string"
-msgstr "Replaced string"
-
-#: templates/table/replace_preview.phtml:40
-msgid "Replace"
-msgstr "Replace"
-
-#: templates/table/rows_zoom.phtml:16
-msgid "Additional search criteria"
-msgstr "Additional search criteria"
-
-#: templates/table/search_and_replace.phtml:3
-msgid "Replace with:"
-msgstr "Replace with:"
-
-#: templates/table/search_and_replace.phtml:22
-#, fuzzy
-#| msgid "as regular expression"
-msgid "Use regular expression"
-msgstr "as regular expression"
-
-#: templates/table/selection_form.phtml:12
-msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
-msgstr "Do a \"query by example\" (wildcard: \"%\") for two different columns"
-
-#: templates/table/selection_form.phtml:34
-msgid "Do a \"query by example\" (wildcard: \"%\")"
-msgstr "Do a \"query by example\" (wildcard: \"%\")"
-
-#: templates/table/zoom_result_form.phtml:7
-msgid "Browse/Edit the points"
-msgstr "Browse/Edit the points"
-
-#: templates/table/zoom_result_form.phtml:15
-msgid "How to use"
-msgstr "How to use"
-
-#: templates/table/zoom_result_form.phtml:23
-msgid "Reset zoom"
-msgstr "Reset zoom"
-
-#: templates/tbl_chart.phtml:17
+#: templates/table/chart/tbl_chart.phtml:17
 msgctxt "Chart type"
 msgid "Bar"
 msgstr "Bar"
 
-#: templates/tbl_chart.phtml:21
+#: templates/table/chart/tbl_chart.phtml:21
 msgctxt "Chart type"
 msgid "Column"
 msgstr "Column"
 
-#: templates/tbl_chart.phtml:25
+#: templates/table/chart/tbl_chart.phtml:25
 msgctxt "Chart type"
 msgid "Line"
 msgstr "Line"
 
-#: templates/tbl_chart.phtml:29
+#: templates/table/chart/tbl_chart.phtml:29
 msgctxt "Chart type"
 msgid "Spline"
 msgstr "Spline"
 
-#: templates/tbl_chart.phtml:33
+#: templates/table/chart/tbl_chart.phtml:33
 msgctxt "Chart type"
 msgid "Area"
 msgstr "Area"
 
-#: templates/tbl_chart.phtml:37
+#: templates/table/chart/tbl_chart.phtml:37
 msgctxt "Chart type"
 msgid "Pie"
 msgstr "Pie"
 
-#: templates/tbl_chart.phtml:41
+#: templates/table/chart/tbl_chart.phtml:41
 msgctxt "Chart type"
 msgid "Timeline"
 msgstr "Timeline"
 
-#: templates/tbl_chart.phtml:45
+#: templates/table/chart/tbl_chart.phtml:45
 msgctxt "Chart type"
 msgid "Scatter"
 msgstr "Scatter"
 
-#: templates/tbl_chart.phtml:50
+#: templates/table/chart/tbl_chart.phtml:50
 msgid "Stacked"
 msgstr "Stacked"
 
-#: templates/tbl_chart.phtml:53
+#: templates/table/chart/tbl_chart.phtml:53
 msgid "Chart title"
 msgstr "Chart title"
 
-#: templates/tbl_chart.phtml:57
+#: templates/table/chart/tbl_chart.phtml:57
 msgid "X-Axis:"
 msgstr "X-Axis:"
 
-#: templates/tbl_chart.phtml:72
+#: templates/table/chart/tbl_chart.phtml:72
 msgid "Series:"
 msgstr "Series:"
 
-#: templates/tbl_chart.phtml:102
+#: templates/table/chart/tbl_chart.phtml:102
 msgid "X-Axis label:"
 msgstr "X-Axis label:"
 
-#: templates/tbl_chart.phtml:104
+#: templates/table/chart/tbl_chart.phtml:104
 msgid "X Values"
 msgstr "X Values"
 
-#: templates/tbl_chart.phtml:107
+#: templates/table/chart/tbl_chart.phtml:107
 msgid "Y-Axis label:"
 msgstr "Y-Axis label:"
 
-#: templates/tbl_chart.phtml:115
+#: templates/table/chart/tbl_chart.phtml:115
 msgid "Series names are in a column"
 msgstr ""
 
-#: templates/tbl_chart.phtml:118
+#: templates/table/chart/tbl_chart.phtml:118
 #, fuzzy
 #| msgid "Inside column:"
 msgid "Series column:"
 msgstr "Inside column:"
 
-#: templates/tbl_chart.phtml:130
+#: templates/table/chart/tbl_chart.phtml:130
 #, fuzzy
 #| msgid "Values for column %s"
 msgid "Value Column:"
 msgstr "Values for column %s"
 
-#: templates/tbl_chart.phtml:150
+#: templates/table/chart/tbl_chart.phtml:150
 #, fuzzy
 #| msgid "Save as file"
 msgid "Save chart as image"
 msgstr "Save as file"
 
-#: templates/tbl_relation/common_form.phtml:7
+#: templates/table/gis_visualization/gis_visualization.phtml:3
+msgid "Display GIS Visualization"
+msgstr "Display GIS Visualisation"
+
+#: templates/table/gis_visualization/gis_visualization.phtml:8
+msgid "Label column"
+msgstr "Label column"
+
+#: templates/table/gis_visualization/gis_visualization.phtml:11
+msgid "-- None --"
+msgstr "-- None --"
+
+#: templates/table/gis_visualization/gis_visualization.phtml:19
+msgid "Spatial column"
+msgstr "Spatial column"
+
+#: templates/table/index_form.phtml:16
+msgid "Index name:"
+msgstr "Index name:"
+
+#: templates/table/index_form.phtml:19
+msgid ""
+"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
+msgstr ""
+"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
+
+#: templates/table/index_form.phtml:40
+#, fuzzy
+#| msgid "Index cache size"
+msgid "Index choice:"
+msgstr "Index cache size"
+
+#: templates/table/index_form.phtml:57
+msgid "Key block size:"
+msgstr ""
+
+#: templates/table/index_form.phtml:74
+msgid "Index type:"
+msgstr "Index type:"
+
+#: templates/table/index_form.phtml:86
+#, fuzzy
+#| msgid "User:"
+msgid "Parser:"
+msgstr "User:"
+
+#: templates/table/index_form.phtml:102
+msgid "Comment:"
+msgstr "Comment:"
+
+#: templates/table/index_form.phtml:149 templates/table/index_form.phtml:190
+#, fuzzy
+#| msgid "Drag to reorder"
+msgid "Drag to reorder"
+msgstr "Drag to reorder"
+
+#: templates/table/relation/common_form.phtml:7
 msgid "Internal relations"
 msgstr "Internal relations"
 
-#: templates/tbl_relation/common_form.phtml:11
+#: templates/table/relation/common_form.phtml:11
 msgid "Internal relation"
 msgstr "Internal relation"
 
-#: templates/tbl_relation/common_form.phtml:14
+#: templates/table/relation/common_form.phtml:14
 msgid ""
 "An internal relation is not necessary when a corresponding FOREIGN KEY "
 "relation exists."
@@ -15972,59 +15807,247 @@ msgstr ""
 "An internal relation is not necessary when a corresponding FOREIGN KEY "
 "relation exists."
 
-#: templates/tbl_relation/common_form.phtml:37
+#: templates/table/relation/common_form.phtml:37
 #, fuzzy
 #| msgid "Foreign key constraint"
 msgid "Foreign key constraints"
 msgstr "Foreign key constraint"
 
-#: templates/tbl_relation/common_form.phtml:40
+#: templates/table/relation/common_form.phtml:40
 #, fuzzy
 #| msgid "Action"
 msgid "Actions"
 msgstr "Action"
 
-#: templates/tbl_relation/common_form.phtml:41
+#: templates/table/relation/common_form.phtml:41
 #, fuzzy
 #| msgid "Constraints for table"
 msgid "Constraint properties"
 msgstr "Constraints for table"
 
-#: templates/tbl_relation/common_form.phtml:44
+#: templates/table/relation/common_form.phtml:44
 msgid ""
 "Only columns with index will be displayed. You can define an index below."
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:49
+#: templates/table/relation/common_form.phtml:49
 msgid "Foreign key constraint"
 msgstr "Foreign key constraint"
 
-#: templates/tbl_relation/common_form.phtml:81
+#: templates/table/relation/common_form.phtml:81
 #, fuzzy
 #| msgid "Add constraints"
 msgid "+ Add constraint"
 msgstr "Add constraints"
 
-#: templates/tbl_relation/common_form.phtml:91
+#: templates/table/relation/common_form.phtml:91
 msgid "Choose column to display:"
 msgstr "Choose column to display:"
 
-#: templates/tbl_relation/foreign_key_row.phtml:13
+#: templates/table/relation/foreign_key_row.phtml:13
 #, fuzzy, php-format
 #| msgid "Foreign key constraint"
 msgid "Foreign key constraint %s has been dropped"
 msgstr "Foreign key constraint"
 
-#: templates/tbl_relation/foreign_key_row.phtml:102
+#: templates/table/relation/foreign_key_row.phtml:102
 msgid "Constraint name"
 msgstr "Constraint name"
 
-#: templates/tbl_relation/foreign_key_row.phtml:157
+#: templates/table/relation/foreign_key_row.phtml:157
 #, fuzzy
 #| msgid "Add column"
 msgid "+ Add column"
 msgstr "Add column"
 
+#: templates/table/search/options.phtml:8
+msgid "Select columns (at least one):"
+msgstr "Select columns (at least one):"
+
+#: templates/table/search/options.phtml:37
+msgid "Add search conditions (body of the \"where\" clause):"
+msgstr "Add search conditions (body of the \"where\" clause):"
+
+#: templates/table/search/options.phtml:45
+msgid "Number of rows per page"
+msgstr "Number of rows per page"
+
+#: templates/table/search/options.phtml:56
+msgid "Display order:"
+msgstr "Display order:"
+
+#: templates/table/search/options_zoom.phtml:6
+msgid "Use this column to label each point"
+msgstr "Use this column to label each point"
+
+#: templates/table/search/options_zoom.phtml:35
+msgid "Maximum rows to plot"
+msgstr "Maximum rows to plot"
+
+#: templates/table/search/replace_preview.phtml:13
+msgid "Find and replace - preview"
+msgstr "Find and replace - preview"
+
+#: templates/table/search/replace_preview.phtml:18
+msgid "Original string"
+msgstr "Original string"
+
+#: templates/table/search/replace_preview.phtml:19
+msgid "Replaced string"
+msgstr "Replaced string"
+
+#: templates/table/search/replace_preview.phtml:40
+msgid "Replace"
+msgstr "Replace"
+
+#: templates/table/search/rows_zoom.phtml:16
+msgid "Additional search criteria"
+msgstr "Additional search criteria"
+
+#: templates/table/search/search_and_replace.phtml:3
+msgid "Replace with:"
+msgstr "Replace with:"
+
+#: templates/table/search/search_and_replace.phtml:22
+#, fuzzy
+#| msgid "as regular expression"
+msgid "Use regular expression"
+msgstr "as regular expression"
+
+#: templates/table/search/selection_form.phtml:12
+msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
+msgstr "Do a \"query by example\" (wildcard: \"%\") for two different columns"
+
+#: templates/table/search/selection_form.phtml:34
+msgid "Do a \"query by example\" (wildcard: \"%\")"
+msgstr "Do a \"query by example\" (wildcard: \"%\")"
+
+#: templates/table/search/zoom_result_form.phtml:7
+msgid "Browse/Edit the points"
+msgstr "Browse/Edit the points"
+
+#: templates/table/search/zoom_result_form.phtml:15
+msgid "How to use"
+msgstr "How to use"
+
+#: templates/table/search/zoom_result_form.phtml:23
+msgid "Reset zoom"
+msgstr "Reset zoom"
+
+#: templates/table/secondary_tabs.phtml:14
+#, fuzzy
+#| msgid "Relation view"
+msgid "Relation view"
+msgstr "Relation view"
+
+#: templates/table/structure/actions_in_table_structure.phtml:14
+#, php-format
+msgid "A primary key has been added on %s."
+msgstr "A primary key has been added on %s."
+
+#: templates/table/structure/actions_in_table_structure.phtml:34
+#: templates/table/structure/actions_in_table_structure.phtml:54
+#: templates/table/structure/actions_in_table_structure.phtml:79
+#: templates/table/structure/actions_in_table_structure.phtml:101
+#, php-format
+msgid "An index has been added on %s."
+msgstr "An index has been added on %s."
+
+#: templates/table/structure/actions_in_table_structure.phtml:130
+#: templates/table/structure/check_all_table_column.phtml:59
+#, fuzzy
+#| msgid "Remove column(s)"
+msgid "Remove from central columns"
+msgstr "Remove column(s)"
+
+#: templates/table/structure/actions_in_table_structure.phtml:138
+#: templates/table/structure/check_all_table_column.phtml:55
+#, fuzzy
+#| msgid "CHAR textarea columns"
+msgid "Add to central columns"
+msgstr "CHAR textarea columns"
+
+#: templates/table/structure/add_column.phtml:7
+#, php-format
+msgid "Add %s column(s)"
+msgstr "Add %s column(s)"
+
+#: templates/table/structure/add_column.phtml:12
+#, fuzzy
+#| msgid "At Beginning of Table"
+msgid "at beginning of table"
+msgstr "At Beginning of Table"
+
+#: templates/table/structure/display_structure.phtml:140 view_create.php:181
+msgid "Edit view"
+msgstr "Edit view"
+
+#: templates/table/structure/display_table_stats.phtml:9
+msgid "Space usage"
+msgstr "Space usage"
+
+#: templates/table/structure/display_table_stats.phtml:32
+msgid "Effective"
+msgstr "Effective"
+
+#: templates/table/structure/move_columns_dialog.phtml:1
+#: templates/table/structure/optional_action_links.phtml:21
+msgid "Move columns"
+msgstr "Move columns"
+
+#: templates/table/structure/move_columns_dialog.phtml:2
+msgid "Move the columns by dragging them up and down."
+msgstr "Move the columns by dragging them up and down."
+
+#: templates/table/structure/optional_action_links.phtml:9
+msgid "Propose table structure"
+msgstr "Propose table structure"
+
+#: templates/table/structure/optional_action_links.phtml:24
+#, fuzzy
+#| msgid "Propose table structure"
+msgid "Improve table structure"
+msgstr "Propose table structure"
+
+#: templates/table/structure/optional_action_links.phtml:30
+#, fuzzy
+#| msgid "Track table"
+msgid "Track view"
+msgstr "Track table"
+
+#: templates/table/structure/row_stats_table.phtml:3
+msgid "Row statistics"
+msgstr "Row statistics"
+
+#: templates/table/structure/row_stats_table.phtml:9
+msgid "static"
+msgstr "static"
+
+#: templates/table/structure/row_stats_table.phtml:11
+msgid "dynamic"
+msgstr "dynamic"
+
+#: templates/table/structure/row_stats_table.phtml:22
+msgid "partitioned"
+msgstr "partitioned"
+
+#: templates/table/structure/row_stats_table.phtml:54
+msgid "Row length"
+msgstr "Row length"
+
+#: templates/table/structure/row_stats_table.phtml:66
+msgid "Row size"
+msgstr "Row size"
+
+#: templates/table/structure/row_stats_table.phtml:73
+msgid "Next autoindex"
+msgstr "Next autoindex"
+
+#: templates/table/structure/table_structure_row.phtml:46
+#, php-format
+msgid "Column %s has been dropped."
+msgstr "Column %s has been dropped."
+
 #: themes.php:17 themes.php:22
 msgid "Theme"
 msgstr "Theme"
@@ -17357,6 +17380,11 @@ msgstr ""
 msgid "concurrent_insert is set to 0"
 msgstr "concurrent_insert is set to 0"
 
+#, fuzzy
+#~| msgid "Read misses"
+#~ msgid "Read as multibytes"
+#~ msgstr "Read misses"
+
 #~ msgid "Relational display column"
 #~ msgstr "Relational display column"
 
diff --git a/po/eo.po b/po/eo.po
index ffeb4943af..77e0b24453 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 4.5.0-dev\n"
 "Report-Msgid-Bugs-To: developers@phpmyadmin.net\n"
-"POT-Creation-Date: 2015-08-08 13:53-0400\n"
+"POT-Creation-Date: 2015-08-12 08:10-0400\n"
 "PO-Revision-Date: 2015-01-01 17:51+0200\n"
 "Last-Translator: Eliovir <eliovir@gmail.com>\n"
 "Language-Team: Esperanto <https://hosted.weblate.org/projects/phpmyadmin/"
@@ -57,7 +57,7 @@ msgid "Table comments:"
 msgstr ""
 
 #: db_datadict.php:104 libraries/Index.class.php:699
-#: libraries/insert_edit.lib.php:1567
+#: libraries/insert_edit.lib.php:1565
 #: libraries/navigation/Nodes/Node_Column.class.php:30
 #: libraries/plugins/export/ExportHtmlword.class.php:280
 #: libraries/plugins/export/ExportHtmlword.class.php:375
@@ -71,13 +71,14 @@ msgstr ""
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1023
 #: libraries/tracking.lib.php:879 libraries/tracking.lib.php:975
 #: templates/columns_definitions/column_name.phtml:18
-#: templates/index_form.phtml:124 templates/table/table_header.phtml:6
-#: templates/table/zoom_result_form.phtml:33
-#: templates/tbl_relation/common_form.phtml:10
-#: templates/tbl_relation/common_form.phtml:43
-#: templates/tbl_relation/foreign_key_row.phtml:194
-#: templates/tbl_relation/foreign_key_row.phtml:206
-#: templates/tbl_relation/internal_relational_row.phtml:71
+#: templates/table/index_form.phtml:124
+#: templates/table/relation/common_form.phtml:10
+#: templates/table/relation/common_form.phtml:43
+#: templates/table/relation/foreign_key_row.phtml:194
+#: templates/table/relation/foreign_key_row.phtml:206
+#: templates/table/relation/internal_relational_row.phtml:71
+#: templates/table/search/table_header.phtml:6
+#: templates/table/search/zoom_result_form.phtml:33
 msgid "Column"
 msgstr ""
 
@@ -95,21 +96,21 @@ msgstr ""
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1001
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1024
 #: libraries/rte/rte_list.lib.php:75 libraries/rte/rte_list.lib.php:103
-#: libraries/rte/rte_routines.lib.php:802
-#: libraries/rte/rte_routines.lib.php:831
-#: libraries/rte/rte_routines.lib.php:1493
+#: libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_routines.lib.php:922
+#: libraries/rte/rte_routines.lib.php:1584
 #: libraries/server_privileges.lib.php:2369 libraries/tracking.lib.php:880
 #: libraries/tracking.lib.php:972
 #: templates/columns_definitions/table_fields_definitions.phtml:11
-#: templates/structure/table_header.phtml:48
-#: templates/structure/table_structure_header.phtml:6
-#: templates/table/table_header.phtml:7
+#: templates/database/structure/table_header.phtml:48
+#: templates/table/search/table_header.phtml:7
+#: templates/table/structure/table_structure_header.phtml:6
 msgid "Type"
 msgstr ""
 
 #: db_datadict.php:106 libraries/Index.class.php:702
 #: libraries/central_columns.lib.php:708
-#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1576
+#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1574
 #: libraries/plugins/export/ExportHtmlword.class.php:286
 #: libraries/plugins/export/ExportHtmlword.class.php:381
 #: libraries/plugins/export/ExportLatex.class.php:509
@@ -122,8 +123,8 @@ msgstr ""
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1026
 #: libraries/tracking.lib.php:882 libraries/tracking.lib.php:978
 #: templates/columns_definitions/table_fields_definitions.phtml:39
-#: templates/structure/table_structure_header.phtml:9
-#: templates/table/zoom_result_form.phtml:34
+#: templates/table/search/zoom_result_form.phtml:34
+#: templates/table/structure/table_structure_header.phtml:9
 msgid "Null"
 msgstr ""
 
@@ -141,8 +142,8 @@ msgstr ""
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1027
 #: libraries/replication_gui.lib.php:153 libraries/tracking.lib.php:883
 #: templates/columns_definitions/table_fields_definitions.phtml:25
-#: templates/structure/body_for_table_summary.phtml:55
-#: templates/structure/table_structure_header.phtml:10
+#: templates/database/structure/body_for_table_summary.phtml:55
+#: templates/table/structure/table_structure_header.phtml:10
 msgid "Default"
 msgstr ""
 
@@ -170,19 +171,19 @@ msgid "Comments"
 msgstr ""
 
 #: db_datadict.php:146
-#: libraries/controllers/StructureController.class.php:1960
-#: libraries/controllers/StructureController.class.php:1965
+#: libraries/controllers/TableStructureController.class.php:951
+#: libraries/controllers/TableStructureController.class.php:956
 #: libraries/tracking.lib.php:922
 #: templates/columns_definitions/column_indexes.phtml:6
-#: templates/structure/check_all_table_column.phtml:22
-#: templates/structure/display_structure.phtml:74
+#: templates/table/structure/check_all_table_column.phtml:22
+#: templates/table/structure/display_structure.phtml:74
 msgid "Primary"
 msgstr ""
 
 #: db_datadict.php:156 js/messages.php:317 libraries/Index.class.php:567
 #: libraries/Index.class.php:606 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261 libraries/mult_submits.lib.php:403
+#: libraries/config/FormDisplay.tpl.php:272 libraries/mult_submits.lib.php:403
 #: libraries/mult_submits.lib.php:417
 #: libraries/plugins/export/ExportHtmlword.class.php:630
 #: libraries/plugins/export/ExportLatex.class.php:589
@@ -198,20 +199,20 @@ msgstr ""
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1010 libraries/tracking.lib.php:1015
 #: prefs_manage.php:140 templates/prefs_autoload.phtml:15
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "No"
 msgstr ""
 
 #: db_datadict.php:156 js/messages.php:443 libraries/Index.class.php:568
 #: libraries/Index.class.php:605 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261
-#: libraries/controllers/StructureController.class.php:1344
-#: libraries/controllers/StructureController.class.php:2223
-#: libraries/controllers/StructureController.class.php:2232
-#: libraries/controllers/StructureController.class.php:2237
-#: libraries/controllers/StructureController.class.php:2242
-#: libraries/controllers/StructureController.class.php:2247
+#: libraries/config/FormDisplay.tpl.php:272
+#: libraries/controllers/TableStructureController.class.php:539
+#: libraries/controllers/TableStructureController.class.php:1201
+#: libraries/controllers/TableStructureController.class.php:1210
+#: libraries/controllers/TableStructureController.class.php:1215
+#: libraries/controllers/TableStructureController.class.php:1220
+#: libraries/controllers/TableStructureController.class.php:1225
 #: libraries/mult_submits.inc.php:82 libraries/mult_submits.inc.php:178
 #: libraries/mult_submits.lib.php:339 libraries/mult_submits.lib.php:372
 #: libraries/mult_submits.lib.php:401 libraries/mult_submits.lib.php:415
@@ -220,8 +221,8 @@ msgstr ""
 #: libraries/plugins/export/ExportOdt.class.php:756
 #: libraries/plugins/export/ExportTexytext.class.php:567
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1077
-#: libraries/server_databases.lib.php:464
-#: libraries/server_databases.lib.php:474
+#: libraries/server_databases.lib.php:475
+#: libraries/server_databases.lib.php:485
 #: libraries/server_privileges.lib.php:2546
 #: libraries/server_privileges.lib.php:2727
 #: libraries/server_privileges.lib.php:2748
@@ -231,7 +232,7 @@ msgstr ""
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1008 libraries/tracking.lib.php:1013
 #: prefs_manage.php:138 templates/prefs_autoload.phtml:14
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "Yes"
 msgstr ""
 
@@ -241,7 +242,7 @@ msgstr ""
 
 #: db_export.php:37 db_tracking.php:90 export.php:382
 #: libraries/DBQbe.class.php:326
-#: libraries/controllers/StructureController.class.php:231
+#: libraries/controllers/DatabaseStructureController.class.php:170
 #: libraries/navigation/NavigationTree.class.php:897
 msgid "No tables found in database."
 msgstr ""
@@ -252,14 +253,14 @@ msgstr ""
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:26
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:120
-#: templates/structure/show_create.phtml:18
+#: templates/database/structure/show_create.phtml:18
 msgid "Tables"
 msgstr ""
 
 #: db_export.php:52 libraries/Menu.class.php:317 libraries/Menu.class.php:425
-#: libraries/Util.class.php:3333 libraries/Util.class.php:3343
-#: libraries/Util.class.php:3349 libraries/Util.class.php:3629
-#: libraries/Util.class.php:4327 libraries/Util.class.php:4344
+#: libraries/Util.class.php:3339 libraries/Util.class.php:3349
+#: libraries/Util.class.php:3355 libraries/Util.class.php:3635
+#: libraries/Util.class.php:4333 libraries/Util.class.php:4350
 #: libraries/central_columns.lib.php:728 libraries/config.values.php:39
 #: libraries/config.values.php:47 libraries/config.values.php:109
 #: libraries/config.values.php:115 libraries/config/setup.forms.php:323
@@ -273,7 +274,7 @@ msgstr ""
 #: libraries/navigation/Nodes/Node_Table.class.php:283
 #: libraries/server_privileges.lib.php:1141 libraries/tracking.lib.php:874
 #: templates/columns_definitions/table_fields_definitions.phtml:3
-#: templates/designer/table_list.phtml:28
+#: templates/database/designer/table_list.phtml:28
 msgid "Structure"
 msgstr ""
 
@@ -285,7 +286,7 @@ msgstr ""
 #: libraries/config/user_preferences.forms.php:292
 #: libraries/config/user_preferences.forms.php:297
 #: libraries/server_privileges.lib.php:1140
-#: templates/structure/display_table_stats.phtml:12
+#: templates/table/structure/display_table_stats.phtml:12
 msgid "Data"
 msgstr ""
 
@@ -355,10 +356,10 @@ msgstr ""
 #: libraries/server_privileges.lib.php:2908
 #: libraries/server_privileges.lib.php:3145
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4346
-#: templates/structure/table_header.phtml:21
-#: templates/tbl_relation/foreign_key_row.phtml:176
-#: templates/tbl_relation/internal_relational_row.phtml:63
+#: libraries/server_privileges.lib.php:4372
+#: templates/database/structure/table_header.phtml:21
+#: templates/table/relation/foreign_key_row.phtml:176
+#: templates/table/relation/internal_relational_row.phtml:63
 msgid "Table"
 msgstr ""
 
@@ -375,7 +376,7 @@ msgid "Updated"
 msgstr ""
 
 #: db_tracking.php:130 js/messages.php:243 libraries/Menu.class.php:552
-#: libraries/Util.class.php:4314 libraries/config.values.php:104
+#: libraries/Util.class.php:4320 libraries/config.values.php:104
 #: libraries/rte/rte_events.lib.php:393 libraries/rte/rte_list.lib.php:101
 #: libraries/server_status_processes.lib.php:92 libraries/tracking.lib.php:279
 msgid "Status"
@@ -384,14 +385,15 @@ msgstr ""
 #: db_tracking.php:131 db_tracking.php:290 libraries/Index.class.php:693
 #: libraries/central_columns.lib.php:687 libraries/rte/rte_list.lib.php:74
 #: libraries/rte/rte_list.lib.php:89 libraries/rte/rte_list.lib.php:102
-#: libraries/server_databases.lib.php:398
+#: libraries/server_databases.lib.php:409
 #: libraries/server_privileges.lib.php:2372
 #: libraries/server_privileges.lib.php:3166
 #: libraries/server_privileges.lib.php:3342
 #: libraries/server_user_groups.lib.php:82
 #: libraries/server_variables.lib.php:189 libraries/tracking.lib.php:280
-#: libraries/tracking.lib.php:793 templates/structure/table_header.phtml:30
-#: templates/structure/table_structure_header.phtml:23
+#: libraries/tracking.lib.php:793
+#: templates/database/structure/table_header.phtml:30
+#: templates/table/structure/table_structure_header.phtml:23
 msgid "Action"
 msgstr ""
 
@@ -433,7 +435,7 @@ msgid "Untracked tables"
 msgstr ""
 
 #: db_tracking.php:305 db_tracking.php:336
-#: templates/structure/optional_action_links.phtml:17
+#: templates/table/structure/optional_action_links.phtml:17
 msgid "Track table"
 msgstr ""
 
@@ -483,7 +485,7 @@ msgid "Value for the column \"%s\""
 msgstr ""
 
 #: gis_data_editor.php:146
-#: templates/gis_visualization/gis_visualization.phtml:37
+#: templates/table/gis_visualization/gis_visualization.phtml:37
 msgid "Use OpenStreetMaps as Base Layer"
 msgstr ""
 
@@ -563,35 +565,35 @@ msgstr ""
 #: libraries/display_change_password.lib.php:162
 #: libraries/display_export.lib.php:402 libraries/display_export.lib.php:408
 #: libraries/display_import.lib.php:392 libraries/index.lib.php:44
-#: libraries/insert_edit.lib.php:1546 libraries/insert_edit.lib.php:1583
+#: libraries/insert_edit.lib.php:1544 libraries/insert_edit.lib.php:1581
 #: libraries/normalization.lib.php:165 libraries/normalization.lib.php:821
 #: libraries/operations.lib.php:38 libraries/operations.lib.php:108
 #: libraries/operations.lib.php:263 libraries/operations.lib.php:306
 #: libraries/operations.lib.php:801 libraries/operations.lib.php:874
 #: libraries/operations.lib.php:923 libraries/operations.lib.php:1337
 #: libraries/operations.lib.php:1658
-#: libraries/plugins/auth/AuthenticationCookie.class.php:244
+#: libraries/plugins/auth/AuthenticationCookie.class.php:232
 #: libraries/replication_gui.lib.php:122 libraries/replication_gui.lib.php:161
 #: libraries/replication_gui.lib.php:324 libraries/replication_gui.lib.php:461
 #: libraries/replication_gui.lib.php:906 libraries/rte/rte_events.lib.php:509
-#: libraries/rte/rte_routines.lib.php:969
-#: libraries/rte/rte_routines.lib.php:1581
+#: libraries/rte/rte_routines.lib.php:1060
+#: libraries/rte/rte_routines.lib.php:1672
 #: libraries/rte/rte_triggers.lib.php:396 libraries/server_bin_log.lib.php:61
 #: libraries/server_privileges.lib.php:705
 #: libraries/server_privileges.lib.php:2106
 #: libraries/server_privileges.lib.php:2872
 #: libraries/server_privileges.lib.php:3553
-#: libraries/server_privileges.lib.php:4627
+#: libraries/server_privileges.lib.php:4653
 #: libraries/server_user_groups.lib.php:285
 #: libraries/sql_query_form.lib.php:369 libraries/sql_query_form.lib.php:429
 #: libraries/tracking.lib.php:533 libraries/tracking.lib.php:653
 #: prefs_manage.php:277 prefs_manage.php:355
 #: templates/columns_definitions/column_definitions_form.phtml:59
-#: templates/header_location.phtml:17 templates/index_form.phtml:238
+#: templates/database/create_table.phtml:21 templates/header_location.phtml:28
 #: templates/startAndNumberOfRowsPanel.phtml:14
-#: templates/structure/add_column.phtml:25
-#: templates/table/create_table.phtml:21
-#: templates/table/selection_form.phtml:75 view_create.php:275
+#: templates/table/index_form.phtml:238
+#: templates/table/search/selection_form.phtml:75
+#: templates/table/structure/add_column.phtml:25 view_create.php:275
 #: view_operations.php:106
 msgid "Go"
 msgstr ""
@@ -669,7 +671,7 @@ msgstr ""
 msgid "Could not load import plugins, please check your installation!"
 msgstr ""
 
-#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1466
+#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1460
 #, php-format
 msgid "Bookmark %s has been created."
 msgstr ""
@@ -703,11 +705,11 @@ msgstr ""
 msgid "Back"
 msgstr ""
 
-#: index.php:148 libraries/Footer.class.php:70
+#: index.php:149 libraries/Footer.class.php:70
 msgid "phpMyAdmin Demo Server"
 msgstr ""
 
-#: index.php:152
+#: index.php:153
 #, php-format
 msgid ""
 "You are using the demo server. You can do anything here, but please do not "
@@ -715,110 +717,110 @@ msgid ""
 "at %s."
 msgstr ""
 
-#: index.php:162
+#: index.php:163
 msgid "General Settings"
 msgstr ""
 
-#: index.php:190 libraries/display_change_password.lib.php:50
+#: index.php:191 libraries/display_change_password.lib.php:50
 #: libraries/display_change_password.lib.php:53 user_password.php:247
 msgid "Change password"
 msgstr ""
 
-#: index.php:206
+#: index.php:207
 msgid "Server connection collation"
 msgstr ""
 
-#: index.php:228
+#: index.php:229
 msgid "Appearance Settings"
 msgstr ""
 
-#: index.php:258 prefs_manage.php:285
+#: index.php:259 prefs_manage.php:285
 msgid "More settings"
 msgstr ""
 
-#: index.php:279
+#: index.php:280
 msgid "Database server"
 msgstr ""
 
-#: index.php:282 libraries/plugins/auth/AuthenticationCookie.class.php:181
+#: index.php:283 libraries/plugins/auth/AuthenticationCookie.class.php:169
 msgid "Server:"
 msgstr ""
 
-#: index.php:286
+#: index.php:287
 msgid "Server type:"
 msgstr ""
 
-#: index.php:290 libraries/plugins/export/ExportLatex.class.php:212
+#: index.php:291 libraries/plugins/export/ExportLatex.class.php:212
 #: libraries/plugins/export/ExportSql.class.php:687
 #: libraries/plugins/export/ExportXml.class.php:189
 msgid "Server version:"
 msgstr ""
 
-#: index.php:296
+#: index.php:297
 msgid "Protocol version:"
 msgstr ""
 
-#: index.php:300
+#: index.php:301
 msgid "User:"
 msgstr ""
 
-#: index.php:305
+#: index.php:306
 msgid "Server charset:"
 msgstr ""
 
-#: index.php:320
+#: index.php:321
 msgid "Web server"
 msgstr ""
 
-#: index.php:331
+#: index.php:332
 msgid "Database client version:"
 msgstr ""
 
-#: index.php:335
+#: index.php:336
 msgid "PHP extension:"
 msgstr ""
 
-#: index.php:349
+#: index.php:350
 msgid "PHP version:"
 msgstr ""
 
-#: index.php:360
+#: index.php:361
 msgid "Show PHP information"
 msgstr ""
 
-#: index.php:383
+#: index.php:384
 msgid "Version information:"
 msgstr ""
 
-#: index.php:392 libraries/Util.class.php:432 libraries/Util.class.php:495
-#: libraries/config/FormDisplay.tpl.php:151
+#: index.php:393 libraries/Util.class.php:432 libraries/Util.class.php:495
+#: libraries/config/FormDisplay.tpl.php:162
 #: libraries/display_export.lib.php:577 libraries/engines/pbxt.lib.php:162
 #: libraries/navigation/NavigationHeader.class.php:196
 #: libraries/server_variables.lib.php:160
 msgid "Documentation"
 msgstr ""
 
-#: index.php:399
+#: index.php:400
 msgid "Wiki"
 msgstr ""
 
-#: index.php:408
+#: index.php:409
 msgid "Official Homepage"
 msgstr ""
 
-#: index.php:415
+#: index.php:416
 msgid "Contribute"
 msgstr ""
 
-#: index.php:422
+#: index.php:423
 msgid "Get support"
 msgstr ""
 
-#: index.php:429
+#: index.php:430
 msgid "List of changes"
 msgstr ""
 
-#: index.php:451
+#: index.php:452
 msgid ""
 "You are connected as 'root' with no password, which corresponds to the "
 "default MySQL privileged account. Your MySQL server is running with this "
@@ -826,21 +828,21 @@ msgid ""
 "by setting a password for user 'root'."
 msgstr ""
 
-#: index.php:468
+#: index.php:469
 msgid ""
 "You have enabled mbstring.func_overload in your PHP configuration. This "
 "option is incompatible with phpMyAdmin and might cause some data to be "
 "corrupted!"
 msgstr ""
 
-#: index.php:483
+#: index.php:484
 msgid ""
 "The mbstring PHP extension was not found and you seem to be using a "
 "multibyte charset. Without the mbstring extension phpMyAdmin is unable to "
 "split strings correctly and it may result in unexpected results."
 msgstr ""
 
-#: index.php:500
+#: index.php:501
 msgid ""
 "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini."
 "session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower than "
@@ -848,17 +850,17 @@ msgid ""
 "expire sooner than configured in phpMyAdmin."
 msgstr ""
 
-#: index.php:519
+#: index.php:520
 msgid ""
 "Login cookie store is lower than cookie validity configured in phpMyAdmin, "
 "because of this, your login will expire sooner than configured in phpMyAdmin."
 msgstr ""
 
-#: index.php:535
+#: index.php:536
 msgid "The configuration file now needs a secret passphrase (blowfish_secret)."
 msgstr ""
 
-#: index.php:548
+#: index.php:549
 msgid ""
 "Directory [code]config[/code], which is used by the setup script, still "
 "exists in your phpMyAdmin directory. It is strongly recommended to remove it "
@@ -866,26 +868,26 @@ msgid ""
 "may be compromised by unauthorized people downloading your configuration."
 msgstr ""
 
-#: index.php:564
+#: index.php:565
 #, php-format
 msgid ""
 "The phpMyAdmin configuration storage is not completely configured, some "
 "extended features have been deactivated. %sFind out why%s. "
 msgstr ""
 
-#: index.php:571
+#: index.php:572
 msgid ""
 "Or alternately go to 'Operations' tab of any database to set it up there."
 msgstr ""
 
-#: index.php:620
+#: index.php:621
 #, php-format
 msgid ""
 "Your PHP MySQL library version %s differs from your MySQL server version %s. "
 "This may cause unpredictable behavior."
 msgstr ""
 
-#: index.php:648
+#: index.php:649
 #, php-format
 msgid ""
 "Server running with Suhosin. Please refer to %sdocumentation%s for possible "
@@ -1026,8 +1028,8 @@ msgstr ""
 msgid "Save & Close"
 msgstr ""
 
-#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:404
-#: libraries/insert_edit.lib.php:1550 prefs_manage.php:361
+#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:415
+#: libraries/insert_edit.lib.php:1548 prefs_manage.php:361
 #: prefs_manage.php:372
 msgid "Reset"
 msgstr ""
@@ -1060,7 +1062,7 @@ msgstr ""
 msgid "Edit Index"
 msgstr ""
 
-#: js/messages.php:99 templates/index_form.phtml:232
+#: js/messages.php:99 templates/table/index_form.phtml:232
 #, php-format
 msgid "Add %s column(s) to index"
 msgstr ""
@@ -1081,13 +1083,14 @@ msgstr ""
 msgid "Please select column(s) for the index."
 msgstr ""
 
-#: js/messages.php:106 templates/structure/add_column.phtml:1
+#: js/messages.php:106 templates/table/structure/add_column.phtml:1
 msgid "You have to add at least one column."
 msgstr ""
 
-#: js/messages.php:109 libraries/insert_edit.lib.php:1548
+#: js/messages.php:109 libraries/insert_edit.lib.php:1546
 #: templates/columns_definitions/column_definitions_form.phtml:162
-#: templates/index_form.phtml:237 templates/tbl_relation/common_form.phtml:106
+#: templates/table/index_form.phtml:237
+#: templates/table/relation/common_form.phtml:106
 msgid "Preview SQL"
 msgstr ""
 
@@ -1104,7 +1107,7 @@ msgid "SQL query:"
 msgstr ""
 
 #. l10n: Default label for the y-Axis of Charts
-#: js/messages.php:118 templates/tbl_chart.phtml:109
+#: js/messages.php:118 templates/table/chart/tbl_chart.phtml:109
 msgid "Y Values"
 msgstr ""
 
@@ -1255,7 +1258,7 @@ msgstr ""
 msgid "Bytes received"
 msgstr ""
 
-#: js/messages.php:169 libraries/server_status.lib.php:226
+#: js/messages.php:169 libraries/server_status.lib.php:235
 msgid "Connections"
 msgstr ""
 
@@ -1312,12 +1315,12 @@ msgstr ""
 msgid "Questions"
 msgstr ""
 
-#: js/messages.php:184 libraries/server_status.lib.php:134
+#: js/messages.php:184 libraries/server_status.lib.php:143
 msgid "Traffic"
 msgstr ""
 
 #: js/messages.php:185 libraries/Menu.class.php:586
-#: libraries/Util.class.php:4318 libraries/server_status_monitor.lib.php:257
+#: libraries/Util.class.php:4324 libraries/server_status_monitor.lib.php:257
 msgid "Settings"
 msgstr ""
 
@@ -1337,8 +1340,9 @@ msgstr ""
 #: libraries/server_status_monitor.lib.php:236
 #: libraries/server_status_processes.lib.php:308
 #: templates/columns_definitions/transformation.phtml:4
-#: templates/designer/options_panel.phtml:178
-#: templates/table/options_zoom.phtml:12 templates/table/rows_zoom.phtml:26
+#: templates/database/designer/options_panel.phtml:178
+#: templates/table/search/options_zoom.phtml:12
+#: templates/table/search/rows_zoom.phtml:26
 msgid "None"
 msgstr ""
 
@@ -1606,8 +1610,8 @@ msgstr ""
 
 #: js/messages.php:270 libraries/Menu.class.php:352
 #: libraries/Menu.class.php:455 libraries/Menu.class.php:582
-#: libraries/Util.class.php:4317 libraries/Util.class.php:4332
-#: libraries/Util.class.php:4349 libraries/config/messages.inc.php:258
+#: libraries/Util.class.php:4323 libraries/Util.class.php:4338
+#: libraries/Util.class.php:4355 libraries/config/messages.inc.php:258
 #: libraries/display_import.lib.php:105
 #: libraries/server_status_monitor.lib.php:318 prefs_manage.php:238
 #: setup/frames/menu.inc.php:26
@@ -1667,13 +1671,13 @@ msgid "Formatting SQL..."
 msgstr ""
 
 #: js/messages.php:293 libraries/server_variables.lib.php:157
-#: templates/designer/aggregate_query_panel.phtml:63
-#: templates/designer/delete_relation_panel.phtml:28
-#: templates/designer/having_query_panel.phtml:117
-#: templates/designer/new_relation_panel.phtml:88
-#: templates/designer/options_panel.phtml:253
-#: templates/designer/rename_to_panel.phtml:45
-#: templates/designer/where_query_panel.phtml:83
+#: templates/database/designer/aggregate_query_panel.phtml:63
+#: templates/database/designer/delete_relation_panel.phtml:28
+#: templates/database/designer/having_query_panel.phtml:117
+#: templates/database/designer/new_relation_panel.phtml:88
+#: templates/database/designer/options_panel.phtml:253
+#: templates/database/designer/rename_to_panel.phtml:45
+#: templates/database/designer/where_query_panel.phtml:83
 msgid "Cancel"
 msgstr ""
 
@@ -1681,7 +1685,7 @@ msgstr ""
 msgid "Page-related settings"
 msgstr ""
 
-#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:402
+#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:413
 msgid "Apply"
 msgstr ""
 
@@ -1716,8 +1720,8 @@ msgstr ""
 msgid "Error text: %s"
 msgstr ""
 
-#: js/messages.php:307 libraries/db_common.inc.php:68
-#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:450
+#: js/messages.php:307 libraries/db_common.inc.php:69
+#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:461
 msgid "No databases selected."
 msgstr ""
 
@@ -1729,12 +1733,13 @@ msgstr ""
 msgid "Adding Primary Key"
 msgstr ""
 
-#: js/messages.php:310 templates/designer/aggregate_query_panel.phtml:59
-#: templates/designer/having_query_panel.phtml:113
-#: templates/designer/new_relation_panel.phtml:87
-#: templates/designer/options_panel.phtml:252
-#: templates/designer/rename_to_panel.phtml:41
-#: templates/designer/where_query_panel.phtml:82
+#: js/messages.php:310
+#: templates/database/designer/aggregate_query_panel.phtml:59
+#: templates/database/designer/having_query_panel.phtml:113
+#: templates/database/designer/new_relation_panel.phtml:87
+#: templates/database/designer/options_panel.phtml:252
+#: templates/database/designer/rename_to_panel.phtml:41
+#: templates/database/designer/where_query_panel.phtml:82
 msgid "OK"
 msgstr ""
 
@@ -1754,7 +1759,7 @@ msgstr ""
 msgid "Changing Charset"
 msgstr ""
 
-#: js/messages.php:320 libraries/Util.class.php:3217
+#: js/messages.php:320 libraries/Util.class.php:3223
 msgid "Enable foreign key checks"
 msgstr ""
 
@@ -1789,20 +1794,21 @@ msgstr ""
 #: js/messages.php:334 libraries/DisplayResults.class.php:4834
 #: libraries/DisplayResults.class.php:5092 libraries/Menu.class.php:344
 #: libraries/Menu.class.php:446 libraries/Menu.class.php:578
-#: libraries/Util.class.php:3636 libraries/Util.class.php:3637
-#: libraries/Util.class.php:4316 libraries/Util.class.php:4331
-#: libraries/Util.class.php:4348 libraries/config/messages.inc.php:252
+#: libraries/Util.class.php:3642 libraries/Util.class.php:3643
+#: libraries/Util.class.php:4322 libraries/Util.class.php:4337
+#: libraries/Util.class.php:4354 libraries/config/messages.inc.php:252
 #: libraries/display_export.lib.php:173 libraries/rte/rte_list.lib.php:146
 #: libraries/server_privileges.lib.php:2211
 #: libraries/server_privileges.lib.php:2290
 #: libraries/server_privileges.lib.php:2632
 #: libraries/server_privileges.lib.php:3356
 #: libraries/server_status_monitor.lib.php:322 prefs_manage.php:303
-#: setup/frames/menu.inc.php:27 templates/structure/check_all_tables.phtml:11
+#: setup/frames/menu.inc.php:27
+#: templates/database/structure/check_all_tables.phtml:11
 msgid "Export"
 msgstr ""
 
-#: js/messages.php:337 libraries/rte/rte_routines.lib.php:652
+#: js/messages.php:337 libraries/rte/rte_routines.lib.php:743
 msgid "ENUM/SET editor"
 msgstr ""
 
@@ -1841,7 +1847,7 @@ msgstr ""
 #: libraries/Console.class.php:214 libraries/DisplayResults.class.php:3474
 #: libraries/DisplayResults.class.php:4818 libraries/Index.class.php:723
 #: libraries/Util.class.php:706 libraries/Util.class.php:1202
-#: libraries/Util.class.php:3634 libraries/Util.class.php:3635
+#: libraries/Util.class.php:3640 libraries/Util.class.php:3641
 #: libraries/central_columns.lib.php:851
 #: libraries/central_columns.lib.php:1193
 #: libraries/config/messages.inc.php:892
@@ -1859,7 +1865,7 @@ msgstr ""
 #: libraries/server_user_groups.lib.php:129
 #: libraries/sql_query_form.lib.php:416 libraries/tracking.lib.php:477
 #: setup/frames/index.inc.php:183 setup/frames/index.inc.php:291
-#: templates/designer/delete_relation_panel.phtml:27
+#: templates/database/designer/delete_relation_panel.phtml:27
 msgid "Delete"
 msgstr ""
 
@@ -2020,11 +2026,11 @@ msgid "No dependencies selected!"
 msgstr ""
 
 #: js/messages.php:394 libraries/central_columns.lib.php:1214
-#: libraries/insert_edit.lib.php:1458 libraries/server_variables.lib.php:155
+#: libraries/insert_edit.lib.php:1456 libraries/server_variables.lib.php:155
 #: setup/frames/config.inc.php:42 setup/frames/index.inc.php:279
 #: templates/columns_definitions/column_definitions_form.phtml:165
-#: templates/gis_visualization/gis_visualization.phtml:48
-#: templates/tbl_relation/common_form.phtml:107
+#: templates/table/gis_visualization/gis_visualization.phtml:48
+#: templates/table/relation/common_form.phtml:107
 msgid "Save"
 msgstr ""
 
@@ -2101,8 +2107,8 @@ msgid "Data point content"
 msgstr ""
 
 #: js/messages.php:430 js/messages.php:562 js/messages.php:579
-#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2573
-#: templates/index_form.phtml:154 templates/index_form.phtml:194
+#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2571
+#: templates/table/index_form.phtml:154 templates/table/index_form.phtml:194
 msgid "Ignore"
 msgstr ""
 
@@ -2161,8 +2167,8 @@ msgstr ""
 msgid "Please select the primary key or a unique key!"
 msgstr ""
 
-#: js/messages.php:457 templates/designer/side_menu.phtml:91
-#: templates/designer/side_menu.phtml:94
+#: js/messages.php:457 templates/database/designer/side_menu.phtml:91
+#: templates/database/designer/side_menu.phtml:94
 msgid "Choose column to display"
 msgstr ""
 
@@ -2176,18 +2182,18 @@ msgstr ""
 msgid "Page name"
 msgstr ""
 
-#: js/messages.php:463 templates/designer/side_menu.phtml:56
-#: templates/designer/side_menu.phtml:59
+#: js/messages.php:463 templates/database/designer/side_menu.phtml:56
+#: templates/database/designer/side_menu.phtml:59
 msgid "Save page"
 msgstr ""
 
-#: js/messages.php:464 templates/designer/side_menu.phtml:63
-#: templates/designer/side_menu.phtml:66
+#: js/messages.php:464 templates/database/designer/side_menu.phtml:63
+#: templates/database/designer/side_menu.phtml:66
 msgid "Save page as"
 msgstr ""
 
-#: js/messages.php:465 templates/designer/side_menu.phtml:49
-#: templates/designer/side_menu.phtml:52
+#: js/messages.php:465 templates/database/designer/side_menu.phtml:49
+#: templates/database/designer/side_menu.phtml:52
 msgid "Open page"
 msgstr ""
 
@@ -2195,7 +2201,7 @@ msgstr ""
 msgid "Delete page"
 msgstr ""
 
-#: js/messages.php:467 templates/designer/side_menu.phtml:10
+#: js/messages.php:467 templates/database/designer/side_menu.phtml:10
 msgid "Untitled"
 msgstr ""
 
@@ -2306,7 +2312,7 @@ msgstr ""
 msgid "cancel"
 msgstr ""
 
-#: js/messages.php:499 libraries/server_status.lib.php:271
+#: js/messages.php:499 libraries/server_status.lib.php:280
 msgid "Aborted"
 msgstr ""
 
@@ -2856,7 +2862,7 @@ msgstr ""
 
 #: js/messages.php:793 libraries/Message.class.php:199
 #: libraries/Util.class.php:654 libraries/core.lib.php:245
-#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1172
+#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1170
 #: tbl_operations.php:229 view_operations.php:63
 msgid "Error"
 msgstr ""
@@ -2915,8 +2921,8 @@ msgstr ""
 msgid "per minute"
 msgstr ""
 
-#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:143
-#: libraries/server_status.lib.php:228
+#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:152
+#: libraries/server_status.lib.php:237
 #: libraries/server_status_queries.lib.php:98
 msgid "per hour"
 msgstr ""
@@ -2934,7 +2940,7 @@ msgstr ""
 msgid "Wrong permissions on configuration file, should not be world writable!"
 msgstr ""
 
-#: libraries/Config.class.php:1799
+#: libraries/Config.class.php:1801
 msgid "Font size"
 msgstr ""
 
@@ -2962,10 +2968,10 @@ msgstr ""
 #: libraries/server_privileges.lib.php:2890
 #: libraries/server_privileges.lib.php:3144
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4332
+#: libraries/server_privileges.lib.php:4358
 #: libraries/server_status_processes.lib.php:80
-#: templates/tbl_relation/foreign_key_row.phtml:165
-#: templates/tbl_relation/internal_relational_row.phtml:55
+#: templates/table/relation/foreign_key_row.phtml:165
+#: templates/table/relation/internal_relational_row.phtml:55
 msgid "Database"
 msgstr "Datumbazo"
 
@@ -3058,11 +3064,11 @@ msgstr ""
 #: libraries/plugins/import/ImportMediawiki.class.php:60
 #: libraries/plugins/import/ImportOds.class.php:59
 #: libraries/plugins/import/ImportShp.class.php:57
-#: libraries/plugins/import/ImportSql.class.php:148
+#: libraries/plugins/import/ImportSql.class.php:51
 #: libraries/plugins/import/ImportXml.class.php:58
-#: libraries/rte/rte_routines.lib.php:833 templates/index_form.phtml:49
-#: templates/structure/row_stats_table.phtml:20
-#: templates/table/options.phtml:2
+#: libraries/rte/rte_routines.lib.php:924 templates/table/index_form.phtml:49
+#: templates/table/search/options.phtml:2
+#: templates/table/structure/row_stats_table.phtml:20
 msgid "Options"
 msgstr ""
 
@@ -3095,7 +3101,8 @@ msgstr ""
 msgid "Order:"
 msgstr ""
 
-#: libraries/Console.class.php:289 templates/table/replace_preview.phtml:17
+#: libraries/Console.class.php:289
+#: templates/table/search/replace_preview.phtml:17
 msgid "Count"
 msgstr ""
 
@@ -3190,9 +3197,9 @@ msgstr ""
 #: libraries/operations.lib.php:794 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:191
-#: templates/structure/sortable_header.phtml:21
-#: templates/structure/sortable_header.phtml:38
-#: templates/table/options.phtml:68
+#: templates/database/structure/sortable_header.phtml:21
+#: templates/database/structure/sortable_header.phtml:38
+#: templates/table/search/options.phtml:68
 msgid "Ascending"
 msgstr ""
 
@@ -3202,13 +3209,14 @@ msgstr ""
 #: libraries/operations.lib.php:797 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:188
-#: templates/structure/sortable_header.phtml:26
-#: templates/structure/sortable_header.phtml:43
-#: templates/table/options.phtml:69
+#: templates/database/structure/sortable_header.phtml:26
+#: templates/database/structure/sortable_header.phtml:43
+#: templates/table/search/options.phtml:69
 msgid "Descending"
 msgstr ""
 
-#: libraries/DBQbe.class.php:467 templates/table/search_and_replace.phtml:6
+#: libraries/DBQbe.class.php:467
+#: templates/table/search/search_and_replace.phtml:6
 msgid "Column:"
 msgstr ""
 
@@ -3363,12 +3371,12 @@ msgstr[0] ""
 msgstr[1] ""
 
 #: libraries/DbSearch.class.php:354 libraries/Menu.class.php:311
-#: libraries/Util.class.php:3337 libraries/Util.class.php:3347
-#: libraries/Util.class.php:3623 libraries/Util.class.php:3624
-#: libraries/Util.class.php:4343 libraries/config.values.php:43
+#: libraries/Util.class.php:3343 libraries/Util.class.php:3353
+#: libraries/Util.class.php:3629 libraries/Util.class.php:3630
+#: libraries/Util.class.php:4349 libraries/config.values.php:43
 #: libraries/config.values.php:51 libraries/config.values.php:119
 #: libraries/navigation/Nodes/Node_Table.class.php:295
-#: templates/structure/check_all_table_column.phtml:5
+#: templates/table/structure/check_all_table_column.phtml:5
 msgid "Browse"
 msgstr ""
 
@@ -3385,7 +3393,8 @@ msgstr ""
 msgid "Words or values to search for (wildcard: \"%\"):"
 msgstr ""
 
-#: libraries/DbSearch.class.php:401 templates/table/search_and_replace.phtml:1
+#: libraries/DbSearch.class.php:401
+#: templates/table/search/search_and_replace.phtml:1
 msgid "Find:"
 msgstr ""
 
@@ -3429,28 +3438,28 @@ msgstr ""
 msgid "Search this table"
 msgstr ""
 
-#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2532
-#: libraries/Util.class.php:2535
+#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2538
+#: libraries/Util.class.php:2541
 msgctxt "First page"
 msgid "Begin"
 msgstr ""
 
-#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2533
-#: libraries/Util.class.php:2536 libraries/server_bin_log.lib.php:170
+#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2539
+#: libraries/Util.class.php:2542 libraries/server_bin_log.lib.php:170
 #: libraries/server_bin_log.lib.php:172
 msgctxt "Previous page"
 msgid "Previous"
 msgstr ""
 
-#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2564
-#: libraries/Util.class.php:2574 libraries/server_bin_log.lib.php:204
+#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2570
+#: libraries/Util.class.php:2580 libraries/server_bin_log.lib.php:204
 #: libraries/server_bin_log.lib.php:206
 msgctxt "Next page"
 msgid "Next"
 msgstr ""
 
-#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2565
-#: libraries/Util.class.php:2575
+#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2571
+#: libraries/Util.class.php:2581
 msgctxt "Last page"
 msgid "End"
 msgstr ""
@@ -3523,15 +3532,15 @@ msgid "May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]."
 msgstr ""
 
 #: libraries/DisplayResults.class.php:4332 libraries/Message.class.php:180
-#: libraries/controllers/TableRelationController.class.php:258
+#: libraries/controllers/TableRelationController.class.php:259
 #: libraries/controllers/TableSearchController.class.php:655
-#: libraries/rte/rte_routines.lib.php:1332 libraries/sql_query_form.lib.php:89
+#: libraries/rte/rte_routines.lib.php:1423 libraries/sql_query_form.lib.php:89
 #: tbl_operations.php:227 tbl_row_action.php:138 view_operations.php:62
 msgid "Your SQL query has been executed successfully."
 msgstr ""
 
 #: libraries/DisplayResults.class.php:4660
-#: libraries/controllers/StructureController.class.php:629
+#: libraries/controllers/DatabaseStructureController.class.php:564
 #, php-format
 msgid ""
 "This view has at least this number of rows. Please refer to %sdocumentation"
@@ -3553,33 +3562,33 @@ msgstr ""
 msgid "%d total"
 msgstr ""
 
-#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1318
+#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1312
 #, php-format
 msgid "Query took %01.4f seconds."
 msgstr ""
 
 #: libraries/DisplayResults.class.php:4807
-#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4767
-#: libraries/Util.class.php:4773 libraries/mult_submits.inc.php:50
-#: templates/structure/check_all_tables.phtml:2
-#: templates/structure/check_all_tables.phtml:9
+#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4773
+#: libraries/Util.class.php:4779 libraries/mult_submits.inc.php:50
+#: templates/database/structure/check_all_tables.phtml:2
+#: templates/database/structure/check_all_tables.phtml:9
 msgid "With selected:"
 msgstr ""
 
 #: libraries/DisplayResults.class.php:4811
-#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4769
-#: libraries/Util.class.php:4770 libraries/server_privileges.lib.php:1174
+#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4775
+#: libraries/Util.class.php:4776 libraries/server_privileges.lib.php:1174
 #: libraries/server_privileges.lib.php:1175
 #: libraries/server_privileges.lib.php:1387
 #: libraries/server_user_groups.lib.php:231
-#: templates/structure/check_all_tables.phtml:3
-#: templates/structure/check_all_tables.phtml:4
+#: templates/database/structure/check_all_tables.phtml:3
+#: templates/database/structure/check_all_tables.phtml:4
 msgid "Check All"
 msgstr ""
 
 #: libraries/DisplayResults.class.php:4985 libraries/Header.class.php:383
-#: templates/structure/optional_action_links.phtml:1
-#: templates/structure/print_view_data_dictionary_link.phtml:3
+#: templates/database/structure/print_view_data_dictionary_link.phtml:3
+#: templates/table/structure/optional_action_links.phtml:1
 msgid "Print view"
 msgstr ""
 
@@ -3587,7 +3596,8 @@ msgstr ""
 msgid "Query results operations"
 msgstr ""
 
-#: libraries/DisplayResults.class.php:5105 templates/tbl_chart.phtml:12
+#: libraries/DisplayResults.class.php:5105
+#: templates/table/chart/tbl_chart.phtml:12
 msgid "Display chart"
 msgstr ""
 
@@ -3676,7 +3686,7 @@ msgid "Click on the bar to scroll to top of page"
 msgstr ""
 
 #: libraries/Header.class.php:749
-#: libraries/plugins/auth/AuthenticationCookie.class.php:152
+#: libraries/plugins/auth/AuthenticationCookie.class.php:140
 msgid "Javascript must be enabled past this point!"
 msgstr ""
 
@@ -3698,11 +3708,11 @@ msgid "Keyname"
 msgstr ""
 
 #: libraries/Index.class.php:697
-#: libraries/controllers/StructureController.class.php:1962
-#: libraries/controllers/StructureController.class.php:1967
+#: libraries/controllers/TableStructureController.class.php:953
+#: libraries/controllers/TableStructureController.class.php:958
 #: libraries/tracking.lib.php:973
 #: templates/columns_definitions/column_indexes.phtml:11
-#: templates/structure/check_all_table_column.phtml:26
+#: templates/table/structure/check_all_table_column.phtml:26
 msgid "Unique"
 msgstr ""
 
@@ -3721,16 +3731,17 @@ msgstr ""
 #: libraries/server_collations.lib.php:35 libraries/tracking.lib.php:881
 #: libraries/tracking.lib.php:977
 #: templates/columns_definitions/table_fields_definitions.phtml:33
-#: templates/structure/row_stats_table.phtml:31
-#: templates/structure/table_header.phtml:55
-#: templates/structure/table_structure_header.phtml:7
-#: templates/table/table_header.phtml:8
+#: templates/database/structure/table_header.phtml:55
+#: templates/table/search/table_header.phtml:8
+#: templates/table/structure/row_stats_table.phtml:31
+#: templates/table/structure/table_structure_header.phtml:7
 msgid "Collation"
 msgstr ""
 
 #: libraries/Index.class.php:703 libraries/rte/rte_events.lib.php:496
-#: libraries/rte/rte_routines.lib.php:956 libraries/tracking.lib.php:885
-#: libraries/tracking.lib.php:979 templates/structure/table_header.phtml:84
+#: libraries/rte/rte_routines.lib.php:1047 libraries/tracking.lib.php:885
+#: libraries/tracking.lib.php:979
+#: templates/database/structure/table_header.phtml:84
 msgid "Comment"
 msgstr ""
 
@@ -3743,15 +3754,15 @@ msgstr ""
 msgid "Index %s has been dropped."
 msgstr ""
 
-#: libraries/Index.class.php:757 libraries/Util.class.php:3630
-#: libraries/Util.class.php:3631
-#: libraries/controllers/StructureController.class.php:1958
-#: libraries/controllers/StructureController.class.php:1959
+#: libraries/Index.class.php:757 libraries/Util.class.php:3636
+#: libraries/Util.class.php:3637
+#: libraries/controllers/TableStructureController.class.php:949
+#: libraries/controllers/TableStructureController.class.php:950
 #: libraries/operations.lib.php:1607 libraries/rte/rte_list.lib.php:150
 #: libraries/server_databases.lib.php:146
-#: templates/structure/check_all_table_column.phtml:15
-#: templates/structure/check_all_tables.phtml:16
-#: templates/tbl_relation/foreign_key_row.phtml:93
+#: templates/database/structure/check_all_tables.phtml:16
+#: templates/table/relation/foreign_key_row.phtml:93
+#: templates/table/structure/check_all_table_column.phtml:15
 msgid "Drop"
 msgstr ""
 
@@ -3780,16 +3791,16 @@ msgstr ""
 #: libraries/Menu.class.php:248
 #: libraries/navigation/Nodes/Node_View.class.php:32
 #: libraries/tbl_info.inc.php:63
-#: templates/structure/structure_table_row.phtml:97
-#: templates/structure/structure_table_row.phtml:159
+#: templates/database/structure/structure_table_row.phtml:97
+#: templates/database/structure/structure_table_row.phtml:159
 msgid "View"
 msgstr ""
 
 #: libraries/Menu.class.php:325 libraries/Menu.class.php:429
-#: libraries/Menu.class.php:548 libraries/Util.class.php:3334
-#: libraries/Util.class.php:3344 libraries/Util.class.php:3350
-#: libraries/Util.class.php:4313 libraries/Util.class.php:4328
-#: libraries/Util.class.php:4345 libraries/config.values.php:40
+#: libraries/Menu.class.php:548 libraries/Util.class.php:3340
+#: libraries/Util.class.php:3350 libraries/Util.class.php:3356
+#: libraries/Util.class.php:4319 libraries/Util.class.php:4334
+#: libraries/Util.class.php:4351 libraries/config.values.php:40
 #: libraries/config.values.php:48 libraries/config.values.php:110
 #: libraries/config.values.php:116 libraries/config/messages.inc.php:321
 #: libraries/navigation/Nodes/Node_Table.class.php:292
@@ -3797,19 +3808,19 @@ msgid "SQL"
 msgstr "SQL"
 
 #: libraries/Menu.class.php:328 libraries/Menu.class.php:432
-#: libraries/Util.class.php:3335 libraries/Util.class.php:3345
-#: libraries/Util.class.php:3351 libraries/Util.class.php:3625
-#: libraries/Util.class.php:3626 libraries/Util.class.php:4329
-#: libraries/Util.class.php:4346 libraries/config.values.php:41
+#: libraries/Util.class.php:3341 libraries/Util.class.php:3351
+#: libraries/Util.class.php:3357 libraries/Util.class.php:3631
+#: libraries/Util.class.php:3632 libraries/Util.class.php:4335
+#: libraries/Util.class.php:4352 libraries/config.values.php:41
 #: libraries/config.values.php:49 libraries/config.values.php:111
 #: libraries/config.values.php:117
 #: libraries/navigation/Nodes/Node_Table.class.php:286
 msgid "Search"
 msgstr ""
 
-#: libraries/Menu.class.php:338 libraries/Util.class.php:3336
-#: libraries/Util.class.php:3346 libraries/Util.class.php:3627
-#: libraries/Util.class.php:3628 libraries/Util.class.php:4347
+#: libraries/Menu.class.php:338 libraries/Util.class.php:3342
+#: libraries/Util.class.php:3352 libraries/Util.class.php:3633
+#: libraries/Util.class.php:3634 libraries/Util.class.php:4353
 #: libraries/config.values.php:42 libraries/config.values.php:50
 #: libraries/config.values.php:118
 #: libraries/navigation/Nodes/Node_Table.class.php:289
@@ -3818,30 +3829,30 @@ msgid "Insert"
 msgstr ""
 
 #: libraries/Menu.class.php:362 libraries/Menu.class.php:467
-#: libraries/Util.class.php:4334 libraries/Util.class.php:4350
+#: libraries/Util.class.php:4340 libraries/Util.class.php:4356
 #: libraries/config.values.php:106 libraries/server_common.lib.php:51
 #: libraries/server_privileges.lib.php:2370
 #: libraries/server_privileges.lib.php:3158
-#: libraries/server_privileges.lib.php:4221
+#: libraries/server_privileges.lib.php:4247
 msgid "Privileges"
 msgstr ""
 
 #: libraries/Menu.class.php:371 libraries/Menu.class.php:379
-#: libraries/Menu.class.php:459 libraries/Util.class.php:3338
-#: libraries/Util.class.php:3352 libraries/Util.class.php:4333
-#: libraries/Util.class.php:4351 libraries/config.values.php:112
+#: libraries/Menu.class.php:459 libraries/Util.class.php:3344
+#: libraries/Util.class.php:3358 libraries/Util.class.php:4339
+#: libraries/Util.class.php:4357 libraries/config.values.php:112
 #: view_operations.php:92
 msgid "Operations"
 msgstr ""
 
 #: libraries/Menu.class.php:384 libraries/Menu.class.php:492
-#: libraries/Util.class.php:4338 libraries/Util.class.php:4352
+#: libraries/Util.class.php:4344 libraries/Util.class.php:4358
 #: libraries/relation.lib.php:255
 msgid "Tracking"
 msgstr ""
 
 #: libraries/Menu.class.php:397 libraries/Menu.class.php:486
-#: libraries/Util.class.php:4337 libraries/Util.class.php:4353
+#: libraries/Util.class.php:4343 libraries/Util.class.php:4359
 #: libraries/navigation/Nodes/Node_Trigger_Container.class.php:24
 #: libraries/plugins/export/ExportHtmlword.class.php:557
 #: libraries/plugins/export/ExportOdt.class.php:685
@@ -3858,16 +3869,16 @@ msgstr ""
 msgid "Database seems to be empty!"
 msgstr ""
 
-#: libraries/Menu.class.php:439 libraries/Util.class.php:4330
+#: libraries/Menu.class.php:439 libraries/Util.class.php:4336
 msgid "Query"
 msgstr ""
 
-#: libraries/Menu.class.php:472 libraries/Util.class.php:4335
+#: libraries/Menu.class.php:472 libraries/Util.class.php:4341
 #: libraries/rte/rte_words.lib.php:36
 msgid "Routines"
 msgstr ""
 
-#: libraries/Menu.class.php:479 libraries/Util.class.php:4336
+#: libraries/Menu.class.php:479 libraries/Util.class.php:4342
 #: libraries/navigation/Nodes/Node_Event_Container.class.php:26
 #: libraries/plugins/export/ExportSql.class.php:940
 #: libraries/plugins/export/ExportXml.class.php:107
@@ -3875,20 +3886,20 @@ msgstr ""
 msgid "Events"
 msgstr ""
 
-#: libraries/Menu.class.php:498 libraries/Util.class.php:4339
+#: libraries/Menu.class.php:498 libraries/Util.class.php:4345
 msgid "Designer"
 msgstr ""
 
-#: libraries/Menu.class.php:507 libraries/Util.class.php:4340
-#: templates/structure/check_all_tables.phtml:35
+#: libraries/Menu.class.php:507 libraries/Util.class.php:4346
+#: templates/database/structure/check_all_tables.phtml:35
 msgid "Central columns"
 msgstr ""
 
-#: libraries/Menu.class.php:544 libraries/Util.class.php:4312
+#: libraries/Menu.class.php:544 libraries/Util.class.php:4318
 #: libraries/config.values.php:103 libraries/config/messages.inc.php:266
 #: libraries/config/messages.inc.php:341
 #: libraries/navigation/NavigationTree.class.php:1239
-#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4332
+#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4358
 msgid "Databases"
 msgstr ""
 
@@ -3897,34 +3908,34 @@ msgid "User accounts"
 msgstr ""
 
 #: libraries/Menu.class.php:595 libraries/ServerStatusData.class.php:121
-#: libraries/Util.class.php:4319 libraries/server_common.lib.php:36
+#: libraries/Util.class.php:4325 libraries/server_common.lib.php:36
 msgid "Binary log"
 msgstr ""
 
 #: libraries/Menu.class.php:601 libraries/ServerStatusData.class.php:126
-#: libraries/Util.class.php:4320 libraries/server_common.lib.php:42
-#: templates/structure/body_for_table_summary.phtml:10
-#: templates/structure/table_header.phtml:27
+#: libraries/Util.class.php:4326 libraries/server_common.lib.php:42
+#: templates/database/structure/body_for_table_summary.phtml:10
+#: templates/database/structure/table_header.phtml:27
 msgid "Replication"
 msgstr ""
 
 #: libraries/Menu.class.php:606 libraries/ServerStatusData.class.php:193
-#: libraries/Util.class.php:4321 libraries/config.values.php:105
+#: libraries/Util.class.php:4327 libraries/config.values.php:105
 #: libraries/server_engines.lib.php:108 libraries/server_engines.lib.php:112
 #: libraries/sql_query_form.lib.php:421
 msgid "Variables"
 msgstr ""
 
-#: libraries/Menu.class.php:610 libraries/Util.class.php:4322
+#: libraries/Menu.class.php:610 libraries/Util.class.php:4328
 msgid "Charsets"
 msgstr ""
 
-#: libraries/Menu.class.php:615 libraries/Util.class.php:4323
+#: libraries/Menu.class.php:615 libraries/Util.class.php:4329
 #: libraries/server_common.lib.php:33 libraries/server_plugins.lib.php:27
 msgid "Plugins"
 msgstr ""
 
-#: libraries/Menu.class.php:626 libraries/Util.class.php:4324
+#: libraries/Menu.class.php:626 libraries/Util.class.php:4330
 msgid "Engines"
 msgstr ""
 
@@ -3949,7 +3960,7 @@ msgid_plural "%1$d rows inserted."
 msgstr[0] ""
 msgstr[1] ""
 
-#: libraries/PDF.class.php:70 libraries/Util.class.php:2521
+#: libraries/PDF.class.php:70 libraries/Util.class.php:2527
 #: libraries/browse_foreigners.lib.php:327
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:865
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:890
@@ -3970,7 +3981,7 @@ msgid "Could not save favorite table!"
 msgstr ""
 
 #: libraries/RecentFavoriteTable.class.php:212
-#: templates/structure/favorite_anchor.phtml:12
+#: templates/database/structure/favorite_anchor.phtml:12
 msgid "Remove from Favorites"
 msgstr ""
 
@@ -4135,7 +4146,7 @@ msgid ""
 msgstr ""
 
 #: libraries/StorageEngine.class.php:373
-#: templates/structure/body_for_table_summary.phtml:50
+#: templates/database/structure/body_for_table_summary.phtml:50
 #, php-format
 msgid "%s is the default storage engine on this MySQL server."
 msgstr ""
@@ -4547,10 +4558,10 @@ msgstr ""
 
 #: libraries/Util.class.php:726 libraries/rte/rte_events.lib.php:110
 #: libraries/rte/rte_events.lib.php:119 libraries/rte/rte_events.lib.php:150
-#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:153
-#: libraries/rte/rte_routines.lib.php:162
-#: libraries/rte/rte_routines.lib.php:235
-#: libraries/rte/rte_routines.lib.php:1366
+#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:223
+#: libraries/rte/rte_routines.lib.php:250
+#: libraries/rte/rte_routines.lib.php:372
+#: libraries/rte/rte_routines.lib.php:1457
 #: libraries/rte/rte_triggers.lib.php:86 libraries/rte/rte_triggers.lib.php:95
 #: libraries/rte/rte_triggers.lib.php:127
 msgid "MySQL said: "
@@ -4594,75 +4605,78 @@ msgstr "Dim"
 msgid "%B %d, %Y at %I:%M %p"
 msgstr ""
 
-#: libraries/Util.class.php:2019
+#: libraries/Util.class.php:2025
 #, php-format
 msgid "%s days, %s hours, %s minutes and %s seconds"
 msgstr ""
 
-#: libraries/Util.class.php:2112
+#: libraries/Util.class.php:2118
 msgid "Missing parameter:"
 msgstr ""
 
-#: libraries/Util.class.php:2645
+#: libraries/Util.class.php:2651
 #, php-format
 msgid "Jump to database \"%s\"."
 msgstr ""
 
-#: libraries/Util.class.php:2670
+#: libraries/Util.class.php:2676
 #, php-format
 msgid "The %s functionality is affected by a known bug, see %s"
 msgstr ""
 
-#: libraries/Util.class.php:2881
+#: libraries/Util.class.php:2887
 msgid "Click to toggle"
 msgstr ""
 
-#: libraries/Util.class.php:3542 prefs_manage.php:248
+#: libraries/Util.class.php:3548 prefs_manage.php:248
 msgid "Browse your computer:"
 msgstr ""
 
-#: libraries/Util.class.php:3567
+#: libraries/Util.class.php:3573
 #, php-format
 msgid "Select from the web server upload directory <b>%s</b>:"
 msgstr ""
 
-#: libraries/Util.class.php:3596 libraries/insert_edit.lib.php:1173
+#: libraries/Util.class.php:3602 libraries/insert_edit.lib.php:1171
 msgid "The directory you set for upload work cannot be reached."
 msgstr ""
 
-#: libraries/Util.class.php:3607
+#: libraries/Util.class.php:3613
 msgid "There are no files to upload!"
 msgstr ""
 
-#: libraries/Util.class.php:3632 libraries/Util.class.php:3633
-#: templates/structure/check_all_tables.phtml:15
+#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: templates/database/structure/check_all_tables.phtml:15
 msgid "Empty"
 msgstr ""
 
-#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: libraries/Util.class.php:3644 libraries/Util.class.php:3645
 msgid "Execute"
 msgstr ""
 
-#: libraries/Util.class.php:4152
+#: libraries/Util.class.php:4158
 msgid "Print"
 msgstr ""
 
-#: libraries/Util.class.php:4257 templates/structure/row_stats_table.phtml:80
-#: templates/structure/table_header.phtml:95
+#: libraries/Util.class.php:4263
+#: templates/database/structure/table_header.phtml:95
+#: templates/table/structure/row_stats_table.phtml:80
 msgid "Creation"
 msgstr ""
 
-#: libraries/Util.class.php:4263 templates/structure/row_stats_table.phtml:87
-#: templates/structure/table_header.phtml:106
+#: libraries/Util.class.php:4269
+#: templates/database/structure/table_header.phtml:106
+#: templates/table/structure/row_stats_table.phtml:87
 msgid "Last update"
 msgstr ""
 
-#: libraries/Util.class.php:4269 templates/structure/row_stats_table.phtml:94
-#: templates/structure/table_header.phtml:117
+#: libraries/Util.class.php:4275
+#: templates/database/structure/table_header.phtml:117
+#: templates/table/structure/row_stats_table.phtml:94
 msgid "Last check"
 msgstr ""
 
-#: libraries/Util.class.php:4315
+#: libraries/Util.class.php:4321
 msgid "Users"
 msgstr ""
 
@@ -4683,16 +4697,16 @@ msgid "Use this value"
 msgstr ""
 
 #: libraries/build_html_for_db.lib.php:33 libraries/import.lib.php:193
-#: templates/structure/actions_in_table_structure.phtml:113
-#: templates/structure/row_stats_table.phtml:42
-#: templates/structure/table_header.phtml:36
+#: templates/database/structure/table_header.phtml:36
+#: templates/table/structure/actions_in_table_structure.phtml:113
+#: templates/table/structure/row_stats_table.phtml:42
 msgid "Rows"
 msgstr ""
 
 #: libraries/build_html_for_db.lib.php:48 libraries/engines/innodb.lib.php:171
-#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:186
-#: libraries/server_status.lib.php:298
-#: templates/structure/display_table_stats.phtml:40
+#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:195
+#: libraries/server_status.lib.php:307
+#: templates/table/structure/display_table_stats.phtml:40
 msgid "Total"
 msgstr ""
 
@@ -4701,10 +4715,12 @@ msgid "Jump to database"
 msgstr ""
 
 #: libraries/build_html_for_db.lib.php:146
+#: templates/database/structure/structure_table_row.phtml:15
 msgid "Not replicated"
 msgstr ""
 
 #: libraries/build_html_for_db.lib.php:158
+#: templates/database/structure/structure_table_row.phtml:16
 msgid "Replicated"
 msgstr ""
 
@@ -4757,17 +4773,17 @@ msgstr ""
 #: libraries/plugins/export/ExportTexytext.class.php:425
 #: libraries/plugins/export/PMA_ExportPdf.class.php:307
 #: libraries/rte/rte_list.lib.php:73 libraries/rte/rte_list.lib.php:85
-#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:830
-#: libraries/rte/rte_routines.lib.php:1492 setup/frames/index.inc.php:162
+#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:921
+#: libraries/rte/rte_routines.lib.php:1583 setup/frames/index.inc.php:162
 #: templates/columns_definitions/table_fields_definitions.phtml:8
-#: templates/structure/table_structure_header.phtml:5
-#: templates/table/create_table.phtml:11
+#: templates/database/create_table.phtml:11
+#: templates/table/structure/table_structure_header.phtml:5
 msgid "Name"
 msgstr ""
 
 #: libraries/central_columns.lib.php:699
 #: libraries/central_columns.lib.php:1381
-#: libraries/rte/rte_routines.lib.php:832
+#: libraries/rte/rte_routines.lib.php:923
 #: templates/columns_definitions/table_fields_definitions.phtml:14
 msgid "Length/Values"
 msgstr ""
@@ -4786,7 +4802,7 @@ msgid "Select a table"
 msgstr ""
 
 #: libraries/central_columns.lib.php:804
-#: templates/structure/add_column.phtml:4
+#: templates/table/structure/add_column.phtml:4
 msgid "Add column"
 msgstr ""
 
@@ -4802,7 +4818,7 @@ msgstr ""
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1002
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1025
 #: templates/columns_definitions/table_fields_definitions.phtml:36
-#: templates/structure/table_structure_header.phtml:8
+#: templates/table/structure/table_structure_header.phtml:8
 msgid "Attributes"
 msgstr ""
 
@@ -4911,7 +4927,7 @@ msgid "Double click"
 msgstr ""
 
 #: libraries/config.values.php:95 libraries/config.values.php:124
-#: libraries/config/FormDisplay.tpl.php:221 libraries/relation.lib.php:97
+#: libraries/config/FormDisplay.tpl.php:232 libraries/relation.lib.php:97
 #: libraries/relation.lib.php:105
 msgid "Disabled"
 msgstr ""
@@ -5081,21 +5097,21 @@ msgstr ""
 msgid "maximum %s"
 msgstr ""
 
-#: libraries/config/FormDisplay.tpl.php:219
+#: libraries/config/FormDisplay.tpl.php:230
 msgid "This setting is disabled, it will not be applied to your configuration."
 msgstr ""
 
-#: libraries/config/FormDisplay.tpl.php:313
+#: libraries/config/FormDisplay.tpl.php:324
 #, php-format
 msgid "Set value: %s"
 msgstr ""
 
-#: libraries/config/FormDisplay.tpl.php:318
+#: libraries/config/FormDisplay.tpl.php:329
 #: libraries/config/messages.inc.php:610
 msgid "Restore default value"
 msgstr ""
 
-#: libraries/config/FormDisplay.tpl.php:332
+#: libraries/config/FormDisplay.tpl.php:343
 msgid "Allow users to customize this value"
 msgstr ""
 
@@ -5511,7 +5527,7 @@ msgstr ""
 
 #: libraries/config/messages.inc.php:136 libraries/config/messages.inc.php:152
 #: libraries/sql_query_form.lib.php:247
-#: templates/structure/row_stats_table.phtml:7
+#: templates/table/structure/row_stats_table.phtml:7
 msgid "Format"
 msgstr ""
 
@@ -6006,7 +6022,7 @@ msgstr ""
 
 #: libraries/config/messages.inc.php:332
 #: libraries/plugins/export/ExportPdf.class.php:279
-#: templates/structure/secondary_tabs.phtml:8
+#: templates/table/secondary_tabs.phtml:8
 msgid "Table structure"
 msgstr ""
 
@@ -7502,101 +7518,33 @@ msgstr ""
 msgid "OpenDocument Text"
 msgstr ""
 
-#: libraries/controllers/StructureController.class.php:465
+#: libraries/controllers/DatabaseStructureController.class.php:405
 #: tbl_operations.php:382
 #, php-format
 msgid "Table %s has been emptied."
 msgstr ""
 
-#: libraries/controllers/StructureController.class.php:486
+#: libraries/controllers/DatabaseStructureController.class.php:426
 #: tbl_operations.php:400 view_operations.php:119
 #, php-format
 msgid "View %s has been dropped."
 msgstr ""
 
-#: libraries/controllers/StructureController.class.php:487
+#: libraries/controllers/DatabaseStructureController.class.php:427
 #: tbl_operations.php:401
 #, php-format
 msgid "Table %s has been dropped."
 msgstr ""
 
-#: libraries/controllers/StructureController.class.php:797
-#, php-format
-msgid "The name '%s' is a MySQL reserved keyword."
-msgid_plural "The names '%s' are MySQL reserved keywords."
-msgstr[0] ""
-msgstr[1] ""
-
-#: libraries/controllers/StructureController.class.php:875
-msgid "No column selected."
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1049
+#: libraries/controllers/DatabaseStructureController.class.php:733
 msgid "Favorite List is full!"
 msgstr ""
 
-#: libraries/controllers/StructureController.class.php:1272
-msgid "The columns have been moved successfully."
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1535
-#, php-format
-msgid ""
-"Table %1$s has been altered successfully. Privileges have been adjusted."
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1541
-#: libraries/controllers/TableIndexesController.class.php:161
-#: tbl_addfield.php:92
-#, php-format
-msgid "Table %1$s has been altered successfully."
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1588
-#: libraries/tracking.lib.php:1094
-msgid "Query error"
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1806
+#: libraries/controllers/DatabaseStructureController.class.php:947
 #: libraries/mysql_charsets.lib.php:366 libraries/mysql_charsets.lib.php:373
 msgid "unknown"
 msgstr ""
 
-#: libraries/controllers/StructureController.class.php:1957
-#: templates/structure/check_all_table_column.phtml:11
-msgid "Change"
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1961
-#: libraries/controllers/StructureController.class.php:1966
-#: libraries/navigation/Nodes/Node_Index.class.php:30
-#: libraries/tracking.lib.php:926
-#: templates/columns_definitions/column_indexes.phtml:16
-#: templates/columns_definitions/table_fields_definitions.phtml:57
-#: templates/structure/check_all_table_column.phtml:30
-#: templates/structure/display_structure.phtml:79
-#: templates/structure/display_table_stats.phtml:19
-msgid "Index"
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1963
-#: libraries/controllers/StructureController.class.php:1968
-#: templates/columns_definitions/column_indexes.phtml:27
-#: templates/structure/check_all_table_column.phtml:37
-msgid "Spatial"
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1964
-#: libraries/controllers/StructureController.class.php:1969
-#: templates/columns_definitions/column_indexes.phtml:22
-#: templates/structure/check_all_table_column.phtml:47
-msgid "Fulltext"
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1970
-msgid "Distinct values"
-msgstr ""
-
 #: libraries/controllers/TableChartController.class.php:82
 #: libraries/controllers/TableGisVisualizationController.class.php:101
 msgid "No SQL query was set to fetch data."
@@ -7610,11 +7558,18 @@ msgstr ""
 msgid "No data to display"
 msgstr ""
 
-#: libraries/controllers/TableRelationController.class.php:217
+#: libraries/controllers/TableIndexesController.class.php:161
+#: libraries/controllers/TableStructureController.class.php:736
+#: tbl_addfield.php:92
+#, php-format
+msgid "Table %1$s has been altered successfully."
+msgstr ""
+
+#: libraries/controllers/TableRelationController.class.php:218
 msgid "Display column was successfully updated."
 msgstr ""
 
-#: libraries/controllers/TableRelationController.class.php:283
+#: libraries/controllers/TableRelationController.class.php:288
 msgid "Internal relations were successfully updated."
 msgstr ""
 
@@ -7627,10 +7582,71 @@ msgid "Zoom search"
 msgstr ""
 
 #: libraries/controllers/TableSearchController.class.php:852
-#: templates/table/selection_form.phtml:59
+#: templates/table/search/selection_form.phtml:59
 msgid "Find and replace"
 msgstr ""
 
+#: libraries/controllers/TableStructureController.class.php:163
+#, php-format
+msgid "The name '%s' is a MySQL reserved keyword."
+msgid_plural "The names '%s' are MySQL reserved keywords."
+msgstr[0] ""
+msgstr[1] ""
+
+#: libraries/controllers/TableStructureController.class.php:241
+msgid "No column selected."
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:467
+msgid "The columns have been moved successfully."
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:730
+#, php-format
+msgid ""
+"Table %1$s has been altered successfully. Privileges have been adjusted."
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:783
+#: libraries/tracking.lib.php:1094
+msgid "Query error"
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:948
+#: templates/table/structure/check_all_table_column.phtml:11
+msgid "Change"
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:952
+#: libraries/controllers/TableStructureController.class.php:957
+#: libraries/navigation/Nodes/Node_Index.class.php:30
+#: libraries/tracking.lib.php:926
+#: templates/columns_definitions/column_indexes.phtml:16
+#: templates/columns_definitions/table_fields_definitions.phtml:57
+#: templates/table/structure/check_all_table_column.phtml:30
+#: templates/table/structure/display_structure.phtml:79
+#: templates/table/structure/display_table_stats.phtml:19
+msgid "Index"
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:954
+#: libraries/controllers/TableStructureController.class.php:959
+#: templates/columns_definitions/column_indexes.phtml:27
+#: templates/table/structure/check_all_table_column.phtml:37
+msgid "Spatial"
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:955
+#: libraries/controllers/TableStructureController.class.php:960
+#: templates/columns_definitions/column_indexes.phtml:22
+#: templates/table/structure/check_all_table_column.phtml:47
+msgid "Fulltext"
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:963
+msgid "Distinct values"
+msgstr ""
+
 #: libraries/core.lib.php:306
 #, php-format
 msgid "The %s extension is missing. Please check your PHP configuration."
@@ -7675,7 +7691,7 @@ msgid "No Password"
 msgstr ""
 
 #: libraries/display_change_password.lib.php:68
-#: libraries/plugins/auth/AuthenticationCookie.class.php:199
+#: libraries/plugins/auth/AuthenticationCookie.class.php:187
 #: libraries/replication_gui.lib.php:422 libraries/replication_gui.lib.php:862
 #: libraries/server_privileges.lib.php:1640
 msgid "Password:"
@@ -8395,12 +8411,12 @@ msgid "Dump has been saved to file %s."
 msgstr ""
 
 #: libraries/import.lib.php:202 libraries/insert_edit.lib.php:124
-#: libraries/rte/rte_routines.lib.php:1353 libraries/sql.lib.php:1312
+#: libraries/rte/rte_routines.lib.php:1444 libraries/sql.lib.php:1306
 #: tbl_get_field.php:44
 msgid "MySQL returned an empty result set (i.e. zero rows)."
 msgstr ""
 
-#: libraries/import.lib.php:265 libraries/sql.lib.php:1326
+#: libraries/import.lib.php:265 libraries/sql.lib.php:1320
 msgid "[ROLLBACK occurred.]"
 msgstr ""
 
@@ -8464,14 +8480,14 @@ msgstr ""
 
 #: libraries/insert_edit.lib.php:233
 #: libraries/navigation/Nodes/Node_DatabaseChild.class.php:48
-#: templates/designer/table_list.phtml:40
+#: templates/database/designer/table_list.phtml:40
 msgid "Hide"
 msgstr ""
 
 #: libraries/insert_edit.lib.php:249
 #: libraries/navigation/Nodes/Node_Function.class.php:32
-#: libraries/rte/rte_routines.lib.php:1495
-#: templates/table/table_header.phtml:4
+#: libraries/rte/rte_routines.lib.php:1586
+#: templates/table/search/table_header.phtml:4
 msgid "Function"
 msgstr ""
 
@@ -8484,82 +8500,83 @@ msgstr ""
 msgid "Because of its length,<br /> this column might not be editable."
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1050
+#: libraries/insert_edit.lib.php:1048
 msgid "Binary - do not edit"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1176 libraries/server_privileges.lib.php:470
-#: templates/table/options.phtml:36
+#: libraries/insert_edit.lib.php:1174 libraries/server_privileges.lib.php:470
+#: templates/table/search/options.phtml:36
 msgid "Or"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1177
+#: libraries/insert_edit.lib.php:1175
 msgid "web server upload directory:"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1348 templates/table/input_box.phtml:49
+#: libraries/insert_edit.lib.php:1346
+#: templates/table/search/input_box.phtml:49
 msgid "Edit/Insert"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1398
+#: libraries/insert_edit.lib.php:1396
 #, php-format
 msgid "Continue insertion with %s rows"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1428
+#: libraries/insert_edit.lib.php:1426
 msgid "and then"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1461
+#: libraries/insert_edit.lib.php:1459
 msgid "Insert as new row"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1464
+#: libraries/insert_edit.lib.php:1462
 msgid "Insert as new row and ignore errors"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1467
+#: libraries/insert_edit.lib.php:1465
 msgid "Show insert query"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1487
+#: libraries/insert_edit.lib.php:1485
 msgid "Go back to previous page"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1490
+#: libraries/insert_edit.lib.php:1488
 msgid "Insert another new row"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1495
+#: libraries/insert_edit.lib.php:1493
 msgid "Go back to this page"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1518
+#: libraries/insert_edit.lib.php:1516
 msgid "Edit next row"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1540
+#: libraries/insert_edit.lib.php:1538
 msgid ""
 "Use TAB key to move from value to value, or CTRL+arrows to move anywhere"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1577 libraries/replication_gui.lib.php:542
-#: libraries/rte/rte_routines.lib.php:1497
+#: libraries/insert_edit.lib.php:1575 libraries/replication_gui.lib.php:542
+#: libraries/rte/rte_routines.lib.php:1588
 #: libraries/server_status_variables.lib.php:220
-#: templates/designer/having_query_panel.phtml:100
-#: templates/designer/options_panel.phtml:73
-#: templates/designer/options_panel.phtml:239
-#: templates/designer/where_query_panel.phtml:69
-#: templates/table/table_header.phtml:10
-#: templates/table/zoom_result_form.phtml:35
+#: templates/database/designer/having_query_panel.phtml:100
+#: templates/database/designer/options_panel.phtml:73
+#: templates/database/designer/options_panel.phtml:239
+#: templates/database/designer/where_query_panel.phtml:69
+#: templates/table/search/table_header.phtml:10
+#: templates/table/search/zoom_result_form.phtml:35
 msgid "Value"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1937 libraries/sql.lib.php:1309
+#: libraries/insert_edit.lib.php:1935 libraries/sql.lib.php:1303
 msgid "Showing SQL query"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1962 libraries/sql.lib.php:1287
+#: libraries/insert_edit.lib.php:1960 libraries/sql.lib.php:1281
 #, php-format
 msgid "Inserted row id: %1$d"
 msgstr ""
@@ -8966,7 +8983,7 @@ msgstr ""
 #: libraries/navigation/Nodes/Node_View_Container.class.php:26
 #: libraries/navigation/Nodes/Node_View_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:129
-#: templates/structure/show_create.phtml:30
+#: templates/database/structure/show_create.phtml:30
 msgid "Views"
 msgstr ""
 
@@ -9252,7 +9269,7 @@ msgstr ""
 
 #: libraries/operations.lib.php:101 libraries/operations.lib.php:249
 #: libraries/operations.lib.php:869 libraries/operations.lib.php:963
-#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:907
+#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:998
 #: templates/columns_definitions/table_fields_definitions.phtml:47
 msgid "Adjust Privileges"
 msgstr ""
@@ -9342,22 +9359,22 @@ msgid "Switch to copied table"
 msgstr ""
 
 #: libraries/operations.lib.php:1360
-#: templates/structure/check_all_tables.phtml:18
+#: templates/database/structure/check_all_tables.phtml:18
 msgid "Table maintenance"
 msgstr ""
 
 #: libraries/operations.lib.php:1398
-#: templates/structure/check_all_tables.phtml:19
+#: templates/database/structure/check_all_tables.phtml:19
 msgid "Analyze table"
 msgstr ""
 
 #: libraries/operations.lib.php:1413
-#: templates/structure/check_all_tables.phtml:20
+#: templates/database/structure/check_all_tables.phtml:20
 msgid "Check table"
 msgstr ""
 
 #: libraries/operations.lib.php:1428
-#: templates/structure/check_all_tables.phtml:22
+#: templates/database/structure/check_all_tables.phtml:22
 msgid "Checksum table"
 msgstr ""
 
@@ -9375,18 +9392,19 @@ msgid "Flush the table (FLUSH)"
 msgstr ""
 
 #: libraries/operations.lib.php:1477
-#: templates/structure/check_all_tables.phtml:23
-#: templates/structure/display_table_stats.phtml:56
+#: templates/database/structure/check_all_tables.phtml:23
+#: templates/table/structure/display_table_stats.phtml:56
 msgid "Optimize table"
 msgstr ""
 
 #: libraries/operations.lib.php:1492
-#: templates/structure/check_all_tables.phtml:24
+#: templates/database/structure/check_all_tables.phtml:24
 msgid "Repair table"
 msgstr ""
 
 #: libraries/operations.lib.php:1538
-#: templates/structure/check_all_tables.phtml:14 view_operations.php:127
+#: templates/database/structure/check_all_tables.phtml:14
+#: view_operations.php:127
 msgid "Delete data or table"
 msgstr ""
 
@@ -9507,7 +9525,7 @@ msgid "Cannot connect: invalid settings."
 msgstr ""
 
 #: libraries/plugins/auth/AuthenticationConfig.class.php:108
-#: libraries/plugins/auth/AuthenticationCookie.class.php:134
+#: libraries/plugins/auth/AuthenticationCookie.class.php:122
 #: libraries/plugins/auth/AuthenticationHttp.class.php:96
 #, php-format
 msgid "Welcome to %s"
@@ -9532,36 +9550,36 @@ msgstr ""
 msgid "Retry to connect"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:146
+#: libraries/plugins/auth/AuthenticationCookie.class.php:134
 msgid "Your session has expired. Please log in again."
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:170
+#: libraries/plugins/auth/AuthenticationCookie.class.php:158
 msgid "Log in"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:178
-#: libraries/plugins/auth/AuthenticationCookie.class.php:188
+#: libraries/plugins/auth/AuthenticationCookie.class.php:166
+#: libraries/plugins/auth/AuthenticationCookie.class.php:176
 msgid "You can enter hostname/IP address and port separated by space."
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:193
+#: libraries/plugins/auth/AuthenticationCookie.class.php:181
 msgid "Username:"
 msgstr "Uzantonomo:"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:205
+#: libraries/plugins/auth/AuthenticationCookie.class.php:193
 msgid "Server Choice:"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:386
+#: libraries/plugins/auth/AuthenticationCookie.class.php:374
 msgid "Entered captcha is wrong, try again!"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:396
+#: libraries/plugins/auth/AuthenticationCookie.class.php:384
 msgid "Please enter correct captcha!"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:423
+#: libraries/plugins/auth/AuthenticationCookie.class.php:411
 msgid "You are not allowed to log in to this MySQL server!"
 msgstr ""
 
@@ -9657,7 +9675,7 @@ msgstr ""
 #: libraries/plugins/export/ExportOdt.class.php:593
 #: libraries/plugins/export/ExportTexytext.class.php:428
 #: libraries/plugins/export/PMA_ExportPdf.class.php:313
-#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:984
 #: libraries/rte/rte_triggers.lib.php:377
 msgid "Definition"
 msgstr ""
@@ -9954,7 +9972,7 @@ msgid "Last check:"
 msgstr ""
 
 #: libraries/plugins/export/ExportSql.class.php:1399
-#: templates/structure/structure_table_row.phtml:183
+#: templates/database/structure/structure_table_row.phtml:183
 msgid "in use"
 msgstr ""
 
@@ -10134,18 +10152,14 @@ msgstr ""
 msgid "The imported file does not contain any data!"
 msgstr ""
 
-#: libraries/plugins/import/ImportSql.class.php:169
+#: libraries/plugins/import/ImportSql.class.php:72
 msgid "SQL compatibility mode:"
 msgstr ""
 
-#: libraries/plugins/import/ImportSql.class.php:181
+#: libraries/plugins/import/ImportSql.class.php:84
 msgid "Do not use <code>AUTO_INCREMENT</code> for zero values"
 msgstr ""
 
-#: libraries/plugins/import/ImportSql.class.php:195
-msgid "Read as multibytes"
-msgstr ""
-
 #: libraries/plugins/import/ImportXml.class.php:54
 msgid "XML"
 msgstr ""
@@ -10188,7 +10202,7 @@ msgid "Show grid"
 msgstr ""
 
 #: libraries/plugins/schema/SchemaPdf.class.php:94
-#: templates/structure/print_view_data_dictionary_link.phtml:6
+#: templates/database/structure/print_view_data_dictionary_link.phtml:6
 msgid "Data Dictionary"
 msgstr ""
 
@@ -10213,7 +10227,7 @@ msgid "The %s table doesn't exist!"
 msgstr ""
 
 #: libraries/plugins/schema/eps/Eps_Relation_Schema.class.php:321
-#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:309
+#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:323
 #, php-format
 msgid "Schema of the %s database - Page %s"
 msgstr ""
@@ -10239,7 +10253,7 @@ msgstr ""
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1005
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1028
 #: libraries/tracking.lib.php:884
-#: templates/structure/table_structure_header.phtml:11
+#: templates/table/structure/table_structure_header.phtml:11
 msgid "Extra"
 msgstr ""
 
@@ -10544,51 +10558,51 @@ msgstr ""
 msgid "Create the needed tables with the <code>%screate_tables.sql</code>."
 msgstr ""
 
-#: libraries/relation.lib.php:360
+#: libraries/relation.lib.php:357
 msgid "Create a pma user and give access to these tables."
 msgstr ""
 
-#: libraries/relation.lib.php:365
+#: libraries/relation.lib.php:360
 msgid ""
 "Enable advanced features in configuration file (<code>config.inc.php</"
 "code>), for example by starting from <code>config.sample.inc.php</code>."
 msgstr ""
 
-#: libraries/relation.lib.php:373
+#: libraries/relation.lib.php:365
 msgid "Re-login to phpMyAdmin to load the updated configuration file."
 msgstr ""
 
-#: libraries/relation.lib.php:1612
+#: libraries/relation.lib.php:1607
 msgid "no description"
 msgstr ""
 
-#: libraries/relation.lib.php:1811
+#: libraries/relation.lib.php:1806
 msgid ""
 "You do not have necessary privileges to create a database named "
 "'phpmyadmin'. You may go to 'Operations' tab of any database to set up the "
 "phpMyAdmin configuration storage there."
 msgstr ""
 
-#: libraries/relation.lib.php:1928
+#: libraries/relation.lib.php:1923
 #, php-format
 msgid ""
 "%sCreate%s a database named 'phpmyadmin' and setup the phpMyAdmin "
 "configuration storage there."
 msgstr ""
 
-#: libraries/relation.lib.php:1936
+#: libraries/relation.lib.php:1931
 #, php-format
 msgid ""
 "%sCreate%s the phpMyAdmin configuration storage in the current database."
 msgstr ""
 
-#: libraries/relation.lib.php:1944
+#: libraries/relation.lib.php:1939
 #, php-format
 msgid "%sCreate%s missing phpMyAdmin configuration storage tables."
 msgstr ""
 
 #: libraries/replication_gui.lib.php:46 libraries/replication_gui.lib.php:343
-#: libraries/server_databases.lib.php:387
+#: libraries/server_databases.lib.php:398
 msgid "Master replication"
 msgstr ""
 
@@ -10643,7 +10657,7 @@ msgid ""
 msgstr ""
 
 #: libraries/replication_gui.lib.php:141
-#: libraries/server_databases.lib.php:389
+#: libraries/server_databases.lib.php:400
 msgid "Slave replication"
 msgstr ""
 
@@ -10904,10 +10918,10 @@ msgid "Master server changed successfully to %s."
 msgstr ""
 
 #: libraries/rte/rte_events.lib.php:106 libraries/rte/rte_events.lib.php:115
-#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:149
-#: libraries/rte/rte_routines.lib.php:158
-#: libraries/rte/rte_routines.lib.php:231
-#: libraries/rte/rte_routines.lib.php:1362
+#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:219
+#: libraries/rte/rte_routines.lib.php:246
+#: libraries/rte/rte_routines.lib.php:368
+#: libraries/rte/rte_routines.lib.php:1453
 #: libraries/rte/rte_triggers.lib.php:82 libraries/rte/rte_triggers.lib.php:91
 #: libraries/rte/rte_triggers.lib.php:123
 #, php-format
@@ -10928,7 +10942,7 @@ msgstr ""
 msgid "Event %1$s has been created."
 msgstr ""
 
-#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:251
+#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:266
 #: libraries/rte/rte_triggers.lib.php:144
 msgid "One or more errors have occurred while processing your request:"
 msgstr ""
@@ -10937,7 +10951,7 @@ msgstr ""
 msgid "Edit event"
 msgstr ""
 
-#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:794
+#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:885
 #: libraries/rte/rte_triggers.lib.php:323 view_create.php:180
 msgid "Details"
 msgstr ""
@@ -10950,7 +10964,7 @@ msgstr ""
 msgid "Event type"
 msgstr ""
 
-#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:817
+#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:908
 #, php-format
 msgid "Change to %s"
 msgstr ""
@@ -10977,12 +10991,14 @@ msgstr ""
 msgid "On completion preserve"
 msgstr ""
 
-#: libraries/rte/rte_events.lib.php:491 libraries/rte/rte_routines.lib.php:930
+#: libraries/rte/rte_events.lib.php:491
+#: libraries/rte/rte_routines.lib.php:1021
 #: libraries/rte/rte_triggers.lib.php:383 view_create.php:209
 msgid "Definer"
 msgstr ""
 
-#: libraries/rte/rte_events.lib.php:535 libraries/rte/rte_routines.lib.php:997
+#: libraries/rte/rte_events.lib.php:535
+#: libraries/rte/rte_routines.lib.php:1088
 #: libraries/rte/rte_triggers.lib.php:422
 msgid "The definer must be in the \"username@hostname\" format!"
 msgstr ""
@@ -11008,9 +11024,9 @@ msgid "You must provide an event definition."
 msgstr ""
 
 #: libraries/rte/rte_export.lib.php:43 libraries/rte/rte_general.lib.php:72
-#: libraries/rte/rte_routines.lib.php:345
-#: libraries/rte/rte_routines.lib.php:1198
-#: libraries/rte/rte_routines.lib.php:1411
+#: libraries/rte/rte_routines.lib.php:153
+#: libraries/rte/rte_routines.lib.php:1289
+#: libraries/rte/rte_routines.lib.php:1502
 msgid "Error in processing request:"
 msgstr ""
 
@@ -11042,132 +11058,132 @@ msgid ""
 "problems."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:110
-#: libraries/rte/rte_routines.lib.php:1006
+#: libraries/rte/rte_routines.lib.php:123
+msgid "Edit routine"
+msgstr ""
+
+#: libraries/rte/rte_routines.lib.php:200
+#: libraries/rte/rte_routines.lib.php:1097
 #, php-format
 msgid "Invalid routine type: \"%s\""
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:170
-msgid "Sorry, we failed to restore the dropped routine."
-msgstr ""
-
-#: libraries/rte/rte_routines.lib.php:211
-#, php-format
-msgid "Routine %1$s has been modified. Privileges have been adjusted."
-msgstr ""
-
-#: libraries/rte/rte_routines.lib.php:216
-#, php-format
-msgid "Routine %1$s has been modified."
-msgstr ""
-
-#: libraries/rte/rte_routines.lib.php:238
+#: libraries/rte/rte_routines.lib.php:253
 #, php-format
 msgid "Routine %1$s has been created."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:315
-msgid "Edit routine"
+#: libraries/rte/rte_routines.lib.php:380
+msgid "Sorry, we failed to restore the dropped routine."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:797
+#: libraries/rte/rte_routines.lib.php:439
+#, php-format
+msgid "Routine %1$s has been modified. Privileges have been adjusted."
+msgstr ""
+
+#: libraries/rte/rte_routines.lib.php:444
+#, php-format
+msgid "Routine %1$s has been modified."
+msgstr ""
+
+#: libraries/rte/rte_routines.lib.php:888
 msgid "Routine name"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:823
+#: libraries/rte/rte_routines.lib.php:914
 msgid "Parameters"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:829
+#: libraries/rte/rte_routines.lib.php:920
 msgid "Direction"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:847
+#: libraries/rte/rte_routines.lib.php:938
 msgid "Add parameter"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:851
+#: libraries/rte/rte_routines.lib.php:942
 msgid "Remove last parameter"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:856
+#: libraries/rte/rte_routines.lib.php:947
 msgid "Return type"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:862
+#: libraries/rte/rte_routines.lib.php:953
 msgid "Return length/values"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:868
+#: libraries/rte/rte_routines.lib.php:959
 msgid "Return options"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:899
+#: libraries/rte/rte_routines.lib.php:990
 msgid "Is deterministic"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:920
+#: libraries/rte/rte_routines.lib.php:1011
 msgid ""
 "You do not have sufficient privileges to perform this operation; Please "
 "refer to the documentation for more details"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:935
+#: libraries/rte/rte_routines.lib.php:1026
 msgid "Security type"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:944
+#: libraries/rte/rte_routines.lib.php:1035
 msgid "SQL data access"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1013
+#: libraries/rte/rte_routines.lib.php:1104
 msgid "You must provide a routine name!"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1047
+#: libraries/rte/rte_routines.lib.php:1138
 #, php-format
 msgid "Invalid direction \"%s\" given for parameter."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1069
-#: libraries/rte/rte_routines.lib.php:1131
+#: libraries/rte/rte_routines.lib.php:1160
+#: libraries/rte/rte_routines.lib.php:1222
 msgid ""
 "You must provide length/values for routine parameters of type ENUM, SET, "
 "VARCHAR and VARBINARY."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1095
+#: libraries/rte/rte_routines.lib.php:1186
 msgid "You must provide a name and a type for each routine parameter."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1114
+#: libraries/rte/rte_routines.lib.php:1205
 msgid "You must provide a valid return type for the routine."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1174
+#: libraries/rte/rte_routines.lib.php:1265
 msgid "You must provide a routine definition."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1285
+#: libraries/rte/rte_routines.lib.php:1376
 #, php-format
 msgid "Execution results of routine %s"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1340
+#: libraries/rte/rte_routines.lib.php:1431
 #, php-format
 msgid "%d row affected by the last statement inside the procedure."
 msgid_plural "%d rows affected by the last statement inside the procedure."
 msgstr[0] ""
 msgstr[1] ""
 
-#: libraries/rte/rte_routines.lib.php:1398
-#: libraries/rte/rte_routines.lib.php:1406
+#: libraries/rte/rte_routines.lib.php:1489
+#: libraries/rte/rte_routines.lib.php:1497
 msgid "Execute routine"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1485
-#: libraries/rte/rte_routines.lib.php:1488
+#: libraries/rte/rte_routines.lib.php:1576
+#: libraries/rte/rte_routines.lib.php:1579
 msgid "Routine parameters"
 msgstr ""
 
@@ -11321,7 +11337,7 @@ msgid "Original position"
 msgstr ""
 
 #: libraries/server_bin_log.lib.php:133
-#: templates/structure/display_table_stats.phtml:4
+#: templates/table/structure/display_table_stats.phtml:4
 msgid "Information"
 msgstr ""
 
@@ -11357,12 +11373,12 @@ msgid ""
 "between the web server and the MySQL server."
 msgstr ""
 
-#: libraries/server_databases.lib.php:364
-#: libraries/server_databases.lib.php:365
+#: libraries/server_databases.lib.php:366
+#: libraries/server_databases.lib.php:371
 msgid "Enable Statistics"
 msgstr ""
 
-#: libraries/server_databases.lib.php:481
+#: libraries/server_databases.lib.php:492
 #, php-format
 msgid "%1$d database has been dropped successfully."
 msgid_plural "%1$d databases have been dropped successfully."
@@ -11722,7 +11738,7 @@ msgid "You have revoked the privileges for %s."
 msgstr ""
 
 #: libraries/server_privileges.lib.php:2059
-#: libraries/server_privileges.lib.php:4290
+#: libraries/server_privileges.lib.php:4316
 msgid "Add user account"
 msgstr ""
 
@@ -11885,53 +11901,53 @@ msgstr ""
 msgid "The privileges were reloaded successfully."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:3994
+#: libraries/server_privileges.lib.php:4003
 #, php-format
 msgid "The user %s already exists!"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4232
+#: libraries/server_privileges.lib.php:4258
 #, php-format
 msgid "Privileges for %s"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4241
+#: libraries/server_privileges.lib.php:4267
 #: libraries/server_status_processes.lib.php:72
 #: libraries/server_user_groups.lib.php:39
 msgid "User"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4282
+#: libraries/server_privileges.lib.php:4308
 msgctxt "Create new user"
 msgid "New"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4311
+#: libraries/server_privileges.lib.php:4337
 msgid "Edit privileges:"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4312
+#: libraries/server_privileges.lib.php:4338
 msgid "User account"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4371
+#: libraries/server_privileges.lib.php:4397
 msgid ""
 "Note: You are attempting to edit privileges of the user with which you are "
 "currently logged in."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4391 libraries/server_users.lib.php:25
+#: libraries/server_privileges.lib.php:4417 libraries/server_users.lib.php:25
 msgid "User accounts overview"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4459
+#: libraries/server_privileges.lib.php:4485
 msgid ""
 "A user account allowing any user from localhost to connect is present. This "
 "will prevent other users from connecting if the host part of their account "
 "allows a connection from any (%) host."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4500
+#: libraries/server_privileges.lib.php:4526
 #, php-format
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
@@ -11940,7 +11956,7 @@ msgid ""
 "%sreload the privileges%s before you continue."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4519
+#: libraries/server_privileges.lib.php:4545
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
 "tables. The content of these tables may differ from the privileges the "
@@ -11949,61 +11965,61 @@ msgid ""
 "privilege."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4569
+#: libraries/server_privileges.lib.php:4595
 msgid "The selected user was not found in the privilege table."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4801
+#: libraries/server_privileges.lib.php:4827
 msgid "You have added a new user."
 msgstr ""
 
-#: libraries/server_status.lib.php:53
+#: libraries/server_status.lib.php:60
 #, php-format
 msgid "Network traffic since startup: %s"
 msgstr ""
 
-#: libraries/server_status.lib.php:66
+#: libraries/server_status.lib.php:73
 #, php-format
 msgid "This MySQL server has been running for %1$s. It started up on %2$s."
 msgstr ""
 
-#: libraries/server_status.lib.php:80
+#: libraries/server_status.lib.php:94
 msgid ""
 "This MySQL server works as <b>master</b> and <b>slave</b> in <b>replication</"
 "b> process."
 msgstr ""
 
-#: libraries/server_status.lib.php:85
+#: libraries/server_status.lib.php:99
 msgid "This MySQL server works as <b>master</b> in <b>replication</b> process."
 msgstr ""
 
-#: libraries/server_status.lib.php:90
+#: libraries/server_status.lib.php:104
 msgid "This MySQL server works as <b>slave</b> in <b>replication</b> process."
 msgstr ""
 
-#: libraries/server_status.lib.php:106
+#: libraries/server_status.lib.php:116
 msgid "Replication status"
 msgstr ""
 
-#: libraries/server_status.lib.php:137
+#: libraries/server_status.lib.php:146
 msgid ""
 "On a busy server, the byte counters may overrun, so those statistics as "
 "reported by the MySQL server may be incorrect."
 msgstr ""
 
-#: libraries/server_status.lib.php:148
+#: libraries/server_status.lib.php:157
 msgid "Received"
 msgstr ""
 
-#: libraries/server_status.lib.php:167
+#: libraries/server_status.lib.php:176
 msgid "Sent"
 msgstr ""
 
-#: libraries/server_status.lib.php:234
+#: libraries/server_status.lib.php:243
 msgid "Max. concurrent connections"
 msgstr ""
 
-#: libraries/server_status.lib.php:244
+#: libraries/server_status.lib.php:253
 msgid "Failed attempts"
 msgstr ""
 
@@ -12923,7 +12939,7 @@ msgstr ""
 msgid "Not implemented yet."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/AlterOperation.php:193
+#: libraries/sql-parser/src/Components/AlterOperation.php:191
 msgid "Unrecognized alter operation."
 msgstr ""
 
@@ -12937,7 +12953,7 @@ msgid "An opening bracket followed by a set of values was expected."
 msgstr ""
 
 #: libraries/sql-parser/src/Components/ArrayObj.php:101
-#: libraries/sql-parser/src/Components/FieldDefinition.php:202
+#: libraries/sql-parser/src/Components/CreateDefinition.php:202
 msgid "An opening bracket was expected."
 msgstr ""
 
@@ -12945,25 +12961,33 @@ msgstr ""
 msgid "A comma or a closing bracket was expected"
 msgstr ""
 
+#: libraries/sql-parser/src/Components/CreateDefinition.php:246
+msgid "A comma or a closing bracket was expected."
+msgstr ""
+
+#: libraries/sql-parser/src/Components/CreateDefinition.php:262
+msgid "A closing bracket was expected."
+msgstr ""
+
 #: libraries/sql-parser/src/Components/DataType.php:125
 msgid "Unrecognized data type."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:225
+#: libraries/sql-parser/src/Components/Expression.php:227
 msgid "Unexpected closing bracket."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:246
-#: libraries/sql-parser/src/Components/Expression.php:283
-#: libraries/sql-parser/src/Components/Expression.php:303
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:285
+#: libraries/sql-parser/src/Components/Expression.php:305
 msgid "An alias was previously found."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:257
+#: libraries/sql-parser/src/Components/Expression.php:259
 msgid "Unexpected dot."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:327
+#: libraries/sql-parser/src/Components/Expression.php:329
 msgid "An alias was expected."
 msgstr ""
 
@@ -12971,14 +12995,6 @@ msgstr ""
 msgid "An expression was expected."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/FieldDefinition.php:246
-msgid "A comma or a closing bracket was expected."
-msgstr ""
-
-#: libraries/sql-parser/src/Components/FieldDefinition.php:262
-msgid "A closing bracket was expected."
-msgstr ""
-
 #: libraries/sql-parser/src/Components/Limit.php:90
 #: libraries/sql-parser/src/Components/Limit.php:112
 msgid "An offset was expected."
@@ -13018,24 +13034,24 @@ msgstr ""
 msgid "Expected delimiter."
 msgstr ""
 
-#: libraries/sql-parser/src/Lexer.php:753
+#: libraries/sql-parser/src/Lexer.php:777
 #, php-format
 msgid "Ending quote %1$s was expected."
 msgstr ""
 
-#: libraries/sql-parser/src/Lexer.php:789
+#: libraries/sql-parser/src/Lexer.php:813
 msgid "Variable name was expected."
 msgstr ""
 
-#: libraries/sql-parser/src/Parser.php:380
+#: libraries/sql-parser/src/Parser.php:391
 msgid "Unexpected beginning of statement."
 msgstr ""
 
-#: libraries/sql-parser/src/Parser.php:399
+#: libraries/sql-parser/src/Parser.php:410
 msgid "Unrecognized statement type."
 msgstr ""
 
-#: libraries/sql-parser/src/Parser.php:479
+#: libraries/sql-parser/src/Parser.php:489
 msgid "No transaction was previously started."
 msgstr ""
 
@@ -13061,7 +13077,7 @@ msgid "The name of the entity was expected."
 msgstr ""
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:310
-msgid "At least one field definition was expected."
+msgid "At least one column definition was expected."
 msgstr ""
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:329
@@ -13121,25 +13137,25 @@ msgstr ""
 msgid "Using bookmark \"%s\" as default browse query."
 msgstr ""
 
-#: libraries/sql.lib.php:1306
+#: libraries/sql.lib.php:1300
 msgid "Showing as PHP code"
 msgstr ""
 
-#: libraries/sql.lib.php:1638
+#: libraries/sql.lib.php:1632
 #, php-format
 msgid ""
 "Current selection does not contain a unique column. Grid edit, checkbox, "
 "Edit, Copy and Delete features are not available. %s"
 msgstr ""
 
-#: libraries/sql.lib.php:1649
+#: libraries/sql.lib.php:1643
 #, php-format
 msgid ""
 "Current selection does not contain a unique column. Grid edit, Edit, Copy "
 "and Delete features may result in undesired behavior. %s"
 msgstr ""
 
-#: libraries/sql.lib.php:1688
+#: libraries/sql.lib.php:1682
 #, php-format
 msgid "Problems with indexes of table `%s`"
 msgstr ""
@@ -13295,7 +13311,7 @@ msgid "Version %s snapshot (SQL code)"
 msgstr ""
 
 #: libraries/tracking.lib.php:947
-#: templates/structure/table_structure_row.phtml:33
+#: templates/table/structure/table_structure_row.phtml:33
 msgctxt "None for default"
 msgid "None"
 msgstr ""
@@ -13347,15 +13363,15 @@ msgstr ""
 msgid "Version %1$s was created, tracking for %2$s is active."
 msgstr ""
 
-#: libraries/user_preferences.inc.php:29
+#: libraries/user_preferences.inc.php:30
 msgid "Manage your settings"
 msgstr ""
 
-#: libraries/user_preferences.inc.php:46 prefs_manage.php:307
+#: libraries/user_preferences.inc.php:54 prefs_manage.php:307
 msgid "Configuration has been saved."
 msgstr ""
 
-#: libraries/user_preferences.inc.php:66
+#: libraries/user_preferences.inc.php:74
 #, php-format
 msgid ""
 "Your preferences will be saved for current session only. Storing them "
@@ -13727,7 +13743,7 @@ msgid "first"
 msgstr ""
 
 #: templates/columns_definitions/move_column.phtml:12
-#: templates/structure/add_column.phtml:21
+#: templates/table/structure/add_column.phtml:21
 #, php-format
 msgid "after %s"
 msgstr ""
@@ -13786,197 +13802,290 @@ msgstr ""
 msgid "Input transformation options"
 msgstr ""
 
-#: templates/designer/aggregate_query_panel.phtml:22
-#: templates/designer/options_panel.phtml:100
-msgid "Aggregate"
-msgstr ""
-
-#: templates/designer/aggregate_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:61
-#: templates/designer/options_panel.phtml:106
-#: templates/designer/options_panel.phtml:170
-#: templates/designer/where_query_panel.phtml:30
-#: templates/table/table_header.phtml:9
-msgid "Operator"
-msgstr ""
-
-#: templates/designer/database_tables.phtml:29
-msgid "Toggle"
-msgstr ""
-
-#: templates/designer/database_tables.phtml:40
-msgid "See table structure"
-msgstr ""
-
-#: templates/designer/delete_relation_panel.phtml:21
-msgid "Delete relation"
-msgstr ""
-
-#: templates/designer/edit_delete_pages.phtml:7
-msgid "Page to open"
-msgstr ""
-
-#: templates/designer/edit_delete_pages.phtml:7
-msgid "Page to delete"
-msgstr ""
-
-#: templates/designer/having_query_panel.phtml:90
-#: templates/designer/options_panel.phtml:63
-#: templates/designer/options_panel.phtml:229
-#: templates/designer/where_query_panel.phtml:59
-msgid "Except"
-msgstr ""
-
-#: templates/designer/having_query_panel.phtml:102
-#: templates/designer/options_panel.phtml:75
-#: templates/designer/options_panel.phtml:241
-#: templates/designer/where_query_panel.phtml:71
-msgid "subquery"
-msgstr ""
-
-#: templates/designer/new_relation_panel.phtml:22
-#: templates/designer/side_menu.phtml:84 templates/designer/side_menu.phtml:87
-msgid "Create relation"
-msgstr ""
-
-#: templates/designer/options_panel.phtml:34
-#: templates/designer/options_panel.phtml:200
-msgid "Relation operator"
-msgstr ""
-
-#: templates/designer/options_panel.phtml:85
-#: templates/designer/rename_to_panel.phtml:23
-msgid "Rename to"
-msgstr ""
-
-#: templates/designer/options_panel.phtml:91
-#: templates/designer/rename_to_panel.phtml:31
-msgid "New name"
-msgstr ""
-
-#: templates/designer/page_save_as.phtml:4
-msgid "Save to selected page"
-msgstr ""
-
-#: templates/designer/page_save_as.phtml:5
-msgid "Create a page and save to it"
-msgstr ""
-
-#: templates/designer/page_save_as.phtml:26
-msgid "New page name"
-msgstr ""
-
-#: templates/designer/page_selector.phtml:2
-msgid "Select page"
-msgstr ""
-
-#: templates/designer/query_details.phtml:10
-msgid "Active options"
-msgstr ""
-
-#: templates/designer/schema_export.phtml:4
-msgid "Select Export Relational Type"
-msgstr ""
-
-#: templates/designer/side_menu.phtml:19 templates/designer/side_menu.phtml:25
-msgid "Show/Hide tables list"
-msgstr ""
-
-#: templates/designer/side_menu.phtml:29 templates/designer/side_menu.phtml:35
-#: templates/designer/side_menu.phtml:36
-msgid "View in fullscreen"
-msgstr ""
-
-#: templates/designer/side_menu.phtml:34
-msgid "Exit fullscreen"
-msgstr ""
-
-#: templates/designer/side_menu.phtml:41 templates/designer/side_menu.phtml:45
-msgid "New page"
-msgstr ""
-
-#: templates/designer/side_menu.phtml:70 templates/designer/side_menu.phtml:73
-msgid "Delete pages"
-msgstr ""
-
-#: templates/designer/side_menu.phtml:77 templates/designer/side_menu.phtml:80
-#: templates/table/create_table.phtml:7
+#: templates/database/create_table.phtml:7
+#: templates/database/designer/side_menu.phtml:77
+#: templates/database/designer/side_menu.phtml:80
 msgid "Create table"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:98
-#: templates/designer/side_menu.phtml:101
+#: templates/database/create_table.phtml:15
+msgid "Number of columns"
+msgstr ""
+
+#: templates/database/designer/aggregate_query_panel.phtml:22
+#: templates/database/designer/options_panel.phtml:100
+msgid "Aggregate"
+msgstr ""
+
+#: templates/database/designer/aggregate_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:61
+#: templates/database/designer/options_panel.phtml:106
+#: templates/database/designer/options_panel.phtml:170
+#: templates/database/designer/where_query_panel.phtml:30
+#: templates/table/search/table_header.phtml:9
+msgid "Operator"
+msgstr ""
+
+#: templates/database/designer/database_tables.phtml:29
+msgid "Toggle"
+msgstr ""
+
+#: templates/database/designer/database_tables.phtml:40
+msgid "See table structure"
+msgstr ""
+
+#: templates/database/designer/delete_relation_panel.phtml:21
+msgid "Delete relation"
+msgstr ""
+
+#: templates/database/designer/edit_delete_pages.phtml:7
+msgid "Page to open"
+msgstr ""
+
+#: templates/database/designer/edit_delete_pages.phtml:7
+msgid "Page to delete"
+msgstr ""
+
+#: templates/database/designer/having_query_panel.phtml:90
+#: templates/database/designer/options_panel.phtml:63
+#: templates/database/designer/options_panel.phtml:229
+#: templates/database/designer/where_query_panel.phtml:59
+msgid "Except"
+msgstr ""
+
+#: templates/database/designer/having_query_panel.phtml:102
+#: templates/database/designer/options_panel.phtml:75
+#: templates/database/designer/options_panel.phtml:241
+#: templates/database/designer/where_query_panel.phtml:71
+msgid "subquery"
+msgstr ""
+
+#: templates/database/designer/new_relation_panel.phtml:22
+#: templates/database/designer/side_menu.phtml:84
+#: templates/database/designer/side_menu.phtml:87
+msgid "Create relation"
+msgstr ""
+
+#: templates/database/designer/options_panel.phtml:34
+#: templates/database/designer/options_panel.phtml:200
+msgid "Relation operator"
+msgstr ""
+
+#: templates/database/designer/options_panel.phtml:85
+#: templates/database/designer/rename_to_panel.phtml:23
+msgid "Rename to"
+msgstr ""
+
+#: templates/database/designer/options_panel.phtml:91
+#: templates/database/designer/rename_to_panel.phtml:31
+msgid "New name"
+msgstr ""
+
+#: templates/database/designer/page_save_as.phtml:4
+msgid "Save to selected page"
+msgstr ""
+
+#: templates/database/designer/page_save_as.phtml:5
+msgid "Create a page and save to it"
+msgstr ""
+
+#: templates/database/designer/page_save_as.phtml:26
+msgid "New page name"
+msgstr ""
+
+#: templates/database/designer/page_selector.phtml:2
+msgid "Select page"
+msgstr ""
+
+#: templates/database/designer/query_details.phtml:10
+msgid "Active options"
+msgstr ""
+
+#: templates/database/designer/schema_export.phtml:4
+msgid "Select Export Relational Type"
+msgstr ""
+
+#: templates/database/designer/side_menu.phtml:19
+#: templates/database/designer/side_menu.phtml:25
+msgid "Show/Hide tables list"
+msgstr ""
+
+#: templates/database/designer/side_menu.phtml:29
+#: templates/database/designer/side_menu.phtml:35
+#: templates/database/designer/side_menu.phtml:36
+msgid "View in fullscreen"
+msgstr ""
+
+#: templates/database/designer/side_menu.phtml:34
+msgid "Exit fullscreen"
+msgstr ""
+
+#: templates/database/designer/side_menu.phtml:41
+#: templates/database/designer/side_menu.phtml:45
+msgid "New page"
+msgstr ""
+
+#: templates/database/designer/side_menu.phtml:70
+#: templates/database/designer/side_menu.phtml:73
+msgid "Delete pages"
+msgstr ""
+
+#: templates/database/designer/side_menu.phtml:98
+#: templates/database/designer/side_menu.phtml:101
 msgid "Reload"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:107
-#: templates/designer/side_menu.phtml:110
+#: templates/database/designer/side_menu.phtml:107
+#: templates/database/designer/side_menu.phtml:110
 msgid "Help"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Angular links"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Direct links"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:122
-#: templates/designer/side_menu.phtml:124
+#: templates/database/designer/side_menu.phtml:122
+#: templates/database/designer/side_menu.phtml:124
 msgid "Snap to grid"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:128
-#: templates/designer/side_menu.phtml:134
+#: templates/database/designer/side_menu.phtml:128
+#: templates/database/designer/side_menu.phtml:134
 msgid "Small/Big All"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:138
-#: templates/designer/side_menu.phtml:141
+#: templates/database/designer/side_menu.phtml:138
+#: templates/database/designer/side_menu.phtml:141
 msgid "Toggle small/big"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:145
-#: templates/designer/side_menu.phtml:148
+#: templates/database/designer/side_menu.phtml:145
+#: templates/database/designer/side_menu.phtml:148
 msgid "Toggle relation lines"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:153
-#: templates/designer/side_menu.phtml:156
+#: templates/database/designer/side_menu.phtml:153
+#: templates/database/designer/side_menu.phtml:156
 msgid "Export schema"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:165
-#: templates/designer/side_menu.phtml:168
+#: templates/database/designer/side_menu.phtml:165
+#: templates/database/designer/side_menu.phtml:168
 msgid "Build Query"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:173
-#: templates/designer/side_menu.phtml:177
+#: templates/database/designer/side_menu.phtml:173
+#: templates/database/designer/side_menu.phtml:177
 msgid "Move Menu"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:181
-#: templates/designer/side_menu.phtml:186
+#: templates/database/designer/side_menu.phtml:181
+#: templates/database/designer/side_menu.phtml:186
 msgid "Pin text"
 msgstr ""
 
-#: templates/designer/table_list.phtml:4
+#: templates/database/designer/table_list.phtml:4
 msgid "Hide/Show all"
 msgstr ""
 
-#: templates/designer/table_list.phtml:14
+#: templates/database/designer/table_list.phtml:14
 msgid "Hide/Show Tables with no relation"
 msgstr ""
 
-#: templates/designer/table_list.phtml:59
+#: templates/database/designer/table_list.phtml:59
 msgid "Number of tables:"
 msgstr ""
 
+#: templates/database/structure/body_for_table_summary.phtml:6
+#, php-format
+msgid "%s table"
+msgid_plural "%s tables"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templates/database/structure/body_for_table_summary.phtml:17
+msgid "Sum"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:6
+msgid "Check tables having overhead"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:10
+msgid "Show create"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:27
+msgid "Prefix"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:28
+msgid "Add prefix to table"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:29
+msgid "Replace table prefix"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:30
+msgid "Copy table with prefix"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:36
+msgid "Add columns to central list"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:37
+msgid "Remove columns from central list"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:38
+msgid "Make consistent with central list"
+msgstr ""
+
+#: templates/database/structure/favorite_anchor.phtml:12
+msgid "Add to Favorites"
+msgstr ""
+
+#: templates/database/structure/show_create.phtml:2
+msgid "Showing create queries"
+msgstr ""
+
+#: templates/database/structure/sortable_header.phtml:13
+msgid "Sort"
+msgstr ""
+
+#: templates/database/structure/table_header.phtml:42
+msgid ""
+"May be approximate. Click on the number to get the exact count. See "
+"[doc@faq3-11]FAQ 3.11[/doc]."
+msgstr ""
+
+#: templates/database/structure/table_header.phtml:66
+#: templates/table/index_form.phtml:127
+msgid "Size"
+msgstr ""
+
+#: templates/database/structure/table_header.phtml:74
+#: templates/table/structure/display_table_stats.phtml:27
+msgid "Overhead"
+msgstr ""
+
+#: templates/database/structure/tracking_icon.phtml:4
+msgid "Tracking is active."
+msgstr ""
+
+#: templates/database/structure/tracking_icon.phtml:8
+msgid "Tracking is not active."
+msgstr ""
+
 #: templates/error/report_form.phtml:7
 msgid ""
 "phpMyAdmin has encountered an error. We have collected data about this error "
@@ -13992,61 +14101,6 @@ msgstr ""
 msgid "Please explain the steps that lead to the error:"
 msgstr ""
 
-#: templates/gis_visualization/gis_visualization.phtml:3
-msgid "Display GIS Visualization"
-msgstr ""
-
-#: templates/gis_visualization/gis_visualization.phtml:8
-msgid "Label column"
-msgstr ""
-
-#: templates/gis_visualization/gis_visualization.phtml:11
-msgid "-- None --"
-msgstr "-- Neniu --"
-
-#: templates/gis_visualization/gis_visualization.phtml:19
-msgid "Spatial column"
-msgstr ""
-
-#: templates/index_form.phtml:16
-msgid "Index name:"
-msgstr ""
-
-#: templates/index_form.phtml:19
-msgid ""
-"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
-msgstr ""
-
-#: templates/index_form.phtml:40
-msgid "Index choice:"
-msgstr ""
-
-#: templates/index_form.phtml:57
-msgid "Key block size:"
-msgstr ""
-
-#: templates/index_form.phtml:74
-msgid "Index type:"
-msgstr ""
-
-#: templates/index_form.phtml:86
-#, fuzzy
-#| msgid "Password:"
-msgid "Parser:"
-msgstr "Pasvorto:"
-
-#: templates/index_form.phtml:102
-msgid "Comment:"
-msgstr ""
-
-#: templates/index_form.phtml:127 templates/structure/table_header.phtml:66
-msgid "Size"
-msgstr ""
-
-#: templates/index_form.phtml:149 templates/index_form.phtml:190
-msgid "Drag to reorder"
-msgstr ""
-
 #: templates/prefs_autoload.phtml:9
 msgid ""
 "Your browser has phpMyAdmin configuration for this domain. Would you like to "
@@ -14057,402 +14111,371 @@ msgstr ""
 msgid "Start row:"
 msgstr ""
 
-#: templates/structure/actions_in_table_structure.phtml:14
-#, php-format
-msgid "A primary key has been added on %s."
-msgstr ""
-
-#: templates/structure/actions_in_table_structure.phtml:34
-#: templates/structure/actions_in_table_structure.phtml:54
-#: templates/structure/actions_in_table_structure.phtml:79
-#: templates/structure/actions_in_table_structure.phtml:101
-#, php-format
-msgid "An index has been added on %s."
-msgstr ""
-
-#: templates/structure/actions_in_table_structure.phtml:130
-#: templates/structure/check_all_table_column.phtml:59
-msgid "Remove from central columns"
-msgstr ""
-
-#: templates/structure/actions_in_table_structure.phtml:138
-#: templates/structure/check_all_table_column.phtml:55
-msgid "Add to central columns"
-msgstr ""
-
-#: templates/structure/add_column.phtml:7
-#, php-format
-msgid "Add %s column(s)"
-msgstr ""
-
-#: templates/structure/add_column.phtml:12
-msgid "at beginning of table"
-msgstr ""
-
-#: templates/structure/body_for_table_summary.phtml:6
-#, php-format
-msgid "%s table"
-msgid_plural "%s tables"
-msgstr[0] ""
-msgstr[1] ""
-
-#: templates/structure/body_for_table_summary.phtml:17
-msgid "Sum"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:6
-msgid "Check tables having overhead"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:10
-msgid "Show create"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:27
-msgid "Prefix"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:28
-msgid "Add prefix to table"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:29
-msgid "Replace table prefix"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:30
-msgid "Copy table with prefix"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:36
-msgid "Add columns to central list"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:37
-msgid "Remove columns from central list"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:38
-msgid "Make consistent with central list"
-msgstr ""
-
-#: templates/structure/display_structure.phtml:140 view_create.php:181
-msgid "Edit view"
-msgstr ""
-
-#: templates/structure/display_table_stats.phtml:9
-msgid "Space usage"
-msgstr ""
-
-#: templates/structure/display_table_stats.phtml:27
-#: templates/structure/table_header.phtml:74
-msgid "Overhead"
-msgstr ""
-
-#: templates/structure/display_table_stats.phtml:32
-msgid "Effective"
-msgstr ""
-
-#: templates/structure/favorite_anchor.phtml:12
-msgid "Add to Favorites"
-msgstr ""
-
-#: templates/structure/move_columns_dialog.phtml:1
-#: templates/structure/optional_action_links.phtml:21
-msgid "Move columns"
-msgstr ""
-
-#: templates/structure/move_columns_dialog.phtml:2
-msgid "Move the columns by dragging them up and down."
-msgstr ""
-
-#: templates/structure/optional_action_links.phtml:9
-msgid "Propose table structure"
-msgstr ""
-
-#: templates/structure/optional_action_links.phtml:24
-msgid "Improve table structure"
-msgstr ""
-
-#: templates/structure/optional_action_links.phtml:30
-msgid "Track view"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:3
-msgid "Row statistics"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:9
-msgid "static"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:11
-msgid "dynamic"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:22
-msgid "partitioned"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:54
-msgid "Row length"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:66
-msgid "Row size"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:73
-msgid "Next autoindex"
-msgstr ""
-
-#: templates/structure/secondary_tabs.phtml:14
-msgid "Relation view"
-msgstr ""
-
-#: templates/structure/show_create.phtml:2
-msgid "Showing create queries"
-msgstr ""
-
-#: templates/structure/sortable_header.phtml:13
-msgid "Sort"
-msgstr ""
-
-#: templates/structure/table_header.phtml:42
-msgid ""
-"May be approximate. Click on the number to get the exact count. See "
-"[doc@faq3-11]FAQ 3.11[/doc]."
-msgstr ""
-
-#: templates/structure/table_structure_row.phtml:46
-#, php-format
-msgid "Column %s has been dropped."
-msgstr ""
-
-#: templates/structure/tracking_icon.phtml:4
-msgid "Tracking is active."
-msgstr ""
-
-#: templates/structure/tracking_icon.phtml:8
-msgid "Tracking is not active."
-msgstr ""
-
-#: templates/table/create_table.phtml:15
-msgid "Number of columns"
-msgstr ""
-
-#: templates/table/options.phtml:8
-msgid "Select columns (at least one):"
-msgstr ""
-
-#: templates/table/options.phtml:37
-msgid "Add search conditions (body of the \"where\" clause):"
-msgstr ""
-
-#: templates/table/options.phtml:45
-msgid "Number of rows per page"
-msgstr ""
-
-#: templates/table/options.phtml:56
-msgid "Display order:"
-msgstr ""
-
-#: templates/table/options_zoom.phtml:6
-msgid "Use this column to label each point"
-msgstr ""
-
-#: templates/table/options_zoom.phtml:35
-msgid "Maximum rows to plot"
-msgstr ""
-
-#: templates/table/replace_preview.phtml:13
-msgid "Find and replace - preview"
-msgstr ""
-
-#: templates/table/replace_preview.phtml:18
-msgid "Original string"
-msgstr ""
-
-#: templates/table/replace_preview.phtml:19
-msgid "Replaced string"
-msgstr ""
-
-#: templates/table/replace_preview.phtml:40
-msgid "Replace"
-msgstr ""
-
-#: templates/table/rows_zoom.phtml:16
-msgid "Additional search criteria"
-msgstr ""
-
-#: templates/table/search_and_replace.phtml:3
-msgid "Replace with:"
-msgstr ""
-
-#: templates/table/search_and_replace.phtml:22
-msgid "Use regular expression"
-msgstr ""
-
-#: templates/table/selection_form.phtml:12
-msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
-msgstr ""
-
-#: templates/table/selection_form.phtml:34
-msgid "Do a \"query by example\" (wildcard: \"%\")"
-msgstr ""
-
-#: templates/table/zoom_result_form.phtml:7
-msgid "Browse/Edit the points"
-msgstr ""
-
-#: templates/table/zoom_result_form.phtml:15
-msgid "How to use"
-msgstr ""
-
-#: templates/table/zoom_result_form.phtml:23
-msgid "Reset zoom"
-msgstr ""
-
-#: templates/tbl_chart.phtml:17
+#: templates/table/chart/tbl_chart.phtml:17
 msgctxt "Chart type"
 msgid "Bar"
 msgstr ""
 
-#: templates/tbl_chart.phtml:21
+#: templates/table/chart/tbl_chart.phtml:21
 msgctxt "Chart type"
 msgid "Column"
 msgstr ""
 
-#: templates/tbl_chart.phtml:25
+#: templates/table/chart/tbl_chart.phtml:25
 msgctxt "Chart type"
 msgid "Line"
 msgstr ""
 
-#: templates/tbl_chart.phtml:29
+#: templates/table/chart/tbl_chart.phtml:29
 msgctxt "Chart type"
 msgid "Spline"
 msgstr ""
 
-#: templates/tbl_chart.phtml:33
+#: templates/table/chart/tbl_chart.phtml:33
 msgctxt "Chart type"
 msgid "Area"
 msgstr ""
 
-#: templates/tbl_chart.phtml:37
+#: templates/table/chart/tbl_chart.phtml:37
 msgctxt "Chart type"
 msgid "Pie"
 msgstr ""
 
-#: templates/tbl_chart.phtml:41
+#: templates/table/chart/tbl_chart.phtml:41
 msgctxt "Chart type"
 msgid "Timeline"
 msgstr "Templinio"
 
-#: templates/tbl_chart.phtml:45
+#: templates/table/chart/tbl_chart.phtml:45
 msgctxt "Chart type"
 msgid "Scatter"
 msgstr ""
 
-#: templates/tbl_chart.phtml:50
+#: templates/table/chart/tbl_chart.phtml:50
 msgid "Stacked"
 msgstr ""
 
-#: templates/tbl_chart.phtml:53
+#: templates/table/chart/tbl_chart.phtml:53
 msgid "Chart title"
 msgstr ""
 
-#: templates/tbl_chart.phtml:57
+#: templates/table/chart/tbl_chart.phtml:57
 msgid "X-Axis:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:72
+#: templates/table/chart/tbl_chart.phtml:72
 msgid "Series:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:102
+#: templates/table/chart/tbl_chart.phtml:102
 msgid "X-Axis label:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:104
+#: templates/table/chart/tbl_chart.phtml:104
 msgid "X Values"
 msgstr ""
 
-#: templates/tbl_chart.phtml:107
+#: templates/table/chart/tbl_chart.phtml:107
 msgid "Y-Axis label:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:115
+#: templates/table/chart/tbl_chart.phtml:115
 msgid "Series names are in a column"
 msgstr ""
 
-#: templates/tbl_chart.phtml:118
+#: templates/table/chart/tbl_chart.phtml:118
 msgid "Series column:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:130
+#: templates/table/chart/tbl_chart.phtml:130
 msgid "Value Column:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:150
+#: templates/table/chart/tbl_chart.phtml:150
 msgid "Save chart as image"
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:7
+#: templates/table/gis_visualization/gis_visualization.phtml:3
+msgid "Display GIS Visualization"
+msgstr ""
+
+#: templates/table/gis_visualization/gis_visualization.phtml:8
+msgid "Label column"
+msgstr ""
+
+#: templates/table/gis_visualization/gis_visualization.phtml:11
+msgid "-- None --"
+msgstr "-- Neniu --"
+
+#: templates/table/gis_visualization/gis_visualization.phtml:19
+msgid "Spatial column"
+msgstr ""
+
+#: templates/table/index_form.phtml:16
+msgid "Index name:"
+msgstr ""
+
+#: templates/table/index_form.phtml:19
+msgid ""
+"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
+msgstr ""
+
+#: templates/table/index_form.phtml:40
+msgid "Index choice:"
+msgstr ""
+
+#: templates/table/index_form.phtml:57
+msgid "Key block size:"
+msgstr ""
+
+#: templates/table/index_form.phtml:74
+msgid "Index type:"
+msgstr ""
+
+#: templates/table/index_form.phtml:86
+#, fuzzy
+#| msgid "Password:"
+msgid "Parser:"
+msgstr "Pasvorto:"
+
+#: templates/table/index_form.phtml:102
+msgid "Comment:"
+msgstr ""
+
+#: templates/table/index_form.phtml:149 templates/table/index_form.phtml:190
+msgid "Drag to reorder"
+msgstr ""
+
+#: templates/table/relation/common_form.phtml:7
 msgid "Internal relations"
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:11
+#: templates/table/relation/common_form.phtml:11
 msgid "Internal relation"
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:14
+#: templates/table/relation/common_form.phtml:14
 msgid ""
 "An internal relation is not necessary when a corresponding FOREIGN KEY "
 "relation exists."
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:37
+#: templates/table/relation/common_form.phtml:37
 msgid "Foreign key constraints"
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:40
+#: templates/table/relation/common_form.phtml:40
 msgid "Actions"
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:41
+#: templates/table/relation/common_form.phtml:41
 msgid "Constraint properties"
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:44
+#: templates/table/relation/common_form.phtml:44
 msgid ""
 "Only columns with index will be displayed. You can define an index below."
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:49
+#: templates/table/relation/common_form.phtml:49
 msgid "Foreign key constraint"
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:81
+#: templates/table/relation/common_form.phtml:81
 msgid "+ Add constraint"
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:91
+#: templates/table/relation/common_form.phtml:91
 msgid "Choose column to display:"
 msgstr ""
 
-#: templates/tbl_relation/foreign_key_row.phtml:13
+#: templates/table/relation/foreign_key_row.phtml:13
 #, php-format
 msgid "Foreign key constraint %s has been dropped"
 msgstr ""
 
-#: templates/tbl_relation/foreign_key_row.phtml:102
+#: templates/table/relation/foreign_key_row.phtml:102
 msgid "Constraint name"
 msgstr ""
 
-#: templates/tbl_relation/foreign_key_row.phtml:157
+#: templates/table/relation/foreign_key_row.phtml:157
 msgid "+ Add column"
 msgstr ""
 
+#: templates/table/search/options.phtml:8
+msgid "Select columns (at least one):"
+msgstr ""
+
+#: templates/table/search/options.phtml:37
+msgid "Add search conditions (body of the \"where\" clause):"
+msgstr ""
+
+#: templates/table/search/options.phtml:45
+msgid "Number of rows per page"
+msgstr ""
+
+#: templates/table/search/options.phtml:56
+msgid "Display order:"
+msgstr ""
+
+#: templates/table/search/options_zoom.phtml:6
+msgid "Use this column to label each point"
+msgstr ""
+
+#: templates/table/search/options_zoom.phtml:35
+msgid "Maximum rows to plot"
+msgstr ""
+
+#: templates/table/search/replace_preview.phtml:13
+msgid "Find and replace - preview"
+msgstr ""
+
+#: templates/table/search/replace_preview.phtml:18
+msgid "Original string"
+msgstr ""
+
+#: templates/table/search/replace_preview.phtml:19
+msgid "Replaced string"
+msgstr ""
+
+#: templates/table/search/replace_preview.phtml:40
+msgid "Replace"
+msgstr ""
+
+#: templates/table/search/rows_zoom.phtml:16
+msgid "Additional search criteria"
+msgstr ""
+
+#: templates/table/search/search_and_replace.phtml:3
+msgid "Replace with:"
+msgstr ""
+
+#: templates/table/search/search_and_replace.phtml:22
+msgid "Use regular expression"
+msgstr ""
+
+#: templates/table/search/selection_form.phtml:12
+msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
+msgstr ""
+
+#: templates/table/search/selection_form.phtml:34
+msgid "Do a \"query by example\" (wildcard: \"%\")"
+msgstr ""
+
+#: templates/table/search/zoom_result_form.phtml:7
+msgid "Browse/Edit the points"
+msgstr ""
+
+#: templates/table/search/zoom_result_form.phtml:15
+msgid "How to use"
+msgstr ""
+
+#: templates/table/search/zoom_result_form.phtml:23
+msgid "Reset zoom"
+msgstr ""
+
+#: templates/table/secondary_tabs.phtml:14
+msgid "Relation view"
+msgstr ""
+
+#: templates/table/structure/actions_in_table_structure.phtml:14
+#, php-format
+msgid "A primary key has been added on %s."
+msgstr ""
+
+#: templates/table/structure/actions_in_table_structure.phtml:34
+#: templates/table/structure/actions_in_table_structure.phtml:54
+#: templates/table/structure/actions_in_table_structure.phtml:79
+#: templates/table/structure/actions_in_table_structure.phtml:101
+#, php-format
+msgid "An index has been added on %s."
+msgstr ""
+
+#: templates/table/structure/actions_in_table_structure.phtml:130
+#: templates/table/structure/check_all_table_column.phtml:59
+msgid "Remove from central columns"
+msgstr ""
+
+#: templates/table/structure/actions_in_table_structure.phtml:138
+#: templates/table/structure/check_all_table_column.phtml:55
+msgid "Add to central columns"
+msgstr ""
+
+#: templates/table/structure/add_column.phtml:7
+#, php-format
+msgid "Add %s column(s)"
+msgstr ""
+
+#: templates/table/structure/add_column.phtml:12
+msgid "at beginning of table"
+msgstr ""
+
+#: templates/table/structure/display_structure.phtml:140 view_create.php:181
+msgid "Edit view"
+msgstr ""
+
+#: templates/table/structure/display_table_stats.phtml:9
+msgid "Space usage"
+msgstr ""
+
+#: templates/table/structure/display_table_stats.phtml:32
+msgid "Effective"
+msgstr ""
+
+#: templates/table/structure/move_columns_dialog.phtml:1
+#: templates/table/structure/optional_action_links.phtml:21
+msgid "Move columns"
+msgstr ""
+
+#: templates/table/structure/move_columns_dialog.phtml:2
+msgid "Move the columns by dragging them up and down."
+msgstr ""
+
+#: templates/table/structure/optional_action_links.phtml:9
+msgid "Propose table structure"
+msgstr ""
+
+#: templates/table/structure/optional_action_links.phtml:24
+msgid "Improve table structure"
+msgstr ""
+
+#: templates/table/structure/optional_action_links.phtml:30
+msgid "Track view"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:3
+msgid "Row statistics"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:9
+msgid "static"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:11
+msgid "dynamic"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:22
+msgid "partitioned"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:54
+msgid "Row length"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:66
+msgid "Row size"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:73
+msgid "Next autoindex"
+msgstr ""
+
+#: templates/table/structure/table_structure_row.phtml:46
+#, php-format
+msgid "Column %s has been dropped."
+msgstr ""
+
 #: themes.php:17 themes.php:22
 msgid "Theme"
 msgstr ""
diff --git a/po/es.po b/po/es.po
index 98351442ba..bda151373d 100644
--- a/po/es.po
+++ b/po/es.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 4.5.0-dev\n"
 "Report-Msgid-Bugs-To: developers@phpmyadmin.net\n"
-"POT-Creation-Date: 2015-08-08 13:53-0400\n"
+"POT-Creation-Date: 2015-08-12 08:10-0400\n"
 "PO-Revision-Date: 2015-07-31 19:42+0200\n"
 "Last-Translator: Franco <fulanodetal.github@openaliasbox.org>\n"
 "Language-Team: Spanish <https://hosted.weblate.org/projects/phpmyadmin/"
@@ -53,7 +53,7 @@ msgid "Table comments:"
 msgstr "Comentarios de la tabla:"
 
 #: db_datadict.php:104 libraries/Index.class.php:699
-#: libraries/insert_edit.lib.php:1567
+#: libraries/insert_edit.lib.php:1565
 #: libraries/navigation/Nodes/Node_Column.class.php:30
 #: libraries/plugins/export/ExportHtmlword.class.php:280
 #: libraries/plugins/export/ExportHtmlword.class.php:375
@@ -67,13 +67,14 @@ msgstr "Comentarios de la tabla:"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1023
 #: libraries/tracking.lib.php:879 libraries/tracking.lib.php:975
 #: templates/columns_definitions/column_name.phtml:18
-#: templates/index_form.phtml:124 templates/table/table_header.phtml:6
-#: templates/table/zoom_result_form.phtml:33
-#: templates/tbl_relation/common_form.phtml:10
-#: templates/tbl_relation/common_form.phtml:43
-#: templates/tbl_relation/foreign_key_row.phtml:194
-#: templates/tbl_relation/foreign_key_row.phtml:206
-#: templates/tbl_relation/internal_relational_row.phtml:71
+#: templates/table/index_form.phtml:124
+#: templates/table/relation/common_form.phtml:10
+#: templates/table/relation/common_form.phtml:43
+#: templates/table/relation/foreign_key_row.phtml:194
+#: templates/table/relation/foreign_key_row.phtml:206
+#: templates/table/relation/internal_relational_row.phtml:71
+#: templates/table/search/table_header.phtml:6
+#: templates/table/search/zoom_result_form.phtml:33
 msgid "Column"
 msgstr "Columna"
 
@@ -91,21 +92,21 @@ msgstr "Columna"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1001
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1024
 #: libraries/rte/rte_list.lib.php:75 libraries/rte/rte_list.lib.php:103
-#: libraries/rte/rte_routines.lib.php:802
-#: libraries/rte/rte_routines.lib.php:831
-#: libraries/rte/rte_routines.lib.php:1493
+#: libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_routines.lib.php:922
+#: libraries/rte/rte_routines.lib.php:1584
 #: libraries/server_privileges.lib.php:2369 libraries/tracking.lib.php:880
 #: libraries/tracking.lib.php:972
 #: templates/columns_definitions/table_fields_definitions.phtml:11
-#: templates/structure/table_header.phtml:48
-#: templates/structure/table_structure_header.phtml:6
-#: templates/table/table_header.phtml:7
+#: templates/database/structure/table_header.phtml:48
+#: templates/table/search/table_header.phtml:7
+#: templates/table/structure/table_structure_header.phtml:6
 msgid "Type"
 msgstr "Tipo"
 
 #: db_datadict.php:106 libraries/Index.class.php:702
 #: libraries/central_columns.lib.php:708
-#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1576
+#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1574
 #: libraries/plugins/export/ExportHtmlword.class.php:286
 #: libraries/plugins/export/ExportHtmlword.class.php:381
 #: libraries/plugins/export/ExportLatex.class.php:509
@@ -118,8 +119,8 @@ msgstr "Tipo"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1026
 #: libraries/tracking.lib.php:882 libraries/tracking.lib.php:978
 #: templates/columns_definitions/table_fields_definitions.phtml:39
-#: templates/structure/table_structure_header.phtml:9
-#: templates/table/zoom_result_form.phtml:34
+#: templates/table/search/zoom_result_form.phtml:34
+#: templates/table/structure/table_structure_header.phtml:9
 msgid "Null"
 msgstr "Nulo"
 
@@ -137,8 +138,8 @@ msgstr "Nulo"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1027
 #: libraries/replication_gui.lib.php:153 libraries/tracking.lib.php:883
 #: templates/columns_definitions/table_fields_definitions.phtml:25
-#: templates/structure/body_for_table_summary.phtml:55
-#: templates/structure/table_structure_header.phtml:10
+#: templates/database/structure/body_for_table_summary.phtml:55
+#: templates/table/structure/table_structure_header.phtml:10
 msgid "Default"
 msgstr "Predeterminado"
 
@@ -166,19 +167,19 @@ msgid "Comments"
 msgstr "Comentarios"
 
 #: db_datadict.php:146
-#: libraries/controllers/StructureController.class.php:1960
-#: libraries/controllers/StructureController.class.php:1965
+#: libraries/controllers/TableStructureController.class.php:951
+#: libraries/controllers/TableStructureController.class.php:956
 #: libraries/tracking.lib.php:922
 #: templates/columns_definitions/column_indexes.phtml:6
-#: templates/structure/check_all_table_column.phtml:22
-#: templates/structure/display_structure.phtml:74
+#: templates/table/structure/check_all_table_column.phtml:22
+#: templates/table/structure/display_structure.phtml:74
 msgid "Primary"
 msgstr "Primaria"
 
 #: db_datadict.php:156 js/messages.php:317 libraries/Index.class.php:567
 #: libraries/Index.class.php:606 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261 libraries/mult_submits.lib.php:403
+#: libraries/config/FormDisplay.tpl.php:272 libraries/mult_submits.lib.php:403
 #: libraries/mult_submits.lib.php:417
 #: libraries/plugins/export/ExportHtmlword.class.php:630
 #: libraries/plugins/export/ExportLatex.class.php:589
@@ -194,20 +195,20 @@ msgstr "Primaria"
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1010 libraries/tracking.lib.php:1015
 #: prefs_manage.php:140 templates/prefs_autoload.phtml:15
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "No"
 msgstr "No"
 
 #: db_datadict.php:156 js/messages.php:443 libraries/Index.class.php:568
 #: libraries/Index.class.php:605 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261
-#: libraries/controllers/StructureController.class.php:1344
-#: libraries/controllers/StructureController.class.php:2223
-#: libraries/controllers/StructureController.class.php:2232
-#: libraries/controllers/StructureController.class.php:2237
-#: libraries/controllers/StructureController.class.php:2242
-#: libraries/controllers/StructureController.class.php:2247
+#: libraries/config/FormDisplay.tpl.php:272
+#: libraries/controllers/TableStructureController.class.php:539
+#: libraries/controllers/TableStructureController.class.php:1201
+#: libraries/controllers/TableStructureController.class.php:1210
+#: libraries/controllers/TableStructureController.class.php:1215
+#: libraries/controllers/TableStructureController.class.php:1220
+#: libraries/controllers/TableStructureController.class.php:1225
 #: libraries/mult_submits.inc.php:82 libraries/mult_submits.inc.php:178
 #: libraries/mult_submits.lib.php:339 libraries/mult_submits.lib.php:372
 #: libraries/mult_submits.lib.php:401 libraries/mult_submits.lib.php:415
@@ -216,8 +217,8 @@ msgstr "No"
 #: libraries/plugins/export/ExportOdt.class.php:756
 #: libraries/plugins/export/ExportTexytext.class.php:567
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1077
-#: libraries/server_databases.lib.php:464
-#: libraries/server_databases.lib.php:474
+#: libraries/server_databases.lib.php:475
+#: libraries/server_databases.lib.php:485
 #: libraries/server_privileges.lib.php:2546
 #: libraries/server_privileges.lib.php:2727
 #: libraries/server_privileges.lib.php:2748
@@ -227,7 +228,7 @@ msgstr "No"
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1008 libraries/tracking.lib.php:1013
 #: prefs_manage.php:138 templates/prefs_autoload.phtml:14
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "Yes"
 msgstr "Sí"
 
@@ -237,7 +238,7 @@ msgstr "Ver el volcado (esquema) de la base de datos"
 
 #: db_export.php:37 db_tracking.php:90 export.php:382
 #: libraries/DBQbe.class.php:326
-#: libraries/controllers/StructureController.class.php:231
+#: libraries/controllers/DatabaseStructureController.class.php:170
 #: libraries/navigation/NavigationTree.class.php:897
 msgid "No tables found in database."
 msgstr "No se han encontrado tablas en la base de datos."
@@ -248,14 +249,14 @@ msgstr "No se han encontrado tablas en la base de datos."
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:26
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:120
-#: templates/structure/show_create.phtml:18
+#: templates/database/structure/show_create.phtml:18
 msgid "Tables"
 msgstr "Tablas"
 
 #: db_export.php:52 libraries/Menu.class.php:317 libraries/Menu.class.php:425
-#: libraries/Util.class.php:3333 libraries/Util.class.php:3343
-#: libraries/Util.class.php:3349 libraries/Util.class.php:3629
-#: libraries/Util.class.php:4327 libraries/Util.class.php:4344
+#: libraries/Util.class.php:3339 libraries/Util.class.php:3349
+#: libraries/Util.class.php:3355 libraries/Util.class.php:3635
+#: libraries/Util.class.php:4333 libraries/Util.class.php:4350
 #: libraries/central_columns.lib.php:728 libraries/config.values.php:39
 #: libraries/config.values.php:47 libraries/config.values.php:109
 #: libraries/config.values.php:115 libraries/config/setup.forms.php:323
@@ -269,7 +270,7 @@ msgstr "Tablas"
 #: libraries/navigation/Nodes/Node_Table.class.php:283
 #: libraries/server_privileges.lib.php:1141 libraries/tracking.lib.php:874
 #: templates/columns_definitions/table_fields_definitions.phtml:3
-#: templates/designer/table_list.phtml:28
+#: templates/database/designer/table_list.phtml:28
 msgid "Structure"
 msgstr "Estructura"
 
@@ -281,7 +282,7 @@ msgstr "Estructura"
 #: libraries/config/user_preferences.forms.php:292
 #: libraries/config/user_preferences.forms.php:297
 #: libraries/server_privileges.lib.php:1140
-#: templates/structure/display_table_stats.phtml:12
+#: templates/table/structure/display_table_stats.phtml:12
 msgid "Data"
 msgstr "Datos"
 
@@ -355,10 +356,10 @@ msgstr "Tablas con seguimiento"
 #: libraries/server_privileges.lib.php:2908
 #: libraries/server_privileges.lib.php:3145
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4346
-#: templates/structure/table_header.phtml:21
-#: templates/tbl_relation/foreign_key_row.phtml:176
-#: templates/tbl_relation/internal_relational_row.phtml:63
+#: libraries/server_privileges.lib.php:4372
+#: templates/database/structure/table_header.phtml:21
+#: templates/table/relation/foreign_key_row.phtml:176
+#: templates/table/relation/internal_relational_row.phtml:63
 msgid "Table"
 msgstr "Tabla"
 
@@ -375,7 +376,7 @@ msgid "Updated"
 msgstr "Actualizado"
 
 #: db_tracking.php:130 js/messages.php:243 libraries/Menu.class.php:552
-#: libraries/Util.class.php:4314 libraries/config.values.php:104
+#: libraries/Util.class.php:4320 libraries/config.values.php:104
 #: libraries/rte/rte_events.lib.php:393 libraries/rte/rte_list.lib.php:101
 #: libraries/server_status_processes.lib.php:92 libraries/tracking.lib.php:279
 msgid "Status"
@@ -384,14 +385,15 @@ msgstr "Estado actual"
 #: db_tracking.php:131 db_tracking.php:290 libraries/Index.class.php:693
 #: libraries/central_columns.lib.php:687 libraries/rte/rte_list.lib.php:74
 #: libraries/rte/rte_list.lib.php:89 libraries/rte/rte_list.lib.php:102
-#: libraries/server_databases.lib.php:398
+#: libraries/server_databases.lib.php:409
 #: libraries/server_privileges.lib.php:2372
 #: libraries/server_privileges.lib.php:3166
 #: libraries/server_privileges.lib.php:3342
 #: libraries/server_user_groups.lib.php:82
 #: libraries/server_variables.lib.php:189 libraries/tracking.lib.php:280
-#: libraries/tracking.lib.php:793 templates/structure/table_header.phtml:30
-#: templates/structure/table_structure_header.phtml:23
+#: libraries/tracking.lib.php:793
+#: templates/database/structure/table_header.phtml:30
+#: templates/table/structure/table_structure_header.phtml:23
 msgid "Action"
 msgstr "Acción"
 
@@ -433,7 +435,7 @@ msgid "Untracked tables"
 msgstr "Tablas sin seguimiento"
 
 #: db_tracking.php:305 db_tracking.php:336
-#: templates/structure/optional_action_links.phtml:17
+#: templates/table/structure/optional_action_links.phtml:17
 msgid "Track table"
 msgstr "Hacer seguimiento a la tabla"
 
@@ -489,7 +491,7 @@ msgid "Value for the column \"%s\""
 msgstr "Valor para la columna \"%s\""
 
 #: gis_data_editor.php:146
-#: templates/gis_visualization/gis_visualization.phtml:37
+#: templates/table/gis_visualization/gis_visualization.phtml:37
 msgid "Use OpenStreetMaps as Base Layer"
 msgstr "Utilizar OpenStreetMaps como capa base"
 
@@ -569,35 +571,35 @@ msgstr "Agregar geometría"
 #: libraries/display_change_password.lib.php:162
 #: libraries/display_export.lib.php:402 libraries/display_export.lib.php:408
 #: libraries/display_import.lib.php:392 libraries/index.lib.php:44
-#: libraries/insert_edit.lib.php:1546 libraries/insert_edit.lib.php:1583
+#: libraries/insert_edit.lib.php:1544 libraries/insert_edit.lib.php:1581
 #: libraries/normalization.lib.php:165 libraries/normalization.lib.php:821
 #: libraries/operations.lib.php:38 libraries/operations.lib.php:108
 #: libraries/operations.lib.php:263 libraries/operations.lib.php:306
 #: libraries/operations.lib.php:801 libraries/operations.lib.php:874
 #: libraries/operations.lib.php:923 libraries/operations.lib.php:1337
 #: libraries/operations.lib.php:1658
-#: libraries/plugins/auth/AuthenticationCookie.class.php:244
+#: libraries/plugins/auth/AuthenticationCookie.class.php:232
 #: libraries/replication_gui.lib.php:122 libraries/replication_gui.lib.php:161
 #: libraries/replication_gui.lib.php:324 libraries/replication_gui.lib.php:461
 #: libraries/replication_gui.lib.php:906 libraries/rte/rte_events.lib.php:509
-#: libraries/rte/rte_routines.lib.php:969
-#: libraries/rte/rte_routines.lib.php:1581
+#: libraries/rte/rte_routines.lib.php:1060
+#: libraries/rte/rte_routines.lib.php:1672
 #: libraries/rte/rte_triggers.lib.php:396 libraries/server_bin_log.lib.php:61
 #: libraries/server_privileges.lib.php:705
 #: libraries/server_privileges.lib.php:2106
 #: libraries/server_privileges.lib.php:2872
 #: libraries/server_privileges.lib.php:3553
-#: libraries/server_privileges.lib.php:4627
+#: libraries/server_privileges.lib.php:4653
 #: libraries/server_user_groups.lib.php:285
 #: libraries/sql_query_form.lib.php:369 libraries/sql_query_form.lib.php:429
 #: libraries/tracking.lib.php:533 libraries/tracking.lib.php:653
 #: prefs_manage.php:277 prefs_manage.php:355
 #: templates/columns_definitions/column_definitions_form.phtml:59
-#: templates/header_location.phtml:17 templates/index_form.phtml:238
+#: templates/database/create_table.phtml:21 templates/header_location.phtml:28
 #: templates/startAndNumberOfRowsPanel.phtml:14
-#: templates/structure/add_column.phtml:25
-#: templates/table/create_table.phtml:21
-#: templates/table/selection_form.phtml:75 view_create.php:275
+#: templates/table/index_form.phtml:238
+#: templates/table/search/selection_form.phtml:75
+#: templates/table/structure/add_column.phtml:25 view_create.php:275
 #: view_operations.php:106
 msgid "Go"
 msgstr "Continuar"
@@ -690,7 +692,7 @@ msgid "Could not load import plugins, please check your installation!"
 msgstr ""
 "No se pudieron cargar los plugins de importación. ¡Revise su instalación!"
 
-#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1466
+#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1460
 #, php-format
 msgid "Bookmark %s has been created."
 msgstr "Se creó el favorito %s."
@@ -729,11 +731,11 @@ msgstr "No se pudo cargar el progreso de la importación."
 msgid "Back"
 msgstr "Volver"
 
-#: index.php:148 libraries/Footer.class.php:70
+#: index.php:149 libraries/Footer.class.php:70
 msgid "phpMyAdmin Demo Server"
 msgstr "Servidor phpMyAdmin de demostración"
 
-#: index.php:152
+#: index.php:153
 #, php-format
 msgid ""
 "You are using the demo server. You can do anything here, but please do not "
@@ -744,110 +746,110 @@ msgstr ""
 "aquí, pero no modifique los usuarios root, debian-sys-maint y pma. Puede "
 "encontrar más información en %s."
 
-#: index.php:162
+#: index.php:163
 msgid "General Settings"
 msgstr "Configuraciones generales"
 
-#: index.php:190 libraries/display_change_password.lib.php:50
+#: index.php:191 libraries/display_change_password.lib.php:50
 #: libraries/display_change_password.lib.php:53 user_password.php:247
 msgid "Change password"
 msgstr "Cambio de contraseña"
 
-#: index.php:206
+#: index.php:207
 msgid "Server connection collation"
 msgstr "Cotejamiento de la conexión al servidor"
 
-#: index.php:228
+#: index.php:229
 msgid "Appearance Settings"
 msgstr "Configuraciones de apariencia"
 
-#: index.php:258 prefs_manage.php:285
+#: index.php:259 prefs_manage.php:285
 msgid "More settings"
 msgstr "Más configuraciones"
 
-#: index.php:279
+#: index.php:280
 msgid "Database server"
 msgstr "Servidor de base de datos"
 
-#: index.php:282 libraries/plugins/auth/AuthenticationCookie.class.php:181
+#: index.php:283 libraries/plugins/auth/AuthenticationCookie.class.php:169
 msgid "Server:"
 msgstr "Servidor:"
 
-#: index.php:286
+#: index.php:287
 msgid "Server type:"
 msgstr "Tipo de servidor:"
 
-#: index.php:290 libraries/plugins/export/ExportLatex.class.php:212
+#: index.php:291 libraries/plugins/export/ExportLatex.class.php:212
 #: libraries/plugins/export/ExportSql.class.php:687
 #: libraries/plugins/export/ExportXml.class.php:189
 msgid "Server version:"
 msgstr "Versión del servidor:"
 
-#: index.php:296
+#: index.php:297
 msgid "Protocol version:"
 msgstr "Versión del protocolo:"
 
-#: index.php:300
+#: index.php:301
 msgid "User:"
 msgstr "Usuario:"
 
-#: index.php:305
+#: index.php:306
 msgid "Server charset:"
 msgstr "Conjunto de caracteres del servidor:"
 
-#: index.php:320
+#: index.php:321
 msgid "Web server"
 msgstr "Servidor web"
 
-#: index.php:331
+#: index.php:332
 msgid "Database client version:"
 msgstr "Versión del cliente de base de datos:"
 
-#: index.php:335
+#: index.php:336
 msgid "PHP extension:"
 msgstr "extensión PHP:"
 
-#: index.php:349
+#: index.php:350
 msgid "PHP version:"
 msgstr "Versión de PHP:"
 
-#: index.php:360
+#: index.php:361
 msgid "Show PHP information"
 msgstr "Mostrar la información de PHP"
 
-#: index.php:383
+#: index.php:384
 msgid "Version information:"
 msgstr "Acerca de esta versión:"
 
-#: index.php:392 libraries/Util.class.php:432 libraries/Util.class.php:495
-#: libraries/config/FormDisplay.tpl.php:151
+#: index.php:393 libraries/Util.class.php:432 libraries/Util.class.php:495
+#: libraries/config/FormDisplay.tpl.php:162
 #: libraries/display_export.lib.php:577 libraries/engines/pbxt.lib.php:162
 #: libraries/navigation/NavigationHeader.class.php:196
 #: libraries/server_variables.lib.php:160
 msgid "Documentation"
 msgstr "Documentación"
 
-#: index.php:399
+#: index.php:400
 msgid "Wiki"
 msgstr "Wiki"
 
-#: index.php:408
+#: index.php:409
 msgid "Official Homepage"
 msgstr "Página oficial de phpMyAdmin"
 
-#: index.php:415
+#: index.php:416
 msgid "Contribute"
 msgstr "Contribuir"
 
-#: index.php:422
+#: index.php:423
 msgid "Get support"
 msgstr "Obtener soporte"
 
-#: index.php:429
+#: index.php:430
 msgid "List of changes"
 msgstr "Lista de cambios"
 
-#: index.php:451
+#: index.php:452
 msgid ""
 "You are connected as 'root' with no password, which corresponds to the "
 "default MySQL privileged account. Your MySQL server is running with this "
@@ -861,7 +863,7 @@ msgstr ""
 "phpMyAdmin seleccione Privilegios y agregue la contraseña a root@localhost. "
 "Deberá escribir la misma contraseña en config.inc.php de phpMyAdmin."
 
-#: index.php:468
+#: index.php:469
 msgid ""
 "You have enabled mbstring.func_overload in your PHP configuration. This "
 "option is incompatible with phpMyAdmin and might cause some data to be "
@@ -871,7 +873,7 @@ msgstr ""
 "opción es incompatible con phpMyAdmin y podría causar la pérdida de algunos "
 "datos!"
 
-#: index.php:483
+#: index.php:484
 msgid ""
 "The mbstring PHP extension was not found and you seem to be using a "
 "multibyte charset. Without the mbstring extension phpMyAdmin is unable to "
@@ -881,7 +883,7 @@ msgstr ""
 "tipografía multibyte. phpMyAdmin no puede cortar correctamente las cadenas "
 "de caracteres sin la extensión mbstring y podría dar resultados inesperados."
 
-#: index.php:500
+#: index.php:501
 msgid ""
 "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini."
 "session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower than "
@@ -893,7 +895,7 @@ msgstr ""
 "validez de la cookie configurada en phpMyAdmin. Por ello, la sesión expirará "
 "antes de lo configurado en phpMyAdmin."
 
-#: index.php:519
+#: index.php:520
 msgid ""
 "Login cookie store is lower than cookie validity configured in phpMyAdmin, "
 "because of this, your login will expire sooner than configured in phpMyAdmin."
@@ -902,13 +904,13 @@ msgstr ""
 "de la cookie configurada en phpMyAdmin. Por ello, la sesión expirará antes "
 "de lo configurado en phpMyAdmin."
 
-#: index.php:535
+#: index.php:536
 msgid "The configuration file now needs a secret passphrase (blowfish_secret)."
 msgstr ""
 "El archivo de configuración ahora necesita una frase secreta "
 "(blowfish_secret)."
 
-#: index.php:548
+#: index.php:549
 msgid ""
 "Directory [code]config[/code], which is used by the setup script, still "
 "exists in your phpMyAdmin directory. It is strongly recommended to remove it "
@@ -921,7 +923,7 @@ msgstr ""
 "seguridad de su servidor cuando personas no autorizadas descarguen su "
 "configuración."
 
-#: index.php:564
+#: index.php:565
 #, php-format
 msgid ""
 "The phpMyAdmin configuration storage is not completely configured, some "
@@ -931,14 +933,14 @@ msgstr ""
 "configurado, algunas funcionalidades extendidas fueron deshabilitadas. "
 "%sAverigüe por qué%s. "
 
-#: index.php:571
+#: index.php:572
 msgid ""
 "Or alternately go to 'Operations' tab of any database to set it up there."
 msgstr ""
 "<br>O, de modo alternativo, utilizar la pestaña «Operaciones» de cualquier "
 "base de datos para configurarlo allí."
 
-#: index.php:620
+#: index.php:621
 #, php-format
 msgid ""
 "Your PHP MySQL library version %s differs from your MySQL server version %s. "
@@ -947,7 +949,7 @@ msgstr ""
 "Su versión de librería PHP MySQL %s es distinta de aquella de su versión de "
 "servidor MySQL %s. Esto puede ocasionar un comportamiento impredecible."
 
-#: index.php:648
+#: index.php:649
 #, php-format
 msgid ""
 "Server running with Suhosin. Please refer to %sdocumentation%s for possible "
@@ -1106,8 +1108,8 @@ msgstr ""
 msgid "Save & Close"
 msgstr "Guardar y cerrar"
 
-#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:404
-#: libraries/insert_edit.lib.php:1550 prefs_manage.php:361
+#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:415
+#: libraries/insert_edit.lib.php:1548 prefs_manage.php:361
 #: prefs_manage.php:372
 msgid "Reset"
 msgstr "Reiniciar"
@@ -1140,7 +1142,7 @@ msgstr "Agregar índice"
 msgid "Edit Index"
 msgstr "Editar índice"
 
-#: js/messages.php:99 templates/index_form.phtml:232
+#: js/messages.php:99 templates/table/index_form.phtml:232
 #, php-format
 msgid "Add %s column(s) to index"
 msgstr "Agregar %s columna(s) al índice"
@@ -1161,13 +1163,14 @@ msgstr "Componer con:"
 msgid "Please select column(s) for the index."
 msgstr "Seleccione la(s) columna(s) para el índice."
 
-#: js/messages.php:106 templates/structure/add_column.phtml:1
+#: js/messages.php:106 templates/table/structure/add_column.phtml:1
 msgid "You have to add at least one column."
 msgstr "Debe agregar al menos una columna."
 
-#: js/messages.php:109 libraries/insert_edit.lib.php:1548
+#: js/messages.php:109 libraries/insert_edit.lib.php:1546
 #: templates/columns_definitions/column_definitions_form.phtml:162
-#: templates/index_form.phtml:237 templates/tbl_relation/common_form.phtml:106
+#: templates/table/index_form.phtml:237
+#: templates/table/relation/common_form.phtml:106
 msgid "Preview SQL"
 msgstr "Previsualizar SQL"
 
@@ -1184,7 +1187,7 @@ msgid "SQL query:"
 msgstr "consulta SQL:"
 
 #. l10n: Default label for the y-Axis of Charts
-#: js/messages.php:118 templates/tbl_chart.phtml:109
+#: js/messages.php:118 templates/table/chart/tbl_chart.phtml:109
 msgid "Y Values"
 msgstr "Valores Y"
 
@@ -1339,7 +1342,7 @@ msgstr "Bytes enviados"
 msgid "Bytes received"
 msgstr "Bytes recibidos"
 
-#: js/messages.php:169 libraries/server_status.lib.php:226
+#: js/messages.php:169 libraries/server_status.lib.php:235
 msgid "Connections"
 msgstr "Conexiones"
 
@@ -1398,13 +1401,13 @@ msgstr "%d tabla(s)"
 msgid "Questions"
 msgstr "Preguntas"
 
-#: js/messages.php:184 libraries/server_status.lib.php:134
+#: js/messages.php:184 libraries/server_status.lib.php:143
 msgid "Traffic"
 msgstr "Tráfico"
 
 # This is the text showed in the tab
 #: js/messages.php:185 libraries/Menu.class.php:586
-#: libraries/Util.class.php:4318 libraries/server_status_monitor.lib.php:257
+#: libraries/Util.class.php:4324 libraries/server_status_monitor.lib.php:257
 msgid "Settings"
 msgstr "Configuración"
 
@@ -1424,8 +1427,9 @@ msgstr "¡Introduzca una longitud válida!"
 #: libraries/server_status_monitor.lib.php:236
 #: libraries/server_status_processes.lib.php:308
 #: templates/columns_definitions/transformation.phtml:4
-#: templates/designer/options_panel.phtml:178
-#: templates/table/options_zoom.phtml:12 templates/table/rows_zoom.phtml:26
+#: templates/database/designer/options_panel.phtml:178
+#: templates/table/search/options_zoom.phtml:12
+#: templates/table/search/rows_zoom.phtml:26
 msgid "None"
 msgstr "Ninguna"
 
@@ -1718,8 +1722,8 @@ msgstr ""
 
 #: js/messages.php:270 libraries/Menu.class.php:352
 #: libraries/Menu.class.php:455 libraries/Menu.class.php:582
-#: libraries/Util.class.php:4317 libraries/Util.class.php:4332
-#: libraries/Util.class.php:4349 libraries/config/messages.inc.php:258
+#: libraries/Util.class.php:4323 libraries/Util.class.php:4338
+#: libraries/Util.class.php:4355 libraries/config/messages.inc.php:258
 #: libraries/display_import.lib.php:105
 #: libraries/server_status_monitor.lib.php:318 prefs_manage.php:238
 #: setup/frames/menu.inc.php:26
@@ -1779,13 +1783,13 @@ msgid "Formatting SQL..."
 msgstr "Formato SQL..."
 
 #: js/messages.php:293 libraries/server_variables.lib.php:157
-#: templates/designer/aggregate_query_panel.phtml:63
-#: templates/designer/delete_relation_panel.phtml:28
-#: templates/designer/having_query_panel.phtml:117
-#: templates/designer/new_relation_panel.phtml:88
-#: templates/designer/options_panel.phtml:253
-#: templates/designer/rename_to_panel.phtml:45
-#: templates/designer/where_query_panel.phtml:83
+#: templates/database/designer/aggregate_query_panel.phtml:63
+#: templates/database/designer/delete_relation_panel.phtml:28
+#: templates/database/designer/having_query_panel.phtml:117
+#: templates/database/designer/new_relation_panel.phtml:88
+#: templates/database/designer/options_panel.phtml:253
+#: templates/database/designer/rename_to_panel.phtml:45
+#: templates/database/designer/where_query_panel.phtml:83
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -1793,7 +1797,7 @@ msgstr "Cancelar"
 msgid "Page-related settings"
 msgstr "Ajustes de página relacionada"
 
-#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:402
+#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:413
 msgid "Apply"
 msgstr "Aplicar"
 
@@ -1828,8 +1832,8 @@ msgstr "Código de error: %s"
 msgid "Error text: %s"
 msgstr "Texto de error: %s"
 
-#: js/messages.php:307 libraries/db_common.inc.php:68
-#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:450
+#: js/messages.php:307 libraries/db_common.inc.php:69
+#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:461
 msgid "No databases selected."
 msgstr "No se seleccionaron bases de datos."
 
@@ -1841,12 +1845,13 @@ msgstr "Eliminando Columna"
 msgid "Adding Primary Key"
 msgstr "Añadiendo Clave Primaria"
 
-#: js/messages.php:310 templates/designer/aggregate_query_panel.phtml:59
-#: templates/designer/having_query_panel.phtml:113
-#: templates/designer/new_relation_panel.phtml:87
-#: templates/designer/options_panel.phtml:252
-#: templates/designer/rename_to_panel.phtml:41
-#: templates/designer/where_query_panel.phtml:82
+#: js/messages.php:310
+#: templates/database/designer/aggregate_query_panel.phtml:59
+#: templates/database/designer/having_query_panel.phtml:113
+#: templates/database/designer/new_relation_panel.phtml:87
+#: templates/database/designer/options_panel.phtml:252
+#: templates/database/designer/rename_to_panel.phtml:41
+#: templates/database/designer/where_query_panel.phtml:82
 msgid "OK"
 msgstr "OK"
 
@@ -1866,7 +1871,7 @@ msgstr "Copiando Base de Datos"
 msgid "Changing Charset"
 msgstr "Cambiando el Juego de caracteres"
 
-#: js/messages.php:320 libraries/Util.class.php:3217
+#: js/messages.php:320 libraries/Util.class.php:3223
 msgid "Enable foreign key checks"
 msgstr "Habilite la revisión de las claves foráneas"
 
@@ -1902,20 +1907,21 @@ msgstr ""
 #: js/messages.php:334 libraries/DisplayResults.class.php:4834
 #: libraries/DisplayResults.class.php:5092 libraries/Menu.class.php:344
 #: libraries/Menu.class.php:446 libraries/Menu.class.php:578
-#: libraries/Util.class.php:3636 libraries/Util.class.php:3637
-#: libraries/Util.class.php:4316 libraries/Util.class.php:4331
-#: libraries/Util.class.php:4348 libraries/config/messages.inc.php:252
+#: libraries/Util.class.php:3642 libraries/Util.class.php:3643
+#: libraries/Util.class.php:4322 libraries/Util.class.php:4337
+#: libraries/Util.class.php:4354 libraries/config/messages.inc.php:252
 #: libraries/display_export.lib.php:173 libraries/rte/rte_list.lib.php:146
 #: libraries/server_privileges.lib.php:2211
 #: libraries/server_privileges.lib.php:2290
 #: libraries/server_privileges.lib.php:2632
 #: libraries/server_privileges.lib.php:3356
 #: libraries/server_status_monitor.lib.php:322 prefs_manage.php:303
-#: setup/frames/menu.inc.php:27 templates/structure/check_all_tables.phtml:11
+#: setup/frames/menu.inc.php:27
+#: templates/database/structure/check_all_tables.phtml:11
 msgid "Export"
 msgstr "Exportar"
 
-#: js/messages.php:337 libraries/rte/rte_routines.lib.php:652
+#: js/messages.php:337 libraries/rte/rte_routines.lib.php:743
 msgid "ENUM/SET editor"
 msgstr "Editor de ENUM/SET"
 
@@ -1955,7 +1961,7 @@ msgstr "Mostrar ventana de consultas SQL"
 #: libraries/Console.class.php:214 libraries/DisplayResults.class.php:3474
 #: libraries/DisplayResults.class.php:4818 libraries/Index.class.php:723
 #: libraries/Util.class.php:706 libraries/Util.class.php:1202
-#: libraries/Util.class.php:3634 libraries/Util.class.php:3635
+#: libraries/Util.class.php:3640 libraries/Util.class.php:3641
 #: libraries/central_columns.lib.php:851
 #: libraries/central_columns.lib.php:1193
 #: libraries/config/messages.inc.php:892
@@ -1973,7 +1979,7 @@ msgstr "Editar"
 #: libraries/server_user_groups.lib.php:129
 #: libraries/sql_query_form.lib.php:416 libraries/tracking.lib.php:477
 #: setup/frames/index.inc.php:183 setup/frames/index.inc.php:291
-#: templates/designer/delete_relation_panel.phtml:27
+#: templates/database/designer/delete_relation_panel.phtml:27
 msgid "Delete"
 msgstr "Borrar"
 
@@ -2145,11 +2151,11 @@ msgid "No dependencies selected!"
 msgstr "¡No se seleccionaron dependencias!"
 
 #: js/messages.php:394 libraries/central_columns.lib.php:1214
-#: libraries/insert_edit.lib.php:1458 libraries/server_variables.lib.php:155
+#: libraries/insert_edit.lib.php:1456 libraries/server_variables.lib.php:155
 #: setup/frames/config.inc.php:42 setup/frames/index.inc.php:279
 #: templates/columns_definitions/column_definitions_form.phtml:165
-#: templates/gis_visualization/gis_visualization.phtml:48
-#: templates/tbl_relation/common_form.phtml:107
+#: templates/table/gis_visualization/gis_visualization.phtml:48
+#: templates/table/relation/common_form.phtml:107
 msgid "Save"
 msgstr "Guardar"
 
@@ -2228,8 +2234,8 @@ msgid "Data point content"
 msgstr "Contenido del punto de datos"
 
 #: js/messages.php:430 js/messages.php:562 js/messages.php:579
-#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2573
-#: templates/index_form.phtml:154 templates/index_form.phtml:194
+#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2571
+#: templates/table/index_form.phtml:154 templates/table/index_form.phtml:194
 msgid "Ignore"
 msgstr "Ignorar"
 
@@ -2290,8 +2296,8 @@ msgstr "Seleccione la clave foránea"
 msgid "Please select the primary key or a unique key!"
 msgstr "¡Seleccione la clave primaria o una clave única!"
 
-#: js/messages.php:457 templates/designer/side_menu.phtml:91
-#: templates/designer/side_menu.phtml:94
+#: js/messages.php:457 templates/database/designer/side_menu.phtml:91
+#: templates/database/designer/side_menu.phtml:94
 msgid "Choose column to display"
 msgstr "Elegir la columna a mostrar"
 
@@ -2307,18 +2313,18 @@ msgstr ""
 msgid "Page name"
 msgstr "Nombre de página"
 
-#: js/messages.php:463 templates/designer/side_menu.phtml:56
-#: templates/designer/side_menu.phtml:59
+#: js/messages.php:463 templates/database/designer/side_menu.phtml:56
+#: templates/database/designer/side_menu.phtml:59
 msgid "Save page"
 msgstr "Guardar página"
 
-#: js/messages.php:464 templates/designer/side_menu.phtml:63
-#: templates/designer/side_menu.phtml:66
+#: js/messages.php:464 templates/database/designer/side_menu.phtml:63
+#: templates/database/designer/side_menu.phtml:66
 msgid "Save page as"
 msgstr "Guardar página como"
 
-#: js/messages.php:465 templates/designer/side_menu.phtml:49
-#: templates/designer/side_menu.phtml:52
+#: js/messages.php:465 templates/database/designer/side_menu.phtml:49
+#: templates/database/designer/side_menu.phtml:52
 msgid "Open page"
 msgstr "Abrir página"
 
@@ -2326,7 +2332,7 @@ msgstr "Abrir página"
 msgid "Delete page"
 msgstr "Borrar página"
 
-#: js/messages.php:467 templates/designer/side_menu.phtml:10
+#: js/messages.php:467 templates/database/designer/side_menu.phtml:10
 msgid "Untitled"
 msgstr "Sin título"
 
@@ -2451,7 +2457,7 @@ msgstr "Longitud original"
 msgid "cancel"
 msgstr "cancelar"
 
-#: js/messages.php:499 libraries/server_status.lib.php:271
+#: js/messages.php:499 libraries/server_status.lib.php:280
 msgid "Aborted"
 msgstr "Abortado"
 
@@ -3025,7 +3031,7 @@ msgstr "Ingrese una entrada HEX válida"
 
 #: js/messages.php:793 libraries/Message.class.php:199
 #: libraries/Util.class.php:654 libraries/core.lib.php:245
-#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1172
+#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1170
 #: tbl_operations.php:229 view_operations.php:63
 msgid "Error"
 msgstr "Error"
@@ -3088,8 +3094,8 @@ msgstr "por segundo"
 msgid "per minute"
 msgstr "por minuto"
 
-#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:143
-#: libraries/server_status.lib.php:228
+#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:152
+#: libraries/server_status.lib.php:237
 #: libraries/server_status_queries.lib.php:98
 msgid "per hour"
 msgstr "por hora"
@@ -3109,7 +3115,7 @@ msgstr ""
 "Permisos incorrectos en el archivo de configuración ¡cualquiera no debería "
 "poder modificarlo!"
 
-#: libraries/Config.class.php:1799
+#: libraries/Config.class.php:1801
 msgid "Font size"
 msgstr "Tamaño de fuente"
 
@@ -3137,10 +3143,10 @@ msgstr "Reconsultar"
 #: libraries/server_privileges.lib.php:2890
 #: libraries/server_privileges.lib.php:3144
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4332
+#: libraries/server_privileges.lib.php:4358
 #: libraries/server_status_processes.lib.php:80
-#: templates/tbl_relation/foreign_key_row.phtml:165
-#: templates/tbl_relation/internal_relational_row.phtml:55
+#: templates/table/relation/foreign_key_row.phtml:165
+#: templates/table/relation/internal_relational_row.phtml:55
 msgid "Database"
 msgstr "Base de datos"
 
@@ -3233,11 +3239,11 @@ msgstr "Historial"
 #: libraries/plugins/import/ImportMediawiki.class.php:60
 #: libraries/plugins/import/ImportOds.class.php:59
 #: libraries/plugins/import/ImportShp.class.php:57
-#: libraries/plugins/import/ImportSql.class.php:148
+#: libraries/plugins/import/ImportSql.class.php:51
 #: libraries/plugins/import/ImportXml.class.php:58
-#: libraries/rte/rte_routines.lib.php:833 templates/index_form.phtml:49
-#: templates/structure/row_stats_table.phtml:20
-#: templates/table/options.phtml:2
+#: libraries/rte/rte_routines.lib.php:924 templates/table/index_form.phtml:49
+#: templates/table/search/options.phtml:2
+#: templates/table/structure/row_stats_table.phtml:20
 msgid "Options"
 msgstr "Opciones"
 
@@ -3270,7 +3276,8 @@ msgstr "descendente"
 msgid "Order:"
 msgstr "Orden:"
 
-#: libraries/Console.class.php:289 templates/table/replace_preview.phtml:17
+#: libraries/Console.class.php:289
+#: templates/table/search/replace_preview.phtml:17
 msgid "Count"
 msgstr "Cantidad"
 
@@ -3367,9 +3374,9 @@ msgstr "Cambiar al tema oscuro"
 #: libraries/operations.lib.php:794 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:191
-#: templates/structure/sortable_header.phtml:21
-#: templates/structure/sortable_header.phtml:38
-#: templates/table/options.phtml:68
+#: templates/database/structure/sortable_header.phtml:21
+#: templates/database/structure/sortable_header.phtml:38
+#: templates/table/search/options.phtml:68
 msgid "Ascending"
 msgstr "Ascendente"
 
@@ -3379,13 +3386,14 @@ msgstr "Ascendente"
 #: libraries/operations.lib.php:797 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:188
-#: templates/structure/sortable_header.phtml:26
-#: templates/structure/sortable_header.phtml:43
-#: templates/table/options.phtml:69
+#: templates/database/structure/sortable_header.phtml:26
+#: templates/database/structure/sortable_header.phtml:43
+#: templates/table/search/options.phtml:69
 msgid "Descending"
 msgstr "Descendente"
 
-#: libraries/DBQbe.class.php:467 templates/table/search_and_replace.phtml:6
+#: libraries/DBQbe.class.php:467
+#: templates/table/search/search_and_replace.phtml:6
 msgid "Column:"
 msgstr "Columna:"
 
@@ -3546,12 +3554,12 @@ msgstr[0] "%1$s coincidencia en la tabla <strong>%2$s</strong>"
 msgstr[1] "%1$s coincidencias en la tabla <strong>%2$s</strong>"
 
 #: libraries/DbSearch.class.php:354 libraries/Menu.class.php:311
-#: libraries/Util.class.php:3337 libraries/Util.class.php:3347
-#: libraries/Util.class.php:3623 libraries/Util.class.php:3624
-#: libraries/Util.class.php:4343 libraries/config.values.php:43
+#: libraries/Util.class.php:3343 libraries/Util.class.php:3353
+#: libraries/Util.class.php:3629 libraries/Util.class.php:3630
+#: libraries/Util.class.php:4349 libraries/config.values.php:43
 #: libraries/config.values.php:51 libraries/config.values.php:119
 #: libraries/navigation/Nodes/Node_Table.class.php:295
-#: templates/structure/check_all_table_column.phtml:5
+#: templates/table/structure/check_all_table_column.phtml:5
 msgid "Browse"
 msgstr "Examinar"
 
@@ -3568,7 +3576,8 @@ msgstr "Buscar en la base de datos"
 msgid "Words or values to search for (wildcard: \"%\"):"
 msgstr "Palabras o valores a buscar (comodín: \"%\"):"
 
-#: libraries/DbSearch.class.php:401 templates/table/search_and_replace.phtml:1
+#: libraries/DbSearch.class.php:401
+#: templates/table/search/search_and_replace.phtml:1
 msgid "Find:"
 msgstr "Encontrado:"
 
@@ -3612,28 +3621,28 @@ msgstr "Filtrar filas"
 msgid "Search this table"
 msgstr "Buscar en esta tabla"
 
-#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2532
-#: libraries/Util.class.php:2535
+#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2538
+#: libraries/Util.class.php:2541
 msgctxt "First page"
 msgid "Begin"
 msgstr "Comenzar"
 
-#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2533
-#: libraries/Util.class.php:2536 libraries/server_bin_log.lib.php:170
+#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2539
+#: libraries/Util.class.php:2542 libraries/server_bin_log.lib.php:170
 #: libraries/server_bin_log.lib.php:172
 msgctxt "Previous page"
 msgid "Previous"
 msgstr "Anterior"
 
-#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2564
-#: libraries/Util.class.php:2574 libraries/server_bin_log.lib.php:204
+#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2570
+#: libraries/Util.class.php:2580 libraries/server_bin_log.lib.php:204
 #: libraries/server_bin_log.lib.php:206
 msgctxt "Next page"
 msgid "Next"
 msgstr "Siguiente"
 
-#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2565
-#: libraries/Util.class.php:2575
+#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2571
+#: libraries/Util.class.php:2581
 msgctxt "Last page"
 msgid "End"
 msgstr "Fin"
@@ -3708,15 +3717,15 @@ msgid "May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]."
 msgstr "Podría ser aproximado. Ver [doc@faq3-11]FAQ 3.11[/doc]."
 
 #: libraries/DisplayResults.class.php:4332 libraries/Message.class.php:180
-#: libraries/controllers/TableRelationController.class.php:258
+#: libraries/controllers/TableRelationController.class.php:259
 #: libraries/controllers/TableSearchController.class.php:655
-#: libraries/rte/rte_routines.lib.php:1332 libraries/sql_query_form.lib.php:89
+#: libraries/rte/rte_routines.lib.php:1423 libraries/sql_query_form.lib.php:89
 #: tbl_operations.php:227 tbl_row_action.php:138 view_operations.php:62
 msgid "Your SQL query has been executed successfully."
 msgstr "Su consulta se ejecutó con éxito."
 
 #: libraries/DisplayResults.class.php:4660
-#: libraries/controllers/StructureController.class.php:629
+#: libraries/controllers/DatabaseStructureController.class.php:564
 #, php-format
 msgid ""
 "This view has at least this number of rows. Please refer to %sdocumentation"
@@ -3740,33 +3749,33 @@ msgstr "%1$d en total, %2$d en la consulta"
 msgid "%d total"
 msgstr "total de %d"
 
-#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1318
+#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1312
 #, php-format
 msgid "Query took %01.4f seconds."
 msgstr "La consulta tardó %01.4f segundos."
 
 #: libraries/DisplayResults.class.php:4807
-#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4767
-#: libraries/Util.class.php:4773 libraries/mult_submits.inc.php:50
-#: templates/structure/check_all_tables.phtml:2
-#: templates/structure/check_all_tables.phtml:9
+#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4773
+#: libraries/Util.class.php:4779 libraries/mult_submits.inc.php:50
+#: templates/database/structure/check_all_tables.phtml:2
+#: templates/database/structure/check_all_tables.phtml:9
 msgid "With selected:"
 msgstr "Para los elementos que están marcados:"
 
 #: libraries/DisplayResults.class.php:4811
-#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4769
-#: libraries/Util.class.php:4770 libraries/server_privileges.lib.php:1174
+#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4775
+#: libraries/Util.class.php:4776 libraries/server_privileges.lib.php:1174
 #: libraries/server_privileges.lib.php:1175
 #: libraries/server_privileges.lib.php:1387
 #: libraries/server_user_groups.lib.php:231
-#: templates/structure/check_all_tables.phtml:3
-#: templates/structure/check_all_tables.phtml:4
+#: templates/database/structure/check_all_tables.phtml:3
+#: templates/database/structure/check_all_tables.phtml:4
 msgid "Check All"
 msgstr "Marcar todos"
 
 #: libraries/DisplayResults.class.php:4985 libraries/Header.class.php:383
-#: templates/structure/optional_action_links.phtml:1
-#: templates/structure/print_view_data_dictionary_link.phtml:3
+#: templates/database/structure/print_view_data_dictionary_link.phtml:3
+#: templates/table/structure/optional_action_links.phtml:1
 msgid "Print view"
 msgstr "Vista de impresión"
 
@@ -3774,7 +3783,8 @@ msgstr "Vista de impresión"
 msgid "Query results operations"
 msgstr "Operaciones sobre los resultados de la consulta"
 
-#: libraries/DisplayResults.class.php:5105 templates/tbl_chart.phtml:12
+#: libraries/DisplayResults.class.php:5105
+#: templates/table/chart/tbl_chart.phtml:12
 msgid "Display chart"
 msgstr "Mostrar gráfico"
 
@@ -3871,7 +3881,7 @@ msgid "Click on the bar to scroll to top of page"
 msgstr "Pulse en la barra para deslizarse al tope de la página"
 
 #: libraries/Header.class.php:749
-#: libraries/plugins/auth/AuthenticationCookie.class.php:152
+#: libraries/plugins/auth/AuthenticationCookie.class.php:140
 msgid "Javascript must be enabled past this point!"
 msgstr "¡Pasado este punto, debe tener Javascript activado!"
 
@@ -3893,11 +3903,11 @@ msgid "Keyname"
 msgstr "Nombre de la clave"
 
 #: libraries/Index.class.php:697
-#: libraries/controllers/StructureController.class.php:1962
-#: libraries/controllers/StructureController.class.php:1967
+#: libraries/controllers/TableStructureController.class.php:953
+#: libraries/controllers/TableStructureController.class.php:958
 #: libraries/tracking.lib.php:973
 #: templates/columns_definitions/column_indexes.phtml:11
-#: templates/structure/check_all_table_column.phtml:26
+#: templates/table/structure/check_all_table_column.phtml:26
 msgid "Unique"
 msgstr "Único"
 
@@ -3916,16 +3926,17 @@ msgstr "Cardinalidad"
 #: libraries/server_collations.lib.php:35 libraries/tracking.lib.php:881
 #: libraries/tracking.lib.php:977
 #: templates/columns_definitions/table_fields_definitions.phtml:33
-#: templates/structure/row_stats_table.phtml:31
-#: templates/structure/table_header.phtml:55
-#: templates/structure/table_structure_header.phtml:7
-#: templates/table/table_header.phtml:8
+#: templates/database/structure/table_header.phtml:55
+#: templates/table/search/table_header.phtml:8
+#: templates/table/structure/row_stats_table.phtml:31
+#: templates/table/structure/table_structure_header.phtml:7
 msgid "Collation"
 msgstr "Cotejamiento"
 
 #: libraries/Index.class.php:703 libraries/rte/rte_events.lib.php:496
-#: libraries/rte/rte_routines.lib.php:956 libraries/tracking.lib.php:885
-#: libraries/tracking.lib.php:979 templates/structure/table_header.phtml:84
+#: libraries/rte/rte_routines.lib.php:1047 libraries/tracking.lib.php:885
+#: libraries/tracking.lib.php:979
+#: templates/database/structure/table_header.phtml:84
 msgid "Comment"
 msgstr "Comentario"
 
@@ -3938,15 +3949,15 @@ msgstr "La clave primaria ha sido eliminada."
 msgid "Index %s has been dropped."
 msgstr "El índice %s ha sido eliminado."
 
-#: libraries/Index.class.php:757 libraries/Util.class.php:3630
-#: libraries/Util.class.php:3631
-#: libraries/controllers/StructureController.class.php:1958
-#: libraries/controllers/StructureController.class.php:1959
+#: libraries/Index.class.php:757 libraries/Util.class.php:3636
+#: libraries/Util.class.php:3637
+#: libraries/controllers/TableStructureController.class.php:949
+#: libraries/controllers/TableStructureController.class.php:950
 #: libraries/operations.lib.php:1607 libraries/rte/rte_list.lib.php:150
 #: libraries/server_databases.lib.php:146
-#: templates/structure/check_all_table_column.phtml:15
-#: templates/structure/check_all_tables.phtml:16
-#: templates/tbl_relation/foreign_key_row.phtml:93
+#: templates/database/structure/check_all_tables.phtml:16
+#: templates/table/relation/foreign_key_row.phtml:93
+#: templates/table/structure/check_all_table_column.phtml:15
 msgid "Drop"
 msgstr "Eliminar"
 
@@ -3979,16 +3990,16 @@ msgstr "Servidor"
 #: libraries/Menu.class.php:248
 #: libraries/navigation/Nodes/Node_View.class.php:32
 #: libraries/tbl_info.inc.php:63
-#: templates/structure/structure_table_row.phtml:97
-#: templates/structure/structure_table_row.phtml:159
+#: templates/database/structure/structure_table_row.phtml:97
+#: templates/database/structure/structure_table_row.phtml:159
 msgid "View"
 msgstr "Visualizar"
 
 #: libraries/Menu.class.php:325 libraries/Menu.class.php:429
-#: libraries/Menu.class.php:548 libraries/Util.class.php:3334
-#: libraries/Util.class.php:3344 libraries/Util.class.php:3350
-#: libraries/Util.class.php:4313 libraries/Util.class.php:4328
-#: libraries/Util.class.php:4345 libraries/config.values.php:40
+#: libraries/Menu.class.php:548 libraries/Util.class.php:3340
+#: libraries/Util.class.php:3350 libraries/Util.class.php:3356
+#: libraries/Util.class.php:4319 libraries/Util.class.php:4334
+#: libraries/Util.class.php:4351 libraries/config.values.php:40
 #: libraries/config.values.php:48 libraries/config.values.php:110
 #: libraries/config.values.php:116 libraries/config/messages.inc.php:321
 #: libraries/navigation/Nodes/Node_Table.class.php:292
@@ -3996,19 +4007,19 @@ msgid "SQL"
 msgstr "SQL"
 
 #: libraries/Menu.class.php:328 libraries/Menu.class.php:432
-#: libraries/Util.class.php:3335 libraries/Util.class.php:3345
-#: libraries/Util.class.php:3351 libraries/Util.class.php:3625
-#: libraries/Util.class.php:3626 libraries/Util.class.php:4329
-#: libraries/Util.class.php:4346 libraries/config.values.php:41
+#: libraries/Util.class.php:3341 libraries/Util.class.php:3351
+#: libraries/Util.class.php:3357 libraries/Util.class.php:3631
+#: libraries/Util.class.php:3632 libraries/Util.class.php:4335
+#: libraries/Util.class.php:4352 libraries/config.values.php:41
 #: libraries/config.values.php:49 libraries/config.values.php:111
 #: libraries/config.values.php:117
 #: libraries/navigation/Nodes/Node_Table.class.php:286
 msgid "Search"
 msgstr "Buscar"
 
-#: libraries/Menu.class.php:338 libraries/Util.class.php:3336
-#: libraries/Util.class.php:3346 libraries/Util.class.php:3627
-#: libraries/Util.class.php:3628 libraries/Util.class.php:4347
+#: libraries/Menu.class.php:338 libraries/Util.class.php:3342
+#: libraries/Util.class.php:3352 libraries/Util.class.php:3633
+#: libraries/Util.class.php:3634 libraries/Util.class.php:4353
 #: libraries/config.values.php:42 libraries/config.values.php:50
 #: libraries/config.values.php:118
 #: libraries/navigation/Nodes/Node_Table.class.php:289
@@ -4017,30 +4028,30 @@ msgid "Insert"
 msgstr "Insertar"
 
 #: libraries/Menu.class.php:362 libraries/Menu.class.php:467
-#: libraries/Util.class.php:4334 libraries/Util.class.php:4350
+#: libraries/Util.class.php:4340 libraries/Util.class.php:4356
 #: libraries/config.values.php:106 libraries/server_common.lib.php:51
 #: libraries/server_privileges.lib.php:2370
 #: libraries/server_privileges.lib.php:3158
-#: libraries/server_privileges.lib.php:4221
+#: libraries/server_privileges.lib.php:4247
 msgid "Privileges"
 msgstr "Privilegios"
 
 #: libraries/Menu.class.php:371 libraries/Menu.class.php:379
-#: libraries/Menu.class.php:459 libraries/Util.class.php:3338
-#: libraries/Util.class.php:3352 libraries/Util.class.php:4333
-#: libraries/Util.class.php:4351 libraries/config.values.php:112
+#: libraries/Menu.class.php:459 libraries/Util.class.php:3344
+#: libraries/Util.class.php:3358 libraries/Util.class.php:4339
+#: libraries/Util.class.php:4357 libraries/config.values.php:112
 #: view_operations.php:92
 msgid "Operations"
 msgstr "Operaciones"
 
 #: libraries/Menu.class.php:384 libraries/Menu.class.php:492
-#: libraries/Util.class.php:4338 libraries/Util.class.php:4352
+#: libraries/Util.class.php:4344 libraries/Util.class.php:4358
 #: libraries/relation.lib.php:255
 msgid "Tracking"
 msgstr "Seguimiento"
 
 #: libraries/Menu.class.php:397 libraries/Menu.class.php:486
-#: libraries/Util.class.php:4337 libraries/Util.class.php:4353
+#: libraries/Util.class.php:4343 libraries/Util.class.php:4359
 #: libraries/navigation/Nodes/Node_Trigger_Container.class.php:24
 #: libraries/plugins/export/ExportHtmlword.class.php:557
 #: libraries/plugins/export/ExportOdt.class.php:685
@@ -4057,16 +4068,16 @@ msgstr "Disparadores"
 msgid "Database seems to be empty!"
 msgstr "La base de datos, ¡parece estar vacía!"
 
-#: libraries/Menu.class.php:439 libraries/Util.class.php:4330
+#: libraries/Menu.class.php:439 libraries/Util.class.php:4336
 msgid "Query"
 msgstr "Generar una consulta"
 
-#: libraries/Menu.class.php:472 libraries/Util.class.php:4335
+#: libraries/Menu.class.php:472 libraries/Util.class.php:4341
 #: libraries/rte/rte_words.lib.php:36
 msgid "Routines"
 msgstr "Rutinas"
 
-#: libraries/Menu.class.php:479 libraries/Util.class.php:4336
+#: libraries/Menu.class.php:479 libraries/Util.class.php:4342
 #: libraries/navigation/Nodes/Node_Event_Container.class.php:26
 #: libraries/plugins/export/ExportSql.class.php:940
 #: libraries/plugins/export/ExportXml.class.php:107
@@ -4074,20 +4085,20 @@ msgstr "Rutinas"
 msgid "Events"
 msgstr "Eventos"
 
-#: libraries/Menu.class.php:498 libraries/Util.class.php:4339
+#: libraries/Menu.class.php:498 libraries/Util.class.php:4345
 msgid "Designer"
 msgstr "Diseñador"
 
-#: libraries/Menu.class.php:507 libraries/Util.class.php:4340
-#: templates/structure/check_all_tables.phtml:35
+#: libraries/Menu.class.php:507 libraries/Util.class.php:4346
+#: templates/database/structure/check_all_tables.phtml:35
 msgid "Central columns"
 msgstr "Columnas centrales"
 
-#: libraries/Menu.class.php:544 libraries/Util.class.php:4312
+#: libraries/Menu.class.php:544 libraries/Util.class.php:4318
 #: libraries/config.values.php:103 libraries/config/messages.inc.php:266
 #: libraries/config/messages.inc.php:341
 #: libraries/navigation/NavigationTree.class.php:1239
-#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4332
+#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4358
 msgid "Databases"
 msgstr "Bases de datos"
 
@@ -4096,34 +4107,34 @@ msgid "User accounts"
 msgstr "Cuentas de usuarios"
 
 #: libraries/Menu.class.php:595 libraries/ServerStatusData.class.php:121
-#: libraries/Util.class.php:4319 libraries/server_common.lib.php:36
+#: libraries/Util.class.php:4325 libraries/server_common.lib.php:36
 msgid "Binary log"
 msgstr "Registro binario"
 
 #: libraries/Menu.class.php:601 libraries/ServerStatusData.class.php:126
-#: libraries/Util.class.php:4320 libraries/server_common.lib.php:42
-#: templates/structure/body_for_table_summary.phtml:10
-#: templates/structure/table_header.phtml:27
+#: libraries/Util.class.php:4326 libraries/server_common.lib.php:42
+#: templates/database/structure/body_for_table_summary.phtml:10
+#: templates/database/structure/table_header.phtml:27
 msgid "Replication"
 msgstr "Replicación"
 
 #: libraries/Menu.class.php:606 libraries/ServerStatusData.class.php:193
-#: libraries/Util.class.php:4321 libraries/config.values.php:105
+#: libraries/Util.class.php:4327 libraries/config.values.php:105
 #: libraries/server_engines.lib.php:108 libraries/server_engines.lib.php:112
 #: libraries/sql_query_form.lib.php:421
 msgid "Variables"
 msgstr "Variables"
 
-#: libraries/Menu.class.php:610 libraries/Util.class.php:4322
+#: libraries/Menu.class.php:610 libraries/Util.class.php:4328
 msgid "Charsets"
 msgstr "Juegos de caracteres"
 
-#: libraries/Menu.class.php:615 libraries/Util.class.php:4323
+#: libraries/Menu.class.php:615 libraries/Util.class.php:4329
 #: libraries/server_common.lib.php:33 libraries/server_plugins.lib.php:27
 msgid "Plugins"
 msgstr "Complementos"
 
-#: libraries/Menu.class.php:626 libraries/Util.class.php:4324
+#: libraries/Menu.class.php:626 libraries/Util.class.php:4330
 msgid "Engines"
 msgstr "Motores"
 
@@ -4148,7 +4159,7 @@ msgid_plural "%1$d rows inserted."
 msgstr[0] "%1$d fila insertada."
 msgstr[1] "%1$d filas insertadas."
 
-#: libraries/PDF.class.php:70 libraries/Util.class.php:2521
+#: libraries/PDF.class.php:70 libraries/Util.class.php:2527
 #: libraries/browse_foreigners.lib.php:327
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:865
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:890
@@ -4169,7 +4180,7 @@ msgid "Could not save favorite table!"
 msgstr "¡No se pudo guardar la tabla favorita!"
 
 #: libraries/RecentFavoriteTable.class.php:212
-#: templates/structure/favorite_anchor.phtml:12
+#: templates/database/structure/favorite_anchor.phtml:12
 msgid "Remove from Favorites"
 msgstr "Eliminar de Favoritos"
 
@@ -4336,7 +4347,7 @@ msgstr ""
 "encuentra este motor de almacenamiento."
 
 #: libraries/StorageEngine.class.php:373
-#: templates/structure/body_for_table_summary.phtml:50
+#: templates/database/structure/body_for_table_summary.phtml:50
 #, php-format
 msgid "%s is the default storage engine on this MySQL server."
 msgstr ""
@@ -4829,10 +4840,10 @@ msgstr "Se encontraron %d errores durante el análisis."
 
 #: libraries/Util.class.php:726 libraries/rte/rte_events.lib.php:110
 #: libraries/rte/rte_events.lib.php:119 libraries/rte/rte_events.lib.php:150
-#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:153
-#: libraries/rte/rte_routines.lib.php:162
-#: libraries/rte/rte_routines.lib.php:235
-#: libraries/rte/rte_routines.lib.php:1366
+#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:223
+#: libraries/rte/rte_routines.lib.php:250
+#: libraries/rte/rte_routines.lib.php:372
+#: libraries/rte/rte_routines.lib.php:1457
 #: libraries/rte/rte_triggers.lib.php:86 libraries/rte/rte_triggers.lib.php:95
 #: libraries/rte/rte_triggers.lib.php:127
 msgid "MySQL said: "
@@ -4876,77 +4887,80 @@ msgstr "Dom"
 msgid "%B %d, %Y at %I:%M %p"
 msgstr "%d-%m-%Y a las %H:%M:%S"
 
-#: libraries/Util.class.php:2019
+#: libraries/Util.class.php:2025
 #, php-format
 msgid "%s days, %s hours, %s minutes and %s seconds"
 msgstr "%s días, %s horas, %s minutos y %s segundos"
 
-#: libraries/Util.class.php:2112
+#: libraries/Util.class.php:2118
 msgid "Missing parameter:"
 msgstr "Parámetro faltante:"
 
-#: libraries/Util.class.php:2645
+#: libraries/Util.class.php:2651
 #, php-format
 msgid "Jump to database \"%s\"."
 msgstr "Saltar a la base de datos \"%s\"."
 
-#: libraries/Util.class.php:2670
+#: libraries/Util.class.php:2676
 #, php-format
 msgid "The %s functionality is affected by a known bug, see %s"
 msgstr "La funcionalidad %s está afectada por un fallo conocido, vea %s"
 
-#: libraries/Util.class.php:2881
+#: libraries/Util.class.php:2887
 msgid "Click to toggle"
 msgstr "Pulse para conmutar"
 
-#: libraries/Util.class.php:3542 prefs_manage.php:248
+#: libraries/Util.class.php:3548 prefs_manage.php:248
 msgid "Browse your computer:"
 msgstr "Buscar en su ordenador:"
 
-#: libraries/Util.class.php:3567
+#: libraries/Util.class.php:3573
 #, php-format
 msgid "Select from the web server upload directory <b>%s</b>:"
 msgstr ""
 "Seleccionar directorio en el servidor web para subir los archivos <b>%s</b>:"
 
-#: libraries/Util.class.php:3596 libraries/insert_edit.lib.php:1173
+#: libraries/Util.class.php:3602 libraries/insert_edit.lib.php:1171
 msgid "The directory you set for upload work cannot be reached."
 msgstr ""
 "No se puede acceder al directorio que seleccionó para subir los archivos."
 
-#: libraries/Util.class.php:3607
+#: libraries/Util.class.php:3613
 msgid "There are no files to upload!"
 msgstr "¡No hay archivos para subir!"
 
-#: libraries/Util.class.php:3632 libraries/Util.class.php:3633
-#: templates/structure/check_all_tables.phtml:15
+#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: templates/database/structure/check_all_tables.phtml:15
 msgid "Empty"
 msgstr "Vaciar"
 
-#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: libraries/Util.class.php:3644 libraries/Util.class.php:3645
 msgid "Execute"
 msgstr "Ejecutar"
 
-#: libraries/Util.class.php:4152
+#: libraries/Util.class.php:4158
 msgid "Print"
 msgstr "Imprimir"
 
-#: libraries/Util.class.php:4257 templates/structure/row_stats_table.phtml:80
-#: templates/structure/table_header.phtml:95
+#: libraries/Util.class.php:4263
+#: templates/database/structure/table_header.phtml:95
+#: templates/table/structure/row_stats_table.phtml:80
 msgid "Creation"
 msgstr "Creación"
 
-#: libraries/Util.class.php:4263 templates/structure/row_stats_table.phtml:87
-#: templates/structure/table_header.phtml:106
+#: libraries/Util.class.php:4269
+#: templates/database/structure/table_header.phtml:106
+#: templates/table/structure/row_stats_table.phtml:87
 msgid "Last update"
 msgstr "Última actualización"
 
-#: libraries/Util.class.php:4269 templates/structure/row_stats_table.phtml:94
-#: templates/structure/table_header.phtml:117
+#: libraries/Util.class.php:4275
+#: templates/database/structure/table_header.phtml:117
+#: templates/table/structure/row_stats_table.phtml:94
 msgid "Last check"
 msgstr "Última revisión"
 
-#: libraries/Util.class.php:4315
+#: libraries/Util.class.php:4321
 msgid "Users"
 msgstr "Usuarios"
 
@@ -4967,16 +4981,16 @@ msgid "Use this value"
 msgstr "Use este valor"
 
 #: libraries/build_html_for_db.lib.php:33 libraries/import.lib.php:193
-#: templates/structure/actions_in_table_structure.phtml:113
-#: templates/structure/row_stats_table.phtml:42
-#: templates/structure/table_header.phtml:36
+#: templates/database/structure/table_header.phtml:36
+#: templates/table/structure/actions_in_table_structure.phtml:113
+#: templates/table/structure/row_stats_table.phtml:42
 msgid "Rows"
 msgstr "Filas"
 
 #: libraries/build_html_for_db.lib.php:48 libraries/engines/innodb.lib.php:171
-#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:186
-#: libraries/server_status.lib.php:298
-#: templates/structure/display_table_stats.phtml:40
+#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:195
+#: libraries/server_status.lib.php:307
+#: templates/table/structure/display_table_stats.phtml:40
 msgid "Total"
 msgstr "Total"
 
@@ -4985,10 +4999,12 @@ msgid "Jump to database"
 msgstr "Saltar a la base de datos"
 
 #: libraries/build_html_for_db.lib.php:146
+#: templates/database/structure/structure_table_row.phtml:15
 msgid "Not replicated"
 msgstr "Sin replicar"
 
 #: libraries/build_html_for_db.lib.php:158
+#: templates/database/structure/structure_table_row.phtml:16
 msgid "Replicated"
 msgstr "Replicado/a"
 
@@ -5045,17 +5061,17 @@ msgstr "No"
 #: libraries/plugins/export/ExportTexytext.class.php:425
 #: libraries/plugins/export/PMA_ExportPdf.class.php:307
 #: libraries/rte/rte_list.lib.php:73 libraries/rte/rte_list.lib.php:85
-#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:830
-#: libraries/rte/rte_routines.lib.php:1492 setup/frames/index.inc.php:162
+#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:921
+#: libraries/rte/rte_routines.lib.php:1583 setup/frames/index.inc.php:162
 #: templates/columns_definitions/table_fields_definitions.phtml:8
-#: templates/structure/table_structure_header.phtml:5
-#: templates/table/create_table.phtml:11
+#: templates/database/create_table.phtml:11
+#: templates/table/structure/table_structure_header.phtml:5
 msgid "Name"
 msgstr "Nombre"
 
 #: libraries/central_columns.lib.php:699
 #: libraries/central_columns.lib.php:1381
-#: libraries/rte/rte_routines.lib.php:832
+#: libraries/rte/rte_routines.lib.php:923
 #: templates/columns_definitions/table_fields_definitions.phtml:14
 msgid "Length/Values"
 msgstr "Longitud/Valores"
@@ -5074,7 +5090,7 @@ msgid "Select a table"
 msgstr "Seleccionar una tabla"
 
 #: libraries/central_columns.lib.php:804
-#: templates/structure/add_column.phtml:4
+#: templates/table/structure/add_column.phtml:4
 msgid "Add column"
 msgstr "Añadir columna"
 
@@ -5090,7 +5106,7 @@ msgstr "Añadir columna nueva"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1002
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1025
 #: templates/columns_definitions/table_fields_definitions.phtml:36
-#: templates/structure/table_structure_header.phtml:8
+#: templates/table/structure/table_structure_header.phtml:8
 msgid "Attributes"
 msgstr "Atributos"
 
@@ -5211,7 +5227,7 @@ msgid "Double click"
 msgstr "Pulsado doble"
 
 #: libraries/config.values.php:95 libraries/config.values.php:124
-#: libraries/config/FormDisplay.tpl.php:221 libraries/relation.lib.php:97
+#: libraries/config/FormDisplay.tpl.php:232 libraries/relation.lib.php:97
 #: libraries/relation.lib.php:105
 msgid "Disabled"
 msgstr "Deshabilitado"
@@ -5386,21 +5402,21 @@ msgstr ""
 msgid "maximum %s"
 msgstr "máximo %s"
 
-#: libraries/config/FormDisplay.tpl.php:219
+#: libraries/config/FormDisplay.tpl.php:230
 msgid "This setting is disabled, it will not be applied to your configuration."
 msgstr "Esta opción está deshabilitada, no se aplicará a su configuración."
 
-#: libraries/config/FormDisplay.tpl.php:313
+#: libraries/config/FormDisplay.tpl.php:324
 #, php-format
 msgid "Set value: %s"
 msgstr "Valor establecido: %s"
 
-#: libraries/config/FormDisplay.tpl.php:318
+#: libraries/config/FormDisplay.tpl.php:329
 #: libraries/config/messages.inc.php:610
 msgid "Restore default value"
 msgstr "Restaurar valor predeterminado"
 
-#: libraries/config/FormDisplay.tpl.php:332
+#: libraries/config/FormDisplay.tpl.php:343
 msgid "Allow users to customize this value"
 msgstr "Permitir a los usuarios personalizar este valor"
 
@@ -5906,7 +5922,7 @@ msgstr "Conjunto de caracteres del archivo"
 
 #: libraries/config/messages.inc.php:136 libraries/config/messages.inc.php:152
 #: libraries/sql_query_form.lib.php:247
-#: templates/structure/row_stats_table.phtml:7
+#: templates/table/structure/row_stats_table.phtml:7
 msgid "Format"
 msgstr "Formato"
 
@@ -6427,7 +6443,7 @@ msgstr ""
 
 #: libraries/config/messages.inc.php:332
 #: libraries/plugins/export/ExportPdf.class.php:279
-#: templates/structure/secondary_tabs.phtml:8
+#: templates/table/secondary_tabs.phtml:8
 msgid "Table structure"
 msgstr "Estructura de tabla"
 
@@ -8138,104 +8154,33 @@ msgstr "Microsoft Word 2000"
 msgid "OpenDocument Text"
 msgstr "Texto Open Document"
 
-#: libraries/controllers/StructureController.class.php:465
+#: libraries/controllers/DatabaseStructureController.class.php:405
 #: tbl_operations.php:382
 #, php-format
 msgid "Table %s has been emptied."
 msgstr "Se ha vaciado la tabla %s."
 
-#: libraries/controllers/StructureController.class.php:486
+#: libraries/controllers/DatabaseStructureController.class.php:426
 #: tbl_operations.php:400 view_operations.php:119
 #, php-format
 msgid "View %s has been dropped."
 msgstr "Se descartó la vista %s."
 
-#: libraries/controllers/StructureController.class.php:487
+#: libraries/controllers/DatabaseStructureController.class.php:427
 #: tbl_operations.php:401
 #, php-format
 msgid "Table %s has been dropped."
 msgstr "Se ha eliminado la tabla %s."
 
-#: libraries/controllers/StructureController.class.php:797
-#, php-format
-msgid "The name '%s' is a MySQL reserved keyword."
-msgid_plural "The names '%s' are MySQL reserved keywords."
-msgstr[0] "El nombre «%s» es una palabra clave reservada de MySQL."
-msgstr[1] "Los nombres «%s» es una palabra clave reservada de MySQL."
-
-#: libraries/controllers/StructureController.class.php:875
-msgid "No column selected."
-msgstr "No se seleccionaron columnas."
-
-#: libraries/controllers/StructureController.class.php:1049
+#: libraries/controllers/DatabaseStructureController.class.php:733
 msgid "Favorite List is full!"
 msgstr "¡La lista de favoritos está completa!"
 
-#: libraries/controllers/StructureController.class.php:1272
-msgid "The columns have been moved successfully."
-msgstr "Las columnas fueron movidas exitosamente."
-
-#: libraries/controllers/StructureController.class.php:1535
-#, fuzzy, php-format
-#| msgid "Table %1$s has been altered successfully."
-msgid ""
-"Table %1$s has been altered successfully. Privileges have been adjusted."
-msgstr ""
-"Los cambios en la Tabla %1$s se hicieron exitosamente. Los privilegios se "
-"ajustaron."
-
-#: libraries/controllers/StructureController.class.php:1541
-#: libraries/controllers/TableIndexesController.class.php:161
-#: tbl_addfield.php:92
-#, php-format
-msgid "Table %1$s has been altered successfully."
-msgstr "Los cambios en la Tabla %1$s se hicieron exitosamente."
-
-#: libraries/controllers/StructureController.class.php:1588
-#: libraries/tracking.lib.php:1094
-msgid "Query error"
-msgstr "Errores de consulta"
-
-#: libraries/controllers/StructureController.class.php:1806
+#: libraries/controllers/DatabaseStructureController.class.php:947
 #: libraries/mysql_charsets.lib.php:366 libraries/mysql_charsets.lib.php:373
 msgid "unknown"
 msgstr "desconocido"
 
-#: libraries/controllers/StructureController.class.php:1957
-#: templates/structure/check_all_table_column.phtml:11
-msgid "Change"
-msgstr "Cambiar"
-
-#: libraries/controllers/StructureController.class.php:1961
-#: libraries/controllers/StructureController.class.php:1966
-#: libraries/navigation/Nodes/Node_Index.class.php:30
-#: libraries/tracking.lib.php:926
-#: templates/columns_definitions/column_indexes.phtml:16
-#: templates/columns_definitions/table_fields_definitions.phtml:57
-#: templates/structure/check_all_table_column.phtml:30
-#: templates/structure/display_structure.phtml:79
-#: templates/structure/display_table_stats.phtml:19
-msgid "Index"
-msgstr "Índice"
-
-#: libraries/controllers/StructureController.class.php:1963
-#: libraries/controllers/StructureController.class.php:1968
-#: templates/columns_definitions/column_indexes.phtml:27
-#: templates/structure/check_all_table_column.phtml:37
-msgid "Spatial"
-msgstr "Espacial"
-
-#: libraries/controllers/StructureController.class.php:1964
-#: libraries/controllers/StructureController.class.php:1969
-#: templates/columns_definitions/column_indexes.phtml:22
-#: templates/structure/check_all_table_column.phtml:47
-msgid "Fulltext"
-msgstr "Texto completo"
-
-#: libraries/controllers/StructureController.class.php:1970
-msgid "Distinct values"
-msgstr "Valores distintos"
-
 #: libraries/controllers/TableChartController.class.php:82
 #: libraries/controllers/TableGisVisualizationController.class.php:101
 msgid "No SQL query was set to fetch data."
@@ -8249,11 +8194,18 @@ msgstr "No existen columnas numéricas en la tabla a graficar."
 msgid "No data to display"
 msgstr "No hay datos para mostrar"
 
-#: libraries/controllers/TableRelationController.class.php:217
+#: libraries/controllers/TableIndexesController.class.php:161
+#: libraries/controllers/TableStructureController.class.php:736
+#: tbl_addfield.php:92
+#, php-format
+msgid "Table %1$s has been altered successfully."
+msgstr "Los cambios en la Tabla %1$s se hicieron exitosamente."
+
+#: libraries/controllers/TableRelationController.class.php:218
 msgid "Display column was successfully updated."
 msgstr "La columna se actualizó satisfactoriamente."
 
-#: libraries/controllers/TableRelationController.class.php:283
+#: libraries/controllers/TableRelationController.class.php:288
 msgid "Internal relations were successfully updated."
 msgstr "Las relaciones internas se actualizaron satisfactoriamente."
 
@@ -8266,10 +8218,74 @@ msgid "Zoom search"
 msgstr "Búsqueda visual"
 
 #: libraries/controllers/TableSearchController.class.php:852
-#: templates/table/selection_form.phtml:59
+#: templates/table/search/selection_form.phtml:59
 msgid "Find and replace"
 msgstr "Buscar y reemplazar"
 
+#: libraries/controllers/TableStructureController.class.php:163
+#, php-format
+msgid "The name '%s' is a MySQL reserved keyword."
+msgid_plural "The names '%s' are MySQL reserved keywords."
+msgstr[0] "El nombre «%s» es una palabra clave reservada de MySQL."
+msgstr[1] "Los nombres «%s» es una palabra clave reservada de MySQL."
+
+#: libraries/controllers/TableStructureController.class.php:241
+msgid "No column selected."
+msgstr "No se seleccionaron columnas."
+
+#: libraries/controllers/TableStructureController.class.php:467
+msgid "The columns have been moved successfully."
+msgstr "Las columnas fueron movidas exitosamente."
+
+#: libraries/controllers/TableStructureController.class.php:730
+#, fuzzy, php-format
+#| msgid "Table %1$s has been altered successfully."
+msgid ""
+"Table %1$s has been altered successfully. Privileges have been adjusted."
+msgstr ""
+"Los cambios en la Tabla %1$s se hicieron exitosamente. Los privilegios se "
+"ajustaron."
+
+#: libraries/controllers/TableStructureController.class.php:783
+#: libraries/tracking.lib.php:1094
+msgid "Query error"
+msgstr "Errores de consulta"
+
+#: libraries/controllers/TableStructureController.class.php:948
+#: templates/table/structure/check_all_table_column.phtml:11
+msgid "Change"
+msgstr "Cambiar"
+
+#: libraries/controllers/TableStructureController.class.php:952
+#: libraries/controllers/TableStructureController.class.php:957
+#: libraries/navigation/Nodes/Node_Index.class.php:30
+#: libraries/tracking.lib.php:926
+#: templates/columns_definitions/column_indexes.phtml:16
+#: templates/columns_definitions/table_fields_definitions.phtml:57
+#: templates/table/structure/check_all_table_column.phtml:30
+#: templates/table/structure/display_structure.phtml:79
+#: templates/table/structure/display_table_stats.phtml:19
+msgid "Index"
+msgstr "Índice"
+
+#: libraries/controllers/TableStructureController.class.php:954
+#: libraries/controllers/TableStructureController.class.php:959
+#: templates/columns_definitions/column_indexes.phtml:27
+#: templates/table/structure/check_all_table_column.phtml:37
+msgid "Spatial"
+msgstr "Espacial"
+
+#: libraries/controllers/TableStructureController.class.php:955
+#: libraries/controllers/TableStructureController.class.php:960
+#: templates/columns_definitions/column_indexes.phtml:22
+#: templates/table/structure/check_all_table_column.phtml:47
+msgid "Fulltext"
+msgstr "Texto completo"
+
+#: libraries/controllers/TableStructureController.class.php:963
+msgid "Distinct values"
+msgstr "Valores distintos"
+
 #: libraries/core.lib.php:306
 #, php-format
 msgid "The %s extension is missing. Please check your PHP configuration."
@@ -8316,7 +8332,7 @@ msgid "No Password"
 msgstr "Sin contraseña"
 
 #: libraries/display_change_password.lib.php:68
-#: libraries/plugins/auth/AuthenticationCookie.class.php:199
+#: libraries/plugins/auth/AuthenticationCookie.class.php:187
 #: libraries/replication_gui.lib.php:422 libraries/replication_gui.lib.php:862
 #: libraries/server_privileges.lib.php:1640
 msgid "Password:"
@@ -9125,13 +9141,13 @@ msgid "Dump has been saved to file %s."
 msgstr "El volcado ha sido guardado al archivo %s."
 
 #: libraries/import.lib.php:202 libraries/insert_edit.lib.php:124
-#: libraries/rte/rte_routines.lib.php:1353 libraries/sql.lib.php:1312
+#: libraries/rte/rte_routines.lib.php:1444 libraries/sql.lib.php:1306
 #: tbl_get_field.php:44
 msgid "MySQL returned an empty result set (i.e. zero rows)."
 msgstr ""
 "MySQL ha devuelto un conjunto de valores vacío (es decir: cero columnas)."
 
-#: libraries/import.lib.php:265 libraries/sql.lib.php:1326
+#: libraries/import.lib.php:265 libraries/sql.lib.php:1320
 msgid "[ROLLBACK occurred.]"
 msgstr "[Ocurrió un ROLLBACK.]"
 
@@ -9199,14 +9215,14 @@ msgstr "Crear un índice en &nbsp;%s&nbsp;columna(s)"
 
 #: libraries/insert_edit.lib.php:233
 #: libraries/navigation/Nodes/Node_DatabaseChild.class.php:48
-#: templates/designer/table_list.phtml:40
+#: templates/database/designer/table_list.phtml:40
 msgid "Hide"
 msgstr "Ocultar"
 
 #: libraries/insert_edit.lib.php:249
 #: libraries/navigation/Nodes/Node_Function.class.php:32
-#: libraries/rte/rte_routines.lib.php:1495
-#: templates/table/table_header.phtml:4
+#: libraries/rte/rte_routines.lib.php:1586
+#: templates/table/search/table_header.phtml:4
 msgid "Function"
 msgstr "Función"
 
@@ -9219,84 +9235,85 @@ msgstr "Binario"
 msgid "Because of its length,<br /> this column might not be editable."
 msgstr "Debido a su longitud,<br /> esta columna podría no ser editable."
 
-#: libraries/insert_edit.lib.php:1050
+#: libraries/insert_edit.lib.php:1048
 msgid "Binary - do not edit"
 msgstr "Binario - no editar"
 
-#: libraries/insert_edit.lib.php:1176 libraries/server_privileges.lib.php:470
-#: templates/table/options.phtml:36
+#: libraries/insert_edit.lib.php:1174 libraries/server_privileges.lib.php:470
+#: templates/table/search/options.phtml:36
 msgid "Or"
 msgstr "O"
 
-#: libraries/insert_edit.lib.php:1177
+#: libraries/insert_edit.lib.php:1175
 msgid "web server upload directory:"
 msgstr "directorio en el servidor web para subir los archivos:"
 
-#: libraries/insert_edit.lib.php:1348 templates/table/input_box.phtml:49
+#: libraries/insert_edit.lib.php:1346
+#: templates/table/search/input_box.phtml:49
 msgid "Edit/Insert"
 msgstr "Editar/Insertar"
 
-#: libraries/insert_edit.lib.php:1398
+#: libraries/insert_edit.lib.php:1396
 #, php-format
 msgid "Continue insertion with %s rows"
 msgstr "Continuar inserción con %s filas"
 
-#: libraries/insert_edit.lib.php:1428
+#: libraries/insert_edit.lib.php:1426
 msgid "and then"
 msgstr "y luego"
 
-#: libraries/insert_edit.lib.php:1461
+#: libraries/insert_edit.lib.php:1459
 msgid "Insert as new row"
 msgstr "Insertar como una nueva fila"
 
-#: libraries/insert_edit.lib.php:1464
+#: libraries/insert_edit.lib.php:1462
 msgid "Insert as new row and ignore errors"
 msgstr "Agregar como nueva fila e ignorar errores"
 
-#: libraries/insert_edit.lib.php:1467
+#: libraries/insert_edit.lib.php:1465
 msgid "Show insert query"
 msgstr "Mostrar consulta de inserción"
 
-#: libraries/insert_edit.lib.php:1487
+#: libraries/insert_edit.lib.php:1485
 msgid "Go back to previous page"
 msgstr "Volver"
 
-#: libraries/insert_edit.lib.php:1490
+#: libraries/insert_edit.lib.php:1488
 msgid "Insert another new row"
 msgstr "Insertar un nuevo registro"
 
-#: libraries/insert_edit.lib.php:1495
+#: libraries/insert_edit.lib.php:1493
 msgid "Go back to this page"
 msgstr "Volver a esta página"
 
-#: libraries/insert_edit.lib.php:1518
+#: libraries/insert_edit.lib.php:1516
 msgid "Edit next row"
 msgstr "Editar la siguiente fila"
 
-#: libraries/insert_edit.lib.php:1540
+#: libraries/insert_edit.lib.php:1538
 msgid ""
 "Use TAB key to move from value to value, or CTRL+arrows to move anywhere"
 msgstr ""
 "Use la tecla TAB para saltar de un valor a otro, o CTRL+flechas para moverse "
 "a cualquier parte"
 
-#: libraries/insert_edit.lib.php:1577 libraries/replication_gui.lib.php:542
-#: libraries/rte/rte_routines.lib.php:1497
+#: libraries/insert_edit.lib.php:1575 libraries/replication_gui.lib.php:542
+#: libraries/rte/rte_routines.lib.php:1588
 #: libraries/server_status_variables.lib.php:220
-#: templates/designer/having_query_panel.phtml:100
-#: templates/designer/options_panel.phtml:73
-#: templates/designer/options_panel.phtml:239
-#: templates/designer/where_query_panel.phtml:69
-#: templates/table/table_header.phtml:10
-#: templates/table/zoom_result_form.phtml:35
+#: templates/database/designer/having_query_panel.phtml:100
+#: templates/database/designer/options_panel.phtml:73
+#: templates/database/designer/options_panel.phtml:239
+#: templates/database/designer/where_query_panel.phtml:69
+#: templates/table/search/table_header.phtml:10
+#: templates/table/search/zoom_result_form.phtml:35
 msgid "Value"
 msgstr "Valor"
 
-#: libraries/insert_edit.lib.php:1937 libraries/sql.lib.php:1309
+#: libraries/insert_edit.lib.php:1935 libraries/sql.lib.php:1303
 msgid "Showing SQL query"
 msgstr "Mostrando la consulta SQL"
 
-#: libraries/insert_edit.lib.php:1962 libraries/sql.lib.php:1287
+#: libraries/insert_edit.lib.php:1960 libraries/sql.lib.php:1281
 #, php-format
 msgid "Inserted row id: %1$d"
 msgstr "La Id de la fila insertada es: %1$d"
@@ -9709,7 +9726,7 @@ msgstr "Nuevo"
 #: libraries/navigation/Nodes/Node_View_Container.class.php:26
 #: libraries/navigation/Nodes/Node_View_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:129
-#: templates/structure/show_create.phtml:30
+#: templates/database/structure/show_create.phtml:30
 msgid "Views"
 msgstr "Vistas"
 
@@ -10049,7 +10066,7 @@ msgstr ""
 
 #: libraries/operations.lib.php:101 libraries/operations.lib.php:249
 #: libraries/operations.lib.php:869 libraries/operations.lib.php:963
-#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:907
+#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:998
 #: templates/columns_definitions/table_fields_definitions.phtml:47
 msgid "Adjust Privileges"
 msgstr "Ajustar los privilegios"
@@ -10139,22 +10156,22 @@ msgid "Switch to copied table"
 msgstr "Cambiar a la tabla copiada"
 
 #: libraries/operations.lib.php:1360
-#: templates/structure/check_all_tables.phtml:18
+#: templates/database/structure/check_all_tables.phtml:18
 msgid "Table maintenance"
 msgstr "Mantenimiento de la tabla"
 
 #: libraries/operations.lib.php:1398
-#: templates/structure/check_all_tables.phtml:19
+#: templates/database/structure/check_all_tables.phtml:19
 msgid "Analyze table"
 msgstr "Analizar la tabla"
 
 #: libraries/operations.lib.php:1413
-#: templates/structure/check_all_tables.phtml:20
+#: templates/database/structure/check_all_tables.phtml:20
 msgid "Check table"
 msgstr "Revisar la tabla"
 
 #: libraries/operations.lib.php:1428
-#: templates/structure/check_all_tables.phtml:22
+#: templates/database/structure/check_all_tables.phtml:22
 msgid "Checksum table"
 msgstr "Tabla de suma de comprobación"
 
@@ -10172,18 +10189,19 @@ msgid "Flush the table (FLUSH)"
 msgstr "Vaciar el caché de la tabla (FLUSH)"
 
 #: libraries/operations.lib.php:1477
-#: templates/structure/check_all_tables.phtml:23
-#: templates/structure/display_table_stats.phtml:56
+#: templates/database/structure/check_all_tables.phtml:23
+#: templates/table/structure/display_table_stats.phtml:56
 msgid "Optimize table"
 msgstr "Optimizar la tabla"
 
 #: libraries/operations.lib.php:1492
-#: templates/structure/check_all_tables.phtml:24
+#: templates/database/structure/check_all_tables.phtml:24
 msgid "Repair table"
 msgstr "Reparar la tabla"
 
 #: libraries/operations.lib.php:1538
-#: templates/structure/check_all_tables.phtml:14 view_operations.php:127
+#: templates/database/structure/check_all_tables.phtml:14
+#: view_operations.php:127
 msgid "Delete data or table"
 msgstr "Borrar datos o tabla"
 
@@ -10308,7 +10326,7 @@ msgid "Cannot connect: invalid settings."
 msgstr "No se estableció la conexión: los parámetros están incorrectos."
 
 #: libraries/plugins/auth/AuthenticationConfig.class.php:108
-#: libraries/plugins/auth/AuthenticationCookie.class.php:134
+#: libraries/plugins/auth/AuthenticationCookie.class.php:122
 #: libraries/plugins/auth/AuthenticationHttp.class.php:96
 #, php-format
 msgid "Welcome to %s"
@@ -10339,38 +10357,38 @@ msgstr ""
 msgid "Retry to connect"
 msgstr "Reintentar conexión"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:146
+#: libraries/plugins/auth/AuthenticationCookie.class.php:134
 msgid "Your session has expired. Please log in again."
 msgstr "Su sesión expiró. Inicie sesión nuevamente."
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:170
+#: libraries/plugins/auth/AuthenticationCookie.class.php:158
 msgid "Log in"
 msgstr "Iniciar sesión"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:178
-#: libraries/plugins/auth/AuthenticationCookie.class.php:188
+#: libraries/plugins/auth/AuthenticationCookie.class.php:166
+#: libraries/plugins/auth/AuthenticationCookie.class.php:176
 msgid "You can enter hostname/IP address and port separated by space."
 msgstr ""
 "Puede escribir el nombre del proveedor de servicios/dirección IP y el "
 "puerto, separado por un espacio."
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:193
+#: libraries/plugins/auth/AuthenticationCookie.class.php:181
 msgid "Username:"
 msgstr "Usuario:"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:205
+#: libraries/plugins/auth/AuthenticationCookie.class.php:193
 msgid "Server Choice:"
 msgstr "Elección del servidor:"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:386
+#: libraries/plugins/auth/AuthenticationCookie.class.php:374
 msgid "Entered captcha is wrong, try again!"
 msgstr "El captcha introducido es incorrecto, ¡intente nuevamente!"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:396
+#: libraries/plugins/auth/AuthenticationCookie.class.php:384
 msgid "Please enter correct captcha!"
 msgstr "¡Introduzca el captcha correcto!"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:423
+#: libraries/plugins/auth/AuthenticationCookie.class.php:411
 msgid "You are not allowed to log in to this MySQL server!"
 msgstr "¡No puede conectarse en este servidor MySQL!"
 
@@ -10468,7 +10486,7 @@ msgstr "Evento"
 #: libraries/plugins/export/ExportOdt.class.php:593
 #: libraries/plugins/export/ExportTexytext.class.php:428
 #: libraries/plugins/export/PMA_ExportPdf.class.php:313
-#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:984
 #: libraries/rte/rte_triggers.lib.php:377
 msgid "Definition"
 msgstr "Definición"
@@ -10790,7 +10808,7 @@ msgid "Last check:"
 msgstr "Última revisión:"
 
 #: libraries/plugins/export/ExportSql.class.php:1399
-#: templates/structure/structure_table_row.phtml:183
+#: templates/database/structure/structure_table_row.phtml:183
 msgid "in use"
 msgstr "en uso"
 
@@ -10987,20 +11005,16 @@ msgstr "La extensión espacial MySQL no soporta el tipo ESRI \"%s\"."
 msgid "The imported file does not contain any data!"
 msgstr "¡El archivo importado no contiene datos!"
 
-#: libraries/plugins/import/ImportSql.class.php:169
+#: libraries/plugins/import/ImportSql.class.php:72
 msgid "SQL compatibility mode:"
 msgstr "Modalidad SQL compatible:"
 
 # Activates use of compatibility mode http://dev.mysql.com/doc/refman/5.0/en
 # /server-sql-mode.html#sqlmode_no_auto_value_on_zero
-#: libraries/plugins/import/ImportSql.class.php:181
+#: libraries/plugins/import/ImportSql.class.php:84
 msgid "Do not use <code>AUTO_INCREMENT</code> for zero values"
 msgstr "No utilizar <code>AUTO_INCREMENT</code> con el valor 0"
 
-#: libraries/plugins/import/ImportSql.class.php:195
-msgid "Read as multibytes"
-msgstr "Leer como conjunto de Bytes"
-
 #: libraries/plugins/import/ImportXml.class.php:54
 msgid "XML"
 msgstr "XML"
@@ -11043,7 +11057,7 @@ msgid "Show grid"
 msgstr "Mostrar la cuadrícula"
 
 #: libraries/plugins/schema/SchemaPdf.class.php:94
-#: templates/structure/print_view_data_dictionary_link.phtml:6
+#: templates/database/structure/print_view_data_dictionary_link.phtml:6
 msgid "Data Dictionary"
 msgstr "Diccionario de datos"
 
@@ -11068,7 +11082,7 @@ msgid "The %s table doesn't exist!"
 msgstr "¡La tabla %s no existe!"
 
 #: libraries/plugins/schema/eps/Eps_Relation_Schema.class.php:321
-#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:309
+#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:323
 #, php-format
 msgid "Schema of the %s database - Page %s"
 msgstr "Esquema de la base de datos %s - Página %s"
@@ -11096,7 +11110,7 @@ msgstr "Tabla de contenidos"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1005
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1028
 #: libraries/tracking.lib.php:884
-#: templates/structure/table_structure_header.phtml:11
+#: templates/table/structure/table_structure_header.phtml:11
 msgid "Extra"
 msgstr "Extra"
 
@@ -11466,11 +11480,11 @@ msgstr "Pasos rápidos para configurar funcionalidades avanzadas:"
 msgid "Create the needed tables with the <code>%screate_tables.sql</code>."
 msgstr "Crear las tablas necesarias con <code>%screate_tables.sql</code>."
 
-#: libraries/relation.lib.php:360
+#: libraries/relation.lib.php:357
 msgid "Create a pma user and give access to these tables."
 msgstr "Crear un usuario pma y permitir acceso a estas tablas."
 
-#: libraries/relation.lib.php:365
+#: libraries/relation.lib.php:360
 msgid ""
 "Enable advanced features in configuration file (<code>config.inc.php</"
 "code>), for example by starting from <code>config.sample.inc.php</code>."
@@ -11479,17 +11493,17 @@ msgstr ""
 "(<code>config.inc.php</code>), por ejemplo comenzando desde <code>config."
 "sample.inc.php</code>."
 
-#: libraries/relation.lib.php:373
+#: libraries/relation.lib.php:365
 msgid "Re-login to phpMyAdmin to load the updated configuration file."
 msgstr ""
 "Inicie sesión en phpMyAdmin nuevamente para cargar el archivo de "
 "configuración actualizado."
 
-#: libraries/relation.lib.php:1612
+#: libraries/relation.lib.php:1607
 msgid "no description"
 msgstr "Sin descripción"
 
-#: libraries/relation.lib.php:1811
+#: libraries/relation.lib.php:1806
 msgid ""
 "You do not have necessary privileges to create a database named "
 "'phpmyadmin'. You may go to 'Operations' tab of any database to set up the "
@@ -11499,7 +11513,7 @@ msgstr ""
 "'phpmyadmin'. Puede ir a la pestaña de 'Operaciones' de cualquier base de "
 "datos para configurar el almacenamiento de configuración en phpMyAdmin."
 
-#: libraries/relation.lib.php:1928
+#: libraries/relation.lib.php:1923
 #, php-format
 msgid ""
 "%sCreate%s a database named 'phpmyadmin' and setup the phpMyAdmin "
@@ -11508,7 +11522,7 @@ msgstr ""
 "%sCree%s una base de datos llamada 'phpmyadmin' y configure el "
 "almacenamiento de configuración en phpMyAdmin."
 
-#: libraries/relation.lib.php:1936
+#: libraries/relation.lib.php:1931
 #, php-format
 msgid ""
 "%sCreate%s the phpMyAdmin configuration storage in the current database."
@@ -11516,14 +11530,14 @@ msgstr ""
 "%sCrear%s las tablas de almacenamiento de configuración de phpMyAdmin en la "
 "base de datos actual."
 
-#: libraries/relation.lib.php:1944
+#: libraries/relation.lib.php:1939
 #, php-format
 msgid "%sCreate%s missing phpMyAdmin configuration storage tables."
 msgstr ""
 "%sCree%s las tablas en las que se guarda la configuración de phpMyAdmin."
 
 #: libraries/replication_gui.lib.php:46 libraries/replication_gui.lib.php:343
-#: libraries/server_databases.lib.php:387
+#: libraries/server_databases.lib.php:398
 msgid "Master replication"
 msgstr "Replicación maestra"
 
@@ -11590,7 +11604,7 @@ msgstr ""
 "configurado como maestro."
 
 #: libraries/replication_gui.lib.php:141
-#: libraries/server_databases.lib.php:389
+#: libraries/server_databases.lib.php:400
 msgid "Slave replication"
 msgstr "Replicación esclava"
 
@@ -11867,10 +11881,10 @@ msgid "Master server changed successfully to %s."
 msgstr "El servidor maestro fue cambiado exitosamente a %s."
 
 #: libraries/rte/rte_events.lib.php:106 libraries/rte/rte_events.lib.php:115
-#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:149
-#: libraries/rte/rte_routines.lib.php:158
-#: libraries/rte/rte_routines.lib.php:231
-#: libraries/rte/rte_routines.lib.php:1362
+#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:219
+#: libraries/rte/rte_routines.lib.php:246
+#: libraries/rte/rte_routines.lib.php:368
+#: libraries/rte/rte_routines.lib.php:1453
 #: libraries/rte/rte_triggers.lib.php:82 libraries/rte/rte_triggers.lib.php:91
 #: libraries/rte/rte_triggers.lib.php:123
 #, php-format
@@ -11891,7 +11905,7 @@ msgstr "Se modificó el evento %1$s."
 msgid "Event %1$s has been created."
 msgstr "Se creó el evento %1$s."
 
-#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:251
+#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:266
 #: libraries/rte/rte_triggers.lib.php:144
 msgid "One or more errors have occurred while processing your request:"
 msgstr "Ocurrieron uno o más errores al procesar el pedido:"
@@ -11900,7 +11914,7 @@ msgstr "Ocurrieron uno o más errores al procesar el pedido:"
 msgid "Edit event"
 msgstr "Editar evento"
 
-#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:794
+#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:885
 #: libraries/rte/rte_triggers.lib.php:323 view_create.php:180
 msgid "Details"
 msgstr "Detalles"
@@ -11913,7 +11927,7 @@ msgstr "Nombre del evento"
 msgid "Event type"
 msgstr "Tipo de evento"
 
-#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:817
+#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:908
 #, php-format
 msgid "Change to %s"
 msgstr "Cambiar a %s"
@@ -11940,12 +11954,14 @@ msgstr "Fin"
 msgid "On completion preserve"
 msgstr "Preservar al completar"
 
-#: libraries/rte/rte_events.lib.php:491 libraries/rte/rte_routines.lib.php:930
+#: libraries/rte/rte_events.lib.php:491
+#: libraries/rte/rte_routines.lib.php:1021
 #: libraries/rte/rte_triggers.lib.php:383 view_create.php:209
 msgid "Definer"
 msgstr "Definidor"
 
-#: libraries/rte/rte_events.lib.php:535 libraries/rte/rte_routines.lib.php:997
+#: libraries/rte/rte_events.lib.php:535
+#: libraries/rte/rte_routines.lib.php:1088
 #: libraries/rte/rte_triggers.lib.php:422
 msgid "The definer must be in the \"username@hostname\" format!"
 msgstr "¡El definidor tiene que ser en el formato \"usuario@sistema\"!"
@@ -11971,9 +11987,9 @@ msgid "You must provide an event definition."
 msgstr "Debe proveer una definición de evento."
 
 #: libraries/rte/rte_export.lib.php:43 libraries/rte/rte_general.lib.php:72
-#: libraries/rte/rte_routines.lib.php:345
-#: libraries/rte/rte_routines.lib.php:1198
-#: libraries/rte/rte_routines.lib.php:1411
+#: libraries/rte/rte_routines.lib.php:153
+#: libraries/rte/rte_routines.lib.php:1289
+#: libraries/rte/rte_routines.lib.php:1502
 msgid "Error in processing request:"
 msgstr "Error al procesar la petición:"
 
@@ -12009,72 +12025,72 @@ msgstr ""
 "guardadas puede fallar[/strong]. Utilice la extensión mejorada «mysqli» para "
 "evitar problemas."
 
-#: libraries/rte/rte_routines.lib.php:110
-#: libraries/rte/rte_routines.lib.php:1006
+#: libraries/rte/rte_routines.lib.php:123
+msgid "Edit routine"
+msgstr "Editar rutina"
+
+#: libraries/rte/rte_routines.lib.php:200
+#: libraries/rte/rte_routines.lib.php:1097
 #, php-format
 msgid "Invalid routine type: \"%s\""
 msgstr "Tipo de rutina inválido: \"%s\""
 
-#: libraries/rte/rte_routines.lib.php:170
-msgid "Sorry, we failed to restore the dropped routine."
-msgstr "Pedimos disculpas por no haber podido recuperar la rutina eliminada."
-
-#: libraries/rte/rte_routines.lib.php:211
-#, php-format
-msgid "Routine %1$s has been modified. Privileges have been adjusted."
-msgstr "Se modificó la rutina %1$s. Los privilegios se ajustaron."
-
-#: libraries/rte/rte_routines.lib.php:216
-#, php-format
-msgid "Routine %1$s has been modified."
-msgstr "Se modificó la rutina %1$s."
-
-#: libraries/rte/rte_routines.lib.php:238
+#: libraries/rte/rte_routines.lib.php:253
 #, php-format
 msgid "Routine %1$s has been created."
 msgstr "Se creó la rutina %1$s."
 
-#: libraries/rte/rte_routines.lib.php:315
-msgid "Edit routine"
-msgstr "Editar rutina"
+#: libraries/rte/rte_routines.lib.php:380
+msgid "Sorry, we failed to restore the dropped routine."
+msgstr "Pedimos disculpas por no haber podido recuperar la rutina eliminada."
 
-#: libraries/rte/rte_routines.lib.php:797
+#: libraries/rte/rte_routines.lib.php:439
+#, php-format
+msgid "Routine %1$s has been modified. Privileges have been adjusted."
+msgstr "Se modificó la rutina %1$s. Los privilegios se ajustaron."
+
+#: libraries/rte/rte_routines.lib.php:444
+#, php-format
+msgid "Routine %1$s has been modified."
+msgstr "Se modificó la rutina %1$s."
+
+#: libraries/rte/rte_routines.lib.php:888
 msgid "Routine name"
 msgstr "Nombre de rutina"
 
-#: libraries/rte/rte_routines.lib.php:823
+#: libraries/rte/rte_routines.lib.php:914
 msgid "Parameters"
 msgstr "Parámetros"
 
-#: libraries/rte/rte_routines.lib.php:829
+#: libraries/rte/rte_routines.lib.php:920
 msgid "Direction"
 msgstr "Dirección"
 
-#: libraries/rte/rte_routines.lib.php:847
+#: libraries/rte/rte_routines.lib.php:938
 msgid "Add parameter"
 msgstr "Agregar parámetro"
 
-#: libraries/rte/rte_routines.lib.php:851
+#: libraries/rte/rte_routines.lib.php:942
 msgid "Remove last parameter"
 msgstr "Eliminar último parámetro"
 
-#: libraries/rte/rte_routines.lib.php:856
+#: libraries/rte/rte_routines.lib.php:947
 msgid "Return type"
 msgstr "Retornar el tipo"
 
-#: libraries/rte/rte_routines.lib.php:862
+#: libraries/rte/rte_routines.lib.php:953
 msgid "Return length/values"
 msgstr "Retornar longitud/valores"
 
-#: libraries/rte/rte_routines.lib.php:868
+#: libraries/rte/rte_routines.lib.php:959
 msgid "Return options"
 msgstr "Retornar opciones"
 
-#: libraries/rte/rte_routines.lib.php:899
+#: libraries/rte/rte_routines.lib.php:990
 msgid "Is deterministic"
 msgstr "Es determinístico"
 
-#: libraries/rte/rte_routines.lib.php:920
+#: libraries/rte/rte_routines.lib.php:1011
 msgid ""
 "You do not have sufficient privileges to perform this operation; Please "
 "refer to the documentation for more details"
@@ -12082,25 +12098,25 @@ msgstr ""
 "Sin privilegios suficientes para realizar esta operación; Por favor, "
 "consulte la documentación para más detalles"
 
-#: libraries/rte/rte_routines.lib.php:935
+#: libraries/rte/rte_routines.lib.php:1026
 msgid "Security type"
 msgstr "Tipo de seguridad"
 
-#: libraries/rte/rte_routines.lib.php:944
+#: libraries/rte/rte_routines.lib.php:1035
 msgid "SQL data access"
 msgstr "Acceso de datos SQL"
 
-#: libraries/rte/rte_routines.lib.php:1013
+#: libraries/rte/rte_routines.lib.php:1104
 msgid "You must provide a routine name!"
 msgstr "¡Debe proveer un nombre de rutina!"
 
-#: libraries/rte/rte_routines.lib.php:1047
+#: libraries/rte/rte_routines.lib.php:1138
 #, php-format
 msgid "Invalid direction \"%s\" given for parameter."
 msgstr "Dirección \"%s\" inválida provista para el parámetro."
 
-#: libraries/rte/rte_routines.lib.php:1069
-#: libraries/rte/rte_routines.lib.php:1131
+#: libraries/rte/rte_routines.lib.php:1160
+#: libraries/rte/rte_routines.lib.php:1222
 msgid ""
 "You must provide length/values for routine parameters of type ENUM, SET, "
 "VARCHAR and VARBINARY."
@@ -12108,37 +12124,37 @@ msgstr ""
 "Debe proveer longitud/valores para los parámetros de tipo ENUM, SET, VARCHAR "
 "y VARBINARY."
 
-#: libraries/rte/rte_routines.lib.php:1095
+#: libraries/rte/rte_routines.lib.php:1186
 msgid "You must provide a name and a type for each routine parameter."
 msgstr "Debe proveer un nombre y tipo para cada parámetro de rutina."
 
-#: libraries/rte/rte_routines.lib.php:1114
+#: libraries/rte/rte_routines.lib.php:1205
 msgid "You must provide a valid return type for the routine."
 msgstr "Debe proveer un tipo de retorno válido para la rutina."
 
-#: libraries/rte/rte_routines.lib.php:1174
+#: libraries/rte/rte_routines.lib.php:1265
 msgid "You must provide a routine definition."
 msgstr "Debe proveer una definición de rutina."
 
-#: libraries/rte/rte_routines.lib.php:1285
+#: libraries/rte/rte_routines.lib.php:1376
 #, php-format
 msgid "Execution results of routine %s"
 msgstr "Resultados de la ejecución de la rutina %s"
 
-#: libraries/rte/rte_routines.lib.php:1340
+#: libraries/rte/rte_routines.lib.php:1431
 #, php-format
 msgid "%d row affected by the last statement inside the procedure."
 msgid_plural "%d rows affected by the last statement inside the procedure."
 msgstr[0] "%d fila afectada por la última sentencia del procedimiento."
 msgstr[1] "%d filas afectadas por la última sentencia del procedimiento."
 
-#: libraries/rte/rte_routines.lib.php:1398
-#: libraries/rte/rte_routines.lib.php:1406
+#: libraries/rte/rte_routines.lib.php:1489
+#: libraries/rte/rte_routines.lib.php:1497
 msgid "Execute routine"
 msgstr "Ejecutar rutina"
 
-#: libraries/rte/rte_routines.lib.php:1485
-#: libraries/rte/rte_routines.lib.php:1488
+#: libraries/rte/rte_routines.lib.php:1576
+#: libraries/rte/rte_routines.lib.php:1579
 msgid "Routine parameters"
 msgstr "Parámetros de rutina"
 
@@ -12294,7 +12310,7 @@ msgid "Original position"
 msgstr "Posición original"
 
 #: libraries/server_bin_log.lib.php:133
-#: templates/structure/display_table_stats.phtml:4
+#: templates/table/structure/display_table_stats.phtml:4
 msgid "Information"
 msgstr "Información"
 
@@ -12332,12 +12348,12 @@ msgstr ""
 "Nota: Activar aquí las estadísticas de la base de datos podría causar "
 "tráfico pesado entre el servidor web y el servidor MySQL."
 
-#: libraries/server_databases.lib.php:364
-#: libraries/server_databases.lib.php:365
+#: libraries/server_databases.lib.php:366
+#: libraries/server_databases.lib.php:371
 msgid "Enable Statistics"
 msgstr "Activar las estadísticas"
 
-#: libraries/server_databases.lib.php:481
+#: libraries/server_databases.lib.php:492
 #, php-format
 msgid "%1$d database has been dropped successfully."
 msgid_plural "%1$d databases have been dropped successfully."
@@ -12716,7 +12732,7 @@ msgid "You have revoked the privileges for %s."
 msgstr "Ha revocado los privilegios para %s."
 
 #: libraries/server_privileges.lib.php:2059
-#: libraries/server_privileges.lib.php:4290
+#: libraries/server_privileges.lib.php:4316
 msgid "Add user account"
 msgstr "Agregar cuenta de usuario"
 
@@ -12888,36 +12904,36 @@ msgstr "Borrando %s"
 msgid "The privileges were reloaded successfully."
 msgstr "Los privilegios fueron cargados nuevamente de manera exitosa."
 
-#: libraries/server_privileges.lib.php:3994
+#: libraries/server_privileges.lib.php:4003
 #, php-format
 msgid "The user %s already exists!"
 msgstr "¡El usuario %s ya existe!"
 
-#: libraries/server_privileges.lib.php:4232
+#: libraries/server_privileges.lib.php:4258
 #, php-format
 msgid "Privileges for %s"
 msgstr "Privilegios para %s"
 
-#: libraries/server_privileges.lib.php:4241
+#: libraries/server_privileges.lib.php:4267
 #: libraries/server_status_processes.lib.php:72
 #: libraries/server_user_groups.lib.php:39
 msgid "User"
 msgstr "Usuario"
 
-#: libraries/server_privileges.lib.php:4282
+#: libraries/server_privileges.lib.php:4308
 msgctxt "Create new user"
 msgid "New"
 msgstr "Nuevo"
 
-#: libraries/server_privileges.lib.php:4311
+#: libraries/server_privileges.lib.php:4337
 msgid "Edit privileges:"
 msgstr "Editar los privilegios:"
 
-#: libraries/server_privileges.lib.php:4312
+#: libraries/server_privileges.lib.php:4338
 msgid "User account"
 msgstr "Cuenta de usuario"
 
-#: libraries/server_privileges.lib.php:4371
+#: libraries/server_privileges.lib.php:4397
 msgid ""
 "Note: You are attempting to edit privileges of the user with which you are "
 "currently logged in."
@@ -12925,11 +12941,11 @@ msgstr ""
 "Nota: está intentando editar los privilegios del usuario con el que inició "
 "la sesión actual."
 
-#: libraries/server_privileges.lib.php:4391 libraries/server_users.lib.php:25
+#: libraries/server_privileges.lib.php:4417 libraries/server_users.lib.php:25
 msgid "User accounts overview"
 msgstr "Vista global de las cuentas de usuario"
 
-#: libraries/server_privileges.lib.php:4459
+#: libraries/server_privileges.lib.php:4485
 msgid ""
 "A user account allowing any user from localhost to connect is present. This "
 "will prevent other users from connecting if the host part of their account "
@@ -12939,7 +12955,7 @@ msgstr ""
 "conectarse. Esto evitará conectarse a otros usuarios, si la parte del host "
 "de su cuenta permite una conexión desde cualquier host (%)."
 
-#: libraries/server_privileges.lib.php:4500
+#: libraries/server_privileges.lib.php:4526
 #, php-format
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
@@ -12953,7 +12969,7 @@ msgstr ""
 "manuales en él. En este caso, nuevamente deberá %scargar la página de "
 "privilegios%s antes de continuar."
 
-#: libraries/server_privileges.lib.php:4519
+#: libraries/server_privileges.lib.php:4545
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
 "tables. The content of these tables may differ from the privileges the "
@@ -12967,25 +12983,25 @@ msgstr ""
 "manuales en él. En este caso, los privilegios deberán actualizarse pero "
 "actualmente, no tiene el privilegio RELOAD."
 
-#: libraries/server_privileges.lib.php:4569
+#: libraries/server_privileges.lib.php:4595
 msgid "The selected user was not found in the privilege table."
 msgstr "El usuario que seleccionó no se encontró en la tabla de privilegios."
 
-#: libraries/server_privileges.lib.php:4801
+#: libraries/server_privileges.lib.php:4827
 msgid "You have added a new user."
 msgstr "Ha agregado un nuevo usuario."
 
-#: libraries/server_status.lib.php:53
+#: libraries/server_status.lib.php:60
 #, php-format
 msgid "Network traffic since startup: %s"
 msgstr "Tráfico de red desde el inicio: %s"
 
-#: libraries/server_status.lib.php:66
+#: libraries/server_status.lib.php:73
 #, php-format
 msgid "This MySQL server has been running for %1$s. It started up on %2$s."
 msgstr "Este servidor MySQL ha estado activo durante %1$s. Se inició en %2$s."
 
-#: libraries/server_status.lib.php:80
+#: libraries/server_status.lib.php:94
 msgid ""
 "This MySQL server works as <b>master</b> and <b>slave</b> in <b>replication</"
 "b> process."
@@ -12993,23 +13009,23 @@ msgstr ""
 "Este servidor MySQL trabaja como <b>maestro</b> y <b>esclavo</b> en un "
 "proceso de <b>replicación</b>."
 
-#: libraries/server_status.lib.php:85
+#: libraries/server_status.lib.php:99
 msgid "This MySQL server works as <b>master</b> in <b>replication</b> process."
 msgstr ""
 "Este servidor MySQL trabaja como <b>maestro</b> en un proceso de "
 "<b>replicación</b>."
 
-#: libraries/server_status.lib.php:90
+#: libraries/server_status.lib.php:104
 msgid "This MySQL server works as <b>slave</b> in <b>replication</b> process."
 msgstr ""
 "Este servidor MySQL trabaja como <b>esclavo</b> en un proceso de "
 "<b>replicación</b>."
 
-#: libraries/server_status.lib.php:106
+#: libraries/server_status.lib.php:116
 msgid "Replication status"
 msgstr "Estado de replicación"
 
-#: libraries/server_status.lib.php:137
+#: libraries/server_status.lib.php:146
 msgid ""
 "On a busy server, the byte counters may overrun, so those statistics as "
 "reported by the MySQL server may be incorrect."
@@ -13018,19 +13034,19 @@ msgstr ""
 "pueden excederse. Por tanto, las estadísticas reportadas por el servidor "
 "MySQL pueden ser incorrectas."
 
-#: libraries/server_status.lib.php:148
+#: libraries/server_status.lib.php:157
 msgid "Received"
 msgstr "Recibido"
 
-#: libraries/server_status.lib.php:167
+#: libraries/server_status.lib.php:176
 msgid "Sent"
 msgstr "Enviado"
 
-#: libraries/server_status.lib.php:234
+#: libraries/server_status.lib.php:243
 msgid "Max. concurrent connections"
 msgstr "Máximas conexiones concurrentes"
 
-#: libraries/server_status.lib.php:244
+#: libraries/server_status.lib.php:253
 msgid "Failed attempts"
 msgstr "Intentos fallidos"
 
@@ -14135,7 +14151,7 @@ msgstr "Esta es una variable de sólo lectura y no puede ser editada"
 msgid "Not implemented yet."
 msgstr "Aún no implementado."
 
-#: libraries/sql-parser/src/Components/AlterOperation.php:193
+#: libraries/sql-parser/src/Components/AlterOperation.php:191
 msgid "Unrecognized alter operation."
 msgstr "Operación de modificación desconocida."
 
@@ -14150,7 +14166,7 @@ msgstr ""
 "Se esperaba un corchete de apertura seguido por un conjunto de valores."
 
 #: libraries/sql-parser/src/Components/ArrayObj.php:101
-#: libraries/sql-parser/src/Components/FieldDefinition.php:202
+#: libraries/sql-parser/src/Components/CreateDefinition.php:202
 msgid "An opening bracket was expected."
 msgstr "Se esperaba un corchete de apertura."
 
@@ -14158,25 +14174,33 @@ msgstr "Se esperaba un corchete de apertura."
 msgid "A comma or a closing bracket was expected"
 msgstr "Se esperaba una coma o un corchete de cierre"
 
+#: libraries/sql-parser/src/Components/CreateDefinition.php:246
+msgid "A comma or a closing bracket was expected."
+msgstr "Se esperaba una coma o un corchete de cierre."
+
+#: libraries/sql-parser/src/Components/CreateDefinition.php:262
+msgid "A closing bracket was expected."
+msgstr "Se esperaba un corchete de cierre."
+
 #: libraries/sql-parser/src/Components/DataType.php:125
 msgid "Unrecognized data type."
 msgstr "Tipo de dato desconocido."
 
-#: libraries/sql-parser/src/Components/Expression.php:225
+#: libraries/sql-parser/src/Components/Expression.php:227
 msgid "Unexpected closing bracket."
 msgstr "Corchete de cierre inesperado."
 
-#: libraries/sql-parser/src/Components/Expression.php:246
-#: libraries/sql-parser/src/Components/Expression.php:283
-#: libraries/sql-parser/src/Components/Expression.php:303
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:285
+#: libraries/sql-parser/src/Components/Expression.php:305
 msgid "An alias was previously found."
 msgstr "Se encontró anteriormente un alias."
 
-#: libraries/sql-parser/src/Components/Expression.php:257
+#: libraries/sql-parser/src/Components/Expression.php:259
 msgid "Unexpected dot."
 msgstr "Punto inesperado."
 
-#: libraries/sql-parser/src/Components/Expression.php:327
+#: libraries/sql-parser/src/Components/Expression.php:329
 msgid "An alias was expected."
 msgstr "Se esperaba un alias."
 
@@ -14184,14 +14208,6 @@ msgstr "Se esperaba un alias."
 msgid "An expression was expected."
 msgstr "Se esperaba una expresión."
 
-#: libraries/sql-parser/src/Components/FieldDefinition.php:246
-msgid "A comma or a closing bracket was expected."
-msgstr "Se esperaba una coma o un corchete de cierre."
-
-#: libraries/sql-parser/src/Components/FieldDefinition.php:262
-msgid "A closing bracket was expected."
-msgstr "Se esperaba un corchete de cierre."
-
 #: libraries/sql-parser/src/Components/Limit.php:90
 #: libraries/sql-parser/src/Components/Limit.php:112
 msgid "An offset was expected."
@@ -14231,25 +14247,25 @@ msgstr "Espacio(s) en blanco esperado(s) antes de delimitador."
 msgid "Expected delimiter."
 msgstr "Delimitador esperado."
 
-#: libraries/sql-parser/src/Lexer.php:753
+#: libraries/sql-parser/src/Lexer.php:777
 #, fuzzy, php-format
 #| msgid "Event %1$s has been created."
 msgid "Ending quote %1$s was expected."
 msgstr "Se esperaba terminar la cita %1$s."
 
-#: libraries/sql-parser/src/Lexer.php:789
+#: libraries/sql-parser/src/Lexer.php:813
 msgid "Variable name was expected."
 msgstr "Se esperaba el nombre de la variable."
 
-#: libraries/sql-parser/src/Parser.php:380
+#: libraries/sql-parser/src/Parser.php:391
 msgid "Unexpected beginning of statement."
 msgstr "Comienzo inesperado de declaración."
 
-#: libraries/sql-parser/src/Parser.php:399
+#: libraries/sql-parser/src/Parser.php:410
 msgid "Unrecognized statement type."
 msgstr "Tipo de declaración desconocida."
 
-#: libraries/sql-parser/src/Parser.php:479
+#: libraries/sql-parser/src/Parser.php:489
 msgid "No transaction was previously started."
 msgstr ""
 
@@ -14281,8 +14297,10 @@ msgid "The name of the entity was expected."
 msgstr "El número de tablas que están abiertas."
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:310
-msgid "At least one field definition was expected."
-msgstr ""
+#, fuzzy
+#| msgid "A rename operation was expected."
+msgid "At least one column definition was expected."
+msgstr "Se esperaba un cambio de nombre."
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:329
 msgid "A \"RETURNS\" keyword was expected."
@@ -14342,11 +14360,11 @@ msgid "Using bookmark \"%s\" as default browse query."
 msgstr ""
 "Utilizando el favorito \"%s\" como consulta predeterminada para examinar."
 
-#: libraries/sql.lib.php:1306
+#: libraries/sql.lib.php:1300
 msgid "Showing as PHP code"
 msgstr "Mostrar como código PHP"
 
-#: libraries/sql.lib.php:1638
+#: libraries/sql.lib.php:1632
 #, php-format
 msgid ""
 "Current selection does not contain a unique column. Grid edit, checkbox, "
@@ -14355,7 +14373,7 @@ msgstr ""
 "La selección actual no contiene una columna única. La edición de la grilla y "
 "los enlaces de copiado, eliminación y edición no están disponibles. %s"
 
-#: libraries/sql.lib.php:1649
+#: libraries/sql.lib.php:1643
 #, fuzzy, php-format
 #| msgid ""
 #| "Current selection does not contain a unique column. Grid edit, checkbox, "
@@ -14367,7 +14385,7 @@ msgstr ""
 "La selección actual no contiene una columna única. La edición de la grilla y "
 "los enlaces de copiado, eliminación y edición no están disponibles."
 
-#: libraries/sql.lib.php:1688
+#: libraries/sql.lib.php:1682
 #, php-format
 msgid "Problems with indexes of table `%s`"
 msgstr "Problemas con los índices de la tabla `%s`"
@@ -14524,7 +14542,7 @@ msgid "Version %s snapshot (SQL code)"
 msgstr "Captura de la versión %s (código SQL)"
 
 #: libraries/tracking.lib.php:947
-#: templates/structure/table_structure_row.phtml:33
+#: templates/table/structure/table_structure_row.phtml:33
 msgctxt "None for default"
 msgid "None"
 msgstr "Ninguna"
@@ -14578,15 +14596,15 @@ msgstr "Se borró la versión %1$s de %2$s."
 msgid "Version %1$s was created, tracking for %2$s is active."
 msgstr "Se ha creado la versión %1$s, se ha activado el seguimiento para %2$s."
 
-#: libraries/user_preferences.inc.php:29
+#: libraries/user_preferences.inc.php:30
 msgid "Manage your settings"
 msgstr "Administrar tu configuración"
 
-#: libraries/user_preferences.inc.php:46 prefs_manage.php:307
+#: libraries/user_preferences.inc.php:54 prefs_manage.php:307
 msgid "Configuration has been saved."
 msgstr "Se guardó la configuración."
 
-#: libraries/user_preferences.inc.php:66
+#: libraries/user_preferences.inc.php:74
 #, php-format
 msgid ""
 "Your preferences will be saved for current session only. Storing them "
@@ -14994,7 +15012,7 @@ msgid "first"
 msgstr "primera"
 
 #: templates/columns_definitions/move_column.phtml:12
-#: templates/structure/add_column.phtml:21
+#: templates/table/structure/add_column.phtml:21
 #, php-format
 msgid "after %s"
 msgstr "después de %s"
@@ -15063,201 +15081,298 @@ msgstr "Transformación de entrada"
 msgid "Input transformation options"
 msgstr "Opciones de transformación de entrada"
 
-#: templates/designer/aggregate_query_panel.phtml:22
-#: templates/designer/options_panel.phtml:100
+#: templates/database/create_table.phtml:7
+#: templates/database/designer/side_menu.phtml:77
+#: templates/database/designer/side_menu.phtml:80
+msgid "Create table"
+msgstr "Crear tabla"
+
+#: templates/database/create_table.phtml:15
+msgid "Number of columns"
+msgstr "Número de columnas"
+
+#: templates/database/designer/aggregate_query_panel.phtml:22
+#: templates/database/designer/options_panel.phtml:100
 msgid "Aggregate"
 msgstr "Agregar"
 
-#: templates/designer/aggregate_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:61
-#: templates/designer/options_panel.phtml:106
-#: templates/designer/options_panel.phtml:170
-#: templates/designer/where_query_panel.phtml:30
-#: templates/table/table_header.phtml:9
+#: templates/database/designer/aggregate_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:61
+#: templates/database/designer/options_panel.phtml:106
+#: templates/database/designer/options_panel.phtml:170
+#: templates/database/designer/where_query_panel.phtml:30
+#: templates/table/search/table_header.phtml:9
 msgid "Operator"
 msgstr "Operador"
 
-#: templates/designer/database_tables.phtml:29
+#: templates/database/designer/database_tables.phtml:29
 #, fuzzy
 msgid "Toggle"
 msgstr "Conmutador"
 
-#: templates/designer/database_tables.phtml:40
+#: templates/database/designer/database_tables.phtml:40
 msgid "See table structure"
 msgstr "Ver estructura de tabla"
 
-#: templates/designer/delete_relation_panel.phtml:21
+#: templates/database/designer/delete_relation_panel.phtml:21
 msgid "Delete relation"
 msgstr "Eliminar la relación"
 
-#: templates/designer/edit_delete_pages.phtml:7
+#: templates/database/designer/edit_delete_pages.phtml:7
 msgid "Page to open"
 msgstr "Página a abrir"
 
-#: templates/designer/edit_delete_pages.phtml:7
+#: templates/database/designer/edit_delete_pages.phtml:7
 msgid "Page to delete"
 msgstr "Página a eliminar"
 
-#: templates/designer/having_query_panel.phtml:90
-#: templates/designer/options_panel.phtml:63
-#: templates/designer/options_panel.phtml:229
-#: templates/designer/where_query_panel.phtml:59
+#: templates/database/designer/having_query_panel.phtml:90
+#: templates/database/designer/options_panel.phtml:63
+#: templates/database/designer/options_panel.phtml:229
+#: templates/database/designer/where_query_panel.phtml:59
 msgid "Except"
 msgstr "Excepto"
 
-#: templates/designer/having_query_panel.phtml:102
-#: templates/designer/options_panel.phtml:75
-#: templates/designer/options_panel.phtml:241
-#: templates/designer/where_query_panel.phtml:71
+#: templates/database/designer/having_query_panel.phtml:102
+#: templates/database/designer/options_panel.phtml:75
+#: templates/database/designer/options_panel.phtml:241
+#: templates/database/designer/where_query_panel.phtml:71
 msgid "subquery"
 msgstr "sub-consulta"
 
-#: templates/designer/new_relation_panel.phtml:22
-#: templates/designer/side_menu.phtml:84 templates/designer/side_menu.phtml:87
+#: templates/database/designer/new_relation_panel.phtml:22
+#: templates/database/designer/side_menu.phtml:84
+#: templates/database/designer/side_menu.phtml:87
 msgid "Create relation"
 msgstr "Crear relación"
 
 # Relation refers to actual mathematical operations not the DB-related term
-#: templates/designer/options_panel.phtml:34
-#: templates/designer/options_panel.phtml:200
+#: templates/database/designer/options_panel.phtml:34
+#: templates/database/designer/options_panel.phtml:200
 msgid "Relation operator"
 msgstr "Operador de relación"
 
-#: templates/designer/options_panel.phtml:85
-#: templates/designer/rename_to_panel.phtml:23
+#: templates/database/designer/options_panel.phtml:85
+#: templates/database/designer/rename_to_panel.phtml:23
 msgid "Rename to"
 msgstr "Cambiar el nombre a"
 
-#: templates/designer/options_panel.phtml:91
-#: templates/designer/rename_to_panel.phtml:31
+#: templates/database/designer/options_panel.phtml:91
+#: templates/database/designer/rename_to_panel.phtml:31
 msgid "New name"
 msgstr "Nuevo nombre"
 
-#: templates/designer/page_save_as.phtml:4
+#: templates/database/designer/page_save_as.phtml:4
 msgid "Save to selected page"
 msgstr "Guardar a la página seleccionada"
 
-#: templates/designer/page_save_as.phtml:5
+#: templates/database/designer/page_save_as.phtml:5
 msgid "Create a page and save to it"
 msgstr "Crear una página y guardar a ella"
 
-#: templates/designer/page_save_as.phtml:26
+#: templates/database/designer/page_save_as.phtml:26
 msgid "New page name"
 msgstr "Nuevo nombre de página"
 
-#: templates/designer/page_selector.phtml:2
+#: templates/database/designer/page_selector.phtml:2
 msgid "Select page"
 msgstr "Seleccionar página"
 
-#: templates/designer/query_details.phtml:10
+#: templates/database/designer/query_details.phtml:10
 msgid "Active options"
 msgstr "Opciones activas"
 
-#: templates/designer/schema_export.phtml:4
+#: templates/database/designer/schema_export.phtml:4
 msgid "Select Export Relational Type"
 msgstr "Seleccionar tipo de exportación relacional"
 
-#: templates/designer/side_menu.phtml:19 templates/designer/side_menu.phtml:25
+#: templates/database/designer/side_menu.phtml:19
+#: templates/database/designer/side_menu.phtml:25
 msgid "Show/Hide tables list"
 msgstr "Mostrar/Ocultar lista de tablas"
 
-#: templates/designer/side_menu.phtml:29 templates/designer/side_menu.phtml:35
-#: templates/designer/side_menu.phtml:36
+#: templates/database/designer/side_menu.phtml:29
+#: templates/database/designer/side_menu.phtml:35
+#: templates/database/designer/side_menu.phtml:36
 msgid "View in fullscreen"
 msgstr "Ver en pantalla completa"
 
-#: templates/designer/side_menu.phtml:34
+#: templates/database/designer/side_menu.phtml:34
 msgid "Exit fullscreen"
 msgstr "Salir de pantalla completa"
 
-#: templates/designer/side_menu.phtml:41 templates/designer/side_menu.phtml:45
+#: templates/database/designer/side_menu.phtml:41
+#: templates/database/designer/side_menu.phtml:45
 msgid "New page"
 msgstr "Nueva página"
 
-#: templates/designer/side_menu.phtml:70 templates/designer/side_menu.phtml:73
+#: templates/database/designer/side_menu.phtml:70
+#: templates/database/designer/side_menu.phtml:73
 msgid "Delete pages"
 msgstr "Borrar páginas"
 
-#: templates/designer/side_menu.phtml:77 templates/designer/side_menu.phtml:80
-#: templates/table/create_table.phtml:7
-msgid "Create table"
-msgstr "Crear tabla"
-
-#: templates/designer/side_menu.phtml:98
-#: templates/designer/side_menu.phtml:101
+#: templates/database/designer/side_menu.phtml:98
+#: templates/database/designer/side_menu.phtml:101
 msgid "Reload"
 msgstr "Cargar nuevamente"
 
-#: templates/designer/side_menu.phtml:107
-#: templates/designer/side_menu.phtml:110
+#: templates/database/designer/side_menu.phtml:107
+#: templates/database/designer/side_menu.phtml:110
 msgid "Help"
 msgstr "Ayuda"
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Angular links"
 msgstr "Enlaces angulares"
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Direct links"
 msgstr "Enlaces directos"
 
-#: templates/designer/side_menu.phtml:122
-#: templates/designer/side_menu.phtml:124
+#: templates/database/designer/side_menu.phtml:122
+#: templates/database/designer/side_menu.phtml:124
 msgid "Snap to grid"
 msgstr "Cuadrícula magnética"
 
-#: templates/designer/side_menu.phtml:128
-#: templates/designer/side_menu.phtml:134
+#: templates/database/designer/side_menu.phtml:128
+#: templates/database/designer/side_menu.phtml:134
 msgid "Small/Big All"
 msgstr "Pequeño/grande todos"
 
-#: templates/designer/side_menu.phtml:138
-#: templates/designer/side_menu.phtml:141
+#: templates/database/designer/side_menu.phtml:138
+#: templates/database/designer/side_menu.phtml:141
 msgid "Toggle small/big"
 msgstr "Alterne entre pequeño y grande"
 
-#: templates/designer/side_menu.phtml:145
-#: templates/designer/side_menu.phtml:148
+#: templates/database/designer/side_menu.phtml:145
+#: templates/database/designer/side_menu.phtml:148
 msgid "Toggle relation lines"
 msgstr "Conmutar líneas de relación"
 
 # Used as description for SQL syntax Export Type (options are INSERT, UPDATE
 # and REPLACE)
-#: templates/designer/side_menu.phtml:153
-#: templates/designer/side_menu.phtml:156
+#: templates/database/designer/side_menu.phtml:153
+#: templates/database/designer/side_menu.phtml:156
 msgid "Export schema"
 msgstr "Exportar estructura"
 
-#: templates/designer/side_menu.phtml:165
-#: templates/designer/side_menu.phtml:168
+#: templates/database/designer/side_menu.phtml:165
+#: templates/database/designer/side_menu.phtml:168
 msgid "Build Query"
 msgstr "Crear consulta"
 
-#: templates/designer/side_menu.phtml:173
-#: templates/designer/side_menu.phtml:177
+#: templates/database/designer/side_menu.phtml:173
+#: templates/database/designer/side_menu.phtml:177
 msgid "Move Menu"
 msgstr "Mover el Menú"
 
-#: templates/designer/side_menu.phtml:181
-#: templates/designer/side_menu.phtml:186
+#: templates/database/designer/side_menu.phtml:181
+#: templates/database/designer/side_menu.phtml:186
 msgid "Pin text"
 msgstr "Fijar texto"
 
-#: templates/designer/table_list.phtml:4
+#: templates/database/designer/table_list.phtml:4
 msgid "Hide/Show all"
 msgstr "Ocultar/mostrar todo"
 
-#: templates/designer/table_list.phtml:14
+#: templates/database/designer/table_list.phtml:14
 msgid "Hide/Show Tables with no relation"
 msgstr "Ocultar/mostrar Tablas que no tengan relación"
 
-#: templates/designer/table_list.phtml:59
+#: templates/database/designer/table_list.phtml:59
 msgid "Number of tables:"
 msgstr "Número de tablas:"
 
+# singular: tabla
+# plural: tablas
+#: templates/database/structure/body_for_table_summary.phtml:6
+#, php-format
+msgid "%s table"
+msgid_plural "%s tables"
+msgstr[0] "%s tabla"
+msgstr[1] "%s tablas"
+
+#: templates/database/structure/body_for_table_summary.phtml:17
+msgid "Sum"
+msgstr "Número de filas"
+
+#: templates/database/structure/check_all_tables.phtml:6
+msgid "Check tables having overhead"
+msgstr "Marcar las tablas con residuo a depurar"
+
+#: templates/database/structure/check_all_tables.phtml:10
+msgid "Show create"
+msgstr "Mostrar creación"
+
+#: templates/database/structure/check_all_tables.phtml:27
+msgid "Prefix"
+msgstr "Prefijo"
+
+#: templates/database/structure/check_all_tables.phtml:28
+msgid "Add prefix to table"
+msgstr "Agregar prefijo a la tabla"
+
+#: templates/database/structure/check_all_tables.phtml:29
+msgid "Replace table prefix"
+msgstr "Reemplazar prefijo de la tabla"
+
+#: templates/database/structure/check_all_tables.phtml:30
+msgid "Copy table with prefix"
+msgstr "Copiar tabla con prefijo"
+
+#: templates/database/structure/check_all_tables.phtml:36
+msgid "Add columns to central list"
+msgstr "Agregar columnas a la lista central"
+
+#: templates/database/structure/check_all_tables.phtml:37
+msgid "Remove columns from central list"
+msgstr "Eliminar columnas de la lista central"
+
+#: templates/database/structure/check_all_tables.phtml:38
+msgid "Make consistent with central list"
+msgstr "Hacer consistente con la lista central"
+
+#: templates/database/structure/favorite_anchor.phtml:12
+msgid "Add to Favorites"
+msgstr "Agregar a Favoritos"
+
+#: templates/database/structure/show_create.phtml:2
+msgid "Showing create queries"
+msgstr "Mostrar las consultas de creación"
+
+#: templates/database/structure/sortable_header.phtml:13
+msgid "Sort"
+msgstr "Ordenar"
+
+#: templates/database/structure/table_header.phtml:42
+msgid ""
+"May be approximate. Click on the number to get the exact count. See "
+"[doc@faq3-11]FAQ 3.11[/doc]."
+msgstr ""
+"Podría ser aproximado. Pulse en el número para obtener la cantidad exacta. "
+"Ver [doc@faq3-11]FAQ 3.11[/doc]."
+
+#: templates/database/structure/table_header.phtml:66
+#: templates/table/index_form.phtml:127
+msgid "Size"
+msgstr "Tamaño"
+
+#: templates/database/structure/table_header.phtml:74
+#: templates/table/structure/display_table_stats.phtml:27
+msgid "Overhead"
+msgstr "Residuo a depurar"
+
+#: templates/database/structure/tracking_icon.phtml:4
+msgid "Tracking is active."
+msgstr "El seguimiento está activo."
+
+#: templates/database/structure/tracking_icon.phtml:8
+msgid "Tracking is not active."
+msgstr "El seguimiento no está activo."
+
 #: templates/error/report_form.phtml:7
 msgid ""
 "phpMyAdmin has encountered an error. We have collected data about this error "
@@ -15276,61 +15391,6 @@ msgstr "Puede examinar los datos en el reporte de error:"
 msgid "Please explain the steps that lead to the error:"
 msgstr "Explique los pasos que llevan al error:"
 
-#: templates/gis_visualization/gis_visualization.phtml:3
-msgid "Display GIS Visualization"
-msgstr "Mostrar visualización GIS"
-
-#: templates/gis_visualization/gis_visualization.phtml:8
-msgid "Label column"
-msgstr "Etiqueta de columna"
-
-#: templates/gis_visualization/gis_visualization.phtml:11
-msgid "-- None --"
-msgstr "-- ninguno --"
-
-#: templates/gis_visualization/gis_visualization.phtml:19
-msgid "Spatial column"
-msgstr "Columna espacial"
-
-#: templates/index_form.phtml:16
-msgid "Index name:"
-msgstr "Nombre del índice:"
-
-#: templates/index_form.phtml:19
-msgid ""
-"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
-msgstr ""
-"¡«PRIMARY» <b>debe</b> ser el nombre <b>exclusivamente</b> de una clave "
-"primaria!"
-
-#: templates/index_form.phtml:40
-msgid "Index choice:"
-msgstr "Opción de índice:"
-
-#: templates/index_form.phtml:57
-msgid "Key block size:"
-msgstr "Tamaño del bloque dominante:"
-
-#: templates/index_form.phtml:74
-msgid "Index type:"
-msgstr "Tipo de índice&nbsp;:"
-
-#: templates/index_form.phtml:86
-msgid "Parser:"
-msgstr "Analizador:"
-
-#: templates/index_form.phtml:102
-msgid "Comment:"
-msgstr "Comentario:"
-
-#: templates/index_form.phtml:127 templates/structure/table_header.phtml:66
-msgid "Size"
-msgstr "Tamaño"
-
-#: templates/index_form.phtml:149 templates/index_form.phtml:190
-msgid "Drag to reorder"
-msgstr "Arrastrar para reordenar"
-
 #: templates/prefs_autoload.phtml:9
 msgid ""
 "Your browser has phpMyAdmin configuration for this domain. Would you like to "
@@ -15343,362 +15403,150 @@ msgstr ""
 msgid "Start row:"
 msgstr "Fila de inicio:"
 
-#: templates/structure/actions_in_table_structure.phtml:14
-#, php-format
-msgid "A primary key has been added on %s."
-msgstr "Se agregó una clave primaria en %s."
-
-#: templates/structure/actions_in_table_structure.phtml:34
-#: templates/structure/actions_in_table_structure.phtml:54
-#: templates/structure/actions_in_table_structure.phtml:79
-#: templates/structure/actions_in_table_structure.phtml:101
-#, php-format
-msgid "An index has been added on %s."
-msgstr "Se añadió un índice en %s."
-
-#: templates/structure/actions_in_table_structure.phtml:130
-#: templates/structure/check_all_table_column.phtml:59
-msgid "Remove from central columns"
-msgstr "Eliminar de las columnas centrales"
-
-#: templates/structure/actions_in_table_structure.phtml:138
-#: templates/structure/check_all_table_column.phtml:55
-msgid "Add to central columns"
-msgstr "Agregar a columnas centrales"
-
-#: templates/structure/add_column.phtml:7
-#, php-format
-msgid "Add %s column(s)"
-msgstr "Agregar %s columna(s)"
-
-#: templates/structure/add_column.phtml:12
-msgid "at beginning of table"
-msgstr "Al comienzo de la tabla"
-
-# singular: tabla
-# plural: tablas
-#: templates/structure/body_for_table_summary.phtml:6
-#, php-format
-msgid "%s table"
-msgid_plural "%s tables"
-msgstr[0] "%s tabla"
-msgstr[1] "%s tablas"
-
-#: templates/structure/body_for_table_summary.phtml:17
-msgid "Sum"
-msgstr "Número de filas"
-
-#: templates/structure/check_all_tables.phtml:6
-msgid "Check tables having overhead"
-msgstr "Marcar las tablas con residuo a depurar"
-
-#: templates/structure/check_all_tables.phtml:10
-msgid "Show create"
-msgstr "Mostrar creación"
-
-#: templates/structure/check_all_tables.phtml:27
-msgid "Prefix"
-msgstr "Prefijo"
-
-#: templates/structure/check_all_tables.phtml:28
-msgid "Add prefix to table"
-msgstr "Agregar prefijo a la tabla"
-
-#: templates/structure/check_all_tables.phtml:29
-msgid "Replace table prefix"
-msgstr "Reemplazar prefijo de la tabla"
-
-#: templates/structure/check_all_tables.phtml:30
-msgid "Copy table with prefix"
-msgstr "Copiar tabla con prefijo"
-
-#: templates/structure/check_all_tables.phtml:36
-msgid "Add columns to central list"
-msgstr "Agregar columnas a la lista central"
-
-#: templates/structure/check_all_tables.phtml:37
-msgid "Remove columns from central list"
-msgstr "Eliminar columnas de la lista central"
-
-#: templates/structure/check_all_tables.phtml:38
-msgid "Make consistent with central list"
-msgstr "Hacer consistente con la lista central"
-
-#: templates/structure/display_structure.phtml:140 view_create.php:181
-msgid "Edit view"
-msgstr "Editar vista"
-
-#: templates/structure/display_table_stats.phtml:9
-msgid "Space usage"
-msgstr "Espacio utilizado"
-
-#: templates/structure/display_table_stats.phtml:27
-#: templates/structure/table_header.phtml:74
-msgid "Overhead"
-msgstr "Residuo a depurar"
-
-#: templates/structure/display_table_stats.phtml:32
-msgid "Effective"
-msgstr "Efectivo/a"
-
-#: templates/structure/favorite_anchor.phtml:12
-msgid "Add to Favorites"
-msgstr "Agregar a Favoritos"
-
-#: templates/structure/move_columns_dialog.phtml:1
-#: templates/structure/optional_action_links.phtml:21
-msgid "Move columns"
-msgstr "Mover columnas"
-
-#: templates/structure/move_columns_dialog.phtml:2
-msgid "Move the columns by dragging them up and down."
-msgstr "Mueva las columnas arrastrándolas hacia arriba o hacia abajo."
-
-#: templates/structure/optional_action_links.phtml:9
-msgid "Propose table structure"
-msgstr "Planteamiento de la estructura de tabla"
-
-#: templates/structure/optional_action_links.phtml:24
-msgid "Improve table structure"
-msgstr "Mejorar la estructura de tabla"
-
-#: templates/structure/optional_action_links.phtml:30
-msgid "Track view"
-msgstr "Vista de seguimiento"
-
-#: templates/structure/row_stats_table.phtml:3
-msgid "Row statistics"
-msgstr "Estadísticas de la fila"
-
-#: templates/structure/row_stats_table.phtml:9
-msgid "static"
-msgstr "estático"
-
-#: templates/structure/row_stats_table.phtml:11
-msgid "dynamic"
-msgstr "dinámico/a"
-
-#: templates/structure/row_stats_table.phtml:22
-msgid "partitioned"
-msgstr "particionado"
-
-#: templates/structure/row_stats_table.phtml:54
-msgid "Row length"
-msgstr "Longitud de la fila"
-
-#: templates/structure/row_stats_table.phtml:66
-msgid "Row size"
-msgstr "Tamaño de la fila"
-
-#: templates/structure/row_stats_table.phtml:73
-msgid "Next autoindex"
-msgstr "Índice automático siguiente"
-
-#: templates/structure/secondary_tabs.phtml:14
-msgid "Relation view"
-msgstr "Vista de relaciones"
-
-#: templates/structure/show_create.phtml:2
-msgid "Showing create queries"
-msgstr "Mostrar las consultas de creación"
-
-#: templates/structure/sortable_header.phtml:13
-msgid "Sort"
-msgstr "Ordenar"
-
-#: templates/structure/table_header.phtml:42
-msgid ""
-"May be approximate. Click on the number to get the exact count. See "
-"[doc@faq3-11]FAQ 3.11[/doc]."
-msgstr ""
-"Podría ser aproximado. Pulse en el número para obtener la cantidad exacta. "
-"Ver [doc@faq3-11]FAQ 3.11[/doc]."
-
-#: templates/structure/table_structure_row.phtml:46
-#, php-format
-msgid "Column %s has been dropped."
-msgstr "Se ha eliminado la columna %s."
-
-#: templates/structure/tracking_icon.phtml:4
-msgid "Tracking is active."
-msgstr "El seguimiento está activo."
-
-#: templates/structure/tracking_icon.phtml:8
-msgid "Tracking is not active."
-msgstr "El seguimiento no está activo."
-
-#: templates/table/create_table.phtml:15
-msgid "Number of columns"
-msgstr "Número de columnas"
-
-#: templates/table/options.phtml:8
-msgid "Select columns (at least one):"
-msgstr "Seleccionar campos (al menos uno):"
-
-#: templates/table/options.phtml:37
-msgid "Add search conditions (body of the \"where\" clause):"
-msgstr ""
-"Insertar las condiciones de búsqueda (cuerpo de la cláusula \"where\"):"
-
-#: templates/table/options.phtml:45
-msgid "Number of rows per page"
-msgstr "registros por página"
-
-#: templates/table/options.phtml:56
-msgid "Display order:"
-msgstr "Mostrar en este orden:"
-
-#: templates/table/options_zoom.phtml:6
-msgid "Use this column to label each point"
-msgstr "Utilice esta columna para etiquetar cada punto"
-
-#: templates/table/options_zoom.phtml:35
-msgid "Maximum rows to plot"
-msgstr "Máximo número de filas a graficar"
-
-#: templates/table/replace_preview.phtml:13
-msgid "Find and replace - preview"
-msgstr "Buscar y reemplazar - vista previa"
-
-#: templates/table/replace_preview.phtml:18
-msgid "Original string"
-msgstr "Cadena original"
-
-#: templates/table/replace_preview.phtml:19
-msgid "Replaced string"
-msgstr "Cadena reemplazada"
-
-#: templates/table/replace_preview.phtml:40
-msgid "Replace"
-msgstr "Reemplazar"
-
-#: templates/table/rows_zoom.phtml:16
-msgid "Additional search criteria"
-msgstr "Criterios de búsqueda adicionales"
-
-#: templates/table/search_and_replace.phtml:3
-msgid "Replace with:"
-msgstr "Reemplazar con:"
-
-#: templates/table/search_and_replace.phtml:22
-msgid "Use regular expression"
-msgstr "Utilizar expresión regular"
-
-#: templates/table/selection_form.phtml:12
-msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
-msgstr ""
-"Hacer una \"consulta basada en ejemplo\" (comodín: \"%\") para dos columnas "
-"distintas"
-
-#: templates/table/selection_form.phtml:34
-msgid "Do a \"query by example\" (wildcard: \"%\")"
-msgstr "Hacer una \"consulta basada en ejemplo\" (comodín: \"%\")"
-
-#: templates/table/zoom_result_form.phtml:7
-msgid "Browse/Edit the points"
-msgstr "Navegar/editar los puntos"
-
-#: templates/table/zoom_result_form.phtml:15
-msgid "How to use"
-msgstr "Forma de utilización"
-
-#: templates/table/zoom_result_form.phtml:23
-msgid "Reset zoom"
-msgstr "Reiniciar ampliación"
-
-#: templates/tbl_chart.phtml:17
+#: templates/table/chart/tbl_chart.phtml:17
 msgctxt "Chart type"
 msgid "Bar"
 msgstr "Barra"
 
-#: templates/tbl_chart.phtml:21
+#: templates/table/chart/tbl_chart.phtml:21
 msgctxt "Chart type"
 msgid "Column"
 msgstr "Columna"
 
-#: templates/tbl_chart.phtml:25
+#: templates/table/chart/tbl_chart.phtml:25
 msgctxt "Chart type"
 msgid "Line"
 msgstr "Línea"
 
-#: templates/tbl_chart.phtml:29
+#: templates/table/chart/tbl_chart.phtml:29
 msgctxt "Chart type"
 msgid "Spline"
 msgstr "Ranuras"
 
-#: templates/tbl_chart.phtml:33
+#: templates/table/chart/tbl_chart.phtml:33
 msgctxt "Chart type"
 msgid "Area"
 msgstr "Área"
 
-#: templates/tbl_chart.phtml:37
+#: templates/table/chart/tbl_chart.phtml:37
 msgctxt "Chart type"
 msgid "Pie"
 msgstr "Torta"
 
-#: templates/tbl_chart.phtml:41
+#: templates/table/chart/tbl_chart.phtml:41
 msgctxt "Chart type"
 msgid "Timeline"
 msgstr "Línea temporal"
 
-#: templates/tbl_chart.phtml:45
+#: templates/table/chart/tbl_chart.phtml:45
 msgctxt "Chart type"
 msgid "Scatter"
 msgstr "Dispersión"
 
-#: templates/tbl_chart.phtml:50
+#: templates/table/chart/tbl_chart.phtml:50
 msgid "Stacked"
 msgstr "Apiladas"
 
-#: templates/tbl_chart.phtml:53
+#: templates/table/chart/tbl_chart.phtml:53
 msgid "Chart title"
 msgstr "Título del gráfico"
 
-#: templates/tbl_chart.phtml:57
+#: templates/table/chart/tbl_chart.phtml:57
 msgid "X-Axis:"
 msgstr "Eje X:"
 
-#: templates/tbl_chart.phtml:72
+#: templates/table/chart/tbl_chart.phtml:72
 msgid "Series:"
 msgstr "Series:"
 
-#: templates/tbl_chart.phtml:102
+#: templates/table/chart/tbl_chart.phtml:102
 msgid "X-Axis label:"
 msgstr "Etiqueta del eje X:"
 
-#: templates/tbl_chart.phtml:104
+#: templates/table/chart/tbl_chart.phtml:104
 msgid "X Values"
 msgstr "Valores X"
 
-#: templates/tbl_chart.phtml:107
+#: templates/table/chart/tbl_chart.phtml:107
 msgid "Y-Axis label:"
 msgstr "Etiqueta del eje Y:"
 
-#: templates/tbl_chart.phtml:115
+#: templates/table/chart/tbl_chart.phtml:115
 msgid "Series names are in a column"
 msgstr "Los nombres de serie se encuentran en una columna"
 
-#: templates/tbl_chart.phtml:118
+#: templates/table/chart/tbl_chart.phtml:118
 msgid "Series column:"
 msgstr "Columna de series:"
 
-#: templates/tbl_chart.phtml:130
+#: templates/table/chart/tbl_chart.phtml:130
 msgid "Value Column:"
 msgstr "Columna de valor:"
 
-#: templates/tbl_chart.phtml:150
+#: templates/table/chart/tbl_chart.phtml:150
 msgid "Save chart as image"
 msgstr "Guardar gráfico como archivo"
 
-#: templates/tbl_relation/common_form.phtml:7
+#: templates/table/gis_visualization/gis_visualization.phtml:3
+msgid "Display GIS Visualization"
+msgstr "Mostrar visualización GIS"
+
+#: templates/table/gis_visualization/gis_visualization.phtml:8
+msgid "Label column"
+msgstr "Etiqueta de columna"
+
+#: templates/table/gis_visualization/gis_visualization.phtml:11
+msgid "-- None --"
+msgstr "-- ninguno --"
+
+#: templates/table/gis_visualization/gis_visualization.phtml:19
+msgid "Spatial column"
+msgstr "Columna espacial"
+
+#: templates/table/index_form.phtml:16
+msgid "Index name:"
+msgstr "Nombre del índice:"
+
+#: templates/table/index_form.phtml:19
+msgid ""
+"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
+msgstr ""
+"¡«PRIMARY» <b>debe</b> ser el nombre <b>exclusivamente</b> de una clave "
+"primaria!"
+
+#: templates/table/index_form.phtml:40
+msgid "Index choice:"
+msgstr "Opción de índice:"
+
+#: templates/table/index_form.phtml:57
+msgid "Key block size:"
+msgstr "Tamaño del bloque dominante:"
+
+#: templates/table/index_form.phtml:74
+msgid "Index type:"
+msgstr "Tipo de índice&nbsp;:"
+
+#: templates/table/index_form.phtml:86
+msgid "Parser:"
+msgstr "Analizador:"
+
+#: templates/table/index_form.phtml:102
+msgid "Comment:"
+msgstr "Comentario:"
+
+#: templates/table/index_form.phtml:149 templates/table/index_form.phtml:190
+msgid "Drag to reorder"
+msgstr "Arrastrar para reordenar"
+
+#: templates/table/relation/common_form.phtml:7
 msgid "Internal relations"
 msgstr "Relaciones internas"
 
-#: templates/tbl_relation/common_form.phtml:11
+#: templates/table/relation/common_form.phtml:11
 msgid "Internal relation"
 msgstr "Relación interna"
 
-#: templates/tbl_relation/common_form.phtml:14
+#: templates/table/relation/common_form.phtml:14
 msgid ""
 "An internal relation is not necessary when a corresponding FOREIGN KEY "
 "relation exists."
@@ -15706,48 +15554,225 @@ msgstr ""
 "No es necesaria una relación interna cuando existe una relación CLAVE "
 "FORÁNEA correspondiente."
 
-#: templates/tbl_relation/common_form.phtml:37
+#: templates/table/relation/common_form.phtml:37
 msgid "Foreign key constraints"
 msgstr "Restricciones de clave foránea"
 
-#: templates/tbl_relation/common_form.phtml:40
+#: templates/table/relation/common_form.phtml:40
 msgid "Actions"
 msgstr "Acciones"
 
-#: templates/tbl_relation/common_form.phtml:41
+#: templates/table/relation/common_form.phtml:41
 msgid "Constraint properties"
 msgstr "Propiedades de la restricción"
 
-#: templates/tbl_relation/common_form.phtml:44
+#: templates/table/relation/common_form.phtml:44
 msgid ""
 "Only columns with index will be displayed. You can define an index below."
 msgstr "Sólo se mostrarán columnas con índices. Abajo puede definir un índice."
 
-#: templates/tbl_relation/common_form.phtml:49
+#: templates/table/relation/common_form.phtml:49
 msgid "Foreign key constraint"
 msgstr "Restricción de clave foránea"
 
-#: templates/tbl_relation/common_form.phtml:81
+#: templates/table/relation/common_form.phtml:81
 msgid "+ Add constraint"
 msgstr "+ Añadir restricción"
 
-#: templates/tbl_relation/common_form.phtml:91
+#: templates/table/relation/common_form.phtml:91
 msgid "Choose column to display:"
 msgstr "Elegir la columna a mostrar:"
 
-#: templates/tbl_relation/foreign_key_row.phtml:13
+#: templates/table/relation/foreign_key_row.phtml:13
 #, php-format
 msgid "Foreign key constraint %s has been dropped"
 msgstr "Se eliminó la restricción de clave foránea «%s»"
 
-#: templates/tbl_relation/foreign_key_row.phtml:102
+#: templates/table/relation/foreign_key_row.phtml:102
 msgid "Constraint name"
 msgstr "Nombre de la restricción"
 
-#: templates/tbl_relation/foreign_key_row.phtml:157
+#: templates/table/relation/foreign_key_row.phtml:157
 msgid "+ Add column"
 msgstr "+ Añadir columna"
 
+#: templates/table/search/options.phtml:8
+msgid "Select columns (at least one):"
+msgstr "Seleccionar campos (al menos uno):"
+
+#: templates/table/search/options.phtml:37
+msgid "Add search conditions (body of the \"where\" clause):"
+msgstr ""
+"Insertar las condiciones de búsqueda (cuerpo de la cláusula \"where\"):"
+
+#: templates/table/search/options.phtml:45
+msgid "Number of rows per page"
+msgstr "registros por página"
+
+#: templates/table/search/options.phtml:56
+msgid "Display order:"
+msgstr "Mostrar en este orden:"
+
+#: templates/table/search/options_zoom.phtml:6
+msgid "Use this column to label each point"
+msgstr "Utilice esta columna para etiquetar cada punto"
+
+#: templates/table/search/options_zoom.phtml:35
+msgid "Maximum rows to plot"
+msgstr "Máximo número de filas a graficar"
+
+#: templates/table/search/replace_preview.phtml:13
+msgid "Find and replace - preview"
+msgstr "Buscar y reemplazar - vista previa"
+
+#: templates/table/search/replace_preview.phtml:18
+msgid "Original string"
+msgstr "Cadena original"
+
+#: templates/table/search/replace_preview.phtml:19
+msgid "Replaced string"
+msgstr "Cadena reemplazada"
+
+#: templates/table/search/replace_preview.phtml:40
+msgid "Replace"
+msgstr "Reemplazar"
+
+#: templates/table/search/rows_zoom.phtml:16
+msgid "Additional search criteria"
+msgstr "Criterios de búsqueda adicionales"
+
+#: templates/table/search/search_and_replace.phtml:3
+msgid "Replace with:"
+msgstr "Reemplazar con:"
+
+#: templates/table/search/search_and_replace.phtml:22
+msgid "Use regular expression"
+msgstr "Utilizar expresión regular"
+
+#: templates/table/search/selection_form.phtml:12
+msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
+msgstr ""
+"Hacer una \"consulta basada en ejemplo\" (comodín: \"%\") para dos columnas "
+"distintas"
+
+#: templates/table/search/selection_form.phtml:34
+msgid "Do a \"query by example\" (wildcard: \"%\")"
+msgstr "Hacer una \"consulta basada en ejemplo\" (comodín: \"%\")"
+
+#: templates/table/search/zoom_result_form.phtml:7
+msgid "Browse/Edit the points"
+msgstr "Navegar/editar los puntos"
+
+#: templates/table/search/zoom_result_form.phtml:15
+msgid "How to use"
+msgstr "Forma de utilización"
+
+#: templates/table/search/zoom_result_form.phtml:23
+msgid "Reset zoom"
+msgstr "Reiniciar ampliación"
+
+#: templates/table/secondary_tabs.phtml:14
+msgid "Relation view"
+msgstr "Vista de relaciones"
+
+#: templates/table/structure/actions_in_table_structure.phtml:14
+#, php-format
+msgid "A primary key has been added on %s."
+msgstr "Se agregó una clave primaria en %s."
+
+#: templates/table/structure/actions_in_table_structure.phtml:34
+#: templates/table/structure/actions_in_table_structure.phtml:54
+#: templates/table/structure/actions_in_table_structure.phtml:79
+#: templates/table/structure/actions_in_table_structure.phtml:101
+#, php-format
+msgid "An index has been added on %s."
+msgstr "Se añadió un índice en %s."
+
+#: templates/table/structure/actions_in_table_structure.phtml:130
+#: templates/table/structure/check_all_table_column.phtml:59
+msgid "Remove from central columns"
+msgstr "Eliminar de las columnas centrales"
+
+#: templates/table/structure/actions_in_table_structure.phtml:138
+#: templates/table/structure/check_all_table_column.phtml:55
+msgid "Add to central columns"
+msgstr "Agregar a columnas centrales"
+
+#: templates/table/structure/add_column.phtml:7
+#, php-format
+msgid "Add %s column(s)"
+msgstr "Agregar %s columna(s)"
+
+#: templates/table/structure/add_column.phtml:12
+msgid "at beginning of table"
+msgstr "Al comienzo de la tabla"
+
+#: templates/table/structure/display_structure.phtml:140 view_create.php:181
+msgid "Edit view"
+msgstr "Editar vista"
+
+#: templates/table/structure/display_table_stats.phtml:9
+msgid "Space usage"
+msgstr "Espacio utilizado"
+
+#: templates/table/structure/display_table_stats.phtml:32
+msgid "Effective"
+msgstr "Efectivo/a"
+
+#: templates/table/structure/move_columns_dialog.phtml:1
+#: templates/table/structure/optional_action_links.phtml:21
+msgid "Move columns"
+msgstr "Mover columnas"
+
+#: templates/table/structure/move_columns_dialog.phtml:2
+msgid "Move the columns by dragging them up and down."
+msgstr "Mueva las columnas arrastrándolas hacia arriba o hacia abajo."
+
+#: templates/table/structure/optional_action_links.phtml:9
+msgid "Propose table structure"
+msgstr "Planteamiento de la estructura de tabla"
+
+#: templates/table/structure/optional_action_links.phtml:24
+msgid "Improve table structure"
+msgstr "Mejorar la estructura de tabla"
+
+#: templates/table/structure/optional_action_links.phtml:30
+msgid "Track view"
+msgstr "Vista de seguimiento"
+
+#: templates/table/structure/row_stats_table.phtml:3
+msgid "Row statistics"
+msgstr "Estadísticas de la fila"
+
+#: templates/table/structure/row_stats_table.phtml:9
+msgid "static"
+msgstr "estático"
+
+#: templates/table/structure/row_stats_table.phtml:11
+msgid "dynamic"
+msgstr "dinámico/a"
+
+#: templates/table/structure/row_stats_table.phtml:22
+msgid "partitioned"
+msgstr "particionado"
+
+#: templates/table/structure/row_stats_table.phtml:54
+msgid "Row length"
+msgstr "Longitud de la fila"
+
+#: templates/table/structure/row_stats_table.phtml:66
+msgid "Row size"
+msgstr "Tamaño de la fila"
+
+#: templates/table/structure/row_stats_table.phtml:73
+msgid "Next autoindex"
+msgstr "Índice automático siguiente"
+
+#: templates/table/structure/table_structure_row.phtml:46
+#, php-format
+msgid "Column %s has been dropped."
+msgstr "Se ha eliminado la columna %s."
+
 #: themes.php:17 themes.php:22
 msgid "Theme"
 msgstr "Tema"
@@ -17115,6 +17140,9 @@ msgstr ""
 msgid "concurrent_insert is set to 0"
 msgstr "«concurrent_insert» está definido como 0"
 
+#~ msgid "Read as multibytes"
+#~ msgstr "Leer como conjunto de Bytes"
+
 # Display option apparently related to
 # http://www.phpmyadmin.net/documentation/#relation
 #~ msgid "Relational display column"
diff --git a/po/et.po b/po/et.po
index 178e1eb2c4..eed2465574 100644
--- a/po/et.po
+++ b/po/et.po
@@ -5,8 +5,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 4.5.0-dev\n"
 "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
-"POT-Creation-Date: 2015-08-08 13:53-0400\n"
-"PO-Revision-Date: 2015-08-10 11:06+0200\n"
+"POT-Creation-Date: 2015-08-12 08:10-0400\n"
+"PO-Revision-Date: 2015-08-12 15:07+0200\n"
 "Last-Translator: Kristjan Räts <kristjanrats@gmail.com>\n"
 "Language-Team: Estonian "
 "<https://hosted.weblate.org/projects/phpmyadmin/master/et/>\n"
@@ -57,7 +57,7 @@ msgid "Table comments:"
 msgstr "Tabeli kommentaarid:"
 
 #: db_datadict.php:104 libraries/Index.class.php:699
-#: libraries/insert_edit.lib.php:1567
+#: libraries/insert_edit.lib.php:1565
 #: libraries/navigation/Nodes/Node_Column.class.php:30
 #: libraries/plugins/export/ExportHtmlword.class.php:280
 #: libraries/plugins/export/ExportHtmlword.class.php:375
@@ -71,13 +71,14 @@ msgstr "Tabeli kommentaarid:"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1023
 #: libraries/tracking.lib.php:879 libraries/tracking.lib.php:975
 #: templates/columns_definitions/column_name.phtml:18
-#: templates/index_form.phtml:124 templates/table/table_header.phtml:6
-#: templates/table/zoom_result_form.phtml:33
-#: templates/tbl_relation/common_form.phtml:10
-#: templates/tbl_relation/common_form.phtml:43
-#: templates/tbl_relation/foreign_key_row.phtml:194
-#: templates/tbl_relation/foreign_key_row.phtml:206
-#: templates/tbl_relation/internal_relational_row.phtml:71
+#: templates/table/index_form.phtml:124
+#: templates/table/relation/common_form.phtml:10
+#: templates/table/relation/common_form.phtml:43
+#: templates/table/relation/foreign_key_row.phtml:194
+#: templates/table/relation/foreign_key_row.phtml:206
+#: templates/table/relation/internal_relational_row.phtml:71
+#: templates/table/search/table_header.phtml:6
+#: templates/table/search/zoom_result_form.phtml:33
 msgid "Column"
 msgstr "Veerg"
 
@@ -95,21 +96,21 @@ msgstr "Veerg"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1001
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1024
 #: libraries/rte/rte_list.lib.php:75 libraries/rte/rte_list.lib.php:103
-#: libraries/rte/rte_routines.lib.php:802
-#: libraries/rte/rte_routines.lib.php:831
-#: libraries/rte/rte_routines.lib.php:1493
+#: libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_routines.lib.php:922
+#: libraries/rte/rte_routines.lib.php:1584
 #: libraries/server_privileges.lib.php:2369 libraries/tracking.lib.php:880
 #: libraries/tracking.lib.php:972
 #: templates/columns_definitions/table_fields_definitions.phtml:11
-#: templates/structure/table_header.phtml:48
-#: templates/structure/table_structure_header.phtml:6
-#: templates/table/table_header.phtml:7
+#: templates/database/structure/table_header.phtml:48
+#: templates/table/search/table_header.phtml:7
+#: templates/table/structure/table_structure_header.phtml:6
 msgid "Type"
 msgstr "Tüüp"
 
 #: db_datadict.php:106 libraries/Index.class.php:702
 #: libraries/central_columns.lib.php:708
-#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1576
+#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1574
 #: libraries/plugins/export/ExportHtmlword.class.php:286
 #: libraries/plugins/export/ExportHtmlword.class.php:381
 #: libraries/plugins/export/ExportLatex.class.php:509
@@ -122,8 +123,8 @@ msgstr "Tüüp"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1026
 #: libraries/tracking.lib.php:882 libraries/tracking.lib.php:978
 #: templates/columns_definitions/table_fields_definitions.phtml:39
-#: templates/structure/table_structure_header.phtml:9
-#: templates/table/zoom_result_form.phtml:34
+#: templates/table/search/zoom_result_form.phtml:34
+#: templates/table/structure/table_structure_header.phtml:9
 msgid "Null"
 msgstr "Tühi"
 
@@ -141,8 +142,8 @@ msgstr "Tühi"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1027
 #: libraries/replication_gui.lib.php:153 libraries/tracking.lib.php:883
 #: templates/columns_definitions/table_fields_definitions.phtml:25
-#: templates/structure/body_for_table_summary.phtml:55
-#: templates/structure/table_structure_header.phtml:10
+#: templates/database/structure/body_for_table_summary.phtml:55
+#: templates/table/structure/table_structure_header.phtml:10
 msgid "Default"
 msgstr "Vaikimisi"
 
@@ -170,19 +171,19 @@ msgid "Comments"
 msgstr "Kommentaarid"
 
 #: db_datadict.php:146
-#: libraries/controllers/StructureController.class.php:1960
-#: libraries/controllers/StructureController.class.php:1965
+#: libraries/controllers/TableStructureController.class.php:951
+#: libraries/controllers/TableStructureController.class.php:956
 #: libraries/tracking.lib.php:922
 #: templates/columns_definitions/column_indexes.phtml:6
-#: templates/structure/check_all_table_column.phtml:22
-#: templates/structure/display_structure.phtml:74
+#: templates/table/structure/check_all_table_column.phtml:22
+#: templates/table/structure/display_structure.phtml:74
 msgid "Primary"
 msgstr "Primaarne"
 
 #: db_datadict.php:156 js/messages.php:317 libraries/Index.class.php:567
 #: libraries/Index.class.php:606 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261 libraries/mult_submits.lib.php:403
+#: libraries/config/FormDisplay.tpl.php:272 libraries/mult_submits.lib.php:403
 #: libraries/mult_submits.lib.php:417
 #: libraries/plugins/export/ExportHtmlword.class.php:630
 #: libraries/plugins/export/ExportLatex.class.php:589
@@ -198,20 +199,20 @@ msgstr "Primaarne"
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1010 libraries/tracking.lib.php:1015
 #: prefs_manage.php:140 templates/prefs_autoload.phtml:15
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "No"
 msgstr "Ei"
 
 #: db_datadict.php:156 js/messages.php:443 libraries/Index.class.php:568
 #: libraries/Index.class.php:605 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261
-#: libraries/controllers/StructureController.class.php:1344
-#: libraries/controllers/StructureController.class.php:2223
-#: libraries/controllers/StructureController.class.php:2232
-#: libraries/controllers/StructureController.class.php:2237
-#: libraries/controllers/StructureController.class.php:2242
-#: libraries/controllers/StructureController.class.php:2247
+#: libraries/config/FormDisplay.tpl.php:272
+#: libraries/controllers/TableStructureController.class.php:539
+#: libraries/controllers/TableStructureController.class.php:1201
+#: libraries/controllers/TableStructureController.class.php:1210
+#: libraries/controllers/TableStructureController.class.php:1215
+#: libraries/controllers/TableStructureController.class.php:1220
+#: libraries/controllers/TableStructureController.class.php:1225
 #: libraries/mult_submits.inc.php:82 libraries/mult_submits.inc.php:178
 #: libraries/mult_submits.lib.php:339 libraries/mult_submits.lib.php:372
 #: libraries/mult_submits.lib.php:401 libraries/mult_submits.lib.php:415
@@ -220,8 +221,8 @@ msgstr "Ei"
 #: libraries/plugins/export/ExportOdt.class.php:756
 #: libraries/plugins/export/ExportTexytext.class.php:567
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1077
-#: libraries/server_databases.lib.php:464
-#: libraries/server_databases.lib.php:474
+#: libraries/server_databases.lib.php:475
+#: libraries/server_databases.lib.php:485
 #: libraries/server_privileges.lib.php:2546
 #: libraries/server_privileges.lib.php:2727
 #: libraries/server_privileges.lib.php:2748
@@ -231,7 +232,7 @@ msgstr "Ei"
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1008 libraries/tracking.lib.php:1013
 #: prefs_manage.php:138 templates/prefs_autoload.phtml:14
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "Yes"
 msgstr "Jah"
 
@@ -241,7 +242,7 @@ msgstr "Vaata andmebaasi tõmmist (skeemi)"
 
 #: db_export.php:37 db_tracking.php:90 export.php:382
 #: libraries/DBQbe.class.php:326
-#: libraries/controllers/StructureController.class.php:231
+#: libraries/controllers/DatabaseStructureController.class.php:170
 #: libraries/navigation/NavigationTree.class.php:897
 msgid "No tables found in database."
 msgstr "Andmebaasist tabeleid ei leitud."
@@ -252,14 +253,14 @@ msgstr "Andmebaasist tabeleid ei leitud."
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:26
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:120
-#: templates/structure/show_create.phtml:18
+#: templates/database/structure/show_create.phtml:18
 msgid "Tables"
 msgstr "Tabelid"
 
 #: db_export.php:52 libraries/Menu.class.php:317 libraries/Menu.class.php:425
-#: libraries/Util.class.php:3333 libraries/Util.class.php:3343
-#: libraries/Util.class.php:3349 libraries/Util.class.php:3629
-#: libraries/Util.class.php:4327 libraries/Util.class.php:4344
+#: libraries/Util.class.php:3339 libraries/Util.class.php:3349
+#: libraries/Util.class.php:3355 libraries/Util.class.php:3635
+#: libraries/Util.class.php:4333 libraries/Util.class.php:4350
 #: libraries/central_columns.lib.php:728 libraries/config.values.php:39
 #: libraries/config.values.php:47 libraries/config.values.php:109
 #: libraries/config.values.php:115 libraries/config/setup.forms.php:323
@@ -273,7 +274,7 @@ msgstr "Tabelid"
 #: libraries/navigation/Nodes/Node_Table.class.php:283
 #: libraries/server_privileges.lib.php:1141 libraries/tracking.lib.php:874
 #: templates/columns_definitions/table_fields_definitions.phtml:3
-#: templates/designer/table_list.phtml:28
+#: templates/database/designer/table_list.phtml:28
 msgid "Structure"
 msgstr "Struktuur"
 
@@ -285,7 +286,7 @@ msgstr "Struktuur"
 #: libraries/config/user_preferences.forms.php:292
 #: libraries/config/user_preferences.forms.php:297
 #: libraries/server_privileges.lib.php:1140
-#: templates/structure/display_table_stats.phtml:12
+#: templates/table/structure/display_table_stats.phtml:12
 msgid "Data"
 msgstr "Andmed"
 
@@ -356,10 +357,10 @@ msgstr "Jälgitud tabelid"
 #: libraries/server_privileges.lib.php:2908
 #: libraries/server_privileges.lib.php:3145
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4346
-#: templates/structure/table_header.phtml:21
-#: templates/tbl_relation/foreign_key_row.phtml:176
-#: templates/tbl_relation/internal_relational_row.phtml:63
+#: libraries/server_privileges.lib.php:4372
+#: templates/database/structure/table_header.phtml:21
+#: templates/table/relation/foreign_key_row.phtml:176
+#: templates/table/relation/internal_relational_row.phtml:63
 msgid "Table"
 msgstr "Tabel"
 
@@ -376,7 +377,7 @@ msgid "Updated"
 msgstr "Uuendatud"
 
 #: db_tracking.php:130 js/messages.php:243 libraries/Menu.class.php:552
-#: libraries/Util.class.php:4314 libraries/config.values.php:104
+#: libraries/Util.class.php:4320 libraries/config.values.php:104
 #: libraries/rte/rte_events.lib.php:393 libraries/rte/rte_list.lib.php:101
 #: libraries/server_status_processes.lib.php:92 libraries/tracking.lib.php:279
 msgid "Status"
@@ -385,14 +386,15 @@ msgstr "Olek"
 #: db_tracking.php:131 db_tracking.php:290 libraries/Index.class.php:693
 #: libraries/central_columns.lib.php:687 libraries/rte/rte_list.lib.php:74
 #: libraries/rte/rte_list.lib.php:89 libraries/rte/rte_list.lib.php:102
-#: libraries/server_databases.lib.php:398
+#: libraries/server_databases.lib.php:409
 #: libraries/server_privileges.lib.php:2372
 #: libraries/server_privileges.lib.php:3166
 #: libraries/server_privileges.lib.php:3342
 #: libraries/server_user_groups.lib.php:82
 #: libraries/server_variables.lib.php:189 libraries/tracking.lib.php:280
-#: libraries/tracking.lib.php:793 templates/structure/table_header.phtml:30
-#: templates/structure/table_structure_header.phtml:23
+#: libraries/tracking.lib.php:793
+#: templates/database/structure/table_header.phtml:30
+#: templates/table/structure/table_structure_header.phtml:23
 msgid "Action"
 msgstr "Tegevus"
 
@@ -434,7 +436,7 @@ msgid "Untracked tables"
 msgstr "Jälgimata tabelid"
 
 #: db_tracking.php:305 db_tracking.php:336
-#: templates/structure/optional_action_links.phtml:17
+#: templates/table/structure/optional_action_links.phtml:17
 msgid "Track table"
 msgstr "Jälgi tabelit"
 
@@ -486,7 +488,7 @@ msgid "Value for the column \"%s\""
 msgstr "\"%s\" veeru väärtus"
 
 #: gis_data_editor.php:146
-#: templates/gis_visualization/gis_visualization.phtml:37
+#: templates/table/gis_visualization/gis_visualization.phtml:37
 msgid "Use OpenStreetMaps as Base Layer"
 msgstr "Kasuta OpenStreetMaps kaarti põhjana"
 
@@ -566,35 +568,35 @@ msgstr "Lisa geomeetria"
 #: libraries/display_change_password.lib.php:162
 #: libraries/display_export.lib.php:402 libraries/display_export.lib.php:408
 #: libraries/display_import.lib.php:392 libraries/index.lib.php:44
-#: libraries/insert_edit.lib.php:1546 libraries/insert_edit.lib.php:1583
+#: libraries/insert_edit.lib.php:1544 libraries/insert_edit.lib.php:1581
 #: libraries/normalization.lib.php:165 libraries/normalization.lib.php:821
 #: libraries/operations.lib.php:38 libraries/operations.lib.php:108
 #: libraries/operations.lib.php:263 libraries/operations.lib.php:306
 #: libraries/operations.lib.php:801 libraries/operations.lib.php:874
 #: libraries/operations.lib.php:923 libraries/operations.lib.php:1337
 #: libraries/operations.lib.php:1658
-#: libraries/plugins/auth/AuthenticationCookie.class.php:244
+#: libraries/plugins/auth/AuthenticationCookie.class.php:232
 #: libraries/replication_gui.lib.php:122 libraries/replication_gui.lib.php:161
 #: libraries/replication_gui.lib.php:324 libraries/replication_gui.lib.php:461
 #: libraries/replication_gui.lib.php:906 libraries/rte/rte_events.lib.php:509
-#: libraries/rte/rte_routines.lib.php:969
-#: libraries/rte/rte_routines.lib.php:1581
+#: libraries/rte/rte_routines.lib.php:1060
+#: libraries/rte/rte_routines.lib.php:1672
 #: libraries/rte/rte_triggers.lib.php:396 libraries/server_bin_log.lib.php:61
 #: libraries/server_privileges.lib.php:705
 #: libraries/server_privileges.lib.php:2106
 #: libraries/server_privileges.lib.php:2872
 #: libraries/server_privileges.lib.php:3553
-#: libraries/server_privileges.lib.php:4627
+#: libraries/server_privileges.lib.php:4653
 #: libraries/server_user_groups.lib.php:285
 #: libraries/sql_query_form.lib.php:369 libraries/sql_query_form.lib.php:429
 #: libraries/tracking.lib.php:533 libraries/tracking.lib.php:653
 #: prefs_manage.php:277 prefs_manage.php:355
 #: templates/columns_definitions/column_definitions_form.phtml:59
-#: templates/header_location.phtml:17 templates/index_form.phtml:238
+#: templates/database/create_table.phtml:21 templates/header_location.phtml:28
 #: templates/startAndNumberOfRowsPanel.phtml:14
-#: templates/structure/add_column.phtml:25
-#: templates/table/create_table.phtml:21
-#: templates/table/selection_form.phtml:75 view_create.php:275
+#: templates/table/index_form.phtml:238
+#: templates/table/search/selection_form.phtml:75
+#: templates/table/structure/add_column.phtml:25 view_create.php:275
 #: view_operations.php:106
 msgid "Go"
 msgstr "Mine"
@@ -685,7 +687,7 @@ msgid "Could not load import plugins, please check your installation!"
 msgstr ""
 "Ei saanud importimise pluginaid laadida, palun kontrolli oma paigaldust!"
 
-#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1466
+#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1460
 #, php-format
 msgid "Bookmark %s has been created."
 msgstr "Loodi järjehoidja %s."
@@ -724,11 +726,11 @@ msgstr "Importimise edenemise laadimine nurjus."
 msgid "Back"
 msgstr "Tagasi"
 
-#: index.php:148 libraries/Footer.class.php:70
+#: index.php:149 libraries/Footer.class.php:70
 msgid "phpMyAdmin Demo Server"
 msgstr "phpMyAdmini Demo Server"
 
-#: index.php:152
+#: index.php:153
 #, php-format
 msgid ""
 "You are using the demo server. You can do anything here, but please do not "
@@ -738,110 +740,110 @@ msgstr ""
 "Oled kasutamas demo serverit. Sa saad siin teha kõike, kuid palun ära muuda "
 "kasutajaid root, debian-sys-maint ja pma. Lisainfot leiad siit: %s."
 
-#: index.php:162
+#: index.php:163
 msgid "General Settings"
 msgstr "Üldised sätted"
 
-#: index.php:190 libraries/display_change_password.lib.php:50
+#: index.php:191 libraries/display_change_password.lib.php:50
 #: libraries/display_change_password.lib.php:53 user_password.php:247
 msgid "Change password"
 msgstr "Muuda parooli"
 
-#: index.php:206
+#: index.php:207
 msgid "Server connection collation"
 msgstr "Serveri ühenduse kodeering"
 
-#: index.php:228
+#: index.php:229
 msgid "Appearance Settings"
 msgstr "Välimuse sätted"
 
-#: index.php:258 prefs_manage.php:285
+#: index.php:259 prefs_manage.php:285
 msgid "More settings"
 msgstr "Rohkem sätteid"
 
-#: index.php:279
+#: index.php:280
 msgid "Database server"
 msgstr "Andmebaasi server"
 
-#: index.php:282 libraries/plugins/auth/AuthenticationCookie.class.php:181
+#: index.php:283 libraries/plugins/auth/AuthenticationCookie.class.php:169
 msgid "Server:"
 msgstr "Server:"
 
-#: index.php:286
+#: index.php:287
 msgid "Server type:"
 msgstr "Serveri tüüp:"
 
-#: index.php:290 libraries/plugins/export/ExportLatex.class.php:212
+#: index.php:291 libraries/plugins/export/ExportLatex.class.php:212
 #: libraries/plugins/export/ExportSql.class.php:687
 #: libraries/plugins/export/ExportXml.class.php:189
 msgid "Server version:"
 msgstr "Serveri versioon:"
 
-#: index.php:296
+#: index.php:297
 msgid "Protocol version:"
 msgstr "Protokolli versioon:"
 
-#: index.php:300
+#: index.php:301
 msgid "User:"
 msgstr "Kasutaja:"
 
-#: index.php:305
+#: index.php:306
 msgid "Server charset:"
 msgstr "Serveri märgitabel:"
 
-#: index.php:320
+#: index.php:321
 msgid "Web server"
 msgstr "Veebiserver"
 
-#: index.php:331
+#: index.php:332
 msgid "Database client version:"
 msgstr "Andmebaasi kliendi versioon:"
 
-#: index.php:335
+#: index.php:336
 msgid "PHP extension:"
 msgstr "PHP laiend:"
 
-#: index.php:349
+#: index.php:350
 msgid "PHP version:"
 msgstr "PHP versioon:"
 
-#: index.php:360
+#: index.php:361
 msgid "Show PHP information"
 msgstr "Näita PHP teavet"
 
-#: index.php:383
+#: index.php:384
 msgid "Version information:"
 msgstr "Versiooniinfo:"
 
-#: index.php:392 libraries/Util.class.php:432 libraries/Util.class.php:495
-#: libraries/config/FormDisplay.tpl.php:151
+#: index.php:393 libraries/Util.class.php:432 libraries/Util.class.php:495
+#: libraries/config/FormDisplay.tpl.php:162
 #: libraries/display_export.lib.php:577 libraries/engines/pbxt.lib.php:162
 #: libraries/navigation/NavigationHeader.class.php:196
 #: libraries/server_variables.lib.php:160
 msgid "Documentation"
 msgstr "Dokumentatsioon"
 
-#: index.php:399
+#: index.php:400
 msgid "Wiki"
 msgstr "Viki"
 
-#: index.php:408
+#: index.php:409
 msgid "Official Homepage"
 msgstr "Ametlik koduleht"
 
-#: index.php:415
+#: index.php:416
 msgid "Contribute"
 msgstr "Anna oma panus"
 
-#: index.php:422
+#: index.php:423
 msgid "Get support"
 msgstr "Hangi abi"
 
-#: index.php:429
+#: index.php:430
 msgid "List of changes"
 msgstr "Muudatuste nimekiri"
 
-#: index.php:451
+#: index.php:452
 msgid ""
 "You are connected as 'root' with no password, which corresponds to the "
 "default MySQL privileged account. Your MySQL server is running with this "
@@ -853,7 +855,7 @@ msgstr ""
 "avatud rünnakutele ja sa peaksid kindlasti selle turvaaugu parandama, "
 "määrates kasutajale 'root' parooli."
 
-#: index.php:468
+#: index.php:469
 msgid ""
 "You have enabled mbstring.func_overload in your PHP configuration. This "
 "option is incompatible with phpMyAdmin and might cause some data to be "
@@ -862,7 +864,7 @@ msgstr ""
 "Oled PHP seadistuses lubanud mbstring.func_overload. See ei ühildu "
 "phpMyAdminiga ja võib andmeid rikkuda!"
 
-#: index.php:483
+#: index.php:484
 msgid ""
 "The mbstring PHP extension was not found and you seem to be using a "
 "multibyte charset. Without the mbstring extension phpMyAdmin is unable to "
@@ -872,7 +874,7 @@ msgstr ""
 "märgitabelit. Ilma mbstring laiendita ei suuda phpMyAdmin sõnesid "
 "korralikult poolitada ja see võib viia ettearvamatute tulemusteni."
 
-#: index.php:500
+#: index.php:501
 msgid ""
 "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini."
 "session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower than "
@@ -884,7 +886,7 @@ msgstr ""
 "kui phpMyAdminis seadistatud küpsise kehtivus. Seetõttu võib sessioon aeguda "
 "kiiremini, kui phpMyAdminis seadistatud."
 
-#: index.php:519
+#: index.php:520
 msgid ""
 "Login cookie store is lower than cookie validity configured in phpMyAdmin, "
 "because of this, your login will expire sooner than configured in phpMyAdmin."
@@ -893,11 +895,11 @@ msgstr ""
 "küpsise kehtivus, seetõttu sinu sisselogimine aegub varem, kui phpMyAdminis "
 "seadistatud."
 
-#: index.php:535
+#: index.php:536
 msgid "The configuration file now needs a secret passphrase (blowfish_secret)."
 msgstr "Seadistusfail vajab nüüd turvasõna (blowfish_secret)."
 
-#: index.php:548
+#: index.php:549
 msgid ""
 "Directory [code]config[/code], which is used by the setup script, still "
 "exists in your phpMyAdmin directory. It is strongly recommended to remove it "
@@ -909,7 +911,7 @@ msgstr ""
 "kataloogi kindlasti kustutama. Vastasel korral võivad su serveri turvalisust "
 "ohustada isikud, kes on alla laadinud serveri seadistuste faili."
 
-#: index.php:564
+#: index.php:565
 #, php-format
 msgid ""
 "The phpMyAdmin configuration storage is not completely configured, some "
@@ -918,14 +920,14 @@ msgstr ""
 "phpMyAdmini häälestuse salvestuskoht ei ole lõplikult häälestatud; mõned "
 "laiendatud funktsioonid ei ole aktiveeritud. %sVaata põhjust%s. "
 
-#: index.php:571
+#: index.php:572
 msgid ""
 "Or alternately go to 'Operations' tab of any database to set it up there."
 msgstr ""
 "Alternatiivina mine suvalises andmebaasis sakile 'Operatsioonid' ja seadista "
 "ta seal."
 
-#: index.php:620
+#: index.php:621
 #, php-format
 msgid ""
 "Your PHP MySQL library version %s differs from your MySQL server version %s. "
@@ -934,7 +936,7 @@ msgstr ""
 "Sinu PHP MySQL'i teegi versioon %s erineb sinu MySQL serveri versioonist %s. "
 "See võib põhjustada ettearvamatut käitumist."
 
-#: index.php:648
+#: index.php:649
 #, php-format
 msgid ""
 "Server running with Suhosin. Please refer to %sdocumentation%s for possible "
@@ -1094,8 +1096,8 @@ msgstr ""
 msgid "Save & Close"
 msgstr "Salvesta ja sule"
 
-#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:404
-#: libraries/insert_edit.lib.php:1550 prefs_manage.php:361
+#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:415
+#: libraries/insert_edit.lib.php:1548 prefs_manage.php:361
 #: prefs_manage.php:372
 msgid "Reset"
 msgstr "Lähtesta"
@@ -1128,7 +1130,7 @@ msgstr "Lisa indeks"
 msgid "Edit Index"
 msgstr "Muuda indeksit"
 
-#: js/messages.php:99 templates/index_form.phtml:232
+#: js/messages.php:99 templates/table/index_form.phtml:232
 #, php-format
 msgid "Add %s column(s) to index"
 msgstr "Lisa indeksisse %s veerg(u)"
@@ -1149,13 +1151,14 @@ msgstr "Kasuta:"
 msgid "Please select column(s) for the index."
 msgstr "Palun vali indeksi veerg(u)."
 
-#: js/messages.php:106 templates/structure/add_column.phtml:1
+#: js/messages.php:106 templates/table/structure/add_column.phtml:1
 msgid "You have to add at least one column."
 msgstr "Pead lisama vähemalt ühe veeru."
 
-#: js/messages.php:109 libraries/insert_edit.lib.php:1548
+#: js/messages.php:109 libraries/insert_edit.lib.php:1546
 #: templates/columns_definitions/column_definitions_form.phtml:162
-#: templates/index_form.phtml:237 templates/tbl_relation/common_form.phtml:106
+#: templates/table/index_form.phtml:237
+#: templates/table/relation/common_form.phtml:106
 msgid "Preview SQL"
 msgstr "SQL eelvaade"
 
@@ -1172,7 +1175,7 @@ msgid "SQL query:"
 msgstr "SQL päring:"
 
 #. l10n: Default label for the y-Axis of Charts
-#: js/messages.php:118 templates/tbl_chart.phtml:109
+#: js/messages.php:118 templates/table/chart/tbl_chart.phtml:109
 msgid "Y Values"
 msgstr "Y väärtused"
 
@@ -1327,7 +1330,7 @@ msgstr "Saadetud baidid"
 msgid "Bytes received"
 msgstr "Vastuvõetud baidid"
 
-#: js/messages.php:169 libraries/server_status.lib.php:226
+#: js/messages.php:169 libraries/server_status.lib.php:235
 msgid "Connections"
 msgstr "Ühendused"
 
@@ -1384,12 +1387,12 @@ msgstr "%d tabel(it)"
 msgid "Questions"
 msgstr "Päringud"
 
-#: js/messages.php:184 libraries/server_status.lib.php:134
+#: js/messages.php:184 libraries/server_status.lib.php:143
 msgid "Traffic"
 msgstr "Liiklus"
 
 #: js/messages.php:185 libraries/Menu.class.php:586
-#: libraries/Util.class.php:4318 libraries/server_status_monitor.lib.php:257
+#: libraries/Util.class.php:4324 libraries/server_status_monitor.lib.php:257
 msgid "Settings"
 msgstr "Sätted"
 
@@ -1409,8 +1412,9 @@ msgstr "Palun lisa seeriasse vähemalt üks muutuja!"
 #: libraries/server_status_monitor.lib.php:236
 #: libraries/server_status_processes.lib.php:308
 #: templates/columns_definitions/transformation.phtml:4
-#: templates/designer/options_panel.phtml:178
-#: templates/table/options_zoom.phtml:12 templates/table/rows_zoom.phtml:26
+#: templates/database/designer/options_panel.phtml:178
+#: templates/table/search/options_zoom.phtml:12
+#: templates/table/search/rows_zoom.phtml:26
 msgid "None"
 msgstr "Puudub"
 
@@ -1696,8 +1700,8 @@ msgstr ""
 
 #: js/messages.php:270 libraries/Menu.class.php:352
 #: libraries/Menu.class.php:455 libraries/Menu.class.php:582
-#: libraries/Util.class.php:4317 libraries/Util.class.php:4332
-#: libraries/Util.class.php:4349 libraries/config/messages.inc.php:258
+#: libraries/Util.class.php:4323 libraries/Util.class.php:4338
+#: libraries/Util.class.php:4355 libraries/config/messages.inc.php:258
 #: libraries/display_import.lib.php:105
 #: libraries/server_status_monitor.lib.php:318 prefs_manage.php:238
 #: setup/frames/menu.inc.php:26
@@ -1757,13 +1761,13 @@ msgid "Formatting SQL..."
 msgstr "SQL vormindamine..."
 
 #: js/messages.php:293 libraries/server_variables.lib.php:157
-#: templates/designer/aggregate_query_panel.phtml:63
-#: templates/designer/delete_relation_panel.phtml:28
-#: templates/designer/having_query_panel.phtml:117
-#: templates/designer/new_relation_panel.phtml:88
-#: templates/designer/options_panel.phtml:253
-#: templates/designer/rename_to_panel.phtml:45
-#: templates/designer/where_query_panel.phtml:83
+#: templates/database/designer/aggregate_query_panel.phtml:63
+#: templates/database/designer/delete_relation_panel.phtml:28
+#: templates/database/designer/having_query_panel.phtml:117
+#: templates/database/designer/new_relation_panel.phtml:88
+#: templates/database/designer/options_panel.phtml:253
+#: templates/database/designer/rename_to_panel.phtml:45
+#: templates/database/designer/where_query_panel.phtml:83
 msgid "Cancel"
 msgstr "Katkesta"
 
@@ -1771,7 +1775,7 @@ msgstr "Katkesta"
 msgid "Page-related settings"
 msgstr "Lehega seonduvad sätted"
 
-#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:402
+#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:413
 msgid "Apply"
 msgstr "Rakenda"
 
@@ -1806,8 +1810,8 @@ msgstr "Vea kood: %s"
 msgid "Error text: %s"
 msgstr "Vea tekst: %s"
 
-#: js/messages.php:307 libraries/db_common.inc.php:68
-#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:450
+#: js/messages.php:307 libraries/db_common.inc.php:69
+#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:461
 msgid "No databases selected."
 msgstr "Ühtegi andmebaasi ei ole valitud."
 
@@ -1819,12 +1823,13 @@ msgstr "Veeru kustutamine"
 msgid "Adding Primary Key"
 msgstr "Primaarvõtme lisamine"
 
-#: js/messages.php:310 templates/designer/aggregate_query_panel.phtml:59
-#: templates/designer/having_query_panel.phtml:113
-#: templates/designer/new_relation_panel.phtml:87
-#: templates/designer/options_panel.phtml:252
-#: templates/designer/rename_to_panel.phtml:41
-#: templates/designer/where_query_panel.phtml:82
+#: js/messages.php:310
+#: templates/database/designer/aggregate_query_panel.phtml:59
+#: templates/database/designer/having_query_panel.phtml:113
+#: templates/database/designer/new_relation_panel.phtml:87
+#: templates/database/designer/options_panel.phtml:252
+#: templates/database/designer/rename_to_panel.phtml:41
+#: templates/database/designer/where_query_panel.phtml:82
 msgid "OK"
 msgstr "OK"
 
@@ -1844,7 +1849,7 @@ msgstr "Andmebaasi kopeerimine"
 msgid "Changing Charset"
 msgstr "Märgitabeli muutmine"
 
-#: js/messages.php:320 libraries/Util.class.php:3217
+#: js/messages.php:320 libraries/Util.class.php:3223
 msgid "Enable foreign key checks"
 msgstr "Luba võõrvõtme(te) kontrollid"
 
@@ -1879,20 +1884,21 @@ msgstr "Salvestatud funktsioon peab sisaldama RETURN käsku!"
 #: js/messages.php:334 libraries/DisplayResults.class.php:4834
 #: libraries/DisplayResults.class.php:5092 libraries/Menu.class.php:344
 #: libraries/Menu.class.php:446 libraries/Menu.class.php:578
-#: libraries/Util.class.php:3636 libraries/Util.class.php:3637
-#: libraries/Util.class.php:4316 libraries/Util.class.php:4331
-#: libraries/Util.class.php:4348 libraries/config/messages.inc.php:252
+#: libraries/Util.class.php:3642 libraries/Util.class.php:3643
+#: libraries/Util.class.php:4322 libraries/Util.class.php:4337
+#: libraries/Util.class.php:4354 libraries/config/messages.inc.php:252
 #: libraries/display_export.lib.php:173 libraries/rte/rte_list.lib.php:146
 #: libraries/server_privileges.lib.php:2211
 #: libraries/server_privileges.lib.php:2290
 #: libraries/server_privileges.lib.php:2632
 #: libraries/server_privileges.lib.php:3356
 #: libraries/server_status_monitor.lib.php:322 prefs_manage.php:303
-#: setup/frames/menu.inc.php:27 templates/structure/check_all_tables.phtml:11
+#: setup/frames/menu.inc.php:27
+#: templates/database/structure/check_all_tables.phtml:11
 msgid "Export"
 msgstr "Ekspordi"
 
-#: js/messages.php:337 libraries/rte/rte_routines.lib.php:652
+#: js/messages.php:337 libraries/rte/rte_routines.lib.php:743
 msgid "ENUM/SET editor"
 msgstr "ENUM/SET toimeti"
 
@@ -1931,7 +1937,7 @@ msgstr "Näita päringu kasti"
 #: libraries/Console.class.php:214 libraries/DisplayResults.class.php:3474
 #: libraries/DisplayResults.class.php:4818 libraries/Index.class.php:723
 #: libraries/Util.class.php:706 libraries/Util.class.php:1202
-#: libraries/Util.class.php:3634 libraries/Util.class.php:3635
+#: libraries/Util.class.php:3640 libraries/Util.class.php:3641
 #: libraries/central_columns.lib.php:851
 #: libraries/central_columns.lib.php:1193
 #: libraries/config/messages.inc.php:892
@@ -1949,7 +1955,7 @@ msgstr "Muuda"
 #: libraries/server_user_groups.lib.php:129
 #: libraries/sql_query_form.lib.php:416 libraries/tracking.lib.php:477
 #: setup/frames/index.inc.php:183 setup/frames/index.inc.php:291
-#: templates/designer/delete_relation_panel.phtml:27
+#: templates/database/designer/delete_relation_panel.phtml:27
 msgid "Delete"
 msgstr "Kustuta"
 
@@ -2120,11 +2126,11 @@ msgid "No dependencies selected!"
 msgstr "Ühtegi sõltuvust ei ole valitud!"
 
 #: js/messages.php:394 libraries/central_columns.lib.php:1214
-#: libraries/insert_edit.lib.php:1458 libraries/server_variables.lib.php:155
+#: libraries/insert_edit.lib.php:1456 libraries/server_variables.lib.php:155
 #: setup/frames/config.inc.php:42 setup/frames/index.inc.php:279
 #: templates/columns_definitions/column_definitions_form.phtml:165
-#: templates/gis_visualization/gis_visualization.phtml:48
-#: templates/tbl_relation/common_form.phtml:107
+#: templates/table/gis_visualization/gis_visualization.phtml:48
+#: templates/table/relation/common_form.phtml:107
 msgid "Save"
 msgstr "Salvesta"
 
@@ -2202,8 +2208,8 @@ msgid "Data point content"
 msgstr "Andmepunkti sisu"
 
 #: js/messages.php:430 js/messages.php:562 js/messages.php:579
-#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2573
-#: templates/index_form.phtml:154 templates/index_form.phtml:194
+#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2571
+#: templates/table/index_form.phtml:154 templates/table/index_form.phtml:194
 msgid "Ignore"
 msgstr "Ignoreeri"
 
@@ -2264,8 +2270,8 @@ msgstr "Vali võõrvõti"
 msgid "Please select the primary key or a unique key!"
 msgstr "Palun vali primaarvõti või unikaalne nimi!"
 
-#: js/messages.php:457 templates/designer/side_menu.phtml:91
-#: templates/designer/side_menu.phtml:94
+#: js/messages.php:457 templates/database/designer/side_menu.phtml:91
+#: templates/database/designer/side_menu.phtml:94
 msgid "Choose column to display"
 msgstr "Vali veerg, mida näidata"
 
@@ -2281,18 +2287,18 @@ msgstr ""
 msgid "Page name"
 msgstr "Lehe nimi"
 
-#: js/messages.php:463 templates/designer/side_menu.phtml:56
-#: templates/designer/side_menu.phtml:59
+#: js/messages.php:463 templates/database/designer/side_menu.phtml:56
+#: templates/database/designer/side_menu.phtml:59
 msgid "Save page"
 msgstr "Salvesta leht"
 
-#: js/messages.php:464 templates/designer/side_menu.phtml:63
-#: templates/designer/side_menu.phtml:66
+#: js/messages.php:464 templates/database/designer/side_menu.phtml:63
+#: templates/database/designer/side_menu.phtml:66
 msgid "Save page as"
 msgstr "Salvesta leht nimega"
 
-#: js/messages.php:465 templates/designer/side_menu.phtml:49
-#: templates/designer/side_menu.phtml:52
+#: js/messages.php:465 templates/database/designer/side_menu.phtml:49
+#: templates/database/designer/side_menu.phtml:52
 msgid "Open page"
 msgstr "Ava lehe"
 
@@ -2300,7 +2306,7 @@ msgstr "Ava lehe"
 msgid "Delete page"
 msgstr "Kustuta leht"
 
-#: js/messages.php:467 templates/designer/side_menu.phtml:10
+#: js/messages.php:467 templates/database/designer/side_menu.phtml:10
 msgid "Untitled"
 msgstr "Nimetu"
 
@@ -2422,7 +2428,7 @@ msgstr "Algne pikkus"
 msgid "cancel"
 msgstr "katkesta"
 
-#: js/messages.php:499 libraries/server_status.lib.php:271
+#: js/messages.php:499 libraries/server_status.lib.php:280
 msgid "Aborted"
 msgstr "Katkestatud"
 
@@ -2985,7 +2991,7 @@ msgstr "Palun sisesta korrektne 16-nd väärtus"
 
 #: js/messages.php:793 libraries/Message.class.php:199
 #: libraries/Util.class.php:654 libraries/core.lib.php:245
-#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1172
+#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1170
 #: tbl_operations.php:229 view_operations.php:63
 msgid "Error"
 msgstr "Viga"
@@ -3044,8 +3050,8 @@ msgstr "sekundis"
 msgid "per minute"
 msgstr "minutis"
 
-#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:143
-#: libraries/server_status.lib.php:228
+#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:152
+#: libraries/server_status.lib.php:237
 #: libraries/server_status_queries.lib.php:98
 msgid "per hour"
 msgstr "tunnis"
@@ -3065,7 +3071,7 @@ msgstr ""
 "Seadistusfailil on valed õigused. See ei tohiks olla kõikide jaoks "
 "kirjutatav!"
 
-#: libraries/Config.class.php:1799
+#: libraries/Config.class.php:1801
 msgid "Font size"
 msgstr "Fondi kõrgus"
 
@@ -3093,10 +3099,10 @@ msgstr "Korduspäring"
 #: libraries/server_privileges.lib.php:2890
 #: libraries/server_privileges.lib.php:3144
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4332
+#: libraries/server_privileges.lib.php:4358
 #: libraries/server_status_processes.lib.php:80
-#: templates/tbl_relation/foreign_key_row.phtml:165
-#: templates/tbl_relation/internal_relational_row.phtml:55
+#: templates/table/relation/foreign_key_row.phtml:165
+#: templates/table/relation/internal_relational_row.phtml:55
 msgid "Database"
 msgstr "Andmebaas"
 
@@ -3189,11 +3195,11 @@ msgstr "Ajalugu"
 #: libraries/plugins/import/ImportMediawiki.class.php:60
 #: libraries/plugins/import/ImportOds.class.php:59
 #: libraries/plugins/import/ImportShp.class.php:57
-#: libraries/plugins/import/ImportSql.class.php:148
+#: libraries/plugins/import/ImportSql.class.php:51
 #: libraries/plugins/import/ImportXml.class.php:58
-#: libraries/rte/rte_routines.lib.php:833 templates/index_form.phtml:49
-#: templates/structure/row_stats_table.phtml:20
-#: templates/table/options.phtml:2
+#: libraries/rte/rte_routines.lib.php:924 templates/table/index_form.phtml:49
+#: templates/table/search/options.phtml:2
+#: templates/table/structure/row_stats_table.phtml:20
 msgid "Options"
 msgstr "Valikud"
 
@@ -3226,7 +3232,8 @@ msgstr "kahanev"
 msgid "Order:"
 msgstr "Järjestus:"
 
-#: libraries/Console.class.php:289 templates/table/replace_preview.phtml:17
+#: libraries/Console.class.php:289
+#: templates/table/search/replace_preview.phtml:17
 msgid "Count"
 msgstr "Kogus"
 
@@ -3323,9 +3330,9 @@ msgstr "Vali tume teema"
 #: libraries/operations.lib.php:794 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:191
-#: templates/structure/sortable_header.phtml:21
-#: templates/structure/sortable_header.phtml:38
-#: templates/table/options.phtml:68
+#: templates/database/structure/sortable_header.phtml:21
+#: templates/database/structure/sortable_header.phtml:38
+#: templates/table/search/options.phtml:68
 msgid "Ascending"
 msgstr "Kasvav"
 
@@ -3335,13 +3342,14 @@ msgstr "Kasvav"
 #: libraries/operations.lib.php:797 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:188
-#: templates/structure/sortable_header.phtml:26
-#: templates/structure/sortable_header.phtml:43
-#: templates/table/options.phtml:69
+#: templates/database/structure/sortable_header.phtml:26
+#: templates/database/structure/sortable_header.phtml:43
+#: templates/table/search/options.phtml:69
 msgid "Descending"
 msgstr "Kahanev"
 
-#: libraries/DBQbe.class.php:467 templates/table/search_and_replace.phtml:6
+#: libraries/DBQbe.class.php:467
+#: templates/table/search/search_and_replace.phtml:6
 msgid "Column:"
 msgstr "Veerg:"
 
@@ -3497,12 +3505,12 @@ msgstr[0] "%1$s vaste <strong>%2$s</strong> tabelis"
 msgstr[1] "%1$s vastet <strong>%2$s</strong> tabelis"
 
 #: libraries/DbSearch.class.php:354 libraries/Menu.class.php:311
-#: libraries/Util.class.php:3337 libraries/Util.class.php:3347
-#: libraries/Util.class.php:3623 libraries/Util.class.php:3624
-#: libraries/Util.class.php:4343 libraries/config.values.php:43
+#: libraries/Util.class.php:3343 libraries/Util.class.php:3353
+#: libraries/Util.class.php:3629 libraries/Util.class.php:3630
+#: libraries/Util.class.php:4349 libraries/config.values.php:43
 #: libraries/config.values.php:51 libraries/config.values.php:119
 #: libraries/navigation/Nodes/Node_Table.class.php:295
-#: templates/structure/check_all_table_column.phtml:5
+#: templates/table/structure/check_all_table_column.phtml:5
 msgid "Browse"
 msgstr "Vaata"
 
@@ -3519,7 +3527,8 @@ msgstr "Otsi andmebaasist"
 msgid "Words or values to search for (wildcard: \"%\"):"
 msgstr "Sõnad või väärtused, mida otsida (metamärk: \"%\"):"
 
-#: libraries/DbSearch.class.php:401 templates/table/search_and_replace.phtml:1
+#: libraries/DbSearch.class.php:401
+#: templates/table/search/search_and_replace.phtml:1
 msgid "Find:"
 msgstr "Leia:"
 
@@ -3563,28 +3572,28 @@ msgstr "Filtreeritud read"
 msgid "Search this table"
 msgstr "Otsi sellest tabelist"
 
-#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2532
-#: libraries/Util.class.php:2535
+#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2538
+#: libraries/Util.class.php:2541
 msgctxt "First page"
 msgid "Begin"
 msgstr "Algus"
 
-#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2533
-#: libraries/Util.class.php:2536 libraries/server_bin_log.lib.php:170
+#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2539
+#: libraries/Util.class.php:2542 libraries/server_bin_log.lib.php:170
 #: libraries/server_bin_log.lib.php:172
 msgctxt "Previous page"
 msgid "Previous"
 msgstr "Eelmine"
 
-#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2564
-#: libraries/Util.class.php:2574 libraries/server_bin_log.lib.php:204
+#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2570
+#: libraries/Util.class.php:2580 libraries/server_bin_log.lib.php:204
 #: libraries/server_bin_log.lib.php:206
 msgctxt "Next page"
 msgid "Next"
 msgstr "Järgmine"
 
-#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2565
-#: libraries/Util.class.php:2575
+#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2571
+#: libraries/Util.class.php:2581
 msgctxt "Last page"
 msgid "End"
 msgstr "Lõpp"
@@ -3618,7 +3627,6 @@ msgid "Relational key"
 msgstr "Seose võti"
 
 #: libraries/DisplayResults.class.php:1744
-#| msgid "Display foreign key relationships"
 msgid "Display column for relations"
 msgstr "Kuva suhete nägemiseks veerg"
 
@@ -3658,15 +3666,15 @@ msgid "May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]."
 msgstr "Võib olla umbkaudne. Vaata [doc@faq3-11]KKK 3.11[/doc]."
 
 #: libraries/DisplayResults.class.php:4332 libraries/Message.class.php:180
-#: libraries/controllers/TableRelationController.class.php:258
+#: libraries/controllers/TableRelationController.class.php:259
 #: libraries/controllers/TableSearchController.class.php:655
-#: libraries/rte/rte_routines.lib.php:1332 libraries/sql_query_form.lib.php:89
+#: libraries/rte/rte_routines.lib.php:1423 libraries/sql_query_form.lib.php:89
 #: tbl_operations.php:227 tbl_row_action.php:138 view_operations.php:62
 msgid "Your SQL query has been executed successfully."
 msgstr "Sinu SQL päring teostati edukalt."
 
 #: libraries/DisplayResults.class.php:4660
-#: libraries/controllers/StructureController.class.php:629
+#: libraries/controllers/DatabaseStructureController.class.php:564
 #, php-format
 msgid ""
 "This view has at least this number of rows. Please refer to %sdocumentation"
@@ -3689,33 +3697,33 @@ msgstr "Kokku %1$d, päringus %2$d"
 msgid "%d total"
 msgstr "kokku: %d"
 
-#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1318
+#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1312
 #, php-format
 msgid "Query took %01.4f seconds."
 msgstr "päring kestis %01.4f sekundit."
 
 #: libraries/DisplayResults.class.php:4807
-#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4767
-#: libraries/Util.class.php:4773 libraries/mult_submits.inc.php:50
-#: templates/structure/check_all_tables.phtml:2
-#: templates/structure/check_all_tables.phtml:9
+#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4773
+#: libraries/Util.class.php:4779 libraries/mult_submits.inc.php:50
+#: templates/database/structure/check_all_tables.phtml:2
+#: templates/database/structure/check_all_tables.phtml:9
 msgid "With selected:"
 msgstr "Valitutega:"
 
 #: libraries/DisplayResults.class.php:4811
-#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4769
-#: libraries/Util.class.php:4770 libraries/server_privileges.lib.php:1174
+#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4775
+#: libraries/Util.class.php:4776 libraries/server_privileges.lib.php:1174
 #: libraries/server_privileges.lib.php:1175
 #: libraries/server_privileges.lib.php:1387
 #: libraries/server_user_groups.lib.php:231
-#: templates/structure/check_all_tables.phtml:3
-#: templates/structure/check_all_tables.phtml:4
+#: templates/database/structure/check_all_tables.phtml:3
+#: templates/database/structure/check_all_tables.phtml:4
 msgid "Check All"
 msgstr "Vali kõik"
 
 #: libraries/DisplayResults.class.php:4985 libraries/Header.class.php:383
-#: templates/structure/optional_action_links.phtml:1
-#: templates/structure/print_view_data_dictionary_link.phtml:3
+#: templates/database/structure/print_view_data_dictionary_link.phtml:3
+#: templates/table/structure/optional_action_links.phtml:1
 msgid "Print view"
 msgstr "Prindi vaade"
 
@@ -3723,7 +3731,8 @@ msgstr "Prindi vaade"
 msgid "Query results operations"
 msgstr "Päringu tulemuste tegevused"
 
-#: libraries/DisplayResults.class.php:5105 templates/tbl_chart.phtml:12
+#: libraries/DisplayResults.class.php:5105
+#: templates/table/chart/tbl_chart.phtml:12
 msgid "Display chart"
 msgstr "Näita diagrammi"
 
@@ -3792,7 +3801,6 @@ msgid "Error while moving uploaded file."
 msgstr "Üleslaetud faili liigutamisel esines viga."
 
 #: libraries/File.class.php:487
-#| msgid "Cannot read moved uploaded file."
 msgid "Cannot read uploaded file."
 msgstr "Ei saa lugeda üleslaaditud faili."
 
@@ -3815,7 +3823,7 @@ msgid "Click on the bar to scroll to top of page"
 msgstr "Kliki ribal, et lehe alguessse kerida"
 
 #: libraries/Header.class.php:749
-#: libraries/plugins/auth/AuthenticationCookie.class.php:152
+#: libraries/plugins/auth/AuthenticationCookie.class.php:140
 msgid "Javascript must be enabled past this point!"
 msgstr "Javascript peab olema lubatud!"
 
@@ -3837,11 +3845,11 @@ msgid "Keyname"
 msgstr "Võtme nimi"
 
 #: libraries/Index.class.php:697
-#: libraries/controllers/StructureController.class.php:1962
-#: libraries/controllers/StructureController.class.php:1967
+#: libraries/controllers/TableStructureController.class.php:953
+#: libraries/controllers/TableStructureController.class.php:958
 #: libraries/tracking.lib.php:973
 #: templates/columns_definitions/column_indexes.phtml:11
-#: templates/structure/check_all_table_column.phtml:26
+#: templates/table/structure/check_all_table_column.phtml:26
 msgid "Unique"
 msgstr "Ainulaadne"
 
@@ -3860,16 +3868,17 @@ msgstr "Hulk"
 #: libraries/server_collations.lib.php:35 libraries/tracking.lib.php:881
 #: libraries/tracking.lib.php:977
 #: templates/columns_definitions/table_fields_definitions.phtml:33
-#: templates/structure/row_stats_table.phtml:31
-#: templates/structure/table_header.phtml:55
-#: templates/structure/table_structure_header.phtml:7
-#: templates/table/table_header.phtml:8
+#: templates/database/structure/table_header.phtml:55
+#: templates/table/search/table_header.phtml:8
+#: templates/table/structure/row_stats_table.phtml:31
+#: templates/table/structure/table_structure_header.phtml:7
 msgid "Collation"
 msgstr "Kodeering"
 
 #: libraries/Index.class.php:703 libraries/rte/rte_events.lib.php:496
-#: libraries/rte/rte_routines.lib.php:956 libraries/tracking.lib.php:885
-#: libraries/tracking.lib.php:979 templates/structure/table_header.phtml:84
+#: libraries/rte/rte_routines.lib.php:1047 libraries/tracking.lib.php:885
+#: libraries/tracking.lib.php:979
+#: templates/database/structure/table_header.phtml:84
 msgid "Comment"
 msgstr "Kommentaar"
 
@@ -3882,15 +3891,15 @@ msgstr "Primaarvõti on kustutatud."
 msgid "Index %s has been dropped."
 msgstr "%s indeks on kustutatud."
 
-#: libraries/Index.class.php:757 libraries/Util.class.php:3630
-#: libraries/Util.class.php:3631
-#: libraries/controllers/StructureController.class.php:1958
-#: libraries/controllers/StructureController.class.php:1959
+#: libraries/Index.class.php:757 libraries/Util.class.php:3636
+#: libraries/Util.class.php:3637
+#: libraries/controllers/TableStructureController.class.php:949
+#: libraries/controllers/TableStructureController.class.php:950
 #: libraries/operations.lib.php:1607 libraries/rte/rte_list.lib.php:150
 #: libraries/server_databases.lib.php:146
-#: templates/structure/check_all_table_column.phtml:15
-#: templates/structure/check_all_tables.phtml:16
-#: templates/tbl_relation/foreign_key_row.phtml:93
+#: templates/database/structure/check_all_tables.phtml:16
+#: templates/table/relation/foreign_key_row.phtml:93
+#: templates/table/structure/check_all_table_column.phtml:15
 msgid "Drop"
 msgstr "Kustuta"
 
@@ -3922,16 +3931,16 @@ msgstr "Server"
 #: libraries/Menu.class.php:248
 #: libraries/navigation/Nodes/Node_View.class.php:32
 #: libraries/tbl_info.inc.php:63
-#: templates/structure/structure_table_row.phtml:97
-#: templates/structure/structure_table_row.phtml:159
+#: templates/database/structure/structure_table_row.phtml:97
+#: templates/database/structure/structure_table_row.phtml:159
 msgid "View"
 msgstr "Vaade"
 
 #: libraries/Menu.class.php:325 libraries/Menu.class.php:429
-#: libraries/Menu.class.php:548 libraries/Util.class.php:3334
-#: libraries/Util.class.php:3344 libraries/Util.class.php:3350
-#: libraries/Util.class.php:4313 libraries/Util.class.php:4328
-#: libraries/Util.class.php:4345 libraries/config.values.php:40
+#: libraries/Menu.class.php:548 libraries/Util.class.php:3340
+#: libraries/Util.class.php:3350 libraries/Util.class.php:3356
+#: libraries/Util.class.php:4319 libraries/Util.class.php:4334
+#: libraries/Util.class.php:4351 libraries/config.values.php:40
 #: libraries/config.values.php:48 libraries/config.values.php:110
 #: libraries/config.values.php:116 libraries/config/messages.inc.php:321
 #: libraries/navigation/Nodes/Node_Table.class.php:292
@@ -3939,19 +3948,19 @@ msgid "SQL"
 msgstr "SQL"
 
 #: libraries/Menu.class.php:328 libraries/Menu.class.php:432
-#: libraries/Util.class.php:3335 libraries/Util.class.php:3345
-#: libraries/Util.class.php:3351 libraries/Util.class.php:3625
-#: libraries/Util.class.php:3626 libraries/Util.class.php:4329
-#: libraries/Util.class.php:4346 libraries/config.values.php:41
+#: libraries/Util.class.php:3341 libraries/Util.class.php:3351
+#: libraries/Util.class.php:3357 libraries/Util.class.php:3631
+#: libraries/Util.class.php:3632 libraries/Util.class.php:4335
+#: libraries/Util.class.php:4352 libraries/config.values.php:41
 #: libraries/config.values.php:49 libraries/config.values.php:111
 #: libraries/config.values.php:117
 #: libraries/navigation/Nodes/Node_Table.class.php:286
 msgid "Search"
 msgstr "Otsi"
 
-#: libraries/Menu.class.php:338 libraries/Util.class.php:3336
-#: libraries/Util.class.php:3346 libraries/Util.class.php:3627
-#: libraries/Util.class.php:3628 libraries/Util.class.php:4347
+#: libraries/Menu.class.php:338 libraries/Util.class.php:3342
+#: libraries/Util.class.php:3352 libraries/Util.class.php:3633
+#: libraries/Util.class.php:3634 libraries/Util.class.php:4353
 #: libraries/config.values.php:42 libraries/config.values.php:50
 #: libraries/config.values.php:118
 #: libraries/navigation/Nodes/Node_Table.class.php:289
@@ -3960,30 +3969,30 @@ msgid "Insert"
 msgstr "Lisa"
 
 #: libraries/Menu.class.php:362 libraries/Menu.class.php:467
-#: libraries/Util.class.php:4334 libraries/Util.class.php:4350
+#: libraries/Util.class.php:4340 libraries/Util.class.php:4356
 #: libraries/config.values.php:106 libraries/server_common.lib.php:51
 #: libraries/server_privileges.lib.php:2370
 #: libraries/server_privileges.lib.php:3158
-#: libraries/server_privileges.lib.php:4221
+#: libraries/server_privileges.lib.php:4247
 msgid "Privileges"
 msgstr "Õigused"
 
 #: libraries/Menu.class.php:371 libraries/Menu.class.php:379
-#: libraries/Menu.class.php:459 libraries/Util.class.php:3338
-#: libraries/Util.class.php:3352 libraries/Util.class.php:4333
-#: libraries/Util.class.php:4351 libraries/config.values.php:112
+#: libraries/Menu.class.php:459 libraries/Util.class.php:3344
+#: libraries/Util.class.php:3358 libraries/Util.class.php:4339
+#: libraries/Util.class.php:4357 libraries/config.values.php:112
 #: view_operations.php:92
 msgid "Operations"
 msgstr "Tegevused"
 
 #: libraries/Menu.class.php:384 libraries/Menu.class.php:492
-#: libraries/Util.class.php:4338 libraries/Util.class.php:4352
+#: libraries/Util.class.php:4344 libraries/Util.class.php:4358
 #: libraries/relation.lib.php:255
 msgid "Tracking"
 msgstr "Jälgimine"
 
 #: libraries/Menu.class.php:397 libraries/Menu.class.php:486
-#: libraries/Util.class.php:4337 libraries/Util.class.php:4353
+#: libraries/Util.class.php:4343 libraries/Util.class.php:4359
 #: libraries/navigation/Nodes/Node_Trigger_Container.class.php:24
 #: libraries/plugins/export/ExportHtmlword.class.php:557
 #: libraries/plugins/export/ExportOdt.class.php:685
@@ -4000,16 +4009,16 @@ msgstr "Päästikud"
 msgid "Database seems to be empty!"
 msgstr "Andmebaas tundub olevat tühi!"
 
-#: libraries/Menu.class.php:439 libraries/Util.class.php:4330
+#: libraries/Menu.class.php:439 libraries/Util.class.php:4336
 msgid "Query"
 msgstr "Päring"
 
-#: libraries/Menu.class.php:472 libraries/Util.class.php:4335
+#: libraries/Menu.class.php:472 libraries/Util.class.php:4341
 #: libraries/rte/rte_words.lib.php:36
 msgid "Routines"
 msgstr "Funktsioonid"
 
-#: libraries/Menu.class.php:479 libraries/Util.class.php:4336
+#: libraries/Menu.class.php:479 libraries/Util.class.php:4342
 #: libraries/navigation/Nodes/Node_Event_Container.class.php:26
 #: libraries/plugins/export/ExportSql.class.php:940
 #: libraries/plugins/export/ExportXml.class.php:107
@@ -4017,20 +4026,20 @@ msgstr "Funktsioonid"
 msgid "Events"
 msgstr "Sündmused"
 
-#: libraries/Menu.class.php:498 libraries/Util.class.php:4339
+#: libraries/Menu.class.php:498 libraries/Util.class.php:4345
 msgid "Designer"
 msgstr "Kujundaja"
 
-#: libraries/Menu.class.php:507 libraries/Util.class.php:4340
-#: templates/structure/check_all_tables.phtml:35
+#: libraries/Menu.class.php:507 libraries/Util.class.php:4346
+#: templates/database/structure/check_all_tables.phtml:35
 msgid "Central columns"
 msgstr "Kesksed veerud"
 
-#: libraries/Menu.class.php:544 libraries/Util.class.php:4312
+#: libraries/Menu.class.php:544 libraries/Util.class.php:4318
 #: libraries/config.values.php:103 libraries/config/messages.inc.php:266
 #: libraries/config/messages.inc.php:341
 #: libraries/navigation/NavigationTree.class.php:1239
-#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4332
+#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4358
 msgid "Databases"
 msgstr "Andmebaasid"
 
@@ -4039,34 +4048,34 @@ msgid "User accounts"
 msgstr "Kasutajate kontod"
 
 #: libraries/Menu.class.php:595 libraries/ServerStatusData.class.php:121
-#: libraries/Util.class.php:4319 libraries/server_common.lib.php:36
+#: libraries/Util.class.php:4325 libraries/server_common.lib.php:36
 msgid "Binary log"
 msgstr "Binaarne logi"
 
 #: libraries/Menu.class.php:601 libraries/ServerStatusData.class.php:126
-#: libraries/Util.class.php:4320 libraries/server_common.lib.php:42
-#: templates/structure/body_for_table_summary.phtml:10
-#: templates/structure/table_header.phtml:27
+#: libraries/Util.class.php:4326 libraries/server_common.lib.php:42
+#: templates/database/structure/body_for_table_summary.phtml:10
+#: templates/database/structure/table_header.phtml:27
 msgid "Replication"
 msgstr "Paljundamine"
 
 #: libraries/Menu.class.php:606 libraries/ServerStatusData.class.php:193
-#: libraries/Util.class.php:4321 libraries/config.values.php:105
+#: libraries/Util.class.php:4327 libraries/config.values.php:105
 #: libraries/server_engines.lib.php:108 libraries/server_engines.lib.php:112
 #: libraries/sql_query_form.lib.php:421
 msgid "Variables"
 msgstr "Muutujad"
 
-#: libraries/Menu.class.php:610 libraries/Util.class.php:4322
+#: libraries/Menu.class.php:610 libraries/Util.class.php:4328
 msgid "Charsets"
 msgstr "Märgitabelid"
 
-#: libraries/Menu.class.php:615 libraries/Util.class.php:4323
+#: libraries/Menu.class.php:615 libraries/Util.class.php:4329
 #: libraries/server_common.lib.php:33 libraries/server_plugins.lib.php:27
 msgid "Plugins"
 msgstr "Pluginad"
 
-#: libraries/Menu.class.php:626 libraries/Util.class.php:4324
+#: libraries/Menu.class.php:626 libraries/Util.class.php:4330
 msgid "Engines"
 msgstr "Mootorid"
 
@@ -4091,7 +4100,7 @@ msgid_plural "%1$d rows inserted."
 msgstr[0] "Lisati %1$d rida."
 msgstr[1] "Lisati %1$d rida."
 
-#: libraries/PDF.class.php:70 libraries/Util.class.php:2521
+#: libraries/PDF.class.php:70 libraries/Util.class.php:2527
 #: libraries/browse_foreigners.lib.php:327
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:865
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:890
@@ -4112,7 +4121,7 @@ msgid "Could not save favorite table!"
 msgstr "Lemmikute tabelit ei suudetud salvestada!"
 
 #: libraries/RecentFavoriteTable.class.php:212
-#: templates/structure/favorite_anchor.phtml:12
+#: templates/database/structure/favorite_anchor.phtml:12
 msgid "Remove from Favorites"
 msgstr "Kustuta lemmikutest"
 
@@ -4277,7 +4286,7 @@ msgid ""
 msgstr "Detailne staatuse teave antud varundusmootori kohta puudub."
 
 #: libraries/StorageEngine.class.php:373
-#: templates/structure/body_for_table_summary.phtml:50
+#: templates/database/structure/body_for_table_summary.phtml:50
 #, php-format
 msgid "%s is the default storage engine on this MySQL server."
 msgstr "%s on selle MySQL serveri vaikimisi varundusmootor."
@@ -4751,10 +4760,10 @@ msgstr "Analüüsi käigus avastati %d viga."
 
 #: libraries/Util.class.php:726 libraries/rte/rte_events.lib.php:110
 #: libraries/rte/rte_events.lib.php:119 libraries/rte/rte_events.lib.php:150
-#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:153
-#: libraries/rte/rte_routines.lib.php:162
-#: libraries/rte/rte_routines.lib.php:235
-#: libraries/rte/rte_routines.lib.php:1366
+#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:223
+#: libraries/rte/rte_routines.lib.php:250
+#: libraries/rte/rte_routines.lib.php:372
+#: libraries/rte/rte_routines.lib.php:1457
 #: libraries/rte/rte_triggers.lib.php:86 libraries/rte/rte_triggers.lib.php:95
 #: libraries/rte/rte_triggers.lib.php:127
 msgid "MySQL said: "
@@ -4798,75 +4807,78 @@ msgstr "Päike"
 msgid "%B %d, %Y at %I:%M %p"
 msgstr "%B %d, %Y kell %I:%M %p"
 
-#: libraries/Util.class.php:2019
+#: libraries/Util.class.php:2025
 #, php-format
 msgid "%s days, %s hours, %s minutes and %s seconds"
 msgstr "%s päeva, %s tundi, %s minutit ja %s sekundit"
 
-#: libraries/Util.class.php:2112
+#: libraries/Util.class.php:2118
 msgid "Missing parameter:"
 msgstr "Puudulik parameeter:"
 
-#: libraries/Util.class.php:2645
+#: libraries/Util.class.php:2651
 #, php-format
 msgid "Jump to database \"%s\"."
 msgstr "Mine \"%s\" andmebaasi."
 
-#: libraries/Util.class.php:2670
+#: libraries/Util.class.php:2676
 #, php-format
 msgid "The %s functionality is affected by a known bug, see %s"
 msgstr "Seda %s funktsionaalsust mõjutas tuntud viga, vaata %s"
 
-#: libraries/Util.class.php:2881
+#: libraries/Util.class.php:2887
 msgid "Click to toggle"
 msgstr "Muuda"
 
-#: libraries/Util.class.php:3542 prefs_manage.php:248
+#: libraries/Util.class.php:3548 prefs_manage.php:248
 msgid "Browse your computer:"
 msgstr "Sirvi oma arvutist:"
 
-#: libraries/Util.class.php:3567
+#: libraries/Util.class.php:3573
 #, php-format
 msgid "Select from the web server upload directory <b>%s</b>:"
 msgstr "Vali veebiserveri üleslaadimise kataloogist <b>%s</b>:"
 
-#: libraries/Util.class.php:3596 libraries/insert_edit.lib.php:1173
+#: libraries/Util.class.php:3602 libraries/insert_edit.lib.php:1171
 msgid "The directory you set for upload work cannot be reached."
 msgstr "Valitud üleslaadimise kataloogile ei pääse ligi."
 
-#: libraries/Util.class.php:3607
+#: libraries/Util.class.php:3613
 msgid "There are no files to upload!"
 msgstr "Puuduvad failid, mida üles laadida!"
 
-#: libraries/Util.class.php:3632 libraries/Util.class.php:3633
-#: templates/structure/check_all_tables.phtml:15
+#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: templates/database/structure/check_all_tables.phtml:15
 msgid "Empty"
 msgstr "Tühjenda"
 
-#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: libraries/Util.class.php:3644 libraries/Util.class.php:3645
 msgid "Execute"
 msgstr "Teosta"
 
-#: libraries/Util.class.php:4152
+#: libraries/Util.class.php:4158
 msgid "Print"
 msgstr "Prindi"
 
-#: libraries/Util.class.php:4257 templates/structure/row_stats_table.phtml:80
-#: templates/structure/table_header.phtml:95
+#: libraries/Util.class.php:4263
+#: templates/database/structure/table_header.phtml:95
+#: templates/table/structure/row_stats_table.phtml:80
 msgid "Creation"
 msgstr "Loodud"
 
-#: libraries/Util.class.php:4263 templates/structure/row_stats_table.phtml:87
-#: templates/structure/table_header.phtml:106
+#: libraries/Util.class.php:4269
+#: templates/database/structure/table_header.phtml:106
+#: templates/table/structure/row_stats_table.phtml:87
 msgid "Last update"
 msgstr "Viimati uuendatud"
 
-#: libraries/Util.class.php:4269 templates/structure/row_stats_table.phtml:94
-#: templates/structure/table_header.phtml:117
+#: libraries/Util.class.php:4275
+#: templates/database/structure/table_header.phtml:117
+#: templates/table/structure/row_stats_table.phtml:94
 msgid "Last check"
 msgstr "Viimane kontroll"
 
-#: libraries/Util.class.php:4315
+#: libraries/Util.class.php:4321
 msgid "Users"
 msgstr "Kasutajad"
 
@@ -4887,16 +4899,16 @@ msgid "Use this value"
 msgstr "Kasuta seda väärtust"
 
 #: libraries/build_html_for_db.lib.php:33 libraries/import.lib.php:193
-#: templates/structure/actions_in_table_structure.phtml:113
-#: templates/structure/row_stats_table.phtml:42
-#: templates/structure/table_header.phtml:36
+#: templates/database/structure/table_header.phtml:36
+#: templates/table/structure/actions_in_table_structure.phtml:113
+#: templates/table/structure/row_stats_table.phtml:42
 msgid "Rows"
 msgstr "Ridu"
 
 #: libraries/build_html_for_db.lib.php:48 libraries/engines/innodb.lib.php:171
-#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:186
-#: libraries/server_status.lib.php:298
-#: templates/structure/display_table_stats.phtml:40
+#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:195
+#: libraries/server_status.lib.php:307
+#: templates/table/structure/display_table_stats.phtml:40
 msgid "Total"
 msgstr "Kokku"
 
@@ -4905,10 +4917,12 @@ msgid "Jump to database"
 msgstr "Mine andmebaasi"
 
 #: libraries/build_html_for_db.lib.php:146
+#: templates/database/structure/structure_table_row.phtml:15
 msgid "Not replicated"
 msgstr "Pole paljundatud"
 
 #: libraries/build_html_for_db.lib.php:158
+#: templates/database/structure/structure_table_row.phtml:16
 msgid "Replicated"
 msgstr "Paljundatud"
 
@@ -4964,17 +4978,17 @@ msgstr "EI"
 #: libraries/plugins/export/ExportTexytext.class.php:425
 #: libraries/plugins/export/PMA_ExportPdf.class.php:307
 #: libraries/rte/rte_list.lib.php:73 libraries/rte/rte_list.lib.php:85
-#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:830
-#: libraries/rte/rte_routines.lib.php:1492 setup/frames/index.inc.php:162
+#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:921
+#: libraries/rte/rte_routines.lib.php:1583 setup/frames/index.inc.php:162
 #: templates/columns_definitions/table_fields_definitions.phtml:8
-#: templates/structure/table_structure_header.phtml:5
-#: templates/table/create_table.phtml:11
+#: templates/database/create_table.phtml:11
+#: templates/table/structure/table_structure_header.phtml:5
 msgid "Name"
 msgstr "Nimi"
 
 #: libraries/central_columns.lib.php:699
 #: libraries/central_columns.lib.php:1381
-#: libraries/rte/rte_routines.lib.php:832
+#: libraries/rte/rte_routines.lib.php:923
 #: templates/columns_definitions/table_fields_definitions.phtml:14
 msgid "Length/Values"
 msgstr "Pikkus/Väärtused"
@@ -4993,7 +5007,7 @@ msgid "Select a table"
 msgstr "Vali tabel"
 
 #: libraries/central_columns.lib.php:804
-#: templates/structure/add_column.phtml:4
+#: templates/table/structure/add_column.phtml:4
 msgid "Add column"
 msgstr "Lisa veerg"
 
@@ -5009,7 +5023,7 @@ msgstr "Lisa uus veerg"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1002
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1025
 #: templates/columns_definitions/table_fields_definitions.phtml:36
-#: templates/structure/table_structure_header.phtml:8
+#: templates/table/structure/table_structure_header.phtml:8
 msgid "Attributes"
 msgstr "Atribuudid"
 
@@ -5125,7 +5139,7 @@ msgid "Double click"
 msgstr "Topeltklikk"
 
 #: libraries/config.values.php:95 libraries/config.values.php:124
-#: libraries/config/FormDisplay.tpl.php:221 libraries/relation.lib.php:97
+#: libraries/config/FormDisplay.tpl.php:232 libraries/relation.lib.php:97
 #: libraries/relation.lib.php:105
 msgid "Disabled"
 msgstr "Keelatud"
@@ -5295,21 +5309,21 @@ msgstr "Pakitud eksportimine ei toimi, sest puudub funktsioon %s."
 msgid "maximum %s"
 msgstr "maksimaalselt %s"
 
-#: libraries/config/FormDisplay.tpl.php:219
+#: libraries/config/FormDisplay.tpl.php:230
 msgid "This setting is disabled, it will not be applied to your configuration."
 msgstr "See säte on keelatud; seda ei saa rakendada sinu seadistusele."
 
-#: libraries/config/FormDisplay.tpl.php:313
+#: libraries/config/FormDisplay.tpl.php:324
 #, php-format
 msgid "Set value: %s"
 msgstr "Sea väärtus: %s"
 
-#: libraries/config/FormDisplay.tpl.php:318
+#: libraries/config/FormDisplay.tpl.php:329
 #: libraries/config/messages.inc.php:610
 msgid "Restore default value"
 msgstr "Taasta vaikimisi väärtus"
 
-#: libraries/config/FormDisplay.tpl.php:332
+#: libraries/config/FormDisplay.tpl.php:343
 msgid "Allow users to customize this value"
 msgstr "Luba kasutajatel seda väärtust muuta"
 
@@ -5796,7 +5810,7 @@ msgstr "Faili märgitabel"
 
 #: libraries/config/messages.inc.php:136 libraries/config/messages.inc.php:152
 #: libraries/sql_query_form.lib.php:247
-#: templates/structure/row_stats_table.phtml:7
+#: templates/table/structure/row_stats_table.phtml:7
 msgid "Format"
 msgstr "Formaat"
 
@@ -6307,7 +6321,7 @@ msgstr ""
 
 #: libraries/config/messages.inc.php:332
 #: libraries/plugins/export/ExportPdf.class.php:279
-#: templates/structure/secondary_tabs.phtml:8
+#: templates/table/secondary_tabs.phtml:8
 msgid "Table structure"
 msgstr "Tabeli struktuur"
 
@@ -7957,101 +7971,33 @@ msgstr "Microsoft Word 2000"
 msgid "OpenDocument Text"
 msgstr "OpenDocument tekst"
 
-#: libraries/controllers/StructureController.class.php:465
+#: libraries/controllers/DatabaseStructureController.class.php:405
 #: tbl_operations.php:382
 #, php-format
 msgid "Table %s has been emptied."
 msgstr "Tabel %s on tühjendatud."
 
-#: libraries/controllers/StructureController.class.php:486
+#: libraries/controllers/DatabaseStructureController.class.php:426
 #: tbl_operations.php:400 view_operations.php:119
 #, php-format
 msgid "View %s has been dropped."
 msgstr "Vaade %s kustutati."
 
-#: libraries/controllers/StructureController.class.php:487
+#: libraries/controllers/DatabaseStructureController.class.php:427
 #: tbl_operations.php:401
 #, php-format
 msgid "Table %s has been dropped."
 msgstr "Tabel %s kustutati."
 
-#: libraries/controllers/StructureController.class.php:797
-#, php-format
-msgid "The name '%s' is a MySQL reserved keyword."
-msgid_plural "The names '%s' are MySQL reserved keywords."
-msgstr[0] "Nimi '%s' on MySQLi reserveeritud võtmesõna."
-msgstr[1] "Nimed '%s' on MySQLi reserveeritud võtmesõnad."
-
-#: libraries/controllers/StructureController.class.php:875
-msgid "No column selected."
-msgstr "Veergu ei ole valitud."
-
-#: libraries/controllers/StructureController.class.php:1049
+#: libraries/controllers/DatabaseStructureController.class.php:733
 msgid "Favorite List is full!"
 msgstr "Lemmikute nimekiri on täis!"
 
-#: libraries/controllers/StructureController.class.php:1272
-msgid "The columns have been moved successfully."
-msgstr "Veerud on edukalt liigutatud."
-
-#: libraries/controllers/StructureController.class.php:1535
-#, php-format
-msgid ""
-"Table %1$s has been altered successfully. Privileges have been adjusted."
-msgstr "Tabeli %1$s muutmine õnnestus. Õiguseid kohandati vastavalt."
-
-#: libraries/controllers/StructureController.class.php:1541
-#: libraries/controllers/TableIndexesController.class.php:161
-#: tbl_addfield.php:92
-#, php-format
-msgid "Table %1$s has been altered successfully."
-msgstr "Tabeli %1$s muutmine õnnestus."
-
-#: libraries/controllers/StructureController.class.php:1588
-#: libraries/tracking.lib.php:1094
-msgid "Query error"
-msgstr "Päringu viga"
-
-#: libraries/controllers/StructureController.class.php:1806
+#: libraries/controllers/DatabaseStructureController.class.php:947
 #: libraries/mysql_charsets.lib.php:366 libraries/mysql_charsets.lib.php:373
 msgid "unknown"
 msgstr "tundmatu"
 
-#: libraries/controllers/StructureController.class.php:1957
-#: templates/structure/check_all_table_column.phtml:11
-msgid "Change"
-msgstr "Muuda"
-
-#: libraries/controllers/StructureController.class.php:1961
-#: libraries/controllers/StructureController.class.php:1966
-#: libraries/navigation/Nodes/Node_Index.class.php:30
-#: libraries/tracking.lib.php:926
-#: templates/columns_definitions/column_indexes.phtml:16
-#: templates/columns_definitions/table_fields_definitions.phtml:57
-#: templates/structure/check_all_table_column.phtml:30
-#: templates/structure/display_structure.phtml:79
-#: templates/structure/display_table_stats.phtml:19
-msgid "Index"
-msgstr "Indeks"
-
-#: libraries/controllers/StructureController.class.php:1963
-#: libraries/controllers/StructureController.class.php:1968
-#: templates/columns_definitions/column_indexes.phtml:27
-#: templates/structure/check_all_table_column.phtml:37
-msgid "Spatial"
-msgstr "Ruumiline"
-
-#: libraries/controllers/StructureController.class.php:1964
-#: libraries/controllers/StructureController.class.php:1969
-#: templates/columns_definitions/column_indexes.phtml:22
-#: templates/structure/check_all_table_column.phtml:47
-msgid "Fulltext"
-msgstr "Täistekst"
-
-#: libraries/controllers/StructureController.class.php:1970
-msgid "Distinct values"
-msgstr "Erista väärtusi"
-
 #: libraries/controllers/TableChartController.class.php:82
 #: libraries/controllers/TableGisVisualizationController.class.php:101
 msgid "No SQL query was set to fetch data."
@@ -8065,11 +8011,18 @@ msgstr "Graafiku loomiseks puuduvad tabelis numbritüüpi veerud."
 msgid "No data to display"
 msgstr "Puuduvad kuvatavad andmed"
 
-#: libraries/controllers/TableRelationController.class.php:217
+#: libraries/controllers/TableIndexesController.class.php:161
+#: libraries/controllers/TableStructureController.class.php:736
+#: tbl_addfield.php:92
+#, php-format
+msgid "Table %1$s has been altered successfully."
+msgstr "Tabeli %1$s muutmine õnnestus."
+
+#: libraries/controllers/TableRelationController.class.php:218
 msgid "Display column was successfully updated."
 msgstr "Kuva veergu uuendati edukalt."
 
-#: libraries/controllers/TableRelationController.class.php:283
+#: libraries/controllers/TableRelationController.class.php:288
 msgid "Internal relations were successfully updated."
 msgstr "Sisemised seosete värskendamine oli edukas."
 
@@ -8082,10 +8035,71 @@ msgid "Zoom search"
 msgstr "Laienda otsingut"
 
 #: libraries/controllers/TableSearchController.class.php:852
-#: templates/table/selection_form.phtml:59
+#: templates/table/search/selection_form.phtml:59
 msgid "Find and replace"
 msgstr "Otsi ja asenda"
 
+#: libraries/controllers/TableStructureController.class.php:163
+#, php-format
+msgid "The name '%s' is a MySQL reserved keyword."
+msgid_plural "The names '%s' are MySQL reserved keywords."
+msgstr[0] "Nimi '%s' on MySQLi reserveeritud võtmesõna."
+msgstr[1] "Nimed '%s' on MySQLi reserveeritud võtmesõnad."
+
+#: libraries/controllers/TableStructureController.class.php:241
+msgid "No column selected."
+msgstr "Veergu ei ole valitud."
+
+#: libraries/controllers/TableStructureController.class.php:467
+msgid "The columns have been moved successfully."
+msgstr "Veerud on edukalt liigutatud."
+
+#: libraries/controllers/TableStructureController.class.php:730
+#, php-format
+msgid ""
+"Table %1$s has been altered successfully. Privileges have been adjusted."
+msgstr "Tabeli %1$s muutmine õnnestus. Õiguseid kohandati vastavalt."
+
+#: libraries/controllers/TableStructureController.class.php:783
+#: libraries/tracking.lib.php:1094
+msgid "Query error"
+msgstr "Päringu viga"
+
+#: libraries/controllers/TableStructureController.class.php:948
+#: templates/table/structure/check_all_table_column.phtml:11
+msgid "Change"
+msgstr "Muuda"
+
+#: libraries/controllers/TableStructureController.class.php:952
+#: libraries/controllers/TableStructureController.class.php:957
+#: libraries/navigation/Nodes/Node_Index.class.php:30
+#: libraries/tracking.lib.php:926
+#: templates/columns_definitions/column_indexes.phtml:16
+#: templates/columns_definitions/table_fields_definitions.phtml:57
+#: templates/table/structure/check_all_table_column.phtml:30
+#: templates/table/structure/display_structure.phtml:79
+#: templates/table/structure/display_table_stats.phtml:19
+msgid "Index"
+msgstr "Indeks"
+
+#: libraries/controllers/TableStructureController.class.php:954
+#: libraries/controllers/TableStructureController.class.php:959
+#: templates/columns_definitions/column_indexes.phtml:27
+#: templates/table/structure/check_all_table_column.phtml:37
+msgid "Spatial"
+msgstr "Ruumiline"
+
+#: libraries/controllers/TableStructureController.class.php:955
+#: libraries/controllers/TableStructureController.class.php:960
+#: templates/columns_definitions/column_indexes.phtml:22
+#: templates/table/structure/check_all_table_column.phtml:47
+msgid "Fulltext"
+msgstr "Täistekst"
+
+#: libraries/controllers/TableStructureController.class.php:963
+msgid "Distinct values"
+msgstr "Erista väärtusi"
+
 #: libraries/core.lib.php:306
 #, php-format
 msgid "The %s extension is missing. Please check your PHP configuration."
@@ -8132,7 +8146,7 @@ msgid "No Password"
 msgstr "Ilma paroolita"
 
 #: libraries/display_change_password.lib.php:68
-#: libraries/plugins/auth/AuthenticationCookie.class.php:199
+#: libraries/plugins/auth/AuthenticationCookie.class.php:187
 #: libraries/replication_gui.lib.php:422 libraries/replication_gui.lib.php:862
 #: libraries/server_privileges.lib.php:1640
 msgid "Password:"
@@ -8157,7 +8171,6 @@ msgstr "MySQL salasõna"
 
 #: libraries/display_change_password.lib.php:110
 #: libraries/server_privileges.lib.php:1706
-#| msgid "sha256_password"
 msgid "SHA256 password"
 msgstr "SHA256 salasõna"
 
@@ -8913,12 +8926,12 @@ msgid "Dump has been saved to file %s."
 msgstr "Tõmmis salvestati %s faili."
 
 #: libraries/import.lib.php:202 libraries/insert_edit.lib.php:124
-#: libraries/rte/rte_routines.lib.php:1353 libraries/sql.lib.php:1312
+#: libraries/rte/rte_routines.lib.php:1444 libraries/sql.lib.php:1306
 #: tbl_get_field.php:44
 msgid "MySQL returned an empty result set (i.e. zero rows)."
 msgstr "MySQL tagastas tühja tulemuse (s.t nulliread)."
 
-#: libraries/import.lib.php:265 libraries/sql.lib.php:1326
+#: libraries/import.lib.php:265 libraries/sql.lib.php:1320
 msgid "[ROLLBACK occurred.]"
 msgstr "[Toimus tagasipööramine.]"
 
@@ -8986,14 +8999,14 @@ msgstr "Loo indeks &nbsp;%s&nbsp;veergudesse"
 
 #: libraries/insert_edit.lib.php:233
 #: libraries/navigation/Nodes/Node_DatabaseChild.class.php:48
-#: templates/designer/table_list.phtml:40
+#: templates/database/designer/table_list.phtml:40
 msgid "Hide"
 msgstr "Peida"
 
 #: libraries/insert_edit.lib.php:249
 #: libraries/navigation/Nodes/Node_Function.class.php:32
-#: libraries/rte/rte_routines.lib.php:1495
-#: templates/table/table_header.phtml:4
+#: libraries/rte/rte_routines.lib.php:1586
+#: templates/table/search/table_header.phtml:4
 msgid "Function"
 msgstr "Funktsioon"
 
@@ -9006,84 +9019,85 @@ msgstr "Binaarne"
 msgid "Because of its length,<br /> this column might not be editable."
 msgstr "Oma pikkuse tõttu ei pruugi<br />see veerg olla muudetav."
 
-#: libraries/insert_edit.lib.php:1050
+#: libraries/insert_edit.lib.php:1048
 msgid "Binary - do not edit"
 msgstr "Binaarne - ära muuda"
 
-#: libraries/insert_edit.lib.php:1176 libraries/server_privileges.lib.php:470
-#: templates/table/options.phtml:36
+#: libraries/insert_edit.lib.php:1174 libraries/server_privileges.lib.php:470
+#: templates/table/search/options.phtml:36
 msgid "Or"
 msgstr "Või"
 
-#: libraries/insert_edit.lib.php:1177
+#: libraries/insert_edit.lib.php:1175
 msgid "web server upload directory:"
 msgstr "veebiserveri üleslaadimiskataloog:"
 
-#: libraries/insert_edit.lib.php:1348 templates/table/input_box.phtml:49
+#: libraries/insert_edit.lib.php:1346
+#: templates/table/search/input_box.phtml:49
 msgid "Edit/Insert"
 msgstr "Muuda/Lisa"
 
-#: libraries/insert_edit.lib.php:1398
+#: libraries/insert_edit.lib.php:1396
 #, php-format
 msgid "Continue insertion with %s rows"
 msgstr "Jätka %s rea lisamist"
 
-#: libraries/insert_edit.lib.php:1428
+#: libraries/insert_edit.lib.php:1426
 msgid "and then"
 msgstr "ja siis"
 
-#: libraries/insert_edit.lib.php:1461
+#: libraries/insert_edit.lib.php:1459
 msgid "Insert as new row"
 msgstr "Lisa uue reana"
 
-#: libraries/insert_edit.lib.php:1464
+#: libraries/insert_edit.lib.php:1462
 msgid "Insert as new row and ignore errors"
 msgstr "Lisa uue reana ja ignoreeri vigu"
 
-#: libraries/insert_edit.lib.php:1467
+#: libraries/insert_edit.lib.php:1465
 msgid "Show insert query"
 msgstr "Näita lisamise päringut"
 
-#: libraries/insert_edit.lib.php:1487
+#: libraries/insert_edit.lib.php:1485
 msgid "Go back to previous page"
 msgstr "Mine eelmisele lehele tagasi"
 
-#: libraries/insert_edit.lib.php:1490
+#: libraries/insert_edit.lib.php:1488
 msgid "Insert another new row"
 msgstr "Lisa järgmine uus rida"
 
-#: libraries/insert_edit.lib.php:1495
+#: libraries/insert_edit.lib.php:1493
 msgid "Go back to this page"
 msgstr "Mine tagasi sellele lehele"
 
-#: libraries/insert_edit.lib.php:1518
+#: libraries/insert_edit.lib.php:1516
 msgid "Edit next row"
 msgstr "Muuda järgmist rida"
 
-#: libraries/insert_edit.lib.php:1540
+#: libraries/insert_edit.lib.php:1538
 msgid ""
 "Use TAB key to move from value to value, or CTRL+arrows to move anywhere"
 msgstr ""
 "Ühelt väärtuselt teisele liikumiseks kasuta TAB-klahvi või mujale "
 "liikumiseks kasuta CTRL + nooled"
 
-#: libraries/insert_edit.lib.php:1577 libraries/replication_gui.lib.php:542
-#: libraries/rte/rte_routines.lib.php:1497
+#: libraries/insert_edit.lib.php:1575 libraries/replication_gui.lib.php:542
+#: libraries/rte/rte_routines.lib.php:1588
 #: libraries/server_status_variables.lib.php:220
-#: templates/designer/having_query_panel.phtml:100
-#: templates/designer/options_panel.phtml:73
-#: templates/designer/options_panel.phtml:239
-#: templates/designer/where_query_panel.phtml:69
-#: templates/table/table_header.phtml:10
-#: templates/table/zoom_result_form.phtml:35
+#: templates/database/designer/having_query_panel.phtml:100
+#: templates/database/designer/options_panel.phtml:73
+#: templates/database/designer/options_panel.phtml:239
+#: templates/database/designer/where_query_panel.phtml:69
+#: templates/table/search/table_header.phtml:10
+#: templates/table/search/zoom_result_form.phtml:35
 msgid "Value"
 msgstr "Väärtus"
 
-#: libraries/insert_edit.lib.php:1937 libraries/sql.lib.php:1309
+#: libraries/insert_edit.lib.php:1935 libraries/sql.lib.php:1303
 msgid "Showing SQL query"
 msgstr "Näitan SQL päringut"
 
-#: libraries/insert_edit.lib.php:1962 libraries/sql.lib.php:1287
+#: libraries/insert_edit.lib.php:1960 libraries/sql.lib.php:1281
 #, php-format
 msgid "Inserted row id: %1$d"
 msgstr "Lisatud rea id: %1$d"
@@ -9492,7 +9506,7 @@ msgstr "Uus"
 #: libraries/navigation/Nodes/Node_View_Container.class.php:26
 #: libraries/navigation/Nodes/Node_View_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:129
-#: templates/structure/show_create.phtml:30
+#: templates/database/structure/show_create.phtml:30
 msgid "Views"
 msgstr "Vaated"
 
@@ -9826,7 +9840,7 @@ msgstr ""
 
 #: libraries/operations.lib.php:101 libraries/operations.lib.php:249
 #: libraries/operations.lib.php:869 libraries/operations.lib.php:963
-#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:907
+#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:998
 #: templates/columns_definitions/table_fields_definitions.phtml:47
 msgid "Adjust Privileges"
 msgstr "Kohanda õiguseid"
@@ -9916,22 +9930,22 @@ msgid "Switch to copied table"
 msgstr "Mine kopeeritud tabelisse"
 
 #: libraries/operations.lib.php:1360
-#: templates/structure/check_all_tables.phtml:18
+#: templates/database/structure/check_all_tables.phtml:18
 msgid "Table maintenance"
 msgstr "Tabeli hooldus"
 
 #: libraries/operations.lib.php:1398
-#: templates/structure/check_all_tables.phtml:19
+#: templates/database/structure/check_all_tables.phtml:19
 msgid "Analyze table"
 msgstr "Analüüsi tabelit"
 
 #: libraries/operations.lib.php:1413
-#: templates/structure/check_all_tables.phtml:20
+#: templates/database/structure/check_all_tables.phtml:20
 msgid "Check table"
 msgstr "Kontrolli tabelit"
 
 #: libraries/operations.lib.php:1428
-#: templates/structure/check_all_tables.phtml:22
+#: templates/database/structure/check_all_tables.phtml:22
 msgid "Checksum table"
 msgstr "Kontrollsumma tabel"
 
@@ -9949,18 +9963,19 @@ msgid "Flush the table (FLUSH)"
 msgstr "Puhasta tabel (FLUSH)"
 
 #: libraries/operations.lib.php:1477
-#: templates/structure/check_all_tables.phtml:23
-#: templates/structure/display_table_stats.phtml:56
+#: templates/database/structure/check_all_tables.phtml:23
+#: templates/table/structure/display_table_stats.phtml:56
 msgid "Optimize table"
 msgstr "Optimeeri tabelit"
 
 #: libraries/operations.lib.php:1492
-#: templates/structure/check_all_tables.phtml:24
+#: templates/database/structure/check_all_tables.phtml:24
 msgid "Repair table"
 msgstr "Paranda tabelit"
 
 #: libraries/operations.lib.php:1538
-#: templates/structure/check_all_tables.phtml:14 view_operations.php:127
+#: templates/database/structure/check_all_tables.phtml:14
+#: view_operations.php:127
 msgid "Delete data or table"
 msgstr "Kustuta andmed või tabel"
 
@@ -10082,7 +10097,7 @@ msgid "Cannot connect: invalid settings."
 msgstr "Ei saa ühendust: vigased sätted."
 
 #: libraries/plugins/auth/AuthenticationConfig.class.php:108
-#: libraries/plugins/auth/AuthenticationCookie.class.php:134
+#: libraries/plugins/auth/AuthenticationCookie.class.php:122
 #: libraries/plugins/auth/AuthenticationHttp.class.php:96
 #, php-format
 msgid "Welcome to %s"
@@ -10113,36 +10128,36 @@ msgstr ""
 msgid "Retry to connect"
 msgstr "Proovi uuesti ühenduda"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:146
+#: libraries/plugins/auth/AuthenticationCookie.class.php:134
 msgid "Your session has expired. Please log in again."
 msgstr "Su sessioon on aegunud. Palun logi uuesti sisse."
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:170
+#: libraries/plugins/auth/AuthenticationCookie.class.php:158
 msgid "Log in"
 msgstr "Logi sisse"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:178
-#: libraries/plugins/auth/AuthenticationCookie.class.php:188
+#: libraries/plugins/auth/AuthenticationCookie.class.php:166
+#: libraries/plugins/auth/AuthenticationCookie.class.php:176
 msgid "You can enter hostname/IP address and port separated by space."
 msgstr "Saad tühikuga eraldades sisestada hostinime/IP-aadressi ja porti."
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:193
+#: libraries/plugins/auth/AuthenticationCookie.class.php:181
 msgid "Username:"
 msgstr "Kasutajanimi:"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:205
+#: libraries/plugins/auth/AuthenticationCookie.class.php:193
 msgid "Server Choice:"
 msgstr "Serveri valik:"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:386
+#: libraries/plugins/auth/AuthenticationCookie.class.php:374
 msgid "Entered captcha is wrong, try again!"
 msgstr "Sisestatud tekst on vale. Proovi uuesti!"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:396
+#: libraries/plugins/auth/AuthenticationCookie.class.php:384
 msgid "Please enter correct captcha!"
 msgstr "Palun sisesta korrektne tekst!"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:423
+#: libraries/plugins/auth/AuthenticationCookie.class.php:411
 msgid "You are not allowed to log in to this MySQL server!"
 msgstr "Sul ei ole lubatud sellesse MySQL serverisse meldida!"
 
@@ -10238,7 +10253,7 @@ msgstr "Sündmus"
 #: libraries/plugins/export/ExportOdt.class.php:593
 #: libraries/plugins/export/ExportTexytext.class.php:428
 #: libraries/plugins/export/PMA_ExportPdf.class.php:313
-#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:984
 #: libraries/rte/rte_triggers.lib.php:377
 msgid "Definition"
 msgstr "Definitsioon"
@@ -10559,7 +10574,7 @@ msgid "Last check:"
 msgstr "Viimane kontroll:"
 
 #: libraries/plugins/export/ExportSql.class.php:1399
-#: templates/structure/structure_table_row.phtml:183
+#: templates/database/structure/structure_table_row.phtml:183
 msgid "in use"
 msgstr "kasutusel"
 
@@ -10752,18 +10767,14 @@ msgstr "MySQL Spatial Extension ei toeta ESRI tüüpi \"%s\"."
 msgid "The imported file does not contain any data!"
 msgstr "Imporditud failis ei ole mitte mingeid andmeid!"
 
-#: libraries/plugins/import/ImportSql.class.php:169
+#: libraries/plugins/import/ImportSql.class.php:72
 msgid "SQL compatibility mode:"
 msgstr "SQL ühilduvuse meetod:"
 
-#: libraries/plugins/import/ImportSql.class.php:181
+#: libraries/plugins/import/ImportSql.class.php:84
 msgid "Do not use <code>AUTO_INCREMENT</code> for zero values"
 msgstr "Ära kasuta nulliliste väärtuste puhul <code>AUTO_INCREMENT</code>"
 
-#: libraries/plugins/import/ImportSql.class.php:195
-msgid "Read as multibytes"
-msgstr "Loe mitmebaidistena"
-
 #: libraries/plugins/import/ImportXml.class.php:54
 msgid "XML"
 msgstr "XML"
@@ -10806,7 +10817,7 @@ msgid "Show grid"
 msgstr "Näita ruudustikku"
 
 #: libraries/plugins/schema/SchemaPdf.class.php:94
-#: templates/structure/print_view_data_dictionary_link.phtml:6
+#: templates/database/structure/print_view_data_dictionary_link.phtml:6
 msgid "Data Dictionary"
 msgstr "Andmesõnastik"
 
@@ -10831,7 +10842,7 @@ msgid "The %s table doesn't exist!"
 msgstr "%s tabelit pole olemas!"
 
 #: libraries/plugins/schema/eps/Eps_Relation_Schema.class.php:321
-#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:309
+#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:323
 #, php-format
 msgid "Schema of the %s database - Page %s"
 msgstr "%s andmebaasi skeem - Leht %s"
@@ -10857,7 +10868,7 @@ msgstr "Sisu tabel"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1005
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1028
 #: libraries/tracking.lib.php:884
-#: templates/structure/table_structure_header.phtml:11
+#: templates/table/structure/table_structure_header.phtml:11
 msgid "Extra"
 msgstr "Lisaks"
 
@@ -11217,11 +11228,11 @@ msgstr "Täpsema funktsionaalsuse seadistamise kiirsammud:"
 msgid "Create the needed tables with the <code>%screate_tables.sql</code>."
 msgstr "Loo vajalikud tabelid <code>%screate_tables.sql</code> failiga."
 
-#: libraries/relation.lib.php:360
+#: libraries/relation.lib.php:357
 msgid "Create a pma user and give access to these tables."
 msgstr "Loo pma kasutaja ja anna juurdepääs nendele tabelitele."
 
-#: libraries/relation.lib.php:365
+#: libraries/relation.lib.php:360
 msgid ""
 "Enable advanced features in configuration file (<code>config.inc.php</"
 "code>), for example by starting from <code>config.sample.inc.php</code>."
@@ -11229,15 +11240,15 @@ msgstr ""
 "Luba täpsem funktsionaalsus häälestusfailis (<code>config.inc.php</code>). "
 "Näiteks alustades <code>config.sample.inc.php</code> failist."
 
-#: libraries/relation.lib.php:373
+#: libraries/relation.lib.php:365
 msgid "Re-login to phpMyAdmin to load the updated configuration file."
 msgstr "Uuendatud seadistuse faili laadimiseks logi phpMyAdmini uuesti sisse."
 
-#: libraries/relation.lib.php:1612
+#: libraries/relation.lib.php:1607
 msgid "no description"
 msgstr "kirjeldus puudub"
 
-#: libraries/relation.lib.php:1811
+#: libraries/relation.lib.php:1806
 msgid ""
 "You do not have necessary privileges to create a database named "
 "'phpmyadmin'. You may go to 'Operations' tab of any database to set up the "
@@ -11247,7 +11258,7 @@ msgstr ""
 "suvalise andmebaasi kaardile 'Operatsioonid' ja määrata phpMyAdmini "
 "häälestuse salvestamine sinna."
 
-#: libraries/relation.lib.php:1928
+#: libraries/relation.lib.php:1923
 #, php-format
 msgid ""
 "%sCreate%s a database named 'phpmyadmin' and setup the phpMyAdmin "
@@ -11256,20 +11267,20 @@ msgstr ""
 "%sLoo%s andmebaas 'phpmyadmin' ja häälesta phpMyAdmini seadistuse "
 "salvestamine sinna."
 
-#: libraries/relation.lib.php:1936
+#: libraries/relation.lib.php:1931
 #, php-format
 msgid ""
 "%sCreate%s the phpMyAdmin configuration storage in the current database."
 msgstr ""
 "%sLoo%s phpMyAdmini seadistuse salvestuse tabelid aktiivses andmebaasis."
 
-#: libraries/relation.lib.php:1944
+#: libraries/relation.lib.php:1939
 #, php-format
 msgid "%sCreate%s missing phpMyAdmin configuration storage tables."
 msgstr "%sLoo%s puuduvad phpMyAdmini seadistuse salvestuse tabelid."
 
 #: libraries/replication_gui.lib.php:46 libraries/replication_gui.lib.php:343
-#: libraries/server_databases.lib.php:387
+#: libraries/server_databases.lib.php:398
 msgid "Master replication"
 msgstr "Ülema paljundamine"
 
@@ -11333,7 +11344,7 @@ msgstr ""
 "b> seadistatud ülemaks."
 
 #: libraries/replication_gui.lib.php:141
-#: libraries/server_databases.lib.php:389
+#: libraries/server_databases.lib.php:400
 msgid "Slave replication"
 msgstr "Alluva paljundamine"
 
@@ -11605,10 +11616,10 @@ msgid "Master server changed successfully to %s."
 msgstr "Ülemserveriks vahetati edukalt %s."
 
 #: libraries/rte/rte_events.lib.php:106 libraries/rte/rte_events.lib.php:115
-#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:149
-#: libraries/rte/rte_routines.lib.php:158
-#: libraries/rte/rte_routines.lib.php:231
-#: libraries/rte/rte_routines.lib.php:1362
+#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:219
+#: libraries/rte/rte_routines.lib.php:246
+#: libraries/rte/rte_routines.lib.php:368
+#: libraries/rte/rte_routines.lib.php:1453
 #: libraries/rte/rte_triggers.lib.php:82 libraries/rte/rte_triggers.lib.php:91
 #: libraries/rte/rte_triggers.lib.php:123
 #, php-format
@@ -11629,7 +11640,7 @@ msgstr "%1$s sündmust on muudetud."
 msgid "Event %1$s has been created."
 msgstr "%1$s sündmus on loodud."
 
-#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:251
+#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:266
 #: libraries/rte/rte_triggers.lib.php:144
 msgid "One or more errors have occurred while processing your request:"
 msgstr "Sinu päringu töötlemisel esines vähemalt üks viga:"
@@ -11638,7 +11649,7 @@ msgstr "Sinu päringu töötlemisel esines vähemalt üks viga:"
 msgid "Edit event"
 msgstr "Muuda sündmust"
 
-#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:794
+#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:885
 #: libraries/rte/rte_triggers.lib.php:323 view_create.php:180
 msgid "Details"
 msgstr "Detailid"
@@ -11651,7 +11662,7 @@ msgstr "Sündmuse nimi"
 msgid "Event type"
 msgstr "Sündmuse tüüp"
 
-#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:817
+#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:908
 #, php-format
 msgid "Change to %s"
 msgstr "Muuda väärtuseks %s"
@@ -11678,12 +11689,14 @@ msgstr "Lõpp"
 msgid "On completion preserve"
 msgstr "Lõpetamisel säilita"
 
-#: libraries/rte/rte_events.lib.php:491 libraries/rte/rte_routines.lib.php:930
+#: libraries/rte/rte_events.lib.php:491
+#: libraries/rte/rte_routines.lib.php:1021
 #: libraries/rte/rte_triggers.lib.php:383 view_create.php:209
 msgid "Definer"
 msgstr "Määraja"
 
-#: libraries/rte/rte_events.lib.php:535 libraries/rte/rte_routines.lib.php:997
+#: libraries/rte/rte_events.lib.php:535
+#: libraries/rte/rte_routines.lib.php:1088
 #: libraries/rte/rte_triggers.lib.php:422
 msgid "The definer must be in the \"username@hostname\" format!"
 msgstr "Määraja peab olema formaadis \"kasutajanimi@hostinimi\"!"
@@ -11709,9 +11722,9 @@ msgid "You must provide an event definition."
 msgstr "Sa pead andma sündmuse definitsiooni."
 
 #: libraries/rte/rte_export.lib.php:43 libraries/rte/rte_general.lib.php:72
-#: libraries/rte/rte_routines.lib.php:345
-#: libraries/rte/rte_routines.lib.php:1198
-#: libraries/rte/rte_routines.lib.php:1411
+#: libraries/rte/rte_routines.lib.php:153
+#: libraries/rte/rte_routines.lib.php:1289
+#: libraries/rte/rte_routines.lib.php:1502
 msgid "Error in processing request:"
 msgstr "Taotluse töötlemisel esines viga:"
 
@@ -11747,72 +11760,72 @@ msgstr ""
 "käivitamine võib ebaõnnestuda![/strong] Probleemide vältimiseks kasuta palun "
 "täiustatud 'mysqli' laiendit."
 
-#: libraries/rte/rte_routines.lib.php:110
-#: libraries/rte/rte_routines.lib.php:1006
+#: libraries/rte/rte_routines.lib.php:123
+msgid "Edit routine"
+msgstr "Muuda funktsiooni"
+
+#: libraries/rte/rte_routines.lib.php:200
+#: libraries/rte/rte_routines.lib.php:1097
 #, php-format
 msgid "Invalid routine type: \"%s\""
 msgstr "Vale funktsiooni tüüp: \"%s\""
 
-#: libraries/rte/rte_routines.lib.php:170
-msgid "Sorry, we failed to restore the dropped routine."
-msgstr "Vabanda, me ei suutnud kustutatud funktsiooni taastada."
-
-#: libraries/rte/rte_routines.lib.php:211
-#, php-format
-msgid "Routine %1$s has been modified. Privileges have been adjusted."
-msgstr "Funktsiooni %1$s on muudetud. Õiguseid on vastavalt kohandatud."
-
-#: libraries/rte/rte_routines.lib.php:216
-#, php-format
-msgid "Routine %1$s has been modified."
-msgstr "%1$s funktsiooni on muudetud."
-
-#: libraries/rte/rte_routines.lib.php:238
+#: libraries/rte/rte_routines.lib.php:253
 #, php-format
 msgid "Routine %1$s has been created."
 msgstr "%1$s funktsioon on loodud."
 
-#: libraries/rte/rte_routines.lib.php:315
-msgid "Edit routine"
-msgstr "Muuda funktsiooni"
+#: libraries/rte/rte_routines.lib.php:380
+msgid "Sorry, we failed to restore the dropped routine."
+msgstr "Vabanda, me ei suutnud kustutatud funktsiooni taastada."
 
-#: libraries/rte/rte_routines.lib.php:797
+#: libraries/rte/rte_routines.lib.php:439
+#, php-format
+msgid "Routine %1$s has been modified. Privileges have been adjusted."
+msgstr "Funktsiooni %1$s on muudetud. Õiguseid on vastavalt kohandatud."
+
+#: libraries/rte/rte_routines.lib.php:444
+#, php-format
+msgid "Routine %1$s has been modified."
+msgstr "%1$s funktsiooni on muudetud."
+
+#: libraries/rte/rte_routines.lib.php:888
 msgid "Routine name"
 msgstr "Funktsiooni nimi"
 
-#: libraries/rte/rte_routines.lib.php:823
+#: libraries/rte/rte_routines.lib.php:914
 msgid "Parameters"
 msgstr "Parameetrid"
 
-#: libraries/rte/rte_routines.lib.php:829
+#: libraries/rte/rte_routines.lib.php:920
 msgid "Direction"
 msgstr "Suund"
 
-#: libraries/rte/rte_routines.lib.php:847
+#: libraries/rte/rte_routines.lib.php:938
 msgid "Add parameter"
 msgstr "Lisa parameeter"
 
-#: libraries/rte/rte_routines.lib.php:851
+#: libraries/rte/rte_routines.lib.php:942
 msgid "Remove last parameter"
 msgstr "Kustuta viimane parameeter"
 
-#: libraries/rte/rte_routines.lib.php:856
+#: libraries/rte/rte_routines.lib.php:947
 msgid "Return type"
 msgstr "Pöördumise tüüp"
 
-#: libraries/rte/rte_routines.lib.php:862
+#: libraries/rte/rte_routines.lib.php:953
 msgid "Return length/values"
 msgstr "Pöördumise pikkus/väärtused"
 
-#: libraries/rte/rte_routines.lib.php:868
+#: libraries/rte/rte_routines.lib.php:959
 msgid "Return options"
 msgstr "Pöördumise valikud"
 
-#: libraries/rte/rte_routines.lib.php:899
+#: libraries/rte/rte_routines.lib.php:990
 msgid "Is deterministic"
 msgstr "Ette määratud"
 
-#: libraries/rte/rte_routines.lib.php:920
+#: libraries/rte/rte_routines.lib.php:1011
 msgid ""
 "You do not have sufficient privileges to perform this operation; Please "
 "refer to the documentation for more details"
@@ -11820,25 +11833,25 @@ msgstr ""
 "Sul puuduvad selle operatsiooni teostamiseks õigused. Täpsemalt vaata palun "
 "dokumentatsioonist"
 
-#: libraries/rte/rte_routines.lib.php:935
+#: libraries/rte/rte_routines.lib.php:1026
 msgid "Security type"
 msgstr "Turvalisuse tüüp"
 
-#: libraries/rte/rte_routines.lib.php:944
+#: libraries/rte/rte_routines.lib.php:1035
 msgid "SQL data access"
 msgstr "SQL andmete juurdepääs"
 
-#: libraries/rte/rte_routines.lib.php:1013
+#: libraries/rte/rte_routines.lib.php:1104
 msgid "You must provide a routine name!"
 msgstr "Sa pead andma funktsiooni nime!"
 
-#: libraries/rte/rte_routines.lib.php:1047
+#: libraries/rte/rte_routines.lib.php:1138
 #, php-format
 msgid "Invalid direction \"%s\" given for parameter."
 msgstr "Parameetrile anti vale suund \"%s\"."
 
-#: libraries/rte/rte_routines.lib.php:1069
-#: libraries/rte/rte_routines.lib.php:1131
+#: libraries/rte/rte_routines.lib.php:1160
+#: libraries/rte/rte_routines.lib.php:1222
 msgid ""
 "You must provide length/values for routine parameters of type ENUM, SET, "
 "VARCHAR and VARBINARY."
@@ -11846,37 +11859,37 @@ msgstr ""
 "Sa pead andma ENUM, SET, VARCHAR ja VARBINARY tüüpi funktsiooni "
 "parameetritele pikkuse/väärtused."
 
-#: libraries/rte/rte_routines.lib.php:1095
+#: libraries/rte/rte_routines.lib.php:1186
 msgid "You must provide a name and a type for each routine parameter."
 msgstr "Sa pead andma igale funktsiooni parameetrile nime ja tüübi."
 
-#: libraries/rte/rte_routines.lib.php:1114
+#: libraries/rte/rte_routines.lib.php:1205
 msgid "You must provide a valid return type for the routine."
 msgstr "Sa pead andma funktsioonile õige pöördumise tüübi."
 
-#: libraries/rte/rte_routines.lib.php:1174
+#: libraries/rte/rte_routines.lib.php:1265
 msgid "You must provide a routine definition."
 msgstr "Sa pead andma funktsiooni definitsiooni."
 
-#: libraries/rte/rte_routines.lib.php:1285
+#: libraries/rte/rte_routines.lib.php:1376
 #, php-format
 msgid "Execution results of routine %s"
 msgstr "%s funktsiooni käivitamise tulemused"
 
-#: libraries/rte/rte_routines.lib.php:1340
+#: libraries/rte/rte_routines.lib.php:1431
 #, php-format
 msgid "%d row affected by the last statement inside the procedure."
 msgid_plural "%d rows affected by the last statement inside the procedure."
 msgstr[0] "Toimingu viimane käsk mõjutas %d rida."
 msgstr[1] "Toimingu viimane käsk mõjutas %d rida."
 
-#: libraries/rte/rte_routines.lib.php:1398
-#: libraries/rte/rte_routines.lib.php:1406
+#: libraries/rte/rte_routines.lib.php:1489
+#: libraries/rte/rte_routines.lib.php:1497
 msgid "Execute routine"
 msgstr "Käivita funktsioon"
 
-#: libraries/rte/rte_routines.lib.php:1485
-#: libraries/rte/rte_routines.lib.php:1488
+#: libraries/rte/rte_routines.lib.php:1576
+#: libraries/rte/rte_routines.lib.php:1579
 msgid "Routine parameters"
 msgstr "Funktsiooni parameetrid"
 
@@ -12030,7 +12043,7 @@ msgid "Original position"
 msgstr "Algne asukoht"
 
 #: libraries/server_bin_log.lib.php:133
-#: templates/structure/display_table_stats.phtml:4
+#: templates/table/structure/display_table_stats.phtml:4
 msgid "Information"
 msgstr "Informatsioon"
 
@@ -12068,12 +12081,12 @@ msgstr ""
 "Märkus: Statistika lubamine võib põhjustada koormava liikluse veebiserveri "
 "ja MySQL serveri vahel."
 
-#: libraries/server_databases.lib.php:364
-#: libraries/server_databases.lib.php:365
+#: libraries/server_databases.lib.php:366
+#: libraries/server_databases.lib.php:371
 msgid "Enable Statistics"
 msgstr "Luba statistika"
 
-#: libraries/server_databases.lib.php:481
+#: libraries/server_databases.lib.php:492
 #, php-format
 msgid "%1$d database has been dropped successfully."
 msgid_plural "%1$d databases have been dropped successfully."
@@ -12442,7 +12455,7 @@ msgid "You have revoked the privileges for %s."
 msgstr "Tühistasid %s õigused."
 
 #: libraries/server_privileges.lib.php:2059
-#: libraries/server_privileges.lib.php:4290
+#: libraries/server_privileges.lib.php:4316
 msgid "Add user account"
 msgstr "Lisa kasutajate konto"
 
@@ -12609,47 +12622,47 @@ msgstr "%s kustutamine"
 msgid "The privileges were reloaded successfully."
 msgstr "Õigused on edukalt uuesti laetud."
 
-#: libraries/server_privileges.lib.php:3994
+#: libraries/server_privileges.lib.php:4003
 #, php-format
 msgid "The user %s already exists!"
 msgstr "Kasutaja %s on juba olemas!"
 
-#: libraries/server_privileges.lib.php:4232
+#: libraries/server_privileges.lib.php:4258
 #, php-format
 msgid "Privileges for %s"
 msgstr "%s õigused"
 
-#: libraries/server_privileges.lib.php:4241
+#: libraries/server_privileges.lib.php:4267
 #: libraries/server_status_processes.lib.php:72
 #: libraries/server_user_groups.lib.php:39
 msgid "User"
 msgstr "Kasutaja"
 
-#: libraries/server_privileges.lib.php:4282
+#: libraries/server_privileges.lib.php:4308
 msgctxt "Create new user"
 msgid "New"
 msgstr "Uus"
 
-#: libraries/server_privileges.lib.php:4311
+#: libraries/server_privileges.lib.php:4337
 msgid "Edit privileges:"
 msgstr "Muuda õiguseid:"
 
-#: libraries/server_privileges.lib.php:4312
+#: libraries/server_privileges.lib.php:4338
 msgid "User account"
 msgstr "Kasutaja konto"
 
-#: libraries/server_privileges.lib.php:4371
+#: libraries/server_privileges.lib.php:4397
 msgid ""
 "Note: You are attempting to edit privileges of the user with which you are "
 "currently logged in."
 msgstr ""
 "Märkus: sa proovid muuta õiguseid kontol, mida kasutasid sisse logimiseks."
 
-#: libraries/server_privileges.lib.php:4391 libraries/server_users.lib.php:25
+#: libraries/server_privileges.lib.php:4417 libraries/server_users.lib.php:25
 msgid "User accounts overview"
 msgstr "Kasutaja kontode ülevaade"
 
-#: libraries/server_privileges.lib.php:4459
+#: libraries/server_privileges.lib.php:4485
 msgid ""
 "A user account allowing any user from localhost to connect is present. This "
 "will prevent other users from connecting if the host part of their account "
@@ -12659,7 +12672,7 @@ msgstr ""
 "olemas. See takistab teistel kasutajatel ühendumast, kui nende konto hosti "
 "pool lubab ühenduda suvalisest (%) masinast."
 
-#: libraries/server_privileges.lib.php:4500
+#: libraries/server_privileges.lib.php:4526
 #, php-format
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
@@ -12671,7 +12684,7 @@ msgstr ""
 "Tabelite sisu võib erineda sellest, mida server kasutab, kui neid on käsitsi "
 "muudetud. Sellisel juhul peaksid enne jätkamist %sõigused uuesti laadima%s."
 
-#: libraries/server_privileges.lib.php:4519
+#: libraries/server_privileges.lib.php:4545
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
 "tables. The content of these tables may differ from the privileges the "
@@ -12684,25 +12697,25 @@ msgstr ""
 "muudetud. Sellisel juhul peab õigused uuesti laadima, kuid hetkel puudub sul "
 "uuesti laadimise õigus."
 
-#: libraries/server_privileges.lib.php:4569
+#: libraries/server_privileges.lib.php:4595
 msgid "The selected user was not found in the privilege table."
 msgstr "Valitud kasutajat õiguste tabelist ei leitud."
 
-#: libraries/server_privileges.lib.php:4801
+#: libraries/server_privileges.lib.php:4827
 msgid "You have added a new user."
 msgstr "Lisasid uue kasutaja."
 
-#: libraries/server_status.lib.php:53
+#: libraries/server_status.lib.php:60
 #, php-format
 msgid "Network traffic since startup: %s"
 msgstr "Võrguliiklus alates käivitumisest: %s"
 
-#: libraries/server_status.lib.php:66
+#: libraries/server_status.lib.php:73
 #, php-format
 msgid "This MySQL server has been running for %1$s. It started up on %2$s."
 msgstr "See MySQL server on töötanud %1$s. See käivitus %2$s."
 
-#: libraries/server_status.lib.php:80
+#: libraries/server_status.lib.php:94
 msgid ""
 "This MySQL server works as <b>master</b> and <b>slave</b> in <b>replication</"
 "b> process."
@@ -12710,19 +12723,19 @@ msgstr ""
 "See MySQL server töötab <b>paljundamisel</b> <b>ülemana</b> ja <b>alluvana</"
 "b>."
 
-#: libraries/server_status.lib.php:85
+#: libraries/server_status.lib.php:99
 msgid "This MySQL server works as <b>master</b> in <b>replication</b> process."
 msgstr "See MySQL server töötab <b>paljundamisel</b> <b>ülemana</b>."
 
-#: libraries/server_status.lib.php:90
+#: libraries/server_status.lib.php:104
 msgid "This MySQL server works as <b>slave</b> in <b>replication</b> process."
 msgstr "See MySQL server töötab <b>paljundamisel</b> <b>alluvana</b>."
 
-#: libraries/server_status.lib.php:106
+#: libraries/server_status.lib.php:116
 msgid "Replication status"
 msgstr "Paljundamise staatus"
 
-#: libraries/server_status.lib.php:137
+#: libraries/server_status.lib.php:146
 msgid ""
 "On a busy server, the byte counters may overrun, so those statistics as "
 "reported by the MySQL server may be incorrect."
@@ -12730,19 +12743,19 @@ msgstr ""
 "Hõivatud serveris võib baitide lugeja olla ülekoormatud ja seetõttu MySQL "
 "serveri poolt koostatud statistika ei pruugi õige olla."
 
-#: libraries/server_status.lib.php:148
+#: libraries/server_status.lib.php:157
 msgid "Received"
 msgstr "Vastu võetud"
 
-#: libraries/server_status.lib.php:167
+#: libraries/server_status.lib.php:176
 msgid "Sent"
 msgstr "Saadetud"
 
-#: libraries/server_status.lib.php:234
+#: libraries/server_status.lib.php:243
 msgid "Max. concurrent connections"
 msgstr "Maks. paralleelühendusi"
 
-#: libraries/server_status.lib.php:244
+#: libraries/server_status.lib.php:253
 msgid "Failed attempts"
 msgstr "Ebaõnnestunud katseid"
 
@@ -13805,7 +13818,7 @@ msgstr "Selle muutuja väärtus on ainult lugemiseks"
 msgid "Not implemented yet."
 msgstr "Hetkel veel rakendamata."
 
-#: libraries/sql-parser/src/Components/AlterOperation.php:193
+#: libraries/sql-parser/src/Components/AlterOperation.php:191
 msgid "Unrecognized alter operation."
 msgstr "Tundmatu ALTER operatsioon."
 
@@ -13819,7 +13832,7 @@ msgid "An opening bracket followed by a set of values was expected."
 msgstr "Oodati avanevat sulgu, millele järgnevad väärtused."
 
 #: libraries/sql-parser/src/Components/ArrayObj.php:101
-#: libraries/sql-parser/src/Components/FieldDefinition.php:202
+#: libraries/sql-parser/src/Components/CreateDefinition.php:202
 msgid "An opening bracket was expected."
 msgstr "Oodati avanevat sulgu."
 
@@ -13827,25 +13840,33 @@ msgstr "Oodati avanevat sulgu."
 msgid "A comma or a closing bracket was expected"
 msgstr "Oodati koma või lõpetavat sulgu"
 
+#: libraries/sql-parser/src/Components/CreateDefinition.php:246
+msgid "A comma or a closing bracket was expected."
+msgstr "Oodati koma või lõpetavat sulgu."
+
+#: libraries/sql-parser/src/Components/CreateDefinition.php:262
+msgid "A closing bracket was expected."
+msgstr "Oodati lõpetavat sulgu."
+
 #: libraries/sql-parser/src/Components/DataType.php:125
 msgid "Unrecognized data type."
 msgstr "Tundmatu andmetüüp."
 
-#: libraries/sql-parser/src/Components/Expression.php:225
+#: libraries/sql-parser/src/Components/Expression.php:227
 msgid "Unexpected closing bracket."
 msgstr "Ootamatu lõpetav sulg."
 
-#: libraries/sql-parser/src/Components/Expression.php:246
-#: libraries/sql-parser/src/Components/Expression.php:283
-#: libraries/sql-parser/src/Components/Expression.php:303
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:285
+#: libraries/sql-parser/src/Components/Expression.php:305
 msgid "An alias was previously found."
 msgstr "Eelnevalt leiti alias."
 
-#: libraries/sql-parser/src/Components/Expression.php:257
+#: libraries/sql-parser/src/Components/Expression.php:259
 msgid "Unexpected dot."
 msgstr "Ootamatu punkt."
 
-#: libraries/sql-parser/src/Components/Expression.php:327
+#: libraries/sql-parser/src/Components/Expression.php:329
 msgid "An alias was expected."
 msgstr "Oodati aliast."
 
@@ -13853,14 +13874,6 @@ msgstr "Oodati aliast."
 msgid "An expression was expected."
 msgstr "Oodati avaldist."
 
-#: libraries/sql-parser/src/Components/FieldDefinition.php:246
-msgid "A comma or a closing bracket was expected."
-msgstr "Oodati koma või lõpetavat sulgu."
-
-#: libraries/sql-parser/src/Components/FieldDefinition.php:262
-msgid "A closing bracket was expected."
-msgstr "Oodati lõpetavat sulgu."
-
 #: libraries/sql-parser/src/Components/Limit.php:90
 #: libraries/sql-parser/src/Components/Limit.php:112
 msgid "An offset was expected."
@@ -13900,24 +13913,24 @@ msgstr "Oodati eraldajale eelnevat tühemikku."
 msgid "Expected delimiter."
 msgstr "Oodati eraldajat."
 
-#: libraries/sql-parser/src/Lexer.php:753
+#: libraries/sql-parser/src/Lexer.php:777
 #, php-format
 msgid "Ending quote %1$s was expected."
 msgstr "Oodati lõpetavat sümbolit %1$s."
 
-#: libraries/sql-parser/src/Lexer.php:789
+#: libraries/sql-parser/src/Lexer.php:813
 msgid "Variable name was expected."
 msgstr "Oodati muutuja nime."
 
-#: libraries/sql-parser/src/Parser.php:380
+#: libraries/sql-parser/src/Parser.php:391
 msgid "Unexpected beginning of statement."
 msgstr "Ootamatu lause algus."
 
-#: libraries/sql-parser/src/Parser.php:399
+#: libraries/sql-parser/src/Parser.php:410
 msgid "Unrecognized statement type."
 msgstr "Tundmatut tüüpi lause."
 
-#: libraries/sql-parser/src/Parser.php:479
+#: libraries/sql-parser/src/Parser.php:489
 msgid "No transaction was previously started."
 msgstr "Transaktsiooni ei olnud eelnevalt alustatud."
 
@@ -13943,8 +13956,9 @@ msgid "The name of the entity was expected."
 msgstr "Oodati olemi nime."
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:310
-msgid "At least one field definition was expected."
-msgstr "Oodati vähemalt ühe välja kirjeldust."
+#| msgid "At least one field definition was expected."
+msgid "At least one column definition was expected."
+msgstr "Oodati vähemalt ühe veeru kirjeldust."
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:329
 msgid "A \"RETURNS\" keyword was expected."
@@ -14003,11 +14017,11 @@ msgstr "Järjehoidjat ei loodud!"
 msgid "Using bookmark \"%s\" as default browse query."
 msgstr "\"%s\" järjehoidjat kasutatakse vaikimisi sirvimise päringuna."
 
-#: libraries/sql.lib.php:1306
+#: libraries/sql.lib.php:1300
 msgid "Showing as PHP code"
 msgstr "Näitan PHP koodina"
 
-#: libraries/sql.lib.php:1638
+#: libraries/sql.lib.php:1632
 #, php-format
 msgid ""
 "Current selection does not contain a unique column. Grid edit, checkbox, "
@@ -14017,7 +14031,7 @@ msgstr ""
 "märkekastide, hariliku muutmisega, kopeerimisega ja kustutamisega seotud "
 "funksionaalsus ei ole saadaval. %s"
 
-#: libraries/sql.lib.php:1649
+#: libraries/sql.lib.php:1643
 #, php-format
 msgid ""
 "Current selection does not contain a unique column. Grid edit, Edit, Copy "
@@ -14027,7 +14041,7 @@ msgstr ""
 "muutmisega, kopeerimise ja kustutamisega seotud võimalused võivad põhjustada "
 "soovimatut käitumist. %s"
 
-#: libraries/sql.lib.php:1688
+#: libraries/sql.lib.php:1682
 #, php-format
 msgid "Problems with indexes of table `%s`"
 msgstr "Probleemid `%s` tabeli indeksitega"
@@ -14184,7 +14198,7 @@ msgid "Version %s snapshot (SQL code)"
 msgstr "Versiooni %s hetkepilt (SQL kood)"
 
 #: libraries/tracking.lib.php:947
-#: templates/structure/table_structure_row.phtml:33
+#: templates/table/structure/table_structure_row.phtml:33
 msgctxt "None for default"
 msgid "None"
 msgstr "Puudub"
@@ -14238,15 +14252,15 @@ msgstr "Versioon %1$s kokku %2$s. versioonist kustutati."
 msgid "Version %1$s was created, tracking for %2$s is active."
 msgstr "Versioon %1$s on loodud, %2$s jälgimine on aktiveeritud."
 
-#: libraries/user_preferences.inc.php:29
+#: libraries/user_preferences.inc.php:30
 msgid "Manage your settings"
 msgstr "Halda oma sätteid"
 
-#: libraries/user_preferences.inc.php:46 prefs_manage.php:307
+#: libraries/user_preferences.inc.php:54 prefs_manage.php:307
 msgid "Configuration has been saved."
 msgstr "Seadistus on salvestatud."
 
-#: libraries/user_preferences.inc.php:66
+#: libraries/user_preferences.inc.php:74
 #, php-format
 msgid ""
 "Your preferences will be saved for current session only. Storing them "
@@ -14564,7 +14578,6 @@ msgid "Row: %1$s, Column: %2$s, Error: %3$s"
 msgstr "Rida: %1$s, veerg: %2$s, viga: %3$s"
 
 #: tbl_row_action.php:70
-#| msgid "No versions selected."
 msgid "No row selected."
 msgstr "Mitte ühtegi rida ei valitud."
 
@@ -14640,7 +14653,7 @@ msgid "first"
 msgstr "esimene"
 
 #: templates/columns_definitions/move_column.phtml:12
-#: templates/structure/add_column.phtml:21
+#: templates/table/structure/add_column.phtml:21
 #, php-format
 msgid "after %s"
 msgstr "peale %s"
@@ -14709,197 +14722,292 @@ msgstr "Sisendi transformatsioon"
 msgid "Input transformation options"
 msgstr "Sisendi transformatsiooni sätted"
 
-#: templates/designer/aggregate_query_panel.phtml:22
-#: templates/designer/options_panel.phtml:100
-msgid "Aggregate"
-msgstr "Agregaat"
-
-#: templates/designer/aggregate_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:61
-#: templates/designer/options_panel.phtml:106
-#: templates/designer/options_panel.phtml:170
-#: templates/designer/where_query_panel.phtml:30
-#: templates/table/table_header.phtml:9
-msgid "Operator"
-msgstr "Operaator"
-
-#: templates/designer/database_tables.phtml:29
-msgid "Toggle"
-msgstr "Lülita"
-
-#: templates/designer/database_tables.phtml:40
-msgid "See table structure"
-msgstr "Vaata tabeli struktuuri"
-
-#: templates/designer/delete_relation_panel.phtml:21
-msgid "Delete relation"
-msgstr "Kustuta seos"
-
-#: templates/designer/edit_delete_pages.phtml:7
-msgid "Page to open"
-msgstr "Leht avamiseks"
-
-#: templates/designer/edit_delete_pages.phtml:7
-msgid "Page to delete"
-msgstr "Leht kustutamiseks"
-
-#: templates/designer/having_query_panel.phtml:90
-#: templates/designer/options_panel.phtml:63
-#: templates/designer/options_panel.phtml:229
-#: templates/designer/where_query_panel.phtml:59
-msgid "Except"
-msgstr "V.a"
-
-#: templates/designer/having_query_panel.phtml:102
-#: templates/designer/options_panel.phtml:75
-#: templates/designer/options_panel.phtml:241
-#: templates/designer/where_query_panel.phtml:71
-msgid "subquery"
-msgstr "alampäring"
-
-#: templates/designer/new_relation_panel.phtml:22
-#: templates/designer/side_menu.phtml:84 templates/designer/side_menu.phtml:87
-msgid "Create relation"
-msgstr "Loo seos"
-
-#: templates/designer/options_panel.phtml:34
-#: templates/designer/options_panel.phtml:200
-msgid "Relation operator"
-msgstr "Seose operaator"
-
-#: templates/designer/options_panel.phtml:85
-#: templates/designer/rename_to_panel.phtml:23
-msgid "Rename to"
-msgstr "Muuda nimeks"
-
-#: templates/designer/options_panel.phtml:91
-#: templates/designer/rename_to_panel.phtml:31
-msgid "New name"
-msgstr "Uus nimi"
-
-#: templates/designer/page_save_as.phtml:4
-msgid "Save to selected page"
-msgstr "Salvesta valitud lehele"
-
-#: templates/designer/page_save_as.phtml:5
-msgid "Create a page and save to it"
-msgstr "Loo leht ja salvesta sellele"
-
-#: templates/designer/page_save_as.phtml:26
-msgid "New page name"
-msgstr "Uue lehe nimi"
-
-#: templates/designer/page_selector.phtml:2
-msgid "Select page"
-msgstr "Vali leht"
-
-#: templates/designer/query_details.phtml:10
-msgid "Active options"
-msgstr "Aktiivsed valikud"
-
-#: templates/designer/schema_export.phtml:4
-msgid "Select Export Relational Type"
-msgstr "Vali ekspordi seose tüüp"
-
-#: templates/designer/side_menu.phtml:19 templates/designer/side_menu.phtml:25
-msgid "Show/Hide tables list"
-msgstr "Näita/peida tabelite loend"
-
-#: templates/designer/side_menu.phtml:29 templates/designer/side_menu.phtml:35
-#: templates/designer/side_menu.phtml:36
-msgid "View in fullscreen"
-msgstr "Kuva üle ekraani"
-
-#: templates/designer/side_menu.phtml:34
-msgid "Exit fullscreen"
-msgstr "Välju üleekraani vaatest"
-
-#: templates/designer/side_menu.phtml:41 templates/designer/side_menu.phtml:45
-msgid "New page"
-msgstr "Uus leht"
-
-#: templates/designer/side_menu.phtml:70 templates/designer/side_menu.phtml:73
-msgid "Delete pages"
-msgstr "Kustuta lehed"
-
-#: templates/designer/side_menu.phtml:77 templates/designer/side_menu.phtml:80
-#: templates/table/create_table.phtml:7
+#: templates/database/create_table.phtml:7
+#: templates/database/designer/side_menu.phtml:77
+#: templates/database/designer/side_menu.phtml:80
 msgid "Create table"
 msgstr "Loo tabel"
 
-#: templates/designer/side_menu.phtml:98
-#: templates/designer/side_menu.phtml:101
+#: templates/database/create_table.phtml:15
+msgid "Number of columns"
+msgstr "Veergude arv"
+
+#: templates/database/designer/aggregate_query_panel.phtml:22
+#: templates/database/designer/options_panel.phtml:100
+msgid "Aggregate"
+msgstr "Agregaat"
+
+#: templates/database/designer/aggregate_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:61
+#: templates/database/designer/options_panel.phtml:106
+#: templates/database/designer/options_panel.phtml:170
+#: templates/database/designer/where_query_panel.phtml:30
+#: templates/table/search/table_header.phtml:9
+msgid "Operator"
+msgstr "Operaator"
+
+#: templates/database/designer/database_tables.phtml:29
+msgid "Toggle"
+msgstr "Lülita"
+
+#: templates/database/designer/database_tables.phtml:40
+msgid "See table structure"
+msgstr "Vaata tabeli struktuuri"
+
+#: templates/database/designer/delete_relation_panel.phtml:21
+msgid "Delete relation"
+msgstr "Kustuta seos"
+
+#: templates/database/designer/edit_delete_pages.phtml:7
+msgid "Page to open"
+msgstr "Leht avamiseks"
+
+#: templates/database/designer/edit_delete_pages.phtml:7
+msgid "Page to delete"
+msgstr "Leht kustutamiseks"
+
+#: templates/database/designer/having_query_panel.phtml:90
+#: templates/database/designer/options_panel.phtml:63
+#: templates/database/designer/options_panel.phtml:229
+#: templates/database/designer/where_query_panel.phtml:59
+msgid "Except"
+msgstr "V.a"
+
+#: templates/database/designer/having_query_panel.phtml:102
+#: templates/database/designer/options_panel.phtml:75
+#: templates/database/designer/options_panel.phtml:241
+#: templates/database/designer/where_query_panel.phtml:71
+msgid "subquery"
+msgstr "alampäring"
+
+#: templates/database/designer/new_relation_panel.phtml:22
+#: templates/database/designer/side_menu.phtml:84
+#: templates/database/designer/side_menu.phtml:87
+msgid "Create relation"
+msgstr "Loo seos"
+
+#: templates/database/designer/options_panel.phtml:34
+#: templates/database/designer/options_panel.phtml:200
+msgid "Relation operator"
+msgstr "Seose operaator"
+
+#: templates/database/designer/options_panel.phtml:85
+#: templates/database/designer/rename_to_panel.phtml:23
+msgid "Rename to"
+msgstr "Muuda nimeks"
+
+#: templates/database/designer/options_panel.phtml:91
+#: templates/database/designer/rename_to_panel.phtml:31
+msgid "New name"
+msgstr "Uus nimi"
+
+#: templates/database/designer/page_save_as.phtml:4
+msgid "Save to selected page"
+msgstr "Salvesta valitud lehele"
+
+#: templates/database/designer/page_save_as.phtml:5
+msgid "Create a page and save to it"
+msgstr "Loo leht ja salvesta sellele"
+
+#: templates/database/designer/page_save_as.phtml:26
+msgid "New page name"
+msgstr "Uue lehe nimi"
+
+#: templates/database/designer/page_selector.phtml:2
+msgid "Select page"
+msgstr "Vali leht"
+
+#: templates/database/designer/query_details.phtml:10
+msgid "Active options"
+msgstr "Aktiivsed valikud"
+
+#: templates/database/designer/schema_export.phtml:4
+msgid "Select Export Relational Type"
+msgstr "Vali ekspordi seose tüüp"
+
+#: templates/database/designer/side_menu.phtml:19
+#: templates/database/designer/side_menu.phtml:25
+msgid "Show/Hide tables list"
+msgstr "Näita/peida tabelite loend"
+
+#: templates/database/designer/side_menu.phtml:29
+#: templates/database/designer/side_menu.phtml:35
+#: templates/database/designer/side_menu.phtml:36
+msgid "View in fullscreen"
+msgstr "Kuva üle ekraani"
+
+#: templates/database/designer/side_menu.phtml:34
+msgid "Exit fullscreen"
+msgstr "Välju üleekraani vaatest"
+
+#: templates/database/designer/side_menu.phtml:41
+#: templates/database/designer/side_menu.phtml:45
+msgid "New page"
+msgstr "Uus leht"
+
+#: templates/database/designer/side_menu.phtml:70
+#: templates/database/designer/side_menu.phtml:73
+msgid "Delete pages"
+msgstr "Kustuta lehed"
+
+#: templates/database/designer/side_menu.phtml:98
+#: templates/database/designer/side_menu.phtml:101
 msgid "Reload"
 msgstr "Lae uuesti"
 
-#: templates/designer/side_menu.phtml:107
-#: templates/designer/side_menu.phtml:110
+#: templates/database/designer/side_menu.phtml:107
+#: templates/database/designer/side_menu.phtml:110
 msgid "Help"
 msgstr "Abi"
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Angular links"
 msgstr "Nurgelised lingid"
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Direct links"
 msgstr "Otselingid"
 
-#: templates/designer/side_menu.phtml:122
-#: templates/designer/side_menu.phtml:124
+#: templates/database/designer/side_menu.phtml:122
+#: templates/database/designer/side_menu.phtml:124
 msgid "Snap to grid"
 msgstr "Kasuta ruudustikku"
 
-#: templates/designer/side_menu.phtml:128
-#: templates/designer/side_menu.phtml:134
+#: templates/database/designer/side_menu.phtml:128
+#: templates/database/designer/side_menu.phtml:134
 msgid "Small/Big All"
 msgstr "Kõik Väikeseks/Suureks"
 
-#: templates/designer/side_menu.phtml:138
-#: templates/designer/side_menu.phtml:141
+#: templates/database/designer/side_menu.phtml:138
+#: templates/database/designer/side_menu.phtml:141
 msgid "Toggle small/big"
 msgstr "Lülitu väiksele/suurele"
 
-#: templates/designer/side_menu.phtml:145
-#: templates/designer/side_menu.phtml:148
+#: templates/database/designer/side_menu.phtml:145
+#: templates/database/designer/side_menu.phtml:148
 msgid "Toggle relation lines"
 msgstr "Muuda seose ridu"
 
-#: templates/designer/side_menu.phtml:153
-#: templates/designer/side_menu.phtml:156
+#: templates/database/designer/side_menu.phtml:153
+#: templates/database/designer/side_menu.phtml:156
 msgid "Export schema"
 msgstr "Ekspordi skeem"
 
-#: templates/designer/side_menu.phtml:165
-#: templates/designer/side_menu.phtml:168
+#: templates/database/designer/side_menu.phtml:165
+#: templates/database/designer/side_menu.phtml:168
 msgid "Build Query"
 msgstr "Loo päring"
 
-#: templates/designer/side_menu.phtml:173
-#: templates/designer/side_menu.phtml:177
+#: templates/database/designer/side_menu.phtml:173
+#: templates/database/designer/side_menu.phtml:177
 msgid "Move Menu"
 msgstr "Liiguta menüü"
 
-#: templates/designer/side_menu.phtml:181
-#: templates/designer/side_menu.phtml:186
+#: templates/database/designer/side_menu.phtml:181
+#: templates/database/designer/side_menu.phtml:186
 msgid "Pin text"
 msgstr "Jäta tekst nähtavaks"
 
-#: templates/designer/table_list.phtml:4
+#: templates/database/designer/table_list.phtml:4
 msgid "Hide/Show all"
 msgstr "Peida/Näita kõiki"
 
-#: templates/designer/table_list.phtml:14
+#: templates/database/designer/table_list.phtml:14
 msgid "Hide/Show Tables with no relation"
 msgstr "Peida/Näita tabeleid, millel puudub seos"
 
-#: templates/designer/table_list.phtml:59
+#: templates/database/designer/table_list.phtml:59
 msgid "Number of tables:"
 msgstr "Tabelite hulk:"
 
+#: templates/database/structure/body_for_table_summary.phtml:6
+#, php-format
+msgid "%s table"
+msgid_plural "%s tables"
+msgstr[0] "%s tabel"
+msgstr[1] "%s tabelit"
+
+#: templates/database/structure/body_for_table_summary.phtml:17
+msgid "Sum"
+msgstr "Summa"
+
+#: templates/database/structure/check_all_tables.phtml:6
+msgid "Check tables having overhead"
+msgstr "Kontrolli ballastiga  tabeleid"
+
+#: templates/database/structure/check_all_tables.phtml:10
+msgid "Show create"
+msgstr "Näita loomist"
+
+#: templates/database/structure/check_all_tables.phtml:27
+msgid "Prefix"
+msgstr "Eesliide"
+
+#: templates/database/structure/check_all_tables.phtml:28
+msgid "Add prefix to table"
+msgstr "Lisa tabelile eesliide"
+
+#: templates/database/structure/check_all_tables.phtml:29
+msgid "Replace table prefix"
+msgstr "Asenda tabeli eesliide"
+
+#: templates/database/structure/check_all_tables.phtml:30
+msgid "Copy table with prefix"
+msgstr "Kopeeri tabel koos eesliitega"
+
+#: templates/database/structure/check_all_tables.phtml:36
+msgid "Add columns to central list"
+msgstr "Lisa veerud kesksesse nimekirja"
+
+#: templates/database/structure/check_all_tables.phtml:37
+msgid "Remove columns from central list"
+msgstr "Eemalda veerud kesksest nimekirjast"
+
+#: templates/database/structure/check_all_tables.phtml:38
+msgid "Make consistent with central list"
+msgstr "Vii keskse loendiga kooskõlla"
+
+#: templates/database/structure/favorite_anchor.phtml:12
+msgid "Add to Favorites"
+msgstr "Lisa lemmikutesse"
+
+#: templates/database/structure/show_create.phtml:2
+msgid "Showing create queries"
+msgstr "Kuvatakse loomise päringuid"
+
+#: templates/database/structure/sortable_header.phtml:13
+msgid "Sort"
+msgstr "Sorteeri"
+
+#: templates/database/structure/table_header.phtml:42
+msgid ""
+"May be approximate. Click on the number to get the exact count. See "
+"[doc@faq3-11]FAQ 3.11[/doc]."
+msgstr ""
+"Võib olla umbkaudne. Täpse arvu saamiseks klõpsa numbril. Vaata "
+"[doc@faq3-11]KKK 3.11[/doc]."
+
+#: templates/database/structure/table_header.phtml:66
+#: templates/table/index_form.phtml:127
+msgid "Size"
+msgstr "Suurus"
+
+#: templates/database/structure/table_header.phtml:74
+#: templates/table/structure/display_table_stats.phtml:27
+msgid "Overhead"
+msgstr "Ballast"
+
+#: templates/database/structure/tracking_icon.phtml:4
+msgid "Tracking is active."
+msgstr "Jälgimine on aktiveeritud."
+
+#: templates/database/structure/tracking_icon.phtml:8
+msgid "Tracking is not active."
+msgstr "Jälgimist pole aktiveeritud."
+
 #: templates/error/report_form.phtml:7
 msgid ""
 "phpMyAdmin has encountered an error. We have collected data about this error "
@@ -14918,59 +15026,6 @@ msgstr "Sa võid tutvuda vearaportis olevate andmetega:"
 msgid "Please explain the steps that lead to the error:"
 msgstr "Palun kirjelda samme, mis põhjustasid vea:"
 
-#: templates/gis_visualization/gis_visualization.phtml:3
-msgid "Display GIS Visualization"
-msgstr "Näita GIS visualiseerimist"
-
-#: templates/gis_visualization/gis_visualization.phtml:8
-msgid "Label column"
-msgstr "Nime veerg"
-
-#: templates/gis_visualization/gis_visualization.phtml:11
-msgid "-- None --"
-msgstr "-- Puudub --"
-
-#: templates/gis_visualization/gis_visualization.phtml:19
-msgid "Spatial column"
-msgstr "Ruumiline veerg"
-
-#: templates/index_form.phtml:16
-msgid "Index name:"
-msgstr "Indeksi nimi:"
-
-#: templates/index_form.phtml:19
-msgid ""
-"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
-msgstr "\"PRIMARY\" <b>peab</b> olema <b>ainult</b> primaarvõtme nimi!"
-
-#: templates/index_form.phtml:40
-msgid "Index choice:"
-msgstr "Indeksi valik:"
-
-#: templates/index_form.phtml:57
-msgid "Key block size:"
-msgstr "Võtme ploki suurus:"
-
-#: templates/index_form.phtml:74
-msgid "Index type:"
-msgstr "Indeksi tüüp:"
-
-#: templates/index_form.phtml:86
-msgid "Parser:"
-msgstr "Parser:"
-
-#: templates/index_form.phtml:102
-msgid "Comment:"
-msgstr "Kommentaar:"
-
-#: templates/index_form.phtml:127 templates/structure/table_header.phtml:66
-msgid "Size"
-msgstr "Suurus"
-
-#: templates/index_form.phtml:149 templates/index_form.phtml:190
-msgid "Drag to reorder"
-msgstr "Järjekorra muutmiseks lohista"
-
 #: templates/prefs_autoload.phtml:9
 msgid ""
 "Your browser has phpMyAdmin configuration for this domain. Would you like to "
@@ -14983,407 +15038,372 @@ msgstr ""
 msgid "Start row:"
 msgstr "Alusta reaga:"
 
-#: templates/structure/actions_in_table_structure.phtml:14
-#, php-format
-msgid "A primary key has been added on %s."
-msgstr "Tabelile %s lisati primaarvõti."
-
-#: templates/structure/actions_in_table_structure.phtml:34
-#: templates/structure/actions_in_table_structure.phtml:54
-#: templates/structure/actions_in_table_structure.phtml:79
-#: templates/structure/actions_in_table_structure.phtml:101
-#, php-format
-msgid "An index has been added on %s."
-msgstr "Veerule %s lisati index."
-
-#: templates/structure/actions_in_table_structure.phtml:130
-#: templates/structure/check_all_table_column.phtml:59
-msgid "Remove from central columns"
-msgstr "Eemalda kesksest nimekirjast"
-
-#: templates/structure/actions_in_table_structure.phtml:138
-#: templates/structure/check_all_table_column.phtml:55
-msgid "Add to central columns"
-msgstr "Lisa kesksesse nimekirja"
-
-#: templates/structure/add_column.phtml:7
-#, php-format
-msgid "Add %s column(s)"
-msgstr "Lisa %s veerg(u)"
-
-#: templates/structure/add_column.phtml:12
-msgid "at beginning of table"
-msgstr "tabeli alguses"
-
-#: templates/structure/body_for_table_summary.phtml:6
-#, php-format
-msgid "%s table"
-msgid_plural "%s tables"
-msgstr[0] "%s tabel"
-msgstr[1] "%s tabelit"
-
-#: templates/structure/body_for_table_summary.phtml:17
-msgid "Sum"
-msgstr "Summa"
-
-#: templates/structure/check_all_tables.phtml:6
-msgid "Check tables having overhead"
-msgstr "Kontrolli ballastiga  tabeleid"
-
-#: templates/structure/check_all_tables.phtml:10
-msgid "Show create"
-msgstr "Näita loomist"
-
-#: templates/structure/check_all_tables.phtml:27
-msgid "Prefix"
-msgstr "Eesliide"
-
-#: templates/structure/check_all_tables.phtml:28
-msgid "Add prefix to table"
-msgstr "Lisa tabelile eesliide"
-
-#: templates/structure/check_all_tables.phtml:29
-msgid "Replace table prefix"
-msgstr "Asenda tabeli eesliide"
-
-#: templates/structure/check_all_tables.phtml:30
-msgid "Copy table with prefix"
-msgstr "Kopeeri tabel koos eesliitega"
-
-#: templates/structure/check_all_tables.phtml:36
-msgid "Add columns to central list"
-msgstr "Lisa veerud kesksesse nimekirja"
-
-#: templates/structure/check_all_tables.phtml:37
-msgid "Remove columns from central list"
-msgstr "Eemalda veerud kesksest nimekirjast"
-
-#: templates/structure/check_all_tables.phtml:38
-msgid "Make consistent with central list"
-msgstr "Vii keskse loendiga kooskõlla"
-
-#: templates/structure/display_structure.phtml:140 view_create.php:181
-msgid "Edit view"
-msgstr "Muuda vaadet"
-
-#: templates/structure/display_table_stats.phtml:9
-msgid "Space usage"
-msgstr "Ruumi kasutus"
-
-#: templates/structure/display_table_stats.phtml:27
-#: templates/structure/table_header.phtml:74
-msgid "Overhead"
-msgstr "Ballast"
-
-#: templates/structure/display_table_stats.phtml:32
-msgid "Effective"
-msgstr "Efektiivne"
-
-#: templates/structure/favorite_anchor.phtml:12
-msgid "Add to Favorites"
-msgstr "Lisa lemmikutesse"
-
-#: templates/structure/move_columns_dialog.phtml:1
-#: templates/structure/optional_action_links.phtml:21
-msgid "Move columns"
-msgstr "Liiguta veergusid"
-
-#: templates/structure/move_columns_dialog.phtml:2
-msgid "Move the columns by dragging them up and down."
-msgstr "Veergusid saad liigutada nende lohistamisega üles ja alla."
-
-#: templates/structure/optional_action_links.phtml:9
-msgid "Propose table structure"
-msgstr "Soovita tabeli struktuuri"
-
-#: templates/structure/optional_action_links.phtml:24
-msgid "Improve table structure"
-msgstr "Parenda tabeli struktuuri"
-
-#: templates/structure/optional_action_links.phtml:30
-msgid "Track view"
-msgstr "Jälgi vaadet"
-
-#: templates/structure/row_stats_table.phtml:3
-msgid "Row statistics"
-msgstr "Rea statistika"
-
-#: templates/structure/row_stats_table.phtml:9
-msgid "static"
-msgstr "staatiline"
-
-#: templates/structure/row_stats_table.phtml:11
-msgid "dynamic"
-msgstr "dünaamiline"
-
-#: templates/structure/row_stats_table.phtml:22
-msgid "partitioned"
-msgstr "partitsioneeritud"
-
-#: templates/structure/row_stats_table.phtml:54
-msgid "Row length"
-msgstr "Rea pikkus"
-
-#: templates/structure/row_stats_table.phtml:66
-msgid "Row size"
-msgstr "Rea laius"
-
-#: templates/structure/row_stats_table.phtml:73
-msgid "Next autoindex"
-msgstr "Järgmine automaatne indeks"
-
-#: templates/structure/secondary_tabs.phtml:14
-msgid "Relation view"
-msgstr "Seoste vaade"
-
-#: templates/structure/show_create.phtml:2
-msgid "Showing create queries"
-msgstr "Kuvatakse loomise päringuid"
-
-#: templates/structure/sortable_header.phtml:13
-msgid "Sort"
-msgstr "Sorteeri"
-
-#: templates/structure/table_header.phtml:42
-msgid ""
-"May be approximate. Click on the number to get the exact count. See "
-"[doc@faq3-11]FAQ 3.11[/doc]."
-msgstr ""
-"Võib olla umbkaudne. Täpse arvu saamiseks klõpsa numbril. Vaata "
-"[doc@faq3-11]KKK 3.11[/doc]."
-
-#: templates/structure/table_structure_row.phtml:46
-#, php-format
-msgid "Column %s has been dropped."
-msgstr "Veerg %s on kustutatud."
-
-#: templates/structure/tracking_icon.phtml:4
-msgid "Tracking is active."
-msgstr "Jälgimine on aktiveeritud."
-
-#: templates/structure/tracking_icon.phtml:8
-msgid "Tracking is not active."
-msgstr "Jälgimist pole aktiveeritud."
-
-#: templates/table/create_table.phtml:15
-msgid "Number of columns"
-msgstr "Veergude arv"
-
-#: templates/table/options.phtml:8
-msgid "Select columns (at least one):"
-msgstr "Vali veerud (vähemalt üks):"
-
-#: templates/table/options.phtml:37
-msgid "Add search conditions (body of the \"where\" clause):"
-msgstr "Lisa otsingu tingimusi (\"WHERE\" klausel):"
-
-#: templates/table/options.phtml:45
-msgid "Number of rows per page"
-msgstr "Ridade hulk lehe kohta"
-
-#: templates/table/options.phtml:56
-msgid "Display order:"
-msgstr "Näitamise järjekord:"
-
-#: templates/table/options_zoom.phtml:6
-msgid "Use this column to label each point"
-msgstr "Kasuta seda veergu iga punkti nimetamiseks"
-
-#: templates/table/options_zoom.phtml:35
-msgid "Maximum rows to plot"
-msgstr "Suurim ridade hulk diagrammis"
-
-#: templates/table/replace_preview.phtml:13
-msgid "Find and replace - preview"
-msgstr "Leia ja asenda eelvaade"
-
-#: templates/table/replace_preview.phtml:18
-msgid "Original string"
-msgstr "Algne tekst"
-
-#: templates/table/replace_preview.phtml:19
-msgid "Replaced string"
-msgstr "Asendatud tekst"
-
-#: templates/table/replace_preview.phtml:40
-msgid "Replace"
-msgstr "Asenda"
-
-#: templates/table/rows_zoom.phtml:16
-msgid "Additional search criteria"
-msgstr "Täiendav otsingu kriteerium"
-
-#: templates/table/search_and_replace.phtml:3
-msgid "Replace with:"
-msgstr "Asenda:"
-
-#: templates/table/search_and_replace.phtml:22
-msgid "Use regular expression"
-msgstr "Kasuta regulaaravaldist"
-
-#: templates/table/selection_form.phtml:12
-msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
-msgstr ""
-"Teosta kahe erineva veergu jaoks \"päring näite alusel\" (metamärk: \"%\")"
-
-#: templates/table/selection_form.phtml:34
-msgid "Do a \"query by example\" (wildcard: \"%\")"
-msgstr "Teosta \"päring näite alusel\" (metamärk: \"%\")"
-
-#: templates/table/zoom_result_form.phtml:7
-msgid "Browse/Edit the points"
-msgstr "Sirvi/Muuda punkte"
-
-#: templates/table/zoom_result_form.phtml:15
-msgid "How to use"
-msgstr "Kuidas kasutada"
-
-#: templates/table/zoom_result_form.phtml:23
-msgid "Reset zoom"
-msgstr "Lähtesta suum"
-
-#: templates/tbl_chart.phtml:17
+#: templates/table/chart/tbl_chart.phtml:17
 msgctxt "Chart type"
 msgid "Bar"
 msgstr "Lint"
 
-#: templates/tbl_chart.phtml:21
+#: templates/table/chart/tbl_chart.phtml:21
 msgctxt "Chart type"
 msgid "Column"
 msgstr "Tulp"
 
-#: templates/tbl_chart.phtml:25
+#: templates/table/chart/tbl_chart.phtml:25
 msgctxt "Chart type"
 msgid "Line"
 msgstr "Joon"
 
-#: templates/tbl_chart.phtml:29
+#: templates/table/chart/tbl_chart.phtml:29
 msgctxt "Chart type"
 msgid "Spline"
 msgstr "Sujuvjoon"
 
-#: templates/tbl_chart.phtml:33
+#: templates/table/chart/tbl_chart.phtml:33
 msgctxt "Chart type"
 msgid "Area"
 msgstr "Ala"
 
-#: templates/tbl_chart.phtml:37
+#: templates/table/chart/tbl_chart.phtml:37
 msgctxt "Chart type"
 msgid "Pie"
 msgstr "Sektor"
 
-#: templates/tbl_chart.phtml:41
+#: templates/table/chart/tbl_chart.phtml:41
 msgctxt "Chart type"
 msgid "Timeline"
 msgstr "Ajaline järjestus"
 
-#: templates/tbl_chart.phtml:45
+#: templates/table/chart/tbl_chart.phtml:45
 msgctxt "Chart type"
 msgid "Scatter"
 msgstr "Hajusgraafik"
 
-#: templates/tbl_chart.phtml:50
+#: templates/table/chart/tbl_chart.phtml:50
 msgid "Stacked"
 msgstr "Jaotatud ühe tulbana"
 
-#: templates/tbl_chart.phtml:53
+#: templates/table/chart/tbl_chart.phtml:53
 msgid "Chart title"
 msgstr "Diagrammi pealkiri"
 
-#: templates/tbl_chart.phtml:57
+#: templates/table/chart/tbl_chart.phtml:57
 msgid "X-Axis:"
 msgstr "X-telg:"
 
-#: templates/tbl_chart.phtml:72
+#: templates/table/chart/tbl_chart.phtml:72
 msgid "Series:"
 msgstr "Seeria:"
 
-#: templates/tbl_chart.phtml:102
+#: templates/table/chart/tbl_chart.phtml:102
 msgid "X-Axis label:"
 msgstr "X-telje nimi:"
 
-#: templates/tbl_chart.phtml:104
+#: templates/table/chart/tbl_chart.phtml:104
 msgid "X Values"
 msgstr "X väärtused"
 
-#: templates/tbl_chart.phtml:107
+#: templates/table/chart/tbl_chart.phtml:107
 msgid "Y-Axis label:"
 msgstr "Y-telje nimi:"
 
-#: templates/tbl_chart.phtml:115
+#: templates/table/chart/tbl_chart.phtml:115
 msgid "Series names are in a column"
 msgstr "Jadade nimed on veerus"
 
-#: templates/tbl_chart.phtml:118
+#: templates/table/chart/tbl_chart.phtml:118
 msgid "Series column:"
 msgstr "Jadade veerg:"
 
-#: templates/tbl_chart.phtml:130
+#: templates/table/chart/tbl_chart.phtml:130
 msgid "Value Column:"
 msgstr "Väärtuste veerg:"
 
-#: templates/tbl_chart.phtml:150
+#: templates/table/chart/tbl_chart.phtml:150
 msgid "Save chart as image"
 msgstr "Salvesta graafik pildina"
 
-#: templates/tbl_relation/common_form.phtml:7
+#: templates/table/gis_visualization/gis_visualization.phtml:3
+msgid "Display GIS Visualization"
+msgstr "Näita GIS visualiseerimist"
+
+#: templates/table/gis_visualization/gis_visualization.phtml:8
+msgid "Label column"
+msgstr "Nime veerg"
+
+#: templates/table/gis_visualization/gis_visualization.phtml:11
+msgid "-- None --"
+msgstr "-- Puudub --"
+
+#: templates/table/gis_visualization/gis_visualization.phtml:19
+msgid "Spatial column"
+msgstr "Ruumiline veerg"
+
+#: templates/table/index_form.phtml:16
+msgid "Index name:"
+msgstr "Indeksi nimi:"
+
+#: templates/table/index_form.phtml:19
+msgid ""
+"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
+msgstr "\"PRIMARY\" <b>peab</b> olema <b>ainult</b> primaarvõtme nimi!"
+
+#: templates/table/index_form.phtml:40
+msgid "Index choice:"
+msgstr "Indeksi valik:"
+
+#: templates/table/index_form.phtml:57
+msgid "Key block size:"
+msgstr "Võtme ploki suurus:"
+
+#: templates/table/index_form.phtml:74
+msgid "Index type:"
+msgstr "Indeksi tüüp:"
+
+#: templates/table/index_form.phtml:86
+msgid "Parser:"
+msgstr "Parser:"
+
+#: templates/table/index_form.phtml:102
+msgid "Comment:"
+msgstr "Kommentaar:"
+
+#: templates/table/index_form.phtml:149 templates/table/index_form.phtml:190
+msgid "Drag to reorder"
+msgstr "Järjekorra muutmiseks lohista"
+
+#: templates/table/relation/common_form.phtml:7
 msgid "Internal relations"
 msgstr "Sisesed seosed"
 
-#: templates/tbl_relation/common_form.phtml:11
+#: templates/table/relation/common_form.phtml:11
 msgid "Internal relation"
 msgstr "Sisemine seos"
 
-#: templates/tbl_relation/common_form.phtml:14
+#: templates/table/relation/common_form.phtml:14
 msgid ""
 "An internal relation is not necessary when a corresponding FOREIGN KEY "
 "relation exists."
 msgstr ""
 "Sisemine seos on mittevajalik, kui vastav FOREIGN KEY seos on juba olemas."
 
-#: templates/tbl_relation/common_form.phtml:37
+#: templates/table/relation/common_form.phtml:37
 msgid "Foreign key constraints"
 msgstr "Võõrvõtme piirangud"
 
-#: templates/tbl_relation/common_form.phtml:40
+#: templates/table/relation/common_form.phtml:40
 msgid "Actions"
 msgstr "Tegevused"
 
-#: templates/tbl_relation/common_form.phtml:41
+#: templates/table/relation/common_form.phtml:41
 msgid "Constraint properties"
 msgstr "Piirangud omadustele"
 
-#: templates/tbl_relation/common_form.phtml:44
+#: templates/table/relation/common_form.phtml:44
 msgid ""
 "Only columns with index will be displayed. You can define an index below."
 msgstr ""
 "Kuvatakse ainult indeksiga veerud. Sa võid defineerida indeksi allpool."
 
-#: templates/tbl_relation/common_form.phtml:49
+#: templates/table/relation/common_form.phtml:49
 msgid "Foreign key constraint"
 msgstr "Võõrvõtme piirang"
 
-#: templates/tbl_relation/common_form.phtml:81
+#: templates/table/relation/common_form.phtml:81
 msgid "+ Add constraint"
 msgstr "+ Lisa piirang"
 
-#: templates/tbl_relation/common_form.phtml:91
+#: templates/table/relation/common_form.phtml:91
 msgid "Choose column to display:"
 msgstr "Vali veerg, mida näidata:"
 
-#: templates/tbl_relation/foreign_key_row.phtml:13
+#: templates/table/relation/foreign_key_row.phtml:13
 #, php-format
 msgid "Foreign key constraint %s has been dropped"
 msgstr "Välisvõtme piirang %s on kustutatud"
 
-#: templates/tbl_relation/foreign_key_row.phtml:102
+#: templates/table/relation/foreign_key_row.phtml:102
 msgid "Constraint name"
 msgstr "Piirangu nimi"
 
-#: templates/tbl_relation/foreign_key_row.phtml:157
+#: templates/table/relation/foreign_key_row.phtml:157
 msgid "+ Add column"
 msgstr "+ Lisa veerg"
 
+#: templates/table/search/options.phtml:8
+msgid "Select columns (at least one):"
+msgstr "Vali veerud (vähemalt üks):"
+
+#: templates/table/search/options.phtml:37
+msgid "Add search conditions (body of the \"where\" clause):"
+msgstr "Lisa otsingu tingimusi (\"WHERE\" klausel):"
+
+#: templates/table/search/options.phtml:45
+msgid "Number of rows per page"
+msgstr "Ridade hulk lehe kohta"
+
+#: templates/table/search/options.phtml:56
+msgid "Display order:"
+msgstr "Näitamise järjekord:"
+
+#: templates/table/search/options_zoom.phtml:6
+msgid "Use this column to label each point"
+msgstr "Kasuta seda veergu iga punkti nimetamiseks"
+
+#: templates/table/search/options_zoom.phtml:35
+msgid "Maximum rows to plot"
+msgstr "Suurim ridade hulk diagrammis"
+
+#: templates/table/search/replace_preview.phtml:13
+msgid "Find and replace - preview"
+msgstr "Leia ja asenda eelvaade"
+
+#: templates/table/search/replace_preview.phtml:18
+msgid "Original string"
+msgstr "Algne tekst"
+
+#: templates/table/search/replace_preview.phtml:19
+msgid "Replaced string"
+msgstr "Asendatud tekst"
+
+#: templates/table/search/replace_preview.phtml:40
+msgid "Replace"
+msgstr "Asenda"
+
+#: templates/table/search/rows_zoom.phtml:16
+msgid "Additional search criteria"
+msgstr "Täiendav otsingu kriteerium"
+
+#: templates/table/search/search_and_replace.phtml:3
+msgid "Replace with:"
+msgstr "Asenda:"
+
+#: templates/table/search/search_and_replace.phtml:22
+msgid "Use regular expression"
+msgstr "Kasuta regulaaravaldist"
+
+#: templates/table/search/selection_form.phtml:12
+msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
+msgstr ""
+"Teosta kahe erineva veergu jaoks \"päring näite alusel\" (metamärk: \"%\")"
+
+#: templates/table/search/selection_form.phtml:34
+msgid "Do a \"query by example\" (wildcard: \"%\")"
+msgstr "Teosta \"päring näite alusel\" (metamärk: \"%\")"
+
+#: templates/table/search/zoom_result_form.phtml:7
+msgid "Browse/Edit the points"
+msgstr "Sirvi/Muuda punkte"
+
+#: templates/table/search/zoom_result_form.phtml:15
+msgid "How to use"
+msgstr "Kuidas kasutada"
+
+#: templates/table/search/zoom_result_form.phtml:23
+msgid "Reset zoom"
+msgstr "Lähtesta suum"
+
+#: templates/table/secondary_tabs.phtml:14
+msgid "Relation view"
+msgstr "Seoste vaade"
+
+#: templates/table/structure/actions_in_table_structure.phtml:14
+#, php-format
+msgid "A primary key has been added on %s."
+msgstr "Tabelile %s lisati primaarvõti."
+
+#: templates/table/structure/actions_in_table_structure.phtml:34
+#: templates/table/structure/actions_in_table_structure.phtml:54
+#: templates/table/structure/actions_in_table_structure.phtml:79
+#: templates/table/structure/actions_in_table_structure.phtml:101
+#, php-format
+msgid "An index has been added on %s."
+msgstr "Veerule %s lisati index."
+
+#: templates/table/structure/actions_in_table_structure.phtml:130
+#: templates/table/structure/check_all_table_column.phtml:59
+msgid "Remove from central columns"
+msgstr "Eemalda kesksest nimekirjast"
+
+#: templates/table/structure/actions_in_table_structure.phtml:138
+#: templates/table/structure/check_all_table_column.phtml:55
+msgid "Add to central columns"
+msgstr "Lisa kesksesse nimekirja"
+
+#: templates/table/structure/add_column.phtml:7
+#, php-format
+msgid "Add %s column(s)"
+msgstr "Lisa %s veerg(u)"
+
+#: templates/table/structure/add_column.phtml:12
+msgid "at beginning of table"
+msgstr "tabeli alguses"
+
+#: templates/table/structure/display_structure.phtml:140 view_create.php:181
+msgid "Edit view"
+msgstr "Muuda vaadet"
+
+#: templates/table/structure/display_table_stats.phtml:9
+msgid "Space usage"
+msgstr "Ruumi kasutus"
+
+#: templates/table/structure/display_table_stats.phtml:32
+msgid "Effective"
+msgstr "Efektiivne"
+
+#: templates/table/structure/move_columns_dialog.phtml:1
+#: templates/table/structure/optional_action_links.phtml:21
+msgid "Move columns"
+msgstr "Liiguta veergusid"
+
+#: templates/table/structure/move_columns_dialog.phtml:2
+msgid "Move the columns by dragging them up and down."
+msgstr "Veergusid saad liigutada nende lohistamisega üles ja alla."
+
+#: templates/table/structure/optional_action_links.phtml:9
+msgid "Propose table structure"
+msgstr "Soovita tabeli struktuuri"
+
+#: templates/table/structure/optional_action_links.phtml:24
+msgid "Improve table structure"
+msgstr "Parenda tabeli struktuuri"
+
+#: templates/table/structure/optional_action_links.phtml:30
+msgid "Track view"
+msgstr "Jälgi vaadet"
+
+#: templates/table/structure/row_stats_table.phtml:3
+msgid "Row statistics"
+msgstr "Rea statistika"
+
+#: templates/table/structure/row_stats_table.phtml:9
+msgid "static"
+msgstr "staatiline"
+
+#: templates/table/structure/row_stats_table.phtml:11
+msgid "dynamic"
+msgstr "dünaamiline"
+
+#: templates/table/structure/row_stats_table.phtml:22
+msgid "partitioned"
+msgstr "partitsioneeritud"
+
+#: templates/table/structure/row_stats_table.phtml:54
+msgid "Row length"
+msgstr "Rea pikkus"
+
+#: templates/table/structure/row_stats_table.phtml:66
+msgid "Row size"
+msgstr "Rea laius"
+
+#: templates/table/structure/row_stats_table.phtml:73
+msgid "Next autoindex"
+msgstr "Järgmine automaatne indeks"
+
+#: templates/table/structure/table_structure_row.phtml:46
+#, php-format
+msgid "Column %s has been dropped."
+msgstr "Veerg %s on kustutatud."
+
 #: themes.php:17 themes.php:22
 msgid "Theme"
 msgstr "Välimus"
@@ -16707,6 +16727,9 @@ msgstr ""
 msgid "concurrent_insert is set to 0"
 msgstr "concurrent_insert väärtuseks on määratud 0"
 
+#~ msgid "Read as multibytes"
+#~ msgstr "Loe mitmebaidistena"
+
 #~ msgid "Relational display column"
 #~ msgstr "Seose näitamise veerg"
 
diff --git a/po/eu.po b/po/eu.po
index 3150b2904b..8f99d22f08 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 4.5.0-dev\n"
 "Report-Msgid-Bugs-To: developers@phpmyadmin.net\n"
-"POT-Creation-Date: 2015-08-08 13:53-0400\n"
+"POT-Creation-Date: 2015-08-12 08:10-0400\n"
 "PO-Revision-Date: 2014-03-31 14:23+0200\n"
 "Last-Translator: Michal Čihař <michal@cihar.com>\n"
 "Language-Team: Basque <https://hosted.weblate.org/projects/phpmyadmin/master/"
@@ -58,7 +58,7 @@ msgid "Table comments:"
 msgstr "Taularen iruzkinak"
 
 #: db_datadict.php:104 libraries/Index.class.php:699
-#: libraries/insert_edit.lib.php:1567
+#: libraries/insert_edit.lib.php:1565
 #: libraries/navigation/Nodes/Node_Column.class.php:30
 #: libraries/plugins/export/ExportHtmlword.class.php:280
 #: libraries/plugins/export/ExportHtmlword.class.php:375
@@ -72,13 +72,14 @@ msgstr "Taularen iruzkinak"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1023
 #: libraries/tracking.lib.php:879 libraries/tracking.lib.php:975
 #: templates/columns_definitions/column_name.phtml:18
-#: templates/index_form.phtml:124 templates/table/table_header.phtml:6
-#: templates/table/zoom_result_form.phtml:33
-#: templates/tbl_relation/common_form.phtml:10
-#: templates/tbl_relation/common_form.phtml:43
-#: templates/tbl_relation/foreign_key_row.phtml:194
-#: templates/tbl_relation/foreign_key_row.phtml:206
-#: templates/tbl_relation/internal_relational_row.phtml:71
+#: templates/table/index_form.phtml:124
+#: templates/table/relation/common_form.phtml:10
+#: templates/table/relation/common_form.phtml:43
+#: templates/table/relation/foreign_key_row.phtml:194
+#: templates/table/relation/foreign_key_row.phtml:206
+#: templates/table/relation/internal_relational_row.phtml:71
+#: templates/table/search/table_header.phtml:6
+#: templates/table/search/zoom_result_form.phtml:33
 msgid "Column"
 msgstr "Zutabea"
 
@@ -96,21 +97,21 @@ msgstr "Zutabea"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1001
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1024
 #: libraries/rte/rte_list.lib.php:75 libraries/rte/rte_list.lib.php:103
-#: libraries/rte/rte_routines.lib.php:802
-#: libraries/rte/rte_routines.lib.php:831
-#: libraries/rte/rte_routines.lib.php:1493
+#: libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_routines.lib.php:922
+#: libraries/rte/rte_routines.lib.php:1584
 #: libraries/server_privileges.lib.php:2369 libraries/tracking.lib.php:880
 #: libraries/tracking.lib.php:972
 #: templates/columns_definitions/table_fields_definitions.phtml:11
-#: templates/structure/table_header.phtml:48
-#: templates/structure/table_structure_header.phtml:6
-#: templates/table/table_header.phtml:7
+#: templates/database/structure/table_header.phtml:48
+#: templates/table/search/table_header.phtml:7
+#: templates/table/structure/table_structure_header.phtml:6
 msgid "Type"
 msgstr "Mota"
 
 #: db_datadict.php:106 libraries/Index.class.php:702
 #: libraries/central_columns.lib.php:708
-#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1576
+#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1574
 #: libraries/plugins/export/ExportHtmlword.class.php:286
 #: libraries/plugins/export/ExportHtmlword.class.php:381
 #: libraries/plugins/export/ExportLatex.class.php:509
@@ -123,8 +124,8 @@ msgstr "Mota"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1026
 #: libraries/tracking.lib.php:882 libraries/tracking.lib.php:978
 #: templates/columns_definitions/table_fields_definitions.phtml:39
-#: templates/structure/table_structure_header.phtml:9
-#: templates/table/zoom_result_form.phtml:34
+#: templates/table/search/zoom_result_form.phtml:34
+#: templates/table/structure/table_structure_header.phtml:9
 msgid "Null"
 msgstr "Nulua"
 
@@ -142,8 +143,8 @@ msgstr "Nulua"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1027
 #: libraries/replication_gui.lib.php:153 libraries/tracking.lib.php:883
 #: templates/columns_definitions/table_fields_definitions.phtml:25
-#: templates/structure/body_for_table_summary.phtml:55
-#: templates/structure/table_structure_header.phtml:10
+#: templates/database/structure/body_for_table_summary.phtml:55
+#: templates/table/structure/table_structure_header.phtml:10
 msgid "Default"
 msgstr "Lehenetsia"
 
@@ -171,19 +172,19 @@ msgid "Comments"
 msgstr "Iruzkinak"
 
 #: db_datadict.php:146
-#: libraries/controllers/StructureController.class.php:1960
-#: libraries/controllers/StructureController.class.php:1965
+#: libraries/controllers/TableStructureController.class.php:951
+#: libraries/controllers/TableStructureController.class.php:956
 #: libraries/tracking.lib.php:922
 #: templates/columns_definitions/column_indexes.phtml:6
-#: templates/structure/check_all_table_column.phtml:22
-#: templates/structure/display_structure.phtml:74
+#: templates/table/structure/check_all_table_column.phtml:22
+#: templates/table/structure/display_structure.phtml:74
 msgid "Primary"
 msgstr "Lehen mailakoa"
 
 #: db_datadict.php:156 js/messages.php:317 libraries/Index.class.php:567
 #: libraries/Index.class.php:606 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261 libraries/mult_submits.lib.php:403
+#: libraries/config/FormDisplay.tpl.php:272 libraries/mult_submits.lib.php:403
 #: libraries/mult_submits.lib.php:417
 #: libraries/plugins/export/ExportHtmlword.class.php:630
 #: libraries/plugins/export/ExportLatex.class.php:589
@@ -199,20 +200,20 @@ msgstr "Lehen mailakoa"
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1010 libraries/tracking.lib.php:1015
 #: prefs_manage.php:140 templates/prefs_autoload.phtml:15
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "No"
 msgstr "Ez"
 
 #: db_datadict.php:156 js/messages.php:443 libraries/Index.class.php:568
 #: libraries/Index.class.php:605 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261
-#: libraries/controllers/StructureController.class.php:1344
-#: libraries/controllers/StructureController.class.php:2223
-#: libraries/controllers/StructureController.class.php:2232
-#: libraries/controllers/StructureController.class.php:2237
-#: libraries/controllers/StructureController.class.php:2242
-#: libraries/controllers/StructureController.class.php:2247
+#: libraries/config/FormDisplay.tpl.php:272
+#: libraries/controllers/TableStructureController.class.php:539
+#: libraries/controllers/TableStructureController.class.php:1201
+#: libraries/controllers/TableStructureController.class.php:1210
+#: libraries/controllers/TableStructureController.class.php:1215
+#: libraries/controllers/TableStructureController.class.php:1220
+#: libraries/controllers/TableStructureController.class.php:1225
 #: libraries/mult_submits.inc.php:82 libraries/mult_submits.inc.php:178
 #: libraries/mult_submits.lib.php:339 libraries/mult_submits.lib.php:372
 #: libraries/mult_submits.lib.php:401 libraries/mult_submits.lib.php:415
@@ -221,8 +222,8 @@ msgstr "Ez"
 #: libraries/plugins/export/ExportOdt.class.php:756
 #: libraries/plugins/export/ExportTexytext.class.php:567
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1077
-#: libraries/server_databases.lib.php:464
-#: libraries/server_databases.lib.php:474
+#: libraries/server_databases.lib.php:475
+#: libraries/server_databases.lib.php:485
 #: libraries/server_privileges.lib.php:2546
 #: libraries/server_privileges.lib.php:2727
 #: libraries/server_privileges.lib.php:2748
@@ -232,7 +233,7 @@ msgstr "Ez"
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1008 libraries/tracking.lib.php:1013
 #: prefs_manage.php:138 templates/prefs_autoload.phtml:14
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "Yes"
 msgstr "Bai"
 
@@ -242,7 +243,7 @@ msgstr "Ikusi datu-basearen iraulketa (eskema)"
 
 #: db_export.php:37 db_tracking.php:90 export.php:382
 #: libraries/DBQbe.class.php:326
-#: libraries/controllers/StructureController.class.php:231
+#: libraries/controllers/DatabaseStructureController.class.php:170
 #: libraries/navigation/NavigationTree.class.php:897
 msgid "No tables found in database."
 msgstr "Ez da taularik aurkitu datu-basean."
@@ -253,14 +254,14 @@ msgstr "Ez da taularik aurkitu datu-basean."
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:26
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:120
-#: templates/structure/show_create.phtml:18
+#: templates/database/structure/show_create.phtml:18
 msgid "Tables"
 msgstr "Taulak"
 
 #: db_export.php:52 libraries/Menu.class.php:317 libraries/Menu.class.php:425
-#: libraries/Util.class.php:3333 libraries/Util.class.php:3343
-#: libraries/Util.class.php:3349 libraries/Util.class.php:3629
-#: libraries/Util.class.php:4327 libraries/Util.class.php:4344
+#: libraries/Util.class.php:3339 libraries/Util.class.php:3349
+#: libraries/Util.class.php:3355 libraries/Util.class.php:3635
+#: libraries/Util.class.php:4333 libraries/Util.class.php:4350
 #: libraries/central_columns.lib.php:728 libraries/config.values.php:39
 #: libraries/config.values.php:47 libraries/config.values.php:109
 #: libraries/config.values.php:115 libraries/config/setup.forms.php:323
@@ -274,7 +275,7 @@ msgstr "Taulak"
 #: libraries/navigation/Nodes/Node_Table.class.php:283
 #: libraries/server_privileges.lib.php:1141 libraries/tracking.lib.php:874
 #: templates/columns_definitions/table_fields_definitions.phtml:3
-#: templates/designer/table_list.phtml:28
+#: templates/database/designer/table_list.phtml:28
 msgid "Structure"
 msgstr "Egitura"
 
@@ -286,7 +287,7 @@ msgstr "Egitura"
 #: libraries/config/user_preferences.forms.php:292
 #: libraries/config/user_preferences.forms.php:297
 #: libraries/server_privileges.lib.php:1140
-#: templates/structure/display_table_stats.phtml:12
+#: templates/table/structure/display_table_stats.phtml:12
 msgid "Data"
 msgstr "Datuak"
 
@@ -371,10 +372,10 @@ msgstr "Taulak jarraipenarekin"
 #: libraries/server_privileges.lib.php:2908
 #: libraries/server_privileges.lib.php:3145
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4346
-#: templates/structure/table_header.phtml:21
-#: templates/tbl_relation/foreign_key_row.phtml:176
-#: templates/tbl_relation/internal_relational_row.phtml:63
+#: libraries/server_privileges.lib.php:4372
+#: templates/database/structure/table_header.phtml:21
+#: templates/table/relation/foreign_key_row.phtml:176
+#: templates/table/relation/internal_relational_row.phtml:63
 msgid "Table"
 msgstr "Taula"
 
@@ -391,7 +392,7 @@ msgid "Updated"
 msgstr "Eguneratua"
 
 #: db_tracking.php:130 js/messages.php:243 libraries/Menu.class.php:552
-#: libraries/Util.class.php:4314 libraries/config.values.php:104
+#: libraries/Util.class.php:4320 libraries/config.values.php:104
 #: libraries/rte/rte_events.lib.php:393 libraries/rte/rte_list.lib.php:101
 #: libraries/server_status_processes.lib.php:92 libraries/tracking.lib.php:279
 msgid "Status"
@@ -400,14 +401,15 @@ msgstr "Egoera"
 #: db_tracking.php:131 db_tracking.php:290 libraries/Index.class.php:693
 #: libraries/central_columns.lib.php:687 libraries/rte/rte_list.lib.php:74
 #: libraries/rte/rte_list.lib.php:89 libraries/rte/rte_list.lib.php:102
-#: libraries/server_databases.lib.php:398
+#: libraries/server_databases.lib.php:409
 #: libraries/server_privileges.lib.php:2372
 #: libraries/server_privileges.lib.php:3166
 #: libraries/server_privileges.lib.php:3342
 #: libraries/server_user_groups.lib.php:82
 #: libraries/server_variables.lib.php:189 libraries/tracking.lib.php:280
-#: libraries/tracking.lib.php:793 templates/structure/table_header.phtml:30
-#: templates/structure/table_structure_header.phtml:23
+#: libraries/tracking.lib.php:793
+#: templates/database/structure/table_header.phtml:30
+#: templates/table/structure/table_structure_header.phtml:23
 msgid "Action"
 msgstr "Ekintza"
 
@@ -451,7 +453,7 @@ msgid "Untracked tables"
 msgstr "Jarraipen gabeko taulak"
 
 #: db_tracking.php:305 db_tracking.php:336
-#: templates/structure/optional_action_links.phtml:17
+#: templates/table/structure/optional_action_links.phtml:17
 msgid "Track table"
 msgstr "Taularen jarraipena egin"
 
@@ -501,7 +503,7 @@ msgid "Value for the column \"%s\""
 msgstr "\"%s\" zutaberako balioa"
 
 #: gis_data_editor.php:146
-#: templates/gis_visualization/gis_visualization.phtml:37
+#: templates/table/gis_visualization/gis_visualization.phtml:37
 msgid "Use OpenStreetMaps as Base Layer"
 msgstr "Erabili OpenStreetMaps Oinarri geruza moduan"
 
@@ -591,35 +593,35 @@ msgstr "Gehitu geometria"
 #: libraries/display_change_password.lib.php:162
 #: libraries/display_export.lib.php:402 libraries/display_export.lib.php:408
 #: libraries/display_import.lib.php:392 libraries/index.lib.php:44
-#: libraries/insert_edit.lib.php:1546 libraries/insert_edit.lib.php:1583
+#: libraries/insert_edit.lib.php:1544 libraries/insert_edit.lib.php:1581
 #: libraries/normalization.lib.php:165 libraries/normalization.lib.php:821
 #: libraries/operations.lib.php:38 libraries/operations.lib.php:108
 #: libraries/operations.lib.php:263 libraries/operations.lib.php:306
 #: libraries/operations.lib.php:801 libraries/operations.lib.php:874
 #: libraries/operations.lib.php:923 libraries/operations.lib.php:1337
 #: libraries/operations.lib.php:1658
-#: libraries/plugins/auth/AuthenticationCookie.class.php:244
+#: libraries/plugins/auth/AuthenticationCookie.class.php:232
 #: libraries/replication_gui.lib.php:122 libraries/replication_gui.lib.php:161
 #: libraries/replication_gui.lib.php:324 libraries/replication_gui.lib.php:461
 #: libraries/replication_gui.lib.php:906 libraries/rte/rte_events.lib.php:509
-#: libraries/rte/rte_routines.lib.php:969
-#: libraries/rte/rte_routines.lib.php:1581
+#: libraries/rte/rte_routines.lib.php:1060
+#: libraries/rte/rte_routines.lib.php:1672
 #: libraries/rte/rte_triggers.lib.php:396 libraries/server_bin_log.lib.php:61
 #: libraries/server_privileges.lib.php:705
 #: libraries/server_privileges.lib.php:2106
 #: libraries/server_privileges.lib.php:2872
 #: libraries/server_privileges.lib.php:3553
-#: libraries/server_privileges.lib.php:4627
+#: libraries/server_privileges.lib.php:4653
 #: libraries/server_user_groups.lib.php:285
 #: libraries/sql_query_form.lib.php:369 libraries/sql_query_form.lib.php:429
 #: libraries/tracking.lib.php:533 libraries/tracking.lib.php:653
 #: prefs_manage.php:277 prefs_manage.php:355
 #: templates/columns_definitions/column_definitions_form.phtml:59
-#: templates/header_location.phtml:17 templates/index_form.phtml:238
+#: templates/database/create_table.phtml:21 templates/header_location.phtml:28
 #: templates/startAndNumberOfRowsPanel.phtml:14
-#: templates/structure/add_column.phtml:25
-#: templates/table/create_table.phtml:21
-#: templates/table/selection_form.phtml:75 view_create.php:275
+#: templates/table/index_form.phtml:238
+#: templates/table/search/selection_form.phtml:75
+#: templates/table/structure/add_column.phtml:25 view_create.php:275
 #: view_operations.php:106
 msgid "Go"
 msgstr "Joan"
@@ -708,7 +710,7 @@ msgstr ""
 msgid "Could not load import plugins, please check your installation!"
 msgstr ""
 
-#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1466
+#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1460
 #, fuzzy, php-format
 #| msgid "Bookmark %s created"
 msgid "Bookmark %s has been created."
@@ -743,12 +745,12 @@ msgstr ""
 msgid "Back"
 msgstr "Itzuli"
 
-#: index.php:148 libraries/Footer.class.php:70
+#: index.php:149 libraries/Footer.class.php:70
 #, fuzzy
 msgid "phpMyAdmin Demo Server"
 msgstr "phpMyAdmin dokumentazioa"
 
-#: index.php:152
+#: index.php:153
 #, php-format
 msgid ""
 "You are using the demo server. You can do anything here, but please do not "
@@ -756,47 +758,47 @@ msgid ""
 "at %s."
 msgstr ""
 
-#: index.php:162
+#: index.php:163
 #, fuzzy
 #| msgid "General relation features"
 msgid "General Settings"
 msgstr "Erlazioen ezaaugarri orokorrak"
 
-#: index.php:190 libraries/display_change_password.lib.php:50
+#: index.php:191 libraries/display_change_password.lib.php:50
 #: libraries/display_change_password.lib.php:53 user_password.php:247
 msgid "Change password"
 msgstr "Pasahitza aldatu"
 
-#: index.php:206
+#: index.php:207
 msgid "Server connection collation"
 msgstr ""
 
-#: index.php:228
+#: index.php:229
 msgid "Appearance Settings"
 msgstr ""
 
-#: index.php:258 prefs_manage.php:285
+#: index.php:259 prefs_manage.php:285
 #, fuzzy
 #| msgid "General relation features"
 msgid "More settings"
 msgstr "Erlazioen ezaaugarri orokorrak"
 
-#: index.php:279
+#: index.php:280
 #, fuzzy
 #| msgid "Databases"
 msgid "Database server"
 msgstr "Datu-baseak"
 
-#: index.php:282 libraries/plugins/auth/AuthenticationCookie.class.php:181
+#: index.php:283 libraries/plugins/auth/AuthenticationCookie.class.php:169
 msgid "Server:"
 msgstr "Zerbitzaria:"
 
-#: index.php:286
+#: index.php:287
 #, fuzzy
 msgid "Server type:"
 msgstr "Zerbitzariaren hautaketa"
 
-#: index.php:290 libraries/plugins/export/ExportLatex.class.php:212
+#: index.php:291 libraries/plugins/export/ExportLatex.class.php:212
 #: libraries/plugins/export/ExportSql.class.php:687
 #: libraries/plugins/export/ExportXml.class.php:189
 #, fuzzy
@@ -804,85 +806,85 @@ msgstr "Zerbitzariaren hautaketa"
 msgid "Server version:"
 msgstr "Zerbitzariaren bertsioa"
 
-#: index.php:296
+#: index.php:297
 #, fuzzy
 msgid "Protocol version:"
 msgstr "Zerbitzariaren bertsioa"
 
-#: index.php:300
+#: index.php:301
 #, fuzzy
 #| msgid "User"
 msgid "User:"
 msgstr "Erabiltzailea"
 
-#: index.php:305
+#: index.php:306
 #, fuzzy
 msgid "Server charset:"
 msgstr "Zerbitzariaren hautaketa"
 
-#: index.php:320
+#: index.php:321
 msgid "Web server"
 msgstr ""
 
-#: index.php:331
+#: index.php:332
 #, fuzzy
 #| msgid "Database comment"
 msgid "Database client version:"
 msgstr "Datu-basearen iruzkina: "
 
-#: index.php:335
+#: index.php:336
 #, fuzzy
 msgid "PHP extension:"
 msgstr "PHP Bertsioa"
 
-#: index.php:349
+#: index.php:350
 #, fuzzy
 #| msgid "PHP Version"
 msgid "PHP version:"
 msgstr "PHP Bertsioa"
 
-#: index.php:360
+#: index.php:361
 msgid "Show PHP information"
 msgstr "PHP informazioa erakutsi"
 
-#: index.php:383
+#: index.php:384
 #, fuzzy
 msgid "Version information:"
 msgstr "Saioa hasteko informazioa"
 
-#: index.php:392 libraries/Util.class.php:432 libraries/Util.class.php:495
-#: libraries/config/FormDisplay.tpl.php:151
+#: index.php:393 libraries/Util.class.php:432 libraries/Util.class.php:495
+#: libraries/config/FormDisplay.tpl.php:162
 #: libraries/display_export.lib.php:577 libraries/engines/pbxt.lib.php:162
 #: libraries/navigation/NavigationHeader.class.php:196
 #: libraries/server_variables.lib.php:160
 msgid "Documentation"
 msgstr "Dokumentazioa"
 
-#: index.php:399
+#: index.php:400
 msgid "Wiki"
 msgstr ""
 
-#: index.php:408
+#: index.php:409
 msgid "Official Homepage"
 msgstr "phpMyAdmin-en webgune ofiziala"
 
-#: index.php:415
+#: index.php:416
 #, fuzzy
 #| msgid "Attributes"
 msgid "Contribute"
 msgstr "Atributuak"
 
-#: index.php:422
+#: index.php:423
 msgid "Get support"
 msgstr ""
 
-#: index.php:429
+#: index.php:430
 #, fuzzy
 #| msgid "No change"
 msgid "List of changes"
 msgstr "Aldaketarik ez"
 
-#: index.php:451
+#: index.php:452
 #, fuzzy
 #| msgid ""
 #| "Your configuration file contains settings (root with no password) that "
@@ -900,21 +902,21 @@ msgstr ""
 "lehenetsitako balio hauekin ari da lanean; atzipen-saiakera arrotzei irekita "
 "beraz. Segurtasun-zulo hau konpondu beharko zenuke."
 
-#: index.php:468
+#: index.php:469
 msgid ""
 "You have enabled mbstring.func_overload in your PHP configuration. This "
 "option is incompatible with phpMyAdmin and might cause some data to be "
 "corrupted!"
 msgstr ""
 
-#: index.php:483
+#: index.php:484
 msgid ""
 "The mbstring PHP extension was not found and you seem to be using a "
 "multibyte charset. Without the mbstring extension phpMyAdmin is unable to "
 "split strings correctly and it may result in unexpected results."
 msgstr ""
 
-#: index.php:500
+#: index.php:501
 msgid ""
 "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini."
 "session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower than "
@@ -922,19 +924,19 @@ msgid ""
 "expire sooner than configured in phpMyAdmin."
 msgstr ""
 
-#: index.php:519
+#: index.php:520
 msgid ""
 "Login cookie store is lower than cookie validity configured in phpMyAdmin, "
 "because of this, your login will expire sooner than configured in phpMyAdmin."
 msgstr ""
 
-#: index.php:535
+#: index.php:536
 msgid "The configuration file now needs a secret passphrase (blowfish_secret)."
 msgstr ""
 "Konfigurazio-fitxategiak orain ezkutuko pasahitz bat behar du "
 "(blowfish_secret)."
 
-#: index.php:548
+#: index.php:549
 msgid ""
 "Directory [code]config[/code], which is used by the setup script, still "
 "exists in your phpMyAdmin directory. It is strongly recommended to remove it "
@@ -942,7 +944,7 @@ msgid ""
 "may be compromised by unauthorized people downloading your configuration."
 msgstr ""
 
-#: index.php:564
+#: index.php:565
 #, fuzzy, php-format
 #| msgid ""
 #| " additional features for working with linked tables have been ctivated. "
@@ -954,19 +956,19 @@ msgstr ""
 "Estekatutako taulekin lan egiteko hobespen gehigarriak ezgaitu dira . "
 "Zergatia jakiteko egizu klik %shemen%s."
 
-#: index.php:571
+#: index.php:572
 msgid ""
 "Or alternately go to 'Operations' tab of any database to set it up there."
 msgstr ""
 
-#: index.php:620
+#: index.php:621
 #, php-format
 msgid ""
 "Your PHP MySQL library version %s differs from your MySQL server version %s. "
 "This may cause unpredictable behavior."
 msgstr ""
 
-#: index.php:648
+#: index.php:649
 #, php-format
 msgid ""
 "Server running with Suhosin. Please refer to %sdocumentation%s for possible "
@@ -1131,8 +1133,8 @@ msgstr ""
 msgid "Save & Close"
 msgstr "Bidali"
 
-#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:404
-#: libraries/insert_edit.lib.php:1550 prefs_manage.php:361
+#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:415
+#: libraries/insert_edit.lib.php:1548 prefs_manage.php:361
 #: prefs_manage.php:372
 msgid "Reset"
 msgstr "Reset egin"
@@ -1173,7 +1175,7 @@ msgstr "Indizea"
 msgid "Edit Index"
 msgstr "Editatu hurrengo lerroa"
 
-#: js/messages.php:99 templates/index_form.phtml:232
+#: js/messages.php:99 templates/table/index_form.phtml:232
 #, fuzzy, php-format
 #| msgid "Add %s field(s)"
 msgid "Add %s column(s) to index"
@@ -1203,15 +1205,16 @@ msgstr "Eremuak honekin mugatuta:"
 msgid "Please select column(s) for the index."
 msgstr "Gehitu %s zutabe"
 
-#: js/messages.php:106 templates/structure/add_column.phtml:1
+#: js/messages.php:106 templates/table/structure/add_column.phtml:1
 #, fuzzy
 #| msgid "You have to choose at least one column to display"
 msgid "You have to add at least one column."
 msgstr "Gutxienez bistaratzeko Zutabe bat hautatu duzu."
 
-#: js/messages.php:109 libraries/insert_edit.lib.php:1548
+#: js/messages.php:109 libraries/insert_edit.lib.php:1546
 #: templates/columns_definitions/column_definitions_form.phtml:162
-#: templates/index_form.phtml:237 templates/tbl_relation/common_form.phtml:106
+#: templates/table/index_form.phtml:237
+#: templates/table/relation/common_form.phtml:106
 msgid "Preview SQL"
 msgstr ""
 
@@ -1234,7 +1237,7 @@ msgid "SQL query:"
 msgstr "SQL kontsulta"
 
 #. l10n: Default label for the y-Axis of Charts
-#: js/messages.php:118 templates/tbl_chart.phtml:109
+#: js/messages.php:118 templates/table/chart/tbl_chart.phtml:109
 #, fuzzy
 #| msgid "Value"
 msgid "Y Values"
@@ -1404,7 +1407,7 @@ msgstr ""
 msgid "Bytes received"
 msgstr "Jasota"
 
-#: js/messages.php:169 libraries/server_status.lib.php:226
+#: js/messages.php:169 libraries/server_status.lib.php:235
 msgid "Connections"
 msgstr "Konexioak"
 
@@ -1464,12 +1467,12 @@ msgstr "%s taula"
 msgid "Questions"
 msgstr "Eragiketak"
 
-#: js/messages.php:184 libraries/server_status.lib.php:134
+#: js/messages.php:184 libraries/server_status.lib.php:143
 msgid "Traffic"
 msgstr "Trafikoa"
 
 #: js/messages.php:185 libraries/Menu.class.php:586
-#: libraries/Util.class.php:4318 libraries/server_status_monitor.lib.php:257
+#: libraries/Util.class.php:4324 libraries/server_status_monitor.lib.php:257
 #, fuzzy
 #| msgid "General relation features"
 msgid "Settings"
@@ -1491,8 +1494,9 @@ msgstr ""
 #: libraries/server_status_monitor.lib.php:236
 #: libraries/server_status_processes.lib.php:308
 #: templates/columns_definitions/transformation.phtml:4
-#: templates/designer/options_panel.phtml:178
-#: templates/table/options_zoom.phtml:12 templates/table/rows_zoom.phtml:26
+#: templates/database/designer/options_panel.phtml:178
+#: templates/table/search/options_zoom.phtml:12
+#: templates/table/search/rows_zoom.phtml:26
 msgid "None"
 msgstr "Batez"
 
@@ -1794,8 +1798,8 @@ msgstr ""
 
 #: js/messages.php:270 libraries/Menu.class.php:352
 #: libraries/Menu.class.php:455 libraries/Menu.class.php:582
-#: libraries/Util.class.php:4317 libraries/Util.class.php:4332
-#: libraries/Util.class.php:4349 libraries/config/messages.inc.php:258
+#: libraries/Util.class.php:4323 libraries/Util.class.php:4338
+#: libraries/Util.class.php:4355 libraries/config/messages.inc.php:258
 #: libraries/display_import.lib.php:105
 #: libraries/server_status_monitor.lib.php:318 prefs_manage.php:238
 #: setup/frames/menu.inc.php:26
@@ -1864,13 +1868,13 @@ msgid "Formatting SQL..."
 msgstr ""
 
 #: js/messages.php:293 libraries/server_variables.lib.php:157
-#: templates/designer/aggregate_query_panel.phtml:63
-#: templates/designer/delete_relation_panel.phtml:28
-#: templates/designer/having_query_panel.phtml:117
-#: templates/designer/new_relation_panel.phtml:88
-#: templates/designer/options_panel.phtml:253
-#: templates/designer/rename_to_panel.phtml:45
-#: templates/designer/where_query_panel.phtml:83
+#: templates/database/designer/aggregate_query_panel.phtml:63
+#: templates/database/designer/delete_relation_panel.phtml:28
+#: templates/database/designer/having_query_panel.phtml:117
+#: templates/database/designer/new_relation_panel.phtml:88
+#: templates/database/designer/options_panel.phtml:253
+#: templates/database/designer/rename_to_panel.phtml:45
+#: templates/database/designer/where_query_panel.phtml:83
 msgid "Cancel"
 msgstr ""
 
@@ -1880,7 +1884,7 @@ msgstr ""
 msgid "Page-related settings"
 msgstr "Erlazioen ezaaugarri orokorrak"
 
-#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:402
+#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:413
 msgid "Apply"
 msgstr ""
 
@@ -1918,8 +1922,8 @@ msgstr ""
 msgid "Error text: %s"
 msgstr ""
 
-#: js/messages.php:307 libraries/db_common.inc.php:68
-#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:450
+#: js/messages.php:307 libraries/db_common.inc.php:69
+#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:461
 msgid "No databases selected."
 msgstr "Ez dago datu-baserik aukeratuta."
 
@@ -1931,12 +1935,13 @@ msgstr ""
 msgid "Adding Primary Key"
 msgstr ""
 
-#: js/messages.php:310 templates/designer/aggregate_query_panel.phtml:59
-#: templates/designer/having_query_panel.phtml:113
-#: templates/designer/new_relation_panel.phtml:87
-#: templates/designer/options_panel.phtml:252
-#: templates/designer/rename_to_panel.phtml:41
-#: templates/designer/where_query_panel.phtml:82
+#: js/messages.php:310
+#: templates/database/designer/aggregate_query_panel.phtml:59
+#: templates/database/designer/having_query_panel.phtml:113
+#: templates/database/designer/new_relation_panel.phtml:87
+#: templates/database/designer/options_panel.phtml:252
+#: templates/database/designer/rename_to_panel.phtml:41
+#: templates/database/designer/where_query_panel.phtml:82
 msgid "OK"
 msgstr "Zuzena"
 
@@ -1960,7 +1965,7 @@ msgstr "Datu-baserik ez"
 msgid "Changing Charset"
 msgstr "Karaktere-jokoa"
 
-#: js/messages.php:320 libraries/Util.class.php:3217
+#: js/messages.php:320 libraries/Util.class.php:3223
 msgid "Enable foreign key checks"
 msgstr ""
 
@@ -2004,20 +2009,21 @@ msgstr ""
 #: js/messages.php:334 libraries/DisplayResults.class.php:4834
 #: libraries/DisplayResults.class.php:5092 libraries/Menu.class.php:344
 #: libraries/Menu.class.php:446 libraries/Menu.class.php:578
-#: libraries/Util.class.php:3636 libraries/Util.class.php:3637
-#: libraries/Util.class.php:4316 libraries/Util.class.php:4331
-#: libraries/Util.class.php:4348 libraries/config/messages.inc.php:252
+#: libraries/Util.class.php:3642 libraries/Util.class.php:3643
+#: libraries/Util.class.php:4322 libraries/Util.class.php:4337
+#: libraries/Util.class.php:4354 libraries/config/messages.inc.php:252
 #: libraries/display_export.lib.php:173 libraries/rte/rte_list.lib.php:146
 #: libraries/server_privileges.lib.php:2211
 #: libraries/server_privileges.lib.php:2290
 #: libraries/server_privileges.lib.php:2632
 #: libraries/server_privileges.lib.php:3356
 #: libraries/server_status_monitor.lib.php:322 prefs_manage.php:303
-#: setup/frames/menu.inc.php:27 templates/structure/check_all_tables.phtml:11
+#: setup/frames/menu.inc.php:27
+#: templates/database/structure/check_all_tables.phtml:11
 msgid "Export"
 msgstr "Esportatu"
 
-#: js/messages.php:337 libraries/rte/rte_routines.lib.php:652
+#: js/messages.php:337 libraries/rte/rte_routines.lib.php:743
 msgid "ENUM/SET editor"
 msgstr "ENUM/SET editorea"
 
@@ -2060,7 +2066,7 @@ msgstr "SQL kontsulta"
 #: libraries/Console.class.php:214 libraries/DisplayResults.class.php:3474
 #: libraries/DisplayResults.class.php:4818 libraries/Index.class.php:723
 #: libraries/Util.class.php:706 libraries/Util.class.php:1202
-#: libraries/Util.class.php:3634 libraries/Util.class.php:3635
+#: libraries/Util.class.php:3640 libraries/Util.class.php:3641
 #: libraries/central_columns.lib.php:851
 #: libraries/central_columns.lib.php:1193
 #: libraries/config/messages.inc.php:892
@@ -2078,7 +2084,7 @@ msgstr "Editatu"
 #: libraries/server_user_groups.lib.php:129
 #: libraries/sql_query_form.lib.php:416 libraries/tracking.lib.php:477
 #: setup/frames/index.inc.php:183 setup/frames/index.inc.php:291
-#: templates/designer/delete_relation_panel.phtml:27
+#: templates/database/designer/delete_relation_panel.phtml:27
 msgid "Delete"
 msgstr "Ezabatu"
 
@@ -2262,11 +2268,11 @@ msgid "No dependencies selected!"
 msgstr "Ez dago datu-baserik aukeratuta."
 
 #: js/messages.php:394 libraries/central_columns.lib.php:1214
-#: libraries/insert_edit.lib.php:1458 libraries/server_variables.lib.php:155
+#: libraries/insert_edit.lib.php:1456 libraries/server_variables.lib.php:155
 #: setup/frames/config.inc.php:42 setup/frames/index.inc.php:279
 #: templates/columns_definitions/column_definitions_form.phtml:165
-#: templates/gis_visualization/gis_visualization.phtml:48
-#: templates/tbl_relation/common_form.phtml:107
+#: templates/table/gis_visualization/gis_visualization.phtml:48
+#: templates/table/relation/common_form.phtml:107
 msgid "Save"
 msgstr "Gorde"
 
@@ -2357,8 +2363,8 @@ msgid "Data point content"
 msgstr "Edukinen taula"
 
 #: js/messages.php:430 js/messages.php:562 js/messages.php:579
-#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2573
-#: templates/index_form.phtml:154 templates/index_form.phtml:194
+#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2571
+#: templates/table/index_form.phtml:154 templates/table/index_form.phtml:194
 msgid "Ignore"
 msgstr "Ezikusi"
 
@@ -2417,8 +2423,8 @@ msgstr ""
 msgid "Please select the primary key or a unique key!"
 msgstr ""
 
-#: js/messages.php:457 templates/designer/side_menu.phtml:91
-#: templates/designer/side_menu.phtml:94
+#: js/messages.php:457 templates/database/designer/side_menu.phtml:91
+#: templates/database/designer/side_menu.phtml:94
 #, fuzzy
 #| msgid "Choose field to display"
 msgid "Choose column to display"
@@ -2436,22 +2442,22 @@ msgstr ""
 msgid "Page name"
 msgstr "Orri zenbakia:"
 
-#: js/messages.php:463 templates/designer/side_menu.phtml:56
-#: templates/designer/side_menu.phtml:59
+#: js/messages.php:463 templates/database/designer/side_menu.phtml:56
+#: templates/database/designer/side_menu.phtml:59
 #, fuzzy
 #| msgid "Select Tables"
 msgid "Save page"
 msgstr "Taulak hautatu"
 
-#: js/messages.php:464 templates/designer/side_menu.phtml:63
-#: templates/designer/side_menu.phtml:66
+#: js/messages.php:464 templates/database/designer/side_menu.phtml:63
+#: templates/database/designer/side_menu.phtml:66
 #, fuzzy
 #| msgid "Select Tables"
 msgid "Save page as"
 msgstr "Taulak hautatu"
 
-#: js/messages.php:465 templates/designer/side_menu.phtml:49
-#: templates/designer/side_menu.phtml:52
+#: js/messages.php:465 templates/database/designer/side_menu.phtml:49
+#: templates/database/designer/side_menu.phtml:52
 #, fuzzy
 #| msgctxt "PDF"
 #| msgid "page"
@@ -2464,7 +2470,7 @@ msgstr "Erabilpena"
 msgid "Delete page"
 msgstr "Taulak hautatu"
 
-#: js/messages.php:467 templates/designer/side_menu.phtml:10
+#: js/messages.php:467 templates/database/designer/side_menu.phtml:10
 msgid "Untitled"
 msgstr ""
 
@@ -2584,7 +2590,7 @@ msgstr "Lerro kateak"
 msgid "cancel"
 msgstr ""
 
-#: js/messages.php:499 libraries/server_status.lib.php:271
+#: js/messages.php:499 libraries/server_status.lib.php:280
 msgid "Aborted"
 msgstr "Deuseztatua"
 
@@ -3238,7 +3244,7 @@ msgstr ""
 
 #: js/messages.php:793 libraries/Message.class.php:199
 #: libraries/Util.class.php:654 libraries/core.lib.php:245
-#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1172
+#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1170
 #: tbl_operations.php:229 view_operations.php:63
 msgid "Error"
 msgstr "Errorea"
@@ -3297,8 +3303,8 @@ msgstr "segunduko"
 msgid "per minute"
 msgstr "minutuko"
 
-#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:143
-#: libraries/server_status.lib.php:228
+#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:152
+#: libraries/server_status.lib.php:237
 #: libraries/server_status_queries.lib.php:98
 msgid "per hour"
 msgstr "orduko"
@@ -3316,7 +3322,7 @@ msgstr ""
 msgid "Wrong permissions on configuration file, should not be world writable!"
 msgstr ""
 
-#: libraries/Config.class.php:1799
+#: libraries/Config.class.php:1801
 msgid "Font size"
 msgstr ""
 
@@ -3346,10 +3352,10 @@ msgstr "kontsultan"
 #: libraries/server_privileges.lib.php:2890
 #: libraries/server_privileges.lib.php:3144
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4332
+#: libraries/server_privileges.lib.php:4358
 #: libraries/server_status_processes.lib.php:80
-#: templates/tbl_relation/foreign_key_row.phtml:165
-#: templates/tbl_relation/internal_relational_row.phtml:55
+#: templates/table/relation/foreign_key_row.phtml:165
+#: templates/table/relation/internal_relational_row.phtml:55
 msgid "Database"
 msgstr "Datu-basea"
 
@@ -3454,11 +3460,11 @@ msgstr "SQL-historia"
 #: libraries/plugins/import/ImportMediawiki.class.php:60
 #: libraries/plugins/import/ImportOds.class.php:59
 #: libraries/plugins/import/ImportShp.class.php:57
-#: libraries/plugins/import/ImportSql.class.php:148
+#: libraries/plugins/import/ImportSql.class.php:51
 #: libraries/plugins/import/ImportXml.class.php:58
-#: libraries/rte/rte_routines.lib.php:833 templates/index_form.phtml:49
-#: templates/structure/row_stats_table.phtml:20
-#: templates/table/options.phtml:2
+#: libraries/rte/rte_routines.lib.php:924 templates/table/index_form.phtml:49
+#: templates/table/search/options.phtml:2
+#: templates/table/structure/row_stats_table.phtml:20
 #, fuzzy
 msgid "Options"
 msgstr "Eragiketak"
@@ -3504,7 +3510,8 @@ msgstr "Beherantz"
 msgid "Order:"
 msgstr "Beste"
 
-#: libraries/Console.class.php:289 templates/table/replace_preview.phtml:17
+#: libraries/Console.class.php:289
+#: templates/table/search/replace_preview.phtml:17
 #, fuzzy
 #| msgid "Column"
 msgid "Count"
@@ -3626,9 +3633,9 @@ msgstr "Kopiatutako taulara aldatu"
 #: libraries/operations.lib.php:794 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:191
-#: templates/structure/sortable_header.phtml:21
-#: templates/structure/sortable_header.phtml:38
-#: templates/table/options.phtml:68
+#: templates/database/structure/sortable_header.phtml:21
+#: templates/database/structure/sortable_header.phtml:38
+#: templates/table/search/options.phtml:68
 msgid "Ascending"
 msgstr "Goranzko"
 
@@ -3638,13 +3645,14 @@ msgstr "Goranzko"
 #: libraries/operations.lib.php:797 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:188
-#: templates/structure/sortable_header.phtml:26
-#: templates/structure/sortable_header.phtml:43
-#: templates/table/options.phtml:69
+#: templates/database/structure/sortable_header.phtml:26
+#: templates/database/structure/sortable_header.phtml:43
+#: templates/table/search/options.phtml:69
 msgid "Descending"
 msgstr "Beherantz"
 
-#: libraries/DBQbe.class.php:467 templates/table/search_and_replace.phtml:6
+#: libraries/DBQbe.class.php:467
+#: templates/table/search/search_and_replace.phtml:6
 #, fuzzy
 #| msgid "Column"
 msgid "Column:"
@@ -3825,12 +3833,12 @@ msgstr[0] "%s emaitza <i>%s</i> taulan"
 msgstr[1] "%s emaitzak <i>%s</i> taulan"
 
 #: libraries/DbSearch.class.php:354 libraries/Menu.class.php:311
-#: libraries/Util.class.php:3337 libraries/Util.class.php:3347
-#: libraries/Util.class.php:3623 libraries/Util.class.php:3624
-#: libraries/Util.class.php:4343 libraries/config.values.php:43
+#: libraries/Util.class.php:3343 libraries/Util.class.php:3353
+#: libraries/Util.class.php:3629 libraries/Util.class.php:3630
+#: libraries/Util.class.php:4349 libraries/config.values.php:43
 #: libraries/config.values.php:51 libraries/config.values.php:119
 #: libraries/navigation/Nodes/Node_Table.class.php:295
-#: templates/structure/check_all_table_column.phtml:5
+#: templates/table/structure/check_all_table_column.phtml:5
 msgid "Browse"
 msgstr "Arakatu"
 
@@ -3847,7 +3855,8 @@ msgstr "Datu-basean bilatu"
 msgid "Words or values to search for (wildcard: \"%\"):"
 msgstr "Bilaketa egiteko hitza(k) edo balioa(k) (komodina: \"%\"):"
 
-#: libraries/DbSearch.class.php:401 templates/table/search_and_replace.phtml:1
+#: libraries/DbSearch.class.php:401
+#: templates/table/search/search_and_replace.phtml:1
 msgid "Find:"
 msgstr "Aurkitu:"
 
@@ -3897,16 +3906,16 @@ msgstr "Eremuak"
 msgid "Search this table"
 msgstr "Datu-basean bilatu"
 
-#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2532
-#: libraries/Util.class.php:2535
+#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2538
+#: libraries/Util.class.php:2541
 #, fuzzy
 #| msgid "Begin"
 msgctxt "First page"
 msgid "Begin"
 msgstr "Hasi"
 
-#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2533
-#: libraries/Util.class.php:2536 libraries/server_bin_log.lib.php:170
+#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2539
+#: libraries/Util.class.php:2542 libraries/server_bin_log.lib.php:170
 #: libraries/server_bin_log.lib.php:172
 #, fuzzy
 #| msgid "Previous"
@@ -3914,8 +3923,8 @@ msgctxt "Previous page"
 msgid "Previous"
 msgstr "Aurrekoa"
 
-#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2564
-#: libraries/Util.class.php:2574 libraries/server_bin_log.lib.php:204
+#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2570
+#: libraries/Util.class.php:2580 libraries/server_bin_log.lib.php:204
 #: libraries/server_bin_log.lib.php:206
 #, fuzzy
 #| msgid "Next"
@@ -3923,8 +3932,8 @@ msgctxt "Next page"
 msgid "Next"
 msgstr "Hurrengoa"
 
-#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2565
-#: libraries/Util.class.php:2575
+#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2571
+#: libraries/Util.class.php:2581
 #, fuzzy
 #| msgid "End"
 msgctxt "Last page"
@@ -4012,9 +4021,9 @@ msgid "May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]."
 msgstr ""
 
 #: libraries/DisplayResults.class.php:4332 libraries/Message.class.php:180
-#: libraries/controllers/TableRelationController.class.php:258
+#: libraries/controllers/TableRelationController.class.php:259
 #: libraries/controllers/TableSearchController.class.php:655
-#: libraries/rte/rte_routines.lib.php:1332 libraries/sql_query_form.lib.php:89
+#: libraries/rte/rte_routines.lib.php:1423 libraries/sql_query_form.lib.php:89
 #: tbl_operations.php:227 tbl_row_action.php:138 view_operations.php:62
 #, fuzzy
 #| msgid "Your SQL query has been executed successfully."
@@ -4022,7 +4031,7 @@ msgid "Your SQL query has been executed successfully."
 msgstr "Zure SQL-kontsula arrakastaz burutu da"
 
 #: libraries/DisplayResults.class.php:4660
-#: libraries/controllers/StructureController.class.php:629
+#: libraries/controllers/DatabaseStructureController.class.php:564
 #, php-format
 msgid ""
 "This view has at least this number of rows. Please refer to %sdocumentation"
@@ -4048,34 +4057,34 @@ msgstr ""
 msgid "%d total"
 msgstr "guztira"
 
-#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1318
+#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1312
 #, fuzzy, php-format
 #| msgid "Query took %01.4f sec"
 msgid "Query took %01.4f seconds."
 msgstr "Kontsulta exekutatzeko denbora %01.4f seg"
 
 #: libraries/DisplayResults.class.php:4807
-#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4767
-#: libraries/Util.class.php:4773 libraries/mult_submits.inc.php:50
-#: templates/structure/check_all_tables.phtml:2
-#: templates/structure/check_all_tables.phtml:9
+#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4773
+#: libraries/Util.class.php:4779 libraries/mult_submits.inc.php:50
+#: templates/database/structure/check_all_tables.phtml:2
+#: templates/database/structure/check_all_tables.phtml:9
 msgid "With selected:"
 msgstr "Ikurdunak:"
 
 #: libraries/DisplayResults.class.php:4811
-#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4769
-#: libraries/Util.class.php:4770 libraries/server_privileges.lib.php:1174
+#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4775
+#: libraries/Util.class.php:4776 libraries/server_privileges.lib.php:1174
 #: libraries/server_privileges.lib.php:1175
 #: libraries/server_privileges.lib.php:1387
 #: libraries/server_user_groups.lib.php:231
-#: templates/structure/check_all_tables.phtml:3
-#: templates/structure/check_all_tables.phtml:4
+#: templates/database/structure/check_all_tables.phtml:3
+#: templates/database/structure/check_all_tables.phtml:4
 msgid "Check All"
 msgstr "Guztiak egiaztatu"
 
 #: libraries/DisplayResults.class.php:4985 libraries/Header.class.php:383
-#: templates/structure/optional_action_links.phtml:1
-#: templates/structure/print_view_data_dictionary_link.phtml:3
+#: templates/database/structure/print_view_data_dictionary_link.phtml:3
+#: templates/table/structure/optional_action_links.phtml:1
 msgid "Print view"
 msgstr "Inprimatzeko ikuspegia"
 
@@ -4083,7 +4092,8 @@ msgstr "Inprimatzeko ikuspegia"
 msgid "Query results operations"
 msgstr ""
 
-#: libraries/DisplayResults.class.php:5105 templates/tbl_chart.phtml:12
+#: libraries/DisplayResults.class.php:5105
+#: templates/table/chart/tbl_chart.phtml:12
 #, fuzzy
 #| msgid "Display PDF schema"
 msgid "Display chart"
@@ -4179,7 +4189,7 @@ msgid "Click on the bar to scroll to top of page"
 msgstr ""
 
 #: libraries/Header.class.php:749
-#: libraries/plugins/auth/AuthenticationCookie.class.php:152
+#: libraries/plugins/auth/AuthenticationCookie.class.php:140
 #, fuzzy
 #| msgid "Cookies must be enabled past this point."
 msgid "Javascript must be enabled past this point!"
@@ -4203,11 +4213,11 @@ msgid "Keyname"
 msgstr "Giltza-izena"
 
 #: libraries/Index.class.php:697
-#: libraries/controllers/StructureController.class.php:1962
-#: libraries/controllers/StructureController.class.php:1967
+#: libraries/controllers/TableStructureController.class.php:953
+#: libraries/controllers/TableStructureController.class.php:958
 #: libraries/tracking.lib.php:973
 #: templates/columns_definitions/column_indexes.phtml:11
-#: templates/structure/check_all_table_column.phtml:26
+#: templates/table/structure/check_all_table_column.phtml:26
 msgid "Unique"
 msgstr "Bakarra"
 
@@ -4226,16 +4236,17 @@ msgstr "Kardinalitatea"
 #: libraries/server_collations.lib.php:35 libraries/tracking.lib.php:881
 #: libraries/tracking.lib.php:977
 #: templates/columns_definitions/table_fields_definitions.phtml:33
-#: templates/structure/row_stats_table.phtml:31
-#: templates/structure/table_header.phtml:55
-#: templates/structure/table_structure_header.phtml:7
-#: templates/table/table_header.phtml:8
+#: templates/database/structure/table_header.phtml:55
+#: templates/table/search/table_header.phtml:8
+#: templates/table/structure/row_stats_table.phtml:31
+#: templates/table/structure/table_structure_header.phtml:7
 msgid "Collation"
 msgstr "Ordenamendua"
 
 #: libraries/Index.class.php:703 libraries/rte/rte_events.lib.php:496
-#: libraries/rte/rte_routines.lib.php:956 libraries/tracking.lib.php:885
-#: libraries/tracking.lib.php:979 templates/structure/table_header.phtml:84
+#: libraries/rte/rte_routines.lib.php:1047 libraries/tracking.lib.php:885
+#: libraries/tracking.lib.php:979
+#: templates/database/structure/table_header.phtml:84
 #, fuzzy
 msgid "Comment"
 msgstr "Iruzkinak"
@@ -4249,15 +4260,15 @@ msgstr "Lehen mailako gakoa ezabatu da."
 msgid "Index %s has been dropped."
 msgstr "%s indizea ezabatu da."
 
-#: libraries/Index.class.php:757 libraries/Util.class.php:3630
-#: libraries/Util.class.php:3631
-#: libraries/controllers/StructureController.class.php:1958
-#: libraries/controllers/StructureController.class.php:1959
+#: libraries/Index.class.php:757 libraries/Util.class.php:3636
+#: libraries/Util.class.php:3637
+#: libraries/controllers/TableStructureController.class.php:949
+#: libraries/controllers/TableStructureController.class.php:950
 #: libraries/operations.lib.php:1607 libraries/rte/rte_list.lib.php:150
 #: libraries/server_databases.lib.php:146
-#: templates/structure/check_all_table_column.phtml:15
-#: templates/structure/check_all_tables.phtml:16
-#: templates/tbl_relation/foreign_key_row.phtml:93
+#: templates/database/structure/check_all_tables.phtml:16
+#: templates/table/relation/foreign_key_row.phtml:93
+#: templates/table/structure/check_all_table_column.phtml:15
 msgid "Drop"
 msgstr "Ezabatu"
 
@@ -4286,16 +4297,16 @@ msgstr "Zerbitzaria"
 #: libraries/Menu.class.php:248
 #: libraries/navigation/Nodes/Node_View.class.php:32
 #: libraries/tbl_info.inc.php:63
-#: templates/structure/structure_table_row.phtml:97
-#: templates/structure/structure_table_row.phtml:159
+#: templates/database/structure/structure_table_row.phtml:97
+#: templates/database/structure/structure_table_row.phtml:159
 msgid "View"
 msgstr "Ikusipegia"
 
 #: libraries/Menu.class.php:325 libraries/Menu.class.php:429
-#: libraries/Menu.class.php:548 libraries/Util.class.php:3334
-#: libraries/Util.class.php:3344 libraries/Util.class.php:3350
-#: libraries/Util.class.php:4313 libraries/Util.class.php:4328
-#: libraries/Util.class.php:4345 libraries/config.values.php:40
+#: libraries/Menu.class.php:548 libraries/Util.class.php:3340
+#: libraries/Util.class.php:3350 libraries/Util.class.php:3356
+#: libraries/Util.class.php:4319 libraries/Util.class.php:4334
+#: libraries/Util.class.php:4351 libraries/config.values.php:40
 #: libraries/config.values.php:48 libraries/config.values.php:110
 #: libraries/config.values.php:116 libraries/config/messages.inc.php:321
 #: libraries/navigation/Nodes/Node_Table.class.php:292
@@ -4303,19 +4314,19 @@ msgid "SQL"
 msgstr "SQL"
 
 #: libraries/Menu.class.php:328 libraries/Menu.class.php:432
-#: libraries/Util.class.php:3335 libraries/Util.class.php:3345
-#: libraries/Util.class.php:3351 libraries/Util.class.php:3625
-#: libraries/Util.class.php:3626 libraries/Util.class.php:4329
-#: libraries/Util.class.php:4346 libraries/config.values.php:41
+#: libraries/Util.class.php:3341 libraries/Util.class.php:3351
+#: libraries/Util.class.php:3357 libraries/Util.class.php:3631
+#: libraries/Util.class.php:3632 libraries/Util.class.php:4335
+#: libraries/Util.class.php:4352 libraries/config.values.php:41
 #: libraries/config.values.php:49 libraries/config.values.php:111
 #: libraries/config.values.php:117
 #: libraries/navigation/Nodes/Node_Table.class.php:286
 msgid "Search"
 msgstr "Bilatu"
 
-#: libraries/Menu.class.php:338 libraries/Util.class.php:3336
-#: libraries/Util.class.php:3346 libraries/Util.class.php:3627
-#: libraries/Util.class.php:3628 libraries/Util.class.php:4347
+#: libraries/Menu.class.php:338 libraries/Util.class.php:3342
+#: libraries/Util.class.php:3352 libraries/Util.class.php:3633
+#: libraries/Util.class.php:3634 libraries/Util.class.php:4353
 #: libraries/config.values.php:42 libraries/config.values.php:50
 #: libraries/config.values.php:118
 #: libraries/navigation/Nodes/Node_Table.class.php:289
@@ -4324,30 +4335,30 @@ msgid "Insert"
 msgstr "Txertatu"
 
 #: libraries/Menu.class.php:362 libraries/Menu.class.php:467
-#: libraries/Util.class.php:4334 libraries/Util.class.php:4350
+#: libraries/Util.class.php:4340 libraries/Util.class.php:4356
 #: libraries/config.values.php:106 libraries/server_common.lib.php:51
 #: libraries/server_privileges.lib.php:2370
 #: libraries/server_privileges.lib.php:3158
-#: libraries/server_privileges.lib.php:4221
+#: libraries/server_privileges.lib.php:4247
 msgid "Privileges"
 msgstr "Pribilegioak"
 
 #: libraries/Menu.class.php:371 libraries/Menu.class.php:379
-#: libraries/Menu.class.php:459 libraries/Util.class.php:3338
-#: libraries/Util.class.php:3352 libraries/Util.class.php:4333
-#: libraries/Util.class.php:4351 libraries/config.values.php:112
+#: libraries/Menu.class.php:459 libraries/Util.class.php:3344
+#: libraries/Util.class.php:3358 libraries/Util.class.php:4339
+#: libraries/Util.class.php:4357 libraries/config.values.php:112
 #: view_operations.php:92
 msgid "Operations"
 msgstr "Eragiketak"
 
 #: libraries/Menu.class.php:384 libraries/Menu.class.php:492
-#: libraries/Util.class.php:4338 libraries/Util.class.php:4352
+#: libraries/Util.class.php:4344 libraries/Util.class.php:4358
 #: libraries/relation.lib.php:255
 msgid "Tracking"
 msgstr ""
 
 #: libraries/Menu.class.php:397 libraries/Menu.class.php:486
-#: libraries/Util.class.php:4337 libraries/Util.class.php:4353
+#: libraries/Util.class.php:4343 libraries/Util.class.php:4359
 #: libraries/navigation/Nodes/Node_Trigger_Container.class.php:24
 #: libraries/plugins/export/ExportHtmlword.class.php:557
 #: libraries/plugins/export/ExportOdt.class.php:685
@@ -4364,16 +4375,16 @@ msgstr ""
 msgid "Database seems to be empty!"
 msgstr ""
 
-#: libraries/Menu.class.php:439 libraries/Util.class.php:4330
+#: libraries/Menu.class.php:439 libraries/Util.class.php:4336
 msgid "Query"
 msgstr "Kontsulta"
 
-#: libraries/Menu.class.php:472 libraries/Util.class.php:4335
+#: libraries/Menu.class.php:472 libraries/Util.class.php:4341
 #: libraries/rte/rte_words.lib.php:36
 msgid "Routines"
 msgstr ""
 
-#: libraries/Menu.class.php:479 libraries/Util.class.php:4336
+#: libraries/Menu.class.php:479 libraries/Util.class.php:4342
 #: libraries/navigation/Nodes/Node_Event_Container.class.php:26
 #: libraries/plugins/export/ExportSql.class.php:940
 #: libraries/plugins/export/ExportXml.class.php:107
@@ -4381,22 +4392,22 @@ msgstr ""
 msgid "Events"
 msgstr ""
 
-#: libraries/Menu.class.php:498 libraries/Util.class.php:4339
+#: libraries/Menu.class.php:498 libraries/Util.class.php:4345
 msgid "Designer"
 msgstr ""
 
-#: libraries/Menu.class.php:507 libraries/Util.class.php:4340
-#: templates/structure/check_all_tables.phtml:35
+#: libraries/Menu.class.php:507 libraries/Util.class.php:4346
+#: templates/database/structure/check_all_tables.phtml:35
 #, fuzzy
 #| msgid "Add/Delete Field Columns"
 msgid "Central columns"
 msgstr "Gehitu/ezabatu irizpide-zutabea"
 
-#: libraries/Menu.class.php:544 libraries/Util.class.php:4312
+#: libraries/Menu.class.php:544 libraries/Util.class.php:4318
 #: libraries/config.values.php:103 libraries/config/messages.inc.php:266
 #: libraries/config/messages.inc.php:341
 #: libraries/navigation/NavigationTree.class.php:1239
-#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4332
+#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4358
 msgid "Databases"
 msgstr "Datu-baseak"
 
@@ -4407,35 +4418,35 @@ msgid "User accounts"
 msgstr "Erabiltzailea"
 
 #: libraries/Menu.class.php:595 libraries/ServerStatusData.class.php:121
-#: libraries/Util.class.php:4319 libraries/server_common.lib.php:36
+#: libraries/Util.class.php:4325 libraries/server_common.lib.php:36
 #, fuzzy
 msgid "Binary log"
 msgstr "Binarioa "
 
 #: libraries/Menu.class.php:601 libraries/ServerStatusData.class.php:126
-#: libraries/Util.class.php:4320 libraries/server_common.lib.php:42
-#: templates/structure/body_for_table_summary.phtml:10
-#: templates/structure/table_header.phtml:27
+#: libraries/Util.class.php:4326 libraries/server_common.lib.php:42
+#: templates/database/structure/body_for_table_summary.phtml:10
+#: templates/database/structure/table_header.phtml:27
 msgid "Replication"
 msgstr "Ihardetsi"
 
 #: libraries/Menu.class.php:606 libraries/ServerStatusData.class.php:193
-#: libraries/Util.class.php:4321 libraries/config.values.php:105
+#: libraries/Util.class.php:4327 libraries/config.values.php:105
 #: libraries/server_engines.lib.php:108 libraries/server_engines.lib.php:112
 #: libraries/sql_query_form.lib.php:421
 msgid "Variables"
 msgstr "Aldagaiak"
 
-#: libraries/Menu.class.php:610 libraries/Util.class.php:4322
+#: libraries/Menu.class.php:610 libraries/Util.class.php:4328
 msgid "Charsets"
 msgstr "Karaktere-multzoa"
 
-#: libraries/Menu.class.php:615 libraries/Util.class.php:4323
+#: libraries/Menu.class.php:615 libraries/Util.class.php:4329
 #: libraries/server_common.lib.php:33 libraries/server_plugins.lib.php:27
 msgid "Plugins"
 msgstr ""
 
-#: libraries/Menu.class.php:626 libraries/Util.class.php:4324
+#: libraries/Menu.class.php:626 libraries/Util.class.php:4330
 msgid "Engines"
 msgstr ""
 
@@ -4460,7 +4471,7 @@ msgid_plural "%1$d rows inserted."
 msgstr[0] ""
 msgstr[1] ""
 
-#: libraries/PDF.class.php:70 libraries/Util.class.php:2521
+#: libraries/PDF.class.php:70 libraries/Util.class.php:2527
 #: libraries/browse_foreigners.lib.php:327
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:865
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:890
@@ -4487,7 +4498,7 @@ msgid "Could not save favorite table!"
 msgstr "Dokumentazioa"
 
 #: libraries/RecentFavoriteTable.class.php:212
-#: templates/structure/favorite_anchor.phtml:12
+#: templates/database/structure/favorite_anchor.phtml:12
 #, fuzzy
 msgid "Remove from Favorites"
 msgstr "Taula berrizendatu izen honetara: "
@@ -4672,7 +4683,7 @@ msgid ""
 msgstr ""
 
 #: libraries/StorageEngine.class.php:373
-#: templates/structure/body_for_table_summary.phtml:50
+#: templates/database/structure/body_for_table_summary.phtml:50
 #, php-format
 msgid "%s is the default storage engine on this MySQL server."
 msgstr "%s da MySQL zerbitzarian lehenetsitako biltegiratzeko mota."
@@ -5098,10 +5109,10 @@ msgstr ""
 
 #: libraries/Util.class.php:726 libraries/rte/rte_events.lib.php:110
 #: libraries/rte/rte_events.lib.php:119 libraries/rte/rte_events.lib.php:150
-#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:153
-#: libraries/rte/rte_routines.lib.php:162
-#: libraries/rte/rte_routines.lib.php:235
-#: libraries/rte/rte_routines.lib.php:1366
+#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:223
+#: libraries/rte/rte_routines.lib.php:250
+#: libraries/rte/rte_routines.lib.php:372
+#: libraries/rte/rte_routines.lib.php:1457
 #: libraries/rte/rte_triggers.lib.php:86 libraries/rte/rte_triggers.lib.php:95
 #: libraries/rte/rte_triggers.lib.php:127
 msgid "MySQL said: "
@@ -5147,76 +5158,79 @@ msgstr "Iga"
 msgid "%B %d, %Y at %I:%M %p"
 msgstr "%Y-%m-%d, %H:%M:%S"
 
-#: libraries/Util.class.php:2019
+#: libraries/Util.class.php:2025
 #, php-format
 msgid "%s days, %s hours, %s minutes and %s seconds"
 msgstr "%s egun, %s ordu, %s minutu eta %s segundu"
 
-#: libraries/Util.class.php:2112
+#: libraries/Util.class.php:2118
 msgid "Missing parameter:"
 msgstr ""
 
-#: libraries/Util.class.php:2645
+#: libraries/Util.class.php:2651
 #, php-format
 msgid "Jump to database \"%s\"."
 msgstr "\"%s\" datu-basera joan."
 
-#: libraries/Util.class.php:2670
+#: libraries/Util.class.php:2676
 #, php-format
 msgid "The %s functionality is affected by a known bug, see %s"
 msgstr ""
 
-#: libraries/Util.class.php:2881
+#: libraries/Util.class.php:2887
 msgid "Click to toggle"
 msgstr ""
 
-#: libraries/Util.class.php:3542 prefs_manage.php:248
+#: libraries/Util.class.php:3548 prefs_manage.php:248
 msgid "Browse your computer:"
 msgstr ""
 
-#: libraries/Util.class.php:3567
+#: libraries/Util.class.php:3573
 #, fuzzy, php-format
 #| msgid "web server upload directory"
 msgid "Select from the web server upload directory <b>%s</b>:"
 msgstr "Fitxategiak igotzeko web-zerbitzariaren direktorioa"
 
-#: libraries/Util.class.php:3596 libraries/insert_edit.lib.php:1173
+#: libraries/Util.class.php:3602 libraries/insert_edit.lib.php:1171
 msgid "The directory you set for upload work cannot be reached."
 msgstr "Igoerentzat ezarri duzun direktorioa ez dago eskuragarri."
 
-#: libraries/Util.class.php:3607
+#: libraries/Util.class.php:3613
 msgid "There are no files to upload!"
 msgstr ""
 
-#: libraries/Util.class.php:3632 libraries/Util.class.php:3633
-#: templates/structure/check_all_tables.phtml:15
+#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: templates/database/structure/check_all_tables.phtml:15
 msgid "Empty"
 msgstr "Hutsik"
 
-#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: libraries/Util.class.php:3644 libraries/Util.class.php:3645
 msgid "Execute"
 msgstr ""
 
-#: libraries/Util.class.php:4152
+#: libraries/Util.class.php:4158
 msgid "Print"
 msgstr "Inprimatu"
 
-#: libraries/Util.class.php:4257 templates/structure/row_stats_table.phtml:80
-#: templates/structure/table_header.phtml:95
+#: libraries/Util.class.php:4263
+#: templates/database/structure/table_header.phtml:95
+#: templates/table/structure/row_stats_table.phtml:80
 msgid "Creation"
 msgstr "Sortzea"
 
-#: libraries/Util.class.php:4263 templates/structure/row_stats_table.phtml:87
-#: templates/structure/table_header.phtml:106
+#: libraries/Util.class.php:4269
+#: templates/database/structure/table_header.phtml:106
+#: templates/table/structure/row_stats_table.phtml:87
 msgid "Last update"
 msgstr "Azken eguneraketa"
 
-#: libraries/Util.class.php:4269 templates/structure/row_stats_table.phtml:94
-#: templates/structure/table_header.phtml:117
+#: libraries/Util.class.php:4275
+#: templates/database/structure/table_header.phtml:117
+#: templates/table/structure/row_stats_table.phtml:94
 msgid "Last check"
 msgstr "Azken egiaztapena"
 
-#: libraries/Util.class.php:4315
+#: libraries/Util.class.php:4321
 #, fuzzy
 #| msgid "User"
 msgid "Users"
@@ -5241,16 +5255,16 @@ msgid "Use this value"
 msgstr "Erabili balio hau"
 
 #: libraries/build_html_for_db.lib.php:33 libraries/import.lib.php:193
-#: templates/structure/actions_in_table_structure.phtml:113
-#: templates/structure/row_stats_table.phtml:42
-#: templates/structure/table_header.phtml:36
+#: templates/database/structure/table_header.phtml:36
+#: templates/table/structure/actions_in_table_structure.phtml:113
+#: templates/table/structure/row_stats_table.phtml:42
 msgid "Rows"
 msgstr "Errenkadak"
 
 #: libraries/build_html_for_db.lib.php:48 libraries/engines/innodb.lib.php:171
-#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:186
-#: libraries/server_status.lib.php:298
-#: templates/structure/display_table_stats.phtml:40
+#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:195
+#: libraries/server_status.lib.php:307
+#: templates/table/structure/display_table_stats.phtml:40
 msgid "Total"
 msgstr "Gutira"
 
@@ -5260,10 +5274,12 @@ msgid "Jump to database"
 msgstr "Datu-baserik ez"
 
 #: libraries/build_html_for_db.lib.php:146
+#: templates/database/structure/structure_table_row.phtml:15
 msgid "Not replicated"
 msgstr ""
 
 #: libraries/build_html_for_db.lib.php:158
+#: templates/database/structure/structure_table_row.phtml:16
 #, fuzzy
 msgid "Replicated"
 msgstr "Erlazioak"
@@ -5321,17 +5337,17 @@ msgstr ""
 #: libraries/plugins/export/ExportTexytext.class.php:425
 #: libraries/plugins/export/PMA_ExportPdf.class.php:307
 #: libraries/rte/rte_list.lib.php:73 libraries/rte/rte_list.lib.php:85
-#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:830
-#: libraries/rte/rte_routines.lib.php:1492 setup/frames/index.inc.php:162
+#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:921
+#: libraries/rte/rte_routines.lib.php:1583 setup/frames/index.inc.php:162
 #: templates/columns_definitions/table_fields_definitions.phtml:8
-#: templates/structure/table_structure_header.phtml:5
-#: templates/table/create_table.phtml:11
+#: templates/database/create_table.phtml:11
+#: templates/table/structure/table_structure_header.phtml:5
 msgid "Name"
 msgstr "Izena"
 
 #: libraries/central_columns.lib.php:699
 #: libraries/central_columns.lib.php:1381
-#: libraries/rte/rte_routines.lib.php:832
+#: libraries/rte/rte_routines.lib.php:923
 #: templates/columns_definitions/table_fields_definitions.phtml:14
 msgid "Length/Values"
 msgstr "Luzera/Balioak*"
@@ -5354,7 +5370,7 @@ msgid "Select a table"
 msgstr "Taulak hautatu"
 
 #: libraries/central_columns.lib.php:804
-#: templates/structure/add_column.phtml:4
+#: templates/table/structure/add_column.phtml:4
 #, fuzzy
 #| msgid "Add %s field(s)"
 msgid "Add column"
@@ -5376,7 +5392,7 @@ msgstr "Gehitu %s zutabe"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1002
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1025
 #: templates/columns_definitions/table_fields_definitions.phtml:36
-#: templates/structure/table_structure_header.phtml:8
+#: templates/table/structure/table_structure_header.phtml:8
 msgid "Attributes"
 msgstr "Atributuak"
 
@@ -5498,7 +5514,7 @@ msgid "Double click"
 msgstr ""
 
 #: libraries/config.values.php:95 libraries/config.values.php:124
-#: libraries/config/FormDisplay.tpl.php:221 libraries/relation.lib.php:97
+#: libraries/config/FormDisplay.tpl.php:232 libraries/relation.lib.php:97
 #: libraries/relation.lib.php:105
 msgid "Disabled"
 msgstr "Ezgaituta"
@@ -5688,21 +5704,21 @@ msgstr ""
 msgid "maximum %s"
 msgstr ""
 
-#: libraries/config/FormDisplay.tpl.php:219
+#: libraries/config/FormDisplay.tpl.php:230
 msgid "This setting is disabled, it will not be applied to your configuration."
 msgstr ""
 
-#: libraries/config/FormDisplay.tpl.php:313
+#: libraries/config/FormDisplay.tpl.php:324
 #, php-format
 msgid "Set value: %s"
 msgstr ""
 
-#: libraries/config/FormDisplay.tpl.php:318
+#: libraries/config/FormDisplay.tpl.php:329
 #: libraries/config/messages.inc.php:610
 msgid "Restore default value"
 msgstr ""
 
-#: libraries/config/FormDisplay.tpl.php:332
+#: libraries/config/FormDisplay.tpl.php:343
 msgid "Allow users to customize this value"
 msgstr ""
 
@@ -6137,7 +6153,7 @@ msgstr "Fitxategiaren karaktereen kodeketa:"
 
 #: libraries/config/messages.inc.php:136 libraries/config/messages.inc.php:152
 #: libraries/sql_query_form.lib.php:247
-#: templates/structure/row_stats_table.phtml:7
+#: templates/table/structure/row_stats_table.phtml:7
 msgid "Format"
 msgstr "Formatoa"
 
@@ -6697,7 +6713,7 @@ msgstr ""
 
 #: libraries/config/messages.inc.php:332
 #: libraries/plugins/export/ExportPdf.class.php:279
-#: templates/structure/secondary_tabs.phtml:8
+#: templates/table/secondary_tabs.phtml:8
 #, fuzzy
 #| msgid "Databases"
 msgid "Table structure"
@@ -8306,111 +8322,35 @@ msgstr ""
 msgid "OpenDocument Text"
 msgstr "Dokumentazioa"
 
-#: libraries/controllers/StructureController.class.php:465
+#: libraries/controllers/DatabaseStructureController.class.php:405
 #: tbl_operations.php:382
 #, php-format
 msgid "Table %s has been emptied."
 msgstr "%s taula hustu egin da."
 
-#: libraries/controllers/StructureController.class.php:486
+#: libraries/controllers/DatabaseStructureController.class.php:426
 #: tbl_operations.php:400 view_operations.php:119
 #, fuzzy, php-format
 #| msgid "View %s has been dropped."
 msgid "View %s has been dropped."
 msgstr "%s Ikuspegia ezabatua izan da"
 
-#: libraries/controllers/StructureController.class.php:487
+#: libraries/controllers/DatabaseStructureController.class.php:427
 #: tbl_operations.php:401
 #, fuzzy, php-format
 #| msgid "Table %s has been dropped."
 msgid "Table %s has been dropped."
 msgstr "%s taula ezabatu egin da"
 
-#: libraries/controllers/StructureController.class.php:797
-#, php-format
-msgid "The name '%s' is a MySQL reserved keyword."
-msgid_plural "The names '%s' are MySQL reserved keywords."
-msgstr[0] ""
-msgstr[1] ""
-
-#: libraries/controllers/StructureController.class.php:875
-#, fuzzy
-#| msgid "No databases selected."
-msgid "No column selected."
-msgstr "Ez dago datu-baserik aukeratuta."
-
-#: libraries/controllers/StructureController.class.php:1049
+#: libraries/controllers/DatabaseStructureController.class.php:733
 msgid "Favorite List is full!"
 msgstr ""
 
-#: libraries/controllers/StructureController.class.php:1272
-#, fuzzy
-#| msgid "The selected users have been deleted successfully."
-msgid "The columns have been moved successfully."
-msgstr "Hautatutako erabiltzaileak arrakastaz ezabatu dira."
-
-#: libraries/controllers/StructureController.class.php:1535
-#, fuzzy, php-format
-msgid ""
-"Table %1$s has been altered successfully. Privileges have been adjusted."
-msgstr "Hautatutako erabiltzaileak arrakastaz ezabatu dira."
-
-#: libraries/controllers/StructureController.class.php:1541
-#: libraries/controllers/TableIndexesController.class.php:161
-#: tbl_addfield.php:92
-#, fuzzy, php-format
-msgid "Table %1$s has been altered successfully."
-msgstr "Hautatutako erabiltzaileak arrakastaz ezabatu dira."
-
-#: libraries/controllers/StructureController.class.php:1588
-#: libraries/tracking.lib.php:1094
-#, fuzzy
-#| msgid "Query type"
-msgid "Query error"
-msgstr "Kontsulta mota"
-
-#: libraries/controllers/StructureController.class.php:1806
+#: libraries/controllers/DatabaseStructureController.class.php:947
 #: libraries/mysql_charsets.lib.php:366 libraries/mysql_charsets.lib.php:373
 msgid "unknown"
 msgstr "ezezaguna"
 
-#: libraries/controllers/StructureController.class.php:1957
-#: templates/structure/check_all_table_column.phtml:11
-msgid "Change"
-msgstr "Aldatu"
-
-#: libraries/controllers/StructureController.class.php:1961
-#: libraries/controllers/StructureController.class.php:1966
-#: libraries/navigation/Nodes/Node_Index.class.php:30
-#: libraries/tracking.lib.php:926
-#: templates/columns_definitions/column_indexes.phtml:16
-#: templates/columns_definitions/table_fields_definitions.phtml:57
-#: templates/structure/check_all_table_column.phtml:30
-#: templates/structure/display_structure.phtml:79
-#: templates/structure/display_table_stats.phtml:19
-msgid "Index"
-msgstr "Indizea"
-
-#: libraries/controllers/StructureController.class.php:1963
-#: libraries/controllers/StructureController.class.php:1968
-#: templates/columns_definitions/column_indexes.phtml:27
-#: templates/structure/check_all_table_column.phtml:37
-msgid "Spatial"
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1964
-#: libraries/controllers/StructureController.class.php:1969
-#: templates/columns_definitions/column_indexes.phtml:22
-#: templates/structure/check_all_table_column.phtml:47
-msgid "Fulltext"
-msgstr "Testu osoa"
-
-#: libraries/controllers/StructureController.class.php:1970
-#, fuzzy
-#| msgid "Session value"
-msgid "Distinct values"
-msgstr "Saioaren balioa"
-
 #: libraries/controllers/TableChartController.class.php:82
 #: libraries/controllers/TableGisVisualizationController.class.php:101
 msgid "No SQL query was set to fetch data."
@@ -8426,13 +8366,20 @@ msgstr ""
 msgid "No data to display"
 msgstr "Datu-baserik ez"
 
-#: libraries/controllers/TableRelationController.class.php:217
+#: libraries/controllers/TableIndexesController.class.php:161
+#: libraries/controllers/TableStructureController.class.php:736
+#: tbl_addfield.php:92
+#, fuzzy, php-format
+msgid "Table %1$s has been altered successfully."
+msgstr "Hautatutako erabiltzaileak arrakastaz ezabatu dira."
+
+#: libraries/controllers/TableRelationController.class.php:218
 #, fuzzy
 #| msgid "Thread %s was successfully killed."
 msgid "Display column was successfully updated."
 msgstr "%s haria arrakastaz ezabatu da."
 
-#: libraries/controllers/TableRelationController.class.php:283
+#: libraries/controllers/TableRelationController.class.php:288
 #, fuzzy
 msgid "Internal relations were successfully updated."
 msgstr "Barne-erlazioak"
@@ -8450,11 +8397,80 @@ msgid "Zoom search"
 msgstr "Bilatu"
 
 #: libraries/controllers/TableSearchController.class.php:852
-#: templates/table/selection_form.phtml:59
+#: templates/table/search/selection_form.phtml:59
 #, fuzzy
 msgid "Find and replace"
 msgstr "SQL kontsulta"
 
+#: libraries/controllers/TableStructureController.class.php:163
+#, php-format
+msgid "The name '%s' is a MySQL reserved keyword."
+msgid_plural "The names '%s' are MySQL reserved keywords."
+msgstr[0] ""
+msgstr[1] ""
+
+#: libraries/controllers/TableStructureController.class.php:241
+#, fuzzy
+#| msgid "No databases selected."
+msgid "No column selected."
+msgstr "Ez dago datu-baserik aukeratuta."
+
+#: libraries/controllers/TableStructureController.class.php:467
+#, fuzzy
+#| msgid "The selected users have been deleted successfully."
+msgid "The columns have been moved successfully."
+msgstr "Hautatutako erabiltzaileak arrakastaz ezabatu dira."
+
+#: libraries/controllers/TableStructureController.class.php:730
+#, fuzzy, php-format
+msgid ""
+"Table %1$s has been altered successfully. Privileges have been adjusted."
+msgstr "Hautatutako erabiltzaileak arrakastaz ezabatu dira."
+
+#: libraries/controllers/TableStructureController.class.php:783
+#: libraries/tracking.lib.php:1094
+#, fuzzy
+#| msgid "Query type"
+msgid "Query error"
+msgstr "Kontsulta mota"
+
+#: libraries/controllers/TableStructureController.class.php:948
+#: templates/table/structure/check_all_table_column.phtml:11
+msgid "Change"
+msgstr "Aldatu"
+
+#: libraries/controllers/TableStructureController.class.php:952
+#: libraries/controllers/TableStructureController.class.php:957
+#: libraries/navigation/Nodes/Node_Index.class.php:30
+#: libraries/tracking.lib.php:926
+#: templates/columns_definitions/column_indexes.phtml:16
+#: templates/columns_definitions/table_fields_definitions.phtml:57
+#: templates/table/structure/check_all_table_column.phtml:30
+#: templates/table/structure/display_structure.phtml:79
+#: templates/table/structure/display_table_stats.phtml:19
+msgid "Index"
+msgstr "Indizea"
+
+#: libraries/controllers/TableStructureController.class.php:954
+#: libraries/controllers/TableStructureController.class.php:959
+#: templates/columns_definitions/column_indexes.phtml:27
+#: templates/table/structure/check_all_table_column.phtml:37
+msgid "Spatial"
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:955
+#: libraries/controllers/TableStructureController.class.php:960
+#: templates/columns_definitions/column_indexes.phtml:22
+#: templates/table/structure/check_all_table_column.phtml:47
+msgid "Fulltext"
+msgstr "Testu osoa"
+
+#: libraries/controllers/TableStructureController.class.php:963
+#, fuzzy
+#| msgid "Session value"
+msgid "Distinct values"
+msgstr "Saioaren balioa"
+
 #: libraries/core.lib.php:306
 #, php-format
 msgid "The %s extension is missing. Please check your PHP configuration."
@@ -8499,7 +8515,7 @@ msgid "No Password"
 msgstr "Pasahitzik ez"
 
 #: libraries/display_change_password.lib.php:68
-#: libraries/plugins/auth/AuthenticationCookie.class.php:199
+#: libraries/plugins/auth/AuthenticationCookie.class.php:187
 #: libraries/replication_gui.lib.php:422 libraries/replication_gui.lib.php:862
 #: libraries/server_privileges.lib.php:1640
 msgid "Password:"
@@ -9299,12 +9315,12 @@ msgid "Dump has been saved to file %s."
 msgstr "Iraulketa %s fitxategian gorde da."
 
 #: libraries/import.lib.php:202 libraries/insert_edit.lib.php:124
-#: libraries/rte/rte_routines.lib.php:1353 libraries/sql.lib.php:1312
+#: libraries/rte/rte_routines.lib.php:1444 libraries/sql.lib.php:1306
 #: tbl_get_field.php:44
 msgid "MySQL returned an empty result set (i.e. zero rows)."
 msgstr "MySQL-k emaitza hutsa itzuli du. (i.e. zero errenkada)."
 
-#: libraries/import.lib.php:265 libraries/sql.lib.php:1326
+#: libraries/import.lib.php:265 libraries/sql.lib.php:1320
 msgid "[ROLLBACK occurred.]"
 msgstr ""
 
@@ -9370,14 +9386,14 @@ msgstr "Indize bat sortu &nbsp;%s&nbsp; zutabetan"
 
 #: libraries/insert_edit.lib.php:233
 #: libraries/navigation/Nodes/Node_DatabaseChild.class.php:48
-#: templates/designer/table_list.phtml:40
+#: templates/database/designer/table_list.phtml:40
 msgid "Hide"
 msgstr ""
 
 #: libraries/insert_edit.lib.php:249
 #: libraries/navigation/Nodes/Node_Function.class.php:32
-#: libraries/rte/rte_routines.lib.php:1495
-#: templates/table/table_header.phtml:4
+#: libraries/rte/rte_routines.lib.php:1586
+#: templates/table/search/table_header.phtml:4
 msgid "Function"
 msgstr "Funtzioak"
 
@@ -9392,86 +9408,87 @@ msgstr "Binarioa"
 msgid "Because of its length,<br /> this column might not be editable."
 msgstr "Bere luzeragatik,<br /> eremu hau ez da editagarria "
 
-#: libraries/insert_edit.lib.php:1050
+#: libraries/insert_edit.lib.php:1048
 msgid "Binary - do not edit"
 msgstr "Binarioa - ez editatu"
 
-#: libraries/insert_edit.lib.php:1176 libraries/server_privileges.lib.php:470
-#: templates/table/options.phtml:36
+#: libraries/insert_edit.lib.php:1174 libraries/server_privileges.lib.php:470
+#: templates/table/search/options.phtml:36
 msgid "Or"
 msgstr "Edo"
 
-#: libraries/insert_edit.lib.php:1177
+#: libraries/insert_edit.lib.php:1175
 #, fuzzy
 #| msgid "web server upload directory"
 msgid "web server upload directory:"
 msgstr "Fitxategiak igotzeko web-zerbitzariaren direktorioa"
 
-#: libraries/insert_edit.lib.php:1348 templates/table/input_box.phtml:49
+#: libraries/insert_edit.lib.php:1346
+#: templates/table/search/input_box.phtml:49
 #, fuzzy
 #| msgid "Insert"
 msgid "Edit/Insert"
 msgstr "Txertatu"
 
-#: libraries/insert_edit.lib.php:1398
+#: libraries/insert_edit.lib.php:1396
 #, php-format
 msgid "Continue insertion with %s rows"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1428
+#: libraries/insert_edit.lib.php:1426
 msgid "and then"
 msgstr "eta orduan"
 
-#: libraries/insert_edit.lib.php:1461
+#: libraries/insert_edit.lib.php:1459
 msgid "Insert as new row"
 msgstr "Txertatu errenkada berri batean"
 
-#: libraries/insert_edit.lib.php:1464
+#: libraries/insert_edit.lib.php:1462
 msgid "Insert as new row and ignore errors"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1467
+#: libraries/insert_edit.lib.php:1465
 msgid "Show insert query"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1487
+#: libraries/insert_edit.lib.php:1485
 msgid "Go back to previous page"
 msgstr "Itzuli"
 
-#: libraries/insert_edit.lib.php:1490
+#: libraries/insert_edit.lib.php:1488
 msgid "Insert another new row"
 msgstr "Erregistro berria gehitu"
 
-#: libraries/insert_edit.lib.php:1495
+#: libraries/insert_edit.lib.php:1493
 msgid "Go back to this page"
 msgstr "Egin atzera orri honetara"
 
-#: libraries/insert_edit.lib.php:1518
+#: libraries/insert_edit.lib.php:1516
 msgid "Edit next row"
 msgstr "Editatu hurrengo lerroa"
 
-#: libraries/insert_edit.lib.php:1540
+#: libraries/insert_edit.lib.php:1538
 msgid ""
 "Use TAB key to move from value to value, or CTRL+arrows to move anywhere"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1577 libraries/replication_gui.lib.php:542
-#: libraries/rte/rte_routines.lib.php:1497
+#: libraries/insert_edit.lib.php:1575 libraries/replication_gui.lib.php:542
+#: libraries/rte/rte_routines.lib.php:1588
 #: libraries/server_status_variables.lib.php:220
-#: templates/designer/having_query_panel.phtml:100
-#: templates/designer/options_panel.phtml:73
-#: templates/designer/options_panel.phtml:239
-#: templates/designer/where_query_panel.phtml:69
-#: templates/table/table_header.phtml:10
-#: templates/table/zoom_result_form.phtml:35
+#: templates/database/designer/having_query_panel.phtml:100
+#: templates/database/designer/options_panel.phtml:73
+#: templates/database/designer/options_panel.phtml:239
+#: templates/database/designer/where_query_panel.phtml:69
+#: templates/table/search/table_header.phtml:10
+#: templates/table/search/zoom_result_form.phtml:35
 msgid "Value"
 msgstr "balioa"
 
-#: libraries/insert_edit.lib.php:1937 libraries/sql.lib.php:1309
+#: libraries/insert_edit.lib.php:1935 libraries/sql.lib.php:1303
 msgid "Showing SQL query"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1962 libraries/sql.lib.php:1287
+#: libraries/insert_edit.lib.php:1960 libraries/sql.lib.php:1281
 #, php-format
 msgid "Inserted row id: %1$d"
 msgstr ""
@@ -9922,7 +9939,7 @@ msgstr ""
 #: libraries/navigation/Nodes/Node_View_Container.class.php:26
 #: libraries/navigation/Nodes/Node_View_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:129
-#: templates/structure/show_create.phtml:30
+#: templates/database/structure/show_create.phtml:30
 msgid "Views"
 msgstr ""
 
@@ -10230,7 +10247,7 @@ msgstr "Ez daukazu baimen nahikorik hemen orain egoteko!"
 
 #: libraries/operations.lib.php:101 libraries/operations.lib.php:249
 #: libraries/operations.lib.php:869 libraries/operations.lib.php:963
-#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:907
+#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:998
 #: templates/columns_definitions/table_fields_definitions.phtml:47
 #, fuzzy
 #| msgid "Edit Privileges"
@@ -10324,22 +10341,22 @@ msgid "Switch to copied table"
 msgstr "Kopiatutako taulara aldatu"
 
 #: libraries/operations.lib.php:1360
-#: templates/structure/check_all_tables.phtml:18
+#: templates/database/structure/check_all_tables.phtml:18
 msgid "Table maintenance"
 msgstr "Taularen mantenua"
 
 #: libraries/operations.lib.php:1398
-#: templates/structure/check_all_tables.phtml:19
+#: templates/database/structure/check_all_tables.phtml:19
 msgid "Analyze table"
 msgstr "Taula aztertu"
 
 #: libraries/operations.lib.php:1413
-#: templates/structure/check_all_tables.phtml:20
+#: templates/database/structure/check_all_tables.phtml:20
 msgid "Check table"
 msgstr "Taula egiaztatu"
 
 #: libraries/operations.lib.php:1428
-#: templates/structure/check_all_tables.phtml:22
+#: templates/database/structure/check_all_tables.phtml:22
 #, fuzzy
 #| msgid "Check table"
 msgid "Checksum table"
@@ -10361,18 +10378,19 @@ msgid "Flush the table (FLUSH)"
 msgstr "Taularen cachea hustu (\"FLUSH\")"
 
 #: libraries/operations.lib.php:1477
-#: templates/structure/check_all_tables.phtml:23
-#: templates/structure/display_table_stats.phtml:56
+#: templates/database/structure/check_all_tables.phtml:23
+#: templates/table/structure/display_table_stats.phtml:56
 msgid "Optimize table"
 msgstr "Taula optimizatu"
 
 #: libraries/operations.lib.php:1492
-#: templates/structure/check_all_tables.phtml:24
+#: templates/database/structure/check_all_tables.phtml:24
 msgid "Repair table"
 msgstr "Taula konpondu"
 
 #: libraries/operations.lib.php:1538
-#: templates/structure/check_all_tables.phtml:14 view_operations.php:127
+#: templates/database/structure/check_all_tables.phtml:14
+#: view_operations.php:127
 #, fuzzy
 #| msgid "Dumping data for table"
 msgid "Delete data or table"
@@ -10505,7 +10523,7 @@ msgid "Cannot connect: invalid settings."
 msgstr ""
 
 #: libraries/plugins/auth/AuthenticationConfig.class.php:108
-#: libraries/plugins/auth/AuthenticationCookie.class.php:134
+#: libraries/plugins/auth/AuthenticationCookie.class.php:122
 #: libraries/plugins/auth/AuthenticationHttp.class.php:96
 #, php-format
 msgid "Welcome to %s"
@@ -10534,38 +10552,38 @@ msgstr ""
 msgid "Retry to connect"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:146
+#: libraries/plugins/auth/AuthenticationCookie.class.php:134
 msgid "Your session has expired. Please log in again."
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:170
+#: libraries/plugins/auth/AuthenticationCookie.class.php:158
 msgid "Log in"
 msgstr "Hasi saioa"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:178
-#: libraries/plugins/auth/AuthenticationCookie.class.php:188
+#: libraries/plugins/auth/AuthenticationCookie.class.php:166
+#: libraries/plugins/auth/AuthenticationCookie.class.php:176
 msgid "You can enter hostname/IP address and port separated by space."
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:193
+#: libraries/plugins/auth/AuthenticationCookie.class.php:181
 msgid "Username:"
 msgstr "Erabiltzaile-izena:"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:205
+#: libraries/plugins/auth/AuthenticationCookie.class.php:193
 #, fuzzy
 #| msgid "Server Choice"
 msgid "Server Choice:"
 msgstr "Zerbitzariaren hautaketa"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:386
+#: libraries/plugins/auth/AuthenticationCookie.class.php:374
 msgid "Entered captcha is wrong, try again!"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:396
+#: libraries/plugins/auth/AuthenticationCookie.class.php:384
 msgid "Please enter correct captcha!"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:423
+#: libraries/plugins/auth/AuthenticationCookie.class.php:411
 #, fuzzy
 #| msgid "Cannot log in to the MySQL server"
 msgid "You are not allowed to log in to this MySQL server!"
@@ -10677,7 +10695,7 @@ msgstr "Bidalita"
 #: libraries/plugins/export/ExportOdt.class.php:593
 #: libraries/plugins/export/ExportTexytext.class.php:428
 #: libraries/plugins/export/PMA_ExportPdf.class.php:313
-#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:984
 #: libraries/rte/rte_triggers.lib.php:377
 #, fuzzy
 #| msgid "Description"
@@ -11028,7 +11046,7 @@ msgid "Last check:"
 msgstr "Azken egiaztapena"
 
 #: libraries/plugins/export/ExportSql.class.php:1399
-#: templates/structure/structure_table_row.phtml:183
+#: templates/database/structure/structure_table_row.phtml:183
 msgid "in use"
 msgstr "lanean"
 
@@ -11226,18 +11244,14 @@ msgstr ""
 msgid "The imported file does not contain any data!"
 msgstr ""
 
-#: libraries/plugins/import/ImportSql.class.php:169
+#: libraries/plugins/import/ImportSql.class.php:72
 msgid "SQL compatibility mode:"
 msgstr ""
 
-#: libraries/plugins/import/ImportSql.class.php:181
+#: libraries/plugins/import/ImportSql.class.php:84
 msgid "Do not use <code>AUTO_INCREMENT</code> for zero values"
 msgstr ""
 
-#: libraries/plugins/import/ImportSql.class.php:195
-msgid "Read as multibytes"
-msgstr ""
-
 #: libraries/plugins/import/ImportXml.class.php:54
 msgid "XML"
 msgstr "XML"
@@ -11282,7 +11296,7 @@ msgid "Show grid"
 msgstr "Sareta erakutsi"
 
 #: libraries/plugins/schema/SchemaPdf.class.php:94
-#: templates/structure/print_view_data_dictionary_link.phtml:6
+#: templates/database/structure/print_view_data_dictionary_link.phtml:6
 msgid "Data Dictionary"
 msgstr "Datu-hiztegia"
 
@@ -11314,7 +11328,7 @@ msgid "The %s table doesn't exist!"
 msgstr "\"%s\" taula ez da existitzen!"
 
 #: libraries/plugins/schema/eps/Eps_Relation_Schema.class.php:321
-#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:309
+#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:323
 #, fuzzy, php-format
 #| msgid "Schema of the \"%s\" database - Page %s"
 msgid "Schema of the %s database - Page %s"
@@ -11344,7 +11358,7 @@ msgstr "Edukinen taula"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1005
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1028
 #: libraries/tracking.lib.php:884
-#: templates/structure/table_structure_header.phtml:11
+#: templates/table/structure/table_structure_header.phtml:11
 msgid "Extra"
 msgstr "Extra"
 
@@ -11732,51 +11746,51 @@ msgstr ""
 msgid "Create the needed tables with the <code>%screate_tables.sql</code>."
 msgstr ""
 
-#: libraries/relation.lib.php:360
+#: libraries/relation.lib.php:357
 msgid "Create a pma user and give access to these tables."
 msgstr ""
 
-#: libraries/relation.lib.php:365
+#: libraries/relation.lib.php:360
 msgid ""
 "Enable advanced features in configuration file (<code>config.inc.php</"
 "code>), for example by starting from <code>config.sample.inc.php</code>."
 msgstr ""
 
-#: libraries/relation.lib.php:373
+#: libraries/relation.lib.php:365
 msgid "Re-login to phpMyAdmin to load the updated configuration file."
 msgstr ""
 
-#: libraries/relation.lib.php:1612
+#: libraries/relation.lib.php:1607
 msgid "no description"
 msgstr "Deskribapenik ez"
 
-#: libraries/relation.lib.php:1811
+#: libraries/relation.lib.php:1806
 msgid ""
 "You do not have necessary privileges to create a database named "
 "'phpmyadmin'. You may go to 'Operations' tab of any database to set up the "
 "phpMyAdmin configuration storage there."
 msgstr ""
 
-#: libraries/relation.lib.php:1928
+#: libraries/relation.lib.php:1923
 #, php-format
 msgid ""
 "%sCreate%s a database named 'phpmyadmin' and setup the phpMyAdmin "
 "configuration storage there."
 msgstr ""
 
-#: libraries/relation.lib.php:1936
+#: libraries/relation.lib.php:1931
 #, php-format
 msgid ""
 "%sCreate%s the phpMyAdmin configuration storage in the current database."
 msgstr ""
 
-#: libraries/relation.lib.php:1944
+#: libraries/relation.lib.php:1939
 #, php-format
 msgid "%sCreate%s missing phpMyAdmin configuration storage tables."
 msgstr ""
 
 #: libraries/replication_gui.lib.php:46 libraries/replication_gui.lib.php:343
-#: libraries/server_databases.lib.php:387
+#: libraries/server_databases.lib.php:398
 msgid "Master replication"
 msgstr ""
 
@@ -11832,7 +11846,7 @@ msgid ""
 msgstr ""
 
 #: libraries/replication_gui.lib.php:141
-#: libraries/server_databases.lib.php:389
+#: libraries/server_databases.lib.php:400
 msgid "Slave replication"
 msgstr ""
 
@@ -12117,10 +12131,10 @@ msgid "Master server changed successfully to %s."
 msgstr "Pribilegioak arrakastaz berkargatu dira."
 
 #: libraries/rte/rte_events.lib.php:106 libraries/rte/rte_events.lib.php:115
-#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:149
-#: libraries/rte/rte_routines.lib.php:158
-#: libraries/rte/rte_routines.lib.php:231
-#: libraries/rte/rte_routines.lib.php:1362
+#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:219
+#: libraries/rte/rte_routines.lib.php:246
+#: libraries/rte/rte_routines.lib.php:368
+#: libraries/rte/rte_routines.lib.php:1453
 #: libraries/rte/rte_triggers.lib.php:82 libraries/rte/rte_triggers.lib.php:91
 #: libraries/rte/rte_triggers.lib.php:123
 #, php-format
@@ -12142,7 +12156,7 @@ msgstr "%s taula ezabatu egin da"
 msgid "Event %1$s has been created."
 msgstr "%s taula ezabatu egin da"
 
-#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:251
+#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:266
 #: libraries/rte/rte_triggers.lib.php:144
 msgid "One or more errors have occurred while processing your request:"
 msgstr ""
@@ -12152,7 +12166,7 @@ msgstr ""
 msgid "Edit event"
 msgstr "Bidalita"
 
-#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:794
+#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:885
 #: libraries/rte/rte_triggers.lib.php:323 view_create.php:180
 msgid "Details"
 msgstr ""
@@ -12167,7 +12181,7 @@ msgstr "Esportazio mota"
 msgid "Event type"
 msgstr "Esportazio mota"
 
-#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:817
+#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:908
 #, fuzzy, php-format
 #| msgid "Change"
 msgid "Change to %s"
@@ -12202,12 +12216,14 @@ msgstr "Amaiera"
 msgid "On completion preserve"
 msgstr "\"Insert\"ak osatu"
 
-#: libraries/rte/rte_events.lib.php:491 libraries/rte/rte_routines.lib.php:930
+#: libraries/rte/rte_events.lib.php:491
+#: libraries/rte/rte_routines.lib.php:1021
 #: libraries/rte/rte_triggers.lib.php:383 view_create.php:209
 msgid "Definer"
 msgstr ""
 
-#: libraries/rte/rte_events.lib.php:535 libraries/rte/rte_routines.lib.php:997
+#: libraries/rte/rte_events.lib.php:535
+#: libraries/rte/rte_routines.lib.php:1088
 #: libraries/rte/rte_triggers.lib.php:422
 msgid "The definer must be in the \"username@hostname\" format!"
 msgstr ""
@@ -12233,9 +12249,9 @@ msgid "You must provide an event definition."
 msgstr ""
 
 #: libraries/rte/rte_export.lib.php:43 libraries/rte/rte_general.lib.php:72
-#: libraries/rte/rte_routines.lib.php:345
-#: libraries/rte/rte_routines.lib.php:1198
-#: libraries/rte/rte_routines.lib.php:1411
+#: libraries/rte/rte_routines.lib.php:153
+#: libraries/rte/rte_routines.lib.php:1289
+#: libraries/rte/rte_routines.lib.php:1502
 #, fuzzy
 #| msgid "Processes"
 msgid "Error in processing request:"
@@ -12271,145 +12287,145 @@ msgid ""
 "problems."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:110
-#: libraries/rte/rte_routines.lib.php:1006
+#: libraries/rte/rte_routines.lib.php:123
+msgid "Edit routine"
+msgstr ""
+
+#: libraries/rte/rte_routines.lib.php:200
+#: libraries/rte/rte_routines.lib.php:1097
 #, php-format
 msgid "Invalid routine type: \"%s\""
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:170
+#: libraries/rte/rte_routines.lib.php:253
+#, fuzzy, php-format
+msgid "Routine %1$s has been created."
+msgstr "%s taula ezabatu egin da"
+
+#: libraries/rte/rte_routines.lib.php:380
 msgid "Sorry, we failed to restore the dropped routine."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:211
+#: libraries/rte/rte_routines.lib.php:439
 #, fuzzy, php-format
 #| msgid "Table %s has been dropped."
 msgid "Routine %1$s has been modified. Privileges have been adjusted."
 msgstr "%s taula ezabatu egin da"
 
-#: libraries/rte/rte_routines.lib.php:216
+#: libraries/rte/rte_routines.lib.php:444
 #, fuzzy, php-format
 #| msgid "Table %s has been dropped."
 msgid "Routine %1$s has been modified."
 msgstr "%s taula ezabatu egin da"
 
-#: libraries/rte/rte_routines.lib.php:238
-#, fuzzy, php-format
-msgid "Routine %1$s has been created."
-msgstr "%s taula ezabatu egin da"
-
-#: libraries/rte/rte_routines.lib.php:315
-msgid "Edit routine"
-msgstr ""
-
-#: libraries/rte/rte_routines.lib.php:797
+#: libraries/rte/rte_routines.lib.php:888
 #, fuzzy
 #| msgid "Column names"
 msgid "Routine name"
 msgstr "Zutabe izenak"
 
-#: libraries/rte/rte_routines.lib.php:823
+#: libraries/rte/rte_routines.lib.php:914
 msgid "Parameters"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:829
+#: libraries/rte/rte_routines.lib.php:920
 #, fuzzy
 #| msgid "Creation"
 msgid "Direction"
 msgstr "Sortzea"
 
-#: libraries/rte/rte_routines.lib.php:847
+#: libraries/rte/rte_routines.lib.php:938
 msgid "Add parameter"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:851
+#: libraries/rte/rte_routines.lib.php:942
 #, fuzzy
 msgid "Remove last parameter"
 msgstr "Taula berrizendatu izen honetara: "
 
-#: libraries/rte/rte_routines.lib.php:856
+#: libraries/rte/rte_routines.lib.php:947
 msgid "Return type"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:862
+#: libraries/rte/rte_routines.lib.php:953
 #, fuzzy
 #| msgid "Length/Values"
 msgid "Return length/values"
 msgstr "Luzera/Balioak*"
 
-#: libraries/rte/rte_routines.lib.php:868
+#: libraries/rte/rte_routines.lib.php:959
 #, fuzzy
 #| msgid "Table options"
 msgid "Return options"
 msgstr "Taularen hobespenak"
 
-#: libraries/rte/rte_routines.lib.php:899
+#: libraries/rte/rte_routines.lib.php:990
 msgid "Is deterministic"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:920
+#: libraries/rte/rte_routines.lib.php:1011
 msgid ""
 "You do not have sufficient privileges to perform this operation; Please "
 "refer to the documentation for more details"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:935
+#: libraries/rte/rte_routines.lib.php:1026
 #, fuzzy
 #| msgid "Query type"
 msgid "Security type"
 msgstr "Kontsulta mota"
 
-#: libraries/rte/rte_routines.lib.php:944
+#: libraries/rte/rte_routines.lib.php:1035
 msgid "SQL data access"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1013
+#: libraries/rte/rte_routines.lib.php:1104
 msgid "You must provide a routine name!"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1047
+#: libraries/rte/rte_routines.lib.php:1138
 #, php-format
 msgid "Invalid direction \"%s\" given for parameter."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1069
-#: libraries/rte/rte_routines.lib.php:1131
+#: libraries/rte/rte_routines.lib.php:1160
+#: libraries/rte/rte_routines.lib.php:1222
 msgid ""
 "You must provide length/values for routine parameters of type ENUM, SET, "
 "VARCHAR and VARBINARY."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1095
+#: libraries/rte/rte_routines.lib.php:1186
 msgid "You must provide a name and a type for each routine parameter."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1114
+#: libraries/rte/rte_routines.lib.php:1205
 msgid "You must provide a valid return type for the routine."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1174
+#: libraries/rte/rte_routines.lib.php:1265
 msgid "You must provide a routine definition."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1285
+#: libraries/rte/rte_routines.lib.php:1376
 #, php-format
 msgid "Execution results of routine %s"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1340
+#: libraries/rte/rte_routines.lib.php:1431
 #, php-format
 msgid "%d row affected by the last statement inside the procedure."
 msgid_plural "%d rows affected by the last statement inside the procedure."
 msgstr[0] ""
 msgstr[1] ""
 
-#: libraries/rte/rte_routines.lib.php:1398
-#: libraries/rte/rte_routines.lib.php:1406
+#: libraries/rte/rte_routines.lib.php:1489
+#: libraries/rte/rte_routines.lib.php:1497
 msgid "Execute routine"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1485
-#: libraries/rte/rte_routines.lib.php:1488
+#: libraries/rte/rte_routines.lib.php:1576
+#: libraries/rte/rte_routines.lib.php:1579
 msgid "Routine parameters"
 msgstr ""
 
@@ -12588,7 +12604,7 @@ msgid "Original position"
 msgstr ""
 
 #: libraries/server_bin_log.lib.php:133
-#: templates/structure/display_table_stats.phtml:4
+#: templates/table/structure/display_table_stats.phtml:4
 #, fuzzy
 msgid "Information"
 msgstr "Saioa hasteko informazioa"
@@ -12627,12 +12643,12 @@ msgstr ""
 "Oharra: Datu-basearen estatistikak hemen gaituz gero web-zerbitzaria eta "
 "MySQL-arenaren arteko trafiko handia sor liteke."
 
-#: libraries/server_databases.lib.php:364
-#: libraries/server_databases.lib.php:365
+#: libraries/server_databases.lib.php:366
+#: libraries/server_databases.lib.php:371
 msgid "Enable Statistics"
 msgstr "Estatistikak gaitu"
 
-#: libraries/server_databases.lib.php:481
+#: libraries/server_databases.lib.php:492
 #, fuzzy, php-format
 #| msgid "%s databases have been dropped successfully."
 msgid "%1$d database has been dropped successfully."
@@ -13028,7 +13044,7 @@ msgid "You have revoked the privileges for %s."
 msgstr "Zuk %s-(r)en pribilegioak ezeztatu dituzu."
 
 #: libraries/server_privileges.lib.php:2059
-#: libraries/server_privileges.lib.php:4290
+#: libraries/server_privileges.lib.php:4316
 #, fuzzy
 #| msgid "Add user"
 msgid "Add user account"
@@ -13215,60 +13231,60 @@ msgstr "%s ezabatzen"
 msgid "The privileges were reloaded successfully."
 msgstr "Pribilegioak arrakastaz berkargatu dira."
 
-#: libraries/server_privileges.lib.php:3994
+#: libraries/server_privileges.lib.php:4003
 #, php-format
 msgid "The user %s already exists!"
 msgstr "%s erabiltzailea badago lehendik ere!"
 
-#: libraries/server_privileges.lib.php:4232
+#: libraries/server_privileges.lib.php:4258
 #, fuzzy, php-format
 #| msgid "Privileges"
 msgid "Privileges for %s"
 msgstr "Pribilegioak"
 
-#: libraries/server_privileges.lib.php:4241
+#: libraries/server_privileges.lib.php:4267
 #: libraries/server_status_processes.lib.php:72
 #: libraries/server_user_groups.lib.php:39
 msgid "User"
 msgstr "Erabiltzailea"
 
-#: libraries/server_privileges.lib.php:4282
+#: libraries/server_privileges.lib.php:4308
 msgctxt "Create new user"
 msgid "New"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4311
+#: libraries/server_privileges.lib.php:4337
 #, fuzzy
 #| msgid "Edit Privileges"
 msgid "Edit privileges:"
 msgstr "Editatu Pribilegioak"
 
-#: libraries/server_privileges.lib.php:4312
+#: libraries/server_privileges.lib.php:4338
 #, fuzzy
 #| msgid "User"
 msgid "User account"
 msgstr "Erabiltzailea"
 
-#: libraries/server_privileges.lib.php:4371
+#: libraries/server_privileges.lib.php:4397
 msgid ""
 "Note: You are attempting to edit privileges of the user with which you are "
 "currently logged in."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4391 libraries/server_users.lib.php:25
+#: libraries/server_privileges.lib.php:4417 libraries/server_users.lib.php:25
 #, fuzzy
 #| msgid "User overview"
 msgid "User accounts overview"
 msgstr "Erabiltzailearen info orokorra"
 
-#: libraries/server_privileges.lib.php:4459
+#: libraries/server_privileges.lib.php:4485
 msgid ""
 "A user account allowing any user from localhost to connect is present. This "
 "will prevent other users from connecting if the host part of their account "
 "allows a connection from any (%) host."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4500
+#: libraries/server_privileges.lib.php:4526
 #, php-format
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
@@ -13282,7 +13298,7 @@ msgstr ""
 "daitezke. Kasu honetan, jarraitu aurretik %spribilegioak berkargatu%s "
 "beharko zenituzke."
 
-#: libraries/server_privileges.lib.php:4519
+#: libraries/server_privileges.lib.php:4545
 #, fuzzy
 #| msgid ""
 #| "Note: phpMyAdmin gets the users' privileges directly from MySQL's "
@@ -13302,64 +13318,64 @@ msgstr ""
 "daitezke. Kasu honetan, jarraitu aurretik %spribilegioak berkargatu%s "
 "beharko zenituzke."
 
-#: libraries/server_privileges.lib.php:4569
+#: libraries/server_privileges.lib.php:4595
 msgid "The selected user was not found in the privilege table."
 msgstr "Hautatutako erabiltzailea ez da pribilegioen taulan aurkitu."
 
-#: libraries/server_privileges.lib.php:4801
+#: libraries/server_privileges.lib.php:4827
 msgid "You have added a new user."
 msgstr "Erabiltzaile berria gehitu duzu."
 
-#: libraries/server_status.lib.php:53
+#: libraries/server_status.lib.php:60
 #, php-format
 msgid "Network traffic since startup: %s"
 msgstr ""
 
-#: libraries/server_status.lib.php:66
+#: libraries/server_status.lib.php:73
 #, fuzzy, php-format
 #| msgid "This MySQL server has been running for %s. It started up on %s."
 msgid "This MySQL server has been running for %1$s. It started up on %2$s."
 msgstr "MySQL zerbitzari hau martxan egon da %s. %s abiaratu zelarik."
 
-#: libraries/server_status.lib.php:80
+#: libraries/server_status.lib.php:94
 msgid ""
 "This MySQL server works as <b>master</b> and <b>slave</b> in <b>replication</"
 "b> process."
 msgstr ""
 
-#: libraries/server_status.lib.php:85
+#: libraries/server_status.lib.php:99
 msgid "This MySQL server works as <b>master</b> in <b>replication</b> process."
 msgstr ""
 
-#: libraries/server_status.lib.php:90
+#: libraries/server_status.lib.php:104
 msgid "This MySQL server works as <b>slave</b> in <b>replication</b> process."
 msgstr ""
 
-#: libraries/server_status.lib.php:106
+#: libraries/server_status.lib.php:116
 msgid "Replication status"
 msgstr ""
 
-#: libraries/server_status.lib.php:137
+#: libraries/server_status.lib.php:146
 msgid ""
 "On a busy server, the byte counters may overrun, so those statistics as "
 "reported by the MySQL server may be incorrect."
 msgstr ""
 
-#: libraries/server_status.lib.php:148
+#: libraries/server_status.lib.php:157
 msgid "Received"
 msgstr "Jasota"
 
-#: libraries/server_status.lib.php:167
+#: libraries/server_status.lib.php:176
 msgid "Sent"
 msgstr "Bidalita"
 
-#: libraries/server_status.lib.php:234
+#: libraries/server_status.lib.php:243
 #, fuzzy
 #| msgid "Connections"
 msgid "Max. concurrent connections"
 msgstr "Konexioak"
 
-#: libraries/server_status.lib.php:244
+#: libraries/server_status.lib.php:253
 msgid "Failed attempts"
 msgstr "Erratutako saiakerak"
 
@@ -14341,7 +14357,7 @@ msgstr ""
 msgid "Not implemented yet."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/AlterOperation.php:193
+#: libraries/sql-parser/src/Components/AlterOperation.php:191
 msgid "Unrecognized alter operation."
 msgstr ""
 
@@ -14355,7 +14371,7 @@ msgid "An opening bracket followed by a set of values was expected."
 msgstr ""
 
 #: libraries/sql-parser/src/Components/ArrayObj.php:101
-#: libraries/sql-parser/src/Components/FieldDefinition.php:202
+#: libraries/sql-parser/src/Components/CreateDefinition.php:202
 msgid "An opening bracket was expected."
 msgstr ""
 
@@ -14363,25 +14379,35 @@ msgstr ""
 msgid "A comma or a closing bracket was expected"
 msgstr ""
 
+#: libraries/sql-parser/src/Components/CreateDefinition.php:246
+#, fuzzy
+#| msgid "No databases selected."
+msgid "A comma or a closing bracket was expected."
+msgstr "Ez dago datu-baserik aukeratuta."
+
+#: libraries/sql-parser/src/Components/CreateDefinition.php:262
+msgid "A closing bracket was expected."
+msgstr ""
+
 #: libraries/sql-parser/src/Components/DataType.php:125
 msgid "Unrecognized data type."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:225
+#: libraries/sql-parser/src/Components/Expression.php:227
 msgid "Unexpected closing bracket."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:246
-#: libraries/sql-parser/src/Components/Expression.php:283
-#: libraries/sql-parser/src/Components/Expression.php:303
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:285
+#: libraries/sql-parser/src/Components/Expression.php:305
 msgid "An alias was previously found."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:257
+#: libraries/sql-parser/src/Components/Expression.php:259
 msgid "Unexpected dot."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:327
+#: libraries/sql-parser/src/Components/Expression.php:329
 #, fuzzy
 #| msgid "No databases selected."
 msgid "An alias was expected."
@@ -14393,16 +14419,6 @@ msgstr "Ez dago datu-baserik aukeratuta."
 msgid "An expression was expected."
 msgstr "Ez dago datu-baserik aukeratuta."
 
-#: libraries/sql-parser/src/Components/FieldDefinition.php:246
-#, fuzzy
-#| msgid "No databases selected."
-msgid "A comma or a closing bracket was expected."
-msgstr "Ez dago datu-baserik aukeratuta."
-
-#: libraries/sql-parser/src/Components/FieldDefinition.php:262
-msgid "A closing bracket was expected."
-msgstr ""
-
 #: libraries/sql-parser/src/Components/Limit.php:90
 #: libraries/sql-parser/src/Components/Limit.php:112
 msgid "An offset was expected."
@@ -14444,27 +14460,27 @@ msgstr ""
 msgid "Expected delimiter."
 msgstr ""
 
-#: libraries/sql-parser/src/Lexer.php:753
+#: libraries/sql-parser/src/Lexer.php:777
 #, fuzzy, php-format
 msgid "Ending quote %1$s was expected."
 msgstr "%s taula ezabatu egin da"
 
-#: libraries/sql-parser/src/Lexer.php:789
+#: libraries/sql-parser/src/Lexer.php:813
 #, fuzzy
 msgid "Variable name was expected."
 msgstr "Txantiloi-fitxategiaren izena"
 
-#: libraries/sql-parser/src/Parser.php:380
+#: libraries/sql-parser/src/Parser.php:391
 #, fuzzy
 #| msgid "At Beginning of Table"
 msgid "Unexpected beginning of statement."
 msgstr "Taularen hasieran"
 
-#: libraries/sql-parser/src/Parser.php:399
+#: libraries/sql-parser/src/Parser.php:410
 msgid "Unrecognized statement type."
 msgstr ""
 
-#: libraries/sql-parser/src/Parser.php:479
+#: libraries/sql-parser/src/Parser.php:489
 msgid "No transaction was previously started."
 msgstr ""
 
@@ -14490,8 +14506,10 @@ msgid "The name of the entity was expected."
 msgstr ""
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:310
-msgid "At least one field definition was expected."
-msgstr ""
+#, fuzzy
+#| msgid "The row has been deleted."
+msgid "At least one column definition was expected."
+msgstr "Errenkada ezabatua izan da"
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:329
 msgid "A \"RETURNS\" keyword was expected."
@@ -14566,25 +14584,25 @@ msgstr "%s laster-marka sortu da"
 msgid "Using bookmark \"%s\" as default browse query."
 msgstr ""
 
-#: libraries/sql.lib.php:1306
+#: libraries/sql.lib.php:1300
 msgid "Showing as PHP code"
 msgstr ""
 
-#: libraries/sql.lib.php:1638
+#: libraries/sql.lib.php:1632
 #, php-format
 msgid ""
 "Current selection does not contain a unique column. Grid edit, checkbox, "
 "Edit, Copy and Delete features are not available. %s"
 msgstr ""
 
-#: libraries/sql.lib.php:1649
+#: libraries/sql.lib.php:1643
 #, php-format
 msgid ""
 "Current selection does not contain a unique column. Grid edit, Edit, Copy "
 "and Delete features may result in undesired behavior. %s"
 msgstr ""
 
-#: libraries/sql.lib.php:1688
+#: libraries/sql.lib.php:1682
 #, php-format
 msgid "Problems with indexes of table `%s`"
 msgstr ""
@@ -14754,7 +14772,7 @@ msgid "Version %s snapshot (SQL code)"
 msgstr ""
 
 #: libraries/tracking.lib.php:947
-#: templates/structure/table_structure_row.phtml:33
+#: templates/table/structure/table_structure_row.phtml:33
 #, fuzzy
 #| msgid "None"
 msgctxt "None for default"
@@ -14810,19 +14828,19 @@ msgstr "Zerbitzariaren bertsioa"
 msgid "Version %1$s was created, tracking for %2$s is active."
 msgstr ""
 
-#: libraries/user_preferences.inc.php:29
+#: libraries/user_preferences.inc.php:30
 #, fuzzy
 #| msgid "General relation features"
 msgid "Manage your settings"
 msgstr "Erlazioen ezaaugarri orokorrak"
 
-#: libraries/user_preferences.inc.php:46 prefs_manage.php:307
+#: libraries/user_preferences.inc.php:54 prefs_manage.php:307
 #, fuzzy
 #| msgid "Modifications have been saved"
 msgid "Configuration has been saved."
 msgstr "Aldaketak gorde dira"
 
-#: libraries/user_preferences.inc.php:66
+#: libraries/user_preferences.inc.php:74
 #, php-format
 msgid ""
 "Your preferences will be saved for current session only. Storing them "
@@ -15222,7 +15240,7 @@ msgid "first"
 msgstr ""
 
 #: templates/columns_definitions/move_column.phtml:12
-#: templates/structure/add_column.phtml:21
+#: templates/table/structure/add_column.phtml:21
 #, fuzzy, php-format
 #| msgid "After %s"
 msgid "after %s"
@@ -15310,241 +15328,344 @@ msgstr "Nabigatzailearen eraldaketa"
 msgid "Input transformation options"
 msgstr "Eraldaketen hobespenak"
 
-#: templates/designer/aggregate_query_panel.phtml:22
-#: templates/designer/options_panel.phtml:100
+#: templates/database/create_table.phtml:7
+#: templates/database/designer/side_menu.phtml:77
+#: templates/database/designer/side_menu.phtml:80
+#, fuzzy
+msgid "Create table"
+msgstr "Orri berri bat sortu"
+
+#: templates/database/create_table.phtml:15
+#, fuzzy
+#| msgid "Number of rows per page"
+msgid "Number of columns"
+msgstr "Errenkada kopurua orriko"
+
+#: templates/database/designer/aggregate_query_panel.phtml:22
+#: templates/database/designer/options_panel.phtml:100
 #, fuzzy
 #| msgid "Create"
 msgid "Aggregate"
 msgstr "Sortu"
 
-#: templates/designer/aggregate_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:61
-#: templates/designer/options_panel.phtml:106
-#: templates/designer/options_panel.phtml:170
-#: templates/designer/where_query_panel.phtml:30
-#: templates/table/table_header.phtml:9
+#: templates/database/designer/aggregate_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:61
+#: templates/database/designer/options_panel.phtml:106
+#: templates/database/designer/options_panel.phtml:170
+#: templates/database/designer/where_query_panel.phtml:30
+#: templates/table/search/table_header.phtml:9
 #, fuzzy
 msgid "Operator"
 msgstr "Eragiketak"
 
-#: templates/designer/database_tables.phtml:29
+#: templates/database/designer/database_tables.phtml:29
 msgid "Toggle"
 msgstr ""
 
-#: templates/designer/database_tables.phtml:40
+#: templates/database/designer/database_tables.phtml:40
 #, fuzzy
 #| msgid "Databases"
 msgid "See table structure"
 msgstr "Datu-baseak"
 
-#: templates/designer/delete_relation_panel.phtml:21
+#: templates/database/designer/delete_relation_panel.phtml:21
 msgid "Delete relation"
 msgstr ""
 
-#: templates/designer/edit_delete_pages.phtml:7
+#: templates/database/designer/edit_delete_pages.phtml:7
 #, fuzzy
 #| msgid "Page number:"
 msgid "Page to open"
 msgstr "Orri zenbakia:"
 
-#: templates/designer/edit_delete_pages.phtml:7
+#: templates/database/designer/edit_delete_pages.phtml:7
 #, fuzzy
 msgid "Page to delete"
 msgstr "Erlazioen ikuspegia"
 
-#: templates/designer/having_query_panel.phtml:90
-#: templates/designer/options_panel.phtml:63
-#: templates/designer/options_panel.phtml:229
-#: templates/designer/where_query_panel.phtml:59
+#: templates/database/designer/having_query_panel.phtml:90
+#: templates/database/designer/options_panel.phtml:63
+#: templates/database/designer/options_panel.phtml:229
+#: templates/database/designer/where_query_panel.phtml:59
 #, fuzzy
 #| msgid "Export"
 msgid "Except"
 msgstr "Esportatu"
 
-#: templates/designer/having_query_panel.phtml:102
-#: templates/designer/options_panel.phtml:75
-#: templates/designer/options_panel.phtml:241
-#: templates/designer/where_query_panel.phtml:71
+#: templates/database/designer/having_query_panel.phtml:102
+#: templates/database/designer/options_panel.phtml:75
+#: templates/database/designer/options_panel.phtml:241
+#: templates/database/designer/where_query_panel.phtml:71
 #, fuzzy
 #| msgid "in query"
 msgid "subquery"
 msgstr "kontsultan"
 
-#: templates/designer/new_relation_panel.phtml:22
-#: templates/designer/side_menu.phtml:84 templates/designer/side_menu.phtml:87
+#: templates/database/designer/new_relation_panel.phtml:22
+#: templates/database/designer/side_menu.phtml:84
+#: templates/database/designer/side_menu.phtml:87
 msgid "Create relation"
 msgstr ""
 
-#: templates/designer/options_panel.phtml:34
-#: templates/designer/options_panel.phtml:200
+#: templates/database/designer/options_panel.phtml:34
+#: templates/database/designer/options_panel.phtml:200
 #, fuzzy
 msgid "Relation operator"
 msgstr "Erlazioen ikuspegia"
 
-#: templates/designer/options_panel.phtml:85
-#: templates/designer/rename_to_panel.phtml:23
+#: templates/database/designer/options_panel.phtml:85
+#: templates/database/designer/rename_to_panel.phtml:23
 #, fuzzy
 msgid "Rename to"
 msgstr "Taula berrizendatu izen honetara: "
 
-#: templates/designer/options_panel.phtml:91
-#: templates/designer/rename_to_panel.phtml:31
+#: templates/database/designer/options_panel.phtml:91
+#: templates/database/designer/rename_to_panel.phtml:31
 #, fuzzy
 #| msgid "User name"
 msgid "New name"
 msgstr "Erabiltzaile-izena"
 
-#: templates/designer/page_save_as.phtml:4
+#: templates/database/designer/page_save_as.phtml:4
 #, fuzzy
 #| msgid "Import files"
 msgid "Save to selected page"
 msgstr "Fitxategiak inportatu"
 
-#: templates/designer/page_save_as.phtml:5
+#: templates/database/designer/page_save_as.phtml:5
 #, fuzzy
 #| msgid "Create a new index"
 msgid "Create a page and save to it"
 msgstr "Indize berri bat sortu"
 
-#: templates/designer/page_save_as.phtml:26
+#: templates/database/designer/page_save_as.phtml:26
 #, fuzzy
 #| msgid "User name"
 msgid "New page name"
 msgstr "Erabiltzaile-izena"
 
-#: templates/designer/page_selector.phtml:2
+#: templates/database/designer/page_selector.phtml:2
 #, fuzzy
 #| msgid "Select Tables"
 msgid "Select page"
 msgstr "Taulak hautatu"
 
-#: templates/designer/query_details.phtml:10
+#: templates/database/designer/query_details.phtml:10
 #, fuzzy
 #| msgid "Table options"
 msgid "Active options"
 msgstr "Taularen hobespenak"
 
-#: templates/designer/schema_export.phtml:4
+#: templates/database/designer/schema_export.phtml:4
 msgid "Select Export Relational Type"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:19 templates/designer/side_menu.phtml:25
+#: templates/database/designer/side_menu.phtml:19
+#: templates/database/designer/side_menu.phtml:25
 #, fuzzy
 #| msgid "Show tables"
 msgid "Show/Hide tables list"
 msgstr "Taulak erakutsi"
 
-#: templates/designer/side_menu.phtml:29 templates/designer/side_menu.phtml:35
-#: templates/designer/side_menu.phtml:36
+#: templates/database/designer/side_menu.phtml:29
+#: templates/database/designer/side_menu.phtml:35
+#: templates/database/designer/side_menu.phtml:36
 msgid "View in fullscreen"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:34
+#: templates/database/designer/side_menu.phtml:34
 msgid "Exit fullscreen"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:41 templates/designer/side_menu.phtml:45
+#: templates/database/designer/side_menu.phtml:41
+#: templates/database/designer/side_menu.phtml:45
 #, fuzzy
 #| msgid "User name"
 msgid "New page"
 msgstr "Erabiltzaile-izena"
 
-#: templates/designer/side_menu.phtml:70 templates/designer/side_menu.phtml:73
+#: templates/database/designer/side_menu.phtml:70
+#: templates/database/designer/side_menu.phtml:73
 #, fuzzy
 #| msgid "Select Tables"
 msgid "Delete pages"
 msgstr "Taulak hautatu"
 
-#: templates/designer/side_menu.phtml:77 templates/designer/side_menu.phtml:80
-#: templates/table/create_table.phtml:7
-#, fuzzy
-msgid "Create table"
-msgstr "Orri berri bat sortu"
-
-#: templates/designer/side_menu.phtml:98
-#: templates/designer/side_menu.phtml:101
+#: templates/database/designer/side_menu.phtml:98
+#: templates/database/designer/side_menu.phtml:101
 msgid "Reload"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:107
-#: templates/designer/side_menu.phtml:110
+#: templates/database/designer/side_menu.phtml:107
+#: templates/database/designer/side_menu.phtml:110
 msgid "Help"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Angular links"
 msgstr "Esteka angularrak"
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Direct links"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:122
-#: templates/designer/side_menu.phtml:124
+#: templates/database/designer/side_menu.phtml:122
+#: templates/database/designer/side_menu.phtml:124
 msgid "Snap to grid"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:128
-#: templates/designer/side_menu.phtml:134
+#: templates/database/designer/side_menu.phtml:128
+#: templates/database/designer/side_menu.phtml:134
 msgid "Small/Big All"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:138
-#: templates/designer/side_menu.phtml:141
+#: templates/database/designer/side_menu.phtml:138
+#: templates/database/designer/side_menu.phtml:141
 msgid "Toggle small/big"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:145
-#: templates/designer/side_menu.phtml:148
+#: templates/database/designer/side_menu.phtml:145
+#: templates/database/designer/side_menu.phtml:148
 #, fuzzy
 #| msgid "Traditional Chinese"
 msgid "Toggle relation lines"
 msgstr "Txinera tradizionala"
 
-#: templates/designer/side_menu.phtml:153
-#: templates/designer/side_menu.phtml:156
+#: templates/database/designer/side_menu.phtml:153
+#: templates/database/designer/side_menu.phtml:156
 #, fuzzy
 #| msgid "Export"
 msgid "Export schema"
 msgstr "Esportatu"
 
-#: templates/designer/side_menu.phtml:165
-#: templates/designer/side_menu.phtml:168
+#: templates/database/designer/side_menu.phtml:165
+#: templates/database/designer/side_menu.phtml:168
 #, fuzzy
 #| msgid "Submit Query"
 msgid "Build Query"
 msgstr "Kontsulta bidali"
 
-#: templates/designer/side_menu.phtml:173
-#: templates/designer/side_menu.phtml:177
+#: templates/database/designer/side_menu.phtml:173
+#: templates/database/designer/side_menu.phtml:177
 msgid "Move Menu"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:181
-#: templates/designer/side_menu.phtml:186
+#: templates/database/designer/side_menu.phtml:181
+#: templates/database/designer/side_menu.phtml:186
 #, fuzzy
 #| msgid "Partial Texts"
 msgid "Pin text"
 msgstr "Testu partzialak"
 
-#: templates/designer/table_list.phtml:4
+#: templates/database/designer/table_list.phtml:4
 #, fuzzy
 msgid "Hide/Show all"
 msgstr "Dena erakutsi"
 
-#: templates/designer/table_list.phtml:14
+#: templates/database/designer/table_list.phtml:14
 msgid "Hide/Show Tables with no relation"
 msgstr ""
 
-#: templates/designer/table_list.phtml:59
+#: templates/database/designer/table_list.phtml:59
 #, fuzzy
 #| msgid "Number of rows per page"
 msgid "Number of tables:"
 msgstr "Errenkada kopurua orriko"
 
+#: templates/database/structure/body_for_table_summary.phtml:6
+#, php-format
+msgid "%s table"
+msgid_plural "%s tables"
+msgstr[0] "%s taula"
+msgstr[1] "%s taulak"
+
+#: templates/database/structure/body_for_table_summary.phtml:17
+msgid "Sum"
+msgstr "Gehiketa"
+
+#: templates/database/structure/check_all_tables.phtml:6
+msgid "Check tables having overhead"
+msgstr "Arazteko hondakinak egiaztatu"
+
+#: templates/database/structure/check_all_tables.phtml:10
+#, fuzzy
+#| msgid "Show color"
+msgid "Show create"
+msgstr "Kolorea erakutsi"
+
+#: templates/database/structure/check_all_tables.phtml:27
+msgid "Prefix"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:28
+msgid "Add prefix to table"
+msgstr "Gehitu aurrizkia taulari"
+
+#: templates/database/structure/check_all_tables.phtml:29
+msgid "Replace table prefix"
+msgstr "Taularen aurrizkia aldatu"
+
+#: templates/database/structure/check_all_tables.phtml:30
+msgid "Copy table with prefix"
+msgstr "Taula aurrizkiarekin kopiatu"
+
+#: templates/database/structure/check_all_tables.phtml:36
+#, fuzzy
+#| msgid "Add %s field(s)"
+msgid "Add columns to central list"
+msgstr "Gehitu %s zutabe"
+
+#: templates/database/structure/check_all_tables.phtml:37
+msgid "Remove columns from central list"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:38
+#, fuzzy
+#| msgid "Add %s field(s)"
+msgid "Make consistent with central list"
+msgstr "Gehitu %s zutabe"
+
+#: templates/database/structure/favorite_anchor.phtml:12
+#, fuzzy
+msgid "Add to Favorites"
+msgstr "Erabiltzaile berria gehitu"
+
+#: templates/database/structure/show_create.phtml:2
+#, fuzzy
+msgid "Showing create queries"
+msgstr "Kontsulta osoak erakutsi"
+
+#: templates/database/structure/sortable_header.phtml:13
+msgid "Sort"
+msgstr "Ordenatu"
+
+#: templates/database/structure/table_header.phtml:42
+msgid ""
+"May be approximate. Click on the number to get the exact count. See "
+"[doc@faq3-11]FAQ 3.11[/doc]."
+msgstr ""
+
+#: templates/database/structure/table_header.phtml:66
+#: templates/table/index_form.phtml:127
+msgid "Size"
+msgstr "Tamaina"
+
+#: templates/database/structure/table_header.phtml:74
+#: templates/table/structure/display_table_stats.phtml:27
+msgid "Overhead"
+msgstr "Arazteko hondakina"
+
+#: templates/database/structure/tracking_icon.phtml:4
+msgid "Tracking is active."
+msgstr "Jarraipena aktibatuta dago."
+
+#: templates/database/structure/tracking_icon.phtml:8
+msgid "Tracking is not active."
+msgstr "Jarraipena ez dago aktibatuta."
+
 #: templates/error/report_form.phtml:7
 msgid ""
 "phpMyAdmin has encountered an error. We have collected data about this error "
@@ -15560,70 +15681,6 @@ msgstr ""
 msgid "Please explain the steps that lead to the error:"
 msgstr ""
 
-#: templates/gis_visualization/gis_visualization.phtml:3
-msgid "Display GIS Visualization"
-msgstr ""
-
-#: templates/gis_visualization/gis_visualization.phtml:8
-#, fuzzy
-#| msgid "Add/Delete Field Columns"
-msgid "Label column"
-msgstr "Gehitu/ezabatu irizpide-zutabea"
-
-#: templates/gis_visualization/gis_visualization.phtml:11
-msgid "-- None --"
-msgstr ""
-
-#: templates/gis_visualization/gis_visualization.phtml:19
-#, fuzzy
-#| msgid "Total"
-msgid "Spatial column"
-msgstr "Gutira"
-
-#: templates/index_form.phtml:16
-msgid "Index name:"
-msgstr "Indizearen izena&nbsp;:"
-
-#: templates/index_form.phtml:19
-msgid ""
-"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
-msgstr ""
-"\"PRIMARY\"-k, <b>soilik</b>, lehen mailako gako baten izena izan <b>behar</"
-"b> du!"
-
-#: templates/index_form.phtml:40
-#, fuzzy
-#| msgid "Index name:"
-msgid "Index choice:"
-msgstr "Indizearen izena&nbsp;:"
-
-#: templates/index_form.phtml:57
-msgid "Key block size:"
-msgstr ""
-
-#: templates/index_form.phtml:74
-msgid "Index type:"
-msgstr "Indize mota&nbsp;:"
-
-#: templates/index_form.phtml:86
-#, fuzzy
-#| msgid "User"
-msgid "Parser:"
-msgstr "Erabiltzailea"
-
-#: templates/index_form.phtml:102
-#, fuzzy
-msgid "Comment:"
-msgstr "Iruzkinak"
-
-#: templates/index_form.phtml:127 templates/structure/table_header.phtml:66
-msgid "Size"
-msgstr "Tamaina"
-
-#: templates/index_form.phtml:149 templates/index_form.phtml:190
-msgid "Drag to reorder"
-msgstr ""
-
 #: templates/prefs_autoload.phtml:9
 msgid ""
 "Your browser has phpMyAdmin configuration for this domain. Would you like to "
@@ -15636,481 +15693,449 @@ msgstr ""
 msgid "Start row:"
 msgstr "Lar"
 
-#: templates/structure/actions_in_table_structure.phtml:14
-#, php-format
-msgid "A primary key has been added on %s."
-msgstr "Lehen mailako gakoa gehitu zaio %s-(r)i."
-
-#: templates/structure/actions_in_table_structure.phtml:34
-#: templates/structure/actions_in_table_structure.phtml:54
-#: templates/structure/actions_in_table_structure.phtml:79
-#: templates/structure/actions_in_table_structure.phtml:101
-#, php-format
-msgid "An index has been added on %s."
-msgstr "Indize bat gehitu gehitu zaio %s-(r)i."
-
-#: templates/structure/actions_in_table_structure.phtml:130
-#: templates/structure/check_all_table_column.phtml:59
-#, fuzzy
-msgid "Remove from central columns"
-msgstr "Taula berrizendatu izen honetara: "
-
-#: templates/structure/actions_in_table_structure.phtml:138
-#: templates/structure/check_all_table_column.phtml:55
-#, fuzzy
-#| msgid "Add %s field(s)"
-msgid "Add to central columns"
-msgstr "Gehitu %s zutabe"
-
-#: templates/structure/add_column.phtml:7
-#, fuzzy, php-format
-#| msgid "Add %s field(s)"
-msgid "Add %s column(s)"
-msgstr "Gehitu %s zutabe"
-
-#: templates/structure/add_column.phtml:12
-#, fuzzy
-#| msgid "At Beginning of Table"
-msgid "at beginning of table"
-msgstr "Taularen hasieran"
-
-#: templates/structure/body_for_table_summary.phtml:6
-#, php-format
-msgid "%s table"
-msgid_plural "%s tables"
-msgstr[0] "%s taula"
-msgstr[1] "%s taulak"
-
-#: templates/structure/body_for_table_summary.phtml:17
-msgid "Sum"
-msgstr "Gehiketa"
-
-#: templates/structure/check_all_tables.phtml:6
-msgid "Check tables having overhead"
-msgstr "Arazteko hondakinak egiaztatu"
-
-#: templates/structure/check_all_tables.phtml:10
-#, fuzzy
-#| msgid "Show color"
-msgid "Show create"
-msgstr "Kolorea erakutsi"
-
-#: templates/structure/check_all_tables.phtml:27
-msgid "Prefix"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:28
-msgid "Add prefix to table"
-msgstr "Gehitu aurrizkia taulari"
-
-#: templates/structure/check_all_tables.phtml:29
-msgid "Replace table prefix"
-msgstr "Taularen aurrizkia aldatu"
-
-#: templates/structure/check_all_tables.phtml:30
-msgid "Copy table with prefix"
-msgstr "Taula aurrizkiarekin kopiatu"
-
-#: templates/structure/check_all_tables.phtml:36
-#, fuzzy
-#| msgid "Add %s field(s)"
-msgid "Add columns to central list"
-msgstr "Gehitu %s zutabe"
-
-#: templates/structure/check_all_tables.phtml:37
-msgid "Remove columns from central list"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:38
-#, fuzzy
-#| msgid "Add %s field(s)"
-msgid "Make consistent with central list"
-msgstr "Gehitu %s zutabe"
-
-#: templates/structure/display_structure.phtml:140 view_create.php:181
-#, fuzzy
-#| msgid "Print view"
-msgid "Edit view"
-msgstr "Inprimatzeko ikuspegia"
-
-#: templates/structure/display_table_stats.phtml:9
-msgid "Space usage"
-msgstr "Erabilitako lekua"
-
-#: templates/structure/display_table_stats.phtml:27
-#: templates/structure/table_header.phtml:74
-msgid "Overhead"
-msgstr "Arazteko hondakina"
-
-#: templates/structure/display_table_stats.phtml:32
-msgid "Effective"
-msgstr "Eraginkorra"
-
-#: templates/structure/favorite_anchor.phtml:12
-#, fuzzy
-msgid "Add to Favorites"
-msgstr "Erabiltzaile berria gehitu"
-
-#: templates/structure/move_columns_dialog.phtml:1
-#: templates/structure/optional_action_links.phtml:21
-#, fuzzy
-#| msgid "Add %s field(s)"
-msgid "Move columns"
-msgstr "Gehitu %s zutabe"
-
-#: templates/structure/move_columns_dialog.phtml:2
-msgid "Move the columns by dragging them up and down."
-msgstr ""
-
-#: templates/structure/optional_action_links.phtml:9
-msgid "Propose table structure"
-msgstr "Taularen egituraren proposamena"
-
-#: templates/structure/optional_action_links.phtml:24
-#, fuzzy
-#| msgid "Propose table structure"
-msgid "Improve table structure"
-msgstr "Taularen egituraren proposamena"
-
-#: templates/structure/optional_action_links.phtml:30
-#, fuzzy
-#| msgid "Track table"
-msgid "Track view"
-msgstr "Taularen jarraipena egin"
-
-#: templates/structure/row_stats_table.phtml:3
-#, fuzzy
-#| msgid "Row Statistics"
-msgid "Row statistics"
-msgstr "Errenkadaren estatistikak"
-
-#: templates/structure/row_stats_table.phtml:9
-msgid "static"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:11
-msgid "dynamic"
-msgstr "dinamikoa"
-
-#: templates/structure/row_stats_table.phtml:22
-msgid "partitioned"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:54
-msgid "Row length"
-msgstr "Errenkadaren luzera"
-
-#: templates/structure/row_stats_table.phtml:66
-msgid "Row size"
-msgstr "Errenkadaren tamaina"
-
-#: templates/structure/row_stats_table.phtml:73
-msgid "Next autoindex"
-msgstr ""
-
-#: templates/structure/secondary_tabs.phtml:14
-#, fuzzy
-#| msgid "Relation view"
-msgid "Relation view"
-msgstr "Erlazioen ikuspegia"
-
-#: templates/structure/show_create.phtml:2
-#, fuzzy
-msgid "Showing create queries"
-msgstr "Kontsulta osoak erakutsi"
-
-#: templates/structure/sortable_header.phtml:13
-msgid "Sort"
-msgstr "Ordenatu"
-
-#: templates/structure/table_header.phtml:42
-msgid ""
-"May be approximate. Click on the number to get the exact count. See "
-"[doc@faq3-11]FAQ 3.11[/doc]."
-msgstr ""
-
-#: templates/structure/table_structure_row.phtml:46
-#, fuzzy, php-format
-#| msgid "Table %s has been dropped."
-msgid "Column %s has been dropped."
-msgstr "%s taula ezabatu egin da"
-
-#: templates/structure/tracking_icon.phtml:4
-msgid "Tracking is active."
-msgstr "Jarraipena aktibatuta dago."
-
-#: templates/structure/tracking_icon.phtml:8
-msgid "Tracking is not active."
-msgstr "Jarraipena ez dago aktibatuta."
-
-#: templates/table/create_table.phtml:15
-#, fuzzy
-#| msgid "Number of rows per page"
-msgid "Number of columns"
-msgstr "Errenkada kopurua orriko"
-
-#: templates/table/options.phtml:8
-#, fuzzy
-#| msgid "Select fields (at least one):"
-msgid "Select columns (at least one):"
-msgstr "Eremuak hautatu (bat gutxienez):"
-
-#: templates/table/options.phtml:37
-msgid "Add search conditions (body of the \"where\" clause):"
-msgstr "Bilatzeko baldintzak txertatu (\"where\" klausularen gorputza):"
-
-#: templates/table/options.phtml:45
-msgid "Number of rows per page"
-msgstr "Errenkada kopurua orriko"
-
-#: templates/table/options.phtml:56
-msgid "Display order:"
-msgstr "Ordena erakutsi:"
-
-#: templates/table/options_zoom.phtml:6
-msgid "Use this column to label each point"
-msgstr ""
-
-#: templates/table/options_zoom.phtml:35
-msgid "Maximum rows to plot"
-msgstr ""
-
-#: templates/table/replace_preview.phtml:13
-msgid "Find and replace - preview"
-msgstr ""
-
-#: templates/table/replace_preview.phtml:18
-#, fuzzy
-#| msgid "Linestring"
-msgid "Original string"
-msgstr "Lerro kateak"
-
-#: templates/table/replace_preview.phtml:19
-#, fuzzy
-#| msgid "Relations"
-msgid "Replaced string"
-msgstr "Erlazioak"
-
-#: templates/table/replace_preview.phtml:40
-#, fuzzy
-msgid "Replace"
-msgstr "Erlazioak"
-
-#: templates/table/rows_zoom.phtml:16
-#, fuzzy
-msgid "Additional search criteria"
-msgstr "SQL kontsulta"
-
-#: templates/table/search_and_replace.phtml:3
-#, fuzzy
-#| msgid "Replace NULL by"
-msgid "Replace with:"
-msgstr "NULL ordezkatu honen ordez:"
-
-#: templates/table/search_and_replace.phtml:22
-#, fuzzy
-#| msgid "as regular expression"
-msgid "Use regular expression"
-msgstr "adierazpen erregular moduan"
-
-#: templates/table/selection_form.phtml:12
-#, fuzzy
-#| msgid "Do a \"query by example\" (wildcard: \"%\")"
-msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
-msgstr "\"Adibide moduan\" kontsulta bat egin (komodina: \"%\")"
-
-#: templates/table/selection_form.phtml:34
-msgid "Do a \"query by example\" (wildcard: \"%\")"
-msgstr "\"Adibide moduan\" kontsulta bat egin (komodina: \"%\")"
-
-#: templates/table/zoom_result_form.phtml:7
-msgid "Browse/Edit the points"
-msgstr ""
-
-#: templates/table/zoom_result_form.phtml:15
-msgid "How to use"
-msgstr ""
-
-#: templates/table/zoom_result_form.phtml:23
-#, fuzzy
-#| msgid "Reset"
-msgid "Reset zoom"
-msgstr "Reset egin"
-
-#: templates/tbl_chart.phtml:17
+#: templates/table/chart/tbl_chart.phtml:17
 #, fuzzy
 #| msgid "Mar"
 msgctxt "Chart type"
 msgid "Bar"
 msgstr "Mar"
 
-#: templates/tbl_chart.phtml:21
+#: templates/table/chart/tbl_chart.phtml:21
 #, fuzzy
 #| msgid "Column"
 msgctxt "Chart type"
 msgid "Column"
 msgstr "Zutabea"
 
-#: templates/tbl_chart.phtml:25
+#: templates/table/chart/tbl_chart.phtml:25
 msgctxt "Chart type"
 msgid "Line"
 msgstr ""
 
-#: templates/tbl_chart.phtml:29
+#: templates/table/chart/tbl_chart.phtml:29
 msgctxt "Chart type"
 msgid "Spline"
 msgstr ""
 
-#: templates/tbl_chart.phtml:33
+#: templates/table/chart/tbl_chart.phtml:33
 msgctxt "Chart type"
 msgid "Area"
 msgstr ""
 
-#: templates/tbl_chart.phtml:37
+#: templates/table/chart/tbl_chart.phtml:37
 #, fuzzy
 #| msgid "PiB"
 msgctxt "Chart type"
 msgid "Pie"
 msgstr "PB"
 
-#: templates/tbl_chart.phtml:41
+#: templates/table/chart/tbl_chart.phtml:41
 #, fuzzy
 #| msgid "Time"
 msgctxt "Chart type"
 msgid "Timeline"
 msgstr "Denbora"
 
-#: templates/tbl_chart.phtml:45
+#: templates/table/chart/tbl_chart.phtml:45
 msgctxt "Chart type"
 msgid "Scatter"
 msgstr ""
 
-#: templates/tbl_chart.phtml:50
+#: templates/table/chart/tbl_chart.phtml:50
 msgid "Stacked"
 msgstr ""
 
-#: templates/tbl_chart.phtml:53
+#: templates/table/chart/tbl_chart.phtml:53
 #, fuzzy
 #| msgid "Import files"
 msgid "Chart title"
 msgstr "Fitxategiak inportatu"
 
-#: templates/tbl_chart.phtml:57
+#: templates/table/chart/tbl_chart.phtml:57
 msgid "X-Axis:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:72
+#: templates/table/chart/tbl_chart.phtml:72
 #, fuzzy
 msgid "Series:"
 msgstr "SQL kontsulta"
 
-#: templates/tbl_chart.phtml:102
+#: templates/table/chart/tbl_chart.phtml:102
 msgid "X-Axis label:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:104
+#: templates/table/chart/tbl_chart.phtml:104
 #, fuzzy
 #| msgid "Value"
 msgid "X Values"
 msgstr "balioa"
 
-#: templates/tbl_chart.phtml:107
+#: templates/table/chart/tbl_chart.phtml:107
 msgid "Y-Axis label:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:115
+#: templates/table/chart/tbl_chart.phtml:115
 msgid "Series names are in a column"
 msgstr ""
 
-#: templates/tbl_chart.phtml:118
+#: templates/table/chart/tbl_chart.phtml:118
 #, fuzzy
 #| msgid "Inside column:"
 msgid "Series column:"
 msgstr "Zutabearen barnean:"
 
-#: templates/tbl_chart.phtml:130
+#: templates/table/chart/tbl_chart.phtml:130
 #, fuzzy
 #| msgid "Values for column %s"
 msgid "Value Column:"
 msgstr "%s zutaberako balioak"
 
-#: templates/tbl_chart.phtml:150
+#: templates/table/chart/tbl_chart.phtml:150
 #, fuzzy
 #| msgid "Save as file"
 msgid "Save chart as image"
 msgstr "Bidali"
 
-#: templates/tbl_relation/common_form.phtml:7
+#: templates/table/gis_visualization/gis_visualization.phtml:3
+msgid "Display GIS Visualization"
+msgstr ""
+
+#: templates/table/gis_visualization/gis_visualization.phtml:8
+#, fuzzy
+#| msgid "Add/Delete Field Columns"
+msgid "Label column"
+msgstr "Gehitu/ezabatu irizpide-zutabea"
+
+#: templates/table/gis_visualization/gis_visualization.phtml:11
+msgid "-- None --"
+msgstr ""
+
+#: templates/table/gis_visualization/gis_visualization.phtml:19
+#, fuzzy
+#| msgid "Total"
+msgid "Spatial column"
+msgstr "Gutira"
+
+#: templates/table/index_form.phtml:16
+msgid "Index name:"
+msgstr "Indizearen izena&nbsp;:"
+
+#: templates/table/index_form.phtml:19
+msgid ""
+"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
+msgstr ""
+"\"PRIMARY\"-k, <b>soilik</b>, lehen mailako gako baten izena izan <b>behar</"
+"b> du!"
+
+#: templates/table/index_form.phtml:40
+#, fuzzy
+#| msgid "Index name:"
+msgid "Index choice:"
+msgstr "Indizearen izena&nbsp;:"
+
+#: templates/table/index_form.phtml:57
+msgid "Key block size:"
+msgstr ""
+
+#: templates/table/index_form.phtml:74
+msgid "Index type:"
+msgstr "Indize mota&nbsp;:"
+
+#: templates/table/index_form.phtml:86
+#, fuzzy
+#| msgid "User"
+msgid "Parser:"
+msgstr "Erabiltzailea"
+
+#: templates/table/index_form.phtml:102
+#, fuzzy
+msgid "Comment:"
+msgstr "Iruzkinak"
+
+#: templates/table/index_form.phtml:149 templates/table/index_form.phtml:190
+msgid "Drag to reorder"
+msgstr ""
+
+#: templates/table/relation/common_form.phtml:7
 msgid "Internal relations"
 msgstr "Barne-erlazioak"
 
-#: templates/tbl_relation/common_form.phtml:11
+#: templates/table/relation/common_form.phtml:11
 #, fuzzy
 #| msgid "Internal relations"
 msgid "Internal relation"
 msgstr "Barne-erlazioak"
 
-#: templates/tbl_relation/common_form.phtml:14
+#: templates/table/relation/common_form.phtml:14
 msgid ""
 "An internal relation is not necessary when a corresponding FOREIGN KEY "
 "relation exists."
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:37
+#: templates/table/relation/common_form.phtml:37
 #, fuzzy
 #| msgid "Add constraints"
 msgid "Foreign key constraints"
 msgstr "Murrizketak gehitu"
 
-#: templates/tbl_relation/common_form.phtml:40
+#: templates/table/relation/common_form.phtml:40
 msgid "Actions"
 msgstr "Ekintzak"
 
-#: templates/tbl_relation/common_form.phtml:41
+#: templates/table/relation/common_form.phtml:41
 #, fuzzy
 #| msgid "Constraints for table"
 msgid "Constraint properties"
 msgstr "Taularentzako murrizketak"
 
-#: templates/tbl_relation/common_form.phtml:44
+#: templates/table/relation/common_form.phtml:44
 msgid ""
 "Only columns with index will be displayed. You can define an index below."
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:49
+#: templates/table/relation/common_form.phtml:49
 msgid "Foreign key constraint"
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:81
+#: templates/table/relation/common_form.phtml:81
 #, fuzzy
 #| msgid "Add constraints"
 msgid "+ Add constraint"
 msgstr "Murrizketak gehitu"
 
-#: templates/tbl_relation/common_form.phtml:91
+#: templates/table/relation/common_form.phtml:91
 #, fuzzy
 #| msgid "Choose field to display"
 msgid "Choose column to display:"
 msgstr "Aukeratu erakutsi beharreko eremua"
 
-#: templates/tbl_relation/foreign_key_row.phtml:13
+#: templates/table/relation/foreign_key_row.phtml:13
 #, fuzzy, php-format
 #| msgid "Add constraints"
 msgid "Foreign key constraint %s has been dropped"
 msgstr "Murrizketak gehitu"
 
-#: templates/tbl_relation/foreign_key_row.phtml:102
+#: templates/table/relation/foreign_key_row.phtml:102
 #, fuzzy
 #| msgid "Constraints for table"
 msgid "Constraint name"
 msgstr "Taularentzako murrizketak"
 
-#: templates/tbl_relation/foreign_key_row.phtml:157
+#: templates/table/relation/foreign_key_row.phtml:157
 #, fuzzy
 #| msgid "Add %s field(s)"
 msgid "+ Add column"
 msgstr "Gehitu %s zutabe"
 
+#: templates/table/search/options.phtml:8
+#, fuzzy
+#| msgid "Select fields (at least one):"
+msgid "Select columns (at least one):"
+msgstr "Eremuak hautatu (bat gutxienez):"
+
+#: templates/table/search/options.phtml:37
+msgid "Add search conditions (body of the \"where\" clause):"
+msgstr "Bilatzeko baldintzak txertatu (\"where\" klausularen gorputza):"
+
+#: templates/table/search/options.phtml:45
+msgid "Number of rows per page"
+msgstr "Errenkada kopurua orriko"
+
+#: templates/table/search/options.phtml:56
+msgid "Display order:"
+msgstr "Ordena erakutsi:"
+
+#: templates/table/search/options_zoom.phtml:6
+msgid "Use this column to label each point"
+msgstr ""
+
+#: templates/table/search/options_zoom.phtml:35
+msgid "Maximum rows to plot"
+msgstr ""
+
+#: templates/table/search/replace_preview.phtml:13
+msgid "Find and replace - preview"
+msgstr ""
+
+#: templates/table/search/replace_preview.phtml:18
+#, fuzzy
+#| msgid "Linestring"
+msgid "Original string"
+msgstr "Lerro kateak"
+
+#: templates/table/search/replace_preview.phtml:19
+#, fuzzy
+#| msgid "Relations"
+msgid "Replaced string"
+msgstr "Erlazioak"
+
+#: templates/table/search/replace_preview.phtml:40
+#, fuzzy
+msgid "Replace"
+msgstr "Erlazioak"
+
+#: templates/table/search/rows_zoom.phtml:16
+#, fuzzy
+msgid "Additional search criteria"
+msgstr "SQL kontsulta"
+
+#: templates/table/search/search_and_replace.phtml:3
+#, fuzzy
+#| msgid "Replace NULL by"
+msgid "Replace with:"
+msgstr "NULL ordezkatu honen ordez:"
+
+#: templates/table/search/search_and_replace.phtml:22
+#, fuzzy
+#| msgid "as regular expression"
+msgid "Use regular expression"
+msgstr "adierazpen erregular moduan"
+
+#: templates/table/search/selection_form.phtml:12
+#, fuzzy
+#| msgid "Do a \"query by example\" (wildcard: \"%\")"
+msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
+msgstr "\"Adibide moduan\" kontsulta bat egin (komodina: \"%\")"
+
+#: templates/table/search/selection_form.phtml:34
+msgid "Do a \"query by example\" (wildcard: \"%\")"
+msgstr "\"Adibide moduan\" kontsulta bat egin (komodina: \"%\")"
+
+#: templates/table/search/zoom_result_form.phtml:7
+msgid "Browse/Edit the points"
+msgstr ""
+
+#: templates/table/search/zoom_result_form.phtml:15
+msgid "How to use"
+msgstr ""
+
+#: templates/table/search/zoom_result_form.phtml:23
+#, fuzzy
+#| msgid "Reset"
+msgid "Reset zoom"
+msgstr "Reset egin"
+
+#: templates/table/secondary_tabs.phtml:14
+#, fuzzy
+#| msgid "Relation view"
+msgid "Relation view"
+msgstr "Erlazioen ikuspegia"
+
+#: templates/table/structure/actions_in_table_structure.phtml:14
+#, php-format
+msgid "A primary key has been added on %s."
+msgstr "Lehen mailako gakoa gehitu zaio %s-(r)i."
+
+#: templates/table/structure/actions_in_table_structure.phtml:34
+#: templates/table/structure/actions_in_table_structure.phtml:54
+#: templates/table/structure/actions_in_table_structure.phtml:79
+#: templates/table/structure/actions_in_table_structure.phtml:101
+#, php-format
+msgid "An index has been added on %s."
+msgstr "Indize bat gehitu gehitu zaio %s-(r)i."
+
+#: templates/table/structure/actions_in_table_structure.phtml:130
+#: templates/table/structure/check_all_table_column.phtml:59
+#, fuzzy
+msgid "Remove from central columns"
+msgstr "Taula berrizendatu izen honetara: "
+
+#: templates/table/structure/actions_in_table_structure.phtml:138
+#: templates/table/structure/check_all_table_column.phtml:55
+#, fuzzy
+#| msgid "Add %s field(s)"
+msgid "Add to central columns"
+msgstr "Gehitu %s zutabe"
+
+#: templates/table/structure/add_column.phtml:7
+#, fuzzy, php-format
+#| msgid "Add %s field(s)"
+msgid "Add %s column(s)"
+msgstr "Gehitu %s zutabe"
+
+#: templates/table/structure/add_column.phtml:12
+#, fuzzy
+#| msgid "At Beginning of Table"
+msgid "at beginning of table"
+msgstr "Taularen hasieran"
+
+#: templates/table/structure/display_structure.phtml:140 view_create.php:181
+#, fuzzy
+#| msgid "Print view"
+msgid "Edit view"
+msgstr "Inprimatzeko ikuspegia"
+
+#: templates/table/structure/display_table_stats.phtml:9
+msgid "Space usage"
+msgstr "Erabilitako lekua"
+
+#: templates/table/structure/display_table_stats.phtml:32
+msgid "Effective"
+msgstr "Eraginkorra"
+
+#: templates/table/structure/move_columns_dialog.phtml:1
+#: templates/table/structure/optional_action_links.phtml:21
+#, fuzzy
+#| msgid "Add %s field(s)"
+msgid "Move columns"
+msgstr "Gehitu %s zutabe"
+
+#: templates/table/structure/move_columns_dialog.phtml:2
+msgid "Move the columns by dragging them up and down."
+msgstr ""
+
+#: templates/table/structure/optional_action_links.phtml:9
+msgid "Propose table structure"
+msgstr "Taularen egituraren proposamena"
+
+#: templates/table/structure/optional_action_links.phtml:24
+#, fuzzy
+#| msgid "Propose table structure"
+msgid "Improve table structure"
+msgstr "Taularen egituraren proposamena"
+
+#: templates/table/structure/optional_action_links.phtml:30
+#, fuzzy
+#| msgid "Track table"
+msgid "Track view"
+msgstr "Taularen jarraipena egin"
+
+#: templates/table/structure/row_stats_table.phtml:3
+#, fuzzy
+#| msgid "Row Statistics"
+msgid "Row statistics"
+msgstr "Errenkadaren estatistikak"
+
+#: templates/table/structure/row_stats_table.phtml:9
+msgid "static"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:11
+msgid "dynamic"
+msgstr "dinamikoa"
+
+#: templates/table/structure/row_stats_table.phtml:22
+msgid "partitioned"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:54
+msgid "Row length"
+msgstr "Errenkadaren luzera"
+
+#: templates/table/structure/row_stats_table.phtml:66
+msgid "Row size"
+msgstr "Errenkadaren tamaina"
+
+#: templates/table/structure/row_stats_table.phtml:73
+msgid "Next autoindex"
+msgstr ""
+
+#: templates/table/structure/table_structure_row.phtml:46
+#, fuzzy, php-format
+#| msgid "Table %s has been dropped."
+msgid "Column %s has been dropped."
+msgstr "%s taula ezabatu egin da"
+
 #: themes.php:17 themes.php:22
 msgid "Theme"
 msgstr ""
diff --git a/po/fa.po b/po/fa.po
index 1d613cda6e..2b5a19bbd6 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 4.5.0-dev\n"
 "Report-Msgid-Bugs-To: developers@phpmyadmin.net\n"
-"POT-Creation-Date: 2015-08-08 13:53-0400\n"
+"POT-Creation-Date: 2015-08-12 08:10-0400\n"
 "PO-Revision-Date: 2014-12-18 09:39+0200\n"
 "Last-Translator: HM <goodlinuxuser@chmail.ir>\n"
 "Language-Team: Persian <https://hosted.weblate.org/projects/phpmyadmin/"
@@ -55,7 +55,7 @@ msgid "Table comments:"
 msgstr "توضيحات جدول:"
 
 #: db_datadict.php:104 libraries/Index.class.php:699
-#: libraries/insert_edit.lib.php:1567
+#: libraries/insert_edit.lib.php:1565
 #: libraries/navigation/Nodes/Node_Column.class.php:30
 #: libraries/plugins/export/ExportHtmlword.class.php:280
 #: libraries/plugins/export/ExportHtmlword.class.php:375
@@ -69,13 +69,14 @@ msgstr "توضيحات جدول:"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1023
 #: libraries/tracking.lib.php:879 libraries/tracking.lib.php:975
 #: templates/columns_definitions/column_name.phtml:18
-#: templates/index_form.phtml:124 templates/table/table_header.phtml:6
-#: templates/table/zoom_result_form.phtml:33
-#: templates/tbl_relation/common_form.phtml:10
-#: templates/tbl_relation/common_form.phtml:43
-#: templates/tbl_relation/foreign_key_row.phtml:194
-#: templates/tbl_relation/foreign_key_row.phtml:206
-#: templates/tbl_relation/internal_relational_row.phtml:71
+#: templates/table/index_form.phtml:124
+#: templates/table/relation/common_form.phtml:10
+#: templates/table/relation/common_form.phtml:43
+#: templates/table/relation/foreign_key_row.phtml:194
+#: templates/table/relation/foreign_key_row.phtml:206
+#: templates/table/relation/internal_relational_row.phtml:71
+#: templates/table/search/table_header.phtml:6
+#: templates/table/search/zoom_result_form.phtml:33
 msgid "Column"
 msgstr "ستون"
 
@@ -93,21 +94,21 @@ msgstr "ستون"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1001
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1024
 #: libraries/rte/rte_list.lib.php:75 libraries/rte/rte_list.lib.php:103
-#: libraries/rte/rte_routines.lib.php:802
-#: libraries/rte/rte_routines.lib.php:831
-#: libraries/rte/rte_routines.lib.php:1493
+#: libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_routines.lib.php:922
+#: libraries/rte/rte_routines.lib.php:1584
 #: libraries/server_privileges.lib.php:2369 libraries/tracking.lib.php:880
 #: libraries/tracking.lib.php:972
 #: templates/columns_definitions/table_fields_definitions.phtml:11
-#: templates/structure/table_header.phtml:48
-#: templates/structure/table_structure_header.phtml:6
-#: templates/table/table_header.phtml:7
+#: templates/database/structure/table_header.phtml:48
+#: templates/table/search/table_header.phtml:7
+#: templates/table/structure/table_structure_header.phtml:6
 msgid "Type"
 msgstr "نوع"
 
 #: db_datadict.php:106 libraries/Index.class.php:702
 #: libraries/central_columns.lib.php:708
-#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1576
+#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1574
 #: libraries/plugins/export/ExportHtmlword.class.php:286
 #: libraries/plugins/export/ExportHtmlword.class.php:381
 #: libraries/plugins/export/ExportLatex.class.php:509
@@ -120,8 +121,8 @@ msgstr "نوع"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1026
 #: libraries/tracking.lib.php:882 libraries/tracking.lib.php:978
 #: templates/columns_definitions/table_fields_definitions.phtml:39
-#: templates/structure/table_structure_header.phtml:9
-#: templates/table/zoom_result_form.phtml:34
+#: templates/table/search/zoom_result_form.phtml:34
+#: templates/table/structure/table_structure_header.phtml:9
 msgid "Null"
 msgstr "تهی"
 
@@ -139,8 +140,8 @@ msgstr "تهی"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1027
 #: libraries/replication_gui.lib.php:153 libraries/tracking.lib.php:883
 #: templates/columns_definitions/table_fields_definitions.phtml:25
-#: templates/structure/body_for_table_summary.phtml:55
-#: templates/structure/table_structure_header.phtml:10
+#: templates/database/structure/body_for_table_summary.phtml:55
+#: templates/table/structure/table_structure_header.phtml:10
 msgid "Default"
 msgstr "پيش‌ فرض"
 
@@ -168,19 +169,19 @@ msgid "Comments"
 msgstr "توضيحات"
 
 #: db_datadict.php:146
-#: libraries/controllers/StructureController.class.php:1960
-#: libraries/controllers/StructureController.class.php:1965
+#: libraries/controllers/TableStructureController.class.php:951
+#: libraries/controllers/TableStructureController.class.php:956
 #: libraries/tracking.lib.php:922
 #: templates/columns_definitions/column_indexes.phtml:6
-#: templates/structure/check_all_table_column.phtml:22
-#: templates/structure/display_structure.phtml:74
+#: templates/table/structure/check_all_table_column.phtml:22
+#: templates/table/structure/display_structure.phtml:74
 msgid "Primary"
 msgstr "اصلي"
 
 #: db_datadict.php:156 js/messages.php:317 libraries/Index.class.php:567
 #: libraries/Index.class.php:606 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261 libraries/mult_submits.lib.php:403
+#: libraries/config/FormDisplay.tpl.php:272 libraries/mult_submits.lib.php:403
 #: libraries/mult_submits.lib.php:417
 #: libraries/plugins/export/ExportHtmlword.class.php:630
 #: libraries/plugins/export/ExportLatex.class.php:589
@@ -196,20 +197,20 @@ msgstr "اصلي"
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1010 libraries/tracking.lib.php:1015
 #: prefs_manage.php:140 templates/prefs_autoload.phtml:15
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "No"
 msgstr "خير"
 
 #: db_datadict.php:156 js/messages.php:443 libraries/Index.class.php:568
 #: libraries/Index.class.php:605 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261
-#: libraries/controllers/StructureController.class.php:1344
-#: libraries/controllers/StructureController.class.php:2223
-#: libraries/controllers/StructureController.class.php:2232
-#: libraries/controllers/StructureController.class.php:2237
-#: libraries/controllers/StructureController.class.php:2242
-#: libraries/controllers/StructureController.class.php:2247
+#: libraries/config/FormDisplay.tpl.php:272
+#: libraries/controllers/TableStructureController.class.php:539
+#: libraries/controllers/TableStructureController.class.php:1201
+#: libraries/controllers/TableStructureController.class.php:1210
+#: libraries/controllers/TableStructureController.class.php:1215
+#: libraries/controllers/TableStructureController.class.php:1220
+#: libraries/controllers/TableStructureController.class.php:1225
 #: libraries/mult_submits.inc.php:82 libraries/mult_submits.inc.php:178
 #: libraries/mult_submits.lib.php:339 libraries/mult_submits.lib.php:372
 #: libraries/mult_submits.lib.php:401 libraries/mult_submits.lib.php:415
@@ -218,8 +219,8 @@ msgstr "خير"
 #: libraries/plugins/export/ExportOdt.class.php:756
 #: libraries/plugins/export/ExportTexytext.class.php:567
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1077
-#: libraries/server_databases.lib.php:464
-#: libraries/server_databases.lib.php:474
+#: libraries/server_databases.lib.php:475
+#: libraries/server_databases.lib.php:485
 #: libraries/server_privileges.lib.php:2546
 #: libraries/server_privileges.lib.php:2727
 #: libraries/server_privileges.lib.php:2748
@@ -229,7 +230,7 @@ msgstr "خير"
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1008 libraries/tracking.lib.php:1013
 #: prefs_manage.php:138 templates/prefs_autoload.phtml:14
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "Yes"
 msgstr "بلي"
 
@@ -239,7 +240,7 @@ msgstr "نمايش الگوي پايگاه داده"
 
 #: db_export.php:37 db_tracking.php:90 export.php:382
 #: libraries/DBQbe.class.php:326
-#: libraries/controllers/StructureController.class.php:231
+#: libraries/controllers/DatabaseStructureController.class.php:170
 #: libraries/navigation/NavigationTree.class.php:897
 msgid "No tables found in database."
 msgstr "در اين پايگاه داده هيچ جدولي وجود ندارد ."
@@ -250,14 +251,14 @@ msgstr "در اين پايگاه داده هيچ جدولي وجود ندارد
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:26
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:120
-#: templates/structure/show_create.phtml:18
+#: templates/database/structure/show_create.phtml:18
 msgid "Tables"
 msgstr "جدولها"
 
 #: db_export.php:52 libraries/Menu.class.php:317 libraries/Menu.class.php:425
-#: libraries/Util.class.php:3333 libraries/Util.class.php:3343
-#: libraries/Util.class.php:3349 libraries/Util.class.php:3629
-#: libraries/Util.class.php:4327 libraries/Util.class.php:4344
+#: libraries/Util.class.php:3339 libraries/Util.class.php:3349
+#: libraries/Util.class.php:3355 libraries/Util.class.php:3635
+#: libraries/Util.class.php:4333 libraries/Util.class.php:4350
 #: libraries/central_columns.lib.php:728 libraries/config.values.php:39
 #: libraries/config.values.php:47 libraries/config.values.php:109
 #: libraries/config.values.php:115 libraries/config/setup.forms.php:323
@@ -271,7 +272,7 @@ msgstr "جدولها"
 #: libraries/navigation/Nodes/Node_Table.class.php:283
 #: libraries/server_privileges.lib.php:1141 libraries/tracking.lib.php:874
 #: templates/columns_definitions/table_fields_definitions.phtml:3
-#: templates/designer/table_list.phtml:28
+#: templates/database/designer/table_list.phtml:28
 msgid "Structure"
 msgstr "ساختار"
 
@@ -283,7 +284,7 @@ msgstr "ساختار"
 #: libraries/config/user_preferences.forms.php:292
 #: libraries/config/user_preferences.forms.php:297
 #: libraries/server_privileges.lib.php:1140
-#: templates/structure/display_table_stats.phtml:12
+#: templates/table/structure/display_table_stats.phtml:12
 msgid "Data"
 msgstr "داده"
 
@@ -367,10 +368,10 @@ msgstr "جدول های پیگیری شده"
 #: libraries/server_privileges.lib.php:2908
 #: libraries/server_privileges.lib.php:3145
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4346
-#: templates/structure/table_header.phtml:21
-#: templates/tbl_relation/foreign_key_row.phtml:176
-#: templates/tbl_relation/internal_relational_row.phtml:63
+#: libraries/server_privileges.lib.php:4372
+#: templates/database/structure/table_header.phtml:21
+#: templates/table/relation/foreign_key_row.phtml:176
+#: templates/table/relation/internal_relational_row.phtml:63
 msgid "Table"
 msgstr "جدول"
 
@@ -387,7 +388,7 @@ msgid "Updated"
 msgstr "به روز شده"
 
 #: db_tracking.php:130 js/messages.php:243 libraries/Menu.class.php:552
-#: libraries/Util.class.php:4314 libraries/config.values.php:104
+#: libraries/Util.class.php:4320 libraries/config.values.php:104
 #: libraries/rte/rte_events.lib.php:393 libraries/rte/rte_list.lib.php:101
 #: libraries/server_status_processes.lib.php:92 libraries/tracking.lib.php:279
 msgid "Status"
@@ -396,14 +397,15 @@ msgstr "وضعیت"
 #: db_tracking.php:131 db_tracking.php:290 libraries/Index.class.php:693
 #: libraries/central_columns.lib.php:687 libraries/rte/rte_list.lib.php:74
 #: libraries/rte/rte_list.lib.php:89 libraries/rte/rte_list.lib.php:102
-#: libraries/server_databases.lib.php:398
+#: libraries/server_databases.lib.php:409
 #: libraries/server_privileges.lib.php:2372
 #: libraries/server_privileges.lib.php:3166
 #: libraries/server_privileges.lib.php:3342
 #: libraries/server_user_groups.lib.php:82
 #: libraries/server_variables.lib.php:189 libraries/tracking.lib.php:280
-#: libraries/tracking.lib.php:793 templates/structure/table_header.phtml:30
-#: templates/structure/table_structure_header.phtml:23
+#: libraries/tracking.lib.php:793
+#: templates/database/structure/table_header.phtml:30
+#: templates/table/structure/table_structure_header.phtml:23
 msgid "Action"
 msgstr "عمل"
 
@@ -447,7 +449,7 @@ msgid "Untracked tables"
 msgstr "جدول های پیگیری نشده"
 
 #: db_tracking.php:305 db_tracking.php:336
-#: templates/structure/optional_action_links.phtml:17
+#: templates/table/structure/optional_action_links.phtml:17
 msgid "Track table"
 msgstr "پیگیری جدول"
 
@@ -500,7 +502,7 @@ msgid "Value for the column \"%s\""
 msgstr "مقادیر ستون \"%s\""
 
 #: gis_data_editor.php:146
-#: templates/gis_visualization/gis_visualization.phtml:37
+#: templates/table/gis_visualization/gis_visualization.phtml:37
 msgid "Use OpenStreetMaps as Base Layer"
 msgstr "استفاده از OpenStreetMaps به عنوان لایه پایه"
 
@@ -581,35 +583,35 @@ msgstr "اضافه کردن هندسه"
 #: libraries/display_change_password.lib.php:162
 #: libraries/display_export.lib.php:402 libraries/display_export.lib.php:408
 #: libraries/display_import.lib.php:392 libraries/index.lib.php:44
-#: libraries/insert_edit.lib.php:1546 libraries/insert_edit.lib.php:1583
+#: libraries/insert_edit.lib.php:1544 libraries/insert_edit.lib.php:1581
 #: libraries/normalization.lib.php:165 libraries/normalization.lib.php:821
 #: libraries/operations.lib.php:38 libraries/operations.lib.php:108
 #: libraries/operations.lib.php:263 libraries/operations.lib.php:306
 #: libraries/operations.lib.php:801 libraries/operations.lib.php:874
 #: libraries/operations.lib.php:923 libraries/operations.lib.php:1337
 #: libraries/operations.lib.php:1658
-#: libraries/plugins/auth/AuthenticationCookie.class.php:244
+#: libraries/plugins/auth/AuthenticationCookie.class.php:232
 #: libraries/replication_gui.lib.php:122 libraries/replication_gui.lib.php:161
 #: libraries/replication_gui.lib.php:324 libraries/replication_gui.lib.php:461
 #: libraries/replication_gui.lib.php:906 libraries/rte/rte_events.lib.php:509
-#: libraries/rte/rte_routines.lib.php:969
-#: libraries/rte/rte_routines.lib.php:1581
+#: libraries/rte/rte_routines.lib.php:1060
+#: libraries/rte/rte_routines.lib.php:1672
 #: libraries/rte/rte_triggers.lib.php:396 libraries/server_bin_log.lib.php:61
 #: libraries/server_privileges.lib.php:705
 #: libraries/server_privileges.lib.php:2106
 #: libraries/server_privileges.lib.php:2872
 #: libraries/server_privileges.lib.php:3553
-#: libraries/server_privileges.lib.php:4627
+#: libraries/server_privileges.lib.php:4653
 #: libraries/server_user_groups.lib.php:285
 #: libraries/sql_query_form.lib.php:369 libraries/sql_query_form.lib.php:429
 #: libraries/tracking.lib.php:533 libraries/tracking.lib.php:653
 #: prefs_manage.php:277 prefs_manage.php:355
 #: templates/columns_definitions/column_definitions_form.phtml:59
-#: templates/header_location.phtml:17 templates/index_form.phtml:238
+#: templates/database/create_table.phtml:21 templates/header_location.phtml:28
 #: templates/startAndNumberOfRowsPanel.phtml:14
-#: templates/structure/add_column.phtml:25
-#: templates/table/create_table.phtml:21
-#: templates/table/selection_form.phtml:75 view_create.php:275
+#: templates/table/index_form.phtml:238
+#: templates/table/search/selection_form.phtml:75
+#: templates/table/structure/add_column.phtml:25 view_create.php:275
 #: view_operations.php:106
 msgid "Go"
 msgstr "تاييد"
@@ -710,7 +712,7 @@ msgstr "نمی توان کاراکترها را بدون داشتن مرجع  آ
 msgid "Could not load import plugins, please check your installation!"
 msgstr "خطا در بارگزاری افزونه ها, لطفا مراحل نصب را چک کنید"
 
-#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1466
+#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1460
 #, fuzzy, php-format
 msgid "Bookmark %s has been created."
 msgstr "تاریخچه ایجاد شده است"
@@ -752,11 +754,11 @@ msgstr ""
 msgid "Back"
 msgstr "بازگشت"
 
-#: index.php:148 libraries/Footer.class.php:70
+#: index.php:149 libraries/Footer.class.php:70
 msgid "phpMyAdmin Demo Server"
 msgstr "سرور دموی phpMyAdmin"
 
-#: index.php:152
+#: index.php:153
 #, php-format
 msgid ""
 "You are using the demo server. You can do anything here, but please do not "
@@ -767,113 +769,113 @@ msgstr ""
 "اما لطفاً کاربران root و debian-sys-maint و pma را تغییر ندهید. برای اطلاعات "
 "بیشتر رجوع کنید به %s."
 
-#: index.php:162
+#: index.php:163
 msgid "General Settings"
 msgstr "تنظیمات عمومی"
 
-#: index.php:190 libraries/display_change_password.lib.php:50
+#: index.php:191 libraries/display_change_password.lib.php:50
 #: libraries/display_change_password.lib.php:53 user_password.php:247
 msgid "Change password"
 msgstr "تغيير کلمه ی عبور"
 
-#: index.php:206
+#: index.php:207
 msgid "Server connection collation"
 msgstr "Collation اتصال سرور"
 
-#: index.php:228
+#: index.php:229
 msgid "Appearance Settings"
 msgstr "تنظیمات ظاهری"
 
-#: index.php:258 prefs_manage.php:285
+#: index.php:259 prefs_manage.php:285
 msgid "More settings"
 msgstr "تظیمات بیشتر"
 
-#: index.php:279
+#: index.php:280
 msgid "Database server"
 msgstr "سرور پایگاه داده"
 
-#: index.php:282 libraries/plugins/auth/AuthenticationCookie.class.php:181
+#: index.php:283 libraries/plugins/auth/AuthenticationCookie.class.php:169
 msgid "Server:"
 msgstr "سرور:"
 
-#: index.php:286
+#: index.php:287
 msgid "Server type:"
 msgstr "نوع سرور:"
 
-#: index.php:290 libraries/plugins/export/ExportLatex.class.php:212
+#: index.php:291 libraries/plugins/export/ExportLatex.class.php:212
 #: libraries/plugins/export/ExportSql.class.php:687
 #: libraries/plugins/export/ExportXml.class.php:189
 msgid "Server version:"
 msgstr "نسخه سرور:"
 
-#: index.php:296
+#: index.php:297
 msgid "Protocol version:"
 msgstr "نسخه پروتکل:"
 
-#: index.php:300
+#: index.php:301
 msgid "User:"
 msgstr "كاربر:"
 
-#: index.php:305
+#: index.php:306
 msgid "Server charset:"
 msgstr "کاراکترست سرور:"
 
-#: index.php:320
+#: index.php:321
 msgid "Web server"
 msgstr "وب سرور"
 
-#: index.php:331
+#: index.php:332
 msgid "Database client version:"
 msgstr "نسخه کلاینت پایگاه داده:"
 
-#: index.php:335
+#: index.php:336
 #, fuzzy
 msgid "PHP extension:"
 msgstr "نسخه PHP"
 
-#: index.php:349
+#: index.php:350
 #, fuzzy
 #| msgid "PHP Version"
 msgid "PHP version:"
 msgstr "نسخه PHP"
 
-#: index.php:360
+#: index.php:361
 msgid "Show PHP information"
 msgstr "نمايش اطلاعات پی اچ پی"
 
-#: index.php:383
+#: index.php:384
 msgid "Version information:"
 msgstr "اطلاعات نسخه:"
 
-#: index.php:392 libraries/Util.class.php:432 libraries/Util.class.php:495
-#: libraries/config/FormDisplay.tpl.php:151
+#: index.php:393 libraries/Util.class.php:432 libraries/Util.class.php:495
+#: libraries/config/FormDisplay.tpl.php:162
 #: libraries/display_export.lib.php:577 libraries/engines/pbxt.lib.php:162
 #: libraries/navigation/NavigationHeader.class.php:196
 #: libraries/server_variables.lib.php:160
 msgid "Documentation"
 msgstr "مستندات"
 
-#: index.php:399
+#: index.php:400
 msgid "Wiki"
 msgstr "ویکی"
 
-#: index.php:408
+#: index.php:409
 msgid "Official Homepage"
 msgstr "صفحه خانگی  رسمي"
 
-#: index.php:415
+#: index.php:416
 msgid "Contribute"
 msgstr "همکاری"
 
-#: index.php:422
+#: index.php:423
 msgid "Get support"
 msgstr "کمک گرفتن"
 
-#: index.php:429
+#: index.php:430
 msgid "List of changes"
 msgstr "لیست تغییرات"
 
-#: index.php:451
+#: index.php:452
 #, fuzzy
 #| msgid ""
 #| "Your configuration file contains settings (root with no password) that "
@@ -891,7 +893,7 @@ msgstr ""
 "حال اجرا است و شما بايد اين حفره امنيتي را با قرار دادن یک اسم رمز برای "
 "کاربر 'روت' درست كنيد."
 
-#: index.php:468
+#: index.php:469
 msgid ""
 "You have enabled mbstring.func_overload in your PHP configuration. This "
 "option is incompatible with phpMyAdmin and might cause some data to be "
@@ -901,14 +903,14 @@ msgstr ""
 "این خاصیت با ویرایشگر اصلی پی اچ پی سازگاری ندارد و ممکن است باعث از بین "
 "رفتن برخی از اطلاعات گردد!"
 
-#: index.php:483
+#: index.php:484
 msgid ""
 "The mbstring PHP extension was not found and you seem to be using a "
 "multibyte charset. Without the mbstring extension phpMyAdmin is unable to "
 "split strings correctly and it may result in unexpected results."
 msgstr ""
 
-#: index.php:500
+#: index.php:501
 msgid ""
 "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini."
 "session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower than "
@@ -916,17 +918,17 @@ msgid ""
 "expire sooner than configured in phpMyAdmin."
 msgstr ""
 
-#: index.php:519
+#: index.php:520
 msgid ""
 "Login cookie store is lower than cookie validity configured in phpMyAdmin, "
 "because of this, your login will expire sooner than configured in phpMyAdmin."
 msgstr ""
 
-#: index.php:535
+#: index.php:536
 msgid "The configuration file now needs a secret passphrase (blowfish_secret)."
 msgstr ""
 
-#: index.php:548
+#: index.php:549
 msgid ""
 "Directory [code]config[/code], which is used by the setup script, still "
 "exists in your phpMyAdmin directory. It is strongly recommended to remove it "
@@ -934,7 +936,7 @@ msgid ""
 "may be compromised by unauthorized people downloading your configuration."
 msgstr ""
 
-#: index.php:564
+#: index.php:565
 #, fuzzy, php-format
 #| msgid ""
 #| "ditional features for working with linked tables have been ctivated. To d "
@@ -946,19 +948,19 @@ msgstr ""
 "امكانات اضافي براي كاركردن با جدولهاي پيوندي غيرفعال شده‌است . براي پيداكردن "
 "دليل آن %sاينجا%s را بزنيد ."
 
-#: index.php:571
+#: index.php:572
 msgid ""
 "Or alternately go to 'Operations' tab of any database to set it up there."
 msgstr ""
 
-#: index.php:620
+#: index.php:621
 #, php-format
 msgid ""
 "Your PHP MySQL library version %s differs from your MySQL server version %s. "
 "This may cause unpredictable behavior."
 msgstr ""
 
-#: index.php:648
+#: index.php:649
 #, php-format
 msgid ""
 "Server running with Suhosin. Please refer to %sdocumentation%s for possible "
@@ -1130,8 +1132,8 @@ msgstr ""
 msgid "Save & Close"
 msgstr "ذخيره به صورت پرونده"
 
-#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:404
-#: libraries/insert_edit.lib.php:1550 prefs_manage.php:361
+#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:415
+#: libraries/insert_edit.lib.php:1548 prefs_manage.php:361
 #: prefs_manage.php:372
 msgid "Reset"
 msgstr "پاک سازی"
@@ -1172,7 +1174,7 @@ msgstr "افزودن index"
 msgid "Edit Index"
 msgstr "ویرایش کردن ایندکس"
 
-#: js/messages.php:99 templates/index_form.phtml:232
+#: js/messages.php:99 templates/table/index_form.phtml:232
 #, fuzzy, php-format
 #| msgid "Add %d column(s) to index"
 msgid "Add %s column(s) to index"
@@ -1202,15 +1204,16 @@ msgstr "ستونهاي درميان‌گرفته با"
 msgid "Please select column(s) for the index."
 msgstr "افزودن %d  ستون جديد به index"
 
-#: js/messages.php:106 templates/structure/add_column.phtml:1
+#: js/messages.php:106 templates/table/structure/add_column.phtml:1
 #, fuzzy
 #| msgid "You have to choose at least one column to display"
 msgid "You have to add at least one column."
 msgstr "شما حذاقل بايد يك ستون را براي نمايش انتخاب نماييد"
 
-#: js/messages.php:109 libraries/insert_edit.lib.php:1548
+#: js/messages.php:109 libraries/insert_edit.lib.php:1546
 #: templates/columns_definitions/column_definitions_form.phtml:162
-#: templates/index_form.phtml:237 templates/tbl_relation/common_form.phtml:106
+#: templates/table/index_form.phtml:237
+#: templates/table/relation/common_form.phtml:106
 msgid "Preview SQL"
 msgstr ""
 
@@ -1233,7 +1236,7 @@ msgid "SQL query:"
 msgstr "پرس و جوي SQL"
 
 #. l10n: Default label for the y-Axis of Charts
-#: js/messages.php:118 templates/tbl_chart.phtml:109
+#: js/messages.php:118 templates/table/chart/tbl_chart.phtml:109
 #, fuzzy
 #| msgid "Value"
 msgid "Y Values"
@@ -1397,7 +1400,7 @@ msgstr "میزان بایت ارسالی"
 msgid "Bytes received"
 msgstr "میزان بایت دریافتی"
 
-#: js/messages.php:169 libraries/server_status.lib.php:226
+#: js/messages.php:169 libraries/server_status.lib.php:235
 msgid "Connections"
 msgstr "اتصالات"
 
@@ -1454,12 +1457,12 @@ msgstr "%d جدول"
 msgid "Questions"
 msgstr "سوالات"
 
-#: js/messages.php:184 libraries/server_status.lib.php:134
+#: js/messages.php:184 libraries/server_status.lib.php:143
 msgid "Traffic"
 msgstr "ترافیک"
 
 #: js/messages.php:185 libraries/Menu.class.php:586
-#: libraries/Util.class.php:4318 libraries/server_status_monitor.lib.php:257
+#: libraries/Util.class.php:4324 libraries/server_status_monitor.lib.php:257
 msgid "Settings"
 msgstr "تنظیم"
 
@@ -1481,8 +1484,9 @@ msgstr "لطفا حداقل یک مقدار به این سری اضافه نما
 #: libraries/server_status_monitor.lib.php:236
 #: libraries/server_status_processes.lib.php:308
 #: templates/columns_definitions/transformation.phtml:4
-#: templates/designer/options_panel.phtml:178
-#: templates/table/options_zoom.phtml:12 templates/table/rows_zoom.phtml:26
+#: templates/database/designer/options_panel.phtml:178
+#: templates/table/search/options_zoom.phtml:12
+#: templates/table/search/rows_zoom.phtml:26
 msgid "None"
 msgstr "هیچ یک"
 
@@ -1767,8 +1771,8 @@ msgstr ""
 
 #: js/messages.php:270 libraries/Menu.class.php:352
 #: libraries/Menu.class.php:455 libraries/Menu.class.php:582
-#: libraries/Util.class.php:4317 libraries/Util.class.php:4332
-#: libraries/Util.class.php:4349 libraries/config/messages.inc.php:258
+#: libraries/Util.class.php:4323 libraries/Util.class.php:4338
+#: libraries/Util.class.php:4355 libraries/config/messages.inc.php:258
 #: libraries/display_import.lib.php:105
 #: libraries/server_status_monitor.lib.php:318 prefs_manage.php:238
 #: setup/frames/menu.inc.php:26
@@ -1830,13 +1834,13 @@ msgid "Formatting SQL..."
 msgstr ""
 
 #: js/messages.php:293 libraries/server_variables.lib.php:157
-#: templates/designer/aggregate_query_panel.phtml:63
-#: templates/designer/delete_relation_panel.phtml:28
-#: templates/designer/having_query_panel.phtml:117
-#: templates/designer/new_relation_panel.phtml:88
-#: templates/designer/options_panel.phtml:253
-#: templates/designer/rename_to_panel.phtml:45
-#: templates/designer/where_query_panel.phtml:83
+#: templates/database/designer/aggregate_query_panel.phtml:63
+#: templates/database/designer/delete_relation_panel.phtml:28
+#: templates/database/designer/having_query_panel.phtml:117
+#: templates/database/designer/new_relation_panel.phtml:88
+#: templates/database/designer/options_panel.phtml:253
+#: templates/database/designer/rename_to_panel.phtml:45
+#: templates/database/designer/where_query_panel.phtml:83
 msgid "Cancel"
 msgstr "لغو کردن"
 
@@ -1846,7 +1850,7 @@ msgstr "لغو کردن"
 msgid "Page-related settings"
 msgstr "تغيير تنظیمات"
 
-#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:402
+#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:413
 msgid "Apply"
 msgstr ""
 
@@ -1881,8 +1885,8 @@ msgstr ""
 msgid "Error text: %s"
 msgstr ""
 
-#: js/messages.php:307 libraries/db_common.inc.php:68
-#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:450
+#: js/messages.php:307 libraries/db_common.inc.php:69
+#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:461
 msgid "No databases selected."
 msgstr "هیچ پایگاه داده ای انتخاب نشده است."
 
@@ -1894,12 +1898,13 @@ msgstr "حذف ستون"
 msgid "Adding Primary Key"
 msgstr "اضافه کردن کلید اولیه"
 
-#: js/messages.php:310 templates/designer/aggregate_query_panel.phtml:59
-#: templates/designer/having_query_panel.phtml:113
-#: templates/designer/new_relation_panel.phtml:87
-#: templates/designer/options_panel.phtml:252
-#: templates/designer/rename_to_panel.phtml:41
-#: templates/designer/where_query_panel.phtml:82
+#: js/messages.php:310
+#: templates/database/designer/aggregate_query_panel.phtml:59
+#: templates/database/designer/having_query_panel.phtml:113
+#: templates/database/designer/new_relation_panel.phtml:87
+#: templates/database/designer/options_panel.phtml:252
+#: templates/database/designer/rename_to_panel.phtml:41
+#: templates/database/designer/where_query_panel.phtml:82
 msgid "OK"
 msgstr "تاييد"
 
@@ -1919,7 +1924,7 @@ msgstr "کپی کردن پایگاه داده"
 msgid "Changing Charset"
 msgstr "تغییر نویسهگان"
 
-#: js/messages.php:320 libraries/Util.class.php:3217
+#: js/messages.php:320 libraries/Util.class.php:3223
 #, fuzzy
 #| msgid "Select Foreign Key"
 msgid "Enable foreign key checks"
@@ -1958,20 +1963,21 @@ msgstr "تعریف یک تابع ذخیره شده باید شامل یک دست
 #: js/messages.php:334 libraries/DisplayResults.class.php:4834
 #: libraries/DisplayResults.class.php:5092 libraries/Menu.class.php:344
 #: libraries/Menu.class.php:446 libraries/Menu.class.php:578
-#: libraries/Util.class.php:3636 libraries/Util.class.php:3637
-#: libraries/Util.class.php:4316 libraries/Util.class.php:4331
-#: libraries/Util.class.php:4348 libraries/config/messages.inc.php:252
+#: libraries/Util.class.php:3642 libraries/Util.class.php:3643
+#: libraries/Util.class.php:4322 libraries/Util.class.php:4337
+#: libraries/Util.class.php:4354 libraries/config/messages.inc.php:252
 #: libraries/display_export.lib.php:173 libraries/rte/rte_list.lib.php:146
 #: libraries/server_privileges.lib.php:2211
 #: libraries/server_privileges.lib.php:2290
 #: libraries/server_privileges.lib.php:2632
 #: libraries/server_privileges.lib.php:3356
 #: libraries/server_status_monitor.lib.php:322 prefs_manage.php:303
-#: setup/frames/menu.inc.php:27 templates/structure/check_all_tables.phtml:11
+#: setup/frames/menu.inc.php:27
+#: templates/database/structure/check_all_tables.phtml:11
 msgid "Export"
 msgstr "صدور"
 
-#: js/messages.php:337 libraries/rte/rte_routines.lib.php:652
+#: js/messages.php:337 libraries/rte/rte_routines.lib.php:743
 msgid "ENUM/SET editor"
 msgstr "ویرایشگر ENUM/SET"
 
@@ -2014,7 +2020,7 @@ msgstr "نمایش جعبه پرس و جو"
 #: libraries/Console.class.php:214 libraries/DisplayResults.class.php:3474
 #: libraries/DisplayResults.class.php:4818 libraries/Index.class.php:723
 #: libraries/Util.class.php:706 libraries/Util.class.php:1202
-#: libraries/Util.class.php:3634 libraries/Util.class.php:3635
+#: libraries/Util.class.php:3640 libraries/Util.class.php:3641
 #: libraries/central_columns.lib.php:851
 #: libraries/central_columns.lib.php:1193
 #: libraries/config/messages.inc.php:892
@@ -2032,7 +2038,7 @@ msgstr "ويرايش"
 #: libraries/server_user_groups.lib.php:129
 #: libraries/sql_query_form.lib.php:416 libraries/tracking.lib.php:477
 #: setup/frames/index.inc.php:183 setup/frames/index.inc.php:291
-#: templates/designer/delete_relation_panel.phtml:27
+#: templates/database/designer/delete_relation_panel.phtml:27
 msgid "Delete"
 msgstr "حذف"
 
@@ -2214,11 +2220,11 @@ msgid "No dependencies selected!"
 msgstr "هیچ پایگاه داده ای انتخاب نشده است."
 
 #: js/messages.php:394 libraries/central_columns.lib.php:1214
-#: libraries/insert_edit.lib.php:1458 libraries/server_variables.lib.php:155
+#: libraries/insert_edit.lib.php:1456 libraries/server_variables.lib.php:155
 #: setup/frames/config.inc.php:42 setup/frames/index.inc.php:279
 #: templates/columns_definitions/column_definitions_form.phtml:165
-#: templates/gis_visualization/gis_visualization.phtml:48
-#: templates/tbl_relation/common_form.phtml:107
+#: templates/table/gis_visualization/gis_visualization.phtml:48
+#: templates/table/relation/common_form.phtml:107
 msgid "Save"
 msgstr "ذخيره"
 
@@ -2308,8 +2314,8 @@ msgid "Data point content"
 msgstr "محتوای داده ها"
 
 #: js/messages.php:430 js/messages.php:562 js/messages.php:579
-#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2573
-#: templates/index_form.phtml:154 templates/index_form.phtml:194
+#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2571
+#: templates/table/index_form.phtml:154 templates/table/index_form.phtml:194
 msgid "Ignore"
 msgstr "در نظر نگرفتن"
 
@@ -2372,8 +2378,8 @@ msgstr "انتخاب کلید خارجی"
 msgid "Please select the primary key or a unique key!"
 msgstr "لطفا کلید اولیه و یا یک کلید منحصر به فرد را انتخاب کنید"
 
-#: js/messages.php:457 templates/designer/side_menu.phtml:91
-#: templates/designer/side_menu.phtml:94
+#: js/messages.php:457 templates/database/designer/side_menu.phtml:91
+#: templates/database/designer/side_menu.phtml:94
 msgid "Choose column to display"
 msgstr "ستون را براي نمايش انتخاب نماييد"
 
@@ -2391,22 +2397,22 @@ msgstr ""
 msgid "Page name"
 msgstr "شماره صفحه:"
 
-#: js/messages.php:463 templates/designer/side_menu.phtml:56
-#: templates/designer/side_menu.phtml:59
+#: js/messages.php:463 templates/database/designer/side_menu.phtml:56
+#: templates/database/designer/side_menu.phtml:59
 #, fuzzy
 #| msgid "Select Tables"
 msgid "Save page"
 msgstr "Select Tables"
 
-#: js/messages.php:464 templates/designer/side_menu.phtml:63
-#: templates/designer/side_menu.phtml:66
+#: js/messages.php:464 templates/database/designer/side_menu.phtml:63
+#: templates/database/designer/side_menu.phtml:66
 #, fuzzy
 #| msgid "Select Tables"
 msgid "Save page as"
 msgstr "Select Tables"
 
-#: js/messages.php:465 templates/designer/side_menu.phtml:49
-#: templates/designer/side_menu.phtml:52
+#: js/messages.php:465 templates/database/designer/side_menu.phtml:49
+#: templates/database/designer/side_menu.phtml:52
 #, fuzzy
 #| msgid "Free pages"
 msgid "Open page"
@@ -2418,7 +2424,7 @@ msgstr "صفحه های ازاد"
 msgid "Delete page"
 msgstr "Select Tables"
 
-#: js/messages.php:467 templates/designer/side_menu.phtml:10
+#: js/messages.php:467 templates/database/designer/side_menu.phtml:10
 #, fuzzy
 #| msgid "Unit"
 msgid "Untitled"
@@ -2556,7 +2562,7 @@ msgstr "موقعیت اصلی"
 msgid "cancel"
 msgstr "لغو کردن"
 
-#: js/messages.php:499 libraries/server_status.lib.php:271
+#: js/messages.php:499 libraries/server_status.lib.php:280
 msgid "Aborted"
 msgstr ""
 
@@ -3191,7 +3197,7 @@ msgstr "شماره پورت معتبر نیست"
 
 #: js/messages.php:793 libraries/Message.class.php:199
 #: libraries/Util.class.php:654 libraries/core.lib.php:245
-#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1172
+#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1170
 #: tbl_operations.php:229 view_operations.php:63
 msgid "Error"
 msgstr "خطا"
@@ -3250,8 +3256,8 @@ msgstr "در ثانیه"
 msgid "per minute"
 msgstr "در دقیقه"
 
-#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:143
-#: libraries/server_status.lib.php:228
+#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:152
+#: libraries/server_status.lib.php:237
 #: libraries/server_status_queries.lib.php:98
 msgid "per hour"
 msgstr "در ساعت"
@@ -3269,7 +3275,7 @@ msgstr "فایل تنظیمات فعلی (%s) قابل خواندن نیست."
 msgid "Wrong permissions on configuration file, should not be world writable!"
 msgstr "تنظمیات دسترسی اشتباه در فایل تنظیمات ، نباید قابل نوشتن جهانی باشد!"
 
-#: libraries/Config.class.php:1799
+#: libraries/Config.class.php:1801
 msgid "Font size"
 msgstr "اندازه فونت"
 
@@ -3299,10 +3305,10 @@ msgstr "کوئری داخلی"
 #: libraries/server_privileges.lib.php:2890
 #: libraries/server_privileges.lib.php:3144
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4332
+#: libraries/server_privileges.lib.php:4358
 #: libraries/server_status_processes.lib.php:80
-#: templates/tbl_relation/foreign_key_row.phtml:165
-#: templates/tbl_relation/internal_relational_row.phtml:55
+#: templates/table/relation/foreign_key_row.phtml:165
+#: templates/table/relation/internal_relational_row.phtml:55
 msgid "Database"
 msgstr "پايگاه داده"
 
@@ -3412,11 +3418,11 @@ msgstr "معتبرسازي SQL"
 #: libraries/plugins/import/ImportMediawiki.class.php:60
 #: libraries/plugins/import/ImportOds.class.php:59
 #: libraries/plugins/import/ImportShp.class.php:57
-#: libraries/plugins/import/ImportSql.class.php:148
+#: libraries/plugins/import/ImportSql.class.php:51
 #: libraries/plugins/import/ImportXml.class.php:58
-#: libraries/rte/rte_routines.lib.php:833 templates/index_form.phtml:49
-#: templates/structure/row_stats_table.phtml:20
-#: templates/table/options.phtml:2
+#: libraries/rte/rte_routines.lib.php:924 templates/table/index_form.phtml:49
+#: templates/table/search/options.phtml:2
+#: templates/table/structure/row_stats_table.phtml:20
 #, fuzzy
 msgid "Options"
 msgstr "عمليات"
@@ -3460,7 +3466,8 @@ msgstr "نزولي"
 msgid "Order:"
 msgstr "دیگر"
 
-#: libraries/Console.class.php:289 templates/table/replace_preview.phtml:17
+#: libraries/Console.class.php:289
+#: templates/table/search/replace_preview.phtml:17
 #, fuzzy
 #| msgid "Column"
 msgid "Count"
@@ -3586,9 +3593,9 @@ msgstr "تعویض به پایگاه داده ی کپی شده"
 #: libraries/operations.lib.php:794 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:191
-#: templates/structure/sortable_header.phtml:21
-#: templates/structure/sortable_header.phtml:38
-#: templates/table/options.phtml:68
+#: templates/database/structure/sortable_header.phtml:21
+#: templates/database/structure/sortable_header.phtml:38
+#: templates/table/search/options.phtml:68
 msgid "Ascending"
 msgstr "صعودي"
 
@@ -3598,13 +3605,14 @@ msgstr "صعودي"
 #: libraries/operations.lib.php:797 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:188
-#: templates/structure/sortable_header.phtml:26
-#: templates/structure/sortable_header.phtml:43
-#: templates/table/options.phtml:69
+#: templates/database/structure/sortable_header.phtml:26
+#: templates/database/structure/sortable_header.phtml:43
+#: templates/table/search/options.phtml:69
 msgid "Descending"
 msgstr "نزولي"
 
-#: libraries/DBQbe.class.php:467 templates/table/search_and_replace.phtml:6
+#: libraries/DBQbe.class.php:467
+#: templates/table/search/search_and_replace.phtml:6
 #, fuzzy
 #| msgid "Column"
 msgid "Column:"
@@ -3783,12 +3791,12 @@ msgstr[0] "%1$s همتا در <strong>%2$s</strong>"
 msgstr[1] "%1$s همتا در <strong>%2$s</strong>"
 
 #: libraries/DbSearch.class.php:354 libraries/Menu.class.php:311
-#: libraries/Util.class.php:3337 libraries/Util.class.php:3347
-#: libraries/Util.class.php:3623 libraries/Util.class.php:3624
-#: libraries/Util.class.php:4343 libraries/config.values.php:43
+#: libraries/Util.class.php:3343 libraries/Util.class.php:3353
+#: libraries/Util.class.php:3629 libraries/Util.class.php:3630
+#: libraries/Util.class.php:4349 libraries/config.values.php:43
 #: libraries/config.values.php:51 libraries/config.values.php:119
 #: libraries/navigation/Nodes/Node_Table.class.php:295
-#: templates/structure/check_all_table_column.phtml:5
+#: templates/table/structure/check_all_table_column.phtml:5
 msgid "Browse"
 msgstr "فهرست"
 
@@ -3805,7 +3813,8 @@ msgstr "جستجو در پايگاه‌ داده"
 msgid "Words or values to search for (wildcard: \"%\"):"
 msgstr "كلمه(ها) يا مقدار(ها) براي جستجو (wildcard: \"%\"):"
 
-#: libraries/DbSearch.class.php:401 templates/table/search_and_replace.phtml:1
+#: libraries/DbSearch.class.php:401
+#: templates/table/search/search_and_replace.phtml:1
 msgid "Find:"
 msgstr "یافتن :"
 
@@ -3855,28 +3864,28 @@ msgstr "فیلتر"
 msgid "Search this table"
 msgstr "جستجو در پايگاه‌ داده"
 
-#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2532
-#: libraries/Util.class.php:2535
+#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2538
+#: libraries/Util.class.php:2541
 msgctxt "First page"
 msgid "Begin"
 msgstr "شروع"
 
-#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2533
-#: libraries/Util.class.php:2536 libraries/server_bin_log.lib.php:170
+#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2539
+#: libraries/Util.class.php:2542 libraries/server_bin_log.lib.php:170
 #: libraries/server_bin_log.lib.php:172
 msgctxt "Previous page"
 msgid "Previous"
 msgstr "قبلی"
 
-#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2564
-#: libraries/Util.class.php:2574 libraries/server_bin_log.lib.php:204
+#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2570
+#: libraries/Util.class.php:2580 libraries/server_bin_log.lib.php:204
 #: libraries/server_bin_log.lib.php:206
 msgctxt "Next page"
 msgid "Next"
 msgstr "بعدی"
 
-#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2565
-#: libraries/Util.class.php:2575
+#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2571
+#: libraries/Util.class.php:2581
 msgctxt "Last page"
 msgid "End"
 msgstr "انتها"
@@ -3959,9 +3968,9 @@ msgid "May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]."
 msgstr ""
 
 #: libraries/DisplayResults.class.php:4332 libraries/Message.class.php:180
-#: libraries/controllers/TableRelationController.class.php:258
+#: libraries/controllers/TableRelationController.class.php:259
 #: libraries/controllers/TableSearchController.class.php:655
-#: libraries/rte/rte_routines.lib.php:1332 libraries/sql_query_form.lib.php:89
+#: libraries/rte/rte_routines.lib.php:1423 libraries/sql_query_form.lib.php:89
 #: tbl_operations.php:227 tbl_row_action.php:138 view_operations.php:62
 #, fuzzy
 #| msgid "Your SQL query has been executed successfully."
@@ -3969,7 +3978,7 @@ msgid "Your SQL query has been executed successfully."
 msgstr "اجرای فرایند شما با موفقيت اجرا گرديد"
 
 #: libraries/DisplayResults.class.php:4660
-#: libraries/controllers/StructureController.class.php:629
+#: libraries/controllers/DatabaseStructureController.class.php:564
 #, php-format
 msgid ""
 "This view has at least this number of rows. Please refer to %sdocumentation"
@@ -3994,33 +4003,33 @@ msgstr ""
 msgid "%d total"
 msgstr "جمع كل"
 
-#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1318
+#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1312
 #, php-format
 msgid "Query took %01.4f seconds."
 msgstr ""
 
 #: libraries/DisplayResults.class.php:4807
-#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4767
-#: libraries/Util.class.php:4773 libraries/mult_submits.inc.php:50
-#: templates/structure/check_all_tables.phtml:2
-#: templates/structure/check_all_tables.phtml:9
+#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4773
+#: libraries/Util.class.php:4779 libraries/mult_submits.inc.php:50
+#: templates/database/structure/check_all_tables.phtml:2
+#: templates/database/structure/check_all_tables.phtml:9
 msgid "With selected:"
 msgstr "موارد انتخاب‌ شده :"
 
 #: libraries/DisplayResults.class.php:4811
-#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4769
-#: libraries/Util.class.php:4770 libraries/server_privileges.lib.php:1174
+#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4775
+#: libraries/Util.class.php:4776 libraries/server_privileges.lib.php:1174
 #: libraries/server_privileges.lib.php:1175
 #: libraries/server_privileges.lib.php:1387
 #: libraries/server_user_groups.lib.php:231
-#: templates/structure/check_all_tables.phtml:3
-#: templates/structure/check_all_tables.phtml:4
+#: templates/database/structure/check_all_tables.phtml:3
+#: templates/database/structure/check_all_tables.phtml:4
 msgid "Check All"
 msgstr "انتخاب همه"
 
 #: libraries/DisplayResults.class.php:4985 libraries/Header.class.php:383
-#: templates/structure/optional_action_links.phtml:1
-#: templates/structure/print_view_data_dictionary_link.phtml:3
+#: templates/database/structure/print_view_data_dictionary_link.phtml:3
+#: templates/table/structure/optional_action_links.phtml:1
 msgid "Print view"
 msgstr "نماي چاپ"
 
@@ -4028,7 +4037,8 @@ msgstr "نماي چاپ"
 msgid "Query results operations"
 msgstr ""
 
-#: libraries/DisplayResults.class.php:5105 templates/tbl_chart.phtml:12
+#: libraries/DisplayResults.class.php:5105
+#: templates/table/chart/tbl_chart.phtml:12
 #, fuzzy
 #| msgid "Displaying Column Comments"
 msgid "Display chart"
@@ -4129,7 +4139,7 @@ msgid "Click on the bar to scroll to top of page"
 msgstr ""
 
 #: libraries/Header.class.php:749
-#: libraries/plugins/auth/AuthenticationCookie.class.php:152
+#: libraries/plugins/auth/AuthenticationCookie.class.php:140
 #, fuzzy
 #| msgid "Cookies must be enabled past this point."
 msgid "Javascript must be enabled past this point!"
@@ -4153,11 +4163,11 @@ msgid "Keyname"
 msgstr "نام کلید"
 
 #: libraries/Index.class.php:697
-#: libraries/controllers/StructureController.class.php:1962
-#: libraries/controllers/StructureController.class.php:1967
+#: libraries/controllers/TableStructureController.class.php:953
+#: libraries/controllers/TableStructureController.class.php:958
 #: libraries/tracking.lib.php:973
 #: templates/columns_definitions/column_indexes.phtml:11
-#: templates/structure/check_all_table_column.phtml:26
+#: templates/table/structure/check_all_table_column.phtml:26
 msgid "Unique"
 msgstr "يكتا"
 
@@ -4176,16 +4186,17 @@ msgstr ""
 #: libraries/server_collations.lib.php:35 libraries/tracking.lib.php:881
 #: libraries/tracking.lib.php:977
 #: templates/columns_definitions/table_fields_definitions.phtml:33
-#: templates/structure/row_stats_table.phtml:31
-#: templates/structure/table_header.phtml:55
-#: templates/structure/table_structure_header.phtml:7
-#: templates/table/table_header.phtml:8
+#: templates/database/structure/table_header.phtml:55
+#: templates/table/search/table_header.phtml:8
+#: templates/table/structure/row_stats_table.phtml:31
+#: templates/table/structure/table_structure_header.phtml:7
 msgid "Collation"
 msgstr "مقایسه"
 
 #: libraries/Index.class.php:703 libraries/rte/rte_events.lib.php:496
-#: libraries/rte/rte_routines.lib.php:956 libraries/tracking.lib.php:885
-#: libraries/tracking.lib.php:979 templates/structure/table_header.phtml:84
+#: libraries/rte/rte_routines.lib.php:1047 libraries/tracking.lib.php:885
+#: libraries/tracking.lib.php:979
+#: templates/database/structure/table_header.phtml:84
 msgid "Comment"
 msgstr "توضيحات"
 
@@ -4198,15 +4209,15 @@ msgstr "كليد اصلي حذف گرديد."
 msgid "Index %s has been dropped."
 msgstr "فهرست %s حذف گرديد."
 
-#: libraries/Index.class.php:757 libraries/Util.class.php:3630
-#: libraries/Util.class.php:3631
-#: libraries/controllers/StructureController.class.php:1958
-#: libraries/controllers/StructureController.class.php:1959
+#: libraries/Index.class.php:757 libraries/Util.class.php:3636
+#: libraries/Util.class.php:3637
+#: libraries/controllers/TableStructureController.class.php:949
+#: libraries/controllers/TableStructureController.class.php:950
 #: libraries/operations.lib.php:1607 libraries/rte/rte_list.lib.php:150
 #: libraries/server_databases.lib.php:146
-#: templates/structure/check_all_table_column.phtml:15
-#: templates/structure/check_all_tables.phtml:16
-#: templates/tbl_relation/foreign_key_row.phtml:93
+#: templates/database/structure/check_all_tables.phtml:16
+#: templates/table/relation/foreign_key_row.phtml:93
+#: templates/table/structure/check_all_table_column.phtml:15
 msgid "Drop"
 msgstr "حذف"
 
@@ -4235,16 +4246,16 @@ msgstr "سرور"
 #: libraries/Menu.class.php:248
 #: libraries/navigation/Nodes/Node_View.class.php:32
 #: libraries/tbl_info.inc.php:63
-#: templates/structure/structure_table_row.phtml:97
-#: templates/structure/structure_table_row.phtml:159
+#: templates/database/structure/structure_table_row.phtml:97
+#: templates/database/structure/structure_table_row.phtml:159
 msgid "View"
 msgstr "نمایه"
 
 #: libraries/Menu.class.php:325 libraries/Menu.class.php:429
-#: libraries/Menu.class.php:548 libraries/Util.class.php:3334
-#: libraries/Util.class.php:3344 libraries/Util.class.php:3350
-#: libraries/Util.class.php:4313 libraries/Util.class.php:4328
-#: libraries/Util.class.php:4345 libraries/config.values.php:40
+#: libraries/Menu.class.php:548 libraries/Util.class.php:3340
+#: libraries/Util.class.php:3350 libraries/Util.class.php:3356
+#: libraries/Util.class.php:4319 libraries/Util.class.php:4334
+#: libraries/Util.class.php:4351 libraries/config.values.php:40
 #: libraries/config.values.php:48 libraries/config.values.php:110
 #: libraries/config.values.php:116 libraries/config/messages.inc.php:321
 #: libraries/navigation/Nodes/Node_Table.class.php:292
@@ -4252,19 +4263,19 @@ msgid "SQL"
 msgstr "SQL"
 
 #: libraries/Menu.class.php:328 libraries/Menu.class.php:432
-#: libraries/Util.class.php:3335 libraries/Util.class.php:3345
-#: libraries/Util.class.php:3351 libraries/Util.class.php:3625
-#: libraries/Util.class.php:3626 libraries/Util.class.php:4329
-#: libraries/Util.class.php:4346 libraries/config.values.php:41
+#: libraries/Util.class.php:3341 libraries/Util.class.php:3351
+#: libraries/Util.class.php:3357 libraries/Util.class.php:3631
+#: libraries/Util.class.php:3632 libraries/Util.class.php:4335
+#: libraries/Util.class.php:4352 libraries/config.values.php:41
 #: libraries/config.values.php:49 libraries/config.values.php:111
 #: libraries/config.values.php:117
 #: libraries/navigation/Nodes/Node_Table.class.php:286
 msgid "Search"
 msgstr "جستجو"
 
-#: libraries/Menu.class.php:338 libraries/Util.class.php:3336
-#: libraries/Util.class.php:3346 libraries/Util.class.php:3627
-#: libraries/Util.class.php:3628 libraries/Util.class.php:4347
+#: libraries/Menu.class.php:338 libraries/Util.class.php:3342
+#: libraries/Util.class.php:3352 libraries/Util.class.php:3633
+#: libraries/Util.class.php:3634 libraries/Util.class.php:4353
 #: libraries/config.values.php:42 libraries/config.values.php:50
 #: libraries/config.values.php:118
 #: libraries/navigation/Nodes/Node_Table.class.php:289
@@ -4273,30 +4284,30 @@ msgid "Insert"
 msgstr "درج"
 
 #: libraries/Menu.class.php:362 libraries/Menu.class.php:467
-#: libraries/Util.class.php:4334 libraries/Util.class.php:4350
+#: libraries/Util.class.php:4340 libraries/Util.class.php:4356
 #: libraries/config.values.php:106 libraries/server_common.lib.php:51
 #: libraries/server_privileges.lib.php:2370
 #: libraries/server_privileges.lib.php:3158
-#: libraries/server_privileges.lib.php:4221
+#: libraries/server_privileges.lib.php:4247
 msgid "Privileges"
 msgstr "امتيازات"
 
 #: libraries/Menu.class.php:371 libraries/Menu.class.php:379
-#: libraries/Menu.class.php:459 libraries/Util.class.php:3338
-#: libraries/Util.class.php:3352 libraries/Util.class.php:4333
-#: libraries/Util.class.php:4351 libraries/config.values.php:112
+#: libraries/Menu.class.php:459 libraries/Util.class.php:3344
+#: libraries/Util.class.php:3358 libraries/Util.class.php:4339
+#: libraries/Util.class.php:4357 libraries/config.values.php:112
 #: view_operations.php:92
 msgid "Operations"
 msgstr "عمليات"
 
 #: libraries/Menu.class.php:384 libraries/Menu.class.php:492
-#: libraries/Util.class.php:4338 libraries/Util.class.php:4352
+#: libraries/Util.class.php:4344 libraries/Util.class.php:4358
 #: libraries/relation.lib.php:255
 msgid "Tracking"
 msgstr ""
 
 #: libraries/Menu.class.php:397 libraries/Menu.class.php:486
-#: libraries/Util.class.php:4337 libraries/Util.class.php:4353
+#: libraries/Util.class.php:4343 libraries/Util.class.php:4359
 #: libraries/navigation/Nodes/Node_Trigger_Container.class.php:24
 #: libraries/plugins/export/ExportHtmlword.class.php:557
 #: libraries/plugins/export/ExportOdt.class.php:685
@@ -4313,16 +4324,16 @@ msgstr ""
 msgid "Database seems to be empty!"
 msgstr ""
 
-#: libraries/Menu.class.php:439 libraries/Util.class.php:4330
+#: libraries/Menu.class.php:439 libraries/Util.class.php:4336
 msgid "Query"
 msgstr "پرس و جو"
 
-#: libraries/Menu.class.php:472 libraries/Util.class.php:4335
+#: libraries/Menu.class.php:472 libraries/Util.class.php:4341
 #: libraries/rte/rte_words.lib.php:36
 msgid "Routines"
 msgstr ""
 
-#: libraries/Menu.class.php:479 libraries/Util.class.php:4336
+#: libraries/Menu.class.php:479 libraries/Util.class.php:4342
 #: libraries/navigation/Nodes/Node_Event_Container.class.php:26
 #: libraries/plugins/export/ExportSql.class.php:940
 #: libraries/plugins/export/ExportXml.class.php:107
@@ -4330,22 +4341,22 @@ msgstr ""
 msgid "Events"
 msgstr "رویدادها"
 
-#: libraries/Menu.class.php:498 libraries/Util.class.php:4339
+#: libraries/Menu.class.php:498 libraries/Util.class.php:4345
 msgid "Designer"
 msgstr "طرّاح"
 
-#: libraries/Menu.class.php:507 libraries/Util.class.php:4340
-#: templates/structure/check_all_tables.phtml:35
+#: libraries/Menu.class.php:507 libraries/Util.class.php:4346
+#: templates/database/structure/check_all_tables.phtml:35
 #, fuzzy
 #| msgid "Textarea columns"
 msgid "Central columns"
 msgstr "اضافه يا حذف ستونها"
 
-#: libraries/Menu.class.php:544 libraries/Util.class.php:4312
+#: libraries/Menu.class.php:544 libraries/Util.class.php:4318
 #: libraries/config.values.php:103 libraries/config/messages.inc.php:266
 #: libraries/config/messages.inc.php:341
 #: libraries/navigation/NavigationTree.class.php:1239
-#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4332
+#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4358
 msgid "Databases"
 msgstr "پايگاههاي داده"
 
@@ -4356,36 +4367,36 @@ msgid "User accounts"
 msgstr "كاربر"
 
 #: libraries/Menu.class.php:595 libraries/ServerStatusData.class.php:121
-#: libraries/Util.class.php:4319 libraries/server_common.lib.php:36
+#: libraries/Util.class.php:4325 libraries/server_common.lib.php:36
 #, fuzzy
 msgid "Binary log"
 msgstr "دودويي"
 
 #: libraries/Menu.class.php:601 libraries/ServerStatusData.class.php:126
-#: libraries/Util.class.php:4320 libraries/server_common.lib.php:42
-#: templates/structure/body_for_table_summary.phtml:10
-#: templates/structure/table_header.phtml:27
+#: libraries/Util.class.php:4326 libraries/server_common.lib.php:42
+#: templates/database/structure/body_for_table_summary.phtml:10
+#: templates/database/structure/table_header.phtml:27
 msgid "Replication"
 msgstr "تکرار"
 
 #: libraries/Menu.class.php:606 libraries/ServerStatusData.class.php:193
-#: libraries/Util.class.php:4321 libraries/config.values.php:105
+#: libraries/Util.class.php:4327 libraries/config.values.php:105
 #: libraries/server_engines.lib.php:108 libraries/server_engines.lib.php:112
 #: libraries/sql_query_form.lib.php:421
 #, fuzzy
 msgid "Variables"
 msgstr "متغییر"
 
-#: libraries/Menu.class.php:610 libraries/Util.class.php:4322
+#: libraries/Menu.class.php:610 libraries/Util.class.php:4328
 msgid "Charsets"
 msgstr ""
 
-#: libraries/Menu.class.php:615 libraries/Util.class.php:4323
+#: libraries/Menu.class.php:615 libraries/Util.class.php:4329
 #: libraries/server_common.lib.php:33 libraries/server_plugins.lib.php:27
 msgid "Plugins"
 msgstr ""
 
-#: libraries/Menu.class.php:626 libraries/Util.class.php:4324
+#: libraries/Menu.class.php:626 libraries/Util.class.php:4330
 msgid "Engines"
 msgstr "موتور"
 
@@ -4410,7 +4421,7 @@ msgid_plural "%1$d rows inserted."
 msgstr[0] ""
 msgstr[1] ""
 
-#: libraries/PDF.class.php:70 libraries/Util.class.php:2521
+#: libraries/PDF.class.php:70 libraries/Util.class.php:2527
 #: libraries/browse_foreigners.lib.php:327
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:865
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:890
@@ -4435,7 +4446,7 @@ msgid "Could not save favorite table!"
 msgstr "جدول اخیر ذخیره نشد"
 
 #: libraries/RecentFavoriteTable.class.php:212
-#: templates/structure/favorite_anchor.phtml:12
+#: templates/database/structure/favorite_anchor.phtml:12
 #, fuzzy
 #| msgid "Remove chart"
 msgid "Remove from Favorites"
@@ -4616,7 +4627,7 @@ msgid ""
 msgstr ""
 
 #: libraries/StorageEngine.class.php:373
-#: templates/structure/body_for_table_summary.phtml:50
+#: templates/database/structure/body_for_table_summary.phtml:50
 #, php-format
 msgid "%s is the default storage engine on this MySQL server."
 msgstr "در این پایگاه داده(mysql) موتور پیش فرض ذخیره سازی %s میباشد ."
@@ -5053,10 +5064,10 @@ msgstr ""
 
 #: libraries/Util.class.php:726 libraries/rte/rte_events.lib.php:110
 #: libraries/rte/rte_events.lib.php:119 libraries/rte/rte_events.lib.php:150
-#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:153
-#: libraries/rte/rte_routines.lib.php:162
-#: libraries/rte/rte_routines.lib.php:235
-#: libraries/rte/rte_routines.lib.php:1366
+#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:223
+#: libraries/rte/rte_routines.lib.php:250
+#: libraries/rte/rte_routines.lib.php:372
+#: libraries/rte/rte_routines.lib.php:1457
 #: libraries/rte/rte_triggers.lib.php:86 libraries/rte/rte_triggers.lib.php:95
 #: libraries/rte/rte_triggers.lib.php:127
 msgid "MySQL said: "
@@ -5102,79 +5113,82 @@ msgstr "يكشنبه"
 msgid "%B %d, %Y at %I:%M %p"
 msgstr "%d %B %Y ساعت %I:%M %p"
 
-#: libraries/Util.class.php:2019
+#: libraries/Util.class.php:2025
 #, php-format
 msgid "%s days, %s hours, %s minutes and %s seconds"
 msgstr "%s روز ، %s ساعت ، %s دقیقه و %s ثانیه"
 
-#: libraries/Util.class.php:2112
+#: libraries/Util.class.php:2118
 msgid "Missing parameter:"
 msgstr "پارامتر یافت نشد:"
 
-#: libraries/Util.class.php:2645
+#: libraries/Util.class.php:2651
 #, php-format
 msgid "Jump to database \"%s\"."
 msgstr "پرش به پایگاه داده \"%s\"."
 
-#: libraries/Util.class.php:2670
+#: libraries/Util.class.php:2676
 #, php-format
 msgid "The %s functionality is affected by a known bug, see %s"
 msgstr ""
 "قابلیت %s به خاطر یک باگ شناخته شده تحت تاثیر قرار گرفته ایست، برای اطلاعات "
 "بیشتر به %s مراجعه کنید"
 
-#: libraries/Util.class.php:2881
+#: libraries/Util.class.php:2887
 msgid "Click to toggle"
 msgstr "برای انتخاب کلیک کنبد"
 
-#: libraries/Util.class.php:3542 prefs_manage.php:248
+#: libraries/Util.class.php:3548 prefs_manage.php:248
 msgid "Browse your computer:"
 msgstr "رایانه خود را مشاهده نمایید:"
 
-#: libraries/Util.class.php:3567
+#: libraries/Util.class.php:3573
 #, php-format
 msgid "Select from the web server upload directory <b>%s</b>:"
 msgstr "انتخاب از مسیر آپلود در سرور <b>%s</b>:"
 
-#: libraries/Util.class.php:3596 libraries/insert_edit.lib.php:1173
+#: libraries/Util.class.php:3602 libraries/insert_edit.lib.php:1171
 msgid "The directory you set for upload work cannot be reached."
 msgstr "پوشه‌اي را كه براي انتقال فايل انتخاب كرده‌ايد قابل دسترسي نيست."
 
-#: libraries/Util.class.php:3607
+#: libraries/Util.class.php:3613
 #, fuzzy
 #| msgid "There are no files to upload"
 msgid "There are no files to upload!"
 msgstr "فایلی برای آپلود موجود نیست"
 
-#: libraries/Util.class.php:3632 libraries/Util.class.php:3633
-#: templates/structure/check_all_tables.phtml:15
+#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: templates/database/structure/check_all_tables.phtml:15
 msgid "Empty"
 msgstr "خالي"
 
-#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: libraries/Util.class.php:3644 libraries/Util.class.php:3645
 msgid "Execute"
 msgstr "اجرا"
 
-#: libraries/Util.class.php:4152
+#: libraries/Util.class.php:4158
 msgid "Print"
 msgstr "چاپ"
 
-#: libraries/Util.class.php:4257 templates/structure/row_stats_table.phtml:80
-#: templates/structure/table_header.phtml:95
+#: libraries/Util.class.php:4263
+#: templates/database/structure/table_header.phtml:95
+#: templates/table/structure/row_stats_table.phtml:80
 msgid "Creation"
 msgstr "ایجاد"
 
-#: libraries/Util.class.php:4263 templates/structure/row_stats_table.phtml:87
-#: templates/structure/table_header.phtml:106
+#: libraries/Util.class.php:4269
+#: templates/database/structure/table_header.phtml:106
+#: templates/table/structure/row_stats_table.phtml:87
 msgid "Last update"
 msgstr "آخرین به روز رسانی"
 
-#: libraries/Util.class.php:4269 templates/structure/row_stats_table.phtml:94
-#: templates/structure/table_header.phtml:117
+#: libraries/Util.class.php:4275
+#: templates/database/structure/table_header.phtml:117
+#: templates/table/structure/row_stats_table.phtml:94
 msgid "Last check"
 msgstr "آخرین بازدید"
 
-#: libraries/Util.class.php:4315
+#: libraries/Util.class.php:4321
 #, fuzzy
 #| msgid "User"
 msgid "Users"
@@ -5199,16 +5213,16 @@ msgid "Use this value"
 msgstr "این مقدار را استفاده کنید"
 
 #: libraries/build_html_for_db.lib.php:33 libraries/import.lib.php:193
-#: templates/structure/actions_in_table_structure.phtml:113
-#: templates/structure/row_stats_table.phtml:42
-#: templates/structure/table_header.phtml:36
+#: templates/database/structure/table_header.phtml:36
+#: templates/table/structure/actions_in_table_structure.phtml:113
+#: templates/table/structure/row_stats_table.phtml:42
 msgid "Rows"
 msgstr "سطرها"
 
 #: libraries/build_html_for_db.lib.php:48 libraries/engines/innodb.lib.php:171
-#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:186
-#: libraries/server_status.lib.php:298
-#: templates/structure/display_table_stats.phtml:40
+#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:195
+#: libraries/server_status.lib.php:307
+#: templates/table/structure/display_table_stats.phtml:40
 msgid "Total"
 msgstr "جمع كل"
 
@@ -5217,10 +5231,12 @@ msgid "Jump to database"
 msgstr "پرش به پایگاه داده"
 
 #: libraries/build_html_for_db.lib.php:146
+#: templates/database/structure/structure_table_row.phtml:15
 msgid "Not replicated"
 msgstr "تکرار نشده"
 
 #: libraries/build_html_for_db.lib.php:158
+#: templates/database/structure/structure_table_row.phtml:16
 msgid "Replicated"
 msgstr "تکراری"
 
@@ -5277,17 +5293,17 @@ msgstr ""
 #: libraries/plugins/export/ExportTexytext.class.php:425
 #: libraries/plugins/export/PMA_ExportPdf.class.php:307
 #: libraries/rte/rte_list.lib.php:73 libraries/rte/rte_list.lib.php:85
-#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:830
-#: libraries/rte/rte_routines.lib.php:1492 setup/frames/index.inc.php:162
+#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:921
+#: libraries/rte/rte_routines.lib.php:1583 setup/frames/index.inc.php:162
 #: templates/columns_definitions/table_fields_definitions.phtml:8
-#: templates/structure/table_structure_header.phtml:5
-#: templates/table/create_table.phtml:11
+#: templates/database/create_table.phtml:11
+#: templates/table/structure/table_structure_header.phtml:5
 msgid "Name"
 msgstr "اسم"
 
 #: libraries/central_columns.lib.php:699
 #: libraries/central_columns.lib.php:1381
-#: libraries/rte/rte_routines.lib.php:832
+#: libraries/rte/rte_routines.lib.php:923
 #: templates/columns_definitions/table_fields_definitions.phtml:14
 msgid "Length/Values"
 msgstr "طول/مقادير*"
@@ -5310,7 +5326,7 @@ msgid "Select a table"
 msgstr "Select Tables"
 
 #: libraries/central_columns.lib.php:804
-#: templates/structure/add_column.phtml:4
+#: templates/table/structure/add_column.phtml:4
 #, fuzzy
 msgid "Add column"
 msgstr "افزودن ستون جديد"
@@ -5330,7 +5346,7 @@ msgstr "افزودن ستون جديد"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1002
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1025
 #: templates/columns_definitions/table_fields_definitions.phtml:36
-#: templates/structure/table_structure_header.phtml:8
+#: templates/table/structure/table_structure_header.phtml:8
 msgid "Attributes"
 msgstr "ويژگيها"
 
@@ -5448,7 +5464,7 @@ msgid "Double click"
 msgstr ""
 
 #: libraries/config.values.php:95 libraries/config.values.php:124
-#: libraries/config/FormDisplay.tpl.php:221 libraries/relation.lib.php:97
+#: libraries/config/FormDisplay.tpl.php:232 libraries/relation.lib.php:97
 #: libraries/relation.lib.php:105
 msgid "Disabled"
 msgstr "غيرفعال"
@@ -5639,21 +5655,21 @@ msgstr "وارد کردن داده کار نمی کند، تابع (%s) یافت
 msgid "maximum %s"
 msgstr ""
 
-#: libraries/config/FormDisplay.tpl.php:219
+#: libraries/config/FormDisplay.tpl.php:230
 msgid "This setting is disabled, it will not be applied to your configuration."
 msgstr ""
 
-#: libraries/config/FormDisplay.tpl.php:313
+#: libraries/config/FormDisplay.tpl.php:324
 #, php-format
 msgid "Set value: %s"
 msgstr ""
 
-#: libraries/config/FormDisplay.tpl.php:318
+#: libraries/config/FormDisplay.tpl.php:329
 #: libraries/config/messages.inc.php:610
 msgid "Restore default value"
 msgstr ""
 
-#: libraries/config/FormDisplay.tpl.php:332
+#: libraries/config/FormDisplay.tpl.php:343
 msgid "Allow users to customize this value"
 msgstr ""
 
@@ -6096,7 +6112,7 @@ msgstr "مجموعه كاراكترهاي پرونده"
 
 #: libraries/config/messages.inc.php:136 libraries/config/messages.inc.php:152
 #: libraries/sql_query_form.lib.php:247
-#: templates/structure/row_stats_table.phtml:7
+#: templates/table/structure/row_stats_table.phtml:7
 msgid "Format"
 msgstr "قالب"
 
@@ -6639,7 +6655,7 @@ msgstr ""
 
 #: libraries/config/messages.inc.php:332
 #: libraries/plugins/export/ExportPdf.class.php:279
-#: templates/structure/secondary_tabs.phtml:8
+#: templates/table/secondary_tabs.phtml:8
 #, fuzzy
 #| msgid "Databases"
 msgid "Table structure"
@@ -8242,112 +8258,35 @@ msgstr ""
 msgid "OpenDocument Text"
 msgstr "مستندات باز"
 
-#: libraries/controllers/StructureController.class.php:465
+#: libraries/controllers/DatabaseStructureController.class.php:405
 #: tbl_operations.php:382
 #, php-format
 msgid "Table %s has been emptied."
 msgstr "جدول %s خالی شد."
 
-#: libraries/controllers/StructureController.class.php:486
+#: libraries/controllers/DatabaseStructureController.class.php:426
 #: tbl_operations.php:400 view_operations.php:119
 #, fuzzy, php-format
 #| msgid "View %s has been dropped."
 msgid "View %s has been dropped."
 msgstr "نمای %s حذف شد"
 
-#: libraries/controllers/StructureController.class.php:487
+#: libraries/controllers/DatabaseStructureController.class.php:427
 #: tbl_operations.php:401
 #, fuzzy, php-format
 #| msgid "Table %s has been dropped."
 msgid "Table %s has been dropped."
 msgstr "جدول %s حذف شد"
 
-#: libraries/controllers/StructureController.class.php:797
-#, php-format
-msgid "The name '%s' is a MySQL reserved keyword."
-msgid_plural "The names '%s' are MySQL reserved keywords."
-msgstr[0] ""
-msgstr[1] ""
-
-#: libraries/controllers/StructureController.class.php:875
-#, fuzzy
-#| msgid "No rows selected"
-msgid "No column selected."
-msgstr "هیچ سطری انتخاب نشده است"
-
-#: libraries/controllers/StructureController.class.php:1049
+#: libraries/controllers/DatabaseStructureController.class.php:733
 msgid "Favorite List is full!"
 msgstr ""
 
-#: libraries/controllers/StructureController.class.php:1272
-#, fuzzy
-#| msgid "Database %s has been dropped."
-msgid "The columns have been moved successfully."
-msgstr "پايگاه داده %s حذف گرديد."
-
-#: libraries/controllers/StructureController.class.php:1535
-#, fuzzy, php-format
-#| msgid "Table %s has been moved to %s."
-msgid ""
-"Table %1$s has been altered successfully. Privileges have been adjusted."
-msgstr "جدول %s به %s انتقال داده‌شد."
-
-#: libraries/controllers/StructureController.class.php:1541
-#: libraries/controllers/TableIndexesController.class.php:161
-#: tbl_addfield.php:92
-#, php-format
-msgid "Table %1$s has been altered successfully."
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1588
-#: libraries/tracking.lib.php:1094
-#, fuzzy
-#| msgid "Query"
-msgid "Query error"
-msgstr "پرس و جو"
-
-#: libraries/controllers/StructureController.class.php:1806
+#: libraries/controllers/DatabaseStructureController.class.php:947
 #: libraries/mysql_charsets.lib.php:366 libraries/mysql_charsets.lib.php:373
 msgid "unknown"
 msgstr "ناشناس"
 
-#: libraries/controllers/StructureController.class.php:1957
-#: templates/structure/check_all_table_column.phtml:11
-msgid "Change"
-msgstr "تغيير"
-
-#: libraries/controllers/StructureController.class.php:1961
-#: libraries/controllers/StructureController.class.php:1966
-#: libraries/navigation/Nodes/Node_Index.class.php:30
-#: libraries/tracking.lib.php:926
-#: templates/columns_definitions/column_indexes.phtml:16
-#: templates/columns_definitions/table_fields_definitions.phtml:57
-#: templates/structure/check_all_table_column.phtml:30
-#: templates/structure/display_structure.phtml:79
-#: templates/structure/display_table_stats.phtml:19
-msgid "Index"
-msgstr "فهرست"
-
-#: libraries/controllers/StructureController.class.php:1963
-#: libraries/controllers/StructureController.class.php:1968
-#: templates/columns_definitions/column_indexes.phtml:27
-#: templates/structure/check_all_table_column.phtml:37
-msgid "Spatial"
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1964
-#: libraries/controllers/StructureController.class.php:1969
-#: templates/columns_definitions/column_indexes.phtml:22
-#: templates/structure/check_all_table_column.phtml:47
-msgid "Fulltext"
-msgstr "كاملا متن"
-
-#: libraries/controllers/StructureController.class.php:1970
-#, fuzzy
-#| msgid "Use this value"
-msgid "Distinct values"
-msgstr "این مقدار را استفاده کنید"
-
 #: libraries/controllers/TableChartController.class.php:82
 #: libraries/controllers/TableGisVisualizationController.class.php:101
 msgid "No SQL query was set to fetch data."
@@ -8363,11 +8302,18 @@ msgstr ""
 msgid "No data to display"
 msgstr "اطلاعاتی یافت نشد"
 
-#: libraries/controllers/TableRelationController.class.php:217
+#: libraries/controllers/TableIndexesController.class.php:161
+#: libraries/controllers/TableStructureController.class.php:736
+#: tbl_addfield.php:92
+#, php-format
+msgid "Table %1$s has been altered successfully."
+msgstr ""
+
+#: libraries/controllers/TableRelationController.class.php:218
 msgid "Display column was successfully updated."
 msgstr ""
 
-#: libraries/controllers/TableRelationController.class.php:283
+#: libraries/controllers/TableRelationController.class.php:288
 #, fuzzy
 #| msgid "Internal relation added"
 msgid "Internal relations were successfully updated."
@@ -8386,12 +8332,82 @@ msgid "Zoom search"
 msgstr "زوم جستجو"
 
 #: libraries/controllers/TableSearchController.class.php:852
-#: templates/table/selection_form.phtml:59
+#: templates/table/search/selection_form.phtml:59
 #, fuzzy
 #| msgid "Hide search criteria"
 msgid "Find and replace"
 msgstr "پنهان سازی ضوابط جستجو"
 
+#: libraries/controllers/TableStructureController.class.php:163
+#, php-format
+msgid "The name '%s' is a MySQL reserved keyword."
+msgid_plural "The names '%s' are MySQL reserved keywords."
+msgstr[0] ""
+msgstr[1] ""
+
+#: libraries/controllers/TableStructureController.class.php:241
+#, fuzzy
+#| msgid "No rows selected"
+msgid "No column selected."
+msgstr "هیچ سطری انتخاب نشده است"
+
+#: libraries/controllers/TableStructureController.class.php:467
+#, fuzzy
+#| msgid "Database %s has been dropped."
+msgid "The columns have been moved successfully."
+msgstr "پايگاه داده %s حذف گرديد."
+
+#: libraries/controllers/TableStructureController.class.php:730
+#, fuzzy, php-format
+#| msgid "Table %s has been moved to %s."
+msgid ""
+"Table %1$s has been altered successfully. Privileges have been adjusted."
+msgstr "جدول %s به %s انتقال داده‌شد."
+
+#: libraries/controllers/TableStructureController.class.php:783
+#: libraries/tracking.lib.php:1094
+#, fuzzy
+#| msgid "Query"
+msgid "Query error"
+msgstr "پرس و جو"
+
+#: libraries/controllers/TableStructureController.class.php:948
+#: templates/table/structure/check_all_table_column.phtml:11
+msgid "Change"
+msgstr "تغيير"
+
+#: libraries/controllers/TableStructureController.class.php:952
+#: libraries/controllers/TableStructureController.class.php:957
+#: libraries/navigation/Nodes/Node_Index.class.php:30
+#: libraries/tracking.lib.php:926
+#: templates/columns_definitions/column_indexes.phtml:16
+#: templates/columns_definitions/table_fields_definitions.phtml:57
+#: templates/table/structure/check_all_table_column.phtml:30
+#: templates/table/structure/display_structure.phtml:79
+#: templates/table/structure/display_table_stats.phtml:19
+msgid "Index"
+msgstr "فهرست"
+
+#: libraries/controllers/TableStructureController.class.php:954
+#: libraries/controllers/TableStructureController.class.php:959
+#: templates/columns_definitions/column_indexes.phtml:27
+#: templates/table/structure/check_all_table_column.phtml:37
+msgid "Spatial"
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:955
+#: libraries/controllers/TableStructureController.class.php:960
+#: templates/columns_definitions/column_indexes.phtml:22
+#: templates/table/structure/check_all_table_column.phtml:47
+msgid "Fulltext"
+msgstr "كاملا متن"
+
+#: libraries/controllers/TableStructureController.class.php:963
+#, fuzzy
+#| msgid "Use this value"
+msgid "Distinct values"
+msgstr "این مقدار را استفاده کنید"
+
 #: libraries/core.lib.php:306
 #, php-format
 msgid "The %s extension is missing. Please check your PHP configuration."
@@ -8438,7 +8454,7 @@ msgid "No Password"
 msgstr "بدون کلمه ی عبور"
 
 #: libraries/display_change_password.lib.php:68
-#: libraries/plugins/auth/AuthenticationCookie.class.php:199
+#: libraries/plugins/auth/AuthenticationCookie.class.php:187
 #: libraries/replication_gui.lib.php:422 libraries/replication_gui.lib.php:862
 #: libraries/server_privileges.lib.php:1640
 msgid "Password:"
@@ -9222,12 +9238,12 @@ msgid "Dump has been saved to file %s."
 msgstr "اطلاعات دریافت شده در فایل %s ذخیره شد‬."
 
 #: libraries/import.lib.php:202 libraries/insert_edit.lib.php:124
-#: libraries/rte/rte_routines.lib.php:1353 libraries/sql.lib.php:1312
+#: libraries/rte/rte_routines.lib.php:1444 libraries/sql.lib.php:1306
 #: tbl_get_field.php:44
 msgid "MySQL returned an empty result set (i.e. zero rows)."
 msgstr "MySQL يك نتيجه خالي داد. (مثلا 0 سطر)."
 
-#: libraries/import.lib.php:265 libraries/sql.lib.php:1326
+#: libraries/import.lib.php:265 libraries/sql.lib.php:1320
 msgid "[ROLLBACK occurred.]"
 msgstr ""
 
@@ -9293,14 +9309,14 @@ msgstr "ساخت يك فهرست در&nbsp;%s&nbsp;ستون"
 
 #: libraries/insert_edit.lib.php:233
 #: libraries/navigation/Nodes/Node_DatabaseChild.class.php:48
-#: templates/designer/table_list.phtml:40
+#: templates/database/designer/table_list.phtml:40
 msgid "Hide"
 msgstr "پنهان کردن"
 
 #: libraries/insert_edit.lib.php:249
 #: libraries/navigation/Nodes/Node_Function.class.php:32
-#: libraries/rte/rte_routines.lib.php:1495
-#: templates/table/table_header.phtml:4
+#: libraries/rte/rte_routines.lib.php:1586
+#: templates/table/search/table_header.phtml:4
 msgid "Function"
 msgstr "تابع"
 
@@ -9313,86 +9329,87 @@ msgstr "دودويي"
 msgid "Because of its length,<br /> this column might not be editable."
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1050
+#: libraries/insert_edit.lib.php:1048
 msgid "Binary - do not edit"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1176 libraries/server_privileges.lib.php:470
-#: templates/table/options.phtml:36
+#: libraries/insert_edit.lib.php:1174 libraries/server_privileges.lib.php:470
+#: templates/table/search/options.phtml:36
 msgid "Or"
 msgstr "يا"
 
-#: libraries/insert_edit.lib.php:1177
+#: libraries/insert_edit.lib.php:1175
 #, fuzzy
 #| msgid "Select from the web server upload directory <b>%s</b>:"
 msgid "web server upload directory:"
 msgstr "انتخاب از مسیر آپلود در سرور <b>%s</b>:"
 
-#: libraries/insert_edit.lib.php:1348 templates/table/input_box.phtml:49
+#: libraries/insert_edit.lib.php:1346
+#: templates/table/search/input_box.phtml:49
 #, fuzzy
 #| msgid "Insert"
 msgid "Edit/Insert"
 msgstr "درج"
 
-#: libraries/insert_edit.lib.php:1398
+#: libraries/insert_edit.lib.php:1396
 #, php-format
 msgid "Continue insertion with %s rows"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1428
+#: libraries/insert_edit.lib.php:1426
 msgid "and then"
 msgstr "و سپس"
 
-#: libraries/insert_edit.lib.php:1461
+#: libraries/insert_edit.lib.php:1459
 msgid "Insert as new row"
 msgstr "درج به عنوان يك سطر جديد"
 
-#: libraries/insert_edit.lib.php:1464
+#: libraries/insert_edit.lib.php:1462
 msgid "Insert as new row and ignore errors"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1467
+#: libraries/insert_edit.lib.php:1465
 msgid "Show insert query"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1487
+#: libraries/insert_edit.lib.php:1485
 msgid "Go back to previous page"
 msgstr "برو به صفحه قبل"
 
-#: libraries/insert_edit.lib.php:1490
+#: libraries/insert_edit.lib.php:1488
 msgid "Insert another new row"
 msgstr "درج يك سطر جديد ديگر"
 
-#: libraries/insert_edit.lib.php:1495
+#: libraries/insert_edit.lib.php:1493
 msgid "Go back to this page"
 msgstr "برگرد به این صفحه"
 
-#: libraries/insert_edit.lib.php:1518
+#: libraries/insert_edit.lib.php:1516
 msgid "Edit next row"
 msgstr "ویرایش کردن ردیف بعدی"
 
-#: libraries/insert_edit.lib.php:1540
+#: libraries/insert_edit.lib.php:1538
 msgid ""
 "Use TAB key to move from value to value, or CTRL+arrows to move anywhere"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1577 libraries/replication_gui.lib.php:542
-#: libraries/rte/rte_routines.lib.php:1497
+#: libraries/insert_edit.lib.php:1575 libraries/replication_gui.lib.php:542
+#: libraries/rte/rte_routines.lib.php:1588
 #: libraries/server_status_variables.lib.php:220
-#: templates/designer/having_query_panel.phtml:100
-#: templates/designer/options_panel.phtml:73
-#: templates/designer/options_panel.phtml:239
-#: templates/designer/where_query_panel.phtml:69
-#: templates/table/table_header.phtml:10
-#: templates/table/zoom_result_form.phtml:35
+#: templates/database/designer/having_query_panel.phtml:100
+#: templates/database/designer/options_panel.phtml:73
+#: templates/database/designer/options_panel.phtml:239
+#: templates/database/designer/where_query_panel.phtml:69
+#: templates/table/search/table_header.phtml:10
+#: templates/table/search/zoom_result_form.phtml:35
 msgid "Value"
 msgstr "مقدار"
 
-#: libraries/insert_edit.lib.php:1937 libraries/sql.lib.php:1309
+#: libraries/insert_edit.lib.php:1935 libraries/sql.lib.php:1303
 msgid "Showing SQL query"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1962 libraries/sql.lib.php:1287
+#: libraries/insert_edit.lib.php:1960 libraries/sql.lib.php:1281
 #, php-format
 msgid "Inserted row id: %1$d"
 msgstr ""
@@ -9862,7 +9879,7 @@ msgstr "جدید"
 #: libraries/navigation/Nodes/Node_View_Container.class.php:26
 #: libraries/navigation/Nodes/Node_View_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:129
-#: templates/structure/show_create.phtml:30
+#: templates/database/structure/show_create.phtml:30
 #, fuzzy
 #| msgid "View"
 msgid "Views"
@@ -10172,7 +10189,7 @@ msgstr ""
 
 #: libraries/operations.lib.php:101 libraries/operations.lib.php:249
 #: libraries/operations.lib.php:869 libraries/operations.lib.php:963
-#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:907
+#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:998
 #: templates/columns_definitions/table_fields_definitions.phtml:47
 #, fuzzy
 #| msgid "Edit Privileges"
@@ -10266,22 +10283,22 @@ msgid "Switch to copied table"
 msgstr ""
 
 #: libraries/operations.lib.php:1360
-#: templates/structure/check_all_tables.phtml:18
+#: templates/database/structure/check_all_tables.phtml:18
 msgid "Table maintenance"
 msgstr "نگهداشت جدول"
 
 #: libraries/operations.lib.php:1398
-#: templates/structure/check_all_tables.phtml:19
+#: templates/database/structure/check_all_tables.phtml:19
 msgid "Analyze table"
 msgstr "انالیز جدول"
 
 #: libraries/operations.lib.php:1413
-#: templates/structure/check_all_tables.phtml:20
+#: templates/database/structure/check_all_tables.phtml:20
 msgid "Check table"
 msgstr "بررسي جدول"
 
 #: libraries/operations.lib.php:1428
-#: templates/structure/check_all_tables.phtml:22
+#: templates/database/structure/check_all_tables.phtml:22
 #, fuzzy
 #| msgid "Check table"
 msgid "Checksum table"
@@ -10303,18 +10320,19 @@ msgid "Flush the table (FLUSH)"
 msgstr "Flush the table (\"FLUSH\")"
 
 #: libraries/operations.lib.php:1477
-#: templates/structure/check_all_tables.phtml:23
-#: templates/structure/display_table_stats.phtml:56
+#: templates/database/structure/check_all_tables.phtml:23
+#: templates/table/structure/display_table_stats.phtml:56
 msgid "Optimize table"
 msgstr "بهينه‌سازي جدول"
 
 #: libraries/operations.lib.php:1492
-#: templates/structure/check_all_tables.phtml:24
+#: templates/database/structure/check_all_tables.phtml:24
 msgid "Repair table"
 msgstr "بازسازی جدول"
 
 #: libraries/operations.lib.php:1538
-#: templates/structure/check_all_tables.phtml:14 view_operations.php:127
+#: templates/database/structure/check_all_tables.phtml:14
+#: view_operations.php:127
 #, fuzzy
 #| msgid "Dumping data for table"
 msgid "Delete data or table"
@@ -10444,7 +10462,7 @@ msgid "Cannot connect: invalid settings."
 msgstr "خطا در اتصال : تنظیمات اشتباه می باشد."
 
 #: libraries/plugins/auth/AuthenticationConfig.class.php:108
-#: libraries/plugins/auth/AuthenticationCookie.class.php:134
+#: libraries/plugins/auth/AuthenticationCookie.class.php:122
 #: libraries/plugins/auth/AuthenticationHttp.class.php:96
 #, php-format
 msgid "Welcome to %s"
@@ -10474,40 +10492,40 @@ msgstr ""
 msgid "Retry to connect"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:146
+#: libraries/plugins/auth/AuthenticationCookie.class.php:134
 msgid "Your session has expired. Please log in again."
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:170
+#: libraries/plugins/auth/AuthenticationCookie.class.php:158
 msgid "Log in"
 msgstr "ورود"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:178
-#: libraries/plugins/auth/AuthenticationCookie.class.php:188
+#: libraries/plugins/auth/AuthenticationCookie.class.php:166
+#: libraries/plugins/auth/AuthenticationCookie.class.php:176
 msgid "You can enter hostname/IP address and port separated by space."
 msgstr ""
 "شما می توانید آدرس hostname/IP و پورت را با استفاده از فاصله بین آنها وارد "
 "نمایید."
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:193
+#: libraries/plugins/auth/AuthenticationCookie.class.php:181
 msgid "Username:"
 msgstr "نام كاربر:"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:205
+#: libraries/plugins/auth/AuthenticationCookie.class.php:193
 #, fuzzy
 #| msgid "Server Choice"
 msgid "Server Choice:"
 msgstr "انتخاب سرور"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:386
+#: libraries/plugins/auth/AuthenticationCookie.class.php:374
 msgid "Entered captcha is wrong, try again!"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:396
+#: libraries/plugins/auth/AuthenticationCookie.class.php:384
 msgid "Please enter correct captcha!"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:423
+#: libraries/plugins/auth/AuthenticationCookie.class.php:411
 #, fuzzy
 #| msgid "Cannot log in to the MySQL server"
 msgid "You are not allowed to log in to this MySQL server!"
@@ -10614,7 +10632,7 @@ msgstr "رویداد"
 #: libraries/plugins/export/ExportOdt.class.php:593
 #: libraries/plugins/export/ExportTexytext.class.php:428
 #: libraries/plugins/export/PMA_ExportPdf.class.php:313
-#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:984
 #: libraries/rte/rte_triggers.lib.php:377
 #, fuzzy
 #| msgid "Description"
@@ -10956,7 +10974,7 @@ msgid "Last check:"
 msgstr "آخرین بازدید:"
 
 #: libraries/plugins/export/ExportSql.class.php:1399
-#: templates/structure/structure_table_row.phtml:183
+#: templates/database/structure/structure_table_row.phtml:183
 msgid "in use"
 msgstr "در حال استفاده"
 
@@ -11152,20 +11170,14 @@ msgstr ""
 msgid "The imported file does not contain any data!"
 msgstr "فایل %s دارای کلید id نمی باشد"
 
-#: libraries/plugins/import/ImportSql.class.php:169
+#: libraries/plugins/import/ImportSql.class.php:72
 msgid "SQL compatibility mode:"
 msgstr ""
 
-#: libraries/plugins/import/ImportSql.class.php:181
+#: libraries/plugins/import/ImportSql.class.php:84
 msgid "Do not use <code>AUTO_INCREMENT</code> for zero values"
 msgstr ""
 
-#: libraries/plugins/import/ImportSql.class.php:195
-#, fuzzy
-#| msgid "Read misses"
-msgid "Read as multibytes"
-msgstr "نمیتواند خوانده شود"
-
 #: libraries/plugins/import/ImportXml.class.php:54
 msgid "XML"
 msgstr "XML"
@@ -11209,7 +11221,7 @@ msgid "Show grid"
 msgstr "نمایش جدول"
 
 #: libraries/plugins/schema/SchemaPdf.class.php:94
-#: templates/structure/print_view_data_dictionary_link.phtml:6
+#: templates/database/structure/print_view_data_dictionary_link.phtml:6
 msgid "Data Dictionary"
 msgstr "دیکشنری داده‌ها"
 
@@ -11241,7 +11253,7 @@ msgid "The %s table doesn't exist!"
 msgstr "جدول \"%s\" وجود ندارد!"
 
 #: libraries/plugins/schema/eps/Eps_Relation_Schema.class.php:321
-#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:309
+#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:323
 #, php-format
 msgid "Schema of the %s database - Page %s"
 msgstr ""
@@ -11271,7 +11283,7 @@ msgstr "توضيحات جدول"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1005
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1028
 #: libraries/tracking.lib.php:884
-#: templates/structure/table_structure_header.phtml:11
+#: templates/table/structure/table_structure_header.phtml:11
 msgid "Extra"
 msgstr "اضافي"
 
@@ -11608,51 +11620,51 @@ msgstr ""
 msgid "Create the needed tables with the <code>%screate_tables.sql</code>."
 msgstr ""
 
-#: libraries/relation.lib.php:360
+#: libraries/relation.lib.php:357
 msgid "Create a pma user and give access to these tables."
 msgstr ""
 
-#: libraries/relation.lib.php:365
+#: libraries/relation.lib.php:360
 msgid ""
 "Enable advanced features in configuration file (<code>config.inc.php</"
 "code>), for example by starting from <code>config.sample.inc.php</code>."
 msgstr ""
 
-#: libraries/relation.lib.php:373
+#: libraries/relation.lib.php:365
 msgid "Re-login to phpMyAdmin to load the updated configuration file."
 msgstr ""
 
-#: libraries/relation.lib.php:1612
+#: libraries/relation.lib.php:1607
 msgid "no description"
 msgstr "no Description"
 
-#: libraries/relation.lib.php:1811
+#: libraries/relation.lib.php:1806
 msgid ""
 "You do not have necessary privileges to create a database named "
 "'phpmyadmin'. You may go to 'Operations' tab of any database to set up the "
 "phpMyAdmin configuration storage there."
 msgstr ""
 
-#: libraries/relation.lib.php:1928
+#: libraries/relation.lib.php:1923
 #, php-format
 msgid ""
 "%sCreate%s a database named 'phpmyadmin' and setup the phpMyAdmin "
 "configuration storage there."
 msgstr ""
 
-#: libraries/relation.lib.php:1936
+#: libraries/relation.lib.php:1931
 #, php-format
 msgid ""
 "%sCreate%s the phpMyAdmin configuration storage in the current database."
 msgstr ""
 
-#: libraries/relation.lib.php:1944
+#: libraries/relation.lib.php:1939
 #, php-format
 msgid "%sCreate%s missing phpMyAdmin configuration storage tables."
 msgstr ""
 
 #: libraries/replication_gui.lib.php:46 libraries/replication_gui.lib.php:343
-#: libraries/server_databases.lib.php:387
+#: libraries/server_databases.lib.php:398
 msgid "Master replication"
 msgstr ""
 
@@ -11708,7 +11720,7 @@ msgid ""
 msgstr ""
 
 #: libraries/replication_gui.lib.php:141
-#: libraries/server_databases.lib.php:389
+#: libraries/server_databases.lib.php:400
 msgid "Slave replication"
 msgstr ""
 
@@ -11985,10 +11997,10 @@ msgid "Master server changed successfully to %s."
 msgstr ""
 
 #: libraries/rte/rte_events.lib.php:106 libraries/rte/rte_events.lib.php:115
-#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:149
-#: libraries/rte/rte_routines.lib.php:158
-#: libraries/rte/rte_routines.lib.php:231
-#: libraries/rte/rte_routines.lib.php:1362
+#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:219
+#: libraries/rte/rte_routines.lib.php:246
+#: libraries/rte/rte_routines.lib.php:368
+#: libraries/rte/rte_routines.lib.php:1453
 #: libraries/rte/rte_triggers.lib.php:82 libraries/rte/rte_triggers.lib.php:91
 #: libraries/rte/rte_triggers.lib.php:123
 #, php-format
@@ -12010,7 +12022,7 @@ msgstr "جدول %s حذف گرديد"
 msgid "Event %1$s has been created."
 msgstr "جدول %s حذف گرديد"
 
-#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:251
+#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:266
 #: libraries/rte/rte_triggers.lib.php:144
 msgid "One or more errors have occurred while processing your request:"
 msgstr ""
@@ -12020,7 +12032,7 @@ msgstr ""
 msgid "Edit event"
 msgstr "افزودن يك كاربر جديد"
 
-#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:794
+#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:885
 #: libraries/rte/rte_triggers.lib.php:323 view_create.php:180
 msgid "Details"
 msgstr ""
@@ -12035,7 +12047,7 @@ msgstr "نام كاربر"
 msgid "Event type"
 msgstr ""
 
-#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:817
+#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:908
 #, fuzzy, php-format
 #| msgid "Change"
 msgid "Change to %s"
@@ -12069,12 +12081,14 @@ msgstr "انتها"
 msgid "On completion preserve"
 msgstr "تمام وروديها"
 
-#: libraries/rte/rte_events.lib.php:491 libraries/rte/rte_routines.lib.php:930
+#: libraries/rte/rte_events.lib.php:491
+#: libraries/rte/rte_routines.lib.php:1021
 #: libraries/rte/rte_triggers.lib.php:383 view_create.php:209
 msgid "Definer"
 msgstr ""
 
-#: libraries/rte/rte_events.lib.php:535 libraries/rte/rte_routines.lib.php:997
+#: libraries/rte/rte_events.lib.php:535
+#: libraries/rte/rte_routines.lib.php:1088
 #: libraries/rte/rte_triggers.lib.php:422
 msgid "The definer must be in the \"username@hostname\" format!"
 msgstr ""
@@ -12100,9 +12114,9 @@ msgid "You must provide an event definition."
 msgstr ""
 
 #: libraries/rte/rte_export.lib.php:43 libraries/rte/rte_general.lib.php:72
-#: libraries/rte/rte_routines.lib.php:345
-#: libraries/rte/rte_routines.lib.php:1198
-#: libraries/rte/rte_routines.lib.php:1411
+#: libraries/rte/rte_routines.lib.php:153
+#: libraries/rte/rte_routines.lib.php:1289
+#: libraries/rte/rte_routines.lib.php:1502
 #, fuzzy
 #| msgid "Error in Processing Request"
 msgid "Error in processing request:"
@@ -12137,141 +12151,141 @@ msgid ""
 "problems."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:110
-#: libraries/rte/rte_routines.lib.php:1006
+#: libraries/rte/rte_routines.lib.php:123
+msgid "Edit routine"
+msgstr "تغییر ستون"
+
+#: libraries/rte/rte_routines.lib.php:200
+#: libraries/rte/rte_routines.lib.php:1097
 #, php-format
 msgid "Invalid routine type: \"%s\""
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:170
+#: libraries/rte/rte_routines.lib.php:253
+#, fuzzy, php-format
+msgid "Routine %1$s has been created."
+msgstr "جدول %s حذف گرديد"
+
+#: libraries/rte/rte_routines.lib.php:380
 msgid "Sorry, we failed to restore the dropped routine."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:211
+#: libraries/rte/rte_routines.lib.php:439
 #, fuzzy, php-format
 #| msgid "Table %s has been dropped."
 msgid "Routine %1$s has been modified. Privileges have been adjusted."
 msgstr "جدول %s حذف گرديد"
 
-#: libraries/rte/rte_routines.lib.php:216
+#: libraries/rte/rte_routines.lib.php:444
 #, fuzzy, php-format
 #| msgid "Table %s has been dropped."
 msgid "Routine %1$s has been modified."
 msgstr "جدول %s حذف گرديد"
 
-#: libraries/rte/rte_routines.lib.php:238
-#, fuzzy, php-format
-msgid "Routine %1$s has been created."
-msgstr "جدول %s حذف گرديد"
-
-#: libraries/rte/rte_routines.lib.php:315
-msgid "Edit routine"
-msgstr "تغییر ستون"
-
-#: libraries/rte/rte_routines.lib.php:797
+#: libraries/rte/rte_routines.lib.php:888
 #, fuzzy
 #| msgid "Column names"
 msgid "Routine name"
 msgstr "نام ستونها"
 
-#: libraries/rte/rte_routines.lib.php:823
+#: libraries/rte/rte_routines.lib.php:914
 msgid "Parameters"
 msgstr "پارامترها"
 
-#: libraries/rte/rte_routines.lib.php:829
+#: libraries/rte/rte_routines.lib.php:920
 #, fuzzy
 #| msgid "Creation"
 msgid "Direction"
 msgstr "ایجاد"
 
-#: libraries/rte/rte_routines.lib.php:847
+#: libraries/rte/rte_routines.lib.php:938
 msgid "Add parameter"
 msgstr "ایجاد پارامتر"
 
-#: libraries/rte/rte_routines.lib.php:851
+#: libraries/rte/rte_routines.lib.php:942
 msgid "Remove last parameter"
 msgstr "حذف آخرین پارامتر"
 
-#: libraries/rte/rte_routines.lib.php:856
+#: libraries/rte/rte_routines.lib.php:947
 msgid "Return type"
 msgstr "نوع برگشتی"
 
-#: libraries/rte/rte_routines.lib.php:862
+#: libraries/rte/rte_routines.lib.php:953
 #, fuzzy
 #| msgid "Length/Values"
 msgid "Return length/values"
 msgstr "طول/مقادير*"
 
-#: libraries/rte/rte_routines.lib.php:868
+#: libraries/rte/rte_routines.lib.php:959
 #, fuzzy
 msgid "Return options"
 msgstr "آمار پايگاههاي داده"
 
-#: libraries/rte/rte_routines.lib.php:899
+#: libraries/rte/rte_routines.lib.php:990
 msgid "Is deterministic"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:920
+#: libraries/rte/rte_routines.lib.php:1011
 msgid ""
 "You do not have sufficient privileges to perform this operation; Please "
 "refer to the documentation for more details"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:935
+#: libraries/rte/rte_routines.lib.php:1026
 msgid "Security type"
 msgstr "حالت امنیتی"
 
-#: libraries/rte/rte_routines.lib.php:944
+#: libraries/rte/rte_routines.lib.php:1035
 msgid "SQL data access"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1013
+#: libraries/rte/rte_routines.lib.php:1104
 msgid "You must provide a routine name!"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1047
+#: libraries/rte/rte_routines.lib.php:1138
 #, php-format
 msgid "Invalid direction \"%s\" given for parameter."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1069
-#: libraries/rte/rte_routines.lib.php:1131
+#: libraries/rte/rte_routines.lib.php:1160
+#: libraries/rte/rte_routines.lib.php:1222
 msgid ""
 "You must provide length/values for routine parameters of type ENUM, SET, "
 "VARCHAR and VARBINARY."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1095
+#: libraries/rte/rte_routines.lib.php:1186
 msgid "You must provide a name and a type for each routine parameter."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1114
+#: libraries/rte/rte_routines.lib.php:1205
 msgid "You must provide a valid return type for the routine."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1174
+#: libraries/rte/rte_routines.lib.php:1265
 msgid "You must provide a routine definition."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1285
+#: libraries/rte/rte_routines.lib.php:1376
 #, php-format
 msgid "Execution results of routine %s"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1340
+#: libraries/rte/rte_routines.lib.php:1431
 #, php-format
 msgid "%d row affected by the last statement inside the procedure."
 msgid_plural "%d rows affected by the last statement inside the procedure."
 msgstr[0] ""
 msgstr[1] ""
 
-#: libraries/rte/rte_routines.lib.php:1398
-#: libraries/rte/rte_routines.lib.php:1406
+#: libraries/rte/rte_routines.lib.php:1489
+#: libraries/rte/rte_routines.lib.php:1497
 msgid "Execute routine"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1485
-#: libraries/rte/rte_routines.lib.php:1488
+#: libraries/rte/rte_routines.lib.php:1576
+#: libraries/rte/rte_routines.lib.php:1579
 msgid "Routine parameters"
 msgstr ""
 
@@ -12439,7 +12453,7 @@ msgid "Original position"
 msgstr "موقعیت اصلی"
 
 #: libraries/server_bin_log.lib.php:133
-#: templates/structure/display_table_stats.phtml:4
+#: templates/table/structure/display_table_stats.phtml:4
 msgid "Information"
 msgstr "اطلاعات"
 
@@ -12477,12 +12491,12 @@ msgstr ""
 "نکته: فعال کردن آمارگیری پایگاه داده ممکن است ترافیک سنگینی بین وب سرور و "
 "سرور پایگاه داده به وجود بیاورد."
 
-#: libraries/server_databases.lib.php:364
-#: libraries/server_databases.lib.php:365
+#: libraries/server_databases.lib.php:366
+#: libraries/server_databases.lib.php:371
 msgid "Enable Statistics"
 msgstr "فعال سازی آمارها"
 
-#: libraries/server_databases.lib.php:481
+#: libraries/server_databases.lib.php:492
 #, fuzzy, php-format
 #| msgid "Database %s has been dropped."
 msgid "%1$d database has been dropped successfully."
@@ -12855,7 +12869,7 @@ msgid "You have revoked the privileges for %s."
 msgstr "شما امتيازات %s را ابطال كرديد."
 
 #: libraries/server_privileges.lib.php:2059
-#: libraries/server_privileges.lib.php:4290
+#: libraries/server_privileges.lib.php:4316
 #, fuzzy
 #| msgid "Add user"
 msgid "Add user account"
@@ -13033,60 +13047,60 @@ msgstr "در حال پاک کردن %s"
 msgid "The privileges were reloaded successfully."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:3994
+#: libraries/server_privileges.lib.php:4003
 #, php-format
 msgid "The user %s already exists!"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4232
+#: libraries/server_privileges.lib.php:4258
 #, fuzzy, php-format
 #| msgid "Privileges"
 msgid "Privileges for %s"
 msgstr "امتيازات"
 
-#: libraries/server_privileges.lib.php:4241
+#: libraries/server_privileges.lib.php:4267
 #: libraries/server_status_processes.lib.php:72
 #: libraries/server_user_groups.lib.php:39
 msgid "User"
 msgstr "كاربر"
 
-#: libraries/server_privileges.lib.php:4282
+#: libraries/server_privileges.lib.php:4308
 #, fuzzy
 #| msgid "New"
 msgctxt "Create new user"
 msgid "New"
 msgstr "جدید"
 
-#: libraries/server_privileges.lib.php:4311
+#: libraries/server_privileges.lib.php:4337
 #, fuzzy
 #| msgid "Edit Privileges"
 msgid "Edit privileges:"
 msgstr "ويرايش امتيازات"
 
-#: libraries/server_privileges.lib.php:4312
+#: libraries/server_privileges.lib.php:4338
 #, fuzzy
 #| msgid "User"
 msgid "User account"
 msgstr "كاربر"
 
-#: libraries/server_privileges.lib.php:4371
+#: libraries/server_privileges.lib.php:4397
 msgid ""
 "Note: You are attempting to edit privileges of the user with which you are "
 "currently logged in."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4391 libraries/server_users.lib.php:25
+#: libraries/server_privileges.lib.php:4417 libraries/server_users.lib.php:25
 msgid "User accounts overview"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4459
+#: libraries/server_privileges.lib.php:4485
 msgid ""
 "A user account allowing any user from localhost to connect is present. This "
 "will prevent other users from connecting if the host part of their account "
 "allows a connection from any (%) host."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4500
+#: libraries/server_privileges.lib.php:4526
 #, php-format
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
@@ -13095,7 +13109,7 @@ msgid ""
 "%sreload the privileges%s before you continue."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4519
+#: libraries/server_privileges.lib.php:4545
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
 "tables. The content of these tables may differ from the privileges the "
@@ -13104,62 +13118,62 @@ msgid ""
 "privilege."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4569
+#: libraries/server_privileges.lib.php:4595
 msgid "The selected user was not found in the privilege table."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4801
+#: libraries/server_privileges.lib.php:4827
 msgid "You have added a new user."
 msgstr "شما يك كاربر جديد اضافه كرديد."
 
-#: libraries/server_status.lib.php:53
+#: libraries/server_status.lib.php:60
 #, php-format
 msgid "Network traffic since startup: %s"
 msgstr ""
 
-#: libraries/server_status.lib.php:66
+#: libraries/server_status.lib.php:73
 #, php-format
 msgid "This MySQL server has been running for %1$s. It started up on %2$s."
 msgstr ""
 
-#: libraries/server_status.lib.php:80
+#: libraries/server_status.lib.php:94
 msgid ""
 "This MySQL server works as <b>master</b> and <b>slave</b> in <b>replication</"
 "b> process."
 msgstr ""
 
-#: libraries/server_status.lib.php:85
+#: libraries/server_status.lib.php:99
 msgid "This MySQL server works as <b>master</b> in <b>replication</b> process."
 msgstr ""
 
-#: libraries/server_status.lib.php:90
+#: libraries/server_status.lib.php:104
 msgid "This MySQL server works as <b>slave</b> in <b>replication</b> process."
 msgstr ""
 
-#: libraries/server_status.lib.php:106
+#: libraries/server_status.lib.php:116
 msgid "Replication status"
 msgstr ""
 
-#: libraries/server_status.lib.php:137
+#: libraries/server_status.lib.php:146
 msgid ""
 "On a busy server, the byte counters may overrun, so those statistics as "
 "reported by the MySQL server may be incorrect."
 msgstr ""
 
-#: libraries/server_status.lib.php:148
+#: libraries/server_status.lib.php:157
 msgid "Received"
 msgstr ""
 
-#: libraries/server_status.lib.php:167
+#: libraries/server_status.lib.php:176
 msgid "Sent"
 msgstr ""
 
-#: libraries/server_status.lib.php:234
+#: libraries/server_status.lib.php:243
 #, fuzzy
 msgid "Max. concurrent connections"
 msgstr "توضيحات جدول"
 
-#: libraries/server_status.lib.php:244
+#: libraries/server_status.lib.php:253
 msgid "Failed attempts"
 msgstr ""
 
@@ -14139,7 +14153,7 @@ msgstr ""
 msgid "Not implemented yet."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/AlterOperation.php:193
+#: libraries/sql-parser/src/Components/AlterOperation.php:191
 msgid "Unrecognized alter operation."
 msgstr ""
 
@@ -14153,7 +14167,7 @@ msgid "An opening bracket followed by a set of values was expected."
 msgstr ""
 
 #: libraries/sql-parser/src/Components/ArrayObj.php:101
-#: libraries/sql-parser/src/Components/FieldDefinition.php:202
+#: libraries/sql-parser/src/Components/CreateDefinition.php:202
 msgid "An opening bracket was expected."
 msgstr ""
 
@@ -14161,25 +14175,35 @@ msgstr ""
 msgid "A comma or a closing bracket was expected"
 msgstr ""
 
+#: libraries/sql-parser/src/Components/CreateDefinition.php:246
+#, fuzzy
+#| msgid "No databases selected."
+msgid "A comma or a closing bracket was expected."
+msgstr "هیچ پایگاه داده ای انتخاب نشده است."
+
+#: libraries/sql-parser/src/Components/CreateDefinition.php:262
+msgid "A closing bracket was expected."
+msgstr ""
+
 #: libraries/sql-parser/src/Components/DataType.php:125
 msgid "Unrecognized data type."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:225
+#: libraries/sql-parser/src/Components/Expression.php:227
 msgid "Unexpected closing bracket."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:246
-#: libraries/sql-parser/src/Components/Expression.php:283
-#: libraries/sql-parser/src/Components/Expression.php:303
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:285
+#: libraries/sql-parser/src/Components/Expression.php:305
 msgid "An alias was previously found."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:257
+#: libraries/sql-parser/src/Components/Expression.php:259
 msgid "Unexpected dot."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:327
+#: libraries/sql-parser/src/Components/Expression.php:329
 #, fuzzy
 #| msgid "No databases selected."
 msgid "An alias was expected."
@@ -14191,16 +14215,6 @@ msgstr "هیچ پایگاه داده ای انتخاب نشده است."
 msgid "An expression was expected."
 msgstr "هیچ سطری انتخاب نشده است"
 
-#: libraries/sql-parser/src/Components/FieldDefinition.php:246
-#, fuzzy
-#| msgid "No databases selected."
-msgid "A comma or a closing bracket was expected."
-msgstr "هیچ پایگاه داده ای انتخاب نشده است."
-
-#: libraries/sql-parser/src/Components/FieldDefinition.php:262
-msgid "A closing bracket was expected."
-msgstr ""
-
 #: libraries/sql-parser/src/Components/Limit.php:90
 #: libraries/sql-parser/src/Components/Limit.php:112
 msgid "An offset was expected."
@@ -14242,26 +14256,26 @@ msgstr ""
 msgid "Expected delimiter."
 msgstr ""
 
-#: libraries/sql-parser/src/Lexer.php:753
+#: libraries/sql-parser/src/Lexer.php:777
 #, fuzzy, php-format
 msgid "Ending quote %1$s was expected."
 msgstr "جدول %s حذف گرديد"
 
-#: libraries/sql-parser/src/Lexer.php:789
+#: libraries/sql-parser/src/Lexer.php:813
 msgid "Variable name was expected."
 msgstr ""
 
-#: libraries/sql-parser/src/Parser.php:380
+#: libraries/sql-parser/src/Parser.php:391
 #, fuzzy
 #| msgid "At Beginning of Table"
 msgid "Unexpected beginning of statement."
 msgstr "در ابتداي جدول"
 
-#: libraries/sql-parser/src/Parser.php:399
+#: libraries/sql-parser/src/Parser.php:410
 msgid "Unrecognized statement type."
 msgstr ""
 
-#: libraries/sql-parser/src/Parser.php:479
+#: libraries/sql-parser/src/Parser.php:489
 msgid "No transaction was previously started."
 msgstr ""
 
@@ -14287,8 +14301,10 @@ msgid "The name of the entity was expected."
 msgstr ""
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:310
-msgid "At least one field definition was expected."
-msgstr ""
+#, fuzzy
+#| msgid "The row has been deleted."
+msgid "At least one column definition was expected."
+msgstr "سطر حذف گرديد"
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:329
 msgid "A \"RETURNS\" keyword was expected."
@@ -14364,11 +14380,11 @@ msgstr "بوک مارک  %s ایجاد شده"
 msgid "Using bookmark \"%s\" as default browse query."
 msgstr ""
 
-#: libraries/sql.lib.php:1306
+#: libraries/sql.lib.php:1300
 msgid "Showing as PHP code"
 msgstr ""
 
-#: libraries/sql.lib.php:1638
+#: libraries/sql.lib.php:1632
 #, fuzzy, php-format
 #| msgid ""
 #| "This table does not contain a unique column. Features related to the grid "
@@ -14380,7 +14396,7 @@ msgstr ""
 "این جدول هیچ مقدار کلیدی ندارد. امکانات ویرایش جدولی، چک باکس ها ، ویرایش ، "
 "کپی و حذف ممکن است کار نکنند."
 
-#: libraries/sql.lib.php:1649
+#: libraries/sql.lib.php:1643
 #, fuzzy, php-format
 #| msgid ""
 #| "This table does not contain a unique column. Features related to the grid "
@@ -14392,7 +14408,7 @@ msgstr ""
 "این جدول هیچ مقدار کلیدی ندارد. امکانات ویرایش جدولی، چک باکس ها ، ویرایش ، "
 "کپی و حذف ممکن است کار نکنند."
 
-#: libraries/sql.lib.php:1688
+#: libraries/sql.lib.php:1682
 #, php-format
 msgid "Problems with indexes of table `%s`"
 msgstr ""
@@ -14556,7 +14572,7 @@ msgid "Version %s snapshot (SQL code)"
 msgstr ""
 
 #: libraries/tracking.lib.php:947
-#: templates/structure/table_structure_row.phtml:33
+#: templates/table/structure/table_structure_row.phtml:33
 #, fuzzy
 #| msgid "None"
 msgctxt "None for default"
@@ -14612,17 +14628,17 @@ msgstr "نسخه سرور"
 msgid "Version %1$s was created, tracking for %2$s is active."
 msgstr ""
 
-#: libraries/user_preferences.inc.php:29
+#: libraries/user_preferences.inc.php:30
 msgid "Manage your settings"
 msgstr ""
 
-#: libraries/user_preferences.inc.php:46 prefs_manage.php:307
+#: libraries/user_preferences.inc.php:54 prefs_manage.php:307
 #, fuzzy
 #| msgid "Modifications have been saved"
 msgid "Configuration has been saved."
 msgstr "اصلاحات ذخيره گرديد"
 
-#: libraries/user_preferences.inc.php:66
+#: libraries/user_preferences.inc.php:74
 #, php-format
 msgid ""
 "Your preferences will be saved for current session only. Storing them "
@@ -15028,7 +15044,7 @@ msgid "first"
 msgstr ""
 
 #: templates/columns_definitions/move_column.phtml:12
-#: templates/structure/add_column.phtml:21
+#: templates/table/structure/add_column.phtml:21
 #, fuzzy, php-format
 #| msgid "After %s"
 msgid "after %s"
@@ -15112,225 +15128,327 @@ msgstr "اطلاعات"
 msgid "Input transformation options"
 msgstr "آمار پايگاههاي داده"
 
-#: templates/designer/aggregate_query_panel.phtml:22
-#: templates/designer/options_panel.phtml:100
+#: templates/database/create_table.phtml:7
+#: templates/database/designer/side_menu.phtml:77
+#: templates/database/designer/side_menu.phtml:80
+msgid "Create table"
+msgstr "ساختن جدول"
+
+#: templates/database/create_table.phtml:15
+msgid "Number of columns"
+msgstr "تعداد سطرها در هر صفحه"
+
+#: templates/database/designer/aggregate_query_panel.phtml:22
+#: templates/database/designer/options_panel.phtml:100
 msgid "Aggregate"
 msgstr "مجموع"
 
-#: templates/designer/aggregate_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:61
-#: templates/designer/options_panel.phtml:106
-#: templates/designer/options_panel.phtml:170
-#: templates/designer/where_query_panel.phtml:30
-#: templates/table/table_header.phtml:9
+#: templates/database/designer/aggregate_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:61
+#: templates/database/designer/options_panel.phtml:106
+#: templates/database/designer/options_panel.phtml:170
+#: templates/database/designer/where_query_panel.phtml:30
+#: templates/table/search/table_header.phtml:9
 #, fuzzy
 msgid "Operator"
 msgstr "عمليات"
 
-#: templates/designer/database_tables.phtml:29
+#: templates/database/designer/database_tables.phtml:29
 msgid "Toggle"
 msgstr ""
 
-#: templates/designer/database_tables.phtml:40
+#: templates/database/designer/database_tables.phtml:40
 #, fuzzy
 #| msgid "Databases"
 msgid "See table structure"
 msgstr "پايگاههاي داده"
 
-#: templates/designer/delete_relation_panel.phtml:21
+#: templates/database/designer/delete_relation_panel.phtml:21
 msgid "Delete relation"
 msgstr "حذف رابطه"
 
-#: templates/designer/edit_delete_pages.phtml:7
+#: templates/database/designer/edit_delete_pages.phtml:7
 #, fuzzy
 #| msgid "Page titles"
 msgid "Page to open"
 msgstr "عنوان صفحه"
 
-#: templates/designer/edit_delete_pages.phtml:7
+#: templates/database/designer/edit_delete_pages.phtml:7
 #, fuzzy
 #| msgid "Relation deleted"
 msgid "Page to delete"
 msgstr "رابطه حذف شد"
 
-#: templates/designer/having_query_panel.phtml:90
-#: templates/designer/options_panel.phtml:63
-#: templates/designer/options_panel.phtml:229
-#: templates/designer/where_query_panel.phtml:59
+#: templates/database/designer/having_query_panel.phtml:90
+#: templates/database/designer/options_panel.phtml:63
+#: templates/database/designer/options_panel.phtml:229
+#: templates/database/designer/where_query_panel.phtml:59
 msgid "Except"
 msgstr "به جز"
 
-#: templates/designer/having_query_panel.phtml:102
-#: templates/designer/options_panel.phtml:75
-#: templates/designer/options_panel.phtml:241
-#: templates/designer/where_query_panel.phtml:71
+#: templates/database/designer/having_query_panel.phtml:102
+#: templates/database/designer/options_panel.phtml:75
+#: templates/database/designer/options_panel.phtml:241
+#: templates/database/designer/where_query_panel.phtml:71
 #, fuzzy
 #| msgid "in query"
 msgid "subquery"
 msgstr "کوئری داخلی"
 
-#: templates/designer/new_relation_panel.phtml:22
-#: templates/designer/side_menu.phtml:84 templates/designer/side_menu.phtml:87
+#: templates/database/designer/new_relation_panel.phtml:22
+#: templates/database/designer/side_menu.phtml:84
+#: templates/database/designer/side_menu.phtml:87
 msgid "Create relation"
 msgstr "ایجاد ارتباط"
 
-#: templates/designer/options_panel.phtml:34
-#: templates/designer/options_panel.phtml:200
+#: templates/database/designer/options_panel.phtml:34
+#: templates/database/designer/options_panel.phtml:200
 msgid "Relation operator"
 msgstr "عملگر رابطه"
 
-#: templates/designer/options_panel.phtml:85
-#: templates/designer/rename_to_panel.phtml:23
+#: templates/database/designer/options_panel.phtml:85
+#: templates/database/designer/rename_to_panel.phtml:23
 msgid "Rename to"
 msgstr "تغییر نام به"
 
-#: templates/designer/options_panel.phtml:91
-#: templates/designer/rename_to_panel.phtml:31
+#: templates/database/designer/options_panel.phtml:91
+#: templates/database/designer/rename_to_panel.phtml:31
 msgid "New name"
 msgstr "نام جدید"
 
-#: templates/designer/page_save_as.phtml:4
+#: templates/database/designer/page_save_as.phtml:4
 #, fuzzy
 #| msgid "Export to selected page"
 msgid "Save to selected page"
 msgstr "صدور اطلاعات به صفحه انتخاب شده"
 
-#: templates/designer/page_save_as.phtml:5
+#: templates/database/designer/page_save_as.phtml:5
 #, fuzzy
 #| msgid "Create a page and export to it"
 msgid "Create a page and save to it"
 msgstr "ایجاد صفحه و صدور اطلاعات به آن"
 
-#: templates/designer/page_save_as.phtml:26
+#: templates/database/designer/page_save_as.phtml:26
 #, fuzzy
 #| msgid "New page name: "
 msgid "New page name"
 msgstr "نام صفحه جدید : "
 
-#: templates/designer/page_selector.phtml:2
+#: templates/database/designer/page_selector.phtml:2
 #, fuzzy
 #| msgid "Select Tables"
 msgid "Select page"
 msgstr "Select Tables"
 
-#: templates/designer/query_details.phtml:10
+#: templates/database/designer/query_details.phtml:10
 msgid "Active options"
 msgstr "گزینه های فعال"
 
-#: templates/designer/schema_export.phtml:4
+#: templates/database/designer/schema_export.phtml:4
 msgid "Select Export Relational Type"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:19 templates/designer/side_menu.phtml:25
+#: templates/database/designer/side_menu.phtml:19
+#: templates/database/designer/side_menu.phtml:25
 #, fuzzy
 #| msgid "Show tables"
 msgid "Show/Hide tables list"
 msgstr "نمايش جدولها"
 
-#: templates/designer/side_menu.phtml:29 templates/designer/side_menu.phtml:35
-#: templates/designer/side_menu.phtml:36
+#: templates/database/designer/side_menu.phtml:29
+#: templates/database/designer/side_menu.phtml:35
+#: templates/database/designer/side_menu.phtml:36
 msgid "View in fullscreen"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:34
+#: templates/database/designer/side_menu.phtml:34
 msgid "Exit fullscreen"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:41 templates/designer/side_menu.phtml:45
+#: templates/database/designer/side_menu.phtml:41
+#: templates/database/designer/side_menu.phtml:45
 #, fuzzy
 #| msgid "New name"
 msgid "New page"
 msgstr "نام جدید"
 
-#: templates/designer/side_menu.phtml:70 templates/designer/side_menu.phtml:73
+#: templates/database/designer/side_menu.phtml:70
+#: templates/database/designer/side_menu.phtml:73
 #, fuzzy
 #| msgid "Select Tables"
 msgid "Delete pages"
 msgstr "Select Tables"
 
-#: templates/designer/side_menu.phtml:77 templates/designer/side_menu.phtml:80
-#: templates/table/create_table.phtml:7
-msgid "Create table"
-msgstr "ساختن جدول"
-
-#: templates/designer/side_menu.phtml:98
-#: templates/designer/side_menu.phtml:101
+#: templates/database/designer/side_menu.phtml:98
+#: templates/database/designer/side_menu.phtml:101
 msgid "Reload"
 msgstr "بارگذاری مجدد"
 
-#: templates/designer/side_menu.phtml:107
-#: templates/designer/side_menu.phtml:110
+#: templates/database/designer/side_menu.phtml:107
+#: templates/database/designer/side_menu.phtml:110
 msgid "Help"
 msgstr "راهنما"
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Angular links"
 msgstr "لینک های زاویه ای"
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Direct links"
 msgstr "لینک های مستقیم"
 
-#: templates/designer/side_menu.phtml:122
-#: templates/designer/side_menu.phtml:124
+#: templates/database/designer/side_menu.phtml:122
+#: templates/database/designer/side_menu.phtml:124
 msgid "Snap to grid"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:128
-#: templates/designer/side_menu.phtml:134
+#: templates/database/designer/side_menu.phtml:128
+#: templates/database/designer/side_menu.phtml:134
 msgid "Small/Big All"
 msgstr "کوچک/بزرگ کردن همه"
 
-#: templates/designer/side_menu.phtml:138
-#: templates/designer/side_menu.phtml:141
+#: templates/database/designer/side_menu.phtml:138
+#: templates/database/designer/side_menu.phtml:141
 msgid "Toggle small/big"
 msgstr "تعویض کوچک/بزرگ"
 
-#: templates/designer/side_menu.phtml:145
-#: templates/designer/side_menu.phtml:148
+#: templates/database/designer/side_menu.phtml:145
+#: templates/database/designer/side_menu.phtml:148
 msgid "Toggle relation lines"
 msgstr "تعویض خطوط رابط"
 
-#: templates/designer/side_menu.phtml:153
-#: templates/designer/side_menu.phtml:156
+#: templates/database/designer/side_menu.phtml:153
+#: templates/database/designer/side_menu.phtml:156
 #, fuzzy
 #| msgid "Export"
 msgid "Export schema"
 msgstr "صدور"
 
-#: templates/designer/side_menu.phtml:165
-#: templates/designer/side_menu.phtml:168
+#: templates/database/designer/side_menu.phtml:165
+#: templates/database/designer/side_menu.phtml:168
 msgid "Build Query"
 msgstr "ایجاد کوئری"
 
-#: templates/designer/side_menu.phtml:173
-#: templates/designer/side_menu.phtml:177
+#: templates/database/designer/side_menu.phtml:173
+#: templates/database/designer/side_menu.phtml:177
 msgid "Move Menu"
 msgstr "حرکت دادن منو"
 
-#: templates/designer/side_menu.phtml:181
-#: templates/designer/side_menu.phtml:186
+#: templates/database/designer/side_menu.phtml:181
+#: templates/database/designer/side_menu.phtml:186
 #, fuzzy
 msgid "Pin text"
 msgstr "متغییر"
 
-#: templates/designer/table_list.phtml:4
+#: templates/database/designer/table_list.phtml:4
 msgid "Hide/Show all"
 msgstr "پنهان/نمايش همه"
 
-#: templates/designer/table_list.phtml:14
+#: templates/database/designer/table_list.phtml:14
 msgid "Hide/Show Tables with no relation"
 msgstr "پنهان کردن/نمایش جدول های بدون رابطه"
 
-#: templates/designer/table_list.phtml:59
+#: templates/database/designer/table_list.phtml:59
 #, fuzzy
 #| msgid "Number of tables"
 msgid "Number of tables:"
 msgstr "تعداد جدول ها"
 
+#: templates/database/structure/body_for_table_summary.phtml:6
+#, php-format
+msgid "%s table"
+msgid_plural "%s tables"
+msgstr[0] "%s جدول"
+msgstr[1] "%s  جدولها"
+
+#: templates/database/structure/body_for_table_summary.phtml:17
+msgid "Sum"
+msgstr "جمع"
+
+#: templates/database/structure/check_all_tables.phtml:6
+msgid "Check tables having overhead"
+msgstr "جدول هایی که سربار دارند را چک کنید"
+
+#: templates/database/structure/check_all_tables.phtml:10
+#, fuzzy
+#| msgid "Show color"
+msgid "Show create"
+msgstr "نمايش رنگ"
+
+#: templates/database/structure/check_all_tables.phtml:27
+msgid "Prefix"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:28
+msgid "Add prefix to table"
+msgstr "پیشوند را به جدول اضافه کنید"
+
+#: templates/database/structure/check_all_tables.phtml:29
+msgid "Replace table prefix"
+msgstr "جایگزینی پیشوند جدول"
+
+#: templates/database/structure/check_all_tables.phtml:30
+msgid "Copy table with prefix"
+msgstr "کپی کردن جدول با پیشوند"
+
+#: templates/database/structure/check_all_tables.phtml:36
+#, fuzzy
+#| msgid "Add columns"
+msgid "Add columns to central list"
+msgstr "افزودن ستونها"
+
+#: templates/database/structure/check_all_tables.phtml:37
+msgid "Remove columns from central list"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:38
+#, fuzzy
+#| msgid "Add columns"
+msgid "Make consistent with central list"
+msgstr "افزودن ستونها"
+
+#: templates/database/structure/favorite_anchor.phtml:12
+#, fuzzy
+msgid "Add to Favorites"
+msgstr "افزودن يك كاربر جديد"
+
+#: templates/database/structure/show_create.phtml:2
+#, fuzzy
+#| msgid "Show Full Queries"
+msgid "Showing create queries"
+msgstr "نمایش کامل کوئری"
+
+#: templates/database/structure/sortable_header.phtml:13
+msgid "Sort"
+msgstr "ترتيب"
+
+#: templates/database/structure/table_header.phtml:42
+msgid ""
+"May be approximate. Click on the number to get the exact count. See "
+"[doc@faq3-11]FAQ 3.11[/doc]."
+msgstr ""
+
+#: templates/database/structure/table_header.phtml:66
+#: templates/table/index_form.phtml:127
+msgid "Size"
+msgstr "اندازه"
+
+#: templates/database/structure/table_header.phtml:74
+#: templates/table/structure/display_table_stats.phtml:27
+msgid "Overhead"
+msgstr "بار بیش از حد"
+
+#: templates/database/structure/tracking_icon.phtml:4
+msgid "Tracking is active."
+msgstr "پیگیری فعال می باشد."
+
+#: templates/database/structure/tracking_icon.phtml:8
+msgid "Tracking is not active."
+msgstr "پیگیری فعال نمی باشد."
+
 #: templates/error/report_form.phtml:7
 msgid ""
 "phpMyAdmin has encountered an error. We have collected data about this error "
@@ -15346,71 +15464,6 @@ msgstr ""
 msgid "Please explain the steps that lead to the error:"
 msgstr ""
 
-#: templates/gis_visualization/gis_visualization.phtml:3
-msgid "Display GIS Visualization"
-msgstr ""
-
-#: templates/gis_visualization/gis_visualization.phtml:8
-#, fuzzy
-#| msgid "Add/Delete Field Columns"
-msgid "Label column"
-msgstr "اضافه يا حذف ستونها"
-
-#: templates/gis_visualization/gis_visualization.phtml:11
-msgid "-- None --"
-msgstr ""
-
-#: templates/gis_visualization/gis_visualization.phtml:19
-#, fuzzy
-#| msgid "Total"
-msgid "Spatial column"
-msgstr "جمع كل"
-
-#: templates/index_form.phtml:16
-msgid "Index name:"
-msgstr "اسم فهرست&nbsp;:"
-
-#: templates/index_form.phtml:19
-msgid ""
-"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
-msgstr "\"PRIMARY\" فقط <b>بايد</b> نام <b>يك</b> كليد اصلي باشد!"
-
-#: templates/index_form.phtml:40
-#, fuzzy
-#| msgid "Index name:"
-msgid "Index choice:"
-msgstr "اسم فهرست&nbsp;:"
-
-#: templates/index_form.phtml:57
-msgid "Key block size:"
-msgstr ""
-
-#: templates/index_form.phtml:74
-msgid "Index type:"
-msgstr "نوع فهرست&nbsp;:"
-
-#: templates/index_form.phtml:86
-#, fuzzy
-#| msgid "User:"
-msgid "Parser:"
-msgstr "كاربر:"
-
-#: templates/index_form.phtml:102
-#, fuzzy
-#| msgid "Comment"
-msgid "Comment:"
-msgstr "توضيحات"
-
-#: templates/index_form.phtml:127 templates/structure/table_header.phtml:66
-msgid "Size"
-msgstr "اندازه"
-
-#: templates/index_form.phtml:149 templates/index_form.phtml:190
-#, fuzzy
-#| msgid "Drag to reorder"
-msgid "Drag to reorder"
-msgstr "برای دوباره مرتب کردن drag کنید"
-
 #: templates/prefs_autoload.phtml:9
 msgid ""
 "Your browser has phpMyAdmin configuration for this domain. Would you like to "
@@ -15423,481 +15476,451 @@ msgstr ""
 msgid "Start row:"
 msgstr "شنبه"
 
-#: templates/structure/actions_in_table_structure.phtml:14
-#, php-format
-msgid "A primary key has been added on %s."
-msgstr "يك كليد اصلي در %s اضافه شد."
-
-#: templates/structure/actions_in_table_structure.phtml:34
-#: templates/structure/actions_in_table_structure.phtml:54
-#: templates/structure/actions_in_table_structure.phtml:79
-#: templates/structure/actions_in_table_structure.phtml:101
-#, php-format
-msgid "An index has been added on %s."
-msgstr "يك فهرست در %s اضافه گرديد."
-
-#: templates/structure/actions_in_table_structure.phtml:130
-#: templates/structure/check_all_table_column.phtml:59
-#, fuzzy
-#| msgid "Remove chart"
-msgid "Remove from central columns"
-msgstr "حذف نمودار"
-
-#: templates/structure/actions_in_table_structure.phtml:138
-#: templates/structure/check_all_table_column.phtml:55
-#, fuzzy
-#| msgid "Add columns"
-msgid "Add to central columns"
-msgstr "افزودن ستونها"
-
-#: templates/structure/add_column.phtml:7
-#, fuzzy, php-format
-msgid "Add %s column(s)"
-msgstr "افزودن ستون جديد"
-
-#: templates/structure/add_column.phtml:12
-#, fuzzy
-#| msgid "At Beginning of Table"
-msgid "at beginning of table"
-msgstr "در ابتداي جدول"
-
-#: templates/structure/body_for_table_summary.phtml:6
-#, php-format
-msgid "%s table"
-msgid_plural "%s tables"
-msgstr[0] "%s جدول"
-msgstr[1] "%s  جدولها"
-
-#: templates/structure/body_for_table_summary.phtml:17
-msgid "Sum"
-msgstr "جمع"
-
-#: templates/structure/check_all_tables.phtml:6
-msgid "Check tables having overhead"
-msgstr "جدول هایی که سربار دارند را چک کنید"
-
-#: templates/structure/check_all_tables.phtml:10
-#, fuzzy
-#| msgid "Show color"
-msgid "Show create"
-msgstr "نمايش رنگ"
-
-#: templates/structure/check_all_tables.phtml:27
-msgid "Prefix"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:28
-msgid "Add prefix to table"
-msgstr "پیشوند را به جدول اضافه کنید"
-
-#: templates/structure/check_all_tables.phtml:29
-msgid "Replace table prefix"
-msgstr "جایگزینی پیشوند جدول"
-
-#: templates/structure/check_all_tables.phtml:30
-msgid "Copy table with prefix"
-msgstr "کپی کردن جدول با پیشوند"
-
-#: templates/structure/check_all_tables.phtml:36
-#, fuzzy
-#| msgid "Add columns"
-msgid "Add columns to central list"
-msgstr "افزودن ستونها"
-
-#: templates/structure/check_all_tables.phtml:37
-msgid "Remove columns from central list"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:38
-#, fuzzy
-#| msgid "Add columns"
-msgid "Make consistent with central list"
-msgstr "افزودن ستونها"
-
-#: templates/structure/display_structure.phtml:140 view_create.php:181
-#, fuzzy
-#| msgid "Print view"
-msgid "Edit view"
-msgstr "نماي چاپ"
-
-#: templates/structure/display_table_stats.phtml:9
-msgid "Space usage"
-msgstr "فضاي استفاده‌شده"
-
-#: templates/structure/display_table_stats.phtml:27
-#: templates/structure/table_header.phtml:74
-msgid "Overhead"
-msgstr "بار بیش از حد"
-
-#: templates/structure/display_table_stats.phtml:32
-msgid "Effective"
-msgstr "موثر"
-
-#: templates/structure/favorite_anchor.phtml:12
-#, fuzzy
-msgid "Add to Favorites"
-msgstr "افزودن يك كاربر جديد"
-
-#: templates/structure/move_columns_dialog.phtml:1
-#: templates/structure/optional_action_links.phtml:21
-#, fuzzy
-msgid "Move columns"
-msgstr "افزودن ستون جديد"
-
-#: templates/structure/move_columns_dialog.phtml:2
-msgid "Move the columns by dragging them up and down."
-msgstr ""
-
-#: templates/structure/optional_action_links.phtml:9
-msgid "Propose table structure"
-msgstr "پيشنهاد ساختار جدول"
-
-#: templates/structure/optional_action_links.phtml:24
-#, fuzzy
-#| msgid "Propose table structure"
-msgid "Improve table structure"
-msgstr "پيشنهاد ساختار جدول"
-
-#: templates/structure/optional_action_links.phtml:30
-#, fuzzy
-#| msgid "Track table"
-msgid "Track view"
-msgstr "پیگیری جدول"
-
-#: templates/structure/row_stats_table.phtml:3
-#, fuzzy
-#| msgid "Row Statistics"
-msgid "Row statistics"
-msgstr "آمار سطرها"
-
-#: templates/structure/row_stats_table.phtml:9
-msgid "static"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:11
-msgid "dynamic"
-msgstr "پويا"
-
-#: templates/structure/row_stats_table.phtml:22
-msgid "partitioned"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:54
-msgid "Row length"
-msgstr "طول سطر"
-
-#: templates/structure/row_stats_table.phtml:66
-msgid "Row size"
-msgstr "اندازه سطر"
-
-#: templates/structure/row_stats_table.phtml:73
-msgid "Next autoindex"
-msgstr ""
-
-#: templates/structure/secondary_tabs.phtml:14
-#, fuzzy
-#| msgid "Relation table"
-msgid "Relation view"
-msgstr "ارتباط جدول"
-
-#: templates/structure/show_create.phtml:2
-#, fuzzy
-#| msgid "Show Full Queries"
-msgid "Showing create queries"
-msgstr "نمایش کامل کوئری"
-
-#: templates/structure/sortable_header.phtml:13
-msgid "Sort"
-msgstr "ترتيب"
-
-#: templates/structure/table_header.phtml:42
-msgid ""
-"May be approximate. Click on the number to get the exact count. See "
-"[doc@faq3-11]FAQ 3.11[/doc]."
-msgstr ""
-
-#: templates/structure/table_structure_row.phtml:46
-#, fuzzy, php-format
-#| msgid "Table %s has been dropped."
-msgid "Column %s has been dropped."
-msgstr "جدول %s حذف گرديد"
-
-#: templates/structure/tracking_icon.phtml:4
-msgid "Tracking is active."
-msgstr "پیگیری فعال می باشد."
-
-#: templates/structure/tracking_icon.phtml:8
-msgid "Tracking is not active."
-msgstr "پیگیری فعال نمی باشد."
-
-#: templates/table/create_table.phtml:15
-msgid "Number of columns"
-msgstr "تعداد سطرها در هر صفحه"
-
-#: templates/table/options.phtml:8
-#, fuzzy
-#| msgid "Select fields (at least one):"
-msgid "Select columns (at least one):"
-msgstr "ستونها را انتخاب نماييد (حداقل يكي)"
-
-#: templates/table/options.phtml:37
-msgid "Add search conditions (body of the \"where\" clause):"
-msgstr "افزودن شرايط جستجو (بدنه شرط \"where\"):"
-
-#: templates/table/options.phtml:45
-msgid "Number of rows per page"
-msgstr "تعداد سطرها در هر صفحه"
-
-#: templates/table/options.phtml:56
-msgid "Display order:"
-msgstr "ترتيب نمايش:"
-
-#: templates/table/options_zoom.phtml:6
-msgid "Use this column to label each point"
-msgstr ""
-
-#: templates/table/options_zoom.phtml:35
-msgid "Maximum rows to plot"
-msgstr ""
-
-#: templates/table/replace_preview.phtml:13
-msgid "Find and replace - preview"
-msgstr ""
-
-#: templates/table/replace_preview.phtml:18
-#, fuzzy
-#| msgid "Original position"
-msgid "Original string"
-msgstr "موقعیت اصلی"
-
-#: templates/table/replace_preview.phtml:19
-#, fuzzy
-msgid "Replaced string"
-msgstr "عمليات"
-
-#: templates/table/replace_preview.phtml:40
-#, fuzzy
-#| msgid "Replicated"
-msgid "Replace"
-msgstr "تکراری"
-
-#: templates/table/rows_zoom.phtml:16
-#, fuzzy
-msgid "Additional search criteria"
-msgstr "پرس و جوي SQL"
-
-#: templates/table/search_and_replace.phtml:3
-#, fuzzy
-#| msgid "Replace table data with file"
-msgid "Replace with:"
-msgstr "جايگزيني داده‌هاي جدول با پرونده"
-
-#: templates/table/search_and_replace.phtml:22
-#, fuzzy
-#| msgid "as regular expression"
-msgid "Use regular expression"
-msgstr "بعنوان مبين منظم(as regular expression)"
-
-#: templates/table/selection_form.phtml:12
-#, fuzzy
-#| msgid "Do a \"query by example\" (wildcard: \"%\")"
-msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
-msgstr "انجام يك \"پرس و جو با نمونه\" (wildcard: \"%\")"
-
-#: templates/table/selection_form.phtml:34
-msgid "Do a \"query by example\" (wildcard: \"%\")"
-msgstr "انجام يك \"پرس و جو با نمونه\" (wildcard: \"%\")"
-
-#: templates/table/zoom_result_form.phtml:7
-msgid "Browse/Edit the points"
-msgstr ""
-
-#: templates/table/zoom_result_form.phtml:15
-msgid "How to use"
-msgstr ""
-
-#: templates/table/zoom_result_form.phtml:23
-#, fuzzy
-#| msgid "Reset"
-msgid "Reset zoom"
-msgstr "Reset"
-
-#: templates/tbl_chart.phtml:17
+#: templates/table/chart/tbl_chart.phtml:17
 #, fuzzy
 #| msgid "Mar"
 msgctxt "Chart type"
 msgid "Bar"
 msgstr "مارس"
 
-#: templates/tbl_chart.phtml:21
+#: templates/table/chart/tbl_chart.phtml:21
 #, fuzzy
 #| msgid "Column"
 msgctxt "Chart type"
 msgid "Column"
 msgstr "ستون"
 
-#: templates/tbl_chart.phtml:25
+#: templates/table/chart/tbl_chart.phtml:25
 msgctxt "Chart type"
 msgid "Line"
 msgstr ""
 
-#: templates/tbl_chart.phtml:29
+#: templates/table/chart/tbl_chart.phtml:29
 #, fuzzy
 #| msgid "Engines"
 msgctxt "Chart type"
 msgid "Spline"
 msgstr "موتور"
 
-#: templates/tbl_chart.phtml:33
+#: templates/table/chart/tbl_chart.phtml:33
 msgctxt "Chart type"
 msgid "Area"
 msgstr ""
 
-#: templates/tbl_chart.phtml:37
+#: templates/table/chart/tbl_chart.phtml:37
 #, fuzzy
 #| msgid "PiB"
 msgctxt "Chart type"
 msgid "Pie"
 msgstr "پتا بايت"
 
-#: templates/tbl_chart.phtml:41
+#: templates/table/chart/tbl_chart.phtml:41
 #, fuzzy
 #| msgid "Time"
 msgctxt "Chart type"
 msgid "Timeline"
 msgstr "زمان"
 
-#: templates/tbl_chart.phtml:45
+#: templates/table/chart/tbl_chart.phtml:45
 msgctxt "Chart type"
 msgid "Scatter"
 msgstr ""
 
-#: templates/tbl_chart.phtml:50
+#: templates/table/chart/tbl_chart.phtml:50
 msgid "Stacked"
 msgstr ""
 
-#: templates/tbl_chart.phtml:53
+#: templates/table/chart/tbl_chart.phtml:53
 #, fuzzy
 msgid "Chart title"
 msgstr "No tables"
 
-#: templates/tbl_chart.phtml:57
+#: templates/table/chart/tbl_chart.phtml:57
 msgid "X-Axis:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:72
+#: templates/table/chart/tbl_chart.phtml:72
 #, fuzzy
 msgid "Series:"
 msgstr "پرس و جوي SQL"
 
-#: templates/tbl_chart.phtml:102
+#: templates/table/chart/tbl_chart.phtml:102
 msgid "X-Axis label:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:104
+#: templates/table/chart/tbl_chart.phtml:104
 #, fuzzy
 #| msgid "Value"
 msgid "X Values"
 msgstr "مقدار"
 
-#: templates/tbl_chart.phtml:107
+#: templates/table/chart/tbl_chart.phtml:107
 msgid "Y-Axis label:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:115
+#: templates/table/chart/tbl_chart.phtml:115
 msgid "Series names are in a column"
 msgstr ""
 
-#: templates/tbl_chart.phtml:118
+#: templates/table/chart/tbl_chart.phtml:118
 #, fuzzy
 #| msgid "Inside column:"
 msgid "Series column:"
 msgstr "در ستونها:"
 
-#: templates/tbl_chart.phtml:130
+#: templates/table/chart/tbl_chart.phtml:130
 #, fuzzy
 #| msgid "Values for column %s"
 msgid "Value Column:"
 msgstr "تعداد ستون ها %s"
 
-#: templates/tbl_chart.phtml:150
+#: templates/table/chart/tbl_chart.phtml:150
 #, fuzzy
 #| msgid "Save as file"
 msgid "Save chart as image"
 msgstr "ذخيره به صورت پرونده"
 
-#: templates/tbl_relation/common_form.phtml:7
+#: templates/table/gis_visualization/gis_visualization.phtml:3
+msgid "Display GIS Visualization"
+msgstr ""
+
+#: templates/table/gis_visualization/gis_visualization.phtml:8
+#, fuzzy
+#| msgid "Add/Delete Field Columns"
+msgid "Label column"
+msgstr "اضافه يا حذف ستونها"
+
+#: templates/table/gis_visualization/gis_visualization.phtml:11
+msgid "-- None --"
+msgstr ""
+
+#: templates/table/gis_visualization/gis_visualization.phtml:19
+#, fuzzy
+#| msgid "Total"
+msgid "Spatial column"
+msgstr "جمع كل"
+
+#: templates/table/index_form.phtml:16
+msgid "Index name:"
+msgstr "اسم فهرست&nbsp;:"
+
+#: templates/table/index_form.phtml:19
+msgid ""
+"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
+msgstr "\"PRIMARY\" فقط <b>بايد</b> نام <b>يك</b> كليد اصلي باشد!"
+
+#: templates/table/index_form.phtml:40
+#, fuzzy
+#| msgid "Index name:"
+msgid "Index choice:"
+msgstr "اسم فهرست&nbsp;:"
+
+#: templates/table/index_form.phtml:57
+msgid "Key block size:"
+msgstr ""
+
+#: templates/table/index_form.phtml:74
+msgid "Index type:"
+msgstr "نوع فهرست&nbsp;:"
+
+#: templates/table/index_form.phtml:86
+#, fuzzy
+#| msgid "User:"
+msgid "Parser:"
+msgstr "كاربر:"
+
+#: templates/table/index_form.phtml:102
+#, fuzzy
+#| msgid "Comment"
+msgid "Comment:"
+msgstr "توضيحات"
+
+#: templates/table/index_form.phtml:149 templates/table/index_form.phtml:190
+#, fuzzy
+#| msgid "Drag to reorder"
+msgid "Drag to reorder"
+msgstr "برای دوباره مرتب کردن drag کنید"
+
+#: templates/table/relation/common_form.phtml:7
 #, fuzzy
 msgid "Internal relations"
 msgstr "اروپای غربی"
 
-#: templates/tbl_relation/common_form.phtml:11
+#: templates/table/relation/common_form.phtml:11
 #, fuzzy
 msgid "Internal relation"
 msgstr "اروپای غربی"
 
-#: templates/tbl_relation/common_form.phtml:14
+#: templates/table/relation/common_form.phtml:14
 msgid ""
 "An internal relation is not necessary when a corresponding FOREIGN KEY "
 "relation exists."
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:37
+#: templates/table/relation/common_form.phtml:37
 #, fuzzy
 #| msgid "Add constraints"
 msgid "Foreign key constraints"
 msgstr "اعمال محدودیت ها"
 
-#: templates/tbl_relation/common_form.phtml:40
+#: templates/table/relation/common_form.phtml:40
 #, fuzzy
 #| msgid "Action"
 msgid "Actions"
 msgstr "عمل"
 
-#: templates/tbl_relation/common_form.phtml:41
+#: templates/table/relation/common_form.phtml:41
 #, fuzzy
 #| msgid "Column names"
 msgid "Constraint properties"
 msgstr "نام ستونها"
 
-#: templates/tbl_relation/common_form.phtml:44
+#: templates/table/relation/common_form.phtml:44
 msgid ""
 "Only columns with index will be displayed. You can define an index below."
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:49
+#: templates/table/relation/common_form.phtml:49
 msgid "Foreign key constraint"
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:81
+#: templates/table/relation/common_form.phtml:81
 #, fuzzy
 #| msgid "Add constraints"
 msgid "+ Add constraint"
 msgstr "اعمال محدودیت ها"
 
-#: templates/tbl_relation/common_form.phtml:91
+#: templates/table/relation/common_form.phtml:91
 #, fuzzy
 #| msgid "Choose column to display"
 msgid "Choose column to display:"
 msgstr "ستون را براي نمايش انتخاب نماييد"
 
-#: templates/tbl_relation/foreign_key_row.phtml:13
+#: templates/table/relation/foreign_key_row.phtml:13
 #, fuzzy, php-format
 #| msgid "Add constraints"
 msgid "Foreign key constraint %s has been dropped"
 msgstr "اعمال محدودیت ها"
 
-#: templates/tbl_relation/foreign_key_row.phtml:102
+#: templates/table/relation/foreign_key_row.phtml:102
 #, fuzzy
 #| msgid "Column names"
 msgid "Constraint name"
 msgstr "نام ستونها"
 
-#: templates/tbl_relation/foreign_key_row.phtml:157
+#: templates/table/relation/foreign_key_row.phtml:157
 #, fuzzy
 msgid "+ Add column"
 msgstr "افزودن ستون جديد"
 
+#: templates/table/search/options.phtml:8
+#, fuzzy
+#| msgid "Select fields (at least one):"
+msgid "Select columns (at least one):"
+msgstr "ستونها را انتخاب نماييد (حداقل يكي)"
+
+#: templates/table/search/options.phtml:37
+msgid "Add search conditions (body of the \"where\" clause):"
+msgstr "افزودن شرايط جستجو (بدنه شرط \"where\"):"
+
+#: templates/table/search/options.phtml:45
+msgid "Number of rows per page"
+msgstr "تعداد سطرها در هر صفحه"
+
+#: templates/table/search/options.phtml:56
+msgid "Display order:"
+msgstr "ترتيب نمايش:"
+
+#: templates/table/search/options_zoom.phtml:6
+msgid "Use this column to label each point"
+msgstr ""
+
+#: templates/table/search/options_zoom.phtml:35
+msgid "Maximum rows to plot"
+msgstr ""
+
+#: templates/table/search/replace_preview.phtml:13
+msgid "Find and replace - preview"
+msgstr ""
+
+#: templates/table/search/replace_preview.phtml:18
+#, fuzzy
+#| msgid "Original position"
+msgid "Original string"
+msgstr "موقعیت اصلی"
+
+#: templates/table/search/replace_preview.phtml:19
+#, fuzzy
+msgid "Replaced string"
+msgstr "عمليات"
+
+#: templates/table/search/replace_preview.phtml:40
+#, fuzzy
+#| msgid "Replicated"
+msgid "Replace"
+msgstr "تکراری"
+
+#: templates/table/search/rows_zoom.phtml:16
+#, fuzzy
+msgid "Additional search criteria"
+msgstr "پرس و جوي SQL"
+
+#: templates/table/search/search_and_replace.phtml:3
+#, fuzzy
+#| msgid "Replace table data with file"
+msgid "Replace with:"
+msgstr "جايگزيني داده‌هاي جدول با پرونده"
+
+#: templates/table/search/search_and_replace.phtml:22
+#, fuzzy
+#| msgid "as regular expression"
+msgid "Use regular expression"
+msgstr "بعنوان مبين منظم(as regular expression)"
+
+#: templates/table/search/selection_form.phtml:12
+#, fuzzy
+#| msgid "Do a \"query by example\" (wildcard: \"%\")"
+msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
+msgstr "انجام يك \"پرس و جو با نمونه\" (wildcard: \"%\")"
+
+#: templates/table/search/selection_form.phtml:34
+msgid "Do a \"query by example\" (wildcard: \"%\")"
+msgstr "انجام يك \"پرس و جو با نمونه\" (wildcard: \"%\")"
+
+#: templates/table/search/zoom_result_form.phtml:7
+msgid "Browse/Edit the points"
+msgstr ""
+
+#: templates/table/search/zoom_result_form.phtml:15
+msgid "How to use"
+msgstr ""
+
+#: templates/table/search/zoom_result_form.phtml:23
+#, fuzzy
+#| msgid "Reset"
+msgid "Reset zoom"
+msgstr "Reset"
+
+#: templates/table/secondary_tabs.phtml:14
+#, fuzzy
+#| msgid "Relation table"
+msgid "Relation view"
+msgstr "ارتباط جدول"
+
+#: templates/table/structure/actions_in_table_structure.phtml:14
+#, php-format
+msgid "A primary key has been added on %s."
+msgstr "يك كليد اصلي در %s اضافه شد."
+
+#: templates/table/structure/actions_in_table_structure.phtml:34
+#: templates/table/structure/actions_in_table_structure.phtml:54
+#: templates/table/structure/actions_in_table_structure.phtml:79
+#: templates/table/structure/actions_in_table_structure.phtml:101
+#, php-format
+msgid "An index has been added on %s."
+msgstr "يك فهرست در %s اضافه گرديد."
+
+#: templates/table/structure/actions_in_table_structure.phtml:130
+#: templates/table/structure/check_all_table_column.phtml:59
+#, fuzzy
+#| msgid "Remove chart"
+msgid "Remove from central columns"
+msgstr "حذف نمودار"
+
+#: templates/table/structure/actions_in_table_structure.phtml:138
+#: templates/table/structure/check_all_table_column.phtml:55
+#, fuzzy
+#| msgid "Add columns"
+msgid "Add to central columns"
+msgstr "افزودن ستونها"
+
+#: templates/table/structure/add_column.phtml:7
+#, fuzzy, php-format
+msgid "Add %s column(s)"
+msgstr "افزودن ستون جديد"
+
+#: templates/table/structure/add_column.phtml:12
+#, fuzzy
+#| msgid "At Beginning of Table"
+msgid "at beginning of table"
+msgstr "در ابتداي جدول"
+
+#: templates/table/structure/display_structure.phtml:140 view_create.php:181
+#, fuzzy
+#| msgid "Print view"
+msgid "Edit view"
+msgstr "نماي چاپ"
+
+#: templates/table/structure/display_table_stats.phtml:9
+msgid "Space usage"
+msgstr "فضاي استفاده‌شده"
+
+#: templates/table/structure/display_table_stats.phtml:32
+msgid "Effective"
+msgstr "موثر"
+
+#: templates/table/structure/move_columns_dialog.phtml:1
+#: templates/table/structure/optional_action_links.phtml:21
+#, fuzzy
+msgid "Move columns"
+msgstr "افزودن ستون جديد"
+
+#: templates/table/structure/move_columns_dialog.phtml:2
+msgid "Move the columns by dragging them up and down."
+msgstr ""
+
+#: templates/table/structure/optional_action_links.phtml:9
+msgid "Propose table structure"
+msgstr "پيشنهاد ساختار جدول"
+
+#: templates/table/structure/optional_action_links.phtml:24
+#, fuzzy
+#| msgid "Propose table structure"
+msgid "Improve table structure"
+msgstr "پيشنهاد ساختار جدول"
+
+#: templates/table/structure/optional_action_links.phtml:30
+#, fuzzy
+#| msgid "Track table"
+msgid "Track view"
+msgstr "پیگیری جدول"
+
+#: templates/table/structure/row_stats_table.phtml:3
+#, fuzzy
+#| msgid "Row Statistics"
+msgid "Row statistics"
+msgstr "آمار سطرها"
+
+#: templates/table/structure/row_stats_table.phtml:9
+msgid "static"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:11
+msgid "dynamic"
+msgstr "پويا"
+
+#: templates/table/structure/row_stats_table.phtml:22
+msgid "partitioned"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:54
+msgid "Row length"
+msgstr "طول سطر"
+
+#: templates/table/structure/row_stats_table.phtml:66
+msgid "Row size"
+msgstr "اندازه سطر"
+
+#: templates/table/structure/row_stats_table.phtml:73
+msgid "Next autoindex"
+msgstr ""
+
+#: templates/table/structure/table_structure_row.phtml:46
+#, fuzzy, php-format
+#| msgid "Table %s has been dropped."
+msgid "Column %s has been dropped."
+msgstr "جدول %s حذف گرديد"
+
 #: themes.php:17 themes.php:22
 msgid "Theme"
 msgstr "تم"
@@ -17089,6 +17112,11 @@ msgstr ""
 msgid "concurrent_insert is set to 0"
 msgstr "مقدار concurrent_insert صفر شده است"
 
+#, fuzzy
+#~| msgid "Read misses"
+#~ msgid "Read as multibytes"
+#~ msgstr "نمیتواند خوانده شود"
+
 #~ msgid "Begin"
 #~ msgstr "شروع"
 
diff --git a/po/fi.po b/po/fi.po
index e099d58f3d..283ab24399 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -2,18 +2,18 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 4.5.0-dev\n"
-"Report-Msgid-Bugs-To: developers@phpmyadmin.net\n"
-"POT-Creation-Date: 2015-08-08 13:53-0400\n"
-"PO-Revision-Date: 2015-01-18 15:39+0200\n"
-"Last-Translator: Juha <jremes@outlook.com>\n"
-"Language-Team: Finnish <https://hosted.weblate.org/projects/phpmyadmin/"
-"master/fi/>\n"
+"Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
+"POT-Creation-Date: 2015-08-12 08:10-0400\n"
+"PO-Revision-Date: 2015-08-12 17:17+0200\n"
+"Last-Translator: Lari Oesch <lari@oesch.me>\n"
+"Language-Team: Finnish "
+"<https://hosted.weblate.org/projects/phpmyadmin/master/fi/>\n"
 "Language: fi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 2.2-dev\n"
+"X-Generator: Weblate 2.4-dev\n"
 
 #: changelog.php:37 license.php:30
 #, php-format
@@ -53,7 +53,7 @@ msgid "Table comments:"
 msgstr "Taulun kommentit:"
 
 #: db_datadict.php:104 libraries/Index.class.php:699
-#: libraries/insert_edit.lib.php:1567
+#: libraries/insert_edit.lib.php:1565
 #: libraries/navigation/Nodes/Node_Column.class.php:30
 #: libraries/plugins/export/ExportHtmlword.class.php:280
 #: libraries/plugins/export/ExportHtmlword.class.php:375
@@ -67,13 +67,14 @@ msgstr "Taulun kommentit:"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1023
 #: libraries/tracking.lib.php:879 libraries/tracking.lib.php:975
 #: templates/columns_definitions/column_name.phtml:18
-#: templates/index_form.phtml:124 templates/table/table_header.phtml:6
-#: templates/table/zoom_result_form.phtml:33
-#: templates/tbl_relation/common_form.phtml:10
-#: templates/tbl_relation/common_form.phtml:43
-#: templates/tbl_relation/foreign_key_row.phtml:194
-#: templates/tbl_relation/foreign_key_row.phtml:206
-#: templates/tbl_relation/internal_relational_row.phtml:71
+#: templates/table/index_form.phtml:124
+#: templates/table/relation/common_form.phtml:10
+#: templates/table/relation/common_form.phtml:43
+#: templates/table/relation/foreign_key_row.phtml:194
+#: templates/table/relation/foreign_key_row.phtml:206
+#: templates/table/relation/internal_relational_row.phtml:71
+#: templates/table/search/table_header.phtml:6
+#: templates/table/search/zoom_result_form.phtml:33
 msgid "Column"
 msgstr "Sarake"
 
@@ -91,21 +92,21 @@ msgstr "Sarake"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1001
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1024
 #: libraries/rte/rte_list.lib.php:75 libraries/rte/rte_list.lib.php:103
-#: libraries/rte/rte_routines.lib.php:802
-#: libraries/rte/rte_routines.lib.php:831
-#: libraries/rte/rte_routines.lib.php:1493
+#: libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_routines.lib.php:922
+#: libraries/rte/rte_routines.lib.php:1584
 #: libraries/server_privileges.lib.php:2369 libraries/tracking.lib.php:880
 #: libraries/tracking.lib.php:972
 #: templates/columns_definitions/table_fields_definitions.phtml:11
-#: templates/structure/table_header.phtml:48
-#: templates/structure/table_structure_header.phtml:6
-#: templates/table/table_header.phtml:7
+#: templates/database/structure/table_header.phtml:48
+#: templates/table/search/table_header.phtml:7
+#: templates/table/structure/table_structure_header.phtml:6
 msgid "Type"
 msgstr "Tyyppi"
 
 #: db_datadict.php:106 libraries/Index.class.php:702
 #: libraries/central_columns.lib.php:708
-#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1576
+#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1574
 #: libraries/plugins/export/ExportHtmlword.class.php:286
 #: libraries/plugins/export/ExportHtmlword.class.php:381
 #: libraries/plugins/export/ExportLatex.class.php:509
@@ -118,8 +119,8 @@ msgstr "Tyyppi"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1026
 #: libraries/tracking.lib.php:882 libraries/tracking.lib.php:978
 #: templates/columns_definitions/table_fields_definitions.phtml:39
-#: templates/structure/table_structure_header.phtml:9
-#: templates/table/zoom_result_form.phtml:34
+#: templates/table/search/zoom_result_form.phtml:34
+#: templates/table/structure/table_structure_header.phtml:9
 msgid "Null"
 msgstr "Tyhjä"
 
@@ -137,8 +138,8 @@ msgstr "Tyhjä"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1027
 #: libraries/replication_gui.lib.php:153 libraries/tracking.lib.php:883
 #: templates/columns_definitions/table_fields_definitions.phtml:25
-#: templates/structure/body_for_table_summary.phtml:55
-#: templates/structure/table_structure_header.phtml:10
+#: templates/database/structure/body_for_table_summary.phtml:55
+#: templates/table/structure/table_structure_header.phtml:10
 msgid "Default"
 msgstr "Oletusarvo"
 
@@ -166,19 +167,19 @@ msgid "Comments"
 msgstr "Kommentit"
 
 #: db_datadict.php:146
-#: libraries/controllers/StructureController.class.php:1960
-#: libraries/controllers/StructureController.class.php:1965
+#: libraries/controllers/TableStructureController.class.php:951
+#: libraries/controllers/TableStructureController.class.php:956
 #: libraries/tracking.lib.php:922
 #: templates/columns_definitions/column_indexes.phtml:6
-#: templates/structure/check_all_table_column.phtml:22
-#: templates/structure/display_structure.phtml:74
+#: templates/table/structure/check_all_table_column.phtml:22
+#: templates/table/structure/display_structure.phtml:74
 msgid "Primary"
 msgstr "Perusavain"
 
 #: db_datadict.php:156 js/messages.php:317 libraries/Index.class.php:567
 #: libraries/Index.class.php:606 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261 libraries/mult_submits.lib.php:403
+#: libraries/config/FormDisplay.tpl.php:272 libraries/mult_submits.lib.php:403
 #: libraries/mult_submits.lib.php:417
 #: libraries/plugins/export/ExportHtmlword.class.php:630
 #: libraries/plugins/export/ExportLatex.class.php:589
@@ -194,20 +195,20 @@ msgstr "Perusavain"
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1010 libraries/tracking.lib.php:1015
 #: prefs_manage.php:140 templates/prefs_autoload.phtml:15
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "No"
 msgstr "Ei"
 
 #: db_datadict.php:156 js/messages.php:443 libraries/Index.class.php:568
 #: libraries/Index.class.php:605 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261
-#: libraries/controllers/StructureController.class.php:1344
-#: libraries/controllers/StructureController.class.php:2223
-#: libraries/controllers/StructureController.class.php:2232
-#: libraries/controllers/StructureController.class.php:2237
-#: libraries/controllers/StructureController.class.php:2242
-#: libraries/controllers/StructureController.class.php:2247
+#: libraries/config/FormDisplay.tpl.php:272
+#: libraries/controllers/TableStructureController.class.php:539
+#: libraries/controllers/TableStructureController.class.php:1201
+#: libraries/controllers/TableStructureController.class.php:1210
+#: libraries/controllers/TableStructureController.class.php:1215
+#: libraries/controllers/TableStructureController.class.php:1220
+#: libraries/controllers/TableStructureController.class.php:1225
 #: libraries/mult_submits.inc.php:82 libraries/mult_submits.inc.php:178
 #: libraries/mult_submits.lib.php:339 libraries/mult_submits.lib.php:372
 #: libraries/mult_submits.lib.php:401 libraries/mult_submits.lib.php:415
@@ -216,8 +217,8 @@ msgstr "Ei"
 #: libraries/plugins/export/ExportOdt.class.php:756
 #: libraries/plugins/export/ExportTexytext.class.php:567
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1077
-#: libraries/server_databases.lib.php:464
-#: libraries/server_databases.lib.php:474
+#: libraries/server_databases.lib.php:475
+#: libraries/server_databases.lib.php:485
 #: libraries/server_privileges.lib.php:2546
 #: libraries/server_privileges.lib.php:2727
 #: libraries/server_privileges.lib.php:2748
@@ -227,7 +228,7 @@ msgstr "Ei"
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1008 libraries/tracking.lib.php:1013
 #: prefs_manage.php:138 templates/prefs_autoload.phtml:14
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "Yes"
 msgstr "Kyllä"
 
@@ -237,7 +238,7 @@ msgstr "Tee vedos tietokannasta"
 
 #: db_export.php:37 db_tracking.php:90 export.php:382
 #: libraries/DBQbe.class.php:326
-#: libraries/controllers/StructureController.class.php:231
+#: libraries/controllers/DatabaseStructureController.class.php:170
 #: libraries/navigation/NavigationTree.class.php:897
 msgid "No tables found in database."
 msgstr "Tietokannassa ei ole tauluja."
@@ -248,14 +249,14 @@ msgstr "Tietokannassa ei ole tauluja."
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:26
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:120
-#: templates/structure/show_create.phtml:18
+#: templates/database/structure/show_create.phtml:18
 msgid "Tables"
 msgstr "Taulut"
 
 #: db_export.php:52 libraries/Menu.class.php:317 libraries/Menu.class.php:425
-#: libraries/Util.class.php:3333 libraries/Util.class.php:3343
-#: libraries/Util.class.php:3349 libraries/Util.class.php:3629
-#: libraries/Util.class.php:4327 libraries/Util.class.php:4344
+#: libraries/Util.class.php:3339 libraries/Util.class.php:3349
+#: libraries/Util.class.php:3355 libraries/Util.class.php:3635
+#: libraries/Util.class.php:4333 libraries/Util.class.php:4350
 #: libraries/central_columns.lib.php:728 libraries/config.values.php:39
 #: libraries/config.values.php:47 libraries/config.values.php:109
 #: libraries/config.values.php:115 libraries/config/setup.forms.php:323
@@ -269,7 +270,7 @@ msgstr "Taulut"
 #: libraries/navigation/Nodes/Node_Table.class.php:283
 #: libraries/server_privileges.lib.php:1141 libraries/tracking.lib.php:874
 #: templates/columns_definitions/table_fields_definitions.phtml:3
-#: templates/designer/table_list.phtml:28
+#: templates/database/designer/table_list.phtml:28
 msgid "Structure"
 msgstr "Rakenne"
 
@@ -281,7 +282,7 @@ msgstr "Rakenne"
 #: libraries/config/user_preferences.forms.php:292
 #: libraries/config/user_preferences.forms.php:297
 #: libraries/server_privileges.lib.php:1140
-#: templates/structure/display_table_stats.phtml:12
+#: templates/table/structure/display_table_stats.phtml:12
 msgid "Data"
 msgstr "Tietoa"
 
@@ -355,10 +356,10 @@ msgstr "Seurattavat taulut"
 #: libraries/server_privileges.lib.php:2908
 #: libraries/server_privileges.lib.php:3145
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4346
-#: templates/structure/table_header.phtml:21
-#: templates/tbl_relation/foreign_key_row.phtml:176
-#: templates/tbl_relation/internal_relational_row.phtml:63
+#: libraries/server_privileges.lib.php:4372
+#: templates/database/structure/table_header.phtml:21
+#: templates/table/relation/foreign_key_row.phtml:176
+#: templates/table/relation/internal_relational_row.phtml:63
 msgid "Table"
 msgstr "Taulu"
 
@@ -375,7 +376,7 @@ msgid "Updated"
 msgstr "Päivitetty"
 
 #: db_tracking.php:130 js/messages.php:243 libraries/Menu.class.php:552
-#: libraries/Util.class.php:4314 libraries/config.values.php:104
+#: libraries/Util.class.php:4320 libraries/config.values.php:104
 #: libraries/rte/rte_events.lib.php:393 libraries/rte/rte_list.lib.php:101
 #: libraries/server_status_processes.lib.php:92 libraries/tracking.lib.php:279
 msgid "Status"
@@ -384,14 +385,15 @@ msgstr "Tila"
 #: db_tracking.php:131 db_tracking.php:290 libraries/Index.class.php:693
 #: libraries/central_columns.lib.php:687 libraries/rte/rte_list.lib.php:74
 #: libraries/rte/rte_list.lib.php:89 libraries/rte/rte_list.lib.php:102
-#: libraries/server_databases.lib.php:398
+#: libraries/server_databases.lib.php:409
 #: libraries/server_privileges.lib.php:2372
 #: libraries/server_privileges.lib.php:3166
 #: libraries/server_privileges.lib.php:3342
 #: libraries/server_user_groups.lib.php:82
 #: libraries/server_variables.lib.php:189 libraries/tracking.lib.php:280
-#: libraries/tracking.lib.php:793 templates/structure/table_header.phtml:30
-#: templates/structure/table_structure_header.phtml:23
+#: libraries/tracking.lib.php:793
+#: templates/database/structure/table_header.phtml:30
+#: templates/table/structure/table_structure_header.phtml:23
 msgid "Action"
 msgstr "Toiminnot"
 
@@ -433,7 +435,7 @@ msgid "Untracked tables"
 msgstr "Seuraamattomat taulut"
 
 #: db_tracking.php:305 db_tracking.php:336
-#: templates/structure/optional_action_links.phtml:17
+#: templates/table/structure/optional_action_links.phtml:17
 msgid "Track table"
 msgstr "Seuraa taulua"
 
@@ -487,7 +489,7 @@ msgid "Value for the column \"%s\""
 msgstr "Arvo sarakkeelle %s"
 
 #: gis_data_editor.php:146
-#: templates/gis_visualization/gis_visualization.phtml:37
+#: templates/table/gis_visualization/gis_visualization.phtml:37
 msgid "Use OpenStreetMaps as Base Layer"
 msgstr "Käytä perustasossa OpenStreetMaps-karttaa"
 
@@ -567,35 +569,35 @@ msgstr "Lisää geometria"
 #: libraries/display_change_password.lib.php:162
 #: libraries/display_export.lib.php:402 libraries/display_export.lib.php:408
 #: libraries/display_import.lib.php:392 libraries/index.lib.php:44
-#: libraries/insert_edit.lib.php:1546 libraries/insert_edit.lib.php:1583
+#: libraries/insert_edit.lib.php:1544 libraries/insert_edit.lib.php:1581
 #: libraries/normalization.lib.php:165 libraries/normalization.lib.php:821
 #: libraries/operations.lib.php:38 libraries/operations.lib.php:108
 #: libraries/operations.lib.php:263 libraries/operations.lib.php:306
 #: libraries/operations.lib.php:801 libraries/operations.lib.php:874
 #: libraries/operations.lib.php:923 libraries/operations.lib.php:1337
 #: libraries/operations.lib.php:1658
-#: libraries/plugins/auth/AuthenticationCookie.class.php:244
+#: libraries/plugins/auth/AuthenticationCookie.class.php:232
 #: libraries/replication_gui.lib.php:122 libraries/replication_gui.lib.php:161
 #: libraries/replication_gui.lib.php:324 libraries/replication_gui.lib.php:461
 #: libraries/replication_gui.lib.php:906 libraries/rte/rte_events.lib.php:509
-#: libraries/rte/rte_routines.lib.php:969
-#: libraries/rte/rte_routines.lib.php:1581
+#: libraries/rte/rte_routines.lib.php:1060
+#: libraries/rte/rte_routines.lib.php:1672
 #: libraries/rte/rte_triggers.lib.php:396 libraries/server_bin_log.lib.php:61
 #: libraries/server_privileges.lib.php:705
 #: libraries/server_privileges.lib.php:2106
 #: libraries/server_privileges.lib.php:2872
 #: libraries/server_privileges.lib.php:3553
-#: libraries/server_privileges.lib.php:4627
+#: libraries/server_privileges.lib.php:4653
 #: libraries/server_user_groups.lib.php:285
 #: libraries/sql_query_form.lib.php:369 libraries/sql_query_form.lib.php:429
 #: libraries/tracking.lib.php:533 libraries/tracking.lib.php:653
 #: prefs_manage.php:277 prefs_manage.php:355
 #: templates/columns_definitions/column_definitions_form.phtml:59
-#: templates/header_location.phtml:17 templates/index_form.phtml:238
+#: templates/database/create_table.phtml:21 templates/header_location.phtml:28
 #: templates/startAndNumberOfRowsPanel.phtml:14
-#: templates/structure/add_column.phtml:25
-#: templates/table/create_table.phtml:21
-#: templates/table/selection_form.phtml:75 view_create.php:275
+#: templates/table/index_form.phtml:238
+#: templates/table/search/selection_form.phtml:75
+#: templates/table/structure/add_column.phtml:25 view_create.php:275
 #: view_operations.php:106
 msgid "Go"
 msgstr "Siirry"
@@ -685,7 +687,7 @@ msgstr "Tiedoston merkistöä ei voida muuttaa ilman merkistönmuuntokirjastoa!"
 msgid "Could not load import plugins, please check your installation!"
 msgstr "Tuontiin tarvittavaa lisäosaa ei voida tuoda, tarkista asetukset!"
 
-#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1466
+#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1460
 #, php-format
 msgid "Bookmark %s has been created."
 msgstr "Kirjanmerkki %s on nyt luotu."
@@ -696,7 +698,7 @@ msgid "Import has been successfully finished, %d queries executed."
 msgstr "Tuonti onnistui, %d kyselyä suoritettu."
 
 #: import.php:713
-#, fuzzy, php-format
+#, php-format
 #| msgid ""
 #| "Script timeout passed, if you want to finish import, please resubmit same "
 #| "file and import will resume."
@@ -704,8 +706,8 @@ msgid ""
 "Script timeout passed, if you want to finish import, please %sresubmit the "
 "same file%s and import will resume."
 msgstr ""
-"Skriptin suoritus aikakatkaistiin. Jos haluat suorittaa tuonnin loppuun, "
-"lähetä sama tiedosto uudestaan, ja tuonti jatkuu."
+"Skriptin suoritus aikakatkaistiin. Jos haluat suorittaa tuonnin loppuun, %"
+"slähetä sama tiedosto uudestaan%s, ja tuonti jatkuu."
 
 #: import.php:723
 msgid ""
@@ -718,7 +720,7 @@ msgstr ""
 
 #: import_status.php:103
 msgid "Could not load the progress of the import."
-msgstr ""
+msgstr "Tuonnin tilaa ei voitu ladata."
 
 #: import_status.php:112 js/messages.php:378 libraries/Util.class.php:776
 #: libraries/export.lib.php:515
@@ -727,11 +729,11 @@ msgstr ""
 msgid "Back"
 msgstr "Takaisin"
 
-#: index.php:148 libraries/Footer.class.php:70
+#: index.php:149 libraries/Footer.class.php:70
 msgid "phpMyAdmin Demo Server"
 msgstr "phpMyAdminin demo-palvelin"
 
-#: index.php:152
+#: index.php:153
 #, php-format
 msgid ""
 "You are using the demo server. You can do anything here, but please do not "
@@ -742,113 +744,111 @@ msgstr ""
 "root-käyttäjää, debian-sys-maint ja pma-käyttäjiä. Lisätietoja saatavilla "
 "linkissä%s."
 
-#: index.php:162
+#: index.php:163
 msgid "General Settings"
 msgstr "Yleiset asetukset"
 
-#: index.php:190 libraries/display_change_password.lib.php:50
+#: index.php:191 libraries/display_change_password.lib.php:50
 #: libraries/display_change_password.lib.php:53 user_password.php:247
 msgid "Change password"
 msgstr "Vaihda salasana"
 
-#: index.php:206
+#: index.php:207
 msgid "Server connection collation"
 msgstr "Palvelinyhteyden aakkosjärjestys"
 
-#: index.php:228
+#: index.php:229
 msgid "Appearance Settings"
 msgstr "Ulkoasuasetukset"
 
-#: index.php:258 prefs_manage.php:285
+#: index.php:259 prefs_manage.php:285
 msgid "More settings"
 msgstr "Lisäasetukset"
 
-#: index.php:279
+#: index.php:280
 msgid "Database server"
 msgstr "Tietokantapalvelin"
 
-#: index.php:282 libraries/plugins/auth/AuthenticationCookie.class.php:181
+#: index.php:283 libraries/plugins/auth/AuthenticationCookie.class.php:169
 msgid "Server:"
 msgstr "Palvelin:"
 
-#: index.php:286
+#: index.php:287
 msgid "Server type:"
 msgstr "Palvelintyyppi:"
 
-#: index.php:290 libraries/plugins/export/ExportLatex.class.php:212
+#: index.php:291 libraries/plugins/export/ExportLatex.class.php:212
 #: libraries/plugins/export/ExportSql.class.php:687
 #: libraries/plugins/export/ExportXml.class.php:189
 msgid "Server version:"
 msgstr "Palvelimen versio:"
 
-#: index.php:296
+#: index.php:297
 msgid "Protocol version:"
 msgstr "Protokollan versio:"
 
-#: index.php:300
+#: index.php:301
 msgid "User:"
 msgstr "Käyttäjä:"
 
-#: index.php:305
+#: index.php:306
 msgid "Server charset:"
 msgstr "Palvelimen merkistö:"
 
-#: index.php:320
+#: index.php:321
 msgid "Web server"
 msgstr "Verkkopalvelin"
 
-#: index.php:331
+#: index.php:332
 msgid "Database client version:"
 msgstr "Tietokannan asiakasohjelman versio:"
 
-#: index.php:335
+#: index.php:336
 msgid "PHP extension:"
 msgstr "PHP-laajennus:"
 
-#: index.php:349
-#, fuzzy
+#: index.php:350
 #| msgid "PHP Version"
 msgid "PHP version:"
-msgstr "PHP:n versio"
+msgstr "PHP:n versio:"
 
-#: index.php:360
+#: index.php:361
 msgid "Show PHP information"
 msgstr "Näytä PHP:n asetustiedot"
 
-#: index.php:383
+#: index.php:384
 msgid "Version information:"
 msgstr "Versiotiedot:"
 
-#: index.php:392 libraries/Util.class.php:432 libraries/Util.class.php:495
-#: libraries/config/FormDisplay.tpl.php:151
+#: index.php:393 libraries/Util.class.php:432 libraries/Util.class.php:495
+#: libraries/config/FormDisplay.tpl.php:162
 #: libraries/display_export.lib.php:577 libraries/engines/pbxt.lib.php:162
 #: libraries/navigation/NavigationHeader.class.php:196
 #: libraries/server_variables.lib.php:160
 msgid "Documentation"
 msgstr "Ohjeet"
 
-#: index.php:399
+#: index.php:400
 msgid "Wiki"
 msgstr "Wiki"
 
-#: index.php:408
+#: index.php:409
 msgid "Official Homepage"
 msgstr "phpMyAdminin kotisivut"
 
-#: index.php:415
+#: index.php:416
 msgid "Contribute"
 msgstr "Osallistu"
 
-#: index.php:422
+#: index.php:423
 msgid "Get support"
 msgstr "Hanki tukea"
 
-#: index.php:429
+#: index.php:430
 msgid "List of changes"
 msgstr "Muutoslista"
 
-#: index.php:451
-#, fuzzy
+#: index.php:452
 #| msgid ""
 #| "Your configuration file contains settings (root with no password) that "
 #| "correspond to the default MySQL privileged account. Your MySQL server is "
@@ -860,12 +860,12 @@ msgid ""
 "default, is open to intrusion, and you really should fix this security hole "
 "by setting a password for user 'root'."
 msgstr ""
-"Asetustiedostossa on MySQL-palvelimen oletuskäyttäjään viittavia asetuksia "
-"(root ilman salasanaa). Tällaisin asetuksin MySQL-palvelin on altis "
+"Asetustiedostossa on MySQL-palvelimen oletuskäyttäjään viittavia asetuksia ("
+"root ilman salasanaa). Tällaisin asetuksin MySQL-palvelin on altis "
 "hyökkäyksille, joten tämä tietoturvariski on syytä korjata pikimmiten, "
 "asettamalla root-käyttäjälle salasana."
 
-#: index.php:468
+#: index.php:469
 msgid ""
 "You have enabled mbstring.func_overload in your PHP configuration. This "
 "option is incompatible with phpMyAdmin and might cause some data to be "
@@ -875,7 +875,7 @@ msgstr ""
 "valinta ei sovi yhteen phpMyAdminin kanssa ja saattaa johtaa tietojen "
 "katoamiseen!"
 
-#: index.php:483
+#: index.php:484
 msgid ""
 "The mbstring PHP extension was not found and you seem to be using a "
 "multibyte charset. Without the mbstring extension phpMyAdmin is unable to "
@@ -885,7 +885,7 @@ msgstr ""
 "olevan käytössä. Ilman mbstring-laajennusta phpMyAdmin ei osaa jaotella "
 "merkkijonoja oikein, ja tästä saattaa koitua odottamattomia seurauksia."
 
-#: index.php:500
+#: index.php:501
 #, fuzzy
 #| msgid ""
 #| "Your PHP parameter [a@http://php.net/manual/en/session.configuration."
@@ -903,7 +903,7 @@ msgstr ""
 "phpMyAdminissa määritetty evästekelpoisuus. Siksi kirjautumisesi erääntyy "
 "nopeammin kuin phpMyAdminissa on määritetty."
 
-#: index.php:519
+#: index.php:520
 msgid ""
 "Login cookie store is lower than cookie validity configured in phpMyAdmin, "
 "because of this, your login will expire sooner than configured in phpMyAdmin."
@@ -911,11 +911,11 @@ msgstr ""
 "Kirjautumistunnuksesi vanhenee nopeammin kuin phpMyAdminissa määritetty. "
 "Siksi kirjautumisesi erääntyy nopeammin kuin phpMyAdminissa on määritetty."
 
-#: index.php:535
+#: index.php:536
 msgid "The configuration file now needs a secret passphrase (blowfish_secret)."
 msgstr "Asetustiedosto vaatii nyt salalausetta (blowfish_secret)."
 
-#: index.php:548
+#: index.php:549
 msgid ""
 "Directory [code]config[/code], which is used by the setup script, still "
 "exists in your phpMyAdmin directory. It is strongly recommended to remove it "
@@ -927,7 +927,7 @@ msgstr ""
 "asetukset on määritetty. Muuten palvelimen turvallisuus saattaa vaarantua "
 "luvattoman asetuksien lataamisen takia."
 
-#: index.php:564
+#: index.php:565
 #, php-format
 msgid ""
 "The phpMyAdmin configuration storage is not completely configured, some "
@@ -937,14 +937,14 @@ msgstr ""
 "tauluihin liittyvät lisäominaisuudet eivät ole käytössä. Katso miksi "
 "%slisätietoja%s. "
 
-#: index.php:571
+#: index.php:572
 msgid ""
 "Or alternately go to 'Operations' tab of any database to set it up there."
 msgstr ""
 "Vaihtoehtoisesti, navigoi minkä tahansa tietokannan \"Toiminnot\" - "
 "välilehdelle."
 
-#: index.php:620
+#: index.php:621
 #, php-format
 msgid ""
 "Your PHP MySQL library version %s differs from your MySQL server version %s. "
@@ -953,7 +953,7 @@ msgstr ""
 "PHP:n MySQL-kirjaston versio %s poikkeaa MySQL-palvelimen versiosta %s. "
 "Tästä voi koitua arvaamattomia seurauksia."
 
-#: index.php:648
+#: index.php:649
 #, php-format
 msgid ""
 "Server running with Suhosin. Please refer to %sdocumentation%s for possible "
@@ -1106,8 +1106,8 @@ msgstr ""
 msgid "Save & Close"
 msgstr "Tallenna & sulje"
 
-#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:404
-#: libraries/insert_edit.lib.php:1550 prefs_manage.php:361
+#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:415
+#: libraries/insert_edit.lib.php:1548 prefs_manage.php:361
 #: prefs_manage.php:372
 msgid "Reset"
 msgstr "Palauta"
@@ -1140,7 +1140,7 @@ msgstr "Lisää indeksi"
 msgid "Edit Index"
 msgstr "Muokkaa indeksiä"
 
-#: js/messages.php:99 templates/index_form.phtml:232
+#: js/messages.php:99 templates/table/index_form.phtml:232
 #, php-format
 msgid "Add %s column(s) to index"
 msgstr "Lisää indeksiin %s kolumni(a)"
@@ -1161,15 +1161,16 @@ msgstr "Yhdistä:"
 msgid "Please select column(s) for the index."
 msgstr "Ole hyvä ja valitse sarakkeet avainta varten."
 
-#: js/messages.php:106 templates/structure/add_column.phtml:1
+#: js/messages.php:106 templates/table/structure/add_column.phtml:1
 msgid "You have to add at least one column."
 msgstr "Sinun tulee lisätä vähintään yksi sarake."
 
-#: js/messages.php:109 libraries/insert_edit.lib.php:1548
+#: js/messages.php:109 libraries/insert_edit.lib.php:1546
 #: templates/columns_definitions/column_definitions_form.phtml:162
-#: templates/index_form.phtml:237 templates/tbl_relation/common_form.phtml:106
+#: templates/table/index_form.phtml:237
+#: templates/table/relation/common_form.phtml:106
 msgid "Preview SQL"
-msgstr "Esikatsele SQL."
+msgstr "Esikatsele SQL"
 
 #: js/messages.php:112
 msgid "Simulate query"
@@ -1184,7 +1185,7 @@ msgid "SQL query:"
 msgstr "SQL-kysely:"
 
 #. l10n: Default label for the y-Axis of Charts
-#: js/messages.php:118 templates/tbl_chart.phtml:109
+#: js/messages.php:118 templates/table/chart/tbl_chart.phtml:109
 msgid "Y Values"
 msgstr "Y Arvot"
 
@@ -1345,7 +1346,7 @@ msgstr "Tavua lähetetty"
 msgid "Bytes received"
 msgstr "Tavua vastaanotettu"
 
-#: js/messages.php:169 libraries/server_status.lib.php:226
+#: js/messages.php:169 libraries/server_status.lib.php:235
 msgid "Connections"
 msgstr "Yhteydet"
 
@@ -1402,12 +1403,12 @@ msgstr "%d taulu(a)"
 msgid "Questions"
 msgstr "Kysymykset"
 
-#: js/messages.php:184 libraries/server_status.lib.php:134
+#: js/messages.php:184 libraries/server_status.lib.php:143
 msgid "Traffic"
 msgstr "Liikenne"
 
 #: js/messages.php:185 libraries/Menu.class.php:586
-#: libraries/Util.class.php:4318 libraries/server_status_monitor.lib.php:257
+#: libraries/Util.class.php:4324 libraries/server_status_monitor.lib.php:257
 msgid "Settings"
 msgstr "Asetukset"
 
@@ -1427,8 +1428,9 @@ msgstr "Lisää sarjaan vähintään yksi muuttuja!"
 #: libraries/server_status_monitor.lib.php:236
 #: libraries/server_status_processes.lib.php:308
 #: templates/columns_definitions/transformation.phtml:4
-#: templates/designer/options_panel.phtml:178
-#: templates/table/options_zoom.phtml:12 templates/table/rows_zoom.phtml:26
+#: templates/database/designer/options_panel.phtml:178
+#: templates/table/search/options_zoom.phtml:12
+#: templates/table/search/rows_zoom.phtml:26
 msgid "None"
 msgstr "Ei mitään"
 
@@ -1717,8 +1719,8 @@ msgstr ""
 
 #: js/messages.php:270 libraries/Menu.class.php:352
 #: libraries/Menu.class.php:455 libraries/Menu.class.php:582
-#: libraries/Util.class.php:4317 libraries/Util.class.php:4332
-#: libraries/Util.class.php:4349 libraries/config/messages.inc.php:258
+#: libraries/Util.class.php:4323 libraries/Util.class.php:4338
+#: libraries/Util.class.php:4355 libraries/config/messages.inc.php:258
 #: libraries/display_import.lib.php:105
 #: libraries/server_status_monitor.lib.php:318 prefs_manage.php:238
 #: setup/frames/menu.inc.php:26
@@ -1778,13 +1780,13 @@ msgid "Formatting SQL..."
 msgstr ""
 
 #: js/messages.php:293 libraries/server_variables.lib.php:157
-#: templates/designer/aggregate_query_panel.phtml:63
-#: templates/designer/delete_relation_panel.phtml:28
-#: templates/designer/having_query_panel.phtml:117
-#: templates/designer/new_relation_panel.phtml:88
-#: templates/designer/options_panel.phtml:253
-#: templates/designer/rename_to_panel.phtml:45
-#: templates/designer/where_query_panel.phtml:83
+#: templates/database/designer/aggregate_query_panel.phtml:63
+#: templates/database/designer/delete_relation_panel.phtml:28
+#: templates/database/designer/having_query_panel.phtml:117
+#: templates/database/designer/new_relation_panel.phtml:88
+#: templates/database/designer/options_panel.phtml:253
+#: templates/database/designer/rename_to_panel.phtml:45
+#: templates/database/designer/where_query_panel.phtml:83
 msgid "Cancel"
 msgstr "Peruuta"
 
@@ -1794,7 +1796,7 @@ msgstr "Peruuta"
 msgid "Page-related settings"
 msgstr "Muuta asetuksia"
 
-#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:402
+#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:413
 msgid "Apply"
 msgstr "Käytä"
 
@@ -1831,8 +1833,8 @@ msgstr "Virhekoodi: %s"
 msgid "Error text: %s"
 msgstr "Virhekoodi: %s"
 
-#: js/messages.php:307 libraries/db_common.inc.php:68
-#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:450
+#: js/messages.php:307 libraries/db_common.inc.php:69
+#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:461
 msgid "No databases selected."
 msgstr "Yhtään tietokantaa ei ole valittu."
 
@@ -1844,12 +1846,13 @@ msgstr "Sarakkeen poisto"
 msgid "Adding Primary Key"
 msgstr "Pääavaimen lisäys"
 
-#: js/messages.php:310 templates/designer/aggregate_query_panel.phtml:59
-#: templates/designer/having_query_panel.phtml:113
-#: templates/designer/new_relation_panel.phtml:87
-#: templates/designer/options_panel.phtml:252
-#: templates/designer/rename_to_panel.phtml:41
-#: templates/designer/where_query_panel.phtml:82
+#: js/messages.php:310
+#: templates/database/designer/aggregate_query_panel.phtml:59
+#: templates/database/designer/having_query_panel.phtml:113
+#: templates/database/designer/new_relation_panel.phtml:87
+#: templates/database/designer/options_panel.phtml:252
+#: templates/database/designer/rename_to_panel.phtml:41
+#: templates/database/designer/where_query_panel.phtml:82
 msgid "OK"
 msgstr "OK"
 
@@ -1869,7 +1872,7 @@ msgstr "Tietokannan kopiointi"
 msgid "Changing Charset"
 msgstr "Merkistökoodauksen vaihtaminen"
 
-#: js/messages.php:320 libraries/Util.class.php:3217
+#: js/messages.php:320 libraries/Util.class.php:3223
 #, fuzzy
 #| msgid "Disable foreign key checks"
 msgid "Enable foreign key checks"
@@ -1906,20 +1909,21 @@ msgstr "Tallennettavan funktion määritelmässä tulee olla RETURN-lause!"
 #: js/messages.php:334 libraries/DisplayResults.class.php:4834
 #: libraries/DisplayResults.class.php:5092 libraries/Menu.class.php:344
 #: libraries/Menu.class.php:446 libraries/Menu.class.php:578
-#: libraries/Util.class.php:3636 libraries/Util.class.php:3637
-#: libraries/Util.class.php:4316 libraries/Util.class.php:4331
-#: libraries/Util.class.php:4348 libraries/config/messages.inc.php:252
+#: libraries/Util.class.php:3642 libraries/Util.class.php:3643
+#: libraries/Util.class.php:4322 libraries/Util.class.php:4337
+#: libraries/Util.class.php:4354 libraries/config/messages.inc.php:252
 #: libraries/display_export.lib.php:173 libraries/rte/rte_list.lib.php:146
 #: libraries/server_privileges.lib.php:2211
 #: libraries/server_privileges.lib.php:2290
 #: libraries/server_privileges.lib.php:2632
 #: libraries/server_privileges.lib.php:3356
 #: libraries/server_status_monitor.lib.php:322 prefs_manage.php:303
-#: setup/frames/menu.inc.php:27 templates/structure/check_all_tables.phtml:11
+#: setup/frames/menu.inc.php:27
+#: templates/database/structure/check_all_tables.phtml:11
 msgid "Export"
 msgstr "Vienti"
 
-#: js/messages.php:337 libraries/rte/rte_routines.lib.php:652
+#: js/messages.php:337 libraries/rte/rte_routines.lib.php:743
 msgid "ENUM/SET editor"
 msgstr "ENUM/SET-muokkaus"
 
@@ -1959,7 +1963,7 @@ msgstr "Näytä kyselykenttä"
 #: libraries/Console.class.php:214 libraries/DisplayResults.class.php:3474
 #: libraries/DisplayResults.class.php:4818 libraries/Index.class.php:723
 #: libraries/Util.class.php:706 libraries/Util.class.php:1202
-#: libraries/Util.class.php:3634 libraries/Util.class.php:3635
+#: libraries/Util.class.php:3640 libraries/Util.class.php:3641
 #: libraries/central_columns.lib.php:851
 #: libraries/central_columns.lib.php:1193
 #: libraries/config/messages.inc.php:892
@@ -1977,7 +1981,7 @@ msgstr "Muokkaa"
 #: libraries/server_user_groups.lib.php:129
 #: libraries/sql_query_form.lib.php:416 libraries/tracking.lib.php:477
 #: setup/frames/index.inc.php:183 setup/frames/index.inc.php:291
-#: templates/designer/delete_relation_panel.phtml:27
+#: templates/database/designer/delete_relation_panel.phtml:27
 msgid "Delete"
 msgstr "Poista"
 
@@ -2150,11 +2154,11 @@ msgid "No dependencies selected!"
 msgstr "Yhtään riippuvuutta ei ole valittu!"
 
 #: js/messages.php:394 libraries/central_columns.lib.php:1214
-#: libraries/insert_edit.lib.php:1458 libraries/server_variables.lib.php:155
+#: libraries/insert_edit.lib.php:1456 libraries/server_variables.lib.php:155
 #: setup/frames/config.inc.php:42 setup/frames/index.inc.php:279
 #: templates/columns_definitions/column_definitions_form.phtml:165
-#: templates/gis_visualization/gis_visualization.phtml:48
-#: templates/tbl_relation/common_form.phtml:107
+#: templates/table/gis_visualization/gis_visualization.phtml:48
+#: templates/table/relation/common_form.phtml:107
 msgid "Save"
 msgstr "Tallenna"
 
@@ -2231,8 +2235,8 @@ msgid "Data point content"
 msgstr "Tietopisteen sisältö"
 
 #: js/messages.php:430 js/messages.php:562 js/messages.php:579
-#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2573
-#: templates/index_form.phtml:154 templates/index_form.phtml:194
+#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2571
+#: templates/table/index_form.phtml:154 templates/table/index_form.phtml:194
 msgid "Ignore"
 msgstr "Älä huomioi"
 
@@ -2291,8 +2295,8 @@ msgstr "Valitse liiteavain"
 msgid "Please select the primary key or a unique key!"
 msgstr "Valitse pää- tai uniikkiavain!"
 
-#: js/messages.php:457 templates/designer/side_menu.phtml:91
-#: templates/designer/side_menu.phtml:94
+#: js/messages.php:457 templates/database/designer/side_menu.phtml:91
+#: templates/database/designer/side_menu.phtml:94
 msgid "Choose column to display"
 msgstr "Valitse näytettävä sarake"
 
@@ -2308,20 +2312,20 @@ msgstr ""
 msgid "Page name"
 msgstr "Sivun nimi"
 
-#: js/messages.php:463 templates/designer/side_menu.phtml:56
-#: templates/designer/side_menu.phtml:59
+#: js/messages.php:463 templates/database/designer/side_menu.phtml:56
+#: templates/database/designer/side_menu.phtml:59
 msgid "Save page"
 msgstr "Tallenna sivu"
 
-#: js/messages.php:464 templates/designer/side_menu.phtml:63
-#: templates/designer/side_menu.phtml:66
+#: js/messages.php:464 templates/database/designer/side_menu.phtml:63
+#: templates/database/designer/side_menu.phtml:66
 #, fuzzy
 #| msgid "Save page"
 msgid "Save page as"
 msgstr "Tallenna sivu"
 
-#: js/messages.php:465 templates/designer/side_menu.phtml:49
-#: templates/designer/side_menu.phtml:52
+#: js/messages.php:465 templates/database/designer/side_menu.phtml:49
+#: templates/database/designer/side_menu.phtml:52
 msgid "Open page"
 msgstr "Avaa sivu"
 
@@ -2329,7 +2333,7 @@ msgstr "Avaa sivu"
 msgid "Delete page"
 msgstr "Poista sivu"
 
-#: js/messages.php:467 templates/designer/side_menu.phtml:10
+#: js/messages.php:467 templates/database/designer/side_menu.phtml:10
 msgid "Untitled"
 msgstr "Nimetön"
 
@@ -2454,7 +2458,7 @@ msgstr "Alkuperäinen merkkijono"
 msgid "cancel"
 msgstr "peruuta"
 
-#: js/messages.php:499 libraries/server_status.lib.php:271
+#: js/messages.php:499 libraries/server_status.lib.php:280
 msgid "Aborted"
 msgstr "Keskeytetty"
 
@@ -3065,7 +3069,7 @@ msgstr "Annathan kelvollisen porttinumeron!"
 
 #: js/messages.php:793 libraries/Message.class.php:199
 #: libraries/Util.class.php:654 libraries/core.lib.php:245
-#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1172
+#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1170
 #: tbl_operations.php:229 view_operations.php:63
 msgid "Error"
 msgstr "Virhe"
@@ -3128,8 +3132,8 @@ msgstr "sekunnissa"
 msgid "per minute"
 msgstr "minuutissa"
 
-#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:143
-#: libraries/server_status.lib.php:228
+#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:152
+#: libraries/server_status.lib.php:237
 #: libraries/server_status_queries.lib.php:98
 msgid "per hour"
 msgstr "tunnissa"
@@ -3149,7 +3153,7 @@ msgstr ""
 "Väärät pääsyasetukset asetustiedostolla, sen ei kuuluisi olla kaikkien "
 "kirjoitettavissa!"
 
-#: libraries/Config.class.php:1799
+#: libraries/Config.class.php:1801
 msgid "Font size"
 msgstr "Fonttikoko"
 
@@ -3177,10 +3181,10 @@ msgstr "Suorita hakulause uudelleen"
 #: libraries/server_privileges.lib.php:2890
 #: libraries/server_privileges.lib.php:3144
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4332
+#: libraries/server_privileges.lib.php:4358
 #: libraries/server_status_processes.lib.php:80
-#: templates/tbl_relation/foreign_key_row.phtml:165
-#: templates/tbl_relation/internal_relational_row.phtml:55
+#: templates/table/relation/foreign_key_row.phtml:165
+#: templates/table/relation/internal_relational_row.phtml:55
 msgid "Database"
 msgstr "Tietokanta"
 
@@ -3273,11 +3277,11 @@ msgstr "Historia"
 #: libraries/plugins/import/ImportMediawiki.class.php:60
 #: libraries/plugins/import/ImportOds.class.php:59
 #: libraries/plugins/import/ImportShp.class.php:57
-#: libraries/plugins/import/ImportSql.class.php:148
+#: libraries/plugins/import/ImportSql.class.php:51
 #: libraries/plugins/import/ImportXml.class.php:58
-#: libraries/rte/rte_routines.lib.php:833 templates/index_form.phtml:49
-#: templates/structure/row_stats_table.phtml:20
-#: templates/table/options.phtml:2
+#: libraries/rte/rte_routines.lib.php:924 templates/table/index_form.phtml:49
+#: templates/table/search/options.phtml:2
+#: templates/table/structure/row_stats_table.phtml:20
 msgid "Options"
 msgstr "Valinnat"
 
@@ -3318,7 +3322,8 @@ msgstr "Laskeva"
 msgid "Order:"
 msgstr "Toinen"
 
-#: libraries/Console.class.php:289 templates/table/replace_preview.phtml:17
+#: libraries/Console.class.php:289
+#: templates/table/search/replace_preview.phtml:17
 msgid "Count"
 msgstr "Laske"
 
@@ -3429,9 +3434,9 @@ msgstr "Siirry kopioituun tauluun"
 #: libraries/operations.lib.php:794 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:191
-#: templates/structure/sortable_header.phtml:21
-#: templates/structure/sortable_header.phtml:38
-#: templates/table/options.phtml:68
+#: templates/database/structure/sortable_header.phtml:21
+#: templates/database/structure/sortable_header.phtml:38
+#: templates/table/search/options.phtml:68
 msgid "Ascending"
 msgstr "Nouseva"
 
@@ -3441,13 +3446,14 @@ msgstr "Nouseva"
 #: libraries/operations.lib.php:797 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:188
-#: templates/structure/sortable_header.phtml:26
-#: templates/structure/sortable_header.phtml:43
-#: templates/table/options.phtml:69
+#: templates/database/structure/sortable_header.phtml:26
+#: templates/database/structure/sortable_header.phtml:43
+#: templates/table/search/options.phtml:69
 msgid "Descending"
 msgstr "Laskeva"
 
-#: libraries/DBQbe.class.php:467 templates/table/search_and_replace.phtml:6
+#: libraries/DBQbe.class.php:467
+#: templates/table/search/search_and_replace.phtml:6
 msgid "Column:"
 msgstr "Sarake:"
 
@@ -3607,12 +3613,12 @@ msgstr[0] "%1$s hakutulosta taulussa <strong>%2$s</strong>"
 msgstr[1] "%1$s hakutulosta taulussa <strong>%2$s</strong>"
 
 #: libraries/DbSearch.class.php:354 libraries/Menu.class.php:311
-#: libraries/Util.class.php:3337 libraries/Util.class.php:3347
-#: libraries/Util.class.php:3623 libraries/Util.class.php:3624
-#: libraries/Util.class.php:4343 libraries/config.values.php:43
+#: libraries/Util.class.php:3343 libraries/Util.class.php:3353
+#: libraries/Util.class.php:3629 libraries/Util.class.php:3630
+#: libraries/Util.class.php:4349 libraries/config.values.php:43
 #: libraries/config.values.php:51 libraries/config.values.php:119
 #: libraries/navigation/Nodes/Node_Table.class.php:295
-#: templates/structure/check_all_table_column.phtml:5
+#: templates/table/structure/check_all_table_column.phtml:5
 msgid "Browse"
 msgstr "Selaa"
 
@@ -3629,7 +3635,8 @@ msgstr "Hae tietokannasta"
 msgid "Words or values to search for (wildcard: \"%\"):"
 msgstr "Haettavat sanat tai arvot (jokerimerkki: \"%\"):"
 
-#: libraries/DbSearch.class.php:401 templates/table/search_and_replace.phtml:1
+#: libraries/DbSearch.class.php:401
+#: templates/table/search/search_and_replace.phtml:1
 msgid "Find:"
 msgstr "Hae:"
 
@@ -3673,28 +3680,28 @@ msgstr "Suodata rivejä"
 msgid "Search this table"
 msgstr "Hae tästä taulusta"
 
-#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2532
-#: libraries/Util.class.php:2535
+#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2538
+#: libraries/Util.class.php:2541
 msgctxt "First page"
 msgid "Begin"
 msgstr "Aloitus"
 
-#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2533
-#: libraries/Util.class.php:2536 libraries/server_bin_log.lib.php:170
+#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2539
+#: libraries/Util.class.php:2542 libraries/server_bin_log.lib.php:170
 #: libraries/server_bin_log.lib.php:172
 msgctxt "Previous page"
 msgid "Previous"
 msgstr "Edellinen sivu"
 
-#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2564
-#: libraries/Util.class.php:2574 libraries/server_bin_log.lib.php:204
+#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2570
+#: libraries/Util.class.php:2580 libraries/server_bin_log.lib.php:204
 #: libraries/server_bin_log.lib.php:206
 msgctxt "Next page"
 msgid "Next"
 msgstr "Seuraava sivu"
 
-#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2565
-#: libraries/Util.class.php:2575
+#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2571
+#: libraries/Util.class.php:2581
 msgctxt "Last page"
 msgid "End"
 msgstr "Viimeinen sivu"
@@ -3769,15 +3776,15 @@ msgid "May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]."
 msgstr "Saattaa olla likimääräinen. Katso [doc@faq3-11]FAQ 3.11[/doc]."
 
 #: libraries/DisplayResults.class.php:4332 libraries/Message.class.php:180
-#: libraries/controllers/TableRelationController.class.php:258
+#: libraries/controllers/TableRelationController.class.php:259
 #: libraries/controllers/TableSearchController.class.php:655
-#: libraries/rte/rte_routines.lib.php:1332 libraries/sql_query_form.lib.php:89
+#: libraries/rte/rte_routines.lib.php:1423 libraries/sql_query_form.lib.php:89
 #: tbl_operations.php:227 tbl_row_action.php:138 view_operations.php:62
 msgid "Your SQL query has been executed successfully."
 msgstr "SQL-kyselysi on suoritettu onnistuneesti."
 
 #: libraries/DisplayResults.class.php:4660
-#: libraries/controllers/StructureController.class.php:629
+#: libraries/controllers/DatabaseStructureController.class.php:564
 #, php-format
 msgid ""
 "This view has at least this number of rows. Please refer to %sdocumentation"
@@ -3801,33 +3808,33 @@ msgstr "%1$d kokonaisuudessaan, %2$d hakulauseessa"
 msgid "%d total"
 msgstr "%d tulos"
 
-#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1318
+#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1312
 #, php-format
 msgid "Query took %01.4f seconds."
 msgstr "Kysely kesti %01.4f sekuntia."
 
 #: libraries/DisplayResults.class.php:4807
-#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4767
-#: libraries/Util.class.php:4773 libraries/mult_submits.inc.php:50
-#: templates/structure/check_all_tables.phtml:2
-#: templates/structure/check_all_tables.phtml:9
+#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4773
+#: libraries/Util.class.php:4779 libraries/mult_submits.inc.php:50
+#: templates/database/structure/check_all_tables.phtml:2
+#: templates/database/structure/check_all_tables.phtml:9
 msgid "With selected:"
 msgstr "Valitut:"
 
 #: libraries/DisplayResults.class.php:4811
-#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4769
-#: libraries/Util.class.php:4770 libraries/server_privileges.lib.php:1174
+#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4775
+#: libraries/Util.class.php:4776 libraries/server_privileges.lib.php:1174
 #: libraries/server_privileges.lib.php:1175
 #: libraries/server_privileges.lib.php:1387
 #: libraries/server_user_groups.lib.php:231
-#: templates/structure/check_all_tables.phtml:3
-#: templates/structure/check_all_tables.phtml:4
+#: templates/database/structure/check_all_tables.phtml:3
+#: templates/database/structure/check_all_tables.phtml:4
 msgid "Check All"
 msgstr "Valitse kaikki"
 
 #: libraries/DisplayResults.class.php:4985 libraries/Header.class.php:383
-#: templates/structure/optional_action_links.phtml:1
-#: templates/structure/print_view_data_dictionary_link.phtml:3
+#: templates/database/structure/print_view_data_dictionary_link.phtml:3
+#: templates/table/structure/optional_action_links.phtml:1
 msgid "Print view"
 msgstr "Tulostusversio"
 
@@ -3835,7 +3842,8 @@ msgstr "Tulostusversio"
 msgid "Query results operations"
 msgstr "Kyselytulosten toimenpiteet"
 
-#: libraries/DisplayResults.class.php:5105 templates/tbl_chart.phtml:12
+#: libraries/DisplayResults.class.php:5105
+#: templates/table/chart/tbl_chart.phtml:12
 msgid "Display chart"
 msgstr "Näytä kaavio"
 
@@ -3931,7 +3939,7 @@ msgid "Click on the bar to scroll to top of page"
 msgstr "Palkin klikkaus vierittää sivun ylös"
 
 #: libraries/Header.class.php:749
-#: libraries/plugins/auth/AuthenticationCookie.class.php:152
+#: libraries/plugins/auth/AuthenticationCookie.class.php:140
 msgid "Javascript must be enabled past this point!"
 msgstr "JavaScriptin on oltava päällä tämän jälkeen!"
 
@@ -3953,11 +3961,11 @@ msgid "Keyname"
 msgstr "Avaimen nimi"
 
 #: libraries/Index.class.php:697
-#: libraries/controllers/StructureController.class.php:1962
-#: libraries/controllers/StructureController.class.php:1967
+#: libraries/controllers/TableStructureController.class.php:953
+#: libraries/controllers/TableStructureController.class.php:958
 #: libraries/tracking.lib.php:973
 #: templates/columns_definitions/column_indexes.phtml:11
-#: templates/structure/check_all_table_column.phtml:26
+#: templates/table/structure/check_all_table_column.phtml:26
 msgid "Unique"
 msgstr "Uniikki"
 
@@ -3976,16 +3984,17 @@ msgstr "Kardinaliteetti"
 #: libraries/server_collations.lib.php:35 libraries/tracking.lib.php:881
 #: libraries/tracking.lib.php:977
 #: templates/columns_definitions/table_fields_definitions.phtml:33
-#: templates/structure/row_stats_table.phtml:31
-#: templates/structure/table_header.phtml:55
-#: templates/structure/table_structure_header.phtml:7
-#: templates/table/table_header.phtml:8
+#: templates/database/structure/table_header.phtml:55
+#: templates/table/search/table_header.phtml:8
+#: templates/table/structure/row_stats_table.phtml:31
+#: templates/table/structure/table_structure_header.phtml:7
 msgid "Collation"
 msgstr "Aakkosjärjestys"
 
 #: libraries/Index.class.php:703 libraries/rte/rte_events.lib.php:496
-#: libraries/rte/rte_routines.lib.php:956 libraries/tracking.lib.php:885
-#: libraries/tracking.lib.php:979 templates/structure/table_header.phtml:84
+#: libraries/rte/rte_routines.lib.php:1047 libraries/tracking.lib.php:885
+#: libraries/tracking.lib.php:979
+#: templates/database/structure/table_header.phtml:84
 msgid "Comment"
 msgstr "Kommentti"
 
@@ -3998,15 +4007,15 @@ msgstr "Perusavain on poistettu."
 msgid "Index %s has been dropped."
 msgstr "Indeksi %s on poistettu."
 
-#: libraries/Index.class.php:757 libraries/Util.class.php:3630
-#: libraries/Util.class.php:3631
-#: libraries/controllers/StructureController.class.php:1958
-#: libraries/controllers/StructureController.class.php:1959
+#: libraries/Index.class.php:757 libraries/Util.class.php:3636
+#: libraries/Util.class.php:3637
+#: libraries/controllers/TableStructureController.class.php:949
+#: libraries/controllers/TableStructureController.class.php:950
 #: libraries/operations.lib.php:1607 libraries/rte/rte_list.lib.php:150
 #: libraries/server_databases.lib.php:146
-#: templates/structure/check_all_table_column.phtml:15
-#: templates/structure/check_all_tables.phtml:16
-#: templates/tbl_relation/foreign_key_row.phtml:93
+#: templates/database/structure/check_all_tables.phtml:16
+#: templates/table/relation/foreign_key_row.phtml:93
+#: templates/table/structure/check_all_table_column.phtml:15
 msgid "Drop"
 msgstr "Tuhoa"
 
@@ -4037,16 +4046,16 @@ msgstr "Palvelin"
 #: libraries/Menu.class.php:248
 #: libraries/navigation/Nodes/Node_View.class.php:32
 #: libraries/tbl_info.inc.php:63
-#: templates/structure/structure_table_row.phtml:97
-#: templates/structure/structure_table_row.phtml:159
+#: templates/database/structure/structure_table_row.phtml:97
+#: templates/database/structure/structure_table_row.phtml:159
 msgid "View"
 msgstr "Näkymä"
 
 #: libraries/Menu.class.php:325 libraries/Menu.class.php:429
-#: libraries/Menu.class.php:548 libraries/Util.class.php:3334
-#: libraries/Util.class.php:3344 libraries/Util.class.php:3350
-#: libraries/Util.class.php:4313 libraries/Util.class.php:4328
-#: libraries/Util.class.php:4345 libraries/config.values.php:40
+#: libraries/Menu.class.php:548 libraries/Util.class.php:3340
+#: libraries/Util.class.php:3350 libraries/Util.class.php:3356
+#: libraries/Util.class.php:4319 libraries/Util.class.php:4334
+#: libraries/Util.class.php:4351 libraries/config.values.php:40
 #: libraries/config.values.php:48 libraries/config.values.php:110
 #: libraries/config.values.php:116 libraries/config/messages.inc.php:321
 #: libraries/navigation/Nodes/Node_Table.class.php:292
@@ -4054,19 +4063,19 @@ msgid "SQL"
 msgstr "SQL"
 
 #: libraries/Menu.class.php:328 libraries/Menu.class.php:432
-#: libraries/Util.class.php:3335 libraries/Util.class.php:3345
-#: libraries/Util.class.php:3351 libraries/Util.class.php:3625
-#: libraries/Util.class.php:3626 libraries/Util.class.php:4329
-#: libraries/Util.class.php:4346 libraries/config.values.php:41
+#: libraries/Util.class.php:3341 libraries/Util.class.php:3351
+#: libraries/Util.class.php:3357 libraries/Util.class.php:3631
+#: libraries/Util.class.php:3632 libraries/Util.class.php:4335
+#: libraries/Util.class.php:4352 libraries/config.values.php:41
 #: libraries/config.values.php:49 libraries/config.values.php:111
 #: libraries/config.values.php:117
 #: libraries/navigation/Nodes/Node_Table.class.php:286
 msgid "Search"
 msgstr "Etsi"
 
-#: libraries/Menu.class.php:338 libraries/Util.class.php:3336
-#: libraries/Util.class.php:3346 libraries/Util.class.php:3627
-#: libraries/Util.class.php:3628 libraries/Util.class.php:4347
+#: libraries/Menu.class.php:338 libraries/Util.class.php:3342
+#: libraries/Util.class.php:3352 libraries/Util.class.php:3633
+#: libraries/Util.class.php:3634 libraries/Util.class.php:4353
 #: libraries/config.values.php:42 libraries/config.values.php:50
 #: libraries/config.values.php:118
 #: libraries/navigation/Nodes/Node_Table.class.php:289
@@ -4075,30 +4084,30 @@ msgid "Insert"
 msgstr "Lisää rivi"
 
 #: libraries/Menu.class.php:362 libraries/Menu.class.php:467
-#: libraries/Util.class.php:4334 libraries/Util.class.php:4350
+#: libraries/Util.class.php:4340 libraries/Util.class.php:4356
 #: libraries/config.values.php:106 libraries/server_common.lib.php:51
 #: libraries/server_privileges.lib.php:2370
 #: libraries/server_privileges.lib.php:3158
-#: libraries/server_privileges.lib.php:4221
+#: libraries/server_privileges.lib.php:4247
 msgid "Privileges"
 msgstr "Käyttöoikeudet"
 
 #: libraries/Menu.class.php:371 libraries/Menu.class.php:379
-#: libraries/Menu.class.php:459 libraries/Util.class.php:3338
-#: libraries/Util.class.php:3352 libraries/Util.class.php:4333
-#: libraries/Util.class.php:4351 libraries/config.values.php:112
+#: libraries/Menu.class.php:459 libraries/Util.class.php:3344
+#: libraries/Util.class.php:3358 libraries/Util.class.php:4339
+#: libraries/Util.class.php:4357 libraries/config.values.php:112
 #: view_operations.php:92
 msgid "Operations"
 msgstr "Toiminnot"
 
 #: libraries/Menu.class.php:384 libraries/Menu.class.php:492
-#: libraries/Util.class.php:4338 libraries/Util.class.php:4352
+#: libraries/Util.class.php:4344 libraries/Util.class.php:4358
 #: libraries/relation.lib.php:255
 msgid "Tracking"
 msgstr "Seuranta"
 
 #: libraries/Menu.class.php:397 libraries/Menu.class.php:486
-#: libraries/Util.class.php:4337 libraries/Util.class.php:4353
+#: libraries/Util.class.php:4343 libraries/Util.class.php:4359
 #: libraries/navigation/Nodes/Node_Trigger_Container.class.php:24
 #: libraries/plugins/export/ExportHtmlword.class.php:557
 #: libraries/plugins/export/ExportOdt.class.php:685
@@ -4115,16 +4124,16 @@ msgstr "Herättimet"
 msgid "Database seems to be empty!"
 msgstr "Tietokanta on tyhjä!"
 
-#: libraries/Menu.class.php:439 libraries/Util.class.php:4330
+#: libraries/Menu.class.php:439 libraries/Util.class.php:4336
 msgid "Query"
 msgstr "Haku"
 
-#: libraries/Menu.class.php:472 libraries/Util.class.php:4335
+#: libraries/Menu.class.php:472 libraries/Util.class.php:4341
 #: libraries/rte/rte_words.lib.php:36
 msgid "Routines"
 msgstr "Rutiinit"
 
-#: libraries/Menu.class.php:479 libraries/Util.class.php:4336
+#: libraries/Menu.class.php:479 libraries/Util.class.php:4342
 #: libraries/navigation/Nodes/Node_Event_Container.class.php:26
 #: libraries/plugins/export/ExportSql.class.php:940
 #: libraries/plugins/export/ExportXml.class.php:107
@@ -4132,20 +4141,20 @@ msgstr "Rutiinit"
 msgid "Events"
 msgstr "Tapahtumat"
 
-#: libraries/Menu.class.php:498 libraries/Util.class.php:4339
+#: libraries/Menu.class.php:498 libraries/Util.class.php:4345
 msgid "Designer"
 msgstr "Suunnittelija"
 
-#: libraries/Menu.class.php:507 libraries/Util.class.php:4340
-#: templates/structure/check_all_tables.phtml:35
+#: libraries/Menu.class.php:507 libraries/Util.class.php:4346
+#: templates/database/structure/check_all_tables.phtml:35
 msgid "Central columns"
 msgstr "Keskisarakkeet"
 
-#: libraries/Menu.class.php:544 libraries/Util.class.php:4312
+#: libraries/Menu.class.php:544 libraries/Util.class.php:4318
 #: libraries/config.values.php:103 libraries/config/messages.inc.php:266
 #: libraries/config/messages.inc.php:341
 #: libraries/navigation/NavigationTree.class.php:1239
-#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4332
+#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4358
 msgid "Databases"
 msgstr "Tietokannat"
 
@@ -4156,34 +4165,34 @@ msgid "User accounts"
 msgstr "Käyttäjät"
 
 #: libraries/Menu.class.php:595 libraries/ServerStatusData.class.php:121
-#: libraries/Util.class.php:4319 libraries/server_common.lib.php:36
+#: libraries/Util.class.php:4325 libraries/server_common.lib.php:36
 msgid "Binary log"
 msgstr "Binääriloki"
 
 #: libraries/Menu.class.php:601 libraries/ServerStatusData.class.php:126
-#: libraries/Util.class.php:4320 libraries/server_common.lib.php:42
-#: templates/structure/body_for_table_summary.phtml:10
-#: templates/structure/table_header.phtml:27
+#: libraries/Util.class.php:4326 libraries/server_common.lib.php:42
+#: templates/database/structure/body_for_table_summary.phtml:10
+#: templates/database/structure/table_header.phtml:27
 msgid "Replication"
 msgstr "Kahdennus"
 
 #: libraries/Menu.class.php:606 libraries/ServerStatusData.class.php:193
-#: libraries/Util.class.php:4321 libraries/config.values.php:105
+#: libraries/Util.class.php:4327 libraries/config.values.php:105
 #: libraries/server_engines.lib.php:108 libraries/server_engines.lib.php:112
 #: libraries/sql_query_form.lib.php:421
 msgid "Variables"
 msgstr "Muuttujat"
 
-#: libraries/Menu.class.php:610 libraries/Util.class.php:4322
+#: libraries/Menu.class.php:610 libraries/Util.class.php:4328
 msgid "Charsets"
 msgstr "Merkistöt"
 
-#: libraries/Menu.class.php:615 libraries/Util.class.php:4323
+#: libraries/Menu.class.php:615 libraries/Util.class.php:4329
 #: libraries/server_common.lib.php:33 libraries/server_plugins.lib.php:27
 msgid "Plugins"
 msgstr "Liitännäiset"
 
-#: libraries/Menu.class.php:626 libraries/Util.class.php:4324
+#: libraries/Menu.class.php:626 libraries/Util.class.php:4330
 msgid "Engines"
 msgstr "Moottorit"
 
@@ -4208,7 +4217,7 @@ msgid_plural "%1$d rows inserted."
 msgstr[0] "%1$d rivi lisätty."
 msgstr[1] "%1$d riviä lisätty."
 
-#: libraries/PDF.class.php:70 libraries/Util.class.php:2521
+#: libraries/PDF.class.php:70 libraries/Util.class.php:2527
 #: libraries/browse_foreigners.lib.php:327
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:865
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:890
@@ -4229,7 +4238,7 @@ msgid "Could not save favorite table!"
 msgstr "Suosikkitaulua ei voida tallentaa!"
 
 #: libraries/RecentFavoriteTable.class.php:212
-#: templates/structure/favorite_anchor.phtml:12
+#: templates/database/structure/favorite_anchor.phtml:12
 msgid "Remove from Favorites"
 msgstr "Poista suosikeista"
 
@@ -4395,7 +4404,7 @@ msgstr ""
 "Tämän tallennusmoottorin tilasta ei ole saatavilla yksityiskohtaisia tietoja."
 
 #: libraries/StorageEngine.class.php:373
-#: templates/structure/body_for_table_summary.phtml:50
+#: templates/database/structure/body_for_table_summary.phtml:50
 #, php-format
 msgid "%s is the default storage engine on this MySQL server."
 msgstr "%s on tämän MySQL-palvelimen oletustallennusmoottori."
@@ -4871,10 +4880,10 @@ msgstr ""
 
 #: libraries/Util.class.php:726 libraries/rte/rte_events.lib.php:110
 #: libraries/rte/rte_events.lib.php:119 libraries/rte/rte_events.lib.php:150
-#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:153
-#: libraries/rte/rte_routines.lib.php:162
-#: libraries/rte/rte_routines.lib.php:235
-#: libraries/rte/rte_routines.lib.php:1366
+#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:223
+#: libraries/rte/rte_routines.lib.php:250
+#: libraries/rte/rte_routines.lib.php:372
+#: libraries/rte/rte_routines.lib.php:1457
 #: libraries/rte/rte_triggers.lib.php:86 libraries/rte/rte_triggers.lib.php:95
 #: libraries/rte/rte_triggers.lib.php:127
 msgid "MySQL said: "
@@ -4920,75 +4929,78 @@ msgstr "Su"
 msgid "%B %d, %Y at %I:%M %p"
 msgstr "%d.%m.%Y klo %H:%M"
 
-#: libraries/Util.class.php:2019
+#: libraries/Util.class.php:2025
 #, php-format
 msgid "%s days, %s hours, %s minutes and %s seconds"
 msgstr "%s päivää, %s tuntia, %s minuuttia ja %s sekuntia"
 
-#: libraries/Util.class.php:2112
+#: libraries/Util.class.php:2118
 msgid "Missing parameter:"
 msgstr "Puuttuva parametri:"
 
-#: libraries/Util.class.php:2645
+#: libraries/Util.class.php:2651
 #, php-format
 msgid "Jump to database \"%s\"."
 msgstr "Siirry tietokantaan \"%s\"."
 
-#: libraries/Util.class.php:2670
+#: libraries/Util.class.php:2676
 #, php-format
 msgid "The %s functionality is affected by a known bug, see %s"
 msgstr "Toimintoon %s vaikuttaa tunnettu vika, katso %s"
 
-#: libraries/Util.class.php:2881
+#: libraries/Util.class.php:2887
 msgid "Click to toggle"
 msgstr "Vaihda painamalla"
 
-#: libraries/Util.class.php:3542 prefs_manage.php:248
+#: libraries/Util.class.php:3548 prefs_manage.php:248
 msgid "Browse your computer:"
 msgstr "Selaa tietokonettasi:"
 
-#: libraries/Util.class.php:3567
+#: libraries/Util.class.php:3573
 #, php-format
 msgid "Select from the web server upload directory <b>%s</b>:"
 msgstr "Valitse verkkopalvelimen lähetyskansiosta <b>%s</b>:"
 
-#: libraries/Util.class.php:3596 libraries/insert_edit.lib.php:1173
+#: libraries/Util.class.php:3602 libraries/insert_edit.lib.php:1171
 msgid "The directory you set for upload work cannot be reached."
 msgstr "Tiedostojen lähetykseen valittua hakemistoa ei voida käyttää."
 
-#: libraries/Util.class.php:3607
+#: libraries/Util.class.php:3613
 msgid "There are no files to upload!"
 msgstr "Palvelimelle ladattavia tiedostoja ei ole!"
 
-#: libraries/Util.class.php:3632 libraries/Util.class.php:3633
-#: templates/structure/check_all_tables.phtml:15
+#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: templates/database/structure/check_all_tables.phtml:15
 msgid "Empty"
 msgstr "Tyhjennä"
 
-#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: libraries/Util.class.php:3644 libraries/Util.class.php:3645
 msgid "Execute"
 msgstr "Suorita"
 
-#: libraries/Util.class.php:4152
+#: libraries/Util.class.php:4158
 msgid "Print"
 msgstr "Tulosta"
 
-#: libraries/Util.class.php:4257 templates/structure/row_stats_table.phtml:80
-#: templates/structure/table_header.phtml:95
+#: libraries/Util.class.php:4263
+#: templates/database/structure/table_header.phtml:95
+#: templates/table/structure/row_stats_table.phtml:80
 msgid "Creation"
 msgstr "Luotu"
 
-#: libraries/Util.class.php:4263 templates/structure/row_stats_table.phtml:87
-#: templates/structure/table_header.phtml:106
+#: libraries/Util.class.php:4269
+#: templates/database/structure/table_header.phtml:106
+#: templates/table/structure/row_stats_table.phtml:87
 msgid "Last update"
 msgstr "Viimeksi päivitetty"
 
-#: libraries/Util.class.php:4269 templates/structure/row_stats_table.phtml:94
-#: templates/structure/table_header.phtml:117
+#: libraries/Util.class.php:4275
+#: templates/database/structure/table_header.phtml:117
+#: templates/table/structure/row_stats_table.phtml:94
 msgid "Last check"
 msgstr "Viimeksi tarkistettu"
 
-#: libraries/Util.class.php:4315
+#: libraries/Util.class.php:4321
 msgid "Users"
 msgstr "Käyttäjät"
 
@@ -5009,16 +5021,16 @@ msgid "Use this value"
 msgstr "Käytä tätä arvoa"
 
 #: libraries/build_html_for_db.lib.php:33 libraries/import.lib.php:193
-#: templates/structure/actions_in_table_structure.phtml:113
-#: templates/structure/row_stats_table.phtml:42
-#: templates/structure/table_header.phtml:36
+#: templates/database/structure/table_header.phtml:36
+#: templates/table/structure/actions_in_table_structure.phtml:113
+#: templates/table/structure/row_stats_table.phtml:42
 msgid "Rows"
 msgstr "Kpl rivejä"
 
 #: libraries/build_html_for_db.lib.php:48 libraries/engines/innodb.lib.php:171
-#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:186
-#: libraries/server_status.lib.php:298
-#: templates/structure/display_table_stats.phtml:40
+#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:195
+#: libraries/server_status.lib.php:307
+#: templates/table/structure/display_table_stats.phtml:40
 msgid "Total"
 msgstr "Yhteensä"
 
@@ -5027,10 +5039,12 @@ msgid "Jump to database"
 msgstr "Siirry tietokantaan"
 
 #: libraries/build_html_for_db.lib.php:146
+#: templates/database/structure/structure_table_row.phtml:15
 msgid "Not replicated"
 msgstr "Ei kahdennettu"
 
 #: libraries/build_html_for_db.lib.php:158
+#: templates/database/structure/structure_table_row.phtml:16
 msgid "Replicated"
 msgstr "Kahdennettu"
 
@@ -5083,17 +5097,17 @@ msgstr ""
 #: libraries/plugins/export/ExportTexytext.class.php:425
 #: libraries/plugins/export/PMA_ExportPdf.class.php:307
 #: libraries/rte/rte_list.lib.php:73 libraries/rte/rte_list.lib.php:85
-#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:830
-#: libraries/rte/rte_routines.lib.php:1492 setup/frames/index.inc.php:162
+#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:921
+#: libraries/rte/rte_routines.lib.php:1583 setup/frames/index.inc.php:162
 #: templates/columns_definitions/table_fields_definitions.phtml:8
-#: templates/structure/table_structure_header.phtml:5
-#: templates/table/create_table.phtml:11
+#: templates/database/create_table.phtml:11
+#: templates/table/structure/table_structure_header.phtml:5
 msgid "Name"
 msgstr "Nimi"
 
 #: libraries/central_columns.lib.php:699
 #: libraries/central_columns.lib.php:1381
-#: libraries/rte/rte_routines.lib.php:832
+#: libraries/rte/rte_routines.lib.php:923
 #: templates/columns_definitions/table_fields_definitions.phtml:14
 msgid "Length/Values"
 msgstr "Pituus/Arvot*"
@@ -5114,7 +5128,7 @@ msgid "Select a table"
 msgstr "Valitse taulu"
 
 #: libraries/central_columns.lib.php:804
-#: templates/structure/add_column.phtml:4
+#: templates/table/structure/add_column.phtml:4
 msgid "Add column"
 msgstr "Lisää sarake"
 
@@ -5130,7 +5144,7 @@ msgstr "Lisää uusi sarake"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1002
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1025
 #: templates/columns_definitions/table_fields_definitions.phtml:36
-#: templates/structure/table_structure_header.phtml:8
+#: templates/table/structure/table_structure_header.phtml:8
 msgid "Attributes"
 msgstr "Attribuutit"
 
@@ -5242,7 +5256,7 @@ msgid "Double click"
 msgstr "Kaksoisnapsautus"
 
 #: libraries/config.values.php:95 libraries/config.values.php:124
-#: libraries/config/FormDisplay.tpl.php:221 libraries/relation.lib.php:97
+#: libraries/config/FormDisplay.tpl.php:232 libraries/relation.lib.php:97
 #: libraries/relation.lib.php:105
 msgid "Disabled"
 msgstr "Pois päältä"
@@ -5422,21 +5436,21 @@ msgstr "Pakattu vienti ei toimi, johtuu puuttuvasta funktioista %s."
 msgid "maximum %s"
 msgstr "Enintään %s"
 
-#: libraries/config/FormDisplay.tpl.php:219
+#: libraries/config/FormDisplay.tpl.php:230
 msgid "This setting is disabled, it will not be applied to your configuration."
 msgstr "Tämä asetus on poissa käytöstä; sitä ei käytetä asetusmäärittelyssäsi."
 
-#: libraries/config/FormDisplay.tpl.php:313
+#: libraries/config/FormDisplay.tpl.php:324
 #, php-format
 msgid "Set value: %s"
 msgstr "Aseta arvo: %s"
 
-#: libraries/config/FormDisplay.tpl.php:318
+#: libraries/config/FormDisplay.tpl.php:329
 #: libraries/config/messages.inc.php:610
 msgid "Restore default value"
 msgstr "Palauta oletusarvo"
 
-#: libraries/config/FormDisplay.tpl.php:332
+#: libraries/config/FormDisplay.tpl.php:343
 msgid "Allow users to customize this value"
 msgstr "Anna käyttäjien mukauttaa tätä arvoa"
 
@@ -6017,7 +6031,7 @@ msgstr "Tiedoston merkistö"
 
 #: libraries/config/messages.inc.php:136 libraries/config/messages.inc.php:152
 #: libraries/sql_query_form.lib.php:247
-#: templates/structure/row_stats_table.phtml:7
+#: templates/table/structure/row_stats_table.phtml:7
 msgid "Format"
 msgstr "Muoto"
 
@@ -6605,7 +6619,7 @@ msgstr ""
 
 #: libraries/config/messages.inc.php:332
 #: libraries/plugins/export/ExportPdf.class.php:279
-#: templates/structure/secondary_tabs.phtml:8
+#: templates/table/secondary_tabs.phtml:8
 msgid "Table structure"
 msgstr "Taulun rakenne"
 
@@ -8528,110 +8542,35 @@ msgstr "Microsoft Word 2000"
 msgid "OpenDocument Text"
 msgstr "OpenDocument teksti"
 
-#: libraries/controllers/StructureController.class.php:465
+#: libraries/controllers/DatabaseStructureController.class.php:405
 #: tbl_operations.php:382
 #, php-format
 msgid "Table %s has been emptied."
 msgstr "Taulu %s on tyhjennetty."
 
-#: libraries/controllers/StructureController.class.php:486
+#: libraries/controllers/DatabaseStructureController.class.php:426
 #: tbl_operations.php:400 view_operations.php:119
 #, fuzzy, php-format
 #| msgid "View %s has been dropped."
 msgid "View %s has been dropped."
 msgstr "Näkymä %s on poistettu"
 
-#: libraries/controllers/StructureController.class.php:487
+#: libraries/controllers/DatabaseStructureController.class.php:427
 #: tbl_operations.php:401
 #, fuzzy, php-format
 #| msgid "Table %s has been dropped."
 msgid "Table %s has been dropped."
 msgstr "Taulu %s on poistettu"
 
-#: libraries/controllers/StructureController.class.php:797
-#, php-format
-msgid "The name '%s' is a MySQL reserved keyword."
-msgid_plural "The names '%s' are MySQL reserved keywords."
-msgstr[0] ""
-msgstr[1] ""
-
-#: libraries/controllers/StructureController.class.php:875
-msgid "No column selected."
-msgstr "Ei valittua saraketta."
-
-#: libraries/controllers/StructureController.class.php:1049
+#: libraries/controllers/DatabaseStructureController.class.php:733
 msgid "Favorite List is full!"
 msgstr "Suosikkilista on täynnä!"
 
-#: libraries/controllers/StructureController.class.php:1272
-#, fuzzy
-#| msgid "The selected users have been deleted successfully."
-msgid "The columns have been moved successfully."
-msgstr "Valitsemiesi käyttäjien poisto onnistui."
-
-#: libraries/controllers/StructureController.class.php:1535
-#, fuzzy, php-format
-#| msgid "Table %1$s has been altered successfully."
-msgid ""
-"Table %1$s has been altered successfully. Privileges have been adjusted."
-msgstr "Taulun %1$s muuttaminen onnistui."
-
-#: libraries/controllers/StructureController.class.php:1541
-#: libraries/controllers/TableIndexesController.class.php:161
-#: tbl_addfield.php:92
-#, php-format
-msgid "Table %1$s has been altered successfully."
-msgstr "Taulun %1$s muuttaminen onnistui."
-
-#: libraries/controllers/StructureController.class.php:1588
-#: libraries/tracking.lib.php:1094
-#, fuzzy
-#| msgid "Ignore errors"
-msgid "Query error"
-msgstr "Älä välitä virheistä"
-
-#: libraries/controllers/StructureController.class.php:1806
+#: libraries/controllers/DatabaseStructureController.class.php:947
 #: libraries/mysql_charsets.lib.php:366 libraries/mysql_charsets.lib.php:373
 msgid "unknown"
 msgstr "tuntematon"
 
-#: libraries/controllers/StructureController.class.php:1957
-#: templates/structure/check_all_table_column.phtml:11
-msgid "Change"
-msgstr "Muokkaa"
-
-#: libraries/controllers/StructureController.class.php:1961
-#: libraries/controllers/StructureController.class.php:1966
-#: libraries/navigation/Nodes/Node_Index.class.php:30
-#: libraries/tracking.lib.php:926
-#: templates/columns_definitions/column_indexes.phtml:16
-#: templates/columns_definitions/table_fields_definitions.phtml:57
-#: templates/structure/check_all_table_column.phtml:30
-#: templates/structure/display_structure.phtml:79
-#: templates/structure/display_table_stats.phtml:19
-msgid "Index"
-msgstr "Indeksi"
-
-#: libraries/controllers/StructureController.class.php:1963
-#: libraries/controllers/StructureController.class.php:1968
-#: templates/columns_definitions/column_indexes.phtml:27
-#: templates/structure/check_all_table_column.phtml:37
-msgid "Spatial"
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1964
-#: libraries/controllers/StructureController.class.php:1969
-#: templates/columns_definitions/column_indexes.phtml:22
-#: templates/structure/check_all_table_column.phtml:47
-msgid "Fulltext"
-msgstr "Koko teksti"
-
-#: libraries/controllers/StructureController.class.php:1970
-#, fuzzy
-#| msgid "Browse distinct values"
-msgid "Distinct values"
-msgstr "Selaa erilaisia arvoja"
-
 #: libraries/controllers/TableChartController.class.php:82
 #: libraries/controllers/TableGisVisualizationController.class.php:101
 msgid "No SQL query was set to fetch data."
@@ -8647,13 +8586,20 @@ msgstr ""
 msgid "No data to display"
 msgstr "Tietoa ei löydy"
 
-#: libraries/controllers/TableRelationController.class.php:217
+#: libraries/controllers/TableIndexesController.class.php:161
+#: libraries/controllers/TableStructureController.class.php:736
+#: tbl_addfield.php:92
+#, php-format
+msgid "Table %1$s has been altered successfully."
+msgstr "Taulun %1$s muuttaminen onnistui."
+
+#: libraries/controllers/TableRelationController.class.php:218
 #, fuzzy
 #| msgid "Thread %s was successfully killed."
 msgid "Display column was successfully updated."
 msgstr "Säikeen %s lopetus onnistui."
 
-#: libraries/controllers/TableRelationController.class.php:283
+#: libraries/controllers/TableRelationController.class.php:288
 #, fuzzy
 #| msgid "Internal relation added"
 msgid "Internal relations were successfully updated."
@@ -8672,12 +8618,80 @@ msgid "Zoom search"
 msgstr "Zoomaushaku"
 
 #: libraries/controllers/TableSearchController.class.php:852
-#: templates/table/selection_form.phtml:59
+#: templates/table/search/selection_form.phtml:59
 #, fuzzy
 #| msgid "Find and Replace"
 msgid "Find and replace"
 msgstr "Etsi ja Korvaa"
 
+#: libraries/controllers/TableStructureController.class.php:163
+#, php-format
+msgid "The name '%s' is a MySQL reserved keyword."
+msgid_plural "The names '%s' are MySQL reserved keywords."
+msgstr[0] ""
+msgstr[1] ""
+
+#: libraries/controllers/TableStructureController.class.php:241
+msgid "No column selected."
+msgstr "Ei valittua saraketta."
+
+#: libraries/controllers/TableStructureController.class.php:467
+#, fuzzy
+#| msgid "The selected users have been deleted successfully."
+msgid "The columns have been moved successfully."
+msgstr "Valitsemiesi käyttäjien poisto onnistui."
+
+#: libraries/controllers/TableStructureController.class.php:730
+#, fuzzy, php-format
+#| msgid "Table %1$s has been altered successfully."
+msgid ""
+"Table %1$s has been altered successfully. Privileges have been adjusted."
+msgstr "Taulun %1$s muuttaminen onnistui."
+
+#: libraries/controllers/TableStructureController.class.php:783
+#: libraries/tracking.lib.php:1094
+#, fuzzy
+#| msgid "Ignore errors"
+msgid "Query error"
+msgstr "Älä välitä virheistä"
+
+#: libraries/controllers/TableStructureController.class.php:948
+#: templates/table/structure/check_all_table_column.phtml:11
+msgid "Change"
+msgstr "Muokkaa"
+
+#: libraries/controllers/TableStructureController.class.php:952
+#: libraries/controllers/TableStructureController.class.php:957
+#: libraries/navigation/Nodes/Node_Index.class.php:30
+#: libraries/tracking.lib.php:926
+#: templates/columns_definitions/column_indexes.phtml:16
+#: templates/columns_definitions/table_fields_definitions.phtml:57
+#: templates/table/structure/check_all_table_column.phtml:30
+#: templates/table/structure/display_structure.phtml:79
+#: templates/table/structure/display_table_stats.phtml:19
+msgid "Index"
+msgstr "Indeksi"
+
+#: libraries/controllers/TableStructureController.class.php:954
+#: libraries/controllers/TableStructureController.class.php:959
+#: templates/columns_definitions/column_indexes.phtml:27
+#: templates/table/structure/check_all_table_column.phtml:37
+msgid "Spatial"
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:955
+#: libraries/controllers/TableStructureController.class.php:960
+#: templates/columns_definitions/column_indexes.phtml:22
+#: templates/table/structure/check_all_table_column.phtml:47
+msgid "Fulltext"
+msgstr "Koko teksti"
+
+#: libraries/controllers/TableStructureController.class.php:963
+#, fuzzy
+#| msgid "Browse distinct values"
+msgid "Distinct values"
+msgstr "Selaa erilaisia arvoja"
+
 #: libraries/core.lib.php:306
 #, php-format
 msgid "The %s extension is missing. Please check your PHP configuration."
@@ -8724,7 +8738,7 @@ msgid "No Password"
 msgstr "Ei salasanaa"
 
 #: libraries/display_change_password.lib.php:68
-#: libraries/plugins/auth/AuthenticationCookie.class.php:199
+#: libraries/plugins/auth/AuthenticationCookie.class.php:187
 #: libraries/replication_gui.lib.php:422 libraries/replication_gui.lib.php:862
 #: libraries/server_privileges.lib.php:1640
 msgid "Password:"
@@ -9541,12 +9555,12 @@ msgid "Dump has been saved to file %s."
 msgstr "Vedos tallennettiin tiedostoon %s."
 
 #: libraries/import.lib.php:202 libraries/insert_edit.lib.php:124
-#: libraries/rte/rte_routines.lib.php:1353 libraries/sql.lib.php:1312
+#: libraries/rte/rte_routines.lib.php:1444 libraries/sql.lib.php:1306
 #: tbl_get_field.php:44
 msgid "MySQL returned an empty result set (i.e. zero rows)."
 msgstr "MySQL palautti tyhjän tulosjoukon (siis nolla riviä)."
 
-#: libraries/import.lib.php:265 libraries/sql.lib.php:1326
+#: libraries/import.lib.php:265 libraries/sql.lib.php:1320
 msgid "[ROLLBACK occurred.]"
 msgstr ""
 
@@ -9618,14 +9632,14 @@ msgstr "Luo &nbsp;%s&nbsp;sarakkeen indeksi"
 
 #: libraries/insert_edit.lib.php:233
 #: libraries/navigation/Nodes/Node_DatabaseChild.class.php:48
-#: templates/designer/table_list.phtml:40
+#: templates/database/designer/table_list.phtml:40
 msgid "Hide"
 msgstr "Kätke"
 
 #: libraries/insert_edit.lib.php:249
 #: libraries/navigation/Nodes/Node_Function.class.php:32
-#: libraries/rte/rte_routines.lib.php:1495
-#: templates/table/table_header.phtml:4
+#: libraries/rte/rte_routines.lib.php:1586
+#: templates/table/search/table_header.phtml:4
 msgid "Function"
 msgstr "Funktio"
 
@@ -9640,88 +9654,89 @@ msgstr "Binääritietoa"
 msgid "Because of its length,<br /> this column might not be editable."
 msgstr "Koska sen pituus, <br/> Tätä saraketta ei ehkä voi muokata"
 
-#: libraries/insert_edit.lib.php:1050
+#: libraries/insert_edit.lib.php:1048
 msgid "Binary - do not edit"
 msgstr "Binääritietoa - älä muokkaa"
 
-#: libraries/insert_edit.lib.php:1176 libraries/server_privileges.lib.php:470
-#: templates/table/options.phtml:36
+#: libraries/insert_edit.lib.php:1174 libraries/server_privileges.lib.php:470
+#: templates/table/search/options.phtml:36
 msgid "Or"
 msgstr "Tai"
 
-#: libraries/insert_edit.lib.php:1177
+#: libraries/insert_edit.lib.php:1175
 #, fuzzy
 #| msgid "web server upload directory"
 msgid "web server upload directory:"
 msgstr "palvelimen lähetyshakemisto"
 
-#: libraries/insert_edit.lib.php:1348 templates/table/input_box.phtml:49
+#: libraries/insert_edit.lib.php:1346
+#: templates/table/search/input_box.phtml:49
 msgid "Edit/Insert"
 msgstr "Muokkaa/lisää"
 
-#: libraries/insert_edit.lib.php:1398
+#: libraries/insert_edit.lib.php:1396
 #, fuzzy, php-format
 #| msgid "Restart insertion with %s rows"
 msgid "Continue insertion with %s rows"
 msgstr "Aloita lisäys alusta %s rivillä"
 
-#: libraries/insert_edit.lib.php:1428
+#: libraries/insert_edit.lib.php:1426
 msgid "and then"
 msgstr "ja sen jälkeen"
 
-#: libraries/insert_edit.lib.php:1461
+#: libraries/insert_edit.lib.php:1459
 msgid "Insert as new row"
 msgstr "Lisää uutena rivinä"
 
-#: libraries/insert_edit.lib.php:1464
+#: libraries/insert_edit.lib.php:1462
 msgid "Insert as new row and ignore errors"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1467
+#: libraries/insert_edit.lib.php:1465
 #, fuzzy
 msgid "Show insert query"
 msgstr "Näytetään SQL-kysely"
 
-#: libraries/insert_edit.lib.php:1487
+#: libraries/insert_edit.lib.php:1485
 msgid "Go back to previous page"
 msgstr "Takaisin"
 
-#: libraries/insert_edit.lib.php:1490
+#: libraries/insert_edit.lib.php:1488
 msgid "Insert another new row"
 msgstr "Lisää uusi rivi"
 
-#: libraries/insert_edit.lib.php:1495
+#: libraries/insert_edit.lib.php:1493
 msgid "Go back to this page"
 msgstr "Palaa tälle sivulle"
 
-#: libraries/insert_edit.lib.php:1518
+#: libraries/insert_edit.lib.php:1516
 msgid "Edit next row"
 msgstr "Muokkaa seuraavaa riviä"
 
-#: libraries/insert_edit.lib.php:1540
+#: libraries/insert_edit.lib.php:1538
 msgid ""
 "Use TAB key to move from value to value, or CTRL+arrows to move anywhere"
 msgstr ""
 "Sarkaimella voi siirtyä arvosta seuraavaan, Ctrl- ja nuolinäppäimillä pystyy "
-"siirtymään minne suuntaan tahansa."
+"siirtymään minne suuntaan tahansa"
 
-#: libraries/insert_edit.lib.php:1577 libraries/replication_gui.lib.php:542
-#: libraries/rte/rte_routines.lib.php:1497
+#: libraries/insert_edit.lib.php:1575 libraries/replication_gui.lib.php:542
+#: libraries/rte/rte_routines.lib.php:1588
 #: libraries/server_status_variables.lib.php:220
-#: templates/designer/having_query_panel.phtml:100
-#: templates/designer/options_panel.phtml:73
-#: templates/designer/options_panel.phtml:239
-#: templates/designer/where_query_panel.phtml:69
-#: templates/table/table_header.phtml:10
-#: templates/table/zoom_result_form.phtml:35
+#: templates/database/designer/having_query_panel.phtml:100
+#: templates/database/designer/options_panel.phtml:73
+#: templates/database/designer/options_panel.phtml:239
+#: templates/database/designer/where_query_panel.phtml:69
+#: templates/table/search/table_header.phtml:10
+#: templates/table/search/zoom_result_form.phtml:35
 msgid "Value"
 msgstr "Arvo"
 
-#: libraries/insert_edit.lib.php:1937 libraries/sql.lib.php:1309
+#: libraries/insert_edit.lib.php:1935 libraries/sql.lib.php:1303
 msgid "Showing SQL query"
 msgstr "Näytetään SQL-kysely"
 
-#: libraries/insert_edit.lib.php:1962 libraries/sql.lib.php:1287
+#: libraries/insert_edit.lib.php:1960 libraries/sql.lib.php:1281
 #, php-format
 msgid "Inserted row id: %1$d"
 msgstr "Lisätyn rivin tunnus: %1$d"
@@ -10172,7 +10187,7 @@ msgstr ""
 #: libraries/navigation/Nodes/Node_View_Container.class.php:26
 #: libraries/navigation/Nodes/Node_View_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:129
-#: templates/structure/show_create.phtml:30
+#: templates/database/structure/show_create.phtml:30
 msgid "Views"
 msgstr "Näkymät"
 
@@ -10485,7 +10500,7 @@ msgstr "Sinulla ei ole riittäviä oikeuksia!"
 
 #: libraries/operations.lib.php:101 libraries/operations.lib.php:249
 #: libraries/operations.lib.php:869 libraries/operations.lib.php:963
-#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:907
+#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:998
 #: templates/columns_definitions/table_fields_definitions.phtml:47
 #, fuzzy
 #| msgid "Edit Privileges"
@@ -10579,22 +10594,22 @@ msgid "Switch to copied table"
 msgstr "Siirry kopioituun tauluun"
 
 #: libraries/operations.lib.php:1360
-#: templates/structure/check_all_tables.phtml:18
+#: templates/database/structure/check_all_tables.phtml:18
 msgid "Table maintenance"
 msgstr "Taulun ylläpito"
 
 #: libraries/operations.lib.php:1398
-#: templates/structure/check_all_tables.phtml:19
+#: templates/database/structure/check_all_tables.phtml:19
 msgid "Analyze table"
 msgstr "Analysoi taulu"
 
 #: libraries/operations.lib.php:1413
-#: templates/structure/check_all_tables.phtml:20
+#: templates/database/structure/check_all_tables.phtml:20
 msgid "Check table"
 msgstr "Tarkista taulu"
 
 #: libraries/operations.lib.php:1428
-#: templates/structure/check_all_tables.phtml:22
+#: templates/database/structure/check_all_tables.phtml:22
 #, fuzzy
 #| msgid "Check table"
 msgid "Checksum table"
@@ -10616,18 +10631,19 @@ msgid "Flush the table (FLUSH)"
 msgstr "Tyhjennä taulun välimuisti (\"FLUSH\")"
 
 #: libraries/operations.lib.php:1477
-#: templates/structure/check_all_tables.phtml:23
-#: templates/structure/display_table_stats.phtml:56
+#: templates/database/structure/check_all_tables.phtml:23
+#: templates/table/structure/display_table_stats.phtml:56
 msgid "Optimize table"
 msgstr "Optimoi taulu"
 
 #: libraries/operations.lib.php:1492
-#: templates/structure/check_all_tables.phtml:24
+#: templates/database/structure/check_all_tables.phtml:24
 msgid "Repair table"
 msgstr "Korjaa taulu"
 
 #: libraries/operations.lib.php:1538
-#: templates/structure/check_all_tables.phtml:14 view_operations.php:127
+#: templates/database/structure/check_all_tables.phtml:14
+#: view_operations.php:127
 #, fuzzy
 #| msgid "Delete tracking data for this table"
 msgid "Delete data or table"
@@ -10762,7 +10778,7 @@ msgid "Cannot connect: invalid settings."
 msgstr "Yhteyttä ei voitu muodostaa: virheelliset asetukset."
 
 #: libraries/plugins/auth/AuthenticationConfig.class.php:108
-#: libraries/plugins/auth/AuthenticationCookie.class.php:134
+#: libraries/plugins/auth/AuthenticationCookie.class.php:122
 #: libraries/plugins/auth/AuthenticationHttp.class.php:96
 #, php-format
 msgid "Welcome to %s"
@@ -10793,39 +10809,39 @@ msgstr ""
 msgid "Retry to connect"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:146
+#: libraries/plugins/auth/AuthenticationCookie.class.php:134
 msgid "Your session has expired. Please log in again."
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:170
+#: libraries/plugins/auth/AuthenticationCookie.class.php:158
 msgid "Log in"
 msgstr "Kirjaudu sisään"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:178
-#: libraries/plugins/auth/AuthenticationCookie.class.php:188
+#: libraries/plugins/auth/AuthenticationCookie.class.php:166
+#: libraries/plugins/auth/AuthenticationCookie.class.php:176
 msgid "You can enter hostname/IP address and port separated by space."
 msgstr ""
 "Voit syöttää verkkotunnuksen/IP-osoitteen ja portin välilyönnillä erotettuna."
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:193
+#: libraries/plugins/auth/AuthenticationCookie.class.php:181
 msgid "Username:"
 msgstr "Käyttäjätunnus:"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:205
+#: libraries/plugins/auth/AuthenticationCookie.class.php:193
 #, fuzzy
 #| msgid "Server Choice"
 msgid "Server Choice:"
 msgstr "Valitse palvelin"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:386
+#: libraries/plugins/auth/AuthenticationCookie.class.php:374
 msgid "Entered captcha is wrong, try again!"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:396
+#: libraries/plugins/auth/AuthenticationCookie.class.php:384
 msgid "Please enter correct captcha!"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:423
+#: libraries/plugins/auth/AuthenticationCookie.class.php:411
 #, fuzzy
 #| msgid "Cannot log in to the MySQL server"
 msgid "You are not allowed to log in to this MySQL server!"
@@ -10927,7 +10943,7 @@ msgstr "Tapahtuma"
 #: libraries/plugins/export/ExportOdt.class.php:593
 #: libraries/plugins/export/ExportTexytext.class.php:428
 #: libraries/plugins/export/PMA_ExportPdf.class.php:313
-#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:984
 #: libraries/rte/rte_triggers.lib.php:377
 msgid "Definition"
 msgstr "Määritys"
@@ -11257,7 +11273,7 @@ msgid "Last check:"
 msgstr "Viimeksi tarkistettu:"
 
 #: libraries/plugins/export/ExportSql.class.php:1399
-#: templates/structure/structure_table_row.phtml:183
+#: templates/database/structure/structure_table_row.phtml:183
 msgid "in use"
 msgstr "käytössä"
 
@@ -11466,24 +11482,18 @@ msgstr ""
 msgid "The imported file does not contain any data!"
 msgstr "Tiedosto %s ei sisällä avaintunnusta"
 
-#: libraries/plugins/import/ImportSql.class.php:169
+#: libraries/plugins/import/ImportSql.class.php:72
 #, fuzzy
 #| msgid "SQL compatibility mode"
 msgid "SQL compatibility mode:"
 msgstr "SQL-yhteensopiva tila"
 
-#: libraries/plugins/import/ImportSql.class.php:181
+#: libraries/plugins/import/ImportSql.class.php:84
 #, fuzzy
 #| msgid "Do not use AUTO_INCREMENT for zero values"
 msgid "Do not use <code>AUTO_INCREMENT</code> for zero values"
 msgstr "Älä käytä nolla-arvoissa AUTO_INCREMENT:iä"
 
-#: libraries/plugins/import/ImportSql.class.php:195
-#, fuzzy
-#| msgid "Read misses"
-msgid "Read as multibytes"
-msgstr "Epäonnistuneet lukuyritykset"
-
 #: libraries/plugins/import/ImportXml.class.php:54
 msgid "XML"
 msgstr "XML"
@@ -11526,7 +11536,7 @@ msgid "Show grid"
 msgstr "Näytä ruudukko"
 
 #: libraries/plugins/schema/SchemaPdf.class.php:94
-#: templates/structure/print_view_data_dictionary_link.phtml:6
+#: templates/database/structure/print_view_data_dictionary_link.phtml:6
 msgid "Data Dictionary"
 msgstr "Tietosanasto"
 
@@ -11558,7 +11568,7 @@ msgid "The %s table doesn't exist!"
 msgstr "Taulua \"%s\" ei ole!"
 
 #: libraries/plugins/schema/eps/Eps_Relation_Schema.class.php:321
-#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:309
+#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:323
 #, fuzzy, php-format
 #| msgid "Schema of the \"%s\" database - Page %s"
 msgid "Schema of the %s database - Page %s"
@@ -11588,7 +11598,7 @@ msgstr "Sisällysluettelo"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1005
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1028
 #: libraries/tracking.lib.php:884
-#: templates/structure/table_structure_header.phtml:11
+#: templates/table/structure/table_structure_header.phtml:11
 msgid "Extra"
 msgstr "Lisätiedot"
 
@@ -12015,32 +12025,32 @@ msgstr ""
 msgid "Create the needed tables with the <code>%screate_tables.sql</code>."
 msgstr ""
 
-#: libraries/relation.lib.php:360
+#: libraries/relation.lib.php:357
 msgid "Create a pma user and give access to these tables."
 msgstr ""
 
-#: libraries/relation.lib.php:365
+#: libraries/relation.lib.php:360
 msgid ""
 "Enable advanced features in configuration file (<code>config.inc.php</"
 "code>), for example by starting from <code>config.sample.inc.php</code>."
 msgstr ""
 
-#: libraries/relation.lib.php:373
+#: libraries/relation.lib.php:365
 msgid "Re-login to phpMyAdmin to load the updated configuration file."
 msgstr ""
 
-#: libraries/relation.lib.php:1612
+#: libraries/relation.lib.php:1607
 msgid "no description"
 msgstr "ei kuvausta"
 
-#: libraries/relation.lib.php:1811
+#: libraries/relation.lib.php:1806
 msgid ""
 "You do not have necessary privileges to create a database named "
 "'phpmyadmin'. You may go to 'Operations' tab of any database to set up the "
 "phpMyAdmin configuration storage there."
 msgstr ""
 
-#: libraries/relation.lib.php:1928
+#: libraries/relation.lib.php:1923
 #, fuzzy, php-format
 #| msgid ""
 #| "Empty phpMyAdmin control user while using phpMyAdmin configuration storage"
@@ -12051,13 +12061,13 @@ msgstr ""
 "Tyhjennä phpMyAdminin hallintakäyttäjä käytettäessä phpMyAdmin configuration "
 "storage-kantaa"
 
-#: libraries/relation.lib.php:1936
+#: libraries/relation.lib.php:1931
 #, php-format
 msgid ""
 "%sCreate%s the phpMyAdmin configuration storage in the current database."
 msgstr ""
 
-#: libraries/relation.lib.php:1944
+#: libraries/relation.lib.php:1939
 #, fuzzy, php-format
 #| msgid ""
 #| "Empty phpMyAdmin control user while using phpMyAdmin configuration storage"
@@ -12067,7 +12077,7 @@ msgstr ""
 "storage-kantaa"
 
 #: libraries/replication_gui.lib.php:46 libraries/replication_gui.lib.php:343
-#: libraries/server_databases.lib.php:387
+#: libraries/server_databases.lib.php:398
 msgid "Master replication"
 msgstr "Isäntäpalvelimen kahdennus"
 
@@ -12139,7 +12149,7 @@ msgstr ""
 "asetettu isäntäpalvelimeksi."
 
 #: libraries/replication_gui.lib.php:141
-#: libraries/server_databases.lib.php:389
+#: libraries/server_databases.lib.php:400
 msgid "Slave replication"
 msgstr "Alipalvelimen kahdennus"
 
@@ -12161,7 +12171,8 @@ msgstr ""
 msgid ""
 "Server is configured as slave in a replication process. Would you like to:"
 msgstr ""
-"Palvelin on määritetty kahdennustoiminnon alipalvelimeksi. Mitä haluat tehdä?"
+"Palvelin on määritetty kahdennustoiminnon alipalvelimeksi. Valitse "
+"suoritettava toiminto:"
 
 #: libraries/replication_gui.lib.php:239
 msgid "See slave status table"
@@ -12453,10 +12464,10 @@ msgid "Master server changed successfully to %s."
 msgstr "%s on onnistuneesti vaihdettu isäntäpalvelimeksi"
 
 #: libraries/rte/rte_events.lib.php:106 libraries/rte/rte_events.lib.php:115
-#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:149
-#: libraries/rte/rte_routines.lib.php:158
-#: libraries/rte/rte_routines.lib.php:231
-#: libraries/rte/rte_routines.lib.php:1362
+#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:219
+#: libraries/rte/rte_routines.lib.php:246
+#: libraries/rte/rte_routines.lib.php:368
+#: libraries/rte/rte_routines.lib.php:1453
 #: libraries/rte/rte_triggers.lib.php:82 libraries/rte/rte_triggers.lib.php:91
 #: libraries/rte/rte_triggers.lib.php:123
 #, fuzzy, php-format
@@ -12480,7 +12491,7 @@ msgstr "Taulu %s on poistettu"
 msgid "Event %1$s has been created."
 msgstr "Taulu %1$s on luotu."
 
-#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:251
+#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:266
 #: libraries/rte/rte_triggers.lib.php:144
 msgid "One or more errors have occurred while processing your request:"
 msgstr ""
@@ -12491,7 +12502,7 @@ msgstr ""
 msgid "Edit event"
 msgstr "Muokkaa palvelinta"
 
-#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:794
+#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:885
 #: libraries/rte/rte_triggers.lib.php:323 view_create.php:180
 #, fuzzy
 #| msgid "Details…"
@@ -12508,7 +12519,7 @@ msgstr "Tapahtuman tyyppi"
 msgid "Event type"
 msgstr "Tapahtuman tyyppi"
 
-#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:817
+#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:908
 #, fuzzy, php-format
 #| msgid "Change"
 msgid "Change to %s"
@@ -12544,12 +12555,14 @@ msgstr "Loppu"
 msgid "On completion preserve"
 msgstr "Kokonaiset lisäyslauseet"
 
-#: libraries/rte/rte_events.lib.php:491 libraries/rte/rte_routines.lib.php:930
+#: libraries/rte/rte_events.lib.php:491
+#: libraries/rte/rte_routines.lib.php:1021
 #: libraries/rte/rte_triggers.lib.php:383 view_create.php:209
 msgid "Definer"
 msgstr ""
 
-#: libraries/rte/rte_events.lib.php:535 libraries/rte/rte_routines.lib.php:997
+#: libraries/rte/rte_events.lib.php:535
+#: libraries/rte/rte_routines.lib.php:1088
 #: libraries/rte/rte_triggers.lib.php:422
 msgid "The definer must be in the \"username@hostname\" format!"
 msgstr ""
@@ -12577,9 +12590,9 @@ msgid "You must provide an event definition."
 msgstr ""
 
 #: libraries/rte/rte_export.lib.php:43 libraries/rte/rte_general.lib.php:72
-#: libraries/rte/rte_routines.lib.php:345
-#: libraries/rte/rte_routines.lib.php:1198
-#: libraries/rte/rte_routines.lib.php:1411
+#: libraries/rte/rte_routines.lib.php:153
+#: libraries/rte/rte_routines.lib.php:1289
+#: libraries/rte/rte_routines.lib.php:1502
 #, fuzzy
 #| msgid "Error in Processing Request"
 msgid "Error in processing request:"
@@ -12615,155 +12628,155 @@ msgid ""
 "problems."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:110
-#: libraries/rte/rte_routines.lib.php:1006
-#, fuzzy, php-format
-#| msgid "Invalid server index: %s"
-msgid "Invalid routine type: \"%s\""
-msgstr "Virheellinen palvelimen indeksi: %s"
-
-#: libraries/rte/rte_routines.lib.php:170
-msgid "Sorry, we failed to restore the dropped routine."
-msgstr ""
-
-#: libraries/rte/rte_routines.lib.php:211
-#, fuzzy, php-format
-#| msgid "Table %s has been dropped."
-msgid "Routine %1$s has been modified. Privileges have been adjusted."
-msgstr "Taulu %s on poistettu"
-
-#: libraries/rte/rte_routines.lib.php:216
-#, fuzzy, php-format
-#| msgid "Table %s has been dropped."
-msgid "Routine %1$s has been modified."
-msgstr "Taulu %s on poistettu"
-
-#: libraries/rte/rte_routines.lib.php:238
-#, fuzzy, php-format
-#| msgid "Table %1$s has been created."
-msgid "Routine %1$s has been created."
-msgstr "Taulu %1$s on luotu."
-
-#: libraries/rte/rte_routines.lib.php:315
+#: libraries/rte/rte_routines.lib.php:123
 #, fuzzy
 #| msgid "Edit mode"
 msgid "Edit routine"
 msgstr "Muokkaustila"
 
-#: libraries/rte/rte_routines.lib.php:797
+#: libraries/rte/rte_routines.lib.php:200
+#: libraries/rte/rte_routines.lib.php:1097
+#, fuzzy, php-format
+#| msgid "Invalid server index: %s"
+msgid "Invalid routine type: \"%s\""
+msgstr "Virheellinen palvelimen indeksi: %s"
+
+#: libraries/rte/rte_routines.lib.php:253
+#, fuzzy, php-format
+#| msgid "Table %1$s has been created."
+msgid "Routine %1$s has been created."
+msgstr "Taulu %1$s on luotu."
+
+#: libraries/rte/rte_routines.lib.php:380
+msgid "Sorry, we failed to restore the dropped routine."
+msgstr ""
+
+#: libraries/rte/rte_routines.lib.php:439
+#, fuzzy, php-format
+#| msgid "Table %s has been dropped."
+msgid "Routine %1$s has been modified. Privileges have been adjusted."
+msgstr "Taulu %s on poistettu"
+
+#: libraries/rte/rte_routines.lib.php:444
+#, fuzzy, php-format
+#| msgid "Table %s has been dropped."
+msgid "Routine %1$s has been modified."
+msgstr "Taulu %s on poistettu"
+
+#: libraries/rte/rte_routines.lib.php:888
 #, fuzzy
 #| msgid "Routines"
 msgid "Routine name"
 msgstr "Rutiinit"
 
-#: libraries/rte/rte_routines.lib.php:823
+#: libraries/rte/rte_routines.lib.php:914
 msgid "Parameters"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:829
+#: libraries/rte/rte_routines.lib.php:920
 #, fuzzy
 #| msgid "Direct links"
 msgid "Direction"
 msgstr "Suorat linkit"
 
-#: libraries/rte/rte_routines.lib.php:847
+#: libraries/rte/rte_routines.lib.php:938
 #, fuzzy
 #| msgid "Apply index(s)"
 msgid "Add parameter"
 msgstr "Käytä indeksiä/indeksejä"
 
-#: libraries/rte/rte_routines.lib.php:851
+#: libraries/rte/rte_routines.lib.php:942
 #, fuzzy
 #| msgid "Remove database"
 msgid "Remove last parameter"
 msgstr "Tuhoa tietokanta"
 
-#: libraries/rte/rte_routines.lib.php:856
+#: libraries/rte/rte_routines.lib.php:947
 msgid "Return type"
 msgstr "Paluutyyppi"
 
-#: libraries/rte/rte_routines.lib.php:862
+#: libraries/rte/rte_routines.lib.php:953
 #, fuzzy
 #| msgid "Length/Values"
 msgid "Return length/values"
 msgstr "Pituus/Arvot*"
 
-#: libraries/rte/rte_routines.lib.php:868
+#: libraries/rte/rte_routines.lib.php:959
 #, fuzzy
 #| msgid "Table options"
 msgid "Return options"
 msgstr "Taulun valinnat"
 
-#: libraries/rte/rte_routines.lib.php:899
+#: libraries/rte/rte_routines.lib.php:990
 msgid "Is deterministic"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:920
+#: libraries/rte/rte_routines.lib.php:1011
 msgid ""
 "You do not have sufficient privileges to perform this operation; Please "
 "refer to the documentation for more details"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:935
+#: libraries/rte/rte_routines.lib.php:1026
 #, fuzzy
 #| msgid "Security"
 msgid "Security type"
 msgstr "Turvallisuus"
 
-#: libraries/rte/rte_routines.lib.php:944
+#: libraries/rte/rte_routines.lib.php:1035
 msgid "SQL data access"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1013
+#: libraries/rte/rte_routines.lib.php:1104
 #, fuzzy
 #| msgid "Invalid table name"
 msgid "You must provide a routine name!"
 msgstr "Virheellinen taulun nimi"
 
-#: libraries/rte/rte_routines.lib.php:1047
+#: libraries/rte/rte_routines.lib.php:1138
 #, php-format
 msgid "Invalid direction \"%s\" given for parameter."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1069
-#: libraries/rte/rte_routines.lib.php:1131
+#: libraries/rte/rte_routines.lib.php:1160
+#: libraries/rte/rte_routines.lib.php:1222
 msgid ""
 "You must provide length/values for routine parameters of type ENUM, SET, "
 "VARCHAR and VARBINARY."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1095
+#: libraries/rte/rte_routines.lib.php:1186
 msgid "You must provide a name and a type for each routine parameter."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1114
+#: libraries/rte/rte_routines.lib.php:1205
 msgid "You must provide a valid return type for the routine."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1174
+#: libraries/rte/rte_routines.lib.php:1265
 msgid "You must provide a routine definition."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1285
+#: libraries/rte/rte_routines.lib.php:1376
 #, fuzzy, php-format
 #| msgid "Allows executing stored routines."
 msgid "Execution results of routine %s"
 msgstr "Sallii talletettujen rutiinien suorittamisen."
 
-#: libraries/rte/rte_routines.lib.php:1340
+#: libraries/rte/rte_routines.lib.php:1431
 #, php-format
 msgid "%d row affected by the last statement inside the procedure."
 msgid_plural "%d rows affected by the last statement inside the procedure."
 msgstr[0] ""
 msgstr[1] ""
 
-#: libraries/rte/rte_routines.lib.php:1398
-#: libraries/rte/rte_routines.lib.php:1406
+#: libraries/rte/rte_routines.lib.php:1489
+#: libraries/rte/rte_routines.lib.php:1497
 msgid "Execute routine"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1485
-#: libraries/rte/rte_routines.lib.php:1488
+#: libraries/rte/rte_routines.lib.php:1576
+#: libraries/rte/rte_routines.lib.php:1579
 #, fuzzy
 #| msgid "Routines"
 msgid "Routine parameters"
@@ -12967,7 +12980,7 @@ msgid "Original position"
 msgstr "Alkuperäinen sijainti"
 
 #: libraries/server_bin_log.lib.php:133
-#: templates/structure/display_table_stats.phtml:4
+#: templates/table/structure/display_table_stats.phtml:4
 msgid "Information"
 msgstr "Tiedot"
 
@@ -13005,12 +13018,12 @@ msgstr ""
 "Huom: Tietokantatilastojen näyttäminen täältä käsin saattaa aiheuttaa "
 "runsaasti liikennettä Internet-palvelimen ja MySQL-palvelimen välille."
 
-#: libraries/server_databases.lib.php:364
-#: libraries/server_databases.lib.php:365
+#: libraries/server_databases.lib.php:366
+#: libraries/server_databases.lib.php:371
 msgid "Enable Statistics"
 msgstr "Näytä tilastot"
 
-#: libraries/server_databases.lib.php:481
+#: libraries/server_databases.lib.php:492
 #, fuzzy, php-format
 #| msgid "%s databases have been dropped successfully."
 msgid "%1$d database has been dropped successfully."
@@ -13399,7 +13412,7 @@ msgid "You have revoked the privileges for %s."
 msgstr "Käyttäjän %s käyttöoikeudet on poistettu."
 
 #: libraries/server_privileges.lib.php:2059
-#: libraries/server_privileges.lib.php:4290
+#: libraries/server_privileges.lib.php:4316
 #, fuzzy
 #| msgid "Add user"
 msgid "Add user account"
@@ -13592,60 +13605,60 @@ msgstr "Poistetaan: %s"
 msgid "The privileges were reloaded successfully."
 msgstr "Käyttöoikeuksien uudelleenlataus onnistui."
 
-#: libraries/server_privileges.lib.php:3994
+#: libraries/server_privileges.lib.php:4003
 #, php-format
 msgid "The user %s already exists!"
 msgstr "Käyttäjä %s on jo olemassa!"
 
-#: libraries/server_privileges.lib.php:4232
+#: libraries/server_privileges.lib.php:4258
 #, fuzzy, php-format
 #| msgid "Privileges"
 msgid "Privileges for %s"
 msgstr "Käyttöoikeudet"
 
-#: libraries/server_privileges.lib.php:4241
+#: libraries/server_privileges.lib.php:4267
 #: libraries/server_status_processes.lib.php:72
 #: libraries/server_user_groups.lib.php:39
 msgid "User"
 msgstr "Käyttäjä"
 
-#: libraries/server_privileges.lib.php:4282
+#: libraries/server_privileges.lib.php:4308
 msgctxt "Create new user"
 msgid "New"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4311
+#: libraries/server_privileges.lib.php:4337
 #, fuzzy
 #| msgid "Edit Privileges"
 msgid "Edit privileges:"
 msgstr "Muokkaa käyttöoikeuksia"
 
-#: libraries/server_privileges.lib.php:4312
+#: libraries/server_privileges.lib.php:4338
 #, fuzzy
 #| msgid "Users"
 msgid "User account"
 msgstr "Käyttäjät"
 
-#: libraries/server_privileges.lib.php:4371
+#: libraries/server_privileges.lib.php:4397
 msgid ""
 "Note: You are attempting to edit privileges of the user with which you are "
 "currently logged in."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4391 libraries/server_users.lib.php:25
+#: libraries/server_privileges.lib.php:4417 libraries/server_users.lib.php:25
 #, fuzzy
 #| msgid "User overview"
 msgid "User accounts overview"
 msgstr "Käyttäjien yleiskatsaus"
 
-#: libraries/server_privileges.lib.php:4459
+#: libraries/server_privileges.lib.php:4485
 msgid ""
 "A user account allowing any user from localhost to connect is present. This "
 "will prevent other users from connecting if the host part of their account "
 "allows a connection from any (%) host."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4500
+#: libraries/server_privileges.lib.php:4526
 #, php-format
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
@@ -13658,7 +13671,7 @@ msgstr ""
 "käyttämistä käyttöoikeuksista, jos tauluihin on tehty muutoksia käsin. "
 "Tällöin %skäyttöoikeudet on ladattava uudestaan%s ennen jatkamista."
 
-#: libraries/server_privileges.lib.php:4519
+#: libraries/server_privileges.lib.php:4545
 #, fuzzy
 #| msgid ""
 #| "Note: phpMyAdmin gets the users' privileges directly from MySQL's "
@@ -13677,26 +13690,26 @@ msgstr ""
 "käyttämistä käyttöoikeuksista, jos tauluihin on tehty muutoksia käsin. "
 "Tällöin %skäyttöoikeudet on ladattava uudestaan%s ennen jatkamista."
 
-#: libraries/server_privileges.lib.php:4569
+#: libraries/server_privileges.lib.php:4595
 msgid "The selected user was not found in the privilege table."
 msgstr "Valittua käyttäjää ei löytynyt käyttöoikeustaulusta."
 
-#: libraries/server_privileges.lib.php:4801
+#: libraries/server_privileges.lib.php:4827
 msgid "You have added a new user."
 msgstr "Uusi käyttäjä lisätty."
 
-#: libraries/server_status.lib.php:53
+#: libraries/server_status.lib.php:60
 #, php-format
 msgid "Network traffic since startup: %s"
 msgstr ""
 
-#: libraries/server_status.lib.php:66
+#: libraries/server_status.lib.php:73
 #, fuzzy, php-format
 #| msgid "s MySQL server has been running for %s. It started up on %s."
 msgid "This MySQL server has been running for %1$s. It started up on %2$s."
 msgstr "Tämä MySQL-palvelin on ollut käynnissä %s. Se käynnistettiin %s."
 
-#: libraries/server_status.lib.php:80
+#: libraries/server_status.lib.php:94
 msgid ""
 "This MySQL server works as <b>master</b> and <b>slave</b> in <b>replication</"
 "b> process."
@@ -13704,22 +13717,22 @@ msgstr ""
 "Tämä MySQL-palvelin toimii <b>kahdennustoiminnossa</b> <b>pää-</b> ja "
 "<b>alipalvelimena</b>."
 
-#: libraries/server_status.lib.php:85
+#: libraries/server_status.lib.php:99
 msgid "This MySQL server works as <b>master</b> in <b>replication</b> process."
 msgstr ""
 "Tämä MySQL-palvelin toimii <b>kahdennustoiminnossa</b> <b>pääpalvelimena</b>."
 
-#: libraries/server_status.lib.php:90
+#: libraries/server_status.lib.php:104
 msgid "This MySQL server works as <b>slave</b> in <b>replication</b> process."
 msgstr ""
 "Tämä MySQL-palvelin toimii <b>kahdennustoiminnossa</b> ja <b>alipalvelimena</"
 "b>."
 
-#: libraries/server_status.lib.php:106
+#: libraries/server_status.lib.php:116
 msgid "Replication status"
 msgstr "Kahdennuksen tila"
 
-#: libraries/server_status.lib.php:137
+#: libraries/server_status.lib.php:146
 msgid ""
 "On a busy server, the byte counters may overrun, so those statistics as "
 "reported by the MySQL server may be incorrect."
@@ -13727,21 +13740,21 @@ msgstr ""
 "Ruuhkaisten palvelinten tavulaskurit saattavat ylivuotaa, joten MySQL-"
 "palvelimen ilmoittamat tilastotiedot saattavat olla virheellisiä."
 
-#: libraries/server_status.lib.php:148
+#: libraries/server_status.lib.php:157
 msgid "Received"
 msgstr "Vastaanotettu"
 
-#: libraries/server_status.lib.php:167
+#: libraries/server_status.lib.php:176
 msgid "Sent"
 msgstr "Lähetetty"
 
-#: libraries/server_status.lib.php:234
+#: libraries/server_status.lib.php:243
 #, fuzzy
 #| msgid "max. concurrent connections"
 msgid "Max. concurrent connections"
 msgstr "Enim. yhtäaikaisia yhteyksiä"
 
-#: libraries/server_status.lib.php:244
+#: libraries/server_status.lib.php:253
 msgid "Failed attempts"
 msgstr "Epäonnistuneet yritykset"
 
@@ -14871,7 +14884,7 @@ msgstr ""
 msgid "Not implemented yet."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/AlterOperation.php:193
+#: libraries/sql-parser/src/Components/AlterOperation.php:191
 #, fuzzy
 #| msgid "Iconic table operations"
 msgid "Unrecognized alter operation."
@@ -14887,7 +14900,7 @@ msgid "An opening bracket followed by a set of values was expected."
 msgstr ""
 
 #: libraries/sql-parser/src/Components/ArrayObj.php:101
-#: libraries/sql-parser/src/Components/FieldDefinition.php:202
+#: libraries/sql-parser/src/Components/CreateDefinition.php:202
 msgid "An opening bracket was expected."
 msgstr ""
 
@@ -14895,25 +14908,35 @@ msgstr ""
 msgid "A comma or a closing bracket was expected"
 msgstr ""
 
+#: libraries/sql-parser/src/Components/CreateDefinition.php:246
+#, fuzzy
+#| msgid "No tables selected."
+msgid "A comma or a closing bracket was expected."
+msgstr "Yhtään taulua ei ole valittu."
+
+#: libraries/sql-parser/src/Components/CreateDefinition.php:262
+msgid "A closing bracket was expected."
+msgstr ""
+
 #: libraries/sql-parser/src/Components/DataType.php:125
 msgid "Unrecognized data type."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:225
+#: libraries/sql-parser/src/Components/Expression.php:227
 msgid "Unexpected closing bracket."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:246
-#: libraries/sql-parser/src/Components/Expression.php:283
-#: libraries/sql-parser/src/Components/Expression.php:303
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:285
+#: libraries/sql-parser/src/Components/Expression.php:305
 msgid "An alias was previously found."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:257
+#: libraries/sql-parser/src/Components/Expression.php:259
 msgid "Unexpected dot."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:327
+#: libraries/sql-parser/src/Components/Expression.php:329
 #, fuzzy
 #| msgid "No tables selected."
 msgid "An alias was expected."
@@ -14925,16 +14948,6 @@ msgstr "Yhtään taulua ei ole valittu."
 msgid "An expression was expected."
 msgstr "Ei yhtään riviä valittu"
 
-#: libraries/sql-parser/src/Components/FieldDefinition.php:246
-#, fuzzy
-#| msgid "No tables selected."
-msgid "A comma or a closing bracket was expected."
-msgstr "Yhtään taulua ei ole valittu."
-
-#: libraries/sql-parser/src/Components/FieldDefinition.php:262
-msgid "A closing bracket was expected."
-msgstr ""
-
 #: libraries/sql-parser/src/Components/Limit.php:90
 #: libraries/sql-parser/src/Components/Limit.php:112
 msgid "An offset was expected."
@@ -14982,29 +14995,29 @@ msgstr ""
 msgid "Expected delimiter."
 msgstr ""
 
-#: libraries/sql-parser/src/Lexer.php:753
+#: libraries/sql-parser/src/Lexer.php:777
 #, fuzzy, php-format
 #| msgid "Table %1$s has been created."
 msgid "Ending quote %1$s was expected."
 msgstr "Taulu %1$s on luotu."
 
-#: libraries/sql-parser/src/Lexer.php:789
+#: libraries/sql-parser/src/Lexer.php:813
 #, fuzzy
 #| msgid "Table name template"
 msgid "Variable name was expected."
 msgstr "Taulunimen pohja"
 
-#: libraries/sql-parser/src/Parser.php:380
+#: libraries/sql-parser/src/Parser.php:391
 #, fuzzy
 #| msgid "At Beginning of Table"
 msgid "Unexpected beginning of statement."
 msgstr "Taulun alkuun"
 
-#: libraries/sql-parser/src/Parser.php:399
+#: libraries/sql-parser/src/Parser.php:410
 msgid "Unrecognized statement type."
 msgstr ""
 
-#: libraries/sql-parser/src/Parser.php:479
+#: libraries/sql-parser/src/Parser.php:489
 msgid "No transaction was previously started."
 msgstr ""
 
@@ -15034,8 +15047,10 @@ msgid "The name of the entity was expected."
 msgstr "Avoinna olevien taulujen määrä."
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:310
-msgid "At least one field definition was expected."
-msgstr ""
+#, fuzzy
+#| msgid "The row has been deleted."
+msgid "At least one column definition was expected."
+msgstr "Rivi on nyt poistettu."
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:329
 msgid "A \"RETURNS\" keyword was expected."
@@ -15112,11 +15127,11 @@ msgstr "Kirjanmerkki %s luotu"
 msgid "Using bookmark \"%s\" as default browse query."
 msgstr ""
 
-#: libraries/sql.lib.php:1306
+#: libraries/sql.lib.php:1300
 msgid "Showing as PHP code"
 msgstr "Näytetään PHP-koodina"
 
-#: libraries/sql.lib.php:1638
+#: libraries/sql.lib.php:1632
 #, fuzzy, php-format
 #| msgid ""
 #| "This table does not contain a unique column. Features related to the grid "
@@ -15129,7 +15144,7 @@ msgstr ""
 "valintaneliöihin, Muokkaa-, Kopioi- ja Poista-linkkeihin liittyvät "
 "ominaisuudet eivät ehkä ole toiminnassa tallennuksen jälkeen."
 
-#: libraries/sql.lib.php:1649
+#: libraries/sql.lib.php:1643
 #, fuzzy, php-format
 #| msgid ""
 #| "This table does not contain a unique column. Features related to the grid "
@@ -15142,7 +15157,7 @@ msgstr ""
 "valintaneliöihin, Muokkaa-, Kopioi- ja Poista-linkkeihin liittyvät "
 "ominaisuudet eivät ehkä ole toiminnassa tallennuksen jälkeen."
 
-#: libraries/sql.lib.php:1688
+#: libraries/sql.lib.php:1682
 #, php-format
 msgid "Problems with indexes of table `%s`"
 msgstr "Taulun \"%s\" indeksien kanssa on ongelmia"
@@ -15314,7 +15329,7 @@ msgid "Version %s snapshot (SQL code)"
 msgstr "Version %s kuvaus (SQL-koodi)"
 
 #: libraries/tracking.lib.php:947
-#: templates/structure/table_structure_row.phtml:33
+#: templates/table/structure/table_structure_row.phtml:33
 #, fuzzy
 #| msgid "None"
 msgctxt "None for default"
@@ -15378,19 +15393,19 @@ msgstr "Luo versio %s kohteesta %s.%s"
 msgid "Version %1$s was created, tracking for %2$s is active."
 msgstr "Versio %s on luotu, kohteen %s.%s seuranta on käytössä."
 
-#: libraries/user_preferences.inc.php:29
+#: libraries/user_preferences.inc.php:30
 #, fuzzy
 #| msgid "Other core settings"
 msgid "Manage your settings"
 msgstr "Muut ydinasetukset"
 
-#: libraries/user_preferences.inc.php:46 prefs_manage.php:307
+#: libraries/user_preferences.inc.php:54 prefs_manage.php:307
 #, fuzzy
 #| msgid "Modifications have been saved"
 msgid "Configuration has been saved."
 msgstr "Muutokset tallennettu"
 
-#: libraries/user_preferences.inc.php:66
+#: libraries/user_preferences.inc.php:74
 #, php-format
 msgid ""
 "Your preferences will be saved for current session only. Storing them "
@@ -15669,7 +15684,7 @@ msgstr ""
 
 #: setup/lib/index.lib.php:135
 msgid "Got invalid version string from server"
-msgstr "Palvelimelta saatiin virheellinen versiomerkkijono."
+msgstr "Palvelimelta saatiin virheellinen versiomerkkijono"
 
 #: setup/lib/index.lib.php:148
 msgid "Unparsable version string"
@@ -15689,7 +15704,7 @@ msgstr ""
 
 #: setup/lib/index.lib.php:175
 msgid "No newer stable version is available"
-msgstr "Saatavilla ei ole uudempaa vakaata versiota."
+msgstr "Saatavilla ei ole uudempaa vakaata versiota"
 
 #: setup/validate.php:24
 #, fuzzy
@@ -15820,7 +15835,7 @@ msgid "first"
 msgstr ""
 
 #: templates/columns_definitions/move_column.phtml:12
-#: templates/structure/add_column.phtml:21
+#: templates/table/structure/add_column.phtml:21
 #, fuzzy, php-format
 #| msgid "After %s"
 msgid "after %s"
@@ -15907,238 +15922,345 @@ msgstr "Selaimen muunnos (transformation)"
 msgid "Input transformation options"
 msgstr "Muunnosvaihtoehdot"
 
-#: templates/designer/aggregate_query_panel.phtml:22
-#: templates/designer/options_panel.phtml:100
+#: templates/database/create_table.phtml:7
+#: templates/database/designer/side_menu.phtml:77
+#: templates/database/designer/side_menu.phtml:80
+msgid "Create table"
+msgstr "Luo taulu"
+
+#: templates/database/create_table.phtml:15
+msgid "Number of columns"
+msgstr "Kenttien määrä"
+
+#: templates/database/designer/aggregate_query_panel.phtml:22
+#: templates/database/designer/options_panel.phtml:100
 #, fuzzy
 #| msgid "Create"
 msgid "Aggregate"
 msgstr "Luo"
 
-#: templates/designer/aggregate_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:61
-#: templates/designer/options_panel.phtml:106
-#: templates/designer/options_panel.phtml:170
-#: templates/designer/where_query_panel.phtml:30
-#: templates/table/table_header.phtml:9
+#: templates/database/designer/aggregate_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:61
+#: templates/database/designer/options_panel.phtml:106
+#: templates/database/designer/options_panel.phtml:170
+#: templates/database/designer/where_query_panel.phtml:30
+#: templates/table/search/table_header.phtml:9
 msgid "Operator"
 msgstr "Operaattori"
 
-#: templates/designer/database_tables.phtml:29
+#: templates/database/designer/database_tables.phtml:29
 msgid "Toggle"
 msgstr ""
 
-#: templates/designer/database_tables.phtml:40
+#: templates/database/designer/database_tables.phtml:40
 #, fuzzy
 #| msgid "Table structure"
 msgid "See table structure"
 msgstr "Taulun rakenne"
 
-#: templates/designer/delete_relation_panel.phtml:21
+#: templates/database/designer/delete_relation_panel.phtml:21
 msgid "Delete relation"
 msgstr "Poista relaatio"
 
-#: templates/designer/edit_delete_pages.phtml:7
+#: templates/database/designer/edit_delete_pages.phtml:7
 #, fuzzy
 #| msgid "Page titles"
 msgid "Page to open"
 msgstr "Sivun otsikot"
 
-#: templates/designer/edit_delete_pages.phtml:7
+#: templates/database/designer/edit_delete_pages.phtml:7
 #, fuzzy
 #| msgid "Relation deleted"
 msgid "Page to delete"
 msgstr "Relaatio poistettu"
 
-#: templates/designer/having_query_panel.phtml:90
-#: templates/designer/options_panel.phtml:63
-#: templates/designer/options_panel.phtml:229
-#: templates/designer/where_query_panel.phtml:59
+#: templates/database/designer/having_query_panel.phtml:90
+#: templates/database/designer/options_panel.phtml:63
+#: templates/database/designer/options_panel.phtml:229
+#: templates/database/designer/where_query_panel.phtml:59
 #, fuzzy
 #| msgid "Export"
 msgid "Except"
 msgstr "Vienti"
 
-#: templates/designer/having_query_panel.phtml:102
-#: templates/designer/options_panel.phtml:75
-#: templates/designer/options_panel.phtml:241
-#: templates/designer/where_query_panel.phtml:71
+#: templates/database/designer/having_query_panel.phtml:102
+#: templates/database/designer/options_panel.phtml:75
+#: templates/database/designer/options_panel.phtml:241
+#: templates/database/designer/where_query_panel.phtml:71
 #, fuzzy
 #| msgid "in query"
 msgid "subquery"
 msgstr "lauseessa"
 
-#: templates/designer/new_relation_panel.phtml:22
-#: templates/designer/side_menu.phtml:84 templates/designer/side_menu.phtml:87
+#: templates/database/designer/new_relation_panel.phtml:22
+#: templates/database/designer/side_menu.phtml:84
+#: templates/database/designer/side_menu.phtml:87
 msgid "Create relation"
 msgstr "Luo relaatio"
 
-#: templates/designer/options_panel.phtml:34
-#: templates/designer/options_panel.phtml:200
+#: templates/database/designer/options_panel.phtml:34
+#: templates/database/designer/options_panel.phtml:200
 #, fuzzy
 #| msgid "Relation deleted"
 msgid "Relation operator"
 msgstr "Relaatio poistettu"
 
-#: templates/designer/options_panel.phtml:85
-#: templates/designer/rename_to_panel.phtml:23
+#: templates/database/designer/options_panel.phtml:85
+#: templates/database/designer/rename_to_panel.phtml:23
 #, fuzzy
 msgid "Rename to"
 msgstr "Nimeä taulu uudelleen"
 
-#: templates/designer/options_panel.phtml:91
-#: templates/designer/rename_to_panel.phtml:31
+#: templates/database/designer/options_panel.phtml:91
+#: templates/database/designer/rename_to_panel.phtml:31
 msgid "New name"
 msgstr "Uusi nimi"
 
-#: templates/designer/page_save_as.phtml:4
+#: templates/database/designer/page_save_as.phtml:4
 #, fuzzy
 #| msgid "Export to selected page"
 msgid "Save to selected page"
 msgstr "Vie valitulle sivulle"
 
-#: templates/designer/page_save_as.phtml:5
+#: templates/database/designer/page_save_as.phtml:5
 #, fuzzy
 #| msgid "Create a page and export to it"
 msgid "Create a page and save to it"
 msgstr "Luo sivu ja vie se"
 
-#: templates/designer/page_save_as.phtml:26
+#: templates/database/designer/page_save_as.phtml:26
 #, fuzzy
 #| msgid "New page name: "
 msgid "New page name"
 msgstr "Uuden sivun nimi: "
 
-#: templates/designer/page_selector.phtml:2
+#: templates/database/designer/page_selector.phtml:2
 #, fuzzy
 #| msgid "Select Tables"
 msgid "Select page"
 msgstr "Valitse taulut"
 
-#: templates/designer/query_details.phtml:10
+#: templates/database/designer/query_details.phtml:10
 #, fuzzy
 #| msgid "Table options"
 msgid "Active options"
 msgstr "Taulun valinnat"
 
-#: templates/designer/schema_export.phtml:4
+#: templates/database/designer/schema_export.phtml:4
 msgid "Select Export Relational Type"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:19 templates/designer/side_menu.phtml:25
+#: templates/database/designer/side_menu.phtml:19
+#: templates/database/designer/side_menu.phtml:25
 #, fuzzy
 #| msgid "Show tables"
 msgid "Show/Hide tables list"
 msgstr "Näytä taulut"
 
-#: templates/designer/side_menu.phtml:29 templates/designer/side_menu.phtml:35
-#: templates/designer/side_menu.phtml:36
+#: templates/database/designer/side_menu.phtml:29
+#: templates/database/designer/side_menu.phtml:35
+#: templates/database/designer/side_menu.phtml:36
 msgid "View in fullscreen"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:34
+#: templates/database/designer/side_menu.phtml:34
 msgid "Exit fullscreen"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:41 templates/designer/side_menu.phtml:45
+#: templates/database/designer/side_menu.phtml:41
+#: templates/database/designer/side_menu.phtml:45
 #, fuzzy
 #| msgid "New name"
 msgid "New page"
 msgstr "Uusi nimi"
 
-#: templates/designer/side_menu.phtml:70 templates/designer/side_menu.phtml:73
+#: templates/database/designer/side_menu.phtml:70
+#: templates/database/designer/side_menu.phtml:73
 #, fuzzy
 #| msgid "Select Tables"
 msgid "Delete pages"
 msgstr "Valitse taulut"
 
-#: templates/designer/side_menu.phtml:77 templates/designer/side_menu.phtml:80
-#: templates/table/create_table.phtml:7
-msgid "Create table"
-msgstr "Luo taulu"
-
-#: templates/designer/side_menu.phtml:98
-#: templates/designer/side_menu.phtml:101
+#: templates/database/designer/side_menu.phtml:98
+#: templates/database/designer/side_menu.phtml:101
 msgid "Reload"
 msgstr "Lataa uudelleen"
 
-#: templates/designer/side_menu.phtml:107
-#: templates/designer/side_menu.phtml:110
+#: templates/database/designer/side_menu.phtml:107
+#: templates/database/designer/side_menu.phtml:110
 msgid "Help"
 msgstr "Ohje"
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Angular links"
 msgstr "Kulmikkaat linkit"
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Direct links"
 msgstr "Suorat linkit"
 
-#: templates/designer/side_menu.phtml:122
-#: templates/designer/side_menu.phtml:124
+#: templates/database/designer/side_menu.phtml:122
+#: templates/database/designer/side_menu.phtml:124
 msgid "Snap to grid"
 msgstr "Sovita ruudukkoon"
 
-#: templates/designer/side_menu.phtml:128
-#: templates/designer/side_menu.phtml:134
+#: templates/database/designer/side_menu.phtml:128
+#: templates/database/designer/side_menu.phtml:134
 msgid "Small/Big All"
 msgstr "Kaikki pienenä/suurena"
 
-#: templates/designer/side_menu.phtml:138
-#: templates/designer/side_menu.phtml:141
+#: templates/database/designer/side_menu.phtml:138
+#: templates/database/designer/side_menu.phtml:141
 msgid "Toggle small/big"
 msgstr "Vaihda pieneksi/suureksi"
 
-#: templates/designer/side_menu.phtml:145
-#: templates/designer/side_menu.phtml:148
+#: templates/database/designer/side_menu.phtml:145
+#: templates/database/designer/side_menu.phtml:148
 #, fuzzy
 #| msgid "To select relation, click :"
 msgid "Toggle relation lines"
 msgstr "Valitaksesi relaation, paina :"
 
-#: templates/designer/side_menu.phtml:153
-#: templates/designer/side_menu.phtml:156
+#: templates/database/designer/side_menu.phtml:153
+#: templates/database/designer/side_menu.phtml:156
 #, fuzzy
 #| msgid "Export"
 msgid "Export schema"
 msgstr "Vienti"
 
-#: templates/designer/side_menu.phtml:165
-#: templates/designer/side_menu.phtml:168
+#: templates/database/designer/side_menu.phtml:165
+#: templates/database/designer/side_menu.phtml:168
 #, fuzzy
 #| msgid "Submit Query"
 msgid "Build Query"
 msgstr "Suorita"
 
-#: templates/designer/side_menu.phtml:173
-#: templates/designer/side_menu.phtml:177
+#: templates/database/designer/side_menu.phtml:173
+#: templates/database/designer/side_menu.phtml:177
 msgid "Move Menu"
 msgstr "Siirrä valikko"
 
-#: templates/designer/side_menu.phtml:181
-#: templates/designer/side_menu.phtml:186
+#: templates/database/designer/side_menu.phtml:181
+#: templates/database/designer/side_menu.phtml:186
 #, fuzzy
 #| msgid "Partial texts"
 msgid "Pin text"
 msgstr "Osittaiset tekstit"
 
-#: templates/designer/table_list.phtml:4
+#: templates/database/designer/table_list.phtml:4
 msgid "Hide/Show all"
 msgstr "Kätke/näytä kaikki"
 
-#: templates/designer/table_list.phtml:14
+#: templates/database/designer/table_list.phtml:14
 msgid "Hide/Show Tables with no relation"
 msgstr "Kätke/näytä taulut, joilla ei ole relaatiota"
 
-#: templates/designer/table_list.phtml:59
+#: templates/database/designer/table_list.phtml:59
 #, fuzzy
 #| msgid "Number of tables"
 msgid "Number of tables:"
 msgstr "Taulujen määrä"
 
+#: templates/database/structure/body_for_table_summary.phtml:6
+#, php-format
+msgid "%s table"
+msgid_plural "%s tables"
+msgstr[0] "%s taulu"
+msgstr[1] "%s taulua"
+
+#: templates/database/structure/body_for_table_summary.phtml:17
+msgid "Sum"
+msgstr "Summa"
+
+#: templates/database/structure/check_all_tables.phtml:6
+msgid "Check tables having overhead"
+msgstr "Valitse taulut, joissa on ylijäämää"
+
+#: templates/database/structure/check_all_tables.phtml:10
+#, fuzzy
+#| msgid "Show color"
+msgid "Show create"
+msgstr "Näytä värit"
+
+#: templates/database/structure/check_all_tables.phtml:27
+#, fuzzy
+#| msgid "Apply index(s)"
+msgid "Prefix"
+msgstr "Käytä indeksiä/indeksejä"
+
+#: templates/database/structure/check_all_tables.phtml:28
+msgid "Add prefix to table"
+msgstr "Lisää etuliite tauluun"
+
+#: templates/database/structure/check_all_tables.phtml:29
+msgid "Replace table prefix"
+msgstr "Korvaa taulun etuliite"
+
+#: templates/database/structure/check_all_tables.phtml:30
+msgid "Copy table with prefix"
+msgstr "Kopioi taulun etuliite"
+
+#: templates/database/structure/check_all_tables.phtml:36
+#, fuzzy
+#| msgid "CHAR textarea columns"
+msgid "Add columns to central list"
+msgstr "CHAR-tekstikentän sarakkeet"
+
+#: templates/database/structure/check_all_tables.phtml:37
+msgid "Remove columns from central list"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:38
+#, fuzzy
+#| msgid "CHAR textarea columns"
+msgid "Make consistent with central list"
+msgstr "CHAR-tekstikentän sarakkeet"
+
+#: templates/database/structure/favorite_anchor.phtml:12
+#, fuzzy
+#| msgid "Add a new server"
+msgid "Add to Favorites"
+msgstr "Lisää uusi palvelin"
+
+#: templates/database/structure/show_create.phtml:2
+#, fuzzy
+#| msgid "Show SQL queries"
+msgid "Showing create queries"
+msgstr "Näytä SQL-kyselyt"
+
+#: templates/database/structure/sortable_header.phtml:13
+msgid "Sort"
+msgstr "Järjestä"
+
+#: templates/database/structure/table_header.phtml:42
+#, fuzzy
+#| msgid "May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]"
+msgid ""
+"May be approximate. Click on the number to get the exact count. See "
+"[doc@faq3-11]FAQ 3.11[/doc]."
+msgstr "Saattaa olla summittainen. Katso [doc@faq3-11]FAQ 3.11[/doc]"
+
+#: templates/database/structure/table_header.phtml:66
+#: templates/table/index_form.phtml:127
+msgid "Size"
+msgstr "Koko"
+
+#: templates/database/structure/table_header.phtml:74
+#: templates/table/structure/display_table_stats.phtml:27
+msgid "Overhead"
+msgstr "Ylijäämä"
+
+#: templates/database/structure/tracking_icon.phtml:4
+msgid "Tracking is active."
+msgstr "Seuranta on käytössä."
+
+#: templates/database/structure/tracking_icon.phtml:8
+msgid "Tracking is not active."
+msgstr "Seuranta ei ole käytössä."
+
 #: templates/error/report_form.phtml:7
 msgid ""
 "phpMyAdmin has encountered an error. We have collected data about this error "
@@ -16154,73 +16276,6 @@ msgstr ""
 msgid "Please explain the steps that lead to the error:"
 msgstr ""
 
-#: templates/gis_visualization/gis_visualization.phtml:3
-#, fuzzy
-#| msgid "Display servers selection"
-msgid "Display GIS Visualization"
-msgstr "Näytä palvelinten valinta"
-
-#: templates/gis_visualization/gis_visualization.phtml:8
-#, fuzzy
-#| msgid "CHAR textarea columns"
-msgid "Label column"
-msgstr "CHAR-tekstikentän sarakkeet"
-
-#: templates/gis_visualization/gis_visualization.phtml:11
-#, fuzzy
-#| msgid "- none -"
-msgid "-- None --"
-msgstr "- ei mitään -"
-
-#: templates/gis_visualization/gis_visualization.phtml:19
-#, fuzzy
-#| msgid "Log file count"
-msgid "Spatial column"
-msgstr "Lokitiedostojen määrä"
-
-#: templates/index_form.phtml:16
-msgid "Index name:"
-msgstr "Indeksin nimi:"
-
-#: templates/index_form.phtml:19
-msgid ""
-"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
-msgstr "\"PRIMARY\" saa olla <b>vain ja ainoastaan</b> perusavaimen nimenä!"
-
-#: templates/index_form.phtml:40
-#, fuzzy
-#| msgid "Index cache size"
-msgid "Index choice:"
-msgstr "Indeksivälimuistin koko"
-
-#: templates/index_form.phtml:57
-msgid "Key block size:"
-msgstr ""
-
-#: templates/index_form.phtml:74
-msgid "Index type:"
-msgstr "Indeksin tyyppi:"
-
-#: templates/index_form.phtml:86
-#, fuzzy
-#| msgid "User:"
-msgid "Parser:"
-msgstr "Käyttäjä:"
-
-#: templates/index_form.phtml:102
-msgid "Comment:"
-msgstr "Kommentti:"
-
-#: templates/index_form.phtml:127 templates/structure/table_header.phtml:66
-msgid "Size"
-msgstr "Koko"
-
-#: templates/index_form.phtml:149 templates/index_form.phtml:190
-#, fuzzy
-#| msgid "Drag to reorder."
-msgid "Drag to reorder"
-msgstr "Muuta järjestystä vetämällä."
-
 #: templates/prefs_autoload.phtml:9
 msgid ""
 "Your browser has phpMyAdmin configuration for this domain. Would you like to "
@@ -16233,416 +16288,189 @@ msgstr ""
 msgid "Start row:"
 msgstr "Aloitusrivi"
 
-#: templates/structure/actions_in_table_structure.phtml:14
-#, php-format
-msgid "A primary key has been added on %s."
-msgstr "Sarakkeelle %s on luotu perusavain."
-
-#: templates/structure/actions_in_table_structure.phtml:34
-#: templates/structure/actions_in_table_structure.phtml:54
-#: templates/structure/actions_in_table_structure.phtml:79
-#: templates/structure/actions_in_table_structure.phtml:101
-#, php-format
-msgid "An index has been added on %s."
-msgstr "Sarakkeelle %s on lisätty indeksi."
-
-#: templates/structure/actions_in_table_structure.phtml:130
-#: templates/structure/check_all_table_column.phtml:59
-#, fuzzy
-#| msgid "Remove column(s)"
-msgid "Remove from central columns"
-msgstr "Poista sarake/sarakkeet"
-
-#: templates/structure/actions_in_table_structure.phtml:138
-#: templates/structure/check_all_table_column.phtml:55
-#, fuzzy
-#| msgid "CHAR textarea columns"
-msgid "Add to central columns"
-msgstr "CHAR-tekstikentän sarakkeet"
-
-#: templates/structure/add_column.phtml:7
-#, fuzzy, php-format
-#| msgid "Add column(s)"
-msgid "Add %s column(s)"
-msgstr "Lisää sarake/sarakkeita"
-
-#: templates/structure/add_column.phtml:12
-#, fuzzy
-#| msgid "At Beginning of Table"
-msgid "at beginning of table"
-msgstr "Taulun alkuun"
-
-#: templates/structure/body_for_table_summary.phtml:6
-#, php-format
-msgid "%s table"
-msgid_plural "%s tables"
-msgstr[0] "%s taulu"
-msgstr[1] "%s taulua"
-
-#: templates/structure/body_for_table_summary.phtml:17
-msgid "Sum"
-msgstr "Summa"
-
-#: templates/structure/check_all_tables.phtml:6
-msgid "Check tables having overhead"
-msgstr "Valitse taulut, joissa on ylijäämää"
-
-#: templates/structure/check_all_tables.phtml:10
-#, fuzzy
-#| msgid "Show color"
-msgid "Show create"
-msgstr "Näytä värit"
-
-#: templates/structure/check_all_tables.phtml:27
-#, fuzzy
-#| msgid "Apply index(s)"
-msgid "Prefix"
-msgstr "Käytä indeksiä/indeksejä"
-
-#: templates/structure/check_all_tables.phtml:28
-msgid "Add prefix to table"
-msgstr "Lisää etuliite tauluun"
-
-#: templates/structure/check_all_tables.phtml:29
-msgid "Replace table prefix"
-msgstr "Korvaa taulun etuliite"
-
-#: templates/structure/check_all_tables.phtml:30
-msgid "Copy table with prefix"
-msgstr "Kopioi taulun etuliite"
-
-#: templates/structure/check_all_tables.phtml:36
-#, fuzzy
-#| msgid "CHAR textarea columns"
-msgid "Add columns to central list"
-msgstr "CHAR-tekstikentän sarakkeet"
-
-#: templates/structure/check_all_tables.phtml:37
-msgid "Remove columns from central list"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:38
-#, fuzzy
-#| msgid "CHAR textarea columns"
-msgid "Make consistent with central list"
-msgstr "CHAR-tekstikentän sarakkeet"
-
-#: templates/structure/display_structure.phtml:140 view_create.php:181
-#, fuzzy
-#| msgid "Print view"
-msgid "Edit view"
-msgstr "Tulostusversio"
-
-#: templates/structure/display_table_stats.phtml:9
-msgid "Space usage"
-msgstr "Levytilan käyttö"
-
-#: templates/structure/display_table_stats.phtml:27
-#: templates/structure/table_header.phtml:74
-msgid "Overhead"
-msgstr "Ylijäämä"
-
-#: templates/structure/display_table_stats.phtml:32
-msgid "Effective"
-msgstr "Pätevä"
-
-#: templates/structure/favorite_anchor.phtml:12
-#, fuzzy
-#| msgid "Add a new server"
-msgid "Add to Favorites"
-msgstr "Lisää uusi palvelin"
-
-#: templates/structure/move_columns_dialog.phtml:1
-#: templates/structure/optional_action_links.phtml:21
-#, fuzzy
-#| msgid "Remove column(s)"
-msgid "Move columns"
-msgstr "Poista sarake/sarakkeet"
-
-#: templates/structure/move_columns_dialog.phtml:2
-msgid "Move the columns by dragging them up and down."
-msgstr ""
-
-#: templates/structure/optional_action_links.phtml:9
-msgid "Propose table structure"
-msgstr "Esitä taulun rakenne"
-
-#: templates/structure/optional_action_links.phtml:24
-#, fuzzy
-#| msgid "Propose table structure"
-msgid "Improve table structure"
-msgstr "Esitä taulun rakenne"
-
-#: templates/structure/optional_action_links.phtml:30
-#, fuzzy
-#| msgid "Track table"
-msgid "Track view"
-msgstr "Seuraa taulua"
-
-#: templates/structure/row_stats_table.phtml:3
-#, fuzzy
-#| msgid "Row Statistics"
-msgid "Row statistics"
-msgstr "Rivitilastot"
-
-#: templates/structure/row_stats_table.phtml:9
-msgid "static"
-msgstr "staattinen"
-
-#: templates/structure/row_stats_table.phtml:11
-msgid "dynamic"
-msgstr "dynaaminen"
-
-#: templates/structure/row_stats_table.phtml:22
-msgid "partitioned"
-msgstr "ositettu"
-
-#: templates/structure/row_stats_table.phtml:54
-msgid "Row length"
-msgstr "Rivin pituus"
-
-#: templates/structure/row_stats_table.phtml:66
-msgid "Row size"
-msgstr "Rivin koko"
-
-#: templates/structure/row_stats_table.phtml:73
-msgid "Next autoindex"
-msgstr ""
-
-#: templates/structure/secondary_tabs.phtml:14
-#, fuzzy
-#| msgid "Relation view"
-msgid "Relation view"
-msgstr "Relaationäkymä"
-
-#: templates/structure/show_create.phtml:2
-#, fuzzy
-#| msgid "Show SQL queries"
-msgid "Showing create queries"
-msgstr "Näytä SQL-kyselyt"
-
-#: templates/structure/sortable_header.phtml:13
-msgid "Sort"
-msgstr "Järjestä"
-
-#: templates/structure/table_header.phtml:42
-#, fuzzy
-#| msgid "May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]"
-msgid ""
-"May be approximate. Click on the number to get the exact count. See "
-"[doc@faq3-11]FAQ 3.11[/doc]."
-msgstr "Saattaa olla summittainen. Katso [doc@faq3-11]FAQ 3.11[/doc]"
-
-#: templates/structure/table_structure_row.phtml:46
-#, fuzzy, php-format
-#| msgid "Table %s has been dropped."
-msgid "Column %s has been dropped."
-msgstr "Taulu %s on poistettu"
-
-#: templates/structure/tracking_icon.phtml:4
-msgid "Tracking is active."
-msgstr "Seuranta on käytössä."
-
-#: templates/structure/tracking_icon.phtml:8
-msgid "Tracking is not active."
-msgstr "Seuranta ei ole käytössä."
-
-#: templates/table/create_table.phtml:15
-msgid "Number of columns"
-msgstr "Kenttien määrä"
-
-#: templates/table/options.phtml:8
-msgid "Select columns (at least one):"
-msgstr "Valitse sarakkeet (vähintään yksi):"
-
-#: templates/table/options.phtml:37
-msgid "Add search conditions (body of the \"where\" clause):"
-msgstr "Lisää hakuehtoja (\"WHERE\"-lauseen sisältö):"
-
-#: templates/table/options.phtml:45
-msgid "Number of rows per page"
-msgstr "Rivejä sivulla"
-
-#: templates/table/options.phtml:56
-msgid "Display order:"
-msgstr "Lajittelujärjestys:"
-
-#: templates/table/options_zoom.phtml:6
-msgid "Use this column to label each point"
-msgstr "Käytä tätä saraketta merkitäksesi jokaisen kohdan"
-
-#: templates/table/options_zoom.phtml:35
-msgid "Maximum rows to plot"
-msgstr "Tulostettavien rivien enimmäismäärä"
-
-#: templates/table/replace_preview.phtml:13
-msgid "Find and replace - preview"
-msgstr "Etsi ja korvaa - esikatselu"
-
-#: templates/table/replace_preview.phtml:18
-msgid "Original string"
-msgstr "Alkuperäinen merkkijono"
-
-#: templates/table/replace_preview.phtml:19
-msgid "Replaced string"
-msgstr "Korvattu merkkijono"
-
-#: templates/table/replace_preview.phtml:40
-msgid "Replace"
-msgstr "Korvaa"
-
-#: templates/table/rows_zoom.phtml:16
-msgid "Additional search criteria"
-msgstr "Tarkempi haku"
-
-#: templates/table/search_and_replace.phtml:3
-msgid "Replace with:"
-msgstr "Korvaa:"
-
-#: templates/table/search_and_replace.phtml:22
-msgid "Use regular expression"
-msgstr "Käytä säännöllistä lauseketta"
-
-#: templates/table/selection_form.phtml:12
-msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
-msgstr ""
-"Suorita mallin mukainen kysely (jokerimerkki: \"%\") kahteen eri sarakkeeseen"
-
-#: templates/table/selection_form.phtml:34
-msgid "Do a \"query by example\" (wildcard: \"%\")"
-msgstr "Suorita mallin mukainen kysely (jokerimerkki: \"%\")"
-
-#: templates/table/zoom_result_form.phtml:7
-msgid "Browse/Edit the points"
-msgstr "Selaa/muokkaa kohtia"
-
-#: templates/table/zoom_result_form.phtml:15
-msgid "How to use"
-msgstr "Kuinka käytetään"
-
-#: templates/table/zoom_result_form.phtml:23
-msgid "Reset zoom"
-msgstr "Palauta zoomaus"
-
-#: templates/tbl_chart.phtml:17
+#: templates/table/chart/tbl_chart.phtml:17
 #, fuzzy
 #| msgid "Mar"
 msgctxt "Chart type"
 msgid "Bar"
 msgstr "Maalis"
 
-#: templates/tbl_chart.phtml:21
+#: templates/table/chart/tbl_chart.phtml:21
 #, fuzzy
 #| msgid "Column"
 msgctxt "Chart type"
 msgid "Column"
 msgstr "Sarake"
 
-#: templates/tbl_chart.phtml:25
+#: templates/table/chart/tbl_chart.phtml:25
 msgctxt "Chart type"
 msgid "Line"
 msgstr ""
 
-#: templates/tbl_chart.phtml:29
+#: templates/table/chart/tbl_chart.phtml:29
 #, fuzzy
 #| msgid "Inline"
 msgctxt "Chart type"
 msgid "Spline"
 msgstr "Muokkaus"
 
-#: templates/tbl_chart.phtml:33
+#: templates/table/chart/tbl_chart.phtml:33
 msgctxt "Chart type"
 msgid "Area"
 msgstr ""
 
-#: templates/tbl_chart.phtml:37
+#: templates/table/chart/tbl_chart.phtml:37
 #, fuzzy
 #| msgid "PiB"
 msgctxt "Chart type"
 msgid "Pie"
 msgstr "Pt"
 
-#: templates/tbl_chart.phtml:41
+#: templates/table/chart/tbl_chart.phtml:41
 #, fuzzy
 #| msgid "Time"
 msgctxt "Chart type"
 msgid "Timeline"
 msgstr "Aika"
 
-#: templates/tbl_chart.phtml:45
+#: templates/table/chart/tbl_chart.phtml:45
 msgctxt "Chart type"
 msgid "Scatter"
 msgstr ""
 
-#: templates/tbl_chart.phtml:50
+#: templates/table/chart/tbl_chart.phtml:50
 #, fuzzy
 #| msgid "Packed"
 msgid "Stacked"
 msgstr "Pakattu"
 
-#: templates/tbl_chart.phtml:53
+#: templates/table/chart/tbl_chart.phtml:53
 #, fuzzy
 #| msgid "Report title"
 msgid "Chart title"
 msgstr "Raportin otsikko"
 
-#: templates/tbl_chart.phtml:57
+#: templates/table/chart/tbl_chart.phtml:57
 msgid "X-Axis:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:72
+#: templates/table/chart/tbl_chart.phtml:72
 #, fuzzy
 #| msgid "SQL queries"
 msgid "Series:"
 msgstr "SQL-kyselyt"
 
-#: templates/tbl_chart.phtml:102
+#: templates/table/chart/tbl_chart.phtml:102
 msgid "X-Axis label:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:104
+#: templates/table/chart/tbl_chart.phtml:104
 #, fuzzy
 #| msgid "Value"
 msgid "X Values"
 msgstr "Arvo"
 
-#: templates/tbl_chart.phtml:107
+#: templates/table/chart/tbl_chart.phtml:107
 msgid "Y-Axis label:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:115
+#: templates/table/chart/tbl_chart.phtml:115
 msgid "Series names are in a column"
 msgstr ""
 
-#: templates/tbl_chart.phtml:118
+#: templates/table/chart/tbl_chart.phtml:118
 #, fuzzy
 #| msgid "Inside column:"
 msgid "Series column:"
 msgstr "Sarakkeen sisällä:"
 
-#: templates/tbl_chart.phtml:130
+#: templates/table/chart/tbl_chart.phtml:130
 #, fuzzy
 #| msgid "Values for column %s"
 msgid "Value Column:"
 msgstr "Arvot sarakkeelle %s"
 
-#: templates/tbl_chart.phtml:150
+#: templates/table/chart/tbl_chart.phtml:150
 #, fuzzy
 #| msgid "Save as file"
 msgid "Save chart as image"
 msgstr "Tallenna tiedostoon"
 
-#: templates/tbl_relation/common_form.phtml:7
+#: templates/table/gis_visualization/gis_visualization.phtml:3
+#, fuzzy
+#| msgid "Display servers selection"
+msgid "Display GIS Visualization"
+msgstr "Näytä palvelinten valinta"
+
+#: templates/table/gis_visualization/gis_visualization.phtml:8
+#, fuzzy
+#| msgid "CHAR textarea columns"
+msgid "Label column"
+msgstr "CHAR-tekstikentän sarakkeet"
+
+#: templates/table/gis_visualization/gis_visualization.phtml:11
+#, fuzzy
+#| msgid "- none -"
+msgid "-- None --"
+msgstr "- ei mitään -"
+
+#: templates/table/gis_visualization/gis_visualization.phtml:19
+#, fuzzy
+#| msgid "Log file count"
+msgid "Spatial column"
+msgstr "Lokitiedostojen määrä"
+
+#: templates/table/index_form.phtml:16
+msgid "Index name:"
+msgstr "Indeksin nimi:"
+
+#: templates/table/index_form.phtml:19
+msgid ""
+"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
+msgstr ""
+"\"PRIMARY\" saa olla <b>vain</b> ja <b>ainoastaan</b> perusavaimen nimenä!"
+
+#: templates/table/index_form.phtml:40
+#, fuzzy
+#| msgid "Index cache size"
+msgid "Index choice:"
+msgstr "Indeksivälimuistin koko"
+
+#: templates/table/index_form.phtml:57
+msgid "Key block size:"
+msgstr ""
+
+#: templates/table/index_form.phtml:74
+msgid "Index type:"
+msgstr "Indeksin tyyppi:"
+
+#: templates/table/index_form.phtml:86
+#, fuzzy
+#| msgid "User:"
+msgid "Parser:"
+msgstr "Käyttäjä:"
+
+#: templates/table/index_form.phtml:102
+msgid "Comment:"
+msgstr "Kommentti:"
+
+#: templates/table/index_form.phtml:149 templates/table/index_form.phtml:190
+#, fuzzy
+#| msgid "Drag to reorder."
+msgid "Drag to reorder"
+msgstr "Muuta järjestystä vetämällä."
+
+#: templates/table/relation/common_form.phtml:7
 msgid "Internal relations"
 msgstr "Sisäiset relaatiot"
 
-#: templates/tbl_relation/common_form.phtml:11
+#: templates/table/relation/common_form.phtml:11
 #, fuzzy
 #| msgid "Internal relations"
 msgid "Internal relation"
 msgstr "Sisäiset relaatiot"
 
-#: templates/tbl_relation/common_form.phtml:14
+#: templates/table/relation/common_form.phtml:14
 msgid ""
 "An internal relation is not necessary when a corresponding FOREIGN KEY "
 "relation exists."
@@ -16650,65 +16478,260 @@ msgstr ""
 "Sisäistä relaatiota ei tarvita, kun vastaava FOREIGN KEY -relaatio on "
 "olemassa."
 
-#: templates/tbl_relation/common_form.phtml:37
+#: templates/table/relation/common_form.phtml:37
 #, fuzzy
 #| msgid "Foreign key limit"
 msgid "Foreign key constraints"
 msgstr "Viiteavaimen rajoitus"
 
-#: templates/tbl_relation/common_form.phtml:40
+#: templates/table/relation/common_form.phtml:40
 #, fuzzy
 #| msgid "Action"
 msgid "Actions"
 msgstr "Toiminnot"
 
-#: templates/tbl_relation/common_form.phtml:41
+#: templates/table/relation/common_form.phtml:41
 #, fuzzy
 #| msgid "Constraints for table"
 msgid "Constraint properties"
 msgstr "Rajoitteet taululle"
 
-#: templates/tbl_relation/common_form.phtml:44
+#: templates/table/relation/common_form.phtml:44
 msgid ""
 "Only columns with index will be displayed. You can define an index below."
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:49
+#: templates/table/relation/common_form.phtml:49
 #, fuzzy
 #| msgid "Foreign key limit"
 msgid "Foreign key constraint"
 msgstr "Viiteavaimen rajoitus"
 
-#: templates/tbl_relation/common_form.phtml:81
+#: templates/table/relation/common_form.phtml:81
 #, fuzzy
 #| msgid "Add constraints"
 msgid "+ Add constraint"
 msgstr "Lisää rajoitteet"
 
-#: templates/tbl_relation/common_form.phtml:91
+#: templates/table/relation/common_form.phtml:91
 #, fuzzy
 #| msgid "Choose column to display"
 msgid "Choose column to display:"
 msgstr "Valitse näytettävä sarake"
 
-#: templates/tbl_relation/foreign_key_row.phtml:13
+#: templates/table/relation/foreign_key_row.phtml:13
 #, fuzzy, php-format
 #| msgid "Foreign key limit"
 msgid "Foreign key constraint %s has been dropped"
 msgstr "Viiteavaimen rajoitus"
 
-#: templates/tbl_relation/foreign_key_row.phtml:102
+#: templates/table/relation/foreign_key_row.phtml:102
 #, fuzzy
 #| msgid "Constraints for table"
 msgid "Constraint name"
 msgstr "Rajoitteet taululle"
 
-#: templates/tbl_relation/foreign_key_row.phtml:157
+#: templates/table/relation/foreign_key_row.phtml:157
 #, fuzzy
 #| msgid "Add column"
 msgid "+ Add column"
 msgstr "Lisää sarake"
 
+#: templates/table/search/options.phtml:8
+msgid "Select columns (at least one):"
+msgstr "Valitse sarakkeet (vähintään yksi):"
+
+#: templates/table/search/options.phtml:37
+msgid "Add search conditions (body of the \"where\" clause):"
+msgstr "Lisää hakuehtoja (\"WHERE\"-lauseen sisältö):"
+
+#: templates/table/search/options.phtml:45
+msgid "Number of rows per page"
+msgstr "Rivejä sivulla"
+
+#: templates/table/search/options.phtml:56
+msgid "Display order:"
+msgstr "Lajittelujärjestys:"
+
+#: templates/table/search/options_zoom.phtml:6
+msgid "Use this column to label each point"
+msgstr "Käytä tätä saraketta merkitäksesi jokaisen kohdan"
+
+#: templates/table/search/options_zoom.phtml:35
+msgid "Maximum rows to plot"
+msgstr "Tulostettavien rivien enimmäismäärä"
+
+#: templates/table/search/replace_preview.phtml:13
+msgid "Find and replace - preview"
+msgstr "Etsi ja korvaa - esikatselu"
+
+#: templates/table/search/replace_preview.phtml:18
+msgid "Original string"
+msgstr "Alkuperäinen merkkijono"
+
+#: templates/table/search/replace_preview.phtml:19
+msgid "Replaced string"
+msgstr "Korvattu merkkijono"
+
+#: templates/table/search/replace_preview.phtml:40
+msgid "Replace"
+msgstr "Korvaa"
+
+#: templates/table/search/rows_zoom.phtml:16
+msgid "Additional search criteria"
+msgstr "Tarkempi haku"
+
+#: templates/table/search/search_and_replace.phtml:3
+msgid "Replace with:"
+msgstr "Korvaa:"
+
+#: templates/table/search/search_and_replace.phtml:22
+msgid "Use regular expression"
+msgstr "Käytä säännöllistä lauseketta"
+
+#: templates/table/search/selection_form.phtml:12
+msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
+msgstr ""
+"Suorita mallin mukainen kysely (jokerimerkki: \"%\") kahteen eri sarakkeeseen"
+
+#: templates/table/search/selection_form.phtml:34
+msgid "Do a \"query by example\" (wildcard: \"%\")"
+msgstr "Suorita mallin mukainen kysely (jokerimerkki: \"%\")"
+
+#: templates/table/search/zoom_result_form.phtml:7
+msgid "Browse/Edit the points"
+msgstr "Selaa/muokkaa kohtia"
+
+#: templates/table/search/zoom_result_form.phtml:15
+msgid "How to use"
+msgstr "Kuinka käytetään"
+
+#: templates/table/search/zoom_result_form.phtml:23
+msgid "Reset zoom"
+msgstr "Palauta zoomaus"
+
+#: templates/table/secondary_tabs.phtml:14
+#, fuzzy
+#| msgid "Relation view"
+msgid "Relation view"
+msgstr "Relaationäkymä"
+
+#: templates/table/structure/actions_in_table_structure.phtml:14
+#, php-format
+msgid "A primary key has been added on %s."
+msgstr "Sarakkeelle %s on luotu perusavain."
+
+#: templates/table/structure/actions_in_table_structure.phtml:34
+#: templates/table/structure/actions_in_table_structure.phtml:54
+#: templates/table/structure/actions_in_table_structure.phtml:79
+#: templates/table/structure/actions_in_table_structure.phtml:101
+#, php-format
+msgid "An index has been added on %s."
+msgstr "Sarakkeelle %s on lisätty indeksi."
+
+#: templates/table/structure/actions_in_table_structure.phtml:130
+#: templates/table/structure/check_all_table_column.phtml:59
+#, fuzzy
+#| msgid "Remove column(s)"
+msgid "Remove from central columns"
+msgstr "Poista sarake/sarakkeet"
+
+#: templates/table/structure/actions_in_table_structure.phtml:138
+#: templates/table/structure/check_all_table_column.phtml:55
+#, fuzzy
+#| msgid "CHAR textarea columns"
+msgid "Add to central columns"
+msgstr "CHAR-tekstikentän sarakkeet"
+
+#: templates/table/structure/add_column.phtml:7
+#, fuzzy, php-format
+#| msgid "Add column(s)"
+msgid "Add %s column(s)"
+msgstr "Lisää sarake/sarakkeita"
+
+#: templates/table/structure/add_column.phtml:12
+#, fuzzy
+#| msgid "At Beginning of Table"
+msgid "at beginning of table"
+msgstr "Taulun alkuun"
+
+#: templates/table/structure/display_structure.phtml:140 view_create.php:181
+#, fuzzy
+#| msgid "Print view"
+msgid "Edit view"
+msgstr "Tulostusversio"
+
+#: templates/table/structure/display_table_stats.phtml:9
+msgid "Space usage"
+msgstr "Levytilan käyttö"
+
+#: templates/table/structure/display_table_stats.phtml:32
+msgid "Effective"
+msgstr "Pätevä"
+
+#: templates/table/structure/move_columns_dialog.phtml:1
+#: templates/table/structure/optional_action_links.phtml:21
+#, fuzzy
+#| msgid "Remove column(s)"
+msgid "Move columns"
+msgstr "Poista sarake/sarakkeet"
+
+#: templates/table/structure/move_columns_dialog.phtml:2
+msgid "Move the columns by dragging them up and down."
+msgstr ""
+
+#: templates/table/structure/optional_action_links.phtml:9
+msgid "Propose table structure"
+msgstr "Esitä taulun rakenne"
+
+#: templates/table/structure/optional_action_links.phtml:24
+#, fuzzy
+#| msgid "Propose table structure"
+msgid "Improve table structure"
+msgstr "Esitä taulun rakenne"
+
+#: templates/table/structure/optional_action_links.phtml:30
+#, fuzzy
+#| msgid "Track table"
+msgid "Track view"
+msgstr "Seuraa taulua"
+
+#: templates/table/structure/row_stats_table.phtml:3
+#, fuzzy
+#| msgid "Row Statistics"
+msgid "Row statistics"
+msgstr "Rivitilastot"
+
+#: templates/table/structure/row_stats_table.phtml:9
+msgid "static"
+msgstr "staattinen"
+
+#: templates/table/structure/row_stats_table.phtml:11
+msgid "dynamic"
+msgstr "dynaaminen"
+
+#: templates/table/structure/row_stats_table.phtml:22
+msgid "partitioned"
+msgstr "ositettu"
+
+#: templates/table/structure/row_stats_table.phtml:54
+msgid "Row length"
+msgstr "Rivin pituus"
+
+#: templates/table/structure/row_stats_table.phtml:66
+msgid "Row size"
+msgstr "Rivin koko"
+
+#: templates/table/structure/row_stats_table.phtml:73
+msgid "Next autoindex"
+msgstr ""
+
+#: templates/table/structure/table_structure_row.phtml:46
+#, fuzzy, php-format
+#| msgid "Table %s has been dropped."
+msgid "Column %s has been dropped."
+msgstr "Taulu %s on poistettu"
+
 #: themes.php:17 themes.php:22
 msgid "Theme"
 msgstr "Teema"
@@ -17986,6 +18009,11 @@ msgstr ""
 msgid "concurrent_insert is set to 0"
 msgstr "concurrent_insert on asetettu arvoon 0"
 
+#, fuzzy
+#~| msgid "Read misses"
+#~ msgid "Read as multibytes"
+#~ msgstr "Epäonnistuneet lukuyritykset"
+
 #~ msgid "Relational display column"
 #~ msgstr "Relatiivinen näyttösarake"
 
diff --git a/po/fr.po b/po/fr.po
index 257394a63e..33a5db5ff6 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -3,8 +3,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin-docs 4.0.0-dev\n"
 "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
-"POT-Creation-Date: 2015-08-08 13:53-0400\n"
-"PO-Revision-Date: 2015-08-09 11:29+0200\n"
+"POT-Creation-Date: 2015-08-12 08:10-0400\n"
+"PO-Revision-Date: 2015-08-12 16:44+0200\n"
 "Last-Translator: Marc Delisle <marc@infomarc.info>\n"
 "Language-Team: French "
 "<https://hosted.weblate.org/projects/phpmyadmin/master/fr/>\n"
@@ -54,7 +54,7 @@ msgid "Table comments:"
 msgstr "Commentaires sur la table : "
 
 #: db_datadict.php:104 libraries/Index.class.php:699
-#: libraries/insert_edit.lib.php:1567
+#: libraries/insert_edit.lib.php:1565
 #: libraries/navigation/Nodes/Node_Column.class.php:30
 #: libraries/plugins/export/ExportHtmlword.class.php:280
 #: libraries/plugins/export/ExportHtmlword.class.php:375
@@ -68,13 +68,14 @@ msgstr "Commentaires sur la table : "
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1023
 #: libraries/tracking.lib.php:879 libraries/tracking.lib.php:975
 #: templates/columns_definitions/column_name.phtml:18
-#: templates/index_form.phtml:124 templates/table/table_header.phtml:6
-#: templates/table/zoom_result_form.phtml:33
-#: templates/tbl_relation/common_form.phtml:10
-#: templates/tbl_relation/common_form.phtml:43
-#: templates/tbl_relation/foreign_key_row.phtml:194
-#: templates/tbl_relation/foreign_key_row.phtml:206
-#: templates/tbl_relation/internal_relational_row.phtml:71
+#: templates/table/index_form.phtml:124
+#: templates/table/relation/common_form.phtml:10
+#: templates/table/relation/common_form.phtml:43
+#: templates/table/relation/foreign_key_row.phtml:194
+#: templates/table/relation/foreign_key_row.phtml:206
+#: templates/table/relation/internal_relational_row.phtml:71
+#: templates/table/search/table_header.phtml:6
+#: templates/table/search/zoom_result_form.phtml:33
 msgid "Column"
 msgstr "Colonne"
 
@@ -92,21 +93,21 @@ msgstr "Colonne"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1001
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1024
 #: libraries/rte/rte_list.lib.php:75 libraries/rte/rte_list.lib.php:103
-#: libraries/rte/rte_routines.lib.php:802
-#: libraries/rte/rte_routines.lib.php:831
-#: libraries/rte/rte_routines.lib.php:1493
+#: libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_routines.lib.php:922
+#: libraries/rte/rte_routines.lib.php:1584
 #: libraries/server_privileges.lib.php:2369 libraries/tracking.lib.php:880
 #: libraries/tracking.lib.php:972
 #: templates/columns_definitions/table_fields_definitions.phtml:11
-#: templates/structure/table_header.phtml:48
-#: templates/structure/table_structure_header.phtml:6
-#: templates/table/table_header.phtml:7
+#: templates/database/structure/table_header.phtml:48
+#: templates/table/search/table_header.phtml:7
+#: templates/table/structure/table_structure_header.phtml:6
 msgid "Type"
 msgstr "Type"
 
 #: db_datadict.php:106 libraries/Index.class.php:702
 #: libraries/central_columns.lib.php:708
-#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1576
+#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1574
 #: libraries/plugins/export/ExportHtmlword.class.php:286
 #: libraries/plugins/export/ExportHtmlword.class.php:381
 #: libraries/plugins/export/ExportLatex.class.php:509
@@ -119,8 +120,8 @@ msgstr "Type"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1026
 #: libraries/tracking.lib.php:882 libraries/tracking.lib.php:978
 #: templates/columns_definitions/table_fields_definitions.phtml:39
-#: templates/structure/table_structure_header.phtml:9
-#: templates/table/zoom_result_form.phtml:34
+#: templates/table/search/zoom_result_form.phtml:34
+#: templates/table/structure/table_structure_header.phtml:9
 msgid "Null"
 msgstr "Null"
 
@@ -138,8 +139,8 @@ msgstr "Null"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1027
 #: libraries/replication_gui.lib.php:153 libraries/tracking.lib.php:883
 #: templates/columns_definitions/table_fields_definitions.phtml:25
-#: templates/structure/body_for_table_summary.phtml:55
-#: templates/structure/table_structure_header.phtml:10
+#: templates/database/structure/body_for_table_summary.phtml:55
+#: templates/table/structure/table_structure_header.phtml:10
 msgid "Default"
 msgstr "Défaut"
 
@@ -167,19 +168,19 @@ msgid "Comments"
 msgstr "Commentaires"
 
 #: db_datadict.php:146
-#: libraries/controllers/StructureController.class.php:1960
-#: libraries/controllers/StructureController.class.php:1965
+#: libraries/controllers/TableStructureController.class.php:951
+#: libraries/controllers/TableStructureController.class.php:956
 #: libraries/tracking.lib.php:922
 #: templates/columns_definitions/column_indexes.phtml:6
-#: templates/structure/check_all_table_column.phtml:22
-#: templates/structure/display_structure.phtml:74
+#: templates/table/structure/check_all_table_column.phtml:22
+#: templates/table/structure/display_structure.phtml:74
 msgid "Primary"
 msgstr "Primaire"
 
 #: db_datadict.php:156 js/messages.php:317 libraries/Index.class.php:567
 #: libraries/Index.class.php:606 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261 libraries/mult_submits.lib.php:403
+#: libraries/config/FormDisplay.tpl.php:272 libraries/mult_submits.lib.php:403
 #: libraries/mult_submits.lib.php:417
 #: libraries/plugins/export/ExportHtmlword.class.php:630
 #: libraries/plugins/export/ExportLatex.class.php:589
@@ -195,20 +196,20 @@ msgstr "Primaire"
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1010 libraries/tracking.lib.php:1015
 #: prefs_manage.php:140 templates/prefs_autoload.phtml:15
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "No"
 msgstr "Non"
 
 #: db_datadict.php:156 js/messages.php:443 libraries/Index.class.php:568
 #: libraries/Index.class.php:605 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261
-#: libraries/controllers/StructureController.class.php:1344
-#: libraries/controllers/StructureController.class.php:2223
-#: libraries/controllers/StructureController.class.php:2232
-#: libraries/controllers/StructureController.class.php:2237
-#: libraries/controllers/StructureController.class.php:2242
-#: libraries/controllers/StructureController.class.php:2247
+#: libraries/config/FormDisplay.tpl.php:272
+#: libraries/controllers/TableStructureController.class.php:539
+#: libraries/controllers/TableStructureController.class.php:1201
+#: libraries/controllers/TableStructureController.class.php:1210
+#: libraries/controllers/TableStructureController.class.php:1215
+#: libraries/controllers/TableStructureController.class.php:1220
+#: libraries/controllers/TableStructureController.class.php:1225
 #: libraries/mult_submits.inc.php:82 libraries/mult_submits.inc.php:178
 #: libraries/mult_submits.lib.php:339 libraries/mult_submits.lib.php:372
 #: libraries/mult_submits.lib.php:401 libraries/mult_submits.lib.php:415
@@ -217,8 +218,8 @@ msgstr "Non"
 #: libraries/plugins/export/ExportOdt.class.php:756
 #: libraries/plugins/export/ExportTexytext.class.php:567
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1077
-#: libraries/server_databases.lib.php:464
-#: libraries/server_databases.lib.php:474
+#: libraries/server_databases.lib.php:475
+#: libraries/server_databases.lib.php:485
 #: libraries/server_privileges.lib.php:2546
 #: libraries/server_privileges.lib.php:2727
 #: libraries/server_privileges.lib.php:2748
@@ -228,7 +229,7 @@ msgstr "Non"
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1008 libraries/tracking.lib.php:1013
 #: prefs_manage.php:138 templates/prefs_autoload.phtml:14
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "Yes"
 msgstr "Oui"
 
@@ -238,7 +239,7 @@ msgstr "Voir une exportation (schéma) de la base de données"
 
 #: db_export.php:37 db_tracking.php:90 export.php:382
 #: libraries/DBQbe.class.php:326
-#: libraries/controllers/StructureController.class.php:231
+#: libraries/controllers/DatabaseStructureController.class.php:170
 #: libraries/navigation/NavigationTree.class.php:897
 msgid "No tables found in database."
 msgstr "Aucune table n'a été trouvée dans cette base."
@@ -249,14 +250,14 @@ msgstr "Aucune table n'a été trouvée dans cette base."
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:26
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:120
-#: templates/structure/show_create.phtml:18
+#: templates/database/structure/show_create.phtml:18
 msgid "Tables"
 msgstr "Tables"
 
 #: db_export.php:52 libraries/Menu.class.php:317 libraries/Menu.class.php:425
-#: libraries/Util.class.php:3333 libraries/Util.class.php:3343
-#: libraries/Util.class.php:3349 libraries/Util.class.php:3629
-#: libraries/Util.class.php:4327 libraries/Util.class.php:4344
+#: libraries/Util.class.php:3339 libraries/Util.class.php:3349
+#: libraries/Util.class.php:3355 libraries/Util.class.php:3635
+#: libraries/Util.class.php:4333 libraries/Util.class.php:4350
 #: libraries/central_columns.lib.php:728 libraries/config.values.php:39
 #: libraries/config.values.php:47 libraries/config.values.php:109
 #: libraries/config.values.php:115 libraries/config/setup.forms.php:323
@@ -270,7 +271,7 @@ msgstr "Tables"
 #: libraries/navigation/Nodes/Node_Table.class.php:283
 #: libraries/server_privileges.lib.php:1141 libraries/tracking.lib.php:874
 #: templates/columns_definitions/table_fields_definitions.phtml:3
-#: templates/designer/table_list.phtml:28
+#: templates/database/designer/table_list.phtml:28
 msgid "Structure"
 msgstr "Structure"
 
@@ -282,7 +283,7 @@ msgstr "Structure"
 #: libraries/config/user_preferences.forms.php:292
 #: libraries/config/user_preferences.forms.php:297
 #: libraries/server_privileges.lib.php:1140
-#: templates/structure/display_table_stats.phtml:12
+#: templates/table/structure/display_table_stats.phtml:12
 msgid "Data"
 msgstr "Données"
 
@@ -356,10 +357,10 @@ msgstr "Tables faisant l'objet d'un suivi"
 #: libraries/server_privileges.lib.php:2908
 #: libraries/server_privileges.lib.php:3145
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4346
-#: templates/structure/table_header.phtml:21
-#: templates/tbl_relation/foreign_key_row.phtml:176
-#: templates/tbl_relation/internal_relational_row.phtml:63
+#: libraries/server_privileges.lib.php:4372
+#: templates/database/structure/table_header.phtml:21
+#: templates/table/relation/foreign_key_row.phtml:176
+#: templates/table/relation/internal_relational_row.phtml:63
 msgid "Table"
 msgstr "Table"
 
@@ -376,7 +377,7 @@ msgid "Updated"
 msgstr "Mis à jour"
 
 #: db_tracking.php:130 js/messages.php:243 libraries/Menu.class.php:552
-#: libraries/Util.class.php:4314 libraries/config.values.php:104
+#: libraries/Util.class.php:4320 libraries/config.values.php:104
 #: libraries/rte/rte_events.lib.php:393 libraries/rte/rte_list.lib.php:101
 #: libraries/server_status_processes.lib.php:92 libraries/tracking.lib.php:279
 msgid "Status"
@@ -385,14 +386,15 @@ msgstr "État"
 #: db_tracking.php:131 db_tracking.php:290 libraries/Index.class.php:693
 #: libraries/central_columns.lib.php:687 libraries/rte/rte_list.lib.php:74
 #: libraries/rte/rte_list.lib.php:89 libraries/rte/rte_list.lib.php:102
-#: libraries/server_databases.lib.php:398
+#: libraries/server_databases.lib.php:409
 #: libraries/server_privileges.lib.php:2372
 #: libraries/server_privileges.lib.php:3166
 #: libraries/server_privileges.lib.php:3342
 #: libraries/server_user_groups.lib.php:82
 #: libraries/server_variables.lib.php:189 libraries/tracking.lib.php:280
-#: libraries/tracking.lib.php:793 templates/structure/table_header.phtml:30
-#: templates/structure/table_structure_header.phtml:23
+#: libraries/tracking.lib.php:793
+#: templates/database/structure/table_header.phtml:30
+#: templates/table/structure/table_structure_header.phtml:23
 msgid "Action"
 msgstr "Action"
 
@@ -434,7 +436,7 @@ msgid "Untracked tables"
 msgstr "Tables ne faisant pas l'objet d'un suivi"
 
 #: db_tracking.php:305 db_tracking.php:336
-#: templates/structure/optional_action_links.phtml:17
+#: templates/table/structure/optional_action_links.phtml:17
 msgid "Track table"
 msgstr "Suivre la table"
 
@@ -490,7 +492,7 @@ msgid "Value for the column \"%s\""
 msgstr "Valeur pour la colonne «%s»"
 
 #: gis_data_editor.php:146
-#: templates/gis_visualization/gis_visualization.phtml:37
+#: templates/table/gis_visualization/gis_visualization.phtml:37
 msgid "Use OpenStreetMaps as Base Layer"
 msgstr "Utiliser OpenStreetMaps comme couche de base"
 
@@ -570,35 +572,35 @@ msgstr "Ajouter géométrie"
 #: libraries/display_change_password.lib.php:162
 #: libraries/display_export.lib.php:402 libraries/display_export.lib.php:408
 #: libraries/display_import.lib.php:392 libraries/index.lib.php:44
-#: libraries/insert_edit.lib.php:1546 libraries/insert_edit.lib.php:1583
+#: libraries/insert_edit.lib.php:1544 libraries/insert_edit.lib.php:1581
 #: libraries/normalization.lib.php:165 libraries/normalization.lib.php:821
 #: libraries/operations.lib.php:38 libraries/operations.lib.php:108
 #: libraries/operations.lib.php:263 libraries/operations.lib.php:306
 #: libraries/operations.lib.php:801 libraries/operations.lib.php:874
 #: libraries/operations.lib.php:923 libraries/operations.lib.php:1337
 #: libraries/operations.lib.php:1658
-#: libraries/plugins/auth/AuthenticationCookie.class.php:244
+#: libraries/plugins/auth/AuthenticationCookie.class.php:232
 #: libraries/replication_gui.lib.php:122 libraries/replication_gui.lib.php:161
 #: libraries/replication_gui.lib.php:324 libraries/replication_gui.lib.php:461
 #: libraries/replication_gui.lib.php:906 libraries/rte/rte_events.lib.php:509
-#: libraries/rte/rte_routines.lib.php:969
-#: libraries/rte/rte_routines.lib.php:1581
+#: libraries/rte/rte_routines.lib.php:1060
+#: libraries/rte/rte_routines.lib.php:1672
 #: libraries/rte/rte_triggers.lib.php:396 libraries/server_bin_log.lib.php:61
 #: libraries/server_privileges.lib.php:705
 #: libraries/server_privileges.lib.php:2106
 #: libraries/server_privileges.lib.php:2872
 #: libraries/server_privileges.lib.php:3553
-#: libraries/server_privileges.lib.php:4627
+#: libraries/server_privileges.lib.php:4653
 #: libraries/server_user_groups.lib.php:285
 #: libraries/sql_query_form.lib.php:369 libraries/sql_query_form.lib.php:429
 #: libraries/tracking.lib.php:533 libraries/tracking.lib.php:653
 #: prefs_manage.php:277 prefs_manage.php:355
 #: templates/columns_definitions/column_definitions_form.phtml:59
-#: templates/header_location.phtml:17 templates/index_form.phtml:238
+#: templates/database/create_table.phtml:21 templates/header_location.phtml:28
 #: templates/startAndNumberOfRowsPanel.phtml:14
-#: templates/structure/add_column.phtml:25
-#: templates/table/create_table.phtml:21
-#: templates/table/selection_form.phtml:75 view_create.php:275
+#: templates/table/index_form.phtml:238
+#: templates/table/search/selection_form.phtml:75
+#: templates/table/structure/add_column.phtml:25 view_create.php:275
 #: view_operations.php:106
 msgid "Go"
 msgstr "Exécuter"
@@ -691,7 +693,7 @@ msgstr ""
 "Chargement impossible des greffons d'importation, veuillez vérifier votre "
 "installation !"
 
-#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1466
+#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1460
 #, php-format
 msgid "Bookmark %s has been created."
 msgstr "Signet %s créé."
@@ -730,11 +732,11 @@ msgstr "Impossible de charger l'état d'avancement de l'importation."
 msgid "Back"
 msgstr "Retour"
 
-#: index.php:148 libraries/Footer.class.php:70
+#: index.php:149 libraries/Footer.class.php:70
 msgid "phpMyAdmin Demo Server"
 msgstr "Serveur de démonstration phpMyAdmin"
 
-#: index.php:152
+#: index.php:153
 #, php-format
 msgid ""
 "You are using the demo server. You can do anything here, but please do not "
@@ -745,110 +747,110 @@ msgstr ""
 "voulez, mais s'il vous plaît, ne changez pas les utilisateurs root, debian-"
 "sys-maint et pma. Plus d'informations sont disponibles à %s."
 
-#: index.php:162
+#: index.php:163
 msgid "General Settings"
 msgstr "Paramètres généraux"
 
-#: index.php:190 libraries/display_change_password.lib.php:50
+#: index.php:191 libraries/display_change_password.lib.php:50
 #: libraries/display_change_password.lib.php:53 user_password.php:247
 msgid "Change password"
 msgstr "Modifier le mot de passe"
 
-#: index.php:206
+#: index.php:207
 msgid "Server connection collation"
 msgstr "Interclassement pour la connexion au serveur"
 
-#: index.php:228
+#: index.php:229
 msgid "Appearance Settings"
 msgstr "Paramètres d'affichage"
 
-#: index.php:258 prefs_manage.php:285
+#: index.php:259 prefs_manage.php:285
 msgid "More settings"
 msgstr "Plus de paramètres"
 
-#: index.php:279
+#: index.php:280
 msgid "Database server"
 msgstr "Serveur de base de données"
 
-#: index.php:282 libraries/plugins/auth/AuthenticationCookie.class.php:181
+#: index.php:283 libraries/plugins/auth/AuthenticationCookie.class.php:169
 msgid "Server:"
 msgstr "Serveur : "
 
-#: index.php:286
+#: index.php:287
 msgid "Server type:"
 msgstr "Type de serveur : "
 
-#: index.php:290 libraries/plugins/export/ExportLatex.class.php:212
+#: index.php:291 libraries/plugins/export/ExportLatex.class.php:212
 #: libraries/plugins/export/ExportSql.class.php:687
 #: libraries/plugins/export/ExportXml.class.php:189
 msgid "Server version:"
 msgstr "Version du serveur : "
 
-#: index.php:296
+#: index.php:297
 msgid "Protocol version:"
 msgstr "Version du protocole : "
 
-#: index.php:300
+#: index.php:301
 msgid "User:"
 msgstr "Utilisateur : "
 
-#: index.php:305
+#: index.php:306
 msgid "Server charset:"
 msgstr "Jeu de caractères du serveur : "
 
-#: index.php:320
+#: index.php:321
 msgid "Web server"
 msgstr "Serveur web"
 
-#: index.php:331
+#: index.php:332
 msgid "Database client version:"
 msgstr "Version du client de base de données : "
 
-#: index.php:335
+#: index.php:336
 msgid "PHP extension:"
 msgstr "Extension PHP : "
 
-#: index.php:349
+#: index.php:350
 msgid "PHP version:"
 msgstr "Version de PHP :"
 
-#: index.php:360
+#: index.php:361
 msgid "Show PHP information"
 msgstr "Afficher les informations relatives à PHP"
 
-#: index.php:383
+#: index.php:384
 msgid "Version information:"
 msgstr "Version : "
 
-#: index.php:392 libraries/Util.class.php:432 libraries/Util.class.php:495
-#: libraries/config/FormDisplay.tpl.php:151
+#: index.php:393 libraries/Util.class.php:432 libraries/Util.class.php:495
+#: libraries/config/FormDisplay.tpl.php:162
 #: libraries/display_export.lib.php:577 libraries/engines/pbxt.lib.php:162
 #: libraries/navigation/NavigationHeader.class.php:196
 #: libraries/server_variables.lib.php:160
 msgid "Documentation"
 msgstr "Documentation"
 
-#: index.php:399
+#: index.php:400
 msgid "Wiki"
 msgstr "Wiki"
 
-#: index.php:408
+#: index.php:409
 msgid "Official Homepage"
 msgstr "Site officiel"
 
-#: index.php:415
+#: index.php:416
 msgid "Contribute"
 msgstr "Contribuer"
 
-#: index.php:422
+#: index.php:423
 msgid "Get support"
 msgstr "Obtenir de l'aide"
 
-#: index.php:429
+#: index.php:430
 msgid "List of changes"
 msgstr "Liste des changements"
 
-#: index.php:451
+#: index.php:452
 msgid ""
 "You are connected as 'root' with no password, which corresponds to the "
 "default MySQL privileged account. Your MySQL server is running with this "
@@ -860,7 +862,7 @@ msgstr ""
 "intrusions, et vous devriez corriger ce problème de sécurité en assignant un "
 "mot de passe à l'utilisateur «root »."
 
-#: index.php:468
+#: index.php:469
 msgid ""
 "You have enabled mbstring.func_overload in your PHP configuration. This "
 "option is incompatible with phpMyAdmin and might cause some data to be "
@@ -870,7 +872,7 @@ msgstr ""
 "option est incompatible avec phpMyAdmin et peut nuire au traitement des "
 "données !"
 
-#: index.php:483
+#: index.php:484
 msgid ""
 "The mbstring PHP extension was not found and you seem to be using a "
 "multibyte charset. Without the mbstring extension phpMyAdmin is unable to "
@@ -881,7 +883,7 @@ msgstr ""
 "phpMyAdmin est incapable de gérer correctement les caractères et il peut en "
 "résulter des problèmes."
 
-#: index.php:500
+#: index.php:501
 msgid ""
 "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini."
 "session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower than "
@@ -893,7 +895,7 @@ msgstr ""
 "petite que la durée du cookie configurée dans phpMyAdmin; donc, votre "
 "session de travail pourrait expirer plus tôt."
 
-#: index.php:519
+#: index.php:520
 msgid ""
 "Login cookie store is lower than cookie validity configured in phpMyAdmin, "
 "because of this, your login will expire sooner than configured in phpMyAdmin."
@@ -902,13 +904,13 @@ msgstr ""
 "LoginCookieValidity; donc, votre session de travail expirera plus tôt que la "
 "valeur configurée dans phpMyAdmin."
 
-#: index.php:535
+#: index.php:536
 msgid "The configuration file now needs a secret passphrase (blowfish_secret)."
 msgstr ""
 "Vous devez ajouter dans le fichier de configuration une phrase de passe "
 "secrète (blowfish_secret)."
 
-#: index.php:548
+#: index.php:549
 msgid ""
 "Directory [code]config[/code], which is used by the setup script, still "
 "exists in your phpMyAdmin directory. It is strongly recommended to remove it "
@@ -921,7 +923,7 @@ msgstr ""
 "serveur peut être compromise par le téléchargement de votre configuration "
 "par des personnes non autorisées."
 
-#: index.php:564
+#: index.php:565
 #, php-format
 msgid ""
 "The phpMyAdmin configuration storage is not completely configured, some "
@@ -931,14 +933,14 @@ msgstr ""
 "certaines fonctionnalités ont été désactivées. %sVoir l'analyse du problème"
 "%s. "
 
-#: index.php:571
+#: index.php:572
 msgid ""
 "Or alternately go to 'Operations' tab of any database to set it up there."
 msgstr ""
 "Ou encore allez sur l'onglet «Opérations», de n'importe quelle base de "
 "données pour l'y placer à cet endroit."
 
-#: index.php:620
+#: index.php:621
 #, php-format
 msgid ""
 "Your PHP MySQL library version %s differs from your MySQL server version %s. "
@@ -947,7 +949,7 @@ msgstr ""
 "La version de votre bibliothèque MySQL (%s) de PHP diffère de la version de "
 "votre serveur MySQL (%s). Ceci peut occasionner un comportement imprévisible."
 
-#: index.php:648
+#: index.php:649
 #, php-format
 msgid ""
 "Server running with Suhosin. Please refer to %sdocumentation%s for possible "
@@ -1110,8 +1112,8 @@ msgstr ""
 msgid "Save & Close"
 msgstr "Sauvegarder et fermer"
 
-#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:404
-#: libraries/insert_edit.lib.php:1550 prefs_manage.php:361
+#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:415
+#: libraries/insert_edit.lib.php:1548 prefs_manage.php:361
 #: prefs_manage.php:372
 msgid "Reset"
 msgstr "Réinitialiser"
@@ -1144,7 +1146,7 @@ msgstr "Ajouter Index"
 msgid "Edit Index"
 msgstr "Modifier un index"
 
-#: js/messages.php:99 templates/index_form.phtml:232
+#: js/messages.php:99 templates/table/index_form.phtml:232
 #, php-format
 msgid "Add %s column(s) to index"
 msgstr "Ajouter %s colonne(s) à l'index"
@@ -1165,13 +1167,14 @@ msgstr "Autres colonnes formant l'index :"
 msgid "Please select column(s) for the index."
 msgstr "Veuillez sélectionner les colonnes de l'index."
 
-#: js/messages.php:106 templates/structure/add_column.phtml:1
+#: js/messages.php:106 templates/table/structure/add_column.phtml:1
 msgid "You have to add at least one column."
 msgstr "Vous devez ajouter au moins une colonne."
 
-#: js/messages.php:109 libraries/insert_edit.lib.php:1548
+#: js/messages.php:109 libraries/insert_edit.lib.php:1546
 #: templates/columns_definitions/column_definitions_form.phtml:162
-#: templates/index_form.phtml:237 templates/tbl_relation/common_form.phtml:106
+#: templates/table/index_form.phtml:237
+#: templates/table/relation/common_form.phtml:106
 msgid "Preview SQL"
 msgstr "Aperçu SQL"
 
@@ -1188,7 +1191,7 @@ msgid "SQL query:"
 msgstr "Requête SQL : "
 
 #. l10n: Default label for the y-Axis of Charts
-#: js/messages.php:118 templates/tbl_chart.phtml:109
+#: js/messages.php:118 templates/table/chart/tbl_chart.phtml:109
 msgid "Y Values"
 msgstr "Valeurs en Y"
 
@@ -1343,7 +1346,7 @@ msgstr "Octets envoyés"
 msgid "Bytes received"
 msgstr "Octets reçus"
 
-#: js/messages.php:169 libraries/server_status.lib.php:226
+#: js/messages.php:169 libraries/server_status.lib.php:235
 msgid "Connections"
 msgstr "Connexions"
 
@@ -1400,12 +1403,12 @@ msgstr "%d table(s)"
 msgid "Questions"
 msgstr "Questions"
 
-#: js/messages.php:184 libraries/server_status.lib.php:134
+#: js/messages.php:184 libraries/server_status.lib.php:143
 msgid "Traffic"
 msgstr "Trafic"
 
 #: js/messages.php:185 libraries/Menu.class.php:586
-#: libraries/Util.class.php:4318 libraries/server_status_monitor.lib.php:257
+#: libraries/Util.class.php:4324 libraries/server_status_monitor.lib.php:257
 msgid "Settings"
 msgstr "Paramètres"
 
@@ -1425,8 +1428,9 @@ msgstr "Veuillez ajouter au moins une variable à la série !"
 #: libraries/server_status_monitor.lib.php:236
 #: libraries/server_status_processes.lib.php:308
 #: templates/columns_definitions/transformation.phtml:4
-#: templates/designer/options_panel.phtml:178
-#: templates/table/options_zoom.phtml:12 templates/table/rows_zoom.phtml:26
+#: templates/database/designer/options_panel.phtml:178
+#: templates/table/search/options_zoom.phtml:12
+#: templates/table/search/rows_zoom.phtml:26
 msgid "None"
 msgstr "Aucune"
 
@@ -1717,8 +1721,8 @@ msgstr ""
 
 #: js/messages.php:270 libraries/Menu.class.php:352
 #: libraries/Menu.class.php:455 libraries/Menu.class.php:582
-#: libraries/Util.class.php:4317 libraries/Util.class.php:4332
-#: libraries/Util.class.php:4349 libraries/config/messages.inc.php:258
+#: libraries/Util.class.php:4323 libraries/Util.class.php:4338
+#: libraries/Util.class.php:4355 libraries/config/messages.inc.php:258
 #: libraries/display_import.lib.php:105
 #: libraries/server_status_monitor.lib.php:318 prefs_manage.php:238
 #: setup/frames/menu.inc.php:26
@@ -1778,13 +1782,13 @@ msgid "Formatting SQL..."
 msgstr "Formatage SQL..."
 
 #: js/messages.php:293 libraries/server_variables.lib.php:157
-#: templates/designer/aggregate_query_panel.phtml:63
-#: templates/designer/delete_relation_panel.phtml:28
-#: templates/designer/having_query_panel.phtml:117
-#: templates/designer/new_relation_panel.phtml:88
-#: templates/designer/options_panel.phtml:253
-#: templates/designer/rename_to_panel.phtml:45
-#: templates/designer/where_query_panel.phtml:83
+#: templates/database/designer/aggregate_query_panel.phtml:63
+#: templates/database/designer/delete_relation_panel.phtml:28
+#: templates/database/designer/having_query_panel.phtml:117
+#: templates/database/designer/new_relation_panel.phtml:88
+#: templates/database/designer/options_panel.phtml:253
+#: templates/database/designer/rename_to_panel.phtml:45
+#: templates/database/designer/where_query_panel.phtml:83
 msgid "Cancel"
 msgstr "Annuler"
 
@@ -1792,7 +1796,7 @@ msgstr "Annuler"
 msgid "Page-related settings"
 msgstr "Paramètres liés à la page"
 
-#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:402
+#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:413
 msgid "Apply"
 msgstr "Appliquer"
 
@@ -1827,8 +1831,8 @@ msgstr "Code d'erreur : %s"
 msgid "Error text: %s"
 msgstr "Texte de l'erreur : %s"
 
-#: js/messages.php:307 libraries/db_common.inc.php:68
-#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:450
+#: js/messages.php:307 libraries/db_common.inc.php:69
+#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:461
 msgid "No databases selected."
 msgstr "Aucune base de données n'a été sélectionnée."
 
@@ -1840,12 +1844,13 @@ msgstr "Suppression de la colonne"
 msgid "Adding Primary Key"
 msgstr "Ajout de clé primaire"
 
-#: js/messages.php:310 templates/designer/aggregate_query_panel.phtml:59
-#: templates/designer/having_query_panel.phtml:113
-#: templates/designer/new_relation_panel.phtml:87
-#: templates/designer/options_panel.phtml:252
-#: templates/designer/rename_to_panel.phtml:41
-#: templates/designer/where_query_panel.phtml:82
+#: js/messages.php:310
+#: templates/database/designer/aggregate_query_panel.phtml:59
+#: templates/database/designer/having_query_panel.phtml:113
+#: templates/database/designer/new_relation_panel.phtml:87
+#: templates/database/designer/options_panel.phtml:252
+#: templates/database/designer/rename_to_panel.phtml:41
+#: templates/database/designer/where_query_panel.phtml:82
 msgid "OK"
 msgstr "OK"
 
@@ -1865,7 +1870,7 @@ msgstr "Copie de la base de données"
 msgid "Changing Charset"
 msgstr "Changement du jeu de caractères"
 
-#: js/messages.php:320 libraries/Util.class.php:3217
+#: js/messages.php:320 libraries/Util.class.php:3223
 msgid "Enable foreign key checks"
 msgstr "Activer la vérification des clés étrangères"
 
@@ -1900,20 +1905,21 @@ msgstr "La définition d'une fonction doit comporter un énoncé RETURN !"
 #: js/messages.php:334 libraries/DisplayResults.class.php:4834
 #: libraries/DisplayResults.class.php:5092 libraries/Menu.class.php:344
 #: libraries/Menu.class.php:446 libraries/Menu.class.php:578
-#: libraries/Util.class.php:3636 libraries/Util.class.php:3637
-#: libraries/Util.class.php:4316 libraries/Util.class.php:4331
-#: libraries/Util.class.php:4348 libraries/config/messages.inc.php:252
+#: libraries/Util.class.php:3642 libraries/Util.class.php:3643
+#: libraries/Util.class.php:4322 libraries/Util.class.php:4337
+#: libraries/Util.class.php:4354 libraries/config/messages.inc.php:252
 #: libraries/display_export.lib.php:173 libraries/rte/rte_list.lib.php:146
 #: libraries/server_privileges.lib.php:2211
 #: libraries/server_privileges.lib.php:2290
 #: libraries/server_privileges.lib.php:2632
 #: libraries/server_privileges.lib.php:3356
 #: libraries/server_status_monitor.lib.php:322 prefs_manage.php:303
-#: setup/frames/menu.inc.php:27 templates/structure/check_all_tables.phtml:11
+#: setup/frames/menu.inc.php:27
+#: templates/database/structure/check_all_tables.phtml:11
 msgid "Export"
 msgstr "Exporter"
 
-#: js/messages.php:337 libraries/rte/rte_routines.lib.php:652
+#: js/messages.php:337 libraries/rte/rte_routines.lib.php:743
 msgid "ENUM/SET editor"
 msgstr "Éditeur ENUM/SET"
 
@@ -1953,7 +1959,7 @@ msgstr "Montrer zone SQL"
 #: libraries/Console.class.php:214 libraries/DisplayResults.class.php:3474
 #: libraries/DisplayResults.class.php:4818 libraries/Index.class.php:723
 #: libraries/Util.class.php:706 libraries/Util.class.php:1202
-#: libraries/Util.class.php:3634 libraries/Util.class.php:3635
+#: libraries/Util.class.php:3640 libraries/Util.class.php:3641
 #: libraries/central_columns.lib.php:851
 #: libraries/central_columns.lib.php:1193
 #: libraries/config/messages.inc.php:892
@@ -1971,7 +1977,7 @@ msgstr "Modifier"
 #: libraries/server_user_groups.lib.php:129
 #: libraries/sql_query_form.lib.php:416 libraries/tracking.lib.php:477
 #: setup/frames/index.inc.php:183 setup/frames/index.inc.php:291
-#: templates/designer/delete_relation_panel.phtml:27
+#: templates/database/designer/delete_relation_panel.phtml:27
 msgid "Delete"
 msgstr "Effacer"
 
@@ -2143,11 +2149,11 @@ msgid "No dependencies selected!"
 msgstr "Aucune dépendance sélectionnée !"
 
 #: js/messages.php:394 libraries/central_columns.lib.php:1214
-#: libraries/insert_edit.lib.php:1458 libraries/server_variables.lib.php:155
+#: libraries/insert_edit.lib.php:1456 libraries/server_variables.lib.php:155
 #: setup/frames/config.inc.php:42 setup/frames/index.inc.php:279
 #: templates/columns_definitions/column_definitions_form.phtml:165
-#: templates/gis_visualization/gis_visualization.phtml:48
-#: templates/tbl_relation/common_form.phtml:107
+#: templates/table/gis_visualization/gis_visualization.phtml:48
+#: templates/table/relation/common_form.phtml:107
 msgid "Save"
 msgstr "Sauvegarder"
 
@@ -2227,8 +2233,8 @@ msgid "Data point content"
 msgstr "Données reliées à ce point"
 
 #: js/messages.php:430 js/messages.php:562 js/messages.php:579
-#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2573
-#: templates/index_form.phtml:154 templates/index_form.phtml:194
+#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2571
+#: templates/table/index_form.phtml:154 templates/table/index_form.phtml:194
 msgid "Ignore"
 msgstr "Ignorer"
 
@@ -2289,8 +2295,8 @@ msgstr "Choisissez la clé étrangère"
 msgid "Please select the primary key or a unique key!"
 msgstr "Veuillez choisir la clé primaire ou un index unique !"
 
-#: js/messages.php:457 templates/designer/side_menu.phtml:91
-#: templates/designer/side_menu.phtml:94
+#: js/messages.php:457 templates/database/designer/side_menu.phtml:91
+#: templates/database/designer/side_menu.phtml:94
 msgid "Choose column to display"
 msgstr "Colonne descriptive"
 
@@ -2306,18 +2312,18 @@ msgstr ""
 msgid "Page name"
 msgstr "Nom de la page"
 
-#: js/messages.php:463 templates/designer/side_menu.phtml:56
-#: templates/designer/side_menu.phtml:59
+#: js/messages.php:463 templates/database/designer/side_menu.phtml:56
+#: templates/database/designer/side_menu.phtml:59
 msgid "Save page"
 msgstr "Sauvegarder la page"
 
-#: js/messages.php:464 templates/designer/side_menu.phtml:63
-#: templates/designer/side_menu.phtml:66
+#: js/messages.php:464 templates/database/designer/side_menu.phtml:63
+#: templates/database/designer/side_menu.phtml:66
 msgid "Save page as"
 msgstr "Sauvegarder la page en tant que"
 
-#: js/messages.php:465 templates/designer/side_menu.phtml:49
-#: templates/designer/side_menu.phtml:52
+#: js/messages.php:465 templates/database/designer/side_menu.phtml:49
+#: templates/database/designer/side_menu.phtml:52
 msgid "Open page"
 msgstr "Ouvrir la page"
 
@@ -2325,7 +2331,7 @@ msgstr "Ouvrir la page"
 msgid "Delete page"
 msgstr "Supprimer la page"
 
-#: js/messages.php:467 templates/designer/side_menu.phtml:10
+#: js/messages.php:467 templates/database/designer/side_menu.phtml:10
 msgid "Untitled"
 msgstr "Sans titre"
 
@@ -2448,7 +2454,7 @@ msgstr "Longueur originale"
 msgid "cancel"
 msgstr "annuler"
 
-#: js/messages.php:499 libraries/server_status.lib.php:271
+#: js/messages.php:499 libraries/server_status.lib.php:280
 msgid "Aborted"
 msgstr "Arrêts prématurés"
 
@@ -3025,7 +3031,7 @@ msgstr "Veuillez saisir une valeur hexadécimale valide"
 
 #: js/messages.php:793 libraries/Message.class.php:199
 #: libraries/Util.class.php:654 libraries/core.lib.php:245
-#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1172
+#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1170
 #: tbl_operations.php:229 view_operations.php:63
 msgid "Error"
 msgstr "Erreur"
@@ -3088,8 +3094,8 @@ msgstr "par seconde"
 msgid "per minute"
 msgstr "par minute"
 
-#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:143
-#: libraries/server_status.lib.php:228
+#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:152
+#: libraries/server_status.lib.php:237
 #: libraries/server_status_queries.lib.php:98
 msgid "per hour"
 msgstr "par heure"
@@ -3109,7 +3115,7 @@ msgstr ""
 "Permissions sur le fichier de configuration incorrectes, il ne doit pas être "
 "en écriture pour tout le monde !"
 
-#: libraries/Config.class.php:1799
+#: libraries/Config.class.php:1801
 msgid "Font size"
 msgstr "Taille du texte"
 
@@ -3137,10 +3143,10 @@ msgstr "Exécuter la requête à nouveau"
 #: libraries/server_privileges.lib.php:2890
 #: libraries/server_privileges.lib.php:3144
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4332
+#: libraries/server_privileges.lib.php:4358
 #: libraries/server_status_processes.lib.php:80
-#: templates/tbl_relation/foreign_key_row.phtml:165
-#: templates/tbl_relation/internal_relational_row.phtml:55
+#: templates/table/relation/foreign_key_row.phtml:165
+#: templates/table/relation/internal_relational_row.phtml:55
 msgid "Database"
 msgstr "Base de données"
 
@@ -3233,11 +3239,11 @@ msgstr "Historique"
 #: libraries/plugins/import/ImportMediawiki.class.php:60
 #: libraries/plugins/import/ImportOds.class.php:59
 #: libraries/plugins/import/ImportShp.class.php:57
-#: libraries/plugins/import/ImportSql.class.php:148
+#: libraries/plugins/import/ImportSql.class.php:51
 #: libraries/plugins/import/ImportXml.class.php:58
-#: libraries/rte/rte_routines.lib.php:833 templates/index_form.phtml:49
-#: templates/structure/row_stats_table.phtml:20
-#: templates/table/options.phtml:2
+#: libraries/rte/rte_routines.lib.php:924 templates/table/index_form.phtml:49
+#: templates/table/search/options.phtml:2
+#: templates/table/structure/row_stats_table.phtml:20
 msgid "Options"
 msgstr "Options"
 
@@ -3270,7 +3276,8 @@ msgstr "décroissant"
 msgid "Order:"
 msgstr "Ordre :"
 
-#: libraries/Console.class.php:289 templates/table/replace_preview.phtml:17
+#: libraries/Console.class.php:289
+#: templates/table/search/replace_preview.phtml:17
 msgid "Count"
 msgstr "Nombre"
 
@@ -3367,9 +3374,9 @@ msgstr "Passer au thème sombre"
 #: libraries/operations.lib.php:794 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:191
-#: templates/structure/sortable_header.phtml:21
-#: templates/structure/sortable_header.phtml:38
-#: templates/table/options.phtml:68
+#: templates/database/structure/sortable_header.phtml:21
+#: templates/database/structure/sortable_header.phtml:38
+#: templates/table/search/options.phtml:68
 msgid "Ascending"
 msgstr "Croissant"
 
@@ -3379,13 +3386,14 @@ msgstr "Croissant"
 #: libraries/operations.lib.php:797 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:188
-#: templates/structure/sortable_header.phtml:26
-#: templates/structure/sortable_header.phtml:43
-#: templates/table/options.phtml:69
+#: templates/database/structure/sortable_header.phtml:26
+#: templates/database/structure/sortable_header.phtml:43
+#: templates/table/search/options.phtml:69
 msgid "Descending"
 msgstr "Décroissant"
 
-#: libraries/DBQbe.class.php:467 templates/table/search_and_replace.phtml:6
+#: libraries/DBQbe.class.php:467
+#: templates/table/search/search_and_replace.phtml:6
 msgid "Column:"
 msgstr "Colonne : "
 
@@ -3544,12 +3552,12 @@ msgstr[0] "%1$s correspondance dans <strong>%2$s</strong>"
 msgstr[1] "%1$s correspondances dans <strong>%2$s</strong>"
 
 #: libraries/DbSearch.class.php:354 libraries/Menu.class.php:311
-#: libraries/Util.class.php:3337 libraries/Util.class.php:3347
-#: libraries/Util.class.php:3623 libraries/Util.class.php:3624
-#: libraries/Util.class.php:4343 libraries/config.values.php:43
+#: libraries/Util.class.php:3343 libraries/Util.class.php:3353
+#: libraries/Util.class.php:3629 libraries/Util.class.php:3630
+#: libraries/Util.class.php:4349 libraries/config.values.php:43
 #: libraries/config.values.php:51 libraries/config.values.php:119
 #: libraries/navigation/Nodes/Node_Table.class.php:295
-#: templates/structure/check_all_table_column.phtml:5
+#: templates/table/structure/check_all_table_column.phtml:5
 msgid "Browse"
 msgstr "Afficher"
 
@@ -3566,7 +3574,8 @@ msgstr "Effectuer une nouvelle recherche dans la base de données"
 msgid "Words or values to search for (wildcard: \"%\"):"
 msgstr "Mots ou valeurs à rechercher (passe-partout: «%») : "
 
-#: libraries/DbSearch.class.php:401 templates/table/search_and_replace.phtml:1
+#: libraries/DbSearch.class.php:401
+#: templates/table/search/search_and_replace.phtml:1
 msgid "Find:"
 msgstr "Type de recherche : "
 
@@ -3610,28 +3619,28 @@ msgstr "Filtrer les lignes"
 msgid "Search this table"
 msgstr "Chercher dans cette table"
 
-#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2532
-#: libraries/Util.class.php:2535
+#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2538
+#: libraries/Util.class.php:2541
 msgctxt "First page"
 msgid "Begin"
 msgstr "Début"
 
-#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2533
-#: libraries/Util.class.php:2536 libraries/server_bin_log.lib.php:170
+#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2539
+#: libraries/Util.class.php:2542 libraries/server_bin_log.lib.php:170
 #: libraries/server_bin_log.lib.php:172
 msgctxt "Previous page"
 msgid "Previous"
 msgstr "Précédent"
 
-#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2564
-#: libraries/Util.class.php:2574 libraries/server_bin_log.lib.php:204
+#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2570
+#: libraries/Util.class.php:2580 libraries/server_bin_log.lib.php:204
 #: libraries/server_bin_log.lib.php:206
 msgctxt "Next page"
 msgid "Next"
 msgstr "Suivant"
 
-#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2565
-#: libraries/Util.class.php:2575
+#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2571
+#: libraries/Util.class.php:2581
 msgctxt "Last page"
 msgid "End"
 msgstr "Fin"
@@ -3704,15 +3713,15 @@ msgid "May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]."
 msgstr "Peut être approximatif. Voir [doc@faq3-11]FAQ 3.11[/doc]."
 
 #: libraries/DisplayResults.class.php:4332 libraries/Message.class.php:180
-#: libraries/controllers/TableRelationController.class.php:258
+#: libraries/controllers/TableRelationController.class.php:259
 #: libraries/controllers/TableSearchController.class.php:655
-#: libraries/rte/rte_routines.lib.php:1332 libraries/sql_query_form.lib.php:89
+#: libraries/rte/rte_routines.lib.php:1423 libraries/sql_query_form.lib.php:89
 #: tbl_operations.php:227 tbl_row_action.php:138 view_operations.php:62
 msgid "Your SQL query has been executed successfully."
 msgstr "Votre requête SQL a été exécutée avec succès."
 
 #: libraries/DisplayResults.class.php:4660
-#: libraries/controllers/StructureController.class.php:629
+#: libraries/controllers/DatabaseStructureController.class.php:564
 #, php-format
 msgid ""
 "This view has at least this number of rows. Please refer to %sdocumentation"
@@ -3736,33 +3745,33 @@ msgstr "%1$d au total, %2$d dans la requête"
 msgid "%d total"
 msgstr "total de %d"
 
-#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1318
+#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1312
 #, php-format
 msgid "Query took %01.4f seconds."
 msgstr "Traitement en %01.4f secondes."
 
 #: libraries/DisplayResults.class.php:4807
-#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4767
-#: libraries/Util.class.php:4773 libraries/mult_submits.inc.php:50
-#: templates/structure/check_all_tables.phtml:2
-#: templates/structure/check_all_tables.phtml:9
+#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4773
+#: libraries/Util.class.php:4779 libraries/mult_submits.inc.php:50
+#: templates/database/structure/check_all_tables.phtml:2
+#: templates/database/structure/check_all_tables.phtml:9
 msgid "With selected:"
 msgstr "Pour la sélection : "
 
 #: libraries/DisplayResults.class.php:4811
-#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4769
-#: libraries/Util.class.php:4770 libraries/server_privileges.lib.php:1174
+#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4775
+#: libraries/Util.class.php:4776 libraries/server_privileges.lib.php:1174
 #: libraries/server_privileges.lib.php:1175
 #: libraries/server_privileges.lib.php:1387
 #: libraries/server_user_groups.lib.php:231
-#: templates/structure/check_all_tables.phtml:3
-#: templates/structure/check_all_tables.phtml:4
+#: templates/database/structure/check_all_tables.phtml:3
+#: templates/database/structure/check_all_tables.phtml:4
 msgid "Check All"
 msgstr "Tout cocher"
 
 #: libraries/DisplayResults.class.php:4985 libraries/Header.class.php:383
-#: templates/structure/optional_action_links.phtml:1
-#: templates/structure/print_view_data_dictionary_link.phtml:3
+#: templates/database/structure/print_view_data_dictionary_link.phtml:3
+#: templates/table/structure/optional_action_links.phtml:1
 msgid "Print view"
 msgstr "Version imprimable"
 
@@ -3770,7 +3779,8 @@ msgstr "Version imprimable"
 msgid "Query results operations"
 msgstr "Opérations sur les résultats de la requête"
 
-#: libraries/DisplayResults.class.php:5105 templates/tbl_chart.phtml:12
+#: libraries/DisplayResults.class.php:5105
+#: templates/table/chart/tbl_chart.phtml:12
 msgid "Display chart"
 msgstr "Afficher le graphique"
 
@@ -3866,7 +3876,7 @@ msgid "Click on the bar to scroll to top of page"
 msgstr "Cliquez sur la barre pour faire défiler en haut de page"
 
 #: libraries/Header.class.php:749
-#: libraries/plugins/auth/AuthenticationCookie.class.php:152
+#: libraries/plugins/auth/AuthenticationCookie.class.php:140
 msgid "Javascript must be enabled past this point!"
 msgstr "Javascript doit être activé !"
 
@@ -3888,11 +3898,11 @@ msgid "Keyname"
 msgstr "Nom de l'index"
 
 #: libraries/Index.class.php:697
-#: libraries/controllers/StructureController.class.php:1962
-#: libraries/controllers/StructureController.class.php:1967
+#: libraries/controllers/TableStructureController.class.php:953
+#: libraries/controllers/TableStructureController.class.php:958
 #: libraries/tracking.lib.php:973
 #: templates/columns_definitions/column_indexes.phtml:11
-#: templates/structure/check_all_table_column.phtml:26
+#: templates/table/structure/check_all_table_column.phtml:26
 msgid "Unique"
 msgstr "Unique"
 
@@ -3911,16 +3921,17 @@ msgstr "Cardinalité"
 #: libraries/server_collations.lib.php:35 libraries/tracking.lib.php:881
 #: libraries/tracking.lib.php:977
 #: templates/columns_definitions/table_fields_definitions.phtml:33
-#: templates/structure/row_stats_table.phtml:31
-#: templates/structure/table_header.phtml:55
-#: templates/structure/table_structure_header.phtml:7
-#: templates/table/table_header.phtml:8
+#: templates/database/structure/table_header.phtml:55
+#: templates/table/search/table_header.phtml:8
+#: templates/table/structure/row_stats_table.phtml:31
+#: templates/table/structure/table_structure_header.phtml:7
 msgid "Collation"
 msgstr "Interclassement"
 
 #: libraries/Index.class.php:703 libraries/rte/rte_events.lib.php:496
-#: libraries/rte/rte_routines.lib.php:956 libraries/tracking.lib.php:885
-#: libraries/tracking.lib.php:979 templates/structure/table_header.phtml:84
+#: libraries/rte/rte_routines.lib.php:1047 libraries/tracking.lib.php:885
+#: libraries/tracking.lib.php:979
+#: templates/database/structure/table_header.phtml:84
 msgid "Comment"
 msgstr "Commentaire"
 
@@ -3933,15 +3944,15 @@ msgstr "La clé primaire a été effacée."
 msgid "Index %s has been dropped."
 msgstr "L'index %s a été effacé."
 
-#: libraries/Index.class.php:757 libraries/Util.class.php:3630
-#: libraries/Util.class.php:3631
-#: libraries/controllers/StructureController.class.php:1958
-#: libraries/controllers/StructureController.class.php:1959
+#: libraries/Index.class.php:757 libraries/Util.class.php:3636
+#: libraries/Util.class.php:3637
+#: libraries/controllers/TableStructureController.class.php:949
+#: libraries/controllers/TableStructureController.class.php:950
 #: libraries/operations.lib.php:1607 libraries/rte/rte_list.lib.php:150
 #: libraries/server_databases.lib.php:146
-#: templates/structure/check_all_table_column.phtml:15
-#: templates/structure/check_all_tables.phtml:16
-#: templates/tbl_relation/foreign_key_row.phtml:93
+#: templates/database/structure/check_all_tables.phtml:16
+#: templates/table/relation/foreign_key_row.phtml:93
+#: templates/table/structure/check_all_table_column.phtml:15
 msgid "Drop"
 msgstr "Supprimer"
 
@@ -3974,16 +3985,16 @@ msgstr "Serveur"
 #: libraries/Menu.class.php:248
 #: libraries/navigation/Nodes/Node_View.class.php:32
 #: libraries/tbl_info.inc.php:63
-#: templates/structure/structure_table_row.phtml:97
-#: templates/structure/structure_table_row.phtml:159
+#: templates/database/structure/structure_table_row.phtml:97
+#: templates/database/structure/structure_table_row.phtml:159
 msgid "View"
 msgstr "Vue"
 
 #: libraries/Menu.class.php:325 libraries/Menu.class.php:429
-#: libraries/Menu.class.php:548 libraries/Util.class.php:3334
-#: libraries/Util.class.php:3344 libraries/Util.class.php:3350
-#: libraries/Util.class.php:4313 libraries/Util.class.php:4328
-#: libraries/Util.class.php:4345 libraries/config.values.php:40
+#: libraries/Menu.class.php:548 libraries/Util.class.php:3340
+#: libraries/Util.class.php:3350 libraries/Util.class.php:3356
+#: libraries/Util.class.php:4319 libraries/Util.class.php:4334
+#: libraries/Util.class.php:4351 libraries/config.values.php:40
 #: libraries/config.values.php:48 libraries/config.values.php:110
 #: libraries/config.values.php:116 libraries/config/messages.inc.php:321
 #: libraries/navigation/Nodes/Node_Table.class.php:292
@@ -3991,19 +4002,19 @@ msgid "SQL"
 msgstr "SQL"
 
 #: libraries/Menu.class.php:328 libraries/Menu.class.php:432
-#: libraries/Util.class.php:3335 libraries/Util.class.php:3345
-#: libraries/Util.class.php:3351 libraries/Util.class.php:3625
-#: libraries/Util.class.php:3626 libraries/Util.class.php:4329
-#: libraries/Util.class.php:4346 libraries/config.values.php:41
+#: libraries/Util.class.php:3341 libraries/Util.class.php:3351
+#: libraries/Util.class.php:3357 libraries/Util.class.php:3631
+#: libraries/Util.class.php:3632 libraries/Util.class.php:4335
+#: libraries/Util.class.php:4352 libraries/config.values.php:41
 #: libraries/config.values.php:49 libraries/config.values.php:111
 #: libraries/config.values.php:117
 #: libraries/navigation/Nodes/Node_Table.class.php:286
 msgid "Search"
 msgstr "Rechercher"
 
-#: libraries/Menu.class.php:338 libraries/Util.class.php:3336
-#: libraries/Util.class.php:3346 libraries/Util.class.php:3627
-#: libraries/Util.class.php:3628 libraries/Util.class.php:4347
+#: libraries/Menu.class.php:338 libraries/Util.class.php:3342
+#: libraries/Util.class.php:3352 libraries/Util.class.php:3633
+#: libraries/Util.class.php:3634 libraries/Util.class.php:4353
 #: libraries/config.values.php:42 libraries/config.values.php:50
 #: libraries/config.values.php:118
 #: libraries/navigation/Nodes/Node_Table.class.php:289
@@ -4012,30 +4023,30 @@ msgid "Insert"
 msgstr "Insérer"
 
 #: libraries/Menu.class.php:362 libraries/Menu.class.php:467
-#: libraries/Util.class.php:4334 libraries/Util.class.php:4350
+#: libraries/Util.class.php:4340 libraries/Util.class.php:4356
 #: libraries/config.values.php:106 libraries/server_common.lib.php:51
 #: libraries/server_privileges.lib.php:2370
 #: libraries/server_privileges.lib.php:3158
-#: libraries/server_privileges.lib.php:4221
+#: libraries/server_privileges.lib.php:4247
 msgid "Privileges"
 msgstr "Privilèges"
 
 #: libraries/Menu.class.php:371 libraries/Menu.class.php:379
-#: libraries/Menu.class.php:459 libraries/Util.class.php:3338
-#: libraries/Util.class.php:3352 libraries/Util.class.php:4333
-#: libraries/Util.class.php:4351 libraries/config.values.php:112
+#: libraries/Menu.class.php:459 libraries/Util.class.php:3344
+#: libraries/Util.class.php:3358 libraries/Util.class.php:4339
+#: libraries/Util.class.php:4357 libraries/config.values.php:112
 #: view_operations.php:92
 msgid "Operations"
 msgstr "Opérations"
 
 #: libraries/Menu.class.php:384 libraries/Menu.class.php:492
-#: libraries/Util.class.php:4338 libraries/Util.class.php:4352
+#: libraries/Util.class.php:4344 libraries/Util.class.php:4358
 #: libraries/relation.lib.php:255
 msgid "Tracking"
 msgstr "Suivi"
 
 #: libraries/Menu.class.php:397 libraries/Menu.class.php:486
-#: libraries/Util.class.php:4337 libraries/Util.class.php:4353
+#: libraries/Util.class.php:4343 libraries/Util.class.php:4359
 #: libraries/navigation/Nodes/Node_Trigger_Container.class.php:24
 #: libraries/plugins/export/ExportHtmlword.class.php:557
 #: libraries/plugins/export/ExportOdt.class.php:685
@@ -4052,16 +4063,16 @@ msgstr "Déclencheurs"
 msgid "Database seems to be empty!"
 msgstr "La base de données semble vide !"
 
-#: libraries/Menu.class.php:439 libraries/Util.class.php:4330
+#: libraries/Menu.class.php:439 libraries/Util.class.php:4336
 msgid "Query"
 msgstr "Requête"
 
-#: libraries/Menu.class.php:472 libraries/Util.class.php:4335
+#: libraries/Menu.class.php:472 libraries/Util.class.php:4341
 #: libraries/rte/rte_words.lib.php:36
 msgid "Routines"
 msgstr "Procédures stockées"
 
-#: libraries/Menu.class.php:479 libraries/Util.class.php:4336
+#: libraries/Menu.class.php:479 libraries/Util.class.php:4342
 #: libraries/navigation/Nodes/Node_Event_Container.class.php:26
 #: libraries/plugins/export/ExportSql.class.php:940
 #: libraries/plugins/export/ExportXml.class.php:107
@@ -4069,20 +4080,20 @@ msgstr "Procédures stockées"
 msgid "Events"
 msgstr "Événements"
 
-#: libraries/Menu.class.php:498 libraries/Util.class.php:4339
+#: libraries/Menu.class.php:498 libraries/Util.class.php:4345
 msgid "Designer"
 msgstr "Concepteur"
 
-#: libraries/Menu.class.php:507 libraries/Util.class.php:4340
-#: templates/structure/check_all_tables.phtml:35
+#: libraries/Menu.class.php:507 libraries/Util.class.php:4346
+#: templates/database/structure/check_all_tables.phtml:35
 msgid "Central columns"
 msgstr "Colonnes centrales"
 
-#: libraries/Menu.class.php:544 libraries/Util.class.php:4312
+#: libraries/Menu.class.php:544 libraries/Util.class.php:4318
 #: libraries/config.values.php:103 libraries/config/messages.inc.php:266
 #: libraries/config/messages.inc.php:341
 #: libraries/navigation/NavigationTree.class.php:1239
-#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4332
+#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4358
 msgid "Databases"
 msgstr "Bases de données"
 
@@ -4091,34 +4102,34 @@ msgid "User accounts"
 msgstr "Comptes d'utilisateurs"
 
 #: libraries/Menu.class.php:595 libraries/ServerStatusData.class.php:121
-#: libraries/Util.class.php:4319 libraries/server_common.lib.php:36
+#: libraries/Util.class.php:4325 libraries/server_common.lib.php:36
 msgid "Binary log"
 msgstr "Log binaire"
 
 #: libraries/Menu.class.php:601 libraries/ServerStatusData.class.php:126
-#: libraries/Util.class.php:4320 libraries/server_common.lib.php:42
-#: templates/structure/body_for_table_summary.phtml:10
-#: templates/structure/table_header.phtml:27
+#: libraries/Util.class.php:4326 libraries/server_common.lib.php:42
+#: templates/database/structure/body_for_table_summary.phtml:10
+#: templates/database/structure/table_header.phtml:27
 msgid "Replication"
 msgstr "Réplication"
 
 #: libraries/Menu.class.php:606 libraries/ServerStatusData.class.php:193
-#: libraries/Util.class.php:4321 libraries/config.values.php:105
+#: libraries/Util.class.php:4327 libraries/config.values.php:105
 #: libraries/server_engines.lib.php:108 libraries/server_engines.lib.php:112
 #: libraries/sql_query_form.lib.php:421
 msgid "Variables"
 msgstr "Variables"
 
-#: libraries/Menu.class.php:610 libraries/Util.class.php:4322
+#: libraries/Menu.class.php:610 libraries/Util.class.php:4328
 msgid "Charsets"
 msgstr "Jeux de caractères"
 
-#: libraries/Menu.class.php:615 libraries/Util.class.php:4323
+#: libraries/Menu.class.php:615 libraries/Util.class.php:4329
 #: libraries/server_common.lib.php:33 libraries/server_plugins.lib.php:27
 msgid "Plugins"
 msgstr "Greffons"
 
-#: libraries/Menu.class.php:626 libraries/Util.class.php:4324
+#: libraries/Menu.class.php:626 libraries/Util.class.php:4330
 msgid "Engines"
 msgstr "Moteurs"
 
@@ -4143,7 +4154,7 @@ msgid_plural "%1$d rows inserted."
 msgstr[0] "%1$d ligne insérée."
 msgstr[1] "%1$d lignes insérées."
 
-#: libraries/PDF.class.php:70 libraries/Util.class.php:2521
+#: libraries/PDF.class.php:70 libraries/Util.class.php:2527
 #: libraries/browse_foreigners.lib.php:327
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:865
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:890
@@ -4164,7 +4175,7 @@ msgid "Could not save favorite table!"
 msgstr "Impossible de sauvegarder la table préférée !"
 
 #: libraries/RecentFavoriteTable.class.php:212
-#: templates/structure/favorite_anchor.phtml:12
+#: templates/database/structure/favorite_anchor.phtml:12
 msgid "Remove from Favorites"
 msgstr "Supprimer des tables préférées"
 
@@ -4331,7 +4342,7 @@ msgstr ""
 "stockage."
 
 #: libraries/StorageEngine.class.php:373
-#: templates/structure/body_for_table_summary.phtml:50
+#: templates/database/structure/body_for_table_summary.phtml:50
 #, php-format
 msgid "%s is the default storage engine on this MySQL server."
 msgstr "Sur ce serveur MySQL, le moteur de stockage par défaut est %s."
@@ -4822,10 +4833,10 @@ msgstr "%d erreurs trouvées lors de l'analyse."
 
 #: libraries/Util.class.php:726 libraries/rte/rte_events.lib.php:110
 #: libraries/rte/rte_events.lib.php:119 libraries/rte/rte_events.lib.php:150
-#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:153
-#: libraries/rte/rte_routines.lib.php:162
-#: libraries/rte/rte_routines.lib.php:235
-#: libraries/rte/rte_routines.lib.php:1366
+#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:223
+#: libraries/rte/rte_routines.lib.php:250
+#: libraries/rte/rte_routines.lib.php:372
+#: libraries/rte/rte_routines.lib.php:1457
 #: libraries/rte/rte_triggers.lib.php:86 libraries/rte/rte_triggers.lib.php:95
 #: libraries/rte/rte_triggers.lib.php:127
 msgid "MySQL said: "
@@ -4869,76 +4880,79 @@ msgstr "Dim"
 msgid "%B %d, %Y at %I:%M %p"
 msgstr "%A %d %B %Y à %H:%M"
 
-#: libraries/Util.class.php:2019
+#: libraries/Util.class.php:2025
 #, php-format
 msgid "%s days, %s hours, %s minutes and %s seconds"
 msgstr "%s jours, %s heures, %s minutes et %s secondes"
 
-#: libraries/Util.class.php:2112
+#: libraries/Util.class.php:2118
 msgid "Missing parameter:"
 msgstr "Paramètre manquant : "
 
-#: libraries/Util.class.php:2645
+#: libraries/Util.class.php:2651
 #, php-format
 msgid "Jump to database \"%s\"."
 msgstr "Aller à la base de données \"%s\"."
 
-#: libraries/Util.class.php:2670
+#: libraries/Util.class.php:2676
 #, php-format
 msgid "The %s functionality is affected by a known bug, see %s"
 msgstr "La fonctionnalité %s est affectée par une anomalie connue, voir %s"
 
-#: libraries/Util.class.php:2881
+#: libraries/Util.class.php:2887
 msgid "Click to toggle"
 msgstr "Cliquer pour basculer"
 
-#: libraries/Util.class.php:3542 prefs_manage.php:248
+#: libraries/Util.class.php:3548 prefs_manage.php:248
 msgid "Browse your computer:"
 msgstr "Parcourir : "
 
-#: libraries/Util.class.php:3567
+#: libraries/Util.class.php:3573
 #, php-format
 msgid "Select from the web server upload directory <b>%s</b>:"
 msgstr ""
 "Choisissez depuis le répertoire de téléchargement du serveur web <b>%s</b> : "
 
-#: libraries/Util.class.php:3596 libraries/insert_edit.lib.php:1173
+#: libraries/Util.class.php:3602 libraries/insert_edit.lib.php:1171
 msgid "The directory you set for upload work cannot be reached."
 msgstr "Le répertoire de transfert est inaccessible."
 
-#: libraries/Util.class.php:3607
+#: libraries/Util.class.php:3613
 msgid "There are no files to upload!"
 msgstr "Aucun fichier n'est disponible pour le transfert !"
 
-#: libraries/Util.class.php:3632 libraries/Util.class.php:3633
-#: templates/structure/check_all_tables.phtml:15
+#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: templates/database/structure/check_all_tables.phtml:15
 msgid "Empty"
 msgstr "Vider"
 
-#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: libraries/Util.class.php:3644 libraries/Util.class.php:3645
 msgid "Execute"
 msgstr "Exécuter"
 
-#: libraries/Util.class.php:4152
+#: libraries/Util.class.php:4158
 msgid "Print"
 msgstr "Imprimer"
 
-#: libraries/Util.class.php:4257 templates/structure/row_stats_table.phtml:80
-#: templates/structure/table_header.phtml:95
+#: libraries/Util.class.php:4263
+#: templates/database/structure/table_header.phtml:95
+#: templates/table/structure/row_stats_table.phtml:80
 msgid "Creation"
 msgstr "Création"
 
-#: libraries/Util.class.php:4263 templates/structure/row_stats_table.phtml:87
-#: templates/structure/table_header.phtml:106
+#: libraries/Util.class.php:4269
+#: templates/database/structure/table_header.phtml:106
+#: templates/table/structure/row_stats_table.phtml:87
 msgid "Last update"
 msgstr "Dernière modification"
 
-#: libraries/Util.class.php:4269 templates/structure/row_stats_table.phtml:94
-#: templates/structure/table_header.phtml:117
+#: libraries/Util.class.php:4275
+#: templates/database/structure/table_header.phtml:117
+#: templates/table/structure/row_stats_table.phtml:94
 msgid "Last check"
 msgstr "Dernière vérification"
 
-#: libraries/Util.class.php:4315
+#: libraries/Util.class.php:4321
 msgid "Users"
 msgstr "Utilisateurs"
 
@@ -4959,16 +4973,16 @@ msgid "Use this value"
 msgstr "Utiliser cette valeur"
 
 #: libraries/build_html_for_db.lib.php:33 libraries/import.lib.php:193
-#: templates/structure/actions_in_table_structure.phtml:113
-#: templates/structure/row_stats_table.phtml:42
-#: templates/structure/table_header.phtml:36
+#: templates/database/structure/table_header.phtml:36
+#: templates/table/structure/actions_in_table_structure.phtml:113
+#: templates/table/structure/row_stats_table.phtml:42
 msgid "Rows"
 msgstr "Lignes"
 
 #: libraries/build_html_for_db.lib.php:48 libraries/engines/innodb.lib.php:171
-#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:186
-#: libraries/server_status.lib.php:298
-#: templates/structure/display_table_stats.phtml:40
+#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:195
+#: libraries/server_status.lib.php:307
+#: templates/table/structure/display_table_stats.phtml:40
 msgid "Total"
 msgstr "Total"
 
@@ -4977,10 +4991,12 @@ msgid "Jump to database"
 msgstr "Aller à la base de données"
 
 #: libraries/build_html_for_db.lib.php:146
+#: templates/database/structure/structure_table_row.phtml:15
 msgid "Not replicated"
 msgstr "Non répliqué"
 
 #: libraries/build_html_for_db.lib.php:158
+#: templates/database/structure/structure_table_row.phtml:16
 msgid "Replicated"
 msgstr "Répliqué"
 
@@ -5037,17 +5053,17 @@ msgstr "NON"
 #: libraries/plugins/export/ExportTexytext.class.php:425
 #: libraries/plugins/export/PMA_ExportPdf.class.php:307
 #: libraries/rte/rte_list.lib.php:73 libraries/rte/rte_list.lib.php:85
-#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:830
-#: libraries/rte/rte_routines.lib.php:1492 setup/frames/index.inc.php:162
+#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:921
+#: libraries/rte/rte_routines.lib.php:1583 setup/frames/index.inc.php:162
 #: templates/columns_definitions/table_fields_definitions.phtml:8
-#: templates/structure/table_structure_header.phtml:5
-#: templates/table/create_table.phtml:11
+#: templates/database/create_table.phtml:11
+#: templates/table/structure/table_structure_header.phtml:5
 msgid "Name"
 msgstr "Nom"
 
 #: libraries/central_columns.lib.php:699
 #: libraries/central_columns.lib.php:1381
-#: libraries/rte/rte_routines.lib.php:832
+#: libraries/rte/rte_routines.lib.php:923
 #: templates/columns_definitions/table_fields_definitions.phtml:14
 msgid "Length/Values"
 msgstr "Taille/Valeurs*"
@@ -5066,7 +5082,7 @@ msgid "Select a table"
 msgstr "Choisissez une table"
 
 #: libraries/central_columns.lib.php:804
-#: templates/structure/add_column.phtml:4
+#: templates/table/structure/add_column.phtml:4
 msgid "Add column"
 msgstr "Ajouter une colonne"
 
@@ -5082,7 +5098,7 @@ msgstr "Ajouter une colonne"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1002
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1025
 #: templates/columns_definitions/table_fields_definitions.phtml:36
-#: templates/structure/table_structure_header.phtml:8
+#: templates/table/structure/table_structure_header.phtml:8
 msgid "Attributes"
 msgstr "Attributs"
 
@@ -5203,7 +5219,7 @@ msgid "Double click"
 msgstr "Double-clic"
 
 #: libraries/config.values.php:95 libraries/config.values.php:124
-#: libraries/config/FormDisplay.tpl.php:221 libraries/relation.lib.php:97
+#: libraries/config/FormDisplay.tpl.php:232 libraries/relation.lib.php:97
 #: libraries/relation.lib.php:105
 msgid "Disabled"
 msgstr "Désactivé"
@@ -5373,22 +5389,22 @@ msgstr "Exportation compressée impossible, fonction manquante (%s)."
 msgid "maximum %s"
 msgstr "maximum %s"
 
-#: libraries/config/FormDisplay.tpl.php:219
+#: libraries/config/FormDisplay.tpl.php:230
 msgid "This setting is disabled, it will not be applied to your configuration."
 msgstr ""
 "Ce réglage est désactivé, il ne sera pas appliqué à votre configuration."
 
-#: libraries/config/FormDisplay.tpl.php:313
+#: libraries/config/FormDisplay.tpl.php:324
 #, php-format
 msgid "Set value: %s"
 msgstr "Assigner la valeur: %s"
 
-#: libraries/config/FormDisplay.tpl.php:318
+#: libraries/config/FormDisplay.tpl.php:329
 #: libraries/config/messages.inc.php:610
 msgid "Restore default value"
 msgstr "Ramener la valeur par défaut"
 
-#: libraries/config/FormDisplay.tpl.php:332
+#: libraries/config/FormDisplay.tpl.php:343
 msgid "Allow users to customize this value"
 msgstr "Permettre aux utilisateurs de personnaliser cette valeur"
 
@@ -5884,7 +5900,7 @@ msgstr "Jeu de caractères du fichier"
 
 #: libraries/config/messages.inc.php:136 libraries/config/messages.inc.php:152
 #: libraries/sql_query_form.lib.php:247
-#: templates/structure/row_stats_table.phtml:7
+#: templates/table/structure/row_stats_table.phtml:7
 msgid "Format"
 msgstr "Format"
 
@@ -6401,7 +6417,7 @@ msgstr "Choisissez les détails à afficher dans la liste des tables."
 
 #: libraries/config/messages.inc.php:332
 #: libraries/plugins/export/ExportPdf.class.php:279
-#: templates/structure/secondary_tabs.phtml:8
+#: templates/table/secondary_tabs.phtml:8
 msgid "Table structure"
 msgstr "Structure de table"
 
@@ -8104,102 +8120,33 @@ msgstr "Microsoft Word 2000"
 msgid "OpenDocument Text"
 msgstr "Texte OpenDocument"
 
-#: libraries/controllers/StructureController.class.php:465
+#: libraries/controllers/DatabaseStructureController.class.php:405
 #: tbl_operations.php:382
 #, php-format
 msgid "Table %s has been emptied."
 msgstr "La table %s a été vidée."
 
-#: libraries/controllers/StructureController.class.php:486
+#: libraries/controllers/DatabaseStructureController.class.php:426
 #: tbl_operations.php:400 view_operations.php:119
 #, php-format
 msgid "View %s has been dropped."
 msgstr "La vue %s a été supprimée."
 
-#: libraries/controllers/StructureController.class.php:487
+#: libraries/controllers/DatabaseStructureController.class.php:427
 #: tbl_operations.php:401
 #, php-format
 msgid "Table %s has been dropped."
 msgstr "La table %s a été effacée."
 
-#: libraries/controllers/StructureController.class.php:797
-#, php-format
-msgid "The name '%s' is a MySQL reserved keyword."
-msgid_plural "The names '%s' are MySQL reserved keywords."
-msgstr[0] "L'identifiant '%s' est un mot-clé MySQL réservé."
-msgstr[1] "Les identifiants '%s' sont des mots-clés MySQL réservés."
-
-#: libraries/controllers/StructureController.class.php:875
-msgid "No column selected."
-msgstr "Aucune colonne n'a été sélectionnée."
-
-#: libraries/controllers/StructureController.class.php:1049
+#: libraries/controllers/DatabaseStructureController.class.php:733
 msgid "Favorite List is full!"
 msgstr "La liste des tables favorites est pleine !"
 
-#: libraries/controllers/StructureController.class.php:1272
-msgid "The columns have been moved successfully."
-msgstr "Les colonnes ont été déplacées avec succès."
-
-#: libraries/controllers/StructureController.class.php:1535
-#, php-format
-msgid ""
-"Table %1$s has been altered successfully. Privileges have been adjusted."
-msgstr ""
-"La table %1$s a été modifiée avec succès. Les privilèges ont été ajustés."
-
-#: libraries/controllers/StructureController.class.php:1541
-#: libraries/controllers/TableIndexesController.class.php:161
-#: tbl_addfield.php:92
-#, php-format
-msgid "Table %1$s has been altered successfully."
-msgstr "La table %1$s a été modifiée avec succès."
-
-#: libraries/controllers/StructureController.class.php:1588
-#: libraries/tracking.lib.php:1094
-msgid "Query error"
-msgstr "Erreur de requête"
-
-#: libraries/controllers/StructureController.class.php:1806
+#: libraries/controllers/DatabaseStructureController.class.php:947
 #: libraries/mysql_charsets.lib.php:366 libraries/mysql_charsets.lib.php:373
 msgid "unknown"
 msgstr "inconnu"
 
-#: libraries/controllers/StructureController.class.php:1957
-#: templates/structure/check_all_table_column.phtml:11
-msgid "Change"
-msgstr "Modifier"
-
-#: libraries/controllers/StructureController.class.php:1961
-#: libraries/controllers/StructureController.class.php:1966
-#: libraries/navigation/Nodes/Node_Index.class.php:30
-#: libraries/tracking.lib.php:926
-#: templates/columns_definitions/column_indexes.phtml:16
-#: templates/columns_definitions/table_fields_definitions.phtml:57
-#: templates/structure/check_all_table_column.phtml:30
-#: templates/structure/display_structure.phtml:79
-#: templates/structure/display_table_stats.phtml:19
-msgid "Index"
-msgstr "Index"
-
-#: libraries/controllers/StructureController.class.php:1963
-#: libraries/controllers/StructureController.class.php:1968
-#: templates/columns_definitions/column_indexes.phtml:27
-#: templates/structure/check_all_table_column.phtml:37
-msgid "Spatial"
-msgstr "Spatial"
-
-#: libraries/controllers/StructureController.class.php:1964
-#: libraries/controllers/StructureController.class.php:1969
-#: templates/columns_definitions/column_indexes.phtml:22
-#: templates/structure/check_all_table_column.phtml:47
-msgid "Fulltext"
-msgstr "Texte entier"
-
-#: libraries/controllers/StructureController.class.php:1970
-msgid "Distinct values"
-msgstr "Valeurs distinctes"
-
 #: libraries/controllers/TableChartController.class.php:82
 #: libraries/controllers/TableGisVisualizationController.class.php:101
 msgid "No SQL query was set to fetch data."
@@ -8213,11 +8160,18 @@ msgstr "Aucune colonne numérique n'existe dans la table."
 msgid "No data to display"
 msgstr "Rien à afficher"
 
-#: libraries/controllers/TableRelationController.class.php:217
+#: libraries/controllers/TableIndexesController.class.php:161
+#: libraries/controllers/TableStructureController.class.php:736
+#: tbl_addfield.php:92
+#, php-format
+msgid "Table %1$s has been altered successfully."
+msgstr "La table %1$s a été modifiée avec succès."
+
+#: libraries/controllers/TableRelationController.class.php:218
 msgid "Display column was successfully updated."
 msgstr "La colonne descriptive a été correctement modifiée."
 
-#: libraries/controllers/TableRelationController.class.php:283
+#: libraries/controllers/TableRelationController.class.php:288
 msgid "Internal relations were successfully updated."
 msgstr "Les relations internes ont été correctement modifiées."
 
@@ -8230,10 +8184,72 @@ msgid "Zoom search"
 msgstr "Recherche par zoom"
 
 #: libraries/controllers/TableSearchController.class.php:852
-#: templates/table/selection_form.phtml:59
+#: templates/table/search/selection_form.phtml:59
 msgid "Find and replace"
 msgstr "Chercher et remplacer"
 
+#: libraries/controllers/TableStructureController.class.php:163
+#, php-format
+msgid "The name '%s' is a MySQL reserved keyword."
+msgid_plural "The names '%s' are MySQL reserved keywords."
+msgstr[0] "L'identifiant '%s' est un mot-clé MySQL réservé."
+msgstr[1] "Les identifiants '%s' sont des mots-clés MySQL réservés."
+
+#: libraries/controllers/TableStructureController.class.php:241
+msgid "No column selected."
+msgstr "Aucune colonne n'a été sélectionnée."
+
+#: libraries/controllers/TableStructureController.class.php:467
+msgid "The columns have been moved successfully."
+msgstr "Les colonnes ont été déplacées avec succès."
+
+#: libraries/controllers/TableStructureController.class.php:730
+#, php-format
+msgid ""
+"Table %1$s has been altered successfully. Privileges have been adjusted."
+msgstr ""
+"La table %1$s a été modifiée avec succès. Les privilèges ont été ajustés."
+
+#: libraries/controllers/TableStructureController.class.php:783
+#: libraries/tracking.lib.php:1094
+msgid "Query error"
+msgstr "Erreur de requête"
+
+#: libraries/controllers/TableStructureController.class.php:948
+#: templates/table/structure/check_all_table_column.phtml:11
+msgid "Change"
+msgstr "Modifier"
+
+#: libraries/controllers/TableStructureController.class.php:952
+#: libraries/controllers/TableStructureController.class.php:957
+#: libraries/navigation/Nodes/Node_Index.class.php:30
+#: libraries/tracking.lib.php:926
+#: templates/columns_definitions/column_indexes.phtml:16
+#: templates/columns_definitions/table_fields_definitions.phtml:57
+#: templates/table/structure/check_all_table_column.phtml:30
+#: templates/table/structure/display_structure.phtml:79
+#: templates/table/structure/display_table_stats.phtml:19
+msgid "Index"
+msgstr "Index"
+
+#: libraries/controllers/TableStructureController.class.php:954
+#: libraries/controllers/TableStructureController.class.php:959
+#: templates/columns_definitions/column_indexes.phtml:27
+#: templates/table/structure/check_all_table_column.phtml:37
+msgid "Spatial"
+msgstr "Spatial"
+
+#: libraries/controllers/TableStructureController.class.php:955
+#: libraries/controllers/TableStructureController.class.php:960
+#: templates/columns_definitions/column_indexes.phtml:22
+#: templates/table/structure/check_all_table_column.phtml:47
+msgid "Fulltext"
+msgstr "Texte entier"
+
+#: libraries/controllers/TableStructureController.class.php:963
+msgid "Distinct values"
+msgstr "Valeurs distinctes"
+
 #: libraries/core.lib.php:306
 #, php-format
 msgid "The %s extension is missing. Please check your PHP configuration."
@@ -8282,7 +8298,7 @@ msgid "No Password"
 msgstr "Aucun mot de passe"
 
 #: libraries/display_change_password.lib.php:68
-#: libraries/plugins/auth/AuthenticationCookie.class.php:199
+#: libraries/plugins/auth/AuthenticationCookie.class.php:187
 #: libraries/replication_gui.lib.php:422 libraries/replication_gui.lib.php:862
 #: libraries/server_privileges.lib.php:1640
 msgid "Password:"
@@ -9086,12 +9102,12 @@ msgid "Dump has been saved to file %s."
 msgstr "Le fichier d'exportation a été sauvegardé sous %s."
 
 #: libraries/import.lib.php:202 libraries/insert_edit.lib.php:124
-#: libraries/rte/rte_routines.lib.php:1353 libraries/sql.lib.php:1312
+#: libraries/rte/rte_routines.lib.php:1444 libraries/sql.lib.php:1306
 #: tbl_get_field.php:44
 msgid "MySQL returned an empty result set (i.e. zero rows)."
 msgstr "MySQL a retourné un résultat vide (aucune ligne)."
 
-#: libraries/import.lib.php:265 libraries/sql.lib.php:1326
+#: libraries/import.lib.php:265 libraries/sql.lib.php:1320
 msgid "[ROLLBACK occurred.]"
 msgstr "[Un ROLLBACK a eu lieu]"
 
@@ -9161,14 +9177,14 @@ msgstr "Créer un index sur &nbsp;%s&nbsp;colonnes"
 
 #: libraries/insert_edit.lib.php:233
 #: libraries/navigation/Nodes/Node_DatabaseChild.class.php:48
-#: templates/designer/table_list.phtml:40
+#: templates/database/designer/table_list.phtml:40
 msgid "Hide"
 msgstr "Cacher"
 
 #: libraries/insert_edit.lib.php:249
 #: libraries/navigation/Nodes/Node_Function.class.php:32
-#: libraries/rte/rte_routines.lib.php:1495
-#: templates/table/table_header.phtml:4
+#: libraries/rte/rte_routines.lib.php:1586
+#: templates/table/search/table_header.phtml:4
 msgid "Function"
 msgstr "Fonction"
 
@@ -9183,84 +9199,85 @@ msgstr ""
 "Il est possible que cette colonne<br />ne soit pas éditable en raison de sa "
 "longueur."
 
-#: libraries/insert_edit.lib.php:1050
+#: libraries/insert_edit.lib.php:1048
 msgid "Binary - do not edit"
 msgstr "Binaire - ne pas éditer"
 
-#: libraries/insert_edit.lib.php:1176 libraries/server_privileges.lib.php:470
-#: templates/table/options.phtml:36
+#: libraries/insert_edit.lib.php:1174 libraries/server_privileges.lib.php:470
+#: templates/table/search/options.phtml:36
 msgid "Or"
 msgstr "Ou"
 
-#: libraries/insert_edit.lib.php:1177
+#: libraries/insert_edit.lib.php:1175
 msgid "web server upload directory:"
 msgstr "répertoire de transfert du serveur web : "
 
-#: libraries/insert_edit.lib.php:1348 templates/table/input_box.phtml:49
+#: libraries/insert_edit.lib.php:1346
+#: templates/table/search/input_box.phtml:49
 msgid "Edit/Insert"
 msgstr "Modifier/Insérer"
 
-#: libraries/insert_edit.lib.php:1398
+#: libraries/insert_edit.lib.php:1396
 #, php-format
 msgid "Continue insertion with %s rows"
 msgstr "Continuer l'insertion avec %s lignes"
 
-#: libraries/insert_edit.lib.php:1428
+#: libraries/insert_edit.lib.php:1426
 msgid "and then"
 msgstr "et ensuite"
 
-#: libraries/insert_edit.lib.php:1461
+#: libraries/insert_edit.lib.php:1459
 msgid "Insert as new row"
 msgstr "Sauvegarder une nouvelle ligne"
 
-#: libraries/insert_edit.lib.php:1464
+#: libraries/insert_edit.lib.php:1462
 msgid "Insert as new row and ignore errors"
 msgstr "Sauvegarder une nouvelle ligne en ignorant les erreurs"
 
-#: libraries/insert_edit.lib.php:1467
+#: libraries/insert_edit.lib.php:1465
 msgid "Show insert query"
 msgstr "Afficher l'énoncé d'insertion"
 
-#: libraries/insert_edit.lib.php:1487
+#: libraries/insert_edit.lib.php:1485
 msgid "Go back to previous page"
 msgstr "Retourner à la page précédente"
 
-#: libraries/insert_edit.lib.php:1490
+#: libraries/insert_edit.lib.php:1488
 msgid "Insert another new row"
 msgstr "Insérer une nouvelle ligne"
 
-#: libraries/insert_edit.lib.php:1495
+#: libraries/insert_edit.lib.php:1493
 msgid "Go back to this page"
 msgstr "Demeurer sur cette page"
 
-#: libraries/insert_edit.lib.php:1518
+#: libraries/insert_edit.lib.php:1516
 msgid "Edit next row"
 msgstr "Modifier la ligne suivante"
 
-#: libraries/insert_edit.lib.php:1540
+#: libraries/insert_edit.lib.php:1538
 msgid ""
 "Use TAB key to move from value to value, or CTRL+arrows to move anywhere"
 msgstr ""
 "Utilisez la tabulation pour aller d'une valeur à l'autre, ou CTRL+flèches "
 "pour aller n'importe où"
 
-#: libraries/insert_edit.lib.php:1577 libraries/replication_gui.lib.php:542
-#: libraries/rte/rte_routines.lib.php:1497
+#: libraries/insert_edit.lib.php:1575 libraries/replication_gui.lib.php:542
+#: libraries/rte/rte_routines.lib.php:1588
 #: libraries/server_status_variables.lib.php:220
-#: templates/designer/having_query_panel.phtml:100
-#: templates/designer/options_panel.phtml:73
-#: templates/designer/options_panel.phtml:239
-#: templates/designer/where_query_panel.phtml:69
-#: templates/table/table_header.phtml:10
-#: templates/table/zoom_result_form.phtml:35
+#: templates/database/designer/having_query_panel.phtml:100
+#: templates/database/designer/options_panel.phtml:73
+#: templates/database/designer/options_panel.phtml:239
+#: templates/database/designer/where_query_panel.phtml:69
+#: templates/table/search/table_header.phtml:10
+#: templates/table/search/zoom_result_form.phtml:35
 msgid "Value"
 msgstr "Valeur"
 
-#: libraries/insert_edit.lib.php:1937 libraries/sql.lib.php:1309
+#: libraries/insert_edit.lib.php:1935 libraries/sql.lib.php:1303
 msgid "Showing SQL query"
 msgstr "Affichage de la requête SQL"
 
-#: libraries/insert_edit.lib.php:1962 libraries/sql.lib.php:1287
+#: libraries/insert_edit.lib.php:1960 libraries/sql.lib.php:1281
 #, php-format
 msgid "Inserted row id: %1$d"
 msgstr "Identifiant de la ligne insérée : %1$d"
@@ -9670,7 +9687,7 @@ msgstr "Nouveau déclencheur"
 #: libraries/navigation/Nodes/Node_View_Container.class.php:26
 #: libraries/navigation/Nodes/Node_View_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:129
-#: templates/structure/show_create.phtml:30
+#: templates/database/structure/show_create.phtml:30
 msgid "Views"
 msgstr "Vues"
 
@@ -10012,7 +10029,7 @@ msgstr ""
 
 #: libraries/operations.lib.php:101 libraries/operations.lib.php:249
 #: libraries/operations.lib.php:869 libraries/operations.lib.php:963
-#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:907
+#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:998
 #: templates/columns_definitions/table_fields_definitions.phtml:47
 msgid "Adjust Privileges"
 msgstr "Ajuster les privilèges"
@@ -10102,22 +10119,22 @@ msgid "Switch to copied table"
 msgstr "Aller à la table copiée"
 
 #: libraries/operations.lib.php:1360
-#: templates/structure/check_all_tables.phtml:18
+#: templates/database/structure/check_all_tables.phtml:18
 msgid "Table maintenance"
 msgstr "<b>Maintenance</b> de la table"
 
 #: libraries/operations.lib.php:1398
-#: templates/structure/check_all_tables.phtml:19
+#: templates/database/structure/check_all_tables.phtml:19
 msgid "Analyze table"
 msgstr "Analyser la table"
 
 #: libraries/operations.lib.php:1413
-#: templates/structure/check_all_tables.phtml:20
+#: templates/database/structure/check_all_tables.phtml:20
 msgid "Check table"
 msgstr "Vérifier la table"
 
 #: libraries/operations.lib.php:1428
-#: templates/structure/check_all_tables.phtml:22
+#: templates/database/structure/check_all_tables.phtml:22
 msgid "Checksum table"
 msgstr "Table de somme de contrôle"
 
@@ -10135,18 +10152,19 @@ msgid "Flush the table (FLUSH)"
 msgstr "Recharger la table (FLUSH)"
 
 #: libraries/operations.lib.php:1477
-#: templates/structure/check_all_tables.phtml:23
-#: templates/structure/display_table_stats.phtml:56
+#: templates/database/structure/check_all_tables.phtml:23
+#: templates/table/structure/display_table_stats.phtml:56
 msgid "Optimize table"
 msgstr "Optimiser la table"
 
 #: libraries/operations.lib.php:1492
-#: templates/structure/check_all_tables.phtml:24
+#: templates/database/structure/check_all_tables.phtml:24
 msgid "Repair table"
 msgstr "Réparer la table"
 
 #: libraries/operations.lib.php:1538
-#: templates/structure/check_all_tables.phtml:14 view_operations.php:127
+#: templates/database/structure/check_all_tables.phtml:14
+#: view_operations.php:127
 msgid "Delete data or table"
 msgstr "Supprimer les données ou la table"
 
@@ -10269,7 +10287,7 @@ msgid "Cannot connect: invalid settings."
 msgstr "Connexion impossible: paramètres incorrects."
 
 #: libraries/plugins/auth/AuthenticationConfig.class.php:108
-#: libraries/plugins/auth/AuthenticationCookie.class.php:134
+#: libraries/plugins/auth/AuthenticationCookie.class.php:122
 #: libraries/plugins/auth/AuthenticationHttp.class.php:96
 #, php-format
 msgid "Welcome to %s"
@@ -10300,38 +10318,38 @@ msgstr ""
 msgid "Retry to connect"
 msgstr "Réessayer de se connecter"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:146
+#: libraries/plugins/auth/AuthenticationCookie.class.php:134
 msgid "Your session has expired. Please log in again."
 msgstr "Votre session a expiré. Veuillez vous connecter à nouveau."
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:170
+#: libraries/plugins/auth/AuthenticationCookie.class.php:158
 msgid "Log in"
 msgstr "Connexion"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:178
-#: libraries/plugins/auth/AuthenticationCookie.class.php:188
+#: libraries/plugins/auth/AuthenticationCookie.class.php:166
+#: libraries/plugins/auth/AuthenticationCookie.class.php:176
 msgid "You can enter hostname/IP address and port separated by space."
 msgstr ""
 "Vous pouvez saisir le nom du serveur ou son adresse IP, ainsi que le port "
 "séparé par une espace."
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:193
+#: libraries/plugins/auth/AuthenticationCookie.class.php:181
 msgid "Username:"
 msgstr "Utilisateur : "
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:205
+#: libraries/plugins/auth/AuthenticationCookie.class.php:193
 msgid "Server Choice:"
 msgstr "Choix du serveur : "
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:386
+#: libraries/plugins/auth/AuthenticationCookie.class.php:374
 msgid "Entered captcha is wrong, try again!"
 msgstr "Erreur, essayez à nouveau !"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:396
+#: libraries/plugins/auth/AuthenticationCookie.class.php:384
 msgid "Please enter correct captcha!"
 msgstr "Veuillez saisir le captcha correct !"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:423
+#: libraries/plugins/auth/AuthenticationCookie.class.php:411
 msgid "You are not allowed to log in to this MySQL server!"
 msgstr "Vous n'êtes pas autorisé à vous connecter à ce serveur MySQL !"
 
@@ -10427,7 +10445,7 @@ msgstr "Événement"
 #: libraries/plugins/export/ExportOdt.class.php:593
 #: libraries/plugins/export/ExportTexytext.class.php:428
 #: libraries/plugins/export/PMA_ExportPdf.class.php:313
-#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:984
 #: libraries/rte/rte_triggers.lib.php:377
 msgid "Definition"
 msgstr "Définition"
@@ -10751,7 +10769,7 @@ msgid "Last check:"
 msgstr "Dernière vérification : "
 
 #: libraries/plugins/export/ExportSql.class.php:1399
-#: templates/structure/structure_table_row.phtml:183
+#: templates/database/structure/structure_table_row.phtml:183
 msgid "in use"
 msgstr "utilisé"
 
@@ -10947,18 +10965,14 @@ msgstr "Les données spatiales MySQL ne supportent pas le type ESRI «%s»."
 msgid "The imported file does not contain any data!"
 msgstr "Le fichier importé ne contient aucune donnée !"
 
-#: libraries/plugins/import/ImportSql.class.php:169
+#: libraries/plugins/import/ImportSql.class.php:72
 msgid "SQL compatibility mode:"
 msgstr "Mode de compatibilité SQL : "
 
-#: libraries/plugins/import/ImportSql.class.php:181
+#: libraries/plugins/import/ImportSql.class.php:84
 msgid "Do not use <code>AUTO_INCREMENT</code> for zero values"
 msgstr "Ne pas utiliser <code>AUTO_INCREMENT</code> pour la valeur zéro"
 
-#: libraries/plugins/import/ImportSql.class.php:195
-msgid "Read as multibytes"
-msgstr "Lire en tant que multioctets"
-
 #: libraries/plugins/import/ImportXml.class.php:54
 msgid "XML"
 msgstr "XML"
@@ -11001,7 +11015,7 @@ msgid "Show grid"
 msgstr "Grille"
 
 #: libraries/plugins/schema/SchemaPdf.class.php:94
-#: templates/structure/print_view_data_dictionary_link.phtml:6
+#: templates/database/structure/print_view_data_dictionary_link.phtml:6
 msgid "Data Dictionary"
 msgstr "Dictionnaire de données"
 
@@ -11026,7 +11040,7 @@ msgid "The %s table doesn't exist!"
 msgstr "La table %s n'existe pas !"
 
 #: libraries/plugins/schema/eps/Eps_Relation_Schema.class.php:321
-#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:309
+#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:323
 #, php-format
 msgid "Schema of the %s database - Page %s"
 msgstr "Schéma de la base %s - Page %s"
@@ -11052,7 +11066,7 @@ msgstr "Table des matières"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1005
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1028
 #: libraries/tracking.lib.php:884
-#: templates/structure/table_structure_header.phtml:11
+#: templates/table/structure/table_structure_header.phtml:11
 msgid "Extra"
 msgstr "Extra"
 
@@ -11419,11 +11433,11 @@ msgid "Create the needed tables with the <code>%screate_tables.sql</code>."
 msgstr ""
 "Créez les tables requises au moyen de <code>%screate_tables.sql</code>."
 
-#: libraries/relation.lib.php:360
+#: libraries/relation.lib.php:357
 msgid "Create a pma user and give access to these tables."
 msgstr "Créez un utilisateur pma et donnez-lui accès à ces tables."
 
-#: libraries/relation.lib.php:365
+#: libraries/relation.lib.php:360
 msgid ""
 "Enable advanced features in configuration file (<code>config.inc.php</"
 "code>), for example by starting from <code>config.sample.inc.php</code>."
@@ -11432,17 +11446,17 @@ msgstr ""
 "(<code>config.inc.php</code>), en vous basant par exemple sur <code>config."
 "sample.inc.php</code>."
 
-#: libraries/relation.lib.php:373
+#: libraries/relation.lib.php:365
 msgid "Re-login to phpMyAdmin to load the updated configuration file."
 msgstr ""
 "Reconnectez-vous à phpMyAdmin afin d'utiliser le fichier de configuration "
 "modifié."
 
-#: libraries/relation.lib.php:1612
+#: libraries/relation.lib.php:1607
 msgid "no description"
 msgstr "pas de description"
 
-#: libraries/relation.lib.php:1811
+#: libraries/relation.lib.php:1806
 msgid ""
 "You do not have necessary privileges to create a database named "
 "'phpmyadmin'. You may go to 'Operations' tab of any database to set up the "
@@ -11453,7 +11467,7 @@ msgstr ""
 "base de données pour y mettre en place la configuration de stockage "
 "phpMyAdmin."
 
-#: libraries/relation.lib.php:1928
+#: libraries/relation.lib.php:1923
 #, php-format
 msgid ""
 "%sCreate%s a database named 'phpmyadmin' and setup the phpMyAdmin "
@@ -11462,7 +11476,7 @@ msgstr ""
 "%sCréer%s une base de données nommée « phpmyadmin » et la configuration du "
 "stockage de phpMyAdmin dans cette base."
 
-#: libraries/relation.lib.php:1936
+#: libraries/relation.lib.php:1931
 #, php-format
 msgid ""
 "%sCreate%s the phpMyAdmin configuration storage in the current database."
@@ -11470,7 +11484,7 @@ msgstr ""
 "%sCréer%s le stockage de configurations phpMyAdmin dans la base de données "
 "active."
 
-#: libraries/relation.lib.php:1944
+#: libraries/relation.lib.php:1939
 #, php-format
 msgid "%sCreate%s missing phpMyAdmin configuration storage tables."
 msgstr ""
@@ -11478,7 +11492,7 @@ msgstr ""
 "phpMyAdmin."
 
 #: libraries/replication_gui.lib.php:46 libraries/replication_gui.lib.php:343
-#: libraries/server_databases.lib.php:387
+#: libraries/server_databases.lib.php:398
 msgid "Master replication"
 msgstr "Réplication maître"
 
@@ -11543,7 +11557,7 @@ msgstr ""
 "configuré comme maître."
 
 #: libraries/replication_gui.lib.php:141
-#: libraries/server_databases.lib.php:389
+#: libraries/server_databases.lib.php:400
 msgid "Slave replication"
 msgstr "Réplication esclave"
 
@@ -11821,10 +11835,10 @@ msgid "Master server changed successfully to %s."
 msgstr "Le serveur maître est maintenant %s."
 
 #: libraries/rte/rte_events.lib.php:106 libraries/rte/rte_events.lib.php:115
-#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:149
-#: libraries/rte/rte_routines.lib.php:158
-#: libraries/rte/rte_routines.lib.php:231
-#: libraries/rte/rte_routines.lib.php:1362
+#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:219
+#: libraries/rte/rte_routines.lib.php:246
+#: libraries/rte/rte_routines.lib.php:368
+#: libraries/rte/rte_routines.lib.php:1453
 #: libraries/rte/rte_triggers.lib.php:82 libraries/rte/rte_triggers.lib.php:91
 #: libraries/rte/rte_triggers.lib.php:123
 #, php-format
@@ -11845,7 +11859,7 @@ msgstr "L'événement %1$s a été modifié."
 msgid "Event %1$s has been created."
 msgstr "L'événement %1$s a été créé."
 
-#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:251
+#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:266
 #: libraries/rte/rte_triggers.lib.php:144
 msgid "One or more errors have occurred while processing your request:"
 msgstr "Au moins une erreur s'est produite lors du traitement de la requête :"
@@ -11854,7 +11868,7 @@ msgstr "Au moins une erreur s'est produite lors du traitement de la requête :"
 msgid "Edit event"
 msgstr "Modifier l'événement"
 
-#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:794
+#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:885
 #: libraries/rte/rte_triggers.lib.php:323 view_create.php:180
 msgid "Details"
 msgstr "Détails"
@@ -11867,7 +11881,7 @@ msgstr "Nom de l'événement"
 msgid "Event type"
 msgstr "Type d'évènement"
 
-#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:817
+#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:908
 #, php-format
 msgid "Change to %s"
 msgstr "Changer pour %s"
@@ -11894,12 +11908,14 @@ msgstr "Fin"
 msgid "On completion preserve"
 msgstr "Suite à l'exécution, conserver"
 
-#: libraries/rte/rte_events.lib.php:491 libraries/rte/rte_routines.lib.php:930
+#: libraries/rte/rte_events.lib.php:491
+#: libraries/rte/rte_routines.lib.php:1021
 #: libraries/rte/rte_triggers.lib.php:383 view_create.php:209
 msgid "Definer"
 msgstr "Créateur"
 
-#: libraries/rte/rte_events.lib.php:535 libraries/rte/rte_routines.lib.php:997
+#: libraries/rte/rte_events.lib.php:535
+#: libraries/rte/rte_routines.lib.php:1088
 #: libraries/rte/rte_triggers.lib.php:422
 msgid "The definer must be in the \"username@hostname\" format!"
 msgstr "Le définisseur doit suivre le format «utilisateur@machine» !"
@@ -11925,9 +11941,9 @@ msgid "You must provide an event definition."
 msgstr "Vous devez fournir une définition pour l'événement."
 
 #: libraries/rte/rte_export.lib.php:43 libraries/rte/rte_general.lib.php:72
-#: libraries/rte/rte_routines.lib.php:345
-#: libraries/rte/rte_routines.lib.php:1198
-#: libraries/rte/rte_routines.lib.php:1411
+#: libraries/rte/rte_routines.lib.php:153
+#: libraries/rte/rte_routines.lib.php:1289
+#: libraries/rte/rte_routines.lib.php:1502
 msgid "Error in processing request:"
 msgstr "Erreur dans le traitement de la requête : "
 
@@ -11963,72 +11979,72 @@ msgstr ""
 "peut échouer ! [/strong]  Veuillez utiliser l'extension «mysqli» pour éviter "
 "ces problèmes."
 
-#: libraries/rte/rte_routines.lib.php:110
-#: libraries/rte/rte_routines.lib.php:1006
+#: libraries/rte/rte_routines.lib.php:123
+msgid "Edit routine"
+msgstr "Modifier une procédure"
+
+#: libraries/rte/rte_routines.lib.php:200
+#: libraries/rte/rte_routines.lib.php:1097
 #, php-format
 msgid "Invalid routine type: \"%s\""
 msgstr "Type de procédure invalide : «%s»"
 
-#: libraries/rte/rte_routines.lib.php:170
-msgid "Sorry, we failed to restore the dropped routine."
-msgstr "Désolé, il a été impossible de restaurer la procédure."
-
-#: libraries/rte/rte_routines.lib.php:211
-#, php-format
-msgid "Routine %1$s has been modified. Privileges have been adjusted."
-msgstr "La procédure %1$s a été modifiée. Les privilèges ont été ajustés."
-
-#: libraries/rte/rte_routines.lib.php:216
-#, php-format
-msgid "Routine %1$s has been modified."
-msgstr "La procédure %1$s a été modifiée."
-
-#: libraries/rte/rte_routines.lib.php:238
+#: libraries/rte/rte_routines.lib.php:253
 #, php-format
 msgid "Routine %1$s has been created."
 msgstr "La procédure %1$s a été créée."
 
-#: libraries/rte/rte_routines.lib.php:315
-msgid "Edit routine"
-msgstr "Modifier une procédure"
+#: libraries/rte/rte_routines.lib.php:380
+msgid "Sorry, we failed to restore the dropped routine."
+msgstr "Désolé, il a été impossible de restaurer la procédure."
 
-#: libraries/rte/rte_routines.lib.php:797
+#: libraries/rte/rte_routines.lib.php:439
+#, php-format
+msgid "Routine %1$s has been modified. Privileges have been adjusted."
+msgstr "La procédure %1$s a été modifiée. Les privilèges ont été ajustés."
+
+#: libraries/rte/rte_routines.lib.php:444
+#, php-format
+msgid "Routine %1$s has been modified."
+msgstr "La procédure %1$s a été modifiée."
+
+#: libraries/rte/rte_routines.lib.php:888
 msgid "Routine name"
 msgstr "Nom de la procédure"
 
-#: libraries/rte/rte_routines.lib.php:823
+#: libraries/rte/rte_routines.lib.php:914
 msgid "Parameters"
 msgstr "Paramètres"
 
-#: libraries/rte/rte_routines.lib.php:829
+#: libraries/rte/rte_routines.lib.php:920
 msgid "Direction"
 msgstr "Direction"
 
-#: libraries/rte/rte_routines.lib.php:847
+#: libraries/rte/rte_routines.lib.php:938
 msgid "Add parameter"
 msgstr "Ajouter un paramètre"
 
-#: libraries/rte/rte_routines.lib.php:851
+#: libraries/rte/rte_routines.lib.php:942
 msgid "Remove last parameter"
 msgstr "Supprimer le dernier paramètre"
 
-#: libraries/rte/rte_routines.lib.php:856
+#: libraries/rte/rte_routines.lib.php:947
 msgid "Return type"
 msgstr "Type retourné"
 
-#: libraries/rte/rte_routines.lib.php:862
+#: libraries/rte/rte_routines.lib.php:953
 msgid "Return length/values"
 msgstr "Taille/Valeurs à retourner"
 
-#: libraries/rte/rte_routines.lib.php:868
+#: libraries/rte/rte_routines.lib.php:959
 msgid "Return options"
 msgstr "Options de retour"
 
-#: libraries/rte/rte_routines.lib.php:899
+#: libraries/rte/rte_routines.lib.php:990
 msgid "Is deterministic"
 msgstr "Est déterministe"
 
-#: libraries/rte/rte_routines.lib.php:920
+#: libraries/rte/rte_routines.lib.php:1011
 msgid ""
 "You do not have sufficient privileges to perform this operation; Please "
 "refer to the documentation for more details"
@@ -12036,25 +12052,25 @@ msgstr ""
 "Vous n'avez pas de privilèges suffisants pour effectuer cette opération; "
 "veuillez vous reporter à la documentation pour plus de détails"
 
-#: libraries/rte/rte_routines.lib.php:935
+#: libraries/rte/rte_routines.lib.php:1026
 msgid "Security type"
 msgstr "Type de sécurité"
 
-#: libraries/rte/rte_routines.lib.php:944
+#: libraries/rte/rte_routines.lib.php:1035
 msgid "SQL data access"
 msgstr "Accès aux données SQL"
 
-#: libraries/rte/rte_routines.lib.php:1013
+#: libraries/rte/rte_routines.lib.php:1104
 msgid "You must provide a routine name!"
 msgstr "Vous devez fournir un nom pour la procédure !"
 
-#: libraries/rte/rte_routines.lib.php:1047
+#: libraries/rte/rte_routines.lib.php:1138
 #, php-format
 msgid "Invalid direction \"%s\" given for parameter."
 msgstr "La direction «%s» fournie pour le paramètre est invalide."
 
-#: libraries/rte/rte_routines.lib.php:1069
-#: libraries/rte/rte_routines.lib.php:1131
+#: libraries/rte/rte_routines.lib.php:1160
+#: libraries/rte/rte_routines.lib.php:1222
 msgid ""
 "You must provide length/values for routine parameters of type ENUM, SET, "
 "VARCHAR and VARBINARY."
@@ -12062,37 +12078,37 @@ msgstr ""
 "Vous devez fournir une longueur ou une valeur pour les paramètres de type "
 "ENUM, SET, VARCHAR et VARBINARY."
 
-#: libraries/rte/rte_routines.lib.php:1095
+#: libraries/rte/rte_routines.lib.php:1186
 msgid "You must provide a name and a type for each routine parameter."
 msgstr "Vous devez fournir un nom et un type pour chacun des paramètres."
 
-#: libraries/rte/rte_routines.lib.php:1114
+#: libraries/rte/rte_routines.lib.php:1205
 msgid "You must provide a valid return type for the routine."
 msgstr "Vous devez fournir un type de retour valable pour la procédure."
 
-#: libraries/rte/rte_routines.lib.php:1174
+#: libraries/rte/rte_routines.lib.php:1265
 msgid "You must provide a routine definition."
 msgstr "Vous devez fournir une définition pour la procédure."
 
-#: libraries/rte/rte_routines.lib.php:1285
+#: libraries/rte/rte_routines.lib.php:1376
 #, php-format
 msgid "Execution results of routine %s"
 msgstr "Résultats de l'exécution de la procédure %s"
 
-#: libraries/rte/rte_routines.lib.php:1340
+#: libraries/rte/rte_routines.lib.php:1431
 #, php-format
 msgid "%d row affected by the last statement inside the procedure."
 msgid_plural "%d rows affected by the last statement inside the procedure."
 msgstr[0] "%d ligne a été affectée par le dernier énoncé de la procédure."
 msgstr[1] "%d lignes ont été affectées par le dernier énoncé de la procédure."
 
-#: libraries/rte/rte_routines.lib.php:1398
-#: libraries/rte/rte_routines.lib.php:1406
+#: libraries/rte/rte_routines.lib.php:1489
+#: libraries/rte/rte_routines.lib.php:1497
 msgid "Execute routine"
 msgstr "Exécuter la procédure"
 
-#: libraries/rte/rte_routines.lib.php:1485
-#: libraries/rte/rte_routines.lib.php:1488
+#: libraries/rte/rte_routines.lib.php:1576
+#: libraries/rte/rte_routines.lib.php:1579
 msgid "Routine parameters"
 msgstr "Paramètres de procédure"
 
@@ -12249,7 +12265,7 @@ msgid "Original position"
 msgstr "Position d'origine"
 
 #: libraries/server_bin_log.lib.php:133
-#: templates/structure/display_table_stats.phtml:4
+#: templates/table/structure/display_table_stats.phtml:4
 msgid "Information"
 msgstr "Information"
 
@@ -12287,12 +12303,12 @@ msgstr ""
 "Note: L'activation des statistiques peut causer un trafic important entre le "
 "serveur web et le serveur MySQL."
 
-#: libraries/server_databases.lib.php:364
-#: libraries/server_databases.lib.php:365
+#: libraries/server_databases.lib.php:366
+#: libraries/server_databases.lib.php:371
 msgid "Enable Statistics"
 msgstr "Activer les statistiques"
 
-#: libraries/server_databases.lib.php:481
+#: libraries/server_databases.lib.php:492
 #, php-format
 msgid "%1$d database has been dropped successfully."
 msgid_plural "%1$d databases have been dropped successfully."
@@ -12677,7 +12693,7 @@ msgid "You have revoked the privileges for %s."
 msgstr "Vous avez révoqué les privilèges pour %s."
 
 #: libraries/server_privileges.lib.php:2059
-#: libraries/server_privileges.lib.php:4290
+#: libraries/server_privileges.lib.php:4316
 msgid "Add user account"
 msgstr "Ajouter un compte d'utilisateur"
 
@@ -12845,36 +12861,36 @@ msgstr "Destruction de %s"
 msgid "The privileges were reloaded successfully."
 msgstr "Les privilèges ont été rechargés."
 
-#: libraries/server_privileges.lib.php:3994
+#: libraries/server_privileges.lib.php:4003
 #, php-format
 msgid "The user %s already exists!"
 msgstr "L'utilisateur %s existe déjà !"
 
-#: libraries/server_privileges.lib.php:4232
+#: libraries/server_privileges.lib.php:4258
 #, php-format
 msgid "Privileges for %s"
 msgstr "Privilèges pour %s"
 
-#: libraries/server_privileges.lib.php:4241
+#: libraries/server_privileges.lib.php:4267
 #: libraries/server_status_processes.lib.php:72
 #: libraries/server_user_groups.lib.php:39
 msgid "User"
 msgstr "Utilisateur"
 
-#: libraries/server_privileges.lib.php:4282
+#: libraries/server_privileges.lib.php:4308
 msgctxt "Create new user"
 msgid "New"
 msgstr "Nouvel utilisateur"
 
-#: libraries/server_privileges.lib.php:4311
+#: libraries/server_privileges.lib.php:4337
 msgid "Edit privileges:"
 msgstr "Changer les privilèges :"
 
-#: libraries/server_privileges.lib.php:4312
+#: libraries/server_privileges.lib.php:4338
 msgid "User account"
 msgstr "Compte d'utilisateur"
 
-#: libraries/server_privileges.lib.php:4371
+#: libraries/server_privileges.lib.php:4397
 msgid ""
 "Note: You are attempting to edit privileges of the user with which you are "
 "currently logged in."
@@ -12882,11 +12898,11 @@ msgstr ""
 "Remarque : Vous tentez de modifier les privilèges de l'utilisateur avec "
 "lequel vous êtes actuellement connecté."
 
-#: libraries/server_privileges.lib.php:4391 libraries/server_users.lib.php:25
+#: libraries/server_privileges.lib.php:4417 libraries/server_users.lib.php:25
 msgid "User accounts overview"
 msgstr "Aperçu des comptes d'utilisateur"
 
-#: libraries/server_privileges.lib.php:4459
+#: libraries/server_privileges.lib.php:4485
 msgid ""
 "A user account allowing any user from localhost to connect is present. This "
 "will prevent other users from connecting if the host part of their account "
@@ -12897,7 +12913,7 @@ msgstr ""
 "connecter si la partie hôte de leur compte permet une connexion de n'importe "
 "quel hôte (%)."
 
-#: libraries/server_privileges.lib.php:4500
+#: libraries/server_privileges.lib.php:4526
 #, php-format
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
@@ -12910,7 +12926,7 @@ msgstr ""
 "effectifs, si des changements manuels ont été apportés. Dans ce cas, vous "
 "devriez %srecharger les privilèges%s avant de continuer."
 
-#: libraries/server_privileges.lib.php:4519
+#: libraries/server_privileges.lib.php:4545
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
 "tables. The content of these tables may differ from the privileges the "
@@ -12923,25 +12939,25 @@ msgstr ""
 "effectifs, si des changements manuels ont été apportés. Dans ce cas, les "
 "privilèges doivent être rechargés mais il vous manque le privilège RELOAD."
 
-#: libraries/server_privileges.lib.php:4569
+#: libraries/server_privileges.lib.php:4595
 msgid "The selected user was not found in the privilege table."
 msgstr "L'utilisateur choisi n'existe pas dans la table des privilèges."
 
-#: libraries/server_privileges.lib.php:4801
+#: libraries/server_privileges.lib.php:4827
 msgid "You have added a new user."
 msgstr "Vous avez ajouté un utilisateur."
 
-#: libraries/server_status.lib.php:53
+#: libraries/server_status.lib.php:60
 #, php-format
 msgid "Network traffic since startup: %s"
 msgstr "Trafic réseau depuis le démarrage : %s"
 
-#: libraries/server_status.lib.php:66
+#: libraries/server_status.lib.php:73
 #, php-format
 msgid "This MySQL server has been running for %1$s. It started up on %2$s."
 msgstr "Ce serveur MySQL fonctionne depuis %1$s. Il a démarré le %2$s."
 
-#: libraries/server_status.lib.php:80
+#: libraries/server_status.lib.php:94
 msgid ""
 "This MySQL server works as <b>master</b> and <b>slave</b> in <b>replication</"
 "b> process."
@@ -12949,23 +12965,23 @@ msgstr ""
 "Ce serveur est un serveur <b>maître</b> et <b>esclave</b> dans le processus "
 "de <b>réplication</b>."
 
-#: libraries/server_status.lib.php:85
+#: libraries/server_status.lib.php:99
 msgid "This MySQL server works as <b>master</b> in <b>replication</b> process."
 msgstr ""
 "Ce serveur est un serveur <b>maître</b> dans le processus de <b>réplication</"
 "b>."
 
-#: libraries/server_status.lib.php:90
+#: libraries/server_status.lib.php:104
 msgid "This MySQL server works as <b>slave</b> in <b>replication</b> process."
 msgstr ""
 "Ce serveur est un serveur <b>esclave</b> dans le processus de "
 "<b>réplication</b>."
 
-#: libraries/server_status.lib.php:106
+#: libraries/server_status.lib.php:116
 msgid "Replication status"
 msgstr "État de la réplication"
 
-#: libraries/server_status.lib.php:137
+#: libraries/server_status.lib.php:146
 msgid ""
 "On a busy server, the byte counters may overrun, so those statistics as "
 "reported by the MySQL server may be incorrect."
@@ -12974,19 +12990,19 @@ msgstr ""
 "dépassée, auquel cas les statistiques rapportées par MySQL peuvent être "
 "inexactes."
 
-#: libraries/server_status.lib.php:148
+#: libraries/server_status.lib.php:157
 msgid "Received"
 msgstr "Reçu"
 
-#: libraries/server_status.lib.php:167
+#: libraries/server_status.lib.php:176
 msgid "Sent"
 msgstr "Envoyé"
 
-#: libraries/server_status.lib.php:234
+#: libraries/server_status.lib.php:243
 msgid "Max. concurrent connections"
 msgstr "Max. de connexions simultanées"
 
-#: libraries/server_status.lib.php:244
+#: libraries/server_status.lib.php:253
 msgid "Failed attempts"
 msgstr "Tentatives échouées"
 
@@ -14070,7 +14086,7 @@ msgstr "Ceci est une variable en lecture seule qui ne peut pas être modifiée"
 msgid "Not implemented yet."
 msgstr "Pas encore mis en œuvre."
 
-#: libraries/sql-parser/src/Components/AlterOperation.php:193
+#: libraries/sql-parser/src/Components/AlterOperation.php:191
 msgid "Unrecognized alter operation."
 msgstr "Opération ALTER non reconnue."
 
@@ -14084,7 +14100,7 @@ msgid "An opening bracket followed by a set of values was expected."
 msgstr "Une parenthèse gauche suivie d'un ensemble de valeurs était attendus."
 
 #: libraries/sql-parser/src/Components/ArrayObj.php:101
-#: libraries/sql-parser/src/Components/FieldDefinition.php:202
+#: libraries/sql-parser/src/Components/CreateDefinition.php:202
 msgid "An opening bracket was expected."
 msgstr "Une parenthèse gauche était attendue."
 
@@ -14092,25 +14108,33 @@ msgstr "Une parenthèse gauche était attendue."
 msgid "A comma or a closing bracket was expected"
 msgstr "Une virgule ou une parenthèse droite était attendus"
 
+#: libraries/sql-parser/src/Components/CreateDefinition.php:246
+msgid "A comma or a closing bracket was expected."
+msgstr "Une virgule ou une parenthèse droite était attendus."
+
+#: libraries/sql-parser/src/Components/CreateDefinition.php:262
+msgid "A closing bracket was expected."
+msgstr "Une parenthèse droite était attendue."
+
 #: libraries/sql-parser/src/Components/DataType.php:125
 msgid "Unrecognized data type."
 msgstr "Type de données non reconnu."
 
-#: libraries/sql-parser/src/Components/Expression.php:225
+#: libraries/sql-parser/src/Components/Expression.php:227
 msgid "Unexpected closing bracket."
 msgstr "Parenthèse droite inattendue."
 
-#: libraries/sql-parser/src/Components/Expression.php:246
-#: libraries/sql-parser/src/Components/Expression.php:283
-#: libraries/sql-parser/src/Components/Expression.php:303
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:285
+#: libraries/sql-parser/src/Components/Expression.php:305
 msgid "An alias was previously found."
 msgstr "Un alias a été constaté précédemment."
 
-#: libraries/sql-parser/src/Components/Expression.php:257
+#: libraries/sql-parser/src/Components/Expression.php:259
 msgid "Unexpected dot."
 msgstr "Point inattendu."
 
-#: libraries/sql-parser/src/Components/Expression.php:327
+#: libraries/sql-parser/src/Components/Expression.php:329
 msgid "An alias was expected."
 msgstr "Un alias était attendu."
 
@@ -14118,14 +14142,6 @@ msgstr "Un alias était attendu."
 msgid "An expression was expected."
 msgstr "Une expression était attendue."
 
-#: libraries/sql-parser/src/Components/FieldDefinition.php:246
-msgid "A comma or a closing bracket was expected."
-msgstr "Une virgule ou une parenthèse droite était attendus."
-
-#: libraries/sql-parser/src/Components/FieldDefinition.php:262
-msgid "A closing bracket was expected."
-msgstr "Une parenthèse droite était attendue."
-
 #: libraries/sql-parser/src/Components/Limit.php:90
 #: libraries/sql-parser/src/Components/Limit.php:112
 msgid "An offset was expected."
@@ -14165,24 +14181,24 @@ msgstr "Des espaces ou tabulations étaient attendus avant le délimiteur."
 msgid "Expected delimiter."
 msgstr "Un délimiteur était attendu."
 
-#: libraries/sql-parser/src/Lexer.php:753
+#: libraries/sql-parser/src/Lexer.php:777
 #, php-format
 msgid "Ending quote %1$s was expected."
 msgstr "Un guillemet %1$s était attendu."
 
-#: libraries/sql-parser/src/Lexer.php:789
+#: libraries/sql-parser/src/Lexer.php:813
 msgid "Variable name was expected."
 msgstr "Un nom de variable était attendu."
 
-#: libraries/sql-parser/src/Parser.php:380
+#: libraries/sql-parser/src/Parser.php:391
 msgid "Unexpected beginning of statement."
 msgstr "Début d'énoncé inattendu."
 
-#: libraries/sql-parser/src/Parser.php:399
+#: libraries/sql-parser/src/Parser.php:410
 msgid "Unrecognized statement type."
 msgstr "Type d'énoncé non reconnu."
 
-#: libraries/sql-parser/src/Parser.php:479
+#: libraries/sql-parser/src/Parser.php:489
 msgid "No transaction was previously started."
 msgstr "Aucune transaction n'a été précédemment démarrée."
 
@@ -14195,7 +14211,6 @@ msgid "This type of clause was previously parsed."
 msgstr "Ce type de clause a été analysé précédemment."
 
 #: libraries/sql-parser/src/Statement.php:265
-#| msgid "A new statement was found, but no delimiter between them."
 msgid ""
 "A new statement was found, but no delimiter between it and the previous one."
 msgstr ""
@@ -14211,8 +14226,9 @@ msgid "The name of the entity was expected."
 msgstr "Le nom de l'entité était attendu."
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:310
-msgid "At least one field definition was expected."
-msgstr "La définition d'au moins un champ était attendue."
+#| msgid "At least one field definition was expected."
+msgid "At least one column definition was expected."
+msgstr "La définition d'au moins une colonne était attendue."
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:329
 msgid "A \"RETURNS\" keyword was expected."
@@ -14271,11 +14287,11 @@ msgstr "Signet non créé !"
 msgid "Using bookmark \"%s\" as default browse query."
 msgstr "Le signet «%s» a été utilisé comme requête par défaut."
 
-#: libraries/sql.lib.php:1306
+#: libraries/sql.lib.php:1300
 msgid "Showing as PHP code"
 msgstr "Affichage du code PHP"
 
-#: libraries/sql.lib.php:1638
+#: libraries/sql.lib.php:1632
 #, php-format
 msgid ""
 "Current selection does not contain a unique column. Grid edit, checkbox, "
@@ -14285,7 +14301,7 @@ msgstr ""
 "d'édition, les cases à cocher ainsi que les liens Edition, Copie et "
 "Supprimer ne sont pas disponibles. %s"
 
-#: libraries/sql.lib.php:1649
+#: libraries/sql.lib.php:1643
 #, php-format
 msgid ""
 "Current selection does not contain a unique column. Grid edit, Edit, Copy "
@@ -14295,7 +14311,7 @@ msgstr ""
 "d'édition, les liens Edition, Copie et Supprimer peuvent provoquer un "
 "résultat indésirable. %s"
 
-#: libraries/sql.lib.php:1688
+#: libraries/sql.lib.php:1682
 #, php-format
 msgid "Problems with indexes of table `%s`"
 msgstr "Il y a des problèmes avec les index de la table `%s`"
@@ -14451,7 +14467,7 @@ msgid "Version %s snapshot (SQL code)"
 msgstr "Instantané de la version %s (code SQL)"
 
 #: libraries/tracking.lib.php:947
-#: templates/structure/table_structure_row.phtml:33
+#: templates/table/structure/table_structure_row.phtml:33
 msgctxt "None for default"
 msgid "None"
 msgstr "Aucune"
@@ -14506,15 +14522,15 @@ msgstr "La version %1$s de %2$s a été supprimée."
 msgid "Version %1$s was created, tracking for %2$s is active."
 msgstr "Version %1$s créée, le suivi pour %2$s est activé."
 
-#: libraries/user_preferences.inc.php:29
+#: libraries/user_preferences.inc.php:30
 msgid "Manage your settings"
 msgstr "Gérer vos paramètres"
 
-#: libraries/user_preferences.inc.php:46 prefs_manage.php:307
+#: libraries/user_preferences.inc.php:54 prefs_manage.php:307
 msgid "Configuration has been saved."
 msgstr "La configuration a été sauvegardée."
 
-#: libraries/user_preferences.inc.php:66
+#: libraries/user_preferences.inc.php:74
 #, php-format
 msgid ""
 "Your preferences will be saved for current session only. Storing them "
@@ -14837,7 +14853,6 @@ msgid "Row: %1$s, Column: %2$s, Error: %3$s"
 msgstr "Ligne : %1$s, Colonne : %2$s, Erreur : %3$s"
 
 #: tbl_row_action.php:70
-#| msgid "No versions selected."
 msgid "No row selected."
 msgstr "Aucune ligne n'a été sélectionnée."
 
@@ -14913,7 +14928,7 @@ msgid "first"
 msgstr "en premier"
 
 #: templates/columns_definitions/move_column.phtml:12
-#: templates/structure/add_column.phtml:21
+#: templates/table/structure/add_column.phtml:21
 #, php-format
 msgid "after %s"
 msgstr "après %s"
@@ -14982,197 +14997,292 @@ msgstr "Transformation de saisie"
 msgid "Input transformation options"
 msgstr "Options de transformation de saisie"
 
-#: templates/designer/aggregate_query_panel.phtml:22
-#: templates/designer/options_panel.phtml:100
-msgid "Aggregate"
-msgstr "Regroupement"
-
-#: templates/designer/aggregate_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:61
-#: templates/designer/options_panel.phtml:106
-#: templates/designer/options_panel.phtml:170
-#: templates/designer/where_query_panel.phtml:30
-#: templates/table/table_header.phtml:9
-msgid "Operator"
-msgstr "Opérateur"
-
-#: templates/designer/database_tables.phtml:29
-msgid "Toggle"
-msgstr "Activer/désactiver"
-
-#: templates/designer/database_tables.phtml:40
-msgid "See table structure"
-msgstr "Voir la structure de la table"
-
-#: templates/designer/delete_relation_panel.phtml:21
-msgid "Delete relation"
-msgstr "Effacer la relation"
-
-#: templates/designer/edit_delete_pages.phtml:7
-msgid "Page to open"
-msgstr "Page à ouvrir"
-
-#: templates/designer/edit_delete_pages.phtml:7
-msgid "Page to delete"
-msgstr "Page à supprimer"
-
-#: templates/designer/having_query_panel.phtml:90
-#: templates/designer/options_panel.phtml:63
-#: templates/designer/options_panel.phtml:229
-#: templates/designer/where_query_panel.phtml:59
-msgid "Except"
-msgstr "Sauf"
-
-#: templates/designer/having_query_panel.phtml:102
-#: templates/designer/options_panel.phtml:75
-#: templates/designer/options_panel.phtml:241
-#: templates/designer/where_query_panel.phtml:71
-msgid "subquery"
-msgstr "sous-requête"
-
-#: templates/designer/new_relation_panel.phtml:22
-#: templates/designer/side_menu.phtml:84 templates/designer/side_menu.phtml:87
-msgid "Create relation"
-msgstr "Nouvelle relation"
-
-#: templates/designer/options_panel.phtml:34
-#: templates/designer/options_panel.phtml:200
-msgid "Relation operator"
-msgstr "Opérateur de relation"
-
-#: templates/designer/options_panel.phtml:85
-#: templates/designer/rename_to_panel.phtml:23
-msgid "Rename to"
-msgstr "Renommer en"
-
-#: templates/designer/options_panel.phtml:91
-#: templates/designer/rename_to_panel.phtml:31
-msgid "New name"
-msgstr "Nouveau nom"
-
-#: templates/designer/page_save_as.phtml:4
-msgid "Save to selected page"
-msgstr "Sauvegarder vers la page sélectionnée"
-
-#: templates/designer/page_save_as.phtml:5
-msgid "Create a page and save to it"
-msgstr "Créer une page et sauvegarder"
-
-#: templates/designer/page_save_as.phtml:26
-msgid "New page name"
-msgstr "Nom de la nouvelle page"
-
-#: templates/designer/page_selector.phtml:2
-msgid "Select page"
-msgstr "Choisissez la page"
-
-#: templates/designer/query_details.phtml:10
-msgid "Active options"
-msgstr "Options actives"
-
-#: templates/designer/schema_export.phtml:4
-msgid "Select Export Relational Type"
-msgstr "Choisissez le type d'exportation des relations"
-
-#: templates/designer/side_menu.phtml:19 templates/designer/side_menu.phtml:25
-msgid "Show/Hide tables list"
-msgstr "Afficher/cacher la liste des tables"
-
-#: templates/designer/side_menu.phtml:29 templates/designer/side_menu.phtml:35
-#: templates/designer/side_menu.phtml:36
-msgid "View in fullscreen"
-msgstr "Voir en plein écran"
-
-#: templates/designer/side_menu.phtml:34
-msgid "Exit fullscreen"
-msgstr "Quitter le plein écran"
-
-#: templates/designer/side_menu.phtml:41 templates/designer/side_menu.phtml:45
-msgid "New page"
-msgstr "Nouvelle page"
-
-#: templates/designer/side_menu.phtml:70 templates/designer/side_menu.phtml:73
-msgid "Delete pages"
-msgstr "Supprimer les pages"
-
-#: templates/designer/side_menu.phtml:77 templates/designer/side_menu.phtml:80
-#: templates/table/create_table.phtml:7
+#: templates/database/create_table.phtml:7
+#: templates/database/designer/side_menu.phtml:77
+#: templates/database/designer/side_menu.phtml:80
 msgid "Create table"
 msgstr "Nouvelle table"
 
-#: templates/designer/side_menu.phtml:98
-#: templates/designer/side_menu.phtml:101
+#: templates/database/create_table.phtml:15
+msgid "Number of columns"
+msgstr "Nombre de colonnes"
+
+#: templates/database/designer/aggregate_query_panel.phtml:22
+#: templates/database/designer/options_panel.phtml:100
+msgid "Aggregate"
+msgstr "Regroupement"
+
+#: templates/database/designer/aggregate_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:61
+#: templates/database/designer/options_panel.phtml:106
+#: templates/database/designer/options_panel.phtml:170
+#: templates/database/designer/where_query_panel.phtml:30
+#: templates/table/search/table_header.phtml:9
+msgid "Operator"
+msgstr "Opérateur"
+
+#: templates/database/designer/database_tables.phtml:29
+msgid "Toggle"
+msgstr "Activer/désactiver"
+
+#: templates/database/designer/database_tables.phtml:40
+msgid "See table structure"
+msgstr "Voir la structure de la table"
+
+#: templates/database/designer/delete_relation_panel.phtml:21
+msgid "Delete relation"
+msgstr "Effacer la relation"
+
+#: templates/database/designer/edit_delete_pages.phtml:7
+msgid "Page to open"
+msgstr "Page à ouvrir"
+
+#: templates/database/designer/edit_delete_pages.phtml:7
+msgid "Page to delete"
+msgstr "Page à supprimer"
+
+#: templates/database/designer/having_query_panel.phtml:90
+#: templates/database/designer/options_panel.phtml:63
+#: templates/database/designer/options_panel.phtml:229
+#: templates/database/designer/where_query_panel.phtml:59
+msgid "Except"
+msgstr "Sauf"
+
+#: templates/database/designer/having_query_panel.phtml:102
+#: templates/database/designer/options_panel.phtml:75
+#: templates/database/designer/options_panel.phtml:241
+#: templates/database/designer/where_query_panel.phtml:71
+msgid "subquery"
+msgstr "sous-requête"
+
+#: templates/database/designer/new_relation_panel.phtml:22
+#: templates/database/designer/side_menu.phtml:84
+#: templates/database/designer/side_menu.phtml:87
+msgid "Create relation"
+msgstr "Nouvelle relation"
+
+#: templates/database/designer/options_panel.phtml:34
+#: templates/database/designer/options_panel.phtml:200
+msgid "Relation operator"
+msgstr "Opérateur de relation"
+
+#: templates/database/designer/options_panel.phtml:85
+#: templates/database/designer/rename_to_panel.phtml:23
+msgid "Rename to"
+msgstr "Renommer en"
+
+#: templates/database/designer/options_panel.phtml:91
+#: templates/database/designer/rename_to_panel.phtml:31
+msgid "New name"
+msgstr "Nouveau nom"
+
+#: templates/database/designer/page_save_as.phtml:4
+msgid "Save to selected page"
+msgstr "Sauvegarder vers la page sélectionnée"
+
+#: templates/database/designer/page_save_as.phtml:5
+msgid "Create a page and save to it"
+msgstr "Créer une page et sauvegarder"
+
+#: templates/database/designer/page_save_as.phtml:26
+msgid "New page name"
+msgstr "Nom de la nouvelle page"
+
+#: templates/database/designer/page_selector.phtml:2
+msgid "Select page"
+msgstr "Choisissez la page"
+
+#: templates/database/designer/query_details.phtml:10
+msgid "Active options"
+msgstr "Options actives"
+
+#: templates/database/designer/schema_export.phtml:4
+msgid "Select Export Relational Type"
+msgstr "Choisissez le type d'exportation des relations"
+
+#: templates/database/designer/side_menu.phtml:19
+#: templates/database/designer/side_menu.phtml:25
+msgid "Show/Hide tables list"
+msgstr "Afficher/cacher la liste des tables"
+
+#: templates/database/designer/side_menu.phtml:29
+#: templates/database/designer/side_menu.phtml:35
+#: templates/database/designer/side_menu.phtml:36
+msgid "View in fullscreen"
+msgstr "Voir en plein écran"
+
+#: templates/database/designer/side_menu.phtml:34
+msgid "Exit fullscreen"
+msgstr "Quitter le plein écran"
+
+#: templates/database/designer/side_menu.phtml:41
+#: templates/database/designer/side_menu.phtml:45
+msgid "New page"
+msgstr "Nouvelle page"
+
+#: templates/database/designer/side_menu.phtml:70
+#: templates/database/designer/side_menu.phtml:73
+msgid "Delete pages"
+msgstr "Supprimer les pages"
+
+#: templates/database/designer/side_menu.phtml:98
+#: templates/database/designer/side_menu.phtml:101
 msgid "Reload"
 msgstr "Recharger"
 
-#: templates/designer/side_menu.phtml:107
-#: templates/designer/side_menu.phtml:110
+#: templates/database/designer/side_menu.phtml:107
+#: templates/database/designer/side_menu.phtml:110
 msgid "Help"
 msgstr "Aide"
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Angular links"
 msgstr "Liens angulaires"
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Direct links"
 msgstr "Liens directs"
 
-#: templates/designer/side_menu.phtml:122
-#: templates/designer/side_menu.phtml:124
+#: templates/database/designer/side_menu.phtml:122
+#: templates/database/designer/side_menu.phtml:124
 msgid "Snap to grid"
 msgstr "Accrocher à la grille"
 
-#: templates/designer/side_menu.phtml:128
-#: templates/designer/side_menu.phtml:134
+#: templates/database/designer/side_menu.phtml:128
+#: templates/database/designer/side_menu.phtml:134
 msgid "Small/Big All"
 msgstr "Agrandir/réduire tout"
 
-#: templates/designer/side_menu.phtml:138
-#: templates/designer/side_menu.phtml:141
+#: templates/database/designer/side_menu.phtml:138
+#: templates/database/designer/side_menu.phtml:141
 msgid "Toggle small/big"
 msgstr "Bascule agrandir/réduire"
 
-#: templates/designer/side_menu.phtml:145
-#: templates/designer/side_menu.phtml:148
+#: templates/database/designer/side_menu.phtml:145
+#: templates/database/designer/side_menu.phtml:148
 msgid "Toggle relation lines"
 msgstr "Basculement des lignes de relations"
 
-#: templates/designer/side_menu.phtml:153
-#: templates/designer/side_menu.phtml:156
+#: templates/database/designer/side_menu.phtml:153
+#: templates/database/designer/side_menu.phtml:156
 msgid "Export schema"
 msgstr "Exporter le schéma"
 
-#: templates/designer/side_menu.phtml:165
-#: templates/designer/side_menu.phtml:168
+#: templates/database/designer/side_menu.phtml:165
+#: templates/database/designer/side_menu.phtml:168
 msgid "Build Query"
 msgstr "Construire la requête"
 
-#: templates/designer/side_menu.phtml:173
-#: templates/designer/side_menu.phtml:177
+#: templates/database/designer/side_menu.phtml:173
+#: templates/database/designer/side_menu.phtml:177
 msgid "Move Menu"
 msgstr "Déplacer le menu"
 
-#: templates/designer/side_menu.phtml:181
-#: templates/designer/side_menu.phtml:186
+#: templates/database/designer/side_menu.phtml:181
+#: templates/database/designer/side_menu.phtml:186
 msgid "Pin text"
 msgstr "Épingler le texte"
 
-#: templates/designer/table_list.phtml:4
+#: templates/database/designer/table_list.phtml:4
 msgid "Hide/Show all"
 msgstr "Cacher/montrer tout"
 
-#: templates/designer/table_list.phtml:14
+#: templates/database/designer/table_list.phtml:14
 msgid "Hide/Show Tables with no relation"
 msgstr "Cacher/montrer les tables sans liens"
 
-#: templates/designer/table_list.phtml:59
+#: templates/database/designer/table_list.phtml:59
 msgid "Number of tables:"
 msgstr "Nombre de tables : "
 
+#: templates/database/structure/body_for_table_summary.phtml:6
+#, php-format
+msgid "%s table"
+msgid_plural "%s tables"
+msgstr[0] "%s table"
+msgstr[1] "%s tables"
+
+#: templates/database/structure/body_for_table_summary.phtml:17
+msgid "Sum"
+msgstr "Somme"
+
+#: templates/database/structure/check_all_tables.phtml:6
+msgid "Check tables having overhead"
+msgstr "Cocher tables avec pertes"
+
+#: templates/database/structure/check_all_tables.phtml:10
+msgid "Show create"
+msgstr "Montrer l'énoncé de création"
+
+#: templates/database/structure/check_all_tables.phtml:27
+msgid "Prefix"
+msgstr "Préfixe"
+
+#: templates/database/structure/check_all_tables.phtml:28
+msgid "Add prefix to table"
+msgstr "Ajouter un préfixe à la table"
+
+#: templates/database/structure/check_all_tables.phtml:29
+msgid "Replace table prefix"
+msgstr "Remplacer le préfixe de table"
+
+#: templates/database/structure/check_all_tables.phtml:30
+msgid "Copy table with prefix"
+msgstr "Copier la table avec un préfixe"
+
+#: templates/database/structure/check_all_tables.phtml:36
+msgid "Add columns to central list"
+msgstr "Ajoute les colonnes à la liste centrale"
+
+#: templates/database/structure/check_all_tables.phtml:37
+msgid "Remove columns from central list"
+msgstr "Supprimer les colonnes de la liste centrale"
+
+#: templates/database/structure/check_all_tables.phtml:38
+msgid "Make consistent with central list"
+msgstr "Rendre conforme à la liste centrale"
+
+#: templates/database/structure/favorite_anchor.phtml:12
+msgid "Add to Favorites"
+msgstr "Ajouter aux tables préférées"
+
+#: templates/database/structure/show_create.phtml:2
+msgid "Showing create queries"
+msgstr "Affichage des requêtes de création"
+
+#: templates/database/structure/sortable_header.phtml:13
+msgid "Sort"
+msgstr "Tri"
+
+#: templates/database/structure/table_header.phtml:42
+msgid ""
+"May be approximate. Click on the number to get the exact count. See "
+"[doc@faq3-11]FAQ 3.11[/doc]."
+msgstr ""
+"Peut être approximatif. Cliquez sur le nombre pour obtenir le compte exact. "
+"Voir [doc@faq3-11]FAQ 3.11[/doc]."
+
+#: templates/database/structure/table_header.phtml:66
+#: templates/table/index_form.phtml:127
+msgid "Size"
+msgstr "Taille"
+
+#: templates/database/structure/table_header.phtml:74
+#: templates/table/structure/display_table_stats.phtml:27
+msgid "Overhead"
+msgstr "Perte"
+
+#: templates/database/structure/tracking_icon.phtml:4
+msgid "Tracking is active."
+msgstr "Le suivi est actif."
+
+#: templates/database/structure/tracking_icon.phtml:8
+msgid "Tracking is not active."
+msgstr "Le suivi n'est pas activé."
+
 #: templates/error/report_form.phtml:7
 msgid ""
 "phpMyAdmin has encountered an error. We have collected data about this error "
@@ -15192,60 +15302,6 @@ msgstr "Vous pouvez examiner les données dans le rapport d'erreur :"
 msgid "Please explain the steps that lead to the error:"
 msgstr "Veuillez expliquez les étapes qui mènent à l'erreur :"
 
-#: templates/gis_visualization/gis_visualization.phtml:3
-msgid "Display GIS Visualization"
-msgstr "Visualiser en GIS"
-
-#: templates/gis_visualization/gis_visualization.phtml:8
-msgid "Label column"
-msgstr "Colonne pour l'intitulé"
-
-#: templates/gis_visualization/gis_visualization.phtml:11
-msgid "-- None --"
-msgstr "-- Aucun --"
-
-#: templates/gis_visualization/gis_visualization.phtml:19
-msgid "Spatial column"
-msgstr "Colonne pour donnée spatiale"
-
-#: templates/index_form.phtml:16
-msgid "Index name:"
-msgstr "Nom de l'index : "
-
-#: templates/index_form.phtml:19
-msgid ""
-"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
-msgstr ""
-"«PRIMARY» <b>doit et ne peut être</b> <b>que</b> le nom d'une clé primaire !"
-
-#: templates/index_form.phtml:40
-msgid "Index choice:"
-msgstr "Choix d'index :"
-
-#: templates/index_form.phtml:57
-msgid "Key block size:"
-msgstr "Taille du bloc de clé :"
-
-#: templates/index_form.phtml:74
-msgid "Index type:"
-msgstr "Type d'index : "
-
-#: templates/index_form.phtml:86
-msgid "Parser:"
-msgstr "Analyseur :"
-
-#: templates/index_form.phtml:102
-msgid "Comment:"
-msgstr "Commentaire : "
-
-#: templates/index_form.phtml:127 templates/structure/table_header.phtml:66
-msgid "Size"
-msgstr "Taille"
-
-#: templates/index_form.phtml:149 templates/index_form.phtml:190
-msgid "Drag to reorder"
-msgstr "Faire glisser pour réordonner"
-
 #: templates/prefs_autoload.phtml:9
 msgid ""
 "Your browser has phpMyAdmin configuration for this domain. Would you like to "
@@ -15258,359 +15314,149 @@ msgstr ""
 msgid "Start row:"
 msgstr "Ligne de départ : "
 
-#: templates/structure/actions_in_table_structure.phtml:14
-#, php-format
-msgid "A primary key has been added on %s."
-msgstr "Une clé primaire a été ajoutée sur %s."
-
-#: templates/structure/actions_in_table_structure.phtml:34
-#: templates/structure/actions_in_table_structure.phtml:54
-#: templates/structure/actions_in_table_structure.phtml:79
-#: templates/structure/actions_in_table_structure.phtml:101
-#, php-format
-msgid "An index has been added on %s."
-msgstr "Un index a été ajouté sur %s."
-
-#: templates/structure/actions_in_table_structure.phtml:130
-#: templates/structure/check_all_table_column.phtml:59
-msgid "Remove from central columns"
-msgstr "Supprimer de la liste centrale de colonnes"
-
-#: templates/structure/actions_in_table_structure.phtml:138
-#: templates/structure/check_all_table_column.phtml:55
-msgid "Add to central columns"
-msgstr "Ajouter à la liste centrale"
-
-#: templates/structure/add_column.phtml:7
-#, php-format
-msgid "Add %s column(s)"
-msgstr "Ajouter %s colonne(s)"
-
-#: templates/structure/add_column.phtml:12
-msgid "at beginning of table"
-msgstr "en début de table"
-
-#: templates/structure/body_for_table_summary.phtml:6
-#, php-format
-msgid "%s table"
-msgid_plural "%s tables"
-msgstr[0] "%s table"
-msgstr[1] "%s tables"
-
-#: templates/structure/body_for_table_summary.phtml:17
-msgid "Sum"
-msgstr "Somme"
-
-#: templates/structure/check_all_tables.phtml:6
-msgid "Check tables having overhead"
-msgstr "Cocher tables avec pertes"
-
-#: templates/structure/check_all_tables.phtml:10
-msgid "Show create"
-msgstr "Montrer l'énoncé de création"
-
-#: templates/structure/check_all_tables.phtml:27
-msgid "Prefix"
-msgstr "Préfixe"
-
-#: templates/structure/check_all_tables.phtml:28
-msgid "Add prefix to table"
-msgstr "Ajouter un préfixe à la table"
-
-#: templates/structure/check_all_tables.phtml:29
-msgid "Replace table prefix"
-msgstr "Remplacer le préfixe de table"
-
-#: templates/structure/check_all_tables.phtml:30
-msgid "Copy table with prefix"
-msgstr "Copier la table avec un préfixe"
-
-#: templates/structure/check_all_tables.phtml:36
-msgid "Add columns to central list"
-msgstr "Ajoute les colonnes à la liste centrale"
-
-#: templates/structure/check_all_tables.phtml:37
-msgid "Remove columns from central list"
-msgstr "Supprimer les colonnes de la liste centrale"
-
-#: templates/structure/check_all_tables.phtml:38
-msgid "Make consistent with central list"
-msgstr "Rendre conforme à la liste centrale"
-
-#: templates/structure/display_structure.phtml:140 view_create.php:181
-msgid "Edit view"
-msgstr "Modifier la vue"
-
-#: templates/structure/display_table_stats.phtml:9
-msgid "Space usage"
-msgstr "Espace utilisé"
-
-#: templates/structure/display_table_stats.phtml:27
-#: templates/structure/table_header.phtml:74
-msgid "Overhead"
-msgstr "Perte"
-
-#: templates/structure/display_table_stats.phtml:32
-msgid "Effective"
-msgstr "Effectif"
-
-#: templates/structure/favorite_anchor.phtml:12
-msgid "Add to Favorites"
-msgstr "Ajouter aux tables préférées"
-
-#: templates/structure/move_columns_dialog.phtml:1
-#: templates/structure/optional_action_links.phtml:21
-msgid "Move columns"
-msgstr "Déplacer des colonnes"
-
-#: templates/structure/move_columns_dialog.phtml:2
-msgid "Move the columns by dragging them up and down."
-msgstr "Déplacez les colonnes en les faisant glisser vers le haut ou le bas."
-
-#: templates/structure/optional_action_links.phtml:9
-msgid "Propose table structure"
-msgstr "Suggérer des optimisations de structure"
-
-#: templates/structure/optional_action_links.phtml:24
-msgid "Improve table structure"
-msgstr "Améliorer la structure de la table"
-
-#: templates/structure/optional_action_links.phtml:30
-msgid "Track view"
-msgstr "Suivre la vue"
-
-#: templates/structure/row_stats_table.phtml:3
-msgid "Row statistics"
-msgstr "Statistiques"
-
-#: templates/structure/row_stats_table.phtml:9
-msgid "static"
-msgstr "statique"
-
-#: templates/structure/row_stats_table.phtml:11
-msgid "dynamic"
-msgstr "dynamique"
-
-#: templates/structure/row_stats_table.phtml:22
-msgid "partitioned"
-msgstr "partitionné"
-
-#: templates/structure/row_stats_table.phtml:54
-msgid "Row length"
-msgstr "Longueur de ligne"
-
-#: templates/structure/row_stats_table.phtml:66
-msgid "Row size"
-msgstr "Taille de la ligne"
-
-#: templates/structure/row_stats_table.phtml:73
-msgid "Next autoindex"
-msgstr "Prochain index automatique"
-
-#: templates/structure/secondary_tabs.phtml:14
-msgid "Relation view"
-msgstr "Vue relationnelle"
-
-#: templates/structure/show_create.phtml:2
-msgid "Showing create queries"
-msgstr "Affichage des requêtes de création"
-
-#: templates/structure/sortable_header.phtml:13
-msgid "Sort"
-msgstr "Tri"
-
-#: templates/structure/table_header.phtml:42
-msgid ""
-"May be approximate. Click on the number to get the exact count. See "
-"[doc@faq3-11]FAQ 3.11[/doc]."
-msgstr ""
-"Peut être approximatif. Cliquez sur le nombre pour obtenir le compte exact. "
-"Voir [doc@faq3-11]FAQ 3.11[/doc]."
-
-#: templates/structure/table_structure_row.phtml:46
-#, php-format
-msgid "Column %s has been dropped."
-msgstr "La colonne %s a été effacée."
-
-#: templates/structure/tracking_icon.phtml:4
-msgid "Tracking is active."
-msgstr "Le suivi est actif."
-
-#: templates/structure/tracking_icon.phtml:8
-msgid "Tracking is not active."
-msgstr "Le suivi n'est pas activé."
-
-#: templates/table/create_table.phtml:15
-msgid "Number of columns"
-msgstr "Nombre de colonnes"
-
-#: templates/table/options.phtml:8
-msgid "Select columns (at least one):"
-msgstr "Choisir les colonnes (au moins une) : "
-
-#: templates/table/options.phtml:37
-msgid "Add search conditions (body of the \"where\" clause):"
-msgstr "Critères de recherche (pour l'énoncé «where») : "
-
-#: templates/table/options.phtml:45
-msgid "Number of rows per page"
-msgstr "Nombre de lignes par page"
-
-#: templates/table/options.phtml:56
-msgid "Display order:"
-msgstr "Ordre d'affichage : "
-
-#: templates/table/options_zoom.phtml:6
-msgid "Use this column to label each point"
-msgstr "Utiliser cette colonne pour décrire chaque point"
-
-#: templates/table/options_zoom.phtml:35
-msgid "Maximum rows to plot"
-msgstr "Nombre maximum de lignes de données à utiliser pour le graphique"
-
-#: templates/table/replace_preview.phtml:13
-msgid "Find and replace - preview"
-msgstr "Chercher et remplacer - aperçu"
-
-#: templates/table/replace_preview.phtml:18
-msgid "Original string"
-msgstr "Chaîne d'origine"
-
-#: templates/table/replace_preview.phtml:19
-msgid "Replaced string"
-msgstr "Chaîne modifiée"
-
-#: templates/table/replace_preview.phtml:40
-msgid "Replace"
-msgstr "Remplacer"
-
-#: templates/table/rows_zoom.phtml:16
-msgid "Additional search criteria"
-msgstr "Critères de recherche supplémentaires"
-
-#: templates/table/search_and_replace.phtml:3
-msgid "Replace with:"
-msgstr "Remplacer par : "
-
-#: templates/table/search_and_replace.phtml:22
-msgid "Use regular expression"
-msgstr "Utiliser une expression régulière"
-
-#: templates/table/selection_form.phtml:12
-msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
-msgstr ""
-"Faites une recherche «par valeur» (passepartout: «% ») sur deux colonnes "
-"différentes"
-
-#: templates/table/selection_form.phtml:34
-msgid "Do a \"query by example\" (wildcard: \"%\")"
-msgstr "Recherche «par valeur» (passepartout: «% »)"
-
-#: templates/table/zoom_result_form.phtml:7
-msgid "Browse/Edit the points"
-msgstr "Afficher/Modifier les points"
-
-#: templates/table/zoom_result_form.phtml:15
-msgid "How to use"
-msgstr "Consignes d'utilisation"
-
-#: templates/table/zoom_result_form.phtml:23
-msgid "Reset zoom"
-msgstr "Réinitialiser le zoom"
-
-#: templates/tbl_chart.phtml:17
+#: templates/table/chart/tbl_chart.phtml:17
 msgctxt "Chart type"
 msgid "Bar"
 msgstr "Barre"
 
-#: templates/tbl_chart.phtml:21
+#: templates/table/chart/tbl_chart.phtml:21
 msgctxt "Chart type"
 msgid "Column"
 msgstr "Colonne"
 
-#: templates/tbl_chart.phtml:25
+#: templates/table/chart/tbl_chart.phtml:25
 msgctxt "Chart type"
 msgid "Line"
 msgstr "Ligne"
 
-#: templates/tbl_chart.phtml:29
+#: templates/table/chart/tbl_chart.phtml:29
 msgctxt "Chart type"
 msgid "Spline"
 msgstr "Spline"
 
-#: templates/tbl_chart.phtml:33
+#: templates/table/chart/tbl_chart.phtml:33
 msgctxt "Chart type"
 msgid "Area"
 msgstr "En aires"
 
-#: templates/tbl_chart.phtml:37
+#: templates/table/chart/tbl_chart.phtml:37
 msgctxt "Chart type"
 msgid "Pie"
 msgstr "Tarte"
 
-#: templates/tbl_chart.phtml:41
+#: templates/table/chart/tbl_chart.phtml:41
 msgctxt "Chart type"
 msgid "Timeline"
 msgstr "Moment"
 
-#: templates/tbl_chart.phtml:45
+#: templates/table/chart/tbl_chart.phtml:45
 msgctxt "Chart type"
 msgid "Scatter"
 msgstr "Nuage de points"
 
-#: templates/tbl_chart.phtml:50
+#: templates/table/chart/tbl_chart.phtml:50
 msgid "Stacked"
 msgstr "En piles"
 
-#: templates/tbl_chart.phtml:53
+#: templates/table/chart/tbl_chart.phtml:53
 msgid "Chart title"
 msgstr "Titre du graphique"
 
-#: templates/tbl_chart.phtml:57
+#: templates/table/chart/tbl_chart.phtml:57
 msgid "X-Axis:"
 msgstr "Axe des X : "
 
-#: templates/tbl_chart.phtml:72
+#: templates/table/chart/tbl_chart.phtml:72
 msgid "Series:"
 msgstr "Séries : "
 
-#: templates/tbl_chart.phtml:102
+#: templates/table/chart/tbl_chart.phtml:102
 msgid "X-Axis label:"
 msgstr "Intitulé pour l'axe des X :"
 
-#: templates/tbl_chart.phtml:104
+#: templates/table/chart/tbl_chart.phtml:104
 msgid "X Values"
 msgstr "Valeurs en X"
 
-#: templates/tbl_chart.phtml:107
+#: templates/table/chart/tbl_chart.phtml:107
 msgid "Y-Axis label:"
 msgstr "Intitulé pour l'axe des Y :"
 
-#: templates/tbl_chart.phtml:115
+#: templates/table/chart/tbl_chart.phtml:115
 msgid "Series names are in a column"
 msgstr "Les noms de la série sont dans une colonne"
 
-#: templates/tbl_chart.phtml:118
+#: templates/table/chart/tbl_chart.phtml:118
 msgid "Series column:"
 msgstr "Colonne pour la série :"
 
-#: templates/tbl_chart.phtml:130
+#: templates/table/chart/tbl_chart.phtml:130
 msgid "Value Column:"
 msgstr "Colonne pour la valeur :"
 
-#: templates/tbl_chart.phtml:150
+#: templates/table/chart/tbl_chart.phtml:150
 msgid "Save chart as image"
 msgstr "Enregistrer le graphique en tant qu'image"
 
-#: templates/tbl_relation/common_form.phtml:7
+#: templates/table/gis_visualization/gis_visualization.phtml:3
+msgid "Display GIS Visualization"
+msgstr "Visualiser en GIS"
+
+#: templates/table/gis_visualization/gis_visualization.phtml:8
+msgid "Label column"
+msgstr "Colonne pour l'intitulé"
+
+#: templates/table/gis_visualization/gis_visualization.phtml:11
+msgid "-- None --"
+msgstr "-- Aucun --"
+
+#: templates/table/gis_visualization/gis_visualization.phtml:19
+msgid "Spatial column"
+msgstr "Colonne pour donnée spatiale"
+
+#: templates/table/index_form.phtml:16
+msgid "Index name:"
+msgstr "Nom de l'index : "
+
+#: templates/table/index_form.phtml:19
+msgid ""
+"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
+msgstr ""
+"«PRIMARY» <b>doit et ne peut être</b> <b>que</b> le nom d'une clé primaire !"
+
+#: templates/table/index_form.phtml:40
+msgid "Index choice:"
+msgstr "Choix d'index :"
+
+#: templates/table/index_form.phtml:57
+msgid "Key block size:"
+msgstr "Taille du bloc de clé :"
+
+#: templates/table/index_form.phtml:74
+msgid "Index type:"
+msgstr "Type d'index : "
+
+#: templates/table/index_form.phtml:86
+msgid "Parser:"
+msgstr "Analyseur :"
+
+#: templates/table/index_form.phtml:102
+msgid "Comment:"
+msgstr "Commentaire : "
+
+#: templates/table/index_form.phtml:149 templates/table/index_form.phtml:190
+msgid "Drag to reorder"
+msgstr "Faire glisser pour réordonner"
+
+#: templates/table/relation/common_form.phtml:7
 msgid "Internal relations"
 msgstr "Relations internes"
 
-#: templates/tbl_relation/common_form.phtml:11
+#: templates/table/relation/common_form.phtml:11
 msgid "Internal relation"
 msgstr "Relation interne"
 
-#: templates/tbl_relation/common_form.phtml:14
+#: templates/table/relation/common_form.phtml:14
 msgid ""
 "An internal relation is not necessary when a corresponding FOREIGN KEY "
 "relation exists."
@@ -15618,50 +15464,226 @@ msgstr ""
 "Une relation interne n'est pas nécessaire lorsqu'une clé correspondante de "
 "type FOREIGN KEY existe."
 
-#: templates/tbl_relation/common_form.phtml:37
+#: templates/table/relation/common_form.phtml:37
 msgid "Foreign key constraints"
 msgstr "Contraintes de clé étrangère"
 
-#: templates/tbl_relation/common_form.phtml:40
+#: templates/table/relation/common_form.phtml:40
 msgid "Actions"
 msgstr "Actions"
 
-#: templates/tbl_relation/common_form.phtml:41
+#: templates/table/relation/common_form.phtml:41
 msgid "Constraint properties"
 msgstr "Propriétés de la contrainte"
 
-#: templates/tbl_relation/common_form.phtml:44
+#: templates/table/relation/common_form.phtml:44
 msgid ""
 "Only columns with index will be displayed. You can define an index below."
 msgstr ""
 "Seules les colonnes avec un index seront affichées. Vous pouvez définir un "
 "index ci-dessous."
 
-#: templates/tbl_relation/common_form.phtml:49
+#: templates/table/relation/common_form.phtml:49
 msgid "Foreign key constraint"
 msgstr "Contrainte de clé étrangère"
 
-#: templates/tbl_relation/common_form.phtml:81
+#: templates/table/relation/common_form.phtml:81
 msgid "+ Add constraint"
 msgstr "+ Ajouter une contrainte"
 
-#: templates/tbl_relation/common_form.phtml:91
+#: templates/table/relation/common_form.phtml:91
 msgid "Choose column to display:"
 msgstr "Colonne descriptive : "
 
-#: templates/tbl_relation/foreign_key_row.phtml:13
+#: templates/table/relation/foreign_key_row.phtml:13
 #, php-format
 msgid "Foreign key constraint %s has been dropped"
 msgstr "La contrainte de clé étrangère %s a été supprimée"
 
-#: templates/tbl_relation/foreign_key_row.phtml:102
+#: templates/table/relation/foreign_key_row.phtml:102
 msgid "Constraint name"
 msgstr "Nom de la contrainte"
 
-#: templates/tbl_relation/foreign_key_row.phtml:157
+#: templates/table/relation/foreign_key_row.phtml:157
 msgid "+ Add column"
 msgstr "+ Ajouter une colonne"
 
+#: templates/table/search/options.phtml:8
+msgid "Select columns (at least one):"
+msgstr "Choisir les colonnes (au moins une) : "
+
+#: templates/table/search/options.phtml:37
+msgid "Add search conditions (body of the \"where\" clause):"
+msgstr "Critères de recherche (pour l'énoncé «where») : "
+
+#: templates/table/search/options.phtml:45
+msgid "Number of rows per page"
+msgstr "Nombre de lignes par page"
+
+#: templates/table/search/options.phtml:56
+msgid "Display order:"
+msgstr "Ordre d'affichage : "
+
+#: templates/table/search/options_zoom.phtml:6
+msgid "Use this column to label each point"
+msgstr "Utiliser cette colonne pour décrire chaque point"
+
+#: templates/table/search/options_zoom.phtml:35
+msgid "Maximum rows to plot"
+msgstr "Nombre maximum de lignes de données à utiliser pour le graphique"
+
+#: templates/table/search/replace_preview.phtml:13
+msgid "Find and replace - preview"
+msgstr "Chercher et remplacer - aperçu"
+
+#: templates/table/search/replace_preview.phtml:18
+msgid "Original string"
+msgstr "Chaîne d'origine"
+
+#: templates/table/search/replace_preview.phtml:19
+msgid "Replaced string"
+msgstr "Chaîne modifiée"
+
+#: templates/table/search/replace_preview.phtml:40
+msgid "Replace"
+msgstr "Remplacer"
+
+#: templates/table/search/rows_zoom.phtml:16
+msgid "Additional search criteria"
+msgstr "Critères de recherche supplémentaires"
+
+#: templates/table/search/search_and_replace.phtml:3
+msgid "Replace with:"
+msgstr "Remplacer par : "
+
+#: templates/table/search/search_and_replace.phtml:22
+msgid "Use regular expression"
+msgstr "Utiliser une expression régulière"
+
+#: templates/table/search/selection_form.phtml:12
+msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
+msgstr ""
+"Faites une recherche «par valeur» (passepartout: «% ») sur deux colonnes "
+"différentes"
+
+#: templates/table/search/selection_form.phtml:34
+msgid "Do a \"query by example\" (wildcard: \"%\")"
+msgstr "Recherche «par valeur» (passepartout: «% »)"
+
+#: templates/table/search/zoom_result_form.phtml:7
+msgid "Browse/Edit the points"
+msgstr "Afficher/Modifier les points"
+
+#: templates/table/search/zoom_result_form.phtml:15
+msgid "How to use"
+msgstr "Consignes d'utilisation"
+
+#: templates/table/search/zoom_result_form.phtml:23
+msgid "Reset zoom"
+msgstr "Réinitialiser le zoom"
+
+#: templates/table/secondary_tabs.phtml:14
+msgid "Relation view"
+msgstr "Vue relationnelle"
+
+#: templates/table/structure/actions_in_table_structure.phtml:14
+#, php-format
+msgid "A primary key has been added on %s."
+msgstr "Une clé primaire a été ajoutée sur %s."
+
+#: templates/table/structure/actions_in_table_structure.phtml:34
+#: templates/table/structure/actions_in_table_structure.phtml:54
+#: templates/table/structure/actions_in_table_structure.phtml:79
+#: templates/table/structure/actions_in_table_structure.phtml:101
+#, php-format
+msgid "An index has been added on %s."
+msgstr "Un index a été ajouté sur %s."
+
+#: templates/table/structure/actions_in_table_structure.phtml:130
+#: templates/table/structure/check_all_table_column.phtml:59
+msgid "Remove from central columns"
+msgstr "Supprimer de la liste centrale de colonnes"
+
+#: templates/table/structure/actions_in_table_structure.phtml:138
+#: templates/table/structure/check_all_table_column.phtml:55
+msgid "Add to central columns"
+msgstr "Ajouter à la liste centrale"
+
+#: templates/table/structure/add_column.phtml:7
+#, php-format
+msgid "Add %s column(s)"
+msgstr "Ajouter %s colonne(s)"
+
+#: templates/table/structure/add_column.phtml:12
+msgid "at beginning of table"
+msgstr "en début de table"
+
+#: templates/table/structure/display_structure.phtml:140 view_create.php:181
+msgid "Edit view"
+msgstr "Modifier la vue"
+
+#: templates/table/structure/display_table_stats.phtml:9
+msgid "Space usage"
+msgstr "Espace utilisé"
+
+#: templates/table/structure/display_table_stats.phtml:32
+msgid "Effective"
+msgstr "Effectif"
+
+#: templates/table/structure/move_columns_dialog.phtml:1
+#: templates/table/structure/optional_action_links.phtml:21
+msgid "Move columns"
+msgstr "Déplacer des colonnes"
+
+#: templates/table/structure/move_columns_dialog.phtml:2
+msgid "Move the columns by dragging them up and down."
+msgstr "Déplacez les colonnes en les faisant glisser vers le haut ou le bas."
+
+#: templates/table/structure/optional_action_links.phtml:9
+msgid "Propose table structure"
+msgstr "Suggérer des optimisations de structure"
+
+#: templates/table/structure/optional_action_links.phtml:24
+msgid "Improve table structure"
+msgstr "Améliorer la structure de la table"
+
+#: templates/table/structure/optional_action_links.phtml:30
+msgid "Track view"
+msgstr "Suivre la vue"
+
+#: templates/table/structure/row_stats_table.phtml:3
+msgid "Row statistics"
+msgstr "Statistiques"
+
+#: templates/table/structure/row_stats_table.phtml:9
+msgid "static"
+msgstr "statique"
+
+#: templates/table/structure/row_stats_table.phtml:11
+msgid "dynamic"
+msgstr "dynamique"
+
+#: templates/table/structure/row_stats_table.phtml:22
+msgid "partitioned"
+msgstr "partitionné"
+
+#: templates/table/structure/row_stats_table.phtml:54
+msgid "Row length"
+msgstr "Longueur de ligne"
+
+#: templates/table/structure/row_stats_table.phtml:66
+msgid "Row size"
+msgstr "Taille de la ligne"
+
+#: templates/table/structure/row_stats_table.phtml:73
+msgid "Next autoindex"
+msgstr "Prochain index automatique"
+
+#: templates/table/structure/table_structure_row.phtml:46
+#, php-format
+msgid "Column %s has been dropped."
+msgstr "La colonne %s a été effacée."
+
 #: themes.php:17 themes.php:22
 msgid "Theme"
 msgstr "Thème"
@@ -17014,6 +17036,9 @@ msgstr ""
 msgid "concurrent_insert is set to 0"
 msgstr "Le paramètre concurrent_insert a une valeur de 0"
 
+#~ msgid "Read as multibytes"
+#~ msgstr "Lire en tant que multioctets"
+
 #~ msgid "Relational display column"
 #~ msgstr "Relations : colonnes descriptives"
 
diff --git a/po/fy.po b/po/fy.po
index e7c13d3278..5bf11101b2 100644
--- a/po/fy.po
+++ b/po/fy.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 4.5.0-dev\n"
 "Report-Msgid-Bugs-To: developers@phpmyadmin.net\n"
-"POT-Creation-Date: 2015-08-08 13:53-0400\n"
+"POT-Creation-Date: 2015-08-12 08:10-0400\n"
 "PO-Revision-Date: 2015-04-15 22:05+0200\n"
 "Last-Translator: Michal Čihař <michal@cihar.com>\n"
 "Language-Team: Frisian <https://hosted.weblate.org/projects/phpmyadmin/"
@@ -55,7 +55,7 @@ msgid "Table comments:"
 msgstr "Tabelopmerkings:"
 
 #: db_datadict.php:104 libraries/Index.class.php:699
-#: libraries/insert_edit.lib.php:1567
+#: libraries/insert_edit.lib.php:1565
 #: libraries/navigation/Nodes/Node_Column.class.php:30
 #: libraries/plugins/export/ExportHtmlword.class.php:280
 #: libraries/plugins/export/ExportHtmlword.class.php:375
@@ -69,13 +69,14 @@ msgstr "Tabelopmerkings:"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1023
 #: libraries/tracking.lib.php:879 libraries/tracking.lib.php:975
 #: templates/columns_definitions/column_name.phtml:18
-#: templates/index_form.phtml:124 templates/table/table_header.phtml:6
-#: templates/table/zoom_result_form.phtml:33
-#: templates/tbl_relation/common_form.phtml:10
-#: templates/tbl_relation/common_form.phtml:43
-#: templates/tbl_relation/foreign_key_row.phtml:194
-#: templates/tbl_relation/foreign_key_row.phtml:206
-#: templates/tbl_relation/internal_relational_row.phtml:71
+#: templates/table/index_form.phtml:124
+#: templates/table/relation/common_form.phtml:10
+#: templates/table/relation/common_form.phtml:43
+#: templates/table/relation/foreign_key_row.phtml:194
+#: templates/table/relation/foreign_key_row.phtml:206
+#: templates/table/relation/internal_relational_row.phtml:71
+#: templates/table/search/table_header.phtml:6
+#: templates/table/search/zoom_result_form.phtml:33
 msgid "Column"
 msgstr "Kolom"
 
@@ -93,21 +94,21 @@ msgstr "Kolom"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1001
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1024
 #: libraries/rte/rte_list.lib.php:75 libraries/rte/rte_list.lib.php:103
-#: libraries/rte/rte_routines.lib.php:802
-#: libraries/rte/rte_routines.lib.php:831
-#: libraries/rte/rte_routines.lib.php:1493
+#: libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_routines.lib.php:922
+#: libraries/rte/rte_routines.lib.php:1584
 #: libraries/server_privileges.lib.php:2369 libraries/tracking.lib.php:880
 #: libraries/tracking.lib.php:972
 #: templates/columns_definitions/table_fields_definitions.phtml:11
-#: templates/structure/table_header.phtml:48
-#: templates/structure/table_structure_header.phtml:6
-#: templates/table/table_header.phtml:7
+#: templates/database/structure/table_header.phtml:48
+#: templates/table/search/table_header.phtml:7
+#: templates/table/structure/table_structure_header.phtml:6
 msgid "Type"
 msgstr "Type"
 
 #: db_datadict.php:106 libraries/Index.class.php:702
 #: libraries/central_columns.lib.php:708
-#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1576
+#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1574
 #: libraries/plugins/export/ExportHtmlword.class.php:286
 #: libraries/plugins/export/ExportHtmlword.class.php:381
 #: libraries/plugins/export/ExportLatex.class.php:509
@@ -120,8 +121,8 @@ msgstr "Type"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1026
 #: libraries/tracking.lib.php:882 libraries/tracking.lib.php:978
 #: templates/columns_definitions/table_fields_definitions.phtml:39
-#: templates/structure/table_structure_header.phtml:9
-#: templates/table/zoom_result_form.phtml:34
+#: templates/table/search/zoom_result_form.phtml:34
+#: templates/table/structure/table_structure_header.phtml:9
 msgid "Null"
 msgstr "Leech"
 
@@ -139,8 +140,8 @@ msgstr "Leech"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1027
 #: libraries/replication_gui.lib.php:153 libraries/tracking.lib.php:883
 #: templates/columns_definitions/table_fields_definitions.phtml:25
-#: templates/structure/body_for_table_summary.phtml:55
-#: templates/structure/table_structure_header.phtml:10
+#: templates/database/structure/body_for_table_summary.phtml:55
+#: templates/table/structure/table_structure_header.phtml:10
 msgid "Default"
 msgstr "Standert"
 
@@ -168,19 +169,19 @@ msgid "Comments"
 msgstr "Opmerkings"
 
 #: db_datadict.php:146
-#: libraries/controllers/StructureController.class.php:1960
-#: libraries/controllers/StructureController.class.php:1965
+#: libraries/controllers/TableStructureController.class.php:951
+#: libraries/controllers/TableStructureController.class.php:956
 #: libraries/tracking.lib.php:922
 #: templates/columns_definitions/column_indexes.phtml:6
-#: templates/structure/check_all_table_column.phtml:22
-#: templates/structure/display_structure.phtml:74
+#: templates/table/structure/check_all_table_column.phtml:22
+#: templates/table/structure/display_structure.phtml:74
 msgid "Primary"
 msgstr ""
 
 #: db_datadict.php:156 js/messages.php:317 libraries/Index.class.php:567
 #: libraries/Index.class.php:606 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261 libraries/mult_submits.lib.php:403
+#: libraries/config/FormDisplay.tpl.php:272 libraries/mult_submits.lib.php:403
 #: libraries/mult_submits.lib.php:417
 #: libraries/plugins/export/ExportHtmlword.class.php:630
 #: libraries/plugins/export/ExportLatex.class.php:589
@@ -196,20 +197,20 @@ msgstr ""
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1010 libraries/tracking.lib.php:1015
 #: prefs_manage.php:140 templates/prefs_autoload.phtml:15
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "No"
 msgstr "Nee"
 
 #: db_datadict.php:156 js/messages.php:443 libraries/Index.class.php:568
 #: libraries/Index.class.php:605 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261
-#: libraries/controllers/StructureController.class.php:1344
-#: libraries/controllers/StructureController.class.php:2223
-#: libraries/controllers/StructureController.class.php:2232
-#: libraries/controllers/StructureController.class.php:2237
-#: libraries/controllers/StructureController.class.php:2242
-#: libraries/controllers/StructureController.class.php:2247
+#: libraries/config/FormDisplay.tpl.php:272
+#: libraries/controllers/TableStructureController.class.php:539
+#: libraries/controllers/TableStructureController.class.php:1201
+#: libraries/controllers/TableStructureController.class.php:1210
+#: libraries/controllers/TableStructureController.class.php:1215
+#: libraries/controllers/TableStructureController.class.php:1220
+#: libraries/controllers/TableStructureController.class.php:1225
 #: libraries/mult_submits.inc.php:82 libraries/mult_submits.inc.php:178
 #: libraries/mult_submits.lib.php:339 libraries/mult_submits.lib.php:372
 #: libraries/mult_submits.lib.php:401 libraries/mult_submits.lib.php:415
@@ -218,8 +219,8 @@ msgstr "Nee"
 #: libraries/plugins/export/ExportOdt.class.php:756
 #: libraries/plugins/export/ExportTexytext.class.php:567
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1077
-#: libraries/server_databases.lib.php:464
-#: libraries/server_databases.lib.php:474
+#: libraries/server_databases.lib.php:475
+#: libraries/server_databases.lib.php:485
 #: libraries/server_privileges.lib.php:2546
 #: libraries/server_privileges.lib.php:2727
 #: libraries/server_privileges.lib.php:2748
@@ -229,7 +230,7 @@ msgstr "Nee"
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1008 libraries/tracking.lib.php:1013
 #: prefs_manage.php:138 templates/prefs_autoload.phtml:14
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "Yes"
 msgstr "Ja"
 
@@ -239,7 +240,7 @@ msgstr ""
 
 #: db_export.php:37 db_tracking.php:90 export.php:382
 #: libraries/DBQbe.class.php:326
-#: libraries/controllers/StructureController.class.php:231
+#: libraries/controllers/DatabaseStructureController.class.php:170
 #: libraries/navigation/NavigationTree.class.php:897
 msgid "No tables found in database."
 msgstr ""
@@ -250,14 +251,14 @@ msgstr ""
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:26
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:120
-#: templates/structure/show_create.phtml:18
+#: templates/database/structure/show_create.phtml:18
 msgid "Tables"
 msgstr "Tabellen"
 
 #: db_export.php:52 libraries/Menu.class.php:317 libraries/Menu.class.php:425
-#: libraries/Util.class.php:3333 libraries/Util.class.php:3343
-#: libraries/Util.class.php:3349 libraries/Util.class.php:3629
-#: libraries/Util.class.php:4327 libraries/Util.class.php:4344
+#: libraries/Util.class.php:3339 libraries/Util.class.php:3349
+#: libraries/Util.class.php:3355 libraries/Util.class.php:3635
+#: libraries/Util.class.php:4333 libraries/Util.class.php:4350
 #: libraries/central_columns.lib.php:728 libraries/config.values.php:39
 #: libraries/config.values.php:47 libraries/config.values.php:109
 #: libraries/config.values.php:115 libraries/config/setup.forms.php:323
@@ -271,7 +272,7 @@ msgstr "Tabellen"
 #: libraries/navigation/Nodes/Node_Table.class.php:283
 #: libraries/server_privileges.lib.php:1141 libraries/tracking.lib.php:874
 #: templates/columns_definitions/table_fields_definitions.phtml:3
-#: templates/designer/table_list.phtml:28
+#: templates/database/designer/table_list.phtml:28
 msgid "Structure"
 msgstr "Struktuer"
 
@@ -283,7 +284,7 @@ msgstr "Struktuer"
 #: libraries/config/user_preferences.forms.php:292
 #: libraries/config/user_preferences.forms.php:297
 #: libraries/server_privileges.lib.php:1140
-#: templates/structure/display_table_stats.phtml:12
+#: templates/table/structure/display_table_stats.phtml:12
 msgid "Data"
 msgstr "Data"
 
@@ -353,10 +354,10 @@ msgstr ""
 #: libraries/server_privileges.lib.php:2908
 #: libraries/server_privileges.lib.php:3145
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4346
-#: templates/structure/table_header.phtml:21
-#: templates/tbl_relation/foreign_key_row.phtml:176
-#: templates/tbl_relation/internal_relational_row.phtml:63
+#: libraries/server_privileges.lib.php:4372
+#: templates/database/structure/table_header.phtml:21
+#: templates/table/relation/foreign_key_row.phtml:176
+#: templates/table/relation/internal_relational_row.phtml:63
 msgid "Table"
 msgstr "Tabel"
 
@@ -373,7 +374,7 @@ msgid "Updated"
 msgstr ""
 
 #: db_tracking.php:130 js/messages.php:243 libraries/Menu.class.php:552
-#: libraries/Util.class.php:4314 libraries/config.values.php:104
+#: libraries/Util.class.php:4320 libraries/config.values.php:104
 #: libraries/rte/rte_events.lib.php:393 libraries/rte/rte_list.lib.php:101
 #: libraries/server_status_processes.lib.php:92 libraries/tracking.lib.php:279
 msgid "Status"
@@ -382,14 +383,15 @@ msgstr "Status"
 #: db_tracking.php:131 db_tracking.php:290 libraries/Index.class.php:693
 #: libraries/central_columns.lib.php:687 libraries/rte/rte_list.lib.php:74
 #: libraries/rte/rte_list.lib.php:89 libraries/rte/rte_list.lib.php:102
-#: libraries/server_databases.lib.php:398
+#: libraries/server_databases.lib.php:409
 #: libraries/server_privileges.lib.php:2372
 #: libraries/server_privileges.lib.php:3166
 #: libraries/server_privileges.lib.php:3342
 #: libraries/server_user_groups.lib.php:82
 #: libraries/server_variables.lib.php:189 libraries/tracking.lib.php:280
-#: libraries/tracking.lib.php:793 templates/structure/table_header.phtml:30
-#: templates/structure/table_structure_header.phtml:23
+#: libraries/tracking.lib.php:793
+#: templates/database/structure/table_header.phtml:30
+#: templates/table/structure/table_structure_header.phtml:23
 msgid "Action"
 msgstr "Aksje"
 
@@ -431,7 +433,7 @@ msgid "Untracked tables"
 msgstr ""
 
 #: db_tracking.php:305 db_tracking.php:336
-#: templates/structure/optional_action_links.phtml:17
+#: templates/table/structure/optional_action_links.phtml:17
 msgid "Track table"
 msgstr ""
 
@@ -481,7 +483,7 @@ msgid "Value for the column \"%s\""
 msgstr ""
 
 #: gis_data_editor.php:146
-#: templates/gis_visualization/gis_visualization.phtml:37
+#: templates/table/gis_visualization/gis_visualization.phtml:37
 msgid "Use OpenStreetMaps as Base Layer"
 msgstr ""
 
@@ -561,35 +563,35 @@ msgstr "Geometry tafoegje"
 #: libraries/display_change_password.lib.php:162
 #: libraries/display_export.lib.php:402 libraries/display_export.lib.php:408
 #: libraries/display_import.lib.php:392 libraries/index.lib.php:44
-#: libraries/insert_edit.lib.php:1546 libraries/insert_edit.lib.php:1583
+#: libraries/insert_edit.lib.php:1544 libraries/insert_edit.lib.php:1581
 #: libraries/normalization.lib.php:165 libraries/normalization.lib.php:821
 #: libraries/operations.lib.php:38 libraries/operations.lib.php:108
 #: libraries/operations.lib.php:263 libraries/operations.lib.php:306
 #: libraries/operations.lib.php:801 libraries/operations.lib.php:874
 #: libraries/operations.lib.php:923 libraries/operations.lib.php:1337
 #: libraries/operations.lib.php:1658
-#: libraries/plugins/auth/AuthenticationCookie.class.php:244
+#: libraries/plugins/auth/AuthenticationCookie.class.php:232
 #: libraries/replication_gui.lib.php:122 libraries/replication_gui.lib.php:161
 #: libraries/replication_gui.lib.php:324 libraries/replication_gui.lib.php:461
 #: libraries/replication_gui.lib.php:906 libraries/rte/rte_events.lib.php:509
-#: libraries/rte/rte_routines.lib.php:969
-#: libraries/rte/rte_routines.lib.php:1581
+#: libraries/rte/rte_routines.lib.php:1060
+#: libraries/rte/rte_routines.lib.php:1672
 #: libraries/rte/rte_triggers.lib.php:396 libraries/server_bin_log.lib.php:61
 #: libraries/server_privileges.lib.php:705
 #: libraries/server_privileges.lib.php:2106
 #: libraries/server_privileges.lib.php:2872
 #: libraries/server_privileges.lib.php:3553
-#: libraries/server_privileges.lib.php:4627
+#: libraries/server_privileges.lib.php:4653
 #: libraries/server_user_groups.lib.php:285
 #: libraries/sql_query_form.lib.php:369 libraries/sql_query_form.lib.php:429
 #: libraries/tracking.lib.php:533 libraries/tracking.lib.php:653
 #: prefs_manage.php:277 prefs_manage.php:355
 #: templates/columns_definitions/column_definitions_form.phtml:59
-#: templates/header_location.phtml:17 templates/index_form.phtml:238
+#: templates/database/create_table.phtml:21 templates/header_location.phtml:28
 #: templates/startAndNumberOfRowsPanel.phtml:14
-#: templates/structure/add_column.phtml:25
-#: templates/table/create_table.phtml:21
-#: templates/table/selection_form.phtml:75 view_create.php:275
+#: templates/table/index_form.phtml:238
+#: templates/table/search/selection_form.phtml:75
+#: templates/table/structure/add_column.phtml:25 view_create.php:275
 #: view_operations.php:106
 msgid "Go"
 msgstr "Starte"
@@ -667,7 +669,7 @@ msgstr ""
 msgid "Could not load import plugins, please check your installation!"
 msgstr ""
 
-#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1466
+#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1460
 #, php-format
 msgid "Bookmark %s has been created."
 msgstr ""
@@ -701,11 +703,11 @@ msgstr ""
 msgid "Back"
 msgstr "Werom"
 
-#: index.php:148 libraries/Footer.class.php:70
+#: index.php:149 libraries/Footer.class.php:70
 msgid "phpMyAdmin Demo Server"
 msgstr "phpMyAdmin-demoserver"
 
-#: index.php:152
+#: index.php:153
 #, php-format
 msgid ""
 "You are using the demo server. You can do anything here, but please do not "
@@ -713,112 +715,112 @@ msgid ""
 "at %s."
 msgstr ""
 
-#: index.php:162
+#: index.php:163
 msgid "General Settings"
 msgstr "Algemiene ynstellingen"
 
-#: index.php:190 libraries/display_change_password.lib.php:50
+#: index.php:191 libraries/display_change_password.lib.php:50
 #: libraries/display_change_password.lib.php:53 user_password.php:247
 msgid "Change password"
 msgstr "Wachtwurd wizigjen"
 
-#: index.php:206
+#: index.php:207
 msgid "Server connection collation"
 msgstr "Kollaasje fan de serverferbining"
 
-#: index.php:228
+#: index.php:229
 msgid "Appearance Settings"
 msgstr "Opmaakynstellingen"
 
-#: index.php:258 prefs_manage.php:285
+#: index.php:259 prefs_manage.php:285
 msgid "More settings"
 msgstr "Mear ynstellingen"
 
-#: index.php:279
+#: index.php:280
 msgid "Database server"
 msgstr "Databaseserver"
 
-#: index.php:282 libraries/plugins/auth/AuthenticationCookie.class.php:181
+#: index.php:283 libraries/plugins/auth/AuthenticationCookie.class.php:169
 msgid "Server:"
 msgstr "Server:"
 
-#: index.php:286
+#: index.php:287
 msgid "Server type:"
 msgstr "Servertype:"
 
-#: index.php:290 libraries/plugins/export/ExportLatex.class.php:212
+#: index.php:291 libraries/plugins/export/ExportLatex.class.php:212
 #: libraries/plugins/export/ExportSql.class.php:687
 #: libraries/plugins/export/ExportXml.class.php:189
 msgid "Server version:"
 msgstr "Serverferzje:"
 
-#: index.php:296
+#: index.php:297
 msgid "Protocol version:"
 msgstr "Protokolferzje:"
 
-#: index.php:300
+#: index.php:301
 msgid "User:"
 msgstr "Brûker:"
 
-#: index.php:305
+#: index.php:306
 msgid "Server charset:"
 msgstr "Serverkarakterset:"
 
-#: index.php:320
+#: index.php:321
 msgid "Web server"
 msgstr "Webserver"
 
-#: index.php:331
+#: index.php:332
 msgid "Database client version:"
 msgstr "Clientferzje fan database:"
 
-#: index.php:335
+#: index.php:336
 msgid "PHP extension:"
 msgstr "PHP-útwreiding:"
 
-#: index.php:349
+#: index.php:350
 #, fuzzy
 #| msgid "PHP Version:"
 msgid "PHP version:"
 msgstr "PHP-ferzje:"
 
-#: index.php:360
+#: index.php:361
 msgid "Show PHP information"
 msgstr "Ynformaasje oer PHP werjaan"
 
-#: index.php:383
+#: index.php:384
 msgid "Version information:"
 msgstr "Ferzje-ynformaasje:"
 
-#: index.php:392 libraries/Util.class.php:432 libraries/Util.class.php:495
-#: libraries/config/FormDisplay.tpl.php:151
+#: index.php:393 libraries/Util.class.php:432 libraries/Util.class.php:495
+#: libraries/config/FormDisplay.tpl.php:162
 #: libraries/display_export.lib.php:577 libraries/engines/pbxt.lib.php:162
 #: libraries/navigation/NavigationHeader.class.php:196
 #: libraries/server_variables.lib.php:160
 msgid "Documentation"
 msgstr "Dokumintaasje"
 
-#: index.php:399
+#: index.php:400
 msgid "Wiki"
 msgstr "Wiki"
 
-#: index.php:408
+#: index.php:409
 msgid "Official Homepage"
 msgstr "Offisjele phpMyAdmin-webstee"
 
-#: index.php:415
+#: index.php:416
 msgid "Contribute"
 msgstr "Bydrage"
 
-#: index.php:422
+#: index.php:423
 msgid "Get support"
 msgstr "Stipe krije"
 
-#: index.php:429
+#: index.php:430
 msgid "List of changes"
 msgstr "List mei wizigingen"
 
-#: index.php:451
+#: index.php:452
 msgid ""
 "You are connected as 'root' with no password, which corresponds to the "
 "default MySQL privileged account. Your MySQL server is running with this "
@@ -826,21 +828,21 @@ msgid ""
 "by setting a password for user 'root'."
 msgstr ""
 
-#: index.php:468
+#: index.php:469
 msgid ""
 "You have enabled mbstring.func_overload in your PHP configuration. This "
 "option is incompatible with phpMyAdmin and might cause some data to be "
 "corrupted!"
 msgstr ""
 
-#: index.php:483
+#: index.php:484
 msgid ""
 "The mbstring PHP extension was not found and you seem to be using a "
 "multibyte charset. Without the mbstring extension phpMyAdmin is unable to "
 "split strings correctly and it may result in unexpected results."
 msgstr ""
 
-#: index.php:500
+#: index.php:501
 msgid ""
 "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini."
 "session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower than "
@@ -848,17 +850,17 @@ msgid ""
 "expire sooner than configured in phpMyAdmin."
 msgstr ""
 
-#: index.php:519
+#: index.php:520
 msgid ""
 "Login cookie store is lower than cookie validity configured in phpMyAdmin, "
 "because of this, your login will expire sooner than configured in phpMyAdmin."
 msgstr ""
 
-#: index.php:535
+#: index.php:536
 msgid "The configuration file now needs a secret passphrase (blowfish_secret)."
 msgstr ""
 
-#: index.php:548
+#: index.php:549
 msgid ""
 "Directory [code]config[/code], which is used by the setup script, still "
 "exists in your phpMyAdmin directory. It is strongly recommended to remove it "
@@ -866,26 +868,26 @@ msgid ""
 "may be compromised by unauthorized people downloading your configuration."
 msgstr ""
 
-#: index.php:564
+#: index.php:565
 #, php-format
 msgid ""
 "The phpMyAdmin configuration storage is not completely configured, some "
 "extended features have been deactivated. %sFind out why%s. "
 msgstr ""
 
-#: index.php:571
+#: index.php:572
 msgid ""
 "Or alternately go to 'Operations' tab of any database to set it up there."
 msgstr ""
 
-#: index.php:620
+#: index.php:621
 #, php-format
 msgid ""
 "Your PHP MySQL library version %s differs from your MySQL server version %s. "
 "This may cause unpredictable behavior."
 msgstr ""
 
-#: index.php:648
+#: index.php:649
 #, php-format
 msgid ""
 "Server running with Suhosin. Please refer to %sdocumentation%s for possible "
@@ -1026,8 +1028,8 @@ msgstr ""
 msgid "Save & Close"
 msgstr "Bewarje & slute"
 
-#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:404
-#: libraries/insert_edit.lib.php:1550 prefs_manage.php:361
+#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:415
+#: libraries/insert_edit.lib.php:1548 prefs_manage.php:361
 #: prefs_manage.php:372
 msgid "Reset"
 msgstr "Ferfarskje"
@@ -1060,7 +1062,7 @@ msgstr "Yndeks tafoegje"
 msgid "Edit Index"
 msgstr "Yndeks bewurkje"
 
-#: js/messages.php:99 templates/index_form.phtml:232
+#: js/messages.php:99 templates/table/index_form.phtml:232
 #, php-format
 msgid "Add %s column(s) to index"
 msgstr ""
@@ -1081,13 +1083,14 @@ msgstr ""
 msgid "Please select column(s) for the index."
 msgstr ""
 
-#: js/messages.php:106 templates/structure/add_column.phtml:1
+#: js/messages.php:106 templates/table/structure/add_column.phtml:1
 msgid "You have to add at least one column."
 msgstr ""
 
-#: js/messages.php:109 libraries/insert_edit.lib.php:1548
+#: js/messages.php:109 libraries/insert_edit.lib.php:1546
 #: templates/columns_definitions/column_definitions_form.phtml:162
-#: templates/index_form.phtml:237 templates/tbl_relation/common_form.phtml:106
+#: templates/table/index_form.phtml:237
+#: templates/table/relation/common_form.phtml:106
 msgid "Preview SQL"
 msgstr ""
 
@@ -1104,7 +1107,7 @@ msgid "SQL query:"
 msgstr "SQL-query:"
 
 #. l10n: Default label for the y-Axis of Charts
-#: js/messages.php:118 templates/tbl_chart.phtml:109
+#: js/messages.php:118 templates/table/chart/tbl_chart.phtml:109
 msgid "Y Values"
 msgstr "Y-wearden"
 
@@ -1255,7 +1258,7 @@ msgstr ""
 msgid "Bytes received"
 msgstr ""
 
-#: js/messages.php:169 libraries/server_status.lib.php:226
+#: js/messages.php:169 libraries/server_status.lib.php:235
 msgid "Connections"
 msgstr "Ferbinings"
 
@@ -1312,12 +1315,12 @@ msgstr "%d tabel(len)"
 msgid "Questions"
 msgstr "Questions"
 
-#: js/messages.php:184 libraries/server_status.lib.php:134
+#: js/messages.php:184 libraries/server_status.lib.php:143
 msgid "Traffic"
 msgstr "Ferkear"
 
 #: js/messages.php:185 libraries/Menu.class.php:586
-#: libraries/Util.class.php:4318 libraries/server_status_monitor.lib.php:257
+#: libraries/Util.class.php:4324 libraries/server_status_monitor.lib.php:257
 msgid "Settings"
 msgstr "Ynstellingen"
 
@@ -1337,8 +1340,9 @@ msgstr ""
 #: libraries/server_status_monitor.lib.php:236
 #: libraries/server_status_processes.lib.php:308
 #: templates/columns_definitions/transformation.phtml:4
-#: templates/designer/options_panel.phtml:178
-#: templates/table/options_zoom.phtml:12 templates/table/rows_zoom.phtml:26
+#: templates/database/designer/options_panel.phtml:178
+#: templates/table/search/options_zoom.phtml:12
+#: templates/table/search/rows_zoom.phtml:26
 msgid "None"
 msgstr "Gjin"
 
@@ -1606,8 +1610,8 @@ msgstr ""
 
 #: js/messages.php:270 libraries/Menu.class.php:352
 #: libraries/Menu.class.php:455 libraries/Menu.class.php:582
-#: libraries/Util.class.php:4317 libraries/Util.class.php:4332
-#: libraries/Util.class.php:4349 libraries/config/messages.inc.php:258
+#: libraries/Util.class.php:4323 libraries/Util.class.php:4338
+#: libraries/Util.class.php:4355 libraries/config/messages.inc.php:258
 #: libraries/display_import.lib.php:105
 #: libraries/server_status_monitor.lib.php:318 prefs_manage.php:238
 #: setup/frames/menu.inc.php:26
@@ -1667,13 +1671,13 @@ msgid "Formatting SQL..."
 msgstr ""
 
 #: js/messages.php:293 libraries/server_variables.lib.php:157
-#: templates/designer/aggregate_query_panel.phtml:63
-#: templates/designer/delete_relation_panel.phtml:28
-#: templates/designer/having_query_panel.phtml:117
-#: templates/designer/new_relation_panel.phtml:88
-#: templates/designer/options_panel.phtml:253
-#: templates/designer/rename_to_panel.phtml:45
-#: templates/designer/where_query_panel.phtml:83
+#: templates/database/designer/aggregate_query_panel.phtml:63
+#: templates/database/designer/delete_relation_panel.phtml:28
+#: templates/database/designer/having_query_panel.phtml:117
+#: templates/database/designer/new_relation_panel.phtml:88
+#: templates/database/designer/options_panel.phtml:253
+#: templates/database/designer/rename_to_panel.phtml:45
+#: templates/database/designer/where_query_panel.phtml:83
 msgid "Cancel"
 msgstr "Annulearje"
 
@@ -1683,7 +1687,7 @@ msgstr "Annulearje"
 msgid "Page-related settings"
 msgstr "Ynstellingen wizigjen"
 
-#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:402
+#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:413
 msgid "Apply"
 msgstr "Tapasse"
 
@@ -1718,8 +1722,8 @@ msgstr "Flaterkoade: %s"
 msgid "Error text: %s"
 msgstr "Flateromskriuwing: %s"
 
-#: js/messages.php:307 libraries/db_common.inc.php:68
-#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:450
+#: js/messages.php:307 libraries/db_common.inc.php:69
+#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:461
 msgid "No databases selected."
 msgstr ""
 
@@ -1731,12 +1735,13 @@ msgstr ""
 msgid "Adding Primary Key"
 msgstr ""
 
-#: js/messages.php:310 templates/designer/aggregate_query_panel.phtml:59
-#: templates/designer/having_query_panel.phtml:113
-#: templates/designer/new_relation_panel.phtml:87
-#: templates/designer/options_panel.phtml:252
-#: templates/designer/rename_to_panel.phtml:41
-#: templates/designer/where_query_panel.phtml:82
+#: js/messages.php:310
+#: templates/database/designer/aggregate_query_panel.phtml:59
+#: templates/database/designer/having_query_panel.phtml:113
+#: templates/database/designer/new_relation_panel.phtml:87
+#: templates/database/designer/options_panel.phtml:252
+#: templates/database/designer/rename_to_panel.phtml:41
+#: templates/database/designer/where_query_panel.phtml:82
 msgid "OK"
 msgstr ""
 
@@ -1756,7 +1761,7 @@ msgstr ""
 msgid "Changing Charset"
 msgstr ""
 
-#: js/messages.php:320 libraries/Util.class.php:3217
+#: js/messages.php:320 libraries/Util.class.php:3223
 msgid "Enable foreign key checks"
 msgstr ""
 
@@ -1791,20 +1796,21 @@ msgstr ""
 #: js/messages.php:334 libraries/DisplayResults.class.php:4834
 #: libraries/DisplayResults.class.php:5092 libraries/Menu.class.php:344
 #: libraries/Menu.class.php:446 libraries/Menu.class.php:578
-#: libraries/Util.class.php:3636 libraries/Util.class.php:3637
-#: libraries/Util.class.php:4316 libraries/Util.class.php:4331
-#: libraries/Util.class.php:4348 libraries/config/messages.inc.php:252
+#: libraries/Util.class.php:3642 libraries/Util.class.php:3643
+#: libraries/Util.class.php:4322 libraries/Util.class.php:4337
+#: libraries/Util.class.php:4354 libraries/config/messages.inc.php:252
 #: libraries/display_export.lib.php:173 libraries/rte/rte_list.lib.php:146
 #: libraries/server_privileges.lib.php:2211
 #: libraries/server_privileges.lib.php:2290
 #: libraries/server_privileges.lib.php:2632
 #: libraries/server_privileges.lib.php:3356
 #: libraries/server_status_monitor.lib.php:322 prefs_manage.php:303
-#: setup/frames/menu.inc.php:27 templates/structure/check_all_tables.phtml:11
+#: setup/frames/menu.inc.php:27
+#: templates/database/structure/check_all_tables.phtml:11
 msgid "Export"
 msgstr "Eksportearje"
 
-#: js/messages.php:337 libraries/rte/rte_routines.lib.php:652
+#: js/messages.php:337 libraries/rte/rte_routines.lib.php:743
 msgid "ENUM/SET editor"
 msgstr ""
 
@@ -1843,7 +1849,7 @@ msgstr ""
 #: libraries/Console.class.php:214 libraries/DisplayResults.class.php:3474
 #: libraries/DisplayResults.class.php:4818 libraries/Index.class.php:723
 #: libraries/Util.class.php:706 libraries/Util.class.php:1202
-#: libraries/Util.class.php:3634 libraries/Util.class.php:3635
+#: libraries/Util.class.php:3640 libraries/Util.class.php:3641
 #: libraries/central_columns.lib.php:851
 #: libraries/central_columns.lib.php:1193
 #: libraries/config/messages.inc.php:892
@@ -1861,7 +1867,7 @@ msgstr "Bewurkje"
 #: libraries/server_user_groups.lib.php:129
 #: libraries/sql_query_form.lib.php:416 libraries/tracking.lib.php:477
 #: setup/frames/index.inc.php:183 setup/frames/index.inc.php:291
-#: templates/designer/delete_relation_panel.phtml:27
+#: templates/database/designer/delete_relation_panel.phtml:27
 msgid "Delete"
 msgstr ""
 
@@ -2023,11 +2029,11 @@ msgid "No dependencies selected!"
 msgstr ""
 
 #: js/messages.php:394 libraries/central_columns.lib.php:1214
-#: libraries/insert_edit.lib.php:1458 libraries/server_variables.lib.php:155
+#: libraries/insert_edit.lib.php:1456 libraries/server_variables.lib.php:155
 #: setup/frames/config.inc.php:42 setup/frames/index.inc.php:279
 #: templates/columns_definitions/column_definitions_form.phtml:165
-#: templates/gis_visualization/gis_visualization.phtml:48
-#: templates/tbl_relation/common_form.phtml:107
+#: templates/table/gis_visualization/gis_visualization.phtml:48
+#: templates/table/relation/common_form.phtml:107
 msgid "Save"
 msgstr "Bewarje"
 
@@ -2104,8 +2110,8 @@ msgid "Data point content"
 msgstr ""
 
 #: js/messages.php:430 js/messages.php:562 js/messages.php:579
-#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2573
-#: templates/index_form.phtml:154 templates/index_form.phtml:194
+#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2571
+#: templates/table/index_form.phtml:154 templates/table/index_form.phtml:194
 msgid "Ignore"
 msgstr ""
 
@@ -2164,8 +2170,8 @@ msgstr ""
 msgid "Please select the primary key or a unique key!"
 msgstr ""
 
-#: js/messages.php:457 templates/designer/side_menu.phtml:91
-#: templates/designer/side_menu.phtml:94
+#: js/messages.php:457 templates/database/designer/side_menu.phtml:91
+#: templates/database/designer/side_menu.phtml:94
 msgid "Choose column to display"
 msgstr ""
 
@@ -2179,20 +2185,20 @@ msgstr ""
 msgid "Page name"
 msgstr "Sidenamme"
 
-#: js/messages.php:463 templates/designer/side_menu.phtml:56
-#: templates/designer/side_menu.phtml:59
+#: js/messages.php:463 templates/database/designer/side_menu.phtml:56
+#: templates/database/designer/side_menu.phtml:59
 msgid "Save page"
 msgstr "Side bewarje"
 
-#: js/messages.php:464 templates/designer/side_menu.phtml:63
-#: templates/designer/side_menu.phtml:66
+#: js/messages.php:464 templates/database/designer/side_menu.phtml:63
+#: templates/database/designer/side_menu.phtml:66
 #, fuzzy
 #| msgid "Save page"
 msgid "Save page as"
 msgstr "Side bewarje"
 
-#: js/messages.php:465 templates/designer/side_menu.phtml:49
-#: templates/designer/side_menu.phtml:52
+#: js/messages.php:465 templates/database/designer/side_menu.phtml:49
+#: templates/database/designer/side_menu.phtml:52
 msgid "Open page"
 msgstr ""
 
@@ -2200,7 +2206,7 @@ msgstr ""
 msgid "Delete page"
 msgstr ""
 
-#: js/messages.php:467 templates/designer/side_menu.phtml:10
+#: js/messages.php:467 templates/database/designer/side_menu.phtml:10
 msgid "Untitled"
 msgstr ""
 
@@ -2311,7 +2317,7 @@ msgstr ""
 msgid "cancel"
 msgstr "annulearje"
 
-#: js/messages.php:499 libraries/server_status.lib.php:271
+#: js/messages.php:499 libraries/server_status.lib.php:280
 msgid "Aborted"
 msgstr ""
 
@@ -2875,7 +2881,7 @@ msgstr ""
 
 #: js/messages.php:793 libraries/Message.class.php:199
 #: libraries/Util.class.php:654 libraries/core.lib.php:245
-#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1172
+#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1170
 #: tbl_operations.php:229 view_operations.php:63
 msgid "Error"
 msgstr "Flater"
@@ -2934,8 +2940,8 @@ msgstr "per sekonde"
 msgid "per minute"
 msgstr "per minút"
 
-#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:143
-#: libraries/server_status.lib.php:228
+#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:152
+#: libraries/server_status.lib.php:237
 #: libraries/server_status_queries.lib.php:98
 msgid "per hour"
 msgstr "per oere"
@@ -2953,7 +2959,7 @@ msgstr ""
 msgid "Wrong permissions on configuration file, should not be world writable!"
 msgstr ""
 
-#: libraries/Config.class.php:1799
+#: libraries/Config.class.php:1801
 msgid "Font size"
 msgstr "Lettertypegrutte"
 
@@ -2981,10 +2987,10 @@ msgstr ""
 #: libraries/server_privileges.lib.php:2890
 #: libraries/server_privileges.lib.php:3144
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4332
+#: libraries/server_privileges.lib.php:4358
 #: libraries/server_status_processes.lib.php:80
-#: templates/tbl_relation/foreign_key_row.phtml:165
-#: templates/tbl_relation/internal_relational_row.phtml:55
+#: templates/table/relation/foreign_key_row.phtml:165
+#: templates/table/relation/internal_relational_row.phtml:55
 msgid "Database"
 msgstr "Database"
 
@@ -3077,11 +3083,11 @@ msgstr "Skiednis"
 #: libraries/plugins/import/ImportMediawiki.class.php:60
 #: libraries/plugins/import/ImportOds.class.php:59
 #: libraries/plugins/import/ImportShp.class.php:57
-#: libraries/plugins/import/ImportSql.class.php:148
+#: libraries/plugins/import/ImportSql.class.php:51
 #: libraries/plugins/import/ImportXml.class.php:58
-#: libraries/rte/rte_routines.lib.php:833 templates/index_form.phtml:49
-#: templates/structure/row_stats_table.phtml:20
-#: templates/table/options.phtml:2
+#: libraries/rte/rte_routines.lib.php:924 templates/table/index_form.phtml:49
+#: templates/table/search/options.phtml:2
+#: templates/table/structure/row_stats_table.phtml:20
 msgid "Options"
 msgstr "Opsjes"
 
@@ -3120,7 +3126,8 @@ msgstr "Ofrinnend"
 msgid "Order:"
 msgstr "Folchoarder"
 
-#: libraries/Console.class.php:289 templates/table/replace_preview.phtml:17
+#: libraries/Console.class.php:289
+#: templates/table/search/replace_preview.phtml:17
 msgid "Count"
 msgstr "Oantal"
 
@@ -3225,9 +3232,9 @@ msgstr ""
 #: libraries/operations.lib.php:794 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:191
-#: templates/structure/sortable_header.phtml:21
-#: templates/structure/sortable_header.phtml:38
-#: templates/table/options.phtml:68
+#: templates/database/structure/sortable_header.phtml:21
+#: templates/database/structure/sortable_header.phtml:38
+#: templates/table/search/options.phtml:68
 msgid "Ascending"
 msgstr "Oprinnend"
 
@@ -3237,13 +3244,14 @@ msgstr "Oprinnend"
 #: libraries/operations.lib.php:797 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:188
-#: templates/structure/sortable_header.phtml:26
-#: templates/structure/sortable_header.phtml:43
-#: templates/table/options.phtml:69
+#: templates/database/structure/sortable_header.phtml:26
+#: templates/database/structure/sortable_header.phtml:43
+#: templates/table/search/options.phtml:69
 msgid "Descending"
 msgstr "Ofrinnend"
 
-#: libraries/DBQbe.class.php:467 templates/table/search_and_replace.phtml:6
+#: libraries/DBQbe.class.php:467
+#: templates/table/search/search_and_replace.phtml:6
 msgid "Column:"
 msgstr "Kolom:"
 
@@ -3398,12 +3406,12 @@ msgstr[0] ""
 msgstr[1] ""
 
 #: libraries/DbSearch.class.php:354 libraries/Menu.class.php:311
-#: libraries/Util.class.php:3337 libraries/Util.class.php:3347
-#: libraries/Util.class.php:3623 libraries/Util.class.php:3624
-#: libraries/Util.class.php:4343 libraries/config.values.php:43
+#: libraries/Util.class.php:3343 libraries/Util.class.php:3353
+#: libraries/Util.class.php:3629 libraries/Util.class.php:3630
+#: libraries/Util.class.php:4349 libraries/config.values.php:43
 #: libraries/config.values.php:51 libraries/config.values.php:119
 #: libraries/navigation/Nodes/Node_Table.class.php:295
-#: templates/structure/check_all_table_column.phtml:5
+#: templates/table/structure/check_all_table_column.phtml:5
 msgid "Browse"
 msgstr "Ferkenne"
 
@@ -3420,7 +3428,8 @@ msgstr "Sykje yn de database"
 msgid "Words or values to search for (wildcard: \"%\"):"
 msgstr ""
 
-#: libraries/DbSearch.class.php:401 templates/table/search_and_replace.phtml:1
+#: libraries/DbSearch.class.php:401
+#: templates/table/search/search_and_replace.phtml:1
 msgid "Find:"
 msgstr ""
 
@@ -3464,28 +3473,28 @@ msgstr ""
 msgid "Search this table"
 msgstr ""
 
-#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2532
-#: libraries/Util.class.php:2535
+#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2538
+#: libraries/Util.class.php:2541
 msgctxt "First page"
 msgid "Begin"
 msgstr "Begjin"
 
-#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2533
-#: libraries/Util.class.php:2536 libraries/server_bin_log.lib.php:170
+#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2539
+#: libraries/Util.class.php:2542 libraries/server_bin_log.lib.php:170
 #: libraries/server_bin_log.lib.php:172
 msgctxt "Previous page"
 msgid "Previous"
 msgstr ""
 
-#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2564
-#: libraries/Util.class.php:2574 libraries/server_bin_log.lib.php:204
+#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2570
+#: libraries/Util.class.php:2580 libraries/server_bin_log.lib.php:204
 #: libraries/server_bin_log.lib.php:206
 msgctxt "Next page"
 msgid "Next"
 msgstr "Folgjende"
 
-#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2565
-#: libraries/Util.class.php:2575
+#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2571
+#: libraries/Util.class.php:2581
 msgctxt "Last page"
 msgid "End"
 msgstr ""
@@ -3560,15 +3569,15 @@ msgid "May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]."
 msgstr ""
 
 #: libraries/DisplayResults.class.php:4332 libraries/Message.class.php:180
-#: libraries/controllers/TableRelationController.class.php:258
+#: libraries/controllers/TableRelationController.class.php:259
 #: libraries/controllers/TableSearchController.class.php:655
-#: libraries/rte/rte_routines.lib.php:1332 libraries/sql_query_form.lib.php:89
+#: libraries/rte/rte_routines.lib.php:1423 libraries/sql_query_form.lib.php:89
 #: tbl_operations.php:227 tbl_row_action.php:138 view_operations.php:62
 msgid "Your SQL query has been executed successfully."
 msgstr ""
 
 #: libraries/DisplayResults.class.php:4660
-#: libraries/controllers/StructureController.class.php:629
+#: libraries/controllers/DatabaseStructureController.class.php:564
 #, php-format
 msgid ""
 "This view has at least this number of rows. Please refer to %sdocumentation"
@@ -3590,33 +3599,33 @@ msgstr ""
 msgid "%d total"
 msgstr ""
 
-#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1318
+#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1312
 #, php-format
 msgid "Query took %01.4f seconds."
 msgstr ""
 
 #: libraries/DisplayResults.class.php:4807
-#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4767
-#: libraries/Util.class.php:4773 libraries/mult_submits.inc.php:50
-#: templates/structure/check_all_tables.phtml:2
-#: templates/structure/check_all_tables.phtml:9
+#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4773
+#: libraries/Util.class.php:4779 libraries/mult_submits.inc.php:50
+#: templates/database/structure/check_all_tables.phtml:2
+#: templates/database/structure/check_all_tables.phtml:9
 msgid "With selected:"
 msgstr ""
 
 #: libraries/DisplayResults.class.php:4811
-#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4769
-#: libraries/Util.class.php:4770 libraries/server_privileges.lib.php:1174
+#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4775
+#: libraries/Util.class.php:4776 libraries/server_privileges.lib.php:1174
 #: libraries/server_privileges.lib.php:1175
 #: libraries/server_privileges.lib.php:1387
 #: libraries/server_user_groups.lib.php:231
-#: templates/structure/check_all_tables.phtml:3
-#: templates/structure/check_all_tables.phtml:4
+#: templates/database/structure/check_all_tables.phtml:3
+#: templates/database/structure/check_all_tables.phtml:4
 msgid "Check All"
 msgstr ""
 
 #: libraries/DisplayResults.class.php:4985 libraries/Header.class.php:383
-#: templates/structure/optional_action_links.phtml:1
-#: templates/structure/print_view_data_dictionary_link.phtml:3
+#: templates/database/structure/print_view_data_dictionary_link.phtml:3
+#: templates/table/structure/optional_action_links.phtml:1
 msgid "Print view"
 msgstr ""
 
@@ -3624,7 +3633,8 @@ msgstr ""
 msgid "Query results operations"
 msgstr ""
 
-#: libraries/DisplayResults.class.php:5105 templates/tbl_chart.phtml:12
+#: libraries/DisplayResults.class.php:5105
+#: templates/table/chart/tbl_chart.phtml:12
 msgid "Display chart"
 msgstr ""
 
@@ -3713,7 +3723,7 @@ msgid "Click on the bar to scroll to top of page"
 msgstr ""
 
 #: libraries/Header.class.php:749
-#: libraries/plugins/auth/AuthenticationCookie.class.php:152
+#: libraries/plugins/auth/AuthenticationCookie.class.php:140
 msgid "Javascript must be enabled past this point!"
 msgstr ""
 
@@ -3735,11 +3745,11 @@ msgid "Keyname"
 msgstr "Kaainamme"
 
 #: libraries/Index.class.php:697
-#: libraries/controllers/StructureController.class.php:1962
-#: libraries/controllers/StructureController.class.php:1967
+#: libraries/controllers/TableStructureController.class.php:953
+#: libraries/controllers/TableStructureController.class.php:958
 #: libraries/tracking.lib.php:973
 #: templates/columns_definitions/column_indexes.phtml:11
-#: templates/structure/check_all_table_column.phtml:26
+#: templates/table/structure/check_all_table_column.phtml:26
 msgid "Unique"
 msgstr "Unike wearde"
 
@@ -3758,16 +3768,17 @@ msgstr ""
 #: libraries/server_collations.lib.php:35 libraries/tracking.lib.php:881
 #: libraries/tracking.lib.php:977
 #: templates/columns_definitions/table_fields_definitions.phtml:33
-#: templates/structure/row_stats_table.phtml:31
-#: templates/structure/table_header.phtml:55
-#: templates/structure/table_structure_header.phtml:7
-#: templates/table/table_header.phtml:8
+#: templates/database/structure/table_header.phtml:55
+#: templates/table/search/table_header.phtml:8
+#: templates/table/structure/row_stats_table.phtml:31
+#: templates/table/structure/table_structure_header.phtml:7
 msgid "Collation"
 msgstr "Kollaasje"
 
 #: libraries/Index.class.php:703 libraries/rte/rte_events.lib.php:496
-#: libraries/rte/rte_routines.lib.php:956 libraries/tracking.lib.php:885
-#: libraries/tracking.lib.php:979 templates/structure/table_header.phtml:84
+#: libraries/rte/rte_routines.lib.php:1047 libraries/tracking.lib.php:885
+#: libraries/tracking.lib.php:979
+#: templates/database/structure/table_header.phtml:84
 msgid "Comment"
 msgstr "Opmerking"
 
@@ -3780,15 +3791,15 @@ msgstr ""
 msgid "Index %s has been dropped."
 msgstr ""
 
-#: libraries/Index.class.php:757 libraries/Util.class.php:3630
-#: libraries/Util.class.php:3631
-#: libraries/controllers/StructureController.class.php:1958
-#: libraries/controllers/StructureController.class.php:1959
+#: libraries/Index.class.php:757 libraries/Util.class.php:3636
+#: libraries/Util.class.php:3637
+#: libraries/controllers/TableStructureController.class.php:949
+#: libraries/controllers/TableStructureController.class.php:950
 #: libraries/operations.lib.php:1607 libraries/rte/rte_list.lib.php:150
 #: libraries/server_databases.lib.php:146
-#: templates/structure/check_all_table_column.phtml:15
-#: templates/structure/check_all_tables.phtml:16
-#: templates/tbl_relation/foreign_key_row.phtml:93
+#: templates/database/structure/check_all_tables.phtml:16
+#: templates/table/relation/foreign_key_row.phtml:93
+#: templates/table/structure/check_all_table_column.phtml:15
 msgid "Drop"
 msgstr "Fuortsmite"
 
@@ -3817,16 +3828,16 @@ msgstr "Server"
 #: libraries/Menu.class.php:248
 #: libraries/navigation/Nodes/Node_View.class.php:32
 #: libraries/tbl_info.inc.php:63
-#: templates/structure/structure_table_row.phtml:97
-#: templates/structure/structure_table_row.phtml:159
+#: templates/database/structure/structure_table_row.phtml:97
+#: templates/database/structure/structure_table_row.phtml:159
 msgid "View"
 msgstr ""
 
 #: libraries/Menu.class.php:325 libraries/Menu.class.php:429
-#: libraries/Menu.class.php:548 libraries/Util.class.php:3334
-#: libraries/Util.class.php:3344 libraries/Util.class.php:3350
-#: libraries/Util.class.php:4313 libraries/Util.class.php:4328
-#: libraries/Util.class.php:4345 libraries/config.values.php:40
+#: libraries/Menu.class.php:548 libraries/Util.class.php:3340
+#: libraries/Util.class.php:3350 libraries/Util.class.php:3356
+#: libraries/Util.class.php:4319 libraries/Util.class.php:4334
+#: libraries/Util.class.php:4351 libraries/config.values.php:40
 #: libraries/config.values.php:48 libraries/config.values.php:110
 #: libraries/config.values.php:116 libraries/config/messages.inc.php:321
 #: libraries/navigation/Nodes/Node_Table.class.php:292
@@ -3834,19 +3845,19 @@ msgid "SQL"
 msgstr "SQL"
 
 #: libraries/Menu.class.php:328 libraries/Menu.class.php:432
-#: libraries/Util.class.php:3335 libraries/Util.class.php:3345
-#: libraries/Util.class.php:3351 libraries/Util.class.php:3625
-#: libraries/Util.class.php:3626 libraries/Util.class.php:4329
-#: libraries/Util.class.php:4346 libraries/config.values.php:41
+#: libraries/Util.class.php:3341 libraries/Util.class.php:3351
+#: libraries/Util.class.php:3357 libraries/Util.class.php:3631
+#: libraries/Util.class.php:3632 libraries/Util.class.php:4335
+#: libraries/Util.class.php:4352 libraries/config.values.php:41
 #: libraries/config.values.php:49 libraries/config.values.php:111
 #: libraries/config.values.php:117
 #: libraries/navigation/Nodes/Node_Table.class.php:286
 msgid "Search"
 msgstr "Sykje"
 
-#: libraries/Menu.class.php:338 libraries/Util.class.php:3336
-#: libraries/Util.class.php:3346 libraries/Util.class.php:3627
-#: libraries/Util.class.php:3628 libraries/Util.class.php:4347
+#: libraries/Menu.class.php:338 libraries/Util.class.php:3342
+#: libraries/Util.class.php:3352 libraries/Util.class.php:3633
+#: libraries/Util.class.php:3634 libraries/Util.class.php:4353
 #: libraries/config.values.php:42 libraries/config.values.php:50
 #: libraries/config.values.php:118
 #: libraries/navigation/Nodes/Node_Table.class.php:289
@@ -3855,30 +3866,30 @@ msgid "Insert"
 msgstr "Ynfoegje"
 
 #: libraries/Menu.class.php:362 libraries/Menu.class.php:467
-#: libraries/Util.class.php:4334 libraries/Util.class.php:4350
+#: libraries/Util.class.php:4340 libraries/Util.class.php:4356
 #: libraries/config.values.php:106 libraries/server_common.lib.php:51
 #: libraries/server_privileges.lib.php:2370
 #: libraries/server_privileges.lib.php:3158
-#: libraries/server_privileges.lib.php:4221
+#: libraries/server_privileges.lib.php:4247
 msgid "Privileges"
 msgstr "Rjochten"
 
 #: libraries/Menu.class.php:371 libraries/Menu.class.php:379
-#: libraries/Menu.class.php:459 libraries/Util.class.php:3338
-#: libraries/Util.class.php:3352 libraries/Util.class.php:4333
-#: libraries/Util.class.php:4351 libraries/config.values.php:112
+#: libraries/Menu.class.php:459 libraries/Util.class.php:3344
+#: libraries/Util.class.php:3358 libraries/Util.class.php:4339
+#: libraries/Util.class.php:4357 libraries/config.values.php:112
 #: view_operations.php:92
 msgid "Operations"
 msgstr "Hannelingen"
 
 #: libraries/Menu.class.php:384 libraries/Menu.class.php:492
-#: libraries/Util.class.php:4338 libraries/Util.class.php:4352
+#: libraries/Util.class.php:4344 libraries/Util.class.php:4358
 #: libraries/relation.lib.php:255
 msgid "Tracking"
 msgstr "Trasearje"
 
 #: libraries/Menu.class.php:397 libraries/Menu.class.php:486
-#: libraries/Util.class.php:4337 libraries/Util.class.php:4353
+#: libraries/Util.class.php:4343 libraries/Util.class.php:4359
 #: libraries/navigation/Nodes/Node_Trigger_Container.class.php:24
 #: libraries/plugins/export/ExportHtmlword.class.php:557
 #: libraries/plugins/export/ExportOdt.class.php:685
@@ -3895,16 +3906,16 @@ msgstr "Triggers"
 msgid "Database seems to be empty!"
 msgstr ""
 
-#: libraries/Menu.class.php:439 libraries/Util.class.php:4330
+#: libraries/Menu.class.php:439 libraries/Util.class.php:4336
 msgid "Query"
 msgstr "Query"
 
-#: libraries/Menu.class.php:472 libraries/Util.class.php:4335
+#: libraries/Menu.class.php:472 libraries/Util.class.php:4341
 #: libraries/rte/rte_words.lib.php:36
 msgid "Routines"
 msgstr "Routines"
 
-#: libraries/Menu.class.php:479 libraries/Util.class.php:4336
+#: libraries/Menu.class.php:479 libraries/Util.class.php:4342
 #: libraries/navigation/Nodes/Node_Event_Container.class.php:26
 #: libraries/plugins/export/ExportSql.class.php:940
 #: libraries/plugins/export/ExportXml.class.php:107
@@ -3912,20 +3923,20 @@ msgstr "Routines"
 msgid "Events"
 msgstr "Barrens"
 
-#: libraries/Menu.class.php:498 libraries/Util.class.php:4339
+#: libraries/Menu.class.php:498 libraries/Util.class.php:4345
 msgid "Designer"
 msgstr "Untwerper"
 
-#: libraries/Menu.class.php:507 libraries/Util.class.php:4340
-#: templates/structure/check_all_tables.phtml:35
+#: libraries/Menu.class.php:507 libraries/Util.class.php:4346
+#: templates/database/structure/check_all_tables.phtml:35
 msgid "Central columns"
 msgstr ""
 
-#: libraries/Menu.class.php:544 libraries/Util.class.php:4312
+#: libraries/Menu.class.php:544 libraries/Util.class.php:4318
 #: libraries/config.values.php:103 libraries/config/messages.inc.php:266
 #: libraries/config/messages.inc.php:341
 #: libraries/navigation/NavigationTree.class.php:1239
-#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4332
+#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4358
 msgid "Databases"
 msgstr "Databases"
 
@@ -3936,34 +3947,34 @@ msgid "User accounts"
 msgstr "Brûkersgroepen"
 
 #: libraries/Menu.class.php:595 libraries/ServerStatusData.class.php:121
-#: libraries/Util.class.php:4319 libraries/server_common.lib.php:36
+#: libraries/Util.class.php:4325 libraries/server_common.lib.php:36
 msgid "Binary log"
 msgstr ""
 
 #: libraries/Menu.class.php:601 libraries/ServerStatusData.class.php:126
-#: libraries/Util.class.php:4320 libraries/server_common.lib.php:42
-#: templates/structure/body_for_table_summary.phtml:10
-#: templates/structure/table_header.phtml:27
+#: libraries/Util.class.php:4326 libraries/server_common.lib.php:42
+#: templates/database/structure/body_for_table_summary.phtml:10
+#: templates/database/structure/table_header.phtml:27
 msgid "Replication"
 msgstr "Replikaasje"
 
 #: libraries/Menu.class.php:606 libraries/ServerStatusData.class.php:193
-#: libraries/Util.class.php:4321 libraries/config.values.php:105
+#: libraries/Util.class.php:4327 libraries/config.values.php:105
 #: libraries/server_engines.lib.php:108 libraries/server_engines.lib.php:112
 #: libraries/sql_query_form.lib.php:421
 msgid "Variables"
 msgstr "Fariabelen"
 
-#: libraries/Menu.class.php:610 libraries/Util.class.php:4322
+#: libraries/Menu.class.php:610 libraries/Util.class.php:4328
 msgid "Charsets"
 msgstr "Karaktersets"
 
-#: libraries/Menu.class.php:615 libraries/Util.class.php:4323
+#: libraries/Menu.class.php:615 libraries/Util.class.php:4329
 #: libraries/server_common.lib.php:33 libraries/server_plugins.lib.php:27
 msgid "Plugins"
 msgstr ""
 
-#: libraries/Menu.class.php:626 libraries/Util.class.php:4324
+#: libraries/Menu.class.php:626 libraries/Util.class.php:4330
 msgid "Engines"
 msgstr ""
 
@@ -3988,7 +3999,7 @@ msgid_plural "%1$d rows inserted."
 msgstr[0] ""
 msgstr[1] ""
 
-#: libraries/PDF.class.php:70 libraries/Util.class.php:2521
+#: libraries/PDF.class.php:70 libraries/Util.class.php:2527
 #: libraries/browse_foreigners.lib.php:327
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:865
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:890
@@ -4009,7 +4020,7 @@ msgid "Could not save favorite table!"
 msgstr ""
 
 #: libraries/RecentFavoriteTable.class.php:212
-#: templates/structure/favorite_anchor.phtml:12
+#: templates/database/structure/favorite_anchor.phtml:12
 msgid "Remove from Favorites"
 msgstr ""
 
@@ -4174,7 +4185,7 @@ msgid ""
 msgstr ""
 
 #: libraries/StorageEngine.class.php:373
-#: templates/structure/body_for_table_summary.phtml:50
+#: templates/database/structure/body_for_table_summary.phtml:50
 #, php-format
 msgid "%s is the default storage engine on this MySQL server."
 msgstr ""
@@ -4586,10 +4597,10 @@ msgstr ""
 
 #: libraries/Util.class.php:726 libraries/rte/rte_events.lib.php:110
 #: libraries/rte/rte_events.lib.php:119 libraries/rte/rte_events.lib.php:150
-#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:153
-#: libraries/rte/rte_routines.lib.php:162
-#: libraries/rte/rte_routines.lib.php:235
-#: libraries/rte/rte_routines.lib.php:1366
+#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:223
+#: libraries/rte/rte_routines.lib.php:250
+#: libraries/rte/rte_routines.lib.php:372
+#: libraries/rte/rte_routines.lib.php:1457
 #: libraries/rte/rte_triggers.lib.php:86 libraries/rte/rte_triggers.lib.php:95
 #: libraries/rte/rte_triggers.lib.php:127
 msgid "MySQL said: "
@@ -4635,75 +4646,78 @@ msgstr "si"
 msgid "%B %d, %Y at %I:%M %p"
 msgstr ""
 
-#: libraries/Util.class.php:2019
+#: libraries/Util.class.php:2025
 #, php-format
 msgid "%s days, %s hours, %s minutes and %s seconds"
 msgstr "%s dagen, %s oeren, %s minuten en %s sekonden"
 
-#: libraries/Util.class.php:2112
+#: libraries/Util.class.php:2118
 msgid "Missing parameter:"
 msgstr ""
 
-#: libraries/Util.class.php:2645
+#: libraries/Util.class.php:2651
 #, php-format
 msgid "Jump to database \"%s\"."
 msgstr ""
 
-#: libraries/Util.class.php:2670
+#: libraries/Util.class.php:2676
 #, php-format
 msgid "The %s functionality is affected by a known bug, see %s"
 msgstr ""
 
-#: libraries/Util.class.php:2881
+#: libraries/Util.class.php:2887
 msgid "Click to toggle"
 msgstr ""
 
-#: libraries/Util.class.php:3542 prefs_manage.php:248
+#: libraries/Util.class.php:3548 prefs_manage.php:248
 msgid "Browse your computer:"
 msgstr ""
 
-#: libraries/Util.class.php:3567
+#: libraries/Util.class.php:3573
 #, php-format
 msgid "Select from the web server upload directory <b>%s</b>:"
 msgstr ""
 
-#: libraries/Util.class.php:3596 libraries/insert_edit.lib.php:1173
+#: libraries/Util.class.php:3602 libraries/insert_edit.lib.php:1171
 msgid "The directory you set for upload work cannot be reached."
 msgstr ""
 
-#: libraries/Util.class.php:3607
+#: libraries/Util.class.php:3613
 msgid "There are no files to upload!"
 msgstr ""
 
-#: libraries/Util.class.php:3632 libraries/Util.class.php:3633
-#: templates/structure/check_all_tables.phtml:15
+#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: templates/database/structure/check_all_tables.phtml:15
 msgid "Empty"
 msgstr "Leegje"
 
-#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: libraries/Util.class.php:3644 libraries/Util.class.php:3645
 msgid "Execute"
 msgstr ""
 
-#: libraries/Util.class.php:4152
+#: libraries/Util.class.php:4158
 msgid "Print"
 msgstr ""
 
-#: libraries/Util.class.php:4257 templates/structure/row_stats_table.phtml:80
-#: templates/structure/table_header.phtml:95
+#: libraries/Util.class.php:4263
+#: templates/database/structure/table_header.phtml:95
+#: templates/table/structure/row_stats_table.phtml:80
 msgid "Creation"
 msgstr ""
 
-#: libraries/Util.class.php:4263 templates/structure/row_stats_table.phtml:87
-#: templates/structure/table_header.phtml:106
+#: libraries/Util.class.php:4269
+#: templates/database/structure/table_header.phtml:106
+#: templates/table/structure/row_stats_table.phtml:87
 msgid "Last update"
 msgstr ""
 
-#: libraries/Util.class.php:4269 templates/structure/row_stats_table.phtml:94
-#: templates/structure/table_header.phtml:117
+#: libraries/Util.class.php:4275
+#: templates/database/structure/table_header.phtml:117
+#: templates/table/structure/row_stats_table.phtml:94
 msgid "Last check"
 msgstr ""
 
-#: libraries/Util.class.php:4315
+#: libraries/Util.class.php:4321
 msgid "Users"
 msgstr "Brûkers"
 
@@ -4724,16 +4738,16 @@ msgid "Use this value"
 msgstr ""
 
 #: libraries/build_html_for_db.lib.php:33 libraries/import.lib.php:193
-#: templates/structure/actions_in_table_structure.phtml:113
-#: templates/structure/row_stats_table.phtml:42
-#: templates/structure/table_header.phtml:36
+#: templates/database/structure/table_header.phtml:36
+#: templates/table/structure/actions_in_table_structure.phtml:113
+#: templates/table/structure/row_stats_table.phtml:42
 msgid "Rows"
 msgstr "Rigen"
 
 #: libraries/build_html_for_db.lib.php:48 libraries/engines/innodb.lib.php:171
-#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:186
-#: libraries/server_status.lib.php:298
-#: templates/structure/display_table_stats.phtml:40
+#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:195
+#: libraries/server_status.lib.php:307
+#: templates/table/structure/display_table_stats.phtml:40
 msgid "Total"
 msgstr "Totaal"
 
@@ -4742,10 +4756,12 @@ msgid "Jump to database"
 msgstr ""
 
 #: libraries/build_html_for_db.lib.php:146
+#: templates/database/structure/structure_table_row.phtml:15
 msgid "Not replicated"
 msgstr ""
 
 #: libraries/build_html_for_db.lib.php:158
+#: templates/database/structure/structure_table_row.phtml:16
 msgid "Replicated"
 msgstr ""
 
@@ -4798,17 +4814,17 @@ msgstr "NEE"
 #: libraries/plugins/export/ExportTexytext.class.php:425
 #: libraries/plugins/export/PMA_ExportPdf.class.php:307
 #: libraries/rte/rte_list.lib.php:73 libraries/rte/rte_list.lib.php:85
-#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:830
-#: libraries/rte/rte_routines.lib.php:1492 setup/frames/index.inc.php:162
+#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:921
+#: libraries/rte/rte_routines.lib.php:1583 setup/frames/index.inc.php:162
 #: templates/columns_definitions/table_fields_definitions.phtml:8
-#: templates/structure/table_structure_header.phtml:5
-#: templates/table/create_table.phtml:11
+#: templates/database/create_table.phtml:11
+#: templates/table/structure/table_structure_header.phtml:5
 msgid "Name"
 msgstr "Namme"
 
 #: libraries/central_columns.lib.php:699
 #: libraries/central_columns.lib.php:1381
-#: libraries/rte/rte_routines.lib.php:832
+#: libraries/rte/rte_routines.lib.php:923
 #: templates/columns_definitions/table_fields_definitions.phtml:14
 msgid "Length/Values"
 msgstr ""
@@ -4829,7 +4845,7 @@ msgid "Select a table"
 msgstr ""
 
 #: libraries/central_columns.lib.php:804
-#: templates/structure/add_column.phtml:4
+#: templates/table/structure/add_column.phtml:4
 msgid "Add column"
 msgstr "Kolom tafoegje"
 
@@ -4845,7 +4861,7 @@ msgstr "Nije kolom tafoegje"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1002
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1025
 #: templates/columns_definitions/table_fields_definitions.phtml:36
-#: templates/structure/table_structure_header.phtml:8
+#: templates/table/structure/table_structure_header.phtml:8
 msgid "Attributes"
 msgstr "Attributen"
 
@@ -4954,7 +4970,7 @@ msgid "Double click"
 msgstr "Dûbelklik"
 
 #: libraries/config.values.php:95 libraries/config.values.php:124
-#: libraries/config/FormDisplay.tpl.php:221 libraries/relation.lib.php:97
+#: libraries/config/FormDisplay.tpl.php:232 libraries/relation.lib.php:97
 #: libraries/relation.lib.php:105
 msgid "Disabled"
 msgstr "Utskeakele"
@@ -5134,21 +5150,21 @@ msgstr ""
 msgid "maximum %s"
 msgstr "maksimum %s"
 
-#: libraries/config/FormDisplay.tpl.php:219
+#: libraries/config/FormDisplay.tpl.php:230
 msgid "This setting is disabled, it will not be applied to your configuration."
 msgstr ""
 
-#: libraries/config/FormDisplay.tpl.php:313
+#: libraries/config/FormDisplay.tpl.php:324
 #, php-format
 msgid "Set value: %s"
 msgstr ""
 
-#: libraries/config/FormDisplay.tpl.php:318
+#: libraries/config/FormDisplay.tpl.php:329
 #: libraries/config/messages.inc.php:610
 msgid "Restore default value"
 msgstr ""
 
-#: libraries/config/FormDisplay.tpl.php:332
+#: libraries/config/FormDisplay.tpl.php:343
 msgid "Allow users to customize this value"
 msgstr ""
 
@@ -5566,7 +5582,7 @@ msgstr ""
 
 #: libraries/config/messages.inc.php:136 libraries/config/messages.inc.php:152
 #: libraries/sql_query_form.lib.php:247
-#: templates/structure/row_stats_table.phtml:7
+#: templates/table/structure/row_stats_table.phtml:7
 msgid "Format"
 msgstr "Opmaak"
 
@@ -6065,7 +6081,7 @@ msgstr ""
 
 #: libraries/config/messages.inc.php:332
 #: libraries/plugins/export/ExportPdf.class.php:279
-#: templates/structure/secondary_tabs.phtml:8
+#: templates/table/secondary_tabs.phtml:8
 msgid "Table structure"
 msgstr "Tabelstruktuer"
 
@@ -7579,101 +7595,33 @@ msgstr "Microsoft Word 2000"
 msgid "OpenDocument Text"
 msgstr "OpenDocument-tekst"
 
-#: libraries/controllers/StructureController.class.php:465
+#: libraries/controllers/DatabaseStructureController.class.php:405
 #: tbl_operations.php:382
 #, php-format
 msgid "Table %s has been emptied."
 msgstr ""
 
-#: libraries/controllers/StructureController.class.php:486
+#: libraries/controllers/DatabaseStructureController.class.php:426
 #: tbl_operations.php:400 view_operations.php:119
 #, php-format
 msgid "View %s has been dropped."
 msgstr ""
 
-#: libraries/controllers/StructureController.class.php:487
+#: libraries/controllers/DatabaseStructureController.class.php:427
 #: tbl_operations.php:401
 #, php-format
 msgid "Table %s has been dropped."
 msgstr ""
 
-#: libraries/controllers/StructureController.class.php:797
-#, php-format
-msgid "The name '%s' is a MySQL reserved keyword."
-msgid_plural "The names '%s' are MySQL reserved keywords."
-msgstr[0] ""
-msgstr[1] ""
-
-#: libraries/controllers/StructureController.class.php:875
-msgid "No column selected."
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1049
+#: libraries/controllers/DatabaseStructureController.class.php:733
 msgid "Favorite List is full!"
 msgstr ""
 
-#: libraries/controllers/StructureController.class.php:1272
-msgid "The columns have been moved successfully."
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1535
-#, php-format
-msgid ""
-"Table %1$s has been altered successfully. Privileges have been adjusted."
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1541
-#: libraries/controllers/TableIndexesController.class.php:161
-#: tbl_addfield.php:92
-#, php-format
-msgid "Table %1$s has been altered successfully."
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1588
-#: libraries/tracking.lib.php:1094
-msgid "Query error"
-msgstr "Queryflater"
-
-#: libraries/controllers/StructureController.class.php:1806
+#: libraries/controllers/DatabaseStructureController.class.php:947
 #: libraries/mysql_charsets.lib.php:366 libraries/mysql_charsets.lib.php:373
 msgid "unknown"
 msgstr "ûnbekend"
 
-#: libraries/controllers/StructureController.class.php:1957
-#: templates/structure/check_all_table_column.phtml:11
-msgid "Change"
-msgstr "Feroarje"
-
-#: libraries/controllers/StructureController.class.php:1961
-#: libraries/controllers/StructureController.class.php:1966
-#: libraries/navigation/Nodes/Node_Index.class.php:30
-#: libraries/tracking.lib.php:926
-#: templates/columns_definitions/column_indexes.phtml:16
-#: templates/columns_definitions/table_fields_definitions.phtml:57
-#: templates/structure/check_all_table_column.phtml:30
-#: templates/structure/display_structure.phtml:79
-#: templates/structure/display_table_stats.phtml:19
-msgid "Index"
-msgstr "Yndeks"
-
-#: libraries/controllers/StructureController.class.php:1963
-#: libraries/controllers/StructureController.class.php:1968
-#: templates/columns_definitions/column_indexes.phtml:27
-#: templates/structure/check_all_table_column.phtml:37
-msgid "Spatial"
-msgstr "Romtlik"
-
-#: libraries/controllers/StructureController.class.php:1964
-#: libraries/controllers/StructureController.class.php:1969
-#: templates/columns_definitions/column_indexes.phtml:22
-#: templates/structure/check_all_table_column.phtml:47
-msgid "Fulltext"
-msgstr "Folsleine tekst"
-
-#: libraries/controllers/StructureController.class.php:1970
-msgid "Distinct values"
-msgstr "Underskiedbere wearden"
-
 #: libraries/controllers/TableChartController.class.php:82
 #: libraries/controllers/TableGisVisualizationController.class.php:101
 msgid "No SQL query was set to fetch data."
@@ -7687,11 +7635,18 @@ msgstr ""
 msgid "No data to display"
 msgstr ""
 
-#: libraries/controllers/TableRelationController.class.php:217
+#: libraries/controllers/TableIndexesController.class.php:161
+#: libraries/controllers/TableStructureController.class.php:736
+#: tbl_addfield.php:92
+#, php-format
+msgid "Table %1$s has been altered successfully."
+msgstr ""
+
+#: libraries/controllers/TableRelationController.class.php:218
 msgid "Display column was successfully updated."
 msgstr ""
 
-#: libraries/controllers/TableRelationController.class.php:283
+#: libraries/controllers/TableRelationController.class.php:288
 msgid "Internal relations were successfully updated."
 msgstr ""
 
@@ -7706,10 +7661,71 @@ msgid "Zoom search"
 msgstr ""
 
 #: libraries/controllers/TableSearchController.class.php:852
-#: templates/table/selection_form.phtml:59
+#: templates/table/search/selection_form.phtml:59
 msgid "Find and replace"
 msgstr ""
 
+#: libraries/controllers/TableStructureController.class.php:163
+#, php-format
+msgid "The name '%s' is a MySQL reserved keyword."
+msgid_plural "The names '%s' are MySQL reserved keywords."
+msgstr[0] ""
+msgstr[1] ""
+
+#: libraries/controllers/TableStructureController.class.php:241
+msgid "No column selected."
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:467
+msgid "The columns have been moved successfully."
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:730
+#, php-format
+msgid ""
+"Table %1$s has been altered successfully. Privileges have been adjusted."
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:783
+#: libraries/tracking.lib.php:1094
+msgid "Query error"
+msgstr "Queryflater"
+
+#: libraries/controllers/TableStructureController.class.php:948
+#: templates/table/structure/check_all_table_column.phtml:11
+msgid "Change"
+msgstr "Feroarje"
+
+#: libraries/controllers/TableStructureController.class.php:952
+#: libraries/controllers/TableStructureController.class.php:957
+#: libraries/navigation/Nodes/Node_Index.class.php:30
+#: libraries/tracking.lib.php:926
+#: templates/columns_definitions/column_indexes.phtml:16
+#: templates/columns_definitions/table_fields_definitions.phtml:57
+#: templates/table/structure/check_all_table_column.phtml:30
+#: templates/table/structure/display_structure.phtml:79
+#: templates/table/structure/display_table_stats.phtml:19
+msgid "Index"
+msgstr "Yndeks"
+
+#: libraries/controllers/TableStructureController.class.php:954
+#: libraries/controllers/TableStructureController.class.php:959
+#: templates/columns_definitions/column_indexes.phtml:27
+#: templates/table/structure/check_all_table_column.phtml:37
+msgid "Spatial"
+msgstr "Romtlik"
+
+#: libraries/controllers/TableStructureController.class.php:955
+#: libraries/controllers/TableStructureController.class.php:960
+#: templates/columns_definitions/column_indexes.phtml:22
+#: templates/table/structure/check_all_table_column.phtml:47
+msgid "Fulltext"
+msgstr "Folsleine tekst"
+
+#: libraries/controllers/TableStructureController.class.php:963
+msgid "Distinct values"
+msgstr "Underskiedbere wearden"
+
 #: libraries/core.lib.php:306
 #, php-format
 msgid "The %s extension is missing. Please check your PHP configuration."
@@ -7754,7 +7770,7 @@ msgid "No Password"
 msgstr "Gjin wachtwurd"
 
 #: libraries/display_change_password.lib.php:68
-#: libraries/plugins/auth/AuthenticationCookie.class.php:199
+#: libraries/plugins/auth/AuthenticationCookie.class.php:187
 #: libraries/replication_gui.lib.php:422 libraries/replication_gui.lib.php:862
 #: libraries/server_privileges.lib.php:1640
 msgid "Password:"
@@ -8488,12 +8504,12 @@ msgid "Dump has been saved to file %s."
 msgstr ""
 
 #: libraries/import.lib.php:202 libraries/insert_edit.lib.php:124
-#: libraries/rte/rte_routines.lib.php:1353 libraries/sql.lib.php:1312
+#: libraries/rte/rte_routines.lib.php:1444 libraries/sql.lib.php:1306
 #: tbl_get_field.php:44
 msgid "MySQL returned an empty result set (i.e. zero rows)."
 msgstr ""
 
-#: libraries/import.lib.php:265 libraries/sql.lib.php:1326
+#: libraries/import.lib.php:265 libraries/sql.lib.php:1320
 msgid "[ROLLBACK occurred.]"
 msgstr ""
 
@@ -8557,14 +8573,14 @@ msgstr ""
 
 #: libraries/insert_edit.lib.php:233
 #: libraries/navigation/Nodes/Node_DatabaseChild.class.php:48
-#: templates/designer/table_list.phtml:40
+#: templates/database/designer/table_list.phtml:40
 msgid "Hide"
 msgstr "Ferbergje"
 
 #: libraries/insert_edit.lib.php:249
 #: libraries/navigation/Nodes/Node_Function.class.php:32
-#: libraries/rte/rte_routines.lib.php:1495
-#: templates/table/table_header.phtml:4
+#: libraries/rte/rte_routines.lib.php:1586
+#: templates/table/search/table_header.phtml:4
 msgid "Function"
 msgstr "Funksje"
 
@@ -8577,82 +8593,83 @@ msgstr "Binêr"
 msgid "Because of its length,<br /> this column might not be editable."
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1050
+#: libraries/insert_edit.lib.php:1048
 msgid "Binary - do not edit"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1176 libraries/server_privileges.lib.php:470
-#: templates/table/options.phtml:36
+#: libraries/insert_edit.lib.php:1174 libraries/server_privileges.lib.php:470
+#: templates/table/search/options.phtml:36
 msgid "Or"
 msgstr "Of"
 
-#: libraries/insert_edit.lib.php:1177
+#: libraries/insert_edit.lib.php:1175
 msgid "web server upload directory:"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1348 templates/table/input_box.phtml:49
+#: libraries/insert_edit.lib.php:1346
+#: templates/table/search/input_box.phtml:49
 msgid "Edit/Insert"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1398
+#: libraries/insert_edit.lib.php:1396
 #, php-format
 msgid "Continue insertion with %s rows"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1428
+#: libraries/insert_edit.lib.php:1426
 msgid "and then"
 msgstr "en dan"
 
-#: libraries/insert_edit.lib.php:1461
+#: libraries/insert_edit.lib.php:1459
 msgid "Insert as new row"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1464
+#: libraries/insert_edit.lib.php:1462
 msgid "Insert as new row and ignore errors"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1467
+#: libraries/insert_edit.lib.php:1465
 msgid "Show insert query"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1487
+#: libraries/insert_edit.lib.php:1485
 msgid "Go back to previous page"
 msgstr "Werom"
 
-#: libraries/insert_edit.lib.php:1490
+#: libraries/insert_edit.lib.php:1488
 msgid "Insert another new row"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1495
+#: libraries/insert_edit.lib.php:1493
 msgid "Go back to this page"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1518
+#: libraries/insert_edit.lib.php:1516
 msgid "Edit next row"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1540
+#: libraries/insert_edit.lib.php:1538
 msgid ""
 "Use TAB key to move from value to value, or CTRL+arrows to move anywhere"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1577 libraries/replication_gui.lib.php:542
-#: libraries/rte/rte_routines.lib.php:1497
+#: libraries/insert_edit.lib.php:1575 libraries/replication_gui.lib.php:542
+#: libraries/rte/rte_routines.lib.php:1588
 #: libraries/server_status_variables.lib.php:220
-#: templates/designer/having_query_panel.phtml:100
-#: templates/designer/options_panel.phtml:73
-#: templates/designer/options_panel.phtml:239
-#: templates/designer/where_query_panel.phtml:69
-#: templates/table/table_header.phtml:10
-#: templates/table/zoom_result_form.phtml:35
+#: templates/database/designer/having_query_panel.phtml:100
+#: templates/database/designer/options_panel.phtml:73
+#: templates/database/designer/options_panel.phtml:239
+#: templates/database/designer/where_query_panel.phtml:69
+#: templates/table/search/table_header.phtml:10
+#: templates/table/search/zoom_result_form.phtml:35
 msgid "Value"
 msgstr "Wearde"
 
-#: libraries/insert_edit.lib.php:1937 libraries/sql.lib.php:1309
+#: libraries/insert_edit.lib.php:1935 libraries/sql.lib.php:1303
 msgid "Showing SQL query"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1962 libraries/sql.lib.php:1287
+#: libraries/insert_edit.lib.php:1960 libraries/sql.lib.php:1281
 #, php-format
 msgid "Inserted row id: %1$d"
 msgstr ""
@@ -9065,7 +9082,7 @@ msgstr "Nij"
 #: libraries/navigation/Nodes/Node_View_Container.class.php:26
 #: libraries/navigation/Nodes/Node_View_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:129
-#: templates/structure/show_create.phtml:30
+#: templates/database/structure/show_create.phtml:30
 msgid "Views"
 msgstr ""
 
@@ -9351,7 +9368,7 @@ msgstr ""
 
 #: libraries/operations.lib.php:101 libraries/operations.lib.php:249
 #: libraries/operations.lib.php:869 libraries/operations.lib.php:963
-#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:907
+#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:998
 #: templates/columns_definitions/table_fields_definitions.phtml:47
 #, fuzzy
 #| msgid "Edit Privileges"
@@ -9443,22 +9460,22 @@ msgid "Switch to copied table"
 msgstr ""
 
 #: libraries/operations.lib.php:1360
-#: templates/structure/check_all_tables.phtml:18
+#: templates/database/structure/check_all_tables.phtml:18
 msgid "Table maintenance"
 msgstr "Tabelûnderhâld"
 
 #: libraries/operations.lib.php:1398
-#: templates/structure/check_all_tables.phtml:19
+#: templates/database/structure/check_all_tables.phtml:19
 msgid "Analyze table"
 msgstr ""
 
 #: libraries/operations.lib.php:1413
-#: templates/structure/check_all_tables.phtml:20
+#: templates/database/structure/check_all_tables.phtml:20
 msgid "Check table"
 msgstr ""
 
 #: libraries/operations.lib.php:1428
-#: templates/structure/check_all_tables.phtml:22
+#: templates/database/structure/check_all_tables.phtml:22
 #, fuzzy
 #| msgid "Users table"
 msgid "Checksum table"
@@ -9478,18 +9495,19 @@ msgid "Flush the table (FLUSH)"
 msgstr ""
 
 #: libraries/operations.lib.php:1477
-#: templates/structure/check_all_tables.phtml:23
-#: templates/structure/display_table_stats.phtml:56
+#: templates/database/structure/check_all_tables.phtml:23
+#: templates/table/structure/display_table_stats.phtml:56
 msgid "Optimize table"
 msgstr "Tabel optimalisearje"
 
 #: libraries/operations.lib.php:1492
-#: templates/structure/check_all_tables.phtml:24
+#: templates/database/structure/check_all_tables.phtml:24
 msgid "Repair table"
 msgstr "Reparearje tabel"
 
 #: libraries/operations.lib.php:1538
-#: templates/structure/check_all_tables.phtml:14 view_operations.php:127
+#: templates/database/structure/check_all_tables.phtml:14
+#: view_operations.php:127
 msgid "Delete data or table"
 msgstr ""
 
@@ -9612,7 +9630,7 @@ msgid "Cannot connect: invalid settings."
 msgstr ""
 
 #: libraries/plugins/auth/AuthenticationConfig.class.php:108
-#: libraries/plugins/auth/AuthenticationCookie.class.php:134
+#: libraries/plugins/auth/AuthenticationCookie.class.php:122
 #: libraries/plugins/auth/AuthenticationHttp.class.php:96
 #, php-format
 msgid "Welcome to %s"
@@ -9637,36 +9655,36 @@ msgstr ""
 msgid "Retry to connect"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:146
+#: libraries/plugins/auth/AuthenticationCookie.class.php:134
 msgid "Your session has expired. Please log in again."
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:170
+#: libraries/plugins/auth/AuthenticationCookie.class.php:158
 msgid "Log in"
 msgstr "Oanmelde"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:178
-#: libraries/plugins/auth/AuthenticationCookie.class.php:188
+#: libraries/plugins/auth/AuthenticationCookie.class.php:166
+#: libraries/plugins/auth/AuthenticationCookie.class.php:176
 msgid "You can enter hostname/IP address and port separated by space."
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:193
+#: libraries/plugins/auth/AuthenticationCookie.class.php:181
 msgid "Username:"
 msgstr "Brûkersnamme:"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:205
+#: libraries/plugins/auth/AuthenticationCookie.class.php:193
 msgid "Server Choice:"
 msgstr "Serverkar:"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:386
+#: libraries/plugins/auth/AuthenticationCookie.class.php:374
 msgid "Entered captcha is wrong, try again!"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:396
+#: libraries/plugins/auth/AuthenticationCookie.class.php:384
 msgid "Please enter correct captcha!"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:423
+#: libraries/plugins/auth/AuthenticationCookie.class.php:411
 msgid "You are not allowed to log in to this MySQL server!"
 msgstr ""
 
@@ -9762,7 +9780,7 @@ msgstr "Barren"
 #: libraries/plugins/export/ExportOdt.class.php:593
 #: libraries/plugins/export/ExportTexytext.class.php:428
 #: libraries/plugins/export/PMA_ExportPdf.class.php:313
-#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:984
 #: libraries/rte/rte_triggers.lib.php:377
 msgid "Definition"
 msgstr "Definysje"
@@ -10067,7 +10085,7 @@ msgid "Last check:"
 msgstr ""
 
 #: libraries/plugins/export/ExportSql.class.php:1399
-#: templates/structure/structure_table_row.phtml:183
+#: templates/database/structure/structure_table_row.phtml:183
 msgid "in use"
 msgstr ""
 
@@ -10247,18 +10265,14 @@ msgstr ""
 msgid "The imported file does not contain any data!"
 msgstr ""
 
-#: libraries/plugins/import/ImportSql.class.php:169
+#: libraries/plugins/import/ImportSql.class.php:72
 msgid "SQL compatibility mode:"
 msgstr "SQL-kompatibiliteitsmoadus:"
 
-#: libraries/plugins/import/ImportSql.class.php:181
+#: libraries/plugins/import/ImportSql.class.php:84
 msgid "Do not use <code>AUTO_INCREMENT</code> for zero values"
 msgstr ""
 
-#: libraries/plugins/import/ImportSql.class.php:195
-msgid "Read as multibytes"
-msgstr ""
-
 #: libraries/plugins/import/ImportXml.class.php:54
 msgid "XML"
 msgstr "XML"
@@ -10303,7 +10317,7 @@ msgid "Show grid"
 msgstr ""
 
 #: libraries/plugins/schema/SchemaPdf.class.php:94
-#: templates/structure/print_view_data_dictionary_link.phtml:6
+#: templates/database/structure/print_view_data_dictionary_link.phtml:6
 msgid "Data Dictionary"
 msgstr ""
 
@@ -10334,7 +10348,7 @@ msgid "The %s table doesn't exist!"
 msgstr ""
 
 #: libraries/plugins/schema/eps/Eps_Relation_Schema.class.php:321
-#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:309
+#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:323
 #, php-format
 msgid "Schema of the %s database - Page %s"
 msgstr ""
@@ -10360,7 +10374,7 @@ msgstr "Ynhâldsopjefte"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1005
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1028
 #: libraries/tracking.lib.php:884
-#: templates/structure/table_structure_header.phtml:11
+#: templates/table/structure/table_structure_header.phtml:11
 msgid "Extra"
 msgstr "Ekstra"
 
@@ -10665,51 +10679,51 @@ msgstr ""
 msgid "Create the needed tables with the <code>%screate_tables.sql</code>."
 msgstr ""
 
-#: libraries/relation.lib.php:360
+#: libraries/relation.lib.php:357
 msgid "Create a pma user and give access to these tables."
 msgstr ""
 
-#: libraries/relation.lib.php:365
+#: libraries/relation.lib.php:360
 msgid ""
 "Enable advanced features in configuration file (<code>config.inc.php</"
 "code>), for example by starting from <code>config.sample.inc.php</code>."
 msgstr ""
 
-#: libraries/relation.lib.php:373
+#: libraries/relation.lib.php:365
 msgid "Re-login to phpMyAdmin to load the updated configuration file."
 msgstr ""
 
-#: libraries/relation.lib.php:1612
+#: libraries/relation.lib.php:1607
 msgid "no description"
 msgstr "gjin beskriuwing"
 
-#: libraries/relation.lib.php:1811
+#: libraries/relation.lib.php:1806
 msgid ""
 "You do not have necessary privileges to create a database named "
 "'phpmyadmin'. You may go to 'Operations' tab of any database to set up the "
 "phpMyAdmin configuration storage there."
 msgstr ""
 
-#: libraries/relation.lib.php:1928
+#: libraries/relation.lib.php:1923
 #, php-format
 msgid ""
 "%sCreate%s a database named 'phpmyadmin' and setup the phpMyAdmin "
 "configuration storage there."
 msgstr ""
 
-#: libraries/relation.lib.php:1936
+#: libraries/relation.lib.php:1931
 #, php-format
 msgid ""
 "%sCreate%s the phpMyAdmin configuration storage in the current database."
 msgstr ""
 
-#: libraries/relation.lib.php:1944
+#: libraries/relation.lib.php:1939
 #, php-format
 msgid "%sCreate%s missing phpMyAdmin configuration storage tables."
 msgstr ""
 
 #: libraries/replication_gui.lib.php:46 libraries/replication_gui.lib.php:343
-#: libraries/server_databases.lib.php:387
+#: libraries/server_databases.lib.php:398
 msgid "Master replication"
 msgstr ""
 
@@ -10764,7 +10778,7 @@ msgid ""
 msgstr ""
 
 #: libraries/replication_gui.lib.php:141
-#: libraries/server_databases.lib.php:389
+#: libraries/server_databases.lib.php:400
 msgid "Slave replication"
 msgstr ""
 
@@ -11025,10 +11039,10 @@ msgid "Master server changed successfully to %s."
 msgstr ""
 
 #: libraries/rte/rte_events.lib.php:106 libraries/rte/rte_events.lib.php:115
-#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:149
-#: libraries/rte/rte_routines.lib.php:158
-#: libraries/rte/rte_routines.lib.php:231
-#: libraries/rte/rte_routines.lib.php:1362
+#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:219
+#: libraries/rte/rte_routines.lib.php:246
+#: libraries/rte/rte_routines.lib.php:368
+#: libraries/rte/rte_routines.lib.php:1453
 #: libraries/rte/rte_triggers.lib.php:82 libraries/rte/rte_triggers.lib.php:91
 #: libraries/rte/rte_triggers.lib.php:123
 #, php-format
@@ -11049,7 +11063,7 @@ msgstr ""
 msgid "Event %1$s has been created."
 msgstr ""
 
-#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:251
+#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:266
 #: libraries/rte/rte_triggers.lib.php:144
 msgid "One or more errors have occurred while processing your request:"
 msgstr ""
@@ -11058,7 +11072,7 @@ msgstr ""
 msgid "Edit event"
 msgstr "Barren bewurkje"
 
-#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:794
+#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:885
 #: libraries/rte/rte_triggers.lib.php:323 view_create.php:180
 msgid "Details"
 msgstr "Details"
@@ -11071,7 +11085,7 @@ msgstr "Barrennamme"
 msgid "Event type"
 msgstr "Barrentype"
 
-#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:817
+#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:908
 #, php-format
 msgid "Change to %s"
 msgstr ""
@@ -11098,12 +11112,14 @@ msgstr ""
 msgid "On completion preserve"
 msgstr ""
 
-#: libraries/rte/rte_events.lib.php:491 libraries/rte/rte_routines.lib.php:930
+#: libraries/rte/rte_events.lib.php:491
+#: libraries/rte/rte_routines.lib.php:1021
 #: libraries/rte/rte_triggers.lib.php:383 view_create.php:209
 msgid "Definer"
 msgstr ""
 
-#: libraries/rte/rte_events.lib.php:535 libraries/rte/rte_routines.lib.php:997
+#: libraries/rte/rte_events.lib.php:535
+#: libraries/rte/rte_routines.lib.php:1088
 #: libraries/rte/rte_triggers.lib.php:422
 msgid "The definer must be in the \"username@hostname\" format!"
 msgstr ""
@@ -11129,9 +11145,9 @@ msgid "You must provide an event definition."
 msgstr ""
 
 #: libraries/rte/rte_export.lib.php:43 libraries/rte/rte_general.lib.php:72
-#: libraries/rte/rte_routines.lib.php:345
-#: libraries/rte/rte_routines.lib.php:1198
-#: libraries/rte/rte_routines.lib.php:1411
+#: libraries/rte/rte_routines.lib.php:153
+#: libraries/rte/rte_routines.lib.php:1289
+#: libraries/rte/rte_routines.lib.php:1502
 msgid "Error in processing request:"
 msgstr ""
 
@@ -11163,132 +11179,132 @@ msgid ""
 "problems."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:110
-#: libraries/rte/rte_routines.lib.php:1006
+#: libraries/rte/rte_routines.lib.php:123
+msgid "Edit routine"
+msgstr "Routine bewurkje"
+
+#: libraries/rte/rte_routines.lib.php:200
+#: libraries/rte/rte_routines.lib.php:1097
 #, php-format
 msgid "Invalid routine type: \"%s\""
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:170
-msgid "Sorry, we failed to restore the dropped routine."
-msgstr ""
-
-#: libraries/rte/rte_routines.lib.php:211
-#, php-format
-msgid "Routine %1$s has been modified. Privileges have been adjusted."
-msgstr ""
-
-#: libraries/rte/rte_routines.lib.php:216
-#, php-format
-msgid "Routine %1$s has been modified."
-msgstr ""
-
-#: libraries/rte/rte_routines.lib.php:238
+#: libraries/rte/rte_routines.lib.php:253
 #, php-format
 msgid "Routine %1$s has been created."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:315
-msgid "Edit routine"
-msgstr "Routine bewurkje"
+#: libraries/rte/rte_routines.lib.php:380
+msgid "Sorry, we failed to restore the dropped routine."
+msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:797
+#: libraries/rte/rte_routines.lib.php:439
+#, php-format
+msgid "Routine %1$s has been modified. Privileges have been adjusted."
+msgstr ""
+
+#: libraries/rte/rte_routines.lib.php:444
+#, php-format
+msgid "Routine %1$s has been modified."
+msgstr ""
+
+#: libraries/rte/rte_routines.lib.php:888
 msgid "Routine name"
 msgstr "Routinenamme"
 
-#: libraries/rte/rte_routines.lib.php:823
+#: libraries/rte/rte_routines.lib.php:914
 msgid "Parameters"
 msgstr "Parameters"
 
-#: libraries/rte/rte_routines.lib.php:829
+#: libraries/rte/rte_routines.lib.php:920
 msgid "Direction"
 msgstr "Rjochting"
 
-#: libraries/rte/rte_routines.lib.php:847
+#: libraries/rte/rte_routines.lib.php:938
 msgid "Add parameter"
 msgstr "Parameter tafoegje"
 
-#: libraries/rte/rte_routines.lib.php:851
+#: libraries/rte/rte_routines.lib.php:942
 msgid "Remove last parameter"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:856
+#: libraries/rte/rte_routines.lib.php:947
 msgid "Return type"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:862
+#: libraries/rte/rte_routines.lib.php:953
 msgid "Return length/values"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:868
+#: libraries/rte/rte_routines.lib.php:959
 msgid "Return options"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:899
+#: libraries/rte/rte_routines.lib.php:990
 msgid "Is deterministic"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:920
+#: libraries/rte/rte_routines.lib.php:1011
 msgid ""
 "You do not have sufficient privileges to perform this operation; Please "
 "refer to the documentation for more details"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:935
+#: libraries/rte/rte_routines.lib.php:1026
 msgid "Security type"
 msgstr "Befeiligingstype"
 
-#: libraries/rte/rte_routines.lib.php:944
+#: libraries/rte/rte_routines.lib.php:1035
 msgid "SQL data access"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1013
+#: libraries/rte/rte_routines.lib.php:1104
 msgid "You must provide a routine name!"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1047
+#: libraries/rte/rte_routines.lib.php:1138
 #, php-format
 msgid "Invalid direction \"%s\" given for parameter."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1069
-#: libraries/rte/rte_routines.lib.php:1131
+#: libraries/rte/rte_routines.lib.php:1160
+#: libraries/rte/rte_routines.lib.php:1222
 msgid ""
 "You must provide length/values for routine parameters of type ENUM, SET, "
 "VARCHAR and VARBINARY."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1095
+#: libraries/rte/rte_routines.lib.php:1186
 msgid "You must provide a name and a type for each routine parameter."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1114
+#: libraries/rte/rte_routines.lib.php:1205
 msgid "You must provide a valid return type for the routine."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1174
+#: libraries/rte/rte_routines.lib.php:1265
 msgid "You must provide a routine definition."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1285
+#: libraries/rte/rte_routines.lib.php:1376
 #, php-format
 msgid "Execution results of routine %s"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1340
+#: libraries/rte/rte_routines.lib.php:1431
 #, php-format
 msgid "%d row affected by the last statement inside the procedure."
 msgid_plural "%d rows affected by the last statement inside the procedure."
 msgstr[0] ""
 msgstr[1] ""
 
-#: libraries/rte/rte_routines.lib.php:1398
-#: libraries/rte/rte_routines.lib.php:1406
+#: libraries/rte/rte_routines.lib.php:1489
+#: libraries/rte/rte_routines.lib.php:1497
 msgid "Execute routine"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1485
-#: libraries/rte/rte_routines.lib.php:1488
+#: libraries/rte/rte_routines.lib.php:1576
+#: libraries/rte/rte_routines.lib.php:1579
 msgid "Routine parameters"
 msgstr "Routineparameters"
 
@@ -11442,7 +11458,7 @@ msgid "Original position"
 msgstr ""
 
 #: libraries/server_bin_log.lib.php:133
-#: templates/structure/display_table_stats.phtml:4
+#: templates/table/structure/display_table_stats.phtml:4
 msgid "Information"
 msgstr "Ynformaasje"
 
@@ -11478,12 +11494,12 @@ msgid ""
 "between the web server and the MySQL server."
 msgstr ""
 
-#: libraries/server_databases.lib.php:364
-#: libraries/server_databases.lib.php:365
+#: libraries/server_databases.lib.php:366
+#: libraries/server_databases.lib.php:371
 msgid "Enable Statistics"
 msgstr ""
 
-#: libraries/server_databases.lib.php:481
+#: libraries/server_databases.lib.php:492
 #, php-format
 msgid "%1$d database has been dropped successfully."
 msgid_plural "%1$d databases have been dropped successfully."
@@ -11843,7 +11859,7 @@ msgid "You have revoked the privileges for %s."
 msgstr ""
 
 #: libraries/server_privileges.lib.php:2059
-#: libraries/server_privileges.lib.php:4290
+#: libraries/server_privileges.lib.php:4316
 #, fuzzy
 #| msgid "Add user"
 msgid "Add user account"
@@ -12010,57 +12026,57 @@ msgstr ""
 msgid "The privileges were reloaded successfully."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:3994
+#: libraries/server_privileges.lib.php:4003
 #, php-format
 msgid "The user %s already exists!"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4232
+#: libraries/server_privileges.lib.php:4258
 #, php-format
 msgid "Privileges for %s"
 msgstr "Rjochten foar %s"
 
-#: libraries/server_privileges.lib.php:4241
+#: libraries/server_privileges.lib.php:4267
 #: libraries/server_status_processes.lib.php:72
 #: libraries/server_user_groups.lib.php:39
 msgid "User"
 msgstr "Brûker"
 
-#: libraries/server_privileges.lib.php:4282
+#: libraries/server_privileges.lib.php:4308
 msgctxt "Create new user"
 msgid "New"
 msgstr "Nij"
 
-#: libraries/server_privileges.lib.php:4311
+#: libraries/server_privileges.lib.php:4337
 #, fuzzy
 #| msgid "Edit Privileges:"
 msgid "Edit privileges:"
 msgstr "Rjochten bewurkje:"
 
-#: libraries/server_privileges.lib.php:4312
+#: libraries/server_privileges.lib.php:4338
 #, fuzzy
 #| msgid "User group"
 msgid "User account"
 msgstr "Brûkersgroep"
 
-#: libraries/server_privileges.lib.php:4371
+#: libraries/server_privileges.lib.php:4397
 msgid ""
 "Note: You are attempting to edit privileges of the user with which you are "
 "currently logged in."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4391 libraries/server_users.lib.php:25
+#: libraries/server_privileges.lib.php:4417 libraries/server_users.lib.php:25
 msgid "User accounts overview"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4459
+#: libraries/server_privileges.lib.php:4485
 msgid ""
 "A user account allowing any user from localhost to connect is present. This "
 "will prevent other users from connecting if the host part of their account "
 "allows a connection from any (%) host."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4500
+#: libraries/server_privileges.lib.php:4526
 #, php-format
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
@@ -12069,7 +12085,7 @@ msgid ""
 "%sreload the privileges%s before you continue."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4519
+#: libraries/server_privileges.lib.php:4545
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
 "tables. The content of these tables may differ from the privileges the "
@@ -12078,61 +12094,61 @@ msgid ""
 "privilege."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4569
+#: libraries/server_privileges.lib.php:4595
 msgid "The selected user was not found in the privilege table."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4801
+#: libraries/server_privileges.lib.php:4827
 msgid "You have added a new user."
 msgstr ""
 
-#: libraries/server_status.lib.php:53
+#: libraries/server_status.lib.php:60
 #, php-format
 msgid "Network traffic since startup: %s"
 msgstr ""
 
-#: libraries/server_status.lib.php:66
+#: libraries/server_status.lib.php:73
 #, php-format
 msgid "This MySQL server has been running for %1$s. It started up on %2$s."
 msgstr ""
 
-#: libraries/server_status.lib.php:80
+#: libraries/server_status.lib.php:94
 msgid ""
 "This MySQL server works as <b>master</b> and <b>slave</b> in <b>replication</"
 "b> process."
 msgstr ""
 
-#: libraries/server_status.lib.php:85
+#: libraries/server_status.lib.php:99
 msgid "This MySQL server works as <b>master</b> in <b>replication</b> process."
 msgstr ""
 
-#: libraries/server_status.lib.php:90
+#: libraries/server_status.lib.php:104
 msgid "This MySQL server works as <b>slave</b> in <b>replication</b> process."
 msgstr ""
 
-#: libraries/server_status.lib.php:106
+#: libraries/server_status.lib.php:116
 msgid "Replication status"
 msgstr ""
 
-#: libraries/server_status.lib.php:137
+#: libraries/server_status.lib.php:146
 msgid ""
 "On a busy server, the byte counters may overrun, so those statistics as "
 "reported by the MySQL server may be incorrect."
 msgstr ""
 
-#: libraries/server_status.lib.php:148
+#: libraries/server_status.lib.php:157
 msgid "Received"
 msgstr ""
 
-#: libraries/server_status.lib.php:167
+#: libraries/server_status.lib.php:176
 msgid "Sent"
 msgstr "Ferstjoerd"
 
-#: libraries/server_status.lib.php:234
+#: libraries/server_status.lib.php:243
 msgid "Max. concurrent connections"
 msgstr ""
 
-#: libraries/server_status.lib.php:244
+#: libraries/server_status.lib.php:253
 msgid "Failed attempts"
 msgstr ""
 
@@ -13054,7 +13070,7 @@ msgstr ""
 msgid "Not implemented yet."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/AlterOperation.php:193
+#: libraries/sql-parser/src/Components/AlterOperation.php:191
 msgid "Unrecognized alter operation."
 msgstr ""
 
@@ -13068,7 +13084,7 @@ msgid "An opening bracket followed by a set of values was expected."
 msgstr ""
 
 #: libraries/sql-parser/src/Components/ArrayObj.php:101
-#: libraries/sql-parser/src/Components/FieldDefinition.php:202
+#: libraries/sql-parser/src/Components/CreateDefinition.php:202
 msgid "An opening bracket was expected."
 msgstr ""
 
@@ -13076,25 +13092,33 @@ msgstr ""
 msgid "A comma or a closing bracket was expected"
 msgstr ""
 
+#: libraries/sql-parser/src/Components/CreateDefinition.php:246
+msgid "A comma or a closing bracket was expected."
+msgstr ""
+
+#: libraries/sql-parser/src/Components/CreateDefinition.php:262
+msgid "A closing bracket was expected."
+msgstr ""
+
 #: libraries/sql-parser/src/Components/DataType.php:125
 msgid "Unrecognized data type."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:225
+#: libraries/sql-parser/src/Components/Expression.php:227
 msgid "Unexpected closing bracket."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:246
-#: libraries/sql-parser/src/Components/Expression.php:283
-#: libraries/sql-parser/src/Components/Expression.php:303
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:285
+#: libraries/sql-parser/src/Components/Expression.php:305
 msgid "An alias was previously found."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:257
+#: libraries/sql-parser/src/Components/Expression.php:259
 msgid "Unexpected dot."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:327
+#: libraries/sql-parser/src/Components/Expression.php:329
 msgid "An alias was expected."
 msgstr ""
 
@@ -13102,14 +13126,6 @@ msgstr ""
 msgid "An expression was expected."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/FieldDefinition.php:246
-msgid "A comma or a closing bracket was expected."
-msgstr ""
-
-#: libraries/sql-parser/src/Components/FieldDefinition.php:262
-msgid "A closing bracket was expected."
-msgstr ""
-
 #: libraries/sql-parser/src/Components/Limit.php:90
 #: libraries/sql-parser/src/Components/Limit.php:112
 msgid "An offset was expected."
@@ -13149,26 +13165,26 @@ msgstr ""
 msgid "Expected delimiter."
 msgstr ""
 
-#: libraries/sql-parser/src/Lexer.php:753
+#: libraries/sql-parser/src/Lexer.php:777
 #, php-format
 msgid "Ending quote %1$s was expected."
 msgstr ""
 
-#: libraries/sql-parser/src/Lexer.php:789
+#: libraries/sql-parser/src/Lexer.php:813
 msgid "Variable name was expected."
 msgstr ""
 
-#: libraries/sql-parser/src/Parser.php:380
+#: libraries/sql-parser/src/Parser.php:391
 #, fuzzy
 #| msgid "Number of tables:"
 msgid "Unexpected beginning of statement."
 msgstr "Oantal tabellen:"
 
-#: libraries/sql-parser/src/Parser.php:399
+#: libraries/sql-parser/src/Parser.php:410
 msgid "Unrecognized statement type."
 msgstr ""
 
-#: libraries/sql-parser/src/Parser.php:479
+#: libraries/sql-parser/src/Parser.php:489
 msgid "No transaction was previously started."
 msgstr ""
 
@@ -13194,7 +13210,7 @@ msgid "The name of the entity was expected."
 msgstr ""
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:310
-msgid "At least one field definition was expected."
+msgid "At least one column definition was expected."
 msgstr ""
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:329
@@ -13254,25 +13270,25 @@ msgstr ""
 msgid "Using bookmark \"%s\" as default browse query."
 msgstr ""
 
-#: libraries/sql.lib.php:1306
+#: libraries/sql.lib.php:1300
 msgid "Showing as PHP code"
 msgstr ""
 
-#: libraries/sql.lib.php:1638
+#: libraries/sql.lib.php:1632
 #, php-format
 msgid ""
 "Current selection does not contain a unique column. Grid edit, checkbox, "
 "Edit, Copy and Delete features are not available. %s"
 msgstr ""
 
-#: libraries/sql.lib.php:1649
+#: libraries/sql.lib.php:1643
 #, php-format
 msgid ""
 "Current selection does not contain a unique column. Grid edit, Edit, Copy "
 "and Delete features may result in undesired behavior. %s"
 msgstr ""
 
-#: libraries/sql.lib.php:1688
+#: libraries/sql.lib.php:1682
 #, php-format
 msgid "Problems with indexes of table `%s`"
 msgstr ""
@@ -13431,7 +13447,7 @@ msgid "Version %s snapshot (SQL code)"
 msgstr ""
 
 #: libraries/tracking.lib.php:947
-#: templates/structure/table_structure_row.phtml:33
+#: templates/table/structure/table_structure_row.phtml:33
 msgctxt "None for default"
 msgid "None"
 msgstr "Gjin"
@@ -13483,15 +13499,15 @@ msgstr ""
 msgid "Version %1$s was created, tracking for %2$s is active."
 msgstr ""
 
-#: libraries/user_preferences.inc.php:29
+#: libraries/user_preferences.inc.php:30
 msgid "Manage your settings"
 msgstr ""
 
-#: libraries/user_preferences.inc.php:46 prefs_manage.php:307
+#: libraries/user_preferences.inc.php:54 prefs_manage.php:307
 msgid "Configuration has been saved."
 msgstr ""
 
-#: libraries/user_preferences.inc.php:66
+#: libraries/user_preferences.inc.php:74
 #, php-format
 msgid ""
 "Your preferences will be saved for current session only. Storing them "
@@ -13867,7 +13883,7 @@ msgid "first"
 msgstr "earste"
 
 #: templates/columns_definitions/move_column.phtml:12
-#: templates/structure/add_column.phtml:21
+#: templates/table/structure/add_column.phtml:21
 #, php-format
 msgid "after %s"
 msgstr "nei %s"
@@ -13926,199 +13942,294 @@ msgstr ""
 msgid "Input transformation options"
 msgstr ""
 
-#: templates/designer/aggregate_query_panel.phtml:22
-#: templates/designer/options_panel.phtml:100
+#: templates/database/create_table.phtml:7
+#: templates/database/designer/side_menu.phtml:77
+#: templates/database/designer/side_menu.phtml:80
+msgid "Create table"
+msgstr ""
+
+#: templates/database/create_table.phtml:15
+msgid "Number of columns"
+msgstr "Oantal kolommen"
+
+#: templates/database/designer/aggregate_query_panel.phtml:22
+#: templates/database/designer/options_panel.phtml:100
 msgid "Aggregate"
 msgstr ""
 
-#: templates/designer/aggregate_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:61
-#: templates/designer/options_panel.phtml:106
-#: templates/designer/options_panel.phtml:170
-#: templates/designer/where_query_panel.phtml:30
-#: templates/table/table_header.phtml:9
+#: templates/database/designer/aggregate_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:61
+#: templates/database/designer/options_panel.phtml:106
+#: templates/database/designer/options_panel.phtml:170
+#: templates/database/designer/where_query_panel.phtml:30
+#: templates/table/search/table_header.phtml:9
 msgid "Operator"
 msgstr "Operator"
 
-#: templates/designer/database_tables.phtml:29
+#: templates/database/designer/database_tables.phtml:29
 msgid "Toggle"
 msgstr ""
 
-#: templates/designer/database_tables.phtml:40
+#: templates/database/designer/database_tables.phtml:40
 #, fuzzy
 #| msgid "Table structure"
 msgid "See table structure"
 msgstr "Tabelstruktuer"
 
-#: templates/designer/delete_relation_panel.phtml:21
+#: templates/database/designer/delete_relation_panel.phtml:21
 msgid "Delete relation"
 msgstr ""
 
-#: templates/designer/edit_delete_pages.phtml:7
+#: templates/database/designer/edit_delete_pages.phtml:7
 msgid "Page to open"
 msgstr ""
 
-#: templates/designer/edit_delete_pages.phtml:7
+#: templates/database/designer/edit_delete_pages.phtml:7
 msgid "Page to delete"
 msgstr ""
 
-#: templates/designer/having_query_panel.phtml:90
-#: templates/designer/options_panel.phtml:63
-#: templates/designer/options_panel.phtml:229
-#: templates/designer/where_query_panel.phtml:59
+#: templates/database/designer/having_query_panel.phtml:90
+#: templates/database/designer/options_panel.phtml:63
+#: templates/database/designer/options_panel.phtml:229
+#: templates/database/designer/where_query_panel.phtml:59
 msgid "Except"
 msgstr ""
 
-#: templates/designer/having_query_panel.phtml:102
-#: templates/designer/options_panel.phtml:75
-#: templates/designer/options_panel.phtml:241
-#: templates/designer/where_query_panel.phtml:71
+#: templates/database/designer/having_query_panel.phtml:102
+#: templates/database/designer/options_panel.phtml:75
+#: templates/database/designer/options_panel.phtml:241
+#: templates/database/designer/where_query_panel.phtml:71
 msgid "subquery"
 msgstr ""
 
-#: templates/designer/new_relation_panel.phtml:22
-#: templates/designer/side_menu.phtml:84 templates/designer/side_menu.phtml:87
+#: templates/database/designer/new_relation_panel.phtml:22
+#: templates/database/designer/side_menu.phtml:84
+#: templates/database/designer/side_menu.phtml:87
 msgid "Create relation"
 msgstr ""
 
-#: templates/designer/options_panel.phtml:34
-#: templates/designer/options_panel.phtml:200
+#: templates/database/designer/options_panel.phtml:34
+#: templates/database/designer/options_panel.phtml:200
 msgid "Relation operator"
 msgstr ""
 
-#: templates/designer/options_panel.phtml:85
-#: templates/designer/rename_to_panel.phtml:23
+#: templates/database/designer/options_panel.phtml:85
+#: templates/database/designer/rename_to_panel.phtml:23
 msgid "Rename to"
 msgstr ""
 
-#: templates/designer/options_panel.phtml:91
-#: templates/designer/rename_to_panel.phtml:31
+#: templates/database/designer/options_panel.phtml:91
+#: templates/database/designer/rename_to_panel.phtml:31
 msgid "New name"
 msgstr "Nije namme"
 
-#: templates/designer/page_save_as.phtml:4
+#: templates/database/designer/page_save_as.phtml:4
 msgid "Save to selected page"
 msgstr ""
 
-#: templates/designer/page_save_as.phtml:5
+#: templates/database/designer/page_save_as.phtml:5
 msgid "Create a page and save to it"
 msgstr ""
 
-#: templates/designer/page_save_as.phtml:26
+#: templates/database/designer/page_save_as.phtml:26
 msgid "New page name"
 msgstr "Nije sidenamme"
 
-#: templates/designer/page_selector.phtml:2
+#: templates/database/designer/page_selector.phtml:2
 msgid "Select page"
 msgstr ""
 
-#: templates/designer/query_details.phtml:10
+#: templates/database/designer/query_details.phtml:10
 msgid "Active options"
 msgstr ""
 
-#: templates/designer/schema_export.phtml:4
+#: templates/database/designer/schema_export.phtml:4
 msgid "Select Export Relational Type"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:19 templates/designer/side_menu.phtml:25
+#: templates/database/designer/side_menu.phtml:19
+#: templates/database/designer/side_menu.phtml:25
 msgid "Show/Hide tables list"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:29 templates/designer/side_menu.phtml:35
-#: templates/designer/side_menu.phtml:36
+#: templates/database/designer/side_menu.phtml:29
+#: templates/database/designer/side_menu.phtml:35
+#: templates/database/designer/side_menu.phtml:36
 msgid "View in fullscreen"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:34
+#: templates/database/designer/side_menu.phtml:34
 msgid "Exit fullscreen"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:41 templates/designer/side_menu.phtml:45
+#: templates/database/designer/side_menu.phtml:41
+#: templates/database/designer/side_menu.phtml:45
 msgid "New page"
 msgstr "Nije side"
 
-#: templates/designer/side_menu.phtml:70 templates/designer/side_menu.phtml:73
+#: templates/database/designer/side_menu.phtml:70
+#: templates/database/designer/side_menu.phtml:73
 msgid "Delete pages"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:77 templates/designer/side_menu.phtml:80
-#: templates/table/create_table.phtml:7
-msgid "Create table"
-msgstr ""
-
-#: templates/designer/side_menu.phtml:98
-#: templates/designer/side_menu.phtml:101
+#: templates/database/designer/side_menu.phtml:98
+#: templates/database/designer/side_menu.phtml:101
 msgid "Reload"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:107
-#: templates/designer/side_menu.phtml:110
+#: templates/database/designer/side_menu.phtml:107
+#: templates/database/designer/side_menu.phtml:110
 msgid "Help"
 msgstr "Help"
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Angular links"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Direct links"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:122
-#: templates/designer/side_menu.phtml:124
+#: templates/database/designer/side_menu.phtml:122
+#: templates/database/designer/side_menu.phtml:124
 msgid "Snap to grid"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:128
-#: templates/designer/side_menu.phtml:134
+#: templates/database/designer/side_menu.phtml:128
+#: templates/database/designer/side_menu.phtml:134
 msgid "Small/Big All"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:138
-#: templates/designer/side_menu.phtml:141
+#: templates/database/designer/side_menu.phtml:138
+#: templates/database/designer/side_menu.phtml:141
 msgid "Toggle small/big"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:145
-#: templates/designer/side_menu.phtml:148
+#: templates/database/designer/side_menu.phtml:145
+#: templates/database/designer/side_menu.phtml:148
 msgid "Toggle relation lines"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:153
-#: templates/designer/side_menu.phtml:156
+#: templates/database/designer/side_menu.phtml:153
+#: templates/database/designer/side_menu.phtml:156
 msgid "Export schema"
 msgstr "Schema eksportearje"
 
-#: templates/designer/side_menu.phtml:165
-#: templates/designer/side_menu.phtml:168
+#: templates/database/designer/side_menu.phtml:165
+#: templates/database/designer/side_menu.phtml:168
 msgid "Build Query"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:173
-#: templates/designer/side_menu.phtml:177
+#: templates/database/designer/side_menu.phtml:173
+#: templates/database/designer/side_menu.phtml:177
 msgid "Move Menu"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:181
-#: templates/designer/side_menu.phtml:186
+#: templates/database/designer/side_menu.phtml:181
+#: templates/database/designer/side_menu.phtml:186
 msgid "Pin text"
 msgstr ""
 
-#: templates/designer/table_list.phtml:4
+#: templates/database/designer/table_list.phtml:4
 msgid "Hide/Show all"
 msgstr ""
 
-#: templates/designer/table_list.phtml:14
+#: templates/database/designer/table_list.phtml:14
 msgid "Hide/Show Tables with no relation"
 msgstr ""
 
-#: templates/designer/table_list.phtml:59
+#: templates/database/designer/table_list.phtml:59
 msgid "Number of tables:"
 msgstr "Oantal tabellen:"
 
+#: templates/database/structure/body_for_table_summary.phtml:6
+#, php-format
+msgid "%s table"
+msgid_plural "%s tables"
+msgstr[0] "%s tabel"
+msgstr[1] "%s tabellen"
+
+#: templates/database/structure/body_for_table_summary.phtml:17
+msgid "Sum"
+msgstr "Som"
+
+#: templates/database/structure/check_all_tables.phtml:6
+msgid "Check tables having overhead"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:10
+msgid "Show create"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:27
+#, fuzzy
+#| msgid "Add prefix"
+msgid "Prefix"
+msgstr "Foarheaksel tafoegje"
+
+#: templates/database/structure/check_all_tables.phtml:28
+msgid "Add prefix to table"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:29
+msgid "Replace table prefix"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:30
+msgid "Copy table with prefix"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:36
+msgid "Add columns to central list"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:37
+msgid "Remove columns from central list"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:38
+msgid "Make consistent with central list"
+msgstr ""
+
+#: templates/database/structure/favorite_anchor.phtml:12
+msgid "Add to Favorites"
+msgstr ""
+
+#: templates/database/structure/show_create.phtml:2
+msgid "Showing create queries"
+msgstr ""
+
+#: templates/database/structure/sortable_header.phtml:13
+msgid "Sort"
+msgstr ""
+
+#: templates/database/structure/table_header.phtml:42
+msgid ""
+"May be approximate. Click on the number to get the exact count. See "
+"[doc@faq3-11]FAQ 3.11[/doc]."
+msgstr ""
+
+#: templates/database/structure/table_header.phtml:66
+#: templates/table/index_form.phtml:127
+msgid "Size"
+msgstr "Grutte"
+
+#: templates/database/structure/table_header.phtml:74
+#: templates/table/structure/display_table_stats.phtml:27
+msgid "Overhead"
+msgstr "Overhead"
+
+#: templates/database/structure/tracking_icon.phtml:4
+msgid "Tracking is active."
+msgstr ""
+
+#: templates/database/structure/tracking_icon.phtml:8
+msgid "Tracking is not active."
+msgstr ""
+
 #: templates/error/report_form.phtml:7
 msgid ""
 "phpMyAdmin has encountered an error. We have collected data about this error "
@@ -14134,63 +14245,6 @@ msgstr ""
 msgid "Please explain the steps that lead to the error:"
 msgstr ""
 
-#: templates/gis_visualization/gis_visualization.phtml:3
-msgid "Display GIS Visualization"
-msgstr ""
-
-#: templates/gis_visualization/gis_visualization.phtml:8
-msgid "Label column"
-msgstr ""
-
-#: templates/gis_visualization/gis_visualization.phtml:11
-msgid "-- None --"
-msgstr "-- Gjin --"
-
-#: templates/gis_visualization/gis_visualization.phtml:19
-msgid "Spatial column"
-msgstr ""
-
-#: templates/index_form.phtml:16
-msgid "Index name:"
-msgstr "Yndeksnamme:"
-
-#: templates/index_form.phtml:19
-msgid ""
-"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
-msgstr ""
-
-#: templates/index_form.phtml:40
-#, fuzzy
-#| msgid "Index name:"
-msgid "Index choice:"
-msgstr "Yndeksnamme:"
-
-#: templates/index_form.phtml:57
-msgid "Key block size:"
-msgstr ""
-
-#: templates/index_form.phtml:74
-msgid "Index type:"
-msgstr "Yndekstype:"
-
-#: templates/index_form.phtml:86
-#, fuzzy
-#| msgid "User:"
-msgid "Parser:"
-msgstr "Brûker:"
-
-#: templates/index_form.phtml:102
-msgid "Comment:"
-msgstr "Opmerking:"
-
-#: templates/index_form.phtml:127 templates/structure/table_header.phtml:66
-msgid "Size"
-msgstr "Grutte"
-
-#: templates/index_form.phtml:149 templates/index_form.phtml:190
-msgid "Drag to reorder"
-msgstr ""
-
 #: templates/prefs_autoload.phtml:9
 msgid ""
 "Your browser has phpMyAdmin configuration for this domain. Would you like to "
@@ -14201,412 +14255,381 @@ msgstr ""
 msgid "Start row:"
 msgstr ""
 
-#: templates/structure/actions_in_table_structure.phtml:14
-#, php-format
-msgid "A primary key has been added on %s."
-msgstr ""
-
-#: templates/structure/actions_in_table_structure.phtml:34
-#: templates/structure/actions_in_table_structure.phtml:54
-#: templates/structure/actions_in_table_structure.phtml:79
-#: templates/structure/actions_in_table_structure.phtml:101
-#, php-format
-msgid "An index has been added on %s."
-msgstr ""
-
-#: templates/structure/actions_in_table_structure.phtml:130
-#: templates/structure/check_all_table_column.phtml:59
-msgid "Remove from central columns"
-msgstr ""
-
-#: templates/structure/actions_in_table_structure.phtml:138
-#: templates/structure/check_all_table_column.phtml:55
-msgid "Add to central columns"
-msgstr ""
-
-#: templates/structure/add_column.phtml:7
-#, php-format
-msgid "Add %s column(s)"
-msgstr "%s kolom(men) tafoegje"
-
-#: templates/structure/add_column.phtml:12
-#, fuzzy
-#| msgid "Number of tables:"
-msgid "at beginning of table"
-msgstr "Oantal tabellen:"
-
-#: templates/structure/body_for_table_summary.phtml:6
-#, php-format
-msgid "%s table"
-msgid_plural "%s tables"
-msgstr[0] "%s tabel"
-msgstr[1] "%s tabellen"
-
-#: templates/structure/body_for_table_summary.phtml:17
-msgid "Sum"
-msgstr "Som"
-
-#: templates/structure/check_all_tables.phtml:6
-msgid "Check tables having overhead"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:10
-msgid "Show create"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:27
-#, fuzzy
-#| msgid "Add prefix"
-msgid "Prefix"
-msgstr "Foarheaksel tafoegje"
-
-#: templates/structure/check_all_tables.phtml:28
-msgid "Add prefix to table"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:29
-msgid "Replace table prefix"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:30
-msgid "Copy table with prefix"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:36
-msgid "Add columns to central list"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:37
-msgid "Remove columns from central list"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:38
-msgid "Make consistent with central list"
-msgstr ""
-
-#: templates/structure/display_structure.phtml:140 view_create.php:181
-msgid "Edit view"
-msgstr ""
-
-#: templates/structure/display_table_stats.phtml:9
-msgid "Space usage"
-msgstr ""
-
-#: templates/structure/display_table_stats.phtml:27
-#: templates/structure/table_header.phtml:74
-msgid "Overhead"
-msgstr "Overhead"
-
-#: templates/structure/display_table_stats.phtml:32
-msgid "Effective"
-msgstr "Effektyf"
-
-#: templates/structure/favorite_anchor.phtml:12
-msgid "Add to Favorites"
-msgstr ""
-
-#: templates/structure/move_columns_dialog.phtml:1
-#: templates/structure/optional_action_links.phtml:21
-msgid "Move columns"
-msgstr ""
-
-#: templates/structure/move_columns_dialog.phtml:2
-msgid "Move the columns by dragging them up and down."
-msgstr ""
-
-#: templates/structure/optional_action_links.phtml:9
-msgid "Propose table structure"
-msgstr ""
-
-#: templates/structure/optional_action_links.phtml:24
-msgid "Improve table structure"
-msgstr "Tabelstruktuer ferbetterje"
-
-#: templates/structure/optional_action_links.phtml:30
-#, fuzzy
-#| msgid "Tracking"
-msgid "Track view"
-msgstr "Trasearje"
-
-#: templates/structure/row_stats_table.phtml:3
-msgid "Row statistics"
-msgstr "Rigestatistiken"
-
-#: templates/structure/row_stats_table.phtml:9
-msgid "static"
-msgstr "statysk"
-
-#: templates/structure/row_stats_table.phtml:11
-msgid "dynamic"
-msgstr "dynamysk"
-
-#: templates/structure/row_stats_table.phtml:22
-msgid "partitioned"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:54
-msgid "Row length"
-msgstr "Rigelingte"
-
-#: templates/structure/row_stats_table.phtml:66
-msgid "Row size"
-msgstr "Rigegrutte"
-
-#: templates/structure/row_stats_table.phtml:73
-msgid "Next autoindex"
-msgstr ""
-
-#: templates/structure/secondary_tabs.phtml:14
-#, fuzzy
-#| msgid "Relational key"
-msgid "Relation view"
-msgstr "Relasjonele kaai"
-
-#: templates/structure/show_create.phtml:2
-msgid "Showing create queries"
-msgstr ""
-
-#: templates/structure/sortable_header.phtml:13
-msgid "Sort"
-msgstr ""
-
-#: templates/structure/table_header.phtml:42
-msgid ""
-"May be approximate. Click on the number to get the exact count. See "
-"[doc@faq3-11]FAQ 3.11[/doc]."
-msgstr ""
-
-#: templates/structure/table_structure_row.phtml:46
-#, php-format
-msgid "Column %s has been dropped."
-msgstr ""
-
-#: templates/structure/tracking_icon.phtml:4
-msgid "Tracking is active."
-msgstr ""
-
-#: templates/structure/tracking_icon.phtml:8
-msgid "Tracking is not active."
-msgstr ""
-
-#: templates/table/create_table.phtml:15
-msgid "Number of columns"
-msgstr "Oantal kolommen"
-
-#: templates/table/options.phtml:8
-msgid "Select columns (at least one):"
-msgstr ""
-
-#: templates/table/options.phtml:37
-msgid "Add search conditions (body of the \"where\" clause):"
-msgstr ""
-
-#: templates/table/options.phtml:45
-msgid "Number of rows per page"
-msgstr "Oantal rigen per side"
-
-#: templates/table/options.phtml:56
-msgid "Display order:"
-msgstr ""
-
-#: templates/table/options_zoom.phtml:6
-msgid "Use this column to label each point"
-msgstr ""
-
-#: templates/table/options_zoom.phtml:35
-msgid "Maximum rows to plot"
-msgstr ""
-
-#: templates/table/replace_preview.phtml:13
-msgid "Find and replace - preview"
-msgstr ""
-
-#: templates/table/replace_preview.phtml:18
-msgid "Original string"
-msgstr ""
-
-#: templates/table/replace_preview.phtml:19
-msgid "Replaced string"
-msgstr ""
-
-#: templates/table/replace_preview.phtml:40
-msgid "Replace"
-msgstr "Ferfang"
-
-#: templates/table/rows_zoom.phtml:16
-msgid "Additional search criteria"
-msgstr ""
-
-#: templates/table/search_and_replace.phtml:3
-msgid "Replace with:"
-msgstr ""
-
-#: templates/table/search_and_replace.phtml:22
-msgid "Use regular expression"
-msgstr ""
-
-#: templates/table/selection_form.phtml:12
-msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
-msgstr ""
-
-#: templates/table/selection_form.phtml:34
-msgid "Do a \"query by example\" (wildcard: \"%\")"
-msgstr ""
-
-#: templates/table/zoom_result_form.phtml:7
-msgid "Browse/Edit the points"
-msgstr ""
-
-#: templates/table/zoom_result_form.phtml:15
-msgid "How to use"
-msgstr ""
-
-#: templates/table/zoom_result_form.phtml:23
-msgid "Reset zoom"
-msgstr ""
-
-#: templates/tbl_chart.phtml:17
+#: templates/table/chart/tbl_chart.phtml:17
 msgctxt "Chart type"
 msgid "Bar"
 msgstr ""
 
-#: templates/tbl_chart.phtml:21
+#: templates/table/chart/tbl_chart.phtml:21
 msgctxt "Chart type"
 msgid "Column"
 msgstr "Kolom"
 
-#: templates/tbl_chart.phtml:25
+#: templates/table/chart/tbl_chart.phtml:25
 msgctxt "Chart type"
 msgid "Line"
 msgstr ""
 
-#: templates/tbl_chart.phtml:29
+#: templates/table/chart/tbl_chart.phtml:29
 msgctxt "Chart type"
 msgid "Spline"
 msgstr ""
 
-#: templates/tbl_chart.phtml:33
+#: templates/table/chart/tbl_chart.phtml:33
 msgctxt "Chart type"
 msgid "Area"
 msgstr ""
 
-#: templates/tbl_chart.phtml:37
+#: templates/table/chart/tbl_chart.phtml:37
 msgctxt "Chart type"
 msgid "Pie"
 msgstr ""
 
-#: templates/tbl_chart.phtml:41
+#: templates/table/chart/tbl_chart.phtml:41
 msgctxt "Chart type"
 msgid "Timeline"
 msgstr "Tiidline"
 
-#: templates/tbl_chart.phtml:45
+#: templates/table/chart/tbl_chart.phtml:45
 msgctxt "Chart type"
 msgid "Scatter"
 msgstr ""
 
-#: templates/tbl_chart.phtml:50
+#: templates/table/chart/tbl_chart.phtml:50
 msgid "Stacked"
 msgstr ""
 
-#: templates/tbl_chart.phtml:53
+#: templates/table/chart/tbl_chart.phtml:53
 msgid "Chart title"
 msgstr "Grafyktitel"
 
-#: templates/tbl_chart.phtml:57
+#: templates/table/chart/tbl_chart.phtml:57
 msgid "X-Axis:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:72
+#: templates/table/chart/tbl_chart.phtml:72
 msgid "Series:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:102
+#: templates/table/chart/tbl_chart.phtml:102
 msgid "X-Axis label:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:104
+#: templates/table/chart/tbl_chart.phtml:104
 msgid "X Values"
 msgstr "X-wearden"
 
-#: templates/tbl_chart.phtml:107
+#: templates/table/chart/tbl_chart.phtml:107
 msgid "Y-Axis label:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:115
+#: templates/table/chart/tbl_chart.phtml:115
 msgid "Series names are in a column"
 msgstr ""
 
-#: templates/tbl_chart.phtml:118
+#: templates/table/chart/tbl_chart.phtml:118
 msgid "Series column:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:130
+#: templates/table/chart/tbl_chart.phtml:130
 #, fuzzy
 #| msgid "Value column:"
 msgid "Value Column:"
 msgstr "Weardekolom:"
 
-#: templates/tbl_chart.phtml:150
+#: templates/table/chart/tbl_chart.phtml:150
 msgid "Save chart as image"
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:7
+#: templates/table/gis_visualization/gis_visualization.phtml:3
+msgid "Display GIS Visualization"
+msgstr ""
+
+#: templates/table/gis_visualization/gis_visualization.phtml:8
+msgid "Label column"
+msgstr ""
+
+#: templates/table/gis_visualization/gis_visualization.phtml:11
+msgid "-- None --"
+msgstr "-- Gjin --"
+
+#: templates/table/gis_visualization/gis_visualization.phtml:19
+msgid "Spatial column"
+msgstr ""
+
+#: templates/table/index_form.phtml:16
+msgid "Index name:"
+msgstr "Yndeksnamme:"
+
+#: templates/table/index_form.phtml:19
+msgid ""
+"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
+msgstr ""
+
+#: templates/table/index_form.phtml:40
+#, fuzzy
+#| msgid "Index name:"
+msgid "Index choice:"
+msgstr "Yndeksnamme:"
+
+#: templates/table/index_form.phtml:57
+msgid "Key block size:"
+msgstr ""
+
+#: templates/table/index_form.phtml:74
+msgid "Index type:"
+msgstr "Yndekstype:"
+
+#: templates/table/index_form.phtml:86
+#, fuzzy
+#| msgid "User:"
+msgid "Parser:"
+msgstr "Brûker:"
+
+#: templates/table/index_form.phtml:102
+msgid "Comment:"
+msgstr "Opmerking:"
+
+#: templates/table/index_form.phtml:149 templates/table/index_form.phtml:190
+msgid "Drag to reorder"
+msgstr ""
+
+#: templates/table/relation/common_form.phtml:7
 msgid "Internal relations"
 msgstr "Ynterne relaasjes"
 
-#: templates/tbl_relation/common_form.phtml:11
+#: templates/table/relation/common_form.phtml:11
 msgid "Internal relation"
 msgstr "Ynterne relaasje"
 
-#: templates/tbl_relation/common_form.phtml:14
+#: templates/table/relation/common_form.phtml:14
 msgid ""
 "An internal relation is not necessary when a corresponding FOREIGN KEY "
 "relation exists."
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:37
+#: templates/table/relation/common_form.phtml:37
 msgid "Foreign key constraints"
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:40
+#: templates/table/relation/common_form.phtml:40
 msgid "Actions"
 msgstr "Aksjes"
 
-#: templates/tbl_relation/common_form.phtml:41
+#: templates/table/relation/common_form.phtml:41
 msgid "Constraint properties"
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:44
+#: templates/table/relation/common_form.phtml:44
 msgid ""
 "Only columns with index will be displayed. You can define an index below."
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:49
+#: templates/table/relation/common_form.phtml:49
 msgid "Foreign key constraint"
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:81
+#: templates/table/relation/common_form.phtml:81
 msgid "+ Add constraint"
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:91
+#: templates/table/relation/common_form.phtml:91
 msgid "Choose column to display:"
 msgstr ""
 
-#: templates/tbl_relation/foreign_key_row.phtml:13
+#: templates/table/relation/foreign_key_row.phtml:13
 #, php-format
 msgid "Foreign key constraint %s has been dropped"
 msgstr ""
 
-#: templates/tbl_relation/foreign_key_row.phtml:102
+#: templates/table/relation/foreign_key_row.phtml:102
 msgid "Constraint name"
 msgstr ""
 
-#: templates/tbl_relation/foreign_key_row.phtml:157
+#: templates/table/relation/foreign_key_row.phtml:157
 msgid "+ Add column"
 msgstr ""
 
+#: templates/table/search/options.phtml:8
+msgid "Select columns (at least one):"
+msgstr ""
+
+#: templates/table/search/options.phtml:37
+msgid "Add search conditions (body of the \"where\" clause):"
+msgstr ""
+
+#: templates/table/search/options.phtml:45
+msgid "Number of rows per page"
+msgstr "Oantal rigen per side"
+
+#: templates/table/search/options.phtml:56
+msgid "Display order:"
+msgstr ""
+
+#: templates/table/search/options_zoom.phtml:6
+msgid "Use this column to label each point"
+msgstr ""
+
+#: templates/table/search/options_zoom.phtml:35
+msgid "Maximum rows to plot"
+msgstr ""
+
+#: templates/table/search/replace_preview.phtml:13
+msgid "Find and replace - preview"
+msgstr ""
+
+#: templates/table/search/replace_preview.phtml:18
+msgid "Original string"
+msgstr ""
+
+#: templates/table/search/replace_preview.phtml:19
+msgid "Replaced string"
+msgstr ""
+
+#: templates/table/search/replace_preview.phtml:40
+msgid "Replace"
+msgstr "Ferfang"
+
+#: templates/table/search/rows_zoom.phtml:16
+msgid "Additional search criteria"
+msgstr ""
+
+#: templates/table/search/search_and_replace.phtml:3
+msgid "Replace with:"
+msgstr ""
+
+#: templates/table/search/search_and_replace.phtml:22
+msgid "Use regular expression"
+msgstr ""
+
+#: templates/table/search/selection_form.phtml:12
+msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
+msgstr ""
+
+#: templates/table/search/selection_form.phtml:34
+msgid "Do a \"query by example\" (wildcard: \"%\")"
+msgstr ""
+
+#: templates/table/search/zoom_result_form.phtml:7
+msgid "Browse/Edit the points"
+msgstr ""
+
+#: templates/table/search/zoom_result_form.phtml:15
+msgid "How to use"
+msgstr ""
+
+#: templates/table/search/zoom_result_form.phtml:23
+msgid "Reset zoom"
+msgstr ""
+
+#: templates/table/secondary_tabs.phtml:14
+#, fuzzy
+#| msgid "Relational key"
+msgid "Relation view"
+msgstr "Relasjonele kaai"
+
+#: templates/table/structure/actions_in_table_structure.phtml:14
+#, php-format
+msgid "A primary key has been added on %s."
+msgstr ""
+
+#: templates/table/structure/actions_in_table_structure.phtml:34
+#: templates/table/structure/actions_in_table_structure.phtml:54
+#: templates/table/structure/actions_in_table_structure.phtml:79
+#: templates/table/structure/actions_in_table_structure.phtml:101
+#, php-format
+msgid "An index has been added on %s."
+msgstr ""
+
+#: templates/table/structure/actions_in_table_structure.phtml:130
+#: templates/table/structure/check_all_table_column.phtml:59
+msgid "Remove from central columns"
+msgstr ""
+
+#: templates/table/structure/actions_in_table_structure.phtml:138
+#: templates/table/structure/check_all_table_column.phtml:55
+msgid "Add to central columns"
+msgstr ""
+
+#: templates/table/structure/add_column.phtml:7
+#, php-format
+msgid "Add %s column(s)"
+msgstr "%s kolom(men) tafoegje"
+
+#: templates/table/structure/add_column.phtml:12
+#, fuzzy
+#| msgid "Number of tables:"
+msgid "at beginning of table"
+msgstr "Oantal tabellen:"
+
+#: templates/table/structure/display_structure.phtml:140 view_create.php:181
+msgid "Edit view"
+msgstr ""
+
+#: templates/table/structure/display_table_stats.phtml:9
+msgid "Space usage"
+msgstr ""
+
+#: templates/table/structure/display_table_stats.phtml:32
+msgid "Effective"
+msgstr "Effektyf"
+
+#: templates/table/structure/move_columns_dialog.phtml:1
+#: templates/table/structure/optional_action_links.phtml:21
+msgid "Move columns"
+msgstr ""
+
+#: templates/table/structure/move_columns_dialog.phtml:2
+msgid "Move the columns by dragging them up and down."
+msgstr ""
+
+#: templates/table/structure/optional_action_links.phtml:9
+msgid "Propose table structure"
+msgstr ""
+
+#: templates/table/structure/optional_action_links.phtml:24
+msgid "Improve table structure"
+msgstr "Tabelstruktuer ferbetterje"
+
+#: templates/table/structure/optional_action_links.phtml:30
+#, fuzzy
+#| msgid "Tracking"
+msgid "Track view"
+msgstr "Trasearje"
+
+#: templates/table/structure/row_stats_table.phtml:3
+msgid "Row statistics"
+msgstr "Rigestatistiken"
+
+#: templates/table/structure/row_stats_table.phtml:9
+msgid "static"
+msgstr "statysk"
+
+#: templates/table/structure/row_stats_table.phtml:11
+msgid "dynamic"
+msgstr "dynamysk"
+
+#: templates/table/structure/row_stats_table.phtml:22
+msgid "partitioned"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:54
+msgid "Row length"
+msgstr "Rigelingte"
+
+#: templates/table/structure/row_stats_table.phtml:66
+msgid "Row size"
+msgstr "Rigegrutte"
+
+#: templates/table/structure/row_stats_table.phtml:73
+msgid "Next autoindex"
+msgstr ""
+
+#: templates/table/structure/table_structure_row.phtml:46
+#, php-format
+msgid "Column %s has been dropped."
+msgstr ""
+
 #: themes.php:17 themes.php:22
 msgid "Theme"
 msgstr "Tema"
diff --git a/po/gl.po b/po/gl.po
index 614752b9cd..6670450ca3 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 4.5.0-dev\n"
 "Report-Msgid-Bugs-To: developers@phpmyadmin.net\n"
-"POT-Creation-Date: 2015-08-08 13:53-0400\n"
+"POT-Creation-Date: 2015-08-12 08:10-0400\n"
 "PO-Revision-Date: 2014-10-10 23:59+0200\n"
 "Last-Translator: Xosé Calvo <xosecalvo@gmail.com>\n"
 "Language-Team: Galician <https://hosted.weblate.org/projects/phpmyadmin/"
@@ -54,7 +54,7 @@ msgid "Table comments:"
 msgstr "Comentarios da táboa:"
 
 #: db_datadict.php:104 libraries/Index.class.php:699
-#: libraries/insert_edit.lib.php:1567
+#: libraries/insert_edit.lib.php:1565
 #: libraries/navigation/Nodes/Node_Column.class.php:30
 #: libraries/plugins/export/ExportHtmlword.class.php:280
 #: libraries/plugins/export/ExportHtmlword.class.php:375
@@ -68,13 +68,14 @@ msgstr "Comentarios da táboa:"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1023
 #: libraries/tracking.lib.php:879 libraries/tracking.lib.php:975
 #: templates/columns_definitions/column_name.phtml:18
-#: templates/index_form.phtml:124 templates/table/table_header.phtml:6
-#: templates/table/zoom_result_form.phtml:33
-#: templates/tbl_relation/common_form.phtml:10
-#: templates/tbl_relation/common_form.phtml:43
-#: templates/tbl_relation/foreign_key_row.phtml:194
-#: templates/tbl_relation/foreign_key_row.phtml:206
-#: templates/tbl_relation/internal_relational_row.phtml:71
+#: templates/table/index_form.phtml:124
+#: templates/table/relation/common_form.phtml:10
+#: templates/table/relation/common_form.phtml:43
+#: templates/table/relation/foreign_key_row.phtml:194
+#: templates/table/relation/foreign_key_row.phtml:206
+#: templates/table/relation/internal_relational_row.phtml:71
+#: templates/table/search/table_header.phtml:6
+#: templates/table/search/zoom_result_form.phtml:33
 msgid "Column"
 msgstr "Columna"
 
@@ -92,21 +93,21 @@ msgstr "Columna"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1001
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1024
 #: libraries/rte/rte_list.lib.php:75 libraries/rte/rte_list.lib.php:103
-#: libraries/rte/rte_routines.lib.php:802
-#: libraries/rte/rte_routines.lib.php:831
-#: libraries/rte/rte_routines.lib.php:1493
+#: libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_routines.lib.php:922
+#: libraries/rte/rte_routines.lib.php:1584
 #: libraries/server_privileges.lib.php:2369 libraries/tracking.lib.php:880
 #: libraries/tracking.lib.php:972
 #: templates/columns_definitions/table_fields_definitions.phtml:11
-#: templates/structure/table_header.phtml:48
-#: templates/structure/table_structure_header.phtml:6
-#: templates/table/table_header.phtml:7
+#: templates/database/structure/table_header.phtml:48
+#: templates/table/search/table_header.phtml:7
+#: templates/table/structure/table_structure_header.phtml:6
 msgid "Type"
 msgstr "Tipo"
 
 #: db_datadict.php:106 libraries/Index.class.php:702
 #: libraries/central_columns.lib.php:708
-#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1576
+#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1574
 #: libraries/plugins/export/ExportHtmlword.class.php:286
 #: libraries/plugins/export/ExportHtmlword.class.php:381
 #: libraries/plugins/export/ExportLatex.class.php:509
@@ -119,8 +120,8 @@ msgstr "Tipo"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1026
 #: libraries/tracking.lib.php:882 libraries/tracking.lib.php:978
 #: templates/columns_definitions/table_fields_definitions.phtml:39
-#: templates/structure/table_structure_header.phtml:9
-#: templates/table/zoom_result_form.phtml:34
+#: templates/table/search/zoom_result_form.phtml:34
+#: templates/table/structure/table_structure_header.phtml:9
 msgid "Null"
 msgstr "Nulo"
 
@@ -138,8 +139,8 @@ msgstr "Nulo"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1027
 #: libraries/replication_gui.lib.php:153 libraries/tracking.lib.php:883
 #: templates/columns_definitions/table_fields_definitions.phtml:25
-#: templates/structure/body_for_table_summary.phtml:55
-#: templates/structure/table_structure_header.phtml:10
+#: templates/database/structure/body_for_table_summary.phtml:55
+#: templates/table/structure/table_structure_header.phtml:10
 msgid "Default"
 msgstr "Predeterminado"
 
@@ -167,19 +168,19 @@ msgid "Comments"
 msgstr "Comentarios"
 
 #: db_datadict.php:146
-#: libraries/controllers/StructureController.class.php:1960
-#: libraries/controllers/StructureController.class.php:1965
+#: libraries/controllers/TableStructureController.class.php:951
+#: libraries/controllers/TableStructureController.class.php:956
 #: libraries/tracking.lib.php:922
 #: templates/columns_definitions/column_indexes.phtml:6
-#: templates/structure/check_all_table_column.phtml:22
-#: templates/structure/display_structure.phtml:74
+#: templates/table/structure/check_all_table_column.phtml:22
+#: templates/table/structure/display_structure.phtml:74
 msgid "Primary"
 msgstr "Primaria"
 
 #: db_datadict.php:156 js/messages.php:317 libraries/Index.class.php:567
 #: libraries/Index.class.php:606 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261 libraries/mult_submits.lib.php:403
+#: libraries/config/FormDisplay.tpl.php:272 libraries/mult_submits.lib.php:403
 #: libraries/mult_submits.lib.php:417
 #: libraries/plugins/export/ExportHtmlword.class.php:630
 #: libraries/plugins/export/ExportLatex.class.php:589
@@ -195,20 +196,20 @@ msgstr "Primaria"
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1010 libraries/tracking.lib.php:1015
 #: prefs_manage.php:140 templates/prefs_autoload.phtml:15
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "No"
 msgstr "Non"
 
 #: db_datadict.php:156 js/messages.php:443 libraries/Index.class.php:568
 #: libraries/Index.class.php:605 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261
-#: libraries/controllers/StructureController.class.php:1344
-#: libraries/controllers/StructureController.class.php:2223
-#: libraries/controllers/StructureController.class.php:2232
-#: libraries/controllers/StructureController.class.php:2237
-#: libraries/controllers/StructureController.class.php:2242
-#: libraries/controllers/StructureController.class.php:2247
+#: libraries/config/FormDisplay.tpl.php:272
+#: libraries/controllers/TableStructureController.class.php:539
+#: libraries/controllers/TableStructureController.class.php:1201
+#: libraries/controllers/TableStructureController.class.php:1210
+#: libraries/controllers/TableStructureController.class.php:1215
+#: libraries/controllers/TableStructureController.class.php:1220
+#: libraries/controllers/TableStructureController.class.php:1225
 #: libraries/mult_submits.inc.php:82 libraries/mult_submits.inc.php:178
 #: libraries/mult_submits.lib.php:339 libraries/mult_submits.lib.php:372
 #: libraries/mult_submits.lib.php:401 libraries/mult_submits.lib.php:415
@@ -217,8 +218,8 @@ msgstr "Non"
 #: libraries/plugins/export/ExportOdt.class.php:756
 #: libraries/plugins/export/ExportTexytext.class.php:567
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1077
-#: libraries/server_databases.lib.php:464
-#: libraries/server_databases.lib.php:474
+#: libraries/server_databases.lib.php:475
+#: libraries/server_databases.lib.php:485
 #: libraries/server_privileges.lib.php:2546
 #: libraries/server_privileges.lib.php:2727
 #: libraries/server_privileges.lib.php:2748
@@ -228,7 +229,7 @@ msgstr "Non"
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1008 libraries/tracking.lib.php:1013
 #: prefs_manage.php:138 templates/prefs_autoload.phtml:14
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "Yes"
 msgstr "Si"
 
@@ -238,7 +239,7 @@ msgstr "Ver o envorcado (esquema) da base de datos"
 
 #: db_export.php:37 db_tracking.php:90 export.php:382
 #: libraries/DBQbe.class.php:326
-#: libraries/controllers/StructureController.class.php:231
+#: libraries/controllers/DatabaseStructureController.class.php:170
 #: libraries/navigation/NavigationTree.class.php:897
 msgid "No tables found in database."
 msgstr "Non foi posíbel atopar ningunha táboa na base de datos."
@@ -249,14 +250,14 @@ msgstr "Non foi posíbel atopar ningunha táboa na base de datos."
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:26
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:120
-#: templates/structure/show_create.phtml:18
+#: templates/database/structure/show_create.phtml:18
 msgid "Tables"
 msgstr "Táboas"
 
 #: db_export.php:52 libraries/Menu.class.php:317 libraries/Menu.class.php:425
-#: libraries/Util.class.php:3333 libraries/Util.class.php:3343
-#: libraries/Util.class.php:3349 libraries/Util.class.php:3629
-#: libraries/Util.class.php:4327 libraries/Util.class.php:4344
+#: libraries/Util.class.php:3339 libraries/Util.class.php:3349
+#: libraries/Util.class.php:3355 libraries/Util.class.php:3635
+#: libraries/Util.class.php:4333 libraries/Util.class.php:4350
 #: libraries/central_columns.lib.php:728 libraries/config.values.php:39
 #: libraries/config.values.php:47 libraries/config.values.php:109
 #: libraries/config.values.php:115 libraries/config/setup.forms.php:323
@@ -270,7 +271,7 @@ msgstr "Táboas"
 #: libraries/navigation/Nodes/Node_Table.class.php:283
 #: libraries/server_privileges.lib.php:1141 libraries/tracking.lib.php:874
 #: templates/columns_definitions/table_fields_definitions.phtml:3
-#: templates/designer/table_list.phtml:28
+#: templates/database/designer/table_list.phtml:28
 msgid "Structure"
 msgstr "Estrutura"
 
@@ -282,7 +283,7 @@ msgstr "Estrutura"
 #: libraries/config/user_preferences.forms.php:292
 #: libraries/config/user_preferences.forms.php:297
 #: libraries/server_privileges.lib.php:1140
-#: templates/structure/display_table_stats.phtml:12
+#: templates/table/structure/display_table_stats.phtml:12
 msgid "Data"
 msgstr "Datos"
 
@@ -361,10 +362,10 @@ msgstr "Táboas seguidas"
 #: libraries/server_privileges.lib.php:2908
 #: libraries/server_privileges.lib.php:3145
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4346
-#: templates/structure/table_header.phtml:21
-#: templates/tbl_relation/foreign_key_row.phtml:176
-#: templates/tbl_relation/internal_relational_row.phtml:63
+#: libraries/server_privileges.lib.php:4372
+#: templates/database/structure/table_header.phtml:21
+#: templates/table/relation/foreign_key_row.phtml:176
+#: templates/table/relation/internal_relational_row.phtml:63
 msgid "Table"
 msgstr "Táboa"
 
@@ -381,7 +382,7 @@ msgid "Updated"
 msgstr "Actualizada"
 
 #: db_tracking.php:130 js/messages.php:243 libraries/Menu.class.php:552
-#: libraries/Util.class.php:4314 libraries/config.values.php:104
+#: libraries/Util.class.php:4320 libraries/config.values.php:104
 #: libraries/rte/rte_events.lib.php:393 libraries/rte/rte_list.lib.php:101
 #: libraries/server_status_processes.lib.php:92 libraries/tracking.lib.php:279
 msgid "Status"
@@ -390,14 +391,15 @@ msgstr "Estado"
 #: db_tracking.php:131 db_tracking.php:290 libraries/Index.class.php:693
 #: libraries/central_columns.lib.php:687 libraries/rte/rte_list.lib.php:74
 #: libraries/rte/rte_list.lib.php:89 libraries/rte/rte_list.lib.php:102
-#: libraries/server_databases.lib.php:398
+#: libraries/server_databases.lib.php:409
 #: libraries/server_privileges.lib.php:2372
 #: libraries/server_privileges.lib.php:3166
 #: libraries/server_privileges.lib.php:3342
 #: libraries/server_user_groups.lib.php:82
 #: libraries/server_variables.lib.php:189 libraries/tracking.lib.php:280
-#: libraries/tracking.lib.php:793 templates/structure/table_header.phtml:30
-#: templates/structure/table_structure_header.phtml:23
+#: libraries/tracking.lib.php:793
+#: templates/database/structure/table_header.phtml:30
+#: templates/table/structure/table_structure_header.phtml:23
 msgid "Action"
 msgstr "Acción"
 
@@ -441,7 +443,7 @@ msgid "Untracked tables"
 msgstr "Táboas non seguidas"
 
 #: db_tracking.php:305 db_tracking.php:336
-#: templates/structure/optional_action_links.phtml:17
+#: templates/table/structure/optional_action_links.phtml:17
 msgid "Track table"
 msgstr "Seguir a táboa"
 
@@ -491,7 +493,7 @@ msgid "Value for the column \"%s\""
 msgstr "Valor para a columna «%s»"
 
 #: gis_data_editor.php:146
-#: templates/gis_visualization/gis_visualization.phtml:37
+#: templates/table/gis_visualization/gis_visualization.phtml:37
 msgid "Use OpenStreetMaps as Base Layer"
 msgstr "Utilizar OpenStreetMaps como capa base"
 
@@ -571,35 +573,35 @@ msgstr "Engadir xeometría"
 #: libraries/display_change_password.lib.php:162
 #: libraries/display_export.lib.php:402 libraries/display_export.lib.php:408
 #: libraries/display_import.lib.php:392 libraries/index.lib.php:44
-#: libraries/insert_edit.lib.php:1546 libraries/insert_edit.lib.php:1583
+#: libraries/insert_edit.lib.php:1544 libraries/insert_edit.lib.php:1581
 #: libraries/normalization.lib.php:165 libraries/normalization.lib.php:821
 #: libraries/operations.lib.php:38 libraries/operations.lib.php:108
 #: libraries/operations.lib.php:263 libraries/operations.lib.php:306
 #: libraries/operations.lib.php:801 libraries/operations.lib.php:874
 #: libraries/operations.lib.php:923 libraries/operations.lib.php:1337
 #: libraries/operations.lib.php:1658
-#: libraries/plugins/auth/AuthenticationCookie.class.php:244
+#: libraries/plugins/auth/AuthenticationCookie.class.php:232
 #: libraries/replication_gui.lib.php:122 libraries/replication_gui.lib.php:161
 #: libraries/replication_gui.lib.php:324 libraries/replication_gui.lib.php:461
 #: libraries/replication_gui.lib.php:906 libraries/rte/rte_events.lib.php:509
-#: libraries/rte/rte_routines.lib.php:969
-#: libraries/rte/rte_routines.lib.php:1581
+#: libraries/rte/rte_routines.lib.php:1060
+#: libraries/rte/rte_routines.lib.php:1672
 #: libraries/rte/rte_triggers.lib.php:396 libraries/server_bin_log.lib.php:61
 #: libraries/server_privileges.lib.php:705
 #: libraries/server_privileges.lib.php:2106
 #: libraries/server_privileges.lib.php:2872
 #: libraries/server_privileges.lib.php:3553
-#: libraries/server_privileges.lib.php:4627
+#: libraries/server_privileges.lib.php:4653
 #: libraries/server_user_groups.lib.php:285
 #: libraries/sql_query_form.lib.php:369 libraries/sql_query_form.lib.php:429
 #: libraries/tracking.lib.php:533 libraries/tracking.lib.php:653
 #: prefs_manage.php:277 prefs_manage.php:355
 #: templates/columns_definitions/column_definitions_form.phtml:59
-#: templates/header_location.phtml:17 templates/index_form.phtml:238
+#: templates/database/create_table.phtml:21 templates/header_location.phtml:28
 #: templates/startAndNumberOfRowsPanel.phtml:14
-#: templates/structure/add_column.phtml:25
-#: templates/table/create_table.phtml:21
-#: templates/table/selection_form.phtml:75 view_create.php:275
+#: templates/table/index_form.phtml:238
+#: templates/table/search/selection_form.phtml:75
+#: templates/table/structure/add_column.phtml:25 view_create.php:275
 #: view_operations.php:106
 msgid "Go"
 msgstr "Ir"
@@ -688,7 +690,7 @@ msgstr ""
 msgid "Could not load import plugins, please check your installation!"
 msgstr "Non foi posíbel importar os engadidos - Comprobe a instalación!"
 
-#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1466
+#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1460
 #, php-format
 msgid "Bookmark %s has been created."
 msgstr "Creouse o marcador %s."
@@ -730,11 +732,11 @@ msgstr ""
 msgid "Back"
 msgstr "Recuar"
 
-#: index.php:148 libraries/Footer.class.php:70
+#: index.php:149 libraries/Footer.class.php:70
 msgid "phpMyAdmin Demo Server"
 msgstr "Servidor de demostración do phpMyAdmin"
 
-#: index.php:152
+#: index.php:153
 #, php-format
 msgid ""
 "You are using the demo server. You can do anything here, but please do not "
@@ -742,112 +744,112 @@ msgid ""
 "at %s."
 msgstr ""
 
-#: index.php:162
+#: index.php:163
 msgid "General Settings"
 msgstr "Configuración xeral"
 
-#: index.php:190 libraries/display_change_password.lib.php:50
+#: index.php:191 libraries/display_change_password.lib.php:50
 #: libraries/display_change_password.lib.php:53 user_password.php:247
 msgid "Change password"
 msgstr "Trocar o contrasinal"
 
-#: index.php:206
+#: index.php:207
 msgid "Server connection collation"
 msgstr "Ordenación alfabética (collation) da conexión do servidor"
 
-#: index.php:228
+#: index.php:229
 msgid "Appearance Settings"
 msgstr "Configuración da aparencia"
 
-#: index.php:258 prefs_manage.php:285
+#: index.php:259 prefs_manage.php:285
 msgid "More settings"
 msgstr "Máis opcións"
 
-#: index.php:279
+#: index.php:280
 msgid "Database server"
 msgstr "Servidor de base de datos"
 
-#: index.php:282 libraries/plugins/auth/AuthenticationCookie.class.php:181
+#: index.php:283 libraries/plugins/auth/AuthenticationCookie.class.php:169
 msgid "Server:"
 msgstr "Servidor:"
 
-#: index.php:286
+#: index.php:287
 msgid "Server type:"
 msgstr "Tipo de servidor:"
 
-#: index.php:290 libraries/plugins/export/ExportLatex.class.php:212
+#: index.php:291 libraries/plugins/export/ExportLatex.class.php:212
 #: libraries/plugins/export/ExportSql.class.php:687
 #: libraries/plugins/export/ExportXml.class.php:189
 msgid "Server version:"
 msgstr "Versión do servidor:"
 
-#: index.php:296
+#: index.php:297
 msgid "Protocol version:"
 msgstr "Versión do protocolo:"
 
-#: index.php:300
+#: index.php:301
 msgid "User:"
 msgstr "Usuario:"
 
-#: index.php:305
+#: index.php:306
 msgid "Server charset:"
 msgstr "Conxunto de caracteres do servidor:"
 
-#: index.php:320
+#: index.php:321
 msgid "Web server"
 msgstr "Servidor web"
 
-#: index.php:331
+#: index.php:332
 msgid "Database client version:"
 msgstr "Versión do cliente da base de datos:"
 
-#: index.php:335
+#: index.php:336
 msgid "PHP extension:"
 msgstr "Extensión de PHP:"
 
-#: index.php:349
+#: index.php:350
 #, fuzzy
 #| msgid "PHP Version:"
 msgid "PHP version:"
 msgstr "Versión do PHP:"
 
-#: index.php:360
+#: index.php:361
 msgid "Show PHP information"
 msgstr "Mostrar información sobre o PHP"
 
-#: index.php:383
+#: index.php:384
 msgid "Version information:"
 msgstr "Información sobre a versión:"
 
-#: index.php:392 libraries/Util.class.php:432 libraries/Util.class.php:495
-#: libraries/config/FormDisplay.tpl.php:151
+#: index.php:393 libraries/Util.class.php:432 libraries/Util.class.php:495
+#: libraries/config/FormDisplay.tpl.php:162
 #: libraries/display_export.lib.php:577 libraries/engines/pbxt.lib.php:162
 #: libraries/navigation/NavigationHeader.class.php:196
 #: libraries/server_variables.lib.php:160
 msgid "Documentation"
 msgstr "Documentación"
 
-#: index.php:399
+#: index.php:400
 msgid "Wiki"
 msgstr "Wiki"
 
-#: index.php:408
+#: index.php:409
 msgid "Official Homepage"
 msgstr "Páxina oficial"
 
-#: index.php:415
+#: index.php:416
 msgid "Contribute"
 msgstr "Colaborar"
 
-#: index.php:422
+#: index.php:423
 msgid "Get support"
 msgstr "Obter axuda"
 
-#: index.php:429
+#: index.php:430
 msgid "List of changes"
 msgstr "Listaxe de cambios"
 
-#: index.php:451
+#: index.php:452
 #, fuzzy
 #| msgid ""
 #| "Your configuration file contains settings (root with no password) that "
@@ -866,7 +868,7 @@ msgstr ""
 "configuración, está aberto a intrusións e habería que mirar de solucionar "
 "este problema de seguranza."
 
-#: index.php:468
+#: index.php:469
 msgid ""
 "You have enabled mbstring.func_overload in your PHP configuration. This "
 "option is incompatible with phpMyAdmin and might cause some data to be "
@@ -875,7 +877,7 @@ msgstr ""
 "Ten activada mbstring.func_overload na configuración do PHP. Esta opción é "
 "incompatíbel co phpMyAdmin e podería ocasionar danos nos datos!"
 
-#: index.php:483
+#: index.php:484
 msgid ""
 "The mbstring PHP extension was not found and you seem to be using a "
 "multibyte charset. Without the mbstring extension phpMyAdmin is unable to "
@@ -886,7 +888,7 @@ msgstr ""
 "incapaz de partir cadeas correctamente e pode provocar resultados "
 "inesperados."
 
-#: index.php:500
+#: index.php:501
 #, fuzzy
 #| msgid ""
 #| "Your PHP parameter [a@http://php.net/manual/en/session.configuration."
@@ -904,7 +906,7 @@ msgstr ""
 "validez das cookies que se configurou en phpMyAdmin; por causa disto, o "
 "rexistro caducará antes do que está configurado en phpMyAdmin."
 
-#: index.php:519
+#: index.php:520
 msgid ""
 "Login cookie store is lower than cookie validity configured in phpMyAdmin, "
 "because of this, your login will expire sooner than configured in phpMyAdmin."
@@ -913,13 +915,13 @@ msgstr ""
 "que se configurou en phpMyAdmin; por causa disto, a identificación caduca "
 "antes do que está configurado no phpMyAdmin."
 
-#: index.php:535
+#: index.php:536
 msgid "The configuration file now needs a secret passphrase (blowfish_secret)."
 msgstr ""
 "O ficheiro de configuración agora necesita un contrasinal secreto "
 "(blowfish_secret)."
 
-#: index.php:548
+#: index.php:549
 msgid ""
 "Directory [code]config[/code], which is used by the setup script, still "
 "exists in your phpMyAdmin directory. It is strongly recommended to remove it "
@@ -932,7 +934,7 @@ msgstr ""
 "servidor poderíase ver comprometida por persoas non autorizadas que "
 "descargasen a configuración."
 
-#: index.php:564
+#: index.php:565
 #, fuzzy, php-format
 #| msgid ""
 #| "The phpMyAdmin configuration storage is not completely configured, some "
@@ -945,12 +947,12 @@ msgstr ""
 "desactiváronse algunhas funcionalidades estendidas. Para saber o por que, "
 "prema %saquí%s."
 
-#: index.php:571
+#: index.php:572
 msgid ""
 "Or alternately go to 'Operations' tab of any database to set it up there."
 msgstr ""
 
-#: index.php:620
+#: index.php:621
 #, php-format
 msgid ""
 "Your PHP MySQL library version %s differs from your MySQL server version %s. "
@@ -959,7 +961,7 @@ msgstr ""
 "A versión %s da biblioteca de PHP MySQL difire da versión %s do servidor de "
 "MySQL. Isto pode ocasionar un comportamento impredicíbel."
 
-#: index.php:648
+#: index.php:649
 #, php-format
 msgid ""
 "Server running with Suhosin. Please refer to %sdocumentation%s for possible "
@@ -1134,8 +1136,8 @@ msgstr ""
 msgid "Save & Close"
 msgstr "Enviar <i>(gravar nun ficheiro)</i><br />"
 
-#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:404
-#: libraries/insert_edit.lib.php:1550 prefs_manage.php:361
+#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:415
+#: libraries/insert_edit.lib.php:1548 prefs_manage.php:361
 #: prefs_manage.php:372
 msgid "Reset"
 msgstr "Reiniciar"
@@ -1176,7 +1178,7 @@ msgstr "Engadir un índice"
 msgid "Edit Index"
 msgstr "Editar o índice"
 
-#: js/messages.php:99 templates/index_form.phtml:232
+#: js/messages.php:99 templates/table/index_form.phtml:232
 #, php-format
 msgid "Add %s column(s) to index"
 msgstr "Engadir %s columna(s) ao índice"
@@ -1205,13 +1207,14 @@ msgstr "Columnas delimitadas por:"
 msgid "Please select column(s) for the index."
 msgstr "Engadir %s columna(s) ao índice"
 
-#: js/messages.php:106 templates/structure/add_column.phtml:1
+#: js/messages.php:106 templates/table/structure/add_column.phtml:1
 msgid "You have to add at least one column."
 msgstr "Debe engadir ao menos unha columna."
 
-#: js/messages.php:109 libraries/insert_edit.lib.php:1548
+#: js/messages.php:109 libraries/insert_edit.lib.php:1546
 #: templates/columns_definitions/column_definitions_form.phtml:162
-#: templates/index_form.phtml:237 templates/tbl_relation/common_form.phtml:106
+#: templates/table/index_form.phtml:237
+#: templates/table/relation/common_form.phtml:106
 msgid "Preview SQL"
 msgstr ""
 
@@ -1232,7 +1235,7 @@ msgid "SQL query:"
 msgstr "Consulta de SQL:"
 
 #. l10n: Default label for the y-Axis of Charts
-#: js/messages.php:118 templates/tbl_chart.phtml:109
+#: js/messages.php:118 templates/table/chart/tbl_chart.phtml:109
 msgid "Y Values"
 msgstr "Valores Y"
 
@@ -1395,7 +1398,7 @@ msgstr "Bytes enviados"
 msgid "Bytes received"
 msgstr "Bytes recibidos"
 
-#: js/messages.php:169 libraries/server_status.lib.php:226
+#: js/messages.php:169 libraries/server_status.lib.php:235
 msgid "Connections"
 msgstr "Conexións"
 
@@ -1452,12 +1455,12 @@ msgstr "%d táboa(s)"
 msgid "Questions"
 msgstr "Preguntas"
 
-#: js/messages.php:184 libraries/server_status.lib.php:134
+#: js/messages.php:184 libraries/server_status.lib.php:143
 msgid "Traffic"
 msgstr "Tráfico"
 
 #: js/messages.php:185 libraries/Menu.class.php:586
-#: libraries/Util.class.php:4318 libraries/server_status_monitor.lib.php:257
+#: libraries/Util.class.php:4324 libraries/server_status_monitor.lib.php:257
 msgid "Settings"
 msgstr "Configuración"
 
@@ -1479,8 +1482,9 @@ msgstr "Engada ao menos unha variábel á serie"
 #: libraries/server_status_monitor.lib.php:236
 #: libraries/server_status_processes.lib.php:308
 #: templates/columns_definitions/transformation.phtml:4
-#: templates/designer/options_panel.phtml:178
-#: templates/table/options_zoom.phtml:12 templates/table/rows_zoom.phtml:26
+#: templates/database/designer/options_panel.phtml:178
+#: templates/table/search/options_zoom.phtml:12
+#: templates/table/search/rows_zoom.phtml:26
 msgid "None"
 msgstr "Ningunha"
 
@@ -1772,8 +1776,8 @@ msgstr ""
 
 #: js/messages.php:270 libraries/Menu.class.php:352
 #: libraries/Menu.class.php:455 libraries/Menu.class.php:582
-#: libraries/Util.class.php:4317 libraries/Util.class.php:4332
-#: libraries/Util.class.php:4349 libraries/config/messages.inc.php:258
+#: libraries/Util.class.php:4323 libraries/Util.class.php:4338
+#: libraries/Util.class.php:4355 libraries/config/messages.inc.php:258
 #: libraries/display_import.lib.php:105
 #: libraries/server_status_monitor.lib.php:318 prefs_manage.php:238
 #: setup/frames/menu.inc.php:26
@@ -1835,13 +1839,13 @@ msgid "Formatting SQL..."
 msgstr ""
 
 #: js/messages.php:293 libraries/server_variables.lib.php:157
-#: templates/designer/aggregate_query_panel.phtml:63
-#: templates/designer/delete_relation_panel.phtml:28
-#: templates/designer/having_query_panel.phtml:117
-#: templates/designer/new_relation_panel.phtml:88
-#: templates/designer/options_panel.phtml:253
-#: templates/designer/rename_to_panel.phtml:45
-#: templates/designer/where_query_panel.phtml:83
+#: templates/database/designer/aggregate_query_panel.phtml:63
+#: templates/database/designer/delete_relation_panel.phtml:28
+#: templates/database/designer/having_query_panel.phtml:117
+#: templates/database/designer/new_relation_panel.phtml:88
+#: templates/database/designer/options_panel.phtml:253
+#: templates/database/designer/rename_to_panel.phtml:45
+#: templates/database/designer/where_query_panel.phtml:83
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -1851,7 +1855,7 @@ msgstr "Cancelar"
 msgid "Page-related settings"
 msgstr "Cambiar a configuración"
 
-#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:402
+#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:413
 msgid "Apply"
 msgstr "Aplicar"
 
@@ -1886,8 +1890,8 @@ msgstr "Código de erro: %s"
 msgid "Error text: %s"
 msgstr "Texto do erro: %s"
 
-#: js/messages.php:307 libraries/db_common.inc.php:68
-#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:450
+#: js/messages.php:307 libraries/db_common.inc.php:69
+#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:461
 msgid "No databases selected."
 msgstr "Non hai ningunha base de datos escollida."
 
@@ -1899,12 +1903,13 @@ msgstr "A eliminar a columna"
 msgid "Adding Primary Key"
 msgstr "A engadir unha chave primaria"
 
-#: js/messages.php:310 templates/designer/aggregate_query_panel.phtml:59
-#: templates/designer/having_query_panel.phtml:113
-#: templates/designer/new_relation_panel.phtml:87
-#: templates/designer/options_panel.phtml:252
-#: templates/designer/rename_to_panel.phtml:41
-#: templates/designer/where_query_panel.phtml:82
+#: js/messages.php:310
+#: templates/database/designer/aggregate_query_panel.phtml:59
+#: templates/database/designer/having_query_panel.phtml:113
+#: templates/database/designer/new_relation_panel.phtml:87
+#: templates/database/designer/options_panel.phtml:252
+#: templates/database/designer/rename_to_panel.phtml:41
+#: templates/database/designer/where_query_panel.phtml:82
 msgid "OK"
 msgstr "OK"
 
@@ -1924,7 +1929,7 @@ msgstr "A copiar a base de datos"
 msgid "Changing Charset"
 msgstr "A cambiar o xogo de caracteres"
 
-#: js/messages.php:320 libraries/Util.class.php:3217
+#: js/messages.php:320 libraries/Util.class.php:3223
 #, fuzzy
 #| msgid "Disable foreign key checks"
 msgid "Enable foreign key checks"
@@ -1963,20 +1968,21 @@ msgstr "A definición dunha función gardada debe conter unha instrución RETURN
 #: js/messages.php:334 libraries/DisplayResults.class.php:4834
 #: libraries/DisplayResults.class.php:5092 libraries/Menu.class.php:344
 #: libraries/Menu.class.php:446 libraries/Menu.class.php:578
-#: libraries/Util.class.php:3636 libraries/Util.class.php:3637
-#: libraries/Util.class.php:4316 libraries/Util.class.php:4331
-#: libraries/Util.class.php:4348 libraries/config/messages.inc.php:252
+#: libraries/Util.class.php:3642 libraries/Util.class.php:3643
+#: libraries/Util.class.php:4322 libraries/Util.class.php:4337
+#: libraries/Util.class.php:4354 libraries/config/messages.inc.php:252
 #: libraries/display_export.lib.php:173 libraries/rte/rte_list.lib.php:146
 #: libraries/server_privileges.lib.php:2211
 #: libraries/server_privileges.lib.php:2290
 #: libraries/server_privileges.lib.php:2632
 #: libraries/server_privileges.lib.php:3356
 #: libraries/server_status_monitor.lib.php:322 prefs_manage.php:303
-#: setup/frames/menu.inc.php:27 templates/structure/check_all_tables.phtml:11
+#: setup/frames/menu.inc.php:27
+#: templates/database/structure/check_all_tables.phtml:11
 msgid "Export"
 msgstr "Exportar"
 
-#: js/messages.php:337 libraries/rte/rte_routines.lib.php:652
+#: js/messages.php:337 libraries/rte/rte_routines.lib.php:743
 msgid "ENUM/SET editor"
 msgstr "Editor  de ENUM/SET"
 
@@ -2017,7 +2023,7 @@ msgstr "Mostrar a caixa de consultas"
 #: libraries/Console.class.php:214 libraries/DisplayResults.class.php:3474
 #: libraries/DisplayResults.class.php:4818 libraries/Index.class.php:723
 #: libraries/Util.class.php:706 libraries/Util.class.php:1202
-#: libraries/Util.class.php:3634 libraries/Util.class.php:3635
+#: libraries/Util.class.php:3640 libraries/Util.class.php:3641
 #: libraries/central_columns.lib.php:851
 #: libraries/central_columns.lib.php:1193
 #: libraries/config/messages.inc.php:892
@@ -2035,7 +2041,7 @@ msgstr "Editar"
 #: libraries/server_user_groups.lib.php:129
 #: libraries/sql_query_form.lib.php:416 libraries/tracking.lib.php:477
 #: setup/frames/index.inc.php:183 setup/frames/index.inc.php:291
-#: templates/designer/delete_relation_panel.phtml:27
+#: templates/database/designer/delete_relation_panel.phtml:27
 msgid "Delete"
 msgstr "Eliminar"
 
@@ -2219,11 +2225,11 @@ msgid "No dependencies selected!"
 msgstr "Non hai ningunha base de datos escollida."
 
 #: js/messages.php:394 libraries/central_columns.lib.php:1214
-#: libraries/insert_edit.lib.php:1458 libraries/server_variables.lib.php:155
+#: libraries/insert_edit.lib.php:1456 libraries/server_variables.lib.php:155
 #: setup/frames/config.inc.php:42 setup/frames/index.inc.php:279
 #: templates/columns_definitions/column_definitions_form.phtml:165
-#: templates/gis_visualization/gis_visualization.phtml:48
-#: templates/tbl_relation/common_form.phtml:107
+#: templates/table/gis_visualization/gis_visualization.phtml:48
+#: templates/table/relation/common_form.phtml:107
 msgid "Save"
 msgstr "Gardar"
 
@@ -2311,8 +2317,8 @@ msgid "Data point content"
 msgstr "Contido do punto de datos"
 
 #: js/messages.php:430 js/messages.php:562 js/messages.php:579
-#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2573
-#: templates/index_form.phtml:154 templates/index_form.phtml:194
+#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2571
+#: templates/table/index_form.phtml:154 templates/table/index_form.phtml:194
 msgid "Ignore"
 msgstr "Ignorar"
 
@@ -2375,8 +2381,8 @@ msgstr "Escoller unha chave externa"
 msgid "Please select the primary key or a unique key!"
 msgstr "Escolla a chave primaria ou unha chave única"
 
-#: js/messages.php:457 templates/designer/side_menu.phtml:91
-#: templates/designer/side_menu.phtml:94
+#: js/messages.php:457 templates/database/designer/side_menu.phtml:91
+#: templates/database/designer/side_menu.phtml:94
 msgid "Choose column to display"
 msgstr "Escolla a columna que desexe mostrar"
 
@@ -2392,22 +2398,22 @@ msgstr ""
 msgid "Page name"
 msgstr "Nome da páxina"
 
-#: js/messages.php:463 templates/designer/side_menu.phtml:56
-#: templates/designer/side_menu.phtml:59
+#: js/messages.php:463 templates/database/designer/side_menu.phtml:56
+#: templates/database/designer/side_menu.phtml:59
 #, fuzzy
 #| msgid "Select page"
 msgid "Save page"
 msgstr "Escoller unha páxina"
 
-#: js/messages.php:464 templates/designer/side_menu.phtml:63
-#: templates/designer/side_menu.phtml:66
+#: js/messages.php:464 templates/database/designer/side_menu.phtml:63
+#: templates/database/designer/side_menu.phtml:66
 #, fuzzy
 #| msgid "Select page"
 msgid "Save page as"
 msgstr "Escoller unha páxina"
 
-#: js/messages.php:465 templates/designer/side_menu.phtml:49
-#: templates/designer/side_menu.phtml:52
+#: js/messages.php:465 templates/database/designer/side_menu.phtml:49
+#: templates/database/designer/side_menu.phtml:52
 #, fuzzy
 #| msgid "Free pages"
 msgid "Open page"
@@ -2419,7 +2425,7 @@ msgstr "Páxinas libres"
 msgid "Delete page"
 msgstr "Escoller unha páxina"
 
-#: js/messages.php:467 templates/designer/side_menu.phtml:10
+#: js/messages.php:467 templates/database/designer/side_menu.phtml:10
 #, fuzzy
 #| msgid "Unit"
 msgid "Untitled"
@@ -2560,7 +2566,7 @@ msgstr "Cadea orixinal"
 msgid "cancel"
 msgstr "Cancelar"
 
-#: js/messages.php:499 libraries/server_status.lib.php:271
+#: js/messages.php:499 libraries/server_status.lib.php:280
 msgid "Aborted"
 msgstr "Interrompido"
 
@@ -3194,7 +3200,7 @@ msgstr "Non é un número de porto válido"
 
 #: js/messages.php:793 libraries/Message.class.php:199
 #: libraries/Util.class.php:654 libraries/core.lib.php:245
-#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1172
+#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1170
 #: tbl_operations.php:229 view_operations.php:63
 msgid "Error"
 msgstr "Produciuse un erro"
@@ -3257,8 +3263,8 @@ msgstr "por segundo"
 msgid "per minute"
 msgstr "por minuto"
 
-#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:143
-#: libraries/server_status.lib.php:228
+#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:152
+#: libraries/server_status.lib.php:237
 #: libraries/server_status_queries.lib.php:98
 msgid "per hour"
 msgstr "por hora"
@@ -3278,7 +3284,7 @@ msgstr ""
 "Os permisos do ficheiro de configuración son incorrectos; non debería poder "
 "escribir nel todo o mundo!"
 
-#: libraries/Config.class.php:1799
+#: libraries/Config.class.php:1801
 msgid "Font size"
 msgstr "Tamaño da letra"
 
@@ -3308,10 +3314,10 @@ msgstr "subconsulta"
 #: libraries/server_privileges.lib.php:2890
 #: libraries/server_privileges.lib.php:3144
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4332
+#: libraries/server_privileges.lib.php:4358
 #: libraries/server_status_processes.lib.php:80
-#: templates/tbl_relation/foreign_key_row.phtml:165
-#: templates/tbl_relation/internal_relational_row.phtml:55
+#: templates/table/relation/foreign_key_row.phtml:165
+#: templates/table/relation/internal_relational_row.phtml:55
 msgid "Database"
 msgstr "Base de datos"
 
@@ -3422,11 +3428,11 @@ msgstr "Historial de SQL"
 #: libraries/plugins/import/ImportMediawiki.class.php:60
 #: libraries/plugins/import/ImportOds.class.php:59
 #: libraries/plugins/import/ImportShp.class.php:57
-#: libraries/plugins/import/ImportSql.class.php:148
+#: libraries/plugins/import/ImportSql.class.php:51
 #: libraries/plugins/import/ImportXml.class.php:58
-#: libraries/rte/rte_routines.lib.php:833 templates/index_form.phtml:49
-#: templates/structure/row_stats_table.phtml:20
-#: templates/table/options.phtml:2
+#: libraries/rte/rte_routines.lib.php:924 templates/table/index_form.phtml:49
+#: templates/table/search/options.phtml:2
+#: templates/table/structure/row_stats_table.phtml:20
 msgid "Options"
 msgstr "Opcións"
 
@@ -3471,7 +3477,8 @@ msgstr "Descendente"
 msgid "Order:"
 msgstr "Orde"
 
-#: libraries/Console.class.php:289 templates/table/replace_preview.phtml:17
+#: libraries/Console.class.php:289
+#: templates/table/search/replace_preview.phtml:17
 msgid "Count"
 msgstr "Cantidade"
 
@@ -3594,9 +3601,9 @@ msgstr "Ir á táboa copiada"
 #: libraries/operations.lib.php:794 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:191
-#: templates/structure/sortable_header.phtml:21
-#: templates/structure/sortable_header.phtml:38
-#: templates/table/options.phtml:68
+#: templates/database/structure/sortable_header.phtml:21
+#: templates/database/structure/sortable_header.phtml:38
+#: templates/table/search/options.phtml:68
 msgid "Ascending"
 msgstr "Ascendente"
 
@@ -3606,13 +3613,14 @@ msgstr "Ascendente"
 #: libraries/operations.lib.php:797 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:188
-#: templates/structure/sortable_header.phtml:26
-#: templates/structure/sortable_header.phtml:43
-#: templates/table/options.phtml:69
+#: templates/database/structure/sortable_header.phtml:26
+#: templates/database/structure/sortable_header.phtml:43
+#: templates/table/search/options.phtml:69
 msgid "Descending"
 msgstr "Descendente"
 
-#: libraries/DBQbe.class.php:467 templates/table/search_and_replace.phtml:6
+#: libraries/DBQbe.class.php:467
+#: templates/table/search/search_and_replace.phtml:6
 msgid "Column:"
 msgstr "Columna:"
 
@@ -3783,12 +3791,12 @@ msgstr[0] "%1$s coincidencia en <strong>%2$s</strong>"
 msgstr[1] "%1$s coincidencias en <strong>%2$s</strong>"
 
 #: libraries/DbSearch.class.php:354 libraries/Menu.class.php:311
-#: libraries/Util.class.php:3337 libraries/Util.class.php:3347
-#: libraries/Util.class.php:3623 libraries/Util.class.php:3624
-#: libraries/Util.class.php:4343 libraries/config.values.php:43
+#: libraries/Util.class.php:3343 libraries/Util.class.php:3353
+#: libraries/Util.class.php:3629 libraries/Util.class.php:3630
+#: libraries/Util.class.php:4349 libraries/config.values.php:43
 #: libraries/config.values.php:51 libraries/config.values.php:119
 #: libraries/navigation/Nodes/Node_Table.class.php:295
-#: templates/structure/check_all_table_column.phtml:5
+#: templates/table/structure/check_all_table_column.phtml:5
 msgid "Browse"
 msgstr "Visualizar"
 
@@ -3805,7 +3813,8 @@ msgstr "Buscar na base de datos"
 msgid "Words or values to search for (wildcard: \"%\"):"
 msgstr "Palabras ou valores que buscar (ou comodín é: «%»):"
 
-#: libraries/DbSearch.class.php:401 templates/table/search_and_replace.phtml:1
+#: libraries/DbSearch.class.php:401
+#: templates/table/search/search_and_replace.phtml:1
 msgid "Find:"
 msgstr "Atopar:"
 
@@ -3853,28 +3862,28 @@ msgstr "Filtros"
 msgid "Search this table"
 msgstr "Buscar na base de datos"
 
-#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2532
-#: libraries/Util.class.php:2535
+#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2538
+#: libraries/Util.class.php:2541
 msgctxt "First page"
 msgid "Begin"
 msgstr "Inicio"
 
-#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2533
-#: libraries/Util.class.php:2536 libraries/server_bin_log.lib.php:170
+#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2539
+#: libraries/Util.class.php:2542 libraries/server_bin_log.lib.php:170
 #: libraries/server_bin_log.lib.php:172
 msgctxt "Previous page"
 msgid "Previous"
 msgstr "Anterior"
 
-#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2564
-#: libraries/Util.class.php:2574 libraries/server_bin_log.lib.php:204
+#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2570
+#: libraries/Util.class.php:2580 libraries/server_bin_log.lib.php:204
 #: libraries/server_bin_log.lib.php:206
 msgctxt "Next page"
 msgid "Next"
 msgstr "Seguinte"
 
-#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2565
-#: libraries/Util.class.php:2575
+#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2571
+#: libraries/Util.class.php:2581
 msgctxt "Last page"
 msgid "End"
 msgstr "Fin"
@@ -3954,9 +3963,9 @@ msgstr ""
 "Pode non ser exacto. Consulte a [doc@faq3-11]pregunta frecuente 3.11[/doc]"
 
 #: libraries/DisplayResults.class.php:4332 libraries/Message.class.php:180
-#: libraries/controllers/TableRelationController.class.php:258
+#: libraries/controllers/TableRelationController.class.php:259
 #: libraries/controllers/TableSearchController.class.php:655
-#: libraries/rte/rte_routines.lib.php:1332 libraries/sql_query_form.lib.php:89
+#: libraries/rte/rte_routines.lib.php:1423 libraries/sql_query_form.lib.php:89
 #: tbl_operations.php:227 tbl_row_action.php:138 view_operations.php:62
 #, fuzzy
 #| msgid "Your SQL query has been executed successfully."
@@ -3964,7 +3973,7 @@ msgid "Your SQL query has been executed successfully."
 msgstr "A consulta de SQL executouse sen problemas"
 
 #: libraries/DisplayResults.class.php:4660
-#: libraries/controllers/StructureController.class.php:629
+#: libraries/controllers/DatabaseStructureController.class.php:564
 #, php-format
 msgid ""
 "This view has at least this number of rows. Please refer to %sdocumentation"
@@ -3990,34 +3999,34 @@ msgstr ""
 msgid "%d total"
 msgstr "total"
 
-#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1318
+#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1312
 #, fuzzy, php-format
 #| msgid "Query took %01.4f sec"
 msgid "Query took %01.4f seconds."
 msgstr "a consulta levou %01.4f segundos"
 
 #: libraries/DisplayResults.class.php:4807
-#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4767
-#: libraries/Util.class.php:4773 libraries/mult_submits.inc.php:50
-#: templates/structure/check_all_tables.phtml:2
-#: templates/structure/check_all_tables.phtml:9
+#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4773
+#: libraries/Util.class.php:4779 libraries/mult_submits.inc.php:50
+#: templates/database/structure/check_all_tables.phtml:2
+#: templates/database/structure/check_all_tables.phtml:9
 msgid "With selected:"
 msgstr "Cos marcados:"
 
 #: libraries/DisplayResults.class.php:4811
-#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4769
-#: libraries/Util.class.php:4770 libraries/server_privileges.lib.php:1174
+#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4775
+#: libraries/Util.class.php:4776 libraries/server_privileges.lib.php:1174
 #: libraries/server_privileges.lib.php:1175
 #: libraries/server_privileges.lib.php:1387
 #: libraries/server_user_groups.lib.php:231
-#: templates/structure/check_all_tables.phtml:3
-#: templates/structure/check_all_tables.phtml:4
+#: templates/database/structure/check_all_tables.phtml:3
+#: templates/database/structure/check_all_tables.phtml:4
 msgid "Check All"
 msgstr "Marcalos todos"
 
 #: libraries/DisplayResults.class.php:4985 libraries/Header.class.php:383
-#: templates/structure/optional_action_links.phtml:1
-#: templates/structure/print_view_data_dictionary_link.phtml:3
+#: templates/database/structure/print_view_data_dictionary_link.phtml:3
+#: templates/table/structure/optional_action_links.phtml:1
 msgid "Print view"
 msgstr "Visualización previa da impresión"
 
@@ -4025,7 +4034,8 @@ msgstr "Visualización previa da impresión"
 msgid "Query results operations"
 msgstr "Operacións cos resultados da consulta"
 
-#: libraries/DisplayResults.class.php:5105 templates/tbl_chart.phtml:12
+#: libraries/DisplayResults.class.php:5105
+#: templates/table/chart/tbl_chart.phtml:12
 msgid "Display chart"
 msgstr "Mostrar a gráfica"
 
@@ -4132,7 +4142,7 @@ msgid "Click on the bar to scroll to top of page"
 msgstr "Prema a barra para desprazarse até a parte superior da páxina"
 
 #: libraries/Header.class.php:749
-#: libraries/plugins/auth/AuthenticationCookie.class.php:152
+#: libraries/plugins/auth/AuthenticationCookie.class.php:140
 #, fuzzy
 #| msgid "Javascript must be enabled past this point"
 msgid "Javascript must be enabled past this point!"
@@ -4156,11 +4166,11 @@ msgid "Keyname"
 msgstr "Nome da chave"
 
 #: libraries/Index.class.php:697
-#: libraries/controllers/StructureController.class.php:1962
-#: libraries/controllers/StructureController.class.php:1967
+#: libraries/controllers/TableStructureController.class.php:953
+#: libraries/controllers/TableStructureController.class.php:958
 #: libraries/tracking.lib.php:973
 #: templates/columns_definitions/column_indexes.phtml:11
-#: templates/structure/check_all_table_column.phtml:26
+#: templates/table/structure/check_all_table_column.phtml:26
 msgid "Unique"
 msgstr "Único"
 
@@ -4179,16 +4189,17 @@ msgstr "Cardinalidade"
 #: libraries/server_collations.lib.php:35 libraries/tracking.lib.php:881
 #: libraries/tracking.lib.php:977
 #: templates/columns_definitions/table_fields_definitions.phtml:33
-#: templates/structure/row_stats_table.phtml:31
-#: templates/structure/table_header.phtml:55
-#: templates/structure/table_structure_header.phtml:7
-#: templates/table/table_header.phtml:8
+#: templates/database/structure/table_header.phtml:55
+#: templates/table/search/table_header.phtml:8
+#: templates/table/structure/row_stats_table.phtml:31
+#: templates/table/structure/table_structure_header.phtml:7
 msgid "Collation"
 msgstr "Orde alfabética"
 
 #: libraries/Index.class.php:703 libraries/rte/rte_events.lib.php:496
-#: libraries/rte/rte_routines.lib.php:956 libraries/tracking.lib.php:885
-#: libraries/tracking.lib.php:979 templates/structure/table_header.phtml:84
+#: libraries/rte/rte_routines.lib.php:1047 libraries/tracking.lib.php:885
+#: libraries/tracking.lib.php:979
+#: templates/database/structure/table_header.phtml:84
 msgid "Comment"
 msgstr "Comentario"
 
@@ -4201,15 +4212,15 @@ msgstr "Eliminouse a chave primaria."
 msgid "Index %s has been dropped."
 msgstr "Eliminouse o índice %s."
 
-#: libraries/Index.class.php:757 libraries/Util.class.php:3630
-#: libraries/Util.class.php:3631
-#: libraries/controllers/StructureController.class.php:1958
-#: libraries/controllers/StructureController.class.php:1959
+#: libraries/Index.class.php:757 libraries/Util.class.php:3636
+#: libraries/Util.class.php:3637
+#: libraries/controllers/TableStructureController.class.php:949
+#: libraries/controllers/TableStructureController.class.php:950
 #: libraries/operations.lib.php:1607 libraries/rte/rte_list.lib.php:150
 #: libraries/server_databases.lib.php:146
-#: templates/structure/check_all_table_column.phtml:15
-#: templates/structure/check_all_tables.phtml:16
-#: templates/tbl_relation/foreign_key_row.phtml:93
+#: templates/database/structure/check_all_tables.phtml:16
+#: templates/table/relation/foreign_key_row.phtml:93
+#: templates/table/structure/check_all_table_column.phtml:15
 msgid "Drop"
 msgstr "Eliminar"
 
@@ -4240,16 +4251,16 @@ msgstr "Servidor"
 #: libraries/Menu.class.php:248
 #: libraries/navigation/Nodes/Node_View.class.php:32
 #: libraries/tbl_info.inc.php:63
-#: templates/structure/structure_table_row.phtml:97
-#: templates/structure/structure_table_row.phtml:159
+#: templates/database/structure/structure_table_row.phtml:97
+#: templates/database/structure/structure_table_row.phtml:159
 msgid "View"
 msgstr "Vista"
 
 #: libraries/Menu.class.php:325 libraries/Menu.class.php:429
-#: libraries/Menu.class.php:548 libraries/Util.class.php:3334
-#: libraries/Util.class.php:3344 libraries/Util.class.php:3350
-#: libraries/Util.class.php:4313 libraries/Util.class.php:4328
-#: libraries/Util.class.php:4345 libraries/config.values.php:40
+#: libraries/Menu.class.php:548 libraries/Util.class.php:3340
+#: libraries/Util.class.php:3350 libraries/Util.class.php:3356
+#: libraries/Util.class.php:4319 libraries/Util.class.php:4334
+#: libraries/Util.class.php:4351 libraries/config.values.php:40
 #: libraries/config.values.php:48 libraries/config.values.php:110
 #: libraries/config.values.php:116 libraries/config/messages.inc.php:321
 #: libraries/navigation/Nodes/Node_Table.class.php:292
@@ -4257,19 +4268,19 @@ msgid "SQL"
 msgstr "SQL"
 
 #: libraries/Menu.class.php:328 libraries/Menu.class.php:432
-#: libraries/Util.class.php:3335 libraries/Util.class.php:3345
-#: libraries/Util.class.php:3351 libraries/Util.class.php:3625
-#: libraries/Util.class.php:3626 libraries/Util.class.php:4329
-#: libraries/Util.class.php:4346 libraries/config.values.php:41
+#: libraries/Util.class.php:3341 libraries/Util.class.php:3351
+#: libraries/Util.class.php:3357 libraries/Util.class.php:3631
+#: libraries/Util.class.php:3632 libraries/Util.class.php:4335
+#: libraries/Util.class.php:4352 libraries/config.values.php:41
 #: libraries/config.values.php:49 libraries/config.values.php:111
 #: libraries/config.values.php:117
 #: libraries/navigation/Nodes/Node_Table.class.php:286
 msgid "Search"
 msgstr "Buscar"
 
-#: libraries/Menu.class.php:338 libraries/Util.class.php:3336
-#: libraries/Util.class.php:3346 libraries/Util.class.php:3627
-#: libraries/Util.class.php:3628 libraries/Util.class.php:4347
+#: libraries/Menu.class.php:338 libraries/Util.class.php:3342
+#: libraries/Util.class.php:3352 libraries/Util.class.php:3633
+#: libraries/Util.class.php:3634 libraries/Util.class.php:4353
 #: libraries/config.values.php:42 libraries/config.values.php:50
 #: libraries/config.values.php:118
 #: libraries/navigation/Nodes/Node_Table.class.php:289
@@ -4278,30 +4289,30 @@ msgid "Insert"
 msgstr "Inserir"
 
 #: libraries/Menu.class.php:362 libraries/Menu.class.php:467
-#: libraries/Util.class.php:4334 libraries/Util.class.php:4350
+#: libraries/Util.class.php:4340 libraries/Util.class.php:4356
 #: libraries/config.values.php:106 libraries/server_common.lib.php:51
 #: libraries/server_privileges.lib.php:2370
 #: libraries/server_privileges.lib.php:3158
-#: libraries/server_privileges.lib.php:4221
+#: libraries/server_privileges.lib.php:4247
 msgid "Privileges"
 msgstr "Privilexios"
 
 #: libraries/Menu.class.php:371 libraries/Menu.class.php:379
-#: libraries/Menu.class.php:459 libraries/Util.class.php:3338
-#: libraries/Util.class.php:3352 libraries/Util.class.php:4333
-#: libraries/Util.class.php:4351 libraries/config.values.php:112
+#: libraries/Menu.class.php:459 libraries/Util.class.php:3344
+#: libraries/Util.class.php:3358 libraries/Util.class.php:4339
+#: libraries/Util.class.php:4357 libraries/config.values.php:112
 #: view_operations.php:92
 msgid "Operations"
 msgstr "Operacións"
 
 #: libraries/Menu.class.php:384 libraries/Menu.class.php:492
-#: libraries/Util.class.php:4338 libraries/Util.class.php:4352
+#: libraries/Util.class.php:4344 libraries/Util.class.php:4358
 #: libraries/relation.lib.php:255
 msgid "Tracking"
 msgstr "Seguimento"
 
 #: libraries/Menu.class.php:397 libraries/Menu.class.php:486
-#: libraries/Util.class.php:4337 libraries/Util.class.php:4353
+#: libraries/Util.class.php:4343 libraries/Util.class.php:4359
 #: libraries/navigation/Nodes/Node_Trigger_Container.class.php:24
 #: libraries/plugins/export/ExportHtmlword.class.php:557
 #: libraries/plugins/export/ExportOdt.class.php:685
@@ -4318,16 +4329,16 @@ msgstr "Disparadores"
 msgid "Database seems to be empty!"
 msgstr "Parece ser que a táboa está baleira!"
 
-#: libraries/Menu.class.php:439 libraries/Util.class.php:4330
+#: libraries/Menu.class.php:439 libraries/Util.class.php:4336
 msgid "Query"
 msgstr "Consulta"
 
-#: libraries/Menu.class.php:472 libraries/Util.class.php:4335
+#: libraries/Menu.class.php:472 libraries/Util.class.php:4341
 #: libraries/rte/rte_words.lib.php:36
 msgid "Routines"
 msgstr "Rutinas"
 
-#: libraries/Menu.class.php:479 libraries/Util.class.php:4336
+#: libraries/Menu.class.php:479 libraries/Util.class.php:4342
 #: libraries/navigation/Nodes/Node_Event_Container.class.php:26
 #: libraries/plugins/export/ExportSql.class.php:940
 #: libraries/plugins/export/ExportXml.class.php:107
@@ -4335,22 +4346,22 @@ msgstr "Rutinas"
 msgid "Events"
 msgstr "Acontecementos"
 
-#: libraries/Menu.class.php:498 libraries/Util.class.php:4339
+#: libraries/Menu.class.php:498 libraries/Util.class.php:4345
 msgid "Designer"
 msgstr "Deseñador"
 
-#: libraries/Menu.class.php:507 libraries/Util.class.php:4340
-#: templates/structure/check_all_tables.phtml:35
+#: libraries/Menu.class.php:507 libraries/Util.class.php:4346
+#: templates/database/structure/check_all_tables.phtml:35
 #, fuzzy
 #| msgid "Textarea columns"
 msgid "Central columns"
 msgstr "Columnas da área de texto"
 
-#: libraries/Menu.class.php:544 libraries/Util.class.php:4312
+#: libraries/Menu.class.php:544 libraries/Util.class.php:4318
 #: libraries/config.values.php:103 libraries/config/messages.inc.php:266
 #: libraries/config/messages.inc.php:341
 #: libraries/navigation/NavigationTree.class.php:1239
-#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4332
+#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4358
 msgid "Databases"
 msgstr "Bases de datos"
 
@@ -4361,34 +4372,34 @@ msgid "User accounts"
 msgstr "Usuarios"
 
 #: libraries/Menu.class.php:595 libraries/ServerStatusData.class.php:121
-#: libraries/Util.class.php:4319 libraries/server_common.lib.php:36
+#: libraries/Util.class.php:4325 libraries/server_common.lib.php:36
 msgid "Binary log"
 msgstr "Rexistro binario"
 
 #: libraries/Menu.class.php:601 libraries/ServerStatusData.class.php:126
-#: libraries/Util.class.php:4320 libraries/server_common.lib.php:42
-#: templates/structure/body_for_table_summary.phtml:10
-#: templates/structure/table_header.phtml:27
+#: libraries/Util.class.php:4326 libraries/server_common.lib.php:42
+#: templates/database/structure/body_for_table_summary.phtml:10
+#: templates/database/structure/table_header.phtml:27
 msgid "Replication"
 msgstr "Replicación"
 
 #: libraries/Menu.class.php:606 libraries/ServerStatusData.class.php:193
-#: libraries/Util.class.php:4321 libraries/config.values.php:105
+#: libraries/Util.class.php:4327 libraries/config.values.php:105
 #: libraries/server_engines.lib.php:108 libraries/server_engines.lib.php:112
 #: libraries/sql_query_form.lib.php:421
 msgid "Variables"
 msgstr "Variábeis"
 
-#: libraries/Menu.class.php:610 libraries/Util.class.php:4322
+#: libraries/Menu.class.php:610 libraries/Util.class.php:4328
 msgid "Charsets"
 msgstr "Conxuntos de caracteres"
 
-#: libraries/Menu.class.php:615 libraries/Util.class.php:4323
+#: libraries/Menu.class.php:615 libraries/Util.class.php:4329
 #: libraries/server_common.lib.php:33 libraries/server_plugins.lib.php:27
 msgid "Plugins"
 msgstr "Engadidos"
 
-#: libraries/Menu.class.php:626 libraries/Util.class.php:4324
+#: libraries/Menu.class.php:626 libraries/Util.class.php:4330
 msgid "Engines"
 msgstr "Motores"
 
@@ -4413,7 +4424,7 @@ msgid_plural "%1$d rows inserted."
 msgstr[0] "%1$d fila inserida."
 msgstr[1] "%1$d filas inseridas."
 
-#: libraries/PDF.class.php:70 libraries/Util.class.php:2521
+#: libraries/PDF.class.php:70 libraries/Util.class.php:2527
 #: libraries/browse_foreigners.lib.php:327
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:865
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:890
@@ -4438,7 +4449,7 @@ msgid "Could not save favorite table!"
 msgstr "Non foi posíbel gravar a táboa recente"
 
 #: libraries/RecentFavoriteTable.class.php:212
-#: templates/structure/favorite_anchor.phtml:12
+#: templates/database/structure/favorite_anchor.phtml:12
 #, fuzzy
 #| msgid "Remove chart"
 msgid "Remove from Favorites"
@@ -4623,7 +4634,7 @@ msgstr ""
 "almacenamento."
 
 #: libraries/StorageEngine.class.php:373
-#: templates/structure/body_for_table_summary.phtml:50
+#: templates/database/structure/body_for_table_summary.phtml:50
 #, php-format
 msgid "%s is the default storage engine on this MySQL server."
 msgstr "%s é o motor de almacenamento predefinido neste servidor de MySQL."
@@ -5119,10 +5130,10 @@ msgstr ""
 
 #: libraries/Util.class.php:726 libraries/rte/rte_events.lib.php:110
 #: libraries/rte/rte_events.lib.php:119 libraries/rte/rte_events.lib.php:150
-#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:153
-#: libraries/rte/rte_routines.lib.php:162
-#: libraries/rte/rte_routines.lib.php:235
-#: libraries/rte/rte_routines.lib.php:1366
+#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:223
+#: libraries/rte/rte_routines.lib.php:250
+#: libraries/rte/rte_routines.lib.php:372
+#: libraries/rte/rte_routines.lib.php:1457
 #: libraries/rte/rte_triggers.lib.php:86 libraries/rte/rte_triggers.lib.php:95
 #: libraries/rte/rte_triggers.lib.php:127
 msgid "MySQL said: "
@@ -5168,77 +5179,80 @@ msgstr "Do"
 msgid "%B %d, %Y at %I:%M %p"
 msgstr "%d de %B de %Y ás %H:%M"
 
-#: libraries/Util.class.php:2019
+#: libraries/Util.class.php:2025
 #, php-format
 msgid "%s days, %s hours, %s minutes and %s seconds"
 msgstr "%s días, %s horas, %s minutos e %s segundos"
 
-#: libraries/Util.class.php:2112
+#: libraries/Util.class.php:2118
 msgid "Missing parameter:"
 msgstr "Parámetro que falta:"
 
-#: libraries/Util.class.php:2645
+#: libraries/Util.class.php:2651
 #, php-format
 msgid "Jump to database \"%s\"."
 msgstr "Ir á base de datos \"%s\"."
 
-#: libraries/Util.class.php:2670
+#: libraries/Util.class.php:2676
 #, php-format
 msgid "The %s functionality is affected by a known bug, see %s"
 msgstr "A función %s vese afectada por un erro descoñecido; consulte %s"
 
-#: libraries/Util.class.php:2881
+#: libraries/Util.class.php:2887
 msgid "Click to toggle"
 msgstr "Prema para conmutar"
 
-#: libraries/Util.class.php:3542 prefs_manage.php:248
+#: libraries/Util.class.php:3548 prefs_manage.php:248
 msgid "Browse your computer:"
 msgstr "Examinar o computador:"
 
-#: libraries/Util.class.php:3567
+#: libraries/Util.class.php:3573
 #, php-format
 msgid "Select from the web server upload directory <b>%s</b>:"
 msgstr "Escoller o directorio de subida do servidor web <b>%s</b>:"
 
-#: libraries/Util.class.php:3596 libraries/insert_edit.lib.php:1173
+#: libraries/Util.class.php:3602 libraries/insert_edit.lib.php:1171
 msgid "The directory you set for upload work cannot be reached."
 msgstr "Non é posíbel acceder ao directorio que designou para os envíos."
 
-#: libraries/Util.class.php:3607
+#: libraries/Util.class.php:3613
 #, fuzzy
 #| msgid "There are no files to upload"
 msgid "There are no files to upload!"
 msgstr "Non hai ficheiros para subir"
 
-#: libraries/Util.class.php:3632 libraries/Util.class.php:3633
-#: templates/structure/check_all_tables.phtml:15
+#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: templates/database/structure/check_all_tables.phtml:15
 msgid "Empty"
 msgstr "Baleirar"
 
-#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: libraries/Util.class.php:3644 libraries/Util.class.php:3645
 msgid "Execute"
 msgstr "Executar"
 
-#: libraries/Util.class.php:4152
+#: libraries/Util.class.php:4158
 msgid "Print"
 msgstr "Imprimir"
 
-#: libraries/Util.class.php:4257 templates/structure/row_stats_table.phtml:80
-#: templates/structure/table_header.phtml:95
+#: libraries/Util.class.php:4263
+#: templates/database/structure/table_header.phtml:95
+#: templates/table/structure/row_stats_table.phtml:80
 msgid "Creation"
 msgstr "Creación"
 
-#: libraries/Util.class.php:4263 templates/structure/row_stats_table.phtml:87
-#: templates/structure/table_header.phtml:106
+#: libraries/Util.class.php:4269
+#: templates/database/structure/table_header.phtml:106
+#: templates/table/structure/row_stats_table.phtml:87
 msgid "Last update"
 msgstr "Última actualización"
 
-#: libraries/Util.class.php:4269 templates/structure/row_stats_table.phtml:94
-#: templates/structure/table_header.phtml:117
+#: libraries/Util.class.php:4275
+#: templates/database/structure/table_header.phtml:117
+#: templates/table/structure/row_stats_table.phtml:94
 msgid "Last check"
 msgstr "Última revisión"
 
-#: libraries/Util.class.php:4315
+#: libraries/Util.class.php:4321
 msgid "Users"
 msgstr "Usuarios"
 
@@ -5259,16 +5273,16 @@ msgid "Use this value"
 msgstr "Usar este valor"
 
 #: libraries/build_html_for_db.lib.php:33 libraries/import.lib.php:193
-#: templates/structure/actions_in_table_structure.phtml:113
-#: templates/structure/row_stats_table.phtml:42
-#: templates/structure/table_header.phtml:36
+#: templates/database/structure/table_header.phtml:36
+#: templates/table/structure/actions_in_table_structure.phtml:113
+#: templates/table/structure/row_stats_table.phtml:42
 msgid "Rows"
 msgstr "Filas"
 
 #: libraries/build_html_for_db.lib.php:48 libraries/engines/innodb.lib.php:171
-#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:186
-#: libraries/server_status.lib.php:298
-#: templates/structure/display_table_stats.phtml:40
+#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:195
+#: libraries/server_status.lib.php:307
+#: templates/table/structure/display_table_stats.phtml:40
 msgid "Total"
 msgstr "Total"
 
@@ -5277,10 +5291,12 @@ msgid "Jump to database"
 msgstr "Ir á base de datos"
 
 #: libraries/build_html_for_db.lib.php:146
+#: templates/database/structure/structure_table_row.phtml:15
 msgid "Not replicated"
 msgstr "Non duplicado"
 
 #: libraries/build_html_for_db.lib.php:158
+#: templates/database/structure/structure_table_row.phtml:16
 msgid "Replicated"
 msgstr "Duplicado"
 
@@ -5337,17 +5353,17 @@ msgstr ""
 #: libraries/plugins/export/ExportTexytext.class.php:425
 #: libraries/plugins/export/PMA_ExportPdf.class.php:307
 #: libraries/rte/rte_list.lib.php:73 libraries/rte/rte_list.lib.php:85
-#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:830
-#: libraries/rte/rte_routines.lib.php:1492 setup/frames/index.inc.php:162
+#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:921
+#: libraries/rte/rte_routines.lib.php:1583 setup/frames/index.inc.php:162
 #: templates/columns_definitions/table_fields_definitions.phtml:8
-#: templates/structure/table_structure_header.phtml:5
-#: templates/table/create_table.phtml:11
+#: templates/database/create_table.phtml:11
+#: templates/table/structure/table_structure_header.phtml:5
 msgid "Name"
 msgstr "Nome"
 
 #: libraries/central_columns.lib.php:699
 #: libraries/central_columns.lib.php:1381
-#: libraries/rte/rte_routines.lib.php:832
+#: libraries/rte/rte_routines.lib.php:923
 #: templates/columns_definitions/table_fields_definitions.phtml:14
 msgid "Length/Values"
 msgstr "Tamaño/Valores"
@@ -5370,7 +5386,7 @@ msgid "Select a table"
 msgstr "Escoller táboas"
 
 #: libraries/central_columns.lib.php:804
-#: templates/structure/add_column.phtml:4
+#: templates/table/structure/add_column.phtml:4
 msgid "Add column"
 msgstr "Engadir unha columna"
 
@@ -5390,7 +5406,7 @@ msgstr "Engadir unha columna"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1002
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1025
 #: templates/columns_definitions/table_fields_definitions.phtml:36
-#: templates/structure/table_structure_header.phtml:8
+#: templates/table/structure/table_structure_header.phtml:8
 msgid "Attributes"
 msgstr "Atributos"
 
@@ -5507,7 +5523,7 @@ msgid "Double click"
 msgstr "Dobre clic"
 
 #: libraries/config.values.php:95 libraries/config.values.php:124
-#: libraries/config/FormDisplay.tpl.php:221 libraries/relation.lib.php:97
+#: libraries/config/FormDisplay.tpl.php:232 libraries/relation.lib.php:97
 #: libraries/relation.lib.php:105
 msgid "Disabled"
 msgstr "Desactivado"
@@ -5696,22 +5712,22 @@ msgstr "A exportación comprimida non vai funcionar porque falta a función %s."
 msgid "maximum %s"
 msgstr "máximo %s"
 
-#: libraries/config/FormDisplay.tpl.php:219
+#: libraries/config/FormDisplay.tpl.php:230
 msgid "This setting is disabled, it will not be applied to your configuration."
 msgstr ""
 "Esta preferencia está desactivada; non se aplicará á súa configuración."
 
-#: libraries/config/FormDisplay.tpl.php:313
+#: libraries/config/FormDisplay.tpl.php:324
 #, php-format
 msgid "Set value: %s"
 msgstr "Pór como valor: %s"
 
-#: libraries/config/FormDisplay.tpl.php:318
+#: libraries/config/FormDisplay.tpl.php:329
 #: libraries/config/messages.inc.php:610
 msgid "Restore default value"
 msgstr "Restaurar o valor por omisión"
 
-#: libraries/config/FormDisplay.tpl.php:332
+#: libraries/config/FormDisplay.tpl.php:343
 msgid "Allow users to customize this value"
 msgstr "Permitir que os usuarios personalicen este valor"
 
@@ -6308,7 +6324,7 @@ msgstr "Conxunto de caracteres do ficheiro"
 
 #: libraries/config/messages.inc.php:136 libraries/config/messages.inc.php:152
 #: libraries/sql_query_form.lib.php:247
-#: templates/structure/row_stats_table.phtml:7
+#: templates/table/structure/row_stats_table.phtml:7
 msgid "Format"
 msgstr "Formato"
 
@@ -6902,7 +6918,7 @@ msgstr ""
 
 #: libraries/config/messages.inc.php:332
 #: libraries/plugins/export/ExportPdf.class.php:279
-#: templates/structure/secondary_tabs.phtml:8
+#: templates/table/secondary_tabs.phtml:8
 msgid "Table structure"
 msgstr "Estrutura da táboa"
 
@@ -8974,105 +8990,35 @@ msgstr "Microsoft Word 2000"
 msgid "OpenDocument Text"
 msgstr "Texto de OpenDocument"
 
-#: libraries/controllers/StructureController.class.php:465
+#: libraries/controllers/DatabaseStructureController.class.php:405
 #: tbl_operations.php:382
 #, php-format
 msgid "Table %s has been emptied."
 msgstr "Baleirouse a táboa %s."
 
-#: libraries/controllers/StructureController.class.php:486
+#: libraries/controllers/DatabaseStructureController.class.php:426
 #: tbl_operations.php:400 view_operations.php:119
 #, fuzzy, php-format
 #| msgid "View %s has been dropped."
 msgid "View %s has been dropped."
 msgstr "Deixouse a vista %s"
 
-#: libraries/controllers/StructureController.class.php:487
+#: libraries/controllers/DatabaseStructureController.class.php:427
 #: tbl_operations.php:401
 #, fuzzy, php-format
 #| msgid "Table %s has been dropped."
 msgid "Table %s has been dropped."
 msgstr "Eliminouse a táboa %s"
 
-#: libraries/controllers/StructureController.class.php:797
-#, fuzzy, php-format
-#| msgid "The column name '%s' is a MySQL reserved keyword."
-msgid "The name '%s' is a MySQL reserved keyword."
-msgid_plural "The names '%s' are MySQL reserved keywords."
-msgstr[0] "O nome de columna «%s» é unha palabra chave reservada do MySQL."
-msgstr[1] "O nome de columna «%s» é unha palabra chave reservada do MySQL."
-
-#: libraries/controllers/StructureController.class.php:875
-msgid "No column selected."
-msgstr "Non seleccionou ningunha columna."
-
-#: libraries/controllers/StructureController.class.php:1049
+#: libraries/controllers/DatabaseStructureController.class.php:733
 msgid "Favorite List is full!"
 msgstr ""
 
-#: libraries/controllers/StructureController.class.php:1272
-msgid "The columns have been moved successfully."
-msgstr "Movéronse as columnas satisfactoriamente."
-
-#: libraries/controllers/StructureController.class.php:1535
-#, fuzzy, php-format
-#| msgid "Table %1$s has been altered successfully."
-msgid ""
-"Table %1$s has been altered successfully. Privileges have been adjusted."
-msgstr "Alterouse a táboa %1$s sen problemas."
-
-#: libraries/controllers/StructureController.class.php:1541
-#: libraries/controllers/TableIndexesController.class.php:161
-#: tbl_addfield.php:92
-#, php-format
-msgid "Table %1$s has been altered successfully."
-msgstr "Alterouse a táboa %1$s sen problemas."
-
-#: libraries/controllers/StructureController.class.php:1588
-#: libraries/tracking.lib.php:1094
-msgid "Query error"
-msgstr "Hai un erro na consulta"
-
-#: libraries/controllers/StructureController.class.php:1806
+#: libraries/controllers/DatabaseStructureController.class.php:947
 #: libraries/mysql_charsets.lib.php:366 libraries/mysql_charsets.lib.php:373
 msgid "unknown"
 msgstr "descoñecido"
 
-#: libraries/controllers/StructureController.class.php:1957
-#: templates/structure/check_all_table_column.phtml:11
-msgid "Change"
-msgstr "Mudar"
-
-#: libraries/controllers/StructureController.class.php:1961
-#: libraries/controllers/StructureController.class.php:1966
-#: libraries/navigation/Nodes/Node_Index.class.php:30
-#: libraries/tracking.lib.php:926
-#: templates/columns_definitions/column_indexes.phtml:16
-#: templates/columns_definitions/table_fields_definitions.phtml:57
-#: templates/structure/check_all_table_column.phtml:30
-#: templates/structure/display_structure.phtml:79
-#: templates/structure/display_table_stats.phtml:19
-msgid "Index"
-msgstr "Índice"
-
-#: libraries/controllers/StructureController.class.php:1963
-#: libraries/controllers/StructureController.class.php:1968
-#: templates/columns_definitions/column_indexes.phtml:27
-#: templates/structure/check_all_table_column.phtml:37
-msgid "Spatial"
-msgstr "Espacial"
-
-#: libraries/controllers/StructureController.class.php:1964
-#: libraries/controllers/StructureController.class.php:1969
-#: templates/columns_definitions/column_indexes.phtml:22
-#: templates/structure/check_all_table_column.phtml:47
-msgid "Fulltext"
-msgstr "Texto completo"
-
-#: libraries/controllers/StructureController.class.php:1970
-msgid "Distinct values"
-msgstr "Valores diferentes"
-
 #: libraries/controllers/TableChartController.class.php:82
 #: libraries/controllers/TableGisVisualizationController.class.php:101
 msgid "No SQL query was set to fetch data."
@@ -9086,13 +9032,20 @@ msgstr "Na táboa que se quere debuxar non existe ningunha columna numérica."
 msgid "No data to display"
 msgstr "Non hai datos que mostrar"
 
-#: libraries/controllers/TableRelationController.class.php:217
+#: libraries/controllers/TableIndexesController.class.php:161
+#: libraries/controllers/TableStructureController.class.php:736
+#: tbl_addfield.php:92
+#, php-format
+msgid "Table %1$s has been altered successfully."
+msgstr "Alterouse a táboa %1$s sen problemas."
+
+#: libraries/controllers/TableRelationController.class.php:218
 #, fuzzy
 #| msgid "Thread %s was successfully killed."
 msgid "Display column was successfully updated."
 msgstr "Finalizouse o fío %s."
 
-#: libraries/controllers/TableRelationController.class.php:283
+#: libraries/controllers/TableRelationController.class.php:288
 #, fuzzy
 #| msgid "Internal relation added"
 msgid "Internal relations were successfully updated."
@@ -9111,12 +9064,75 @@ msgid "Zoom search"
 msgstr "Busca gráfica"
 
 #: libraries/controllers/TableSearchController.class.php:852
-#: templates/table/selection_form.phtml:59
+#: templates/table/search/selection_form.phtml:59
 #, fuzzy
 #| msgid "Find and Replace"
 msgid "Find and replace"
 msgstr "Buscar e substituír"
 
+#: libraries/controllers/TableStructureController.class.php:163
+#, fuzzy, php-format
+#| msgid "The column name '%s' is a MySQL reserved keyword."
+msgid "The name '%s' is a MySQL reserved keyword."
+msgid_plural "The names '%s' are MySQL reserved keywords."
+msgstr[0] "O nome de columna «%s» é unha palabra chave reservada do MySQL."
+msgstr[1] "O nome de columna «%s» é unha palabra chave reservada do MySQL."
+
+#: libraries/controllers/TableStructureController.class.php:241
+msgid "No column selected."
+msgstr "Non seleccionou ningunha columna."
+
+#: libraries/controllers/TableStructureController.class.php:467
+msgid "The columns have been moved successfully."
+msgstr "Movéronse as columnas satisfactoriamente."
+
+#: libraries/controllers/TableStructureController.class.php:730
+#, fuzzy, php-format
+#| msgid "Table %1$s has been altered successfully."
+msgid ""
+"Table %1$s has been altered successfully. Privileges have been adjusted."
+msgstr "Alterouse a táboa %1$s sen problemas."
+
+#: libraries/controllers/TableStructureController.class.php:783
+#: libraries/tracking.lib.php:1094
+msgid "Query error"
+msgstr "Hai un erro na consulta"
+
+#: libraries/controllers/TableStructureController.class.php:948
+#: templates/table/structure/check_all_table_column.phtml:11
+msgid "Change"
+msgstr "Mudar"
+
+#: libraries/controllers/TableStructureController.class.php:952
+#: libraries/controllers/TableStructureController.class.php:957
+#: libraries/navigation/Nodes/Node_Index.class.php:30
+#: libraries/tracking.lib.php:926
+#: templates/columns_definitions/column_indexes.phtml:16
+#: templates/columns_definitions/table_fields_definitions.phtml:57
+#: templates/table/structure/check_all_table_column.phtml:30
+#: templates/table/structure/display_structure.phtml:79
+#: templates/table/structure/display_table_stats.phtml:19
+msgid "Index"
+msgstr "Índice"
+
+#: libraries/controllers/TableStructureController.class.php:954
+#: libraries/controllers/TableStructureController.class.php:959
+#: templates/columns_definitions/column_indexes.phtml:27
+#: templates/table/structure/check_all_table_column.phtml:37
+msgid "Spatial"
+msgstr "Espacial"
+
+#: libraries/controllers/TableStructureController.class.php:955
+#: libraries/controllers/TableStructureController.class.php:960
+#: templates/columns_definitions/column_indexes.phtml:22
+#: templates/table/structure/check_all_table_column.phtml:47
+msgid "Fulltext"
+msgstr "Texto completo"
+
+#: libraries/controllers/TableStructureController.class.php:963
+msgid "Distinct values"
+msgstr "Valores diferentes"
+
 #: libraries/core.lib.php:306
 #, php-format
 msgid "The %s extension is missing. Please check your PHP configuration."
@@ -9165,7 +9181,7 @@ msgid "No Password"
 msgstr "Sen contrasinal"
 
 #: libraries/display_change_password.lib.php:68
-#: libraries/plugins/auth/AuthenticationCookie.class.php:199
+#: libraries/plugins/auth/AuthenticationCookie.class.php:187
 #: libraries/replication_gui.lib.php:422 libraries/replication_gui.lib.php:862
 #: libraries/server_privileges.lib.php:1640
 msgid "Password:"
@@ -9997,12 +10013,12 @@ msgid "Dump has been saved to file %s."
 msgstr "Gardouse o  envorcado no ficheiro %s."
 
 #: libraries/import.lib.php:202 libraries/insert_edit.lib.php:124
-#: libraries/rte/rte_routines.lib.php:1353 libraries/sql.lib.php:1312
+#: libraries/rte/rte_routines.lib.php:1444 libraries/sql.lib.php:1306
 #: tbl_get_field.php:44
 msgid "MySQL returned an empty result set (i.e. zero rows)."
 msgstr "O MySQL retornou un conxunto baleiro (isto é, cero fileiras)."
 
-#: libraries/import.lib.php:265 libraries/sql.lib.php:1326
+#: libraries/import.lib.php:265 libraries/sql.lib.php:1320
 msgid "[ROLLBACK occurred.]"
 msgstr ""
 
@@ -10074,14 +10090,14 @@ msgstr "Crear un índice en &nbsp;%s&nbsp;columnas"
 
 #: libraries/insert_edit.lib.php:233
 #: libraries/navigation/Nodes/Node_DatabaseChild.class.php:48
-#: templates/designer/table_list.phtml:40
+#: templates/database/designer/table_list.phtml:40
 msgid "Hide"
 msgstr "Agochar"
 
 #: libraries/insert_edit.lib.php:249
 #: libraries/navigation/Nodes/Node_Function.class.php:32
-#: libraries/rte/rte_routines.lib.php:1495
-#: templates/table/table_header.phtml:4
+#: libraries/rte/rte_routines.lib.php:1586
+#: templates/table/search/table_header.phtml:4
 msgid "Function"
 msgstr "Función"
 
@@ -10096,84 +10112,85 @@ msgstr "Binario"
 msgid "Because of its length,<br /> this column might not be editable."
 msgstr "Por causa da súa lonxitude,<br /> este campo pode non ser editábel"
 
-#: libraries/insert_edit.lib.php:1050
+#: libraries/insert_edit.lib.php:1048
 msgid "Binary - do not edit"
 msgstr "Binario - non editar"
 
-#: libraries/insert_edit.lib.php:1176 libraries/server_privileges.lib.php:470
-#: templates/table/options.phtml:36
+#: libraries/insert_edit.lib.php:1174 libraries/server_privileges.lib.php:470
+#: templates/table/search/options.phtml:36
 msgid "Or"
 msgstr "ou"
 
-#: libraries/insert_edit.lib.php:1177
+#: libraries/insert_edit.lib.php:1175
 msgid "web server upload directory:"
 msgstr "directorio de recepción do servidor web:"
 
-#: libraries/insert_edit.lib.php:1348 templates/table/input_box.phtml:49
+#: libraries/insert_edit.lib.php:1346
+#: templates/table/search/input_box.phtml:49
 msgid "Edit/Insert"
 msgstr "Editar/Inserir"
 
-#: libraries/insert_edit.lib.php:1398
+#: libraries/insert_edit.lib.php:1396
 #, php-format
 msgid "Continue insertion with %s rows"
 msgstr "Continuar a inserción con %s fileiras"
 
-#: libraries/insert_edit.lib.php:1428
+#: libraries/insert_edit.lib.php:1426
 msgid "and then"
 msgstr "e despois"
 
-#: libraries/insert_edit.lib.php:1461
+#: libraries/insert_edit.lib.php:1459
 msgid "Insert as new row"
 msgstr "Inserir unha columna nova"
 
-#: libraries/insert_edit.lib.php:1464
+#: libraries/insert_edit.lib.php:1462
 msgid "Insert as new row and ignore errors"
 msgstr "Inserir como fila nova e ignorar os erros"
 
-#: libraries/insert_edit.lib.php:1467
+#: libraries/insert_edit.lib.php:1465
 msgid "Show insert query"
 msgstr "Mostrar a consulta de inserción"
 
-#: libraries/insert_edit.lib.php:1487
+#: libraries/insert_edit.lib.php:1485
 msgid "Go back to previous page"
 msgstr "Volver para páxina anterior"
 
-#: libraries/insert_edit.lib.php:1490
+#: libraries/insert_edit.lib.php:1488
 msgid "Insert another new row"
 msgstr "Inserir un rexistro novo"
 
-#: libraries/insert_edit.lib.php:1495
+#: libraries/insert_edit.lib.php:1493
 msgid "Go back to this page"
 msgstr "Volver para esta páxina"
 
-#: libraries/insert_edit.lib.php:1518
+#: libraries/insert_edit.lib.php:1516
 msgid "Edit next row"
 msgstr "Modificar a fileira seguinte"
 
-#: libraries/insert_edit.lib.php:1540
+#: libraries/insert_edit.lib.php:1538
 msgid ""
 "Use TAB key to move from value to value, or CTRL+arrows to move anywhere"
 msgstr ""
 "Use a tecla do tabulador para moverse de valor en valor ou a tecla CONTROL "
 "combinada cunha frecha para moverse a calquera sitio"
 
-#: libraries/insert_edit.lib.php:1577 libraries/replication_gui.lib.php:542
-#: libraries/rte/rte_routines.lib.php:1497
+#: libraries/insert_edit.lib.php:1575 libraries/replication_gui.lib.php:542
+#: libraries/rte/rte_routines.lib.php:1588
 #: libraries/server_status_variables.lib.php:220
-#: templates/designer/having_query_panel.phtml:100
-#: templates/designer/options_panel.phtml:73
-#: templates/designer/options_panel.phtml:239
-#: templates/designer/where_query_panel.phtml:69
-#: templates/table/table_header.phtml:10
-#: templates/table/zoom_result_form.phtml:35
+#: templates/database/designer/having_query_panel.phtml:100
+#: templates/database/designer/options_panel.phtml:73
+#: templates/database/designer/options_panel.phtml:239
+#: templates/database/designer/where_query_panel.phtml:69
+#: templates/table/search/table_header.phtml:10
+#: templates/table/search/zoom_result_form.phtml:35
 msgid "Value"
 msgstr "Valor"
 
-#: libraries/insert_edit.lib.php:1937 libraries/sql.lib.php:1309
+#: libraries/insert_edit.lib.php:1935 libraries/sql.lib.php:1303
 msgid "Showing SQL query"
 msgstr "Mostrar a consulta de SQL"
 
-#: libraries/insert_edit.lib.php:1962 libraries/sql.lib.php:1287
+#: libraries/insert_edit.lib.php:1960 libraries/sql.lib.php:1281
 #, php-format
 msgid "Inserted row id: %1$d"
 msgstr "Identificador da fileira inserida: %1$d"
@@ -10619,7 +10636,7 @@ msgstr "Novo"
 #: libraries/navigation/Nodes/Node_View_Container.class.php:26
 #: libraries/navigation/Nodes/Node_View_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:129
-#: templates/structure/show_create.phtml:30
+#: templates/database/structure/show_create.phtml:30
 msgid "Views"
 msgstr "Vistas"
 
@@ -10931,7 +10948,7 @@ msgstr "Non ten dereitos suficientes para estar aquí agora!"
 
 #: libraries/operations.lib.php:101 libraries/operations.lib.php:249
 #: libraries/operations.lib.php:869 libraries/operations.lib.php:963
-#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:907
+#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:998
 #: templates/columns_definitions/table_fields_definitions.phtml:47
 #, fuzzy
 #| msgid "Edit Privileges"
@@ -11023,22 +11040,22 @@ msgid "Switch to copied table"
 msgstr "Ir á táboa copiada"
 
 #: libraries/operations.lib.php:1360
-#: templates/structure/check_all_tables.phtml:18
+#: templates/database/structure/check_all_tables.phtml:18
 msgid "Table maintenance"
 msgstr "Táboa de mantemento"
 
 #: libraries/operations.lib.php:1398
-#: templates/structure/check_all_tables.phtml:19
+#: templates/database/structure/check_all_tables.phtml:19
 msgid "Analyze table"
 msgstr "Analizar a táboa"
 
 #: libraries/operations.lib.php:1413
-#: templates/structure/check_all_tables.phtml:20
+#: templates/database/structure/check_all_tables.phtml:20
 msgid "Check table"
 msgstr "Comprobar a táboa"
 
 #: libraries/operations.lib.php:1428
-#: templates/structure/check_all_tables.phtml:22
+#: templates/database/structure/check_all_tables.phtml:22
 #, fuzzy
 #| msgid "Check table"
 msgid "Checksum table"
@@ -11058,18 +11075,19 @@ msgid "Flush the table (FLUSH)"
 msgstr "Borrar a táboa («FLUSH»)"
 
 #: libraries/operations.lib.php:1477
-#: templates/structure/check_all_tables.phtml:23
-#: templates/structure/display_table_stats.phtml:56
+#: templates/database/structure/check_all_tables.phtml:23
+#: templates/table/structure/display_table_stats.phtml:56
 msgid "Optimize table"
 msgstr "Optimizar a táboa"
 
 #: libraries/operations.lib.php:1492
-#: templates/structure/check_all_tables.phtml:24
+#: templates/database/structure/check_all_tables.phtml:24
 msgid "Repair table"
 msgstr "Reparar a táboa"
 
 #: libraries/operations.lib.php:1538
-#: templates/structure/check_all_tables.phtml:14 view_operations.php:127
+#: templates/database/structure/check_all_tables.phtml:14
+#: view_operations.php:127
 msgid "Delete data or table"
 msgstr "Eliminar datos ou táboa"
 
@@ -11197,7 +11215,7 @@ msgid "Cannot connect: invalid settings."
 msgstr "Non é posíbel conectar: os axustes non son válidos."
 
 #: libraries/plugins/auth/AuthenticationConfig.class.php:108
-#: libraries/plugins/auth/AuthenticationCookie.class.php:134
+#: libraries/plugins/auth/AuthenticationCookie.class.php:122
 #: libraries/plugins/auth/AuthenticationHttp.class.php:96
 #, php-format
 msgid "Welcome to %s"
@@ -11228,38 +11246,38 @@ msgstr ""
 msgid "Retry to connect"
 msgstr "Ténteo de novo para conectar"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:146
+#: libraries/plugins/auth/AuthenticationCookie.class.php:134
 msgid "Your session has expired. Please log in again."
 msgstr "A súa sesión xa expirou. Tenteo de novo."
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:170
+#: libraries/plugins/auth/AuthenticationCookie.class.php:158
 msgid "Log in"
 msgstr "Entrada (login)"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:178
-#: libraries/plugins/auth/AuthenticationCookie.class.php:188
+#: libraries/plugins/auth/AuthenticationCookie.class.php:166
+#: libraries/plugins/auth/AuthenticationCookie.class.php:176
 msgid "You can enter hostname/IP address and port separated by space."
 msgstr ""
 "Pode escribir o nome de servidor/enderezo de IP e o porto separados por un "
 "espazo."
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:193
+#: libraries/plugins/auth/AuthenticationCookie.class.php:181
 msgid "Username:"
 msgstr "Nome de usuario:"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:205
+#: libraries/plugins/auth/AuthenticationCookie.class.php:193
 msgid "Server Choice:"
 msgstr "Escolla de servidor:"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:386
+#: libraries/plugins/auth/AuthenticationCookie.class.php:374
 msgid "Entered captcha is wrong, try again!"
 msgstr "O captcha introducido é incorrecto; ténteo de novo!"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:396
+#: libraries/plugins/auth/AuthenticationCookie.class.php:384
 msgid "Please enter correct captcha!"
 msgstr "Introduza o captcha correcto!"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:423
+#: libraries/plugins/auth/AuthenticationCookie.class.php:411
 #, fuzzy
 #| msgid "Cannot log in to the MySQL server"
 msgid "You are not allowed to log in to this MySQL server!"
@@ -11357,7 +11375,7 @@ msgstr "Acontecemento"
 #: libraries/plugins/export/ExportOdt.class.php:593
 #: libraries/plugins/export/ExportTexytext.class.php:428
 #: libraries/plugins/export/PMA_ExportPdf.class.php:313
-#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:984
 #: libraries/rte/rte_triggers.lib.php:377
 msgid "Definition"
 msgstr "Definición"
@@ -11693,7 +11711,7 @@ msgid "Last check:"
 msgstr "Última revisión:"
 
 #: libraries/plugins/export/ExportSql.class.php:1399
-#: templates/structure/structure_table_row.phtml:183
+#: templates/database/structure/structure_table_row.phtml:183
 msgid "in use"
 msgstr "en uso"
 
@@ -11903,20 +11921,14 @@ msgstr "A Extensión Espacial do MySQL non recoñece o tipo «%s» da ESRI."
 msgid "The imported file does not contain any data!"
 msgstr "O ficheiro importado non contén datos"
 
-#: libraries/plugins/import/ImportSql.class.php:169
+#: libraries/plugins/import/ImportSql.class.php:72
 msgid "SQL compatibility mode:"
 msgstr "Modo de compatibilidade de SQL:"
 
-#: libraries/plugins/import/ImportSql.class.php:181
+#: libraries/plugins/import/ImportSql.class.php:84
 msgid "Do not use <code>AUTO_INCREMENT</code> for zero values"
 msgstr "Non empregar <code>AUTO_INCREMENT</code> cos valores cero"
 
-#: libraries/plugins/import/ImportSql.class.php:195
-#, fuzzy
-#| msgid "Read misses"
-msgid "Read as multibytes"
-msgstr "Fallos de lectura"
-
 #: libraries/plugins/import/ImportXml.class.php:54
 msgid "XML"
 msgstr "XML"
@@ -11959,7 +11971,7 @@ msgid "Show grid"
 msgstr "Mostrar a grella"
 
 #: libraries/plugins/schema/SchemaPdf.class.php:94
-#: templates/structure/print_view_data_dictionary_link.phtml:6
+#: templates/database/structure/print_view_data_dictionary_link.phtml:6
 msgid "Data Dictionary"
 msgstr "Dicionario de datos"
 
@@ -11990,7 +12002,7 @@ msgid "The %s table doesn't exist!"
 msgstr "Non existe a táboa %s!"
 
 #: libraries/plugins/schema/eps/Eps_Relation_Schema.class.php:321
-#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:309
+#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:323
 #, php-format
 msgid "Schema of the %s database - Page %s"
 msgstr "Esquema da base de datos %s - Páxina %s"
@@ -12019,7 +12031,7 @@ msgstr "Índice"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1005
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1028
 #: libraries/tracking.lib.php:884
-#: templates/structure/table_structure_header.phtml:11
+#: templates/table/structure/table_structure_header.phtml:11
 msgid "Extra"
 msgstr "Extra"
 
@@ -12434,11 +12446,11 @@ msgstr "Pasos rápidos para configurar as funcionalidades avanzadas:"
 msgid "Create the needed tables with the <code>%screate_tables.sql</code>."
 msgstr "Cree as táboas necesarias con <code>exemplos/create_tables.sql</code>."
 
-#: libraries/relation.lib.php:360
+#: libraries/relation.lib.php:357
 msgid "Create a pma user and give access to these tables."
 msgstr "Cree un usuario usuario pma e déalle acceso a estas táboas."
 
-#: libraries/relation.lib.php:365
+#: libraries/relation.lib.php:360
 msgid ""
 "Enable advanced features in configuration file (<code>config.inc.php</"
 "code>), for example by starting from <code>config.sample.inc.php</code>."
@@ -12447,24 +12459,24 @@ msgstr ""
 "(<code>config.inc.php</code>) comezando, por exemplo con <code>config.sample."
 "inc.php</code>."
 
-#: libraries/relation.lib.php:373
+#: libraries/relation.lib.php:365
 msgid "Re-login to phpMyAdmin to load the updated configuration file."
 msgstr ""
 "Entre de novo no phpMyAdmin para cargar o ficheiro de configuración "
 "actualizado."
 
-#: libraries/relation.lib.php:1612
+#: libraries/relation.lib.php:1607
 msgid "no description"
 msgstr "sen descrición"
 
-#: libraries/relation.lib.php:1811
+#: libraries/relation.lib.php:1806
 msgid ""
 "You do not have necessary privileges to create a database named "
 "'phpmyadmin'. You may go to 'Operations' tab of any database to set up the "
 "phpMyAdmin configuration storage there."
 msgstr ""
 
-#: libraries/relation.lib.php:1928
+#: libraries/relation.lib.php:1923
 #, fuzzy, php-format
 #| msgid "Missing phpMyAdmin configuration storage tables"
 msgid ""
@@ -12472,21 +12484,21 @@ msgid ""
 "configuration storage there."
 msgstr "Faltan as táboas de almacenamento da configuración do phpMyAdmin"
 
-#: libraries/relation.lib.php:1936
+#: libraries/relation.lib.php:1931
 #, fuzzy, php-format
 #| msgid "Missing phpMyAdmin configuration storage tables"
 msgid ""
 "%sCreate%s the phpMyAdmin configuration storage in the current database."
 msgstr "Faltan as táboas de almacenamento da configuración do phpMyAdmin"
 
-#: libraries/relation.lib.php:1944
+#: libraries/relation.lib.php:1939
 #, fuzzy, php-format
 #| msgid "Missing phpMyAdmin configuration storage tables"
 msgid "%sCreate%s missing phpMyAdmin configuration storage tables."
 msgstr "Faltan as táboas de almacenamento da configuración do phpMyAdmin"
 
 #: libraries/replication_gui.lib.php:46 libraries/replication_gui.lib.php:343
-#: libraries/server_databases.lib.php:387
+#: libraries/server_databases.lib.php:398
 msgid "Master replication"
 msgstr "Replicación do principal"
 
@@ -12559,7 +12571,7 @@ msgstr ""
 "configurado como principal."
 
 #: libraries/replication_gui.lib.php:141
-#: libraries/server_databases.lib.php:389
+#: libraries/server_databases.lib.php:400
 msgid "Slave replication"
 msgstr "Replicación do escravo"
 
@@ -12856,10 +12868,10 @@ msgid "Master server changed successfully to %s."
 msgstr "O servidor principal mudouse con éxito a %s"
 
 #: libraries/rte/rte_events.lib.php:106 libraries/rte/rte_events.lib.php:115
-#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:149
-#: libraries/rte/rte_routines.lib.php:158
-#: libraries/rte/rte_routines.lib.php:231
-#: libraries/rte/rte_routines.lib.php:1362
+#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:219
+#: libraries/rte/rte_routines.lib.php:246
+#: libraries/rte/rte_routines.lib.php:368
+#: libraries/rte/rte_routines.lib.php:1453
 #: libraries/rte/rte_triggers.lib.php:82 libraries/rte/rte_triggers.lib.php:91
 #: libraries/rte/rte_triggers.lib.php:123
 #, php-format
@@ -12880,7 +12892,7 @@ msgstr "O acontecemento %1$s foi modificado."
 msgid "Event %1$s has been created."
 msgstr "O acontecemento %1$s foi creado."
 
-#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:251
+#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:266
 #: libraries/rte/rte_triggers.lib.php:144
 #, fuzzy
 #| msgid ""
@@ -12892,7 +12904,7 @@ msgstr "<b>Producíronse un ou máis erros ao procesar a petición:</b>"
 msgid "Edit event"
 msgstr "Editar o acontecemento"
 
-#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:794
+#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:885
 #: libraries/rte/rte_triggers.lib.php:323 view_create.php:180
 msgid "Details"
 msgstr "Detalles"
@@ -12905,7 +12917,7 @@ msgstr "Nome do acontecemento"
 msgid "Event type"
 msgstr "Tipo de acontecemento"
 
-#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:817
+#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:908
 #, php-format
 msgid "Change to %s"
 msgstr "Cambiar a %s"
@@ -12932,12 +12944,14 @@ msgstr "Fin"
 msgid "On completion preserve"
 msgstr "Preservar ao completar"
 
-#: libraries/rte/rte_events.lib.php:491 libraries/rte/rte_routines.lib.php:930
+#: libraries/rte/rte_events.lib.php:491
+#: libraries/rte/rte_routines.lib.php:1021
 #: libraries/rte/rte_triggers.lib.php:383 view_create.php:209
 msgid "Definer"
 msgstr "Definidor"
 
-#: libraries/rte/rte_events.lib.php:535 libraries/rte/rte_routines.lib.php:997
+#: libraries/rte/rte_events.lib.php:535
+#: libraries/rte/rte_routines.lib.php:1088
 #: libraries/rte/rte_triggers.lib.php:422
 #, fuzzy
 #| msgid "The definer must be in the \"username@hostname\" format"
@@ -12967,9 +12981,9 @@ msgid "You must provide an event definition."
 msgstr "Debe indicar unha definición do acontecemento."
 
 #: libraries/rte/rte_export.lib.php:43 libraries/rte/rte_general.lib.php:72
-#: libraries/rte/rte_routines.lib.php:345
-#: libraries/rte/rte_routines.lib.php:1198
-#: libraries/rte/rte_routines.lib.php:1411
+#: libraries/rte/rte_routines.lib.php:153
+#: libraries/rte/rte_routines.lib.php:1289
+#: libraries/rte/rte_routines.lib.php:1502
 msgid "Error in processing request:"
 msgstr "Produciuse un erro ao procesar a petición:"
 
@@ -13005,99 +13019,99 @@ msgstr ""
 "fallar![/strong] Empregue a extensión mellorada «mysqli para evitar "
 "problemas."
 
-#: libraries/rte/rte_routines.lib.php:110
-#: libraries/rte/rte_routines.lib.php:1006
+#: libraries/rte/rte_routines.lib.php:123
+msgid "Edit routine"
+msgstr "Editar a rutina"
+
+#: libraries/rte/rte_routines.lib.php:200
+#: libraries/rte/rte_routines.lib.php:1097
 #, php-format
 msgid "Invalid routine type: \"%s\""
 msgstr "O tipo de rutina non é válido: «%s»"
 
-#: libraries/rte/rte_routines.lib.php:170
+#: libraries/rte/rte_routines.lib.php:253
+#, php-format
+msgid "Routine %1$s has been created."
+msgstr "A rutina %1$s foi creada."
+
+#: libraries/rte/rte_routines.lib.php:380
 msgid "Sorry, we failed to restore the dropped routine."
 msgstr "Sentímolo, non foi posíbel restaurar a rutina eliminada."
 
-#: libraries/rte/rte_routines.lib.php:211
+#: libraries/rte/rte_routines.lib.php:439
 #, fuzzy, php-format
 #| msgid "Routine %1$s has been modified."
 msgid "Routine %1$s has been modified. Privileges have been adjusted."
 msgstr "A rutina %1$s foi modificada."
 
-#: libraries/rte/rte_routines.lib.php:216
+#: libraries/rte/rte_routines.lib.php:444
 #, php-format
 msgid "Routine %1$s has been modified."
 msgstr "A rutina %1$s foi modificada."
 
-#: libraries/rte/rte_routines.lib.php:238
-#, php-format
-msgid "Routine %1$s has been created."
-msgstr "A rutina %1$s foi creada."
-
-#: libraries/rte/rte_routines.lib.php:315
-msgid "Edit routine"
-msgstr "Editar a rutina"
-
-#: libraries/rte/rte_routines.lib.php:797
+#: libraries/rte/rte_routines.lib.php:888
 msgid "Routine name"
 msgstr "Nome da rutina"
 
-#: libraries/rte/rte_routines.lib.php:823
+#: libraries/rte/rte_routines.lib.php:914
 msgid "Parameters"
 msgstr "Parámetros"
 
-#: libraries/rte/rte_routines.lib.php:829
+#: libraries/rte/rte_routines.lib.php:920
 msgid "Direction"
 msgstr "Dirección"
 
-#: libraries/rte/rte_routines.lib.php:847
+#: libraries/rte/rte_routines.lib.php:938
 msgid "Add parameter"
 msgstr "Engadir un parámetro"
 
-#: libraries/rte/rte_routines.lib.php:851
+#: libraries/rte/rte_routines.lib.php:942
 msgid "Remove last parameter"
 msgstr "Eliminar o último parámetro"
 
-#: libraries/rte/rte_routines.lib.php:856
+#: libraries/rte/rte_routines.lib.php:947
 msgid "Return type"
 msgstr "Tipo de devolución"
 
-#: libraries/rte/rte_routines.lib.php:862
+#: libraries/rte/rte_routines.lib.php:953
 msgid "Return length/values"
 msgstr "Devolver tamaños/valores"
 
-#: libraries/rte/rte_routines.lib.php:868
+#: libraries/rte/rte_routines.lib.php:959
 msgid "Return options"
 msgstr "Devolver opcións"
 
-#: libraries/rte/rte_routines.lib.php:899
+#: libraries/rte/rte_routines.lib.php:990
 msgid "Is deterministic"
 msgstr "É determinista"
 
-#: libraries/rte/rte_routines.lib.php:920
+#: libraries/rte/rte_routines.lib.php:1011
 msgid ""
 "You do not have sufficient privileges to perform this operation; Please "
 "refer to the documentation for more details"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:935
+#: libraries/rte/rte_routines.lib.php:1026
 msgid "Security type"
 msgstr "Tipo de seguranza"
 
-#: libraries/rte/rte_routines.lib.php:944
+#: libraries/rte/rte_routines.lib.php:1035
 msgid "SQL data access"
 msgstr "Acceso de datos SQL"
 
-#: libraries/rte/rte_routines.lib.php:1013
+#: libraries/rte/rte_routines.lib.php:1104
 #, fuzzy
 #| msgid "You must provide a routine name"
 msgid "You must provide a routine name!"
 msgstr "Debe indicar un nome á rutina"
 
-#: libraries/rte/rte_routines.lib.php:1047
+#: libraries/rte/rte_routines.lib.php:1138
 #, php-format
 msgid "Invalid direction \"%s\" given for parameter."
 msgstr "O parámetro «%s» recibiu unha dirección incorrecta."
 
-#: libraries/rte/rte_routines.lib.php:1069
-#: libraries/rte/rte_routines.lib.php:1131
+#: libraries/rte/rte_routines.lib.php:1160
+#: libraries/rte/rte_routines.lib.php:1222
 msgid ""
 "You must provide length/values for routine parameters of type ENUM, SET, "
 "VARCHAR and VARBINARY."
@@ -13105,24 +13119,24 @@ msgstr ""
 "Ten que fornecer tamaños/valores para os parámetros das rutinas de tipo  "
 "ENUM, SET, VARCHAR e VARBINARY."
 
-#: libraries/rte/rte_routines.lib.php:1095
+#: libraries/rte/rte_routines.lib.php:1186
 msgid "You must provide a name and a type for each routine parameter."
 msgstr "Ten que fornecer un nome e un tipo para cada parámetro da rutina."
 
-#: libraries/rte/rte_routines.lib.php:1114
+#: libraries/rte/rte_routines.lib.php:1205
 msgid "You must provide a valid return type for the routine."
 msgstr "Ten que fornecer un tipo de devolución válida para a rutina."
 
-#: libraries/rte/rte_routines.lib.php:1174
+#: libraries/rte/rte_routines.lib.php:1265
 msgid "You must provide a routine definition."
 msgstr "Debe indicar unha definición da rutina."
 
-#: libraries/rte/rte_routines.lib.php:1285
+#: libraries/rte/rte_routines.lib.php:1376
 #, php-format
 msgid "Execution results of routine %s"
 msgstr "Resultados da execución da rutina %s"
 
-#: libraries/rte/rte_routines.lib.php:1340
+#: libraries/rte/rte_routines.lib.php:1431
 #, fuzzy, php-format
 #| msgid "%d row affected by the last statement inside the procedure"
 #| msgid_plural "%d rows affected by the last statement inside the procedure"
@@ -13133,13 +13147,13 @@ msgstr[0] ""
 msgstr[1] ""
 "%d fileiras afectadas pola última instrución de dentro do procedemento"
 
-#: libraries/rte/rte_routines.lib.php:1398
-#: libraries/rte/rte_routines.lib.php:1406
+#: libraries/rte/rte_routines.lib.php:1489
+#: libraries/rte/rte_routines.lib.php:1497
 msgid "Execute routine"
 msgstr "Executar a rutina"
 
-#: libraries/rte/rte_routines.lib.php:1485
-#: libraries/rte/rte_routines.lib.php:1488
+#: libraries/rte/rte_routines.lib.php:1576
+#: libraries/rte/rte_routines.lib.php:1579
 msgid "Routine parameters"
 msgstr "Parámetros da rutina"
 
@@ -13301,7 +13315,7 @@ msgid "Original position"
 msgstr "Posición orixinal"
 
 #: libraries/server_bin_log.lib.php:133
-#: templates/structure/display_table_stats.phtml:4
+#: templates/table/structure/display_table_stats.phtml:4
 msgid "Information"
 msgstr "Información"
 
@@ -13339,12 +13353,12 @@ msgstr ""
 "Nota: De activar as estatísticas da base de datos, ocasionará que se produza "
 "un tráfico denso entre o servidor web e o de MySQL."
 
-#: libraries/server_databases.lib.php:364
-#: libraries/server_databases.lib.php:365
+#: libraries/server_databases.lib.php:366
+#: libraries/server_databases.lib.php:371
 msgid "Enable Statistics"
 msgstr "Activar as estatísticas"
 
-#: libraries/server_databases.lib.php:481
+#: libraries/server_databases.lib.php:492
 #, php-format
 msgid "%1$d database has been dropped successfully."
 msgid_plural "%1$d databases have been dropped successfully."
@@ -13730,7 +13744,7 @@ msgid "You have revoked the privileges for %s."
 msgstr "Revogou os privilexios de %s."
 
 #: libraries/server_privileges.lib.php:2059
-#: libraries/server_privileges.lib.php:4290
+#: libraries/server_privileges.lib.php:4316
 #, fuzzy
 #| msgid "Add user"
 msgid "Add user account"
@@ -13917,59 +13931,59 @@ msgstr "A eliminar %s"
 msgid "The privileges were reloaded successfully."
 msgstr "Non houbo problemas ao recargar os privilexios."
 
-#: libraries/server_privileges.lib.php:3994
+#: libraries/server_privileges.lib.php:4003
 #, php-format
 msgid "The user %s already exists!"
 msgstr "Xa existe o usuario %s!"
 
-#: libraries/server_privileges.lib.php:4232
+#: libraries/server_privileges.lib.php:4258
 #, php-format
 msgid "Privileges for %s"
 msgstr "Privilexios para %s"
 
-#: libraries/server_privileges.lib.php:4241
+#: libraries/server_privileges.lib.php:4267
 #: libraries/server_status_processes.lib.php:72
 #: libraries/server_user_groups.lib.php:39
 msgid "User"
 msgstr "Usuario"
 
-#: libraries/server_privileges.lib.php:4282
+#: libraries/server_privileges.lib.php:4308
 msgctxt "Create new user"
 msgid "New"
 msgstr "Novo"
 
-#: libraries/server_privileges.lib.php:4311
+#: libraries/server_privileges.lib.php:4337
 #, fuzzy
 #| msgid "Edit Privileges:"
 msgid "Edit privileges:"
 msgstr "Modificar os privilexios:"
 
-#: libraries/server_privileges.lib.php:4312
+#: libraries/server_privileges.lib.php:4338
 #, fuzzy
 #| msgid "Users"
 msgid "User account"
 msgstr "Usuarios"
 
-#: libraries/server_privileges.lib.php:4371
+#: libraries/server_privileges.lib.php:4397
 msgid ""
 "Note: You are attempting to edit privileges of the user with which you are "
 "currently logged in."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4391 libraries/server_users.lib.php:25
+#: libraries/server_privileges.lib.php:4417 libraries/server_users.lib.php:25
 #, fuzzy
 #| msgid "Users overview"
 msgid "User accounts overview"
 msgstr "Vista xeral dos usuarios"
 
-#: libraries/server_privileges.lib.php:4459
+#: libraries/server_privileges.lib.php:4485
 msgid ""
 "A user account allowing any user from localhost to connect is present. This "
 "will prevent other users from connecting if the host part of their account "
 "allows a connection from any (%) host."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4500
+#: libraries/server_privileges.lib.php:4526
 #, php-format
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
@@ -13982,7 +13996,7 @@ msgstr ""
 "privilexios que usa o servidor se se levaron a cabo alteracións manuais. "
 "Neste caso, debería %svolver a cargar os privilexios%s antes de proseguir."
 
-#: libraries/server_privileges.lib.php:4519
+#: libraries/server_privileges.lib.php:4545
 #, fuzzy
 #| msgid ""
 #| "Note: phpMyAdmin gets the users' privileges directly from MySQL's "
@@ -14001,25 +14015,25 @@ msgstr ""
 "privilexios que usa o servidor se se levaron a cabo alteracións manuais. "
 "Neste caso, debería %svolver a cargar os privilexios%s antes de proseguir."
 
-#: libraries/server_privileges.lib.php:4569
+#: libraries/server_privileges.lib.php:4595
 msgid "The selected user was not found in the privilege table."
 msgstr "Non se atopou o usuario escollido na táboa de privilexios."
 
-#: libraries/server_privileges.lib.php:4801
+#: libraries/server_privileges.lib.php:4827
 msgid "You have added a new user."
 msgstr "Engadiu un usuario novo."
 
-#: libraries/server_status.lib.php:53
+#: libraries/server_status.lib.php:60
 #, php-format
 msgid "Network traffic since startup: %s"
 msgstr "Tráfico da rede desde o inicio: %s"
 
-#: libraries/server_status.lib.php:66
+#: libraries/server_status.lib.php:73
 #, php-format
 msgid "This MySQL server has been running for %1$s. It started up on %2$s."
 msgstr "Este servidor de MySQL leva funcionando %1$s. Iniciouse ás %2$s."
 
-#: libraries/server_status.lib.php:80
+#: libraries/server_status.lib.php:94
 msgid ""
 "This MySQL server works as <b>master</b> and <b>slave</b> in <b>replication</"
 "b> process."
@@ -14027,22 +14041,22 @@ msgstr ""
 "Este servidor funciona como <b>mestre</b> e <b>escravo</b>  nun proceso de "
 "<b>replicación</b>."
 
-#: libraries/server_status.lib.php:85
+#: libraries/server_status.lib.php:99
 msgid "This MySQL server works as <b>master</b> in <b>replication</b> process."
 msgstr ""
 "Este servidor funciona como <b>mestre</b>nun proceso de <b>replicación</b>."
 
-#: libraries/server_status.lib.php:90
+#: libraries/server_status.lib.php:104
 msgid "This MySQL server works as <b>slave</b> in <b>replication</b> process."
 msgstr ""
 "Este servidor funciona como <b>escravo</b>  nun proceso de <b>replicación</"
 "b>."
 
-#: libraries/server_status.lib.php:106
+#: libraries/server_status.lib.php:116
 msgid "Replication status"
 msgstr "Estado da replicación"
 
-#: libraries/server_status.lib.php:137
+#: libraries/server_status.lib.php:146
 msgid ""
 "On a busy server, the byte counters may overrun, so those statistics as "
 "reported by the MySQL server may be incorrect."
@@ -14051,21 +14065,21 @@ msgstr ""
 "que esas estatísticas, tal e como as transmite o servidor de MySQL, poden "
 "resultar incorrectas."
 
-#: libraries/server_status.lib.php:148
+#: libraries/server_status.lib.php:157
 msgid "Received"
 msgstr "Recibido"
 
-#: libraries/server_status.lib.php:167
+#: libraries/server_status.lib.php:176
 msgid "Sent"
 msgstr "Enviado"
 
-#: libraries/server_status.lib.php:234
+#: libraries/server_status.lib.php:243
 #, fuzzy
 #| msgid "max. concurrent connections"
 msgid "Max. concurrent connections"
 msgstr "conexións simultáneas máximas"
 
-#: libraries/server_status.lib.php:244
+#: libraries/server_status.lib.php:253
 msgid "Failed attempts"
 msgstr "Tentativas falidas"
 
@@ -15183,7 +15197,7 @@ msgstr ""
 msgid "Not implemented yet."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/AlterOperation.php:193
+#: libraries/sql-parser/src/Components/AlterOperation.php:191
 #, fuzzy
 #| msgid "Iconic table operations"
 msgid "Unrecognized alter operation."
@@ -15199,7 +15213,7 @@ msgid "An opening bracket followed by a set of values was expected."
 msgstr ""
 
 #: libraries/sql-parser/src/Components/ArrayObj.php:101
-#: libraries/sql-parser/src/Components/FieldDefinition.php:202
+#: libraries/sql-parser/src/Components/CreateDefinition.php:202
 msgid "An opening bracket was expected."
 msgstr ""
 
@@ -15207,25 +15221,35 @@ msgstr ""
 msgid "A comma or a closing bracket was expected"
 msgstr ""
 
+#: libraries/sql-parser/src/Components/CreateDefinition.php:246
+#, fuzzy
+#| msgid "No databases selected."
+msgid "A comma or a closing bracket was expected."
+msgstr "Non hai ningunha base de datos escollida."
+
+#: libraries/sql-parser/src/Components/CreateDefinition.php:262
+msgid "A closing bracket was expected."
+msgstr ""
+
 #: libraries/sql-parser/src/Components/DataType.php:125
 msgid "Unrecognized data type."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:225
+#: libraries/sql-parser/src/Components/Expression.php:227
 msgid "Unexpected closing bracket."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:246
-#: libraries/sql-parser/src/Components/Expression.php:283
-#: libraries/sql-parser/src/Components/Expression.php:303
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:285
+#: libraries/sql-parser/src/Components/Expression.php:305
 msgid "An alias was previously found."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:257
+#: libraries/sql-parser/src/Components/Expression.php:259
 msgid "Unexpected dot."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:327
+#: libraries/sql-parser/src/Components/Expression.php:329
 #, fuzzy
 #| msgid "No databases selected."
 msgid "An alias was expected."
@@ -15237,16 +15261,6 @@ msgstr "Non hai ningunha base de datos escollida."
 msgid "An expression was expected."
 msgstr "Non hai ningunha fileira seleccionada"
 
-#: libraries/sql-parser/src/Components/FieldDefinition.php:246
-#, fuzzy
-#| msgid "No databases selected."
-msgid "A comma or a closing bracket was expected."
-msgstr "Non hai ningunha base de datos escollida."
-
-#: libraries/sql-parser/src/Components/FieldDefinition.php:262
-msgid "A closing bracket was expected."
-msgstr ""
-
 #: libraries/sql-parser/src/Components/Limit.php:90
 #: libraries/sql-parser/src/Components/Limit.php:112
 msgid "An offset was expected."
@@ -15294,29 +15308,29 @@ msgstr ""
 msgid "Expected delimiter."
 msgstr ""
 
-#: libraries/sql-parser/src/Lexer.php:753
+#: libraries/sql-parser/src/Lexer.php:777
 #, fuzzy, php-format
 #| msgid "Event %1$s has been created."
 msgid "Ending quote %1$s was expected."
 msgstr "O acontecemento %1$s foi creado."
 
-#: libraries/sql-parser/src/Lexer.php:789
+#: libraries/sql-parser/src/Lexer.php:813
 #, fuzzy
 #| msgid "Table name template"
 msgid "Variable name was expected."
 msgstr "Modelo de nome dos ficheiros"
 
-#: libraries/sql-parser/src/Parser.php:380
+#: libraries/sql-parser/src/Parser.php:391
 #, fuzzy
 #| msgid "At Beginning of Table"
 msgid "Unexpected beginning of statement."
 msgstr "No comezo da táboa"
 
-#: libraries/sql-parser/src/Parser.php:399
+#: libraries/sql-parser/src/Parser.php:410
 msgid "Unrecognized statement type."
 msgstr ""
 
-#: libraries/sql-parser/src/Parser.php:479
+#: libraries/sql-parser/src/Parser.php:489
 msgid "No transaction was previously started."
 msgstr ""
 
@@ -15346,8 +15360,10 @@ msgid "The name of the entity was expected."
 msgstr "O número de táboas abertas."
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:310
-msgid "At least one field definition was expected."
-msgstr ""
+#, fuzzy
+#| msgid "The row has been deleted."
+msgid "At least one column definition was expected."
+msgstr "Eliminouse a fileira"
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:329
 msgid "A \"RETURNS\" keyword was expected."
@@ -15408,11 +15424,11 @@ msgstr "Non se creou o marcador"
 msgid "Using bookmark \"%s\" as default browse query."
 msgstr "A empregar o marcador «%s» como consulta de navegación por omisión."
 
-#: libraries/sql.lib.php:1306
+#: libraries/sql.lib.php:1300
 msgid "Showing as PHP code"
 msgstr "Mostrar como código PHP"
 
-#: libraries/sql.lib.php:1638
+#: libraries/sql.lib.php:1632
 #, fuzzy, php-format
 #| msgid ""
 #| "Table %s does not contain a unique column. Grid edit, checkbox, Edit, "
@@ -15425,7 +15441,7 @@ msgstr ""
 "relacionadas coa edición da grella, caixa de selección, editar, copiar e "
 "eliminar non están dispoñíbeis."
 
-#: libraries/sql.lib.php:1649
+#: libraries/sql.lib.php:1643
 #, fuzzy, php-format
 #| msgid ""
 #| "Table %s does not contain a unique column. Grid edit, checkbox, Edit, "
@@ -15438,7 +15454,7 @@ msgstr ""
 "relacionadas coa edición da grella, caixa de selección, editar, copiar e "
 "eliminar non están dispoñíbeis."
 
-#: libraries/sql.lib.php:1688
+#: libraries/sql.lib.php:1682
 #, php-format
 msgid "Problems with indexes of table `%s`"
 msgstr "Problemas cos índices da táboa «%s»"
@@ -15600,7 +15616,7 @@ msgid "Version %s snapshot (SQL code)"
 msgstr "Instantánea da versión %s (código SQL)"
 
 #: libraries/tracking.lib.php:947
-#: templates/structure/table_structure_row.phtml:33
+#: templates/table/structure/table_structure_row.phtml:33
 msgctxt "None for default"
 msgid "None"
 msgstr "Nada"
@@ -15655,15 +15671,15 @@ msgstr "Crear versión %1$s de %2$s"
 msgid "Version %1$s was created, tracking for %2$s is active."
 msgstr "Creouse a versión %1$s; activouse o seguimento de %2$s."
 
-#: libraries/user_preferences.inc.php:29
+#: libraries/user_preferences.inc.php:30
 msgid "Manage your settings"
 msgstr "Xestionar a configuración"
 
-#: libraries/user_preferences.inc.php:46 prefs_manage.php:307
+#: libraries/user_preferences.inc.php:54 prefs_manage.php:307
 msgid "Configuration has been saved."
 msgstr "Gardouse a configuración."
 
-#: libraries/user_preferences.inc.php:66
+#: libraries/user_preferences.inc.php:74
 #, php-format
 msgid ""
 "Your preferences will be saved for current session only. Storing them "
@@ -16081,7 +16097,7 @@ msgid "first"
 msgstr "Primeiro"
 
 #: templates/columns_definitions/move_column.phtml:12
-#: templates/structure/add_column.phtml:21
+#: templates/table/structure/add_column.phtml:21
 #, php-format
 msgid "after %s"
 msgstr "despois de %s"
@@ -16160,219 +16176,327 @@ msgstr "Transformación do navegador"
 msgid "Input transformation options"
 msgstr "Opcións de transformación"
 
-#: templates/designer/aggregate_query_panel.phtml:22
-#: templates/designer/options_panel.phtml:100
+#: templates/database/create_table.phtml:7
+#: templates/database/designer/side_menu.phtml:77
+#: templates/database/designer/side_menu.phtml:80
+msgid "Create table"
+msgstr "Crear unha táboa"
+
+#: templates/database/create_table.phtml:15
+msgid "Number of columns"
+msgstr "Número de columnas"
+
+#: templates/database/designer/aggregate_query_panel.phtml:22
+#: templates/database/designer/options_panel.phtml:100
 msgid "Aggregate"
 msgstr "Agregar"
 
-#: templates/designer/aggregate_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:61
-#: templates/designer/options_panel.phtml:106
-#: templates/designer/options_panel.phtml:170
-#: templates/designer/where_query_panel.phtml:30
-#: templates/table/table_header.phtml:9
+#: templates/database/designer/aggregate_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:61
+#: templates/database/designer/options_panel.phtml:106
+#: templates/database/designer/options_panel.phtml:170
+#: templates/database/designer/where_query_panel.phtml:30
+#: templates/table/search/table_header.phtml:9
 msgid "Operator"
 msgstr "Operador"
 
-#: templates/designer/database_tables.phtml:29
+#: templates/database/designer/database_tables.phtml:29
 msgid "Toggle"
 msgstr ""
 
-#: templates/designer/database_tables.phtml:40
+#: templates/database/designer/database_tables.phtml:40
 #, fuzzy
 #| msgid "Table structure"
 msgid "See table structure"
 msgstr "Estrutura da táboa"
 
-#: templates/designer/delete_relation_panel.phtml:21
+#: templates/database/designer/delete_relation_panel.phtml:21
 msgid "Delete relation"
 msgstr "Eliminar a relación"
 
-#: templates/designer/edit_delete_pages.phtml:7
+#: templates/database/designer/edit_delete_pages.phtml:7
 #, fuzzy
 #| msgid "Page titles"
 msgid "Page to open"
 msgstr "Títulos de páxina"
 
-#: templates/designer/edit_delete_pages.phtml:7
+#: templates/database/designer/edit_delete_pages.phtml:7
 #, fuzzy
 #| msgid "Relation deleted"
 msgid "Page to delete"
 msgstr "Eliminouse a relación"
 
-#: templates/designer/having_query_panel.phtml:90
-#: templates/designer/options_panel.phtml:63
-#: templates/designer/options_panel.phtml:229
-#: templates/designer/where_query_panel.phtml:59
+#: templates/database/designer/having_query_panel.phtml:90
+#: templates/database/designer/options_panel.phtml:63
+#: templates/database/designer/options_panel.phtml:229
+#: templates/database/designer/where_query_panel.phtml:59
 msgid "Except"
 msgstr "Excepto"
 
-#: templates/designer/having_query_panel.phtml:102
-#: templates/designer/options_panel.phtml:75
-#: templates/designer/options_panel.phtml:241
-#: templates/designer/where_query_panel.phtml:71
+#: templates/database/designer/having_query_panel.phtml:102
+#: templates/database/designer/options_panel.phtml:75
+#: templates/database/designer/options_panel.phtml:241
+#: templates/database/designer/where_query_panel.phtml:71
 msgid "subquery"
 msgstr "subconsulta"
 
-#: templates/designer/new_relation_panel.phtml:22
-#: templates/designer/side_menu.phtml:84 templates/designer/side_menu.phtml:87
+#: templates/database/designer/new_relation_panel.phtml:22
+#: templates/database/designer/side_menu.phtml:84
+#: templates/database/designer/side_menu.phtml:87
 msgid "Create relation"
 msgstr "Crear unha relación"
 
-#: templates/designer/options_panel.phtml:34
-#: templates/designer/options_panel.phtml:200
+#: templates/database/designer/options_panel.phtml:34
+#: templates/database/designer/options_panel.phtml:200
 msgid "Relation operator"
 msgstr "Operador de relación"
 
-#: templates/designer/options_panel.phtml:85
-#: templates/designer/rename_to_panel.phtml:23
+#: templates/database/designer/options_panel.phtml:85
+#: templates/database/designer/rename_to_panel.phtml:23
 msgid "Rename to"
 msgstr "Renomear como"
 
-#: templates/designer/options_panel.phtml:91
-#: templates/designer/rename_to_panel.phtml:31
+#: templates/database/designer/options_panel.phtml:91
+#: templates/database/designer/rename_to_panel.phtml:31
 msgid "New name"
 msgstr "Novo nome"
 
-#: templates/designer/page_save_as.phtml:4
+#: templates/database/designer/page_save_as.phtml:4
 #, fuzzy
 #| msgid "Export to selected page"
 msgid "Save to selected page"
 msgstr "Exportar á páxina escollida"
 
-#: templates/designer/page_save_as.phtml:5
+#: templates/database/designer/page_save_as.phtml:5
 #, fuzzy
 #| msgid "Create a page and export to it"
 msgid "Create a page and save to it"
 msgstr "Crear unha páxina e exportar a ela"
 
-#: templates/designer/page_save_as.phtml:26
+#: templates/database/designer/page_save_as.phtml:26
 #, fuzzy
 #| msgid "New page name: "
 msgid "New page name"
 msgstr "Nome da nova páxina: "
 
-#: templates/designer/page_selector.phtml:2
+#: templates/database/designer/page_selector.phtml:2
 msgid "Select page"
 msgstr "Escoller unha páxina"
 
-#: templates/designer/query_details.phtml:10
+#: templates/database/designer/query_details.phtml:10
 msgid "Active options"
 msgstr "Opcións activas"
 
-#: templates/designer/schema_export.phtml:4
+#: templates/database/designer/schema_export.phtml:4
 msgid "Select Export Relational Type"
 msgstr "Escoller o tipo de exportación relacional"
 
-#: templates/designer/side_menu.phtml:19 templates/designer/side_menu.phtml:25
+#: templates/database/designer/side_menu.phtml:19
+#: templates/database/designer/side_menu.phtml:25
 #, fuzzy
 #| msgid "Showing tables:"
 msgid "Show/Hide tables list"
 msgstr "A mostrar as táboas:"
 
-#: templates/designer/side_menu.phtml:29 templates/designer/side_menu.phtml:35
-#: templates/designer/side_menu.phtml:36
+#: templates/database/designer/side_menu.phtml:29
+#: templates/database/designer/side_menu.phtml:35
+#: templates/database/designer/side_menu.phtml:36
 msgid "View in fullscreen"
 msgstr "Ver a pantalla completa"
 
-#: templates/designer/side_menu.phtml:34
+#: templates/database/designer/side_menu.phtml:34
 msgid "Exit fullscreen"
 msgstr "Saír da pantalla completa"
 
-#: templates/designer/side_menu.phtml:41 templates/designer/side_menu.phtml:45
+#: templates/database/designer/side_menu.phtml:41
+#: templates/database/designer/side_menu.phtml:45
 #, fuzzy
 #| msgid "New name"
 msgid "New page"
 msgstr "Novo nome"
 
-#: templates/designer/side_menu.phtml:70 templates/designer/side_menu.phtml:73
+#: templates/database/designer/side_menu.phtml:70
+#: templates/database/designer/side_menu.phtml:73
 #, fuzzy
 #| msgid "Select page"
 msgid "Delete pages"
 msgstr "Escoller unha páxina"
 
-#: templates/designer/side_menu.phtml:77 templates/designer/side_menu.phtml:80
-#: templates/table/create_table.phtml:7
-msgid "Create table"
-msgstr "Crear unha táboa"
-
-#: templates/designer/side_menu.phtml:98
-#: templates/designer/side_menu.phtml:101
+#: templates/database/designer/side_menu.phtml:98
+#: templates/database/designer/side_menu.phtml:101
 msgid "Reload"
 msgstr "Recargar"
 
-#: templates/designer/side_menu.phtml:107
-#: templates/designer/side_menu.phtml:110
+#: templates/database/designer/side_menu.phtml:107
+#: templates/database/designer/side_menu.phtml:110
 msgid "Help"
 msgstr "Axuda"
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Angular links"
 msgstr "Ligazóns angulares"
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Direct links"
 msgstr "Ligazóns directas"
 
-#: templates/designer/side_menu.phtml:122
-#: templates/designer/side_menu.phtml:124
+#: templates/database/designer/side_menu.phtml:122
+#: templates/database/designer/side_menu.phtml:124
 msgid "Snap to grid"
 msgstr "Axustar á grella"
 
-#: templates/designer/side_menu.phtml:128
-#: templates/designer/side_menu.phtml:134
+#: templates/database/designer/side_menu.phtml:128
+#: templates/database/designer/side_menu.phtml:134
 msgid "Small/Big All"
 msgstr "Todo pequeno/grande"
 
-#: templates/designer/side_menu.phtml:138
-#: templates/designer/side_menu.phtml:141
+#: templates/database/designer/side_menu.phtml:138
+#: templates/database/designer/side_menu.phtml:141
 msgid "Toggle small/big"
 msgstr "Alternar pequeno/grande"
 
-#: templates/designer/side_menu.phtml:145
-#: templates/designer/side_menu.phtml:148
+#: templates/database/designer/side_menu.phtml:145
+#: templates/database/designer/side_menu.phtml:148
 msgid "Toggle relation lines"
 msgstr "Conmutar as liñas de relación"
 
-#: templates/designer/side_menu.phtml:153
-#: templates/designer/side_menu.phtml:156
+#: templates/database/designer/side_menu.phtml:153
+#: templates/database/designer/side_menu.phtml:156
 #, fuzzy
 #| msgid "Export all"
 msgid "Export schema"
 msgstr "Exportar todo"
 
-#: templates/designer/side_menu.phtml:165
-#: templates/designer/side_menu.phtml:168
+#: templates/database/designer/side_menu.phtml:165
+#: templates/database/designer/side_menu.phtml:168
 msgid "Build Query"
 msgstr "Construír unha consulta"
 
-#: templates/designer/side_menu.phtml:173
-#: templates/designer/side_menu.phtml:177
+#: templates/database/designer/side_menu.phtml:173
+#: templates/database/designer/side_menu.phtml:177
 msgid "Move Menu"
 msgstr "Mover o menú"
 
-#: templates/designer/side_menu.phtml:181
-#: templates/designer/side_menu.phtml:186
+#: templates/database/designer/side_menu.phtml:181
+#: templates/database/designer/side_menu.phtml:186
 #, fuzzy
 #| msgid "Partial texts"
 msgid "Pin text"
 msgstr "Textos parciais"
 
-#: templates/designer/table_list.phtml:4
+#: templates/database/designer/table_list.phtml:4
 msgid "Hide/Show all"
 msgstr "Agochalo/Mostralo todo"
 
-#: templates/designer/table_list.phtml:14
+#: templates/database/designer/table_list.phtml:14
 msgid "Hide/Show Tables with no relation"
 msgstr "Agochar/Mostrar as táboas sen relación"
 
-#: templates/designer/table_list.phtml:59
+#: templates/database/designer/table_list.phtml:59
 msgid "Number of tables:"
 msgstr "Número de táboas:"
 
+#: templates/database/structure/body_for_table_summary.phtml:6
+#, php-format
+msgid "%s table"
+msgid_plural "%s tables"
+msgstr[0] "%s táboa"
+msgstr[1] "%s táboas"
+
+#: templates/database/structure/body_for_table_summary.phtml:17
+msgid "Sum"
+msgstr "Suma"
+
+#: templates/database/structure/check_all_tables.phtml:6
+msgid "Check tables having overhead"
+msgstr "Exceso na comprobación"
+
+#: templates/database/structure/check_all_tables.phtml:10
+#, fuzzy
+#| msgid "Show color"
+msgid "Show create"
+msgstr "Mostrar a cor"
+
+#: templates/database/structure/check_all_tables.phtml:27
+#, fuzzy
+#| msgid "Add prefix"
+msgid "Prefix"
+msgstr "Engadir un prefixo"
+
+#: templates/database/structure/check_all_tables.phtml:28
+msgid "Add prefix to table"
+msgstr "Engadir un prefixo á táboa"
+
+#: templates/database/structure/check_all_tables.phtml:29
+msgid "Replace table prefix"
+msgstr "Substituír o prefixo da táboa"
+
+#: templates/database/structure/check_all_tables.phtml:30
+msgid "Copy table with prefix"
+msgstr "Copiar a táboa con prefixo"
+
+#: templates/database/structure/check_all_tables.phtml:36
+#, fuzzy
+#| msgid "CHAR textarea columns"
+msgid "Add columns to central list"
+msgstr "Columnas de área de texto de CHAR"
+
+#: templates/database/structure/check_all_tables.phtml:37
+msgid "Remove columns from central list"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:38
+#, fuzzy
+#| msgid "CHAR textarea columns"
+msgid "Make consistent with central list"
+msgstr "Columnas de área de texto de CHAR"
+
+#: templates/database/structure/favorite_anchor.phtml:12
+#, fuzzy
+#| msgid "Add this series"
+msgid "Add to Favorites"
+msgstr "Engadir esta serie"
+
+#: templates/database/structure/show_create.phtml:2
+#, fuzzy
+#| msgid "Show SQL queries"
+msgid "Showing create queries"
+msgstr "Mostrar as consultas de SQL"
+
+#: templates/database/structure/sortable_header.phtml:13
+msgid "Sort"
+msgstr "Ordenar"
+
+#: templates/database/structure/table_header.phtml:42
+#, fuzzy
+#| msgid "May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]"
+msgid ""
+"May be approximate. Click on the number to get the exact count. See "
+"[doc@faq3-11]FAQ 3.11[/doc]."
+msgstr ""
+"Pode non ser exacto. Consulte a [doc@faq3-11]pregunta frecuente 3.11[/doc]"
+
+#: templates/database/structure/table_header.phtml:66
+#: templates/table/index_form.phtml:127
+msgid "Size"
+msgstr "Tamaño"
+
+#: templates/database/structure/table_header.phtml:74
+#: templates/table/structure/display_table_stats.phtml:27
+msgid "Overhead"
+msgstr "De máis (Overhead)"
+
+#: templates/database/structure/tracking_icon.phtml:4
+msgid "Tracking is active."
+msgstr "O seguimento está activado."
+
+#: templates/database/structure/tracking_icon.phtml:8
+msgid "Tracking is not active."
+msgstr "O seguimento non está activado."
+
 #: templates/error/report_form.phtml:7
 msgid ""
 "phpMyAdmin has encountered an error. We have collected data about this error "
@@ -16388,66 +16512,6 @@ msgstr ""
 msgid "Please explain the steps that lead to the error:"
 msgstr ""
 
-#: templates/gis_visualization/gis_visualization.phtml:3
-msgid "Display GIS Visualization"
-msgstr "Mostrar a visualización GIS"
-
-#: templates/gis_visualization/gis_visualization.phtml:8
-msgid "Label column"
-msgstr "Etiqueta da columna"
-
-#: templates/gis_visualization/gis_visualization.phtml:11
-msgid "-- None --"
-msgstr "- Ningunha -"
-
-#: templates/gis_visualization/gis_visualization.phtml:19
-msgid "Spatial column"
-msgstr "Columna espacial"
-
-#: templates/index_form.phtml:16
-msgid "Index name:"
-msgstr "Nome do índice:"
-
-#: templates/index_form.phtml:19
-msgid ""
-"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
-msgstr ""
-"«PRIMARIA» <b>debe</b> ser o nome de e <b>só de</b> unha chave primaria!"
-
-#: templates/index_form.phtml:40
-#, fuzzy
-#| msgid "Index cache size"
-msgid "Index choice:"
-msgstr "Tamaño da caché do índice"
-
-#: templates/index_form.phtml:57
-msgid "Key block size:"
-msgstr ""
-
-#: templates/index_form.phtml:74
-msgid "Index type:"
-msgstr "Tipo de índice:"
-
-#: templates/index_form.phtml:86
-#, fuzzy
-#| msgid "User:"
-msgid "Parser:"
-msgstr "Usuario:"
-
-#: templates/index_form.phtml:102
-msgid "Comment:"
-msgstr "Comentario:"
-
-#: templates/index_form.phtml:127 templates/structure/table_header.phtml:66
-msgid "Size"
-msgstr "Tamaño"
-
-#: templates/index_form.phtml:149 templates/index_form.phtml:190
-#, fuzzy
-#| msgid "Drag to reorder"
-msgid "Drag to reorder"
-msgstr "Arrastre para reordenar"
-
 #: templates/prefs_autoload.phtml:9
 msgid ""
 "Your browser has phpMyAdmin configuration for this domain. Would you like to "
@@ -16460,392 +16524,161 @@ msgstr ""
 msgid "Start row:"
 msgstr "Fila inicial:"
 
-#: templates/structure/actions_in_table_structure.phtml:14
-#, php-format
-msgid "A primary key has been added on %s."
-msgstr "Engadiuse unha chave primaria a %s."
-
-#: templates/structure/actions_in_table_structure.phtml:34
-#: templates/structure/actions_in_table_structure.phtml:54
-#: templates/structure/actions_in_table_structure.phtml:79
-#: templates/structure/actions_in_table_structure.phtml:101
-#, php-format
-msgid "An index has been added on %s."
-msgstr "Engadiuse un índice a %s."
-
-#: templates/structure/actions_in_table_structure.phtml:130
-#: templates/structure/check_all_table_column.phtml:59
-#, fuzzy
-#| msgid "Remove column(s)"
-msgid "Remove from central columns"
-msgstr "Eliminar columna(s)"
-
-#: templates/structure/actions_in_table_structure.phtml:138
-#: templates/structure/check_all_table_column.phtml:55
-#, fuzzy
-#| msgid "CHAR textarea columns"
-msgid "Add to central columns"
-msgstr "Columnas de área de texto de CHAR"
-
-#: templates/structure/add_column.phtml:7
-#, php-format
-msgid "Add %s column(s)"
-msgstr "Engadir %s columna(s)"
-
-#: templates/structure/add_column.phtml:12
-#, fuzzy
-#| msgid "At Beginning of Table"
-msgid "at beginning of table"
-msgstr "No comezo da táboa"
-
-#: templates/structure/body_for_table_summary.phtml:6
-#, php-format
-msgid "%s table"
-msgid_plural "%s tables"
-msgstr[0] "%s táboa"
-msgstr[1] "%s táboas"
-
-#: templates/structure/body_for_table_summary.phtml:17
-msgid "Sum"
-msgstr "Suma"
-
-#: templates/structure/check_all_tables.phtml:6
-msgid "Check tables having overhead"
-msgstr "Exceso na comprobación"
-
-#: templates/structure/check_all_tables.phtml:10
-#, fuzzy
-#| msgid "Show color"
-msgid "Show create"
-msgstr "Mostrar a cor"
-
-#: templates/structure/check_all_tables.phtml:27
-#, fuzzy
-#| msgid "Add prefix"
-msgid "Prefix"
-msgstr "Engadir un prefixo"
-
-#: templates/structure/check_all_tables.phtml:28
-msgid "Add prefix to table"
-msgstr "Engadir un prefixo á táboa"
-
-#: templates/structure/check_all_tables.phtml:29
-msgid "Replace table prefix"
-msgstr "Substituír o prefixo da táboa"
-
-#: templates/structure/check_all_tables.phtml:30
-msgid "Copy table with prefix"
-msgstr "Copiar a táboa con prefixo"
-
-#: templates/structure/check_all_tables.phtml:36
-#, fuzzy
-#| msgid "CHAR textarea columns"
-msgid "Add columns to central list"
-msgstr "Columnas de área de texto de CHAR"
-
-#: templates/structure/check_all_tables.phtml:37
-msgid "Remove columns from central list"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:38
-#, fuzzy
-#| msgid "CHAR textarea columns"
-msgid "Make consistent with central list"
-msgstr "Columnas de área de texto de CHAR"
-
-#: templates/structure/display_structure.phtml:140 view_create.php:181
-msgid "Edit view"
-msgstr "Editar a vista"
-
-#: templates/structure/display_table_stats.phtml:9
-msgid "Space usage"
-msgstr "Uso do espazo"
-
-#: templates/structure/display_table_stats.phtml:27
-#: templates/structure/table_header.phtml:74
-msgid "Overhead"
-msgstr "De máis (Overhead)"
-
-#: templates/structure/display_table_stats.phtml:32
-msgid "Effective"
-msgstr "Efectivo"
-
-#: templates/structure/favorite_anchor.phtml:12
-#, fuzzy
-#| msgid "Add this series"
-msgid "Add to Favorites"
-msgstr "Engadir esta serie"
-
-#: templates/structure/move_columns_dialog.phtml:1
-#: templates/structure/optional_action_links.phtml:21
-msgid "Move columns"
-msgstr "Mover columna(s)"
-
-#: templates/structure/move_columns_dialog.phtml:2
-msgid "Move the columns by dragging them up and down."
-msgstr "Mova as columnas arrastrándoas para riba e para baixo."
-
-#: templates/structure/optional_action_links.phtml:9
-msgid "Propose table structure"
-msgstr "Propor unha estrutura para a táboa"
-
-#: templates/structure/optional_action_links.phtml:24
-#, fuzzy
-#| msgid "Propose table structure"
-msgid "Improve table structure"
-msgstr "Propor unha estrutura para a táboa"
-
-#: templates/structure/optional_action_links.phtml:30
-#, fuzzy
-#| msgid "Track table"
-msgid "Track view"
-msgstr "Seguir a táboa"
-
-#: templates/structure/row_stats_table.phtml:3
-msgid "Row statistics"
-msgstr "Estatísticas das fileiras"
-
-#: templates/structure/row_stats_table.phtml:9
-msgid "static"
-msgstr "estáticas"
-
-#: templates/structure/row_stats_table.phtml:11
-msgid "dynamic"
-msgstr "dinámicas"
-
-#: templates/structure/row_stats_table.phtml:22
-msgid "partitioned"
-msgstr "particionado"
-
-#: templates/structure/row_stats_table.phtml:54
-msgid "Row length"
-msgstr "Lonxitude das fileiras"
-
-#: templates/structure/row_stats_table.phtml:66
-msgid "Row size"
-msgstr "Tamaño das fileiras"
-
-#: templates/structure/row_stats_table.phtml:73
-msgid "Next autoindex"
-msgstr "Índice automático seguinte"
-
-#: templates/structure/secondary_tabs.phtml:14
-#, fuzzy
-#| msgid "Relation view"
-msgid "Relation view"
-msgstr "Vista das relacións"
-
-#: templates/structure/show_create.phtml:2
-#, fuzzy
-#| msgid "Show SQL queries"
-msgid "Showing create queries"
-msgstr "Mostrar as consultas de SQL"
-
-#: templates/structure/sortable_header.phtml:13
-msgid "Sort"
-msgstr "Ordenar"
-
-#: templates/structure/table_header.phtml:42
-#, fuzzy
-#| msgid "May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]"
-msgid ""
-"May be approximate. Click on the number to get the exact count. See "
-"[doc@faq3-11]FAQ 3.11[/doc]."
-msgstr ""
-"Pode non ser exacto. Consulte a [doc@faq3-11]pregunta frecuente 3.11[/doc]"
-
-#: templates/structure/table_structure_row.phtml:46
-#, php-format
-msgid "Column %s has been dropped."
-msgstr "Eliminouse a columna %s."
-
-#: templates/structure/tracking_icon.phtml:4
-msgid "Tracking is active."
-msgstr "O seguimento está activado."
-
-#: templates/structure/tracking_icon.phtml:8
-msgid "Tracking is not active."
-msgstr "O seguimento non está activado."
-
-#: templates/table/create_table.phtml:15
-msgid "Number of columns"
-msgstr "Número de columnas"
-
-#: templates/table/options.phtml:8
-msgid "Select columns (at least one):"
-msgstr "Escolla os campos (mínimo un):"
-
-#: templates/table/options.phtml:37
-msgid "Add search conditions (body of the \"where\" clause):"
-msgstr "Engada condicións de busca (o corpo da cláusula «WHERE»):"
-
-#: templates/table/options.phtml:45
-msgid "Number of rows per page"
-msgstr "Número de filas por páxina"
-
-#: templates/table/options.phtml:56
-msgid "Display order:"
-msgstr "Mostrar en orde:"
-
-#: templates/table/options_zoom.phtml:6
-msgid "Use this column to label each point"
-msgstr "Empregue esta columna para etiquetar cada punto"
-
-#: templates/table/options_zoom.phtml:35
-msgid "Maximum rows to plot"
-msgstr "Máximo de filas que aparecen na gráfica"
-
-#: templates/table/replace_preview.phtml:13
-msgid "Find and replace - preview"
-msgstr "Buscar e substituír - vista previa"
-
-#: templates/table/replace_preview.phtml:18
-msgid "Original string"
-msgstr "Cadea orixinal"
-
-#: templates/table/replace_preview.phtml:19
-msgid "Replaced string"
-msgstr "Cadea substituída"
-
-#: templates/table/replace_preview.phtml:40
-msgid "Replace"
-msgstr "Substituír"
-
-#: templates/table/rows_zoom.phtml:16
-msgid "Additional search criteria"
-msgstr "Criterios adicionais de busca"
-
-#: templates/table/search_and_replace.phtml:3
-msgid "Replace with:"
-msgstr "Substituír por:"
-
-#: templates/table/search_and_replace.phtml:22
-#, fuzzy
-#| msgid "as regular expression"
-msgid "Use regular expression"
-msgstr "como expresión regular"
-
-#: templates/table/selection_form.phtml:12
-msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
-msgstr ""
-"Facer unha «consulta de exemplo» (o comodín é «%») para dúas columnas "
-"diferentes"
-
-#: templates/table/selection_form.phtml:34
-msgid "Do a \"query by example\" (wildcard: \"%\")"
-msgstr "Faga unha «consulta por exemplo» (o comodín é «%»)"
-
-#: templates/table/zoom_result_form.phtml:7
-msgid "Browse/Edit the points"
-msgstr "Examinar/Editar os puntos"
-
-#: templates/table/zoom_result_form.phtml:15
-msgid "How to use"
-msgstr "Como usar"
-
-#: templates/table/zoom_result_form.phtml:23
-msgid "Reset zoom"
-msgstr "Restaurar a ampliación"
-
-#: templates/tbl_chart.phtml:17
+#: templates/table/chart/tbl_chart.phtml:17
 msgctxt "Chart type"
 msgid "Bar"
 msgstr "Barras"
 
-#: templates/tbl_chart.phtml:21
+#: templates/table/chart/tbl_chart.phtml:21
 msgctxt "Chart type"
 msgid "Column"
 msgstr "Columnas"
 
-#: templates/tbl_chart.phtml:25
+#: templates/table/chart/tbl_chart.phtml:25
 msgctxt "Chart type"
 msgid "Line"
 msgstr "Liñas"
 
-#: templates/tbl_chart.phtml:29
+#: templates/table/chart/tbl_chart.phtml:29
 msgctxt "Chart type"
 msgid "Spline"
 msgstr "Curvas spline"
 
-#: templates/tbl_chart.phtml:33
+#: templates/table/chart/tbl_chart.phtml:33
 msgctxt "Chart type"
 msgid "Area"
 msgstr "Áreas"
 
-#: templates/tbl_chart.phtml:37
+#: templates/table/chart/tbl_chart.phtml:37
 msgctxt "Chart type"
 msgid "Pie"
 msgstr "Sectores"
 
-#: templates/tbl_chart.phtml:41
+#: templates/table/chart/tbl_chart.phtml:41
 msgctxt "Chart type"
 msgid "Timeline"
 msgstr "Liña de tempo"
 
-#: templates/tbl_chart.phtml:45
+#: templates/table/chart/tbl_chart.phtml:45
 msgctxt "Chart type"
 msgid "Scatter"
 msgstr ""
 
-#: templates/tbl_chart.phtml:50
+#: templates/table/chart/tbl_chart.phtml:50
 msgid "Stacked"
 msgstr "Amontoado"
 
-#: templates/tbl_chart.phtml:53
+#: templates/table/chart/tbl_chart.phtml:53
 msgid "Chart title"
 msgstr "Título da gráfica"
 
-#: templates/tbl_chart.phtml:57
+#: templates/table/chart/tbl_chart.phtml:57
 msgid "X-Axis:"
 msgstr "Eixo X:"
 
-#: templates/tbl_chart.phtml:72
+#: templates/table/chart/tbl_chart.phtml:72
 msgid "Series:"
 msgstr "Series:"
 
-#: templates/tbl_chart.phtml:102
+#: templates/table/chart/tbl_chart.phtml:102
 msgid "X-Axis label:"
 msgstr "Etiqueta do eixo X:"
 
-#: templates/tbl_chart.phtml:104
+#: templates/table/chart/tbl_chart.phtml:104
 msgid "X Values"
 msgstr "Valores X"
 
-#: templates/tbl_chart.phtml:107
+#: templates/table/chart/tbl_chart.phtml:107
 msgid "Y-Axis label:"
 msgstr "Eixo Y:"
 
-#: templates/tbl_chart.phtml:115
+#: templates/table/chart/tbl_chart.phtml:115
 msgid "Series names are in a column"
 msgstr ""
 
-#: templates/tbl_chart.phtml:118
+#: templates/table/chart/tbl_chart.phtml:118
 #, fuzzy
 #| msgid "Inside column:"
 msgid "Series column:"
 msgstr "Dentro da columna:"
 
-#: templates/tbl_chart.phtml:130
+#: templates/table/chart/tbl_chart.phtml:130
 #, fuzzy
 #| msgid "Values for column %s"
 msgid "Value Column:"
 msgstr "Valores para a columna %s"
 
-#: templates/tbl_chart.phtml:150
+#: templates/table/chart/tbl_chart.phtml:150
 #, fuzzy
 #| msgid "Save as file"
 msgid "Save chart as image"
 msgstr "Enviar <i>(gravar nun ficheiro)</i><br />"
 
-#: templates/tbl_relation/common_form.phtml:7
+#: templates/table/gis_visualization/gis_visualization.phtml:3
+msgid "Display GIS Visualization"
+msgstr "Mostrar a visualización GIS"
+
+#: templates/table/gis_visualization/gis_visualization.phtml:8
+msgid "Label column"
+msgstr "Etiqueta da columna"
+
+#: templates/table/gis_visualization/gis_visualization.phtml:11
+msgid "-- None --"
+msgstr "- Ningunha -"
+
+#: templates/table/gis_visualization/gis_visualization.phtml:19
+msgid "Spatial column"
+msgstr "Columna espacial"
+
+#: templates/table/index_form.phtml:16
+msgid "Index name:"
+msgstr "Nome do índice:"
+
+#: templates/table/index_form.phtml:19
+msgid ""
+"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
+msgstr ""
+"«PRIMARIA» <b>debe</b> ser o nome de e <b>só de</b> unha chave primaria!"
+
+#: templates/table/index_form.phtml:40
+#, fuzzy
+#| msgid "Index cache size"
+msgid "Index choice:"
+msgstr "Tamaño da caché do índice"
+
+#: templates/table/index_form.phtml:57
+msgid "Key block size:"
+msgstr ""
+
+#: templates/table/index_form.phtml:74
+msgid "Index type:"
+msgstr "Tipo de índice:"
+
+#: templates/table/index_form.phtml:86
+#, fuzzy
+#| msgid "User:"
+msgid "Parser:"
+msgstr "Usuario:"
+
+#: templates/table/index_form.phtml:102
+msgid "Comment:"
+msgstr "Comentario:"
+
+#: templates/table/index_form.phtml:149 templates/table/index_form.phtml:190
+#, fuzzy
+#| msgid "Drag to reorder"
+msgid "Drag to reorder"
+msgstr "Arrastre para reordenar"
+
+#: templates/table/relation/common_form.phtml:7
 msgid "Internal relations"
 msgstr "Relacións internas"
 
-#: templates/tbl_relation/common_form.phtml:11
+#: templates/table/relation/common_form.phtml:11
 msgid "Internal relation"
 msgstr "Relación interna"
 
-#: templates/tbl_relation/common_form.phtml:14
+#: templates/table/relation/common_form.phtml:14
 msgid ""
 "An internal relation is not necessary when a corresponding FOREIGN KEY "
 "relation exists."
@@ -16853,57 +16686,247 @@ msgstr ""
 "Non se precisa unha relación interna cando existe unha CHAVE EXTERNA "
 "correspondente."
 
-#: templates/tbl_relation/common_form.phtml:37
+#: templates/table/relation/common_form.phtml:37
 #, fuzzy
 #| msgid "Foreign key constraint"
 msgid "Foreign key constraints"
 msgstr "Límite das chaves externas"
 
-#: templates/tbl_relation/common_form.phtml:40
+#: templates/table/relation/common_form.phtml:40
 msgid "Actions"
 msgstr "Accións"
 
-#: templates/tbl_relation/common_form.phtml:41
+#: templates/table/relation/common_form.phtml:41
 #, fuzzy
 #| msgid "Constraints for table"
 msgid "Constraint properties"
 msgstr "Restricións para a táboa"
 
-#: templates/tbl_relation/common_form.phtml:44
+#: templates/table/relation/common_form.phtml:44
 msgid ""
 "Only columns with index will be displayed. You can define an index below."
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:49
+#: templates/table/relation/common_form.phtml:49
 msgid "Foreign key constraint"
 msgstr "Límite das chaves externas"
 
-#: templates/tbl_relation/common_form.phtml:81
+#: templates/table/relation/common_form.phtml:81
 #, fuzzy
 #| msgid "Add constraints"
 msgid "+ Add constraint"
 msgstr "Engadir limitacións"
 
-#: templates/tbl_relation/common_form.phtml:91
+#: templates/table/relation/common_form.phtml:91
 msgid "Choose column to display:"
 msgstr "Escolla a columna que desexe mostrar:"
 
-#: templates/tbl_relation/foreign_key_row.phtml:13
+#: templates/table/relation/foreign_key_row.phtml:13
 #, fuzzy, php-format
 #| msgid "Foreign key constraint"
 msgid "Foreign key constraint %s has been dropped"
 msgstr "Límite das chaves externas"
 
-#: templates/tbl_relation/foreign_key_row.phtml:102
+#: templates/table/relation/foreign_key_row.phtml:102
 msgid "Constraint name"
 msgstr "Límite do nome"
 
-#: templates/tbl_relation/foreign_key_row.phtml:157
+#: templates/table/relation/foreign_key_row.phtml:157
 #, fuzzy
 #| msgid "Add column"
 msgid "+ Add column"
 msgstr "Engadir unha columna"
 
+#: templates/table/search/options.phtml:8
+msgid "Select columns (at least one):"
+msgstr "Escolla os campos (mínimo un):"
+
+#: templates/table/search/options.phtml:37
+msgid "Add search conditions (body of the \"where\" clause):"
+msgstr "Engada condicións de busca (o corpo da cláusula «WHERE»):"
+
+#: templates/table/search/options.phtml:45
+msgid "Number of rows per page"
+msgstr "Número de filas por páxina"
+
+#: templates/table/search/options.phtml:56
+msgid "Display order:"
+msgstr "Mostrar en orde:"
+
+#: templates/table/search/options_zoom.phtml:6
+msgid "Use this column to label each point"
+msgstr "Empregue esta columna para etiquetar cada punto"
+
+#: templates/table/search/options_zoom.phtml:35
+msgid "Maximum rows to plot"
+msgstr "Máximo de filas que aparecen na gráfica"
+
+#: templates/table/search/replace_preview.phtml:13
+msgid "Find and replace - preview"
+msgstr "Buscar e substituír - vista previa"
+
+#: templates/table/search/replace_preview.phtml:18
+msgid "Original string"
+msgstr "Cadea orixinal"
+
+#: templates/table/search/replace_preview.phtml:19
+msgid "Replaced string"
+msgstr "Cadea substituída"
+
+#: templates/table/search/replace_preview.phtml:40
+msgid "Replace"
+msgstr "Substituír"
+
+#: templates/table/search/rows_zoom.phtml:16
+msgid "Additional search criteria"
+msgstr "Criterios adicionais de busca"
+
+#: templates/table/search/search_and_replace.phtml:3
+msgid "Replace with:"
+msgstr "Substituír por:"
+
+#: templates/table/search/search_and_replace.phtml:22
+#, fuzzy
+#| msgid "as regular expression"
+msgid "Use regular expression"
+msgstr "como expresión regular"
+
+#: templates/table/search/selection_form.phtml:12
+msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
+msgstr ""
+"Facer unha «consulta de exemplo» (o comodín é «%») para dúas columnas "
+"diferentes"
+
+#: templates/table/search/selection_form.phtml:34
+msgid "Do a \"query by example\" (wildcard: \"%\")"
+msgstr "Faga unha «consulta por exemplo» (o comodín é «%»)"
+
+#: templates/table/search/zoom_result_form.phtml:7
+msgid "Browse/Edit the points"
+msgstr "Examinar/Editar os puntos"
+
+#: templates/table/search/zoom_result_form.phtml:15
+msgid "How to use"
+msgstr "Como usar"
+
+#: templates/table/search/zoom_result_form.phtml:23
+msgid "Reset zoom"
+msgstr "Restaurar a ampliación"
+
+#: templates/table/secondary_tabs.phtml:14
+#, fuzzy
+#| msgid "Relation view"
+msgid "Relation view"
+msgstr "Vista das relacións"
+
+#: templates/table/structure/actions_in_table_structure.phtml:14
+#, php-format
+msgid "A primary key has been added on %s."
+msgstr "Engadiuse unha chave primaria a %s."
+
+#: templates/table/structure/actions_in_table_structure.phtml:34
+#: templates/table/structure/actions_in_table_structure.phtml:54
+#: templates/table/structure/actions_in_table_structure.phtml:79
+#: templates/table/structure/actions_in_table_structure.phtml:101
+#, php-format
+msgid "An index has been added on %s."
+msgstr "Engadiuse un índice a %s."
+
+#: templates/table/structure/actions_in_table_structure.phtml:130
+#: templates/table/structure/check_all_table_column.phtml:59
+#, fuzzy
+#| msgid "Remove column(s)"
+msgid "Remove from central columns"
+msgstr "Eliminar columna(s)"
+
+#: templates/table/structure/actions_in_table_structure.phtml:138
+#: templates/table/structure/check_all_table_column.phtml:55
+#, fuzzy
+#| msgid "CHAR textarea columns"
+msgid "Add to central columns"
+msgstr "Columnas de área de texto de CHAR"
+
+#: templates/table/structure/add_column.phtml:7
+#, php-format
+msgid "Add %s column(s)"
+msgstr "Engadir %s columna(s)"
+
+#: templates/table/structure/add_column.phtml:12
+#, fuzzy
+#| msgid "At Beginning of Table"
+msgid "at beginning of table"
+msgstr "No comezo da táboa"
+
+#: templates/table/structure/display_structure.phtml:140 view_create.php:181
+msgid "Edit view"
+msgstr "Editar a vista"
+
+#: templates/table/structure/display_table_stats.phtml:9
+msgid "Space usage"
+msgstr "Uso do espazo"
+
+#: templates/table/structure/display_table_stats.phtml:32
+msgid "Effective"
+msgstr "Efectivo"
+
+#: templates/table/structure/move_columns_dialog.phtml:1
+#: templates/table/structure/optional_action_links.phtml:21
+msgid "Move columns"
+msgstr "Mover columna(s)"
+
+#: templates/table/structure/move_columns_dialog.phtml:2
+msgid "Move the columns by dragging them up and down."
+msgstr "Mova as columnas arrastrándoas para riba e para baixo."
+
+#: templates/table/structure/optional_action_links.phtml:9
+msgid "Propose table structure"
+msgstr "Propor unha estrutura para a táboa"
+
+#: templates/table/structure/optional_action_links.phtml:24
+#, fuzzy
+#| msgid "Propose table structure"
+msgid "Improve table structure"
+msgstr "Propor unha estrutura para a táboa"
+
+#: templates/table/structure/optional_action_links.phtml:30
+#, fuzzy
+#| msgid "Track table"
+msgid "Track view"
+msgstr "Seguir a táboa"
+
+#: templates/table/structure/row_stats_table.phtml:3
+msgid "Row statistics"
+msgstr "Estatísticas das fileiras"
+
+#: templates/table/structure/row_stats_table.phtml:9
+msgid "static"
+msgstr "estáticas"
+
+#: templates/table/structure/row_stats_table.phtml:11
+msgid "dynamic"
+msgstr "dinámicas"
+
+#: templates/table/structure/row_stats_table.phtml:22
+msgid "partitioned"
+msgstr "particionado"
+
+#: templates/table/structure/row_stats_table.phtml:54
+msgid "Row length"
+msgstr "Lonxitude das fileiras"
+
+#: templates/table/structure/row_stats_table.phtml:66
+msgid "Row size"
+msgstr "Tamaño das fileiras"
+
+#: templates/table/structure/row_stats_table.phtml:73
+msgid "Next autoindex"
+msgstr "Índice automático seguinte"
+
+#: templates/table/structure/table_structure_row.phtml:46
+#, php-format
+msgid "Column %s has been dropped."
+msgstr "Eliminouse a columna %s."
+
 #: themes.php:17 themes.php:22
 msgid "Theme"
 msgstr "Tema"
@@ -18292,6 +18315,11 @@ msgstr ""
 msgid "concurrent_insert is set to 0"
 msgstr "concurrent_insert está definido como 0"
 
+#, fuzzy
+#~| msgid "Read misses"
+#~ msgid "Read as multibytes"
+#~ msgstr "Fallos de lectura"
+
 #~ msgid "Relational display column"
 #~ msgstr "Mostrar columna de relación"
 
diff --git a/po/he.po b/po/he.po
index c6fc8b235b..a82ab41ab3 100644
--- a/po/he.po
+++ b/po/he.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 4.5.0-dev\n"
 "Report-Msgid-Bugs-To: developers@phpmyadmin.net\n"
-"POT-Creation-Date: 2015-08-08 13:53-0400\n"
+"POT-Creation-Date: 2015-08-12 08:10-0400\n"
 "PO-Revision-Date: 2015-07-28 16:36+0200\n"
 "Last-Translator: Moshe Harush <mmh15@windowslive.com>\n"
 "Language-Team: Hebrew <https://hosted.weblate.org/projects/phpmyadmin/master/"
@@ -53,7 +53,7 @@ msgid "Table comments:"
 msgstr "הערות לטבלה:"
 
 #: db_datadict.php:104 libraries/Index.class.php:699
-#: libraries/insert_edit.lib.php:1567
+#: libraries/insert_edit.lib.php:1565
 #: libraries/navigation/Nodes/Node_Column.class.php:30
 #: libraries/plugins/export/ExportHtmlword.class.php:280
 #: libraries/plugins/export/ExportHtmlword.class.php:375
@@ -67,13 +67,14 @@ msgstr "הערות לטבלה:"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1023
 #: libraries/tracking.lib.php:879 libraries/tracking.lib.php:975
 #: templates/columns_definitions/column_name.phtml:18
-#: templates/index_form.phtml:124 templates/table/table_header.phtml:6
-#: templates/table/zoom_result_form.phtml:33
-#: templates/tbl_relation/common_form.phtml:10
-#: templates/tbl_relation/common_form.phtml:43
-#: templates/tbl_relation/foreign_key_row.phtml:194
-#: templates/tbl_relation/foreign_key_row.phtml:206
-#: templates/tbl_relation/internal_relational_row.phtml:71
+#: templates/table/index_form.phtml:124
+#: templates/table/relation/common_form.phtml:10
+#: templates/table/relation/common_form.phtml:43
+#: templates/table/relation/foreign_key_row.phtml:194
+#: templates/table/relation/foreign_key_row.phtml:206
+#: templates/table/relation/internal_relational_row.phtml:71
+#: templates/table/search/table_header.phtml:6
+#: templates/table/search/zoom_result_form.phtml:33
 msgid "Column"
 msgstr "עמודה"
 
@@ -91,21 +92,21 @@ msgstr "עמודה"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1001
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1024
 #: libraries/rte/rte_list.lib.php:75 libraries/rte/rte_list.lib.php:103
-#: libraries/rte/rte_routines.lib.php:802
-#: libraries/rte/rte_routines.lib.php:831
-#: libraries/rte/rte_routines.lib.php:1493
+#: libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_routines.lib.php:922
+#: libraries/rte/rte_routines.lib.php:1584
 #: libraries/server_privileges.lib.php:2369 libraries/tracking.lib.php:880
 #: libraries/tracking.lib.php:972
 #: templates/columns_definitions/table_fields_definitions.phtml:11
-#: templates/structure/table_header.phtml:48
-#: templates/structure/table_structure_header.phtml:6
-#: templates/table/table_header.phtml:7
+#: templates/database/structure/table_header.phtml:48
+#: templates/table/search/table_header.phtml:7
+#: templates/table/structure/table_structure_header.phtml:6
 msgid "Type"
 msgstr "סוג"
 
 #: db_datadict.php:106 libraries/Index.class.php:702
 #: libraries/central_columns.lib.php:708
-#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1576
+#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1574
 #: libraries/plugins/export/ExportHtmlword.class.php:286
 #: libraries/plugins/export/ExportHtmlword.class.php:381
 #: libraries/plugins/export/ExportLatex.class.php:509
@@ -118,8 +119,8 @@ msgstr "סוג"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1026
 #: libraries/tracking.lib.php:882 libraries/tracking.lib.php:978
 #: templates/columns_definitions/table_fields_definitions.phtml:39
-#: templates/structure/table_structure_header.phtml:9
-#: templates/table/zoom_result_form.phtml:34
+#: templates/table/search/zoom_result_form.phtml:34
+#: templates/table/structure/table_structure_header.phtml:9
 msgid "Null"
 msgstr "ריק"
 
@@ -137,8 +138,8 @@ msgstr "ריק"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1027
 #: libraries/replication_gui.lib.php:153 libraries/tracking.lib.php:883
 #: templates/columns_definitions/table_fields_definitions.phtml:25
-#: templates/structure/body_for_table_summary.phtml:55
-#: templates/structure/table_structure_header.phtml:10
+#: templates/database/structure/body_for_table_summary.phtml:55
+#: templates/table/structure/table_structure_header.phtml:10
 msgid "Default"
 msgstr "בררת מחדל"
 
@@ -166,19 +167,19 @@ msgid "Comments"
 msgstr "הערות"
 
 #: db_datadict.php:146
-#: libraries/controllers/StructureController.class.php:1960
-#: libraries/controllers/StructureController.class.php:1965
+#: libraries/controllers/TableStructureController.class.php:951
+#: libraries/controllers/TableStructureController.class.php:956
 #: libraries/tracking.lib.php:922
 #: templates/columns_definitions/column_indexes.phtml:6
-#: templates/structure/check_all_table_column.phtml:22
-#: templates/structure/display_structure.phtml:74
+#: templates/table/structure/check_all_table_column.phtml:22
+#: templates/table/structure/display_structure.phtml:74
 msgid "Primary"
 msgstr "ראשי"
 
 #: db_datadict.php:156 js/messages.php:317 libraries/Index.class.php:567
 #: libraries/Index.class.php:606 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261 libraries/mult_submits.lib.php:403
+#: libraries/config/FormDisplay.tpl.php:272 libraries/mult_submits.lib.php:403
 #: libraries/mult_submits.lib.php:417
 #: libraries/plugins/export/ExportHtmlword.class.php:630
 #: libraries/plugins/export/ExportLatex.class.php:589
@@ -194,20 +195,20 @@ msgstr "ראשי"
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1010 libraries/tracking.lib.php:1015
 #: prefs_manage.php:140 templates/prefs_autoload.phtml:15
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "No"
 msgstr "לא"
 
 #: db_datadict.php:156 js/messages.php:443 libraries/Index.class.php:568
 #: libraries/Index.class.php:605 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261
-#: libraries/controllers/StructureController.class.php:1344
-#: libraries/controllers/StructureController.class.php:2223
-#: libraries/controllers/StructureController.class.php:2232
-#: libraries/controllers/StructureController.class.php:2237
-#: libraries/controllers/StructureController.class.php:2242
-#: libraries/controllers/StructureController.class.php:2247
+#: libraries/config/FormDisplay.tpl.php:272
+#: libraries/controllers/TableStructureController.class.php:539
+#: libraries/controllers/TableStructureController.class.php:1201
+#: libraries/controllers/TableStructureController.class.php:1210
+#: libraries/controllers/TableStructureController.class.php:1215
+#: libraries/controllers/TableStructureController.class.php:1220
+#: libraries/controllers/TableStructureController.class.php:1225
 #: libraries/mult_submits.inc.php:82 libraries/mult_submits.inc.php:178
 #: libraries/mult_submits.lib.php:339 libraries/mult_submits.lib.php:372
 #: libraries/mult_submits.lib.php:401 libraries/mult_submits.lib.php:415
@@ -216,8 +217,8 @@ msgstr "לא"
 #: libraries/plugins/export/ExportOdt.class.php:756
 #: libraries/plugins/export/ExportTexytext.class.php:567
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1077
-#: libraries/server_databases.lib.php:464
-#: libraries/server_databases.lib.php:474
+#: libraries/server_databases.lib.php:475
+#: libraries/server_databases.lib.php:485
 #: libraries/server_privileges.lib.php:2546
 #: libraries/server_privileges.lib.php:2727
 #: libraries/server_privileges.lib.php:2748
@@ -227,7 +228,7 @@ msgstr "לא"
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1008 libraries/tracking.lib.php:1013
 #: prefs_manage.php:138 templates/prefs_autoload.phtml:14
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "Yes"
 msgstr "כן"
 
@@ -237,7 +238,7 @@ msgstr "צפייה בשליפה (תבנית) של מסד נתונים"
 
 #: db_export.php:37 db_tracking.php:90 export.php:382
 #: libraries/DBQbe.class.php:326
-#: libraries/controllers/StructureController.class.php:231
+#: libraries/controllers/DatabaseStructureController.class.php:170
 #: libraries/navigation/NavigationTree.class.php:897
 msgid "No tables found in database."
 msgstr "לא נמצאו טבלאות במסד הנתונים."
@@ -248,14 +249,14 @@ msgstr "לא נמצאו טבלאות במסד הנתונים."
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:26
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:120
-#: templates/structure/show_create.phtml:18
+#: templates/database/structure/show_create.phtml:18
 msgid "Tables"
 msgstr "טבלאות"
 
 #: db_export.php:52 libraries/Menu.class.php:317 libraries/Menu.class.php:425
-#: libraries/Util.class.php:3333 libraries/Util.class.php:3343
-#: libraries/Util.class.php:3349 libraries/Util.class.php:3629
-#: libraries/Util.class.php:4327 libraries/Util.class.php:4344
+#: libraries/Util.class.php:3339 libraries/Util.class.php:3349
+#: libraries/Util.class.php:3355 libraries/Util.class.php:3635
+#: libraries/Util.class.php:4333 libraries/Util.class.php:4350
 #: libraries/central_columns.lib.php:728 libraries/config.values.php:39
 #: libraries/config.values.php:47 libraries/config.values.php:109
 #: libraries/config.values.php:115 libraries/config/setup.forms.php:323
@@ -269,7 +270,7 @@ msgstr "טבלאות"
 #: libraries/navigation/Nodes/Node_Table.class.php:283
 #: libraries/server_privileges.lib.php:1141 libraries/tracking.lib.php:874
 #: templates/columns_definitions/table_fields_definitions.phtml:3
-#: templates/designer/table_list.phtml:28
+#: templates/database/designer/table_list.phtml:28
 msgid "Structure"
 msgstr "מבנה"
 
@@ -281,7 +282,7 @@ msgstr "מבנה"
 #: libraries/config/user_preferences.forms.php:292
 #: libraries/config/user_preferences.forms.php:297
 #: libraries/server_privileges.lib.php:1140
-#: templates/structure/display_table_stats.phtml:12
+#: templates/table/structure/display_table_stats.phtml:12
 msgid "Data"
 msgstr "נתונים"
 
@@ -364,10 +365,10 @@ msgstr "טבלאות במעקב"
 #: libraries/server_privileges.lib.php:2908
 #: libraries/server_privileges.lib.php:3145
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4346
-#: templates/structure/table_header.phtml:21
-#: templates/tbl_relation/foreign_key_row.phtml:176
-#: templates/tbl_relation/internal_relational_row.phtml:63
+#: libraries/server_privileges.lib.php:4372
+#: templates/database/structure/table_header.phtml:21
+#: templates/table/relation/foreign_key_row.phtml:176
+#: templates/table/relation/internal_relational_row.phtml:63
 msgid "Table"
 msgstr "טבלה"
 
@@ -384,7 +385,7 @@ msgid "Updated"
 msgstr "עודכנה"
 
 #: db_tracking.php:130 js/messages.php:243 libraries/Menu.class.php:552
-#: libraries/Util.class.php:4314 libraries/config.values.php:104
+#: libraries/Util.class.php:4320 libraries/config.values.php:104
 #: libraries/rte/rte_events.lib.php:393 libraries/rte/rte_list.lib.php:101
 #: libraries/server_status_processes.lib.php:92 libraries/tracking.lib.php:279
 msgid "Status"
@@ -393,14 +394,15 @@ msgstr "מצב"
 #: db_tracking.php:131 db_tracking.php:290 libraries/Index.class.php:693
 #: libraries/central_columns.lib.php:687 libraries/rte/rte_list.lib.php:74
 #: libraries/rte/rte_list.lib.php:89 libraries/rte/rte_list.lib.php:102
-#: libraries/server_databases.lib.php:398
+#: libraries/server_databases.lib.php:409
 #: libraries/server_privileges.lib.php:2372
 #: libraries/server_privileges.lib.php:3166
 #: libraries/server_privileges.lib.php:3342
 #: libraries/server_user_groups.lib.php:82
 #: libraries/server_variables.lib.php:189 libraries/tracking.lib.php:280
-#: libraries/tracking.lib.php:793 templates/structure/table_header.phtml:30
-#: templates/structure/table_structure_header.phtml:23
+#: libraries/tracking.lib.php:793
+#: templates/database/structure/table_header.phtml:30
+#: templates/table/structure/table_structure_header.phtml:23
 msgid "Action"
 msgstr "פעולה"
 
@@ -444,7 +446,7 @@ msgid "Untracked tables"
 msgstr "טבלאות שאינן במעקב"
 
 #: db_tracking.php:305 db_tracking.php:336
-#: templates/structure/optional_action_links.phtml:17
+#: templates/table/structure/optional_action_links.phtml:17
 msgid "Track table"
 msgstr "מעקב אחר טבלה"
 
@@ -494,7 +496,7 @@ msgid "Value for the column \"%s\""
 msgstr "ערך עבור העמודה „%s“"
 
 #: gis_data_editor.php:146
-#: templates/gis_visualization/gis_visualization.phtml:37
+#: templates/table/gis_visualization/gis_visualization.phtml:37
 msgid "Use OpenStreetMaps as Base Layer"
 msgstr "שימוש ב־OpenStreetMaps כשכבת הבסיס"
 
@@ -574,35 +576,35 @@ msgstr "הוספת פני שטח"
 #: libraries/display_change_password.lib.php:162
 #: libraries/display_export.lib.php:402 libraries/display_export.lib.php:408
 #: libraries/display_import.lib.php:392 libraries/index.lib.php:44
-#: libraries/insert_edit.lib.php:1546 libraries/insert_edit.lib.php:1583
+#: libraries/insert_edit.lib.php:1544 libraries/insert_edit.lib.php:1581
 #: libraries/normalization.lib.php:165 libraries/normalization.lib.php:821
 #: libraries/operations.lib.php:38 libraries/operations.lib.php:108
 #: libraries/operations.lib.php:263 libraries/operations.lib.php:306
 #: libraries/operations.lib.php:801 libraries/operations.lib.php:874
 #: libraries/operations.lib.php:923 libraries/operations.lib.php:1337
 #: libraries/operations.lib.php:1658
-#: libraries/plugins/auth/AuthenticationCookie.class.php:244
+#: libraries/plugins/auth/AuthenticationCookie.class.php:232
 #: libraries/replication_gui.lib.php:122 libraries/replication_gui.lib.php:161
 #: libraries/replication_gui.lib.php:324 libraries/replication_gui.lib.php:461
 #: libraries/replication_gui.lib.php:906 libraries/rte/rte_events.lib.php:509
-#: libraries/rte/rte_routines.lib.php:969
-#: libraries/rte/rte_routines.lib.php:1581
+#: libraries/rte/rte_routines.lib.php:1060
+#: libraries/rte/rte_routines.lib.php:1672
 #: libraries/rte/rte_triggers.lib.php:396 libraries/server_bin_log.lib.php:61
 #: libraries/server_privileges.lib.php:705
 #: libraries/server_privileges.lib.php:2106
 #: libraries/server_privileges.lib.php:2872
 #: libraries/server_privileges.lib.php:3553
-#: libraries/server_privileges.lib.php:4627
+#: libraries/server_privileges.lib.php:4653
 #: libraries/server_user_groups.lib.php:285
 #: libraries/sql_query_form.lib.php:369 libraries/sql_query_form.lib.php:429
 #: libraries/tracking.lib.php:533 libraries/tracking.lib.php:653
 #: prefs_manage.php:277 prefs_manage.php:355
 #: templates/columns_definitions/column_definitions_form.phtml:59
-#: templates/header_location.phtml:17 templates/index_form.phtml:238
+#: templates/database/create_table.phtml:21 templates/header_location.phtml:28
 #: templates/startAndNumberOfRowsPanel.phtml:14
-#: templates/structure/add_column.phtml:25
-#: templates/table/create_table.phtml:21
-#: templates/table/selection_form.phtml:75 view_create.php:275
+#: templates/table/index_form.phtml:238
+#: templates/table/search/selection_form.phtml:75
+#: templates/table/structure/add_column.phtml:25 view_create.php:275
 #: view_operations.php:106
 msgid "Go"
 msgstr "ביצוע"
@@ -695,7 +697,7 @@ msgstr "לא ניתן להמיר את קידוד התווים של הקובץ ל
 msgid "Could not load import plugins, please check your installation!"
 msgstr "לא ניתן לטעון את תוספי הייבוא, נא לבדוק האם ההתקנה שלך תקינה!"
 
-#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1466
+#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1460
 #, fuzzy, php-format
 #| msgid "Bookmark %s created"
 msgid "Bookmark %s has been created."
@@ -737,11 +739,11 @@ msgstr ""
 msgid "Back"
 msgstr "חזרה"
 
-#: index.php:148 libraries/Footer.class.php:70
+#: index.php:149 libraries/Footer.class.php:70
 msgid "phpMyAdmin Demo Server"
 msgstr "שרת הדגמה של phpMyAdmin"
 
-#: index.php:152
+#: index.php:153
 #, php-format
 msgid ""
 "You are using the demo server. You can do anything here, but please do not "
@@ -749,112 +751,112 @@ msgid ""
 "at %s."
 msgstr ""
 
-#: index.php:162
+#: index.php:163
 msgid "General Settings"
 msgstr "הגדרות כלליות"
 
-#: index.php:190 libraries/display_change_password.lib.php:50
+#: index.php:191 libraries/display_change_password.lib.php:50
 #: libraries/display_change_password.lib.php:53 user_password.php:247
 msgid "Change password"
 msgstr "שינוי סיסמא"
 
-#: index.php:206
+#: index.php:207
 msgid "Server connection collation"
 msgstr "איסוף חיבור שרת"
 
-#: index.php:228
+#: index.php:229
 msgid "Appearance Settings"
 msgstr "הגדרות מראה"
 
-#: index.php:258 prefs_manage.php:285
+#: index.php:259 prefs_manage.php:285
 msgid "More settings"
 msgstr "הגדרות נוספות"
 
-#: index.php:279
+#: index.php:280
 msgid "Database server"
 msgstr "שרת מסד נתונים"
 
-#: index.php:282 libraries/plugins/auth/AuthenticationCookie.class.php:181
+#: index.php:283 libraries/plugins/auth/AuthenticationCookie.class.php:169
 msgid "Server:"
 msgstr "שרת:"
 
-#: index.php:286
+#: index.php:287
 msgid "Server type:"
 msgstr "סוג שרת:"
 
-#: index.php:290 libraries/plugins/export/ExportLatex.class.php:212
+#: index.php:291 libraries/plugins/export/ExportLatex.class.php:212
 #: libraries/plugins/export/ExportSql.class.php:687
 #: libraries/plugins/export/ExportXml.class.php:189
 msgid "Server version:"
 msgstr "גרסת שרת:"
 
-#: index.php:296
+#: index.php:297
 msgid "Protocol version:"
 msgstr "גירסת פרוטוקול:"
 
-#: index.php:300
+#: index.php:301
 msgid "User:"
 msgstr "משתמש:"
 
-#: index.php:305
+#: index.php:306
 msgid "Server charset:"
 msgstr "ערכת תווים לשרת:"
 
-#: index.php:320
+#: index.php:321
 msgid "Web server"
 msgstr "שרת אינטרנט"
 
-#: index.php:331
+#: index.php:332
 msgid "Database client version:"
 msgstr "גרסת לקוח מאגר הנתונים:"
 
-#: index.php:335
+#: index.php:336
 msgid "PHP extension:"
 msgstr "הרחבות PHP:"
 
-#: index.php:349
+#: index.php:350
 #, fuzzy
 #| msgid "PHP Version"
 msgid "PHP version:"
 msgstr "גרסת PHP"
 
-#: index.php:360
+#: index.php:361
 msgid "Show PHP information"
 msgstr "ראיית מידע PHP"
 
-#: index.php:383
+#: index.php:384
 msgid "Version information:"
 msgstr "מידע גרסאות:"
 
-#: index.php:392 libraries/Util.class.php:432 libraries/Util.class.php:495
-#: libraries/config/FormDisplay.tpl.php:151
+#: index.php:393 libraries/Util.class.php:432 libraries/Util.class.php:495
+#: libraries/config/FormDisplay.tpl.php:162
 #: libraries/display_export.lib.php:577 libraries/engines/pbxt.lib.php:162
 #: libraries/navigation/NavigationHeader.class.php:196
 #: libraries/server_variables.lib.php:160
 msgid "Documentation"
 msgstr "תיעוד"
 
-#: index.php:399
+#: index.php:400
 msgid "Wiki"
 msgstr "ויקי"
 
-#: index.php:408
+#: index.php:409
 msgid "Official Homepage"
 msgstr "דף הבית phpMyAdmin הרשמי"
 
-#: index.php:415
+#: index.php:416
 msgid "Contribute"
 msgstr "תורם"
 
-#: index.php:422
+#: index.php:423
 msgid "Get support"
 msgstr "קבל תמיכה"
 
-#: index.php:429
+#: index.php:430
 msgid "List of changes"
 msgstr "רשימת שינויים"
 
-#: index.php:451
+#: index.php:452
 #, fuzzy
 #| msgid ""
 #| "Your configuration file contains settings (root with no password) that "
@@ -871,7 +873,7 @@ msgstr ""
 "ברירת מחדל של MySQL. שרת MySQL שלך פועל עם ברירת מחדל זאת, והוא פתוח לחדירות,"
 "ואתה ממש צריך לתקן את חור אבטחה זה."
 
-#: index.php:468
+#: index.php:469
 #, fuzzy
 msgid ""
 "You have enabled mbstring.func_overload in your PHP configuration. This "
@@ -881,7 +883,7 @@ msgstr ""
 "הפכת mbstring.func_overload בתצורת ה-PHP שלך. אפשרות זו אינו תואם ל- "
 "phpMyAdmin, עלול לגרום לנתונים פגומים!"
 
-#: index.php:483
+#: index.php:484
 msgid ""
 "The mbstring PHP extension was not found and you seem to be using a "
 "multibyte charset. Without the mbstring extension phpMyAdmin is unable to "
@@ -891,7 +893,7 @@ msgstr ""
 "mbstring מותקנת, phpMyAdmin אינו יכול לחלק מחרוזות באופן תקין וזה יכול לגרום "
 "לתוצאות לא רצויות."
 
-#: index.php:500
+#: index.php:501
 #, fuzzy
 msgid ""
 "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini."
@@ -904,7 +906,7 @@ msgstr ""
 "עוגיה תוקפו נקבעה ב phpMyAdmin, בגלל זה, הכניסה שלך יפוג מוקדם יותר מאשר "
 "נקבעה ב phpMyAdmin."
 
-#: index.php:519
+#: index.php:520
 msgid ""
 "Login cookie store is lower than cookie validity configured in phpMyAdmin, "
 "because of this, your login will expire sooner than configured in phpMyAdmin."
@@ -912,11 +914,11 @@ msgstr ""
 "חנות עוגיית כניסה נמוכה מתוקף עוגייה המוגדר בphpMyAdmin, בגלל זה, הכניסה שלך "
 "תפוג מוקדם יותר מאשר מוגדרת בphpMyAdmin."
 
-#: index.php:535
+#: index.php:536
 msgid "The configuration file now needs a secret passphrase (blowfish_secret)."
 msgstr "קובץ התצורה צריכה ביטוי סיסמה סודית (blowfish_secret)."
 
-#: index.php:548
+#: index.php:549
 msgid ""
 "Directory [code]config[/code], which is used by the setup script, still "
 "exists in your phpMyAdmin directory. It is strongly recommended to remove it "
@@ -926,7 +928,7 @@ msgstr ""
 "מדריך [code]תצורה[/code], שהשתמש על ידי התקנת סקריפט, עוד קיים במדריך "
 "הphpMyAdmin שלך. עדיף לך להסיר אותו בסוף מהתצורה phpMyAdmin."
 
-#: index.php:564
+#: index.php:565
 #, fuzzy, php-format
 #| msgid ""
 #| " additional features for working with linked tables have been ctivated. "
@@ -937,19 +939,19 @@ msgid ""
 msgstr ""
 "תכונות נוספות לעבודה עם טבלאות מקושרות בוטלו. לעוד מידע למה לחץ %sכאן%s."
 
-#: index.php:571
+#: index.php:572
 msgid ""
 "Or alternately go to 'Operations' tab of any database to set it up there."
 msgstr ""
 
-#: index.php:620
+#: index.php:621
 #, php-format
 msgid ""
 "Your PHP MySQL library version %s differs from your MySQL server version %s. "
 "This may cause unpredictable behavior."
 msgstr ""
 
-#: index.php:648
+#: index.php:649
 #, php-format
 msgid ""
 "Server running with Suhosin. Please refer to %sdocumentation%s for possible "
@@ -1114,8 +1116,8 @@ msgstr ""
 msgid "Save & Close"
 msgstr "שמירה כקובץ"
 
-#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:404
-#: libraries/insert_edit.lib.php:1550 prefs_manage.php:361
+#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:415
+#: libraries/insert_edit.lib.php:1548 prefs_manage.php:361
 #: prefs_manage.php:372
 msgid "Reset"
 msgstr "איפוס"
@@ -1156,7 +1158,7 @@ msgstr "הוספת אינדקס"
 msgid "Edit Index"
 msgstr "עריכת האינדקס"
 
-#: js/messages.php:99 templates/index_form.phtml:232
+#: js/messages.php:99 templates/table/index_form.phtml:232
 #, php-format
 msgid "Add %s column(s) to index"
 msgstr "הוספת %s עמודות לאינדקס"
@@ -1185,15 +1187,16 @@ msgstr "שדות מוקפים ע\"י"
 msgid "Please select column(s) for the index."
 msgstr "הוספת %s עמודות לאינדקס"
 
-#: js/messages.php:106 templates/structure/add_column.phtml:1
+#: js/messages.php:106 templates/table/structure/add_column.phtml:1
 #, fuzzy
 #| msgid "You have to add at least one field."
 msgid "You have to add at least one column."
 msgstr "אתה חייב להוסיף לפחות שדה אחד."
 
-#: js/messages.php:109 libraries/insert_edit.lib.php:1548
+#: js/messages.php:109 libraries/insert_edit.lib.php:1546
 #: templates/columns_definitions/column_definitions_form.phtml:162
-#: templates/index_form.phtml:237 templates/tbl_relation/common_form.phtml:106
+#: templates/table/index_form.phtml:237
+#: templates/table/relation/common_form.phtml:106
 msgid "Preview SQL"
 msgstr ""
 
@@ -1216,7 +1219,7 @@ msgid "SQL query:"
 msgstr "שאילתת SQL"
 
 #. l10n: Default label for the y-Axis of Charts
-#: js/messages.php:118 templates/tbl_chart.phtml:109
+#: js/messages.php:118 templates/table/chart/tbl_chart.phtml:109
 msgid "Y Values"
 msgstr "ערך"
 
@@ -1381,7 +1384,7 @@ msgstr "בתים נשלחו"
 msgid "Bytes received"
 msgstr "התקבל"
 
-#: js/messages.php:169 libraries/server_status.lib.php:226
+#: js/messages.php:169 libraries/server_status.lib.php:235
 msgid "Connections"
 msgstr "חיבורים"
 
@@ -1440,12 +1443,12 @@ msgstr "%s טבלאות"
 msgid "Questions"
 msgstr "Persian"
 
-#: js/messages.php:184 libraries/server_status.lib.php:134
+#: js/messages.php:184 libraries/server_status.lib.php:143
 msgid "Traffic"
 msgstr "תעבורה"
 
 #: js/messages.php:185 libraries/Menu.class.php:586
-#: libraries/Util.class.php:4318 libraries/server_status_monitor.lib.php:257
+#: libraries/Util.class.php:4324 libraries/server_status_monitor.lib.php:257
 #, fuzzy
 #| msgid "General relation features"
 msgid "Settings"
@@ -1469,8 +1472,9 @@ msgstr "אנא הוסף לפחות משתנה אחד לסידרה"
 #: libraries/server_status_monitor.lib.php:236
 #: libraries/server_status_processes.lib.php:308
 #: templates/columns_definitions/transformation.phtml:4
-#: templates/designer/options_panel.phtml:178
-#: templates/table/options_zoom.phtml:12 templates/table/rows_zoom.phtml:26
+#: templates/database/designer/options_panel.phtml:178
+#: templates/table/search/options_zoom.phtml:12
+#: templates/table/search/rows_zoom.phtml:26
 msgid "None"
 msgstr "ללא"
 
@@ -1772,8 +1776,8 @@ msgstr ""
 
 #: js/messages.php:270 libraries/Menu.class.php:352
 #: libraries/Menu.class.php:455 libraries/Menu.class.php:582
-#: libraries/Util.class.php:4317 libraries/Util.class.php:4332
-#: libraries/Util.class.php:4349 libraries/config/messages.inc.php:258
+#: libraries/Util.class.php:4323 libraries/Util.class.php:4338
+#: libraries/Util.class.php:4355 libraries/config/messages.inc.php:258
 #: libraries/display_import.lib.php:105
 #: libraries/server_status_monitor.lib.php:318 prefs_manage.php:238
 #: setup/frames/menu.inc.php:26
@@ -1842,13 +1846,13 @@ msgid "Formatting SQL..."
 msgstr ""
 
 #: js/messages.php:293 libraries/server_variables.lib.php:157
-#: templates/designer/aggregate_query_panel.phtml:63
-#: templates/designer/delete_relation_panel.phtml:28
-#: templates/designer/having_query_panel.phtml:117
-#: templates/designer/new_relation_panel.phtml:88
-#: templates/designer/options_panel.phtml:253
-#: templates/designer/rename_to_panel.phtml:45
-#: templates/designer/where_query_panel.phtml:83
+#: templates/database/designer/aggregate_query_panel.phtml:63
+#: templates/database/designer/delete_relation_panel.phtml:28
+#: templates/database/designer/having_query_panel.phtml:117
+#: templates/database/designer/new_relation_panel.phtml:88
+#: templates/database/designer/options_panel.phtml:253
+#: templates/database/designer/rename_to_panel.phtml:45
+#: templates/database/designer/where_query_panel.phtml:83
 msgid "Cancel"
 msgstr ""
 
@@ -1858,7 +1862,7 @@ msgstr ""
 msgid "Page-related settings"
 msgstr "תכונות קשר כלליות"
 
-#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:402
+#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:413
 msgid "Apply"
 msgstr ""
 
@@ -1896,8 +1900,8 @@ msgstr ""
 msgid "Error text: %s"
 msgstr ""
 
-#: js/messages.php:307 libraries/db_common.inc.php:68
-#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:450
+#: js/messages.php:307 libraries/db_common.inc.php:69
+#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:461
 msgid "No databases selected."
 msgstr "אף מאגר נתונים לא נבחר."
 
@@ -1909,12 +1913,13 @@ msgstr ""
 msgid "Adding Primary Key"
 msgstr ""
 
-#: js/messages.php:310 templates/designer/aggregate_query_panel.phtml:59
-#: templates/designer/having_query_panel.phtml:113
-#: templates/designer/new_relation_panel.phtml:87
-#: templates/designer/options_panel.phtml:252
-#: templates/designer/rename_to_panel.phtml:41
-#: templates/designer/where_query_panel.phtml:82
+#: js/messages.php:310
+#: templates/database/designer/aggregate_query_panel.phtml:59
+#: templates/database/designer/having_query_panel.phtml:113
+#: templates/database/designer/new_relation_panel.phtml:87
+#: templates/database/designer/options_panel.phtml:252
+#: templates/database/designer/rename_to_panel.phtml:41
+#: templates/database/designer/where_query_panel.phtml:82
 msgid "OK"
 msgstr "אישור"
 
@@ -1940,7 +1945,7 @@ msgstr "העתקת מאגר נתונים אל"
 msgid "Changing Charset"
 msgstr "קידוד"
 
-#: js/messages.php:320 libraries/Util.class.php:3217
+#: js/messages.php:320 libraries/Util.class.php:3223
 msgid "Enable foreign key checks"
 msgstr ""
 
@@ -1983,20 +1988,21 @@ msgstr ""
 #: js/messages.php:334 libraries/DisplayResults.class.php:4834
 #: libraries/DisplayResults.class.php:5092 libraries/Menu.class.php:344
 #: libraries/Menu.class.php:446 libraries/Menu.class.php:578
-#: libraries/Util.class.php:3636 libraries/Util.class.php:3637
-#: libraries/Util.class.php:4316 libraries/Util.class.php:4331
-#: libraries/Util.class.php:4348 libraries/config/messages.inc.php:252
+#: libraries/Util.class.php:3642 libraries/Util.class.php:3643
+#: libraries/Util.class.php:4322 libraries/Util.class.php:4337
+#: libraries/Util.class.php:4354 libraries/config/messages.inc.php:252
 #: libraries/display_export.lib.php:173 libraries/rte/rte_list.lib.php:146
 #: libraries/server_privileges.lib.php:2211
 #: libraries/server_privileges.lib.php:2290
 #: libraries/server_privileges.lib.php:2632
 #: libraries/server_privileges.lib.php:3356
 #: libraries/server_status_monitor.lib.php:322 prefs_manage.php:303
-#: setup/frames/menu.inc.php:27 templates/structure/check_all_tables.phtml:11
+#: setup/frames/menu.inc.php:27
+#: templates/database/structure/check_all_tables.phtml:11
 msgid "Export"
 msgstr "יצוא"
 
-#: js/messages.php:337 libraries/rte/rte_routines.lib.php:652
+#: js/messages.php:337 libraries/rte/rte_routines.lib.php:743
 msgid "ENUM/SET editor"
 msgstr ""
 
@@ -2038,7 +2044,7 @@ msgstr "שאילתת SQL"
 #: libraries/Console.class.php:214 libraries/DisplayResults.class.php:3474
 #: libraries/DisplayResults.class.php:4818 libraries/Index.class.php:723
 #: libraries/Util.class.php:706 libraries/Util.class.php:1202
-#: libraries/Util.class.php:3634 libraries/Util.class.php:3635
+#: libraries/Util.class.php:3640 libraries/Util.class.php:3641
 #: libraries/central_columns.lib.php:851
 #: libraries/central_columns.lib.php:1193
 #: libraries/config/messages.inc.php:892
@@ -2056,7 +2062,7 @@ msgstr "עריכה"
 #: libraries/server_user_groups.lib.php:129
 #: libraries/sql_query_form.lib.php:416 libraries/tracking.lib.php:477
 #: setup/frames/index.inc.php:183 setup/frames/index.inc.php:291
-#: templates/designer/delete_relation_panel.phtml:27
+#: templates/database/designer/delete_relation_panel.phtml:27
 msgid "Delete"
 msgstr "מחיקה"
 
@@ -2240,11 +2246,11 @@ msgid "No dependencies selected!"
 msgstr "אף מאגר נתונים לא נבחר."
 
 #: js/messages.php:394 libraries/central_columns.lib.php:1214
-#: libraries/insert_edit.lib.php:1458 libraries/server_variables.lib.php:155
+#: libraries/insert_edit.lib.php:1456 libraries/server_variables.lib.php:155
 #: setup/frames/config.inc.php:42 setup/frames/index.inc.php:279
 #: templates/columns_definitions/column_definitions_form.phtml:165
-#: templates/gis_visualization/gis_visualization.phtml:48
-#: templates/tbl_relation/common_form.phtml:107
+#: templates/table/gis_visualization/gis_visualization.phtml:48
+#: templates/table/relation/common_form.phtml:107
 msgid "Save"
 msgstr "שמירה"
 
@@ -2335,8 +2341,8 @@ msgid "Data point content"
 msgstr "תוכן עניניים"
 
 #: js/messages.php:430 js/messages.php:562 js/messages.php:579
-#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2573
-#: templates/index_form.phtml:154 templates/index_form.phtml:194
+#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2571
+#: templates/table/index_form.phtml:154 templates/table/index_form.phtml:194
 msgid "Ignore"
 msgstr "התעלמות"
 
@@ -2395,8 +2401,8 @@ msgstr ""
 msgid "Please select the primary key or a unique key!"
 msgstr ""
 
-#: js/messages.php:457 templates/designer/side_menu.phtml:91
-#: templates/designer/side_menu.phtml:94
+#: js/messages.php:457 templates/database/designer/side_menu.phtml:91
+#: templates/database/designer/side_menu.phtml:94
 #, fuzzy
 #| msgid "Choose field to display"
 msgid "Choose column to display"
@@ -2414,22 +2420,22 @@ msgstr ""
 msgid "Page name"
 msgstr "מספר דף:"
 
-#: js/messages.php:463 templates/designer/side_menu.phtml:56
-#: templates/designer/side_menu.phtml:59
+#: js/messages.php:463 templates/database/designer/side_menu.phtml:56
+#: templates/database/designer/side_menu.phtml:59
 #, fuzzy
 #| msgid "Select All"
 msgid "Save page"
 msgstr "בחירת הכל"
 
-#: js/messages.php:464 templates/designer/side_menu.phtml:63
-#: templates/designer/side_menu.phtml:66
+#: js/messages.php:464 templates/database/designer/side_menu.phtml:63
+#: templates/database/designer/side_menu.phtml:66
 #, fuzzy
 #| msgid "Select All"
 msgid "Save page as"
 msgstr "בחירת הכל"
 
-#: js/messages.php:465 templates/designer/side_menu.phtml:49
-#: templates/designer/side_menu.phtml:52
+#: js/messages.php:465 templates/database/designer/side_menu.phtml:49
+#: templates/database/designer/side_menu.phtml:52
 #, fuzzy
 #| msgid "Free pages"
 msgid "Open page"
@@ -2441,7 +2447,7 @@ msgstr "דפים חופשיים"
 msgid "Delete page"
 msgstr "בחירת הכל"
 
-#: js/messages.php:467 templates/designer/side_menu.phtml:10
+#: js/messages.php:467 templates/database/designer/side_menu.phtml:10
 msgid "Untitled"
 msgstr ""
 
@@ -2563,7 +2569,7 @@ msgstr "מיקום מקורי"
 msgid "cancel"
 msgstr ""
 
-#: js/messages.php:499 libraries/server_status.lib.php:271
+#: js/messages.php:499 libraries/server_status.lib.php:280
 msgid "Aborted"
 msgstr "בוטל"
 
@@ -3240,7 +3246,7 @@ msgstr "%d הוא לא מספר שורה תקין."
 
 #: js/messages.php:793 libraries/Message.class.php:199
 #: libraries/Util.class.php:654 libraries/core.lib.php:245
-#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1172
+#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1170
 #: tbl_operations.php:229 view_operations.php:63
 msgid "Error"
 msgstr "שגיאה"
@@ -3299,8 +3305,8 @@ msgstr "לשנייה"
 msgid "per minute"
 msgstr "לדקה"
 
-#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:143
-#: libraries/server_status.lib.php:228
+#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:152
+#: libraries/server_status.lib.php:237
 #: libraries/server_status_queries.lib.php:98
 msgid "per hour"
 msgstr "לשעה"
@@ -3318,7 +3324,7 @@ msgstr ""
 msgid "Wrong permissions on configuration file, should not be world writable!"
 msgstr ""
 
-#: libraries/Config.class.php:1799
+#: libraries/Config.class.php:1801
 msgid "Font size"
 msgstr ""
 
@@ -3348,10 +3354,10 @@ msgstr "בשאילתה"
 #: libraries/server_privileges.lib.php:2890
 #: libraries/server_privileges.lib.php:3144
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4332
+#: libraries/server_privileges.lib.php:4358
 #: libraries/server_status_processes.lib.php:80
-#: templates/tbl_relation/foreign_key_row.phtml:165
-#: templates/tbl_relation/internal_relational_row.phtml:55
+#: templates/table/relation/foreign_key_row.phtml:165
+#: templates/table/relation/internal_relational_row.phtml:55
 msgid "Database"
 msgstr "מסד נתונים"
 
@@ -3457,11 +3463,11 @@ msgstr "היסטוריית SQL"
 #: libraries/plugins/import/ImportMediawiki.class.php:60
 #: libraries/plugins/import/ImportOds.class.php:59
 #: libraries/plugins/import/ImportShp.class.php:57
-#: libraries/plugins/import/ImportSql.class.php:148
+#: libraries/plugins/import/ImportSql.class.php:51
 #: libraries/plugins/import/ImportXml.class.php:58
-#: libraries/rte/rte_routines.lib.php:833 templates/index_form.phtml:49
-#: templates/structure/row_stats_table.phtml:20
-#: templates/table/options.phtml:2
+#: libraries/rte/rte_routines.lib.php:924 templates/table/index_form.phtml:49
+#: templates/table/search/options.phtml:2
+#: templates/table/structure/row_stats_table.phtml:20
 #, fuzzy
 msgid "Options"
 msgstr "פעולות"
@@ -3507,7 +3513,8 @@ msgstr "יורד"
 msgid "Order:"
 msgstr "אחר"
 
-#: libraries/Console.class.php:289 templates/table/replace_preview.phtml:17
+#: libraries/Console.class.php:289
+#: templates/table/search/replace_preview.phtml:17
 #, fuzzy
 #| msgid "Column"
 msgid "Count"
@@ -3629,9 +3636,9 @@ msgstr "מעבר לטבלה שהועתקה"
 #: libraries/operations.lib.php:794 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:191
-#: templates/structure/sortable_header.phtml:21
-#: templates/structure/sortable_header.phtml:38
-#: templates/table/options.phtml:68
+#: templates/database/structure/sortable_header.phtml:21
+#: templates/database/structure/sortable_header.phtml:38
+#: templates/table/search/options.phtml:68
 msgid "Ascending"
 msgstr "עולה"
 
@@ -3641,13 +3648,14 @@ msgstr "עולה"
 #: libraries/operations.lib.php:797 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:188
-#: templates/structure/sortable_header.phtml:26
-#: templates/structure/sortable_header.phtml:43
-#: templates/table/options.phtml:69
+#: templates/database/structure/sortable_header.phtml:26
+#: templates/database/structure/sortable_header.phtml:43
+#: templates/table/search/options.phtml:69
 msgid "Descending"
 msgstr "יורד"
 
-#: libraries/DBQbe.class.php:467 templates/table/search_and_replace.phtml:6
+#: libraries/DBQbe.class.php:467
+#: templates/table/search/search_and_replace.phtml:6
 #, fuzzy
 #| msgid "Column"
 msgid "Column:"
@@ -3830,12 +3838,12 @@ msgstr[0] "תוצאה אחת (%1$s) בטבלה <i>%2$s</i>"
 msgstr[1] "%1$s תוצאות בטבלה <i>%2$s</i>"
 
 #: libraries/DbSearch.class.php:354 libraries/Menu.class.php:311
-#: libraries/Util.class.php:3337 libraries/Util.class.php:3347
-#: libraries/Util.class.php:3623 libraries/Util.class.php:3624
-#: libraries/Util.class.php:4343 libraries/config.values.php:43
+#: libraries/Util.class.php:3343 libraries/Util.class.php:3353
+#: libraries/Util.class.php:3629 libraries/Util.class.php:3630
+#: libraries/Util.class.php:4349 libraries/config.values.php:43
 #: libraries/config.values.php:51 libraries/config.values.php:119
 #: libraries/navigation/Nodes/Node_Table.class.php:295
-#: templates/structure/check_all_table_column.phtml:5
+#: templates/table/structure/check_all_table_column.phtml:5
 msgid "Browse"
 msgstr "עיון"
 
@@ -3852,7 +3860,8 @@ msgstr "חיפוש במסד הנתונים"
 msgid "Words or values to search for (wildcard: \"%\"):"
 msgstr "מילים או ערכים לחיפוש אחריהם (תו כללי: „%“):"
 
-#: libraries/DbSearch.class.php:401 templates/table/search_and_replace.phtml:1
+#: libraries/DbSearch.class.php:401
+#: templates/table/search/search_and_replace.phtml:1
 msgid "Find:"
 msgstr "חיפוש:"
 
@@ -3902,16 +3911,16 @@ msgstr "שדות"
 msgid "Search this table"
 msgstr "חיפוש במסד הנתונים"
 
-#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2532
-#: libraries/Util.class.php:2535
+#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2538
+#: libraries/Util.class.php:2541
 #, fuzzy
 #| msgid "Begin"
 msgctxt "First page"
 msgid "Begin"
 msgstr "התחלה"
 
-#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2533
-#: libraries/Util.class.php:2536 libraries/server_bin_log.lib.php:170
+#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2539
+#: libraries/Util.class.php:2542 libraries/server_bin_log.lib.php:170
 #: libraries/server_bin_log.lib.php:172
 #, fuzzy
 #| msgid "Previous"
@@ -3919,8 +3928,8 @@ msgctxt "Previous page"
 msgid "Previous"
 msgstr "הקודם"
 
-#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2564
-#: libraries/Util.class.php:2574 libraries/server_bin_log.lib.php:204
+#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2570
+#: libraries/Util.class.php:2580 libraries/server_bin_log.lib.php:204
 #: libraries/server_bin_log.lib.php:206
 #, fuzzy
 #| msgid "Next"
@@ -3928,8 +3937,8 @@ msgctxt "Next page"
 msgid "Next"
 msgstr "הבא"
 
-#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2565
-#: libraries/Util.class.php:2575
+#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2571
+#: libraries/Util.class.php:2581
 #, fuzzy
 #| msgid "End"
 msgctxt "Last page"
@@ -4018,9 +4027,9 @@ msgid "May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]."
 msgstr "יכול להיות הערכה. ראה [doc@faq3-11]FAQ 3.11[/doc]"
 
 #: libraries/DisplayResults.class.php:4332 libraries/Message.class.php:180
-#: libraries/controllers/TableRelationController.class.php:258
+#: libraries/controllers/TableRelationController.class.php:259
 #: libraries/controllers/TableSearchController.class.php:655
-#: libraries/rte/rte_routines.lib.php:1332 libraries/sql_query_form.lib.php:89
+#: libraries/rte/rte_routines.lib.php:1423 libraries/sql_query_form.lib.php:89
 #: tbl_operations.php:227 tbl_row_action.php:138 view_operations.php:62
 #, fuzzy
 #| msgid "Your SQL query has been executed successfully."
@@ -4028,7 +4037,7 @@ msgid "Your SQL query has been executed successfully."
 msgstr "שאילתת ה־SQL שלך בוצעה בהצלחה"
 
 #: libraries/DisplayResults.class.php:4660
-#: libraries/controllers/StructureController.class.php:629
+#: libraries/controllers/DatabaseStructureController.class.php:564
 #, php-format
 msgid ""
 "This view has at least this number of rows. Please refer to %sdocumentation"
@@ -4052,34 +4061,34 @@ msgstr ""
 msgid "%d total"
 msgstr "סה\"כ"
 
-#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1318
+#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1312
 #, fuzzy, php-format
 #| msgid "Query took %01.4f sec"
 msgid "Query took %01.4f seconds."
 msgstr "שאילתה לקחה %01.4f שניות"
 
 #: libraries/DisplayResults.class.php:4807
-#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4767
-#: libraries/Util.class.php:4773 libraries/mult_submits.inc.php:50
-#: templates/structure/check_all_tables.phtml:2
-#: templates/structure/check_all_tables.phtml:9
+#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4773
+#: libraries/Util.class.php:4779 libraries/mult_submits.inc.php:50
+#: templates/database/structure/check_all_tables.phtml:2
+#: templates/database/structure/check_all_tables.phtml:9
 msgid "With selected:"
 msgstr "עם הנבחרים:"
 
 #: libraries/DisplayResults.class.php:4811
-#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4769
-#: libraries/Util.class.php:4770 libraries/server_privileges.lib.php:1174
+#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4775
+#: libraries/Util.class.php:4776 libraries/server_privileges.lib.php:1174
 #: libraries/server_privileges.lib.php:1175
 #: libraries/server_privileges.lib.php:1387
 #: libraries/server_user_groups.lib.php:231
-#: templates/structure/check_all_tables.phtml:3
-#: templates/structure/check_all_tables.phtml:4
+#: templates/database/structure/check_all_tables.phtml:3
+#: templates/database/structure/check_all_tables.phtml:4
 msgid "Check All"
 msgstr "סימון הכול"
 
 #: libraries/DisplayResults.class.php:4985 libraries/Header.class.php:383
-#: templates/structure/optional_action_links.phtml:1
-#: templates/structure/print_view_data_dictionary_link.phtml:3
+#: templates/database/structure/print_view_data_dictionary_link.phtml:3
+#: templates/table/structure/optional_action_links.phtml:1
 msgid "Print view"
 msgstr "תצוגת הדפסה"
 
@@ -4087,7 +4096,8 @@ msgstr "תצוגת הדפסה"
 msgid "Query results operations"
 msgstr ""
 
-#: libraries/DisplayResults.class.php:5105 templates/tbl_chart.phtml:12
+#: libraries/DisplayResults.class.php:5105
+#: templates/table/chart/tbl_chart.phtml:12
 #, fuzzy
 #| msgid "Displaying Column Comments"
 msgid "Display chart"
@@ -4185,7 +4195,7 @@ msgid "Click on the bar to scroll to top of page"
 msgstr ""
 
 #: libraries/Header.class.php:749
-#: libraries/plugins/auth/AuthenticationCookie.class.php:152
+#: libraries/plugins/auth/AuthenticationCookie.class.php:140
 #, fuzzy
 #| msgid "Cookies must be enabled past this point."
 msgid "Javascript must be enabled past this point!"
@@ -4209,11 +4219,11 @@ msgid "Keyname"
 msgstr "שם מפתח"
 
 #: libraries/Index.class.php:697
-#: libraries/controllers/StructureController.class.php:1962
-#: libraries/controllers/StructureController.class.php:1967
+#: libraries/controllers/TableStructureController.class.php:953
+#: libraries/controllers/TableStructureController.class.php:958
 #: libraries/tracking.lib.php:973
 #: templates/columns_definitions/column_indexes.phtml:11
-#: templates/structure/check_all_table_column.phtml:26
+#: templates/table/structure/check_all_table_column.phtml:26
 msgid "Unique"
 msgstr "ייחודי"
 
@@ -4232,16 +4242,17 @@ msgstr "מספור"
 #: libraries/server_collations.lib.php:35 libraries/tracking.lib.php:881
 #: libraries/tracking.lib.php:977
 #: templates/columns_definitions/table_fields_definitions.phtml:33
-#: templates/structure/row_stats_table.phtml:31
-#: templates/structure/table_header.phtml:55
-#: templates/structure/table_structure_header.phtml:7
-#: templates/table/table_header.phtml:8
+#: templates/database/structure/table_header.phtml:55
+#: templates/table/search/table_header.phtml:8
+#: templates/table/structure/row_stats_table.phtml:31
+#: templates/table/structure/table_structure_header.phtml:7
 msgid "Collation"
 msgstr "איסוף"
 
 #: libraries/Index.class.php:703 libraries/rte/rte_events.lib.php:496
-#: libraries/rte/rte_routines.lib.php:956 libraries/tracking.lib.php:885
-#: libraries/tracking.lib.php:979 templates/structure/table_header.phtml:84
+#: libraries/rte/rte_routines.lib.php:1047 libraries/tracking.lib.php:885
+#: libraries/tracking.lib.php:979
+#: templates/database/structure/table_header.phtml:84
 #, fuzzy
 msgid "Comment"
 msgstr "הערות"
@@ -4255,15 +4266,15 @@ msgstr "המפתח הראשי הוסר."
 msgid "Index %s has been dropped."
 msgstr "אינדקס %s הוסר."
 
-#: libraries/Index.class.php:757 libraries/Util.class.php:3630
-#: libraries/Util.class.php:3631
-#: libraries/controllers/StructureController.class.php:1958
-#: libraries/controllers/StructureController.class.php:1959
+#: libraries/Index.class.php:757 libraries/Util.class.php:3636
+#: libraries/Util.class.php:3637
+#: libraries/controllers/TableStructureController.class.php:949
+#: libraries/controllers/TableStructureController.class.php:950
 #: libraries/operations.lib.php:1607 libraries/rte/rte_list.lib.php:150
 #: libraries/server_databases.lib.php:146
-#: templates/structure/check_all_table_column.phtml:15
-#: templates/structure/check_all_tables.phtml:16
-#: templates/tbl_relation/foreign_key_row.phtml:93
+#: templates/database/structure/check_all_tables.phtml:16
+#: templates/table/relation/foreign_key_row.phtml:93
+#: templates/table/structure/check_all_table_column.phtml:15
 msgid "Drop"
 msgstr "השמטה"
 
@@ -4292,16 +4303,16 @@ msgstr "שרת"
 #: libraries/Menu.class.php:248
 #: libraries/navigation/Nodes/Node_View.class.php:32
 #: libraries/tbl_info.inc.php:63
-#: templates/structure/structure_table_row.phtml:97
-#: templates/structure/structure_table_row.phtml:159
+#: templates/database/structure/structure_table_row.phtml:97
+#: templates/database/structure/structure_table_row.phtml:159
 msgid "View"
 msgstr "תצוגה"
 
 #: libraries/Menu.class.php:325 libraries/Menu.class.php:429
-#: libraries/Menu.class.php:548 libraries/Util.class.php:3334
-#: libraries/Util.class.php:3344 libraries/Util.class.php:3350
-#: libraries/Util.class.php:4313 libraries/Util.class.php:4328
-#: libraries/Util.class.php:4345 libraries/config.values.php:40
+#: libraries/Menu.class.php:548 libraries/Util.class.php:3340
+#: libraries/Util.class.php:3350 libraries/Util.class.php:3356
+#: libraries/Util.class.php:4319 libraries/Util.class.php:4334
+#: libraries/Util.class.php:4351 libraries/config.values.php:40
 #: libraries/config.values.php:48 libraries/config.values.php:110
 #: libraries/config.values.php:116 libraries/config/messages.inc.php:321
 #: libraries/navigation/Nodes/Node_Table.class.php:292
@@ -4309,19 +4320,19 @@ msgid "SQL"
 msgstr "SQL"
 
 #: libraries/Menu.class.php:328 libraries/Menu.class.php:432
-#: libraries/Util.class.php:3335 libraries/Util.class.php:3345
-#: libraries/Util.class.php:3351 libraries/Util.class.php:3625
-#: libraries/Util.class.php:3626 libraries/Util.class.php:4329
-#: libraries/Util.class.php:4346 libraries/config.values.php:41
+#: libraries/Util.class.php:3341 libraries/Util.class.php:3351
+#: libraries/Util.class.php:3357 libraries/Util.class.php:3631
+#: libraries/Util.class.php:3632 libraries/Util.class.php:4335
+#: libraries/Util.class.php:4352 libraries/config.values.php:41
 #: libraries/config.values.php:49 libraries/config.values.php:111
 #: libraries/config.values.php:117
 #: libraries/navigation/Nodes/Node_Table.class.php:286
 msgid "Search"
 msgstr "חיפוש"
 
-#: libraries/Menu.class.php:338 libraries/Util.class.php:3336
-#: libraries/Util.class.php:3346 libraries/Util.class.php:3627
-#: libraries/Util.class.php:3628 libraries/Util.class.php:4347
+#: libraries/Menu.class.php:338 libraries/Util.class.php:3342
+#: libraries/Util.class.php:3352 libraries/Util.class.php:3633
+#: libraries/Util.class.php:3634 libraries/Util.class.php:4353
 #: libraries/config.values.php:42 libraries/config.values.php:50
 #: libraries/config.values.php:118
 #: libraries/navigation/Nodes/Node_Table.class.php:289
@@ -4330,30 +4341,30 @@ msgid "Insert"
 msgstr "הכנסה"
 
 #: libraries/Menu.class.php:362 libraries/Menu.class.php:467
-#: libraries/Util.class.php:4334 libraries/Util.class.php:4350
+#: libraries/Util.class.php:4340 libraries/Util.class.php:4356
 #: libraries/config.values.php:106 libraries/server_common.lib.php:51
 #: libraries/server_privileges.lib.php:2370
 #: libraries/server_privileges.lib.php:3158
-#: libraries/server_privileges.lib.php:4221
+#: libraries/server_privileges.lib.php:4247
 msgid "Privileges"
 msgstr "הרשאות"
 
 #: libraries/Menu.class.php:371 libraries/Menu.class.php:379
-#: libraries/Menu.class.php:459 libraries/Util.class.php:3338
-#: libraries/Util.class.php:3352 libraries/Util.class.php:4333
-#: libraries/Util.class.php:4351 libraries/config.values.php:112
+#: libraries/Menu.class.php:459 libraries/Util.class.php:3344
+#: libraries/Util.class.php:3358 libraries/Util.class.php:4339
+#: libraries/Util.class.php:4357 libraries/config.values.php:112
 #: view_operations.php:92
 msgid "Operations"
 msgstr "פעולות"
 
 #: libraries/Menu.class.php:384 libraries/Menu.class.php:492
-#: libraries/Util.class.php:4338 libraries/Util.class.php:4352
+#: libraries/Util.class.php:4344 libraries/Util.class.php:4358
 #: libraries/relation.lib.php:255
 msgid "Tracking"
 msgstr ""
 
 #: libraries/Menu.class.php:397 libraries/Menu.class.php:486
-#: libraries/Util.class.php:4337 libraries/Util.class.php:4353
+#: libraries/Util.class.php:4343 libraries/Util.class.php:4359
 #: libraries/navigation/Nodes/Node_Trigger_Container.class.php:24
 #: libraries/plugins/export/ExportHtmlword.class.php:557
 #: libraries/plugins/export/ExportOdt.class.php:685
@@ -4370,16 +4381,16 @@ msgstr ""
 msgid "Database seems to be empty!"
 msgstr ""
 
-#: libraries/Menu.class.php:439 libraries/Util.class.php:4330
+#: libraries/Menu.class.php:439 libraries/Util.class.php:4336
 msgid "Query"
 msgstr "שאילתה"
 
-#: libraries/Menu.class.php:472 libraries/Util.class.php:4335
+#: libraries/Menu.class.php:472 libraries/Util.class.php:4341
 #: libraries/rte/rte_words.lib.php:36
 msgid "Routines"
 msgstr ""
 
-#: libraries/Menu.class.php:479 libraries/Util.class.php:4336
+#: libraries/Menu.class.php:479 libraries/Util.class.php:4342
 #: libraries/navigation/Nodes/Node_Event_Container.class.php:26
 #: libraries/plugins/export/ExportSql.class.php:940
 #: libraries/plugins/export/ExportXml.class.php:107
@@ -4387,22 +4398,22 @@ msgstr ""
 msgid "Events"
 msgstr ""
 
-#: libraries/Menu.class.php:498 libraries/Util.class.php:4339
+#: libraries/Menu.class.php:498 libraries/Util.class.php:4345
 msgid "Designer"
 msgstr ""
 
-#: libraries/Menu.class.php:507 libraries/Util.class.php:4340
-#: templates/structure/check_all_tables.phtml:35
+#: libraries/Menu.class.php:507 libraries/Util.class.php:4346
+#: templates/database/structure/check_all_tables.phtml:35
 #, fuzzy
 #| msgid "Add/Delete Field Columns"
 msgid "Central columns"
 msgstr "הוספת/מחיקת עמודות שדה"
 
-#: libraries/Menu.class.php:544 libraries/Util.class.php:4312
+#: libraries/Menu.class.php:544 libraries/Util.class.php:4318
 #: libraries/config.values.php:103 libraries/config/messages.inc.php:266
 #: libraries/config/messages.inc.php:341
 #: libraries/navigation/NavigationTree.class.php:1239
-#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4332
+#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4358
 msgid "Databases"
 msgstr "מאגרי נתונים"
 
@@ -4413,34 +4424,34 @@ msgid "User accounts"
 msgstr "משתמש"
 
 #: libraries/Menu.class.php:595 libraries/ServerStatusData.class.php:121
-#: libraries/Util.class.php:4319 libraries/server_common.lib.php:36
+#: libraries/Util.class.php:4325 libraries/server_common.lib.php:36
 msgid "Binary log"
 msgstr "דו\"ח בינארי"
 
 #: libraries/Menu.class.php:601 libraries/ServerStatusData.class.php:126
-#: libraries/Util.class.php:4320 libraries/server_common.lib.php:42
-#: templates/structure/body_for_table_summary.phtml:10
-#: templates/structure/table_header.phtml:27
+#: libraries/Util.class.php:4326 libraries/server_common.lib.php:42
+#: templates/database/structure/body_for_table_summary.phtml:10
+#: templates/database/structure/table_header.phtml:27
 msgid "Replication"
 msgstr "שכפול"
 
 #: libraries/Menu.class.php:606 libraries/ServerStatusData.class.php:193
-#: libraries/Util.class.php:4321 libraries/config.values.php:105
+#: libraries/Util.class.php:4327 libraries/config.values.php:105
 #: libraries/server_engines.lib.php:108 libraries/server_engines.lib.php:112
 #: libraries/sql_query_form.lib.php:421
 msgid "Variables"
 msgstr "משתנים"
 
-#: libraries/Menu.class.php:610 libraries/Util.class.php:4322
+#: libraries/Menu.class.php:610 libraries/Util.class.php:4328
 msgid "Charsets"
 msgstr "קידודים"
 
-#: libraries/Menu.class.php:615 libraries/Util.class.php:4323
+#: libraries/Menu.class.php:615 libraries/Util.class.php:4329
 #: libraries/server_common.lib.php:33 libraries/server_plugins.lib.php:27
 msgid "Plugins"
 msgstr ""
 
-#: libraries/Menu.class.php:626 libraries/Util.class.php:4324
+#: libraries/Menu.class.php:626 libraries/Util.class.php:4330
 msgid "Engines"
 msgstr "מנועים"
 
@@ -4467,7 +4478,7 @@ msgid_plural "%1$d rows inserted."
 msgstr[0] "לא נבחרו שורות"
 msgstr[1] "לא נבחרו שורות"
 
-#: libraries/PDF.class.php:70 libraries/Util.class.php:2521
+#: libraries/PDF.class.php:70 libraries/Util.class.php:2527
 #: libraries/browse_foreigners.lib.php:327
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:865
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:890
@@ -4493,7 +4504,7 @@ msgid "Could not save favorite table!"
 msgstr "תיעוד"
 
 #: libraries/RecentFavoriteTable.class.php:212
-#: templates/structure/favorite_anchor.phtml:12
+#: templates/database/structure/favorite_anchor.phtml:12
 #, fuzzy
 #| msgid "Rename database to"
 msgid "Remove from Favorites"
@@ -4680,7 +4691,7 @@ msgid ""
 msgstr "אין מידע מצב מפורט על מנוע אחסון זה."
 
 #: libraries/StorageEngine.class.php:373
-#: templates/structure/body_for_table_summary.phtml:50
+#: templates/database/structure/body_for_table_summary.phtml:50
 #, php-format
 msgid "%s is the default storage engine on this MySQL server."
 msgstr "%s הוא מנוע האחסון כבררת המחדל של שרת MySQL זה."
@@ -5106,10 +5117,10 @@ msgstr ""
 
 #: libraries/Util.class.php:726 libraries/rte/rte_events.lib.php:110
 #: libraries/rte/rte_events.lib.php:119 libraries/rte/rte_events.lib.php:150
-#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:153
-#: libraries/rte/rte_routines.lib.php:162
-#: libraries/rte/rte_routines.lib.php:235
-#: libraries/rte/rte_routines.lib.php:1366
+#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:223
+#: libraries/rte/rte_routines.lib.php:250
+#: libraries/rte/rte_routines.lib.php:372
+#: libraries/rte/rte_routines.lib.php:1457
 #: libraries/rte/rte_triggers.lib.php:86 libraries/rte/rte_triggers.lib.php:95
 #: libraries/rte/rte_triggers.lib.php:127
 msgid "MySQL said: "
@@ -5155,77 +5166,80 @@ msgstr "יום ראשון"
 msgid "%B %d, %Y at %I:%M %p"
 msgstr "%B %d, %Y בזמן %I:%M %p"
 
-#: libraries/Util.class.php:2019
+#: libraries/Util.class.php:2025
 #, php-format
 msgid "%s days, %s hours, %s minutes and %s seconds"
 msgstr "%s ימים, %s שעות, %s דקות ו- %s שניות"
 
-#: libraries/Util.class.php:2112
+#: libraries/Util.class.php:2118
 #, fuzzy
 #| msgid "Add new field"
 msgid "Missing parameter:"
 msgstr "הוספת שדה חדש"
 
-#: libraries/Util.class.php:2645
+#: libraries/Util.class.php:2651
 #, php-format
 msgid "Jump to database \"%s\"."
 msgstr "קפיצה אל מאגר נתונים \"%s\"."
 
-#: libraries/Util.class.php:2670
+#: libraries/Util.class.php:2676
 #, php-format
 msgid "The %s functionality is affected by a known bug, see %s"
 msgstr ""
 
-#: libraries/Util.class.php:2881
+#: libraries/Util.class.php:2887
 msgid "Click to toggle"
 msgstr ""
 
-#: libraries/Util.class.php:3542 prefs_manage.php:248
+#: libraries/Util.class.php:3548 prefs_manage.php:248
 msgid "Browse your computer:"
 msgstr ""
 
-#: libraries/Util.class.php:3567
+#: libraries/Util.class.php:3573
 #, fuzzy, php-format
 msgid "Select from the web server upload directory <b>%s</b>:"
 msgstr "שמירת שרת בתוך תיקיית %s"
 
-#: libraries/Util.class.php:3596 libraries/insert_edit.lib.php:1173
+#: libraries/Util.class.php:3602 libraries/insert_edit.lib.php:1171
 msgid "The directory you set for upload work cannot be reached."
 msgstr ""
 
-#: libraries/Util.class.php:3607
+#: libraries/Util.class.php:3613
 msgid "There are no files to upload!"
 msgstr ""
 
-#: libraries/Util.class.php:3632 libraries/Util.class.php:3633
-#: templates/structure/check_all_tables.phtml:15
+#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: templates/database/structure/check_all_tables.phtml:15
 msgid "Empty"
 msgstr "ריקון"
 
-#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: libraries/Util.class.php:3644 libraries/Util.class.php:3645
 msgid "Execute"
 msgstr ""
 
-#: libraries/Util.class.php:4152
+#: libraries/Util.class.php:4158
 msgid "Print"
 msgstr "הדפסה"
 
-#: libraries/Util.class.php:4257 templates/structure/row_stats_table.phtml:80
-#: templates/structure/table_header.phtml:95
+#: libraries/Util.class.php:4263
+#: templates/database/structure/table_header.phtml:95
+#: templates/table/structure/row_stats_table.phtml:80
 msgid "Creation"
 msgstr "יצירה"
 
-#: libraries/Util.class.php:4263 templates/structure/row_stats_table.phtml:87
-#: templates/structure/table_header.phtml:106
+#: libraries/Util.class.php:4269
+#: templates/database/structure/table_header.phtml:106
+#: templates/table/structure/row_stats_table.phtml:87
 msgid "Last update"
 msgstr "עדכון אחרון"
 
-#: libraries/Util.class.php:4269 templates/structure/row_stats_table.phtml:94
-#: templates/structure/table_header.phtml:117
+#: libraries/Util.class.php:4275
+#: templates/database/structure/table_header.phtml:117
+#: templates/table/structure/row_stats_table.phtml:94
 msgid "Last check"
 msgstr "נבדק לאחרונה"
 
-#: libraries/Util.class.php:4315
+#: libraries/Util.class.php:4321
 #, fuzzy
 #| msgid "User"
 msgid "Users"
@@ -5248,16 +5262,16 @@ msgid "Use this value"
 msgstr "שימוש בערך זה"
 
 #: libraries/build_html_for_db.lib.php:33 libraries/import.lib.php:193
-#: templates/structure/actions_in_table_structure.phtml:113
-#: templates/structure/row_stats_table.phtml:42
-#: templates/structure/table_header.phtml:36
+#: templates/database/structure/table_header.phtml:36
+#: templates/table/structure/actions_in_table_structure.phtml:113
+#: templates/table/structure/row_stats_table.phtml:42
 msgid "Rows"
 msgstr "שורות"
 
 #: libraries/build_html_for_db.lib.php:48 libraries/engines/innodb.lib.php:171
-#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:186
-#: libraries/server_status.lib.php:298
-#: templates/structure/display_table_stats.phtml:40
+#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:195
+#: libraries/server_status.lib.php:307
+#: templates/table/structure/display_table_stats.phtml:40
 msgid "Total"
 msgstr "סה״כ"
 
@@ -5267,10 +5281,12 @@ msgid "Jump to database"
 msgstr "אין מאגרי נתונים"
 
 #: libraries/build_html_for_db.lib.php:146
+#: templates/database/structure/structure_table_row.phtml:15
 msgid "Not replicated"
 msgstr ""
 
 #: libraries/build_html_for_db.lib.php:158
+#: templates/database/structure/structure_table_row.phtml:16
 #, fuzzy
 msgid "Replicated"
 msgstr "יחסים"
@@ -5328,17 +5344,17 @@ msgstr ""
 #: libraries/plugins/export/ExportTexytext.class.php:425
 #: libraries/plugins/export/PMA_ExportPdf.class.php:307
 #: libraries/rte/rte_list.lib.php:73 libraries/rte/rte_list.lib.php:85
-#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:830
-#: libraries/rte/rte_routines.lib.php:1492 setup/frames/index.inc.php:162
+#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:921
+#: libraries/rte/rte_routines.lib.php:1583 setup/frames/index.inc.php:162
 #: templates/columns_definitions/table_fields_definitions.phtml:8
-#: templates/structure/table_structure_header.phtml:5
-#: templates/table/create_table.phtml:11
+#: templates/database/create_table.phtml:11
+#: templates/table/structure/table_structure_header.phtml:5
 msgid "Name"
 msgstr "שם"
 
 #: libraries/central_columns.lib.php:699
 #: libraries/central_columns.lib.php:1381
-#: libraries/rte/rte_routines.lib.php:832
+#: libraries/rte/rte_routines.lib.php:923
 #: templates/columns_definitions/table_fields_definitions.phtml:14
 msgid "Length/Values"
 msgstr "אורך/ערכים*"
@@ -5361,7 +5377,7 @@ msgid "Select a table"
 msgstr "בחירת טבלאות"
 
 #: libraries/central_columns.lib.php:804
-#: templates/structure/add_column.phtml:4
+#: templates/table/structure/add_column.phtml:4
 #, fuzzy
 #| msgid "Add %s field(s)"
 msgid "Add column"
@@ -5383,7 +5399,7 @@ msgstr "הוספת %s תאים"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1002
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1025
 #: templates/columns_definitions/table_fields_definitions.phtml:36
-#: templates/structure/table_structure_header.phtml:8
+#: templates/table/structure/table_structure_header.phtml:8
 msgid "Attributes"
 msgstr "תכונות"
 
@@ -5499,7 +5515,7 @@ msgid "Double click"
 msgstr ""
 
 #: libraries/config.values.php:95 libraries/config.values.php:124
-#: libraries/config/FormDisplay.tpl.php:221 libraries/relation.lib.php:97
+#: libraries/config/FormDisplay.tpl.php:232 libraries/relation.lib.php:97
 #: libraries/relation.lib.php:105
 msgid "Disabled"
 msgstr "מבוטל"
@@ -5689,21 +5705,21 @@ msgstr ""
 msgid "maximum %s"
 msgstr ""
 
-#: libraries/config/FormDisplay.tpl.php:219
+#: libraries/config/FormDisplay.tpl.php:230
 msgid "This setting is disabled, it will not be applied to your configuration."
 msgstr ""
 
-#: libraries/config/FormDisplay.tpl.php:313
+#: libraries/config/FormDisplay.tpl.php:324
 #, php-format
 msgid "Set value: %s"
 msgstr ""
 
-#: libraries/config/FormDisplay.tpl.php:318
+#: libraries/config/FormDisplay.tpl.php:329
 #: libraries/config/messages.inc.php:610
 msgid "Restore default value"
 msgstr ""
 
-#: libraries/config/FormDisplay.tpl.php:332
+#: libraries/config/FormDisplay.tpl.php:343
 msgid "Allow users to customize this value"
 msgstr ""
 
@@ -6139,7 +6155,7 @@ msgstr "חבילת הקידוד של הקובץ:"
 
 #: libraries/config/messages.inc.php:136 libraries/config/messages.inc.php:152
 #: libraries/sql_query_form.lib.php:247
-#: templates/structure/row_stats_table.phtml:7
+#: templates/table/structure/row_stats_table.phtml:7
 msgid "Format"
 msgstr "תבנית"
 
@@ -6700,7 +6716,7 @@ msgstr ""
 
 #: libraries/config/messages.inc.php:332
 #: libraries/plugins/export/ExportPdf.class.php:279
-#: templates/structure/secondary_tabs.phtml:8
+#: templates/table/secondary_tabs.phtml:8
 #, fuzzy
 #| msgid "Databases"
 msgid "Table structure"
@@ -8309,111 +8325,35 @@ msgstr "Microsoft Word 2000"
 msgid "OpenDocument Text"
 msgstr "תיעוד"
 
-#: libraries/controllers/StructureController.class.php:465
+#: libraries/controllers/DatabaseStructureController.class.php:405
 #: tbl_operations.php:382
 #, php-format
 msgid "Table %s has been emptied."
 msgstr "הטבלה %s רוקנה."
 
-#: libraries/controllers/StructureController.class.php:486
+#: libraries/controllers/DatabaseStructureController.class.php:426
 #: tbl_operations.php:400 view_operations.php:119
 #, fuzzy, php-format
 #| msgid "View %s has been dropped."
 msgid "View %s has been dropped."
 msgstr "התצוגה %s נשמטה"
 
-#: libraries/controllers/StructureController.class.php:487
+#: libraries/controllers/DatabaseStructureController.class.php:427
 #: tbl_operations.php:401
 #, fuzzy, php-format
 #| msgid "Table %s has been dropped."
 msgid "Table %s has been dropped."
 msgstr "הטבלה %s נשמטה"
 
-#: libraries/controllers/StructureController.class.php:797
-#, php-format
-msgid "The name '%s' is a MySQL reserved keyword."
-msgid_plural "The names '%s' are MySQL reserved keywords."
-msgstr[0] ""
-msgstr[1] ""
-
-#: libraries/controllers/StructureController.class.php:875
-#, fuzzy
-#| msgid "No rows selected"
-msgid "No column selected."
-msgstr "לא נבחרו שורות"
-
-#: libraries/controllers/StructureController.class.php:1049
+#: libraries/controllers/DatabaseStructureController.class.php:733
 msgid "Favorite List is full!"
 msgstr ""
 
-#: libraries/controllers/StructureController.class.php:1272
-#, fuzzy
-msgid "The columns have been moved successfully."
-msgstr "%s מסדי נתונים נמחקו בהצלחה."
-
-#: libraries/controllers/StructureController.class.php:1535
-#, fuzzy, php-format
-#| msgid "Table %s has been moved to %s."
-msgid ""
-"Table %1$s has been altered successfully. Privileges have been adjusted."
-msgstr "הטבלה %s הועברה ל- %s."
-
-#: libraries/controllers/StructureController.class.php:1541
-#: libraries/controllers/TableIndexesController.class.php:161
-#: tbl_addfield.php:92
-#, php-format
-msgid "Table %1$s has been altered successfully."
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1588
-#: libraries/tracking.lib.php:1094
-#, fuzzy
-#| msgid "Query type"
-msgid "Query error"
-msgstr "סוג שאילתה"
-
-#: libraries/controllers/StructureController.class.php:1806
+#: libraries/controllers/DatabaseStructureController.class.php:947
 #: libraries/mysql_charsets.lib.php:366 libraries/mysql_charsets.lib.php:373
 msgid "unknown"
 msgstr "לא ידוע"
 
-#: libraries/controllers/StructureController.class.php:1957
-#: templates/structure/check_all_table_column.phtml:11
-msgid "Change"
-msgstr "שינוי"
-
-#: libraries/controllers/StructureController.class.php:1961
-#: libraries/controllers/StructureController.class.php:1966
-#: libraries/navigation/Nodes/Node_Index.class.php:30
-#: libraries/tracking.lib.php:926
-#: templates/columns_definitions/column_indexes.phtml:16
-#: templates/columns_definitions/table_fields_definitions.phtml:57
-#: templates/structure/check_all_table_column.phtml:30
-#: templates/structure/display_structure.phtml:79
-#: templates/structure/display_table_stats.phtml:19
-msgid "Index"
-msgstr "אינדקס"
-
-#: libraries/controllers/StructureController.class.php:1963
-#: libraries/controllers/StructureController.class.php:1968
-#: templates/columns_definitions/column_indexes.phtml:27
-#: templates/structure/check_all_table_column.phtml:37
-msgid "Spatial"
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1964
-#: libraries/controllers/StructureController.class.php:1969
-#: templates/columns_definitions/column_indexes.phtml:22
-#: templates/structure/check_all_table_column.phtml:47
-msgid "Fulltext"
-msgstr "Fulltext"
-
-#: libraries/controllers/StructureController.class.php:1970
-#, fuzzy
-#| msgid "Browse distinct values"
-msgid "Distinct values"
-msgstr "עיין בערכים נפרדים"
-
 #: libraries/controllers/TableChartController.class.php:82
 #: libraries/controllers/TableGisVisualizationController.class.php:101
 msgid "No SQL query was set to fetch data."
@@ -8429,11 +8369,18 @@ msgstr ""
 msgid "No data to display"
 msgstr "אין מאגרי נתונים"
 
-#: libraries/controllers/TableRelationController.class.php:217
+#: libraries/controllers/TableIndexesController.class.php:161
+#: libraries/controllers/TableStructureController.class.php:736
+#: tbl_addfield.php:92
+#, php-format
+msgid "Table %1$s has been altered successfully."
+msgstr ""
+
+#: libraries/controllers/TableRelationController.class.php:218
 msgid "Display column was successfully updated."
 msgstr ""
 
-#: libraries/controllers/TableRelationController.class.php:283
+#: libraries/controllers/TableRelationController.class.php:288
 #, fuzzy
 msgid "Internal relations were successfully updated."
 msgstr "יחסים פנימיים"
@@ -8451,11 +8398,80 @@ msgid "Zoom search"
 msgstr "חיפוש"
 
 #: libraries/controllers/TableSearchController.class.php:852
-#: templates/table/selection_form.phtml:59
+#: templates/table/search/selection_form.phtml:59
 #, fuzzy
 msgid "Find and replace"
 msgstr "שאילתת SQL"
 
+#: libraries/controllers/TableStructureController.class.php:163
+#, php-format
+msgid "The name '%s' is a MySQL reserved keyword."
+msgid_plural "The names '%s' are MySQL reserved keywords."
+msgstr[0] ""
+msgstr[1] ""
+
+#: libraries/controllers/TableStructureController.class.php:241
+#, fuzzy
+#| msgid "No rows selected"
+msgid "No column selected."
+msgstr "לא נבחרו שורות"
+
+#: libraries/controllers/TableStructureController.class.php:467
+#, fuzzy
+msgid "The columns have been moved successfully."
+msgstr "%s מסדי נתונים נמחקו בהצלחה."
+
+#: libraries/controllers/TableStructureController.class.php:730
+#, fuzzy, php-format
+#| msgid "Table %s has been moved to %s."
+msgid ""
+"Table %1$s has been altered successfully. Privileges have been adjusted."
+msgstr "הטבלה %s הועברה ל- %s."
+
+#: libraries/controllers/TableStructureController.class.php:783
+#: libraries/tracking.lib.php:1094
+#, fuzzy
+#| msgid "Query type"
+msgid "Query error"
+msgstr "סוג שאילתה"
+
+#: libraries/controllers/TableStructureController.class.php:948
+#: templates/table/structure/check_all_table_column.phtml:11
+msgid "Change"
+msgstr "שינוי"
+
+#: libraries/controllers/TableStructureController.class.php:952
+#: libraries/controllers/TableStructureController.class.php:957
+#: libraries/navigation/Nodes/Node_Index.class.php:30
+#: libraries/tracking.lib.php:926
+#: templates/columns_definitions/column_indexes.phtml:16
+#: templates/columns_definitions/table_fields_definitions.phtml:57
+#: templates/table/structure/check_all_table_column.phtml:30
+#: templates/table/structure/display_structure.phtml:79
+#: templates/table/structure/display_table_stats.phtml:19
+msgid "Index"
+msgstr "אינדקס"
+
+#: libraries/controllers/TableStructureController.class.php:954
+#: libraries/controllers/TableStructureController.class.php:959
+#: templates/columns_definitions/column_indexes.phtml:27
+#: templates/table/structure/check_all_table_column.phtml:37
+msgid "Spatial"
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:955
+#: libraries/controllers/TableStructureController.class.php:960
+#: templates/columns_definitions/column_indexes.phtml:22
+#: templates/table/structure/check_all_table_column.phtml:47
+msgid "Fulltext"
+msgstr "Fulltext"
+
+#: libraries/controllers/TableStructureController.class.php:963
+#, fuzzy
+#| msgid "Browse distinct values"
+msgid "Distinct values"
+msgstr "עיין בערכים נפרדים"
+
 #: libraries/core.lib.php:306
 #, php-format
 msgid "The %s extension is missing. Please check your PHP configuration."
@@ -8502,7 +8518,7 @@ msgid "No Password"
 msgstr "ללא סיסמא"
 
 #: libraries/display_change_password.lib.php:68
-#: libraries/plugins/auth/AuthenticationCookie.class.php:199
+#: libraries/plugins/auth/AuthenticationCookie.class.php:187
 #: libraries/replication_gui.lib.php:422 libraries/replication_gui.lib.php:862
 #: libraries/server_privileges.lib.php:1640
 msgid "Password:"
@@ -9300,12 +9316,12 @@ msgid "Dump has been saved to file %s."
 msgstr "השליפה נשמרה אל הקובץ %s."
 
 #: libraries/import.lib.php:202 libraries/insert_edit.lib.php:124
-#: libraries/rte/rte_routines.lib.php:1353 libraries/sql.lib.php:1312
+#: libraries/rte/rte_routines.lib.php:1444 libraries/sql.lib.php:1306
 #: tbl_get_field.php:44
 msgid "MySQL returned an empty result set (i.e. zero rows)."
 msgstr "MySQL החזיר חבילת תוצאות ריקה (לדוגמא, אפס שורות)."
 
-#: libraries/import.lib.php:265 libraries/sql.lib.php:1326
+#: libraries/import.lib.php:265 libraries/sql.lib.php:1320
 msgid "[ROLLBACK occurred.]"
 msgstr ""
 
@@ -9371,14 +9387,14 @@ msgstr "יצירת אינדקס על&nbsp;%s&nbsp; עמודות"
 
 #: libraries/insert_edit.lib.php:233
 #: libraries/navigation/Nodes/Node_DatabaseChild.class.php:48
-#: templates/designer/table_list.phtml:40
+#: templates/database/designer/table_list.phtml:40
 msgid "Hide"
 msgstr ""
 
 #: libraries/insert_edit.lib.php:249
 #: libraries/navigation/Nodes/Node_Function.class.php:32
-#: libraries/rte/rte_routines.lib.php:1495
-#: templates/table/table_header.phtml:4
+#: libraries/rte/rte_routines.lib.php:1586
+#: templates/table/search/table_header.phtml:4
 msgid "Function"
 msgstr "פונקציה"
 
@@ -9393,85 +9409,86 @@ msgstr "בינארי"
 msgid "Because of its length,<br /> this column might not be editable."
 msgstr "משום אורכם, <br /> השדה הזה יכול להיות בלתי עריך "
 
-#: libraries/insert_edit.lib.php:1050
+#: libraries/insert_edit.lib.php:1048
 msgid "Binary - do not edit"
 msgstr "בינארי - אין לערוך"
 
-#: libraries/insert_edit.lib.php:1176 libraries/server_privileges.lib.php:470
-#: templates/table/options.phtml:36
+#: libraries/insert_edit.lib.php:1174 libraries/server_privileges.lib.php:470
+#: templates/table/search/options.phtml:36
 msgid "Or"
 msgstr "או"
 
-#: libraries/insert_edit.lib.php:1177
+#: libraries/insert_edit.lib.php:1175
 #, fuzzy
 msgid "web server upload directory:"
 msgstr "שמירת שרת בתוך תיקיית %s"
 
-#: libraries/insert_edit.lib.php:1348 templates/table/input_box.phtml:49
+#: libraries/insert_edit.lib.php:1346
+#: templates/table/search/input_box.phtml:49
 #, fuzzy
 #| msgid "Insert"
 msgid "Edit/Insert"
 msgstr "הכנסה"
 
-#: libraries/insert_edit.lib.php:1398
+#: libraries/insert_edit.lib.php:1396
 #, php-format
 msgid "Continue insertion with %s rows"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1428
+#: libraries/insert_edit.lib.php:1426
 msgid "and then"
 msgstr "ואז"
 
-#: libraries/insert_edit.lib.php:1461
+#: libraries/insert_edit.lib.php:1459
 msgid "Insert as new row"
 msgstr "הכנסה כשורה חדשה"
 
-#: libraries/insert_edit.lib.php:1464
+#: libraries/insert_edit.lib.php:1462
 msgid "Insert as new row and ignore errors"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1467
+#: libraries/insert_edit.lib.php:1465
 msgid "Show insert query"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1487
+#: libraries/insert_edit.lib.php:1485
 msgid "Go back to previous page"
 msgstr "חזרה לעמוד הקודם"
 
-#: libraries/insert_edit.lib.php:1490
+#: libraries/insert_edit.lib.php:1488
 msgid "Insert another new row"
 msgstr "הוספה נוספת של שורה חדשה"
 
-#: libraries/insert_edit.lib.php:1495
+#: libraries/insert_edit.lib.php:1493
 msgid "Go back to this page"
 msgstr "חזרה אחורה לעמוד זה"
 
-#: libraries/insert_edit.lib.php:1518
+#: libraries/insert_edit.lib.php:1516
 msgid "Edit next row"
 msgstr "עריכת השורה הבאה"
 
-#: libraries/insert_edit.lib.php:1540
+#: libraries/insert_edit.lib.php:1538
 msgid ""
 "Use TAB key to move from value to value, or CTRL+arrows to move anywhere"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1577 libraries/replication_gui.lib.php:542
-#: libraries/rte/rte_routines.lib.php:1497
+#: libraries/insert_edit.lib.php:1575 libraries/replication_gui.lib.php:542
+#: libraries/rte/rte_routines.lib.php:1588
 #: libraries/server_status_variables.lib.php:220
-#: templates/designer/having_query_panel.phtml:100
-#: templates/designer/options_panel.phtml:73
-#: templates/designer/options_panel.phtml:239
-#: templates/designer/where_query_panel.phtml:69
-#: templates/table/table_header.phtml:10
-#: templates/table/zoom_result_form.phtml:35
+#: templates/database/designer/having_query_panel.phtml:100
+#: templates/database/designer/options_panel.phtml:73
+#: templates/database/designer/options_panel.phtml:239
+#: templates/database/designer/where_query_panel.phtml:69
+#: templates/table/search/table_header.phtml:10
+#: templates/table/search/zoom_result_form.phtml:35
 msgid "Value"
 msgstr "ערך"
 
-#: libraries/insert_edit.lib.php:1937 libraries/sql.lib.php:1309
+#: libraries/insert_edit.lib.php:1935 libraries/sql.lib.php:1303
 msgid "Showing SQL query"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1962 libraries/sql.lib.php:1287
+#: libraries/insert_edit.lib.php:1960 libraries/sql.lib.php:1281
 #, php-format
 msgid "Inserted row id: %1$d"
 msgstr ""
@@ -9920,7 +9937,7 @@ msgstr ""
 #: libraries/navigation/Nodes/Node_View_Container.class.php:26
 #: libraries/navigation/Nodes/Node_View_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:129
-#: templates/structure/show_create.phtml:30
+#: templates/database/structure/show_create.phtml:30
 msgid "Views"
 msgstr ""
 
@@ -10229,7 +10246,7 @@ msgstr "אין לך הרשאות מספיקות להיות כאן כרגע!"
 
 #: libraries/operations.lib.php:101 libraries/operations.lib.php:249
 #: libraries/operations.lib.php:869 libraries/operations.lib.php:963
-#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:907
+#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:998
 #: templates/columns_definitions/table_fields_definitions.phtml:47
 #, fuzzy
 #| msgid "Edit Privileges"
@@ -10323,22 +10340,22 @@ msgid "Switch to copied table"
 msgstr "מעבר לטבלה שהועתקה"
 
 #: libraries/operations.lib.php:1360
-#: templates/structure/check_all_tables.phtml:18
+#: templates/database/structure/check_all_tables.phtml:18
 msgid "Table maintenance"
 msgstr "אחזקת טבלה"
 
 #: libraries/operations.lib.php:1398
-#: templates/structure/check_all_tables.phtml:19
+#: templates/database/structure/check_all_tables.phtml:19
 msgid "Analyze table"
 msgstr "ניתוח טבלה"
 
 #: libraries/operations.lib.php:1413
-#: templates/structure/check_all_tables.phtml:20
+#: templates/database/structure/check_all_tables.phtml:20
 msgid "Check table"
 msgstr "בדיקת טבלה"
 
 #: libraries/operations.lib.php:1428
-#: templates/structure/check_all_tables.phtml:22
+#: templates/database/structure/check_all_tables.phtml:22
 #, fuzzy
 #| msgid "Check table"
 msgid "Checksum table"
@@ -10360,18 +10377,19 @@ msgid "Flush the table (FLUSH)"
 msgstr "ריקון טבלה (\"FLUSH\")"
 
 #: libraries/operations.lib.php:1477
-#: templates/structure/check_all_tables.phtml:23
-#: templates/structure/display_table_stats.phtml:56
+#: templates/database/structure/check_all_tables.phtml:23
+#: templates/table/structure/display_table_stats.phtml:56
 msgid "Optimize table"
 msgstr "ייעול טבלה"
 
 #: libraries/operations.lib.php:1492
-#: templates/structure/check_all_tables.phtml:24
+#: templates/database/structure/check_all_tables.phtml:24
 msgid "Repair table"
 msgstr "תיקון טבלה"
 
 #: libraries/operations.lib.php:1538
-#: templates/structure/check_all_tables.phtml:14 view_operations.php:127
+#: templates/database/structure/check_all_tables.phtml:14
+#: view_operations.php:127
 #, fuzzy
 #| msgid "Dumping data for table"
 msgid "Delete data or table"
@@ -10505,7 +10523,7 @@ msgid "Cannot connect: invalid settings."
 msgstr "חיבור נכשל: הגדרות לא תקינות."
 
 #: libraries/plugins/auth/AuthenticationConfig.class.php:108
-#: libraries/plugins/auth/AuthenticationCookie.class.php:134
+#: libraries/plugins/auth/AuthenticationCookie.class.php:122
 #: libraries/plugins/auth/AuthenticationHttp.class.php:96
 #, php-format
 msgid "Welcome to %s"
@@ -10533,38 +10551,38 @@ msgstr ""
 msgid "Retry to connect"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:146
+#: libraries/plugins/auth/AuthenticationCookie.class.php:134
 msgid "Your session has expired. Please log in again."
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:170
+#: libraries/plugins/auth/AuthenticationCookie.class.php:158
 msgid "Log in"
 msgstr "כניסה"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:178
-#: libraries/plugins/auth/AuthenticationCookie.class.php:188
+#: libraries/plugins/auth/AuthenticationCookie.class.php:166
+#: libraries/plugins/auth/AuthenticationCookie.class.php:176
 msgid "You can enter hostname/IP address and port separated by space."
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:193
+#: libraries/plugins/auth/AuthenticationCookie.class.php:181
 msgid "Username:"
 msgstr "שם משתמש:"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:205
+#: libraries/plugins/auth/AuthenticationCookie.class.php:193
 #, fuzzy
 #| msgid "Server Choice"
 msgid "Server Choice:"
 msgstr "בחירת שרת"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:386
+#: libraries/plugins/auth/AuthenticationCookie.class.php:374
 msgid "Entered captcha is wrong, try again!"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:396
+#: libraries/plugins/auth/AuthenticationCookie.class.php:384
 msgid "Please enter correct captcha!"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:423
+#: libraries/plugins/auth/AuthenticationCookie.class.php:411
 #, fuzzy
 #| msgid "Cannot log in to the MySQL server"
 msgid "You are not allowed to log in to this MySQL server!"
@@ -10676,7 +10694,7 @@ msgstr "נשלח"
 #: libraries/plugins/export/ExportOdt.class.php:593
 #: libraries/plugins/export/ExportTexytext.class.php:428
 #: libraries/plugins/export/PMA_ExportPdf.class.php:313
-#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:984
 #: libraries/rte/rte_triggers.lib.php:377
 #, fuzzy
 #| msgid "Description"
@@ -11026,7 +11044,7 @@ msgid "Last check:"
 msgstr "נבדק לאחרונה:"
 
 #: libraries/plugins/export/ExportSql.class.php:1399
-#: templates/structure/structure_table_row.phtml:183
+#: templates/database/structure/structure_table_row.phtml:183
 msgid "in use"
 msgstr "בשימוש"
 
@@ -11223,20 +11241,16 @@ msgstr ""
 msgid "The imported file does not contain any data!"
 msgstr ""
 
-#: libraries/plugins/import/ImportSql.class.php:169
+#: libraries/plugins/import/ImportSql.class.php:72
 #, fuzzy
 #| msgid "MySQL&nbsp;4.0 compatible"
 msgid "SQL compatibility mode:"
 msgstr "תואם MySQL&nbsp;4.0"
 
-#: libraries/plugins/import/ImportSql.class.php:181
+#: libraries/plugins/import/ImportSql.class.php:84
 msgid "Do not use <code>AUTO_INCREMENT</code> for zero values"
 msgstr ""
 
-#: libraries/plugins/import/ImportSql.class.php:195
-msgid "Read as multibytes"
-msgstr ""
-
 #: libraries/plugins/import/ImportXml.class.php:54
 msgid "XML"
 msgstr "XML"
@@ -11281,7 +11295,7 @@ msgid "Show grid"
 msgstr "הראה רשת"
 
 #: libraries/plugins/schema/SchemaPdf.class.php:94
-#: templates/structure/print_view_data_dictionary_link.phtml:6
+#: templates/database/structure/print_view_data_dictionary_link.phtml:6
 msgid "Data Dictionary"
 msgstr "מילון נתונים"
 
@@ -11312,7 +11326,7 @@ msgid "The %s table doesn't exist!"
 msgstr "הטבלה \"%s\" לא קיימת!"
 
 #: libraries/plugins/schema/eps/Eps_Relation_Schema.class.php:321
-#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:309
+#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:323
 #, php-format
 msgid "Schema of the %s database - Page %s"
 msgstr ""
@@ -11341,7 +11355,7 @@ msgstr "תוכן עניניים"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1005
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1028
 #: libraries/tracking.lib.php:884
-#: templates/structure/table_structure_header.phtml:11
+#: templates/table/structure/table_structure_header.phtml:11
 msgid "Extra"
 msgstr "תוספת"
 
@@ -11675,51 +11689,51 @@ msgstr ""
 msgid "Create the needed tables with the <code>%screate_tables.sql</code>."
 msgstr ""
 
-#: libraries/relation.lib.php:360
+#: libraries/relation.lib.php:357
 msgid "Create a pma user and give access to these tables."
 msgstr ""
 
-#: libraries/relation.lib.php:365
+#: libraries/relation.lib.php:360
 msgid ""
 "Enable advanced features in configuration file (<code>config.inc.php</"
 "code>), for example by starting from <code>config.sample.inc.php</code>."
 msgstr ""
 
-#: libraries/relation.lib.php:373
+#: libraries/relation.lib.php:365
 msgid "Re-login to phpMyAdmin to load the updated configuration file."
 msgstr ""
 
-#: libraries/relation.lib.php:1612
+#: libraries/relation.lib.php:1607
 msgid "no description"
 msgstr "ללא תיאור"
 
-#: libraries/relation.lib.php:1811
+#: libraries/relation.lib.php:1806
 msgid ""
 "You do not have necessary privileges to create a database named "
 "'phpmyadmin'. You may go to 'Operations' tab of any database to set up the "
 "phpMyAdmin configuration storage there."
 msgstr ""
 
-#: libraries/relation.lib.php:1928
+#: libraries/relation.lib.php:1923
 #, php-format
 msgid ""
 "%sCreate%s a database named 'phpmyadmin' and setup the phpMyAdmin "
 "configuration storage there."
 msgstr ""
 
-#: libraries/relation.lib.php:1936
+#: libraries/relation.lib.php:1931
 #, php-format
 msgid ""
 "%sCreate%s the phpMyAdmin configuration storage in the current database."
 msgstr ""
 
-#: libraries/relation.lib.php:1944
+#: libraries/relation.lib.php:1939
 #, php-format
 msgid "%sCreate%s missing phpMyAdmin configuration storage tables."
 msgstr ""
 
 #: libraries/replication_gui.lib.php:46 libraries/replication_gui.lib.php:343
-#: libraries/server_databases.lib.php:387
+#: libraries/server_databases.lib.php:398
 msgid "Master replication"
 msgstr ""
 
@@ -11775,7 +11789,7 @@ msgid ""
 msgstr ""
 
 #: libraries/replication_gui.lib.php:141
-#: libraries/server_databases.lib.php:389
+#: libraries/server_databases.lib.php:400
 msgid "Slave replication"
 msgstr ""
 
@@ -12059,10 +12073,10 @@ msgid "Master server changed successfully to %s."
 msgstr "ההרשאות נטענו מחדש בהצלחה."
 
 #: libraries/rte/rte_events.lib.php:106 libraries/rte/rte_events.lib.php:115
-#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:149
-#: libraries/rte/rte_routines.lib.php:158
-#: libraries/rte/rte_routines.lib.php:231
-#: libraries/rte/rte_routines.lib.php:1362
+#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:219
+#: libraries/rte/rte_routines.lib.php:246
+#: libraries/rte/rte_routines.lib.php:368
+#: libraries/rte/rte_routines.lib.php:1453
 #: libraries/rte/rte_triggers.lib.php:82 libraries/rte/rte_triggers.lib.php:91
 #: libraries/rte/rte_triggers.lib.php:123
 #, php-format
@@ -12084,7 +12098,7 @@ msgstr "טבלה %s נמחקה"
 msgid "Event %1$s has been created."
 msgstr "טבלה %s נמחקה"
 
-#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:251
+#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:266
 #: libraries/rte/rte_triggers.lib.php:144
 msgid "One or more errors have occurred while processing your request:"
 msgstr ""
@@ -12094,7 +12108,7 @@ msgstr ""
 msgid "Edit event"
 msgstr "נשלח"
 
-#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:794
+#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:885
 #: libraries/rte/rte_triggers.lib.php:323 view_create.php:180
 msgid "Details"
 msgstr ""
@@ -12109,7 +12123,7 @@ msgstr "סוג אירוע"
 msgid "Event type"
 msgstr "סוג אירוע"
 
-#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:817
+#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:908
 #, fuzzy, php-format
 #| msgid "Change"
 msgid "Change to %s"
@@ -12144,12 +12158,14 @@ msgstr "סיום"
 msgid "On completion preserve"
 msgstr "השלם הכנסות"
 
-#: libraries/rte/rte_events.lib.php:491 libraries/rte/rte_routines.lib.php:930
+#: libraries/rte/rte_events.lib.php:491
+#: libraries/rte/rte_routines.lib.php:1021
 #: libraries/rte/rte_triggers.lib.php:383 view_create.php:209
 msgid "Definer"
 msgstr ""
 
-#: libraries/rte/rte_events.lib.php:535 libraries/rte/rte_routines.lib.php:997
+#: libraries/rte/rte_events.lib.php:535
+#: libraries/rte/rte_routines.lib.php:1088
 #: libraries/rte/rte_triggers.lib.php:422
 msgid "The definer must be in the \"username@hostname\" format!"
 msgstr ""
@@ -12175,9 +12191,9 @@ msgid "You must provide an event definition."
 msgstr ""
 
 #: libraries/rte/rte_export.lib.php:43 libraries/rte/rte_general.lib.php:72
-#: libraries/rte/rte_routines.lib.php:345
-#: libraries/rte/rte_routines.lib.php:1198
-#: libraries/rte/rte_routines.lib.php:1411
+#: libraries/rte/rte_routines.lib.php:153
+#: libraries/rte/rte_routines.lib.php:1289
+#: libraries/rte/rte_routines.lib.php:1502
 #, fuzzy
 #| msgid "Processes"
 msgid "Error in processing request:"
@@ -12213,148 +12229,148 @@ msgid ""
 "problems."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:110
-#: libraries/rte/rte_routines.lib.php:1006
+#: libraries/rte/rte_routines.lib.php:123
+msgid "Edit routine"
+msgstr ""
+
+#: libraries/rte/rte_routines.lib.php:200
+#: libraries/rte/rte_routines.lib.php:1097
 #, php-format
 msgid "Invalid routine type: \"%s\""
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:170
+#: libraries/rte/rte_routines.lib.php:253
+#, fuzzy, php-format
+msgid "Routine %1$s has been created."
+msgstr "טבלה %s נמחקה"
+
+#: libraries/rte/rte_routines.lib.php:380
 msgid "Sorry, we failed to restore the dropped routine."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:211
+#: libraries/rte/rte_routines.lib.php:439
 #, fuzzy, php-format
 #| msgid "Table %s has been dropped."
 msgid "Routine %1$s has been modified. Privileges have been adjusted."
 msgstr "טבלה %s נמחקה"
 
-#: libraries/rte/rte_routines.lib.php:216
+#: libraries/rte/rte_routines.lib.php:444
 #, fuzzy, php-format
 #| msgid "Table %s has been dropped."
 msgid "Routine %1$s has been modified."
 msgstr "טבלה %s נמחקה"
 
-#: libraries/rte/rte_routines.lib.php:238
-#, fuzzy, php-format
-msgid "Routine %1$s has been created."
-msgstr "טבלה %s נמחקה"
-
-#: libraries/rte/rte_routines.lib.php:315
-msgid "Edit routine"
-msgstr ""
-
-#: libraries/rte/rte_routines.lib.php:797
+#: libraries/rte/rte_routines.lib.php:888
 #, fuzzy
 #| msgid "Column names"
 msgid "Routine name"
 msgstr "שמות עמודה"
 
-#: libraries/rte/rte_routines.lib.php:823
+#: libraries/rte/rte_routines.lib.php:914
 msgid "Parameters"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:829
+#: libraries/rte/rte_routines.lib.php:920
 #, fuzzy
 #| msgid "Creation"
 msgid "Direction"
 msgstr "יצירה"
 
-#: libraries/rte/rte_routines.lib.php:847
+#: libraries/rte/rte_routines.lib.php:938
 #, fuzzy
 #| msgid "Add new field"
 msgid "Add parameter"
 msgstr "הוספת שדה חדש"
 
-#: libraries/rte/rte_routines.lib.php:851
+#: libraries/rte/rte_routines.lib.php:942
 #, fuzzy
 #| msgid "Rename database to"
 msgid "Remove last parameter"
 msgstr "שינוי שם מאגר נתונים אל"
 
-#: libraries/rte/rte_routines.lib.php:856
+#: libraries/rte/rte_routines.lib.php:947
 msgid "Return type"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:862
+#: libraries/rte/rte_routines.lib.php:953
 #, fuzzy
 #| msgid "Length/Values"
 msgid "Return length/values"
 msgstr "אורך/ערכים*"
 
-#: libraries/rte/rte_routines.lib.php:868
+#: libraries/rte/rte_routines.lib.php:959
 #, fuzzy
 #| msgid "Table options"
 msgid "Return options"
 msgstr "אפשרויות טבלה"
 
-#: libraries/rte/rte_routines.lib.php:899
+#: libraries/rte/rte_routines.lib.php:990
 msgid "Is deterministic"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:920
+#: libraries/rte/rte_routines.lib.php:1011
 msgid ""
 "You do not have sufficient privileges to perform this operation; Please "
 "refer to the documentation for more details"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:935
+#: libraries/rte/rte_routines.lib.php:1026
 #, fuzzy
 #| msgid "Query type"
 msgid "Security type"
 msgstr "סוג שאילתה"
 
-#: libraries/rte/rte_routines.lib.php:944
+#: libraries/rte/rte_routines.lib.php:1035
 msgid "SQL data access"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1013
+#: libraries/rte/rte_routines.lib.php:1104
 msgid "You must provide a routine name!"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1047
+#: libraries/rte/rte_routines.lib.php:1138
 #, php-format
 msgid "Invalid direction \"%s\" given for parameter."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1069
-#: libraries/rte/rte_routines.lib.php:1131
+#: libraries/rte/rte_routines.lib.php:1160
+#: libraries/rte/rte_routines.lib.php:1222
 msgid ""
 "You must provide length/values for routine parameters of type ENUM, SET, "
 "VARCHAR and VARBINARY."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1095
+#: libraries/rte/rte_routines.lib.php:1186
 msgid "You must provide a name and a type for each routine parameter."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1114
+#: libraries/rte/rte_routines.lib.php:1205
 msgid "You must provide a valid return type for the routine."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1174
+#: libraries/rte/rte_routines.lib.php:1265
 msgid "You must provide a routine definition."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1285
+#: libraries/rte/rte_routines.lib.php:1376
 #, fuzzy, php-format
 msgid "Execution results of routine %s"
 msgstr "מאפשר יצירת שגרות מאוחסנות."
 
-#: libraries/rte/rte_routines.lib.php:1340
+#: libraries/rte/rte_routines.lib.php:1431
 #, php-format
 msgid "%d row affected by the last statement inside the procedure."
 msgid_plural "%d rows affected by the last statement inside the procedure."
 msgstr[0] ""
 msgstr[1] ""
 
-#: libraries/rte/rte_routines.lib.php:1398
-#: libraries/rte/rte_routines.lib.php:1406
+#: libraries/rte/rte_routines.lib.php:1489
+#: libraries/rte/rte_routines.lib.php:1497
 msgid "Execute routine"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1485
-#: libraries/rte/rte_routines.lib.php:1488
+#: libraries/rte/rte_routines.lib.php:1576
+#: libraries/rte/rte_routines.lib.php:1579
 msgid "Routine parameters"
 msgstr ""
 
@@ -12534,7 +12550,7 @@ msgid "Original position"
 msgstr "מיקום מקורי"
 
 #: libraries/server_bin_log.lib.php:133
-#: templates/structure/display_table_stats.phtml:4
+#: templates/table/structure/display_table_stats.phtml:4
 msgid "Information"
 msgstr "מידע"
 
@@ -12572,12 +12588,12 @@ msgstr ""
 "הערה: הפעלת סטטיסטיקות מאגר נתונים כאן יכולות לגרום לתעבורה כבדה בין השרת "
 "האינטרנט לשרת MySQL."
 
-#: libraries/server_databases.lib.php:364
-#: libraries/server_databases.lib.php:365
+#: libraries/server_databases.lib.php:366
+#: libraries/server_databases.lib.php:371
 msgid "Enable Statistics"
 msgstr "הפעלת סטטיסטיקה"
 
-#: libraries/server_databases.lib.php:481
+#: libraries/server_databases.lib.php:492
 #, fuzzy, php-format
 #| msgid "%s databases have been dropped successfully."
 msgid "%1$d database has been dropped successfully."
@@ -12958,7 +12974,7 @@ msgid "You have revoked the privileges for %s."
 msgstr "אתה שללת הרשאות עבור %s."
 
 #: libraries/server_privileges.lib.php:2059
-#: libraries/server_privileges.lib.php:4290
+#: libraries/server_privileges.lib.php:4316
 #, fuzzy
 #| msgid "Add user"
 msgid "Add user account"
@@ -13143,60 +13159,60 @@ msgstr "מוחק %s"
 msgid "The privileges were reloaded successfully."
 msgstr "ההרשאות נטענו מחדש בהצלחה."
 
-#: libraries/server_privileges.lib.php:3994
+#: libraries/server_privileges.lib.php:4003
 #, php-format
 msgid "The user %s already exists!"
 msgstr "שם המשתמש %s כבר קיים!"
 
-#: libraries/server_privileges.lib.php:4232
+#: libraries/server_privileges.lib.php:4258
 #, fuzzy, php-format
 #| msgid "Privileges"
 msgid "Privileges for %s"
 msgstr "הרשאות"
 
-#: libraries/server_privileges.lib.php:4241
+#: libraries/server_privileges.lib.php:4267
 #: libraries/server_status_processes.lib.php:72
 #: libraries/server_user_groups.lib.php:39
 msgid "User"
 msgstr "משתמש"
 
-#: libraries/server_privileges.lib.php:4282
+#: libraries/server_privileges.lib.php:4308
 msgctxt "Create new user"
 msgid "New"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4311
+#: libraries/server_privileges.lib.php:4337
 #, fuzzy
 #| msgid "Edit Privileges"
 msgid "Edit privileges:"
 msgstr "עריכת הרשאות"
 
-#: libraries/server_privileges.lib.php:4312
+#: libraries/server_privileges.lib.php:4338
 #, fuzzy
 #| msgid "User"
 msgid "User account"
 msgstr "משתמש"
 
-#: libraries/server_privileges.lib.php:4371
+#: libraries/server_privileges.lib.php:4397
 msgid ""
 "Note: You are attempting to edit privileges of the user with which you are "
 "currently logged in."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4391 libraries/server_users.lib.php:25
+#: libraries/server_privileges.lib.php:4417 libraries/server_users.lib.php:25
 #, fuzzy
 #| msgid "User overview"
 msgid "User accounts overview"
 msgstr "סקירת משתמשים"
 
-#: libraries/server_privileges.lib.php:4459
+#: libraries/server_privileges.lib.php:4485
 msgid ""
 "A user account allowing any user from localhost to connect is present. This "
 "will prevent other users from connecting if the host part of their account "
 "allows a connection from any (%) host."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4500
+#: libraries/server_privileges.lib.php:4526
 #, php-format
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
@@ -13208,7 +13224,7 @@ msgstr ""
 "הטבלאות האלו יכול להיות שונה מההרשאות שהשרת משתמש בהן, אם הן שונו באופן "
 "ידני. במקרה זה, אתה צריך לבצע %sטעינה מחדש של הרשאות%s לפני שאתה ממשיך."
 
-#: libraries/server_privileges.lib.php:4519
+#: libraries/server_privileges.lib.php:4545
 #, fuzzy
 #| msgid ""
 #| "Note: phpMyAdmin gets the users' privileges directly from MySQL's "
@@ -13226,64 +13242,64 @@ msgstr ""
 "הטבלאות האלו יכול להיות שונה מההרשאות שהשרת משתמש בהן, אם הן שונו באופן "
 "ידני. במקרה זה, אתה צריך לבצע %sטעינה מחדש של הרשאות%s לפני שאתה ממשיך."
 
-#: libraries/server_privileges.lib.php:4569
+#: libraries/server_privileges.lib.php:4595
 msgid "The selected user was not found in the privilege table."
 msgstr "המשתמש שנבחר לא נמצא בטבלת ההרשאות."
 
-#: libraries/server_privileges.lib.php:4801
+#: libraries/server_privileges.lib.php:4827
 msgid "You have added a new user."
 msgstr "משתמש חדש נוסף."
 
-#: libraries/server_status.lib.php:53
+#: libraries/server_status.lib.php:60
 #, php-format
 msgid "Network traffic since startup: %s"
 msgstr ""
 
-#: libraries/server_status.lib.php:66
+#: libraries/server_status.lib.php:73
 #, fuzzy, php-format
 #| msgid "This MySQL server has been running for %s. It started up on %s."
 msgid "This MySQL server has been running for %1$s. It started up on %2$s."
 msgstr "שרת MySQL פעיל במשך %s. הוא התחיל לפעול ב- %s."
 
-#: libraries/server_status.lib.php:80
+#: libraries/server_status.lib.php:94
 msgid ""
 "This MySQL server works as <b>master</b> and <b>slave</b> in <b>replication</"
 "b> process."
 msgstr ""
 
-#: libraries/server_status.lib.php:85
+#: libraries/server_status.lib.php:99
 msgid "This MySQL server works as <b>master</b> in <b>replication</b> process."
 msgstr ""
 
-#: libraries/server_status.lib.php:90
+#: libraries/server_status.lib.php:104
 msgid "This MySQL server works as <b>slave</b> in <b>replication</b> process."
 msgstr ""
 
-#: libraries/server_status.lib.php:106
+#: libraries/server_status.lib.php:116
 msgid "Replication status"
 msgstr ""
 
-#: libraries/server_status.lib.php:137
+#: libraries/server_status.lib.php:146
 msgid ""
 "On a busy server, the byte counters may overrun, so those statistics as "
 "reported by the MySQL server may be incorrect."
 msgstr ""
 
-#: libraries/server_status.lib.php:148
+#: libraries/server_status.lib.php:157
 msgid "Received"
 msgstr "התקבל"
 
-#: libraries/server_status.lib.php:167
+#: libraries/server_status.lib.php:176
 msgid "Sent"
 msgstr "נשלח"
 
-#: libraries/server_status.lib.php:234
+#: libraries/server_status.lib.php:243
 #, fuzzy
 #| msgid "Connections"
 msgid "Max. concurrent connections"
 msgstr "חיבורים"
 
-#: libraries/server_status.lib.php:244
+#: libraries/server_status.lib.php:253
 msgid "Failed attempts"
 msgstr "ניסיונות כושלים"
 
@@ -14264,7 +14280,7 @@ msgstr ""
 msgid "Not implemented yet."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/AlterOperation.php:193
+#: libraries/sql-parser/src/Components/AlterOperation.php:191
 msgid "Unrecognized alter operation."
 msgstr ""
 
@@ -14278,7 +14294,7 @@ msgid "An opening bracket followed by a set of values was expected."
 msgstr ""
 
 #: libraries/sql-parser/src/Components/ArrayObj.php:101
-#: libraries/sql-parser/src/Components/FieldDefinition.php:202
+#: libraries/sql-parser/src/Components/CreateDefinition.php:202
 msgid "An opening bracket was expected."
 msgstr ""
 
@@ -14286,25 +14302,35 @@ msgstr ""
 msgid "A comma or a closing bracket was expected"
 msgstr ""
 
+#: libraries/sql-parser/src/Components/CreateDefinition.php:246
+#, fuzzy
+#| msgid "No databases selected."
+msgid "A comma or a closing bracket was expected."
+msgstr "אף מאגר נתונים לא נבחר."
+
+#: libraries/sql-parser/src/Components/CreateDefinition.php:262
+msgid "A closing bracket was expected."
+msgstr ""
+
 #: libraries/sql-parser/src/Components/DataType.php:125
 msgid "Unrecognized data type."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:225
+#: libraries/sql-parser/src/Components/Expression.php:227
 msgid "Unexpected closing bracket."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:246
-#: libraries/sql-parser/src/Components/Expression.php:283
-#: libraries/sql-parser/src/Components/Expression.php:303
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:285
+#: libraries/sql-parser/src/Components/Expression.php:305
 msgid "An alias was previously found."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:257
+#: libraries/sql-parser/src/Components/Expression.php:259
 msgid "Unexpected dot."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:327
+#: libraries/sql-parser/src/Components/Expression.php:329
 #, fuzzy
 #| msgid "No databases selected."
 msgid "An alias was expected."
@@ -14316,16 +14342,6 @@ msgstr "אף מאגר נתונים לא נבחר."
 msgid "An expression was expected."
 msgstr "לא נבחרו שורות"
 
-#: libraries/sql-parser/src/Components/FieldDefinition.php:246
-#, fuzzy
-#| msgid "No databases selected."
-msgid "A comma or a closing bracket was expected."
-msgstr "אף מאגר נתונים לא נבחר."
-
-#: libraries/sql-parser/src/Components/FieldDefinition.php:262
-msgid "A closing bracket was expected."
-msgstr ""
-
 #: libraries/sql-parser/src/Components/Limit.php:90
 #: libraries/sql-parser/src/Components/Limit.php:112
 msgid "An offset was expected."
@@ -14367,27 +14383,27 @@ msgstr ""
 msgid "Expected delimiter."
 msgstr ""
 
-#: libraries/sql-parser/src/Lexer.php:753
+#: libraries/sql-parser/src/Lexer.php:777
 #, fuzzy, php-format
 msgid "Ending quote %1$s was expected."
 msgstr "טבלה %s נמחקה"
 
-#: libraries/sql-parser/src/Lexer.php:789
+#: libraries/sql-parser/src/Lexer.php:813
 #, fuzzy
 msgid "Variable name was expected."
 msgstr "תבנית שם קובץ"
 
-#: libraries/sql-parser/src/Parser.php:380
+#: libraries/sql-parser/src/Parser.php:391
 #, fuzzy
 #| msgid "At Beginning of Table"
 msgid "Unexpected beginning of statement."
 msgstr "בתחילת טבלה"
 
-#: libraries/sql-parser/src/Parser.php:399
+#: libraries/sql-parser/src/Parser.php:410
 msgid "Unrecognized statement type."
 msgstr ""
 
-#: libraries/sql-parser/src/Parser.php:479
+#: libraries/sql-parser/src/Parser.php:489
 msgid "No transaction was previously started."
 msgstr ""
 
@@ -14413,8 +14429,10 @@ msgid "The name of the entity was expected."
 msgstr ""
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:310
-msgid "At least one field definition was expected."
-msgstr ""
+#, fuzzy
+#| msgid "The row has been deleted."
+msgid "At least one column definition was expected."
+msgstr "השורה נמחקה"
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:329
 msgid "A \"RETURNS\" keyword was expected."
@@ -14490,25 +14508,25 @@ msgstr "הסימנייה %s נוצרה"
 msgid "Using bookmark \"%s\" as default browse query."
 msgstr ""
 
-#: libraries/sql.lib.php:1306
+#: libraries/sql.lib.php:1300
 msgid "Showing as PHP code"
 msgstr ""
 
-#: libraries/sql.lib.php:1638
+#: libraries/sql.lib.php:1632
 #, php-format
 msgid ""
 "Current selection does not contain a unique column. Grid edit, checkbox, "
 "Edit, Copy and Delete features are not available. %s"
 msgstr ""
 
-#: libraries/sql.lib.php:1649
+#: libraries/sql.lib.php:1643
 #, php-format
 msgid ""
 "Current selection does not contain a unique column. Grid edit, Edit, Copy "
 "and Delete features may result in undesired behavior. %s"
 msgstr ""
 
-#: libraries/sql.lib.php:1688
+#: libraries/sql.lib.php:1682
 #, php-format
 msgid "Problems with indexes of table `%s`"
 msgstr "בעיות עם אינדקסים של טבלה `%s`"
@@ -14675,7 +14693,7 @@ msgid "Version %s snapshot (SQL code)"
 msgstr ""
 
 #: libraries/tracking.lib.php:947
-#: templates/structure/table_structure_row.phtml:33
+#: templates/table/structure/table_structure_row.phtml:33
 #, fuzzy
 #| msgid "None"
 msgctxt "None for default"
@@ -14729,19 +14747,19 @@ msgstr "גרסת שרת"
 msgid "Version %1$s was created, tracking for %2$s is active."
 msgstr ""
 
-#: libraries/user_preferences.inc.php:29
+#: libraries/user_preferences.inc.php:30
 #, fuzzy
 #| msgid "General relation features"
 msgid "Manage your settings"
 msgstr "תכונות קשר כלליות"
 
-#: libraries/user_preferences.inc.php:46 prefs_manage.php:307
+#: libraries/user_preferences.inc.php:54 prefs_manage.php:307
 #, fuzzy
 #| msgid "Modifications have been saved"
 msgid "Configuration has been saved."
 msgstr "שינויים נשמרו"
 
-#: libraries/user_preferences.inc.php:66
+#: libraries/user_preferences.inc.php:74
 #, php-format
 msgid ""
 "Your preferences will be saved for current session only. Storing them "
@@ -15140,7 +15158,7 @@ msgid "first"
 msgstr ""
 
 #: templates/columns_definitions/move_column.phtml:12
-#: templates/structure/add_column.phtml:21
+#: templates/table/structure/add_column.phtml:21
 #, fuzzy, php-format
 #| msgid "After %s"
 msgid "after %s"
@@ -15225,240 +15243,347 @@ msgstr "שינויי צורה זמינים"
 msgid "Input transformation options"
 msgstr "לתבנית זאת אין אפשרויות"
 
-#: templates/designer/aggregate_query_panel.phtml:22
-#: templates/designer/options_panel.phtml:100
+#: templates/database/create_table.phtml:7
+#: templates/database/designer/side_menu.phtml:77
+#: templates/database/designer/side_menu.phtml:80
+#, fuzzy
+msgid "Create table"
+msgstr "יצירת עמוד חדש"
+
+#: templates/database/create_table.phtml:15
+#, fuzzy
+#| msgid "Number of fields"
+msgid "Number of columns"
+msgstr "מספר שדות"
+
+#: templates/database/designer/aggregate_query_panel.phtml:22
+#: templates/database/designer/options_panel.phtml:100
 #, fuzzy
 #| msgid "Create"
 msgid "Aggregate"
 msgstr "יצירה"
 
-#: templates/designer/aggregate_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:61
-#: templates/designer/options_panel.phtml:106
-#: templates/designer/options_panel.phtml:170
-#: templates/designer/where_query_panel.phtml:30
-#: templates/table/table_header.phtml:9
+#: templates/database/designer/aggregate_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:61
+#: templates/database/designer/options_panel.phtml:106
+#: templates/database/designer/options_panel.phtml:170
+#: templates/database/designer/where_query_panel.phtml:30
+#: templates/table/search/table_header.phtml:9
 #, fuzzy
 msgid "Operator"
 msgstr "פעולות"
 
-#: templates/designer/database_tables.phtml:29
+#: templates/database/designer/database_tables.phtml:29
 msgid "Toggle"
 msgstr ""
 
-#: templates/designer/database_tables.phtml:40
+#: templates/database/designer/database_tables.phtml:40
 #, fuzzy
 #| msgid "Databases"
 msgid "See table structure"
 msgstr "מאגרי נתונים"
 
-#: templates/designer/delete_relation_panel.phtml:21
+#: templates/database/designer/delete_relation_panel.phtml:21
 msgid "Delete relation"
 msgstr ""
 
-#: templates/designer/edit_delete_pages.phtml:7
+#: templates/database/designer/edit_delete_pages.phtml:7
 #, fuzzy
 #| msgid "Page number:"
 msgid "Page to open"
 msgstr "מספר דף:"
 
-#: templates/designer/edit_delete_pages.phtml:7
+#: templates/database/designer/edit_delete_pages.phtml:7
 #, fuzzy
 msgid "Page to delete"
 msgstr "תצוגת יחסים"
 
-#: templates/designer/having_query_panel.phtml:90
-#: templates/designer/options_panel.phtml:63
-#: templates/designer/options_panel.phtml:229
-#: templates/designer/where_query_panel.phtml:59
+#: templates/database/designer/having_query_panel.phtml:90
+#: templates/database/designer/options_panel.phtml:63
+#: templates/database/designer/options_panel.phtml:229
+#: templates/database/designer/where_query_panel.phtml:59
 #, fuzzy
 #| msgid "Export"
 msgid "Except"
 msgstr "ייצוא"
 
-#: templates/designer/having_query_panel.phtml:102
-#: templates/designer/options_panel.phtml:75
-#: templates/designer/options_panel.phtml:241
-#: templates/designer/where_query_panel.phtml:71
+#: templates/database/designer/having_query_panel.phtml:102
+#: templates/database/designer/options_panel.phtml:75
+#: templates/database/designer/options_panel.phtml:241
+#: templates/database/designer/where_query_panel.phtml:71
 #, fuzzy
 #| msgid "in query"
 msgid "subquery"
 msgstr "בשאילתה"
 
-#: templates/designer/new_relation_panel.phtml:22
-#: templates/designer/side_menu.phtml:84 templates/designer/side_menu.phtml:87
+#: templates/database/designer/new_relation_panel.phtml:22
+#: templates/database/designer/side_menu.phtml:84
+#: templates/database/designer/side_menu.phtml:87
 msgid "Create relation"
 msgstr ""
 
-#: templates/designer/options_panel.phtml:34
-#: templates/designer/options_panel.phtml:200
+#: templates/database/designer/options_panel.phtml:34
+#: templates/database/designer/options_panel.phtml:200
 #, fuzzy
 msgid "Relation operator"
 msgstr "תצוגת יחסים"
 
-#: templates/designer/options_panel.phtml:85
-#: templates/designer/rename_to_panel.phtml:23
+#: templates/database/designer/options_panel.phtml:85
+#: templates/database/designer/rename_to_panel.phtml:23
 #, fuzzy
 msgid "Rename to"
 msgstr "שינוי שם טבלה אל"
 
-#: templates/designer/options_panel.phtml:91
-#: templates/designer/rename_to_panel.phtml:31
+#: templates/database/designer/options_panel.phtml:91
+#: templates/database/designer/rename_to_panel.phtml:31
 #, fuzzy
 #| msgid "User name"
 msgid "New name"
 msgstr "שם משתמש"
 
-#: templates/designer/page_save_as.phtml:4
+#: templates/database/designer/page_save_as.phtml:4
 #, fuzzy
 #| msgid "No rows selected"
 msgid "Save to selected page"
 msgstr "לא נבחרו שורות"
 
-#: templates/designer/page_save_as.phtml:5
+#: templates/database/designer/page_save_as.phtml:5
 #, fuzzy
 #| msgid "Create a new index"
 msgid "Create a page and save to it"
 msgstr "יצירת אינדקס חדש"
 
-#: templates/designer/page_save_as.phtml:26
+#: templates/database/designer/page_save_as.phtml:26
 #, fuzzy
 #| msgid "User name"
 msgid "New page name"
 msgstr "שם משתמש"
 
-#: templates/designer/page_selector.phtml:2
+#: templates/database/designer/page_selector.phtml:2
 #, fuzzy
 #| msgid "Select All"
 msgid "Select page"
 msgstr "בחירת הכל"
 
-#: templates/designer/query_details.phtml:10
+#: templates/database/designer/query_details.phtml:10
 #, fuzzy
 #| msgid "Table options"
 msgid "Active options"
 msgstr "אפשרויות טבלה"
 
-#: templates/designer/schema_export.phtml:4
+#: templates/database/designer/schema_export.phtml:4
 msgid "Select Export Relational Type"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:19 templates/designer/side_menu.phtml:25
+#: templates/database/designer/side_menu.phtml:19
+#: templates/database/designer/side_menu.phtml:25
 #, fuzzy
 #| msgid "Show tables"
 msgid "Show/Hide tables list"
 msgstr "ראיית טבלאות"
 
-#: templates/designer/side_menu.phtml:29 templates/designer/side_menu.phtml:35
-#: templates/designer/side_menu.phtml:36
+#: templates/database/designer/side_menu.phtml:29
+#: templates/database/designer/side_menu.phtml:35
+#: templates/database/designer/side_menu.phtml:36
 msgid "View in fullscreen"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:34
+#: templates/database/designer/side_menu.phtml:34
 msgid "Exit fullscreen"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:41 templates/designer/side_menu.phtml:45
+#: templates/database/designer/side_menu.phtml:41
+#: templates/database/designer/side_menu.phtml:45
 #, fuzzy
 #| msgid "User name"
 msgid "New page"
 msgstr "שם משתמש"
 
-#: templates/designer/side_menu.phtml:70 templates/designer/side_menu.phtml:73
+#: templates/database/designer/side_menu.phtml:70
+#: templates/database/designer/side_menu.phtml:73
 #, fuzzy
 #| msgid "Select All"
 msgid "Delete pages"
 msgstr "בחירת הכל"
 
-#: templates/designer/side_menu.phtml:77 templates/designer/side_menu.phtml:80
-#: templates/table/create_table.phtml:7
-#, fuzzy
-msgid "Create table"
-msgstr "יצירת עמוד חדש"
-
-#: templates/designer/side_menu.phtml:98
-#: templates/designer/side_menu.phtml:101
+#: templates/database/designer/side_menu.phtml:98
+#: templates/database/designer/side_menu.phtml:101
 msgid "Reload"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:107
-#: templates/designer/side_menu.phtml:110
+#: templates/database/designer/side_menu.phtml:107
+#: templates/database/designer/side_menu.phtml:110
 msgid "Help"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Angular links"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Direct links"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:122
-#: templates/designer/side_menu.phtml:124
+#: templates/database/designer/side_menu.phtml:122
+#: templates/database/designer/side_menu.phtml:124
 msgid "Snap to grid"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:128
-#: templates/designer/side_menu.phtml:134
+#: templates/database/designer/side_menu.phtml:128
+#: templates/database/designer/side_menu.phtml:134
 msgid "Small/Big All"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:138
-#: templates/designer/side_menu.phtml:141
+#: templates/database/designer/side_menu.phtml:138
+#: templates/database/designer/side_menu.phtml:141
 msgid "Toggle small/big"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:145
-#: templates/designer/side_menu.phtml:148
+#: templates/database/designer/side_menu.phtml:145
+#: templates/database/designer/side_menu.phtml:148
 #, fuzzy
 #| msgid "Traditional Chinese"
 msgid "Toggle relation lines"
 msgstr "סינית מסורתית"
 
-#: templates/designer/side_menu.phtml:153
-#: templates/designer/side_menu.phtml:156
+#: templates/database/designer/side_menu.phtml:153
+#: templates/database/designer/side_menu.phtml:156
 #, fuzzy
 #| msgid "Export"
 msgid "Export schema"
 msgstr "ייצוא"
 
-#: templates/designer/side_menu.phtml:165
-#: templates/designer/side_menu.phtml:168
+#: templates/database/designer/side_menu.phtml:165
+#: templates/database/designer/side_menu.phtml:168
 #, fuzzy
 #| msgid "Submit Query"
 msgid "Build Query"
 msgstr "שליחת שאילתה"
 
-#: templates/designer/side_menu.phtml:173
-#: templates/designer/side_menu.phtml:177
+#: templates/database/designer/side_menu.phtml:173
+#: templates/database/designer/side_menu.phtml:177
 msgid "Move Menu"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:181
-#: templates/designer/side_menu.phtml:186
+#: templates/database/designer/side_menu.phtml:181
+#: templates/database/designer/side_menu.phtml:186
 #, fuzzy
 #| msgid "Partial Texts"
 msgid "Pin text"
 msgstr "טקסטים חלקיים"
 
-#: templates/designer/table_list.phtml:4
+#: templates/database/designer/table_list.phtml:4
 #, fuzzy
 msgid "Hide/Show all"
 msgstr "ראיית הכל"
 
-#: templates/designer/table_list.phtml:14
+#: templates/database/designer/table_list.phtml:14
 msgid "Hide/Show Tables with no relation"
 msgstr ""
 
-#: templates/designer/table_list.phtml:59
+#: templates/database/designer/table_list.phtml:59
 #, fuzzy
 msgid "Number of tables:"
 msgstr "מספר שדות"
 
+#: templates/database/structure/body_for_table_summary.phtml:6
+#, php-format
+msgid "%s table"
+msgid_plural "%s tables"
+msgstr[0] "טבלה אחת (%s)"
+msgstr[1] "%s טבלאות"
+
+#: templates/database/structure/body_for_table_summary.phtml:17
+msgid "Sum"
+msgstr "סכום"
+
+#: templates/database/structure/check_all_tables.phtml:6
+msgid "Check tables having overhead"
+msgstr "בדיקת טבלאות בעלות תקורה"
+
+#: templates/database/structure/check_all_tables.phtml:10
+#, fuzzy
+#| msgid "Show color"
+msgid "Show create"
+msgstr "ראיית צבע"
+
+#: templates/database/structure/check_all_tables.phtml:27
+#, fuzzy
+#| msgid "Add new field"
+msgid "Prefix"
+msgstr "הוספת שדה חדש"
+
+#: templates/database/structure/check_all_tables.phtml:28
+msgid "Add prefix to table"
+msgstr "הוספת קידומת לטבלה"
+
+#: templates/database/structure/check_all_tables.phtml:29
+msgid "Replace table prefix"
+msgstr "החלפת קידומת הטבלה"
+
+#: templates/database/structure/check_all_tables.phtml:30
+msgid "Copy table with prefix"
+msgstr "העתקת הטבלה עם קידומת"
+
+#: templates/database/structure/check_all_tables.phtml:36
+#, fuzzy
+#| msgid "Add %s field(s)"
+msgid "Add columns to central list"
+msgstr "הוספת %s תאים"
+
+#: templates/database/structure/check_all_tables.phtml:37
+msgid "Remove columns from central list"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:38
+#, fuzzy
+#| msgid "Add %s field(s)"
+msgid "Make consistent with central list"
+msgstr "הוספת %s תאים"
+
+#: templates/database/structure/favorite_anchor.phtml:12
+#, fuzzy
+msgid "Add to Favorites"
+msgstr "הוספת משתמש חדש"
+
+#: templates/database/structure/show_create.phtml:2
+#, fuzzy
+msgid "Showing create queries"
+msgstr "הראה שאילתות שלמות"
+
+#: templates/database/structure/sortable_header.phtml:13
+msgid "Sort"
+msgstr "סידור"
+
+#: templates/database/structure/table_header.phtml:42
+#, fuzzy
+#| msgid "May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]"
+msgid ""
+"May be approximate. Click on the number to get the exact count. See "
+"[doc@faq3-11]FAQ 3.11[/doc]."
+msgstr "יכול להיות הערכה. ראה [doc@faq3-11]FAQ 3.11[/doc]"
+
+#: templates/database/structure/table_header.phtml:66
+#: templates/table/index_form.phtml:127
+msgid "Size"
+msgstr "גודל"
+
+#: templates/database/structure/table_header.phtml:74
+#: templates/table/structure/display_table_stats.phtml:27
+msgid "Overhead"
+msgstr "תקורה"
+
+#: templates/database/structure/tracking_icon.phtml:4
+msgid "Tracking is active."
+msgstr "המעקב פעיל."
+
+#: templates/database/structure/tracking_icon.phtml:8
+msgid "Tracking is not active."
+msgstr "המעקב אינו פעיל."
+
 #: templates/error/report_form.phtml:7
 msgid ""
 "phpMyAdmin has encountered an error. We have collected data about this error "
@@ -15474,68 +15599,6 @@ msgstr ""
 msgid "Please explain the steps that lead to the error:"
 msgstr ""
 
-#: templates/gis_visualization/gis_visualization.phtml:3
-msgid "Display GIS Visualization"
-msgstr ""
-
-#: templates/gis_visualization/gis_visualization.phtml:8
-#, fuzzy
-#| msgid "Add/Delete Field Columns"
-msgid "Label column"
-msgstr "הוספת/מחיקת עמודות שדה"
-
-#: templates/gis_visualization/gis_visualization.phtml:11
-msgid "-- None --"
-msgstr ""
-
-#: templates/gis_visualization/gis_visualization.phtml:19
-#, fuzzy
-#| msgid "Total"
-msgid "Spatial column"
-msgstr "סה\"כ"
-
-#: templates/index_form.phtml:16
-msgid "Index name:"
-msgstr "שם אינדקס:"
-
-#: templates/index_form.phtml:19
-msgid ""
-"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
-msgstr ""
-
-#: templates/index_form.phtml:40
-#, fuzzy
-#| msgid "Index name:"
-msgid "Index choice:"
-msgstr "שם אינדקס:"
-
-#: templates/index_form.phtml:57
-msgid "Key block size:"
-msgstr ""
-
-#: templates/index_form.phtml:74
-msgid "Index type:"
-msgstr "סוג אינדקס:"
-
-#: templates/index_form.phtml:86
-#, fuzzy
-#| msgid "User:"
-msgid "Parser:"
-msgstr "משתמש:"
-
-#: templates/index_form.phtml:102
-#, fuzzy
-msgid "Comment:"
-msgstr "הערות"
-
-#: templates/index_form.phtml:127 templates/structure/table_header.phtml:66
-msgid "Size"
-msgstr "גודל"
-
-#: templates/index_form.phtml:149 templates/index_form.phtml:190
-msgid "Drag to reorder"
-msgstr ""
-
 #: templates/prefs_autoload.phtml:9
 msgid ""
 "Your browser has phpMyAdmin configuration for this domain. Would you like to "
@@ -15548,488 +15611,450 @@ msgstr ""
 msgid "Start row:"
 msgstr "שבת"
 
-#: templates/structure/actions_in_table_structure.phtml:14
-#, php-format
-msgid "A primary key has been added on %s."
-msgstr "נוסף מפתח ראשי אל %s."
-
-#: templates/structure/actions_in_table_structure.phtml:34
-#: templates/structure/actions_in_table_structure.phtml:54
-#: templates/structure/actions_in_table_structure.phtml:79
-#: templates/structure/actions_in_table_structure.phtml:101
-#, php-format
-msgid "An index has been added on %s."
-msgstr "נוסף אינדקס אל %s."
-
-#: templates/structure/actions_in_table_structure.phtml:130
-#: templates/structure/check_all_table_column.phtml:59
-#, fuzzy
-#| msgid "Rename database to"
-msgid "Remove from central columns"
-msgstr "שינוי שם מאגר נתונים אל"
-
-#: templates/structure/actions_in_table_structure.phtml:138
-#: templates/structure/check_all_table_column.phtml:55
-#, fuzzy
-#| msgid "Add %s field(s)"
-msgid "Add to central columns"
-msgstr "הוספת %s תאים"
-
-#: templates/structure/add_column.phtml:7
-#, fuzzy, php-format
-#| msgid "Add %s field(s)"
-msgid "Add %s column(s)"
-msgstr "הוספת %s תאים"
-
-#: templates/structure/add_column.phtml:12
-#, fuzzy
-#| msgid "At Beginning of Table"
-msgid "at beginning of table"
-msgstr "בתחילת טבלה"
-
-#: templates/structure/body_for_table_summary.phtml:6
-#, php-format
-msgid "%s table"
-msgid_plural "%s tables"
-msgstr[0] "טבלה אחת (%s)"
-msgstr[1] "%s טבלאות"
-
-#: templates/structure/body_for_table_summary.phtml:17
-msgid "Sum"
-msgstr "סכום"
-
-#: templates/structure/check_all_tables.phtml:6
-msgid "Check tables having overhead"
-msgstr "בדיקת טבלאות בעלות תקורה"
-
-#: templates/structure/check_all_tables.phtml:10
-#, fuzzy
-#| msgid "Show color"
-msgid "Show create"
-msgstr "ראיית צבע"
-
-#: templates/structure/check_all_tables.phtml:27
-#, fuzzy
-#| msgid "Add new field"
-msgid "Prefix"
-msgstr "הוספת שדה חדש"
-
-#: templates/structure/check_all_tables.phtml:28
-msgid "Add prefix to table"
-msgstr "הוספת קידומת לטבלה"
-
-#: templates/structure/check_all_tables.phtml:29
-msgid "Replace table prefix"
-msgstr "החלפת קידומת הטבלה"
-
-#: templates/structure/check_all_tables.phtml:30
-msgid "Copy table with prefix"
-msgstr "העתקת הטבלה עם קידומת"
-
-#: templates/structure/check_all_tables.phtml:36
-#, fuzzy
-#| msgid "Add %s field(s)"
-msgid "Add columns to central list"
-msgstr "הוספת %s תאים"
-
-#: templates/structure/check_all_tables.phtml:37
-msgid "Remove columns from central list"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:38
-#, fuzzy
-#| msgid "Add %s field(s)"
-msgid "Make consistent with central list"
-msgstr "הוספת %s תאים"
-
-#: templates/structure/display_structure.phtml:140 view_create.php:181
-#, fuzzy
-#| msgid "Print view"
-msgid "Edit view"
-msgstr "תצוגת הדפסה"
-
-#: templates/structure/display_table_stats.phtml:9
-msgid "Space usage"
-msgstr "שימוש מקום"
-
-#: templates/structure/display_table_stats.phtml:27
-#: templates/structure/table_header.phtml:74
-msgid "Overhead"
-msgstr "תקורה"
-
-#: templates/structure/display_table_stats.phtml:32
-msgid "Effective"
-msgstr "יעיל"
-
-#: templates/structure/favorite_anchor.phtml:12
-#, fuzzy
-msgid "Add to Favorites"
-msgstr "הוספת משתמש חדש"
-
-#: templates/structure/move_columns_dialog.phtml:1
-#: templates/structure/optional_action_links.phtml:21
-#, fuzzy
-#| msgid "Add %s field(s)"
-msgid "Move columns"
-msgstr "הוספת %s תאים"
-
-#: templates/structure/move_columns_dialog.phtml:2
-msgid "Move the columns by dragging them up and down."
-msgstr ""
-
-#: templates/structure/optional_action_links.phtml:9
-msgid "Propose table structure"
-msgstr "הצעת מבנה טבלה"
-
-#: templates/structure/optional_action_links.phtml:24
-#, fuzzy
-#| msgid "Propose table structure"
-msgid "Improve table structure"
-msgstr "הצעת מבנה טבלה"
-
-#: templates/structure/optional_action_links.phtml:30
-#, fuzzy
-#| msgid "Track table"
-msgid "Track view"
-msgstr "מעקב אחר טבלה"
-
-#: templates/structure/row_stats_table.phtml:3
-#, fuzzy
-#| msgid "Row Statistics"
-msgid "Row statistics"
-msgstr "סטטיסטיקת שורה"
-
-#: templates/structure/row_stats_table.phtml:9
-msgid "static"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:11
-msgid "dynamic"
-msgstr "דינאמי"
-
-#: templates/structure/row_stats_table.phtml:22
-msgid "partitioned"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:54
-msgid "Row length"
-msgstr "אורך שורה"
-
-#: templates/structure/row_stats_table.phtml:66
-msgid "Row size"
-msgstr "גודל שורה"
-
-#: templates/structure/row_stats_table.phtml:73
-msgid "Next autoindex"
-msgstr ""
-
-#: templates/structure/secondary_tabs.phtml:14
-#, fuzzy
-#| msgid "Relation view"
-msgid "Relation view"
-msgstr "תצוגת יחסים"
-
-#: templates/structure/show_create.phtml:2
-#, fuzzy
-msgid "Showing create queries"
-msgstr "הראה שאילתות שלמות"
-
-#: templates/structure/sortable_header.phtml:13
-msgid "Sort"
-msgstr "סידור"
-
-#: templates/structure/table_header.phtml:42
-#, fuzzy
-#| msgid "May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]"
-msgid ""
-"May be approximate. Click on the number to get the exact count. See "
-"[doc@faq3-11]FAQ 3.11[/doc]."
-msgstr "יכול להיות הערכה. ראה [doc@faq3-11]FAQ 3.11[/doc]"
-
-#: templates/structure/table_structure_row.phtml:46
-#, fuzzy, php-format
-#| msgid "Table %s has been dropped."
-msgid "Column %s has been dropped."
-msgstr "טבלה %s נמחקה"
-
-#: templates/structure/tracking_icon.phtml:4
-msgid "Tracking is active."
-msgstr "המעקב פעיל."
-
-#: templates/structure/tracking_icon.phtml:8
-msgid "Tracking is not active."
-msgstr "המעקב אינו פעיל."
-
-#: templates/table/create_table.phtml:15
-#, fuzzy
-#| msgid "Number of fields"
-msgid "Number of columns"
-msgstr "מספר שדות"
-
-#: templates/table/options.phtml:8
-#, fuzzy
-#| msgid "Select fields (at least one):"
-msgid "Select columns (at least one):"
-msgstr "בחירת שדות (לפחות אחד):"
-
-#: templates/table/options.phtml:37
-msgid "Add search conditions (body of the \"where\" clause):"
-msgstr "הוספת תנאי חיפוש (הגוף של תנאי \"where\"):"
-
-#: templates/table/options.phtml:45
-msgid "Number of rows per page"
-msgstr "מספר של שורות לכל דף"
-
-#: templates/table/options.phtml:56
-msgid "Display order:"
-msgstr "סדר תצוגה:"
-
-#: templates/table/options_zoom.phtml:6
-msgid "Use this column to label each point"
-msgstr ""
-
-#: templates/table/options_zoom.phtml:35
-msgid "Maximum rows to plot"
-msgstr ""
-
-#: templates/table/replace_preview.phtml:13
-msgid "Find and replace - preview"
-msgstr ""
-
-#: templates/table/replace_preview.phtml:18
-#, fuzzy
-#| msgid "Original position"
-msgid "Original string"
-msgstr "מיקום מקורי"
-
-#: templates/table/replace_preview.phtml:19
-#, fuzzy
-#| msgid "Relations"
-msgid "Replaced string"
-msgstr "יחסים"
-
-#: templates/table/replace_preview.phtml:40
-#, fuzzy
-msgid "Replace"
-msgstr "יחסים"
-
-#: templates/table/rows_zoom.phtml:16
-#, fuzzy
-msgid "Additional search criteria"
-msgstr "שאילתת SQL"
-
-#: templates/table/search_and_replace.phtml:3
-#, fuzzy
-#| msgid "Replace NULL by"
-msgid "Replace with:"
-msgstr "החלפת NULL ע\"י"
-
-#: templates/table/search_and_replace.phtml:22
-#, fuzzy
-#| msgid "as regular expression"
-msgid "Use regular expression"
-msgstr "כביטוי רגולרי"
-
-#: templates/table/selection_form.phtml:12
-#, fuzzy
-#| msgid "Do a \"query by example\" (wildcard: \"%\")"
-msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
-msgstr "ביצוע \"שאילתה לדוגמה\" (תו כללי: \"%\")"
-
-#: templates/table/selection_form.phtml:34
-msgid "Do a \"query by example\" (wildcard: \"%\")"
-msgstr "ביצוע \"שאילתה לדוגמה\" (תו כללי: \"%\")"
-
-#: templates/table/zoom_result_form.phtml:7
-msgid "Browse/Edit the points"
-msgstr ""
-
-#: templates/table/zoom_result_form.phtml:15
-msgid "How to use"
-msgstr ""
-
-#: templates/table/zoom_result_form.phtml:23
-#, fuzzy
-#| msgid "Reset"
-msgid "Reset zoom"
-msgstr "איפוס"
-
-#: templates/tbl_chart.phtml:17
+#: templates/table/chart/tbl_chart.phtml:17
 #, fuzzy
 #| msgid "Mar"
 msgctxt "Chart type"
 msgid "Bar"
 msgstr "מרץ"
 
-#: templates/tbl_chart.phtml:21
+#: templates/table/chart/tbl_chart.phtml:21
 #, fuzzy
 #| msgid "Column names"
 msgctxt "Chart type"
 msgid "Column"
 msgstr "שמות עמודה"
 
-#: templates/tbl_chart.phtml:25
+#: templates/table/chart/tbl_chart.phtml:25
 msgctxt "Chart type"
 msgid "Line"
 msgstr ""
 
-#: templates/tbl_chart.phtml:29
+#: templates/table/chart/tbl_chart.phtml:29
 #, fuzzy
 #| msgid "Engines"
 msgctxt "Chart type"
 msgid "Spline"
 msgstr "מנועים"
 
-#: templates/tbl_chart.phtml:33
+#: templates/table/chart/tbl_chart.phtml:33
 msgctxt "Chart type"
 msgid "Area"
 msgstr ""
 
-#: templates/tbl_chart.phtml:37
+#: templates/table/chart/tbl_chart.phtml:37
 #, fuzzy
 #| msgid "PiB"
 msgctxt "Chart type"
 msgid "Pie"
 msgstr "PB"
 
-#: templates/tbl_chart.phtml:41
+#: templates/table/chart/tbl_chart.phtml:41
 #, fuzzy
 #| msgid "Time"
 msgctxt "Chart type"
 msgid "Timeline"
 msgstr "זמן"
 
-#: templates/tbl_chart.phtml:45
+#: templates/table/chart/tbl_chart.phtml:45
 msgctxt "Chart type"
 msgid "Scatter"
 msgstr ""
 
-#: templates/tbl_chart.phtml:50
+#: templates/table/chart/tbl_chart.phtml:50
 msgid "Stacked"
 msgstr ""
 
-#: templates/tbl_chart.phtml:53
+#: templates/table/chart/tbl_chart.phtml:53
 #, fuzzy
 #| msgid "Import files"
 msgid "Chart title"
 msgstr "קבצי ייבוא"
 
-#: templates/tbl_chart.phtml:57
+#: templates/table/chart/tbl_chart.phtml:57
 msgid "X-Axis:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:72
+#: templates/table/chart/tbl_chart.phtml:72
 #, fuzzy
 msgid "Series:"
 msgstr "שאילתת SQL"
 
-#: templates/tbl_chart.phtml:102
+#: templates/table/chart/tbl_chart.phtml:102
 msgid "X-Axis label:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:104
+#: templates/table/chart/tbl_chart.phtml:104
 #, fuzzy
 #| msgid "Value"
 msgid "X Values"
 msgstr "ערך"
 
-#: templates/tbl_chart.phtml:107
+#: templates/table/chart/tbl_chart.phtml:107
 msgid "Y-Axis label:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:115
+#: templates/table/chart/tbl_chart.phtml:115
 msgid "Series names are in a column"
 msgstr ""
 
-#: templates/tbl_chart.phtml:118
+#: templates/table/chart/tbl_chart.phtml:118
 #, fuzzy
 #| msgid "Inside column:"
 msgid "Series column:"
 msgstr "בתוך העמודה:"
 
-#: templates/tbl_chart.phtml:130
+#: templates/table/chart/tbl_chart.phtml:130
 #, fuzzy
 #| msgid "Number of fields"
 msgid "Value Column:"
 msgstr "מספר שדות"
 
-#: templates/tbl_chart.phtml:150
+#: templates/table/chart/tbl_chart.phtml:150
 #, fuzzy
 #| msgid "Save as file"
 msgid "Save chart as image"
 msgstr "שמירה כקובץ"
 
-#: templates/tbl_relation/common_form.phtml:7
+#: templates/table/gis_visualization/gis_visualization.phtml:3
+msgid "Display GIS Visualization"
+msgstr ""
+
+#: templates/table/gis_visualization/gis_visualization.phtml:8
+#, fuzzy
+#| msgid "Add/Delete Field Columns"
+msgid "Label column"
+msgstr "הוספת/מחיקת עמודות שדה"
+
+#: templates/table/gis_visualization/gis_visualization.phtml:11
+msgid "-- None --"
+msgstr ""
+
+#: templates/table/gis_visualization/gis_visualization.phtml:19
+#, fuzzy
+#| msgid "Total"
+msgid "Spatial column"
+msgstr "סה\"כ"
+
+#: templates/table/index_form.phtml:16
+msgid "Index name:"
+msgstr "שם אינדקס:"
+
+#: templates/table/index_form.phtml:19
+msgid ""
+"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
+msgstr ""
+
+#: templates/table/index_form.phtml:40
+#, fuzzy
+#| msgid "Index name:"
+msgid "Index choice:"
+msgstr "שם אינדקס:"
+
+#: templates/table/index_form.phtml:57
+msgid "Key block size:"
+msgstr ""
+
+#: templates/table/index_form.phtml:74
+msgid "Index type:"
+msgstr "סוג אינדקס:"
+
+#: templates/table/index_form.phtml:86
+#, fuzzy
+#| msgid "User:"
+msgid "Parser:"
+msgstr "משתמש:"
+
+#: templates/table/index_form.phtml:102
+#, fuzzy
+msgid "Comment:"
+msgstr "הערות"
+
+#: templates/table/index_form.phtml:149 templates/table/index_form.phtml:190
+msgid "Drag to reorder"
+msgstr ""
+
+#: templates/table/relation/common_form.phtml:7
 msgid "Internal relations"
 msgstr "יחסים פנימיים"
 
-#: templates/tbl_relation/common_form.phtml:11
+#: templates/table/relation/common_form.phtml:11
 #, fuzzy
 #| msgid "Internal relations"
 msgid "Internal relation"
 msgstr "יחסים פנימיים"
 
-#: templates/tbl_relation/common_form.phtml:14
+#: templates/table/relation/common_form.phtml:14
 msgid ""
 "An internal relation is not necessary when a corresponding FOREIGN KEY "
 "relation exists."
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:37
+#: templates/table/relation/common_form.phtml:37
 #, fuzzy
 #| msgid "Add constraints"
 msgid "Foreign key constraints"
 msgstr "הוספת הגבלות"
 
-#: templates/tbl_relation/common_form.phtml:40
+#: templates/table/relation/common_form.phtml:40
 msgid "Actions"
 msgstr "פעולה"
 
-#: templates/tbl_relation/common_form.phtml:41
+#: templates/table/relation/common_form.phtml:41
 #, fuzzy
 #| msgid "Constraints for table"
 msgid "Constraint properties"
 msgstr "הגבלות לטבלה"
 
-#: templates/tbl_relation/common_form.phtml:44
+#: templates/table/relation/common_form.phtml:44
 msgid ""
 "Only columns with index will be displayed. You can define an index below."
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:49
+#: templates/table/relation/common_form.phtml:49
 msgid "Foreign key constraint"
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:81
+#: templates/table/relation/common_form.phtml:81
 #, fuzzy
 #| msgid "Add constraints"
 msgid "+ Add constraint"
 msgstr "הוספת הגבלות"
 
-#: templates/tbl_relation/common_form.phtml:91
+#: templates/table/relation/common_form.phtml:91
 #, fuzzy
 #| msgid "Choose field to display"
 msgid "Choose column to display:"
 msgstr "בחירת שדה להצגה"
 
-#: templates/tbl_relation/foreign_key_row.phtml:13
+#: templates/table/relation/foreign_key_row.phtml:13
 #, fuzzy, php-format
 #| msgid "Add constraints"
 msgid "Foreign key constraint %s has been dropped"
 msgstr "הוספת הגבלות"
 
-#: templates/tbl_relation/foreign_key_row.phtml:102
+#: templates/table/relation/foreign_key_row.phtml:102
 #, fuzzy
 #| msgid "Constraints for table"
 msgid "Constraint name"
 msgstr "הגבלות לטבלה"
 
-#: templates/tbl_relation/foreign_key_row.phtml:157
+#: templates/table/relation/foreign_key_row.phtml:157
 #, fuzzy
 #| msgid "Add %s field(s)"
 msgid "+ Add column"
 msgstr "הוספת %s תאים"
 
+#: templates/table/search/options.phtml:8
+#, fuzzy
+#| msgid "Select fields (at least one):"
+msgid "Select columns (at least one):"
+msgstr "בחירת שדות (לפחות אחד):"
+
+#: templates/table/search/options.phtml:37
+msgid "Add search conditions (body of the \"where\" clause):"
+msgstr "הוספת תנאי חיפוש (הגוף של תנאי \"where\"):"
+
+#: templates/table/search/options.phtml:45
+msgid "Number of rows per page"
+msgstr "מספר של שורות לכל דף"
+
+#: templates/table/search/options.phtml:56
+msgid "Display order:"
+msgstr "סדר תצוגה:"
+
+#: templates/table/search/options_zoom.phtml:6
+msgid "Use this column to label each point"
+msgstr ""
+
+#: templates/table/search/options_zoom.phtml:35
+msgid "Maximum rows to plot"
+msgstr ""
+
+#: templates/table/search/replace_preview.phtml:13
+msgid "Find and replace - preview"
+msgstr ""
+
+#: templates/table/search/replace_preview.phtml:18
+#, fuzzy
+#| msgid "Original position"
+msgid "Original string"
+msgstr "מיקום מקורי"
+
+#: templates/table/search/replace_preview.phtml:19
+#, fuzzy
+#| msgid "Relations"
+msgid "Replaced string"
+msgstr "יחסים"
+
+#: templates/table/search/replace_preview.phtml:40
+#, fuzzy
+msgid "Replace"
+msgstr "יחסים"
+
+#: templates/table/search/rows_zoom.phtml:16
+#, fuzzy
+msgid "Additional search criteria"
+msgstr "שאילתת SQL"
+
+#: templates/table/search/search_and_replace.phtml:3
+#, fuzzy
+#| msgid "Replace NULL by"
+msgid "Replace with:"
+msgstr "החלפת NULL ע\"י"
+
+#: templates/table/search/search_and_replace.phtml:22
+#, fuzzy
+#| msgid "as regular expression"
+msgid "Use regular expression"
+msgstr "כביטוי רגולרי"
+
+#: templates/table/search/selection_form.phtml:12
+#, fuzzy
+#| msgid "Do a \"query by example\" (wildcard: \"%\")"
+msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
+msgstr "ביצוע \"שאילתה לדוגמה\" (תו כללי: \"%\")"
+
+#: templates/table/search/selection_form.phtml:34
+msgid "Do a \"query by example\" (wildcard: \"%\")"
+msgstr "ביצוע \"שאילתה לדוגמה\" (תו כללי: \"%\")"
+
+#: templates/table/search/zoom_result_form.phtml:7
+msgid "Browse/Edit the points"
+msgstr ""
+
+#: templates/table/search/zoom_result_form.phtml:15
+msgid "How to use"
+msgstr ""
+
+#: templates/table/search/zoom_result_form.phtml:23
+#, fuzzy
+#| msgid "Reset"
+msgid "Reset zoom"
+msgstr "איפוס"
+
+#: templates/table/secondary_tabs.phtml:14
+#, fuzzy
+#| msgid "Relation view"
+msgid "Relation view"
+msgstr "תצוגת יחסים"
+
+#: templates/table/structure/actions_in_table_structure.phtml:14
+#, php-format
+msgid "A primary key has been added on %s."
+msgstr "נוסף מפתח ראשי אל %s."
+
+#: templates/table/structure/actions_in_table_structure.phtml:34
+#: templates/table/structure/actions_in_table_structure.phtml:54
+#: templates/table/structure/actions_in_table_structure.phtml:79
+#: templates/table/structure/actions_in_table_structure.phtml:101
+#, php-format
+msgid "An index has been added on %s."
+msgstr "נוסף אינדקס אל %s."
+
+#: templates/table/structure/actions_in_table_structure.phtml:130
+#: templates/table/structure/check_all_table_column.phtml:59
+#, fuzzy
+#| msgid "Rename database to"
+msgid "Remove from central columns"
+msgstr "שינוי שם מאגר נתונים אל"
+
+#: templates/table/structure/actions_in_table_structure.phtml:138
+#: templates/table/structure/check_all_table_column.phtml:55
+#, fuzzy
+#| msgid "Add %s field(s)"
+msgid "Add to central columns"
+msgstr "הוספת %s תאים"
+
+#: templates/table/structure/add_column.phtml:7
+#, fuzzy, php-format
+#| msgid "Add %s field(s)"
+msgid "Add %s column(s)"
+msgstr "הוספת %s תאים"
+
+#: templates/table/structure/add_column.phtml:12
+#, fuzzy
+#| msgid "At Beginning of Table"
+msgid "at beginning of table"
+msgstr "בתחילת טבלה"
+
+#: templates/table/structure/display_structure.phtml:140 view_create.php:181
+#, fuzzy
+#| msgid "Print view"
+msgid "Edit view"
+msgstr "תצוגת הדפסה"
+
+#: templates/table/structure/display_table_stats.phtml:9
+msgid "Space usage"
+msgstr "שימוש מקום"
+
+#: templates/table/structure/display_table_stats.phtml:32
+msgid "Effective"
+msgstr "יעיל"
+
+#: templates/table/structure/move_columns_dialog.phtml:1
+#: templates/table/structure/optional_action_links.phtml:21
+#, fuzzy
+#| msgid "Add %s field(s)"
+msgid "Move columns"
+msgstr "הוספת %s תאים"
+
+#: templates/table/structure/move_columns_dialog.phtml:2
+msgid "Move the columns by dragging them up and down."
+msgstr ""
+
+#: templates/table/structure/optional_action_links.phtml:9
+msgid "Propose table structure"
+msgstr "הצעת מבנה טבלה"
+
+#: templates/table/structure/optional_action_links.phtml:24
+#, fuzzy
+#| msgid "Propose table structure"
+msgid "Improve table structure"
+msgstr "הצעת מבנה טבלה"
+
+#: templates/table/structure/optional_action_links.phtml:30
+#, fuzzy
+#| msgid "Track table"
+msgid "Track view"
+msgstr "מעקב אחר טבלה"
+
+#: templates/table/structure/row_stats_table.phtml:3
+#, fuzzy
+#| msgid "Row Statistics"
+msgid "Row statistics"
+msgstr "סטטיסטיקת שורה"
+
+#: templates/table/structure/row_stats_table.phtml:9
+msgid "static"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:11
+msgid "dynamic"
+msgstr "דינאמי"
+
+#: templates/table/structure/row_stats_table.phtml:22
+msgid "partitioned"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:54
+msgid "Row length"
+msgstr "אורך שורה"
+
+#: templates/table/structure/row_stats_table.phtml:66
+msgid "Row size"
+msgstr "גודל שורה"
+
+#: templates/table/structure/row_stats_table.phtml:73
+msgid "Next autoindex"
+msgstr ""
+
+#: templates/table/structure/table_structure_row.phtml:46
+#, fuzzy, php-format
+#| msgid "Table %s has been dropped."
+msgid "Column %s has been dropped."
+msgstr "טבלה %s נמחקה"
+
 #: themes.php:17 themes.php:22
 msgid "Theme"
 msgstr ""
diff --git a/po/hi.po b/po/hi.po
index 4c33277ca6..e0472f4493 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 4.5.0-dev\n"
 "Report-Msgid-Bugs-To: developers@phpmyadmin.net\n"
-"POT-Creation-Date: 2015-08-08 13:53-0400\n"
+"POT-Creation-Date: 2015-08-12 08:10-0400\n"
 "PO-Revision-Date: 2015-02-04 18:16+0200\n"
 "Last-Translator: Nisarg Jhaveri <nisargjhaveri@gmail.com>\n"
 "Language-Team: Hindi <https://hosted.weblate.org/projects/phpmyadmin/master/"
@@ -53,7 +53,7 @@ msgid "Table comments:"
 msgstr "तालिका टिप्पणी:"
 
 #: db_datadict.php:104 libraries/Index.class.php:699
-#: libraries/insert_edit.lib.php:1567
+#: libraries/insert_edit.lib.php:1565
 #: libraries/navigation/Nodes/Node_Column.class.php:30
 #: libraries/plugins/export/ExportHtmlword.class.php:280
 #: libraries/plugins/export/ExportHtmlword.class.php:375
@@ -67,13 +67,14 @@ msgstr "तालिका टिप्पणी:"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1023
 #: libraries/tracking.lib.php:879 libraries/tracking.lib.php:975
 #: templates/columns_definitions/column_name.phtml:18
-#: templates/index_form.phtml:124 templates/table/table_header.phtml:6
-#: templates/table/zoom_result_form.phtml:33
-#: templates/tbl_relation/common_form.phtml:10
-#: templates/tbl_relation/common_form.phtml:43
-#: templates/tbl_relation/foreign_key_row.phtml:194
-#: templates/tbl_relation/foreign_key_row.phtml:206
-#: templates/tbl_relation/internal_relational_row.phtml:71
+#: templates/table/index_form.phtml:124
+#: templates/table/relation/common_form.phtml:10
+#: templates/table/relation/common_form.phtml:43
+#: templates/table/relation/foreign_key_row.phtml:194
+#: templates/table/relation/foreign_key_row.phtml:206
+#: templates/table/relation/internal_relational_row.phtml:71
+#: templates/table/search/table_header.phtml:6
+#: templates/table/search/zoom_result_form.phtml:33
 msgid "Column"
 msgstr "स्तम्भ"
 
@@ -91,21 +92,21 @@ msgstr "स्तम्भ"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1001
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1024
 #: libraries/rte/rte_list.lib.php:75 libraries/rte/rte_list.lib.php:103
-#: libraries/rte/rte_routines.lib.php:802
-#: libraries/rte/rte_routines.lib.php:831
-#: libraries/rte/rte_routines.lib.php:1493
+#: libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_routines.lib.php:922
+#: libraries/rte/rte_routines.lib.php:1584
 #: libraries/server_privileges.lib.php:2369 libraries/tracking.lib.php:880
 #: libraries/tracking.lib.php:972
 #: templates/columns_definitions/table_fields_definitions.phtml:11
-#: templates/structure/table_header.phtml:48
-#: templates/structure/table_structure_header.phtml:6
-#: templates/table/table_header.phtml:7
+#: templates/database/structure/table_header.phtml:48
+#: templates/table/search/table_header.phtml:7
+#: templates/table/structure/table_structure_header.phtml:6
 msgid "Type"
 msgstr "प्रकार/किस्म"
 
 #: db_datadict.php:106 libraries/Index.class.php:702
 #: libraries/central_columns.lib.php:708
-#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1576
+#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1574
 #: libraries/plugins/export/ExportHtmlword.class.php:286
 #: libraries/plugins/export/ExportHtmlword.class.php:381
 #: libraries/plugins/export/ExportLatex.class.php:509
@@ -118,8 +119,8 @@ msgstr "प्रकार/किस्म"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1026
 #: libraries/tracking.lib.php:882 libraries/tracking.lib.php:978
 #: templates/columns_definitions/table_fields_definitions.phtml:39
-#: templates/structure/table_structure_header.phtml:9
-#: templates/table/zoom_result_form.phtml:34
+#: templates/table/search/zoom_result_form.phtml:34
+#: templates/table/structure/table_structure_header.phtml:9
 msgid "Null"
 msgstr "शून्य"
 
@@ -137,8 +138,8 @@ msgstr "शून्य"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1027
 #: libraries/replication_gui.lib.php:153 libraries/tracking.lib.php:883
 #: templates/columns_definitions/table_fields_definitions.phtml:25
-#: templates/structure/body_for_table_summary.phtml:55
-#: templates/structure/table_structure_header.phtml:10
+#: templates/database/structure/body_for_table_summary.phtml:55
+#: templates/table/structure/table_structure_header.phtml:10
 msgid "Default"
 msgstr "तयशुदा"
 
@@ -166,19 +167,19 @@ msgid "Comments"
 msgstr "टिप्पणी"
 
 #: db_datadict.php:146
-#: libraries/controllers/StructureController.class.php:1960
-#: libraries/controllers/StructureController.class.php:1965
+#: libraries/controllers/TableStructureController.class.php:951
+#: libraries/controllers/TableStructureController.class.php:956
 #: libraries/tracking.lib.php:922
 #: templates/columns_definitions/column_indexes.phtml:6
-#: templates/structure/check_all_table_column.phtml:22
-#: templates/structure/display_structure.phtml:74
+#: templates/table/structure/check_all_table_column.phtml:22
+#: templates/table/structure/display_structure.phtml:74
 msgid "Primary"
 msgstr "प्राथमिक"
 
 #: db_datadict.php:156 js/messages.php:317 libraries/Index.class.php:567
 #: libraries/Index.class.php:606 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261 libraries/mult_submits.lib.php:403
+#: libraries/config/FormDisplay.tpl.php:272 libraries/mult_submits.lib.php:403
 #: libraries/mult_submits.lib.php:417
 #: libraries/plugins/export/ExportHtmlword.class.php:630
 #: libraries/plugins/export/ExportLatex.class.php:589
@@ -194,20 +195,20 @@ msgstr "प्राथमिक"
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1010 libraries/tracking.lib.php:1015
 #: prefs_manage.php:140 templates/prefs_autoload.phtml:15
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "No"
 msgstr "ना"
 
 #: db_datadict.php:156 js/messages.php:443 libraries/Index.class.php:568
 #: libraries/Index.class.php:605 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261
-#: libraries/controllers/StructureController.class.php:1344
-#: libraries/controllers/StructureController.class.php:2223
-#: libraries/controllers/StructureController.class.php:2232
-#: libraries/controllers/StructureController.class.php:2237
-#: libraries/controllers/StructureController.class.php:2242
-#: libraries/controllers/StructureController.class.php:2247
+#: libraries/config/FormDisplay.tpl.php:272
+#: libraries/controllers/TableStructureController.class.php:539
+#: libraries/controllers/TableStructureController.class.php:1201
+#: libraries/controllers/TableStructureController.class.php:1210
+#: libraries/controllers/TableStructureController.class.php:1215
+#: libraries/controllers/TableStructureController.class.php:1220
+#: libraries/controllers/TableStructureController.class.php:1225
 #: libraries/mult_submits.inc.php:82 libraries/mult_submits.inc.php:178
 #: libraries/mult_submits.lib.php:339 libraries/mult_submits.lib.php:372
 #: libraries/mult_submits.lib.php:401 libraries/mult_submits.lib.php:415
@@ -216,8 +217,8 @@ msgstr "ना"
 #: libraries/plugins/export/ExportOdt.class.php:756
 #: libraries/plugins/export/ExportTexytext.class.php:567
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1077
-#: libraries/server_databases.lib.php:464
-#: libraries/server_databases.lib.php:474
+#: libraries/server_databases.lib.php:475
+#: libraries/server_databases.lib.php:485
 #: libraries/server_privileges.lib.php:2546
 #: libraries/server_privileges.lib.php:2727
 #: libraries/server_privileges.lib.php:2748
@@ -227,7 +228,7 @@ msgstr "ना"
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1008 libraries/tracking.lib.php:1013
 #: prefs_manage.php:138 templates/prefs_autoload.phtml:14
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "Yes"
 msgstr "हाँ"
 
@@ -237,7 +238,7 @@ msgstr "डेटाबेस का डंप (स्कीमा) दिखा
 
 #: db_export.php:37 db_tracking.php:90 export.php:382
 #: libraries/DBQbe.class.php:326
-#: libraries/controllers/StructureController.class.php:231
+#: libraries/controllers/DatabaseStructureController.class.php:170
 #: libraries/navigation/NavigationTree.class.php:897
 msgid "No tables found in database."
 msgstr "डाटाबेस में कोई टेबल नहीं।"
@@ -248,14 +249,14 @@ msgstr "डाटाबेस में कोई टेबल नहीं।"
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:26
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:120
-#: templates/structure/show_create.phtml:18
+#: templates/database/structure/show_create.phtml:18
 msgid "Tables"
 msgstr "टेबल"
 
 #: db_export.php:52 libraries/Menu.class.php:317 libraries/Menu.class.php:425
-#: libraries/Util.class.php:3333 libraries/Util.class.php:3343
-#: libraries/Util.class.php:3349 libraries/Util.class.php:3629
-#: libraries/Util.class.php:4327 libraries/Util.class.php:4344
+#: libraries/Util.class.php:3339 libraries/Util.class.php:3349
+#: libraries/Util.class.php:3355 libraries/Util.class.php:3635
+#: libraries/Util.class.php:4333 libraries/Util.class.php:4350
 #: libraries/central_columns.lib.php:728 libraries/config.values.php:39
 #: libraries/config.values.php:47 libraries/config.values.php:109
 #: libraries/config.values.php:115 libraries/config/setup.forms.php:323
@@ -269,7 +270,7 @@ msgstr "टेबल"
 #: libraries/navigation/Nodes/Node_Table.class.php:283
 #: libraries/server_privileges.lib.php:1141 libraries/tracking.lib.php:874
 #: templates/columns_definitions/table_fields_definitions.phtml:3
-#: templates/designer/table_list.phtml:28
+#: templates/database/designer/table_list.phtml:28
 msgid "Structure"
 msgstr "संरचना"
 
@@ -281,7 +282,7 @@ msgstr "संरचना"
 #: libraries/config/user_preferences.forms.php:292
 #: libraries/config/user_preferences.forms.php:297
 #: libraries/server_privileges.lib.php:1140
-#: templates/structure/display_table_stats.phtml:12
+#: templates/table/structure/display_table_stats.phtml:12
 msgid "Data"
 msgstr "डाटा"
 
@@ -358,10 +359,10 @@ msgstr "ट्रैक की गयी टेबलएं"
 #: libraries/server_privileges.lib.php:2908
 #: libraries/server_privileges.lib.php:3145
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4346
-#: templates/structure/table_header.phtml:21
-#: templates/tbl_relation/foreign_key_row.phtml:176
-#: templates/tbl_relation/internal_relational_row.phtml:63
+#: libraries/server_privileges.lib.php:4372
+#: templates/database/structure/table_header.phtml:21
+#: templates/table/relation/foreign_key_row.phtml:176
+#: templates/table/relation/internal_relational_row.phtml:63
 msgid "Table"
 msgstr "टेबल"
 
@@ -378,7 +379,7 @@ msgid "Updated"
 msgstr "अद्यतन"
 
 #: db_tracking.php:130 js/messages.php:243 libraries/Menu.class.php:552
-#: libraries/Util.class.php:4314 libraries/config.values.php:104
+#: libraries/Util.class.php:4320 libraries/config.values.php:104
 #: libraries/rte/rte_events.lib.php:393 libraries/rte/rte_list.lib.php:101
 #: libraries/server_status_processes.lib.php:92 libraries/tracking.lib.php:279
 msgid "Status"
@@ -387,14 +388,15 @@ msgstr "स्थिति"
 #: db_tracking.php:131 db_tracking.php:290 libraries/Index.class.php:693
 #: libraries/central_columns.lib.php:687 libraries/rte/rte_list.lib.php:74
 #: libraries/rte/rte_list.lib.php:89 libraries/rte/rte_list.lib.php:102
-#: libraries/server_databases.lib.php:398
+#: libraries/server_databases.lib.php:409
 #: libraries/server_privileges.lib.php:2372
 #: libraries/server_privileges.lib.php:3166
 #: libraries/server_privileges.lib.php:3342
 #: libraries/server_user_groups.lib.php:82
 #: libraries/server_variables.lib.php:189 libraries/tracking.lib.php:280
-#: libraries/tracking.lib.php:793 templates/structure/table_header.phtml:30
-#: templates/structure/table_structure_header.phtml:23
+#: libraries/tracking.lib.php:793
+#: templates/database/structure/table_header.phtml:30
+#: templates/table/structure/table_structure_header.phtml:23
 msgid "Action"
 msgstr "कार्य"
 
@@ -438,7 +440,7 @@ msgid "Untracked tables"
 msgstr "लापता टेबलएं"
 
 #: db_tracking.php:305 db_tracking.php:336
-#: templates/structure/optional_action_links.phtml:17
+#: templates/table/structure/optional_action_links.phtml:17
 msgid "Track table"
 msgstr "टेबलओं को ट्रैक करें"
 
@@ -491,7 +493,7 @@ msgid "Value for the column \"%s\""
 msgstr "\"%s\" काँलम के लिए मूल्य"
 
 #: gis_data_editor.php:146
-#: templates/gis_visualization/gis_visualization.phtml:37
+#: templates/table/gis_visualization/gis_visualization.phtml:37
 msgid "Use OpenStreetMaps as Base Layer"
 msgstr "बेस परत के रूप में OpenStreetMaps का प्रयोग करें"
 
@@ -571,35 +573,35 @@ msgstr "ज्यामिति जोडें"
 #: libraries/display_change_password.lib.php:162
 #: libraries/display_export.lib.php:402 libraries/display_export.lib.php:408
 #: libraries/display_import.lib.php:392 libraries/index.lib.php:44
-#: libraries/insert_edit.lib.php:1546 libraries/insert_edit.lib.php:1583
+#: libraries/insert_edit.lib.php:1544 libraries/insert_edit.lib.php:1581
 #: libraries/normalization.lib.php:165 libraries/normalization.lib.php:821
 #: libraries/operations.lib.php:38 libraries/operations.lib.php:108
 #: libraries/operations.lib.php:263 libraries/operations.lib.php:306
 #: libraries/operations.lib.php:801 libraries/operations.lib.php:874
 #: libraries/operations.lib.php:923 libraries/operations.lib.php:1337
 #: libraries/operations.lib.php:1658
-#: libraries/plugins/auth/AuthenticationCookie.class.php:244
+#: libraries/plugins/auth/AuthenticationCookie.class.php:232
 #: libraries/replication_gui.lib.php:122 libraries/replication_gui.lib.php:161
 #: libraries/replication_gui.lib.php:324 libraries/replication_gui.lib.php:461
 #: libraries/replication_gui.lib.php:906 libraries/rte/rte_events.lib.php:509
-#: libraries/rte/rte_routines.lib.php:969
-#: libraries/rte/rte_routines.lib.php:1581
+#: libraries/rte/rte_routines.lib.php:1060
+#: libraries/rte/rte_routines.lib.php:1672
 #: libraries/rte/rte_triggers.lib.php:396 libraries/server_bin_log.lib.php:61
 #: libraries/server_privileges.lib.php:705
 #: libraries/server_privileges.lib.php:2106
 #: libraries/server_privileges.lib.php:2872
 #: libraries/server_privileges.lib.php:3553
-#: libraries/server_privileges.lib.php:4627
+#: libraries/server_privileges.lib.php:4653
 #: libraries/server_user_groups.lib.php:285
 #: libraries/sql_query_form.lib.php:369 libraries/sql_query_form.lib.php:429
 #: libraries/tracking.lib.php:533 libraries/tracking.lib.php:653
 #: prefs_manage.php:277 prefs_manage.php:355
 #: templates/columns_definitions/column_definitions_form.phtml:59
-#: templates/header_location.phtml:17 templates/index_form.phtml:238
+#: templates/database/create_table.phtml:21 templates/header_location.phtml:28
 #: templates/startAndNumberOfRowsPanel.phtml:14
-#: templates/structure/add_column.phtml:25
-#: templates/table/create_table.phtml:21
-#: templates/table/selection_form.phtml:75 view_create.php:275
+#: templates/table/index_form.phtml:238
+#: templates/table/search/selection_form.phtml:75
+#: templates/table/structure/add_column.phtml:25 view_create.php:275
 #: view_operations.php:106
 msgid "Go"
 msgstr "जाएँ"
@@ -689,7 +691,7 @@ msgstr "फ़ाइल के अक्षर सेट को रूपां
 msgid "Could not load import plugins, please check your installation!"
 msgstr "आयात प्लगइन्स नहीं लोड किये जा सके। कृपया अपनी संस्थापना जाँचें!"
 
-#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1466
+#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1460
 #, php-format
 msgid "Bookmark %s has been created."
 msgstr "पृष्ठचिन्ह  %s बनाया."
@@ -729,11 +731,11 @@ msgstr ""
 msgid "Back"
 msgstr "वापस"
 
-#: index.php:148 libraries/Footer.class.php:70
+#: index.php:149 libraries/Footer.class.php:70
 msgid "phpMyAdmin Demo Server"
 msgstr "phpMyAdmin डेमो सर्वर"
 
-#: index.php:152
+#: index.php:153
 #, php-format
 msgid ""
 "You are using the demo server. You can do anything here, but please do not "
@@ -743,118 +745,118 @@ msgstr ""
 "आप डेमो सर्वर का प्रयोग कर रहे हैं। आप यहाँ कुछ भी कर सकते हैं, लेकिन root, debian-sys-"
 "maint और pma उपयोगकर्ताओं को मत बदलें। अधिक जानकारी %s पर उपलब्ध है।"
 
-#: index.php:162
+#: index.php:163
 msgid "General Settings"
 msgstr "जनरल सेटिंग्स"
 
-#: index.php:190 libraries/display_change_password.lib.php:50
+#: index.php:191 libraries/display_change_password.lib.php:50
 #: libraries/display_change_password.lib.php:53 user_password.php:247
 msgid "Change password"
 msgstr "पासव्रड बदलिये"
 
-#: index.php:206
+#: index.php:207
 msgid "Server connection collation"
 msgstr "MySQL जोडणी मिलान"
 
-#: index.php:228
+#: index.php:229
 msgid "Appearance Settings"
 msgstr "उपस्थिति सेटिंग्स"
 
-#: index.php:258 prefs_manage.php:285
+#: index.php:259 prefs_manage.php:285
 msgid "More settings"
 msgstr "अधिक स्थापना"
 
-#: index.php:279
+#: index.php:280
 msgid "Database server"
 msgstr "डेटाबेस सर्वर"
 
-#: index.php:282 libraries/plugins/auth/AuthenticationCookie.class.php:181
+#: index.php:283 libraries/plugins/auth/AuthenticationCookie.class.php:169
 msgid "Server:"
 msgstr "सर्वर:"
 
-#: index.php:286
+#: index.php:287
 msgid "Server type:"
 msgstr "सर्वर प्रकार:"
 
-#: index.php:290 libraries/plugins/export/ExportLatex.class.php:212
+#: index.php:291 libraries/plugins/export/ExportLatex.class.php:212
 #: libraries/plugins/export/ExportSql.class.php:687
 #: libraries/plugins/export/ExportXml.class.php:189
 msgid "Server version:"
 msgstr "सर्वर संस्करण :"
 
-#: index.php:296
+#: index.php:297
 msgid "Protocol version:"
 msgstr "प्रोटोकॉल वर्ज़न:"
 
-#: index.php:300
+#: index.php:301
 msgid "User:"
 msgstr "उपयोगकर्ता :"
 
-#: index.php:305
+#: index.php:306
 #, fuzzy
 #| msgid "Server socket"
 msgid "Server charset:"
 msgstr "सर्वर गर्तिका"
 
-#: index.php:320
+#: index.php:321
 msgid "Web server"
 msgstr "वेब सर्वर"
 
-#: index.php:331
+#: index.php:332
 #, fuzzy
 #| msgid "Use light version"
 msgid "Database client version:"
 msgstr "सरल संस्करण का उपयोग"
 
-#: index.php:335
+#: index.php:336
 #, fuzzy
 #| msgid "PHP extension"
 msgid "PHP extension:"
 msgstr "PHPविस्तार"
 
-#: index.php:349
+#: index.php:350
 #, fuzzy
 #| msgid "Version"
 msgid "PHP version:"
 msgstr "संस्करण"
 
-#: index.php:360
+#: index.php:361
 msgid "Show PHP information"
 msgstr "PHP कि जानकारी दिखाओ"
 
-#: index.php:383
+#: index.php:384
 msgid "Version information:"
 msgstr "संस्करण की जानकारी:"
 
-#: index.php:392 libraries/Util.class.php:432 libraries/Util.class.php:495
-#: libraries/config/FormDisplay.tpl.php:151
+#: index.php:393 libraries/Util.class.php:432 libraries/Util.class.php:495
+#: libraries/config/FormDisplay.tpl.php:162
 #: libraries/display_export.lib.php:577 libraries/engines/pbxt.lib.php:162
 #: libraries/navigation/NavigationHeader.class.php:196
 #: libraries/server_variables.lib.php:160
 msgid "Documentation"
 msgstr "प्रलेखन"
 
-#: index.php:399
+#: index.php:400
 msgid "Wiki"
 msgstr "Wiki"
 
-#: index.php:408
+#: index.php:409
 msgid "Official Homepage"
 msgstr "आधिकारिक होमपेज"
 
-#: index.php:415
+#: index.php:416
 msgid "Contribute"
 msgstr "योगदान"
 
-#: index.php:422
+#: index.php:423
 msgid "Get support"
 msgstr "समर्थन पाएं"
 
-#: index.php:429
+#: index.php:430
 msgid "List of changes"
 msgstr "परिवर्तनों की सूची"
 
-#: index.php:451
+#: index.php:452
 msgid ""
 "You are connected as 'root' with no password, which corresponds to the "
 "default MySQL privileged account. Your MySQL server is running with this "
@@ -862,7 +864,7 @@ msgid ""
 "by setting a password for user 'root'."
 msgstr ""
 
-#: index.php:468
+#: index.php:469
 msgid ""
 "You have enabled mbstring.func_overload in your PHP configuration. This "
 "option is incompatible with phpMyAdmin and might cause some data to be "
@@ -871,7 +873,7 @@ msgstr ""
 "आपने PHP विन्यास में mbstring.func_overload को सक्षम किया है। यह विकल्प phpMyAdmin "
 "के साथ असंगत है और इसकी वजह से कुछ डाटा भ्रष्ट हो सकता है!"
 
-#: index.php:483
+#: index.php:484
 msgid ""
 "The mbstring PHP extension was not found and you seem to be using a "
 "multibyte charset. Without the mbstring extension phpMyAdmin is unable to "
@@ -881,7 +883,7 @@ msgstr ""
 "रहे हैं। Mbstring विस्तार के बिना phpMyAdmin सही ढंग से string को विभाजित करने में "
 "असमर्थ है और इसके अप्रत्याशित परिणाम हो सकते हैं।"
 
-#: index.php:500
+#: index.php:501
 msgid ""
 "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini."
 "session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower than "
@@ -889,17 +891,17 @@ msgid ""
 "expire sooner than configured in phpMyAdmin."
 msgstr ""
 
-#: index.php:519
+#: index.php:520
 msgid ""
 "Login cookie store is lower than cookie validity configured in phpMyAdmin, "
 "because of this, your login will expire sooner than configured in phpMyAdmin."
 msgstr ""
 
-#: index.php:535
+#: index.php:536
 msgid "The configuration file now needs a secret passphrase (blowfish_secret)."
 msgstr ""
 
-#: index.php:548
+#: index.php:549
 msgid ""
 "Directory [code]config[/code], which is used by the setup script, still "
 "exists in your phpMyAdmin directory. It is strongly recommended to remove it "
@@ -911,7 +913,7 @@ msgstr ""
 "हो जाये उसे मिटा दे। वर्ना अनधिकृत लोग जो आपका कॉन्फ़िगरेशन डाउनलोड करेंगे उनसे आपकी "
 "सर्वर की सुरक्षा खतरेमे आ सकती है।"
 
-#: index.php:564
+#: index.php:565
 #, fuzzy, php-format
 #| msgid ""
 #| "ditional features for working with linked tables have been ctivated. To d "
@@ -923,19 +925,19 @@ msgstr ""
 "लिंक्ड टेबलओं के साथ काम करने के लिए अतिरिक्त सुविधाओं को निष्क्रिय कर दिया गया है. क्यों ये "
 "किया गया है, जानने के लिए %shere%s पर क्लिक करें."
 
-#: index.php:571
+#: index.php:572
 msgid ""
 "Or alternately go to 'Operations' tab of any database to set it up there."
 msgstr ""
 
-#: index.php:620
+#: index.php:621
 #, php-format
 msgid ""
 "Your PHP MySQL library version %s differs from your MySQL server version %s. "
 "This may cause unpredictable behavior."
 msgstr ""
 
-#: index.php:648
+#: index.php:649
 #, php-format
 msgid ""
 "Server running with Suhosin. Please refer to %sdocumentation%s for possible "
@@ -1108,8 +1110,8 @@ msgstr ""
 msgid "Save & Close"
 msgstr "फ़ाइल के रूप में सहेजें"
 
-#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:404
-#: libraries/insert_edit.lib.php:1550 prefs_manage.php:361
+#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:415
+#: libraries/insert_edit.lib.php:1548 prefs_manage.php:361
 #: prefs_manage.php:372
 msgid "Reset"
 msgstr "रीसेट"
@@ -1150,7 +1152,7 @@ msgstr "अनुक्रमणिका जोड़ें"
 msgid "Edit Index"
 msgstr "अनुक्रमणिका सम्पादित करें"
 
-#: js/messages.php:99 templates/index_form.phtml:232
+#: js/messages.php:99 templates/table/index_form.phtml:232
 #, fuzzy, php-format
 #| msgid "Add %s field(s)"
 msgid "Add %s column(s) to index"
@@ -1180,15 +1182,16 @@ msgstr "कोलम के नाम"
 msgid "Please select column(s) for the index."
 msgstr "%s क्षेत्र जोडें"
 
-#: js/messages.php:106 templates/structure/add_column.phtml:1
+#: js/messages.php:106 templates/table/structure/add_column.phtml:1
 #, fuzzy
 #| msgid "You have to choose at least one column to display"
 msgid "You have to add at least one column."
 msgstr "आपको कम से कम एक स्तंभ प्रदर्शित करने के लिए चयन करना है."
 
-#: js/messages.php:109 libraries/insert_edit.lib.php:1548
+#: js/messages.php:109 libraries/insert_edit.lib.php:1546
 #: templates/columns_definitions/column_definitions_form.phtml:162
-#: templates/index_form.phtml:237 templates/tbl_relation/common_form.phtml:106
+#: templates/table/index_form.phtml:237
+#: templates/table/relation/common_form.phtml:106
 msgid "Preview SQL"
 msgstr ""
 
@@ -1211,7 +1214,7 @@ msgid "SQL query:"
 msgstr "SQL क्वरी"
 
 #. l10n: Default label for the y-Axis of Charts
-#: js/messages.php:118 templates/tbl_chart.phtml:109
+#: js/messages.php:118 templates/table/chart/tbl_chart.phtml:109
 #, fuzzy
 #| msgid "Value"
 msgid "Y Values"
@@ -1375,7 +1378,7 @@ msgstr "बाइट भेजे गए"
 msgid "Bytes received"
 msgstr "बाइट प्राप्त हुए"
 
-#: js/messages.php:169 libraries/server_status.lib.php:226
+#: js/messages.php:169 libraries/server_status.lib.php:235
 msgid "Connections"
 msgstr "कनेक्शन"
 
@@ -1432,12 +1435,12 @@ msgstr "%d टेबल"
 msgid "Questions"
 msgstr "प्रश्न"
 
-#: js/messages.php:184 libraries/server_status.lib.php:134
+#: js/messages.php:184 libraries/server_status.lib.php:143
 msgid "Traffic"
 msgstr "व्यस्तता"
 
 #: js/messages.php:185 libraries/Menu.class.php:586
-#: libraries/Util.class.php:4318 libraries/server_status_monitor.lib.php:257
+#: libraries/Util.class.php:4324 libraries/server_status_monitor.lib.php:257
 msgid "Settings"
 msgstr "सेटिंग्स"
 
@@ -1459,8 +1462,9 @@ msgstr "कृपया, श्रृंखला में कम से कम
 #: libraries/server_status_monitor.lib.php:236
 #: libraries/server_status_processes.lib.php:308
 #: templates/columns_definitions/transformation.phtml:4
-#: templates/designer/options_panel.phtml:178
-#: templates/table/options_zoom.phtml:12 templates/table/rows_zoom.phtml:26
+#: templates/database/designer/options_panel.phtml:178
+#: templates/table/search/options_zoom.phtml:12
+#: templates/table/search/rows_zoom.phtml:26
 msgid "None"
 msgstr "कुछ नहीं"
 
@@ -1757,8 +1761,8 @@ msgstr ""
 
 #: js/messages.php:270 libraries/Menu.class.php:352
 #: libraries/Menu.class.php:455 libraries/Menu.class.php:582
-#: libraries/Util.class.php:4317 libraries/Util.class.php:4332
-#: libraries/Util.class.php:4349 libraries/config/messages.inc.php:258
+#: libraries/Util.class.php:4323 libraries/Util.class.php:4338
+#: libraries/Util.class.php:4355 libraries/config/messages.inc.php:258
 #: libraries/display_import.lib.php:105
 #: libraries/server_status_monitor.lib.php:318 prefs_manage.php:238
 #: setup/frames/menu.inc.php:26
@@ -1820,13 +1824,13 @@ msgid "Formatting SQL..."
 msgstr ""
 
 #: js/messages.php:293 libraries/server_variables.lib.php:157
-#: templates/designer/aggregate_query_panel.phtml:63
-#: templates/designer/delete_relation_panel.phtml:28
-#: templates/designer/having_query_panel.phtml:117
-#: templates/designer/new_relation_panel.phtml:88
-#: templates/designer/options_panel.phtml:253
-#: templates/designer/rename_to_panel.phtml:45
-#: templates/designer/where_query_panel.phtml:83
+#: templates/database/designer/aggregate_query_panel.phtml:63
+#: templates/database/designer/delete_relation_panel.phtml:28
+#: templates/database/designer/having_query_panel.phtml:117
+#: templates/database/designer/new_relation_panel.phtml:88
+#: templates/database/designer/options_panel.phtml:253
+#: templates/database/designer/rename_to_panel.phtml:45
+#: templates/database/designer/where_query_panel.phtml:83
 msgid "Cancel"
 msgstr "रद्द"
 
@@ -1836,7 +1840,7 @@ msgstr "रद्द"
 msgid "Page-related settings"
 msgstr "सेटिंग्स बदलें"
 
-#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:402
+#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:413
 msgid "Apply"
 msgstr ""
 
@@ -1871,8 +1875,8 @@ msgstr ""
 msgid "Error text: %s"
 msgstr ""
 
-#: js/messages.php:307 libraries/db_common.inc.php:68
-#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:450
+#: js/messages.php:307 libraries/db_common.inc.php:69
+#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:461
 msgid "No databases selected."
 msgstr "कोइ डाटाबेस नहीं चुना गया है।"
 
@@ -1884,12 +1888,13 @@ msgstr "कॉलम को हटाया जाना"
 msgid "Adding Primary Key"
 msgstr "प्राथमिक कुञ्जी जोड़ना"
 
-#: js/messages.php:310 templates/designer/aggregate_query_panel.phtml:59
-#: templates/designer/having_query_panel.phtml:113
-#: templates/designer/new_relation_panel.phtml:87
-#: templates/designer/options_panel.phtml:252
-#: templates/designer/rename_to_panel.phtml:41
-#: templates/designer/where_query_panel.phtml:82
+#: js/messages.php:310
+#: templates/database/designer/aggregate_query_panel.phtml:59
+#: templates/database/designer/having_query_panel.phtml:113
+#: templates/database/designer/new_relation_panel.phtml:87
+#: templates/database/designer/options_panel.phtml:252
+#: templates/database/designer/rename_to_panel.phtml:41
+#: templates/database/designer/where_query_panel.phtml:82
 msgid "OK"
 msgstr "ठीक है"
 
@@ -1909,7 +1914,7 @@ msgstr "डॅटाबेस प्रतिलिपिकरण"
 msgid "Changing Charset"
 msgstr "वर्ण समूह बदलाव"
 
-#: js/messages.php:320 libraries/Util.class.php:3217
+#: js/messages.php:320 libraries/Util.class.php:3223
 #, fuzzy
 #| msgid "Disable foreign key checks"
 msgid "Enable foreign key checks"
@@ -1948,20 +1953,21 @@ msgstr "एक संगृहीत फंक्शन की परिभा
 #: js/messages.php:334 libraries/DisplayResults.class.php:4834
 #: libraries/DisplayResults.class.php:5092 libraries/Menu.class.php:344
 #: libraries/Menu.class.php:446 libraries/Menu.class.php:578
-#: libraries/Util.class.php:3636 libraries/Util.class.php:3637
-#: libraries/Util.class.php:4316 libraries/Util.class.php:4331
-#: libraries/Util.class.php:4348 libraries/config/messages.inc.php:252
+#: libraries/Util.class.php:3642 libraries/Util.class.php:3643
+#: libraries/Util.class.php:4322 libraries/Util.class.php:4337
+#: libraries/Util.class.php:4354 libraries/config/messages.inc.php:252
 #: libraries/display_export.lib.php:173 libraries/rte/rte_list.lib.php:146
 #: libraries/server_privileges.lib.php:2211
 #: libraries/server_privileges.lib.php:2290
 #: libraries/server_privileges.lib.php:2632
 #: libraries/server_privileges.lib.php:3356
 #: libraries/server_status_monitor.lib.php:322 prefs_manage.php:303
-#: setup/frames/menu.inc.php:27 templates/structure/check_all_tables.phtml:11
+#: setup/frames/menu.inc.php:27
+#: templates/database/structure/check_all_tables.phtml:11
 msgid "Export"
 msgstr "निर्यात"
 
-#: js/messages.php:337 libraries/rte/rte_routines.lib.php:652
+#: js/messages.php:337 libraries/rte/rte_routines.lib.php:743
 msgid "ENUM/SET editor"
 msgstr ""
 
@@ -2002,7 +2008,7 @@ msgstr "क्वॅरी बॉक्स दिखाएँ"
 #: libraries/Console.class.php:214 libraries/DisplayResults.class.php:3474
 #: libraries/DisplayResults.class.php:4818 libraries/Index.class.php:723
 #: libraries/Util.class.php:706 libraries/Util.class.php:1202
-#: libraries/Util.class.php:3634 libraries/Util.class.php:3635
+#: libraries/Util.class.php:3640 libraries/Util.class.php:3641
 #: libraries/central_columns.lib.php:851
 #: libraries/central_columns.lib.php:1193
 #: libraries/config/messages.inc.php:892
@@ -2020,7 +2026,7 @@ msgstr "सम्पादन"
 #: libraries/server_user_groups.lib.php:129
 #: libraries/sql_query_form.lib.php:416 libraries/tracking.lib.php:477
 #: setup/frames/index.inc.php:183 setup/frames/index.inc.php:291
-#: templates/designer/delete_relation_panel.phtml:27
+#: templates/database/designer/delete_relation_panel.phtml:27
 msgid "Delete"
 msgstr "मिटाएँ"
 
@@ -2204,11 +2210,11 @@ msgid "No dependencies selected!"
 msgstr "कोइ डाटाबेस नहीं चुना गया है।"
 
 #: js/messages.php:394 libraries/central_columns.lib.php:1214
-#: libraries/insert_edit.lib.php:1458 libraries/server_variables.lib.php:155
+#: libraries/insert_edit.lib.php:1456 libraries/server_variables.lib.php:155
 #: setup/frames/config.inc.php:42 setup/frames/index.inc.php:279
 #: templates/columns_definitions/column_definitions_form.phtml:165
-#: templates/gis_visualization/gis_visualization.phtml:48
-#: templates/tbl_relation/common_form.phtml:107
+#: templates/table/gis_visualization/gis_visualization.phtml:48
+#: templates/table/relation/common_form.phtml:107
 msgid "Save"
 msgstr "सुरक्षित करें"
 
@@ -2299,8 +2305,8 @@ msgid "Data point content"
 msgstr "डॅटा बिन्दु सामग्री"
 
 #: js/messages.php:430 js/messages.php:562 js/messages.php:579
-#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2573
-#: templates/index_form.phtml:154 templates/index_form.phtml:194
+#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2571
+#: templates/table/index_form.phtml:154 templates/table/index_form.phtml:194
 msgid "Ignore"
 msgstr "उपेक्षा करें"
 
@@ -2365,8 +2371,8 @@ msgstr "परदेशी कुंजी का चयन करें"
 msgid "Please select the primary key or a unique key!"
 msgstr "कृपया प्राथमिक कुंजी या एक अद्वितीय कुंजी का चयन करें"
 
-#: js/messages.php:457 templates/designer/side_menu.phtml:91
-#: templates/designer/side_menu.phtml:94
+#: js/messages.php:457 templates/database/designer/side_menu.phtml:91
+#: templates/database/designer/side_menu.phtml:94
 msgid "Choose column to display"
 msgstr "प्रदर्शित करने के लिए काँलम चुनें"
 
@@ -2384,22 +2390,22 @@ msgstr ""
 msgid "Page name"
 msgstr "पृष्ठ नाम:"
 
-#: js/messages.php:463 templates/designer/side_menu.phtml:56
-#: templates/designer/side_menu.phtml:59
+#: js/messages.php:463 templates/database/designer/side_menu.phtml:56
+#: templates/database/designer/side_menu.phtml:59
 #, fuzzy
 #| msgid "Select Tables"
 msgid "Save page"
 msgstr "पेज चुनिये"
 
-#: js/messages.php:464 templates/designer/side_menu.phtml:63
-#: templates/designer/side_menu.phtml:66
+#: js/messages.php:464 templates/database/designer/side_menu.phtml:63
+#: templates/database/designer/side_menu.phtml:66
 #, fuzzy
 #| msgid "Select Tables"
 msgid "Save page as"
 msgstr "पेज चुनिये"
 
-#: js/messages.php:465 templates/designer/side_menu.phtml:49
-#: templates/designer/side_menu.phtml:52
+#: js/messages.php:465 templates/database/designer/side_menu.phtml:49
+#: templates/database/designer/side_menu.phtml:52
 #, fuzzy
 #| msgid "Free pages"
 msgid "Open page"
@@ -2411,7 +2417,7 @@ msgstr "मुक्त पृष्ठों"
 msgid "Delete page"
 msgstr "पेज चुनिये"
 
-#: js/messages.php:467 templates/designer/side_menu.phtml:10
+#: js/messages.php:467 templates/database/designer/side_menu.phtml:10
 #, fuzzy
 #| msgid "Unit"
 msgid "Untitled"
@@ -2549,7 +2555,7 @@ msgstr "मूल स्थिति"
 msgid "cancel"
 msgstr "रद्द"
 
-#: js/messages.php:499 libraries/server_status.lib.php:271
+#: js/messages.php:499 libraries/server_status.lib.php:280
 msgid "Aborted"
 msgstr "रद्द"
 
@@ -3177,7 +3183,7 @@ msgstr "वैध पोर्ट नहीं एक"
 
 #: js/messages.php:793 libraries/Message.class.php:199
 #: libraries/Util.class.php:654 libraries/core.lib.php:245
-#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1172
+#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1170
 #: tbl_operations.php:229 view_operations.php:63
 msgid "Error"
 msgstr "त्रुटि"
@@ -3237,8 +3243,8 @@ msgstr "प्रति सेकंड"
 msgid "per minute"
 msgstr "प्रति मिनट"
 
-#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:143
-#: libraries/server_status.lib.php:228
+#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:152
+#: libraries/server_status.lib.php:237
 #: libraries/server_status_queries.lib.php:98
 msgid "per hour"
 msgstr "प्रति घंटा"
@@ -3256,7 +3262,7 @@ msgstr ""
 msgid "Wrong permissions on configuration file, should not be world writable!"
 msgstr ""
 
-#: libraries/Config.class.php:1799
+#: libraries/Config.class.php:1801
 msgid "Font size"
 msgstr "फ़ॉन्ट का आकार"
 
@@ -3286,10 +3292,10 @@ msgstr "उप-क्वरी"
 #: libraries/server_privileges.lib.php:2890
 #: libraries/server_privileges.lib.php:3144
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4332
+#: libraries/server_privileges.lib.php:4358
 #: libraries/server_status_processes.lib.php:80
-#: templates/tbl_relation/foreign_key_row.phtml:165
-#: templates/tbl_relation/internal_relational_row.phtml:55
+#: templates/table/relation/foreign_key_row.phtml:165
+#: templates/table/relation/internal_relational_row.phtml:55
 msgid "Database"
 msgstr "डाटाबेस"
 
@@ -3400,11 +3406,11 @@ msgstr "SQL- इतिहास"
 #: libraries/plugins/import/ImportMediawiki.class.php:60
 #: libraries/plugins/import/ImportOds.class.php:59
 #: libraries/plugins/import/ImportShp.class.php:57
-#: libraries/plugins/import/ImportSql.class.php:148
+#: libraries/plugins/import/ImportSql.class.php:51
 #: libraries/plugins/import/ImportXml.class.php:58
-#: libraries/rte/rte_routines.lib.php:833 templates/index_form.phtml:49
-#: templates/structure/row_stats_table.phtml:20
-#: templates/table/options.phtml:2
+#: libraries/rte/rte_routines.lib.php:924 templates/table/index_form.phtml:49
+#: templates/table/search/options.phtml:2
+#: templates/table/structure/row_stats_table.phtml:20
 msgid "Options"
 msgstr "विकल्प"
 
@@ -3447,7 +3453,8 @@ msgstr "अवरोही"
 msgid "Order:"
 msgstr "अन्य"
 
-#: libraries/Console.class.php:289 templates/table/replace_preview.phtml:17
+#: libraries/Console.class.php:289
+#: templates/table/search/replace_preview.phtml:17
 #, fuzzy
 #| msgid "Column"
 msgid "Count"
@@ -3572,9 +3579,9 @@ msgstr "नकल की टेबल पर स्विच करें"
 #: libraries/operations.lib.php:794 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:191
-#: templates/structure/sortable_header.phtml:21
-#: templates/structure/sortable_header.phtml:38
-#: templates/table/options.phtml:68
+#: templates/database/structure/sortable_header.phtml:21
+#: templates/database/structure/sortable_header.phtml:38
+#: templates/table/search/options.phtml:68
 msgid "Ascending"
 msgstr "आरोही"
 
@@ -3584,13 +3591,14 @@ msgstr "आरोही"
 #: libraries/operations.lib.php:797 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:188
-#: templates/structure/sortable_header.phtml:26
-#: templates/structure/sortable_header.phtml:43
-#: templates/table/options.phtml:69
+#: templates/database/structure/sortable_header.phtml:26
+#: templates/database/structure/sortable_header.phtml:43
+#: templates/table/search/options.phtml:69
 msgid "Descending"
 msgstr "अवरोही"
 
-#: libraries/DBQbe.class.php:467 templates/table/search_and_replace.phtml:6
+#: libraries/DBQbe.class.php:467
+#: templates/table/search/search_and_replace.phtml:6
 #, fuzzy
 #| msgid "Column"
 msgid "Column:"
@@ -3773,12 +3781,12 @@ msgstr[0] "<i>%s</i> टेबल के अंदर %s मैच हैं."
 msgstr[1] "<i>%s</i> टेबल के अंदर %s मैच हैं."
 
 #: libraries/DbSearch.class.php:354 libraries/Menu.class.php:311
-#: libraries/Util.class.php:3337 libraries/Util.class.php:3347
-#: libraries/Util.class.php:3623 libraries/Util.class.php:3624
-#: libraries/Util.class.php:4343 libraries/config.values.php:43
+#: libraries/Util.class.php:3343 libraries/Util.class.php:3353
+#: libraries/Util.class.php:3629 libraries/Util.class.php:3630
+#: libraries/Util.class.php:4349 libraries/config.values.php:43
 #: libraries/config.values.php:51 libraries/config.values.php:119
 #: libraries/navigation/Nodes/Node_Table.class.php:295
-#: templates/structure/check_all_table_column.phtml:5
+#: templates/table/structure/check_all_table_column.phtml:5
 msgid "Browse"
 msgstr "ब्राउज़"
 
@@ -3795,7 +3803,8 @@ msgstr "डाटाबेस में खोजें"
 msgid "Words or values to search for (wildcard: \"%\"):"
 msgstr "शब्द अथवा वेल्यु जिसे सर्च करना है (wildcard: \"%\"):"
 
-#: libraries/DbSearch.class.php:401 templates/table/search_and_replace.phtml:1
+#: libraries/DbSearch.class.php:401
+#: templates/table/search/search_and_replace.phtml:1
 msgid "Find:"
 msgstr "खोजो:"
 
@@ -3847,16 +3856,16 @@ msgstr "फ़िल्टर"
 msgid "Search this table"
 msgstr "डाटाबेस में खोजें"
 
-#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2532
-#: libraries/Util.class.php:2535
+#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2538
+#: libraries/Util.class.php:2541
 #, fuzzy
 #| msgid "Begin"
 msgctxt "First page"
 msgid "Begin"
 msgstr "प्रारंभ"
 
-#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2533
-#: libraries/Util.class.php:2536 libraries/server_bin_log.lib.php:170
+#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2539
+#: libraries/Util.class.php:2542 libraries/server_bin_log.lib.php:170
 #: libraries/server_bin_log.lib.php:172
 #, fuzzy
 #| msgid "Previous"
@@ -3864,8 +3873,8 @@ msgctxt "Previous page"
 msgid "Previous"
 msgstr "पिछला"
 
-#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2564
-#: libraries/Util.class.php:2574 libraries/server_bin_log.lib.php:204
+#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2570
+#: libraries/Util.class.php:2580 libraries/server_bin_log.lib.php:204
 #: libraries/server_bin_log.lib.php:206
 #, fuzzy
 #| msgid "Next"
@@ -3873,8 +3882,8 @@ msgctxt "Next page"
 msgid "Next"
 msgstr "अगला"
 
-#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2565
-#: libraries/Util.class.php:2575
+#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2571
+#: libraries/Util.class.php:2581
 #, fuzzy
 #| msgid "End"
 msgctxt "Last page"
@@ -3957,9 +3966,9 @@ msgid "May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]."
 msgstr "शायद अनुमानित हैं. [doc@faq3-11]FAQ 3.11[/doc] देखें"
 
 #: libraries/DisplayResults.class.php:4332 libraries/Message.class.php:180
-#: libraries/controllers/TableRelationController.class.php:258
+#: libraries/controllers/TableRelationController.class.php:259
 #: libraries/controllers/TableSearchController.class.php:655
-#: libraries/rte/rte_routines.lib.php:1332 libraries/sql_query_form.lib.php:89
+#: libraries/rte/rte_routines.lib.php:1423 libraries/sql_query_form.lib.php:89
 #: tbl_operations.php:227 tbl_row_action.php:138 view_operations.php:62
 #, fuzzy
 #| msgid "Your SQL query has been executed successfully."
@@ -3967,7 +3976,7 @@ msgid "Your SQL query has been executed successfully."
 msgstr "आपकी SQL कुएरी सफलता के साथ पूरी की गई है"
 
 #: libraries/DisplayResults.class.php:4660
-#: libraries/controllers/StructureController.class.php:629
+#: libraries/controllers/DatabaseStructureController.class.php:564
 #, php-format
 msgid ""
 "This view has at least this number of rows. Please refer to %sdocumentation"
@@ -3991,34 +4000,34 @@ msgstr ""
 msgid "%d total"
 msgstr "कुल"
 
-#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1318
+#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1312
 #, fuzzy, php-format
 #| msgid "Query took %01.4f sec"
 msgid "Query took %01.4f seconds."
 msgstr "क्वरी को %01.4f सेकेंड का समय लगा"
 
 #: libraries/DisplayResults.class.php:4807
-#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4767
-#: libraries/Util.class.php:4773 libraries/mult_submits.inc.php:50
-#: templates/structure/check_all_tables.phtml:2
-#: templates/structure/check_all_tables.phtml:9
+#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4773
+#: libraries/Util.class.php:4779 libraries/mult_submits.inc.php:50
+#: templates/database/structure/check_all_tables.phtml:2
+#: templates/database/structure/check_all_tables.phtml:9
 msgid "With selected:"
 msgstr "चुने हुओं को:"
 
 #: libraries/DisplayResults.class.php:4811
-#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4769
-#: libraries/Util.class.php:4770 libraries/server_privileges.lib.php:1174
+#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4775
+#: libraries/Util.class.php:4776 libraries/server_privileges.lib.php:1174
 #: libraries/server_privileges.lib.php:1175
 #: libraries/server_privileges.lib.php:1387
 #: libraries/server_user_groups.lib.php:231
-#: templates/structure/check_all_tables.phtml:3
-#: templates/structure/check_all_tables.phtml:4
+#: templates/database/structure/check_all_tables.phtml:3
+#: templates/database/structure/check_all_tables.phtml:4
 msgid "Check All"
 msgstr "सभी को चेक करें"
 
 #: libraries/DisplayResults.class.php:4985 libraries/Header.class.php:383
-#: templates/structure/optional_action_links.phtml:1
-#: templates/structure/print_view_data_dictionary_link.phtml:3
+#: templates/database/structure/print_view_data_dictionary_link.phtml:3
+#: templates/table/structure/optional_action_links.phtml:1
 msgid "Print view"
 msgstr "छपाई द्रश्य"
 
@@ -4026,7 +4035,8 @@ msgstr "छपाई द्रश्य"
 msgid "Query results operations"
 msgstr ""
 
-#: libraries/DisplayResults.class.php:5105 templates/tbl_chart.phtml:12
+#: libraries/DisplayResults.class.php:5105
+#: templates/table/chart/tbl_chart.phtml:12
 #, fuzzy
 #| msgid "Display Features"
 msgid "Display chart"
@@ -4129,7 +4139,7 @@ msgid "Click on the bar to scroll to top of page"
 msgstr ""
 
 #: libraries/Header.class.php:749
-#: libraries/plugins/auth/AuthenticationCookie.class.php:152
+#: libraries/plugins/auth/AuthenticationCookie.class.php:140
 #, fuzzy
 #| msgid "Cookies must be enabled past this point."
 msgid "Javascript must be enabled past this point!"
@@ -4153,11 +4163,11 @@ msgid "Keyname"
 msgstr "मुख्यनाम"
 
 #: libraries/Index.class.php:697
-#: libraries/controllers/StructureController.class.php:1962
-#: libraries/controllers/StructureController.class.php:1967
+#: libraries/controllers/TableStructureController.class.php:953
+#: libraries/controllers/TableStructureController.class.php:958
 #: libraries/tracking.lib.php:973
 #: templates/columns_definitions/column_indexes.phtml:11
-#: templates/structure/check_all_table_column.phtml:26
+#: templates/table/structure/check_all_table_column.phtml:26
 msgid "Unique"
 msgstr "अद्वितीय"
 
@@ -4176,16 +4186,17 @@ msgstr "प्रमुखता"
 #: libraries/server_collations.lib.php:35 libraries/tracking.lib.php:881
 #: libraries/tracking.lib.php:977
 #: templates/columns_definitions/table_fields_definitions.phtml:33
-#: templates/structure/row_stats_table.phtml:31
-#: templates/structure/table_header.phtml:55
-#: templates/structure/table_structure_header.phtml:7
-#: templates/table/table_header.phtml:8
+#: templates/database/structure/table_header.phtml:55
+#: templates/table/search/table_header.phtml:8
+#: templates/table/structure/row_stats_table.phtml:31
+#: templates/table/structure/table_structure_header.phtml:7
 msgid "Collation"
 msgstr "क्रम में करें"
 
 #: libraries/Index.class.php:703 libraries/rte/rte_events.lib.php:496
-#: libraries/rte/rte_routines.lib.php:956 libraries/tracking.lib.php:885
-#: libraries/tracking.lib.php:979 templates/structure/table_header.phtml:84
+#: libraries/rte/rte_routines.lib.php:1047 libraries/tracking.lib.php:885
+#: libraries/tracking.lib.php:979
+#: templates/database/structure/table_header.phtml:84
 msgid "Comment"
 msgstr "टिप्पणी"
 
@@ -4198,15 +4209,15 @@ msgstr "प्राथमिक कुंजी गिरा दी गयी 
 msgid "Index %s has been dropped."
 msgstr "सूचकांक %s गिरा दिया गया है."
 
-#: libraries/Index.class.php:757 libraries/Util.class.php:3630
-#: libraries/Util.class.php:3631
-#: libraries/controllers/StructureController.class.php:1958
-#: libraries/controllers/StructureController.class.php:1959
+#: libraries/Index.class.php:757 libraries/Util.class.php:3636
+#: libraries/Util.class.php:3637
+#: libraries/controllers/TableStructureController.class.php:949
+#: libraries/controllers/TableStructureController.class.php:950
 #: libraries/operations.lib.php:1607 libraries/rte/rte_list.lib.php:150
 #: libraries/server_databases.lib.php:146
-#: templates/structure/check_all_table_column.phtml:15
-#: templates/structure/check_all_tables.phtml:16
-#: templates/tbl_relation/foreign_key_row.phtml:93
+#: templates/database/structure/check_all_tables.phtml:16
+#: templates/table/relation/foreign_key_row.phtml:93
+#: templates/table/structure/check_all_table_column.phtml:15
 msgid "Drop"
 msgstr "रद्द"
 
@@ -4235,16 +4246,16 @@ msgstr "सर्वर"
 #: libraries/Menu.class.php:248
 #: libraries/navigation/Nodes/Node_View.class.php:32
 #: libraries/tbl_info.inc.php:63
-#: templates/structure/structure_table_row.phtml:97
-#: templates/structure/structure_table_row.phtml:159
+#: templates/database/structure/structure_table_row.phtml:97
+#: templates/database/structure/structure_table_row.phtml:159
 msgid "View"
 msgstr "दृश्य"
 
 #: libraries/Menu.class.php:325 libraries/Menu.class.php:429
-#: libraries/Menu.class.php:548 libraries/Util.class.php:3334
-#: libraries/Util.class.php:3344 libraries/Util.class.php:3350
-#: libraries/Util.class.php:4313 libraries/Util.class.php:4328
-#: libraries/Util.class.php:4345 libraries/config.values.php:40
+#: libraries/Menu.class.php:548 libraries/Util.class.php:3340
+#: libraries/Util.class.php:3350 libraries/Util.class.php:3356
+#: libraries/Util.class.php:4319 libraries/Util.class.php:4334
+#: libraries/Util.class.php:4351 libraries/config.values.php:40
 #: libraries/config.values.php:48 libraries/config.values.php:110
 #: libraries/config.values.php:116 libraries/config/messages.inc.php:321
 #: libraries/navigation/Nodes/Node_Table.class.php:292
@@ -4252,19 +4263,19 @@ msgid "SQL"
 msgstr "SQL"
 
 #: libraries/Menu.class.php:328 libraries/Menu.class.php:432
-#: libraries/Util.class.php:3335 libraries/Util.class.php:3345
-#: libraries/Util.class.php:3351 libraries/Util.class.php:3625
-#: libraries/Util.class.php:3626 libraries/Util.class.php:4329
-#: libraries/Util.class.php:4346 libraries/config.values.php:41
+#: libraries/Util.class.php:3341 libraries/Util.class.php:3351
+#: libraries/Util.class.php:3357 libraries/Util.class.php:3631
+#: libraries/Util.class.php:3632 libraries/Util.class.php:4335
+#: libraries/Util.class.php:4352 libraries/config.values.php:41
 #: libraries/config.values.php:49 libraries/config.values.php:111
 #: libraries/config.values.php:117
 #: libraries/navigation/Nodes/Node_Table.class.php:286
 msgid "Search"
 msgstr "ढूंढें"
 
-#: libraries/Menu.class.php:338 libraries/Util.class.php:3336
-#: libraries/Util.class.php:3346 libraries/Util.class.php:3627
-#: libraries/Util.class.php:3628 libraries/Util.class.php:4347
+#: libraries/Menu.class.php:338 libraries/Util.class.php:3342
+#: libraries/Util.class.php:3352 libraries/Util.class.php:3633
+#: libraries/Util.class.php:3634 libraries/Util.class.php:4353
 #: libraries/config.values.php:42 libraries/config.values.php:50
 #: libraries/config.values.php:118
 #: libraries/navigation/Nodes/Node_Table.class.php:289
@@ -4273,30 +4284,30 @@ msgid "Insert"
 msgstr "इनसर्ट"
 
 #: libraries/Menu.class.php:362 libraries/Menu.class.php:467
-#: libraries/Util.class.php:4334 libraries/Util.class.php:4350
+#: libraries/Util.class.php:4340 libraries/Util.class.php:4356
 #: libraries/config.values.php:106 libraries/server_common.lib.php:51
 #: libraries/server_privileges.lib.php:2370
 #: libraries/server_privileges.lib.php:3158
-#: libraries/server_privileges.lib.php:4221
+#: libraries/server_privileges.lib.php:4247
 msgid "Privileges"
 msgstr "प्रिविलेज"
 
 #: libraries/Menu.class.php:371 libraries/Menu.class.php:379
-#: libraries/Menu.class.php:459 libraries/Util.class.php:3338
-#: libraries/Util.class.php:3352 libraries/Util.class.php:4333
-#: libraries/Util.class.php:4351 libraries/config.values.php:112
+#: libraries/Menu.class.php:459 libraries/Util.class.php:3344
+#: libraries/Util.class.php:3358 libraries/Util.class.php:4339
+#: libraries/Util.class.php:4357 libraries/config.values.php:112
 #: view_operations.php:92
 msgid "Operations"
 msgstr "कार्रवाई"
 
 #: libraries/Menu.class.php:384 libraries/Menu.class.php:492
-#: libraries/Util.class.php:4338 libraries/Util.class.php:4352
+#: libraries/Util.class.php:4344 libraries/Util.class.php:4358
 #: libraries/relation.lib.php:255
 msgid "Tracking"
 msgstr "नज़र रखना"
 
 #: libraries/Menu.class.php:397 libraries/Menu.class.php:486
-#: libraries/Util.class.php:4337 libraries/Util.class.php:4353
+#: libraries/Util.class.php:4343 libraries/Util.class.php:4359
 #: libraries/navigation/Nodes/Node_Trigger_Container.class.php:24
 #: libraries/plugins/export/ExportHtmlword.class.php:557
 #: libraries/plugins/export/ExportOdt.class.php:685
@@ -4313,16 +4324,16 @@ msgstr "ट्रिगर"
 msgid "Database seems to be empty!"
 msgstr "डाटाबेस खाली लग रहा है!"
 
-#: libraries/Menu.class.php:439 libraries/Util.class.php:4330
+#: libraries/Menu.class.php:439 libraries/Util.class.php:4336
 msgid "Query"
 msgstr "क्वरी"
 
-#: libraries/Menu.class.php:472 libraries/Util.class.php:4335
+#: libraries/Menu.class.php:472 libraries/Util.class.php:4341
 #: libraries/rte/rte_words.lib.php:36
 msgid "Routines"
 msgstr "नियमित कार्य"
 
-#: libraries/Menu.class.php:479 libraries/Util.class.php:4336
+#: libraries/Menu.class.php:479 libraries/Util.class.php:4342
 #: libraries/navigation/Nodes/Node_Event_Container.class.php:26
 #: libraries/plugins/export/ExportSql.class.php:940
 #: libraries/plugins/export/ExportXml.class.php:107
@@ -4330,22 +4341,22 @@ msgstr "नियमित कार्य"
 msgid "Events"
 msgstr ""
 
-#: libraries/Menu.class.php:498 libraries/Util.class.php:4339
+#: libraries/Menu.class.php:498 libraries/Util.class.php:4345
 msgid "Designer"
 msgstr "डिजाइनर"
 
-#: libraries/Menu.class.php:507 libraries/Util.class.php:4340
-#: templates/structure/check_all_tables.phtml:35
+#: libraries/Menu.class.php:507 libraries/Util.class.php:4346
+#: templates/database/structure/check_all_tables.phtml:35
 #, fuzzy
 #| msgid "Textarea columns"
 msgid "Central columns"
 msgstr "पाठ क्षेत्रपाठ क्षेत्र कोलम"
 
-#: libraries/Menu.class.php:544 libraries/Util.class.php:4312
+#: libraries/Menu.class.php:544 libraries/Util.class.php:4318
 #: libraries/config.values.php:103 libraries/config/messages.inc.php:266
 #: libraries/config/messages.inc.php:341
 #: libraries/navigation/NavigationTree.class.php:1239
-#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4332
+#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4358
 msgid "Databases"
 msgstr "डाटाबेस"
 
@@ -4356,34 +4367,34 @@ msgid "User accounts"
 msgstr "यूसर"
 
 #: libraries/Menu.class.php:595 libraries/ServerStatusData.class.php:121
-#: libraries/Util.class.php:4319 libraries/server_common.lib.php:36
+#: libraries/Util.class.php:4325 libraries/server_common.lib.php:36
 msgid "Binary log"
 msgstr "बाइनरी लोग"
 
 #: libraries/Menu.class.php:601 libraries/ServerStatusData.class.php:126
-#: libraries/Util.class.php:4320 libraries/server_common.lib.php:42
-#: templates/structure/body_for_table_summary.phtml:10
-#: templates/structure/table_header.phtml:27
+#: libraries/Util.class.php:4326 libraries/server_common.lib.php:42
+#: templates/database/structure/body_for_table_summary.phtml:10
+#: templates/database/structure/table_header.phtml:27
 msgid "Replication"
 msgstr "प्रतिकृति"
 
 #: libraries/Menu.class.php:606 libraries/ServerStatusData.class.php:193
-#: libraries/Util.class.php:4321 libraries/config.values.php:105
+#: libraries/Util.class.php:4327 libraries/config.values.php:105
 #: libraries/server_engines.lib.php:108 libraries/server_engines.lib.php:112
 #: libraries/sql_query_form.lib.php:421
 msgid "Variables"
 msgstr "प्रक्रियां"
 
-#: libraries/Menu.class.php:610 libraries/Util.class.php:4322
+#: libraries/Menu.class.php:610 libraries/Util.class.php:4328
 msgid "Charsets"
 msgstr "चरित्र सेट"
 
-#: libraries/Menu.class.php:615 libraries/Util.class.php:4323
+#: libraries/Menu.class.php:615 libraries/Util.class.php:4329
 #: libraries/server_common.lib.php:33 libraries/server_plugins.lib.php:27
 msgid "Plugins"
 msgstr ""
 
-#: libraries/Menu.class.php:626 libraries/Util.class.php:4324
+#: libraries/Menu.class.php:626 libraries/Util.class.php:4330
 msgid "Engines"
 msgstr "इंजन"
 
@@ -4408,7 +4419,7 @@ msgid_plural "%1$d rows inserted."
 msgstr[0] "एकवचन %1$d पंक्ति डाली।"
 msgstr[1] "बहुवचन %1$d पंक्तिया डाली।"
 
-#: libraries/PDF.class.php:70 libraries/Util.class.php:2521
+#: libraries/PDF.class.php:70 libraries/Util.class.php:2527
 #: libraries/browse_foreigners.lib.php:327
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:865
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:890
@@ -4435,7 +4446,7 @@ msgid "Could not save favorite table!"
 msgstr "विन्यास सहेज नहीं सकते"
 
 #: libraries/RecentFavoriteTable.class.php:212
-#: templates/structure/favorite_anchor.phtml:12
+#: templates/database/structure/favorite_anchor.phtml:12
 #, fuzzy
 #| msgid "Remove chart"
 msgid "Remove from Favorites"
@@ -4621,7 +4632,7 @@ msgid ""
 msgstr "इस भंडारण इंजन स्थिति के लिए कोई विस्तृत जानकारी उपलब्ध नहीं है."
 
 #: libraries/StorageEngine.class.php:373
-#: templates/structure/body_for_table_summary.phtml:50
+#: templates/database/structure/body_for_table_summary.phtml:50
 #, php-format
 msgid "%s is the default storage engine on this MySQL server."
 msgstr "%s इस MySQL सर्वर पर तयशुदा भंडारण इंजन है."
@@ -5058,10 +5069,10 @@ msgstr ""
 
 #: libraries/Util.class.php:726 libraries/rte/rte_events.lib.php:110
 #: libraries/rte/rte_events.lib.php:119 libraries/rte/rte_events.lib.php:150
-#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:153
-#: libraries/rte/rte_routines.lib.php:162
-#: libraries/rte/rte_routines.lib.php:235
-#: libraries/rte/rte_routines.lib.php:1366
+#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:223
+#: libraries/rte/rte_routines.lib.php:250
+#: libraries/rte/rte_routines.lib.php:372
+#: libraries/rte/rte_routines.lib.php:1457
 #: libraries/rte/rte_triggers.lib.php:86 libraries/rte/rte_triggers.lib.php:95
 #: libraries/rte/rte_triggers.lib.php:127
 msgid "MySQL said: "
@@ -5107,81 +5118,84 @@ msgstr "रविवार"
 msgid "%B %d, %Y at %I:%M %p"
 msgstr "%d %B, %Y को %I:%M %p"
 
-#: libraries/Util.class.php:2019
+#: libraries/Util.class.php:2025
 #, php-format
 msgid "%s days, %s hours, %s minutes and %s seconds"
 msgstr "%s दिन, %s घंटे, %s मिनट and %s सेकंड"
 
-#: libraries/Util.class.php:2112
+#: libraries/Util.class.php:2118
 #, fuzzy
 #| msgid "Routines"
 msgid "Missing parameter:"
 msgstr "नियमित कार्य"
 
-#: libraries/Util.class.php:2645
+#: libraries/Util.class.php:2651
 #, php-format
 msgid "Jump to database \"%s\"."
 msgstr "\"%s\" डेटाबेस पर जायें;."
 
-#: libraries/Util.class.php:2670
+#: libraries/Util.class.php:2676
 #, php-format
 msgid "The %s functionality is affected by a known bug, see %s"
 msgstr "%s कार्यक्षमताएक एक बग के द्वारा जनि जाती है| %s पर ध्यान दे"
 
-#: libraries/Util.class.php:2881
+#: libraries/Util.class.php:2887
 #, fuzzy
 #| msgid "Click to select"
 msgid "Click to toggle"
 msgstr "चयन करने के लिए क्लिक करें."
 
-#: libraries/Util.class.php:3542 prefs_manage.php:248
+#: libraries/Util.class.php:3548 prefs_manage.php:248
 msgid "Browse your computer:"
 msgstr "अपना कंप्यूटर ब्राउज़ करें:"
 
-#: libraries/Util.class.php:3567
+#: libraries/Util.class.php:3573
 #, php-format
 msgid "Select from the web server upload directory <b>%s</b>:"
 msgstr "अपने वेब सर्वर की अपलोड डिरेक्टरी से चुने <b>%s</b>:"
 
-#: libraries/Util.class.php:3596 libraries/insert_edit.lib.php:1173
+#: libraries/Util.class.php:3602 libraries/insert_edit.lib.php:1171
 msgid "The directory you set for upload work cannot be reached."
 msgstr "आपकी अपलोड दिरेक्टोरी तक पहुंचा नहीं जा सकता."
 
-#: libraries/Util.class.php:3607
+#: libraries/Util.class.php:3613
 #, fuzzy
 #| msgid "There are no files to upload"
 msgid "There are no files to upload!"
 msgstr "अपलोड करने के लिए फाइल उपलब्ध नहीं"
 
-#: libraries/Util.class.php:3632 libraries/Util.class.php:3633
-#: templates/structure/check_all_tables.phtml:15
+#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: templates/database/structure/check_all_tables.phtml:15
 msgid "Empty"
 msgstr "खाली"
 
-#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: libraries/Util.class.php:3644 libraries/Util.class.php:3645
 msgid "Execute"
 msgstr ""
 
-#: libraries/Util.class.php:4152
+#: libraries/Util.class.php:4158
 msgid "Print"
 msgstr "छापें"
 
-#: libraries/Util.class.php:4257 templates/structure/row_stats_table.phtml:80
-#: templates/structure/table_header.phtml:95
+#: libraries/Util.class.php:4263
+#: templates/database/structure/table_header.phtml:95
+#: templates/table/structure/row_stats_table.phtml:80
 msgid "Creation"
 msgstr "रचना"
 
-#: libraries/Util.class.php:4263 templates/structure/row_stats_table.phtml:87
-#: templates/structure/table_header.phtml:106
+#: libraries/Util.class.php:4269
+#: templates/database/structure/table_header.phtml:106
+#: templates/table/structure/row_stats_table.phtml:87
 msgid "Last update"
 msgstr "पिछला नवीनीकरण"
 
-#: libraries/Util.class.php:4269 templates/structure/row_stats_table.phtml:94
-#: templates/structure/table_header.phtml:117
+#: libraries/Util.class.php:4275
+#: templates/database/structure/table_header.phtml:117
+#: templates/table/structure/row_stats_table.phtml:94
 msgid "Last check"
 msgstr "पिछली जाँच"
 
-#: libraries/Util.class.php:4315
+#: libraries/Util.class.php:4321
 #, fuzzy
 #| msgid "User"
 msgid "Users"
@@ -5204,16 +5218,16 @@ msgid "Use this value"
 msgstr "इस मान का उपयोग करें"
 
 #: libraries/build_html_for_db.lib.php:33 libraries/import.lib.php:193
-#: templates/structure/actions_in_table_structure.phtml:113
-#: templates/structure/row_stats_table.phtml:42
-#: templates/structure/table_header.phtml:36
+#: templates/database/structure/table_header.phtml:36
+#: templates/table/structure/actions_in_table_structure.phtml:113
+#: templates/table/structure/row_stats_table.phtml:42
 msgid "Rows"
 msgstr "रो"
 
 #: libraries/build_html_for_db.lib.php:48 libraries/engines/innodb.lib.php:171
-#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:186
-#: libraries/server_status.lib.php:298
-#: templates/structure/display_table_stats.phtml:40
+#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:195
+#: libraries/server_status.lib.php:307
+#: templates/table/structure/display_table_stats.phtml:40
 msgid "Total"
 msgstr "कुल"
 
@@ -5222,10 +5236,12 @@ msgid "Jump to database"
 msgstr "डेटाबेस को कूद"
 
 #: libraries/build_html_for_db.lib.php:146
+#: templates/database/structure/structure_table_row.phtml:15
 msgid "Not replicated"
 msgstr "नहीं दोहराया"
 
 #: libraries/build_html_for_db.lib.php:158
+#: templates/database/structure/structure_table_row.phtml:16
 msgid "Replicated"
 msgstr "दोहराया"
 
@@ -5282,17 +5298,17 @@ msgstr ""
 #: libraries/plugins/export/ExportTexytext.class.php:425
 #: libraries/plugins/export/PMA_ExportPdf.class.php:307
 #: libraries/rte/rte_list.lib.php:73 libraries/rte/rte_list.lib.php:85
-#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:830
-#: libraries/rte/rte_routines.lib.php:1492 setup/frames/index.inc.php:162
+#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:921
+#: libraries/rte/rte_routines.lib.php:1583 setup/frames/index.inc.php:162
 #: templates/columns_definitions/table_fields_definitions.phtml:8
-#: templates/structure/table_structure_header.phtml:5
-#: templates/table/create_table.phtml:11
+#: templates/database/create_table.phtml:11
+#: templates/table/structure/table_structure_header.phtml:5
 msgid "Name"
 msgstr "नाम"
 
 #: libraries/central_columns.lib.php:699
 #: libraries/central_columns.lib.php:1381
-#: libraries/rte/rte_routines.lib.php:832
+#: libraries/rte/rte_routines.lib.php:923
 #: templates/columns_definitions/table_fields_definitions.phtml:14
 msgid "Length/Values"
 msgstr "लंबाई/अर्थ*"
@@ -5315,7 +5331,7 @@ msgid "Select a table"
 msgstr "टेबल चुनिये"
 
 #: libraries/central_columns.lib.php:804
-#: templates/structure/add_column.phtml:4
+#: templates/table/structure/add_column.phtml:4
 msgid "Add column"
 msgstr "नया काँलम जोडें"
 
@@ -5335,7 +5351,7 @@ msgstr "नया काँलम जोडें"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1002
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1025
 #: templates/columns_definitions/table_fields_definitions.phtml:36
-#: templates/structure/table_structure_header.phtml:8
+#: templates/table/structure/table_structure_header.phtml:8
 msgid "Attributes"
 msgstr "विशेषता"
 
@@ -5458,7 +5474,7 @@ msgid "Double click"
 msgstr ""
 
 #: libraries/config.values.php:95 libraries/config.values.php:124
-#: libraries/config/FormDisplay.tpl.php:221 libraries/relation.lib.php:97
+#: libraries/config/FormDisplay.tpl.php:232 libraries/relation.lib.php:97
 #: libraries/relation.lib.php:105
 msgid "Disabled"
 msgstr "अक्षम"
@@ -5649,21 +5665,21 @@ msgstr "निर्यात काम नहीं करेगा, function (
 msgid "maximum %s"
 msgstr "अधिकतम %s"
 
-#: libraries/config/FormDisplay.tpl.php:219
+#: libraries/config/FormDisplay.tpl.php:230
 msgid "This setting is disabled, it will not be applied to your configuration."
 msgstr "यह सेटिंग अक्षम है, यह आपके विन्यास में लागू नहीं की जा सकेगी."
 
-#: libraries/config/FormDisplay.tpl.php:313
+#: libraries/config/FormDisplay.tpl.php:324
 #, php-format
 msgid "Set value: %s"
 msgstr "मान निर्धारित: %s"
 
-#: libraries/config/FormDisplay.tpl.php:318
+#: libraries/config/FormDisplay.tpl.php:329
 #: libraries/config/messages.inc.php:610
 msgid "Restore default value"
 msgstr "मूलभूत मान को बहाल"
 
-#: libraries/config/FormDisplay.tpl.php:332
+#: libraries/config/FormDisplay.tpl.php:343
 msgid "Allow users to customize this value"
 msgstr "कर्ता को इस मूल्य को अनुकूलित करने की अनुमति दें"
 
@@ -6160,7 +6176,7 @@ msgstr "फ़ाइल का चरित्र सेट"
 
 #: libraries/config/messages.inc.php:136 libraries/config/messages.inc.php:152
 #: libraries/sql_query_form.lib.php:247
-#: templates/structure/row_stats_table.phtml:7
+#: templates/table/structure/row_stats_table.phtml:7
 msgid "Format"
 msgstr "प्रारूप"
 
@@ -6759,7 +6775,7 @@ msgstr ""
 
 #: libraries/config/messages.inc.php:332
 #: libraries/plugins/export/ExportPdf.class.php:279
-#: templates/structure/secondary_tabs.phtml:8
+#: templates/table/secondary_tabs.phtml:8
 #, fuzzy
 #| msgid "Database for user"
 msgid "Table structure"
@@ -8606,112 +8622,35 @@ msgstr ""
 msgid "OpenDocument Text"
 msgstr "दस्तावेज़ खोलें"
 
-#: libraries/controllers/StructureController.class.php:465
+#: libraries/controllers/DatabaseStructureController.class.php:405
 #: tbl_operations.php:382
 #, php-format
 msgid "Table %s has been emptied."
 msgstr "टेबल %s को खाली किया गया है."
 
-#: libraries/controllers/StructureController.class.php:486
+#: libraries/controllers/DatabaseStructureController.class.php:426
 #: tbl_operations.php:400 view_operations.php:119
 #, fuzzy, php-format
 #| msgid "View %s has been dropped."
 msgid "View %s has been dropped."
 msgstr "द्रश्य %s रद्द किया गया है."
 
-#: libraries/controllers/StructureController.class.php:487
+#: libraries/controllers/DatabaseStructureController.class.php:427
 #: tbl_operations.php:401
 #, fuzzy, php-format
 #| msgid "Table %s has been dropped."
 msgid "Table %s has been dropped."
 msgstr "टेबल %s को रद्द किया गया है."
 
-#: libraries/controllers/StructureController.class.php:797
-#, php-format
-msgid "The name '%s' is a MySQL reserved keyword."
-msgid_plural "The names '%s' are MySQL reserved keywords."
-msgstr[0] ""
-msgstr[1] ""
-
-#: libraries/controllers/StructureController.class.php:875
-#, fuzzy
-#| msgid "No rows selected"
-msgid "No column selected."
-msgstr "कोई पंक्ति चयनित नहीं"
-
-#: libraries/controllers/StructureController.class.php:1049
+#: libraries/controllers/DatabaseStructureController.class.php:733
 msgid "Favorite List is full!"
 msgstr "प्रिय सूची भरी हुई है!"
 
-#: libraries/controllers/StructureController.class.php:1272
-#, fuzzy
-#| msgid "Table %1$s has been altered successfully."
-msgid "The columns have been moved successfully."
-msgstr "%1$s टेबल को सफलतापूर्वक बदल दिया गया है"
-
-#: libraries/controllers/StructureController.class.php:1535
-#, fuzzy, php-format
-#| msgid "Table %1$s has been altered successfully."
-msgid ""
-"Table %1$s has been altered successfully. Privileges have been adjusted."
-msgstr "%1$s टेबल को सफलतापूर्वक बदल दिया गया है"
-
-#: libraries/controllers/StructureController.class.php:1541
-#: libraries/controllers/TableIndexesController.class.php:161
-#: tbl_addfield.php:92
-#, php-format
-msgid "Table %1$s has been altered successfully."
-msgstr "%1$s टेबल को सफलतापूर्वक बदल दिया गया है"
-
-#: libraries/controllers/StructureController.class.php:1588
-#: libraries/tracking.lib.php:1094
-#, fuzzy
-#| msgid "Gather errors"
-msgid "Query error"
-msgstr "त्रुटियों को इकट्ठा करें"
-
-#: libraries/controllers/StructureController.class.php:1806
+#: libraries/controllers/DatabaseStructureController.class.php:947
 #: libraries/mysql_charsets.lib.php:366 libraries/mysql_charsets.lib.php:373
 msgid "unknown"
 msgstr "अज्ञात"
 
-#: libraries/controllers/StructureController.class.php:1957
-#: templates/structure/check_all_table_column.phtml:11
-msgid "Change"
-msgstr "बदलें"
-
-#: libraries/controllers/StructureController.class.php:1961
-#: libraries/controllers/StructureController.class.php:1966
-#: libraries/navigation/Nodes/Node_Index.class.php:30
-#: libraries/tracking.lib.php:926
-#: templates/columns_definitions/column_indexes.phtml:16
-#: templates/columns_definitions/table_fields_definitions.phtml:57
-#: templates/structure/check_all_table_column.phtml:30
-#: templates/structure/display_structure.phtml:79
-#: templates/structure/display_table_stats.phtml:19
-msgid "Index"
-msgstr "सूची"
-
-#: libraries/controllers/StructureController.class.php:1963
-#: libraries/controllers/StructureController.class.php:1968
-#: templates/columns_definitions/column_indexes.phtml:27
-#: templates/structure/check_all_table_column.phtml:37
-msgid "Spatial"
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1964
-#: libraries/controllers/StructureController.class.php:1969
-#: templates/columns_definitions/column_indexes.phtml:22
-#: templates/structure/check_all_table_column.phtml:47
-msgid "Fulltext"
-msgstr "प्राथमिक"
-
-#: libraries/controllers/StructureController.class.php:1970
-#, fuzzy
-#| msgid "Browse distinct values"
-msgid "Distinct values"
-msgstr "अलग मूल्य ब्राउस करें "
-
 #: libraries/controllers/TableChartController.class.php:82
 #: libraries/controllers/TableGisVisualizationController.class.php:101
 msgid "No SQL query was set to fetch data."
@@ -8727,13 +8666,20 @@ msgstr ""
 msgid "No data to display"
 msgstr "कोइ डाटाबेस नहिं"
 
-#: libraries/controllers/TableRelationController.class.php:217
+#: libraries/controllers/TableIndexesController.class.php:161
+#: libraries/controllers/TableStructureController.class.php:736
+#: tbl_addfield.php:92
+#, php-format
+msgid "Table %1$s has been altered successfully."
+msgstr "%1$s टेबल को सफलतापूर्वक बदल दिया गया है"
+
+#: libraries/controllers/TableRelationController.class.php:218
 #, fuzzy
 #| msgid "Thread %s was successfully killed."
 msgid "Display column was successfully updated."
 msgstr "Thread %s को सफलता से मारा गया।"
 
-#: libraries/controllers/TableRelationController.class.php:283
+#: libraries/controllers/TableRelationController.class.php:288
 #, fuzzy
 #| msgid "Internal relation added"
 msgid "Internal relations were successfully updated."
@@ -8752,12 +8698,82 @@ msgid "Zoom search"
 msgstr "ज़ूम ख़ोज"
 
 #: libraries/controllers/TableSearchController.class.php:852
-#: templates/table/selection_form.phtml:59
+#: templates/table/search/selection_form.phtml:59
 #, fuzzy
 #| msgid "Hide search criteria"
 msgid "Find and replace"
 msgstr "ख़ोज मापदंड छिपाएँ"
 
+#: libraries/controllers/TableStructureController.class.php:163
+#, php-format
+msgid "The name '%s' is a MySQL reserved keyword."
+msgid_plural "The names '%s' are MySQL reserved keywords."
+msgstr[0] ""
+msgstr[1] ""
+
+#: libraries/controllers/TableStructureController.class.php:241
+#, fuzzy
+#| msgid "No rows selected"
+msgid "No column selected."
+msgstr "कोई पंक्ति चयनित नहीं"
+
+#: libraries/controllers/TableStructureController.class.php:467
+#, fuzzy
+#| msgid "Table %1$s has been altered successfully."
+msgid "The columns have been moved successfully."
+msgstr "%1$s टेबल को सफलतापूर्वक बदल दिया गया है"
+
+#: libraries/controllers/TableStructureController.class.php:730
+#, fuzzy, php-format
+#| msgid "Table %1$s has been altered successfully."
+msgid ""
+"Table %1$s has been altered successfully. Privileges have been adjusted."
+msgstr "%1$s टेबल को सफलतापूर्वक बदल दिया गया है"
+
+#: libraries/controllers/TableStructureController.class.php:783
+#: libraries/tracking.lib.php:1094
+#, fuzzy
+#| msgid "Gather errors"
+msgid "Query error"
+msgstr "त्रुटियों को इकट्ठा करें"
+
+#: libraries/controllers/TableStructureController.class.php:948
+#: templates/table/structure/check_all_table_column.phtml:11
+msgid "Change"
+msgstr "बदलें"
+
+#: libraries/controllers/TableStructureController.class.php:952
+#: libraries/controllers/TableStructureController.class.php:957
+#: libraries/navigation/Nodes/Node_Index.class.php:30
+#: libraries/tracking.lib.php:926
+#: templates/columns_definitions/column_indexes.phtml:16
+#: templates/columns_definitions/table_fields_definitions.phtml:57
+#: templates/table/structure/check_all_table_column.phtml:30
+#: templates/table/structure/display_structure.phtml:79
+#: templates/table/structure/display_table_stats.phtml:19
+msgid "Index"
+msgstr "सूची"
+
+#: libraries/controllers/TableStructureController.class.php:954
+#: libraries/controllers/TableStructureController.class.php:959
+#: templates/columns_definitions/column_indexes.phtml:27
+#: templates/table/structure/check_all_table_column.phtml:37
+msgid "Spatial"
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:955
+#: libraries/controllers/TableStructureController.class.php:960
+#: templates/columns_definitions/column_indexes.phtml:22
+#: templates/table/structure/check_all_table_column.phtml:47
+msgid "Fulltext"
+msgstr "प्राथमिक"
+
+#: libraries/controllers/TableStructureController.class.php:963
+#, fuzzy
+#| msgid "Browse distinct values"
+msgid "Distinct values"
+msgstr "अलग मूल्य ब्राउस करें "
+
 #: libraries/core.lib.php:306
 #, php-format
 msgid "The %s extension is missing. Please check your PHP configuration."
@@ -8804,7 +8820,7 @@ msgid "No Password"
 msgstr "पासवर्ड नहीं है"
 
 #: libraries/display_change_password.lib.php:68
-#: libraries/plugins/auth/AuthenticationCookie.class.php:199
+#: libraries/plugins/auth/AuthenticationCookie.class.php:187
 #: libraries/replication_gui.lib.php:422 libraries/replication_gui.lib.php:862
 #: libraries/server_privileges.lib.php:1640
 msgid "Password:"
@@ -9578,12 +9594,12 @@ msgid "Dump has been saved to file %s."
 msgstr "डंप को %s फाइल में सेव किया गया है."
 
 #: libraries/import.lib.php:202 libraries/insert_edit.lib.php:124
-#: libraries/rte/rte_routines.lib.php:1353 libraries/sql.lib.php:1312
+#: libraries/rte/rte_routines.lib.php:1444 libraries/sql.lib.php:1306
 #: tbl_get_field.php:44
 msgid "MySQL returned an empty result set (i.e. zero rows)."
 msgstr "MySQL ने एक खाली परिणाम सेट लोताया।"
 
-#: libraries/import.lib.php:265 libraries/sql.lib.php:1326
+#: libraries/import.lib.php:265 libraries/sql.lib.php:1320
 msgid "[ROLLBACK occurred.]"
 msgstr ""
 
@@ -9659,14 +9675,14 @@ msgstr "&nbsp;%s&nbsp; कोलम पर इन्डेक्स बनाऐ
 
 #: libraries/insert_edit.lib.php:233
 #: libraries/navigation/Nodes/Node_DatabaseChild.class.php:48
-#: templates/designer/table_list.phtml:40
+#: templates/database/designer/table_list.phtml:40
 msgid "Hide"
 msgstr "छिपाना"
 
 #: libraries/insert_edit.lib.php:249
 #: libraries/navigation/Nodes/Node_Function.class.php:32
-#: libraries/rte/rte_routines.lib.php:1495
-#: templates/table/table_header.phtml:4
+#: libraries/rte/rte_routines.lib.php:1586
+#: templates/table/search/table_header.phtml:4
 msgid "Function"
 msgstr ""
 
@@ -9679,86 +9695,87 @@ msgstr "बइनरी"
 msgid "Because of its length,<br /> this column might not be editable."
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1050
+#: libraries/insert_edit.lib.php:1048
 msgid "Binary - do not edit"
 msgstr "बइनरी - एडिट मत करिये"
 
-#: libraries/insert_edit.lib.php:1176 libraries/server_privileges.lib.php:470
-#: templates/table/options.phtml:36
+#: libraries/insert_edit.lib.php:1174 libraries/server_privileges.lib.php:470
+#: templates/table/search/options.phtml:36
 msgid "Or"
 msgstr "अथवा"
 
-#: libraries/insert_edit.lib.php:1177
+#: libraries/insert_edit.lib.php:1175
 #, fuzzy
 #| msgid "web server upload directory"
 msgid "web server upload directory:"
 msgstr "वेब सर्वर अपलोड निर्देशिका"
 
-#: libraries/insert_edit.lib.php:1348 templates/table/input_box.phtml:49
+#: libraries/insert_edit.lib.php:1346
+#: templates/table/search/input_box.phtml:49
 #, fuzzy
 #| msgid "Insert"
 msgid "Edit/Insert"
 msgstr "इनसर्ट"
 
-#: libraries/insert_edit.lib.php:1398
+#: libraries/insert_edit.lib.php:1396
 #, php-format
 msgid "Continue insertion with %s rows"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1428
+#: libraries/insert_edit.lib.php:1426
 msgid "and then"
 msgstr "और फिर"
 
-#: libraries/insert_edit.lib.php:1461
+#: libraries/insert_edit.lib.php:1459
 msgid "Insert as new row"
 msgstr "इसको नया रौ में जोडे"
 
-#: libraries/insert_edit.lib.php:1464
+#: libraries/insert_edit.lib.php:1462
 msgid "Insert as new row and ignore errors"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1467
+#: libraries/insert_edit.lib.php:1465
 msgid "Show insert query"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1487
+#: libraries/insert_edit.lib.php:1485
 msgid "Go back to previous page"
 msgstr "पिछले पृष्ट पर वापस जाएँ"
 
-#: libraries/insert_edit.lib.php:1490
+#: libraries/insert_edit.lib.php:1488
 msgid "Insert another new row"
 msgstr "एक और नई रो इनसर्ट करें"
 
-#: libraries/insert_edit.lib.php:1495
+#: libraries/insert_edit.lib.php:1493
 msgid "Go back to this page"
 msgstr "इस पृष्ठ पर वापस जाएँ"
 
-#: libraries/insert_edit.lib.php:1518
+#: libraries/insert_edit.lib.php:1516
 msgid "Edit next row"
 msgstr "अगली रो को संपादित करें"
 
-#: libraries/insert_edit.lib.php:1540
+#: libraries/insert_edit.lib.php:1538
 msgid ""
 "Use TAB key to move from value to value, or CTRL+arrows to move anywhere"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1577 libraries/replication_gui.lib.php:542
-#: libraries/rte/rte_routines.lib.php:1497
+#: libraries/insert_edit.lib.php:1575 libraries/replication_gui.lib.php:542
+#: libraries/rte/rte_routines.lib.php:1588
 #: libraries/server_status_variables.lib.php:220
-#: templates/designer/having_query_panel.phtml:100
-#: templates/designer/options_panel.phtml:73
-#: templates/designer/options_panel.phtml:239
-#: templates/designer/where_query_panel.phtml:69
-#: templates/table/table_header.phtml:10
-#: templates/table/zoom_result_form.phtml:35
+#: templates/database/designer/having_query_panel.phtml:100
+#: templates/database/designer/options_panel.phtml:73
+#: templates/database/designer/options_panel.phtml:239
+#: templates/database/designer/where_query_panel.phtml:69
+#: templates/table/search/table_header.phtml:10
+#: templates/table/search/zoom_result_form.phtml:35
 msgid "Value"
 msgstr "मूल्य"
 
-#: libraries/insert_edit.lib.php:1937 libraries/sql.lib.php:1309
+#: libraries/insert_edit.lib.php:1935 libraries/sql.lib.php:1303
 msgid "Showing SQL query"
 msgstr "SQL क्वेरी शो"
 
-#: libraries/insert_edit.lib.php:1962 libraries/sql.lib.php:1287
+#: libraries/insert_edit.lib.php:1960 libraries/sql.lib.php:1281
 #, php-format
 msgid "Inserted row id: %1$d"
 msgstr "इनसर्ट रो id: %1$d"
@@ -10211,7 +10228,7 @@ msgstr ""
 #: libraries/navigation/Nodes/Node_View_Container.class.php:26
 #: libraries/navigation/Nodes/Node_View_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:129
-#: templates/structure/show_create.phtml:30
+#: templates/database/structure/show_create.phtml:30
 #, fuzzy
 #| msgid "View"
 msgid "Views"
@@ -10526,7 +10543,7 @@ msgstr "आपके पास यहाँ उपस्थित होने 
 
 #: libraries/operations.lib.php:101 libraries/operations.lib.php:249
 #: libraries/operations.lib.php:869 libraries/operations.lib.php:963
-#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:907
+#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:998
 #: templates/columns_definitions/table_fields_definitions.phtml:47
 #, fuzzy
 #| msgid "Edit Privileges"
@@ -10620,22 +10637,22 @@ msgid "Switch to copied table"
 msgstr "नकल की टेबल पर स्विच करें"
 
 #: libraries/operations.lib.php:1360
-#: templates/structure/check_all_tables.phtml:18
+#: templates/database/structure/check_all_tables.phtml:18
 msgid "Table maintenance"
 msgstr "टेबल  रख-रखाव"
 
 #: libraries/operations.lib.php:1398
-#: templates/structure/check_all_tables.phtml:19
+#: templates/database/structure/check_all_tables.phtml:19
 msgid "Analyze table"
 msgstr "टेबल का विश्लेषण करें"
 
 #: libraries/operations.lib.php:1413
-#: templates/structure/check_all_tables.phtml:20
+#: templates/database/structure/check_all_tables.phtml:20
 msgid "Check table"
 msgstr "टेबल को चेक करें"
 
 #: libraries/operations.lib.php:1428
-#: templates/structure/check_all_tables.phtml:22
+#: templates/database/structure/check_all_tables.phtml:22
 #, fuzzy
 #| msgid "Check table"
 msgid "Checksum table"
@@ -10655,18 +10672,19 @@ msgid "Flush the table (FLUSH)"
 msgstr "टेबल को Flush करें (\"FLUSH\")"
 
 #: libraries/operations.lib.php:1477
-#: templates/structure/check_all_tables.phtml:23
-#: templates/structure/display_table_stats.phtml:56
+#: templates/database/structure/check_all_tables.phtml:23
+#: templates/table/structure/display_table_stats.phtml:56
 msgid "Optimize table"
 msgstr "टेबल को अनुकूलित करें"
 
 #: libraries/operations.lib.php:1492
-#: templates/structure/check_all_tables.phtml:24
+#: templates/database/structure/check_all_tables.phtml:24
 msgid "Repair table"
 msgstr "टेबल को मरम्मत करें"
 
 #: libraries/operations.lib.php:1538
-#: templates/structure/check_all_tables.phtml:14 view_operations.php:127
+#: templates/database/structure/check_all_tables.phtml:14
+#: view_operations.php:127
 msgid "Delete data or table"
 msgstr "टेबल या डेटा हटाएँ"
 
@@ -10792,7 +10810,7 @@ msgid "Cannot connect: invalid settings."
 msgstr "अमान्य सेटिंग्स: कनेक्ट नहीं कर सकते हैं।"
 
 #: libraries/plugins/auth/AuthenticationConfig.class.php:108
-#: libraries/plugins/auth/AuthenticationCookie.class.php:134
+#: libraries/plugins/auth/AuthenticationCookie.class.php:122
 #: libraries/plugins/auth/AuthenticationHttp.class.php:96
 #, php-format
 msgid "Welcome to %s"
@@ -10822,38 +10840,38 @@ msgstr ""
 msgid "Retry to connect"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:146
+#: libraries/plugins/auth/AuthenticationCookie.class.php:134
 msgid "Your session has expired. Please log in again."
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:170
+#: libraries/plugins/auth/AuthenticationCookie.class.php:158
 msgid "Log in"
 msgstr "लोगिन"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:178
-#: libraries/plugins/auth/AuthenticationCookie.class.php:188
+#: libraries/plugins/auth/AuthenticationCookie.class.php:166
+#: libraries/plugins/auth/AuthenticationCookie.class.php:176
 msgid "You can enter hostname/IP address and port separated by space."
 msgstr "आप होस्टनाम / आईपी पता और पोर्ट स्पचे से अलग कर के दाल सकते हैं."
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:193
+#: libraries/plugins/auth/AuthenticationCookie.class.php:181
 msgid "Username:"
 msgstr "उपयोक्तानाम:"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:205
+#: libraries/plugins/auth/AuthenticationCookie.class.php:193
 #, fuzzy
 #| msgid "Server Choice"
 msgid "Server Choice:"
 msgstr "सर्वर चुनिये"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:386
+#: libraries/plugins/auth/AuthenticationCookie.class.php:374
 msgid "Entered captcha is wrong, try again!"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:396
+#: libraries/plugins/auth/AuthenticationCookie.class.php:384
 msgid "Please enter correct captcha!"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:423
+#: libraries/plugins/auth/AuthenticationCookie.class.php:411
 #, fuzzy
 #| msgid "Cannot log in to the MySQL server"
 msgid "You are not allowed to log in to this MySQL server!"
@@ -10961,7 +10979,7 @@ msgstr "घटना"
 #: libraries/plugins/export/ExportOdt.class.php:593
 #: libraries/plugins/export/ExportTexytext.class.php:428
 #: libraries/plugins/export/PMA_ExportPdf.class.php:313
-#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:984
 #: libraries/rte/rte_triggers.lib.php:377
 #, fuzzy
 #| msgid "Description"
@@ -11309,7 +11327,7 @@ msgid "Last check:"
 msgstr "पिछली जाँच:"
 
 #: libraries/plugins/export/ExportSql.class.php:1399
-#: templates/structure/structure_table_row.phtml:183
+#: templates/database/structure/structure_table_row.phtml:183
 msgid "in use"
 msgstr "उपयोग में है"
 
@@ -11511,20 +11529,14 @@ msgstr ""
 msgid "The imported file does not contain any data!"
 msgstr "%s फाइल में कोई भी प्रमुख आईडी नहीं है"
 
-#: libraries/plugins/import/ImportSql.class.php:169
+#: libraries/plugins/import/ImportSql.class.php:72
 msgid "SQL compatibility mode:"
 msgstr "SQL संगतता मोड"
 
-#: libraries/plugins/import/ImportSql.class.php:181
+#: libraries/plugins/import/ImportSql.class.php:84
 msgid "Do not use <code>AUTO_INCREMENT</code> for zero values"
 msgstr ""
 
-#: libraries/plugins/import/ImportSql.class.php:195
-#, fuzzy
-#| msgid "Read misses"
-msgid "Read as multibytes"
-msgstr "गलतियाँ पढ़ें"
-
 #: libraries/plugins/import/ImportXml.class.php:54
 msgid "XML"
 msgstr "XML"
@@ -11569,7 +11581,7 @@ msgid "Show grid"
 msgstr "ग्रिड दिखाओ"
 
 #: libraries/plugins/schema/SchemaPdf.class.php:94
-#: templates/structure/print_view_data_dictionary_link.phtml:6
+#: templates/database/structure/print_view_data_dictionary_link.phtml:6
 msgid "Data Dictionary"
 msgstr "डेटा शब्दकोश"
 
@@ -11601,7 +11613,7 @@ msgid "The %s table doesn't exist!"
 msgstr "%s  टेबल(s) मौजूद नहीं है"
 
 #: libraries/plugins/schema/eps/Eps_Relation_Schema.class.php:321
-#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:309
+#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:323
 #, php-format
 msgid "Schema of the %s database - Page %s"
 msgstr ""
@@ -11630,7 +11642,7 @@ msgstr "लेख - सूची"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1005
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1028
 #: libraries/tracking.lib.php:884
-#: templates/structure/table_structure_header.phtml:11
+#: templates/table/structure/table_structure_header.phtml:11
 msgid "Extra"
 msgstr "अतिरिक्त"
 
@@ -11971,32 +11983,32 @@ msgstr "सेटअप करने के लिए त्वरित कद
 msgid "Create the needed tables with the <code>%screate_tables.sql</code>."
 msgstr ""
 
-#: libraries/relation.lib.php:360
+#: libraries/relation.lib.php:357
 msgid "Create a pma user and give access to these tables."
 msgstr ""
 
-#: libraries/relation.lib.php:365
+#: libraries/relation.lib.php:360
 msgid ""
 "Enable advanced features in configuration file (<code>config.inc.php</"
 "code>), for example by starting from <code>config.sample.inc.php</code>."
 msgstr ""
 
-#: libraries/relation.lib.php:373
+#: libraries/relation.lib.php:365
 msgid "Re-login to phpMyAdmin to load the updated configuration file."
 msgstr ""
 
-#: libraries/relation.lib.php:1612
+#: libraries/relation.lib.php:1607
 msgid "no description"
 msgstr "कोई विवरण नहीं"
 
-#: libraries/relation.lib.php:1811
+#: libraries/relation.lib.php:1806
 msgid ""
 "You do not have necessary privileges to create a database named "
 "'phpmyadmin'. You may go to 'Operations' tab of any database to set up the "
 "phpMyAdmin configuration storage there."
 msgstr ""
 
-#: libraries/relation.lib.php:1928
+#: libraries/relation.lib.php:1923
 #, fuzzy, php-format
 #| msgid "Missing phpMyAdmin configuration storage tables"
 msgid ""
@@ -12004,21 +12016,21 @@ msgid ""
 "configuration storage there."
 msgstr "phpMyAdmin विन्यास भंडारण टेबल लापता"
 
-#: libraries/relation.lib.php:1936
+#: libraries/relation.lib.php:1931
 #, fuzzy, php-format
 #| msgid "Missing phpMyAdmin configuration storage tables"
 msgid ""
 "%sCreate%s the phpMyAdmin configuration storage in the current database."
 msgstr "phpMyAdmin विन्यास भंडारण टेबल लापता"
 
-#: libraries/relation.lib.php:1944
+#: libraries/relation.lib.php:1939
 #, fuzzy, php-format
 #| msgid "Missing phpMyAdmin configuration storage tables"
 msgid "%sCreate%s missing phpMyAdmin configuration storage tables."
 msgstr "phpMyAdmin विन्यास भंडारण टेबल लापता"
 
 #: libraries/replication_gui.lib.php:46 libraries/replication_gui.lib.php:343
-#: libraries/server_databases.lib.php:387
+#: libraries/server_databases.lib.php:398
 msgid "Master replication"
 msgstr ""
 
@@ -12073,7 +12085,7 @@ msgid ""
 msgstr ""
 
 #: libraries/replication_gui.lib.php:141
-#: libraries/server_databases.lib.php:389
+#: libraries/server_databases.lib.php:400
 msgid "Slave replication"
 msgstr ""
 
@@ -12360,10 +12372,10 @@ msgid "Master server changed successfully to %s."
 msgstr "मास्टर सर्वर सफलतापूर्वक परिवर्तित %s"
 
 #: libraries/rte/rte_events.lib.php:106 libraries/rte/rte_events.lib.php:115
-#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:149
-#: libraries/rte/rte_routines.lib.php:158
-#: libraries/rte/rte_routines.lib.php:231
-#: libraries/rte/rte_routines.lib.php:1362
+#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:219
+#: libraries/rte/rte_routines.lib.php:246
+#: libraries/rte/rte_routines.lib.php:368
+#: libraries/rte/rte_routines.lib.php:1453
 #: libraries/rte/rte_triggers.lib.php:82 libraries/rte/rte_triggers.lib.php:91
 #: libraries/rte/rte_triggers.lib.php:123
 #, fuzzy, php-format
@@ -12387,7 +12399,7 @@ msgstr "टेबल %s को रद्द किया गया है."
 msgid "Event %1$s has been created."
 msgstr "%1$s टेबल बना दिया गया है"
 
-#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:251
+#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:266
 #: libraries/rte/rte_triggers.lib.php:144
 msgid "One or more errors have occurred while processing your request:"
 msgstr ""
@@ -12398,7 +12410,7 @@ msgstr ""
 msgid "Edit event"
 msgstr "सर्वर को संपादित करें"
 
-#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:794
+#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:885
 #: libraries/rte/rte_triggers.lib.php:323 view_create.php:180
 #, fuzzy
 #| msgid "Details…"
@@ -12415,7 +12427,7 @@ msgstr "इवेंट प्रकार "
 msgid "Event type"
 msgstr "इवेंट प्रकार"
 
-#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:817
+#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:908
 #, fuzzy, php-format
 #| msgid "Change"
 msgid "Change to %s"
@@ -12449,12 +12461,14 @@ msgstr "आखरी"
 msgid "On completion preserve"
 msgstr "पूरा इनसर्टस"
 
-#: libraries/rte/rte_events.lib.php:491 libraries/rte/rte_routines.lib.php:930
+#: libraries/rte/rte_events.lib.php:491
+#: libraries/rte/rte_routines.lib.php:1021
 #: libraries/rte/rte_triggers.lib.php:383 view_create.php:209
 msgid "Definer"
 msgstr ""
 
-#: libraries/rte/rte_events.lib.php:535 libraries/rte/rte_routines.lib.php:997
+#: libraries/rte/rte_events.lib.php:535
+#: libraries/rte/rte_routines.lib.php:1088
 #: libraries/rte/rte_triggers.lib.php:422
 msgid "The definer must be in the \"username@hostname\" format!"
 msgstr ""
@@ -12482,9 +12496,9 @@ msgid "You must provide an event definition."
 msgstr ""
 
 #: libraries/rte/rte_export.lib.php:43 libraries/rte/rte_general.lib.php:72
-#: libraries/rte/rte_routines.lib.php:345
-#: libraries/rte/rte_routines.lib.php:1198
-#: libraries/rte/rte_routines.lib.php:1411
+#: libraries/rte/rte_routines.lib.php:153
+#: libraries/rte/rte_routines.lib.php:1289
+#: libraries/rte/rte_routines.lib.php:1502
 #, fuzzy
 #| msgid "Error in Processing Request"
 msgid "Error in processing request:"
@@ -12520,155 +12534,155 @@ msgid ""
 "problems."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:110
-#: libraries/rte/rte_routines.lib.php:1006
-#, fuzzy, php-format
-#| msgid "Invalid server index: %s"
-msgid "Invalid routine type: \"%s\""
-msgstr "अवैध सर्वर सूचकांक: %s"
-
-#: libraries/rte/rte_routines.lib.php:170
-msgid "Sorry, we failed to restore the dropped routine."
-msgstr ""
-
-#: libraries/rte/rte_routines.lib.php:211
-#, fuzzy, php-format
-#| msgid "Column %s has been dropped."
-msgid "Routine %1$s has been modified. Privileges have been adjusted."
-msgstr "टेबल %s को रद्द किया गया है."
-
-#: libraries/rte/rte_routines.lib.php:216
-#, fuzzy, php-format
-#| msgid "Column %s has been dropped."
-msgid "Routine %1$s has been modified."
-msgstr "टेबल %s को रद्द किया गया है."
-
-#: libraries/rte/rte_routines.lib.php:238
-#, fuzzy, php-format
-#| msgid "Table %1$s has been created."
-msgid "Routine %1$s has been created."
-msgstr "%1$s टेबल बना दिया गया है"
-
-#: libraries/rte/rte_routines.lib.php:315
+#: libraries/rte/rte_routines.lib.php:123
 #, fuzzy
 #| msgid "Edit mode"
 msgid "Edit routine"
 msgstr "संपादन मोड"
 
-#: libraries/rte/rte_routines.lib.php:797
+#: libraries/rte/rte_routines.lib.php:200
+#: libraries/rte/rte_routines.lib.php:1097
+#, fuzzy, php-format
+#| msgid "Invalid server index: %s"
+msgid "Invalid routine type: \"%s\""
+msgstr "अवैध सर्वर सूचकांक: %s"
+
+#: libraries/rte/rte_routines.lib.php:253
+#, fuzzy, php-format
+#| msgid "Table %1$s has been created."
+msgid "Routine %1$s has been created."
+msgstr "%1$s टेबल बना दिया गया है"
+
+#: libraries/rte/rte_routines.lib.php:380
+msgid "Sorry, we failed to restore the dropped routine."
+msgstr ""
+
+#: libraries/rte/rte_routines.lib.php:439
+#, fuzzy, php-format
+#| msgid "Column %s has been dropped."
+msgid "Routine %1$s has been modified. Privileges have been adjusted."
+msgstr "टेबल %s को रद्द किया गया है."
+
+#: libraries/rte/rte_routines.lib.php:444
+#, fuzzy, php-format
+#| msgid "Column %s has been dropped."
+msgid "Routine %1$s has been modified."
+msgstr "टेबल %s को रद्द किया गया है."
+
+#: libraries/rte/rte_routines.lib.php:888
 #, fuzzy
 #| msgid "Routines"
 msgid "Routine name"
 msgstr "नियमित कार्य"
 
-#: libraries/rte/rte_routines.lib.php:823
+#: libraries/rte/rte_routines.lib.php:914
 msgid "Parameters"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:829
+#: libraries/rte/rte_routines.lib.php:920
 #, fuzzy
 #| msgid "Direct links"
 msgid "Direction"
 msgstr "सीधे संपर्क"
 
-#: libraries/rte/rte_routines.lib.php:847
+#: libraries/rte/rte_routines.lib.php:938
 #, fuzzy
 #| msgid "Add index"
 msgid "Add parameter"
 msgstr "अनुक्रमणिका जोड़"
 
-#: libraries/rte/rte_routines.lib.php:851
+#: libraries/rte/rte_routines.lib.php:942
 #, fuzzy
 #| msgid "Remove database"
 msgid "Remove last parameter"
 msgstr "डेटाबेस को हटा दे"
 
-#: libraries/rte/rte_routines.lib.php:856
+#: libraries/rte/rte_routines.lib.php:947
 msgid "Return type"
 msgstr "रिटर्न प्रकार"
 
-#: libraries/rte/rte_routines.lib.php:862
+#: libraries/rte/rte_routines.lib.php:953
 #, fuzzy
 #| msgid "Length/Values"
 msgid "Return length/values"
 msgstr "लंबाई/अर्थ*"
 
-#: libraries/rte/rte_routines.lib.php:868
+#: libraries/rte/rte_routines.lib.php:959
 #, fuzzy
 #| msgid "Table options"
 msgid "Return options"
 msgstr "टेबल विकल्प"
 
-#: libraries/rte/rte_routines.lib.php:899
+#: libraries/rte/rte_routines.lib.php:990
 msgid "Is deterministic"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:920
+#: libraries/rte/rte_routines.lib.php:1011
 msgid ""
 "You do not have sufficient privileges to perform this operation; Please "
 "refer to the documentation for more details"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:935
+#: libraries/rte/rte_routines.lib.php:1026
 #, fuzzy
 #| msgid "Security"
 msgid "Security type"
 msgstr "सुरक्षा"
 
-#: libraries/rte/rte_routines.lib.php:944
+#: libraries/rte/rte_routines.lib.php:1035
 msgid "SQL data access"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1013
+#: libraries/rte/rte_routines.lib.php:1104
 #, fuzzy
 #| msgid "Invalid table name"
 msgid "You must provide a routine name!"
 msgstr "अवैध टेबल नाम"
 
-#: libraries/rte/rte_routines.lib.php:1047
+#: libraries/rte/rte_routines.lib.php:1138
 #, php-format
 msgid "Invalid direction \"%s\" given for parameter."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1069
-#: libraries/rte/rte_routines.lib.php:1131
+#: libraries/rte/rte_routines.lib.php:1160
+#: libraries/rte/rte_routines.lib.php:1222
 msgid ""
 "You must provide length/values for routine parameters of type ENUM, SET, "
 "VARCHAR and VARBINARY."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1095
+#: libraries/rte/rte_routines.lib.php:1186
 msgid "You must provide a name and a type for each routine parameter."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1114
+#: libraries/rte/rte_routines.lib.php:1205
 msgid "You must provide a valid return type for the routine."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1174
+#: libraries/rte/rte_routines.lib.php:1265
 msgid "You must provide a routine definition."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1285
+#: libraries/rte/rte_routines.lib.php:1376
 #, fuzzy, php-format
 #| msgid "Allows executing stored routines."
 msgid "Execution results of routine %s"
 msgstr "संग्रहीत दिनचर्या को क्रियान्वित करने की अनुमति देता है"
 
-#: libraries/rte/rte_routines.lib.php:1340
+#: libraries/rte/rte_routines.lib.php:1431
 #, php-format
 msgid "%d row affected by the last statement inside the procedure."
 msgid_plural "%d rows affected by the last statement inside the procedure."
 msgstr[0] ""
 msgstr[1] ""
 
-#: libraries/rte/rte_routines.lib.php:1398
-#: libraries/rte/rte_routines.lib.php:1406
+#: libraries/rte/rte_routines.lib.php:1489
+#: libraries/rte/rte_routines.lib.php:1497
 msgid "Execute routine"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1485
-#: libraries/rte/rte_routines.lib.php:1488
+#: libraries/rte/rte_routines.lib.php:1576
+#: libraries/rte/rte_routines.lib.php:1579
 #, fuzzy
 #| msgid "Routines"
 msgid "Routine parameters"
@@ -12872,7 +12886,7 @@ msgid "Original position"
 msgstr "मूल स्थिति"
 
 #: libraries/server_bin_log.lib.php:133
-#: templates/structure/display_table_stats.phtml:4
+#: templates/table/structure/display_table_stats.phtml:4
 msgid "Information"
 msgstr "सूचना"
 
@@ -12910,12 +12924,12 @@ msgstr ""
 "नोट: यहां डाटाबेस के आँकडे Enable करने से webserver और MySQL के बीच में ट्रेफिक बडने की "
 "संभावना है।"
 
-#: libraries/server_databases.lib.php:364
-#: libraries/server_databases.lib.php:365
+#: libraries/server_databases.lib.php:366
+#: libraries/server_databases.lib.php:371
 msgid "Enable Statistics"
 msgstr "आँकडे Enable करें"
 
-#: libraries/server_databases.lib.php:481
+#: libraries/server_databases.lib.php:492
 #, fuzzy, php-format
 #| msgid "%s databases have been dropped successfully."
 msgid "%1$d database has been dropped successfully."
@@ -13294,7 +13308,7 @@ msgid "You have revoked the privileges for %s."
 msgstr "आपने %s के privileges वापस ले लिया."
 
 #: libraries/server_privileges.lib.php:2059
-#: libraries/server_privileges.lib.php:4290
+#: libraries/server_privileges.lib.php:4316
 #, fuzzy
 #| msgid "Add user"
 msgid "Add user account"
@@ -13475,60 +13489,60 @@ msgstr ""
 msgid "The privileges were reloaded successfully."
 msgstr "चयनित यूसर को सफलतापूर्वक हटा दिया गया है।"
 
-#: libraries/server_privileges.lib.php:3994
+#: libraries/server_privileges.lib.php:4003
 #, php-format
 msgid "The user %s already exists!"
 msgstr "उपयोगकर्ता %s पहले से मौजूद है!"
 
-#: libraries/server_privileges.lib.php:4232
+#: libraries/server_privileges.lib.php:4258
 #, fuzzy, php-format
 #| msgid "Privileges"
 msgid "Privileges for %s"
 msgstr "प्रिविलेज"
 
-#: libraries/server_privileges.lib.php:4241
+#: libraries/server_privileges.lib.php:4267
 #: libraries/server_status_processes.lib.php:72
 #: libraries/server_user_groups.lib.php:39
 msgid "User"
 msgstr "यूजर"
 
-#: libraries/server_privileges.lib.php:4282
+#: libraries/server_privileges.lib.php:4308
 msgctxt "Create new user"
 msgid "New"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4311
+#: libraries/server_privileges.lib.php:4337
 #, fuzzy
 #| msgid "Edit Privileges"
 msgid "Edit privileges:"
 msgstr "प्रिविलेज एडिट करें"
 
-#: libraries/server_privileges.lib.php:4312
+#: libraries/server_privileges.lib.php:4338
 #, fuzzy
 #| msgid "User"
 msgid "User account"
 msgstr "यूसर"
 
-#: libraries/server_privileges.lib.php:4371
+#: libraries/server_privileges.lib.php:4397
 msgid ""
 "Note: You are attempting to edit privileges of the user with which you are "
 "currently logged in."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4391 libraries/server_users.lib.php:25
+#: libraries/server_privileges.lib.php:4417 libraries/server_users.lib.php:25
 #, fuzzy
 #| msgid "User overview"
 msgid "User accounts overview"
 msgstr "यूसर सिंहावलोकन"
 
-#: libraries/server_privileges.lib.php:4459
+#: libraries/server_privileges.lib.php:4485
 msgid ""
 "A user account allowing any user from localhost to connect is present. This "
 "will prevent other users from connecting if the host part of their account "
 "allows a connection from any (%) host."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4500
+#: libraries/server_privileges.lib.php:4526
 #, php-format
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
@@ -13537,7 +13551,7 @@ msgid ""
 "%sreload the privileges%s before you continue."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4519
+#: libraries/server_privileges.lib.php:4545
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
 "tables. The content of these tables may differ from the privileges the "
@@ -13546,63 +13560,63 @@ msgid ""
 "privilege."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4569
+#: libraries/server_privileges.lib.php:4595
 msgid "The selected user was not found in the privilege table."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4801
+#: libraries/server_privileges.lib.php:4827
 msgid "You have added a new user."
 msgstr "आपने नया यूसर बना लिया।"
 
-#: libraries/server_status.lib.php:53
+#: libraries/server_status.lib.php:60
 #, php-format
 msgid "Network traffic since startup: %s"
 msgstr ""
 
-#: libraries/server_status.lib.php:66
+#: libraries/server_status.lib.php:73
 #, php-format
 msgid "This MySQL server has been running for %1$s. It started up on %2$s."
 msgstr ""
 
-#: libraries/server_status.lib.php:80
+#: libraries/server_status.lib.php:94
 msgid ""
 "This MySQL server works as <b>master</b> and <b>slave</b> in <b>replication</"
 "b> process."
 msgstr ""
 
-#: libraries/server_status.lib.php:85
+#: libraries/server_status.lib.php:99
 msgid "This MySQL server works as <b>master</b> in <b>replication</b> process."
 msgstr ""
 
-#: libraries/server_status.lib.php:90
+#: libraries/server_status.lib.php:104
 msgid "This MySQL server works as <b>slave</b> in <b>replication</b> process."
 msgstr ""
 
-#: libraries/server_status.lib.php:106
+#: libraries/server_status.lib.php:116
 msgid "Replication status"
 msgstr "प्रतिकृति स्थिति"
 
-#: libraries/server_status.lib.php:137
+#: libraries/server_status.lib.php:146
 msgid ""
 "On a busy server, the byte counters may overrun, so those statistics as "
 "reported by the MySQL server may be incorrect."
 msgstr ""
 
-#: libraries/server_status.lib.php:148
+#: libraries/server_status.lib.php:157
 msgid "Received"
 msgstr "प्राप्त"
 
-#: libraries/server_status.lib.php:167
+#: libraries/server_status.lib.php:176
 msgid "Sent"
 msgstr "भेजा"
 
-#: libraries/server_status.lib.php:234
+#: libraries/server_status.lib.php:243
 #, fuzzy
 #| msgid "max. concurrent connections"
 msgid "Max. concurrent connections"
 msgstr "अधिकतम वर्तमान कनेक्शन"
 
-#: libraries/server_status.lib.php:244
+#: libraries/server_status.lib.php:253
 msgid "Failed attempts"
 msgstr "असफल प्रयास"
 
@@ -14602,7 +14616,7 @@ msgstr ""
 msgid "Not implemented yet."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/AlterOperation.php:193
+#: libraries/sql-parser/src/Components/AlterOperation.php:191
 #, fuzzy
 #| msgid "Iconic table operations"
 msgid "Unrecognized alter operation."
@@ -14618,7 +14632,7 @@ msgid "An opening bracket followed by a set of values was expected."
 msgstr ""
 
 #: libraries/sql-parser/src/Components/ArrayObj.php:101
-#: libraries/sql-parser/src/Components/FieldDefinition.php:202
+#: libraries/sql-parser/src/Components/CreateDefinition.php:202
 msgid "An opening bracket was expected."
 msgstr ""
 
@@ -14626,25 +14640,35 @@ msgstr ""
 msgid "A comma or a closing bracket was expected"
 msgstr ""
 
+#: libraries/sql-parser/src/Components/CreateDefinition.php:246
+#, fuzzy
+#| msgid "No databases selected."
+msgid "A comma or a closing bracket was expected."
+msgstr "कोइ डाटाबेस नहीं चुना गया है।"
+
+#: libraries/sql-parser/src/Components/CreateDefinition.php:262
+msgid "A closing bracket was expected."
+msgstr ""
+
 #: libraries/sql-parser/src/Components/DataType.php:125
 msgid "Unrecognized data type."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:225
+#: libraries/sql-parser/src/Components/Expression.php:227
 msgid "Unexpected closing bracket."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:246
-#: libraries/sql-parser/src/Components/Expression.php:283
-#: libraries/sql-parser/src/Components/Expression.php:303
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:285
+#: libraries/sql-parser/src/Components/Expression.php:305
 msgid "An alias was previously found."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:257
+#: libraries/sql-parser/src/Components/Expression.php:259
 msgid "Unexpected dot."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:327
+#: libraries/sql-parser/src/Components/Expression.php:329
 #, fuzzy
 #| msgid "No databases selected."
 msgid "An alias was expected."
@@ -14656,16 +14680,6 @@ msgstr "कोइ डाटाबेस नहीं चुना गया ह
 msgid "An expression was expected."
 msgstr "कोई पंक्ति चयनित नहीं"
 
-#: libraries/sql-parser/src/Components/FieldDefinition.php:246
-#, fuzzy
-#| msgid "No databases selected."
-msgid "A comma or a closing bracket was expected."
-msgstr "कोइ डाटाबेस नहीं चुना गया है।"
-
-#: libraries/sql-parser/src/Components/FieldDefinition.php:262
-msgid "A closing bracket was expected."
-msgstr ""
-
 #: libraries/sql-parser/src/Components/Limit.php:90
 #: libraries/sql-parser/src/Components/Limit.php:112
 msgid "An offset was expected."
@@ -14709,29 +14723,29 @@ msgstr ""
 msgid "Expected delimiter."
 msgstr ""
 
-#: libraries/sql-parser/src/Lexer.php:753
+#: libraries/sql-parser/src/Lexer.php:777
 #, fuzzy, php-format
 #| msgid "Table %1$s has been created."
 msgid "Ending quote %1$s was expected."
 msgstr "%1$s टेबल बना दिया गया है"
 
-#: libraries/sql-parser/src/Lexer.php:789
+#: libraries/sql-parser/src/Lexer.php:813
 #, fuzzy
 #| msgid "Table name template"
 msgid "Variable name was expected."
 msgstr "टेबल नाम टेम्पलेट"
 
-#: libraries/sql-parser/src/Parser.php:380
+#: libraries/sql-parser/src/Parser.php:391
 #, fuzzy
 #| msgid "At Beginning of Table"
 msgid "Unexpected beginning of statement."
 msgstr "टेबल के शुरू में"
 
-#: libraries/sql-parser/src/Parser.php:399
+#: libraries/sql-parser/src/Parser.php:410
 msgid "Unrecognized statement type."
 msgstr ""
 
-#: libraries/sql-parser/src/Parser.php:479
+#: libraries/sql-parser/src/Parser.php:489
 msgid "No transaction was previously started."
 msgstr ""
 
@@ -14757,8 +14771,10 @@ msgid "The name of the entity was expected."
 msgstr ""
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:310
-msgid "At least one field definition was expected."
-msgstr ""
+#, fuzzy
+#| msgid "The row has been deleted."
+msgid "At least one column definition was expected."
+msgstr "रौ को डिलीट कर दिया"
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:329
 msgid "A \"RETURNS\" keyword was expected."
@@ -14835,11 +14851,11 @@ msgstr "बुकमार्क %s बनाया"
 msgid "Using bookmark \"%s\" as default browse query."
 msgstr ""
 
-#: libraries/sql.lib.php:1306
+#: libraries/sql.lib.php:1300
 msgid "Showing as PHP code"
 msgstr "PHP कोड की तरह दिखाएँ"
 
-#: libraries/sql.lib.php:1638
+#: libraries/sql.lib.php:1632
 #, fuzzy, php-format
 #| msgid ""
 #| "This table does not contain a unique column. Features related to the grid "
@@ -14851,7 +14867,7 @@ msgstr ""
 "इस टेबल में कोई भी विशिष्ट (unique) कॉलम नहीं है। इस बात कि सम्भावना है कि ग्रिड "
 "सम्पादन, टिक-बॉक्स, सम्पादन, प्रतिलिपि एवं मिटाने के लिंक से जुडी सुविधाएँ काम न करें।"
 
-#: libraries/sql.lib.php:1649
+#: libraries/sql.lib.php:1643
 #, fuzzy, php-format
 #| msgid ""
 #| "This table does not contain a unique column. Features related to the grid "
@@ -14863,7 +14879,7 @@ msgstr ""
 "इस टेबल में कोई भी विशिष्ट (unique) कॉलम नहीं है। इस बात कि सम्भावना है कि ग्रिड "
 "सम्पादन, टिक-बॉक्स, सम्पादन, प्रतिलिपि एवं मिटाने के लिंक से जुडी सुविधाएँ काम न करें।"
 
-#: libraries/sql.lib.php:1688
+#: libraries/sql.lib.php:1682
 #, php-format
 msgid "Problems with indexes of table `%s`"
 msgstr "`%s` टेबल के अनुक्रमित के साथ समस्याएँ"
@@ -15035,7 +15051,7 @@ msgid "Version %s snapshot (SQL code)"
 msgstr "संस्करण %s क्षणचित्र (SQL कोड)"
 
 #: libraries/tracking.lib.php:947
-#: templates/structure/table_structure_row.phtml:33
+#: templates/table/structure/table_structure_row.phtml:33
 msgctxt "None for default"
 msgid "None"
 msgstr "कोई नहीं"
@@ -15097,19 +15113,19 @@ msgstr "%s संस्करण बनायें %s.%s"
 msgid "Version %1$s was created, tracking for %2$s is active."
 msgstr "संस्करण %s बन चूका है, ट्रैकिंग %s.%s के लिए सक्रिय"
 
-#: libraries/user_preferences.inc.php:29
+#: libraries/user_preferences.inc.php:30
 #, fuzzy
 #| msgid "General relation features"
 msgid "Manage your settings"
 msgstr "सेटिंग्स प्रबंधक"
 
-#: libraries/user_preferences.inc.php:46 prefs_manage.php:307
+#: libraries/user_preferences.inc.php:54 prefs_manage.php:307
 #, fuzzy
 #| msgid "Modifications have been saved"
 msgid "Configuration has been saved."
 msgstr "विन्यास को बचाया गया है"
 
-#: libraries/user_preferences.inc.php:66
+#: libraries/user_preferences.inc.php:74
 #, php-format
 msgid ""
 "Your preferences will be saved for current session only. Storing them "
@@ -15510,7 +15526,7 @@ msgid "first"
 msgstr ""
 
 #: templates/columns_definitions/move_column.phtml:12
-#: templates/structure/add_column.phtml:21
+#: templates/table/structure/add_column.phtml:21
 #, fuzzy, php-format
 #| msgid "After %s"
 msgid "after %s"
@@ -15582,241 +15598,348 @@ msgstr "सामग्री दिखाने"
 msgid "Input transformation options"
 msgstr "परिवर्तन के विकल्प"
 
-#: templates/designer/aggregate_query_panel.phtml:22
-#: templates/designer/options_panel.phtml:100
+#: templates/database/create_table.phtml:7
+#: templates/database/designer/side_menu.phtml:77
+#: templates/database/designer/side_menu.phtml:80
+msgid "Create table"
+msgstr "टेबल बनायें"
+
+#: templates/database/create_table.phtml:15
+msgid "Number of columns"
+msgstr "काँलम की संख्या"
+
+#: templates/database/designer/aggregate_query_panel.phtml:22
+#: templates/database/designer/options_panel.phtml:100
 #, fuzzy
 #| msgid "Create"
 msgid "Aggregate"
 msgstr "कुल"
 
-#: templates/designer/aggregate_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:61
-#: templates/designer/options_panel.phtml:106
-#: templates/designer/options_panel.phtml:170
-#: templates/designer/where_query_panel.phtml:30
-#: templates/table/table_header.phtml:9
+#: templates/database/designer/aggregate_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:61
+#: templates/database/designer/options_panel.phtml:106
+#: templates/database/designer/options_panel.phtml:170
+#: templates/database/designer/where_query_panel.phtml:30
+#: templates/table/search/table_header.phtml:9
 msgid "Operator"
 msgstr "ऑपरेटर"
 
-#: templates/designer/database_tables.phtml:29
+#: templates/database/designer/database_tables.phtml:29
 msgid "Toggle"
 msgstr ""
 
-#: templates/designer/database_tables.phtml:40
+#: templates/database/designer/database_tables.phtml:40
 #, fuzzy
 #| msgid "Database for user"
 msgid "See table structure"
 msgstr "यूसर के लिए डेटाबेस"
 
-#: templates/designer/delete_relation_panel.phtml:21
+#: templates/database/designer/delete_relation_panel.phtml:21
 msgid "Delete relation"
 msgstr "संबंध हटाना"
 
-#: templates/designer/edit_delete_pages.phtml:7
+#: templates/database/designer/edit_delete_pages.phtml:7
 #, fuzzy
 #| msgid "Page titles"
 msgid "Page to open"
 msgstr "पृष्ठ शीर्षक"
 
-#: templates/designer/edit_delete_pages.phtml:7
+#: templates/database/designer/edit_delete_pages.phtml:7
 #, fuzzy
 #| msgid "Relation deleted"
 msgid "Page to delete"
 msgstr "रिश्ते को नष्ट कर दिया"
 
-#: templates/designer/having_query_panel.phtml:90
-#: templates/designer/options_panel.phtml:63
-#: templates/designer/options_panel.phtml:229
-#: templates/designer/where_query_panel.phtml:59
+#: templates/database/designer/having_query_panel.phtml:90
+#: templates/database/designer/options_panel.phtml:63
+#: templates/database/designer/options_panel.phtml:229
+#: templates/database/designer/where_query_panel.phtml:59
 #, fuzzy
 #| msgid "Export"
 msgid "Except"
 msgstr "सिवाय"
 
-#: templates/designer/having_query_panel.phtml:102
-#: templates/designer/options_panel.phtml:75
-#: templates/designer/options_panel.phtml:241
-#: templates/designer/where_query_panel.phtml:71
+#: templates/database/designer/having_query_panel.phtml:102
+#: templates/database/designer/options_panel.phtml:75
+#: templates/database/designer/options_panel.phtml:241
+#: templates/database/designer/where_query_panel.phtml:71
 #, fuzzy
 #| msgid "Query"
 msgid "subquery"
 msgstr "उप-क्वरी"
 
-#: templates/designer/new_relation_panel.phtml:22
-#: templates/designer/side_menu.phtml:84 templates/designer/side_menu.phtml:87
+#: templates/database/designer/new_relation_panel.phtml:22
+#: templates/database/designer/side_menu.phtml:84
+#: templates/database/designer/side_menu.phtml:87
 msgid "Create relation"
 msgstr "संबंध बनायें"
 
-#: templates/designer/options_panel.phtml:34
-#: templates/designer/options_panel.phtml:200
+#: templates/database/designer/options_panel.phtml:34
+#: templates/database/designer/options_panel.phtml:200
 #, fuzzy
 #| msgid "Relation deleted"
 msgid "Relation operator"
 msgstr "संबंध ऑपरेटर"
 
-#: templates/designer/options_panel.phtml:85
-#: templates/designer/rename_to_panel.phtml:23
+#: templates/database/designer/options_panel.phtml:85
+#: templates/database/designer/rename_to_panel.phtml:23
 #, fuzzy
 #| msgid "Rename database to"
 msgid "Rename to"
 msgstr "नाम बदल कर ____ रखें"
 
-#: templates/designer/options_panel.phtml:91
-#: templates/designer/rename_to_panel.phtml:31
+#: templates/database/designer/options_panel.phtml:91
+#: templates/database/designer/rename_to_panel.phtml:31
 #, fuzzy
 #| msgid "User name"
 msgid "New name"
 msgstr "नया नेम"
 
-#: templates/designer/page_save_as.phtml:4
+#: templates/database/designer/page_save_as.phtml:4
 #, fuzzy
 #| msgid "Export to selected page"
 msgid "Save to selected page"
 msgstr "चयनित पेज को निर्यात"
 
-#: templates/designer/page_save_as.phtml:5
+#: templates/database/designer/page_save_as.phtml:5
 #, fuzzy
 #| msgid "Create a new index"
 msgid "Create a page and save to it"
 msgstr "एक पेज बनाएँ और इसमें निर्यात करिएँ"
 
-#: templates/designer/page_save_as.phtml:26
+#: templates/database/designer/page_save_as.phtml:26
 #, fuzzy
 #| msgid "User name"
 msgid "New page name"
 msgstr "नया पेज के नाम"
 
-#: templates/designer/page_selector.phtml:2
+#: templates/database/designer/page_selector.phtml:2
 #, fuzzy
 #| msgid "Select Tables"
 msgid "Select page"
 msgstr "पेज चुनिये"
 
-#: templates/designer/query_details.phtml:10
+#: templates/database/designer/query_details.phtml:10
 #, fuzzy
 #| msgid "Actions"
 msgid "Active options"
 msgstr "सक्रिय विकल्प"
 
-#: templates/designer/schema_export.phtml:4
+#: templates/database/designer/schema_export.phtml:4
 msgid "Select Export Relational Type"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:19 templates/designer/side_menu.phtml:25
+#: templates/database/designer/side_menu.phtml:19
+#: templates/database/designer/side_menu.phtml:25
 #, fuzzy
 #| msgid "Show tables"
 msgid "Show/Hide tables list"
 msgstr "टेबल दिखाओ"
 
-#: templates/designer/side_menu.phtml:29 templates/designer/side_menu.phtml:35
-#: templates/designer/side_menu.phtml:36
+#: templates/database/designer/side_menu.phtml:29
+#: templates/database/designer/side_menu.phtml:35
+#: templates/database/designer/side_menu.phtml:36
 msgid "View in fullscreen"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:34
+#: templates/database/designer/side_menu.phtml:34
 msgid "Exit fullscreen"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:41 templates/designer/side_menu.phtml:45
+#: templates/database/designer/side_menu.phtml:41
+#: templates/database/designer/side_menu.phtml:45
 #, fuzzy
 #| msgid "User name"
 msgid "New page"
 msgstr "नया नेम"
 
-#: templates/designer/side_menu.phtml:70 templates/designer/side_menu.phtml:73
+#: templates/database/designer/side_menu.phtml:70
+#: templates/database/designer/side_menu.phtml:73
 #, fuzzy
 #| msgid "Select Tables"
 msgid "Delete pages"
 msgstr "पेज चुनिये"
 
-#: templates/designer/side_menu.phtml:77 templates/designer/side_menu.phtml:80
-#: templates/table/create_table.phtml:7
-msgid "Create table"
-msgstr "टेबल बनायें"
-
-#: templates/designer/side_menu.phtml:98
-#: templates/designer/side_menu.phtml:101
+#: templates/database/designer/side_menu.phtml:98
+#: templates/database/designer/side_menu.phtml:101
 msgid "Reload"
 msgstr "पुनः लोड"
 
-#: templates/designer/side_menu.phtml:107
-#: templates/designer/side_menu.phtml:110
+#: templates/database/designer/side_menu.phtml:107
+#: templates/database/designer/side_menu.phtml:110
 msgid "Help"
 msgstr "मदद"
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Angular links"
 msgstr "कोणीय लिंक"
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Direct links"
 msgstr "सीधे संपर्क"
 
-#: templates/designer/side_menu.phtml:122
-#: templates/designer/side_menu.phtml:124
+#: templates/database/designer/side_menu.phtml:122
+#: templates/database/designer/side_menu.phtml:124
 msgid "Snap to grid"
 msgstr "ग्रिड पर स्नैप"
 
-#: templates/designer/side_menu.phtml:128
-#: templates/designer/side_menu.phtml:134
+#: templates/database/designer/side_menu.phtml:128
+#: templates/database/designer/side_menu.phtml:134
 msgid "Small/Big All"
 msgstr "सभी छोटे/बड़े"
 
-#: templates/designer/side_menu.phtml:138
-#: templates/designer/side_menu.phtml:141
+#: templates/database/designer/side_menu.phtml:138
+#: templates/database/designer/side_menu.phtml:141
 msgid "Toggle small/big"
 msgstr "टोग्ल छोटे/बड़े"
 
-#: templates/designer/side_menu.phtml:145
-#: templates/designer/side_menu.phtml:148
+#: templates/database/designer/side_menu.phtml:145
+#: templates/database/designer/side_menu.phtml:148
 #, fuzzy
 #| msgid "To select relation, click :"
 msgid "Toggle relation lines"
 msgstr "संबंध चयन करने के लिए क्लिक करें :"
 
-#: templates/designer/side_menu.phtml:153
-#: templates/designer/side_menu.phtml:156
+#: templates/database/designer/side_menu.phtml:153
+#: templates/database/designer/side_menu.phtml:156
 #, fuzzy
 #| msgid "Export"
 msgid "Export schema"
 msgstr "निर्यात"
 
-#: templates/designer/side_menu.phtml:165
-#: templates/designer/side_menu.phtml:168
+#: templates/database/designer/side_menu.phtml:165
+#: templates/database/designer/side_menu.phtml:168
 #, fuzzy
 #| msgid "Submit Query"
 msgid "Build Query"
 msgstr "क्वरी प्रस्तुत करें"
 
-#: templates/designer/side_menu.phtml:173
-#: templates/designer/side_menu.phtml:177
+#: templates/database/designer/side_menu.phtml:173
+#: templates/database/designer/side_menu.phtml:177
 msgid "Move Menu"
 msgstr "चाल मेनू"
 
-#: templates/designer/side_menu.phtml:181
-#: templates/designer/side_menu.phtml:186
+#: templates/database/designer/side_menu.phtml:181
+#: templates/database/designer/side_menu.phtml:186
 #, fuzzy
 #| msgid "Partial texts"
 msgid "Pin text"
 msgstr "आंशिक पाठ"
 
-#: templates/designer/table_list.phtml:4
+#: templates/database/designer/table_list.phtml:4
 msgid "Hide/Show all"
 msgstr "सभी दिखाना/छिपाना"
 
-#: templates/designer/table_list.phtml:14
+#: templates/database/designer/table_list.phtml:14
 msgid "Hide/Show Tables with no relation"
 msgstr "बिना रिश्ते की टेबलओं को दिखाना/छिपाना"
 
-#: templates/designer/table_list.phtml:59
+#: templates/database/designer/table_list.phtml:59
 #, fuzzy
 #| msgid "Number of tables"
 msgid "Number of tables:"
 msgstr "टेबल की संख्या"
 
+#: templates/database/structure/body_for_table_summary.phtml:6
+#, php-format
+msgid "%s table"
+msgid_plural "%s tables"
+msgstr[0] "%s टेबल"
+msgstr[1] "%s टेबल"
+
+#: templates/database/structure/body_for_table_summary.phtml:17
+msgid "Sum"
+msgstr "जोड"
+
+#: templates/database/structure/check_all_tables.phtml:6
+msgid "Check tables having overhead"
+msgstr "ओवर्हेअद वाली तालुकाओं को चेक करें."
+
+#: templates/database/structure/check_all_tables.phtml:10
+#, fuzzy
+#| msgid "Show color"
+msgid "Show create"
+msgstr "रंग दिखाओ"
+
+#: templates/database/structure/check_all_tables.phtml:27
+#, fuzzy
+#| msgid "Add index"
+msgid "Prefix"
+msgstr "अनुक्रमणिका जोड़"
+
+#: templates/database/structure/check_all_tables.phtml:28
+msgid "Add prefix to table"
+msgstr "टेबल पर उपसर्ग जोड़ें"
+
+#: templates/database/structure/check_all_tables.phtml:29
+msgid "Replace table prefix"
+msgstr "टेबल के उपसर्ग को पुनर्स्थापना करें"
+
+#: templates/database/structure/check_all_tables.phtml:30
+msgid "Copy table with prefix"
+msgstr "टेबल को इस उपसर्ग के साथ प्रतिलिपि बनाएँ"
+
+#: templates/database/structure/check_all_tables.phtml:36
+#, fuzzy
+#| msgid "CHAR textarea columns"
+msgid "Add columns to central list"
+msgstr "CHAR textarea कॉलम"
+
+#: templates/database/structure/check_all_tables.phtml:37
+msgid "Remove columns from central list"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:38
+#, fuzzy
+#| msgid "CHAR textarea columns"
+msgid "Make consistent with central list"
+msgstr "CHAR textarea कॉलम"
+
+#: templates/database/structure/favorite_anchor.phtml:12
+#, fuzzy
+#| msgid "Add a new server"
+msgid "Add to Favorites"
+msgstr "एक नया सर्वर जोडें"
+
+#: templates/database/structure/show_create.phtml:2
+#, fuzzy
+#| msgid "Show SQL queries"
+msgid "Showing create queries"
+msgstr "SQL प्रशन दिखाएँ"
+
+#: templates/database/structure/sortable_header.phtml:13
+msgid "Sort"
+msgstr "सॉर्ट"
+
+#: templates/database/structure/table_header.phtml:42
+#, fuzzy
+#| msgid "May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]"
+msgid ""
+"May be approximate. Click on the number to get the exact count. See "
+"[doc@faq3-11]FAQ 3.11[/doc]."
+msgstr "शायद अनुमानित हैं. [doc@faq3-11]FAQ 3.11[/doc] देखें"
+
+#: templates/database/structure/table_header.phtml:66
+#: templates/table/index_form.phtml:127
+msgid "Size"
+msgstr "आकार"
+
+#: templates/database/structure/table_header.phtml:74
+#: templates/table/structure/display_table_stats.phtml:27
+msgid "Overhead"
+msgstr "जरूरत से ज्यादा"
+
+#: templates/database/structure/tracking_icon.phtml:4
+msgid "Tracking is active."
+msgstr "ट्रैकिंग सक्रिय है।"
+
+#: templates/database/structure/tracking_icon.phtml:8
+msgid "Tracking is not active."
+msgstr "ट्रैकिंग सक्रिय नहीं है."
+
 #: templates/error/report_form.phtml:7
 msgid ""
 "phpMyAdmin has encountered an error. We have collected data about this error "
@@ -15832,75 +15955,6 @@ msgstr ""
 msgid "Please explain the steps that lead to the error:"
 msgstr ""
 
-#: templates/gis_visualization/gis_visualization.phtml:3
-#, fuzzy
-#| msgid "Display servers selection"
-msgid "Display GIS Visualization"
-msgstr "सर्वर चयन प्रदशित करें"
-
-#: templates/gis_visualization/gis_visualization.phtml:8
-#, fuzzy
-#| msgid "Textarea columns"
-msgid "Label column"
-msgstr "पाठ क्षेत्रपाठ क्षेत्र कोलम"
-
-#: templates/gis_visualization/gis_visualization.phtml:11
-#, fuzzy
-#| msgid "- none -"
-msgid "-- None --"
-msgstr "- कोई नहीं -"
-
-#: templates/gis_visualization/gis_visualization.phtml:19
-#, fuzzy
-#| msgid "Total"
-msgid "Spatial column"
-msgstr "कुल"
-
-#: templates/index_form.phtml:16
-msgid "Index name:"
-msgstr "इन्डेक्स नाम"
-
-#: templates/index_form.phtml:19
-msgid ""
-"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
-msgstr "\"PRIMARY\" <b>केवल एक</b> प्राथमिक कुंजी का नाम <b>हो सकता है</b>!"
-
-#: templates/index_form.phtml:40
-#, fuzzy
-#| msgid "Index cache size"
-msgid "Index choice:"
-msgstr "सूचकांक कैश आकार"
-
-#: templates/index_form.phtml:57
-msgid "Key block size:"
-msgstr ""
-
-#: templates/index_form.phtml:74
-msgid "Index type:"
-msgstr "इन्डेक्स प्रकार"
-
-#: templates/index_form.phtml:86
-#, fuzzy
-#| msgid "User:"
-msgid "Parser:"
-msgstr "उपयोगकर्ता :"
-
-#: templates/index_form.phtml:102
-#, fuzzy
-#| msgid "Comment"
-msgid "Comment:"
-msgstr "टिप्पणी"
-
-#: templates/index_form.phtml:127 templates/structure/table_header.phtml:66
-msgid "Size"
-msgstr "आकार"
-
-#: templates/index_form.phtml:149 templates/index_form.phtml:190
-#, fuzzy
-#| msgid "Drag to reorder"
-msgid "Drag to reorder"
-msgstr "पुनः व्यवस्थित करने के लिए घसीटें"
-
 #: templates/prefs_autoload.phtml:9
 msgid ""
 "Your browser has phpMyAdmin configuration for this domain. Would you like to "
@@ -15913,496 +15967,465 @@ msgstr ""
 msgid "Start row:"
 msgstr "क्षेत्र रोयाँ"
 
-#: templates/structure/actions_in_table_structure.phtml:14
-#, php-format
-msgid "A primary key has been added on %s."
-msgstr "%s  पर एक प्राईमरी की जड़ी गयी है"
-
-#: templates/structure/actions_in_table_structure.phtml:34
-#: templates/structure/actions_in_table_structure.phtml:54
-#: templates/structure/actions_in_table_structure.phtml:79
-#: templates/structure/actions_in_table_structure.phtml:101
-#, php-format
-msgid "An index has been added on %s."
-msgstr "%s पर एक सूचकांक जोड़ा गया है"
-
-#: templates/structure/actions_in_table_structure.phtml:130
-#: templates/structure/check_all_table_column.phtml:59
-#, fuzzy
-#| msgid "Remove column(s)"
-msgid "Remove from central columns"
-msgstr "काँलम हटाना"
-
-#: templates/structure/actions_in_table_structure.phtml:138
-#: templates/structure/check_all_table_column.phtml:55
-#, fuzzy
-#| msgid "CHAR textarea columns"
-msgid "Add to central columns"
-msgstr "CHAR textarea कॉलम"
-
-#: templates/structure/add_column.phtml:7
-#, fuzzy, php-format
-#| msgid "Add %s field(s)"
-msgid "Add %s column(s)"
-msgstr "%s क्षेत्र जोडें"
-
-#: templates/structure/add_column.phtml:12
-#, fuzzy
-#| msgid "At Beginning of Table"
-msgid "at beginning of table"
-msgstr "टेबल के शुरू में"
-
-#: templates/structure/body_for_table_summary.phtml:6
-#, php-format
-msgid "%s table"
-msgid_plural "%s tables"
-msgstr[0] "%s टेबल"
-msgstr[1] "%s टेबल"
-
-#: templates/structure/body_for_table_summary.phtml:17
-msgid "Sum"
-msgstr "जोड"
-
-#: templates/structure/check_all_tables.phtml:6
-msgid "Check tables having overhead"
-msgstr "ओवर्हेअद वाली तालुकाओं को चेक करें."
-
-#: templates/structure/check_all_tables.phtml:10
-#, fuzzy
-#| msgid "Show color"
-msgid "Show create"
-msgstr "रंग दिखाओ"
-
-#: templates/structure/check_all_tables.phtml:27
-#, fuzzy
-#| msgid "Add index"
-msgid "Prefix"
-msgstr "अनुक्रमणिका जोड़"
-
-#: templates/structure/check_all_tables.phtml:28
-msgid "Add prefix to table"
-msgstr "टेबल पर उपसर्ग जोड़ें"
-
-#: templates/structure/check_all_tables.phtml:29
-msgid "Replace table prefix"
-msgstr "टेबल के उपसर्ग को पुनर्स्थापना करें"
-
-#: templates/structure/check_all_tables.phtml:30
-msgid "Copy table with prefix"
-msgstr "टेबल को इस उपसर्ग के साथ प्रतिलिपि बनाएँ"
-
-#: templates/structure/check_all_tables.phtml:36
-#, fuzzy
-#| msgid "CHAR textarea columns"
-msgid "Add columns to central list"
-msgstr "CHAR textarea कॉलम"
-
-#: templates/structure/check_all_tables.phtml:37
-msgid "Remove columns from central list"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:38
-#, fuzzy
-#| msgid "CHAR textarea columns"
-msgid "Make consistent with central list"
-msgstr "CHAR textarea कॉलम"
-
-#: templates/structure/display_structure.phtml:140 view_create.php:181
-#, fuzzy
-#| msgid "Print view"
-msgid "Edit view"
-msgstr "छपाई द्रश्य."
-
-#: templates/structure/display_table_stats.phtml:9
-msgid "Space usage"
-msgstr "स्थान उपयोग"
-
-#: templates/structure/display_table_stats.phtml:27
-#: templates/structure/table_header.phtml:74
-msgid "Overhead"
-msgstr "जरूरत से ज्यादा"
-
-#: templates/structure/display_table_stats.phtml:32
-msgid "Effective"
-msgstr "वास्तविक"
-
-#: templates/structure/favorite_anchor.phtml:12
-#, fuzzy
-#| msgid "Add a new server"
-msgid "Add to Favorites"
-msgstr "एक नया सर्वर जोडें"
-
-#: templates/structure/move_columns_dialog.phtml:1
-#: templates/structure/optional_action_links.phtml:21
-#, fuzzy
-#| msgid "Remove column(s)"
-msgid "Move columns"
-msgstr "काँलम हटाना"
-
-#: templates/structure/move_columns_dialog.phtml:2
-msgid "Move the columns by dragging them up and down."
-msgstr ""
-
-#: templates/structure/optional_action_links.phtml:9
-msgid "Propose table structure"
-msgstr "टेबल संरचना का प्रस्ताव"
-
-#: templates/structure/optional_action_links.phtml:24
-#, fuzzy
-#| msgid "Propose table structure"
-msgid "Improve table structure"
-msgstr "टेबल संरचना का प्रस्ताव"
-
-#: templates/structure/optional_action_links.phtml:30
-#, fuzzy
-#| msgid "Track table"
-msgid "Track view"
-msgstr "टेबलओं को ट्रैक करें"
-
-#: templates/structure/row_stats_table.phtml:3
-#, fuzzy
-#| msgid "Row Statistics"
-msgid "Row statistics"
-msgstr "पंक्ति आँकड़े"
-
-#: templates/structure/row_stats_table.phtml:9
-msgid "static"
-msgstr "स्थिर"
-
-#: templates/structure/row_stats_table.phtml:11
-msgid "dynamic"
-msgstr "गतिशील"
-
-#: templates/structure/row_stats_table.phtml:22
-msgid "partitioned"
-msgstr "विभाजित"
-
-#: templates/structure/row_stats_table.phtml:54
-msgid "Row length"
-msgstr "रौ की लंबाई"
-
-#: templates/structure/row_stats_table.phtml:66
-msgid "Row size"
-msgstr "रौ का आकार"
-
-#: templates/structure/row_stats_table.phtml:73
-msgid "Next autoindex"
-msgstr ""
-
-#: templates/structure/secondary_tabs.phtml:14
-#, fuzzy
-#| msgid "Relation view"
-msgid "Relation view"
-msgstr "संबंध दृश्य"
-
-#: templates/structure/show_create.phtml:2
-#, fuzzy
-#| msgid "Show SQL queries"
-msgid "Showing create queries"
-msgstr "SQL प्रशन दिखाएँ"
-
-#: templates/structure/sortable_header.phtml:13
-msgid "Sort"
-msgstr "सॉर्ट"
-
-#: templates/structure/table_header.phtml:42
-#, fuzzy
-#| msgid "May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]"
-msgid ""
-"May be approximate. Click on the number to get the exact count. See "
-"[doc@faq3-11]FAQ 3.11[/doc]."
-msgstr "शायद अनुमानित हैं. [doc@faq3-11]FAQ 3.11[/doc] देखें"
-
-#: templates/structure/table_structure_row.phtml:46
-#, php-format
-msgid "Column %s has been dropped."
-msgstr "टेबल %s को रद्द किया गया है."
-
-#: templates/structure/tracking_icon.phtml:4
-msgid "Tracking is active."
-msgstr "ट्रैकिंग सक्रिय है।"
-
-#: templates/structure/tracking_icon.phtml:8
-msgid "Tracking is not active."
-msgstr "ट्रैकिंग सक्रिय नहीं है."
-
-#: templates/table/create_table.phtml:15
-msgid "Number of columns"
-msgstr "काँलम की संख्या"
-
-#: templates/table/options.phtml:8
-msgid "Select columns (at least one):"
-msgstr "स्तंभ चुनें (कम से कम एक):"
-
-#: templates/table/options.phtml:37
-msgid "Add search conditions (body of the \"where\" clause):"
-msgstr "खोज शर्तें जोडें (\"where\" खंड के शरीर में):"
-
-#: templates/table/options.phtml:45
-msgid "Number of rows per page"
-msgstr "प्रति पृष्ट कितने रौ"
-
-#: templates/table/options.phtml:56
-msgid "Display order:"
-msgstr "क्रम से दिखाओ:"
-
-#: templates/table/options_zoom.phtml:6
-msgid "Use this column to label each point"
-msgstr ""
-
-#: templates/table/options_zoom.phtml:35
-#, fuzzy
-#| msgid "Maximum number of rows to display"
-msgid "Maximum rows to plot"
-msgstr "प्रदर्शित रो की अधिकतम संख्या"
-
-#: templates/table/replace_preview.phtml:13
-msgid "Find and replace - preview"
-msgstr ""
-
-#: templates/table/replace_preview.phtml:18
-#, fuzzy
-#| msgid "Original position"
-msgid "Original string"
-msgstr "मूल स्थिति"
-
-#: templates/table/replace_preview.phtml:19
-#, fuzzy
-#| msgid "Replication"
-msgid "Replaced string"
-msgstr "पसंबंधित लिंक"
-
-#: templates/table/replace_preview.phtml:40
-#, fuzzy
-#| msgid "Replicated"
-msgid "Replace"
-msgstr "दोहराया"
-
-#: templates/table/rows_zoom.phtml:16
-#, fuzzy
-#| msgid "Hide search criteria"
-msgid "Additional search criteria"
-msgstr "खोज मापदंड छिपाना"
-
-#: templates/table/search_and_replace.phtml:3
-#, fuzzy
-#| msgid "Replace NULL by"
-msgid "Replace with:"
-msgstr "शून्य की जगह पर"
-
-#: templates/table/search_and_replace.phtml:22
-#, fuzzy
-#| msgid "as regular expression"
-msgid "Use regular expression"
-msgstr "नियमित अभिव्यक्ति के रूप में"
-
-#: templates/table/selection_form.phtml:12
-msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
-msgstr ""
-
-#: templates/table/selection_form.phtml:34
-msgid "Do a \"query by example\" (wildcard: \"%\")"
-msgstr ""
-
-#: templates/table/zoom_result_form.phtml:7
-msgid "Browse/Edit the points"
-msgstr ""
-
-#: templates/table/zoom_result_form.phtml:15
-#, fuzzy
-#| msgid "Control user"
-msgid "How to use"
-msgstr "नियंत्रण यूसर"
-
-#: templates/table/zoom_result_form.phtml:23
-#, fuzzy
-#| msgid "Reset"
-msgid "Reset zoom"
-msgstr "रीसेट"
-
-#: templates/tbl_chart.phtml:17
+#: templates/table/chart/tbl_chart.phtml:17
 #, fuzzy
 #| msgid "Bar"
 msgctxt "Chart type"
 msgid "Bar"
 msgstr "पट्टी"
 
-#: templates/tbl_chart.phtml:21
+#: templates/table/chart/tbl_chart.phtml:21
 #, fuzzy
 #| msgid "Column"
 msgctxt "Chart type"
 msgid "Column"
 msgstr "स्तम्भ"
 
-#: templates/tbl_chart.phtml:25
+#: templates/table/chart/tbl_chart.phtml:25
 #, fuzzy
 #| msgid "Line"
 msgctxt "Chart type"
 msgid "Line"
 msgstr "लाइन"
 
-#: templates/tbl_chart.phtml:29
+#: templates/table/chart/tbl_chart.phtml:29
 #, fuzzy
 #| msgid "Inline"
 msgctxt "Chart type"
 msgid "Spline"
 msgstr "इनलाइन"
 
-#: templates/tbl_chart.phtml:33
+#: templates/table/chart/tbl_chart.phtml:33
 msgctxt "Chart type"
 msgid "Area"
 msgstr ""
 
-#: templates/tbl_chart.phtml:37
+#: templates/table/chart/tbl_chart.phtml:37
 #, fuzzy
 #| msgid "Pie"
 msgctxt "Chart type"
 msgid "Pie"
 msgstr "Pie"
 
-#: templates/tbl_chart.phtml:41
+#: templates/table/chart/tbl_chart.phtml:41
 #, fuzzy
 #| msgid "Time"
 msgctxt "Chart type"
 msgid "Timeline"
 msgstr "समय"
 
-#: templates/tbl_chart.phtml:45
+#: templates/table/chart/tbl_chart.phtml:45
 msgctxt "Chart type"
 msgid "Scatter"
 msgstr ""
 
-#: templates/tbl_chart.phtml:50
+#: templates/table/chart/tbl_chart.phtml:50
 msgid "Stacked"
 msgstr "जमा"
 
-#: templates/tbl_chart.phtml:53
+#: templates/table/chart/tbl_chart.phtml:53
 #, fuzzy
 #| msgid "Default title"
 msgid "Chart title"
 msgstr "डिफ़ॉल्ट शीर्षक"
 
-#: templates/tbl_chart.phtml:57
+#: templates/table/chart/tbl_chart.phtml:57
 msgid "X-Axis:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:72
+#: templates/table/chart/tbl_chart.phtml:72
 #, fuzzy
 #| msgid "SQL queries"
 msgid "Series:"
 msgstr "SQL क्वरी"
 
-#: templates/tbl_chart.phtml:102
+#: templates/table/chart/tbl_chart.phtml:102
 #, fuzzy
 #| msgid "X Axis label"
 msgid "X-Axis label:"
 msgstr "X Axis लेबल"
 
-#: templates/tbl_chart.phtml:104
+#: templates/table/chart/tbl_chart.phtml:104
 #, fuzzy
 #| msgid "Value"
 msgid "X Values"
 msgstr "मूल्य"
 
-#: templates/tbl_chart.phtml:107
+#: templates/table/chart/tbl_chart.phtml:107
 #, fuzzy
 #| msgid "Y Axis label"
 msgid "Y-Axis label:"
 msgstr "Y Axis लेबल"
 
-#: templates/tbl_chart.phtml:115
+#: templates/table/chart/tbl_chart.phtml:115
 msgid "Series names are in a column"
 msgstr ""
 
-#: templates/tbl_chart.phtml:118
+#: templates/table/chart/tbl_chart.phtml:118
 #, fuzzy
 #| msgid "Inside column:"
 msgid "Series column:"
 msgstr "काँलम के अंदर:"
 
-#: templates/tbl_chart.phtml:130
+#: templates/table/chart/tbl_chart.phtml:130
 #, fuzzy
 #| msgid "Values for column %s"
 msgid "Value Column:"
 msgstr "%s स्तंभ के लिए मूल्य"
 
-#: templates/tbl_chart.phtml:150
+#: templates/table/chart/tbl_chart.phtml:150
 #, fuzzy
 #| msgid "Save as file"
 msgid "Save chart as image"
 msgstr "फ़ाइल के रूप में सहेजें"
 
-#: templates/tbl_relation/common_form.phtml:7
+#: templates/table/gis_visualization/gis_visualization.phtml:3
+#, fuzzy
+#| msgid "Display servers selection"
+msgid "Display GIS Visualization"
+msgstr "सर्वर चयन प्रदशित करें"
+
+#: templates/table/gis_visualization/gis_visualization.phtml:8
+#, fuzzy
+#| msgid "Textarea columns"
+msgid "Label column"
+msgstr "पाठ क्षेत्रपाठ क्षेत्र कोलम"
+
+#: templates/table/gis_visualization/gis_visualization.phtml:11
+#, fuzzy
+#| msgid "- none -"
+msgid "-- None --"
+msgstr "- कोई नहीं -"
+
+#: templates/table/gis_visualization/gis_visualization.phtml:19
+#, fuzzy
+#| msgid "Total"
+msgid "Spatial column"
+msgstr "कुल"
+
+#: templates/table/index_form.phtml:16
+msgid "Index name:"
+msgstr "इन्डेक्स नाम"
+
+#: templates/table/index_form.phtml:19
+msgid ""
+"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
+msgstr "\"PRIMARY\" <b>केवल एक</b> प्राथमिक कुंजी का नाम <b>हो सकता है</b>!"
+
+#: templates/table/index_form.phtml:40
+#, fuzzy
+#| msgid "Index cache size"
+msgid "Index choice:"
+msgstr "सूचकांक कैश आकार"
+
+#: templates/table/index_form.phtml:57
+msgid "Key block size:"
+msgstr ""
+
+#: templates/table/index_form.phtml:74
+msgid "Index type:"
+msgstr "इन्डेक्स प्रकार"
+
+#: templates/table/index_form.phtml:86
+#, fuzzy
+#| msgid "User:"
+msgid "Parser:"
+msgstr "उपयोगकर्ता :"
+
+#: templates/table/index_form.phtml:102
+#, fuzzy
+#| msgid "Comment"
+msgid "Comment:"
+msgstr "टिप्पणी"
+
+#: templates/table/index_form.phtml:149 templates/table/index_form.phtml:190
+#, fuzzy
+#| msgid "Drag to reorder"
+msgid "Drag to reorder"
+msgstr "पुनः व्यवस्थित करने के लिए घसीटें"
+
+#: templates/table/relation/common_form.phtml:7
 msgid "Internal relations"
 msgstr "आंतरिक संबंध"
 
-#: templates/tbl_relation/common_form.phtml:11
+#: templates/table/relation/common_form.phtml:11
 msgid "Internal relation"
 msgstr "आंतरिक संबंध"
 
-#: templates/tbl_relation/common_form.phtml:14
+#: templates/table/relation/common_form.phtml:14
 msgid ""
 "An internal relation is not necessary when a corresponding FOREIGN KEY "
 "relation exists."
 msgstr "एक आंतरिक संबंध आवश्यक  नहीं है जब एक विदेशी कुंजी संबंध मौजूद है."
 
-#: templates/tbl_relation/common_form.phtml:37
+#: templates/table/relation/common_form.phtml:37
 #, fuzzy
 #| msgid "Foreign key constraint"
 msgid "Foreign key constraints"
 msgstr "विदेशी कुंजी बाधा"
 
-#: templates/tbl_relation/common_form.phtml:40
+#: templates/table/relation/common_form.phtml:40
 #, fuzzy
 #| msgid "Action"
 msgid "Actions"
 msgstr "कार्य"
 
-#: templates/tbl_relation/common_form.phtml:41
+#: templates/table/relation/common_form.phtml:41
 #, fuzzy
 #| msgid "Constraints for table"
 msgid "Constraint properties"
 msgstr "टेबल के लिए प्रतिबन्ध"
 
-#: templates/tbl_relation/common_form.phtml:44
+#: templates/table/relation/common_form.phtml:44
 msgid ""
 "Only columns with index will be displayed. You can define an index below."
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:49
+#: templates/table/relation/common_form.phtml:49
 msgid "Foreign key constraint"
 msgstr "विदेशी कुंजी बाधा"
 
-#: templates/tbl_relation/common_form.phtml:81
+#: templates/table/relation/common_form.phtml:81
 #, fuzzy
 #| msgid "Add constraints"
 msgid "+ Add constraint"
 msgstr "शर्तें जोडें"
 
-#: templates/tbl_relation/common_form.phtml:91
+#: templates/table/relation/common_form.phtml:91
 #, fuzzy
 #| msgid "Choose column to display"
 msgid "Choose column to display:"
 msgstr "प्रदर्शित करने के लिए काँलम चुनें"
 
-#: templates/tbl_relation/foreign_key_row.phtml:13
+#: templates/table/relation/foreign_key_row.phtml:13
 #, fuzzy, php-format
 #| msgid "Foreign key constraint"
 msgid "Foreign key constraint %s has been dropped"
 msgstr "विदेशी कुंजी बाधा"
 
-#: templates/tbl_relation/foreign_key_row.phtml:102
+#: templates/table/relation/foreign_key_row.phtml:102
 #, fuzzy
 #| msgid "Constraints for table"
 msgid "Constraint name"
 msgstr "टेबल के लिए प्रतिबन्ध"
 
-#: templates/tbl_relation/foreign_key_row.phtml:157
+#: templates/table/relation/foreign_key_row.phtml:157
 #, fuzzy
 #| msgid "Add column"
 msgid "+ Add column"
 msgstr "नया काँलम जोडें"
 
+#: templates/table/search/options.phtml:8
+msgid "Select columns (at least one):"
+msgstr "स्तंभ चुनें (कम से कम एक):"
+
+#: templates/table/search/options.phtml:37
+msgid "Add search conditions (body of the \"where\" clause):"
+msgstr "खोज शर्तें जोडें (\"where\" खंड के शरीर में):"
+
+#: templates/table/search/options.phtml:45
+msgid "Number of rows per page"
+msgstr "प्रति पृष्ट कितने रौ"
+
+#: templates/table/search/options.phtml:56
+msgid "Display order:"
+msgstr "क्रम से दिखाओ:"
+
+#: templates/table/search/options_zoom.phtml:6
+msgid "Use this column to label each point"
+msgstr ""
+
+#: templates/table/search/options_zoom.phtml:35
+#, fuzzy
+#| msgid "Maximum number of rows to display"
+msgid "Maximum rows to plot"
+msgstr "प्रदर्शित रो की अधिकतम संख्या"
+
+#: templates/table/search/replace_preview.phtml:13
+msgid "Find and replace - preview"
+msgstr ""
+
+#: templates/table/search/replace_preview.phtml:18
+#, fuzzy
+#| msgid "Original position"
+msgid "Original string"
+msgstr "मूल स्थिति"
+
+#: templates/table/search/replace_preview.phtml:19
+#, fuzzy
+#| msgid "Replication"
+msgid "Replaced string"
+msgstr "पसंबंधित लिंक"
+
+#: templates/table/search/replace_preview.phtml:40
+#, fuzzy
+#| msgid "Replicated"
+msgid "Replace"
+msgstr "दोहराया"
+
+#: templates/table/search/rows_zoom.phtml:16
+#, fuzzy
+#| msgid "Hide search criteria"
+msgid "Additional search criteria"
+msgstr "खोज मापदंड छिपाना"
+
+#: templates/table/search/search_and_replace.phtml:3
+#, fuzzy
+#| msgid "Replace NULL by"
+msgid "Replace with:"
+msgstr "शून्य की जगह पर"
+
+#: templates/table/search/search_and_replace.phtml:22
+#, fuzzy
+#| msgid "as regular expression"
+msgid "Use regular expression"
+msgstr "नियमित अभिव्यक्ति के रूप में"
+
+#: templates/table/search/selection_form.phtml:12
+msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
+msgstr ""
+
+#: templates/table/search/selection_form.phtml:34
+msgid "Do a \"query by example\" (wildcard: \"%\")"
+msgstr ""
+
+#: templates/table/search/zoom_result_form.phtml:7
+msgid "Browse/Edit the points"
+msgstr ""
+
+#: templates/table/search/zoom_result_form.phtml:15
+#, fuzzy
+#| msgid "Control user"
+msgid "How to use"
+msgstr "नियंत्रण यूसर"
+
+#: templates/table/search/zoom_result_form.phtml:23
+#, fuzzy
+#| msgid "Reset"
+msgid "Reset zoom"
+msgstr "रीसेट"
+
+#: templates/table/secondary_tabs.phtml:14
+#, fuzzy
+#| msgid "Relation view"
+msgid "Relation view"
+msgstr "संबंध दृश्य"
+
+#: templates/table/structure/actions_in_table_structure.phtml:14
+#, php-format
+msgid "A primary key has been added on %s."
+msgstr "%s  पर एक प्राईमरी की जड़ी गयी है"
+
+#: templates/table/structure/actions_in_table_structure.phtml:34
+#: templates/table/structure/actions_in_table_structure.phtml:54
+#: templates/table/structure/actions_in_table_structure.phtml:79
+#: templates/table/structure/actions_in_table_structure.phtml:101
+#, php-format
+msgid "An index has been added on %s."
+msgstr "%s पर एक सूचकांक जोड़ा गया है"
+
+#: templates/table/structure/actions_in_table_structure.phtml:130
+#: templates/table/structure/check_all_table_column.phtml:59
+#, fuzzy
+#| msgid "Remove column(s)"
+msgid "Remove from central columns"
+msgstr "काँलम हटाना"
+
+#: templates/table/structure/actions_in_table_structure.phtml:138
+#: templates/table/structure/check_all_table_column.phtml:55
+#, fuzzy
+#| msgid "CHAR textarea columns"
+msgid "Add to central columns"
+msgstr "CHAR textarea कॉलम"
+
+#: templates/table/structure/add_column.phtml:7
+#, fuzzy, php-format
+#| msgid "Add %s field(s)"
+msgid "Add %s column(s)"
+msgstr "%s क्षेत्र जोडें"
+
+#: templates/table/structure/add_column.phtml:12
+#, fuzzy
+#| msgid "At Beginning of Table"
+msgid "at beginning of table"
+msgstr "टेबल के शुरू में"
+
+#: templates/table/structure/display_structure.phtml:140 view_create.php:181
+#, fuzzy
+#| msgid "Print view"
+msgid "Edit view"
+msgstr "छपाई द्रश्य."
+
+#: templates/table/structure/display_table_stats.phtml:9
+msgid "Space usage"
+msgstr "स्थान उपयोग"
+
+#: templates/table/structure/display_table_stats.phtml:32
+msgid "Effective"
+msgstr "वास्तविक"
+
+#: templates/table/structure/move_columns_dialog.phtml:1
+#: templates/table/structure/optional_action_links.phtml:21
+#, fuzzy
+#| msgid "Remove column(s)"
+msgid "Move columns"
+msgstr "काँलम हटाना"
+
+#: templates/table/structure/move_columns_dialog.phtml:2
+msgid "Move the columns by dragging them up and down."
+msgstr ""
+
+#: templates/table/structure/optional_action_links.phtml:9
+msgid "Propose table structure"
+msgstr "टेबल संरचना का प्रस्ताव"
+
+#: templates/table/structure/optional_action_links.phtml:24
+#, fuzzy
+#| msgid "Propose table structure"
+msgid "Improve table structure"
+msgstr "टेबल संरचना का प्रस्ताव"
+
+#: templates/table/structure/optional_action_links.phtml:30
+#, fuzzy
+#| msgid "Track table"
+msgid "Track view"
+msgstr "टेबलओं को ट्रैक करें"
+
+#: templates/table/structure/row_stats_table.phtml:3
+#, fuzzy
+#| msgid "Row Statistics"
+msgid "Row statistics"
+msgstr "पंक्ति आँकड़े"
+
+#: templates/table/structure/row_stats_table.phtml:9
+msgid "static"
+msgstr "स्थिर"
+
+#: templates/table/structure/row_stats_table.phtml:11
+msgid "dynamic"
+msgstr "गतिशील"
+
+#: templates/table/structure/row_stats_table.phtml:22
+msgid "partitioned"
+msgstr "विभाजित"
+
+#: templates/table/structure/row_stats_table.phtml:54
+msgid "Row length"
+msgstr "रौ की लंबाई"
+
+#: templates/table/structure/row_stats_table.phtml:66
+msgid "Row size"
+msgstr "रौ का आकार"
+
+#: templates/table/structure/row_stats_table.phtml:73
+msgid "Next autoindex"
+msgstr ""
+
+#: templates/table/structure/table_structure_row.phtml:46
+#, php-format
+msgid "Column %s has been dropped."
+msgstr "टेबल %s को रद्द किया गया है."
+
 #: themes.php:17 themes.php:22
 msgid "Theme"
 msgstr ""
@@ -17664,6 +17687,11 @@ msgstr ""
 msgid "concurrent_insert is set to 0"
 msgstr "concurrent_insert 0 पर सेट है"
 
+#, fuzzy
+#~| msgid "Read misses"
+#~ msgid "Read as multibytes"
+#~ msgstr "गलतियाँ पढ़ें"
+
 #~ msgid "Relational display column"
 #~ msgstr "संबंधपरक प्रदर्शन स्तंभ"
 
diff --git a/po/hr.po b/po/hr.po
index 4f7c9defd9..95a1b25d3d 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 4.5.0-dev\n"
 "Report-Msgid-Bugs-To: developers@phpmyadmin.net\n"
-"POT-Creation-Date: 2015-08-08 13:53-0400\n"
+"POT-Creation-Date: 2015-08-12 08:10-0400\n"
 "PO-Revision-Date: 2014-03-28 11:02+0200\n"
 "Last-Translator: Michal Čihař <michal@cihar.com>\n"
 "Language-Team: Croatian <https://hosted.weblate.org/projects/phpmyadmin/"
@@ -57,7 +57,7 @@ msgid "Table comments:"
 msgstr "Komentari tablice:"
 
 #: db_datadict.php:104 libraries/Index.class.php:699
-#: libraries/insert_edit.lib.php:1567
+#: libraries/insert_edit.lib.php:1565
 #: libraries/navigation/Nodes/Node_Column.class.php:30
 #: libraries/plugins/export/ExportHtmlword.class.php:280
 #: libraries/plugins/export/ExportHtmlword.class.php:375
@@ -71,13 +71,14 @@ msgstr "Komentari tablice:"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1023
 #: libraries/tracking.lib.php:879 libraries/tracking.lib.php:975
 #: templates/columns_definitions/column_name.phtml:18
-#: templates/index_form.phtml:124 templates/table/table_header.phtml:6
-#: templates/table/zoom_result_form.phtml:33
-#: templates/tbl_relation/common_form.phtml:10
-#: templates/tbl_relation/common_form.phtml:43
-#: templates/tbl_relation/foreign_key_row.phtml:194
-#: templates/tbl_relation/foreign_key_row.phtml:206
-#: templates/tbl_relation/internal_relational_row.phtml:71
+#: templates/table/index_form.phtml:124
+#: templates/table/relation/common_form.phtml:10
+#: templates/table/relation/common_form.phtml:43
+#: templates/table/relation/foreign_key_row.phtml:194
+#: templates/table/relation/foreign_key_row.phtml:206
+#: templates/table/relation/internal_relational_row.phtml:71
+#: templates/table/search/table_header.phtml:6
+#: templates/table/search/zoom_result_form.phtml:33
 msgid "Column"
 msgstr "Stupac"
 
@@ -95,21 +96,21 @@ msgstr "Stupac"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1001
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1024
 #: libraries/rte/rte_list.lib.php:75 libraries/rte/rte_list.lib.php:103
-#: libraries/rte/rte_routines.lib.php:802
-#: libraries/rte/rte_routines.lib.php:831
-#: libraries/rte/rte_routines.lib.php:1493
+#: libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_routines.lib.php:922
+#: libraries/rte/rte_routines.lib.php:1584
 #: libraries/server_privileges.lib.php:2369 libraries/tracking.lib.php:880
 #: libraries/tracking.lib.php:972
 #: templates/columns_definitions/table_fields_definitions.phtml:11
-#: templates/structure/table_header.phtml:48
-#: templates/structure/table_structure_header.phtml:6
-#: templates/table/table_header.phtml:7
+#: templates/database/structure/table_header.phtml:48
+#: templates/table/search/table_header.phtml:7
+#: templates/table/structure/table_structure_header.phtml:6
 msgid "Type"
 msgstr "Vrsta"
 
 #: db_datadict.php:106 libraries/Index.class.php:702
 #: libraries/central_columns.lib.php:708
-#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1576
+#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1574
 #: libraries/plugins/export/ExportHtmlword.class.php:286
 #: libraries/plugins/export/ExportHtmlword.class.php:381
 #: libraries/plugins/export/ExportLatex.class.php:509
@@ -122,8 +123,8 @@ msgstr "Vrsta"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1026
 #: libraries/tracking.lib.php:882 libraries/tracking.lib.php:978
 #: templates/columns_definitions/table_fields_definitions.phtml:39
-#: templates/structure/table_structure_header.phtml:9
-#: templates/table/zoom_result_form.phtml:34
+#: templates/table/search/zoom_result_form.phtml:34
+#: templates/table/structure/table_structure_header.phtml:9
 msgid "Null"
 msgstr "Null"
 
@@ -141,8 +142,8 @@ msgstr "Null"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1027
 #: libraries/replication_gui.lib.php:153 libraries/tracking.lib.php:883
 #: templates/columns_definitions/table_fields_definitions.phtml:25
-#: templates/structure/body_for_table_summary.phtml:55
-#: templates/structure/table_structure_header.phtml:10
+#: templates/database/structure/body_for_table_summary.phtml:55
+#: templates/table/structure/table_structure_header.phtml:10
 msgid "Default"
 msgstr "Zadano"
 
@@ -170,19 +171,19 @@ msgid "Comments"
 msgstr "Komentari"
 
 #: db_datadict.php:146
-#: libraries/controllers/StructureController.class.php:1960
-#: libraries/controllers/StructureController.class.php:1965
+#: libraries/controllers/TableStructureController.class.php:951
+#: libraries/controllers/TableStructureController.class.php:956
 #: libraries/tracking.lib.php:922
 #: templates/columns_definitions/column_indexes.phtml:6
-#: templates/structure/check_all_table_column.phtml:22
-#: templates/structure/display_structure.phtml:74
+#: templates/table/structure/check_all_table_column.phtml:22
+#: templates/table/structure/display_structure.phtml:74
 msgid "Primary"
 msgstr "Primarni"
 
 #: db_datadict.php:156 js/messages.php:317 libraries/Index.class.php:567
 #: libraries/Index.class.php:606 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261 libraries/mult_submits.lib.php:403
+#: libraries/config/FormDisplay.tpl.php:272 libraries/mult_submits.lib.php:403
 #: libraries/mult_submits.lib.php:417
 #: libraries/plugins/export/ExportHtmlword.class.php:630
 #: libraries/plugins/export/ExportLatex.class.php:589
@@ -198,20 +199,20 @@ msgstr "Primarni"
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1010 libraries/tracking.lib.php:1015
 #: prefs_manage.php:140 templates/prefs_autoload.phtml:15
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "No"
 msgstr "Ne"
 
 #: db_datadict.php:156 js/messages.php:443 libraries/Index.class.php:568
 #: libraries/Index.class.php:605 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261
-#: libraries/controllers/StructureController.class.php:1344
-#: libraries/controllers/StructureController.class.php:2223
-#: libraries/controllers/StructureController.class.php:2232
-#: libraries/controllers/StructureController.class.php:2237
-#: libraries/controllers/StructureController.class.php:2242
-#: libraries/controllers/StructureController.class.php:2247
+#: libraries/config/FormDisplay.tpl.php:272
+#: libraries/controllers/TableStructureController.class.php:539
+#: libraries/controllers/TableStructureController.class.php:1201
+#: libraries/controllers/TableStructureController.class.php:1210
+#: libraries/controllers/TableStructureController.class.php:1215
+#: libraries/controllers/TableStructureController.class.php:1220
+#: libraries/controllers/TableStructureController.class.php:1225
 #: libraries/mult_submits.inc.php:82 libraries/mult_submits.inc.php:178
 #: libraries/mult_submits.lib.php:339 libraries/mult_submits.lib.php:372
 #: libraries/mult_submits.lib.php:401 libraries/mult_submits.lib.php:415
@@ -220,8 +221,8 @@ msgstr "Ne"
 #: libraries/plugins/export/ExportOdt.class.php:756
 #: libraries/plugins/export/ExportTexytext.class.php:567
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1077
-#: libraries/server_databases.lib.php:464
-#: libraries/server_databases.lib.php:474
+#: libraries/server_databases.lib.php:475
+#: libraries/server_databases.lib.php:485
 #: libraries/server_privileges.lib.php:2546
 #: libraries/server_privileges.lib.php:2727
 #: libraries/server_privileges.lib.php:2748
@@ -231,7 +232,7 @@ msgstr "Ne"
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1008 libraries/tracking.lib.php:1013
 #: prefs_manage.php:138 templates/prefs_autoload.phtml:14
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "Yes"
 msgstr "Da"
 
@@ -241,7 +242,7 @@ msgstr "Prikaži ispis (shemu) baze podataka"
 
 #: db_export.php:37 db_tracking.php:90 export.php:382
 #: libraries/DBQbe.class.php:326
-#: libraries/controllers/StructureController.class.php:231
+#: libraries/controllers/DatabaseStructureController.class.php:170
 #: libraries/navigation/NavigationTree.class.php:897
 msgid "No tables found in database."
 msgstr "U bazi podataka nisu pronađene tablice."
@@ -252,14 +253,14 @@ msgstr "U bazi podataka nisu pronađene tablice."
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:26
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:120
-#: templates/structure/show_create.phtml:18
+#: templates/database/structure/show_create.phtml:18
 msgid "Tables"
 msgstr "Tablice"
 
 #: db_export.php:52 libraries/Menu.class.php:317 libraries/Menu.class.php:425
-#: libraries/Util.class.php:3333 libraries/Util.class.php:3343
-#: libraries/Util.class.php:3349 libraries/Util.class.php:3629
-#: libraries/Util.class.php:4327 libraries/Util.class.php:4344
+#: libraries/Util.class.php:3339 libraries/Util.class.php:3349
+#: libraries/Util.class.php:3355 libraries/Util.class.php:3635
+#: libraries/Util.class.php:4333 libraries/Util.class.php:4350
 #: libraries/central_columns.lib.php:728 libraries/config.values.php:39
 #: libraries/config.values.php:47 libraries/config.values.php:109
 #: libraries/config.values.php:115 libraries/config/setup.forms.php:323
@@ -273,7 +274,7 @@ msgstr "Tablice"
 #: libraries/navigation/Nodes/Node_Table.class.php:283
 #: libraries/server_privileges.lib.php:1141 libraries/tracking.lib.php:874
 #: templates/columns_definitions/table_fields_definitions.phtml:3
-#: templates/designer/table_list.phtml:28
+#: templates/database/designer/table_list.phtml:28
 msgid "Structure"
 msgstr "Strukturu"
 
@@ -285,7 +286,7 @@ msgstr "Strukturu"
 #: libraries/config/user_preferences.forms.php:292
 #: libraries/config/user_preferences.forms.php:297
 #: libraries/server_privileges.lib.php:1140
-#: templates/structure/display_table_stats.phtml:12
+#: templates/table/structure/display_table_stats.phtml:12
 msgid "Data"
 msgstr "Podaci"
 
@@ -369,10 +370,10 @@ msgstr "Praćene tablice"
 #: libraries/server_privileges.lib.php:2908
 #: libraries/server_privileges.lib.php:3145
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4346
-#: templates/structure/table_header.phtml:21
-#: templates/tbl_relation/foreign_key_row.phtml:176
-#: templates/tbl_relation/internal_relational_row.phtml:63
+#: libraries/server_privileges.lib.php:4372
+#: templates/database/structure/table_header.phtml:21
+#: templates/table/relation/foreign_key_row.phtml:176
+#: templates/table/relation/internal_relational_row.phtml:63
 msgid "Table"
 msgstr "Tablica"
 
@@ -389,7 +390,7 @@ msgid "Updated"
 msgstr "Ažurirano"
 
 #: db_tracking.php:130 js/messages.php:243 libraries/Menu.class.php:552
-#: libraries/Util.class.php:4314 libraries/config.values.php:104
+#: libraries/Util.class.php:4320 libraries/config.values.php:104
 #: libraries/rte/rte_events.lib.php:393 libraries/rte/rte_list.lib.php:101
 #: libraries/server_status_processes.lib.php:92 libraries/tracking.lib.php:279
 msgid "Status"
@@ -398,14 +399,15 @@ msgstr "Stanje"
 #: db_tracking.php:131 db_tracking.php:290 libraries/Index.class.php:693
 #: libraries/central_columns.lib.php:687 libraries/rte/rte_list.lib.php:74
 #: libraries/rte/rte_list.lib.php:89 libraries/rte/rte_list.lib.php:102
-#: libraries/server_databases.lib.php:398
+#: libraries/server_databases.lib.php:409
 #: libraries/server_privileges.lib.php:2372
 #: libraries/server_privileges.lib.php:3166
 #: libraries/server_privileges.lib.php:3342
 #: libraries/server_user_groups.lib.php:82
 #: libraries/server_variables.lib.php:189 libraries/tracking.lib.php:280
-#: libraries/tracking.lib.php:793 templates/structure/table_header.phtml:30
-#: templates/structure/table_structure_header.phtml:23
+#: libraries/tracking.lib.php:793
+#: templates/database/structure/table_header.phtml:30
+#: templates/table/structure/table_structure_header.phtml:23
 msgid "Action"
 msgstr "Aktivnost"
 
@@ -449,7 +451,7 @@ msgid "Untracked tables"
 msgstr "Nepraćene tablice"
 
 #: db_tracking.php:305 db_tracking.php:336
-#: templates/structure/optional_action_links.phtml:17
+#: templates/table/structure/optional_action_links.phtml:17
 msgid "Track table"
 msgstr "Prati tablicu"
 
@@ -499,7 +501,7 @@ msgid "Value for the column \"%s\""
 msgstr "Vrijednost stupca \"%s\""
 
 #: gis_data_editor.php:146
-#: templates/gis_visualization/gis_visualization.phtml:37
+#: templates/table/gis_visualization/gis_visualization.phtml:37
 msgid "Use OpenStreetMaps as Base Layer"
 msgstr "Iskoristi OpenStreetMaps kao osnovni sloj"
 
@@ -588,35 +590,35 @@ msgstr "Dodaj geometriju"
 #: libraries/display_change_password.lib.php:162
 #: libraries/display_export.lib.php:402 libraries/display_export.lib.php:408
 #: libraries/display_import.lib.php:392 libraries/index.lib.php:44
-#: libraries/insert_edit.lib.php:1546 libraries/insert_edit.lib.php:1583
+#: libraries/insert_edit.lib.php:1544 libraries/insert_edit.lib.php:1581
 #: libraries/normalization.lib.php:165 libraries/normalization.lib.php:821
 #: libraries/operations.lib.php:38 libraries/operations.lib.php:108
 #: libraries/operations.lib.php:263 libraries/operations.lib.php:306
 #: libraries/operations.lib.php:801 libraries/operations.lib.php:874
 #: libraries/operations.lib.php:923 libraries/operations.lib.php:1337
 #: libraries/operations.lib.php:1658
-#: libraries/plugins/auth/AuthenticationCookie.class.php:244
+#: libraries/plugins/auth/AuthenticationCookie.class.php:232
 #: libraries/replication_gui.lib.php:122 libraries/replication_gui.lib.php:161
 #: libraries/replication_gui.lib.php:324 libraries/replication_gui.lib.php:461
 #: libraries/replication_gui.lib.php:906 libraries/rte/rte_events.lib.php:509
-#: libraries/rte/rte_routines.lib.php:969
-#: libraries/rte/rte_routines.lib.php:1581
+#: libraries/rte/rte_routines.lib.php:1060
+#: libraries/rte/rte_routines.lib.php:1672
 #: libraries/rte/rte_triggers.lib.php:396 libraries/server_bin_log.lib.php:61
 #: libraries/server_privileges.lib.php:705
 #: libraries/server_privileges.lib.php:2106
 #: libraries/server_privileges.lib.php:2872
 #: libraries/server_privileges.lib.php:3553
-#: libraries/server_privileges.lib.php:4627
+#: libraries/server_privileges.lib.php:4653
 #: libraries/server_user_groups.lib.php:285
 #: libraries/sql_query_form.lib.php:369 libraries/sql_query_form.lib.php:429
 #: libraries/tracking.lib.php:533 libraries/tracking.lib.php:653
 #: prefs_manage.php:277 prefs_manage.php:355
 #: templates/columns_definitions/column_definitions_form.phtml:59
-#: templates/header_location.phtml:17 templates/index_form.phtml:238
+#: templates/database/create_table.phtml:21 templates/header_location.phtml:28
 #: templates/startAndNumberOfRowsPanel.phtml:14
-#: templates/structure/add_column.phtml:25
-#: templates/table/create_table.phtml:21
-#: templates/table/selection_form.phtml:75 view_create.php:275
+#: templates/table/index_form.phtml:238
+#: templates/table/search/selection_form.phtml:75
+#: templates/table/structure/add_column.phtml:25 view_create.php:275
 #: view_operations.php:106
 msgid "Go"
 msgstr "Kreni"
@@ -716,7 +718,7 @@ msgstr ""
 msgid "Could not load import plugins, please check your installation!"
 msgstr "Nije moguće učitati dodatke za uvoz. Provjerite svoju instalaciju!"
 
-#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1466
+#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1460
 #, fuzzy, php-format
 #| msgid "Bookmark %s created"
 msgid "Bookmark %s has been created."
@@ -759,12 +761,12 @@ msgstr ""
 msgid "Back"
 msgstr "Nazad"
 
-#: index.php:148 libraries/Footer.class.php:70
+#: index.php:149 libraries/Footer.class.php:70
 #, fuzzy
 msgid "phpMyAdmin Demo Server"
 msgstr "phpMyAdmin dokumentacija"
 
-#: index.php:152
+#: index.php:153
 #, php-format
 msgid ""
 "You are using the demo server. You can do anything here, but please do not "
@@ -772,49 +774,49 @@ msgid ""
 "at %s."
 msgstr ""
 
-#: index.php:162
+#: index.php:163
 #, fuzzy
 #| msgid "General relation features"
 msgid "General Settings"
 msgstr "Opće osobine relacija"
 
-#: index.php:190 libraries/display_change_password.lib.php:50
+#: index.php:191 libraries/display_change_password.lib.php:50
 #: libraries/display_change_password.lib.php:53 user_password.php:247
 msgid "Change password"
 msgstr "Promijeni lozinku"
 
-#: index.php:206
+#: index.php:207
 #, fuzzy
 #| msgid "MySQL connection collation"
 msgid "Server connection collation"
 msgstr "MySQL uspoređivanje veza"
 
-#: index.php:228
+#: index.php:229
 msgid "Appearance Settings"
 msgstr ""
 
-#: index.php:258 prefs_manage.php:285
+#: index.php:259 prefs_manage.php:285
 #, fuzzy
 #| msgid "General relation features"
 msgid "More settings"
 msgstr "Opće osobine relacija"
 
-#: index.php:279
+#: index.php:280
 #, fuzzy
 #| msgid "Database for user"
 msgid "Database server"
 msgstr "Baza podataka za korisnika"
 
-#: index.php:282 libraries/plugins/auth/AuthenticationCookie.class.php:181
+#: index.php:283 libraries/plugins/auth/AuthenticationCookie.class.php:169
 msgid "Server:"
 msgstr "Poslužitelj:"
 
-#: index.php:286
+#: index.php:287
 #, fuzzy
 msgid "Server type:"
 msgstr "ID poslužitelja"
 
-#: index.php:290 libraries/plugins/export/ExportLatex.class.php:212
+#: index.php:291 libraries/plugins/export/ExportLatex.class.php:212
 #: libraries/plugins/export/ExportSql.class.php:687
 #: libraries/plugins/export/ExportXml.class.php:189
 #, fuzzy
@@ -822,87 +824,87 @@ msgstr "ID poslužitelja"
 msgid "Server version:"
 msgstr "Verzija poslužitelja"
 
-#: index.php:296
+#: index.php:297
 #, fuzzy
 #| msgid "Protocol version"
 msgid "Protocol version:"
 msgstr "Verzija protokola"
 
-#: index.php:300
+#: index.php:301
 #, fuzzy
 #| msgid "User"
 msgid "User:"
 msgstr "Korisnik"
 
-#: index.php:305
+#: index.php:306
 #, fuzzy
 msgid "Server charset:"
 msgstr "Odabir poslužitelja"
 
-#: index.php:320
+#: index.php:321
 msgid "Web server"
 msgstr "Web poslužitelj"
 
-#: index.php:331
+#: index.php:332
 #, fuzzy
 msgid "Database client version:"
 msgstr "MySQL verzija klijenta"
 
-#: index.php:335
+#: index.php:336
 #, fuzzy
 #| msgid "PHP extension"
 msgid "PHP extension:"
 msgstr "PHP ekstenzija"
 
-#: index.php:349
+#: index.php:350
 #, fuzzy
 #| msgid "PHP Version"
 msgid "PHP version:"
 msgstr "PHP verzija"
 
-#: index.php:360
+#: index.php:361
 msgid "Show PHP information"
 msgstr "Prikaži PHP podatke"
 
-#: index.php:383
+#: index.php:384
 #, fuzzy
 #| msgid "Version information"
 msgid "Version information:"
 msgstr "Podaci o verziji"
 
-#: index.php:392 libraries/Util.class.php:432 libraries/Util.class.php:495
-#: libraries/config/FormDisplay.tpl.php:151
+#: index.php:393 libraries/Util.class.php:432 libraries/Util.class.php:495
+#: libraries/config/FormDisplay.tpl.php:162
 #: libraries/display_export.lib.php:577 libraries/engines/pbxt.lib.php:162
 #: libraries/navigation/NavigationHeader.class.php:196
 #: libraries/server_variables.lib.php:160
 msgid "Documentation"
 msgstr "Dokumentacija"
 
-#: index.php:399
+#: index.php:400
 msgid "Wiki"
 msgstr "Wiki"
 
-#: index.php:408
+#: index.php:409
 msgid "Official Homepage"
 msgstr "Službena stranica programa phpMyAdmin"
 
-#: index.php:415
+#: index.php:416
 #, fuzzy
 #| msgid "Attributes"
 msgid "Contribute"
 msgstr "Atributi"
 
-#: index.php:422
+#: index.php:423
 msgid "Get support"
 msgstr ""
 
-#: index.php:429
+#: index.php:430
 #, fuzzy
 #| msgid "No change"
 msgid "List of changes"
 msgstr "Bez izmjena"
 
-#: index.php:451
+#: index.php:452
 #, fuzzy
 #| msgid ""
 #| "Your configuration file contains settings (root with no password) that "
@@ -920,7 +922,7 @@ msgstr ""
 "pokrenut je sa zadanim postavkama i kao takav otvoren je upadima. Potrebno "
 "je ispraviti ovaj sigurnosni nedostatak."
 
-#: index.php:468
+#: index.php:469
 msgid ""
 "You have enabled mbstring.func_overload in your PHP configuration. This "
 "option is incompatible with phpMyAdmin and might cause some data to be "
@@ -930,7 +932,7 @@ msgstr ""
 "opcija nije kompatibilna s programom phpMyAdmin i može prouzrokovati "
 "oštećivanje nekih podataka!"
 
-#: index.php:483
+#: index.php:484
 msgid ""
 "The mbstring PHP extension was not found and you seem to be using a "
 "multibyte charset. Without the mbstring extension phpMyAdmin is unable to "
@@ -940,7 +942,7 @@ msgstr ""
 "tablicu znakova. Bez proširenja mbstring, phpMyAdmin nije u mogućnosti "
 "pravilno razdjeljivati naredbe i može doći do neočekivanih rezultata."
 
-#: index.php:500
+#: index.php:501
 msgid ""
 "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini."
 "session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower than "
@@ -948,17 +950,17 @@ msgid ""
 "expire sooner than configured in phpMyAdmin."
 msgstr ""
 
-#: index.php:519
+#: index.php:520
 msgid ""
 "Login cookie store is lower than cookie validity configured in phpMyAdmin, "
 "because of this, your login will expire sooner than configured in phpMyAdmin."
 msgstr ""
 
-#: index.php:535
+#: index.php:536
 msgid "The configuration file now needs a secret passphrase (blowfish_secret)."
 msgstr "Konfiguracijska datoteka potražuje tajnu lozinku (blowfish_secret)."
 
-#: index.php:548
+#: index.php:549
 msgid ""
 "Directory [code]config[/code], which is used by the setup script, still "
 "exists in your phpMyAdmin directory. It is strongly recommended to remove it "
@@ -966,7 +968,7 @@ msgid ""
 "may be compromised by unauthorized people downloading your configuration."
 msgstr ""
 
-#: index.php:564
+#: index.php:565
 #, fuzzy, php-format
 #| msgid ""
 #| " additional features for working with linked tables have been ctivated. "
@@ -978,12 +980,12 @@ msgstr ""
 "Dodatne osobine za rad s relacijski tablicama su isključene. Kako biste "
 "saznali razloge, pritisnite %sovdje%s."
 
-#: index.php:571
+#: index.php:572
 msgid ""
 "Or alternately go to 'Operations' tab of any database to set it up there."
 msgstr ""
 
-#: index.php:620
+#: index.php:621
 #, php-format
 msgid ""
 "Your PHP MySQL library version %s differs from your MySQL server version %s. "
@@ -992,7 +994,7 @@ msgstr ""
 "Verzija %s vaše PHP MySQL biblioteke razlikuje se oda vaše verzije %s MySQL "
 "poslužitelja. Ovo bi moglo prouzrokovati nepredviđeno ponašanje."
 
-#: index.php:648
+#: index.php:649
 #, php-format
 msgid ""
 "Server running with Suhosin. Please refer to %sdocumentation%s for possible "
@@ -1160,8 +1162,8 @@ msgstr ""
 msgid "Save & Close"
 msgstr "Spremi kao datoteku"
 
-#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:404
-#: libraries/insert_edit.lib.php:1550 prefs_manage.php:361
+#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:415
+#: libraries/insert_edit.lib.php:1548 prefs_manage.php:361
 #: prefs_manage.php:372
 msgid "Reset"
 msgstr "Povrat"
@@ -1202,7 +1204,7 @@ msgstr "Dodaj Indeks"
 msgid "Edit Index"
 msgstr "Uredi indeks"
 
-#: js/messages.php:99 templates/index_form.phtml:232
+#: js/messages.php:99 templates/table/index_form.phtml:232
 #, fuzzy, php-format
 #| msgid "Add %s field(s)"
 msgid "Add %s column(s) to index"
@@ -1232,15 +1234,16 @@ msgstr "Polja obuhvaćena po"
 msgid "Please select column(s) for the index."
 msgstr "Dodaj %s polja"
 
-#: js/messages.php:106 templates/structure/add_column.phtml:1
+#: js/messages.php:106 templates/table/structure/add_column.phtml:1
 #, fuzzy
 #| msgid "You have to add at least one field."
 msgid "You have to add at least one column."
 msgstr "Morate dodati najmanje jedno polje."
 
-#: js/messages.php:109 libraries/insert_edit.lib.php:1548
+#: js/messages.php:109 libraries/insert_edit.lib.php:1546
 #: templates/columns_definitions/column_definitions_form.phtml:162
-#: templates/index_form.phtml:237 templates/tbl_relation/common_form.phtml:106
+#: templates/table/index_form.phtml:237
+#: templates/table/relation/common_form.phtml:106
 msgid "Preview SQL"
 msgstr ""
 
@@ -1263,7 +1266,7 @@ msgid "SQL query:"
 msgstr "SQL upit"
 
 #. l10n: Default label for the y-Axis of Charts
-#: js/messages.php:118 templates/tbl_chart.phtml:109
+#: js/messages.php:118 templates/table/chart/tbl_chart.phtml:109
 #, fuzzy
 #| msgid "Value"
 msgid "Y Values"
@@ -1440,7 +1443,7 @@ msgstr ""
 msgid "Bytes received"
 msgstr "Primljeno"
 
-#: js/messages.php:169 libraries/server_status.lib.php:226
+#: js/messages.php:169 libraries/server_status.lib.php:235
 msgid "Connections"
 msgstr "Veze"
 
@@ -1499,12 +1502,12 @@ msgstr "%s tablica"
 msgid "Questions"
 msgstr "Perzijski"
 
-#: js/messages.php:184 libraries/server_status.lib.php:134
+#: js/messages.php:184 libraries/server_status.lib.php:143
 msgid "Traffic"
 msgstr "Promet"
 
 #: js/messages.php:185 libraries/Menu.class.php:586
-#: libraries/Util.class.php:4318 libraries/server_status_monitor.lib.php:257
+#: libraries/Util.class.php:4324 libraries/server_status_monitor.lib.php:257
 #, fuzzy
 #| msgid "General relation features"
 msgid "Settings"
@@ -1528,8 +1531,9 @@ msgstr ""
 #: libraries/server_status_monitor.lib.php:236
 #: libraries/server_status_processes.lib.php:308
 #: templates/columns_definitions/transformation.phtml:4
-#: templates/designer/options_panel.phtml:178
-#: templates/table/options_zoom.phtml:12 templates/table/rows_zoom.phtml:26
+#: templates/database/designer/options_panel.phtml:178
+#: templates/table/search/options_zoom.phtml:12
+#: templates/table/search/rows_zoom.phtml:26
 msgid "None"
 msgstr "bez kompresije"
 
@@ -1833,8 +1837,8 @@ msgstr ""
 
 #: js/messages.php:270 libraries/Menu.class.php:352
 #: libraries/Menu.class.php:455 libraries/Menu.class.php:582
-#: libraries/Util.class.php:4317 libraries/Util.class.php:4332
-#: libraries/Util.class.php:4349 libraries/config/messages.inc.php:258
+#: libraries/Util.class.php:4323 libraries/Util.class.php:4338
+#: libraries/Util.class.php:4355 libraries/config/messages.inc.php:258
 #: libraries/display_import.lib.php:105
 #: libraries/server_status_monitor.lib.php:318 prefs_manage.php:238
 #: setup/frames/menu.inc.php:26
@@ -1906,13 +1910,13 @@ msgid "Formatting SQL..."
 msgstr ""
 
 #: js/messages.php:293 libraries/server_variables.lib.php:157
-#: templates/designer/aggregate_query_panel.phtml:63
-#: templates/designer/delete_relation_panel.phtml:28
-#: templates/designer/having_query_panel.phtml:117
-#: templates/designer/new_relation_panel.phtml:88
-#: templates/designer/options_panel.phtml:253
-#: templates/designer/rename_to_panel.phtml:45
-#: templates/designer/where_query_panel.phtml:83
+#: templates/database/designer/aggregate_query_panel.phtml:63
+#: templates/database/designer/delete_relation_panel.phtml:28
+#: templates/database/designer/having_query_panel.phtml:117
+#: templates/database/designer/new_relation_panel.phtml:88
+#: templates/database/designer/options_panel.phtml:253
+#: templates/database/designer/rename_to_panel.phtml:45
+#: templates/database/designer/where_query_panel.phtml:83
 msgid "Cancel"
 msgstr "Odustani"
 
@@ -1922,7 +1926,7 @@ msgstr "Odustani"
 msgid "Page-related settings"
 msgstr "Opće osobine relacija"
 
-#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:402
+#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:413
 msgid "Apply"
 msgstr ""
 
@@ -1960,8 +1964,8 @@ msgstr ""
 msgid "Error text: %s"
 msgstr ""
 
-#: js/messages.php:307 libraries/db_common.inc.php:68
-#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:450
+#: js/messages.php:307 libraries/db_common.inc.php:69
+#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:461
 msgid "No databases selected."
 msgstr "Nema odabrane baze podataka."
 
@@ -1973,12 +1977,13 @@ msgstr "Brisanje stupca"
 msgid "Adding Primary Key"
 msgstr "Dodavanje primarnog ključa"
 
-#: js/messages.php:310 templates/designer/aggregate_query_panel.phtml:59
-#: templates/designer/having_query_panel.phtml:113
-#: templates/designer/new_relation_panel.phtml:87
-#: templates/designer/options_panel.phtml:252
-#: templates/designer/rename_to_panel.phtml:41
-#: templates/designer/where_query_panel.phtml:82
+#: js/messages.php:310
+#: templates/database/designer/aggregate_query_panel.phtml:59
+#: templates/database/designer/having_query_panel.phtml:113
+#: templates/database/designer/new_relation_panel.phtml:87
+#: templates/database/designer/options_panel.phtml:252
+#: templates/database/designer/rename_to_panel.phtml:41
+#: templates/database/designer/where_query_panel.phtml:82
 msgid "OK"
 msgstr "U redu"
 
@@ -2004,7 +2009,7 @@ msgstr "Kopiraj bazu podataka u"
 msgid "Changing Charset"
 msgstr "Tablica znakova"
 
-#: js/messages.php:320 libraries/Util.class.php:3217
+#: js/messages.php:320 libraries/Util.class.php:3223
 #, fuzzy
 #| msgid "Disable foreign key checks"
 msgid "Enable foreign key checks"
@@ -2050,20 +2055,21 @@ msgstr ""
 #: js/messages.php:334 libraries/DisplayResults.class.php:4834
 #: libraries/DisplayResults.class.php:5092 libraries/Menu.class.php:344
 #: libraries/Menu.class.php:446 libraries/Menu.class.php:578
-#: libraries/Util.class.php:3636 libraries/Util.class.php:3637
-#: libraries/Util.class.php:4316 libraries/Util.class.php:4331
-#: libraries/Util.class.php:4348 libraries/config/messages.inc.php:252
+#: libraries/Util.class.php:3642 libraries/Util.class.php:3643
+#: libraries/Util.class.php:4322 libraries/Util.class.php:4337
+#: libraries/Util.class.php:4354 libraries/config/messages.inc.php:252
 #: libraries/display_export.lib.php:173 libraries/rte/rte_list.lib.php:146
 #: libraries/server_privileges.lib.php:2211
 #: libraries/server_privileges.lib.php:2290
 #: libraries/server_privileges.lib.php:2632
 #: libraries/server_privileges.lib.php:3356
 #: libraries/server_status_monitor.lib.php:322 prefs_manage.php:303
-#: setup/frames/menu.inc.php:27 templates/structure/check_all_tables.phtml:11
+#: setup/frames/menu.inc.php:27
+#: templates/database/structure/check_all_tables.phtml:11
 msgid "Export"
 msgstr "Izvoz"
 
-#: js/messages.php:337 libraries/rte/rte_routines.lib.php:652
+#: js/messages.php:337 libraries/rte/rte_routines.lib.php:743
 msgid "ENUM/SET editor"
 msgstr "ENUM/SET uređivač"
 
@@ -2106,7 +2112,7 @@ msgstr "SQL upit"
 #: libraries/Console.class.php:214 libraries/DisplayResults.class.php:3474
 #: libraries/DisplayResults.class.php:4818 libraries/Index.class.php:723
 #: libraries/Util.class.php:706 libraries/Util.class.php:1202
-#: libraries/Util.class.php:3634 libraries/Util.class.php:3635
+#: libraries/Util.class.php:3640 libraries/Util.class.php:3641
 #: libraries/central_columns.lib.php:851
 #: libraries/central_columns.lib.php:1193
 #: libraries/config/messages.inc.php:892
@@ -2124,7 +2130,7 @@ msgstr "Uređivanje"
 #: libraries/server_user_groups.lib.php:129
 #: libraries/sql_query_form.lib.php:416 libraries/tracking.lib.php:477
 #: setup/frames/index.inc.php:183 setup/frames/index.inc.php:291
-#: templates/designer/delete_relation_panel.phtml:27
+#: templates/database/designer/delete_relation_panel.phtml:27
 msgid "Delete"
 msgstr "Izbriši"
 
@@ -2307,11 +2313,11 @@ msgid "No dependencies selected!"
 msgstr "Nema odabrane baze podataka."
 
 #: js/messages.php:394 libraries/central_columns.lib.php:1214
-#: libraries/insert_edit.lib.php:1458 libraries/server_variables.lib.php:155
+#: libraries/insert_edit.lib.php:1456 libraries/server_variables.lib.php:155
 #: setup/frames/config.inc.php:42 setup/frames/index.inc.php:279
 #: templates/columns_definitions/column_definitions_form.phtml:165
-#: templates/gis_visualization/gis_visualization.phtml:48
-#: templates/tbl_relation/common_form.phtml:107
+#: templates/table/gis_visualization/gis_visualization.phtml:48
+#: templates/table/relation/common_form.phtml:107
 msgid "Save"
 msgstr "Spremi"
 
@@ -2403,8 +2409,8 @@ msgid "Data point content"
 msgstr "Veličina pokazatelja podataka"
 
 #: js/messages.php:430 js/messages.php:562 js/messages.php:579
-#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2573
-#: templates/index_form.phtml:154 templates/index_form.phtml:194
+#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2571
+#: templates/table/index_form.phtml:154 templates/table/index_form.phtml:194
 msgid "Ignore"
 msgstr "Ignoriraj"
 
@@ -2465,8 +2471,8 @@ msgstr "Odaberite strani ključ"
 msgid "Please select the primary key or a unique key!"
 msgstr "Odaberite primarni ključ ili jedinstveni ključ"
 
-#: js/messages.php:457 templates/designer/side_menu.phtml:91
-#: templates/designer/side_menu.phtml:94
+#: js/messages.php:457 templates/database/designer/side_menu.phtml:91
+#: templates/database/designer/side_menu.phtml:94
 #, fuzzy
 #| msgid "Choose field to display"
 msgid "Choose column to display"
@@ -2484,22 +2490,22 @@ msgstr ""
 msgid "Page name"
 msgstr "Broj stranice:"
 
-#: js/messages.php:463 templates/designer/side_menu.phtml:56
-#: templates/designer/side_menu.phtml:59
+#: js/messages.php:463 templates/database/designer/side_menu.phtml:56
+#: templates/database/designer/side_menu.phtml:59
 #, fuzzy
 #| msgid "Select Tables"
 msgid "Save page"
 msgstr "Odaberite tablice"
 
-#: js/messages.php:464 templates/designer/side_menu.phtml:63
-#: templates/designer/side_menu.phtml:66
+#: js/messages.php:464 templates/database/designer/side_menu.phtml:63
+#: templates/database/designer/side_menu.phtml:66
 #, fuzzy
 #| msgid "Select Tables"
 msgid "Save page as"
 msgstr "Odaberite tablice"
 
-#: js/messages.php:465 templates/designer/side_menu.phtml:49
-#: templates/designer/side_menu.phtml:52
+#: js/messages.php:465 templates/database/designer/side_menu.phtml:49
+#: templates/database/designer/side_menu.phtml:52
 #, fuzzy
 #| msgid "Free pages"
 msgid "Open page"
@@ -2511,7 +2517,7 @@ msgstr "Slobodne stranice"
 msgid "Delete page"
 msgstr "Odaberite tablice"
 
-#: js/messages.php:467 templates/designer/side_menu.phtml:10
+#: js/messages.php:467 templates/database/designer/side_menu.phtml:10
 #, fuzzy
 #| msgid "Unit"
 msgid "Untitled"
@@ -2637,7 +2643,7 @@ msgstr "Izvorni položaj"
 msgid "cancel"
 msgstr "Odustani"
 
-#: js/messages.php:499 libraries/server_status.lib.php:271
+#: js/messages.php:499 libraries/server_status.lib.php:280
 msgid "Aborted"
 msgstr "Prekinuto"
 
@@ -3327,7 +3333,7 @@ msgstr "Netočan broj porta"
 
 #: js/messages.php:793 libraries/Message.class.php:199
 #: libraries/Util.class.php:654 libraries/core.lib.php:245
-#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1172
+#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1170
 #: tbl_operations.php:229 view_operations.php:63
 msgid "Error"
 msgstr "Pogreška"
@@ -3387,8 +3393,8 @@ msgstr "po sekundi"
 msgid "per minute"
 msgstr "po minuti"
 
-#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:143
-#: libraries/server_status.lib.php:228
+#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:152
+#: libraries/server_status.lib.php:237
 #: libraries/server_status_queries.lib.php:98
 msgid "per hour"
 msgstr "po satu"
@@ -3406,7 +3412,7 @@ msgstr ""
 msgid "Wrong permissions on configuration file, should not be world writable!"
 msgstr ""
 
-#: libraries/Config.class.php:1799
+#: libraries/Config.class.php:1801
 msgid "Font size"
 msgstr "Veličina fonta"
 
@@ -3436,10 +3442,10 @@ msgstr "unutar upita"
 #: libraries/server_privileges.lib.php:2890
 #: libraries/server_privileges.lib.php:3144
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4332
+#: libraries/server_privileges.lib.php:4358
 #: libraries/server_status_processes.lib.php:80
-#: templates/tbl_relation/foreign_key_row.phtml:165
-#: templates/tbl_relation/internal_relational_row.phtml:55
+#: templates/table/relation/foreign_key_row.phtml:165
+#: templates/table/relation/internal_relational_row.phtml:55
 msgid "Database"
 msgstr "Baza podataka"
 
@@ -3549,11 +3555,11 @@ msgstr "SQL povijest"
 #: libraries/plugins/import/ImportMediawiki.class.php:60
 #: libraries/plugins/import/ImportOds.class.php:59
 #: libraries/plugins/import/ImportShp.class.php:57
-#: libraries/plugins/import/ImportSql.class.php:148
+#: libraries/plugins/import/ImportSql.class.php:51
 #: libraries/plugins/import/ImportXml.class.php:58
-#: libraries/rte/rte_routines.lib.php:833 templates/index_form.phtml:49
-#: templates/structure/row_stats_table.phtml:20
-#: templates/table/options.phtml:2
+#: libraries/rte/rte_routines.lib.php:924 templates/table/index_form.phtml:49
+#: templates/table/search/options.phtml:2
+#: templates/table/structure/row_stats_table.phtml:20
 msgid "Options"
 msgstr "Opcije"
 
@@ -3598,7 +3604,8 @@ msgstr "Silazno"
 msgid "Order:"
 msgstr "Ostalo"
 
-#: libraries/Console.class.php:289 templates/table/replace_preview.phtml:17
+#: libraries/Console.class.php:289
+#: templates/table/search/replace_preview.phtml:17
 #, fuzzy
 #| msgid "Column"
 msgid "Count"
@@ -3722,9 +3729,9 @@ msgstr "Prebaci se na kopiranu tablicu"
 #: libraries/operations.lib.php:794 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:191
-#: templates/structure/sortable_header.phtml:21
-#: templates/structure/sortable_header.phtml:38
-#: templates/table/options.phtml:68
+#: templates/database/structure/sortable_header.phtml:21
+#: templates/database/structure/sortable_header.phtml:38
+#: templates/table/search/options.phtml:68
 msgid "Ascending"
 msgstr "Uzlazno"
 
@@ -3734,13 +3741,14 @@ msgstr "Uzlazno"
 #: libraries/operations.lib.php:797 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:188
-#: templates/structure/sortable_header.phtml:26
-#: templates/structure/sortable_header.phtml:43
-#: templates/table/options.phtml:69
+#: templates/database/structure/sortable_header.phtml:26
+#: templates/database/structure/sortable_header.phtml:43
+#: templates/table/search/options.phtml:69
 msgid "Descending"
 msgstr "Silazno"
 
-#: libraries/DBQbe.class.php:467 templates/table/search_and_replace.phtml:6
+#: libraries/DBQbe.class.php:467
+#: templates/table/search/search_and_replace.phtml:6
 #, fuzzy
 #| msgid "Column"
 msgid "Column:"
@@ -3928,12 +3936,12 @@ msgstr[0] "%s poklapanja unutar tablice <i>%s</i>"
 msgstr[1] "%s poklapanja unutar tablice <i>%s</i>"
 
 #: libraries/DbSearch.class.php:354 libraries/Menu.class.php:311
-#: libraries/Util.class.php:3337 libraries/Util.class.php:3347
-#: libraries/Util.class.php:3623 libraries/Util.class.php:3624
-#: libraries/Util.class.php:4343 libraries/config.values.php:43
+#: libraries/Util.class.php:3343 libraries/Util.class.php:3353
+#: libraries/Util.class.php:3629 libraries/Util.class.php:3630
+#: libraries/Util.class.php:4349 libraries/config.values.php:43
 #: libraries/config.values.php:51 libraries/config.values.php:119
 #: libraries/navigation/Nodes/Node_Table.class.php:295
-#: templates/structure/check_all_table_column.phtml:5
+#: templates/table/structure/check_all_table_column.phtml:5
 msgid "Browse"
 msgstr "Pretraživanje"
 
@@ -3950,7 +3958,8 @@ msgstr "Traži u bazi podataka"
 msgid "Words or values to search for (wildcard: \"%\"):"
 msgstr "Riječi ili vrijednost za pretraživanje (zamjenski znak: \"%\"):"
 
-#: libraries/DbSearch.class.php:401 templates/table/search_and_replace.phtml:1
+#: libraries/DbSearch.class.php:401
+#: templates/table/search/search_and_replace.phtml:1
 msgid "Find:"
 msgstr "Traži:"
 
@@ -4000,16 +4009,16 @@ msgstr "Datoteke"
 msgid "Search this table"
 msgstr "Traži u bazi podataka"
 
-#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2532
-#: libraries/Util.class.php:2535
+#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2538
+#: libraries/Util.class.php:2541
 #, fuzzy
 #| msgid "Begin"
 msgctxt "First page"
 msgid "Begin"
 msgstr "Na vrh stranice"
 
-#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2533
-#: libraries/Util.class.php:2536 libraries/server_bin_log.lib.php:170
+#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2539
+#: libraries/Util.class.php:2542 libraries/server_bin_log.lib.php:170
 #: libraries/server_bin_log.lib.php:172
 #, fuzzy
 #| msgid "Previous"
@@ -4017,8 +4026,8 @@ msgctxt "Previous page"
 msgid "Previous"
 msgstr "Prethodni"
 
-#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2564
-#: libraries/Util.class.php:2574 libraries/server_bin_log.lib.php:204
+#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2570
+#: libraries/Util.class.php:2580 libraries/server_bin_log.lib.php:204
 #: libraries/server_bin_log.lib.php:206
 #, fuzzy
 #| msgid "Next"
@@ -4026,8 +4035,8 @@ msgctxt "Next page"
 msgid "Next"
 msgstr "Sljedeće"
 
-#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2565
-#: libraries/Util.class.php:2575
+#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2571
+#: libraries/Util.class.php:2581
 #, fuzzy
 #| msgid "End"
 msgctxt "Last page"
@@ -4116,9 +4125,9 @@ msgid "May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]."
 msgstr "Može biti približno. Pogledajte [doc@faq3-11]ČPP 3.11[/doc]"
 
 #: libraries/DisplayResults.class.php:4332 libraries/Message.class.php:180
-#: libraries/controllers/TableRelationController.class.php:258
+#: libraries/controllers/TableRelationController.class.php:259
 #: libraries/controllers/TableSearchController.class.php:655
-#: libraries/rte/rte_routines.lib.php:1332 libraries/sql_query_form.lib.php:89
+#: libraries/rte/rte_routines.lib.php:1423 libraries/sql_query_form.lib.php:89
 #: tbl_operations.php:227 tbl_row_action.php:138 view_operations.php:62
 #, fuzzy
 #| msgid "Your SQL query has been executed successfully."
@@ -4126,7 +4135,7 @@ msgid "Your SQL query has been executed successfully."
 msgstr "Vaš SQL upit uspješno je izvršen"
 
 #: libraries/DisplayResults.class.php:4660
-#: libraries/controllers/StructureController.class.php:629
+#: libraries/controllers/DatabaseStructureController.class.php:564
 #, php-format
 msgid ""
 "This view has at least this number of rows. Please refer to %sdocumentation"
@@ -4151,34 +4160,34 @@ msgstr ""
 msgid "%d total"
 msgstr "ukupno"
 
-#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1318
+#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1312
 #, fuzzy, php-format
 #| msgid "Query took %01.4f sec"
 msgid "Query took %01.4f seconds."
 msgstr "Upit je trajao %01.4f sek"
 
 #: libraries/DisplayResults.class.php:4807
-#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4767
-#: libraries/Util.class.php:4773 libraries/mult_submits.inc.php:50
-#: templates/structure/check_all_tables.phtml:2
-#: templates/structure/check_all_tables.phtml:9
+#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4773
+#: libraries/Util.class.php:4779 libraries/mult_submits.inc.php:50
+#: templates/database/structure/check_all_tables.phtml:2
+#: templates/database/structure/check_all_tables.phtml:9
 msgid "With selected:"
 msgstr "S odabirom:"
 
 #: libraries/DisplayResults.class.php:4811
-#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4769
-#: libraries/Util.class.php:4770 libraries/server_privileges.lib.php:1174
+#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4775
+#: libraries/Util.class.php:4776 libraries/server_privileges.lib.php:1174
 #: libraries/server_privileges.lib.php:1175
 #: libraries/server_privileges.lib.php:1387
 #: libraries/server_user_groups.lib.php:231
-#: templates/structure/check_all_tables.phtml:3
-#: templates/structure/check_all_tables.phtml:4
+#: templates/database/structure/check_all_tables.phtml:3
+#: templates/database/structure/check_all_tables.phtml:4
 msgid "Check All"
 msgstr "Označi sve"
 
 #: libraries/DisplayResults.class.php:4985 libraries/Header.class.php:383
-#: templates/structure/optional_action_links.phtml:1
-#: templates/structure/print_view_data_dictionary_link.phtml:3
+#: templates/database/structure/print_view_data_dictionary_link.phtml:3
+#: templates/table/structure/optional_action_links.phtml:1
 msgid "Print view"
 msgstr "Prikaz ispisa"
 
@@ -4186,7 +4195,8 @@ msgstr "Prikaz ispisa"
 msgid "Query results operations"
 msgstr "Operacije rezultata upita"
 
-#: libraries/DisplayResults.class.php:5105 templates/tbl_chart.phtml:12
+#: libraries/DisplayResults.class.php:5105
+#: templates/table/chart/tbl_chart.phtml:12
 #, fuzzy
 #| msgid "Display PDF schema"
 msgid "Display chart"
@@ -4295,7 +4305,7 @@ msgid "Click on the bar to scroll to top of page"
 msgstr ""
 
 #: libraries/Header.class.php:749
-#: libraries/plugins/auth/AuthenticationCookie.class.php:152
+#: libraries/plugins/auth/AuthenticationCookie.class.php:140
 #, fuzzy
 #| msgid "Cookies must be enabled past this point."
 msgid "Javascript must be enabled past this point!"
@@ -4319,11 +4329,11 @@ msgid "Keyname"
 msgstr "Naziv ključa"
 
 #: libraries/Index.class.php:697
-#: libraries/controllers/StructureController.class.php:1962
-#: libraries/controllers/StructureController.class.php:1967
+#: libraries/controllers/TableStructureController.class.php:953
+#: libraries/controllers/TableStructureController.class.php:958
 #: libraries/tracking.lib.php:973
 #: templates/columns_definitions/column_indexes.phtml:11
-#: templates/structure/check_all_table_column.phtml:26
+#: templates/table/structure/check_all_table_column.phtml:26
 msgid "Unique"
 msgstr "Jedinstveno"
 
@@ -4342,16 +4352,17 @@ msgstr "Najvažnije"
 #: libraries/server_collations.lib.php:35 libraries/tracking.lib.php:881
 #: libraries/tracking.lib.php:977
 #: templates/columns_definitions/table_fields_definitions.phtml:33
-#: templates/structure/row_stats_table.phtml:31
-#: templates/structure/table_header.phtml:55
-#: templates/structure/table_structure_header.phtml:7
-#: templates/table/table_header.phtml:8
+#: templates/database/structure/table_header.phtml:55
+#: templates/table/search/table_header.phtml:8
+#: templates/table/structure/row_stats_table.phtml:31
+#: templates/table/structure/table_structure_header.phtml:7
 msgid "Collation"
 msgstr "Uspoređivanje"
 
 #: libraries/Index.class.php:703 libraries/rte/rte_events.lib.php:496
-#: libraries/rte/rte_routines.lib.php:956 libraries/tracking.lib.php:885
-#: libraries/tracking.lib.php:979 templates/structure/table_header.phtml:84
+#: libraries/rte/rte_routines.lib.php:1047 libraries/tracking.lib.php:885
+#: libraries/tracking.lib.php:979
+#: templates/database/structure/table_header.phtml:84
 msgid "Comment"
 msgstr "Komentar"
 
@@ -4364,15 +4375,15 @@ msgstr "Primarni ključ je odbačen."
 msgid "Index %s has been dropped."
 msgstr "Index %s je odbačen."
 
-#: libraries/Index.class.php:757 libraries/Util.class.php:3630
-#: libraries/Util.class.php:3631
-#: libraries/controllers/StructureController.class.php:1958
-#: libraries/controllers/StructureController.class.php:1959
+#: libraries/Index.class.php:757 libraries/Util.class.php:3636
+#: libraries/Util.class.php:3637
+#: libraries/controllers/TableStructureController.class.php:949
+#: libraries/controllers/TableStructureController.class.php:950
 #: libraries/operations.lib.php:1607 libraries/rte/rte_list.lib.php:150
 #: libraries/server_databases.lib.php:146
-#: templates/structure/check_all_table_column.phtml:15
-#: templates/structure/check_all_tables.phtml:16
-#: templates/tbl_relation/foreign_key_row.phtml:93
+#: templates/database/structure/check_all_tables.phtml:16
+#: templates/table/relation/foreign_key_row.phtml:93
+#: templates/table/structure/check_all_table_column.phtml:15
 msgid "Drop"
 msgstr "Ispusti"
 
@@ -4402,16 +4413,16 @@ msgstr "Poslužitelj"
 #: libraries/Menu.class.php:248
 #: libraries/navigation/Nodes/Node_View.class.php:32
 #: libraries/tbl_info.inc.php:63
-#: templates/structure/structure_table_row.phtml:97
-#: templates/structure/structure_table_row.phtml:159
+#: templates/database/structure/structure_table_row.phtml:97
+#: templates/database/structure/structure_table_row.phtml:159
 msgid "View"
 msgstr "Prikaz"
 
 #: libraries/Menu.class.php:325 libraries/Menu.class.php:429
-#: libraries/Menu.class.php:548 libraries/Util.class.php:3334
-#: libraries/Util.class.php:3344 libraries/Util.class.php:3350
-#: libraries/Util.class.php:4313 libraries/Util.class.php:4328
-#: libraries/Util.class.php:4345 libraries/config.values.php:40
+#: libraries/Menu.class.php:548 libraries/Util.class.php:3340
+#: libraries/Util.class.php:3350 libraries/Util.class.php:3356
+#: libraries/Util.class.php:4319 libraries/Util.class.php:4334
+#: libraries/Util.class.php:4351 libraries/config.values.php:40
 #: libraries/config.values.php:48 libraries/config.values.php:110
 #: libraries/config.values.php:116 libraries/config/messages.inc.php:321
 #: libraries/navigation/Nodes/Node_Table.class.php:292
@@ -4419,19 +4430,19 @@ msgid "SQL"
 msgstr "SQL"
 
 #: libraries/Menu.class.php:328 libraries/Menu.class.php:432
-#: libraries/Util.class.php:3335 libraries/Util.class.php:3345
-#: libraries/Util.class.php:3351 libraries/Util.class.php:3625
-#: libraries/Util.class.php:3626 libraries/Util.class.php:4329
-#: libraries/Util.class.php:4346 libraries/config.values.php:41
+#: libraries/Util.class.php:3341 libraries/Util.class.php:3351
+#: libraries/Util.class.php:3357 libraries/Util.class.php:3631
+#: libraries/Util.class.php:3632 libraries/Util.class.php:4335
+#: libraries/Util.class.php:4352 libraries/config.values.php:41
 #: libraries/config.values.php:49 libraries/config.values.php:111
 #: libraries/config.values.php:117
 #: libraries/navigation/Nodes/Node_Table.class.php:286
 msgid "Search"
 msgstr "Traži"
 
-#: libraries/Menu.class.php:338 libraries/Util.class.php:3336
-#: libraries/Util.class.php:3346 libraries/Util.class.php:3627
-#: libraries/Util.class.php:3628 libraries/Util.class.php:4347
+#: libraries/Menu.class.php:338 libraries/Util.class.php:3342
+#: libraries/Util.class.php:3352 libraries/Util.class.php:3633
+#: libraries/Util.class.php:3634 libraries/Util.class.php:4353
 #: libraries/config.values.php:42 libraries/config.values.php:50
 #: libraries/config.values.php:118
 #: libraries/navigation/Nodes/Node_Table.class.php:289
@@ -4440,30 +4451,30 @@ msgid "Insert"
 msgstr "Umetni"
 
 #: libraries/Menu.class.php:362 libraries/Menu.class.php:467
-#: libraries/Util.class.php:4334 libraries/Util.class.php:4350
+#: libraries/Util.class.php:4340 libraries/Util.class.php:4356
 #: libraries/config.values.php:106 libraries/server_common.lib.php:51
 #: libraries/server_privileges.lib.php:2370
 #: libraries/server_privileges.lib.php:3158
-#: libraries/server_privileges.lib.php:4221
+#: libraries/server_privileges.lib.php:4247
 msgid "Privileges"
 msgstr "Privilegije"
 
 #: libraries/Menu.class.php:371 libraries/Menu.class.php:379
-#: libraries/Menu.class.php:459 libraries/Util.class.php:3338
-#: libraries/Util.class.php:3352 libraries/Util.class.php:4333
-#: libraries/Util.class.php:4351 libraries/config.values.php:112
+#: libraries/Menu.class.php:459 libraries/Util.class.php:3344
+#: libraries/Util.class.php:3358 libraries/Util.class.php:4339
+#: libraries/Util.class.php:4357 libraries/config.values.php:112
 #: view_operations.php:92
 msgid "Operations"
 msgstr "Operacije"
 
 #: libraries/Menu.class.php:384 libraries/Menu.class.php:492
-#: libraries/Util.class.php:4338 libraries/Util.class.php:4352
+#: libraries/Util.class.php:4344 libraries/Util.class.php:4358
 #: libraries/relation.lib.php:255
 msgid "Tracking"
 msgstr "Praćenje"
 
 #: libraries/Menu.class.php:397 libraries/Menu.class.php:486
-#: libraries/Util.class.php:4337 libraries/Util.class.php:4353
+#: libraries/Util.class.php:4343 libraries/Util.class.php:4359
 #: libraries/navigation/Nodes/Node_Trigger_Container.class.php:24
 #: libraries/plugins/export/ExportHtmlword.class.php:557
 #: libraries/plugins/export/ExportOdt.class.php:685
@@ -4480,16 +4491,16 @@ msgstr "Okidači"
 msgid "Database seems to be empty!"
 msgstr "Baza podataka izgleda praznom!"
 
-#: libraries/Menu.class.php:439 libraries/Util.class.php:4330
+#: libraries/Menu.class.php:439 libraries/Util.class.php:4336
 msgid "Query"
 msgstr "Upit"
 
-#: libraries/Menu.class.php:472 libraries/Util.class.php:4335
+#: libraries/Menu.class.php:472 libraries/Util.class.php:4341
 #: libraries/rte/rte_words.lib.php:36
 msgid "Routines"
 msgstr "Rutine"
 
-#: libraries/Menu.class.php:479 libraries/Util.class.php:4336
+#: libraries/Menu.class.php:479 libraries/Util.class.php:4342
 #: libraries/navigation/Nodes/Node_Event_Container.class.php:26
 #: libraries/plugins/export/ExportSql.class.php:940
 #: libraries/plugins/export/ExportXml.class.php:107
@@ -4497,22 +4508,22 @@ msgstr "Rutine"
 msgid "Events"
 msgstr "Događaji"
 
-#: libraries/Menu.class.php:498 libraries/Util.class.php:4339
+#: libraries/Menu.class.php:498 libraries/Util.class.php:4345
 msgid "Designer"
 msgstr "Kreator"
 
-#: libraries/Menu.class.php:507 libraries/Util.class.php:4340
-#: templates/structure/check_all_tables.phtml:35
+#: libraries/Menu.class.php:507 libraries/Util.class.php:4346
+#: templates/database/structure/check_all_tables.phtml:35
 #, fuzzy
 #| msgid "Add/Delete Field Columns"
 msgid "Central columns"
 msgstr "Dodaj/Izbriši stupce polja"
 
-#: libraries/Menu.class.php:544 libraries/Util.class.php:4312
+#: libraries/Menu.class.php:544 libraries/Util.class.php:4318
 #: libraries/config.values.php:103 libraries/config/messages.inc.php:266
 #: libraries/config/messages.inc.php:341
 #: libraries/navigation/NavigationTree.class.php:1239
-#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4332
+#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4358
 msgid "Databases"
 msgstr "Baze podataka"
 
@@ -4523,34 +4534,34 @@ msgid "User accounts"
 msgstr "Korisnik"
 
 #: libraries/Menu.class.php:595 libraries/ServerStatusData.class.php:121
-#: libraries/Util.class.php:4319 libraries/server_common.lib.php:36
+#: libraries/Util.class.php:4325 libraries/server_common.lib.php:36
 msgid "Binary log"
 msgstr "Binarni zapisnik"
 
 #: libraries/Menu.class.php:601 libraries/ServerStatusData.class.php:126
-#: libraries/Util.class.php:4320 libraries/server_common.lib.php:42
-#: templates/structure/body_for_table_summary.phtml:10
-#: templates/structure/table_header.phtml:27
+#: libraries/Util.class.php:4326 libraries/server_common.lib.php:42
+#: templates/database/structure/body_for_table_summary.phtml:10
+#: templates/database/structure/table_header.phtml:27
 msgid "Replication"
 msgstr "Replikacija"
 
 #: libraries/Menu.class.php:606 libraries/ServerStatusData.class.php:193
-#: libraries/Util.class.php:4321 libraries/config.values.php:105
+#: libraries/Util.class.php:4327 libraries/config.values.php:105
 #: libraries/server_engines.lib.php:108 libraries/server_engines.lib.php:112
 #: libraries/sql_query_form.lib.php:421
 msgid "Variables"
 msgstr "Varijable"
 
-#: libraries/Menu.class.php:610 libraries/Util.class.php:4322
+#: libraries/Menu.class.php:610 libraries/Util.class.php:4328
 msgid "Charsets"
 msgstr "Tablice znakova"
 
-#: libraries/Menu.class.php:615 libraries/Util.class.php:4323
+#: libraries/Menu.class.php:615 libraries/Util.class.php:4329
 #: libraries/server_common.lib.php:33 libraries/server_plugins.lib.php:27
 msgid "Plugins"
 msgstr "Dodatci"
 
-#: libraries/Menu.class.php:626 libraries/Util.class.php:4324
+#: libraries/Menu.class.php:626 libraries/Util.class.php:4330
 msgid "Engines"
 msgstr "Pogoni"
 
@@ -4578,7 +4589,7 @@ msgid_plural "%1$d rows inserted."
 msgstr[0] "Umetnuto redaka: %1$d."
 msgstr[1] "Umetnuto redaka: %1$d."
 
-#: libraries/PDF.class.php:70 libraries/Util.class.php:2521
+#: libraries/PDF.class.php:70 libraries/Util.class.php:2527
 #: libraries/browse_foreigners.lib.php:327
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:865
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:890
@@ -4605,7 +4616,7 @@ msgid "Could not save favorite table!"
 msgstr "Nije moguće učitati zadanu konfiguraciju iz: \"%1$s\""
 
 #: libraries/RecentFavoriteTable.class.php:212
-#: templates/structure/favorite_anchor.phtml:12
+#: templates/database/structure/favorite_anchor.phtml:12
 #, fuzzy
 #| msgid "Rename database to"
 msgid "Remove from Favorites"
@@ -4790,7 +4801,7 @@ msgid ""
 msgstr "Za ovaj pogon pohranjivanje ne postoje raspoloživi podaci."
 
 #: libraries/StorageEngine.class.php:373
-#: templates/structure/body_for_table_summary.phtml:50
+#: templates/database/structure/body_for_table_summary.phtml:50
 #, php-format
 msgid "%s is the default storage engine on this MySQL server."
 msgstr "%s je zadani pogon pohranjivanja na ovom MySQL poslužitelju."
@@ -5227,10 +5238,10 @@ msgstr ""
 
 #: libraries/Util.class.php:726 libraries/rte/rte_events.lib.php:110
 #: libraries/rte/rte_events.lib.php:119 libraries/rte/rte_events.lib.php:150
-#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:153
-#: libraries/rte/rte_routines.lib.php:162
-#: libraries/rte/rte_routines.lib.php:235
-#: libraries/rte/rte_routines.lib.php:1366
+#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:223
+#: libraries/rte/rte_routines.lib.php:250
+#: libraries/rte/rte_routines.lib.php:372
+#: libraries/rte/rte_routines.lib.php:1457
 #: libraries/rte/rte_triggers.lib.php:86 libraries/rte/rte_triggers.lib.php:95
 #: libraries/rte/rte_triggers.lib.php:127
 msgid "MySQL said: "
@@ -5276,79 +5287,82 @@ msgstr "Ned"
 msgid "%B %d, %Y at %I:%M %p"
 msgstr "%B %d, %Y u %I:%M %p"
 
-#: libraries/Util.class.php:2019
+#: libraries/Util.class.php:2025
 #, php-format
 msgid "%s days, %s hours, %s minutes and %s seconds"
 msgstr "%s dana, %s sati, %s minuta i %s sekunda"
 
-#: libraries/Util.class.php:2112
+#: libraries/Util.class.php:2118
 #, fuzzy
 #| msgid "Routines"
 msgid "Missing parameter:"
 msgstr "Rutine"
 
-#: libraries/Util.class.php:2645
+#: libraries/Util.class.php:2651
 #, php-format
 msgid "Jump to database \"%s\"."
 msgstr "Skoči do baze podataka \"%s\"."
 
-#: libraries/Util.class.php:2670
+#: libraries/Util.class.php:2676
 #, php-format
 msgid "The %s functionality is affected by a known bug, see %s"
 msgstr "Na funkcionalnost %s utječe poznati nedostatak. Pogledajte %s"
 
-#: libraries/Util.class.php:2881
+#: libraries/Util.class.php:2887
 msgid "Click to toggle"
 msgstr ""
 
-#: libraries/Util.class.php:3542 prefs_manage.php:248
+#: libraries/Util.class.php:3548 prefs_manage.php:248
 msgid "Browse your computer:"
 msgstr "Pretraži računalo:"
 
-#: libraries/Util.class.php:3567
+#: libraries/Util.class.php:3573
 #, fuzzy, php-format
 #| msgid "web server upload directory"
 msgid "Select from the web server upload directory <b>%s</b>:"
 msgstr "mapa učitavanja web poslužitelja"
 
-#: libraries/Util.class.php:3596 libraries/insert_edit.lib.php:1173
+#: libraries/Util.class.php:3602 libraries/insert_edit.lib.php:1171
 msgid "The directory you set for upload work cannot be reached."
 msgstr "Mapu koju ste odabrali za potrebe učitavanja nije moguće dohvatiti."
 
-#: libraries/Util.class.php:3607
+#: libraries/Util.class.php:3613
 #, fuzzy
 msgid "There are no files to upload!"
 msgstr "Provjeri tablicu"
 
-#: libraries/Util.class.php:3632 libraries/Util.class.php:3633
-#: templates/structure/check_all_tables.phtml:15
+#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: templates/database/structure/check_all_tables.phtml:15
 msgid "Empty"
 msgstr "Isprazni"
 
-#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: libraries/Util.class.php:3644 libraries/Util.class.php:3645
 msgid "Execute"
 msgstr "Izvrši"
 
-#: libraries/Util.class.php:4152
+#: libraries/Util.class.php:4158
 msgid "Print"
 msgstr "Ispiši"
 
-#: libraries/Util.class.php:4257 templates/structure/row_stats_table.phtml:80
-#: templates/structure/table_header.phtml:95
+#: libraries/Util.class.php:4263
+#: templates/database/structure/table_header.phtml:95
+#: templates/table/structure/row_stats_table.phtml:80
 msgid "Creation"
 msgstr "Izrada"
 
-#: libraries/Util.class.php:4263 templates/structure/row_stats_table.phtml:87
-#: templates/structure/table_header.phtml:106
+#: libraries/Util.class.php:4269
+#: templates/database/structure/table_header.phtml:106
+#: templates/table/structure/row_stats_table.phtml:87
 msgid "Last update"
 msgstr "Posljednje ažuriranje"
 
-#: libraries/Util.class.php:4269 templates/structure/row_stats_table.phtml:94
-#: templates/structure/table_header.phtml:117
+#: libraries/Util.class.php:4275
+#: templates/database/structure/table_header.phtml:117
+#: templates/table/structure/row_stats_table.phtml:94
 msgid "Last check"
 msgstr "Posljednja provjera"
 
-#: libraries/Util.class.php:4315
+#: libraries/Util.class.php:4321
 #, fuzzy
 #| msgid "User"
 msgid "Users"
@@ -5371,16 +5385,16 @@ msgid "Use this value"
 msgstr "Upotrijebi ovu vrijednost"
 
 #: libraries/build_html_for_db.lib.php:33 libraries/import.lib.php:193
-#: templates/structure/actions_in_table_structure.phtml:113
-#: templates/structure/row_stats_table.phtml:42
-#: templates/structure/table_header.phtml:36
+#: templates/database/structure/table_header.phtml:36
+#: templates/table/structure/actions_in_table_structure.phtml:113
+#: templates/table/structure/row_stats_table.phtml:42
 msgid "Rows"
 msgstr "Redaka"
 
 #: libraries/build_html_for_db.lib.php:48 libraries/engines/innodb.lib.php:171
-#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:186
-#: libraries/server_status.lib.php:298
-#: templates/structure/display_table_stats.phtml:40
+#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:195
+#: libraries/server_status.lib.php:307
+#: templates/table/structure/display_table_stats.phtml:40
 msgid "Total"
 msgstr "Ukupno"
 
@@ -5390,10 +5404,12 @@ msgid "Jump to database"
 msgstr "Nema baza podataka"
 
 #: libraries/build_html_for_db.lib.php:146
+#: templates/database/structure/structure_table_row.phtml:15
 msgid "Not replicated"
 msgstr ""
 
 #: libraries/build_html_for_db.lib.php:158
+#: templates/database/structure/structure_table_row.phtml:16
 #, fuzzy
 #| msgid "Replication"
 msgid "Replicated"
@@ -5452,17 +5468,17 @@ msgstr ""
 #: libraries/plugins/export/ExportTexytext.class.php:425
 #: libraries/plugins/export/PMA_ExportPdf.class.php:307
 #: libraries/rte/rte_list.lib.php:73 libraries/rte/rte_list.lib.php:85
-#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:830
-#: libraries/rte/rte_routines.lib.php:1492 setup/frames/index.inc.php:162
+#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:921
+#: libraries/rte/rte_routines.lib.php:1583 setup/frames/index.inc.php:162
 #: templates/columns_definitions/table_fields_definitions.phtml:8
-#: templates/structure/table_structure_header.phtml:5
-#: templates/table/create_table.phtml:11
+#: templates/database/create_table.phtml:11
+#: templates/table/structure/table_structure_header.phtml:5
 msgid "Name"
 msgstr "Naziv"
 
 #: libraries/central_columns.lib.php:699
 #: libraries/central_columns.lib.php:1381
-#: libraries/rte/rte_routines.lib.php:832
+#: libraries/rte/rte_routines.lib.php:923
 #: templates/columns_definitions/table_fields_definitions.phtml:14
 msgid "Length/Values"
 msgstr "Duljina/Vrijednosti"
@@ -5485,7 +5501,7 @@ msgid "Select a table"
 msgstr "Odaberite tablice"
 
 #: libraries/central_columns.lib.php:804
-#: templates/structure/add_column.phtml:4
+#: templates/table/structure/add_column.phtml:4
 #, fuzzy
 #| msgid "Add %s field(s)"
 msgid "Add column"
@@ -5507,7 +5523,7 @@ msgstr "Dodaj %s polja"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1002
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1025
 #: templates/columns_definitions/table_fields_definitions.phtml:36
-#: templates/structure/table_structure_header.phtml:8
+#: templates/table/structure/table_structure_header.phtml:8
 msgid "Attributes"
 msgstr "Atributi"
 
@@ -5633,7 +5649,7 @@ msgid "Double click"
 msgstr ""
 
 #: libraries/config.values.php:95 libraries/config.values.php:124
-#: libraries/config/FormDisplay.tpl.php:221 libraries/relation.lib.php:97
+#: libraries/config/FormDisplay.tpl.php:232 libraries/relation.lib.php:97
 #: libraries/relation.lib.php:105
 msgid "Disabled"
 msgstr "Onemogućeno"
@@ -5832,21 +5848,21 @@ msgstr ""
 msgid "maximum %s"
 msgstr "maksimum %s"
 
-#: libraries/config/FormDisplay.tpl.php:219
+#: libraries/config/FormDisplay.tpl.php:230
 msgid "This setting is disabled, it will not be applied to your configuration."
 msgstr ""
 
-#: libraries/config/FormDisplay.tpl.php:313
+#: libraries/config/FormDisplay.tpl.php:324
 #, php-format
 msgid "Set value: %s"
 msgstr "Postavi vrijednost %s"
 
-#: libraries/config/FormDisplay.tpl.php:318
+#: libraries/config/FormDisplay.tpl.php:329
 #: libraries/config/messages.inc.php:610
 msgid "Restore default value"
 msgstr "Vrati zadanu vrijednost"
 
-#: libraries/config/FormDisplay.tpl.php:332
+#: libraries/config/FormDisplay.tpl.php:343
 msgid "Allow users to customize this value"
 msgstr ""
 
@@ -6289,7 +6305,7 @@ msgstr "Tablica znakova za datoteku:"
 
 #: libraries/config/messages.inc.php:136 libraries/config/messages.inc.php:152
 #: libraries/sql_query_form.lib.php:247
-#: templates/structure/row_stats_table.phtml:7
+#: templates/table/structure/row_stats_table.phtml:7
 msgid "Format"
 msgstr "Oblikovanje"
 
@@ -6860,7 +6876,7 @@ msgstr ""
 
 #: libraries/config/messages.inc.php:332
 #: libraries/plugins/export/ExportPdf.class.php:279
-#: templates/structure/secondary_tabs.phtml:8
+#: templates/table/secondary_tabs.phtml:8
 #, fuzzy
 #| msgid "Database for user"
 msgid "Table structure"
@@ -8509,113 +8525,35 @@ msgstr "Microsoft Word 2000"
 msgid "OpenDocument Text"
 msgstr "Otvori tekst dokumenta"
 
-#: libraries/controllers/StructureController.class.php:465
+#: libraries/controllers/DatabaseStructureController.class.php:405
 #: tbl_operations.php:382
 #, php-format
 msgid "Table %s has been emptied."
 msgstr "Tablica %s je očišćena."
 
-#: libraries/controllers/StructureController.class.php:486
+#: libraries/controllers/DatabaseStructureController.class.php:426
 #: tbl_operations.php:400 view_operations.php:119
 #, fuzzy, php-format
 #| msgid "View %s has been dropped."
 msgid "View %s has been dropped."
 msgstr "Index %s je ispušten"
 
-#: libraries/controllers/StructureController.class.php:487
+#: libraries/controllers/DatabaseStructureController.class.php:427
 #: tbl_operations.php:401
 #, fuzzy, php-format
 #| msgid "Table %s has been dropped."
 msgid "Table %s has been dropped."
 msgstr "Tablica %s je odbačen"
 
-#: libraries/controllers/StructureController.class.php:797
-#, php-format
-msgid "The name '%s' is a MySQL reserved keyword."
-msgid_plural "The names '%s' are MySQL reserved keywords."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: libraries/controllers/StructureController.class.php:875
-#, fuzzy
-#| msgid "No rows selected"
-msgid "No column selected."
-msgstr "Nema odabranih redova"
-
-#: libraries/controllers/StructureController.class.php:1049
+#: libraries/controllers/DatabaseStructureController.class.php:733
 msgid "Favorite List is full!"
 msgstr ""
 
-#: libraries/controllers/StructureController.class.php:1272
-#, fuzzy
-#| msgid "The selected users have been deleted successfully."
-msgid "The columns have been moved successfully."
-msgstr "Odabrani korisnici uspješno su izbrisani."
-
-#: libraries/controllers/StructureController.class.php:1535
-#, fuzzy, php-format
-#| msgid "Table %1$s has been altered successfully."
-msgid ""
-"Table %1$s has been altered successfully. Privileges have been adjusted."
-msgstr "Tablica %1$s uspješno je izmijenjena."
-
-#: libraries/controllers/StructureController.class.php:1541
-#: libraries/controllers/TableIndexesController.class.php:161
-#: tbl_addfield.php:92
-#, php-format
-msgid "Table %1$s has been altered successfully."
-msgstr "Tablica %1$s uspješno je izmijenjena."
-
-#: libraries/controllers/StructureController.class.php:1588
-#: libraries/tracking.lib.php:1094
-#, fuzzy
-#| msgid "Query type"
-msgid "Query error"
-msgstr "Vrsta upita"
-
-#: libraries/controllers/StructureController.class.php:1806
+#: libraries/controllers/DatabaseStructureController.class.php:947
 #: libraries/mysql_charsets.lib.php:366 libraries/mysql_charsets.lib.php:373
 msgid "unknown"
 msgstr "nepoznato"
 
-#: libraries/controllers/StructureController.class.php:1957
-#: templates/structure/check_all_table_column.phtml:11
-msgid "Change"
-msgstr "Promijeni"
-
-#: libraries/controllers/StructureController.class.php:1961
-#: libraries/controllers/StructureController.class.php:1966
-#: libraries/navigation/Nodes/Node_Index.class.php:30
-#: libraries/tracking.lib.php:926
-#: templates/columns_definitions/column_indexes.phtml:16
-#: templates/columns_definitions/table_fields_definitions.phtml:57
-#: templates/structure/check_all_table_column.phtml:30
-#: templates/structure/display_structure.phtml:79
-#: templates/structure/display_table_stats.phtml:19
-msgid "Index"
-msgstr "Indeks"
-
-#: libraries/controllers/StructureController.class.php:1963
-#: libraries/controllers/StructureController.class.php:1968
-#: templates/columns_definitions/column_indexes.phtml:27
-#: templates/structure/check_all_table_column.phtml:37
-msgid "Spatial"
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1964
-#: libraries/controllers/StructureController.class.php:1969
-#: templates/columns_definitions/column_indexes.phtml:22
-#: templates/structure/check_all_table_column.phtml:47
-msgid "Fulltext"
-msgstr "Puni tekst"
-
-#: libraries/controllers/StructureController.class.php:1970
-#, fuzzy
-#| msgid "Browse distinct values"
-msgid "Distinct values"
-msgstr "Pretraži prepoznatljive vrijednosti"
-
 #: libraries/controllers/TableChartController.class.php:82
 #: libraries/controllers/TableGisVisualizationController.class.php:101
 msgid "No SQL query was set to fetch data."
@@ -8631,13 +8569,20 @@ msgstr ""
 msgid "No data to display"
 msgstr "Nema baza podataka"
 
-#: libraries/controllers/TableRelationController.class.php:217
+#: libraries/controllers/TableIndexesController.class.php:161
+#: libraries/controllers/TableStructureController.class.php:736
+#: tbl_addfield.php:92
+#, php-format
+msgid "Table %1$s has been altered successfully."
+msgstr "Tablica %1$s uspješno je izmijenjena."
+
+#: libraries/controllers/TableRelationController.class.php:218
 #, fuzzy
 #| msgid "Thread %s was successfully killed."
 msgid "Display column was successfully updated."
 msgstr "Grana %s uspješno je prekinuta."
 
-#: libraries/controllers/TableRelationController.class.php:283
+#: libraries/controllers/TableRelationController.class.php:288
 #, fuzzy
 #| msgid "Internal relation added"
 msgid "Internal relations were successfully updated."
@@ -8656,11 +8601,82 @@ msgid "Zoom search"
 msgstr "Traži"
 
 #: libraries/controllers/TableSearchController.class.php:852
-#: templates/table/selection_form.phtml:59
+#: templates/table/search/selection_form.phtml:59
 #, fuzzy
 msgid "Find and replace"
 msgstr "SQL upit"
 
+#: libraries/controllers/TableStructureController.class.php:163
+#, php-format
+msgid "The name '%s' is a MySQL reserved keyword."
+msgid_plural "The names '%s' are MySQL reserved keywords."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: libraries/controllers/TableStructureController.class.php:241
+#, fuzzy
+#| msgid "No rows selected"
+msgid "No column selected."
+msgstr "Nema odabranih redova"
+
+#: libraries/controllers/TableStructureController.class.php:467
+#, fuzzy
+#| msgid "The selected users have been deleted successfully."
+msgid "The columns have been moved successfully."
+msgstr "Odabrani korisnici uspješno su izbrisani."
+
+#: libraries/controllers/TableStructureController.class.php:730
+#, fuzzy, php-format
+#| msgid "Table %1$s has been altered successfully."
+msgid ""
+"Table %1$s has been altered successfully. Privileges have been adjusted."
+msgstr "Tablica %1$s uspješno je izmijenjena."
+
+#: libraries/controllers/TableStructureController.class.php:783
+#: libraries/tracking.lib.php:1094
+#, fuzzy
+#| msgid "Query type"
+msgid "Query error"
+msgstr "Vrsta upita"
+
+#: libraries/controllers/TableStructureController.class.php:948
+#: templates/table/structure/check_all_table_column.phtml:11
+msgid "Change"
+msgstr "Promijeni"
+
+#: libraries/controllers/TableStructureController.class.php:952
+#: libraries/controllers/TableStructureController.class.php:957
+#: libraries/navigation/Nodes/Node_Index.class.php:30
+#: libraries/tracking.lib.php:926
+#: templates/columns_definitions/column_indexes.phtml:16
+#: templates/columns_definitions/table_fields_definitions.phtml:57
+#: templates/table/structure/check_all_table_column.phtml:30
+#: templates/table/structure/display_structure.phtml:79
+#: templates/table/structure/display_table_stats.phtml:19
+msgid "Index"
+msgstr "Indeks"
+
+#: libraries/controllers/TableStructureController.class.php:954
+#: libraries/controllers/TableStructureController.class.php:959
+#: templates/columns_definitions/column_indexes.phtml:27
+#: templates/table/structure/check_all_table_column.phtml:37
+msgid "Spatial"
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:955
+#: libraries/controllers/TableStructureController.class.php:960
+#: templates/columns_definitions/column_indexes.phtml:22
+#: templates/table/structure/check_all_table_column.phtml:47
+msgid "Fulltext"
+msgstr "Puni tekst"
+
+#: libraries/controllers/TableStructureController.class.php:963
+#, fuzzy
+#| msgid "Browse distinct values"
+msgid "Distinct values"
+msgstr "Pretraži prepoznatljive vrijednosti"
+
 #: libraries/core.lib.php:306
 #, php-format
 msgid "The %s extension is missing. Please check your PHP configuration."
@@ -8707,7 +8723,7 @@ msgid "No Password"
 msgstr "Bez lozinke"
 
 #: libraries/display_change_password.lib.php:68
-#: libraries/plugins/auth/AuthenticationCookie.class.php:199
+#: libraries/plugins/auth/AuthenticationCookie.class.php:187
 #: libraries/replication_gui.lib.php:422 libraries/replication_gui.lib.php:862
 #: libraries/server_privileges.lib.php:1640
 msgid "Password:"
@@ -9578,12 +9594,12 @@ msgid "Dump has been saved to file %s."
 msgstr "Izbacivanje je spremljeno u datoteku %s."
 
 #: libraries/import.lib.php:202 libraries/insert_edit.lib.php:124
-#: libraries/rte/rte_routines.lib.php:1353 libraries/sql.lib.php:1312
+#: libraries/rte/rte_routines.lib.php:1444 libraries/sql.lib.php:1306
 #: tbl_get_field.php:44
 msgid "MySQL returned an empty result set (i.e. zero rows)."
 msgstr "MySQL je vratio prazan komplet rezultata (npr. nula redova)."
 
-#: libraries/import.lib.php:265 libraries/sql.lib.php:1326
+#: libraries/import.lib.php:265 libraries/sql.lib.php:1320
 msgid "[ROLLBACK occurred.]"
 msgstr ""
 
@@ -9650,14 +9666,14 @@ msgstr "Izradi indeks &nbsp;%s&nbsp;stupaca"
 
 #: libraries/insert_edit.lib.php:233
 #: libraries/navigation/Nodes/Node_DatabaseChild.class.php:48
-#: templates/designer/table_list.phtml:40
+#: templates/database/designer/table_list.phtml:40
 msgid "Hide"
 msgstr "Sakrij"
 
 #: libraries/insert_edit.lib.php:249
 #: libraries/navigation/Nodes/Node_Function.class.php:32
-#: libraries/rte/rte_routines.lib.php:1495
-#: templates/table/table_header.phtml:4
+#: libraries/rte/rte_routines.lib.php:1586
+#: templates/table/search/table_header.phtml:4
 msgid "Function"
 msgstr "Funkcija"
 
@@ -9673,90 +9689,91 @@ msgid "Because of its length,<br /> this column might not be editable."
 msgstr ""
 " Zbog svoje duljine,<br /> uređivanje ovog polja možda neće biti moguće "
 
-#: libraries/insert_edit.lib.php:1050
+#: libraries/insert_edit.lib.php:1048
 msgid "Binary - do not edit"
 msgstr "Binarno - ne uređuj"
 
-#: libraries/insert_edit.lib.php:1176 libraries/server_privileges.lib.php:470
-#: templates/table/options.phtml:36
+#: libraries/insert_edit.lib.php:1174 libraries/server_privileges.lib.php:470
+#: templates/table/search/options.phtml:36
 msgid "Or"
 msgstr "Ili"
 
-#: libraries/insert_edit.lib.php:1177
+#: libraries/insert_edit.lib.php:1175
 #, fuzzy
 #| msgid "web server upload directory"
 msgid "web server upload directory:"
 msgstr "mapa učitavanja web poslužitelja"
 
-#: libraries/insert_edit.lib.php:1348 templates/table/input_box.phtml:49
+#: libraries/insert_edit.lib.php:1346
+#: templates/table/search/input_box.phtml:49
 #, fuzzy
 #| msgid "Insert"
 msgid "Edit/Insert"
 msgstr "Umetni"
 
-#: libraries/insert_edit.lib.php:1398
+#: libraries/insert_edit.lib.php:1396
 #, fuzzy, php-format
 #| msgid "Restart insertion with %s rows"
 msgid "Continue insertion with %s rows"
 msgstr "Ponovno pokreni umetanje s %s redaka"
 
-#: libraries/insert_edit.lib.php:1428
+#: libraries/insert_edit.lib.php:1426
 msgid "and then"
 msgstr "i potom"
 
-#: libraries/insert_edit.lib.php:1461
+#: libraries/insert_edit.lib.php:1459
 msgid "Insert as new row"
 msgstr "Umetni kao novi redak"
 
-#: libraries/insert_edit.lib.php:1464
+#: libraries/insert_edit.lib.php:1462
 msgid "Insert as new row and ignore errors"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1467
+#: libraries/insert_edit.lib.php:1465
 #, fuzzy
 msgid "Show insert query"
 msgstr "Prikazivanje SQL upita"
 
-#: libraries/insert_edit.lib.php:1487
+#: libraries/insert_edit.lib.php:1485
 msgid "Go back to previous page"
 msgstr "Kreni nazad na prethodnu stranicu"
 
-#: libraries/insert_edit.lib.php:1490
+#: libraries/insert_edit.lib.php:1488
 msgid "Insert another new row"
 msgstr "Umetni dodatni novi redak"
 
-#: libraries/insert_edit.lib.php:1495
+#: libraries/insert_edit.lib.php:1493
 msgid "Go back to this page"
 msgstr "Kreni nazad na ovu stranicu"
 
-#: libraries/insert_edit.lib.php:1518
+#: libraries/insert_edit.lib.php:1516
 msgid "Edit next row"
 msgstr "Uredi sljedeći redak"
 
-#: libraries/insert_edit.lib.php:1540
+#: libraries/insert_edit.lib.php:1538
 msgid ""
 "Use TAB key to move from value to value, or CTRL+arrows to move anywhere"
 msgstr ""
 "Pomoću tipke TAB premještate se od jedne vrijednost do druge vrijednost, "
 "odnosno s tipkama CTRL+Strelice za premještanje bilo kamo"
 
-#: libraries/insert_edit.lib.php:1577 libraries/replication_gui.lib.php:542
-#: libraries/rte/rte_routines.lib.php:1497
+#: libraries/insert_edit.lib.php:1575 libraries/replication_gui.lib.php:542
+#: libraries/rte/rte_routines.lib.php:1588
 #: libraries/server_status_variables.lib.php:220
-#: templates/designer/having_query_panel.phtml:100
-#: templates/designer/options_panel.phtml:73
-#: templates/designer/options_panel.phtml:239
-#: templates/designer/where_query_panel.phtml:69
-#: templates/table/table_header.phtml:10
-#: templates/table/zoom_result_form.phtml:35
+#: templates/database/designer/having_query_panel.phtml:100
+#: templates/database/designer/options_panel.phtml:73
+#: templates/database/designer/options_panel.phtml:239
+#: templates/database/designer/where_query_panel.phtml:69
+#: templates/table/search/table_header.phtml:10
+#: templates/table/search/zoom_result_form.phtml:35
 msgid "Value"
 msgstr "Vrijednost"
 
-#: libraries/insert_edit.lib.php:1937 libraries/sql.lib.php:1309
+#: libraries/insert_edit.lib.php:1935 libraries/sql.lib.php:1303
 msgid "Showing SQL query"
 msgstr "Prikazivanje SQL upita"
 
-#: libraries/insert_edit.lib.php:1962 libraries/sql.lib.php:1287
+#: libraries/insert_edit.lib.php:1960 libraries/sql.lib.php:1281
 #, php-format
 msgid "Inserted row id: %1$d"
 msgstr "Umetnut ID retka: %1$d"
@@ -10224,7 +10241,7 @@ msgstr "Novo"
 #: libraries/navigation/Nodes/Node_View_Container.class.php:26
 #: libraries/navigation/Nodes/Node_View_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:129
-#: templates/structure/show_create.phtml:30
+#: templates/database/structure/show_create.phtml:30
 #, fuzzy
 #| msgid "View"
 msgid "Views"
@@ -10540,7 +10557,7 @@ msgstr "Nemate dovoljno privilegija da boravite ovdje!"
 
 #: libraries/operations.lib.php:101 libraries/operations.lib.php:249
 #: libraries/operations.lib.php:869 libraries/operations.lib.php:963
-#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:907
+#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:998
 #: templates/columns_definitions/table_fields_definitions.phtml:47
 #, fuzzy
 #| msgid "Edit Privileges"
@@ -10634,22 +10651,22 @@ msgid "Switch to copied table"
 msgstr "Prebaci se na kopiranu tablicu"
 
 #: libraries/operations.lib.php:1360
-#: templates/structure/check_all_tables.phtml:18
+#: templates/database/structure/check_all_tables.phtml:18
 msgid "Table maintenance"
 msgstr "Održavanje tablice"
 
 #: libraries/operations.lib.php:1398
-#: templates/structure/check_all_tables.phtml:19
+#: templates/database/structure/check_all_tables.phtml:19
 msgid "Analyze table"
 msgstr "Analiziraj tablicu"
 
 #: libraries/operations.lib.php:1413
-#: templates/structure/check_all_tables.phtml:20
+#: templates/database/structure/check_all_tables.phtml:20
 msgid "Check table"
 msgstr "Provjeri tablicu"
 
 #: libraries/operations.lib.php:1428
-#: templates/structure/check_all_tables.phtml:22
+#: templates/database/structure/check_all_tables.phtml:22
 #, fuzzy
 #| msgid "Check table"
 msgid "Checksum table"
@@ -10671,18 +10688,19 @@ msgid "Flush the table (FLUSH)"
 msgstr "Isprazni tablicu (\"FLUSH\")"
 
 #: libraries/operations.lib.php:1477
-#: templates/structure/check_all_tables.phtml:23
-#: templates/structure/display_table_stats.phtml:56
+#: templates/database/structure/check_all_tables.phtml:23
+#: templates/table/structure/display_table_stats.phtml:56
 msgid "Optimize table"
 msgstr "Optimiziraj tablicu"
 
 #: libraries/operations.lib.php:1492
-#: templates/structure/check_all_tables.phtml:24
+#: templates/database/structure/check_all_tables.phtml:24
 msgid "Repair table"
 msgstr "Popravi tablicu"
 
 #: libraries/operations.lib.php:1538
-#: templates/structure/check_all_tables.phtml:14 view_operations.php:127
+#: templates/database/structure/check_all_tables.phtml:14
+#: view_operations.php:127
 #, fuzzy
 #| msgid "Dumping data for table"
 msgid "Delete data or table"
@@ -10812,7 +10830,7 @@ msgid "Cannot connect: invalid settings."
 msgstr "Povezivanje nije moguće: neispravna postavka."
 
 #: libraries/plugins/auth/AuthenticationConfig.class.php:108
-#: libraries/plugins/auth/AuthenticationCookie.class.php:134
+#: libraries/plugins/auth/AuthenticationCookie.class.php:122
 #: libraries/plugins/auth/AuthenticationHttp.class.php:96
 #, php-format
 msgid "Welcome to %s"
@@ -10844,38 +10862,38 @@ msgstr ""
 msgid "Retry to connect"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:146
+#: libraries/plugins/auth/AuthenticationCookie.class.php:134
 msgid "Your session has expired. Please log in again."
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:170
+#: libraries/plugins/auth/AuthenticationCookie.class.php:158
 msgid "Log in"
 msgstr "Prijava"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:178
-#: libraries/plugins/auth/AuthenticationCookie.class.php:188
+#: libraries/plugins/auth/AuthenticationCookie.class.php:166
+#: libraries/plugins/auth/AuthenticationCookie.class.php:176
 msgid "You can enter hostname/IP address and port separated by space."
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:193
+#: libraries/plugins/auth/AuthenticationCookie.class.php:181
 msgid "Username:"
 msgstr "Korisničko ime:"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:205
+#: libraries/plugins/auth/AuthenticationCookie.class.php:193
 #, fuzzy
 #| msgid "Server Choice"
 msgid "Server Choice:"
 msgstr "Odabir poslužitelja"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:386
+#: libraries/plugins/auth/AuthenticationCookie.class.php:374
 msgid "Entered captcha is wrong, try again!"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:396
+#: libraries/plugins/auth/AuthenticationCookie.class.php:384
 msgid "Please enter correct captcha!"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:423
+#: libraries/plugins/auth/AuthenticationCookie.class.php:411
 #, fuzzy
 #| msgid "Cannot log in to the MySQL server"
 msgid "You are not allowed to log in to this MySQL server!"
@@ -10986,7 +11004,7 @@ msgstr "Događaj"
 #: libraries/plugins/export/ExportOdt.class.php:593
 #: libraries/plugins/export/ExportTexytext.class.php:428
 #: libraries/plugins/export/PMA_ExportPdf.class.php:313
-#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:984
 #: libraries/rte/rte_triggers.lib.php:377
 #, fuzzy
 #| msgid "Description"
@@ -11340,7 +11358,7 @@ msgid "Last check:"
 msgstr "Posljednja provjera"
 
 #: libraries/plugins/export/ExportSql.class.php:1399
-#: templates/structure/structure_table_row.phtml:183
+#: templates/database/structure/structure_table_row.phtml:183
 msgid "in use"
 msgstr "u upotrebi"
 
@@ -11542,22 +11560,16 @@ msgstr ""
 msgid "The imported file does not contain any data!"
 msgstr ""
 
-#: libraries/plugins/import/ImportSql.class.php:169
+#: libraries/plugins/import/ImportSql.class.php:72
 #, fuzzy
 #| msgid "SQL compatibility mode"
 msgid "SQL compatibility mode:"
 msgstr "Način rada SQL kompatibilnosti"
 
-#: libraries/plugins/import/ImportSql.class.php:181
+#: libraries/plugins/import/ImportSql.class.php:84
 msgid "Do not use <code>AUTO_INCREMENT</code> for zero values"
 msgstr ""
 
-#: libraries/plugins/import/ImportSql.class.php:195
-#, fuzzy
-#| msgid "Read misses"
-msgid "Read as multibytes"
-msgstr "Propuštena čitanja"
-
 #: libraries/plugins/import/ImportXml.class.php:54
 msgid "XML"
 msgstr "XML"
@@ -11602,7 +11614,7 @@ msgid "Show grid"
 msgstr "Prikaži mrežu"
 
 #: libraries/plugins/schema/SchemaPdf.class.php:94
-#: templates/structure/print_view_data_dictionary_link.phtml:6
+#: templates/database/structure/print_view_data_dictionary_link.phtml:6
 msgid "Data Dictionary"
 msgstr "Rječnik podataka"
 
@@ -11634,7 +11646,7 @@ msgid "The %s table doesn't exist!"
 msgstr "Tablica \"%s\" ne postoji!"
 
 #: libraries/plugins/schema/eps/Eps_Relation_Schema.class.php:321
-#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:309
+#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:323
 #, fuzzy, php-format
 #| msgid "Schema of the \"%s\" database - Page %s"
 msgid "Schema of the %s database - Page %s"
@@ -11664,7 +11676,7 @@ msgstr "Sadržaj tablice"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1005
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1028
 #: libraries/tracking.lib.php:884
-#: templates/structure/table_structure_header.phtml:11
+#: templates/table/structure/table_structure_header.phtml:11
 msgid "Extra"
 msgstr "Dodatno"
 
@@ -12090,51 +12102,51 @@ msgstr ""
 msgid "Create the needed tables with the <code>%screate_tables.sql</code>."
 msgstr ""
 
-#: libraries/relation.lib.php:360
+#: libraries/relation.lib.php:357
 msgid "Create a pma user and give access to these tables."
 msgstr ""
 
-#: libraries/relation.lib.php:365
+#: libraries/relation.lib.php:360
 msgid ""
 "Enable advanced features in configuration file (<code>config.inc.php</"
 "code>), for example by starting from <code>config.sample.inc.php</code>."
 msgstr ""
 
-#: libraries/relation.lib.php:373
+#: libraries/relation.lib.php:365
 msgid "Re-login to phpMyAdmin to load the updated configuration file."
 msgstr ""
 
-#: libraries/relation.lib.php:1612
+#: libraries/relation.lib.php:1607
 msgid "no description"
 msgstr "bez opisa"
 
-#: libraries/relation.lib.php:1811
+#: libraries/relation.lib.php:1806
 msgid ""
 "You do not have necessary privileges to create a database named "
 "'phpmyadmin'. You may go to 'Operations' tab of any database to set up the "
 "phpMyAdmin configuration storage there."
 msgstr ""
 
-#: libraries/relation.lib.php:1928
+#: libraries/relation.lib.php:1923
 #, php-format
 msgid ""
 "%sCreate%s a database named 'phpmyadmin' and setup the phpMyAdmin "
 "configuration storage there."
 msgstr ""
 
-#: libraries/relation.lib.php:1936
+#: libraries/relation.lib.php:1931
 #, php-format
 msgid ""
 "%sCreate%s the phpMyAdmin configuration storage in the current database."
 msgstr ""
 
-#: libraries/relation.lib.php:1944
+#: libraries/relation.lib.php:1939
 #, php-format
 msgid "%sCreate%s missing phpMyAdmin configuration storage tables."
 msgstr ""
 
 #: libraries/replication_gui.lib.php:46 libraries/replication_gui.lib.php:343
-#: libraries/server_databases.lib.php:387
+#: libraries/server_databases.lib.php:398
 msgid "Master replication"
 msgstr ""
 
@@ -12190,7 +12202,7 @@ msgid ""
 msgstr ""
 
 #: libraries/replication_gui.lib.php:141
-#: libraries/server_databases.lib.php:389
+#: libraries/server_databases.lib.php:400
 msgid "Slave replication"
 msgstr ""
 
@@ -12475,10 +12487,10 @@ msgid "Master server changed successfully to %s."
 msgstr "Privilegije su uspješno učitane."
 
 #: libraries/rte/rte_events.lib.php:106 libraries/rte/rte_events.lib.php:115
-#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:149
-#: libraries/rte/rte_routines.lib.php:158
-#: libraries/rte/rte_routines.lib.php:231
-#: libraries/rte/rte_routines.lib.php:1362
+#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:219
+#: libraries/rte/rte_routines.lib.php:246
+#: libraries/rte/rte_routines.lib.php:368
+#: libraries/rte/rte_routines.lib.php:1453
 #: libraries/rte/rte_triggers.lib.php:82 libraries/rte/rte_triggers.lib.php:91
 #: libraries/rte/rte_triggers.lib.php:123
 #, php-format
@@ -12501,7 +12513,7 @@ msgstr "Tablica %s je odbačen"
 msgid "Event %1$s has been created."
 msgstr "Tablica %1$s je izrađena."
 
-#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:251
+#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:266
 #: libraries/rte/rte_triggers.lib.php:144
 #, fuzzy
 #| msgid ""
@@ -12516,7 +12528,7 @@ msgstr ""
 msgid "Edit event"
 msgstr "Web poslužitelj"
 
-#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:794
+#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:885
 #: libraries/rte/rte_triggers.lib.php:323 view_create.php:180
 #, fuzzy
 #| msgid "Details…"
@@ -12533,7 +12545,7 @@ msgstr "Vrsta događaja"
 msgid "Event type"
 msgstr "Vrsta događaja"
 
-#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:817
+#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:908
 #, fuzzy, php-format
 #| msgid "Change"
 msgid "Change to %s"
@@ -12568,12 +12580,14 @@ msgstr "Završetak"
 msgid "On completion preserve"
 msgstr "Dovrši umetanja"
 
-#: libraries/rte/rte_events.lib.php:491 libraries/rte/rte_routines.lib.php:930
+#: libraries/rte/rte_events.lib.php:491
+#: libraries/rte/rte_routines.lib.php:1021
 #: libraries/rte/rte_triggers.lib.php:383 view_create.php:209
 msgid "Definer"
 msgstr ""
 
-#: libraries/rte/rte_events.lib.php:535 libraries/rte/rte_routines.lib.php:997
+#: libraries/rte/rte_events.lib.php:535
+#: libraries/rte/rte_routines.lib.php:1088
 #: libraries/rte/rte_triggers.lib.php:422
 msgid "The definer must be in the \"username@hostname\" format!"
 msgstr ""
@@ -12601,9 +12615,9 @@ msgid "You must provide an event definition."
 msgstr ""
 
 #: libraries/rte/rte_export.lib.php:43 libraries/rte/rte_general.lib.php:72
-#: libraries/rte/rte_routines.lib.php:345
-#: libraries/rte/rte_routines.lib.php:1198
-#: libraries/rte/rte_routines.lib.php:1411
+#: libraries/rte/rte_routines.lib.php:153
+#: libraries/rte/rte_routines.lib.php:1289
+#: libraries/rte/rte_routines.lib.php:1502
 #, fuzzy
 #| msgid "Processes"
 msgid "Error in processing request:"
@@ -12639,139 +12653,139 @@ msgid ""
 "problems."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:110
-#: libraries/rte/rte_routines.lib.php:1006
+#: libraries/rte/rte_routines.lib.php:123
+#, fuzzy
+msgid "Edit routine"
+msgstr "Web poslužitelj"
+
+#: libraries/rte/rte_routines.lib.php:200
+#: libraries/rte/rte_routines.lib.php:1097
 #, fuzzy, php-format
 #| msgid "Invalid server index: \"%s\""
 msgid "Invalid routine type: \"%s\""
 msgstr "Neispravan indeks poslužitelja: \"%s\""
 
-#: libraries/rte/rte_routines.lib.php:170
-msgid "Sorry, we failed to restore the dropped routine."
-msgstr ""
-
-#: libraries/rte/rte_routines.lib.php:211
-#, fuzzy, php-format
-#| msgid "Table %s has been dropped."
-msgid "Routine %1$s has been modified. Privileges have been adjusted."
-msgstr "Tablica %s je odbačen"
-
-#: libraries/rte/rte_routines.lib.php:216
-#, fuzzy, php-format
-#| msgid "Table %s has been dropped."
-msgid "Routine %1$s has been modified."
-msgstr "Tablica %s je odbačen"
-
-#: libraries/rte/rte_routines.lib.php:238
+#: libraries/rte/rte_routines.lib.php:253
 #, fuzzy, php-format
 #| msgid "Table %1$s has been created."
 msgid "Routine %1$s has been created."
 msgstr "Tablica %1$s je izrađena."
 
-#: libraries/rte/rte_routines.lib.php:315
-#, fuzzy
-msgid "Edit routine"
-msgstr "Web poslužitelj"
+#: libraries/rte/rte_routines.lib.php:380
+msgid "Sorry, we failed to restore the dropped routine."
+msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:797
+#: libraries/rte/rte_routines.lib.php:439
+#, fuzzy, php-format
+#| msgid "Table %s has been dropped."
+msgid "Routine %1$s has been modified. Privileges have been adjusted."
+msgstr "Tablica %s je odbačen"
+
+#: libraries/rte/rte_routines.lib.php:444
+#, fuzzy, php-format
+#| msgid "Table %s has been dropped."
+msgid "Routine %1$s has been modified."
+msgstr "Tablica %s je odbačen"
+
+#: libraries/rte/rte_routines.lib.php:888
 #, fuzzy
 #| msgid "Routines"
 msgid "Routine name"
 msgstr "Rutine"
 
-#: libraries/rte/rte_routines.lib.php:823
+#: libraries/rte/rte_routines.lib.php:914
 msgid "Parameters"
 msgstr "Parametri"
 
-#: libraries/rte/rte_routines.lib.php:829
+#: libraries/rte/rte_routines.lib.php:920
 #, fuzzy
 #| msgid "Direct links"
 msgid "Direction"
 msgstr "Izravne veze"
 
-#: libraries/rte/rte_routines.lib.php:847
+#: libraries/rte/rte_routines.lib.php:938
 msgid "Add parameter"
 msgstr "Dodaj parametar"
 
-#: libraries/rte/rte_routines.lib.php:851
+#: libraries/rte/rte_routines.lib.php:942
 #, fuzzy
 #| msgid "Rename database to"
 msgid "Remove last parameter"
 msgstr "Preimenuj bazu podataka u"
 
-#: libraries/rte/rte_routines.lib.php:856
+#: libraries/rte/rte_routines.lib.php:947
 msgid "Return type"
 msgstr "Vrsta povratka"
 
-#: libraries/rte/rte_routines.lib.php:862
+#: libraries/rte/rte_routines.lib.php:953
 #, fuzzy
 #| msgid "Length/Values"
 msgid "Return length/values"
 msgstr "Duljina/Vrijednosti"
 
-#: libraries/rte/rte_routines.lib.php:868
+#: libraries/rte/rte_routines.lib.php:959
 #, fuzzy
 #| msgid "Table options"
 msgid "Return options"
 msgstr "Opcije tablice"
 
-#: libraries/rte/rte_routines.lib.php:899
+#: libraries/rte/rte_routines.lib.php:990
 msgid "Is deterministic"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:920
+#: libraries/rte/rte_routines.lib.php:1011
 msgid ""
 "You do not have sufficient privileges to perform this operation; Please "
 "refer to the documentation for more details"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:935
+#: libraries/rte/rte_routines.lib.php:1026
 #, fuzzy
 #| msgid "Query type"
 msgid "Security type"
 msgstr "Vrsta upita"
 
-#: libraries/rte/rte_routines.lib.php:944
+#: libraries/rte/rte_routines.lib.php:1035
 msgid "SQL data access"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1013
+#: libraries/rte/rte_routines.lib.php:1104
 #, fuzzy
 #| msgid "Invalid table name"
 msgid "You must provide a routine name!"
 msgstr "Neispravan naziv tablice"
 
-#: libraries/rte/rte_routines.lib.php:1047
+#: libraries/rte/rte_routines.lib.php:1138
 #, php-format
 msgid "Invalid direction \"%s\" given for parameter."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1069
-#: libraries/rte/rte_routines.lib.php:1131
+#: libraries/rte/rte_routines.lib.php:1160
+#: libraries/rte/rte_routines.lib.php:1222
 msgid ""
 "You must provide length/values for routine parameters of type ENUM, SET, "
 "VARCHAR and VARBINARY."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1095
+#: libraries/rte/rte_routines.lib.php:1186
 msgid "You must provide a name and a type for each routine parameter."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1114
+#: libraries/rte/rte_routines.lib.php:1205
 msgid "You must provide a valid return type for the routine."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1174
+#: libraries/rte/rte_routines.lib.php:1265
 msgid "You must provide a routine definition."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1285
+#: libraries/rte/rte_routines.lib.php:1376
 #, fuzzy, php-format
 #| msgid "Allows executing stored routines."
 msgid "Execution results of routine %s"
 msgstr "Dopušta pokretanje pohranjenih rutina."
 
-#: libraries/rte/rte_routines.lib.php:1340
+#: libraries/rte/rte_routines.lib.php:1431
 #, php-format
 msgid "%d row affected by the last statement inside the procedure."
 msgid_plural "%d rows affected by the last statement inside the procedure."
@@ -12779,13 +12793,13 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: libraries/rte/rte_routines.lib.php:1398
-#: libraries/rte/rte_routines.lib.php:1406
+#: libraries/rte/rte_routines.lib.php:1489
+#: libraries/rte/rte_routines.lib.php:1497
 msgid "Execute routine"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1485
-#: libraries/rte/rte_routines.lib.php:1488
+#: libraries/rte/rte_routines.lib.php:1576
+#: libraries/rte/rte_routines.lib.php:1579
 #, fuzzy
 #| msgid "Routines"
 msgid "Routine parameters"
@@ -12981,7 +12995,7 @@ msgid "Original position"
 msgstr "Izvorni položaj"
 
 #: libraries/server_bin_log.lib.php:133
-#: templates/structure/display_table_stats.phtml:4
+#: templates/table/structure/display_table_stats.phtml:4
 msgid "Information"
 msgstr "Podaci"
 
@@ -13019,12 +13033,12 @@ msgstr ""
 "Napomena: Omogućavanja statistika baze podataka može prouzrokovati izuzetno "
 "velik promet između web poslužitelja i MySQL poslužitelja."
 
-#: libraries/server_databases.lib.php:364
-#: libraries/server_databases.lib.php:365
+#: libraries/server_databases.lib.php:366
+#: libraries/server_databases.lib.php:371
 msgid "Enable Statistics"
 msgstr "Omogući statistike"
 
-#: libraries/server_databases.lib.php:481
+#: libraries/server_databases.lib.php:492
 #, php-format
 msgid "%1$d database has been dropped successfully."
 msgid_plural "%1$d databases have been dropped successfully."
@@ -13417,7 +13431,7 @@ msgid "You have revoked the privileges for %s."
 msgstr "Opozvali ste privilegije za %s."
 
 #: libraries/server_privileges.lib.php:2059
-#: libraries/server_privileges.lib.php:4290
+#: libraries/server_privileges.lib.php:4316
 #, fuzzy
 #| msgid "Add user"
 msgid "Add user account"
@@ -13604,62 +13618,62 @@ msgstr "Brisanje %s"
 msgid "The privileges were reloaded successfully."
 msgstr "Privilegije su uspješno učitane."
 
-#: libraries/server_privileges.lib.php:3994
+#: libraries/server_privileges.lib.php:4003
 #, php-format
 msgid "The user %s already exists!"
 msgstr "Korisnik %s već postoji!"
 
-#: libraries/server_privileges.lib.php:4232
+#: libraries/server_privileges.lib.php:4258
 #, fuzzy, php-format
 #| msgid "Privileges"
 msgid "Privileges for %s"
 msgstr "Privilegije"
 
-#: libraries/server_privileges.lib.php:4241
+#: libraries/server_privileges.lib.php:4267
 #: libraries/server_status_processes.lib.php:72
 #: libraries/server_user_groups.lib.php:39
 msgid "User"
 msgstr "Korisnik"
 
-#: libraries/server_privileges.lib.php:4282
+#: libraries/server_privileges.lib.php:4308
 #, fuzzy
 #| msgid "New"
 msgctxt "Create new user"
 msgid "New"
 msgstr "Novo"
 
-#: libraries/server_privileges.lib.php:4311
+#: libraries/server_privileges.lib.php:4337
 #, fuzzy
 #| msgid "Edit Privileges"
 msgid "Edit privileges:"
 msgstr "Uredi privilegije"
 
-#: libraries/server_privileges.lib.php:4312
+#: libraries/server_privileges.lib.php:4338
 #, fuzzy
 #| msgid "User"
 msgid "User account"
 msgstr "Korisnik"
 
-#: libraries/server_privileges.lib.php:4371
+#: libraries/server_privileges.lib.php:4397
 msgid ""
 "Note: You are attempting to edit privileges of the user with which you are "
 "currently logged in."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4391 libraries/server_users.lib.php:25
+#: libraries/server_privileges.lib.php:4417 libraries/server_users.lib.php:25
 #, fuzzy
 #| msgid "User overview"
 msgid "User accounts overview"
 msgstr "Pregled korisnika"
 
-#: libraries/server_privileges.lib.php:4459
+#: libraries/server_privileges.lib.php:4485
 msgid ""
 "A user account allowing any user from localhost to connect is present. This "
 "will prevent other users from connecting if the host part of their account "
 "allows a connection from any (%) host."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4500
+#: libraries/server_privileges.lib.php:4526
 #, php-format
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
@@ -13672,7 +13686,7 @@ msgstr ""
 "može se razlikovati od privilegija koje upotrebljava poslužitelj. U tom je "
 "slučaju potrebno %sponovo učitati privilegije%s prije nastavljanja rada."
 
-#: libraries/server_privileges.lib.php:4519
+#: libraries/server_privileges.lib.php:4545
 #, fuzzy
 #| msgid ""
 #| "Note: phpMyAdmin gets the users' privileges directly from MySQL's "
@@ -13691,45 +13705,45 @@ msgstr ""
 "može se razlikovati od privilegija koje upotrebljava poslužitelj. U tom je "
 "slučaju potrebno %sponovo učitati privilegije%s prije nastavljanja rada."
 
-#: libraries/server_privileges.lib.php:4569
+#: libraries/server_privileges.lib.php:4595
 msgid "The selected user was not found in the privilege table."
 msgstr "Odabrani korisnik nije pronađen u tablici privilegija."
 
-#: libraries/server_privileges.lib.php:4801
+#: libraries/server_privileges.lib.php:4827
 msgid "You have added a new user."
 msgstr "Dodali ste novog korisnika."
 
-#: libraries/server_status.lib.php:53
+#: libraries/server_status.lib.php:60
 #, php-format
 msgid "Network traffic since startup: %s"
 msgstr ""
 
-#: libraries/server_status.lib.php:66
+#: libraries/server_status.lib.php:73
 #, fuzzy, php-format
 #| msgid "This MySQL server has been running for %s. It started up on %s."
 msgid "This MySQL server has been running for %1$s. It started up on %2$s."
 msgstr "Ovaj MySQL poslužitelj radi tijekom %s. Pokrenut je %s."
 
-#: libraries/server_status.lib.php:80
+#: libraries/server_status.lib.php:94
 msgid ""
 "This MySQL server works as <b>master</b> and <b>slave</b> in <b>replication</"
 "b> process."
 msgstr ""
 
-#: libraries/server_status.lib.php:85
+#: libraries/server_status.lib.php:99
 msgid "This MySQL server works as <b>master</b> in <b>replication</b> process."
 msgstr ""
 
-#: libraries/server_status.lib.php:90
+#: libraries/server_status.lib.php:104
 msgid "This MySQL server works as <b>slave</b> in <b>replication</b> process."
 msgstr ""
 
-#: libraries/server_status.lib.php:106
+#: libraries/server_status.lib.php:116
 #, fuzzy
 msgid "Replication status"
 msgstr "Replikacija"
 
-#: libraries/server_status.lib.php:137
+#: libraries/server_status.lib.php:146
 msgid ""
 "On a busy server, the byte counters may overrun, so those statistics as "
 "reported by the MySQL server may be incorrect."
@@ -13738,21 +13752,21 @@ msgstr ""
 "prikaza, pri čemu bi statistike koje prikazuje MySQL poslužitelj mogle biti "
 "netočne."
 
-#: libraries/server_status.lib.php:148
+#: libraries/server_status.lib.php:157
 msgid "Received"
 msgstr "Primljeno"
 
-#: libraries/server_status.lib.php:167
+#: libraries/server_status.lib.php:176
 msgid "Sent"
 msgstr "Poslano"
 
-#: libraries/server_status.lib.php:234
+#: libraries/server_status.lib.php:243
 #, fuzzy
 #| msgid "max. concurrent connections"
 msgid "Max. concurrent connections"
 msgstr "najv. uzastopnih veza"
 
-#: libraries/server_status.lib.php:244
+#: libraries/server_status.lib.php:253
 msgid "Failed attempts"
 msgstr "Neuspjeli pokušaji"
 
@@ -14865,7 +14879,7 @@ msgstr ""
 msgid "Not implemented yet."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/AlterOperation.php:193
+#: libraries/sql-parser/src/Components/AlterOperation.php:191
 msgid "Unrecognized alter operation."
 msgstr ""
 
@@ -14879,7 +14893,7 @@ msgid "An opening bracket followed by a set of values was expected."
 msgstr ""
 
 #: libraries/sql-parser/src/Components/ArrayObj.php:101
-#: libraries/sql-parser/src/Components/FieldDefinition.php:202
+#: libraries/sql-parser/src/Components/CreateDefinition.php:202
 msgid "An opening bracket was expected."
 msgstr ""
 
@@ -14887,25 +14901,35 @@ msgstr ""
 msgid "A comma or a closing bracket was expected"
 msgstr ""
 
+#: libraries/sql-parser/src/Components/CreateDefinition.php:246
+#, fuzzy
+#| msgid "No databases selected."
+msgid "A comma or a closing bracket was expected."
+msgstr "Nema odabrane baze podataka."
+
+#: libraries/sql-parser/src/Components/CreateDefinition.php:262
+msgid "A closing bracket was expected."
+msgstr ""
+
 #: libraries/sql-parser/src/Components/DataType.php:125
 msgid "Unrecognized data type."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:225
+#: libraries/sql-parser/src/Components/Expression.php:227
 msgid "Unexpected closing bracket."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:246
-#: libraries/sql-parser/src/Components/Expression.php:283
-#: libraries/sql-parser/src/Components/Expression.php:303
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:285
+#: libraries/sql-parser/src/Components/Expression.php:305
 msgid "An alias was previously found."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:257
+#: libraries/sql-parser/src/Components/Expression.php:259
 msgid "Unexpected dot."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:327
+#: libraries/sql-parser/src/Components/Expression.php:329
 #, fuzzy
 #| msgid "No databases selected."
 msgid "An alias was expected."
@@ -14917,16 +14941,6 @@ msgstr "Nema odabrane baze podataka."
 msgid "An expression was expected."
 msgstr "Nema odabranih redova"
 
-#: libraries/sql-parser/src/Components/FieldDefinition.php:246
-#, fuzzy
-#| msgid "No databases selected."
-msgid "A comma or a closing bracket was expected."
-msgstr "Nema odabrane baze podataka."
-
-#: libraries/sql-parser/src/Components/FieldDefinition.php:262
-msgid "A closing bracket was expected."
-msgstr ""
-
 #: libraries/sql-parser/src/Components/Limit.php:90
 #: libraries/sql-parser/src/Components/Limit.php:112
 msgid "An offset was expected."
@@ -14972,28 +14986,28 @@ msgstr ""
 msgid "Expected delimiter."
 msgstr ""
 
-#: libraries/sql-parser/src/Lexer.php:753
+#: libraries/sql-parser/src/Lexer.php:777
 #, fuzzy, php-format
 #| msgid "Table %1$s has been created."
 msgid "Ending quote %1$s was expected."
 msgstr "Tablica %1$s je izrađena."
 
-#: libraries/sql-parser/src/Lexer.php:789
+#: libraries/sql-parser/src/Lexer.php:813
 #, fuzzy
 msgid "Variable name was expected."
 msgstr "Predložak naziva datoteka"
 
-#: libraries/sql-parser/src/Parser.php:380
+#: libraries/sql-parser/src/Parser.php:391
 #, fuzzy
 #| msgid "At Beginning of Table"
 msgid "Unexpected beginning of statement."
 msgstr "Pri početku tablice"
 
-#: libraries/sql-parser/src/Parser.php:399
+#: libraries/sql-parser/src/Parser.php:410
 msgid "Unrecognized statement type."
 msgstr ""
 
-#: libraries/sql-parser/src/Parser.php:479
+#: libraries/sql-parser/src/Parser.php:489
 msgid "No transaction was previously started."
 msgstr ""
 
@@ -15021,8 +15035,10 @@ msgid "The name of the entity was expected."
 msgstr "Broj otvorenih tablica."
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:310
-msgid "At least one field definition was expected."
-msgstr ""
+#, fuzzy
+#| msgid "The row has been deleted."
+msgid "At least one column definition was expected."
+msgstr "Redak je izbrisan"
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:329
 msgid "A \"RETURNS\" keyword was expected."
@@ -15098,25 +15114,25 @@ msgstr "Izrađen je favorit %s"
 msgid "Using bookmark \"%s\" as default browse query."
 msgstr ""
 
-#: libraries/sql.lib.php:1306
+#: libraries/sql.lib.php:1300
 msgid "Showing as PHP code"
 msgstr "Prikazivanje kao PHP koda"
 
-#: libraries/sql.lib.php:1638
+#: libraries/sql.lib.php:1632
 #, php-format
 msgid ""
 "Current selection does not contain a unique column. Grid edit, checkbox, "
 "Edit, Copy and Delete features are not available. %s"
 msgstr ""
 
-#: libraries/sql.lib.php:1649
+#: libraries/sql.lib.php:1643
 #, php-format
 msgid ""
 "Current selection does not contain a unique column. Grid edit, Edit, Copy "
 "and Delete features may result in undesired behavior. %s"
 msgstr ""
 
-#: libraries/sql.lib.php:1688
+#: libraries/sql.lib.php:1682
 #, php-format
 msgid "Problems with indexes of table `%s`"
 msgstr "Problemi s indeksima tablice `%s`"
@@ -15287,7 +15303,7 @@ msgid "Version %s snapshot (SQL code)"
 msgstr ""
 
 #: libraries/tracking.lib.php:947
-#: templates/structure/table_structure_row.phtml:33
+#: templates/table/structure/table_structure_row.phtml:33
 #, fuzzy
 #| msgid "None"
 msgctxt "None for default"
@@ -15341,19 +15357,19 @@ msgstr "Izradi relaciju"
 msgid "Version %1$s was created, tracking for %2$s is active."
 msgstr ""
 
-#: libraries/user_preferences.inc.php:29
+#: libraries/user_preferences.inc.php:30
 #, fuzzy
 #| msgid "General relation features"
 msgid "Manage your settings"
 msgstr "Opće osobine relacija"
 
-#: libraries/user_preferences.inc.php:46 prefs_manage.php:307
+#: libraries/user_preferences.inc.php:54 prefs_manage.php:307
 #, fuzzy
 #| msgid "Modifications have been saved"
 msgid "Configuration has been saved."
 msgstr "Izmjene su spremljene"
 
-#: libraries/user_preferences.inc.php:66
+#: libraries/user_preferences.inc.php:74
 #, php-format
 msgid ""
 "Your preferences will be saved for current session only. Storing them "
@@ -15765,7 +15781,7 @@ msgid "first"
 msgstr ""
 
 #: templates/columns_definitions/move_column.phtml:12
-#: templates/structure/add_column.phtml:21
+#: templates/table/structure/add_column.phtml:21
 #, fuzzy, php-format
 #| msgid "After %s"
 msgid "after %s"
@@ -15853,240 +15869,348 @@ msgstr "Pretvaranje preglednika"
 msgid "Input transformation options"
 msgstr "Opcije preoblikovanja"
 
-#: templates/designer/aggregate_query_panel.phtml:22
-#: templates/designer/options_panel.phtml:100
+#: templates/database/create_table.phtml:7
+#: templates/database/designer/side_menu.phtml:77
+#: templates/database/designer/side_menu.phtml:80
+msgid "Create table"
+msgstr "Izradi tablicu"
+
+#: templates/database/create_table.phtml:15
+#, fuzzy
+#| msgid "Number of fields"
+msgid "Number of columns"
+msgstr "Broj polja"
+
+#: templates/database/designer/aggregate_query_panel.phtml:22
+#: templates/database/designer/options_panel.phtml:100
 #, fuzzy
 #| msgid "Create"
 msgid "Aggregate"
 msgstr "Izradi"
 
-#: templates/designer/aggregate_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:61
-#: templates/designer/options_panel.phtml:106
-#: templates/designer/options_panel.phtml:170
-#: templates/designer/where_query_panel.phtml:30
-#: templates/table/table_header.phtml:9
+#: templates/database/designer/aggregate_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:61
+#: templates/database/designer/options_panel.phtml:106
+#: templates/database/designer/options_panel.phtml:170
+#: templates/database/designer/where_query_panel.phtml:30
+#: templates/table/search/table_header.phtml:9
 msgid "Operator"
 msgstr "Operator"
 
-#: templates/designer/database_tables.phtml:29
+#: templates/database/designer/database_tables.phtml:29
 msgid "Toggle"
 msgstr ""
 
-#: templates/designer/database_tables.phtml:40
+#: templates/database/designer/database_tables.phtml:40
 #, fuzzy
 #| msgid "Database for user"
 msgid "See table structure"
 msgstr "Baza podataka za korisnika"
 
-#: templates/designer/delete_relation_panel.phtml:21
+#: templates/database/designer/delete_relation_panel.phtml:21
 msgid "Delete relation"
 msgstr "Izbriši relaciju"
 
-#: templates/designer/edit_delete_pages.phtml:7
+#: templates/database/designer/edit_delete_pages.phtml:7
 #, fuzzy
 #| msgid "Page number:"
 msgid "Page to open"
 msgstr "Broj stranice:"
 
-#: templates/designer/edit_delete_pages.phtml:7
+#: templates/database/designer/edit_delete_pages.phtml:7
 #, fuzzy
 #| msgid "Relation deleted"
 msgid "Page to delete"
 msgstr "Relacija je izbrisana"
 
-#: templates/designer/having_query_panel.phtml:90
-#: templates/designer/options_panel.phtml:63
-#: templates/designer/options_panel.phtml:229
-#: templates/designer/where_query_panel.phtml:59
+#: templates/database/designer/having_query_panel.phtml:90
+#: templates/database/designer/options_panel.phtml:63
+#: templates/database/designer/options_panel.phtml:229
+#: templates/database/designer/where_query_panel.phtml:59
 #, fuzzy
 #| msgid "Export"
 msgid "Except"
 msgstr "Izvoz"
 
-#: templates/designer/having_query_panel.phtml:102
-#: templates/designer/options_panel.phtml:75
-#: templates/designer/options_panel.phtml:241
-#: templates/designer/where_query_panel.phtml:71
+#: templates/database/designer/having_query_panel.phtml:102
+#: templates/database/designer/options_panel.phtml:75
+#: templates/database/designer/options_panel.phtml:241
+#: templates/database/designer/where_query_panel.phtml:71
 #, fuzzy
 #| msgid "in query"
 msgid "subquery"
 msgstr "unutar upita"
 
-#: templates/designer/new_relation_panel.phtml:22
-#: templates/designer/side_menu.phtml:84 templates/designer/side_menu.phtml:87
+#: templates/database/designer/new_relation_panel.phtml:22
+#: templates/database/designer/side_menu.phtml:84
+#: templates/database/designer/side_menu.phtml:87
 msgid "Create relation"
 msgstr "Izradi relaciju"
 
-#: templates/designer/options_panel.phtml:34
-#: templates/designer/options_panel.phtml:200
+#: templates/database/designer/options_panel.phtml:34
+#: templates/database/designer/options_panel.phtml:200
 #, fuzzy
 #| msgid "Relation deleted"
 msgid "Relation operator"
 msgstr "Relacija je izbrisana"
 
-#: templates/designer/options_panel.phtml:85
-#: templates/designer/rename_to_panel.phtml:23
+#: templates/database/designer/options_panel.phtml:85
+#: templates/database/designer/rename_to_panel.phtml:23
 #, fuzzy
 msgid "Rename to"
 msgstr "Preimenuj tablicu u"
 
-#: templates/designer/options_panel.phtml:91
-#: templates/designer/rename_to_panel.phtml:31
+#: templates/database/designer/options_panel.phtml:91
+#: templates/database/designer/rename_to_panel.phtml:31
 #, fuzzy
 #| msgid "User name"
 msgid "New name"
 msgstr "Korisničko ime"
 
-#: templates/designer/page_save_as.phtml:4
+#: templates/database/designer/page_save_as.phtml:4
 #, fuzzy
 #| msgid "Export/Import to scale"
 msgid "Save to selected page"
 msgstr "Uvoz / Izvor prema omjeru"
 
-#: templates/designer/page_save_as.phtml:5
+#: templates/database/designer/page_save_as.phtml:5
 #, fuzzy
 #| msgid "Create a new index"
 msgid "Create a page and save to it"
 msgstr "Izradi novi indeks"
 
-#: templates/designer/page_save_as.phtml:26
+#: templates/database/designer/page_save_as.phtml:26
 #, fuzzy
 #| msgid "User name"
 msgid "New page name"
 msgstr "Korisničko ime"
 
-#: templates/designer/page_selector.phtml:2
+#: templates/database/designer/page_selector.phtml:2
 #, fuzzy
 #| msgid "Select Tables"
 msgid "Select page"
 msgstr "Odaberite tablice"
 
-#: templates/designer/query_details.phtml:10
+#: templates/database/designer/query_details.phtml:10
 #, fuzzy
 #| msgid "Table options"
 msgid "Active options"
 msgstr "Opcije tablice"
 
-#: templates/designer/schema_export.phtml:4
+#: templates/database/designer/schema_export.phtml:4
 msgid "Select Export Relational Type"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:19 templates/designer/side_menu.phtml:25
+#: templates/database/designer/side_menu.phtml:19
+#: templates/database/designer/side_menu.phtml:25
 #, fuzzy
 #| msgid "Show tables"
 msgid "Show/Hide tables list"
 msgstr "Prikaži tablice"
 
-#: templates/designer/side_menu.phtml:29 templates/designer/side_menu.phtml:35
-#: templates/designer/side_menu.phtml:36
+#: templates/database/designer/side_menu.phtml:29
+#: templates/database/designer/side_menu.phtml:35
+#: templates/database/designer/side_menu.phtml:36
 msgid "View in fullscreen"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:34
+#: templates/database/designer/side_menu.phtml:34
 msgid "Exit fullscreen"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:41 templates/designer/side_menu.phtml:45
+#: templates/database/designer/side_menu.phtml:41
+#: templates/database/designer/side_menu.phtml:45
 #, fuzzy
 #| msgid "User name"
 msgid "New page"
 msgstr "Korisničko ime"
 
-#: templates/designer/side_menu.phtml:70 templates/designer/side_menu.phtml:73
+#: templates/database/designer/side_menu.phtml:70
+#: templates/database/designer/side_menu.phtml:73
 #, fuzzy
 #| msgid "Select Tables"
 msgid "Delete pages"
 msgstr "Odaberite tablice"
 
-#: templates/designer/side_menu.phtml:77 templates/designer/side_menu.phtml:80
-#: templates/table/create_table.phtml:7
-msgid "Create table"
-msgstr "Izradi tablicu"
-
-#: templates/designer/side_menu.phtml:98
-#: templates/designer/side_menu.phtml:101
+#: templates/database/designer/side_menu.phtml:98
+#: templates/database/designer/side_menu.phtml:101
 msgid "Reload"
 msgstr "Osvježi"
 
-#: templates/designer/side_menu.phtml:107
-#: templates/designer/side_menu.phtml:110
+#: templates/database/designer/side_menu.phtml:107
+#: templates/database/designer/side_menu.phtml:110
 msgid "Help"
 msgstr "Pomoć"
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Angular links"
 msgstr "Kutne veze"
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Direct links"
 msgstr "Izravne veze"
 
-#: templates/designer/side_menu.phtml:122
-#: templates/designer/side_menu.phtml:124
+#: templates/database/designer/side_menu.phtml:122
+#: templates/database/designer/side_menu.phtml:124
 msgid "Snap to grid"
 msgstr "Poravnaj s mrežom"
 
-#: templates/designer/side_menu.phtml:128
-#: templates/designer/side_menu.phtml:134
+#: templates/database/designer/side_menu.phtml:128
+#: templates/database/designer/side_menu.phtml:134
 msgid "Small/Big All"
 msgstr "Malo / Sve veliko"
 
-#: templates/designer/side_menu.phtml:138
-#: templates/designer/side_menu.phtml:141
+#: templates/database/designer/side_menu.phtml:138
+#: templates/database/designer/side_menu.phtml:141
 msgid "Toggle small/big"
 msgstr "Malo / Veliko"
 
-#: templates/designer/side_menu.phtml:145
-#: templates/designer/side_menu.phtml:148
+#: templates/database/designer/side_menu.phtml:145
+#: templates/database/designer/side_menu.phtml:148
 #, fuzzy
 #| msgid "To select relation, click :"
 msgid "Toggle relation lines"
 msgstr "Za odabir relacije pritisnite:"
 
-#: templates/designer/side_menu.phtml:153
-#: templates/designer/side_menu.phtml:156
+#: templates/database/designer/side_menu.phtml:153
+#: templates/database/designer/side_menu.phtml:156
 #, fuzzy
 #| msgid "Export"
 msgid "Export schema"
 msgstr "Izvoz"
 
-#: templates/designer/side_menu.phtml:165
-#: templates/designer/side_menu.phtml:168
+#: templates/database/designer/side_menu.phtml:165
+#: templates/database/designer/side_menu.phtml:168
 #, fuzzy
 #| msgid "Submit Query"
 msgid "Build Query"
 msgstr "Podnesi upit"
 
-#: templates/designer/side_menu.phtml:173
-#: templates/designer/side_menu.phtml:177
+#: templates/database/designer/side_menu.phtml:173
+#: templates/database/designer/side_menu.phtml:177
 msgid "Move Menu"
 msgstr "Premjesti izbornik"
 
-#: templates/designer/side_menu.phtml:181
-#: templates/designer/side_menu.phtml:186
+#: templates/database/designer/side_menu.phtml:181
+#: templates/database/designer/side_menu.phtml:186
 #, fuzzy
 #| msgid "Partial Texts"
 msgid "Pin text"
 msgstr "Djelomični tekstovi"
 
-#: templates/designer/table_list.phtml:4
+#: templates/database/designer/table_list.phtml:4
 msgid "Hide/Show all"
 msgstr "Prikaži / Sakrij sve"
 
-#: templates/designer/table_list.phtml:14
+#: templates/database/designer/table_list.phtml:14
 msgid "Hide/Show Tables with no relation"
 msgstr "Prikaži / Sakrij tablice bez relacija"
 
-#: templates/designer/table_list.phtml:59
+#: templates/database/designer/table_list.phtml:59
 #, fuzzy
 #| msgid "Number of tables"
 msgid "Number of tables:"
 msgstr "Broj tablica"
 
+#: templates/database/structure/body_for_table_summary.phtml:6
+#, php-format
+msgid "%s table"
+msgid_plural "%s tables"
+msgstr[0] "%s tablicu"
+msgstr[1] "%s tablica"
+msgstr[2] "%s tablice"
+
+#: templates/database/structure/body_for_table_summary.phtml:17
+msgid "Sum"
+msgstr "Zbroj"
+
+#: templates/database/structure/check_all_tables.phtml:6
+msgid "Check tables having overhead"
+msgstr "Provjeri za prepunjene tablice"
+
+#: templates/database/structure/check_all_tables.phtml:10
+#, fuzzy
+#| msgid "Show color"
+msgid "Show create"
+msgstr "Prikaži boju"
+
+#: templates/database/structure/check_all_tables.phtml:27
+#, fuzzy
+#| msgid "Add prefix"
+msgid "Prefix"
+msgstr "Dodaj prefiks"
+
+#: templates/database/structure/check_all_tables.phtml:28
+msgid "Add prefix to table"
+msgstr "Dodaj prefiks tablici"
+
+#: templates/database/structure/check_all_tables.phtml:29
+msgid "Replace table prefix"
+msgstr "Zamijeni prefiks tablice"
+
+#: templates/database/structure/check_all_tables.phtml:30
+msgid "Copy table with prefix"
+msgstr "Kopiraj tablicu sa prefiksom"
+
+#: templates/database/structure/check_all_tables.phtml:36
+#, fuzzy
+#| msgid "Add %s field(s)"
+msgid "Add columns to central list"
+msgstr "Dodaj %s polja"
+
+#: templates/database/structure/check_all_tables.phtml:37
+msgid "Remove columns from central list"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:38
+#, fuzzy
+#| msgid "Add %s field(s)"
+msgid "Make consistent with central list"
+msgstr "Dodaj %s polja"
+
+#: templates/database/structure/favorite_anchor.phtml:12
+#, fuzzy
+msgid "Add to Favorites"
+msgstr "Dodaj novog korisnika"
+
+#: templates/database/structure/show_create.phtml:2
+#, fuzzy
+msgid "Showing create queries"
+msgstr "Prikaži pune upite"
+
+#: templates/database/structure/sortable_header.phtml:13
+msgid "Sort"
+msgstr "Presloži"
+
+#: templates/database/structure/table_header.phtml:42
+#, fuzzy
+#| msgid "May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]"
+msgid ""
+"May be approximate. Click on the number to get the exact count. See "
+"[doc@faq3-11]FAQ 3.11[/doc]."
+msgstr "Može biti približno. Pogledajte [doc@faq3-11]ČPP 3.11[/doc]"
+
+#: templates/database/structure/table_header.phtml:66
+#: templates/table/index_form.phtml:127
+msgid "Size"
+msgstr "Veličina"
+
+#: templates/database/structure/table_header.phtml:74
+#: templates/table/structure/display_table_stats.phtml:27
+msgid "Overhead"
+msgstr "Prepunjenje"
+
+#: templates/database/structure/tracking_icon.phtml:4
+msgid "Tracking is active."
+msgstr "Praćenje je aktivno."
+
+#: templates/database/structure/tracking_icon.phtml:8
+msgid "Tracking is not active."
+msgstr "Praćenje nije aktivno."
+
 #: templates/error/report_form.phtml:7
 msgid ""
 "phpMyAdmin has encountered an error. We have collected data about this error "
@@ -16102,70 +16226,6 @@ msgstr ""
 msgid "Please explain the steps that lead to the error:"
 msgstr ""
 
-#: templates/gis_visualization/gis_visualization.phtml:3
-msgid "Display GIS Visualization"
-msgstr ""
-
-#: templates/gis_visualization/gis_visualization.phtml:8
-#, fuzzy
-#| msgid "Add/Delete Field Columns"
-msgid "Label column"
-msgstr "Dodaj/Izbriši stupce polja"
-
-#: templates/gis_visualization/gis_visualization.phtml:11
-msgid "-- None --"
-msgstr ""
-
-#: templates/gis_visualization/gis_visualization.phtml:19
-#, fuzzy
-#| msgid "Log file count"
-msgid "Spatial column"
-msgstr "Najveći broj datoteka zapisnika"
-
-#: templates/index_form.phtml:16
-msgid "Index name:"
-msgstr "Naziv indeksa:"
-
-#: templates/index_form.phtml:19
-msgid ""
-"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
-msgstr ""
-"\"PRIMARY\" <b>mora biti</b> naziv i <b>samo naziv</b> primarnog ključa!"
-
-#: templates/index_form.phtml:40
-#, fuzzy
-#| msgid "Index cache size"
-msgid "Index choice:"
-msgstr "Veličina pohrane indeksa"
-
-#: templates/index_form.phtml:57
-msgid "Key block size:"
-msgstr ""
-
-#: templates/index_form.phtml:74
-msgid "Index type:"
-msgstr "Vrsta indeksa:"
-
-#: templates/index_form.phtml:86
-#, fuzzy
-#| msgid "User"
-msgid "Parser:"
-msgstr "Korisnik"
-
-#: templates/index_form.phtml:102
-#, fuzzy
-#| msgid "Comment"
-msgid "Comment:"
-msgstr "Komentar"
-
-#: templates/index_form.phtml:127 templates/structure/table_header.phtml:66
-msgid "Size"
-msgstr "Veličina"
-
-#: templates/index_form.phtml:149 templates/index_form.phtml:190
-msgid "Drag to reorder"
-msgstr ""
-
 #: templates/prefs_autoload.phtml:9
 msgid ""
 "Your browser has phpMyAdmin configuration for this domain. Would you like to "
@@ -16178,494 +16238,457 @@ msgstr ""
 msgid "Start row:"
 msgstr "Sub"
 
-#: templates/structure/actions_in_table_structure.phtml:14
-#, php-format
-msgid "A primary key has been added on %s."
-msgstr "Primarni ključ je dodan na %s."
-
-#: templates/structure/actions_in_table_structure.phtml:34
-#: templates/structure/actions_in_table_structure.phtml:54
-#: templates/structure/actions_in_table_structure.phtml:79
-#: templates/structure/actions_in_table_structure.phtml:101
-#, php-format
-msgid "An index has been added on %s."
-msgstr "Indeks je pridodan na %s."
-
-#: templates/structure/actions_in_table_structure.phtml:130
-#: templates/structure/check_all_table_column.phtml:59
-#, fuzzy
-#| msgid "Remove column(s)"
-msgid "Remove from central columns"
-msgstr "Ukloni stupac / stupce"
-
-#: templates/structure/actions_in_table_structure.phtml:138
-#: templates/structure/check_all_table_column.phtml:55
-#, fuzzy
-#| msgid "Add %s field(s)"
-msgid "Add to central columns"
-msgstr "Dodaj %s polja"
-
-#: templates/structure/add_column.phtml:7
-#, fuzzy, php-format
-#| msgid "Add %s field(s)"
-msgid "Add %s column(s)"
-msgstr "Dodaj %s polja"
-
-#: templates/structure/add_column.phtml:12
-#, fuzzy
-#| msgid "At Beginning of Table"
-msgid "at beginning of table"
-msgstr "Pri početku tablice"
-
-#: templates/structure/body_for_table_summary.phtml:6
-#, php-format
-msgid "%s table"
-msgid_plural "%s tables"
-msgstr[0] "%s tablicu"
-msgstr[1] "%s tablica"
-msgstr[2] "%s tablice"
-
-#: templates/structure/body_for_table_summary.phtml:17
-msgid "Sum"
-msgstr "Zbroj"
-
-#: templates/structure/check_all_tables.phtml:6
-msgid "Check tables having overhead"
-msgstr "Provjeri za prepunjene tablice"
-
-#: templates/structure/check_all_tables.phtml:10
-#, fuzzy
-#| msgid "Show color"
-msgid "Show create"
-msgstr "Prikaži boju"
-
-#: templates/structure/check_all_tables.phtml:27
-#, fuzzy
-#| msgid "Add prefix"
-msgid "Prefix"
-msgstr "Dodaj prefiks"
-
-#: templates/structure/check_all_tables.phtml:28
-msgid "Add prefix to table"
-msgstr "Dodaj prefiks tablici"
-
-#: templates/structure/check_all_tables.phtml:29
-msgid "Replace table prefix"
-msgstr "Zamijeni prefiks tablice"
-
-#: templates/structure/check_all_tables.phtml:30
-msgid "Copy table with prefix"
-msgstr "Kopiraj tablicu sa prefiksom"
-
-#: templates/structure/check_all_tables.phtml:36
-#, fuzzy
-#| msgid "Add %s field(s)"
-msgid "Add columns to central list"
-msgstr "Dodaj %s polja"
-
-#: templates/structure/check_all_tables.phtml:37
-msgid "Remove columns from central list"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:38
-#, fuzzy
-#| msgid "Add %s field(s)"
-msgid "Make consistent with central list"
-msgstr "Dodaj %s polja"
-
-#: templates/structure/display_structure.phtml:140 view_create.php:181
-#, fuzzy
-#| msgid "Print view"
-msgid "Edit view"
-msgstr "Prikaz ispisa"
-
-#: templates/structure/display_table_stats.phtml:9
-msgid "Space usage"
-msgstr "Iskorištenost prostora"
-
-#: templates/structure/display_table_stats.phtml:27
-#: templates/structure/table_header.phtml:74
-msgid "Overhead"
-msgstr "Prepunjenje"
-
-#: templates/structure/display_table_stats.phtml:32
-msgid "Effective"
-msgstr "Na snazi"
-
-#: templates/structure/favorite_anchor.phtml:12
-#, fuzzy
-msgid "Add to Favorites"
-msgstr "Dodaj novog korisnika"
-
-#: templates/structure/move_columns_dialog.phtml:1
-#: templates/structure/optional_action_links.phtml:21
-#, fuzzy
-#| msgid "Remove column(s)"
-msgid "Move columns"
-msgstr "Ukloni stupac / stupce"
-
-#: templates/structure/move_columns_dialog.phtml:2
-msgid "Move the columns by dragging them up and down."
-msgstr ""
-
-#: templates/structure/optional_action_links.phtml:9
-msgid "Propose table structure"
-msgstr "Predloži strukturu tablice"
-
-#: templates/structure/optional_action_links.phtml:24
-#, fuzzy
-#| msgid "Propose table structure"
-msgid "Improve table structure"
-msgstr "Predloži strukturu tablice"
-
-#: templates/structure/optional_action_links.phtml:30
-#, fuzzy
-#| msgid "Track table"
-msgid "Track view"
-msgstr "Prati tablicu"
-
-#: templates/structure/row_stats_table.phtml:3
-#, fuzzy
-#| msgid "Row Statistics"
-msgid "Row statistics"
-msgstr "Statistike redova"
-
-#: templates/structure/row_stats_table.phtml:9
-msgid "static"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:11
-msgid "dynamic"
-msgstr "dinamički"
-
-#: templates/structure/row_stats_table.phtml:22
-msgid "partitioned"
-msgstr "particionirano"
-
-#: templates/structure/row_stats_table.phtml:54
-msgid "Row length"
-msgstr "Duljina retka"
-
-#: templates/structure/row_stats_table.phtml:66
-msgid "Row size"
-msgstr "Veličina retka"
-
-#: templates/structure/row_stats_table.phtml:73
-msgid "Next autoindex"
-msgstr ""
-
-#: templates/structure/secondary_tabs.phtml:14
-#, fuzzy
-#| msgid "Relation view"
-msgid "Relation view"
-msgstr "Prikaz relacija"
-
-#: templates/structure/show_create.phtml:2
-#, fuzzy
-msgid "Showing create queries"
-msgstr "Prikaži pune upite"
-
-#: templates/structure/sortable_header.phtml:13
-msgid "Sort"
-msgstr "Presloži"
-
-#: templates/structure/table_header.phtml:42
-#, fuzzy
-#| msgid "May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]"
-msgid ""
-"May be approximate. Click on the number to get the exact count. See "
-"[doc@faq3-11]FAQ 3.11[/doc]."
-msgstr "Može biti približno. Pogledajte [doc@faq3-11]ČPP 3.11[/doc]"
-
-#: templates/structure/table_structure_row.phtml:46
-#, fuzzy, php-format
-#| msgid "Table %s has been dropped."
-msgid "Column %s has been dropped."
-msgstr "Tablica %s je odbačen"
-
-#: templates/structure/tracking_icon.phtml:4
-msgid "Tracking is active."
-msgstr "Praćenje je aktivno."
-
-#: templates/structure/tracking_icon.phtml:8
-msgid "Tracking is not active."
-msgstr "Praćenje nije aktivno."
-
-#: templates/table/create_table.phtml:15
-#, fuzzy
-#| msgid "Number of fields"
-msgid "Number of columns"
-msgstr "Broj polja"
-
-#: templates/table/options.phtml:8
-#, fuzzy
-#| msgid "Select fields (at least one):"
-msgid "Select columns (at least one):"
-msgstr "Odaberite polja (najmanje jedno):"
-
-#: templates/table/options.phtml:37
-msgid "Add search conditions (body of the \"where\" clause):"
-msgstr "Dodaj  uvjete pretrage (sadržaj uvjeta \"gdje\"):"
-
-#: templates/table/options.phtml:45
-msgid "Number of rows per page"
-msgstr "Broj redaka po stranici"
-
-#: templates/table/options.phtml:56
-msgid "Display order:"
-msgstr "Redoslijed prikaza:"
-
-#: templates/table/options_zoom.phtml:6
-msgid "Use this column to label each point"
-msgstr ""
-
-#: templates/table/options_zoom.phtml:35
-msgid "Maximum rows to plot"
-msgstr ""
-
-#: templates/table/replace_preview.phtml:13
-msgid "Find and replace - preview"
-msgstr ""
-
-#: templates/table/replace_preview.phtml:18
-#, fuzzy
-#| msgid "Original position"
-msgid "Original string"
-msgstr "Izvorni položaj"
-
-#: templates/table/replace_preview.phtml:19
-#, fuzzy
-#| msgid "Relations"
-msgid "Replaced string"
-msgstr "Relacije"
-
-#: templates/table/replace_preview.phtml:40
-#, fuzzy
-#| msgid "Replication"
-msgid "Replace"
-msgstr "Replikacija"
-
-#: templates/table/rows_zoom.phtml:16
-#, fuzzy
-msgid "Additional search criteria"
-msgstr "SQL upit"
-
-#: templates/table/search_and_replace.phtml:3
-#, fuzzy
-#| msgid "Replace NULL by"
-msgid "Replace with:"
-msgstr "NULL zamijeni s"
-
-#: templates/table/search_and_replace.phtml:22
-#, fuzzy
-#| msgid "as regular expression"
-msgid "Use regular expression"
-msgstr "kao regularan izraz"
-
-#: templates/table/selection_form.phtml:12
-#, fuzzy
-#| msgid "Do a \"query by example\" (wildcard: \"%\")"
-msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
-msgstr "Izvedi \"upit po primjeru\" (džoker: \"%\")"
-
-#: templates/table/selection_form.phtml:34
-msgid "Do a \"query by example\" (wildcard: \"%\")"
-msgstr "Izvedi \"upit po primjeru\" (džoker: \"%\")"
-
-#: templates/table/zoom_result_form.phtml:7
-msgid "Browse/Edit the points"
-msgstr ""
-
-#: templates/table/zoom_result_form.phtml:15
-#, fuzzy
-msgid "How to use"
-msgstr "PHP ekstenzija"
-
-#: templates/table/zoom_result_form.phtml:23
-#, fuzzy
-#| msgid "Reset"
-msgid "Reset zoom"
-msgstr "Povrat"
-
-#: templates/tbl_chart.phtml:17
+#: templates/table/chart/tbl_chart.phtml:17
 #, fuzzy
 #| msgid "Mar"
 msgctxt "Chart type"
 msgid "Bar"
 msgstr "Ožu"
 
-#: templates/tbl_chart.phtml:21
+#: templates/table/chart/tbl_chart.phtml:21
 #, fuzzy
 #| msgid "Column names"
 msgctxt "Chart type"
 msgid "Column"
 msgstr "Nazivi stupaca"
 
-#: templates/tbl_chart.phtml:25
+#: templates/table/chart/tbl_chart.phtml:25
 msgctxt "Chart type"
 msgid "Line"
 msgstr "Linija"
 
-#: templates/tbl_chart.phtml:29
+#: templates/table/chart/tbl_chart.phtml:29
 #, fuzzy
 #| msgid "Engines"
 msgctxt "Chart type"
 msgid "Spline"
 msgstr "Pogoni"
 
-#: templates/tbl_chart.phtml:33
+#: templates/table/chart/tbl_chart.phtml:33
 msgctxt "Chart type"
 msgid "Area"
 msgstr ""
 
-#: templates/tbl_chart.phtml:37
+#: templates/table/chart/tbl_chart.phtml:37
 #, fuzzy
 #| msgid "PiB"
 msgctxt "Chart type"
 msgid "Pie"
 msgstr "PB"
 
-#: templates/tbl_chart.phtml:41
+#: templates/table/chart/tbl_chart.phtml:41
 #, fuzzy
 #| msgid "Time"
 msgctxt "Chart type"
 msgid "Timeline"
 msgstr "Vrijeme"
 
-#: templates/tbl_chart.phtml:45
+#: templates/table/chart/tbl_chart.phtml:45
 msgctxt "Chart type"
 msgid "Scatter"
 msgstr ""
 
-#: templates/tbl_chart.phtml:50
+#: templates/table/chart/tbl_chart.phtml:50
 #, fuzzy
 #| msgid "Packed"
 msgid "Stacked"
 msgstr "Pakirano"
 
-#: templates/tbl_chart.phtml:53
+#: templates/table/chart/tbl_chart.phtml:53
 #, fuzzy
 #| msgid "Report title"
 msgid "Chart title"
 msgstr "Naslov izvještaja"
 
-#: templates/tbl_chart.phtml:57
+#: templates/table/chart/tbl_chart.phtml:57
 msgid "X-Axis:"
 msgstr "X-os:"
 
-#: templates/tbl_chart.phtml:72
+#: templates/table/chart/tbl_chart.phtml:72
 #, fuzzy
 msgid "Series:"
 msgstr "SQL upit"
 
-#: templates/tbl_chart.phtml:102
+#: templates/table/chart/tbl_chart.phtml:102
 msgid "X-Axis label:"
 msgstr "Oznaka X-osi:"
 
-#: templates/tbl_chart.phtml:104
+#: templates/table/chart/tbl_chart.phtml:104
 #, fuzzy
 #| msgid "Value"
 msgid "X Values"
 msgstr "Vrijednost"
 
-#: templates/tbl_chart.phtml:107
+#: templates/table/chart/tbl_chart.phtml:107
 msgid "Y-Axis label:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:115
+#: templates/table/chart/tbl_chart.phtml:115
 msgid "Series names are in a column"
 msgstr ""
 
-#: templates/tbl_chart.phtml:118
+#: templates/table/chart/tbl_chart.phtml:118
 #, fuzzy
 #| msgid "Inside column:"
 msgid "Series column:"
 msgstr "Unutar polja:"
 
-#: templates/tbl_chart.phtml:130
+#: templates/table/chart/tbl_chart.phtml:130
 #, fuzzy
 #| msgid "Values for column %s"
 msgid "Value Column:"
 msgstr "Vrijednosti za stupac %s"
 
-#: templates/tbl_chart.phtml:150
+#: templates/table/chart/tbl_chart.phtml:150
 #, fuzzy
 #| msgid "Save as file"
 msgid "Save chart as image"
 msgstr "Spremi kao datoteku"
 
-#: templates/tbl_relation/common_form.phtml:7
+#: templates/table/gis_visualization/gis_visualization.phtml:3
+msgid "Display GIS Visualization"
+msgstr ""
+
+#: templates/table/gis_visualization/gis_visualization.phtml:8
+#, fuzzy
+#| msgid "Add/Delete Field Columns"
+msgid "Label column"
+msgstr "Dodaj/Izbriši stupce polja"
+
+#: templates/table/gis_visualization/gis_visualization.phtml:11
+msgid "-- None --"
+msgstr ""
+
+#: templates/table/gis_visualization/gis_visualization.phtml:19
+#, fuzzy
+#| msgid "Log file count"
+msgid "Spatial column"
+msgstr "Najveći broj datoteka zapisnika"
+
+#: templates/table/index_form.phtml:16
+msgid "Index name:"
+msgstr "Naziv indeksa:"
+
+#: templates/table/index_form.phtml:19
+msgid ""
+"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
+msgstr ""
+"\"PRIMARY\" <b>mora biti</b> naziv i <b>samo naziv</b> primarnog ključa!"
+
+#: templates/table/index_form.phtml:40
+#, fuzzy
+#| msgid "Index cache size"
+msgid "Index choice:"
+msgstr "Veličina pohrane indeksa"
+
+#: templates/table/index_form.phtml:57
+msgid "Key block size:"
+msgstr ""
+
+#: templates/table/index_form.phtml:74
+msgid "Index type:"
+msgstr "Vrsta indeksa:"
+
+#: templates/table/index_form.phtml:86
+#, fuzzy
+#| msgid "User"
+msgid "Parser:"
+msgstr "Korisnik"
+
+#: templates/table/index_form.phtml:102
+#, fuzzy
+#| msgid "Comment"
+msgid "Comment:"
+msgstr "Komentar"
+
+#: templates/table/index_form.phtml:149 templates/table/index_form.phtml:190
+msgid "Drag to reorder"
+msgstr ""
+
+#: templates/table/relation/common_form.phtml:7
 msgid "Internal relations"
 msgstr "Interne relacije"
 
-#: templates/tbl_relation/common_form.phtml:11
+#: templates/table/relation/common_form.phtml:11
 #, fuzzy
 #| msgid "Internal relations"
 msgid "Internal relation"
 msgstr "Interne relacije"
 
-#: templates/tbl_relation/common_form.phtml:14
+#: templates/table/relation/common_form.phtml:14
 msgid ""
 "An internal relation is not necessary when a corresponding FOREIGN KEY "
 "relation exists."
 msgstr ""
 "Interna relacija nije potrebna ako postoji odgovarajuća relacija FOREIGN KEY."
 
-#: templates/tbl_relation/common_form.phtml:37
+#: templates/table/relation/common_form.phtml:37
 #, fuzzy
 #| msgid "Disable foreign key checks"
 msgid "Foreign key constraints"
 msgstr "Onemogući provjere stranih znakova"
 
-#: templates/tbl_relation/common_form.phtml:40
+#: templates/table/relation/common_form.phtml:40
 msgid "Actions"
 msgstr "Aktivnosti"
 
-#: templates/tbl_relation/common_form.phtml:41
+#: templates/table/relation/common_form.phtml:41
 #, fuzzy
 #| msgid "Constraints for table"
 msgid "Constraint properties"
 msgstr "Ograničenja za tablicu"
 
-#: templates/tbl_relation/common_form.phtml:44
+#: templates/table/relation/common_form.phtml:44
 msgid ""
 "Only columns with index will be displayed. You can define an index below."
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:49
+#: templates/table/relation/common_form.phtml:49
 msgid "Foreign key constraint"
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:81
+#: templates/table/relation/common_form.phtml:81
 #, fuzzy
 #| msgid "Add constraints"
 msgid "+ Add constraint"
 msgstr "Dodaj prisile"
 
-#: templates/tbl_relation/common_form.phtml:91
+#: templates/table/relation/common_form.phtml:91
 #, fuzzy
 #| msgid "Choose field to display"
 msgid "Choose column to display:"
 msgstr "Odaberi polje za prikaz"
 
-#: templates/tbl_relation/foreign_key_row.phtml:13
+#: templates/table/relation/foreign_key_row.phtml:13
 #, fuzzy, php-format
 #| msgid "Disable foreign key checks"
 msgid "Foreign key constraint %s has been dropped"
 msgstr "Onemogući provjere stranih znakova"
 
-#: templates/tbl_relation/foreign_key_row.phtml:102
+#: templates/table/relation/foreign_key_row.phtml:102
 #, fuzzy
 #| msgid "Constraints for table"
 msgid "Constraint name"
 msgstr "Ograničenja za tablicu"
 
-#: templates/tbl_relation/foreign_key_row.phtml:157
+#: templates/table/relation/foreign_key_row.phtml:157
 #, fuzzy
 #| msgid "Add %s field(s)"
 msgid "+ Add column"
 msgstr "Dodaj %s polja"
 
+#: templates/table/search/options.phtml:8
+#, fuzzy
+#| msgid "Select fields (at least one):"
+msgid "Select columns (at least one):"
+msgstr "Odaberite polja (najmanje jedno):"
+
+#: templates/table/search/options.phtml:37
+msgid "Add search conditions (body of the \"where\" clause):"
+msgstr "Dodaj  uvjete pretrage (sadržaj uvjeta \"gdje\"):"
+
+#: templates/table/search/options.phtml:45
+msgid "Number of rows per page"
+msgstr "Broj redaka po stranici"
+
+#: templates/table/search/options.phtml:56
+msgid "Display order:"
+msgstr "Redoslijed prikaza:"
+
+#: templates/table/search/options_zoom.phtml:6
+msgid "Use this column to label each point"
+msgstr ""
+
+#: templates/table/search/options_zoom.phtml:35
+msgid "Maximum rows to plot"
+msgstr ""
+
+#: templates/table/search/replace_preview.phtml:13
+msgid "Find and replace - preview"
+msgstr ""
+
+#: templates/table/search/replace_preview.phtml:18
+#, fuzzy
+#| msgid "Original position"
+msgid "Original string"
+msgstr "Izvorni položaj"
+
+#: templates/table/search/replace_preview.phtml:19
+#, fuzzy
+#| msgid "Relations"
+msgid "Replaced string"
+msgstr "Relacije"
+
+#: templates/table/search/replace_preview.phtml:40
+#, fuzzy
+#| msgid "Replication"
+msgid "Replace"
+msgstr "Replikacija"
+
+#: templates/table/search/rows_zoom.phtml:16
+#, fuzzy
+msgid "Additional search criteria"
+msgstr "SQL upit"
+
+#: templates/table/search/search_and_replace.phtml:3
+#, fuzzy
+#| msgid "Replace NULL by"
+msgid "Replace with:"
+msgstr "NULL zamijeni s"
+
+#: templates/table/search/search_and_replace.phtml:22
+#, fuzzy
+#| msgid "as regular expression"
+msgid "Use regular expression"
+msgstr "kao regularan izraz"
+
+#: templates/table/search/selection_form.phtml:12
+#, fuzzy
+#| msgid "Do a \"query by example\" (wildcard: \"%\")"
+msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
+msgstr "Izvedi \"upit po primjeru\" (džoker: \"%\")"
+
+#: templates/table/search/selection_form.phtml:34
+msgid "Do a \"query by example\" (wildcard: \"%\")"
+msgstr "Izvedi \"upit po primjeru\" (džoker: \"%\")"
+
+#: templates/table/search/zoom_result_form.phtml:7
+msgid "Browse/Edit the points"
+msgstr ""
+
+#: templates/table/search/zoom_result_form.phtml:15
+#, fuzzy
+msgid "How to use"
+msgstr "PHP ekstenzija"
+
+#: templates/table/search/zoom_result_form.phtml:23
+#, fuzzy
+#| msgid "Reset"
+msgid "Reset zoom"
+msgstr "Povrat"
+
+#: templates/table/secondary_tabs.phtml:14
+#, fuzzy
+#| msgid "Relation view"
+msgid "Relation view"
+msgstr "Prikaz relacija"
+
+#: templates/table/structure/actions_in_table_structure.phtml:14
+#, php-format
+msgid "A primary key has been added on %s."
+msgstr "Primarni ključ je dodan na %s."
+
+#: templates/table/structure/actions_in_table_structure.phtml:34
+#: templates/table/structure/actions_in_table_structure.phtml:54
+#: templates/table/structure/actions_in_table_structure.phtml:79
+#: templates/table/structure/actions_in_table_structure.phtml:101
+#, php-format
+msgid "An index has been added on %s."
+msgstr "Indeks je pridodan na %s."
+
+#: templates/table/structure/actions_in_table_structure.phtml:130
+#: templates/table/structure/check_all_table_column.phtml:59
+#, fuzzy
+#| msgid "Remove column(s)"
+msgid "Remove from central columns"
+msgstr "Ukloni stupac / stupce"
+
+#: templates/table/structure/actions_in_table_structure.phtml:138
+#: templates/table/structure/check_all_table_column.phtml:55
+#, fuzzy
+#| msgid "Add %s field(s)"
+msgid "Add to central columns"
+msgstr "Dodaj %s polja"
+
+#: templates/table/structure/add_column.phtml:7
+#, fuzzy, php-format
+#| msgid "Add %s field(s)"
+msgid "Add %s column(s)"
+msgstr "Dodaj %s polja"
+
+#: templates/table/structure/add_column.phtml:12
+#, fuzzy
+#| msgid "At Beginning of Table"
+msgid "at beginning of table"
+msgstr "Pri početku tablice"
+
+#: templates/table/structure/display_structure.phtml:140 view_create.php:181
+#, fuzzy
+#| msgid "Print view"
+msgid "Edit view"
+msgstr "Prikaz ispisa"
+
+#: templates/table/structure/display_table_stats.phtml:9
+msgid "Space usage"
+msgstr "Iskorištenost prostora"
+
+#: templates/table/structure/display_table_stats.phtml:32
+msgid "Effective"
+msgstr "Na snazi"
+
+#: templates/table/structure/move_columns_dialog.phtml:1
+#: templates/table/structure/optional_action_links.phtml:21
+#, fuzzy
+#| msgid "Remove column(s)"
+msgid "Move columns"
+msgstr "Ukloni stupac / stupce"
+
+#: templates/table/structure/move_columns_dialog.phtml:2
+msgid "Move the columns by dragging them up and down."
+msgstr ""
+
+#: templates/table/structure/optional_action_links.phtml:9
+msgid "Propose table structure"
+msgstr "Predloži strukturu tablice"
+
+#: templates/table/structure/optional_action_links.phtml:24
+#, fuzzy
+#| msgid "Propose table structure"
+msgid "Improve table structure"
+msgstr "Predloži strukturu tablice"
+
+#: templates/table/structure/optional_action_links.phtml:30
+#, fuzzy
+#| msgid "Track table"
+msgid "Track view"
+msgstr "Prati tablicu"
+
+#: templates/table/structure/row_stats_table.phtml:3
+#, fuzzy
+#| msgid "Row Statistics"
+msgid "Row statistics"
+msgstr "Statistike redova"
+
+#: templates/table/structure/row_stats_table.phtml:9
+msgid "static"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:11
+msgid "dynamic"
+msgstr "dinamički"
+
+#: templates/table/structure/row_stats_table.phtml:22
+msgid "partitioned"
+msgstr "particionirano"
+
+#: templates/table/structure/row_stats_table.phtml:54
+msgid "Row length"
+msgstr "Duljina retka"
+
+#: templates/table/structure/row_stats_table.phtml:66
+msgid "Row size"
+msgstr "Veličina retka"
+
+#: templates/table/structure/row_stats_table.phtml:73
+msgid "Next autoindex"
+msgstr ""
+
+#: templates/table/structure/table_structure_row.phtml:46
+#, fuzzy, php-format
+#| msgid "Table %s has been dropped."
+msgid "Column %s has been dropped."
+msgstr "Tablica %s je odbačen"
+
 #: themes.php:17 themes.php:22
 msgid "Theme"
 msgstr "Tema"
@@ -17925,6 +17948,11 @@ msgstr ""
 msgid "concurrent_insert is set to 0"
 msgstr "najv. uzastopnih veza"
 
+#, fuzzy
+#~| msgid "Read misses"
+#~ msgid "Read as multibytes"
+#~ msgstr "Propuštena čitanja"
+
 #, fuzzy
 #~| msgid "Relational display field"
 #~ msgid "Relational display column"
diff --git a/po/hu.po b/po/hu.po
index 478ef4a9b3..f80bb43846 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 4.5.0-dev\n"
 "Report-Msgid-Bugs-To: developers@phpmyadmin.net\n"
-"POT-Creation-Date: 2015-08-08 13:53-0400\n"
+"POT-Creation-Date: 2015-08-12 08:10-0400\n"
 "PO-Revision-Date: 2015-08-02 12:15+0200\n"
 "Last-Translator: Balázs Úr <urbalazs@gmail.com>\n"
 "Language-Team: Hungarian <https://hosted.weblate.org/projects/phpmyadmin/"
@@ -53,7 +53,7 @@ msgid "Table comments:"
 msgstr "Tábla megjegyzések:"
 
 #: db_datadict.php:104 libraries/Index.class.php:699
-#: libraries/insert_edit.lib.php:1567
+#: libraries/insert_edit.lib.php:1565
 #: libraries/navigation/Nodes/Node_Column.class.php:30
 #: libraries/plugins/export/ExportHtmlword.class.php:280
 #: libraries/plugins/export/ExportHtmlword.class.php:375
@@ -67,13 +67,14 @@ msgstr "Tábla megjegyzések:"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1023
 #: libraries/tracking.lib.php:879 libraries/tracking.lib.php:975
 #: templates/columns_definitions/column_name.phtml:18
-#: templates/index_form.phtml:124 templates/table/table_header.phtml:6
-#: templates/table/zoom_result_form.phtml:33
-#: templates/tbl_relation/common_form.phtml:10
-#: templates/tbl_relation/common_form.phtml:43
-#: templates/tbl_relation/foreign_key_row.phtml:194
-#: templates/tbl_relation/foreign_key_row.phtml:206
-#: templates/tbl_relation/internal_relational_row.phtml:71
+#: templates/table/index_form.phtml:124
+#: templates/table/relation/common_form.phtml:10
+#: templates/table/relation/common_form.phtml:43
+#: templates/table/relation/foreign_key_row.phtml:194
+#: templates/table/relation/foreign_key_row.phtml:206
+#: templates/table/relation/internal_relational_row.phtml:71
+#: templates/table/search/table_header.phtml:6
+#: templates/table/search/zoom_result_form.phtml:33
 msgid "Column"
 msgstr "Oszlop"
 
@@ -91,21 +92,21 @@ msgstr "Oszlop"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1001
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1024
 #: libraries/rte/rte_list.lib.php:75 libraries/rte/rte_list.lib.php:103
-#: libraries/rte/rte_routines.lib.php:802
-#: libraries/rte/rte_routines.lib.php:831
-#: libraries/rte/rte_routines.lib.php:1493
+#: libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_routines.lib.php:922
+#: libraries/rte/rte_routines.lib.php:1584
 #: libraries/server_privileges.lib.php:2369 libraries/tracking.lib.php:880
 #: libraries/tracking.lib.php:972
 #: templates/columns_definitions/table_fields_definitions.phtml:11
-#: templates/structure/table_header.phtml:48
-#: templates/structure/table_structure_header.phtml:6
-#: templates/table/table_header.phtml:7
+#: templates/database/structure/table_header.phtml:48
+#: templates/table/search/table_header.phtml:7
+#: templates/table/structure/table_structure_header.phtml:6
 msgid "Type"
 msgstr "Típus"
 
 #: db_datadict.php:106 libraries/Index.class.php:702
 #: libraries/central_columns.lib.php:708
-#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1576
+#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1574
 #: libraries/plugins/export/ExportHtmlword.class.php:286
 #: libraries/plugins/export/ExportHtmlword.class.php:381
 #: libraries/plugins/export/ExportLatex.class.php:509
@@ -118,8 +119,8 @@ msgstr "Típus"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1026
 #: libraries/tracking.lib.php:882 libraries/tracking.lib.php:978
 #: templates/columns_definitions/table_fields_definitions.phtml:39
-#: templates/structure/table_structure_header.phtml:9
-#: templates/table/zoom_result_form.phtml:34
+#: templates/table/search/zoom_result_form.phtml:34
+#: templates/table/structure/table_structure_header.phtml:9
 msgid "Null"
 msgstr "Nulla"
 
@@ -137,8 +138,8 @@ msgstr "Nulla"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1027
 #: libraries/replication_gui.lib.php:153 libraries/tracking.lib.php:883
 #: templates/columns_definitions/table_fields_definitions.phtml:25
-#: templates/structure/body_for_table_summary.phtml:55
-#: templates/structure/table_structure_header.phtml:10
+#: templates/database/structure/body_for_table_summary.phtml:55
+#: templates/table/structure/table_structure_header.phtml:10
 msgid "Default"
 msgstr "Alapértelmezett"
 
@@ -166,19 +167,19 @@ msgid "Comments"
 msgstr "Megjegyzések"
 
 #: db_datadict.php:146
-#: libraries/controllers/StructureController.class.php:1960
-#: libraries/controllers/StructureController.class.php:1965
+#: libraries/controllers/TableStructureController.class.php:951
+#: libraries/controllers/TableStructureController.class.php:956
 #: libraries/tracking.lib.php:922
 #: templates/columns_definitions/column_indexes.phtml:6
-#: templates/structure/check_all_table_column.phtml:22
-#: templates/structure/display_structure.phtml:74
+#: templates/table/structure/check_all_table_column.phtml:22
+#: templates/table/structure/display_structure.phtml:74
 msgid "Primary"
 msgstr "Elsődleges"
 
 #: db_datadict.php:156 js/messages.php:317 libraries/Index.class.php:567
 #: libraries/Index.class.php:606 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261 libraries/mult_submits.lib.php:403
+#: libraries/config/FormDisplay.tpl.php:272 libraries/mult_submits.lib.php:403
 #: libraries/mult_submits.lib.php:417
 #: libraries/plugins/export/ExportHtmlword.class.php:630
 #: libraries/plugins/export/ExportLatex.class.php:589
@@ -194,20 +195,20 @@ msgstr "Elsődleges"
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1010 libraries/tracking.lib.php:1015
 #: prefs_manage.php:140 templates/prefs_autoload.phtml:15
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "No"
 msgstr "Nem"
 
 #: db_datadict.php:156 js/messages.php:443 libraries/Index.class.php:568
 #: libraries/Index.class.php:605 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261
-#: libraries/controllers/StructureController.class.php:1344
-#: libraries/controllers/StructureController.class.php:2223
-#: libraries/controllers/StructureController.class.php:2232
-#: libraries/controllers/StructureController.class.php:2237
-#: libraries/controllers/StructureController.class.php:2242
-#: libraries/controllers/StructureController.class.php:2247
+#: libraries/config/FormDisplay.tpl.php:272
+#: libraries/controllers/TableStructureController.class.php:539
+#: libraries/controllers/TableStructureController.class.php:1201
+#: libraries/controllers/TableStructureController.class.php:1210
+#: libraries/controllers/TableStructureController.class.php:1215
+#: libraries/controllers/TableStructureController.class.php:1220
+#: libraries/controllers/TableStructureController.class.php:1225
 #: libraries/mult_submits.inc.php:82 libraries/mult_submits.inc.php:178
 #: libraries/mult_submits.lib.php:339 libraries/mult_submits.lib.php:372
 #: libraries/mult_submits.lib.php:401 libraries/mult_submits.lib.php:415
@@ -216,8 +217,8 @@ msgstr "Nem"
 #: libraries/plugins/export/ExportOdt.class.php:756
 #: libraries/plugins/export/ExportTexytext.class.php:567
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1077
-#: libraries/server_databases.lib.php:464
-#: libraries/server_databases.lib.php:474
+#: libraries/server_databases.lib.php:475
+#: libraries/server_databases.lib.php:485
 #: libraries/server_privileges.lib.php:2546
 #: libraries/server_privileges.lib.php:2727
 #: libraries/server_privileges.lib.php:2748
@@ -227,7 +228,7 @@ msgstr "Nem"
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1008 libraries/tracking.lib.php:1013
 #: prefs_manage.php:138 templates/prefs_autoload.phtml:14
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "Yes"
 msgstr "Igen"
 
@@ -237,7 +238,7 @@ msgstr "Adatbázis kiírás (vázlat) megtekintése"
 
 #: db_export.php:37 db_tracking.php:90 export.php:382
 #: libraries/DBQbe.class.php:326
-#: libraries/controllers/StructureController.class.php:231
+#: libraries/controllers/DatabaseStructureController.class.php:170
 #: libraries/navigation/NavigationTree.class.php:897
 msgid "No tables found in database."
 msgstr "Nem található tábla az adatbázisban."
@@ -248,14 +249,14 @@ msgstr "Nem található tábla az adatbázisban."
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:26
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:120
-#: templates/structure/show_create.phtml:18
+#: templates/database/structure/show_create.phtml:18
 msgid "Tables"
 msgstr "Tábla"
 
 #: db_export.php:52 libraries/Menu.class.php:317 libraries/Menu.class.php:425
-#: libraries/Util.class.php:3333 libraries/Util.class.php:3343
-#: libraries/Util.class.php:3349 libraries/Util.class.php:3629
-#: libraries/Util.class.php:4327 libraries/Util.class.php:4344
+#: libraries/Util.class.php:3339 libraries/Util.class.php:3349
+#: libraries/Util.class.php:3355 libraries/Util.class.php:3635
+#: libraries/Util.class.php:4333 libraries/Util.class.php:4350
 #: libraries/central_columns.lib.php:728 libraries/config.values.php:39
 #: libraries/config.values.php:47 libraries/config.values.php:109
 #: libraries/config.values.php:115 libraries/config/setup.forms.php:323
@@ -269,7 +270,7 @@ msgstr "Tábla"
 #: libraries/navigation/Nodes/Node_Table.class.php:283
 #: libraries/server_privileges.lib.php:1141 libraries/tracking.lib.php:874
 #: templates/columns_definitions/table_fields_definitions.phtml:3
-#: templates/designer/table_list.phtml:28
+#: templates/database/designer/table_list.phtml:28
 msgid "Structure"
 msgstr "Szerkezet"
 
@@ -281,7 +282,7 @@ msgstr "Szerkezet"
 #: libraries/config/user_preferences.forms.php:292
 #: libraries/config/user_preferences.forms.php:297
 #: libraries/server_privileges.lib.php:1140
-#: templates/structure/display_table_stats.phtml:12
+#: templates/table/structure/display_table_stats.phtml:12
 msgid "Data"
 msgstr "Adatok"
 
@@ -353,10 +354,10 @@ msgstr "Nyomon követett táblák"
 #: libraries/server_privileges.lib.php:2908
 #: libraries/server_privileges.lib.php:3145
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4346
-#: templates/structure/table_header.phtml:21
-#: templates/tbl_relation/foreign_key_row.phtml:176
-#: templates/tbl_relation/internal_relational_row.phtml:63
+#: libraries/server_privileges.lib.php:4372
+#: templates/database/structure/table_header.phtml:21
+#: templates/table/relation/foreign_key_row.phtml:176
+#: templates/table/relation/internal_relational_row.phtml:63
 msgid "Table"
 msgstr "Tábla"
 
@@ -373,7 +374,7 @@ msgid "Updated"
 msgstr "Frissítve"
 
 #: db_tracking.php:130 js/messages.php:243 libraries/Menu.class.php:552
-#: libraries/Util.class.php:4314 libraries/config.values.php:104
+#: libraries/Util.class.php:4320 libraries/config.values.php:104
 #: libraries/rte/rte_events.lib.php:393 libraries/rte/rte_list.lib.php:101
 #: libraries/server_status_processes.lib.php:92 libraries/tracking.lib.php:279
 msgid "Status"
@@ -382,14 +383,15 @@ msgstr "Állapot"
 #: db_tracking.php:131 db_tracking.php:290 libraries/Index.class.php:693
 #: libraries/central_columns.lib.php:687 libraries/rte/rte_list.lib.php:74
 #: libraries/rte/rte_list.lib.php:89 libraries/rte/rte_list.lib.php:102
-#: libraries/server_databases.lib.php:398
+#: libraries/server_databases.lib.php:409
 #: libraries/server_privileges.lib.php:2372
 #: libraries/server_privileges.lib.php:3166
 #: libraries/server_privileges.lib.php:3342
 #: libraries/server_user_groups.lib.php:82
 #: libraries/server_variables.lib.php:189 libraries/tracking.lib.php:280
-#: libraries/tracking.lib.php:793 templates/structure/table_header.phtml:30
-#: templates/structure/table_structure_header.phtml:23
+#: libraries/tracking.lib.php:793
+#: templates/database/structure/table_header.phtml:30
+#: templates/table/structure/table_structure_header.phtml:23
 msgid "Action"
 msgstr "Művelet"
 
@@ -431,7 +433,7 @@ msgid "Untracked tables"
 msgstr "Nem követett táblák"
 
 #: db_tracking.php:305 db_tracking.php:336
-#: templates/structure/optional_action_links.phtml:17
+#: templates/table/structure/optional_action_links.phtml:17
 msgid "Track table"
 msgstr "Tábla nyomon követése"
 
@@ -483,7 +485,7 @@ msgid "Value for the column \"%s\""
 msgstr "\"%s\" oszlop értéke"
 
 #: gis_data_editor.php:146
-#: templates/gis_visualization/gis_visualization.phtml:37
+#: templates/table/gis_visualization/gis_visualization.phtml:37
 msgid "Use OpenStreetMaps as Base Layer"
 msgstr "OpenStreetMaps használata alaprétegként"
 
@@ -563,35 +565,35 @@ msgstr "Geometria hozzáadása"
 #: libraries/display_change_password.lib.php:162
 #: libraries/display_export.lib.php:402 libraries/display_export.lib.php:408
 #: libraries/display_import.lib.php:392 libraries/index.lib.php:44
-#: libraries/insert_edit.lib.php:1546 libraries/insert_edit.lib.php:1583
+#: libraries/insert_edit.lib.php:1544 libraries/insert_edit.lib.php:1581
 #: libraries/normalization.lib.php:165 libraries/normalization.lib.php:821
 #: libraries/operations.lib.php:38 libraries/operations.lib.php:108
 #: libraries/operations.lib.php:263 libraries/operations.lib.php:306
 #: libraries/operations.lib.php:801 libraries/operations.lib.php:874
 #: libraries/operations.lib.php:923 libraries/operations.lib.php:1337
 #: libraries/operations.lib.php:1658
-#: libraries/plugins/auth/AuthenticationCookie.class.php:244
+#: libraries/plugins/auth/AuthenticationCookie.class.php:232
 #: libraries/replication_gui.lib.php:122 libraries/replication_gui.lib.php:161
 #: libraries/replication_gui.lib.php:324 libraries/replication_gui.lib.php:461
 #: libraries/replication_gui.lib.php:906 libraries/rte/rte_events.lib.php:509
-#: libraries/rte/rte_routines.lib.php:969
-#: libraries/rte/rte_routines.lib.php:1581
+#: libraries/rte/rte_routines.lib.php:1060
+#: libraries/rte/rte_routines.lib.php:1672
 #: libraries/rte/rte_triggers.lib.php:396 libraries/server_bin_log.lib.php:61
 #: libraries/server_privileges.lib.php:705
 #: libraries/server_privileges.lib.php:2106
 #: libraries/server_privileges.lib.php:2872
 #: libraries/server_privileges.lib.php:3553
-#: libraries/server_privileges.lib.php:4627
+#: libraries/server_privileges.lib.php:4653
 #: libraries/server_user_groups.lib.php:285
 #: libraries/sql_query_form.lib.php:369 libraries/sql_query_form.lib.php:429
 #: libraries/tracking.lib.php:533 libraries/tracking.lib.php:653
 #: prefs_manage.php:277 prefs_manage.php:355
 #: templates/columns_definitions/column_definitions_form.phtml:59
-#: templates/header_location.phtml:17 templates/index_form.phtml:238
+#: templates/database/create_table.phtml:21 templates/header_location.phtml:28
 #: templates/startAndNumberOfRowsPanel.phtml:14
-#: templates/structure/add_column.phtml:25
-#: templates/table/create_table.phtml:21
-#: templates/table/selection_form.phtml:75 view_create.php:275
+#: templates/table/index_form.phtml:238
+#: templates/table/search/selection_form.phtml:75
+#: templates/table/structure/add_column.phtml:25 view_create.php:275
 #: view_operations.php:106
 msgid "Go"
 msgstr "Indítás"
@@ -685,7 +687,7 @@ msgstr ""
 "Nem lehetett betölteni az importáló beépülő modulokat. Kérjük, ellenőrizze a "
 "telepítését!"
 
-#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1466
+#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1460
 #, php-format
 msgid "Bookmark %s has been created."
 msgstr "A(z) %s könyvjelző létrejött."
@@ -725,11 +727,11 @@ msgstr "Nem sikerült betölteni az importálás folyamatát."
 msgid "Back"
 msgstr "Vissza"
 
-#: index.php:148 libraries/Footer.class.php:70
+#: index.php:149 libraries/Footer.class.php:70
 msgid "phpMyAdmin Demo Server"
 msgstr "phpMyAdmin Demo Server"
 
-#: index.php:152
+#: index.php:153
 #, php-format
 msgid ""
 "You are using the demo server. You can do anything here, but please do not "
@@ -739,110 +741,110 @@ msgstr ""
 "Ön demo kiszolgálót használ. Bármit szerkeszthet, de kérjük, ne változtasson "
 "a root, debian-sys-maint és pma felhasználókon. További információ: %s."
 
-#: index.php:162
+#: index.php:163
 msgid "General Settings"
 msgstr "Általános beállítások"
 
-#: index.php:190 libraries/display_change_password.lib.php:50
+#: index.php:191 libraries/display_change_password.lib.php:50
 #: libraries/display_change_password.lib.php:53 user_password.php:247
 msgid "Change password"
 msgstr "Jelszó megváltoztatása"
 
-#: index.php:206
+#: index.php:207
 msgid "Server connection collation"
 msgstr "Kiszolgálókapcsolat illesztése"
 
-#: index.php:228
+#: index.php:229
 msgid "Appearance Settings"
 msgstr "Megjelenési beállítások"
 
-#: index.php:258 prefs_manage.php:285
+#: index.php:259 prefs_manage.php:285
 msgid "More settings"
 msgstr "További beállítások"
 
-#: index.php:279
+#: index.php:280
 msgid "Database server"
 msgstr "Adatbázis-kiszolgáló"
 
-#: index.php:282 libraries/plugins/auth/AuthenticationCookie.class.php:181
+#: index.php:283 libraries/plugins/auth/AuthenticationCookie.class.php:169
 msgid "Server:"
 msgstr "Kiszolgáló:"
 
-#: index.php:286
+#: index.php:287
 msgid "Server type:"
 msgstr "Kiszolgáló típusa:"
 
-#: index.php:290 libraries/plugins/export/ExportLatex.class.php:212
+#: index.php:291 libraries/plugins/export/ExportLatex.class.php:212
 #: libraries/plugins/export/ExportSql.class.php:687
 #: libraries/plugins/export/ExportXml.class.php:189
 msgid "Server version:"
 msgstr "Kiszolgáló verziója:"
 
-#: index.php:296
+#: index.php:297
 msgid "Protocol version:"
 msgstr "Protokoll verzió:"
 
-#: index.php:300
+#: index.php:301
 msgid "User:"
 msgstr "Felhasználó:"
 
-#: index.php:305
+#: index.php:306
 msgid "Server charset:"
 msgstr "A kiszolgáló karakterkódolása:"
 
-#: index.php:320
+#: index.php:321
 msgid "Web server"
 msgstr "Webkiszolgáló"
 
-#: index.php:331
+#: index.php:332
 msgid "Database client version:"
 msgstr "Adatbázis-kliens verziója:"
 
-#: index.php:335
+#: index.php:336
 msgid "PHP extension:"
 msgstr "PHP-kiterjesztés:"
 
-#: index.php:349
+#: index.php:350
 msgid "PHP version:"
 msgstr "PHP verzió:"
 
-#: index.php:360
+#: index.php:361
 msgid "Show PHP information"
 msgstr "PHP információ megjelenítése"
 
-#: index.php:383
+#: index.php:384
 msgid "Version information:"
 msgstr "Verziószám:"
 
-#: index.php:392 libraries/Util.class.php:432 libraries/Util.class.php:495
-#: libraries/config/FormDisplay.tpl.php:151
+#: index.php:393 libraries/Util.class.php:432 libraries/Util.class.php:495
+#: libraries/config/FormDisplay.tpl.php:162
 #: libraries/display_export.lib.php:577 libraries/engines/pbxt.lib.php:162
 #: libraries/navigation/NavigationHeader.class.php:196
 #: libraries/server_variables.lib.php:160
 msgid "Documentation"
 msgstr "Dokumentáció"
 
-#: index.php:399
+#: index.php:400
 msgid "Wiki"
 msgstr "Wiki"
 
-#: index.php:408
+#: index.php:409
 msgid "Official Homepage"
 msgstr "Hivatalos honlap"
 
-#: index.php:415
+#: index.php:416
 msgid "Contribute"
 msgstr "Közreműködés"
 
-#: index.php:422
+#: index.php:423
 msgid "Get support"
 msgstr "Támogatás szerzése"
 
-#: index.php:429
+#: index.php:430
 msgid "List of changes"
 msgstr "Változások listája"
 
-#: index.php:451
+#: index.php:452
 msgid ""
 "You are connected as 'root' with no password, which corresponds to the "
 "default MySQL privileged account. Your MySQL server is running with this "
@@ -854,7 +856,7 @@ msgstr ""
 "alapbeállítással fut, behatolásra nyitott, ezért javítsa ki ezt a biztonsági "
 "rést úgy, hogy a „root” felhasználóhoz jelszót rendel."
 
-#: index.php:468
+#: index.php:469
 msgid ""
 "You have enabled mbstring.func_overload in your PHP configuration. This "
 "option is incompatible with phpMyAdmin and might cause some data to be "
@@ -863,7 +865,7 @@ msgstr ""
 "Ön engedélyezte az mbstring.func_overload funkciót a PHP konfigurációban. Ez "
 "a beállítás nem kompatibilis a phpMyAdminnal, és az adatsérüléssel járhat!"
 
-#: index.php:483
+#: index.php:484
 msgid ""
 "The mbstring PHP extension was not found and you seem to be using a "
 "multibyte charset. Without the mbstring extension phpMyAdmin is unable to "
@@ -874,7 +876,7 @@ msgstr ""
 "tudja megfelelően felosztani a karakterláncokat, mely nem várt eredményhez "
 "vezethet."
 
-#: index.php:500
+#: index.php:501
 msgid ""
 "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini."
 "session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower than "
@@ -886,7 +888,7 @@ msgstr ""
 "phpMyAdminban beállított cookie érvényességénél. Emiatt a bejelentkezése a "
 "phpMyAdminban beállítottnál előbb járhat le."
 
-#: index.php:519
+#: index.php:520
 msgid ""
 "Login cookie store is lower than cookie validity configured in phpMyAdmin, "
 "because of this, your login will expire sooner than configured in phpMyAdmin."
@@ -895,13 +897,13 @@ msgstr ""
 "érvényességénél. Emiatt a bejelentkezése a phpMyAdminban beállítottnál előbb "
 "fog lejárni."
 
-#: index.php:535
+#: index.php:536
 msgid "The configuration file now needs a secret passphrase (blowfish_secret)."
 msgstr ""
 "A konfigurációs fájlnak egy titkos hozzáférési kódra (blowfish_secret) van "
 "szüksége."
 
-#: index.php:548
+#: index.php:549
 msgid ""
 "Directory [code]config[/code], which is used by the setup script, still "
 "exists in your phpMyAdmin directory. It is strongly recommended to remove it "
@@ -912,7 +914,7 @@ msgstr ""
 "phpMyAdmin könyvtárában. Távolítsa el a phpMyAdmin beállítása után. "
 "Máskülönben az illetéktelen behatolás veszélye magas lesz."
 
-#: index.php:564
+#: index.php:565
 #, php-format
 msgid ""
 "The phpMyAdmin configuration storage is not completely configured, some "
@@ -921,14 +923,14 @@ msgstr ""
 "A phpMyAdmin beállítástárolója nincs teljesen beállítva, néhány kibővített "
 "funkció ki lett kapcsolva. %sTudja meg, hogy miért%s. "
 
-#: index.php:571
+#: index.php:572
 msgid ""
 "Or alternately go to 'Operations' tab of any database to set it up there."
 msgstr ""
 "Vagy alternatív megoldásként menjen bármelyik adatbázis „Műveletek” lapjára, "
 "hogy ott beállíthassa."
 
-#: index.php:620
+#: index.php:621
 #, php-format
 msgid ""
 "Your PHP MySQL library version %s differs from your MySQL server version %s. "
@@ -937,7 +939,7 @@ msgstr ""
 "A PHP MySQL programkönyvtár verziója (%s) eltér a MySQL kiszolgáló "
 "verziójától (%s). Ez kiszámíthatatlan viselkedést okozhat."
 
-#: index.php:648
+#: index.php:649
 #, php-format
 msgid ""
 "Server running with Suhosin. Please refer to %sdocumentation%s for possible "
@@ -1098,8 +1100,8 @@ msgstr ""
 msgid "Save & Close"
 msgstr "Mentés és bezárás"
 
-#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:404
-#: libraries/insert_edit.lib.php:1550 prefs_manage.php:361
+#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:415
+#: libraries/insert_edit.lib.php:1548 prefs_manage.php:361
 #: prefs_manage.php:372
 msgid "Reset"
 msgstr "Visszaállítás"
@@ -1132,7 +1134,7 @@ msgstr "Index hozzáadása"
 msgid "Edit Index"
 msgstr "Index szerkesztése"
 
-#: js/messages.php:99 templates/index_form.phtml:232
+#: js/messages.php:99 templates/table/index_form.phtml:232
 #, php-format
 msgid "Add %s column(s) to index"
 msgstr "%s oszlop hozzáadása az indexhez"
@@ -1153,13 +1155,14 @@ msgstr "Összetétel ezzel:"
 msgid "Please select column(s) for the index."
 msgstr "Válasszon oszlopokat az indexhez."
 
-#: js/messages.php:106 templates/structure/add_column.phtml:1
+#: js/messages.php:106 templates/table/structure/add_column.phtml:1
 msgid "You have to add at least one column."
 msgstr "Legalább egy oszlopot kell hozzáadnia."
 
-#: js/messages.php:109 libraries/insert_edit.lib.php:1548
+#: js/messages.php:109 libraries/insert_edit.lib.php:1546
 #: templates/columns_definitions/column_definitions_form.phtml:162
-#: templates/index_form.phtml:237 templates/tbl_relation/common_form.phtml:106
+#: templates/table/index_form.phtml:237
+#: templates/table/relation/common_form.phtml:106
 msgid "Preview SQL"
 msgstr "SQL előnézete"
 
@@ -1176,7 +1179,7 @@ msgid "SQL query:"
 msgstr "SQL lekérdezés:"
 
 #. l10n: Default label for the y-Axis of Charts
-#: js/messages.php:118 templates/tbl_chart.phtml:109
+#: js/messages.php:118 templates/table/chart/tbl_chart.phtml:109
 msgid "Y Values"
 msgstr "Y érték"
 
@@ -1331,7 +1334,7 @@ msgstr "Elküldött bájtok"
 msgid "Bytes received"
 msgstr "Fogadott bájtok"
 
-#: js/messages.php:169 libraries/server_status.lib.php:226
+#: js/messages.php:169 libraries/server_status.lib.php:235
 msgid "Connections"
 msgstr "Kapcsolatok"
 
@@ -1388,12 +1391,12 @@ msgstr "%d tábla"
 msgid "Questions"
 msgstr "Kérdések"
 
-#: js/messages.php:184 libraries/server_status.lib.php:134
+#: js/messages.php:184 libraries/server_status.lib.php:143
 msgid "Traffic"
 msgstr "Forgalom"
 
 #: js/messages.php:185 libraries/Menu.class.php:586
-#: libraries/Util.class.php:4318 libraries/server_status_monitor.lib.php:257
+#: libraries/Util.class.php:4324 libraries/server_status_monitor.lib.php:257
 msgid "Settings"
 msgstr "Beállítások"
 
@@ -1413,8 +1416,9 @@ msgstr "Legalább egy változót adjon meg a sorozathoz!"
 #: libraries/server_status_monitor.lib.php:236
 #: libraries/server_status_processes.lib.php:308
 #: templates/columns_definitions/transformation.phtml:4
-#: templates/designer/options_panel.phtml:178
-#: templates/table/options_zoom.phtml:12 templates/table/rows_zoom.phtml:26
+#: templates/database/designer/options_panel.phtml:178
+#: templates/table/search/options_zoom.phtml:12
+#: templates/table/search/rows_zoom.phtml:26
 msgid "None"
 msgstr "Nincs"
 
@@ -1706,8 +1710,8 @@ msgstr ""
 
 #: js/messages.php:270 libraries/Menu.class.php:352
 #: libraries/Menu.class.php:455 libraries/Menu.class.php:582
-#: libraries/Util.class.php:4317 libraries/Util.class.php:4332
-#: libraries/Util.class.php:4349 libraries/config/messages.inc.php:258
+#: libraries/Util.class.php:4323 libraries/Util.class.php:4338
+#: libraries/Util.class.php:4355 libraries/config/messages.inc.php:258
 #: libraries/display_import.lib.php:105
 #: libraries/server_status_monitor.lib.php:318 prefs_manage.php:238
 #: setup/frames/menu.inc.php:26
@@ -1767,13 +1771,13 @@ msgid "Formatting SQL..."
 msgstr "SQL formázása…"
 
 #: js/messages.php:293 libraries/server_variables.lib.php:157
-#: templates/designer/aggregate_query_panel.phtml:63
-#: templates/designer/delete_relation_panel.phtml:28
-#: templates/designer/having_query_panel.phtml:117
-#: templates/designer/new_relation_panel.phtml:88
-#: templates/designer/options_panel.phtml:253
-#: templates/designer/rename_to_panel.phtml:45
-#: templates/designer/where_query_panel.phtml:83
+#: templates/database/designer/aggregate_query_panel.phtml:63
+#: templates/database/designer/delete_relation_panel.phtml:28
+#: templates/database/designer/having_query_panel.phtml:117
+#: templates/database/designer/new_relation_panel.phtml:88
+#: templates/database/designer/options_panel.phtml:253
+#: templates/database/designer/rename_to_panel.phtml:45
+#: templates/database/designer/where_query_panel.phtml:83
 msgid "Cancel"
 msgstr "Mégse"
 
@@ -1781,7 +1785,7 @@ msgstr "Mégse"
 msgid "Page-related settings"
 msgstr "Oldallal kapcsolatos beállítások"
 
-#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:402
+#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:413
 msgid "Apply"
 msgstr "Alkalmaz"
 
@@ -1816,8 +1820,8 @@ msgstr "Hibakód: %s"
 msgid "Error text: %s"
 msgstr "Hibaüzenet: %s"
 
-#: js/messages.php:307 libraries/db_common.inc.php:68
-#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:450
+#: js/messages.php:307 libraries/db_common.inc.php:69
+#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:461
 msgid "No databases selected."
 msgstr "Nincs kiválasztott adatbázis."
 
@@ -1829,12 +1833,13 @@ msgstr "Oszlop törlése"
 msgid "Adding Primary Key"
 msgstr "Elsődleges kulcs hozzáadása"
 
-#: js/messages.php:310 templates/designer/aggregate_query_panel.phtml:59
-#: templates/designer/having_query_panel.phtml:113
-#: templates/designer/new_relation_panel.phtml:87
-#: templates/designer/options_panel.phtml:252
-#: templates/designer/rename_to_panel.phtml:41
-#: templates/designer/where_query_panel.phtml:82
+#: js/messages.php:310
+#: templates/database/designer/aggregate_query_panel.phtml:59
+#: templates/database/designer/having_query_panel.phtml:113
+#: templates/database/designer/new_relation_panel.phtml:87
+#: templates/database/designer/options_panel.phtml:252
+#: templates/database/designer/rename_to_panel.phtml:41
+#: templates/database/designer/where_query_panel.phtml:82
 msgid "OK"
 msgstr "OK"
 
@@ -1854,7 +1859,7 @@ msgstr "Adatbázis másolása"
 msgid "Changing Charset"
 msgstr "Karakterkészlet változtatása"
 
-#: js/messages.php:320 libraries/Util.class.php:3217
+#: js/messages.php:320 libraries/Util.class.php:3223
 msgid "Enable foreign key checks"
 msgstr "Idegen kulcsok ellenőrzésének engedélyezése"
 
@@ -1890,20 +1895,21 @@ msgstr ""
 #: js/messages.php:334 libraries/DisplayResults.class.php:4834
 #: libraries/DisplayResults.class.php:5092 libraries/Menu.class.php:344
 #: libraries/Menu.class.php:446 libraries/Menu.class.php:578
-#: libraries/Util.class.php:3636 libraries/Util.class.php:3637
-#: libraries/Util.class.php:4316 libraries/Util.class.php:4331
-#: libraries/Util.class.php:4348 libraries/config/messages.inc.php:252
+#: libraries/Util.class.php:3642 libraries/Util.class.php:3643
+#: libraries/Util.class.php:4322 libraries/Util.class.php:4337
+#: libraries/Util.class.php:4354 libraries/config/messages.inc.php:252
 #: libraries/display_export.lib.php:173 libraries/rte/rte_list.lib.php:146
 #: libraries/server_privileges.lib.php:2211
 #: libraries/server_privileges.lib.php:2290
 #: libraries/server_privileges.lib.php:2632
 #: libraries/server_privileges.lib.php:3356
 #: libraries/server_status_monitor.lib.php:322 prefs_manage.php:303
-#: setup/frames/menu.inc.php:27 templates/structure/check_all_tables.phtml:11
+#: setup/frames/menu.inc.php:27
+#: templates/database/structure/check_all_tables.phtml:11
 msgid "Export"
 msgstr "Exportálás"
 
-#: js/messages.php:337 libraries/rte/rte_routines.lib.php:652
+#: js/messages.php:337 libraries/rte/rte_routines.lib.php:743
 msgid "ENUM/SET editor"
 msgstr "ENUM/SET szerkesztő"
 
@@ -1943,7 +1949,7 @@ msgstr "Lekérdezési doboz megjelenítése"
 #: libraries/Console.class.php:214 libraries/DisplayResults.class.php:3474
 #: libraries/DisplayResults.class.php:4818 libraries/Index.class.php:723
 #: libraries/Util.class.php:706 libraries/Util.class.php:1202
-#: libraries/Util.class.php:3634 libraries/Util.class.php:3635
+#: libraries/Util.class.php:3640 libraries/Util.class.php:3641
 #: libraries/central_columns.lib.php:851
 #: libraries/central_columns.lib.php:1193
 #: libraries/config/messages.inc.php:892
@@ -1961,7 +1967,7 @@ msgstr "Módosítás"
 #: libraries/server_user_groups.lib.php:129
 #: libraries/sql_query_form.lib.php:416 libraries/tracking.lib.php:477
 #: setup/frames/index.inc.php:183 setup/frames/index.inc.php:291
-#: templates/designer/delete_relation_panel.phtml:27
+#: templates/database/designer/delete_relation_panel.phtml:27
 msgid "Delete"
 msgstr "Törlés"
 
@@ -2133,11 +2139,11 @@ msgid "No dependencies selected!"
 msgstr "Nincsenek függőségek kiválasztva!"
 
 #: js/messages.php:394 libraries/central_columns.lib.php:1214
-#: libraries/insert_edit.lib.php:1458 libraries/server_variables.lib.php:155
+#: libraries/insert_edit.lib.php:1456 libraries/server_variables.lib.php:155
 #: setup/frames/config.inc.php:42 setup/frames/index.inc.php:279
 #: templates/columns_definitions/column_definitions_form.phtml:165
-#: templates/gis_visualization/gis_visualization.phtml:48
-#: templates/tbl_relation/common_form.phtml:107
+#: templates/table/gis_visualization/gis_visualization.phtml:48
+#: templates/table/relation/common_form.phtml:107
 msgid "Save"
 msgstr "Mentés"
 
@@ -2218,8 +2224,8 @@ msgid "Data point content"
 msgstr "Adatmutató tartalma"
 
 #: js/messages.php:430 js/messages.php:562 js/messages.php:579
-#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2573
-#: templates/index_form.phtml:154 templates/index_form.phtml:194
+#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2571
+#: templates/table/index_form.phtml:154 templates/table/index_form.phtml:194
 msgid "Ignore"
 msgstr "Kihagyás"
 
@@ -2280,8 +2286,8 @@ msgstr "Idegen kulcs kiválasztása"
 msgid "Please select the primary key or a unique key!"
 msgstr "Válassza ki az elsődleges kulcsot vagy egy egyedi kulcsot!"
 
-#: js/messages.php:457 templates/designer/side_menu.phtml:91
-#: templates/designer/side_menu.phtml:94
+#: js/messages.php:457 templates/database/designer/side_menu.phtml:91
+#: templates/database/designer/side_menu.phtml:94
 msgid "Choose column to display"
 msgstr "Válassza ki a megjelenítendő oszlopot"
 
@@ -2297,18 +2303,18 @@ msgstr ""
 msgid "Page name"
 msgstr "Oldal neve"
 
-#: js/messages.php:463 templates/designer/side_menu.phtml:56
-#: templates/designer/side_menu.phtml:59
+#: js/messages.php:463 templates/database/designer/side_menu.phtml:56
+#: templates/database/designer/side_menu.phtml:59
 msgid "Save page"
 msgstr "Oldal mentése"
 
-#: js/messages.php:464 templates/designer/side_menu.phtml:63
-#: templates/designer/side_menu.phtml:66
+#: js/messages.php:464 templates/database/designer/side_menu.phtml:63
+#: templates/database/designer/side_menu.phtml:66
 msgid "Save page as"
 msgstr "Oldal mentése másként"
 
-#: js/messages.php:465 templates/designer/side_menu.phtml:49
-#: templates/designer/side_menu.phtml:52
+#: js/messages.php:465 templates/database/designer/side_menu.phtml:49
+#: templates/database/designer/side_menu.phtml:52
 msgid "Open page"
 msgstr "Oldal megnyitása"
 
@@ -2316,7 +2322,7 @@ msgstr "Oldal megnyitása"
 msgid "Delete page"
 msgstr "Oldal törlése"
 
-#: js/messages.php:467 templates/designer/side_menu.phtml:10
+#: js/messages.php:467 templates/database/designer/side_menu.phtml:10
 msgid "Untitled"
 msgstr "Névtelen"
 
@@ -2441,7 +2447,7 @@ msgstr "Eredeti hossz"
 msgid "cancel"
 msgstr "mégse"
 
-#: js/messages.php:499 libraries/server_status.lib.php:271
+#: js/messages.php:499 libraries/server_status.lib.php:280
 msgid "Aborted"
 msgstr "Megszakítva"
 
@@ -3008,7 +3014,7 @@ msgstr "Adjon meg egy érvényes HEX bemenetet"
 
 #: js/messages.php:793 libraries/Message.class.php:199
 #: libraries/Util.class.php:654 libraries/core.lib.php:245
-#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1172
+#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1170
 #: tbl_operations.php:229 view_operations.php:63
 msgid "Error"
 msgstr "Hiba"
@@ -3071,8 +3077,8 @@ msgstr "másodpercenként"
 msgid "per minute"
 msgstr "percenként"
 
-#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:143
-#: libraries/server_status.lib.php:228
+#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:152
+#: libraries/server_status.lib.php:237
 #: libraries/server_status_queries.lib.php:98
 msgid "per hour"
 msgstr "óránként"
@@ -3090,7 +3096,7 @@ msgstr "A létező beállító fájl (%s) nem olvasható."
 msgid "Wrong permissions on configuration file, should not be world writable!"
 msgstr "A konfigurációs fájl helytelen írási engedéllyel rendelkezik!"
 
-#: libraries/Config.class.php:1799
+#: libraries/Config.class.php:1801
 msgid "Font size"
 msgstr "Betűméret"
 
@@ -3118,10 +3124,10 @@ msgstr "Újra lekérdezés"
 #: libraries/server_privileges.lib.php:2890
 #: libraries/server_privileges.lib.php:3144
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4332
+#: libraries/server_privileges.lib.php:4358
 #: libraries/server_status_processes.lib.php:80
-#: templates/tbl_relation/foreign_key_row.phtml:165
-#: templates/tbl_relation/internal_relational_row.phtml:55
+#: templates/table/relation/foreign_key_row.phtml:165
+#: templates/table/relation/internal_relational_row.phtml:55
 msgid "Database"
 msgstr "Adatbázis"
 
@@ -3214,11 +3220,11 @@ msgstr "Előzmények"
 #: libraries/plugins/import/ImportMediawiki.class.php:60
 #: libraries/plugins/import/ImportOds.class.php:59
 #: libraries/plugins/import/ImportShp.class.php:57
-#: libraries/plugins/import/ImportSql.class.php:148
+#: libraries/plugins/import/ImportSql.class.php:51
 #: libraries/plugins/import/ImportXml.class.php:58
-#: libraries/rte/rte_routines.lib.php:833 templates/index_form.phtml:49
-#: templates/structure/row_stats_table.phtml:20
-#: templates/table/options.phtml:2
+#: libraries/rte/rte_routines.lib.php:924 templates/table/index_form.phtml:49
+#: templates/table/search/options.phtml:2
+#: templates/table/structure/row_stats_table.phtml:20
 msgid "Options"
 msgstr "Beállítások"
 
@@ -3251,7 +3257,8 @@ msgstr "csökkenő"
 msgid "Order:"
 msgstr "Sorrend:"
 
-#: libraries/Console.class.php:289 templates/table/replace_preview.phtml:17
+#: libraries/Console.class.php:289
+#: templates/table/search/replace_preview.phtml:17
 msgid "Count"
 msgstr "Számláló"
 
@@ -3348,9 +3355,9 @@ msgstr "Átváltás sötét témára"
 #: libraries/operations.lib.php:794 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:191
-#: templates/structure/sortable_header.phtml:21
-#: templates/structure/sortable_header.phtml:38
-#: templates/table/options.phtml:68
+#: templates/database/structure/sortable_header.phtml:21
+#: templates/database/structure/sortable_header.phtml:38
+#: templates/table/search/options.phtml:68
 msgid "Ascending"
 msgstr "Növekvő"
 
@@ -3360,13 +3367,14 @@ msgstr "Növekvő"
 #: libraries/operations.lib.php:797 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:188
-#: templates/structure/sortable_header.phtml:26
-#: templates/structure/sortable_header.phtml:43
-#: templates/table/options.phtml:69
+#: templates/database/structure/sortable_header.phtml:26
+#: templates/database/structure/sortable_header.phtml:43
+#: templates/table/search/options.phtml:69
 msgid "Descending"
 msgstr "Csökkenő"
 
-#: libraries/DBQbe.class.php:467 templates/table/search_and_replace.phtml:6
+#: libraries/DBQbe.class.php:467
+#: templates/table/search/search_and_replace.phtml:6
 msgid "Column:"
 msgstr "Oszlop:"
 
@@ -3526,12 +3534,12 @@ msgstr[0] "%1$s találat ebben: <strong>%2$s</strong>"
 msgstr[1] "%1$s találat ebben: <strong>%2$s</strong>"
 
 #: libraries/DbSearch.class.php:354 libraries/Menu.class.php:311
-#: libraries/Util.class.php:3337 libraries/Util.class.php:3347
-#: libraries/Util.class.php:3623 libraries/Util.class.php:3624
-#: libraries/Util.class.php:4343 libraries/config.values.php:43
+#: libraries/Util.class.php:3343 libraries/Util.class.php:3353
+#: libraries/Util.class.php:3629 libraries/Util.class.php:3630
+#: libraries/Util.class.php:4349 libraries/config.values.php:43
 #: libraries/config.values.php:51 libraries/config.values.php:119
 #: libraries/navigation/Nodes/Node_Table.class.php:295
-#: templates/structure/check_all_table_column.phtml:5
+#: templates/table/structure/check_all_table_column.phtml:5
 msgid "Browse"
 msgstr "Tartalom"
 
@@ -3548,7 +3556,8 @@ msgstr "Keresés az adatbázisban"
 msgid "Words or values to search for (wildcard: \"%\"):"
 msgstr "Keresendő szavak vagy értékek (karakterhelyettesítő: \"%\"):"
 
-#: libraries/DbSearch.class.php:401 templates/table/search_and_replace.phtml:1
+#: libraries/DbSearch.class.php:401
+#: templates/table/search/search_and_replace.phtml:1
 msgid "Find:"
 msgstr "Keresés:"
 
@@ -3592,28 +3601,28 @@ msgstr "Sorok szűrése"
 msgid "Search this table"
 msgstr "Keresés a táblában"
 
-#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2532
-#: libraries/Util.class.php:2535
+#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2538
+#: libraries/Util.class.php:2541
 msgctxt "First page"
 msgid "Begin"
 msgstr "Kezdet"
 
-#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2533
-#: libraries/Util.class.php:2536 libraries/server_bin_log.lib.php:170
+#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2539
+#: libraries/Util.class.php:2542 libraries/server_bin_log.lib.php:170
 #: libraries/server_bin_log.lib.php:172
 msgctxt "Previous page"
 msgid "Previous"
 msgstr "Előző"
 
-#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2564
-#: libraries/Util.class.php:2574 libraries/server_bin_log.lib.php:204
+#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2570
+#: libraries/Util.class.php:2580 libraries/server_bin_log.lib.php:204
 #: libraries/server_bin_log.lib.php:206
 msgctxt "Next page"
 msgid "Next"
 msgstr "Következő"
 
-#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2565
-#: libraries/Util.class.php:2575
+#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2571
+#: libraries/Util.class.php:2581
 msgctxt "Last page"
 msgid "End"
 msgstr "Vége"
@@ -3688,15 +3697,15 @@ msgid "May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]."
 msgstr "Becsült érték lehet. Lásd [doc@faq3-11]GyIK 3.11[/doc]."
 
 #: libraries/DisplayResults.class.php:4332 libraries/Message.class.php:180
-#: libraries/controllers/TableRelationController.class.php:258
+#: libraries/controllers/TableRelationController.class.php:259
 #: libraries/controllers/TableSearchController.class.php:655
-#: libraries/rte/rte_routines.lib.php:1332 libraries/sql_query_form.lib.php:89
+#: libraries/rte/rte_routines.lib.php:1423 libraries/sql_query_form.lib.php:89
 #: tbl_operations.php:227 tbl_row_action.php:138 view_operations.php:62
 msgid "Your SQL query has been executed successfully."
 msgstr "Az SQL-lekérdezés végrehajtása sikerült."
 
 #: libraries/DisplayResults.class.php:4660
-#: libraries/controllers/StructureController.class.php:629
+#: libraries/controllers/DatabaseStructureController.class.php:564
 #, php-format
 msgid ""
 "This view has at least this number of rows. Please refer to %sdocumentation"
@@ -3720,33 +3729,33 @@ msgstr "%1$d összesen, %2$d a lekérdezésben"
 msgid "%d total"
 msgstr "összesen %d"
 
-#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1318
+#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1312
 #, php-format
 msgid "Query took %01.4f seconds."
 msgstr "A lekérdezés %01.4f másodpercig tartott."
 
 #: libraries/DisplayResults.class.php:4807
-#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4767
-#: libraries/Util.class.php:4773 libraries/mult_submits.inc.php:50
-#: templates/structure/check_all_tables.phtml:2
-#: templates/structure/check_all_tables.phtml:9
+#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4773
+#: libraries/Util.class.php:4779 libraries/mult_submits.inc.php:50
+#: templates/database/structure/check_all_tables.phtml:2
+#: templates/database/structure/check_all_tables.phtml:9
 msgid "With selected:"
 msgstr "A kijelöltekkel végzendő művelet:"
 
 #: libraries/DisplayResults.class.php:4811
-#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4769
-#: libraries/Util.class.php:4770 libraries/server_privileges.lib.php:1174
+#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4775
+#: libraries/Util.class.php:4776 libraries/server_privileges.lib.php:1174
 #: libraries/server_privileges.lib.php:1175
 #: libraries/server_privileges.lib.php:1387
 #: libraries/server_user_groups.lib.php:231
-#: templates/structure/check_all_tables.phtml:3
-#: templates/structure/check_all_tables.phtml:4
+#: templates/database/structure/check_all_tables.phtml:3
+#: templates/database/structure/check_all_tables.phtml:4
 msgid "Check All"
 msgstr "Mind kijelölése"
 
 #: libraries/DisplayResults.class.php:4985 libraries/Header.class.php:383
-#: templates/structure/optional_action_links.phtml:1
-#: templates/structure/print_view_data_dictionary_link.phtml:3
+#: templates/database/structure/print_view_data_dictionary_link.phtml:3
+#: templates/table/structure/optional_action_links.phtml:1
 msgid "Print view"
 msgstr "Nyomtatási nézet"
 
@@ -3754,7 +3763,8 @@ msgstr "Nyomtatási nézet"
 msgid "Query results operations"
 msgstr "Műveletek a lekérdezési eredménnyel"
 
-#: libraries/DisplayResults.class.php:5105 templates/tbl_chart.phtml:12
+#: libraries/DisplayResults.class.php:5105
+#: templates/table/chart/tbl_chart.phtml:12
 msgid "Display chart"
 msgstr "Diagram megjelenítése"
 
@@ -3851,7 +3861,7 @@ msgid "Click on the bar to scroll to top of page"
 msgstr "Kattintson a sávra az oldal tetejére való görgetéshez"
 
 #: libraries/Header.class.php:749
-#: libraries/plugins/auth/AuthenticationCookie.class.php:152
+#: libraries/plugins/auth/AuthenticationCookie.class.php:140
 msgid "Javascript must be enabled past this point!"
 msgstr "Ettől a ponttól engedélyeznie kell a JavaScriptet!"
 
@@ -3873,11 +3883,11 @@ msgid "Keyname"
 msgstr "Kulcsnév"
 
 #: libraries/Index.class.php:697
-#: libraries/controllers/StructureController.class.php:1962
-#: libraries/controllers/StructureController.class.php:1967
+#: libraries/controllers/TableStructureController.class.php:953
+#: libraries/controllers/TableStructureController.class.php:958
 #: libraries/tracking.lib.php:973
 #: templates/columns_definitions/column_indexes.phtml:11
-#: templates/structure/check_all_table_column.phtml:26
+#: templates/table/structure/check_all_table_column.phtml:26
 msgid "Unique"
 msgstr "Egyedi"
 
@@ -3896,16 +3906,17 @@ msgstr "Számosság"
 #: libraries/server_collations.lib.php:35 libraries/tracking.lib.php:881
 #: libraries/tracking.lib.php:977
 #: templates/columns_definitions/table_fields_definitions.phtml:33
-#: templates/structure/row_stats_table.phtml:31
-#: templates/structure/table_header.phtml:55
-#: templates/structure/table_structure_header.phtml:7
-#: templates/table/table_header.phtml:8
+#: templates/database/structure/table_header.phtml:55
+#: templates/table/search/table_header.phtml:8
+#: templates/table/structure/row_stats_table.phtml:31
+#: templates/table/structure/table_structure_header.phtml:7
 msgid "Collation"
 msgstr "Illesztés"
 
 #: libraries/Index.class.php:703 libraries/rte/rte_events.lib.php:496
-#: libraries/rte/rte_routines.lib.php:956 libraries/tracking.lib.php:885
-#: libraries/tracking.lib.php:979 templates/structure/table_header.phtml:84
+#: libraries/rte/rte_routines.lib.php:1047 libraries/tracking.lib.php:885
+#: libraries/tracking.lib.php:979
+#: templates/database/structure/table_header.phtml:84
 msgid "Comment"
 msgstr "Megjegyzés"
 
@@ -3918,15 +3929,15 @@ msgstr "Az elsődleges kulcs eldobása megtörtént."
 msgid "Index %s has been dropped."
 msgstr "A(z) %s index eldobása megtörtént."
 
-#: libraries/Index.class.php:757 libraries/Util.class.php:3630
-#: libraries/Util.class.php:3631
-#: libraries/controllers/StructureController.class.php:1958
-#: libraries/controllers/StructureController.class.php:1959
+#: libraries/Index.class.php:757 libraries/Util.class.php:3636
+#: libraries/Util.class.php:3637
+#: libraries/controllers/TableStructureController.class.php:949
+#: libraries/controllers/TableStructureController.class.php:950
 #: libraries/operations.lib.php:1607 libraries/rte/rte_list.lib.php:150
 #: libraries/server_databases.lib.php:146
-#: templates/structure/check_all_table_column.phtml:15
-#: templates/structure/check_all_tables.phtml:16
-#: templates/tbl_relation/foreign_key_row.phtml:93
+#: templates/database/structure/check_all_tables.phtml:16
+#: templates/table/relation/foreign_key_row.phtml:93
+#: templates/table/structure/check_all_table_column.phtml:15
 msgid "Drop"
 msgstr "Eldobás"
 
@@ -3957,16 +3968,16 @@ msgstr "Kiszolgáló"
 #: libraries/Menu.class.php:248
 #: libraries/navigation/Nodes/Node_View.class.php:32
 #: libraries/tbl_info.inc.php:63
-#: templates/structure/structure_table_row.phtml:97
-#: templates/structure/structure_table_row.phtml:159
+#: templates/database/structure/structure_table_row.phtml:97
+#: templates/database/structure/structure_table_row.phtml:159
 msgid "View"
 msgstr "Nézet"
 
 #: libraries/Menu.class.php:325 libraries/Menu.class.php:429
-#: libraries/Menu.class.php:548 libraries/Util.class.php:3334
-#: libraries/Util.class.php:3344 libraries/Util.class.php:3350
-#: libraries/Util.class.php:4313 libraries/Util.class.php:4328
-#: libraries/Util.class.php:4345 libraries/config.values.php:40
+#: libraries/Menu.class.php:548 libraries/Util.class.php:3340
+#: libraries/Util.class.php:3350 libraries/Util.class.php:3356
+#: libraries/Util.class.php:4319 libraries/Util.class.php:4334
+#: libraries/Util.class.php:4351 libraries/config.values.php:40
 #: libraries/config.values.php:48 libraries/config.values.php:110
 #: libraries/config.values.php:116 libraries/config/messages.inc.php:321
 #: libraries/navigation/Nodes/Node_Table.class.php:292
@@ -3974,19 +3985,19 @@ msgid "SQL"
 msgstr "SQL"
 
 #: libraries/Menu.class.php:328 libraries/Menu.class.php:432
-#: libraries/Util.class.php:3335 libraries/Util.class.php:3345
-#: libraries/Util.class.php:3351 libraries/Util.class.php:3625
-#: libraries/Util.class.php:3626 libraries/Util.class.php:4329
-#: libraries/Util.class.php:4346 libraries/config.values.php:41
+#: libraries/Util.class.php:3341 libraries/Util.class.php:3351
+#: libraries/Util.class.php:3357 libraries/Util.class.php:3631
+#: libraries/Util.class.php:3632 libraries/Util.class.php:4335
+#: libraries/Util.class.php:4352 libraries/config.values.php:41
 #: libraries/config.values.php:49 libraries/config.values.php:111
 #: libraries/config.values.php:117
 #: libraries/navigation/Nodes/Node_Table.class.php:286
 msgid "Search"
 msgstr "Keresés"
 
-#: libraries/Menu.class.php:338 libraries/Util.class.php:3336
-#: libraries/Util.class.php:3346 libraries/Util.class.php:3627
-#: libraries/Util.class.php:3628 libraries/Util.class.php:4347
+#: libraries/Menu.class.php:338 libraries/Util.class.php:3342
+#: libraries/Util.class.php:3352 libraries/Util.class.php:3633
+#: libraries/Util.class.php:3634 libraries/Util.class.php:4353
 #: libraries/config.values.php:42 libraries/config.values.php:50
 #: libraries/config.values.php:118
 #: libraries/navigation/Nodes/Node_Table.class.php:289
@@ -3995,30 +4006,30 @@ msgid "Insert"
 msgstr "Beszúrás"
 
 #: libraries/Menu.class.php:362 libraries/Menu.class.php:467
-#: libraries/Util.class.php:4334 libraries/Util.class.php:4350
+#: libraries/Util.class.php:4340 libraries/Util.class.php:4356
 #: libraries/config.values.php:106 libraries/server_common.lib.php:51
 #: libraries/server_privileges.lib.php:2370
 #: libraries/server_privileges.lib.php:3158
-#: libraries/server_privileges.lib.php:4221
+#: libraries/server_privileges.lib.php:4247
 msgid "Privileges"
 msgstr "Jogok"
 
 #: libraries/Menu.class.php:371 libraries/Menu.class.php:379
-#: libraries/Menu.class.php:459 libraries/Util.class.php:3338
-#: libraries/Util.class.php:3352 libraries/Util.class.php:4333
-#: libraries/Util.class.php:4351 libraries/config.values.php:112
+#: libraries/Menu.class.php:459 libraries/Util.class.php:3344
+#: libraries/Util.class.php:3358 libraries/Util.class.php:4339
+#: libraries/Util.class.php:4357 libraries/config.values.php:112
 #: view_operations.php:92
 msgid "Operations"
 msgstr "Műveletek"
 
 #: libraries/Menu.class.php:384 libraries/Menu.class.php:492
-#: libraries/Util.class.php:4338 libraries/Util.class.php:4352
+#: libraries/Util.class.php:4344 libraries/Util.class.php:4358
 #: libraries/relation.lib.php:255
 msgid "Tracking"
 msgstr "Követés"
 
 #: libraries/Menu.class.php:397 libraries/Menu.class.php:486
-#: libraries/Util.class.php:4337 libraries/Util.class.php:4353
+#: libraries/Util.class.php:4343 libraries/Util.class.php:4359
 #: libraries/navigation/Nodes/Node_Trigger_Container.class.php:24
 #: libraries/plugins/export/ExportHtmlword.class.php:557
 #: libraries/plugins/export/ExportOdt.class.php:685
@@ -4035,16 +4046,16 @@ msgstr "Eseményindítók"
 msgid "Database seems to be empty!"
 msgstr "Üresnek tűnik az adatbázis!"
 
-#: libraries/Menu.class.php:439 libraries/Util.class.php:4330
+#: libraries/Menu.class.php:439 libraries/Util.class.php:4336
 msgid "Query"
 msgstr "Lekérdezés"
 
-#: libraries/Menu.class.php:472 libraries/Util.class.php:4335
+#: libraries/Menu.class.php:472 libraries/Util.class.php:4341
 #: libraries/rte/rte_words.lib.php:36
 msgid "Routines"
 msgstr "Eljárások"
 
-#: libraries/Menu.class.php:479 libraries/Util.class.php:4336
+#: libraries/Menu.class.php:479 libraries/Util.class.php:4342
 #: libraries/navigation/Nodes/Node_Event_Container.class.php:26
 #: libraries/plugins/export/ExportSql.class.php:940
 #: libraries/plugins/export/ExportXml.class.php:107
@@ -4052,20 +4063,20 @@ msgstr "Eljárások"
 msgid "Events"
 msgstr "Események"
 
-#: libraries/Menu.class.php:498 libraries/Util.class.php:4339
+#: libraries/Menu.class.php:498 libraries/Util.class.php:4345
 msgid "Designer"
 msgstr "Tervező"
 
-#: libraries/Menu.class.php:507 libraries/Util.class.php:4340
-#: templates/structure/check_all_tables.phtml:35
+#: libraries/Menu.class.php:507 libraries/Util.class.php:4346
+#: templates/database/structure/check_all_tables.phtml:35
 msgid "Central columns"
 msgstr "Központi oszlopok"
 
-#: libraries/Menu.class.php:544 libraries/Util.class.php:4312
+#: libraries/Menu.class.php:544 libraries/Util.class.php:4318
 #: libraries/config.values.php:103 libraries/config/messages.inc.php:266
 #: libraries/config/messages.inc.php:341
 #: libraries/navigation/NavigationTree.class.php:1239
-#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4332
+#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4358
 msgid "Databases"
 msgstr "Adatbázisok"
 
@@ -4074,34 +4085,34 @@ msgid "User accounts"
 msgstr "Felhasználói fiókok"
 
 #: libraries/Menu.class.php:595 libraries/ServerStatusData.class.php:121
-#: libraries/Util.class.php:4319 libraries/server_common.lib.php:36
+#: libraries/Util.class.php:4325 libraries/server_common.lib.php:36
 msgid "Binary log"
 msgstr "Bináris napló"
 
 #: libraries/Menu.class.php:601 libraries/ServerStatusData.class.php:126
-#: libraries/Util.class.php:4320 libraries/server_common.lib.php:42
-#: templates/structure/body_for_table_summary.phtml:10
-#: templates/structure/table_header.phtml:27
+#: libraries/Util.class.php:4326 libraries/server_common.lib.php:42
+#: templates/database/structure/body_for_table_summary.phtml:10
+#: templates/database/structure/table_header.phtml:27
 msgid "Replication"
 msgstr "Többszörözés"
 
 #: libraries/Menu.class.php:606 libraries/ServerStatusData.class.php:193
-#: libraries/Util.class.php:4321 libraries/config.values.php:105
+#: libraries/Util.class.php:4327 libraries/config.values.php:105
 #: libraries/server_engines.lib.php:108 libraries/server_engines.lib.php:112
 #: libraries/sql_query_form.lib.php:421
 msgid "Variables"
 msgstr "Változók"
 
-#: libraries/Menu.class.php:610 libraries/Util.class.php:4322
+#: libraries/Menu.class.php:610 libraries/Util.class.php:4328
 msgid "Charsets"
 msgstr "Karakterkészlet"
 
-#: libraries/Menu.class.php:615 libraries/Util.class.php:4323
+#: libraries/Menu.class.php:615 libraries/Util.class.php:4329
 #: libraries/server_common.lib.php:33 libraries/server_plugins.lib.php:27
 msgid "Plugins"
 msgstr "Bővítmények"
 
-#: libraries/Menu.class.php:626 libraries/Util.class.php:4324
+#: libraries/Menu.class.php:626 libraries/Util.class.php:4330
 msgid "Engines"
 msgstr "Motorok"
 
@@ -4126,7 +4137,7 @@ msgid_plural "%1$d rows inserted."
 msgstr[0] "A(z) %1$d sor beszúrása megtörtént."
 msgstr[1] "A(z) %1$d sor beszúrása megtörtént."
 
-#: libraries/PDF.class.php:70 libraries/Util.class.php:2521
+#: libraries/PDF.class.php:70 libraries/Util.class.php:2527
 #: libraries/browse_foreigners.lib.php:327
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:865
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:890
@@ -4147,7 +4158,7 @@ msgid "Could not save favorite table!"
 msgstr "Nem sikerült elmenteni a kedvenc táblát!"
 
 #: libraries/RecentFavoriteTable.class.php:212
-#: templates/structure/favorite_anchor.phtml:12
+#: templates/database/structure/favorite_anchor.phtml:12
 msgid "Remove from Favorites"
 msgstr "Eltávolítás a kedvencek közül"
 
@@ -4313,7 +4324,7 @@ msgstr ""
 "Erről a tárolómotorról részletes állapot-információ nem áll rendelkezésre."
 
 #: libraries/StorageEngine.class.php:373
-#: templates/structure/body_for_table_summary.phtml:50
+#: templates/database/structure/body_for_table_summary.phtml:50
 #, php-format
 msgid "%s is the default storage engine on this MySQL server."
 msgstr "Ezen a MySQL kiszolgálón a(z) %s az alapértelmezett tárolómotor."
@@ -4788,10 +4799,10 @@ msgstr "%d hibát találtunk az elemzés során."
 
 #: libraries/Util.class.php:726 libraries/rte/rte_events.lib.php:110
 #: libraries/rte/rte_events.lib.php:119 libraries/rte/rte_events.lib.php:150
-#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:153
-#: libraries/rte/rte_routines.lib.php:162
-#: libraries/rte/rte_routines.lib.php:235
-#: libraries/rte/rte_routines.lib.php:1366
+#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:223
+#: libraries/rte/rte_routines.lib.php:250
+#: libraries/rte/rte_routines.lib.php:372
+#: libraries/rte/rte_routines.lib.php:1457
 #: libraries/rte/rte_triggers.lib.php:86 libraries/rte/rte_triggers.lib.php:95
 #: libraries/rte/rte_triggers.lib.php:127
 msgid "MySQL said: "
@@ -4835,75 +4846,78 @@ msgstr "Vas"
 msgid "%B %d, %Y at %I:%M %p"
 msgstr "%Y. %B %d. %H:%M"
 
-#: libraries/Util.class.php:2019
+#: libraries/Util.class.php:2025
 #, php-format
 msgid "%s days, %s hours, %s minutes and %s seconds"
 msgstr "%s nap, %s óra, %s perc, %s másodperc"
 
-#: libraries/Util.class.php:2112
+#: libraries/Util.class.php:2118
 msgid "Missing parameter:"
 msgstr "Hiányzó paraméter:"
 
-#: libraries/Util.class.php:2645
+#: libraries/Util.class.php:2651
 #, php-format
 msgid "Jump to database \"%s\"."
 msgstr "Ugrás a(z) \"%s\" adatbázishoz."
 
-#: libraries/Util.class.php:2670
+#: libraries/Util.class.php:2676
 #, php-format
 msgid "The %s functionality is affected by a known bug, see %s"
 msgstr "A(z) %s funkcióra egy ismert hiba van hatással, lásd itt: %s"
 
-#: libraries/Util.class.php:2881
+#: libraries/Util.class.php:2887
 msgid "Click to toggle"
 msgstr "Kattintson a váltáshoz"
 
-#: libraries/Util.class.php:3542 prefs_manage.php:248
+#: libraries/Util.class.php:3548 prefs_manage.php:248
 msgid "Browse your computer:"
 msgstr "Számítógép tallózása:"
 
-#: libraries/Util.class.php:3567
+#: libraries/Util.class.php:3573
 #, php-format
 msgid "Select from the web server upload directory <b>%s</b>:"
 msgstr "Válasszon a webkiszolgáló feltöltési könyvtárából <b> %s </b>:"
 
-#: libraries/Util.class.php:3596 libraries/insert_edit.lib.php:1173
+#: libraries/Util.class.php:3602 libraries/insert_edit.lib.php:1171
 msgid "The directory you set for upload work cannot be reached."
 msgstr "Nem elérhető a feltöltésekhez megadott könyvtár."
 
-#: libraries/Util.class.php:3607
+#: libraries/Util.class.php:3613
 msgid "There are no files to upload!"
 msgstr "Nincsenek feltöltendő fájlok!"
 
-#: libraries/Util.class.php:3632 libraries/Util.class.php:3633
-#: templates/structure/check_all_tables.phtml:15
+#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: templates/database/structure/check_all_tables.phtml:15
 msgid "Empty"
 msgstr "Kiürítés"
 
-#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: libraries/Util.class.php:3644 libraries/Util.class.php:3645
 msgid "Execute"
 msgstr "Végrehajtás"
 
-#: libraries/Util.class.php:4152
+#: libraries/Util.class.php:4158
 msgid "Print"
 msgstr "Nyomtatás"
 
-#: libraries/Util.class.php:4257 templates/structure/row_stats_table.phtml:80
-#: templates/structure/table_header.phtml:95
+#: libraries/Util.class.php:4263
+#: templates/database/structure/table_header.phtml:95
+#: templates/table/structure/row_stats_table.phtml:80
 msgid "Creation"
 msgstr "Létrehozás"
 
-#: libraries/Util.class.php:4263 templates/structure/row_stats_table.phtml:87
-#: templates/structure/table_header.phtml:106
+#: libraries/Util.class.php:4269
+#: templates/database/structure/table_header.phtml:106
+#: templates/table/structure/row_stats_table.phtml:87
 msgid "Last update"
 msgstr "Utolsó frissítés"
 
-#: libraries/Util.class.php:4269 templates/structure/row_stats_table.phtml:94
-#: templates/structure/table_header.phtml:117
+#: libraries/Util.class.php:4275
+#: templates/database/structure/table_header.phtml:117
+#: templates/table/structure/row_stats_table.phtml:94
 msgid "Last check"
 msgstr "Utolsó ellenőrzés"
 
-#: libraries/Util.class.php:4315
+#: libraries/Util.class.php:4321
 msgid "Users"
 msgstr "Felhasználók"
 
@@ -4924,16 +4938,16 @@ msgid "Use this value"
 msgstr "Ezen érték használata"
 
 #: libraries/build_html_for_db.lib.php:33 libraries/import.lib.php:193
-#: templates/structure/actions_in_table_structure.phtml:113
-#: templates/structure/row_stats_table.phtml:42
-#: templates/structure/table_header.phtml:36
+#: templates/database/structure/table_header.phtml:36
+#: templates/table/structure/actions_in_table_structure.phtml:113
+#: templates/table/structure/row_stats_table.phtml:42
 msgid "Rows"
 msgstr "Sorok"
 
 #: libraries/build_html_for_db.lib.php:48 libraries/engines/innodb.lib.php:171
-#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:186
-#: libraries/server_status.lib.php:298
-#: templates/structure/display_table_stats.phtml:40
+#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:195
+#: libraries/server_status.lib.php:307
+#: templates/table/structure/display_table_stats.phtml:40
 msgid "Total"
 msgstr "Összesen"
 
@@ -4942,10 +4956,12 @@ msgid "Jump to database"
 msgstr "Adatbázisra ugrás"
 
 #: libraries/build_html_for_db.lib.php:146
+#: templates/database/structure/structure_table_row.phtml:15
 msgid "Not replicated"
 msgstr "Nem replikált"
 
 #: libraries/build_html_for_db.lib.php:158
+#: templates/database/structure/structure_table_row.phtml:16
 msgid "Replicated"
 msgstr "Többszörözzött"
 
@@ -5003,17 +5019,17 @@ msgstr "NEM"
 #: libraries/plugins/export/ExportTexytext.class.php:425
 #: libraries/plugins/export/PMA_ExportPdf.class.php:307
 #: libraries/rte/rte_list.lib.php:73 libraries/rte/rte_list.lib.php:85
-#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:830
-#: libraries/rte/rte_routines.lib.php:1492 setup/frames/index.inc.php:162
+#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:921
+#: libraries/rte/rte_routines.lib.php:1583 setup/frames/index.inc.php:162
 #: templates/columns_definitions/table_fields_definitions.phtml:8
-#: templates/structure/table_structure_header.phtml:5
-#: templates/table/create_table.phtml:11
+#: templates/database/create_table.phtml:11
+#: templates/table/structure/table_structure_header.phtml:5
 msgid "Name"
 msgstr "Név"
 
 #: libraries/central_columns.lib.php:699
 #: libraries/central_columns.lib.php:1381
-#: libraries/rte/rte_routines.lib.php:832
+#: libraries/rte/rte_routines.lib.php:923
 #: templates/columns_definitions/table_fields_definitions.phtml:14
 msgid "Length/Values"
 msgstr "Hossz/Értékek"
@@ -5032,7 +5048,7 @@ msgid "Select a table"
 msgstr "Válasszon egy táblát"
 
 #: libraries/central_columns.lib.php:804
-#: templates/structure/add_column.phtml:4
+#: templates/table/structure/add_column.phtml:4
 msgid "Add column"
 msgstr "Oszlop hozzáadása"
 
@@ -5048,7 +5064,7 @@ msgstr "Új oszlop hozzáadása"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1002
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1025
 #: templates/columns_definitions/table_fields_definitions.phtml:36
-#: templates/structure/table_structure_header.phtml:8
+#: templates/table/structure/table_structure_header.phtml:8
 msgid "Attributes"
 msgstr "Tulajdonságok"
 
@@ -5165,7 +5181,7 @@ msgid "Double click"
 msgstr "Dupla kattintás"
 
 #: libraries/config.values.php:95 libraries/config.values.php:124
-#: libraries/config/FormDisplay.tpl.php:221 libraries/relation.lib.php:97
+#: libraries/config/FormDisplay.tpl.php:232 libraries/relation.lib.php:97
 #: libraries/relation.lib.php:105
 msgid "Disabled"
 msgstr "Letiltott"
@@ -5335,22 +5351,22 @@ msgstr "Tömörített exportálás nem fog működni, mert hiányzik a funkció:
 msgid "maximum %s"
 msgstr "maximum %s"
 
-#: libraries/config/FormDisplay.tpl.php:219
+#: libraries/config/FormDisplay.tpl.php:230
 msgid "This setting is disabled, it will not be applied to your configuration."
 msgstr ""
 "Ez a beállítás le van tiltva, nem lesz alkalmazva az Ön konfigurációjában."
 
-#: libraries/config/FormDisplay.tpl.php:313
+#: libraries/config/FormDisplay.tpl.php:324
 #, php-format
 msgid "Set value: %s"
 msgstr "Adja meg az értéket: %s"
 
-#: libraries/config/FormDisplay.tpl.php:318
+#: libraries/config/FormDisplay.tpl.php:329
 #: libraries/config/messages.inc.php:610
 msgid "Restore default value"
 msgstr "Alapértelmezett érték visszaállítása"
 
-#: libraries/config/FormDisplay.tpl.php:332
+#: libraries/config/FormDisplay.tpl.php:343
 msgid "Allow users to customize this value"
 msgstr "Engedélyezi a felhasználóknak az érték módosítását"
 
@@ -5856,7 +5872,7 @@ msgstr "A fájl karakterkészlete"
 
 #: libraries/config/messages.inc.php:136 libraries/config/messages.inc.php:152
 #: libraries/sql_query_form.lib.php:247
-#: templates/structure/row_stats_table.phtml:7
+#: templates/table/structure/row_stats_table.phtml:7
 msgid "Format"
 msgstr "Formátum"
 
@@ -6371,7 +6387,7 @@ msgstr ""
 
 #: libraries/config/messages.inc.php:332
 #: libraries/plugins/export/ExportPdf.class.php:279
-#: templates/structure/secondary_tabs.phtml:8
+#: templates/table/secondary_tabs.phtml:8
 msgid "Table structure"
 msgstr "Táblaszerkezet"
 
@@ -8065,103 +8081,33 @@ msgstr "Microsoft Word 2000"
 msgid "OpenDocument Text"
 msgstr "Open Document szöveges dokumentum"
 
-#: libraries/controllers/StructureController.class.php:465
+#: libraries/controllers/DatabaseStructureController.class.php:405
 #: tbl_operations.php:382
 #, php-format
 msgid "Table %s has been emptied."
 msgstr "A(z) %s tábla kiürítése megtörtént."
 
-#: libraries/controllers/StructureController.class.php:486
+#: libraries/controllers/DatabaseStructureController.class.php:426
 #: tbl_operations.php:400 view_operations.php:119
 #, php-format
 msgid "View %s has been dropped."
 msgstr "A(z) %s nézet el lett dobva."
 
-#: libraries/controllers/StructureController.class.php:487
+#: libraries/controllers/DatabaseStructureController.class.php:427
 #: tbl_operations.php:401
 #, php-format
 msgid "Table %s has been dropped."
 msgstr "A(z) %s tábla el lett dobva."
 
-#: libraries/controllers/StructureController.class.php:797
-#, php-format
-msgid "The name '%s' is a MySQL reserved keyword."
-msgid_plural "The names '%s' are MySQL reserved keywords."
-msgstr[0] "A(z) „%s” név a MySQL számára fenntartott kulcsszó."
-msgstr[1] "A(z) „%s” nevek a MySQL számára fenntartott kulcsszavak."
-
-#: libraries/controllers/StructureController.class.php:875
-msgid "No column selected."
-msgstr "Nem jelölt ki sort."
-
-#: libraries/controllers/StructureController.class.php:1049
+#: libraries/controllers/DatabaseStructureController.class.php:733
 msgid "Favorite List is full!"
 msgstr "A kedvencek listája tele van!"
 
-#: libraries/controllers/StructureController.class.php:1272
-msgid "The columns have been moved successfully."
-msgstr "Az oszlop mozgatása sikeresen megtörtént."
-
-#: libraries/controllers/StructureController.class.php:1535
-#, php-format
-msgid ""
-"Table %1$s has been altered successfully. Privileges have been adjusted."
-msgstr ""
-"A(z) %1$s tábla sikeresen módosítva lett. A jogosultságok módosítása "
-"megtörtént."
-
-#: libraries/controllers/StructureController.class.php:1541
-#: libraries/controllers/TableIndexesController.class.php:161
-#: tbl_addfield.php:92
-#, php-format
-msgid "Table %1$s has been altered successfully."
-msgstr "A(z) %1$s tábla módosítása sikerült."
-
-#: libraries/controllers/StructureController.class.php:1588
-#: libraries/tracking.lib.php:1094
-msgid "Query error"
-msgstr "Lekérdezési hiba"
-
-#: libraries/controllers/StructureController.class.php:1806
+#: libraries/controllers/DatabaseStructureController.class.php:947
 #: libraries/mysql_charsets.lib.php:366 libraries/mysql_charsets.lib.php:373
 msgid "unknown"
 msgstr "ismeretlen"
 
-#: libraries/controllers/StructureController.class.php:1957
-#: templates/structure/check_all_table_column.phtml:11
-msgid "Change"
-msgstr "Módosítás"
-
-#: libraries/controllers/StructureController.class.php:1961
-#: libraries/controllers/StructureController.class.php:1966
-#: libraries/navigation/Nodes/Node_Index.class.php:30
-#: libraries/tracking.lib.php:926
-#: templates/columns_definitions/column_indexes.phtml:16
-#: templates/columns_definitions/table_fields_definitions.phtml:57
-#: templates/structure/check_all_table_column.phtml:30
-#: templates/structure/display_structure.phtml:79
-#: templates/structure/display_table_stats.phtml:19
-msgid "Index"
-msgstr "Index"
-
-#: libraries/controllers/StructureController.class.php:1963
-#: libraries/controllers/StructureController.class.php:1968
-#: templates/columns_definitions/column_indexes.phtml:27
-#: templates/structure/check_all_table_column.phtml:37
-msgid "Spatial"
-msgstr "Térbeli"
-
-#: libraries/controllers/StructureController.class.php:1964
-#: libraries/controllers/StructureController.class.php:1969
-#: templates/columns_definitions/column_indexes.phtml:22
-#: templates/structure/check_all_table_column.phtml:47
-msgid "Fulltext"
-msgstr "Teljes szöveg"
-
-#: libraries/controllers/StructureController.class.php:1970
-msgid "Distinct values"
-msgstr "Különböző értékek"
-
 #: libraries/controllers/TableChartController.class.php:82
 #: libraries/controllers/TableGisVisualizationController.class.php:101
 msgid "No SQL query was set to fetch data."
@@ -8175,11 +8121,18 @@ msgstr "Nem tartalmaz számoszlopot a táblázat."
 msgid "No data to display"
 msgstr "Nincs megjelenítendő adat"
 
-#: libraries/controllers/TableRelationController.class.php:217
+#: libraries/controllers/TableIndexesController.class.php:161
+#: libraries/controllers/TableStructureController.class.php:736
+#: tbl_addfield.php:92
+#, php-format
+msgid "Table %1$s has been altered successfully."
+msgstr "A(z) %1$s tábla módosítása sikerült."
+
+#: libraries/controllers/TableRelationController.class.php:218
 msgid "Display column was successfully updated."
 msgstr "A megjelenített oszlop sikeresen frissítve."
 
-#: libraries/controllers/TableRelationController.class.php:283
+#: libraries/controllers/TableRelationController.class.php:288
 msgid "Internal relations were successfully updated."
 msgstr "A belső kapcsolatok sikeresen frissítve."
 
@@ -8192,10 +8145,73 @@ msgid "Zoom search"
 msgstr "Lépcsőzetes keresés"
 
 #: libraries/controllers/TableSearchController.class.php:852
-#: templates/table/selection_form.phtml:59
+#: templates/table/search/selection_form.phtml:59
 msgid "Find and replace"
 msgstr "Keresés és csere"
 
+#: libraries/controllers/TableStructureController.class.php:163
+#, php-format
+msgid "The name '%s' is a MySQL reserved keyword."
+msgid_plural "The names '%s' are MySQL reserved keywords."
+msgstr[0] "A(z) „%s” név a MySQL számára fenntartott kulcsszó."
+msgstr[1] "A(z) „%s” nevek a MySQL számára fenntartott kulcsszavak."
+
+#: libraries/controllers/TableStructureController.class.php:241
+msgid "No column selected."
+msgstr "Nem jelölt ki sort."
+
+#: libraries/controllers/TableStructureController.class.php:467
+msgid "The columns have been moved successfully."
+msgstr "Az oszlop mozgatása sikeresen megtörtént."
+
+#: libraries/controllers/TableStructureController.class.php:730
+#, php-format
+msgid ""
+"Table %1$s has been altered successfully. Privileges have been adjusted."
+msgstr ""
+"A(z) %1$s tábla sikeresen módosítva lett. A jogosultságok módosítása "
+"megtörtént."
+
+#: libraries/controllers/TableStructureController.class.php:783
+#: libraries/tracking.lib.php:1094
+msgid "Query error"
+msgstr "Lekérdezési hiba"
+
+#: libraries/controllers/TableStructureController.class.php:948
+#: templates/table/structure/check_all_table_column.phtml:11
+msgid "Change"
+msgstr "Módosítás"
+
+#: libraries/controllers/TableStructureController.class.php:952
+#: libraries/controllers/TableStructureController.class.php:957
+#: libraries/navigation/Nodes/Node_Index.class.php:30
+#: libraries/tracking.lib.php:926
+#: templates/columns_definitions/column_indexes.phtml:16
+#: templates/columns_definitions/table_fields_definitions.phtml:57
+#: templates/table/structure/check_all_table_column.phtml:30
+#: templates/table/structure/display_structure.phtml:79
+#: templates/table/structure/display_table_stats.phtml:19
+msgid "Index"
+msgstr "Index"
+
+#: libraries/controllers/TableStructureController.class.php:954
+#: libraries/controllers/TableStructureController.class.php:959
+#: templates/columns_definitions/column_indexes.phtml:27
+#: templates/table/structure/check_all_table_column.phtml:37
+msgid "Spatial"
+msgstr "Térbeli"
+
+#: libraries/controllers/TableStructureController.class.php:955
+#: libraries/controllers/TableStructureController.class.php:960
+#: templates/columns_definitions/column_indexes.phtml:22
+#: templates/table/structure/check_all_table_column.phtml:47
+msgid "Fulltext"
+msgstr "Teljes szöveg"
+
+#: libraries/controllers/TableStructureController.class.php:963
+msgid "Distinct values"
+msgstr "Különböző értékek"
+
 #: libraries/core.lib.php:306
 #, php-format
 msgid "The %s extension is missing. Please check your PHP configuration."
@@ -8242,7 +8258,7 @@ msgid "No Password"
 msgstr "Nincs jelszó"
 
 #: libraries/display_change_password.lib.php:68
-#: libraries/plugins/auth/AuthenticationCookie.class.php:199
+#: libraries/plugins/auth/AuthenticationCookie.class.php:187
 #: libraries/replication_gui.lib.php:422 libraries/replication_gui.lib.php:862
 #: libraries/server_privileges.lib.php:1640
 msgid "Password:"
@@ -9037,12 +9053,12 @@ msgid "Dump has been saved to file %s."
 msgstr "A kiíratás mentése a(z) %s fájlba megtörtént."
 
 #: libraries/import.lib.php:202 libraries/insert_edit.lib.php:124
-#: libraries/rte/rte_routines.lib.php:1353 libraries/sql.lib.php:1312
+#: libraries/rte/rte_routines.lib.php:1444 libraries/sql.lib.php:1306
 #: tbl_get_field.php:44
 msgid "MySQL returned an empty result set (i.e. zero rows)."
 msgstr "A MySQL üres eredményhalmazt adott vissza (pl. nulla sorok)."
 
-#: libraries/import.lib.php:265 libraries/sql.lib.php:1326
+#: libraries/import.lib.php:265 libraries/sql.lib.php:1320
 msgid "[ROLLBACK occurred.]"
 msgstr "[ROLLBACK történt.]"
 
@@ -9112,14 +9128,14 @@ msgstr "Index készítése a(z) &nbsp;%s&nbsp;oszlopokon"
 
 #: libraries/insert_edit.lib.php:233
 #: libraries/navigation/Nodes/Node_DatabaseChild.class.php:48
-#: templates/designer/table_list.phtml:40
+#: templates/database/designer/table_list.phtml:40
 msgid "Hide"
 msgstr "Elrejtés"
 
 #: libraries/insert_edit.lib.php:249
 #: libraries/navigation/Nodes/Node_Function.class.php:32
-#: libraries/rte/rte_routines.lib.php:1495
-#: templates/table/table_header.phtml:4
+#: libraries/rte/rte_routines.lib.php:1586
+#: templates/table/search/table_header.phtml:4
 msgid "Function"
 msgstr "Függvény"
 
@@ -9132,84 +9148,85 @@ msgstr "Bináris"
 msgid "Because of its length,<br /> this column might not be editable."
 msgstr "A hossza miatt ez az<br /> oszlop talán nem szerkeszthető."
 
-#: libraries/insert_edit.lib.php:1050
+#: libraries/insert_edit.lib.php:1048
 msgid "Binary - do not edit"
 msgstr "Bináris - nem szerkeszthető"
 
-#: libraries/insert_edit.lib.php:1176 libraries/server_privileges.lib.php:470
-#: templates/table/options.phtml:36
+#: libraries/insert_edit.lib.php:1174 libraries/server_privileges.lib.php:470
+#: templates/table/search/options.phtml:36
 msgid "Or"
 msgstr "Vagy"
 
-#: libraries/insert_edit.lib.php:1177
+#: libraries/insert_edit.lib.php:1175
 msgid "web server upload directory:"
 msgstr "webszerver feltöltési könyvtár:"
 
-#: libraries/insert_edit.lib.php:1348 templates/table/input_box.phtml:49
+#: libraries/insert_edit.lib.php:1346
+#: templates/table/search/input_box.phtml:49
 msgid "Edit/Insert"
 msgstr "Szerkesztés/Beszúrás"
 
-#: libraries/insert_edit.lib.php:1398
+#: libraries/insert_edit.lib.php:1396
 #, php-format
 msgid "Continue insertion with %s rows"
 msgstr "Beszúrás folytatása a(z) %s sorokkal"
 
-#: libraries/insert_edit.lib.php:1428
+#: libraries/insert_edit.lib.php:1426
 msgid "and then"
 msgstr "és utána"
 
-#: libraries/insert_edit.lib.php:1461
+#: libraries/insert_edit.lib.php:1459
 msgid "Insert as new row"
 msgstr "Beszúrás új sorként"
 
-#: libraries/insert_edit.lib.php:1464
+#: libraries/insert_edit.lib.php:1462
 msgid "Insert as new row and ignore errors"
 msgstr "Új sor beillesztése és a hibák figyelmen kívül hagyása"
 
-#: libraries/insert_edit.lib.php:1467
+#: libraries/insert_edit.lib.php:1465
 msgid "Show insert query"
 msgstr "Beillesztő lekérdezés megjelenítése"
 
-#: libraries/insert_edit.lib.php:1487
+#: libraries/insert_edit.lib.php:1485
 msgid "Go back to previous page"
 msgstr "Vissza az előző oldalra"
 
-#: libraries/insert_edit.lib.php:1490
+#: libraries/insert_edit.lib.php:1488
 msgid "Insert another new row"
 msgstr "Új sor beszúrása"
 
-#: libraries/insert_edit.lib.php:1495
+#: libraries/insert_edit.lib.php:1493
 msgid "Go back to this page"
 msgstr "Visszatérés erre az oldalra"
 
-#: libraries/insert_edit.lib.php:1518
+#: libraries/insert_edit.lib.php:1516
 msgid "Edit next row"
 msgstr "Következő sor szerkesztése"
 
-#: libraries/insert_edit.lib.php:1540
+#: libraries/insert_edit.lib.php:1538
 msgid ""
 "Use TAB key to move from value to value, or CTRL+arrows to move anywhere"
 msgstr ""
 "A TAB billentyűvel értékről értékre lépkedhet, vagy a CTRL+nyilakkal bárhová "
 "léphet"
 
-#: libraries/insert_edit.lib.php:1577 libraries/replication_gui.lib.php:542
-#: libraries/rte/rte_routines.lib.php:1497
+#: libraries/insert_edit.lib.php:1575 libraries/replication_gui.lib.php:542
+#: libraries/rte/rte_routines.lib.php:1588
 #: libraries/server_status_variables.lib.php:220
-#: templates/designer/having_query_panel.phtml:100
-#: templates/designer/options_panel.phtml:73
-#: templates/designer/options_panel.phtml:239
-#: templates/designer/where_query_panel.phtml:69
-#: templates/table/table_header.phtml:10
-#: templates/table/zoom_result_form.phtml:35
+#: templates/database/designer/having_query_panel.phtml:100
+#: templates/database/designer/options_panel.phtml:73
+#: templates/database/designer/options_panel.phtml:239
+#: templates/database/designer/where_query_panel.phtml:69
+#: templates/table/search/table_header.phtml:10
+#: templates/table/search/zoom_result_form.phtml:35
 msgid "Value"
 msgstr "Érték"
 
-#: libraries/insert_edit.lib.php:1937 libraries/sql.lib.php:1309
+#: libraries/insert_edit.lib.php:1935 libraries/sql.lib.php:1303
 msgid "Showing SQL query"
 msgstr "Megjelenítés SQL lekérdezésként"
 
-#: libraries/insert_edit.lib.php:1962 libraries/sql.lib.php:1287
+#: libraries/insert_edit.lib.php:1960 libraries/sql.lib.php:1281
 #, php-format
 msgid "Inserted row id: %1$d"
 msgstr "A beszúrt sor azonosítószáma: %1$d"
@@ -9619,7 +9636,7 @@ msgstr "új"
 #: libraries/navigation/Nodes/Node_View_Container.class.php:26
 #: libraries/navigation/Nodes/Node_View_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:129
-#: templates/structure/show_create.phtml:30
+#: templates/database/structure/show_create.phtml:30
 msgid "Views"
 msgstr "Nézetek"
 
@@ -9959,7 +9976,7 @@ msgstr ""
 
 #: libraries/operations.lib.php:101 libraries/operations.lib.php:249
 #: libraries/operations.lib.php:869 libraries/operations.lib.php:963
-#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:907
+#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:998
 #: templates/columns_definitions/table_fields_definitions.phtml:47
 msgid "Adjust Privileges"
 msgstr "Jogosultságok módosítása"
@@ -10049,22 +10066,22 @@ msgid "Switch to copied table"
 msgstr "A másolt táblára váltás"
 
 #: libraries/operations.lib.php:1360
-#: templates/structure/check_all_tables.phtml:18
+#: templates/database/structure/check_all_tables.phtml:18
 msgid "Table maintenance"
 msgstr "Tábla karbantartása"
 
 #: libraries/operations.lib.php:1398
-#: templates/structure/check_all_tables.phtml:19
+#: templates/database/structure/check_all_tables.phtml:19
 msgid "Analyze table"
 msgstr "Tábla elemzése"
 
 #: libraries/operations.lib.php:1413
-#: templates/structure/check_all_tables.phtml:20
+#: templates/database/structure/check_all_tables.phtml:20
 msgid "Check table"
 msgstr "Tábla ellenőrzése"
 
 #: libraries/operations.lib.php:1428
-#: templates/structure/check_all_tables.phtml:22
+#: templates/database/structure/check_all_tables.phtml:22
 msgid "Checksum table"
 msgstr "Tábla ellenőrzőösszege"
 
@@ -10082,18 +10099,19 @@ msgid "Flush the table (FLUSH)"
 msgstr "Tábla kiöblítése (FLUSH)"
 
 #: libraries/operations.lib.php:1477
-#: templates/structure/check_all_tables.phtml:23
-#: templates/structure/display_table_stats.phtml:56
+#: templates/database/structure/check_all_tables.phtml:23
+#: templates/table/structure/display_table_stats.phtml:56
 msgid "Optimize table"
 msgstr "Tábla optimalizálása"
 
 #: libraries/operations.lib.php:1492
-#: templates/structure/check_all_tables.phtml:24
+#: templates/database/structure/check_all_tables.phtml:24
 msgid "Repair table"
 msgstr "Tábla javítása"
 
 #: libraries/operations.lib.php:1538
-#: templates/structure/check_all_tables.phtml:14 view_operations.php:127
+#: templates/database/structure/check_all_tables.phtml:14
+#: view_operations.php:127
 msgid "Delete data or table"
 msgstr "Adat vagy tábla törlése"
 
@@ -10219,7 +10237,7 @@ msgid "Cannot connect: invalid settings."
 msgstr "Nem lehet csatlakozni: érvénytelenek a beállítások."
 
 #: libraries/plugins/auth/AuthenticationConfig.class.php:108
-#: libraries/plugins/auth/AuthenticationCookie.class.php:134
+#: libraries/plugins/auth/AuthenticationCookie.class.php:122
 #: libraries/plugins/auth/AuthenticationHttp.class.php:96
 #, php-format
 msgid "Welcome to %s"
@@ -10250,37 +10268,37 @@ msgstr ""
 msgid "Retry to connect"
 msgstr "Kapcsolódási kísérlet ismétlése"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:146
+#: libraries/plugins/auth/AuthenticationCookie.class.php:134
 msgid "Your session has expired. Please log in again."
 msgstr "Lejárt a munkamenet. Lépjen be újra."
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:170
+#: libraries/plugins/auth/AuthenticationCookie.class.php:158
 msgid "Log in"
 msgstr "Belépés"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:178
-#: libraries/plugins/auth/AuthenticationCookie.class.php:188
+#: libraries/plugins/auth/AuthenticationCookie.class.php:166
+#: libraries/plugins/auth/AuthenticationCookie.class.php:176
 msgid "You can enter hostname/IP address and port separated by space."
 msgstr ""
 "Az állomásnevet/IP-címet és a port számát szóközzel elválasztva írhatja be."
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:193
+#: libraries/plugins/auth/AuthenticationCookie.class.php:181
 msgid "Username:"
 msgstr "Felhasználónév:"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:205
+#: libraries/plugins/auth/AuthenticationCookie.class.php:193
 msgid "Server Choice:"
 msgstr "Szerver választása:"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:386
+#: libraries/plugins/auth/AuthenticationCookie.class.php:374
 msgid "Entered captcha is wrong, try again!"
 msgstr "A megadott captcha helytelen, próbálja újra!"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:396
+#: libraries/plugins/auth/AuthenticationCookie.class.php:384
 msgid "Please enter correct captcha!"
 msgstr "Adja meg a helyes captchat!"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:423
+#: libraries/plugins/auth/AuthenticationCookie.class.php:411
 msgid "You are not allowed to log in to this MySQL server!"
 msgstr "Önnek nem engedélyezett a bejelentkezés erre a MySQL kiszolgálóra!"
 
@@ -10376,7 +10394,7 @@ msgstr "Esemény"
 #: libraries/plugins/export/ExportOdt.class.php:593
 #: libraries/plugins/export/ExportTexytext.class.php:428
 #: libraries/plugins/export/PMA_ExportPdf.class.php:313
-#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:984
 #: libraries/rte/rte_triggers.lib.php:377
 msgid "Definition"
 msgstr "Meghatározás"
@@ -10697,7 +10715,7 @@ msgid "Last check:"
 msgstr "Utolsó ellenőrzés:"
 
 #: libraries/plugins/export/ExportSql.class.php:1399
-#: templates/structure/structure_table_row.phtml:183
+#: templates/database/structure/structure_table_row.phtml:183
 msgid "in use"
 msgstr "használatban"
 
@@ -10892,18 +10910,14 @@ msgstr "A MySQL térbeli kiterjesztése nem támogatja az ESRI típust: \"%s\"."
 msgid "The imported file does not contain any data!"
 msgstr "Az importált fájl nem tartalmaz semmilyen adatot!"
 
-#: libraries/plugins/import/ImportSql.class.php:169
+#: libraries/plugins/import/ImportSql.class.php:72
 msgid "SQL compatibility mode:"
 msgstr "SQL kompatibilitási mód:"
 
-#: libraries/plugins/import/ImportSql.class.php:181
+#: libraries/plugins/import/ImportSql.class.php:84
 msgid "Do not use <code>AUTO_INCREMENT</code> for zero values"
 msgstr "Ne használja az <code>AUTO_INCREMENT</code>-et nulla értékekhez"
 
-#: libraries/plugins/import/ImportSql.class.php:195
-msgid "Read as multibytes"
-msgstr "Olvasás multibájtként"
-
 #: libraries/plugins/import/ImportXml.class.php:54
 msgid "XML"
 msgstr "XML"
@@ -10946,7 +10960,7 @@ msgid "Show grid"
 msgstr "Rács megjelenítése"
 
 #: libraries/plugins/schema/SchemaPdf.class.php:94
-#: templates/structure/print_view_data_dictionary_link.phtml:6
+#: templates/database/structure/print_view_data_dictionary_link.phtml:6
 msgid "Data Dictionary"
 msgstr "Adat szótár"
 
@@ -10971,7 +10985,7 @@ msgid "The %s table doesn't exist!"
 msgstr "A(z) %s tábla nem létezik!"
 
 #: libraries/plugins/schema/eps/Eps_Relation_Schema.class.php:321
-#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:309
+#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:323
 #, php-format
 msgid "Schema of the %s database - Page %s"
 msgstr "A(z) \"%s\" adatbázis sémája - %s. oldal"
@@ -10997,7 +11011,7 @@ msgstr "Tartalomjegyzék"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1005
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1028
 #: libraries/tracking.lib.php:884
-#: templates/structure/table_structure_header.phtml:11
+#: templates/table/structure/table_structure_header.phtml:11
 msgid "Extra"
 msgstr "Extra"
 
@@ -11368,12 +11382,12 @@ msgid "Create the needed tables with the <code>%screate_tables.sql</code>."
 msgstr ""
 "Hozza létre a szükséges táblákat a <code>%screate_tables.sql</code> fájllal."
 
-#: libraries/relation.lib.php:360
+#: libraries/relation.lib.php:357
 msgid "Create a pma user and give access to these tables."
 msgstr ""
 "Hozzon létre egy pma felhasználót és adjon hozzáférést ezekhez a táblákhoz."
 
-#: libraries/relation.lib.php:365
+#: libraries/relation.lib.php:360
 msgid ""
 "Enable advanced features in configuration file (<code>config.inc.php</"
 "code>), for example by starting from <code>config.sample.inc.php</code>."
@@ -11381,16 +11395,16 @@ msgstr ""
 "Engedélyezze a haladó funkciókat a beállító fájlban (<code>config.inc.php</"
 "code>), például induljon ki a <code>config.sample.inc.php</code> fájlból."
 
-#: libraries/relation.lib.php:373
+#: libraries/relation.lib.php:365
 msgid "Re-login to phpMyAdmin to load the updated configuration file."
 msgstr ""
 "Jelentkezzen be újra a phpMyAdminba a frissített beállítófájl betöltéséhez."
 
-#: libraries/relation.lib.php:1612
+#: libraries/relation.lib.php:1607
 msgid "no description"
 msgstr "nincs leírás"
 
-#: libraries/relation.lib.php:1811
+#: libraries/relation.lib.php:1806
 msgid ""
 "You do not have necessary privileges to create a database named "
 "'phpmyadmin'. You may go to 'Operations' tab of any database to set up the "
@@ -11400,7 +11414,7 @@ msgstr ""
 "adatbázis létrehozásához. El kellene mennie bármelyik adatbázis „Műveletek” "
 "lapjára, hogy ott beállítsa a phpMyAdmin beállítástárolóját."
 
-#: libraries/relation.lib.php:1928
+#: libraries/relation.lib.php:1923
 #, php-format
 msgid ""
 "%sCreate%s a database named 'phpmyadmin' and setup the phpMyAdmin "
@@ -11409,19 +11423,19 @@ msgstr ""
 "%sHozzon létre%s egy „phpmyadmin” nevű adatbázist, és állítsa be ott a "
 "phpMyAdmin beállítástárolóját."
 
-#: libraries/relation.lib.php:1936
+#: libraries/relation.lib.php:1931
 #, php-format
 msgid ""
 "%sCreate%s the phpMyAdmin configuration storage in the current database."
 msgstr "A phpMyAdmin beállítástároló %slétrehozása%s a jelenlegi adatbázisban."
 
-#: libraries/relation.lib.php:1944
+#: libraries/relation.lib.php:1939
 #, php-format
 msgid "%sCreate%s missing phpMyAdmin configuration storage tables."
 msgstr "Hiányzó phpMyAdmin beállítástároló táblák %slétrehozása%s."
 
 #: libraries/replication_gui.lib.php:46 libraries/replication_gui.lib.php:343
-#: libraries/server_databases.lib.php:387
+#: libraries/server_databases.lib.php:398
 msgid "Master replication"
 msgstr "Mester replikáció"
 
@@ -11487,7 +11501,7 @@ msgstr ""
 "<b>van</b> beállítva."
 
 #: libraries/replication_gui.lib.php:141
-#: libraries/server_databases.lib.php:389
+#: libraries/server_databases.lib.php:400
 msgid "Slave replication"
 msgstr "Szolga replikáció"
 
@@ -11762,10 +11776,10 @@ msgid "Master server changed successfully to %s."
 msgstr "A mesterkiszolgáló sikeresen módosítva erre: %s."
 
 #: libraries/rte/rte_events.lib.php:106 libraries/rte/rte_events.lib.php:115
-#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:149
-#: libraries/rte/rte_routines.lib.php:158
-#: libraries/rte/rte_routines.lib.php:231
-#: libraries/rte/rte_routines.lib.php:1362
+#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:219
+#: libraries/rte/rte_routines.lib.php:246
+#: libraries/rte/rte_routines.lib.php:368
+#: libraries/rte/rte_routines.lib.php:1453
 #: libraries/rte/rte_triggers.lib.php:82 libraries/rte/rte_triggers.lib.php:91
 #: libraries/rte/rte_triggers.lib.php:123
 #, php-format
@@ -11786,7 +11800,7 @@ msgstr "A(z) %1$s esemény módosult."
 msgid "Event %1$s has been created."
 msgstr "A(z) %1$s esemény létrejött."
 
-#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:251
+#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:266
 #: libraries/rte/rte_triggers.lib.php:144
 msgid "One or more errors have occurred while processing your request:"
 msgstr "Egy vagy több hiba történt a kérés feldolgozása közben:"
@@ -11795,7 +11809,7 @@ msgstr "Egy vagy több hiba történt a kérés feldolgozása közben:"
 msgid "Edit event"
 msgstr "Esemény módosítása"
 
-#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:794
+#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:885
 #: libraries/rte/rte_triggers.lib.php:323 view_create.php:180
 msgid "Details"
 msgstr "Részletek"
@@ -11808,7 +11822,7 @@ msgstr "Eseménynév"
 msgid "Event type"
 msgstr "Esemény típusa"
 
-#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:817
+#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:908
 #, php-format
 msgid "Change to %s"
 msgstr "Módosítás erre: %s"
@@ -11835,12 +11849,14 @@ msgstr "Vége"
 msgid "On completion preserve"
 msgstr "befejezés során megőrzés"
 
-#: libraries/rte/rte_events.lib.php:491 libraries/rte/rte_routines.lib.php:930
+#: libraries/rte/rte_events.lib.php:491
+#: libraries/rte/rte_routines.lib.php:1021
 #: libraries/rte/rte_triggers.lib.php:383 view_create.php:209
 msgid "Definer"
 msgstr "Meghatározó"
 
-#: libraries/rte/rte_events.lib.php:535 libraries/rte/rte_routines.lib.php:997
+#: libraries/rte/rte_events.lib.php:535
+#: libraries/rte/rte_routines.lib.php:1088
 #: libraries/rte/rte_triggers.lib.php:422
 msgid "The definer must be in the \"username@hostname\" format!"
 msgstr "A meghatározónak „felhasznalonev@gepnev” formátumban kell lennie!"
@@ -11866,9 +11882,9 @@ msgid "You must provide an event definition."
 msgstr "Meg kell adnia egy eseménymeghatározást."
 
 #: libraries/rte/rte_export.lib.php:43 libraries/rte/rte_general.lib.php:72
-#: libraries/rte/rte_routines.lib.php:345
-#: libraries/rte/rte_routines.lib.php:1198
-#: libraries/rte/rte_routines.lib.php:1411
+#: libraries/rte/rte_routines.lib.php:153
+#: libraries/rte/rte_routines.lib.php:1289
+#: libraries/rte/rte_routines.lib.php:1502
 msgid "Error in processing request:"
 msgstr "Hiba a kérés feldolgozásában:"
 
@@ -11904,73 +11920,73 @@ msgstr ""
 "sikertelen lehet![/strong] Kérjük, használja a fejlettebb 'mysqli' "
 "kiterjesztést a problémák elkerülése érdekében."
 
-#: libraries/rte/rte_routines.lib.php:110
-#: libraries/rte/rte_routines.lib.php:1006
+#: libraries/rte/rte_routines.lib.php:123
+msgid "Edit routine"
+msgstr "Eljárás szerkesztése"
+
+#: libraries/rte/rte_routines.lib.php:200
+#: libraries/rte/rte_routines.lib.php:1097
 #, php-format
 msgid "Invalid routine type: \"%s\""
 msgstr "Érvénytelen eljárástípus: \"%s\""
 
-#: libraries/rte/rte_routines.lib.php:170
+#: libraries/rte/rte_routines.lib.php:253
+#, php-format
+msgid "Routine %1$s has been created."
+msgstr "A(z) %1$s eljárás létrejött."
+
+#: libraries/rte/rte_routines.lib.php:380
 msgid "Sorry, we failed to restore the dropped routine."
 msgstr "Elnézést, nem sikerült visszaállítani az eldobott eljárást."
 
-#: libraries/rte/rte_routines.lib.php:211
+#: libraries/rte/rte_routines.lib.php:439
 #, php-format
 msgid "Routine %1$s has been modified. Privileges have been adjusted."
 msgstr ""
 "A(z) %1$s eljárás módosítása megtörtént. A jogosultságok módosítva lettek."
 
-#: libraries/rte/rte_routines.lib.php:216
+#: libraries/rte/rte_routines.lib.php:444
 #, php-format
 msgid "Routine %1$s has been modified."
 msgstr "A(z) %1$s eljárás módosítása megtörtént."
 
-#: libraries/rte/rte_routines.lib.php:238
-#, php-format
-msgid "Routine %1$s has been created."
-msgstr "A(z) %1$s eljárás létrejött."
-
-#: libraries/rte/rte_routines.lib.php:315
-msgid "Edit routine"
-msgstr "Eljárás szerkesztése"
-
-#: libraries/rte/rte_routines.lib.php:797
+#: libraries/rte/rte_routines.lib.php:888
 msgid "Routine name"
 msgstr "Eljárás neve"
 
-#: libraries/rte/rte_routines.lib.php:823
+#: libraries/rte/rte_routines.lib.php:914
 msgid "Parameters"
 msgstr "Paraméterek"
 
-#: libraries/rte/rte_routines.lib.php:829
+#: libraries/rte/rte_routines.lib.php:920
 msgid "Direction"
 msgstr "Irány"
 
-#: libraries/rte/rte_routines.lib.php:847
+#: libraries/rte/rte_routines.lib.php:938
 msgid "Add parameter"
 msgstr "Paraméter hozzáadása"
 
-#: libraries/rte/rte_routines.lib.php:851
+#: libraries/rte/rte_routines.lib.php:942
 msgid "Remove last parameter"
 msgstr "Utolsó paraméter eltávolítása"
 
-#: libraries/rte/rte_routines.lib.php:856
+#: libraries/rte/rte_routines.lib.php:947
 msgid "Return type"
 msgstr "Típus visszaadása"
 
-#: libraries/rte/rte_routines.lib.php:862
+#: libraries/rte/rte_routines.lib.php:953
 msgid "Return length/values"
 msgstr "Hossz/Értékek visszaadása"
 
-#: libraries/rte/rte_routines.lib.php:868
+#: libraries/rte/rte_routines.lib.php:959
 msgid "Return options"
 msgstr "Visszatérés beállításai"
 
-#: libraries/rte/rte_routines.lib.php:899
+#: libraries/rte/rte_routines.lib.php:990
 msgid "Is deterministic"
 msgstr "Determinisztikus"
 
-#: libraries/rte/rte_routines.lib.php:920
+#: libraries/rte/rte_routines.lib.php:1011
 msgid ""
 "You do not have sufficient privileges to perform this operation; Please "
 "refer to the documentation for more details"
@@ -11978,25 +11994,25 @@ msgstr ""
 "Nincs elegendő jogosultsága a művelet végrehajtásához. További részletekért "
 "nézze meg a dokumentációt"
 
-#: libraries/rte/rte_routines.lib.php:935
+#: libraries/rte/rte_routines.lib.php:1026
 msgid "Security type"
 msgstr "Biztonság típusa"
 
-#: libraries/rte/rte_routines.lib.php:944
+#: libraries/rte/rte_routines.lib.php:1035
 msgid "SQL data access"
 msgstr "SQL-adathozzáférés"
 
-#: libraries/rte/rte_routines.lib.php:1013
+#: libraries/rte/rte_routines.lib.php:1104
 msgid "You must provide a routine name!"
 msgstr "Meg kell adnia egy eljárásnevet!"
 
-#: libraries/rte/rte_routines.lib.php:1047
+#: libraries/rte/rte_routines.lib.php:1138
 #, php-format
 msgid "Invalid direction \"%s\" given for parameter."
 msgstr "Érvénytelen rendezés lett a paraméternek adva: \"%s\"."
 
-#: libraries/rte/rte_routines.lib.php:1069
-#: libraries/rte/rte_routines.lib.php:1131
+#: libraries/rte/rte_routines.lib.php:1160
+#: libraries/rte/rte_routines.lib.php:1222
 msgid ""
 "You must provide length/values for routine parameters of type ENUM, SET, "
 "VARCHAR and VARBINARY."
@@ -12004,37 +12020,37 @@ msgstr ""
 "Meg kell adnia hosszat/értékeket az ENUM, SET, VARCHAR és VARBINARY rutin "
 "paramétereihez."
 
-#: libraries/rte/rte_routines.lib.php:1095
+#: libraries/rte/rte_routines.lib.php:1186
 msgid "You must provide a name and a type for each routine parameter."
 msgstr "Meg kell adnia egy nevet és egy típust minden rutin paraméterhez."
 
-#: libraries/rte/rte_routines.lib.php:1114
+#: libraries/rte/rte_routines.lib.php:1205
 msgid "You must provide a valid return type for the routine."
 msgstr "Meg kell adnia egy érvényes visszatérési típust a rutinhoz."
 
-#: libraries/rte/rte_routines.lib.php:1174
+#: libraries/rte/rte_routines.lib.php:1265
 msgid "You must provide a routine definition."
 msgstr "Meg kell adnia a rutin leírását."
 
-#: libraries/rte/rte_routines.lib.php:1285
+#: libraries/rte/rte_routines.lib.php:1376
 #, php-format
 msgid "Execution results of routine %s"
 msgstr "A(z) %s eljárás végrehajtási eredményei"
 
-#: libraries/rte/rte_routines.lib.php:1340
+#: libraries/rte/rte_routines.lib.php:1431
 #, php-format
 msgid "%d row affected by the last statement inside the procedure."
 msgid_plural "%d rows affected by the last statement inside the procedure."
 msgstr[0] "Az eljáráson belüli utolsó utasítás %d sort érintett."
 msgstr[1] "Az eljáráson belüli utolsó utasítás %d sort érintett."
 
-#: libraries/rte/rte_routines.lib.php:1398
-#: libraries/rte/rte_routines.lib.php:1406
+#: libraries/rte/rte_routines.lib.php:1489
+#: libraries/rte/rte_routines.lib.php:1497
 msgid "Execute routine"
 msgstr "Eljárás végrehajtása"
 
-#: libraries/rte/rte_routines.lib.php:1485
-#: libraries/rte/rte_routines.lib.php:1488
+#: libraries/rte/rte_routines.lib.php:1576
+#: libraries/rte/rte_routines.lib.php:1579
 msgid "Routine parameters"
 msgstr "Eljárás paraméterei"
 
@@ -12188,7 +12204,7 @@ msgid "Original position"
 msgstr "Eredeti pozíció"
 
 #: libraries/server_bin_log.lib.php:133
-#: templates/structure/display_table_stats.phtml:4
+#: templates/table/structure/display_table_stats.phtml:4
 msgid "Information"
 msgstr "Információ"
 
@@ -12226,12 +12242,12 @@ msgstr ""
 "Megjegyzés: az adatbázis-statisztika engedélyezése a webszerver és a MySQL "
 "közti nagy adatforgalomhoz vezethet."
 
-#: libraries/server_databases.lib.php:364
-#: libraries/server_databases.lib.php:365
+#: libraries/server_databases.lib.php:366
+#: libraries/server_databases.lib.php:371
 msgid "Enable Statistics"
 msgstr "Statisztika engedélyezése"
 
-#: libraries/server_databases.lib.php:481
+#: libraries/server_databases.lib.php:492
 #, php-format
 msgid "%1$d database has been dropped successfully."
 msgid_plural "%1$d databases have been dropped successfully."
@@ -12612,7 +12628,7 @@ msgid "You have revoked the privileges for %s."
 msgstr "%s jogainak visszavonása megtörtént."
 
 #: libraries/server_privileges.lib.php:2059
-#: libraries/server_privileges.lib.php:4290
+#: libraries/server_privileges.lib.php:4316
 msgid "Add user account"
 msgstr "Felhasználói fiók hozzáadása"
 
@@ -12778,36 +12794,36 @@ msgstr "%s törlése"
 msgid "The privileges were reloaded successfully."
 msgstr "A jogok újratöltése sikerült."
 
-#: libraries/server_privileges.lib.php:3994
+#: libraries/server_privileges.lib.php:4003
 #, php-format
 msgid "The user %s already exists!"
 msgstr "%s felhasználó már létezik!"
 
-#: libraries/server_privileges.lib.php:4232
+#: libraries/server_privileges.lib.php:4258
 #, php-format
 msgid "Privileges for %s"
 msgstr "%s jogosultságai"
 
-#: libraries/server_privileges.lib.php:4241
+#: libraries/server_privileges.lib.php:4267
 #: libraries/server_status_processes.lib.php:72
 #: libraries/server_user_groups.lib.php:39
 msgid "User"
 msgstr "Felhasználó"
 
-#: libraries/server_privileges.lib.php:4282
+#: libraries/server_privileges.lib.php:4308
 msgctxt "Create new user"
 msgid "New"
 msgstr "új"
 
-#: libraries/server_privileges.lib.php:4311
+#: libraries/server_privileges.lib.php:4337
 msgid "Edit privileges:"
 msgstr "Jogok szerkesztése:"
 
-#: libraries/server_privileges.lib.php:4312
+#: libraries/server_privileges.lib.php:4338
 msgid "User account"
 msgstr "Felhasználói fiók"
 
-#: libraries/server_privileges.lib.php:4371
+#: libraries/server_privileges.lib.php:4397
 msgid ""
 "Note: You are attempting to edit privileges of the user with which you are "
 "currently logged in."
@@ -12815,11 +12831,11 @@ msgstr ""
 "Megjegyzés: annak a felhasználónak a jogosultságait próbálja szerkeszteni, "
 "amellyel jelenleg be van lépve."
 
-#: libraries/server_privileges.lib.php:4391 libraries/server_users.lib.php:25
+#: libraries/server_privileges.lib.php:4417 libraries/server_users.lib.php:25
 msgid "User accounts overview"
 msgstr "Felhasználói fiókok áttekintése"
 
-#: libraries/server_privileges.lib.php:4459
+#: libraries/server_privileges.lib.php:4485
 msgid ""
 "A user account allowing any user from localhost to connect is present. This "
 "will prevent other users from connecting if the host part of their account "
@@ -12830,7 +12846,7 @@ msgstr ""
 "kapcsolódását, ha a fiókjuk gép része lehetővé tesz egy kapcsolatot bármely "
 "(%) gépről."
 
-#: libraries/server_privileges.lib.php:4500
+#: libraries/server_privileges.lib.php:4526
 #, php-format
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
@@ -12843,7 +12859,7 @@ msgstr ""
 "használt jogoktól, ha a módosításuk kézzel történt. Ebben az esetben "
 "%stöltse be újra a jogokat%s a folytatás előtt."
 
-#: libraries/server_privileges.lib.php:4519
+#: libraries/server_privileges.lib.php:4545
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
 "tables. The content of these tables may differ from the privileges the "
@@ -12856,25 +12872,25 @@ msgstr ""
 "által használt jogoktól, ha a módosításuk kézzel történt. Ebben az esetben a "
 "jogokat újra kell tölteni, de jelenleg nincs RELOAD joga."
 
-#: libraries/server_privileges.lib.php:4569
+#: libraries/server_privileges.lib.php:4595
 msgid "The selected user was not found in the privilege table."
 msgstr "Nem található a kiválasztott felhasználó a privilégium táblában."
 
-#: libraries/server_privileges.lib.php:4801
+#: libraries/server_privileges.lib.php:4827
 msgid "You have added a new user."
 msgstr "Az új felhasználó hozzáadása megtörtént."
 
-#: libraries/server_status.lib.php:53
+#: libraries/server_status.lib.php:60
 #, php-format
 msgid "Network traffic since startup: %s"
 msgstr "Hálózati forgalom az indítás óta: %s"
 
-#: libraries/server_status.lib.php:66
+#: libraries/server_status.lib.php:73
 #, php-format
 msgid "This MySQL server has been running for %1$s. It started up on %2$s."
 msgstr "Ez a MySQL szerver %1$s óta fut. Indítás időpontja: %2$s."
 
-#: libraries/server_status.lib.php:80
+#: libraries/server_status.lib.php:94
 msgid ""
 "This MySQL server works as <b>master</b> and <b>slave</b> in <b>replication</"
 "b> process."
@@ -12882,23 +12898,23 @@ msgstr ""
 "Ezt a MySQL kiszolgáló <b>mester</b> és <b>szolga</b> módban működik a "
 "<b>többszörözési</b> folyamatban."
 
-#: libraries/server_status.lib.php:85
+#: libraries/server_status.lib.php:99
 msgid "This MySQL server works as <b>master</b> in <b>replication</b> process."
 msgstr ""
 "Ez a MySQL kiszolgáló <b>mesterként</b> működik a <b>többszörözési</b> "
 "folyamatban."
 
-#: libraries/server_status.lib.php:90
+#: libraries/server_status.lib.php:104
 msgid "This MySQL server works as <b>slave</b> in <b>replication</b> process."
 msgstr ""
 "Ez a MySQL kiszolgáló <b>szolgaként</b> működik a <b>többszörözési</b> "
 "folyamatban."
 
-#: libraries/server_status.lib.php:106
+#: libraries/server_status.lib.php:116
 msgid "Replication status"
 msgstr "Többszörözés állapota"
 
-#: libraries/server_status.lib.php:137
+#: libraries/server_status.lib.php:146
 msgid ""
 "On a busy server, the byte counters may overrun, so those statistics as "
 "reported by the MySQL server may be incorrect."
@@ -12906,19 +12922,19 @@ msgstr ""
 "Foglalt szerveren túlfuthatnak a bájtszámlálók, ezért a MySQL által "
 "jelentett statisztikák pontatlanok lehetnek."
 
-#: libraries/server_status.lib.php:148
+#: libraries/server_status.lib.php:157
 msgid "Received"
 msgstr "Fogadott"
 
-#: libraries/server_status.lib.php:167
+#: libraries/server_status.lib.php:176
 msgid "Sent"
 msgstr "Küldött"
 
-#: libraries/server_status.lib.php:234
+#: libraries/server_status.lib.php:243
 msgid "Max. concurrent connections"
 msgstr "Max. egyidejű kapcsolatok"
 
-#: libraries/server_status.lib.php:244
+#: libraries/server_status.lib.php:253
 msgid "Failed attempts"
 msgstr "Sikertelen próbák"
 
@@ -13998,7 +14014,7 @@ msgstr "Ez egy csak olvasható változó és nem szerkeszthető"
 msgid "Not implemented yet."
 msgstr "Még nincs megvalósítva."
 
-#: libraries/sql-parser/src/Components/AlterOperation.php:193
+#: libraries/sql-parser/src/Components/AlterOperation.php:191
 msgid "Unrecognized alter operation."
 msgstr "Felismerhetetlen módosítás művelet."
 
@@ -14012,7 +14028,7 @@ msgid "An opening bracket followed by a set of values was expected."
 msgstr ""
 
 #: libraries/sql-parser/src/Components/ArrayObj.php:101
-#: libraries/sql-parser/src/Components/FieldDefinition.php:202
+#: libraries/sql-parser/src/Components/CreateDefinition.php:202
 msgid "An opening bracket was expected."
 msgstr ""
 
@@ -14020,25 +14036,35 @@ msgstr ""
 msgid "A comma or a closing bracket was expected"
 msgstr ""
 
+#: libraries/sql-parser/src/Components/CreateDefinition.php:246
+#, fuzzy
+#| msgid "No tables selected."
+msgid "A comma or a closing bracket was expected."
+msgstr "Nincsenek táblák kiválasztva."
+
+#: libraries/sql-parser/src/Components/CreateDefinition.php:262
+msgid "A closing bracket was expected."
+msgstr ""
+
 #: libraries/sql-parser/src/Components/DataType.php:125
 msgid "Unrecognized data type."
 msgstr "Felismerhetetlen adattípus."
 
-#: libraries/sql-parser/src/Components/Expression.php:225
+#: libraries/sql-parser/src/Components/Expression.php:227
 msgid "Unexpected closing bracket."
 msgstr "Váratlan lezáró zárójel."
 
-#: libraries/sql-parser/src/Components/Expression.php:246
-#: libraries/sql-parser/src/Components/Expression.php:283
-#: libraries/sql-parser/src/Components/Expression.php:303
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:285
+#: libraries/sql-parser/src/Components/Expression.php:305
 msgid "An alias was previously found."
 msgstr "Egy álnév korábban már megtalálva."
 
-#: libraries/sql-parser/src/Components/Expression.php:257
+#: libraries/sql-parser/src/Components/Expression.php:259
 msgid "Unexpected dot."
 msgstr "Váratlan pont."
 
-#: libraries/sql-parser/src/Components/Expression.php:327
+#: libraries/sql-parser/src/Components/Expression.php:329
 #, fuzzy
 #| msgid "No tables selected."
 msgid "An alias was expected."
@@ -14050,16 +14076,6 @@ msgstr "Nincsenek táblák kiválasztva."
 msgid "An expression was expected."
 msgstr "Nincsenek verziók kijelölve."
 
-#: libraries/sql-parser/src/Components/FieldDefinition.php:246
-#, fuzzy
-#| msgid "No tables selected."
-msgid "A comma or a closing bracket was expected."
-msgstr "Nincsenek táblák kiválasztva."
-
-#: libraries/sql-parser/src/Components/FieldDefinition.php:262
-msgid "A closing bracket was expected."
-msgstr ""
-
 #: libraries/sql-parser/src/Components/Limit.php:90
 #: libraries/sql-parser/src/Components/Limit.php:112
 msgid "An offset was expected."
@@ -14105,29 +14121,29 @@ msgstr ""
 msgid "Expected delimiter."
 msgstr ""
 
-#: libraries/sql-parser/src/Lexer.php:753
+#: libraries/sql-parser/src/Lexer.php:777
 #, fuzzy, php-format
 #| msgid "Event %1$s has been created."
 msgid "Ending quote %1$s was expected."
 msgstr "A(z) %1$s esemény létrejött."
 
-#: libraries/sql-parser/src/Lexer.php:789
+#: libraries/sql-parser/src/Lexer.php:813
 #, fuzzy
 #| msgid "Table name template"
 msgid "Variable name was expected."
 msgstr "Táblanév sablon"
 
-#: libraries/sql-parser/src/Parser.php:380
+#: libraries/sql-parser/src/Parser.php:391
 #, fuzzy
 #| msgid "at beginning of table"
 msgid "Unexpected beginning of statement."
 msgstr "a tábla elejénél"
 
-#: libraries/sql-parser/src/Parser.php:399
+#: libraries/sql-parser/src/Parser.php:410
 msgid "Unrecognized statement type."
 msgstr "Felismerhetetlen utasítástípus."
 
-#: libraries/sql-parser/src/Parser.php:479
+#: libraries/sql-parser/src/Parser.php:489
 msgid "No transaction was previously started."
 msgstr "Nem volt korábban elindított tranzakció."
 
@@ -14159,8 +14175,10 @@ msgid "The name of the entity was expected."
 msgstr "A megnyitott táblák száma."
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:310
-msgid "At least one field definition was expected."
-msgstr ""
+#, fuzzy
+#| msgid "Template was deleted."
+msgid "At least one column definition was expected."
+msgstr "A sablon törölve lett."
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:329
 msgid "A \"RETURNS\" keyword was expected."
@@ -14222,11 +14240,11 @@ msgid "Using bookmark \"%s\" as default browse query."
 msgstr ""
 "A(z) „%s” könyvjelző használata alapértelmezett tallózás lekérdezésként."
 
-#: libraries/sql.lib.php:1306
+#: libraries/sql.lib.php:1300
 msgid "Showing as PHP code"
 msgstr "Megjelenítés PHP kódként"
 
-#: libraries/sql.lib.php:1638
+#: libraries/sql.lib.php:1632
 #, php-format
 msgid ""
 "Current selection does not contain a unique column. Grid edit, checkbox, "
@@ -14235,7 +14253,7 @@ msgstr ""
 "A jelenlegi kijelölés nem tartalmaz egyedi oszlopot. A Rács szerkesztése, "
 "jelölőnégyzet, Szerkesztés, Másolás és Törlés funkciók nem érhetők el. %s"
 
-#: libraries/sql.lib.php:1649
+#: libraries/sql.lib.php:1643
 #, php-format
 msgid ""
 "Current selection does not contain a unique column. Grid edit, Edit, Copy "
@@ -14245,7 +14263,7 @@ msgstr ""
 "Szerkesztés, Másolás és Törlés funkciók nem kívánatos viselkedést "
 "eredményezhetnek. %s"
 
-#: libraries/sql.lib.php:1688
+#: libraries/sql.lib.php:1682
 #, php-format
 msgid "Problems with indexes of table `%s`"
 msgstr "Probléma a(z) `%s` tábla indexeivel"
@@ -14401,7 +14419,7 @@ msgid "Version %s snapshot (SQL code)"
 msgstr "%s verzió pillanatfelvételre (SQL kód)"
 
 #: libraries/tracking.lib.php:947
-#: templates/structure/table_structure_row.phtml:33
+#: templates/table/structure/table_structure_row.phtml:33
 msgctxt "None for default"
 msgid "None"
 msgstr "Nincs"
@@ -14456,15 +14474,15 @@ msgstr "%1$s / %2$s verzió törölve lett."
 msgid "Version %1$s was created, tracking for %2$s is active."
 msgstr "%1$s verzió létrejött, a %2$s nyomonkövetése aktív."
 
-#: libraries/user_preferences.inc.php:29
+#: libraries/user_preferences.inc.php:30
 msgid "Manage your settings"
 msgstr "Beállítások kezelése"
 
-#: libraries/user_preferences.inc.php:46 prefs_manage.php:307
+#: libraries/user_preferences.inc.php:54 prefs_manage.php:307
 msgid "Configuration has been saved."
 msgstr "A módosítások mentése megtörtént."
 
-#: libraries/user_preferences.inc.php:66
+#: libraries/user_preferences.inc.php:74
 #, php-format
 msgid ""
 "Your preferences will be saved for current session only. Storing them "
@@ -14862,7 +14880,7 @@ msgid "first"
 msgstr "első"
 
 #: templates/columns_definitions/move_column.phtml:12
-#: templates/structure/add_column.phtml:21
+#: templates/table/structure/add_column.phtml:21
 #, php-format
 msgid "after %s"
 msgstr "%s után"
@@ -14931,197 +14949,292 @@ msgstr "Bemenet átalakítás"
 msgid "Input transformation options"
 msgstr "Bemenet átalakítás beállításai"
 
-#: templates/designer/aggregate_query_panel.phtml:22
-#: templates/designer/options_panel.phtml:100
-msgid "Aggregate"
-msgstr "Összegzés"
-
-#: templates/designer/aggregate_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:61
-#: templates/designer/options_panel.phtml:106
-#: templates/designer/options_panel.phtml:170
-#: templates/designer/where_query_panel.phtml:30
-#: templates/table/table_header.phtml:9
-msgid "Operator"
-msgstr "Operátor"
-
-#: templates/designer/database_tables.phtml:29
-msgid "Toggle"
-msgstr "Átváltás"
-
-#: templates/designer/database_tables.phtml:40
-msgid "See table structure"
-msgstr "Táblaszerkezet megtekintése"
-
-#: templates/designer/delete_relation_panel.phtml:21
-msgid "Delete relation"
-msgstr "Kapcsolat törlése"
-
-#: templates/designer/edit_delete_pages.phtml:7
-msgid "Page to open"
-msgstr "A megnyitandó oldal"
-
-#: templates/designer/edit_delete_pages.phtml:7
-msgid "Page to delete"
-msgstr "A törlendő oldal"
-
-#: templates/designer/having_query_panel.phtml:90
-#: templates/designer/options_panel.phtml:63
-#: templates/designer/options_panel.phtml:229
-#: templates/designer/where_query_panel.phtml:59
-msgid "Except"
-msgstr "kivéve"
-
-#: templates/designer/having_query_panel.phtml:102
-#: templates/designer/options_panel.phtml:75
-#: templates/designer/options_panel.phtml:241
-#: templates/designer/where_query_panel.phtml:71
-msgid "subquery"
-msgstr "allekérdezés"
-
-#: templates/designer/new_relation_panel.phtml:22
-#: templates/designer/side_menu.phtml:84 templates/designer/side_menu.phtml:87
-msgid "Create relation"
-msgstr "Kapcsolat létrehozása"
-
-#: templates/designer/options_panel.phtml:34
-#: templates/designer/options_panel.phtml:200
-msgid "Relation operator"
-msgstr "Kapcsolat operátor"
-
-#: templates/designer/options_panel.phtml:85
-#: templates/designer/rename_to_panel.phtml:23
-msgid "Rename to"
-msgstr "Átnevezés"
-
-#: templates/designer/options_panel.phtml:91
-#: templates/designer/rename_to_panel.phtml:31
-msgid "New name"
-msgstr "Új név"
-
-#: templates/designer/page_save_as.phtml:4
-msgid "Save to selected page"
-msgstr "Mentés a kiválasztott oldalra"
-
-#: templates/designer/page_save_as.phtml:5
-msgid "Create a page and save to it"
-msgstr "Oldal létrehozása és mentés arra"
-
-#: templates/designer/page_save_as.phtml:26
-msgid "New page name"
-msgstr "Új oldal neve"
-
-#: templates/designer/page_selector.phtml:2
-msgid "Select page"
-msgstr "Oldal kiválasztása"
-
-#: templates/designer/query_details.phtml:10
-msgid "Active options"
-msgstr "Aktív beállítások"
-
-#: templates/designer/schema_export.phtml:4
-msgid "Select Export Relational Type"
-msgstr "Export relációs típusának kiválasztása"
-
-#: templates/designer/side_menu.phtml:19 templates/designer/side_menu.phtml:25
-msgid "Show/Hide tables list"
-msgstr "Táblák listájának megjelenítése vagy elrejtése"
-
-#: templates/designer/side_menu.phtml:29 templates/designer/side_menu.phtml:35
-#: templates/designer/side_menu.phtml:36
-msgid "View in fullscreen"
-msgstr "Teljes képernyős megjelenítés"
-
-#: templates/designer/side_menu.phtml:34
-msgid "Exit fullscreen"
-msgstr "Kilépés a teljes képernyő módból"
-
-#: templates/designer/side_menu.phtml:41 templates/designer/side_menu.phtml:45
-msgid "New page"
-msgstr "Új oldal"
-
-#: templates/designer/side_menu.phtml:70 templates/designer/side_menu.phtml:73
-msgid "Delete pages"
-msgstr "Oldalak törlése"
-
-#: templates/designer/side_menu.phtml:77 templates/designer/side_menu.phtml:80
-#: templates/table/create_table.phtml:7
+#: templates/database/create_table.phtml:7
+#: templates/database/designer/side_menu.phtml:77
+#: templates/database/designer/side_menu.phtml:80
 msgid "Create table"
 msgstr "Tábla létrehozása"
 
-#: templates/designer/side_menu.phtml:98
-#: templates/designer/side_menu.phtml:101
+#: templates/database/create_table.phtml:15
+msgid "Number of columns"
+msgstr "Oszlopok száma"
+
+#: templates/database/designer/aggregate_query_panel.phtml:22
+#: templates/database/designer/options_panel.phtml:100
+msgid "Aggregate"
+msgstr "Összegzés"
+
+#: templates/database/designer/aggregate_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:61
+#: templates/database/designer/options_panel.phtml:106
+#: templates/database/designer/options_panel.phtml:170
+#: templates/database/designer/where_query_panel.phtml:30
+#: templates/table/search/table_header.phtml:9
+msgid "Operator"
+msgstr "Operátor"
+
+#: templates/database/designer/database_tables.phtml:29
+msgid "Toggle"
+msgstr "Átváltás"
+
+#: templates/database/designer/database_tables.phtml:40
+msgid "See table structure"
+msgstr "Táblaszerkezet megtekintése"
+
+#: templates/database/designer/delete_relation_panel.phtml:21
+msgid "Delete relation"
+msgstr "Kapcsolat törlése"
+
+#: templates/database/designer/edit_delete_pages.phtml:7
+msgid "Page to open"
+msgstr "A megnyitandó oldal"
+
+#: templates/database/designer/edit_delete_pages.phtml:7
+msgid "Page to delete"
+msgstr "A törlendő oldal"
+
+#: templates/database/designer/having_query_panel.phtml:90
+#: templates/database/designer/options_panel.phtml:63
+#: templates/database/designer/options_panel.phtml:229
+#: templates/database/designer/where_query_panel.phtml:59
+msgid "Except"
+msgstr "kivéve"
+
+#: templates/database/designer/having_query_panel.phtml:102
+#: templates/database/designer/options_panel.phtml:75
+#: templates/database/designer/options_panel.phtml:241
+#: templates/database/designer/where_query_panel.phtml:71
+msgid "subquery"
+msgstr "allekérdezés"
+
+#: templates/database/designer/new_relation_panel.phtml:22
+#: templates/database/designer/side_menu.phtml:84
+#: templates/database/designer/side_menu.phtml:87
+msgid "Create relation"
+msgstr "Kapcsolat létrehozása"
+
+#: templates/database/designer/options_panel.phtml:34
+#: templates/database/designer/options_panel.phtml:200
+msgid "Relation operator"
+msgstr "Kapcsolat operátor"
+
+#: templates/database/designer/options_panel.phtml:85
+#: templates/database/designer/rename_to_panel.phtml:23
+msgid "Rename to"
+msgstr "Átnevezés"
+
+#: templates/database/designer/options_panel.phtml:91
+#: templates/database/designer/rename_to_panel.phtml:31
+msgid "New name"
+msgstr "Új név"
+
+#: templates/database/designer/page_save_as.phtml:4
+msgid "Save to selected page"
+msgstr "Mentés a kiválasztott oldalra"
+
+#: templates/database/designer/page_save_as.phtml:5
+msgid "Create a page and save to it"
+msgstr "Oldal létrehozása és mentés arra"
+
+#: templates/database/designer/page_save_as.phtml:26
+msgid "New page name"
+msgstr "Új oldal neve"
+
+#: templates/database/designer/page_selector.phtml:2
+msgid "Select page"
+msgstr "Oldal kiválasztása"
+
+#: templates/database/designer/query_details.phtml:10
+msgid "Active options"
+msgstr "Aktív beállítások"
+
+#: templates/database/designer/schema_export.phtml:4
+msgid "Select Export Relational Type"
+msgstr "Export relációs típusának kiválasztása"
+
+#: templates/database/designer/side_menu.phtml:19
+#: templates/database/designer/side_menu.phtml:25
+msgid "Show/Hide tables list"
+msgstr "Táblák listájának megjelenítése vagy elrejtése"
+
+#: templates/database/designer/side_menu.phtml:29
+#: templates/database/designer/side_menu.phtml:35
+#: templates/database/designer/side_menu.phtml:36
+msgid "View in fullscreen"
+msgstr "Teljes képernyős megjelenítés"
+
+#: templates/database/designer/side_menu.phtml:34
+msgid "Exit fullscreen"
+msgstr "Kilépés a teljes képernyő módból"
+
+#: templates/database/designer/side_menu.phtml:41
+#: templates/database/designer/side_menu.phtml:45
+msgid "New page"
+msgstr "Új oldal"
+
+#: templates/database/designer/side_menu.phtml:70
+#: templates/database/designer/side_menu.phtml:73
+msgid "Delete pages"
+msgstr "Oldalak törlése"
+
+#: templates/database/designer/side_menu.phtml:98
+#: templates/database/designer/side_menu.phtml:101
 msgid "Reload"
 msgstr "Újratöltés"
 
-#: templates/designer/side_menu.phtml:107
-#: templates/designer/side_menu.phtml:110
+#: templates/database/designer/side_menu.phtml:107
+#: templates/database/designer/side_menu.phtml:110
 msgid "Help"
 msgstr "Súgó"
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Angular links"
 msgstr "Összeférhetetlen hivatkozások"
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Direct links"
 msgstr "Közvetlen hivatkozások"
 
-#: templates/designer/side_menu.phtml:122
-#: templates/designer/side_menu.phtml:124
+#: templates/database/designer/side_menu.phtml:122
+#: templates/database/designer/side_menu.phtml:124
 msgid "Snap to grid"
 msgstr "Rácshoz illesztés"
 
-#: templates/designer/side_menu.phtml:128
-#: templates/designer/side_menu.phtml:134
+#: templates/database/designer/side_menu.phtml:128
+#: templates/database/designer/side_menu.phtml:134
 msgid "Small/Big All"
 msgstr "Mind kicsi/nagy"
 
-#: templates/designer/side_menu.phtml:138
-#: templates/designer/side_menu.phtml:141
+#: templates/database/designer/side_menu.phtml:138
+#: templates/database/designer/side_menu.phtml:141
 msgid "Toggle small/big"
 msgstr "Kicsi/nagy kapcsoló"
 
-#: templates/designer/side_menu.phtml:145
-#: templates/designer/side_menu.phtml:148
+#: templates/database/designer/side_menu.phtml:145
+#: templates/database/designer/side_menu.phtml:148
 msgid "Toggle relation lines"
 msgstr "Relációs vonalak átállítása"
 
-#: templates/designer/side_menu.phtml:153
-#: templates/designer/side_menu.phtml:156
+#: templates/database/designer/side_menu.phtml:153
+#: templates/database/designer/side_menu.phtml:156
 msgid "Export schema"
 msgstr "Séma exportálása"
 
-#: templates/designer/side_menu.phtml:165
-#: templates/designer/side_menu.phtml:168
+#: templates/database/designer/side_menu.phtml:165
+#: templates/database/designer/side_menu.phtml:168
 msgid "Build Query"
 msgstr "Lekérdezés készítése"
 
-#: templates/designer/side_menu.phtml:173
-#: templates/designer/side_menu.phtml:177
+#: templates/database/designer/side_menu.phtml:173
+#: templates/database/designer/side_menu.phtml:177
 msgid "Move Menu"
 msgstr "Menü áthelyezése"
 
-#: templates/designer/side_menu.phtml:181
-#: templates/designer/side_menu.phtml:186
+#: templates/database/designer/side_menu.phtml:181
+#: templates/database/designer/side_menu.phtml:186
 msgid "Pin text"
 msgstr "Szöveg rögzítése"
 
-#: templates/designer/table_list.phtml:4
+#: templates/database/designer/table_list.phtml:4
 msgid "Hide/Show all"
 msgstr "Minden elrejtése/megjelenítése"
 
-#: templates/designer/table_list.phtml:14
+#: templates/database/designer/table_list.phtml:14
 msgid "Hide/Show Tables with no relation"
 msgstr "A kapcsolat nélküli táblák megjelenítése/elrejtése"
 
-#: templates/designer/table_list.phtml:59
+#: templates/database/designer/table_list.phtml:59
 msgid "Number of tables:"
 msgstr "Táblák száma:"
 
+#: templates/database/structure/body_for_table_summary.phtml:6
+#, php-format
+msgid "%s table"
+msgid_plural "%s tables"
+msgstr[0] "%s tábla"
+msgstr[1] "%s tábla"
+
+#: templates/database/structure/body_for_table_summary.phtml:17
+msgid "Sum"
+msgstr "Összesen"
+
+#: templates/database/structure/check_all_tables.phtml:6
+msgid "Check tables having overhead"
+msgstr "A felülírott táblák kijelölése"
+
+#: templates/database/structure/check_all_tables.phtml:10
+msgid "Show create"
+msgstr "Létrehozás megjelenítése"
+
+#: templates/database/structure/check_all_tables.phtml:27
+msgid "Prefix"
+msgstr "Előtag"
+
+#: templates/database/structure/check_all_tables.phtml:28
+msgid "Add prefix to table"
+msgstr "Előtag hozzáadása a táblához"
+
+#: templates/database/structure/check_all_tables.phtml:29
+msgid "Replace table prefix"
+msgstr "Tábla előtagjának lecserélése"
+
+#: templates/database/structure/check_all_tables.phtml:30
+msgid "Copy table with prefix"
+msgstr "Tábla másolása előtaggal"
+
+#: templates/database/structure/check_all_tables.phtml:36
+msgid "Add columns to central list"
+msgstr "Oszlopok hozzáadása a központi listához"
+
+#: templates/database/structure/check_all_tables.phtml:37
+msgid "Remove columns from central list"
+msgstr "Oszlopok eltávolítása a központi listából"
+
+#: templates/database/structure/check_all_tables.phtml:38
+msgid "Make consistent with central list"
+msgstr "Konzisztensé tétel a központi listával"
+
+#: templates/database/structure/favorite_anchor.phtml:12
+msgid "Add to Favorites"
+msgstr "Hozzáadás a kedvencekhez"
+
+#: templates/database/structure/show_create.phtml:2
+msgid "Showing create queries"
+msgstr "Létrehozás lekérdezések megjelenítése"
+
+#: templates/database/structure/sortable_header.phtml:13
+msgid "Sort"
+msgstr "Rendezés"
+
+#: templates/database/structure/table_header.phtml:42
+msgid ""
+"May be approximate. Click on the number to get the exact count. See "
+"[doc@faq3-11]FAQ 3.11[/doc]."
+msgstr ""
+"Becsült érték lehet. Kattintson a számra a pontos érték lekéréséhez. Lásd "
+"[doc@faq3-11]FAQ 3.11[/doc]."
+
+#: templates/database/structure/table_header.phtml:66
+#: templates/table/index_form.phtml:127
+msgid "Size"
+msgstr "Méret"
+
+#: templates/database/structure/table_header.phtml:74
+#: templates/table/structure/display_table_stats.phtml:27
+msgid "Overhead"
+msgstr "Felülírás"
+
+#: templates/database/structure/tracking_icon.phtml:4
+msgid "Tracking is active."
+msgstr "Nyomkövetés aktív."
+
+#: templates/database/structure/tracking_icon.phtml:8
+msgid "Tracking is not active."
+msgstr "Nyomkövetés inaktív."
+
 #: templates/error/report_form.phtml:7
 msgid ""
 "phpMyAdmin has encountered an error. We have collected data about this error "
@@ -15141,61 +15254,6 @@ msgstr "Meg kellene vizsgálni a hibajelentésben lévő adatokat:"
 msgid "Please explain the steps that lead to the error:"
 msgstr "Magyarázza meg a lépéseket, amelyek a hibához vezettek:"
 
-#: templates/gis_visualization/gis_visualization.phtml:3
-msgid "Display GIS Visualization"
-msgstr "GIS vizualizáció megjelenítése"
-
-#: templates/gis_visualization/gis_visualization.phtml:8
-msgid "Label column"
-msgstr "Oszlopcímke"
-
-#: templates/gis_visualization/gis_visualization.phtml:11
-msgid "-- None --"
-msgstr "-- Nincs --"
-
-#: templates/gis_visualization/gis_visualization.phtml:19
-msgid "Spatial column"
-msgstr "Térbeli oszlop"
-
-#: templates/index_form.phtml:16
-msgid "Index name:"
-msgstr "Index neve:"
-
-#: templates/index_form.phtml:19
-msgid ""
-"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
-msgstr ""
-"Az elsődleges kulcs nevének, és <b>csak annak</b> \"PRIMARY\"-nak <b>kell</"
-"b> lennie!"
-
-#: templates/index_form.phtml:40
-msgid "Index choice:"
-msgstr "Index választás:"
-
-#: templates/index_form.phtml:57
-msgid "Key block size:"
-msgstr "Kulcs blokkméret:"
-
-#: templates/index_form.phtml:74
-msgid "Index type:"
-msgstr "Index típusa:"
-
-#: templates/index_form.phtml:86
-msgid "Parser:"
-msgstr "Feldolgozó:"
-
-#: templates/index_form.phtml:102
-msgid "Comment:"
-msgstr "Megjegyzés:"
-
-#: templates/index_form.phtml:127 templates/structure/table_header.phtml:66
-msgid "Size"
-msgstr "Méret"
-
-#: templates/index_form.phtml:149 templates/index_form.phtml:190
-msgid "Drag to reorder"
-msgstr "Húzza az újrarendezéshez"
-
 #: templates/prefs_autoload.phtml:9
 msgid ""
 "Your browser has phpMyAdmin configuration for this domain. Would you like to "
@@ -15208,410 +15266,377 @@ msgstr ""
 msgid "Start row:"
 msgstr "Kezdő sor:"
 
-#: templates/structure/actions_in_table_structure.phtml:14
-#, php-format
-msgid "A primary key has been added on %s."
-msgstr "Az elsődleges kulcs hozzáadása a(z) %s mezőn megtörtént."
-
-#: templates/structure/actions_in_table_structure.phtml:34
-#: templates/structure/actions_in_table_structure.phtml:54
-#: templates/structure/actions_in_table_structure.phtml:79
-#: templates/structure/actions_in_table_structure.phtml:101
-#, php-format
-msgid "An index has been added on %s."
-msgstr "Az index hozzáadása a(z) %s mezőn megtörtént."
-
-#: templates/structure/actions_in_table_structure.phtml:130
-#: templates/structure/check_all_table_column.phtml:59
-msgid "Remove from central columns"
-msgstr "Eltávolítás a központi oszlopokból"
-
-#: templates/structure/actions_in_table_structure.phtml:138
-#: templates/structure/check_all_table_column.phtml:55
-msgid "Add to central columns"
-msgstr "Hozzáadás a központi oszlopokhoz"
-
-#: templates/structure/add_column.phtml:7
-#, php-format
-msgid "Add %s column(s)"
-msgstr "%s oszlop hozzáadása"
-
-#: templates/structure/add_column.phtml:12
-msgid "at beginning of table"
-msgstr "a tábla elejénél"
-
-#: templates/structure/body_for_table_summary.phtml:6
-#, php-format
-msgid "%s table"
-msgid_plural "%s tables"
-msgstr[0] "%s tábla"
-msgstr[1] "%s tábla"
-
-#: templates/structure/body_for_table_summary.phtml:17
-msgid "Sum"
-msgstr "Összesen"
-
-#: templates/structure/check_all_tables.phtml:6
-msgid "Check tables having overhead"
-msgstr "A felülírott táblák kijelölése"
-
-#: templates/structure/check_all_tables.phtml:10
-msgid "Show create"
-msgstr "Létrehozás megjelenítése"
-
-#: templates/structure/check_all_tables.phtml:27
-msgid "Prefix"
-msgstr "Előtag"
-
-#: templates/structure/check_all_tables.phtml:28
-msgid "Add prefix to table"
-msgstr "Előtag hozzáadása a táblához"
-
-#: templates/structure/check_all_tables.phtml:29
-msgid "Replace table prefix"
-msgstr "Tábla előtagjának lecserélése"
-
-#: templates/structure/check_all_tables.phtml:30
-msgid "Copy table with prefix"
-msgstr "Tábla másolása előtaggal"
-
-#: templates/structure/check_all_tables.phtml:36
-msgid "Add columns to central list"
-msgstr "Oszlopok hozzáadása a központi listához"
-
-#: templates/structure/check_all_tables.phtml:37
-msgid "Remove columns from central list"
-msgstr "Oszlopok eltávolítása a központi listából"
-
-#: templates/structure/check_all_tables.phtml:38
-msgid "Make consistent with central list"
-msgstr "Konzisztensé tétel a központi listával"
-
-#: templates/structure/display_structure.phtml:140 view_create.php:181
-msgid "Edit view"
-msgstr "Nézet szerkesztése"
-
-#: templates/structure/display_table_stats.phtml:9
-msgid "Space usage"
-msgstr "Területhasználat"
-
-#: templates/structure/display_table_stats.phtml:27
-#: templates/structure/table_header.phtml:74
-msgid "Overhead"
-msgstr "Felülírás"
-
-#: templates/structure/display_table_stats.phtml:32
-msgid "Effective"
-msgstr "Hatásos"
-
-#: templates/structure/favorite_anchor.phtml:12
-msgid "Add to Favorites"
-msgstr "Hozzáadás a kedvencekhez"
-
-#: templates/structure/move_columns_dialog.phtml:1
-#: templates/structure/optional_action_links.phtml:21
-msgid "Move columns"
-msgstr "Oszlopok mozgatása"
-
-#: templates/structure/move_columns_dialog.phtml:2
-msgid "Move the columns by dragging them up and down."
-msgstr "Oszlopok mozgatása fel és le húzással."
-
-#: templates/structure/optional_action_links.phtml:9
-msgid "Propose table structure"
-msgstr "Táblaszerkezet ajánlása"
-
-#: templates/structure/optional_action_links.phtml:24
-msgid "Improve table structure"
-msgstr "Táblaszerkezet javítása"
-
-#: templates/structure/optional_action_links.phtml:30
-msgid "Track view"
-msgstr "Nyomkövetés nézet"
-
-#: templates/structure/row_stats_table.phtml:3
-msgid "Row statistics"
-msgstr "Sor statisztikája"
-
-#: templates/structure/row_stats_table.phtml:9
-msgid "static"
-msgstr "statikus"
-
-#: templates/structure/row_stats_table.phtml:11
-msgid "dynamic"
-msgstr "dinamikus"
-
-#: templates/structure/row_stats_table.phtml:22
-msgid "partitioned"
-msgstr "particionált"
-
-#: templates/structure/row_stats_table.phtml:54
-msgid "Row length"
-msgstr "Sor hossza"
-
-#: templates/structure/row_stats_table.phtml:66
-msgid "Row size"
-msgstr "Sor mérete"
-
-#: templates/structure/row_stats_table.phtml:73
-msgid "Next autoindex"
-msgstr "Következő automatikus index"
-
-#: templates/structure/secondary_tabs.phtml:14
-msgid "Relation view"
-msgstr "Kapcsolati nézet"
-
-#: templates/structure/show_create.phtml:2
-msgid "Showing create queries"
-msgstr "Létrehozás lekérdezések megjelenítése"
-
-#: templates/structure/sortable_header.phtml:13
-msgid "Sort"
-msgstr "Rendezés"
-
-#: templates/structure/table_header.phtml:42
-msgid ""
-"May be approximate. Click on the number to get the exact count. See "
-"[doc@faq3-11]FAQ 3.11[/doc]."
-msgstr ""
-"Becsült érték lehet. Kattintson a számra a pontos érték lekéréséhez. Lásd "
-"[doc@faq3-11]FAQ 3.11[/doc]."
-
-#: templates/structure/table_structure_row.phtml:46
-#, php-format
-msgid "Column %s has been dropped."
-msgstr "A(z) %s oszlop eldobása megtörtént."
-
-#: templates/structure/tracking_icon.phtml:4
-msgid "Tracking is active."
-msgstr "Nyomkövetés aktív."
-
-#: templates/structure/tracking_icon.phtml:8
-msgid "Tracking is not active."
-msgstr "Nyomkövetés inaktív."
-
-#: templates/table/create_table.phtml:15
-msgid "Number of columns"
-msgstr "Oszlopok száma"
-
-#: templates/table/options.phtml:8
-msgid "Select columns (at least one):"
-msgstr "Válasszon oszlopokat (legalább egyet):"
-
-#: templates/table/options.phtml:37
-msgid "Add search conditions (body of the \"where\" clause):"
-msgstr "adja meg a keresési feltételeket (a \"where\" feltétel törzsét):"
-
-#: templates/table/options.phtml:45
-msgid "Number of rows per page"
-msgstr "Sorok száma oldalanként"
-
-#: templates/table/options.phtml:56
-msgid "Display order:"
-msgstr "Megjelenítési sorrend:"
-
-#: templates/table/options_zoom.phtml:6
-msgid "Use this column to label each point"
-msgstr "Használja ezt az oszlopot az egyes pontok címkézéséhez"
-
-#: templates/table/options_zoom.phtml:35
-msgid "Maximum rows to plot"
-msgstr "A megjelenítendő sorok maximális száma"
-
-#: templates/table/replace_preview.phtml:13
-msgid "Find and replace - preview"
-msgstr "Keresés és csere - előnézet"
-
-#: templates/table/replace_preview.phtml:18
-msgid "Original string"
-msgstr "Eredeti szöveg"
-
-#: templates/table/replace_preview.phtml:19
-msgid "Replaced string"
-msgstr "Cserélt szöveg"
-
-#: templates/table/replace_preview.phtml:40
-msgid "Replace"
-msgstr "Csere"
-
-#: templates/table/rows_zoom.phtml:16
-msgid "Additional search criteria"
-msgstr "További keresési feltételek"
-
-#: templates/table/search_and_replace.phtml:3
-msgid "Replace with:"
-msgstr "Csere ezzel:"
-
-#: templates/table/search_and_replace.phtml:22
-msgid "Use regular expression"
-msgstr "Reguláris kifejezés használata"
-
-#: templates/table/selection_form.phtml:12
-msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
-msgstr ""
-"Egy „példa szerinti lekérdezés” végrehajtása (karakterhelyettesítő: „%”) két "
-"különböző oszlopon"
-
-#: templates/table/selection_form.phtml:34
-msgid "Do a \"query by example\" (wildcard: \"%\")"
-msgstr ""
-"Egy \"példa szerinti lekérdezés\" végrehajtása (karakterhelyettesítő: \"%\")"
-
-#: templates/table/zoom_result_form.phtml:7
-msgid "Browse/Edit the points"
-msgstr "Pontok böngészése/szerkesztése"
-
-#: templates/table/zoom_result_form.phtml:15
-msgid "How to use"
-msgstr "Hogyan kell használni"
-
-#: templates/table/zoom_result_form.phtml:23
-msgid "Reset zoom"
-msgstr "Nagyítás visszaállítása"
-
-#: templates/tbl_chart.phtml:17
+#: templates/table/chart/tbl_chart.phtml:17
 msgctxt "Chart type"
 msgid "Bar"
 msgstr "Sáv"
 
-#: templates/tbl_chart.phtml:21
+#: templates/table/chart/tbl_chart.phtml:21
 msgctxt "Chart type"
 msgid "Column"
 msgstr "Oszlop"
 
-#: templates/tbl_chart.phtml:25
+#: templates/table/chart/tbl_chart.phtml:25
 msgctxt "Chart type"
 msgid "Line"
 msgstr "Vonal"
 
-#: templates/tbl_chart.phtml:29
+#: templates/table/chart/tbl_chart.phtml:29
 msgctxt "Chart type"
 msgid "Spline"
 msgstr "Ék"
 
-#: templates/tbl_chart.phtml:33
+#: templates/table/chart/tbl_chart.phtml:33
 msgctxt "Chart type"
 msgid "Area"
 msgstr "Terület"
 
-#: templates/tbl_chart.phtml:37
+#: templates/table/chart/tbl_chart.phtml:37
 msgctxt "Chart type"
 msgid "Pie"
 msgstr "Torta"
 
-#: templates/tbl_chart.phtml:41
+#: templates/table/chart/tbl_chart.phtml:41
 msgctxt "Chart type"
 msgid "Timeline"
 msgstr "Idővonal"
 
-#: templates/tbl_chart.phtml:45
+#: templates/table/chart/tbl_chart.phtml:45
 msgctxt "Chart type"
 msgid "Scatter"
 msgstr "Pont"
 
-#: templates/tbl_chart.phtml:50
+#: templates/table/chart/tbl_chart.phtml:50
 msgid "Stacked"
 msgstr "Halmozott"
 
-#: templates/tbl_chart.phtml:53
+#: templates/table/chart/tbl_chart.phtml:53
 msgid "Chart title"
 msgstr "Diagramcím"
 
-#: templates/tbl_chart.phtml:57
+#: templates/table/chart/tbl_chart.phtml:57
 msgid "X-Axis:"
 msgstr "X tengely:"
 
-#: templates/tbl_chart.phtml:72
+#: templates/table/chart/tbl_chart.phtml:72
 msgid "Series:"
 msgstr "Adatsorok:"
 
-#: templates/tbl_chart.phtml:102
+#: templates/table/chart/tbl_chart.phtml:102
 msgid "X-Axis label:"
 msgstr "X tengely címkéje:"
 
-#: templates/tbl_chart.phtml:104
+#: templates/table/chart/tbl_chart.phtml:104
 msgid "X Values"
 msgstr "X értékek"
 
-#: templates/tbl_chart.phtml:107
+#: templates/table/chart/tbl_chart.phtml:107
 msgid "Y-Axis label:"
 msgstr "Y tengely címkéje:"
 
-#: templates/tbl_chart.phtml:115
+#: templates/table/chart/tbl_chart.phtml:115
 msgid "Series names are in a column"
 msgstr "Az adatsorok nevei egy oszlopban vannak"
 
-#: templates/tbl_chart.phtml:118
+#: templates/table/chart/tbl_chart.phtml:118
 msgid "Series column:"
 msgstr "Adatsorok oszlopa:"
 
-#: templates/tbl_chart.phtml:130
+#: templates/table/chart/tbl_chart.phtml:130
 msgid "Value Column:"
 msgstr "Érték oszlopa:"
 
-#: templates/tbl_chart.phtml:150
+#: templates/table/chart/tbl_chart.phtml:150
 msgid "Save chart as image"
 msgstr "Diagram mentése képként"
 
-#: templates/tbl_relation/common_form.phtml:7
+#: templates/table/gis_visualization/gis_visualization.phtml:3
+msgid "Display GIS Visualization"
+msgstr "GIS vizualizáció megjelenítése"
+
+#: templates/table/gis_visualization/gis_visualization.phtml:8
+msgid "Label column"
+msgstr "Oszlopcímke"
+
+#: templates/table/gis_visualization/gis_visualization.phtml:11
+msgid "-- None --"
+msgstr "-- Nincs --"
+
+#: templates/table/gis_visualization/gis_visualization.phtml:19
+msgid "Spatial column"
+msgstr "Térbeli oszlop"
+
+#: templates/table/index_form.phtml:16
+msgid "Index name:"
+msgstr "Index neve:"
+
+#: templates/table/index_form.phtml:19
+msgid ""
+"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
+msgstr ""
+"Az elsődleges kulcs nevének, és <b>csak annak</b> \"PRIMARY\"-nak <b>kell</"
+"b> lennie!"
+
+#: templates/table/index_form.phtml:40
+msgid "Index choice:"
+msgstr "Index választás:"
+
+#: templates/table/index_form.phtml:57
+msgid "Key block size:"
+msgstr "Kulcs blokkméret:"
+
+#: templates/table/index_form.phtml:74
+msgid "Index type:"
+msgstr "Index típusa:"
+
+#: templates/table/index_form.phtml:86
+msgid "Parser:"
+msgstr "Feldolgozó:"
+
+#: templates/table/index_form.phtml:102
+msgid "Comment:"
+msgstr "Megjegyzés:"
+
+#: templates/table/index_form.phtml:149 templates/table/index_form.phtml:190
+msgid "Drag to reorder"
+msgstr "Húzza az újrarendezéshez"
+
+#: templates/table/relation/common_form.phtml:7
 msgid "Internal relations"
 msgstr "Belső kapcsolatok"
 
-#: templates/tbl_relation/common_form.phtml:11
+#: templates/table/relation/common_form.phtml:11
 msgid "Internal relation"
 msgstr "Belső kapcsolat"
 
-#: templates/tbl_relation/common_form.phtml:14
+#: templates/table/relation/common_form.phtml:14
 msgid ""
 "An internal relation is not necessary when a corresponding FOREIGN KEY "
 "relation exists."
 msgstr ""
 "Nincs szükség belső kapcsolatra, ha létezik megfelelő IDEGEN KULCS kapcsolat."
 
-#: templates/tbl_relation/common_form.phtml:37
+#: templates/table/relation/common_form.phtml:37
 msgid "Foreign key constraints"
 msgstr "Idegen kulcs megszorítások"
 
-#: templates/tbl_relation/common_form.phtml:40
+#: templates/table/relation/common_form.phtml:40
 msgid "Actions"
 msgstr "Műveletek"
 
-#: templates/tbl_relation/common_form.phtml:41
+#: templates/table/relation/common_form.phtml:41
 msgid "Constraint properties"
 msgstr "Megszorítás tulajdonságai"
 
-#: templates/tbl_relation/common_form.phtml:44
+#: templates/table/relation/common_form.phtml:44
 msgid ""
 "Only columns with index will be displayed. You can define an index below."
 msgstr ""
 "Csak az indexszel rendelkező oszlopok lesznek megjelenítve. Lent létrehozhat "
 "egy indexet."
 
-#: templates/tbl_relation/common_form.phtml:49
+#: templates/table/relation/common_form.phtml:49
 msgid "Foreign key constraint"
 msgstr "Idegen kulcs megszorítás"
 
-#: templates/tbl_relation/common_form.phtml:81
+#: templates/table/relation/common_form.phtml:81
 msgid "+ Add constraint"
 msgstr "+ Megszorítás hozzáadása"
 
-#: templates/tbl_relation/common_form.phtml:91
+#: templates/table/relation/common_form.phtml:91
 msgid "Choose column to display:"
 msgstr "Válassza ki a megjelenítendő oszlopot:"
 
-#: templates/tbl_relation/foreign_key_row.phtml:13
+#: templates/table/relation/foreign_key_row.phtml:13
 #, php-format
 msgid "Foreign key constraint %s has been dropped"
 msgstr "A(z) %s idegen kulcs megszorítás el lett dobva"
 
-#: templates/tbl_relation/foreign_key_row.phtml:102
+#: templates/table/relation/foreign_key_row.phtml:102
 msgid "Constraint name"
 msgstr "Megkötés neve"
 
-#: templates/tbl_relation/foreign_key_row.phtml:157
+#: templates/table/relation/foreign_key_row.phtml:157
 msgid "+ Add column"
 msgstr "+ Oszlop hozzáadása"
 
+#: templates/table/search/options.phtml:8
+msgid "Select columns (at least one):"
+msgstr "Válasszon oszlopokat (legalább egyet):"
+
+#: templates/table/search/options.phtml:37
+msgid "Add search conditions (body of the \"where\" clause):"
+msgstr "adja meg a keresési feltételeket (a \"where\" feltétel törzsét):"
+
+#: templates/table/search/options.phtml:45
+msgid "Number of rows per page"
+msgstr "Sorok száma oldalanként"
+
+#: templates/table/search/options.phtml:56
+msgid "Display order:"
+msgstr "Megjelenítési sorrend:"
+
+#: templates/table/search/options_zoom.phtml:6
+msgid "Use this column to label each point"
+msgstr "Használja ezt az oszlopot az egyes pontok címkézéséhez"
+
+#: templates/table/search/options_zoom.phtml:35
+msgid "Maximum rows to plot"
+msgstr "A megjelenítendő sorok maximális száma"
+
+#: templates/table/search/replace_preview.phtml:13
+msgid "Find and replace - preview"
+msgstr "Keresés és csere - előnézet"
+
+#: templates/table/search/replace_preview.phtml:18
+msgid "Original string"
+msgstr "Eredeti szöveg"
+
+#: templates/table/search/replace_preview.phtml:19
+msgid "Replaced string"
+msgstr "Cserélt szöveg"
+
+#: templates/table/search/replace_preview.phtml:40
+msgid "Replace"
+msgstr "Csere"
+
+#: templates/table/search/rows_zoom.phtml:16
+msgid "Additional search criteria"
+msgstr "További keresési feltételek"
+
+#: templates/table/search/search_and_replace.phtml:3
+msgid "Replace with:"
+msgstr "Csere ezzel:"
+
+#: templates/table/search/search_and_replace.phtml:22
+msgid "Use regular expression"
+msgstr "Reguláris kifejezés használata"
+
+#: templates/table/search/selection_form.phtml:12
+msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
+msgstr ""
+"Egy „példa szerinti lekérdezés” végrehajtása (karakterhelyettesítő: „%”) két "
+"különböző oszlopon"
+
+#: templates/table/search/selection_form.phtml:34
+msgid "Do a \"query by example\" (wildcard: \"%\")"
+msgstr ""
+"Egy \"példa szerinti lekérdezés\" végrehajtása (karakterhelyettesítő: \"%\")"
+
+#: templates/table/search/zoom_result_form.phtml:7
+msgid "Browse/Edit the points"
+msgstr "Pontok böngészése/szerkesztése"
+
+#: templates/table/search/zoom_result_form.phtml:15
+msgid "How to use"
+msgstr "Hogyan kell használni"
+
+#: templates/table/search/zoom_result_form.phtml:23
+msgid "Reset zoom"
+msgstr "Nagyítás visszaállítása"
+
+#: templates/table/secondary_tabs.phtml:14
+msgid "Relation view"
+msgstr "Kapcsolati nézet"
+
+#: templates/table/structure/actions_in_table_structure.phtml:14
+#, php-format
+msgid "A primary key has been added on %s."
+msgstr "Az elsődleges kulcs hozzáadása a(z) %s mezőn megtörtént."
+
+#: templates/table/structure/actions_in_table_structure.phtml:34
+#: templates/table/structure/actions_in_table_structure.phtml:54
+#: templates/table/structure/actions_in_table_structure.phtml:79
+#: templates/table/structure/actions_in_table_structure.phtml:101
+#, php-format
+msgid "An index has been added on %s."
+msgstr "Az index hozzáadása a(z) %s mezőn megtörtént."
+
+#: templates/table/structure/actions_in_table_structure.phtml:130
+#: templates/table/structure/check_all_table_column.phtml:59
+msgid "Remove from central columns"
+msgstr "Eltávolítás a központi oszlopokból"
+
+#: templates/table/structure/actions_in_table_structure.phtml:138
+#: templates/table/structure/check_all_table_column.phtml:55
+msgid "Add to central columns"
+msgstr "Hozzáadás a központi oszlopokhoz"
+
+#: templates/table/structure/add_column.phtml:7
+#, php-format
+msgid "Add %s column(s)"
+msgstr "%s oszlop hozzáadása"
+
+#: templates/table/structure/add_column.phtml:12
+msgid "at beginning of table"
+msgstr "a tábla elejénél"
+
+#: templates/table/structure/display_structure.phtml:140 view_create.php:181
+msgid "Edit view"
+msgstr "Nézet szerkesztése"
+
+#: templates/table/structure/display_table_stats.phtml:9
+msgid "Space usage"
+msgstr "Területhasználat"
+
+#: templates/table/structure/display_table_stats.phtml:32
+msgid "Effective"
+msgstr "Hatásos"
+
+#: templates/table/structure/move_columns_dialog.phtml:1
+#: templates/table/structure/optional_action_links.phtml:21
+msgid "Move columns"
+msgstr "Oszlopok mozgatása"
+
+#: templates/table/structure/move_columns_dialog.phtml:2
+msgid "Move the columns by dragging them up and down."
+msgstr "Oszlopok mozgatása fel és le húzással."
+
+#: templates/table/structure/optional_action_links.phtml:9
+msgid "Propose table structure"
+msgstr "Táblaszerkezet ajánlása"
+
+#: templates/table/structure/optional_action_links.phtml:24
+msgid "Improve table structure"
+msgstr "Táblaszerkezet javítása"
+
+#: templates/table/structure/optional_action_links.phtml:30
+msgid "Track view"
+msgstr "Nyomkövetés nézet"
+
+#: templates/table/structure/row_stats_table.phtml:3
+msgid "Row statistics"
+msgstr "Sor statisztikája"
+
+#: templates/table/structure/row_stats_table.phtml:9
+msgid "static"
+msgstr "statikus"
+
+#: templates/table/structure/row_stats_table.phtml:11
+msgid "dynamic"
+msgstr "dinamikus"
+
+#: templates/table/structure/row_stats_table.phtml:22
+msgid "partitioned"
+msgstr "particionált"
+
+#: templates/table/structure/row_stats_table.phtml:54
+msgid "Row length"
+msgstr "Sor hossza"
+
+#: templates/table/structure/row_stats_table.phtml:66
+msgid "Row size"
+msgstr "Sor mérete"
+
+#: templates/table/structure/row_stats_table.phtml:73
+msgid "Next autoindex"
+msgstr "Következő automatikus index"
+
+#: templates/table/structure/table_structure_row.phtml:46
+#, php-format
+msgid "Column %s has been dropped."
+msgstr "A(z) %s oszlop eldobása megtörtént."
+
 #: themes.php:17 themes.php:22
 msgid "Theme"
 msgstr "Téma"
@@ -16960,6 +16985,9 @@ msgstr ""
 msgid "concurrent_insert is set to 0"
 msgstr "A concurrent_insert 0-ra van állítva"
 
+#~ msgid "Read as multibytes"
+#~ msgstr "Olvasás multibájtként"
+
 #~ msgid "Relational display column"
 #~ msgstr "Relációs megjelenítési oszlop"
 
diff --git a/po/hy.po b/po/hy.po
index b1c0dd34f1..cbecae3e26 100644
--- a/po/hy.po
+++ b/po/hy.po
@@ -6,12 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 4.5.0-dev\n"
-"Report-Msgid-Bugs-To: developers@phpmyadmin.net\n"
-"POT-Creation-Date: 2015-08-08 13:53-0400\n"
-"PO-Revision-Date: 2015-08-03 20:10+0200\n"
+"Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
+"POT-Creation-Date: 2015-08-12 08:10-0400\n"
+"PO-Revision-Date: 2015-08-12 15:21+0200\n"
 "Last-Translator: Andrey Aleksanyants <aaleksanyants@yahoo.com>\n"
-"Language-Team: Armenian <https://hosted.weblate.org/projects/phpmyadmin/"
-"master/hy/>\n"
+"Language-Team: Armenian "
+"<https://hosted.weblate.org/projects/phpmyadmin/master/hy/>\n"
 "Language: hy\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -57,7 +57,7 @@ msgid "Table comments:"
 msgstr "Աղյուսակների մեկնաբանությունները՝"
 
 #: db_datadict.php:104 libraries/Index.class.php:699
-#: libraries/insert_edit.lib.php:1567
+#: libraries/insert_edit.lib.php:1565
 #: libraries/navigation/Nodes/Node_Column.class.php:30
 #: libraries/plugins/export/ExportHtmlword.class.php:280
 #: libraries/plugins/export/ExportHtmlword.class.php:375
@@ -71,13 +71,14 @@ msgstr "Աղյուսակների մեկնաբանությունները՝"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1023
 #: libraries/tracking.lib.php:879 libraries/tracking.lib.php:975
 #: templates/columns_definitions/column_name.phtml:18
-#: templates/index_form.phtml:124 templates/table/table_header.phtml:6
-#: templates/table/zoom_result_form.phtml:33
-#: templates/tbl_relation/common_form.phtml:10
-#: templates/tbl_relation/common_form.phtml:43
-#: templates/tbl_relation/foreign_key_row.phtml:194
-#: templates/tbl_relation/foreign_key_row.phtml:206
-#: templates/tbl_relation/internal_relational_row.phtml:71
+#: templates/table/index_form.phtml:124
+#: templates/table/relation/common_form.phtml:10
+#: templates/table/relation/common_form.phtml:43
+#: templates/table/relation/foreign_key_row.phtml:194
+#: templates/table/relation/foreign_key_row.phtml:206
+#: templates/table/relation/internal_relational_row.phtml:71
+#: templates/table/search/table_header.phtml:6
+#: templates/table/search/zoom_result_form.phtml:33
 msgid "Column"
 msgstr "Սյունակ"
 
@@ -95,21 +96,21 @@ msgstr "Սյունակ"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1001
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1024
 #: libraries/rte/rte_list.lib.php:75 libraries/rte/rte_list.lib.php:103
-#: libraries/rte/rte_routines.lib.php:802
-#: libraries/rte/rte_routines.lib.php:831
-#: libraries/rte/rte_routines.lib.php:1493
+#: libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_routines.lib.php:922
+#: libraries/rte/rte_routines.lib.php:1584
 #: libraries/server_privileges.lib.php:2369 libraries/tracking.lib.php:880
 #: libraries/tracking.lib.php:972
 #: templates/columns_definitions/table_fields_definitions.phtml:11
-#: templates/structure/table_header.phtml:48
-#: templates/structure/table_structure_header.phtml:6
-#: templates/table/table_header.phtml:7
+#: templates/database/structure/table_header.phtml:48
+#: templates/table/search/table_header.phtml:7
+#: templates/table/structure/table_structure_header.phtml:6
 msgid "Type"
 msgstr "Տեսակ"
 
 #: db_datadict.php:106 libraries/Index.class.php:702
 #: libraries/central_columns.lib.php:708
-#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1576
+#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1574
 #: libraries/plugins/export/ExportHtmlword.class.php:286
 #: libraries/plugins/export/ExportHtmlword.class.php:381
 #: libraries/plugins/export/ExportLatex.class.php:509
@@ -122,8 +123,8 @@ msgstr "Տեսակ"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1026
 #: libraries/tracking.lib.php:882 libraries/tracking.lib.php:978
 #: templates/columns_definitions/table_fields_definitions.phtml:39
-#: templates/structure/table_structure_header.phtml:9
-#: templates/table/zoom_result_form.phtml:34
+#: templates/table/search/zoom_result_form.phtml:34
+#: templates/table/structure/table_structure_header.phtml:9
 msgid "Null"
 msgstr "Null"
 
@@ -141,8 +142,8 @@ msgstr "Null"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1027
 #: libraries/replication_gui.lib.php:153 libraries/tracking.lib.php:883
 #: templates/columns_definitions/table_fields_definitions.phtml:25
-#: templates/structure/body_for_table_summary.phtml:55
-#: templates/structure/table_structure_header.phtml:10
+#: templates/database/structure/body_for_table_summary.phtml:55
+#: templates/table/structure/table_structure_header.phtml:10
 msgid "Default"
 msgstr "Լռելյան"
 
@@ -170,19 +171,19 @@ msgid "Comments"
 msgstr "Մեկնաբանություններ"
 
 #: db_datadict.php:146
-#: libraries/controllers/StructureController.class.php:1960
-#: libraries/controllers/StructureController.class.php:1965
+#: libraries/controllers/TableStructureController.class.php:951
+#: libraries/controllers/TableStructureController.class.php:956
 #: libraries/tracking.lib.php:922
 #: templates/columns_definitions/column_indexes.phtml:6
-#: templates/structure/check_all_table_column.phtml:22
-#: templates/structure/display_structure.phtml:74
+#: templates/table/structure/check_all_table_column.phtml:22
+#: templates/table/structure/display_structure.phtml:74
 msgid "Primary"
 msgstr "Առաջնային"
 
 #: db_datadict.php:156 js/messages.php:317 libraries/Index.class.php:567
 #: libraries/Index.class.php:606 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261 libraries/mult_submits.lib.php:403
+#: libraries/config/FormDisplay.tpl.php:272 libraries/mult_submits.lib.php:403
 #: libraries/mult_submits.lib.php:417
 #: libraries/plugins/export/ExportHtmlword.class.php:630
 #: libraries/plugins/export/ExportLatex.class.php:589
@@ -198,20 +199,20 @@ msgstr "Առաջնային"
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1010 libraries/tracking.lib.php:1015
 #: prefs_manage.php:140 templates/prefs_autoload.phtml:15
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "No"
 msgstr "Ոչ"
 
 #: db_datadict.php:156 js/messages.php:443 libraries/Index.class.php:568
 #: libraries/Index.class.php:605 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261
-#: libraries/controllers/StructureController.class.php:1344
-#: libraries/controllers/StructureController.class.php:2223
-#: libraries/controllers/StructureController.class.php:2232
-#: libraries/controllers/StructureController.class.php:2237
-#: libraries/controllers/StructureController.class.php:2242
-#: libraries/controllers/StructureController.class.php:2247
+#: libraries/config/FormDisplay.tpl.php:272
+#: libraries/controllers/TableStructureController.class.php:539
+#: libraries/controllers/TableStructureController.class.php:1201
+#: libraries/controllers/TableStructureController.class.php:1210
+#: libraries/controllers/TableStructureController.class.php:1215
+#: libraries/controllers/TableStructureController.class.php:1220
+#: libraries/controllers/TableStructureController.class.php:1225
 #: libraries/mult_submits.inc.php:82 libraries/mult_submits.inc.php:178
 #: libraries/mult_submits.lib.php:339 libraries/mult_submits.lib.php:372
 #: libraries/mult_submits.lib.php:401 libraries/mult_submits.lib.php:415
@@ -220,8 +221,8 @@ msgstr "Ոչ"
 #: libraries/plugins/export/ExportOdt.class.php:756
 #: libraries/plugins/export/ExportTexytext.class.php:567
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1077
-#: libraries/server_databases.lib.php:464
-#: libraries/server_databases.lib.php:474
+#: libraries/server_databases.lib.php:475
+#: libraries/server_databases.lib.php:485
 #: libraries/server_privileges.lib.php:2546
 #: libraries/server_privileges.lib.php:2727
 #: libraries/server_privileges.lib.php:2748
@@ -231,7 +232,7 @@ msgstr "Ոչ"
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1008 libraries/tracking.lib.php:1013
 #: prefs_manage.php:138 templates/prefs_autoload.phtml:14
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "Yes"
 msgstr "Այո"
 
@@ -241,7 +242,7 @@ msgstr "Ցուցադրել տվյալների բազայի դամփը (ուրվ
 
 #: db_export.php:37 db_tracking.php:90 export.php:382
 #: libraries/DBQbe.class.php:326
-#: libraries/controllers/StructureController.class.php:231
+#: libraries/controllers/DatabaseStructureController.class.php:170
 #: libraries/navigation/NavigationTree.class.php:897
 msgid "No tables found in database."
 msgstr "Տվյալների բազայում աղյուսակներ չեն հայտնաբերվել։"
@@ -252,14 +253,14 @@ msgstr "Տվյալների բազայում աղյուսակներ չեն հայ
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:26
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:120
-#: templates/structure/show_create.phtml:18
+#: templates/database/structure/show_create.phtml:18
 msgid "Tables"
 msgstr "Աղյուսակներ"
 
 #: db_export.php:52 libraries/Menu.class.php:317 libraries/Menu.class.php:425
-#: libraries/Util.class.php:3333 libraries/Util.class.php:3343
-#: libraries/Util.class.php:3349 libraries/Util.class.php:3629
-#: libraries/Util.class.php:4327 libraries/Util.class.php:4344
+#: libraries/Util.class.php:3339 libraries/Util.class.php:3349
+#: libraries/Util.class.php:3355 libraries/Util.class.php:3635
+#: libraries/Util.class.php:4333 libraries/Util.class.php:4350
 #: libraries/central_columns.lib.php:728 libraries/config.values.php:39
 #: libraries/config.values.php:47 libraries/config.values.php:109
 #: libraries/config.values.php:115 libraries/config/setup.forms.php:323
@@ -273,7 +274,7 @@ msgstr "Աղյուսակներ"
 #: libraries/navigation/Nodes/Node_Table.class.php:283
 #: libraries/server_privileges.lib.php:1141 libraries/tracking.lib.php:874
 #: templates/columns_definitions/table_fields_definitions.phtml:3
-#: templates/designer/table_list.phtml:28
+#: templates/database/designer/table_list.phtml:28
 msgid "Structure"
 msgstr "Կառուցվածք"
 
@@ -285,7 +286,7 @@ msgstr "Կառուցվածք"
 #: libraries/config/user_preferences.forms.php:292
 #: libraries/config/user_preferences.forms.php:297
 #: libraries/server_privileges.lib.php:1140
-#: templates/structure/display_table_stats.phtml:12
+#: templates/table/structure/display_table_stats.phtml:12
 msgid "Data"
 msgstr "Տվյալներ"
 
@@ -357,10 +358,10 @@ msgstr "Հետագծվող աղյուսակներ"
 #: libraries/server_privileges.lib.php:2908
 #: libraries/server_privileges.lib.php:3145
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4346
-#: templates/structure/table_header.phtml:21
-#: templates/tbl_relation/foreign_key_row.phtml:176
-#: templates/tbl_relation/internal_relational_row.phtml:63
+#: libraries/server_privileges.lib.php:4372
+#: templates/database/structure/table_header.phtml:21
+#: templates/table/relation/foreign_key_row.phtml:176
+#: templates/table/relation/internal_relational_row.phtml:63
 msgid "Table"
 msgstr "Աղյուսակ"
 
@@ -377,7 +378,7 @@ msgid "Updated"
 msgstr "Թարմացված"
 
 #: db_tracking.php:130 js/messages.php:243 libraries/Menu.class.php:552
-#: libraries/Util.class.php:4314 libraries/config.values.php:104
+#: libraries/Util.class.php:4320 libraries/config.values.php:104
 #: libraries/rte/rte_events.lib.php:393 libraries/rte/rte_list.lib.php:101
 #: libraries/server_status_processes.lib.php:92 libraries/tracking.lib.php:279
 msgid "Status"
@@ -386,14 +387,15 @@ msgstr "Կարգավիճակ"
 #: db_tracking.php:131 db_tracking.php:290 libraries/Index.class.php:693
 #: libraries/central_columns.lib.php:687 libraries/rte/rte_list.lib.php:74
 #: libraries/rte/rte_list.lib.php:89 libraries/rte/rte_list.lib.php:102
-#: libraries/server_databases.lib.php:398
+#: libraries/server_databases.lib.php:409
 #: libraries/server_privileges.lib.php:2372
 #: libraries/server_privileges.lib.php:3166
 #: libraries/server_privileges.lib.php:3342
 #: libraries/server_user_groups.lib.php:82
 #: libraries/server_variables.lib.php:189 libraries/tracking.lib.php:280
-#: libraries/tracking.lib.php:793 templates/structure/table_header.phtml:30
-#: templates/structure/table_structure_header.phtml:23
+#: libraries/tracking.lib.php:793
+#: templates/database/structure/table_header.phtml:30
+#: templates/table/structure/table_structure_header.phtml:23
 msgid "Action"
 msgstr "Գործողություն"
 
@@ -435,7 +437,7 @@ msgid "Untracked tables"
 msgstr "Չհետագծվող աղյուսակներ"
 
 #: db_tracking.php:305 db_tracking.php:336
-#: templates/structure/optional_action_links.phtml:17
+#: templates/table/structure/optional_action_links.phtml:17
 msgid "Track table"
 msgstr "Հետագծել աղյուսակը"
 
@@ -491,7 +493,7 @@ msgid "Value for the column \"%s\""
 msgstr "\"%s\" սյունակի համար արժեքը"
 
 #: gis_data_editor.php:146
-#: templates/gis_visualization/gis_visualization.phtml:37
+#: templates/table/gis_visualization/gis_visualization.phtml:37
 msgid "Use OpenStreetMaps as Base Layer"
 msgstr "Օգտագործեք OpenStreetMaps որպես հիմնական շերտ"
 
@@ -571,35 +573,35 @@ msgstr "Ավելացնել երկրաչափություն"
 #: libraries/display_change_password.lib.php:162
 #: libraries/display_export.lib.php:402 libraries/display_export.lib.php:408
 #: libraries/display_import.lib.php:392 libraries/index.lib.php:44
-#: libraries/insert_edit.lib.php:1546 libraries/insert_edit.lib.php:1583
+#: libraries/insert_edit.lib.php:1544 libraries/insert_edit.lib.php:1581
 #: libraries/normalization.lib.php:165 libraries/normalization.lib.php:821
 #: libraries/operations.lib.php:38 libraries/operations.lib.php:108
 #: libraries/operations.lib.php:263 libraries/operations.lib.php:306
 #: libraries/operations.lib.php:801 libraries/operations.lib.php:874
 #: libraries/operations.lib.php:923 libraries/operations.lib.php:1337
 #: libraries/operations.lib.php:1658
-#: libraries/plugins/auth/AuthenticationCookie.class.php:244
+#: libraries/plugins/auth/AuthenticationCookie.class.php:232
 #: libraries/replication_gui.lib.php:122 libraries/replication_gui.lib.php:161
 #: libraries/replication_gui.lib.php:324 libraries/replication_gui.lib.php:461
 #: libraries/replication_gui.lib.php:906 libraries/rte/rte_events.lib.php:509
-#: libraries/rte/rte_routines.lib.php:969
-#: libraries/rte/rte_routines.lib.php:1581
+#: libraries/rte/rte_routines.lib.php:1060
+#: libraries/rte/rte_routines.lib.php:1672
 #: libraries/rte/rte_triggers.lib.php:396 libraries/server_bin_log.lib.php:61
 #: libraries/server_privileges.lib.php:705
 #: libraries/server_privileges.lib.php:2106
 #: libraries/server_privileges.lib.php:2872
 #: libraries/server_privileges.lib.php:3553
-#: libraries/server_privileges.lib.php:4627
+#: libraries/server_privileges.lib.php:4653
 #: libraries/server_user_groups.lib.php:285
 #: libraries/sql_query_form.lib.php:369 libraries/sql_query_form.lib.php:429
 #: libraries/tracking.lib.php:533 libraries/tracking.lib.php:653
 #: prefs_manage.php:277 prefs_manage.php:355
 #: templates/columns_definitions/column_definitions_form.phtml:59
-#: templates/header_location.phtml:17 templates/index_form.phtml:238
+#: templates/database/create_table.phtml:21 templates/header_location.phtml:28
 #: templates/startAndNumberOfRowsPanel.phtml:14
-#: templates/structure/add_column.phtml:25
-#: templates/table/create_table.phtml:21
-#: templates/table/selection_form.phtml:75 view_create.php:275
+#: templates/table/index_form.phtml:238
+#: templates/table/search/selection_form.phtml:75
+#: templates/table/structure/add_column.phtml:25 view_create.php:275
 #: view_operations.php:106
 msgid "Go"
 msgstr "Առաջ"
@@ -692,7 +694,7 @@ msgstr ""
 "Չհաջողվեց բեռնել ներմուծման հանգույցները։ Խնդրում ենք ստուգել ձեր տեղակայման "
 "ամբողջականությունը։"
 
-#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1466
+#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1460
 #, php-format
 msgid "Bookmark %s has been created."
 msgstr "%s էջանիշը ստեղծվեց։"
@@ -731,11 +733,11 @@ msgstr "Չհաջողվեց բեռնել ներմուծման առաջընթաց
 msgid "Back"
 msgstr "Հետ"
 
-#: index.php:148 libraries/Footer.class.php:70
+#: index.php:149 libraries/Footer.class.php:70
 msgid "phpMyAdmin Demo Server"
 msgstr "phpMyAdmin-ի ցուցադրողական սպասարկիչ"
 
-#: index.php:152
+#: index.php:153
 #, php-format
 msgid ""
 "You are using the demo server. You can do anything here, but please do not "
@@ -746,110 +748,110 @@ msgstr ""
 "ցանկանաք, սակայն խնդրում ենք չփոխել՝ root, debian-sys-maint և pma "
 "օգտվողներին։ Հավելյալ տեղեկությունների համար դիմեք %s։"
 
-#: index.php:162
+#: index.php:163
 msgid "General Settings"
 msgstr "Ընդհանուր կայանքներ"
 
-#: index.php:190 libraries/display_change_password.lib.php:50
+#: index.php:191 libraries/display_change_password.lib.php:50
 #: libraries/display_change_password.lib.php:53 user_password.php:247
 msgid "Change password"
 msgstr "Փոխել գաղտնաբառը"
 
-#: index.php:206
+#: index.php:207
 msgid "Server connection collation"
 msgstr "Սպասարկչի կապի կոդավորումը"
 
-#: index.php:228
+#: index.php:229
 msgid "Appearance Settings"
 msgstr "Արտաքին տեսքի կայանքներ"
 
-#: index.php:258 prefs_manage.php:285
+#: index.php:259 prefs_manage.php:285
 msgid "More settings"
 msgstr "Լրացուցիչ կայանքներ"
 
-#: index.php:279
+#: index.php:280
 msgid "Database server"
 msgstr "Տվյալների բազայի սպասարկիչը"
 
-#: index.php:282 libraries/plugins/auth/AuthenticationCookie.class.php:181
+#: index.php:283 libraries/plugins/auth/AuthenticationCookie.class.php:169
 msgid "Server:"
 msgstr "Սպասարկիչը՝"
 
-#: index.php:286
+#: index.php:287
 msgid "Server type:"
 msgstr "Սպասարկչի տեսակը՝"
 
-#: index.php:290 libraries/plugins/export/ExportLatex.class.php:212
+#: index.php:291 libraries/plugins/export/ExportLatex.class.php:212
 #: libraries/plugins/export/ExportSql.class.php:687
 #: libraries/plugins/export/ExportXml.class.php:189
 msgid "Server version:"
 msgstr "Սպասարկչի տարբերակը՝"
 
-#: index.php:296
+#: index.php:297
 msgid "Protocol version:"
 msgstr "Արձանագրության տարբերակը՝"
 
-#: index.php:300
+#: index.php:301
 msgid "User:"
 msgstr "Օգտվող՝"
 
-#: index.php:305
+#: index.php:306
 msgid "Server charset:"
 msgstr "Սպասարկչի կոդավորումը՝"
 
-#: index.php:320
+#: index.php:321
 msgid "Web server"
 msgstr "Վեբ սպասարկիչ"
 
-#: index.php:331
+#: index.php:332
 msgid "Database client version:"
 msgstr "Տվյալների բազայի սպասառուի տարբերակը՝"
 
-#: index.php:335
+#: index.php:336
 msgid "PHP extension:"
 msgstr "PHP ընդլայնումը՝"
 
-#: index.php:349
+#: index.php:350
 msgid "PHP version:"
 msgstr "PHP-ի տարբերակը՝"
 
-#: index.php:360
+#: index.php:361
 msgid "Show PHP information"
 msgstr "Ցուցադրել PHP-ի տվյալները"
 
-#: index.php:383
+#: index.php:384
 msgid "Version information:"
 msgstr "Տարբերակի վերաբերյալ տեղեկությունները՝"
 
-#: index.php:392 libraries/Util.class.php:432 libraries/Util.class.php:495
-#: libraries/config/FormDisplay.tpl.php:151
+#: index.php:393 libraries/Util.class.php:432 libraries/Util.class.php:495
+#: libraries/config/FormDisplay.tpl.php:162
 #: libraries/display_export.lib.php:577 libraries/engines/pbxt.lib.php:162
 #: libraries/navigation/NavigationHeader.class.php:196
 #: libraries/server_variables.lib.php:160
 msgid "Documentation"
 msgstr "Ուղեցույցներ"
 
-#: index.php:399
+#: index.php:400
 msgid "Wiki"
 msgstr "Վիքի"
 
-#: index.php:408
+#: index.php:409
 msgid "Official Homepage"
 msgstr "phpMyAdmin-ի պաշտոնական կայքէջ"
 
-#: index.php:415
+#: index.php:416
 msgid "Contribute"
 msgstr "Աջակցել"
 
-#: index.php:422
+#: index.php:423
 msgid "Get support"
 msgstr "Դիմել օգնությանը"
 
-#: index.php:429
+#: index.php:430
 msgid "List of changes"
 msgstr "Փոփոխացանկ"
 
-#: index.php:451
+#: index.php:452
 msgid ""
 "You are connected as 'root' with no password, which corresponds to the "
 "default MySQL privileged account. Your MySQL server is running with this "
@@ -857,11 +859,11 @@ msgid ""
 "by setting a password for user 'root'."
 msgstr ""
 "Դուք միացել եք որպես 'root' առանց գաղտնաբառի, ինչը համապատասխանում է MySQL-ի "
-"հաշվի լռելյայն արտոնությւոնների կայանքներին։ Տվյալ կայանքներով մենկնարկված "
+"հաշվի լռելյայն արտոնությունների կայանքներին։ Տվյալ կայանքներով մենկնարկված "
 "MySQL սպասարկիչը պաշտպանված չէ ներխուժումներից, ուստի դուք պետք է շտկեք այս "
 "անվտանգություն խոցելիությունը՝ նշանակելով գաղտնաբառ 'root' օգտվողի համար։"
 
-#: index.php:468
+#: index.php:469
 msgid ""
 "You have enabled mbstring.func_overload in your PHP configuration. This "
 "option is incompatible with phpMyAdmin and might cause some data to be "
@@ -871,7 +873,7 @@ msgstr ""
 "դրույթը անհամատեղելի է phpMyAdmin-ի հետ և կարող է հանգեցնել որոշ տվյալների "
 "վնասմանը։"
 
-#: index.php:483
+#: index.php:484
 msgid ""
 "The mbstring PHP extension was not found and you seem to be using a "
 "multibyte charset. Without the mbstring extension phpMyAdmin is unable to "
@@ -882,7 +884,7 @@ msgstr ""
 "ը ի վիճակի չէ տրոհել տողերը ճիշտ կերպով, ինչը կարող է հանգեցնել անսպասելի "
 "արդյունքներին։"
 
-#: index.php:500
+#: index.php:501
 msgid ""
 "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini."
 "session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower than "
@@ -894,22 +896,22 @@ msgstr ""
 "է, քան phpMyAdmin-ում սահմանված թխուկի վավերականությունը, այդ իսկ պատճառով, "
 "ձեր աշխատաշրջանը կարող է սպառվել ավելի շուտ, քան նշանակված է phpMyAdmin-ում։"
 
-#: index.php:519
+#: index.php:520
 msgid ""
 "Login cookie store is lower than cookie validity configured in phpMyAdmin, "
 "because of this, your login will expire sooner than configured in phpMyAdmin."
 msgstr ""
 "Աշխատաշրջանի թխուկի պահպանումը ավելի ցածր է քան phpMyAdmin-ում սահմանված "
-"թխուկի վավերականությւոնը, այդ իսկ պատճառով, ձեր աշխատաշրջանը սպառվելու է "
+"թխուկի վավերականությունը, այդ իսկ պատճառով, ձեր աշխատաշրջանը սպառվելու է "
 "ավելի շուտ, քան նշանակված է phpMyAdmin-ում։"
 
-#: index.php:535
+#: index.php:536
 msgid "The configuration file now needs a secret passphrase (blowfish_secret)."
 msgstr ""
 "Կազմաձևի ֆայլի մեջ այժմ պետք է սահմանել գաղտնի այցեբառակապակցությունը "
 "(blowfish_secret)."
 
-#: index.php:548
+#: index.php:549
 msgid ""
 "Directory [code]config[/code], which is used by the setup script, still "
 "exists in your phpMyAdmin directory. It is strongly recommended to remove it "
@@ -921,7 +923,7 @@ msgstr ""
 "կարգավորելուց անմիջապես հետո, հակառակ դեպքում ձեր սպասարկիչը կարող է "
 "վտանգվել՝ կազմաձևի ֆայլը ոչ իրավազոր անձանց կողմից ներբեռնելու միջոցով։"
 
-#: index.php:564
+#: index.php:565
 #, php-format
 msgid ""
 "The phpMyAdmin configuration storage is not completely configured, some "
@@ -930,14 +932,14 @@ msgstr ""
 "phpMyAdmin-ի կազմաձևի տարածությունը լիովին կազմաձևած չէ, որոշ հավելյալ "
 "հատկությունները կասեցվեցին %sԻմացեք, թե ինչու%s։ "
 
-#: index.php:571
+#: index.php:572
 msgid ""
 "Or alternately go to 'Operations' tab of any database to set it up there."
 msgstr ""
 "Կամ անցեք ցանկացած տվյալների բազայի 'Գործողություններ' ներդիրը՝ այտեղից "
 "կազմաձևելու համար։"
 
-#: index.php:620
+#: index.php:621
 #, php-format
 msgid ""
 "Your PHP MySQL library version %s differs from your MySQL server version %s. "
@@ -946,7 +948,7 @@ msgstr ""
 "Ձեր PHP-ի MySQL դարանի %s տարբերակը տարբերվում է ձեր սպասարկչում տեղակայված "
 "MySQL-ի %s տարբերակից։ Այն կարող է հանգեցնել անկանխատեսելի վարքագծին։"
 
-#: index.php:648
+#: index.php:649
 #, php-format
 msgid ""
 "Server running with Suhosin. Please refer to %sdocumentation%s for possible "
@@ -1106,8 +1108,8 @@ msgstr ""
 msgid "Save & Close"
 msgstr "Պահպանել և փակել"
 
-#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:404
-#: libraries/insert_edit.lib.php:1550 prefs_manage.php:361
+#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:415
+#: libraries/insert_edit.lib.php:1548 prefs_manage.php:361
 #: prefs_manage.php:372
 msgid "Reset"
 msgstr "Վերակայել"
@@ -1140,7 +1142,7 @@ msgstr "Ավելացնել ցուցակագիր"
 msgid "Edit Index"
 msgstr "Խմբագրել ցուցակագիրը"
 
-#: js/messages.php:99 templates/index_form.phtml:232
+#: js/messages.php:99 templates/table/index_form.phtml:232
 #, php-format
 msgid "Add %s column(s) to index"
 msgstr "Ցուցակագրին ավելացնել %s սյունակ"
@@ -1161,13 +1163,14 @@ msgstr "Համալրված՝"
 msgid "Please select column(s) for the index."
 msgstr "Ընտրեք սյունակներ՝ ցուցակագրի համար։"
 
-#: js/messages.php:106 templates/structure/add_column.phtml:1
+#: js/messages.php:106 templates/table/structure/add_column.phtml:1
 msgid "You have to add at least one column."
 msgstr "Անհրաժեշտ է ավելացնել առնվազն մեկ սյունակ։"
 
-#: js/messages.php:109 libraries/insert_edit.lib.php:1548
+#: js/messages.php:109 libraries/insert_edit.lib.php:1546
 #: templates/columns_definitions/column_definitions_form.phtml:162
-#: templates/index_form.phtml:237 templates/tbl_relation/common_form.phtml:106
+#: templates/table/index_form.phtml:237
+#: templates/table/relation/common_form.phtml:106
 msgid "Preview SQL"
 msgstr "SQL-ի նախադիտում"
 
@@ -1184,7 +1187,7 @@ msgid "SQL query:"
 msgstr "SQL հարցում՝"
 
 #. l10n: Default label for the y-Axis of Charts
-#: js/messages.php:118 templates/tbl_chart.phtml:109
+#: js/messages.php:118 templates/table/chart/tbl_chart.phtml:109
 msgid "Y Values"
 msgstr "Y արժեքը"
 
@@ -1335,7 +1338,7 @@ msgstr "Ուղարկված բայթեր"
 msgid "Bytes received"
 msgstr "Ստացած բայթեր"
 
-#: js/messages.php:169 libraries/server_status.lib.php:226
+#: js/messages.php:169 libraries/server_status.lib.php:235
 msgid "Connections"
 msgstr "Կապեր"
 
@@ -1392,12 +1395,12 @@ msgstr "%d աղյուսակ"
 msgid "Questions"
 msgstr "Հարցեր"
 
-#: js/messages.php:184 libraries/server_status.lib.php:134
+#: js/messages.php:184 libraries/server_status.lib.php:143
 msgid "Traffic"
 msgstr "Երթևեկություն"
 
 #: js/messages.php:185 libraries/Menu.class.php:586
-#: libraries/Util.class.php:4318 libraries/server_status_monitor.lib.php:257
+#: libraries/Util.class.php:4324 libraries/server_status_monitor.lib.php:257
 msgid "Settings"
 msgstr "Կայանքներ"
 
@@ -1417,8 +1420,9 @@ msgstr "Ավելացրեք առնվազն մեկ փոփոխական այս շա
 #: libraries/server_status_monitor.lib.php:236
 #: libraries/server_status_processes.lib.php:308
 #: templates/columns_definitions/transformation.phtml:4
-#: templates/designer/options_panel.phtml:178
-#: templates/table/options_zoom.phtml:12 templates/table/rows_zoom.phtml:26
+#: templates/database/designer/options_panel.phtml:178
+#: templates/table/search/options_zoom.phtml:12
+#: templates/table/search/rows_zoom.phtml:26
 msgid "None"
 msgstr "Չկա"
 
@@ -1708,8 +1712,8 @@ msgstr ""
 
 #: js/messages.php:270 libraries/Menu.class.php:352
 #: libraries/Menu.class.php:455 libraries/Menu.class.php:582
-#: libraries/Util.class.php:4317 libraries/Util.class.php:4332
-#: libraries/Util.class.php:4349 libraries/config/messages.inc.php:258
+#: libraries/Util.class.php:4323 libraries/Util.class.php:4338
+#: libraries/Util.class.php:4355 libraries/config/messages.inc.php:258
 #: libraries/display_import.lib.php:105
 #: libraries/server_status_monitor.lib.php:318 prefs_manage.php:238
 #: setup/frames/menu.inc.php:26
@@ -1769,13 +1773,13 @@ msgid "Formatting SQL..."
 msgstr "SQL-ի ձևավորում ..."
 
 #: js/messages.php:293 libraries/server_variables.lib.php:157
-#: templates/designer/aggregate_query_panel.phtml:63
-#: templates/designer/delete_relation_panel.phtml:28
-#: templates/designer/having_query_panel.phtml:117
-#: templates/designer/new_relation_panel.phtml:88
-#: templates/designer/options_panel.phtml:253
-#: templates/designer/rename_to_panel.phtml:45
-#: templates/designer/where_query_panel.phtml:83
+#: templates/database/designer/aggregate_query_panel.phtml:63
+#: templates/database/designer/delete_relation_panel.phtml:28
+#: templates/database/designer/having_query_panel.phtml:117
+#: templates/database/designer/new_relation_panel.phtml:88
+#: templates/database/designer/options_panel.phtml:253
+#: templates/database/designer/rename_to_panel.phtml:45
+#: templates/database/designer/where_query_panel.phtml:83
 msgid "Cancel"
 msgstr "Չեղարկել"
 
@@ -1783,7 +1787,7 @@ msgstr "Չեղարկել"
 msgid "Page-related settings"
 msgstr "Էջերի կայանքներ"
 
-#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:402
+#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:413
 msgid "Apply"
 msgstr "Կիրառել"
 
@@ -1818,8 +1822,8 @@ msgstr "Սխալի կոդ՝ %s"
 msgid "Error text: %s"
 msgstr "Սխալի նկարագրություն՝ %s"
 
-#: js/messages.php:307 libraries/db_common.inc.php:68
-#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:450
+#: js/messages.php:307 libraries/db_common.inc.php:69
+#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:461
 msgid "No databases selected."
 msgstr "Տվյալների բազան ընտրած չէ։"
 
@@ -1831,12 +1835,13 @@ msgstr "Սյունակի ջնջում"
 msgid "Adding Primary Key"
 msgstr "Առաջնային բանալիի ավելացում"
 
-#: js/messages.php:310 templates/designer/aggregate_query_panel.phtml:59
-#: templates/designer/having_query_panel.phtml:113
-#: templates/designer/new_relation_panel.phtml:87
-#: templates/designer/options_panel.phtml:252
-#: templates/designer/rename_to_panel.phtml:41
-#: templates/designer/where_query_panel.phtml:82
+#: js/messages.php:310
+#: templates/database/designer/aggregate_query_panel.phtml:59
+#: templates/database/designer/having_query_panel.phtml:113
+#: templates/database/designer/new_relation_panel.phtml:87
+#: templates/database/designer/options_panel.phtml:252
+#: templates/database/designer/rename_to_panel.phtml:41
+#: templates/database/designer/where_query_panel.phtml:82
 msgid "OK"
 msgstr "Լավ"
 
@@ -1856,7 +1861,7 @@ msgstr "Տվյալների բազայի կրկնապատկում"
 msgid "Changing Charset"
 msgstr "Կոդավորման փոփոխում"
 
-#: js/messages.php:320 libraries/Util.class.php:3217
+#: js/messages.php:320 libraries/Util.class.php:3223
 msgid "Enable foreign key checks"
 msgstr "Միացնել արտաքին բանալիների ստուգումը"
 
@@ -1892,20 +1897,21 @@ msgstr ""
 #: js/messages.php:334 libraries/DisplayResults.class.php:4834
 #: libraries/DisplayResults.class.php:5092 libraries/Menu.class.php:344
 #: libraries/Menu.class.php:446 libraries/Menu.class.php:578
-#: libraries/Util.class.php:3636 libraries/Util.class.php:3637
-#: libraries/Util.class.php:4316 libraries/Util.class.php:4331
-#: libraries/Util.class.php:4348 libraries/config/messages.inc.php:252
+#: libraries/Util.class.php:3642 libraries/Util.class.php:3643
+#: libraries/Util.class.php:4322 libraries/Util.class.php:4337
+#: libraries/Util.class.php:4354 libraries/config/messages.inc.php:252
 #: libraries/display_export.lib.php:173 libraries/rte/rte_list.lib.php:146
 #: libraries/server_privileges.lib.php:2211
 #: libraries/server_privileges.lib.php:2290
 #: libraries/server_privileges.lib.php:2632
 #: libraries/server_privileges.lib.php:3356
 #: libraries/server_status_monitor.lib.php:322 prefs_manage.php:303
-#: setup/frames/menu.inc.php:27 templates/structure/check_all_tables.phtml:11
+#: setup/frames/menu.inc.php:27
+#: templates/database/structure/check_all_tables.phtml:11
 msgid "Export"
 msgstr "Արտահանում"
 
-#: js/messages.php:337 libraries/rte/rte_routines.lib.php:652
+#: js/messages.php:337 libraries/rte/rte_routines.lib.php:743
 msgid "ENUM/SET editor"
 msgstr "ENUM/SET խմբագիր"
 
@@ -1946,7 +1952,7 @@ msgstr "Ցուցադրել հարցման դաշտը"
 #: libraries/Console.class.php:214 libraries/DisplayResults.class.php:3474
 #: libraries/DisplayResults.class.php:4818 libraries/Index.class.php:723
 #: libraries/Util.class.php:706 libraries/Util.class.php:1202
-#: libraries/Util.class.php:3634 libraries/Util.class.php:3635
+#: libraries/Util.class.php:3640 libraries/Util.class.php:3641
 #: libraries/central_columns.lib.php:851
 #: libraries/central_columns.lib.php:1193
 #: libraries/config/messages.inc.php:892
@@ -1964,7 +1970,7 @@ msgstr "Խմբագրել"
 #: libraries/server_user_groups.lib.php:129
 #: libraries/sql_query_form.lib.php:416 libraries/tracking.lib.php:477
 #: setup/frames/index.inc.php:183 setup/frames/index.inc.php:291
-#: templates/designer/delete_relation_panel.phtml:27
+#: templates/database/designer/delete_relation_panel.phtml:27
 msgid "Delete"
 msgstr "Հեռացնել"
 
@@ -2136,11 +2142,11 @@ msgid "No dependencies selected!"
 msgstr "Ընտրած կախվածություններ չկան։"
 
 #: js/messages.php:394 libraries/central_columns.lib.php:1214
-#: libraries/insert_edit.lib.php:1458 libraries/server_variables.lib.php:155
+#: libraries/insert_edit.lib.php:1456 libraries/server_variables.lib.php:155
 #: setup/frames/config.inc.php:42 setup/frames/index.inc.php:279
 #: templates/columns_definitions/column_definitions_form.phtml:165
-#: templates/gis_visualization/gis_visualization.phtml:48
-#: templates/tbl_relation/common_form.phtml:107
+#: templates/table/gis_visualization/gis_visualization.phtml:48
+#: templates/table/relation/common_form.phtml:107
 msgid "Save"
 msgstr "Պահպանել"
 
@@ -2174,11 +2180,11 @@ msgstr "Առավելագույն արժեքը՝"
 
 #: js/messages.php:406
 msgid "Hide find and replace criteria"
-msgstr "Թաքցնել որոնման և փոխարինման եզրերը"
+msgstr "Թաքցնել գտնելու և փոխարինելու եզրերը"
 
 #: js/messages.php:407
 msgid "Show find and replace criteria"
-msgstr "Ցուցադրել որոնման և փոխարինման եզրերը"
+msgstr "Ցուցադրել գտնելու և փոխարինելու եզրերը"
 
 #: js/messages.php:411
 msgid "Each point represents a data row."
@@ -2220,8 +2226,8 @@ msgid "Data point content"
 msgstr "Տվյալների կետի պարունակությունը"
 
 #: js/messages.php:430 js/messages.php:562 js/messages.php:579
-#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2573
-#: templates/index_form.phtml:154 templates/index_form.phtml:194
+#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2571
+#: templates/table/index_form.phtml:154 templates/table/index_form.phtml:194
 msgid "Ignore"
 msgstr "Անտեսել"
 
@@ -2282,8 +2288,8 @@ msgstr "Ընտրեք արտաքին բանալին"
 msgid "Please select the primary key or a unique key!"
 msgstr "Ընտրեք առաջնային բանալիի կամ յուրահատուկ բանալիի սյունակը։"
 
-#: js/messages.php:457 templates/designer/side_menu.phtml:91
-#: templates/designer/side_menu.phtml:94
+#: js/messages.php:457 templates/database/designer/side_menu.phtml:91
+#: templates/database/designer/side_menu.phtml:94
 msgid "Choose column to display"
 msgstr "Ընտրեք սյունակը՝ ցուցադրելու համար"
 
@@ -2299,18 +2305,18 @@ msgstr ""
 msgid "Page name"
 msgstr "Էջի անուն"
 
-#: js/messages.php:463 templates/designer/side_menu.phtml:56
-#: templates/designer/side_menu.phtml:59
+#: js/messages.php:463 templates/database/designer/side_menu.phtml:56
+#: templates/database/designer/side_menu.phtml:59
 msgid "Save page"
 msgstr "Պահպանել էջը"
 
-#: js/messages.php:464 templates/designer/side_menu.phtml:63
-#: templates/designer/side_menu.phtml:66
+#: js/messages.php:464 templates/database/designer/side_menu.phtml:63
+#: templates/database/designer/side_menu.phtml:66
 msgid "Save page as"
 msgstr "Պահպանել էջը որպես"
 
-#: js/messages.php:465 templates/designer/side_menu.phtml:49
-#: templates/designer/side_menu.phtml:52
+#: js/messages.php:465 templates/database/designer/side_menu.phtml:49
+#: templates/database/designer/side_menu.phtml:52
 msgid "Open page"
 msgstr "Բացել էջը"
 
@@ -2318,7 +2324,7 @@ msgstr "Բացել էջը"
 msgid "Delete page"
 msgstr "Ջնջել էջը"
 
-#: js/messages.php:467 templates/designer/side_menu.phtml:10
+#: js/messages.php:467 templates/database/designer/side_menu.phtml:10
 msgid "Untitled"
 msgstr "Առանց վերնագրի"
 
@@ -2438,7 +2444,7 @@ msgstr "Սկզբնական երկարություն"
 msgid "cancel"
 msgstr "չեղարկել"
 
-#: js/messages.php:499 libraries/server_status.lib.php:271
+#: js/messages.php:499 libraries/server_status.lib.php:280
 msgid "Aborted"
 msgstr "Ընդհատված"
 
@@ -2577,7 +2583,7 @@ msgstr "արդի է"
 #: js/messages.php:552 libraries/DisplayResults.class.php:4939
 #: view_create.php:181
 msgid "Create view"
-msgstr "Ստեղծել դիտում"
+msgstr "Ստեղծել ներկայացում"
 
 #: js/messages.php:555
 msgid "Send Error Report"
@@ -3007,7 +3013,7 @@ msgstr "Խնդրում ենք մուտքագրել վավերական տասնվ
 
 #: js/messages.php:793 libraries/Message.class.php:199
 #: libraries/Util.class.php:654 libraries/core.lib.php:245
-#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1172
+#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1170
 #: tbl_operations.php:229 view_operations.php:63
 msgid "Error"
 msgstr "Սխալ"
@@ -3070,8 +3076,8 @@ msgstr "վայրկյանում"
 msgid "per minute"
 msgstr "րոպեում"
 
-#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:143
-#: libraries/server_status.lib.php:228
+#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:152
+#: libraries/server_status.lib.php:237
 #: libraries/server_status_queries.lib.php:98
 msgid "per hour"
 msgstr "ժամում"
@@ -3091,7 +3097,7 @@ msgstr ""
 "Անվավեր արտոնություններ կազմաձևի ֆայլում։ Այն չպետք է բոլորի կողմից գրվող "
 "լինի։"
 
-#: libraries/Config.class.php:1799
+#: libraries/Config.class.php:1801
 msgid "Font size"
 msgstr "Տառաչափ"
 
@@ -3119,10 +3125,10 @@ msgstr "Կրկնել հարցումը"
 #: libraries/server_privileges.lib.php:2890
 #: libraries/server_privileges.lib.php:3144
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4332
+#: libraries/server_privileges.lib.php:4358
 #: libraries/server_status_processes.lib.php:80
-#: templates/tbl_relation/foreign_key_row.phtml:165
-#: templates/tbl_relation/internal_relational_row.phtml:55
+#: templates/table/relation/foreign_key_row.phtml:165
+#: templates/table/relation/internal_relational_row.phtml:55
 msgid "Database"
 msgstr "Տվյալների բազա"
 
@@ -3215,11 +3221,11 @@ msgstr "Պատմություն"
 #: libraries/plugins/import/ImportMediawiki.class.php:60
 #: libraries/plugins/import/ImportOds.class.php:59
 #: libraries/plugins/import/ImportShp.class.php:57
-#: libraries/plugins/import/ImportSql.class.php:148
+#: libraries/plugins/import/ImportSql.class.php:51
 #: libraries/plugins/import/ImportXml.class.php:58
-#: libraries/rte/rte_routines.lib.php:833 templates/index_form.phtml:49
-#: templates/structure/row_stats_table.phtml:20
-#: templates/table/options.phtml:2
+#: libraries/rte/rte_routines.lib.php:924 templates/table/index_form.phtml:49
+#: templates/table/search/options.phtml:2
+#: templates/table/structure/row_stats_table.phtml:20
 msgid "Options"
 msgstr "Կայանքներ"
 
@@ -3252,7 +3258,8 @@ msgstr "ըստ նվազման"
 msgid "Order:"
 msgstr "Հերթականություն՝"
 
-#: libraries/Console.class.php:289 templates/table/replace_preview.phtml:17
+#: libraries/Console.class.php:289
+#: templates/table/search/replace_preview.phtml:17
 msgid "Count"
 msgstr "Քանակ"
 
@@ -3349,9 +3356,9 @@ msgstr "Փոխակրել մուգ ոճին"
 #: libraries/operations.lib.php:794 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:191
-#: templates/structure/sortable_header.phtml:21
-#: templates/structure/sortable_header.phtml:38
-#: templates/table/options.phtml:68
+#: templates/database/structure/sortable_header.phtml:21
+#: templates/database/structure/sortable_header.phtml:38
+#: templates/table/search/options.phtml:68
 msgid "Ascending"
 msgstr "Ըստ աճման"
 
@@ -3361,13 +3368,14 @@ msgstr "Ըստ աճման"
 #: libraries/operations.lib.php:797 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:188
-#: templates/structure/sortable_header.phtml:26
-#: templates/structure/sortable_header.phtml:43
-#: templates/table/options.phtml:69
+#: templates/database/structure/sortable_header.phtml:26
+#: templates/database/structure/sortable_header.phtml:43
+#: templates/table/search/options.phtml:69
 msgid "Descending"
 msgstr "Ըստ նվազման"
 
-#: libraries/DBQbe.class.php:467 templates/table/search_and_replace.phtml:6
+#: libraries/DBQbe.class.php:467
+#: templates/table/search/search_and_replace.phtml:6
 msgid "Column:"
 msgstr "Սյունակ՝"
 
@@ -3526,12 +3534,12 @@ msgstr[0] "%1$s համընկնում <strong>%2$s-ում</strong>"
 msgstr[1] "%1$s համընկնում <strong>%2$s-ում</strong>"
 
 #: libraries/DbSearch.class.php:354 libraries/Menu.class.php:311
-#: libraries/Util.class.php:3337 libraries/Util.class.php:3347
-#: libraries/Util.class.php:3623 libraries/Util.class.php:3624
-#: libraries/Util.class.php:4343 libraries/config.values.php:43
+#: libraries/Util.class.php:3343 libraries/Util.class.php:3353
+#: libraries/Util.class.php:3629 libraries/Util.class.php:3630
+#: libraries/Util.class.php:4349 libraries/config.values.php:43
 #: libraries/config.values.php:51 libraries/config.values.php:119
 #: libraries/navigation/Nodes/Node_Table.class.php:295
-#: templates/structure/check_all_table_column.phtml:5
+#: templates/table/structure/check_all_table_column.phtml:5
 msgid "Browse"
 msgstr "Դիտարկում"
 
@@ -3548,7 +3556,8 @@ msgstr "Որոնումը տվյալների բազայում"
 msgid "Words or values to search for (wildcard: \"%\"):"
 msgstr "Բառեր կամ արժեքներ՝ որոնելու համար (դերանշան՝ \"%\")՝"
 
-#: libraries/DbSearch.class.php:401 templates/table/search_and_replace.phtml:1
+#: libraries/DbSearch.class.php:401
+#: templates/table/search/search_and_replace.phtml:1
 msgid "Find:"
 msgstr "Գտնել՝"
 
@@ -3592,28 +3601,28 @@ msgstr "Զտել տողերը"
 msgid "Search this table"
 msgstr "Որոնել այս աղյուսակում"
 
-#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2532
-#: libraries/Util.class.php:2535
+#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2538
+#: libraries/Util.class.php:2541
 msgctxt "First page"
 msgid "Begin"
 msgstr "Սկիզբ"
 
-#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2533
-#: libraries/Util.class.php:2536 libraries/server_bin_log.lib.php:170
+#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2539
+#: libraries/Util.class.php:2542 libraries/server_bin_log.lib.php:170
 #: libraries/server_bin_log.lib.php:172
 msgctxt "Previous page"
 msgid "Previous"
 msgstr "Նախորդ"
 
-#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2564
-#: libraries/Util.class.php:2574 libraries/server_bin_log.lib.php:204
+#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2570
+#: libraries/Util.class.php:2580 libraries/server_bin_log.lib.php:204
 #: libraries/server_bin_log.lib.php:206
 msgctxt "Next page"
 msgid "Next"
 msgstr "Հաջորդ"
 
-#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2565
-#: libraries/Util.class.php:2575
+#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2571
+#: libraries/Util.class.php:2581
 msgctxt "Last page"
 msgid "End"
 msgstr "Վերջ"
@@ -3647,10 +3656,8 @@ msgid "Relational key"
 msgstr "Կապակցող բանալի"
 
 #: libraries/DisplayResults.class.php:1744
-#, fuzzy
-#| msgid "Displaying Column Comments"
 msgid "Display column for relations"
-msgstr "Սյունակների մեկնաբանությւոնների ցուցադրումը"
+msgstr "Սյունակների մեկնաբանությունների ցուցադրումը"
 
 #: libraries/DisplayResults.class.php:1757
 msgid "Show binary contents"
@@ -3688,15 +3695,15 @@ msgid "May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]."
 msgstr "Կարող է մոտավոր լինել։ Դիմեք [doc@faq3-11]FAQ 3.11[/doc]։"
 
 #: libraries/DisplayResults.class.php:4332 libraries/Message.class.php:180
-#: libraries/controllers/TableRelationController.class.php:258
+#: libraries/controllers/TableRelationController.class.php:259
 #: libraries/controllers/TableSearchController.class.php:655
-#: libraries/rte/rte_routines.lib.php:1332 libraries/sql_query_form.lib.php:89
+#: libraries/rte/rte_routines.lib.php:1423 libraries/sql_query_form.lib.php:89
 #: tbl_operations.php:227 tbl_row_action.php:138 view_operations.php:62
 msgid "Your SQL query has been executed successfully."
 msgstr "Ձեր SQL հարցումը հաջողությամբ կատարվեց։"
 
 #: libraries/DisplayResults.class.php:4660
-#: libraries/controllers/StructureController.class.php:629
+#: libraries/controllers/DatabaseStructureController.class.php:564
 #, php-format
 msgid ""
 "This view has at least this number of rows. Please refer to %sdocumentation"
@@ -3718,33 +3725,33 @@ msgstr "Ընդամենը %1$d,%2$d հարցման մեջ"
 msgid "%d total"
 msgstr "Ընդամենը %d"
 
-#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1318
+#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1312
 #, php-format
 msgid "Query took %01.4f seconds."
 msgstr "Հարցումը տևեց %01.4f վայրկյան։"
 
 #: libraries/DisplayResults.class.php:4807
-#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4767
-#: libraries/Util.class.php:4773 libraries/mult_submits.inc.php:50
-#: templates/structure/check_all_tables.phtml:2
-#: templates/structure/check_all_tables.phtml:9
+#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4773
+#: libraries/Util.class.php:4779 libraries/mult_submits.inc.php:50
+#: templates/database/structure/check_all_tables.phtml:2
+#: templates/database/structure/check_all_tables.phtml:9
 msgid "With selected:"
 msgstr "Ներառյալ նշվածները՝"
 
 #: libraries/DisplayResults.class.php:4811
-#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4769
-#: libraries/Util.class.php:4770 libraries/server_privileges.lib.php:1174
+#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4775
+#: libraries/Util.class.php:4776 libraries/server_privileges.lib.php:1174
 #: libraries/server_privileges.lib.php:1175
 #: libraries/server_privileges.lib.php:1387
 #: libraries/server_user_groups.lib.php:231
-#: templates/structure/check_all_tables.phtml:3
-#: templates/structure/check_all_tables.phtml:4
+#: templates/database/structure/check_all_tables.phtml:3
+#: templates/database/structure/check_all_tables.phtml:4
 msgid "Check All"
 msgstr "Նշել բոլորը"
 
 #: libraries/DisplayResults.class.php:4985 libraries/Header.class.php:383
-#: templates/structure/optional_action_links.phtml:1
-#: templates/structure/print_view_data_dictionary_link.phtml:3
+#: templates/database/structure/print_view_data_dictionary_link.phtml:3
+#: templates/table/structure/optional_action_links.phtml:1
 msgid "Print view"
 msgstr "Տպման տարբերակը"
 
@@ -3752,7 +3759,8 @@ msgstr "Տպման տարբերակը"
 msgid "Query results operations"
 msgstr "Հարցման արդյունքների օգտագործումը"
 
-#: libraries/DisplayResults.class.php:5105 templates/tbl_chart.phtml:12
+#: libraries/DisplayResults.class.php:5105
+#: templates/table/chart/tbl_chart.phtml:12
 msgid "Display chart"
 msgstr "Ցուցադրել գծապատկերը"
 
@@ -3823,10 +3831,8 @@ msgid "Error while moving uploaded file."
 msgstr "Վերբեռնված ֆայլի տեղափոխման սխալ։"
 
 #: libraries/File.class.php:487
-#, fuzzy
-#| msgid "File was not an uploaded file."
 msgid "Cannot read uploaded file."
-msgstr "Ֆայլը՝ վերբեռնված ֆայլ չէր։"
+msgstr "Չհաջողվեց կարդալ վերբեռնված ֆայլը։"
 
 #: libraries/Footer.class.php:74
 #, php-format
@@ -3847,7 +3853,7 @@ msgid "Click on the bar to scroll to top of page"
 msgstr ""
 
 #: libraries/Header.class.php:749
-#: libraries/plugins/auth/AuthenticationCookie.class.php:152
+#: libraries/plugins/auth/AuthenticationCookie.class.php:140
 msgid "Javascript must be enabled past this point!"
 msgstr "Javascript-ը պետք է միացրած լինի այս պահից սկսած։"
 
@@ -3869,11 +3875,11 @@ msgid "Keyname"
 msgstr "Բանալիի անվանումը"
 
 #: libraries/Index.class.php:697
-#: libraries/controllers/StructureController.class.php:1962
-#: libraries/controllers/StructureController.class.php:1967
+#: libraries/controllers/TableStructureController.class.php:953
+#: libraries/controllers/TableStructureController.class.php:958
 #: libraries/tracking.lib.php:973
 #: templates/columns_definitions/column_indexes.phtml:11
-#: templates/structure/check_all_table_column.phtml:26
+#: templates/table/structure/check_all_table_column.phtml:26
 msgid "Unique"
 msgstr "Յուրահատուկ"
 
@@ -3892,16 +3898,17 @@ msgstr "Բազմության հզորություն"
 #: libraries/server_collations.lib.php:35 libraries/tracking.lib.php:881
 #: libraries/tracking.lib.php:977
 #: templates/columns_definitions/table_fields_definitions.phtml:33
-#: templates/structure/row_stats_table.phtml:31
-#: templates/structure/table_header.phtml:55
-#: templates/structure/table_structure_header.phtml:7
-#: templates/table/table_header.phtml:8
+#: templates/database/structure/table_header.phtml:55
+#: templates/table/search/table_header.phtml:8
+#: templates/table/structure/row_stats_table.phtml:31
+#: templates/table/structure/table_structure_header.phtml:7
 msgid "Collation"
 msgstr "Համեմատումը"
 
 #: libraries/Index.class.php:703 libraries/rte/rte_events.lib.php:496
-#: libraries/rte/rte_routines.lib.php:956 libraries/tracking.lib.php:885
-#: libraries/tracking.lib.php:979 templates/structure/table_header.phtml:84
+#: libraries/rte/rte_routines.lib.php:1047 libraries/tracking.lib.php:885
+#: libraries/tracking.lib.php:979
+#: templates/database/structure/table_header.phtml:84
 msgid "Comment"
 msgstr "Մեկնաբանություն"
 
@@ -3914,15 +3921,15 @@ msgstr "Առաջնային բանալին ջնջվեց։"
 msgid "Index %s has been dropped."
 msgstr "%s ցուցակագիրը ջնջվեց։"
 
-#: libraries/Index.class.php:757 libraries/Util.class.php:3630
-#: libraries/Util.class.php:3631
-#: libraries/controllers/StructureController.class.php:1958
-#: libraries/controllers/StructureController.class.php:1959
+#: libraries/Index.class.php:757 libraries/Util.class.php:3636
+#: libraries/Util.class.php:3637
+#: libraries/controllers/TableStructureController.class.php:949
+#: libraries/controllers/TableStructureController.class.php:950
 #: libraries/operations.lib.php:1607 libraries/rte/rte_list.lib.php:150
 #: libraries/server_databases.lib.php:146
-#: templates/structure/check_all_table_column.phtml:15
-#: templates/structure/check_all_tables.phtml:16
-#: templates/tbl_relation/foreign_key_row.phtml:93
+#: templates/database/structure/check_all_tables.phtml:16
+#: templates/table/relation/foreign_key_row.phtml:93
+#: templates/table/structure/check_all_table_column.phtml:15
 msgid "Drop"
 msgstr "Ջնջել"
 
@@ -3955,16 +3962,16 @@ msgstr "Սպասարկիչ"
 #: libraries/Menu.class.php:248
 #: libraries/navigation/Nodes/Node_View.class.php:32
 #: libraries/tbl_info.inc.php:63
-#: templates/structure/structure_table_row.phtml:97
-#: templates/structure/structure_table_row.phtml:159
+#: templates/database/structure/structure_table_row.phtml:97
+#: templates/database/structure/structure_table_row.phtml:159
 msgid "View"
 msgstr "Ներկայացում"
 
 #: libraries/Menu.class.php:325 libraries/Menu.class.php:429
-#: libraries/Menu.class.php:548 libraries/Util.class.php:3334
-#: libraries/Util.class.php:3344 libraries/Util.class.php:3350
-#: libraries/Util.class.php:4313 libraries/Util.class.php:4328
-#: libraries/Util.class.php:4345 libraries/config.values.php:40
+#: libraries/Menu.class.php:548 libraries/Util.class.php:3340
+#: libraries/Util.class.php:3350 libraries/Util.class.php:3356
+#: libraries/Util.class.php:4319 libraries/Util.class.php:4334
+#: libraries/Util.class.php:4351 libraries/config.values.php:40
 #: libraries/config.values.php:48 libraries/config.values.php:110
 #: libraries/config.values.php:116 libraries/config/messages.inc.php:321
 #: libraries/navigation/Nodes/Node_Table.class.php:292
@@ -3972,19 +3979,19 @@ msgid "SQL"
 msgstr "SQL"
 
 #: libraries/Menu.class.php:328 libraries/Menu.class.php:432
-#: libraries/Util.class.php:3335 libraries/Util.class.php:3345
-#: libraries/Util.class.php:3351 libraries/Util.class.php:3625
-#: libraries/Util.class.php:3626 libraries/Util.class.php:4329
-#: libraries/Util.class.php:4346 libraries/config.values.php:41
+#: libraries/Util.class.php:3341 libraries/Util.class.php:3351
+#: libraries/Util.class.php:3357 libraries/Util.class.php:3631
+#: libraries/Util.class.php:3632 libraries/Util.class.php:4335
+#: libraries/Util.class.php:4352 libraries/config.values.php:41
 #: libraries/config.values.php:49 libraries/config.values.php:111
 #: libraries/config.values.php:117
 #: libraries/navigation/Nodes/Node_Table.class.php:286
 msgid "Search"
 msgstr "Որոնում"
 
-#: libraries/Menu.class.php:338 libraries/Util.class.php:3336
-#: libraries/Util.class.php:3346 libraries/Util.class.php:3627
-#: libraries/Util.class.php:3628 libraries/Util.class.php:4347
+#: libraries/Menu.class.php:338 libraries/Util.class.php:3342
+#: libraries/Util.class.php:3352 libraries/Util.class.php:3633
+#: libraries/Util.class.php:3634 libraries/Util.class.php:4353
 #: libraries/config.values.php:42 libraries/config.values.php:50
 #: libraries/config.values.php:118
 #: libraries/navigation/Nodes/Node_Table.class.php:289
@@ -3993,30 +4000,30 @@ msgid "Insert"
 msgstr "Զետեղել"
 
 #: libraries/Menu.class.php:362 libraries/Menu.class.php:467
-#: libraries/Util.class.php:4334 libraries/Util.class.php:4350
+#: libraries/Util.class.php:4340 libraries/Util.class.php:4356
 #: libraries/config.values.php:106 libraries/server_common.lib.php:51
 #: libraries/server_privileges.lib.php:2370
 #: libraries/server_privileges.lib.php:3158
-#: libraries/server_privileges.lib.php:4221
+#: libraries/server_privileges.lib.php:4247
 msgid "Privileges"
 msgstr "Արտոնություններ"
 
 #: libraries/Menu.class.php:371 libraries/Menu.class.php:379
-#: libraries/Menu.class.php:459 libraries/Util.class.php:3338
-#: libraries/Util.class.php:3352 libraries/Util.class.php:4333
-#: libraries/Util.class.php:4351 libraries/config.values.php:112
+#: libraries/Menu.class.php:459 libraries/Util.class.php:3344
+#: libraries/Util.class.php:3358 libraries/Util.class.php:4339
+#: libraries/Util.class.php:4357 libraries/config.values.php:112
 #: view_operations.php:92
 msgid "Operations"
 msgstr "Գործողություններ"
 
 #: libraries/Menu.class.php:384 libraries/Menu.class.php:492
-#: libraries/Util.class.php:4338 libraries/Util.class.php:4352
+#: libraries/Util.class.php:4344 libraries/Util.class.php:4358
 #: libraries/relation.lib.php:255
 msgid "Tracking"
 msgstr "Հետագծում"
 
 #: libraries/Menu.class.php:397 libraries/Menu.class.php:486
-#: libraries/Util.class.php:4337 libraries/Util.class.php:4353
+#: libraries/Util.class.php:4343 libraries/Util.class.php:4359
 #: libraries/navigation/Nodes/Node_Trigger_Container.class.php:24
 #: libraries/plugins/export/ExportHtmlword.class.php:557
 #: libraries/plugins/export/ExportOdt.class.php:685
@@ -4033,16 +4040,16 @@ msgstr "Ձգաններ"
 msgid "Database seems to be empty!"
 msgstr "Տվյալների բազան դատարկ է"
 
-#: libraries/Menu.class.php:439 libraries/Util.class.php:4330
+#: libraries/Menu.class.php:439 libraries/Util.class.php:4336
 msgid "Query"
 msgstr "Հարցում"
 
-#: libraries/Menu.class.php:472 libraries/Util.class.php:4335
+#: libraries/Menu.class.php:472 libraries/Util.class.php:4341
 #: libraries/rte/rte_words.lib.php:36
 msgid "Routines"
 msgstr "Գործընթացներ"
 
-#: libraries/Menu.class.php:479 libraries/Util.class.php:4336
+#: libraries/Menu.class.php:479 libraries/Util.class.php:4342
 #: libraries/navigation/Nodes/Node_Event_Container.class.php:26
 #: libraries/plugins/export/ExportSql.class.php:940
 #: libraries/plugins/export/ExportXml.class.php:107
@@ -4050,20 +4057,20 @@ msgstr "Գործընթացներ"
 msgid "Events"
 msgstr "Իրադարձություններ"
 
-#: libraries/Menu.class.php:498 libraries/Util.class.php:4339
+#: libraries/Menu.class.php:498 libraries/Util.class.php:4345
 msgid "Designer"
 msgstr "Ձևավորող"
 
-#: libraries/Menu.class.php:507 libraries/Util.class.php:4340
-#: templates/structure/check_all_tables.phtml:35
+#: libraries/Menu.class.php:507 libraries/Util.class.php:4346
+#: templates/database/structure/check_all_tables.phtml:35
 msgid "Central columns"
 msgstr "Կենտրոնական սյունակներ"
 
-#: libraries/Menu.class.php:544 libraries/Util.class.php:4312
+#: libraries/Menu.class.php:544 libraries/Util.class.php:4318
 #: libraries/config.values.php:103 libraries/config/messages.inc.php:266
 #: libraries/config/messages.inc.php:341
 #: libraries/navigation/NavigationTree.class.php:1239
-#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4332
+#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4358
 msgid "Databases"
 msgstr "Տվյալների բազաներ"
 
@@ -4072,34 +4079,34 @@ msgid "User accounts"
 msgstr "Օգտվողների հաշիվներ"
 
 #: libraries/Menu.class.php:595 libraries/ServerStatusData.class.php:121
-#: libraries/Util.class.php:4319 libraries/server_common.lib.php:36
+#: libraries/Util.class.php:4325 libraries/server_common.lib.php:36
 msgid "Binary log"
 msgstr "Երկուական մատյան"
 
 #: libraries/Menu.class.php:601 libraries/ServerStatusData.class.php:126
-#: libraries/Util.class.php:4320 libraries/server_common.lib.php:42
-#: templates/structure/body_for_table_summary.phtml:10
-#: templates/structure/table_header.phtml:27
+#: libraries/Util.class.php:4326 libraries/server_common.lib.php:42
+#: templates/database/structure/body_for_table_summary.phtml:10
+#: templates/database/structure/table_header.phtml:27
 msgid "Replication"
-msgstr "Վերարադրում"
+msgstr "Կրկնապատկում"
 
 #: libraries/Menu.class.php:606 libraries/ServerStatusData.class.php:193
-#: libraries/Util.class.php:4321 libraries/config.values.php:105
+#: libraries/Util.class.php:4327 libraries/config.values.php:105
 #: libraries/server_engines.lib.php:108 libraries/server_engines.lib.php:112
 #: libraries/sql_query_form.lib.php:421
 msgid "Variables"
 msgstr "Փոփոխականներ"
 
-#: libraries/Menu.class.php:610 libraries/Util.class.php:4322
+#: libraries/Menu.class.php:610 libraries/Util.class.php:4328
 msgid "Charsets"
 msgstr "Կոդավորումներ"
 
-#: libraries/Menu.class.php:615 libraries/Util.class.php:4323
+#: libraries/Menu.class.php:615 libraries/Util.class.php:4329
 #: libraries/server_common.lib.php:33 libraries/server_plugins.lib.php:27
 msgid "Plugins"
 msgstr "Խրվակներ"
 
-#: libraries/Menu.class.php:626 libraries/Util.class.php:4324
+#: libraries/Menu.class.php:626 libraries/Util.class.php:4330
 msgid "Engines"
 msgstr "Շարժիչներ"
 
@@ -4114,17 +4121,17 @@ msgstr[1] "ազդվել է %1$d տող։"
 #, php-format
 msgid "%1$d row deleted."
 msgid_plural "%1$d rows deleted."
-msgstr[0] "%1$d տող ջնջվեց."
-msgstr[1] "%1$d տող ջնջվեց."
+msgstr[0] "%1$d տող ջնջվեց։"
+msgstr[1] "%1$d տող ջնջվեց։"
 
 #: libraries/Message.class.php:292
 #, php-format
 msgid "%1$d row inserted."
 msgid_plural "%1$d rows inserted."
-msgstr[0] "%1$d տող զետեղվեց."
-msgstr[1] "%1$d տող զետեղվեց."
+msgstr[0] "%1$d տող զետեղվեց։"
+msgstr[1] "%1$d տող զետեղվեց։"
 
-#: libraries/PDF.class.php:70 libraries/Util.class.php:2521
+#: libraries/PDF.class.php:70 libraries/Util.class.php:2527
 #: libraries/browse_foreigners.lib.php:327
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:865
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:890
@@ -4145,13 +4152,13 @@ msgid "Could not save favorite table!"
 msgstr "Չհաջողվեց պահպանել ընտրյալ աղյուսակը։"
 
 #: libraries/RecentFavoriteTable.class.php:212
-#: templates/structure/favorite_anchor.phtml:12
+#: templates/database/structure/favorite_anchor.phtml:12
 msgid "Remove from Favorites"
 msgstr "Ջնջել ընտրյալներից"
 
 #: libraries/RecentFavoriteTable.class.php:234
 msgid "There are no recent tables."
-msgstr "Վերջին օգտագործված աղյուսակներ չկան։"
+msgstr "Վերջերս օգտագործված աղյուսակներ չկան։"
 
 #: libraries/RecentFavoriteTable.class.php:235
 msgid "There are no favorite tables."
@@ -4159,7 +4166,7 @@ msgstr "Ընտրյալ աղյուսակներ չկան։"
 
 #: libraries/RecentFavoriteTable.class.php:250
 msgid "Recent tables"
-msgstr "Վերջերս օգտագործված այուսակները"
+msgstr "Վերջին աղյուսակները"
 
 #: libraries/RecentFavoriteTable.class.php:252
 msgid "Recent"
@@ -4172,7 +4179,7 @@ msgstr "Ընտրյալ աղյուսակներ"
 
 #: libraries/RecentFavoriteTable.class.php:256
 msgid "Favorites"
-msgstr "Ընտրյալ"
+msgstr "Ընտրյալներ"
 
 #: libraries/SavedSearches.class.php:246
 msgid "Please provide a name for this bookmarked search."
@@ -4312,7 +4319,7 @@ msgstr ""
 "բացակայում են։"
 
 #: libraries/StorageEngine.class.php:373
-#: templates/structure/body_for_table_summary.phtml:50
+#: templates/database/structure/body_for_table_summary.phtml:50
 #, php-format
 msgid "%s is the default storage engine on this MySQL server."
 msgstr "%s-ը հանդիսանում է MySQL սպասարկչի լռելյայն պահպանման շարժիչը։"
@@ -4724,10 +4731,10 @@ msgstr "Վերլուծման ժամանակ գտնվել է %d սխալ։"
 
 #: libraries/Util.class.php:726 libraries/rte/rte_events.lib.php:110
 #: libraries/rte/rte_events.lib.php:119 libraries/rte/rte_events.lib.php:150
-#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:153
-#: libraries/rte/rte_routines.lib.php:162
-#: libraries/rte/rte_routines.lib.php:235
-#: libraries/rte/rte_routines.lib.php:1366
+#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:223
+#: libraries/rte/rte_routines.lib.php:250
+#: libraries/rte/rte_routines.lib.php:372
+#: libraries/rte/rte_routines.lib.php:1457
 #: libraries/rte/rte_triggers.lib.php:86 libraries/rte/rte_triggers.lib.php:95
 #: libraries/rte/rte_triggers.lib.php:127
 msgid "MySQL said: "
@@ -4771,75 +4778,78 @@ msgstr "Կիր"
 msgid "%B %d, %Y at %I:%M %p"
 msgstr "%B %d, %Yթ. ժ. %H:%M"
 
-#: libraries/Util.class.php:2019
+#: libraries/Util.class.php:2025
 #, php-format
 msgid "%s days, %s hours, %s minutes and %s seconds"
 msgstr "%s օր, %s ժամ, %s րոպե և %s վայրկյան"
 
-#: libraries/Util.class.php:2112
+#: libraries/Util.class.php:2118
 msgid "Missing parameter:"
 msgstr ""
 
-#: libraries/Util.class.php:2645
+#: libraries/Util.class.php:2651
 #, php-format
 msgid "Jump to database \"%s\"."
-msgstr ""
+msgstr "Զանցել \"%s\" տվյալների բազային։"
 
-#: libraries/Util.class.php:2670
+#: libraries/Util.class.php:2676
 #, php-format
 msgid "The %s functionality is affected by a known bug, see %s"
 msgstr ""
 
-#: libraries/Util.class.php:2881
+#: libraries/Util.class.php:2887
 msgid "Click to toggle"
 msgstr "Կտտացրեք՝ փոխարկելու համար"
 
-#: libraries/Util.class.php:3542 prefs_manage.php:248
+#: libraries/Util.class.php:3548 prefs_manage.php:248
 msgid "Browse your computer:"
 msgstr ""
 
-#: libraries/Util.class.php:3567
+#: libraries/Util.class.php:3573
 #, php-format
 msgid "Select from the web server upload directory <b>%s</b>:"
 msgstr ""
 
-#: libraries/Util.class.php:3596 libraries/insert_edit.lib.php:1173
+#: libraries/Util.class.php:3602 libraries/insert_edit.lib.php:1171
 msgid "The directory you set for upload work cannot be reached."
 msgstr ""
 
-#: libraries/Util.class.php:3607
+#: libraries/Util.class.php:3613
 msgid "There are no files to upload!"
 msgstr ""
 
-#: libraries/Util.class.php:3632 libraries/Util.class.php:3633
-#: templates/structure/check_all_tables.phtml:15
+#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: templates/database/structure/check_all_tables.phtml:15
 msgid "Empty"
 msgstr "Դատարկել"
 
-#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: libraries/Util.class.php:3644 libraries/Util.class.php:3645
 msgid "Execute"
 msgstr "Կատարել"
 
-#: libraries/Util.class.php:4152
+#: libraries/Util.class.php:4158
 msgid "Print"
 msgstr "Տպել"
 
-#: libraries/Util.class.php:4257 templates/structure/row_stats_table.phtml:80
-#: templates/structure/table_header.phtml:95
+#: libraries/Util.class.php:4263
+#: templates/database/structure/table_header.phtml:95
+#: templates/table/structure/row_stats_table.phtml:80
 msgid "Creation"
 msgstr "Ստեղծում"
 
-#: libraries/Util.class.php:4263 templates/structure/row_stats_table.phtml:87
-#: templates/structure/table_header.phtml:106
+#: libraries/Util.class.php:4269
+#: templates/database/structure/table_header.phtml:106
+#: templates/table/structure/row_stats_table.phtml:87
 msgid "Last update"
 msgstr "Վերջին թարմացումը"
 
-#: libraries/Util.class.php:4269 templates/structure/row_stats_table.phtml:94
-#: templates/structure/table_header.phtml:117
+#: libraries/Util.class.php:4275
+#: templates/database/structure/table_header.phtml:117
+#: templates/table/structure/row_stats_table.phtml:94
 msgid "Last check"
 msgstr "Վերջին ստուգումը"
 
-#: libraries/Util.class.php:4315
+#: libraries/Util.class.php:4321
 msgid "Users"
 msgstr "Օգտվողներ"
 
@@ -4860,28 +4870,30 @@ msgid "Use this value"
 msgstr "Օգտագործել այս արժեքը"
 
 #: libraries/build_html_for_db.lib.php:33 libraries/import.lib.php:193
-#: templates/structure/actions_in_table_structure.phtml:113
-#: templates/structure/row_stats_table.phtml:42
-#: templates/structure/table_header.phtml:36
+#: templates/database/structure/table_header.phtml:36
+#: templates/table/structure/actions_in_table_structure.phtml:113
+#: templates/table/structure/row_stats_table.phtml:42
 msgid "Rows"
 msgstr "Տողեր"
 
 #: libraries/build_html_for_db.lib.php:48 libraries/engines/innodb.lib.php:171
-#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:186
-#: libraries/server_status.lib.php:298
-#: templates/structure/display_table_stats.phtml:40
+#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:195
+#: libraries/server_status.lib.php:307
+#: templates/table/structure/display_table_stats.phtml:40
 msgid "Total"
-msgstr ""
+msgstr "Ընդամենը"
 
 #: libraries/build_html_for_db.lib.php:96
 msgid "Jump to database"
-msgstr ""
+msgstr "Զանցել տվյալների բազային"
 
 #: libraries/build_html_for_db.lib.php:146
+#: templates/database/structure/structure_table_row.phtml:15
 msgid "Not replicated"
 msgstr ""
 
 #: libraries/build_html_for_db.lib.php:158
+#: templates/database/structure/structure_table_row.phtml:16
 msgid "Replicated"
 msgstr ""
 
@@ -4934,17 +4946,17 @@ msgstr "ՈՉ"
 #: libraries/plugins/export/ExportTexytext.class.php:425
 #: libraries/plugins/export/PMA_ExportPdf.class.php:307
 #: libraries/rte/rte_list.lib.php:73 libraries/rte/rte_list.lib.php:85
-#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:830
-#: libraries/rte/rte_routines.lib.php:1492 setup/frames/index.inc.php:162
+#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:921
+#: libraries/rte/rte_routines.lib.php:1583 setup/frames/index.inc.php:162
 #: templates/columns_definitions/table_fields_definitions.phtml:8
-#: templates/structure/table_structure_header.phtml:5
-#: templates/table/create_table.phtml:11
+#: templates/database/create_table.phtml:11
+#: templates/table/structure/table_structure_header.phtml:5
 msgid "Name"
 msgstr "Անուն"
 
 #: libraries/central_columns.lib.php:699
 #: libraries/central_columns.lib.php:1381
-#: libraries/rte/rte_routines.lib.php:832
+#: libraries/rte/rte_routines.lib.php:923
 #: templates/columns_definitions/table_fields_definitions.phtml:14
 msgid "Length/Values"
 msgstr ""
@@ -4963,7 +4975,7 @@ msgid "Select a table"
 msgstr "Ընտրել աղյուսակը"
 
 #: libraries/central_columns.lib.php:804
-#: templates/structure/add_column.phtml:4
+#: templates/table/structure/add_column.phtml:4
 msgid "Add column"
 msgstr "Ավելացնել սյունակ"
 
@@ -4979,7 +4991,7 @@ msgstr "Ավելացնել նոր սյունակ"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1002
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1025
 #: templates/columns_definitions/table_fields_definitions.phtml:36
-#: templates/structure/table_structure_header.phtml:8
+#: templates/table/structure/table_structure_header.phtml:8
 msgid "Attributes"
 msgstr "Հատկանիշներ"
 
@@ -5088,7 +5100,7 @@ msgid "Double click"
 msgstr "Երկկտտոց"
 
 #: libraries/config.values.php:95 libraries/config.values.php:124
-#: libraries/config/FormDisplay.tpl.php:221 libraries/relation.lib.php:97
+#: libraries/config/FormDisplay.tpl.php:232 libraries/relation.lib.php:97
 #: libraries/relation.lib.php:105
 msgid "Disabled"
 msgstr "Կասեցված"
@@ -5258,21 +5270,21 @@ msgstr ""
 msgid "maximum %s"
 msgstr "առավելագույն %s"
 
-#: libraries/config/FormDisplay.tpl.php:219
+#: libraries/config/FormDisplay.tpl.php:230
 msgid "This setting is disabled, it will not be applied to your configuration."
 msgstr ""
 
-#: libraries/config/FormDisplay.tpl.php:313
+#: libraries/config/FormDisplay.tpl.php:324
 #, php-format
 msgid "Set value: %s"
 msgstr "Սահմանել արժեքը՝ %s"
 
-#: libraries/config/FormDisplay.tpl.php:318
+#: libraries/config/FormDisplay.tpl.php:329
 #: libraries/config/messages.inc.php:610
 msgid "Restore default value"
 msgstr "Վերականգնել լռելյայն արժեքը"
 
-#: libraries/config/FormDisplay.tpl.php:332
+#: libraries/config/FormDisplay.tpl.php:343
 msgid "Allow users to customize this value"
 msgstr "Թույլատրել օգտվողներին՝ փոփոխել այս արժեքը"
 
@@ -5691,7 +5703,7 @@ msgstr ""
 
 #: libraries/config/messages.inc.php:136 libraries/config/messages.inc.php:152
 #: libraries/sql_query_form.lib.php:247
-#: templates/structure/row_stats_table.phtml:7
+#: templates/table/structure/row_stats_table.phtml:7
 msgid "Format"
 msgstr ""
 
@@ -5891,7 +5903,7 @@ msgstr "Տվյալների զետեղման ժամանակ օգտագործել
 #: libraries/config/messages.inc.php:212
 #: libraries/plugins/export/ExportSql.class.php:425
 msgid "Maximal length of created query"
-msgstr ""
+msgstr "Ստեղծվող հարցման առավելագույն երկարությունը"
 
 #: libraries/config/messages.inc.php:218
 msgid "Export type"
@@ -6186,7 +6198,7 @@ msgstr ""
 
 #: libraries/config/messages.inc.php:332
 #: libraries/plugins/export/ExportPdf.class.php:279
-#: templates/structure/secondary_tabs.phtml:8
+#: templates/table/secondary_tabs.phtml:8
 msgid "Table structure"
 msgstr "Աղյուսակի կառուցվածքը"
 
@@ -6636,7 +6648,7 @@ msgstr ""
 
 #: libraries/config/messages.inc.php:540
 msgid "Recently used tables"
-msgstr "Վերջերս օգտագործված այուսակները"
+msgstr "Վերջերս օգտագործված աղյուսակները"
 
 #: libraries/config/messages.inc.php:542
 msgid "These are Edit, Copy and Delete links."
@@ -7231,10 +7243,12 @@ msgid ""
 "Whether the tracking mechanism creates versions for tables and views "
 "automatically."
 msgstr ""
+"Արդյո՞ք հետագծման սցենարը պետք է ինքնաշխատ կերպով ստեղծի աղյուսակների և "
+"ներկայացումների տարբերակները։"
 
 #: libraries/config/messages.inc.php:802
 msgid "Automatically create versions"
-msgstr ""
+msgstr "Տարբերակների ինքնաշխատ ստեղծում"
 
 #: libraries/config/messages.inc.php:804
 msgid ""
@@ -7313,7 +7327,7 @@ msgstr "Ցուցադրել գաղտնաբառը փոխելու ձևը"
 
 #: libraries/config/messages.inc.php:842
 msgid "Show create database form"
-msgstr "Ցորցադրել տվյալների բազայի ստեղծման ձևը"
+msgstr "Ցուցադրել տվյալների բազայի ստեղծման ձևը"
 
 #: libraries/config/messages.inc.php:844
 msgid "Show or hide a column displaying the comments for all tables."
@@ -7405,7 +7419,7 @@ msgstr ""
 
 #: libraries/config/messages.inc.php:883 libraries/sql_query_form.lib.php:351
 msgid "Retain query box"
-msgstr ""
+msgstr "Թողնել հարցման դաշտը"
 
 #: libraries/config/messages.inc.php:885
 msgid "Allow to display database and table statistics (eg. space usage)."
@@ -7684,101 +7698,33 @@ msgstr ""
 msgid "OpenDocument Text"
 msgstr ""
 
-#: libraries/controllers/StructureController.class.php:465
+#: libraries/controllers/DatabaseStructureController.class.php:405
 #: tbl_operations.php:382
 #, php-format
 msgid "Table %s has been emptied."
 msgstr "%s աղյուսակը դատարկվել է։"
 
-#: libraries/controllers/StructureController.class.php:486
+#: libraries/controllers/DatabaseStructureController.class.php:426
 #: tbl_operations.php:400 view_operations.php:119
 #, php-format
 msgid "View %s has been dropped."
 msgstr "%s ներկայացումը ջնջվեց։"
 
-#: libraries/controllers/StructureController.class.php:487
+#: libraries/controllers/DatabaseStructureController.class.php:427
 #: tbl_operations.php:401
 #, php-format
 msgid "Table %s has been dropped."
 msgstr "%s աղյուսակը ջնջվեց։"
 
-#: libraries/controllers/StructureController.class.php:797
-#, php-format
-msgid "The name '%s' is a MySQL reserved keyword."
-msgid_plural "The names '%s' are MySQL reserved keywords."
-msgstr[0] ""
-msgstr[1] ""
-
-#: libraries/controllers/StructureController.class.php:875
-msgid "No column selected."
-msgstr "Ընտրած սյունակներ չկան։"
-
-#: libraries/controllers/StructureController.class.php:1049
+#: libraries/controllers/DatabaseStructureController.class.php:733
 msgid "Favorite List is full!"
 msgstr ""
 
-#: libraries/controllers/StructureController.class.php:1272
-msgid "The columns have been moved successfully."
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1535
-#, php-format
-msgid ""
-"Table %1$s has been altered successfully. Privileges have been adjusted."
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1541
-#: libraries/controllers/TableIndexesController.class.php:161
-#: tbl_addfield.php:92
-#, php-format
-msgid "Table %1$s has been altered successfully."
-msgstr "%1$s աղյուսակը հաջողությամբ փոխվել է։"
-
-#: libraries/controllers/StructureController.class.php:1588
-#: libraries/tracking.lib.php:1094
-msgid "Query error"
-msgstr "Հարցման սխալ"
-
-#: libraries/controllers/StructureController.class.php:1806
+#: libraries/controllers/DatabaseStructureController.class.php:947
 #: libraries/mysql_charsets.lib.php:366 libraries/mysql_charsets.lib.php:373
 msgid "unknown"
 msgstr "անհայտ"
 
-#: libraries/controllers/StructureController.class.php:1957
-#: templates/structure/check_all_table_column.phtml:11
-msgid "Change"
-msgstr "Փոխել"
-
-#: libraries/controllers/StructureController.class.php:1961
-#: libraries/controllers/StructureController.class.php:1966
-#: libraries/navigation/Nodes/Node_Index.class.php:30
-#: libraries/tracking.lib.php:926
-#: templates/columns_definitions/column_indexes.phtml:16
-#: templates/columns_definitions/table_fields_definitions.phtml:57
-#: templates/structure/check_all_table_column.phtml:30
-#: templates/structure/display_structure.phtml:79
-#: templates/structure/display_table_stats.phtml:19
-msgid "Index"
-msgstr "Ցուցակագիր"
-
-#: libraries/controllers/StructureController.class.php:1963
-#: libraries/controllers/StructureController.class.php:1968
-#: templates/columns_definitions/column_indexes.phtml:27
-#: templates/structure/check_all_table_column.phtml:37
-msgid "Spatial"
-msgstr "Տարածական"
-
-#: libraries/controllers/StructureController.class.php:1964
-#: libraries/controllers/StructureController.class.php:1969
-#: templates/columns_definitions/column_indexes.phtml:22
-#: templates/structure/check_all_table_column.phtml:47
-msgid "Fulltext"
-msgstr "Ամբողջ գրվածքով"
-
-#: libraries/controllers/StructureController.class.php:1970
-msgid "Distinct values"
-msgstr ""
-
 #: libraries/controllers/TableChartController.class.php:82
 #: libraries/controllers/TableGisVisualizationController.class.php:101
 msgid "No SQL query was set to fetch data."
@@ -7792,11 +7738,18 @@ msgstr ""
 msgid "No data to display"
 msgstr "Ցուցադրելու տվյալներ չկան"
 
-#: libraries/controllers/TableRelationController.class.php:217
+#: libraries/controllers/TableIndexesController.class.php:161
+#: libraries/controllers/TableStructureController.class.php:736
+#: tbl_addfield.php:92
+#, php-format
+msgid "Table %1$s has been altered successfully."
+msgstr "%1$s աղյուսակը հաջողությամբ փոխվել է։"
+
+#: libraries/controllers/TableRelationController.class.php:218
 msgid "Display column was successfully updated."
 msgstr ""
 
-#: libraries/controllers/TableRelationController.class.php:283
+#: libraries/controllers/TableRelationController.class.php:288
 msgid "Internal relations were successfully updated."
 msgstr "Ներքին կապակցումները հաջողությամբ արդիացվեցին։"
 
@@ -7809,10 +7762,71 @@ msgid "Zoom search"
 msgstr "Մոտեցնելով որոնում"
 
 #: libraries/controllers/TableSearchController.class.php:852
-#: templates/table/selection_form.phtml:59
+#: templates/table/search/selection_form.phtml:59
 msgid "Find and replace"
 msgstr "Գտնել և փոխարինել"
 
+#: libraries/controllers/TableStructureController.class.php:163
+#, php-format
+msgid "The name '%s' is a MySQL reserved keyword."
+msgid_plural "The names '%s' are MySQL reserved keywords."
+msgstr[0] "'%s' անունը ամրագրված է MySQL-ի կողմից օգտագործման համար։"
+msgstr[1] "'%s' անունները ամրագրված են MySQL-ի կողմից օգտագործման համար։"
+
+#: libraries/controllers/TableStructureController.class.php:241
+msgid "No column selected."
+msgstr "Ընտրած սյունակներ չկան։"
+
+#: libraries/controllers/TableStructureController.class.php:467
+msgid "The columns have been moved successfully."
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:730
+#, php-format
+msgid ""
+"Table %1$s has been altered successfully. Privileges have been adjusted."
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:783
+#: libraries/tracking.lib.php:1094
+msgid "Query error"
+msgstr "Հարցման սխալ"
+
+#: libraries/controllers/TableStructureController.class.php:948
+#: templates/table/structure/check_all_table_column.phtml:11
+msgid "Change"
+msgstr "Փոխել"
+
+#: libraries/controllers/TableStructureController.class.php:952
+#: libraries/controllers/TableStructureController.class.php:957
+#: libraries/navigation/Nodes/Node_Index.class.php:30
+#: libraries/tracking.lib.php:926
+#: templates/columns_definitions/column_indexes.phtml:16
+#: templates/columns_definitions/table_fields_definitions.phtml:57
+#: templates/table/structure/check_all_table_column.phtml:30
+#: templates/table/structure/display_structure.phtml:79
+#: templates/table/structure/display_table_stats.phtml:19
+msgid "Index"
+msgstr "Ցուցակագիր"
+
+#: libraries/controllers/TableStructureController.class.php:954
+#: libraries/controllers/TableStructureController.class.php:959
+#: templates/columns_definitions/column_indexes.phtml:27
+#: templates/table/structure/check_all_table_column.phtml:37
+msgid "Spatial"
+msgstr "Տարածական"
+
+#: libraries/controllers/TableStructureController.class.php:955
+#: libraries/controllers/TableStructureController.class.php:960
+#: templates/columns_definitions/column_indexes.phtml:22
+#: templates/table/structure/check_all_table_column.phtml:47
+msgid "Fulltext"
+msgstr "Ամբողջ գրվածքով"
+
+#: libraries/controllers/TableStructureController.class.php:963
+msgid "Distinct values"
+msgstr ""
+
 #: libraries/core.lib.php:306
 #, php-format
 msgid "The %s extension is missing. Please check your PHP configuration."
@@ -7857,7 +7871,7 @@ msgid "No Password"
 msgstr "Առանց գաղտնաբառի"
 
 #: libraries/display_change_password.lib.php:68
-#: libraries/plugins/auth/AuthenticationCookie.class.php:199
+#: libraries/plugins/auth/AuthenticationCookie.class.php:187
 #: libraries/replication_gui.lib.php:422 libraries/replication_gui.lib.php:862
 #: libraries/server_privileges.lib.php:1640
 msgid "Password:"
@@ -7867,7 +7881,7 @@ msgstr "Գաղտնաբառ՝"
 #: libraries/replication_gui.lib.php:886
 #: libraries/server_privileges.lib.php:1682
 msgid "Re-type:"
-msgstr ""
+msgstr "Հաստատել՝"
 
 #: libraries/display_change_password.lib.php:87
 #: libraries/display_change_password.lib.php:116
@@ -7882,14 +7896,12 @@ msgstr "MySQL-ի սկզբնական գաղտնաբառը"
 
 #: libraries/display_change_password.lib.php:110
 #: libraries/server_privileges.lib.php:1706
-#, fuzzy
-#| msgid "sha256_password"
 msgid "SHA256 password"
-msgstr "sha256_password"
+msgstr "SHA256 գաղտնաբառը"
 
 #: libraries/display_change_password.lib.php:137
 msgid "MySQL 4.0 compatible"
-msgstr ""
+msgstr "Համատեղելի է MySQL 4.0-ի հետ"
 
 #: libraries/display_change_password.lib.php:150
 #: libraries/server_privileges.lib.php:1715
@@ -7901,12 +7913,12 @@ msgstr ""
 
 #: libraries/display_create_database.lib.php:23
 msgid "Create database"
-msgstr "Ստեղծել տվյալների բազան"
+msgstr "Ստեղծել տվյալների բազա"
 
 #: libraries/display_create_database.lib.php:46
 #: libraries/display_export.lib.php:213
 msgid "Create"
-msgstr ""
+msgstr "Ստեղծել"
 
 #: libraries/display_create_database.lib.php:50
 msgid "Create database:"
@@ -7923,7 +7935,7 @@ msgstr ""
 
 #: libraries/display_export.lib.php:175
 msgid "Exporting databases from the current server"
-msgstr ""
+msgstr "Ընթացիկ սպասարկչից տվյալների բազաների արտահանումը"
 
 #: libraries/display_export.lib.php:178
 #, php-format
@@ -8151,7 +8163,7 @@ msgstr ""
 
 #: libraries/display_import.lib.php:108
 msgid "Importing into the current server"
-msgstr ""
+msgstr "Ընթացիկ սպասարկչին ներմուծումը"
 
 #: libraries/display_import.lib.php:111
 #, php-format
@@ -8188,7 +8200,7 @@ msgstr ""
 
 #: libraries/display_import.lib.php:276
 msgid "Partial Import:"
-msgstr ""
+msgstr "Մասնակի ներմուծումը՝"
 
 #: libraries/display_import.lib.php:283
 #, php-format
@@ -8305,7 +8317,7 @@ msgstr "էջ"
 
 #: libraries/engines/innodb.lib.php:190
 msgid "Free pages"
-msgstr ""
+msgstr "Մաքուր էջեր"
 
 #: libraries/engines/innodb.lib.php:198
 msgid "Dirty pages"
@@ -8577,12 +8589,12 @@ msgid "Dump has been saved to file %s."
 msgstr ""
 
 #: libraries/import.lib.php:202 libraries/insert_edit.lib.php:124
-#: libraries/rte/rte_routines.lib.php:1353 libraries/sql.lib.php:1312
+#: libraries/rte/rte_routines.lib.php:1444 libraries/sql.lib.php:1306
 #: tbl_get_field.php:44
 msgid "MySQL returned an empty result set (i.e. zero rows)."
 msgstr ""
 
-#: libraries/import.lib.php:265 libraries/sql.lib.php:1326
+#: libraries/import.lib.php:265 libraries/sql.lib.php:1320
 msgid "[ROLLBACK occurred.]"
 msgstr "[Տեղի է ունեցել ՀԵՏԴԱՐՁ]"
 
@@ -8646,14 +8658,14 @@ msgstr ""
 
 #: libraries/insert_edit.lib.php:233
 #: libraries/navigation/Nodes/Node_DatabaseChild.class.php:48
-#: templates/designer/table_list.phtml:40
+#: templates/database/designer/table_list.phtml:40
 msgid "Hide"
 msgstr "Թաքցնել"
 
 #: libraries/insert_edit.lib.php:249
 #: libraries/navigation/Nodes/Node_Function.class.php:32
-#: libraries/rte/rte_routines.lib.php:1495
-#: templates/table/table_header.phtml:4
+#: libraries/rte/rte_routines.lib.php:1586
+#: templates/table/search/table_header.phtml:4
 msgid "Function"
 msgstr "Գործառույթ"
 
@@ -8666,82 +8678,83 @@ msgstr "Երկուական"
 msgid "Because of its length,<br /> this column might not be editable."
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1050
+#: libraries/insert_edit.lib.php:1048
 msgid "Binary - do not edit"
 msgstr "Երկուական տվյալներ - չեն խմբագրվում"
 
-#: libraries/insert_edit.lib.php:1176 libraries/server_privileges.lib.php:470
-#: templates/table/options.phtml:36
+#: libraries/insert_edit.lib.php:1174 libraries/server_privileges.lib.php:470
+#: templates/table/search/options.phtml:36
 msgid "Or"
 msgstr "Կամ"
 
-#: libraries/insert_edit.lib.php:1177
+#: libraries/insert_edit.lib.php:1175
 msgid "web server upload directory:"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1348 templates/table/input_box.phtml:49
+#: libraries/insert_edit.lib.php:1346
+#: templates/table/search/input_box.phtml:49
 msgid "Edit/Insert"
 msgstr "Խմբագրել/Զետեղել"
 
-#: libraries/insert_edit.lib.php:1398
+#: libraries/insert_edit.lib.php:1396
 #, php-format
 msgid "Continue insertion with %s rows"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1428
+#: libraries/insert_edit.lib.php:1426
 msgid "and then"
 msgstr "և հետո"
 
-#: libraries/insert_edit.lib.php:1461
+#: libraries/insert_edit.lib.php:1459
 msgid "Insert as new row"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1464
+#: libraries/insert_edit.lib.php:1462
 msgid "Insert as new row and ignore errors"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1467
+#: libraries/insert_edit.lib.php:1465
 msgid "Show insert query"
 msgstr "Ցուցադրել զետեղման հարցումը"
 
-#: libraries/insert_edit.lib.php:1487
+#: libraries/insert_edit.lib.php:1485
 msgid "Go back to previous page"
-msgstr ""
+msgstr "Վերադառնալ նախորդ էջին"
 
-#: libraries/insert_edit.lib.php:1490
+#: libraries/insert_edit.lib.php:1488
 msgid "Insert another new row"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1495
+#: libraries/insert_edit.lib.php:1493
 msgid "Go back to this page"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1518
+#: libraries/insert_edit.lib.php:1516
 msgid "Edit next row"
 msgstr "Խմբագրել հաջորդ տողը"
 
-#: libraries/insert_edit.lib.php:1540
+#: libraries/insert_edit.lib.php:1538
 msgid ""
 "Use TAB key to move from value to value, or CTRL+arrows to move anywhere"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1577 libraries/replication_gui.lib.php:542
-#: libraries/rte/rte_routines.lib.php:1497
+#: libraries/insert_edit.lib.php:1575 libraries/replication_gui.lib.php:542
+#: libraries/rte/rte_routines.lib.php:1588
 #: libraries/server_status_variables.lib.php:220
-#: templates/designer/having_query_panel.phtml:100
-#: templates/designer/options_panel.phtml:73
-#: templates/designer/options_panel.phtml:239
-#: templates/designer/where_query_panel.phtml:69
-#: templates/table/table_header.phtml:10
-#: templates/table/zoom_result_form.phtml:35
+#: templates/database/designer/having_query_panel.phtml:100
+#: templates/database/designer/options_panel.phtml:73
+#: templates/database/designer/options_panel.phtml:239
+#: templates/database/designer/where_query_panel.phtml:69
+#: templates/table/search/table_header.phtml:10
+#: templates/table/search/zoom_result_form.phtml:35
 msgid "Value"
 msgstr "Արժեքը"
 
-#: libraries/insert_edit.lib.php:1937 libraries/sql.lib.php:1309
+#: libraries/insert_edit.lib.php:1935 libraries/sql.lib.php:1303
 msgid "Showing SQL query"
 msgstr "SQL հարցման ցուցադրում"
 
-#: libraries/insert_edit.lib.php:1962 libraries/sql.lib.php:1287
+#: libraries/insert_edit.lib.php:1960 libraries/sql.lib.php:1281
 #, php-format
 msgid "Inserted row id: %1$d"
 msgstr ""
@@ -9017,7 +9030,7 @@ msgstr "Ելք"
 
 #: libraries/navigation/NavigationHeader.class.php:186
 msgid "phpMyAdmin documentation"
-msgstr ""
+msgstr "phpMyAdmin-ի պաշտոնական ուղեցույց"
 
 #: libraries/navigation/NavigationHeader.class.php:206
 msgid "Navigation panel settings"
@@ -9037,8 +9050,8 @@ msgstr ""
 #, php-format
 msgid "%s result found"
 msgid_plural "%s results found"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "գտնվել է %s արդյունք"
+msgstr[1] "գտնվել է %s արդյունք"
 
 #: libraries/navigation/NavigationTree.class.php:1331
 msgid "Filter databases by name or regex"
@@ -9148,7 +9161,7 @@ msgstr "Նոր"
 #: libraries/navigation/Nodes/Node_View_Container.class.php:26
 #: libraries/navigation/Nodes/Node_View_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:129
-#: templates/structure/show_create.phtml:30
+#: templates/database/structure/show_create.phtml:30
 msgid "Views"
 msgstr "Ներկայացումներ"
 
@@ -9434,7 +9447,7 @@ msgstr ""
 
 #: libraries/operations.lib.php:101 libraries/operations.lib.php:249
 #: libraries/operations.lib.php:869 libraries/operations.lib.php:963
-#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:907
+#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:998
 #: templates/columns_definitions/table_fields_definitions.phtml:47
 msgid "Adjust Privileges"
 msgstr "Կարգավորել արտոնությունները"
@@ -9524,22 +9537,22 @@ msgid "Switch to copied table"
 msgstr "Փոխարկվել կրկնապատկված աղյուսակին"
 
 #: libraries/operations.lib.php:1360
-#: templates/structure/check_all_tables.phtml:18
+#: templates/database/structure/check_all_tables.phtml:18
 msgid "Table maintenance"
 msgstr "Աղյուսակի սպասարկում"
 
 #: libraries/operations.lib.php:1398
-#: templates/structure/check_all_tables.phtml:19
+#: templates/database/structure/check_all_tables.phtml:19
 msgid "Analyze table"
 msgstr "Վերլուծել աղյուսակը"
 
 #: libraries/operations.lib.php:1413
-#: templates/structure/check_all_tables.phtml:20
+#: templates/database/structure/check_all_tables.phtml:20
 msgid "Check table"
 msgstr "Ստուգել աղյուսակը"
 
 #: libraries/operations.lib.php:1428
-#: templates/structure/check_all_tables.phtml:22
+#: templates/database/structure/check_all_tables.phtml:22
 msgid "Checksum table"
 msgstr "Ստուգել աղյուսակի ստւգագումարը"
 
@@ -9557,18 +9570,19 @@ msgid "Flush the table (FLUSH)"
 msgstr ""
 
 #: libraries/operations.lib.php:1477
-#: templates/structure/check_all_tables.phtml:23
-#: templates/structure/display_table_stats.phtml:56
+#: templates/database/structure/check_all_tables.phtml:23
+#: templates/table/structure/display_table_stats.phtml:56
 msgid "Optimize table"
 msgstr "Օպտիմիզացնել աղյուսակը"
 
 #: libraries/operations.lib.php:1492
-#: templates/structure/check_all_tables.phtml:24
+#: templates/database/structure/check_all_tables.phtml:24
 msgid "Repair table"
 msgstr "Վերականգնել աղյուսակը"
 
 #: libraries/operations.lib.php:1538
-#: templates/structure/check_all_tables.phtml:14 view_operations.php:127
+#: templates/database/structure/check_all_tables.phtml:14
+#: view_operations.php:127
 msgid "Delete data or table"
 msgstr "Ջնջել տվյալները կամ աղյուսակը"
 
@@ -9674,7 +9688,7 @@ msgstr ""
 #: libraries/plugins/AuthenticationPlugin.class.php:82
 #: libraries/plugins/AuthenticationPlugin.class.php:84
 msgid "Cannot log in to the MySQL server"
-msgstr ""
+msgstr "Հնարավոր չէ կապ հաստատել MySQL սպասարկչի հետ"
 
 #: libraries/plugins/SchemaPlugin.class.php:68
 msgid "Show color"
@@ -9689,7 +9703,7 @@ msgid "Cannot connect: invalid settings."
 msgstr ""
 
 #: libraries/plugins/auth/AuthenticationConfig.class.php:108
-#: libraries/plugins/auth/AuthenticationCookie.class.php:134
+#: libraries/plugins/auth/AuthenticationCookie.class.php:122
 #: libraries/plugins/auth/AuthenticationHttp.class.php:96
 #, php-format
 msgid "Welcome to %s"
@@ -9714,36 +9728,36 @@ msgstr ""
 msgid "Retry to connect"
 msgstr "Կրկնել միանալու փորձը"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:146
+#: libraries/plugins/auth/AuthenticationCookie.class.php:134
 msgid "Your session has expired. Please log in again."
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:170
+#: libraries/plugins/auth/AuthenticationCookie.class.php:158
 msgid "Log in"
 msgstr "Մուտք"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:178
-#: libraries/plugins/auth/AuthenticationCookie.class.php:188
+#: libraries/plugins/auth/AuthenticationCookie.class.php:166
+#: libraries/plugins/auth/AuthenticationCookie.class.php:176
 msgid "You can enter hostname/IP address and port separated by space."
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:193
+#: libraries/plugins/auth/AuthenticationCookie.class.php:181
 msgid "Username:"
 msgstr "Օգտանուն՝"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:205
+#: libraries/plugins/auth/AuthenticationCookie.class.php:193
 msgid "Server Choice:"
 msgstr "Սպասարկչի ընտրությունը՝"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:386
+#: libraries/plugins/auth/AuthenticationCookie.class.php:374
 msgid "Entered captcha is wrong, try again!"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:396
+#: libraries/plugins/auth/AuthenticationCookie.class.php:384
 msgid "Please enter correct captcha!"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:423
+#: libraries/plugins/auth/AuthenticationCookie.class.php:411
 msgid "You are not allowed to log in to this MySQL server!"
 msgstr ""
 
@@ -9839,7 +9853,7 @@ msgstr "Իրադարձություն"
 #: libraries/plugins/export/ExportOdt.class.php:593
 #: libraries/plugins/export/ExportTexytext.class.php:428
 #: libraries/plugins/export/PMA_ExportPdf.class.php:313
-#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:984
 #: libraries/rte/rte_triggers.lib.php:377
 msgid "Definition"
 msgstr "Սահմանում"
@@ -10136,7 +10150,7 @@ msgid "Last check:"
 msgstr "Վերջին ստուգումը՝"
 
 #: libraries/plugins/export/ExportSql.class.php:1399
-#: templates/structure/structure_table_row.phtml:183
+#: templates/database/structure/structure_table_row.phtml:183
 msgid "in use"
 msgstr "օգտագործվում է"
 
@@ -10316,18 +10330,14 @@ msgstr ""
 msgid "The imported file does not contain any data!"
 msgstr ""
 
-#: libraries/plugins/import/ImportSql.class.php:169
+#: libraries/plugins/import/ImportSql.class.php:72
 msgid "SQL compatibility mode:"
 msgstr "SQL համատեղելիության եղանակը՝"
 
-#: libraries/plugins/import/ImportSql.class.php:181
+#: libraries/plugins/import/ImportSql.class.php:84
 msgid "Do not use <code>AUTO_INCREMENT</code> for zero values"
 msgstr ""
 
-#: libraries/plugins/import/ImportSql.class.php:195
-msgid "Read as multibytes"
-msgstr ""
-
 #: libraries/plugins/import/ImportXml.class.php:54
 msgid "XML"
 msgstr ""
@@ -10370,7 +10380,7 @@ msgid "Show grid"
 msgstr "Ցուցադրել ցանցավորումը"
 
 #: libraries/plugins/schema/SchemaPdf.class.php:94
-#: templates/structure/print_view_data_dictionary_link.phtml:6
+#: templates/database/structure/print_view_data_dictionary_link.phtml:6
 msgid "Data Dictionary"
 msgstr "Տվյալների բառարան"
 
@@ -10395,7 +10405,7 @@ msgid "The %s table doesn't exist!"
 msgstr ""
 
 #: libraries/plugins/schema/eps/Eps_Relation_Schema.class.php:321
-#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:309
+#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:323
 #, php-format
 msgid "Schema of the %s database - Page %s"
 msgstr ""
@@ -10421,7 +10431,7 @@ msgstr "Բովանդակության աղյուսակը"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1005
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1028
 #: libraries/tracking.lib.php:884
-#: templates/structure/table_structure_header.phtml:11
+#: templates/table/structure/table_structure_header.phtml:11
 msgid "Extra"
 msgstr "Լրացուցիչ"
 
@@ -10659,7 +10669,7 @@ msgstr ""
 
 #: libraries/relation.lib.php:174
 msgid "Displaying Column Comments"
-msgstr "Սյունակների մեկնաբանությւոնների ցուցադրումը"
+msgstr "Սյունակների մեկնաբանությունների ցուցադրումը"
 
 #: libraries/relation.lib.php:180
 msgid "Browser transformation"
@@ -10726,51 +10736,51 @@ msgstr ""
 msgid "Create the needed tables with the <code>%screate_tables.sql</code>."
 msgstr ""
 
-#: libraries/relation.lib.php:360
+#: libraries/relation.lib.php:357
 msgid "Create a pma user and give access to these tables."
 msgstr ""
 
-#: libraries/relation.lib.php:365
+#: libraries/relation.lib.php:360
 msgid ""
 "Enable advanced features in configuration file (<code>config.inc.php</"
 "code>), for example by starting from <code>config.sample.inc.php</code>."
 msgstr ""
 
-#: libraries/relation.lib.php:373
+#: libraries/relation.lib.php:365
 msgid "Re-login to phpMyAdmin to load the updated configuration file."
 msgstr ""
 
-#: libraries/relation.lib.php:1612
+#: libraries/relation.lib.php:1607
 msgid "no description"
 msgstr "նկարագրություն չկա"
 
-#: libraries/relation.lib.php:1811
+#: libraries/relation.lib.php:1806
 msgid ""
 "You do not have necessary privileges to create a database named "
 "'phpmyadmin'. You may go to 'Operations' tab of any database to set up the "
 "phpMyAdmin configuration storage there."
 msgstr ""
 
-#: libraries/relation.lib.php:1928
+#: libraries/relation.lib.php:1923
 #, php-format
 msgid ""
 "%sCreate%s a database named 'phpmyadmin' and setup the phpMyAdmin "
 "configuration storage there."
 msgstr ""
 
-#: libraries/relation.lib.php:1936
+#: libraries/relation.lib.php:1931
 #, php-format
 msgid ""
 "%sCreate%s the phpMyAdmin configuration storage in the current database."
 msgstr ""
 
-#: libraries/relation.lib.php:1944
+#: libraries/relation.lib.php:1939
 #, php-format
 msgid "%sCreate%s missing phpMyAdmin configuration storage tables."
 msgstr ""
 
 #: libraries/replication_gui.lib.php:46 libraries/replication_gui.lib.php:343
-#: libraries/server_databases.lib.php:387
+#: libraries/server_databases.lib.php:398
 msgid "Master replication"
 msgstr ""
 
@@ -10825,7 +10835,7 @@ msgid ""
 msgstr ""
 
 #: libraries/replication_gui.lib.php:141
-#: libraries/server_databases.lib.php:389
+#: libraries/server_databases.lib.php:400
 msgid "Slave replication"
 msgstr ""
 
@@ -11086,10 +11096,10 @@ msgid "Master server changed successfully to %s."
 msgstr ""
 
 #: libraries/rte/rte_events.lib.php:106 libraries/rte/rte_events.lib.php:115
-#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:149
-#: libraries/rte/rte_routines.lib.php:158
-#: libraries/rte/rte_routines.lib.php:231
-#: libraries/rte/rte_routines.lib.php:1362
+#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:219
+#: libraries/rte/rte_routines.lib.php:246
+#: libraries/rte/rte_routines.lib.php:368
+#: libraries/rte/rte_routines.lib.php:1453
 #: libraries/rte/rte_triggers.lib.php:82 libraries/rte/rte_triggers.lib.php:91
 #: libraries/rte/rte_triggers.lib.php:123
 #, php-format
@@ -11110,7 +11120,7 @@ msgstr ""
 msgid "Event %1$s has been created."
 msgstr ""
 
-#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:251
+#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:266
 #: libraries/rte/rte_triggers.lib.php:144
 msgid "One or more errors have occurred while processing your request:"
 msgstr ""
@@ -11119,7 +11129,7 @@ msgstr ""
 msgid "Edit event"
 msgstr "Խմբագրել իրադարձությունը"
 
-#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:794
+#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:885
 #: libraries/rte/rte_triggers.lib.php:323 view_create.php:180
 msgid "Details"
 msgstr "Մանրամասները"
@@ -11132,7 +11142,7 @@ msgstr "Իրադարձության անուն"
 msgid "Event type"
 msgstr "Իրադարձության տեսակը՝"
 
-#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:817
+#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:908
 #, php-format
 msgid "Change to %s"
 msgstr "Փոխել %s-ի"
@@ -11159,12 +11169,14 @@ msgstr "Վերջ"
 msgid "On completion preserve"
 msgstr ""
 
-#: libraries/rte/rte_events.lib.php:491 libraries/rte/rte_routines.lib.php:930
+#: libraries/rte/rte_events.lib.php:491
+#: libraries/rte/rte_routines.lib.php:1021
 #: libraries/rte/rte_triggers.lib.php:383 view_create.php:209
 msgid "Definer"
 msgstr ""
 
-#: libraries/rte/rte_events.lib.php:535 libraries/rte/rte_routines.lib.php:997
+#: libraries/rte/rte_events.lib.php:535
+#: libraries/rte/rte_routines.lib.php:1088
 #: libraries/rte/rte_triggers.lib.php:422
 msgid "The definer must be in the \"username@hostname\" format!"
 msgstr ""
@@ -11190,9 +11202,9 @@ msgid "You must provide an event definition."
 msgstr "Դուք պետք է տրամադրեք իրադարձության սահմանումը։"
 
 #: libraries/rte/rte_export.lib.php:43 libraries/rte/rte_general.lib.php:72
-#: libraries/rte/rte_routines.lib.php:345
-#: libraries/rte/rte_routines.lib.php:1198
-#: libraries/rte/rte_routines.lib.php:1411
+#: libraries/rte/rte_routines.lib.php:153
+#: libraries/rte/rte_routines.lib.php:1289
+#: libraries/rte/rte_routines.lib.php:1502
 msgid "Error in processing request:"
 msgstr ""
 
@@ -11224,131 +11236,132 @@ msgid ""
 "problems."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:110
-#: libraries/rte/rte_routines.lib.php:1006
+#: libraries/rte/rte_routines.lib.php:123
+msgid "Edit routine"
+msgstr ""
+
+#: libraries/rte/rte_routines.lib.php:200
+#: libraries/rte/rte_routines.lib.php:1097
 #, php-format
 msgid "Invalid routine type: \"%s\""
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:170
-msgid "Sorry, we failed to restore the dropped routine."
-msgstr ""
-
-#: libraries/rte/rte_routines.lib.php:211
-#, php-format
-msgid "Routine %1$s has been modified. Privileges have been adjusted."
-msgstr ""
-
-#: libraries/rte/rte_routines.lib.php:216
-#, php-format
-msgid "Routine %1$s has been modified."
-msgstr "%1$s գործընթացը փոփոխվել է։"
-
-#: libraries/rte/rte_routines.lib.php:238
+#: libraries/rte/rte_routines.lib.php:253
 #, php-format
 msgid "Routine %1$s has been created."
 msgstr "%1$s գործընթացը ստեղծվել է։"
 
-#: libraries/rte/rte_routines.lib.php:315
-msgid "Edit routine"
+#: libraries/rte/rte_routines.lib.php:380
+msgid "Sorry, we failed to restore the dropped routine."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:797
+#: libraries/rte/rte_routines.lib.php:439
+#, php-format
+msgid "Routine %1$s has been modified. Privileges have been adjusted."
+msgstr ""
+
+#: libraries/rte/rte_routines.lib.php:444
+#, php-format
+msgid "Routine %1$s has been modified."
+msgstr "%1$s գործընթացը փոփոխվել է։"
+
+#: libraries/rte/rte_routines.lib.php:888
 msgid "Routine name"
 msgstr "Գործընթացի անունը"
 
-#: libraries/rte/rte_routines.lib.php:823
+#: libraries/rte/rte_routines.lib.php:914
 msgid "Parameters"
 msgstr "Հարաչափեր"
 
-#: libraries/rte/rte_routines.lib.php:829
+#: libraries/rte/rte_routines.lib.php:920
 msgid "Direction"
 msgstr "Ուղղություն"
 
-#: libraries/rte/rte_routines.lib.php:847
+#: libraries/rte/rte_routines.lib.php:938
 msgid "Add parameter"
 msgstr "Ավելացնել հարաչափ"
 
-#: libraries/rte/rte_routines.lib.php:851
+#: libraries/rte/rte_routines.lib.php:942
 msgid "Remove last parameter"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:856
+#: libraries/rte/rte_routines.lib.php:947
 msgid "Return type"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:862
+#: libraries/rte/rte_routines.lib.php:953
 msgid "Return length/values"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:868
+#: libraries/rte/rte_routines.lib.php:959
 msgid "Return options"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:899
+#: libraries/rte/rte_routines.lib.php:990
 msgid "Is deterministic"
 msgstr "Կողմնորոշիչ է"
 
-#: libraries/rte/rte_routines.lib.php:920
+#: libraries/rte/rte_routines.lib.php:1011
 msgid ""
 "You do not have sufficient privileges to perform this operation; Please "
 "refer to the documentation for more details"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:935
+#: libraries/rte/rte_routines.lib.php:1026
 msgid "Security type"
 msgstr "Անվտանգության տեսակը"
 
-#: libraries/rte/rte_routines.lib.php:944
+#: libraries/rte/rte_routines.lib.php:1035
 msgid "SQL data access"
 msgstr "SQL տվյալների մատչում"
 
-#: libraries/rte/rte_routines.lib.php:1013
+#: libraries/rte/rte_routines.lib.php:1104
 msgid "You must provide a routine name!"
 msgstr "Դուք պետք է տրամադրեք գործընթացի անունը։"
 
-#: libraries/rte/rte_routines.lib.php:1047
+#: libraries/rte/rte_routines.lib.php:1138
 #, php-format
 msgid "Invalid direction \"%s\" given for parameter."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1069
-#: libraries/rte/rte_routines.lib.php:1131
+#: libraries/rte/rte_routines.lib.php:1160
+#: libraries/rte/rte_routines.lib.php:1222
 msgid ""
 "You must provide length/values for routine parameters of type ENUM, SET, "
 "VARCHAR and VARBINARY."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1095
+#: libraries/rte/rte_routines.lib.php:1186
 msgid "You must provide a name and a type for each routine parameter."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1114
+#: libraries/rte/rte_routines.lib.php:1205
 msgid "You must provide a valid return type for the routine."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1174
+#: libraries/rte/rte_routines.lib.php:1265
 msgid "You must provide a routine definition."
 msgstr "Դուք պետք է տրամադրեք գործընթացի սահմանումը։"
 
-#: libraries/rte/rte_routines.lib.php:1285
+#: libraries/rte/rte_routines.lib.php:1376
 #, php-format
 msgid "Execution results of routine %s"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1340
+#: libraries/rte/rte_routines.lib.php:1431
 #, php-format
 msgid "%d row affected by the last statement inside the procedure."
 msgid_plural "%d rows affected by the last statement inside the procedure."
-msgstr[0] ""
+msgstr[0] "Ընթացակարգի վերջին արտահայտությունով ընդգրկվել է %d տող։"
+msgstr[1] "Ընթացակարգի վերջին արտահայտությունով ընդգրկվել է %d տող։"
 
-#: libraries/rte/rte_routines.lib.php:1398
-#: libraries/rte/rte_routines.lib.php:1406
+#: libraries/rte/rte_routines.lib.php:1489
+#: libraries/rte/rte_routines.lib.php:1497
 msgid "Execute routine"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1485
-#: libraries/rte/rte_routines.lib.php:1488
+#: libraries/rte/rte_routines.lib.php:1576
+#: libraries/rte/rte_routines.lib.php:1579
 msgid "Routine parameters"
 msgstr "Գործընթացի հարաչափերը"
 
@@ -11502,7 +11515,7 @@ msgid "Original position"
 msgstr ""
 
 #: libraries/server_bin_log.lib.php:133
-#: templates/structure/display_table_stats.phtml:4
+#: templates/table/structure/display_table_stats.phtml:4
 msgid "Information"
 msgstr "Տեղեկություններ"
 
@@ -11526,7 +11539,7 @@ msgstr ""
 
 #: libraries/server_common.lib.php:39
 msgid "Character Sets and Collations"
-msgstr ""
+msgstr "Կոդավորումները և համադրումները"
 
 #: libraries/server_common.lib.php:45
 msgid "Databases statistics"
@@ -11538,17 +11551,17 @@ msgid ""
 "between the web server and the MySQL server."
 msgstr ""
 
-#: libraries/server_databases.lib.php:364
-#: libraries/server_databases.lib.php:365
+#: libraries/server_databases.lib.php:366
+#: libraries/server_databases.lib.php:371
 msgid "Enable Statistics"
 msgstr "Միացնել վիճակագրումը"
 
-#: libraries/server_databases.lib.php:481
+#: libraries/server_databases.lib.php:492
 #, php-format
 msgid "%1$d database has been dropped successfully."
 msgid_plural "%1$d databases have been dropped successfully."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%1$d տվյալների բազա հաջողությամբ ջնջվեց։"
+msgstr[1] "%1$d տվյալների բազա հաջողությամբ ջնջվեցին։"
 
 #: libraries/server_plugins.lib.php:31
 msgid "Modules"
@@ -11899,7 +11912,7 @@ msgid "You have revoked the privileges for %s."
 msgstr ""
 
 #: libraries/server_privileges.lib.php:2059
-#: libraries/server_privileges.lib.php:4290
+#: libraries/server_privileges.lib.php:4316
 msgid "Add user account"
 msgstr "Ավելացնել օգտվողի հաշիվ"
 
@@ -12062,53 +12075,53 @@ msgstr "%s-ի ջնջում"
 msgid "The privileges were reloaded successfully."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:3994
+#: libraries/server_privileges.lib.php:4003
 #, php-format
 msgid "The user %s already exists!"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4232
+#: libraries/server_privileges.lib.php:4258
 #, php-format
 msgid "Privileges for %s"
 msgstr "Արտոնություններ %s-ի համար"
 
-#: libraries/server_privileges.lib.php:4241
+#: libraries/server_privileges.lib.php:4267
 #: libraries/server_status_processes.lib.php:72
 #: libraries/server_user_groups.lib.php:39
 msgid "User"
 msgstr "Օգտվող"
 
-#: libraries/server_privileges.lib.php:4282
+#: libraries/server_privileges.lib.php:4308
 msgctxt "Create new user"
 msgid "New"
 msgstr "Նոր"
 
-#: libraries/server_privileges.lib.php:4311
+#: libraries/server_privileges.lib.php:4337
 msgid "Edit privileges:"
 msgstr "Խմբագրել արտոնությունները՝"
 
-#: libraries/server_privileges.lib.php:4312
+#: libraries/server_privileges.lib.php:4338
 msgid "User account"
 msgstr "Օգտվողի հաշիվ"
 
-#: libraries/server_privileges.lib.php:4371
+#: libraries/server_privileges.lib.php:4397
 msgid ""
 "Note: You are attempting to edit privileges of the user with which you are "
 "currently logged in."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4391 libraries/server_users.lib.php:25
+#: libraries/server_privileges.lib.php:4417 libraries/server_users.lib.php:25
 msgid "User accounts overview"
 msgstr "Օգտվողների հաշիվների ակնարկում"
 
-#: libraries/server_privileges.lib.php:4459
+#: libraries/server_privileges.lib.php:4485
 msgid ""
 "A user account allowing any user from localhost to connect is present. This "
 "will prevent other users from connecting if the host part of their account "
 "allows a connection from any (%) host."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4500
+#: libraries/server_privileges.lib.php:4526
 #, php-format
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
@@ -12117,7 +12130,7 @@ msgid ""
 "%sreload the privileges%s before you continue."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4519
+#: libraries/server_privileges.lib.php:4545
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
 "tables. The content of these tables may differ from the privileges the "
@@ -12126,61 +12139,61 @@ msgid ""
 "privilege."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4569
+#: libraries/server_privileges.lib.php:4595
 msgid "The selected user was not found in the privilege table."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4801
+#: libraries/server_privileges.lib.php:4827
 msgid "You have added a new user."
 msgstr ""
 
-#: libraries/server_status.lib.php:53
+#: libraries/server_status.lib.php:60
 #, php-format
 msgid "Network traffic since startup: %s"
 msgstr ""
 
-#: libraries/server_status.lib.php:66
+#: libraries/server_status.lib.php:73
 #, php-format
 msgid "This MySQL server has been running for %1$s. It started up on %2$s."
 msgstr ""
 
-#: libraries/server_status.lib.php:80
+#: libraries/server_status.lib.php:94
 msgid ""
 "This MySQL server works as <b>master</b> and <b>slave</b> in <b>replication</"
 "b> process."
 msgstr ""
 
-#: libraries/server_status.lib.php:85
+#: libraries/server_status.lib.php:99
 msgid "This MySQL server works as <b>master</b> in <b>replication</b> process."
 msgstr ""
 
-#: libraries/server_status.lib.php:90
+#: libraries/server_status.lib.php:104
 msgid "This MySQL server works as <b>slave</b> in <b>replication</b> process."
 msgstr ""
 
-#: libraries/server_status.lib.php:106
+#: libraries/server_status.lib.php:116
 msgid "Replication status"
 msgstr ""
 
-#: libraries/server_status.lib.php:137
+#: libraries/server_status.lib.php:146
 msgid ""
 "On a busy server, the byte counters may overrun, so those statistics as "
 "reported by the MySQL server may be incorrect."
 msgstr ""
 
-#: libraries/server_status.lib.php:148
+#: libraries/server_status.lib.php:157
 msgid "Received"
 msgstr "Ընդունված"
 
-#: libraries/server_status.lib.php:167
+#: libraries/server_status.lib.php:176
 msgid "Sent"
 msgstr "Ուղարկված է"
 
-#: libraries/server_status.lib.php:234
+#: libraries/server_status.lib.php:243
 msgid "Max. concurrent connections"
 msgstr ""
 
-#: libraries/server_status.lib.php:244
+#: libraries/server_status.lib.php:253
 msgid "Failed attempts"
 msgstr "Ձախողված փորձեր"
 
@@ -13100,7 +13113,7 @@ msgstr ""
 msgid "Not implemented yet."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/AlterOperation.php:193
+#: libraries/sql-parser/src/Components/AlterOperation.php:191
 msgid "Unrecognized alter operation."
 msgstr ""
 
@@ -13114,7 +13127,7 @@ msgid "An opening bracket followed by a set of values was expected."
 msgstr ""
 
 #: libraries/sql-parser/src/Components/ArrayObj.php:101
-#: libraries/sql-parser/src/Components/FieldDefinition.php:202
+#: libraries/sql-parser/src/Components/CreateDefinition.php:202
 msgid "An opening bracket was expected."
 msgstr ""
 
@@ -13122,25 +13135,33 @@ msgstr ""
 msgid "A comma or a closing bracket was expected"
 msgstr ""
 
+#: libraries/sql-parser/src/Components/CreateDefinition.php:246
+msgid "A comma or a closing bracket was expected."
+msgstr "Սպասվում էր ստորակետը կամ փակող փակագիծը։"
+
+#: libraries/sql-parser/src/Components/CreateDefinition.php:262
+msgid "A closing bracket was expected."
+msgstr ""
+
 #: libraries/sql-parser/src/Components/DataType.php:125
 msgid "Unrecognized data type."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:225
+#: libraries/sql-parser/src/Components/Expression.php:227
 msgid "Unexpected closing bracket."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:246
-#: libraries/sql-parser/src/Components/Expression.php:283
-#: libraries/sql-parser/src/Components/Expression.php:303
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:285
+#: libraries/sql-parser/src/Components/Expression.php:305
 msgid "An alias was previously found."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:257
+#: libraries/sql-parser/src/Components/Expression.php:259
 msgid "Unexpected dot."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:327
+#: libraries/sql-parser/src/Components/Expression.php:329
 msgid "An alias was expected."
 msgstr "Սպասվում էր այլանունը։"
 
@@ -13148,14 +13169,6 @@ msgstr "Սպասվում էր այլանունը։"
 msgid "An expression was expected."
 msgstr "Սպասվում էր արտահայտությունը։"
 
-#: libraries/sql-parser/src/Components/FieldDefinition.php:246
-msgid "A comma or a closing bracket was expected."
-msgstr "Սպասվում էր ստորակետը կամ փակող փակագիծը։"
-
-#: libraries/sql-parser/src/Components/FieldDefinition.php:262
-msgid "A closing bracket was expected."
-msgstr ""
-
 #: libraries/sql-parser/src/Components/Limit.php:90
 #: libraries/sql-parser/src/Components/Limit.php:112
 msgid "An offset was expected."
@@ -13195,24 +13208,24 @@ msgstr ""
 msgid "Expected delimiter."
 msgstr ""
 
-#: libraries/sql-parser/src/Lexer.php:753
+#: libraries/sql-parser/src/Lexer.php:777
 #, php-format
 msgid "Ending quote %1$s was expected."
 msgstr ""
 
-#: libraries/sql-parser/src/Lexer.php:789
+#: libraries/sql-parser/src/Lexer.php:813
 msgid "Variable name was expected."
 msgstr "Սպասվում էր փոփոխականի անունը։"
 
-#: libraries/sql-parser/src/Parser.php:380
+#: libraries/sql-parser/src/Parser.php:391
 msgid "Unexpected beginning of statement."
 msgstr ""
 
-#: libraries/sql-parser/src/Parser.php:399
+#: libraries/sql-parser/src/Parser.php:410
 msgid "Unrecognized statement type."
 msgstr ""
 
-#: libraries/sql-parser/src/Parser.php:479
+#: libraries/sql-parser/src/Parser.php:489
 msgid "No transaction was previously started."
 msgstr ""
 
@@ -13238,8 +13251,9 @@ msgid "The name of the entity was expected."
 msgstr ""
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:310
-msgid "At least one field definition was expected."
-msgstr ""
+#| msgid "A rename operation was expected."
+msgid "At least one column definition was expected."
+msgstr "Սպասվում էր առնվազն մեկ սյունակի սահմանումը։"
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:329
 msgid "A \"RETURNS\" keyword was expected."
@@ -13298,25 +13312,25 @@ msgstr "Էջանիշը չի ստեղծվել։"
 msgid "Using bookmark \"%s\" as default browse query."
 msgstr ""
 
-#: libraries/sql.lib.php:1306
+#: libraries/sql.lib.php:1300
 msgid "Showing as PHP code"
 msgstr "PHP կոդի տեսքով ցուցադրում"
 
-#: libraries/sql.lib.php:1638
+#: libraries/sql.lib.php:1632
 #, php-format
 msgid ""
 "Current selection does not contain a unique column. Grid edit, checkbox, "
 "Edit, Copy and Delete features are not available. %s"
 msgstr ""
 
-#: libraries/sql.lib.php:1649
+#: libraries/sql.lib.php:1643
 #, php-format
 msgid ""
 "Current selection does not contain a unique column. Grid edit, Edit, Copy "
 "and Delete features may result in undesired behavior. %s"
 msgstr ""
 
-#: libraries/sql.lib.php:1688
+#: libraries/sql.lib.php:1682
 #, php-format
 msgid "Problems with indexes of table `%s`"
 msgstr "Խնդիրներ՝ `%s` աղյուսակի ցուցակագրերի հետ"
@@ -13324,17 +13338,17 @@ msgstr "Խնդիրներ՝ `%s` աղյուսակի ցուցակագրերի հե
 #: libraries/sql_query_form.lib.php:136
 #, php-format
 msgid "Run SQL query/queries on server %s"
-msgstr ""
+msgstr "Կատարել SQL հարցում(ներ)ը %s սպասարկչում"
 
 #: libraries/sql_query_form.lib.php:153
 #, php-format
 msgid "Run SQL query/queries on database %s"
-msgstr ""
+msgstr "Կատարել SQL հարցում(ներ)ը %s տվյալների բազային"
 
 #: libraries/sql_query_form.lib.php:174
 #, php-format
 msgid "Run SQL query/queries on table %s"
-msgstr ""
+msgstr "Կատարել SQL հարցում(ներ)ը %s աղյուսակին"
 
 #: libraries/sql_query_form.lib.php:250
 msgid "Get auto-saved query"
@@ -13358,11 +13372,11 @@ msgstr "Սահմանիչ"
 
 #: libraries/sql_query_form.lib.php:341
 msgid "Show this query here again"
-msgstr ""
+msgstr "Կրկին ցուցադրել տվյալ հարցումը"
 
 #: libraries/sql_query_form.lib.php:358
 msgid "Rollback when finished"
-msgstr ""
+msgstr "Հետարկել վերջացնելուց հետո"
 
 #: libraries/sql_query_form.lib.php:412
 msgid "View only"
@@ -13472,7 +13486,7 @@ msgid "Version %s snapshot (SQL code)"
 msgstr ""
 
 #: libraries/tracking.lib.php:947
-#: templates/structure/table_structure_row.phtml:33
+#: templates/table/structure/table_structure_row.phtml:33
 msgctxt "None for default"
 msgid "None"
 msgstr "Չկա"
@@ -13524,15 +13538,15 @@ msgstr "%1$s տարբերակը %2$s-ից ջնջվել է։"
 msgid "Version %1$s was created, tracking for %2$s is active."
 msgstr ""
 
-#: libraries/user_preferences.inc.php:29
+#: libraries/user_preferences.inc.php:30
 msgid "Manage your settings"
-msgstr ""
+msgstr "Կառավարել ձեր կայանքները"
 
-#: libraries/user_preferences.inc.php:46 prefs_manage.php:307
+#: libraries/user_preferences.inc.php:54 prefs_manage.php:307
 msgid "Configuration has been saved."
 msgstr ""
 
-#: libraries/user_preferences.inc.php:66
+#: libraries/user_preferences.inc.php:74
 #, php-format
 msgid ""
 "Your preferences will be saved for current session only. Storing them "
@@ -13590,7 +13604,7 @@ msgstr ""
 
 #: prefs_manage.php:263
 msgid "You have no saved settings!"
-msgstr ""
+msgstr "Դուք չունեք որևէ պահպանված կայանքներ։"
 
 #: prefs_manage.php:268 prefs_manage.php:347
 msgid "This feature is not supported by your web browser"
@@ -13598,7 +13612,7 @@ msgstr ""
 
 #: prefs_manage.php:274
 msgid "Merge with current configuration"
-msgstr ""
+msgstr "Ձուլել ընթացիկ կազմաձևի հետ"
 
 #: prefs_manage.php:290
 #, php-format
@@ -13622,6 +13636,8 @@ msgstr ""
 #: prefs_manage.php:366
 msgid "You can reset all your settings and restore them to default values."
 msgstr ""
+"Դուք կարող եք վերակայել ձեր կայանքները՝ վերադարձնելով դրանց սկզբնական "
+"դրույթները։"
 
 #: server_databases.php:112
 msgid "No databases"
@@ -13738,7 +13754,7 @@ msgstr "Բեռնել"
 
 #: setup/frames/index.inc.php:308
 msgid "phpMyAdmin homepage"
-msgstr ""
+msgstr "phpMyAdmin-ի կայքէջ"
 
 #: setup/frames/index.inc.php:310
 msgid "Donate"
@@ -13829,10 +13845,8 @@ msgid "Row: %1$s, Column: %2$s, Error: %3$s"
 msgstr ""
 
 #: tbl_row_action.php:70
-#, fuzzy
-#| msgid "No versions selected."
 msgid "No row selected."
-msgstr "Ընտրած տարբերակներ չկան։"
+msgstr "Ընտրած տողեր չկան։"
 
 #: tbl_tracking.php:33
 #, php-format
@@ -13906,7 +13920,7 @@ msgid "first"
 msgstr ""
 
 #: templates/columns_definitions/move_column.phtml:12
-#: templates/structure/add_column.phtml:21
+#: templates/table/structure/add_column.phtml:21
 #, php-format
 msgid "after %s"
 msgstr "%s-ից հետո"
@@ -13965,197 +13979,290 @@ msgstr ""
 msgid "Input transformation options"
 msgstr ""
 
-#: templates/designer/aggregate_query_panel.phtml:22
-#: templates/designer/options_panel.phtml:100
-msgid "Aggregate"
-msgstr ""
-
-#: templates/designer/aggregate_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:61
-#: templates/designer/options_panel.phtml:106
-#: templates/designer/options_panel.phtml:170
-#: templates/designer/where_query_panel.phtml:30
-#: templates/table/table_header.phtml:9
-msgid "Operator"
-msgstr ""
-
-#: templates/designer/database_tables.phtml:29
-msgid "Toggle"
-msgstr ""
-
-#: templates/designer/database_tables.phtml:40
-msgid "See table structure"
-msgstr "Դիտել աղյուսակի կառուցվածքը"
-
-#: templates/designer/delete_relation_panel.phtml:21
-msgid "Delete relation"
-msgstr "Ջնջել կապակցումը"
-
-#: templates/designer/edit_delete_pages.phtml:7
-msgid "Page to open"
-msgstr ""
-
-#: templates/designer/edit_delete_pages.phtml:7
-msgid "Page to delete"
-msgstr ""
-
-#: templates/designer/having_query_panel.phtml:90
-#: templates/designer/options_panel.phtml:63
-#: templates/designer/options_panel.phtml:229
-#: templates/designer/where_query_panel.phtml:59
-msgid "Except"
-msgstr "Բացառությամբ"
-
-#: templates/designer/having_query_panel.phtml:102
-#: templates/designer/options_panel.phtml:75
-#: templates/designer/options_panel.phtml:241
-#: templates/designer/where_query_panel.phtml:71
-msgid "subquery"
-msgstr "ենթահարցում"
-
-#: templates/designer/new_relation_panel.phtml:22
-#: templates/designer/side_menu.phtml:84 templates/designer/side_menu.phtml:87
-msgid "Create relation"
-msgstr "Ստեղծել կապակցումը"
-
-#: templates/designer/options_panel.phtml:34
-#: templates/designer/options_panel.phtml:200
-msgid "Relation operator"
-msgstr ""
-
-#: templates/designer/options_panel.phtml:85
-#: templates/designer/rename_to_panel.phtml:23
-msgid "Rename to"
-msgstr "Վերանվանել"
-
-#: templates/designer/options_panel.phtml:91
-#: templates/designer/rename_to_panel.phtml:31
-msgid "New name"
-msgstr "Նոր անուն"
-
-#: templates/designer/page_save_as.phtml:4
-msgid "Save to selected page"
-msgstr ""
-
-#: templates/designer/page_save_as.phtml:5
-msgid "Create a page and save to it"
-msgstr ""
-
-#: templates/designer/page_save_as.phtml:26
-msgid "New page name"
-msgstr "Նոր էջի անունը"
-
-#: templates/designer/page_selector.phtml:2
-msgid "Select page"
-msgstr "Ընտրեք էջը"
-
-#: templates/designer/query_details.phtml:10
-msgid "Active options"
-msgstr "Գործուն կայանքներ"
-
-#: templates/designer/schema_export.phtml:4
-msgid "Select Export Relational Type"
-msgstr ""
-
-#: templates/designer/side_menu.phtml:19 templates/designer/side_menu.phtml:25
-msgid "Show/Hide tables list"
-msgstr "Ցուցադրել/թաքցնել աղյուսակների ցանկը"
-
-#: templates/designer/side_menu.phtml:29 templates/designer/side_menu.phtml:35
-#: templates/designer/side_menu.phtml:36
-msgid "View in fullscreen"
-msgstr ""
-
-#: templates/designer/side_menu.phtml:34
-msgid "Exit fullscreen"
-msgstr ""
-
-#: templates/designer/side_menu.phtml:41 templates/designer/side_menu.phtml:45
-msgid "New page"
-msgstr "Նոր էջ"
-
-#: templates/designer/side_menu.phtml:70 templates/designer/side_menu.phtml:73
-msgid "Delete pages"
-msgstr "Ջնջել էջերը"
-
-#: templates/designer/side_menu.phtml:77 templates/designer/side_menu.phtml:80
-#: templates/table/create_table.phtml:7
+#: templates/database/create_table.phtml:7
+#: templates/database/designer/side_menu.phtml:77
+#: templates/database/designer/side_menu.phtml:80
 msgid "Create table"
 msgstr "Ստեղծել աղյուսակը"
 
-#: templates/designer/side_menu.phtml:98
-#: templates/designer/side_menu.phtml:101
+#: templates/database/create_table.phtml:15
+msgid "Number of columns"
+msgstr ""
+
+#: templates/database/designer/aggregate_query_panel.phtml:22
+#: templates/database/designer/options_panel.phtml:100
+msgid "Aggregate"
+msgstr ""
+
+#: templates/database/designer/aggregate_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:61
+#: templates/database/designer/options_panel.phtml:106
+#: templates/database/designer/options_panel.phtml:170
+#: templates/database/designer/where_query_panel.phtml:30
+#: templates/table/search/table_header.phtml:9
+msgid "Operator"
+msgstr ""
+
+#: templates/database/designer/database_tables.phtml:29
+msgid "Toggle"
+msgstr ""
+
+#: templates/database/designer/database_tables.phtml:40
+msgid "See table structure"
+msgstr "Դիտել աղյուսակի կառուցվածքը"
+
+#: templates/database/designer/delete_relation_panel.phtml:21
+msgid "Delete relation"
+msgstr "Ջնջել կապակցումը"
+
+#: templates/database/designer/edit_delete_pages.phtml:7
+msgid "Page to open"
+msgstr ""
+
+#: templates/database/designer/edit_delete_pages.phtml:7
+msgid "Page to delete"
+msgstr "Ջնջվող էջը"
+
+#: templates/database/designer/having_query_panel.phtml:90
+#: templates/database/designer/options_panel.phtml:63
+#: templates/database/designer/options_panel.phtml:229
+#: templates/database/designer/where_query_panel.phtml:59
+msgid "Except"
+msgstr "Բացառությամբ"
+
+#: templates/database/designer/having_query_panel.phtml:102
+#: templates/database/designer/options_panel.phtml:75
+#: templates/database/designer/options_panel.phtml:241
+#: templates/database/designer/where_query_panel.phtml:71
+msgid "subquery"
+msgstr "ենթահարցում"
+
+#: templates/database/designer/new_relation_panel.phtml:22
+#: templates/database/designer/side_menu.phtml:84
+#: templates/database/designer/side_menu.phtml:87
+msgid "Create relation"
+msgstr "Ստեղծել կապակցումը"
+
+#: templates/database/designer/options_panel.phtml:34
+#: templates/database/designer/options_panel.phtml:200
+msgid "Relation operator"
+msgstr ""
+
+#: templates/database/designer/options_panel.phtml:85
+#: templates/database/designer/rename_to_panel.phtml:23
+msgid "Rename to"
+msgstr "Վերանվանել"
+
+#: templates/database/designer/options_panel.phtml:91
+#: templates/database/designer/rename_to_panel.phtml:31
+msgid "New name"
+msgstr "Նոր անուն"
+
+#: templates/database/designer/page_save_as.phtml:4
+msgid "Save to selected page"
+msgstr ""
+
+#: templates/database/designer/page_save_as.phtml:5
+msgid "Create a page and save to it"
+msgstr ""
+
+#: templates/database/designer/page_save_as.phtml:26
+msgid "New page name"
+msgstr "Նոր էջի անունը"
+
+#: templates/database/designer/page_selector.phtml:2
+msgid "Select page"
+msgstr "Ընտրեք էջը"
+
+#: templates/database/designer/query_details.phtml:10
+msgid "Active options"
+msgstr "Գործուն կայանքներ"
+
+#: templates/database/designer/schema_export.phtml:4
+msgid "Select Export Relational Type"
+msgstr ""
+
+#: templates/database/designer/side_menu.phtml:19
+#: templates/database/designer/side_menu.phtml:25
+msgid "Show/Hide tables list"
+msgstr "Ցուցադրել/թաքցնել աղյուսակների ցանկը"
+
+#: templates/database/designer/side_menu.phtml:29
+#: templates/database/designer/side_menu.phtml:35
+#: templates/database/designer/side_menu.phtml:36
+msgid "View in fullscreen"
+msgstr ""
+
+#: templates/database/designer/side_menu.phtml:34
+msgid "Exit fullscreen"
+msgstr ""
+
+#: templates/database/designer/side_menu.phtml:41
+#: templates/database/designer/side_menu.phtml:45
+msgid "New page"
+msgstr "Նոր էջ"
+
+#: templates/database/designer/side_menu.phtml:70
+#: templates/database/designer/side_menu.phtml:73
+msgid "Delete pages"
+msgstr "Ջնջել էջերը"
+
+#: templates/database/designer/side_menu.phtml:98
+#: templates/database/designer/side_menu.phtml:101
 msgid "Reload"
 msgstr "Թարմացնել"
 
-#: templates/designer/side_menu.phtml:107
-#: templates/designer/side_menu.phtml:110
+#: templates/database/designer/side_menu.phtml:107
+#: templates/database/designer/side_menu.phtml:110
 msgid "Help"
 msgstr "Օգնություն"
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Angular links"
 msgstr "Անկյունային հղումներ"
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Direct links"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:122
-#: templates/designer/side_menu.phtml:124
+#: templates/database/designer/side_menu.phtml:122
+#: templates/database/designer/side_menu.phtml:124
 msgid "Snap to grid"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:128
-#: templates/designer/side_menu.phtml:134
+#: templates/database/designer/side_menu.phtml:128
+#: templates/database/designer/side_menu.phtml:134
 msgid "Small/Big All"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:138
-#: templates/designer/side_menu.phtml:141
+#: templates/database/designer/side_menu.phtml:138
+#: templates/database/designer/side_menu.phtml:141
 msgid "Toggle small/big"
 msgstr "Փոխարկել փոքր/մեծ"
 
-#: templates/designer/side_menu.phtml:145
-#: templates/designer/side_menu.phtml:148
+#: templates/database/designer/side_menu.phtml:145
+#: templates/database/designer/side_menu.phtml:148
 msgid "Toggle relation lines"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:153
-#: templates/designer/side_menu.phtml:156
+#: templates/database/designer/side_menu.phtml:153
+#: templates/database/designer/side_menu.phtml:156
 msgid "Export schema"
 msgstr "Ուրվագծի արտահանում"
 
-#: templates/designer/side_menu.phtml:165
-#: templates/designer/side_menu.phtml:168
+#: templates/database/designer/side_menu.phtml:165
+#: templates/database/designer/side_menu.phtml:168
 msgid "Build Query"
 msgstr "Կազմել հարցումը"
 
-#: templates/designer/side_menu.phtml:173
-#: templates/designer/side_menu.phtml:177
+#: templates/database/designer/side_menu.phtml:173
+#: templates/database/designer/side_menu.phtml:177
 msgid "Move Menu"
 msgstr "Տեղափոխել ընտրացանկը"
 
-#: templates/designer/side_menu.phtml:181
-#: templates/designer/side_menu.phtml:186
+#: templates/database/designer/side_menu.phtml:181
+#: templates/database/designer/side_menu.phtml:186
 msgid "Pin text"
 msgstr ""
 
-#: templates/designer/table_list.phtml:4
+#: templates/database/designer/table_list.phtml:4
 msgid "Hide/Show all"
 msgstr ""
 
-#: templates/designer/table_list.phtml:14
+#: templates/database/designer/table_list.phtml:14
 msgid "Hide/Show Tables with no relation"
 msgstr ""
 
-#: templates/designer/table_list.phtml:59
+#: templates/database/designer/table_list.phtml:59
 msgid "Number of tables:"
 msgstr "Աղյուսակների քանակը՝"
 
+#: templates/database/structure/body_for_table_summary.phtml:6
+#, php-format
+msgid "%s table"
+msgid_plural "%s tables"
+msgstr[0] "%s աղյուսակ"
+msgstr[1] "%s աղյուսակ"
+
+#: templates/database/structure/body_for_table_summary.phtml:17
+msgid "Sum"
+msgstr "Ընդամենը"
+
+#: templates/database/structure/check_all_tables.phtml:6
+msgid "Check tables having overhead"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:10
+msgid "Show create"
+msgstr "Ցուցադրել ստեղծման ձևը"
+
+#: templates/database/structure/check_all_tables.phtml:27
+msgid "Prefix"
+msgstr "Նախածանց"
+
+#: templates/database/structure/check_all_tables.phtml:28
+msgid "Add prefix to table"
+msgstr "Ավելացնել նախածանց աղյուսակին"
+
+#: templates/database/structure/check_all_tables.phtml:29
+msgid "Replace table prefix"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:30
+msgid "Copy table with prefix"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:36
+msgid "Add columns to central list"
+msgstr "Ավելացնել սյունակներ՝ կենտրոնական ցանկին"
+
+#: templates/database/structure/check_all_tables.phtml:37
+msgid "Remove columns from central list"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:38
+msgid "Make consistent with central list"
+msgstr "Համապատասխանեցնել կենտրոնական ցանկին"
+
+#: templates/database/structure/favorite_anchor.phtml:12
+msgid "Add to Favorites"
+msgstr "Ավելացնել ընտրյալներին"
+
+#: templates/database/structure/show_create.phtml:2
+msgid "Showing create queries"
+msgstr "Ստեղծման հարցումների ցուցադրում"
+
+#: templates/database/structure/sortable_header.phtml:13
+msgid "Sort"
+msgstr "Դասավորել"
+
+#: templates/database/structure/table_header.phtml:42
+msgid ""
+"May be approximate. Click on the number to get the exact count. See "
+"[doc@faq3-11]FAQ 3.11[/doc]."
+msgstr ""
+
+#: templates/database/structure/table_header.phtml:66
+#: templates/table/index_form.phtml:127
+msgid "Size"
+msgstr "Ծավալը"
+
+#: templates/database/structure/table_header.phtml:74
+#: templates/table/structure/display_table_stats.phtml:27
+msgid "Overhead"
+msgstr ""
+
+#: templates/database/structure/tracking_icon.phtml:4
+msgid "Tracking is active."
+msgstr "Հետագծումը միացրած է։"
+
+#: templates/database/structure/tracking_icon.phtml:8
+msgid "Tracking is not active."
+msgstr "Հետագծումը միացրած չէ։"
+
 #: templates/error/report_form.phtml:7
 msgid ""
 "phpMyAdmin has encountered an error. We have collected data about this error "
@@ -14171,59 +14278,6 @@ msgstr ""
 msgid "Please explain the steps that lead to the error:"
 msgstr ""
 
-#: templates/gis_visualization/gis_visualization.phtml:3
-msgid "Display GIS Visualization"
-msgstr ""
-
-#: templates/gis_visualization/gis_visualization.phtml:8
-msgid "Label column"
-msgstr "Սյունակի պիտակը"
-
-#: templates/gis_visualization/gis_visualization.phtml:11
-msgid "-- None --"
-msgstr "-- Չկա --"
-
-#: templates/gis_visualization/gis_visualization.phtml:19
-msgid "Spatial column"
-msgstr ""
-
-#: templates/index_form.phtml:16
-msgid "Index name:"
-msgstr ""
-
-#: templates/index_form.phtml:19
-msgid ""
-"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
-msgstr ""
-
-#: templates/index_form.phtml:40
-msgid "Index choice:"
-msgstr ""
-
-#: templates/index_form.phtml:57
-msgid "Key block size:"
-msgstr ""
-
-#: templates/index_form.phtml:74
-msgid "Index type:"
-msgstr ""
-
-#: templates/index_form.phtml:86
-msgid "Parser:"
-msgstr "Վերլուծիչ՝"
-
-#: templates/index_form.phtml:102
-msgid "Comment:"
-msgstr "Մեկնաբանություն՝"
-
-#: templates/index_form.phtml:127 templates/structure/table_header.phtml:66
-msgid "Size"
-msgstr "Ծավալը"
-
-#: templates/index_form.phtml:149 templates/index_form.phtml:190
-msgid "Drag to reorder"
-msgstr ""
-
 #: templates/prefs_autoload.phtml:9
 msgid ""
 "Your browser has phpMyAdmin configuration for this domain. Would you like to "
@@ -14234,402 +14288,369 @@ msgstr ""
 msgid "Start row:"
 msgstr ""
 
-#: templates/structure/actions_in_table_structure.phtml:14
-#, php-format
-msgid "A primary key has been added on %s."
-msgstr ""
-
-#: templates/structure/actions_in_table_structure.phtml:34
-#: templates/structure/actions_in_table_structure.phtml:54
-#: templates/structure/actions_in_table_structure.phtml:79
-#: templates/structure/actions_in_table_structure.phtml:101
-#, php-format
-msgid "An index has been added on %s."
-msgstr "%s-ի համար ավելացվել է ցուցակագիր։"
-
-#: templates/structure/actions_in_table_structure.phtml:130
-#: templates/structure/check_all_table_column.phtml:59
-msgid "Remove from central columns"
-msgstr ""
-
-#: templates/structure/actions_in_table_structure.phtml:138
-#: templates/structure/check_all_table_column.phtml:55
-msgid "Add to central columns"
-msgstr "Ավելացնել կենտրոնական սյունակներին"
-
-#: templates/structure/add_column.phtml:7
-#, php-format
-msgid "Add %s column(s)"
-msgstr "Ավելացնել %s սյունակ"
-
-#: templates/structure/add_column.phtml:12
-msgid "at beginning of table"
-msgstr "աղյուսակի սկզբում"
-
-#: templates/structure/body_for_table_summary.phtml:6
-#, php-format
-msgid "%s table"
-msgid_plural "%s tables"
-msgstr[0] "%s աղյուսակ"
-msgstr[1] "%s աղյուսակ"
-
-#: templates/structure/body_for_table_summary.phtml:17
-msgid "Sum"
-msgstr "Ընդամենը"
-
-#: templates/structure/check_all_tables.phtml:6
-msgid "Check tables having overhead"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:10
-msgid "Show create"
-msgstr "Ցուցադրել ստեղծման ձևը"
-
-#: templates/structure/check_all_tables.phtml:27
-msgid "Prefix"
-msgstr "Նախածանց"
-
-#: templates/structure/check_all_tables.phtml:28
-msgid "Add prefix to table"
-msgstr "Ավելացնել նախածանց աղյուսակին"
-
-#: templates/structure/check_all_tables.phtml:29
-msgid "Replace table prefix"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:30
-msgid "Copy table with prefix"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:36
-msgid "Add columns to central list"
-msgstr "Ավելացնել սյունակներ՝ կենտրոնական ցանկին"
-
-#: templates/structure/check_all_tables.phtml:37
-msgid "Remove columns from central list"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:38
-msgid "Make consistent with central list"
-msgstr "Համապատասխանեցնել կենտրոնական ցանկին"
-
-#: templates/structure/display_structure.phtml:140 view_create.php:181
-msgid "Edit view"
-msgstr "Խմբագրել ներկայացումը"
-
-#: templates/structure/display_table_stats.phtml:9
-msgid "Space usage"
-msgstr "Տարածության օգտագործում"
-
-#: templates/structure/display_table_stats.phtml:27
-#: templates/structure/table_header.phtml:74
-msgid "Overhead"
-msgstr ""
-
-#: templates/structure/display_table_stats.phtml:32
-msgid "Effective"
-msgstr "Արդյունավետություն"
-
-#: templates/structure/favorite_anchor.phtml:12
-msgid "Add to Favorites"
-msgstr "Ավելացնել ընտրյալներին"
-
-#: templates/structure/move_columns_dialog.phtml:1
-#: templates/structure/optional_action_links.phtml:21
-msgid "Move columns"
-msgstr "Տեղափոխել սյունակները"
-
-#: templates/structure/move_columns_dialog.phtml:2
-msgid "Move the columns by dragging them up and down."
-msgstr ""
-
-#: templates/structure/optional_action_links.phtml:9
-msgid "Propose table structure"
-msgstr ""
-
-#: templates/structure/optional_action_links.phtml:24
-msgid "Improve table structure"
-msgstr ""
-
-#: templates/structure/optional_action_links.phtml:30
-msgid "Track view"
-msgstr "Հետագծել ներկայացումը"
-
-#: templates/structure/row_stats_table.phtml:3
-msgid "Row statistics"
-msgstr "Տողի վիճակագրությունը"
-
-#: templates/structure/row_stats_table.phtml:9
-msgid "static"
-msgstr "կայուն"
-
-#: templates/structure/row_stats_table.phtml:11
-msgid "dynamic"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:22
-msgid "partitioned"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:54
-msgid "Row length"
-msgstr "Տողի երկարությունը"
-
-#: templates/structure/row_stats_table.phtml:66
-msgid "Row size"
-msgstr "Տողի չափ"
-
-#: templates/structure/row_stats_table.phtml:73
-msgid "Next autoindex"
-msgstr ""
-
-#: templates/structure/secondary_tabs.phtml:14
-msgid "Relation view"
-msgstr "Կապակցման դիտում"
-
-#: templates/structure/show_create.phtml:2
-msgid "Showing create queries"
-msgstr "Ստեղծման հարցումների ցուցադրում"
-
-#: templates/structure/sortable_header.phtml:13
-msgid "Sort"
-msgstr "Դասավորել"
-
-#: templates/structure/table_header.phtml:42
-msgid ""
-"May be approximate. Click on the number to get the exact count. See "
-"[doc@faq3-11]FAQ 3.11[/doc]."
-msgstr ""
-
-#: templates/structure/table_structure_row.phtml:46
-#, php-format
-msgid "Column %s has been dropped."
-msgstr ""
-
-#: templates/structure/tracking_icon.phtml:4
-msgid "Tracking is active."
-msgstr "Հետագծումը միացրած է։"
-
-#: templates/structure/tracking_icon.phtml:8
-msgid "Tracking is not active."
-msgstr "Հետագծումը միացրած չէ։"
-
-#: templates/table/create_table.phtml:15
-msgid "Number of columns"
-msgstr ""
-
-#: templates/table/options.phtml:8
-msgid "Select columns (at least one):"
-msgstr "Ընտրեք սյունակները (առնվազն մեկը)՝"
-
-#: templates/table/options.phtml:37
-msgid "Add search conditions (body of the \"where\" clause):"
-msgstr ""
-
-#: templates/table/options.phtml:45
-msgid "Number of rows per page"
-msgstr ""
-
-#: templates/table/options.phtml:56
-msgid "Display order:"
-msgstr ""
-
-#: templates/table/options_zoom.phtml:6
-msgid "Use this column to label each point"
-msgstr "Օգտագործեք այս սյունակը՝ ամեն կետը պիտակելու համար"
-
-#: templates/table/options_zoom.phtml:35
-msgid "Maximum rows to plot"
-msgstr ""
-
-#: templates/table/replace_preview.phtml:13
-msgid "Find and replace - preview"
-msgstr ""
-
-#: templates/table/replace_preview.phtml:18
-msgid "Original string"
-msgstr ""
-
-#: templates/table/replace_preview.phtml:19
-msgid "Replaced string"
-msgstr "Փոխարինված տողը"
-
-#: templates/table/replace_preview.phtml:40
-msgid "Replace"
-msgstr "Փոխարինում"
-
-#: templates/table/rows_zoom.phtml:16
-msgid "Additional search criteria"
-msgstr "Հավելյալ որոնման եղրեր"
-
-#: templates/table/search_and_replace.phtml:3
-msgid "Replace with:"
-msgstr "Փոխարինել՝"
-
-#: templates/table/search_and_replace.phtml:22
-msgid "Use regular expression"
-msgstr "Օգտագործել կանոնավոր արտահայտությունը"
-
-#: templates/table/selection_form.phtml:12
-msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
-msgstr ""
-
-#: templates/table/selection_form.phtml:34
-msgid "Do a \"query by example\" (wildcard: \"%\")"
-msgstr ""
-
-#: templates/table/zoom_result_form.phtml:7
-msgid "Browse/Edit the points"
-msgstr ""
-
-#: templates/table/zoom_result_form.phtml:15
-msgid "How to use"
-msgstr ""
-
-#: templates/table/zoom_result_form.phtml:23
-msgid "Reset zoom"
-msgstr "Վերակայել խոշորացումը"
-
-#: templates/tbl_chart.phtml:17
+#: templates/table/chart/tbl_chart.phtml:17
 msgctxt "Chart type"
 msgid "Bar"
 msgstr ""
 
-#: templates/tbl_chart.phtml:21
+#: templates/table/chart/tbl_chart.phtml:21
 msgctxt "Chart type"
 msgid "Column"
 msgstr "Սյունակ"
 
-#: templates/tbl_chart.phtml:25
+#: templates/table/chart/tbl_chart.phtml:25
 msgctxt "Chart type"
 msgid "Line"
 msgstr ""
 
-#: templates/tbl_chart.phtml:29
+#: templates/table/chart/tbl_chart.phtml:29
 msgctxt "Chart type"
 msgid "Spline"
 msgstr ""
 
-#: templates/tbl_chart.phtml:33
+#: templates/table/chart/tbl_chart.phtml:33
 msgctxt "Chart type"
 msgid "Area"
 msgstr ""
 
-#: templates/tbl_chart.phtml:37
+#: templates/table/chart/tbl_chart.phtml:37
 msgctxt "Chart type"
 msgid "Pie"
 msgstr ""
 
-#: templates/tbl_chart.phtml:41
+#: templates/table/chart/tbl_chart.phtml:41
 msgctxt "Chart type"
 msgid "Timeline"
 msgstr "Ժամագիծ"
 
-#: templates/tbl_chart.phtml:45
+#: templates/table/chart/tbl_chart.phtml:45
 msgctxt "Chart type"
 msgid "Scatter"
 msgstr ""
 
-#: templates/tbl_chart.phtml:50
+#: templates/table/chart/tbl_chart.phtml:50
 msgid "Stacked"
 msgstr ""
 
-#: templates/tbl_chart.phtml:53
+#: templates/table/chart/tbl_chart.phtml:53
 msgid "Chart title"
 msgstr "Գծապատկերի վերնագիր"
 
-#: templates/tbl_chart.phtml:57
+#: templates/table/chart/tbl_chart.phtml:57
 msgid "X-Axis:"
-msgstr ""
+msgstr "X առանցք`"
 
-#: templates/tbl_chart.phtml:72
+#: templates/table/chart/tbl_chart.phtml:72
 msgid "Series:"
 msgstr "Շարքեր՝"
 
-#: templates/tbl_chart.phtml:102
+#: templates/table/chart/tbl_chart.phtml:102
 msgid "X-Axis label:"
-msgstr ""
+msgstr "X առանցքի պիտակը՝"
 
-#: templates/tbl_chart.phtml:104
+#: templates/table/chart/tbl_chart.phtml:104
 msgid "X Values"
-msgstr ""
+msgstr "X արժեքները"
 
-#: templates/tbl_chart.phtml:107
+#: templates/table/chart/tbl_chart.phtml:107
 msgid "Y-Axis label:"
-msgstr ""
+msgstr "Y առանցքի պիտակը՝"
 
-#: templates/tbl_chart.phtml:115
+#: templates/table/chart/tbl_chart.phtml:115
 msgid "Series names are in a column"
 msgstr ""
 
-#: templates/tbl_chart.phtml:118
+#: templates/table/chart/tbl_chart.phtml:118
 msgid "Series column:"
 msgstr "Շարքի սյունակ՝"
 
-#: templates/tbl_chart.phtml:130
+#: templates/table/chart/tbl_chart.phtml:130
 msgid "Value Column:"
 msgstr "Արժեքի սյունակը՝"
 
-#: templates/tbl_chart.phtml:150
+#: templates/table/chart/tbl_chart.phtml:150
 msgid "Save chart as image"
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:7
+#: templates/table/gis_visualization/gis_visualization.phtml:3
+msgid "Display GIS Visualization"
+msgstr ""
+
+#: templates/table/gis_visualization/gis_visualization.phtml:8
+msgid "Label column"
+msgstr "Սյունակի պիտակը"
+
+#: templates/table/gis_visualization/gis_visualization.phtml:11
+msgid "-- None --"
+msgstr "-- Չկա --"
+
+#: templates/table/gis_visualization/gis_visualization.phtml:19
+msgid "Spatial column"
+msgstr ""
+
+#: templates/table/index_form.phtml:16
+msgid "Index name:"
+msgstr ""
+
+#: templates/table/index_form.phtml:19
+msgid ""
+"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
+msgstr ""
+
+#: templates/table/index_form.phtml:40
+msgid "Index choice:"
+msgstr ""
+
+#: templates/table/index_form.phtml:57
+msgid "Key block size:"
+msgstr ""
+
+#: templates/table/index_form.phtml:74
+msgid "Index type:"
+msgstr ""
+
+#: templates/table/index_form.phtml:86
+msgid "Parser:"
+msgstr "Վերլուծիչ՝"
+
+#: templates/table/index_form.phtml:102
+msgid "Comment:"
+msgstr "Մեկնաբանություն՝"
+
+#: templates/table/index_form.phtml:149 templates/table/index_form.phtml:190
+msgid "Drag to reorder"
+msgstr ""
+
+#: templates/table/relation/common_form.phtml:7
 msgid "Internal relations"
 msgstr "Ներքին կապակցումներ"
 
-#: templates/tbl_relation/common_form.phtml:11
+#: templates/table/relation/common_form.phtml:11
 msgid "Internal relation"
 msgstr "Ներքին կապակցում"
 
-#: templates/tbl_relation/common_form.phtml:14
+#: templates/table/relation/common_form.phtml:14
 msgid ""
 "An internal relation is not necessary when a corresponding FOREIGN KEY "
 "relation exists."
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:37
+#: templates/table/relation/common_form.phtml:37
 msgid "Foreign key constraints"
 msgstr "Արտաքին բանալիի սահմանափակումները"
 
-#: templates/tbl_relation/common_form.phtml:40
+#: templates/table/relation/common_form.phtml:40
 msgid "Actions"
 msgstr "Գործողություններ"
 
-#: templates/tbl_relation/common_form.phtml:41
+#: templates/table/relation/common_form.phtml:41
 msgid "Constraint properties"
 msgstr "Սահմանափակման հատկություններ"
 
-#: templates/tbl_relation/common_form.phtml:44
+#: templates/table/relation/common_form.phtml:44
 msgid ""
 "Only columns with index will be displayed. You can define an index below."
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:49
+#: templates/table/relation/common_form.phtml:49
 msgid "Foreign key constraint"
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:81
+#: templates/table/relation/common_form.phtml:81
 msgid "+ Add constraint"
 msgstr "+ Ավելացնել սահմանափակում"
 
-#: templates/tbl_relation/common_form.phtml:91
+#: templates/table/relation/common_form.phtml:91
 msgid "Choose column to display:"
 msgstr ""
 
-#: templates/tbl_relation/foreign_key_row.phtml:13
+#: templates/table/relation/foreign_key_row.phtml:13
 #, php-format
 msgid "Foreign key constraint %s has been dropped"
 msgstr "Արտաքին բանալիի %s սահմանափակումը ջնջվեց"
 
-#: templates/tbl_relation/foreign_key_row.phtml:102
+#: templates/table/relation/foreign_key_row.phtml:102
 msgid "Constraint name"
 msgstr "Սահմանափակման անվանում"
 
-#: templates/tbl_relation/foreign_key_row.phtml:157
+#: templates/table/relation/foreign_key_row.phtml:157
 msgid "+ Add column"
 msgstr "+ Ավելացնել սյունակ"
 
+#: templates/table/search/options.phtml:8
+msgid "Select columns (at least one):"
+msgstr "Ընտրեք սյունակները (առնվազն մեկը)՝"
+
+#: templates/table/search/options.phtml:37
+msgid "Add search conditions (body of the \"where\" clause):"
+msgstr ""
+
+#: templates/table/search/options.phtml:45
+msgid "Number of rows per page"
+msgstr ""
+
+#: templates/table/search/options.phtml:56
+msgid "Display order:"
+msgstr ""
+
+#: templates/table/search/options_zoom.phtml:6
+msgid "Use this column to label each point"
+msgstr "Օգտագործեք այս սյունակը՝ ամեն կետը պիտակելու համար"
+
+#: templates/table/search/options_zoom.phtml:35
+msgid "Maximum rows to plot"
+msgstr ""
+
+#: templates/table/search/replace_preview.phtml:13
+msgid "Find and replace - preview"
+msgstr "Գտնել և փոխարինել՝ նախադիտում"
+
+#: templates/table/search/replace_preview.phtml:18
+msgid "Original string"
+msgstr ""
+
+#: templates/table/search/replace_preview.phtml:19
+msgid "Replaced string"
+msgstr "Փոխարինված տողը"
+
+#: templates/table/search/replace_preview.phtml:40
+msgid "Replace"
+msgstr "Փոխարինում"
+
+#: templates/table/search/rows_zoom.phtml:16
+msgid "Additional search criteria"
+msgstr "Հավելյալ որոնման եղրեր"
+
+#: templates/table/search/search_and_replace.phtml:3
+msgid "Replace with:"
+msgstr "Փոխարինել՝"
+
+#: templates/table/search/search_and_replace.phtml:22
+msgid "Use regular expression"
+msgstr "Օգտագործել կանոնավոր արտահայտությունը"
+
+#: templates/table/search/selection_form.phtml:12
+msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
+msgstr ""
+
+#: templates/table/search/selection_form.phtml:34
+msgid "Do a \"query by example\" (wildcard: \"%\")"
+msgstr ""
+
+#: templates/table/search/zoom_result_form.phtml:7
+msgid "Browse/Edit the points"
+msgstr ""
+
+#: templates/table/search/zoom_result_form.phtml:15
+msgid "How to use"
+msgstr ""
+
+#: templates/table/search/zoom_result_form.phtml:23
+msgid "Reset zoom"
+msgstr "Վերակայել խոշորացումը"
+
+#: templates/table/secondary_tabs.phtml:14
+msgid "Relation view"
+msgstr "Կապակցման դիտում"
+
+#: templates/table/structure/actions_in_table_structure.phtml:14
+#, php-format
+msgid "A primary key has been added on %s."
+msgstr ""
+
+#: templates/table/structure/actions_in_table_structure.phtml:34
+#: templates/table/structure/actions_in_table_structure.phtml:54
+#: templates/table/structure/actions_in_table_structure.phtml:79
+#: templates/table/structure/actions_in_table_structure.phtml:101
+#, php-format
+msgid "An index has been added on %s."
+msgstr "%s-ի համար ավելացվել է ցուցակագիր։"
+
+#: templates/table/structure/actions_in_table_structure.phtml:130
+#: templates/table/structure/check_all_table_column.phtml:59
+msgid "Remove from central columns"
+msgstr ""
+
+#: templates/table/structure/actions_in_table_structure.phtml:138
+#: templates/table/structure/check_all_table_column.phtml:55
+msgid "Add to central columns"
+msgstr "Ավելացնել կենտրոնական սյունակներին"
+
+#: templates/table/structure/add_column.phtml:7
+#, php-format
+msgid "Add %s column(s)"
+msgstr "Ավելացնել %s սյունակ"
+
+#: templates/table/structure/add_column.phtml:12
+msgid "at beginning of table"
+msgstr "աղյուսակի սկզբում"
+
+#: templates/table/structure/display_structure.phtml:140 view_create.php:181
+msgid "Edit view"
+msgstr "Խմբագրել ներկայացումը"
+
+#: templates/table/structure/display_table_stats.phtml:9
+msgid "Space usage"
+msgstr "Տարածության օգտագործում"
+
+#: templates/table/structure/display_table_stats.phtml:32
+msgid "Effective"
+msgstr "Արդյունավետություն"
+
+#: templates/table/structure/move_columns_dialog.phtml:1
+#: templates/table/structure/optional_action_links.phtml:21
+msgid "Move columns"
+msgstr "Տեղափոխել սյունակները"
+
+#: templates/table/structure/move_columns_dialog.phtml:2
+msgid "Move the columns by dragging them up and down."
+msgstr ""
+
+#: templates/table/structure/optional_action_links.phtml:9
+msgid "Propose table structure"
+msgstr ""
+
+#: templates/table/structure/optional_action_links.phtml:24
+msgid "Improve table structure"
+msgstr ""
+
+#: templates/table/structure/optional_action_links.phtml:30
+msgid "Track view"
+msgstr "Հետագծել ներկայացումը"
+
+#: templates/table/structure/row_stats_table.phtml:3
+msgid "Row statistics"
+msgstr "Տողի վիճակագրությունը"
+
+#: templates/table/structure/row_stats_table.phtml:9
+msgid "static"
+msgstr "կայուն"
+
+#: templates/table/structure/row_stats_table.phtml:11
+msgid "dynamic"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:22
+msgid "partitioned"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:54
+msgid "Row length"
+msgstr "Տողի երկարությունը"
+
+#: templates/table/structure/row_stats_table.phtml:66
+msgid "Row size"
+msgstr "Տողի չափ"
+
+#: templates/table/structure/row_stats_table.phtml:73
+msgid "Next autoindex"
+msgstr ""
+
+#: templates/table/structure/table_structure_row.phtml:46
+#, php-format
+msgid "Column %s has been dropped."
+msgstr ""
+
 #: themes.php:17 themes.php:22
 msgid "Theme"
 msgstr ""
diff --git a/po/ia.po b/po/ia.po
index 392523b2cf..8bdc3a09b6 100644
--- a/po/ia.po
+++ b/po/ia.po
@@ -6,12 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 4.5.0-dev\n"
-"Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
-"POT-Creation-Date: 2015-08-08 13:53-0400\n"
+"Report-Msgid-Bugs-To: developers@phpmyadmin.net\n"
+"POT-Creation-Date: 2015-08-12 08:10-0400\n"
 "PO-Revision-Date: 2015-08-09 00:05+0200\n"
 "Last-Translator: Giovanni Sora <g.sora@tiscali.it>\n"
-"Language-Team: Interlingua "
-"<https://hosted.weblate.org/projects/phpmyadmin/master/ia/>\n"
+"Language-Team: Interlingua <https://hosted.weblate.org/projects/phpmyadmin/"
+"master/ia/>\n"
 "Language: ia\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -57,7 +57,7 @@ msgid "Table comments:"
 msgstr "Commentos de tabella:"
 
 #: db_datadict.php:104 libraries/Index.class.php:699
-#: libraries/insert_edit.lib.php:1567
+#: libraries/insert_edit.lib.php:1565
 #: libraries/navigation/Nodes/Node_Column.class.php:30
 #: libraries/plugins/export/ExportHtmlword.class.php:280
 #: libraries/plugins/export/ExportHtmlword.class.php:375
@@ -71,13 +71,14 @@ msgstr "Commentos de tabella:"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1023
 #: libraries/tracking.lib.php:879 libraries/tracking.lib.php:975
 #: templates/columns_definitions/column_name.phtml:18
-#: templates/index_form.phtml:124 templates/table/table_header.phtml:6
-#: templates/table/zoom_result_form.phtml:33
-#: templates/tbl_relation/common_form.phtml:10
-#: templates/tbl_relation/common_form.phtml:43
-#: templates/tbl_relation/foreign_key_row.phtml:194
-#: templates/tbl_relation/foreign_key_row.phtml:206
-#: templates/tbl_relation/internal_relational_row.phtml:71
+#: templates/table/index_form.phtml:124
+#: templates/table/relation/common_form.phtml:10
+#: templates/table/relation/common_form.phtml:43
+#: templates/table/relation/foreign_key_row.phtml:194
+#: templates/table/relation/foreign_key_row.phtml:206
+#: templates/table/relation/internal_relational_row.phtml:71
+#: templates/table/search/table_header.phtml:6
+#: templates/table/search/zoom_result_form.phtml:33
 msgid "Column"
 msgstr "Columna"
 
@@ -95,21 +96,21 @@ msgstr "Columna"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1001
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1024
 #: libraries/rte/rte_list.lib.php:75 libraries/rte/rte_list.lib.php:103
-#: libraries/rte/rte_routines.lib.php:802
-#: libraries/rte/rte_routines.lib.php:831
-#: libraries/rte/rte_routines.lib.php:1493
+#: libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_routines.lib.php:922
+#: libraries/rte/rte_routines.lib.php:1584
 #: libraries/server_privileges.lib.php:2369 libraries/tracking.lib.php:880
 #: libraries/tracking.lib.php:972
 #: templates/columns_definitions/table_fields_definitions.phtml:11
-#: templates/structure/table_header.phtml:48
-#: templates/structure/table_structure_header.phtml:6
-#: templates/table/table_header.phtml:7
+#: templates/database/structure/table_header.phtml:48
+#: templates/table/search/table_header.phtml:7
+#: templates/table/structure/table_structure_header.phtml:6
 msgid "Type"
 msgstr "Typo"
 
 #: db_datadict.php:106 libraries/Index.class.php:702
 #: libraries/central_columns.lib.php:708
-#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1576
+#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1574
 #: libraries/plugins/export/ExportHtmlword.class.php:286
 #: libraries/plugins/export/ExportHtmlword.class.php:381
 #: libraries/plugins/export/ExportLatex.class.php:509
@@ -122,8 +123,8 @@ msgstr "Typo"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1026
 #: libraries/tracking.lib.php:882 libraries/tracking.lib.php:978
 #: templates/columns_definitions/table_fields_definitions.phtml:39
-#: templates/structure/table_structure_header.phtml:9
-#: templates/table/zoom_result_form.phtml:34
+#: templates/table/search/zoom_result_form.phtml:34
+#: templates/table/structure/table_structure_header.phtml:9
 msgid "Null"
 msgstr "Null"
 
@@ -141,8 +142,8 @@ msgstr "Null"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1027
 #: libraries/replication_gui.lib.php:153 libraries/tracking.lib.php:883
 #: templates/columns_definitions/table_fields_definitions.phtml:25
-#: templates/structure/body_for_table_summary.phtml:55
-#: templates/structure/table_structure_header.phtml:10
+#: templates/database/structure/body_for_table_summary.phtml:55
+#: templates/table/structure/table_structure_header.phtml:10
 msgid "Default"
 msgstr "Predefinite"
 
@@ -170,19 +171,19 @@ msgid "Comments"
 msgstr "Commentos"
 
 #: db_datadict.php:146
-#: libraries/controllers/StructureController.class.php:1960
-#: libraries/controllers/StructureController.class.php:1965
+#: libraries/controllers/TableStructureController.class.php:951
+#: libraries/controllers/TableStructureController.class.php:956
 #: libraries/tracking.lib.php:922
 #: templates/columns_definitions/column_indexes.phtml:6
-#: templates/structure/check_all_table_column.phtml:22
-#: templates/structure/display_structure.phtml:74
+#: templates/table/structure/check_all_table_column.phtml:22
+#: templates/table/structure/display_structure.phtml:74
 msgid "Primary"
 msgstr "Primari"
 
 #: db_datadict.php:156 js/messages.php:317 libraries/Index.class.php:567
 #: libraries/Index.class.php:606 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261 libraries/mult_submits.lib.php:403
+#: libraries/config/FormDisplay.tpl.php:272 libraries/mult_submits.lib.php:403
 #: libraries/mult_submits.lib.php:417
 #: libraries/plugins/export/ExportHtmlword.class.php:630
 #: libraries/plugins/export/ExportLatex.class.php:589
@@ -198,20 +199,20 @@ msgstr "Primari"
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1010 libraries/tracking.lib.php:1015
 #: prefs_manage.php:140 templates/prefs_autoload.phtml:15
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "No"
 msgstr "No"
 
 #: db_datadict.php:156 js/messages.php:443 libraries/Index.class.php:568
 #: libraries/Index.class.php:605 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261
-#: libraries/controllers/StructureController.class.php:1344
-#: libraries/controllers/StructureController.class.php:2223
-#: libraries/controllers/StructureController.class.php:2232
-#: libraries/controllers/StructureController.class.php:2237
-#: libraries/controllers/StructureController.class.php:2242
-#: libraries/controllers/StructureController.class.php:2247
+#: libraries/config/FormDisplay.tpl.php:272
+#: libraries/controllers/TableStructureController.class.php:539
+#: libraries/controllers/TableStructureController.class.php:1201
+#: libraries/controllers/TableStructureController.class.php:1210
+#: libraries/controllers/TableStructureController.class.php:1215
+#: libraries/controllers/TableStructureController.class.php:1220
+#: libraries/controllers/TableStructureController.class.php:1225
 #: libraries/mult_submits.inc.php:82 libraries/mult_submits.inc.php:178
 #: libraries/mult_submits.lib.php:339 libraries/mult_submits.lib.php:372
 #: libraries/mult_submits.lib.php:401 libraries/mult_submits.lib.php:415
@@ -220,8 +221,8 @@ msgstr "No"
 #: libraries/plugins/export/ExportOdt.class.php:756
 #: libraries/plugins/export/ExportTexytext.class.php:567
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1077
-#: libraries/server_databases.lib.php:464
-#: libraries/server_databases.lib.php:474
+#: libraries/server_databases.lib.php:475
+#: libraries/server_databases.lib.php:485
 #: libraries/server_privileges.lib.php:2546
 #: libraries/server_privileges.lib.php:2727
 #: libraries/server_privileges.lib.php:2748
@@ -231,7 +232,7 @@ msgstr "No"
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1008 libraries/tracking.lib.php:1013
 #: prefs_manage.php:138 templates/prefs_autoload.phtml:14
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "Yes"
 msgstr "Si"
 
@@ -241,7 +242,7 @@ msgstr "Vide dump (schema) del base de datos"
 
 #: db_export.php:37 db_tracking.php:90 export.php:382
 #: libraries/DBQbe.class.php:326
-#: libraries/controllers/StructureController.class.php:231
+#: libraries/controllers/DatabaseStructureController.class.php:170
 #: libraries/navigation/NavigationTree.class.php:897
 msgid "No tables found in database."
 msgstr "Il non ha tabulas in le base de datos."
@@ -252,14 +253,14 @@ msgstr "Il non ha tabulas in le base de datos."
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:26
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:120
-#: templates/structure/show_create.phtml:18
+#: templates/database/structure/show_create.phtml:18
 msgid "Tables"
 msgstr "Tabellas"
 
 #: db_export.php:52 libraries/Menu.class.php:317 libraries/Menu.class.php:425
-#: libraries/Util.class.php:3333 libraries/Util.class.php:3343
-#: libraries/Util.class.php:3349 libraries/Util.class.php:3629
-#: libraries/Util.class.php:4327 libraries/Util.class.php:4344
+#: libraries/Util.class.php:3339 libraries/Util.class.php:3349
+#: libraries/Util.class.php:3355 libraries/Util.class.php:3635
+#: libraries/Util.class.php:4333 libraries/Util.class.php:4350
 #: libraries/central_columns.lib.php:728 libraries/config.values.php:39
 #: libraries/config.values.php:47 libraries/config.values.php:109
 #: libraries/config.values.php:115 libraries/config/setup.forms.php:323
@@ -273,7 +274,7 @@ msgstr "Tabellas"
 #: libraries/navigation/Nodes/Node_Table.class.php:283
 #: libraries/server_privileges.lib.php:1141 libraries/tracking.lib.php:874
 #: templates/columns_definitions/table_fields_definitions.phtml:3
-#: templates/designer/table_list.phtml:28
+#: templates/database/designer/table_list.phtml:28
 msgid "Structure"
 msgstr "Structura"
 
@@ -285,7 +286,7 @@ msgstr "Structura"
 #: libraries/config/user_preferences.forms.php:292
 #: libraries/config/user_preferences.forms.php:297
 #: libraries/server_privileges.lib.php:1140
-#: templates/structure/display_table_stats.phtml:12
+#: templates/table/structure/display_table_stats.phtml:12
 msgid "Data"
 msgstr "Datos"
 
@@ -359,10 +360,10 @@ msgstr "Tabulas traciate"
 #: libraries/server_privileges.lib.php:2908
 #: libraries/server_privileges.lib.php:3145
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4346
-#: templates/structure/table_header.phtml:21
-#: templates/tbl_relation/foreign_key_row.phtml:176
-#: templates/tbl_relation/internal_relational_row.phtml:63
+#: libraries/server_privileges.lib.php:4372
+#: templates/database/structure/table_header.phtml:21
+#: templates/table/relation/foreign_key_row.phtml:176
+#: templates/table/relation/internal_relational_row.phtml:63
 msgid "Table"
 msgstr "Tabula"
 
@@ -379,7 +380,7 @@ msgid "Updated"
 msgstr "Actualisate"
 
 #: db_tracking.php:130 js/messages.php:243 libraries/Menu.class.php:552
-#: libraries/Util.class.php:4314 libraries/config.values.php:104
+#: libraries/Util.class.php:4320 libraries/config.values.php:104
 #: libraries/rte/rte_events.lib.php:393 libraries/rte/rte_list.lib.php:101
 #: libraries/server_status_processes.lib.php:92 libraries/tracking.lib.php:279
 msgid "Status"
@@ -388,14 +389,15 @@ msgstr "Stato"
 #: db_tracking.php:131 db_tracking.php:290 libraries/Index.class.php:693
 #: libraries/central_columns.lib.php:687 libraries/rte/rte_list.lib.php:74
 #: libraries/rte/rte_list.lib.php:89 libraries/rte/rte_list.lib.php:102
-#: libraries/server_databases.lib.php:398
+#: libraries/server_databases.lib.php:409
 #: libraries/server_privileges.lib.php:2372
 #: libraries/server_privileges.lib.php:3166
 #: libraries/server_privileges.lib.php:3342
 #: libraries/server_user_groups.lib.php:82
 #: libraries/server_variables.lib.php:189 libraries/tracking.lib.php:280
-#: libraries/tracking.lib.php:793 templates/structure/table_header.phtml:30
-#: templates/structure/table_structure_header.phtml:23
+#: libraries/tracking.lib.php:793
+#: templates/database/structure/table_header.phtml:30
+#: templates/table/structure/table_structure_header.phtml:23
 msgid "Action"
 msgstr "Action"
 
@@ -437,7 +439,7 @@ msgid "Untracked tables"
 msgstr "Tabulas non traciate"
 
 #: db_tracking.php:305 db_tracking.php:336
-#: templates/structure/optional_action_links.phtml:17
+#: templates/table/structure/optional_action_links.phtml:17
 msgid "Track table"
 msgstr "Tracia tabula"
 
@@ -493,7 +495,7 @@ msgid "Value for the column \"%s\""
 msgstr "Valor pro le columna \"%s\""
 
 #: gis_data_editor.php:146
-#: templates/gis_visualization/gis_visualization.phtml:37
+#: templates/table/gis_visualization/gis_visualization.phtml:37
 msgid "Use OpenStreetMaps as Base Layer"
 msgstr "Usa OpenStreetMaps como disposition o nivello basic"
 
@@ -573,35 +575,35 @@ msgstr "Adde un geometria"
 #: libraries/display_change_password.lib.php:162
 #: libraries/display_export.lib.php:402 libraries/display_export.lib.php:408
 #: libraries/display_import.lib.php:392 libraries/index.lib.php:44
-#: libraries/insert_edit.lib.php:1546 libraries/insert_edit.lib.php:1583
+#: libraries/insert_edit.lib.php:1544 libraries/insert_edit.lib.php:1581
 #: libraries/normalization.lib.php:165 libraries/normalization.lib.php:821
 #: libraries/operations.lib.php:38 libraries/operations.lib.php:108
 #: libraries/operations.lib.php:263 libraries/operations.lib.php:306
 #: libraries/operations.lib.php:801 libraries/operations.lib.php:874
 #: libraries/operations.lib.php:923 libraries/operations.lib.php:1337
 #: libraries/operations.lib.php:1658
-#: libraries/plugins/auth/AuthenticationCookie.class.php:244
+#: libraries/plugins/auth/AuthenticationCookie.class.php:232
 #: libraries/replication_gui.lib.php:122 libraries/replication_gui.lib.php:161
 #: libraries/replication_gui.lib.php:324 libraries/replication_gui.lib.php:461
 #: libraries/replication_gui.lib.php:906 libraries/rte/rte_events.lib.php:509
-#: libraries/rte/rte_routines.lib.php:969
-#: libraries/rte/rte_routines.lib.php:1581
+#: libraries/rte/rte_routines.lib.php:1060
+#: libraries/rte/rte_routines.lib.php:1672
 #: libraries/rte/rte_triggers.lib.php:396 libraries/server_bin_log.lib.php:61
 #: libraries/server_privileges.lib.php:705
 #: libraries/server_privileges.lib.php:2106
 #: libraries/server_privileges.lib.php:2872
 #: libraries/server_privileges.lib.php:3553
-#: libraries/server_privileges.lib.php:4627
+#: libraries/server_privileges.lib.php:4653
 #: libraries/server_user_groups.lib.php:285
 #: libraries/sql_query_form.lib.php:369 libraries/sql_query_form.lib.php:429
 #: libraries/tracking.lib.php:533 libraries/tracking.lib.php:653
 #: prefs_manage.php:277 prefs_manage.php:355
 #: templates/columns_definitions/column_definitions_form.phtml:59
-#: templates/header_location.phtml:17 templates/index_form.phtml:238
+#: templates/database/create_table.phtml:21 templates/header_location.phtml:28
 #: templates/startAndNumberOfRowsPanel.phtml:14
-#: templates/structure/add_column.phtml:25
-#: templates/table/create_table.phtml:21
-#: templates/table/selection_form.phtml:75 view_create.php:275
+#: templates/table/index_form.phtml:238
+#: templates/table/search/selection_form.phtml:75
+#: templates/table/structure/add_column.phtml:25 view_create.php:275
 #: view_operations.php:106
 msgid "Go"
 msgstr "Vade"
@@ -695,7 +697,7 @@ msgstr ""
 "Il non es possibile cargar plugins de importar, pro favor tu verifica tu "
 "installation!"
 
-#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1466
+#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1460
 #, php-format
 msgid "Bookmark %s has been created."
 msgstr "Marcator de libro %s create."
@@ -734,11 +736,11 @@ msgstr "Il non pote incargar le progression del importation."
 msgid "Back"
 msgstr "Retro"
 
-#: index.php:148 libraries/Footer.class.php:70
+#: index.php:149 libraries/Footer.class.php:70
 msgid "phpMyAdmin Demo Server"
 msgstr "Servitor demo de phpMyAdmin"
 
-#: index.php:152
+#: index.php:153
 #, php-format
 msgid ""
 "You are using the demo server. You can do anything here, but please do not "
@@ -749,110 +751,110 @@ msgstr ""
 "non modifica usatores root, debian-sys-maint e pma. Altere information es "
 "disponibile in %s."
 
-#: index.php:162
+#: index.php:163
 msgid "General Settings"
 msgstr "Preferentias general"
 
-#: index.php:190 libraries/display_change_password.lib.php:50
+#: index.php:191 libraries/display_change_password.lib.php:50
 #: libraries/display_change_password.lib.php:53 user_password.php:247
 msgid "Change password"
 msgstr "Modifica contrasigno"
 
-#: index.php:206
+#: index.php:207
 msgid "Server connection collation"
 msgstr "Colliger de connexion de servitor"
 
-#: index.php:228
+#: index.php:229
 msgid "Appearance Settings"
 msgstr "Preferentias de apparentia"
 
-#: index.php:258 prefs_manage.php:285
+#: index.php:259 prefs_manage.php:285
 msgid "More settings"
 msgstr "Altere preferentias"
 
-#: index.php:279
+#: index.php:280
 msgid "Database server"
 msgstr "Servitor de base de datos"
 
-#: index.php:282 libraries/plugins/auth/AuthenticationCookie.class.php:181
+#: index.php:283 libraries/plugins/auth/AuthenticationCookie.class.php:169
 msgid "Server:"
 msgstr "Servitor:"
 
-#: index.php:286
+#: index.php:287
 msgid "Server type:"
 msgstr "Typo de servitor:"
 
-#: index.php:290 libraries/plugins/export/ExportLatex.class.php:212
+#: index.php:291 libraries/plugins/export/ExportLatex.class.php:212
 #: libraries/plugins/export/ExportSql.class.php:687
 #: libraries/plugins/export/ExportXml.class.php:189
 msgid "Server version:"
 msgstr "Version de servitor:"
 
-#: index.php:296
+#: index.php:297
 msgid "Protocol version:"
 msgstr "Version de protocollo:"
 
-#: index.php:300
+#: index.php:301
 msgid "User:"
 msgstr "Usator:"
 
-#: index.php:305
+#: index.php:306
 msgid "Server charset:"
 msgstr "Insimul de characteres del servitor:"
 
-#: index.php:320
+#: index.php:321
 msgid "Web server"
 msgstr "Servitor web"
 
-#: index.php:331
+#: index.php:332
 msgid "Database client version:"
 msgstr "Version del cliente de base de datos:"
 
-#: index.php:335
+#: index.php:336
 msgid "PHP extension:"
 msgstr "Extension de PHP:"
 
-#: index.php:349
+#: index.php:350
 msgid "PHP version:"
 msgstr "Version de PHP:"
 
-#: index.php:360
+#: index.php:361
 msgid "Show PHP information"
 msgstr "Monstra information de PHP"
 
-#: index.php:383
+#: index.php:384
 msgid "Version information:"
 msgstr "Information de version:"
 
-#: index.php:392 libraries/Util.class.php:432 libraries/Util.class.php:495
-#: libraries/config/FormDisplay.tpl.php:151
+#: index.php:393 libraries/Util.class.php:432 libraries/Util.class.php:495
+#: libraries/config/FormDisplay.tpl.php:162
 #: libraries/display_export.lib.php:577 libraries/engines/pbxt.lib.php:162
 #: libraries/navigation/NavigationHeader.class.php:196
 #: libraries/server_variables.lib.php:160
 msgid "Documentation"
 msgstr "Documentation"
 
-#: index.php:399
+#: index.php:400
 msgid "Wiki"
 msgstr "Wiki"
 
-#: index.php:408
+#: index.php:409
 msgid "Official Homepage"
 msgstr "Pagina initial o domo official"
 
-#: index.php:415
+#: index.php:416
 msgid "Contribute"
 msgstr "Contribue"
 
-#: index.php:422
+#: index.php:423
 msgid "Get support"
 msgstr "Obtene supporto"
 
-#: index.php:429
+#: index.php:430
 msgid "List of changes"
 msgstr "Lista de modificationes"
 
-#: index.php:451
+#: index.php:452
 msgid ""
 "You are connected as 'root' with no password, which corresponds to the "
 "default MySQL privileged account. Your MySQL server is running with this "
@@ -865,7 +867,7 @@ msgstr ""
 "seriemente corriger iste foramine de securitate per fixar un contrasigno pro "
 "le usator 'root'."
 
-#: index.php:468
+#: index.php:469
 msgid ""
 "You have enabled mbstring.func_overload in your PHP configuration. This "
 "option is incompatible with phpMyAdmin and might cause some data to be "
@@ -875,7 +877,7 @@ msgstr ""
 "operation es incompatibile con phpMyAdmin e poterea causar alcun corruption "
 "de datos!"
 
-#: index.php:483
+#: index.php:484
 msgid ""
 "The mbstring PHP extension was not found and you seem to be using a "
 "multibyte charset. Without the mbstring extension phpMyAdmin is unable to "
@@ -885,7 +887,7 @@ msgstr ""
 "insimul de characteres multibyte. Sin le extension mbstring phpMyAdmin non "
 "pote divider catenas correctemente e on poterea obtener exitos inexpectate."
 
-#: index.php:500
+#: index.php:501
 msgid ""
 "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini."
 "session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower than "
@@ -897,7 +899,7 @@ msgstr ""
 "validitate de cookie configurate in phpMyAdmin, debite a isto, tu "
 "authentication poterea expirar ante que lo que es configurate in phpMyAdmin."
 
-#: index.php:519
+#: index.php:520
 msgid ""
 "Login cookie store is lower than cookie validity configured in phpMyAdmin, "
 "because of this, your login will expire sooner than configured in phpMyAdmin."
@@ -906,13 +908,13 @@ msgstr ""
 "cookie configurate in  phpMyAdmin, pro iste ration, tu\n"
 "accesso expirara plus tosto que lo que es configurate in phpMyAdmin."
 
-#: index.php:535
+#: index.php:536
 msgid "The configuration file now needs a secret passphrase (blowfish_secret)."
 msgstr ""
 "Nunc on necessita un contrasigno pro le file de configuration "
 "(blowfish_secret)."
 
-#: index.php:548
+#: index.php:549
 msgid ""
 "Directory [code]config[/code], which is used by the setup script, still "
 "exists in your phpMyAdmin directory. It is strongly recommended to remove it "
@@ -925,7 +927,7 @@ msgstr ""
 "le securitate de tu servbitor poterea esser compromittite per personas non "
 "authorisate discargante tu configuration."
 
-#: index.php:564
+#: index.php:565
 #, php-format
 msgid ""
 "The phpMyAdmin configuration storage is not completely configured, some "
@@ -934,14 +936,14 @@ msgstr ""
 "Le configuration de phpMyAdmin non es completemente configurate, alcun "
 "characteristicas additional ha essite deactivate.  %sDiscoperi perque%s. "
 
-#: index.php:571
+#: index.php:572
 msgid ""
 "Or alternately go to 'Operations' tab of any database to set it up there."
 msgstr ""
 "O alternativemente  va a le scheda de 'Operationes' de ulle base de datos "
 "pro configurar lo illac."
 
-#: index.php:620
+#: index.php:621
 #, php-format
 msgid ""
 "Your PHP MySQL library version %s differs from your MySQL server version %s. "
@@ -950,7 +952,7 @@ msgstr ""
 "Tu biblioteca de PHP MySQL version %s differe ex tu version de vervitor "
 "MySQL %s. Isto poterea causar comportamentos imprevisibile."
 
-#: index.php:648
+#: index.php:649
 #, php-format
 msgid ""
 "Server running with Suhosin. Please refer to %sdocumentation%s for possible "
@@ -1103,8 +1105,8 @@ msgstr ""
 msgid "Save & Close"
 msgstr "Salveguarda & Claude"
 
-#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:404
-#: libraries/insert_edit.lib.php:1550 prefs_manage.php:361
+#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:415
+#: libraries/insert_edit.lib.php:1548 prefs_manage.php:361
 #: prefs_manage.php:372
 msgid "Reset"
 msgstr "Refixa"
@@ -1137,7 +1139,7 @@ msgstr "Adde indice"
 msgid "Edit Index"
 msgstr "Modifica indice"
 
-#: js/messages.php:99 templates/index_form.phtml:232
+#: js/messages.php:99 templates/table/index_form.phtml:232
 #, php-format
 msgid "Add %s column(s) to index"
 msgstr "Adde %s columna(s) al indice"
@@ -1158,13 +1160,14 @@ msgstr "Composite con:"
 msgid "Please select column(s) for the index."
 msgstr "Pro favor tu selige columna(s) pro le indice."
 
-#: js/messages.php:106 templates/structure/add_column.phtml:1
+#: js/messages.php:106 templates/table/structure/add_column.phtml:1
 msgid "You have to add at least one column."
 msgstr "Tu debe adder al minus un columna."
 
-#: js/messages.php:109 libraries/insert_edit.lib.php:1548
+#: js/messages.php:109 libraries/insert_edit.lib.php:1546
 #: templates/columns_definitions/column_definitions_form.phtml:162
-#: templates/index_form.phtml:237 templates/tbl_relation/common_form.phtml:106
+#: templates/table/index_form.phtml:237
+#: templates/table/relation/common_form.phtml:106
 msgid "Preview SQL"
 msgstr "Vista preliminar SQL"
 
@@ -1181,7 +1184,7 @@ msgid "SQL query:"
 msgstr "Query SQL:"
 
 #. l10n: Default label for the y-Axis of Charts
-#: js/messages.php:118 templates/tbl_chart.phtml:109
+#: js/messages.php:118 templates/table/chart/tbl_chart.phtml:109
 msgid "Y Values"
 msgstr "Valores pro le axis Y"
 
@@ -1337,7 +1340,7 @@ msgstr "Bytes inviate"
 msgid "Bytes received"
 msgstr "Buytes recipite"
 
-#: js/messages.php:169 libraries/server_status.lib.php:226
+#: js/messages.php:169 libraries/server_status.lib.php:235
 msgid "Connections"
 msgstr "Connexiones"
 
@@ -1394,12 +1397,12 @@ msgstr "%d tabella/s"
 msgid "Questions"
 msgstr "Demandas"
 
-#: js/messages.php:184 libraries/server_status.lib.php:134
+#: js/messages.php:184 libraries/server_status.lib.php:143
 msgid "Traffic"
 msgstr "Traffico"
 
 #: js/messages.php:185 libraries/Menu.class.php:586
-#: libraries/Util.class.php:4318 libraries/server_status_monitor.lib.php:257
+#: libraries/Util.class.php:4324 libraries/server_status_monitor.lib.php:257
 msgid "Settings"
 msgstr "Preferentias"
 
@@ -1419,8 +1422,9 @@ msgstr "Pro favor tu adde al minus un variabile al series!"
 #: libraries/server_status_monitor.lib.php:236
 #: libraries/server_status_processes.lib.php:308
 #: templates/columns_definitions/transformation.phtml:4
-#: templates/designer/options_panel.phtml:178
-#: templates/table/options_zoom.phtml:12 templates/table/rows_zoom.phtml:26
+#: templates/database/designer/options_panel.phtml:178
+#: templates/table/search/options_zoom.phtml:12
+#: templates/table/search/rows_zoom.phtml:26
 msgid "None"
 msgstr "Necun"
 
@@ -1715,8 +1719,8 @@ msgstr ""
 
 #: js/messages.php:270 libraries/Menu.class.php:352
 #: libraries/Menu.class.php:455 libraries/Menu.class.php:582
-#: libraries/Util.class.php:4317 libraries/Util.class.php:4332
-#: libraries/Util.class.php:4349 libraries/config/messages.inc.php:258
+#: libraries/Util.class.php:4323 libraries/Util.class.php:4338
+#: libraries/Util.class.php:4355 libraries/config/messages.inc.php:258
 #: libraries/display_import.lib.php:105
 #: libraries/server_status_monitor.lib.php:318 prefs_manage.php:238
 #: setup/frames/menu.inc.php:26
@@ -1776,13 +1780,13 @@ msgid "Formatting SQL..."
 msgstr "Formatante SQL..."
 
 #: js/messages.php:293 libraries/server_variables.lib.php:157
-#: templates/designer/aggregate_query_panel.phtml:63
-#: templates/designer/delete_relation_panel.phtml:28
-#: templates/designer/having_query_panel.phtml:117
-#: templates/designer/new_relation_panel.phtml:88
-#: templates/designer/options_panel.phtml:253
-#: templates/designer/rename_to_panel.phtml:45
-#: templates/designer/where_query_panel.phtml:83
+#: templates/database/designer/aggregate_query_panel.phtml:63
+#: templates/database/designer/delete_relation_panel.phtml:28
+#: templates/database/designer/having_query_panel.phtml:117
+#: templates/database/designer/new_relation_panel.phtml:88
+#: templates/database/designer/options_panel.phtml:253
+#: templates/database/designer/rename_to_panel.phtml:45
+#: templates/database/designer/where_query_panel.phtml:83
 msgid "Cancel"
 msgstr "Cancella"
 
@@ -1790,7 +1794,7 @@ msgstr "Cancella"
 msgid "Page-related settings"
 msgstr "Preferentias referite al pagina"
 
-#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:402
+#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:413
 msgid "Apply"
 msgstr "Applica"
 
@@ -1825,8 +1829,8 @@ msgstr "Codice de error: %s"
 msgid "Error text: %s"
 msgstr "Texto de error: %s"
 
-#: js/messages.php:307 libraries/db_common.inc.php:68
-#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:450
+#: js/messages.php:307 libraries/db_common.inc.php:69
+#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:461
 msgid "No databases selected."
 msgstr "Necun base de datos seligite."
 
@@ -1838,12 +1842,13 @@ msgstr "Depone columna"
 msgid "Adding Primary Key"
 msgstr "Adde clave primari"
 
-#: js/messages.php:310 templates/designer/aggregate_query_panel.phtml:59
-#: templates/designer/having_query_panel.phtml:113
-#: templates/designer/new_relation_panel.phtml:87
-#: templates/designer/options_panel.phtml:252
-#: templates/designer/rename_to_panel.phtml:41
-#: templates/designer/where_query_panel.phtml:82
+#: js/messages.php:310
+#: templates/database/designer/aggregate_query_panel.phtml:59
+#: templates/database/designer/having_query_panel.phtml:113
+#: templates/database/designer/new_relation_panel.phtml:87
+#: templates/database/designer/options_panel.phtml:252
+#: templates/database/designer/rename_to_panel.phtml:41
+#: templates/database/designer/where_query_panel.phtml:82
 msgid "OK"
 msgstr "OK"
 
@@ -1863,7 +1868,7 @@ msgstr "Copiante base de datos"
 msgid "Changing Charset"
 msgstr "Modificante insimul de characteres"
 
-#: js/messages.php:320 libraries/Util.class.php:3217
+#: js/messages.php:320 libraries/Util.class.php:3223
 msgid "Enable foreign key checks"
 msgstr "Habilita le verificationes sur le clave estranie"
 
@@ -1900,20 +1905,21 @@ msgstr ""
 #: js/messages.php:334 libraries/DisplayResults.class.php:4834
 #: libraries/DisplayResults.class.php:5092 libraries/Menu.class.php:344
 #: libraries/Menu.class.php:446 libraries/Menu.class.php:578
-#: libraries/Util.class.php:3636 libraries/Util.class.php:3637
-#: libraries/Util.class.php:4316 libraries/Util.class.php:4331
-#: libraries/Util.class.php:4348 libraries/config/messages.inc.php:252
+#: libraries/Util.class.php:3642 libraries/Util.class.php:3643
+#: libraries/Util.class.php:4322 libraries/Util.class.php:4337
+#: libraries/Util.class.php:4354 libraries/config/messages.inc.php:252
 #: libraries/display_export.lib.php:173 libraries/rte/rte_list.lib.php:146
 #: libraries/server_privileges.lib.php:2211
 #: libraries/server_privileges.lib.php:2290
 #: libraries/server_privileges.lib.php:2632
 #: libraries/server_privileges.lib.php:3356
 #: libraries/server_status_monitor.lib.php:322 prefs_manage.php:303
-#: setup/frames/menu.inc.php:27 templates/structure/check_all_tables.phtml:11
+#: setup/frames/menu.inc.php:27
+#: templates/database/structure/check_all_tables.phtml:11
 msgid "Export"
 msgstr "Exporta"
 
-#: js/messages.php:337 libraries/rte/rte_routines.lib.php:652
+#: js/messages.php:337 libraries/rte/rte_routines.lib.php:743
 msgid "ENUM/SET editor"
 msgstr "Editor de ENUM/SET"
 
@@ -1954,7 +1960,7 @@ msgstr "Monstra quadro de query"
 #: libraries/Console.class.php:214 libraries/DisplayResults.class.php:3474
 #: libraries/DisplayResults.class.php:4818 libraries/Index.class.php:723
 #: libraries/Util.class.php:706 libraries/Util.class.php:1202
-#: libraries/Util.class.php:3634 libraries/Util.class.php:3635
+#: libraries/Util.class.php:3640 libraries/Util.class.php:3641
 #: libraries/central_columns.lib.php:851
 #: libraries/central_columns.lib.php:1193
 #: libraries/config/messages.inc.php:892
@@ -1972,7 +1978,7 @@ msgstr "Modifica"
 #: libraries/server_user_groups.lib.php:129
 #: libraries/sql_query_form.lib.php:416 libraries/tracking.lib.php:477
 #: setup/frames/index.inc.php:183 setup/frames/index.inc.php:291
-#: templates/designer/delete_relation_panel.phtml:27
+#: templates/database/designer/delete_relation_panel.phtml:27
 msgid "Delete"
 msgstr "Dele"
 
@@ -2143,11 +2149,11 @@ msgid "No dependencies selected!"
 msgstr "Necun dependentias seligite!"
 
 #: js/messages.php:394 libraries/central_columns.lib.php:1214
-#: libraries/insert_edit.lib.php:1458 libraries/server_variables.lib.php:155
+#: libraries/insert_edit.lib.php:1456 libraries/server_variables.lib.php:155
 #: setup/frames/config.inc.php:42 setup/frames/index.inc.php:279
 #: templates/columns_definitions/column_definitions_form.phtml:165
-#: templates/gis_visualization/gis_visualization.phtml:48
-#: templates/tbl_relation/common_form.phtml:107
+#: templates/table/gis_visualization/gis_visualization.phtml:48
+#: templates/table/relation/common_form.phtml:107
 msgid "Save"
 msgstr "Salveguarda"
 
@@ -2229,8 +2235,8 @@ msgid "Data point content"
 msgstr "Contento del puncto de datos"
 
 #: js/messages.php:430 js/messages.php:562 js/messages.php:579
-#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2573
-#: templates/index_form.phtml:154 templates/index_form.phtml:194
+#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2571
+#: templates/table/index_form.phtml:154 templates/table/index_form.phtml:194
 msgid "Ignore"
 msgstr "Ignora"
 
@@ -2291,8 +2297,8 @@ msgstr "Selige clave estranie"
 msgid "Please select the primary key or a unique key!"
 msgstr "Pro favor selige le clave primari o un clave unic!"
 
-#: js/messages.php:457 templates/designer/side_menu.phtml:91
-#: templates/designer/side_menu.phtml:94
+#: js/messages.php:457 templates/database/designer/side_menu.phtml:91
+#: templates/database/designer/side_menu.phtml:94
 msgid "Choose column to display"
 msgstr "Selige columna de monstrar"
 
@@ -2308,18 +2314,18 @@ msgstr ""
 msgid "Page name"
 msgstr "Nomine de pagina"
 
-#: js/messages.php:463 templates/designer/side_menu.phtml:56
-#: templates/designer/side_menu.phtml:59
+#: js/messages.php:463 templates/database/designer/side_menu.phtml:56
+#: templates/database/designer/side_menu.phtml:59
 msgid "Save page"
 msgstr "Salveguarda pagina"
 
-#: js/messages.php:464 templates/designer/side_menu.phtml:63
-#: templates/designer/side_menu.phtml:66
+#: js/messages.php:464 templates/database/designer/side_menu.phtml:63
+#: templates/database/designer/side_menu.phtml:66
 msgid "Save page as"
 msgstr "Salveguarda pagina como"
 
-#: js/messages.php:465 templates/designer/side_menu.phtml:49
-#: templates/designer/side_menu.phtml:52
+#: js/messages.php:465 templates/database/designer/side_menu.phtml:49
+#: templates/database/designer/side_menu.phtml:52
 msgid "Open page"
 msgstr "Aperi pagina"
 
@@ -2327,7 +2333,7 @@ msgstr "Aperi pagina"
 msgid "Delete page"
 msgstr "Dele pagina"
 
-#: js/messages.php:467 templates/designer/side_menu.phtml:10
+#: js/messages.php:467 templates/database/designer/side_menu.phtml:10
 msgid "Untitled"
 msgstr "Untitled (Sin titulo)"
 
@@ -2452,7 +2458,7 @@ msgstr "Fortia original"
 msgid "cancel"
 msgstr "cancella"
 
-#: js/messages.php:499 libraries/server_status.lib.php:271
+#: js/messages.php:499 libraries/server_status.lib.php:280
 msgid "Aborted"
 msgstr "Abortate"
 
@@ -3030,7 +3036,7 @@ msgstr "Pro favor inserta un valide ingresso HEX"
 
 #: js/messages.php:793 libraries/Message.class.php:199
 #: libraries/Util.class.php:654 libraries/core.lib.php:245
-#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1172
+#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1170
 #: tbl_operations.php:229 view_operations.php:63
 msgid "Error"
 msgstr "Error"
@@ -3093,8 +3099,8 @@ msgstr "per secunda"
 msgid "per minute"
 msgstr "per minuta"
 
-#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:143
-#: libraries/server_status.lib.php:228
+#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:152
+#: libraries/server_status.lib.php:237
 #: libraries/server_status_queries.lib.php:98
 msgid "per hour"
 msgstr "per hora"
@@ -3114,7 +3120,7 @@ msgstr ""
 "Permissiones incorrecte sur le file de configuration, il non deberea esser "
 "scribibile per omnes!"
 
-#: libraries/Config.class.php:1799
+#: libraries/Config.class.php:1801
 msgid "Font size"
 msgstr "Grandor de font"
 
@@ -3142,10 +3148,10 @@ msgstr "Repite Query"
 #: libraries/server_privileges.lib.php:2890
 #: libraries/server_privileges.lib.php:3144
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4332
+#: libraries/server_privileges.lib.php:4358
 #: libraries/server_status_processes.lib.php:80
-#: templates/tbl_relation/foreign_key_row.phtml:165
-#: templates/tbl_relation/internal_relational_row.phtml:55
+#: templates/table/relation/foreign_key_row.phtml:165
+#: templates/table/relation/internal_relational_row.phtml:55
 msgid "Database"
 msgstr "Base de datos"
 
@@ -3238,11 +3244,11 @@ msgstr "Chronologia"
 #: libraries/plugins/import/ImportMediawiki.class.php:60
 #: libraries/plugins/import/ImportOds.class.php:59
 #: libraries/plugins/import/ImportShp.class.php:57
-#: libraries/plugins/import/ImportSql.class.php:148
+#: libraries/plugins/import/ImportSql.class.php:51
 #: libraries/plugins/import/ImportXml.class.php:58
-#: libraries/rte/rte_routines.lib.php:833 templates/index_form.phtml:49
-#: templates/structure/row_stats_table.phtml:20
-#: templates/table/options.phtml:2
+#: libraries/rte/rte_routines.lib.php:924 templates/table/index_form.phtml:49
+#: templates/table/search/options.phtml:2
+#: templates/table/structure/row_stats_table.phtml:20
 msgid "Options"
 msgstr "Optiones"
 
@@ -3275,7 +3281,8 @@ msgstr "descendente"
 msgid "Order:"
 msgstr "Ordine:"
 
-#: libraries/Console.class.php:289 templates/table/replace_preview.phtml:17
+#: libraries/Console.class.php:289
+#: templates/table/search/replace_preview.phtml:17
 msgid "Count"
 msgstr "Computo"
 
@@ -3372,9 +3379,9 @@ msgstr "Commuta a thema obscur"
 #: libraries/operations.lib.php:794 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:191
-#: templates/structure/sortable_header.phtml:21
-#: templates/structure/sortable_header.phtml:38
-#: templates/table/options.phtml:68
+#: templates/database/structure/sortable_header.phtml:21
+#: templates/database/structure/sortable_header.phtml:38
+#: templates/table/search/options.phtml:68
 msgid "Ascending"
 msgstr "Ascendente"
 
@@ -3384,13 +3391,14 @@ msgstr "Ascendente"
 #: libraries/operations.lib.php:797 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:188
-#: templates/structure/sortable_header.phtml:26
-#: templates/structure/sortable_header.phtml:43
-#: templates/table/options.phtml:69
+#: templates/database/structure/sortable_header.phtml:26
+#: templates/database/structure/sortable_header.phtml:43
+#: templates/table/search/options.phtml:69
 msgid "Descending"
 msgstr "Descendente"
 
-#: libraries/DBQbe.class.php:467 templates/table/search_and_replace.phtml:6
+#: libraries/DBQbe.class.php:467
+#: templates/table/search/search_and_replace.phtml:6
 msgid "Column:"
 msgstr "Columna:"
 
@@ -3551,12 +3559,12 @@ msgstr[0] "%1$s correspondentia in <strong>%2$s</strong>"
 msgstr[1] "%1$s correspondentias in <strong>%2$s</strong>"
 
 #: libraries/DbSearch.class.php:354 libraries/Menu.class.php:311
-#: libraries/Util.class.php:3337 libraries/Util.class.php:3347
-#: libraries/Util.class.php:3623 libraries/Util.class.php:3624
-#: libraries/Util.class.php:4343 libraries/config.values.php:43
+#: libraries/Util.class.php:3343 libraries/Util.class.php:3353
+#: libraries/Util.class.php:3629 libraries/Util.class.php:3630
+#: libraries/Util.class.php:4349 libraries/config.values.php:43
 #: libraries/config.values.php:51 libraries/config.values.php:119
 #: libraries/navigation/Nodes/Node_Table.class.php:295
-#: templates/structure/check_all_table_column.phtml:5
+#: templates/table/structure/check_all_table_column.phtml:5
 msgid "Browse"
 msgstr "Naviga"
 
@@ -3573,7 +3581,8 @@ msgstr "Cerca in le base de datos"
 msgid "Words or values to search for (wildcard: \"%\"):"
 msgstr "Parolas o valores de cercar (metacharacter: \"%\"):"
 
-#: libraries/DbSearch.class.php:401 templates/table/search_and_replace.phtml:1
+#: libraries/DbSearch.class.php:401
+#: templates/table/search/search_and_replace.phtml:1
 msgid "Find:"
 msgstr "Trova:"
 
@@ -3617,28 +3626,28 @@ msgstr "Filtra rangos"
 msgid "Search this table"
 msgstr "Cerca in iste tabella"
 
-#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2532
-#: libraries/Util.class.php:2535
+#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2538
+#: libraries/Util.class.php:2541
 msgctxt "First page"
 msgid "Begin"
 msgstr "Initio"
 
-#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2533
-#: libraries/Util.class.php:2536 libraries/server_bin_log.lib.php:170
+#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2539
+#: libraries/Util.class.php:2542 libraries/server_bin_log.lib.php:170
 #: libraries/server_bin_log.lib.php:172
 msgctxt "Previous page"
 msgid "Previous"
 msgstr "Previe"
 
-#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2564
-#: libraries/Util.class.php:2574 libraries/server_bin_log.lib.php:204
+#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2570
+#: libraries/Util.class.php:2580 libraries/server_bin_log.lib.php:204
 #: libraries/server_bin_log.lib.php:206
 msgctxt "Next page"
 msgid "Next"
 msgstr "Proxime"
 
-#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2565
-#: libraries/Util.class.php:2575
+#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2571
+#: libraries/Util.class.php:2581
 msgctxt "Last page"
 msgid "End"
 msgstr "Ultime"
@@ -3711,15 +3720,15 @@ msgid "May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]."
 msgstr "Il pote esser approximate. Vide[doc@faq3-11]FAQ 3.11[/doc]."
 
 #: libraries/DisplayResults.class.php:4332 libraries/Message.class.php:180
-#: libraries/controllers/TableRelationController.class.php:258
+#: libraries/controllers/TableRelationController.class.php:259
 #: libraries/controllers/TableSearchController.class.php:655
-#: libraries/rte/rte_routines.lib.php:1332 libraries/sql_query_form.lib.php:89
+#: libraries/rte/rte_routines.lib.php:1423 libraries/sql_query_form.lib.php:89
 #: tbl_operations.php:227 tbl_row_action.php:138 view_operations.php:62
 msgid "Your SQL query has been executed successfully."
 msgstr "Le demanda (query) SQL ha essite executate con successo."
 
 #: libraries/DisplayResults.class.php:4660
-#: libraries/controllers/StructureController.class.php:629
+#: libraries/controllers/DatabaseStructureController.class.php:564
 #, php-format
 msgid ""
 "This view has at least this number of rows. Please refer to %sdocumentation"
@@ -3743,33 +3752,33 @@ msgstr "%1$d total, %2$d in query"
 msgid "%d total"
 msgstr "%d total"
 
-#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1318
+#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1312
 #, php-format
 msgid "Query took %01.4f seconds."
 msgstr "Query prendeva %01.4f secundas."
 
 #: libraries/DisplayResults.class.php:4807
-#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4767
-#: libraries/Util.class.php:4773 libraries/mult_submits.inc.php:50
-#: templates/structure/check_all_tables.phtml:2
-#: templates/structure/check_all_tables.phtml:9
+#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4773
+#: libraries/Util.class.php:4779 libraries/mult_submits.inc.php:50
+#: templates/database/structure/check_all_tables.phtml:2
+#: templates/database/structure/check_all_tables.phtml:9
 msgid "With selected:"
 msgstr "Si seligite:"
 
 #: libraries/DisplayResults.class.php:4811
-#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4769
-#: libraries/Util.class.php:4770 libraries/server_privileges.lib.php:1174
+#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4775
+#: libraries/Util.class.php:4776 libraries/server_privileges.lib.php:1174
 #: libraries/server_privileges.lib.php:1175
 #: libraries/server_privileges.lib.php:1387
 #: libraries/server_user_groups.lib.php:231
-#: templates/structure/check_all_tables.phtml:3
-#: templates/structure/check_all_tables.phtml:4
+#: templates/database/structure/check_all_tables.phtml:3
+#: templates/database/structure/check_all_tables.phtml:4
 msgid "Check All"
 msgstr "Marca omnes"
 
 #: libraries/DisplayResults.class.php:4985 libraries/Header.class.php:383
-#: templates/structure/optional_action_links.phtml:1
-#: templates/structure/print_view_data_dictionary_link.phtml:3
+#: templates/database/structure/print_view_data_dictionary_link.phtml:3
+#: templates/table/structure/optional_action_links.phtml:1
 msgid "Print view"
 msgstr "Vista pro imprimer"
 
@@ -3777,7 +3786,8 @@ msgstr "Vista pro imprimer"
 msgid "Query results operations"
 msgstr "Operationes super exitos de query"
 
-#: libraries/DisplayResults.class.php:5105 templates/tbl_chart.phtml:12
+#: libraries/DisplayResults.class.php:5105
+#: templates/table/chart/tbl_chart.phtml:12
 msgid "Display chart"
 msgstr "Monstra graphico"
 
@@ -3870,7 +3880,7 @@ msgid "Click on the bar to scroll to top of page"
 msgstr "Pulsa sur le barra pro rolar al culmine del pagina"
 
 #: libraries/Header.class.php:749
-#: libraries/plugins/auth/AuthenticationCookie.class.php:152
+#: libraries/plugins/auth/AuthenticationCookie.class.php:140
 msgid "Javascript must be enabled past this point!"
 msgstr "Javascript debe esser habilitate passate iste puncto!"
 
@@ -3892,11 +3902,11 @@ msgid "Keyname"
 msgstr "Nomine clave"
 
 #: libraries/Index.class.php:697
-#: libraries/controllers/StructureController.class.php:1962
-#: libraries/controllers/StructureController.class.php:1967
+#: libraries/controllers/TableStructureController.class.php:953
+#: libraries/controllers/TableStructureController.class.php:958
 #: libraries/tracking.lib.php:973
 #: templates/columns_definitions/column_indexes.phtml:11
-#: templates/structure/check_all_table_column.phtml:26
+#: templates/table/structure/check_all_table_column.phtml:26
 msgid "Unique"
 msgstr "Unic"
 
@@ -3915,16 +3925,17 @@ msgstr "Cardinalitate"
 #: libraries/server_collations.lib.php:35 libraries/tracking.lib.php:881
 #: libraries/tracking.lib.php:977
 #: templates/columns_definitions/table_fields_definitions.phtml:33
-#: templates/structure/row_stats_table.phtml:31
-#: templates/structure/table_header.phtml:55
-#: templates/structure/table_structure_header.phtml:7
-#: templates/table/table_header.phtml:8
+#: templates/database/structure/table_header.phtml:55
+#: templates/table/search/table_header.phtml:8
+#: templates/table/structure/row_stats_table.phtml:31
+#: templates/table/structure/table_structure_header.phtml:7
 msgid "Collation"
 msgstr "Collation"
 
 #: libraries/Index.class.php:703 libraries/rte/rte_events.lib.php:496
-#: libraries/rte/rte_routines.lib.php:956 libraries/tracking.lib.php:885
-#: libraries/tracking.lib.php:979 templates/structure/table_header.phtml:84
+#: libraries/rte/rte_routines.lib.php:1047 libraries/tracking.lib.php:885
+#: libraries/tracking.lib.php:979
+#: templates/database/structure/table_header.phtml:84
 msgid "Comment"
 msgstr "Commento"
 
@@ -3937,15 +3948,15 @@ msgstr "Le clave primari ha essite delite."
 msgid "Index %s has been dropped."
 msgstr "Indice %s ha essite delite."
 
-#: libraries/Index.class.php:757 libraries/Util.class.php:3630
-#: libraries/Util.class.php:3631
-#: libraries/controllers/StructureController.class.php:1958
-#: libraries/controllers/StructureController.class.php:1959
+#: libraries/Index.class.php:757 libraries/Util.class.php:3636
+#: libraries/Util.class.php:3637
+#: libraries/controllers/TableStructureController.class.php:949
+#: libraries/controllers/TableStructureController.class.php:950
 #: libraries/operations.lib.php:1607 libraries/rte/rte_list.lib.php:150
 #: libraries/server_databases.lib.php:146
-#: templates/structure/check_all_table_column.phtml:15
-#: templates/structure/check_all_tables.phtml:16
-#: templates/tbl_relation/foreign_key_row.phtml:93
+#: templates/database/structure/check_all_tables.phtml:16
+#: templates/table/relation/foreign_key_row.phtml:93
+#: templates/table/structure/check_all_table_column.phtml:15
 msgid "Drop"
 msgstr "Lassa cader"
 
@@ -3976,16 +3987,16 @@ msgstr "Servitor"
 #: libraries/Menu.class.php:248
 #: libraries/navigation/Nodes/Node_View.class.php:32
 #: libraries/tbl_info.inc.php:63
-#: templates/structure/structure_table_row.phtml:97
-#: templates/structure/structure_table_row.phtml:159
+#: templates/database/structure/structure_table_row.phtml:97
+#: templates/database/structure/structure_table_row.phtml:159
 msgid "View"
 msgstr "Vista"
 
 #: libraries/Menu.class.php:325 libraries/Menu.class.php:429
-#: libraries/Menu.class.php:548 libraries/Util.class.php:3334
-#: libraries/Util.class.php:3344 libraries/Util.class.php:3350
-#: libraries/Util.class.php:4313 libraries/Util.class.php:4328
-#: libraries/Util.class.php:4345 libraries/config.values.php:40
+#: libraries/Menu.class.php:548 libraries/Util.class.php:3340
+#: libraries/Util.class.php:3350 libraries/Util.class.php:3356
+#: libraries/Util.class.php:4319 libraries/Util.class.php:4334
+#: libraries/Util.class.php:4351 libraries/config.values.php:40
 #: libraries/config.values.php:48 libraries/config.values.php:110
 #: libraries/config.values.php:116 libraries/config/messages.inc.php:321
 #: libraries/navigation/Nodes/Node_Table.class.php:292
@@ -3993,19 +4004,19 @@ msgid "SQL"
 msgstr "SQL"
 
 #: libraries/Menu.class.php:328 libraries/Menu.class.php:432
-#: libraries/Util.class.php:3335 libraries/Util.class.php:3345
-#: libraries/Util.class.php:3351 libraries/Util.class.php:3625
-#: libraries/Util.class.php:3626 libraries/Util.class.php:4329
-#: libraries/Util.class.php:4346 libraries/config.values.php:41
+#: libraries/Util.class.php:3341 libraries/Util.class.php:3351
+#: libraries/Util.class.php:3357 libraries/Util.class.php:3631
+#: libraries/Util.class.php:3632 libraries/Util.class.php:4335
+#: libraries/Util.class.php:4352 libraries/config.values.php:41
 #: libraries/config.values.php:49 libraries/config.values.php:111
 #: libraries/config.values.php:117
 #: libraries/navigation/Nodes/Node_Table.class.php:286
 msgid "Search"
 msgstr "Cerca"
 
-#: libraries/Menu.class.php:338 libraries/Util.class.php:3336
-#: libraries/Util.class.php:3346 libraries/Util.class.php:3627
-#: libraries/Util.class.php:3628 libraries/Util.class.php:4347
+#: libraries/Menu.class.php:338 libraries/Util.class.php:3342
+#: libraries/Util.class.php:3352 libraries/Util.class.php:3633
+#: libraries/Util.class.php:3634 libraries/Util.class.php:4353
 #: libraries/config.values.php:42 libraries/config.values.php:50
 #: libraries/config.values.php:118
 #: libraries/navigation/Nodes/Node_Table.class.php:289
@@ -4014,30 +4025,30 @@ msgid "Insert"
 msgstr "Inserta"
 
 #: libraries/Menu.class.php:362 libraries/Menu.class.php:467
-#: libraries/Util.class.php:4334 libraries/Util.class.php:4350
+#: libraries/Util.class.php:4340 libraries/Util.class.php:4356
 #: libraries/config.values.php:106 libraries/server_common.lib.php:51
 #: libraries/server_privileges.lib.php:2370
 #: libraries/server_privileges.lib.php:3158
-#: libraries/server_privileges.lib.php:4221
+#: libraries/server_privileges.lib.php:4247
 msgid "Privileges"
 msgstr "Permissiones"
 
 #: libraries/Menu.class.php:371 libraries/Menu.class.php:379
-#: libraries/Menu.class.php:459 libraries/Util.class.php:3338
-#: libraries/Util.class.php:3352 libraries/Util.class.php:4333
-#: libraries/Util.class.php:4351 libraries/config.values.php:112
+#: libraries/Menu.class.php:459 libraries/Util.class.php:3344
+#: libraries/Util.class.php:3358 libraries/Util.class.php:4339
+#: libraries/Util.class.php:4357 libraries/config.values.php:112
 #: view_operations.php:92
 msgid "Operations"
 msgstr "Operationes"
 
 #: libraries/Menu.class.php:384 libraries/Menu.class.php:492
-#: libraries/Util.class.php:4338 libraries/Util.class.php:4352
+#: libraries/Util.class.php:4344 libraries/Util.class.php:4358
 #: libraries/relation.lib.php:255
 msgid "Tracking"
 msgstr "Traciamento"
 
 #: libraries/Menu.class.php:397 libraries/Menu.class.php:486
-#: libraries/Util.class.php:4337 libraries/Util.class.php:4353
+#: libraries/Util.class.php:4343 libraries/Util.class.php:4359
 #: libraries/navigation/Nodes/Node_Trigger_Container.class.php:24
 #: libraries/plugins/export/ExportHtmlword.class.php:557
 #: libraries/plugins/export/ExportOdt.class.php:685
@@ -4054,16 +4065,16 @@ msgstr "Triggers"
 msgid "Database seems to be empty!"
 msgstr "Le base de datos sembla esser vacue!"
 
-#: libraries/Menu.class.php:439 libraries/Util.class.php:4330
+#: libraries/Menu.class.php:439 libraries/Util.class.php:4336
 msgid "Query"
 msgstr "Query"
 
-#: libraries/Menu.class.php:472 libraries/Util.class.php:4335
+#: libraries/Menu.class.php:472 libraries/Util.class.php:4341
 #: libraries/rte/rte_words.lib.php:36
 msgid "Routines"
 msgstr "Routines"
 
-#: libraries/Menu.class.php:479 libraries/Util.class.php:4336
+#: libraries/Menu.class.php:479 libraries/Util.class.php:4342
 #: libraries/navigation/Nodes/Node_Event_Container.class.php:26
 #: libraries/plugins/export/ExportSql.class.php:940
 #: libraries/plugins/export/ExportXml.class.php:107
@@ -4071,20 +4082,20 @@ msgstr "Routines"
 msgid "Events"
 msgstr "Eventos"
 
-#: libraries/Menu.class.php:498 libraries/Util.class.php:4339
+#: libraries/Menu.class.php:498 libraries/Util.class.php:4345
 msgid "Designer"
 msgstr "Designator"
 
-#: libraries/Menu.class.php:507 libraries/Util.class.php:4340
-#: templates/structure/check_all_tables.phtml:35
+#: libraries/Menu.class.php:507 libraries/Util.class.php:4346
+#: templates/database/structure/check_all_tables.phtml:35
 msgid "Central columns"
 msgstr "Columnas central"
 
-#: libraries/Menu.class.php:544 libraries/Util.class.php:4312
+#: libraries/Menu.class.php:544 libraries/Util.class.php:4318
 #: libraries/config.values.php:103 libraries/config/messages.inc.php:266
 #: libraries/config/messages.inc.php:341
 #: libraries/navigation/NavigationTree.class.php:1239
-#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4332
+#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4358
 msgid "Databases"
 msgstr "Base de datos"
 
@@ -4093,34 +4104,34 @@ msgid "User accounts"
 msgstr "Contos de usator"
 
 #: libraries/Menu.class.php:595 libraries/ServerStatusData.class.php:121
-#: libraries/Util.class.php:4319 libraries/server_common.lib.php:36
+#: libraries/Util.class.php:4325 libraries/server_common.lib.php:36
 msgid "Binary log"
 msgstr "Registro binari"
 
 #: libraries/Menu.class.php:601 libraries/ServerStatusData.class.php:126
-#: libraries/Util.class.php:4320 libraries/server_common.lib.php:42
-#: templates/structure/body_for_table_summary.phtml:10
-#: templates/structure/table_header.phtml:27
+#: libraries/Util.class.php:4326 libraries/server_common.lib.php:42
+#: templates/database/structure/body_for_table_summary.phtml:10
+#: templates/database/structure/table_header.phtml:27
 msgid "Replication"
 msgstr "Replication"
 
 #: libraries/Menu.class.php:606 libraries/ServerStatusData.class.php:193
-#: libraries/Util.class.php:4321 libraries/config.values.php:105
+#: libraries/Util.class.php:4327 libraries/config.values.php:105
 #: libraries/server_engines.lib.php:108 libraries/server_engines.lib.php:112
 #: libraries/sql_query_form.lib.php:421
 msgid "Variables"
 msgstr "Variabiles"
 
-#: libraries/Menu.class.php:610 libraries/Util.class.php:4322
+#: libraries/Menu.class.php:610 libraries/Util.class.php:4328
 msgid "Charsets"
 msgstr "Insimul de characteres"
 
-#: libraries/Menu.class.php:615 libraries/Util.class.php:4323
+#: libraries/Menu.class.php:615 libraries/Util.class.php:4329
 #: libraries/server_common.lib.php:33 libraries/server_plugins.lib.php:27
 msgid "Plugins"
 msgstr "Plugins"
 
-#: libraries/Menu.class.php:626 libraries/Util.class.php:4324
+#: libraries/Menu.class.php:626 libraries/Util.class.php:4330
 msgid "Engines"
 msgstr "Motores"
 
@@ -4145,7 +4156,7 @@ msgid_plural "%1$d rows inserted."
 msgstr[0] "%1$d rango insertate."
 msgstr[1] "%1$d rangos insertate."
 
-#: libraries/PDF.class.php:70 libraries/Util.class.php:2521
+#: libraries/PDF.class.php:70 libraries/Util.class.php:2527
 #: libraries/browse_foreigners.lib.php:327
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:865
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:890
@@ -4166,7 +4177,7 @@ msgid "Could not save favorite table!"
 msgstr "Il non pote salveguardar le tabella favorite!"
 
 #: libraries/RecentFavoriteTable.class.php:212
-#: templates/structure/favorite_anchor.phtml:12
+#: templates/database/structure/favorite_anchor.phtml:12
 msgid "Remove from Favorites"
 msgstr "Remove ex favoritos"
 
@@ -4334,7 +4345,7 @@ msgstr ""
 "immagazinage."
 
 #: libraries/StorageEngine.class.php:373
-#: templates/structure/body_for_table_summary.phtml:50
+#: templates/database/structure/body_for_table_summary.phtml:50
 #, php-format
 msgid "%s is the default storage engine on this MySQL server."
 msgstr "%s es le motor predefinite de immagazinage sur iste servitor MySQL."
@@ -4821,10 +4832,10 @@ msgstr "%d errores esseva trovate durante le analysis."
 
 #: libraries/Util.class.php:726 libraries/rte/rte_events.lib.php:110
 #: libraries/rte/rte_events.lib.php:119 libraries/rte/rte_events.lib.php:150
-#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:153
-#: libraries/rte/rte_routines.lib.php:162
-#: libraries/rte/rte_routines.lib.php:235
-#: libraries/rte/rte_routines.lib.php:1366
+#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:223
+#: libraries/rte/rte_routines.lib.php:250
+#: libraries/rte/rte_routines.lib.php:372
+#: libraries/rte/rte_routines.lib.php:1457
 #: libraries/rte/rte_triggers.lib.php:86 libraries/rte/rte_triggers.lib.php:95
 #: libraries/rte/rte_triggers.lib.php:127
 msgid "MySQL said: "
@@ -4868,78 +4879,81 @@ msgstr "Dom"
 msgid "%B %d, %Y at %I:%M %p"
 msgstr "%B %d, %Y a %I:%M %p"
 
-#: libraries/Util.class.php:2019
+#: libraries/Util.class.php:2025
 #, php-format
 msgid "%s days, %s hours, %s minutes and %s seconds"
 msgstr "%s dies, %s horas, %s minutas e %s secundas"
 
-#: libraries/Util.class.php:2112
+#: libraries/Util.class.php:2118
 msgid "Missing parameter:"
 msgstr "Parametro mancante:"
 
-#: libraries/Util.class.php:2645
+#: libraries/Util.class.php:2651
 #, php-format
 msgid "Jump to database \"%s\"."
 msgstr "Salta al base de datos \"%s\"."
 
-#: libraries/Util.class.php:2670
+#: libraries/Util.class.php:2676
 #, php-format
 msgid "The %s functionality is affected by a known bug, see %s"
 msgstr ""
 "Le functionalitate %s es influentiate per un error cognoscite, tu vide %s"
 
-#: libraries/Util.class.php:2881
+#: libraries/Util.class.php:2887
 msgid "Click to toggle"
 msgstr "Pulsa pro alternar"
 
-#: libraries/Util.class.php:3542 prefs_manage.php:248
+#: libraries/Util.class.php:3548 prefs_manage.php:248
 msgid "Browse your computer:"
 msgstr "Cerca in tu computator:"
 
-#: libraries/Util.class.php:3567
+#: libraries/Util.class.php:3573
 #, php-format
 msgid "Select from the web server upload directory <b>%s</b>:"
 msgstr "Selige ex le directorio de incargamento de servitor web <b>%s</b>:"
 
-#: libraries/Util.class.php:3596 libraries/insert_edit.lib.php:1173
+#: libraries/Util.class.php:3602 libraries/insert_edit.lib.php:1171
 msgid "The directory you set for upload work cannot be reached."
 msgstr ""
 "Le directorio que tu fixava pro le travalio de incargar non pote esser "
 "attingite."
 
-#: libraries/Util.class.php:3607
+#: libraries/Util.class.php:3613
 msgid "There are no files to upload!"
 msgstr "Il non ha alcun file  de incargar!"
 
-#: libraries/Util.class.php:3632 libraries/Util.class.php:3633
-#: templates/structure/check_all_tables.phtml:15
+#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: templates/database/structure/check_all_tables.phtml:15
 msgid "Empty"
 msgstr "Vacua"
 
-#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: libraries/Util.class.php:3644 libraries/Util.class.php:3645
 msgid "Execute"
 msgstr "Executa"
 
-#: libraries/Util.class.php:4152
+#: libraries/Util.class.php:4158
 msgid "Print"
 msgstr "Imprime"
 
-#: libraries/Util.class.php:4257 templates/structure/row_stats_table.phtml:80
-#: templates/structure/table_header.phtml:95
+#: libraries/Util.class.php:4263
+#: templates/database/structure/table_header.phtml:95
+#: templates/table/structure/row_stats_table.phtml:80
 msgid "Creation"
 msgstr "Creation"
 
-#: libraries/Util.class.php:4263 templates/structure/row_stats_table.phtml:87
-#: templates/structure/table_header.phtml:106
+#: libraries/Util.class.php:4269
+#: templates/database/structure/table_header.phtml:106
+#: templates/table/structure/row_stats_table.phtml:87
 msgid "Last update"
 msgstr "Ultime actualisation"
 
-#: libraries/Util.class.php:4269 templates/structure/row_stats_table.phtml:94
-#: templates/structure/table_header.phtml:117
+#: libraries/Util.class.php:4275
+#: templates/database/structure/table_header.phtml:117
+#: templates/table/structure/row_stats_table.phtml:94
 msgid "Last check"
 msgstr "Ultime controlo"
 
-#: libraries/Util.class.php:4315
+#: libraries/Util.class.php:4321
 msgid "Users"
 msgstr "Usatores"
 
@@ -4960,16 +4974,16 @@ msgid "Use this value"
 msgstr "Usa iste valor"
 
 #: libraries/build_html_for_db.lib.php:33 libraries/import.lib.php:193
-#: templates/structure/actions_in_table_structure.phtml:113
-#: templates/structure/row_stats_table.phtml:42
-#: templates/structure/table_header.phtml:36
+#: templates/database/structure/table_header.phtml:36
+#: templates/table/structure/actions_in_table_structure.phtml:113
+#: templates/table/structure/row_stats_table.phtml:42
 msgid "Rows"
 msgstr "Rangos"
 
 #: libraries/build_html_for_db.lib.php:48 libraries/engines/innodb.lib.php:171
-#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:186
-#: libraries/server_status.lib.php:298
-#: templates/structure/display_table_stats.phtml:40
+#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:195
+#: libraries/server_status.lib.php:307
+#: templates/table/structure/display_table_stats.phtml:40
 msgid "Total"
 msgstr "Total"
 
@@ -4978,10 +4992,12 @@ msgid "Jump to database"
 msgstr "Va al base da datos"
 
 #: libraries/build_html_for_db.lib.php:146
+#: templates/database/structure/structure_table_row.phtml:15
 msgid "Not replicated"
 msgstr "Non replicate"
 
 #: libraries/build_html_for_db.lib.php:158
+#: templates/database/structure/structure_table_row.phtml:16
 msgid "Replicated"
 msgstr "Replicate"
 
@@ -5038,17 +5054,17 @@ msgstr "NO"
 #: libraries/plugins/export/ExportTexytext.class.php:425
 #: libraries/plugins/export/PMA_ExportPdf.class.php:307
 #: libraries/rte/rte_list.lib.php:73 libraries/rte/rte_list.lib.php:85
-#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:830
-#: libraries/rte/rte_routines.lib.php:1492 setup/frames/index.inc.php:162
+#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:921
+#: libraries/rte/rte_routines.lib.php:1583 setup/frames/index.inc.php:162
 #: templates/columns_definitions/table_fields_definitions.phtml:8
-#: templates/structure/table_structure_header.phtml:5
-#: templates/table/create_table.phtml:11
+#: templates/database/create_table.phtml:11
+#: templates/table/structure/table_structure_header.phtml:5
 msgid "Name"
 msgstr "Nomine"
 
 #: libraries/central_columns.lib.php:699
 #: libraries/central_columns.lib.php:1381
-#: libraries/rte/rte_routines.lib.php:832
+#: libraries/rte/rte_routines.lib.php:923
 #: templates/columns_definitions/table_fields_definitions.phtml:14
 msgid "Length/Values"
 msgstr "Longitudine/Valores"
@@ -5067,7 +5083,7 @@ msgid "Select a table"
 msgstr "Selige un tabella"
 
 #: libraries/central_columns.lib.php:804
-#: templates/structure/add_column.phtml:4
+#: templates/table/structure/add_column.phtml:4
 msgid "Add column"
 msgstr "Adde columna"
 
@@ -5083,7 +5099,7 @@ msgstr "Adde nove columna"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1002
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1025
 #: templates/columns_definitions/table_fields_definitions.phtml:36
-#: templates/structure/table_structure_header.phtml:8
+#: templates/table/structure/table_structure_header.phtml:8
 msgid "Attributes"
 msgstr "Attributos"
 
@@ -5202,7 +5218,7 @@ msgid "Double click"
 msgstr "Duple pulsa"
 
 #: libraries/config.values.php:95 libraries/config.values.php:124
-#: libraries/config/FormDisplay.tpl.php:221 libraries/relation.lib.php:97
+#: libraries/config/FormDisplay.tpl.php:232 libraries/relation.lib.php:97
 #: libraries/relation.lib.php:105
 msgid "Disabled"
 msgstr "Dishabilita"
@@ -5376,23 +5392,23 @@ msgstr ""
 msgid "maximum %s"
 msgstr "maxime %s"
 
-#: libraries/config/FormDisplay.tpl.php:219
+#: libraries/config/FormDisplay.tpl.php:230
 msgid "This setting is disabled, it will not be applied to your configuration."
 msgstr ""
 "Iste preferentia es dishabilitate, illo non essera applicate a tu "
 "configuration."
 
-#: libraries/config/FormDisplay.tpl.php:313
+#: libraries/config/FormDisplay.tpl.php:324
 #, php-format
 msgid "Set value: %s"
 msgstr "Fixa valor: %s"
 
-#: libraries/config/FormDisplay.tpl.php:318
+#: libraries/config/FormDisplay.tpl.php:329
 #: libraries/config/messages.inc.php:610
 msgid "Restore default value"
 msgstr "Restabili valor predefinite"
 
-#: libraries/config/FormDisplay.tpl.php:332
+#: libraries/config/FormDisplay.tpl.php:343
 msgid "Allow users to customize this value"
 msgstr "Permitte a usatores personalisar iste valor"
 
@@ -5897,7 +5913,7 @@ msgstr "Insimul de characteres del file"
 
 #: libraries/config/messages.inc.php:136 libraries/config/messages.inc.php:152
 #: libraries/sql_query_form.lib.php:247
-#: templates/structure/row_stats_table.phtml:7
+#: templates/table/structure/row_stats_table.phtml:7
 msgid "Format"
 msgstr "Formato"
 
@@ -6411,7 +6427,7 @@ msgstr ""
 
 #: libraries/config/messages.inc.php:332
 #: libraries/plugins/export/ExportPdf.class.php:279
-#: templates/structure/secondary_tabs.phtml:8
+#: templates/table/secondary_tabs.phtml:8
 msgid "Table structure"
 msgstr "Structura de tabella"
 
@@ -8116,101 +8132,33 @@ msgstr "Microsoft Word 2000"
 msgid "OpenDocument Text"
 msgstr "Texto OpenDocument"
 
-#: libraries/controllers/StructureController.class.php:465
+#: libraries/controllers/DatabaseStructureController.class.php:405
 #: tbl_operations.php:382
 #, php-format
 msgid "Table %s has been emptied."
 msgstr ""
 
-#: libraries/controllers/StructureController.class.php:486
+#: libraries/controllers/DatabaseStructureController.class.php:426
 #: tbl_operations.php:400 view_operations.php:119
 #, php-format
 msgid "View %s has been dropped."
 msgstr "Vista %s ha essite delite."
 
-#: libraries/controllers/StructureController.class.php:487
+#: libraries/controllers/DatabaseStructureController.class.php:427
 #: tbl_operations.php:401
 #, php-format
 msgid "Table %s has been dropped."
 msgstr "Tabella %s ha essite delite."
 
-#: libraries/controllers/StructureController.class.php:797
-#, php-format
-msgid "The name '%s' is a MySQL reserved keyword."
-msgid_plural "The names '%s' are MySQL reserved keywords."
-msgstr[0] ""
-msgstr[1] ""
-
-#: libraries/controllers/StructureController.class.php:875
-msgid "No column selected."
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1049
+#: libraries/controllers/DatabaseStructureController.class.php:733
 msgid "Favorite List is full!"
 msgstr "Lista de favoritos es complete!"
 
-#: libraries/controllers/StructureController.class.php:1272
-msgid "The columns have been moved successfully."
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1535
-#, php-format
-msgid ""
-"Table %1$s has been altered successfully. Privileges have been adjusted."
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1541
-#: libraries/controllers/TableIndexesController.class.php:161
-#: tbl_addfield.php:92
-#, php-format
-msgid "Table %1$s has been altered successfully."
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1588
-#: libraries/tracking.lib.php:1094
-msgid "Query error"
-msgstr "Error de query"
-
-#: libraries/controllers/StructureController.class.php:1806
+#: libraries/controllers/DatabaseStructureController.class.php:947
 #: libraries/mysql_charsets.lib.php:366 libraries/mysql_charsets.lib.php:373
 msgid "unknown"
 msgstr "incognite"
 
-#: libraries/controllers/StructureController.class.php:1957
-#: templates/structure/check_all_table_column.phtml:11
-msgid "Change"
-msgstr "Modifica"
-
-#: libraries/controllers/StructureController.class.php:1961
-#: libraries/controllers/StructureController.class.php:1966
-#: libraries/navigation/Nodes/Node_Index.class.php:30
-#: libraries/tracking.lib.php:926
-#: templates/columns_definitions/column_indexes.phtml:16
-#: templates/columns_definitions/table_fields_definitions.phtml:57
-#: templates/structure/check_all_table_column.phtml:30
-#: templates/structure/display_structure.phtml:79
-#: templates/structure/display_table_stats.phtml:19
-msgid "Index"
-msgstr "Indice"
-
-#: libraries/controllers/StructureController.class.php:1963
-#: libraries/controllers/StructureController.class.php:1968
-#: templates/columns_definitions/column_indexes.phtml:27
-#: templates/structure/check_all_table_column.phtml:37
-msgid "Spatial"
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1964
-#: libraries/controllers/StructureController.class.php:1969
-#: templates/columns_definitions/column_indexes.phtml:22
-#: templates/structure/check_all_table_column.phtml:47
-msgid "Fulltext"
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1970
-msgid "Distinct values"
-msgstr "Valores distincte"
-
 #: libraries/controllers/TableChartController.class.php:82
 #: libraries/controllers/TableGisVisualizationController.class.php:101
 msgid "No SQL query was set to fetch data."
@@ -8224,11 +8172,18 @@ msgstr ""
 msgid "No data to display"
 msgstr "Necun dato de monstrar"
 
-#: libraries/controllers/TableRelationController.class.php:217
+#: libraries/controllers/TableIndexesController.class.php:161
+#: libraries/controllers/TableStructureController.class.php:736
+#: tbl_addfield.php:92
+#, php-format
+msgid "Table %1$s has been altered successfully."
+msgstr ""
+
+#: libraries/controllers/TableRelationController.class.php:218
 msgid "Display column was successfully updated."
 msgstr ""
 
-#: libraries/controllers/TableRelationController.class.php:283
+#: libraries/controllers/TableRelationController.class.php:288
 msgid "Internal relations were successfully updated."
 msgstr "Relationes interne ha essite actualisate on successo."
 
@@ -8241,10 +8196,71 @@ msgid "Zoom search"
 msgstr "Cerca de zoom"
 
 #: libraries/controllers/TableSearchController.class.php:852
-#: templates/table/selection_form.phtml:59
+#: templates/table/search/selection_form.phtml:59
 msgid "Find and replace"
 msgstr "Trova e reimplacia"
 
+#: libraries/controllers/TableStructureController.class.php:163
+#, php-format
+msgid "The name '%s' is a MySQL reserved keyword."
+msgid_plural "The names '%s' are MySQL reserved keywords."
+msgstr[0] ""
+msgstr[1] ""
+
+#: libraries/controllers/TableStructureController.class.php:241
+msgid "No column selected."
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:467
+msgid "The columns have been moved successfully."
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:730
+#, php-format
+msgid ""
+"Table %1$s has been altered successfully. Privileges have been adjusted."
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:783
+#: libraries/tracking.lib.php:1094
+msgid "Query error"
+msgstr "Error de query"
+
+#: libraries/controllers/TableStructureController.class.php:948
+#: templates/table/structure/check_all_table_column.phtml:11
+msgid "Change"
+msgstr "Modifica"
+
+#: libraries/controllers/TableStructureController.class.php:952
+#: libraries/controllers/TableStructureController.class.php:957
+#: libraries/navigation/Nodes/Node_Index.class.php:30
+#: libraries/tracking.lib.php:926
+#: templates/columns_definitions/column_indexes.phtml:16
+#: templates/columns_definitions/table_fields_definitions.phtml:57
+#: templates/table/structure/check_all_table_column.phtml:30
+#: templates/table/structure/display_structure.phtml:79
+#: templates/table/structure/display_table_stats.phtml:19
+msgid "Index"
+msgstr "Indice"
+
+#: libraries/controllers/TableStructureController.class.php:954
+#: libraries/controllers/TableStructureController.class.php:959
+#: templates/columns_definitions/column_indexes.phtml:27
+#: templates/table/structure/check_all_table_column.phtml:37
+msgid "Spatial"
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:955
+#: libraries/controllers/TableStructureController.class.php:960
+#: templates/columns_definitions/column_indexes.phtml:22
+#: templates/table/structure/check_all_table_column.phtml:47
+msgid "Fulltext"
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:963
+msgid "Distinct values"
+msgstr "Valores distincte"
+
 #: libraries/core.lib.php:306
 #, php-format
 msgid "The %s extension is missing. Please check your PHP configuration."
@@ -8294,7 +8310,7 @@ msgid "No Password"
 msgstr "Necun contrasigno"
 
 #: libraries/display_change_password.lib.php:68
-#: libraries/plugins/auth/AuthenticationCookie.class.php:199
+#: libraries/plugins/auth/AuthenticationCookie.class.php:187
 #: libraries/replication_gui.lib.php:422 libraries/replication_gui.lib.php:862
 #: libraries/server_privileges.lib.php:1640
 msgid "Password:"
@@ -9087,12 +9103,12 @@ msgid "Dump has been saved to file %s."
 msgstr "Le discargamento (dump) ha essite salveguardate in file %s."
 
 #: libraries/import.lib.php:202 libraries/insert_edit.lib.php:124
-#: libraries/rte/rte_routines.lib.php:1353 libraries/sql.lib.php:1312
+#: libraries/rte/rte_routines.lib.php:1444 libraries/sql.lib.php:1306
 #: tbl_get_field.php:44
 msgid "MySQL returned an empty result set (i.e. zero rows)."
 msgstr "MySQL retornava un insimul de exito vacue (i.e. zero rangos)."
 
-#: libraries/import.lib.php:265 libraries/sql.lib.php:1326
+#: libraries/import.lib.php:265 libraries/sql.lib.php:1320
 msgid "[ROLLBACK occurred.]"
 msgstr "[ROLLBACK occurreva.]"
 
@@ -9160,14 +9176,14 @@ msgstr "Crea un indice sur &nbsp;%s&nbsp;columnas"
 
 #: libraries/insert_edit.lib.php:233
 #: libraries/navigation/Nodes/Node_DatabaseChild.class.php:48
-#: templates/designer/table_list.phtml:40
+#: templates/database/designer/table_list.phtml:40
 msgid "Hide"
 msgstr "Cela"
 
 #: libraries/insert_edit.lib.php:249
 #: libraries/navigation/Nodes/Node_Function.class.php:32
-#: libraries/rte/rte_routines.lib.php:1495
-#: templates/table/table_header.phtml:4
+#: libraries/rte/rte_routines.lib.php:1586
+#: templates/table/search/table_header.phtml:4
 msgid "Function"
 msgstr "Function"
 
@@ -9180,84 +9196,85 @@ msgstr "Binari"
 msgid "Because of its length,<br /> this column might not be editable."
 msgstr "Per su longitudine,<br /> iste columna poterea non esser modificabile."
 
-#: libraries/insert_edit.lib.php:1050
+#: libraries/insert_edit.lib.php:1048
 msgid "Binary - do not edit"
 msgstr "Dato binari - non modifica"
 
-#: libraries/insert_edit.lib.php:1176 libraries/server_privileges.lib.php:470
-#: templates/table/options.phtml:36
+#: libraries/insert_edit.lib.php:1174 libraries/server_privileges.lib.php:470
+#: templates/table/search/options.phtml:36
 msgid "Or"
 msgstr "O"
 
-#: libraries/insert_edit.lib.php:1177
+#: libraries/insert_edit.lib.php:1175
 msgid "web server upload directory:"
 msgstr "directorio de incargamento de servitor web:"
 
-#: libraries/insert_edit.lib.php:1348 templates/table/input_box.phtml:49
+#: libraries/insert_edit.lib.php:1346
+#: templates/table/search/input_box.phtml:49
 msgid "Edit/Insert"
 msgstr "Modifica/Inserta"
 
-#: libraries/insert_edit.lib.php:1398
+#: libraries/insert_edit.lib.php:1396
 #, php-format
 msgid "Continue insertion with %s rows"
 msgstr "Continua insertion con %s rangos"
 
-#: libraries/insert_edit.lib.php:1428
+#: libraries/insert_edit.lib.php:1426
 msgid "and then"
 msgstr "e alora"
 
-#: libraries/insert_edit.lib.php:1461
+#: libraries/insert_edit.lib.php:1459
 msgid "Insert as new row"
 msgstr "inserta como nove rango"
 
-#: libraries/insert_edit.lib.php:1464
+#: libraries/insert_edit.lib.php:1462
 msgid "Insert as new row and ignore errors"
 msgstr "Inserta como nove rango e ignora errores"
 
-#: libraries/insert_edit.lib.php:1467
+#: libraries/insert_edit.lib.php:1465
 msgid "Show insert query"
 msgstr "Monstra query de insertar"
 
-#: libraries/insert_edit.lib.php:1487
+#: libraries/insert_edit.lib.php:1485
 msgid "Go back to previous page"
 msgstr "Vade a previe pagina"
 
-#: libraries/insert_edit.lib.php:1490
+#: libraries/insert_edit.lib.php:1488
 msgid "Insert another new row"
 msgstr "Inserta un altere nove rango"
 
-#: libraries/insert_edit.lib.php:1495
+#: libraries/insert_edit.lib.php:1493
 msgid "Go back to this page"
 msgstr "Vade retro a iste pagina"
 
-#: libraries/insert_edit.lib.php:1518
+#: libraries/insert_edit.lib.php:1516
 msgid "Edit next row"
 msgstr "Modifica nove rango"
 
-#: libraries/insert_edit.lib.php:1540
+#: libraries/insert_edit.lib.php:1538
 msgid ""
 "Use TAB key to move from value to value, or CTRL+arrows to move anywhere"
 msgstr ""
 "Usa le clave TAB pro mover de valor a valor, o CTRL+flechas pro mover lo "
 "ubique"
 
-#: libraries/insert_edit.lib.php:1577 libraries/replication_gui.lib.php:542
-#: libraries/rte/rte_routines.lib.php:1497
+#: libraries/insert_edit.lib.php:1575 libraries/replication_gui.lib.php:542
+#: libraries/rte/rte_routines.lib.php:1588
 #: libraries/server_status_variables.lib.php:220
-#: templates/designer/having_query_panel.phtml:100
-#: templates/designer/options_panel.phtml:73
-#: templates/designer/options_panel.phtml:239
-#: templates/designer/where_query_panel.phtml:69
-#: templates/table/table_header.phtml:10
-#: templates/table/zoom_result_form.phtml:35
+#: templates/database/designer/having_query_panel.phtml:100
+#: templates/database/designer/options_panel.phtml:73
+#: templates/database/designer/options_panel.phtml:239
+#: templates/database/designer/where_query_panel.phtml:69
+#: templates/table/search/table_header.phtml:10
+#: templates/table/search/zoom_result_form.phtml:35
 msgid "Value"
 msgstr "Valor"
 
-#: libraries/insert_edit.lib.php:1937 libraries/sql.lib.php:1309
+#: libraries/insert_edit.lib.php:1935 libraries/sql.lib.php:1303
 msgid "Showing SQL query"
 msgstr "Monstrante query de SQL"
 
-#: libraries/insert_edit.lib.php:1962 libraries/sql.lib.php:1287
+#: libraries/insert_edit.lib.php:1960 libraries/sql.lib.php:1281
 #, php-format
 msgid "Inserted row id: %1$d"
 msgstr "Insertate id de rango: %1$d"
@@ -9671,7 +9688,7 @@ msgstr "Nove"
 #: libraries/navigation/Nodes/Node_View_Container.class.php:26
 #: libraries/navigation/Nodes/Node_View_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:129
-#: templates/structure/show_create.phtml:30
+#: templates/database/structure/show_create.phtml:30
 msgid "Views"
 msgstr "Vistas"
 
@@ -9998,7 +10015,7 @@ msgstr ""
 
 #: libraries/operations.lib.php:101 libraries/operations.lib.php:249
 #: libraries/operations.lib.php:869 libraries/operations.lib.php:963
-#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:907
+#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:998
 #: templates/columns_definitions/table_fields_definitions.phtml:47
 msgid "Adjust Privileges"
 msgstr "Adapta Permissiones"
@@ -10088,22 +10105,22 @@ msgid "Switch to copied table"
 msgstr "Commuta a tabella copiate"
 
 #: libraries/operations.lib.php:1360
-#: templates/structure/check_all_tables.phtml:18
+#: templates/database/structure/check_all_tables.phtml:18
 msgid "Table maintenance"
 msgstr "Mentenimento de tabella"
 
 #: libraries/operations.lib.php:1398
-#: templates/structure/check_all_tables.phtml:19
+#: templates/database/structure/check_all_tables.phtml:19
 msgid "Analyze table"
 msgstr "Analysa tabella"
 
 #: libraries/operations.lib.php:1413
-#: templates/structure/check_all_tables.phtml:20
+#: templates/database/structure/check_all_tables.phtml:20
 msgid "Check table"
 msgstr "Verifica tabella"
 
 #: libraries/operations.lib.php:1428
-#: templates/structure/check_all_tables.phtml:22
+#: templates/database/structure/check_all_tables.phtml:22
 msgid "Checksum table"
 msgstr "Tabella de checksum"
 
@@ -10121,18 +10138,19 @@ msgid "Flush the table (FLUSH)"
 msgstr ""
 
 #: libraries/operations.lib.php:1477
-#: templates/structure/check_all_tables.phtml:23
-#: templates/structure/display_table_stats.phtml:56
+#: templates/database/structure/check_all_tables.phtml:23
+#: templates/table/structure/display_table_stats.phtml:56
 msgid "Optimize table"
 msgstr "Optimiza tabella"
 
 #: libraries/operations.lib.php:1492
-#: templates/structure/check_all_tables.phtml:24
+#: templates/database/structure/check_all_tables.phtml:24
 msgid "Repair table"
 msgstr ""
 
 #: libraries/operations.lib.php:1538
-#: templates/structure/check_all_tables.phtml:14 view_operations.php:127
+#: templates/database/structure/check_all_tables.phtml:14
+#: view_operations.php:127
 msgid "Delete data or table"
 msgstr "Dele datos o tabella"
 
@@ -10253,7 +10271,7 @@ msgid "Cannot connect: invalid settings."
 msgstr ""
 
 #: libraries/plugins/auth/AuthenticationConfig.class.php:108
-#: libraries/plugins/auth/AuthenticationCookie.class.php:134
+#: libraries/plugins/auth/AuthenticationCookie.class.php:122
 #: libraries/plugins/auth/AuthenticationHttp.class.php:96
 #, php-format
 msgid "Welcome to %s"
@@ -10278,36 +10296,36 @@ msgstr ""
 msgid "Retry to connect"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:146
+#: libraries/plugins/auth/AuthenticationCookie.class.php:134
 msgid "Your session has expired. Please log in again."
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:170
+#: libraries/plugins/auth/AuthenticationCookie.class.php:158
 msgid "Log in"
 msgstr "Accesso (Log in)"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:178
-#: libraries/plugins/auth/AuthenticationCookie.class.php:188
+#: libraries/plugins/auth/AuthenticationCookie.class.php:166
+#: libraries/plugins/auth/AuthenticationCookie.class.php:176
 msgid "You can enter hostname/IP address and port separated by space."
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:193
+#: libraries/plugins/auth/AuthenticationCookie.class.php:181
 msgid "Username:"
 msgstr "Nomine de usator:"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:205
+#: libraries/plugins/auth/AuthenticationCookie.class.php:193
 msgid "Server Choice:"
 msgstr "Selection de servitor:"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:386
+#: libraries/plugins/auth/AuthenticationCookie.class.php:374
 msgid "Entered captcha is wrong, try again!"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:396
+#: libraries/plugins/auth/AuthenticationCookie.class.php:384
 msgid "Please enter correct captcha!"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:423
+#: libraries/plugins/auth/AuthenticationCookie.class.php:411
 msgid "You are not allowed to log in to this MySQL server!"
 msgstr ""
 "Tu non ha le permisso de acceder con authentication a iste servitor MySQL!"
@@ -10404,7 +10422,7 @@ msgstr "Evento"
 #: libraries/plugins/export/ExportOdt.class.php:593
 #: libraries/plugins/export/ExportTexytext.class.php:428
 #: libraries/plugins/export/PMA_ExportPdf.class.php:313
-#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:984
 #: libraries/rte/rte_triggers.lib.php:377
 msgid "Definition"
 msgstr "Definition"
@@ -10720,7 +10738,7 @@ msgid "Last check:"
 msgstr "Ultime controlo:"
 
 #: libraries/plugins/export/ExportSql.class.php:1399
-#: templates/structure/structure_table_row.phtml:183
+#: templates/database/structure/structure_table_row.phtml:183
 msgid "in use"
 msgstr "in uso"
 
@@ -10905,18 +10923,14 @@ msgstr ""
 msgid "The imported file does not contain any data!"
 msgstr ""
 
-#: libraries/plugins/import/ImportSql.class.php:169
+#: libraries/plugins/import/ImportSql.class.php:72
 msgid "SQL compatibility mode:"
 msgstr ""
 
-#: libraries/plugins/import/ImportSql.class.php:181
+#: libraries/plugins/import/ImportSql.class.php:84
 msgid "Do not use <code>AUTO_INCREMENT</code> for zero values"
 msgstr "Non usa <code>AUTO_INCREMENT</code> pro valores de zero"
 
-#: libraries/plugins/import/ImportSql.class.php:195
-msgid "Read as multibytes"
-msgstr "Lege como multibytes"
-
 #: libraries/plugins/import/ImportXml.class.php:54
 msgid "XML"
 msgstr "XML"
@@ -10959,7 +10973,7 @@ msgid "Show grid"
 msgstr "Monstra grillia"
 
 #: libraries/plugins/schema/SchemaPdf.class.php:94
-#: templates/structure/print_view_data_dictionary_link.phtml:6
+#: templates/database/structure/print_view_data_dictionary_link.phtml:6
 msgid "Data Dictionary"
 msgstr "Dictionario de datos"
 
@@ -10984,7 +10998,7 @@ msgid "The %s table doesn't exist!"
 msgstr ""
 
 #: libraries/plugins/schema/eps/Eps_Relation_Schema.class.php:321
-#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:309
+#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:323
 #, php-format
 msgid "Schema of the %s database - Page %s"
 msgstr ""
@@ -11010,7 +11024,7 @@ msgstr "Tabula de contentos"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1005
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1028
 #: libraries/tracking.lib.php:884
-#: templates/structure/table_structure_header.phtml:11
+#: templates/table/structure/table_structure_header.phtml:11
 msgid "Extra"
 msgstr "Extra"
 
@@ -11317,32 +11331,32 @@ msgstr ""
 msgid "Create the needed tables with the <code>%screate_tables.sql</code>."
 msgstr "Crea le tabella necessari con le <code>%screate_tables.sql</code>."
 
-#: libraries/relation.lib.php:360
+#: libraries/relation.lib.php:357
 msgid "Create a pma user and give access to these tables."
 msgstr ""
 
-#: libraries/relation.lib.php:365
+#: libraries/relation.lib.php:360
 msgid ""
 "Enable advanced features in configuration file (<code>config.inc.php</"
 "code>), for example by starting from <code>config.sample.inc.php</code>."
 msgstr ""
 
-#: libraries/relation.lib.php:373
+#: libraries/relation.lib.php:365
 msgid "Re-login to phpMyAdmin to load the updated configuration file."
 msgstr ""
 
-#: libraries/relation.lib.php:1612
+#: libraries/relation.lib.php:1607
 msgid "no description"
 msgstr ""
 
-#: libraries/relation.lib.php:1811
+#: libraries/relation.lib.php:1806
 msgid ""
 "You do not have necessary privileges to create a database named "
 "'phpmyadmin'. You may go to 'Operations' tab of any database to set up the "
 "phpMyAdmin configuration storage there."
 msgstr ""
 
-#: libraries/relation.lib.php:1928
+#: libraries/relation.lib.php:1923
 #, php-format
 msgid ""
 "%sCreate%s a database named 'phpmyadmin' and setup the phpMyAdmin "
@@ -11351,7 +11365,7 @@ msgstr ""
 "%sCreate%s un base de datos nominate 'phpmyadmin' e configura le "
 "configuration de immagazinage de phpMyAdmin ci."
 
-#: libraries/relation.lib.php:1936
+#: libraries/relation.lib.php:1931
 #, php-format
 msgid ""
 "%sCreate%s the phpMyAdmin configuration storage in the current database."
@@ -11359,7 +11373,7 @@ msgstr ""
 "%sCrea%s le immagazinage de configuration de phpMyAdmin in le base de datos "
 "currente."
 
-#: libraries/relation.lib.php:1944
+#: libraries/relation.lib.php:1939
 #, php-format
 msgid "%sCreate%s missing phpMyAdmin configuration storage tables."
 msgstr ""
@@ -11367,7 +11381,7 @@ msgstr ""
 "phpMyAdmin."
 
 #: libraries/replication_gui.lib.php:46 libraries/replication_gui.lib.php:343
-#: libraries/server_databases.lib.php:387
+#: libraries/server_databases.lib.php:398
 msgid "Master replication"
 msgstr ""
 
@@ -11422,7 +11436,7 @@ msgid ""
 msgstr ""
 
 #: libraries/replication_gui.lib.php:141
-#: libraries/server_databases.lib.php:389
+#: libraries/server_databases.lib.php:400
 msgid "Slave replication"
 msgstr ""
 
@@ -11683,10 +11697,10 @@ msgid "Master server changed successfully to %s."
 msgstr ""
 
 #: libraries/rte/rte_events.lib.php:106 libraries/rte/rte_events.lib.php:115
-#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:149
-#: libraries/rte/rte_routines.lib.php:158
-#: libraries/rte/rte_routines.lib.php:231
-#: libraries/rte/rte_routines.lib.php:1362
+#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:219
+#: libraries/rte/rte_routines.lib.php:246
+#: libraries/rte/rte_routines.lib.php:368
+#: libraries/rte/rte_routines.lib.php:1453
 #: libraries/rte/rte_triggers.lib.php:82 libraries/rte/rte_triggers.lib.php:91
 #: libraries/rte/rte_triggers.lib.php:123
 #, php-format
@@ -11707,7 +11721,7 @@ msgstr ""
 msgid "Event %1$s has been created."
 msgstr ""
 
-#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:251
+#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:266
 #: libraries/rte/rte_triggers.lib.php:144
 msgid "One or more errors have occurred while processing your request:"
 msgstr "Uno o plure errores ha occurrite quando on processava tu requesta:"
@@ -11716,7 +11730,7 @@ msgstr "Uno o plure errores ha occurrite quando on processava tu requesta:"
 msgid "Edit event"
 msgstr "Modifica evento"
 
-#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:794
+#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:885
 #: libraries/rte/rte_triggers.lib.php:323 view_create.php:180
 msgid "Details"
 msgstr "Detalios"
@@ -11729,7 +11743,7 @@ msgstr "Nomine de evento"
 msgid "Event type"
 msgstr "Typo de evento"
 
-#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:817
+#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:908
 #, php-format
 msgid "Change to %s"
 msgstr ""
@@ -11756,12 +11770,14 @@ msgstr "Fin"
 msgid "On completion preserve"
 msgstr ""
 
-#: libraries/rte/rte_events.lib.php:491 libraries/rte/rte_routines.lib.php:930
+#: libraries/rte/rte_events.lib.php:491
+#: libraries/rte/rte_routines.lib.php:1021
 #: libraries/rte/rte_triggers.lib.php:383 view_create.php:209
 msgid "Definer"
 msgstr ""
 
-#: libraries/rte/rte_events.lib.php:535 libraries/rte/rte_routines.lib.php:997
+#: libraries/rte/rte_events.lib.php:535
+#: libraries/rte/rte_routines.lib.php:1088
 #: libraries/rte/rte_triggers.lib.php:422
 msgid "The definer must be in the \"username@hostname\" format!"
 msgstr ""
@@ -11787,9 +11803,9 @@ msgid "You must provide an event definition."
 msgstr ""
 
 #: libraries/rte/rte_export.lib.php:43 libraries/rte/rte_general.lib.php:72
-#: libraries/rte/rte_routines.lib.php:345
-#: libraries/rte/rte_routines.lib.php:1198
-#: libraries/rte/rte_routines.lib.php:1411
+#: libraries/rte/rte_routines.lib.php:153
+#: libraries/rte/rte_routines.lib.php:1289
+#: libraries/rte/rte_routines.lib.php:1502
 msgid "Error in processing request:"
 msgstr ""
 
@@ -11821,132 +11837,132 @@ msgid ""
 "problems."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:110
-#: libraries/rte/rte_routines.lib.php:1006
+#: libraries/rte/rte_routines.lib.php:123
+msgid "Edit routine"
+msgstr ""
+
+#: libraries/rte/rte_routines.lib.php:200
+#: libraries/rte/rte_routines.lib.php:1097
 #, php-format
 msgid "Invalid routine type: \"%s\""
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:170
-msgid "Sorry, we failed to restore the dropped routine."
-msgstr ""
-
-#: libraries/rte/rte_routines.lib.php:211
-#, php-format
-msgid "Routine %1$s has been modified. Privileges have been adjusted."
-msgstr ""
-
-#: libraries/rte/rte_routines.lib.php:216
-#, php-format
-msgid "Routine %1$s has been modified."
-msgstr ""
-
-#: libraries/rte/rte_routines.lib.php:238
+#: libraries/rte/rte_routines.lib.php:253
 #, php-format
 msgid "Routine %1$s has been created."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:315
-msgid "Edit routine"
+#: libraries/rte/rte_routines.lib.php:380
+msgid "Sorry, we failed to restore the dropped routine."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:797
+#: libraries/rte/rte_routines.lib.php:439
+#, php-format
+msgid "Routine %1$s has been modified. Privileges have been adjusted."
+msgstr ""
+
+#: libraries/rte/rte_routines.lib.php:444
+#, php-format
+msgid "Routine %1$s has been modified."
+msgstr ""
+
+#: libraries/rte/rte_routines.lib.php:888
 msgid "Routine name"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:823
+#: libraries/rte/rte_routines.lib.php:914
 msgid "Parameters"
 msgstr "Parametros"
 
-#: libraries/rte/rte_routines.lib.php:829
+#: libraries/rte/rte_routines.lib.php:920
 msgid "Direction"
 msgstr "Direction"
 
-#: libraries/rte/rte_routines.lib.php:847
+#: libraries/rte/rte_routines.lib.php:938
 msgid "Add parameter"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:851
+#: libraries/rte/rte_routines.lib.php:942
 msgid "Remove last parameter"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:856
+#: libraries/rte/rte_routines.lib.php:947
 msgid "Return type"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:862
+#: libraries/rte/rte_routines.lib.php:953
 msgid "Return length/values"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:868
+#: libraries/rte/rte_routines.lib.php:959
 msgid "Return options"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:899
+#: libraries/rte/rte_routines.lib.php:990
 msgid "Is deterministic"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:920
+#: libraries/rte/rte_routines.lib.php:1011
 msgid ""
 "You do not have sufficient privileges to perform this operation; Please "
 "refer to the documentation for more details"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:935
+#: libraries/rte/rte_routines.lib.php:1026
 msgid "Security type"
 msgstr "Typo de securitate"
 
-#: libraries/rte/rte_routines.lib.php:944
+#: libraries/rte/rte_routines.lib.php:1035
 msgid "SQL data access"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1013
+#: libraries/rte/rte_routines.lib.php:1104
 msgid "You must provide a routine name!"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1047
+#: libraries/rte/rte_routines.lib.php:1138
 #, php-format
 msgid "Invalid direction \"%s\" given for parameter."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1069
-#: libraries/rte/rte_routines.lib.php:1131
+#: libraries/rte/rte_routines.lib.php:1160
+#: libraries/rte/rte_routines.lib.php:1222
 msgid ""
 "You must provide length/values for routine parameters of type ENUM, SET, "
 "VARCHAR and VARBINARY."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1095
+#: libraries/rte/rte_routines.lib.php:1186
 msgid "You must provide a name and a type for each routine parameter."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1114
+#: libraries/rte/rte_routines.lib.php:1205
 msgid "You must provide a valid return type for the routine."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1174
+#: libraries/rte/rte_routines.lib.php:1265
 msgid "You must provide a routine definition."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1285
+#: libraries/rte/rte_routines.lib.php:1376
 #, php-format
 msgid "Execution results of routine %s"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1340
+#: libraries/rte/rte_routines.lib.php:1431
 #, php-format
 msgid "%d row affected by the last statement inside the procedure."
 msgid_plural "%d rows affected by the last statement inside the procedure."
 msgstr[0] ""
 msgstr[1] ""
 
-#: libraries/rte/rte_routines.lib.php:1398
-#: libraries/rte/rte_routines.lib.php:1406
+#: libraries/rte/rte_routines.lib.php:1489
+#: libraries/rte/rte_routines.lib.php:1497
 msgid "Execute routine"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1485
-#: libraries/rte/rte_routines.lib.php:1488
+#: libraries/rte/rte_routines.lib.php:1576
+#: libraries/rte/rte_routines.lib.php:1579
 msgid "Routine parameters"
 msgstr ""
 
@@ -12100,7 +12116,7 @@ msgid "Original position"
 msgstr ""
 
 #: libraries/server_bin_log.lib.php:133
-#: templates/structure/display_table_stats.phtml:4
+#: templates/table/structure/display_table_stats.phtml:4
 msgid "Information"
 msgstr "Information"
 
@@ -12136,12 +12152,12 @@ msgid ""
 "between the web server and the MySQL server."
 msgstr ""
 
-#: libraries/server_databases.lib.php:364
-#: libraries/server_databases.lib.php:365
+#: libraries/server_databases.lib.php:366
+#: libraries/server_databases.lib.php:371
 msgid "Enable Statistics"
 msgstr ""
 
-#: libraries/server_databases.lib.php:481
+#: libraries/server_databases.lib.php:492
 #, php-format
 msgid "%1$d database has been dropped successfully."
 msgid_plural "%1$d databases have been dropped successfully."
@@ -12497,7 +12513,7 @@ msgid "You have revoked the privileges for %s."
 msgstr ""
 
 #: libraries/server_privileges.lib.php:2059
-#: libraries/server_privileges.lib.php:4290
+#: libraries/server_privileges.lib.php:4316
 msgid "Add user account"
 msgstr "Adde conto de usator"
 
@@ -12660,53 +12676,53 @@ msgstr ""
 msgid "The privileges were reloaded successfully."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:3994
+#: libraries/server_privileges.lib.php:4003
 #, php-format
 msgid "The user %s already exists!"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4232
+#: libraries/server_privileges.lib.php:4258
 #, php-format
 msgid "Privileges for %s"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4241
+#: libraries/server_privileges.lib.php:4267
 #: libraries/server_status_processes.lib.php:72
 #: libraries/server_user_groups.lib.php:39
 msgid "User"
 msgstr "Usator"
 
-#: libraries/server_privileges.lib.php:4282
+#: libraries/server_privileges.lib.php:4308
 msgctxt "Create new user"
 msgid "New"
 msgstr "Nove"
 
-#: libraries/server_privileges.lib.php:4311
+#: libraries/server_privileges.lib.php:4337
 msgid "Edit privileges:"
 msgstr "Modifica privilegios:"
 
-#: libraries/server_privileges.lib.php:4312
+#: libraries/server_privileges.lib.php:4338
 msgid "User account"
 msgstr "Conto de usator"
 
-#: libraries/server_privileges.lib.php:4371
+#: libraries/server_privileges.lib.php:4397
 msgid ""
 "Note: You are attempting to edit privileges of the user with which you are "
 "currently logged in."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4391 libraries/server_users.lib.php:25
+#: libraries/server_privileges.lib.php:4417 libraries/server_users.lib.php:25
 msgid "User accounts overview"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4459
+#: libraries/server_privileges.lib.php:4485
 msgid ""
 "A user account allowing any user from localhost to connect is present. This "
 "will prevent other users from connecting if the host part of their account "
 "allows a connection from any (%) host."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4500
+#: libraries/server_privileges.lib.php:4526
 #, php-format
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
@@ -12715,7 +12731,7 @@ msgid ""
 "%sreload the privileges%s before you continue."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4519
+#: libraries/server_privileges.lib.php:4545
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
 "tables. The content of these tables may differ from the privileges the "
@@ -12724,61 +12740,61 @@ msgid ""
 "privilege."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4569
+#: libraries/server_privileges.lib.php:4595
 msgid "The selected user was not found in the privilege table."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4801
+#: libraries/server_privileges.lib.php:4827
 msgid "You have added a new user."
 msgstr ""
 
-#: libraries/server_status.lib.php:53
+#: libraries/server_status.lib.php:60
 #, php-format
 msgid "Network traffic since startup: %s"
 msgstr ""
 
-#: libraries/server_status.lib.php:66
+#: libraries/server_status.lib.php:73
 #, php-format
 msgid "This MySQL server has been running for %1$s. It started up on %2$s."
 msgstr ""
 
-#: libraries/server_status.lib.php:80
+#: libraries/server_status.lib.php:94
 msgid ""
 "This MySQL server works as <b>master</b> and <b>slave</b> in <b>replication</"
 "b> process."
 msgstr ""
 
-#: libraries/server_status.lib.php:85
+#: libraries/server_status.lib.php:99
 msgid "This MySQL server works as <b>master</b> in <b>replication</b> process."
 msgstr ""
 
-#: libraries/server_status.lib.php:90
+#: libraries/server_status.lib.php:104
 msgid "This MySQL server works as <b>slave</b> in <b>replication</b> process."
 msgstr ""
 
-#: libraries/server_status.lib.php:106
+#: libraries/server_status.lib.php:116
 msgid "Replication status"
 msgstr ""
 
-#: libraries/server_status.lib.php:137
+#: libraries/server_status.lib.php:146
 msgid ""
 "On a busy server, the byte counters may overrun, so those statistics as "
 "reported by the MySQL server may be incorrect."
 msgstr ""
 
-#: libraries/server_status.lib.php:148
+#: libraries/server_status.lib.php:157
 msgid "Received"
 msgstr "Recipite"
 
-#: libraries/server_status.lib.php:167
+#: libraries/server_status.lib.php:176
 msgid "Sent"
 msgstr "Inviate"
 
-#: libraries/server_status.lib.php:234
+#: libraries/server_status.lib.php:243
 msgid "Max. concurrent connections"
 msgstr "Max.Connexiones concurrente"
 
-#: libraries/server_status.lib.php:244
+#: libraries/server_status.lib.php:253
 msgid "Failed attempts"
 msgstr ""
 
@@ -13698,7 +13714,7 @@ msgstr ""
 msgid "Not implemented yet."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/AlterOperation.php:193
+#: libraries/sql-parser/src/Components/AlterOperation.php:191
 msgid "Unrecognized alter operation."
 msgstr ""
 
@@ -13712,7 +13728,7 @@ msgid "An opening bracket followed by a set of values was expected."
 msgstr ""
 
 #: libraries/sql-parser/src/Components/ArrayObj.php:101
-#: libraries/sql-parser/src/Components/FieldDefinition.php:202
+#: libraries/sql-parser/src/Components/CreateDefinition.php:202
 msgid "An opening bracket was expected."
 msgstr ""
 
@@ -13720,25 +13736,33 @@ msgstr ""
 msgid "A comma or a closing bracket was expected"
 msgstr ""
 
+#: libraries/sql-parser/src/Components/CreateDefinition.php:246
+msgid "A comma or a closing bracket was expected."
+msgstr "On expectava un comma o un parentheses claudite."
+
+#: libraries/sql-parser/src/Components/CreateDefinition.php:262
+msgid "A closing bracket was expected."
+msgstr ""
+
 #: libraries/sql-parser/src/Components/DataType.php:125
 msgid "Unrecognized data type."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:225
+#: libraries/sql-parser/src/Components/Expression.php:227
 msgid "Unexpected closing bracket."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:246
-#: libraries/sql-parser/src/Components/Expression.php:283
-#: libraries/sql-parser/src/Components/Expression.php:303
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:285
+#: libraries/sql-parser/src/Components/Expression.php:305
 msgid "An alias was previously found."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:257
+#: libraries/sql-parser/src/Components/Expression.php:259
 msgid "Unexpected dot."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:327
+#: libraries/sql-parser/src/Components/Expression.php:329
 msgid "An alias was expected."
 msgstr "On expectava un alias."
 
@@ -13746,14 +13770,6 @@ msgstr "On expectava un alias."
 msgid "An expression was expected."
 msgstr "On expectava un expression."
 
-#: libraries/sql-parser/src/Components/FieldDefinition.php:246
-msgid "A comma or a closing bracket was expected."
-msgstr "On expectava un comma o un parentheses claudite."
-
-#: libraries/sql-parser/src/Components/FieldDefinition.php:262
-msgid "A closing bracket was expected."
-msgstr ""
-
 #: libraries/sql-parser/src/Components/Limit.php:90
 #: libraries/sql-parser/src/Components/Limit.php:112
 msgid "An offset was expected."
@@ -13793,24 +13809,24 @@ msgstr ""
 msgid "Expected delimiter."
 msgstr ""
 
-#: libraries/sql-parser/src/Lexer.php:753
+#: libraries/sql-parser/src/Lexer.php:777
 #, php-format
 msgid "Ending quote %1$s was expected."
 msgstr ""
 
-#: libraries/sql-parser/src/Lexer.php:789
+#: libraries/sql-parser/src/Lexer.php:813
 msgid "Variable name was expected."
 msgstr "On expectava un nomine de variabile."
 
-#: libraries/sql-parser/src/Parser.php:380
+#: libraries/sql-parser/src/Parser.php:391
 msgid "Unexpected beginning of statement."
 msgstr "Un initio de instruction non expectate."
 
-#: libraries/sql-parser/src/Parser.php:399
+#: libraries/sql-parser/src/Parser.php:410
 msgid "Unrecognized statement type."
 msgstr ""
 
-#: libraries/sql-parser/src/Parser.php:479
+#: libraries/sql-parser/src/Parser.php:489
 msgid "No transaction was previously started."
 msgstr ""
 
@@ -13836,8 +13852,10 @@ msgid "The name of the entity was expected."
 msgstr ""
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:310
-msgid "At least one field definition was expected."
-msgstr ""
+#, fuzzy
+#| msgid "A rename operation was expected."
+msgid "At least one column definition was expected."
+msgstr "On expectava un operation de renominar.."
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:329
 msgid "A \"RETURNS\" keyword was expected."
@@ -13896,11 +13914,11 @@ msgstr "Marcator de libro non create!"
 msgid "Using bookmark \"%s\" as default browse query."
 msgstr ""
 
-#: libraries/sql.lib.php:1306
+#: libraries/sql.lib.php:1300
 msgid "Showing as PHP code"
 msgstr ""
 
-#: libraries/sql.lib.php:1638
+#: libraries/sql.lib.php:1632
 #, php-format
 msgid ""
 "Current selection does not contain a unique column. Grid edit, checkbox, "
@@ -13909,7 +13927,7 @@ msgstr ""
 "Selection currente non contine un unic columna. Functionalitates ligate al "
 "modificar grillia, modificar, copiar, marcar, deler non es disponibile %s"
 
-#: libraries/sql.lib.php:1649
+#: libraries/sql.lib.php:1643
 #, php-format
 msgid ""
 "Current selection does not contain a unique column. Grid edit, Edit, Copy "
@@ -13919,7 +13937,7 @@ msgstr ""
 "modificar grillia, modificar, copiar, e deler pote resultar in un "
 "comportamento indesiderate. %s"
 
-#: libraries/sql.lib.php:1688
+#: libraries/sql.lib.php:1682
 #, php-format
 msgid "Problems with indexes of table `%s`"
 msgstr ""
@@ -14075,7 +14093,7 @@ msgid "Version %s snapshot (SQL code)"
 msgstr ""
 
 #: libraries/tracking.lib.php:947
-#: templates/structure/table_structure_row.phtml:33
+#: templates/table/structure/table_structure_row.phtml:33
 msgctxt "None for default"
 msgid "None"
 msgstr "Necun"
@@ -14127,15 +14145,15 @@ msgstr "Version %1$s de %2$s esseva delite."
 msgid "Version %1$s was created, tracking for %2$s is active."
 msgstr ""
 
-#: libraries/user_preferences.inc.php:29
+#: libraries/user_preferences.inc.php:30
 msgid "Manage your settings"
 msgstr ""
 
-#: libraries/user_preferences.inc.php:46 prefs_manage.php:307
+#: libraries/user_preferences.inc.php:54 prefs_manage.php:307
 msgid "Configuration has been saved."
 msgstr ""
 
-#: libraries/user_preferences.inc.php:66
+#: libraries/user_preferences.inc.php:74
 #, php-format
 msgid ""
 "Your preferences will be saved for current session only. Storing them "
@@ -14433,7 +14451,6 @@ msgid "Row: %1$s, Column: %2$s, Error: %3$s"
 msgstr ""
 
 #: tbl_row_action.php:70
-#| msgid "No versions selected."
 msgid "No row selected."
 msgstr "Necun rango seligite."
 
@@ -14509,7 +14526,7 @@ msgid "first"
 msgstr "prime"
 
 #: templates/columns_definitions/move_column.phtml:12
-#: templates/structure/add_column.phtml:21
+#: templates/table/structure/add_column.phtml:21
 #, php-format
 msgid "after %s"
 msgstr "post %s"
@@ -14568,197 +14585,292 @@ msgstr "Transformation de ingresso"
 msgid "Input transformation options"
 msgstr "Optiones de transformation de ingresso"
 
-#: templates/designer/aggregate_query_panel.phtml:22
-#: templates/designer/options_panel.phtml:100
-msgid "Aggregate"
-msgstr "Total"
-
-#: templates/designer/aggregate_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:61
-#: templates/designer/options_panel.phtml:106
-#: templates/designer/options_panel.phtml:170
-#: templates/designer/where_query_panel.phtml:30
-#: templates/table/table_header.phtml:9
-msgid "Operator"
-msgstr "Operator"
-
-#: templates/designer/database_tables.phtml:29
-msgid "Toggle"
-msgstr "Alternar"
-
-#: templates/designer/database_tables.phtml:40
-msgid "See table structure"
-msgstr "Vide le structura de tabella"
-
-#: templates/designer/delete_relation_panel.phtml:21
-msgid "Delete relation"
-msgstr "Dele relation"
-
-#: templates/designer/edit_delete_pages.phtml:7
-msgid "Page to open"
-msgstr "Pagina de aperir"
-
-#: templates/designer/edit_delete_pages.phtml:7
-msgid "Page to delete"
-msgstr "Pagina de deler"
-
-#: templates/designer/having_query_panel.phtml:90
-#: templates/designer/options_panel.phtml:63
-#: templates/designer/options_panel.phtml:229
-#: templates/designer/where_query_panel.phtml:59
-msgid "Except"
-msgstr "Excepte"
-
-#: templates/designer/having_query_panel.phtml:102
-#: templates/designer/options_panel.phtml:75
-#: templates/designer/options_panel.phtml:241
-#: templates/designer/where_query_panel.phtml:71
-msgid "subquery"
-msgstr "subquery"
-
-#: templates/designer/new_relation_panel.phtml:22
-#: templates/designer/side_menu.phtml:84 templates/designer/side_menu.phtml:87
-msgid "Create relation"
-msgstr "Crea relation"
-
-#: templates/designer/options_panel.phtml:34
-#: templates/designer/options_panel.phtml:200
-msgid "Relation operator"
-msgstr "Operator de relation"
-
-#: templates/designer/options_panel.phtml:85
-#: templates/designer/rename_to_panel.phtml:23
-msgid "Rename to"
-msgstr "Renomina in"
-
-#: templates/designer/options_panel.phtml:91
-#: templates/designer/rename_to_panel.phtml:31
-msgid "New name"
-msgstr "Nove nomine"
-
-#: templates/designer/page_save_as.phtml:4
-msgid "Save to selected page"
-msgstr "Salveguarda al pagina seligite"
-
-#: templates/designer/page_save_as.phtml:5
-msgid "Create a page and save to it"
-msgstr "Crea un pagina e salveguarda a illo"
-
-#: templates/designer/page_save_as.phtml:26
-msgid "New page name"
-msgstr "Nomine de nove pagina"
-
-#: templates/designer/page_selector.phtml:2
-msgid "Select page"
-msgstr "Selige pagina"
-
-#: templates/designer/query_details.phtml:10
-msgid "Active options"
-msgstr "Optiones active"
-
-#: templates/designer/schema_export.phtml:4
-msgid "Select Export Relational Type"
-msgstr "Selige typo de exportation relational"
-
-#: templates/designer/side_menu.phtml:19 templates/designer/side_menu.phtml:25
-msgid "Show/Hide tables list"
-msgstr "Monstra/Cela lista de tabellas"
-
-#: templates/designer/side_menu.phtml:29 templates/designer/side_menu.phtml:35
-#: templates/designer/side_menu.phtml:36
-msgid "View in fullscreen"
-msgstr "Monstra a schermo integre"
-
-#: templates/designer/side_menu.phtml:34
-msgid "Exit fullscreen"
-msgstr "Abandona le modo de schermo integre"
-
-#: templates/designer/side_menu.phtml:41 templates/designer/side_menu.phtml:45
-msgid "New page"
-msgstr "Nove pagina"
-
-#: templates/designer/side_menu.phtml:70 templates/designer/side_menu.phtml:73
-msgid "Delete pages"
-msgstr "Dele paginas"
-
-#: templates/designer/side_menu.phtml:77 templates/designer/side_menu.phtml:80
-#: templates/table/create_table.phtml:7
+#: templates/database/create_table.phtml:7
+#: templates/database/designer/side_menu.phtml:77
+#: templates/database/designer/side_menu.phtml:80
 msgid "Create table"
 msgstr "Crea tabella"
 
-#: templates/designer/side_menu.phtml:98
-#: templates/designer/side_menu.phtml:101
+#: templates/database/create_table.phtml:15
+msgid "Number of columns"
+msgstr "Numero de columnas"
+
+#: templates/database/designer/aggregate_query_panel.phtml:22
+#: templates/database/designer/options_panel.phtml:100
+msgid "Aggregate"
+msgstr "Total"
+
+#: templates/database/designer/aggregate_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:61
+#: templates/database/designer/options_panel.phtml:106
+#: templates/database/designer/options_panel.phtml:170
+#: templates/database/designer/where_query_panel.phtml:30
+#: templates/table/search/table_header.phtml:9
+msgid "Operator"
+msgstr "Operator"
+
+#: templates/database/designer/database_tables.phtml:29
+msgid "Toggle"
+msgstr "Alternar"
+
+#: templates/database/designer/database_tables.phtml:40
+msgid "See table structure"
+msgstr "Vide le structura de tabella"
+
+#: templates/database/designer/delete_relation_panel.phtml:21
+msgid "Delete relation"
+msgstr "Dele relation"
+
+#: templates/database/designer/edit_delete_pages.phtml:7
+msgid "Page to open"
+msgstr "Pagina de aperir"
+
+#: templates/database/designer/edit_delete_pages.phtml:7
+msgid "Page to delete"
+msgstr "Pagina de deler"
+
+#: templates/database/designer/having_query_panel.phtml:90
+#: templates/database/designer/options_panel.phtml:63
+#: templates/database/designer/options_panel.phtml:229
+#: templates/database/designer/where_query_panel.phtml:59
+msgid "Except"
+msgstr "Excepte"
+
+#: templates/database/designer/having_query_panel.phtml:102
+#: templates/database/designer/options_panel.phtml:75
+#: templates/database/designer/options_panel.phtml:241
+#: templates/database/designer/where_query_panel.phtml:71
+msgid "subquery"
+msgstr "subquery"
+
+#: templates/database/designer/new_relation_panel.phtml:22
+#: templates/database/designer/side_menu.phtml:84
+#: templates/database/designer/side_menu.phtml:87
+msgid "Create relation"
+msgstr "Crea relation"
+
+#: templates/database/designer/options_panel.phtml:34
+#: templates/database/designer/options_panel.phtml:200
+msgid "Relation operator"
+msgstr "Operator de relation"
+
+#: templates/database/designer/options_panel.phtml:85
+#: templates/database/designer/rename_to_panel.phtml:23
+msgid "Rename to"
+msgstr "Renomina in"
+
+#: templates/database/designer/options_panel.phtml:91
+#: templates/database/designer/rename_to_panel.phtml:31
+msgid "New name"
+msgstr "Nove nomine"
+
+#: templates/database/designer/page_save_as.phtml:4
+msgid "Save to selected page"
+msgstr "Salveguarda al pagina seligite"
+
+#: templates/database/designer/page_save_as.phtml:5
+msgid "Create a page and save to it"
+msgstr "Crea un pagina e salveguarda a illo"
+
+#: templates/database/designer/page_save_as.phtml:26
+msgid "New page name"
+msgstr "Nomine de nove pagina"
+
+#: templates/database/designer/page_selector.phtml:2
+msgid "Select page"
+msgstr "Selige pagina"
+
+#: templates/database/designer/query_details.phtml:10
+msgid "Active options"
+msgstr "Optiones active"
+
+#: templates/database/designer/schema_export.phtml:4
+msgid "Select Export Relational Type"
+msgstr "Selige typo de exportation relational"
+
+#: templates/database/designer/side_menu.phtml:19
+#: templates/database/designer/side_menu.phtml:25
+msgid "Show/Hide tables list"
+msgstr "Monstra/Cela lista de tabellas"
+
+#: templates/database/designer/side_menu.phtml:29
+#: templates/database/designer/side_menu.phtml:35
+#: templates/database/designer/side_menu.phtml:36
+msgid "View in fullscreen"
+msgstr "Monstra a schermo integre"
+
+#: templates/database/designer/side_menu.phtml:34
+msgid "Exit fullscreen"
+msgstr "Abandona le modo de schermo integre"
+
+#: templates/database/designer/side_menu.phtml:41
+#: templates/database/designer/side_menu.phtml:45
+msgid "New page"
+msgstr "Nove pagina"
+
+#: templates/database/designer/side_menu.phtml:70
+#: templates/database/designer/side_menu.phtml:73
+msgid "Delete pages"
+msgstr "Dele paginas"
+
+#: templates/database/designer/side_menu.phtml:98
+#: templates/database/designer/side_menu.phtml:101
 msgid "Reload"
 msgstr "Recarga"
 
-#: templates/designer/side_menu.phtml:107
-#: templates/designer/side_menu.phtml:110
+#: templates/database/designer/side_menu.phtml:107
+#: templates/database/designer/side_menu.phtml:110
 msgid "Help"
 msgstr "Adjuta"
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Angular links"
 msgstr "Ligamines angular"
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Direct links"
 msgstr "Ligamines directe"
 
-#: templates/designer/side_menu.phtml:122
-#: templates/designer/side_menu.phtml:124
+#: templates/database/designer/side_menu.phtml:122
+#: templates/database/designer/side_menu.phtml:124
 msgid "Snap to grid"
 msgstr "Colpos (snap) al grilia"
 
-#: templates/designer/side_menu.phtml:128
-#: templates/designer/side_menu.phtml:134
+#: templates/database/designer/side_menu.phtml:128
+#: templates/database/designer/side_menu.phtml:134
 msgid "Small/Big All"
 msgstr "Toto parve/grande"
 
-#: templates/designer/side_menu.phtml:138
-#: templates/designer/side_menu.phtml:141
+#: templates/database/designer/side_menu.phtml:138
+#: templates/database/designer/side_menu.phtml:141
 msgid "Toggle small/big"
 msgstr "Commuta inter parve/grande"
 
-#: templates/designer/side_menu.phtml:145
-#: templates/designer/side_menu.phtml:148
+#: templates/database/designer/side_menu.phtml:145
+#: templates/database/designer/side_menu.phtml:148
 msgid "Toggle relation lines"
 msgstr "Commuta lineas de relation"
 
-#: templates/designer/side_menu.phtml:153
-#: templates/designer/side_menu.phtml:156
+#: templates/database/designer/side_menu.phtml:153
+#: templates/database/designer/side_menu.phtml:156
 msgid "Export schema"
 msgstr "Exporta schema"
 
-#: templates/designer/side_menu.phtml:165
-#: templates/designer/side_menu.phtml:168
+#: templates/database/designer/side_menu.phtml:165
+#: templates/database/designer/side_menu.phtml:168
 msgid "Build Query"
 msgstr "Construe Query"
 
-#: templates/designer/side_menu.phtml:173
-#: templates/designer/side_menu.phtml:177
+#: templates/database/designer/side_menu.phtml:173
+#: templates/database/designer/side_menu.phtml:177
 msgid "Move Menu"
 msgstr "Move menu"
 
-#: templates/designer/side_menu.phtml:181
-#: templates/designer/side_menu.phtml:186
+#: templates/database/designer/side_menu.phtml:181
+#: templates/database/designer/side_menu.phtml:186
 msgid "Pin text"
 msgstr "Texto de spinula (pin text)"
 
-#: templates/designer/table_list.phtml:4
+#: templates/database/designer/table_list.phtml:4
 msgid "Hide/Show all"
 msgstr "Cela/monstra toto"
 
-#: templates/designer/table_list.phtml:14
+#: templates/database/designer/table_list.phtml:14
 msgid "Hide/Show Tables with no relation"
 msgstr "Cela/Monstra tabellas con necun relation"
 
-#: templates/designer/table_list.phtml:59
+#: templates/database/designer/table_list.phtml:59
 msgid "Number of tables:"
 msgstr "Numero de tabellas:"
 
+#: templates/database/structure/body_for_table_summary.phtml:6
+#, php-format
+msgid "%s table"
+msgid_plural "%s tables"
+msgstr[0] "%s tabula"
+msgstr[1] "%s tabulas"
+
+#: templates/database/structure/body_for_table_summary.phtml:17
+msgid "Sum"
+msgstr "Summa"
+
+#: templates/database/structure/check_all_tables.phtml:6
+msgid "Check tables having overhead"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:10
+msgid "Show create"
+msgstr "Monstra create"
+
+#: templates/database/structure/check_all_tables.phtml:27
+msgid "Prefix"
+msgstr "Prefixo"
+
+#: templates/database/structure/check_all_tables.phtml:28
+msgid "Add prefix to table"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:29
+msgid "Replace table prefix"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:30
+msgid "Copy table with prefix"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:36
+msgid "Add columns to central list"
+msgstr "Adde columnas al lista central"
+
+#: templates/database/structure/check_all_tables.phtml:37
+msgid "Remove columns from central list"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:38
+msgid "Make consistent with central list"
+msgstr "Face consistente con le lista central"
+
+#: templates/database/structure/favorite_anchor.phtml:12
+msgid "Add to Favorites"
+msgstr "Adde a Favoritos"
+
+#: templates/database/structure/show_create.phtml:2
+msgid "Showing create queries"
+msgstr ""
+
+#: templates/database/structure/sortable_header.phtml:13
+msgid "Sort"
+msgstr "Ordina"
+
+#: templates/database/structure/table_header.phtml:42
+msgid ""
+"May be approximate. Click on the number to get the exact count. See "
+"[doc@faq3-11]FAQ 3.11[/doc]."
+msgstr ""
+"Il pote esser approximate. Pulsa sur le numero pro obtener le computo "
+"exacte. Vide[doc@faq3-11]FAQ 3.11[/doc]."
+
+#: templates/database/structure/table_header.phtml:66
+#: templates/table/index_form.phtml:127
+msgid "Size"
+msgstr "Grandor"
+
+#: templates/database/structure/table_header.phtml:74
+#: templates/table/structure/display_table_stats.phtml:27
+msgid "Overhead"
+msgstr "Overhead"
+
+#: templates/database/structure/tracking_icon.phtml:4
+msgid "Tracking is active."
+msgstr ""
+
+#: templates/database/structure/tracking_icon.phtml:8
+msgid "Tracking is not active."
+msgstr ""
+
 #: templates/error/report_form.phtml:7
 msgid ""
 "phpMyAdmin has encountered an error. We have collected data about this error "
@@ -14777,59 +14889,6 @@ msgstr "Tu pote examinar le datos in le reporto de error:"
 msgid "Please explain the steps that lead to the error:"
 msgstr "Pro favor tu explica le passos ducente al error:"
 
-#: templates/gis_visualization/gis_visualization.phtml:3
-msgid "Display GIS Visualization"
-msgstr ""
-
-#: templates/gis_visualization/gis_visualization.phtml:8
-msgid "Label column"
-msgstr "Etiquetta columna"
-
-#: templates/gis_visualization/gis_visualization.phtml:11
-msgid "-- None --"
-msgstr "-- Necun --"
-
-#: templates/gis_visualization/gis_visualization.phtml:19
-msgid "Spatial column"
-msgstr "Columna spatial"
-
-#: templates/index_form.phtml:16
-msgid "Index name:"
-msgstr "Nomine de indice:"
-
-#: templates/index_form.phtml:19
-msgid ""
-"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
-msgstr ""
-
-#: templates/index_form.phtml:40
-msgid "Index choice:"
-msgstr "Selection de indice:"
-
-#: templates/index_form.phtml:57
-msgid "Key block size:"
-msgstr ""
-
-#: templates/index_form.phtml:74
-msgid "Index type:"
-msgstr "Typo de indice:"
-
-#: templates/index_form.phtml:86
-msgid "Parser:"
-msgstr "Analysator (parser):"
-
-#: templates/index_form.phtml:102
-msgid "Comment:"
-msgstr "Commento:"
-
-#: templates/index_form.phtml:127 templates/structure/table_header.phtml:66
-msgid "Size"
-msgstr "Grandor"
-
-#: templates/index_form.phtml:149 templates/index_form.phtml:190
-msgid "Drag to reorder"
-msgstr "Trahe pro reordinar"
-
 #: templates/prefs_autoload.phtml:9
 msgid ""
 "Your browser has phpMyAdmin configuration for this domain. Would you like to "
@@ -14840,406 +14899,371 @@ msgstr ""
 msgid "Start row:"
 msgstr "Initia rango:"
 
-#: templates/structure/actions_in_table_structure.phtml:14
-#, php-format
-msgid "A primary key has been added on %s."
-msgstr ""
-
-#: templates/structure/actions_in_table_structure.phtml:34
-#: templates/structure/actions_in_table_structure.phtml:54
-#: templates/structure/actions_in_table_structure.phtml:79
-#: templates/structure/actions_in_table_structure.phtml:101
-#, php-format
-msgid "An index has been added on %s."
-msgstr ""
-
-#: templates/structure/actions_in_table_structure.phtml:130
-#: templates/structure/check_all_table_column.phtml:59
-msgid "Remove from central columns"
-msgstr "Remove ex le columnas central"
-
-#: templates/structure/actions_in_table_structure.phtml:138
-#: templates/structure/check_all_table_column.phtml:55
-msgid "Add to central columns"
-msgstr "Adde al columnas central"
-
-#: templates/structure/add_column.phtml:7
-#, php-format
-msgid "Add %s column(s)"
-msgstr "Adde %s columna(s)"
-
-#: templates/structure/add_column.phtml:12
-msgid "at beginning of table"
-msgstr "a le initio de tabella"
-
-#: templates/structure/body_for_table_summary.phtml:6
-#, php-format
-msgid "%s table"
-msgid_plural "%s tables"
-msgstr[0] "%s tabula"
-msgstr[1] "%s tabulas"
-
-#: templates/structure/body_for_table_summary.phtml:17
-msgid "Sum"
-msgstr "Summa"
-
-#: templates/structure/check_all_tables.phtml:6
-msgid "Check tables having overhead"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:10
-msgid "Show create"
-msgstr "Monstra create"
-
-#: templates/structure/check_all_tables.phtml:27
-msgid "Prefix"
-msgstr "Prefixo"
-
-#: templates/structure/check_all_tables.phtml:28
-msgid "Add prefix to table"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:29
-msgid "Replace table prefix"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:30
-msgid "Copy table with prefix"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:36
-msgid "Add columns to central list"
-msgstr "Adde columnas al lista central"
-
-#: templates/structure/check_all_tables.phtml:37
-msgid "Remove columns from central list"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:38
-msgid "Make consistent with central list"
-msgstr "Face consistente con le lista central"
-
-#: templates/structure/display_structure.phtml:140 view_create.php:181
-msgid "Edit view"
-msgstr ""
-
-#: templates/structure/display_table_stats.phtml:9
-msgid "Space usage"
-msgstr ""
-
-#: templates/structure/display_table_stats.phtml:27
-#: templates/structure/table_header.phtml:74
-msgid "Overhead"
-msgstr "Overhead"
-
-#: templates/structure/display_table_stats.phtml:32
-msgid "Effective"
-msgstr "Effective"
-
-#: templates/structure/favorite_anchor.phtml:12
-msgid "Add to Favorites"
-msgstr "Adde a Favoritos"
-
-#: templates/structure/move_columns_dialog.phtml:1
-#: templates/structure/optional_action_links.phtml:21
-msgid "Move columns"
-msgstr ""
-
-#: templates/structure/move_columns_dialog.phtml:2
-msgid "Move the columns by dragging them up and down."
-msgstr ""
-
-#: templates/structure/optional_action_links.phtml:9
-msgid "Propose table structure"
-msgstr ""
-
-#: templates/structure/optional_action_links.phtml:24
-msgid "Improve table structure"
-msgstr "Meliora structura de tabella"
-
-#: templates/structure/optional_action_links.phtml:30
-msgid "Track view"
-msgstr "Vista de traciar"
-
-#: templates/structure/row_stats_table.phtml:3
-msgid "Row statistics"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:9
-msgid "static"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:11
-msgid "dynamic"
-msgstr "dynamic"
-
-#: templates/structure/row_stats_table.phtml:22
-msgid "partitioned"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:54
-msgid "Row length"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:66
-msgid "Row size"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:73
-msgid "Next autoindex"
-msgstr ""
-
-#: templates/structure/secondary_tabs.phtml:14
-msgid "Relation view"
-msgstr "Vista relational"
-
-#: templates/structure/show_create.phtml:2
-msgid "Showing create queries"
-msgstr ""
-
-#: templates/structure/sortable_header.phtml:13
-msgid "Sort"
-msgstr "Ordina"
-
-#: templates/structure/table_header.phtml:42
-msgid ""
-"May be approximate. Click on the number to get the exact count. See "
-"[doc@faq3-11]FAQ 3.11[/doc]."
-msgstr ""
-"Il pote esser approximate. Pulsa sur le numero pro obtener le computo "
-"exacte. Vide[doc@faq3-11]FAQ 3.11[/doc]."
-
-#: templates/structure/table_structure_row.phtml:46
-#, php-format
-msgid "Column %s has been dropped."
-msgstr ""
-
-#: templates/structure/tracking_icon.phtml:4
-msgid "Tracking is active."
-msgstr ""
-
-#: templates/structure/tracking_icon.phtml:8
-msgid "Tracking is not active."
-msgstr ""
-
-#: templates/table/create_table.phtml:15
-msgid "Number of columns"
-msgstr "Numero de columnas"
-
-#: templates/table/options.phtml:8
-msgid "Select columns (at least one):"
-msgstr "Selige columnas (al minus uno):"
-
-#: templates/table/options.phtml:37
-msgid "Add search conditions (body of the \"where\" clause):"
-msgstr "Adde conditiones (corpore del clausula \"where\"):"
-
-#: templates/table/options.phtml:45
-msgid "Number of rows per page"
-msgstr "Numero de rangos per pagina"
-
-#: templates/table/options.phtml:56
-msgid "Display order:"
-msgstr "Ordine de monstrar:"
-
-#: templates/table/options_zoom.phtml:6
-msgid "Use this column to label each point"
-msgstr "Usa iste columna pro etiquettar cata puncto"
-
-#: templates/table/options_zoom.phtml:35
-msgid "Maximum rows to plot"
-msgstr "Maxime rangos de designar"
-
-#: templates/table/replace_preview.phtml:13
-msgid "Find and replace - preview"
-msgstr "Trova e reimplacia - vista preliminar"
-
-#: templates/table/replace_preview.phtml:18
-msgid "Original string"
-msgstr "Catena original"
-
-#: templates/table/replace_preview.phtml:19
-msgid "Replaced string"
-msgstr "Catena reimplaciate"
-
-#: templates/table/replace_preview.phtml:40
-msgid "Replace"
-msgstr "Reimplacia"
-
-#: templates/table/rows_zoom.phtml:16
-msgid "Additional search criteria"
-msgstr "Ulterior criterios de cerca"
-
-#: templates/table/search_and_replace.phtml:3
-msgid "Replace with:"
-msgstr "Reimplacia con:"
-
-#: templates/table/search_and_replace.phtml:22
-msgid "Use regular expression"
-msgstr "Usa expression regular"
-
-#: templates/table/selection_form.phtml:12
-msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
-msgstr ""
-"Executa un \"query ab exemplo\" (metacharacter \"%s\") pro duo columnas "
-"differente"
-
-#: templates/table/selection_form.phtml:34
-msgid "Do a \"query by example\" (wildcard: \"%\")"
-msgstr "Executa un \"query ab exemplo\"(metacharacter: \"%\")"
-
-#: templates/table/zoom_result_form.phtml:7
-msgid "Browse/Edit the points"
-msgstr "Naviga/Modifica le punctos"
-
-#: templates/table/zoom_result_form.phtml:15
-msgid "How to use"
-msgstr "Como usar"
-
-#: templates/table/zoom_result_form.phtml:23
-msgid "Reset zoom"
-msgstr "Refixa le zoom"
-
-#: templates/tbl_chart.phtml:17
+#: templates/table/chart/tbl_chart.phtml:17
 msgctxt "Chart type"
 msgid "Bar"
 msgstr "Barra"
 
-#: templates/tbl_chart.phtml:21
+#: templates/table/chart/tbl_chart.phtml:21
 msgctxt "Chart type"
 msgid "Column"
 msgstr "Columna"
 
-#: templates/tbl_chart.phtml:25
+#: templates/table/chart/tbl_chart.phtml:25
 msgctxt "Chart type"
 msgid "Line"
 msgstr "Linea"
 
-#: templates/tbl_chart.phtml:29
+#: templates/table/chart/tbl_chart.phtml:29
 msgctxt "Chart type"
 msgid "Spline"
 msgstr ""
 
-#: templates/tbl_chart.phtml:33
+#: templates/table/chart/tbl_chart.phtml:33
 msgctxt "Chart type"
 msgid "Area"
 msgstr "Area"
 
-#: templates/tbl_chart.phtml:37
+#: templates/table/chart/tbl_chart.phtml:37
 msgctxt "Chart type"
 msgid "Pie"
 msgstr ""
 
-#: templates/tbl_chart.phtml:41
+#: templates/table/chart/tbl_chart.phtml:41
 msgctxt "Chart type"
 msgid "Timeline"
 msgstr "Chronologia"
 
-#: templates/tbl_chart.phtml:45
+#: templates/table/chart/tbl_chart.phtml:45
 msgctxt "Chart type"
 msgid "Scatter"
 msgstr ""
 
-#: templates/tbl_chart.phtml:50
+#: templates/table/chart/tbl_chart.phtml:50
 msgid "Stacked"
 msgstr ""
 
-#: templates/tbl_chart.phtml:53
+#: templates/table/chart/tbl_chart.phtml:53
 msgid "Chart title"
 msgstr ""
 
-#: templates/tbl_chart.phtml:57
+#: templates/table/chart/tbl_chart.phtml:57
 msgid "X-Axis:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:72
+#: templates/table/chart/tbl_chart.phtml:72
 msgid "Series:"
 msgstr "Series:"
 
-#: templates/tbl_chart.phtml:102
+#: templates/table/chart/tbl_chart.phtml:102
 msgid "X-Axis label:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:104
+#: templates/table/chart/tbl_chart.phtml:104
 msgid "X Values"
 msgstr ""
 
-#: templates/tbl_chart.phtml:107
+#: templates/table/chart/tbl_chart.phtml:107
 msgid "Y-Axis label:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:115
+#: templates/table/chart/tbl_chart.phtml:115
 msgid "Series names are in a column"
 msgstr ""
 
-#: templates/tbl_chart.phtml:118
+#: templates/table/chart/tbl_chart.phtml:118
 msgid "Series column:"
 msgstr "Columna de series:"
 
-#: templates/tbl_chart.phtml:130
+#: templates/table/chart/tbl_chart.phtml:130
 msgid "Value Column:"
 msgstr "Columna de valor:"
 
-#: templates/tbl_chart.phtml:150
+#: templates/table/chart/tbl_chart.phtml:150
 msgid "Save chart as image"
 msgstr "Salveguarda diagramma como imagine"
 
-#: templates/tbl_relation/common_form.phtml:7
+#: templates/table/gis_visualization/gis_visualization.phtml:3
+msgid "Display GIS Visualization"
+msgstr ""
+
+#: templates/table/gis_visualization/gis_visualization.phtml:8
+msgid "Label column"
+msgstr "Etiquetta columna"
+
+#: templates/table/gis_visualization/gis_visualization.phtml:11
+msgid "-- None --"
+msgstr "-- Necun --"
+
+#: templates/table/gis_visualization/gis_visualization.phtml:19
+msgid "Spatial column"
+msgstr "Columna spatial"
+
+#: templates/table/index_form.phtml:16
+msgid "Index name:"
+msgstr "Nomine de indice:"
+
+#: templates/table/index_form.phtml:19
+msgid ""
+"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
+msgstr ""
+
+#: templates/table/index_form.phtml:40
+msgid "Index choice:"
+msgstr "Selection de indice:"
+
+#: templates/table/index_form.phtml:57
+msgid "Key block size:"
+msgstr ""
+
+#: templates/table/index_form.phtml:74
+msgid "Index type:"
+msgstr "Typo de indice:"
+
+#: templates/table/index_form.phtml:86
+msgid "Parser:"
+msgstr "Analysator (parser):"
+
+#: templates/table/index_form.phtml:102
+msgid "Comment:"
+msgstr "Commento:"
+
+#: templates/table/index_form.phtml:149 templates/table/index_form.phtml:190
+msgid "Drag to reorder"
+msgstr "Trahe pro reordinar"
+
+#: templates/table/relation/common_form.phtml:7
 msgid "Internal relations"
 msgstr "Relationes interne"
 
-#: templates/tbl_relation/common_form.phtml:11
+#: templates/table/relation/common_form.phtml:11
 msgid "Internal relation"
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:14
+#: templates/table/relation/common_form.phtml:14
 msgid ""
 "An internal relation is not necessary when a corresponding FOREIGN KEY "
 "relation exists."
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:37
+#: templates/table/relation/common_form.phtml:37
 msgid "Foreign key constraints"
 msgstr "Limites de clave externe"
 
-#: templates/tbl_relation/common_form.phtml:40
+#: templates/table/relation/common_form.phtml:40
 msgid "Actions"
 msgstr "Actiones"
 
-#: templates/tbl_relation/common_form.phtml:41
+#: templates/table/relation/common_form.phtml:41
 msgid "Constraint properties"
 msgstr "Limita proprietates"
 
-#: templates/tbl_relation/common_form.phtml:44
+#: templates/table/relation/common_form.phtml:44
 msgid ""
 "Only columns with index will be displayed. You can define an index below."
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:49
+#: templates/table/relation/common_form.phtml:49
 msgid "Foreign key constraint"
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:81
+#: templates/table/relation/common_form.phtml:81
 msgid "+ Add constraint"
 msgstr "+ Adde un limite"
 
-#: templates/tbl_relation/common_form.phtml:91
+#: templates/table/relation/common_form.phtml:91
 msgid "Choose column to display:"
 msgstr "Selige columna de monstrar:"
 
-#: templates/tbl_relation/foreign_key_row.phtml:13
+#: templates/table/relation/foreign_key_row.phtml:13
 #, php-format
 msgid "Foreign key constraint %s has been dropped"
 msgstr "Limites de clave externe %s ha essite abandonate"
 
-#: templates/tbl_relation/foreign_key_row.phtml:102
+#: templates/table/relation/foreign_key_row.phtml:102
 msgid "Constraint name"
 msgstr ""
 
-#: templates/tbl_relation/foreign_key_row.phtml:157
+#: templates/table/relation/foreign_key_row.phtml:157
 msgid "+ Add column"
 msgstr "+ Adde columna"
 
+#: templates/table/search/options.phtml:8
+msgid "Select columns (at least one):"
+msgstr "Selige columnas (al minus uno):"
+
+#: templates/table/search/options.phtml:37
+msgid "Add search conditions (body of the \"where\" clause):"
+msgstr "Adde conditiones (corpore del clausula \"where\"):"
+
+#: templates/table/search/options.phtml:45
+msgid "Number of rows per page"
+msgstr "Numero de rangos per pagina"
+
+#: templates/table/search/options.phtml:56
+msgid "Display order:"
+msgstr "Ordine de monstrar:"
+
+#: templates/table/search/options_zoom.phtml:6
+msgid "Use this column to label each point"
+msgstr "Usa iste columna pro etiquettar cata puncto"
+
+#: templates/table/search/options_zoom.phtml:35
+msgid "Maximum rows to plot"
+msgstr "Maxime rangos de designar"
+
+#: templates/table/search/replace_preview.phtml:13
+msgid "Find and replace - preview"
+msgstr "Trova e reimplacia - vista preliminar"
+
+#: templates/table/search/replace_preview.phtml:18
+msgid "Original string"
+msgstr "Catena original"
+
+#: templates/table/search/replace_preview.phtml:19
+msgid "Replaced string"
+msgstr "Catena reimplaciate"
+
+#: templates/table/search/replace_preview.phtml:40
+msgid "Replace"
+msgstr "Reimplacia"
+
+#: templates/table/search/rows_zoom.phtml:16
+msgid "Additional search criteria"
+msgstr "Ulterior criterios de cerca"
+
+#: templates/table/search/search_and_replace.phtml:3
+msgid "Replace with:"
+msgstr "Reimplacia con:"
+
+#: templates/table/search/search_and_replace.phtml:22
+msgid "Use regular expression"
+msgstr "Usa expression regular"
+
+#: templates/table/search/selection_form.phtml:12
+msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
+msgstr ""
+"Executa un \"query ab exemplo\" (metacharacter \"%s\") pro duo columnas "
+"differente"
+
+#: templates/table/search/selection_form.phtml:34
+msgid "Do a \"query by example\" (wildcard: \"%\")"
+msgstr "Executa un \"query ab exemplo\"(metacharacter: \"%\")"
+
+#: templates/table/search/zoom_result_form.phtml:7
+msgid "Browse/Edit the points"
+msgstr "Naviga/Modifica le punctos"
+
+#: templates/table/search/zoom_result_form.phtml:15
+msgid "How to use"
+msgstr "Como usar"
+
+#: templates/table/search/zoom_result_form.phtml:23
+msgid "Reset zoom"
+msgstr "Refixa le zoom"
+
+#: templates/table/secondary_tabs.phtml:14
+msgid "Relation view"
+msgstr "Vista relational"
+
+#: templates/table/structure/actions_in_table_structure.phtml:14
+#, php-format
+msgid "A primary key has been added on %s."
+msgstr ""
+
+#: templates/table/structure/actions_in_table_structure.phtml:34
+#: templates/table/structure/actions_in_table_structure.phtml:54
+#: templates/table/structure/actions_in_table_structure.phtml:79
+#: templates/table/structure/actions_in_table_structure.phtml:101
+#, php-format
+msgid "An index has been added on %s."
+msgstr ""
+
+#: templates/table/structure/actions_in_table_structure.phtml:130
+#: templates/table/structure/check_all_table_column.phtml:59
+msgid "Remove from central columns"
+msgstr "Remove ex le columnas central"
+
+#: templates/table/structure/actions_in_table_structure.phtml:138
+#: templates/table/structure/check_all_table_column.phtml:55
+msgid "Add to central columns"
+msgstr "Adde al columnas central"
+
+#: templates/table/structure/add_column.phtml:7
+#, php-format
+msgid "Add %s column(s)"
+msgstr "Adde %s columna(s)"
+
+#: templates/table/structure/add_column.phtml:12
+msgid "at beginning of table"
+msgstr "a le initio de tabella"
+
+#: templates/table/structure/display_structure.phtml:140 view_create.php:181
+msgid "Edit view"
+msgstr ""
+
+#: templates/table/structure/display_table_stats.phtml:9
+msgid "Space usage"
+msgstr ""
+
+#: templates/table/structure/display_table_stats.phtml:32
+msgid "Effective"
+msgstr "Effective"
+
+#: templates/table/structure/move_columns_dialog.phtml:1
+#: templates/table/structure/optional_action_links.phtml:21
+msgid "Move columns"
+msgstr ""
+
+#: templates/table/structure/move_columns_dialog.phtml:2
+msgid "Move the columns by dragging them up and down."
+msgstr ""
+
+#: templates/table/structure/optional_action_links.phtml:9
+msgid "Propose table structure"
+msgstr ""
+
+#: templates/table/structure/optional_action_links.phtml:24
+msgid "Improve table structure"
+msgstr "Meliora structura de tabella"
+
+#: templates/table/structure/optional_action_links.phtml:30
+msgid "Track view"
+msgstr "Vista de traciar"
+
+#: templates/table/structure/row_stats_table.phtml:3
+msgid "Row statistics"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:9
+msgid "static"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:11
+msgid "dynamic"
+msgstr "dynamic"
+
+#: templates/table/structure/row_stats_table.phtml:22
+msgid "partitioned"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:54
+msgid "Row length"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:66
+msgid "Row size"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:73
+msgid "Next autoindex"
+msgstr ""
+
+#: templates/table/structure/table_structure_row.phtml:46
+#, php-format
+msgid "Column %s has been dropped."
+msgstr ""
+
 #: themes.php:17 themes.php:22
 msgid "Theme"
 msgstr "Thema"
@@ -16344,6 +16368,9 @@ msgstr ""
 msgid "concurrent_insert is set to 0"
 msgstr "concurrent_insert - insertion concurrente- es ponite a 0"
 
+#~ msgid "Read as multibytes"
+#~ msgstr "Lege como multibytes"
+
 #~ msgid "Relational display column"
 #~ msgstr "Columna de monstra relational"
 
diff --git a/po/id.po b/po/id.po
index 2730866de3..97dfbc478a 100644
--- a/po/id.po
+++ b/po/id.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 4.5.0-dev\n"
 "Report-Msgid-Bugs-To: developers@phpmyadmin.net\n"
-"POT-Creation-Date: 2015-08-08 13:53-0400\n"
+"POT-Creation-Date: 2015-08-12 08:10-0400\n"
 "PO-Revision-Date: 2015-06-17 06:05+0200\n"
 "Last-Translator: Tommy Surbakti <tommy@surbakti.net>\n"
 "Language-Team: Indonesian <https://hosted.weblate.org/projects/phpmyadmin/"
@@ -54,7 +54,7 @@ msgid "Table comments:"
 msgstr "Komentar tabel:"
 
 #: db_datadict.php:104 libraries/Index.class.php:699
-#: libraries/insert_edit.lib.php:1567
+#: libraries/insert_edit.lib.php:1565
 #: libraries/navigation/Nodes/Node_Column.class.php:30
 #: libraries/plugins/export/ExportHtmlword.class.php:280
 #: libraries/plugins/export/ExportHtmlword.class.php:375
@@ -68,13 +68,14 @@ msgstr "Komentar tabel:"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1023
 #: libraries/tracking.lib.php:879 libraries/tracking.lib.php:975
 #: templates/columns_definitions/column_name.phtml:18
-#: templates/index_form.phtml:124 templates/table/table_header.phtml:6
-#: templates/table/zoom_result_form.phtml:33
-#: templates/tbl_relation/common_form.phtml:10
-#: templates/tbl_relation/common_form.phtml:43
-#: templates/tbl_relation/foreign_key_row.phtml:194
-#: templates/tbl_relation/foreign_key_row.phtml:206
-#: templates/tbl_relation/internal_relational_row.phtml:71
+#: templates/table/index_form.phtml:124
+#: templates/table/relation/common_form.phtml:10
+#: templates/table/relation/common_form.phtml:43
+#: templates/table/relation/foreign_key_row.phtml:194
+#: templates/table/relation/foreign_key_row.phtml:206
+#: templates/table/relation/internal_relational_row.phtml:71
+#: templates/table/search/table_header.phtml:6
+#: templates/table/search/zoom_result_form.phtml:33
 msgid "Column"
 msgstr "Kolom"
 
@@ -92,21 +93,21 @@ msgstr "Kolom"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1001
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1024
 #: libraries/rte/rte_list.lib.php:75 libraries/rte/rte_list.lib.php:103
-#: libraries/rte/rte_routines.lib.php:802
-#: libraries/rte/rte_routines.lib.php:831
-#: libraries/rte/rte_routines.lib.php:1493
+#: libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_routines.lib.php:922
+#: libraries/rte/rte_routines.lib.php:1584
 #: libraries/server_privileges.lib.php:2369 libraries/tracking.lib.php:880
 #: libraries/tracking.lib.php:972
 #: templates/columns_definitions/table_fields_definitions.phtml:11
-#: templates/structure/table_header.phtml:48
-#: templates/structure/table_structure_header.phtml:6
-#: templates/table/table_header.phtml:7
+#: templates/database/structure/table_header.phtml:48
+#: templates/table/search/table_header.phtml:7
+#: templates/table/structure/table_structure_header.phtml:6
 msgid "Type"
 msgstr "Jenis"
 
 #: db_datadict.php:106 libraries/Index.class.php:702
 #: libraries/central_columns.lib.php:708
-#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1576
+#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1574
 #: libraries/plugins/export/ExportHtmlword.class.php:286
 #: libraries/plugins/export/ExportHtmlword.class.php:381
 #: libraries/plugins/export/ExportLatex.class.php:509
@@ -119,8 +120,8 @@ msgstr "Jenis"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1026
 #: libraries/tracking.lib.php:882 libraries/tracking.lib.php:978
 #: templates/columns_definitions/table_fields_definitions.phtml:39
-#: templates/structure/table_structure_header.phtml:9
-#: templates/table/zoom_result_form.phtml:34
+#: templates/table/search/zoom_result_form.phtml:34
+#: templates/table/structure/table_structure_header.phtml:9
 msgid "Null"
 msgstr "Kosong"
 
@@ -138,8 +139,8 @@ msgstr "Kosong"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1027
 #: libraries/replication_gui.lib.php:153 libraries/tracking.lib.php:883
 #: templates/columns_definitions/table_fields_definitions.phtml:25
-#: templates/structure/body_for_table_summary.phtml:55
-#: templates/structure/table_structure_header.phtml:10
+#: templates/database/structure/body_for_table_summary.phtml:55
+#: templates/table/structure/table_structure_header.phtml:10
 msgid "Default"
 msgstr "Bawaan"
 
@@ -167,19 +168,19 @@ msgid "Comments"
 msgstr "Komentar"
 
 #: db_datadict.php:146
-#: libraries/controllers/StructureController.class.php:1960
-#: libraries/controllers/StructureController.class.php:1965
+#: libraries/controllers/TableStructureController.class.php:951
+#: libraries/controllers/TableStructureController.class.php:956
 #: libraries/tracking.lib.php:922
 #: templates/columns_definitions/column_indexes.phtml:6
-#: templates/structure/check_all_table_column.phtml:22
-#: templates/structure/display_structure.phtml:74
+#: templates/table/structure/check_all_table_column.phtml:22
+#: templates/table/structure/display_structure.phtml:74
 msgid "Primary"
 msgstr "Kunci Utama"
 
 #: db_datadict.php:156 js/messages.php:317 libraries/Index.class.php:567
 #: libraries/Index.class.php:606 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261 libraries/mult_submits.lib.php:403
+#: libraries/config/FormDisplay.tpl.php:272 libraries/mult_submits.lib.php:403
 #: libraries/mult_submits.lib.php:417
 #: libraries/plugins/export/ExportHtmlword.class.php:630
 #: libraries/plugins/export/ExportLatex.class.php:589
@@ -195,20 +196,20 @@ msgstr "Kunci Utama"
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1010 libraries/tracking.lib.php:1015
 #: prefs_manage.php:140 templates/prefs_autoload.phtml:15
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "No"
 msgstr "Tidak"
 
 #: db_datadict.php:156 js/messages.php:443 libraries/Index.class.php:568
 #: libraries/Index.class.php:605 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261
-#: libraries/controllers/StructureController.class.php:1344
-#: libraries/controllers/StructureController.class.php:2223
-#: libraries/controllers/StructureController.class.php:2232
-#: libraries/controllers/StructureController.class.php:2237
-#: libraries/controllers/StructureController.class.php:2242
-#: libraries/controllers/StructureController.class.php:2247
+#: libraries/config/FormDisplay.tpl.php:272
+#: libraries/controllers/TableStructureController.class.php:539
+#: libraries/controllers/TableStructureController.class.php:1201
+#: libraries/controllers/TableStructureController.class.php:1210
+#: libraries/controllers/TableStructureController.class.php:1215
+#: libraries/controllers/TableStructureController.class.php:1220
+#: libraries/controllers/TableStructureController.class.php:1225
 #: libraries/mult_submits.inc.php:82 libraries/mult_submits.inc.php:178
 #: libraries/mult_submits.lib.php:339 libraries/mult_submits.lib.php:372
 #: libraries/mult_submits.lib.php:401 libraries/mult_submits.lib.php:415
@@ -217,8 +218,8 @@ msgstr "Tidak"
 #: libraries/plugins/export/ExportOdt.class.php:756
 #: libraries/plugins/export/ExportTexytext.class.php:567
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1077
-#: libraries/server_databases.lib.php:464
-#: libraries/server_databases.lib.php:474
+#: libraries/server_databases.lib.php:475
+#: libraries/server_databases.lib.php:485
 #: libraries/server_privileges.lib.php:2546
 #: libraries/server_privileges.lib.php:2727
 #: libraries/server_privileges.lib.php:2748
@@ -228,7 +229,7 @@ msgstr "Tidak"
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1008 libraries/tracking.lib.php:1013
 #: prefs_manage.php:138 templates/prefs_autoload.phtml:14
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "Yes"
 msgstr "Ya"
 
@@ -238,7 +239,7 @@ msgstr "Tampilkan dump (skema) dari database"
 
 #: db_export.php:37 db_tracking.php:90 export.php:382
 #: libraries/DBQbe.class.php:326
-#: libraries/controllers/StructureController.class.php:231
+#: libraries/controllers/DatabaseStructureController.class.php:170
 #: libraries/navigation/NavigationTree.class.php:897
 msgid "No tables found in database."
 msgstr "Tabel tidak ditemukan di database."
@@ -249,14 +250,14 @@ msgstr "Tabel tidak ditemukan di database."
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:26
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:120
-#: templates/structure/show_create.phtml:18
+#: templates/database/structure/show_create.phtml:18
 msgid "Tables"
 msgstr "Tabel"
 
 #: db_export.php:52 libraries/Menu.class.php:317 libraries/Menu.class.php:425
-#: libraries/Util.class.php:3333 libraries/Util.class.php:3343
-#: libraries/Util.class.php:3349 libraries/Util.class.php:3629
-#: libraries/Util.class.php:4327 libraries/Util.class.php:4344
+#: libraries/Util.class.php:3339 libraries/Util.class.php:3349
+#: libraries/Util.class.php:3355 libraries/Util.class.php:3635
+#: libraries/Util.class.php:4333 libraries/Util.class.php:4350
 #: libraries/central_columns.lib.php:728 libraries/config.values.php:39
 #: libraries/config.values.php:47 libraries/config.values.php:109
 #: libraries/config.values.php:115 libraries/config/setup.forms.php:323
@@ -270,7 +271,7 @@ msgstr "Tabel"
 #: libraries/navigation/Nodes/Node_Table.class.php:283
 #: libraries/server_privileges.lib.php:1141 libraries/tracking.lib.php:874
 #: templates/columns_definitions/table_fields_definitions.phtml:3
-#: templates/designer/table_list.phtml:28
+#: templates/database/designer/table_list.phtml:28
 msgid "Structure"
 msgstr "Struktur"
 
@@ -282,7 +283,7 @@ msgstr "Struktur"
 #: libraries/config/user_preferences.forms.php:292
 #: libraries/config/user_preferences.forms.php:297
 #: libraries/server_privileges.lib.php:1140
-#: templates/structure/display_table_stats.phtml:12
+#: templates/table/structure/display_table_stats.phtml:12
 msgid "Data"
 msgstr "Data"
 
@@ -356,10 +357,10 @@ msgstr "Tabel yang dilacak"
 #: libraries/server_privileges.lib.php:2908
 #: libraries/server_privileges.lib.php:3145
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4346
-#: templates/structure/table_header.phtml:21
-#: templates/tbl_relation/foreign_key_row.phtml:176
-#: templates/tbl_relation/internal_relational_row.phtml:63
+#: libraries/server_privileges.lib.php:4372
+#: templates/database/structure/table_header.phtml:21
+#: templates/table/relation/foreign_key_row.phtml:176
+#: templates/table/relation/internal_relational_row.phtml:63
 msgid "Table"
 msgstr "Tabel"
 
@@ -376,7 +377,7 @@ msgid "Updated"
 msgstr "Diperbarui"
 
 #: db_tracking.php:130 js/messages.php:243 libraries/Menu.class.php:552
-#: libraries/Util.class.php:4314 libraries/config.values.php:104
+#: libraries/Util.class.php:4320 libraries/config.values.php:104
 #: libraries/rte/rte_events.lib.php:393 libraries/rte/rte_list.lib.php:101
 #: libraries/server_status_processes.lib.php:92 libraries/tracking.lib.php:279
 msgid "Status"
@@ -385,14 +386,15 @@ msgstr "Status"
 #: db_tracking.php:131 db_tracking.php:290 libraries/Index.class.php:693
 #: libraries/central_columns.lib.php:687 libraries/rte/rte_list.lib.php:74
 #: libraries/rte/rte_list.lib.php:89 libraries/rte/rte_list.lib.php:102
-#: libraries/server_databases.lib.php:398
+#: libraries/server_databases.lib.php:409
 #: libraries/server_privileges.lib.php:2372
 #: libraries/server_privileges.lib.php:3166
 #: libraries/server_privileges.lib.php:3342
 #: libraries/server_user_groups.lib.php:82
 #: libraries/server_variables.lib.php:189 libraries/tracking.lib.php:280
-#: libraries/tracking.lib.php:793 templates/structure/table_header.phtml:30
-#: templates/structure/table_structure_header.phtml:23
+#: libraries/tracking.lib.php:793
+#: templates/database/structure/table_header.phtml:30
+#: templates/table/structure/table_structure_header.phtml:23
 msgid "Action"
 msgstr "Tindakan"
 
@@ -434,7 +436,7 @@ msgid "Untracked tables"
 msgstr "Tabel yang tidak dilacak"
 
 #: db_tracking.php:305 db_tracking.php:336
-#: templates/structure/optional_action_links.phtml:17
+#: templates/table/structure/optional_action_links.phtml:17
 msgid "Track table"
 msgstr "Lacak tabel"
 
@@ -489,7 +491,7 @@ msgid "Value for the column \"%s\""
 msgstr "Nilai untuk kolom \"%s\""
 
 #: gis_data_editor.php:146
-#: templates/gis_visualization/gis_visualization.phtml:37
+#: templates/table/gis_visualization/gis_visualization.phtml:37
 msgid "Use OpenStreetMaps as Base Layer"
 msgstr "Gunakan OpenStreetMaps sebagai Lapisan Dasar"
 
@@ -569,35 +571,35 @@ msgstr "Tambahkan geometri"
 #: libraries/display_change_password.lib.php:162
 #: libraries/display_export.lib.php:402 libraries/display_export.lib.php:408
 #: libraries/display_import.lib.php:392 libraries/index.lib.php:44
-#: libraries/insert_edit.lib.php:1546 libraries/insert_edit.lib.php:1583
+#: libraries/insert_edit.lib.php:1544 libraries/insert_edit.lib.php:1581
 #: libraries/normalization.lib.php:165 libraries/normalization.lib.php:821
 #: libraries/operations.lib.php:38 libraries/operations.lib.php:108
 #: libraries/operations.lib.php:263 libraries/operations.lib.php:306
 #: libraries/operations.lib.php:801 libraries/operations.lib.php:874
 #: libraries/operations.lib.php:923 libraries/operations.lib.php:1337
 #: libraries/operations.lib.php:1658
-#: libraries/plugins/auth/AuthenticationCookie.class.php:244
+#: libraries/plugins/auth/AuthenticationCookie.class.php:232
 #: libraries/replication_gui.lib.php:122 libraries/replication_gui.lib.php:161
 #: libraries/replication_gui.lib.php:324 libraries/replication_gui.lib.php:461
 #: libraries/replication_gui.lib.php:906 libraries/rte/rte_events.lib.php:509
-#: libraries/rte/rte_routines.lib.php:969
-#: libraries/rte/rte_routines.lib.php:1581
+#: libraries/rte/rte_routines.lib.php:1060
+#: libraries/rte/rte_routines.lib.php:1672
 #: libraries/rte/rte_triggers.lib.php:396 libraries/server_bin_log.lib.php:61
 #: libraries/server_privileges.lib.php:705
 #: libraries/server_privileges.lib.php:2106
 #: libraries/server_privileges.lib.php:2872
 #: libraries/server_privileges.lib.php:3553
-#: libraries/server_privileges.lib.php:4627
+#: libraries/server_privileges.lib.php:4653
 #: libraries/server_user_groups.lib.php:285
 #: libraries/sql_query_form.lib.php:369 libraries/sql_query_form.lib.php:429
 #: libraries/tracking.lib.php:533 libraries/tracking.lib.php:653
 #: prefs_manage.php:277 prefs_manage.php:355
 #: templates/columns_definitions/column_definitions_form.phtml:59
-#: templates/header_location.phtml:17 templates/index_form.phtml:238
+#: templates/database/create_table.phtml:21 templates/header_location.phtml:28
 #: templates/startAndNumberOfRowsPanel.phtml:14
-#: templates/structure/add_column.phtml:25
-#: templates/table/create_table.phtml:21
-#: templates/table/selection_form.phtml:75 view_create.php:275
+#: templates/table/index_form.phtml:238
+#: templates/table/search/selection_form.phtml:75
+#: templates/table/structure/add_column.phtml:25 view_create.php:275
 #: view_operations.php:106
 msgid "Go"
 msgstr "Kirim"
@@ -688,7 +690,7 @@ msgstr ""
 msgid "Could not load import plugins, please check your installation!"
 msgstr "Tidak dapat memuat plugin import, harap periksa instalasi Anda!"
 
-#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1466
+#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1460
 #, php-format
 msgid "Bookmark %s has been created."
 msgstr "Bookmark %s telah dibuat."
@@ -728,11 +730,11 @@ msgstr ""
 msgid "Back"
 msgstr "Kembali"
 
-#: index.php:148 libraries/Footer.class.php:70
+#: index.php:149 libraries/Footer.class.php:70
 msgid "phpMyAdmin Demo Server"
 msgstr "Server demonstrasi phpMyAdmin"
 
-#: index.php:152
+#: index.php:153
 #, php-format
 msgid ""
 "You are using the demo server. You can do anything here, but please do not "
@@ -743,110 +745,110 @@ msgstr ""
 "tetapi harap jangan mengubah root, debian-sys-main dan pma users. Informasi "
 "lebih lanjut tersedia di %s."
 
-#: index.php:162
+#: index.php:163
 msgid "General Settings"
 msgstr "Pengaturan Umum"
 
-#: index.php:190 libraries/display_change_password.lib.php:50
+#: index.php:191 libraries/display_change_password.lib.php:50
 #: libraries/display_change_password.lib.php:53 user_password.php:247
 msgid "Change password"
 msgstr "Ubah Sandi"
 
-#: index.php:206
+#: index.php:207
 msgid "Server connection collation"
 msgstr "Penyortiran koneksi server"
 
-#: index.php:228
+#: index.php:229
 msgid "Appearance Settings"
 msgstr "Pengaturan Tampilan"
 
-#: index.php:258 prefs_manage.php:285
+#: index.php:259 prefs_manage.php:285
 msgid "More settings"
 msgstr "Pengaturan lain"
 
-#: index.php:279
+#: index.php:280
 msgid "Database server"
 msgstr "Server basis data"
 
-#: index.php:282 libraries/plugins/auth/AuthenticationCookie.class.php:181
+#: index.php:283 libraries/plugins/auth/AuthenticationCookie.class.php:169
 msgid "Server:"
 msgstr "Server:"
 
-#: index.php:286
+#: index.php:287
 msgid "Server type:"
 msgstr "Jenis server:"
 
-#: index.php:290 libraries/plugins/export/ExportLatex.class.php:212
+#: index.php:291 libraries/plugins/export/ExportLatex.class.php:212
 #: libraries/plugins/export/ExportSql.class.php:687
 #: libraries/plugins/export/ExportXml.class.php:189
 msgid "Server version:"
 msgstr "Versi Server:"
 
-#: index.php:296
+#: index.php:297
 msgid "Protocol version:"
 msgstr "Versi protokol:"
 
-#: index.php:300
+#: index.php:301
 msgid "User:"
 msgstr "Pengguna:"
 
-#: index.php:305
+#: index.php:306
 msgid "Server charset:"
 msgstr "Kumpulan karakter server:"
 
-#: index.php:320
+#: index.php:321
 msgid "Web server"
 msgstr "Server web"
 
-#: index.php:331
+#: index.php:332
 msgid "Database client version:"
 msgstr "Versi klien basis data:"
 
-#: index.php:335
+#: index.php:336
 msgid "PHP extension:"
 msgstr "Ekstensi PHP:"
 
-#: index.php:349
+#: index.php:350
 msgid "PHP version:"
 msgstr "PHP Versi:"
 
-#: index.php:360
+#: index.php:361
 msgid "Show PHP information"
 msgstr "Tampilkan informasi PHP"
 
-#: index.php:383
+#: index.php:384
 msgid "Version information:"
 msgstr "Informasi versi:"
 
-#: index.php:392 libraries/Util.class.php:432 libraries/Util.class.php:495
-#: libraries/config/FormDisplay.tpl.php:151
+#: index.php:393 libraries/Util.class.php:432 libraries/Util.class.php:495
+#: libraries/config/FormDisplay.tpl.php:162
 #: libraries/display_export.lib.php:577 libraries/engines/pbxt.lib.php:162
 #: libraries/navigation/NavigationHeader.class.php:196
 #: libraries/server_variables.lib.php:160
 msgid "Documentation"
 msgstr "Dokumentasi"
 
-#: index.php:399
+#: index.php:400
 msgid "Wiki"
 msgstr "Wiki"
 
-#: index.php:408
+#: index.php:409
 msgid "Official Homepage"
 msgstr "Situs resmi"
 
-#: index.php:415
+#: index.php:416
 msgid "Contribute"
 msgstr "Berkontribusi"
 
-#: index.php:422
+#: index.php:423
 msgid "Get support"
 msgstr "Dukungan"
 
-#: index.php:429
+#: index.php:430
 msgid "List of changes"
 msgstr "Daftar perubahan"
 
-#: index.php:451
+#: index.php:452
 msgid ""
 "You are connected as 'root' with no password, which corresponds to the "
 "default MySQL privileged account. Your MySQL server is running with this "
@@ -858,7 +860,7 @@ msgstr ""
 "tanpa sandi, server Anda terbuka lebar untuk suatu penyerangan. Disarankan "
 "untuk memperbaiki kelemahan keamanan (security hole) ini."
 
-#: index.php:468
+#: index.php:469
 msgid ""
 "You have enabled mbstring.func_overload in your PHP configuration. This "
 "option is incompatible with phpMyAdmin and might cause some data to be "
@@ -867,7 +869,7 @@ msgstr ""
 "Anda mengaktifkan Fungsi mbstring.func_overload pada konfigurasi PHP. "
 "Pilihan ini tidak cocok dengan phpMyAdmin dan mampu merusak sebagian data!"
 
-#: index.php:483
+#: index.php:484
 msgid ""
 "The mbstring PHP extension was not found and you seem to be using a "
 "multibyte charset. Without the mbstring extension phpMyAdmin is unable to "
@@ -878,7 +880,7 @@ msgstr ""
 "baris-baris dengan cara yang benar. Hal ini mampu mengakibatkan hasil yang "
 "tidak diinginkan."
 
-#: index.php:500
+#: index.php:501
 msgid ""
 "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini."
 "session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower than "
@@ -891,7 +893,7 @@ msgstr ""
 "login anda mungkin dapat berakhir lebih cepat daripada konfigurasi "
 "phpMyAdmin."
 
-#: index.php:519
+#: index.php:520
 msgid ""
 "Login cookie store is lower than cookie validity configured in phpMyAdmin, "
 "because of this, your login will expire sooner than configured in phpMyAdmin."
@@ -900,12 +902,12 @@ msgstr ""
 "phpMyAdmin, karenanya, login anda akan lebih cepat berakhir daripada "
 "konfigurasi phpMyAdmin."
 
-#: index.php:535
+#: index.php:536
 msgid "The configuration file now needs a secret passphrase (blowfish_secret)."
 msgstr ""
 "File konfigurasi membutuhkan susunan kata-kata rahasia (blowfish_secret)."
 
-#: index.php:548
+#: index.php:549
 msgid ""
 "Directory [code]config[/code], which is used by the setup script, still "
 "exists in your phpMyAdmin directory. It is strongly recommended to remove it "
@@ -917,7 +919,7 @@ msgstr ""
 "phpMyAdmin dikonfigurasi. Atau keamanan server anda bisa dimasuki orang lain "
 "dan mengunduh konfigurasi anda"
 
-#: index.php:564
+#: index.php:565
 #, php-format
 msgid ""
 "The phpMyAdmin configuration storage is not completely configured, some "
@@ -926,14 +928,14 @@ msgstr ""
 "Penyimpanan konfigurasi phpMyAdmin belum sempurna, beberapa fitur untuk "
 "sementara dimatikan. %sCari tahu mengapa%s. "
 
-#: index.php:571
+#: index.php:572
 msgid ""
 "Or alternately go to 'Operations' tab of any database to set it up there."
 msgstr ""
 "Sebagai alternatif pergilah ke tab 'Operator' dari sebarang database untuk "
 "menatanya di sana."
 
-#: index.php:620
+#: index.php:621
 #, php-format
 msgid ""
 "Your PHP MySQL library version %s differs from your MySQL server version %s. "
@@ -942,7 +944,7 @@ msgstr ""
 "Versi pustaka MySQL pada PHP anda %s sedangkan versi server MySQL %s. Ini "
 "dapat menyebabkan perilaku tak terduga."
 
-#: index.php:648
+#: index.php:649
 #, php-format
 msgid ""
 "Server running with Suhosin. Please refer to %sdocumentation%s for possible "
@@ -1091,8 +1093,8 @@ msgstr ""
 msgid "Save & Close"
 msgstr "Simpan & Tutup"
 
-#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:404
-#: libraries/insert_edit.lib.php:1550 prefs_manage.php:361
+#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:415
+#: libraries/insert_edit.lib.php:1548 prefs_manage.php:361
 #: prefs_manage.php:372
 msgid "Reset"
 msgstr "Reset"
@@ -1125,7 +1127,7 @@ msgstr "Tambah indek"
 msgid "Edit Index"
 msgstr "Mengedit Indeks"
 
-#: js/messages.php:99 templates/index_form.phtml:232
+#: js/messages.php:99 templates/table/index_form.phtml:232
 #, php-format
 msgid "Add %s column(s) to index"
 msgstr "Tambahkan %s kolom ke index"
@@ -1146,13 +1148,14 @@ msgstr "Gabung dengan:"
 msgid "Please select column(s) for the index."
 msgstr "Pilih kolom untuk di index."
 
-#: js/messages.php:106 templates/structure/add_column.phtml:1
+#: js/messages.php:106 templates/table/structure/add_column.phtml:1
 msgid "You have to add at least one column."
 msgstr "Anda perlu menambahkan paling tidak satu kolom."
 
-#: js/messages.php:109 libraries/insert_edit.lib.php:1548
+#: js/messages.php:109 libraries/insert_edit.lib.php:1546
 #: templates/columns_definitions/column_definitions_form.phtml:162
-#: templates/index_form.phtml:237 templates/tbl_relation/common_form.phtml:106
+#: templates/table/index_form.phtml:237
+#: templates/table/relation/common_form.phtml:106
 msgid "Preview SQL"
 msgstr "Pratinjau SQL"
 
@@ -1169,7 +1172,7 @@ msgid "SQL query:"
 msgstr "Query SQL:"
 
 #. l10n: Default label for the y-Axis of Charts
-#: js/messages.php:118 templates/tbl_chart.phtml:109
+#: js/messages.php:118 templates/table/chart/tbl_chart.phtml:109
 msgid "Y Values"
 msgstr "Nilai Y"
 
@@ -1329,7 +1332,7 @@ msgstr "Bita dikirim"
 msgid "Bytes received"
 msgstr "Bita diterima"
 
-#: js/messages.php:169 libraries/server_status.lib.php:226
+#: js/messages.php:169 libraries/server_status.lib.php:235
 msgid "Connections"
 msgstr "Koneksi"
 
@@ -1386,12 +1389,12 @@ msgstr "%d tabel"
 msgid "Questions"
 msgstr "Perintah"
 
-#: js/messages.php:184 libraries/server_status.lib.php:134
+#: js/messages.php:184 libraries/server_status.lib.php:143
 msgid "Traffic"
 msgstr "Lalu Lintas"
 
 #: js/messages.php:185 libraries/Menu.class.php:586
-#: libraries/Util.class.php:4318 libraries/server_status_monitor.lib.php:257
+#: libraries/Util.class.php:4324 libraries/server_status_monitor.lib.php:257
 msgid "Settings"
 msgstr "Pengaturan"
 
@@ -1411,8 +1414,9 @@ msgstr "Harap tambahkan paling tidak satu variabel ke dalam seri!"
 #: libraries/server_status_monitor.lib.php:236
 #: libraries/server_status_processes.lib.php:308
 #: templates/columns_definitions/transformation.phtml:4
-#: templates/designer/options_panel.phtml:178
-#: templates/table/options_zoom.phtml:12 templates/table/rows_zoom.phtml:26
+#: templates/database/designer/options_panel.phtml:178
+#: templates/table/search/options_zoom.phtml:12
+#: templates/table/search/rows_zoom.phtml:26
 msgid "None"
 msgstr "Tidak ada"
 
@@ -1698,8 +1702,8 @@ msgstr ""
 
 #: js/messages.php:270 libraries/Menu.class.php:352
 #: libraries/Menu.class.php:455 libraries/Menu.class.php:582
-#: libraries/Util.class.php:4317 libraries/Util.class.php:4332
-#: libraries/Util.class.php:4349 libraries/config/messages.inc.php:258
+#: libraries/Util.class.php:4323 libraries/Util.class.php:4338
+#: libraries/Util.class.php:4355 libraries/config/messages.inc.php:258
 #: libraries/display_import.lib.php:105
 #: libraries/server_status_monitor.lib.php:318 prefs_manage.php:238
 #: setup/frames/menu.inc.php:26
@@ -1759,13 +1763,13 @@ msgid "Formatting SQL..."
 msgstr "Memformat SQL..."
 
 #: js/messages.php:293 libraries/server_variables.lib.php:157
-#: templates/designer/aggregate_query_panel.phtml:63
-#: templates/designer/delete_relation_panel.phtml:28
-#: templates/designer/having_query_panel.phtml:117
-#: templates/designer/new_relation_panel.phtml:88
-#: templates/designer/options_panel.phtml:253
-#: templates/designer/rename_to_panel.phtml:45
-#: templates/designer/where_query_panel.phtml:83
+#: templates/database/designer/aggregate_query_panel.phtml:63
+#: templates/database/designer/delete_relation_panel.phtml:28
+#: templates/database/designer/having_query_panel.phtml:117
+#: templates/database/designer/new_relation_panel.phtml:88
+#: templates/database/designer/options_panel.phtml:253
+#: templates/database/designer/rename_to_panel.phtml:45
+#: templates/database/designer/where_query_panel.phtml:83
 msgid "Cancel"
 msgstr "Batal"
 
@@ -1775,7 +1779,7 @@ msgstr "Batal"
 msgid "Page-related settings"
 msgstr "Ubah pengaturan"
 
-#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:402
+#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:413
 msgid "Apply"
 msgstr "Terapkan"
 
@@ -1810,8 +1814,8 @@ msgstr "Kode Kesalahan: %s"
 msgid "Error text: %s"
 msgstr "Pesan Kesalahan: %s"
 
-#: js/messages.php:307 libraries/db_common.inc.php:68
-#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:450
+#: js/messages.php:307 libraries/db_common.inc.php:69
+#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:461
 msgid "No databases selected."
 msgstr "Basis data belum dipilih."
 
@@ -1823,12 +1827,13 @@ msgstr "Menghapus Kolom"
 msgid "Adding Primary Key"
 msgstr "Menambahkan Kunci Primer"
 
-#: js/messages.php:310 templates/designer/aggregate_query_panel.phtml:59
-#: templates/designer/having_query_panel.phtml:113
-#: templates/designer/new_relation_panel.phtml:87
-#: templates/designer/options_panel.phtml:252
-#: templates/designer/rename_to_panel.phtml:41
-#: templates/designer/where_query_panel.phtml:82
+#: js/messages.php:310
+#: templates/database/designer/aggregate_query_panel.phtml:59
+#: templates/database/designer/having_query_panel.phtml:113
+#: templates/database/designer/new_relation_panel.phtml:87
+#: templates/database/designer/options_panel.phtml:252
+#: templates/database/designer/rename_to_panel.phtml:41
+#: templates/database/designer/where_query_panel.phtml:82
 msgid "OK"
 msgstr "Oke"
 
@@ -1848,7 +1853,7 @@ msgstr "Menyalin Basis Data"
 msgid "Changing Charset"
 msgstr "Mengganti Set Karakter"
 
-#: js/messages.php:320 libraries/Util.class.php:3217
+#: js/messages.php:320 libraries/Util.class.php:3223
 #, fuzzy
 #| msgid "Disable foreign key checks"
 msgid "Enable foreign key checks"
@@ -1885,20 +1890,21 @@ msgstr "Definisi fungsi disimpan harus mengandung pernyataan RETURN!"
 #: js/messages.php:334 libraries/DisplayResults.class.php:4834
 #: libraries/DisplayResults.class.php:5092 libraries/Menu.class.php:344
 #: libraries/Menu.class.php:446 libraries/Menu.class.php:578
-#: libraries/Util.class.php:3636 libraries/Util.class.php:3637
-#: libraries/Util.class.php:4316 libraries/Util.class.php:4331
-#: libraries/Util.class.php:4348 libraries/config/messages.inc.php:252
+#: libraries/Util.class.php:3642 libraries/Util.class.php:3643
+#: libraries/Util.class.php:4322 libraries/Util.class.php:4337
+#: libraries/Util.class.php:4354 libraries/config/messages.inc.php:252
 #: libraries/display_export.lib.php:173 libraries/rte/rte_list.lib.php:146
 #: libraries/server_privileges.lib.php:2211
 #: libraries/server_privileges.lib.php:2290
 #: libraries/server_privileges.lib.php:2632
 #: libraries/server_privileges.lib.php:3356
 #: libraries/server_status_monitor.lib.php:322 prefs_manage.php:303
-#: setup/frames/menu.inc.php:27 templates/structure/check_all_tables.phtml:11
+#: setup/frames/menu.inc.php:27
+#: templates/database/structure/check_all_tables.phtml:11
 msgid "Export"
 msgstr "Ekspor"
 
-#: js/messages.php:337 libraries/rte/rte_routines.lib.php:652
+#: js/messages.php:337 libraries/rte/rte_routines.lib.php:743
 msgid "ENUM/SET editor"
 msgstr "Editor ENUM/SET"
 
@@ -1939,7 +1945,7 @@ msgstr "Tampilkan kotak kueri"
 #: libraries/Console.class.php:214 libraries/DisplayResults.class.php:3474
 #: libraries/DisplayResults.class.php:4818 libraries/Index.class.php:723
 #: libraries/Util.class.php:706 libraries/Util.class.php:1202
-#: libraries/Util.class.php:3634 libraries/Util.class.php:3635
+#: libraries/Util.class.php:3640 libraries/Util.class.php:3641
 #: libraries/central_columns.lib.php:851
 #: libraries/central_columns.lib.php:1193
 #: libraries/config/messages.inc.php:892
@@ -1957,7 +1963,7 @@ msgstr "Ubah"
 #: libraries/server_user_groups.lib.php:129
 #: libraries/sql_query_form.lib.php:416 libraries/tracking.lib.php:477
 #: setup/frames/index.inc.php:183 setup/frames/index.inc.php:291
-#: templates/designer/delete_relation_panel.phtml:27
+#: templates/database/designer/delete_relation_panel.phtml:27
 msgid "Delete"
 msgstr "Hapus"
 
@@ -2127,11 +2133,11 @@ msgid "No dependencies selected!"
 msgstr "Dependensi belum dipilih!"
 
 #: js/messages.php:394 libraries/central_columns.lib.php:1214
-#: libraries/insert_edit.lib.php:1458 libraries/server_variables.lib.php:155
+#: libraries/insert_edit.lib.php:1456 libraries/server_variables.lib.php:155
 #: setup/frames/config.inc.php:42 setup/frames/index.inc.php:279
 #: templates/columns_definitions/column_definitions_form.phtml:165
-#: templates/gis_visualization/gis_visualization.phtml:48
-#: templates/tbl_relation/common_form.phtml:107
+#: templates/table/gis_visualization/gis_visualization.phtml:48
+#: templates/table/relation/common_form.phtml:107
 msgid "Save"
 msgstr "Simpan"
 
@@ -2210,8 +2216,8 @@ msgid "Data point content"
 msgstr "Isi titk data"
 
 #: js/messages.php:430 js/messages.php:562 js/messages.php:579
-#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2573
-#: templates/index_form.phtml:154 templates/index_form.phtml:194
+#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2571
+#: templates/table/index_form.phtml:154 templates/table/index_form.phtml:194
 msgid "Ignore"
 msgstr "Abaikan"
 
@@ -2272,8 +2278,8 @@ msgstr "Pilih Foreign Key"
 msgid "Please select the primary key or a unique key!"
 msgstr "Harap pilih kunci primer(primary key) atau kunci unik(unique key)!"
 
-#: js/messages.php:457 templates/designer/side_menu.phtml:91
-#: templates/designer/side_menu.phtml:94
+#: js/messages.php:457 templates/database/designer/side_menu.phtml:91
+#: templates/database/designer/side_menu.phtml:94
 msgid "Choose column to display"
 msgstr "Pilih kolom untuk ditampilkan"
 
@@ -2289,20 +2295,20 @@ msgstr ""
 msgid "Page name"
 msgstr "Nama halaman"
 
-#: js/messages.php:463 templates/designer/side_menu.phtml:56
-#: templates/designer/side_menu.phtml:59
+#: js/messages.php:463 templates/database/designer/side_menu.phtml:56
+#: templates/database/designer/side_menu.phtml:59
 msgid "Save page"
 msgstr "Simpan halaman"
 
-#: js/messages.php:464 templates/designer/side_menu.phtml:63
-#: templates/designer/side_menu.phtml:66
+#: js/messages.php:464 templates/database/designer/side_menu.phtml:63
+#: templates/database/designer/side_menu.phtml:66
 #, fuzzy
 #| msgid "Select page"
 msgid "Save page as"
 msgstr "Pilih halaman"
 
-#: js/messages.php:465 templates/designer/side_menu.phtml:49
-#: templates/designer/side_menu.phtml:52
+#: js/messages.php:465 templates/database/designer/side_menu.phtml:49
+#: templates/database/designer/side_menu.phtml:52
 msgid "Open page"
 msgstr "Buka halaman"
 
@@ -2310,7 +2316,7 @@ msgstr "Buka halaman"
 msgid "Delete page"
 msgstr "Hapus halaman"
 
-#: js/messages.php:467 templates/designer/side_menu.phtml:10
+#: js/messages.php:467 templates/database/designer/side_menu.phtml:10
 msgid "Untitled"
 msgstr "Belum ada nama"
 
@@ -2433,7 +2439,7 @@ msgstr "String asli"
 msgid "cancel"
 msgstr "Batal"
 
-#: js/messages.php:499 libraries/server_status.lib.php:271
+#: js/messages.php:499 libraries/server_status.lib.php:280
 msgid "Aborted"
 msgstr "Batalkan"
 
@@ -3038,7 +3044,7 @@ msgstr "Tolong masukkan angka yang valid!"
 
 #: js/messages.php:793 libraries/Message.class.php:199
 #: libraries/Util.class.php:654 libraries/core.lib.php:245
-#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1172
+#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1170
 #: tbl_operations.php:229 view_operations.php:63
 msgid "Error"
 msgstr "Galat"
@@ -3101,8 +3107,8 @@ msgstr "per detik"
 msgid "per minute"
 msgstr "per menit"
 
-#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:143
-#: libraries/server_status.lib.php:228
+#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:152
+#: libraries/server_status.lib.php:237
 #: libraries/server_status_queries.lib.php:98
 msgid "per hour"
 msgstr "dalam sejam"
@@ -3121,7 +3127,7 @@ msgid "Wrong permissions on configuration file, should not be world writable!"
 msgstr ""
 "Perizinan yang salah pada file konfigurasi, sehingga tidak dapat ditulis!"
 
-#: libraries/Config.class.php:1799
+#: libraries/Config.class.php:1801
 msgid "Font size"
 msgstr "Ukuran huruf"
 
@@ -3149,10 +3155,10 @@ msgstr "Kueri ulang"
 #: libraries/server_privileges.lib.php:2890
 #: libraries/server_privileges.lib.php:3144
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4332
+#: libraries/server_privileges.lib.php:4358
 #: libraries/server_status_processes.lib.php:80
-#: templates/tbl_relation/foreign_key_row.phtml:165
-#: templates/tbl_relation/internal_relational_row.phtml:55
+#: templates/table/relation/foreign_key_row.phtml:165
+#: templates/table/relation/internal_relational_row.phtml:55
 msgid "Database"
 msgstr "Basis data"
 
@@ -3244,11 +3250,11 @@ msgstr "Riwayat"
 #: libraries/plugins/import/ImportMediawiki.class.php:60
 #: libraries/plugins/import/ImportOds.class.php:59
 #: libraries/plugins/import/ImportShp.class.php:57
-#: libraries/plugins/import/ImportSql.class.php:148
+#: libraries/plugins/import/ImportSql.class.php:51
 #: libraries/plugins/import/ImportXml.class.php:58
-#: libraries/rte/rte_routines.lib.php:833 templates/index_form.phtml:49
-#: templates/structure/row_stats_table.phtml:20
-#: templates/table/options.phtml:2
+#: libraries/rte/rte_routines.lib.php:924 templates/table/index_form.phtml:49
+#: templates/table/search/options.phtml:2
+#: templates/table/structure/row_stats_table.phtml:20
 msgid "Options"
 msgstr "Opsi"
 
@@ -3289,7 +3295,8 @@ msgstr "Menurun"
 msgid "Order:"
 msgstr "Lainnya"
 
-#: libraries/Console.class.php:289 templates/table/replace_preview.phtml:17
+#: libraries/Console.class.php:289
+#: templates/table/search/replace_preview.phtml:17
 msgid "Count"
 msgstr "Jumlah"
 
@@ -3400,9 +3407,9 @@ msgstr "Pindah ke tabel salinan"
 #: libraries/operations.lib.php:794 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:191
-#: templates/structure/sortable_header.phtml:21
-#: templates/structure/sortable_header.phtml:38
-#: templates/table/options.phtml:68
+#: templates/database/structure/sortable_header.phtml:21
+#: templates/database/structure/sortable_header.phtml:38
+#: templates/table/search/options.phtml:68
 msgid "Ascending"
 msgstr "Menaik"
 
@@ -3412,13 +3419,14 @@ msgstr "Menaik"
 #: libraries/operations.lib.php:797 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:188
-#: templates/structure/sortable_header.phtml:26
-#: templates/structure/sortable_header.phtml:43
-#: templates/table/options.phtml:69
+#: templates/database/structure/sortable_header.phtml:26
+#: templates/database/structure/sortable_header.phtml:43
+#: templates/table/search/options.phtml:69
 msgid "Descending"
 msgstr "Menurun"
 
-#: libraries/DBQbe.class.php:467 templates/table/search_and_replace.phtml:6
+#: libraries/DBQbe.class.php:467
+#: templates/table/search/search_and_replace.phtml:6
 msgid "Column:"
 msgstr "Kolom:"
 
@@ -3576,12 +3584,12 @@ msgid_plural "%1$s matches in <strong>%2$s</strong>"
 msgstr[0] "%1$s cocok dengan <strong>%2$s</strong>"
 
 #: libraries/DbSearch.class.php:354 libraries/Menu.class.php:311
-#: libraries/Util.class.php:3337 libraries/Util.class.php:3347
-#: libraries/Util.class.php:3623 libraries/Util.class.php:3624
-#: libraries/Util.class.php:4343 libraries/config.values.php:43
+#: libraries/Util.class.php:3343 libraries/Util.class.php:3353
+#: libraries/Util.class.php:3629 libraries/Util.class.php:3630
+#: libraries/Util.class.php:4349 libraries/config.values.php:43
 #: libraries/config.values.php:51 libraries/config.values.php:119
 #: libraries/navigation/Nodes/Node_Table.class.php:295
-#: templates/structure/check_all_table_column.phtml:5
+#: templates/table/structure/check_all_table_column.phtml:5
 msgid "Browse"
 msgstr "Jelajahi"
 
@@ -3598,7 +3606,8 @@ msgstr "Cari dalam basis data"
 msgid "Words or values to search for (wildcard: \"%\"):"
 msgstr "Kata atau hasil untuk dicari (wildcard: \"%\"):"
 
-#: libraries/DbSearch.class.php:401 templates/table/search_and_replace.phtml:1
+#: libraries/DbSearch.class.php:401
+#: templates/table/search/search_and_replace.phtml:1
 msgid "Find:"
 msgstr "Cari:"
 
@@ -3642,28 +3651,28 @@ msgstr "Saring baris"
 msgid "Search this table"
 msgstr "Cari di tabel ini"
 
-#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2532
-#: libraries/Util.class.php:2535
+#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2538
+#: libraries/Util.class.php:2541
 msgctxt "First page"
 msgid "Begin"
 msgstr "Awal"
 
-#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2533
-#: libraries/Util.class.php:2536 libraries/server_bin_log.lib.php:170
+#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2539
+#: libraries/Util.class.php:2542 libraries/server_bin_log.lib.php:170
 #: libraries/server_bin_log.lib.php:172
 msgctxt "Previous page"
 msgid "Previous"
 msgstr "Sebelumnya"
 
-#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2564
-#: libraries/Util.class.php:2574 libraries/server_bin_log.lib.php:204
+#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2570
+#: libraries/Util.class.php:2580 libraries/server_bin_log.lib.php:204
 #: libraries/server_bin_log.lib.php:206
 msgctxt "Next page"
 msgid "Next"
 msgstr "Berikutnya"
 
-#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2565
-#: libraries/Util.class.php:2575
+#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2571
+#: libraries/Util.class.php:2581
 msgctxt "Last page"
 msgid "End"
 msgstr "Akhir"
@@ -3738,15 +3747,15 @@ msgid "May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]."
 msgstr "Kemungkinan hanya perkiraan saja. Lihat [doc@faq3-11]FAQ 3.11[/doc]."
 
 #: libraries/DisplayResults.class.php:4332 libraries/Message.class.php:180
-#: libraries/controllers/TableRelationController.class.php:258
+#: libraries/controllers/TableRelationController.class.php:259
 #: libraries/controllers/TableSearchController.class.php:655
-#: libraries/rte/rte_routines.lib.php:1332 libraries/sql_query_form.lib.php:89
+#: libraries/rte/rte_routines.lib.php:1423 libraries/sql_query_form.lib.php:89
 #: tbl_operations.php:227 tbl_row_action.php:138 view_operations.php:62
 msgid "Your SQL query has been executed successfully."
 msgstr "Kueri SQL Anda berhasil dieksekusi."
 
 #: libraries/DisplayResults.class.php:4660
-#: libraries/controllers/StructureController.class.php:629
+#: libraries/controllers/DatabaseStructureController.class.php:564
 #, php-format
 msgid ""
 "This view has at least this number of rows. Please refer to %sdocumentation"
@@ -3770,33 +3779,33 @@ msgstr "total %1$d, %2$d dalam kueri"
 msgid "%d total"
 msgstr "total %d"
 
-#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1318
+#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1312
 #, php-format
 msgid "Query took %01.4f seconds."
 msgstr "Pencarian dilakukan dalam %01.4f detik."
 
 #: libraries/DisplayResults.class.php:4807
-#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4767
-#: libraries/Util.class.php:4773 libraries/mult_submits.inc.php:50
-#: templates/structure/check_all_tables.phtml:2
-#: templates/structure/check_all_tables.phtml:9
+#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4773
+#: libraries/Util.class.php:4779 libraries/mult_submits.inc.php:50
+#: templates/database/structure/check_all_tables.phtml:2
+#: templates/database/structure/check_all_tables.phtml:9
 msgid "With selected:"
 msgstr "Dengan pilihan:"
 
 #: libraries/DisplayResults.class.php:4811
-#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4769
-#: libraries/Util.class.php:4770 libraries/server_privileges.lib.php:1174
+#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4775
+#: libraries/Util.class.php:4776 libraries/server_privileges.lib.php:1174
 #: libraries/server_privileges.lib.php:1175
 #: libraries/server_privileges.lib.php:1387
 #: libraries/server_user_groups.lib.php:231
-#: templates/structure/check_all_tables.phtml:3
-#: templates/structure/check_all_tables.phtml:4
+#: templates/database/structure/check_all_tables.phtml:3
+#: templates/database/structure/check_all_tables.phtml:4
 msgid "Check All"
 msgstr "Pilih Semua"
 
 #: libraries/DisplayResults.class.php:4985 libraries/Header.class.php:383
-#: templates/structure/optional_action_links.phtml:1
-#: templates/structure/print_view_data_dictionary_link.phtml:3
+#: templates/database/structure/print_view_data_dictionary_link.phtml:3
+#: templates/table/structure/optional_action_links.phtml:1
 msgid "Print view"
 msgstr "Tampilan cetak"
 
@@ -3804,7 +3813,8 @@ msgstr "Tampilan cetak"
 msgid "Query results operations"
 msgstr "Operasi hasil kueri"
 
-#: libraries/DisplayResults.class.php:5105 templates/tbl_chart.phtml:12
+#: libraries/DisplayResults.class.php:5105
+#: templates/table/chart/tbl_chart.phtml:12
 msgid "Display chart"
 msgstr "Tampilkan bagan"
 
@@ -3898,7 +3908,7 @@ msgid "Click on the bar to scroll to top of page"
 msgstr "Klik pada bar untuk menggulir ke atas halaman"
 
 #: libraries/Header.class.php:749
-#: libraries/plugins/auth/AuthenticationCookie.class.php:152
+#: libraries/plugins/auth/AuthenticationCookie.class.php:140
 msgid "Javascript must be enabled past this point!"
 msgstr "Javascript harus diaktifkan lewat point ini!"
 
@@ -3920,11 +3930,11 @@ msgid "Keyname"
 msgstr "Nama kunci"
 
 #: libraries/Index.class.php:697
-#: libraries/controllers/StructureController.class.php:1962
-#: libraries/controllers/StructureController.class.php:1967
+#: libraries/controllers/TableStructureController.class.php:953
+#: libraries/controllers/TableStructureController.class.php:958
 #: libraries/tracking.lib.php:973
 #: templates/columns_definitions/column_indexes.phtml:11
-#: templates/structure/check_all_table_column.phtml:26
+#: templates/table/structure/check_all_table_column.phtml:26
 msgid "Unique"
 msgstr "Unik"
 
@@ -3943,16 +3953,17 @@ msgstr "Kardinalitas"
 #: libraries/server_collations.lib.php:35 libraries/tracking.lib.php:881
 #: libraries/tracking.lib.php:977
 #: templates/columns_definitions/table_fields_definitions.phtml:33
-#: templates/structure/row_stats_table.phtml:31
-#: templates/structure/table_header.phtml:55
-#: templates/structure/table_structure_header.phtml:7
-#: templates/table/table_header.phtml:8
+#: templates/database/structure/table_header.phtml:55
+#: templates/table/search/table_header.phtml:8
+#: templates/table/structure/row_stats_table.phtml:31
+#: templates/table/structure/table_structure_header.phtml:7
 msgid "Collation"
 msgstr "Penyortiran"
 
 #: libraries/Index.class.php:703 libraries/rte/rte_events.lib.php:496
-#: libraries/rte/rte_routines.lib.php:956 libraries/tracking.lib.php:885
-#: libraries/tracking.lib.php:979 templates/structure/table_header.phtml:84
+#: libraries/rte/rte_routines.lib.php:1047 libraries/tracking.lib.php:885
+#: libraries/tracking.lib.php:979
+#: templates/database/structure/table_header.phtml:84
 msgid "Comment"
 msgstr "Komentar"
 
@@ -3965,15 +3976,15 @@ msgstr "Kunci primer telah dihapus."
 msgid "Index %s has been dropped."
 msgstr "Indeks %s telah dihapus."
 
-#: libraries/Index.class.php:757 libraries/Util.class.php:3630
-#: libraries/Util.class.php:3631
-#: libraries/controllers/StructureController.class.php:1958
-#: libraries/controllers/StructureController.class.php:1959
+#: libraries/Index.class.php:757 libraries/Util.class.php:3636
+#: libraries/Util.class.php:3637
+#: libraries/controllers/TableStructureController.class.php:949
+#: libraries/controllers/TableStructureController.class.php:950
 #: libraries/operations.lib.php:1607 libraries/rte/rte_list.lib.php:150
 #: libraries/server_databases.lib.php:146
-#: templates/structure/check_all_table_column.phtml:15
-#: templates/structure/check_all_tables.phtml:16
-#: templates/tbl_relation/foreign_key_row.phtml:93
+#: templates/database/structure/check_all_tables.phtml:16
+#: templates/table/relation/foreign_key_row.phtml:93
+#: templates/table/structure/check_all_table_column.phtml:15
 msgid "Drop"
 msgstr "Hapus"
 
@@ -4004,16 +4015,16 @@ msgstr "Server"
 #: libraries/Menu.class.php:248
 #: libraries/navigation/Nodes/Node_View.class.php:32
 #: libraries/tbl_info.inc.php:63
-#: templates/structure/structure_table_row.phtml:97
-#: templates/structure/structure_table_row.phtml:159
+#: templates/database/structure/structure_table_row.phtml:97
+#: templates/database/structure/structure_table_row.phtml:159
 msgid "View"
 msgstr "Gambarkan"
 
 #: libraries/Menu.class.php:325 libraries/Menu.class.php:429
-#: libraries/Menu.class.php:548 libraries/Util.class.php:3334
-#: libraries/Util.class.php:3344 libraries/Util.class.php:3350
-#: libraries/Util.class.php:4313 libraries/Util.class.php:4328
-#: libraries/Util.class.php:4345 libraries/config.values.php:40
+#: libraries/Menu.class.php:548 libraries/Util.class.php:3340
+#: libraries/Util.class.php:3350 libraries/Util.class.php:3356
+#: libraries/Util.class.php:4319 libraries/Util.class.php:4334
+#: libraries/Util.class.php:4351 libraries/config.values.php:40
 #: libraries/config.values.php:48 libraries/config.values.php:110
 #: libraries/config.values.php:116 libraries/config/messages.inc.php:321
 #: libraries/navigation/Nodes/Node_Table.class.php:292
@@ -4021,19 +4032,19 @@ msgid "SQL"
 msgstr "SQL"
 
 #: libraries/Menu.class.php:328 libraries/Menu.class.php:432
-#: libraries/Util.class.php:3335 libraries/Util.class.php:3345
-#: libraries/Util.class.php:3351 libraries/Util.class.php:3625
-#: libraries/Util.class.php:3626 libraries/Util.class.php:4329
-#: libraries/Util.class.php:4346 libraries/config.values.php:41
+#: libraries/Util.class.php:3341 libraries/Util.class.php:3351
+#: libraries/Util.class.php:3357 libraries/Util.class.php:3631
+#: libraries/Util.class.php:3632 libraries/Util.class.php:4335
+#: libraries/Util.class.php:4352 libraries/config.values.php:41
 #: libraries/config.values.php:49 libraries/config.values.php:111
 #: libraries/config.values.php:117
 #: libraries/navigation/Nodes/Node_Table.class.php:286
 msgid "Search"
 msgstr "Cari"
 
-#: libraries/Menu.class.php:338 libraries/Util.class.php:3336
-#: libraries/Util.class.php:3346 libraries/Util.class.php:3627
-#: libraries/Util.class.php:3628 libraries/Util.class.php:4347
+#: libraries/Menu.class.php:338 libraries/Util.class.php:3342
+#: libraries/Util.class.php:3352 libraries/Util.class.php:3633
+#: libraries/Util.class.php:3634 libraries/Util.class.php:4353
 #: libraries/config.values.php:42 libraries/config.values.php:50
 #: libraries/config.values.php:118
 #: libraries/navigation/Nodes/Node_Table.class.php:289
@@ -4042,30 +4053,30 @@ msgid "Insert"
 msgstr "Tambahkan"
 
 #: libraries/Menu.class.php:362 libraries/Menu.class.php:467
-#: libraries/Util.class.php:4334 libraries/Util.class.php:4350
+#: libraries/Util.class.php:4340 libraries/Util.class.php:4356
 #: libraries/config.values.php:106 libraries/server_common.lib.php:51
 #: libraries/server_privileges.lib.php:2370
 #: libraries/server_privileges.lib.php:3158
-#: libraries/server_privileges.lib.php:4221
+#: libraries/server_privileges.lib.php:4247
 msgid "Privileges"
 msgstr "Hak Akses"
 
 #: libraries/Menu.class.php:371 libraries/Menu.class.php:379
-#: libraries/Menu.class.php:459 libraries/Util.class.php:3338
-#: libraries/Util.class.php:3352 libraries/Util.class.php:4333
-#: libraries/Util.class.php:4351 libraries/config.values.php:112
+#: libraries/Menu.class.php:459 libraries/Util.class.php:3344
+#: libraries/Util.class.php:3358 libraries/Util.class.php:4339
+#: libraries/Util.class.php:4357 libraries/config.values.php:112
 #: view_operations.php:92
 msgid "Operations"
 msgstr "Operasi"
 
 #: libraries/Menu.class.php:384 libraries/Menu.class.php:492
-#: libraries/Util.class.php:4338 libraries/Util.class.php:4352
+#: libraries/Util.class.php:4344 libraries/Util.class.php:4358
 #: libraries/relation.lib.php:255
 msgid "Tracking"
 msgstr "Pelacakan"
 
 #: libraries/Menu.class.php:397 libraries/Menu.class.php:486
-#: libraries/Util.class.php:4337 libraries/Util.class.php:4353
+#: libraries/Util.class.php:4343 libraries/Util.class.php:4359
 #: libraries/navigation/Nodes/Node_Trigger_Container.class.php:24
 #: libraries/plugins/export/ExportHtmlword.class.php:557
 #: libraries/plugins/export/ExportOdt.class.php:685
@@ -4082,16 +4093,16 @@ msgstr "Trigger"
 msgid "Database seems to be empty!"
 msgstr "Basis data kelihatannya kosong!"
 
-#: libraries/Menu.class.php:439 libraries/Util.class.php:4330
+#: libraries/Menu.class.php:439 libraries/Util.class.php:4336
 msgid "Query"
 msgstr "Kueri"
 
-#: libraries/Menu.class.php:472 libraries/Util.class.php:4335
+#: libraries/Menu.class.php:472 libraries/Util.class.php:4341
 #: libraries/rte/rte_words.lib.php:36
 msgid "Routines"
 msgstr "Routine"
 
-#: libraries/Menu.class.php:479 libraries/Util.class.php:4336
+#: libraries/Menu.class.php:479 libraries/Util.class.php:4342
 #: libraries/navigation/Nodes/Node_Event_Container.class.php:26
 #: libraries/plugins/export/ExportSql.class.php:940
 #: libraries/plugins/export/ExportXml.class.php:107
@@ -4099,20 +4110,20 @@ msgstr "Routine"
 msgid "Events"
 msgstr "Event"
 
-#: libraries/Menu.class.php:498 libraries/Util.class.php:4339
+#: libraries/Menu.class.php:498 libraries/Util.class.php:4345
 msgid "Designer"
 msgstr "Desainer"
 
-#: libraries/Menu.class.php:507 libraries/Util.class.php:4340
-#: templates/structure/check_all_tables.phtml:35
+#: libraries/Menu.class.php:507 libraries/Util.class.php:4346
+#: templates/database/structure/check_all_tables.phtml:35
 msgid "Central columns"
 msgstr "Tengah kolom"
 
-#: libraries/Menu.class.php:544 libraries/Util.class.php:4312
+#: libraries/Menu.class.php:544 libraries/Util.class.php:4318
 #: libraries/config.values.php:103 libraries/config/messages.inc.php:266
 #: libraries/config/messages.inc.php:341
 #: libraries/navigation/NavigationTree.class.php:1239
-#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4332
+#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4358
 msgid "Databases"
 msgstr "Basis data"
 
@@ -4123,34 +4134,34 @@ msgid "User accounts"
 msgstr "Grup pengguna"
 
 #: libraries/Menu.class.php:595 libraries/ServerStatusData.class.php:121
-#: libraries/Util.class.php:4319 libraries/server_common.lib.php:36
+#: libraries/Util.class.php:4325 libraries/server_common.lib.php:36
 msgid "Binary log"
 msgstr "Log biner"
 
 #: libraries/Menu.class.php:601 libraries/ServerStatusData.class.php:126
-#: libraries/Util.class.php:4320 libraries/server_common.lib.php:42
-#: templates/structure/body_for_table_summary.phtml:10
-#: templates/structure/table_header.phtml:27
+#: libraries/Util.class.php:4326 libraries/server_common.lib.php:42
+#: templates/database/structure/body_for_table_summary.phtml:10
+#: templates/database/structure/table_header.phtml:27
 msgid "Replication"
 msgstr "Replikasi"
 
 #: libraries/Menu.class.php:606 libraries/ServerStatusData.class.php:193
-#: libraries/Util.class.php:4321 libraries/config.values.php:105
+#: libraries/Util.class.php:4327 libraries/config.values.php:105
 #: libraries/server_engines.lib.php:108 libraries/server_engines.lib.php:112
 #: libraries/sql_query_form.lib.php:421
 msgid "Variables"
 msgstr "Variabel"
 
-#: libraries/Menu.class.php:610 libraries/Util.class.php:4322
+#: libraries/Menu.class.php:610 libraries/Util.class.php:4328
 msgid "Charsets"
 msgstr "Set Karakter"
 
-#: libraries/Menu.class.php:615 libraries/Util.class.php:4323
+#: libraries/Menu.class.php:615 libraries/Util.class.php:4329
 #: libraries/server_common.lib.php:33 libraries/server_plugins.lib.php:27
 msgid "Plugins"
 msgstr "Plugin"
 
-#: libraries/Menu.class.php:626 libraries/Util.class.php:4324
+#: libraries/Menu.class.php:626 libraries/Util.class.php:4330
 msgid "Engines"
 msgstr "Mesin"
 
@@ -4178,7 +4189,7 @@ msgid "%1$d row inserted."
 msgid_plural "%1$d rows inserted."
 msgstr[0] "%1$d baris ditambahkan."
 
-#: libraries/PDF.class.php:70 libraries/Util.class.php:2521
+#: libraries/PDF.class.php:70 libraries/Util.class.php:2527
 #: libraries/browse_foreigners.lib.php:327
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:865
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:890
@@ -4199,7 +4210,7 @@ msgid "Could not save favorite table!"
 msgstr "Tidak dapat menyimpan tabel favorit!"
 
 #: libraries/RecentFavoriteTable.class.php:212
-#: templates/structure/favorite_anchor.phtml:12
+#: templates/database/structure/favorite_anchor.phtml:12
 msgid "Remove from Favorites"
 msgstr "Hapus dari favorit"
 
@@ -4362,7 +4373,7 @@ msgid ""
 msgstr "Informasi status detail mesin penyimpanan ini tidak tersedia."
 
 #: libraries/StorageEngine.class.php:373
-#: templates/structure/body_for_table_summary.phtml:50
+#: templates/database/structure/body_for_table_summary.phtml:50
 #, php-format
 msgid "%s is the default storage engine on this MySQL server."
 msgstr "%s adalah mesin penyimpanan utama pada server MySQL ini."
@@ -4844,10 +4855,10 @@ msgstr ""
 
 #: libraries/Util.class.php:726 libraries/rte/rte_events.lib.php:110
 #: libraries/rte/rte_events.lib.php:119 libraries/rte/rte_events.lib.php:150
-#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:153
-#: libraries/rte/rte_routines.lib.php:162
-#: libraries/rte/rte_routines.lib.php:235
-#: libraries/rte/rte_routines.lib.php:1366
+#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:223
+#: libraries/rte/rte_routines.lib.php:250
+#: libraries/rte/rte_routines.lib.php:372
+#: libraries/rte/rte_routines.lib.php:1457
 #: libraries/rte/rte_triggers.lib.php:86 libraries/rte/rte_triggers.lib.php:95
 #: libraries/rte/rte_triggers.lib.php:127
 msgid "MySQL said: "
@@ -4891,77 +4902,80 @@ msgstr "Minggu"
 msgid "%B %d, %Y at %I:%M %p"
 msgstr "%d %B %Y pada %H.%M"
 
-#: libraries/Util.class.php:2019
+#: libraries/Util.class.php:2025
 #, php-format
 msgid "%s days, %s hours, %s minutes and %s seconds"
 msgstr "%s hari, %s jam, %s menit dan %s detik"
 
-#: libraries/Util.class.php:2112
+#: libraries/Util.class.php:2118
 msgid "Missing parameter:"
 msgstr "Parameter yang hilang:"
 
-#: libraries/Util.class.php:2645
+#: libraries/Util.class.php:2651
 #, php-format
 msgid "Jump to database \"%s\"."
 msgstr "Langsung ke basis data \"%s\"."
 
-#: libraries/Util.class.php:2670
+#: libraries/Util.class.php:2676
 #, php-format
 msgid "The %s functionality is affected by a known bug, see %s"
 msgstr "Fungsionalitas %s dipengaruhi oleh suatu bug, lihat %s"
 
-#: libraries/Util.class.php:2881
+#: libraries/Util.class.php:2887
 msgid "Click to toggle"
 msgstr "Klik untuk beralih"
 
-#: libraries/Util.class.php:3542 prefs_manage.php:248
+#: libraries/Util.class.php:3548 prefs_manage.php:248
 msgid "Browse your computer:"
 msgstr "Telusuri komputer Anda:"
 
-#: libraries/Util.class.php:3567
+#: libraries/Util.class.php:3573
 #, php-format
 msgid "Select from the web server upload directory <b>%s</b>:"
 msgstr "Pilih dari direktori unggah <b>%s</b> pada web server:"
 
-#: libraries/Util.class.php:3596 libraries/insert_edit.lib.php:1173
+#: libraries/Util.class.php:3602 libraries/insert_edit.lib.php:1171
 msgid "The directory you set for upload work cannot be reached."
 msgstr ""
 "Direktori yang telah ditetapkan untuk mengunggah tidak dapat dihubungi."
 
-#: libraries/Util.class.php:3607
+#: libraries/Util.class.php:3613
 msgid "There are no files to upload!"
 msgstr "Tidak ada arsip untuk diunggah!"
 
 # Imperative menu
-#: libraries/Util.class.php:3632 libraries/Util.class.php:3633
-#: templates/structure/check_all_tables.phtml:15
+#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: templates/database/structure/check_all_tables.phtml:15
 msgid "Empty"
 msgstr "Kosongkan"
 
-#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: libraries/Util.class.php:3644 libraries/Util.class.php:3645
 msgid "Execute"
 msgstr "Eksekusi"
 
-#: libraries/Util.class.php:4152
+#: libraries/Util.class.php:4158
 msgid "Print"
 msgstr "Cetak"
 
-#: libraries/Util.class.php:4257 templates/structure/row_stats_table.phtml:80
-#: templates/structure/table_header.phtml:95
+#: libraries/Util.class.php:4263
+#: templates/database/structure/table_header.phtml:95
+#: templates/table/structure/row_stats_table.phtml:80
 msgid "Creation"
 msgstr "Pembuatan"
 
-#: libraries/Util.class.php:4263 templates/structure/row_stats_table.phtml:87
-#: templates/structure/table_header.phtml:106
+#: libraries/Util.class.php:4269
+#: templates/database/structure/table_header.phtml:106
+#: templates/table/structure/row_stats_table.phtml:87
 msgid "Last update"
 msgstr "Pembaruan terakhir"
 
-#: libraries/Util.class.php:4269 templates/structure/row_stats_table.phtml:94
-#: templates/structure/table_header.phtml:117
+#: libraries/Util.class.php:4275
+#: templates/database/structure/table_header.phtml:117
+#: templates/table/structure/row_stats_table.phtml:94
 msgid "Last check"
 msgstr "Pemeriksaan terakhir"
 
-#: libraries/Util.class.php:4315
+#: libraries/Util.class.php:4321
 msgid "Users"
 msgstr "Pengguna"
 
@@ -4982,16 +4996,16 @@ msgid "Use this value"
 msgstr "Gunakan nilai ini"
 
 #: libraries/build_html_for_db.lib.php:33 libraries/import.lib.php:193
-#: templates/structure/actions_in_table_structure.phtml:113
-#: templates/structure/row_stats_table.phtml:42
-#: templates/structure/table_header.phtml:36
+#: templates/database/structure/table_header.phtml:36
+#: templates/table/structure/actions_in_table_structure.phtml:113
+#: templates/table/structure/row_stats_table.phtml:42
 msgid "Rows"
 msgstr "Baris"
 
 #: libraries/build_html_for_db.lib.php:48 libraries/engines/innodb.lib.php:171
-#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:186
-#: libraries/server_status.lib.php:298
-#: templates/structure/display_table_stats.phtml:40
+#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:195
+#: libraries/server_status.lib.php:307
+#: templates/table/structure/display_table_stats.phtml:40
 msgid "Total"
 msgstr "Jumlah"
 
@@ -5000,10 +5014,12 @@ msgid "Jump to database"
 msgstr "Langsung ke basis data"
 
 #: libraries/build_html_for_db.lib.php:146
+#: templates/database/structure/structure_table_row.phtml:15
 msgid "Not replicated"
 msgstr "Tidak direplikasi"
 
 #: libraries/build_html_for_db.lib.php:158
+#: templates/database/structure/structure_table_row.phtml:16
 msgid "Replicated"
 msgstr "Direplikasi"
 
@@ -5060,17 +5076,17 @@ msgstr "TIDAK"
 #: libraries/plugins/export/ExportTexytext.class.php:425
 #: libraries/plugins/export/PMA_ExportPdf.class.php:307
 #: libraries/rte/rte_list.lib.php:73 libraries/rte/rte_list.lib.php:85
-#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:830
-#: libraries/rte/rte_routines.lib.php:1492 setup/frames/index.inc.php:162
+#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:921
+#: libraries/rte/rte_routines.lib.php:1583 setup/frames/index.inc.php:162
 #: templates/columns_definitions/table_fields_definitions.phtml:8
-#: templates/structure/table_structure_header.phtml:5
-#: templates/table/create_table.phtml:11
+#: templates/database/create_table.phtml:11
+#: templates/table/structure/table_structure_header.phtml:5
 msgid "Name"
 msgstr "Nama"
 
 #: libraries/central_columns.lib.php:699
 #: libraries/central_columns.lib.php:1381
-#: libraries/rte/rte_routines.lib.php:832
+#: libraries/rte/rte_routines.lib.php:923
 #: templates/columns_definitions/table_fields_definitions.phtml:14
 msgid "Length/Values"
 msgstr "Panjang/Nilai"
@@ -5093,7 +5109,7 @@ msgid "Select a table"
 msgstr "Pilih tabel"
 
 #: libraries/central_columns.lib.php:804
-#: templates/structure/add_column.phtml:4
+#: templates/table/structure/add_column.phtml:4
 msgid "Add column"
 msgstr "Tambah kolom"
 
@@ -5113,7 +5129,7 @@ msgstr "Tambah kolom"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1002
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1025
 #: templates/columns_definitions/table_fields_definitions.phtml:36
-#: templates/structure/table_structure_header.phtml:8
+#: templates/table/structure/table_structure_header.phtml:8
 msgid "Attributes"
 msgstr "Atribut"
 
@@ -5229,7 +5245,7 @@ msgid "Double click"
 msgstr "Klik ganda"
 
 #: libraries/config.values.php:95 libraries/config.values.php:124
-#: libraries/config/FormDisplay.tpl.php:221 libraries/relation.lib.php:97
+#: libraries/config/FormDisplay.tpl.php:232 libraries/relation.lib.php:97
 #: libraries/relation.lib.php:105
 msgid "Disabled"
 msgstr "Tidak aktif"
@@ -5418,23 +5434,23 @@ msgstr "proses ekspor terkompres tidak akan berjalan karena fungsi  %s hilang."
 msgid "maximum %s"
 msgstr "maksimum %s"
 
-#: libraries/config/FormDisplay.tpl.php:219
+#: libraries/config/FormDisplay.tpl.php:230
 msgid "This setting is disabled, it will not be applied to your configuration."
 msgstr ""
 "Pengaturan ini tidak diaktifkan, pengaturan tidak akan diterapkan pada "
 "konfigurasi anda."
 
-#: libraries/config/FormDisplay.tpl.php:313
+#: libraries/config/FormDisplay.tpl.php:324
 #, php-format
 msgid "Set value: %s"
 msgstr "Tetapkan nilai: %s"
 
-#: libraries/config/FormDisplay.tpl.php:318
+#: libraries/config/FormDisplay.tpl.php:329
 #: libraries/config/messages.inc.php:610
 msgid "Restore default value"
 msgstr "Kembalikan nilai bawaan"
 
-#: libraries/config/FormDisplay.tpl.php:332
+#: libraries/config/FormDisplay.tpl.php:343
 msgid "Allow users to customize this value"
 msgstr "Izinkan pengguna untuk mengubah nilai ini"
 
@@ -5964,7 +5980,7 @@ msgstr "Set karakter berkas"
 
 #: libraries/config/messages.inc.php:136 libraries/config/messages.inc.php:152
 #: libraries/sql_query_form.lib.php:247
-#: templates/structure/row_stats_table.phtml:7
+#: templates/table/structure/row_stats_table.phtml:7
 msgid "Format"
 msgstr "Format"
 
@@ -6491,7 +6507,7 @@ msgstr "Pilih detail mana untuk menampilkan struktur database (daftar tabel)."
 
 #: libraries/config/messages.inc.php:332
 #: libraries/plugins/export/ExportPdf.class.php:279
-#: templates/structure/secondary_tabs.phtml:8
+#: templates/table/secondary_tabs.phtml:8
 msgid "Table structure"
 msgstr "Struktur tabel"
 
@@ -8335,107 +8351,35 @@ msgstr "Microsoft Word 2000"
 msgid "OpenDocument Text"
 msgstr "Teks OpenDocument"
 
-#: libraries/controllers/StructureController.class.php:465
+#: libraries/controllers/DatabaseStructureController.class.php:405
 #: tbl_operations.php:382
 #, php-format
 msgid "Table %s has been emptied."
 msgstr "Tabel %s telah dikosongkan."
 
-#: libraries/controllers/StructureController.class.php:486
+#: libraries/controllers/DatabaseStructureController.class.php:426
 #: tbl_operations.php:400 view_operations.php:119
 #, fuzzy, php-format
 #| msgid "View %s has been dropped."
 msgid "View %s has been dropped."
 msgstr "View %s telah dihapus"
 
-#: libraries/controllers/StructureController.class.php:487
+#: libraries/controllers/DatabaseStructureController.class.php:427
 #: tbl_operations.php:401
 #, fuzzy, php-format
 #| msgid "Table %s has been dropped."
 msgid "Table %s has been dropped."
 msgstr "Tabel %s telah dihapus"
 
-#: libraries/controllers/StructureController.class.php:797
-#, fuzzy, php-format
-msgid "The name '%s' is a MySQL reserved keyword."
-msgid_plural "The names '%s' are MySQL reserved keywords."
-msgstr[0] "Nama kolom '%s' adalah kata kunci pesanan MySQL."
-
-#: libraries/controllers/StructureController.class.php:875
-msgid "No column selected."
-msgstr "Tidak ada kolom yang dipilih."
-
-#: libraries/controllers/StructureController.class.php:1049
+#: libraries/controllers/DatabaseStructureController.class.php:733
 msgid "Favorite List is full!"
 msgstr "Daftar favorit sudah penuh!"
 
-#: libraries/controllers/StructureController.class.php:1272
-#, fuzzy
-#| msgid "The selected users have been deleted successfully."
-msgid "The columns have been moved successfully."
-msgstr "Sukses menghapus pengguna yang dipilih."
-
-#: libraries/controllers/StructureController.class.php:1535
-#, fuzzy, php-format
-#| msgid "Table %1$s has been altered successfully."
-msgid ""
-"Table %1$s has been altered successfully. Privileges have been adjusted."
-msgstr "Tabel %1$s berhasil diubah."
-
-#: libraries/controllers/StructureController.class.php:1541
-#: libraries/controllers/TableIndexesController.class.php:161
-#: tbl_addfield.php:92
-#, php-format
-msgid "Table %1$s has been altered successfully."
-msgstr "Tabel %1$s berhasil diubah."
-
-#: libraries/controllers/StructureController.class.php:1588
-#: libraries/tracking.lib.php:1094
-msgid "Query error"
-msgstr "Galat kueri"
-
-#: libraries/controllers/StructureController.class.php:1806
+#: libraries/controllers/DatabaseStructureController.class.php:947
 #: libraries/mysql_charsets.lib.php:366 libraries/mysql_charsets.lib.php:373
 msgid "unknown"
 msgstr "tidak diketahui"
 
-#: libraries/controllers/StructureController.class.php:1957
-#: templates/structure/check_all_table_column.phtml:11
-msgid "Change"
-msgstr "Ubah"
-
-#: libraries/controllers/StructureController.class.php:1961
-#: libraries/controllers/StructureController.class.php:1966
-#: libraries/navigation/Nodes/Node_Index.class.php:30
-#: libraries/tracking.lib.php:926
-#: templates/columns_definitions/column_indexes.phtml:16
-#: templates/columns_definitions/table_fields_definitions.phtml:57
-#: templates/structure/check_all_table_column.phtml:30
-#: templates/structure/display_structure.phtml:79
-#: templates/structure/display_table_stats.phtml:19
-msgid "Index"
-msgstr "Indeks"
-
-#: libraries/controllers/StructureController.class.php:1963
-#: libraries/controllers/StructureController.class.php:1968
-#: templates/columns_definitions/column_indexes.phtml:27
-#: templates/structure/check_all_table_column.phtml:37
-msgid "Spatial"
-msgstr "Spasial"
-
-#: libraries/controllers/StructureController.class.php:1964
-#: libraries/controllers/StructureController.class.php:1969
-#: templates/columns_definitions/column_indexes.phtml:22
-#: templates/structure/check_all_table_column.phtml:47
-msgid "Fulltext"
-msgstr "Teks penuh"
-
-#: libraries/controllers/StructureController.class.php:1970
-#, fuzzy
-#| msgid "Browse distinct values"
-msgid "Distinct values"
-msgstr "Jelajahi nilai distingtif"
-
 #: libraries/controllers/TableChartController.class.php:82
 #: libraries/controllers/TableGisVisualizationController.class.php:101
 #, fuzzy
@@ -8453,13 +8397,20 @@ msgstr "Tidak ada kolom numerik yang muncul dalam tabel untuk perencanaan."
 msgid "No data to display"
 msgstr "Tidak ada data"
 
-#: libraries/controllers/TableRelationController.class.php:217
+#: libraries/controllers/TableIndexesController.class.php:161
+#: libraries/controllers/TableStructureController.class.php:736
+#: tbl_addfield.php:92
+#, php-format
+msgid "Table %1$s has been altered successfully."
+msgstr "Tabel %1$s berhasil diubah."
+
+#: libraries/controllers/TableRelationController.class.php:218
 #, fuzzy
 #| msgid "Thread %s was successfully killed."
 msgid "Display column was successfully updated."
 msgstr "Sukses hentikan Thread %s."
 
-#: libraries/controllers/TableRelationController.class.php:283
+#: libraries/controllers/TableRelationController.class.php:288
 #, fuzzy
 #| msgid "Internal relation added"
 msgid "Internal relations were successfully updated."
@@ -8474,10 +8425,75 @@ msgid "Zoom search"
 msgstr "Perbesar pencarian"
 
 #: libraries/controllers/TableSearchController.class.php:852
-#: templates/table/selection_form.phtml:59
+#: templates/table/search/selection_form.phtml:59
 msgid "Find and replace"
 msgstr "Cari dan Gantikan"
 
+#: libraries/controllers/TableStructureController.class.php:163
+#, fuzzy, php-format
+msgid "The name '%s' is a MySQL reserved keyword."
+msgid_plural "The names '%s' are MySQL reserved keywords."
+msgstr[0] "Nama kolom '%s' adalah kata kunci pesanan MySQL."
+
+#: libraries/controllers/TableStructureController.class.php:241
+msgid "No column selected."
+msgstr "Tidak ada kolom yang dipilih."
+
+#: libraries/controllers/TableStructureController.class.php:467
+#, fuzzy
+#| msgid "The selected users have been deleted successfully."
+msgid "The columns have been moved successfully."
+msgstr "Sukses menghapus pengguna yang dipilih."
+
+#: libraries/controllers/TableStructureController.class.php:730
+#, fuzzy, php-format
+#| msgid "Table %1$s has been altered successfully."
+msgid ""
+"Table %1$s has been altered successfully. Privileges have been adjusted."
+msgstr "Tabel %1$s berhasil diubah."
+
+#: libraries/controllers/TableStructureController.class.php:783
+#: libraries/tracking.lib.php:1094
+msgid "Query error"
+msgstr "Galat kueri"
+
+#: libraries/controllers/TableStructureController.class.php:948
+#: templates/table/structure/check_all_table_column.phtml:11
+msgid "Change"
+msgstr "Ubah"
+
+#: libraries/controllers/TableStructureController.class.php:952
+#: libraries/controllers/TableStructureController.class.php:957
+#: libraries/navigation/Nodes/Node_Index.class.php:30
+#: libraries/tracking.lib.php:926
+#: templates/columns_definitions/column_indexes.phtml:16
+#: templates/columns_definitions/table_fields_definitions.phtml:57
+#: templates/table/structure/check_all_table_column.phtml:30
+#: templates/table/structure/display_structure.phtml:79
+#: templates/table/structure/display_table_stats.phtml:19
+msgid "Index"
+msgstr "Indeks"
+
+#: libraries/controllers/TableStructureController.class.php:954
+#: libraries/controllers/TableStructureController.class.php:959
+#: templates/columns_definitions/column_indexes.phtml:27
+#: templates/table/structure/check_all_table_column.phtml:37
+msgid "Spatial"
+msgstr "Spasial"
+
+#: libraries/controllers/TableStructureController.class.php:955
+#: libraries/controllers/TableStructureController.class.php:960
+#: templates/columns_definitions/column_indexes.phtml:22
+#: templates/table/structure/check_all_table_column.phtml:47
+msgid "Fulltext"
+msgstr "Teks penuh"
+
+#: libraries/controllers/TableStructureController.class.php:963
+#, fuzzy
+#| msgid "Browse distinct values"
+msgid "Distinct values"
+msgstr "Jelajahi nilai distingtif"
+
 #: libraries/core.lib.php:306
 #, php-format
 msgid "The %s extension is missing. Please check your PHP configuration."
@@ -8526,7 +8542,7 @@ msgid "No Password"
 msgstr "Kata Sandi tidak ditetapkan"
 
 #: libraries/display_change_password.lib.php:68
-#: libraries/plugins/auth/AuthenticationCookie.class.php:199
+#: libraries/plugins/auth/AuthenticationCookie.class.php:187
 #: libraries/replication_gui.lib.php:422 libraries/replication_gui.lib.php:862
 #: libraries/server_privileges.lib.php:1640
 msgid "Password:"
@@ -9381,12 +9397,12 @@ msgid "Dump has been saved to file %s."
 msgstr "Dump (Skema) disimpan pada berkas %s."
 
 #: libraries/import.lib.php:202 libraries/insert_edit.lib.php:124
-#: libraries/rte/rte_routines.lib.php:1353 libraries/sql.lib.php:1312
+#: libraries/rte/rte_routines.lib.php:1444 libraries/sql.lib.php:1306
 #: tbl_get_field.php:44
 msgid "MySQL returned an empty result set (i.e. zero rows)."
 msgstr "MySQL memberikan hasil kosong (atau nol baris)."
 
-#: libraries/import.lib.php:265 libraries/sql.lib.php:1326
+#: libraries/import.lib.php:265 libraries/sql.lib.php:1320
 #, fuzzy
 msgid "[ROLLBACK occurred.]"
 msgstr "[ROLLBACK occurred.]"
@@ -9463,14 +9479,14 @@ msgstr "Buat indeks pada &nbsp;%s&nbsp; kolom"
 
 #: libraries/insert_edit.lib.php:233
 #: libraries/navigation/Nodes/Node_DatabaseChild.class.php:48
-#: templates/designer/table_list.phtml:40
+#: templates/database/designer/table_list.phtml:40
 msgid "Hide"
 msgstr "Sembunyikan"
 
 #: libraries/insert_edit.lib.php:249
 #: libraries/navigation/Nodes/Node_Function.class.php:32
-#: libraries/rte/rte_routines.lib.php:1495
-#: templates/table/table_header.phtml:4
+#: libraries/rte/rte_routines.lib.php:1586
+#: templates/table/search/table_header.phtml:4
 msgid "Function"
 msgstr "Fungsi"
 
@@ -9485,86 +9501,87 @@ msgstr "Biner"
 msgid "Because of its length,<br /> this column might not be editable."
 msgstr "Karena panjangnya,<br /> isian ini mungkin tidak dapat diedit"
 
-#: libraries/insert_edit.lib.php:1050
+#: libraries/insert_edit.lib.php:1048
 msgid "Binary - do not edit"
 msgstr "Biner - jangan diedit"
 
-#: libraries/insert_edit.lib.php:1176 libraries/server_privileges.lib.php:470
-#: templates/table/options.phtml:36
+#: libraries/insert_edit.lib.php:1174 libraries/server_privileges.lib.php:470
+#: templates/table/search/options.phtml:36
 msgid "Or"
 msgstr "Atau"
 
-#: libraries/insert_edit.lib.php:1177
+#: libraries/insert_edit.lib.php:1175
 #, fuzzy
 #| msgid "web server upload directory"
 msgid "web server upload directory:"
 msgstr "direktori unggahan server web"
 
-#: libraries/insert_edit.lib.php:1348 templates/table/input_box.phtml:49
+#: libraries/insert_edit.lib.php:1346
+#: templates/table/search/input_box.phtml:49
 msgid "Edit/Insert"
 msgstr "Edit/Tambah"
 
-#: libraries/insert_edit.lib.php:1398
+#: libraries/insert_edit.lib.php:1396
 #, php-format
 msgid "Continue insertion with %s rows"
 msgstr "Lanjutkan penambahan untuk %s baris"
 
-#: libraries/insert_edit.lib.php:1428
+#: libraries/insert_edit.lib.php:1426
 msgid "and then"
 msgstr "selanjutnya"
 
-#: libraries/insert_edit.lib.php:1461
+#: libraries/insert_edit.lib.php:1459
 msgid "Insert as new row"
 msgstr "Tambahkan sebagai baris baru"
 
-#: libraries/insert_edit.lib.php:1464
+#: libraries/insert_edit.lib.php:1462
 msgid "Insert as new row and ignore errors"
 msgstr "Tambahkan sebagai baris baru dan abaikan galat"
 
-#: libraries/insert_edit.lib.php:1467
+#: libraries/insert_edit.lib.php:1465
 msgid "Show insert query"
 msgstr "Tampilkan kueri penambahan"
 
-#: libraries/insert_edit.lib.php:1487
+#: libraries/insert_edit.lib.php:1485
 msgid "Go back to previous page"
 msgstr "kembali"
 
-#: libraries/insert_edit.lib.php:1490
+#: libraries/insert_edit.lib.php:1488
 msgid "Insert another new row"
 msgstr "tambahkan baris baru berikutnya"
 
-#: libraries/insert_edit.lib.php:1495
+#: libraries/insert_edit.lib.php:1493
 msgid "Go back to this page"
 msgstr "Kembali ke halaman ini"
 
-#: libraries/insert_edit.lib.php:1518
+#: libraries/insert_edit.lib.php:1516
 msgid "Edit next row"
 msgstr "Edit baris berikut"
 
-#: libraries/insert_edit.lib.php:1540
+#: libraries/insert_edit.lib.php:1538
 msgid ""
 "Use TAB key to move from value to value, or CTRL+arrows to move anywhere"
 msgstr ""
 "Gunakan tombol TAB untuk maju dari angka ke angka atau gunakan CTRL+panah "
 "untuk maju kemana saja"
 
-#: libraries/insert_edit.lib.php:1577 libraries/replication_gui.lib.php:542
-#: libraries/rte/rte_routines.lib.php:1497
+#: libraries/insert_edit.lib.php:1575 libraries/replication_gui.lib.php:542
+#: libraries/rte/rte_routines.lib.php:1588
 #: libraries/server_status_variables.lib.php:220
-#: templates/designer/having_query_panel.phtml:100
-#: templates/designer/options_panel.phtml:73
-#: templates/designer/options_panel.phtml:239
-#: templates/designer/where_query_panel.phtml:69
-#: templates/table/table_header.phtml:10
-#: templates/table/zoom_result_form.phtml:35
+#: templates/database/designer/having_query_panel.phtml:100
+#: templates/database/designer/options_panel.phtml:73
+#: templates/database/designer/options_panel.phtml:239
+#: templates/database/designer/where_query_panel.phtml:69
+#: templates/table/search/table_header.phtml:10
+#: templates/table/search/zoom_result_form.phtml:35
 msgid "Value"
 msgstr "Nilai"
 
-#: libraries/insert_edit.lib.php:1937 libraries/sql.lib.php:1309
+#: libraries/insert_edit.lib.php:1935 libraries/sql.lib.php:1303
 msgid "Showing SQL query"
 msgstr "Menampilkan kueri SQL"
 
-#: libraries/insert_edit.lib.php:1962 libraries/sql.lib.php:1287
+#: libraries/insert_edit.lib.php:1960 libraries/sql.lib.php:1281
 #, php-format
 msgid "Inserted row id: %1$d"
 msgstr "Nomor baris baru: %1$d"
@@ -10030,7 +10047,7 @@ msgstr "Baru"
 #: libraries/navigation/Nodes/Node_View_Container.class.php:26
 #: libraries/navigation/Nodes/Node_View_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:129
-#: templates/structure/show_create.phtml:30
+#: templates/database/structure/show_create.phtml:30
 msgid "Views"
 msgstr "View"
 
@@ -10411,7 +10428,7 @@ msgstr "Hak Akses Anda untuk melanjut tidak cukup!"
 
 #: libraries/operations.lib.php:101 libraries/operations.lib.php:249
 #: libraries/operations.lib.php:869 libraries/operations.lib.php:963
-#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:907
+#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:998
 #: templates/columns_definitions/table_fields_definitions.phtml:47
 #, fuzzy
 #| msgid "Edit Privileges"
@@ -10506,22 +10523,22 @@ msgid "Switch to copied table"
 msgstr "Pindah ke tabel salinan"
 
 #: libraries/operations.lib.php:1360
-#: templates/structure/check_all_tables.phtml:18
+#: templates/database/structure/check_all_tables.phtml:18
 msgid "Table maintenance"
 msgstr "Pemeliharaan tabel"
 
 #: libraries/operations.lib.php:1398
-#: templates/structure/check_all_tables.phtml:19
+#: templates/database/structure/check_all_tables.phtml:19
 msgid "Analyze table"
 msgstr "Analisis tabel"
 
 #: libraries/operations.lib.php:1413
-#: templates/structure/check_all_tables.phtml:20
+#: templates/database/structure/check_all_tables.phtml:20
 msgid "Check table"
 msgstr "Periksa tabel"
 
 #: libraries/operations.lib.php:1428
-#: templates/structure/check_all_tables.phtml:22
+#: templates/database/structure/check_all_tables.phtml:22
 #, fuzzy
 #| msgid "Check table"
 msgid "Checksum table"
@@ -10541,18 +10558,19 @@ msgid "Flush the table (FLUSH)"
 msgstr "Bersihkan tabel (\"FLUSH\")"
 
 #: libraries/operations.lib.php:1477
-#: templates/structure/check_all_tables.phtml:23
-#: templates/structure/display_table_stats.phtml:56
+#: templates/database/structure/check_all_tables.phtml:23
+#: templates/table/structure/display_table_stats.phtml:56
 msgid "Optimize table"
 msgstr "Optimalkan tabel"
 
 #: libraries/operations.lib.php:1492
-#: templates/structure/check_all_tables.phtml:24
+#: templates/database/structure/check_all_tables.phtml:24
 msgid "Repair table"
 msgstr "Perbaiki tabel"
 
 #: libraries/operations.lib.php:1538
-#: templates/structure/check_all_tables.phtml:14 view_operations.php:127
+#: templates/database/structure/check_all_tables.phtml:14
+#: view_operations.php:127
 msgid "Delete data or table"
 msgstr "Hapus data atau tabel"
 
@@ -10678,7 +10696,7 @@ msgid "Cannot connect: invalid settings."
 msgstr "Koneksi gagal: pengaturan invalid."
 
 #: libraries/plugins/auth/AuthenticationConfig.class.php:108
-#: libraries/plugins/auth/AuthenticationCookie.class.php:134
+#: libraries/plugins/auth/AuthenticationCookie.class.php:122
 #: libraries/plugins/auth/AuthenticationHttp.class.php:96
 #, php-format
 msgid "Welcome to %s"
@@ -10710,41 +10728,41 @@ msgstr ""
 msgid "Retry to connect"
 msgstr "Coba lagi untuk menghubungkan"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:146
+#: libraries/plugins/auth/AuthenticationCookie.class.php:134
 msgid "Your session has expired. Please log in again."
 msgstr "Sesi anda telah berakhir. Silakan log in kembali."
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:170
+#: libraries/plugins/auth/AuthenticationCookie.class.php:158
 msgid "Log in"
 msgstr "Masuk"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:178
-#: libraries/plugins/auth/AuthenticationCookie.class.php:188
+#: libraries/plugins/auth/AuthenticationCookie.class.php:166
+#: libraries/plugins/auth/AuthenticationCookie.class.php:176
 msgid "You can enter hostname/IP address and port separated by space."
 msgstr ""
 "Anda bisa memasukkan hostname/alamat IP dan port dipisahkan dengan spasi."
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:193
+#: libraries/plugins/auth/AuthenticationCookie.class.php:181
 msgid "Username:"
 msgstr "Nama Pengguna:"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:205
+#: libraries/plugins/auth/AuthenticationCookie.class.php:193
 #, fuzzy
 #| msgid "Server Choice"
 msgid "Server Choice:"
 msgstr "Pilihan Server"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:386
+#: libraries/plugins/auth/AuthenticationCookie.class.php:374
 #, fuzzy
 msgid "Entered captcha is wrong, try again!"
 msgstr "Captcha yang dimasukan salah, coba lagi!"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:396
+#: libraries/plugins/auth/AuthenticationCookie.class.php:384
 #, fuzzy
 msgid "Please enter correct captcha!"
 msgstr "Silakan masukkan captcha yang benar!"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:423
+#: libraries/plugins/auth/AuthenticationCookie.class.php:411
 #, fuzzy
 #| msgid "Cannot log in to the MySQL server"
 msgid "You are not allowed to log in to this MySQL server!"
@@ -10843,7 +10861,7 @@ msgstr "Kejadian"
 #: libraries/plugins/export/ExportOdt.class.php:593
 #: libraries/plugins/export/ExportTexytext.class.php:428
 #: libraries/plugins/export/PMA_ExportPdf.class.php:313
-#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:984
 #: libraries/rte/rte_triggers.lib.php:377
 msgid "Definition"
 msgstr "Definisi"
@@ -11214,7 +11232,7 @@ msgid "Last check:"
 msgstr "Pemeriksaan terakhir:"
 
 #: libraries/plugins/export/ExportSql.class.php:1399
-#: templates/structure/structure_table_row.phtml:183
+#: templates/database/structure/structure_table_row.phtml:183
 msgid "in use"
 msgstr "sedang digunakan"
 
@@ -11433,20 +11451,14 @@ msgstr "MySQL Spatial Ekstensi tidak mendukung ESRI Jenis \"%s\"."
 msgid "The imported file does not contain any data!"
 msgstr "Berkas yang diimpor tidak mengandung data"
 
-#: libraries/plugins/import/ImportSql.class.php:169
+#: libraries/plugins/import/ImportSql.class.php:72
 msgid "SQL compatibility mode:"
 msgstr "Modus kompatibilitas SQL:"
 
-#: libraries/plugins/import/ImportSql.class.php:181
+#: libraries/plugins/import/ImportSql.class.php:84
 msgid "Do not use <code>AUTO_INCREMENT</code> for zero values"
 msgstr "Jangan gunakan <code>AUTO_INCREMENT</code> untuk nilai nol"
 
-#: libraries/plugins/import/ImportSql.class.php:195
-#, fuzzy
-#| msgid "Read misses"
-msgid "Read as multibytes"
-msgstr "Pembacaan yang kelewat"
-
 #: libraries/plugins/import/ImportXml.class.php:54
 msgid "XML"
 msgstr "XML"
@@ -11491,7 +11503,7 @@ msgid "Show grid"
 msgstr "Tampilkan garis"
 
 #: libraries/plugins/schema/SchemaPdf.class.php:94
-#: templates/structure/print_view_data_dictionary_link.phtml:6
+#: templates/database/structure/print_view_data_dictionary_link.phtml:6
 msgid "Data Dictionary"
 msgstr "Kamus Data"
 
@@ -11522,7 +11534,7 @@ msgid "The %s table doesn't exist!"
 msgstr "Tabel %s tidak ditemukan!"
 
 #: libraries/plugins/schema/eps/Eps_Relation_Schema.class.php:321
-#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:309
+#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:323
 #, php-format
 msgid "Schema of the %s database - Page %s"
 msgstr "Skema basis data %s - Halaman %s"
@@ -11551,7 +11563,7 @@ msgstr "Daftar Isi"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1005
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1028
 #: libraries/tracking.lib.php:884
-#: templates/structure/table_structure_header.phtml:11
+#: templates/table/structure/table_structure_header.phtml:11
 msgid "Extra"
 msgstr "Ekstra"
 
@@ -11944,12 +11956,12 @@ msgid "Create the needed tables with the <code>%screate_tables.sql</code>."
 msgstr ""
 "Membuat tabel yang dibutuhkan dengan <code>contoh/create_tables.sql</code>."
 
-#: libraries/relation.lib.php:360
+#: libraries/relation.lib.php:357
 #, fuzzy
 msgid "Create a pma user and give access to these tables."
 msgstr "Membuat user pma dan memberikan akses ke tabel ini."
 
-#: libraries/relation.lib.php:365
+#: libraries/relation.lib.php:360
 #, fuzzy
 msgid ""
 "Enable advanced features in configuration file (<code>config.inc.php</"
@@ -11958,23 +11970,23 @@ msgstr ""
 "Aktifkan fitur-fitur canggih dalam file konfigurasi (<code> config.inc.php</"
 "code>), misalnya dengan memulai dari <code> config.sample.inc.php</code>."
 
-#: libraries/relation.lib.php:373
+#: libraries/relation.lib.php:365
 #, fuzzy
 msgid "Re-login to phpMyAdmin to load the updated configuration file."
 msgstr "Login ulang ke phpMyAdmin untuk memuat file konfigurasi yang baru."
 
-#: libraries/relation.lib.php:1612
+#: libraries/relation.lib.php:1607
 msgid "no description"
 msgstr "tidak ada deskripsi"
 
-#: libraries/relation.lib.php:1811
+#: libraries/relation.lib.php:1806
 msgid ""
 "You do not have necessary privileges to create a database named "
 "'phpmyadmin'. You may go to 'Operations' tab of any database to set up the "
 "phpMyAdmin configuration storage there."
 msgstr ""
 
-#: libraries/relation.lib.php:1928
+#: libraries/relation.lib.php:1923
 #, fuzzy, php-format
 #| msgid "Missing phpMyAdmin configuration storage tables"
 msgid ""
@@ -11982,21 +11994,21 @@ msgid ""
 "configuration storage there."
 msgstr "Tabel penyimpanan konfigurasi phpMyAdmin tidak ditemukan"
 
-#: libraries/relation.lib.php:1936
+#: libraries/relation.lib.php:1931
 #, fuzzy, php-format
 #| msgid "Missing phpMyAdmin configuration storage tables"
 msgid ""
 "%sCreate%s the phpMyAdmin configuration storage in the current database."
 msgstr "Tabel penyimpanan konfigurasi phpMyAdmin tidak ditemukan"
 
-#: libraries/relation.lib.php:1944
+#: libraries/relation.lib.php:1939
 #, fuzzy, php-format
 #| msgid "Missing phpMyAdmin configuration storage tables"
 msgid "%sCreate%s missing phpMyAdmin configuration storage tables."
 msgstr "Tabel penyimpanan konfigurasi phpMyAdmin tidak ditemukan"
 
 #: libraries/replication_gui.lib.php:46 libraries/replication_gui.lib.php:343
-#: libraries/server_databases.lib.php:387
+#: libraries/server_databases.lib.php:398
 msgid "Master replication"
 msgstr "Replikasi master"
 
@@ -12064,7 +12076,7 @@ msgstr ""
 "dikonfigurasi sebagai master."
 
 #: libraries/replication_gui.lib.php:141
-#: libraries/server_databases.lib.php:389
+#: libraries/server_databases.lib.php:400
 msgid "Slave replication"
 msgstr "Replikasi slave"
 
@@ -12369,10 +12381,10 @@ msgid "Master server changed successfully to %s."
 msgstr "Server master berhasil diubah menjadi %s"
 
 #: libraries/rte/rte_events.lib.php:106 libraries/rte/rte_events.lib.php:115
-#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:149
-#: libraries/rte/rte_routines.lib.php:158
-#: libraries/rte/rte_routines.lib.php:231
-#: libraries/rte/rte_routines.lib.php:1362
+#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:219
+#: libraries/rte/rte_routines.lib.php:246
+#: libraries/rte/rte_routines.lib.php:368
+#: libraries/rte/rte_routines.lib.php:1453
 #: libraries/rte/rte_triggers.lib.php:82 libraries/rte/rte_triggers.lib.php:91
 #: libraries/rte/rte_triggers.lib.php:123
 #, fuzzy, php-format
@@ -12393,7 +12405,7 @@ msgstr "Event %1$s telah diubah."
 msgid "Event %1$s has been created."
 msgstr "Event %1$s telah dibuat."
 
-#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:251
+#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:266
 #: libraries/rte/rte_triggers.lib.php:144
 #, fuzzy
 msgid "One or more errors have occurred while processing your request:"
@@ -12404,7 +12416,7 @@ msgstr ""
 msgid "Edit event"
 msgstr "Edit kejadian"
 
-#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:794
+#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:885
 #: libraries/rte/rte_triggers.lib.php:323 view_create.php:180
 msgid "Details"
 msgstr "Detail"
@@ -12417,7 +12429,7 @@ msgstr "Nama event"
 msgid "Event type"
 msgstr "Jenis event"
 
-#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:817
+#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:908
 #, php-format
 msgid "Change to %s"
 msgstr "Ubah menjadi %s"
@@ -12444,13 +12456,15 @@ msgstr "Selesai"
 msgid "On completion preserve"
 msgstr "Sewaktu selesai pertahankan"
 
-#: libraries/rte/rte_events.lib.php:491 libraries/rte/rte_routines.lib.php:930
+#: libraries/rte/rte_events.lib.php:491
+#: libraries/rte/rte_routines.lib.php:1021
 #: libraries/rte/rte_triggers.lib.php:383 view_create.php:209
 #, fuzzy
 msgid "Definer"
 msgstr "Definer"
 
-#: libraries/rte/rte_events.lib.php:535 libraries/rte/rte_routines.lib.php:997
+#: libraries/rte/rte_events.lib.php:535
+#: libraries/rte/rte_routines.lib.php:1088
 #: libraries/rte/rte_triggers.lib.php:422
 #, fuzzy
 msgid "The definer must be in the \"username@hostname\" format!"
@@ -12479,9 +12493,9 @@ msgid "You must provide an event definition."
 msgstr "Anda harus memasukkan definisi event."
 
 #: libraries/rte/rte_export.lib.php:43 libraries/rte/rte_general.lib.php:72
-#: libraries/rte/rte_routines.lib.php:345
-#: libraries/rte/rte_routines.lib.php:1198
-#: libraries/rte/rte_routines.lib.php:1411
+#: libraries/rte/rte_routines.lib.php:153
+#: libraries/rte/rte_routines.lib.php:1289
+#: libraries/rte/rte_routines.lib.php:1502
 #, fuzzy
 #| msgid "Error in processing request"
 msgid "Error in processing request:"
@@ -12521,99 +12535,99 @@ msgstr ""
 "gagal! [/strong] Silakan gunakan ditingkatkan ekstensi 'mysqli' untuk "
 "menghindari masalah."
 
-#: libraries/rte/rte_routines.lib.php:110
-#: libraries/rte/rte_routines.lib.php:1006
+#: libraries/rte/rte_routines.lib.php:123
+msgid "Edit routine"
+msgstr "Edit rutinitas"
+
+#: libraries/rte/rte_routines.lib.php:200
+#: libraries/rte/rte_routines.lib.php:1097
 #, php-format
 msgid "Invalid routine type: \"%s\""
 msgstr "Jenis routine invalid: \"%s\""
 
-#: libraries/rte/rte_routines.lib.php:170
+#: libraries/rte/rte_routines.lib.php:253
+#, php-format
+msgid "Routine %1$s has been created."
+msgstr "Routine %1$s telah dibuat."
+
+#: libraries/rte/rte_routines.lib.php:380
 msgid "Sorry, we failed to restore the dropped routine."
 msgstr "Maaf, kami gagal memulihkan routine yang dihapus."
 
-#: libraries/rte/rte_routines.lib.php:211
+#: libraries/rte/rte_routines.lib.php:439
 #, fuzzy, php-format
 #| msgid "Routine %1$s has been modified."
 msgid "Routine %1$s has been modified. Privileges have been adjusted."
 msgstr "Routine %1$s telah diubah."
 
-#: libraries/rte/rte_routines.lib.php:216
+#: libraries/rte/rte_routines.lib.php:444
 #, php-format
 msgid "Routine %1$s has been modified."
 msgstr "Routine %1$s telah diubah."
 
-#: libraries/rte/rte_routines.lib.php:238
-#, php-format
-msgid "Routine %1$s has been created."
-msgstr "Routine %1$s telah dibuat."
-
-#: libraries/rte/rte_routines.lib.php:315
-msgid "Edit routine"
-msgstr "Edit rutinitas"
-
-#: libraries/rte/rte_routines.lib.php:797
+#: libraries/rte/rte_routines.lib.php:888
 msgid "Routine name"
 msgstr "Nama routine"
 
-#: libraries/rte/rte_routines.lib.php:823
+#: libraries/rte/rte_routines.lib.php:914
 msgid "Parameters"
 msgstr "Parameter"
 
-#: libraries/rte/rte_routines.lib.php:829
+#: libraries/rte/rte_routines.lib.php:920
 msgid "Direction"
 msgstr "Arah"
 
-#: libraries/rte/rte_routines.lib.php:847
+#: libraries/rte/rte_routines.lib.php:938
 msgid "Add parameter"
 msgstr "Tambahkan parameter"
 
-#: libraries/rte/rte_routines.lib.php:851
+#: libraries/rte/rte_routines.lib.php:942
 msgid "Remove last parameter"
 msgstr "Hapus parameter terakhir"
 
-#: libraries/rte/rte_routines.lib.php:856
+#: libraries/rte/rte_routines.lib.php:947
 msgid "Return type"
 msgstr "Jenis hasil"
 
-#: libraries/rte/rte_routines.lib.php:862
+#: libraries/rte/rte_routines.lib.php:953
 msgid "Return length/values"
 msgstr "Panjang/nilai hasil"
 
-#: libraries/rte/rte_routines.lib.php:868
+#: libraries/rte/rte_routines.lib.php:959
 msgid "Return options"
 msgstr "Opsi hasil"
 
-#: libraries/rte/rte_routines.lib.php:899
+#: libraries/rte/rte_routines.lib.php:990
 msgid "Is deterministic"
 msgstr "Deterministik"
 
-#: libraries/rte/rte_routines.lib.php:920
+#: libraries/rte/rte_routines.lib.php:1011
 msgid ""
 "You do not have sufficient privileges to perform this operation; Please "
 "refer to the documentation for more details"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:935
+#: libraries/rte/rte_routines.lib.php:1026
 msgid "Security type"
 msgstr "Jenis keamanan"
 
-#: libraries/rte/rte_routines.lib.php:944
+#: libraries/rte/rte_routines.lib.php:1035
 msgid "SQL data access"
 msgstr "Akses data SQL"
 
-#: libraries/rte/rte_routines.lib.php:1013
+#: libraries/rte/rte_routines.lib.php:1104
 #, fuzzy
 #| msgid "You must provide a routine name"
 msgid "You must provide a routine name!"
 msgstr "Anda harus memasukkan nama routine"
 
-#: libraries/rte/rte_routines.lib.php:1047
+#: libraries/rte/rte_routines.lib.php:1138
 #, fuzzy, php-format
 msgid "Invalid direction \"%s\" given for parameter."
 msgstr "Arah tidak valid \"%s\" diberikan untuk parameter."
 
-#: libraries/rte/rte_routines.lib.php:1069
-#: libraries/rte/rte_routines.lib.php:1131
+#: libraries/rte/rte_routines.lib.php:1160
+#: libraries/rte/rte_routines.lib.php:1222
 msgid ""
 "You must provide length/values for routine parameters of type ENUM, SET, "
 "VARCHAR and VARBINARY."
@@ -12621,36 +12635,36 @@ msgstr ""
 "Anda harus memasukkan panjang/nilai untuk parameter routine bagi jenis ENUM, "
 "SET, VARCHAR, dan VARBINARY."
 
-#: libraries/rte/rte_routines.lib.php:1095
+#: libraries/rte/rte_routines.lib.php:1186
 msgid "You must provide a name and a type for each routine parameter."
 msgstr "Anda harus memasukkan nama dan jenis setiap parameter routine."
 
-#: libraries/rte/rte_routines.lib.php:1114
+#: libraries/rte/rte_routines.lib.php:1205
 msgid "You must provide a valid return type for the routine."
 msgstr "Anda harus memasukkan jenis hasil yang valid untuk routine."
 
-#: libraries/rte/rte_routines.lib.php:1174
+#: libraries/rte/rte_routines.lib.php:1265
 msgid "You must provide a routine definition."
 msgstr "Anda harus memasukkan definisi routine."
 
-#: libraries/rte/rte_routines.lib.php:1285
+#: libraries/rte/rte_routines.lib.php:1376
 #, php-format
 msgid "Execution results of routine %s"
 msgstr "Hasil eksekusi routine %s"
 
-#: libraries/rte/rte_routines.lib.php:1340
+#: libraries/rte/rte_routines.lib.php:1431
 #, fuzzy, php-format
 msgid "%d row affected by the last statement inside the procedure."
 msgid_plural "%d rows affected by the last statement inside the procedure."
 msgstr[0] "%d baris terpengaruh oleh pernyataan terakhir dalam prosedur."
 
-#: libraries/rte/rte_routines.lib.php:1398
-#: libraries/rte/rte_routines.lib.php:1406
+#: libraries/rte/rte_routines.lib.php:1489
+#: libraries/rte/rte_routines.lib.php:1497
 msgid "Execute routine"
 msgstr "Jalankan routine"
 
-#: libraries/rte/rte_routines.lib.php:1485
-#: libraries/rte/rte_routines.lib.php:1488
+#: libraries/rte/rte_routines.lib.php:1576
+#: libraries/rte/rte_routines.lib.php:1579
 msgid "Routine parameters"
 msgstr "Parameter routine"
 
@@ -12816,7 +12830,7 @@ msgid "Original position"
 msgstr "Posisi aslinya"
 
 #: libraries/server_bin_log.lib.php:133
-#: templates/structure/display_table_stats.phtml:4
+#: templates/table/structure/display_table_stats.phtml:4
 msgid "Information"
 msgstr "Informasi"
 
@@ -12854,12 +12868,12 @@ msgstr ""
 "Perhatian: Pengaktifan statistik basis data dapat mengakibatkan lalu lintas "
 "besar antara webserver dan server MySQL."
 
-#: libraries/server_databases.lib.php:364
-#: libraries/server_databases.lib.php:365
+#: libraries/server_databases.lib.php:366
+#: libraries/server_databases.lib.php:371
 msgid "Enable Statistics"
 msgstr "Aktifkan Statistik"
 
-#: libraries/server_databases.lib.php:481
+#: libraries/server_databases.lib.php:492
 #, fuzzy, php-format
 #| msgid "%s databases have been dropped successfully."
 msgid "%1$d database has been dropped successfully."
@@ -13253,7 +13267,7 @@ msgid "You have revoked the privileges for %s."
 msgstr "Anda telah mencabut hak akses untuk %s."
 
 #: libraries/server_privileges.lib.php:2059
-#: libraries/server_privileges.lib.php:4290
+#: libraries/server_privileges.lib.php:4316
 #, fuzzy
 #| msgid "Add user group"
 msgid "Add user account"
@@ -13439,43 +13453,43 @@ msgstr "Menghapus %s"
 msgid "The privileges were reloaded successfully."
 msgstr "Hak akses berhasil dimuat ulang."
 
-#: libraries/server_privileges.lib.php:3994
+#: libraries/server_privileges.lib.php:4003
 #, php-format
 msgid "The user %s already exists!"
 msgstr "Pengguna %s telah terdaftar!"
 
-#: libraries/server_privileges.lib.php:4232
+#: libraries/server_privileges.lib.php:4258
 #, fuzzy, php-format
 #| msgid "Privileges"
 msgid "Privileges for %s"
 msgstr "Hak Akses untuk %s"
 
-#: libraries/server_privileges.lib.php:4241
+#: libraries/server_privileges.lib.php:4267
 #: libraries/server_status_processes.lib.php:72
 #: libraries/server_user_groups.lib.php:39
 msgid "User"
 msgstr "Pengguna"
 
-#: libraries/server_privileges.lib.php:4282
+#: libraries/server_privileges.lib.php:4308
 #, fuzzy
 #| msgid "New"
 msgctxt "Create new user"
 msgid "New"
 msgstr "Baru"
 
-#: libraries/server_privileges.lib.php:4311
+#: libraries/server_privileges.lib.php:4337
 #, fuzzy
 #| msgid "Edit Privileges"
 msgid "Edit privileges:"
 msgstr "Edit Hak Akses"
 
-#: libraries/server_privileges.lib.php:4312
+#: libraries/server_privileges.lib.php:4338
 #, fuzzy
 #| msgid "User group"
 msgid "User account"
 msgstr "Grup pengguna"
 
-#: libraries/server_privileges.lib.php:4371
+#: libraries/server_privileges.lib.php:4397
 #, fuzzy
 msgid ""
 "Note: You are attempting to edit privileges of the user with which you are "
@@ -13483,20 +13497,20 @@ msgid ""
 msgstr ""
 "Catatan: Anda mencoba untuk mengedit hak-hak user yang Anda sedang login."
 
-#: libraries/server_privileges.lib.php:4391 libraries/server_users.lib.php:25
+#: libraries/server_privileges.lib.php:4417 libraries/server_users.lib.php:25
 #, fuzzy
 #| msgid "Users overview"
 msgid "User accounts overview"
 msgstr "Ikhtisar pengguna"
 
-#: libraries/server_privileges.lib.php:4459
+#: libraries/server_privileges.lib.php:4485
 msgid ""
 "A user account allowing any user from localhost to connect is present. This "
 "will prevent other users from connecting if the host part of their account "
 "allows a connection from any (%) host."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4500
+#: libraries/server_privileges.lib.php:4526
 #, php-format
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
@@ -13510,7 +13524,7 @@ msgstr ""
 "diubah secara manual. Disarankan untuk %sme-reload profil pengguna%s sebelum "
 "melanjut."
 
-#: libraries/server_privileges.lib.php:4519
+#: libraries/server_privileges.lib.php:4545
 #, fuzzy
 #| msgid ""
 #| "Note: phpMyAdmin gets the users' privileges directly from MySQL's "
@@ -13530,26 +13544,26 @@ msgstr ""
 "diubah secara manual. Disarankan untuk %sme-reload profil pengguna%s sebelum "
 "melanjut."
 
-#: libraries/server_privileges.lib.php:4569
+#: libraries/server_privileges.lib.php:4595
 msgid "The selected user was not found in the privilege table."
 msgstr "Pengguna yang dipilih tidak ditemukan pada tabel hak akses."
 
-#: libraries/server_privileges.lib.php:4801
+#: libraries/server_privileges.lib.php:4827
 msgid "You have added a new user."
 msgstr "Pengguna baru telah ditambahkan."
 
-#: libraries/server_status.lib.php:53
+#: libraries/server_status.lib.php:60
 #, php-format
 msgid "Network traffic since startup: %s"
 msgstr "Lalu lintas jaringan sejak awal: %sw"
 
-#: libraries/server_status.lib.php:66
+#: libraries/server_status.lib.php:73
 #, php-format
 msgid "This MySQL server has been running for %1$s. It started up on %2$s."
 msgstr ""
 "Server MySQL ini telah berjalan selama %1$s. Server ini dijalankan pada %2$s."
 
-#: libraries/server_status.lib.php:80
+#: libraries/server_status.lib.php:94
 msgid ""
 "This MySQL server works as <b>master</b> and <b>slave</b> in <b>replication</"
 "b> process."
@@ -13557,23 +13571,23 @@ msgstr ""
 "Server MySQL ini berfungsi sebagai <b>master</b> dan <b>slave</b> dalam "
 "proses <b>replication</b>."
 
-#: libraries/server_status.lib.php:85
+#: libraries/server_status.lib.php:99
 msgid "This MySQL server works as <b>master</b> in <b>replication</b> process."
 msgstr ""
 "Server MySQL ini berfungsi sebagai <b>master</b> dalam proses "
 "<b>replication</b>."
 
-#: libraries/server_status.lib.php:90
+#: libraries/server_status.lib.php:104
 msgid "This MySQL server works as <b>slave</b> in <b>replication</b> process."
 msgstr ""
 "Server MySQL ini berfungsi sebagai <b>slave</b> dalam proses <b>replication</"
 "b>."
 
-#: libraries/server_status.lib.php:106
+#: libraries/server_status.lib.php:116
 msgid "Replication status"
 msgstr "Status replikasi"
 
-#: libraries/server_status.lib.php:137
+#: libraries/server_status.lib.php:146
 #, fuzzy
 msgid ""
 "On a busy server, the byte counters may overrun, so those statistics as "
@@ -13582,21 +13596,21 @@ msgstr ""
 "Pada server sibuk, counter byte dapat dikuasai, sehingga statistik tersebut "
 "seperti dilansir server MySQL mungkin salah."
 
-#: libraries/server_status.lib.php:148
+#: libraries/server_status.lib.php:157
 msgid "Received"
 msgstr "Penerimaan"
 
-#: libraries/server_status.lib.php:167
+#: libraries/server_status.lib.php:176
 msgid "Sent"
 msgstr "Pengiriman"
 
-#: libraries/server_status.lib.php:234
+#: libraries/server_status.lib.php:243
 #, fuzzy
 #| msgid "max. concurrent connections"
 msgid "Max. concurrent connections"
 msgstr "Koneksi konkuren maksimum"
 
-#: libraries/server_status.lib.php:244
+#: libraries/server_status.lib.php:253
 msgid "Failed attempts"
 msgstr "Gagal"
 
@@ -14792,7 +14806,7 @@ msgstr ""
 msgid "Not implemented yet."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/AlterOperation.php:193
+#: libraries/sql-parser/src/Components/AlterOperation.php:191
 #, fuzzy
 #| msgid "Iconic table operations"
 msgid "Unrecognized alter operation."
@@ -14808,7 +14822,7 @@ msgid "An opening bracket followed by a set of values was expected."
 msgstr ""
 
 #: libraries/sql-parser/src/Components/ArrayObj.php:101
-#: libraries/sql-parser/src/Components/FieldDefinition.php:202
+#: libraries/sql-parser/src/Components/CreateDefinition.php:202
 msgid "An opening bracket was expected."
 msgstr ""
 
@@ -14816,25 +14830,35 @@ msgstr ""
 msgid "A comma or a closing bracket was expected"
 msgstr ""
 
+#: libraries/sql-parser/src/Components/CreateDefinition.php:246
+#, fuzzy
+#| msgid "No tables selected."
+msgid "A comma or a closing bracket was expected."
+msgstr "Tabel belum dipilih."
+
+#: libraries/sql-parser/src/Components/CreateDefinition.php:262
+msgid "A closing bracket was expected."
+msgstr ""
+
 #: libraries/sql-parser/src/Components/DataType.php:125
 msgid "Unrecognized data type."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:225
+#: libraries/sql-parser/src/Components/Expression.php:227
 msgid "Unexpected closing bracket."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:246
-#: libraries/sql-parser/src/Components/Expression.php:283
-#: libraries/sql-parser/src/Components/Expression.php:303
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:285
+#: libraries/sql-parser/src/Components/Expression.php:305
 msgid "An alias was previously found."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:257
+#: libraries/sql-parser/src/Components/Expression.php:259
 msgid "Unexpected dot."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:327
+#: libraries/sql-parser/src/Components/Expression.php:329
 #, fuzzy
 #| msgid "No tables selected."
 msgid "An alias was expected."
@@ -14846,16 +14870,6 @@ msgstr "Tabel belum dipilih."
 msgid "An expression was expected."
 msgstr "Tidak ada baris yang dipilih"
 
-#: libraries/sql-parser/src/Components/FieldDefinition.php:246
-#, fuzzy
-#| msgid "No tables selected."
-msgid "A comma or a closing bracket was expected."
-msgstr "Tabel belum dipilih."
-
-#: libraries/sql-parser/src/Components/FieldDefinition.php:262
-msgid "A closing bracket was expected."
-msgstr ""
-
 #: libraries/sql-parser/src/Components/Limit.php:90
 #: libraries/sql-parser/src/Components/Limit.php:112
 msgid "An offset was expected."
@@ -14903,29 +14917,29 @@ msgstr ""
 msgid "Expected delimiter."
 msgstr ""
 
-#: libraries/sql-parser/src/Lexer.php:753
+#: libraries/sql-parser/src/Lexer.php:777
 #, fuzzy, php-format
 #| msgid "Event %1$s has been created."
 msgid "Ending quote %1$s was expected."
 msgstr "Event %1$s telah dibuat."
 
-#: libraries/sql-parser/src/Lexer.php:789
+#: libraries/sql-parser/src/Lexer.php:813
 #, fuzzy
 #| msgid "Table name template"
 msgid "Variable name was expected."
 msgstr "Templat nama tabel"
 
-#: libraries/sql-parser/src/Parser.php:380
+#: libraries/sql-parser/src/Parser.php:391
 #, fuzzy
 #| msgid "At Beginning of Table"
 msgid "Unexpected beginning of statement."
 msgstr "Pada Awal Tabel"
 
-#: libraries/sql-parser/src/Parser.php:399
+#: libraries/sql-parser/src/Parser.php:410
 msgid "Unrecognized statement type."
 msgstr ""
 
-#: libraries/sql-parser/src/Parser.php:479
+#: libraries/sql-parser/src/Parser.php:489
 msgid "No transaction was previously started."
 msgstr ""
 
@@ -14955,8 +14969,10 @@ msgid "The name of the entity was expected."
 msgstr "Jumlah tabel yang terbuka."
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:310
-msgid "At least one field definition was expected."
-msgstr ""
+#, fuzzy
+#| msgid "The row has been deleted."
+msgid "At least one column definition was expected."
+msgstr "Baris telah dihapus."
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:329
 msgid "A \"RETURNS\" keyword was expected."
@@ -15035,11 +15051,11 @@ msgstr "Markah %s dibuat"
 msgid "Using bookmark \"%s\" as default browse query."
 msgstr "Menggunakan markah \"%s\" sebagai kueri penjelajahan bawaan."
 
-#: libraries/sql.lib.php:1306
+#: libraries/sql.lib.php:1300
 msgid "Showing as PHP code"
 msgstr "Tampilkan sebagai kode PHP"
 
-#: libraries/sql.lib.php:1638
+#: libraries/sql.lib.php:1632
 #, fuzzy, php-format
 #| msgid ""
 #| "This table does not contain a unique column. Features related to the grid "
@@ -15052,7 +15068,7 @@ msgstr ""
 "grid, kotak centang, Edit, Copy dan Delete link mungkin tidak bekerja "
 "setelah disimpan."
 
-#: libraries/sql.lib.php:1649
+#: libraries/sql.lib.php:1643
 #, fuzzy, php-format
 #| msgid ""
 #| "This table does not contain a unique column. Features related to the grid "
@@ -15065,7 +15081,7 @@ msgstr ""
 "grid, kotak centang, Edit, Copy dan Delete link mungkin tidak bekerja "
 "setelah disimpan."
 
-#: libraries/sql.lib.php:1688
+#: libraries/sql.lib.php:1682
 #, php-format
 msgid "Problems with indexes of table `%s`"
 msgstr "Ditemukan masalah dengan indeks dalam tabel `%s`"
@@ -15235,7 +15251,7 @@ msgid "Version %s snapshot (SQL code)"
 msgstr "Versi snapshot %s (kode SQL)"
 
 #: libraries/tracking.lib.php:947
-#: templates/structure/table_structure_row.phtml:33
+#: templates/table/structure/table_structure_row.phtml:33
 msgctxt "None for default"
 msgid "None"
 msgstr "Tidak ada"
@@ -15295,15 +15311,15 @@ msgstr "Buat versi %s dari %s.%s"
 msgid "Version %1$s was created, tracking for %2$s is active."
 msgstr "Versi %s telah dibuat, pelacakan untuk %s.%s diaktifkan."
 
-#: libraries/user_preferences.inc.php:29
+#: libraries/user_preferences.inc.php:30
 msgid "Manage your settings"
 msgstr "Kelola pengaturan Anda"
 
-#: libraries/user_preferences.inc.php:46 prefs_manage.php:307
+#: libraries/user_preferences.inc.php:54 prefs_manage.php:307
 msgid "Configuration has been saved."
 msgstr "Konfigurasi telah disimpan."
 
-#: libraries/user_preferences.inc.php:66
+#: libraries/user_preferences.inc.php:74
 #, fuzzy, php-format
 msgid ""
 "Your preferences will be saved for current session only. Storing them "
@@ -15733,7 +15749,7 @@ msgid "first"
 msgstr "pertama"
 
 #: templates/columns_definitions/move_column.phtml:12
-#: templates/structure/add_column.phtml:21
+#: templates/table/structure/add_column.phtml:21
 #, php-format
 msgid "after %s"
 msgstr "setelah %s"
@@ -15814,228 +15830,333 @@ msgstr "Transformasi Browser"
 msgid "Input transformation options"
 msgstr "Pilihan transformasi"
 
-#: templates/designer/aggregate_query_panel.phtml:22
-#: templates/designer/options_panel.phtml:100
+#: templates/database/create_table.phtml:7
+#: templates/database/designer/side_menu.phtml:77
+#: templates/database/designer/side_menu.phtml:80
+msgid "Create table"
+msgstr "Buat tabel"
+
+#: templates/database/create_table.phtml:15
+msgid "Number of columns"
+msgstr "Jumlah kolom"
+
+#: templates/database/designer/aggregate_query_panel.phtml:22
+#: templates/database/designer/options_panel.phtml:100
 msgid "Aggregate"
 msgstr "Agregasi"
 
-#: templates/designer/aggregate_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:61
-#: templates/designer/options_panel.phtml:106
-#: templates/designer/options_panel.phtml:170
-#: templates/designer/where_query_panel.phtml:30
-#: templates/table/table_header.phtml:9
+#: templates/database/designer/aggregate_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:61
+#: templates/database/designer/options_panel.phtml:106
+#: templates/database/designer/options_panel.phtml:170
+#: templates/database/designer/where_query_panel.phtml:30
+#: templates/table/search/table_header.phtml:9
 msgid "Operator"
 msgstr "Operator"
 
-#: templates/designer/database_tables.phtml:29
+#: templates/database/designer/database_tables.phtml:29
 msgid "Toggle"
 msgstr ""
 
-#: templates/designer/database_tables.phtml:40
+#: templates/database/designer/database_tables.phtml:40
 #, fuzzy
 #| msgid "Table structure"
 msgid "See table structure"
 msgstr "Struktur tabel"
 
-#: templates/designer/delete_relation_panel.phtml:21
+#: templates/database/designer/delete_relation_panel.phtml:21
 msgid "Delete relation"
 msgstr "Hapus relasi"
 
-#: templates/designer/edit_delete_pages.phtml:7
+#: templates/database/designer/edit_delete_pages.phtml:7
 #, fuzzy
 #| msgid "Page titles"
 msgid "Page to open"
 msgstr "Judul halaman"
 
-#: templates/designer/edit_delete_pages.phtml:7
+#: templates/database/designer/edit_delete_pages.phtml:7
 #, fuzzy
 #| msgid "Relation deleted"
 msgid "Page to delete"
 msgstr "Relasi dihapus"
 
-#: templates/designer/having_query_panel.phtml:90
-#: templates/designer/options_panel.phtml:63
-#: templates/designer/options_panel.phtml:229
-#: templates/designer/where_query_panel.phtml:59
+#: templates/database/designer/having_query_panel.phtml:90
+#: templates/database/designer/options_panel.phtml:63
+#: templates/database/designer/options_panel.phtml:229
+#: templates/database/designer/where_query_panel.phtml:59
 msgid "Except"
 msgstr "Kecuali"
 
-#: templates/designer/having_query_panel.phtml:102
-#: templates/designer/options_panel.phtml:75
-#: templates/designer/options_panel.phtml:241
-#: templates/designer/where_query_panel.phtml:71
+#: templates/database/designer/having_query_panel.phtml:102
+#: templates/database/designer/options_panel.phtml:75
+#: templates/database/designer/options_panel.phtml:241
+#: templates/database/designer/where_query_panel.phtml:71
 msgid "subquery"
 msgstr "subkueri"
 
-#: templates/designer/new_relation_panel.phtml:22
-#: templates/designer/side_menu.phtml:84 templates/designer/side_menu.phtml:87
+#: templates/database/designer/new_relation_panel.phtml:22
+#: templates/database/designer/side_menu.phtml:84
+#: templates/database/designer/side_menu.phtml:87
 msgid "Create relation"
 msgstr "Buat relasi"
 
-#: templates/designer/options_panel.phtml:34
-#: templates/designer/options_panel.phtml:200
+#: templates/database/designer/options_panel.phtml:34
+#: templates/database/designer/options_panel.phtml:200
 msgid "Relation operator"
 msgstr "Operator relasi"
 
-#: templates/designer/options_panel.phtml:85
-#: templates/designer/rename_to_panel.phtml:23
+#: templates/database/designer/options_panel.phtml:85
+#: templates/database/designer/rename_to_panel.phtml:23
 msgid "Rename to"
 msgstr "Ubah nama menjadi"
 
-#: templates/designer/options_panel.phtml:91
-#: templates/designer/rename_to_panel.phtml:31
+#: templates/database/designer/options_panel.phtml:91
+#: templates/database/designer/rename_to_panel.phtml:31
 msgid "New name"
 msgstr "Nama baru"
 
-#: templates/designer/page_save_as.phtml:4
+#: templates/database/designer/page_save_as.phtml:4
 #, fuzzy
 #| msgid "Export to selected page"
 msgid "Save to selected page"
 msgstr "Ekspor ke halaman terpilih"
 
-#: templates/designer/page_save_as.phtml:5
+#: templates/database/designer/page_save_as.phtml:5
 #, fuzzy
 #| msgid "Create a page and export to it"
 msgid "Create a page and save to it"
 msgstr "Buat halaman dan ekspor ke dalamnya"
 
-#: templates/designer/page_save_as.phtml:26
+#: templates/database/designer/page_save_as.phtml:26
 #, fuzzy
 #| msgid "New page name: "
 msgid "New page name"
 msgstr "Nama halaman baru: "
 
-#: templates/designer/page_selector.phtml:2
+#: templates/database/designer/page_selector.phtml:2
 msgid "Select page"
 msgstr "Pilih halaman"
 
-#: templates/designer/query_details.phtml:10
+#: templates/database/designer/query_details.phtml:10
 msgid "Active options"
 msgstr "Opsi aktif"
 
-#: templates/designer/schema_export.phtml:4
+#: templates/database/designer/schema_export.phtml:4
 #, fuzzy
 msgid "Select Export Relational Type"
 msgstr "Pilih Ekspor Relational Jenis"
 
-#: templates/designer/side_menu.phtml:19 templates/designer/side_menu.phtml:25
+#: templates/database/designer/side_menu.phtml:19
+#: templates/database/designer/side_menu.phtml:25
 #, fuzzy
 #| msgid "Showing tables"
 msgid "Show/Hide tables list"
 msgstr "Menampilkan tabel"
 
-#: templates/designer/side_menu.phtml:29 templates/designer/side_menu.phtml:35
-#: templates/designer/side_menu.phtml:36
+#: templates/database/designer/side_menu.phtml:29
+#: templates/database/designer/side_menu.phtml:35
+#: templates/database/designer/side_menu.phtml:36
 #, fuzzy
 msgid "View in fullscreen"
 msgstr "Lihat pada layarpenuh"
 
-#: templates/designer/side_menu.phtml:34
+#: templates/database/designer/side_menu.phtml:34
 #, fuzzy
 msgid "Exit fullscreen"
 msgstr "keluar dari layarpenuh"
 
-#: templates/designer/side_menu.phtml:41 templates/designer/side_menu.phtml:45
+#: templates/database/designer/side_menu.phtml:41
+#: templates/database/designer/side_menu.phtml:45
 #, fuzzy
 #| msgid "New name"
 msgid "New page"
 msgstr "Nama baru"
 
-#: templates/designer/side_menu.phtml:70 templates/designer/side_menu.phtml:73
+#: templates/database/designer/side_menu.phtml:70
+#: templates/database/designer/side_menu.phtml:73
 #, fuzzy
 #| msgid "Select page"
 msgid "Delete pages"
 msgstr "Pilih halaman"
 
-#: templates/designer/side_menu.phtml:77 templates/designer/side_menu.phtml:80
-#: templates/table/create_table.phtml:7
-msgid "Create table"
-msgstr "Buat tabel"
-
-#: templates/designer/side_menu.phtml:98
-#: templates/designer/side_menu.phtml:101
+#: templates/database/designer/side_menu.phtml:98
+#: templates/database/designer/side_menu.phtml:101
 msgid "Reload"
 msgstr "Muat ulang"
 
-#: templates/designer/side_menu.phtml:107
-#: templates/designer/side_menu.phtml:110
+#: templates/database/designer/side_menu.phtml:107
+#: templates/database/designer/side_menu.phtml:110
 msgid "Help"
 msgstr "Bantuan"
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Angular links"
 msgstr "Tautan angular"
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Direct links"
 msgstr "Tautan langsung"
 
-#: templates/designer/side_menu.phtml:122
-#: templates/designer/side_menu.phtml:124
+#: templates/database/designer/side_menu.phtml:122
+#: templates/database/designer/side_menu.phtml:124
 msgid "Snap to grid"
 msgstr "Lekatkan kepada kisi"
 
-#: templates/designer/side_menu.phtml:128
-#: templates/designer/side_menu.phtml:134
+#: templates/database/designer/side_menu.phtml:128
+#: templates/database/designer/side_menu.phtml:134
 #, fuzzy
 msgid "Small/Big All"
 msgstr "Kecilkan/Besarkan semua"
 
-#: templates/designer/side_menu.phtml:138
-#: templates/designer/side_menu.phtml:141
+#: templates/database/designer/side_menu.phtml:138
+#: templates/database/designer/side_menu.phtml:141
 #, fuzzy
 msgid "Toggle small/big"
 msgstr "Beralih kecil / besar"
 
-#: templates/designer/side_menu.phtml:145
-#: templates/designer/side_menu.phtml:148
+#: templates/database/designer/side_menu.phtml:145
+#: templates/database/designer/side_menu.phtml:148
 #, fuzzy
 #| msgid "Page creation failed"
 msgid "Toggle relation lines"
 msgstr "Pembuatan halaman gagal"
 
-#: templates/designer/side_menu.phtml:153
-#: templates/designer/side_menu.phtml:156
+#: templates/database/designer/side_menu.phtml:153
+#: templates/database/designer/side_menu.phtml:156
 #, fuzzy
 #| msgid "Export"
 msgid "Export schema"
 msgstr "Ekspor"
 
-#: templates/designer/side_menu.phtml:165
-#: templates/designer/side_menu.phtml:168
+#: templates/database/designer/side_menu.phtml:165
+#: templates/database/designer/side_menu.phtml:168
 msgid "Build Query"
 msgstr "Bangun Kueri"
 
-#: templates/designer/side_menu.phtml:173
-#: templates/designer/side_menu.phtml:177
+#: templates/database/designer/side_menu.phtml:173
+#: templates/database/designer/side_menu.phtml:177
 msgid "Move Menu"
 msgstr "Pindahkan Menu"
 
-#: templates/designer/side_menu.phtml:181
-#: templates/designer/side_menu.phtml:186
+#: templates/database/designer/side_menu.phtml:181
+#: templates/database/designer/side_menu.phtml:186
 #, fuzzy
 #| msgid "Partial texts"
 msgid "Pin text"
 msgstr "Teks parsial"
 
-#: templates/designer/table_list.phtml:4
+#: templates/database/designer/table_list.phtml:4
 msgid "Hide/Show all"
 msgstr "Sembunyikan/Tampilkan semua"
 
-#: templates/designer/table_list.phtml:14
+#: templates/database/designer/table_list.phtml:14
 msgid "Hide/Show Tables with no relation"
 msgstr "Tampilkan/Sembunyikan Tabel tanpa relasi"
 
-#: templates/designer/table_list.phtml:59
+#: templates/database/designer/table_list.phtml:59
 #, fuzzy
 #| msgid "Number of tables"
 msgid "Number of tables:"
 msgstr "Jumlah tabel"
 
+#: templates/database/structure/body_for_table_summary.phtml:6
+#, php-format
+msgid "%s table"
+msgid_plural "%s tables"
+msgstr[0] "%s tabel"
+
+#: templates/database/structure/body_for_table_summary.phtml:17
+msgid "Sum"
+msgstr "Jumlah"
+
+#: templates/database/structure/check_all_tables.phtml:6
+msgid "Check tables having overhead"
+msgstr "Pilih tabel berbeban tambahan"
+
+#: templates/database/structure/check_all_tables.phtml:10
+#, fuzzy
+#| msgid "Show color"
+msgid "Show create"
+msgstr "Tampilkan warna"
+
+#: templates/database/structure/check_all_tables.phtml:27
+#, fuzzy
+#| msgid "Add prefix"
+msgid "Prefix"
+msgstr "Tambahkan prefiks"
+
+#: templates/database/structure/check_all_tables.phtml:28
+msgid "Add prefix to table"
+msgstr "Tambahkan prefiks untuk tabel"
+
+#: templates/database/structure/check_all_tables.phtml:29
+msgid "Replace table prefix"
+msgstr "Ganti prefiks tabel"
+
+#: templates/database/structure/check_all_tables.phtml:30
+msgid "Copy table with prefix"
+msgstr "Salin tabel dengan prefiks"
+
+#: templates/database/structure/check_all_tables.phtml:36
+#, fuzzy
+#| msgid "CHAR textarea columns"
+msgid "Add columns to central list"
+msgstr "Kolom textarea CHAR"
+
+#: templates/database/structure/check_all_tables.phtml:37
+#, fuzzy
+msgid "Remove columns from central list"
+msgstr "Menghapus kolom dari daftar pusat"
+
+#: templates/database/structure/check_all_tables.phtml:38
+#, fuzzy
+#| msgid "CHAR textarea columns"
+msgid "Make consistent with central list"
+msgstr "Kolom textarea CHAR"
+
+#: templates/database/structure/favorite_anchor.phtml:12
+msgid "Add to Favorites"
+msgstr "Tambahkan ke favorit"
+
+#: templates/database/structure/show_create.phtml:2
+#, fuzzy
+#| msgid "Show SQL queries"
+msgid "Showing create queries"
+msgstr "Tampilkan kueri SQL"
+
+#: templates/database/structure/sortable_header.phtml:13
+msgid "Sort"
+msgstr "Urutan"
+
+#: templates/database/structure/table_header.phtml:42
+#, fuzzy
+#| msgid "May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]."
+msgid ""
+"May be approximate. Click on the number to get the exact count. See "
+"[doc@faq3-11]FAQ 3.11[/doc]."
+msgstr "Kemungkinan hanya perkiraan saja. Lihat [doc@faq3-11]FAQ 3.11[/doc]."
+
+#: templates/database/structure/table_header.phtml:66
+#: templates/table/index_form.phtml:127
+msgid "Size"
+msgstr "Ukuran"
+
+#: templates/database/structure/table_header.phtml:74
+#: templates/table/structure/display_table_stats.phtml:27
+msgid "Overhead"
+msgstr "Beban"
+
+#: templates/database/structure/tracking_icon.phtml:4
+msgid "Tracking is active."
+msgstr "Pelacakan aktif."
+
+#: templates/database/structure/tracking_icon.phtml:8
+msgid "Tracking is not active."
+msgstr "Pelacakan tidak aktif."
+
 #: templates/error/report_form.phtml:7
 #, fuzzy
 msgid ""
@@ -16057,67 +16178,6 @@ msgstr "Anda dapat memeriksa data dalam laporan galat:"
 msgid "Please explain the steps that lead to the error:"
 msgstr "Tolong jelaskan langkah-langkah yang mengarah ke kesalahan:"
 
-#: templates/gis_visualization/gis_visualization.phtml:3
-msgid "Display GIS Visualization"
-msgstr "Tampilkan Visualisasi GIS"
-
-#: templates/gis_visualization/gis_visualization.phtml:8
-msgid "Label column"
-msgstr "Kolom label"
-
-#: templates/gis_visualization/gis_visualization.phtml:11
-msgid "-- None --"
-msgstr "-- Tidak ada --"
-
-#: templates/gis_visualization/gis_visualization.phtml:19
-msgid "Spatial column"
-msgstr "Kolom spasial"
-
-#: templates/index_form.phtml:16
-msgid "Index name:"
-msgstr "Nama indeks:"
-
-#: templates/index_form.phtml:19
-msgid ""
-"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
-msgstr ""
-"\"PRIMARY\" <b>harus</b> menjadi nama dan <b>hanya</b> dipakai sebagai nama "
-"kunci primer!"
-
-#: templates/index_form.phtml:40
-#, fuzzy
-#| msgid "Index cache size"
-msgid "Index choice:"
-msgstr "Besar singgahan indeks"
-
-#: templates/index_form.phtml:57
-msgid "Key block size:"
-msgstr ""
-
-#: templates/index_form.phtml:74
-msgid "Index type:"
-msgstr "Jenis indeks:"
-
-#: templates/index_form.phtml:86
-#, fuzzy
-#| msgid "User:"
-msgid "Parser:"
-msgstr "Pengguna:"
-
-#: templates/index_form.phtml:102
-msgid "Comment:"
-msgstr "Komentar:"
-
-#: templates/index_form.phtml:127 templates/structure/table_header.phtml:66
-msgid "Size"
-msgstr "Ukuran"
-
-#: templates/index_form.phtml:149 templates/index_form.phtml:190
-#, fuzzy
-#| msgid "Drag to reorder"
-msgid "Drag to reorder"
-msgstr "Seret untuk mengubah urutan"
-
 #: templates/prefs_autoload.phtml:9
 #, fuzzy
 msgid ""
@@ -16131,405 +16191,175 @@ msgstr ""
 msgid "Start row:"
 msgstr "Awal baris:"
 
-#: templates/structure/actions_in_table_structure.phtml:14
-#, php-format
-msgid "A primary key has been added on %s."
-msgstr "Sebuah kunci primer telah ditambahkan pada %s."
-
-#: templates/structure/actions_in_table_structure.phtml:34
-#: templates/structure/actions_in_table_structure.phtml:54
-#: templates/structure/actions_in_table_structure.phtml:79
-#: templates/structure/actions_in_table_structure.phtml:101
-#, php-format
-msgid "An index has been added on %s."
-msgstr "Sebuah indeks telah ditambahkan pada %s."
-
-#: templates/structure/actions_in_table_structure.phtml:130
-#: templates/structure/check_all_table_column.phtml:59
-#, fuzzy
-#| msgid "Remove column(s)"
-msgid "Remove from central columns"
-msgstr "Hapus kolom"
-
-#: templates/structure/actions_in_table_structure.phtml:138
-#: templates/structure/check_all_table_column.phtml:55
-#, fuzzy
-#| msgid "CHAR textarea columns"
-msgid "Add to central columns"
-msgstr "Kolom textarea CHAR"
-
-#: templates/structure/add_column.phtml:7
-#, php-format
-msgid "Add %s column(s)"
-msgstr "Tambahkan %s kolom"
-
-#: templates/structure/add_column.phtml:12
-#, fuzzy
-#| msgid "At Beginning of Table"
-msgid "at beginning of table"
-msgstr "Pada Awal Tabel"
-
-#: templates/structure/body_for_table_summary.phtml:6
-#, php-format
-msgid "%s table"
-msgid_plural "%s tables"
-msgstr[0] "%s tabel"
-
-#: templates/structure/body_for_table_summary.phtml:17
-msgid "Sum"
-msgstr "Jumlah"
-
-#: templates/structure/check_all_tables.phtml:6
-msgid "Check tables having overhead"
-msgstr "Pilih tabel berbeban tambahan"
-
-#: templates/structure/check_all_tables.phtml:10
-#, fuzzy
-#| msgid "Show color"
-msgid "Show create"
-msgstr "Tampilkan warna"
-
-#: templates/structure/check_all_tables.phtml:27
-#, fuzzy
-#| msgid "Add prefix"
-msgid "Prefix"
-msgstr "Tambahkan prefiks"
-
-#: templates/structure/check_all_tables.phtml:28
-msgid "Add prefix to table"
-msgstr "Tambahkan prefiks untuk tabel"
-
-#: templates/structure/check_all_tables.phtml:29
-msgid "Replace table prefix"
-msgstr "Ganti prefiks tabel"
-
-#: templates/structure/check_all_tables.phtml:30
-msgid "Copy table with prefix"
-msgstr "Salin tabel dengan prefiks"
-
-#: templates/structure/check_all_tables.phtml:36
-#, fuzzy
-#| msgid "CHAR textarea columns"
-msgid "Add columns to central list"
-msgstr "Kolom textarea CHAR"
-
-#: templates/structure/check_all_tables.phtml:37
-#, fuzzy
-msgid "Remove columns from central list"
-msgstr "Menghapus kolom dari daftar pusat"
-
-#: templates/structure/check_all_tables.phtml:38
-#, fuzzy
-#| msgid "CHAR textarea columns"
-msgid "Make consistent with central list"
-msgstr "Kolom textarea CHAR"
-
-#: templates/structure/display_structure.phtml:140 view_create.php:181
-msgid "Edit view"
-msgstr "Tampilan edit"
-
-#: templates/structure/display_table_stats.phtml:9
-msgid "Space usage"
-msgstr "Penggunaan ruang"
-
-#: templates/structure/display_table_stats.phtml:27
-#: templates/structure/table_header.phtml:74
-msgid "Overhead"
-msgstr "Beban"
-
-#: templates/structure/display_table_stats.phtml:32
-msgid "Effective"
-msgstr "Efektif"
-
-#: templates/structure/favorite_anchor.phtml:12
-msgid "Add to Favorites"
-msgstr "Tambahkan ke favorit"
-
-#: templates/structure/move_columns_dialog.phtml:1
-#: templates/structure/optional_action_links.phtml:21
-#, fuzzy
-#| msgid "Remove column(s)"
-msgid "Move columns"
-msgstr "Hapus kolom"
-
-#: templates/structure/move_columns_dialog.phtml:2
-#, fuzzy
-msgid "Move the columns by dragging them up and down."
-msgstr "Pindahkan kolom dengan menyeret mereka naik dan turun."
-
-#: templates/structure/optional_action_links.phtml:9
-msgid "Propose table structure"
-msgstr "Usulkan struktur tabel"
-
-#: templates/structure/optional_action_links.phtml:24
-#, fuzzy
-#| msgid "Propose table structure"
-msgid "Improve table structure"
-msgstr "Usulkan struktur tabel"
-
-#: templates/structure/optional_action_links.phtml:30
-#, fuzzy
-#| msgid "Track table"
-msgid "Track view"
-msgstr "Lacak tabel"
-
-#: templates/structure/row_stats_table.phtml:3
-#, fuzzy
-#| msgid "Row Statistics"
-msgid "Row statistics"
-msgstr "Statistik Baris"
-
-#: templates/structure/row_stats_table.phtml:9
-msgid "static"
-msgstr "statis"
-
-#: templates/structure/row_stats_table.phtml:11
-msgid "dynamic"
-msgstr "dinamis"
-
-#: templates/structure/row_stats_table.phtml:22
-msgid "partitioned"
-msgstr "dipartisi"
-
-#: templates/structure/row_stats_table.phtml:54
-msgid "Row length"
-msgstr "Panjang baris"
-
-#: templates/structure/row_stats_table.phtml:66
-msgid "Row size"
-msgstr "Besar baris"
-
-#: templates/structure/row_stats_table.phtml:73
-msgid "Next autoindex"
-msgstr "Indeks otomatis berikut"
-
-#: templates/structure/secondary_tabs.phtml:14
-#, fuzzy
-#| msgid "Relation view"
-msgid "Relation view"
-msgstr "Tampilan relasi"
-
-#: templates/structure/show_create.phtml:2
-#, fuzzy
-#| msgid "Show SQL queries"
-msgid "Showing create queries"
-msgstr "Tampilkan kueri SQL"
-
-#: templates/structure/sortable_header.phtml:13
-msgid "Sort"
-msgstr "Urutan"
-
-#: templates/structure/table_header.phtml:42
-#, fuzzy
-#| msgid "May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]."
-msgid ""
-"May be approximate. Click on the number to get the exact count. See "
-"[doc@faq3-11]FAQ 3.11[/doc]."
-msgstr "Kemungkinan hanya perkiraan saja. Lihat [doc@faq3-11]FAQ 3.11[/doc]."
-
-#: templates/structure/table_structure_row.phtml:46
-#, php-format
-msgid "Column %s has been dropped."
-msgstr "Kolom %s telah dihapus."
-
-#: templates/structure/tracking_icon.phtml:4
-msgid "Tracking is active."
-msgstr "Pelacakan aktif."
-
-#: templates/structure/tracking_icon.phtml:8
-msgid "Tracking is not active."
-msgstr "Pelacakan tidak aktif."
-
-#: templates/table/create_table.phtml:15
-msgid "Number of columns"
-msgstr "Jumlah kolom"
-
-#: templates/table/options.phtml:8
-msgid "Select columns (at least one):"
-msgstr "Pilih kolom (paling tidak satu):"
-
-#: templates/table/options.phtml:37
-msgid "Add search conditions (body of the \"where\" clause):"
-msgstr "Tambahkan kriteria pencarian (bagian klausa \"where\"):"
-
-#: templates/table/options.phtml:45
-msgid "Number of rows per page"
-msgstr "Jumlah baris per halaman"
-
-#: templates/table/options.phtml:56
-msgid "Display order:"
-msgstr "Urutan tampilan:"
-
-#: templates/table/options_zoom.phtml:6
-msgid "Use this column to label each point"
-msgstr "Gunakan kolom ini untuk label setiap titik"
-
-#: templates/table/options_zoom.phtml:35
-msgid "Maximum rows to plot"
-msgstr "Baris maksimum untuk plot"
-
-#: templates/table/replace_preview.phtml:13
-msgid "Find and replace - preview"
-msgstr "Cari dan gantikan - Pratinjau"
-
-#: templates/table/replace_preview.phtml:18
-msgid "Original string"
-msgstr "String asli"
-
-#: templates/table/replace_preview.phtml:19
-msgid "Replaced string"
-msgstr "Gantikan string"
-
-#: templates/table/replace_preview.phtml:40
-msgid "Replace"
-msgstr "Gantikan"
-
-#: templates/table/rows_zoom.phtml:16
-msgid "Additional search criteria"
-msgstr "Kriteria pencarian tambahan"
-
-#: templates/table/search_and_replace.phtml:3
-msgid "Replace with:"
-msgstr "Ganti dengan:"
-
-#: templates/table/search_and_replace.phtml:22
-msgid "Use regular expression"
-msgstr "Gunakan regular expression"
-
-#: templates/table/selection_form.phtml:12
-msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
-msgstr ""
-"Lakukan \"kueri dengan contoh\" (wildcard: \"%\") untuk dua kolom yang "
-"berbeda"
-
-#: templates/table/selection_form.phtml:34
-msgid "Do a \"query by example\" (wildcard: \"%\")"
-msgstr "Lakukan \"kueri dengan contoh\" (wildcard: \"%\")"
-
-#: templates/table/zoom_result_form.phtml:7
-msgid "Browse/Edit the points"
-msgstr "Lihat/Edit titik"
-
-#: templates/table/zoom_result_form.phtml:15
-msgid "How to use"
-msgstr "Cara pakai"
-
-#: templates/table/zoom_result_form.phtml:23
-msgid "Reset zoom"
-msgstr "Set ulang pembesaran"
-
-#: templates/tbl_chart.phtml:17
+#: templates/table/chart/tbl_chart.phtml:17
 #, fuzzy
 #| msgid "Bar"
 msgctxt "Chart type"
 msgid "Bar"
 msgstr "Batang"
 
-#: templates/tbl_chart.phtml:21
+#: templates/table/chart/tbl_chart.phtml:21
 #, fuzzy
 #| msgid "Column"
 msgctxt "Chart type"
 msgid "Column"
 msgstr "Kolom"
 
-#: templates/tbl_chart.phtml:25
+#: templates/table/chart/tbl_chart.phtml:25
 #, fuzzy
 #| msgid "Line"
 msgctxt "Chart type"
 msgid "Line"
 msgstr "Garis"
 
-#: templates/tbl_chart.phtml:29
+#: templates/table/chart/tbl_chart.phtml:29
 #, fuzzy
 #| msgid "Spline"
 msgctxt "Chart type"
 msgid "Spline"
 msgstr "Spline"
 
-#: templates/tbl_chart.phtml:33
+#: templates/table/chart/tbl_chart.phtml:33
 msgctxt "Chart type"
 msgid "Area"
 msgstr "daerah"
 
-#: templates/tbl_chart.phtml:37
+#: templates/table/chart/tbl_chart.phtml:37
 #, fuzzy
 #| msgid "Pie"
 msgctxt "Chart type"
 msgid "Pie"
 msgstr "Pai"
 
-#: templates/tbl_chart.phtml:41
+#: templates/table/chart/tbl_chart.phtml:41
 #, fuzzy
 #| msgid "Time"
 msgctxt "Chart type"
 msgid "Timeline"
 msgstr "Waktu"
 
-#: templates/tbl_chart.phtml:45
+#: templates/table/chart/tbl_chart.phtml:45
 msgctxt "Chart type"
 msgid "Scatter"
 msgstr "menyebarkan"
 
-#: templates/tbl_chart.phtml:50
+#: templates/table/chart/tbl_chart.phtml:50
 msgid "Stacked"
 msgstr "Bertumpuk"
 
-#: templates/tbl_chart.phtml:53
+#: templates/table/chart/tbl_chart.phtml:53
 msgid "Chart title"
 msgstr "Judul bagan"
 
-#: templates/tbl_chart.phtml:57
+#: templates/table/chart/tbl_chart.phtml:57
 msgid "X-Axis:"
 msgstr "Sumbu-X:"
 
-#: templates/tbl_chart.phtml:72
+#: templates/table/chart/tbl_chart.phtml:72
 msgid "Series:"
 msgstr "Seri:"
 
-#: templates/tbl_chart.phtml:102
+#: templates/table/chart/tbl_chart.phtml:102
 msgid "X-Axis label:"
 msgstr "Label Sumbu-X:"
 
-#: templates/tbl_chart.phtml:104
+#: templates/table/chart/tbl_chart.phtml:104
 msgid "X Values"
 msgstr "Nilai X"
 
-#: templates/tbl_chart.phtml:107
+#: templates/table/chart/tbl_chart.phtml:107
 msgid "Y-Axis label:"
 msgstr "Label Sumbu-Y:"
 
-#: templates/tbl_chart.phtml:115
+#: templates/table/chart/tbl_chart.phtml:115
 #, fuzzy
 msgid "Series names are in a column"
 msgstr "Nama seri dalam kolom"
 
-#: templates/tbl_chart.phtml:118
+#: templates/table/chart/tbl_chart.phtml:118
 #, fuzzy
 #| msgid "Inside column:"
 msgid "Series column:"
 msgstr "Dalam kolom:"
 
-#: templates/tbl_chart.phtml:130
+#: templates/table/chart/tbl_chart.phtml:130
 #, fuzzy
 #| msgid "Values for column %s"
 msgid "Value Column:"
 msgstr "Nilai untuk kolom %s"
 
-#: templates/tbl_chart.phtml:150
+#: templates/table/chart/tbl_chart.phtml:150
 #, fuzzy
 #| msgid "Save as file"
 msgid "Save chart as image"
 msgstr "Simpan sebagai berkas"
 
-#: templates/tbl_relation/common_form.phtml:7
+#: templates/table/gis_visualization/gis_visualization.phtml:3
+msgid "Display GIS Visualization"
+msgstr "Tampilkan Visualisasi GIS"
+
+#: templates/table/gis_visualization/gis_visualization.phtml:8
+msgid "Label column"
+msgstr "Kolom label"
+
+#: templates/table/gis_visualization/gis_visualization.phtml:11
+msgid "-- None --"
+msgstr "-- Tidak ada --"
+
+#: templates/table/gis_visualization/gis_visualization.phtml:19
+msgid "Spatial column"
+msgstr "Kolom spasial"
+
+#: templates/table/index_form.phtml:16
+msgid "Index name:"
+msgstr "Nama indeks:"
+
+#: templates/table/index_form.phtml:19
+msgid ""
+"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
+msgstr ""
+"\"PRIMARY\" <b>harus</b> menjadi nama dan <b>hanya</b> dipakai sebagai nama "
+"kunci primer!"
+
+#: templates/table/index_form.phtml:40
+#, fuzzy
+#| msgid "Index cache size"
+msgid "Index choice:"
+msgstr "Besar singgahan indeks"
+
+#: templates/table/index_form.phtml:57
+msgid "Key block size:"
+msgstr ""
+
+#: templates/table/index_form.phtml:74
+msgid "Index type:"
+msgstr "Jenis indeks:"
+
+#: templates/table/index_form.phtml:86
+#, fuzzy
+#| msgid "User:"
+msgid "Parser:"
+msgstr "Pengguna:"
+
+#: templates/table/index_form.phtml:102
+msgid "Comment:"
+msgstr "Komentar:"
+
+#: templates/table/index_form.phtml:149 templates/table/index_form.phtml:190
+#, fuzzy
+#| msgid "Drag to reorder"
+msgid "Drag to reorder"
+msgstr "Seret untuk mengubah urutan"
+
+#: templates/table/relation/common_form.phtml:7
 msgid "Internal relations"
 msgstr "Relasi internal"
 
-#: templates/tbl_relation/common_form.phtml:11
+#: templates/table/relation/common_form.phtml:11
 msgid "Internal relation"
 msgstr "Relasi internal"
 
-#: templates/tbl_relation/common_form.phtml:14
+#: templates/table/relation/common_form.phtml:14
 #, fuzzy
 msgid ""
 "An internal relation is not necessary when a corresponding FOREIGN KEY "
@@ -16537,25 +16367,25 @@ msgid ""
 msgstr ""
 "Relasi internal tidak diperlukan bila hubungan FOREIGN KEY yang sesuai."
 
-#: templates/tbl_relation/common_form.phtml:37
+#: templates/table/relation/common_form.phtml:37
 #, fuzzy
 #| msgid "Foreign key limit"
 msgid "Foreign key constraints"
 msgstr "Batas foreign key"
 
-#: templates/tbl_relation/common_form.phtml:40
+#: templates/table/relation/common_form.phtml:40
 #, fuzzy
 #| msgid "Action"
 msgid "Actions"
 msgstr "Tindakan"
 
-#: templates/tbl_relation/common_form.phtml:41
+#: templates/table/relation/common_form.phtml:41
 #, fuzzy
 #| msgid "Constraints for table"
 msgid "Constraint properties"
 msgstr "Ketidakleluasaan untuk tabel"
 
-#: templates/tbl_relation/common_form.phtml:44
+#: templates/table/relation/common_form.phtml:44
 #, fuzzy
 msgid ""
 "Only columns with index will be displayed. You can define an index below."
@@ -16563,41 +16393,234 @@ msgstr ""
 "Hanya kolom dengan indeks akan ditampilkan. Anda dapat menentukan indeks di "
 "bawah ini."
 
-#: templates/tbl_relation/common_form.phtml:49
+#: templates/table/relation/common_form.phtml:49
 #, fuzzy
 msgid "Foreign key constraint"
 msgstr "Batasan kunci asing"
 
-#: templates/tbl_relation/common_form.phtml:81
+#: templates/table/relation/common_form.phtml:81
 #, fuzzy
 #| msgid "Add constraints"
 msgid "+ Add constraint"
 msgstr "Tambahkan batasan"
 
-#: templates/tbl_relation/common_form.phtml:91
+#: templates/table/relation/common_form.phtml:91
 #, fuzzy
 #| msgid "Choose column to display"
 msgid "Choose column to display:"
 msgstr "Pilih kolom untuk ditampilkan"
 
-#: templates/tbl_relation/foreign_key_row.phtml:13
+#: templates/table/relation/foreign_key_row.phtml:13
 #, fuzzy, php-format
 #| msgid "Foreign key limit"
 msgid "Foreign key constraint %s has been dropped"
 msgstr "Batas foreign key"
 
-#: templates/tbl_relation/foreign_key_row.phtml:102
+#: templates/table/relation/foreign_key_row.phtml:102
 #, fuzzy
 #| msgid "Constraints for table"
 msgid "Constraint name"
 msgstr "Ketidakleluasaan untuk tabel"
 
-#: templates/tbl_relation/foreign_key_row.phtml:157
+#: templates/table/relation/foreign_key_row.phtml:157
 #, fuzzy
 #| msgid "Add column"
 msgid "+ Add column"
 msgstr "Tambah kolom"
 
+#: templates/table/search/options.phtml:8
+msgid "Select columns (at least one):"
+msgstr "Pilih kolom (paling tidak satu):"
+
+#: templates/table/search/options.phtml:37
+msgid "Add search conditions (body of the \"where\" clause):"
+msgstr "Tambahkan kriteria pencarian (bagian klausa \"where\"):"
+
+#: templates/table/search/options.phtml:45
+msgid "Number of rows per page"
+msgstr "Jumlah baris per halaman"
+
+#: templates/table/search/options.phtml:56
+msgid "Display order:"
+msgstr "Urutan tampilan:"
+
+#: templates/table/search/options_zoom.phtml:6
+msgid "Use this column to label each point"
+msgstr "Gunakan kolom ini untuk label setiap titik"
+
+#: templates/table/search/options_zoom.phtml:35
+msgid "Maximum rows to plot"
+msgstr "Baris maksimum untuk plot"
+
+#: templates/table/search/replace_preview.phtml:13
+msgid "Find and replace - preview"
+msgstr "Cari dan gantikan - Pratinjau"
+
+#: templates/table/search/replace_preview.phtml:18
+msgid "Original string"
+msgstr "String asli"
+
+#: templates/table/search/replace_preview.phtml:19
+msgid "Replaced string"
+msgstr "Gantikan string"
+
+#: templates/table/search/replace_preview.phtml:40
+msgid "Replace"
+msgstr "Gantikan"
+
+#: templates/table/search/rows_zoom.phtml:16
+msgid "Additional search criteria"
+msgstr "Kriteria pencarian tambahan"
+
+#: templates/table/search/search_and_replace.phtml:3
+msgid "Replace with:"
+msgstr "Ganti dengan:"
+
+#: templates/table/search/search_and_replace.phtml:22
+msgid "Use regular expression"
+msgstr "Gunakan regular expression"
+
+#: templates/table/search/selection_form.phtml:12
+msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
+msgstr ""
+"Lakukan \"kueri dengan contoh\" (wildcard: \"%\") untuk dua kolom yang "
+"berbeda"
+
+#: templates/table/search/selection_form.phtml:34
+msgid "Do a \"query by example\" (wildcard: \"%\")"
+msgstr "Lakukan \"kueri dengan contoh\" (wildcard: \"%\")"
+
+#: templates/table/search/zoom_result_form.phtml:7
+msgid "Browse/Edit the points"
+msgstr "Lihat/Edit titik"
+
+#: templates/table/search/zoom_result_form.phtml:15
+msgid "How to use"
+msgstr "Cara pakai"
+
+#: templates/table/search/zoom_result_form.phtml:23
+msgid "Reset zoom"
+msgstr "Set ulang pembesaran"
+
+#: templates/table/secondary_tabs.phtml:14
+#, fuzzy
+#| msgid "Relation view"
+msgid "Relation view"
+msgstr "Tampilan relasi"
+
+#: templates/table/structure/actions_in_table_structure.phtml:14
+#, php-format
+msgid "A primary key has been added on %s."
+msgstr "Sebuah kunci primer telah ditambahkan pada %s."
+
+#: templates/table/structure/actions_in_table_structure.phtml:34
+#: templates/table/structure/actions_in_table_structure.phtml:54
+#: templates/table/structure/actions_in_table_structure.phtml:79
+#: templates/table/structure/actions_in_table_structure.phtml:101
+#, php-format
+msgid "An index has been added on %s."
+msgstr "Sebuah indeks telah ditambahkan pada %s."
+
+#: templates/table/structure/actions_in_table_structure.phtml:130
+#: templates/table/structure/check_all_table_column.phtml:59
+#, fuzzy
+#| msgid "Remove column(s)"
+msgid "Remove from central columns"
+msgstr "Hapus kolom"
+
+#: templates/table/structure/actions_in_table_structure.phtml:138
+#: templates/table/structure/check_all_table_column.phtml:55
+#, fuzzy
+#| msgid "CHAR textarea columns"
+msgid "Add to central columns"
+msgstr "Kolom textarea CHAR"
+
+#: templates/table/structure/add_column.phtml:7
+#, php-format
+msgid "Add %s column(s)"
+msgstr "Tambahkan %s kolom"
+
+#: templates/table/structure/add_column.phtml:12
+#, fuzzy
+#| msgid "At Beginning of Table"
+msgid "at beginning of table"
+msgstr "Pada Awal Tabel"
+
+#: templates/table/structure/display_structure.phtml:140 view_create.php:181
+msgid "Edit view"
+msgstr "Tampilan edit"
+
+#: templates/table/structure/display_table_stats.phtml:9
+msgid "Space usage"
+msgstr "Penggunaan ruang"
+
+#: templates/table/structure/display_table_stats.phtml:32
+msgid "Effective"
+msgstr "Efektif"
+
+#: templates/table/structure/move_columns_dialog.phtml:1
+#: templates/table/structure/optional_action_links.phtml:21
+#, fuzzy
+#| msgid "Remove column(s)"
+msgid "Move columns"
+msgstr "Hapus kolom"
+
+#: templates/table/structure/move_columns_dialog.phtml:2
+#, fuzzy
+msgid "Move the columns by dragging them up and down."
+msgstr "Pindahkan kolom dengan menyeret mereka naik dan turun."
+
+#: templates/table/structure/optional_action_links.phtml:9
+msgid "Propose table structure"
+msgstr "Usulkan struktur tabel"
+
+#: templates/table/structure/optional_action_links.phtml:24
+#, fuzzy
+#| msgid "Propose table structure"
+msgid "Improve table structure"
+msgstr "Usulkan struktur tabel"
+
+#: templates/table/structure/optional_action_links.phtml:30
+#, fuzzy
+#| msgid "Track table"
+msgid "Track view"
+msgstr "Lacak tabel"
+
+#: templates/table/structure/row_stats_table.phtml:3
+#, fuzzy
+#| msgid "Row Statistics"
+msgid "Row statistics"
+msgstr "Statistik Baris"
+
+#: templates/table/structure/row_stats_table.phtml:9
+msgid "static"
+msgstr "statis"
+
+#: templates/table/structure/row_stats_table.phtml:11
+msgid "dynamic"
+msgstr "dinamis"
+
+#: templates/table/structure/row_stats_table.phtml:22
+msgid "partitioned"
+msgstr "dipartisi"
+
+#: templates/table/structure/row_stats_table.phtml:54
+msgid "Row length"
+msgstr "Panjang baris"
+
+#: templates/table/structure/row_stats_table.phtml:66
+msgid "Row size"
+msgstr "Besar baris"
+
+#: templates/table/structure/row_stats_table.phtml:73
+msgid "Next autoindex"
+msgstr "Indeks otomatis berikut"
+
+#: templates/table/structure/table_structure_row.phtml:46
+#, php-format
+msgid "Column %s has been dropped."
+msgstr "Kolom %s telah dihapus."
+
 #: themes.php:17 themes.php:22
 msgid "Theme"
 msgstr "Tema"
@@ -18081,6 +18104,11 @@ msgstr ""
 msgid "concurrent_insert is set to 0"
 msgstr "concurrent_insert diatur ke 0"
 
+#, fuzzy
+#~| msgid "Read misses"
+#~ msgid "Read as multibytes"
+#~ msgstr "Pembacaan yang kelewat"
+
 #~ msgid "Relational display column"
 #~ msgstr "Kolom tampilan relasi"
 
diff --git a/po/it.po b/po/it.po
index 2b098ac7a9..e269fc0451 100644
--- a/po/it.po
+++ b/po/it.po
@@ -3,8 +3,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 4.5.0-dev\n"
 "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
-"POT-Creation-Date: 2015-08-08 13:53-0400\n"
-"PO-Revision-Date: 2015-08-08 22:19+0200\n"
+"POT-Creation-Date: 2015-08-12 08:10-0400\n"
+"PO-Revision-Date: 2015-08-12 21:59+0200\n"
 "Last-Translator: Stefano Martinelli <stefano.ste.martinelli@gmail.com>\n"
 "Language-Team: Italian "
 "<https://hosted.weblate.org/projects/phpmyadmin/master/it/>\n"
@@ -53,7 +53,7 @@ msgid "Table comments:"
 msgstr "Commenti alla tabella:"
 
 #: db_datadict.php:104 libraries/Index.class.php:699
-#: libraries/insert_edit.lib.php:1567
+#: libraries/insert_edit.lib.php:1565
 #: libraries/navigation/Nodes/Node_Column.class.php:30
 #: libraries/plugins/export/ExportHtmlword.class.php:280
 #: libraries/plugins/export/ExportHtmlword.class.php:375
@@ -67,13 +67,14 @@ msgstr "Commenti alla tabella:"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1023
 #: libraries/tracking.lib.php:879 libraries/tracking.lib.php:975
 #: templates/columns_definitions/column_name.phtml:18
-#: templates/index_form.phtml:124 templates/table/table_header.phtml:6
-#: templates/table/zoom_result_form.phtml:33
-#: templates/tbl_relation/common_form.phtml:10
-#: templates/tbl_relation/common_form.phtml:43
-#: templates/tbl_relation/foreign_key_row.phtml:194
-#: templates/tbl_relation/foreign_key_row.phtml:206
-#: templates/tbl_relation/internal_relational_row.phtml:71
+#: templates/table/index_form.phtml:124
+#: templates/table/relation/common_form.phtml:10
+#: templates/table/relation/common_form.phtml:43
+#: templates/table/relation/foreign_key_row.phtml:194
+#: templates/table/relation/foreign_key_row.phtml:206
+#: templates/table/relation/internal_relational_row.phtml:71
+#: templates/table/search/table_header.phtml:6
+#: templates/table/search/zoom_result_form.phtml:33
 msgid "Column"
 msgstr "Colonna"
 
@@ -91,21 +92,21 @@ msgstr "Colonna"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1001
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1024
 #: libraries/rte/rte_list.lib.php:75 libraries/rte/rte_list.lib.php:103
-#: libraries/rte/rte_routines.lib.php:802
-#: libraries/rte/rte_routines.lib.php:831
-#: libraries/rte/rte_routines.lib.php:1493
+#: libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_routines.lib.php:922
+#: libraries/rte/rte_routines.lib.php:1584
 #: libraries/server_privileges.lib.php:2369 libraries/tracking.lib.php:880
 #: libraries/tracking.lib.php:972
 #: templates/columns_definitions/table_fields_definitions.phtml:11
-#: templates/structure/table_header.phtml:48
-#: templates/structure/table_structure_header.phtml:6
-#: templates/table/table_header.phtml:7
+#: templates/database/structure/table_header.phtml:48
+#: templates/table/search/table_header.phtml:7
+#: templates/table/structure/table_structure_header.phtml:6
 msgid "Type"
 msgstr "Tipo"
 
 #: db_datadict.php:106 libraries/Index.class.php:702
 #: libraries/central_columns.lib.php:708
-#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1576
+#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1574
 #: libraries/plugins/export/ExportHtmlword.class.php:286
 #: libraries/plugins/export/ExportHtmlword.class.php:381
 #: libraries/plugins/export/ExportLatex.class.php:509
@@ -118,8 +119,8 @@ msgstr "Tipo"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1026
 #: libraries/tracking.lib.php:882 libraries/tracking.lib.php:978
 #: templates/columns_definitions/table_fields_definitions.phtml:39
-#: templates/structure/table_structure_header.phtml:9
-#: templates/table/zoom_result_form.phtml:34
+#: templates/table/search/zoom_result_form.phtml:34
+#: templates/table/structure/table_structure_header.phtml:9
 msgid "Null"
 msgstr "Null"
 
@@ -137,8 +138,8 @@ msgstr "Null"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1027
 #: libraries/replication_gui.lib.php:153 libraries/tracking.lib.php:883
 #: templates/columns_definitions/table_fields_definitions.phtml:25
-#: templates/structure/body_for_table_summary.phtml:55
-#: templates/structure/table_structure_header.phtml:10
+#: templates/database/structure/body_for_table_summary.phtml:55
+#: templates/table/structure/table_structure_header.phtml:10
 msgid "Default"
 msgstr "Predefinito"
 
@@ -166,19 +167,19 @@ msgid "Comments"
 msgstr "Commenti"
 
 #: db_datadict.php:146
-#: libraries/controllers/StructureController.class.php:1960
-#: libraries/controllers/StructureController.class.php:1965
+#: libraries/controllers/TableStructureController.class.php:951
+#: libraries/controllers/TableStructureController.class.php:956
 #: libraries/tracking.lib.php:922
 #: templates/columns_definitions/column_indexes.phtml:6
-#: templates/structure/check_all_table_column.phtml:22
-#: templates/structure/display_structure.phtml:74
+#: templates/table/structure/check_all_table_column.phtml:22
+#: templates/table/structure/display_structure.phtml:74
 msgid "Primary"
 msgstr "Primaria"
 
 #: db_datadict.php:156 js/messages.php:317 libraries/Index.class.php:567
 #: libraries/Index.class.php:606 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261 libraries/mult_submits.lib.php:403
+#: libraries/config/FormDisplay.tpl.php:272 libraries/mult_submits.lib.php:403
 #: libraries/mult_submits.lib.php:417
 #: libraries/plugins/export/ExportHtmlword.class.php:630
 #: libraries/plugins/export/ExportLatex.class.php:589
@@ -194,20 +195,20 @@ msgstr "Primaria"
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1010 libraries/tracking.lib.php:1015
 #: prefs_manage.php:140 templates/prefs_autoload.phtml:15
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "No"
 msgstr "No"
 
 #: db_datadict.php:156 js/messages.php:443 libraries/Index.class.php:568
 #: libraries/Index.class.php:605 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261
-#: libraries/controllers/StructureController.class.php:1344
-#: libraries/controllers/StructureController.class.php:2223
-#: libraries/controllers/StructureController.class.php:2232
-#: libraries/controllers/StructureController.class.php:2237
-#: libraries/controllers/StructureController.class.php:2242
-#: libraries/controllers/StructureController.class.php:2247
+#: libraries/config/FormDisplay.tpl.php:272
+#: libraries/controllers/TableStructureController.class.php:539
+#: libraries/controllers/TableStructureController.class.php:1201
+#: libraries/controllers/TableStructureController.class.php:1210
+#: libraries/controllers/TableStructureController.class.php:1215
+#: libraries/controllers/TableStructureController.class.php:1220
+#: libraries/controllers/TableStructureController.class.php:1225
 #: libraries/mult_submits.inc.php:82 libraries/mult_submits.inc.php:178
 #: libraries/mult_submits.lib.php:339 libraries/mult_submits.lib.php:372
 #: libraries/mult_submits.lib.php:401 libraries/mult_submits.lib.php:415
@@ -216,8 +217,8 @@ msgstr "No"
 #: libraries/plugins/export/ExportOdt.class.php:756
 #: libraries/plugins/export/ExportTexytext.class.php:567
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1077
-#: libraries/server_databases.lib.php:464
-#: libraries/server_databases.lib.php:474
+#: libraries/server_databases.lib.php:475
+#: libraries/server_databases.lib.php:485
 #: libraries/server_privileges.lib.php:2546
 #: libraries/server_privileges.lib.php:2727
 #: libraries/server_privileges.lib.php:2748
@@ -227,7 +228,7 @@ msgstr "No"
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1008 libraries/tracking.lib.php:1013
 #: prefs_manage.php:138 templates/prefs_autoload.phtml:14
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "Yes"
 msgstr "Sì"
 
@@ -237,7 +238,7 @@ msgstr "Visualizza dump (schema) del database"
 
 #: db_export.php:37 db_tracking.php:90 export.php:382
 #: libraries/DBQbe.class.php:326
-#: libraries/controllers/StructureController.class.php:231
+#: libraries/controllers/DatabaseStructureController.class.php:170
 #: libraries/navigation/NavigationTree.class.php:897
 msgid "No tables found in database."
 msgstr "Non ci sono tabelle nel database."
@@ -248,14 +249,14 @@ msgstr "Non ci sono tabelle nel database."
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:26
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:120
-#: templates/structure/show_create.phtml:18
+#: templates/database/structure/show_create.phtml:18
 msgid "Tables"
 msgstr "Tabelle"
 
 #: db_export.php:52 libraries/Menu.class.php:317 libraries/Menu.class.php:425
-#: libraries/Util.class.php:3333 libraries/Util.class.php:3343
-#: libraries/Util.class.php:3349 libraries/Util.class.php:3629
-#: libraries/Util.class.php:4327 libraries/Util.class.php:4344
+#: libraries/Util.class.php:3339 libraries/Util.class.php:3349
+#: libraries/Util.class.php:3355 libraries/Util.class.php:3635
+#: libraries/Util.class.php:4333 libraries/Util.class.php:4350
 #: libraries/central_columns.lib.php:728 libraries/config.values.php:39
 #: libraries/config.values.php:47 libraries/config.values.php:109
 #: libraries/config.values.php:115 libraries/config/setup.forms.php:323
@@ -269,7 +270,7 @@ msgstr "Tabelle"
 #: libraries/navigation/Nodes/Node_Table.class.php:283
 #: libraries/server_privileges.lib.php:1141 libraries/tracking.lib.php:874
 #: templates/columns_definitions/table_fields_definitions.phtml:3
-#: templates/designer/table_list.phtml:28
+#: templates/database/designer/table_list.phtml:28
 msgid "Structure"
 msgstr "Struttura"
 
@@ -281,7 +282,7 @@ msgstr "Struttura"
 #: libraries/config/user_preferences.forms.php:292
 #: libraries/config/user_preferences.forms.php:297
 #: libraries/server_privileges.lib.php:1140
-#: templates/structure/display_table_stats.phtml:12
+#: templates/table/structure/display_table_stats.phtml:12
 msgid "Data"
 msgstr "Dati"
 
@@ -355,10 +356,10 @@ msgstr "Tabelle monitorate"
 #: libraries/server_privileges.lib.php:2908
 #: libraries/server_privileges.lib.php:3145
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4346
-#: templates/structure/table_header.phtml:21
-#: templates/tbl_relation/foreign_key_row.phtml:176
-#: templates/tbl_relation/internal_relational_row.phtml:63
+#: libraries/server_privileges.lib.php:4372
+#: templates/database/structure/table_header.phtml:21
+#: templates/table/relation/foreign_key_row.phtml:176
+#: templates/table/relation/internal_relational_row.phtml:63
 msgid "Table"
 msgstr "Tabella"
 
@@ -375,7 +376,7 @@ msgid "Updated"
 msgstr "Aggiornato"
 
 #: db_tracking.php:130 js/messages.php:243 libraries/Menu.class.php:552
-#: libraries/Util.class.php:4314 libraries/config.values.php:104
+#: libraries/Util.class.php:4320 libraries/config.values.php:104
 #: libraries/rte/rte_events.lib.php:393 libraries/rte/rte_list.lib.php:101
 #: libraries/server_status_processes.lib.php:92 libraries/tracking.lib.php:279
 msgid "Status"
@@ -384,14 +385,15 @@ msgstr "Stato"
 #: db_tracking.php:131 db_tracking.php:290 libraries/Index.class.php:693
 #: libraries/central_columns.lib.php:687 libraries/rte/rte_list.lib.php:74
 #: libraries/rte/rte_list.lib.php:89 libraries/rte/rte_list.lib.php:102
-#: libraries/server_databases.lib.php:398
+#: libraries/server_databases.lib.php:409
 #: libraries/server_privileges.lib.php:2372
 #: libraries/server_privileges.lib.php:3166
 #: libraries/server_privileges.lib.php:3342
 #: libraries/server_user_groups.lib.php:82
 #: libraries/server_variables.lib.php:189 libraries/tracking.lib.php:280
-#: libraries/tracking.lib.php:793 templates/structure/table_header.phtml:30
-#: templates/structure/table_structure_header.phtml:23
+#: libraries/tracking.lib.php:793
+#: templates/database/structure/table_header.phtml:30
+#: templates/table/structure/table_structure_header.phtml:23
 msgid "Action"
 msgstr "Azione"
 
@@ -433,7 +435,7 @@ msgid "Untracked tables"
 msgstr "Tabelle non monitorate"
 
 #: db_tracking.php:305 db_tracking.php:336
-#: templates/structure/optional_action_links.phtml:17
+#: templates/table/structure/optional_action_links.phtml:17
 msgid "Track table"
 msgstr "Controlla tabella"
 
@@ -487,7 +489,7 @@ msgid "Value for the column \"%s\""
 msgstr "Valore per il campo \"%s\""
 
 #: gis_data_editor.php:146
-#: templates/gis_visualization/gis_visualization.phtml:37
+#: templates/table/gis_visualization/gis_visualization.phtml:37
 msgid "Use OpenStreetMaps as Base Layer"
 msgstr "Usa OpenStreetMaps come livello base"
 
@@ -567,35 +569,35 @@ msgstr "Aggiungi una geometria"
 #: libraries/display_change_password.lib.php:162
 #: libraries/display_export.lib.php:402 libraries/display_export.lib.php:408
 #: libraries/display_import.lib.php:392 libraries/index.lib.php:44
-#: libraries/insert_edit.lib.php:1546 libraries/insert_edit.lib.php:1583
+#: libraries/insert_edit.lib.php:1544 libraries/insert_edit.lib.php:1581
 #: libraries/normalization.lib.php:165 libraries/normalization.lib.php:821
 #: libraries/operations.lib.php:38 libraries/operations.lib.php:108
 #: libraries/operations.lib.php:263 libraries/operations.lib.php:306
 #: libraries/operations.lib.php:801 libraries/operations.lib.php:874
 #: libraries/operations.lib.php:923 libraries/operations.lib.php:1337
 #: libraries/operations.lib.php:1658
-#: libraries/plugins/auth/AuthenticationCookie.class.php:244
+#: libraries/plugins/auth/AuthenticationCookie.class.php:232
 #: libraries/replication_gui.lib.php:122 libraries/replication_gui.lib.php:161
 #: libraries/replication_gui.lib.php:324 libraries/replication_gui.lib.php:461
 #: libraries/replication_gui.lib.php:906 libraries/rte/rte_events.lib.php:509
-#: libraries/rte/rte_routines.lib.php:969
-#: libraries/rte/rte_routines.lib.php:1581
+#: libraries/rte/rte_routines.lib.php:1060
+#: libraries/rte/rte_routines.lib.php:1672
 #: libraries/rte/rte_triggers.lib.php:396 libraries/server_bin_log.lib.php:61
 #: libraries/server_privileges.lib.php:705
 #: libraries/server_privileges.lib.php:2106
 #: libraries/server_privileges.lib.php:2872
 #: libraries/server_privileges.lib.php:3553
-#: libraries/server_privileges.lib.php:4627
+#: libraries/server_privileges.lib.php:4653
 #: libraries/server_user_groups.lib.php:285
 #: libraries/sql_query_form.lib.php:369 libraries/sql_query_form.lib.php:429
 #: libraries/tracking.lib.php:533 libraries/tracking.lib.php:653
 #: prefs_manage.php:277 prefs_manage.php:355
 #: templates/columns_definitions/column_definitions_form.phtml:59
-#: templates/header_location.phtml:17 templates/index_form.phtml:238
+#: templates/database/create_table.phtml:21 templates/header_location.phtml:28
 #: templates/startAndNumberOfRowsPanel.phtml:14
-#: templates/structure/add_column.phtml:25
-#: templates/table/create_table.phtml:21
-#: templates/table/selection_form.phtml:75 view_create.php:275
+#: templates/table/index_form.phtml:238
+#: templates/table/search/selection_form.phtml:75
+#: templates/table/structure/add_column.phtml:25 view_create.php:275
 #: view_operations.php:106
 msgid "Go"
 msgstr "Esegui"
@@ -690,7 +692,7 @@ msgstr ""
 "Non è stato possibile caricare i plugin di importazione, controlla la tua "
 "installazione!"
 
-#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1466
+#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1460
 #, php-format
 msgid "Bookmark %s has been created."
 msgstr "Segnalibro %s creato."
@@ -731,11 +733,11 @@ msgstr ""
 msgid "Back"
 msgstr "Indietro"
 
-#: index.php:148 libraries/Footer.class.php:70
+#: index.php:149 libraries/Footer.class.php:70
 msgid "phpMyAdmin Demo Server"
 msgstr "Server dimostrativo di phpMyAdmin"
 
-#: index.php:152
+#: index.php:153
 #, php-format
 msgid ""
 "You are using the demo server. You can do anything here, but please do not "
@@ -746,110 +748,110 @@ msgstr ""
 "favore non cambiare gli utenti root, debian-sys-maint e pma.\n"
 "Maggiori informazioni sono disponibili su %s."
 
-#: index.php:162
+#: index.php:163
 msgid "General Settings"
 msgstr "Impostazioni Generali"
 
-#: index.php:190 libraries/display_change_password.lib.php:50
+#: index.php:191 libraries/display_change_password.lib.php:50
 #: libraries/display_change_password.lib.php:53 user_password.php:247
 msgid "Change password"
 msgstr "Cambia password"
 
-#: index.php:206
+#: index.php:207
 msgid "Server connection collation"
 msgstr "Collation della connessione del server"
 
-#: index.php:228
+#: index.php:229
 msgid "Appearance Settings"
 msgstr "Impostazioni di Presentazione"
 
-#: index.php:258 prefs_manage.php:285
+#: index.php:259 prefs_manage.php:285
 msgid "More settings"
 msgstr "Ulteriori impostazioni"
 
-#: index.php:279
+#: index.php:280
 msgid "Database server"
 msgstr "Server del Database"
 
-#: index.php:282 libraries/plugins/auth/AuthenticationCookie.class.php:181
+#: index.php:283 libraries/plugins/auth/AuthenticationCookie.class.php:169
 msgid "Server:"
 msgstr "Server:"
 
-#: index.php:286
+#: index.php:287
 msgid "Server type:"
 msgstr "Tipo di server:"
 
-#: index.php:290 libraries/plugins/export/ExportLatex.class.php:212
+#: index.php:291 libraries/plugins/export/ExportLatex.class.php:212
 #: libraries/plugins/export/ExportSql.class.php:687
 #: libraries/plugins/export/ExportXml.class.php:189
 msgid "Server version:"
 msgstr "Versione del server:"
 
-#: index.php:296
+#: index.php:297
 msgid "Protocol version:"
 msgstr "Versione protocollo:"
 
-#: index.php:300
+#: index.php:301
 msgid "User:"
 msgstr "Utente:"
 
-#: index.php:305
+#: index.php:306
 msgid "Server charset:"
 msgstr "Codifica caratteri del server:"
 
-#: index.php:320
+#: index.php:321
 msgid "Web server"
 msgstr "Web server"
 
-#: index.php:331
+#: index.php:332
 msgid "Database client version:"
 msgstr "Versione del client del database:"
 
-#: index.php:335
+#: index.php:336
 msgid "PHP extension:"
 msgstr "Estensione PHP:"
 
-#: index.php:349
+#: index.php:350
 msgid "PHP version:"
 msgstr "Versione PHP:"
 
-#: index.php:360
+#: index.php:361
 msgid "Show PHP information"
 msgstr "Mostra le info sul PHP"
 
-#: index.php:383
+#: index.php:384
 msgid "Version information:"
 msgstr "Informazioni sulla versione:"
 
-#: index.php:392 libraries/Util.class.php:432 libraries/Util.class.php:495
-#: libraries/config/FormDisplay.tpl.php:151
+#: index.php:393 libraries/Util.class.php:432 libraries/Util.class.php:495
+#: libraries/config/FormDisplay.tpl.php:162
 #: libraries/display_export.lib.php:577 libraries/engines/pbxt.lib.php:162
 #: libraries/navigation/NavigationHeader.class.php:196
 #: libraries/server_variables.lib.php:160
 msgid "Documentation"
 msgstr "Documentazione"
 
-#: index.php:399
+#: index.php:400
 msgid "Wiki"
 msgstr "Wiki"
 
-#: index.php:408
+#: index.php:409
 msgid "Official Homepage"
 msgstr "Home page ufficiale di phpMyAdmin"
 
-#: index.php:415
+#: index.php:416
 msgid "Contribute"
 msgstr "Contribuisci"
 
-#: index.php:422
+#: index.php:423
 msgid "Get support"
 msgstr "Ricevi aiuto"
 
-#: index.php:429
+#: index.php:430
 msgid "List of changes"
 msgstr "Lista dei cambiamenti"
 
-#: index.php:451
+#: index.php:452
 msgid ""
 "You are connected as 'root' with no password, which corresponds to the "
 "default MySQL privileged account. Your MySQL server is running with this "
@@ -862,7 +864,7 @@ msgstr ""
 "dovresti realmente sistemare questa falla nella sicurezza impostando una "
 "password per l'utente 'root'."
 
-#: index.php:468
+#: index.php:469
 msgid ""
 "You have enabled mbstring.func_overload in your PHP configuration. This "
 "option is incompatible with phpMyAdmin and might cause some data to be "
@@ -872,7 +874,7 @@ msgstr ""
 "opzione è incompatibile con phpMyAdmin e potrebbe causare la corruzione di "
 "alcuni dati!"
 
-#: index.php:483
+#: index.php:484
 msgid ""
 "The mbstring PHP extension was not found and you seem to be using a "
 "multibyte charset. Without the mbstring extension phpMyAdmin is unable to "
@@ -883,7 +885,7 @@ msgstr ""
 "phpMyAdmin non è in grado di dividere correttamente le stringhe di caratteri "
 "e questo può portare a risultati inaspettati."
 
-#: index.php:500
+#: index.php:501
 msgid ""
 "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini."
 "session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower than "
@@ -895,7 +897,7 @@ msgstr ""
 "alla validitá del cookie configurata in phpMyAdmin; per questo motivo, il "
 "login potrebbe scadere prima di quanto configurato in phpMyAdmin."
 
-#: index.php:519
+#: index.php:520
 msgid ""
 "Login cookie store is lower than cookie validity configured in phpMyAdmin, "
 "because of this, your login will expire sooner than configured in phpMyAdmin."
@@ -904,13 +906,13 @@ msgstr ""
 "phpMyAdmin, per questo motivo, it tuo login scadrá prima di quanto "
 "configurato in phpMyAdmin."
 
-#: index.php:535
+#: index.php:536
 msgid "The configuration file now needs a secret passphrase (blowfish_secret)."
 msgstr ""
 "Adesso c'è bisogno di una password per il file di configurazione "
 "(blowfish_secret)."
 
-#: index.php:548
+#: index.php:549
 msgid ""
 "Directory [code]config[/code], which is used by the setup script, still "
 "exists in your phpMyAdmin directory. It is strongly recommended to remove it "
@@ -923,7 +925,7 @@ msgstr ""
 "caso contrario la sicurezza del vostro server potrebbe essere compromessa da "
 "persone non autorizzate che scaricano la vostra configurazione."
 
-#: index.php:564
+#: index.php:565
 #, php-format
 msgid ""
 "The phpMyAdmin configuration storage is not completely configured, some "
@@ -932,14 +934,14 @@ msgstr ""
 "La configurazione dello storage di phpMyAdmin non é completa, quindi alcune "
 "caratteristiche aggiuntive sono state disattivate. %sScopri perché%s. "
 
-#: index.php:571
+#: index.php:572
 msgid ""
 "Or alternately go to 'Operations' tab of any database to set it up there."
 msgstr ""
 "In alternativa, vai alla scheda 'Operazioni' di qualunque database per "
 "configurarlo da lì."
 
-#: index.php:620
+#: index.php:621
 #, php-format
 msgid ""
 "Your PHP MySQL library version %s differs from your MySQL server version %s. "
@@ -948,7 +950,7 @@ msgstr ""
 "Le tue librerie di PHP per MySQL versione %s sono diverse dalla versione di "
 "MySQL server %s. Potrebbe causare comportamenti imprevedibili."
 
-#: index.php:648
+#: index.php:649
 #, php-format
 msgid ""
 "Server running with Suhosin. Please refer to %sdocumentation%s for possible "
@@ -1109,8 +1111,8 @@ msgstr ""
 msgid "Save & Close"
 msgstr "Salva &amp; Chiudi"
 
-#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:404
-#: libraries/insert_edit.lib.php:1550 prefs_manage.php:361
+#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:415
+#: libraries/insert_edit.lib.php:1548 prefs_manage.php:361
 #: prefs_manage.php:372
 msgid "Reset"
 msgstr "Riavvia"
@@ -1143,7 +1145,7 @@ msgstr "Aggiungi Indice"
 msgid "Edit Index"
 msgstr "Modifica Indice"
 
-#: js/messages.php:99 templates/index_form.phtml:232
+#: js/messages.php:99 templates/table/index_form.phtml:232
 #, php-format
 msgid "Add %s column(s) to index"
 msgstr "Aggiungi %s campo/i all'indice"
@@ -1164,13 +1166,14 @@ msgstr "Composto da:"
 msgid "Please select column(s) for the index."
 msgstr "Selezionare il campo/i per l'indice."
 
-#: js/messages.php:106 templates/structure/add_column.phtml:1
+#: js/messages.php:106 templates/table/structure/add_column.phtml:1
 msgid "You have to add at least one column."
 msgstr "Devi aggiungere almeno un campo."
 
-#: js/messages.php:109 libraries/insert_edit.lib.php:1548
+#: js/messages.php:109 libraries/insert_edit.lib.php:1546
 #: templates/columns_definitions/column_definitions_form.phtml:162
-#: templates/index_form.phtml:237 templates/tbl_relation/common_form.phtml:106
+#: templates/table/index_form.phtml:237
+#: templates/table/relation/common_form.phtml:106
 msgid "Preview SQL"
 msgstr "Anteprima SQL"
 
@@ -1187,7 +1190,7 @@ msgid "SQL query:"
 msgstr "Query SQL:"
 
 #. l10n: Default label for the y-Axis of Charts
-#: js/messages.php:118 templates/tbl_chart.phtml:109
+#: js/messages.php:118 templates/table/chart/tbl_chart.phtml:109
 msgid "Y Values"
 msgstr "Valori per asse Y"
 
@@ -1343,7 +1346,7 @@ msgstr "Byte inviati"
 msgid "Bytes received"
 msgstr "Byte ricevuti"
 
-#: js/messages.php:169 libraries/server_status.lib.php:226
+#: js/messages.php:169 libraries/server_status.lib.php:235
 msgid "Connections"
 msgstr "Connessioni"
 
@@ -1400,12 +1403,12 @@ msgstr "%d tabella/e"
 msgid "Questions"
 msgstr "Domande"
 
-#: js/messages.php:184 libraries/server_status.lib.php:134
+#: js/messages.php:184 libraries/server_status.lib.php:143
 msgid "Traffic"
 msgstr "Traffico"
 
 #: js/messages.php:185 libraries/Menu.class.php:586
-#: libraries/Util.class.php:4318 libraries/server_status_monitor.lib.php:257
+#: libraries/Util.class.php:4324 libraries/server_status_monitor.lib.php:257
 msgid "Settings"
 msgstr "Impostazioni"
 
@@ -1425,8 +1428,9 @@ msgstr "Aggiungi almeno una variabile alla serie!"
 #: libraries/server_status_monitor.lib.php:236
 #: libraries/server_status_processes.lib.php:308
 #: templates/columns_definitions/transformation.phtml:4
-#: templates/designer/options_panel.phtml:178
-#: templates/table/options_zoom.phtml:12 templates/table/rows_zoom.phtml:26
+#: templates/database/designer/options_panel.phtml:178
+#: templates/table/search/options_zoom.phtml:12
+#: templates/table/search/rows_zoom.phtml:26
 msgid "None"
 msgstr "Nessuno"
 
@@ -1718,8 +1722,8 @@ msgstr ""
 
 #: js/messages.php:270 libraries/Menu.class.php:352
 #: libraries/Menu.class.php:455 libraries/Menu.class.php:582
-#: libraries/Util.class.php:4317 libraries/Util.class.php:4332
-#: libraries/Util.class.php:4349 libraries/config/messages.inc.php:258
+#: libraries/Util.class.php:4323 libraries/Util.class.php:4338
+#: libraries/Util.class.php:4355 libraries/config/messages.inc.php:258
 #: libraries/display_import.lib.php:105
 #: libraries/server_status_monitor.lib.php:318 prefs_manage.php:238
 #: setup/frames/menu.inc.php:26
@@ -1779,13 +1783,13 @@ msgid "Formatting SQL..."
 msgstr "Formatto SQL..."
 
 #: js/messages.php:293 libraries/server_variables.lib.php:157
-#: templates/designer/aggregate_query_panel.phtml:63
-#: templates/designer/delete_relation_panel.phtml:28
-#: templates/designer/having_query_panel.phtml:117
-#: templates/designer/new_relation_panel.phtml:88
-#: templates/designer/options_panel.phtml:253
-#: templates/designer/rename_to_panel.phtml:45
-#: templates/designer/where_query_panel.phtml:83
+#: templates/database/designer/aggregate_query_panel.phtml:63
+#: templates/database/designer/delete_relation_panel.phtml:28
+#: templates/database/designer/having_query_panel.phtml:117
+#: templates/database/designer/new_relation_panel.phtml:88
+#: templates/database/designer/options_panel.phtml:253
+#: templates/database/designer/rename_to_panel.phtml:45
+#: templates/database/designer/where_query_panel.phtml:83
 msgid "Cancel"
 msgstr "Annulla"
 
@@ -1793,7 +1797,7 @@ msgstr "Annulla"
 msgid "Page-related settings"
 msgstr "Impostazioni pagina"
 
-#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:402
+#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:413
 msgid "Apply"
 msgstr "Applica"
 
@@ -1828,8 +1832,8 @@ msgstr "Codice errore: %s"
 msgid "Error text: %s"
 msgstr "Messaggio errore: %s"
 
-#: js/messages.php:307 libraries/db_common.inc.php:68
-#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:450
+#: js/messages.php:307 libraries/db_common.inc.php:69
+#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:461
 msgid "No databases selected."
 msgstr "Nessun database selezionato."
 
@@ -1841,12 +1845,13 @@ msgstr "Eliminazione Campo"
 msgid "Adding Primary Key"
 msgstr "Creazione chiave primaria"
 
-#: js/messages.php:310 templates/designer/aggregate_query_panel.phtml:59
-#: templates/designer/having_query_panel.phtml:113
-#: templates/designer/new_relation_panel.phtml:87
-#: templates/designer/options_panel.phtml:252
-#: templates/designer/rename_to_panel.phtml:41
-#: templates/designer/where_query_panel.phtml:82
+#: js/messages.php:310
+#: templates/database/designer/aggregate_query_panel.phtml:59
+#: templates/database/designer/having_query_panel.phtml:113
+#: templates/database/designer/new_relation_panel.phtml:87
+#: templates/database/designer/options_panel.phtml:252
+#: templates/database/designer/rename_to_panel.phtml:41
+#: templates/database/designer/where_query_panel.phtml:82
 msgid "OK"
 msgstr "OK"
 
@@ -1866,7 +1871,7 @@ msgstr "Sto copiando il Database"
 msgid "Changing Charset"
 msgstr "Sto cambiando il charset"
 
-#: js/messages.php:320 libraries/Util.class.php:3217
+#: js/messages.php:320 libraries/Util.class.php:3223
 msgid "Enable foreign key checks"
 msgstr "Abilita i controlli sulle chiavi esterne"
 
@@ -1903,20 +1908,21 @@ msgstr ""
 #: js/messages.php:334 libraries/DisplayResults.class.php:4834
 #: libraries/DisplayResults.class.php:5092 libraries/Menu.class.php:344
 #: libraries/Menu.class.php:446 libraries/Menu.class.php:578
-#: libraries/Util.class.php:3636 libraries/Util.class.php:3637
-#: libraries/Util.class.php:4316 libraries/Util.class.php:4331
-#: libraries/Util.class.php:4348 libraries/config/messages.inc.php:252
+#: libraries/Util.class.php:3642 libraries/Util.class.php:3643
+#: libraries/Util.class.php:4322 libraries/Util.class.php:4337
+#: libraries/Util.class.php:4354 libraries/config/messages.inc.php:252
 #: libraries/display_export.lib.php:173 libraries/rte/rte_list.lib.php:146
 #: libraries/server_privileges.lib.php:2211
 #: libraries/server_privileges.lib.php:2290
 #: libraries/server_privileges.lib.php:2632
 #: libraries/server_privileges.lib.php:3356
 #: libraries/server_status_monitor.lib.php:322 prefs_manage.php:303
-#: setup/frames/menu.inc.php:27 templates/structure/check_all_tables.phtml:11
+#: setup/frames/menu.inc.php:27
+#: templates/database/structure/check_all_tables.phtml:11
 msgid "Export"
 msgstr "Esporta"
 
-#: js/messages.php:337 libraries/rte/rte_routines.lib.php:652
+#: js/messages.php:337 libraries/rte/rte_routines.lib.php:743
 msgid "ENUM/SET editor"
 msgstr "Editor di ENUM/SET"
 
@@ -1957,7 +1963,7 @@ msgstr "Mostra riquadro query SQL"
 #: libraries/Console.class.php:214 libraries/DisplayResults.class.php:3474
 #: libraries/DisplayResults.class.php:4818 libraries/Index.class.php:723
 #: libraries/Util.class.php:706 libraries/Util.class.php:1202
-#: libraries/Util.class.php:3634 libraries/Util.class.php:3635
+#: libraries/Util.class.php:3640 libraries/Util.class.php:3641
 #: libraries/central_columns.lib.php:851
 #: libraries/central_columns.lib.php:1193
 #: libraries/config/messages.inc.php:892
@@ -1975,7 +1981,7 @@ msgstr "Modifica"
 #: libraries/server_user_groups.lib.php:129
 #: libraries/sql_query_form.lib.php:416 libraries/tracking.lib.php:477
 #: setup/frames/index.inc.php:183 setup/frames/index.inc.php:291
-#: templates/designer/delete_relation_panel.phtml:27
+#: templates/database/designer/delete_relation_panel.phtml:27
 msgid "Delete"
 msgstr "Elimina"
 
@@ -2145,11 +2151,11 @@ msgid "No dependencies selected!"
 msgstr "Nessuna dipendenza selezionata!"
 
 #: js/messages.php:394 libraries/central_columns.lib.php:1214
-#: libraries/insert_edit.lib.php:1458 libraries/server_variables.lib.php:155
+#: libraries/insert_edit.lib.php:1456 libraries/server_variables.lib.php:155
 #: setup/frames/config.inc.php:42 setup/frames/index.inc.php:279
 #: templates/columns_definitions/column_definitions_form.phtml:165
-#: templates/gis_visualization/gis_visualization.phtml:48
-#: templates/tbl_relation/common_form.phtml:107
+#: templates/table/gis_visualization/gis_visualization.phtml:48
+#: templates/table/relation/common_form.phtml:107
 msgid "Save"
 msgstr "Salva"
 
@@ -2231,8 +2237,8 @@ msgid "Data point content"
 msgstr "Contenuto del punto"
 
 #: js/messages.php:430 js/messages.php:562 js/messages.php:579
-#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2573
-#: templates/index_form.phtml:154 templates/index_form.phtml:194
+#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2571
+#: templates/table/index_form.phtml:154 templates/table/index_form.phtml:194
 msgid "Ignore"
 msgstr "Ignora"
 
@@ -2293,8 +2299,8 @@ msgstr "Seleziona Foreign Key"
 msgid "Please select the primary key or a unique key!"
 msgstr "Seleziona la chiave primaria o una chiave univoca!"
 
-#: js/messages.php:457 templates/designer/side_menu.phtml:91
-#: templates/designer/side_menu.phtml:94
+#: js/messages.php:457 templates/database/designer/side_menu.phtml:91
+#: templates/database/designer/side_menu.phtml:94
 msgid "Choose column to display"
 msgstr "Scegli il campo da mostrare"
 
@@ -2310,18 +2316,18 @@ msgstr ""
 msgid "Page name"
 msgstr "Nome della pagina"
 
-#: js/messages.php:463 templates/designer/side_menu.phtml:56
-#: templates/designer/side_menu.phtml:59
+#: js/messages.php:463 templates/database/designer/side_menu.phtml:56
+#: templates/database/designer/side_menu.phtml:59
 msgid "Save page"
 msgstr "Salva pagina"
 
-#: js/messages.php:464 templates/designer/side_menu.phtml:63
-#: templates/designer/side_menu.phtml:66
+#: js/messages.php:464 templates/database/designer/side_menu.phtml:63
+#: templates/database/designer/side_menu.phtml:66
 msgid "Save page as"
 msgstr "Salva pagina come"
 
-#: js/messages.php:465 templates/designer/side_menu.phtml:49
-#: templates/designer/side_menu.phtml:52
+#: js/messages.php:465 templates/database/designer/side_menu.phtml:49
+#: templates/database/designer/side_menu.phtml:52
 msgid "Open page"
 msgstr "Apri pagina"
 
@@ -2329,7 +2335,7 @@ msgstr "Apri pagina"
 msgid "Delete page"
 msgstr "Cancella pagina"
 
-#: js/messages.php:467 templates/designer/side_menu.phtml:10
+#: js/messages.php:467 templates/database/designer/side_menu.phtml:10
 msgid "Untitled"
 msgstr "Senza titolo"
 
@@ -2454,7 +2460,7 @@ msgstr "Lunghezza originale"
 msgid "cancel"
 msgstr "Annulla"
 
-#: js/messages.php:499 libraries/server_status.lib.php:271
+#: js/messages.php:499 libraries/server_status.lib.php:280
 msgid "Aborted"
 msgstr "Fallito"
 
@@ -3030,7 +3036,7 @@ msgstr "Si prega di inserire un input HEX valido"
 
 #: js/messages.php:793 libraries/Message.class.php:199
 #: libraries/Util.class.php:654 libraries/core.lib.php:245
-#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1172
+#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1170
 #: tbl_operations.php:229 view_operations.php:63
 msgid "Error"
 msgstr "Errore"
@@ -3092,8 +3098,8 @@ msgstr "al secondo"
 msgid "per minute"
 msgstr "al minuto"
 
-#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:143
-#: libraries/server_status.lib.php:228
+#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:152
+#: libraries/server_status.lib.php:237
 #: libraries/server_status_queries.lib.php:98
 msgid "per hour"
 msgstr "all'ora"
@@ -3113,7 +3119,7 @@ msgstr ""
 "Permessi incorretti sul file di configurazione, non deve essere scrivibile "
 "da tutti!"
 
-#: libraries/Config.class.php:1799
+#: libraries/Config.class.php:1801
 msgid "Font size"
 msgstr "Dimensione font"
 
@@ -3141,10 +3147,10 @@ msgstr "Re-query"
 #: libraries/server_privileges.lib.php:2890
 #: libraries/server_privileges.lib.php:3144
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4332
+#: libraries/server_privileges.lib.php:4358
 #: libraries/server_status_processes.lib.php:80
-#: templates/tbl_relation/foreign_key_row.phtml:165
-#: templates/tbl_relation/internal_relational_row.phtml:55
+#: templates/table/relation/foreign_key_row.phtml:165
+#: templates/table/relation/internal_relational_row.phtml:55
 msgid "Database"
 msgstr "Database"
 
@@ -3237,11 +3243,11 @@ msgstr "History"
 #: libraries/plugins/import/ImportMediawiki.class.php:60
 #: libraries/plugins/import/ImportOds.class.php:59
 #: libraries/plugins/import/ImportShp.class.php:57
-#: libraries/plugins/import/ImportSql.class.php:148
+#: libraries/plugins/import/ImportSql.class.php:51
 #: libraries/plugins/import/ImportXml.class.php:58
-#: libraries/rte/rte_routines.lib.php:833 templates/index_form.phtml:49
-#: templates/structure/row_stats_table.phtml:20
-#: templates/table/options.phtml:2
+#: libraries/rte/rte_routines.lib.php:924 templates/table/index_form.phtml:49
+#: templates/table/search/options.phtml:2
+#: templates/table/structure/row_stats_table.phtml:20
 msgid "Options"
 msgstr "Opzioni"
 
@@ -3274,7 +3280,8 @@ msgstr "decrescente"
 msgid "Order:"
 msgstr "Ordine:"
 
-#: libraries/Console.class.php:289 templates/table/replace_preview.phtml:17
+#: libraries/Console.class.php:289
+#: templates/table/search/replace_preview.phtml:17
 msgid "Count"
 msgstr "Conteggio"
 
@@ -3371,9 +3378,9 @@ msgstr "Passare al tema scuro"
 #: libraries/operations.lib.php:794 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:191
-#: templates/structure/sortable_header.phtml:21
-#: templates/structure/sortable_header.phtml:38
-#: templates/table/options.phtml:68
+#: templates/database/structure/sortable_header.phtml:21
+#: templates/database/structure/sortable_header.phtml:38
+#: templates/table/search/options.phtml:68
 msgid "Ascending"
 msgstr "Crescente"
 
@@ -3383,13 +3390,14 @@ msgstr "Crescente"
 #: libraries/operations.lib.php:797 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:188
-#: templates/structure/sortable_header.phtml:26
-#: templates/structure/sortable_header.phtml:43
-#: templates/table/options.phtml:69
+#: templates/database/structure/sortable_header.phtml:26
+#: templates/database/structure/sortable_header.phtml:43
+#: templates/table/search/options.phtml:69
 msgid "Descending"
 msgstr "Decrescente"
 
-#: libraries/DBQbe.class.php:467 templates/table/search_and_replace.phtml:6
+#: libraries/DBQbe.class.php:467
+#: templates/table/search/search_and_replace.phtml:6
 msgid "Column:"
 msgstr "Colonna:"
 
@@ -3547,12 +3555,12 @@ msgstr[0] "%1$s corrispondenza in <strong>%2$s</strong>"
 msgstr[1] "%1$s corrispondenze in <strong>%2$s</strong>"
 
 #: libraries/DbSearch.class.php:354 libraries/Menu.class.php:311
-#: libraries/Util.class.php:3337 libraries/Util.class.php:3347
-#: libraries/Util.class.php:3623 libraries/Util.class.php:3624
-#: libraries/Util.class.php:4343 libraries/config.values.php:43
+#: libraries/Util.class.php:3343 libraries/Util.class.php:3353
+#: libraries/Util.class.php:3629 libraries/Util.class.php:3630
+#: libraries/Util.class.php:4349 libraries/config.values.php:43
 #: libraries/config.values.php:51 libraries/config.values.php:119
 #: libraries/navigation/Nodes/Node_Table.class.php:295
-#: templates/structure/check_all_table_column.phtml:5
+#: templates/table/structure/check_all_table_column.phtml:5
 msgid "Browse"
 msgstr "Mostra"
 
@@ -3569,7 +3577,8 @@ msgstr "Cerca nel database"
 msgid "Words or values to search for (wildcard: \"%\"):"
 msgstr "Parole o valori da cercare (carattere jolly: \"%\"):"
 
-#: libraries/DbSearch.class.php:401 templates/table/search_and_replace.phtml:1
+#: libraries/DbSearch.class.php:401
+#: templates/table/search/search_and_replace.phtml:1
 msgid "Find:"
 msgstr "Cerca:"
 
@@ -3613,28 +3622,28 @@ msgstr "Filtra righe"
 msgid "Search this table"
 msgstr "Cerca nella tabella"
 
-#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2532
-#: libraries/Util.class.php:2535
+#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2538
+#: libraries/Util.class.php:2541
 msgctxt "First page"
 msgid "Begin"
 msgstr "Inizio"
 
-#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2533
-#: libraries/Util.class.php:2536 libraries/server_bin_log.lib.php:170
+#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2539
+#: libraries/Util.class.php:2542 libraries/server_bin_log.lib.php:170
 #: libraries/server_bin_log.lib.php:172
 msgctxt "Previous page"
 msgid "Previous"
 msgstr "Precedente"
 
-#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2564
-#: libraries/Util.class.php:2574 libraries/server_bin_log.lib.php:204
+#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2570
+#: libraries/Util.class.php:2580 libraries/server_bin_log.lib.php:204
 #: libraries/server_bin_log.lib.php:206
 msgctxt "Next page"
 msgid "Next"
 msgstr "Prossima"
 
-#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2565
-#: libraries/Util.class.php:2575
+#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2571
+#: libraries/Util.class.php:2581
 msgctxt "Last page"
 msgid "End"
 msgstr "Ultima"
@@ -3707,15 +3716,15 @@ msgid "May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]."
 msgstr "Può essere approssimativo. Vedi [doc@faq3-11]FAQ 3.11[/doc]."
 
 #: libraries/DisplayResults.class.php:4332 libraries/Message.class.php:180
-#: libraries/controllers/TableRelationController.class.php:258
+#: libraries/controllers/TableRelationController.class.php:259
 #: libraries/controllers/TableSearchController.class.php:655
-#: libraries/rte/rte_routines.lib.php:1332 libraries/sql_query_form.lib.php:89
+#: libraries/rte/rte_routines.lib.php:1423 libraries/sql_query_form.lib.php:89
 #: tbl_operations.php:227 tbl_row_action.php:138 view_operations.php:62
 msgid "Your SQL query has been executed successfully."
 msgstr "La query SQL è stata eseguita con successo."
 
 #: libraries/DisplayResults.class.php:4660
-#: libraries/controllers/StructureController.class.php:629
+#: libraries/controllers/DatabaseStructureController.class.php:564
 #, php-format
 msgid ""
 "This view has at least this number of rows. Please refer to %sdocumentation"
@@ -3739,33 +3748,33 @@ msgstr "%1$d totali, %2$d nella query"
 msgid "%d total"
 msgstr "%d del totale"
 
-#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1318
+#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1312
 #, php-format
 msgid "Query took %01.4f seconds."
 msgstr "La query ha impiegato %01.4f secondi."
 
 #: libraries/DisplayResults.class.php:4807
-#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4767
-#: libraries/Util.class.php:4773 libraries/mult_submits.inc.php:50
-#: templates/structure/check_all_tables.phtml:2
-#: templates/structure/check_all_tables.phtml:9
+#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4773
+#: libraries/Util.class.php:4779 libraries/mult_submits.inc.php:50
+#: templates/database/structure/check_all_tables.phtml:2
+#: templates/database/structure/check_all_tables.phtml:9
 msgid "With selected:"
 msgstr "Se selezionati:"
 
 #: libraries/DisplayResults.class.php:4811
-#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4769
-#: libraries/Util.class.php:4770 libraries/server_privileges.lib.php:1174
+#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4775
+#: libraries/Util.class.php:4776 libraries/server_privileges.lib.php:1174
 #: libraries/server_privileges.lib.php:1175
 #: libraries/server_privileges.lib.php:1387
 #: libraries/server_user_groups.lib.php:231
-#: templates/structure/check_all_tables.phtml:3
-#: templates/structure/check_all_tables.phtml:4
+#: templates/database/structure/check_all_tables.phtml:3
+#: templates/database/structure/check_all_tables.phtml:4
 msgid "Check All"
 msgstr "Seleziona tutti"
 
 #: libraries/DisplayResults.class.php:4985 libraries/Header.class.php:383
-#: templates/structure/optional_action_links.phtml:1
-#: templates/structure/print_view_data_dictionary_link.phtml:3
+#: templates/database/structure/print_view_data_dictionary_link.phtml:3
+#: templates/table/structure/optional_action_links.phtml:1
 msgid "Print view"
 msgstr "Visualizza per stampa"
 
@@ -3773,7 +3782,8 @@ msgstr "Visualizza per stampa"
 msgid "Query results operations"
 msgstr "Operazioni sui risultati della query"
 
-#: libraries/DisplayResults.class.php:5105 templates/tbl_chart.phtml:12
+#: libraries/DisplayResults.class.php:5105
+#: templates/table/chart/tbl_chart.phtml:12
 msgid "Display chart"
 msgstr "Mostra diagramma"
 
@@ -3864,7 +3874,7 @@ msgid "Click on the bar to scroll to top of page"
 msgstr "Clicca sulla barra per scorrere fino all'inizio della pagina"
 
 #: libraries/Header.class.php:749
-#: libraries/plugins/auth/AuthenticationCookie.class.php:152
+#: libraries/plugins/auth/AuthenticationCookie.class.php:140
 msgid "Javascript must be enabled past this point!"
 msgstr "Da qui in poi, JavaScript deve essere abilitato!"
 
@@ -3886,11 +3896,11 @@ msgid "Keyname"
 msgstr "Chiave"
 
 #: libraries/Index.class.php:697
-#: libraries/controllers/StructureController.class.php:1962
-#: libraries/controllers/StructureController.class.php:1967
+#: libraries/controllers/TableStructureController.class.php:953
+#: libraries/controllers/TableStructureController.class.php:958
 #: libraries/tracking.lib.php:973
 #: templates/columns_definitions/column_indexes.phtml:11
-#: templates/structure/check_all_table_column.phtml:26
+#: templates/table/structure/check_all_table_column.phtml:26
 msgid "Unique"
 msgstr "Unica"
 
@@ -3909,16 +3919,17 @@ msgstr "Cardinalità"
 #: libraries/server_collations.lib.php:35 libraries/tracking.lib.php:881
 #: libraries/tracking.lib.php:977
 #: templates/columns_definitions/table_fields_definitions.phtml:33
-#: templates/structure/row_stats_table.phtml:31
-#: templates/structure/table_header.phtml:55
-#: templates/structure/table_structure_header.phtml:7
-#: templates/table/table_header.phtml:8
+#: templates/database/structure/table_header.phtml:55
+#: templates/table/search/table_header.phtml:8
+#: templates/table/structure/row_stats_table.phtml:31
+#: templates/table/structure/table_structure_header.phtml:7
 msgid "Collation"
 msgstr "Codifica caratteri"
 
 #: libraries/Index.class.php:703 libraries/rte/rte_events.lib.php:496
-#: libraries/rte/rte_routines.lib.php:956 libraries/tracking.lib.php:885
-#: libraries/tracking.lib.php:979 templates/structure/table_header.phtml:84
+#: libraries/rte/rte_routines.lib.php:1047 libraries/tracking.lib.php:885
+#: libraries/tracking.lib.php:979
+#: templates/database/structure/table_header.phtml:84
 msgid "Comment"
 msgstr "Commenti"
 
@@ -3931,15 +3942,15 @@ msgstr "La chiave primaria è stata eliminata."
 msgid "Index %s has been dropped."
 msgstr "L'indice %s è stato eliminato."
 
-#: libraries/Index.class.php:757 libraries/Util.class.php:3630
-#: libraries/Util.class.php:3631
-#: libraries/controllers/StructureController.class.php:1958
-#: libraries/controllers/StructureController.class.php:1959
+#: libraries/Index.class.php:757 libraries/Util.class.php:3636
+#: libraries/Util.class.php:3637
+#: libraries/controllers/TableStructureController.class.php:949
+#: libraries/controllers/TableStructureController.class.php:950
 #: libraries/operations.lib.php:1607 libraries/rte/rte_list.lib.php:150
 #: libraries/server_databases.lib.php:146
-#: templates/structure/check_all_table_column.phtml:15
-#: templates/structure/check_all_tables.phtml:16
-#: templates/tbl_relation/foreign_key_row.phtml:93
+#: templates/database/structure/check_all_tables.phtml:16
+#: templates/table/relation/foreign_key_row.phtml:93
+#: templates/table/structure/check_all_table_column.phtml:15
 msgid "Drop"
 msgstr "Elimina"
 
@@ -3972,16 +3983,16 @@ msgstr "Server"
 #: libraries/Menu.class.php:248
 #: libraries/navigation/Nodes/Node_View.class.php:32
 #: libraries/tbl_info.inc.php:63
-#: templates/structure/structure_table_row.phtml:97
-#: templates/structure/structure_table_row.phtml:159
+#: templates/database/structure/structure_table_row.phtml:97
+#: templates/database/structure/structure_table_row.phtml:159
 msgid "View"
 msgstr "Vista"
 
 #: libraries/Menu.class.php:325 libraries/Menu.class.php:429
-#: libraries/Menu.class.php:548 libraries/Util.class.php:3334
-#: libraries/Util.class.php:3344 libraries/Util.class.php:3350
-#: libraries/Util.class.php:4313 libraries/Util.class.php:4328
-#: libraries/Util.class.php:4345 libraries/config.values.php:40
+#: libraries/Menu.class.php:548 libraries/Util.class.php:3340
+#: libraries/Util.class.php:3350 libraries/Util.class.php:3356
+#: libraries/Util.class.php:4319 libraries/Util.class.php:4334
+#: libraries/Util.class.php:4351 libraries/config.values.php:40
 #: libraries/config.values.php:48 libraries/config.values.php:110
 #: libraries/config.values.php:116 libraries/config/messages.inc.php:321
 #: libraries/navigation/Nodes/Node_Table.class.php:292
@@ -3989,19 +4000,19 @@ msgid "SQL"
 msgstr "SQL"
 
 #: libraries/Menu.class.php:328 libraries/Menu.class.php:432
-#: libraries/Util.class.php:3335 libraries/Util.class.php:3345
-#: libraries/Util.class.php:3351 libraries/Util.class.php:3625
-#: libraries/Util.class.php:3626 libraries/Util.class.php:4329
-#: libraries/Util.class.php:4346 libraries/config.values.php:41
+#: libraries/Util.class.php:3341 libraries/Util.class.php:3351
+#: libraries/Util.class.php:3357 libraries/Util.class.php:3631
+#: libraries/Util.class.php:3632 libraries/Util.class.php:4335
+#: libraries/Util.class.php:4352 libraries/config.values.php:41
 #: libraries/config.values.php:49 libraries/config.values.php:111
 #: libraries/config.values.php:117
 #: libraries/navigation/Nodes/Node_Table.class.php:286
 msgid "Search"
 msgstr "Cerca"
 
-#: libraries/Menu.class.php:338 libraries/Util.class.php:3336
-#: libraries/Util.class.php:3346 libraries/Util.class.php:3627
-#: libraries/Util.class.php:3628 libraries/Util.class.php:4347
+#: libraries/Menu.class.php:338 libraries/Util.class.php:3342
+#: libraries/Util.class.php:3352 libraries/Util.class.php:3633
+#: libraries/Util.class.php:3634 libraries/Util.class.php:4353
 #: libraries/config.values.php:42 libraries/config.values.php:50
 #: libraries/config.values.php:118
 #: libraries/navigation/Nodes/Node_Table.class.php:289
@@ -4010,30 +4021,30 @@ msgid "Insert"
 msgstr "Inserisci"
 
 #: libraries/Menu.class.php:362 libraries/Menu.class.php:467
-#: libraries/Util.class.php:4334 libraries/Util.class.php:4350
+#: libraries/Util.class.php:4340 libraries/Util.class.php:4356
 #: libraries/config.values.php:106 libraries/server_common.lib.php:51
 #: libraries/server_privileges.lib.php:2370
 #: libraries/server_privileges.lib.php:3158
-#: libraries/server_privileges.lib.php:4221
+#: libraries/server_privileges.lib.php:4247
 msgid "Privileges"
 msgstr "Privilegi"
 
 #: libraries/Menu.class.php:371 libraries/Menu.class.php:379
-#: libraries/Menu.class.php:459 libraries/Util.class.php:3338
-#: libraries/Util.class.php:3352 libraries/Util.class.php:4333
-#: libraries/Util.class.php:4351 libraries/config.values.php:112
+#: libraries/Menu.class.php:459 libraries/Util.class.php:3344
+#: libraries/Util.class.php:3358 libraries/Util.class.php:4339
+#: libraries/Util.class.php:4357 libraries/config.values.php:112
 #: view_operations.php:92
 msgid "Operations"
 msgstr "Operazioni"
 
 #: libraries/Menu.class.php:384 libraries/Menu.class.php:492
-#: libraries/Util.class.php:4338 libraries/Util.class.php:4352
+#: libraries/Util.class.php:4344 libraries/Util.class.php:4358
 #: libraries/relation.lib.php:255
 msgid "Tracking"
 msgstr "Monitoraggio"
 
 #: libraries/Menu.class.php:397 libraries/Menu.class.php:486
-#: libraries/Util.class.php:4337 libraries/Util.class.php:4353
+#: libraries/Util.class.php:4343 libraries/Util.class.php:4359
 #: libraries/navigation/Nodes/Node_Trigger_Container.class.php:24
 #: libraries/plugins/export/ExportHtmlword.class.php:557
 #: libraries/plugins/export/ExportOdt.class.php:685
@@ -4050,16 +4061,16 @@ msgstr "Trigger"
 msgid "Database seems to be empty!"
 msgstr "Il database sembra essere vuoto!"
 
-#: libraries/Menu.class.php:439 libraries/Util.class.php:4330
+#: libraries/Menu.class.php:439 libraries/Util.class.php:4336
 msgid "Query"
 msgstr "Query da esempio"
 
-#: libraries/Menu.class.php:472 libraries/Util.class.php:4335
+#: libraries/Menu.class.php:472 libraries/Util.class.php:4341
 #: libraries/rte/rte_words.lib.php:36
 msgid "Routines"
 msgstr "Routine"
 
-#: libraries/Menu.class.php:479 libraries/Util.class.php:4336
+#: libraries/Menu.class.php:479 libraries/Util.class.php:4342
 #: libraries/navigation/Nodes/Node_Event_Container.class.php:26
 #: libraries/plugins/export/ExportSql.class.php:940
 #: libraries/plugins/export/ExportXml.class.php:107
@@ -4067,20 +4078,20 @@ msgstr "Routine"
 msgid "Events"
 msgstr "Eventi"
 
-#: libraries/Menu.class.php:498 libraries/Util.class.php:4339
+#: libraries/Menu.class.php:498 libraries/Util.class.php:4345
 msgid "Designer"
 msgstr "Designer"
 
-#: libraries/Menu.class.php:507 libraries/Util.class.php:4340
-#: templates/structure/check_all_tables.phtml:35
+#: libraries/Menu.class.php:507 libraries/Util.class.php:4346
+#: templates/database/structure/check_all_tables.phtml:35
 msgid "Central columns"
 msgstr "Colonne centrali"
 
-#: libraries/Menu.class.php:544 libraries/Util.class.php:4312
+#: libraries/Menu.class.php:544 libraries/Util.class.php:4318
 #: libraries/config.values.php:103 libraries/config/messages.inc.php:266
 #: libraries/config/messages.inc.php:341
 #: libraries/navigation/NavigationTree.class.php:1239
-#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4332
+#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4358
 msgid "Databases"
 msgstr "Database"
 
@@ -4089,34 +4100,34 @@ msgid "User accounts"
 msgstr "Account utenti"
 
 #: libraries/Menu.class.php:595 libraries/ServerStatusData.class.php:121
-#: libraries/Util.class.php:4319 libraries/server_common.lib.php:36
+#: libraries/Util.class.php:4325 libraries/server_common.lib.php:36
 msgid "Binary log"
 msgstr "Log binario"
 
 #: libraries/Menu.class.php:601 libraries/ServerStatusData.class.php:126
-#: libraries/Util.class.php:4320 libraries/server_common.lib.php:42
-#: templates/structure/body_for_table_summary.phtml:10
-#: templates/structure/table_header.phtml:27
+#: libraries/Util.class.php:4326 libraries/server_common.lib.php:42
+#: templates/database/structure/body_for_table_summary.phtml:10
+#: templates/database/structure/table_header.phtml:27
 msgid "Replication"
 msgstr "Replicazione"
 
 #: libraries/Menu.class.php:606 libraries/ServerStatusData.class.php:193
-#: libraries/Util.class.php:4321 libraries/config.values.php:105
+#: libraries/Util.class.php:4327 libraries/config.values.php:105
 #: libraries/server_engines.lib.php:108 libraries/server_engines.lib.php:112
 #: libraries/sql_query_form.lib.php:421
 msgid "Variables"
 msgstr "Variabili"
 
-#: libraries/Menu.class.php:610 libraries/Util.class.php:4322
+#: libraries/Menu.class.php:610 libraries/Util.class.php:4328
 msgid "Charsets"
 msgstr "Set di caratteri"
 
-#: libraries/Menu.class.php:615 libraries/Util.class.php:4323
+#: libraries/Menu.class.php:615 libraries/Util.class.php:4329
 #: libraries/server_common.lib.php:33 libraries/server_plugins.lib.php:27
 msgid "Plugins"
 msgstr "Plugin"
 
-#: libraries/Menu.class.php:626 libraries/Util.class.php:4324
+#: libraries/Menu.class.php:626 libraries/Util.class.php:4330
 msgid "Engines"
 msgstr "Motori"
 
@@ -4141,7 +4152,7 @@ msgid_plural "%1$d rows inserted."
 msgstr[0] "%1$d riga inserita."
 msgstr[1] "%1$d righe inserite."
 
-#: libraries/PDF.class.php:70 libraries/Util.class.php:2521
+#: libraries/PDF.class.php:70 libraries/Util.class.php:2527
 #: libraries/browse_foreigners.lib.php:327
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:865
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:890
@@ -4162,7 +4173,7 @@ msgid "Could not save favorite table!"
 msgstr "Impossibile salvare la tabella dei preferiti!"
 
 #: libraries/RecentFavoriteTable.class.php:212
-#: templates/structure/favorite_anchor.phtml:12
+#: templates/database/structure/favorite_anchor.phtml:12
 msgid "Remove from Favorites"
 msgstr "Rimuovi dai preferiti"
 
@@ -4329,7 +4340,7 @@ msgstr ""
 "motore di memorizzazione."
 
 #: libraries/StorageEngine.class.php:373
-#: templates/structure/body_for_table_summary.phtml:50
+#: templates/database/structure/body_for_table_summary.phtml:50
 #, php-format
 msgid "%s is the default storage engine on this MySQL server."
 msgstr "%s è il motore di memorizzazione predefinito su questo server MySQL."
@@ -4816,10 +4827,10 @@ msgstr "Sono stati trovati %d errori durante l'analisi."
 
 #: libraries/Util.class.php:726 libraries/rte/rte_events.lib.php:110
 #: libraries/rte/rte_events.lib.php:119 libraries/rte/rte_events.lib.php:150
-#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:153
-#: libraries/rte/rte_routines.lib.php:162
-#: libraries/rte/rte_routines.lib.php:235
-#: libraries/rte/rte_routines.lib.php:1366
+#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:223
+#: libraries/rte/rte_routines.lib.php:250
+#: libraries/rte/rte_routines.lib.php:372
+#: libraries/rte/rte_routines.lib.php:1457
 #: libraries/rte/rte_triggers.lib.php:86 libraries/rte/rte_triggers.lib.php:95
 #: libraries/rte/rte_triggers.lib.php:127
 msgid "MySQL said: "
@@ -4863,75 +4874,78 @@ msgstr "Dom"
 msgid "%B %d, %Y at %I:%M %p"
 msgstr "%B %d, %Y alle %H:%M"
 
-#: libraries/Util.class.php:2019
+#: libraries/Util.class.php:2025
 #, php-format
 msgid "%s days, %s hours, %s minutes and %s seconds"
 msgstr "%s giorni, %s ore, %s minuti e %s secondi"
 
-#: libraries/Util.class.php:2112
+#: libraries/Util.class.php:2118
 msgid "Missing parameter:"
 msgstr "Parametro mancante:"
 
-#: libraries/Util.class.php:2645
+#: libraries/Util.class.php:2651
 #, php-format
 msgid "Jump to database \"%s\"."
 msgstr "Passa al database \"%s\"."
 
-#: libraries/Util.class.php:2670
+#: libraries/Util.class.php:2676
 #, php-format
 msgid "The %s functionality is affected by a known bug, see %s"
 msgstr "La %s funzionalità è affetta da un bug noto, vedi %s"
 
-#: libraries/Util.class.php:2881
+#: libraries/Util.class.php:2887
 msgid "Click to toggle"
 msgstr "Clicca per alternare"
 
-#: libraries/Util.class.php:3542 prefs_manage.php:248
+#: libraries/Util.class.php:3548 prefs_manage.php:248
 msgid "Browse your computer:"
 msgstr "Cerca sul tuo computer:"
 
-#: libraries/Util.class.php:3567
+#: libraries/Util.class.php:3573
 #, php-format
 msgid "Select from the web server upload directory <b>%s</b>:"
 msgstr "Selezionare dalla cartella di upload del server web <b>%s</b>:"
 
-#: libraries/Util.class.php:3596 libraries/insert_edit.lib.php:1173
+#: libraries/Util.class.php:3602 libraries/insert_edit.lib.php:1171
 msgid "The directory you set for upload work cannot be reached."
 msgstr "La directory impostata per l'upload non può essere trovata."
 
-#: libraries/Util.class.php:3607
+#: libraries/Util.class.php:3613
 msgid "There are no files to upload!"
 msgstr "Nessun file da caricare!"
 
-#: libraries/Util.class.php:3632 libraries/Util.class.php:3633
-#: templates/structure/check_all_tables.phtml:15
+#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: templates/database/structure/check_all_tables.phtml:15
 msgid "Empty"
 msgstr "Svuota"
 
-#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: libraries/Util.class.php:3644 libraries/Util.class.php:3645
 msgid "Execute"
 msgstr "Esegui"
 
-#: libraries/Util.class.php:4152
+#: libraries/Util.class.php:4158
 msgid "Print"
 msgstr "Stampa"
 
-#: libraries/Util.class.php:4257 templates/structure/row_stats_table.phtml:80
-#: templates/structure/table_header.phtml:95
+#: libraries/Util.class.php:4263
+#: templates/database/structure/table_header.phtml:95
+#: templates/table/structure/row_stats_table.phtml:80
 msgid "Creation"
 msgstr "Creazione"
 
-#: libraries/Util.class.php:4263 templates/structure/row_stats_table.phtml:87
-#: templates/structure/table_header.phtml:106
+#: libraries/Util.class.php:4269
+#: templates/database/structure/table_header.phtml:106
+#: templates/table/structure/row_stats_table.phtml:87
 msgid "Last update"
 msgstr "Ultimo cambiamento"
 
-#: libraries/Util.class.php:4269 templates/structure/row_stats_table.phtml:94
-#: templates/structure/table_header.phtml:117
+#: libraries/Util.class.php:4275
+#: templates/database/structure/table_header.phtml:117
+#: templates/table/structure/row_stats_table.phtml:94
 msgid "Last check"
 msgstr "Ultimo controllo"
 
-#: libraries/Util.class.php:4315
+#: libraries/Util.class.php:4321
 msgid "Users"
 msgstr "Utenti"
 
@@ -4952,16 +4966,16 @@ msgid "Use this value"
 msgstr "Usa questo valore"
 
 #: libraries/build_html_for_db.lib.php:33 libraries/import.lib.php:193
-#: templates/structure/actions_in_table_structure.phtml:113
-#: templates/structure/row_stats_table.phtml:42
-#: templates/structure/table_header.phtml:36
+#: templates/database/structure/table_header.phtml:36
+#: templates/table/structure/actions_in_table_structure.phtml:113
+#: templates/table/structure/row_stats_table.phtml:42
 msgid "Rows"
 msgstr "Righe"
 
 #: libraries/build_html_for_db.lib.php:48 libraries/engines/innodb.lib.php:171
-#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:186
-#: libraries/server_status.lib.php:298
-#: templates/structure/display_table_stats.phtml:40
+#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:195
+#: libraries/server_status.lib.php:307
+#: templates/table/structure/display_table_stats.phtml:40
 msgid "Total"
 msgstr "Totale"
 
@@ -4970,10 +4984,12 @@ msgid "Jump to database"
 msgstr "Vai al database"
 
 #: libraries/build_html_for_db.lib.php:146
+#: templates/database/structure/structure_table_row.phtml:15
 msgid "Not replicated"
 msgstr "Non replicato"
 
 #: libraries/build_html_for_db.lib.php:158
+#: templates/database/structure/structure_table_row.phtml:16
 msgid "Replicated"
 msgstr "Replicato"
 
@@ -5029,17 +5045,17 @@ msgstr "NO"
 #: libraries/plugins/export/ExportTexytext.class.php:425
 #: libraries/plugins/export/PMA_ExportPdf.class.php:307
 #: libraries/rte/rte_list.lib.php:73 libraries/rte/rte_list.lib.php:85
-#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:830
-#: libraries/rte/rte_routines.lib.php:1492 setup/frames/index.inc.php:162
+#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:921
+#: libraries/rte/rte_routines.lib.php:1583 setup/frames/index.inc.php:162
 #: templates/columns_definitions/table_fields_definitions.phtml:8
-#: templates/structure/table_structure_header.phtml:5
-#: templates/table/create_table.phtml:11
+#: templates/database/create_table.phtml:11
+#: templates/table/structure/table_structure_header.phtml:5
 msgid "Name"
 msgstr "Nome"
 
 #: libraries/central_columns.lib.php:699
 #: libraries/central_columns.lib.php:1381
-#: libraries/rte/rte_routines.lib.php:832
+#: libraries/rte/rte_routines.lib.php:923
 #: templates/columns_definitions/table_fields_definitions.phtml:14
 msgid "Length/Values"
 msgstr "Lunghezza/Valori"
@@ -5058,7 +5074,7 @@ msgid "Select a table"
 msgstr "Seleziona una tabella"
 
 #: libraries/central_columns.lib.php:804
-#: templates/structure/add_column.phtml:4
+#: templates/table/structure/add_column.phtml:4
 msgid "Add column"
 msgstr "Aggiungi campo"
 
@@ -5074,7 +5090,7 @@ msgstr "Aggiungi nuovo campo"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1002
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1025
 #: templates/columns_definitions/table_fields_definitions.phtml:36
-#: templates/structure/table_structure_header.phtml:8
+#: templates/table/structure/table_structure_header.phtml:8
 msgid "Attributes"
 msgstr "Attributi"
 
@@ -5192,7 +5208,7 @@ msgid "Double click"
 msgstr "Doppio click"
 
 #: libraries/config.values.php:95 libraries/config.values.php:124
-#: libraries/config/FormDisplay.tpl.php:221 libraries/relation.lib.php:97
+#: libraries/config/FormDisplay.tpl.php:232 libraries/relation.lib.php:97
 #: libraries/relation.lib.php:105
 msgid "Disabled"
 msgstr "Disabilitata"
@@ -5364,23 +5380,23 @@ msgstr ""
 msgid "maximum %s"
 msgstr "massimo %s"
 
-#: libraries/config/FormDisplay.tpl.php:219
+#: libraries/config/FormDisplay.tpl.php:230
 msgid "This setting is disabled, it will not be applied to your configuration."
 msgstr ""
 "Questa impostazione è disabilitata, non sarà applicata alla tua "
 "configurazione."
 
-#: libraries/config/FormDisplay.tpl.php:313
+#: libraries/config/FormDisplay.tpl.php:324
 #, php-format
 msgid "Set value: %s"
 msgstr "Imposta valore: %s"
 
-#: libraries/config/FormDisplay.tpl.php:318
+#: libraries/config/FormDisplay.tpl.php:329
 #: libraries/config/messages.inc.php:610
 msgid "Restore default value"
 msgstr "Ripristinare valori predefiniti"
 
-#: libraries/config/FormDisplay.tpl.php:332
+#: libraries/config/FormDisplay.tpl.php:343
 msgid "Allow users to customize this value"
 msgstr "Consente agli utenti di personalizzare questo valore"
 
@@ -5882,7 +5898,7 @@ msgstr "Codifica dei caratteri del file"
 
 #: libraries/config/messages.inc.php:136 libraries/config/messages.inc.php:152
 #: libraries/sql_query_form.lib.php:247
-#: templates/structure/row_stats_table.phtml:7
+#: templates/table/structure/row_stats_table.phtml:7
 msgid "Format"
 msgstr "Formato"
 
@@ -6400,7 +6416,7 @@ msgstr ""
 
 #: libraries/config/messages.inc.php:332
 #: libraries/plugins/export/ExportPdf.class.php:279
-#: templates/structure/secondary_tabs.phtml:8
+#: templates/table/secondary_tabs.phtml:8
 msgid "Table structure"
 msgstr "Struttura della tabella"
 
@@ -8114,103 +8130,33 @@ msgstr "Microsoft Word 2000"
 msgid "OpenDocument Text"
 msgstr "Testo OpenDocument"
 
-#: libraries/controllers/StructureController.class.php:465
+#: libraries/controllers/DatabaseStructureController.class.php:405
 #: tbl_operations.php:382
 #, php-format
 msgid "Table %s has been emptied."
 msgstr "La tabella %s è stata svuotata."
 
-#: libraries/controllers/StructureController.class.php:486
+#: libraries/controllers/DatabaseStructureController.class.php:426
 #: tbl_operations.php:400 view_operations.php:119
 #, php-format
 msgid "View %s has been dropped."
 msgstr "La vista %s è stata eliminata."
 
-#: libraries/controllers/StructureController.class.php:487
+#: libraries/controllers/DatabaseStructureController.class.php:427
 #: tbl_operations.php:401
 #, php-format
 msgid "Table %s has been dropped."
 msgstr "La tabella %s è stata eliminata."
 
-#: libraries/controllers/StructureController.class.php:797
-#, php-format
-msgid "The name '%s' is a MySQL reserved keyword."
-msgid_plural "The names '%s' are MySQL reserved keywords."
-msgstr[0] "Il nome '%s' è un termine riservato MySQL."
-msgstr[1] "I nomi '%s' sono termini riservati MySQL."
-
-#: libraries/controllers/StructureController.class.php:875
-msgid "No column selected."
-msgstr "Nessuna colonna selezionata."
-
-#: libraries/controllers/StructureController.class.php:1049
+#: libraries/controllers/DatabaseStructureController.class.php:733
 msgid "Favorite List is full!"
 msgstr "La lista dei preferiti è piena!"
 
-#: libraries/controllers/StructureController.class.php:1272
-msgid "The columns have been moved successfully."
-msgstr "I campi sono stati spostati con successo."
-
-#: libraries/controllers/StructureController.class.php:1535
-#, php-format
-msgid ""
-"Table %1$s has been altered successfully. Privileges have been adjusted."
-msgstr ""
-"La tabella %1$s è già stata modificata con successo. I privilegi sono stati "
-"adattati."
-
-#: libraries/controllers/StructureController.class.php:1541
-#: libraries/controllers/TableIndexesController.class.php:161
-#: tbl_addfield.php:92
-#, php-format
-msgid "Table %1$s has been altered successfully."
-msgstr "La tabella %1$s è già stata modificata con successo."
-
-#: libraries/controllers/StructureController.class.php:1588
-#: libraries/tracking.lib.php:1094
-msgid "Query error"
-msgstr "Errore nella query"
-
-#: libraries/controllers/StructureController.class.php:1806
+#: libraries/controllers/DatabaseStructureController.class.php:947
 #: libraries/mysql_charsets.lib.php:366 libraries/mysql_charsets.lib.php:373
 msgid "unknown"
 msgstr "sconosciuto"
 
-#: libraries/controllers/StructureController.class.php:1957
-#: templates/structure/check_all_table_column.phtml:11
-msgid "Change"
-msgstr "Modifica"
-
-#: libraries/controllers/StructureController.class.php:1961
-#: libraries/controllers/StructureController.class.php:1966
-#: libraries/navigation/Nodes/Node_Index.class.php:30
-#: libraries/tracking.lib.php:926
-#: templates/columns_definitions/column_indexes.phtml:16
-#: templates/columns_definitions/table_fields_definitions.phtml:57
-#: templates/structure/check_all_table_column.phtml:30
-#: templates/structure/display_structure.phtml:79
-#: templates/structure/display_table_stats.phtml:19
-msgid "Index"
-msgstr "Indice"
-
-#: libraries/controllers/StructureController.class.php:1963
-#: libraries/controllers/StructureController.class.php:1968
-#: templates/columns_definitions/column_indexes.phtml:27
-#: templates/structure/check_all_table_column.phtml:37
-msgid "Spatial"
-msgstr "Spaziale"
-
-#: libraries/controllers/StructureController.class.php:1964
-#: libraries/controllers/StructureController.class.php:1969
-#: templates/columns_definitions/column_indexes.phtml:22
-#: templates/structure/check_all_table_column.phtml:47
-msgid "Fulltext"
-msgstr "Testo completo"
-
-#: libraries/controllers/StructureController.class.php:1970
-msgid "Distinct values"
-msgstr "Valori distinti"
-
 #: libraries/controllers/TableChartController.class.php:82
 #: libraries/controllers/TableGisVisualizationController.class.php:101
 msgid "No SQL query was set to fetch data."
@@ -8225,11 +8171,18 @@ msgstr ""
 msgid "No data to display"
 msgstr "Nessun dato da visualizzare"
 
-#: libraries/controllers/TableRelationController.class.php:217
+#: libraries/controllers/TableIndexesController.class.php:161
+#: libraries/controllers/TableStructureController.class.php:736
+#: tbl_addfield.php:92
+#, php-format
+msgid "Table %1$s has been altered successfully."
+msgstr "La tabella %1$s è già stata modificata con successo."
+
+#: libraries/controllers/TableRelationController.class.php:218
 msgid "Display column was successfully updated."
 msgstr "Il campo display è stato aggiornato con successo."
 
-#: libraries/controllers/TableRelationController.class.php:283
+#: libraries/controllers/TableRelationController.class.php:288
 msgid "Internal relations were successfully updated."
 msgstr "Le relazioni interne sono state aggiornate con successo."
 
@@ -8242,10 +8195,73 @@ msgid "Zoom search"
 msgstr "Ricerca Zoom"
 
 #: libraries/controllers/TableSearchController.class.php:852
-#: templates/table/selection_form.phtml:59
+#: templates/table/search/selection_form.phtml:59
 msgid "Find and replace"
 msgstr "Trova e sostituisci"
 
+#: libraries/controllers/TableStructureController.class.php:163
+#, php-format
+msgid "The name '%s' is a MySQL reserved keyword."
+msgid_plural "The names '%s' are MySQL reserved keywords."
+msgstr[0] "Il nome '%s' è un termine riservato MySQL."
+msgstr[1] "I nomi '%s' sono termini riservati MySQL."
+
+#: libraries/controllers/TableStructureController.class.php:241
+msgid "No column selected."
+msgstr "Nessuna colonna selezionata."
+
+#: libraries/controllers/TableStructureController.class.php:467
+msgid "The columns have been moved successfully."
+msgstr "I campi sono stati spostati con successo."
+
+#: libraries/controllers/TableStructureController.class.php:730
+#, php-format
+msgid ""
+"Table %1$s has been altered successfully. Privileges have been adjusted."
+msgstr ""
+"La tabella %1$s è già stata modificata con successo. I privilegi sono stati "
+"adattati."
+
+#: libraries/controllers/TableStructureController.class.php:783
+#: libraries/tracking.lib.php:1094
+msgid "Query error"
+msgstr "Errore nella query"
+
+#: libraries/controllers/TableStructureController.class.php:948
+#: templates/table/structure/check_all_table_column.phtml:11
+msgid "Change"
+msgstr "Modifica"
+
+#: libraries/controllers/TableStructureController.class.php:952
+#: libraries/controllers/TableStructureController.class.php:957
+#: libraries/navigation/Nodes/Node_Index.class.php:30
+#: libraries/tracking.lib.php:926
+#: templates/columns_definitions/column_indexes.phtml:16
+#: templates/columns_definitions/table_fields_definitions.phtml:57
+#: templates/table/structure/check_all_table_column.phtml:30
+#: templates/table/structure/display_structure.phtml:79
+#: templates/table/structure/display_table_stats.phtml:19
+msgid "Index"
+msgstr "Indice"
+
+#: libraries/controllers/TableStructureController.class.php:954
+#: libraries/controllers/TableStructureController.class.php:959
+#: templates/columns_definitions/column_indexes.phtml:27
+#: templates/table/structure/check_all_table_column.phtml:37
+msgid "Spatial"
+msgstr "Spaziale"
+
+#: libraries/controllers/TableStructureController.class.php:955
+#: libraries/controllers/TableStructureController.class.php:960
+#: templates/columns_definitions/column_indexes.phtml:22
+#: templates/table/structure/check_all_table_column.phtml:47
+msgid "Fulltext"
+msgstr "Testo completo"
+
+#: libraries/controllers/TableStructureController.class.php:963
+msgid "Distinct values"
+msgstr "Valori distinti"
+
 #: libraries/core.lib.php:306
 #, php-format
 msgid "The %s extension is missing. Please check your PHP configuration."
@@ -8294,7 +8310,7 @@ msgid "No Password"
 msgstr "Nessuna Password"
 
 #: libraries/display_change_password.lib.php:68
-#: libraries/plugins/auth/AuthenticationCookie.class.php:199
+#: libraries/plugins/auth/AuthenticationCookie.class.php:187
 #: libraries/replication_gui.lib.php:422 libraries/replication_gui.lib.php:862
 #: libraries/server_privileges.lib.php:1640
 msgid "Password:"
@@ -9092,12 +9108,12 @@ msgid "Dump has been saved to file %s."
 msgstr "Il dump è stato salvato nel file %s."
 
 #: libraries/import.lib.php:202 libraries/insert_edit.lib.php:124
-#: libraries/rte/rte_routines.lib.php:1353 libraries/sql.lib.php:1312
+#: libraries/rte/rte_routines.lib.php:1444 libraries/sql.lib.php:1306
 #: tbl_get_field.php:44
 msgid "MySQL returned an empty result set (i.e. zero rows)."
 msgstr "MySQL ha restituito un insieme vuoto (i.e. zero righe)."
 
-#: libraries/import.lib.php:265 libraries/sql.lib.php:1326
+#: libraries/import.lib.php:265 libraries/sql.lib.php:1320
 msgid "[ROLLBACK occurred.]"
 msgstr "[è stato fatto un ROLLBACK.]"
 
@@ -9165,14 +9181,14 @@ msgstr "Crea un indice su &nbsp;%s&nbsp;campi"
 
 #: libraries/insert_edit.lib.php:233
 #: libraries/navigation/Nodes/Node_DatabaseChild.class.php:48
-#: templates/designer/table_list.phtml:40
+#: templates/database/designer/table_list.phtml:40
 msgid "Hide"
 msgstr "Nascondi"
 
 #: libraries/insert_edit.lib.php:249
 #: libraries/navigation/Nodes/Node_Function.class.php:32
-#: libraries/rte/rte_routines.lib.php:1495
-#: templates/table/table_header.phtml:4
+#: libraries/rte/rte_routines.lib.php:1586
+#: templates/table/search/table_header.phtml:4
 msgid "Function"
 msgstr "Funzione"
 
@@ -9187,84 +9203,85 @@ msgstr ""
 "A causa della sua lunghezza,<br /> questo campo potrebbe non essere "
 "modificabile."
 
-#: libraries/insert_edit.lib.php:1050
+#: libraries/insert_edit.lib.php:1048
 msgid "Binary - do not edit"
 msgstr "Dato binario - non modificare"
 
-#: libraries/insert_edit.lib.php:1176 libraries/server_privileges.lib.php:470
-#: templates/table/options.phtml:36
+#: libraries/insert_edit.lib.php:1174 libraries/server_privileges.lib.php:470
+#: templates/table/search/options.phtml:36
 msgid "Or"
 msgstr "Oppure"
 
-#: libraries/insert_edit.lib.php:1177
+#: libraries/insert_edit.lib.php:1175
 msgid "web server upload directory:"
 msgstr "directory di upload del web-server:"
 
-#: libraries/insert_edit.lib.php:1348 templates/table/input_box.phtml:49
+#: libraries/insert_edit.lib.php:1346
+#: templates/table/search/input_box.phtml:49
 msgid "Edit/Insert"
 msgstr "Modifica/Inserisci"
 
-#: libraries/insert_edit.lib.php:1398
+#: libraries/insert_edit.lib.php:1396
 #, php-format
 msgid "Continue insertion with %s rows"
 msgstr "Riprendi inserimento con %s righe"
 
-#: libraries/insert_edit.lib.php:1428
+#: libraries/insert_edit.lib.php:1426
 msgid "and then"
 msgstr "e quindi"
 
-#: libraries/insert_edit.lib.php:1461
+#: libraries/insert_edit.lib.php:1459
 msgid "Insert as new row"
 msgstr "Inserisci come nuova riga"
 
-#: libraries/insert_edit.lib.php:1464
+#: libraries/insert_edit.lib.php:1462
 msgid "Insert as new row and ignore errors"
 msgstr "Inserisci come nuova riga e ignora gli errori"
 
-#: libraries/insert_edit.lib.php:1467
+#: libraries/insert_edit.lib.php:1465
 msgid "Show insert query"
 msgstr "Mostra la insert query"
 
-#: libraries/insert_edit.lib.php:1487
+#: libraries/insert_edit.lib.php:1485
 msgid "Go back to previous page"
 msgstr "Indietro"
 
-#: libraries/insert_edit.lib.php:1490
+#: libraries/insert_edit.lib.php:1488
 msgid "Insert another new row"
 msgstr "Inserisci un nuovo record"
 
-#: libraries/insert_edit.lib.php:1495
+#: libraries/insert_edit.lib.php:1493
 msgid "Go back to this page"
 msgstr "Torna a questa pagina"
 
-#: libraries/insert_edit.lib.php:1518
+#: libraries/insert_edit.lib.php:1516
 msgid "Edit next row"
 msgstr "Modifica il record successivo"
 
-#: libraries/insert_edit.lib.php:1540
+#: libraries/insert_edit.lib.php:1538
 msgid ""
 "Use TAB key to move from value to value, or CTRL+arrows to move anywhere"
 msgstr ""
 "Usare il tasto TAB per spostare il cursore di valore in valore, o CTRL"
 "+frecce per spostarlo altrove"
 
-#: libraries/insert_edit.lib.php:1577 libraries/replication_gui.lib.php:542
-#: libraries/rte/rte_routines.lib.php:1497
+#: libraries/insert_edit.lib.php:1575 libraries/replication_gui.lib.php:542
+#: libraries/rte/rte_routines.lib.php:1588
 #: libraries/server_status_variables.lib.php:220
-#: templates/designer/having_query_panel.phtml:100
-#: templates/designer/options_panel.phtml:73
-#: templates/designer/options_panel.phtml:239
-#: templates/designer/where_query_panel.phtml:69
-#: templates/table/table_header.phtml:10
-#: templates/table/zoom_result_form.phtml:35
+#: templates/database/designer/having_query_panel.phtml:100
+#: templates/database/designer/options_panel.phtml:73
+#: templates/database/designer/options_panel.phtml:239
+#: templates/database/designer/where_query_panel.phtml:69
+#: templates/table/search/table_header.phtml:10
+#: templates/table/search/zoom_result_form.phtml:35
 msgid "Value"
 msgstr "Valore"
 
-#: libraries/insert_edit.lib.php:1937 libraries/sql.lib.php:1309
+#: libraries/insert_edit.lib.php:1935 libraries/sql.lib.php:1303
 msgid "Showing SQL query"
 msgstr "Visualizzo la query SQL"
 
-#: libraries/insert_edit.lib.php:1962 libraries/sql.lib.php:1287
+#: libraries/insert_edit.lib.php:1960 libraries/sql.lib.php:1281
 #, php-format
 msgid "Inserted row id: %1$d"
 msgstr "Inserita riga id: %1$d"
@@ -9675,7 +9692,7 @@ msgstr "Nuovo"
 #: libraries/navigation/Nodes/Node_View_Container.class.php:26
 #: libraries/navigation/Nodes/Node_View_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:129
-#: templates/structure/show_create.phtml:30
+#: templates/database/structure/show_create.phtml:30
 msgid "Views"
 msgstr "Viste"
 
@@ -10017,7 +10034,7 @@ msgstr ""
 
 #: libraries/operations.lib.php:101 libraries/operations.lib.php:249
 #: libraries/operations.lib.php:869 libraries/operations.lib.php:963
-#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:907
+#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:998
 #: templates/columns_definitions/table_fields_definitions.phtml:47
 msgid "Adjust Privileges"
 msgstr "Adatta Privilegi"
@@ -10107,22 +10124,22 @@ msgid "Switch to copied table"
 msgstr "Passa alla tabella copiata"
 
 #: libraries/operations.lib.php:1360
-#: templates/structure/check_all_tables.phtml:18
+#: templates/database/structure/check_all_tables.phtml:18
 msgid "Table maintenance"
 msgstr "Amministrazione tabella"
 
 #: libraries/operations.lib.php:1398
-#: templates/structure/check_all_tables.phtml:19
+#: templates/database/structure/check_all_tables.phtml:19
 msgid "Analyze table"
 msgstr "Analizza tabella"
 
 #: libraries/operations.lib.php:1413
-#: templates/structure/check_all_tables.phtml:20
+#: templates/database/structure/check_all_tables.phtml:20
 msgid "Check table"
 msgstr "Controlla tabella"
 
 #: libraries/operations.lib.php:1428
-#: templates/structure/check_all_tables.phtml:22
+#: templates/database/structure/check_all_tables.phtml:22
 msgid "Checksum table"
 msgstr "Checksum tabella"
 
@@ -10140,18 +10157,19 @@ msgid "Flush the table (FLUSH)"
 msgstr "Ricarica la tabella (FLUSH)"
 
 #: libraries/operations.lib.php:1477
-#: templates/structure/check_all_tables.phtml:23
-#: templates/structure/display_table_stats.phtml:56
+#: templates/database/structure/check_all_tables.phtml:23
+#: templates/table/structure/display_table_stats.phtml:56
 msgid "Optimize table"
 msgstr "Ottimizza tabella"
 
 #: libraries/operations.lib.php:1492
-#: templates/structure/check_all_tables.phtml:24
+#: templates/database/structure/check_all_tables.phtml:24
 msgid "Repair table"
 msgstr "Ripara tabella"
 
 #: libraries/operations.lib.php:1538
-#: templates/structure/check_all_tables.phtml:14 view_operations.php:127
+#: templates/database/structure/check_all_tables.phtml:14
+#: view_operations.php:127
 msgid "Delete data or table"
 msgstr "Rimouvi la tabella o i dati"
 
@@ -10274,7 +10292,7 @@ msgid "Cannot connect: invalid settings."
 msgstr "Impossibile connettersi: impostazioni non valide."
 
 #: libraries/plugins/auth/AuthenticationConfig.class.php:108
-#: libraries/plugins/auth/AuthenticationCookie.class.php:134
+#: libraries/plugins/auth/AuthenticationCookie.class.php:122
 #: libraries/plugins/auth/AuthenticationHttp.class.php:96
 #, php-format
 msgid "Welcome to %s"
@@ -10305,37 +10323,37 @@ msgstr ""
 msgid "Retry to connect"
 msgstr "Riprova a connetterti"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:146
+#: libraries/plugins/auth/AuthenticationCookie.class.php:134
 msgid "Your session has expired. Please log in again."
 msgstr "La tua sessione è scaduta. Esegui un nuovo login."
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:170
+#: libraries/plugins/auth/AuthenticationCookie.class.php:158
 msgid "Log in"
 msgstr "Connetti"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:178
-#: libraries/plugins/auth/AuthenticationCookie.class.php:188
+#: libraries/plugins/auth/AuthenticationCookie.class.php:166
+#: libraries/plugins/auth/AuthenticationCookie.class.php:176
 msgid "You can enter hostname/IP address and port separated by space."
 msgstr ""
 "Puoi inserire l'Indirizzo IP/hostname e la porta, separati da uno spazio."
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:193
+#: libraries/plugins/auth/AuthenticationCookie.class.php:181
 msgid "Username:"
 msgstr "Nome utente:"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:205
+#: libraries/plugins/auth/AuthenticationCookie.class.php:193
 msgid "Server Choice:"
 msgstr "Scelta del server:"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:386
+#: libraries/plugins/auth/AuthenticationCookie.class.php:374
 msgid "Entered captcha is wrong, try again!"
 msgstr "Il captcha inserito è sbagliato, riprova!"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:396
+#: libraries/plugins/auth/AuthenticationCookie.class.php:384
 msgid "Please enter correct captcha!"
 msgstr "Inserisci per favore il captcha corretto!"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:423
+#: libraries/plugins/auth/AuthenticationCookie.class.php:411
 msgid "You are not allowed to log in to this MySQL server!"
 msgstr "Non sei autorizzato ad eseguire il login in questo server MySQL!"
 
@@ -10433,7 +10451,7 @@ msgstr "Evento"
 #: libraries/plugins/export/ExportOdt.class.php:593
 #: libraries/plugins/export/ExportTexytext.class.php:428
 #: libraries/plugins/export/PMA_ExportPdf.class.php:313
-#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:984
 #: libraries/rte/rte_triggers.lib.php:377
 msgid "Definition"
 msgstr "Definizione"
@@ -10758,7 +10776,7 @@ msgid "Last check:"
 msgstr "Ultimo controllo:"
 
 #: libraries/plugins/export/ExportSql.class.php:1399
-#: templates/structure/structure_table_row.phtml:183
+#: templates/database/structure/structure_table_row.phtml:183
 msgid "in use"
 msgstr "in uso"
 
@@ -10955,18 +10973,14 @@ msgstr "L'Estensione Spaziale di MySQL non supporta il tipo ESRI \"%s\"."
 msgid "The imported file does not contain any data!"
 msgstr "Il file importato non contiene alcun dato!"
 
-#: libraries/plugins/import/ImportSql.class.php:169
+#: libraries/plugins/import/ImportSql.class.php:72
 msgid "SQL compatibility mode:"
 msgstr "Modalitá di compatibilità SQL:"
 
-#: libraries/plugins/import/ImportSql.class.php:181
+#: libraries/plugins/import/ImportSql.class.php:84
 msgid "Do not use <code>AUTO_INCREMENT</code> for zero values"
 msgstr "Non usare <code>AUTO_INCREMENT</code> per il valori zero"
 
-#: libraries/plugins/import/ImportSql.class.php:195
-msgid "Read as multibytes"
-msgstr "Letto come multybyte"
-
 #: libraries/plugins/import/ImportXml.class.php:54
 msgid "XML"
 msgstr "XML"
@@ -11009,7 +11023,7 @@ msgid "Show grid"
 msgstr "Mostra la griglia"
 
 #: libraries/plugins/schema/SchemaPdf.class.php:94
-#: templates/structure/print_view_data_dictionary_link.phtml:6
+#: templates/database/structure/print_view_data_dictionary_link.phtml:6
 msgid "Data Dictionary"
 msgstr "Dizionario dei dati"
 
@@ -11034,7 +11048,7 @@ msgid "The %s table doesn't exist!"
 msgstr "La tabella %s non esiste!"
 
 #: libraries/plugins/schema/eps/Eps_Relation_Schema.class.php:321
-#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:309
+#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:323
 #, php-format
 msgid "Schema of the %s database - Page %s"
 msgstr "Schema del database %s - Pagina %s"
@@ -11060,7 +11074,7 @@ msgstr "Tabella dei contenuti"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1005
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1028
 #: libraries/tracking.lib.php:884
-#: templates/structure/table_structure_header.phtml:11
+#: templates/table/structure/table_structure_header.phtml:11
 msgid "Extra"
 msgstr "Extra"
 
@@ -11428,11 +11442,11 @@ msgstr "Passi veloci per l'installazione delle funzionalità avanzate:"
 msgid "Create the needed tables with the <code>%screate_tables.sql</code>."
 msgstr "Crea le tabelle necessarie con <code>%screate_tables.sql</code>."
 
-#: libraries/relation.lib.php:360
+#: libraries/relation.lib.php:357
 msgid "Create a pma user and give access to these tables."
 msgstr "Crea l'utente pma e dagli accesso a queste tabelle."
 
-#: libraries/relation.lib.php:365
+#: libraries/relation.lib.php:360
 msgid ""
 "Enable advanced features in configuration file (<code>config.inc.php</"
 "code>), for example by starting from <code>config.sample.inc.php</code>."
@@ -11440,17 +11454,17 @@ msgstr ""
 "Attiva funzionalità avanzate nel file di configuratione (<code>config.inc."
 "php</code>), per esempio partendo da <code>config.sample.inc.php</code>."
 
-#: libraries/relation.lib.php:373
+#: libraries/relation.lib.php:365
 msgid "Re-login to phpMyAdmin to load the updated configuration file."
 msgstr ""
 "Rieffettua il login in phpMyAdmin per caricare il file della configurazione "
 "aggiornato."
 
-#: libraries/relation.lib.php:1612
+#: libraries/relation.lib.php:1607
 msgid "no description"
 msgstr "nessuna descrizione"
 
-#: libraries/relation.lib.php:1811
+#: libraries/relation.lib.php:1806
 msgid ""
 "You do not have necessary privileges to create a database named "
 "'phpmyadmin'. You may go to 'Operations' tab of any database to set up the "
@@ -11461,7 +11475,7 @@ msgstr ""
 "database per impostare in quel database la memorizzazione della "
 "configurazione di phpMyAdmin."
 
-#: libraries/relation.lib.php:1928
+#: libraries/relation.lib.php:1923
 #, php-format
 msgid ""
 "%sCreate%s a database named 'phpmyadmin' and setup the phpMyAdmin "
@@ -11470,14 +11484,14 @@ msgstr ""
 "%sCrea%s un database denominato 'phpmyadmin' e imposta la configurazione di "
 "storage phpMyAdmin lì."
 
-#: libraries/relation.lib.php:1936
+#: libraries/relation.lib.php:1931
 #, php-format
 msgid ""
 "%sCreate%s the phpMyAdmin configuration storage in the current database."
 msgstr ""
 "%sCreate%s la configurazione salvata di phpMyAdmin nel database corrente."
 
-#: libraries/relation.lib.php:1944
+#: libraries/relation.lib.php:1939
 #, php-format
 msgid "%sCreate%s missing phpMyAdmin configuration storage tables."
 msgstr ""
@@ -11485,7 +11499,7 @@ msgstr ""
 "phpMyAdmin."
 
 #: libraries/replication_gui.lib.php:46 libraries/replication_gui.lib.php:343
-#: libraries/server_databases.lib.php:387
+#: libraries/server_databases.lib.php:398
 msgid "Master replication"
 msgstr "Replicazione master"
 
@@ -11551,7 +11565,7 @@ msgstr ""
 "configurato come master."
 
 #: libraries/replication_gui.lib.php:141
-#: libraries/server_databases.lib.php:389
+#: libraries/server_databases.lib.php:400
 msgid "Slave replication"
 msgstr "Replicazione slave"
 
@@ -11826,10 +11840,10 @@ msgid "Master server changed successfully to %s."
 msgstr "Server master modificato con successo in %s."
 
 #: libraries/rte/rte_events.lib.php:106 libraries/rte/rte_events.lib.php:115
-#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:149
-#: libraries/rte/rte_routines.lib.php:158
-#: libraries/rte/rte_routines.lib.php:231
-#: libraries/rte/rte_routines.lib.php:1362
+#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:219
+#: libraries/rte/rte_routines.lib.php:246
+#: libraries/rte/rte_routines.lib.php:368
+#: libraries/rte/rte_routines.lib.php:1453
 #: libraries/rte/rte_triggers.lib.php:82 libraries/rte/rte_triggers.lib.php:91
 #: libraries/rte/rte_triggers.lib.php:123
 #, php-format
@@ -11851,7 +11865,7 @@ msgstr "L'evento %1$s è stato modificato."
 msgid "Event %1$s has been created."
 msgstr "L'evento %1$s è stato creato."
 
-#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:251
+#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:266
 #: libraries/rte/rte_triggers.lib.php:144
 msgid "One or more errors have occurred while processing your request:"
 msgstr ""
@@ -11861,7 +11875,7 @@ msgstr ""
 msgid "Edit event"
 msgstr "Modifica evento"
 
-#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:794
+#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:885
 #: libraries/rte/rte_triggers.lib.php:323 view_create.php:180
 msgid "Details"
 msgstr "Dettagli"
@@ -11874,7 +11888,7 @@ msgstr "Nome dell'evento"
 msgid "Event type"
 msgstr "Tipo di evento"
 
-#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:817
+#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:908
 #, php-format
 msgid "Change to %s"
 msgstr "Cambia a %s"
@@ -11901,12 +11915,14 @@ msgstr "Fine"
 msgid "On completion preserve"
 msgstr "Conserva dopo il completamento"
 
-#: libraries/rte/rte_events.lib.php:491 libraries/rte/rte_routines.lib.php:930
+#: libraries/rte/rte_events.lib.php:491
+#: libraries/rte/rte_routines.lib.php:1021
 #: libraries/rte/rte_triggers.lib.php:383 view_create.php:209
 msgid "Definer"
 msgstr "Definer"
 
-#: libraries/rte/rte_events.lib.php:535 libraries/rte/rte_routines.lib.php:997
+#: libraries/rte/rte_events.lib.php:535
+#: libraries/rte/rte_routines.lib.php:1088
 #: libraries/rte/rte_triggers.lib.php:422
 msgid "The definer must be in the \"username@hostname\" format!"
 msgstr "Il definer deve essere nel seguente formato: \"nomeutente@nomehost\"!"
@@ -11932,9 +11948,9 @@ msgid "You must provide an event definition."
 msgstr "È necessario fornire una definizione per l'evento."
 
 #: libraries/rte/rte_export.lib.php:43 libraries/rte/rte_general.lib.php:72
-#: libraries/rte/rte_routines.lib.php:345
-#: libraries/rte/rte_routines.lib.php:1198
-#: libraries/rte/rte_routines.lib.php:1411
+#: libraries/rte/rte_routines.lib.php:153
+#: libraries/rte/rte_routines.lib.php:1289
+#: libraries/rte/rte_routines.lib.php:1502
 msgid "Error in processing request:"
 msgstr "Errore nell'elaborazione della richiesta:"
 
@@ -11970,74 +11986,74 @@ msgstr ""
 "potrebbe fallire![/strong] É consigliato di utilizzare l'estensione 'mysqli' "
 "per evitare eventuali problemi."
 
-#: libraries/rte/rte_routines.lib.php:110
-#: libraries/rte/rte_routines.lib.php:1006
+#: libraries/rte/rte_routines.lib.php:123
+msgid "Edit routine"
+msgstr "Modifica routine"
+
+#: libraries/rte/rte_routines.lib.php:200
+#: libraries/rte/rte_routines.lib.php:1097
 #, php-format
 msgid "Invalid routine type: \"%s\""
 msgstr "Tipo di routine non valido: \"%s\""
 
-#: libraries/rte/rte_routines.lib.php:170
+#: libraries/rte/rte_routines.lib.php:253
+#, php-format
+msgid "Routine %1$s has been created."
+msgstr "La routine %1$s é stata creata."
+
+#: libraries/rte/rte_routines.lib.php:380
 msgid "Sorry, we failed to restore the dropped routine."
 msgstr ""
 "Ci dispiace, non siamo riusciti a ripristinare la routine che é stata "
 "rimossa."
 
-#: libraries/rte/rte_routines.lib.php:211
+#: libraries/rte/rte_routines.lib.php:439
 #, php-format
 msgid "Routine %1$s has been modified. Privileges have been adjusted."
 msgstr "La routine %1$s é stata modificata. I privilegi sono stati adattati."
 
-#: libraries/rte/rte_routines.lib.php:216
+#: libraries/rte/rte_routines.lib.php:444
 #, php-format
 msgid "Routine %1$s has been modified."
 msgstr "La routine %1$s é stata modificata."
 
-#: libraries/rte/rte_routines.lib.php:238
-#, php-format
-msgid "Routine %1$s has been created."
-msgstr "La routine %1$s é stata creata."
-
-#: libraries/rte/rte_routines.lib.php:315
-msgid "Edit routine"
-msgstr "Modifica routine"
-
-#: libraries/rte/rte_routines.lib.php:797
+#: libraries/rte/rte_routines.lib.php:888
 msgid "Routine name"
 msgstr "Nome della routine"
 
-#: libraries/rte/rte_routines.lib.php:823
+#: libraries/rte/rte_routines.lib.php:914
 msgid "Parameters"
 msgstr "Parametri"
 
-#: libraries/rte/rte_routines.lib.php:829
+#: libraries/rte/rte_routines.lib.php:920
 msgid "Direction"
 msgstr "Direzione"
 
-#: libraries/rte/rte_routines.lib.php:847
+#: libraries/rte/rte_routines.lib.php:938
 msgid "Add parameter"
 msgstr "Aggiungi parametro"
 
-#: libraries/rte/rte_routines.lib.php:851
+#: libraries/rte/rte_routines.lib.php:942
 msgid "Remove last parameter"
 msgstr "Rimuovi l'ultimo parametro"
 
-#: libraries/rte/rte_routines.lib.php:856
+#: libraries/rte/rte_routines.lib.php:947
 msgid "Return type"
 msgstr "Tipo di risultato"
 
-#: libraries/rte/rte_routines.lib.php:862
+#: libraries/rte/rte_routines.lib.php:953
 msgid "Return length/values"
 msgstr "Lunghezza/valori del risultato"
 
-#: libraries/rte/rte_routines.lib.php:868
+#: libraries/rte/rte_routines.lib.php:959
 msgid "Return options"
 msgstr "Opzioni del risultato"
 
-#: libraries/rte/rte_routines.lib.php:899
+#: libraries/rte/rte_routines.lib.php:990
 msgid "Is deterministic"
 msgstr "É deterministica"
 
-#: libraries/rte/rte_routines.lib.php:920
+#: libraries/rte/rte_routines.lib.php:1011
 msgid ""
 "You do not have sufficient privileges to perform this operation; Please "
 "refer to the documentation for more details"
@@ -12045,25 +12061,25 @@ msgstr ""
 "Non hai privilegi sufficienti per completare questa operazione; controlla a "
 "documentazione per maggiori dettagli"
 
-#: libraries/rte/rte_routines.lib.php:935
+#: libraries/rte/rte_routines.lib.php:1026
 msgid "Security type"
 msgstr "Tipo di sicurezza"
 
-#: libraries/rte/rte_routines.lib.php:944
+#: libraries/rte/rte_routines.lib.php:1035
 msgid "SQL data access"
 msgstr "Tipo di accesso dati SQL"
 
-#: libraries/rte/rte_routines.lib.php:1013
+#: libraries/rte/rte_routines.lib.php:1104
 msgid "You must provide a routine name!"
 msgstr "Devi fornire un nome di routine!"
 
-#: libraries/rte/rte_routines.lib.php:1047
+#: libraries/rte/rte_routines.lib.php:1138
 #, php-format
 msgid "Invalid direction \"%s\" given for parameter."
 msgstr "Direzione invalida \"%s\" é stata fornita per un parametro."
 
-#: libraries/rte/rte_routines.lib.php:1069
-#: libraries/rte/rte_routines.lib.php:1131
+#: libraries/rte/rte_routines.lib.php:1160
+#: libraries/rte/rte_routines.lib.php:1222
 msgid ""
 "You must provide length/values for routine parameters of type ENUM, SET, "
 "VARCHAR and VARBINARY."
@@ -12071,25 +12087,25 @@ msgstr ""
 "È necessario fornire lunghezza o valori per parameteri della routine del "
 "tipo ENUM, SET, VARCHAR e VARBINARY."
 
-#: libraries/rte/rte_routines.lib.php:1095
+#: libraries/rte/rte_routines.lib.php:1186
 msgid "You must provide a name and a type for each routine parameter."
 msgstr ""
 "È necessario fornire un nome ed un tipo per ogni parametro della routine."
 
-#: libraries/rte/rte_routines.lib.php:1114
+#: libraries/rte/rte_routines.lib.php:1205
 msgid "You must provide a valid return type for the routine."
 msgstr "È necessario fornire un valido tipo del risultato."
 
-#: libraries/rte/rte_routines.lib.php:1174
+#: libraries/rte/rte_routines.lib.php:1265
 msgid "You must provide a routine definition."
 msgstr "È necessario fornire una definizione per la routine."
 
-#: libraries/rte/rte_routines.lib.php:1285
+#: libraries/rte/rte_routines.lib.php:1376
 #, php-format
 msgid "Execution results of routine %s"
 msgstr "Risultato di esecuzione della routine %s"
 
-#: libraries/rte/rte_routines.lib.php:1340
+#: libraries/rte/rte_routines.lib.php:1431
 #, php-format
 msgid "%d row affected by the last statement inside the procedure."
 msgid_plural "%d rows affected by the last statement inside the procedure."
@@ -12100,13 +12116,13 @@ msgstr[1] ""
 "%d righe influenzate dall'ultima istruzione eseguita all'interno della "
 "procedura."
 
-#: libraries/rte/rte_routines.lib.php:1398
-#: libraries/rte/rte_routines.lib.php:1406
+#: libraries/rte/rte_routines.lib.php:1489
+#: libraries/rte/rte_routines.lib.php:1497
 msgid "Execute routine"
 msgstr "Esegui routine"
 
-#: libraries/rte/rte_routines.lib.php:1485
-#: libraries/rte/rte_routines.lib.php:1488
+#: libraries/rte/rte_routines.lib.php:1576
+#: libraries/rte/rte_routines.lib.php:1579
 msgid "Routine parameters"
 msgstr "Parametri della routine"
 
@@ -12262,7 +12278,7 @@ msgid "Original position"
 msgstr "Posizione originale"
 
 #: libraries/server_bin_log.lib.php:133
-#: templates/structure/display_table_stats.phtml:4
+#: templates/table/structure/display_table_stats.phtml:4
 msgid "Information"
 msgstr "Informazioni"
 
@@ -12300,12 +12316,12 @@ msgstr ""
 "N.B.: Abilitare qui le statistiche del Database potrebbe causare del "
 "traffico intenso fra il server web e MySQL."
 
-#: libraries/server_databases.lib.php:364
-#: libraries/server_databases.lib.php:365
+#: libraries/server_databases.lib.php:366
+#: libraries/server_databases.lib.php:371
 msgid "Enable Statistics"
 msgstr "Abilita le Statistiche"
 
-#: libraries/server_databases.lib.php:481
+#: libraries/server_databases.lib.php:492
 #, php-format
 msgid "%1$d database has been dropped successfully."
 msgid_plural "%1$d databases have been dropped successfully."
@@ -12681,7 +12697,7 @@ msgid "You have revoked the privileges for %s."
 msgstr "Hai revocato i privilegi per %s."
 
 #: libraries/server_privileges.lib.php:2059
-#: libraries/server_privileges.lib.php:4290
+#: libraries/server_privileges.lib.php:4316
 msgid "Add user account"
 msgstr "Aggiungi account utente"
 
@@ -12849,36 +12865,36 @@ msgstr "Cancellazione in corso di %s"
 msgid "The privileges were reloaded successfully."
 msgstr "I privilegi sono stati ricaricati con successo."
 
-#: libraries/server_privileges.lib.php:3994
+#: libraries/server_privileges.lib.php:4003
 #, php-format
 msgid "The user %s already exists!"
 msgstr "L'utente %s esiste già!"
 
-#: libraries/server_privileges.lib.php:4232
+#: libraries/server_privileges.lib.php:4258
 #, php-format
 msgid "Privileges for %s"
 msgstr "Privilegi per %s"
 
-#: libraries/server_privileges.lib.php:4241
+#: libraries/server_privileges.lib.php:4267
 #: libraries/server_status_processes.lib.php:72
 #: libraries/server_user_groups.lib.php:39
 msgid "User"
 msgstr "Utente"
 
-#: libraries/server_privileges.lib.php:4282
+#: libraries/server_privileges.lib.php:4308
 msgctxt "Create new user"
 msgid "New"
 msgstr "Nuovo"
 
-#: libraries/server_privileges.lib.php:4311
+#: libraries/server_privileges.lib.php:4337
 msgid "Edit privileges:"
 msgstr "Modifica privilegi:"
 
-#: libraries/server_privileges.lib.php:4312
+#: libraries/server_privileges.lib.php:4338
 msgid "User account"
 msgstr "Account utente"
 
-#: libraries/server_privileges.lib.php:4371
+#: libraries/server_privileges.lib.php:4397
 msgid ""
 "Note: You are attempting to edit privileges of the user with which you are "
 "currently logged in."
@@ -12886,11 +12902,11 @@ msgstr ""
 "Nota: Stai cercando di modificare i privilegi dell'utente con cui sei "
 "collegato attualmente."
 
-#: libraries/server_privileges.lib.php:4391 libraries/server_users.lib.php:25
+#: libraries/server_privileges.lib.php:4417 libraries/server_users.lib.php:25
 msgid "User accounts overview"
 msgstr "Vista d'insieme degli account utente"
 
-#: libraries/server_privileges.lib.php:4459
+#: libraries/server_privileges.lib.php:4485
 msgid ""
 "A user account allowing any user from localhost to connect is present. This "
 "will prevent other users from connecting if the host part of their account "
@@ -12901,7 +12917,7 @@ msgstr ""
 "di connettersi se la parte host del loro account permette una connessione da "
 "host qualsiasi (%)."
 
-#: libraries/server_privileges.lib.php:4500
+#: libraries/server_privileges.lib.php:4526
 #, php-format
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
@@ -12914,7 +12930,7 @@ msgstr ""
 "privilegi usati dal server se sono stati fatti cambiamenti manuali. In "
 "questo caso, Si dovrebbero %srinfrescare i privilegi%s prima di continuare."
 
-#: libraries/server_privileges.lib.php:4519
+#: libraries/server_privileges.lib.php:4545
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
 "tables. The content of these tables may differ from the privileges the "
@@ -12928,25 +12944,25 @@ msgstr ""
 "questo caso, si devono ricaricare i privilegi ma al momento non disponi del "
 "privilegio RELOAD."
 
-#: libraries/server_privileges.lib.php:4569
+#: libraries/server_privileges.lib.php:4595
 msgid "The selected user was not found in the privilege table."
 msgstr "L'utente selezionato non è stato trovato nella tabella dei privilegi."
 
-#: libraries/server_privileges.lib.php:4801
+#: libraries/server_privileges.lib.php:4827
 msgid "You have added a new user."
 msgstr "Hai aggiunto un nuovo utente."
 
-#: libraries/server_status.lib.php:53
+#: libraries/server_status.lib.php:60
 #, php-format
 msgid "Network traffic since startup: %s"
 msgstr "Traffico rete dall'avvio: %s"
 
-#: libraries/server_status.lib.php:66
+#: libraries/server_status.lib.php:73
 #, php-format
 msgid "This MySQL server has been running for %1$s. It started up on %2$s."
 msgstr "Questo server MySQL sta girando da %1$s. É stato avviato il %2$s."
 
-#: libraries/server_status.lib.php:80
+#: libraries/server_status.lib.php:94
 msgid ""
 "This MySQL server works as <b>master</b> and <b>slave</b> in <b>replication</"
 "b> process."
@@ -12954,23 +12970,23 @@ msgstr ""
 "Questo server MySQL funziona come un <b>master</b> e <b>slave</b> nel "
 "processo di <b>replicazione</b>."
 
-#: libraries/server_status.lib.php:85
+#: libraries/server_status.lib.php:99
 msgid "This MySQL server works as <b>master</b> in <b>replication</b> process."
 msgstr ""
 "Questo server MySQL funziona come un <b>master</b> nel processo di "
 "<b>replicazione</b>."
 
-#: libraries/server_status.lib.php:90
+#: libraries/server_status.lib.php:104
 msgid "This MySQL server works as <b>slave</b> in <b>replication</b> process."
 msgstr ""
 "Questo server MySQL funziona come un <b>slave</b> nel processo di "
 "<b>replicazione</b>."
 
-#: libraries/server_status.lib.php:106
+#: libraries/server_status.lib.php:116
 msgid "Replication status"
 msgstr "Stato di replicazione"
 
-#: libraries/server_status.lib.php:137
+#: libraries/server_status.lib.php:146
 msgid ""
 "On a busy server, the byte counters may overrun, so those statistics as "
 "reported by the MySQL server may be incorrect."
@@ -12979,19 +12995,19 @@ msgstr ""
 "dismisura e per questa ragione le statistiche riportate dal server MySQL "
 "potrebbero non essere corrette."
 
-#: libraries/server_status.lib.php:148
+#: libraries/server_status.lib.php:157
 msgid "Received"
 msgstr "Ricevuti"
 
-#: libraries/server_status.lib.php:167
+#: libraries/server_status.lib.php:176
 msgid "Sent"
 msgstr "Spediti"
 
-#: libraries/server_status.lib.php:234
+#: libraries/server_status.lib.php:243
 msgid "Max. concurrent connections"
 msgstr "Max. connessioni contemporanee"
 
-#: libraries/server_status.lib.php:244
+#: libraries/server_status.lib.php:253
 msgid "Failed attempts"
 msgstr "Tentativi falliti"
 
@@ -14089,7 +14105,7 @@ msgstr "Questa è una variabile a sola lettura e non può essere modificata"
 msgid "Not implemented yet."
 msgstr "Non ancora implementato."
 
-#: libraries/sql-parser/src/Components/AlterOperation.php:193
+#: libraries/sql-parser/src/Components/AlterOperation.php:191
 msgid "Unrecognized alter operation."
 msgstr "Operazione di modifica non riconosciuta."
 
@@ -14103,7 +14119,7 @@ msgid "An opening bracket followed by a set of values was expected."
 msgstr "Era attesa una parentesi aperta seguita da un insieme di valori."
 
 #: libraries/sql-parser/src/Components/ArrayObj.php:101
-#: libraries/sql-parser/src/Components/FieldDefinition.php:202
+#: libraries/sql-parser/src/Components/CreateDefinition.php:202
 msgid "An opening bracket was expected."
 msgstr "Era attesa una parentesi aperta."
 
@@ -14111,25 +14127,33 @@ msgstr "Era attesa una parentesi aperta."
 msgid "A comma or a closing bracket was expected"
 msgstr "Era attesa una virgola o una parentesi chiusa"
 
+#: libraries/sql-parser/src/Components/CreateDefinition.php:246
+msgid "A comma or a closing bracket was expected."
+msgstr "Era attesa una virgola o una parentesi chiusa."
+
+#: libraries/sql-parser/src/Components/CreateDefinition.php:262
+msgid "A closing bracket was expected."
+msgstr "Era attesa una parentesi chiusa."
+
 #: libraries/sql-parser/src/Components/DataType.php:125
 msgid "Unrecognized data type."
 msgstr "Tipo dati non riconosciuto."
 
-#: libraries/sql-parser/src/Components/Expression.php:225
+#: libraries/sql-parser/src/Components/Expression.php:227
 msgid "Unexpected closing bracket."
 msgstr "Parentesi chiusa inattesa."
 
-#: libraries/sql-parser/src/Components/Expression.php:246
-#: libraries/sql-parser/src/Components/Expression.php:283
-#: libraries/sql-parser/src/Components/Expression.php:303
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:285
+#: libraries/sql-parser/src/Components/Expression.php:305
 msgid "An alias was previously found."
 msgstr "Un alias è stato trovato precedentemente."
 
-#: libraries/sql-parser/src/Components/Expression.php:257
+#: libraries/sql-parser/src/Components/Expression.php:259
 msgid "Unexpected dot."
 msgstr "Segno di punteggiatura \"punto\" inatteso."
 
-#: libraries/sql-parser/src/Components/Expression.php:327
+#: libraries/sql-parser/src/Components/Expression.php:329
 msgid "An alias was expected."
 msgstr "Era atteso un alias."
 
@@ -14137,14 +14161,6 @@ msgstr "Era atteso un alias."
 msgid "An expression was expected."
 msgstr "Era attesa un'espressione."
 
-#: libraries/sql-parser/src/Components/FieldDefinition.php:246
-msgid "A comma or a closing bracket was expected."
-msgstr "Era attesa una virgola o una parentesi chiusa."
-
-#: libraries/sql-parser/src/Components/FieldDefinition.php:262
-msgid "A closing bracket was expected."
-msgstr "Era attesa una parentesi chiusa."
-
 #: libraries/sql-parser/src/Components/Limit.php:90
 #: libraries/sql-parser/src/Components/Limit.php:112
 msgid "An offset was expected."
@@ -14184,24 +14200,24 @@ msgstr "Erano attesi uno o più spazi bianchi prima del delimitatore."
 msgid "Expected delimiter."
 msgstr "Era atteso un delimitatore."
 
-#: libraries/sql-parser/src/Lexer.php:753
+#: libraries/sql-parser/src/Lexer.php:777
 #, php-format
 msgid "Ending quote %1$s was expected."
 msgstr "Era atteso il fine quote %1$s."
 
-#: libraries/sql-parser/src/Lexer.php:789
+#: libraries/sql-parser/src/Lexer.php:813
 msgid "Variable name was expected."
 msgstr "Era atteso un nome di variabile."
 
-#: libraries/sql-parser/src/Parser.php:380
+#: libraries/sql-parser/src/Parser.php:391
 msgid "Unexpected beginning of statement."
 msgstr "Inizio di statement inatteso."
 
-#: libraries/sql-parser/src/Parser.php:399
+#: libraries/sql-parser/src/Parser.php:410
 msgid "Unrecognized statement type."
 msgstr "Tipo statement non riconosciuto."
 
-#: libraries/sql-parser/src/Parser.php:479
+#: libraries/sql-parser/src/Parser.php:489
 msgid "No transaction was previously started."
 msgstr "Non è stata iniziata alcuna transazione in precedenza."
 
@@ -14214,7 +14230,6 @@ msgid "This type of clause was previously parsed."
 msgstr "Questo tipo di clausola è stata esaminata in precedenza."
 
 #: libraries/sql-parser/src/Statement.php:265
-#| msgid "A new statement was found, but no delimiter between them."
 msgid ""
 "A new statement was found, but no delimiter between it and the previous one."
 msgstr ""
@@ -14230,7 +14245,8 @@ msgid "The name of the entity was expected."
 msgstr "Era atteso il nome dell'entity."
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:310
-msgid "At least one field definition was expected."
+#| msgid "At least one field definition was expected."
+msgid "At least one column definition was expected."
 msgstr "Era attesa almeno una definizione di campo."
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:329
@@ -14290,11 +14306,11 @@ msgstr "Segnalibro non creato!"
 msgid "Using bookmark \"%s\" as default browse query."
 msgstr "Usa il segnalibro \"%s\" come la query di navigazione predefinita."
 
-#: libraries/sql.lib.php:1306
+#: libraries/sql.lib.php:1300
 msgid "Showing as PHP code"
 msgstr "Visualizzo comel codice PHP"
 
-#: libraries/sql.lib.php:1638
+#: libraries/sql.lib.php:1632
 #, php-format
 msgid ""
 "Current selection does not contain a unique column. Grid edit, checkbox, "
@@ -14303,7 +14319,7 @@ msgstr ""
 "La selezione corrente non contiene un campo unico. Modifica griglia, "
 "checkbox, Modifica, Copia ed Elimina potrebbero non essere disponibili. %s"
 
-#: libraries/sql.lib.php:1649
+#: libraries/sql.lib.php:1643
 #, php-format
 msgid ""
 "Current selection does not contain a unique column. Grid edit, Edit, Copy "
@@ -14312,7 +14328,7 @@ msgstr ""
 "La selezione corrente non contiene un campo unico. Modifica griglia, "
 "Modifica, Copia ed Elimina potrebbero mostrare comportamenti indesiderati. %s"
 
-#: libraries/sql.lib.php:1688
+#: libraries/sql.lib.php:1682
 #, php-format
 msgid "Problems with indexes of table `%s`"
 msgstr "Problemi con gli indici della tabella `%s`"
@@ -14468,7 +14484,7 @@ msgid "Version %s snapshot (SQL code)"
 msgstr "Versione %s dello snapshot (codice SQL)"
 
 #: libraries/tracking.lib.php:947
-#: templates/structure/table_structure_row.phtml:33
+#: templates/table/structure/table_structure_row.phtml:33
 msgctxt "None for default"
 msgid "None"
 msgstr "Nessuno"
@@ -14523,15 +14539,15 @@ msgstr "La versione %1$s di %2$s è stata cancellata."
 msgid "Version %1$s was created, tracking for %2$s is active."
 msgstr "Versione %1$s creata, monitoraggio attivato per %2$s."
 
-#: libraries/user_preferences.inc.php:29
+#: libraries/user_preferences.inc.php:30
 msgid "Manage your settings"
 msgstr "Gestisci le tue impostazioni"
 
-#: libraries/user_preferences.inc.php:46 prefs_manage.php:307
+#: libraries/user_preferences.inc.php:54 prefs_manage.php:307
 msgid "Configuration has been saved."
 msgstr "La configurazione é stata salvata."
 
-#: libraries/user_preferences.inc.php:66
+#: libraries/user_preferences.inc.php:74
 #, php-format
 msgid ""
 "Your preferences will be saved for current session only. Storing them "
@@ -14856,7 +14872,6 @@ msgid "Row: %1$s, Column: %2$s, Error: %3$s"
 msgstr "Riga: %1$s, Campo: %2$s, Errore: %3$s"
 
 #: tbl_row_action.php:70
-#| msgid "No versions selected."
 msgid "No row selected."
 msgstr "Nessuna riga selezionata."
 
@@ -14932,7 +14947,7 @@ msgid "first"
 msgstr "primo"
 
 #: templates/columns_definitions/move_column.phtml:12
-#: templates/structure/add_column.phtml:21
+#: templates/table/structure/add_column.phtml:21
 #, php-format
 msgid "after %s"
 msgstr "dopo %s"
@@ -15001,197 +15016,292 @@ msgstr "Trasformazione dell'input"
 msgid "Input transformation options"
 msgstr "Opzioni di trasformazione dell'input"
 
-#: templates/designer/aggregate_query_panel.phtml:22
-#: templates/designer/options_panel.phtml:100
-msgid "Aggregate"
-msgstr "Globale"
-
-#: templates/designer/aggregate_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:61
-#: templates/designer/options_panel.phtml:106
-#: templates/designer/options_panel.phtml:170
-#: templates/designer/where_query_panel.phtml:30
-#: templates/table/table_header.phtml:9
-msgid "Operator"
-msgstr "Operatore"
-
-#: templates/designer/database_tables.phtml:29
-msgid "Toggle"
-msgstr "Scambia"
-
-#: templates/designer/database_tables.phtml:40
-msgid "See table structure"
-msgstr "Guarda la struttura della tabella"
-
-#: templates/designer/delete_relation_panel.phtml:21
-msgid "Delete relation"
-msgstr "Elimina relazione"
-
-#: templates/designer/edit_delete_pages.phtml:7
-msgid "Page to open"
-msgstr "Pagina da aprire"
-
-#: templates/designer/edit_delete_pages.phtml:7
-msgid "Page to delete"
-msgstr "Pagina da cancellare"
-
-#: templates/designer/having_query_panel.phtml:90
-#: templates/designer/options_panel.phtml:63
-#: templates/designer/options_panel.phtml:229
-#: templates/designer/where_query_panel.phtml:59
-msgid "Except"
-msgstr "Eccetto"
-
-#: templates/designer/having_query_panel.phtml:102
-#: templates/designer/options_panel.phtml:75
-#: templates/designer/options_panel.phtml:241
-#: templates/designer/where_query_panel.phtml:71
-msgid "subquery"
-msgstr "subquery"
-
-#: templates/designer/new_relation_panel.phtml:22
-#: templates/designer/side_menu.phtml:84 templates/designer/side_menu.phtml:87
-msgid "Create relation"
-msgstr "Crea relazioni"
-
-#: templates/designer/options_panel.phtml:34
-#: templates/designer/options_panel.phtml:200
-msgid "Relation operator"
-msgstr "Operatore relazionario"
-
-#: templates/designer/options_panel.phtml:85
-#: templates/designer/rename_to_panel.phtml:23
-msgid "Rename to"
-msgstr "Rinomina a"
-
-#: templates/designer/options_panel.phtml:91
-#: templates/designer/rename_to_panel.phtml:31
-msgid "New name"
-msgstr "Nuovo nome"
-
-#: templates/designer/page_save_as.phtml:4
-msgid "Save to selected page"
-msgstr "Salva nella pagina selezionata"
-
-#: templates/designer/page_save_as.phtml:5
-msgid "Create a page and save to it"
-msgstr "Crea una pagina e salva in essa"
-
-#: templates/designer/page_save_as.phtml:26
-msgid "New page name"
-msgstr "Nome della nuova pagina"
-
-#: templates/designer/page_selector.phtml:2
-msgid "Select page"
-msgstr "Seleziona pagina"
-
-#: templates/designer/query_details.phtml:10
-msgid "Active options"
-msgstr "Opzioni attive"
-
-#: templates/designer/schema_export.phtml:4
-msgid "Select Export Relational Type"
-msgstr "Seleziona il Tipo di Esportazione Relazionale"
-
-#: templates/designer/side_menu.phtml:19 templates/designer/side_menu.phtml:25
-msgid "Show/Hide tables list"
-msgstr "Mostra/Nascondi la lista delle tabelle"
-
-#: templates/designer/side_menu.phtml:29 templates/designer/side_menu.phtml:35
-#: templates/designer/side_menu.phtml:36
-msgid "View in fullscreen"
-msgstr "Visualizza pieno schermo"
-
-#: templates/designer/side_menu.phtml:34
-msgid "Exit fullscreen"
-msgstr "Esci da visualizzazione a pieno schermo"
-
-#: templates/designer/side_menu.phtml:41 templates/designer/side_menu.phtml:45
-msgid "New page"
-msgstr "Nuova pagina"
-
-#: templates/designer/side_menu.phtml:70 templates/designer/side_menu.phtml:73
-msgid "Delete pages"
-msgstr "Elimina pagine"
-
-#: templates/designer/side_menu.phtml:77 templates/designer/side_menu.phtml:80
-#: templates/table/create_table.phtml:7
+#: templates/database/create_table.phtml:7
+#: templates/database/designer/side_menu.phtml:77
+#: templates/database/designer/side_menu.phtml:80
 msgid "Create table"
 msgstr "Crea tabelle"
 
-#: templates/designer/side_menu.phtml:98
-#: templates/designer/side_menu.phtml:101
+#: templates/database/create_table.phtml:15
+msgid "Number of columns"
+msgstr "Numero dei campi"
+
+#: templates/database/designer/aggregate_query_panel.phtml:22
+#: templates/database/designer/options_panel.phtml:100
+msgid "Aggregate"
+msgstr "Globale"
+
+#: templates/database/designer/aggregate_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:61
+#: templates/database/designer/options_panel.phtml:106
+#: templates/database/designer/options_panel.phtml:170
+#: templates/database/designer/where_query_panel.phtml:30
+#: templates/table/search/table_header.phtml:9
+msgid "Operator"
+msgstr "Operatore"
+
+#: templates/database/designer/database_tables.phtml:29
+msgid "Toggle"
+msgstr "Scambia"
+
+#: templates/database/designer/database_tables.phtml:40
+msgid "See table structure"
+msgstr "Guarda la struttura della tabella"
+
+#: templates/database/designer/delete_relation_panel.phtml:21
+msgid "Delete relation"
+msgstr "Elimina relazione"
+
+#: templates/database/designer/edit_delete_pages.phtml:7
+msgid "Page to open"
+msgstr "Pagina da aprire"
+
+#: templates/database/designer/edit_delete_pages.phtml:7
+msgid "Page to delete"
+msgstr "Pagina da cancellare"
+
+#: templates/database/designer/having_query_panel.phtml:90
+#: templates/database/designer/options_panel.phtml:63
+#: templates/database/designer/options_panel.phtml:229
+#: templates/database/designer/where_query_panel.phtml:59
+msgid "Except"
+msgstr "Eccetto"
+
+#: templates/database/designer/having_query_panel.phtml:102
+#: templates/database/designer/options_panel.phtml:75
+#: templates/database/designer/options_panel.phtml:241
+#: templates/database/designer/where_query_panel.phtml:71
+msgid "subquery"
+msgstr "subquery"
+
+#: templates/database/designer/new_relation_panel.phtml:22
+#: templates/database/designer/side_menu.phtml:84
+#: templates/database/designer/side_menu.phtml:87
+msgid "Create relation"
+msgstr "Crea relazioni"
+
+#: templates/database/designer/options_panel.phtml:34
+#: templates/database/designer/options_panel.phtml:200
+msgid "Relation operator"
+msgstr "Operatore relazionario"
+
+#: templates/database/designer/options_panel.phtml:85
+#: templates/database/designer/rename_to_panel.phtml:23
+msgid "Rename to"
+msgstr "Rinomina a"
+
+#: templates/database/designer/options_panel.phtml:91
+#: templates/database/designer/rename_to_panel.phtml:31
+msgid "New name"
+msgstr "Nuovo nome"
+
+#: templates/database/designer/page_save_as.phtml:4
+msgid "Save to selected page"
+msgstr "Salva nella pagina selezionata"
+
+#: templates/database/designer/page_save_as.phtml:5
+msgid "Create a page and save to it"
+msgstr "Crea una pagina e salva in essa"
+
+#: templates/database/designer/page_save_as.phtml:26
+msgid "New page name"
+msgstr "Nome della nuova pagina"
+
+#: templates/database/designer/page_selector.phtml:2
+msgid "Select page"
+msgstr "Seleziona pagina"
+
+#: templates/database/designer/query_details.phtml:10
+msgid "Active options"
+msgstr "Opzioni attive"
+
+#: templates/database/designer/schema_export.phtml:4
+msgid "Select Export Relational Type"
+msgstr "Seleziona il Tipo di Esportazione Relazionale"
+
+#: templates/database/designer/side_menu.phtml:19
+#: templates/database/designer/side_menu.phtml:25
+msgid "Show/Hide tables list"
+msgstr "Mostra/Nascondi la lista delle tabelle"
+
+#: templates/database/designer/side_menu.phtml:29
+#: templates/database/designer/side_menu.phtml:35
+#: templates/database/designer/side_menu.phtml:36
+msgid "View in fullscreen"
+msgstr "Visualizza pieno schermo"
+
+#: templates/database/designer/side_menu.phtml:34
+msgid "Exit fullscreen"
+msgstr "Esci da visualizzazione a pieno schermo"
+
+#: templates/database/designer/side_menu.phtml:41
+#: templates/database/designer/side_menu.phtml:45
+msgid "New page"
+msgstr "Nuova pagina"
+
+#: templates/database/designer/side_menu.phtml:70
+#: templates/database/designer/side_menu.phtml:73
+msgid "Delete pages"
+msgstr "Elimina pagine"
+
+#: templates/database/designer/side_menu.phtml:98
+#: templates/database/designer/side_menu.phtml:101
 msgid "Reload"
 msgstr "Ricarica"
 
-#: templates/designer/side_menu.phtml:107
-#: templates/designer/side_menu.phtml:110
+#: templates/database/designer/side_menu.phtml:107
+#: templates/database/designer/side_menu.phtml:110
 msgid "Help"
 msgstr "Aiuto"
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Angular links"
 msgstr "Link angolari"
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Direct links"
 msgstr "Link diretti"
 
-#: templates/designer/side_menu.phtml:122
-#: templates/designer/side_menu.phtml:124
+#: templates/database/designer/side_menu.phtml:122
+#: templates/database/designer/side_menu.phtml:124
 msgid "Snap to grid"
 msgstr "Calamita alla griglia"
 
-#: templates/designer/side_menu.phtml:128
-#: templates/designer/side_menu.phtml:134
+#: templates/database/designer/side_menu.phtml:128
+#: templates/database/designer/side_menu.phtml:134
 msgid "Small/Big All"
 msgstr "Espandi/Contrai"
 
-#: templates/designer/side_menu.phtml:138
-#: templates/designer/side_menu.phtml:141
+#: templates/database/designer/side_menu.phtml:138
+#: templates/database/designer/side_menu.phtml:141
 msgid "Toggle small/big"
 msgstr "Contrai/Espandi"
 
-#: templates/designer/side_menu.phtml:145
-#: templates/designer/side_menu.phtml:148
+#: templates/database/designer/side_menu.phtml:145
+#: templates/database/designer/side_menu.phtml:148
 msgid "Toggle relation lines"
 msgstr "Attiva le linee della relazione"
 
-#: templates/designer/side_menu.phtml:153
-#: templates/designer/side_menu.phtml:156
+#: templates/database/designer/side_menu.phtml:153
+#: templates/database/designer/side_menu.phtml:156
 msgid "Export schema"
 msgstr "Esporta schema"
 
-#: templates/designer/side_menu.phtml:165
-#: templates/designer/side_menu.phtml:168
+#: templates/database/designer/side_menu.phtml:165
+#: templates/database/designer/side_menu.phtml:168
 msgid "Build Query"
 msgstr "Crea Query"
 
-#: templates/designer/side_menu.phtml:173
-#: templates/designer/side_menu.phtml:177
+#: templates/database/designer/side_menu.phtml:173
+#: templates/database/designer/side_menu.phtml:177
 msgid "Move Menu"
 msgstr "Muovi menù"
 
-#: templates/designer/side_menu.phtml:181
-#: templates/designer/side_menu.phtml:186
+#: templates/database/designer/side_menu.phtml:181
+#: templates/database/designer/side_menu.phtml:186
 msgid "Pin text"
 msgstr "Testo pin"
 
-#: templates/designer/table_list.phtml:4
+#: templates/database/designer/table_list.phtml:4
 msgid "Hide/Show all"
 msgstr "Mostra/nascondi tutto"
 
-#: templates/designer/table_list.phtml:14
+#: templates/database/designer/table_list.phtml:14
 msgid "Hide/Show Tables with no relation"
 msgstr "Mostra/nascondi tabella senza relazioni"
 
-#: templates/designer/table_list.phtml:59
+#: templates/database/designer/table_list.phtml:59
 msgid "Number of tables:"
 msgstr "Numero di tabelle:"
 
+#: templates/database/structure/body_for_table_summary.phtml:6
+#, php-format
+msgid "%s table"
+msgid_plural "%s tables"
+msgstr[0] "%s tabella"
+msgstr[1] "%s tabelle"
+
+#: templates/database/structure/body_for_table_summary.phtml:17
+msgid "Sum"
+msgstr "Totali"
+
+#: templates/database/structure/check_all_tables.phtml:6
+msgid "Check tables having overhead"
+msgstr "Controllo addizionale"
+
+#: templates/database/structure/check_all_tables.phtml:10
+msgid "Show create"
+msgstr "Mostra crea"
+
+#: templates/database/structure/check_all_tables.phtml:27
+msgid "Prefix"
+msgstr "Prefisso"
+
+#: templates/database/structure/check_all_tables.phtml:28
+msgid "Add prefix to table"
+msgstr "Aggiungi prefisso alla tabella"
+
+#: templates/database/structure/check_all_tables.phtml:29
+msgid "Replace table prefix"
+msgstr "Sostituisci il prefisso della tabella"
+
+#: templates/database/structure/check_all_tables.phtml:30
+msgid "Copy table with prefix"
+msgstr "Copia tabella col prefisso"
+
+#: templates/database/structure/check_all_tables.phtml:36
+msgid "Add columns to central list"
+msgstr "Aggiungi campi alla lista centrale"
+
+#: templates/database/structure/check_all_tables.phtml:37
+msgid "Remove columns from central list"
+msgstr "Rimuove campi dalla lista centrale"
+
+#: templates/database/structure/check_all_tables.phtml:38
+msgid "Make consistent with central list"
+msgstr "Rendi consistente con la lista centrale"
+
+#: templates/database/structure/favorite_anchor.phtml:12
+msgid "Add to Favorites"
+msgstr "Aggiungi ai Preferiti"
+
+#: templates/database/structure/show_create.phtml:2
+msgid "Showing create queries"
+msgstr "Mostra crea query"
+
+#: templates/database/structure/sortable_header.phtml:13
+msgid "Sort"
+msgstr "Ordinamento"
+
+#: templates/database/structure/table_header.phtml:42
+msgid ""
+"May be approximate. Click on the number to get the exact count. See "
+"[doc@faq3-11]FAQ 3.11[/doc]."
+msgstr ""
+"Può essere approssimativo. Clicca sul numero per vedere il conteggio esatto. "
+"Vedi [doc@faq3-11]FAQ 3.11[/doc]."
+
+#: templates/database/structure/table_header.phtml:66
+#: templates/table/index_form.phtml:127
+msgid "Size"
+msgstr "Dimensione"
+
+#: templates/database/structure/table_header.phtml:74
+#: templates/table/structure/display_table_stats.phtml:27
+msgid "Overhead"
+msgstr "Overhead"
+
+#: templates/database/structure/tracking_icon.phtml:4
+msgid "Tracking is active."
+msgstr "Il tracking è attivo."
+
+#: templates/database/structure/tracking_icon.phtml:8
+msgid "Tracking is not active."
+msgstr "Il tracking non è attivo."
+
 #: templates/error/report_form.phtml:7
 msgid ""
 "phpMyAdmin has encountered an error. We have collected data about this error "
@@ -15210,60 +15320,6 @@ msgstr "Puoi esaminare i dati nel rapporto di errore:"
 msgid "Please explain the steps that lead to the error:"
 msgstr "Per favore spiega i passaggi che conducono all'errore:"
 
-#: templates/gis_visualization/gis_visualization.phtml:3
-msgid "Display GIS Visualization"
-msgstr "Mostra la visualizzazione GIS"
-
-#: templates/gis_visualization/gis_visualization.phtml:8
-msgid "Label column"
-msgstr "Etichetta del campo"
-
-#: templates/gis_visualization/gis_visualization.phtml:11
-msgid "-- None --"
-msgstr "-- Nessuno --"
-
-#: templates/gis_visualization/gis_visualization.phtml:19
-msgid "Spatial column"
-msgstr "Campo Spatial"
-
-#: templates/index_form.phtml:16
-msgid "Index name:"
-msgstr "Nome dell'indice:"
-
-#: templates/index_form.phtml:19
-msgid ""
-"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
-msgstr ""
-"\"PRIMARY\" <b>puó</b> essere <b>solo</b> il nome di una chiave primaria!"
-
-#: templates/index_form.phtml:40
-msgid "Index choice:"
-msgstr "Scelta dell'indice:"
-
-#: templates/index_form.phtml:57
-msgid "Key block size:"
-msgstr "Dimensione del key block:"
-
-#: templates/index_form.phtml:74
-msgid "Index type:"
-msgstr "Tipo di indice:"
-
-#: templates/index_form.phtml:86
-msgid "Parser:"
-msgstr "Analizzatore:"
-
-#: templates/index_form.phtml:102
-msgid "Comment:"
-msgstr "Commento:"
-
-#: templates/index_form.phtml:127 templates/structure/table_header.phtml:66
-msgid "Size"
-msgstr "Dimensione"
-
-#: templates/index_form.phtml:149 templates/index_form.phtml:190
-msgid "Drag to reorder"
-msgstr "Trascina per riordinare"
-
 #: templates/prefs_autoload.phtml:9
 msgid ""
 "Your browser has phpMyAdmin configuration for this domain. Would you like to "
@@ -15276,358 +15332,149 @@ msgstr ""
 msgid "Start row:"
 msgstr "Riga iniziale:"
 
-#: templates/structure/actions_in_table_structure.phtml:14
-#, php-format
-msgid "A primary key has been added on %s."
-msgstr "Una chiave primaria è stata aggiunta in %s."
-
-#: templates/structure/actions_in_table_structure.phtml:34
-#: templates/structure/actions_in_table_structure.phtml:54
-#: templates/structure/actions_in_table_structure.phtml:79
-#: templates/structure/actions_in_table_structure.phtml:101
-#, php-format
-msgid "An index has been added on %s."
-msgstr "Un indice è stato aggiunto in %s."
-
-#: templates/structure/actions_in_table_structure.phtml:130
-#: templates/structure/check_all_table_column.phtml:59
-msgid "Remove from central columns"
-msgstr "Rimuovi dai campi centrali"
-
-#: templates/structure/actions_in_table_structure.phtml:138
-#: templates/structure/check_all_table_column.phtml:55
-msgid "Add to central columns"
-msgstr "Aggiungi ai campi centrali"
-
-#: templates/structure/add_column.phtml:7
-#, php-format
-msgid "Add %s column(s)"
-msgstr "Aggiungi %s campo/i"
-
-#: templates/structure/add_column.phtml:12
-msgid "at beginning of table"
-msgstr "All'inizio della tabella"
-
-#: templates/structure/body_for_table_summary.phtml:6
-#, php-format
-msgid "%s table"
-msgid_plural "%s tables"
-msgstr[0] "%s tabella"
-msgstr[1] "%s tabelle"
-
-#: templates/structure/body_for_table_summary.phtml:17
-msgid "Sum"
-msgstr "Totali"
-
-#: templates/structure/check_all_tables.phtml:6
-msgid "Check tables having overhead"
-msgstr "Controllo addizionale"
-
-#: templates/structure/check_all_tables.phtml:10
-msgid "Show create"
-msgstr "Mostra crea"
-
-#: templates/structure/check_all_tables.phtml:27
-msgid "Prefix"
-msgstr "Prefisso"
-
-#: templates/structure/check_all_tables.phtml:28
-msgid "Add prefix to table"
-msgstr "Aggiungi prefisso alla tabella"
-
-#: templates/structure/check_all_tables.phtml:29
-msgid "Replace table prefix"
-msgstr "Sostituisci il prefisso della tabella"
-
-#: templates/structure/check_all_tables.phtml:30
-msgid "Copy table with prefix"
-msgstr "Copia tabella col prefisso"
-
-#: templates/structure/check_all_tables.phtml:36
-msgid "Add columns to central list"
-msgstr "Aggiungi campi alla lista centrale"
-
-#: templates/structure/check_all_tables.phtml:37
-msgid "Remove columns from central list"
-msgstr "Rimuove campi dalla lista centrale"
-
-#: templates/structure/check_all_tables.phtml:38
-msgid "Make consistent with central list"
-msgstr "Rendi consistente con la lista centrale"
-
-#: templates/structure/display_structure.phtml:140 view_create.php:181
-msgid "Edit view"
-msgstr "Modifica la vista"
-
-#: templates/structure/display_table_stats.phtml:9
-msgid "Space usage"
-msgstr "Spazio utilizzato"
-
-#: templates/structure/display_table_stats.phtml:27
-#: templates/structure/table_header.phtml:74
-msgid "Overhead"
-msgstr "Overhead"
-
-#: templates/structure/display_table_stats.phtml:32
-msgid "Effective"
-msgstr "Effettivo"
-
-#: templates/structure/favorite_anchor.phtml:12
-msgid "Add to Favorites"
-msgstr "Aggiungi ai Preferiti"
-
-#: templates/structure/move_columns_dialog.phtml:1
-#: templates/structure/optional_action_links.phtml:21
-msgid "Move columns"
-msgstr "Muovi campi"
-
-#: templates/structure/move_columns_dialog.phtml:2
-msgid "Move the columns by dragging them up and down."
-msgstr "Sposta i campi trascinandoli su e giù."
-
-#: templates/structure/optional_action_links.phtml:9
-msgid "Propose table structure"
-msgstr "Proponi la struttura della tabella"
-
-#: templates/structure/optional_action_links.phtml:24
-msgid "Improve table structure"
-msgstr "Migliora la struttura della tabella"
-
-#: templates/structure/optional_action_links.phtml:30
-msgid "Track view"
-msgstr "Tracciatura vista"
-
-#: templates/structure/row_stats_table.phtml:3
-msgid "Row statistics"
-msgstr "Statistiche righe"
-
-#: templates/structure/row_stats_table.phtml:9
-msgid "static"
-msgstr "statico"
-
-#: templates/structure/row_stats_table.phtml:11
-msgid "dynamic"
-msgstr "dinamico"
-
-#: templates/structure/row_stats_table.phtml:22
-msgid "partitioned"
-msgstr "partizionato"
-
-#: templates/structure/row_stats_table.phtml:54
-msgid "Row length"
-msgstr "Lunghezza riga"
-
-#: templates/structure/row_stats_table.phtml:66
-msgid "Row size"
-msgstr "Dimensione riga"
-
-#: templates/structure/row_stats_table.phtml:73
-msgid "Next autoindex"
-msgstr "Prossimo autoindex"
-
-#: templates/structure/secondary_tabs.phtml:14
-msgid "Relation view"
-msgstr "Relazione vista"
-
-#: templates/structure/show_create.phtml:2
-msgid "Showing create queries"
-msgstr "Mostra crea query"
-
-#: templates/structure/sortable_header.phtml:13
-msgid "Sort"
-msgstr "Ordinamento"
-
-#: templates/structure/table_header.phtml:42
-msgid ""
-"May be approximate. Click on the number to get the exact count. See "
-"[doc@faq3-11]FAQ 3.11[/doc]."
-msgstr ""
-"Può essere approssimativo. Clicca sul numero per vedere il conteggio esatto. "
-"Vedi [doc@faq3-11]FAQ 3.11[/doc]."
-
-#: templates/structure/table_structure_row.phtml:46
-#, php-format
-msgid "Column %s has been dropped."
-msgstr "Il campo %s è stato eliminato."
-
-#: templates/structure/tracking_icon.phtml:4
-msgid "Tracking is active."
-msgstr "Il tracking è attivo."
-
-#: templates/structure/tracking_icon.phtml:8
-msgid "Tracking is not active."
-msgstr "Il tracking non è attivo."
-
-#: templates/table/create_table.phtml:15
-msgid "Number of columns"
-msgstr "Numero dei campi"
-
-#: templates/table/options.phtml:8
-msgid "Select columns (at least one):"
-msgstr "Seleziona campi (almeno uno):"
-
-#: templates/table/options.phtml:37
-msgid "Add search conditions (body of the \"where\" clause):"
-msgstr "Aggiungi condizioni di ricerca (corpo della clausola \"where\"):"
-
-#: templates/table/options.phtml:45
-msgid "Number of rows per page"
-msgstr "Numero di righe per pagina"
-
-#: templates/table/options.phtml:56
-msgid "Display order:"
-msgstr "Ordine di visualizzazione:"
-
-#: templates/table/options_zoom.phtml:6
-msgid "Use this column to label each point"
-msgstr "Usate questo campo per etichettare ogni punto"
-
-#: templates/table/options_zoom.phtml:35
-msgid "Maximum rows to plot"
-msgstr "Massimo numero di righe da visualizzare"
-
-#: templates/table/replace_preview.phtml:13
-msgid "Find and replace - preview"
-msgstr "Trova e sostituisci - anteprima"
-
-#: templates/table/replace_preview.phtml:18
-msgid "Original string"
-msgstr "Stringa originale"
-
-#: templates/table/replace_preview.phtml:19
-msgid "Replaced string"
-msgstr "Stringa sostituita"
-
-#: templates/table/replace_preview.phtml:40
-msgid "Replace"
-msgstr "Sostituisci"
-
-#: templates/table/rows_zoom.phtml:16
-msgid "Additional search criteria"
-msgstr "Ulteriori criteri di ricerca"
-
-#: templates/table/search_and_replace.phtml:3
-msgid "Replace with:"
-msgstr "Sostituisci con:"
-
-#: templates/table/search_and_replace.phtml:22
-msgid "Use regular expression"
-msgstr "Usa espressione regolare"
-
-#: templates/table/selection_form.phtml:12
-msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
-msgstr ""
-"Esegui \"query da esempio\" (carattere jolly: \"%\") per due campi differenti"
-
-#: templates/table/selection_form.phtml:34
-msgid "Do a \"query by example\" (wildcard: \"%\")"
-msgstr "Esegui \"query da esempio\" (carattere jolly: \"%\")"
-
-#: templates/table/zoom_result_form.phtml:7
-msgid "Browse/Edit the points"
-msgstr "Esplora/Modifica i punti"
-
-#: templates/table/zoom_result_form.phtml:15
-msgid "How to use"
-msgstr "Come usare"
-
-#: templates/table/zoom_result_form.phtml:23
-msgid "Reset zoom"
-msgstr "Reimposta zoom"
-
-#: templates/tbl_chart.phtml:17
+#: templates/table/chart/tbl_chart.phtml:17
 msgctxt "Chart type"
 msgid "Bar"
 msgstr "Barre"
 
-#: templates/tbl_chart.phtml:21
+#: templates/table/chart/tbl_chart.phtml:21
 msgctxt "Chart type"
 msgid "Column"
 msgstr "Campo"
 
-#: templates/tbl_chart.phtml:25
+#: templates/table/chart/tbl_chart.phtml:25
 msgctxt "Chart type"
 msgid "Line"
 msgstr "Linea"
 
-#: templates/tbl_chart.phtml:29
+#: templates/table/chart/tbl_chart.phtml:29
 msgctxt "Chart type"
 msgid "Spline"
 msgstr "Spline"
 
-#: templates/tbl_chart.phtml:33
+#: templates/table/chart/tbl_chart.phtml:33
 msgctxt "Chart type"
 msgid "Area"
 msgstr "Area"
 
-#: templates/tbl_chart.phtml:37
+#: templates/table/chart/tbl_chart.phtml:37
 msgctxt "Chart type"
 msgid "Pie"
 msgstr "A torta"
 
-#: templates/tbl_chart.phtml:41
+#: templates/table/chart/tbl_chart.phtml:41
 msgctxt "Chart type"
 msgid "Timeline"
 msgstr "Timeline"
 
-#: templates/tbl_chart.phtml:45
+#: templates/table/chart/tbl_chart.phtml:45
 msgctxt "Chart type"
 msgid "Scatter"
 msgstr "Distribuzione"
 
-#: templates/tbl_chart.phtml:50
+#: templates/table/chart/tbl_chart.phtml:50
 msgid "Stacked"
 msgstr "Sovrapposti"
 
-#: templates/tbl_chart.phtml:53
+#: templates/table/chart/tbl_chart.phtml:53
 msgid "Chart title"
 msgstr "Titolo del grafico"
 
-#: templates/tbl_chart.phtml:57
+#: templates/table/chart/tbl_chart.phtml:57
 msgid "X-Axis:"
 msgstr "Asse X:"
 
-#: templates/tbl_chart.phtml:72
+#: templates/table/chart/tbl_chart.phtml:72
 msgid "Series:"
 msgstr "Serie:"
 
-#: templates/tbl_chart.phtml:102
+#: templates/table/chart/tbl_chart.phtml:102
 msgid "X-Axis label:"
 msgstr "Etichetta per l'asse X:"
 
-#: templates/tbl_chart.phtml:104
+#: templates/table/chart/tbl_chart.phtml:104
 msgid "X Values"
 msgstr "Valori per asse X"
 
-#: templates/tbl_chart.phtml:107
+#: templates/table/chart/tbl_chart.phtml:107
 msgid "Y-Axis label:"
 msgstr "Etichetta per l'asse Y:"
 
-#: templates/tbl_chart.phtml:115
+#: templates/table/chart/tbl_chart.phtml:115
 msgid "Series names are in a column"
 msgstr "I nomi delle serie sono i un campo"
 
-#: templates/tbl_chart.phtml:118
+#: templates/table/chart/tbl_chart.phtml:118
 msgid "Series column:"
 msgstr "Campo serie:"
 
-#: templates/tbl_chart.phtml:130
+#: templates/table/chart/tbl_chart.phtml:130
 msgid "Value Column:"
 msgstr "Campo Valore:"
 
-#: templates/tbl_chart.phtml:150
+#: templates/table/chart/tbl_chart.phtml:150
 msgid "Save chart as image"
 msgstr "Salva il grafico come immagine"
 
-#: templates/tbl_relation/common_form.phtml:7
+#: templates/table/gis_visualization/gis_visualization.phtml:3
+msgid "Display GIS Visualization"
+msgstr "Mostra la visualizzazione GIS"
+
+#: templates/table/gis_visualization/gis_visualization.phtml:8
+msgid "Label column"
+msgstr "Etichetta del campo"
+
+#: templates/table/gis_visualization/gis_visualization.phtml:11
+msgid "-- None --"
+msgstr "-- Nessuno --"
+
+#: templates/table/gis_visualization/gis_visualization.phtml:19
+msgid "Spatial column"
+msgstr "Campo Spatial"
+
+#: templates/table/index_form.phtml:16
+msgid "Index name:"
+msgstr "Nome dell'indice:"
+
+#: templates/table/index_form.phtml:19
+msgid ""
+"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
+msgstr ""
+"\"PRIMARY\" <b>puó</b> essere <b>solo</b> il nome di una chiave primaria!"
+
+#: templates/table/index_form.phtml:40
+msgid "Index choice:"
+msgstr "Scelta dell'indice:"
+
+#: templates/table/index_form.phtml:57
+msgid "Key block size:"
+msgstr "Dimensione del key block:"
+
+#: templates/table/index_form.phtml:74
+msgid "Index type:"
+msgstr "Tipo di indice:"
+
+#: templates/table/index_form.phtml:86
+msgid "Parser:"
+msgstr "Analizzatore:"
+
+#: templates/table/index_form.phtml:102
+msgid "Comment:"
+msgstr "Commento:"
+
+#: templates/table/index_form.phtml:149 templates/table/index_form.phtml:190
+msgid "Drag to reorder"
+msgstr "Trascina per riordinare"
+
+#: templates/table/relation/common_form.phtml:7
 msgid "Internal relations"
 msgstr "Relazioni interne"
 
-#: templates/tbl_relation/common_form.phtml:11
+#: templates/table/relation/common_form.phtml:11
 msgid "Internal relation"
 msgstr "Relazioni interne"
 
-#: templates/tbl_relation/common_form.phtml:14
+#: templates/table/relation/common_form.phtml:14
 msgid ""
 "An internal relation is not necessary when a corresponding FOREIGN KEY "
 "relation exists."
@@ -15635,50 +15482,225 @@ msgstr ""
 "Una relazione interna non %è necessaria, quando una corrispondente relazione "
 "FOREIGN KEY esiste."
 
-#: templates/tbl_relation/common_form.phtml:37
+#: templates/table/relation/common_form.phtml:37
 msgid "Foreign key constraints"
 msgstr "Vincoli della foreign key"
 
-#: templates/tbl_relation/common_form.phtml:40
+#: templates/table/relation/common_form.phtml:40
 msgid "Actions"
 msgstr "Azioni"
 
-#: templates/tbl_relation/common_form.phtml:41
+#: templates/table/relation/common_form.phtml:41
 msgid "Constraint properties"
 msgstr "Proprietà del vincolo"
 
-#: templates/tbl_relation/common_form.phtml:44
+#: templates/table/relation/common_form.phtml:44
 msgid ""
 "Only columns with index will be displayed. You can define an index below."
 msgstr ""
 "Saranno visualizzati solo campi con indice. Puoi definire un indice qui "
 "sotto."
 
-#: templates/tbl_relation/common_form.phtml:49
+#: templates/table/relation/common_form.phtml:49
 msgid "Foreign key constraint"
 msgstr "Vincolo della chiave esterna"
 
-#: templates/tbl_relation/common_form.phtml:81
+#: templates/table/relation/common_form.phtml:81
 msgid "+ Add constraint"
 msgstr "+ Aggiungi vincolo"
 
-#: templates/tbl_relation/common_form.phtml:91
+#: templates/table/relation/common_form.phtml:91
 msgid "Choose column to display:"
 msgstr "Scegli il campo da mostrare:"
 
-#: templates/tbl_relation/foreign_key_row.phtml:13
+#: templates/table/relation/foreign_key_row.phtml:13
 #, php-format
 msgid "Foreign key constraint %s has been dropped"
 msgstr "Il vincolo %s della foreign key è stato eliminato"
 
-#: templates/tbl_relation/foreign_key_row.phtml:102
+#: templates/table/relation/foreign_key_row.phtml:102
 msgid "Constraint name"
 msgstr "Nome del vincolo"
 
-#: templates/tbl_relation/foreign_key_row.phtml:157
+#: templates/table/relation/foreign_key_row.phtml:157
 msgid "+ Add column"
 msgstr "+ Aggiungi campo"
 
+#: templates/table/search/options.phtml:8
+msgid "Select columns (at least one):"
+msgstr "Seleziona campi (almeno uno):"
+
+#: templates/table/search/options.phtml:37
+msgid "Add search conditions (body of the \"where\" clause):"
+msgstr "Aggiungi condizioni di ricerca (corpo della clausola \"where\"):"
+
+#: templates/table/search/options.phtml:45
+msgid "Number of rows per page"
+msgstr "Numero di righe per pagina"
+
+#: templates/table/search/options.phtml:56
+msgid "Display order:"
+msgstr "Ordine di visualizzazione:"
+
+#: templates/table/search/options_zoom.phtml:6
+msgid "Use this column to label each point"
+msgstr "Usate questo campo per etichettare ogni punto"
+
+#: templates/table/search/options_zoom.phtml:35
+msgid "Maximum rows to plot"
+msgstr "Massimo numero di righe da visualizzare"
+
+#: templates/table/search/replace_preview.phtml:13
+msgid "Find and replace - preview"
+msgstr "Trova e sostituisci - anteprima"
+
+#: templates/table/search/replace_preview.phtml:18
+msgid "Original string"
+msgstr "Stringa originale"
+
+#: templates/table/search/replace_preview.phtml:19
+msgid "Replaced string"
+msgstr "Stringa sostituita"
+
+#: templates/table/search/replace_preview.phtml:40
+msgid "Replace"
+msgstr "Sostituisci"
+
+#: templates/table/search/rows_zoom.phtml:16
+msgid "Additional search criteria"
+msgstr "Ulteriori criteri di ricerca"
+
+#: templates/table/search/search_and_replace.phtml:3
+msgid "Replace with:"
+msgstr "Sostituisci con:"
+
+#: templates/table/search/search_and_replace.phtml:22
+msgid "Use regular expression"
+msgstr "Usa espressione regolare"
+
+#: templates/table/search/selection_form.phtml:12
+msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
+msgstr ""
+"Esegui \"query da esempio\" (carattere jolly: \"%\") per due campi differenti"
+
+#: templates/table/search/selection_form.phtml:34
+msgid "Do a \"query by example\" (wildcard: \"%\")"
+msgstr "Esegui \"query da esempio\" (carattere jolly: \"%\")"
+
+#: templates/table/search/zoom_result_form.phtml:7
+msgid "Browse/Edit the points"
+msgstr "Esplora/Modifica i punti"
+
+#: templates/table/search/zoom_result_form.phtml:15
+msgid "How to use"
+msgstr "Come usare"
+
+#: templates/table/search/zoom_result_form.phtml:23
+msgid "Reset zoom"
+msgstr "Reimposta zoom"
+
+#: templates/table/secondary_tabs.phtml:14
+msgid "Relation view"
+msgstr "Relazione vista"
+
+#: templates/table/structure/actions_in_table_structure.phtml:14
+#, php-format
+msgid "A primary key has been added on %s."
+msgstr "Una chiave primaria è stata aggiunta in %s."
+
+#: templates/table/structure/actions_in_table_structure.phtml:34
+#: templates/table/structure/actions_in_table_structure.phtml:54
+#: templates/table/structure/actions_in_table_structure.phtml:79
+#: templates/table/structure/actions_in_table_structure.phtml:101
+#, php-format
+msgid "An index has been added on %s."
+msgstr "Un indice è stato aggiunto in %s."
+
+#: templates/table/structure/actions_in_table_structure.phtml:130
+#: templates/table/structure/check_all_table_column.phtml:59
+msgid "Remove from central columns"
+msgstr "Rimuovi dai campi centrali"
+
+#: templates/table/structure/actions_in_table_structure.phtml:138
+#: templates/table/structure/check_all_table_column.phtml:55
+msgid "Add to central columns"
+msgstr "Aggiungi ai campi centrali"
+
+#: templates/table/structure/add_column.phtml:7
+#, php-format
+msgid "Add %s column(s)"
+msgstr "Aggiungi %s campo/i"
+
+#: templates/table/structure/add_column.phtml:12
+msgid "at beginning of table"
+msgstr "All'inizio della tabella"
+
+#: templates/table/structure/display_structure.phtml:140 view_create.php:181
+msgid "Edit view"
+msgstr "Modifica la vista"
+
+#: templates/table/structure/display_table_stats.phtml:9
+msgid "Space usage"
+msgstr "Spazio utilizzato"
+
+#: templates/table/structure/display_table_stats.phtml:32
+msgid "Effective"
+msgstr "Effettivo"
+
+#: templates/table/structure/move_columns_dialog.phtml:1
+#: templates/table/structure/optional_action_links.phtml:21
+msgid "Move columns"
+msgstr "Muovi campi"
+
+#: templates/table/structure/move_columns_dialog.phtml:2
+msgid "Move the columns by dragging them up and down."
+msgstr "Sposta i campi trascinandoli su e giù."
+
+#: templates/table/structure/optional_action_links.phtml:9
+msgid "Propose table structure"
+msgstr "Proponi la struttura della tabella"
+
+#: templates/table/structure/optional_action_links.phtml:24
+msgid "Improve table structure"
+msgstr "Migliora la struttura della tabella"
+
+#: templates/table/structure/optional_action_links.phtml:30
+msgid "Track view"
+msgstr "Tracciatura vista"
+
+#: templates/table/structure/row_stats_table.phtml:3
+msgid "Row statistics"
+msgstr "Statistiche righe"
+
+#: templates/table/structure/row_stats_table.phtml:9
+msgid "static"
+msgstr "statico"
+
+#: templates/table/structure/row_stats_table.phtml:11
+msgid "dynamic"
+msgstr "dinamico"
+
+#: templates/table/structure/row_stats_table.phtml:22
+msgid "partitioned"
+msgstr "partizionato"
+
+#: templates/table/structure/row_stats_table.phtml:54
+msgid "Row length"
+msgstr "Lunghezza riga"
+
+#: templates/table/structure/row_stats_table.phtml:66
+msgid "Row size"
+msgstr "Dimensione riga"
+
+#: templates/table/structure/row_stats_table.phtml:73
+msgid "Next autoindex"
+msgstr "Prossimo autoindex"
+
+#: templates/table/structure/table_structure_row.phtml:46
+#, php-format
+msgid "Column %s has been dropped."
+msgstr "Il campo %s è stato eliminato."
+
 #: themes.php:17 themes.php:22
 msgid "Theme"
 msgstr "Tema"
@@ -17054,6 +17076,9 @@ msgstr ""
 msgid "concurrent_insert is set to 0"
 msgstr "concurrent_insert è impostato a 0"
 
+#~ msgid "Read as multibytes"
+#~ msgstr "Letto come multybyte"
+
 #~ msgid "Relational display column"
 #~ msgstr "Campo di visualizzazione relazionale"
 
diff --git a/po/ja.po b/po/ja.po
index a555ad2be1..4dbb29dfa2 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 4.5.0-dev\n"
 "Report-Msgid-Bugs-To: developers@phpmyadmin.net\n"
-"POT-Creation-Date: 2015-08-08 13:53-0400\n"
+"POT-Creation-Date: 2015-08-12 08:10-0400\n"
 "PO-Revision-Date: 2015-03-28 04:08+0200\n"
 "Last-Translator: Hiroshi Chiyokawa <hiroshi.chiyokawa@gmail.com>\n"
 "Language-Team: Japanese <https://hosted.weblate.org/projects/phpmyadmin/"
@@ -53,7 +53,7 @@ msgid "Table comments:"
 msgstr "テーブルのコメント："
 
 #: db_datadict.php:104 libraries/Index.class.php:699
-#: libraries/insert_edit.lib.php:1567
+#: libraries/insert_edit.lib.php:1565
 #: libraries/navigation/Nodes/Node_Column.class.php:30
 #: libraries/plugins/export/ExportHtmlword.class.php:280
 #: libraries/plugins/export/ExportHtmlword.class.php:375
@@ -67,13 +67,14 @@ msgstr "テーブルのコメント："
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1023
 #: libraries/tracking.lib.php:879 libraries/tracking.lib.php:975
 #: templates/columns_definitions/column_name.phtml:18
-#: templates/index_form.phtml:124 templates/table/table_header.phtml:6
-#: templates/table/zoom_result_form.phtml:33
-#: templates/tbl_relation/common_form.phtml:10
-#: templates/tbl_relation/common_form.phtml:43
-#: templates/tbl_relation/foreign_key_row.phtml:194
-#: templates/tbl_relation/foreign_key_row.phtml:206
-#: templates/tbl_relation/internal_relational_row.phtml:71
+#: templates/table/index_form.phtml:124
+#: templates/table/relation/common_form.phtml:10
+#: templates/table/relation/common_form.phtml:43
+#: templates/table/relation/foreign_key_row.phtml:194
+#: templates/table/relation/foreign_key_row.phtml:206
+#: templates/table/relation/internal_relational_row.phtml:71
+#: templates/table/search/table_header.phtml:6
+#: templates/table/search/zoom_result_form.phtml:33
 msgid "Column"
 msgstr "カラム"
 
@@ -91,21 +92,21 @@ msgstr "カラム"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1001
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1024
 #: libraries/rte/rte_list.lib.php:75 libraries/rte/rte_list.lib.php:103
-#: libraries/rte/rte_routines.lib.php:802
-#: libraries/rte/rte_routines.lib.php:831
-#: libraries/rte/rte_routines.lib.php:1493
+#: libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_routines.lib.php:922
+#: libraries/rte/rte_routines.lib.php:1584
 #: libraries/server_privileges.lib.php:2369 libraries/tracking.lib.php:880
 #: libraries/tracking.lib.php:972
 #: templates/columns_definitions/table_fields_definitions.phtml:11
-#: templates/structure/table_header.phtml:48
-#: templates/structure/table_structure_header.phtml:6
-#: templates/table/table_header.phtml:7
+#: templates/database/structure/table_header.phtml:48
+#: templates/table/search/table_header.phtml:7
+#: templates/table/structure/table_structure_header.phtml:6
 msgid "Type"
 msgstr "データ型"
 
 #: db_datadict.php:106 libraries/Index.class.php:702
 #: libraries/central_columns.lib.php:708
-#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1576
+#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1574
 #: libraries/plugins/export/ExportHtmlword.class.php:286
 #: libraries/plugins/export/ExportHtmlword.class.php:381
 #: libraries/plugins/export/ExportLatex.class.php:509
@@ -118,8 +119,8 @@ msgstr "データ型"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1026
 #: libraries/tracking.lib.php:882 libraries/tracking.lib.php:978
 #: templates/columns_definitions/table_fields_definitions.phtml:39
-#: templates/structure/table_structure_header.phtml:9
-#: templates/table/zoom_result_form.phtml:34
+#: templates/table/search/zoom_result_form.phtml:34
+#: templates/table/structure/table_structure_header.phtml:9
 msgid "Null"
 msgstr "NULL"
 
@@ -137,8 +138,8 @@ msgstr "NULL"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1027
 #: libraries/replication_gui.lib.php:153 libraries/tracking.lib.php:883
 #: templates/columns_definitions/table_fields_definitions.phtml:25
-#: templates/structure/body_for_table_summary.phtml:55
-#: templates/structure/table_structure_header.phtml:10
+#: templates/database/structure/body_for_table_summary.phtml:55
+#: templates/table/structure/table_structure_header.phtml:10
 msgid "Default"
 msgstr "デフォルト値"
 
@@ -166,19 +167,19 @@ msgid "Comments"
 msgstr "コメント"
 
 #: db_datadict.php:146
-#: libraries/controllers/StructureController.class.php:1960
-#: libraries/controllers/StructureController.class.php:1965
+#: libraries/controllers/TableStructureController.class.php:951
+#: libraries/controllers/TableStructureController.class.php:956
 #: libraries/tracking.lib.php:922
 #: templates/columns_definitions/column_indexes.phtml:6
-#: templates/structure/check_all_table_column.phtml:22
-#: templates/structure/display_structure.phtml:74
+#: templates/table/structure/check_all_table_column.phtml:22
+#: templates/table/structure/display_structure.phtml:74
 msgid "Primary"
 msgstr "主"
 
 #: db_datadict.php:156 js/messages.php:317 libraries/Index.class.php:567
 #: libraries/Index.class.php:606 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261 libraries/mult_submits.lib.php:403
+#: libraries/config/FormDisplay.tpl.php:272 libraries/mult_submits.lib.php:403
 #: libraries/mult_submits.lib.php:417
 #: libraries/plugins/export/ExportHtmlword.class.php:630
 #: libraries/plugins/export/ExportLatex.class.php:589
@@ -194,20 +195,20 @@ msgstr "主"
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1010 libraries/tracking.lib.php:1015
 #: prefs_manage.php:140 templates/prefs_autoload.phtml:15
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "No"
 msgstr "いいえ"
 
 #: db_datadict.php:156 js/messages.php:443 libraries/Index.class.php:568
 #: libraries/Index.class.php:605 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261
-#: libraries/controllers/StructureController.class.php:1344
-#: libraries/controllers/StructureController.class.php:2223
-#: libraries/controllers/StructureController.class.php:2232
-#: libraries/controllers/StructureController.class.php:2237
-#: libraries/controllers/StructureController.class.php:2242
-#: libraries/controllers/StructureController.class.php:2247
+#: libraries/config/FormDisplay.tpl.php:272
+#: libraries/controllers/TableStructureController.class.php:539
+#: libraries/controllers/TableStructureController.class.php:1201
+#: libraries/controllers/TableStructureController.class.php:1210
+#: libraries/controllers/TableStructureController.class.php:1215
+#: libraries/controllers/TableStructureController.class.php:1220
+#: libraries/controllers/TableStructureController.class.php:1225
 #: libraries/mult_submits.inc.php:82 libraries/mult_submits.inc.php:178
 #: libraries/mult_submits.lib.php:339 libraries/mult_submits.lib.php:372
 #: libraries/mult_submits.lib.php:401 libraries/mult_submits.lib.php:415
@@ -216,8 +217,8 @@ msgstr "いいえ"
 #: libraries/plugins/export/ExportOdt.class.php:756
 #: libraries/plugins/export/ExportTexytext.class.php:567
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1077
-#: libraries/server_databases.lib.php:464
-#: libraries/server_databases.lib.php:474
+#: libraries/server_databases.lib.php:475
+#: libraries/server_databases.lib.php:485
 #: libraries/server_privileges.lib.php:2546
 #: libraries/server_privileges.lib.php:2727
 #: libraries/server_privileges.lib.php:2748
@@ -227,7 +228,7 @@ msgstr "いいえ"
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1008 libraries/tracking.lib.php:1013
 #: prefs_manage.php:138 templates/prefs_autoload.phtml:14
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "Yes"
 msgstr "はい"
 
@@ -237,7 +238,7 @@ msgstr "データベースのダンプ (スキーマ) 表示"
 
 #: db_export.php:37 db_tracking.php:90 export.php:382
 #: libraries/DBQbe.class.php:326
-#: libraries/controllers/StructureController.class.php:231
+#: libraries/controllers/DatabaseStructureController.class.php:170
 #: libraries/navigation/NavigationTree.class.php:897
 msgid "No tables found in database."
 msgstr "このデータベースにはテーブルがありません。"
@@ -248,14 +249,14 @@ msgstr "このデータベースにはテーブルがありません。"
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:26
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:120
-#: templates/structure/show_create.phtml:18
+#: templates/database/structure/show_create.phtml:18
 msgid "Tables"
 msgstr "テーブル"
 
 #: db_export.php:52 libraries/Menu.class.php:317 libraries/Menu.class.php:425
-#: libraries/Util.class.php:3333 libraries/Util.class.php:3343
-#: libraries/Util.class.php:3349 libraries/Util.class.php:3629
-#: libraries/Util.class.php:4327 libraries/Util.class.php:4344
+#: libraries/Util.class.php:3339 libraries/Util.class.php:3349
+#: libraries/Util.class.php:3355 libraries/Util.class.php:3635
+#: libraries/Util.class.php:4333 libraries/Util.class.php:4350
 #: libraries/central_columns.lib.php:728 libraries/config.values.php:39
 #: libraries/config.values.php:47 libraries/config.values.php:109
 #: libraries/config.values.php:115 libraries/config/setup.forms.php:323
@@ -269,7 +270,7 @@ msgstr "テーブル"
 #: libraries/navigation/Nodes/Node_Table.class.php:283
 #: libraries/server_privileges.lib.php:1141 libraries/tracking.lib.php:874
 #: templates/columns_definitions/table_fields_definitions.phtml:3
-#: templates/designer/table_list.phtml:28
+#: templates/database/designer/table_list.phtml:28
 msgid "Structure"
 msgstr "構造"
 
@@ -281,7 +282,7 @@ msgstr "構造"
 #: libraries/config/user_preferences.forms.php:292
 #: libraries/config/user_preferences.forms.php:297
 #: libraries/server_privileges.lib.php:1140
-#: templates/structure/display_table_stats.phtml:12
+#: templates/table/structure/display_table_stats.phtml:12
 msgid "Data"
 msgstr "データ"
 
@@ -355,10 +356,10 @@ msgstr "SQL コマンドを追跡しているテーブル"
 #: libraries/server_privileges.lib.php:2908
 #: libraries/server_privileges.lib.php:3145
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4346
-#: templates/structure/table_header.phtml:21
-#: templates/tbl_relation/foreign_key_row.phtml:176
-#: templates/tbl_relation/internal_relational_row.phtml:63
+#: libraries/server_privileges.lib.php:4372
+#: templates/database/structure/table_header.phtml:21
+#: templates/table/relation/foreign_key_row.phtml:176
+#: templates/table/relation/internal_relational_row.phtml:63
 msgid "Table"
 msgstr "テーブル"
 
@@ -375,7 +376,7 @@ msgid "Updated"
 msgstr "更新日時"
 
 #: db_tracking.php:130 js/messages.php:243 libraries/Menu.class.php:552
-#: libraries/Util.class.php:4314 libraries/config.values.php:104
+#: libraries/Util.class.php:4320 libraries/config.values.php:104
 #: libraries/rte/rte_events.lib.php:393 libraries/rte/rte_list.lib.php:101
 #: libraries/server_status_processes.lib.php:92 libraries/tracking.lib.php:279
 msgid "Status"
@@ -384,14 +385,15 @@ msgstr "状態"
 #: db_tracking.php:131 db_tracking.php:290 libraries/Index.class.php:693
 #: libraries/central_columns.lib.php:687 libraries/rte/rte_list.lib.php:74
 #: libraries/rte/rte_list.lib.php:89 libraries/rte/rte_list.lib.php:102
-#: libraries/server_databases.lib.php:398
+#: libraries/server_databases.lib.php:409
 #: libraries/server_privileges.lib.php:2372
 #: libraries/server_privileges.lib.php:3166
 #: libraries/server_privileges.lib.php:3342
 #: libraries/server_user_groups.lib.php:82
 #: libraries/server_variables.lib.php:189 libraries/tracking.lib.php:280
-#: libraries/tracking.lib.php:793 templates/structure/table_header.phtml:30
-#: templates/structure/table_structure_header.phtml:23
+#: libraries/tracking.lib.php:793
+#: templates/database/structure/table_header.phtml:30
+#: templates/table/structure/table_structure_header.phtml:23
 msgid "Action"
 msgstr "操作"
 
@@ -435,7 +437,7 @@ msgid "Untracked tables"
 msgstr "SQL コマンドを追跡していないテーブル"
 
 #: db_tracking.php:305 db_tracking.php:336
-#: templates/structure/optional_action_links.phtml:17
+#: templates/table/structure/optional_action_links.phtml:17
 msgid "Track table"
 msgstr "テーブルを追跡する"
 
@@ -487,7 +489,7 @@ msgid "Value for the column \"%s\""
 msgstr "カラム \"%s\" に対しての値"
 
 #: gis_data_editor.php:146
-#: templates/gis_visualization/gis_visualization.phtml:37
+#: templates/table/gis_visualization/gis_visualization.phtml:37
 msgid "Use OpenStreetMaps as Base Layer"
 msgstr "ベースレイヤーに OpenStreetMap を使用する"
 
@@ -567,35 +569,35 @@ msgstr "幾何データを追加する"
 #: libraries/display_change_password.lib.php:162
 #: libraries/display_export.lib.php:402 libraries/display_export.lib.php:408
 #: libraries/display_import.lib.php:392 libraries/index.lib.php:44
-#: libraries/insert_edit.lib.php:1546 libraries/insert_edit.lib.php:1583
+#: libraries/insert_edit.lib.php:1544 libraries/insert_edit.lib.php:1581
 #: libraries/normalization.lib.php:165 libraries/normalization.lib.php:821
 #: libraries/operations.lib.php:38 libraries/operations.lib.php:108
 #: libraries/operations.lib.php:263 libraries/operations.lib.php:306
 #: libraries/operations.lib.php:801 libraries/operations.lib.php:874
 #: libraries/operations.lib.php:923 libraries/operations.lib.php:1337
 #: libraries/operations.lib.php:1658
-#: libraries/plugins/auth/AuthenticationCookie.class.php:244
+#: libraries/plugins/auth/AuthenticationCookie.class.php:232
 #: libraries/replication_gui.lib.php:122 libraries/replication_gui.lib.php:161
 #: libraries/replication_gui.lib.php:324 libraries/replication_gui.lib.php:461
 #: libraries/replication_gui.lib.php:906 libraries/rte/rte_events.lib.php:509
-#: libraries/rte/rte_routines.lib.php:969
-#: libraries/rte/rte_routines.lib.php:1581
+#: libraries/rte/rte_routines.lib.php:1060
+#: libraries/rte/rte_routines.lib.php:1672
 #: libraries/rte/rte_triggers.lib.php:396 libraries/server_bin_log.lib.php:61
 #: libraries/server_privileges.lib.php:705
 #: libraries/server_privileges.lib.php:2106
 #: libraries/server_privileges.lib.php:2872
 #: libraries/server_privileges.lib.php:3553
-#: libraries/server_privileges.lib.php:4627
+#: libraries/server_privileges.lib.php:4653
 #: libraries/server_user_groups.lib.php:285
 #: libraries/sql_query_form.lib.php:369 libraries/sql_query_form.lib.php:429
 #: libraries/tracking.lib.php:533 libraries/tracking.lib.php:653
 #: prefs_manage.php:277 prefs_manage.php:355
 #: templates/columns_definitions/column_definitions_form.phtml:59
-#: templates/header_location.phtml:17 templates/index_form.phtml:238
+#: templates/database/create_table.phtml:21 templates/header_location.phtml:28
 #: templates/startAndNumberOfRowsPanel.phtml:14
-#: templates/structure/add_column.phtml:25
-#: templates/table/create_table.phtml:21
-#: templates/table/selection_form.phtml:75 view_create.php:275
+#: templates/table/index_form.phtml:238
+#: templates/table/search/selection_form.phtml:75
+#: templates/table/structure/add_column.phtml:25 view_create.php:275
 #: view_operations.php:106
 msgid "Go"
 msgstr "実行"
@@ -688,7 +690,7 @@ msgstr ""
 "インポートプラグインが読み込めません。正しくインストールされているか確認して"
 "ください！"
 
-#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1466
+#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1460
 #, php-format
 msgid "Bookmark %s has been created."
 msgstr "ブックマーク %s を作成しました。"
@@ -729,11 +731,11 @@ msgstr ""
 msgid "Back"
 msgstr "戻る"
 
-#: index.php:148 libraries/Footer.class.php:70
+#: index.php:149 libraries/Footer.class.php:70
 msgid "phpMyAdmin Demo Server"
 msgstr "phpMyAdmin デモ サーバー"
 
-#: index.php:152
+#: index.php:153
 #, php-format
 msgid ""
 "You are using the demo server. You can do anything here, but please do not "
@@ -744,112 +746,112 @@ msgstr ""
 "root、debian-sys-maintとpmaは変更しないで下さい。詳しい情報は、%sを参照くださ"
 "い。"
 
-#: index.php:162
+#: index.php:163
 msgid "General Settings"
 msgstr "一般設定"
 
-#: index.php:190 libraries/display_change_password.lib.php:50
+#: index.php:191 libraries/display_change_password.lib.php:50
 #: libraries/display_change_password.lib.php:53 user_password.php:247
 msgid "Change password"
 msgstr "パスワードを変更する"
 
-#: index.php:206
+#: index.php:207
 msgid "Server connection collation"
 msgstr "サーバ接続の照合順序"
 
-#: index.php:228
+#: index.php:229
 msgid "Appearance Settings"
 msgstr "外観の設定"
 
-#: index.php:258 prefs_manage.php:285
+#: index.php:259 prefs_manage.php:285
 msgid "More settings"
 msgstr "詳細設定"
 
-#: index.php:279
+#: index.php:280
 msgid "Database server"
 msgstr "データベースサーバ"
 
-#: index.php:282 libraries/plugins/auth/AuthenticationCookie.class.php:181
+#: index.php:283 libraries/plugins/auth/AuthenticationCookie.class.php:169
 msgid "Server:"
 msgstr "サーバ："
 
-#: index.php:286
+#: index.php:287
 msgid "Server type:"
 msgstr "サーバの種類："
 
-#: index.php:290 libraries/plugins/export/ExportLatex.class.php:212
+#: index.php:291 libraries/plugins/export/ExportLatex.class.php:212
 #: libraries/plugins/export/ExportSql.class.php:687
 #: libraries/plugins/export/ExportXml.class.php:189
 msgid "Server version:"
 msgstr "サーバのバージョン："
 
-#: index.php:296
+#: index.php:297
 msgid "Protocol version:"
 msgstr "プロトコル バージョン:"
 
-#: index.php:300
+#: index.php:301
 msgid "User:"
 msgstr "ユーザ："
 
-#: index.php:305
+#: index.php:306
 msgid "Server charset:"
 msgstr "サーバの文字セット:"
 
-#: index.php:320
+#: index.php:321
 msgid "Web server"
 msgstr "ウェブサーバ"
 
-#: index.php:331
+#: index.php:332
 msgid "Database client version:"
 msgstr "データベースクライアントのバージョン："
 
-#: index.php:335
+#: index.php:336
 msgid "PHP extension:"
 msgstr "PHP 拡張:"
 
-#: index.php:349
+#: index.php:350
 #, fuzzy
 #| msgid "PHP Version"
 msgid "PHP version:"
 msgstr "PHP のバージョン"
 
-#: index.php:360
+#: index.php:361
 msgid "Show PHP information"
 msgstr "PHP情報を表示する"
 
-#: index.php:383
+#: index.php:384
 msgid "Version information:"
 msgstr "バージョン情報："
 
-#: index.php:392 libraries/Util.class.php:432 libraries/Util.class.php:495
-#: libraries/config/FormDisplay.tpl.php:151
+#: index.php:393 libraries/Util.class.php:432 libraries/Util.class.php:495
+#: libraries/config/FormDisplay.tpl.php:162
 #: libraries/display_export.lib.php:577 libraries/engines/pbxt.lib.php:162
 #: libraries/navigation/NavigationHeader.class.php:196
 #: libraries/server_variables.lib.php:160
 msgid "Documentation"
 msgstr "ドキュメント"
 
-#: index.php:399
+#: index.php:400
 msgid "Wiki"
 msgstr "Wiki"
 
-#: index.php:408
+#: index.php:409
 msgid "Official Homepage"
 msgstr "phpMyAdmin オフィシャルサイト"
 
-#: index.php:415
+#: index.php:416
 msgid "Contribute"
 msgstr "phpMyAdmin に協力するには"
 
-#: index.php:422
+#: index.php:423
 msgid "Get support"
 msgstr "サポート"
 
-#: index.php:429
+#: index.php:430
 msgid "List of changes"
 msgstr "更新履歴"
 
-#: index.php:451
+#: index.php:452
 msgid ""
 "You are connected as 'root' with no password, which corresponds to the "
 "default MySQL privileged account. Your MySQL server is running with this "
@@ -861,7 +863,7 @@ msgstr ""
 "アクセス可能な状態になっています。root ユーザのパスワードを設定することによっ"
 "て、必ずこのセキュリティホールは閉ざしてください。"
 
-#: index.php:468
+#: index.php:469
 msgid ""
 "You have enabled mbstring.func_overload in your PHP configuration. This "
 "option is incompatible with phpMyAdmin and might cause some data to be "
@@ -870,7 +872,7 @@ msgstr ""
 "PHP の設定で mbstring.func_overload が有効になっています。phpMyAdmin はこのオ"
 "プションに対応していないため、データが破壊されることがあります!"
 
-#: index.php:483
+#: index.php:484
 msgid ""
 "The mbstring PHP extension was not found and you seem to be using a "
 "multibyte charset. Without the mbstring extension phpMyAdmin is unable to "
@@ -880,7 +882,7 @@ msgstr ""
 "いるようですが、mbstring 拡張がないと phpMyAdmin は文字列を正しく分割できない"
 "ため予期しない結果になることがあります。"
 
-#: index.php:500
+#: index.php:501
 msgid ""
 "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini."
 "session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower than "
@@ -892,7 +894,7 @@ msgstr ""
 "phpMyAdmin に設定されているクッキーの有効期間より短くなっています。このため、"
 "phpMyAdmin に設定されているよりも早くログインの期限が切れるかもしれません。"
 
-#: index.php:519
+#: index.php:520
 msgid ""
 "Login cookie store is lower than cookie validity configured in phpMyAdmin, "
 "because of this, your login will expire sooner than configured in phpMyAdmin."
@@ -901,13 +903,13 @@ msgstr ""
 "りも短くなっています。このため、phpMyAdmin に設定されているよりも早くログイン"
 "の期限が切れます。"
 
-#: index.php:535
+#: index.php:536
 msgid "The configuration file now needs a secret passphrase (blowfish_secret)."
 msgstr ""
 "設定ファイルに、暗号化 (blowfish_secret) 用の非公開パスフレーズの設定を必要と"
 "するようになりました。"
 
-#: index.php:548
+#: index.php:549
 msgid ""
 "Directory [code]config[/code], which is used by the setup script, still "
 "exists in your phpMyAdmin directory. It is strongly recommended to remove it "
@@ -919,7 +921,7 @@ msgstr ""
 "ことを強くお勧めします。削除しない場合、誰でも認証なしでサーバの設定をダウン"
 "ロードすることができるため、サーバのセキュリティが低下します。"
 
-#: index.php:564
+#: index.php:565
 #, php-format
 msgid ""
 "The phpMyAdmin configuration storage is not completely configured, some "
@@ -928,12 +930,12 @@ msgstr ""
 "phpMyAdmin 環境保管領域が完全に設定されていないため、いくつかの拡張機能が無効"
 "になっています。理由については%sこちら%sをご覧ください。 "
 
-#: index.php:571
+#: index.php:572
 msgid ""
 "Or alternately go to 'Operations' tab of any database to set it up there."
 msgstr "代わりにデータベースの操作タブを使って設定することもできます。"
 
-#: index.php:620
+#: index.php:621
 #, php-format
 msgid ""
 "Your PHP MySQL library version %s differs from your MySQL server version %s. "
@@ -942,7 +944,7 @@ msgstr ""
 "お使いになっている PHP の MySQL ライブラリのバージョン %s が MySQL サーバの"
 "バージョン %s と異なります。これは予期しない不具合を起こす可能性があります。"
 
-#: index.php:648
+#: index.php:649
 #, php-format
 msgid ""
 "Server running with Suhosin. Please refer to %sdocumentation%s for possible "
@@ -1097,8 +1099,8 @@ msgstr ""
 msgid "Save & Close"
 msgstr "保存して閉じる"
 
-#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:404
-#: libraries/insert_edit.lib.php:1550 prefs_manage.php:361
+#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:415
+#: libraries/insert_edit.lib.php:1548 prefs_manage.php:361
 #: prefs_manage.php:372
 msgid "Reset"
 msgstr "リセット"
@@ -1131,7 +1133,7 @@ msgstr "インデックスを追加する"
 msgid "Edit Index"
 msgstr "インデックスを編集する"
 
-#: js/messages.php:99 templates/index_form.phtml:232
+#: js/messages.php:99 templates/table/index_form.phtml:232
 #, php-format
 msgid "Add %s column(s) to index"
 msgstr "インデックスに %s 個のカラムを追加する"
@@ -1152,13 +1154,14 @@ msgstr "合成物:"
 msgid "Please select column(s) for the index."
 msgstr "インデックスに使用するカラムを選択してください。"
 
-#: js/messages.php:106 templates/structure/add_column.phtml:1
+#: js/messages.php:106 templates/table/structure/add_column.phtml:1
 msgid "You have to add at least one column."
 msgstr "最低ひとつはカラムを追加してください。"
 
-#: js/messages.php:109 libraries/insert_edit.lib.php:1548
+#: js/messages.php:109 libraries/insert_edit.lib.php:1546
 #: templates/columns_definitions/column_definitions_form.phtml:162
-#: templates/index_form.phtml:237 templates/tbl_relation/common_form.phtml:106
+#: templates/table/index_form.phtml:237
+#: templates/table/relation/common_form.phtml:106
 msgid "Preview SQL"
 msgstr "SQLのプレビュー"
 
@@ -1181,7 +1184,7 @@ msgid "SQL query:"
 msgstr "実行した SQL"
 
 #. l10n: Default label for the y-Axis of Charts
-#: js/messages.php:118 templates/tbl_chart.phtml:109
+#: js/messages.php:118 templates/table/chart/tbl_chart.phtml:109
 msgid "Y Values"
 msgstr "Y 軸の値"
 
@@ -1343,7 +1346,7 @@ msgstr "送信"
 msgid "Bytes received"
 msgstr "受信"
 
-#: js/messages.php:169 libraries/server_status.lib.php:226
+#: js/messages.php:169 libraries/server_status.lib.php:235
 msgid "Connections"
 msgstr "接続"
 
@@ -1400,12 +1403,12 @@ msgstr "%d テーブル"
 msgid "Questions"
 msgstr "問い合わせ"
 
-#: js/messages.php:184 libraries/server_status.lib.php:134
+#: js/messages.php:184 libraries/server_status.lib.php:143
 msgid "Traffic"
 msgstr "トラフィック"
 
 #: js/messages.php:185 libraries/Menu.class.php:586
-#: libraries/Util.class.php:4318 libraries/server_status_monitor.lib.php:257
+#: libraries/Util.class.php:4324 libraries/server_status_monitor.lib.php:257
 msgid "Settings"
 msgstr "設定"
 
@@ -1427,8 +1430,9 @@ msgstr "少なくとも１つの系列を追加してください"
 #: libraries/server_status_monitor.lib.php:236
 #: libraries/server_status_processes.lib.php:308
 #: templates/columns_definitions/transformation.phtml:4
-#: templates/designer/options_panel.phtml:178
-#: templates/table/options_zoom.phtml:12 templates/table/rows_zoom.phtml:26
+#: templates/database/designer/options_panel.phtml:178
+#: templates/table/search/options_zoom.phtml:12
+#: templates/table/search/rows_zoom.phtml:26
 msgid "None"
 msgstr "なし"
 
@@ -1717,8 +1721,8 @@ msgstr ""
 
 #: js/messages.php:270 libraries/Menu.class.php:352
 #: libraries/Menu.class.php:455 libraries/Menu.class.php:582
-#: libraries/Util.class.php:4317 libraries/Util.class.php:4332
-#: libraries/Util.class.php:4349 libraries/config/messages.inc.php:258
+#: libraries/Util.class.php:4323 libraries/Util.class.php:4338
+#: libraries/Util.class.php:4355 libraries/config/messages.inc.php:258
 #: libraries/display_import.lib.php:105
 #: libraries/server_status_monitor.lib.php:318 prefs_manage.php:238
 #: setup/frames/menu.inc.php:26
@@ -1778,13 +1782,13 @@ msgid "Formatting SQL..."
 msgstr ""
 
 #: js/messages.php:293 libraries/server_variables.lib.php:157
-#: templates/designer/aggregate_query_panel.phtml:63
-#: templates/designer/delete_relation_panel.phtml:28
-#: templates/designer/having_query_panel.phtml:117
-#: templates/designer/new_relation_panel.phtml:88
-#: templates/designer/options_panel.phtml:253
-#: templates/designer/rename_to_panel.phtml:45
-#: templates/designer/where_query_panel.phtml:83
+#: templates/database/designer/aggregate_query_panel.phtml:63
+#: templates/database/designer/delete_relation_panel.phtml:28
+#: templates/database/designer/having_query_panel.phtml:117
+#: templates/database/designer/new_relation_panel.phtml:88
+#: templates/database/designer/options_panel.phtml:253
+#: templates/database/designer/rename_to_panel.phtml:45
+#: templates/database/designer/where_query_panel.phtml:83
 msgid "Cancel"
 msgstr "キャンセル"
 
@@ -1794,7 +1798,7 @@ msgstr "キャンセル"
 msgid "Page-related settings"
 msgstr "設定の変更"
 
-#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:402
+#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:413
 msgid "Apply"
 msgstr "適用"
 
@@ -1831,8 +1835,8 @@ msgstr "エラーコード：%s"
 msgid "Error text: %s"
 msgstr "エラーテキスト：%s"
 
-#: js/messages.php:307 libraries/db_common.inc.php:68
-#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:450
+#: js/messages.php:307 libraries/db_common.inc.php:69
+#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:461
 msgid "No databases selected."
 msgstr "データベースが選択されていません。"
 
@@ -1844,12 +1848,13 @@ msgstr "カラムを削除しています"
 msgid "Adding Primary Key"
 msgstr "主キーを追加しています"
 
-#: js/messages.php:310 templates/designer/aggregate_query_panel.phtml:59
-#: templates/designer/having_query_panel.phtml:113
-#: templates/designer/new_relation_panel.phtml:87
-#: templates/designer/options_panel.phtml:252
-#: templates/designer/rename_to_panel.phtml:41
-#: templates/designer/where_query_panel.phtml:82
+#: js/messages.php:310
+#: templates/database/designer/aggregate_query_panel.phtml:59
+#: templates/database/designer/having_query_panel.phtml:113
+#: templates/database/designer/new_relation_panel.phtml:87
+#: templates/database/designer/options_panel.phtml:252
+#: templates/database/designer/rename_to_panel.phtml:41
+#: templates/database/designer/where_query_panel.phtml:82
 msgid "OK"
 msgstr "OK"
 
@@ -1869,7 +1874,7 @@ msgstr "データベースをコピーしています"
 msgid "Changing Charset"
 msgstr "文字セットを変更しています"
 
-#: js/messages.php:320 libraries/Util.class.php:3217
+#: js/messages.php:320 libraries/Util.class.php:3223
 #, fuzzy
 #| msgid "Disable foreign key checks"
 msgid "Enable foreign key checks"
@@ -1908,20 +1913,21 @@ msgstr "ストアドファンクションの定義には、RETURN 文を含め
 #: js/messages.php:334 libraries/DisplayResults.class.php:4834
 #: libraries/DisplayResults.class.php:5092 libraries/Menu.class.php:344
 #: libraries/Menu.class.php:446 libraries/Menu.class.php:578
-#: libraries/Util.class.php:3636 libraries/Util.class.php:3637
-#: libraries/Util.class.php:4316 libraries/Util.class.php:4331
-#: libraries/Util.class.php:4348 libraries/config/messages.inc.php:252
+#: libraries/Util.class.php:3642 libraries/Util.class.php:3643
+#: libraries/Util.class.php:4322 libraries/Util.class.php:4337
+#: libraries/Util.class.php:4354 libraries/config/messages.inc.php:252
 #: libraries/display_export.lib.php:173 libraries/rte/rte_list.lib.php:146
 #: libraries/server_privileges.lib.php:2211
 #: libraries/server_privileges.lib.php:2290
 #: libraries/server_privileges.lib.php:2632
 #: libraries/server_privileges.lib.php:3356
 #: libraries/server_status_monitor.lib.php:322 prefs_manage.php:303
-#: setup/frames/menu.inc.php:27 templates/structure/check_all_tables.phtml:11
+#: setup/frames/menu.inc.php:27
+#: templates/database/structure/check_all_tables.phtml:11
 msgid "Export"
 msgstr "エクスポート"
 
-#: js/messages.php:337 libraries/rte/rte_routines.lib.php:652
+#: js/messages.php:337 libraries/rte/rte_routines.lib.php:743
 msgid "ENUM/SET editor"
 msgstr "ENUM/SET エディタ"
 
@@ -1964,7 +1970,7 @@ msgstr "クエリボックスを表示"
 #: libraries/Console.class.php:214 libraries/DisplayResults.class.php:3474
 #: libraries/DisplayResults.class.php:4818 libraries/Index.class.php:723
 #: libraries/Util.class.php:706 libraries/Util.class.php:1202
-#: libraries/Util.class.php:3634 libraries/Util.class.php:3635
+#: libraries/Util.class.php:3640 libraries/Util.class.php:3641
 #: libraries/central_columns.lib.php:851
 #: libraries/central_columns.lib.php:1193
 #: libraries/config/messages.inc.php:892
@@ -1982,7 +1988,7 @@ msgstr "編集"
 #: libraries/server_user_groups.lib.php:129
 #: libraries/sql_query_form.lib.php:416 libraries/tracking.lib.php:477
 #: setup/frames/index.inc.php:183 setup/frames/index.inc.php:291
-#: templates/designer/delete_relation_panel.phtml:27
+#: templates/database/designer/delete_relation_panel.phtml:27
 msgid "Delete"
 msgstr "削除"
 
@@ -2166,11 +2172,11 @@ msgid "No dependencies selected!"
 msgstr "データベースが選択されていません。"
 
 #: js/messages.php:394 libraries/central_columns.lib.php:1214
-#: libraries/insert_edit.lib.php:1458 libraries/server_variables.lib.php:155
+#: libraries/insert_edit.lib.php:1456 libraries/server_variables.lib.php:155
 #: setup/frames/config.inc.php:42 setup/frames/index.inc.php:279
 #: templates/columns_definitions/column_definitions_form.phtml:165
-#: templates/gis_visualization/gis_visualization.phtml:48
-#: templates/tbl_relation/common_form.phtml:107
+#: templates/table/gis_visualization/gis_visualization.phtml:48
+#: templates/table/relation/common_form.phtml:107
 msgid "Save"
 msgstr "保存する"
 
@@ -2257,8 +2263,8 @@ msgid "Data point content"
 msgstr "プロット点におけるデータ内容"
 
 #: js/messages.php:430 js/messages.php:562 js/messages.php:579
-#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2573
-#: templates/index_form.phtml:154 templates/index_form.phtml:194
+#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2571
+#: templates/table/index_form.phtml:154 templates/table/index_form.phtml:194
 msgid "Ignore"
 msgstr "無視"
 
@@ -2319,8 +2325,8 @@ msgstr "外部キーを選択してください"
 msgid "Please select the primary key or a unique key!"
 msgstr "主キーまたはユニークキーを選択してください！"
 
-#: js/messages.php:457 templates/designer/side_menu.phtml:91
-#: templates/designer/side_menu.phtml:94
+#: js/messages.php:457 templates/database/designer/side_menu.phtml:91
+#: templates/database/designer/side_menu.phtml:94
 msgid "Choose column to display"
 msgstr "表示するカラムの選択"
 
@@ -2336,22 +2342,22 @@ msgstr ""
 msgid "Page name"
 msgstr "ページ名"
 
-#: js/messages.php:463 templates/designer/side_menu.phtml:56
-#: templates/designer/side_menu.phtml:59
+#: js/messages.php:463 templates/database/designer/side_menu.phtml:56
+#: templates/database/designer/side_menu.phtml:59
 #, fuzzy
 #| msgid "Select page"
 msgid "Save page"
 msgstr "ページを選択してください"
 
-#: js/messages.php:464 templates/designer/side_menu.phtml:63
-#: templates/designer/side_menu.phtml:66
+#: js/messages.php:464 templates/database/designer/side_menu.phtml:63
+#: templates/database/designer/side_menu.phtml:66
 #, fuzzy
 #| msgid "Select page"
 msgid "Save page as"
 msgstr "ページを選択してください"
 
-#: js/messages.php:465 templates/designer/side_menu.phtml:49
-#: templates/designer/side_menu.phtml:52
+#: js/messages.php:465 templates/database/designer/side_menu.phtml:49
+#: templates/database/designer/side_menu.phtml:52
 #, fuzzy
 #| msgid "Free pages"
 msgid "Open page"
@@ -2363,7 +2369,7 @@ msgstr "フリーページ数"
 msgid "Delete page"
 msgstr "ページを選択してください"
 
-#: js/messages.php:467 templates/designer/side_menu.phtml:10
+#: js/messages.php:467 templates/database/designer/side_menu.phtml:10
 #, fuzzy
 #| msgid "Unit"
 msgid "Untitled"
@@ -2498,7 +2504,7 @@ msgstr "元の位置"
 msgid "cancel"
 msgstr "キャンセル"
 
-#: js/messages.php:499 libraries/server_status.lib.php:271
+#: js/messages.php:499 libraries/server_status.lib.php:280
 msgid "Aborted"
 msgstr "中断"
 
@@ -3111,7 +3117,7 @@ msgstr "有効なポート番号を入力してください！"
 
 #: js/messages.php:793 libraries/Message.class.php:199
 #: libraries/Util.class.php:654 libraries/core.lib.php:245
-#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1172
+#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1170
 #: tbl_operations.php:229 view_operations.php:63
 msgid "Error"
 msgstr "エラー"
@@ -3171,8 +3177,8 @@ msgstr "/ 秒"
 msgid "per minute"
 msgstr "/ 分"
 
-#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:143
-#: libraries/server_status.lib.php:228
+#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:152
+#: libraries/server_status.lib.php:237
 #: libraries/server_status_queries.lib.php:98
 msgid "per hour"
 msgstr "/ 時"
@@ -3192,7 +3198,7 @@ msgstr ""
 "設定ファイルのパーミッションが正しくありません。誰でも書き込み可能になってい"
 "ます！"
 
-#: libraries/Config.class.php:1799
+#: libraries/Config.class.php:1801
 msgid "Font size"
 msgstr "フォントサイズ"
 
@@ -3222,10 +3228,10 @@ msgstr "サブクエリ"
 #: libraries/server_privileges.lib.php:2890
 #: libraries/server_privileges.lib.php:3144
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4332
+#: libraries/server_privileges.lib.php:4358
 #: libraries/server_status_processes.lib.php:80
-#: templates/tbl_relation/foreign_key_row.phtml:165
-#: templates/tbl_relation/internal_relational_row.phtml:55
+#: templates/table/relation/foreign_key_row.phtml:165
+#: templates/table/relation/internal_relational_row.phtml:55
 msgid "Database"
 msgstr "データベース"
 
@@ -3333,11 +3339,11 @@ msgstr "SQL 履歴"
 #: libraries/plugins/import/ImportMediawiki.class.php:60
 #: libraries/plugins/import/ImportOds.class.php:59
 #: libraries/plugins/import/ImportShp.class.php:57
-#: libraries/plugins/import/ImportSql.class.php:148
+#: libraries/plugins/import/ImportSql.class.php:51
 #: libraries/plugins/import/ImportXml.class.php:58
-#: libraries/rte/rte_routines.lib.php:833 templates/index_form.phtml:49
-#: templates/structure/row_stats_table.phtml:20
-#: templates/table/options.phtml:2
+#: libraries/rte/rte_routines.lib.php:924 templates/table/index_form.phtml:49
+#: templates/table/search/options.phtml:2
+#: templates/table/structure/row_stats_table.phtml:20
 msgid "Options"
 msgstr "オプション"
 
@@ -3382,7 +3388,8 @@ msgstr "降順"
 msgid "Order:"
 msgstr "その他"
 
-#: libraries/Console.class.php:289 templates/table/replace_preview.phtml:17
+#: libraries/Console.class.php:289
+#: templates/table/search/replace_preview.phtml:17
 #, fuzzy
 #| msgid "Column"
 msgid "Count"
@@ -3507,9 +3514,9 @@ msgstr "コピーしたテーブルに切り替える"
 #: libraries/operations.lib.php:794 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:191
-#: templates/structure/sortable_header.phtml:21
-#: templates/structure/sortable_header.phtml:38
-#: templates/table/options.phtml:68
+#: templates/database/structure/sortable_header.phtml:21
+#: templates/database/structure/sortable_header.phtml:38
+#: templates/table/search/options.phtml:68
 msgid "Ascending"
 msgstr "昇順"
 
@@ -3519,13 +3526,14 @@ msgstr "昇順"
 #: libraries/operations.lib.php:797 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:188
-#: templates/structure/sortable_header.phtml:26
-#: templates/structure/sortable_header.phtml:43
-#: templates/table/options.phtml:69
+#: templates/database/structure/sortable_header.phtml:26
+#: templates/database/structure/sortable_header.phtml:43
+#: templates/table/search/options.phtml:69
 msgid "Descending"
 msgstr "降順"
 
-#: libraries/DBQbe.class.php:467 templates/table/search_and_replace.phtml:6
+#: libraries/DBQbe.class.php:467
+#: templates/table/search/search_and_replace.phtml:6
 #, fuzzy
 #| msgid "Column"
 msgid "Column:"
@@ -3708,12 +3716,12 @@ msgid_plural "%1$s matches in <strong>%2$s</strong>"
 msgstr[0] "%1$s 件 (テーブル <i>%2$s</i>)"
 
 #: libraries/DbSearch.class.php:354 libraries/Menu.class.php:311
-#: libraries/Util.class.php:3337 libraries/Util.class.php:3347
-#: libraries/Util.class.php:3623 libraries/Util.class.php:3624
-#: libraries/Util.class.php:4343 libraries/config.values.php:43
+#: libraries/Util.class.php:3343 libraries/Util.class.php:3353
+#: libraries/Util.class.php:3629 libraries/Util.class.php:3630
+#: libraries/Util.class.php:4349 libraries/config.values.php:43
 #: libraries/config.values.php:51 libraries/config.values.php:119
 #: libraries/navigation/Nodes/Node_Table.class.php:295
-#: templates/structure/check_all_table_column.phtml:5
+#: templates/table/structure/check_all_table_column.phtml:5
 msgid "Browse"
 msgstr "表示"
 
@@ -3730,7 +3738,8 @@ msgstr "データベース内検索"
 msgid "Words or values to search for (wildcard: \"%\"):"
 msgstr "検索する単語や値 (ワイルドカード: \"%\"):"
 
-#: libraries/DbSearch.class.php:401 templates/table/search_and_replace.phtml:1
+#: libraries/DbSearch.class.php:401
+#: templates/table/search/search_and_replace.phtml:1
 msgid "Find:"
 msgstr "検索条件:"
 
@@ -3778,28 +3787,28 @@ msgstr "フィルタ"
 msgid "Search this table"
 msgstr "データベース内検索"
 
-#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2532
-#: libraries/Util.class.php:2535
+#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2538
+#: libraries/Util.class.php:2541
 msgctxt "First page"
 msgid "Begin"
 msgstr "先頭"
 
-#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2533
-#: libraries/Util.class.php:2536 libraries/server_bin_log.lib.php:170
+#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2539
+#: libraries/Util.class.php:2542 libraries/server_bin_log.lib.php:170
 #: libraries/server_bin_log.lib.php:172
 msgctxt "Previous page"
 msgid "Previous"
 msgstr "前へ"
 
-#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2564
-#: libraries/Util.class.php:2574 libraries/server_bin_log.lib.php:204
+#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2570
+#: libraries/Util.class.php:2580 libraries/server_bin_log.lib.php:204
 #: libraries/server_bin_log.lib.php:206
 msgctxt "Next page"
 msgid "Next"
 msgstr "次へ"
 
-#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2565
-#: libraries/Util.class.php:2575
+#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2571
+#: libraries/Util.class.php:2581
 msgctxt "Last page"
 msgid "End"
 msgstr "最後"
@@ -3878,9 +3887,9 @@ msgid "May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]."
 msgstr "正確な数字とは限りません。[doc@faq3-11]FAQ 3.11[/doc] をご覧ください"
 
 #: libraries/DisplayResults.class.php:4332 libraries/Message.class.php:180
-#: libraries/controllers/TableRelationController.class.php:258
+#: libraries/controllers/TableRelationController.class.php:259
 #: libraries/controllers/TableSearchController.class.php:655
-#: libraries/rte/rte_routines.lib.php:1332 libraries/sql_query_form.lib.php:89
+#: libraries/rte/rte_routines.lib.php:1423 libraries/sql_query_form.lib.php:89
 #: tbl_operations.php:227 tbl_row_action.php:138 view_operations.php:62
 #, fuzzy
 #| msgid "Your SQL query has been executed successfully."
@@ -3888,7 +3897,7 @@ msgid "Your SQL query has been executed successfully."
 msgstr "SQL は正常に実行されました"
 
 #: libraries/DisplayResults.class.php:4660
-#: libraries/controllers/StructureController.class.php:629
+#: libraries/controllers/DatabaseStructureController.class.php:564
 #, php-format
 msgid ""
 "This view has at least this number of rows. Please refer to %sdocumentation"
@@ -3912,34 +3921,34 @@ msgstr ""
 msgid "%d total"
 msgstr "合計"
 
-#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1318
+#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1312
 #, fuzzy, php-format
 #| msgid "Query took %01.4f sec"
 msgid "Query took %01.4f seconds."
 msgstr "クエリの実行時間 %01.4f 秒"
 
 #: libraries/DisplayResults.class.php:4807
-#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4767
-#: libraries/Util.class.php:4773 libraries/mult_submits.inc.php:50
-#: templates/structure/check_all_tables.phtml:2
-#: templates/structure/check_all_tables.phtml:9
+#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4773
+#: libraries/Util.class.php:4779 libraries/mult_submits.inc.php:50
+#: templates/database/structure/check_all_tables.phtml:2
+#: templates/database/structure/check_all_tables.phtml:9
 msgid "With selected:"
 msgstr "チェックしたものを:"
 
 #: libraries/DisplayResults.class.php:4811
-#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4769
-#: libraries/Util.class.php:4770 libraries/server_privileges.lib.php:1174
+#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4775
+#: libraries/Util.class.php:4776 libraries/server_privileges.lib.php:1174
 #: libraries/server_privileges.lib.php:1175
 #: libraries/server_privileges.lib.php:1387
 #: libraries/server_user_groups.lib.php:231
-#: templates/structure/check_all_tables.phtml:3
-#: templates/structure/check_all_tables.phtml:4
+#: templates/database/structure/check_all_tables.phtml:3
+#: templates/database/structure/check_all_tables.phtml:4
 msgid "Check All"
 msgstr "すべてチェックする"
 
 #: libraries/DisplayResults.class.php:4985 libraries/Header.class.php:383
-#: templates/structure/optional_action_links.phtml:1
-#: templates/structure/print_view_data_dictionary_link.phtml:3
+#: templates/database/structure/print_view_data_dictionary_link.phtml:3
+#: templates/table/structure/optional_action_links.phtml:1
 msgid "Print view"
 msgstr "印刷用画面"
 
@@ -3947,7 +3956,8 @@ msgstr "印刷用画面"
 msgid "Query results operations"
 msgstr "クエリ結果操作"
 
-#: libraries/DisplayResults.class.php:5105 templates/tbl_chart.phtml:12
+#: libraries/DisplayResults.class.php:5105
+#: templates/table/chart/tbl_chart.phtml:12
 msgid "Display chart"
 msgstr "グラフで表示する"
 
@@ -4054,7 +4064,7 @@ msgid "Click on the bar to scroll to top of page"
 msgstr ""
 
 #: libraries/Header.class.php:749
-#: libraries/plugins/auth/AuthenticationCookie.class.php:152
+#: libraries/plugins/auth/AuthenticationCookie.class.php:140
 #, fuzzy
 #| msgid "Javascript must be enabled past this point"
 msgid "Javascript must be enabled past this point!"
@@ -4078,11 +4088,11 @@ msgid "Keyname"
 msgstr "キー名"
 
 #: libraries/Index.class.php:697
-#: libraries/controllers/StructureController.class.php:1962
-#: libraries/controllers/StructureController.class.php:1967
+#: libraries/controllers/TableStructureController.class.php:953
+#: libraries/controllers/TableStructureController.class.php:958
 #: libraries/tracking.lib.php:973
 #: templates/columns_definitions/column_indexes.phtml:11
-#: templates/structure/check_all_table_column.phtml:26
+#: templates/table/structure/check_all_table_column.phtml:26
 msgid "Unique"
 msgstr "ユニーク"
 
@@ -4101,16 +4111,17 @@ msgstr "一意な値の数"
 #: libraries/server_collations.lib.php:35 libraries/tracking.lib.php:881
 #: libraries/tracking.lib.php:977
 #: templates/columns_definitions/table_fields_definitions.phtml:33
-#: templates/structure/row_stats_table.phtml:31
-#: templates/structure/table_header.phtml:55
-#: templates/structure/table_structure_header.phtml:7
-#: templates/table/table_header.phtml:8
+#: templates/database/structure/table_header.phtml:55
+#: templates/table/search/table_header.phtml:8
+#: templates/table/structure/row_stats_table.phtml:31
+#: templates/table/structure/table_structure_header.phtml:7
 msgid "Collation"
 msgstr "照合順序"
 
 #: libraries/Index.class.php:703 libraries/rte/rte_events.lib.php:496
-#: libraries/rte/rte_routines.lib.php:956 libraries/tracking.lib.php:885
-#: libraries/tracking.lib.php:979 templates/structure/table_header.phtml:84
+#: libraries/rte/rte_routines.lib.php:1047 libraries/tracking.lib.php:885
+#: libraries/tracking.lib.php:979
+#: templates/database/structure/table_header.phtml:84
 msgid "Comment"
 msgstr "コメント"
 
@@ -4123,15 +4134,15 @@ msgstr "主キーを削除しました。"
 msgid "Index %s has been dropped."
 msgstr "インデックス %s を削除しました。"
 
-#: libraries/Index.class.php:757 libraries/Util.class.php:3630
-#: libraries/Util.class.php:3631
-#: libraries/controllers/StructureController.class.php:1958
-#: libraries/controllers/StructureController.class.php:1959
+#: libraries/Index.class.php:757 libraries/Util.class.php:3636
+#: libraries/Util.class.php:3637
+#: libraries/controllers/TableStructureController.class.php:949
+#: libraries/controllers/TableStructureController.class.php:950
 #: libraries/operations.lib.php:1607 libraries/rte/rte_list.lib.php:150
 #: libraries/server_databases.lib.php:146
-#: templates/structure/check_all_table_column.phtml:15
-#: templates/structure/check_all_tables.phtml:16
-#: templates/tbl_relation/foreign_key_row.phtml:93
+#: templates/database/structure/check_all_tables.phtml:16
+#: templates/table/relation/foreign_key_row.phtml:93
+#: templates/table/structure/check_all_table_column.phtml:15
 msgid "Drop"
 msgstr "削除"
 
@@ -4162,16 +4173,16 @@ msgstr "サーバ"
 #: libraries/Menu.class.php:248
 #: libraries/navigation/Nodes/Node_View.class.php:32
 #: libraries/tbl_info.inc.php:63
-#: templates/structure/structure_table_row.phtml:97
-#: templates/structure/structure_table_row.phtml:159
+#: templates/database/structure/structure_table_row.phtml:97
+#: templates/database/structure/structure_table_row.phtml:159
 msgid "View"
 msgstr "ビュー"
 
 #: libraries/Menu.class.php:325 libraries/Menu.class.php:429
-#: libraries/Menu.class.php:548 libraries/Util.class.php:3334
-#: libraries/Util.class.php:3344 libraries/Util.class.php:3350
-#: libraries/Util.class.php:4313 libraries/Util.class.php:4328
-#: libraries/Util.class.php:4345 libraries/config.values.php:40
+#: libraries/Menu.class.php:548 libraries/Util.class.php:3340
+#: libraries/Util.class.php:3350 libraries/Util.class.php:3356
+#: libraries/Util.class.php:4319 libraries/Util.class.php:4334
+#: libraries/Util.class.php:4351 libraries/config.values.php:40
 #: libraries/config.values.php:48 libraries/config.values.php:110
 #: libraries/config.values.php:116 libraries/config/messages.inc.php:321
 #: libraries/navigation/Nodes/Node_Table.class.php:292
@@ -4179,19 +4190,19 @@ msgid "SQL"
 msgstr "SQL"
 
 #: libraries/Menu.class.php:328 libraries/Menu.class.php:432
-#: libraries/Util.class.php:3335 libraries/Util.class.php:3345
-#: libraries/Util.class.php:3351 libraries/Util.class.php:3625
-#: libraries/Util.class.php:3626 libraries/Util.class.php:4329
-#: libraries/Util.class.php:4346 libraries/config.values.php:41
+#: libraries/Util.class.php:3341 libraries/Util.class.php:3351
+#: libraries/Util.class.php:3357 libraries/Util.class.php:3631
+#: libraries/Util.class.php:3632 libraries/Util.class.php:4335
+#: libraries/Util.class.php:4352 libraries/config.values.php:41
 #: libraries/config.values.php:49 libraries/config.values.php:111
 #: libraries/config.values.php:117
 #: libraries/navigation/Nodes/Node_Table.class.php:286
 msgid "Search"
 msgstr "検索"
 
-#: libraries/Menu.class.php:338 libraries/Util.class.php:3336
-#: libraries/Util.class.php:3346 libraries/Util.class.php:3627
-#: libraries/Util.class.php:3628 libraries/Util.class.php:4347
+#: libraries/Menu.class.php:338 libraries/Util.class.php:3342
+#: libraries/Util.class.php:3352 libraries/Util.class.php:3633
+#: libraries/Util.class.php:3634 libraries/Util.class.php:4353
 #: libraries/config.values.php:42 libraries/config.values.php:50
 #: libraries/config.values.php:118
 #: libraries/navigation/Nodes/Node_Table.class.php:289
@@ -4200,30 +4211,30 @@ msgid "Insert"
 msgstr "挿入"
 
 #: libraries/Menu.class.php:362 libraries/Menu.class.php:467
-#: libraries/Util.class.php:4334 libraries/Util.class.php:4350
+#: libraries/Util.class.php:4340 libraries/Util.class.php:4356
 #: libraries/config.values.php:106 libraries/server_common.lib.php:51
 #: libraries/server_privileges.lib.php:2370
 #: libraries/server_privileges.lib.php:3158
-#: libraries/server_privileges.lib.php:4221
+#: libraries/server_privileges.lib.php:4247
 msgid "Privileges"
 msgstr "特権"
 
 #: libraries/Menu.class.php:371 libraries/Menu.class.php:379
-#: libraries/Menu.class.php:459 libraries/Util.class.php:3338
-#: libraries/Util.class.php:3352 libraries/Util.class.php:4333
-#: libraries/Util.class.php:4351 libraries/config.values.php:112
+#: libraries/Menu.class.php:459 libraries/Util.class.php:3344
+#: libraries/Util.class.php:3358 libraries/Util.class.php:4339
+#: libraries/Util.class.php:4357 libraries/config.values.php:112
 #: view_operations.php:92
 msgid "Operations"
 msgstr "操作"
 
 #: libraries/Menu.class.php:384 libraries/Menu.class.php:492
-#: libraries/Util.class.php:4338 libraries/Util.class.php:4352
+#: libraries/Util.class.php:4344 libraries/Util.class.php:4358
 #: libraries/relation.lib.php:255
 msgid "Tracking"
 msgstr "SQL コマンドの追跡"
 
 #: libraries/Menu.class.php:397 libraries/Menu.class.php:486
-#: libraries/Util.class.php:4337 libraries/Util.class.php:4353
+#: libraries/Util.class.php:4343 libraries/Util.class.php:4359
 #: libraries/navigation/Nodes/Node_Trigger_Container.class.php:24
 #: libraries/plugins/export/ExportHtmlword.class.php:557
 #: libraries/plugins/export/ExportOdt.class.php:685
@@ -4240,16 +4251,16 @@ msgstr "トリガ"
 msgid "Database seems to be empty!"
 msgstr "データベースが空のようです!"
 
-#: libraries/Menu.class.php:439 libraries/Util.class.php:4330
+#: libraries/Menu.class.php:439 libraries/Util.class.php:4336
 msgid "Query"
 msgstr "クエリ"
 
-#: libraries/Menu.class.php:472 libraries/Util.class.php:4335
+#: libraries/Menu.class.php:472 libraries/Util.class.php:4341
 #: libraries/rte/rte_words.lib.php:36
 msgid "Routines"
 msgstr "ルーチン"
 
-#: libraries/Menu.class.php:479 libraries/Util.class.php:4336
+#: libraries/Menu.class.php:479 libraries/Util.class.php:4342
 #: libraries/navigation/Nodes/Node_Event_Container.class.php:26
 #: libraries/plugins/export/ExportSql.class.php:940
 #: libraries/plugins/export/ExportXml.class.php:107
@@ -4257,22 +4268,22 @@ msgstr "ルーチン"
 msgid "Events"
 msgstr "イベント"
 
-#: libraries/Menu.class.php:498 libraries/Util.class.php:4339
+#: libraries/Menu.class.php:498 libraries/Util.class.php:4345
 msgid "Designer"
 msgstr "デザイナ"
 
-#: libraries/Menu.class.php:507 libraries/Util.class.php:4340
-#: templates/structure/check_all_tables.phtml:35
+#: libraries/Menu.class.php:507 libraries/Util.class.php:4346
+#: templates/database/structure/check_all_tables.phtml:35
 #, fuzzy
 #| msgid "Textarea columns"
 msgid "Central columns"
 msgstr "textarea の 1 行の文字数"
 
-#: libraries/Menu.class.php:544 libraries/Util.class.php:4312
+#: libraries/Menu.class.php:544 libraries/Util.class.php:4318
 #: libraries/config.values.php:103 libraries/config/messages.inc.php:266
 #: libraries/config/messages.inc.php:341
 #: libraries/navigation/NavigationTree.class.php:1239
-#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4332
+#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4358
 msgid "Databases"
 msgstr "データベース"
 
@@ -4283,34 +4294,34 @@ msgid "User accounts"
 msgstr "ユーザグループ"
 
 #: libraries/Menu.class.php:595 libraries/ServerStatusData.class.php:121
-#: libraries/Util.class.php:4319 libraries/server_common.lib.php:36
+#: libraries/Util.class.php:4325 libraries/server_common.lib.php:36
 msgid "Binary log"
 msgstr "バイナリログ"
 
 #: libraries/Menu.class.php:601 libraries/ServerStatusData.class.php:126
-#: libraries/Util.class.php:4320 libraries/server_common.lib.php:42
-#: templates/structure/body_for_table_summary.phtml:10
-#: templates/structure/table_header.phtml:27
+#: libraries/Util.class.php:4326 libraries/server_common.lib.php:42
+#: templates/database/structure/body_for_table_summary.phtml:10
+#: templates/database/structure/table_header.phtml:27
 msgid "Replication"
 msgstr "レプリケーション"
 
 #: libraries/Menu.class.php:606 libraries/ServerStatusData.class.php:193
-#: libraries/Util.class.php:4321 libraries/config.values.php:105
+#: libraries/Util.class.php:4327 libraries/config.values.php:105
 #: libraries/server_engines.lib.php:108 libraries/server_engines.lib.php:112
 #: libraries/sql_query_form.lib.php:421
 msgid "Variables"
 msgstr "変数"
 
-#: libraries/Menu.class.php:610 libraries/Util.class.php:4322
+#: libraries/Menu.class.php:610 libraries/Util.class.php:4328
 msgid "Charsets"
 msgstr "文字セット"
 
-#: libraries/Menu.class.php:615 libraries/Util.class.php:4323
+#: libraries/Menu.class.php:615 libraries/Util.class.php:4329
 #: libraries/server_common.lib.php:33 libraries/server_plugins.lib.php:27
 msgid "Plugins"
 msgstr "プラグイン"
 
-#: libraries/Menu.class.php:626 libraries/Util.class.php:4324
+#: libraries/Menu.class.php:626 libraries/Util.class.php:4330
 msgid "Engines"
 msgstr "エンジン"
 
@@ -4332,7 +4343,7 @@ msgid "%1$d row inserted."
 msgid_plural "%1$d rows inserted."
 msgstr[0] "%1$d 行挿入しました。"
 
-#: libraries/PDF.class.php:70 libraries/Util.class.php:2521
+#: libraries/PDF.class.php:70 libraries/Util.class.php:2527
 #: libraries/browse_foreigners.lib.php:327
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:865
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:890
@@ -4357,7 +4368,7 @@ msgid "Could not save favorite table!"
 msgstr "最近使用したテーブルが保存できません"
 
 #: libraries/RecentFavoriteTable.class.php:212
-#: templates/structure/favorite_anchor.phtml:12
+#: templates/database/structure/favorite_anchor.phtml:12
 #, fuzzy
 #| msgid "Remove chart"
 msgid "Remove from Favorites"
@@ -4538,7 +4549,7 @@ msgid ""
 msgstr "このストレージエンジンにはステータスの詳細情報はありません。"
 
 #: libraries/StorageEngine.class.php:373
-#: templates/structure/body_for_table_summary.phtml:50
+#: templates/database/structure/body_for_table_summary.phtml:50
 #, php-format
 msgid "%s is the default storage engine on this MySQL server."
 msgstr "%s はこの MySQL サーバのデフォルトストレージエンジンです。"
@@ -5020,10 +5031,10 @@ msgstr ""
 
 #: libraries/Util.class.php:726 libraries/rte/rte_events.lib.php:110
 #: libraries/rte/rte_events.lib.php:119 libraries/rte/rte_events.lib.php:150
-#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:153
-#: libraries/rte/rte_routines.lib.php:162
-#: libraries/rte/rte_routines.lib.php:235
-#: libraries/rte/rte_routines.lib.php:1366
+#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:223
+#: libraries/rte/rte_routines.lib.php:250
+#: libraries/rte/rte_routines.lib.php:372
+#: libraries/rte/rte_routines.lib.php:1457
 #: libraries/rte/rte_triggers.lib.php:86 libraries/rte/rte_triggers.lib.php:95
 #: libraries/rte/rte_triggers.lib.php:127
 msgid "MySQL said: "
@@ -5069,77 +5080,80 @@ msgstr "日"
 msgid "%B %d, %Y at %I:%M %p"
 msgstr "%Y 年 %B %d 日 %H:%M"
 
-#: libraries/Util.class.php:2019
+#: libraries/Util.class.php:2025
 #, php-format
 msgid "%s days, %s hours, %s minutes and %s seconds"
 msgstr "%s 日 %s 時間 %s 分 %s 秒"
 
-#: libraries/Util.class.php:2112
+#: libraries/Util.class.php:2118
 msgid "Missing parameter:"
 msgstr "パラメータがありません："
 
-#: libraries/Util.class.php:2645
+#: libraries/Util.class.php:2651
 #, php-format
 msgid "Jump to database \"%s\"."
 msgstr "データベース「%s」に移動します。"
 
-#: libraries/Util.class.php:2670
+#: libraries/Util.class.php:2676
 #, php-format
 msgid "The %s functionality is affected by a known bug, see %s"
 msgstr "%s の機能には既知のバグがあります。%s をご覧ください"
 
-#: libraries/Util.class.php:2881
+#: libraries/Util.class.php:2887
 msgid "Click to toggle"
 msgstr "クリックでオン／オフ切り替え"
 
-#: libraries/Util.class.php:3542 prefs_manage.php:248
+#: libraries/Util.class.php:3548 prefs_manage.php:248
 msgid "Browse your computer:"
 msgstr "アップロードファイル:"
 
-#: libraries/Util.class.php:3567
+#: libraries/Util.class.php:3573
 #, php-format
 msgid "Select from the web server upload directory <b>%s</b>:"
 msgstr "ウェブサーバ上のアップロードディレクトリ <b>%s</b> から選択する："
 
-#: libraries/Util.class.php:3596 libraries/insert_edit.lib.php:1173
+#: libraries/Util.class.php:3602 libraries/insert_edit.lib.php:1171
 msgid "The directory you set for upload work cannot be reached."
 msgstr "指定したアップロードディレクトリが利用できません。"
 
-#: libraries/Util.class.php:3607
+#: libraries/Util.class.php:3613
 #, fuzzy
 #| msgid "There are no files to upload"
 msgid "There are no files to upload!"
 msgstr "アップロードファイルがありません"
 
-#: libraries/Util.class.php:3632 libraries/Util.class.php:3633
-#: templates/structure/check_all_tables.phtml:15
+#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: templates/database/structure/check_all_tables.phtml:15
 msgid "Empty"
 msgstr "空にする"
 
-#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: libraries/Util.class.php:3644 libraries/Util.class.php:3645
 msgid "Execute"
 msgstr "実行"
 
-#: libraries/Util.class.php:4152
+#: libraries/Util.class.php:4158
 msgid "Print"
 msgstr "印刷"
 
-#: libraries/Util.class.php:4257 templates/structure/row_stats_table.phtml:80
-#: templates/structure/table_header.phtml:95
+#: libraries/Util.class.php:4263
+#: templates/database/structure/table_header.phtml:95
+#: templates/table/structure/row_stats_table.phtml:80
 msgid "Creation"
 msgstr "作成日時"
 
-#: libraries/Util.class.php:4263 templates/structure/row_stats_table.phtml:87
-#: templates/structure/table_header.phtml:106
+#: libraries/Util.class.php:4269
+#: templates/database/structure/table_header.phtml:106
+#: templates/table/structure/row_stats_table.phtml:87
 msgid "Last update"
 msgstr "最終更新"
 
-#: libraries/Util.class.php:4269 templates/structure/row_stats_table.phtml:94
-#: templates/structure/table_header.phtml:117
+#: libraries/Util.class.php:4275
+#: templates/database/structure/table_header.phtml:117
+#: templates/table/structure/row_stats_table.phtml:94
 msgid "Last check"
 msgstr "最終検査"
 
-#: libraries/Util.class.php:4315
+#: libraries/Util.class.php:4321
 msgid "Users"
 msgstr "ユーザ"
 
@@ -5160,16 +5174,16 @@ msgid "Use this value"
 msgstr "この値を利用する"
 
 #: libraries/build_html_for_db.lib.php:33 libraries/import.lib.php:193
-#: templates/structure/actions_in_table_structure.phtml:113
-#: templates/structure/row_stats_table.phtml:42
-#: templates/structure/table_header.phtml:36
+#: templates/database/structure/table_header.phtml:36
+#: templates/table/structure/actions_in_table_structure.phtml:113
+#: templates/table/structure/row_stats_table.phtml:42
 msgid "Rows"
 msgstr "行"
 
 #: libraries/build_html_for_db.lib.php:48 libraries/engines/innodb.lib.php:171
-#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:186
-#: libraries/server_status.lib.php:298
-#: templates/structure/display_table_stats.phtml:40
+#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:195
+#: libraries/server_status.lib.php:307
+#: templates/table/structure/display_table_stats.phtml:40
 msgid "Total"
 msgstr "合計"
 
@@ -5178,10 +5192,12 @@ msgid "Jump to database"
 msgstr "データベースに移動"
 
 #: libraries/build_html_for_db.lib.php:146
+#: templates/database/structure/structure_table_row.phtml:15
 msgid "Not replicated"
 msgstr "レプリケーションしていない"
 
 #: libraries/build_html_for_db.lib.php:158
+#: templates/database/structure/structure_table_row.phtml:16
 msgid "Replicated"
 msgstr "レプリケーションしている"
 
@@ -5238,17 +5254,17 @@ msgstr ""
 #: libraries/plugins/export/ExportTexytext.class.php:425
 #: libraries/plugins/export/PMA_ExportPdf.class.php:307
 #: libraries/rte/rte_list.lib.php:73 libraries/rte/rte_list.lib.php:85
-#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:830
-#: libraries/rte/rte_routines.lib.php:1492 setup/frames/index.inc.php:162
+#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:921
+#: libraries/rte/rte_routines.lib.php:1583 setup/frames/index.inc.php:162
 #: templates/columns_definitions/table_fields_definitions.phtml:8
-#: templates/structure/table_structure_header.phtml:5
-#: templates/table/create_table.phtml:11
+#: templates/database/create_table.phtml:11
+#: templates/table/structure/table_structure_header.phtml:5
 msgid "Name"
 msgstr "名前"
 
 #: libraries/central_columns.lib.php:699
 #: libraries/central_columns.lib.php:1381
-#: libraries/rte/rte_routines.lib.php:832
+#: libraries/rte/rte_routines.lib.php:923
 #: templates/columns_definitions/table_fields_definitions.phtml:14
 msgid "Length/Values"
 msgstr "長さ/値"
@@ -5271,7 +5287,7 @@ msgid "Select a table"
 msgstr "テーブルを選択してください"
 
 #: libraries/central_columns.lib.php:804
-#: templates/structure/add_column.phtml:4
+#: templates/table/structure/add_column.phtml:4
 msgid "Add column"
 msgstr "カラムを追加する"
 
@@ -5291,7 +5307,7 @@ msgstr "カラムを追加する"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1002
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1025
 #: templates/columns_definitions/table_fields_definitions.phtml:36
-#: templates/structure/table_structure_header.phtml:8
+#: templates/table/structure/table_structure_header.phtml:8
 msgid "Attributes"
 msgstr "属性"
 
@@ -5411,7 +5427,7 @@ msgid "Double click"
 msgstr ""
 
 #: libraries/config.values.php:95 libraries/config.values.php:124
-#: libraries/config/FormDisplay.tpl.php:221 libraries/relation.lib.php:97
+#: libraries/config/FormDisplay.tpl.php:232 libraries/relation.lib.php:97
 #: libraries/relation.lib.php:105
 msgid "Disabled"
 msgstr "無効"
@@ -5602,21 +5618,21 @@ msgstr "エクスポートが行えません。関数 %s がありません。"
 msgid "maximum %s"
 msgstr "最大 %s"
 
-#: libraries/config/FormDisplay.tpl.php:219
+#: libraries/config/FormDisplay.tpl.php:230
 msgid "This setting is disabled, it will not be applied to your configuration."
 msgstr "この項目は無効になっています。これは設定に適用されていません。"
 
-#: libraries/config/FormDisplay.tpl.php:313
+#: libraries/config/FormDisplay.tpl.php:324
 #, php-format
 msgid "Set value: %s"
 msgstr "値「%s」を設定"
 
-#: libraries/config/FormDisplay.tpl.php:318
+#: libraries/config/FormDisplay.tpl.php:329
 #: libraries/config/messages.inc.php:610
 msgid "Restore default value"
 msgstr "デフォルト値に戻す"
 
-#: libraries/config/FormDisplay.tpl.php:332
+#: libraries/config/FormDisplay.tpl.php:343
 msgid "Allow users to customize this value"
 msgstr "この値の変更をユーザに許可する"
 
@@ -6200,7 +6216,7 @@ msgstr "ファイルの文字セット"
 
 #: libraries/config/messages.inc.php:136 libraries/config/messages.inc.php:152
 #: libraries/sql_query_form.lib.php:247
-#: templates/structure/row_stats_table.phtml:7
+#: templates/table/structure/row_stats_table.phtml:7
 msgid "Format"
 msgstr "フォーマット"
 
@@ -6790,7 +6806,7 @@ msgstr "データベースの構造 (テーブルの一覧) で詳細に表示
 
 #: libraries/config/messages.inc.php:332
 #: libraries/plugins/export/ExportPdf.class.php:279
-#: templates/structure/secondary_tabs.phtml:8
+#: templates/table/secondary_tabs.phtml:8
 msgid "Table structure"
 msgstr "テーブルの構造"
 
@@ -8813,103 +8829,35 @@ msgstr "Microsoft Word 2000"
 msgid "OpenDocument Text"
 msgstr "Open Document テキスト"
 
-#: libraries/controllers/StructureController.class.php:465
+#: libraries/controllers/DatabaseStructureController.class.php:405
 #: tbl_operations.php:382
 #, php-format
 msgid "Table %s has been emptied."
 msgstr "テーブル %s を空にしました。"
 
-#: libraries/controllers/StructureController.class.php:486
+#: libraries/controllers/DatabaseStructureController.class.php:426
 #: tbl_operations.php:400 view_operations.php:119
 #, fuzzy, php-format
 #| msgid "View %s has been dropped."
 msgid "View %s has been dropped."
 msgstr "ビュー %s を破棄しました"
 
-#: libraries/controllers/StructureController.class.php:487
+#: libraries/controllers/DatabaseStructureController.class.php:427
 #: tbl_operations.php:401
 #, fuzzy, php-format
 #| msgid "Table %s has been dropped."
 msgid "Table %s has been dropped."
 msgstr "テーブル %s を削除しました"
 
-#: libraries/controllers/StructureController.class.php:797
-#, php-format
-msgid "The name '%s' is a MySQL reserved keyword."
-msgid_plural "The names '%s' are MySQL reserved keywords."
-msgstr[0] ""
-
-#: libraries/controllers/StructureController.class.php:875
-msgid "No column selected."
-msgstr "カラムが選択されていません。"
-
-#: libraries/controllers/StructureController.class.php:1049
+#: libraries/controllers/DatabaseStructureController.class.php:733
 msgid "Favorite List is full!"
 msgstr ""
 
-#: libraries/controllers/StructureController.class.php:1272
-msgid "The columns have been moved successfully."
-msgstr "カラムは正常に移動されました。"
-
-#: libraries/controllers/StructureController.class.php:1535
-#, fuzzy, php-format
-#| msgid "Table %1$s has been altered successfully."
-msgid ""
-"Table %1$s has been altered successfully. Privileges have been adjusted."
-msgstr "テーブル %1$s は正常に変更されました。"
-
-#: libraries/controllers/StructureController.class.php:1541
-#: libraries/controllers/TableIndexesController.class.php:161
-#: tbl_addfield.php:92
-#, php-format
-msgid "Table %1$s has been altered successfully."
-msgstr "テーブル %1$s は正常に変更されました。"
-
-#: libraries/controllers/StructureController.class.php:1588
-#: libraries/tracking.lib.php:1094
-msgid "Query error"
-msgstr "クエリエラー"
-
-#: libraries/controllers/StructureController.class.php:1806
+#: libraries/controllers/DatabaseStructureController.class.php:947
 #: libraries/mysql_charsets.lib.php:366 libraries/mysql_charsets.lib.php:373
 msgid "unknown"
 msgstr "不明"
 
-#: libraries/controllers/StructureController.class.php:1957
-#: templates/structure/check_all_table_column.phtml:11
-msgid "Change"
-msgstr "変更"
-
-#: libraries/controllers/StructureController.class.php:1961
-#: libraries/controllers/StructureController.class.php:1966
-#: libraries/navigation/Nodes/Node_Index.class.php:30
-#: libraries/tracking.lib.php:926
-#: templates/columns_definitions/column_indexes.phtml:16
-#: templates/columns_definitions/table_fields_definitions.phtml:57
-#: templates/structure/check_all_table_column.phtml:30
-#: templates/structure/display_structure.phtml:79
-#: templates/structure/display_table_stats.phtml:19
-msgid "Index"
-msgstr "インデックス"
-
-#: libraries/controllers/StructureController.class.php:1963
-#: libraries/controllers/StructureController.class.php:1968
-#: templates/columns_definitions/column_indexes.phtml:27
-#: templates/structure/check_all_table_column.phtml:37
-msgid "Spatial"
-msgstr "空間"
-
-#: libraries/controllers/StructureController.class.php:1964
-#: libraries/controllers/StructureController.class.php:1969
-#: templates/columns_definitions/column_indexes.phtml:22
-#: templates/structure/check_all_table_column.phtml:47
-msgid "Fulltext"
-msgstr "全文"
-
-#: libraries/controllers/StructureController.class.php:1970
-msgid "Distinct values"
-msgstr "件数集計"
-
 #: libraries/controllers/TableChartController.class.php:82
 #: libraries/controllers/TableGisVisualizationController.class.php:101
 msgid "No SQL query was set to fetch data."
@@ -8925,13 +8873,20 @@ msgstr ""
 msgid "No data to display"
 msgstr "データが存在しません"
 
-#: libraries/controllers/TableRelationController.class.php:217
+#: libraries/controllers/TableIndexesController.class.php:161
+#: libraries/controllers/TableStructureController.class.php:736
+#: tbl_addfield.php:92
+#, php-format
+msgid "Table %1$s has been altered successfully."
+msgstr "テーブル %1$s は正常に変更されました。"
+
+#: libraries/controllers/TableRelationController.class.php:218
 #, fuzzy
 #| msgid "Thread %s was successfully killed."
 msgid "Display column was successfully updated."
 msgstr "スレッド %s は正常終了しました。"
 
-#: libraries/controllers/TableRelationController.class.php:283
+#: libraries/controllers/TableRelationController.class.php:288
 #, fuzzy
 #| msgid "Internal relation added"
 msgid "Internal relations were successfully updated."
@@ -8950,12 +8905,73 @@ msgid "Zoom search"
 msgstr "検索プロット"
 
 #: libraries/controllers/TableSearchController.class.php:852
-#: templates/table/selection_form.phtml:59
+#: templates/table/search/selection_form.phtml:59
 #, fuzzy
 #| msgid "Hide find and replace criteria"
 msgid "Find and replace"
 msgstr "検索と置換の条件を隠す"
 
+#: libraries/controllers/TableStructureController.class.php:163
+#, php-format
+msgid "The name '%s' is a MySQL reserved keyword."
+msgid_plural "The names '%s' are MySQL reserved keywords."
+msgstr[0] ""
+
+#: libraries/controllers/TableStructureController.class.php:241
+msgid "No column selected."
+msgstr "カラムが選択されていません。"
+
+#: libraries/controllers/TableStructureController.class.php:467
+msgid "The columns have been moved successfully."
+msgstr "カラムは正常に移動されました。"
+
+#: libraries/controllers/TableStructureController.class.php:730
+#, fuzzy, php-format
+#| msgid "Table %1$s has been altered successfully."
+msgid ""
+"Table %1$s has been altered successfully. Privileges have been adjusted."
+msgstr "テーブル %1$s は正常に変更されました。"
+
+#: libraries/controllers/TableStructureController.class.php:783
+#: libraries/tracking.lib.php:1094
+msgid "Query error"
+msgstr "クエリエラー"
+
+#: libraries/controllers/TableStructureController.class.php:948
+#: templates/table/structure/check_all_table_column.phtml:11
+msgid "Change"
+msgstr "変更"
+
+#: libraries/controllers/TableStructureController.class.php:952
+#: libraries/controllers/TableStructureController.class.php:957
+#: libraries/navigation/Nodes/Node_Index.class.php:30
+#: libraries/tracking.lib.php:926
+#: templates/columns_definitions/column_indexes.phtml:16
+#: templates/columns_definitions/table_fields_definitions.phtml:57
+#: templates/table/structure/check_all_table_column.phtml:30
+#: templates/table/structure/display_structure.phtml:79
+#: templates/table/structure/display_table_stats.phtml:19
+msgid "Index"
+msgstr "インデックス"
+
+#: libraries/controllers/TableStructureController.class.php:954
+#: libraries/controllers/TableStructureController.class.php:959
+#: templates/columns_definitions/column_indexes.phtml:27
+#: templates/table/structure/check_all_table_column.phtml:37
+msgid "Spatial"
+msgstr "空間"
+
+#: libraries/controllers/TableStructureController.class.php:955
+#: libraries/controllers/TableStructureController.class.php:960
+#: templates/columns_definitions/column_indexes.phtml:22
+#: templates/table/structure/check_all_table_column.phtml:47
+msgid "Fulltext"
+msgstr "全文"
+
+#: libraries/controllers/TableStructureController.class.php:963
+msgid "Distinct values"
+msgstr "件数集計"
+
 #: libraries/core.lib.php:306
 #, php-format
 msgid "The %s extension is missing. Please check your PHP configuration."
@@ -9004,7 +9020,7 @@ msgid "No Password"
 msgstr "パスワード無し"
 
 #: libraries/display_change_password.lib.php:68
-#: libraries/plugins/auth/AuthenticationCookie.class.php:199
+#: libraries/plugins/auth/AuthenticationCookie.class.php:187
 #: libraries/replication_gui.lib.php:422 libraries/replication_gui.lib.php:862
 #: libraries/server_privileges.lib.php:1640
 msgid "Password:"
@@ -9842,12 +9858,12 @@ msgid "Dump has been saved to file %s."
 msgstr "ダンプをファイル %s に保存しました。"
 
 #: libraries/import.lib.php:202 libraries/insert_edit.lib.php:124
-#: libraries/rte/rte_routines.lib.php:1353 libraries/sql.lib.php:1312
+#: libraries/rte/rte_routines.lib.php:1444 libraries/sql.lib.php:1306
 #: tbl_get_field.php:44
 msgid "MySQL returned an empty result set (i.e. zero rows)."
 msgstr "返り値が空でした (行数 0)。"
 
-#: libraries/import.lib.php:265 libraries/sql.lib.php:1326
+#: libraries/import.lib.php:265 libraries/sql.lib.php:1320
 msgid "[ROLLBACK occurred.]"
 msgstr ""
 
@@ -9920,14 +9936,14 @@ msgstr "%s つのカラムにインデックスを作成する"
 
 #: libraries/insert_edit.lib.php:233
 #: libraries/navigation/Nodes/Node_DatabaseChild.class.php:48
-#: templates/designer/table_list.phtml:40
+#: templates/database/designer/table_list.phtml:40
 msgid "Hide"
 msgstr "隠す"
 
 #: libraries/insert_edit.lib.php:249
 #: libraries/navigation/Nodes/Node_Function.class.php:32
-#: libraries/rte/rte_routines.lib.php:1495
-#: templates/table/table_header.phtml:4
+#: libraries/rte/rte_routines.lib.php:1586
+#: templates/table/search/table_header.phtml:4
 msgid "Function"
 msgstr "関数"
 
@@ -9942,86 +9958,87 @@ msgstr "バイナリ"
 msgid "Because of its length,<br /> this column might not be editable."
 msgstr "長さによってはこのカラムを<br />編集できなくなる場合もあります。"
 
-#: libraries/insert_edit.lib.php:1050
+#: libraries/insert_edit.lib.php:1048
 msgid "Binary - do not edit"
 msgstr "バイナリ - 編集不可"
 
-#: libraries/insert_edit.lib.php:1176 libraries/server_privileges.lib.php:470
-#: templates/table/options.phtml:36
+#: libraries/insert_edit.lib.php:1174 libraries/server_privileges.lib.php:470
+#: templates/table/search/options.phtml:36
 msgid "Or"
 msgstr "または"
 
-#: libraries/insert_edit.lib.php:1177
+#: libraries/insert_edit.lib.php:1175
 #, fuzzy
 #| msgid "web server upload directory"
 msgid "web server upload directory:"
 msgstr "ウェブサーバ上のアップロードディレクトリ"
 
-#: libraries/insert_edit.lib.php:1348 templates/table/input_box.phtml:49
+#: libraries/insert_edit.lib.php:1346
+#: templates/table/search/input_box.phtml:49
 msgid "Edit/Insert"
 msgstr "編集／挿入"
 
-#: libraries/insert_edit.lib.php:1398
+#: libraries/insert_edit.lib.php:1396
 #, php-format
 msgid "Continue insertion with %s rows"
 msgstr "%s 行づつ挿入を行う"
 
-#: libraries/insert_edit.lib.php:1428
+#: libraries/insert_edit.lib.php:1426
 msgid "and then"
 msgstr "続いて"
 
-#: libraries/insert_edit.lib.php:1461
+#: libraries/insert_edit.lib.php:1459
 msgid "Insert as new row"
 msgstr "新しい行として挿入する"
 
-#: libraries/insert_edit.lib.php:1464
+#: libraries/insert_edit.lib.php:1462
 msgid "Insert as new row and ignore errors"
 msgstr "新しい行として挿入し、エラーは無視する"
 
-#: libraries/insert_edit.lib.php:1467
+#: libraries/insert_edit.lib.php:1465
 msgid "Show insert query"
 msgstr "挿入クエリ文を表示する"
 
-#: libraries/insert_edit.lib.php:1487
+#: libraries/insert_edit.lib.php:1485
 msgid "Go back to previous page"
 msgstr "前のページに戻る"
 
-#: libraries/insert_edit.lib.php:1490
+#: libraries/insert_edit.lib.php:1488
 msgid "Insert another new row"
 msgstr "新しいレコードを追加する"
 
-#: libraries/insert_edit.lib.php:1495
+#: libraries/insert_edit.lib.php:1493
 msgid "Go back to this page"
 msgstr "このページに戻る"
 
-#: libraries/insert_edit.lib.php:1518
+#: libraries/insert_edit.lib.php:1516
 msgid "Edit next row"
 msgstr "次の行を編集する"
 
-#: libraries/insert_edit.lib.php:1540
+#: libraries/insert_edit.lib.php:1538
 msgid ""
 "Use TAB key to move from value to value, or CTRL+arrows to move anywhere"
 msgstr ""
 "次の値に移動するときは TAB キーを使ってください。CTRL＋カーソルキーを使うと自"
 "由に移動できます"
 
-#: libraries/insert_edit.lib.php:1577 libraries/replication_gui.lib.php:542
-#: libraries/rte/rte_routines.lib.php:1497
+#: libraries/insert_edit.lib.php:1575 libraries/replication_gui.lib.php:542
+#: libraries/rte/rte_routines.lib.php:1588
 #: libraries/server_status_variables.lib.php:220
-#: templates/designer/having_query_panel.phtml:100
-#: templates/designer/options_panel.phtml:73
-#: templates/designer/options_panel.phtml:239
-#: templates/designer/where_query_panel.phtml:69
-#: templates/table/table_header.phtml:10
-#: templates/table/zoom_result_form.phtml:35
+#: templates/database/designer/having_query_panel.phtml:100
+#: templates/database/designer/options_panel.phtml:73
+#: templates/database/designer/options_panel.phtml:239
+#: templates/database/designer/where_query_panel.phtml:69
+#: templates/table/search/table_header.phtml:10
+#: templates/table/search/zoom_result_form.phtml:35
 msgid "Value"
 msgstr "値"
 
-#: libraries/insert_edit.lib.php:1937 libraries/sql.lib.php:1309
+#: libraries/insert_edit.lib.php:1935 libraries/sql.lib.php:1303
 msgid "Showing SQL query"
 msgstr "SQL クエリを表示"
 
-#: libraries/insert_edit.lib.php:1962 libraries/sql.lib.php:1287
+#: libraries/insert_edit.lib.php:1960 libraries/sql.lib.php:1281
 #, php-format
 msgid "Inserted row id: %1$d"
 msgstr "id %1$d の行を挿入しました"
@@ -10479,7 +10496,7 @@ msgstr "新規作成"
 #: libraries/navigation/Nodes/Node_View_Container.class.php:26
 #: libraries/navigation/Nodes/Node_View_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:129
-#: templates/structure/show_create.phtml:30
+#: templates/database/structure/show_create.phtml:30
 msgid "Views"
 msgstr "ビュー"
 
@@ -10794,7 +10811,7 @@ msgstr "特権不足でアクセスできません!"
 
 #: libraries/operations.lib.php:101 libraries/operations.lib.php:249
 #: libraries/operations.lib.php:869 libraries/operations.lib.php:963
-#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:907
+#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:998
 #: templates/columns_definitions/table_fields_definitions.phtml:47
 #, fuzzy
 #| msgid "Edit Privileges"
@@ -10888,22 +10905,22 @@ msgid "Switch to copied table"
 msgstr "コピーしたテーブルに切り替える"
 
 #: libraries/operations.lib.php:1360
-#: templates/structure/check_all_tables.phtml:18
+#: templates/database/structure/check_all_tables.phtml:18
 msgid "Table maintenance"
 msgstr "テーブルメンテナンス"
 
 #: libraries/operations.lib.php:1398
-#: templates/structure/check_all_tables.phtml:19
+#: templates/database/structure/check_all_tables.phtml:19
 msgid "Analyze table"
 msgstr "テーブルを分析する"
 
 #: libraries/operations.lib.php:1413
-#: templates/structure/check_all_tables.phtml:20
+#: templates/database/structure/check_all_tables.phtml:20
 msgid "Check table"
 msgstr "テーブルをチェックする"
 
 #: libraries/operations.lib.php:1428
-#: templates/structure/check_all_tables.phtml:22
+#: templates/database/structure/check_all_tables.phtml:22
 #, fuzzy
 #| msgid "Check table"
 msgid "Checksum table"
@@ -10923,18 +10940,19 @@ msgid "Flush the table (FLUSH)"
 msgstr "テーブルをフラッシュする (FLUSH)"
 
 #: libraries/operations.lib.php:1477
-#: templates/structure/check_all_tables.phtml:23
-#: templates/structure/display_table_stats.phtml:56
+#: templates/database/structure/check_all_tables.phtml:23
+#: templates/table/structure/display_table_stats.phtml:56
 msgid "Optimize table"
 msgstr "テーブルを最適化する"
 
 #: libraries/operations.lib.php:1492
-#: templates/structure/check_all_tables.phtml:24
+#: templates/database/structure/check_all_tables.phtml:24
 msgid "Repair table"
 msgstr "テーブルを修復する"
 
 #: libraries/operations.lib.php:1538
-#: templates/structure/check_all_tables.phtml:14 view_operations.php:127
+#: templates/database/structure/check_all_tables.phtml:14
+#: view_operations.php:127
 msgid "Delete data or table"
 msgstr "データまたはテーブルの削除"
 
@@ -11060,7 +11078,7 @@ msgid "Cannot connect: invalid settings."
 msgstr "接続できません。設定が無効です。"
 
 #: libraries/plugins/auth/AuthenticationConfig.class.php:108
-#: libraries/plugins/auth/AuthenticationCookie.class.php:134
+#: libraries/plugins/auth/AuthenticationCookie.class.php:122
 #: libraries/plugins/auth/AuthenticationHttp.class.php:96
 #, php-format
 msgid "Welcome to %s"
@@ -11090,39 +11108,39 @@ msgstr ""
 msgid "Retry to connect"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:146
+#: libraries/plugins/auth/AuthenticationCookie.class.php:134
 msgid "Your session has expired. Please log in again."
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:170
+#: libraries/plugins/auth/AuthenticationCookie.class.php:158
 msgid "Log in"
 msgstr "ログイン"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:178
-#: libraries/plugins/auth/AuthenticationCookie.class.php:188
+#: libraries/plugins/auth/AuthenticationCookie.class.php:166
+#: libraries/plugins/auth/AuthenticationCookie.class.php:176
 msgid "You can enter hostname/IP address and port separated by space."
 msgstr ""
 "「ホスト名／IP アドレス」と「ポート」を空白で区切って入力することができます。"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:193
+#: libraries/plugins/auth/AuthenticationCookie.class.php:181
 msgid "Username:"
 msgstr "ユーザ名:"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:205
+#: libraries/plugins/auth/AuthenticationCookie.class.php:193
 #, fuzzy
 #| msgid "Server Choice"
 msgid "Server Choice:"
 msgstr "サーバの選択"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:386
+#: libraries/plugins/auth/AuthenticationCookie.class.php:374
 msgid "Entered captcha is wrong, try again!"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:396
+#: libraries/plugins/auth/AuthenticationCookie.class.php:384
 msgid "Please enter correct captcha!"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:423
+#: libraries/plugins/auth/AuthenticationCookie.class.php:411
 #, fuzzy
 #| msgid "Cannot log in to the MySQL server"
 msgid "You are not allowed to log in to this MySQL server!"
@@ -11221,7 +11239,7 @@ msgstr "イベント"
 #: libraries/plugins/export/ExportOdt.class.php:593
 #: libraries/plugins/export/ExportTexytext.class.php:428
 #: libraries/plugins/export/PMA_ExportPdf.class.php:313
-#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:984
 #: libraries/rte/rte_triggers.lib.php:377
 msgid "Definition"
 msgstr "定義"
@@ -11570,7 +11588,7 @@ msgid "Last check:"
 msgstr "最終検査："
 
 #: libraries/plugins/export/ExportSql.class.php:1399
-#: templates/structure/structure_table_row.phtml:183
+#: templates/database/structure/structure_table_row.phtml:183
 msgid "in use"
 msgstr "使用中"
 
@@ -11783,20 +11801,14 @@ msgstr "MySQL の空間拡張が ESRI タイプをサポートしていません
 msgid "The imported file does not contain any data!"
 msgstr "インポートされたファイルには、データが含まれていません。"
 
-#: libraries/plugins/import/ImportSql.class.php:169
+#: libraries/plugins/import/ImportSql.class.php:72
 msgid "SQL compatibility mode:"
 msgstr "SQL 互換モード:"
 
-#: libraries/plugins/import/ImportSql.class.php:181
+#: libraries/plugins/import/ImportSql.class.php:84
 msgid "Do not use <code>AUTO_INCREMENT</code> for zero values"
 msgstr "値がゼロのものに対して <code>AUTO_INCREMENT</code> を使用しない"
 
-#: libraries/plugins/import/ImportSql.class.php:195
-#, fuzzy
-#| msgid "Read misses"
-msgid "Read as multibytes"
-msgstr "読み込みミス"
-
 #: libraries/plugins/import/ImportXml.class.php:54
 msgid "XML"
 msgstr "XML"
@@ -11839,7 +11851,7 @@ msgid "Show grid"
 msgstr "グリッドを表示"
 
 #: libraries/plugins/schema/SchemaPdf.class.php:94
-#: templates/structure/print_view_data_dictionary_link.phtml:6
+#: templates/database/structure/print_view_data_dictionary_link.phtml:6
 msgid "Data Dictionary"
 msgstr "データ辞書"
 
@@ -11870,7 +11882,7 @@ msgid "The %s table doesn't exist!"
 msgstr "%s テーブルは存在しません!"
 
 #: libraries/plugins/schema/eps/Eps_Relation_Schema.class.php:321
-#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:309
+#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:323
 #, php-format
 msgid "Schema of the %s database - Page %s"
 msgstr "データベース %s のスキーマ - ページ %s"
@@ -11899,7 +11911,7 @@ msgstr "テーブルの内容"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1005
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1028
 #: libraries/tracking.lib.php:884
-#: templates/structure/table_structure_header.phtml:11
+#: templates/table/structure/table_structure_header.phtml:11
 msgid "Extra"
 msgstr "その他"
 
@@ -12304,11 +12316,11 @@ msgstr "高度な機能の設定する簡単な方法:"
 msgid "Create the needed tables with the <code>%screate_tables.sql</code>."
 msgstr "<code>examples/create_tables.sql</code> で必要なテーブルを作成します。"
 
-#: libraries/relation.lib.php:360
+#: libraries/relation.lib.php:357
 msgid "Create a pma user and give access to these tables."
 msgstr "作ったテーブルにアクセスできる pma ユーザを作成します。"
 
-#: libraries/relation.lib.php:365
+#: libraries/relation.lib.php:360
 msgid ""
 "Enable advanced features in configuration file (<code>config.inc.php</"
 "code>), for example by starting from <code>config.sample.inc.php</code>."
@@ -12316,22 +12328,22 @@ msgstr ""
 "設定ファイル (<code>config.inc.php</code>) で高度な機能を有効にします。"
 "<code>config.sample.inc.php</code> にある設定例をコピーするといいでしょう。"
 
-#: libraries/relation.lib.php:373
+#: libraries/relation.lib.php:365
 msgid "Re-login to phpMyAdmin to load the updated configuration file."
 msgstr "更新した設定ファイルを読み込むために phpMyAdmin にログインし直します。"
 
-#: libraries/relation.lib.php:1612
+#: libraries/relation.lib.php:1607
 msgid "no description"
 msgstr "説明がありません"
 
-#: libraries/relation.lib.php:1811
+#: libraries/relation.lib.php:1806
 msgid ""
 "You do not have necessary privileges to create a database named "
 "'phpmyadmin'. You may go to 'Operations' tab of any database to set up the "
 "phpMyAdmin configuration storage there."
 msgstr ""
 
-#: libraries/relation.lib.php:1928
+#: libraries/relation.lib.php:1923
 #, fuzzy, php-format
 #| msgid "Missing phpMyAdmin configuration storage tables"
 msgid ""
@@ -12339,21 +12351,21 @@ msgid ""
 "configuration storage there."
 msgstr "phpMyAdmin 環境保管領域用のテーブルが不明"
 
-#: libraries/relation.lib.php:1936
+#: libraries/relation.lib.php:1931
 #, fuzzy, php-format
 #| msgid "Missing phpMyAdmin configuration storage tables"
 msgid ""
 "%sCreate%s the phpMyAdmin configuration storage in the current database."
 msgstr "phpMyAdmin 環境保管領域用のテーブルが不明"
 
-#: libraries/relation.lib.php:1944
+#: libraries/relation.lib.php:1939
 #, fuzzy, php-format
 #| msgid "Missing phpMyAdmin configuration storage tables"
 msgid "%sCreate%s missing phpMyAdmin configuration storage tables."
 msgstr "phpMyAdmin 環境保管領域用のテーブルが不明"
 
 #: libraries/replication_gui.lib.php:46 libraries/replication_gui.lib.php:343
-#: libraries/server_databases.lib.php:387
+#: libraries/server_databases.lib.php:398
 msgid "Master replication"
 msgstr "マスタレプリケーション"
 
@@ -12426,7 +12438,7 @@ msgstr ""
 "ます。"
 
 #: libraries/replication_gui.lib.php:141
-#: libraries/server_databases.lib.php:389
+#: libraries/server_databases.lib.php:400
 msgid "Slave replication"
 msgstr "スレーブレプリケーション"
 
@@ -12729,10 +12741,10 @@ msgid "Master server changed successfully to %s."
 msgstr "マスタサーバを %s へ切り替えるのに成功しました。"
 
 #: libraries/rte/rte_events.lib.php:106 libraries/rte/rte_events.lib.php:115
-#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:149
-#: libraries/rte/rte_routines.lib.php:158
-#: libraries/rte/rte_routines.lib.php:231
-#: libraries/rte/rte_routines.lib.php:1362
+#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:219
+#: libraries/rte/rte_routines.lib.php:246
+#: libraries/rte/rte_routines.lib.php:368
+#: libraries/rte/rte_routines.lib.php:1453
 #: libraries/rte/rte_triggers.lib.php:82 libraries/rte/rte_triggers.lib.php:91
 #: libraries/rte/rte_triggers.lib.php:123
 #, php-format
@@ -12753,7 +12765,7 @@ msgstr "イベント %1$s を変更しました。"
 msgid "Event %1$s has been created."
 msgstr "イベント %1$s を作成しました。"
 
-#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:251
+#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:266
 #: libraries/rte/rte_triggers.lib.php:144
 #, fuzzy
 #| msgid ""
@@ -12765,7 +12777,7 @@ msgstr "<b>リクエストの処理中に 1 つ以上のエラーが発生しま
 msgid "Edit event"
 msgstr "イベントを編集する"
 
-#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:794
+#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:885
 #: libraries/rte/rte_triggers.lib.php:323 view_create.php:180
 msgid "Details"
 msgstr "詳細"
@@ -12778,7 +12790,7 @@ msgstr "イベント名"
 msgid "Event type"
 msgstr "イベント種別"
 
-#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:817
+#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:908
 #, php-format
 msgid "Change to %s"
 msgstr "%s に変更する"
@@ -12805,12 +12817,14 @@ msgstr "終了"
 msgid "On completion preserve"
 msgstr "完了後もイベントを残す"
 
-#: libraries/rte/rte_events.lib.php:491 libraries/rte/rte_routines.lib.php:930
+#: libraries/rte/rte_events.lib.php:491
+#: libraries/rte/rte_routines.lib.php:1021
 #: libraries/rte/rte_triggers.lib.php:383 view_create.php:209
 msgid "Definer"
 msgstr "定義者"
 
-#: libraries/rte/rte_events.lib.php:535 libraries/rte/rte_routines.lib.php:997
+#: libraries/rte/rte_events.lib.php:535
+#: libraries/rte/rte_routines.lib.php:1088
 #: libraries/rte/rte_triggers.lib.php:422
 #, fuzzy
 #| msgid "The definer must be in the \"username@hostname\" format"
@@ -12840,9 +12854,9 @@ msgid "You must provide an event definition."
 msgstr "イベントの定義は必須です。"
 
 #: libraries/rte/rte_export.lib.php:43 libraries/rte/rte_general.lib.php:72
-#: libraries/rte/rte_routines.lib.php:345
-#: libraries/rte/rte_routines.lib.php:1198
-#: libraries/rte/rte_routines.lib.php:1411
+#: libraries/rte/rte_routines.lib.php:153
+#: libraries/rte/rte_routines.lib.php:1289
+#: libraries/rte/rte_routines.lib.php:1502
 #, fuzzy
 #| msgid "Error in processing request"
 msgid "Error in processing request:"
@@ -12880,99 +12894,99 @@ msgstr ""
 "敗する可能性があります！[/strong] 問題を回避するためには、改良された"
 "「mysqli」拡張を使用するようにしてください。"
 
-#: libraries/rte/rte_routines.lib.php:110
-#: libraries/rte/rte_routines.lib.php:1006
+#: libraries/rte/rte_routines.lib.php:123
+msgid "Edit routine"
+msgstr "ルーチンを編集する"
+
+#: libraries/rte/rte_routines.lib.php:200
+#: libraries/rte/rte_routines.lib.php:1097
 #, php-format
 msgid "Invalid routine type: \"%s\""
 msgstr "ルーチンタイプが不正です: \"%s\""
 
-#: libraries/rte/rte_routines.lib.php:170
+#: libraries/rte/rte_routines.lib.php:253
+#, php-format
+msgid "Routine %1$s has been created."
+msgstr "ルーチン %1$s を作成しました。"
+
+#: libraries/rte/rte_routines.lib.php:380
 msgid "Sorry, we failed to restore the dropped routine."
 msgstr "申し訳ありませんが、削除されたルーチンの復元に失敗しました。"
 
-#: libraries/rte/rte_routines.lib.php:211
+#: libraries/rte/rte_routines.lib.php:439
 #, fuzzy, php-format
 #| msgid "Routine %1$s has been modified."
 msgid "Routine %1$s has been modified. Privileges have been adjusted."
 msgstr "ルーチン %1$s を変更しました。"
 
-#: libraries/rte/rte_routines.lib.php:216
+#: libraries/rte/rte_routines.lib.php:444
 #, php-format
 msgid "Routine %1$s has been modified."
 msgstr "ルーチン %1$s を変更しました。"
 
-#: libraries/rte/rte_routines.lib.php:238
-#, php-format
-msgid "Routine %1$s has been created."
-msgstr "ルーチン %1$s を作成しました。"
-
-#: libraries/rte/rte_routines.lib.php:315
-msgid "Edit routine"
-msgstr "ルーチンを編集する"
-
-#: libraries/rte/rte_routines.lib.php:797
+#: libraries/rte/rte_routines.lib.php:888
 msgid "Routine name"
 msgstr "ルーチン名"
 
-#: libraries/rte/rte_routines.lib.php:823
+#: libraries/rte/rte_routines.lib.php:914
 msgid "Parameters"
 msgstr "パラメータ"
 
-#: libraries/rte/rte_routines.lib.php:829
+#: libraries/rte/rte_routines.lib.php:920
 msgid "Direction"
 msgstr "入出力"
 
-#: libraries/rte/rte_routines.lib.php:847
+#: libraries/rte/rte_routines.lib.php:938
 msgid "Add parameter"
 msgstr "パラメータを追加する"
 
-#: libraries/rte/rte_routines.lib.php:851
+#: libraries/rte/rte_routines.lib.php:942
 msgid "Remove last parameter"
 msgstr "最後のパラメータを削除する"
 
-#: libraries/rte/rte_routines.lib.php:856
+#: libraries/rte/rte_routines.lib.php:947
 msgid "Return type"
 msgstr "返り値の種類"
 
-#: libraries/rte/rte_routines.lib.php:862
+#: libraries/rte/rte_routines.lib.php:953
 msgid "Return length/values"
 msgstr "返り値の長さ/値"
 
-#: libraries/rte/rte_routines.lib.php:868
+#: libraries/rte/rte_routines.lib.php:959
 msgid "Return options"
 msgstr "返り値のオプション"
 
-#: libraries/rte/rte_routines.lib.php:899
+#: libraries/rte/rte_routines.lib.php:990
 msgid "Is deterministic"
 msgstr "DETERMINISTIC"
 
-#: libraries/rte/rte_routines.lib.php:920
+#: libraries/rte/rte_routines.lib.php:1011
 msgid ""
 "You do not have sufficient privileges to perform this operation; Please "
 "refer to the documentation for more details"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:935
+#: libraries/rte/rte_routines.lib.php:1026
 msgid "Security type"
 msgstr "SQL SECURITY"
 
-#: libraries/rte/rte_routines.lib.php:944
+#: libraries/rte/rte_routines.lib.php:1035
 msgid "SQL data access"
 msgstr "データ干渉方式"
 
-#: libraries/rte/rte_routines.lib.php:1013
+#: libraries/rte/rte_routines.lib.php:1104
 #, fuzzy
 #| msgid "You must provide a routine name"
 msgid "You must provide a routine name!"
 msgstr "ルーチン名は必須です"
 
-#: libraries/rte/rte_routines.lib.php:1047
+#: libraries/rte/rte_routines.lib.php:1138
 #, php-format
 msgid "Invalid direction \"%s\" given for parameter."
 msgstr "パラメータに対して不正な入出力「%s」が与えられています。"
 
-#: libraries/rte/rte_routines.lib.php:1069
-#: libraries/rte/rte_routines.lib.php:1131
+#: libraries/rte/rte_routines.lib.php:1160
+#: libraries/rte/rte_routines.lib.php:1222
 msgid ""
 "You must provide length/values for routine parameters of type ENUM, SET, "
 "VARCHAR and VARBINARY."
@@ -12980,24 +12994,24 @@ msgstr ""
 "ルーチンパラメータが ENUM、SET、VARCHAR、VARBINARY の場合、長さ/値は必須で"
 "す。"
 
-#: libraries/rte/rte_routines.lib.php:1095
+#: libraries/rte/rte_routines.lib.php:1186
 msgid "You must provide a name and a type for each routine parameter."
 msgstr "ルーチンの各パラメータに対して、名前とデータ型は必須です。"
 
-#: libraries/rte/rte_routines.lib.php:1114
+#: libraries/rte/rte_routines.lib.php:1205
 msgid "You must provide a valid return type for the routine."
 msgstr "ルーチンに対して、有効な返り値の種類を指定してください。"
 
-#: libraries/rte/rte_routines.lib.php:1174
+#: libraries/rte/rte_routines.lib.php:1265
 msgid "You must provide a routine definition."
 msgstr "ルーチンの定義は必須です。"
 
-#: libraries/rte/rte_routines.lib.php:1285
+#: libraries/rte/rte_routines.lib.php:1376
 #, php-format
 msgid "Execution results of routine %s"
 msgstr "ルーチン %s の実行結果"
 
-#: libraries/rte/rte_routines.lib.php:1340
+#: libraries/rte/rte_routines.lib.php:1431
 #, fuzzy, php-format
 #| msgid "%d row affected by the last statement inside the procedure"
 #| msgid_plural "%d rows affected by the last statement inside the procedure"
@@ -13005,13 +13019,13 @@ msgid "%d row affected by the last statement inside the procedure."
 msgid_plural "%d rows affected by the last statement inside the procedure."
 msgstr[0] "プロシージャ内の最後のステートメントは %d 行の変更を行いました"
 
-#: libraries/rte/rte_routines.lib.php:1398
-#: libraries/rte/rte_routines.lib.php:1406
+#: libraries/rte/rte_routines.lib.php:1489
+#: libraries/rte/rte_routines.lib.php:1497
 msgid "Execute routine"
 msgstr "ルーチンを実行する"
 
-#: libraries/rte/rte_routines.lib.php:1485
-#: libraries/rte/rte_routines.lib.php:1488
+#: libraries/rte/rte_routines.lib.php:1576
+#: libraries/rte/rte_routines.lib.php:1579
 msgid "Routine parameters"
 msgstr "ルーチンのパラメータ"
 
@@ -13175,7 +13189,7 @@ msgid "Original position"
 msgstr "元の位置"
 
 #: libraries/server_bin_log.lib.php:133
-#: templates/structure/display_table_stats.phtml:4
+#: templates/table/structure/display_table_stats.phtml:4
 msgid "Information"
 msgstr "情報"
 
@@ -13213,12 +13227,12 @@ msgstr ""
 "注意: データベースの統計を有効にするとウェブサーバと MySQL サーバの間の通信量"
 "が激増することがあります。"
 
-#: libraries/server_databases.lib.php:364
-#: libraries/server_databases.lib.php:365
+#: libraries/server_databases.lib.php:366
+#: libraries/server_databases.lib.php:371
 msgid "Enable Statistics"
 msgstr "統計を有効にする"
 
-#: libraries/server_databases.lib.php:481
+#: libraries/server_databases.lib.php:492
 #, php-format
 msgid "%1$d database has been dropped successfully."
 msgid_plural "%1$d databases have been dropped successfully."
@@ -13595,7 +13609,7 @@ msgid "You have revoked the privileges for %s."
 msgstr "%s の特権を取り消しました。"
 
 #: libraries/server_privileges.lib.php:2059
-#: libraries/server_privileges.lib.php:4290
+#: libraries/server_privileges.lib.php:4316
 #, fuzzy
 #| msgid "Add user"
 msgid "Add user account"
@@ -13779,61 +13793,61 @@ msgstr "%s を削除中です"
 msgid "The privileges were reloaded successfully."
 msgstr "特権を正常に再読み込みしました。"
 
-#: libraries/server_privileges.lib.php:3994
+#: libraries/server_privileges.lib.php:4003
 #, php-format
 msgid "The user %s already exists!"
 msgstr "ユーザ %s は既に存在します!"
 
-#: libraries/server_privileges.lib.php:4232
+#: libraries/server_privileges.lib.php:4258
 #, php-format
 msgid "Privileges for %s"
 msgstr "%s に対する特権"
 
-#: libraries/server_privileges.lib.php:4241
+#: libraries/server_privileges.lib.php:4267
 #: libraries/server_status_processes.lib.php:72
 #: libraries/server_user_groups.lib.php:39
 msgid "User"
 msgstr "ユーザ"
 
-#: libraries/server_privileges.lib.php:4282
+#: libraries/server_privileges.lib.php:4308
 #, fuzzy
 #| msgid "New"
 msgctxt "Create new user"
 msgid "New"
 msgstr "新規作成"
 
-#: libraries/server_privileges.lib.php:4311
+#: libraries/server_privileges.lib.php:4337
 #, fuzzy
 #| msgid "Edit Privileges"
 msgid "Edit privileges:"
 msgstr "特権を編集"
 
-#: libraries/server_privileges.lib.php:4312
+#: libraries/server_privileges.lib.php:4338
 #, fuzzy
 #| msgid "Users"
 msgid "User account"
 msgstr "ユーザグループ"
 
-#: libraries/server_privileges.lib.php:4371
+#: libraries/server_privileges.lib.php:4397
 msgid ""
 "Note: You are attempting to edit privileges of the user with which you are "
 "currently logged in."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4391 libraries/server_users.lib.php:25
+#: libraries/server_privileges.lib.php:4417 libraries/server_users.lib.php:25
 #, fuzzy
 #| msgid "Users overview"
 msgid "User accounts overview"
 msgstr "ユーザ概略"
 
-#: libraries/server_privileges.lib.php:4459
+#: libraries/server_privileges.lib.php:4485
 msgid ""
 "A user account allowing any user from localhost to connect is present. This "
 "will prevent other users from connecting if the host part of their account "
 "allows a connection from any (%) host."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4500
+#: libraries/server_privileges.lib.php:4526
 #, php-format
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
@@ -13846,7 +13860,7 @@ msgstr ""
 "特権の内容が一致しなくなることがありますので、作業を続ける前に %s特権の再読み"
 "込み%s をしてください。"
 
-#: libraries/server_privileges.lib.php:4519
+#: libraries/server_privileges.lib.php:4545
 #, fuzzy
 #| msgid ""
 #| "Note: phpMyAdmin gets the users' privileges directly from MySQL's "
@@ -13865,25 +13879,25 @@ msgstr ""
 "特権の内容が一致しなくなることがありますので、作業を続ける前に %s特権の再読み"
 "込み%s をしてください。"
 
-#: libraries/server_privileges.lib.php:4569
+#: libraries/server_privileges.lib.php:4595
 msgid "The selected user was not found in the privilege table."
 msgstr "特権テーブルには選択したユーザがいません。"
 
-#: libraries/server_privileges.lib.php:4801
+#: libraries/server_privileges.lib.php:4827
 msgid "You have added a new user."
 msgstr "新しいユーザを追加しました。"
 
-#: libraries/server_status.lib.php:53
+#: libraries/server_status.lib.php:60
 #, php-format
 msgid "Network traffic since startup: %s"
 msgstr "起動以後のネットワークトラフィック：%s"
 
-#: libraries/server_status.lib.php:66
+#: libraries/server_status.lib.php:73
 #, php-format
 msgid "This MySQL server has been running for %1$s. It started up on %2$s."
 msgstr "この MySQL サーバの稼働時間: %1$s (起動時刻: %2$s)。"
 
-#: libraries/server_status.lib.php:80
+#: libraries/server_status.lib.php:94
 msgid ""
 "This MySQL server works as <b>master</b> and <b>slave</b> in <b>replication</"
 "b> process."
@@ -13891,23 +13905,23 @@ msgstr ""
 "この MySQL サーバは、<b>レプリケーション</b>プロセスの<b>マスタ</b>と<b>ス"
 "レーブ</b>として動作しています。"
 
-#: libraries/server_status.lib.php:85
+#: libraries/server_status.lib.php:99
 msgid "This MySQL server works as <b>master</b> in <b>replication</b> process."
 msgstr ""
 "この MySQL サーバは、<b>レプリケーション</b>プロセスの<b>マスタ</b>として動作"
 "しています。"
 
-#: libraries/server_status.lib.php:90
+#: libraries/server_status.lib.php:104
 msgid "This MySQL server works as <b>slave</b> in <b>replication</b> process."
 msgstr ""
 "この MySQL サーバは、<b>レプリケーション</b>プロセスの<b>スレーブ</b>として動"
 "作しています。"
 
-#: libraries/server_status.lib.php:106
+#: libraries/server_status.lib.php:116
 msgid "Replication status"
 msgstr "レプリケーションステータス"
 
-#: libraries/server_status.lib.php:137
+#: libraries/server_status.lib.php:146
 msgid ""
 "On a busy server, the byte counters may overrun, so those statistics as "
 "reported by the MySQL server may be incorrect."
@@ -13915,21 +13929,21 @@ msgstr ""
 "処理が集中するサーバではバイトカウンタが超過することがあるため、MySQL サーバ"
 "が報告してくる統計は不正確なことがあります。"
 
-#: libraries/server_status.lib.php:148
+#: libraries/server_status.lib.php:157
 msgid "Received"
 msgstr "受信済"
 
-#: libraries/server_status.lib.php:167
+#: libraries/server_status.lib.php:176
 msgid "Sent"
 msgstr "送信済"
 
-#: libraries/server_status.lib.php:234
+#: libraries/server_status.lib.php:243
 #, fuzzy
 #| msgid "max. concurrent connections"
 msgid "Max. concurrent connections"
 msgstr "最大同時接続数"
 
-#: libraries/server_status.lib.php:244
+#: libraries/server_status.lib.php:253
 msgid "Failed attempts"
 msgstr "失敗回数"
 
@@ -15011,7 +15025,7 @@ msgstr ""
 msgid "Not implemented yet."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/AlterOperation.php:193
+#: libraries/sql-parser/src/Components/AlterOperation.php:191
 #, fuzzy
 #| msgid "Iconic table operations"
 msgid "Unrecognized alter operation."
@@ -15027,7 +15041,7 @@ msgid "An opening bracket followed by a set of values was expected."
 msgstr ""
 
 #: libraries/sql-parser/src/Components/ArrayObj.php:101
-#: libraries/sql-parser/src/Components/FieldDefinition.php:202
+#: libraries/sql-parser/src/Components/CreateDefinition.php:202
 msgid "An opening bracket was expected."
 msgstr ""
 
@@ -15035,25 +15049,35 @@ msgstr ""
 msgid "A comma or a closing bracket was expected"
 msgstr ""
 
+#: libraries/sql-parser/src/Components/CreateDefinition.php:246
+#, fuzzy
+#| msgid "No tables selected."
+msgid "A comma or a closing bracket was expected."
+msgstr "テーブルが選択されていません。"
+
+#: libraries/sql-parser/src/Components/CreateDefinition.php:262
+msgid "A closing bracket was expected."
+msgstr ""
+
 #: libraries/sql-parser/src/Components/DataType.php:125
 msgid "Unrecognized data type."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:225
+#: libraries/sql-parser/src/Components/Expression.php:227
 msgid "Unexpected closing bracket."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:246
-#: libraries/sql-parser/src/Components/Expression.php:283
-#: libraries/sql-parser/src/Components/Expression.php:303
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:285
+#: libraries/sql-parser/src/Components/Expression.php:305
 msgid "An alias was previously found."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:257
+#: libraries/sql-parser/src/Components/Expression.php:259
 msgid "Unexpected dot."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:327
+#: libraries/sql-parser/src/Components/Expression.php:329
 #, fuzzy
 #| msgid "No tables selected."
 msgid "An alias was expected."
@@ -15065,16 +15089,6 @@ msgstr "テーブルが選択されていません。"
 msgid "An expression was expected."
 msgstr "行が選択されていません"
 
-#: libraries/sql-parser/src/Components/FieldDefinition.php:246
-#, fuzzy
-#| msgid "No tables selected."
-msgid "A comma or a closing bracket was expected."
-msgstr "テーブルが選択されていません。"
-
-#: libraries/sql-parser/src/Components/FieldDefinition.php:262
-msgid "A closing bracket was expected."
-msgstr ""
-
 #: libraries/sql-parser/src/Components/Limit.php:90
 #: libraries/sql-parser/src/Components/Limit.php:112
 msgid "An offset was expected."
@@ -15122,29 +15136,29 @@ msgstr ""
 msgid "Expected delimiter."
 msgstr ""
 
-#: libraries/sql-parser/src/Lexer.php:753
+#: libraries/sql-parser/src/Lexer.php:777
 #, fuzzy, php-format
 #| msgid "Event %1$s has been created."
 msgid "Ending quote %1$s was expected."
 msgstr "イベント %1$s を作成しました。"
 
-#: libraries/sql-parser/src/Lexer.php:789
+#: libraries/sql-parser/src/Lexer.php:813
 #, fuzzy
 #| msgid "Table name template"
 msgid "Variable name was expected."
 msgstr "テーブル名のテンプレート"
 
-#: libraries/sql-parser/src/Parser.php:380
+#: libraries/sql-parser/src/Parser.php:391
 #, fuzzy
 #| msgid "At Beginning of Table"
 msgid "Unexpected beginning of statement."
 msgstr "テーブルの先頭"
 
-#: libraries/sql-parser/src/Parser.php:399
+#: libraries/sql-parser/src/Parser.php:410
 msgid "Unrecognized statement type."
 msgstr ""
 
-#: libraries/sql-parser/src/Parser.php:479
+#: libraries/sql-parser/src/Parser.php:489
 msgid "No transaction was previously started."
 msgstr ""
 
@@ -15174,8 +15188,10 @@ msgid "The name of the entity was expected."
 msgstr "開いているテーブルの数。"
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:310
-msgid "At least one field definition was expected."
-msgstr ""
+#, fuzzy
+#| msgid "The row has been deleted."
+msgid "At least one column definition was expected."
+msgstr "行を削除しました"
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:329
 msgid "A \"RETURNS\" keyword was expected."
@@ -15253,11 +15269,11 @@ msgstr "ブックマーク %s を作成しました"
 msgid "Using bookmark \"%s\" as default browse query."
 msgstr "デフォルトの表示クエリとしてブックマーク \"%s\" を使用する。"
 
-#: libraries/sql.lib.php:1306
+#: libraries/sql.lib.php:1300
 msgid "Showing as PHP code"
 msgstr "PHP コードとして表示"
 
-#: libraries/sql.lib.php:1638
+#: libraries/sql.lib.php:1632
 #, fuzzy, php-format
 #| msgid ""
 #| "This table does not contain a unique column. Features related to the grid "
@@ -15270,7 +15286,7 @@ msgstr ""
 "ボックス、編集、コピー、削除のリンクに関連する機能は、保存後に動作しない場合"
 "があります。"
 
-#: libraries/sql.lib.php:1649
+#: libraries/sql.lib.php:1643
 #, fuzzy, php-format
 #| msgid ""
 #| "This table does not contain a unique column. Features related to the grid "
@@ -15283,7 +15299,7 @@ msgstr ""
 "ボックス、編集、コピー、削除のリンクに関連する機能は、保存後に動作しない場合"
 "があります。"
 
-#: libraries/sql.lib.php:1688
+#: libraries/sql.lib.php:1682
 #, php-format
 msgid "Problems with indexes of table `%s`"
 msgstr "テーブル `%s` のインデックスに問題があります"
@@ -15446,7 +15462,7 @@ msgid "Version %s snapshot (SQL code)"
 msgstr "世代 %s のスナップショット (SQL コード)"
 
 #: libraries/tracking.lib.php:947
-#: templates/structure/table_structure_row.phtml:33
+#: templates/table/structure/table_structure_row.phtml:33
 msgctxt "None for default"
 msgid "None"
 msgstr "なし"
@@ -15505,15 +15521,15 @@ msgid "Version %1$s was created, tracking for %2$s is active."
 msgstr ""
 "世代 %1$s を作成しました。%2$s の SQL コマンド追跡機能はアクティブです。"
 
-#: libraries/user_preferences.inc.php:29
+#: libraries/user_preferences.inc.php:30
 msgid "Manage your settings"
 msgstr "ユーザ環境設定の管理"
 
-#: libraries/user_preferences.inc.php:46 prefs_manage.php:307
+#: libraries/user_preferences.inc.php:54 prefs_manage.php:307
 msgid "Configuration has been saved."
 msgstr "設定を保存しました。"
 
-#: libraries/user_preferences.inc.php:66
+#: libraries/user_preferences.inc.php:74
 #, php-format
 msgid ""
 "Your preferences will be saved for current session only. Storing them "
@@ -15936,7 +15952,7 @@ msgid "first"
 msgstr "最初へ"
 
 #: templates/columns_definitions/move_column.phtml:12
-#: templates/structure/add_column.phtml:21
+#: templates/table/structure/add_column.phtml:21
 #, php-format
 msgid "after %s"
 msgstr "%s の後へ"
@@ -16013,221 +16029,327 @@ msgstr "ブラウザ変換機能"
 msgid "Input transformation options"
 msgstr "変換オプション"
 
-#: templates/designer/aggregate_query_panel.phtml:22
-#: templates/designer/options_panel.phtml:100
+#: templates/database/create_table.phtml:7
+#: templates/database/designer/side_menu.phtml:77
+#: templates/database/designer/side_menu.phtml:80
+msgid "Create table"
+msgstr "テーブルを作成"
+
+#: templates/database/create_table.phtml:15
+msgid "Number of columns"
+msgstr "カラム数"
+
+#: templates/database/designer/aggregate_query_panel.phtml:22
+#: templates/database/designer/options_panel.phtml:100
 msgid "Aggregate"
 msgstr "集計"
 
-#: templates/designer/aggregate_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:61
-#: templates/designer/options_panel.phtml:106
-#: templates/designer/options_panel.phtml:170
-#: templates/designer/where_query_panel.phtml:30
-#: templates/table/table_header.phtml:9
+#: templates/database/designer/aggregate_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:61
+#: templates/database/designer/options_panel.phtml:106
+#: templates/database/designer/options_panel.phtml:170
+#: templates/database/designer/where_query_panel.phtml:30
+#: templates/table/search/table_header.phtml:9
 msgid "Operator"
 msgstr "演算子"
 
-#: templates/designer/database_tables.phtml:29
+#: templates/database/designer/database_tables.phtml:29
 msgid "Toggle"
 msgstr ""
 
-#: templates/designer/database_tables.phtml:40
+#: templates/database/designer/database_tables.phtml:40
 #, fuzzy
 #| msgid "Table structure"
 msgid "See table structure"
 msgstr "テーブルの構造"
 
-#: templates/designer/delete_relation_panel.phtml:21
+#: templates/database/designer/delete_relation_panel.phtml:21
 msgid "Delete relation"
 msgstr "リレーションを削除"
 
-#: templates/designer/edit_delete_pages.phtml:7
+#: templates/database/designer/edit_delete_pages.phtml:7
 #, fuzzy
 #| msgid "Page titles"
 msgid "Page to open"
 msgstr "ページタイトル"
 
-#: templates/designer/edit_delete_pages.phtml:7
+#: templates/database/designer/edit_delete_pages.phtml:7
 #, fuzzy
 #| msgid "Relation deleted"
 msgid "Page to delete"
 msgstr "リレーションを削除しました"
 
-#: templates/designer/having_query_panel.phtml:90
-#: templates/designer/options_panel.phtml:63
-#: templates/designer/options_panel.phtml:229
-#: templates/designer/where_query_panel.phtml:59
+#: templates/database/designer/having_query_panel.phtml:90
+#: templates/database/designer/options_panel.phtml:63
+#: templates/database/designer/options_panel.phtml:229
+#: templates/database/designer/where_query_panel.phtml:59
 msgid "Except"
 msgstr "以外"
 
-#: templates/designer/having_query_panel.phtml:102
-#: templates/designer/options_panel.phtml:75
-#: templates/designer/options_panel.phtml:241
-#: templates/designer/where_query_panel.phtml:71
+#: templates/database/designer/having_query_panel.phtml:102
+#: templates/database/designer/options_panel.phtml:75
+#: templates/database/designer/options_panel.phtml:241
+#: templates/database/designer/where_query_panel.phtml:71
 msgid "subquery"
 msgstr "サブクエリ"
 
-#: templates/designer/new_relation_panel.phtml:22
-#: templates/designer/side_menu.phtml:84 templates/designer/side_menu.phtml:87
+#: templates/database/designer/new_relation_panel.phtml:22
+#: templates/database/designer/side_menu.phtml:84
+#: templates/database/designer/side_menu.phtml:87
 msgid "Create relation"
 msgstr "リレーションを作成"
 
-#: templates/designer/options_panel.phtml:34
-#: templates/designer/options_panel.phtml:200
+#: templates/database/designer/options_panel.phtml:34
+#: templates/database/designer/options_panel.phtml:200
 msgid "Relation operator"
 msgstr "リレーション演算子"
 
-#: templates/designer/options_panel.phtml:85
-#: templates/designer/rename_to_panel.phtml:23
+#: templates/database/designer/options_panel.phtml:85
+#: templates/database/designer/rename_to_panel.phtml:23
 msgid "Rename to"
 msgstr "変更後の名称"
 
-#: templates/designer/options_panel.phtml:91
-#: templates/designer/rename_to_panel.phtml:31
+#: templates/database/designer/options_panel.phtml:91
+#: templates/database/designer/rename_to_panel.phtml:31
 msgid "New name"
 msgstr "新しい名前"
 
-#: templates/designer/page_save_as.phtml:4
+#: templates/database/designer/page_save_as.phtml:4
 #, fuzzy
 #| msgid "Export to selected page"
 msgid "Save to selected page"
 msgstr "選択したページへエクスポートする"
 
-#: templates/designer/page_save_as.phtml:5
+#: templates/database/designer/page_save_as.phtml:5
 #, fuzzy
 #| msgid "Create a page and export to it"
 msgid "Create a page and save to it"
 msgstr "ページを作成し、そこへエクスポートする。"
 
-#: templates/designer/page_save_as.phtml:26
+#: templates/database/designer/page_save_as.phtml:26
 #, fuzzy
 #| msgid "New page name: "
 msgid "New page name"
 msgstr "新しいページの名前: "
 
-#: templates/designer/page_selector.phtml:2
+#: templates/database/designer/page_selector.phtml:2
 msgid "Select page"
 msgstr "ページを選択してください"
 
-#: templates/designer/query_details.phtml:10
+#: templates/database/designer/query_details.phtml:10
 msgid "Active options"
 msgstr "アクティブオプション"
 
-#: templates/designer/schema_export.phtml:4
+#: templates/database/designer/schema_export.phtml:4
 msgid "Select Export Relational Type"
 msgstr "エクスポートするリレーショナルタイプを選択してください"
 
-#: templates/designer/side_menu.phtml:19 templates/designer/side_menu.phtml:25
+#: templates/database/designer/side_menu.phtml:19
+#: templates/database/designer/side_menu.phtml:25
 #, fuzzy
 #| msgid "Showing tables"
 msgid "Show/Hide tables list"
 msgstr "テーブルを表示しています"
 
-#: templates/designer/side_menu.phtml:29 templates/designer/side_menu.phtml:35
-#: templates/designer/side_menu.phtml:36
+#: templates/database/designer/side_menu.phtml:29
+#: templates/database/designer/side_menu.phtml:35
+#: templates/database/designer/side_menu.phtml:36
 msgid "View in fullscreen"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:34
+#: templates/database/designer/side_menu.phtml:34
 msgid "Exit fullscreen"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:41 templates/designer/side_menu.phtml:45
+#: templates/database/designer/side_menu.phtml:41
+#: templates/database/designer/side_menu.phtml:45
 #, fuzzy
 #| msgid "New name"
 msgid "New page"
 msgstr "新しい名前"
 
-#: templates/designer/side_menu.phtml:70 templates/designer/side_menu.phtml:73
+#: templates/database/designer/side_menu.phtml:70
+#: templates/database/designer/side_menu.phtml:73
 #, fuzzy
 #| msgid "Select page"
 msgid "Delete pages"
 msgstr "ページを選択してください"
 
-#: templates/designer/side_menu.phtml:77 templates/designer/side_menu.phtml:80
-#: templates/table/create_table.phtml:7
-msgid "Create table"
-msgstr "テーブルを作成"
-
-#: templates/designer/side_menu.phtml:98
-#: templates/designer/side_menu.phtml:101
+#: templates/database/designer/side_menu.phtml:98
+#: templates/database/designer/side_menu.phtml:101
 msgid "Reload"
 msgstr "再読み込み"
 
-#: templates/designer/side_menu.phtml:107
-#: templates/designer/side_menu.phtml:110
+#: templates/database/designer/side_menu.phtml:107
+#: templates/database/designer/side_menu.phtml:110
 msgid "Help"
 msgstr "ヘルプ"
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Angular links"
 msgstr "角リンク"
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Direct links"
 msgstr "直リンク"
 
-#: templates/designer/side_menu.phtml:122
-#: templates/designer/side_menu.phtml:124
+#: templates/database/designer/side_menu.phtml:122
+#: templates/database/designer/side_menu.phtml:124
 msgid "Snap to grid"
 msgstr "グリッドにあわせる"
 
-#: templates/designer/side_menu.phtml:128
-#: templates/designer/side_menu.phtml:134
+#: templates/database/designer/side_menu.phtml:128
+#: templates/database/designer/side_menu.phtml:134
 msgid "Small/Big All"
 msgstr "すべてを大きく/小さく"
 
-#: templates/designer/side_menu.phtml:138
-#: templates/designer/side_menu.phtml:141
+#: templates/database/designer/side_menu.phtml:138
+#: templates/database/designer/side_menu.phtml:141
 msgid "Toggle small/big"
 msgstr "大小を切り替える"
 
-#: templates/designer/side_menu.phtml:145
-#: templates/designer/side_menu.phtml:148
+#: templates/database/designer/side_menu.phtml:145
+#: templates/database/designer/side_menu.phtml:148
 msgid "Toggle relation lines"
 msgstr "リレーションラインの表示切替"
 
-#: templates/designer/side_menu.phtml:153
-#: templates/designer/side_menu.phtml:156
+#: templates/database/designer/side_menu.phtml:153
+#: templates/database/designer/side_menu.phtml:156
 #, fuzzy
 #| msgid "Export all"
 msgid "Export schema"
 msgstr "すべてエクスポート"
 
-#: templates/designer/side_menu.phtml:165
-#: templates/designer/side_menu.phtml:168
+#: templates/database/designer/side_menu.phtml:165
+#: templates/database/designer/side_menu.phtml:168
 msgid "Build Query"
 msgstr "クエリを作成する"
 
-#: templates/designer/side_menu.phtml:173
-#: templates/designer/side_menu.phtml:177
+#: templates/database/designer/side_menu.phtml:173
+#: templates/database/designer/side_menu.phtml:177
 msgid "Move Menu"
 msgstr "メニューを移動する"
 
-#: templates/designer/side_menu.phtml:181
-#: templates/designer/side_menu.phtml:186
+#: templates/database/designer/side_menu.phtml:181
+#: templates/database/designer/side_menu.phtml:186
 #, fuzzy
 #| msgid "Partial texts"
 msgid "Pin text"
 msgstr "部分テキスト"
 
-#: templates/designer/table_list.phtml:4
+#: templates/database/designer/table_list.phtml:4
 msgid "Hide/Show all"
 msgstr "すべて隠す/表示"
 
-#: templates/designer/table_list.phtml:14
+#: templates/database/designer/table_list.phtml:14
 msgid "Hide/Show Tables with no relation"
 msgstr "リレーションのないテーブルを隠す/表示"
 
-#: templates/designer/table_list.phtml:59
+#: templates/database/designer/table_list.phtml:59
 #, fuzzy
 #| msgid "Number of tables"
 msgid "Number of tables:"
 msgstr "テーブル数"
 
+#: templates/database/structure/body_for_table_summary.phtml:6
+#, php-format
+msgid "%s table"
+msgid_plural "%s tables"
+msgstr[0] "%s テーブル"
+
+#: templates/database/structure/body_for_table_summary.phtml:17
+msgid "Sum"
+msgstr "合計"
+
+#: templates/database/structure/check_all_tables.phtml:6
+msgid "Check tables having overhead"
+msgstr "オーバーヘッドのあるテーブルを確認する"
+
+#: templates/database/structure/check_all_tables.phtml:10
+#, fuzzy
+#| msgid "Show color"
+msgid "Show create"
+msgstr "色表示"
+
+#: templates/database/structure/check_all_tables.phtml:27
+#, fuzzy
+#| msgid "Add prefix"
+msgid "Prefix"
+msgstr "追加する接頭辞"
+
+#: templates/database/structure/check_all_tables.phtml:28
+msgid "Add prefix to table"
+msgstr "接頭辞をテーブル名に追加する"
+
+#: templates/database/structure/check_all_tables.phtml:29
+msgid "Replace table prefix"
+msgstr "テーブル名の接頭辞を付け替える"
+
+#: templates/database/structure/check_all_tables.phtml:30
+msgid "Copy table with prefix"
+msgstr "接頭辞を付け替えてテーブルをコピーする"
+
+#: templates/database/structure/check_all_tables.phtml:36
+#, fuzzy
+#| msgid "CHAR textarea columns"
+msgid "Add columns to central list"
+msgstr "文字入力用 textarea の 1 行の文字数"
+
+#: templates/database/structure/check_all_tables.phtml:37
+msgid "Remove columns from central list"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:38
+#, fuzzy
+#| msgid "CHAR textarea columns"
+msgid "Make consistent with central list"
+msgstr "文字入力用 textarea の 1 行の文字数"
+
+#: templates/database/structure/favorite_anchor.phtml:12
+#, fuzzy
+#| msgid "Add this series"
+msgid "Add to Favorites"
+msgstr "この系列を追加する"
+
+#: templates/database/structure/show_create.phtml:2
+#, fuzzy
+#| msgid "Show SQL queries"
+msgid "Showing create queries"
+msgstr "SQL クエリを表示する"
+
+#: templates/database/structure/sortable_header.phtml:13
+msgid "Sort"
+msgstr "ソート"
+
+#: templates/database/structure/table_header.phtml:42
+#, fuzzy
+#| msgid "May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]"
+msgid ""
+"May be approximate. Click on the number to get the exact count. See "
+"[doc@faq3-11]FAQ 3.11[/doc]."
+msgstr "正確な数字とは限りません。[doc@faq3-11]FAQ 3.11[/doc] をご覧ください"
+
+#: templates/database/structure/table_header.phtml:66
+#: templates/table/index_form.phtml:127
+msgid "Size"
+msgstr "サイズ"
+
+#: templates/database/structure/table_header.phtml:74
+#: templates/table/structure/display_table_stats.phtml:27
+msgid "Overhead"
+msgstr "オーバーヘッド"
+
+#: templates/database/structure/tracking_icon.phtml:4
+msgid "Tracking is active."
+msgstr "SQL コマンドの追跡はアクティブです。"
+
+#: templates/database/structure/tracking_icon.phtml:8
+msgid "Tracking is not active."
+msgstr "SQL コマンドの追跡は非アクティブです。"
+
 #: templates/error/report_form.phtml:7
 msgid ""
 "phpMyAdmin has encountered an error. We have collected data about this error "
@@ -16243,69 +16365,6 @@ msgstr ""
 msgid "Please explain the steps that lead to the error:"
 msgstr ""
 
-#: templates/gis_visualization/gis_visualization.phtml:3
-msgid "Display GIS Visualization"
-msgstr "視覚化した空間情報"
-
-#: templates/gis_visualization/gis_visualization.phtml:8
-msgid "Label column"
-msgstr "ラベルカラム"
-
-#: templates/gis_visualization/gis_visualization.phtml:11
-msgid "-- None --"
-msgstr "-- なし --"
-
-#: templates/gis_visualization/gis_visualization.phtml:19
-msgid "Spatial column"
-msgstr "空間情報カラム"
-
-#: templates/index_form.phtml:16
-msgid "Index name:"
-msgstr "インデックス名:"
-
-#: templates/index_form.phtml:19
-msgid ""
-"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
-msgstr ""
-"主キーは<b>必ず</b> \"PRIMARY\" という名前でなければならず、この名前を<b>それ"
-"以外に使用してはいけません</b>!"
-
-#: templates/index_form.phtml:40
-#, fuzzy
-#| msgid "Index cache size"
-msgid "Index choice:"
-msgstr "インデックスキャッシュの大きさ"
-
-#: templates/index_form.phtml:57
-msgid "Key block size:"
-msgstr ""
-
-#: templates/index_form.phtml:74
-msgid "Index type:"
-msgstr "インデックスの種類:"
-
-#: templates/index_form.phtml:86
-#, fuzzy
-#| msgid "User:"
-msgid "Parser:"
-msgstr "ユーザ："
-
-#: templates/index_form.phtml:102
-#, fuzzy
-#| msgid "Comment"
-msgid "Comment:"
-msgstr "コメント"
-
-#: templates/index_form.phtml:127 templates/structure/table_header.phtml:66
-msgid "Size"
-msgstr "サイズ"
-
-#: templates/index_form.phtml:149 templates/index_form.phtml:190
-#, fuzzy
-#| msgid "Drag to reorder"
-msgid "Drag to reorder"
-msgstr "ドラッグでカラムの入れ替え"
-
 #: templates/prefs_autoload.phtml:9
 msgid ""
 "Your browser has phpMyAdmin configuration for this domain. Would you like to "
@@ -16321,459 +16380,423 @@ msgstr ""
 msgid "Start row:"
 msgstr "開始行"
 
-#: templates/structure/actions_in_table_structure.phtml:14
-#, php-format
-msgid "A primary key has been added on %s."
-msgstr "%s に主キーを追加しました。"
-
-#: templates/structure/actions_in_table_structure.phtml:34
-#: templates/structure/actions_in_table_structure.phtml:54
-#: templates/structure/actions_in_table_structure.phtml:79
-#: templates/structure/actions_in_table_structure.phtml:101
-#, php-format
-msgid "An index has been added on %s."
-msgstr "%s にインデックスを追加しました。"
-
-#: templates/structure/actions_in_table_structure.phtml:130
-#: templates/structure/check_all_table_column.phtml:59
-#, fuzzy
-#| msgid "Remove column(s)"
-msgid "Remove from central columns"
-msgstr "カラムの削除"
-
-#: templates/structure/actions_in_table_structure.phtml:138
-#: templates/structure/check_all_table_column.phtml:55
-#, fuzzy
-#| msgid "CHAR textarea columns"
-msgid "Add to central columns"
-msgstr "文字入力用 textarea の 1 行の文字数"
-
-#: templates/structure/add_column.phtml:7
-#, php-format
-msgid "Add %s column(s)"
-msgstr "%s 個のカラムを追加する"
-
-#: templates/structure/add_column.phtml:12
-#, fuzzy
-#| msgid "At Beginning of Table"
-msgid "at beginning of table"
-msgstr "テーブルの先頭"
-
-#: templates/structure/body_for_table_summary.phtml:6
-#, php-format
-msgid "%s table"
-msgid_plural "%s tables"
-msgstr[0] "%s テーブル"
-
-#: templates/structure/body_for_table_summary.phtml:17
-msgid "Sum"
-msgstr "合計"
-
-#: templates/structure/check_all_tables.phtml:6
-msgid "Check tables having overhead"
-msgstr "オーバーヘッドのあるテーブルを確認する"
-
-#: templates/structure/check_all_tables.phtml:10
-#, fuzzy
-#| msgid "Show color"
-msgid "Show create"
-msgstr "色表示"
-
-#: templates/structure/check_all_tables.phtml:27
-#, fuzzy
-#| msgid "Add prefix"
-msgid "Prefix"
-msgstr "追加する接頭辞"
-
-#: templates/structure/check_all_tables.phtml:28
-msgid "Add prefix to table"
-msgstr "接頭辞をテーブル名に追加する"
-
-#: templates/structure/check_all_tables.phtml:29
-msgid "Replace table prefix"
-msgstr "テーブル名の接頭辞を付け替える"
-
-#: templates/structure/check_all_tables.phtml:30
-msgid "Copy table with prefix"
-msgstr "接頭辞を付け替えてテーブルをコピーする"
-
-#: templates/structure/check_all_tables.phtml:36
-#, fuzzy
-#| msgid "CHAR textarea columns"
-msgid "Add columns to central list"
-msgstr "文字入力用 textarea の 1 行の文字数"
-
-#: templates/structure/check_all_tables.phtml:37
-msgid "Remove columns from central list"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:38
-#, fuzzy
-#| msgid "CHAR textarea columns"
-msgid "Make consistent with central list"
-msgstr "文字入力用 textarea の 1 行の文字数"
-
-#: templates/structure/display_structure.phtml:140 view_create.php:181
-msgid "Edit view"
-msgstr "ビューを編集する"
-
-#: templates/structure/display_table_stats.phtml:9
-msgid "Space usage"
-msgstr "ディスク使用量"
-
-#: templates/structure/display_table_stats.phtml:27
-#: templates/structure/table_header.phtml:74
-msgid "Overhead"
-msgstr "オーバーヘッド"
-
-#: templates/structure/display_table_stats.phtml:32
-msgid "Effective"
-msgstr "有効"
-
-#: templates/structure/favorite_anchor.phtml:12
-#, fuzzy
-#| msgid "Add this series"
-msgid "Add to Favorites"
-msgstr "この系列を追加する"
-
-#: templates/structure/move_columns_dialog.phtml:1
-#: templates/structure/optional_action_links.phtml:21
-msgid "Move columns"
-msgstr "カラムを移動させる"
-
-#: templates/structure/move_columns_dialog.phtml:2
-msgid "Move the columns by dragging them up and down."
-msgstr "ドラックして上下させ、カラムを移動させてください。"
-
-#: templates/structure/optional_action_links.phtml:9
-msgid "Propose table structure"
-msgstr "テーブル構造を確認する"
-
-#: templates/structure/optional_action_links.phtml:24
-#, fuzzy
-#| msgid "Propose table structure"
-msgid "Improve table structure"
-msgstr "テーブル構造を確認する"
-
-#: templates/structure/optional_action_links.phtml:30
-msgid "Track view"
-msgstr "追跡の閲覧"
-
-#: templates/structure/row_stats_table.phtml:3
-#, fuzzy
-#| msgid "Row Statistics"
-msgid "Row statistics"
-msgstr "行の統計"
-
-#: templates/structure/row_stats_table.phtml:9
-msgid "static"
-msgstr "静的"
-
-#: templates/structure/row_stats_table.phtml:11
-msgid "dynamic"
-msgstr "動的"
-
-#: templates/structure/row_stats_table.phtml:22
-msgid "partitioned"
-msgstr "パーティション有り"
-
-#: templates/structure/row_stats_table.phtml:54
-msgid "Row length"
-msgstr "行の長さ"
-
-#: templates/structure/row_stats_table.phtml:66
-msgid "Row size"
-msgstr "行のサイズ"
-
-#: templates/structure/row_stats_table.phtml:73
-msgid "Next autoindex"
-msgstr "次の自動付番"
-
-#: templates/structure/secondary_tabs.phtml:14
-#, fuzzy
-#| msgid "Relation view"
-msgid "Relation view"
-msgstr "リレーションビュー"
-
-#: templates/structure/show_create.phtml:2
-#, fuzzy
-#| msgid "Show SQL queries"
-msgid "Showing create queries"
-msgstr "SQL クエリを表示する"
-
-#: templates/structure/sortable_header.phtml:13
-msgid "Sort"
-msgstr "ソート"
-
-#: templates/structure/table_header.phtml:42
-#, fuzzy
-#| msgid "May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]"
-msgid ""
-"May be approximate. Click on the number to get the exact count. See "
-"[doc@faq3-11]FAQ 3.11[/doc]."
-msgstr "正確な数字とは限りません。[doc@faq3-11]FAQ 3.11[/doc] をご覧ください"
-
-#: templates/structure/table_structure_row.phtml:46
-#, php-format
-msgid "Column %s has been dropped."
-msgstr "カラム %s を削除しました。"
-
-#: templates/structure/tracking_icon.phtml:4
-msgid "Tracking is active."
-msgstr "SQL コマンドの追跡はアクティブです。"
-
-#: templates/structure/tracking_icon.phtml:8
-msgid "Tracking is not active."
-msgstr "SQL コマンドの追跡は非アクティブです。"
-
-#: templates/table/create_table.phtml:15
-msgid "Number of columns"
-msgstr "カラム数"
-
-#: templates/table/options.phtml:8
-msgid "Select columns (at least one):"
-msgstr "表示するカラム (最低 1 つ):"
-
-#: templates/table/options.phtml:37
-msgid "Add search conditions (body of the \"where\" clause):"
-msgstr "検索条件 (WHERE 節の全内容):"
-
-#: templates/table/options.phtml:45
-msgid "Number of rows per page"
-msgstr "ページあたりの行数"
-
-#: templates/table/options.phtml:56
-msgid "Display order:"
-msgstr "表示順:"
-
-#: templates/table/options_zoom.phtml:6
-msgid "Use this column to label each point"
-msgstr "各点のラベルとして使われるカラム"
-
-#: templates/table/options_zoom.phtml:35
-msgid "Maximum rows to plot"
-msgstr "プロットする結果の最大数"
-
-#: templates/table/replace_preview.phtml:13
-msgid "Find and replace - preview"
-msgstr ""
-
-#: templates/table/replace_preview.phtml:18
-#, fuzzy
-#| msgid "Original position"
-msgid "Original string"
-msgstr "元の位置"
-
-#: templates/table/replace_preview.phtml:19
-#, fuzzy
-#| msgid "Related Links"
-msgid "Replaced string"
-msgstr "関連リンク"
-
-#: templates/table/replace_preview.phtml:40
-#, fuzzy
-#| msgid "Replicated"
-msgid "Replace"
-msgstr "レプリケーションしている"
-
-#: templates/table/rows_zoom.phtml:16
-msgid "Additional search criteria"
-msgstr "更なる検索条件"
-
-#: templates/table/search_and_replace.phtml:3
-#, fuzzy
-#| msgid "Replace NULL with:"
-msgid "Replace with:"
-msgstr "NULL の代替文字列:"
-
-#: templates/table/search_and_replace.phtml:22
-#, fuzzy
-#| msgid "as regular expression"
-msgid "Use regular expression"
-msgstr "正規表現"
-
-#: templates/table/selection_form.phtml:12
-msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
-msgstr "異なる 2 つのカラムによる定型問い合わせ (ワイルドカード: \"%\")"
-
-#: templates/table/selection_form.phtml:34
-msgid "Do a \"query by example\" (wildcard: \"%\")"
-msgstr "定型問い合わせ (ワイルドカード: \"%\")"
-
-#: templates/table/zoom_result_form.phtml:7
-msgid "Browse/Edit the points"
-msgstr "結果表示／プロット点の編集"
-
-#: templates/table/zoom_result_form.phtml:15
-msgid "How to use"
-msgstr "使い方"
-
-#: templates/table/zoom_result_form.phtml:23
-msgid "Reset zoom"
-msgstr "ズームを戻す"
-
-#: templates/tbl_chart.phtml:17
+#: templates/table/chart/tbl_chart.phtml:17
 msgctxt "Chart type"
 msgid "Bar"
 msgstr "横棒グラフ"
 
-#: templates/tbl_chart.phtml:21
+#: templates/table/chart/tbl_chart.phtml:21
 msgctxt "Chart type"
 msgid "Column"
 msgstr "縦棒グラフ"
 
-#: templates/tbl_chart.phtml:25
+#: templates/table/chart/tbl_chart.phtml:25
 msgctxt "Chart type"
 msgid "Line"
 msgstr "折れ線グラフ"
 
-#: templates/tbl_chart.phtml:29
+#: templates/table/chart/tbl_chart.phtml:29
 msgctxt "Chart type"
 msgid "Spline"
 msgstr "曲線グラフ"
 
-#: templates/tbl_chart.phtml:33
+#: templates/table/chart/tbl_chart.phtml:33
 msgctxt "Chart type"
 msgid "Area"
 msgstr ""
 
-#: templates/tbl_chart.phtml:37
+#: templates/table/chart/tbl_chart.phtml:37
 msgctxt "Chart type"
 msgid "Pie"
 msgstr "円グラフ"
 
-#: templates/tbl_chart.phtml:41
+#: templates/table/chart/tbl_chart.phtml:41
 #, fuzzy
 #| msgid "Time"
 msgctxt "Chart type"
 msgid "Timeline"
 msgstr "時間"
 
-#: templates/tbl_chart.phtml:45
+#: templates/table/chart/tbl_chart.phtml:45
 msgctxt "Chart type"
 msgid "Scatter"
 msgstr ""
 
-#: templates/tbl_chart.phtml:50
+#: templates/table/chart/tbl_chart.phtml:50
 msgid "Stacked"
 msgstr "積み上げ形式"
 
-#: templates/tbl_chart.phtml:53
+#: templates/table/chart/tbl_chart.phtml:53
 msgid "Chart title"
 msgstr "グラフの題名"
 
-#: templates/tbl_chart.phtml:57
+#: templates/table/chart/tbl_chart.phtml:57
 msgid "X-Axis:"
 msgstr "X 軸:"
 
-#: templates/tbl_chart.phtml:72
+#: templates/table/chart/tbl_chart.phtml:72
 msgid "Series:"
 msgstr "系列："
 
-#: templates/tbl_chart.phtml:102
+#: templates/table/chart/tbl_chart.phtml:102
 msgid "X-Axis label:"
 msgstr "X 軸のラベル:"
 
-#: templates/tbl_chart.phtml:104
+#: templates/table/chart/tbl_chart.phtml:104
 msgid "X Values"
 msgstr "X 軸の値"
 
-#: templates/tbl_chart.phtml:107
+#: templates/table/chart/tbl_chart.phtml:107
 msgid "Y-Axis label:"
 msgstr "Y 軸のラベル:"
 
-#: templates/tbl_chart.phtml:115
+#: templates/table/chart/tbl_chart.phtml:115
 msgid "Series names are in a column"
 msgstr ""
 
-#: templates/tbl_chart.phtml:118
+#: templates/table/chart/tbl_chart.phtml:118
 #, fuzzy
 #| msgid "Inside column:"
 msgid "Series column:"
 msgstr "検索するカラム:"
 
-#: templates/tbl_chart.phtml:130
+#: templates/table/chart/tbl_chart.phtml:130
 #, fuzzy
 #| msgid "Values for column %s"
 msgid "Value Column:"
 msgstr "カラム %s に対しての値"
 
-#: templates/tbl_chart.phtml:150
+#: templates/table/chart/tbl_chart.phtml:150
 #, fuzzy
 #| msgid "Save as file"
 msgid "Save chart as image"
 msgstr "ファイルに保存する"
 
-#: templates/tbl_relation/common_form.phtml:7
+#: templates/table/gis_visualization/gis_visualization.phtml:3
+msgid "Display GIS Visualization"
+msgstr "視覚化した空間情報"
+
+#: templates/table/gis_visualization/gis_visualization.phtml:8
+msgid "Label column"
+msgstr "ラベルカラム"
+
+#: templates/table/gis_visualization/gis_visualization.phtml:11
+msgid "-- None --"
+msgstr "-- なし --"
+
+#: templates/table/gis_visualization/gis_visualization.phtml:19
+msgid "Spatial column"
+msgstr "空間情報カラム"
+
+#: templates/table/index_form.phtml:16
+msgid "Index name:"
+msgstr "インデックス名:"
+
+#: templates/table/index_form.phtml:19
+msgid ""
+"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
+msgstr ""
+"主キーは<b>必ず</b> \"PRIMARY\" という名前でなければならず、この名前を<b>それ"
+"以外に使用してはいけません</b>!"
+
+#: templates/table/index_form.phtml:40
+#, fuzzy
+#| msgid "Index cache size"
+msgid "Index choice:"
+msgstr "インデックスキャッシュの大きさ"
+
+#: templates/table/index_form.phtml:57
+msgid "Key block size:"
+msgstr ""
+
+#: templates/table/index_form.phtml:74
+msgid "Index type:"
+msgstr "インデックスの種類:"
+
+#: templates/table/index_form.phtml:86
+#, fuzzy
+#| msgid "User:"
+msgid "Parser:"
+msgstr "ユーザ："
+
+#: templates/table/index_form.phtml:102
+#, fuzzy
+#| msgid "Comment"
+msgid "Comment:"
+msgstr "コメント"
+
+#: templates/table/index_form.phtml:149 templates/table/index_form.phtml:190
+#, fuzzy
+#| msgid "Drag to reorder"
+msgid "Drag to reorder"
+msgstr "ドラッグでカラムの入れ替え"
+
+#: templates/table/relation/common_form.phtml:7
 msgid "Internal relations"
 msgstr "内部リレーション"
 
-#: templates/tbl_relation/common_form.phtml:11
+#: templates/table/relation/common_form.phtml:11
 msgid "Internal relation"
 msgstr "内部リレーション"
 
-#: templates/tbl_relation/common_form.phtml:14
+#: templates/table/relation/common_form.phtml:14
 msgid ""
 "An internal relation is not necessary when a corresponding FOREIGN KEY "
 "relation exists."
 msgstr ""
 "対応する外部リレーションが存在する場合、内部リレーションは必要ありません。"
 
-#: templates/tbl_relation/common_form.phtml:37
+#: templates/table/relation/common_form.phtml:37
 #, fuzzy
 #| msgid "Foreign key constraint"
 msgid "Foreign key constraints"
 msgstr "外部キー制約"
 
-#: templates/tbl_relation/common_form.phtml:40
+#: templates/table/relation/common_form.phtml:40
 msgid "Actions"
 msgstr "アクション"
 
-#: templates/tbl_relation/common_form.phtml:41
+#: templates/table/relation/common_form.phtml:41
 #, fuzzy
 #| msgid "Constraints for table"
 msgid "Constraint properties"
 msgstr "テーブルの制約"
 
-#: templates/tbl_relation/common_form.phtml:44
+#: templates/table/relation/common_form.phtml:44
 msgid ""
 "Only columns with index will be displayed. You can define an index below."
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:49
+#: templates/table/relation/common_form.phtml:49
 msgid "Foreign key constraint"
 msgstr "外部キー制約"
 
-#: templates/tbl_relation/common_form.phtml:81
+#: templates/table/relation/common_form.phtml:81
 #, fuzzy
 #| msgid "Add constraints"
 msgid "+ Add constraint"
 msgstr "制約を追加する"
 
-#: templates/tbl_relation/common_form.phtml:91
+#: templates/table/relation/common_form.phtml:91
 #, fuzzy
 #| msgid "Choose column to display"
 msgid "Choose column to display:"
 msgstr "表示するカラムの選択"
 
-#: templates/tbl_relation/foreign_key_row.phtml:13
+#: templates/table/relation/foreign_key_row.phtml:13
 #, fuzzy, php-format
 #| msgid "Foreign key constraint"
 msgid "Foreign key constraint %s has been dropped"
 msgstr "外部キー制約"
 
-#: templates/tbl_relation/foreign_key_row.phtml:102
+#: templates/table/relation/foreign_key_row.phtml:102
 #, fuzzy
 #| msgid "Constraints for table"
 msgid "Constraint name"
 msgstr "テーブルの制約"
 
-#: templates/tbl_relation/foreign_key_row.phtml:157
+#: templates/table/relation/foreign_key_row.phtml:157
 #, fuzzy
 #| msgid "Add column"
 msgid "+ Add column"
 msgstr "カラムを追加する"
 
+#: templates/table/search/options.phtml:8
+msgid "Select columns (at least one):"
+msgstr "表示するカラム (最低 1 つ):"
+
+#: templates/table/search/options.phtml:37
+msgid "Add search conditions (body of the \"where\" clause):"
+msgstr "検索条件 (WHERE 節の全内容):"
+
+#: templates/table/search/options.phtml:45
+msgid "Number of rows per page"
+msgstr "ページあたりの行数"
+
+#: templates/table/search/options.phtml:56
+msgid "Display order:"
+msgstr "表示順:"
+
+#: templates/table/search/options_zoom.phtml:6
+msgid "Use this column to label each point"
+msgstr "各点のラベルとして使われるカラム"
+
+#: templates/table/search/options_zoom.phtml:35
+msgid "Maximum rows to plot"
+msgstr "プロットする結果の最大数"
+
+#: templates/table/search/replace_preview.phtml:13
+msgid "Find and replace - preview"
+msgstr ""
+
+#: templates/table/search/replace_preview.phtml:18
+#, fuzzy
+#| msgid "Original position"
+msgid "Original string"
+msgstr "元の位置"
+
+#: templates/table/search/replace_preview.phtml:19
+#, fuzzy
+#| msgid "Related Links"
+msgid "Replaced string"
+msgstr "関連リンク"
+
+#: templates/table/search/replace_preview.phtml:40
+#, fuzzy
+#| msgid "Replicated"
+msgid "Replace"
+msgstr "レプリケーションしている"
+
+#: templates/table/search/rows_zoom.phtml:16
+msgid "Additional search criteria"
+msgstr "更なる検索条件"
+
+#: templates/table/search/search_and_replace.phtml:3
+#, fuzzy
+#| msgid "Replace NULL with:"
+msgid "Replace with:"
+msgstr "NULL の代替文字列:"
+
+#: templates/table/search/search_and_replace.phtml:22
+#, fuzzy
+#| msgid "as regular expression"
+msgid "Use regular expression"
+msgstr "正規表現"
+
+#: templates/table/search/selection_form.phtml:12
+msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
+msgstr "異なる 2 つのカラムによる定型問い合わせ (ワイルドカード: \"%\")"
+
+#: templates/table/search/selection_form.phtml:34
+msgid "Do a \"query by example\" (wildcard: \"%\")"
+msgstr "定型問い合わせ (ワイルドカード: \"%\")"
+
+#: templates/table/search/zoom_result_form.phtml:7
+msgid "Browse/Edit the points"
+msgstr "結果表示／プロット点の編集"
+
+#: templates/table/search/zoom_result_form.phtml:15
+msgid "How to use"
+msgstr "使い方"
+
+#: templates/table/search/zoom_result_form.phtml:23
+msgid "Reset zoom"
+msgstr "ズームを戻す"
+
+#: templates/table/secondary_tabs.phtml:14
+#, fuzzy
+#| msgid "Relation view"
+msgid "Relation view"
+msgstr "リレーションビュー"
+
+#: templates/table/structure/actions_in_table_structure.phtml:14
+#, php-format
+msgid "A primary key has been added on %s."
+msgstr "%s に主キーを追加しました。"
+
+#: templates/table/structure/actions_in_table_structure.phtml:34
+#: templates/table/structure/actions_in_table_structure.phtml:54
+#: templates/table/structure/actions_in_table_structure.phtml:79
+#: templates/table/structure/actions_in_table_structure.phtml:101
+#, php-format
+msgid "An index has been added on %s."
+msgstr "%s にインデックスを追加しました。"
+
+#: templates/table/structure/actions_in_table_structure.phtml:130
+#: templates/table/structure/check_all_table_column.phtml:59
+#, fuzzy
+#| msgid "Remove column(s)"
+msgid "Remove from central columns"
+msgstr "カラムの削除"
+
+#: templates/table/structure/actions_in_table_structure.phtml:138
+#: templates/table/structure/check_all_table_column.phtml:55
+#, fuzzy
+#| msgid "CHAR textarea columns"
+msgid "Add to central columns"
+msgstr "文字入力用 textarea の 1 行の文字数"
+
+#: templates/table/structure/add_column.phtml:7
+#, php-format
+msgid "Add %s column(s)"
+msgstr "%s 個のカラムを追加する"
+
+#: templates/table/structure/add_column.phtml:12
+#, fuzzy
+#| msgid "At Beginning of Table"
+msgid "at beginning of table"
+msgstr "テーブルの先頭"
+
+#: templates/table/structure/display_structure.phtml:140 view_create.php:181
+msgid "Edit view"
+msgstr "ビューを編集する"
+
+#: templates/table/structure/display_table_stats.phtml:9
+msgid "Space usage"
+msgstr "ディスク使用量"
+
+#: templates/table/structure/display_table_stats.phtml:32
+msgid "Effective"
+msgstr "有効"
+
+#: templates/table/structure/move_columns_dialog.phtml:1
+#: templates/table/structure/optional_action_links.phtml:21
+msgid "Move columns"
+msgstr "カラムを移動させる"
+
+#: templates/table/structure/move_columns_dialog.phtml:2
+msgid "Move the columns by dragging them up and down."
+msgstr "ドラックして上下させ、カラムを移動させてください。"
+
+#: templates/table/structure/optional_action_links.phtml:9
+msgid "Propose table structure"
+msgstr "テーブル構造を確認する"
+
+#: templates/table/structure/optional_action_links.phtml:24
+#, fuzzy
+#| msgid "Propose table structure"
+msgid "Improve table structure"
+msgstr "テーブル構造を確認する"
+
+#: templates/table/structure/optional_action_links.phtml:30
+msgid "Track view"
+msgstr "追跡の閲覧"
+
+#: templates/table/structure/row_stats_table.phtml:3
+#, fuzzy
+#| msgid "Row Statistics"
+msgid "Row statistics"
+msgstr "行の統計"
+
+#: templates/table/structure/row_stats_table.phtml:9
+msgid "static"
+msgstr "静的"
+
+#: templates/table/structure/row_stats_table.phtml:11
+msgid "dynamic"
+msgstr "動的"
+
+#: templates/table/structure/row_stats_table.phtml:22
+msgid "partitioned"
+msgstr "パーティション有り"
+
+#: templates/table/structure/row_stats_table.phtml:54
+msgid "Row length"
+msgstr "行の長さ"
+
+#: templates/table/structure/row_stats_table.phtml:66
+msgid "Row size"
+msgstr "行のサイズ"
+
+#: templates/table/structure/row_stats_table.phtml:73
+msgid "Next autoindex"
+msgstr "次の自動付番"
+
+#: templates/table/structure/table_structure_row.phtml:46
+#, php-format
+msgid "Column %s has been dropped."
+msgstr "カラム %s を削除しました。"
+
 #: themes.php:17 themes.php:22
 msgid "Theme"
 msgstr "テーマ"
@@ -18195,6 +18218,11 @@ msgstr ""
 msgid "concurrent_insert is set to 0"
 msgstr "concurrent_insert は 0 に設定されています"
 
+#, fuzzy
+#~| msgid "Read misses"
+#~ msgid "Read as multibytes"
+#~ msgstr "読み込みミス"
+
 #~ msgid "Relational display column"
 #~ msgstr "リレーション表示カラム"
 
diff --git a/po/ka.po b/po/ka.po
index c0ca5288fa..96078de773 100644
--- a/po/ka.po
+++ b/po/ka.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 4.5.0-dev\n"
 "Report-Msgid-Bugs-To: developers@phpmyadmin.net\n"
-"POT-Creation-Date: 2015-08-08 13:53-0400\n"
+"POT-Creation-Date: 2015-08-12 08:10-0400\n"
 "PO-Revision-Date: 2014-03-27 15:20+0200\n"
 "Last-Translator: Michal Čihař <michal@cihar.com>\n"
 "Language-Team: Georgian <https://hosted.weblate.org/projects/phpmyadmin/"
@@ -55,7 +55,7 @@ msgid "Table comments:"
 msgstr "ცხრილის კომენტარები"
 
 #: db_datadict.php:104 libraries/Index.class.php:699
-#: libraries/insert_edit.lib.php:1567
+#: libraries/insert_edit.lib.php:1565
 #: libraries/navigation/Nodes/Node_Column.class.php:30
 #: libraries/plugins/export/ExportHtmlword.class.php:280
 #: libraries/plugins/export/ExportHtmlword.class.php:375
@@ -69,13 +69,14 @@ msgstr "ცხრილის კომენტარები"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1023
 #: libraries/tracking.lib.php:879 libraries/tracking.lib.php:975
 #: templates/columns_definitions/column_name.phtml:18
-#: templates/index_form.phtml:124 templates/table/table_header.phtml:6
-#: templates/table/zoom_result_form.phtml:33
-#: templates/tbl_relation/common_form.phtml:10
-#: templates/tbl_relation/common_form.phtml:43
-#: templates/tbl_relation/foreign_key_row.phtml:194
-#: templates/tbl_relation/foreign_key_row.phtml:206
-#: templates/tbl_relation/internal_relational_row.phtml:71
+#: templates/table/index_form.phtml:124
+#: templates/table/relation/common_form.phtml:10
+#: templates/table/relation/common_form.phtml:43
+#: templates/table/relation/foreign_key_row.phtml:194
+#: templates/table/relation/foreign_key_row.phtml:206
+#: templates/table/relation/internal_relational_row.phtml:71
+#: templates/table/search/table_header.phtml:6
+#: templates/table/search/zoom_result_form.phtml:33
 msgid "Column"
 msgstr "სვეტები"
 
@@ -93,21 +94,21 @@ msgstr "სვეტები"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1001
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1024
 #: libraries/rte/rte_list.lib.php:75 libraries/rte/rte_list.lib.php:103
-#: libraries/rte/rte_routines.lib.php:802
-#: libraries/rte/rte_routines.lib.php:831
-#: libraries/rte/rte_routines.lib.php:1493
+#: libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_routines.lib.php:922
+#: libraries/rte/rte_routines.lib.php:1584
 #: libraries/server_privileges.lib.php:2369 libraries/tracking.lib.php:880
 #: libraries/tracking.lib.php:972
 #: templates/columns_definitions/table_fields_definitions.phtml:11
-#: templates/structure/table_header.phtml:48
-#: templates/structure/table_structure_header.phtml:6
-#: templates/table/table_header.phtml:7
+#: templates/database/structure/table_header.phtml:48
+#: templates/table/search/table_header.phtml:7
+#: templates/table/structure/table_structure_header.phtml:6
 msgid "Type"
 msgstr "ტიპი"
 
 #: db_datadict.php:106 libraries/Index.class.php:702
 #: libraries/central_columns.lib.php:708
-#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1576
+#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1574
 #: libraries/plugins/export/ExportHtmlword.class.php:286
 #: libraries/plugins/export/ExportHtmlword.class.php:381
 #: libraries/plugins/export/ExportLatex.class.php:509
@@ -120,8 +121,8 @@ msgstr "ტიპი"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1026
 #: libraries/tracking.lib.php:882 libraries/tracking.lib.php:978
 #: templates/columns_definitions/table_fields_definitions.phtml:39
-#: templates/structure/table_structure_header.phtml:9
-#: templates/table/zoom_result_form.phtml:34
+#: templates/table/search/zoom_result_form.phtml:34
+#: templates/table/structure/table_structure_header.phtml:9
 msgid "Null"
 msgstr "Null"
 
@@ -139,8 +140,8 @@ msgstr "Null"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1027
 #: libraries/replication_gui.lib.php:153 libraries/tracking.lib.php:883
 #: templates/columns_definitions/table_fields_definitions.phtml:25
-#: templates/structure/body_for_table_summary.phtml:55
-#: templates/structure/table_structure_header.phtml:10
+#: templates/database/structure/body_for_table_summary.phtml:55
+#: templates/table/structure/table_structure_header.phtml:10
 msgid "Default"
 msgstr "სტანდარტული"
 
@@ -168,19 +169,19 @@ msgid "Comments"
 msgstr "კომენტარები"
 
 #: db_datadict.php:146
-#: libraries/controllers/StructureController.class.php:1960
-#: libraries/controllers/StructureController.class.php:1965
+#: libraries/controllers/TableStructureController.class.php:951
+#: libraries/controllers/TableStructureController.class.php:956
 #: libraries/tracking.lib.php:922
 #: templates/columns_definitions/column_indexes.phtml:6
-#: templates/structure/check_all_table_column.phtml:22
-#: templates/structure/display_structure.phtml:74
+#: templates/table/structure/check_all_table_column.phtml:22
+#: templates/table/structure/display_structure.phtml:74
 msgid "Primary"
 msgstr "პირველადი"
 
 #: db_datadict.php:156 js/messages.php:317 libraries/Index.class.php:567
 #: libraries/Index.class.php:606 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261 libraries/mult_submits.lib.php:403
+#: libraries/config/FormDisplay.tpl.php:272 libraries/mult_submits.lib.php:403
 #: libraries/mult_submits.lib.php:417
 #: libraries/plugins/export/ExportHtmlword.class.php:630
 #: libraries/plugins/export/ExportLatex.class.php:589
@@ -196,20 +197,20 @@ msgstr "პირველადი"
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1010 libraries/tracking.lib.php:1015
 #: prefs_manage.php:140 templates/prefs_autoload.phtml:15
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "No"
 msgstr "არა"
 
 #: db_datadict.php:156 js/messages.php:443 libraries/Index.class.php:568
 #: libraries/Index.class.php:605 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261
-#: libraries/controllers/StructureController.class.php:1344
-#: libraries/controllers/StructureController.class.php:2223
-#: libraries/controllers/StructureController.class.php:2232
-#: libraries/controllers/StructureController.class.php:2237
-#: libraries/controllers/StructureController.class.php:2242
-#: libraries/controllers/StructureController.class.php:2247
+#: libraries/config/FormDisplay.tpl.php:272
+#: libraries/controllers/TableStructureController.class.php:539
+#: libraries/controllers/TableStructureController.class.php:1201
+#: libraries/controllers/TableStructureController.class.php:1210
+#: libraries/controllers/TableStructureController.class.php:1215
+#: libraries/controllers/TableStructureController.class.php:1220
+#: libraries/controllers/TableStructureController.class.php:1225
 #: libraries/mult_submits.inc.php:82 libraries/mult_submits.inc.php:178
 #: libraries/mult_submits.lib.php:339 libraries/mult_submits.lib.php:372
 #: libraries/mult_submits.lib.php:401 libraries/mult_submits.lib.php:415
@@ -218,8 +219,8 @@ msgstr "არა"
 #: libraries/plugins/export/ExportOdt.class.php:756
 #: libraries/plugins/export/ExportTexytext.class.php:567
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1077
-#: libraries/server_databases.lib.php:464
-#: libraries/server_databases.lib.php:474
+#: libraries/server_databases.lib.php:475
+#: libraries/server_databases.lib.php:485
 #: libraries/server_privileges.lib.php:2546
 #: libraries/server_privileges.lib.php:2727
 #: libraries/server_privileges.lib.php:2748
@@ -229,7 +230,7 @@ msgstr "არა"
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1008 libraries/tracking.lib.php:1013
 #: prefs_manage.php:138 templates/prefs_autoload.phtml:14
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "Yes"
 msgstr "დიახ"
 
@@ -239,7 +240,7 @@ msgstr ""
 
 #: db_export.php:37 db_tracking.php:90 export.php:382
 #: libraries/DBQbe.class.php:326
-#: libraries/controllers/StructureController.class.php:231
+#: libraries/controllers/DatabaseStructureController.class.php:170
 #: libraries/navigation/NavigationTree.class.php:897
 msgid "No tables found in database."
 msgstr ""
@@ -250,14 +251,14 @@ msgstr ""
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:26
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:120
-#: templates/structure/show_create.phtml:18
+#: templates/database/structure/show_create.phtml:18
 msgid "Tables"
 msgstr "ცხრილები"
 
 #: db_export.php:52 libraries/Menu.class.php:317 libraries/Menu.class.php:425
-#: libraries/Util.class.php:3333 libraries/Util.class.php:3343
-#: libraries/Util.class.php:3349 libraries/Util.class.php:3629
-#: libraries/Util.class.php:4327 libraries/Util.class.php:4344
+#: libraries/Util.class.php:3339 libraries/Util.class.php:3349
+#: libraries/Util.class.php:3355 libraries/Util.class.php:3635
+#: libraries/Util.class.php:4333 libraries/Util.class.php:4350
 #: libraries/central_columns.lib.php:728 libraries/config.values.php:39
 #: libraries/config.values.php:47 libraries/config.values.php:109
 #: libraries/config.values.php:115 libraries/config/setup.forms.php:323
@@ -271,7 +272,7 @@ msgstr "ცხრილები"
 #: libraries/navigation/Nodes/Node_Table.class.php:283
 #: libraries/server_privileges.lib.php:1141 libraries/tracking.lib.php:874
 #: templates/columns_definitions/table_fields_definitions.phtml:3
-#: templates/designer/table_list.phtml:28
+#: templates/database/designer/table_list.phtml:28
 msgid "Structure"
 msgstr "სტრუქტურა"
 
@@ -283,7 +284,7 @@ msgstr "სტრუქტურა"
 #: libraries/config/user_preferences.forms.php:292
 #: libraries/config/user_preferences.forms.php:297
 #: libraries/server_privileges.lib.php:1140
-#: templates/structure/display_table_stats.phtml:12
+#: templates/table/structure/display_table_stats.phtml:12
 msgid "Data"
 msgstr "მონაცემები"
 
@@ -365,10 +366,10 @@ msgstr "ნანახი ცხრილები"
 #: libraries/server_privileges.lib.php:2908
 #: libraries/server_privileges.lib.php:3145
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4346
-#: templates/structure/table_header.phtml:21
-#: templates/tbl_relation/foreign_key_row.phtml:176
-#: templates/tbl_relation/internal_relational_row.phtml:63
+#: libraries/server_privileges.lib.php:4372
+#: templates/database/structure/table_header.phtml:21
+#: templates/table/relation/foreign_key_row.phtml:176
+#: templates/table/relation/internal_relational_row.phtml:63
 msgid "Table"
 msgstr "ცხრილი"
 
@@ -385,7 +386,7 @@ msgid "Updated"
 msgstr ""
 
 #: db_tracking.php:130 js/messages.php:243 libraries/Menu.class.php:552
-#: libraries/Util.class.php:4314 libraries/config.values.php:104
+#: libraries/Util.class.php:4320 libraries/config.values.php:104
 #: libraries/rte/rte_events.lib.php:393 libraries/rte/rte_list.lib.php:101
 #: libraries/server_status_processes.lib.php:92 libraries/tracking.lib.php:279
 msgid "Status"
@@ -394,14 +395,15 @@ msgstr "სტატუსი"
 #: db_tracking.php:131 db_tracking.php:290 libraries/Index.class.php:693
 #: libraries/central_columns.lib.php:687 libraries/rte/rte_list.lib.php:74
 #: libraries/rte/rte_list.lib.php:89 libraries/rte/rte_list.lib.php:102
-#: libraries/server_databases.lib.php:398
+#: libraries/server_databases.lib.php:409
 #: libraries/server_privileges.lib.php:2372
 #: libraries/server_privileges.lib.php:3166
 #: libraries/server_privileges.lib.php:3342
 #: libraries/server_user_groups.lib.php:82
 #: libraries/server_variables.lib.php:189 libraries/tracking.lib.php:280
-#: libraries/tracking.lib.php:793 templates/structure/table_header.phtml:30
-#: templates/structure/table_structure_header.phtml:23
+#: libraries/tracking.lib.php:793
+#: templates/database/structure/table_header.phtml:30
+#: templates/table/structure/table_structure_header.phtml:23
 msgid "Action"
 msgstr "მოქმედება"
 
@@ -445,7 +447,7 @@ msgid "Untracked tables"
 msgstr ""
 
 #: db_tracking.php:305 db_tracking.php:336
-#: templates/structure/optional_action_links.phtml:17
+#: templates/table/structure/optional_action_links.phtml:17
 #, fuzzy
 msgid "Track table"
 msgstr "ცხრილის შემოწმება"
@@ -498,7 +500,7 @@ msgid "Value for the column \"%s\""
 msgstr ""
 
 #: gis_data_editor.php:146
-#: templates/gis_visualization/gis_visualization.phtml:37
+#: templates/table/gis_visualization/gis_visualization.phtml:37
 msgid "Use OpenStreetMaps as Base Layer"
 msgstr ""
 
@@ -579,35 +581,35 @@ msgstr "გეომეტრიის დამატება"
 #: libraries/display_change_password.lib.php:162
 #: libraries/display_export.lib.php:402 libraries/display_export.lib.php:408
 #: libraries/display_import.lib.php:392 libraries/index.lib.php:44
-#: libraries/insert_edit.lib.php:1546 libraries/insert_edit.lib.php:1583
+#: libraries/insert_edit.lib.php:1544 libraries/insert_edit.lib.php:1581
 #: libraries/normalization.lib.php:165 libraries/normalization.lib.php:821
 #: libraries/operations.lib.php:38 libraries/operations.lib.php:108
 #: libraries/operations.lib.php:263 libraries/operations.lib.php:306
 #: libraries/operations.lib.php:801 libraries/operations.lib.php:874
 #: libraries/operations.lib.php:923 libraries/operations.lib.php:1337
 #: libraries/operations.lib.php:1658
-#: libraries/plugins/auth/AuthenticationCookie.class.php:244
+#: libraries/plugins/auth/AuthenticationCookie.class.php:232
 #: libraries/replication_gui.lib.php:122 libraries/replication_gui.lib.php:161
 #: libraries/replication_gui.lib.php:324 libraries/replication_gui.lib.php:461
 #: libraries/replication_gui.lib.php:906 libraries/rte/rte_events.lib.php:509
-#: libraries/rte/rte_routines.lib.php:969
-#: libraries/rte/rte_routines.lib.php:1581
+#: libraries/rte/rte_routines.lib.php:1060
+#: libraries/rte/rte_routines.lib.php:1672
 #: libraries/rte/rte_triggers.lib.php:396 libraries/server_bin_log.lib.php:61
 #: libraries/server_privileges.lib.php:705
 #: libraries/server_privileges.lib.php:2106
 #: libraries/server_privileges.lib.php:2872
 #: libraries/server_privileges.lib.php:3553
-#: libraries/server_privileges.lib.php:4627
+#: libraries/server_privileges.lib.php:4653
 #: libraries/server_user_groups.lib.php:285
 #: libraries/sql_query_form.lib.php:369 libraries/sql_query_form.lib.php:429
 #: libraries/tracking.lib.php:533 libraries/tracking.lib.php:653
 #: prefs_manage.php:277 prefs_manage.php:355
 #: templates/columns_definitions/column_definitions_form.phtml:59
-#: templates/header_location.phtml:17 templates/index_form.phtml:238
+#: templates/database/create_table.phtml:21 templates/header_location.phtml:28
 #: templates/startAndNumberOfRowsPanel.phtml:14
-#: templates/structure/add_column.phtml:25
-#: templates/table/create_table.phtml:21
-#: templates/table/selection_form.phtml:75 view_create.php:275
+#: templates/table/index_form.phtml:238
+#: templates/table/search/selection_form.phtml:75
+#: templates/table/structure/add_column.phtml:25 view_create.php:275
 #: view_operations.php:106
 msgid "Go"
 msgstr "გადასვლა"
@@ -691,7 +693,7 @@ msgstr ""
 msgid "Could not load import plugins, please check your installation!"
 msgstr ""
 
-#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1466
+#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1460
 #, fuzzy, php-format
 #| msgid "Table %1$s has been created."
 msgid "Bookmark %s has been created."
@@ -726,13 +728,13 @@ msgstr ""
 msgid "Back"
 msgstr "უკან"
 
-#: index.php:148 libraries/Footer.class.php:70
+#: index.php:149 libraries/Footer.class.php:70
 #, fuzzy
 #| msgid "phpMyAdmin homepage"
 msgid "phpMyAdmin Demo Server"
 msgstr "phpMyAdmin-ის სათაო გვერდი"
 
-#: index.php:152
+#: index.php:153
 #, php-format
 msgid ""
 "You are using the demo server. You can do anything here, but please do not "
@@ -740,52 +742,52 @@ msgid ""
 "at %s."
 msgstr ""
 
-#: index.php:162
+#: index.php:163
 #, fuzzy
 #| msgid "General relation features"
 msgid "General Settings"
 msgstr "General relation features"
 
-#: index.php:190 libraries/display_change_password.lib.php:50
+#: index.php:191 libraries/display_change_password.lib.php:50
 #: libraries/display_change_password.lib.php:53 user_password.php:247
 msgid "Change password"
 msgstr "პაროლის შეცვლა"
 
-#: index.php:206
+#: index.php:207
 #, fuzzy
 #| msgid "MySQL connection collation"
 msgid "Server connection collation"
 msgstr "MySQL კავშირის კოლაცია"
 
-#: index.php:228
+#: index.php:229
 #, fuzzy
 #| msgid "Other core settings"
 msgid "Appearance Settings"
 msgstr "Other core settings"
 
-#: index.php:258 prefs_manage.php:285
+#: index.php:259 prefs_manage.php:285
 #, fuzzy
 #| msgid "Other core settings"
 msgid "More settings"
 msgstr "Other core settings"
 
-#: index.php:279
+#: index.php:280
 #, fuzzy
 #| msgid "Database for user"
 msgid "Database server"
 msgstr "მონაცემთა ბაზა მომხმარებლისთვის"
 
-#: index.php:282 libraries/plugins/auth/AuthenticationCookie.class.php:181
+#: index.php:283 libraries/plugins/auth/AuthenticationCookie.class.php:169
 msgid "Server:"
 msgstr "სერვერი:"
 
-#: index.php:286
+#: index.php:287
 #, fuzzy
 #| msgid "Server port"
 msgid "Server type:"
 msgstr "სერვერის პორტი"
 
-#: index.php:290 libraries/plugins/export/ExportLatex.class.php:212
+#: index.php:291 libraries/plugins/export/ExportLatex.class.php:212
 #: libraries/plugins/export/ExportSql.class.php:687
 #: libraries/plugins/export/ExportXml.class.php:189
 #, fuzzy
@@ -793,90 +795,90 @@ msgstr "სერვერის პორტი"
 msgid "Server version:"
 msgstr "სერვერის ვერსია"
 
-#: index.php:296
+#: index.php:297
 #, fuzzy
 #| msgid "Protocol version"
 msgid "Protocol version:"
 msgstr "ოქმის ვერსია"
 
-#: index.php:300
+#: index.php:301
 #, fuzzy
 #| msgid "User"
 msgid "User:"
 msgstr "მომხმარებელი"
 
-#: index.php:305
+#: index.php:306
 #, fuzzy
 #| msgid "Server socket"
 msgid "Server charset:"
 msgstr "Server socket"
 
-#: index.php:320
+#: index.php:321
 msgid "Web server"
 msgstr "ვებ სერვერი"
 
-#: index.php:331
+#: index.php:332
 #, fuzzy
 #| msgid "Use light version"
 msgid "Database client version:"
 msgstr "Use light version"
 
-#: index.php:335
+#: index.php:336
 #, fuzzy
 #| msgid "PHP extension"
 msgid "PHP extension:"
 msgstr "PHP-ის გაფართოება"
 
-#: index.php:349
+#: index.php:350
 #, fuzzy
 #| msgid "PHP Version"
 msgid "PHP version:"
 msgstr "PHP-ის ვერსია"
 
-#: index.php:360
+#: index.php:361
 msgid "Show PHP information"
 msgstr "PHP-ის ინფორმაციის ჩვენება"
 
-#: index.php:383
+#: index.php:384
 #, fuzzy
 #| msgid "Version information"
 msgid "Version information:"
 msgstr "ინფორმაცია ვერსიის შესახებ"
 
-#: index.php:392 libraries/Util.class.php:432 libraries/Util.class.php:495
-#: libraries/config/FormDisplay.tpl.php:151
+#: index.php:393 libraries/Util.class.php:432 libraries/Util.class.php:495
+#: libraries/config/FormDisplay.tpl.php:162
 #: libraries/display_export.lib.php:577 libraries/engines/pbxt.lib.php:162
 #: libraries/navigation/NavigationHeader.class.php:196
 #: libraries/server_variables.lib.php:160
 msgid "Documentation"
 msgstr "დოკუმენტაცია"
 
-#: index.php:399
+#: index.php:400
 msgid "Wiki"
 msgstr "ვიკი"
 
-#: index.php:408
+#: index.php:409
 msgid "Official Homepage"
 msgstr "ოფიციალური ვებგვერდი"
 
-#: index.php:415
+#: index.php:416
 #, fuzzy
 #| msgid "Attributes"
 msgid "Contribute"
 msgstr "ატრიბუტები"
 
-#: index.php:422
+#: index.php:423
 #, fuzzy
 msgid "Get support"
 msgstr "ექსპორტი"
 
-#: index.php:429
+#: index.php:430
 #, fuzzy
 #| msgid "No change"
 msgid "List of changes"
 msgstr "ცვლილების გარეშე"
 
-#: index.php:451
+#: index.php:452
 msgid ""
 "You are connected as 'root' with no password, which corresponds to the "
 "default MySQL privileged account. Your MySQL server is running with this "
@@ -884,7 +886,7 @@ msgid ""
 "by setting a password for user 'root'."
 msgstr ""
 
-#: index.php:468
+#: index.php:469
 msgid ""
 "You have enabled mbstring.func_overload in your PHP configuration. This "
 "option is incompatible with phpMyAdmin and might cause some data to be "
@@ -894,7 +896,7 @@ msgstr ""
 "პარამეტრი არაა თავსებადი phpMyAdmin-თან და შეიძლება გამოიწვიოს მონაცემების "
 "დაზიანება!"
 
-#: index.php:483
+#: index.php:484
 msgid ""
 "The mbstring PHP extension was not found and you seem to be using a "
 "multibyte charset. Without the mbstring extension phpMyAdmin is unable to "
@@ -905,7 +907,7 @@ msgstr ""
 "არ შეუძლია სტრიქონების სწორად დაყოფა რის გამოც შეიძლება მიიღოთ მოულოდნელი "
 "შედეგი."
 
-#: index.php:500
+#: index.php:501
 #, fuzzy
 #| msgid ""
 #| "r PHP parameter [a@http://php.net/manual/en/session.configuration.#ini."
@@ -923,7 +925,7 @@ msgstr ""
 "cookie validity configured in phpMyAdmin, because of this, your login will "
 "expire sooner than configured in phpMyAdmin."
 
-#: index.php:519
+#: index.php:520
 #, fuzzy
 #| msgid ""
 #| "r PHP parameter [a@http://php.net/manual/en/session.configuration.#ini."
@@ -939,11 +941,11 @@ msgstr ""
 "cookie validity configured in phpMyAdmin, because of this, your login will "
 "expire sooner than configured in phpMyAdmin."
 
-#: index.php:535
+#: index.php:536
 msgid "The configuration file now needs a secret passphrase (blowfish_secret)."
 msgstr ""
 
-#: index.php:548
+#: index.php:549
 msgid ""
 "Directory [code]config[/code], which is used by the setup script, still "
 "exists in your phpMyAdmin directory. It is strongly recommended to remove it "
@@ -951,7 +953,7 @@ msgid ""
 "may be compromised by unauthorized people downloading your configuration."
 msgstr ""
 
-#: index.php:564
+#: index.php:565
 #, fuzzy, php-format
 #| msgid ""
 #| " additional features for working with linked tables have been ctivated. "
@@ -963,19 +965,19 @@ msgstr ""
 "The additional features for working with linked tables have been "
 "deactivated. To find out why click %shere%s."
 
-#: index.php:571
+#: index.php:572
 msgid ""
 "Or alternately go to 'Operations' tab of any database to set it up there."
 msgstr ""
 
-#: index.php:620
+#: index.php:621
 #, php-format
 msgid ""
 "Your PHP MySQL library version %s differs from your MySQL server version %s. "
 "This may cause unpredictable behavior."
 msgstr ""
 
-#: index.php:648
+#: index.php:649
 #, php-format
 msgid ""
 "Server running with Suhosin. Please refer to %sdocumentation%s for possible "
@@ -1145,8 +1147,8 @@ msgstr ""
 msgid "Save & Close"
 msgstr "ფაილის სახის შენახვა"
 
-#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:404
-#: libraries/insert_edit.lib.php:1550 prefs_manage.php:361
+#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:415
+#: libraries/insert_edit.lib.php:1548 prefs_manage.php:361
 #: prefs_manage.php:372
 msgid "Reset"
 msgstr "დაბრუნება"
@@ -1191,7 +1193,7 @@ msgstr "ახალი ველის დამატება"
 msgid "Edit Index"
 msgstr "რედაქტირების რეჟიმი"
 
-#: js/messages.php:99 templates/index_form.phtml:232
+#: js/messages.php:99 templates/table/index_form.phtml:232
 #, fuzzy, php-format
 #| msgid "Add %s field(s)"
 msgid "Add %s column(s) to index"
@@ -1221,15 +1223,16 @@ msgstr "Fields enclosed by"
 msgid "Please select column(s) for the index."
 msgstr "%s ველის დამატება"
 
-#: js/messages.php:106 templates/structure/add_column.phtml:1
+#: js/messages.php:106 templates/table/structure/add_column.phtml:1
 #, fuzzy
 #| msgid "You have to add at least one field."
 msgid "You have to add at least one column."
 msgstr "You have to add at least one field."
 
-#: js/messages.php:109 libraries/insert_edit.lib.php:1548
+#: js/messages.php:109 libraries/insert_edit.lib.php:1546
 #: templates/columns_definitions/column_definitions_form.phtml:162
-#: templates/index_form.phtml:237 templates/tbl_relation/common_form.phtml:106
+#: templates/table/index_form.phtml:237
+#: templates/table/relation/common_form.phtml:106
 msgid "Preview SQL"
 msgstr ""
 
@@ -1252,7 +1255,7 @@ msgid "SQL query:"
 msgstr "SQL მოთხოვნა"
 
 #. l10n: Default label for the y-Axis of Charts
-#: js/messages.php:118 templates/tbl_chart.phtml:109
+#: js/messages.php:118 templates/table/chart/tbl_chart.phtml:109
 #, fuzzy
 #| msgid "Value"
 msgid "Y Values"
@@ -1432,7 +1435,7 @@ msgstr ""
 msgid "Bytes received"
 msgstr "მიღებულია"
 
-#: js/messages.php:169 libraries/server_status.lib.php:226
+#: js/messages.php:169 libraries/server_status.lib.php:235
 msgid "Connections"
 msgstr "კავშირები"
 
@@ -1491,12 +1494,12 @@ msgstr "%s table(s)"
 msgid "Questions"
 msgstr "სპარსული"
 
-#: js/messages.php:184 libraries/server_status.lib.php:134
+#: js/messages.php:184 libraries/server_status.lib.php:143
 msgid "Traffic"
 msgstr "ტრაფიკი"
 
 #: js/messages.php:185 libraries/Menu.class.php:586
-#: libraries/Util.class.php:4318 libraries/server_status_monitor.lib.php:257
+#: libraries/Util.class.php:4324 libraries/server_status_monitor.lib.php:257
 #, fuzzy
 #| msgid "General relation features"
 msgid "Settings"
@@ -1520,8 +1523,9 @@ msgstr ""
 #: libraries/server_status_monitor.lib.php:236
 #: libraries/server_status_processes.lib.php:308
 #: templates/columns_definitions/transformation.phtml:4
-#: templates/designer/options_panel.phtml:178
-#: templates/table/options_zoom.phtml:12 templates/table/rows_zoom.phtml:26
+#: templates/database/designer/options_panel.phtml:178
+#: templates/table/search/options_zoom.phtml:12
+#: templates/table/search/rows_zoom.phtml:26
 msgid "None"
 msgstr "არაა"
 
@@ -1828,8 +1832,8 @@ msgstr ""
 
 #: js/messages.php:270 libraries/Menu.class.php:352
 #: libraries/Menu.class.php:455 libraries/Menu.class.php:582
-#: libraries/Util.class.php:4317 libraries/Util.class.php:4332
-#: libraries/Util.class.php:4349 libraries/config/messages.inc.php:258
+#: libraries/Util.class.php:4323 libraries/Util.class.php:4338
+#: libraries/Util.class.php:4355 libraries/config/messages.inc.php:258
 #: libraries/display_import.lib.php:105
 #: libraries/server_status_monitor.lib.php:318 prefs_manage.php:238
 #: setup/frames/menu.inc.php:26
@@ -1899,13 +1903,13 @@ msgid "Formatting SQL..."
 msgstr ""
 
 #: js/messages.php:293 libraries/server_variables.lib.php:157
-#: templates/designer/aggregate_query_panel.phtml:63
-#: templates/designer/delete_relation_panel.phtml:28
-#: templates/designer/having_query_panel.phtml:117
-#: templates/designer/new_relation_panel.phtml:88
-#: templates/designer/options_panel.phtml:253
-#: templates/designer/rename_to_panel.phtml:45
-#: templates/designer/where_query_panel.phtml:83
+#: templates/database/designer/aggregate_query_panel.phtml:63
+#: templates/database/designer/delete_relation_panel.phtml:28
+#: templates/database/designer/having_query_panel.phtml:117
+#: templates/database/designer/new_relation_panel.phtml:88
+#: templates/database/designer/options_panel.phtml:253
+#: templates/database/designer/rename_to_panel.phtml:45
+#: templates/database/designer/where_query_panel.phtml:83
 msgid "Cancel"
 msgstr "გაუქმება"
 
@@ -1915,7 +1919,7 @@ msgstr "გაუქმება"
 msgid "Page-related settings"
 msgstr "Other core settings"
 
-#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:402
+#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:413
 msgid "Apply"
 msgstr ""
 
@@ -1954,8 +1958,8 @@ msgstr ""
 msgid "Error text: %s"
 msgstr ""
 
-#: js/messages.php:307 libraries/db_common.inc.php:68
-#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:450
+#: js/messages.php:307 libraries/db_common.inc.php:69
+#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:461
 msgid "No databases selected."
 msgstr ""
 
@@ -1967,12 +1971,13 @@ msgstr ""
 msgid "Adding Primary Key"
 msgstr ""
 
-#: js/messages.php:310 templates/designer/aggregate_query_panel.phtml:59
-#: templates/designer/having_query_panel.phtml:113
-#: templates/designer/new_relation_panel.phtml:87
-#: templates/designer/options_panel.phtml:252
-#: templates/designer/rename_to_panel.phtml:41
-#: templates/designer/where_query_panel.phtml:82
+#: js/messages.php:310
+#: templates/database/designer/aggregate_query_panel.phtml:59
+#: templates/database/designer/having_query_panel.phtml:113
+#: templates/database/designer/new_relation_panel.phtml:87
+#: templates/database/designer/options_panel.phtml:252
+#: templates/database/designer/rename_to_panel.phtml:41
+#: templates/database/designer/where_query_panel.phtml:82
 msgid "OK"
 msgstr "OK"
 
@@ -1998,7 +2003,7 @@ msgstr "Copy database to"
 msgid "Changing Charset"
 msgstr "სიმბოლოთა ნაკრები"
 
-#: js/messages.php:320 libraries/Util.class.php:3217
+#: js/messages.php:320 libraries/Util.class.php:3223
 #, fuzzy
 #| msgid "Disable foreign key checks"
 msgid "Enable foreign key checks"
@@ -2046,20 +2051,21 @@ msgstr ""
 #: js/messages.php:334 libraries/DisplayResults.class.php:4834
 #: libraries/DisplayResults.class.php:5092 libraries/Menu.class.php:344
 #: libraries/Menu.class.php:446 libraries/Menu.class.php:578
-#: libraries/Util.class.php:3636 libraries/Util.class.php:3637
-#: libraries/Util.class.php:4316 libraries/Util.class.php:4331
-#: libraries/Util.class.php:4348 libraries/config/messages.inc.php:252
+#: libraries/Util.class.php:3642 libraries/Util.class.php:3643
+#: libraries/Util.class.php:4322 libraries/Util.class.php:4337
+#: libraries/Util.class.php:4354 libraries/config/messages.inc.php:252
 #: libraries/display_export.lib.php:173 libraries/rte/rte_list.lib.php:146
 #: libraries/server_privileges.lib.php:2211
 #: libraries/server_privileges.lib.php:2290
 #: libraries/server_privileges.lib.php:2632
 #: libraries/server_privileges.lib.php:3356
 #: libraries/server_status_monitor.lib.php:322 prefs_manage.php:303
-#: setup/frames/menu.inc.php:27 templates/structure/check_all_tables.phtml:11
+#: setup/frames/menu.inc.php:27
+#: templates/database/structure/check_all_tables.phtml:11
 msgid "Export"
 msgstr "ექსპორტი"
 
-#: js/messages.php:337 libraries/rte/rte_routines.lib.php:652
+#: js/messages.php:337 libraries/rte/rte_routines.lib.php:743
 msgid "ENUM/SET editor"
 msgstr ""
 
@@ -2103,7 +2109,7 @@ msgstr "SQL Query box"
 #: libraries/Console.class.php:214 libraries/DisplayResults.class.php:3474
 #: libraries/DisplayResults.class.php:4818 libraries/Index.class.php:723
 #: libraries/Util.class.php:706 libraries/Util.class.php:1202
-#: libraries/Util.class.php:3634 libraries/Util.class.php:3635
+#: libraries/Util.class.php:3640 libraries/Util.class.php:3641
 #: libraries/central_columns.lib.php:851
 #: libraries/central_columns.lib.php:1193
 #: libraries/config/messages.inc.php:892
@@ -2121,7 +2127,7 @@ msgstr "რედაქტირება"
 #: libraries/server_user_groups.lib.php:129
 #: libraries/sql_query_form.lib.php:416 libraries/tracking.lib.php:477
 #: setup/frames/index.inc.php:183 setup/frames/index.inc.php:291
-#: templates/designer/delete_relation_panel.phtml:27
+#: templates/database/designer/delete_relation_panel.phtml:27
 msgid "Delete"
 msgstr "წაშლა"
 
@@ -2297,11 +2303,11 @@ msgid "No dependencies selected!"
 msgstr ""
 
 #: js/messages.php:394 libraries/central_columns.lib.php:1214
-#: libraries/insert_edit.lib.php:1458 libraries/server_variables.lib.php:155
+#: libraries/insert_edit.lib.php:1456 libraries/server_variables.lib.php:155
 #: setup/frames/config.inc.php:42 setup/frames/index.inc.php:279
 #: templates/columns_definitions/column_definitions_form.phtml:165
-#: templates/gis_visualization/gis_visualization.phtml:48
-#: templates/tbl_relation/common_form.phtml:107
+#: templates/table/gis_visualization/gis_visualization.phtml:48
+#: templates/table/relation/common_form.phtml:107
 msgid "Save"
 msgstr "შენახვა"
 
@@ -2396,8 +2402,8 @@ msgid "Data point content"
 msgstr "Data pointer size"
 
 #: js/messages.php:430 js/messages.php:562 js/messages.php:579
-#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2573
-#: templates/index_form.phtml:154 templates/index_form.phtml:194
+#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2571
+#: templates/table/index_form.phtml:154 templates/table/index_form.phtml:194
 msgid "Ignore"
 msgstr "იგნორირება"
 
@@ -2458,8 +2464,8 @@ msgstr ""
 msgid "Please select the primary key or a unique key!"
 msgstr ""
 
-#: js/messages.php:457 templates/designer/side_menu.phtml:91
-#: templates/designer/side_menu.phtml:94
+#: js/messages.php:457 templates/database/designer/side_menu.phtml:91
+#: templates/database/designer/side_menu.phtml:94
 #, fuzzy
 #| msgid "Choose field to display"
 msgid "Choose column to display"
@@ -2477,22 +2483,22 @@ msgstr ""
 msgid "Page name"
 msgstr "გვერდის ნომერი:"
 
-#: js/messages.php:463 templates/designer/side_menu.phtml:56
-#: templates/designer/side_menu.phtml:59
+#: js/messages.php:463 templates/database/designer/side_menu.phtml:56
+#: templates/database/designer/side_menu.phtml:59
 #, fuzzy
 #| msgid "Select All"
 msgid "Save page"
 msgstr "ყველას მონიშნვა"
 
-#: js/messages.php:464 templates/designer/side_menu.phtml:63
-#: templates/designer/side_menu.phtml:66
+#: js/messages.php:464 templates/database/designer/side_menu.phtml:63
+#: templates/database/designer/side_menu.phtml:66
 #, fuzzy
 #| msgid "Select All"
 msgid "Save page as"
 msgstr "ყველას მონიშნვა"
 
-#: js/messages.php:465 templates/designer/side_menu.phtml:49
-#: templates/designer/side_menu.phtml:52
+#: js/messages.php:465 templates/database/designer/side_menu.phtml:49
+#: templates/database/designer/side_menu.phtml:52
 #, fuzzy
 #| msgctxt "PDF"
 #| msgid "page"
@@ -2505,7 +2511,7 @@ msgstr "pages"
 msgid "Delete page"
 msgstr "ყველას მონიშნვა"
 
-#: js/messages.php:467 templates/designer/side_menu.phtml:10
+#: js/messages.php:467 templates/database/designer/side_menu.phtml:10
 msgid "Untitled"
 msgstr ""
 
@@ -2630,7 +2636,7 @@ msgstr "საწყისი მდებარეობა"
 msgid "cancel"
 msgstr "გაუქმება"
 
-#: js/messages.php:499 libraries/server_status.lib.php:271
+#: js/messages.php:499 libraries/server_status.lib.php:280
 msgid "Aborted"
 msgstr "შეწყვეტილია"
 
@@ -3317,7 +3323,7 @@ msgstr "პორტის ნომერი არასწორია"
 
 #: js/messages.php:793 libraries/Message.class.php:199
 #: libraries/Util.class.php:654 libraries/core.lib.php:245
-#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1172
+#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1170
 #: tbl_operations.php:229 view_operations.php:63
 msgid "Error"
 msgstr "შეცდომა"
@@ -3377,8 +3383,8 @@ msgstr "წამში"
 msgid "per minute"
 msgstr "წუთში"
 
-#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:143
-#: libraries/server_status.lib.php:228
+#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:152
+#: libraries/server_status.lib.php:237
 #: libraries/server_status_queries.lib.php:98
 msgid "per hour"
 msgstr "საათში"
@@ -3396,7 +3402,7 @@ msgstr ""
 msgid "Wrong permissions on configuration file, should not be world writable!"
 msgstr ""
 
-#: libraries/Config.class.php:1799
+#: libraries/Config.class.php:1801
 msgid "Font size"
 msgstr "შრიფტის ზომა"
 
@@ -3426,10 +3432,10 @@ msgstr "მოთხოვნაში"
 #: libraries/server_privileges.lib.php:2890
 #: libraries/server_privileges.lib.php:3144
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4332
+#: libraries/server_privileges.lib.php:4358
 #: libraries/server_status_processes.lib.php:80
-#: templates/tbl_relation/foreign_key_row.phtml:165
-#: templates/tbl_relation/internal_relational_row.phtml:55
+#: templates/table/relation/foreign_key_row.phtml:165
+#: templates/table/relation/internal_relational_row.phtml:55
 msgid "Database"
 msgstr "მონაცემთა ბაზა"
 
@@ -3536,11 +3542,11 @@ msgstr "SQL history"
 #: libraries/plugins/import/ImportMediawiki.class.php:60
 #: libraries/plugins/import/ImportOds.class.php:59
 #: libraries/plugins/import/ImportShp.class.php:57
-#: libraries/plugins/import/ImportSql.class.php:148
+#: libraries/plugins/import/ImportSql.class.php:51
 #: libraries/plugins/import/ImportXml.class.php:58
-#: libraries/rte/rte_routines.lib.php:833 templates/index_form.phtml:49
-#: templates/structure/row_stats_table.phtml:20
-#: templates/table/options.phtml:2
+#: libraries/rte/rte_routines.lib.php:924 templates/table/index_form.phtml:49
+#: templates/table/search/options.phtml:2
+#: templates/table/structure/row_stats_table.phtml:20
 msgid "Options"
 msgstr "პარამეტრები"
 
@@ -3583,7 +3589,8 @@ msgstr "კლებადობით"
 msgid "Order:"
 msgstr ""
 
-#: libraries/Console.class.php:289 templates/table/replace_preview.phtml:17
+#: libraries/Console.class.php:289
+#: templates/table/search/replace_preview.phtml:17
 #, fuzzy
 #| msgid "Column"
 msgid "Count"
@@ -3705,9 +3712,9 @@ msgstr ""
 #: libraries/operations.lib.php:794 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:191
-#: templates/structure/sortable_header.phtml:21
-#: templates/structure/sortable_header.phtml:38
-#: templates/table/options.phtml:68
+#: templates/database/structure/sortable_header.phtml:21
+#: templates/database/structure/sortable_header.phtml:38
+#: templates/table/search/options.phtml:68
 msgid "Ascending"
 msgstr "ზრდადობით"
 
@@ -3717,13 +3724,14 @@ msgstr "ზრდადობით"
 #: libraries/operations.lib.php:797 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:188
-#: templates/structure/sortable_header.phtml:26
-#: templates/structure/sortable_header.phtml:43
-#: templates/table/options.phtml:69
+#: templates/database/structure/sortable_header.phtml:26
+#: templates/database/structure/sortable_header.phtml:43
+#: templates/table/search/options.phtml:69
 msgid "Descending"
 msgstr "კლებადობით"
 
-#: libraries/DBQbe.class.php:467 templates/table/search_and_replace.phtml:6
+#: libraries/DBQbe.class.php:467
+#: templates/table/search/search_and_replace.phtml:6
 #, fuzzy
 #| msgid "Column"
 msgid "Column:"
@@ -3910,12 +3918,12 @@ msgstr[0] "%s match(es) inside table <i>%s</i>"
 msgstr[1] "%s match(es) inside table <i>%s</i>"
 
 #: libraries/DbSearch.class.php:354 libraries/Menu.class.php:311
-#: libraries/Util.class.php:3337 libraries/Util.class.php:3347
-#: libraries/Util.class.php:3623 libraries/Util.class.php:3624
-#: libraries/Util.class.php:4343 libraries/config.values.php:43
+#: libraries/Util.class.php:3343 libraries/Util.class.php:3353
+#: libraries/Util.class.php:3629 libraries/Util.class.php:3630
+#: libraries/Util.class.php:4349 libraries/config.values.php:43
 #: libraries/config.values.php:51 libraries/config.values.php:119
 #: libraries/navigation/Nodes/Node_Table.class.php:295
-#: templates/structure/check_all_table_column.phtml:5
+#: templates/table/structure/check_all_table_column.phtml:5
 msgid "Browse"
 msgstr "არჩევა"
 
@@ -3934,7 +3942,8 @@ msgstr "მონაცემთა ბაზაში ძებნა"
 msgid "Words or values to search for (wildcard: \"%\"):"
 msgstr "Word(s) or value(s) to search for (wildcard: \"%\"):"
 
-#: libraries/DbSearch.class.php:401 templates/table/search_and_replace.phtml:1
+#: libraries/DbSearch.class.php:401
+#: templates/table/search/search_and_replace.phtml:1
 msgid "Find:"
 msgstr "ძებნა:"
 
@@ -3987,16 +3996,16 @@ msgstr "ფაილები"
 msgid "Search this table"
 msgstr "მონაცემთა ბაზაში ძებნა"
 
-#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2532
-#: libraries/Util.class.php:2535
+#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2538
+#: libraries/Util.class.php:2541
 #, fuzzy
 #| msgid "Begin"
 msgctxt "First page"
 msgid "Begin"
 msgstr "დასაწყისი"
 
-#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2533
-#: libraries/Util.class.php:2536 libraries/server_bin_log.lib.php:170
+#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2539
+#: libraries/Util.class.php:2542 libraries/server_bin_log.lib.php:170
 #: libraries/server_bin_log.lib.php:172
 #, fuzzy
 #| msgid "Previous"
@@ -4004,8 +4013,8 @@ msgctxt "Previous page"
 msgid "Previous"
 msgstr "წინა"
 
-#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2564
-#: libraries/Util.class.php:2574 libraries/server_bin_log.lib.php:204
+#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2570
+#: libraries/Util.class.php:2580 libraries/server_bin_log.lib.php:204
 #: libraries/server_bin_log.lib.php:206
 #, fuzzy
 #| msgid "Next"
@@ -4013,8 +4022,8 @@ msgctxt "Next page"
 msgid "Next"
 msgstr "შემდეგი"
 
-#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2565
-#: libraries/Util.class.php:2575
+#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2571
+#: libraries/Util.class.php:2581
 #, fuzzy
 #| msgid "End"
 msgctxt "Last page"
@@ -4103,9 +4112,9 @@ msgid "May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]."
 msgstr "შეიძლება იყოს მიახლოებითი. იხილეთ [doc@faq3-11]FAQ 3.11[/doc]"
 
 #: libraries/DisplayResults.class.php:4332 libraries/Message.class.php:180
-#: libraries/controllers/TableRelationController.class.php:258
+#: libraries/controllers/TableRelationController.class.php:259
 #: libraries/controllers/TableSearchController.class.php:655
-#: libraries/rte/rte_routines.lib.php:1332 libraries/sql_query_form.lib.php:89
+#: libraries/rte/rte_routines.lib.php:1423 libraries/sql_query_form.lib.php:89
 #: tbl_operations.php:227 tbl_row_action.php:138 view_operations.php:62
 #, fuzzy
 #| msgid "%s databases have been dropped successfully."
@@ -4113,7 +4122,7 @@ msgid "Your SQL query has been executed successfully."
 msgstr "%s databases have been dropped successfully."
 
 #: libraries/DisplayResults.class.php:4660
-#: libraries/controllers/StructureController.class.php:629
+#: libraries/controllers/DatabaseStructureController.class.php:564
 #, php-format
 msgid ""
 "This view has at least this number of rows. Please refer to %sdocumentation"
@@ -4136,34 +4145,34 @@ msgstr ""
 msgid "%d total"
 msgstr "სულ"
 
-#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1318
+#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1312
 #, fuzzy, php-format
 #| msgid "Query took %01.4f sec"
 msgid "Query took %01.4f seconds."
 msgstr "მოთხოვნას დასჭირდა %01.4f წმ"
 
 #: libraries/DisplayResults.class.php:4807
-#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4767
-#: libraries/Util.class.php:4773 libraries/mult_submits.inc.php:50
-#: templates/structure/check_all_tables.phtml:2
-#: templates/structure/check_all_tables.phtml:9
+#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4773
+#: libraries/Util.class.php:4779 libraries/mult_submits.inc.php:50
+#: templates/database/structure/check_all_tables.phtml:2
+#: templates/database/structure/check_all_tables.phtml:9
 msgid "With selected:"
 msgstr ""
 
 #: libraries/DisplayResults.class.php:4811
-#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4769
-#: libraries/Util.class.php:4770 libraries/server_privileges.lib.php:1174
+#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4775
+#: libraries/Util.class.php:4776 libraries/server_privileges.lib.php:1174
 #: libraries/server_privileges.lib.php:1175
 #: libraries/server_privileges.lib.php:1387
 #: libraries/server_user_groups.lib.php:231
-#: templates/structure/check_all_tables.phtml:3
-#: templates/structure/check_all_tables.phtml:4
+#: templates/database/structure/check_all_tables.phtml:3
+#: templates/database/structure/check_all_tables.phtml:4
 msgid "Check All"
 msgstr "ყველას შემოწმება"
 
 #: libraries/DisplayResults.class.php:4985 libraries/Header.class.php:383
-#: templates/structure/optional_action_links.phtml:1
-#: templates/structure/print_view_data_dictionary_link.phtml:3
+#: templates/database/structure/print_view_data_dictionary_link.phtml:3
+#: templates/table/structure/optional_action_links.phtml:1
 msgid "Print view"
 msgstr "ხედის ამობეჭდვა"
 
@@ -4171,7 +4180,8 @@ msgstr "ხედის ამობეჭდვა"
 msgid "Query results operations"
 msgstr ""
 
-#: libraries/DisplayResults.class.php:5105 templates/tbl_chart.phtml:12
+#: libraries/DisplayResults.class.php:5105
+#: templates/table/chart/tbl_chart.phtml:12
 #, fuzzy
 #| msgid "Display PDF schema"
 msgid "Display chart"
@@ -4272,7 +4282,7 @@ msgid "Click on the bar to scroll to top of page"
 msgstr ""
 
 #: libraries/Header.class.php:749
-#: libraries/plugins/auth/AuthenticationCookie.class.php:152
+#: libraries/plugins/auth/AuthenticationCookie.class.php:140
 msgid "Javascript must be enabled past this point!"
 msgstr ""
 
@@ -4294,11 +4304,11 @@ msgid "Keyname"
 msgstr ""
 
 #: libraries/Index.class.php:697
-#: libraries/controllers/StructureController.class.php:1962
-#: libraries/controllers/StructureController.class.php:1967
+#: libraries/controllers/TableStructureController.class.php:953
+#: libraries/controllers/TableStructureController.class.php:958
 #: libraries/tracking.lib.php:973
 #: templates/columns_definitions/column_indexes.phtml:11
-#: templates/structure/check_all_table_column.phtml:26
+#: templates/table/structure/check_all_table_column.phtml:26
 msgid "Unique"
 msgstr "უნიკალური"
 
@@ -4317,16 +4327,17 @@ msgstr "Cardinality"
 #: libraries/server_collations.lib.php:35 libraries/tracking.lib.php:881
 #: libraries/tracking.lib.php:977
 #: templates/columns_definitions/table_fields_definitions.phtml:33
-#: templates/structure/row_stats_table.phtml:31
-#: templates/structure/table_header.phtml:55
-#: templates/structure/table_structure_header.phtml:7
-#: templates/table/table_header.phtml:8
+#: templates/database/structure/table_header.phtml:55
+#: templates/table/search/table_header.phtml:8
+#: templates/table/structure/row_stats_table.phtml:31
+#: templates/table/structure/table_structure_header.phtml:7
 msgid "Collation"
 msgstr "კოლაცია"
 
 #: libraries/Index.class.php:703 libraries/rte/rte_events.lib.php:496
-#: libraries/rte/rte_routines.lib.php:956 libraries/tracking.lib.php:885
-#: libraries/tracking.lib.php:979 templates/structure/table_header.phtml:84
+#: libraries/rte/rte_routines.lib.php:1047 libraries/tracking.lib.php:885
+#: libraries/tracking.lib.php:979
+#: templates/database/structure/table_header.phtml:84
 msgid "Comment"
 msgstr "კომენტარი"
 
@@ -4339,15 +4350,15 @@ msgstr ""
 msgid "Index %s has been dropped."
 msgstr ""
 
-#: libraries/Index.class.php:757 libraries/Util.class.php:3630
-#: libraries/Util.class.php:3631
-#: libraries/controllers/StructureController.class.php:1958
-#: libraries/controllers/StructureController.class.php:1959
+#: libraries/Index.class.php:757 libraries/Util.class.php:3636
+#: libraries/Util.class.php:3637
+#: libraries/controllers/TableStructureController.class.php:949
+#: libraries/controllers/TableStructureController.class.php:950
 #: libraries/operations.lib.php:1607 libraries/rte/rte_list.lib.php:150
 #: libraries/server_databases.lib.php:146
-#: templates/structure/check_all_table_column.phtml:15
-#: templates/structure/check_all_tables.phtml:16
-#: templates/tbl_relation/foreign_key_row.phtml:93
+#: templates/database/structure/check_all_tables.phtml:16
+#: templates/table/relation/foreign_key_row.phtml:93
+#: templates/table/structure/check_all_table_column.phtml:15
 msgid "Drop"
 msgstr ""
 
@@ -4376,16 +4387,16 @@ msgstr "სერვერი"
 #: libraries/Menu.class.php:248
 #: libraries/navigation/Nodes/Node_View.class.php:32
 #: libraries/tbl_info.inc.php:63
-#: templates/structure/structure_table_row.phtml:97
-#: templates/structure/structure_table_row.phtml:159
+#: templates/database/structure/structure_table_row.phtml:97
+#: templates/database/structure/structure_table_row.phtml:159
 msgid "View"
 msgstr "ხედო"
 
 #: libraries/Menu.class.php:325 libraries/Menu.class.php:429
-#: libraries/Menu.class.php:548 libraries/Util.class.php:3334
-#: libraries/Util.class.php:3344 libraries/Util.class.php:3350
-#: libraries/Util.class.php:4313 libraries/Util.class.php:4328
-#: libraries/Util.class.php:4345 libraries/config.values.php:40
+#: libraries/Menu.class.php:548 libraries/Util.class.php:3340
+#: libraries/Util.class.php:3350 libraries/Util.class.php:3356
+#: libraries/Util.class.php:4319 libraries/Util.class.php:4334
+#: libraries/Util.class.php:4351 libraries/config.values.php:40
 #: libraries/config.values.php:48 libraries/config.values.php:110
 #: libraries/config.values.php:116 libraries/config/messages.inc.php:321
 #: libraries/navigation/Nodes/Node_Table.class.php:292
@@ -4393,19 +4404,19 @@ msgid "SQL"
 msgstr "SQL"
 
 #: libraries/Menu.class.php:328 libraries/Menu.class.php:432
-#: libraries/Util.class.php:3335 libraries/Util.class.php:3345
-#: libraries/Util.class.php:3351 libraries/Util.class.php:3625
-#: libraries/Util.class.php:3626 libraries/Util.class.php:4329
-#: libraries/Util.class.php:4346 libraries/config.values.php:41
+#: libraries/Util.class.php:3341 libraries/Util.class.php:3351
+#: libraries/Util.class.php:3357 libraries/Util.class.php:3631
+#: libraries/Util.class.php:3632 libraries/Util.class.php:4335
+#: libraries/Util.class.php:4352 libraries/config.values.php:41
 #: libraries/config.values.php:49 libraries/config.values.php:111
 #: libraries/config.values.php:117
 #: libraries/navigation/Nodes/Node_Table.class.php:286
 msgid "Search"
 msgstr "ძებნა"
 
-#: libraries/Menu.class.php:338 libraries/Util.class.php:3336
-#: libraries/Util.class.php:3346 libraries/Util.class.php:3627
-#: libraries/Util.class.php:3628 libraries/Util.class.php:4347
+#: libraries/Menu.class.php:338 libraries/Util.class.php:3342
+#: libraries/Util.class.php:3352 libraries/Util.class.php:3633
+#: libraries/Util.class.php:3634 libraries/Util.class.php:4353
 #: libraries/config.values.php:42 libraries/config.values.php:50
 #: libraries/config.values.php:118
 #: libraries/navigation/Nodes/Node_Table.class.php:289
@@ -4414,30 +4425,30 @@ msgid "Insert"
 msgstr "ჩასმა"
 
 #: libraries/Menu.class.php:362 libraries/Menu.class.php:467
-#: libraries/Util.class.php:4334 libraries/Util.class.php:4350
+#: libraries/Util.class.php:4340 libraries/Util.class.php:4356
 #: libraries/config.values.php:106 libraries/server_common.lib.php:51
 #: libraries/server_privileges.lib.php:2370
 #: libraries/server_privileges.lib.php:3158
-#: libraries/server_privileges.lib.php:4221
+#: libraries/server_privileges.lib.php:4247
 msgid "Privileges"
 msgstr "პრივილეგიები"
 
 #: libraries/Menu.class.php:371 libraries/Menu.class.php:379
-#: libraries/Menu.class.php:459 libraries/Util.class.php:3338
-#: libraries/Util.class.php:3352 libraries/Util.class.php:4333
-#: libraries/Util.class.php:4351 libraries/config.values.php:112
+#: libraries/Menu.class.php:459 libraries/Util.class.php:3344
+#: libraries/Util.class.php:3358 libraries/Util.class.php:4339
+#: libraries/Util.class.php:4357 libraries/config.values.php:112
 #: view_operations.php:92
 msgid "Operations"
 msgstr "მოქმედებები"
 
 #: libraries/Menu.class.php:384 libraries/Menu.class.php:492
-#: libraries/Util.class.php:4338 libraries/Util.class.php:4352
+#: libraries/Util.class.php:4344 libraries/Util.class.php:4358
 #: libraries/relation.lib.php:255
 msgid "Tracking"
 msgstr ""
 
 #: libraries/Menu.class.php:397 libraries/Menu.class.php:486
-#: libraries/Util.class.php:4337 libraries/Util.class.php:4353
+#: libraries/Util.class.php:4343 libraries/Util.class.php:4359
 #: libraries/navigation/Nodes/Node_Trigger_Container.class.php:24
 #: libraries/plugins/export/ExportHtmlword.class.php:557
 #: libraries/plugins/export/ExportOdt.class.php:685
@@ -4454,16 +4465,16 @@ msgstr "ტრიგერები"
 msgid "Database seems to be empty!"
 msgstr ""
 
-#: libraries/Menu.class.php:439 libraries/Util.class.php:4330
+#: libraries/Menu.class.php:439 libraries/Util.class.php:4336
 msgid "Query"
 msgstr "მოთხოვნა"
 
-#: libraries/Menu.class.php:472 libraries/Util.class.php:4335
+#: libraries/Menu.class.php:472 libraries/Util.class.php:4341
 #: libraries/rte/rte_words.lib.php:36
 msgid "Routines"
 msgstr "Routines"
 
-#: libraries/Menu.class.php:479 libraries/Util.class.php:4336
+#: libraries/Menu.class.php:479 libraries/Util.class.php:4342
 #: libraries/navigation/Nodes/Node_Event_Container.class.php:26
 #: libraries/plugins/export/ExportSql.class.php:940
 #: libraries/plugins/export/ExportXml.class.php:107
@@ -4471,22 +4482,22 @@ msgstr "Routines"
 msgid "Events"
 msgstr "მოვლენები"
 
-#: libraries/Menu.class.php:498 libraries/Util.class.php:4339
+#: libraries/Menu.class.php:498 libraries/Util.class.php:4345
 msgid "Designer"
 msgstr "შემქნელი"
 
-#: libraries/Menu.class.php:507 libraries/Util.class.php:4340
-#: templates/structure/check_all_tables.phtml:35
+#: libraries/Menu.class.php:507 libraries/Util.class.php:4346
+#: templates/database/structure/check_all_tables.phtml:35
 #, fuzzy
 #| msgid "CHAR textarea columns"
 msgid "Central columns"
 msgstr "CHAR textarea columns"
 
-#: libraries/Menu.class.php:544 libraries/Util.class.php:4312
+#: libraries/Menu.class.php:544 libraries/Util.class.php:4318
 #: libraries/config.values.php:103 libraries/config/messages.inc.php:266
 #: libraries/config/messages.inc.php:341
 #: libraries/navigation/NavigationTree.class.php:1239
-#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4332
+#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4358
 msgid "Databases"
 msgstr "მონაცემთა ბაზები"
 
@@ -4497,34 +4508,34 @@ msgid "User accounts"
 msgstr "მომხმარებელი"
 
 #: libraries/Menu.class.php:595 libraries/ServerStatusData.class.php:121
-#: libraries/Util.class.php:4319 libraries/server_common.lib.php:36
+#: libraries/Util.class.php:4325 libraries/server_common.lib.php:36
 msgid "Binary log"
 msgstr "ბინარული ჟურნალი"
 
 #: libraries/Menu.class.php:601 libraries/ServerStatusData.class.php:126
-#: libraries/Util.class.php:4320 libraries/server_common.lib.php:42
-#: templates/structure/body_for_table_summary.phtml:10
-#: templates/structure/table_header.phtml:27
+#: libraries/Util.class.php:4326 libraries/server_common.lib.php:42
+#: templates/database/structure/body_for_table_summary.phtml:10
+#: templates/database/structure/table_header.phtml:27
 msgid "Replication"
 msgstr "რეპლიკაცია"
 
 #: libraries/Menu.class.php:606 libraries/ServerStatusData.class.php:193
-#: libraries/Util.class.php:4321 libraries/config.values.php:105
+#: libraries/Util.class.php:4327 libraries/config.values.php:105
 #: libraries/server_engines.lib.php:108 libraries/server_engines.lib.php:112
 #: libraries/sql_query_form.lib.php:421
 msgid "Variables"
 msgstr "ცვლადები"
 
-#: libraries/Menu.class.php:610 libraries/Util.class.php:4322
+#: libraries/Menu.class.php:610 libraries/Util.class.php:4328
 msgid "Charsets"
 msgstr "სიმბოლოთა ნაკრებები"
 
-#: libraries/Menu.class.php:615 libraries/Util.class.php:4323
+#: libraries/Menu.class.php:615 libraries/Util.class.php:4329
 #: libraries/server_common.lib.php:33 libraries/server_plugins.lib.php:27
 msgid "Plugins"
 msgstr ""
 
-#: libraries/Menu.class.php:626 libraries/Util.class.php:4324
+#: libraries/Menu.class.php:626 libraries/Util.class.php:4330
 msgid "Engines"
 msgstr "ძრავები"
 
@@ -4552,7 +4563,7 @@ msgid_plural "%1$d rows inserted."
 msgstr[0] "ჩაისვა %1$d სტრიქონი."
 msgstr[1] "ჩაისვა %1$d სტრიქონი."
 
-#: libraries/PDF.class.php:70 libraries/Util.class.php:2521
+#: libraries/PDF.class.php:70 libraries/Util.class.php:2527
 #: libraries/browse_foreigners.lib.php:327
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:865
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:890
@@ -4579,7 +4590,7 @@ msgid "Could not save favorite table!"
 msgstr "კონფიგურაციის შენახვა ან ჩატვირთვა ვერ მოხერხდა"
 
 #: libraries/RecentFavoriteTable.class.php:212
-#: templates/structure/favorite_anchor.phtml:12
+#: templates/database/structure/favorite_anchor.phtml:12
 #, fuzzy
 #| msgid "Rename database to"
 msgid "Remove from Favorites"
@@ -4766,7 +4777,7 @@ msgid ""
 msgstr ""
 
 #: libraries/StorageEngine.class.php:373
-#: templates/structure/body_for_table_summary.phtml:50
+#: templates/database/structure/body_for_table_summary.phtml:50
 #, php-format
 msgid "%s is the default storage engine on this MySQL server."
 msgstr ""
@@ -5194,10 +5205,10 @@ msgstr ""
 
 #: libraries/Util.class.php:726 libraries/rte/rte_events.lib.php:110
 #: libraries/rte/rte_events.lib.php:119 libraries/rte/rte_events.lib.php:150
-#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:153
-#: libraries/rte/rte_routines.lib.php:162
-#: libraries/rte/rte_routines.lib.php:235
-#: libraries/rte/rte_routines.lib.php:1366
+#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:223
+#: libraries/rte/rte_routines.lib.php:250
+#: libraries/rte/rte_routines.lib.php:372
+#: libraries/rte/rte_routines.lib.php:1457
 #: libraries/rte/rte_triggers.lib.php:86 libraries/rte/rte_triggers.lib.php:95
 #: libraries/rte/rte_triggers.lib.php:127
 msgid "MySQL said: "
@@ -5243,80 +5254,83 @@ msgstr "კვი"
 msgid "%B %d, %Y at %I:%M %p"
 msgstr "%B %d, %Y, %I:%M %p"
 
-#: libraries/Util.class.php:2019
+#: libraries/Util.class.php:2025
 #, php-format
 msgid "%s days, %s hours, %s minutes and %s seconds"
 msgstr "%s დღე, %s საათი, %s წუთი და %s წამი"
 
-#: libraries/Util.class.php:2112
+#: libraries/Util.class.php:2118
 #, fuzzy
 #| msgid "Routines"
 msgid "Missing parameter:"
 msgstr "Routines"
 
-#: libraries/Util.class.php:2645
+#: libraries/Util.class.php:2651
 #, php-format
 msgid "Jump to database \"%s\"."
 msgstr ""
 
-#: libraries/Util.class.php:2670
+#: libraries/Util.class.php:2676
 #, php-format
 msgid "The %s functionality is affected by a known bug, see %s"
 msgstr ""
 
-#: libraries/Util.class.php:2881
+#: libraries/Util.class.php:2887
 msgid "Click to toggle"
 msgstr ""
 
-#: libraries/Util.class.php:3542 prefs_manage.php:248
+#: libraries/Util.class.php:3548 prefs_manage.php:248
 msgid "Browse your computer:"
 msgstr ""
 
-#: libraries/Util.class.php:3567
+#: libraries/Util.class.php:3573
 #, fuzzy, php-format
 #| msgid "web server upload directory"
 msgid "Select from the web server upload directory <b>%s</b>:"
 msgstr "web server upload directory"
 
-#: libraries/Util.class.php:3596 libraries/insert_edit.lib.php:1173
+#: libraries/Util.class.php:3602 libraries/insert_edit.lib.php:1171
 msgid "The directory you set for upload work cannot be reached."
 msgstr ""
 
-#: libraries/Util.class.php:3607
+#: libraries/Util.class.php:3613
 #, fuzzy
 #| msgid "There are no configured servers"
 msgid "There are no files to upload!"
 msgstr "There are no configured servers"
 
-#: libraries/Util.class.php:3632 libraries/Util.class.php:3633
-#: templates/structure/check_all_tables.phtml:15
+#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: templates/database/structure/check_all_tables.phtml:15
 msgid "Empty"
 msgstr "ცარიელი"
 
-#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: libraries/Util.class.php:3644 libraries/Util.class.php:3645
 msgid "Execute"
 msgstr ""
 
-#: libraries/Util.class.php:4152
+#: libraries/Util.class.php:4158
 msgid "Print"
 msgstr "დაბეჭდვა"
 
-#: libraries/Util.class.php:4257 templates/structure/row_stats_table.phtml:80
-#: templates/structure/table_header.phtml:95
+#: libraries/Util.class.php:4263
+#: templates/database/structure/table_header.phtml:95
+#: templates/table/structure/row_stats_table.phtml:80
 msgid "Creation"
 msgstr "შეიქმნა"
 
-#: libraries/Util.class.php:4263 templates/structure/row_stats_table.phtml:87
-#: templates/structure/table_header.phtml:106
+#: libraries/Util.class.php:4269
+#: templates/database/structure/table_header.phtml:106
+#: templates/table/structure/row_stats_table.phtml:87
 msgid "Last update"
 msgstr "უკანასკნელი განახლება"
 
-#: libraries/Util.class.php:4269 templates/structure/row_stats_table.phtml:94
-#: templates/structure/table_header.phtml:117
+#: libraries/Util.class.php:4275
+#: templates/database/structure/table_header.phtml:117
+#: templates/table/structure/row_stats_table.phtml:94
 msgid "Last check"
 msgstr ""
 
-#: libraries/Util.class.php:4315
+#: libraries/Util.class.php:4321
 #, fuzzy
 #| msgid "User"
 msgid "Users"
@@ -5341,16 +5355,16 @@ msgid "Use this value"
 msgstr "გამოიყენეთ ეს ველი"
 
 #: libraries/build_html_for_db.lib.php:33 libraries/import.lib.php:193
-#: templates/structure/actions_in_table_structure.phtml:113
-#: templates/structure/row_stats_table.phtml:42
-#: templates/structure/table_header.phtml:36
+#: templates/database/structure/table_header.phtml:36
+#: templates/table/structure/actions_in_table_structure.phtml:113
+#: templates/table/structure/row_stats_table.phtml:42
 msgid "Rows"
 msgstr "სტრიქონები"
 
 #: libraries/build_html_for_db.lib.php:48 libraries/engines/innodb.lib.php:171
-#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:186
-#: libraries/server_status.lib.php:298
-#: templates/structure/display_table_stats.phtml:40
+#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:195
+#: libraries/server_status.lib.php:307
+#: templates/table/structure/display_table_stats.phtml:40
 msgid "Total"
 msgstr "სულ"
 
@@ -5360,11 +5374,13 @@ msgid "Jump to database"
 msgstr "მონაცემთა ბაზები არაა"
 
 #: libraries/build_html_for_db.lib.php:146
+#: templates/database/structure/structure_table_row.phtml:15
 #, fuzzy
 msgid "Not replicated"
 msgstr "სერვერის კონფიგურაცია"
 
 #: libraries/build_html_for_db.lib.php:158
+#: templates/database/structure/structure_table_row.phtml:16
 #, fuzzy
 #| msgid "Replication"
 msgid "Replicated"
@@ -5423,17 +5439,17 @@ msgstr ""
 #: libraries/plugins/export/ExportTexytext.class.php:425
 #: libraries/plugins/export/PMA_ExportPdf.class.php:307
 #: libraries/rte/rte_list.lib.php:73 libraries/rte/rte_list.lib.php:85
-#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:830
-#: libraries/rte/rte_routines.lib.php:1492 setup/frames/index.inc.php:162
+#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:921
+#: libraries/rte/rte_routines.lib.php:1583 setup/frames/index.inc.php:162
 #: templates/columns_definitions/table_fields_definitions.phtml:8
-#: templates/structure/table_structure_header.phtml:5
-#: templates/table/create_table.phtml:11
+#: templates/database/create_table.phtml:11
+#: templates/table/structure/table_structure_header.phtml:5
 msgid "Name"
 msgstr "სახელი"
 
 #: libraries/central_columns.lib.php:699
 #: libraries/central_columns.lib.php:1381
-#: libraries/rte/rte_routines.lib.php:832
+#: libraries/rte/rte_routines.lib.php:923
 #: templates/columns_definitions/table_fields_definitions.phtml:14
 msgid "Length/Values"
 msgstr ""
@@ -5456,7 +5472,7 @@ msgid "Select a table"
 msgstr "ცხრილების არჩევა"
 
 #: libraries/central_columns.lib.php:804
-#: templates/structure/add_column.phtml:4
+#: templates/table/structure/add_column.phtml:4
 #, fuzzy
 #| msgid "Add %s field(s)"
 msgid "Add column"
@@ -5478,7 +5494,7 @@ msgstr "%s ველის დამატება"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1002
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1025
 #: templates/columns_definitions/table_fields_definitions.phtml:36
-#: templates/structure/table_structure_header.phtml:8
+#: templates/table/structure/table_structure_header.phtml:8
 msgid "Attributes"
 msgstr "ატრიბუტები"
 
@@ -5596,7 +5612,7 @@ msgid "Double click"
 msgstr ""
 
 #: libraries/config.values.php:95 libraries/config.values.php:124
-#: libraries/config/FormDisplay.tpl.php:221 libraries/relation.lib.php:97
+#: libraries/config/FormDisplay.tpl.php:232 libraries/relation.lib.php:97
 #: libraries/relation.lib.php:105
 msgid "Disabled"
 msgstr "გათიშულია"
@@ -5796,21 +5812,21 @@ msgstr ""
 msgid "maximum %s"
 msgstr "Maximum tables"
 
-#: libraries/config/FormDisplay.tpl.php:219
+#: libraries/config/FormDisplay.tpl.php:230
 msgid "This setting is disabled, it will not be applied to your configuration."
 msgstr ""
 
-#: libraries/config/FormDisplay.tpl.php:313
+#: libraries/config/FormDisplay.tpl.php:324
 #, php-format
 msgid "Set value: %s"
 msgstr ""
 
-#: libraries/config/FormDisplay.tpl.php:318
+#: libraries/config/FormDisplay.tpl.php:329
 #: libraries/config/messages.inc.php:610
 msgid "Restore default value"
 msgstr ""
 
-#: libraries/config/FormDisplay.tpl.php:332
+#: libraries/config/FormDisplay.tpl.php:343
 msgid "Allow users to customize this value"
 msgstr ""
 
@@ -6346,7 +6362,7 @@ msgstr "სომბოლოთა ნაკრები ფაილისა
 
 #: libraries/config/messages.inc.php:136 libraries/config/messages.inc.php:152
 #: libraries/sql_query_form.lib.php:247
-#: templates/structure/row_stats_table.phtml:7
+#: templates/table/structure/row_stats_table.phtml:7
 msgid "Format"
 msgstr "ფორმატი"
 
@@ -6922,7 +6938,7 @@ msgstr ""
 
 #: libraries/config/messages.inc.php:332
 #: libraries/plugins/export/ExportPdf.class.php:279
-#: templates/structure/secondary_tabs.phtml:8
+#: templates/table/secondary_tabs.phtml:8
 #, fuzzy
 #| msgid "Database for user"
 msgid "Table structure"
@@ -8690,109 +8706,35 @@ msgstr "Microsoft Word 2000"
 msgid "OpenDocument Text"
 msgstr "Open Document Text"
 
-#: libraries/controllers/StructureController.class.php:465
+#: libraries/controllers/DatabaseStructureController.class.php:405
 #: tbl_operations.php:382
 #, php-format
 msgid "Table %s has been emptied."
 msgstr ""
 
-#: libraries/controllers/StructureController.class.php:486
+#: libraries/controllers/DatabaseStructureController.class.php:426
 #: tbl_operations.php:400 view_operations.php:119
 #, fuzzy, php-format
 #| msgid "Field %s has been dropped."
 msgid "View %s has been dropped."
 msgstr "Field %s has been dropped"
 
-#: libraries/controllers/StructureController.class.php:487
+#: libraries/controllers/DatabaseStructureController.class.php:427
 #: tbl_operations.php:401
 #, fuzzy, php-format
 #| msgid "Field %s has been dropped."
 msgid "Table %s has been dropped."
 msgstr "Field %s has been dropped"
 
-#: libraries/controllers/StructureController.class.php:797
-#, php-format
-msgid "The name '%s' is a MySQL reserved keyword."
-msgid_plural "The names '%s' are MySQL reserved keywords."
-msgstr[0] ""
-
-#: libraries/controllers/StructureController.class.php:875
-msgid "No column selected."
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1049
+#: libraries/controllers/DatabaseStructureController.class.php:733
 msgid "Favorite List is full!"
 msgstr ""
 
-#: libraries/controllers/StructureController.class.php:1272
-#, fuzzy
-#| msgid "%s databases have been dropped successfully."
-msgid "The columns have been moved successfully."
-msgstr "%s databases have been dropped successfully."
-
-#: libraries/controllers/StructureController.class.php:1535
-#, fuzzy, php-format
-#| msgid "Table %s has been dropped."
-msgid ""
-"Table %1$s has been altered successfully. Privileges have been adjusted."
-msgstr "Table %s has been dropped"
-
-#: libraries/controllers/StructureController.class.php:1541
-#: libraries/controllers/TableIndexesController.class.php:161
-#: tbl_addfield.php:92
-#, php-format
-msgid "Table %1$s has been altered successfully."
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1588
-#: libraries/tracking.lib.php:1094
-#, fuzzy
-#| msgid "Ignore errors"
-msgid "Query error"
-msgstr "შეცდომების იგნორირება"
-
-#: libraries/controllers/StructureController.class.php:1806
+#: libraries/controllers/DatabaseStructureController.class.php:947
 #: libraries/mysql_charsets.lib.php:366 libraries/mysql_charsets.lib.php:373
 msgid "unknown"
 msgstr "უცნობი"
 
-#: libraries/controllers/StructureController.class.php:1957
-#: templates/structure/check_all_table_column.phtml:11
-msgid "Change"
-msgstr "შეცვლა"
-
-#: libraries/controllers/StructureController.class.php:1961
-#: libraries/controllers/StructureController.class.php:1966
-#: libraries/navigation/Nodes/Node_Index.class.php:30
-#: libraries/tracking.lib.php:926
-#: templates/columns_definitions/column_indexes.phtml:16
-#: templates/columns_definitions/table_fields_definitions.phtml:57
-#: templates/structure/check_all_table_column.phtml:30
-#: templates/structure/display_structure.phtml:79
-#: templates/structure/display_table_stats.phtml:19
-msgid "Index"
-msgstr "ინდექსი"
-
-#: libraries/controllers/StructureController.class.php:1963
-#: libraries/controllers/StructureController.class.php:1968
-#: templates/columns_definitions/column_indexes.phtml:27
-#: templates/structure/check_all_table_column.phtml:37
-msgid "Spatial"
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1964
-#: libraries/controllers/StructureController.class.php:1969
-#: templates/columns_definitions/column_indexes.phtml:22
-#: templates/structure/check_all_table_column.phtml:47
-msgid "Fulltext"
-msgstr "Fulltext"
-
-#: libraries/controllers/StructureController.class.php:1970
-#, fuzzy
-#| msgid "Session value"
-msgid "Distinct values"
-msgstr "სესიის მნიშვნელობა"
-
 #: libraries/controllers/TableChartController.class.php:82
 #: libraries/controllers/TableGisVisualizationController.class.php:101
 msgid "No SQL query was set to fetch data."
@@ -8808,11 +8750,18 @@ msgstr ""
 msgid "No data to display"
 msgstr "მონაცემთა ბაზები არაა"
 
-#: libraries/controllers/TableRelationController.class.php:217
+#: libraries/controllers/TableIndexesController.class.php:161
+#: libraries/controllers/TableStructureController.class.php:736
+#: tbl_addfield.php:92
+#, php-format
+msgid "Table %1$s has been altered successfully."
+msgstr ""
+
+#: libraries/controllers/TableRelationController.class.php:218
 msgid "Display column was successfully updated."
 msgstr ""
 
-#: libraries/controllers/TableRelationController.class.php:283
+#: libraries/controllers/TableRelationController.class.php:288
 #, fuzzy
 #| msgid "Internal relations"
 msgid "Internal relations were successfully updated."
@@ -8831,12 +8780,79 @@ msgid "Zoom search"
 msgstr "ძებნა"
 
 #: libraries/controllers/TableSearchController.class.php:852
-#: templates/table/selection_form.phtml:59
+#: templates/table/search/selection_form.phtml:59
 #, fuzzy
 #| msgid "SQL Query box"
 msgid "Find and replace"
 msgstr "SQL Query box"
 
+#: libraries/controllers/TableStructureController.class.php:163
+#, php-format
+msgid "The name '%s' is a MySQL reserved keyword."
+msgid_plural "The names '%s' are MySQL reserved keywords."
+msgstr[0] ""
+
+#: libraries/controllers/TableStructureController.class.php:241
+msgid "No column selected."
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:467
+#, fuzzy
+#| msgid "%s databases have been dropped successfully."
+msgid "The columns have been moved successfully."
+msgstr "%s databases have been dropped successfully."
+
+#: libraries/controllers/TableStructureController.class.php:730
+#, fuzzy, php-format
+#| msgid "Table %s has been dropped."
+msgid ""
+"Table %1$s has been altered successfully. Privileges have been adjusted."
+msgstr "Table %s has been dropped"
+
+#: libraries/controllers/TableStructureController.class.php:783
+#: libraries/tracking.lib.php:1094
+#, fuzzy
+#| msgid "Ignore errors"
+msgid "Query error"
+msgstr "შეცდომების იგნორირება"
+
+#: libraries/controllers/TableStructureController.class.php:948
+#: templates/table/structure/check_all_table_column.phtml:11
+msgid "Change"
+msgstr "შეცვლა"
+
+#: libraries/controllers/TableStructureController.class.php:952
+#: libraries/controllers/TableStructureController.class.php:957
+#: libraries/navigation/Nodes/Node_Index.class.php:30
+#: libraries/tracking.lib.php:926
+#: templates/columns_definitions/column_indexes.phtml:16
+#: templates/columns_definitions/table_fields_definitions.phtml:57
+#: templates/table/structure/check_all_table_column.phtml:30
+#: templates/table/structure/display_structure.phtml:79
+#: templates/table/structure/display_table_stats.phtml:19
+msgid "Index"
+msgstr "ინდექსი"
+
+#: libraries/controllers/TableStructureController.class.php:954
+#: libraries/controllers/TableStructureController.class.php:959
+#: templates/columns_definitions/column_indexes.phtml:27
+#: templates/table/structure/check_all_table_column.phtml:37
+msgid "Spatial"
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:955
+#: libraries/controllers/TableStructureController.class.php:960
+#: templates/columns_definitions/column_indexes.phtml:22
+#: templates/table/structure/check_all_table_column.phtml:47
+msgid "Fulltext"
+msgstr "Fulltext"
+
+#: libraries/controllers/TableStructureController.class.php:963
+#, fuzzy
+#| msgid "Session value"
+msgid "Distinct values"
+msgstr "სესიის მნიშვნელობა"
+
 #: libraries/core.lib.php:306
 #, php-format
 msgid "The %s extension is missing. Please check your PHP configuration."
@@ -8881,7 +8897,7 @@ msgid "No Password"
 msgstr "პაროლი არაა"
 
 #: libraries/display_change_password.lib.php:68
-#: libraries/plugins/auth/AuthenticationCookie.class.php:199
+#: libraries/plugins/auth/AuthenticationCookie.class.php:187
 #: libraries/replication_gui.lib.php:422 libraries/replication_gui.lib.php:862
 #: libraries/server_privileges.lib.php:1640
 msgid "Password:"
@@ -9702,12 +9718,12 @@ msgid "Dump has been saved to file %s."
 msgstr ""
 
 #: libraries/import.lib.php:202 libraries/insert_edit.lib.php:124
-#: libraries/rte/rte_routines.lib.php:1353 libraries/sql.lib.php:1312
+#: libraries/rte/rte_routines.lib.php:1444 libraries/sql.lib.php:1306
 #: tbl_get_field.php:44
 msgid "MySQL returned an empty result set (i.e. zero rows)."
 msgstr ""
 
-#: libraries/import.lib.php:265 libraries/sql.lib.php:1326
+#: libraries/import.lib.php:265 libraries/sql.lib.php:1320
 msgid "[ROLLBACK occurred.]"
 msgstr ""
 
@@ -9775,14 +9791,14 @@ msgstr "Create an index on&nbsp;%s&nbsp;columns"
 
 #: libraries/insert_edit.lib.php:233
 #: libraries/navigation/Nodes/Node_DatabaseChild.class.php:48
-#: templates/designer/table_list.phtml:40
+#: templates/database/designer/table_list.phtml:40
 msgid "Hide"
 msgstr "დამალვა"
 
 #: libraries/insert_edit.lib.php:249
 #: libraries/navigation/Nodes/Node_Function.class.php:32
-#: libraries/rte/rte_routines.lib.php:1495
-#: templates/table/table_header.phtml:4
+#: libraries/rte/rte_routines.lib.php:1586
+#: templates/table/search/table_header.phtml:4
 msgid "Function"
 msgstr "ფუნქცია"
 
@@ -9797,88 +9813,89 @@ msgstr "ბინარული"
 msgid "Because of its length,<br /> this column might not be editable."
 msgstr "Because of its length,<br /> this field might not be editable "
 
-#: libraries/insert_edit.lib.php:1050
+#: libraries/insert_edit.lib.php:1048
 msgid "Binary - do not edit"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1176 libraries/server_privileges.lib.php:470
-#: templates/table/options.phtml:36
+#: libraries/insert_edit.lib.php:1174 libraries/server_privileges.lib.php:470
+#: templates/table/search/options.phtml:36
 msgid "Or"
 msgstr "ან"
 
-#: libraries/insert_edit.lib.php:1177
+#: libraries/insert_edit.lib.php:1175
 #, fuzzy
 #| msgid "web server upload directory"
 msgid "web server upload directory:"
 msgstr "web server upload directory"
 
-#: libraries/insert_edit.lib.php:1348 templates/table/input_box.phtml:49
+#: libraries/insert_edit.lib.php:1346
+#: templates/table/search/input_box.phtml:49
 #, fuzzy
 #| msgid "Insert"
 msgid "Edit/Insert"
 msgstr "ჩასმა"
 
-#: libraries/insert_edit.lib.php:1398
+#: libraries/insert_edit.lib.php:1396
 #, fuzzy, php-format
 #| msgid "Restart insertion with %s rows"
 msgid "Continue insertion with %s rows"
 msgstr "Restart insertion with %s rows"
 
-#: libraries/insert_edit.lib.php:1428
+#: libraries/insert_edit.lib.php:1426
 msgid "and then"
 msgstr "და შემდეგ"
 
-#: libraries/insert_edit.lib.php:1461
+#: libraries/insert_edit.lib.php:1459
 msgid "Insert as new row"
 msgstr "ახალი სტრიქონის ჩამატება"
 
-#: libraries/insert_edit.lib.php:1464
+#: libraries/insert_edit.lib.php:1462
 msgid "Insert as new row and ignore errors"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1467
+#: libraries/insert_edit.lib.php:1465
 #, fuzzy
 msgid "Show insert query"
 msgstr "Showing SQL query"
 
-#: libraries/insert_edit.lib.php:1487
+#: libraries/insert_edit.lib.php:1485
 msgid "Go back to previous page"
 msgstr "წინა გვერდზე დაბრუნება"
 
-#: libraries/insert_edit.lib.php:1490
+#: libraries/insert_edit.lib.php:1488
 msgid "Insert another new row"
 msgstr "სხვა ახალი სტრიქონის დამატება"
 
-#: libraries/insert_edit.lib.php:1495
+#: libraries/insert_edit.lib.php:1493
 msgid "Go back to this page"
 msgstr "ამ გვერდზე დაბრუნება"
 
-#: libraries/insert_edit.lib.php:1518
+#: libraries/insert_edit.lib.php:1516
 msgid "Edit next row"
 msgstr "შემდეგი სტრიქონის რედაქტირება"
 
-#: libraries/insert_edit.lib.php:1540
+#: libraries/insert_edit.lib.php:1538
 msgid ""
 "Use TAB key to move from value to value, or CTRL+arrows to move anywhere"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1577 libraries/replication_gui.lib.php:542
-#: libraries/rte/rte_routines.lib.php:1497
+#: libraries/insert_edit.lib.php:1575 libraries/replication_gui.lib.php:542
+#: libraries/rte/rte_routines.lib.php:1588
 #: libraries/server_status_variables.lib.php:220
-#: templates/designer/having_query_panel.phtml:100
-#: templates/designer/options_panel.phtml:73
-#: templates/designer/options_panel.phtml:239
-#: templates/designer/where_query_panel.phtml:69
-#: templates/table/table_header.phtml:10
-#: templates/table/zoom_result_form.phtml:35
+#: templates/database/designer/having_query_panel.phtml:100
+#: templates/database/designer/options_panel.phtml:73
+#: templates/database/designer/options_panel.phtml:239
+#: templates/database/designer/where_query_panel.phtml:69
+#: templates/table/search/table_header.phtml:10
+#: templates/table/search/zoom_result_form.phtml:35
 msgid "Value"
 msgstr "მნიშვნელობა"
 
-#: libraries/insert_edit.lib.php:1937 libraries/sql.lib.php:1309
+#: libraries/insert_edit.lib.php:1935 libraries/sql.lib.php:1303
 msgid "Showing SQL query"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1962 libraries/sql.lib.php:1287
+#: libraries/insert_edit.lib.php:1960 libraries/sql.lib.php:1281
 #, php-format
 msgid "Inserted row id: %1$d"
 msgstr "ჩამატებული სტრიქონის id: %1$d"
@@ -10329,7 +10346,7 @@ msgstr ""
 #: libraries/navigation/Nodes/Node_View_Container.class.php:26
 #: libraries/navigation/Nodes/Node_View_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:129
-#: templates/structure/show_create.phtml:30
+#: templates/database/structure/show_create.phtml:30
 #, fuzzy
 #| msgid "View"
 msgid "Views"
@@ -10639,7 +10656,7 @@ msgstr ""
 
 #: libraries/operations.lib.php:101 libraries/operations.lib.php:249
 #: libraries/operations.lib.php:869 libraries/operations.lib.php:963
-#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:907
+#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:998
 #: templates/columns_definitions/table_fields_definitions.phtml:47
 #, fuzzy
 #| msgid "Edit Privileges"
@@ -10734,22 +10751,22 @@ msgid "Switch to copied table"
 msgstr ""
 
 #: libraries/operations.lib.php:1360
-#: templates/structure/check_all_tables.phtml:18
+#: templates/database/structure/check_all_tables.phtml:18
 msgid "Table maintenance"
 msgstr ""
 
 #: libraries/operations.lib.php:1398
-#: templates/structure/check_all_tables.phtml:19
+#: templates/database/structure/check_all_tables.phtml:19
 msgid "Analyze table"
 msgstr ""
 
 #: libraries/operations.lib.php:1413
-#: templates/structure/check_all_tables.phtml:20
+#: templates/database/structure/check_all_tables.phtml:20
 msgid "Check table"
 msgstr "ცხრილის შემოწმება"
 
 #: libraries/operations.lib.php:1428
-#: templates/structure/check_all_tables.phtml:22
+#: templates/database/structure/check_all_tables.phtml:22
 #, fuzzy
 #| msgid "Check table"
 msgid "Checksum table"
@@ -10771,18 +10788,19 @@ msgid "Flush the table (FLUSH)"
 msgstr "Flush the table (\"FLUSH\")"
 
 #: libraries/operations.lib.php:1477
-#: templates/structure/check_all_tables.phtml:23
-#: templates/structure/display_table_stats.phtml:56
+#: templates/database/structure/check_all_tables.phtml:23
+#: templates/table/structure/display_table_stats.phtml:56
 msgid "Optimize table"
 msgstr "ცხრილის ოპტიმიზება"
 
 #: libraries/operations.lib.php:1492
-#: templates/structure/check_all_tables.phtml:24
+#: templates/database/structure/check_all_tables.phtml:24
 msgid "Repair table"
 msgstr "ცხრილის აღდგენა"
 
 #: libraries/operations.lib.php:1538
-#: templates/structure/check_all_tables.phtml:14 view_operations.php:127
+#: templates/database/structure/check_all_tables.phtml:14
+#: view_operations.php:127
 #, fuzzy
 #| msgid "Dumping data for table"
 msgid "Delete data or table"
@@ -10911,7 +10929,7 @@ msgid "Cannot connect: invalid settings."
 msgstr "დაკავშირება შეუძლებელია: პარამეტრები არასწორია."
 
 #: libraries/plugins/auth/AuthenticationConfig.class.php:108
-#: libraries/plugins/auth/AuthenticationCookie.class.php:134
+#: libraries/plugins/auth/AuthenticationCookie.class.php:122
 #: libraries/plugins/auth/AuthenticationHttp.class.php:96
 #, php-format
 msgid "Welcome to %s"
@@ -10936,38 +10954,38 @@ msgstr ""
 msgid "Retry to connect"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:146
+#: libraries/plugins/auth/AuthenticationCookie.class.php:134
 msgid "Your session has expired. Please log in again."
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:170
+#: libraries/plugins/auth/AuthenticationCookie.class.php:158
 msgid "Log in"
 msgstr "შესვლა"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:178
-#: libraries/plugins/auth/AuthenticationCookie.class.php:188
+#: libraries/plugins/auth/AuthenticationCookie.class.php:166
+#: libraries/plugins/auth/AuthenticationCookie.class.php:176
 msgid "You can enter hostname/IP address and port separated by space."
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:193
+#: libraries/plugins/auth/AuthenticationCookie.class.php:181
 msgid "Username:"
 msgstr "მომხმარებელი:"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:205
+#: libraries/plugins/auth/AuthenticationCookie.class.php:193
 #, fuzzy
 #| msgid "Server Choice"
 msgid "Server Choice:"
 msgstr "სერვერის არჩევა"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:386
+#: libraries/plugins/auth/AuthenticationCookie.class.php:374
 msgid "Entered captcha is wrong, try again!"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:396
+#: libraries/plugins/auth/AuthenticationCookie.class.php:384
 msgid "Please enter correct captcha!"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:423
+#: libraries/plugins/auth/AuthenticationCookie.class.php:411
 #, fuzzy
 #| msgid "Cannot log in to the MySQL server"
 msgid "You are not allowed to log in to this MySQL server!"
@@ -11081,7 +11099,7 @@ msgstr "მოვლენა"
 #: libraries/plugins/export/ExportOdt.class.php:593
 #: libraries/plugins/export/ExportTexytext.class.php:428
 #: libraries/plugins/export/PMA_ExportPdf.class.php:313
-#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:984
 #: libraries/rte/rte_triggers.lib.php:377
 #, fuzzy
 #| msgid "Description"
@@ -11436,7 +11454,7 @@ msgid "Last check:"
 msgstr ""
 
 #: libraries/plugins/export/ExportSql.class.php:1399
-#: templates/structure/structure_table_row.phtml:183
+#: templates/database/structure/structure_table_row.phtml:183
 msgid "in use"
 msgstr ""
 
@@ -11640,20 +11658,16 @@ msgstr ""
 msgid "The imported file does not contain any data!"
 msgstr "File %s does not contain any key id"
 
-#: libraries/plugins/import/ImportSql.class.php:169
+#: libraries/plugins/import/ImportSql.class.php:72
 #, fuzzy
 #| msgid "SQL compatibility mode"
 msgid "SQL compatibility mode:"
 msgstr "SQL compatibility mode"
 
-#: libraries/plugins/import/ImportSql.class.php:181
+#: libraries/plugins/import/ImportSql.class.php:84
 msgid "Do not use <code>AUTO_INCREMENT</code> for zero values"
 msgstr ""
 
-#: libraries/plugins/import/ImportSql.class.php:195
-msgid "Read as multibytes"
-msgstr ""
-
 #: libraries/plugins/import/ImportXml.class.php:54
 msgid "XML"
 msgstr "XML"
@@ -11698,7 +11712,7 @@ msgid "Show grid"
 msgstr ""
 
 #: libraries/plugins/schema/SchemaPdf.class.php:94
-#: templates/structure/print_view_data_dictionary_link.phtml:6
+#: templates/database/structure/print_view_data_dictionary_link.phtml:6
 msgid "Data Dictionary"
 msgstr "მონაცემების ლექსიკონი"
 
@@ -11730,7 +11744,7 @@ msgid "The %s table doesn't exist!"
 msgstr "ცხრილი \"%s\" არ არსებობს!"
 
 #: libraries/plugins/schema/eps/Eps_Relation_Schema.class.php:321
-#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:309
+#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:323
 #, fuzzy, php-format
 #| msgid "Schema of the \"%s\" database - Page %s"
 msgid "Schema of the %s database - Page %s"
@@ -11759,7 +11773,7 @@ msgstr ""
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1005
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1028
 #: libraries/tracking.lib.php:884
-#: templates/structure/table_structure_header.phtml:11
+#: templates/table/structure/table_structure_header.phtml:11
 msgid "Extra"
 msgstr "ექსტრა"
 
@@ -12168,51 +12182,51 @@ msgstr ""
 msgid "Create the needed tables with the <code>%screate_tables.sql</code>."
 msgstr ""
 
-#: libraries/relation.lib.php:360
+#: libraries/relation.lib.php:357
 msgid "Create a pma user and give access to these tables."
 msgstr ""
 
-#: libraries/relation.lib.php:365
+#: libraries/relation.lib.php:360
 msgid ""
 "Enable advanced features in configuration file (<code>config.inc.php</"
 "code>), for example by starting from <code>config.sample.inc.php</code>."
 msgstr ""
 
-#: libraries/relation.lib.php:373
+#: libraries/relation.lib.php:365
 msgid "Re-login to phpMyAdmin to load the updated configuration file."
 msgstr ""
 
-#: libraries/relation.lib.php:1612
+#: libraries/relation.lib.php:1607
 msgid "no description"
 msgstr ""
 
-#: libraries/relation.lib.php:1811
+#: libraries/relation.lib.php:1806
 msgid ""
 "You do not have necessary privileges to create a database named "
 "'phpmyadmin'. You may go to 'Operations' tab of any database to set up the "
 "phpMyAdmin configuration storage there."
 msgstr ""
 
-#: libraries/relation.lib.php:1928
+#: libraries/relation.lib.php:1923
 #, php-format
 msgid ""
 "%sCreate%s a database named 'phpmyadmin' and setup the phpMyAdmin "
 "configuration storage there."
 msgstr ""
 
-#: libraries/relation.lib.php:1936
+#: libraries/relation.lib.php:1931
 #, php-format
 msgid ""
 "%sCreate%s the phpMyAdmin configuration storage in the current database."
 msgstr ""
 
-#: libraries/relation.lib.php:1944
+#: libraries/relation.lib.php:1939
 #, php-format
 msgid "%sCreate%s missing phpMyAdmin configuration storage tables."
 msgstr ""
 
 #: libraries/replication_gui.lib.php:46 libraries/replication_gui.lib.php:343
-#: libraries/server_databases.lib.php:387
+#: libraries/server_databases.lib.php:398
 #, fuzzy
 msgid "Master replication"
 msgstr "სერვერის კონფიგურაცია"
@@ -12270,7 +12284,7 @@ msgid ""
 msgstr ""
 
 #: libraries/replication_gui.lib.php:141
-#: libraries/server_databases.lib.php:389
+#: libraries/server_databases.lib.php:400
 #, fuzzy
 msgid "Slave replication"
 msgstr "სერვერის კონფიგურაცია"
@@ -12557,10 +12571,10 @@ msgid "Master server changed successfully to %s."
 msgstr "The privileges were reloaded successfully."
 
 #: libraries/rte/rte_events.lib.php:106 libraries/rte/rte_events.lib.php:115
-#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:149
-#: libraries/rte/rte_routines.lib.php:158
-#: libraries/rte/rte_routines.lib.php:231
-#: libraries/rte/rte_routines.lib.php:1362
+#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:219
+#: libraries/rte/rte_routines.lib.php:246
+#: libraries/rte/rte_routines.lib.php:368
+#: libraries/rte/rte_routines.lib.php:1453
 #: libraries/rte/rte_triggers.lib.php:82 libraries/rte/rte_triggers.lib.php:91
 #: libraries/rte/rte_triggers.lib.php:123
 #, php-format
@@ -12583,7 +12597,7 @@ msgstr "Table %s has been dropped"
 msgid "Event %1$s has been created."
 msgstr "Table %1$s has been created."
 
-#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:251
+#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:266
 #: libraries/rte/rte_triggers.lib.php:144
 msgid "One or more errors have occurred while processing your request:"
 msgstr ""
@@ -12594,7 +12608,7 @@ msgstr ""
 msgid "Edit event"
 msgstr "სერვერის რედაქტირება"
 
-#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:794
+#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:885
 #: libraries/rte/rte_triggers.lib.php:323 view_create.php:180
 #, fuzzy
 #| msgid "Details…"
@@ -12611,7 +12625,7 @@ msgstr "მოვლენის ტიპი"
 msgid "Event type"
 msgstr "მოვლენის ტიპი"
 
-#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:817
+#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:908
 #, fuzzy, php-format
 #| msgid "Change"
 msgid "Change to %s"
@@ -12647,12 +12661,14 @@ msgstr "დასასრული"
 msgid "On completion preserve"
 msgstr "სრული ჩასმები"
 
-#: libraries/rte/rte_events.lib.php:491 libraries/rte/rte_routines.lib.php:930
+#: libraries/rte/rte_events.lib.php:491
+#: libraries/rte/rte_routines.lib.php:1021
 #: libraries/rte/rte_triggers.lib.php:383 view_create.php:209
 msgid "Definer"
 msgstr ""
 
-#: libraries/rte/rte_events.lib.php:535 libraries/rte/rte_routines.lib.php:997
+#: libraries/rte/rte_events.lib.php:535
+#: libraries/rte/rte_routines.lib.php:1088
 #: libraries/rte/rte_triggers.lib.php:422
 msgid "The definer must be in the \"username@hostname\" format!"
 msgstr ""
@@ -12680,9 +12696,9 @@ msgid "You must provide an event definition."
 msgstr ""
 
 #: libraries/rte/rte_export.lib.php:43 libraries/rte/rte_general.lib.php:72
-#: libraries/rte/rte_routines.lib.php:345
-#: libraries/rte/rte_routines.lib.php:1198
-#: libraries/rte/rte_routines.lib.php:1411
+#: libraries/rte/rte_routines.lib.php:153
+#: libraries/rte/rte_routines.lib.php:1289
+#: libraries/rte/rte_routines.lib.php:1502
 #, fuzzy
 #| msgid "Processes"
 msgid "Error in processing request:"
@@ -12718,154 +12734,154 @@ msgid ""
 "problems."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:110
-#: libraries/rte/rte_routines.lib.php:1006
-#, fuzzy, php-format
-#| msgid "Invalid server index: \"%s\""
-msgid "Invalid routine type: \"%s\""
-msgstr "Invalid server index: \"%s\""
-
-#: libraries/rte/rte_routines.lib.php:170
-msgid "Sorry, we failed to restore the dropped routine."
-msgstr ""
-
-#: libraries/rte/rte_routines.lib.php:211
-#, fuzzy, php-format
-#| msgid "Table %s has been dropped."
-msgid "Routine %1$s has been modified. Privileges have been adjusted."
-msgstr "Table %s has been dropped"
-
-#: libraries/rte/rte_routines.lib.php:216
-#, fuzzy, php-format
-#| msgid "Table %s has been dropped."
-msgid "Routine %1$s has been modified."
-msgstr "Table %s has been dropped"
-
-#: libraries/rte/rte_routines.lib.php:238
-#, fuzzy, php-format
-#| msgid "Table %1$s has been created."
-msgid "Routine %1$s has been created."
-msgstr "Table %1$s has been created."
-
-#: libraries/rte/rte_routines.lib.php:315
+#: libraries/rte/rte_routines.lib.php:123
 #, fuzzy
 #| msgid "Edit mode"
 msgid "Edit routine"
 msgstr "რედაქტირების რეჟიმი"
 
-#: libraries/rte/rte_routines.lib.php:797
+#: libraries/rte/rte_routines.lib.php:200
+#: libraries/rte/rte_routines.lib.php:1097
+#, fuzzy, php-format
+#| msgid "Invalid server index: \"%s\""
+msgid "Invalid routine type: \"%s\""
+msgstr "Invalid server index: \"%s\""
+
+#: libraries/rte/rte_routines.lib.php:253
+#, fuzzy, php-format
+#| msgid "Table %1$s has been created."
+msgid "Routine %1$s has been created."
+msgstr "Table %1$s has been created."
+
+#: libraries/rte/rte_routines.lib.php:380
+msgid "Sorry, we failed to restore the dropped routine."
+msgstr ""
+
+#: libraries/rte/rte_routines.lib.php:439
+#, fuzzy, php-format
+#| msgid "Table %s has been dropped."
+msgid "Routine %1$s has been modified. Privileges have been adjusted."
+msgstr "Table %s has been dropped"
+
+#: libraries/rte/rte_routines.lib.php:444
+#, fuzzy, php-format
+#| msgid "Table %s has been dropped."
+msgid "Routine %1$s has been modified."
+msgstr "Table %s has been dropped"
+
+#: libraries/rte/rte_routines.lib.php:888
 #, fuzzy
 #| msgid "Routines"
 msgid "Routine name"
 msgstr "Routines"
 
-#: libraries/rte/rte_routines.lib.php:823
+#: libraries/rte/rte_routines.lib.php:914
 msgid "Parameters"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:829
+#: libraries/rte/rte_routines.lib.php:920
 #, fuzzy
 #| msgid "Direct links"
 msgid "Direction"
 msgstr "პირდაპირი ბმულები"
 
-#: libraries/rte/rte_routines.lib.php:847
+#: libraries/rte/rte_routines.lib.php:938
 #, fuzzy
 #| msgid "Add new field"
 msgid "Add parameter"
 msgstr "ახალი ველის დამატება"
 
-#: libraries/rte/rte_routines.lib.php:851
+#: libraries/rte/rte_routines.lib.php:942
 #, fuzzy
 #| msgid "Rename database to"
 msgid "Remove last parameter"
 msgstr "Rename database to"
 
-#: libraries/rte/rte_routines.lib.php:856
+#: libraries/rte/rte_routines.lib.php:947
 msgid "Return type"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:862
+#: libraries/rte/rte_routines.lib.php:953
 #, fuzzy
 #| msgid "Length/Values"
 msgid "Return length/values"
 msgstr "Length/Values"
 
-#: libraries/rte/rte_routines.lib.php:868
+#: libraries/rte/rte_routines.lib.php:959
 #, fuzzy
 #| msgid "Table options"
 msgid "Return options"
 msgstr "ცხრილის პარამეტრები"
 
-#: libraries/rte/rte_routines.lib.php:899
+#: libraries/rte/rte_routines.lib.php:990
 msgid "Is deterministic"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:920
+#: libraries/rte/rte_routines.lib.php:1011
 msgid ""
 "You do not have sufficient privileges to perform this operation; Please "
 "refer to the documentation for more details"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:935
+#: libraries/rte/rte_routines.lib.php:1026
 #, fuzzy
 #| msgid "Security"
 msgid "Security type"
 msgstr "უსაფრთხოება"
 
-#: libraries/rte/rte_routines.lib.php:944
+#: libraries/rte/rte_routines.lib.php:1035
 msgid "SQL data access"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1013
+#: libraries/rte/rte_routines.lib.php:1104
 #, fuzzy
 #| msgid "Invalid table name"
 msgid "You must provide a routine name!"
 msgstr "ცხრილის არასწორი სახელი"
 
-#: libraries/rte/rte_routines.lib.php:1047
+#: libraries/rte/rte_routines.lib.php:1138
 #, php-format
 msgid "Invalid direction \"%s\" given for parameter."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1069
-#: libraries/rte/rte_routines.lib.php:1131
+#: libraries/rte/rte_routines.lib.php:1160
+#: libraries/rte/rte_routines.lib.php:1222
 msgid ""
 "You must provide length/values for routine parameters of type ENUM, SET, "
 "VARCHAR and VARBINARY."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1095
+#: libraries/rte/rte_routines.lib.php:1186
 msgid "You must provide a name and a type for each routine parameter."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1114
+#: libraries/rte/rte_routines.lib.php:1205
 msgid "You must provide a valid return type for the routine."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1174
+#: libraries/rte/rte_routines.lib.php:1265
 msgid "You must provide a routine definition."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1285
+#: libraries/rte/rte_routines.lib.php:1376
 #, fuzzy, php-format
 #| msgid "Allows executing stored routines."
 msgid "Execution results of routine %s"
 msgstr "Allows executing stored routines."
 
-#: libraries/rte/rte_routines.lib.php:1340
+#: libraries/rte/rte_routines.lib.php:1431
 #, php-format
 msgid "%d row affected by the last statement inside the procedure."
 msgid_plural "%d rows affected by the last statement inside the procedure."
 msgstr[0] ""
 
-#: libraries/rte/rte_routines.lib.php:1398
-#: libraries/rte/rte_routines.lib.php:1406
+#: libraries/rte/rte_routines.lib.php:1489
+#: libraries/rte/rte_routines.lib.php:1497
 msgid "Execute routine"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1485
-#: libraries/rte/rte_routines.lib.php:1488
+#: libraries/rte/rte_routines.lib.php:1576
+#: libraries/rte/rte_routines.lib.php:1579
 #, fuzzy
 #| msgid "Routines"
 msgid "Routine parameters"
@@ -13068,7 +13084,7 @@ msgid "Original position"
 msgstr "საწყისი მდებარეობა"
 
 #: libraries/server_bin_log.lib.php:133
-#: templates/structure/display_table_stats.phtml:4
+#: templates/table/structure/display_table_stats.phtml:4
 msgid "Information"
 msgstr "ინფორმაცია"
 
@@ -13104,12 +13120,12 @@ msgid ""
 "between the web server and the MySQL server."
 msgstr ""
 
-#: libraries/server_databases.lib.php:364
-#: libraries/server_databases.lib.php:365
+#: libraries/server_databases.lib.php:366
+#: libraries/server_databases.lib.php:371
 msgid "Enable Statistics"
 msgstr "სტატისტიკის ჩართვა"
 
-#: libraries/server_databases.lib.php:481
+#: libraries/server_databases.lib.php:492
 #, fuzzy, php-format
 #| msgid "%s databases have been dropped successfully."
 msgid "%1$d database has been dropped successfully."
@@ -13480,7 +13496,7 @@ msgid "You have revoked the privileges for %s."
 msgstr ""
 
 #: libraries/server_privileges.lib.php:2059
-#: libraries/server_privileges.lib.php:4290
+#: libraries/server_privileges.lib.php:4316
 #, fuzzy
 #| msgid "Add user"
 msgid "Add user account"
@@ -13664,60 +13680,60 @@ msgstr "%s-ის წაშლა"
 msgid "The privileges were reloaded successfully."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:3994
+#: libraries/server_privileges.lib.php:4003
 #, php-format
 msgid "The user %s already exists!"
 msgstr "მომხმარებელი %s უკვე არსებობს!"
 
-#: libraries/server_privileges.lib.php:4232
+#: libraries/server_privileges.lib.php:4258
 #, fuzzy, php-format
 #| msgid "Privileges"
 msgid "Privileges for %s"
 msgstr "პრივილეგიები"
 
-#: libraries/server_privileges.lib.php:4241
+#: libraries/server_privileges.lib.php:4267
 #: libraries/server_status_processes.lib.php:72
 #: libraries/server_user_groups.lib.php:39
 msgid "User"
 msgstr "მომხმარებელი"
 
-#: libraries/server_privileges.lib.php:4282
+#: libraries/server_privileges.lib.php:4308
 msgctxt "Create new user"
 msgid "New"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4311
+#: libraries/server_privileges.lib.php:4337
 #, fuzzy
 #| msgid "Edit Privileges"
 msgid "Edit privileges:"
 msgstr "პრივილეგიების რედაქტირება"
 
-#: libraries/server_privileges.lib.php:4312
+#: libraries/server_privileges.lib.php:4338
 #, fuzzy
 #| msgid "User"
 msgid "User account"
 msgstr "მომხმარებელი"
 
-#: libraries/server_privileges.lib.php:4371
+#: libraries/server_privileges.lib.php:4397
 msgid ""
 "Note: You are attempting to edit privileges of the user with which you are "
 "currently logged in."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4391 libraries/server_users.lib.php:25
+#: libraries/server_privileges.lib.php:4417 libraries/server_users.lib.php:25
 #, fuzzy
 #| msgid "User overview"
 msgid "User accounts overview"
 msgstr "მომხმარებლის მიმოხილვა"
 
-#: libraries/server_privileges.lib.php:4459
+#: libraries/server_privileges.lib.php:4485
 msgid ""
 "A user account allowing any user from localhost to connect is present. This "
 "will prevent other users from connecting if the host part of their account "
 "allows a connection from any (%) host."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4500
+#: libraries/server_privileges.lib.php:4526
 #, php-format
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
@@ -13726,7 +13742,7 @@ msgid ""
 "%sreload the privileges%s before you continue."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4519
+#: libraries/server_privileges.lib.php:4545
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
 "tables. The content of these tables may differ from the privileges the "
@@ -13735,65 +13751,65 @@ msgid ""
 "privilege."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4569
+#: libraries/server_privileges.lib.php:4595
 msgid "The selected user was not found in the privilege table."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4801
+#: libraries/server_privileges.lib.php:4827
 msgid "You have added a new user."
 msgstr "თქვენ დაამატეთ ახალი მომხმარებელი."
 
-#: libraries/server_status.lib.php:53
+#: libraries/server_status.lib.php:60
 #, php-format
 msgid "Network traffic since startup: %s"
 msgstr ""
 
-#: libraries/server_status.lib.php:66
+#: libraries/server_status.lib.php:73
 #, fuzzy, php-format
 #| msgid "This MySQL server has been running for %s. It started up on %s."
 msgid "This MySQL server has been running for %1$s. It started up on %2$s."
 msgstr "MySQL სერვერის მუშაობის პერიოდი - %s. გაშვების დრო - %s."
 
-#: libraries/server_status.lib.php:80
+#: libraries/server_status.lib.php:94
 msgid ""
 "This MySQL server works as <b>master</b> and <b>slave</b> in <b>replication</"
 "b> process."
 msgstr ""
 
-#: libraries/server_status.lib.php:85
+#: libraries/server_status.lib.php:99
 msgid "This MySQL server works as <b>master</b> in <b>replication</b> process."
 msgstr ""
 
-#: libraries/server_status.lib.php:90
+#: libraries/server_status.lib.php:104
 msgid "This MySQL server works as <b>slave</b> in <b>replication</b> process."
 msgstr ""
 
-#: libraries/server_status.lib.php:106
+#: libraries/server_status.lib.php:116
 #, fuzzy
 msgid "Replication status"
 msgstr "რეპლიკაცია"
 
-#: libraries/server_status.lib.php:137
+#: libraries/server_status.lib.php:146
 msgid ""
 "On a busy server, the byte counters may overrun, so those statistics as "
 "reported by the MySQL server may be incorrect."
 msgstr ""
 
-#: libraries/server_status.lib.php:148
+#: libraries/server_status.lib.php:157
 msgid "Received"
 msgstr "მიღებულია"
 
-#: libraries/server_status.lib.php:167
+#: libraries/server_status.lib.php:176
 msgid "Sent"
 msgstr "გაიგზავნა"
 
-#: libraries/server_status.lib.php:234
+#: libraries/server_status.lib.php:243
 #, fuzzy
 #| msgid "Insecure connection"
 msgid "Max. concurrent connections"
 msgstr "დაუცველი კავშირი"
 
-#: libraries/server_status.lib.php:244
+#: libraries/server_status.lib.php:253
 msgid "Failed attempts"
 msgstr ""
 
@@ -14786,7 +14802,7 @@ msgstr ""
 msgid "Not implemented yet."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/AlterOperation.php:193
+#: libraries/sql-parser/src/Components/AlterOperation.php:191
 msgid "Unrecognized alter operation."
 msgstr ""
 
@@ -14800,7 +14816,7 @@ msgid "An opening bracket followed by a set of values was expected."
 msgstr ""
 
 #: libraries/sql-parser/src/Components/ArrayObj.php:101
-#: libraries/sql-parser/src/Components/FieldDefinition.php:202
+#: libraries/sql-parser/src/Components/CreateDefinition.php:202
 msgid "An opening bracket was expected."
 msgstr ""
 
@@ -14808,25 +14824,35 @@ msgstr ""
 msgid "A comma or a closing bracket was expected"
 msgstr ""
 
+#: libraries/sql-parser/src/Components/CreateDefinition.php:246
+#, fuzzy
+#| msgid "Remove selected users"
+msgid "A comma or a closing bracket was expected."
+msgstr "Remove selected users"
+
+#: libraries/sql-parser/src/Components/CreateDefinition.php:262
+msgid "A closing bracket was expected."
+msgstr ""
+
 #: libraries/sql-parser/src/Components/DataType.php:125
 msgid "Unrecognized data type."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:225
+#: libraries/sql-parser/src/Components/Expression.php:227
 msgid "Unexpected closing bracket."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:246
-#: libraries/sql-parser/src/Components/Expression.php:283
-#: libraries/sql-parser/src/Components/Expression.php:303
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:285
+#: libraries/sql-parser/src/Components/Expression.php:305
 msgid "An alias was previously found."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:257
+#: libraries/sql-parser/src/Components/Expression.php:259
 msgid "Unexpected dot."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:327
+#: libraries/sql-parser/src/Components/Expression.php:329
 #, fuzzy
 #| msgid "Remove selected users"
 msgid "An alias was expected."
@@ -14838,16 +14864,6 @@ msgstr "Remove selected users"
 msgid "An expression was expected."
 msgstr "Remove selected users"
 
-#: libraries/sql-parser/src/Components/FieldDefinition.php:246
-#, fuzzy
-#| msgid "Remove selected users"
-msgid "A comma or a closing bracket was expected."
-msgstr "Remove selected users"
-
-#: libraries/sql-parser/src/Components/FieldDefinition.php:262
-msgid "A closing bracket was expected."
-msgstr ""
-
 #: libraries/sql-parser/src/Components/Limit.php:90
 #: libraries/sql-parser/src/Components/Limit.php:112
 msgid "An offset was expected."
@@ -14889,27 +14905,27 @@ msgstr ""
 msgid "Expected delimiter."
 msgstr ""
 
-#: libraries/sql-parser/src/Lexer.php:753
+#: libraries/sql-parser/src/Lexer.php:777
 #, fuzzy, php-format
 #| msgid "Table %1$s has been created."
 msgid "Ending quote %1$s was expected."
 msgstr "Table %1$s has been created."
 
-#: libraries/sql-parser/src/Lexer.php:789
+#: libraries/sql-parser/src/Lexer.php:813
 msgid "Variable name was expected."
 msgstr ""
 
-#: libraries/sql-parser/src/Parser.php:380
+#: libraries/sql-parser/src/Parser.php:391
 #, fuzzy
 #| msgid "At Beginning of Table"
 msgid "Unexpected beginning of statement."
 msgstr "ცხრილის დასაწყისში"
 
-#: libraries/sql-parser/src/Parser.php:399
+#: libraries/sql-parser/src/Parser.php:410
 msgid "Unrecognized statement type."
 msgstr ""
 
-#: libraries/sql-parser/src/Parser.php:479
+#: libraries/sql-parser/src/Parser.php:489
 msgid "No transaction was previously started."
 msgstr ""
 
@@ -14935,8 +14951,10 @@ msgid "The name of the entity was expected."
 msgstr ""
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:310
-msgid "At least one field definition was expected."
-msgstr ""
+#, fuzzy
+#| msgid "The row has been deleted."
+msgid "At least one column definition was expected."
+msgstr "სტრიქონი წაიშალა"
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:329
 msgid "A \"RETURNS\" keyword was expected."
@@ -15009,25 +15027,25 @@ msgstr "ცხრილის ჩანიშვნა"
 msgid "Using bookmark \"%s\" as default browse query."
 msgstr ""
 
-#: libraries/sql.lib.php:1306
+#: libraries/sql.lib.php:1300
 msgid "Showing as PHP code"
 msgstr "PHP კოდის სახით ჩვენება"
 
-#: libraries/sql.lib.php:1638
+#: libraries/sql.lib.php:1632
 #, php-format
 msgid ""
 "Current selection does not contain a unique column. Grid edit, checkbox, "
 "Edit, Copy and Delete features are not available. %s"
 msgstr ""
 
-#: libraries/sql.lib.php:1649
+#: libraries/sql.lib.php:1643
 #, php-format
 msgid ""
 "Current selection does not contain a unique column. Grid edit, Edit, Copy "
 "and Delete features may result in undesired behavior. %s"
 msgstr ""
 
-#: libraries/sql.lib.php:1688
+#: libraries/sql.lib.php:1682
 #, php-format
 msgid "Problems with indexes of table `%s`"
 msgstr ""
@@ -15196,7 +15214,7 @@ msgid "Version %s snapshot (SQL code)"
 msgstr ""
 
 #: libraries/tracking.lib.php:947
-#: templates/structure/table_structure_row.phtml:33
+#: templates/table/structure/table_structure_row.phtml:33
 #, fuzzy
 #| msgid "None"
 msgctxt "None for default"
@@ -15250,19 +15268,19 @@ msgstr "Create relation"
 msgid "Version %1$s was created, tracking for %2$s is active."
 msgstr ""
 
-#: libraries/user_preferences.inc.php:29
+#: libraries/user_preferences.inc.php:30
 #, fuzzy
 #| msgid "Other core settings"
 msgid "Manage your settings"
 msgstr "Other core settings"
 
-#: libraries/user_preferences.inc.php:46 prefs_manage.php:307
+#: libraries/user_preferences.inc.php:54 prefs_manage.php:307
 #, fuzzy
 #| msgid "Modifications have been saved"
 msgid "Configuration has been saved."
 msgstr "ცვლილებები შენახულია"
 
-#: libraries/user_preferences.inc.php:66
+#: libraries/user_preferences.inc.php:74
 #, php-format
 msgid ""
 "Your preferences will be saved for current session only. Storing them "
@@ -15683,7 +15701,7 @@ msgid "first"
 msgstr ""
 
 #: templates/columns_definitions/move_column.phtml:12
-#: templates/structure/add_column.phtml:21
+#: templates/table/structure/add_column.phtml:21
 #, fuzzy, php-format
 #| msgid "After %s"
 msgid "after %s"
@@ -15765,240 +15783,352 @@ msgstr "ინფორმაცია ბრაუზერის შესა
 msgid "Input transformation options"
 msgstr "გარდაქმნის პარამეტრები"
 
-#: templates/designer/aggregate_query_panel.phtml:22
-#: templates/designer/options_panel.phtml:100
+#: templates/database/create_table.phtml:7
+#: templates/database/designer/side_menu.phtml:77
+#: templates/database/designer/side_menu.phtml:80
+msgid "Create table"
+msgstr "ცხრილის შექმნა"
+
+#: templates/database/create_table.phtml:15
+#, fuzzy
+#| msgid "Number of fields"
+msgid "Number of columns"
+msgstr "ველების რაოდენობა"
+
+#: templates/database/designer/aggregate_query_panel.phtml:22
+#: templates/database/designer/options_panel.phtml:100
 #, fuzzy
 #| msgid "Create"
 msgid "Aggregate"
 msgstr "შექმნა"
 
-#: templates/designer/aggregate_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:61
-#: templates/designer/options_panel.phtml:106
-#: templates/designer/options_panel.phtml:170
-#: templates/designer/where_query_panel.phtml:30
-#: templates/table/table_header.phtml:9
+#: templates/database/designer/aggregate_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:61
+#: templates/database/designer/options_panel.phtml:106
+#: templates/database/designer/options_panel.phtml:170
+#: templates/database/designer/where_query_panel.phtml:30
+#: templates/table/search/table_header.phtml:9
 msgid "Operator"
 msgstr "ოპერატორი"
 
-#: templates/designer/database_tables.phtml:29
+#: templates/database/designer/database_tables.phtml:29
 msgid "Toggle"
 msgstr ""
 
-#: templates/designer/database_tables.phtml:40
+#: templates/database/designer/database_tables.phtml:40
 #, fuzzy
 #| msgid "Database for user"
 msgid "See table structure"
 msgstr "მონაცემთა ბაზა მომხმარებლისთვის"
 
-#: templates/designer/delete_relation_panel.phtml:21
+#: templates/database/designer/delete_relation_panel.phtml:21
 msgid "Delete relation"
 msgstr ""
 
-#: templates/designer/edit_delete_pages.phtml:7
+#: templates/database/designer/edit_delete_pages.phtml:7
 #, fuzzy
 #| msgid "Page number:"
 msgid "Page to open"
 msgstr "გვერდის ნომერი:"
 
-#: templates/designer/edit_delete_pages.phtml:7
+#: templates/database/designer/edit_delete_pages.phtml:7
 #, fuzzy
 #| msgid "Page number:"
 msgid "Page to delete"
 msgstr "გვერდის ნომერი:"
 
-#: templates/designer/having_query_panel.phtml:90
-#: templates/designer/options_panel.phtml:63
-#: templates/designer/options_panel.phtml:229
-#: templates/designer/where_query_panel.phtml:59
+#: templates/database/designer/having_query_panel.phtml:90
+#: templates/database/designer/options_panel.phtml:63
+#: templates/database/designer/options_panel.phtml:229
+#: templates/database/designer/where_query_panel.phtml:59
 #, fuzzy
 #| msgid "Export"
 msgid "Except"
 msgstr "ექსპორტი"
 
-#: templates/designer/having_query_panel.phtml:102
-#: templates/designer/options_panel.phtml:75
-#: templates/designer/options_panel.phtml:241
-#: templates/designer/where_query_panel.phtml:71
+#: templates/database/designer/having_query_panel.phtml:102
+#: templates/database/designer/options_panel.phtml:75
+#: templates/database/designer/options_panel.phtml:241
+#: templates/database/designer/where_query_panel.phtml:71
 #, fuzzy
 #| msgid "in query"
 msgid "subquery"
 msgstr "მოთხოვნაში"
 
-#: templates/designer/new_relation_panel.phtml:22
-#: templates/designer/side_menu.phtml:84 templates/designer/side_menu.phtml:87
+#: templates/database/designer/new_relation_panel.phtml:22
+#: templates/database/designer/side_menu.phtml:84
+#: templates/database/designer/side_menu.phtml:87
 msgid "Create relation"
 msgstr ""
 
-#: templates/designer/options_panel.phtml:34
-#: templates/designer/options_panel.phtml:200
+#: templates/database/designer/options_panel.phtml:34
+#: templates/database/designer/options_panel.phtml:200
 #, fuzzy
 #| msgid "Relation deleted"
 msgid "Relation operator"
 msgstr "Relation deleted"
 
-#: templates/designer/options_panel.phtml:85
-#: templates/designer/rename_to_panel.phtml:23
+#: templates/database/designer/options_panel.phtml:85
+#: templates/database/designer/rename_to_panel.phtml:23
 #, fuzzy
 msgid "Rename to"
 msgstr "Rename table to"
 
-#: templates/designer/options_panel.phtml:91
-#: templates/designer/rename_to_panel.phtml:31
+#: templates/database/designer/options_panel.phtml:91
+#: templates/database/designer/rename_to_panel.phtml:31
 #, fuzzy
 #| msgid "User name"
 msgid "New name"
 msgstr "მომხმარებლის სახელი"
 
-#: templates/designer/page_save_as.phtml:4
+#: templates/database/designer/page_save_as.phtml:4
 #, fuzzy
 #| msgid "Export/Import to scale"
 msgid "Save to selected page"
 msgstr "Export/Import to scale"
 
-#: templates/designer/page_save_as.phtml:5
+#: templates/database/designer/page_save_as.phtml:5
 #, fuzzy
 #| msgid "Create a new index"
 msgid "Create a page and save to it"
 msgstr "ახალი ინდექსის შექმნა"
 
-#: templates/designer/page_save_as.phtml:26
+#: templates/database/designer/page_save_as.phtml:26
 #, fuzzy
 #| msgid "User name"
 msgid "New page name"
 msgstr "მომხმარებლის სახელი"
 
-#: templates/designer/page_selector.phtml:2
+#: templates/database/designer/page_selector.phtml:2
 #, fuzzy
 #| msgid "Select All"
 msgid "Select page"
 msgstr "ყველას მონიშნვა"
 
-#: templates/designer/query_details.phtml:10
+#: templates/database/designer/query_details.phtml:10
 #, fuzzy
 #| msgid "Table options"
 msgid "Active options"
 msgstr "ცხრილის პარამეტრები"
 
-#: templates/designer/schema_export.phtml:4
+#: templates/database/designer/schema_export.phtml:4
 msgid "Select Export Relational Type"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:19 templates/designer/side_menu.phtml:25
+#: templates/database/designer/side_menu.phtml:19
+#: templates/database/designer/side_menu.phtml:25
 #, fuzzy
 #| msgid "Show tables"
 msgid "Show/Hide tables list"
 msgstr "ცხრილების ჩვენება"
 
-#: templates/designer/side_menu.phtml:29 templates/designer/side_menu.phtml:35
-#: templates/designer/side_menu.phtml:36
+#: templates/database/designer/side_menu.phtml:29
+#: templates/database/designer/side_menu.phtml:35
+#: templates/database/designer/side_menu.phtml:36
 msgid "View in fullscreen"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:34
+#: templates/database/designer/side_menu.phtml:34
 msgid "Exit fullscreen"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:41 templates/designer/side_menu.phtml:45
+#: templates/database/designer/side_menu.phtml:41
+#: templates/database/designer/side_menu.phtml:45
 #, fuzzy
 #| msgid "User name"
 msgid "New page"
 msgstr "მომხმარებლის სახელი"
 
-#: templates/designer/side_menu.phtml:70 templates/designer/side_menu.phtml:73
+#: templates/database/designer/side_menu.phtml:70
+#: templates/database/designer/side_menu.phtml:73
 #, fuzzy
 #| msgid "Select All"
 msgid "Delete pages"
 msgstr "ყველას მონიშნვა"
 
-#: templates/designer/side_menu.phtml:77 templates/designer/side_menu.phtml:80
-#: templates/table/create_table.phtml:7
-msgid "Create table"
-msgstr "ცხრილის შექმნა"
-
-#: templates/designer/side_menu.phtml:98
-#: templates/designer/side_menu.phtml:101
+#: templates/database/designer/side_menu.phtml:98
+#: templates/database/designer/side_menu.phtml:101
 msgid "Reload"
 msgstr "გადატვირთვა"
 
-#: templates/designer/side_menu.phtml:107
-#: templates/designer/side_menu.phtml:110
+#: templates/database/designer/side_menu.phtml:107
+#: templates/database/designer/side_menu.phtml:110
 msgid "Help"
 msgstr "დახმარება"
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Angular links"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Direct links"
 msgstr "პირდაპირი ბმულები"
 
-#: templates/designer/side_menu.phtml:122
-#: templates/designer/side_menu.phtml:124
+#: templates/database/designer/side_menu.phtml:122
+#: templates/database/designer/side_menu.phtml:124
 msgid "Snap to grid"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:128
-#: templates/designer/side_menu.phtml:134
+#: templates/database/designer/side_menu.phtml:128
+#: templates/database/designer/side_menu.phtml:134
 msgid "Small/Big All"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:138
-#: templates/designer/side_menu.phtml:141
+#: templates/database/designer/side_menu.phtml:138
+#: templates/database/designer/side_menu.phtml:141
 msgid "Toggle small/big"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:145
-#: templates/designer/side_menu.phtml:148
+#: templates/database/designer/side_menu.phtml:145
+#: templates/database/designer/side_menu.phtml:148
 #, fuzzy
 #| msgid "To select relation, click :"
 msgid "Toggle relation lines"
 msgstr "To select relation, click :"
 
-#: templates/designer/side_menu.phtml:153
-#: templates/designer/side_menu.phtml:156
+#: templates/database/designer/side_menu.phtml:153
+#: templates/database/designer/side_menu.phtml:156
 #, fuzzy
 #| msgid "Export"
 msgid "Export schema"
 msgstr "ექსპორტი"
 
-#: templates/designer/side_menu.phtml:165
-#: templates/designer/side_menu.phtml:168
+#: templates/database/designer/side_menu.phtml:165
+#: templates/database/designer/side_menu.phtml:168
 #, fuzzy
 #| msgid "Submit Query"
 msgid "Build Query"
 msgstr "მოთხოვნის გაგზავნა"
 
-#: templates/designer/side_menu.phtml:173
-#: templates/designer/side_menu.phtml:177
+#: templates/database/designer/side_menu.phtml:173
+#: templates/database/designer/side_menu.phtml:177
 msgid "Move Menu"
 msgstr "მენიუს გადატანა"
 
-#: templates/designer/side_menu.phtml:181
-#: templates/designer/side_menu.phtml:186
+#: templates/database/designer/side_menu.phtml:181
+#: templates/database/designer/side_menu.phtml:186
 #, fuzzy
 #| msgid "Partial Texts"
 msgid "Pin text"
 msgstr "Partial Texts"
 
-#: templates/designer/table_list.phtml:4
+#: templates/database/designer/table_list.phtml:4
 msgid "Hide/Show all"
 msgstr "ყველას დამალვა/ჩვენება"
 
-#: templates/designer/table_list.phtml:14
+#: templates/database/designer/table_list.phtml:14
 msgid "Hide/Show Tables with no relation"
 msgstr ""
 
-#: templates/designer/table_list.phtml:59
+#: templates/database/designer/table_list.phtml:59
 #, fuzzy
 #| msgid "Number of tables"
 msgid "Number of tables:"
 msgstr "ცხრილების რაოდენობა"
 
+#: templates/database/structure/body_for_table_summary.phtml:6
+#, php-format
+msgid "%s table"
+msgid_plural "%s tables"
+msgstr[0] ""
+
+#: templates/database/structure/body_for_table_summary.phtml:17
+msgid "Sum"
+msgstr "ჯამი"
+
+#: templates/database/structure/check_all_tables.phtml:6
+msgid "Check tables having overhead"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:10
+#, fuzzy
+#| msgid "Show color"
+msgid "Show create"
+msgstr "ფერის ჩვენება"
+
+#: templates/database/structure/check_all_tables.phtml:27
+#, fuzzy
+#| msgid "Add new field"
+msgid "Prefix"
+msgstr "ახალი ველის დამატება"
+
+#: templates/database/structure/check_all_tables.phtml:28
+msgid "Add prefix to table"
+msgstr "პრეფიქსის დამატება მაგიდისათვის"
+
+#: templates/database/structure/check_all_tables.phtml:29
+#, fuzzy
+#| msgid "Replace table data with file"
+msgid "Replace table prefix"
+msgstr "Replace table data with file"
+
+#: templates/database/structure/check_all_tables.phtml:30
+#, fuzzy
+#| msgid "Replace table data with file"
+msgid "Copy table with prefix"
+msgstr "Replace table data with file"
+
+#: templates/database/structure/check_all_tables.phtml:36
+#, fuzzy
+#| msgid "Add %s field(s)"
+msgid "Add columns to central list"
+msgstr "%s ველის დამატება"
+
+#: templates/database/structure/check_all_tables.phtml:37
+msgid "Remove columns from central list"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:38
+#, fuzzy
+#| msgid "Add %s field(s)"
+msgid "Make consistent with central list"
+msgstr "%s ველის დამატება"
+
+#: templates/database/structure/favorite_anchor.phtml:12
+#, fuzzy
+#| msgid "Add a new server"
+msgid "Add to Favorites"
+msgstr "ახალი სერვერის დამატება"
+
+#: templates/database/structure/show_create.phtml:2
+#, fuzzy
+#| msgid "Show SQL queries"
+msgid "Showing create queries"
+msgstr "SQL მოთხოვნების ჩვენება"
+
+#: templates/database/structure/sortable_header.phtml:13
+msgid "Sort"
+msgstr "დალაგება"
+
+#: templates/database/structure/table_header.phtml:42
+#, fuzzy
+#| msgid "May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]"
+msgid ""
+"May be approximate. Click on the number to get the exact count. See "
+"[doc@faq3-11]FAQ 3.11[/doc]."
+msgstr "შეიძლება იყოს მიახლოებითი. იხილეთ [doc@faq3-11]FAQ 3.11[/doc]"
+
+#: templates/database/structure/table_header.phtml:66
+#: templates/table/index_form.phtml:127
+msgid "Size"
+msgstr "ზომა"
+
+#: templates/database/structure/table_header.phtml:74
+#: templates/table/structure/display_table_stats.phtml:27
+msgid "Overhead"
+msgstr "Overhead"
+
+#: templates/database/structure/tracking_icon.phtml:4
+msgid "Tracking is active."
+msgstr ""
+
+#: templates/database/structure/tracking_icon.phtml:8
+msgid "Tracking is not active."
+msgstr ""
+
 #: templates/error/report_form.phtml:7
 msgid ""
 "phpMyAdmin has encountered an error. We have collected data about this error "
@@ -16014,71 +16144,6 @@ msgstr ""
 msgid "Please explain the steps that lead to the error:"
 msgstr ""
 
-#: templates/gis_visualization/gis_visualization.phtml:3
-msgid "Display GIS Visualization"
-msgstr "ჩვენების GIS ვიზუალიზაცია"
-
-#: templates/gis_visualization/gis_visualization.phtml:8
-#, fuzzy
-#| msgid "CHAR textarea columns"
-msgid "Label column"
-msgstr "CHAR textarea columns"
-
-#: templates/gis_visualization/gis_visualization.phtml:11
-#, fuzzy
-#| msgid "- none -"
-msgid "-- None --"
-msgstr "- არაა -"
-
-#: templates/gis_visualization/gis_visualization.phtml:19
-#, fuzzy
-#| msgid "Log file count"
-msgid "Spatial column"
-msgstr "Log file count"
-
-#: templates/index_form.phtml:16
-msgid "Index name:"
-msgstr "ინდექსის სახელი:"
-
-#: templates/index_form.phtml:19
-msgid ""
-"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
-msgstr ""
-
-#: templates/index_form.phtml:40
-#, fuzzy
-#| msgid "Index name:"
-msgid "Index choice:"
-msgstr "ინდექსის სახელი:"
-
-#: templates/index_form.phtml:57
-msgid "Key block size:"
-msgstr ""
-
-#: templates/index_form.phtml:74
-msgid "Index type:"
-msgstr "ინდექსის ტიპი:"
-
-#: templates/index_form.phtml:86
-#, fuzzy
-#| msgid "User"
-msgid "Parser:"
-msgstr "მომხმარებელი"
-
-#: templates/index_form.phtml:102
-#, fuzzy
-#| msgid "Comment"
-msgid "Comment:"
-msgstr "კომენტარი"
-
-#: templates/index_form.phtml:127 templates/structure/table_header.phtml:66
-msgid "Size"
-msgstr "ზომა"
-
-#: templates/index_form.phtml:149 templates/index_form.phtml:190
-msgid "Drag to reorder"
-msgstr ""
-
 #: templates/prefs_autoload.phtml:9
 msgid ""
 "Your browser has phpMyAdmin configuration for this domain. Would you like to "
@@ -16091,505 +16156,465 @@ msgstr ""
 msgid "Start row:"
 msgstr "Startup"
 
-#: templates/structure/actions_in_table_structure.phtml:14
-#, php-format
-msgid "A primary key has been added on %s."
-msgstr ""
-
-#: templates/structure/actions_in_table_structure.phtml:34
-#: templates/structure/actions_in_table_structure.phtml:54
-#: templates/structure/actions_in_table_structure.phtml:79
-#: templates/structure/actions_in_table_structure.phtml:101
-#, php-format
-msgid "An index has been added on %s."
-msgstr ""
-
-#: templates/structure/actions_in_table_structure.phtml:130
-#: templates/structure/check_all_table_column.phtml:59
-#, fuzzy
-#| msgid "Rename database to"
-msgid "Remove from central columns"
-msgstr "Rename database to"
-
-#: templates/structure/actions_in_table_structure.phtml:138
-#: templates/structure/check_all_table_column.phtml:55
-#, fuzzy
-#| msgid "Add %s field(s)"
-msgid "Add to central columns"
-msgstr "%s ველის დამატება"
-
-#: templates/structure/add_column.phtml:7
-#, fuzzy, php-format
-#| msgid "Add %s field(s)"
-msgid "Add %s column(s)"
-msgstr "%s ველის დამატება"
-
-#: templates/structure/add_column.phtml:12
-#, fuzzy
-#| msgid "At Beginning of Table"
-msgid "at beginning of table"
-msgstr "ცხრილის დასაწყისში"
-
-#: templates/structure/body_for_table_summary.phtml:6
-#, php-format
-msgid "%s table"
-msgid_plural "%s tables"
-msgstr[0] ""
-
-#: templates/structure/body_for_table_summary.phtml:17
-msgid "Sum"
-msgstr "ჯამი"
-
-#: templates/structure/check_all_tables.phtml:6
-msgid "Check tables having overhead"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:10
-#, fuzzy
-#| msgid "Show color"
-msgid "Show create"
-msgstr "ფერის ჩვენება"
-
-#: templates/structure/check_all_tables.phtml:27
-#, fuzzy
-#| msgid "Add new field"
-msgid "Prefix"
-msgstr "ახალი ველის დამატება"
-
-#: templates/structure/check_all_tables.phtml:28
-msgid "Add prefix to table"
-msgstr "პრეფიქსის დამატება მაგიდისათვის"
-
-#: templates/structure/check_all_tables.phtml:29
-#, fuzzy
-#| msgid "Replace table data with file"
-msgid "Replace table prefix"
-msgstr "Replace table data with file"
-
-#: templates/structure/check_all_tables.phtml:30
-#, fuzzy
-#| msgid "Replace table data with file"
-msgid "Copy table with prefix"
-msgstr "Replace table data with file"
-
-#: templates/structure/check_all_tables.phtml:36
-#, fuzzy
-#| msgid "Add %s field(s)"
-msgid "Add columns to central list"
-msgstr "%s ველის დამატება"
-
-#: templates/structure/check_all_tables.phtml:37
-msgid "Remove columns from central list"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:38
-#, fuzzy
-#| msgid "Add %s field(s)"
-msgid "Make consistent with central list"
-msgstr "%s ველის დამატება"
-
-#: templates/structure/display_structure.phtml:140 view_create.php:181
-#, fuzzy
-#| msgid "Print view"
-msgid "Edit view"
-msgstr "ხედის ამობეჭდვა"
-
-#: templates/structure/display_table_stats.phtml:9
-msgid "Space usage"
-msgstr "ადგილის გამოყენება"
-
-#: templates/structure/display_table_stats.phtml:27
-#: templates/structure/table_header.phtml:74
-msgid "Overhead"
-msgstr "Overhead"
-
-#: templates/structure/display_table_stats.phtml:32
-msgid "Effective"
-msgstr "ეფექტური"
-
-#: templates/structure/favorite_anchor.phtml:12
-#, fuzzy
-#| msgid "Add a new server"
-msgid "Add to Favorites"
-msgstr "ახალი სერვერის დამატება"
-
-#: templates/structure/move_columns_dialog.phtml:1
-#: templates/structure/optional_action_links.phtml:21
-#, fuzzy
-#| msgid "Add %s field(s)"
-msgid "Move columns"
-msgstr "%s ველის დამატება"
-
-#: templates/structure/move_columns_dialog.phtml:2
-msgid "Move the columns by dragging them up and down."
-msgstr ""
-
-#: templates/structure/optional_action_links.phtml:9
-msgid "Propose table structure"
-msgstr "ცხრილის სტრუქტურის შეთავაზება"
-
-#: templates/structure/optional_action_links.phtml:24
-#, fuzzy
-#| msgid "Propose table structure"
-msgid "Improve table structure"
-msgstr "ცხრილის სტრუქტურის შეთავაზება"
-
-#: templates/structure/optional_action_links.phtml:30
-#, fuzzy
-msgid "Track view"
-msgstr "ცხრილის შემოწმება"
-
-#: templates/structure/row_stats_table.phtml:3
-#, fuzzy
-#| msgid "Show statistics"
-msgid "Row statistics"
-msgstr "სტატისტიკის ჩევნება"
-
-#: templates/structure/row_stats_table.phtml:9
-msgid "static"
-msgstr "სტატიკური"
-
-#: templates/structure/row_stats_table.phtml:11
-msgid "dynamic"
-msgstr "დინამიური"
-
-#: templates/structure/row_stats_table.phtml:22
-msgid "partitioned"
-msgstr "დაყოფილი"
-
-#: templates/structure/row_stats_table.phtml:54
-msgid "Row length"
-msgstr "სტრიქონის სიგრძე"
-
-#: templates/structure/row_stats_table.phtml:66
-msgid "Row size"
-msgstr "სტრიქონის ზომა"
-
-#: templates/structure/row_stats_table.phtml:73
-msgid "Next autoindex"
-msgstr ""
-
-#: templates/structure/secondary_tabs.phtml:14
-#, fuzzy
-#| msgid "Relation view"
-msgid "Relation view"
-msgstr "Relation view"
-
-#: templates/structure/show_create.phtml:2
-#, fuzzy
-#| msgid "Show SQL queries"
-msgid "Showing create queries"
-msgstr "SQL მოთხოვნების ჩვენება"
-
-#: templates/structure/sortable_header.phtml:13
-msgid "Sort"
-msgstr "დალაგება"
-
-#: templates/structure/table_header.phtml:42
-#, fuzzy
-#| msgid "May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]"
-msgid ""
-"May be approximate. Click on the number to get the exact count. See "
-"[doc@faq3-11]FAQ 3.11[/doc]."
-msgstr "შეიძლება იყოს მიახლოებითი. იხილეთ [doc@faq3-11]FAQ 3.11[/doc]"
-
-#: templates/structure/table_structure_row.phtml:46
-#, fuzzy, php-format
-#| msgid "Table %s has been dropped."
-msgid "Column %s has been dropped."
-msgstr "Table %s has been dropped"
-
-#: templates/structure/tracking_icon.phtml:4
-msgid "Tracking is active."
-msgstr ""
-
-#: templates/structure/tracking_icon.phtml:8
-msgid "Tracking is not active."
-msgstr ""
-
-#: templates/table/create_table.phtml:15
-#, fuzzy
-#| msgid "Number of fields"
-msgid "Number of columns"
-msgstr "ველების რაოდენობა"
-
-#: templates/table/options.phtml:8
-#, fuzzy
-#| msgid "Select fields (at least one):"
-msgid "Select columns (at least one):"
-msgstr "Select fields (at least one):"
-
-#: templates/table/options.phtml:37
-msgid "Add search conditions (body of the \"where\" clause):"
-msgstr ""
-
-#: templates/table/options.phtml:45
-msgid "Number of rows per page"
-msgstr ""
-
-#: templates/table/options.phtml:56
-msgid "Display order:"
-msgstr ""
-
-#: templates/table/options_zoom.phtml:6
-msgid "Use this column to label each point"
-msgstr ""
-
-#: templates/table/options_zoom.phtml:35
-#, fuzzy
-#| msgid "Maximum number of rows to display"
-msgid "Maximum rows to plot"
-msgstr "Maximum number of rows to display"
-
-#: templates/table/replace_preview.phtml:13
-msgid "Find and replace - preview"
-msgstr ""
-
-#: templates/table/replace_preview.phtml:18
-#, fuzzy
-#| msgid "Original position"
-msgid "Original string"
-msgstr "საწყისი მდებარეობა"
-
-#: templates/table/replace_preview.phtml:19
-#, fuzzy
-#| msgid "Relations"
-msgid "Replaced string"
-msgstr "Relations"
-
-#: templates/table/replace_preview.phtml:40
-#, fuzzy
-#| msgid "Replication"
-msgid "Replace"
-msgstr "რეპლიკაცია"
-
-#: templates/table/rows_zoom.phtml:16
-#, fuzzy
-#| msgid "SQL Query box"
-msgid "Additional search criteria"
-msgstr "SQL Query box"
-
-#: templates/table/search_and_replace.phtml:3
-#, fuzzy
-#| msgid "Replace NULL by"
-msgid "Replace with:"
-msgstr "Replace NULL by"
-
-#: templates/table/search_and_replace.phtml:22
-#, fuzzy
-#| msgid "as regular expression"
-msgid "Use regular expression"
-msgstr "რეგულარული გამოსახულება"
-
-#: templates/table/selection_form.phtml:12
-#, fuzzy
-#| msgid "Do a \"query by example\" (wildcard: \"%\")"
-msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
-msgstr "Do a \"query by example\" (wildcard: \"%\")"
-
-#: templates/table/selection_form.phtml:34
-msgid "Do a \"query by example\" (wildcard: \"%\")"
-msgstr ""
-
-#: templates/table/zoom_result_form.phtml:7
-msgid "Browse/Edit the points"
-msgstr ""
-
-#: templates/table/zoom_result_form.phtml:15
-#, fuzzy
-#| msgid "Control user"
-msgid "How to use"
-msgstr "Control user"
-
-#: templates/table/zoom_result_form.phtml:23
-#, fuzzy
-#| msgid "Reset"
-msgid "Reset zoom"
-msgstr "დაბრუნება"
-
-#: templates/tbl_chart.phtml:17
+#: templates/table/chart/tbl_chart.phtml:17
 #, fuzzy
 #| msgid "Mar"
 msgctxt "Chart type"
 msgid "Bar"
 msgstr "მარ"
 
-#: templates/tbl_chart.phtml:21
+#: templates/table/chart/tbl_chart.phtml:21
 #, fuzzy
 #| msgid "Column"
 msgctxt "Chart type"
 msgid "Column"
 msgstr "სვეტები"
 
-#: templates/tbl_chart.phtml:25
+#: templates/table/chart/tbl_chart.phtml:25
 msgctxt "Chart type"
 msgid "Line"
 msgstr ""
 
-#: templates/tbl_chart.phtml:29
+#: templates/table/chart/tbl_chart.phtml:29
 #, fuzzy
 #| msgid "Engines"
 msgctxt "Chart type"
 msgid "Spline"
 msgstr "ძრავები"
 
-#: templates/tbl_chart.phtml:33
+#: templates/table/chart/tbl_chart.phtml:33
 msgctxt "Chart type"
 msgid "Area"
 msgstr ""
 
-#: templates/tbl_chart.phtml:37
+#: templates/table/chart/tbl_chart.phtml:37
 #, fuzzy
 #| msgid "PiB"
 msgctxt "Chart type"
 msgid "Pie"
 msgstr "PiB"
 
-#: templates/tbl_chart.phtml:41
+#: templates/table/chart/tbl_chart.phtml:41
 #, fuzzy
 #| msgid "Time"
 msgctxt "Chart type"
 msgid "Timeline"
 msgstr "დრო"
 
-#: templates/tbl_chart.phtml:45
+#: templates/table/chart/tbl_chart.phtml:45
 msgctxt "Chart type"
 msgid "Scatter"
 msgstr ""
 
-#: templates/tbl_chart.phtml:50
+#: templates/table/chart/tbl_chart.phtml:50
 #, fuzzy
 #| msgid "Packed"
 msgid "Stacked"
 msgstr "შეკუმშული"
 
-#: templates/tbl_chart.phtml:53
+#: templates/table/chart/tbl_chart.phtml:53
 #, fuzzy
 #| msgid "Report title"
 msgid "Chart title"
 msgstr "Report title"
 
-#: templates/tbl_chart.phtml:57
+#: templates/table/chart/tbl_chart.phtml:57
 msgid "X-Axis:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:72
+#: templates/table/chart/tbl_chart.phtml:72
 #, fuzzy
 #| msgid "SQL queries"
 msgid "Series:"
 msgstr "SQL მოთხოვნები"
 
-#: templates/tbl_chart.phtml:102
+#: templates/table/chart/tbl_chart.phtml:102
 msgid "X-Axis label:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:104
+#: templates/table/chart/tbl_chart.phtml:104
 #, fuzzy
 #| msgid "Value"
 msgid "X Values"
 msgstr "მნიშვნელობა"
 
-#: templates/tbl_chart.phtml:107
+#: templates/table/chart/tbl_chart.phtml:107
 msgid "Y-Axis label:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:115
+#: templates/table/chart/tbl_chart.phtml:115
 msgid "Series names are in a column"
 msgstr ""
 
-#: templates/tbl_chart.phtml:118
+#: templates/table/chart/tbl_chart.phtml:118
 #, fuzzy
 #| msgid "Inside column:"
 msgid "Series column:"
 msgstr "სვეტში:"
 
-#: templates/tbl_chart.phtml:130
+#: templates/table/chart/tbl_chart.phtml:130
 #, fuzzy
 #| msgid "Values for column %s"
 msgid "Value Column:"
 msgstr "ველების რაოდენობა სვეტებისათვის %s"
 
-#: templates/tbl_chart.phtml:150
+#: templates/table/chart/tbl_chart.phtml:150
 #, fuzzy
 #| msgid "Save as file"
 msgid "Save chart as image"
 msgstr "ფაილის სახის შენახვა"
 
-#: templates/tbl_relation/common_form.phtml:7
+#: templates/table/gis_visualization/gis_visualization.phtml:3
+msgid "Display GIS Visualization"
+msgstr "ჩვენების GIS ვიზუალიზაცია"
+
+#: templates/table/gis_visualization/gis_visualization.phtml:8
+#, fuzzy
+#| msgid "CHAR textarea columns"
+msgid "Label column"
+msgstr "CHAR textarea columns"
+
+#: templates/table/gis_visualization/gis_visualization.phtml:11
+#, fuzzy
+#| msgid "- none -"
+msgid "-- None --"
+msgstr "- არაა -"
+
+#: templates/table/gis_visualization/gis_visualization.phtml:19
+#, fuzzy
+#| msgid "Log file count"
+msgid "Spatial column"
+msgstr "Log file count"
+
+#: templates/table/index_form.phtml:16
+msgid "Index name:"
+msgstr "ინდექსის სახელი:"
+
+#: templates/table/index_form.phtml:19
+msgid ""
+"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
+msgstr ""
+
+#: templates/table/index_form.phtml:40
+#, fuzzy
+#| msgid "Index name:"
+msgid "Index choice:"
+msgstr "ინდექსის სახელი:"
+
+#: templates/table/index_form.phtml:57
+msgid "Key block size:"
+msgstr ""
+
+#: templates/table/index_form.phtml:74
+msgid "Index type:"
+msgstr "ინდექსის ტიპი:"
+
+#: templates/table/index_form.phtml:86
+#, fuzzy
+#| msgid "User"
+msgid "Parser:"
+msgstr "მომხმარებელი"
+
+#: templates/table/index_form.phtml:102
+#, fuzzy
+#| msgid "Comment"
+msgid "Comment:"
+msgstr "კომენტარი"
+
+#: templates/table/index_form.phtml:149 templates/table/index_form.phtml:190
+msgid "Drag to reorder"
+msgstr ""
+
+#: templates/table/relation/common_form.phtml:7
 #, fuzzy
 #| msgid "Internal relations"
 msgid "Internal relations"
 msgstr "Internal relations"
 
-#: templates/tbl_relation/common_form.phtml:11
+#: templates/table/relation/common_form.phtml:11
 #, fuzzy
 #| msgid "Internal relations"
 msgid "Internal relation"
 msgstr "Internal relations"
 
-#: templates/tbl_relation/common_form.phtml:14
+#: templates/table/relation/common_form.phtml:14
 msgid ""
 "An internal relation is not necessary when a corresponding FOREIGN KEY "
 "relation exists."
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:37
+#: templates/table/relation/common_form.phtml:37
 #, fuzzy
 #| msgid "Foreign key limit"
 msgid "Foreign key constraints"
 msgstr "Foreign key limit"
 
-#: templates/tbl_relation/common_form.phtml:40
+#: templates/table/relation/common_form.phtml:40
 msgid "Actions"
 msgstr "მოქმედებები"
 
-#: templates/tbl_relation/common_form.phtml:41
+#: templates/table/relation/common_form.phtml:41
 #, fuzzy
 #| msgid "Routines"
 msgid "Constraint properties"
 msgstr "Routines"
 
-#: templates/tbl_relation/common_form.phtml:44
+#: templates/table/relation/common_form.phtml:44
 msgid ""
 "Only columns with index will be displayed. You can define an index below."
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:49
+#: templates/table/relation/common_form.phtml:49
 #, fuzzy
 #| msgid "Foreign key limit"
 msgid "Foreign key constraint"
 msgstr "Foreign key limit"
 
-#: templates/tbl_relation/common_form.phtml:81
+#: templates/table/relation/common_form.phtml:81
 #, fuzzy
 #| msgid "Foreign key limit"
 msgid "+ Add constraint"
 msgstr "Foreign key limit"
 
-#: templates/tbl_relation/common_form.phtml:91
+#: templates/table/relation/common_form.phtml:91
 #, fuzzy
 #| msgid "Choose field to display"
 msgid "Choose column to display:"
 msgstr "აირჩიეთ საჩვენებელი ველი"
 
-#: templates/tbl_relation/foreign_key_row.phtml:13
+#: templates/table/relation/foreign_key_row.phtml:13
 #, fuzzy, php-format
 #| msgid "Foreign key limit"
 msgid "Foreign key constraint %s has been dropped"
 msgstr "Foreign key limit"
 
-#: templates/tbl_relation/foreign_key_row.phtml:102
+#: templates/table/relation/foreign_key_row.phtml:102
 #, fuzzy
 #| msgid "Routines"
 msgid "Constraint name"
 msgstr "Routines"
 
-#: templates/tbl_relation/foreign_key_row.phtml:157
+#: templates/table/relation/foreign_key_row.phtml:157
 #, fuzzy
 #| msgid "Add %s field(s)"
 msgid "+ Add column"
 msgstr "%s ველის დამატება"
 
+#: templates/table/search/options.phtml:8
+#, fuzzy
+#| msgid "Select fields (at least one):"
+msgid "Select columns (at least one):"
+msgstr "Select fields (at least one):"
+
+#: templates/table/search/options.phtml:37
+msgid "Add search conditions (body of the \"where\" clause):"
+msgstr ""
+
+#: templates/table/search/options.phtml:45
+msgid "Number of rows per page"
+msgstr ""
+
+#: templates/table/search/options.phtml:56
+msgid "Display order:"
+msgstr ""
+
+#: templates/table/search/options_zoom.phtml:6
+msgid "Use this column to label each point"
+msgstr ""
+
+#: templates/table/search/options_zoom.phtml:35
+#, fuzzy
+#| msgid "Maximum number of rows to display"
+msgid "Maximum rows to plot"
+msgstr "Maximum number of rows to display"
+
+#: templates/table/search/replace_preview.phtml:13
+msgid "Find and replace - preview"
+msgstr ""
+
+#: templates/table/search/replace_preview.phtml:18
+#, fuzzy
+#| msgid "Original position"
+msgid "Original string"
+msgstr "საწყისი მდებარეობა"
+
+#: templates/table/search/replace_preview.phtml:19
+#, fuzzy
+#| msgid "Relations"
+msgid "Replaced string"
+msgstr "Relations"
+
+#: templates/table/search/replace_preview.phtml:40
+#, fuzzy
+#| msgid "Replication"
+msgid "Replace"
+msgstr "რეპლიკაცია"
+
+#: templates/table/search/rows_zoom.phtml:16
+#, fuzzy
+#| msgid "SQL Query box"
+msgid "Additional search criteria"
+msgstr "SQL Query box"
+
+#: templates/table/search/search_and_replace.phtml:3
+#, fuzzy
+#| msgid "Replace NULL by"
+msgid "Replace with:"
+msgstr "Replace NULL by"
+
+#: templates/table/search/search_and_replace.phtml:22
+#, fuzzy
+#| msgid "as regular expression"
+msgid "Use regular expression"
+msgstr "რეგულარული გამოსახულება"
+
+#: templates/table/search/selection_form.phtml:12
+#, fuzzy
+#| msgid "Do a \"query by example\" (wildcard: \"%\")"
+msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
+msgstr "Do a \"query by example\" (wildcard: \"%\")"
+
+#: templates/table/search/selection_form.phtml:34
+msgid "Do a \"query by example\" (wildcard: \"%\")"
+msgstr ""
+
+#: templates/table/search/zoom_result_form.phtml:7
+msgid "Browse/Edit the points"
+msgstr ""
+
+#: templates/table/search/zoom_result_form.phtml:15
+#, fuzzy
+#| msgid "Control user"
+msgid "How to use"
+msgstr "Control user"
+
+#: templates/table/search/zoom_result_form.phtml:23
+#, fuzzy
+#| msgid "Reset"
+msgid "Reset zoom"
+msgstr "დაბრუნება"
+
+#: templates/table/secondary_tabs.phtml:14
+#, fuzzy
+#| msgid "Relation view"
+msgid "Relation view"
+msgstr "Relation view"
+
+#: templates/table/structure/actions_in_table_structure.phtml:14
+#, php-format
+msgid "A primary key has been added on %s."
+msgstr ""
+
+#: templates/table/structure/actions_in_table_structure.phtml:34
+#: templates/table/structure/actions_in_table_structure.phtml:54
+#: templates/table/structure/actions_in_table_structure.phtml:79
+#: templates/table/structure/actions_in_table_structure.phtml:101
+#, php-format
+msgid "An index has been added on %s."
+msgstr ""
+
+#: templates/table/structure/actions_in_table_structure.phtml:130
+#: templates/table/structure/check_all_table_column.phtml:59
+#, fuzzy
+#| msgid "Rename database to"
+msgid "Remove from central columns"
+msgstr "Rename database to"
+
+#: templates/table/structure/actions_in_table_structure.phtml:138
+#: templates/table/structure/check_all_table_column.phtml:55
+#, fuzzy
+#| msgid "Add %s field(s)"
+msgid "Add to central columns"
+msgstr "%s ველის დამატება"
+
+#: templates/table/structure/add_column.phtml:7
+#, fuzzy, php-format
+#| msgid "Add %s field(s)"
+msgid "Add %s column(s)"
+msgstr "%s ველის დამატება"
+
+#: templates/table/structure/add_column.phtml:12
+#, fuzzy
+#| msgid "At Beginning of Table"
+msgid "at beginning of table"
+msgstr "ცხრილის დასაწყისში"
+
+#: templates/table/structure/display_structure.phtml:140 view_create.php:181
+#, fuzzy
+#| msgid "Print view"
+msgid "Edit view"
+msgstr "ხედის ამობეჭდვა"
+
+#: templates/table/structure/display_table_stats.phtml:9
+msgid "Space usage"
+msgstr "ადგილის გამოყენება"
+
+#: templates/table/structure/display_table_stats.phtml:32
+msgid "Effective"
+msgstr "ეფექტური"
+
+#: templates/table/structure/move_columns_dialog.phtml:1
+#: templates/table/structure/optional_action_links.phtml:21
+#, fuzzy
+#| msgid "Add %s field(s)"
+msgid "Move columns"
+msgstr "%s ველის დამატება"
+
+#: templates/table/structure/move_columns_dialog.phtml:2
+msgid "Move the columns by dragging them up and down."
+msgstr ""
+
+#: templates/table/structure/optional_action_links.phtml:9
+msgid "Propose table structure"
+msgstr "ცხრილის სტრუქტურის შეთავაზება"
+
+#: templates/table/structure/optional_action_links.phtml:24
+#, fuzzy
+#| msgid "Propose table structure"
+msgid "Improve table structure"
+msgstr "ცხრილის სტრუქტურის შეთავაზება"
+
+#: templates/table/structure/optional_action_links.phtml:30
+#, fuzzy
+msgid "Track view"
+msgstr "ცხრილის შემოწმება"
+
+#: templates/table/structure/row_stats_table.phtml:3
+#, fuzzy
+#| msgid "Show statistics"
+msgid "Row statistics"
+msgstr "სტატისტიკის ჩევნება"
+
+#: templates/table/structure/row_stats_table.phtml:9
+msgid "static"
+msgstr "სტატიკური"
+
+#: templates/table/structure/row_stats_table.phtml:11
+msgid "dynamic"
+msgstr "დინამიური"
+
+#: templates/table/structure/row_stats_table.phtml:22
+msgid "partitioned"
+msgstr "დაყოფილი"
+
+#: templates/table/structure/row_stats_table.phtml:54
+msgid "Row length"
+msgstr "სტრიქონის სიგრძე"
+
+#: templates/table/structure/row_stats_table.phtml:66
+msgid "Row size"
+msgstr "სტრიქონის ზომა"
+
+#: templates/table/structure/row_stats_table.phtml:73
+msgid "Next autoindex"
+msgstr ""
+
+#: templates/table/structure/table_structure_row.phtml:46
+#, fuzzy, php-format
+#| msgid "Table %s has been dropped."
+msgid "Column %s has been dropped."
+msgstr "Table %s has been dropped"
+
 #: themes.php:17 themes.php:22
 msgid "Theme"
 msgstr ""
diff --git a/po/kk.po b/po/kk.po
index 0418181c53..ba6251764a 100644
--- a/po/kk.po
+++ b/po/kk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 4.5.0-dev\n"
 "Report-Msgid-Bugs-To: developers@phpmyadmin.net\n"
-"POT-Creation-Date: 2015-08-08 13:53-0400\n"
+"POT-Creation-Date: 2015-08-12 08:10-0400\n"
 "PO-Revision-Date: 2014-03-31 14:26+0200\n"
 "Last-Translator: Michal Čihař <michal@cihar.com>\n"
 "Language-Team: Kazakh <https://hosted.weblate.org/projects/phpmyadmin/master/"
@@ -59,7 +59,7 @@ msgid "Table comments:"
 msgstr "Кестеге түсініктеме:"
 
 #: db_datadict.php:104 libraries/Index.class.php:699
-#: libraries/insert_edit.lib.php:1567
+#: libraries/insert_edit.lib.php:1565
 #: libraries/navigation/Nodes/Node_Column.class.php:30
 #: libraries/plugins/export/ExportHtmlword.class.php:280
 #: libraries/plugins/export/ExportHtmlword.class.php:375
@@ -73,13 +73,14 @@ msgstr "Кестеге түсініктеме:"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1023
 #: libraries/tracking.lib.php:879 libraries/tracking.lib.php:975
 #: templates/columns_definitions/column_name.phtml:18
-#: templates/index_form.phtml:124 templates/table/table_header.phtml:6
-#: templates/table/zoom_result_form.phtml:33
-#: templates/tbl_relation/common_form.phtml:10
-#: templates/tbl_relation/common_form.phtml:43
-#: templates/tbl_relation/foreign_key_row.phtml:194
-#: templates/tbl_relation/foreign_key_row.phtml:206
-#: templates/tbl_relation/internal_relational_row.phtml:71
+#: templates/table/index_form.phtml:124
+#: templates/table/relation/common_form.phtml:10
+#: templates/table/relation/common_form.phtml:43
+#: templates/table/relation/foreign_key_row.phtml:194
+#: templates/table/relation/foreign_key_row.phtml:206
+#: templates/table/relation/internal_relational_row.phtml:71
+#: templates/table/search/table_header.phtml:6
+#: templates/table/search/zoom_result_form.phtml:33
 msgid "Column"
 msgstr "Бағана"
 
@@ -97,21 +98,21 @@ msgstr "Бағана"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1001
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1024
 #: libraries/rte/rte_list.lib.php:75 libraries/rte/rte_list.lib.php:103
-#: libraries/rte/rte_routines.lib.php:802
-#: libraries/rte/rte_routines.lib.php:831
-#: libraries/rte/rte_routines.lib.php:1493
+#: libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_routines.lib.php:922
+#: libraries/rte/rte_routines.lib.php:1584
 #: libraries/server_privileges.lib.php:2369 libraries/tracking.lib.php:880
 #: libraries/tracking.lib.php:972
 #: templates/columns_definitions/table_fields_definitions.phtml:11
-#: templates/structure/table_header.phtml:48
-#: templates/structure/table_structure_header.phtml:6
-#: templates/table/table_header.phtml:7
+#: templates/database/structure/table_header.phtml:48
+#: templates/table/search/table_header.phtml:7
+#: templates/table/structure/table_structure_header.phtml:6
 msgid "Type"
 msgstr "Типі"
 
 #: db_datadict.php:106 libraries/Index.class.php:702
 #: libraries/central_columns.lib.php:708
-#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1576
+#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1574
 #: libraries/plugins/export/ExportHtmlword.class.php:286
 #: libraries/plugins/export/ExportHtmlword.class.php:381
 #: libraries/plugins/export/ExportLatex.class.php:509
@@ -124,8 +125,8 @@ msgstr "Типі"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1026
 #: libraries/tracking.lib.php:882 libraries/tracking.lib.php:978
 #: templates/columns_definitions/table_fields_definitions.phtml:39
-#: templates/structure/table_structure_header.phtml:9
-#: templates/table/zoom_result_form.phtml:34
+#: templates/table/search/zoom_result_form.phtml:34
+#: templates/table/structure/table_structure_header.phtml:9
 msgid "Null"
 msgstr "Бос/Null"
 
@@ -143,8 +144,8 @@ msgstr "Бос/Null"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1027
 #: libraries/replication_gui.lib.php:153 libraries/tracking.lib.php:883
 #: templates/columns_definitions/table_fields_definitions.phtml:25
-#: templates/structure/body_for_table_summary.phtml:55
-#: templates/structure/table_structure_header.phtml:10
+#: templates/database/structure/body_for_table_summary.phtml:55
+#: templates/table/structure/table_structure_header.phtml:10
 msgid "Default"
 msgstr "Келісім бойынша"
 
@@ -172,19 +173,19 @@ msgid "Comments"
 msgstr "Түсініктеме"
 
 #: db_datadict.php:146
-#: libraries/controllers/StructureController.class.php:1960
-#: libraries/controllers/StructureController.class.php:1965
+#: libraries/controllers/TableStructureController.class.php:951
+#: libraries/controllers/TableStructureController.class.php:956
 #: libraries/tracking.lib.php:922
 #: templates/columns_definitions/column_indexes.phtml:6
-#: templates/structure/check_all_table_column.phtml:22
-#: templates/structure/display_structure.phtml:74
+#: templates/table/structure/check_all_table_column.phtml:22
+#: templates/table/structure/display_structure.phtml:74
 msgid "Primary"
 msgstr ""
 
 #: db_datadict.php:156 js/messages.php:317 libraries/Index.class.php:567
 #: libraries/Index.class.php:606 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261 libraries/mult_submits.lib.php:403
+#: libraries/config/FormDisplay.tpl.php:272 libraries/mult_submits.lib.php:403
 #: libraries/mult_submits.lib.php:417
 #: libraries/plugins/export/ExportHtmlword.class.php:630
 #: libraries/plugins/export/ExportLatex.class.php:589
@@ -200,20 +201,20 @@ msgstr ""
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1010 libraries/tracking.lib.php:1015
 #: prefs_manage.php:140 templates/prefs_autoload.phtml:15
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "No"
 msgstr "Жоқ"
 
 #: db_datadict.php:156 js/messages.php:443 libraries/Index.class.php:568
 #: libraries/Index.class.php:605 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261
-#: libraries/controllers/StructureController.class.php:1344
-#: libraries/controllers/StructureController.class.php:2223
-#: libraries/controllers/StructureController.class.php:2232
-#: libraries/controllers/StructureController.class.php:2237
-#: libraries/controllers/StructureController.class.php:2242
-#: libraries/controllers/StructureController.class.php:2247
+#: libraries/config/FormDisplay.tpl.php:272
+#: libraries/controllers/TableStructureController.class.php:539
+#: libraries/controllers/TableStructureController.class.php:1201
+#: libraries/controllers/TableStructureController.class.php:1210
+#: libraries/controllers/TableStructureController.class.php:1215
+#: libraries/controllers/TableStructureController.class.php:1220
+#: libraries/controllers/TableStructureController.class.php:1225
 #: libraries/mult_submits.inc.php:82 libraries/mult_submits.inc.php:178
 #: libraries/mult_submits.lib.php:339 libraries/mult_submits.lib.php:372
 #: libraries/mult_submits.lib.php:401 libraries/mult_submits.lib.php:415
@@ -222,8 +223,8 @@ msgstr "Жоқ"
 #: libraries/plugins/export/ExportOdt.class.php:756
 #: libraries/plugins/export/ExportTexytext.class.php:567
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1077
-#: libraries/server_databases.lib.php:464
-#: libraries/server_databases.lib.php:474
+#: libraries/server_databases.lib.php:475
+#: libraries/server_databases.lib.php:485
 #: libraries/server_privileges.lib.php:2546
 #: libraries/server_privileges.lib.php:2727
 #: libraries/server_privileges.lib.php:2748
@@ -233,7 +234,7 @@ msgstr "Жоқ"
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1008 libraries/tracking.lib.php:1013
 #: prefs_manage.php:138 templates/prefs_autoload.phtml:14
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "Yes"
 msgstr "Иә"
 
@@ -243,7 +244,7 @@ msgstr "Мәліметтер қорының дамп (схемасын) көру
 
 #: db_export.php:37 db_tracking.php:90 export.php:382
 #: libraries/DBQbe.class.php:326
-#: libraries/controllers/StructureController.class.php:231
+#: libraries/controllers/DatabaseStructureController.class.php:170
 #: libraries/navigation/NavigationTree.class.php:897
 msgid "No tables found in database."
 msgstr "Дерекқорында, ешбір кестелер табылмады."
@@ -254,14 +255,14 @@ msgstr "Дерекқорында, ешбір кестелер табылмады
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:26
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:120
-#: templates/structure/show_create.phtml:18
+#: templates/database/structure/show_create.phtml:18
 msgid "Tables"
 msgstr ""
 
 #: db_export.php:52 libraries/Menu.class.php:317 libraries/Menu.class.php:425
-#: libraries/Util.class.php:3333 libraries/Util.class.php:3343
-#: libraries/Util.class.php:3349 libraries/Util.class.php:3629
-#: libraries/Util.class.php:4327 libraries/Util.class.php:4344
+#: libraries/Util.class.php:3339 libraries/Util.class.php:3349
+#: libraries/Util.class.php:3355 libraries/Util.class.php:3635
+#: libraries/Util.class.php:4333 libraries/Util.class.php:4350
 #: libraries/central_columns.lib.php:728 libraries/config.values.php:39
 #: libraries/config.values.php:47 libraries/config.values.php:109
 #: libraries/config.values.php:115 libraries/config/setup.forms.php:323
@@ -275,7 +276,7 @@ msgstr ""
 #: libraries/navigation/Nodes/Node_Table.class.php:283
 #: libraries/server_privileges.lib.php:1141 libraries/tracking.lib.php:874
 #: templates/columns_definitions/table_fields_definitions.phtml:3
-#: templates/designer/table_list.phtml:28
+#: templates/database/designer/table_list.phtml:28
 msgid "Structure"
 msgstr ""
 
@@ -287,7 +288,7 @@ msgstr ""
 #: libraries/config/user_preferences.forms.php:292
 #: libraries/config/user_preferences.forms.php:297
 #: libraries/server_privileges.lib.php:1140
-#: templates/structure/display_table_stats.phtml:12
+#: templates/table/structure/display_table_stats.phtml:12
 msgid "Data"
 msgstr ""
 
@@ -370,10 +371,10 @@ msgstr "Қадағаланатын кестелер"
 #: libraries/server_privileges.lib.php:2908
 #: libraries/server_privileges.lib.php:3145
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4346
-#: templates/structure/table_header.phtml:21
-#: templates/tbl_relation/foreign_key_row.phtml:176
-#: templates/tbl_relation/internal_relational_row.phtml:63
+#: libraries/server_privileges.lib.php:4372
+#: templates/database/structure/table_header.phtml:21
+#: templates/table/relation/foreign_key_row.phtml:176
+#: templates/table/relation/internal_relational_row.phtml:63
 msgid "Table"
 msgstr "Кесте"
 
@@ -390,7 +391,7 @@ msgid "Updated"
 msgstr "Жаңартылған"
 
 #: db_tracking.php:130 js/messages.php:243 libraries/Menu.class.php:552
-#: libraries/Util.class.php:4314 libraries/config.values.php:104
+#: libraries/Util.class.php:4320 libraries/config.values.php:104
 #: libraries/rte/rte_events.lib.php:393 libraries/rte/rte_list.lib.php:101
 #: libraries/server_status_processes.lib.php:92 libraries/tracking.lib.php:279
 msgid "Status"
@@ -399,14 +400,15 @@ msgstr "Күй"
 #: db_tracking.php:131 db_tracking.php:290 libraries/Index.class.php:693
 #: libraries/central_columns.lib.php:687 libraries/rte/rte_list.lib.php:74
 #: libraries/rte/rte_list.lib.php:89 libraries/rte/rte_list.lib.php:102
-#: libraries/server_databases.lib.php:398
+#: libraries/server_databases.lib.php:409
 #: libraries/server_privileges.lib.php:2372
 #: libraries/server_privileges.lib.php:3166
 #: libraries/server_privileges.lib.php:3342
 #: libraries/server_user_groups.lib.php:82
 #: libraries/server_variables.lib.php:189 libraries/tracking.lib.php:280
-#: libraries/tracking.lib.php:793 templates/structure/table_header.phtml:30
-#: templates/structure/table_structure_header.phtml:23
+#: libraries/tracking.lib.php:793
+#: templates/database/structure/table_header.phtml:30
+#: templates/table/structure/table_structure_header.phtml:23
 msgid "Action"
 msgstr "Әрекет"
 
@@ -450,7 +452,7 @@ msgid "Untracked tables"
 msgstr "Бақылауға болмайтын кестелер"
 
 #: db_tracking.php:305 db_tracking.php:336
-#: templates/structure/optional_action_links.phtml:17
+#: templates/table/structure/optional_action_links.phtml:17
 msgid "Track table"
 msgstr "Кестені бақылау"
 
@@ -505,7 +507,7 @@ msgid "Value for the column \"%s\""
 msgstr "\"%s\" баған мәні"
 
 #: gis_data_editor.php:146
-#: templates/gis_visualization/gis_visualization.phtml:37
+#: templates/table/gis_visualization/gis_visualization.phtml:37
 msgid "Use OpenStreetMaps as Base Layer"
 msgstr "OpenStreetMaps негізгі қабат ретінде қолданыңыз"
 
@@ -594,35 +596,35 @@ msgstr "Геометрияны қосу"
 #: libraries/display_change_password.lib.php:162
 #: libraries/display_export.lib.php:402 libraries/display_export.lib.php:408
 #: libraries/display_import.lib.php:392 libraries/index.lib.php:44
-#: libraries/insert_edit.lib.php:1546 libraries/insert_edit.lib.php:1583
+#: libraries/insert_edit.lib.php:1544 libraries/insert_edit.lib.php:1581
 #: libraries/normalization.lib.php:165 libraries/normalization.lib.php:821
 #: libraries/operations.lib.php:38 libraries/operations.lib.php:108
 #: libraries/operations.lib.php:263 libraries/operations.lib.php:306
 #: libraries/operations.lib.php:801 libraries/operations.lib.php:874
 #: libraries/operations.lib.php:923 libraries/operations.lib.php:1337
 #: libraries/operations.lib.php:1658
-#: libraries/plugins/auth/AuthenticationCookie.class.php:244
+#: libraries/plugins/auth/AuthenticationCookie.class.php:232
 #: libraries/replication_gui.lib.php:122 libraries/replication_gui.lib.php:161
 #: libraries/replication_gui.lib.php:324 libraries/replication_gui.lib.php:461
 #: libraries/replication_gui.lib.php:906 libraries/rte/rte_events.lib.php:509
-#: libraries/rte/rte_routines.lib.php:969
-#: libraries/rte/rte_routines.lib.php:1581
+#: libraries/rte/rte_routines.lib.php:1060
+#: libraries/rte/rte_routines.lib.php:1672
 #: libraries/rte/rte_triggers.lib.php:396 libraries/server_bin_log.lib.php:61
 #: libraries/server_privileges.lib.php:705
 #: libraries/server_privileges.lib.php:2106
 #: libraries/server_privileges.lib.php:2872
 #: libraries/server_privileges.lib.php:3553
-#: libraries/server_privileges.lib.php:4627
+#: libraries/server_privileges.lib.php:4653
 #: libraries/server_user_groups.lib.php:285
 #: libraries/sql_query_form.lib.php:369 libraries/sql_query_form.lib.php:429
 #: libraries/tracking.lib.php:533 libraries/tracking.lib.php:653
 #: prefs_manage.php:277 prefs_manage.php:355
 #: templates/columns_definitions/column_definitions_form.phtml:59
-#: templates/header_location.phtml:17 templates/index_form.phtml:238
+#: templates/database/create_table.phtml:21 templates/header_location.phtml:28
 #: templates/startAndNumberOfRowsPanel.phtml:14
-#: templates/structure/add_column.phtml:25
-#: templates/table/create_table.phtml:21
-#: templates/table/selection_form.phtml:75 view_create.php:275
+#: templates/table/index_form.phtml:238
+#: templates/table/search/selection_form.phtml:75
+#: templates/table/structure/add_column.phtml:25 view_create.php:275
 #: view_operations.php:106
 msgid "Go"
 msgstr "Өту"
@@ -715,7 +717,7 @@ msgstr ""
 msgid "Could not load import plugins, please check your installation!"
 msgstr ""
 
-#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1466
+#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1460
 #, fuzzy, php-format
 #| msgid "Database %1$s has been created."
 msgid "Bookmark %s has been created."
@@ -750,11 +752,11 @@ msgstr ""
 msgid "Back"
 msgstr "Артқа"
 
-#: index.php:148 libraries/Footer.class.php:70
+#: index.php:149 libraries/Footer.class.php:70
 msgid "phpMyAdmin Demo Server"
 msgstr ""
 
-#: index.php:152
+#: index.php:153
 #, php-format
 msgid ""
 "You are using the demo server. You can do anything here, but please do not "
@@ -762,42 +764,42 @@ msgid ""
 "at %s."
 msgstr ""
 
-#: index.php:162
+#: index.php:163
 msgid "General Settings"
 msgstr ""
 
-#: index.php:190 libraries/display_change_password.lib.php:50
+#: index.php:191 libraries/display_change_password.lib.php:50
 #: libraries/display_change_password.lib.php:53 user_password.php:247
 msgid "Change password"
 msgstr ""
 
-#: index.php:206
+#: index.php:207
 msgid "Server connection collation"
 msgstr ""
 
-#: index.php:228
+#: index.php:229
 msgid "Appearance Settings"
 msgstr ""
 
-#: index.php:258 prefs_manage.php:285
+#: index.php:259 prefs_manage.php:285
 msgid "More settings"
 msgstr ""
 
-#: index.php:279
+#: index.php:280
 msgid "Database server"
 msgstr ""
 
-#: index.php:282 libraries/plugins/auth/AuthenticationCookie.class.php:181
+#: index.php:283 libraries/plugins/auth/AuthenticationCookie.class.php:169
 msgid "Server:"
 msgstr "Сервер:"
 
-#: index.php:286
+#: index.php:287
 #, fuzzy
 #| msgid "Server:"
 msgid "Server type:"
 msgstr "Сервер:"
 
-#: index.php:290 libraries/plugins/export/ExportLatex.class.php:212
+#: index.php:291 libraries/plugins/export/ExportLatex.class.php:212
 #: libraries/plugins/export/ExportSql.class.php:687
 #: libraries/plugins/export/ExportXml.class.php:189
 #, fuzzy
@@ -805,81 +807,81 @@ msgstr "Сервер:"
 msgid "Server version:"
 msgstr "Ағымдағы баптау"
 
-#: index.php:296
+#: index.php:297
 #, fuzzy
 #| msgid "Last version"
 msgid "Protocol version:"
 msgstr "Соңғы нұсқа"
 
-#: index.php:300
+#: index.php:301
 #, fuzzy
 #| msgid "Username:"
 msgid "User:"
 msgstr "Қолданушы:"
 
-#: index.php:305
+#: index.php:306
 #, fuzzy
 #| msgid "Remove chart"
 msgid "Server charset:"
 msgstr "Графикті жою"
 
-#: index.php:320
+#: index.php:321
 msgid "Web server"
 msgstr ""
 
-#: index.php:331
+#: index.php:332
 #, fuzzy
 #| msgid "Database comment"
 msgid "Database client version:"
 msgstr "Дерекқорына түсініктеме: "
 
-#: index.php:335
+#: index.php:336
 msgid "PHP extension:"
 msgstr ""
 
-#: index.php:349
+#: index.php:350
 #, fuzzy
 #| msgid "Versions"
 msgid "PHP version:"
 msgstr "Нұсқа"
 
-#: index.php:360
+#: index.php:361
 msgid "Show PHP information"
 msgstr ""
 
-#: index.php:383
+#: index.php:384
 msgid "Version information:"
 msgstr ""
 
-#: index.php:392 libraries/Util.class.php:432 libraries/Util.class.php:495
-#: libraries/config/FormDisplay.tpl.php:151
+#: index.php:393 libraries/Util.class.php:432 libraries/Util.class.php:495
+#: libraries/config/FormDisplay.tpl.php:162
 #: libraries/display_export.lib.php:577 libraries/engines/pbxt.lib.php:162
 #: libraries/navigation/NavigationHeader.class.php:196
 #: libraries/server_variables.lib.php:160
 msgid "Documentation"
 msgstr ""
 
-#: index.php:399
+#: index.php:400
 msgid "Wiki"
 msgstr ""
 
-#: index.php:408
+#: index.php:409
 msgid "Official Homepage"
 msgstr ""
 
-#: index.php:415
+#: index.php:416
 msgid "Contribute"
 msgstr ""
 
-#: index.php:422
+#: index.php:423
 msgid "Get support"
 msgstr ""
 
-#: index.php:429
+#: index.php:430
 msgid "List of changes"
 msgstr ""
 
-#: index.php:451
+#: index.php:452
 msgid ""
 "You are connected as 'root' with no password, which corresponds to the "
 "default MySQL privileged account. Your MySQL server is running with this "
@@ -887,21 +889,21 @@ msgid ""
 "by setting a password for user 'root'."
 msgstr ""
 
-#: index.php:468
+#: index.php:469
 msgid ""
 "You have enabled mbstring.func_overload in your PHP configuration. This "
 "option is incompatible with phpMyAdmin and might cause some data to be "
 "corrupted!"
 msgstr ""
 
-#: index.php:483
+#: index.php:484
 msgid ""
 "The mbstring PHP extension was not found and you seem to be using a "
 "multibyte charset. Without the mbstring extension phpMyAdmin is unable to "
 "split strings correctly and it may result in unexpected results."
 msgstr ""
 
-#: index.php:500
+#: index.php:501
 msgid ""
 "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini."
 "session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower than "
@@ -909,17 +911,17 @@ msgid ""
 "expire sooner than configured in phpMyAdmin."
 msgstr ""
 
-#: index.php:519
+#: index.php:520
 msgid ""
 "Login cookie store is lower than cookie validity configured in phpMyAdmin, "
 "because of this, your login will expire sooner than configured in phpMyAdmin."
 msgstr ""
 
-#: index.php:535
+#: index.php:536
 msgid "The configuration file now needs a secret passphrase (blowfish_secret)."
 msgstr ""
 
-#: index.php:548
+#: index.php:549
 msgid ""
 "Directory [code]config[/code], which is used by the setup script, still "
 "exists in your phpMyAdmin directory. It is strongly recommended to remove it "
@@ -927,7 +929,7 @@ msgid ""
 "may be compromised by unauthorized people downloading your configuration."
 msgstr ""
 
-#: index.php:564
+#: index.php:565
 #, fuzzy, php-format
 #| msgid ""
 #| "The phpMyAdmin configuration storage has been deactivated. To find out "
@@ -939,19 +941,19 @@ msgstr ""
 "Кейбір ұлғаймалы мүмкіндіктеріне байланысты, PhpMyAdmin қол жетімсіз. "
 "Себебін анықтау үшін %sмұнда%s басыңыз."
 
-#: index.php:571
+#: index.php:572
 msgid ""
 "Or alternately go to 'Operations' tab of any database to set it up there."
 msgstr ""
 
-#: index.php:620
+#: index.php:621
 #, php-format
 msgid ""
 "Your PHP MySQL library version %s differs from your MySQL server version %s. "
 "This may cause unpredictable behavior."
 msgstr ""
 
-#: index.php:648
+#: index.php:649
 #, php-format
 msgid ""
 "Server running with Suhosin. Please refer to %sdocumentation%s for possible "
@@ -1116,8 +1118,8 @@ msgstr ""
 msgid "Save & Close"
 msgstr ""
 
-#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:404
-#: libraries/insert_edit.lib.php:1550 prefs_manage.php:361
+#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:415
+#: libraries/insert_edit.lib.php:1548 prefs_manage.php:361
 #: prefs_manage.php:372
 msgid "Reset"
 msgstr ""
@@ -1154,7 +1156,7 @@ msgstr "Индекс қосу"
 msgid "Edit Index"
 msgstr "Индексті өзгерту"
 
-#: js/messages.php:99 templates/index_form.phtml:232
+#: js/messages.php:99 templates/table/index_form.phtml:232
 #, fuzzy, php-format
 #| msgid "Add columns"
 msgid "Add %s column(s) to index"
@@ -1178,13 +1180,14 @@ msgstr ""
 msgid "Please select column(s) for the index."
 msgstr "Бағаналар қосу"
 
-#: js/messages.php:106 templates/structure/add_column.phtml:1
+#: js/messages.php:106 templates/table/structure/add_column.phtml:1
 msgid "You have to add at least one column."
 msgstr ""
 
-#: js/messages.php:109 libraries/insert_edit.lib.php:1548
+#: js/messages.php:109 libraries/insert_edit.lib.php:1546
 #: templates/columns_definitions/column_definitions_form.phtml:162
-#: templates/index_form.phtml:237 templates/tbl_relation/common_form.phtml:106
+#: templates/table/index_form.phtml:237
+#: templates/table/relation/common_form.phtml:106
 msgid "Preview SQL"
 msgstr ""
 
@@ -1205,7 +1208,7 @@ msgid "SQL query:"
 msgstr ""
 
 #. l10n: Default label for the y-Axis of Charts
-#: js/messages.php:118 templates/tbl_chart.phtml:109
+#: js/messages.php:118 templates/table/chart/tbl_chart.phtml:109
 msgid "Y Values"
 msgstr ""
 
@@ -1362,7 +1365,7 @@ msgstr ""
 msgid "Bytes received"
 msgstr "Байт қабылданды"
 
-#: js/messages.php:169 libraries/server_status.lib.php:226
+#: js/messages.php:169 libraries/server_status.lib.php:235
 msgid "Connections"
 msgstr ""
 
@@ -1419,12 +1422,12 @@ msgstr "%d Кесте(лер)"
 msgid "Questions"
 msgstr "Сұрақтар"
 
-#: js/messages.php:184 libraries/server_status.lib.php:134
+#: js/messages.php:184 libraries/server_status.lib.php:143
 msgid "Traffic"
 msgstr "Трафик"
 
 #: js/messages.php:185 libraries/Menu.class.php:586
-#: libraries/Util.class.php:4318 libraries/server_status_monitor.lib.php:257
+#: libraries/Util.class.php:4324 libraries/server_status_monitor.lib.php:257
 msgid "Settings"
 msgstr "Баптау"
 
@@ -1446,8 +1449,9 @@ msgstr "Тәңiр жарылқасын, ең болмаса топтамаға 
 #: libraries/server_status_monitor.lib.php:236
 #: libraries/server_status_processes.lib.php:308
 #: templates/columns_definitions/transformation.phtml:4
-#: templates/designer/options_panel.phtml:178
-#: templates/table/options_zoom.phtml:12 templates/table/rows_zoom.phtml:26
+#: templates/database/designer/options_panel.phtml:178
+#: templates/table/search/options_zoom.phtml:12
+#: templates/table/search/rows_zoom.phtml:26
 msgid "None"
 msgstr "Жоқ"
 
@@ -1716,8 +1720,8 @@ msgstr ""
 
 #: js/messages.php:270 libraries/Menu.class.php:352
 #: libraries/Menu.class.php:455 libraries/Menu.class.php:582
-#: libraries/Util.class.php:4317 libraries/Util.class.php:4332
-#: libraries/Util.class.php:4349 libraries/config/messages.inc.php:258
+#: libraries/Util.class.php:4323 libraries/Util.class.php:4338
+#: libraries/Util.class.php:4355 libraries/config/messages.inc.php:258
 #: libraries/display_import.lib.php:105
 #: libraries/server_status_monitor.lib.php:318 prefs_manage.php:238
 #: setup/frames/menu.inc.php:26
@@ -1777,13 +1781,13 @@ msgid "Formatting SQL..."
 msgstr ""
 
 #: js/messages.php:293 libraries/server_variables.lib.php:157
-#: templates/designer/aggregate_query_panel.phtml:63
-#: templates/designer/delete_relation_panel.phtml:28
-#: templates/designer/having_query_panel.phtml:117
-#: templates/designer/new_relation_panel.phtml:88
-#: templates/designer/options_panel.phtml:253
-#: templates/designer/rename_to_panel.phtml:45
-#: templates/designer/where_query_panel.phtml:83
+#: templates/database/designer/aggregate_query_panel.phtml:63
+#: templates/database/designer/delete_relation_panel.phtml:28
+#: templates/database/designer/having_query_panel.phtml:117
+#: templates/database/designer/new_relation_panel.phtml:88
+#: templates/database/designer/options_panel.phtml:253
+#: templates/database/designer/rename_to_panel.phtml:45
+#: templates/database/designer/where_query_panel.phtml:83
 msgid "Cancel"
 msgstr ""
 
@@ -1793,7 +1797,7 @@ msgstr ""
 msgid "Page-related settings"
 msgstr "Баптауын өзгерту"
 
-#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:402
+#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:413
 msgid "Apply"
 msgstr ""
 
@@ -1828,8 +1832,8 @@ msgstr ""
 msgid "Error text: %s"
 msgstr ""
 
-#: js/messages.php:307 libraries/db_common.inc.php:68
-#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:450
+#: js/messages.php:307 libraries/db_common.inc.php:69
+#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:461
 msgid "No databases selected."
 msgstr ""
 
@@ -1841,12 +1845,13 @@ msgstr "Бағананың жойылуы"
 msgid "Adding Primary Key"
 msgstr ""
 
-#: js/messages.php:310 templates/designer/aggregate_query_panel.phtml:59
-#: templates/designer/having_query_panel.phtml:113
-#: templates/designer/new_relation_panel.phtml:87
-#: templates/designer/options_panel.phtml:252
-#: templates/designer/rename_to_panel.phtml:41
-#: templates/designer/where_query_panel.phtml:82
+#: js/messages.php:310
+#: templates/database/designer/aggregate_query_panel.phtml:59
+#: templates/database/designer/having_query_panel.phtml:113
+#: templates/database/designer/new_relation_panel.phtml:87
+#: templates/database/designer/options_panel.phtml:252
+#: templates/database/designer/rename_to_panel.phtml:41
+#: templates/database/designer/where_query_panel.phtml:82
 msgid "OK"
 msgstr "Жарайды"
 
@@ -1866,7 +1871,7 @@ msgstr "Дерекқорының көшірілуі"
 msgid "Changing Charset"
 msgstr ""
 
-#: js/messages.php:320 libraries/Util.class.php:3217
+#: js/messages.php:320 libraries/Util.class.php:3223
 #, fuzzy
 #| msgid "Foreign key check:"
 msgid "Enable foreign key checks"
@@ -1903,20 +1908,21 @@ msgstr ""
 #: js/messages.php:334 libraries/DisplayResults.class.php:4834
 #: libraries/DisplayResults.class.php:5092 libraries/Menu.class.php:344
 #: libraries/Menu.class.php:446 libraries/Menu.class.php:578
-#: libraries/Util.class.php:3636 libraries/Util.class.php:3637
-#: libraries/Util.class.php:4316 libraries/Util.class.php:4331
-#: libraries/Util.class.php:4348 libraries/config/messages.inc.php:252
+#: libraries/Util.class.php:3642 libraries/Util.class.php:3643
+#: libraries/Util.class.php:4322 libraries/Util.class.php:4337
+#: libraries/Util.class.php:4354 libraries/config/messages.inc.php:252
 #: libraries/display_export.lib.php:173 libraries/rte/rte_list.lib.php:146
 #: libraries/server_privileges.lib.php:2211
 #: libraries/server_privileges.lib.php:2290
 #: libraries/server_privileges.lib.php:2632
 #: libraries/server_privileges.lib.php:3356
 #: libraries/server_status_monitor.lib.php:322 prefs_manage.php:303
-#: setup/frames/menu.inc.php:27 templates/structure/check_all_tables.phtml:11
+#: setup/frames/menu.inc.php:27
+#: templates/database/structure/check_all_tables.phtml:11
 msgid "Export"
 msgstr "Экспорт"
 
-#: js/messages.php:337 libraries/rte/rte_routines.lib.php:652
+#: js/messages.php:337 libraries/rte/rte_routines.lib.php:743
 msgid "ENUM/SET editor"
 msgstr ""
 
@@ -1957,7 +1963,7 @@ msgstr "Сұраныс өрісін көрсету"
 #: libraries/Console.class.php:214 libraries/DisplayResults.class.php:3474
 #: libraries/DisplayResults.class.php:4818 libraries/Index.class.php:723
 #: libraries/Util.class.php:706 libraries/Util.class.php:1202
-#: libraries/Util.class.php:3634 libraries/Util.class.php:3635
+#: libraries/Util.class.php:3640 libraries/Util.class.php:3641
 #: libraries/central_columns.lib.php:851
 #: libraries/central_columns.lib.php:1193
 #: libraries/config/messages.inc.php:892
@@ -1975,7 +1981,7 @@ msgstr "Өзгерту"
 #: libraries/server_user_groups.lib.php:129
 #: libraries/sql_query_form.lib.php:416 libraries/tracking.lib.php:477
 #: setup/frames/index.inc.php:183 setup/frames/index.inc.php:291
-#: templates/designer/delete_relation_panel.phtml:27
+#: templates/database/designer/delete_relation_panel.phtml:27
 msgid "Delete"
 msgstr "Жою"
 
@@ -2149,11 +2155,11 @@ msgid "No dependencies selected!"
 msgstr "Бірде-бір қатар таңдалынбады"
 
 #: js/messages.php:394 libraries/central_columns.lib.php:1214
-#: libraries/insert_edit.lib.php:1458 libraries/server_variables.lib.php:155
+#: libraries/insert_edit.lib.php:1456 libraries/server_variables.lib.php:155
 #: setup/frames/config.inc.php:42 setup/frames/index.inc.php:279
 #: templates/columns_definitions/column_definitions_form.phtml:165
-#: templates/gis_visualization/gis_visualization.phtml:48
-#: templates/tbl_relation/common_form.phtml:107
+#: templates/table/gis_visualization/gis_visualization.phtml:48
+#: templates/table/relation/common_form.phtml:107
 msgid "Save"
 msgstr "Сақтау"
 
@@ -2238,8 +2244,8 @@ msgid "Data point content"
 msgstr ""
 
 #: js/messages.php:430 js/messages.php:562 js/messages.php:579
-#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2573
-#: templates/index_form.phtml:154 templates/index_form.phtml:194
+#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2571
+#: templates/table/index_form.phtml:154 templates/table/index_form.phtml:194
 msgid "Ignore"
 msgstr "Елемеу"
 
@@ -2298,8 +2304,8 @@ msgstr "Сыртқы кілтті таңдаңыз"
 msgid "Please select the primary key or a unique key!"
 msgstr ""
 
-#: js/messages.php:457 templates/designer/side_menu.phtml:91
-#: templates/designer/side_menu.phtml:94
+#: js/messages.php:457 templates/database/designer/side_menu.phtml:91
+#: templates/database/designer/side_menu.phtml:94
 msgid "Choose column to display"
 msgstr ""
 
@@ -2313,22 +2319,22 @@ msgstr ""
 msgid "Page name"
 msgstr ""
 
-#: js/messages.php:463 templates/designer/side_menu.phtml:56
-#: templates/designer/side_menu.phtml:59
+#: js/messages.php:463 templates/database/designer/side_menu.phtml:56
+#: templates/database/designer/side_menu.phtml:59
 #, fuzzy
 #| msgid "Save"
 msgid "Save page"
 msgstr "Сақтау"
 
-#: js/messages.php:464 templates/designer/side_menu.phtml:63
-#: templates/designer/side_menu.phtml:66
+#: js/messages.php:464 templates/database/designer/side_menu.phtml:63
+#: templates/database/designer/side_menu.phtml:66
 #, fuzzy
 #| msgid "Save"
 msgid "Save page as"
 msgstr "Сақтау"
 
-#: js/messages.php:465 templates/designer/side_menu.phtml:49
-#: templates/designer/side_menu.phtml:52
+#: js/messages.php:465 templates/database/designer/side_menu.phtml:49
+#: templates/database/designer/side_menu.phtml:52
 msgid "Open page"
 msgstr ""
 
@@ -2338,7 +2344,7 @@ msgstr ""
 msgid "Delete page"
 msgstr "Жою"
 
-#: js/messages.php:467 templates/designer/side_menu.phtml:10
+#: js/messages.php:467 templates/database/designer/side_menu.phtml:10
 #, fuzzy
 #| msgid "Unit"
 msgid "Untitled"
@@ -2460,7 +2466,7 @@ msgstr "Сызық"
 msgid "cancel"
 msgstr ""
 
-#: js/messages.php:499 libraries/server_status.lib.php:271
+#: js/messages.php:499 libraries/server_status.lib.php:280
 msgid "Aborted"
 msgstr ""
 
@@ -3052,7 +3058,7 @@ msgstr ""
 
 #: js/messages.php:793 libraries/Message.class.php:199
 #: libraries/Util.class.php:654 libraries/core.lib.php:245
-#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1172
+#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1170
 #: tbl_operations.php:229 view_operations.php:63
 msgid "Error"
 msgstr "Қате"
@@ -3111,8 +3117,8 @@ msgstr "секундке"
 msgid "per minute"
 msgstr "Минутқа"
 
-#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:143
-#: libraries/server_status.lib.php:228
+#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:152
+#: libraries/server_status.lib.php:237
 #: libraries/server_status_queries.lib.php:98
 msgid "per hour"
 msgstr "сағатқа"
@@ -3130,7 +3136,7 @@ msgstr ""
 msgid "Wrong permissions on configuration file, should not be world writable!"
 msgstr ""
 
-#: libraries/Config.class.php:1799
+#: libraries/Config.class.php:1801
 #, fuzzy
 msgid "Font size"
 msgstr "Қарiп өлшемi"
@@ -3159,10 +3165,10 @@ msgstr ""
 #: libraries/server_privileges.lib.php:2890
 #: libraries/server_privileges.lib.php:3144
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4332
+#: libraries/server_privileges.lib.php:4358
 #: libraries/server_status_processes.lib.php:80
-#: templates/tbl_relation/foreign_key_row.phtml:165
-#: templates/tbl_relation/internal_relational_row.phtml:55
+#: templates/table/relation/foreign_key_row.phtml:165
+#: templates/table/relation/internal_relational_row.phtml:55
 msgid "Database"
 msgstr "Дерекқор"
 
@@ -3264,11 +3270,11 @@ msgstr ""
 #: libraries/plugins/import/ImportMediawiki.class.php:60
 #: libraries/plugins/import/ImportOds.class.php:59
 #: libraries/plugins/import/ImportShp.class.php:57
-#: libraries/plugins/import/ImportSql.class.php:148
+#: libraries/plugins/import/ImportSql.class.php:51
 #: libraries/plugins/import/ImportXml.class.php:58
-#: libraries/rte/rte_routines.lib.php:833 templates/index_form.phtml:49
-#: templates/structure/row_stats_table.phtml:20
-#: templates/table/options.phtml:2
+#: libraries/rte/rte_routines.lib.php:924 templates/table/index_form.phtml:49
+#: templates/table/search/options.phtml:2
+#: templates/table/structure/row_stats_table.phtml:20
 msgid "Options"
 msgstr ""
 
@@ -3313,7 +3319,8 @@ msgstr "Кему бойынша"
 msgid "Order:"
 msgstr "Басқа"
 
-#: libraries/Console.class.php:289 templates/table/replace_preview.phtml:17
+#: libraries/Console.class.php:289
+#: templates/table/search/replace_preview.phtml:17
 #, fuzzy
 #| msgid "Column"
 msgid "Count"
@@ -3434,9 +3441,9 @@ msgstr "Көшірілген дерекқорына өту"
 #: libraries/operations.lib.php:794 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:191
-#: templates/structure/sortable_header.phtml:21
-#: templates/structure/sortable_header.phtml:38
-#: templates/table/options.phtml:68
+#: templates/database/structure/sortable_header.phtml:21
+#: templates/database/structure/sortable_header.phtml:38
+#: templates/table/search/options.phtml:68
 msgid "Ascending"
 msgstr "Өсу бойынша"
 
@@ -3446,13 +3453,14 @@ msgstr "Өсу бойынша"
 #: libraries/operations.lib.php:797 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:188
-#: templates/structure/sortable_header.phtml:26
-#: templates/structure/sortable_header.phtml:43
-#: templates/table/options.phtml:69
+#: templates/database/structure/sortable_header.phtml:26
+#: templates/database/structure/sortable_header.phtml:43
+#: templates/table/search/options.phtml:69
 msgid "Descending"
 msgstr "Кему бойынша"
 
-#: libraries/DBQbe.class.php:467 templates/table/search_and_replace.phtml:6
+#: libraries/DBQbe.class.php:467
+#: templates/table/search/search_and_replace.phtml:6
 #, fuzzy
 #| msgid "Column"
 msgid "Column:"
@@ -3633,12 +3641,12 @@ msgstr[0] "%1$s кестедегi сәйкестiк <i>%2$s</i>"
 msgstr[1] "%1$s кестедегi сәйкестiктер <i>%2$s</i>"
 
 #: libraries/DbSearch.class.php:354 libraries/Menu.class.php:311
-#: libraries/Util.class.php:3337 libraries/Util.class.php:3347
-#: libraries/Util.class.php:3623 libraries/Util.class.php:3624
-#: libraries/Util.class.php:4343 libraries/config.values.php:43
+#: libraries/Util.class.php:3343 libraries/Util.class.php:3353
+#: libraries/Util.class.php:3629 libraries/Util.class.php:3630
+#: libraries/Util.class.php:4349 libraries/config.values.php:43
 #: libraries/config.values.php:51 libraries/config.values.php:119
 #: libraries/navigation/Nodes/Node_Table.class.php:295
-#: templates/structure/check_all_table_column.phtml:5
+#: templates/table/structure/check_all_table_column.phtml:5
 msgid "Browse"
 msgstr "Шолу"
 
@@ -3655,7 +3663,8 @@ msgstr "Дерекқорынан іздеу"
 msgid "Words or values to search for (wildcard: \"%\"):"
 msgstr "Іздеу үшін сөз немесе мағына (топтық таңба \"%\"):"
 
-#: libraries/DbSearch.class.php:401 templates/table/search_and_replace.phtml:1
+#: libraries/DbSearch.class.php:401
+#: templates/table/search/search_and_replace.phtml:1
 msgid "Find:"
 msgstr "Сайт бойынша іздеу:"
 
@@ -3703,28 +3712,28 @@ msgstr "Сүзгі"
 msgid "Search this table"
 msgstr "Дерекқорынан іздеу"
 
-#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2532
-#: libraries/Util.class.php:2535
+#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2538
+#: libraries/Util.class.php:2541
 msgctxt "First page"
 msgid "Begin"
 msgstr ""
 
-#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2533
-#: libraries/Util.class.php:2536 libraries/server_bin_log.lib.php:170
+#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2539
+#: libraries/Util.class.php:2542 libraries/server_bin_log.lib.php:170
 #: libraries/server_bin_log.lib.php:172
 msgctxt "Previous page"
 msgid "Previous"
 msgstr ""
 
-#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2564
-#: libraries/Util.class.php:2574 libraries/server_bin_log.lib.php:204
+#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2570
+#: libraries/Util.class.php:2580 libraries/server_bin_log.lib.php:204
 #: libraries/server_bin_log.lib.php:206
 msgctxt "Next page"
 msgid "Next"
 msgstr ""
 
-#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2565
-#: libraries/Util.class.php:2575
+#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2571
+#: libraries/Util.class.php:2581
 msgctxt "Last page"
 msgid "End"
 msgstr ""
@@ -3801,9 +3810,9 @@ msgid "May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]."
 msgstr ""
 
 #: libraries/DisplayResults.class.php:4332 libraries/Message.class.php:180
-#: libraries/controllers/TableRelationController.class.php:258
+#: libraries/controllers/TableRelationController.class.php:259
 #: libraries/controllers/TableSearchController.class.php:655
-#: libraries/rte/rte_routines.lib.php:1332 libraries/sql_query_form.lib.php:89
+#: libraries/rte/rte_routines.lib.php:1423 libraries/sql_query_form.lib.php:89
 #: tbl_operations.php:227 tbl_row_action.php:138 view_operations.php:62
 #, fuzzy
 #| msgid "Your SQL query has been executed successfully."
@@ -3811,7 +3820,7 @@ msgid "Your SQL query has been executed successfully."
 msgstr "SQL-сұранысы сәтті орындалды"
 
 #: libraries/DisplayResults.class.php:4660
-#: libraries/controllers/StructureController.class.php:629
+#: libraries/controllers/DatabaseStructureController.class.php:564
 #, php-format
 msgid ""
 "This view has at least this number of rows. Please refer to %sdocumentation"
@@ -3834,33 +3843,33 @@ msgstr ""
 msgid "%d total"
 msgstr "%d Кесте(лер)"
 
-#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1318
+#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1312
 #, php-format
 msgid "Query took %01.4f seconds."
 msgstr ""
 
 #: libraries/DisplayResults.class.php:4807
-#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4767
-#: libraries/Util.class.php:4773 libraries/mult_submits.inc.php:50
-#: templates/structure/check_all_tables.phtml:2
-#: templates/structure/check_all_tables.phtml:9
+#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4773
+#: libraries/Util.class.php:4779 libraries/mult_submits.inc.php:50
+#: templates/database/structure/check_all_tables.phtml:2
+#: templates/database/structure/check_all_tables.phtml:9
 msgid "With selected:"
 msgstr "Белгi соғылғандарды:"
 
 #: libraries/DisplayResults.class.php:4811
-#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4769
-#: libraries/Util.class.php:4770 libraries/server_privileges.lib.php:1174
+#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4775
+#: libraries/Util.class.php:4776 libraries/server_privileges.lib.php:1174
 #: libraries/server_privileges.lib.php:1175
 #: libraries/server_privileges.lib.php:1387
 #: libraries/server_user_groups.lib.php:231
-#: templates/structure/check_all_tables.phtml:3
-#: templates/structure/check_all_tables.phtml:4
+#: templates/database/structure/check_all_tables.phtml:3
+#: templates/database/structure/check_all_tables.phtml:4
 msgid "Check All"
 msgstr "Барлығын белгілеу"
 
 #: libraries/DisplayResults.class.php:4985 libraries/Header.class.php:383
-#: templates/structure/optional_action_links.phtml:1
-#: templates/structure/print_view_data_dictionary_link.phtml:3
+#: templates/database/structure/print_view_data_dictionary_link.phtml:3
+#: templates/table/structure/optional_action_links.phtml:1
 msgid "Print view"
 msgstr "Баспаға шығару түрі"
 
@@ -3868,7 +3877,8 @@ msgstr "Баспаға шығару түрі"
 msgid "Query results operations"
 msgstr ""
 
-#: libraries/DisplayResults.class.php:5105 templates/tbl_chart.phtml:12
+#: libraries/DisplayResults.class.php:5105
+#: templates/table/chart/tbl_chart.phtml:12
 msgid "Display chart"
 msgstr ""
 
@@ -3963,7 +3973,7 @@ msgid "Click on the bar to scroll to top of page"
 msgstr ""
 
 #: libraries/Header.class.php:749
-#: libraries/plugins/auth/AuthenticationCookie.class.php:152
+#: libraries/plugins/auth/AuthenticationCookie.class.php:140
 msgid "Javascript must be enabled past this point!"
 msgstr ""
 
@@ -3985,11 +3995,11 @@ msgid "Keyname"
 msgstr "Индекс атауы"
 
 #: libraries/Index.class.php:697
-#: libraries/controllers/StructureController.class.php:1962
-#: libraries/controllers/StructureController.class.php:1967
+#: libraries/controllers/TableStructureController.class.php:953
+#: libraries/controllers/TableStructureController.class.php:958
 #: libraries/tracking.lib.php:973
 #: templates/columns_definitions/column_indexes.phtml:11
-#: templates/structure/check_all_table_column.phtml:26
+#: templates/table/structure/check_all_table_column.phtml:26
 msgid "Unique"
 msgstr "Бірегей"
 
@@ -4008,16 +4018,17 @@ msgstr ""
 #: libraries/server_collations.lib.php:35 libraries/tracking.lib.php:881
 #: libraries/tracking.lib.php:977
 #: templates/columns_definitions/table_fields_definitions.phtml:33
-#: templates/structure/row_stats_table.phtml:31
-#: templates/structure/table_header.phtml:55
-#: templates/structure/table_structure_header.phtml:7
-#: templates/table/table_header.phtml:8
+#: templates/database/structure/table_header.phtml:55
+#: templates/table/search/table_header.phtml:8
+#: templates/table/structure/row_stats_table.phtml:31
+#: templates/table/structure/table_structure_header.phtml:7
 msgid "Collation"
 msgstr "Салыстыру"
 
 #: libraries/Index.class.php:703 libraries/rte/rte_events.lib.php:496
-#: libraries/rte/rte_routines.lib.php:956 libraries/tracking.lib.php:885
-#: libraries/tracking.lib.php:979 templates/structure/table_header.phtml:84
+#: libraries/rte/rte_routines.lib.php:1047 libraries/tracking.lib.php:885
+#: libraries/tracking.lib.php:979
+#: templates/database/structure/table_header.phtml:84
 msgid "Comment"
 msgstr "Пікірлеу"
 
@@ -4030,15 +4041,15 @@ msgstr ""
 msgid "Index %s has been dropped."
 msgstr "Индекс %s жойылған болатын."
 
-#: libraries/Index.class.php:757 libraries/Util.class.php:3630
-#: libraries/Util.class.php:3631
-#: libraries/controllers/StructureController.class.php:1958
-#: libraries/controllers/StructureController.class.php:1959
+#: libraries/Index.class.php:757 libraries/Util.class.php:3636
+#: libraries/Util.class.php:3637
+#: libraries/controllers/TableStructureController.class.php:949
+#: libraries/controllers/TableStructureController.class.php:950
 #: libraries/operations.lib.php:1607 libraries/rte/rte_list.lib.php:150
 #: libraries/server_databases.lib.php:146
-#: templates/structure/check_all_table_column.phtml:15
-#: templates/structure/check_all_tables.phtml:16
-#: templates/tbl_relation/foreign_key_row.phtml:93
+#: templates/database/structure/check_all_tables.phtml:16
+#: templates/table/relation/foreign_key_row.phtml:93
+#: templates/table/structure/check_all_table_column.phtml:15
 msgid "Drop"
 msgstr "Жою"
 
@@ -4067,16 +4078,16 @@ msgstr ""
 #: libraries/Menu.class.php:248
 #: libraries/navigation/Nodes/Node_View.class.php:32
 #: libraries/tbl_info.inc.php:63
-#: templates/structure/structure_table_row.phtml:97
-#: templates/structure/structure_table_row.phtml:159
+#: templates/database/structure/structure_table_row.phtml:97
+#: templates/database/structure/structure_table_row.phtml:159
 msgid "View"
 msgstr "Түр"
 
 #: libraries/Menu.class.php:325 libraries/Menu.class.php:429
-#: libraries/Menu.class.php:548 libraries/Util.class.php:3334
-#: libraries/Util.class.php:3344 libraries/Util.class.php:3350
-#: libraries/Util.class.php:4313 libraries/Util.class.php:4328
-#: libraries/Util.class.php:4345 libraries/config.values.php:40
+#: libraries/Menu.class.php:548 libraries/Util.class.php:3340
+#: libraries/Util.class.php:3350 libraries/Util.class.php:3356
+#: libraries/Util.class.php:4319 libraries/Util.class.php:4334
+#: libraries/Util.class.php:4351 libraries/config.values.php:40
 #: libraries/config.values.php:48 libraries/config.values.php:110
 #: libraries/config.values.php:116 libraries/config/messages.inc.php:321
 #: libraries/navigation/Nodes/Node_Table.class.php:292
@@ -4084,19 +4095,19 @@ msgid "SQL"
 msgstr ""
 
 #: libraries/Menu.class.php:328 libraries/Menu.class.php:432
-#: libraries/Util.class.php:3335 libraries/Util.class.php:3345
-#: libraries/Util.class.php:3351 libraries/Util.class.php:3625
-#: libraries/Util.class.php:3626 libraries/Util.class.php:4329
-#: libraries/Util.class.php:4346 libraries/config.values.php:41
+#: libraries/Util.class.php:3341 libraries/Util.class.php:3351
+#: libraries/Util.class.php:3357 libraries/Util.class.php:3631
+#: libraries/Util.class.php:3632 libraries/Util.class.php:4335
+#: libraries/Util.class.php:4352 libraries/config.values.php:41
 #: libraries/config.values.php:49 libraries/config.values.php:111
 #: libraries/config.values.php:117
 #: libraries/navigation/Nodes/Node_Table.class.php:286
 msgid "Search"
 msgstr "Іздеу"
 
-#: libraries/Menu.class.php:338 libraries/Util.class.php:3336
-#: libraries/Util.class.php:3346 libraries/Util.class.php:3627
-#: libraries/Util.class.php:3628 libraries/Util.class.php:4347
+#: libraries/Menu.class.php:338 libraries/Util.class.php:3342
+#: libraries/Util.class.php:3352 libraries/Util.class.php:3633
+#: libraries/Util.class.php:3634 libraries/Util.class.php:4353
 #: libraries/config.values.php:42 libraries/config.values.php:50
 #: libraries/config.values.php:118
 #: libraries/navigation/Nodes/Node_Table.class.php:289
@@ -4105,30 +4116,30 @@ msgid "Insert"
 msgstr ""
 
 #: libraries/Menu.class.php:362 libraries/Menu.class.php:467
-#: libraries/Util.class.php:4334 libraries/Util.class.php:4350
+#: libraries/Util.class.php:4340 libraries/Util.class.php:4356
 #: libraries/config.values.php:106 libraries/server_common.lib.php:51
 #: libraries/server_privileges.lib.php:2370
 #: libraries/server_privileges.lib.php:3158
-#: libraries/server_privileges.lib.php:4221
+#: libraries/server_privileges.lib.php:4247
 msgid "Privileges"
 msgstr ""
 
 #: libraries/Menu.class.php:371 libraries/Menu.class.php:379
-#: libraries/Menu.class.php:459 libraries/Util.class.php:3338
-#: libraries/Util.class.php:3352 libraries/Util.class.php:4333
-#: libraries/Util.class.php:4351 libraries/config.values.php:112
+#: libraries/Menu.class.php:459 libraries/Util.class.php:3344
+#: libraries/Util.class.php:3358 libraries/Util.class.php:4339
+#: libraries/Util.class.php:4357 libraries/config.values.php:112
 #: view_operations.php:92
 msgid "Operations"
 msgstr ""
 
 #: libraries/Menu.class.php:384 libraries/Menu.class.php:492
-#: libraries/Util.class.php:4338 libraries/Util.class.php:4352
+#: libraries/Util.class.php:4344 libraries/Util.class.php:4358
 #: libraries/relation.lib.php:255
 msgid "Tracking"
 msgstr ""
 
 #: libraries/Menu.class.php:397 libraries/Menu.class.php:486
-#: libraries/Util.class.php:4337 libraries/Util.class.php:4353
+#: libraries/Util.class.php:4343 libraries/Util.class.php:4359
 #: libraries/navigation/Nodes/Node_Trigger_Container.class.php:24
 #: libraries/plugins/export/ExportHtmlword.class.php:557
 #: libraries/plugins/export/ExportOdt.class.php:685
@@ -4145,16 +4156,16 @@ msgstr ""
 msgid "Database seems to be empty!"
 msgstr ""
 
-#: libraries/Menu.class.php:439 libraries/Util.class.php:4330
+#: libraries/Menu.class.php:439 libraries/Util.class.php:4336
 msgid "Query"
 msgstr ""
 
-#: libraries/Menu.class.php:472 libraries/Util.class.php:4335
+#: libraries/Menu.class.php:472 libraries/Util.class.php:4341
 #: libraries/rte/rte_words.lib.php:36
 msgid "Routines"
 msgstr ""
 
-#: libraries/Menu.class.php:479 libraries/Util.class.php:4336
+#: libraries/Menu.class.php:479 libraries/Util.class.php:4342
 #: libraries/navigation/Nodes/Node_Event_Container.class.php:26
 #: libraries/plugins/export/ExportSql.class.php:940
 #: libraries/plugins/export/ExportXml.class.php:107
@@ -4162,22 +4173,22 @@ msgstr ""
 msgid "Events"
 msgstr ""
 
-#: libraries/Menu.class.php:498 libraries/Util.class.php:4339
+#: libraries/Menu.class.php:498 libraries/Util.class.php:4345
 msgid "Designer"
 msgstr ""
 
-#: libraries/Menu.class.php:507 libraries/Util.class.php:4340
-#: templates/structure/check_all_tables.phtml:35
+#: libraries/Menu.class.php:507 libraries/Util.class.php:4346
+#: templates/database/structure/check_all_tables.phtml:35
 #, fuzzy
 #| msgid "Add columns"
 msgid "Central columns"
 msgstr "Бағаналар қосу"
 
-#: libraries/Menu.class.php:544 libraries/Util.class.php:4312
+#: libraries/Menu.class.php:544 libraries/Util.class.php:4318
 #: libraries/config.values.php:103 libraries/config/messages.inc.php:266
 #: libraries/config/messages.inc.php:341
 #: libraries/navigation/NavigationTree.class.php:1239
-#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4332
+#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4358
 msgid "Databases"
 msgstr "Дерекқоры"
 
@@ -4186,34 +4197,34 @@ msgid "User accounts"
 msgstr ""
 
 #: libraries/Menu.class.php:595 libraries/ServerStatusData.class.php:121
-#: libraries/Util.class.php:4319 libraries/server_common.lib.php:36
+#: libraries/Util.class.php:4325 libraries/server_common.lib.php:36
 msgid "Binary log"
 msgstr ""
 
 #: libraries/Menu.class.php:601 libraries/ServerStatusData.class.php:126
-#: libraries/Util.class.php:4320 libraries/server_common.lib.php:42
-#: templates/structure/body_for_table_summary.phtml:10
-#: templates/structure/table_header.phtml:27
+#: libraries/Util.class.php:4326 libraries/server_common.lib.php:42
+#: templates/database/structure/body_for_table_summary.phtml:10
+#: templates/database/structure/table_header.phtml:27
 msgid "Replication"
 msgstr "Репликация"
 
 #: libraries/Menu.class.php:606 libraries/ServerStatusData.class.php:193
-#: libraries/Util.class.php:4321 libraries/config.values.php:105
+#: libraries/Util.class.php:4327 libraries/config.values.php:105
 #: libraries/server_engines.lib.php:108 libraries/server_engines.lib.php:112
 #: libraries/sql_query_form.lib.php:421
 msgid "Variables"
 msgstr ""
 
-#: libraries/Menu.class.php:610 libraries/Util.class.php:4322
+#: libraries/Menu.class.php:610 libraries/Util.class.php:4328
 msgid "Charsets"
 msgstr ""
 
-#: libraries/Menu.class.php:615 libraries/Util.class.php:4323
+#: libraries/Menu.class.php:615 libraries/Util.class.php:4329
 #: libraries/server_common.lib.php:33 libraries/server_plugins.lib.php:27
 msgid "Plugins"
 msgstr ""
 
-#: libraries/Menu.class.php:626 libraries/Util.class.php:4324
+#: libraries/Menu.class.php:626 libraries/Util.class.php:4330
 msgid "Engines"
 msgstr ""
 
@@ -4238,7 +4249,7 @@ msgid_plural "%1$d rows inserted."
 msgstr[0] ""
 msgstr[1] ""
 
-#: libraries/PDF.class.php:70 libraries/Util.class.php:2521
+#: libraries/PDF.class.php:70 libraries/Util.class.php:2527
 #: libraries/browse_foreigners.lib.php:327
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:865
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:890
@@ -4259,7 +4270,7 @@ msgid "Could not save favorite table!"
 msgstr ""
 
 #: libraries/RecentFavoriteTable.class.php:212
-#: templates/structure/favorite_anchor.phtml:12
+#: templates/database/structure/favorite_anchor.phtml:12
 #, fuzzy
 #| msgid "Remove chart"
 msgid "Remove from Favorites"
@@ -4438,7 +4449,7 @@ msgid ""
 msgstr ""
 
 #: libraries/StorageEngine.class.php:373
-#: templates/structure/body_for_table_summary.phtml:50
+#: templates/database/structure/body_for_table_summary.phtml:50
 #, fuzzy, php-format
 msgid "%s is the default storage engine on this MySQL server."
 msgstr "%s - келісім бойынша орнатылған MySQL серверінің кесте типі"
@@ -4858,10 +4869,10 @@ msgstr ""
 
 #: libraries/Util.class.php:726 libraries/rte/rte_events.lib.php:110
 #: libraries/rte/rte_events.lib.php:119 libraries/rte/rte_events.lib.php:150
-#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:153
-#: libraries/rte/rte_routines.lib.php:162
-#: libraries/rte/rte_routines.lib.php:235
-#: libraries/rte/rte_routines.lib.php:1366
+#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:223
+#: libraries/rte/rte_routines.lib.php:250
+#: libraries/rte/rte_routines.lib.php:372
+#: libraries/rte/rte_routines.lib.php:1457
 #: libraries/rte/rte_triggers.lib.php:86 libraries/rte/rte_triggers.lib.php:95
 #: libraries/rte/rte_triggers.lib.php:127
 msgid "MySQL said: "
@@ -4907,75 +4918,78 @@ msgstr ""
 msgid "%B %d, %Y at %I:%M %p"
 msgstr ""
 
-#: libraries/Util.class.php:2019
+#: libraries/Util.class.php:2025
 #, php-format
 msgid "%s days, %s hours, %s minutes and %s seconds"
 msgstr ""
 
-#: libraries/Util.class.php:2112
+#: libraries/Util.class.php:2118
 msgid "Missing parameter:"
 msgstr ""
 
-#: libraries/Util.class.php:2645
+#: libraries/Util.class.php:2651
 #, php-format
 msgid "Jump to database \"%s\"."
 msgstr ""
 
-#: libraries/Util.class.php:2670
+#: libraries/Util.class.php:2676
 #, php-format
 msgid "The %s functionality is affected by a known bug, see %s"
 msgstr ""
 
-#: libraries/Util.class.php:2881
+#: libraries/Util.class.php:2887
 msgid "Click to toggle"
 msgstr ""
 
-#: libraries/Util.class.php:3542 prefs_manage.php:248
+#: libraries/Util.class.php:3548 prefs_manage.php:248
 msgid "Browse your computer:"
 msgstr ""
 
-#: libraries/Util.class.php:3567
+#: libraries/Util.class.php:3573
 #, php-format
 msgid "Select from the web server upload directory <b>%s</b>:"
 msgstr ""
 
-#: libraries/Util.class.php:3596 libraries/insert_edit.lib.php:1173
+#: libraries/Util.class.php:3602 libraries/insert_edit.lib.php:1171
 msgid "The directory you set for upload work cannot be reached."
 msgstr ""
 
-#: libraries/Util.class.php:3607
+#: libraries/Util.class.php:3613
 msgid "There are no files to upload!"
 msgstr ""
 
-#: libraries/Util.class.php:3632 libraries/Util.class.php:3633
-#: templates/structure/check_all_tables.phtml:15
+#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: templates/database/structure/check_all_tables.phtml:15
 msgid "Empty"
 msgstr "Тазарту"
 
-#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: libraries/Util.class.php:3644 libraries/Util.class.php:3645
 msgid "Execute"
 msgstr ""
 
-#: libraries/Util.class.php:4152
+#: libraries/Util.class.php:4158
 msgid "Print"
 msgstr ""
 
-#: libraries/Util.class.php:4257 templates/structure/row_stats_table.phtml:80
-#: templates/structure/table_header.phtml:95
+#: libraries/Util.class.php:4263
+#: templates/database/structure/table_header.phtml:95
+#: templates/table/structure/row_stats_table.phtml:80
 msgid "Creation"
 msgstr "Құру"
 
-#: libraries/Util.class.php:4263 templates/structure/row_stats_table.phtml:87
-#: templates/structure/table_header.phtml:106
+#: libraries/Util.class.php:4269
+#: templates/database/structure/table_header.phtml:106
+#: templates/table/structure/row_stats_table.phtml:87
 msgid "Last update"
 msgstr "Соңғы жаңартылым"
 
-#: libraries/Util.class.php:4269 templates/structure/row_stats_table.phtml:94
-#: templates/structure/table_header.phtml:117
+#: libraries/Util.class.php:4275
+#: templates/database/structure/table_header.phtml:117
+#: templates/table/structure/row_stats_table.phtml:94
 msgid "Last check"
 msgstr "Соңғы тексерім"
 
-#: libraries/Util.class.php:4315
+#: libraries/Util.class.php:4321
 msgid "Users"
 msgstr ""
 
@@ -4998,16 +5012,16 @@ msgid "Use this value"
 msgstr "Осы мәнді қолданыңыз"
 
 #: libraries/build_html_for_db.lib.php:33 libraries/import.lib.php:193
-#: templates/structure/actions_in_table_structure.phtml:113
-#: templates/structure/row_stats_table.phtml:42
-#: templates/structure/table_header.phtml:36
+#: templates/database/structure/table_header.phtml:36
+#: templates/table/structure/actions_in_table_structure.phtml:113
+#: templates/table/structure/row_stats_table.phtml:42
 msgid "Rows"
 msgstr "Қатарлар"
 
 #: libraries/build_html_for_db.lib.php:48 libraries/engines/innodb.lib.php:171
-#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:186
-#: libraries/server_status.lib.php:298
-#: templates/structure/display_table_stats.phtml:40
+#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:195
+#: libraries/server_status.lib.php:307
+#: templates/table/structure/display_table_stats.phtml:40
 msgid "Total"
 msgstr "Барлығы"
 
@@ -5016,10 +5030,12 @@ msgid "Jump to database"
 msgstr ""
 
 #: libraries/build_html_for_db.lib.php:146
+#: templates/database/structure/structure_table_row.phtml:15
 msgid "Not replicated"
 msgstr ""
 
 #: libraries/build_html_for_db.lib.php:158
+#: templates/database/structure/structure_table_row.phtml:16
 msgid "Replicated"
 msgstr ""
 
@@ -5074,17 +5090,17 @@ msgstr ""
 #: libraries/plugins/export/ExportTexytext.class.php:425
 #: libraries/plugins/export/PMA_ExportPdf.class.php:307
 #: libraries/rte/rte_list.lib.php:73 libraries/rte/rte_list.lib.php:85
-#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:830
-#: libraries/rte/rte_routines.lib.php:1492 setup/frames/index.inc.php:162
+#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:921
+#: libraries/rte/rte_routines.lib.php:1583 setup/frames/index.inc.php:162
 #: templates/columns_definitions/table_fields_definitions.phtml:8
-#: templates/structure/table_structure_header.phtml:5
-#: templates/table/create_table.phtml:11
+#: templates/database/create_table.phtml:11
+#: templates/table/structure/table_structure_header.phtml:5
 msgid "Name"
 msgstr ""
 
 #: libraries/central_columns.lib.php:699
 #: libraries/central_columns.lib.php:1381
-#: libraries/rte/rte_routines.lib.php:832
+#: libraries/rte/rte_routines.lib.php:923
 #: templates/columns_definitions/table_fields_definitions.phtml:14
 msgid "Length/Values"
 msgstr ""
@@ -5105,7 +5121,7 @@ msgid "Select a table"
 msgstr "Барлығын ерекшелеу"
 
 #: libraries/central_columns.lib.php:804
-#: templates/structure/add_column.phtml:4
+#: templates/table/structure/add_column.phtml:4
 msgid "Add column"
 msgstr ""
 
@@ -5125,7 +5141,7 @@ msgstr "Бағандарды Қосу/Өшіру"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1002
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1025
 #: templates/columns_definitions/table_fields_definitions.phtml:36
-#: templates/structure/table_structure_header.phtml:8
+#: templates/table/structure/table_structure_header.phtml:8
 msgid "Attributes"
 msgstr ""
 
@@ -5241,7 +5257,7 @@ msgid "Double click"
 msgstr ""
 
 #: libraries/config.values.php:95 libraries/config.values.php:124
-#: libraries/config/FormDisplay.tpl.php:221 libraries/relation.lib.php:97
+#: libraries/config/FormDisplay.tpl.php:232 libraries/relation.lib.php:97
 #: libraries/relation.lib.php:105
 msgid "Disabled"
 msgstr ""
@@ -5421,21 +5437,21 @@ msgstr ""
 msgid "maximum %s"
 msgstr ""
 
-#: libraries/config/FormDisplay.tpl.php:219
+#: libraries/config/FormDisplay.tpl.php:230
 msgid "This setting is disabled, it will not be applied to your configuration."
 msgstr ""
 
-#: libraries/config/FormDisplay.tpl.php:313
+#: libraries/config/FormDisplay.tpl.php:324
 #, php-format
 msgid "Set value: %s"
 msgstr ""
 
-#: libraries/config/FormDisplay.tpl.php:318
+#: libraries/config/FormDisplay.tpl.php:329
 #: libraries/config/messages.inc.php:610
 msgid "Restore default value"
 msgstr ""
 
-#: libraries/config/FormDisplay.tpl.php:332
+#: libraries/config/FormDisplay.tpl.php:343
 msgid "Allow users to customize this value"
 msgstr ""
 
@@ -5857,7 +5873,7 @@ msgstr ""
 
 #: libraries/config/messages.inc.php:136 libraries/config/messages.inc.php:152
 #: libraries/sql_query_form.lib.php:247
-#: templates/structure/row_stats_table.phtml:7
+#: templates/table/structure/row_stats_table.phtml:7
 msgid "Format"
 msgstr ""
 
@@ -6372,7 +6388,7 @@ msgstr ""
 
 #: libraries/config/messages.inc.php:332
 #: libraries/plugins/export/ExportPdf.class.php:279
-#: templates/structure/secondary_tabs.phtml:8
+#: templates/table/secondary_tabs.phtml:8
 #, fuzzy
 #| msgid "Databases"
 msgid "Table structure"
@@ -7913,106 +7929,34 @@ msgstr ""
 msgid "OpenDocument Text"
 msgstr ""
 
-#: libraries/controllers/StructureController.class.php:465
+#: libraries/controllers/DatabaseStructureController.class.php:405
 #: tbl_operations.php:382
 #, php-format
 msgid "Table %s has been emptied."
 msgstr "%s кестесі аластанды."
 
-#: libraries/controllers/StructureController.class.php:486
+#: libraries/controllers/DatabaseStructureController.class.php:426
 #: tbl_operations.php:400 view_operations.php:119
 #, fuzzy, php-format
 msgid "View %s has been dropped."
 msgstr "%s көрсетілімі жойылған"
 
-#: libraries/controllers/StructureController.class.php:487
+#: libraries/controllers/DatabaseStructureController.class.php:427
 #: tbl_operations.php:401
 #, fuzzy, php-format
 #| msgid "Table %s has been dropped."
 msgid "Table %s has been dropped."
 msgstr "%s кестесі жойылған болатын"
 
-#: libraries/controllers/StructureController.class.php:797
-#, php-format
-msgid "The name '%s' is a MySQL reserved keyword."
-msgid_plural "The names '%s' are MySQL reserved keywords."
-msgstr[0] ""
-msgstr[1] ""
-
-#: libraries/controllers/StructureController.class.php:875
-#, fuzzy
-#| msgid "No rows selected"
-msgid "No column selected."
-msgstr "Бірде-бір қатар таңдалынбады"
-
-#: libraries/controllers/StructureController.class.php:1049
+#: libraries/controllers/DatabaseStructureController.class.php:733
 msgid "Favorite List is full!"
 msgstr ""
 
-#: libraries/controllers/StructureController.class.php:1272
-msgid "The columns have been moved successfully."
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1535
-#, php-format
-msgid ""
-"Table %1$s has been altered successfully. Privileges have been adjusted."
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1541
-#: libraries/controllers/TableIndexesController.class.php:161
-#: tbl_addfield.php:92
-#, php-format
-msgid "Table %1$s has been altered successfully."
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1588
-#: libraries/tracking.lib.php:1094
-msgid "Query error"
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1806
+#: libraries/controllers/DatabaseStructureController.class.php:947
 #: libraries/mysql_charsets.lib.php:366 libraries/mysql_charsets.lib.php:373
 msgid "unknown"
 msgstr "белгісіз"
 
-#: libraries/controllers/StructureController.class.php:1957
-#: templates/structure/check_all_table_column.phtml:11
-msgid "Change"
-msgstr "Өзгерту"
-
-#: libraries/controllers/StructureController.class.php:1961
-#: libraries/controllers/StructureController.class.php:1966
-#: libraries/navigation/Nodes/Node_Index.class.php:30
-#: libraries/tracking.lib.php:926
-#: templates/columns_definitions/column_indexes.phtml:16
-#: templates/columns_definitions/table_fields_definitions.phtml:57
-#: templates/structure/check_all_table_column.phtml:30
-#: templates/structure/display_structure.phtml:79
-#: templates/structure/display_table_stats.phtml:19
-msgid "Index"
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1963
-#: libraries/controllers/StructureController.class.php:1968
-#: templates/columns_definitions/column_indexes.phtml:27
-#: templates/structure/check_all_table_column.phtml:37
-msgid "Spatial"
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1964
-#: libraries/controllers/StructureController.class.php:1969
-#: templates/columns_definitions/column_indexes.phtml:22
-#: templates/structure/check_all_table_column.phtml:47
-msgid "Fulltext"
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1970
-#, fuzzy
-#| msgid "Use this value"
-msgid "Distinct values"
-msgstr "Осы мәнді қолданыңыз"
-
 #: libraries/controllers/TableChartController.class.php:82
 #: libraries/controllers/TableGisVisualizationController.class.php:101
 msgid "No SQL query was set to fetch data."
@@ -8028,11 +7972,18 @@ msgstr ""
 msgid "No data to display"
 msgstr "Мәліметтер жоқ"
 
-#: libraries/controllers/TableRelationController.class.php:217
+#: libraries/controllers/TableIndexesController.class.php:161
+#: libraries/controllers/TableStructureController.class.php:736
+#: tbl_addfield.php:92
+#, php-format
+msgid "Table %1$s has been altered successfully."
+msgstr ""
+
+#: libraries/controllers/TableRelationController.class.php:218
 msgid "Display column was successfully updated."
 msgstr ""
 
-#: libraries/controllers/TableRelationController.class.php:283
+#: libraries/controllers/TableRelationController.class.php:288
 #, fuzzy
 #| msgid "Table %s has been emptied."
 msgid "Internal relations were successfully updated."
@@ -8051,12 +8002,77 @@ msgid "Zoom search"
 msgstr "Iздестiрудi үлкейту"
 
 #: libraries/controllers/TableSearchController.class.php:852
-#: templates/table/selection_form.phtml:59
+#: templates/table/search/selection_form.phtml:59
 #, fuzzy
 #| msgid "Hide search criteria"
 msgid "Find and replace"
 msgstr "Іздеу параметрлерiн жасыру"
 
+#: libraries/controllers/TableStructureController.class.php:163
+#, php-format
+msgid "The name '%s' is a MySQL reserved keyword."
+msgid_plural "The names '%s' are MySQL reserved keywords."
+msgstr[0] ""
+msgstr[1] ""
+
+#: libraries/controllers/TableStructureController.class.php:241
+#, fuzzy
+#| msgid "No rows selected"
+msgid "No column selected."
+msgstr "Бірде-бір қатар таңдалынбады"
+
+#: libraries/controllers/TableStructureController.class.php:467
+msgid "The columns have been moved successfully."
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:730
+#, php-format
+msgid ""
+"Table %1$s has been altered successfully. Privileges have been adjusted."
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:783
+#: libraries/tracking.lib.php:1094
+msgid "Query error"
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:948
+#: templates/table/structure/check_all_table_column.phtml:11
+msgid "Change"
+msgstr "Өзгерту"
+
+#: libraries/controllers/TableStructureController.class.php:952
+#: libraries/controllers/TableStructureController.class.php:957
+#: libraries/navigation/Nodes/Node_Index.class.php:30
+#: libraries/tracking.lib.php:926
+#: templates/columns_definitions/column_indexes.phtml:16
+#: templates/columns_definitions/table_fields_definitions.phtml:57
+#: templates/table/structure/check_all_table_column.phtml:30
+#: templates/table/structure/display_structure.phtml:79
+#: templates/table/structure/display_table_stats.phtml:19
+msgid "Index"
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:954
+#: libraries/controllers/TableStructureController.class.php:959
+#: templates/columns_definitions/column_indexes.phtml:27
+#: templates/table/structure/check_all_table_column.phtml:37
+msgid "Spatial"
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:955
+#: libraries/controllers/TableStructureController.class.php:960
+#: templates/columns_definitions/column_indexes.phtml:22
+#: templates/table/structure/check_all_table_column.phtml:47
+msgid "Fulltext"
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:963
+#, fuzzy
+#| msgid "Use this value"
+msgid "Distinct values"
+msgstr "Осы мәнді қолданыңыз"
+
 #: libraries/core.lib.php:306
 #, php-format
 msgid "The %s extension is missing. Please check your PHP configuration."
@@ -8101,7 +8117,7 @@ msgid "No Password"
 msgstr ""
 
 #: libraries/display_change_password.lib.php:68
-#: libraries/plugins/auth/AuthenticationCookie.class.php:199
+#: libraries/plugins/auth/AuthenticationCookie.class.php:187
 #: libraries/replication_gui.lib.php:422 libraries/replication_gui.lib.php:862
 #: libraries/server_privileges.lib.php:1640
 msgid "Password:"
@@ -8855,12 +8871,12 @@ msgid "Dump has been saved to file %s."
 msgstr "%s файлына дамп сақталынды."
 
 #: libraries/import.lib.php:202 libraries/insert_edit.lib.php:124
-#: libraries/rte/rte_routines.lib.php:1353 libraries/sql.lib.php:1312
+#: libraries/rte/rte_routines.lib.php:1444 libraries/sql.lib.php:1306
 #: tbl_get_field.php:44
 msgid "MySQL returned an empty result set (i.e. zero rows)."
 msgstr ""
 
-#: libraries/import.lib.php:265 libraries/sql.lib.php:1326
+#: libraries/import.lib.php:265 libraries/sql.lib.php:1320
 msgid "[ROLLBACK occurred.]"
 msgstr ""
 
@@ -8924,14 +8940,14 @@ msgstr ""
 
 #: libraries/insert_edit.lib.php:233
 #: libraries/navigation/Nodes/Node_DatabaseChild.class.php:48
-#: templates/designer/table_list.phtml:40
+#: templates/database/designer/table_list.phtml:40
 msgid "Hide"
 msgstr ""
 
 #: libraries/insert_edit.lib.php:249
 #: libraries/navigation/Nodes/Node_Function.class.php:32
-#: libraries/rte/rte_routines.lib.php:1495
-#: templates/table/table_header.phtml:4
+#: libraries/rte/rte_routines.lib.php:1586
+#: templates/table/search/table_header.phtml:4
 msgid "Function"
 msgstr ""
 
@@ -8944,82 +8960,83 @@ msgstr ""
 msgid "Because of its length,<br /> this column might not be editable."
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1050
+#: libraries/insert_edit.lib.php:1048
 msgid "Binary - do not edit"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1176 libraries/server_privileges.lib.php:470
-#: templates/table/options.phtml:36
+#: libraries/insert_edit.lib.php:1174 libraries/server_privileges.lib.php:470
+#: templates/table/search/options.phtml:36
 msgid "Or"
 msgstr "Немесе"
 
-#: libraries/insert_edit.lib.php:1177
+#: libraries/insert_edit.lib.php:1175
 msgid "web server upload directory:"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1348 templates/table/input_box.phtml:49
+#: libraries/insert_edit.lib.php:1346
+#: templates/table/search/input_box.phtml:49
 msgid "Edit/Insert"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1398
+#: libraries/insert_edit.lib.php:1396
 #, php-format
 msgid "Continue insertion with %s rows"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1428
+#: libraries/insert_edit.lib.php:1426
 msgid "and then"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1461
+#: libraries/insert_edit.lib.php:1459
 msgid "Insert as new row"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1464
+#: libraries/insert_edit.lib.php:1462
 msgid "Insert as new row and ignore errors"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1467
+#: libraries/insert_edit.lib.php:1465
 msgid "Show insert query"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1487
+#: libraries/insert_edit.lib.php:1485
 msgid "Go back to previous page"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1490
+#: libraries/insert_edit.lib.php:1488
 msgid "Insert another new row"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1495
+#: libraries/insert_edit.lib.php:1493
 msgid "Go back to this page"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1518
+#: libraries/insert_edit.lib.php:1516
 msgid "Edit next row"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1540
+#: libraries/insert_edit.lib.php:1538
 msgid ""
 "Use TAB key to move from value to value, or CTRL+arrows to move anywhere"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1577 libraries/replication_gui.lib.php:542
-#: libraries/rte/rte_routines.lib.php:1497
+#: libraries/insert_edit.lib.php:1575 libraries/replication_gui.lib.php:542
+#: libraries/rte/rte_routines.lib.php:1588
 #: libraries/server_status_variables.lib.php:220
-#: templates/designer/having_query_panel.phtml:100
-#: templates/designer/options_panel.phtml:73
-#: templates/designer/options_panel.phtml:239
-#: templates/designer/where_query_panel.phtml:69
-#: templates/table/table_header.phtml:10
-#: templates/table/zoom_result_form.phtml:35
+#: templates/database/designer/having_query_panel.phtml:100
+#: templates/database/designer/options_panel.phtml:73
+#: templates/database/designer/options_panel.phtml:239
+#: templates/database/designer/where_query_panel.phtml:69
+#: templates/table/search/table_header.phtml:10
+#: templates/table/search/zoom_result_form.phtml:35
 msgid "Value"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1937 libraries/sql.lib.php:1309
+#: libraries/insert_edit.lib.php:1935 libraries/sql.lib.php:1303
 msgid "Showing SQL query"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1962 libraries/sql.lib.php:1287
+#: libraries/insert_edit.lib.php:1960 libraries/sql.lib.php:1281
 #, php-format
 msgid "Inserted row id: %1$d"
 msgstr ""
@@ -9456,7 +9473,7 @@ msgstr ""
 #: libraries/navigation/Nodes/Node_View_Container.class.php:26
 #: libraries/navigation/Nodes/Node_View_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:129
-#: templates/structure/show_create.phtml:30
+#: templates/database/structure/show_create.phtml:30
 msgid "Views"
 msgstr ""
 
@@ -9759,7 +9776,7 @@ msgstr ""
 
 #: libraries/operations.lib.php:101 libraries/operations.lib.php:249
 #: libraries/operations.lib.php:869 libraries/operations.lib.php:963
-#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:907
+#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:998
 #: templates/columns_definitions/table_fields_definitions.phtml:47
 #, fuzzy
 #| msgid "Reloading Privileges"
@@ -9853,22 +9870,22 @@ msgid "Switch to copied table"
 msgstr ""
 
 #: libraries/operations.lib.php:1360
-#: templates/structure/check_all_tables.phtml:18
+#: templates/database/structure/check_all_tables.phtml:18
 msgid "Table maintenance"
 msgstr ""
 
 #: libraries/operations.lib.php:1398
-#: templates/structure/check_all_tables.phtml:19
+#: templates/database/structure/check_all_tables.phtml:19
 msgid "Analyze table"
 msgstr "Кестенiң талдауы"
 
 #: libraries/operations.lib.php:1413
-#: templates/structure/check_all_tables.phtml:20
+#: templates/database/structure/check_all_tables.phtml:20
 msgid "Check table"
 msgstr "Кестені тексеру"
 
 #: libraries/operations.lib.php:1428
-#: templates/structure/check_all_tables.phtml:22
+#: templates/database/structure/check_all_tables.phtml:22
 #, fuzzy
 #| msgid "Check table"
 msgid "Checksum table"
@@ -9888,18 +9905,19 @@ msgid "Flush the table (FLUSH)"
 msgstr ""
 
 #: libraries/operations.lib.php:1477
-#: templates/structure/check_all_tables.phtml:23
-#: templates/structure/display_table_stats.phtml:56
+#: templates/database/structure/check_all_tables.phtml:23
+#: templates/table/structure/display_table_stats.phtml:56
 msgid "Optimize table"
 msgstr "Кестені тиімді ету"
 
 #: libraries/operations.lib.php:1492
-#: templates/structure/check_all_tables.phtml:24
+#: templates/database/structure/check_all_tables.phtml:24
 msgid "Repair table"
 msgstr "Кестені калпына келтіру"
 
 #: libraries/operations.lib.php:1538
-#: templates/structure/check_all_tables.phtml:14 view_operations.php:127
+#: templates/database/structure/check_all_tables.phtml:14
+#: view_operations.php:127
 msgid "Delete data or table"
 msgstr ""
 
@@ -10022,7 +10040,7 @@ msgid "Cannot connect: invalid settings."
 msgstr ""
 
 #: libraries/plugins/auth/AuthenticationConfig.class.php:108
-#: libraries/plugins/auth/AuthenticationCookie.class.php:134
+#: libraries/plugins/auth/AuthenticationCookie.class.php:122
 #: libraries/plugins/auth/AuthenticationHttp.class.php:96
 #, php-format
 msgid "Welcome to %s"
@@ -10047,38 +10065,38 @@ msgstr ""
 msgid "Retry to connect"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:146
+#: libraries/plugins/auth/AuthenticationCookie.class.php:134
 msgid "Your session has expired. Please log in again."
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:170
+#: libraries/plugins/auth/AuthenticationCookie.class.php:158
 msgid "Log in"
 msgstr "Кіру"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:178
-#: libraries/plugins/auth/AuthenticationCookie.class.php:188
+#: libraries/plugins/auth/AuthenticationCookie.class.php:166
+#: libraries/plugins/auth/AuthenticationCookie.class.php:176
 msgid "You can enter hostname/IP address and port separated by space."
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:193
+#: libraries/plugins/auth/AuthenticationCookie.class.php:181
 msgid "Username:"
 msgstr "Қолданушы:"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:205
+#: libraries/plugins/auth/AuthenticationCookie.class.php:193
 #, fuzzy
 #| msgid "Server:"
 msgid "Server Choice:"
 msgstr "Сервер:"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:386
+#: libraries/plugins/auth/AuthenticationCookie.class.php:374
 msgid "Entered captcha is wrong, try again!"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:396
+#: libraries/plugins/auth/AuthenticationCookie.class.php:384
 msgid "Please enter correct captcha!"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:423
+#: libraries/plugins/auth/AuthenticationCookie.class.php:411
 #, fuzzy
 msgid "You are not allowed to log in to this MySQL server!"
 msgstr "%s - келісім бойынша орнатылған MySQL серверінің кесте типі"
@@ -10175,7 +10193,7 @@ msgstr ""
 #: libraries/plugins/export/ExportOdt.class.php:593
 #: libraries/plugins/export/ExportTexytext.class.php:428
 #: libraries/plugins/export/PMA_ExportPdf.class.php:313
-#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:984
 #: libraries/rte/rte_triggers.lib.php:377
 msgid "Definition"
 msgstr ""
@@ -10490,7 +10508,7 @@ msgid "Last check:"
 msgstr "Соңғы тексеріс:"
 
 #: libraries/plugins/export/ExportSql.class.php:1399
-#: templates/structure/structure_table_row.phtml:183
+#: templates/database/structure/structure_table_row.phtml:183
 msgid "in use"
 msgstr "қолданыста"
 
@@ -10680,18 +10698,14 @@ msgstr ""
 msgid "The imported file does not contain any data!"
 msgstr ""
 
-#: libraries/plugins/import/ImportSql.class.php:169
+#: libraries/plugins/import/ImportSql.class.php:72
 msgid "SQL compatibility mode:"
 msgstr ""
 
-#: libraries/plugins/import/ImportSql.class.php:181
+#: libraries/plugins/import/ImportSql.class.php:84
 msgid "Do not use <code>AUTO_INCREMENT</code> for zero values"
 msgstr ""
 
-#: libraries/plugins/import/ImportSql.class.php:195
-msgid "Read as multibytes"
-msgstr ""
-
 #: libraries/plugins/import/ImportXml.class.php:54
 msgid "XML"
 msgstr ""
@@ -10736,7 +10750,7 @@ msgid "Show grid"
 msgstr ""
 
 #: libraries/plugins/schema/SchemaPdf.class.php:94
-#: templates/structure/print_view_data_dictionary_link.phtml:6
+#: templates/database/structure/print_view_data_dictionary_link.phtml:6
 msgid "Data Dictionary"
 msgstr "Мәлiметтердiң сөздiгi"
 
@@ -10767,7 +10781,7 @@ msgid "The %s table doesn't exist!"
 msgstr ""
 
 #: libraries/plugins/schema/eps/Eps_Relation_Schema.class.php:321
-#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:309
+#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:323
 #, php-format
 msgid "Schema of the %s database - Page %s"
 msgstr ""
@@ -10796,7 +10810,7 @@ msgstr ""
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1005
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1028
 #: libraries/tracking.lib.php:884
-#: templates/structure/table_structure_header.phtml:11
+#: templates/table/structure/table_structure_header.phtml:11
 msgid "Extra"
 msgstr ""
 
@@ -11119,51 +11133,51 @@ msgstr ""
 msgid "Create the needed tables with the <code>%screate_tables.sql</code>."
 msgstr ""
 
-#: libraries/relation.lib.php:360
+#: libraries/relation.lib.php:357
 msgid "Create a pma user and give access to these tables."
 msgstr ""
 
-#: libraries/relation.lib.php:365
+#: libraries/relation.lib.php:360
 msgid ""
 "Enable advanced features in configuration file (<code>config.inc.php</"
 "code>), for example by starting from <code>config.sample.inc.php</code>."
 msgstr ""
 
-#: libraries/relation.lib.php:373
+#: libraries/relation.lib.php:365
 msgid "Re-login to phpMyAdmin to load the updated configuration file."
 msgstr ""
 
-#: libraries/relation.lib.php:1612
+#: libraries/relation.lib.php:1607
 msgid "no description"
 msgstr ""
 
-#: libraries/relation.lib.php:1811
+#: libraries/relation.lib.php:1806
 msgid ""
 "You do not have necessary privileges to create a database named "
 "'phpmyadmin'. You may go to 'Operations' tab of any database to set up the "
 "phpMyAdmin configuration storage there."
 msgstr ""
 
-#: libraries/relation.lib.php:1928
+#: libraries/relation.lib.php:1923
 #, php-format
 msgid ""
 "%sCreate%s a database named 'phpmyadmin' and setup the phpMyAdmin "
 "configuration storage there."
 msgstr ""
 
-#: libraries/relation.lib.php:1936
+#: libraries/relation.lib.php:1931
 #, php-format
 msgid ""
 "%sCreate%s the phpMyAdmin configuration storage in the current database."
 msgstr ""
 
-#: libraries/relation.lib.php:1944
+#: libraries/relation.lib.php:1939
 #, php-format
 msgid "%sCreate%s missing phpMyAdmin configuration storage tables."
 msgstr ""
 
 #: libraries/replication_gui.lib.php:46 libraries/replication_gui.lib.php:343
-#: libraries/server_databases.lib.php:387
+#: libraries/server_databases.lib.php:398
 msgid "Master replication"
 msgstr ""
 
@@ -11218,7 +11232,7 @@ msgid ""
 msgstr ""
 
 #: libraries/replication_gui.lib.php:141
-#: libraries/server_databases.lib.php:389
+#: libraries/server_databases.lib.php:400
 msgid "Slave replication"
 msgstr ""
 
@@ -11487,10 +11501,10 @@ msgid "Master server changed successfully to %s."
 msgstr ""
 
 #: libraries/rte/rte_events.lib.php:106 libraries/rte/rte_events.lib.php:115
-#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:149
-#: libraries/rte/rte_routines.lib.php:158
-#: libraries/rte/rte_routines.lib.php:231
-#: libraries/rte/rte_routines.lib.php:1362
+#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:219
+#: libraries/rte/rte_routines.lib.php:246
+#: libraries/rte/rte_routines.lib.php:368
+#: libraries/rte/rte_routines.lib.php:1453
 #: libraries/rte/rte_triggers.lib.php:82 libraries/rte/rte_triggers.lib.php:91
 #: libraries/rte/rte_triggers.lib.php:123
 #, php-format
@@ -11511,7 +11525,7 @@ msgstr ""
 msgid "Event %1$s has been created."
 msgstr ""
 
-#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:251
+#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:266
 #: libraries/rte/rte_triggers.lib.php:144
 msgid "One or more errors have occurred while processing your request:"
 msgstr ""
@@ -11520,7 +11534,7 @@ msgstr ""
 msgid "Edit event"
 msgstr ""
 
-#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:794
+#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:885
 #: libraries/rte/rte_triggers.lib.php:323 view_create.php:180
 msgid "Details"
 msgstr ""
@@ -11533,7 +11547,7 @@ msgstr ""
 msgid "Event type"
 msgstr ""
 
-#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:817
+#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:908
 #, php-format
 msgid "Change to %s"
 msgstr ""
@@ -11560,12 +11574,14 @@ msgstr ""
 msgid "On completion preserve"
 msgstr ""
 
-#: libraries/rte/rte_events.lib.php:491 libraries/rte/rte_routines.lib.php:930
+#: libraries/rte/rte_events.lib.php:491
+#: libraries/rte/rte_routines.lib.php:1021
 #: libraries/rte/rte_triggers.lib.php:383 view_create.php:209
 msgid "Definer"
 msgstr ""
 
-#: libraries/rte/rte_events.lib.php:535 libraries/rte/rte_routines.lib.php:997
+#: libraries/rte/rte_events.lib.php:535
+#: libraries/rte/rte_routines.lib.php:1088
 #: libraries/rte/rte_triggers.lib.php:422
 msgid "The definer must be in the \"username@hostname\" format!"
 msgstr ""
@@ -11591,9 +11607,9 @@ msgid "You must provide an event definition."
 msgstr ""
 
 #: libraries/rte/rte_export.lib.php:43 libraries/rte/rte_general.lib.php:72
-#: libraries/rte/rte_routines.lib.php:345
-#: libraries/rte/rte_routines.lib.php:1198
-#: libraries/rte/rte_routines.lib.php:1411
+#: libraries/rte/rte_routines.lib.php:153
+#: libraries/rte/rte_routines.lib.php:1289
+#: libraries/rte/rte_routines.lib.php:1502
 msgid "Error in processing request:"
 msgstr ""
 
@@ -11625,132 +11641,132 @@ msgid ""
 "problems."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:110
-#: libraries/rte/rte_routines.lib.php:1006
+#: libraries/rte/rte_routines.lib.php:123
+msgid "Edit routine"
+msgstr ""
+
+#: libraries/rte/rte_routines.lib.php:200
+#: libraries/rte/rte_routines.lib.php:1097
 #, php-format
 msgid "Invalid routine type: \"%s\""
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:170
-msgid "Sorry, we failed to restore the dropped routine."
-msgstr ""
-
-#: libraries/rte/rte_routines.lib.php:211
-#, php-format
-msgid "Routine %1$s has been modified. Privileges have been adjusted."
-msgstr ""
-
-#: libraries/rte/rte_routines.lib.php:216
-#, php-format
-msgid "Routine %1$s has been modified."
-msgstr ""
-
-#: libraries/rte/rte_routines.lib.php:238
+#: libraries/rte/rte_routines.lib.php:253
 #, php-format
 msgid "Routine %1$s has been created."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:315
-msgid "Edit routine"
+#: libraries/rte/rte_routines.lib.php:380
+msgid "Sorry, we failed to restore the dropped routine."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:797
+#: libraries/rte/rte_routines.lib.php:439
+#, php-format
+msgid "Routine %1$s has been modified. Privileges have been adjusted."
+msgstr ""
+
+#: libraries/rte/rte_routines.lib.php:444
+#, php-format
+msgid "Routine %1$s has been modified."
+msgstr ""
+
+#: libraries/rte/rte_routines.lib.php:888
 msgid "Routine name"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:823
+#: libraries/rte/rte_routines.lib.php:914
 msgid "Parameters"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:829
+#: libraries/rte/rte_routines.lib.php:920
 msgid "Direction"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:847
+#: libraries/rte/rte_routines.lib.php:938
 msgid "Add parameter"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:851
+#: libraries/rte/rte_routines.lib.php:942
 msgid "Remove last parameter"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:856
+#: libraries/rte/rte_routines.lib.php:947
 msgid "Return type"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:862
+#: libraries/rte/rte_routines.lib.php:953
 msgid "Return length/values"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:868
+#: libraries/rte/rte_routines.lib.php:959
 msgid "Return options"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:899
+#: libraries/rte/rte_routines.lib.php:990
 msgid "Is deterministic"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:920
+#: libraries/rte/rte_routines.lib.php:1011
 msgid ""
 "You do not have sufficient privileges to perform this operation; Please "
 "refer to the documentation for more details"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:935
+#: libraries/rte/rte_routines.lib.php:1026
 msgid "Security type"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:944
+#: libraries/rte/rte_routines.lib.php:1035
 msgid "SQL data access"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1013
+#: libraries/rte/rte_routines.lib.php:1104
 msgid "You must provide a routine name!"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1047
+#: libraries/rte/rte_routines.lib.php:1138
 #, php-format
 msgid "Invalid direction \"%s\" given for parameter."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1069
-#: libraries/rte/rte_routines.lib.php:1131
+#: libraries/rte/rte_routines.lib.php:1160
+#: libraries/rte/rte_routines.lib.php:1222
 msgid ""
 "You must provide length/values for routine parameters of type ENUM, SET, "
 "VARCHAR and VARBINARY."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1095
+#: libraries/rte/rte_routines.lib.php:1186
 msgid "You must provide a name and a type for each routine parameter."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1114
+#: libraries/rte/rte_routines.lib.php:1205
 msgid "You must provide a valid return type for the routine."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1174
+#: libraries/rte/rte_routines.lib.php:1265
 msgid "You must provide a routine definition."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1285
+#: libraries/rte/rte_routines.lib.php:1376
 #, php-format
 msgid "Execution results of routine %s"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1340
+#: libraries/rte/rte_routines.lib.php:1431
 #, php-format
 msgid "%d row affected by the last statement inside the procedure."
 msgid_plural "%d rows affected by the last statement inside the procedure."
 msgstr[0] ""
 msgstr[1] ""
 
-#: libraries/rte/rte_routines.lib.php:1398
-#: libraries/rte/rte_routines.lib.php:1406
+#: libraries/rte/rte_routines.lib.php:1489
+#: libraries/rte/rte_routines.lib.php:1497
 msgid "Execute routine"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1485
-#: libraries/rte/rte_routines.lib.php:1488
+#: libraries/rte/rte_routines.lib.php:1576
+#: libraries/rte/rte_routines.lib.php:1579
 msgid "Routine parameters"
 msgstr ""
 
@@ -11906,7 +11922,7 @@ msgid "Original position"
 msgstr ""
 
 #: libraries/server_bin_log.lib.php:133
-#: templates/structure/display_table_stats.phtml:4
+#: templates/table/structure/display_table_stats.phtml:4
 msgid "Information"
 msgstr ""
 
@@ -11942,12 +11958,12 @@ msgid ""
 "between the web server and the MySQL server."
 msgstr ""
 
-#: libraries/server_databases.lib.php:364
-#: libraries/server_databases.lib.php:365
+#: libraries/server_databases.lib.php:366
+#: libraries/server_databases.lib.php:371
 msgid "Enable Statistics"
 msgstr ""
 
-#: libraries/server_databases.lib.php:481
+#: libraries/server_databases.lib.php:492
 #, php-format
 msgid "%1$d database has been dropped successfully."
 msgid_plural "%1$d databases have been dropped successfully."
@@ -12311,7 +12327,7 @@ msgid "You have revoked the privileges for %s."
 msgstr ""
 
 #: libraries/server_privileges.lib.php:2059
-#: libraries/server_privileges.lib.php:4290
+#: libraries/server_privileges.lib.php:4316
 #, fuzzy
 #| msgid "Add user"
 msgid "Add user account"
@@ -12480,55 +12496,55 @@ msgstr ""
 msgid "The privileges were reloaded successfully."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:3994
+#: libraries/server_privileges.lib.php:4003
 #, php-format
 msgid "The user %s already exists!"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4232
+#: libraries/server_privileges.lib.php:4258
 #, php-format
 msgid "Privileges for %s"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4241
+#: libraries/server_privileges.lib.php:4267
 #: libraries/server_status_processes.lib.php:72
 #: libraries/server_user_groups.lib.php:39
 msgid "User"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4282
+#: libraries/server_privileges.lib.php:4308
 msgctxt "Create new user"
 msgid "New"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4311
+#: libraries/server_privileges.lib.php:4337
 #, fuzzy
 #| msgid "Reloading Privileges"
 msgid "Edit privileges:"
 msgstr "Артықшылықтардың қайта қосылуы"
 
-#: libraries/server_privileges.lib.php:4312
+#: libraries/server_privileges.lib.php:4338
 msgid "User account"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4371
+#: libraries/server_privileges.lib.php:4397
 msgid ""
 "Note: You are attempting to edit privileges of the user with which you are "
 "currently logged in."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4391 libraries/server_users.lib.php:25
+#: libraries/server_privileges.lib.php:4417 libraries/server_users.lib.php:25
 msgid "User accounts overview"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4459
+#: libraries/server_privileges.lib.php:4485
 msgid ""
 "A user account allowing any user from localhost to connect is present. This "
 "will prevent other users from connecting if the host part of their account "
 "allows a connection from any (%) host."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4500
+#: libraries/server_privileges.lib.php:4526
 #, php-format
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
@@ -12537,7 +12553,7 @@ msgid ""
 "%sreload the privileges%s before you continue."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4519
+#: libraries/server_privileges.lib.php:4545
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
 "tables. The content of these tables may differ from the privileges the "
@@ -12546,63 +12562,63 @@ msgid ""
 "privilege."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4569
+#: libraries/server_privileges.lib.php:4595
 msgid "The selected user was not found in the privilege table."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4801
+#: libraries/server_privileges.lib.php:4827
 msgid "You have added a new user."
 msgstr ""
 
-#: libraries/server_status.lib.php:53
+#: libraries/server_status.lib.php:60
 #, php-format
 msgid "Network traffic since startup: %s"
 msgstr ""
 
-#: libraries/server_status.lib.php:66
+#: libraries/server_status.lib.php:73
 #, php-format
 msgid "This MySQL server has been running for %1$s. It started up on %2$s."
 msgstr ""
 
-#: libraries/server_status.lib.php:80
+#: libraries/server_status.lib.php:94
 msgid ""
 "This MySQL server works as <b>master</b> and <b>slave</b> in <b>replication</"
 "b> process."
 msgstr ""
 
-#: libraries/server_status.lib.php:85
+#: libraries/server_status.lib.php:99
 msgid "This MySQL server works as <b>master</b> in <b>replication</b> process."
 msgstr ""
 
-#: libraries/server_status.lib.php:90
+#: libraries/server_status.lib.php:104
 msgid "This MySQL server works as <b>slave</b> in <b>replication</b> process."
 msgstr ""
 
-#: libraries/server_status.lib.php:106
+#: libraries/server_status.lib.php:116
 msgid "Replication status"
 msgstr ""
 
-#: libraries/server_status.lib.php:137
+#: libraries/server_status.lib.php:146
 msgid ""
 "On a busy server, the byte counters may overrun, so those statistics as "
 "reported by the MySQL server may be incorrect."
 msgstr ""
 
-#: libraries/server_status.lib.php:148
+#: libraries/server_status.lib.php:157
 msgid "Received"
 msgstr ""
 
-#: libraries/server_status.lib.php:167
+#: libraries/server_status.lib.php:176
 msgid "Sent"
 msgstr ""
 
-#: libraries/server_status.lib.php:234
+#: libraries/server_status.lib.php:243
 #, fuzzy
 #| msgid "concurrent_insert is set to 0"
 msgid "Max. concurrent connections"
 msgstr "Паралельді_кірістірмелерді анықтау"
 
-#: libraries/server_status.lib.php:244
+#: libraries/server_status.lib.php:253
 msgid "Failed attempts"
 msgstr ""
 
@@ -13548,7 +13564,7 @@ msgstr ""
 msgid "Not implemented yet."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/AlterOperation.php:193
+#: libraries/sql-parser/src/Components/AlterOperation.php:191
 msgid "Unrecognized alter operation."
 msgstr ""
 
@@ -13562,7 +13578,7 @@ msgid "An opening bracket followed by a set of values was expected."
 msgstr ""
 
 #: libraries/sql-parser/src/Components/ArrayObj.php:101
-#: libraries/sql-parser/src/Components/FieldDefinition.php:202
+#: libraries/sql-parser/src/Components/CreateDefinition.php:202
 msgid "An opening bracket was expected."
 msgstr ""
 
@@ -13570,25 +13586,35 @@ msgstr ""
 msgid "A comma or a closing bracket was expected"
 msgstr ""
 
+#: libraries/sql-parser/src/Components/CreateDefinition.php:246
+#, fuzzy
+#| msgid "No rows selected"
+msgid "A comma or a closing bracket was expected."
+msgstr "Бірде-бір қатар таңдалынбады"
+
+#: libraries/sql-parser/src/Components/CreateDefinition.php:262
+msgid "A closing bracket was expected."
+msgstr ""
+
 #: libraries/sql-parser/src/Components/DataType.php:125
 msgid "Unrecognized data type."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:225
+#: libraries/sql-parser/src/Components/Expression.php:227
 msgid "Unexpected closing bracket."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:246
-#: libraries/sql-parser/src/Components/Expression.php:283
-#: libraries/sql-parser/src/Components/Expression.php:303
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:285
+#: libraries/sql-parser/src/Components/Expression.php:305
 msgid "An alias was previously found."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:257
+#: libraries/sql-parser/src/Components/Expression.php:259
 msgid "Unexpected dot."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:327
+#: libraries/sql-parser/src/Components/Expression.php:329
 #, fuzzy
 #| msgid "No rows selected"
 msgid "An alias was expected."
@@ -13600,16 +13626,6 @@ msgstr "Бірде-бір қатар таңдалынбады"
 msgid "An expression was expected."
 msgstr "Бірде-бір қатар таңдалынбады"
 
-#: libraries/sql-parser/src/Components/FieldDefinition.php:246
-#, fuzzy
-#| msgid "No rows selected"
-msgid "A comma or a closing bracket was expected."
-msgstr "Бірде-бір қатар таңдалынбады"
-
-#: libraries/sql-parser/src/Components/FieldDefinition.php:262
-msgid "A closing bracket was expected."
-msgstr ""
-
 #: libraries/sql-parser/src/Components/Limit.php:90
 #: libraries/sql-parser/src/Components/Limit.php:112
 msgid "An offset was expected."
@@ -13651,26 +13667,26 @@ msgstr ""
 msgid "Expected delimiter."
 msgstr ""
 
-#: libraries/sql-parser/src/Lexer.php:753
+#: libraries/sql-parser/src/Lexer.php:777
 #, php-format
 msgid "Ending quote %1$s was expected."
 msgstr ""
 
-#: libraries/sql-parser/src/Lexer.php:789
+#: libraries/sql-parser/src/Lexer.php:813
 msgid "Variable name was expected."
 msgstr ""
 
-#: libraries/sql-parser/src/Parser.php:380
+#: libraries/sql-parser/src/Parser.php:391
 #, fuzzy
 #| msgid "Replace table prefix"
 msgid "Unexpected beginning of statement."
 msgstr "Кестениң префиксін ауыстыру"
 
-#: libraries/sql-parser/src/Parser.php:399
+#: libraries/sql-parser/src/Parser.php:410
 msgid "Unrecognized statement type."
 msgstr ""
 
-#: libraries/sql-parser/src/Parser.php:479
+#: libraries/sql-parser/src/Parser.php:489
 msgid "No transaction was previously started."
 msgstr ""
 
@@ -13696,8 +13712,10 @@ msgid "The name of the entity was expected."
 msgstr ""
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:310
-msgid "At least one field definition was expected."
-msgstr ""
+#, fuzzy
+#| msgid "Table %s has been emptied."
+msgid "At least one column definition was expected."
+msgstr "%s кестесі аластанды"
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:329
 msgid "A \"RETURNS\" keyword was expected."
@@ -13768,25 +13786,25 @@ msgstr ""
 msgid "Using bookmark \"%s\" as default browse query."
 msgstr ""
 
-#: libraries/sql.lib.php:1306
+#: libraries/sql.lib.php:1300
 msgid "Showing as PHP code"
 msgstr ""
 
-#: libraries/sql.lib.php:1638
+#: libraries/sql.lib.php:1632
 #, php-format
 msgid ""
 "Current selection does not contain a unique column. Grid edit, checkbox, "
 "Edit, Copy and Delete features are not available. %s"
 msgstr ""
 
-#: libraries/sql.lib.php:1649
+#: libraries/sql.lib.php:1643
 #, php-format
 msgid ""
 "Current selection does not contain a unique column. Grid edit, Edit, Copy "
 "and Delete features may result in undesired behavior. %s"
 msgstr ""
 
-#: libraries/sql.lib.php:1688
+#: libraries/sql.lib.php:1682
 #, php-format
 msgid "Problems with indexes of table `%s`"
 msgstr ""
@@ -13948,7 +13966,7 @@ msgid "Version %s snapshot (SQL code)"
 msgstr ""
 
 #: libraries/tracking.lib.php:947
-#: templates/structure/table_structure_row.phtml:33
+#: templates/table/structure/table_structure_row.phtml:33
 msgctxt "None for default"
 msgid "None"
 msgstr ""
@@ -14000,15 +14018,15 @@ msgstr ""
 msgid "Version %1$s was created, tracking for %2$s is active."
 msgstr ""
 
-#: libraries/user_preferences.inc.php:29
+#: libraries/user_preferences.inc.php:30
 msgid "Manage your settings"
 msgstr ""
 
-#: libraries/user_preferences.inc.php:46 prefs_manage.php:307
+#: libraries/user_preferences.inc.php:54 prefs_manage.php:307
 msgid "Configuration has been saved."
 msgstr ""
 
-#: libraries/user_preferences.inc.php:66
+#: libraries/user_preferences.inc.php:74
 #, php-format
 msgid ""
 "Your preferences will be saved for current session only. Storing them "
@@ -14394,7 +14412,7 @@ msgid "first"
 msgstr ""
 
 #: templates/columns_definitions/move_column.phtml:12
-#: templates/structure/add_column.phtml:21
+#: templates/table/structure/add_column.phtml:21
 #, php-format
 msgid "after %s"
 msgstr ""
@@ -14454,211 +14472,310 @@ msgstr ""
 msgid "Input transformation options"
 msgstr ""
 
-#: templates/designer/aggregate_query_panel.phtml:22
-#: templates/designer/options_panel.phtml:100
+#: templates/database/create_table.phtml:7
+#: templates/database/designer/side_menu.phtml:77
+#: templates/database/designer/side_menu.phtml:80
+msgid "Create table"
+msgstr ""
+
+#: templates/database/create_table.phtml:15
+msgid "Number of columns"
+msgstr ""
+
+#: templates/database/designer/aggregate_query_panel.phtml:22
+#: templates/database/designer/options_panel.phtml:100
 msgid "Aggregate"
 msgstr ""
 
-#: templates/designer/aggregate_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:61
-#: templates/designer/options_panel.phtml:106
-#: templates/designer/options_panel.phtml:170
-#: templates/designer/where_query_panel.phtml:30
-#: templates/table/table_header.phtml:9
+#: templates/database/designer/aggregate_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:61
+#: templates/database/designer/options_panel.phtml:106
+#: templates/database/designer/options_panel.phtml:170
+#: templates/database/designer/where_query_panel.phtml:30
+#: templates/table/search/table_header.phtml:9
 msgid "Operator"
 msgstr ""
 
-#: templates/designer/database_tables.phtml:29
+#: templates/database/designer/database_tables.phtml:29
 msgid "Toggle"
 msgstr ""
 
-#: templates/designer/database_tables.phtml:40
+#: templates/database/designer/database_tables.phtml:40
 #, fuzzy
 #| msgid "Databases"
 msgid "See table structure"
 msgstr "Мәлімет қорлары"
 
-#: templates/designer/delete_relation_panel.phtml:21
+#: templates/database/designer/delete_relation_panel.phtml:21
 msgid "Delete relation"
 msgstr ""
 
-#: templates/designer/edit_delete_pages.phtml:7
+#: templates/database/designer/edit_delete_pages.phtml:7
 #, fuzzy
 #| msgid "Replace table prefix"
 msgid "Page to open"
 msgstr "Кестениң префиксін ауыстыру"
 
-#: templates/designer/edit_delete_pages.phtml:7
+#: templates/database/designer/edit_delete_pages.phtml:7
 msgid "Page to delete"
 msgstr ""
 
-#: templates/designer/having_query_panel.phtml:90
-#: templates/designer/options_panel.phtml:63
-#: templates/designer/options_panel.phtml:229
-#: templates/designer/where_query_panel.phtml:59
+#: templates/database/designer/having_query_panel.phtml:90
+#: templates/database/designer/options_panel.phtml:63
+#: templates/database/designer/options_panel.phtml:229
+#: templates/database/designer/where_query_panel.phtml:59
 msgid "Except"
 msgstr ""
 
-#: templates/designer/having_query_panel.phtml:102
-#: templates/designer/options_panel.phtml:75
-#: templates/designer/options_panel.phtml:241
-#: templates/designer/where_query_panel.phtml:71
+#: templates/database/designer/having_query_panel.phtml:102
+#: templates/database/designer/options_panel.phtml:75
+#: templates/database/designer/options_panel.phtml:241
+#: templates/database/designer/where_query_panel.phtml:71
 msgid "subquery"
 msgstr ""
 
-#: templates/designer/new_relation_panel.phtml:22
-#: templates/designer/side_menu.phtml:84 templates/designer/side_menu.phtml:87
+#: templates/database/designer/new_relation_panel.phtml:22
+#: templates/database/designer/side_menu.phtml:84
+#: templates/database/designer/side_menu.phtml:87
 msgid "Create relation"
 msgstr ""
 
-#: templates/designer/options_panel.phtml:34
-#: templates/designer/options_panel.phtml:200
+#: templates/database/designer/options_panel.phtml:34
+#: templates/database/designer/options_panel.phtml:200
 msgid "Relation operator"
 msgstr ""
 
-#: templates/designer/options_panel.phtml:85
-#: templates/designer/rename_to_panel.phtml:23
+#: templates/database/designer/options_panel.phtml:85
+#: templates/database/designer/rename_to_panel.phtml:23
 msgid "Rename to"
 msgstr ""
 
-#: templates/designer/options_panel.phtml:91
-#: templates/designer/rename_to_panel.phtml:31
+#: templates/database/designer/options_panel.phtml:91
+#: templates/database/designer/rename_to_panel.phtml:31
 msgid "New name"
 msgstr ""
 
-#: templates/designer/page_save_as.phtml:4
+#: templates/database/designer/page_save_as.phtml:4
 #, fuzzy
 #| msgid "No rows selected"
 msgid "Save to selected page"
 msgstr "Бірде-бір қатар таңдалынбады"
 
-#: templates/designer/page_save_as.phtml:5
+#: templates/database/designer/page_save_as.phtml:5
 msgid "Create a page and save to it"
 msgstr ""
 
-#: templates/designer/page_save_as.phtml:26
+#: templates/database/designer/page_save_as.phtml:26
 msgid "New page name"
 msgstr ""
 
-#: templates/designer/page_selector.phtml:2
+#: templates/database/designer/page_selector.phtml:2
 msgid "Select page"
 msgstr ""
 
-#: templates/designer/query_details.phtml:10
+#: templates/database/designer/query_details.phtml:10
 msgid "Active options"
 msgstr ""
 
-#: templates/designer/schema_export.phtml:4
+#: templates/database/designer/schema_export.phtml:4
 msgid "Select Export Relational Type"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:19 templates/designer/side_menu.phtml:25
+#: templates/database/designer/side_menu.phtml:19
+#: templates/database/designer/side_menu.phtml:25
 #, fuzzy
 #| msgid "Inside tables:"
 msgid "Show/Hide tables list"
 msgstr "Кесте бойынша:"
 
-#: templates/designer/side_menu.phtml:29 templates/designer/side_menu.phtml:35
-#: templates/designer/side_menu.phtml:36
+#: templates/database/designer/side_menu.phtml:29
+#: templates/database/designer/side_menu.phtml:35
+#: templates/database/designer/side_menu.phtml:36
 msgid "View in fullscreen"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:34
+#: templates/database/designer/side_menu.phtml:34
 msgid "Exit fullscreen"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:41 templates/designer/side_menu.phtml:45
+#: templates/database/designer/side_menu.phtml:41
+#: templates/database/designer/side_menu.phtml:45
 msgid "New page"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:70 templates/designer/side_menu.phtml:73
+#: templates/database/designer/side_menu.phtml:70
+#: templates/database/designer/side_menu.phtml:73
 #, fuzzy
 #| msgid "Delete"
 msgid "Delete pages"
 msgstr "Жою"
 
-#: templates/designer/side_menu.phtml:77 templates/designer/side_menu.phtml:80
-#: templates/table/create_table.phtml:7
-msgid "Create table"
-msgstr ""
-
-#: templates/designer/side_menu.phtml:98
-#: templates/designer/side_menu.phtml:101
+#: templates/database/designer/side_menu.phtml:98
+#: templates/database/designer/side_menu.phtml:101
 msgid "Reload"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:107
-#: templates/designer/side_menu.phtml:110
+#: templates/database/designer/side_menu.phtml:107
+#: templates/database/designer/side_menu.phtml:110
 msgid "Help"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Angular links"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Direct links"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:122
-#: templates/designer/side_menu.phtml:124
+#: templates/database/designer/side_menu.phtml:122
+#: templates/database/designer/side_menu.phtml:124
 msgid "Snap to grid"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:128
-#: templates/designer/side_menu.phtml:134
+#: templates/database/designer/side_menu.phtml:128
+#: templates/database/designer/side_menu.phtml:134
 msgid "Small/Big All"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:138
-#: templates/designer/side_menu.phtml:141
+#: templates/database/designer/side_menu.phtml:138
+#: templates/database/designer/side_menu.phtml:141
 msgid "Toggle small/big"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:145
-#: templates/designer/side_menu.phtml:148
+#: templates/database/designer/side_menu.phtml:145
+#: templates/database/designer/side_menu.phtml:148
 msgid "Toggle relation lines"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:153
-#: templates/designer/side_menu.phtml:156
+#: templates/database/designer/side_menu.phtml:153
+#: templates/database/designer/side_menu.phtml:156
 #, fuzzy
 #| msgid "Export"
 msgid "Export schema"
 msgstr "Экспорт"
 
-#: templates/designer/side_menu.phtml:165
-#: templates/designer/side_menu.phtml:168
+#: templates/database/designer/side_menu.phtml:165
+#: templates/database/designer/side_menu.phtml:168
 msgid "Build Query"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:173
-#: templates/designer/side_menu.phtml:177
+#: templates/database/designer/side_menu.phtml:173
+#: templates/database/designer/side_menu.phtml:177
 msgid "Move Menu"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:181
-#: templates/designer/side_menu.phtml:186
+#: templates/database/designer/side_menu.phtml:181
+#: templates/database/designer/side_menu.phtml:186
 #, fuzzy
 #| msgid "Point"
 msgid "Pin text"
 msgstr "Нүкте"
 
-#: templates/designer/table_list.phtml:4
+#: templates/database/designer/table_list.phtml:4
 msgid "Hide/Show all"
 msgstr ""
 
-#: templates/designer/table_list.phtml:14
+#: templates/database/designer/table_list.phtml:14
 msgid "Hide/Show Tables with no relation"
 msgstr ""
 
-#: templates/designer/table_list.phtml:59
+#: templates/database/designer/table_list.phtml:59
 msgid "Number of tables:"
 msgstr ""
 
+#: templates/database/structure/body_for_table_summary.phtml:6
+#, php-format
+msgid "%s table"
+msgid_plural "%s tables"
+msgstr[0] "%s кестесімен"
+msgstr[1] "%s кестелерімен"
+
+#: templates/database/structure/body_for_table_summary.phtml:17
+msgid "Sum"
+msgstr "Барлығы"
+
+#: templates/database/structure/check_all_tables.phtml:6
+msgid "Check tables having overhead"
+msgstr "Ықшамдауды қажет ететіндерді белгілеу"
+
+#: templates/database/structure/check_all_tables.phtml:10
+#, fuzzy
+#| msgid "Show all"
+msgid "Show create"
+msgstr "Бәрін көрсету"
+
+#: templates/database/structure/check_all_tables.phtml:27
+msgid "Prefix"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:28
+msgid "Add prefix to table"
+msgstr "Кестеге префикс қосу"
+
+#: templates/database/structure/check_all_tables.phtml:29
+msgid "Replace table prefix"
+msgstr "Кестениң префиксін ауыстыру"
+
+#: templates/database/structure/check_all_tables.phtml:30
+msgid "Copy table with prefix"
+msgstr "Кестені префикс пен бірге көшіру"
+
+#: templates/database/structure/check_all_tables.phtml:36
+#, fuzzy
+#| msgid "Add columns"
+msgid "Add columns to central list"
+msgstr "Бағаналар қосу"
+
+#: templates/database/structure/check_all_tables.phtml:37
+msgid "Remove columns from central list"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:38
+#, fuzzy
+#| msgid "Add columns"
+msgid "Make consistent with central list"
+msgstr "Бағаналар қосу"
+
+#: templates/database/structure/favorite_anchor.phtml:12
+msgid "Add to Favorites"
+msgstr ""
+
+#: templates/database/structure/show_create.phtml:2
+msgid "Showing create queries"
+msgstr ""
+
+#: templates/database/structure/sortable_header.phtml:13
+msgid "Sort"
+msgstr "Сұрыптау"
+
+#: templates/database/structure/table_header.phtml:42
+msgid ""
+"May be approximate. Click on the number to get the exact count. See "
+"[doc@faq3-11]FAQ 3.11[/doc]."
+msgstr ""
+
+#: templates/database/structure/table_header.phtml:66
+#: templates/table/index_form.phtml:127
+msgid "Size"
+msgstr "Мөлшері"
+
+#: templates/database/structure/table_header.phtml:74
+#: templates/table/structure/display_table_stats.phtml:27
+msgid "Overhead"
+msgstr ""
+
+#: templates/database/structure/tracking_icon.phtml:4
+msgid "Tracking is active."
+msgstr "Бақылау қосулы."
+
+#: templates/database/structure/tracking_icon.phtml:8
+msgid "Tracking is not active."
+msgstr "Бақылауды белсендендірілу."
+
 #: templates/error/report_form.phtml:7
 msgid ""
 "phpMyAdmin has encountered an error. We have collected data about this error "
@@ -14674,65 +14791,6 @@ msgstr ""
 msgid "Please explain the steps that lead to the error:"
 msgstr ""
 
-#: templates/gis_visualization/gis_visualization.phtml:3
-msgid "Display GIS Visualization"
-msgstr ""
-
-#: templates/gis_visualization/gis_visualization.phtml:8
-msgid "Label column"
-msgstr ""
-
-#: templates/gis_visualization/gis_visualization.phtml:11
-msgid "-- None --"
-msgstr ""
-
-#: templates/gis_visualization/gis_visualization.phtml:19
-msgid "Spatial column"
-msgstr ""
-
-#: templates/index_form.phtml:16
-msgid "Index name:"
-msgstr ""
-
-#: templates/index_form.phtml:19
-msgid ""
-"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
-msgstr ""
-
-#: templates/index_form.phtml:40
-#, fuzzy
-#| msgid "Indexes"
-msgid "Index choice:"
-msgstr "Индекстер"
-
-#: templates/index_form.phtml:57
-msgid "Key block size:"
-msgstr ""
-
-#: templates/index_form.phtml:74
-msgid "Index type:"
-msgstr ""
-
-#: templates/index_form.phtml:86
-#, fuzzy
-#| msgid "Username:"
-msgid "Parser:"
-msgstr "Қолданушы:"
-
-#: templates/index_form.phtml:102
-#, fuzzy
-#| msgid "Comment"
-msgid "Comment:"
-msgstr "Пікірлеу"
-
-#: templates/index_form.phtml:127 templates/structure/table_header.phtml:66
-msgid "Size"
-msgstr "Мөлшері"
-
-#: templates/index_form.phtml:149 templates/index_form.phtml:190
-msgid "Drag to reorder"
-msgstr ""
-
 #: templates/prefs_autoload.phtml:9
 msgid ""
 "Your browser has phpMyAdmin configuration for this domain. Would you like to "
@@ -14745,454 +14803,421 @@ msgstr ""
 msgid "Start row:"
 msgstr "Сұрыптау"
 
-#: templates/structure/actions_in_table_structure.phtml:14
-#, php-format
-msgid "A primary key has been added on %s."
-msgstr ""
-
-#: templates/structure/actions_in_table_structure.phtml:34
-#: templates/structure/actions_in_table_structure.phtml:54
-#: templates/structure/actions_in_table_structure.phtml:79
-#: templates/structure/actions_in_table_structure.phtml:101
-#, php-format
-msgid "An index has been added on %s."
-msgstr ""
-
-#: templates/structure/actions_in_table_structure.phtml:130
-#: templates/structure/check_all_table_column.phtml:59
-#, fuzzy
-#| msgid "Remove chart"
-msgid "Remove from central columns"
-msgstr "Графикті жою"
-
-#: templates/structure/actions_in_table_structure.phtml:138
-#: templates/structure/check_all_table_column.phtml:55
-#, fuzzy
-#| msgid "Add columns"
-msgid "Add to central columns"
-msgstr "Бағаналар қосу"
-
-#: templates/structure/add_column.phtml:7
-#, php-format
-msgid "Add %s column(s)"
-msgstr ""
-
-#: templates/structure/add_column.phtml:12
-#, fuzzy
-#| msgid "Replace table prefix"
-msgid "at beginning of table"
-msgstr "Кестениң префиксін ауыстыру"
-
-#: templates/structure/body_for_table_summary.phtml:6
-#, php-format
-msgid "%s table"
-msgid_plural "%s tables"
-msgstr[0] "%s кестесімен"
-msgstr[1] "%s кестелерімен"
-
-#: templates/structure/body_for_table_summary.phtml:17
-msgid "Sum"
-msgstr "Барлығы"
-
-#: templates/structure/check_all_tables.phtml:6
-msgid "Check tables having overhead"
-msgstr "Ықшамдауды қажет ететіндерді белгілеу"
-
-#: templates/structure/check_all_tables.phtml:10
-#, fuzzy
-#| msgid "Show all"
-msgid "Show create"
-msgstr "Бәрін көрсету"
-
-#: templates/structure/check_all_tables.phtml:27
-msgid "Prefix"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:28
-msgid "Add prefix to table"
-msgstr "Кестеге префикс қосу"
-
-#: templates/structure/check_all_tables.phtml:29
-msgid "Replace table prefix"
-msgstr "Кестениң префиксін ауыстыру"
-
-#: templates/structure/check_all_tables.phtml:30
-msgid "Copy table with prefix"
-msgstr "Кестені префикс пен бірге көшіру"
-
-#: templates/structure/check_all_tables.phtml:36
-#, fuzzy
-#| msgid "Add columns"
-msgid "Add columns to central list"
-msgstr "Бағаналар қосу"
-
-#: templates/structure/check_all_tables.phtml:37
-msgid "Remove columns from central list"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:38
-#, fuzzy
-#| msgid "Add columns"
-msgid "Make consistent with central list"
-msgstr "Бағаналар қосу"
-
-#: templates/structure/display_structure.phtml:140 view_create.php:181
-msgid "Edit view"
-msgstr ""
-
-#: templates/structure/display_table_stats.phtml:9
-msgid "Space usage"
-msgstr ""
-
-#: templates/structure/display_table_stats.phtml:27
-#: templates/structure/table_header.phtml:74
-msgid "Overhead"
-msgstr ""
-
-#: templates/structure/display_table_stats.phtml:32
-msgid "Effective"
-msgstr ""
-
-#: templates/structure/favorite_anchor.phtml:12
-msgid "Add to Favorites"
-msgstr ""
-
-#: templates/structure/move_columns_dialog.phtml:1
-#: templates/structure/optional_action_links.phtml:21
-#, fuzzy
-msgid "Move columns"
-msgstr "Бағана іші"
-
-#: templates/structure/move_columns_dialog.phtml:2
-msgid "Move the columns by dragging them up and down."
-msgstr ""
-
-#: templates/structure/optional_action_links.phtml:9
-msgid "Propose table structure"
-msgstr ""
-
-#: templates/structure/optional_action_links.phtml:24
-#, fuzzy
-#| msgid "Databases"
-msgid "Improve table structure"
-msgstr "Мәлімет қорлары"
-
-#: templates/structure/optional_action_links.phtml:30
-#, fuzzy
-#| msgid "Track table"
-msgid "Track view"
-msgstr "Кестені бақылау"
-
-#: templates/structure/row_stats_table.phtml:3
-#, fuzzy
-#| msgid "Query statistics"
-msgid "Row statistics"
-msgstr "Сұраныстардың статистикасы"
-
-#: templates/structure/row_stats_table.phtml:9
-msgid "static"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:11
-msgid "dynamic"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:22
-msgid "partitioned"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:54
-msgid "Row length"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:66
-msgid "Row size"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:73
-msgid "Next autoindex"
-msgstr ""
-
-#: templates/structure/secondary_tabs.phtml:14
-#, fuzzy
-#| msgid "Replication"
-msgid "Relation view"
-msgstr "Репликация"
-
-#: templates/structure/show_create.phtml:2
-msgid "Showing create queries"
-msgstr ""
-
-#: templates/structure/sortable_header.phtml:13
-msgid "Sort"
-msgstr "Сұрыптау"
-
-#: templates/structure/table_header.phtml:42
-msgid ""
-"May be approximate. Click on the number to get the exact count. See "
-"[doc@faq3-11]FAQ 3.11[/doc]."
-msgstr ""
-
-#: templates/structure/table_structure_row.phtml:46
-#, php-format
-msgid "Column %s has been dropped."
-msgstr ""
-
-#: templates/structure/tracking_icon.phtml:4
-msgid "Tracking is active."
-msgstr "Бақылау қосулы."
-
-#: templates/structure/tracking_icon.phtml:8
-msgid "Tracking is not active."
-msgstr "Бақылауды белсендендірілу."
-
-#: templates/table/create_table.phtml:15
-msgid "Number of columns"
-msgstr ""
-
-#: templates/table/options.phtml:8
-msgid "Select columns (at least one):"
-msgstr ""
-
-#: templates/table/options.phtml:37
-msgid "Add search conditions (body of the \"where\" clause):"
-msgstr ""
-
-#: templates/table/options.phtml:45
-msgid "Number of rows per page"
-msgstr ""
-
-#: templates/table/options.phtml:56
-msgid "Display order:"
-msgstr ""
-
-#: templates/table/options_zoom.phtml:6
-msgid "Use this column to label each point"
-msgstr ""
-
-#: templates/table/options_zoom.phtml:35
-msgid "Maximum rows to plot"
-msgstr ""
-
-#: templates/table/replace_preview.phtml:13
-msgid "Find and replace - preview"
-msgstr ""
-
-#: templates/table/replace_preview.phtml:18
-#, fuzzy
-#| msgid "Linestring"
-msgid "Original string"
-msgstr "Сызық"
-
-#: templates/table/replace_preview.phtml:19
-#, fuzzy
-#| msgid "Replace table prefix"
-msgid "Replaced string"
-msgstr "Кестениң префиксін ауыстыру"
-
-#: templates/table/replace_preview.phtml:40
-msgid "Replace"
-msgstr ""
-
-#: templates/table/rows_zoom.phtml:16
-msgid "Additional search criteria"
-msgstr ""
-
-#: templates/table/search_and_replace.phtml:3
-#, fuzzy
-#| msgid "Replace table prefix"
-msgid "Replace with:"
-msgstr "Кестениң префиксін ауыстыру"
-
-#: templates/table/search_and_replace.phtml:22
-#, fuzzy
-#| msgid "as regular expression"
-msgid "Use regular expression"
-msgstr "жүйелі түрде айтылу"
-
-#: templates/table/selection_form.phtml:12
-msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
-msgstr ""
-
-#: templates/table/selection_form.phtml:34
-msgid "Do a \"query by example\" (wildcard: \"%\")"
-msgstr ""
-
-#: templates/table/zoom_result_form.phtml:7
-msgid "Browse/Edit the points"
-msgstr ""
-
-#: templates/table/zoom_result_form.phtml:15
-msgid "How to use"
-msgstr ""
-
-#: templates/table/zoom_result_form.phtml:23
-msgid "Reset zoom"
-msgstr ""
-
-#: templates/tbl_chart.phtml:17
+#: templates/table/chart/tbl_chart.phtml:17
 msgctxt "Chart type"
 msgid "Bar"
 msgstr ""
 
-#: templates/tbl_chart.phtml:21
+#: templates/table/chart/tbl_chart.phtml:21
 msgctxt "Chart type"
 msgid "Column"
 msgstr ""
 
-#: templates/tbl_chart.phtml:25
+#: templates/table/chart/tbl_chart.phtml:25
 msgctxt "Chart type"
 msgid "Line"
 msgstr ""
 
-#: templates/tbl_chart.phtml:29
+#: templates/table/chart/tbl_chart.phtml:29
 msgctxt "Chart type"
 msgid "Spline"
 msgstr ""
 
-#: templates/tbl_chart.phtml:33
+#: templates/table/chart/tbl_chart.phtml:33
 msgctxt "Chart type"
 msgid "Area"
 msgstr ""
 
-#: templates/tbl_chart.phtml:37
+#: templates/table/chart/tbl_chart.phtml:37
 msgctxt "Chart type"
 msgid "Pie"
 msgstr ""
 
-#: templates/tbl_chart.phtml:41
+#: templates/table/chart/tbl_chart.phtml:41
 #, fuzzy
 #| msgid "Time"
 msgctxt "Chart type"
 msgid "Timeline"
 msgstr "Уақыт"
 
-#: templates/tbl_chart.phtml:45
+#: templates/table/chart/tbl_chart.phtml:45
 msgctxt "Chart type"
 msgid "Scatter"
 msgstr ""
 
-#: templates/tbl_chart.phtml:50
+#: templates/table/chart/tbl_chart.phtml:50
 msgid "Stacked"
 msgstr ""
 
-#: templates/tbl_chart.phtml:53
+#: templates/table/chart/tbl_chart.phtml:53
 msgid "Chart title"
 msgstr ""
 
-#: templates/tbl_chart.phtml:57
+#: templates/table/chart/tbl_chart.phtml:57
 msgid "X-Axis:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:72
+#: templates/table/chart/tbl_chart.phtml:72
 msgid "Series:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:102
+#: templates/table/chart/tbl_chart.phtml:102
 msgid "X-Axis label:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:104
+#: templates/table/chart/tbl_chart.phtml:104
 msgid "X Values"
 msgstr ""
 
-#: templates/tbl_chart.phtml:107
+#: templates/table/chart/tbl_chart.phtml:107
 msgid "Y-Axis label:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:115
+#: templates/table/chart/tbl_chart.phtml:115
 msgid "Series names are in a column"
 msgstr ""
 
-#: templates/tbl_chart.phtml:118
+#: templates/table/chart/tbl_chart.phtml:118
 #, fuzzy
 #| msgid "Inside column:"
 msgid "Series column:"
 msgstr "Бағана бойынша:"
 
-#: templates/tbl_chart.phtml:130
+#: templates/table/chart/tbl_chart.phtml:130
 #, fuzzy
 #| msgid "Values for column %s"
 msgid "Value Column:"
 msgstr "%s баған мәні"
 
-#: templates/tbl_chart.phtml:150
+#: templates/table/chart/tbl_chart.phtml:150
 msgid "Save chart as image"
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:7
+#: templates/table/gis_visualization/gis_visualization.phtml:3
+msgid "Display GIS Visualization"
+msgstr ""
+
+#: templates/table/gis_visualization/gis_visualization.phtml:8
+msgid "Label column"
+msgstr ""
+
+#: templates/table/gis_visualization/gis_visualization.phtml:11
+msgid "-- None --"
+msgstr ""
+
+#: templates/table/gis_visualization/gis_visualization.phtml:19
+msgid "Spatial column"
+msgstr ""
+
+#: templates/table/index_form.phtml:16
+msgid "Index name:"
+msgstr ""
+
+#: templates/table/index_form.phtml:19
+msgid ""
+"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
+msgstr ""
+
+#: templates/table/index_form.phtml:40
+#, fuzzy
+#| msgid "Indexes"
+msgid "Index choice:"
+msgstr "Индекстер"
+
+#: templates/table/index_form.phtml:57
+msgid "Key block size:"
+msgstr ""
+
+#: templates/table/index_form.phtml:74
+msgid "Index type:"
+msgstr ""
+
+#: templates/table/index_form.phtml:86
+#, fuzzy
+#| msgid "Username:"
+msgid "Parser:"
+msgstr "Қолданушы:"
+
+#: templates/table/index_form.phtml:102
+#, fuzzy
+#| msgid "Comment"
+msgid "Comment:"
+msgstr "Пікірлеу"
+
+#: templates/table/index_form.phtml:149 templates/table/index_form.phtml:190
+msgid "Drag to reorder"
+msgstr ""
+
+#: templates/table/relation/common_form.phtml:7
 #, fuzzy
 #| msgid "Table %s has been emptied."
 msgid "Internal relations"
 msgstr "%s кестесі аластанды"
 
-#: templates/tbl_relation/common_form.phtml:11
+#: templates/table/relation/common_form.phtml:11
 msgid "Internal relation"
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:14
+#: templates/table/relation/common_form.phtml:14
 msgid ""
 "An internal relation is not necessary when a corresponding FOREIGN KEY "
 "relation exists."
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:37
+#: templates/table/relation/common_form.phtml:37
 #, fuzzy
 #| msgid "Foreign key check:"
 msgid "Foreign key constraints"
 msgstr "Сыртқы кілттерді тексерілісі:"
 
-#: templates/tbl_relation/common_form.phtml:40
+#: templates/table/relation/common_form.phtml:40
 #, fuzzy
 #| msgid "Action"
 msgid "Actions"
 msgstr "Әрекет"
 
-#: templates/tbl_relation/common_form.phtml:41
+#: templates/table/relation/common_form.phtml:41
 #, fuzzy
 #| msgid "Add constraints"
 msgid "Constraint properties"
 msgstr "Шектеу қою"
 
-#: templates/tbl_relation/common_form.phtml:44
+#: templates/table/relation/common_form.phtml:44
 msgid ""
 "Only columns with index will be displayed. You can define an index below."
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:49
+#: templates/table/relation/common_form.phtml:49
 msgid "Foreign key constraint"
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:81
+#: templates/table/relation/common_form.phtml:81
 #, fuzzy
 #| msgid "Add constraints"
 msgid "+ Add constraint"
 msgstr "Шектеу қою"
 
-#: templates/tbl_relation/common_form.phtml:91
+#: templates/table/relation/common_form.phtml:91
 #, fuzzy
 #| msgid "You have to choose at least one column to display"
 msgid "Choose column to display:"
 msgstr "Сұраныс орындалуы үшін, көрсетілімдегі баған/бағандар таңдалуы тиіс"
 
-#: templates/tbl_relation/foreign_key_row.phtml:13
+#: templates/table/relation/foreign_key_row.phtml:13
 #, fuzzy, php-format
 #| msgid "Foreign key check:"
 msgid "Foreign key constraint %s has been dropped"
 msgstr "Сыртқы кілттерді тексерілісі:"
 
-#: templates/tbl_relation/foreign_key_row.phtml:102
+#: templates/table/relation/foreign_key_row.phtml:102
 #, fuzzy
 #| msgid "Add constraints"
 msgid "Constraint name"
 msgstr "Шектеу қою"
 
-#: templates/tbl_relation/foreign_key_row.phtml:157
+#: templates/table/relation/foreign_key_row.phtml:157
 #, fuzzy
 #| msgid "Add/Delete columns"
 msgid "+ Add column"
 msgstr "Бағандарды Қосу/Өшіру"
 
+#: templates/table/search/options.phtml:8
+msgid "Select columns (at least one):"
+msgstr ""
+
+#: templates/table/search/options.phtml:37
+msgid "Add search conditions (body of the \"where\" clause):"
+msgstr ""
+
+#: templates/table/search/options.phtml:45
+msgid "Number of rows per page"
+msgstr ""
+
+#: templates/table/search/options.phtml:56
+msgid "Display order:"
+msgstr ""
+
+#: templates/table/search/options_zoom.phtml:6
+msgid "Use this column to label each point"
+msgstr ""
+
+#: templates/table/search/options_zoom.phtml:35
+msgid "Maximum rows to plot"
+msgstr ""
+
+#: templates/table/search/replace_preview.phtml:13
+msgid "Find and replace - preview"
+msgstr ""
+
+#: templates/table/search/replace_preview.phtml:18
+#, fuzzy
+#| msgid "Linestring"
+msgid "Original string"
+msgstr "Сызық"
+
+#: templates/table/search/replace_preview.phtml:19
+#, fuzzy
+#| msgid "Replace table prefix"
+msgid "Replaced string"
+msgstr "Кестениң префиксін ауыстыру"
+
+#: templates/table/search/replace_preview.phtml:40
+msgid "Replace"
+msgstr ""
+
+#: templates/table/search/rows_zoom.phtml:16
+msgid "Additional search criteria"
+msgstr ""
+
+#: templates/table/search/search_and_replace.phtml:3
+#, fuzzy
+#| msgid "Replace table prefix"
+msgid "Replace with:"
+msgstr "Кестениң префиксін ауыстыру"
+
+#: templates/table/search/search_and_replace.phtml:22
+#, fuzzy
+#| msgid "as regular expression"
+msgid "Use regular expression"
+msgstr "жүйелі түрде айтылу"
+
+#: templates/table/search/selection_form.phtml:12
+msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
+msgstr ""
+
+#: templates/table/search/selection_form.phtml:34
+msgid "Do a \"query by example\" (wildcard: \"%\")"
+msgstr ""
+
+#: templates/table/search/zoom_result_form.phtml:7
+msgid "Browse/Edit the points"
+msgstr ""
+
+#: templates/table/search/zoom_result_form.phtml:15
+msgid "How to use"
+msgstr ""
+
+#: templates/table/search/zoom_result_form.phtml:23
+msgid "Reset zoom"
+msgstr ""
+
+#: templates/table/secondary_tabs.phtml:14
+#, fuzzy
+#| msgid "Replication"
+msgid "Relation view"
+msgstr "Репликация"
+
+#: templates/table/structure/actions_in_table_structure.phtml:14
+#, php-format
+msgid "A primary key has been added on %s."
+msgstr ""
+
+#: templates/table/structure/actions_in_table_structure.phtml:34
+#: templates/table/structure/actions_in_table_structure.phtml:54
+#: templates/table/structure/actions_in_table_structure.phtml:79
+#: templates/table/structure/actions_in_table_structure.phtml:101
+#, php-format
+msgid "An index has been added on %s."
+msgstr ""
+
+#: templates/table/structure/actions_in_table_structure.phtml:130
+#: templates/table/structure/check_all_table_column.phtml:59
+#, fuzzy
+#| msgid "Remove chart"
+msgid "Remove from central columns"
+msgstr "Графикті жою"
+
+#: templates/table/structure/actions_in_table_structure.phtml:138
+#: templates/table/structure/check_all_table_column.phtml:55
+#, fuzzy
+#| msgid "Add columns"
+msgid "Add to central columns"
+msgstr "Бағаналар қосу"
+
+#: templates/table/structure/add_column.phtml:7
+#, php-format
+msgid "Add %s column(s)"
+msgstr ""
+
+#: templates/table/structure/add_column.phtml:12
+#, fuzzy
+#| msgid "Replace table prefix"
+msgid "at beginning of table"
+msgstr "Кестениң префиксін ауыстыру"
+
+#: templates/table/structure/display_structure.phtml:140 view_create.php:181
+msgid "Edit view"
+msgstr ""
+
+#: templates/table/structure/display_table_stats.phtml:9
+msgid "Space usage"
+msgstr ""
+
+#: templates/table/structure/display_table_stats.phtml:32
+msgid "Effective"
+msgstr ""
+
+#: templates/table/structure/move_columns_dialog.phtml:1
+#: templates/table/structure/optional_action_links.phtml:21
+#, fuzzy
+msgid "Move columns"
+msgstr "Бағана іші"
+
+#: templates/table/structure/move_columns_dialog.phtml:2
+msgid "Move the columns by dragging them up and down."
+msgstr ""
+
+#: templates/table/structure/optional_action_links.phtml:9
+msgid "Propose table structure"
+msgstr ""
+
+#: templates/table/structure/optional_action_links.phtml:24
+#, fuzzy
+#| msgid "Databases"
+msgid "Improve table structure"
+msgstr "Мәлімет қорлары"
+
+#: templates/table/structure/optional_action_links.phtml:30
+#, fuzzy
+#| msgid "Track table"
+msgid "Track view"
+msgstr "Кестені бақылау"
+
+#: templates/table/structure/row_stats_table.phtml:3
+#, fuzzy
+#| msgid "Query statistics"
+msgid "Row statistics"
+msgstr "Сұраныстардың статистикасы"
+
+#: templates/table/structure/row_stats_table.phtml:9
+msgid "static"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:11
+msgid "dynamic"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:22
+msgid "partitioned"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:54
+msgid "Row length"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:66
+msgid "Row size"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:73
+msgid "Next autoindex"
+msgstr ""
+
+#: templates/table/structure/table_structure_row.phtml:46
+#, php-format
+msgid "Column %s has been dropped."
+msgstr ""
+
 #: themes.php:17 themes.php:22
 msgid "Theme"
 msgstr ""
diff --git a/po/km.po b/po/km.po
index f8fc5d3c89..51ed686b47 100644
--- a/po/km.po
+++ b/po/km.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 4.5.0-dev\n"
 "Report-Msgid-Bugs-To: developers@phpmyadmin.net\n"
-"POT-Creation-Date: 2015-08-08 13:53-0400\n"
+"POT-Creation-Date: 2015-08-12 08:10-0400\n"
 "PO-Revision-Date: 2014-04-19 18:59+0200\n"
 "Last-Translator: Sovichet Tep <sovichet.tep@gmail.com>\n"
 "Language-Team: Central Khmer <https://hosted.weblate.org/projects/phpmyadmin/"
@@ -56,7 +56,7 @@ msgid "Table comments:"
 msgstr "មតិយោបល់​តារាង៖"
 
 #: db_datadict.php:104 libraries/Index.class.php:699
-#: libraries/insert_edit.lib.php:1567
+#: libraries/insert_edit.lib.php:1565
 #: libraries/navigation/Nodes/Node_Column.class.php:30
 #: libraries/plugins/export/ExportHtmlword.class.php:280
 #: libraries/plugins/export/ExportHtmlword.class.php:375
@@ -70,13 +70,14 @@ msgstr "មតិយោបល់​តារាង៖"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1023
 #: libraries/tracking.lib.php:879 libraries/tracking.lib.php:975
 #: templates/columns_definitions/column_name.phtml:18
-#: templates/index_form.phtml:124 templates/table/table_header.phtml:6
-#: templates/table/zoom_result_form.phtml:33
-#: templates/tbl_relation/common_form.phtml:10
-#: templates/tbl_relation/common_form.phtml:43
-#: templates/tbl_relation/foreign_key_row.phtml:194
-#: templates/tbl_relation/foreign_key_row.phtml:206
-#: templates/tbl_relation/internal_relational_row.phtml:71
+#: templates/table/index_form.phtml:124
+#: templates/table/relation/common_form.phtml:10
+#: templates/table/relation/common_form.phtml:43
+#: templates/table/relation/foreign_key_row.phtml:194
+#: templates/table/relation/foreign_key_row.phtml:206
+#: templates/table/relation/internal_relational_row.phtml:71
+#: templates/table/search/table_header.phtml:6
+#: templates/table/search/zoom_result_form.phtml:33
 msgid "Column"
 msgstr "ជួរឈរ"
 
@@ -94,21 +95,21 @@ msgstr "ជួរឈរ"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1001
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1024
 #: libraries/rte/rte_list.lib.php:75 libraries/rte/rte_list.lib.php:103
-#: libraries/rte/rte_routines.lib.php:802
-#: libraries/rte/rte_routines.lib.php:831
-#: libraries/rte/rte_routines.lib.php:1493
+#: libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_routines.lib.php:922
+#: libraries/rte/rte_routines.lib.php:1584
 #: libraries/server_privileges.lib.php:2369 libraries/tracking.lib.php:880
 #: libraries/tracking.lib.php:972
 #: templates/columns_definitions/table_fields_definitions.phtml:11
-#: templates/structure/table_header.phtml:48
-#: templates/structure/table_structure_header.phtml:6
-#: templates/table/table_header.phtml:7
+#: templates/database/structure/table_header.phtml:48
+#: templates/table/search/table_header.phtml:7
+#: templates/table/structure/table_structure_header.phtml:6
 msgid "Type"
 msgstr "ប្រភេទ"
 
 #: db_datadict.php:106 libraries/Index.class.php:702
 #: libraries/central_columns.lib.php:708
-#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1576
+#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1574
 #: libraries/plugins/export/ExportHtmlword.class.php:286
 #: libraries/plugins/export/ExportHtmlword.class.php:381
 #: libraries/plugins/export/ExportLatex.class.php:509
@@ -121,8 +122,8 @@ msgstr "ប្រភេទ"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1026
 #: libraries/tracking.lib.php:882 libraries/tracking.lib.php:978
 #: templates/columns_definitions/table_fields_definitions.phtml:39
-#: templates/structure/table_structure_header.phtml:9
-#: templates/table/zoom_result_form.phtml:34
+#: templates/table/search/zoom_result_form.phtml:34
+#: templates/table/structure/table_structure_header.phtml:9
 msgid "Null"
 msgstr "មោឃៈ"
 
@@ -140,8 +141,8 @@ msgstr "មោឃៈ"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1027
 #: libraries/replication_gui.lib.php:153 libraries/tracking.lib.php:883
 #: templates/columns_definitions/table_fields_definitions.phtml:25
-#: templates/structure/body_for_table_summary.phtml:55
-#: templates/structure/table_structure_header.phtml:10
+#: templates/database/structure/body_for_table_summary.phtml:55
+#: templates/table/structure/table_structure_header.phtml:10
 msgid "Default"
 msgstr "លំនាំដើម"
 
@@ -169,19 +170,19 @@ msgid "Comments"
 msgstr "មតិ"
 
 #: db_datadict.php:146
-#: libraries/controllers/StructureController.class.php:1960
-#: libraries/controllers/StructureController.class.php:1965
+#: libraries/controllers/TableStructureController.class.php:951
+#: libraries/controllers/TableStructureController.class.php:956
 #: libraries/tracking.lib.php:922
 #: templates/columns_definitions/column_indexes.phtml:6
-#: templates/structure/check_all_table_column.phtml:22
-#: templates/structure/display_structure.phtml:74
+#: templates/table/structure/check_all_table_column.phtml:22
+#: templates/table/structure/display_structure.phtml:74
 msgid "Primary"
 msgstr ""
 
 #: db_datadict.php:156 js/messages.php:317 libraries/Index.class.php:567
 #: libraries/Index.class.php:606 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261 libraries/mult_submits.lib.php:403
+#: libraries/config/FormDisplay.tpl.php:272 libraries/mult_submits.lib.php:403
 #: libraries/mult_submits.lib.php:417
 #: libraries/plugins/export/ExportHtmlword.class.php:630
 #: libraries/plugins/export/ExportLatex.class.php:589
@@ -197,20 +198,20 @@ msgstr ""
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1010 libraries/tracking.lib.php:1015
 #: prefs_manage.php:140 templates/prefs_autoload.phtml:15
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "No"
 msgstr "ទេ"
 
 #: db_datadict.php:156 js/messages.php:443 libraries/Index.class.php:568
 #: libraries/Index.class.php:605 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261
-#: libraries/controllers/StructureController.class.php:1344
-#: libraries/controllers/StructureController.class.php:2223
-#: libraries/controllers/StructureController.class.php:2232
-#: libraries/controllers/StructureController.class.php:2237
-#: libraries/controllers/StructureController.class.php:2242
-#: libraries/controllers/StructureController.class.php:2247
+#: libraries/config/FormDisplay.tpl.php:272
+#: libraries/controllers/TableStructureController.class.php:539
+#: libraries/controllers/TableStructureController.class.php:1201
+#: libraries/controllers/TableStructureController.class.php:1210
+#: libraries/controllers/TableStructureController.class.php:1215
+#: libraries/controllers/TableStructureController.class.php:1220
+#: libraries/controllers/TableStructureController.class.php:1225
 #: libraries/mult_submits.inc.php:82 libraries/mult_submits.inc.php:178
 #: libraries/mult_submits.lib.php:339 libraries/mult_submits.lib.php:372
 #: libraries/mult_submits.lib.php:401 libraries/mult_submits.lib.php:415
@@ -219,8 +220,8 @@ msgstr "ទេ"
 #: libraries/plugins/export/ExportOdt.class.php:756
 #: libraries/plugins/export/ExportTexytext.class.php:567
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1077
-#: libraries/server_databases.lib.php:464
-#: libraries/server_databases.lib.php:474
+#: libraries/server_databases.lib.php:475
+#: libraries/server_databases.lib.php:485
 #: libraries/server_privileges.lib.php:2546
 #: libraries/server_privileges.lib.php:2727
 #: libraries/server_privileges.lib.php:2748
@@ -230,7 +231,7 @@ msgstr "ទេ"
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1008 libraries/tracking.lib.php:1013
 #: prefs_manage.php:138 templates/prefs_autoload.phtml:14
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "Yes"
 msgstr "បាទ/ចាស"
 
@@ -240,7 +241,7 @@ msgstr ""
 
 #: db_export.php:37 db_tracking.php:90 export.php:382
 #: libraries/DBQbe.class.php:326
-#: libraries/controllers/StructureController.class.php:231
+#: libraries/controllers/DatabaseStructureController.class.php:170
 #: libraries/navigation/NavigationTree.class.php:897
 msgid "No tables found in database."
 msgstr "រកមិនឃើញតារាងនៅក្នុងមូលដ្ឋានទិន្នន័យ។"
@@ -251,14 +252,14 @@ msgstr "រកមិនឃើញតារាងនៅក្នុងមូលដ
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:26
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:120
-#: templates/structure/show_create.phtml:18
+#: templates/database/structure/show_create.phtml:18
 msgid "Tables"
 msgstr ""
 
 #: db_export.php:52 libraries/Menu.class.php:317 libraries/Menu.class.php:425
-#: libraries/Util.class.php:3333 libraries/Util.class.php:3343
-#: libraries/Util.class.php:3349 libraries/Util.class.php:3629
-#: libraries/Util.class.php:4327 libraries/Util.class.php:4344
+#: libraries/Util.class.php:3339 libraries/Util.class.php:3349
+#: libraries/Util.class.php:3355 libraries/Util.class.php:3635
+#: libraries/Util.class.php:4333 libraries/Util.class.php:4350
 #: libraries/central_columns.lib.php:728 libraries/config.values.php:39
 #: libraries/config.values.php:47 libraries/config.values.php:109
 #: libraries/config.values.php:115 libraries/config/setup.forms.php:323
@@ -272,7 +273,7 @@ msgstr ""
 #: libraries/navigation/Nodes/Node_Table.class.php:283
 #: libraries/server_privileges.lib.php:1141 libraries/tracking.lib.php:874
 #: templates/columns_definitions/table_fields_definitions.phtml:3
-#: templates/designer/table_list.phtml:28
+#: templates/database/designer/table_list.phtml:28
 msgid "Structure"
 msgstr ""
 
@@ -284,7 +285,7 @@ msgstr ""
 #: libraries/config/user_preferences.forms.php:292
 #: libraries/config/user_preferences.forms.php:297
 #: libraries/server_privileges.lib.php:1140
-#: templates/structure/display_table_stats.phtml:12
+#: templates/table/structure/display_table_stats.phtml:12
 msgid "Data"
 msgstr ""
 
@@ -363,10 +364,10 @@ msgstr "តារាង​ដែល​តាមដាន"
 #: libraries/server_privileges.lib.php:2908
 #: libraries/server_privileges.lib.php:3145
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4346
-#: templates/structure/table_header.phtml:21
-#: templates/tbl_relation/foreign_key_row.phtml:176
-#: templates/tbl_relation/internal_relational_row.phtml:63
+#: libraries/server_privileges.lib.php:4372
+#: templates/database/structure/table_header.phtml:21
+#: templates/table/relation/foreign_key_row.phtml:176
+#: templates/table/relation/internal_relational_row.phtml:63
 msgid "Table"
 msgstr "តារាង"
 
@@ -383,7 +384,7 @@ msgid "Updated"
 msgstr "បានធ្វើបច្ចុប្បន្នភាព"
 
 #: db_tracking.php:130 js/messages.php:243 libraries/Menu.class.php:552
-#: libraries/Util.class.php:4314 libraries/config.values.php:104
+#: libraries/Util.class.php:4320 libraries/config.values.php:104
 #: libraries/rte/rte_events.lib.php:393 libraries/rte/rte_list.lib.php:101
 #: libraries/server_status_processes.lib.php:92 libraries/tracking.lib.php:279
 msgid "Status"
@@ -392,14 +393,15 @@ msgstr "ស្ថានភាព"
 #: db_tracking.php:131 db_tracking.php:290 libraries/Index.class.php:693
 #: libraries/central_columns.lib.php:687 libraries/rte/rte_list.lib.php:74
 #: libraries/rte/rte_list.lib.php:89 libraries/rte/rte_list.lib.php:102
-#: libraries/server_databases.lib.php:398
+#: libraries/server_databases.lib.php:409
 #: libraries/server_privileges.lib.php:2372
 #: libraries/server_privileges.lib.php:3166
 #: libraries/server_privileges.lib.php:3342
 #: libraries/server_user_groups.lib.php:82
 #: libraries/server_variables.lib.php:189 libraries/tracking.lib.php:280
-#: libraries/tracking.lib.php:793 templates/structure/table_header.phtml:30
-#: templates/structure/table_structure_header.phtml:23
+#: libraries/tracking.lib.php:793
+#: templates/database/structure/table_header.phtml:30
+#: templates/table/structure/table_structure_header.phtml:23
 msgid "Action"
 msgstr "សកម្មភាព"
 
@@ -443,7 +445,7 @@ msgid "Untracked tables"
 msgstr "តារាង​ដែល​មិន​តាមដាន"
 
 #: db_tracking.php:305 db_tracking.php:336
-#: templates/structure/optional_action_links.phtml:17
+#: templates/table/structure/optional_action_links.phtml:17
 msgid "Track table"
 msgstr "តាមដាន​តារាង"
 
@@ -493,7 +495,7 @@ msgid "Value for the column \"%s\""
 msgstr "តម្លៃ​នៃ​ជួរ​ឈរ \"%s\""
 
 #: gis_data_editor.php:146
-#: templates/gis_visualization/gis_visualization.phtml:37
+#: templates/table/gis_visualization/gis_visualization.phtml:37
 msgid "Use OpenStreetMaps as Base Layer"
 msgstr "ប្រើ OpenStreetMaps ជា​ស្រទាប់​មូលដ្ឋាន"
 
@@ -573,35 +575,35 @@ msgstr "បន្ថែម​ធរណីមាត្រ"
 #: libraries/display_change_password.lib.php:162
 #: libraries/display_export.lib.php:402 libraries/display_export.lib.php:408
 #: libraries/display_import.lib.php:392 libraries/index.lib.php:44
-#: libraries/insert_edit.lib.php:1546 libraries/insert_edit.lib.php:1583
+#: libraries/insert_edit.lib.php:1544 libraries/insert_edit.lib.php:1581
 #: libraries/normalization.lib.php:165 libraries/normalization.lib.php:821
 #: libraries/operations.lib.php:38 libraries/operations.lib.php:108
 #: libraries/operations.lib.php:263 libraries/operations.lib.php:306
 #: libraries/operations.lib.php:801 libraries/operations.lib.php:874
 #: libraries/operations.lib.php:923 libraries/operations.lib.php:1337
 #: libraries/operations.lib.php:1658
-#: libraries/plugins/auth/AuthenticationCookie.class.php:244
+#: libraries/plugins/auth/AuthenticationCookie.class.php:232
 #: libraries/replication_gui.lib.php:122 libraries/replication_gui.lib.php:161
 #: libraries/replication_gui.lib.php:324 libraries/replication_gui.lib.php:461
 #: libraries/replication_gui.lib.php:906 libraries/rte/rte_events.lib.php:509
-#: libraries/rte/rte_routines.lib.php:969
-#: libraries/rte/rte_routines.lib.php:1581
+#: libraries/rte/rte_routines.lib.php:1060
+#: libraries/rte/rte_routines.lib.php:1672
 #: libraries/rte/rte_triggers.lib.php:396 libraries/server_bin_log.lib.php:61
 #: libraries/server_privileges.lib.php:705
 #: libraries/server_privileges.lib.php:2106
 #: libraries/server_privileges.lib.php:2872
 #: libraries/server_privileges.lib.php:3553
-#: libraries/server_privileges.lib.php:4627
+#: libraries/server_privileges.lib.php:4653
 #: libraries/server_user_groups.lib.php:285
 #: libraries/sql_query_form.lib.php:369 libraries/sql_query_form.lib.php:429
 #: libraries/tracking.lib.php:533 libraries/tracking.lib.php:653
 #: prefs_manage.php:277 prefs_manage.php:355
 #: templates/columns_definitions/column_definitions_form.phtml:59
-#: templates/header_location.phtml:17 templates/index_form.phtml:238
+#: templates/database/create_table.phtml:21 templates/header_location.phtml:28
 #: templates/startAndNumberOfRowsPanel.phtml:14
-#: templates/structure/add_column.phtml:25
-#: templates/table/create_table.phtml:21
-#: templates/table/selection_form.phtml:75 view_create.php:275
+#: templates/table/index_form.phtml:238
+#: templates/table/search/selection_form.phtml:75
+#: templates/table/structure/add_column.phtml:25 view_create.php:275
 #: view_operations.php:106
 msgid "Go"
 msgstr "ទៅ"
@@ -683,7 +685,7 @@ msgstr ""
 msgid "Could not load import plugins, please check your installation!"
 msgstr ""
 
-#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1466
+#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1460
 #, php-format
 msgid "Bookmark %s has been created."
 msgstr "បាន​បង្កើត​ចំណាំ %s ។"
@@ -717,11 +719,11 @@ msgstr ""
 msgid "Back"
 msgstr "បកក្រោយ"
 
-#: index.php:148 libraries/Footer.class.php:70
+#: index.php:149 libraries/Footer.class.php:70
 msgid "phpMyAdmin Demo Server"
 msgstr ""
 
-#: index.php:152
+#: index.php:153
 #, php-format
 msgid ""
 "You are using the demo server. You can do anything here, but please do not "
@@ -729,112 +731,112 @@ msgid ""
 "at %s."
 msgstr ""
 
-#: index.php:162
+#: index.php:163
 msgid "General Settings"
 msgstr "ការ​កំណត់​ទូទៅ"
 
-#: index.php:190 libraries/display_change_password.lib.php:50
+#: index.php:191 libraries/display_change_password.lib.php:50
 #: libraries/display_change_password.lib.php:53 user_password.php:247
 msgid "Change password"
 msgstr "ប្ដូរ​ពាក្យ​សម្ងាត់"
 
-#: index.php:206
+#: index.php:207
 msgid "Server connection collation"
 msgstr ""
 
-#: index.php:228
+#: index.php:229
 msgid "Appearance Settings"
 msgstr "ការ​កំណត់​រូបរាង​បង្ហាញ"
 
-#: index.php:258 prefs_manage.php:285
+#: index.php:259 prefs_manage.php:285
 msgid "More settings"
 msgstr "ការ​កំណត់​ច្រើន​ទៀត"
 
-#: index.php:279
+#: index.php:280
 msgid "Database server"
 msgstr "ម៉ាស៊ីន​មេ​មូលដ្ឋាន​ទិន្នន័យ"
 
-#: index.php:282 libraries/plugins/auth/AuthenticationCookie.class.php:181
+#: index.php:283 libraries/plugins/auth/AuthenticationCookie.class.php:169
 msgid "Server:"
 msgstr "ម៉ាស៊ីន​មេ៖"
 
-#: index.php:286
+#: index.php:287
 msgid "Server type:"
 msgstr "ប្រភេទ​ម៉ាស៊ីន​មេ៖"
 
-#: index.php:290 libraries/plugins/export/ExportLatex.class.php:212
+#: index.php:291 libraries/plugins/export/ExportLatex.class.php:212
 #: libraries/plugins/export/ExportSql.class.php:687
 #: libraries/plugins/export/ExportXml.class.php:189
 msgid "Server version:"
 msgstr "កំណែ​ម៉ាស៊ីន​មេ៖"
 
-#: index.php:296
+#: index.php:297
 msgid "Protocol version:"
 msgstr ""
 
-#: index.php:300
+#: index.php:301
 msgid "User:"
 msgstr "អ្នកប្រើ៖"
 
-#: index.php:305
+#: index.php:306
 msgid "Server charset:"
 msgstr ""
 
-#: index.php:320
+#: index.php:321
 msgid "Web server"
 msgstr ""
 
-#: index.php:331
+#: index.php:332
 msgid "Database client version:"
 msgstr ""
 
-#: index.php:335
+#: index.php:336
 msgid "PHP extension:"
 msgstr "កម្មវិធី​បន្ថែម​របស់ PHP៖"
 
-#: index.php:349
+#: index.php:350
 #, fuzzy
 #| msgid "PHP extension:"
 msgid "PHP version:"
 msgstr "កម្មវិធី​បន្ថែម​របស់ PHP៖"
 
-#: index.php:360
+#: index.php:361
 msgid "Show PHP information"
 msgstr "បង្ហាញ​ព័ត៌មាន PHP"
 
-#: index.php:383
+#: index.php:384
 msgid "Version information:"
 msgstr "ព័ត៌មាន​អំពី​កំណែ៖"
 
-#: index.php:392 libraries/Util.class.php:432 libraries/Util.class.php:495
-#: libraries/config/FormDisplay.tpl.php:151
+#: index.php:393 libraries/Util.class.php:432 libraries/Util.class.php:495
+#: libraries/config/FormDisplay.tpl.php:162
 #: libraries/display_export.lib.php:577 libraries/engines/pbxt.lib.php:162
 #: libraries/navigation/NavigationHeader.class.php:196
 #: libraries/server_variables.lib.php:160
 msgid "Documentation"
 msgstr ""
 
-#: index.php:399
+#: index.php:400
 msgid "Wiki"
 msgstr "វិគី"
 
-#: index.php:408
+#: index.php:409
 msgid "Official Homepage"
 msgstr "គេហទំព័រ​ផ្លូវការ"
 
-#: index.php:415
+#: index.php:416
 msgid "Contribute"
 msgstr "រួម​ចំណែក"
 
-#: index.php:422
+#: index.php:423
 msgid "Get support"
 msgstr "ទទួល​ការ​គាំទ្រ"
 
-#: index.php:429
+#: index.php:430
 msgid "List of changes"
 msgstr "បញ្ជី​បន្លាស់​ប្ដូរ"
 
-#: index.php:451
+#: index.php:452
 msgid ""
 "You are connected as 'root' with no password, which corresponds to the "
 "default MySQL privileged account. Your MySQL server is running with this "
@@ -842,21 +844,21 @@ msgid ""
 "by setting a password for user 'root'."
 msgstr ""
 
-#: index.php:468
+#: index.php:469
 msgid ""
 "You have enabled mbstring.func_overload in your PHP configuration. This "
 "option is incompatible with phpMyAdmin and might cause some data to be "
 "corrupted!"
 msgstr ""
 
-#: index.php:483
+#: index.php:484
 msgid ""
 "The mbstring PHP extension was not found and you seem to be using a "
 "multibyte charset. Without the mbstring extension phpMyAdmin is unable to "
 "split strings correctly and it may result in unexpected results."
 msgstr ""
 
-#: index.php:500
+#: index.php:501
 msgid ""
 "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini."
 "session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower than "
@@ -864,17 +866,17 @@ msgid ""
 "expire sooner than configured in phpMyAdmin."
 msgstr ""
 
-#: index.php:519
+#: index.php:520
 msgid ""
 "Login cookie store is lower than cookie validity configured in phpMyAdmin, "
 "because of this, your login will expire sooner than configured in phpMyAdmin."
 msgstr ""
 
-#: index.php:535
+#: index.php:536
 msgid "The configuration file now needs a secret passphrase (blowfish_secret)."
 msgstr ""
 
-#: index.php:548
+#: index.php:549
 msgid ""
 "Directory [code]config[/code], which is used by the setup script, still "
 "exists in your phpMyAdmin directory. It is strongly recommended to remove it "
@@ -882,7 +884,7 @@ msgid ""
 "may be compromised by unauthorized people downloading your configuration."
 msgstr ""
 
-#: index.php:564
+#: index.php:565
 #, fuzzy, php-format
 #| msgid ""
 #| "The phpMyAdmin configuration storage has been deactivated. To find out "
@@ -894,19 +896,19 @@ msgstr ""
 "ការ​កំណត់​រចនា​សម្ព័ន្ធ​ឃ្លាំង​ផ្ទុក phpMyAdmin ត្រូវ​បាន​បិទ​ដំណើរ​ការ។ សូម​ចុច %shere%s ដើម្បី​ស្វែងរក​"
 "មូលហេតុ។"
 
-#: index.php:571
+#: index.php:572
 msgid ""
 "Or alternately go to 'Operations' tab of any database to set it up there."
 msgstr ""
 
-#: index.php:620
+#: index.php:621
 #, php-format
 msgid ""
 "Your PHP MySQL library version %s differs from your MySQL server version %s. "
 "This may cause unpredictable behavior."
 msgstr ""
 
-#: index.php:648
+#: index.php:649
 #, php-format
 msgid ""
 "Server running with Suhosin. Please refer to %sdocumentation%s for possible "
@@ -1067,8 +1069,8 @@ msgstr ""
 msgid "Save & Close"
 msgstr ""
 
-#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:404
-#: libraries/insert_edit.lib.php:1550 prefs_manage.php:361
+#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:415
+#: libraries/insert_edit.lib.php:1548 prefs_manage.php:361
 #: prefs_manage.php:372
 msgid "Reset"
 msgstr ""
@@ -1103,7 +1105,7 @@ msgstr "បន្ថែម​សន្ទស្សន៍"
 msgid "Edit Index"
 msgstr "កែ​សន្ទស្សន៍"
 
-#: js/messages.php:99 templates/index_form.phtml:232
+#: js/messages.php:99 templates/table/index_form.phtml:232
 #, php-format
 msgid "Add %s column(s) to index"
 msgstr "បន្ថែម​ជួរ​ឈរ %s ទៅ​សន្ទស្សន៍"
@@ -1126,13 +1128,14 @@ msgstr ""
 msgid "Please select column(s) for the index."
 msgstr "បន្ថែម​ជួរ​ឈរ %s ទៅ​សន្ទស្សន៍"
 
-#: js/messages.php:106 templates/structure/add_column.phtml:1
+#: js/messages.php:106 templates/table/structure/add_column.phtml:1
 msgid "You have to add at least one column."
 msgstr ""
 
-#: js/messages.php:109 libraries/insert_edit.lib.php:1548
+#: js/messages.php:109 libraries/insert_edit.lib.php:1546
 #: templates/columns_definitions/column_definitions_form.phtml:162
-#: templates/index_form.phtml:237 templates/tbl_relation/common_form.phtml:106
+#: templates/table/index_form.phtml:237
+#: templates/table/relation/common_form.phtml:106
 msgid "Preview SQL"
 msgstr ""
 
@@ -1149,7 +1152,7 @@ msgid "SQL query:"
 msgstr ""
 
 #. l10n: Default label for the y-Axis of Charts
-#: js/messages.php:118 templates/tbl_chart.phtml:109
+#: js/messages.php:118 templates/table/chart/tbl_chart.phtml:109
 msgid "Y Values"
 msgstr "តម្លៃ Y"
 
@@ -1302,7 +1305,7 @@ msgstr "ចំនួន​បៃ​ដែល​បាន​ផ្ញើ"
 msgid "Bytes received"
 msgstr "ចំនួន​បៃ​ដែល​បាន​ទទួល"
 
-#: js/messages.php:169 libraries/server_status.lib.php:226
+#: js/messages.php:169 libraries/server_status.lib.php:235
 msgid "Connections"
 msgstr "ការ​តភ្ជាប់"
 
@@ -1359,12 +1362,12 @@ msgstr "%d តារាង"
 msgid "Questions"
 msgstr "សំណួរ"
 
-#: js/messages.php:184 libraries/server_status.lib.php:134
+#: js/messages.php:184 libraries/server_status.lib.php:143
 msgid "Traffic"
 msgstr "ចរាចរណ៍"
 
 #: js/messages.php:185 libraries/Menu.class.php:586
-#: libraries/Util.class.php:4318 libraries/server_status_monitor.lib.php:257
+#: libraries/Util.class.php:4324 libraries/server_status_monitor.lib.php:257
 msgid "Settings"
 msgstr "ការ​កំណត់"
 
@@ -1384,8 +1387,9 @@ msgstr ""
 #: libraries/server_status_monitor.lib.php:236
 #: libraries/server_status_processes.lib.php:308
 #: templates/columns_definitions/transformation.phtml:4
-#: templates/designer/options_panel.phtml:178
-#: templates/table/options_zoom.phtml:12 templates/table/rows_zoom.phtml:26
+#: templates/database/designer/options_panel.phtml:178
+#: templates/table/search/options_zoom.phtml:12
+#: templates/table/search/rows_zoom.phtml:26
 msgid "None"
 msgstr "គ្មាន"
 
@@ -1654,8 +1658,8 @@ msgstr ""
 
 #: js/messages.php:270 libraries/Menu.class.php:352
 #: libraries/Menu.class.php:455 libraries/Menu.class.php:582
-#: libraries/Util.class.php:4317 libraries/Util.class.php:4332
-#: libraries/Util.class.php:4349 libraries/config/messages.inc.php:258
+#: libraries/Util.class.php:4323 libraries/Util.class.php:4338
+#: libraries/Util.class.php:4355 libraries/config/messages.inc.php:258
 #: libraries/display_import.lib.php:105
 #: libraries/server_status_monitor.lib.php:318 prefs_manage.php:238
 #: setup/frames/menu.inc.php:26
@@ -1715,13 +1719,13 @@ msgid "Formatting SQL..."
 msgstr ""
 
 #: js/messages.php:293 libraries/server_variables.lib.php:157
-#: templates/designer/aggregate_query_panel.phtml:63
-#: templates/designer/delete_relation_panel.phtml:28
-#: templates/designer/having_query_panel.phtml:117
-#: templates/designer/new_relation_panel.phtml:88
-#: templates/designer/options_panel.phtml:253
-#: templates/designer/rename_to_panel.phtml:45
-#: templates/designer/where_query_panel.phtml:83
+#: templates/database/designer/aggregate_query_panel.phtml:63
+#: templates/database/designer/delete_relation_panel.phtml:28
+#: templates/database/designer/having_query_panel.phtml:117
+#: templates/database/designer/new_relation_panel.phtml:88
+#: templates/database/designer/options_panel.phtml:253
+#: templates/database/designer/rename_to_panel.phtml:45
+#: templates/database/designer/where_query_panel.phtml:83
 msgid "Cancel"
 msgstr "បោះបង់"
 
@@ -1731,7 +1735,7 @@ msgstr "បោះបង់"
 msgid "Page-related settings"
 msgstr "ប្ដូរ​ការ​កំណត់"
 
-#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:402
+#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:413
 msgid "Apply"
 msgstr ""
 
@@ -1768,8 +1772,8 @@ msgstr "កូដ​កំហុស៖ %s"
 msgid "Error text: %s"
 msgstr "អត្ថបទ​កំហុស៖ %s"
 
-#: js/messages.php:307 libraries/db_common.inc.php:68
-#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:450
+#: js/messages.php:307 libraries/db_common.inc.php:69
+#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:461
 msgid "No databases selected."
 msgstr "មិន​បាន​ជ្រើស​មូលដ្ឋាន​ទិន្នន័យ។"
 
@@ -1781,12 +1785,13 @@ msgstr "ការ​លុប​ជួរ​ឈរ"
 msgid "Adding Primary Key"
 msgstr "ការ​បន្ថែម​លេខ​ប​ឋម"
 
-#: js/messages.php:310 templates/designer/aggregate_query_panel.phtml:59
-#: templates/designer/having_query_panel.phtml:113
-#: templates/designer/new_relation_panel.phtml:87
-#: templates/designer/options_panel.phtml:252
-#: templates/designer/rename_to_panel.phtml:41
-#: templates/designer/where_query_panel.phtml:82
+#: js/messages.php:310
+#: templates/database/designer/aggregate_query_panel.phtml:59
+#: templates/database/designer/having_query_panel.phtml:113
+#: templates/database/designer/new_relation_panel.phtml:87
+#: templates/database/designer/options_panel.phtml:252
+#: templates/database/designer/rename_to_panel.phtml:41
+#: templates/database/designer/where_query_panel.phtml:82
 msgid "OK"
 msgstr ""
 
@@ -1806,7 +1811,7 @@ msgstr ""
 msgid "Changing Charset"
 msgstr ""
 
-#: js/messages.php:320 libraries/Util.class.php:3217
+#: js/messages.php:320 libraries/Util.class.php:3223
 msgid "Enable foreign key checks"
 msgstr ""
 
@@ -1841,20 +1846,21 @@ msgstr ""
 #: js/messages.php:334 libraries/DisplayResults.class.php:4834
 #: libraries/DisplayResults.class.php:5092 libraries/Menu.class.php:344
 #: libraries/Menu.class.php:446 libraries/Menu.class.php:578
-#: libraries/Util.class.php:3636 libraries/Util.class.php:3637
-#: libraries/Util.class.php:4316 libraries/Util.class.php:4331
-#: libraries/Util.class.php:4348 libraries/config/messages.inc.php:252
+#: libraries/Util.class.php:3642 libraries/Util.class.php:3643
+#: libraries/Util.class.php:4322 libraries/Util.class.php:4337
+#: libraries/Util.class.php:4354 libraries/config/messages.inc.php:252
 #: libraries/display_export.lib.php:173 libraries/rte/rte_list.lib.php:146
 #: libraries/server_privileges.lib.php:2211
 #: libraries/server_privileges.lib.php:2290
 #: libraries/server_privileges.lib.php:2632
 #: libraries/server_privileges.lib.php:3356
 #: libraries/server_status_monitor.lib.php:322 prefs_manage.php:303
-#: setup/frames/menu.inc.php:27 templates/structure/check_all_tables.phtml:11
+#: setup/frames/menu.inc.php:27
+#: templates/database/structure/check_all_tables.phtml:11
 msgid "Export"
 msgstr ""
 
-#: js/messages.php:337 libraries/rte/rte_routines.lib.php:652
+#: js/messages.php:337 libraries/rte/rte_routines.lib.php:743
 msgid "ENUM/SET editor"
 msgstr ""
 
@@ -1893,7 +1899,7 @@ msgstr ""
 #: libraries/Console.class.php:214 libraries/DisplayResults.class.php:3474
 #: libraries/DisplayResults.class.php:4818 libraries/Index.class.php:723
 #: libraries/Util.class.php:706 libraries/Util.class.php:1202
-#: libraries/Util.class.php:3634 libraries/Util.class.php:3635
+#: libraries/Util.class.php:3640 libraries/Util.class.php:3641
 #: libraries/central_columns.lib.php:851
 #: libraries/central_columns.lib.php:1193
 #: libraries/config/messages.inc.php:892
@@ -1911,7 +1917,7 @@ msgstr ""
 #: libraries/server_user_groups.lib.php:129
 #: libraries/sql_query_form.lib.php:416 libraries/tracking.lib.php:477
 #: setup/frames/index.inc.php:183 setup/frames/index.inc.php:291
-#: templates/designer/delete_relation_panel.phtml:27
+#: templates/database/designer/delete_relation_panel.phtml:27
 msgid "Delete"
 msgstr ""
 
@@ -2081,11 +2087,11 @@ msgid "No dependencies selected!"
 msgstr "មិន​បាន​ជ្រើស​មូលដ្ឋាន​ទិន្នន័យ។"
 
 #: js/messages.php:394 libraries/central_columns.lib.php:1214
-#: libraries/insert_edit.lib.php:1458 libraries/server_variables.lib.php:155
+#: libraries/insert_edit.lib.php:1456 libraries/server_variables.lib.php:155
 #: setup/frames/config.inc.php:42 setup/frames/index.inc.php:279
 #: templates/columns_definitions/column_definitions_form.phtml:165
-#: templates/gis_visualization/gis_visualization.phtml:48
-#: templates/tbl_relation/common_form.phtml:107
+#: templates/table/gis_visualization/gis_visualization.phtml:48
+#: templates/table/relation/common_form.phtml:107
 msgid "Save"
 msgstr ""
 
@@ -2162,8 +2168,8 @@ msgid "Data point content"
 msgstr ""
 
 #: js/messages.php:430 js/messages.php:562 js/messages.php:579
-#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2573
-#: templates/index_form.phtml:154 templates/index_form.phtml:194
+#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2571
+#: templates/table/index_form.phtml:154 templates/table/index_form.phtml:194
 msgid "Ignore"
 msgstr ""
 
@@ -2222,8 +2228,8 @@ msgstr ""
 msgid "Please select the primary key or a unique key!"
 msgstr ""
 
-#: js/messages.php:457 templates/designer/side_menu.phtml:91
-#: templates/designer/side_menu.phtml:94
+#: js/messages.php:457 templates/database/designer/side_menu.phtml:91
+#: templates/database/designer/side_menu.phtml:94
 msgid "Choose column to display"
 msgstr ""
 
@@ -2237,22 +2243,22 @@ msgstr ""
 msgid "Page name"
 msgstr ""
 
-#: js/messages.php:463 templates/designer/side_menu.phtml:56
-#: templates/designer/side_menu.phtml:59
+#: js/messages.php:463 templates/database/designer/side_menu.phtml:56
+#: templates/database/designer/side_menu.phtml:59
 #, fuzzy
 #| msgid "Reload page"
 msgid "Save page"
 msgstr "ផ្ទុក​ទំព័រ​ឡើង​វិញ"
 
-#: js/messages.php:464 templates/designer/side_menu.phtml:63
-#: templates/designer/side_menu.phtml:66
+#: js/messages.php:464 templates/database/designer/side_menu.phtml:63
+#: templates/database/designer/side_menu.phtml:66
 #, fuzzy
 #| msgid "Reload page"
 msgid "Save page as"
 msgstr "ផ្ទុក​ទំព័រ​ឡើង​វិញ"
 
-#: js/messages.php:465 templates/designer/side_menu.phtml:49
-#: templates/designer/side_menu.phtml:52
+#: js/messages.php:465 templates/database/designer/side_menu.phtml:49
+#: templates/database/designer/side_menu.phtml:52
 #, fuzzy
 #| msgid "Reload page"
 msgid "Open page"
@@ -2264,7 +2270,7 @@ msgstr "ផ្ទុក​ទំព័រ​ឡើង​វិញ"
 msgid "Delete page"
 msgstr "ផ្ទុក​ទំព័រ​ឡើង​វិញ"
 
-#: js/messages.php:467 templates/designer/side_menu.phtml:10
+#: js/messages.php:467 templates/database/designer/side_menu.phtml:10
 msgid "Untitled"
 msgstr ""
 
@@ -2379,7 +2385,7 @@ msgstr ""
 msgid "cancel"
 msgstr "បោះបង់"
 
-#: js/messages.php:499 libraries/server_status.lib.php:271
+#: js/messages.php:499 libraries/server_status.lib.php:280
 msgid "Aborted"
 msgstr ""
 
@@ -2973,7 +2979,7 @@ msgstr "សូម​បញ្ចូល​តម្លៃ​លេខ​ត្រ
 
 #: js/messages.php:793 libraries/Message.class.php:199
 #: libraries/Util.class.php:654 libraries/core.lib.php:245
-#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1172
+#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1170
 #: tbl_operations.php:229 view_operations.php:63
 msgid "Error"
 msgstr ""
@@ -3032,8 +3038,8 @@ msgstr ""
 msgid "per minute"
 msgstr ""
 
-#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:143
-#: libraries/server_status.lib.php:228
+#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:152
+#: libraries/server_status.lib.php:237
 #: libraries/server_status_queries.lib.php:98
 msgid "per hour"
 msgstr ""
@@ -3051,7 +3057,7 @@ msgstr ""
 msgid "Wrong permissions on configuration file, should not be world writable!"
 msgstr ""
 
-#: libraries/Config.class.php:1799
+#: libraries/Config.class.php:1801
 msgid "Font size"
 msgstr ""
 
@@ -3079,10 +3085,10 @@ msgstr ""
 #: libraries/server_privileges.lib.php:2890
 #: libraries/server_privileges.lib.php:3144
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4332
+#: libraries/server_privileges.lib.php:4358
 #: libraries/server_status_processes.lib.php:80
-#: templates/tbl_relation/foreign_key_row.phtml:165
-#: templates/tbl_relation/internal_relational_row.phtml:55
+#: templates/table/relation/foreign_key_row.phtml:165
+#: templates/table/relation/internal_relational_row.phtml:55
 msgid "Database"
 msgstr "មូលដ្ឋានទិន្នន័យ"
 
@@ -3182,11 +3188,11 @@ msgstr ""
 #: libraries/plugins/import/ImportMediawiki.class.php:60
 #: libraries/plugins/import/ImportOds.class.php:59
 #: libraries/plugins/import/ImportShp.class.php:57
-#: libraries/plugins/import/ImportSql.class.php:148
+#: libraries/plugins/import/ImportSql.class.php:51
 #: libraries/plugins/import/ImportXml.class.php:58
-#: libraries/rte/rte_routines.lib.php:833 templates/index_form.phtml:49
-#: templates/structure/row_stats_table.phtml:20
-#: templates/table/options.phtml:2
+#: libraries/rte/rte_routines.lib.php:924 templates/table/index_form.phtml:49
+#: templates/table/search/options.phtml:2
+#: templates/table/structure/row_stats_table.phtml:20
 msgid "Options"
 msgstr ""
 
@@ -3221,7 +3227,8 @@ msgstr ""
 msgid "Order:"
 msgstr ""
 
-#: libraries/Console.class.php:289 templates/table/replace_preview.phtml:17
+#: libraries/Console.class.php:289
+#: templates/table/search/replace_preview.phtml:17
 msgid "Count"
 msgstr ""
 
@@ -3326,9 +3333,9 @@ msgstr ""
 #: libraries/operations.lib.php:794 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:191
-#: templates/structure/sortable_header.phtml:21
-#: templates/structure/sortable_header.phtml:38
-#: templates/table/options.phtml:68
+#: templates/database/structure/sortable_header.phtml:21
+#: templates/database/structure/sortable_header.phtml:38
+#: templates/table/search/options.phtml:68
 msgid "Ascending"
 msgstr ""
 
@@ -3338,13 +3345,14 @@ msgstr ""
 #: libraries/operations.lib.php:797 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:188
-#: templates/structure/sortable_header.phtml:26
-#: templates/structure/sortable_header.phtml:43
-#: templates/table/options.phtml:69
+#: templates/database/structure/sortable_header.phtml:26
+#: templates/database/structure/sortable_header.phtml:43
+#: templates/table/search/options.phtml:69
 msgid "Descending"
 msgstr ""
 
-#: libraries/DBQbe.class.php:467 templates/table/search_and_replace.phtml:6
+#: libraries/DBQbe.class.php:467
+#: templates/table/search/search_and_replace.phtml:6
 msgid "Column:"
 msgstr ""
 
@@ -3499,12 +3507,12 @@ msgstr[0] ""
 msgstr[1] ""
 
 #: libraries/DbSearch.class.php:354 libraries/Menu.class.php:311
-#: libraries/Util.class.php:3337 libraries/Util.class.php:3347
-#: libraries/Util.class.php:3623 libraries/Util.class.php:3624
-#: libraries/Util.class.php:4343 libraries/config.values.php:43
+#: libraries/Util.class.php:3343 libraries/Util.class.php:3353
+#: libraries/Util.class.php:3629 libraries/Util.class.php:3630
+#: libraries/Util.class.php:4349 libraries/config.values.php:43
 #: libraries/config.values.php:51 libraries/config.values.php:119
 #: libraries/navigation/Nodes/Node_Table.class.php:295
-#: templates/structure/check_all_table_column.phtml:5
+#: templates/table/structure/check_all_table_column.phtml:5
 msgid "Browse"
 msgstr ""
 
@@ -3521,7 +3529,8 @@ msgstr ""
 msgid "Words or values to search for (wildcard: \"%\"):"
 msgstr ""
 
-#: libraries/DbSearch.class.php:401 templates/table/search_and_replace.phtml:1
+#: libraries/DbSearch.class.php:401
+#: templates/table/search/search_and_replace.phtml:1
 msgid "Find:"
 msgstr ""
 
@@ -3565,28 +3574,28 @@ msgstr "ត្រង​ជួរ​ដេក"
 msgid "Search this table"
 msgstr ""
 
-#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2532
-#: libraries/Util.class.php:2535
+#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2538
+#: libraries/Util.class.php:2541
 msgctxt "First page"
 msgid "Begin"
 msgstr ""
 
-#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2533
-#: libraries/Util.class.php:2536 libraries/server_bin_log.lib.php:170
+#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2539
+#: libraries/Util.class.php:2542 libraries/server_bin_log.lib.php:170
 #: libraries/server_bin_log.lib.php:172
 msgctxt "Previous page"
 msgid "Previous"
 msgstr ""
 
-#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2564
-#: libraries/Util.class.php:2574 libraries/server_bin_log.lib.php:204
+#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2570
+#: libraries/Util.class.php:2580 libraries/server_bin_log.lib.php:204
 #: libraries/server_bin_log.lib.php:206
 msgctxt "Next page"
 msgid "Next"
 msgstr ""
 
-#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2565
-#: libraries/Util.class.php:2575
+#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2571
+#: libraries/Util.class.php:2581
 msgctxt "Last page"
 msgid "End"
 msgstr ""
@@ -3661,15 +3670,15 @@ msgid "May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]."
 msgstr ""
 
 #: libraries/DisplayResults.class.php:4332 libraries/Message.class.php:180
-#: libraries/controllers/TableRelationController.class.php:258
+#: libraries/controllers/TableRelationController.class.php:259
 #: libraries/controllers/TableSearchController.class.php:655
-#: libraries/rte/rte_routines.lib.php:1332 libraries/sql_query_form.lib.php:89
+#: libraries/rte/rte_routines.lib.php:1423 libraries/sql_query_form.lib.php:89
 #: tbl_operations.php:227 tbl_row_action.php:138 view_operations.php:62
 msgid "Your SQL query has been executed successfully."
 msgstr ""
 
 #: libraries/DisplayResults.class.php:4660
-#: libraries/controllers/StructureController.class.php:629
+#: libraries/controllers/DatabaseStructureController.class.php:564
 #, php-format
 msgid ""
 "This view has at least this number of rows. Please refer to %sdocumentation"
@@ -3691,33 +3700,33 @@ msgstr ""
 msgid "%d total"
 msgstr ""
 
-#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1318
+#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1312
 #, php-format
 msgid "Query took %01.4f seconds."
 msgstr ""
 
 #: libraries/DisplayResults.class.php:4807
-#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4767
-#: libraries/Util.class.php:4773 libraries/mult_submits.inc.php:50
-#: templates/structure/check_all_tables.phtml:2
-#: templates/structure/check_all_tables.phtml:9
+#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4773
+#: libraries/Util.class.php:4779 libraries/mult_submits.inc.php:50
+#: templates/database/structure/check_all_tables.phtml:2
+#: templates/database/structure/check_all_tables.phtml:9
 msgid "With selected:"
 msgstr ""
 
 #: libraries/DisplayResults.class.php:4811
-#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4769
-#: libraries/Util.class.php:4770 libraries/server_privileges.lib.php:1174
+#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4775
+#: libraries/Util.class.php:4776 libraries/server_privileges.lib.php:1174
 #: libraries/server_privileges.lib.php:1175
 #: libraries/server_privileges.lib.php:1387
 #: libraries/server_user_groups.lib.php:231
-#: templates/structure/check_all_tables.phtml:3
-#: templates/structure/check_all_tables.phtml:4
+#: templates/database/structure/check_all_tables.phtml:3
+#: templates/database/structure/check_all_tables.phtml:4
 msgid "Check All"
 msgstr ""
 
 #: libraries/DisplayResults.class.php:4985 libraries/Header.class.php:383
-#: templates/structure/optional_action_links.phtml:1
-#: templates/structure/print_view_data_dictionary_link.phtml:3
+#: templates/database/structure/print_view_data_dictionary_link.phtml:3
+#: templates/table/structure/optional_action_links.phtml:1
 msgid "Print view"
 msgstr ""
 
@@ -3725,7 +3734,8 @@ msgstr ""
 msgid "Query results operations"
 msgstr ""
 
-#: libraries/DisplayResults.class.php:5105 templates/tbl_chart.phtml:12
+#: libraries/DisplayResults.class.php:5105
+#: templates/table/chart/tbl_chart.phtml:12
 msgid "Display chart"
 msgstr ""
 
@@ -3816,7 +3826,7 @@ msgid "Click on the bar to scroll to top of page"
 msgstr ""
 
 #: libraries/Header.class.php:749
-#: libraries/plugins/auth/AuthenticationCookie.class.php:152
+#: libraries/plugins/auth/AuthenticationCookie.class.php:140
 msgid "Javascript must be enabled past this point!"
 msgstr ""
 
@@ -3838,11 +3848,11 @@ msgid "Keyname"
 msgstr ""
 
 #: libraries/Index.class.php:697
-#: libraries/controllers/StructureController.class.php:1962
-#: libraries/controllers/StructureController.class.php:1967
+#: libraries/controllers/TableStructureController.class.php:953
+#: libraries/controllers/TableStructureController.class.php:958
 #: libraries/tracking.lib.php:973
 #: templates/columns_definitions/column_indexes.phtml:11
-#: templates/structure/check_all_table_column.phtml:26
+#: templates/table/structure/check_all_table_column.phtml:26
 msgid "Unique"
 msgstr ""
 
@@ -3861,16 +3871,17 @@ msgstr ""
 #: libraries/server_collations.lib.php:35 libraries/tracking.lib.php:881
 #: libraries/tracking.lib.php:977
 #: templates/columns_definitions/table_fields_definitions.phtml:33
-#: templates/structure/row_stats_table.phtml:31
-#: templates/structure/table_header.phtml:55
-#: templates/structure/table_structure_header.phtml:7
-#: templates/table/table_header.phtml:8
+#: templates/database/structure/table_header.phtml:55
+#: templates/table/search/table_header.phtml:8
+#: templates/table/structure/row_stats_table.phtml:31
+#: templates/table/structure/table_structure_header.phtml:7
 msgid "Collation"
 msgstr ""
 
 #: libraries/Index.class.php:703 libraries/rte/rte_events.lib.php:496
-#: libraries/rte/rte_routines.lib.php:956 libraries/tracking.lib.php:885
-#: libraries/tracking.lib.php:979 templates/structure/table_header.phtml:84
+#: libraries/rte/rte_routines.lib.php:1047 libraries/tracking.lib.php:885
+#: libraries/tracking.lib.php:979
+#: templates/database/structure/table_header.phtml:84
 msgid "Comment"
 msgstr ""
 
@@ -3883,15 +3894,15 @@ msgstr ""
 msgid "Index %s has been dropped."
 msgstr ""
 
-#: libraries/Index.class.php:757 libraries/Util.class.php:3630
-#: libraries/Util.class.php:3631
-#: libraries/controllers/StructureController.class.php:1958
-#: libraries/controllers/StructureController.class.php:1959
+#: libraries/Index.class.php:757 libraries/Util.class.php:3636
+#: libraries/Util.class.php:3637
+#: libraries/controllers/TableStructureController.class.php:949
+#: libraries/controllers/TableStructureController.class.php:950
 #: libraries/operations.lib.php:1607 libraries/rte/rte_list.lib.php:150
 #: libraries/server_databases.lib.php:146
-#: templates/structure/check_all_table_column.phtml:15
-#: templates/structure/check_all_tables.phtml:16
-#: templates/tbl_relation/foreign_key_row.phtml:93
+#: templates/database/structure/check_all_tables.phtml:16
+#: templates/table/relation/foreign_key_row.phtml:93
+#: templates/table/structure/check_all_table_column.phtml:15
 msgid "Drop"
 msgstr "លុប"
 
@@ -3920,16 +3931,16 @@ msgstr ""
 #: libraries/Menu.class.php:248
 #: libraries/navigation/Nodes/Node_View.class.php:32
 #: libraries/tbl_info.inc.php:63
-#: templates/structure/structure_table_row.phtml:97
-#: templates/structure/structure_table_row.phtml:159
+#: templates/database/structure/structure_table_row.phtml:97
+#: templates/database/structure/structure_table_row.phtml:159
 msgid "View"
 msgstr ""
 
 #: libraries/Menu.class.php:325 libraries/Menu.class.php:429
-#: libraries/Menu.class.php:548 libraries/Util.class.php:3334
-#: libraries/Util.class.php:3344 libraries/Util.class.php:3350
-#: libraries/Util.class.php:4313 libraries/Util.class.php:4328
-#: libraries/Util.class.php:4345 libraries/config.values.php:40
+#: libraries/Menu.class.php:548 libraries/Util.class.php:3340
+#: libraries/Util.class.php:3350 libraries/Util.class.php:3356
+#: libraries/Util.class.php:4319 libraries/Util.class.php:4334
+#: libraries/Util.class.php:4351 libraries/config.values.php:40
 #: libraries/config.values.php:48 libraries/config.values.php:110
 #: libraries/config.values.php:116 libraries/config/messages.inc.php:321
 #: libraries/navigation/Nodes/Node_Table.class.php:292
@@ -3937,19 +3948,19 @@ msgid "SQL"
 msgstr ""
 
 #: libraries/Menu.class.php:328 libraries/Menu.class.php:432
-#: libraries/Util.class.php:3335 libraries/Util.class.php:3345
-#: libraries/Util.class.php:3351 libraries/Util.class.php:3625
-#: libraries/Util.class.php:3626 libraries/Util.class.php:4329
-#: libraries/Util.class.php:4346 libraries/config.values.php:41
+#: libraries/Util.class.php:3341 libraries/Util.class.php:3351
+#: libraries/Util.class.php:3357 libraries/Util.class.php:3631
+#: libraries/Util.class.php:3632 libraries/Util.class.php:4335
+#: libraries/Util.class.php:4352 libraries/config.values.php:41
 #: libraries/config.values.php:49 libraries/config.values.php:111
 #: libraries/config.values.php:117
 #: libraries/navigation/Nodes/Node_Table.class.php:286
 msgid "Search"
 msgstr ""
 
-#: libraries/Menu.class.php:338 libraries/Util.class.php:3336
-#: libraries/Util.class.php:3346 libraries/Util.class.php:3627
-#: libraries/Util.class.php:3628 libraries/Util.class.php:4347
+#: libraries/Menu.class.php:338 libraries/Util.class.php:3342
+#: libraries/Util.class.php:3352 libraries/Util.class.php:3633
+#: libraries/Util.class.php:3634 libraries/Util.class.php:4353
 #: libraries/config.values.php:42 libraries/config.values.php:50
 #: libraries/config.values.php:118
 #: libraries/navigation/Nodes/Node_Table.class.php:289
@@ -3958,30 +3969,30 @@ msgid "Insert"
 msgstr ""
 
 #: libraries/Menu.class.php:362 libraries/Menu.class.php:467
-#: libraries/Util.class.php:4334 libraries/Util.class.php:4350
+#: libraries/Util.class.php:4340 libraries/Util.class.php:4356
 #: libraries/config.values.php:106 libraries/server_common.lib.php:51
 #: libraries/server_privileges.lib.php:2370
 #: libraries/server_privileges.lib.php:3158
-#: libraries/server_privileges.lib.php:4221
+#: libraries/server_privileges.lib.php:4247
 msgid "Privileges"
 msgstr ""
 
 #: libraries/Menu.class.php:371 libraries/Menu.class.php:379
-#: libraries/Menu.class.php:459 libraries/Util.class.php:3338
-#: libraries/Util.class.php:3352 libraries/Util.class.php:4333
-#: libraries/Util.class.php:4351 libraries/config.values.php:112
+#: libraries/Menu.class.php:459 libraries/Util.class.php:3344
+#: libraries/Util.class.php:3358 libraries/Util.class.php:4339
+#: libraries/Util.class.php:4357 libraries/config.values.php:112
 #: view_operations.php:92
 msgid "Operations"
 msgstr ""
 
 #: libraries/Menu.class.php:384 libraries/Menu.class.php:492
-#: libraries/Util.class.php:4338 libraries/Util.class.php:4352
+#: libraries/Util.class.php:4344 libraries/Util.class.php:4358
 #: libraries/relation.lib.php:255
 msgid "Tracking"
 msgstr ""
 
 #: libraries/Menu.class.php:397 libraries/Menu.class.php:486
-#: libraries/Util.class.php:4337 libraries/Util.class.php:4353
+#: libraries/Util.class.php:4343 libraries/Util.class.php:4359
 #: libraries/navigation/Nodes/Node_Trigger_Container.class.php:24
 #: libraries/plugins/export/ExportHtmlword.class.php:557
 #: libraries/plugins/export/ExportOdt.class.php:685
@@ -3998,16 +4009,16 @@ msgstr ""
 msgid "Database seems to be empty!"
 msgstr ""
 
-#: libraries/Menu.class.php:439 libraries/Util.class.php:4330
+#: libraries/Menu.class.php:439 libraries/Util.class.php:4336
 msgid "Query"
 msgstr ""
 
-#: libraries/Menu.class.php:472 libraries/Util.class.php:4335
+#: libraries/Menu.class.php:472 libraries/Util.class.php:4341
 #: libraries/rte/rte_words.lib.php:36
 msgid "Routines"
 msgstr ""
 
-#: libraries/Menu.class.php:479 libraries/Util.class.php:4336
+#: libraries/Menu.class.php:479 libraries/Util.class.php:4342
 #: libraries/navigation/Nodes/Node_Event_Container.class.php:26
 #: libraries/plugins/export/ExportSql.class.php:940
 #: libraries/plugins/export/ExportXml.class.php:107
@@ -4015,20 +4026,20 @@ msgstr ""
 msgid "Events"
 msgstr ""
 
-#: libraries/Menu.class.php:498 libraries/Util.class.php:4339
+#: libraries/Menu.class.php:498 libraries/Util.class.php:4345
 msgid "Designer"
 msgstr ""
 
-#: libraries/Menu.class.php:507 libraries/Util.class.php:4340
-#: templates/structure/check_all_tables.phtml:35
+#: libraries/Menu.class.php:507 libraries/Util.class.php:4346
+#: templates/database/structure/check_all_tables.phtml:35
 msgid "Central columns"
 msgstr ""
 
-#: libraries/Menu.class.php:544 libraries/Util.class.php:4312
+#: libraries/Menu.class.php:544 libraries/Util.class.php:4318
 #: libraries/config.values.php:103 libraries/config/messages.inc.php:266
 #: libraries/config/messages.inc.php:341
 #: libraries/navigation/NavigationTree.class.php:1239
-#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4332
+#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4358
 msgid "Databases"
 msgstr ""
 
@@ -4037,34 +4048,34 @@ msgid "User accounts"
 msgstr ""
 
 #: libraries/Menu.class.php:595 libraries/ServerStatusData.class.php:121
-#: libraries/Util.class.php:4319 libraries/server_common.lib.php:36
+#: libraries/Util.class.php:4325 libraries/server_common.lib.php:36
 msgid "Binary log"
 msgstr ""
 
 #: libraries/Menu.class.php:601 libraries/ServerStatusData.class.php:126
-#: libraries/Util.class.php:4320 libraries/server_common.lib.php:42
-#: templates/structure/body_for_table_summary.phtml:10
-#: templates/structure/table_header.phtml:27
+#: libraries/Util.class.php:4326 libraries/server_common.lib.php:42
+#: templates/database/structure/body_for_table_summary.phtml:10
+#: templates/database/structure/table_header.phtml:27
 msgid "Replication"
 msgstr ""
 
 #: libraries/Menu.class.php:606 libraries/ServerStatusData.class.php:193
-#: libraries/Util.class.php:4321 libraries/config.values.php:105
+#: libraries/Util.class.php:4327 libraries/config.values.php:105
 #: libraries/server_engines.lib.php:108 libraries/server_engines.lib.php:112
 #: libraries/sql_query_form.lib.php:421
 msgid "Variables"
 msgstr ""
 
-#: libraries/Menu.class.php:610 libraries/Util.class.php:4322
+#: libraries/Menu.class.php:610 libraries/Util.class.php:4328
 msgid "Charsets"
 msgstr ""
 
-#: libraries/Menu.class.php:615 libraries/Util.class.php:4323
+#: libraries/Menu.class.php:615 libraries/Util.class.php:4329
 #: libraries/server_common.lib.php:33 libraries/server_plugins.lib.php:27
 msgid "Plugins"
 msgstr ""
 
-#: libraries/Menu.class.php:626 libraries/Util.class.php:4324
+#: libraries/Menu.class.php:626 libraries/Util.class.php:4330
 msgid "Engines"
 msgstr ""
 
@@ -4089,7 +4100,7 @@ msgid_plural "%1$d rows inserted."
 msgstr[0] ""
 msgstr[1] ""
 
-#: libraries/PDF.class.php:70 libraries/Util.class.php:2521
+#: libraries/PDF.class.php:70 libraries/Util.class.php:2527
 #: libraries/browse_foreigners.lib.php:327
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:865
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:890
@@ -4110,7 +4121,7 @@ msgid "Could not save favorite table!"
 msgstr ""
 
 #: libraries/RecentFavoriteTable.class.php:212
-#: templates/structure/favorite_anchor.phtml:12
+#: templates/database/structure/favorite_anchor.phtml:12
 msgid "Remove from Favorites"
 msgstr ""
 
@@ -4275,7 +4286,7 @@ msgid ""
 msgstr ""
 
 #: libraries/StorageEngine.class.php:373
-#: templates/structure/body_for_table_summary.phtml:50
+#: templates/database/structure/body_for_table_summary.phtml:50
 #, php-format
 msgid "%s is the default storage engine on this MySQL server."
 msgstr ""
@@ -4687,10 +4698,10 @@ msgstr ""
 
 #: libraries/Util.class.php:726 libraries/rte/rte_events.lib.php:110
 #: libraries/rte/rte_events.lib.php:119 libraries/rte/rte_events.lib.php:150
-#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:153
-#: libraries/rte/rte_routines.lib.php:162
-#: libraries/rte/rte_routines.lib.php:235
-#: libraries/rte/rte_routines.lib.php:1366
+#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:223
+#: libraries/rte/rte_routines.lib.php:250
+#: libraries/rte/rte_routines.lib.php:372
+#: libraries/rte/rte_routines.lib.php:1457
 #: libraries/rte/rte_triggers.lib.php:86 libraries/rte/rte_triggers.lib.php:95
 #: libraries/rte/rte_triggers.lib.php:127
 msgid "MySQL said: "
@@ -4736,75 +4747,78 @@ msgstr ""
 msgid "%B %d, %Y at %I:%M %p"
 msgstr ""
 
-#: libraries/Util.class.php:2019
+#: libraries/Util.class.php:2025
 #, php-format
 msgid "%s days, %s hours, %s minutes and %s seconds"
 msgstr ""
 
-#: libraries/Util.class.php:2112
+#: libraries/Util.class.php:2118
 msgid "Missing parameter:"
 msgstr ""
 
-#: libraries/Util.class.php:2645
+#: libraries/Util.class.php:2651
 #, php-format
 msgid "Jump to database \"%s\"."
 msgstr ""
 
-#: libraries/Util.class.php:2670
+#: libraries/Util.class.php:2676
 #, php-format
 msgid "The %s functionality is affected by a known bug, see %s"
 msgstr ""
 
-#: libraries/Util.class.php:2881
+#: libraries/Util.class.php:2887
 msgid "Click to toggle"
 msgstr ""
 
-#: libraries/Util.class.php:3542 prefs_manage.php:248
+#: libraries/Util.class.php:3548 prefs_manage.php:248
 msgid "Browse your computer:"
 msgstr ""
 
-#: libraries/Util.class.php:3567
+#: libraries/Util.class.php:3573
 #, php-format
 msgid "Select from the web server upload directory <b>%s</b>:"
 msgstr ""
 
-#: libraries/Util.class.php:3596 libraries/insert_edit.lib.php:1173
+#: libraries/Util.class.php:3602 libraries/insert_edit.lib.php:1171
 msgid "The directory you set for upload work cannot be reached."
 msgstr ""
 
-#: libraries/Util.class.php:3607
+#: libraries/Util.class.php:3613
 msgid "There are no files to upload!"
 msgstr ""
 
-#: libraries/Util.class.php:3632 libraries/Util.class.php:3633
-#: templates/structure/check_all_tables.phtml:15
+#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: templates/database/structure/check_all_tables.phtml:15
 msgid "Empty"
 msgstr ""
 
-#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: libraries/Util.class.php:3644 libraries/Util.class.php:3645
 msgid "Execute"
 msgstr ""
 
-#: libraries/Util.class.php:4152
+#: libraries/Util.class.php:4158
 msgid "Print"
 msgstr ""
 
-#: libraries/Util.class.php:4257 templates/structure/row_stats_table.phtml:80
-#: templates/structure/table_header.phtml:95
+#: libraries/Util.class.php:4263
+#: templates/database/structure/table_header.phtml:95
+#: templates/table/structure/row_stats_table.phtml:80
 msgid "Creation"
 msgstr ""
 
-#: libraries/Util.class.php:4263 templates/structure/row_stats_table.phtml:87
-#: templates/structure/table_header.phtml:106
+#: libraries/Util.class.php:4269
+#: templates/database/structure/table_header.phtml:106
+#: templates/table/structure/row_stats_table.phtml:87
 msgid "Last update"
 msgstr ""
 
-#: libraries/Util.class.php:4269 templates/structure/row_stats_table.phtml:94
-#: templates/structure/table_header.phtml:117
+#: libraries/Util.class.php:4275
+#: templates/database/structure/table_header.phtml:117
+#: templates/table/structure/row_stats_table.phtml:94
 msgid "Last check"
 msgstr ""
 
-#: libraries/Util.class.php:4315
+#: libraries/Util.class.php:4321
 msgid "Users"
 msgstr ""
 
@@ -4825,16 +4839,16 @@ msgid "Use this value"
 msgstr ""
 
 #: libraries/build_html_for_db.lib.php:33 libraries/import.lib.php:193
-#: templates/structure/actions_in_table_structure.phtml:113
-#: templates/structure/row_stats_table.phtml:42
-#: templates/structure/table_header.phtml:36
+#: templates/database/structure/table_header.phtml:36
+#: templates/table/structure/actions_in_table_structure.phtml:113
+#: templates/table/structure/row_stats_table.phtml:42
 msgid "Rows"
 msgstr "ជួរដេក"
 
 #: libraries/build_html_for_db.lib.php:48 libraries/engines/innodb.lib.php:171
-#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:186
-#: libraries/server_status.lib.php:298
-#: templates/structure/display_table_stats.phtml:40
+#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:195
+#: libraries/server_status.lib.php:307
+#: templates/table/structure/display_table_stats.phtml:40
 msgid "Total"
 msgstr ""
 
@@ -4843,10 +4857,12 @@ msgid "Jump to database"
 msgstr ""
 
 #: libraries/build_html_for_db.lib.php:146
+#: templates/database/structure/structure_table_row.phtml:15
 msgid "Not replicated"
 msgstr ""
 
 #: libraries/build_html_for_db.lib.php:158
+#: templates/database/structure/structure_table_row.phtml:16
 msgid "Replicated"
 msgstr ""
 
@@ -4899,17 +4915,17 @@ msgstr ""
 #: libraries/plugins/export/ExportTexytext.class.php:425
 #: libraries/plugins/export/PMA_ExportPdf.class.php:307
 #: libraries/rte/rte_list.lib.php:73 libraries/rte/rte_list.lib.php:85
-#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:830
-#: libraries/rte/rte_routines.lib.php:1492 setup/frames/index.inc.php:162
+#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:921
+#: libraries/rte/rte_routines.lib.php:1583 setup/frames/index.inc.php:162
 #: templates/columns_definitions/table_fields_definitions.phtml:8
-#: templates/structure/table_structure_header.phtml:5
-#: templates/table/create_table.phtml:11
+#: templates/database/create_table.phtml:11
+#: templates/table/structure/table_structure_header.phtml:5
 msgid "Name"
 msgstr ""
 
 #: libraries/central_columns.lib.php:699
 #: libraries/central_columns.lib.php:1381
-#: libraries/rte/rte_routines.lib.php:832
+#: libraries/rte/rte_routines.lib.php:923
 #: templates/columns_definitions/table_fields_definitions.phtml:14
 msgid "Length/Values"
 msgstr ""
@@ -4932,7 +4948,7 @@ msgid "Select a table"
 msgstr "ជ្រើសទាំងអស់"
 
 #: libraries/central_columns.lib.php:804
-#: templates/structure/add_column.phtml:4
+#: templates/table/structure/add_column.phtml:4
 msgid "Add column"
 msgstr ""
 
@@ -4950,7 +4966,7 @@ msgstr ""
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1002
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1025
 #: templates/columns_definitions/table_fields_definitions.phtml:36
-#: templates/structure/table_structure_header.phtml:8
+#: templates/table/structure/table_structure_header.phtml:8
 msgid "Attributes"
 msgstr ""
 
@@ -5059,7 +5075,7 @@ msgid "Double click"
 msgstr ""
 
 #: libraries/config.values.php:95 libraries/config.values.php:124
-#: libraries/config/FormDisplay.tpl.php:221 libraries/relation.lib.php:97
+#: libraries/config/FormDisplay.tpl.php:232 libraries/relation.lib.php:97
 #: libraries/relation.lib.php:105
 msgid "Disabled"
 msgstr ""
@@ -5237,21 +5253,21 @@ msgstr ""
 msgid "maximum %s"
 msgstr ""
 
-#: libraries/config/FormDisplay.tpl.php:219
+#: libraries/config/FormDisplay.tpl.php:230
 msgid "This setting is disabled, it will not be applied to your configuration."
 msgstr ""
 
-#: libraries/config/FormDisplay.tpl.php:313
+#: libraries/config/FormDisplay.tpl.php:324
 #, php-format
 msgid "Set value: %s"
 msgstr ""
 
-#: libraries/config/FormDisplay.tpl.php:318
+#: libraries/config/FormDisplay.tpl.php:329
 #: libraries/config/messages.inc.php:610
 msgid "Restore default value"
 msgstr ""
 
-#: libraries/config/FormDisplay.tpl.php:332
+#: libraries/config/FormDisplay.tpl.php:343
 msgid "Allow users to customize this value"
 msgstr ""
 
@@ -5669,7 +5685,7 @@ msgstr ""
 
 #: libraries/config/messages.inc.php:136 libraries/config/messages.inc.php:152
 #: libraries/sql_query_form.lib.php:247
-#: templates/structure/row_stats_table.phtml:7
+#: templates/table/structure/row_stats_table.phtml:7
 msgid "Format"
 msgstr ""
 
@@ -6166,7 +6182,7 @@ msgstr ""
 
 #: libraries/config/messages.inc.php:332
 #: libraries/plugins/export/ExportPdf.class.php:279
-#: templates/structure/secondary_tabs.phtml:8
+#: templates/table/secondary_tabs.phtml:8
 msgid "Table structure"
 msgstr ""
 
@@ -7670,100 +7686,33 @@ msgstr ""
 msgid "OpenDocument Text"
 msgstr ""
 
-#: libraries/controllers/StructureController.class.php:465
+#: libraries/controllers/DatabaseStructureController.class.php:405
 #: tbl_operations.php:382
 #, php-format
 msgid "Table %s has been emptied."
 msgstr ""
 
-#: libraries/controllers/StructureController.class.php:486
+#: libraries/controllers/DatabaseStructureController.class.php:426
 #: tbl_operations.php:400 view_operations.php:119
 #, php-format
 msgid "View %s has been dropped."
 msgstr ""
 
-#: libraries/controllers/StructureController.class.php:487
+#: libraries/controllers/DatabaseStructureController.class.php:427
 #: tbl_operations.php:401
 #, php-format
 msgid "Table %s has been dropped."
 msgstr ""
 
-#: libraries/controllers/StructureController.class.php:797
-#, php-format
-msgid "The name '%s' is a MySQL reserved keyword."
-msgid_plural "The names '%s' are MySQL reserved keywords."
-msgstr[0] ""
-
-#: libraries/controllers/StructureController.class.php:875
-msgid "No column selected."
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1049
+#: libraries/controllers/DatabaseStructureController.class.php:733
 msgid "Favorite List is full!"
 msgstr "បញ្ជី​ការ​ពេញ​ចិត្ត​គឺ​ពេញ​ហើយ!"
 
-#: libraries/controllers/StructureController.class.php:1272
-msgid "The columns have been moved successfully."
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1535
-#, php-format
-msgid ""
-"Table %1$s has been altered successfully. Privileges have been adjusted."
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1541
-#: libraries/controllers/TableIndexesController.class.php:161
-#: tbl_addfield.php:92
-#, php-format
-msgid "Table %1$s has been altered successfully."
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1588
-#: libraries/tracking.lib.php:1094
-msgid "Query error"
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1806
+#: libraries/controllers/DatabaseStructureController.class.php:947
 #: libraries/mysql_charsets.lib.php:366 libraries/mysql_charsets.lib.php:373
 msgid "unknown"
 msgstr ""
 
-#: libraries/controllers/StructureController.class.php:1957
-#: templates/structure/check_all_table_column.phtml:11
-msgid "Change"
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1961
-#: libraries/controllers/StructureController.class.php:1966
-#: libraries/navigation/Nodes/Node_Index.class.php:30
-#: libraries/tracking.lib.php:926
-#: templates/columns_definitions/column_indexes.phtml:16
-#: templates/columns_definitions/table_fields_definitions.phtml:57
-#: templates/structure/check_all_table_column.phtml:30
-#: templates/structure/display_structure.phtml:79
-#: templates/structure/display_table_stats.phtml:19
-msgid "Index"
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1963
-#: libraries/controllers/StructureController.class.php:1968
-#: templates/columns_definitions/column_indexes.phtml:27
-#: templates/structure/check_all_table_column.phtml:37
-msgid "Spatial"
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1964
-#: libraries/controllers/StructureController.class.php:1969
-#: templates/columns_definitions/column_indexes.phtml:22
-#: templates/structure/check_all_table_column.phtml:47
-msgid "Fulltext"
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1970
-msgid "Distinct values"
-msgstr ""
-
 #: libraries/controllers/TableChartController.class.php:82
 #: libraries/controllers/TableGisVisualizationController.class.php:101
 msgid "No SQL query was set to fetch data."
@@ -7777,11 +7726,18 @@ msgstr ""
 msgid "No data to display"
 msgstr ""
 
-#: libraries/controllers/TableRelationController.class.php:217
+#: libraries/controllers/TableIndexesController.class.php:161
+#: libraries/controllers/TableStructureController.class.php:736
+#: tbl_addfield.php:92
+#, php-format
+msgid "Table %1$s has been altered successfully."
+msgstr ""
+
+#: libraries/controllers/TableRelationController.class.php:218
 msgid "Display column was successfully updated."
 msgstr ""
 
-#: libraries/controllers/TableRelationController.class.php:283
+#: libraries/controllers/TableRelationController.class.php:288
 msgid "Internal relations were successfully updated."
 msgstr ""
 
@@ -7794,10 +7750,70 @@ msgid "Zoom search"
 msgstr ""
 
 #: libraries/controllers/TableSearchController.class.php:852
-#: templates/table/selection_form.phtml:59
+#: templates/table/search/selection_form.phtml:59
 msgid "Find and replace"
 msgstr ""
 
+#: libraries/controllers/TableStructureController.class.php:163
+#, php-format
+msgid "The name '%s' is a MySQL reserved keyword."
+msgid_plural "The names '%s' are MySQL reserved keywords."
+msgstr[0] ""
+
+#: libraries/controllers/TableStructureController.class.php:241
+msgid "No column selected."
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:467
+msgid "The columns have been moved successfully."
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:730
+#, php-format
+msgid ""
+"Table %1$s has been altered successfully. Privileges have been adjusted."
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:783
+#: libraries/tracking.lib.php:1094
+msgid "Query error"
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:948
+#: templates/table/structure/check_all_table_column.phtml:11
+msgid "Change"
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:952
+#: libraries/controllers/TableStructureController.class.php:957
+#: libraries/navigation/Nodes/Node_Index.class.php:30
+#: libraries/tracking.lib.php:926
+#: templates/columns_definitions/column_indexes.phtml:16
+#: templates/columns_definitions/table_fields_definitions.phtml:57
+#: templates/table/structure/check_all_table_column.phtml:30
+#: templates/table/structure/display_structure.phtml:79
+#: templates/table/structure/display_table_stats.phtml:19
+msgid "Index"
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:954
+#: libraries/controllers/TableStructureController.class.php:959
+#: templates/columns_definitions/column_indexes.phtml:27
+#: templates/table/structure/check_all_table_column.phtml:37
+msgid "Spatial"
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:955
+#: libraries/controllers/TableStructureController.class.php:960
+#: templates/columns_definitions/column_indexes.phtml:22
+#: templates/table/structure/check_all_table_column.phtml:47
+msgid "Fulltext"
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:963
+msgid "Distinct values"
+msgstr ""
+
 #: libraries/core.lib.php:306
 #, php-format
 msgid "The %s extension is missing. Please check your PHP configuration."
@@ -7842,7 +7858,7 @@ msgid "No Password"
 msgstr ""
 
 #: libraries/display_change_password.lib.php:68
-#: libraries/plugins/auth/AuthenticationCookie.class.php:199
+#: libraries/plugins/auth/AuthenticationCookie.class.php:187
 #: libraries/replication_gui.lib.php:422 libraries/replication_gui.lib.php:862
 #: libraries/server_privileges.lib.php:1640
 msgid "Password:"
@@ -8580,12 +8596,12 @@ msgid "Dump has been saved to file %s."
 msgstr ""
 
 #: libraries/import.lib.php:202 libraries/insert_edit.lib.php:124
-#: libraries/rte/rte_routines.lib.php:1353 libraries/sql.lib.php:1312
+#: libraries/rte/rte_routines.lib.php:1444 libraries/sql.lib.php:1306
 #: tbl_get_field.php:44
 msgid "MySQL returned an empty result set (i.e. zero rows)."
 msgstr ""
 
-#: libraries/import.lib.php:265 libraries/sql.lib.php:1326
+#: libraries/import.lib.php:265 libraries/sql.lib.php:1320
 msgid "[ROLLBACK occurred.]"
 msgstr ""
 
@@ -8649,14 +8665,14 @@ msgstr ""
 
 #: libraries/insert_edit.lib.php:233
 #: libraries/navigation/Nodes/Node_DatabaseChild.class.php:48
-#: templates/designer/table_list.phtml:40
+#: templates/database/designer/table_list.phtml:40
 msgid "Hide"
 msgstr ""
 
 #: libraries/insert_edit.lib.php:249
 #: libraries/navigation/Nodes/Node_Function.class.php:32
-#: libraries/rte/rte_routines.lib.php:1495
-#: templates/table/table_header.phtml:4
+#: libraries/rte/rte_routines.lib.php:1586
+#: templates/table/search/table_header.phtml:4
 msgid "Function"
 msgstr ""
 
@@ -8669,82 +8685,83 @@ msgstr ""
 msgid "Because of its length,<br /> this column might not be editable."
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1050
+#: libraries/insert_edit.lib.php:1048
 msgid "Binary - do not edit"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1176 libraries/server_privileges.lib.php:470
-#: templates/table/options.phtml:36
+#: libraries/insert_edit.lib.php:1174 libraries/server_privileges.lib.php:470
+#: templates/table/search/options.phtml:36
 msgid "Or"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1177
+#: libraries/insert_edit.lib.php:1175
 msgid "web server upload directory:"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1348 templates/table/input_box.phtml:49
+#: libraries/insert_edit.lib.php:1346
+#: templates/table/search/input_box.phtml:49
 msgid "Edit/Insert"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1398
+#: libraries/insert_edit.lib.php:1396
 #, php-format
 msgid "Continue insertion with %s rows"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1428
+#: libraries/insert_edit.lib.php:1426
 msgid "and then"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1461
+#: libraries/insert_edit.lib.php:1459
 msgid "Insert as new row"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1464
+#: libraries/insert_edit.lib.php:1462
 msgid "Insert as new row and ignore errors"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1467
+#: libraries/insert_edit.lib.php:1465
 msgid "Show insert query"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1487
+#: libraries/insert_edit.lib.php:1485
 msgid "Go back to previous page"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1490
+#: libraries/insert_edit.lib.php:1488
 msgid "Insert another new row"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1495
+#: libraries/insert_edit.lib.php:1493
 msgid "Go back to this page"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1518
+#: libraries/insert_edit.lib.php:1516
 msgid "Edit next row"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1540
+#: libraries/insert_edit.lib.php:1538
 msgid ""
 "Use TAB key to move from value to value, or CTRL+arrows to move anywhere"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1577 libraries/replication_gui.lib.php:542
-#: libraries/rte/rte_routines.lib.php:1497
+#: libraries/insert_edit.lib.php:1575 libraries/replication_gui.lib.php:542
+#: libraries/rte/rte_routines.lib.php:1588
 #: libraries/server_status_variables.lib.php:220
-#: templates/designer/having_query_panel.phtml:100
-#: templates/designer/options_panel.phtml:73
-#: templates/designer/options_panel.phtml:239
-#: templates/designer/where_query_panel.phtml:69
-#: templates/table/table_header.phtml:10
-#: templates/table/zoom_result_form.phtml:35
+#: templates/database/designer/having_query_panel.phtml:100
+#: templates/database/designer/options_panel.phtml:73
+#: templates/database/designer/options_panel.phtml:239
+#: templates/database/designer/where_query_panel.phtml:69
+#: templates/table/search/table_header.phtml:10
+#: templates/table/search/zoom_result_form.phtml:35
 msgid "Value"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1937 libraries/sql.lib.php:1309
+#: libraries/insert_edit.lib.php:1935 libraries/sql.lib.php:1303
 msgid "Showing SQL query"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1962 libraries/sql.lib.php:1287
+#: libraries/insert_edit.lib.php:1960 libraries/sql.lib.php:1281
 #, php-format
 msgid "Inserted row id: %1$d"
 msgstr ""
@@ -9152,7 +9169,7 @@ msgstr ""
 #: libraries/navigation/Nodes/Node_View_Container.class.php:26
 #: libraries/navigation/Nodes/Node_View_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:129
-#: templates/structure/show_create.phtml:30
+#: templates/database/structure/show_create.phtml:30
 msgid "Views"
 msgstr ""
 
@@ -9444,7 +9461,7 @@ msgstr ""
 
 #: libraries/operations.lib.php:101 libraries/operations.lib.php:249
 #: libraries/operations.lib.php:869 libraries/operations.lib.php:963
-#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:907
+#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:998
 #: templates/columns_definitions/table_fields_definitions.phtml:47
 msgid "Adjust Privileges"
 msgstr ""
@@ -9534,22 +9551,22 @@ msgid "Switch to copied table"
 msgstr ""
 
 #: libraries/operations.lib.php:1360
-#: templates/structure/check_all_tables.phtml:18
+#: templates/database/structure/check_all_tables.phtml:18
 msgid "Table maintenance"
 msgstr ""
 
 #: libraries/operations.lib.php:1398
-#: templates/structure/check_all_tables.phtml:19
+#: templates/database/structure/check_all_tables.phtml:19
 msgid "Analyze table"
 msgstr ""
 
 #: libraries/operations.lib.php:1413
-#: templates/structure/check_all_tables.phtml:20
+#: templates/database/structure/check_all_tables.phtml:20
 msgid "Check table"
 msgstr ""
 
 #: libraries/operations.lib.php:1428
-#: templates/structure/check_all_tables.phtml:22
+#: templates/database/structure/check_all_tables.phtml:22
 #, fuzzy
 #| msgid "Track table"
 msgid "Checksum table"
@@ -9569,18 +9586,19 @@ msgid "Flush the table (FLUSH)"
 msgstr ""
 
 #: libraries/operations.lib.php:1477
-#: templates/structure/check_all_tables.phtml:23
-#: templates/structure/display_table_stats.phtml:56
+#: templates/database/structure/check_all_tables.phtml:23
+#: templates/table/structure/display_table_stats.phtml:56
 msgid "Optimize table"
 msgstr ""
 
 #: libraries/operations.lib.php:1492
-#: templates/structure/check_all_tables.phtml:24
+#: templates/database/structure/check_all_tables.phtml:24
 msgid "Repair table"
 msgstr ""
 
 #: libraries/operations.lib.php:1538
-#: templates/structure/check_all_tables.phtml:14 view_operations.php:127
+#: templates/database/structure/check_all_tables.phtml:14
+#: view_operations.php:127
 msgid "Delete data or table"
 msgstr ""
 
@@ -9703,7 +9721,7 @@ msgid "Cannot connect: invalid settings."
 msgstr ""
 
 #: libraries/plugins/auth/AuthenticationConfig.class.php:108
-#: libraries/plugins/auth/AuthenticationCookie.class.php:134
+#: libraries/plugins/auth/AuthenticationCookie.class.php:122
 #: libraries/plugins/auth/AuthenticationHttp.class.php:96
 #, php-format
 msgid "Welcome to %s"
@@ -9728,36 +9746,36 @@ msgstr ""
 msgid "Retry to connect"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:146
+#: libraries/plugins/auth/AuthenticationCookie.class.php:134
 msgid "Your session has expired. Please log in again."
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:170
+#: libraries/plugins/auth/AuthenticationCookie.class.php:158
 msgid "Log in"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:178
-#: libraries/plugins/auth/AuthenticationCookie.class.php:188
+#: libraries/plugins/auth/AuthenticationCookie.class.php:166
+#: libraries/plugins/auth/AuthenticationCookie.class.php:176
 msgid "You can enter hostname/IP address and port separated by space."
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:193
+#: libraries/plugins/auth/AuthenticationCookie.class.php:181
 msgid "Username:"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:205
+#: libraries/plugins/auth/AuthenticationCookie.class.php:193
 msgid "Server Choice:"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:386
+#: libraries/plugins/auth/AuthenticationCookie.class.php:374
 msgid "Entered captcha is wrong, try again!"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:396
+#: libraries/plugins/auth/AuthenticationCookie.class.php:384
 msgid "Please enter correct captcha!"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:423
+#: libraries/plugins/auth/AuthenticationCookie.class.php:411
 msgid "You are not allowed to log in to this MySQL server!"
 msgstr ""
 
@@ -9853,7 +9871,7 @@ msgstr ""
 #: libraries/plugins/export/ExportOdt.class.php:593
 #: libraries/plugins/export/ExportTexytext.class.php:428
 #: libraries/plugins/export/PMA_ExportPdf.class.php:313
-#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:984
 #: libraries/rte/rte_triggers.lib.php:377
 msgid "Definition"
 msgstr ""
@@ -10150,7 +10168,7 @@ msgid "Last check:"
 msgstr "ពិនិត្យចុងក្រោយ៖"
 
 #: libraries/plugins/export/ExportSql.class.php:1399
-#: templates/structure/structure_table_row.phtml:183
+#: templates/database/structure/structure_table_row.phtml:183
 msgid "in use"
 msgstr "កំពុង​ប្រើ"
 
@@ -10330,18 +10348,14 @@ msgstr ""
 msgid "The imported file does not contain any data!"
 msgstr ""
 
-#: libraries/plugins/import/ImportSql.class.php:169
+#: libraries/plugins/import/ImportSql.class.php:72
 msgid "SQL compatibility mode:"
 msgstr ""
 
-#: libraries/plugins/import/ImportSql.class.php:181
+#: libraries/plugins/import/ImportSql.class.php:84
 msgid "Do not use <code>AUTO_INCREMENT</code> for zero values"
 msgstr ""
 
-#: libraries/plugins/import/ImportSql.class.php:195
-msgid "Read as multibytes"
-msgstr ""
-
 #: libraries/plugins/import/ImportXml.class.php:54
 msgid "XML"
 msgstr ""
@@ -10384,7 +10398,7 @@ msgid "Show grid"
 msgstr ""
 
 #: libraries/plugins/schema/SchemaPdf.class.php:94
-#: templates/structure/print_view_data_dictionary_link.phtml:6
+#: templates/database/structure/print_view_data_dictionary_link.phtml:6
 msgid "Data Dictionary"
 msgstr ""
 
@@ -10409,7 +10423,7 @@ msgid "The %s table doesn't exist!"
 msgstr ""
 
 #: libraries/plugins/schema/eps/Eps_Relation_Schema.class.php:321
-#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:309
+#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:323
 #, php-format
 msgid "Schema of the %s database - Page %s"
 msgstr ""
@@ -10438,7 +10452,7 @@ msgstr ""
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1005
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1028
 #: libraries/tracking.lib.php:884
-#: templates/structure/table_structure_header.phtml:11
+#: templates/table/structure/table_structure_header.phtml:11
 msgid "Extra"
 msgstr ""
 
@@ -10755,51 +10769,51 @@ msgstr ""
 msgid "Create the needed tables with the <code>%screate_tables.sql</code>."
 msgstr ""
 
-#: libraries/relation.lib.php:360
+#: libraries/relation.lib.php:357
 msgid "Create a pma user and give access to these tables."
 msgstr ""
 
-#: libraries/relation.lib.php:365
+#: libraries/relation.lib.php:360
 msgid ""
 "Enable advanced features in configuration file (<code>config.inc.php</"
 "code>), for example by starting from <code>config.sample.inc.php</code>."
 msgstr ""
 
-#: libraries/relation.lib.php:373
+#: libraries/relation.lib.php:365
 msgid "Re-login to phpMyAdmin to load the updated configuration file."
 msgstr ""
 
-#: libraries/relation.lib.php:1612
+#: libraries/relation.lib.php:1607
 msgid "no description"
 msgstr ""
 
-#: libraries/relation.lib.php:1811
+#: libraries/relation.lib.php:1806
 msgid ""
 "You do not have necessary privileges to create a database named "
 "'phpmyadmin'. You may go to 'Operations' tab of any database to set up the "
 "phpMyAdmin configuration storage there."
 msgstr ""
 
-#: libraries/relation.lib.php:1928
+#: libraries/relation.lib.php:1923
 #, php-format
 msgid ""
 "%sCreate%s a database named 'phpmyadmin' and setup the phpMyAdmin "
 "configuration storage there."
 msgstr ""
 
-#: libraries/relation.lib.php:1936
+#: libraries/relation.lib.php:1931
 #, php-format
 msgid ""
 "%sCreate%s the phpMyAdmin configuration storage in the current database."
 msgstr ""
 
-#: libraries/relation.lib.php:1944
+#: libraries/relation.lib.php:1939
 #, php-format
 msgid "%sCreate%s missing phpMyAdmin configuration storage tables."
 msgstr ""
 
 #: libraries/replication_gui.lib.php:46 libraries/replication_gui.lib.php:343
-#: libraries/server_databases.lib.php:387
+#: libraries/server_databases.lib.php:398
 msgid "Master replication"
 msgstr ""
 
@@ -10854,7 +10868,7 @@ msgid ""
 msgstr ""
 
 #: libraries/replication_gui.lib.php:141
-#: libraries/server_databases.lib.php:389
+#: libraries/server_databases.lib.php:400
 msgid "Slave replication"
 msgstr ""
 
@@ -11117,10 +11131,10 @@ msgid "Master server changed successfully to %s."
 msgstr ""
 
 #: libraries/rte/rte_events.lib.php:106 libraries/rte/rte_events.lib.php:115
-#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:149
-#: libraries/rte/rte_routines.lib.php:158
-#: libraries/rte/rte_routines.lib.php:231
-#: libraries/rte/rte_routines.lib.php:1362
+#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:219
+#: libraries/rte/rte_routines.lib.php:246
+#: libraries/rte/rte_routines.lib.php:368
+#: libraries/rte/rte_routines.lib.php:1453
 #: libraries/rte/rte_triggers.lib.php:82 libraries/rte/rte_triggers.lib.php:91
 #: libraries/rte/rte_triggers.lib.php:123
 #, php-format
@@ -11141,7 +11155,7 @@ msgstr ""
 msgid "Event %1$s has been created."
 msgstr ""
 
-#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:251
+#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:266
 #: libraries/rte/rte_triggers.lib.php:144
 msgid "One or more errors have occurred while processing your request:"
 msgstr ""
@@ -11150,7 +11164,7 @@ msgstr ""
 msgid "Edit event"
 msgstr ""
 
-#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:794
+#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:885
 #: libraries/rte/rte_triggers.lib.php:323 view_create.php:180
 msgid "Details"
 msgstr ""
@@ -11163,7 +11177,7 @@ msgstr ""
 msgid "Event type"
 msgstr ""
 
-#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:817
+#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:908
 #, php-format
 msgid "Change to %s"
 msgstr ""
@@ -11190,12 +11204,14 @@ msgstr ""
 msgid "On completion preserve"
 msgstr ""
 
-#: libraries/rte/rte_events.lib.php:491 libraries/rte/rte_routines.lib.php:930
+#: libraries/rte/rte_events.lib.php:491
+#: libraries/rte/rte_routines.lib.php:1021
 #: libraries/rte/rte_triggers.lib.php:383 view_create.php:209
 msgid "Definer"
 msgstr ""
 
-#: libraries/rte/rte_events.lib.php:535 libraries/rte/rte_routines.lib.php:997
+#: libraries/rte/rte_events.lib.php:535
+#: libraries/rte/rte_routines.lib.php:1088
 #: libraries/rte/rte_triggers.lib.php:422
 msgid "The definer must be in the \"username@hostname\" format!"
 msgstr ""
@@ -11221,9 +11237,9 @@ msgid "You must provide an event definition."
 msgstr ""
 
 #: libraries/rte/rte_export.lib.php:43 libraries/rte/rte_general.lib.php:72
-#: libraries/rte/rte_routines.lib.php:345
-#: libraries/rte/rte_routines.lib.php:1198
-#: libraries/rte/rte_routines.lib.php:1411
+#: libraries/rte/rte_routines.lib.php:153
+#: libraries/rte/rte_routines.lib.php:1289
+#: libraries/rte/rte_routines.lib.php:1502
 msgid "Error in processing request:"
 msgstr ""
 
@@ -11255,131 +11271,131 @@ msgid ""
 "problems."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:110
-#: libraries/rte/rte_routines.lib.php:1006
+#: libraries/rte/rte_routines.lib.php:123
+msgid "Edit routine"
+msgstr ""
+
+#: libraries/rte/rte_routines.lib.php:200
+#: libraries/rte/rte_routines.lib.php:1097
 #, php-format
 msgid "Invalid routine type: \"%s\""
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:170
-msgid "Sorry, we failed to restore the dropped routine."
-msgstr ""
-
-#: libraries/rte/rte_routines.lib.php:211
-#, php-format
-msgid "Routine %1$s has been modified. Privileges have been adjusted."
-msgstr ""
-
-#: libraries/rte/rte_routines.lib.php:216
-#, php-format
-msgid "Routine %1$s has been modified."
-msgstr ""
-
-#: libraries/rte/rte_routines.lib.php:238
+#: libraries/rte/rte_routines.lib.php:253
 #, php-format
 msgid "Routine %1$s has been created."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:315
-msgid "Edit routine"
+#: libraries/rte/rte_routines.lib.php:380
+msgid "Sorry, we failed to restore the dropped routine."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:797
+#: libraries/rte/rte_routines.lib.php:439
+#, php-format
+msgid "Routine %1$s has been modified. Privileges have been adjusted."
+msgstr ""
+
+#: libraries/rte/rte_routines.lib.php:444
+#, php-format
+msgid "Routine %1$s has been modified."
+msgstr ""
+
+#: libraries/rte/rte_routines.lib.php:888
 msgid "Routine name"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:823
+#: libraries/rte/rte_routines.lib.php:914
 msgid "Parameters"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:829
+#: libraries/rte/rte_routines.lib.php:920
 msgid "Direction"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:847
+#: libraries/rte/rte_routines.lib.php:938
 msgid "Add parameter"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:851
+#: libraries/rte/rte_routines.lib.php:942
 msgid "Remove last parameter"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:856
+#: libraries/rte/rte_routines.lib.php:947
 msgid "Return type"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:862
+#: libraries/rte/rte_routines.lib.php:953
 msgid "Return length/values"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:868
+#: libraries/rte/rte_routines.lib.php:959
 msgid "Return options"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:899
+#: libraries/rte/rte_routines.lib.php:990
 msgid "Is deterministic"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:920
+#: libraries/rte/rte_routines.lib.php:1011
 msgid ""
 "You do not have sufficient privileges to perform this operation; Please "
 "refer to the documentation for more details"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:935
+#: libraries/rte/rte_routines.lib.php:1026
 msgid "Security type"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:944
+#: libraries/rte/rte_routines.lib.php:1035
 msgid "SQL data access"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1013
+#: libraries/rte/rte_routines.lib.php:1104
 msgid "You must provide a routine name!"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1047
+#: libraries/rte/rte_routines.lib.php:1138
 #, php-format
 msgid "Invalid direction \"%s\" given for parameter."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1069
-#: libraries/rte/rte_routines.lib.php:1131
+#: libraries/rte/rte_routines.lib.php:1160
+#: libraries/rte/rte_routines.lib.php:1222
 msgid ""
 "You must provide length/values for routine parameters of type ENUM, SET, "
 "VARCHAR and VARBINARY."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1095
+#: libraries/rte/rte_routines.lib.php:1186
 msgid "You must provide a name and a type for each routine parameter."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1114
+#: libraries/rte/rte_routines.lib.php:1205
 msgid "You must provide a valid return type for the routine."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1174
+#: libraries/rte/rte_routines.lib.php:1265
 msgid "You must provide a routine definition."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1285
+#: libraries/rte/rte_routines.lib.php:1376
 #, php-format
 msgid "Execution results of routine %s"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1340
+#: libraries/rte/rte_routines.lib.php:1431
 #, php-format
 msgid "%d row affected by the last statement inside the procedure."
 msgid_plural "%d rows affected by the last statement inside the procedure."
 msgstr[0] ""
 
-#: libraries/rte/rte_routines.lib.php:1398
-#: libraries/rte/rte_routines.lib.php:1406
+#: libraries/rte/rte_routines.lib.php:1489
+#: libraries/rte/rte_routines.lib.php:1497
 msgid "Execute routine"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1485
-#: libraries/rte/rte_routines.lib.php:1488
+#: libraries/rte/rte_routines.lib.php:1576
+#: libraries/rte/rte_routines.lib.php:1579
 msgid "Routine parameters"
 msgstr ""
 
@@ -11533,7 +11549,7 @@ msgid "Original position"
 msgstr ""
 
 #: libraries/server_bin_log.lib.php:133
-#: templates/structure/display_table_stats.phtml:4
+#: templates/table/structure/display_table_stats.phtml:4
 msgid "Information"
 msgstr ""
 
@@ -11569,12 +11585,12 @@ msgid ""
 "between the web server and the MySQL server."
 msgstr ""
 
-#: libraries/server_databases.lib.php:364
-#: libraries/server_databases.lib.php:365
+#: libraries/server_databases.lib.php:366
+#: libraries/server_databases.lib.php:371
 msgid "Enable Statistics"
 msgstr ""
 
-#: libraries/server_databases.lib.php:481
+#: libraries/server_databases.lib.php:492
 #, php-format
 msgid "%1$d database has been dropped successfully."
 msgid_plural "%1$d databases have been dropped successfully."
@@ -11930,7 +11946,7 @@ msgid "You have revoked the privileges for %s."
 msgstr ""
 
 #: libraries/server_privileges.lib.php:2059
-#: libraries/server_privileges.lib.php:4290
+#: libraries/server_privileges.lib.php:4316
 msgid "Add user account"
 msgstr ""
 
@@ -12097,53 +12113,53 @@ msgstr ""
 msgid "The privileges were reloaded successfully."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:3994
+#: libraries/server_privileges.lib.php:4003
 #, php-format
 msgid "The user %s already exists!"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4232
+#: libraries/server_privileges.lib.php:4258
 #, php-format
 msgid "Privileges for %s"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4241
+#: libraries/server_privileges.lib.php:4267
 #: libraries/server_status_processes.lib.php:72
 #: libraries/server_user_groups.lib.php:39
 msgid "User"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4282
+#: libraries/server_privileges.lib.php:4308
 msgctxt "Create new user"
 msgid "New"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4311
+#: libraries/server_privileges.lib.php:4337
 msgid "Edit privileges:"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4312
+#: libraries/server_privileges.lib.php:4338
 msgid "User account"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4371
+#: libraries/server_privileges.lib.php:4397
 msgid ""
 "Note: You are attempting to edit privileges of the user with which you are "
 "currently logged in."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4391 libraries/server_users.lib.php:25
+#: libraries/server_privileges.lib.php:4417 libraries/server_users.lib.php:25
 msgid "User accounts overview"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4459
+#: libraries/server_privileges.lib.php:4485
 msgid ""
 "A user account allowing any user from localhost to connect is present. This "
 "will prevent other users from connecting if the host part of their account "
 "allows a connection from any (%) host."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4500
+#: libraries/server_privileges.lib.php:4526
 #, php-format
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
@@ -12152,7 +12168,7 @@ msgid ""
 "%sreload the privileges%s before you continue."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4519
+#: libraries/server_privileges.lib.php:4545
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
 "tables. The content of these tables may differ from the privileges the "
@@ -12161,63 +12177,63 @@ msgid ""
 "privilege."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4569
+#: libraries/server_privileges.lib.php:4595
 msgid "The selected user was not found in the privilege table."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4801
+#: libraries/server_privileges.lib.php:4827
 msgid "You have added a new user."
 msgstr ""
 
-#: libraries/server_status.lib.php:53
+#: libraries/server_status.lib.php:60
 #, php-format
 msgid "Network traffic since startup: %s"
 msgstr ""
 
-#: libraries/server_status.lib.php:66
+#: libraries/server_status.lib.php:73
 #, php-format
 msgid "This MySQL server has been running for %1$s. It started up on %2$s."
 msgstr ""
 
-#: libraries/server_status.lib.php:80
+#: libraries/server_status.lib.php:94
 msgid ""
 "This MySQL server works as <b>master</b> and <b>slave</b> in <b>replication</"
 "b> process."
 msgstr ""
 
-#: libraries/server_status.lib.php:85
+#: libraries/server_status.lib.php:99
 msgid "This MySQL server works as <b>master</b> in <b>replication</b> process."
 msgstr ""
 
-#: libraries/server_status.lib.php:90
+#: libraries/server_status.lib.php:104
 msgid "This MySQL server works as <b>slave</b> in <b>replication</b> process."
 msgstr ""
 
-#: libraries/server_status.lib.php:106
+#: libraries/server_status.lib.php:116
 msgid "Replication status"
 msgstr ""
 
-#: libraries/server_status.lib.php:137
+#: libraries/server_status.lib.php:146
 msgid ""
 "On a busy server, the byte counters may overrun, so those statistics as "
 "reported by the MySQL server may be incorrect."
 msgstr ""
 
-#: libraries/server_status.lib.php:148
+#: libraries/server_status.lib.php:157
 msgid "Received"
 msgstr ""
 
-#: libraries/server_status.lib.php:167
+#: libraries/server_status.lib.php:176
 msgid "Sent"
 msgstr ""
 
-#: libraries/server_status.lib.php:234
+#: libraries/server_status.lib.php:243
 #, fuzzy
 #| msgid "Connections"
 msgid "Max. concurrent connections"
 msgstr "ការ​តភ្ជាប់"
 
-#: libraries/server_status.lib.php:244
+#: libraries/server_status.lib.php:253
 msgid "Failed attempts"
 msgstr ""
 
@@ -13139,7 +13155,7 @@ msgstr ""
 msgid "Not implemented yet."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/AlterOperation.php:193
+#: libraries/sql-parser/src/Components/AlterOperation.php:191
 msgid "Unrecognized alter operation."
 msgstr ""
 
@@ -13153,7 +13169,7 @@ msgid "An opening bracket followed by a set of values was expected."
 msgstr ""
 
 #: libraries/sql-parser/src/Components/ArrayObj.php:101
-#: libraries/sql-parser/src/Components/FieldDefinition.php:202
+#: libraries/sql-parser/src/Components/CreateDefinition.php:202
 msgid "An opening bracket was expected."
 msgstr ""
 
@@ -13161,25 +13177,35 @@ msgstr ""
 msgid "A comma or a closing bracket was expected"
 msgstr ""
 
+#: libraries/sql-parser/src/Components/CreateDefinition.php:246
+#, fuzzy
+#| msgid "No databases selected."
+msgid "A comma or a closing bracket was expected."
+msgstr "មិន​បាន​ជ្រើស​មូលដ្ឋាន​ទិន្នន័យ។"
+
+#: libraries/sql-parser/src/Components/CreateDefinition.php:262
+msgid "A closing bracket was expected."
+msgstr ""
+
 #: libraries/sql-parser/src/Components/DataType.php:125
 msgid "Unrecognized data type."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:225
+#: libraries/sql-parser/src/Components/Expression.php:227
 msgid "Unexpected closing bracket."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:246
-#: libraries/sql-parser/src/Components/Expression.php:283
-#: libraries/sql-parser/src/Components/Expression.php:303
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:285
+#: libraries/sql-parser/src/Components/Expression.php:305
 msgid "An alias was previously found."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:257
+#: libraries/sql-parser/src/Components/Expression.php:259
 msgid "Unexpected dot."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:327
+#: libraries/sql-parser/src/Components/Expression.php:329
 #, fuzzy
 #| msgid "No databases selected."
 msgid "An alias was expected."
@@ -13191,16 +13217,6 @@ msgstr "មិន​បាន​ជ្រើស​មូលដ្ឋាន​ទ
 msgid "An expression was expected."
 msgstr "មិន​បាន​ជ្រើស​មូលដ្ឋាន​ទិន្នន័យ។"
 
-#: libraries/sql-parser/src/Components/FieldDefinition.php:246
-#, fuzzy
-#| msgid "No databases selected."
-msgid "A comma or a closing bracket was expected."
-msgstr "មិន​បាន​ជ្រើស​មូលដ្ឋាន​ទិន្នន័យ។"
-
-#: libraries/sql-parser/src/Components/FieldDefinition.php:262
-msgid "A closing bracket was expected."
-msgstr ""
-
 #: libraries/sql-parser/src/Components/Limit.php:90
 #: libraries/sql-parser/src/Components/Limit.php:112
 msgid "An offset was expected."
@@ -13242,24 +13258,24 @@ msgstr ""
 msgid "Expected delimiter."
 msgstr ""
 
-#: libraries/sql-parser/src/Lexer.php:753
+#: libraries/sql-parser/src/Lexer.php:777
 #, php-format
 msgid "Ending quote %1$s was expected."
 msgstr ""
 
-#: libraries/sql-parser/src/Lexer.php:789
+#: libraries/sql-parser/src/Lexer.php:813
 msgid "Variable name was expected."
 msgstr ""
 
-#: libraries/sql-parser/src/Parser.php:380
+#: libraries/sql-parser/src/Parser.php:391
 msgid "Unexpected beginning of statement."
 msgstr ""
 
-#: libraries/sql-parser/src/Parser.php:399
+#: libraries/sql-parser/src/Parser.php:410
 msgid "Unrecognized statement type."
 msgstr ""
 
-#: libraries/sql-parser/src/Parser.php:479
+#: libraries/sql-parser/src/Parser.php:489
 msgid "No transaction was previously started."
 msgstr ""
 
@@ -13285,8 +13301,10 @@ msgid "The name of the entity was expected."
 msgstr ""
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:310
-msgid "At least one field definition was expected."
-msgstr ""
+#, fuzzy
+#| msgid "The bookmark has been deleted."
+msgid "At least one column definition was expected."
+msgstr "បាន​លុប​ចំណាំ។"
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:329
 msgid "A \"RETURNS\" keyword was expected."
@@ -13345,25 +13363,25 @@ msgstr ""
 msgid "Using bookmark \"%s\" as default browse query."
 msgstr ""
 
-#: libraries/sql.lib.php:1306
+#: libraries/sql.lib.php:1300
 msgid "Showing as PHP code"
 msgstr ""
 
-#: libraries/sql.lib.php:1638
+#: libraries/sql.lib.php:1632
 #, php-format
 msgid ""
 "Current selection does not contain a unique column. Grid edit, checkbox, "
 "Edit, Copy and Delete features are not available. %s"
 msgstr ""
 
-#: libraries/sql.lib.php:1649
+#: libraries/sql.lib.php:1643
 #, php-format
 msgid ""
 "Current selection does not contain a unique column. Grid edit, Edit, Copy "
 "and Delete features may result in undesired behavior. %s"
 msgstr ""
 
-#: libraries/sql.lib.php:1688
+#: libraries/sql.lib.php:1682
 #, php-format
 msgid "Problems with indexes of table `%s`"
 msgstr ""
@@ -13524,7 +13542,7 @@ msgid "Version %s snapshot (SQL code)"
 msgstr ""
 
 #: libraries/tracking.lib.php:947
-#: templates/structure/table_structure_row.phtml:33
+#: templates/table/structure/table_structure_row.phtml:33
 msgctxt "None for default"
 msgid "None"
 msgstr ""
@@ -13576,15 +13594,15 @@ msgstr ""
 msgid "Version %1$s was created, tracking for %2$s is active."
 msgstr ""
 
-#: libraries/user_preferences.inc.php:29
+#: libraries/user_preferences.inc.php:30
 msgid "Manage your settings"
 msgstr ""
 
-#: libraries/user_preferences.inc.php:46 prefs_manage.php:307
+#: libraries/user_preferences.inc.php:54 prefs_manage.php:307
 msgid "Configuration has been saved."
 msgstr ""
 
-#: libraries/user_preferences.inc.php:66
+#: libraries/user_preferences.inc.php:74
 #, php-format
 msgid ""
 "Your preferences will be saved for current session only. Storing them "
@@ -13962,7 +13980,7 @@ msgid "first"
 msgstr ""
 
 #: templates/columns_definitions/move_column.phtml:12
-#: templates/structure/add_column.phtml:21
+#: templates/table/structure/add_column.phtml:21
 #, php-format
 msgid "after %s"
 msgstr ""
@@ -14023,201 +14041,297 @@ msgstr "ព័ត៌មាន​អំពី​កំណែ៖"
 msgid "Input transformation options"
 msgstr ""
 
-#: templates/designer/aggregate_query_panel.phtml:22
-#: templates/designer/options_panel.phtml:100
+#: templates/database/create_table.phtml:7
+#: templates/database/designer/side_menu.phtml:77
+#: templates/database/designer/side_menu.phtml:80
+msgid "Create table"
+msgstr ""
+
+#: templates/database/create_table.phtml:15
+msgid "Number of columns"
+msgstr ""
+
+#: templates/database/designer/aggregate_query_panel.phtml:22
+#: templates/database/designer/options_panel.phtml:100
 msgid "Aggregate"
 msgstr ""
 
-#: templates/designer/aggregate_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:61
-#: templates/designer/options_panel.phtml:106
-#: templates/designer/options_panel.phtml:170
-#: templates/designer/where_query_panel.phtml:30
-#: templates/table/table_header.phtml:9
+#: templates/database/designer/aggregate_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:61
+#: templates/database/designer/options_panel.phtml:106
+#: templates/database/designer/options_panel.phtml:170
+#: templates/database/designer/where_query_panel.phtml:30
+#: templates/table/search/table_header.phtml:9
 msgid "Operator"
 msgstr ""
 
-#: templates/designer/database_tables.phtml:29
+#: templates/database/designer/database_tables.phtml:29
 msgid "Toggle"
 msgstr ""
 
-#: templates/designer/database_tables.phtml:40
+#: templates/database/designer/database_tables.phtml:40
 msgid "See table structure"
 msgstr ""
 
-#: templates/designer/delete_relation_panel.phtml:21
+#: templates/database/designer/delete_relation_panel.phtml:21
 msgid "Delete relation"
 msgstr ""
 
-#: templates/designer/edit_delete_pages.phtml:7
+#: templates/database/designer/edit_delete_pages.phtml:7
 msgid "Page to open"
 msgstr ""
 
-#: templates/designer/edit_delete_pages.phtml:7
+#: templates/database/designer/edit_delete_pages.phtml:7
 msgid "Page to delete"
 msgstr ""
 
-#: templates/designer/having_query_panel.phtml:90
-#: templates/designer/options_panel.phtml:63
-#: templates/designer/options_panel.phtml:229
-#: templates/designer/where_query_panel.phtml:59
+#: templates/database/designer/having_query_panel.phtml:90
+#: templates/database/designer/options_panel.phtml:63
+#: templates/database/designer/options_panel.phtml:229
+#: templates/database/designer/where_query_panel.phtml:59
 msgid "Except"
 msgstr ""
 
-#: templates/designer/having_query_panel.phtml:102
-#: templates/designer/options_panel.phtml:75
-#: templates/designer/options_panel.phtml:241
-#: templates/designer/where_query_panel.phtml:71
+#: templates/database/designer/having_query_panel.phtml:102
+#: templates/database/designer/options_panel.phtml:75
+#: templates/database/designer/options_panel.phtml:241
+#: templates/database/designer/where_query_panel.phtml:71
 msgid "subquery"
 msgstr ""
 
-#: templates/designer/new_relation_panel.phtml:22
-#: templates/designer/side_menu.phtml:84 templates/designer/side_menu.phtml:87
+#: templates/database/designer/new_relation_panel.phtml:22
+#: templates/database/designer/side_menu.phtml:84
+#: templates/database/designer/side_menu.phtml:87
 msgid "Create relation"
 msgstr ""
 
-#: templates/designer/options_panel.phtml:34
-#: templates/designer/options_panel.phtml:200
+#: templates/database/designer/options_panel.phtml:34
+#: templates/database/designer/options_panel.phtml:200
 msgid "Relation operator"
 msgstr ""
 
-#: templates/designer/options_panel.phtml:85
-#: templates/designer/rename_to_panel.phtml:23
+#: templates/database/designer/options_panel.phtml:85
+#: templates/database/designer/rename_to_panel.phtml:23
 msgid "Rename to"
 msgstr ""
 
-#: templates/designer/options_panel.phtml:91
-#: templates/designer/rename_to_panel.phtml:31
+#: templates/database/designer/options_panel.phtml:91
+#: templates/database/designer/rename_to_panel.phtml:31
 msgid "New name"
 msgstr ""
 
-#: templates/designer/page_save_as.phtml:4
+#: templates/database/designer/page_save_as.phtml:4
 msgid "Save to selected page"
 msgstr ""
 
-#: templates/designer/page_save_as.phtml:5
+#: templates/database/designer/page_save_as.phtml:5
 msgid "Create a page and save to it"
 msgstr ""
 
-#: templates/designer/page_save_as.phtml:26
+#: templates/database/designer/page_save_as.phtml:26
 msgid "New page name"
 msgstr ""
 
-#: templates/designer/page_selector.phtml:2
+#: templates/database/designer/page_selector.phtml:2
 msgid "Select page"
 msgstr ""
 
-#: templates/designer/query_details.phtml:10
+#: templates/database/designer/query_details.phtml:10
 msgid "Active options"
 msgstr ""
 
-#: templates/designer/schema_export.phtml:4
+#: templates/database/designer/schema_export.phtml:4
 msgid "Select Export Relational Type"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:19 templates/designer/side_menu.phtml:25
+#: templates/database/designer/side_menu.phtml:19
+#: templates/database/designer/side_menu.phtml:25
 msgid "Show/Hide tables list"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:29 templates/designer/side_menu.phtml:35
-#: templates/designer/side_menu.phtml:36
+#: templates/database/designer/side_menu.phtml:29
+#: templates/database/designer/side_menu.phtml:35
+#: templates/database/designer/side_menu.phtml:36
 msgid "View in fullscreen"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:34
+#: templates/database/designer/side_menu.phtml:34
 msgid "Exit fullscreen"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:41 templates/designer/side_menu.phtml:45
+#: templates/database/designer/side_menu.phtml:41
+#: templates/database/designer/side_menu.phtml:45
 #, fuzzy
 #| msgid "Reload page"
 msgid "New page"
 msgstr "ផ្ទុក​ទំព័រ​ឡើង​វិញ"
 
-#: templates/designer/side_menu.phtml:70 templates/designer/side_menu.phtml:73
+#: templates/database/designer/side_menu.phtml:70
+#: templates/database/designer/side_menu.phtml:73
 #, fuzzy
 #| msgid "Reload page"
 msgid "Delete pages"
 msgstr "ផ្ទុក​ទំព័រ​ឡើង​វិញ"
 
-#: templates/designer/side_menu.phtml:77 templates/designer/side_menu.phtml:80
-#: templates/table/create_table.phtml:7
-msgid "Create table"
-msgstr ""
-
-#: templates/designer/side_menu.phtml:98
-#: templates/designer/side_menu.phtml:101
+#: templates/database/designer/side_menu.phtml:98
+#: templates/database/designer/side_menu.phtml:101
 msgid "Reload"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:107
-#: templates/designer/side_menu.phtml:110
+#: templates/database/designer/side_menu.phtml:107
+#: templates/database/designer/side_menu.phtml:110
 msgid "Help"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Angular links"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Direct links"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:122
-#: templates/designer/side_menu.phtml:124
+#: templates/database/designer/side_menu.phtml:122
+#: templates/database/designer/side_menu.phtml:124
 msgid "Snap to grid"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:128
-#: templates/designer/side_menu.phtml:134
+#: templates/database/designer/side_menu.phtml:128
+#: templates/database/designer/side_menu.phtml:134
 msgid "Small/Big All"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:138
-#: templates/designer/side_menu.phtml:141
+#: templates/database/designer/side_menu.phtml:138
+#: templates/database/designer/side_menu.phtml:141
 msgid "Toggle small/big"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:145
-#: templates/designer/side_menu.phtml:148
+#: templates/database/designer/side_menu.phtml:145
+#: templates/database/designer/side_menu.phtml:148
 msgid "Toggle relation lines"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:153
-#: templates/designer/side_menu.phtml:156
+#: templates/database/designer/side_menu.phtml:153
+#: templates/database/designer/side_menu.phtml:156
 msgid "Export schema"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:165
-#: templates/designer/side_menu.phtml:168
+#: templates/database/designer/side_menu.phtml:165
+#: templates/database/designer/side_menu.phtml:168
 msgid "Build Query"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:173
-#: templates/designer/side_menu.phtml:177
+#: templates/database/designer/side_menu.phtml:173
+#: templates/database/designer/side_menu.phtml:177
 msgid "Move Menu"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:181
-#: templates/designer/side_menu.phtml:186
+#: templates/database/designer/side_menu.phtml:181
+#: templates/database/designer/side_menu.phtml:186
 msgid "Pin text"
 msgstr ""
 
-#: templates/designer/table_list.phtml:4
+#: templates/database/designer/table_list.phtml:4
 msgid "Hide/Show all"
 msgstr ""
 
-#: templates/designer/table_list.phtml:14
+#: templates/database/designer/table_list.phtml:14
 msgid "Hide/Show Tables with no relation"
 msgstr ""
 
-#: templates/designer/table_list.phtml:59
+#: templates/database/designer/table_list.phtml:59
 msgid "Number of tables:"
 msgstr ""
 
+#: templates/database/structure/body_for_table_summary.phtml:6
+#, php-format
+msgid "%s table"
+msgid_plural "%s tables"
+msgstr[0] "%s តារាង"
+
+#: templates/database/structure/body_for_table_summary.phtml:17
+msgid "Sum"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:6
+msgid "Check tables having overhead"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:10
+msgid "Show create"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:27
+msgid "Prefix"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:28
+msgid "Add prefix to table"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:29
+msgid "Replace table prefix"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:30
+msgid "Copy table with prefix"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:36
+#, fuzzy
+#| msgid "Add %s column(s) to index"
+msgid "Add columns to central list"
+msgstr "បន្ថែម​ជួរ​ឈរ %s ទៅ​សន្ទស្សន៍"
+
+#: templates/database/structure/check_all_tables.phtml:37
+msgid "Remove columns from central list"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:38
+#, fuzzy
+#| msgid "Add %s column(s) to index"
+msgid "Make consistent with central list"
+msgstr "បន្ថែម​ជួរ​ឈរ %s ទៅ​សន្ទស្សន៍"
+
+#: templates/database/structure/favorite_anchor.phtml:12
+msgid "Add to Favorites"
+msgstr ""
+
+#: templates/database/structure/show_create.phtml:2
+msgid "Showing create queries"
+msgstr ""
+
+#: templates/database/structure/sortable_header.phtml:13
+msgid "Sort"
+msgstr ""
+
+#: templates/database/structure/table_header.phtml:42
+msgid ""
+"May be approximate. Click on the number to get the exact count. See "
+"[doc@faq3-11]FAQ 3.11[/doc]."
+msgstr ""
+
+#: templates/database/structure/table_header.phtml:66
+#: templates/table/index_form.phtml:127
+msgid "Size"
+msgstr "ទំហំ"
+
+#: templates/database/structure/table_header.phtml:74
+#: templates/table/structure/display_table_stats.phtml:27
+msgid "Overhead"
+msgstr ""
+
+#: templates/database/structure/tracking_icon.phtml:4
+msgid "Tracking is active."
+msgstr ""
+
+#: templates/database/structure/tracking_icon.phtml:8
+msgid "Tracking is not active."
+msgstr ""
+
 #: templates/error/report_form.phtml:7
 msgid ""
 "phpMyAdmin has encountered an error. We have collected data about this error "
@@ -14233,61 +14347,6 @@ msgstr ""
 msgid "Please explain the steps that lead to the error:"
 msgstr ""
 
-#: templates/gis_visualization/gis_visualization.phtml:3
-msgid "Display GIS Visualization"
-msgstr ""
-
-#: templates/gis_visualization/gis_visualization.phtml:8
-msgid "Label column"
-msgstr ""
-
-#: templates/gis_visualization/gis_visualization.phtml:11
-msgid "-- None --"
-msgstr ""
-
-#: templates/gis_visualization/gis_visualization.phtml:19
-msgid "Spatial column"
-msgstr ""
-
-#: templates/index_form.phtml:16
-msgid "Index name:"
-msgstr ""
-
-#: templates/index_form.phtml:19
-msgid ""
-"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
-msgstr ""
-
-#: templates/index_form.phtml:40
-msgid "Index choice:"
-msgstr ""
-
-#: templates/index_form.phtml:57
-msgid "Key block size:"
-msgstr ""
-
-#: templates/index_form.phtml:74
-msgid "Index type:"
-msgstr ""
-
-#: templates/index_form.phtml:86
-#, fuzzy
-#| msgid "User:"
-msgid "Parser:"
-msgstr "អ្នកប្រើ៖"
-
-#: templates/index_form.phtml:102
-msgid "Comment:"
-msgstr ""
-
-#: templates/index_form.phtml:127 templates/structure/table_header.phtml:66
-msgid "Size"
-msgstr "ទំហំ"
-
-#: templates/index_form.phtml:149 templates/index_form.phtml:190
-msgid "Drag to reorder"
-msgstr ""
-
 #: templates/prefs_autoload.phtml:9
 msgid ""
 "Your browser has phpMyAdmin configuration for this domain. Would you like to "
@@ -14298,413 +14357,379 @@ msgstr ""
 msgid "Start row:"
 msgstr ""
 
-#: templates/structure/actions_in_table_structure.phtml:14
-#, php-format
-msgid "A primary key has been added on %s."
-msgstr ""
-
-#: templates/structure/actions_in_table_structure.phtml:34
-#: templates/structure/actions_in_table_structure.phtml:54
-#: templates/structure/actions_in_table_structure.phtml:79
-#: templates/structure/actions_in_table_structure.phtml:101
-#, php-format
-msgid "An index has been added on %s."
-msgstr ""
-
-#: templates/structure/actions_in_table_structure.phtml:130
-#: templates/structure/check_all_table_column.phtml:59
-msgid "Remove from central columns"
-msgstr ""
-
-#: templates/structure/actions_in_table_structure.phtml:138
-#: templates/structure/check_all_table_column.phtml:55
-msgid "Add to central columns"
-msgstr ""
-
-#: templates/structure/add_column.phtml:7
-#, php-format
-msgid "Add %s column(s)"
-msgstr ""
-
-#: templates/structure/add_column.phtml:12
-msgid "at beginning of table"
-msgstr ""
-
-#: templates/structure/body_for_table_summary.phtml:6
-#, php-format
-msgid "%s table"
-msgid_plural "%s tables"
-msgstr[0] "%s តារាង"
-
-#: templates/structure/body_for_table_summary.phtml:17
-msgid "Sum"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:6
-msgid "Check tables having overhead"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:10
-msgid "Show create"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:27
-msgid "Prefix"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:28
-msgid "Add prefix to table"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:29
-msgid "Replace table prefix"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:30
-msgid "Copy table with prefix"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:36
-#, fuzzy
-#| msgid "Add %s column(s) to index"
-msgid "Add columns to central list"
-msgstr "បន្ថែម​ជួរ​ឈរ %s ទៅ​សន្ទស្សន៍"
-
-#: templates/structure/check_all_tables.phtml:37
-msgid "Remove columns from central list"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:38
-#, fuzzy
-#| msgid "Add %s column(s) to index"
-msgid "Make consistent with central list"
-msgstr "បន្ថែម​ជួរ​ឈរ %s ទៅ​សន្ទស្សន៍"
-
-#: templates/structure/display_structure.phtml:140 view_create.php:181
-msgid "Edit view"
-msgstr ""
-
-#: templates/structure/display_table_stats.phtml:9
-msgid "Space usage"
-msgstr ""
-
-#: templates/structure/display_table_stats.phtml:27
-#: templates/structure/table_header.phtml:74
-msgid "Overhead"
-msgstr ""
-
-#: templates/structure/display_table_stats.phtml:32
-msgid "Effective"
-msgstr ""
-
-#: templates/structure/favorite_anchor.phtml:12
-msgid "Add to Favorites"
-msgstr ""
-
-#: templates/structure/move_columns_dialog.phtml:1
-#: templates/structure/optional_action_links.phtml:21
-msgid "Move columns"
-msgstr ""
-
-#: templates/structure/move_columns_dialog.phtml:2
-msgid "Move the columns by dragging them up and down."
-msgstr ""
-
-#: templates/structure/optional_action_links.phtml:9
-msgid "Propose table structure"
-msgstr ""
-
-#: templates/structure/optional_action_links.phtml:24
-msgid "Improve table structure"
-msgstr ""
-
-#: templates/structure/optional_action_links.phtml:30
-#, fuzzy
-#| msgid "Track table"
-msgid "Track view"
-msgstr "តាមដាន​តារាង"
-
-#: templates/structure/row_stats_table.phtml:3
-msgid "Row statistics"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:9
-msgid "static"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:11
-msgid "dynamic"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:22
-msgid "partitioned"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:54
-msgid "Row length"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:66
-msgid "Row size"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:73
-msgid "Next autoindex"
-msgstr ""
-
-#: templates/structure/secondary_tabs.phtml:14
-msgid "Relation view"
-msgstr ""
-
-#: templates/structure/show_create.phtml:2
-msgid "Showing create queries"
-msgstr ""
-
-#: templates/structure/sortable_header.phtml:13
-msgid "Sort"
-msgstr ""
-
-#: templates/structure/table_header.phtml:42
-msgid ""
-"May be approximate. Click on the number to get the exact count. See "
-"[doc@faq3-11]FAQ 3.11[/doc]."
-msgstr ""
-
-#: templates/structure/table_structure_row.phtml:46
-#, php-format
-msgid "Column %s has been dropped."
-msgstr ""
-
-#: templates/structure/tracking_icon.phtml:4
-msgid "Tracking is active."
-msgstr ""
-
-#: templates/structure/tracking_icon.phtml:8
-msgid "Tracking is not active."
-msgstr ""
-
-#: templates/table/create_table.phtml:15
-msgid "Number of columns"
-msgstr ""
-
-#: templates/table/options.phtml:8
-msgid "Select columns (at least one):"
-msgstr ""
-
-#: templates/table/options.phtml:37
-msgid "Add search conditions (body of the \"where\" clause):"
-msgstr ""
-
-#: templates/table/options.phtml:45
-msgid "Number of rows per page"
-msgstr ""
-
-#: templates/table/options.phtml:56
-msgid "Display order:"
-msgstr ""
-
-#: templates/table/options_zoom.phtml:6
-msgid "Use this column to label each point"
-msgstr ""
-
-#: templates/table/options_zoom.phtml:35
-msgid "Maximum rows to plot"
-msgstr ""
-
-#: templates/table/replace_preview.phtml:13
-msgid "Find and replace - preview"
-msgstr ""
-
-#: templates/table/replace_preview.phtml:18
-msgid "Original string"
-msgstr ""
-
-#: templates/table/replace_preview.phtml:19
-msgid "Replaced string"
-msgstr ""
-
-#: templates/table/replace_preview.phtml:40
-msgid "Replace"
-msgstr ""
-
-#: templates/table/rows_zoom.phtml:16
-msgid "Additional search criteria"
-msgstr ""
-
-#: templates/table/search_and_replace.phtml:3
-msgid "Replace with:"
-msgstr ""
-
-#: templates/table/search_and_replace.phtml:22
-msgid "Use regular expression"
-msgstr ""
-
-#: templates/table/selection_form.phtml:12
-msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
-msgstr ""
-
-#: templates/table/selection_form.phtml:34
-msgid "Do a \"query by example\" (wildcard: \"%\")"
-msgstr ""
-
-#: templates/table/zoom_result_form.phtml:7
-msgid "Browse/Edit the points"
-msgstr ""
-
-#: templates/table/zoom_result_form.phtml:15
-msgid "How to use"
-msgstr ""
-
-#: templates/table/zoom_result_form.phtml:23
-msgid "Reset zoom"
-msgstr ""
-
-#: templates/tbl_chart.phtml:17
+#: templates/table/chart/tbl_chart.phtml:17
 msgctxt "Chart type"
 msgid "Bar"
 msgstr ""
 
-#: templates/tbl_chart.phtml:21
+#: templates/table/chart/tbl_chart.phtml:21
 msgctxt "Chart type"
 msgid "Column"
 msgstr ""
 
-#: templates/tbl_chart.phtml:25
+#: templates/table/chart/tbl_chart.phtml:25
 msgctxt "Chart type"
 msgid "Line"
 msgstr ""
 
-#: templates/tbl_chart.phtml:29
+#: templates/table/chart/tbl_chart.phtml:29
 msgctxt "Chart type"
 msgid "Spline"
 msgstr ""
 
-#: templates/tbl_chart.phtml:33
+#: templates/table/chart/tbl_chart.phtml:33
 msgctxt "Chart type"
 msgid "Area"
 msgstr ""
 
-#: templates/tbl_chart.phtml:37
+#: templates/table/chart/tbl_chart.phtml:37
 msgctxt "Chart type"
 msgid "Pie"
 msgstr ""
 
-#: templates/tbl_chart.phtml:41
+#: templates/table/chart/tbl_chart.phtml:41
 msgctxt "Chart type"
 msgid "Timeline"
 msgstr ""
 
-#: templates/tbl_chart.phtml:45
+#: templates/table/chart/tbl_chart.phtml:45
 msgctxt "Chart type"
 msgid "Scatter"
 msgstr ""
 
-#: templates/tbl_chart.phtml:50
+#: templates/table/chart/tbl_chart.phtml:50
 msgid "Stacked"
 msgstr ""
 
-#: templates/tbl_chart.phtml:53
+#: templates/table/chart/tbl_chart.phtml:53
 msgid "Chart title"
 msgstr ""
 
-#: templates/tbl_chart.phtml:57
+#: templates/table/chart/tbl_chart.phtml:57
 msgid "X-Axis:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:72
+#: templates/table/chart/tbl_chart.phtml:72
 msgid "Series:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:102
+#: templates/table/chart/tbl_chart.phtml:102
 msgid "X-Axis label:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:104
+#: templates/table/chart/tbl_chart.phtml:104
 msgid "X Values"
 msgstr ""
 
-#: templates/tbl_chart.phtml:107
+#: templates/table/chart/tbl_chart.phtml:107
 msgid "Y-Axis label:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:115
+#: templates/table/chart/tbl_chart.phtml:115
 msgid "Series names are in a column"
 msgstr ""
 
-#: templates/tbl_chart.phtml:118
+#: templates/table/chart/tbl_chart.phtml:118
 msgid "Series column:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:130
+#: templates/table/chart/tbl_chart.phtml:130
 #, fuzzy
 #| msgid "Table comments:"
 msgid "Value Column:"
 msgstr "មតិយោបល់​តារាង៖"
 
-#: templates/tbl_chart.phtml:150
+#: templates/table/chart/tbl_chart.phtml:150
 msgid "Save chart as image"
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:7
+#: templates/table/gis_visualization/gis_visualization.phtml:3
+msgid "Display GIS Visualization"
+msgstr ""
+
+#: templates/table/gis_visualization/gis_visualization.phtml:8
+msgid "Label column"
+msgstr ""
+
+#: templates/table/gis_visualization/gis_visualization.phtml:11
+msgid "-- None --"
+msgstr ""
+
+#: templates/table/gis_visualization/gis_visualization.phtml:19
+msgid "Spatial column"
+msgstr ""
+
+#: templates/table/index_form.phtml:16
+msgid "Index name:"
+msgstr ""
+
+#: templates/table/index_form.phtml:19
+msgid ""
+"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
+msgstr ""
+
+#: templates/table/index_form.phtml:40
+msgid "Index choice:"
+msgstr ""
+
+#: templates/table/index_form.phtml:57
+msgid "Key block size:"
+msgstr ""
+
+#: templates/table/index_form.phtml:74
+msgid "Index type:"
+msgstr ""
+
+#: templates/table/index_form.phtml:86
+#, fuzzy
+#| msgid "User:"
+msgid "Parser:"
+msgstr "អ្នកប្រើ៖"
+
+#: templates/table/index_form.phtml:102
+msgid "Comment:"
+msgstr ""
+
+#: templates/table/index_form.phtml:149 templates/table/index_form.phtml:190
+msgid "Drag to reorder"
+msgstr ""
+
+#: templates/table/relation/common_form.phtml:7
 msgid "Internal relations"
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:11
+#: templates/table/relation/common_form.phtml:11
 msgid "Internal relation"
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:14
+#: templates/table/relation/common_form.phtml:14
 msgid ""
 "An internal relation is not necessary when a corresponding FOREIGN KEY "
 "relation exists."
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:37
+#: templates/table/relation/common_form.phtml:37
 msgid "Foreign key constraints"
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:40
+#: templates/table/relation/common_form.phtml:40
 #, fuzzy
 #| msgid "Action"
 msgid "Actions"
 msgstr "សកម្មភាព"
 
-#: templates/tbl_relation/common_form.phtml:41
+#: templates/table/relation/common_form.phtml:41
 msgid "Constraint properties"
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:44
+#: templates/table/relation/common_form.phtml:44
 msgid ""
 "Only columns with index will be displayed. You can define an index below."
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:49
+#: templates/table/relation/common_form.phtml:49
 msgid "Foreign key constraint"
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:81
+#: templates/table/relation/common_form.phtml:81
 #, fuzzy
 #| msgid "Add %s column(s) to index"
 msgid "+ Add constraint"
 msgstr "បន្ថែម​ជួរ​ឈរ %s ទៅ​សន្ទស្សន៍"
 
-#: templates/tbl_relation/common_form.phtml:91
+#: templates/table/relation/common_form.phtml:91
 msgid "Choose column to display:"
 msgstr ""
 
-#: templates/tbl_relation/foreign_key_row.phtml:13
+#: templates/table/relation/foreign_key_row.phtml:13
 #, php-format
 msgid "Foreign key constraint %s has been dropped"
 msgstr ""
 
-#: templates/tbl_relation/foreign_key_row.phtml:102
+#: templates/table/relation/foreign_key_row.phtml:102
 msgid "Constraint name"
 msgstr ""
 
-#: templates/tbl_relation/foreign_key_row.phtml:157
+#: templates/table/relation/foreign_key_row.phtml:157
 msgid "+ Add column"
 msgstr ""
 
+#: templates/table/search/options.phtml:8
+msgid "Select columns (at least one):"
+msgstr ""
+
+#: templates/table/search/options.phtml:37
+msgid "Add search conditions (body of the \"where\" clause):"
+msgstr ""
+
+#: templates/table/search/options.phtml:45
+msgid "Number of rows per page"
+msgstr ""
+
+#: templates/table/search/options.phtml:56
+msgid "Display order:"
+msgstr ""
+
+#: templates/table/search/options_zoom.phtml:6
+msgid "Use this column to label each point"
+msgstr ""
+
+#: templates/table/search/options_zoom.phtml:35
+msgid "Maximum rows to plot"
+msgstr ""
+
+#: templates/table/search/replace_preview.phtml:13
+msgid "Find and replace - preview"
+msgstr ""
+
+#: templates/table/search/replace_preview.phtml:18
+msgid "Original string"
+msgstr ""
+
+#: templates/table/search/replace_preview.phtml:19
+msgid "Replaced string"
+msgstr ""
+
+#: templates/table/search/replace_preview.phtml:40
+msgid "Replace"
+msgstr ""
+
+#: templates/table/search/rows_zoom.phtml:16
+msgid "Additional search criteria"
+msgstr ""
+
+#: templates/table/search/search_and_replace.phtml:3
+msgid "Replace with:"
+msgstr ""
+
+#: templates/table/search/search_and_replace.phtml:22
+msgid "Use regular expression"
+msgstr ""
+
+#: templates/table/search/selection_form.phtml:12
+msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
+msgstr ""
+
+#: templates/table/search/selection_form.phtml:34
+msgid "Do a \"query by example\" (wildcard: \"%\")"
+msgstr ""
+
+#: templates/table/search/zoom_result_form.phtml:7
+msgid "Browse/Edit the points"
+msgstr ""
+
+#: templates/table/search/zoom_result_form.phtml:15
+msgid "How to use"
+msgstr ""
+
+#: templates/table/search/zoom_result_form.phtml:23
+msgid "Reset zoom"
+msgstr ""
+
+#: templates/table/secondary_tabs.phtml:14
+msgid "Relation view"
+msgstr ""
+
+#: templates/table/structure/actions_in_table_structure.phtml:14
+#, php-format
+msgid "A primary key has been added on %s."
+msgstr ""
+
+#: templates/table/structure/actions_in_table_structure.phtml:34
+#: templates/table/structure/actions_in_table_structure.phtml:54
+#: templates/table/structure/actions_in_table_structure.phtml:79
+#: templates/table/structure/actions_in_table_structure.phtml:101
+#, php-format
+msgid "An index has been added on %s."
+msgstr ""
+
+#: templates/table/structure/actions_in_table_structure.phtml:130
+#: templates/table/structure/check_all_table_column.phtml:59
+msgid "Remove from central columns"
+msgstr ""
+
+#: templates/table/structure/actions_in_table_structure.phtml:138
+#: templates/table/structure/check_all_table_column.phtml:55
+msgid "Add to central columns"
+msgstr ""
+
+#: templates/table/structure/add_column.phtml:7
+#, php-format
+msgid "Add %s column(s)"
+msgstr ""
+
+#: templates/table/structure/add_column.phtml:12
+msgid "at beginning of table"
+msgstr ""
+
+#: templates/table/structure/display_structure.phtml:140 view_create.php:181
+msgid "Edit view"
+msgstr ""
+
+#: templates/table/structure/display_table_stats.phtml:9
+msgid "Space usage"
+msgstr ""
+
+#: templates/table/structure/display_table_stats.phtml:32
+msgid "Effective"
+msgstr ""
+
+#: templates/table/structure/move_columns_dialog.phtml:1
+#: templates/table/structure/optional_action_links.phtml:21
+msgid "Move columns"
+msgstr ""
+
+#: templates/table/structure/move_columns_dialog.phtml:2
+msgid "Move the columns by dragging them up and down."
+msgstr ""
+
+#: templates/table/structure/optional_action_links.phtml:9
+msgid "Propose table structure"
+msgstr ""
+
+#: templates/table/structure/optional_action_links.phtml:24
+msgid "Improve table structure"
+msgstr ""
+
+#: templates/table/structure/optional_action_links.phtml:30
+#, fuzzy
+#| msgid "Track table"
+msgid "Track view"
+msgstr "តាមដាន​តារាង"
+
+#: templates/table/structure/row_stats_table.phtml:3
+msgid "Row statistics"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:9
+msgid "static"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:11
+msgid "dynamic"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:22
+msgid "partitioned"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:54
+msgid "Row length"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:66
+msgid "Row size"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:73
+msgid "Next autoindex"
+msgstr ""
+
+#: templates/table/structure/table_structure_row.phtml:46
+#, php-format
+msgid "Column %s has been dropped."
+msgstr ""
+
 #: themes.php:17 themes.php:22
 msgid "Theme"
 msgstr ""
diff --git a/po/kn.po b/po/kn.po
index 9b52c40541..28dc28db17 100644
--- a/po/kn.po
+++ b/po/kn.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 4.5.0-dev\n"
 "Report-Msgid-Bugs-To: developers@phpmyadmin.net\n"
-"POT-Creation-Date: 2015-08-08 13:53-0400\n"
+"POT-Creation-Date: 2015-08-12 08:10-0400\n"
 "PO-Revision-Date: 2015-07-24 13:05+0200\n"
 "Last-Translator: Shameem Ahmed A Mulla <shameem.sam@gmail.com>\n"
 "Language-Team: Kannada <https://hosted.weblate.org/projects/phpmyadmin/"
@@ -56,7 +56,7 @@ msgid "Table comments:"
 msgstr "ಟೇಬಲ್ ಕಾಮೆಂಟ್ಸ್:"
 
 #: db_datadict.php:104 libraries/Index.class.php:699
-#: libraries/insert_edit.lib.php:1567
+#: libraries/insert_edit.lib.php:1565
 #: libraries/navigation/Nodes/Node_Column.class.php:30
 #: libraries/plugins/export/ExportHtmlword.class.php:280
 #: libraries/plugins/export/ExportHtmlword.class.php:375
@@ -70,13 +70,14 @@ msgstr "ಟೇಬಲ್ ಕಾಮೆಂಟ್ಸ್:"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1023
 #: libraries/tracking.lib.php:879 libraries/tracking.lib.php:975
 #: templates/columns_definitions/column_name.phtml:18
-#: templates/index_form.phtml:124 templates/table/table_header.phtml:6
-#: templates/table/zoom_result_form.phtml:33
-#: templates/tbl_relation/common_form.phtml:10
-#: templates/tbl_relation/common_form.phtml:43
-#: templates/tbl_relation/foreign_key_row.phtml:194
-#: templates/tbl_relation/foreign_key_row.phtml:206
-#: templates/tbl_relation/internal_relational_row.phtml:71
+#: templates/table/index_form.phtml:124
+#: templates/table/relation/common_form.phtml:10
+#: templates/table/relation/common_form.phtml:43
+#: templates/table/relation/foreign_key_row.phtml:194
+#: templates/table/relation/foreign_key_row.phtml:206
+#: templates/table/relation/internal_relational_row.phtml:71
+#: templates/table/search/table_header.phtml:6
+#: templates/table/search/zoom_result_form.phtml:33
 msgid "Column"
 msgstr "ಅಂಕಣ"
 
@@ -94,21 +95,21 @@ msgstr "ಅಂಕಣ"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1001
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1024
 #: libraries/rte/rte_list.lib.php:75 libraries/rte/rte_list.lib.php:103
-#: libraries/rte/rte_routines.lib.php:802
-#: libraries/rte/rte_routines.lib.php:831
-#: libraries/rte/rte_routines.lib.php:1493
+#: libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_routines.lib.php:922
+#: libraries/rte/rte_routines.lib.php:1584
 #: libraries/server_privileges.lib.php:2369 libraries/tracking.lib.php:880
 #: libraries/tracking.lib.php:972
 #: templates/columns_definitions/table_fields_definitions.phtml:11
-#: templates/structure/table_header.phtml:48
-#: templates/structure/table_structure_header.phtml:6
-#: templates/table/table_header.phtml:7
+#: templates/database/structure/table_header.phtml:48
+#: templates/table/search/table_header.phtml:7
+#: templates/table/structure/table_structure_header.phtml:6
 msgid "Type"
 msgstr "ಕೌಟುಂಬಿಕತೆ"
 
 #: db_datadict.php:106 libraries/Index.class.php:702
 #: libraries/central_columns.lib.php:708
-#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1576
+#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1574
 #: libraries/plugins/export/ExportHtmlword.class.php:286
 #: libraries/plugins/export/ExportHtmlword.class.php:381
 #: libraries/plugins/export/ExportLatex.class.php:509
@@ -121,8 +122,8 @@ msgstr "ಕೌಟುಂಬಿಕತೆ"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1026
 #: libraries/tracking.lib.php:882 libraries/tracking.lib.php:978
 #: templates/columns_definitions/table_fields_definitions.phtml:39
-#: templates/structure/table_structure_header.phtml:9
-#: templates/table/zoom_result_form.phtml:34
+#: templates/table/search/zoom_result_form.phtml:34
+#: templates/table/structure/table_structure_header.phtml:9
 msgid "Null"
 msgstr "ಶೂನ್ಯ"
 
@@ -140,8 +141,8 @@ msgstr "ಶೂನ್ಯ"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1027
 #: libraries/replication_gui.lib.php:153 libraries/tracking.lib.php:883
 #: templates/columns_definitions/table_fields_definitions.phtml:25
-#: templates/structure/body_for_table_summary.phtml:55
-#: templates/structure/table_structure_header.phtml:10
+#: templates/database/structure/body_for_table_summary.phtml:55
+#: templates/table/structure/table_structure_header.phtml:10
 msgid "Default"
 msgstr "ಪೂರ್ವನಿಯೋಜಿತ"
 
@@ -169,19 +170,19 @@ msgid "Comments"
 msgstr "ಪ್ರತಿಕ್ರಿಯೆಗಳು"
 
 #: db_datadict.php:146
-#: libraries/controllers/StructureController.class.php:1960
-#: libraries/controllers/StructureController.class.php:1965
+#: libraries/controllers/TableStructureController.class.php:951
+#: libraries/controllers/TableStructureController.class.php:956
 #: libraries/tracking.lib.php:922
 #: templates/columns_definitions/column_indexes.phtml:6
-#: templates/structure/check_all_table_column.phtml:22
-#: templates/structure/display_structure.phtml:74
+#: templates/table/structure/check_all_table_column.phtml:22
+#: templates/table/structure/display_structure.phtml:74
 msgid "Primary"
 msgstr "ಪ್ರಾಥಮಿಕ"
 
 #: db_datadict.php:156 js/messages.php:317 libraries/Index.class.php:567
 #: libraries/Index.class.php:606 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261 libraries/mult_submits.lib.php:403
+#: libraries/config/FormDisplay.tpl.php:272 libraries/mult_submits.lib.php:403
 #: libraries/mult_submits.lib.php:417
 #: libraries/plugins/export/ExportHtmlword.class.php:630
 #: libraries/plugins/export/ExportLatex.class.php:589
@@ -197,20 +198,20 @@ msgstr "ಪ್ರಾಥಮಿಕ"
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1010 libraries/tracking.lib.php:1015
 #: prefs_manage.php:140 templates/prefs_autoload.phtml:15
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "No"
 msgstr "ಇಲ್ಲ"
 
 #: db_datadict.php:156 js/messages.php:443 libraries/Index.class.php:568
 #: libraries/Index.class.php:605 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261
-#: libraries/controllers/StructureController.class.php:1344
-#: libraries/controllers/StructureController.class.php:2223
-#: libraries/controllers/StructureController.class.php:2232
-#: libraries/controllers/StructureController.class.php:2237
-#: libraries/controllers/StructureController.class.php:2242
-#: libraries/controllers/StructureController.class.php:2247
+#: libraries/config/FormDisplay.tpl.php:272
+#: libraries/controllers/TableStructureController.class.php:539
+#: libraries/controllers/TableStructureController.class.php:1201
+#: libraries/controllers/TableStructureController.class.php:1210
+#: libraries/controllers/TableStructureController.class.php:1215
+#: libraries/controllers/TableStructureController.class.php:1220
+#: libraries/controllers/TableStructureController.class.php:1225
 #: libraries/mult_submits.inc.php:82 libraries/mult_submits.inc.php:178
 #: libraries/mult_submits.lib.php:339 libraries/mult_submits.lib.php:372
 #: libraries/mult_submits.lib.php:401 libraries/mult_submits.lib.php:415
@@ -219,8 +220,8 @@ msgstr "ಇಲ್ಲ"
 #: libraries/plugins/export/ExportOdt.class.php:756
 #: libraries/plugins/export/ExportTexytext.class.php:567
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1077
-#: libraries/server_databases.lib.php:464
-#: libraries/server_databases.lib.php:474
+#: libraries/server_databases.lib.php:475
+#: libraries/server_databases.lib.php:485
 #: libraries/server_privileges.lib.php:2546
 #: libraries/server_privileges.lib.php:2727
 #: libraries/server_privileges.lib.php:2748
@@ -230,7 +231,7 @@ msgstr "ಇಲ್ಲ"
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1008 libraries/tracking.lib.php:1013
 #: prefs_manage.php:138 templates/prefs_autoload.phtml:14
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "Yes"
 msgstr "ಹೌದು"
 
@@ -240,7 +241,7 @@ msgstr "ಡೇಟಾಬೇಸ್ ಡಂಪ್ (ಸ್ಕೀಮಾ) ವ
 
 #: db_export.php:37 db_tracking.php:90 export.php:382
 #: libraries/DBQbe.class.php:326
-#: libraries/controllers/StructureController.class.php:231
+#: libraries/controllers/DatabaseStructureController.class.php:170
 #: libraries/navigation/NavigationTree.class.php:897
 msgid "No tables found in database."
 msgstr "ಯಾವುದೇ ಟೇಬಲ್ ಡೇಟಾಬೇಸನ್ನಲ್ಲಿ ಕಂಡುಬಂದಿಲ್ಲ."
@@ -251,14 +252,14 @@ msgstr "ಯಾವುದೇ ಟೇಬಲ್ ಡೇಟಾಬೇಸನ
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:26
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:120
-#: templates/structure/show_create.phtml:18
+#: templates/database/structure/show_create.phtml:18
 msgid "Tables"
 msgstr ""
 
 #: db_export.php:52 libraries/Menu.class.php:317 libraries/Menu.class.php:425
-#: libraries/Util.class.php:3333 libraries/Util.class.php:3343
-#: libraries/Util.class.php:3349 libraries/Util.class.php:3629
-#: libraries/Util.class.php:4327 libraries/Util.class.php:4344
+#: libraries/Util.class.php:3339 libraries/Util.class.php:3349
+#: libraries/Util.class.php:3355 libraries/Util.class.php:3635
+#: libraries/Util.class.php:4333 libraries/Util.class.php:4350
 #: libraries/central_columns.lib.php:728 libraries/config.values.php:39
 #: libraries/config.values.php:47 libraries/config.values.php:109
 #: libraries/config.values.php:115 libraries/config/setup.forms.php:323
@@ -272,7 +273,7 @@ msgstr ""
 #: libraries/navigation/Nodes/Node_Table.class.php:283
 #: libraries/server_privileges.lib.php:1141 libraries/tracking.lib.php:874
 #: templates/columns_definitions/table_fields_definitions.phtml:3
-#: templates/designer/table_list.phtml:28
+#: templates/database/designer/table_list.phtml:28
 msgid "Structure"
 msgstr ""
 
@@ -284,7 +285,7 @@ msgstr ""
 #: libraries/config/user_preferences.forms.php:292
 #: libraries/config/user_preferences.forms.php:297
 #: libraries/server_privileges.lib.php:1140
-#: templates/structure/display_table_stats.phtml:12
+#: templates/table/structure/display_table_stats.phtml:12
 msgid "Data"
 msgstr ""
 
@@ -354,10 +355,10 @@ msgstr "ಕಂಡುಬರುವ ಕೋಷ್ಟಕಗಳು"
 #: libraries/server_privileges.lib.php:2908
 #: libraries/server_privileges.lib.php:3145
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4346
-#: templates/structure/table_header.phtml:21
-#: templates/tbl_relation/foreign_key_row.phtml:176
-#: templates/tbl_relation/internal_relational_row.phtml:63
+#: libraries/server_privileges.lib.php:4372
+#: templates/database/structure/table_header.phtml:21
+#: templates/table/relation/foreign_key_row.phtml:176
+#: templates/table/relation/internal_relational_row.phtml:63
 msgid "Table"
 msgstr "ಟೇಬಲ್"
 
@@ -374,7 +375,7 @@ msgid "Updated"
 msgstr "ನವೀಕರಿಸಲಾಗಿದೆ"
 
 #: db_tracking.php:130 js/messages.php:243 libraries/Menu.class.php:552
-#: libraries/Util.class.php:4314 libraries/config.values.php:104
+#: libraries/Util.class.php:4320 libraries/config.values.php:104
 #: libraries/rte/rte_events.lib.php:393 libraries/rte/rte_list.lib.php:101
 #: libraries/server_status_processes.lib.php:92 libraries/tracking.lib.php:279
 msgid "Status"
@@ -383,14 +384,15 @@ msgstr "ಸ್ಥಿತಿ"
 #: db_tracking.php:131 db_tracking.php:290 libraries/Index.class.php:693
 #: libraries/central_columns.lib.php:687 libraries/rte/rte_list.lib.php:74
 #: libraries/rte/rte_list.lib.php:89 libraries/rte/rte_list.lib.php:102
-#: libraries/server_databases.lib.php:398
+#: libraries/server_databases.lib.php:409
 #: libraries/server_privileges.lib.php:2372
 #: libraries/server_privileges.lib.php:3166
 #: libraries/server_privileges.lib.php:3342
 #: libraries/server_user_groups.lib.php:82
 #: libraries/server_variables.lib.php:189 libraries/tracking.lib.php:280
-#: libraries/tracking.lib.php:793 templates/structure/table_header.phtml:30
-#: templates/structure/table_structure_header.phtml:23
+#: libraries/tracking.lib.php:793
+#: templates/database/structure/table_header.phtml:30
+#: templates/table/structure/table_structure_header.phtml:23
 msgid "Action"
 msgstr "ಕ್ರಿಯೆ"
 
@@ -432,7 +434,7 @@ msgid "Untracked tables"
 msgstr "ಜಾಡೀಕರಣ ಮಾಡಲಾರದ ಕೋಷ್ಟಕಗಳು"
 
 #: db_tracking.php:305 db_tracking.php:336
-#: templates/structure/optional_action_links.phtml:17
+#: templates/table/structure/optional_action_links.phtml:17
 msgid "Track table"
 msgstr "ಕೋಷ್ಟಕಗಳನ್ನು ಟ್ರ್ಯಾಕ್ ಮಾಡಿ"
 
@@ -488,7 +490,7 @@ msgid "Value for the column \"%s\""
 msgstr "\"%s\" ಕಾಲಮ್ ಮೌಲ್ಯ"
 
 #: gis_data_editor.php:146
-#: templates/gis_visualization/gis_visualization.phtml:37
+#: templates/table/gis_visualization/gis_visualization.phtml:37
 msgid "Use OpenStreetMaps as Base Layer"
 msgstr ""
 
@@ -568,35 +570,35 @@ msgstr ""
 #: libraries/display_change_password.lib.php:162
 #: libraries/display_export.lib.php:402 libraries/display_export.lib.php:408
 #: libraries/display_import.lib.php:392 libraries/index.lib.php:44
-#: libraries/insert_edit.lib.php:1546 libraries/insert_edit.lib.php:1583
+#: libraries/insert_edit.lib.php:1544 libraries/insert_edit.lib.php:1581
 #: libraries/normalization.lib.php:165 libraries/normalization.lib.php:821
 #: libraries/operations.lib.php:38 libraries/operations.lib.php:108
 #: libraries/operations.lib.php:263 libraries/operations.lib.php:306
 #: libraries/operations.lib.php:801 libraries/operations.lib.php:874
 #: libraries/operations.lib.php:923 libraries/operations.lib.php:1337
 #: libraries/operations.lib.php:1658
-#: libraries/plugins/auth/AuthenticationCookie.class.php:244
+#: libraries/plugins/auth/AuthenticationCookie.class.php:232
 #: libraries/replication_gui.lib.php:122 libraries/replication_gui.lib.php:161
 #: libraries/replication_gui.lib.php:324 libraries/replication_gui.lib.php:461
 #: libraries/replication_gui.lib.php:906 libraries/rte/rte_events.lib.php:509
-#: libraries/rte/rte_routines.lib.php:969
-#: libraries/rte/rte_routines.lib.php:1581
+#: libraries/rte/rte_routines.lib.php:1060
+#: libraries/rte/rte_routines.lib.php:1672
 #: libraries/rte/rte_triggers.lib.php:396 libraries/server_bin_log.lib.php:61
 #: libraries/server_privileges.lib.php:705
 #: libraries/server_privileges.lib.php:2106
 #: libraries/server_privileges.lib.php:2872
 #: libraries/server_privileges.lib.php:3553
-#: libraries/server_privileges.lib.php:4627
+#: libraries/server_privileges.lib.php:4653
 #: libraries/server_user_groups.lib.php:285
 #: libraries/sql_query_form.lib.php:369 libraries/sql_query_form.lib.php:429
 #: libraries/tracking.lib.php:533 libraries/tracking.lib.php:653
 #: prefs_manage.php:277 prefs_manage.php:355
 #: templates/columns_definitions/column_definitions_form.phtml:59
-#: templates/header_location.phtml:17 templates/index_form.phtml:238
+#: templates/database/create_table.phtml:21 templates/header_location.phtml:28
 #: templates/startAndNumberOfRowsPanel.phtml:14
-#: templates/structure/add_column.phtml:25
-#: templates/table/create_table.phtml:21
-#: templates/table/selection_form.phtml:75 view_create.php:275
+#: templates/table/index_form.phtml:238
+#: templates/table/search/selection_form.phtml:75
+#: templates/table/structure/add_column.phtml:25 view_create.php:275
 #: view_operations.php:106
 msgid "Go"
 msgstr ""
@@ -674,7 +676,7 @@ msgstr ""
 msgid "Could not load import plugins, please check your installation!"
 msgstr ""
 
-#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1466
+#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1460
 #, php-format
 msgid "Bookmark %s has been created."
 msgstr ""
@@ -708,11 +710,11 @@ msgstr ""
 msgid "Back"
 msgstr ""
 
-#: index.php:148 libraries/Footer.class.php:70
+#: index.php:149 libraries/Footer.class.php:70
 msgid "phpMyAdmin Demo Server"
 msgstr ""
 
-#: index.php:152
+#: index.php:153
 #, php-format
 msgid ""
 "You are using the demo server. You can do anything here, but please do not "
@@ -720,110 +722,110 @@ msgid ""
 "at %s."
 msgstr ""
 
-#: index.php:162
+#: index.php:163
 msgid "General Settings"
 msgstr ""
 
-#: index.php:190 libraries/display_change_password.lib.php:50
+#: index.php:191 libraries/display_change_password.lib.php:50
 #: libraries/display_change_password.lib.php:53 user_password.php:247
 msgid "Change password"
 msgstr ""
 
-#: index.php:206
+#: index.php:207
 msgid "Server connection collation"
 msgstr ""
 
-#: index.php:228
+#: index.php:229
 msgid "Appearance Settings"
 msgstr ""
 
-#: index.php:258 prefs_manage.php:285
+#: index.php:259 prefs_manage.php:285
 msgid "More settings"
 msgstr ""
 
-#: index.php:279
+#: index.php:280
 msgid "Database server"
 msgstr ""
 
-#: index.php:282 libraries/plugins/auth/AuthenticationCookie.class.php:181
+#: index.php:283 libraries/plugins/auth/AuthenticationCookie.class.php:169
 msgid "Server:"
 msgstr ""
 
-#: index.php:286
+#: index.php:287
 msgid "Server type:"
 msgstr ""
 
-#: index.php:290 libraries/plugins/export/ExportLatex.class.php:212
+#: index.php:291 libraries/plugins/export/ExportLatex.class.php:212
 #: libraries/plugins/export/ExportSql.class.php:687
 #: libraries/plugins/export/ExportXml.class.php:189
 msgid "Server version:"
 msgstr ""
 
-#: index.php:296
+#: index.php:297
 msgid "Protocol version:"
 msgstr ""
 
-#: index.php:300
+#: index.php:301
 msgid "User:"
 msgstr "ಸದಸ್ಯ:"
 
-#: index.php:305
+#: index.php:306
 msgid "Server charset:"
 msgstr ""
 
-#: index.php:320
+#: index.php:321
 msgid "Web server"
 msgstr ""
 
-#: index.php:331
+#: index.php:332
 msgid "Database client version:"
 msgstr ""
 
-#: index.php:335
+#: index.php:336
 msgid "PHP extension:"
 msgstr ""
 
-#: index.php:349
+#: index.php:350
 msgid "PHP version:"
 msgstr ""
 
-#: index.php:360
+#: index.php:361
 msgid "Show PHP information"
 msgstr ""
 
-#: index.php:383
+#: index.php:384
 msgid "Version information:"
 msgstr ""
 
-#: index.php:392 libraries/Util.class.php:432 libraries/Util.class.php:495
-#: libraries/config/FormDisplay.tpl.php:151
+#: index.php:393 libraries/Util.class.php:432 libraries/Util.class.php:495
+#: libraries/config/FormDisplay.tpl.php:162
 #: libraries/display_export.lib.php:577 libraries/engines/pbxt.lib.php:162
 #: libraries/navigation/NavigationHeader.class.php:196
 #: libraries/server_variables.lib.php:160
 msgid "Documentation"
 msgstr ""
 
-#: index.php:399
+#: index.php:400
 msgid "Wiki"
 msgstr ""
 
-#: index.php:408
+#: index.php:409
 msgid "Official Homepage"
 msgstr ""
 
-#: index.php:415
+#: index.php:416
 msgid "Contribute"
 msgstr ""
 
-#: index.php:422
+#: index.php:423
 msgid "Get support"
 msgstr ""
 
-#: index.php:429
+#: index.php:430
 msgid "List of changes"
 msgstr ""
 
-#: index.php:451
+#: index.php:452
 msgid ""
 "You are connected as 'root' with no password, which corresponds to the "
 "default MySQL privileged account. Your MySQL server is running with this "
@@ -831,21 +833,21 @@ msgid ""
 "by setting a password for user 'root'."
 msgstr ""
 
-#: index.php:468
+#: index.php:469
 msgid ""
 "You have enabled mbstring.func_overload in your PHP configuration. This "
 "option is incompatible with phpMyAdmin and might cause some data to be "
 "corrupted!"
 msgstr ""
 
-#: index.php:483
+#: index.php:484
 msgid ""
 "The mbstring PHP extension was not found and you seem to be using a "
 "multibyte charset. Without the mbstring extension phpMyAdmin is unable to "
 "split strings correctly and it may result in unexpected results."
 msgstr ""
 
-#: index.php:500
+#: index.php:501
 msgid ""
 "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini."
 "session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower than "
@@ -853,17 +855,17 @@ msgid ""
 "expire sooner than configured in phpMyAdmin."
 msgstr ""
 
-#: index.php:519
+#: index.php:520
 msgid ""
 "Login cookie store is lower than cookie validity configured in phpMyAdmin, "
 "because of this, your login will expire sooner than configured in phpMyAdmin."
 msgstr ""
 
-#: index.php:535
+#: index.php:536
 msgid "The configuration file now needs a secret passphrase (blowfish_secret)."
 msgstr ""
 
-#: index.php:548
+#: index.php:549
 msgid ""
 "Directory [code]config[/code], which is used by the setup script, still "
 "exists in your phpMyAdmin directory. It is strongly recommended to remove it "
@@ -871,26 +873,26 @@ msgid ""
 "may be compromised by unauthorized people downloading your configuration."
 msgstr ""
 
-#: index.php:564
+#: index.php:565
 #, php-format
 msgid ""
 "The phpMyAdmin configuration storage is not completely configured, some "
 "extended features have been deactivated. %sFind out why%s. "
 msgstr ""
 
-#: index.php:571
+#: index.php:572
 msgid ""
 "Or alternately go to 'Operations' tab of any database to set it up there."
 msgstr ""
 
-#: index.php:620
+#: index.php:621
 #, php-format
 msgid ""
 "Your PHP MySQL library version %s differs from your MySQL server version %s. "
 "This may cause unpredictable behavior."
 msgstr ""
 
-#: index.php:648
+#: index.php:649
 #, php-format
 msgid ""
 "Server running with Suhosin. Please refer to %sdocumentation%s for possible "
@@ -1031,8 +1033,8 @@ msgstr ""
 msgid "Save & Close"
 msgstr ""
 
-#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:404
-#: libraries/insert_edit.lib.php:1550 prefs_manage.php:361
+#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:415
+#: libraries/insert_edit.lib.php:1548 prefs_manage.php:361
 #: prefs_manage.php:372
 msgid "Reset"
 msgstr ""
@@ -1065,7 +1067,7 @@ msgstr ""
 msgid "Edit Index"
 msgstr ""
 
-#: js/messages.php:99 templates/index_form.phtml:232
+#: js/messages.php:99 templates/table/index_form.phtml:232
 #, php-format
 msgid "Add %s column(s) to index"
 msgstr ""
@@ -1086,13 +1088,14 @@ msgstr ""
 msgid "Please select column(s) for the index."
 msgstr ""
 
-#: js/messages.php:106 templates/structure/add_column.phtml:1
+#: js/messages.php:106 templates/table/structure/add_column.phtml:1
 msgid "You have to add at least one column."
 msgstr ""
 
-#: js/messages.php:109 libraries/insert_edit.lib.php:1548
+#: js/messages.php:109 libraries/insert_edit.lib.php:1546
 #: templates/columns_definitions/column_definitions_form.phtml:162
-#: templates/index_form.phtml:237 templates/tbl_relation/common_form.phtml:106
+#: templates/table/index_form.phtml:237
+#: templates/table/relation/common_form.phtml:106
 msgid "Preview SQL"
 msgstr ""
 
@@ -1109,7 +1112,7 @@ msgid "SQL query:"
 msgstr ""
 
 #. l10n: Default label for the y-Axis of Charts
-#: js/messages.php:118 templates/tbl_chart.phtml:109
+#: js/messages.php:118 templates/table/chart/tbl_chart.phtml:109
 msgid "Y Values"
 msgstr ""
 
@@ -1260,7 +1263,7 @@ msgstr ""
 msgid "Bytes received"
 msgstr ""
 
-#: js/messages.php:169 libraries/server_status.lib.php:226
+#: js/messages.php:169 libraries/server_status.lib.php:235
 msgid "Connections"
 msgstr ""
 
@@ -1317,12 +1320,12 @@ msgstr ""
 msgid "Questions"
 msgstr ""
 
-#: js/messages.php:184 libraries/server_status.lib.php:134
+#: js/messages.php:184 libraries/server_status.lib.php:143
 msgid "Traffic"
 msgstr ""
 
 #: js/messages.php:185 libraries/Menu.class.php:586
-#: libraries/Util.class.php:4318 libraries/server_status_monitor.lib.php:257
+#: libraries/Util.class.php:4324 libraries/server_status_monitor.lib.php:257
 msgid "Settings"
 msgstr ""
 
@@ -1342,8 +1345,9 @@ msgstr ""
 #: libraries/server_status_monitor.lib.php:236
 #: libraries/server_status_processes.lib.php:308
 #: templates/columns_definitions/transformation.phtml:4
-#: templates/designer/options_panel.phtml:178
-#: templates/table/options_zoom.phtml:12 templates/table/rows_zoom.phtml:26
+#: templates/database/designer/options_panel.phtml:178
+#: templates/table/search/options_zoom.phtml:12
+#: templates/table/search/rows_zoom.phtml:26
 msgid "None"
 msgstr ""
 
@@ -1611,8 +1615,8 @@ msgstr ""
 
 #: js/messages.php:270 libraries/Menu.class.php:352
 #: libraries/Menu.class.php:455 libraries/Menu.class.php:582
-#: libraries/Util.class.php:4317 libraries/Util.class.php:4332
-#: libraries/Util.class.php:4349 libraries/config/messages.inc.php:258
+#: libraries/Util.class.php:4323 libraries/Util.class.php:4338
+#: libraries/Util.class.php:4355 libraries/config/messages.inc.php:258
 #: libraries/display_import.lib.php:105
 #: libraries/server_status_monitor.lib.php:318 prefs_manage.php:238
 #: setup/frames/menu.inc.php:26
@@ -1672,13 +1676,13 @@ msgid "Formatting SQL..."
 msgstr ""
 
 #: js/messages.php:293 libraries/server_variables.lib.php:157
-#: templates/designer/aggregate_query_panel.phtml:63
-#: templates/designer/delete_relation_panel.phtml:28
-#: templates/designer/having_query_panel.phtml:117
-#: templates/designer/new_relation_panel.phtml:88
-#: templates/designer/options_panel.phtml:253
-#: templates/designer/rename_to_panel.phtml:45
-#: templates/designer/where_query_panel.phtml:83
+#: templates/database/designer/aggregate_query_panel.phtml:63
+#: templates/database/designer/delete_relation_panel.phtml:28
+#: templates/database/designer/having_query_panel.phtml:117
+#: templates/database/designer/new_relation_panel.phtml:88
+#: templates/database/designer/options_panel.phtml:253
+#: templates/database/designer/rename_to_panel.phtml:45
+#: templates/database/designer/where_query_panel.phtml:83
 msgid "Cancel"
 msgstr ""
 
@@ -1686,7 +1690,7 @@ msgstr ""
 msgid "Page-related settings"
 msgstr ""
 
-#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:402
+#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:413
 msgid "Apply"
 msgstr ""
 
@@ -1721,8 +1725,8 @@ msgstr ""
 msgid "Error text: %s"
 msgstr ""
 
-#: js/messages.php:307 libraries/db_common.inc.php:68
-#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:450
+#: js/messages.php:307 libraries/db_common.inc.php:69
+#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:461
 msgid "No databases selected."
 msgstr ""
 
@@ -1734,12 +1738,13 @@ msgstr ""
 msgid "Adding Primary Key"
 msgstr ""
 
-#: js/messages.php:310 templates/designer/aggregate_query_panel.phtml:59
-#: templates/designer/having_query_panel.phtml:113
-#: templates/designer/new_relation_panel.phtml:87
-#: templates/designer/options_panel.phtml:252
-#: templates/designer/rename_to_panel.phtml:41
-#: templates/designer/where_query_panel.phtml:82
+#: js/messages.php:310
+#: templates/database/designer/aggregate_query_panel.phtml:59
+#: templates/database/designer/having_query_panel.phtml:113
+#: templates/database/designer/new_relation_panel.phtml:87
+#: templates/database/designer/options_panel.phtml:252
+#: templates/database/designer/rename_to_panel.phtml:41
+#: templates/database/designer/where_query_panel.phtml:82
 msgid "OK"
 msgstr ""
 
@@ -1759,7 +1764,7 @@ msgstr ""
 msgid "Changing Charset"
 msgstr ""
 
-#: js/messages.php:320 libraries/Util.class.php:3217
+#: js/messages.php:320 libraries/Util.class.php:3223
 msgid "Enable foreign key checks"
 msgstr ""
 
@@ -1794,20 +1799,21 @@ msgstr ""
 #: js/messages.php:334 libraries/DisplayResults.class.php:4834
 #: libraries/DisplayResults.class.php:5092 libraries/Menu.class.php:344
 #: libraries/Menu.class.php:446 libraries/Menu.class.php:578
-#: libraries/Util.class.php:3636 libraries/Util.class.php:3637
-#: libraries/Util.class.php:4316 libraries/Util.class.php:4331
-#: libraries/Util.class.php:4348 libraries/config/messages.inc.php:252
+#: libraries/Util.class.php:3642 libraries/Util.class.php:3643
+#: libraries/Util.class.php:4322 libraries/Util.class.php:4337
+#: libraries/Util.class.php:4354 libraries/config/messages.inc.php:252
 #: libraries/display_export.lib.php:173 libraries/rte/rte_list.lib.php:146
 #: libraries/server_privileges.lib.php:2211
 #: libraries/server_privileges.lib.php:2290
 #: libraries/server_privileges.lib.php:2632
 #: libraries/server_privileges.lib.php:3356
 #: libraries/server_status_monitor.lib.php:322 prefs_manage.php:303
-#: setup/frames/menu.inc.php:27 templates/structure/check_all_tables.phtml:11
+#: setup/frames/menu.inc.php:27
+#: templates/database/structure/check_all_tables.phtml:11
 msgid "Export"
 msgstr ""
 
-#: js/messages.php:337 libraries/rte/rte_routines.lib.php:652
+#: js/messages.php:337 libraries/rte/rte_routines.lib.php:743
 msgid "ENUM/SET editor"
 msgstr ""
 
@@ -1846,7 +1852,7 @@ msgstr ""
 #: libraries/Console.class.php:214 libraries/DisplayResults.class.php:3474
 #: libraries/DisplayResults.class.php:4818 libraries/Index.class.php:723
 #: libraries/Util.class.php:706 libraries/Util.class.php:1202
-#: libraries/Util.class.php:3634 libraries/Util.class.php:3635
+#: libraries/Util.class.php:3640 libraries/Util.class.php:3641
 #: libraries/central_columns.lib.php:851
 #: libraries/central_columns.lib.php:1193
 #: libraries/config/messages.inc.php:892
@@ -1864,7 +1870,7 @@ msgstr ""
 #: libraries/server_user_groups.lib.php:129
 #: libraries/sql_query_form.lib.php:416 libraries/tracking.lib.php:477
 #: setup/frames/index.inc.php:183 setup/frames/index.inc.php:291
-#: templates/designer/delete_relation_panel.phtml:27
+#: templates/database/designer/delete_relation_panel.phtml:27
 msgid "Delete"
 msgstr ""
 
@@ -2025,11 +2031,11 @@ msgid "No dependencies selected!"
 msgstr ""
 
 #: js/messages.php:394 libraries/central_columns.lib.php:1214
-#: libraries/insert_edit.lib.php:1458 libraries/server_variables.lib.php:155
+#: libraries/insert_edit.lib.php:1456 libraries/server_variables.lib.php:155
 #: setup/frames/config.inc.php:42 setup/frames/index.inc.php:279
 #: templates/columns_definitions/column_definitions_form.phtml:165
-#: templates/gis_visualization/gis_visualization.phtml:48
-#: templates/tbl_relation/common_form.phtml:107
+#: templates/table/gis_visualization/gis_visualization.phtml:48
+#: templates/table/relation/common_form.phtml:107
 msgid "Save"
 msgstr ""
 
@@ -2106,8 +2112,8 @@ msgid "Data point content"
 msgstr ""
 
 #: js/messages.php:430 js/messages.php:562 js/messages.php:579
-#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2573
-#: templates/index_form.phtml:154 templates/index_form.phtml:194
+#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2571
+#: templates/table/index_form.phtml:154 templates/table/index_form.phtml:194
 msgid "Ignore"
 msgstr ""
 
@@ -2166,8 +2172,8 @@ msgstr ""
 msgid "Please select the primary key or a unique key!"
 msgstr ""
 
-#: js/messages.php:457 templates/designer/side_menu.phtml:91
-#: templates/designer/side_menu.phtml:94
+#: js/messages.php:457 templates/database/designer/side_menu.phtml:91
+#: templates/database/designer/side_menu.phtml:94
 msgid "Choose column to display"
 msgstr ""
 
@@ -2181,18 +2187,18 @@ msgstr ""
 msgid "Page name"
 msgstr ""
 
-#: js/messages.php:463 templates/designer/side_menu.phtml:56
-#: templates/designer/side_menu.phtml:59
+#: js/messages.php:463 templates/database/designer/side_menu.phtml:56
+#: templates/database/designer/side_menu.phtml:59
 msgid "Save page"
 msgstr ""
 
-#: js/messages.php:464 templates/designer/side_menu.phtml:63
-#: templates/designer/side_menu.phtml:66
+#: js/messages.php:464 templates/database/designer/side_menu.phtml:63
+#: templates/database/designer/side_menu.phtml:66
 msgid "Save page as"
 msgstr ""
 
-#: js/messages.php:465 templates/designer/side_menu.phtml:49
-#: templates/designer/side_menu.phtml:52
+#: js/messages.php:465 templates/database/designer/side_menu.phtml:49
+#: templates/database/designer/side_menu.phtml:52
 msgid "Open page"
 msgstr ""
 
@@ -2200,7 +2206,7 @@ msgstr ""
 msgid "Delete page"
 msgstr ""
 
-#: js/messages.php:467 templates/designer/side_menu.phtml:10
+#: js/messages.php:467 templates/database/designer/side_menu.phtml:10
 msgid "Untitled"
 msgstr ""
 
@@ -2311,7 +2317,7 @@ msgstr ""
 msgid "cancel"
 msgstr ""
 
-#: js/messages.php:499 libraries/server_status.lib.php:271
+#: js/messages.php:499 libraries/server_status.lib.php:280
 msgid "Aborted"
 msgstr ""
 
@@ -2861,7 +2867,7 @@ msgstr ""
 
 #: js/messages.php:793 libraries/Message.class.php:199
 #: libraries/Util.class.php:654 libraries/core.lib.php:245
-#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1172
+#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1170
 #: tbl_operations.php:229 view_operations.php:63
 msgid "Error"
 msgstr ""
@@ -2920,8 +2926,8 @@ msgstr ""
 msgid "per minute"
 msgstr ""
 
-#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:143
-#: libraries/server_status.lib.php:228
+#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:152
+#: libraries/server_status.lib.php:237
 #: libraries/server_status_queries.lib.php:98
 msgid "per hour"
 msgstr ""
@@ -2939,7 +2945,7 @@ msgstr ""
 msgid "Wrong permissions on configuration file, should not be world writable!"
 msgstr ""
 
-#: libraries/Config.class.php:1799
+#: libraries/Config.class.php:1801
 msgid "Font size"
 msgstr ""
 
@@ -2967,10 +2973,10 @@ msgstr ""
 #: libraries/server_privileges.lib.php:2890
 #: libraries/server_privileges.lib.php:3144
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4332
+#: libraries/server_privileges.lib.php:4358
 #: libraries/server_status_processes.lib.php:80
-#: templates/tbl_relation/foreign_key_row.phtml:165
-#: templates/tbl_relation/internal_relational_row.phtml:55
+#: templates/table/relation/foreign_key_row.phtml:165
+#: templates/table/relation/internal_relational_row.phtml:55
 msgid "Database"
 msgstr ""
 
@@ -3063,11 +3069,11 @@ msgstr ""
 #: libraries/plugins/import/ImportMediawiki.class.php:60
 #: libraries/plugins/import/ImportOds.class.php:59
 #: libraries/plugins/import/ImportShp.class.php:57
-#: libraries/plugins/import/ImportSql.class.php:148
+#: libraries/plugins/import/ImportSql.class.php:51
 #: libraries/plugins/import/ImportXml.class.php:58
-#: libraries/rte/rte_routines.lib.php:833 templates/index_form.phtml:49
-#: templates/structure/row_stats_table.phtml:20
-#: templates/table/options.phtml:2
+#: libraries/rte/rte_routines.lib.php:924 templates/table/index_form.phtml:49
+#: templates/table/search/options.phtml:2
+#: templates/table/structure/row_stats_table.phtml:20
 msgid "Options"
 msgstr ""
 
@@ -3100,7 +3106,8 @@ msgstr ""
 msgid "Order:"
 msgstr ""
 
-#: libraries/Console.class.php:289 templates/table/replace_preview.phtml:17
+#: libraries/Console.class.php:289
+#: templates/table/search/replace_preview.phtml:17
 msgid "Count"
 msgstr ""
 
@@ -3195,9 +3202,9 @@ msgstr ""
 #: libraries/operations.lib.php:794 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:191
-#: templates/structure/sortable_header.phtml:21
-#: templates/structure/sortable_header.phtml:38
-#: templates/table/options.phtml:68
+#: templates/database/structure/sortable_header.phtml:21
+#: templates/database/structure/sortable_header.phtml:38
+#: templates/table/search/options.phtml:68
 msgid "Ascending"
 msgstr ""
 
@@ -3207,13 +3214,14 @@ msgstr ""
 #: libraries/operations.lib.php:797 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:188
-#: templates/structure/sortable_header.phtml:26
-#: templates/structure/sortable_header.phtml:43
-#: templates/table/options.phtml:69
+#: templates/database/structure/sortable_header.phtml:26
+#: templates/database/structure/sortable_header.phtml:43
+#: templates/table/search/options.phtml:69
 msgid "Descending"
 msgstr ""
 
-#: libraries/DBQbe.class.php:467 templates/table/search_and_replace.phtml:6
+#: libraries/DBQbe.class.php:467
+#: templates/table/search/search_and_replace.phtml:6
 msgid "Column:"
 msgstr ""
 
@@ -3368,12 +3376,12 @@ msgstr[0] ""
 msgstr[1] ""
 
 #: libraries/DbSearch.class.php:354 libraries/Menu.class.php:311
-#: libraries/Util.class.php:3337 libraries/Util.class.php:3347
-#: libraries/Util.class.php:3623 libraries/Util.class.php:3624
-#: libraries/Util.class.php:4343 libraries/config.values.php:43
+#: libraries/Util.class.php:3343 libraries/Util.class.php:3353
+#: libraries/Util.class.php:3629 libraries/Util.class.php:3630
+#: libraries/Util.class.php:4349 libraries/config.values.php:43
 #: libraries/config.values.php:51 libraries/config.values.php:119
 #: libraries/navigation/Nodes/Node_Table.class.php:295
-#: templates/structure/check_all_table_column.phtml:5
+#: templates/table/structure/check_all_table_column.phtml:5
 msgid "Browse"
 msgstr ""
 
@@ -3390,7 +3398,8 @@ msgstr ""
 msgid "Words or values to search for (wildcard: \"%\"):"
 msgstr ""
 
-#: libraries/DbSearch.class.php:401 templates/table/search_and_replace.phtml:1
+#: libraries/DbSearch.class.php:401
+#: templates/table/search/search_and_replace.phtml:1
 msgid "Find:"
 msgstr ""
 
@@ -3434,28 +3443,28 @@ msgstr ""
 msgid "Search this table"
 msgstr ""
 
-#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2532
-#: libraries/Util.class.php:2535
+#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2538
+#: libraries/Util.class.php:2541
 msgctxt "First page"
 msgid "Begin"
 msgstr ""
 
-#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2533
-#: libraries/Util.class.php:2536 libraries/server_bin_log.lib.php:170
+#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2539
+#: libraries/Util.class.php:2542 libraries/server_bin_log.lib.php:170
 #: libraries/server_bin_log.lib.php:172
 msgctxt "Previous page"
 msgid "Previous"
 msgstr ""
 
-#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2564
-#: libraries/Util.class.php:2574 libraries/server_bin_log.lib.php:204
+#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2570
+#: libraries/Util.class.php:2580 libraries/server_bin_log.lib.php:204
 #: libraries/server_bin_log.lib.php:206
 msgctxt "Next page"
 msgid "Next"
 msgstr ""
 
-#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2565
-#: libraries/Util.class.php:2575
+#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2571
+#: libraries/Util.class.php:2581
 msgctxt "Last page"
 msgid "End"
 msgstr ""
@@ -3528,15 +3537,15 @@ msgid "May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]."
 msgstr ""
 
 #: libraries/DisplayResults.class.php:4332 libraries/Message.class.php:180
-#: libraries/controllers/TableRelationController.class.php:258
+#: libraries/controllers/TableRelationController.class.php:259
 #: libraries/controllers/TableSearchController.class.php:655
-#: libraries/rte/rte_routines.lib.php:1332 libraries/sql_query_form.lib.php:89
+#: libraries/rte/rte_routines.lib.php:1423 libraries/sql_query_form.lib.php:89
 #: tbl_operations.php:227 tbl_row_action.php:138 view_operations.php:62
 msgid "Your SQL query has been executed successfully."
 msgstr ""
 
 #: libraries/DisplayResults.class.php:4660
-#: libraries/controllers/StructureController.class.php:629
+#: libraries/controllers/DatabaseStructureController.class.php:564
 #, php-format
 msgid ""
 "This view has at least this number of rows. Please refer to %sdocumentation"
@@ -3558,33 +3567,33 @@ msgstr ""
 msgid "%d total"
 msgstr ""
 
-#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1318
+#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1312
 #, php-format
 msgid "Query took %01.4f seconds."
 msgstr ""
 
 #: libraries/DisplayResults.class.php:4807
-#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4767
-#: libraries/Util.class.php:4773 libraries/mult_submits.inc.php:50
-#: templates/structure/check_all_tables.phtml:2
-#: templates/structure/check_all_tables.phtml:9
+#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4773
+#: libraries/Util.class.php:4779 libraries/mult_submits.inc.php:50
+#: templates/database/structure/check_all_tables.phtml:2
+#: templates/database/structure/check_all_tables.phtml:9
 msgid "With selected:"
 msgstr ""
 
 #: libraries/DisplayResults.class.php:4811
-#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4769
-#: libraries/Util.class.php:4770 libraries/server_privileges.lib.php:1174
+#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4775
+#: libraries/Util.class.php:4776 libraries/server_privileges.lib.php:1174
 #: libraries/server_privileges.lib.php:1175
 #: libraries/server_privileges.lib.php:1387
 #: libraries/server_user_groups.lib.php:231
-#: templates/structure/check_all_tables.phtml:3
-#: templates/structure/check_all_tables.phtml:4
+#: templates/database/structure/check_all_tables.phtml:3
+#: templates/database/structure/check_all_tables.phtml:4
 msgid "Check All"
 msgstr ""
 
 #: libraries/DisplayResults.class.php:4985 libraries/Header.class.php:383
-#: templates/structure/optional_action_links.phtml:1
-#: templates/structure/print_view_data_dictionary_link.phtml:3
+#: templates/database/structure/print_view_data_dictionary_link.phtml:3
+#: templates/table/structure/optional_action_links.phtml:1
 msgid "Print view"
 msgstr ""
 
@@ -3592,7 +3601,8 @@ msgstr ""
 msgid "Query results operations"
 msgstr ""
 
-#: libraries/DisplayResults.class.php:5105 templates/tbl_chart.phtml:12
+#: libraries/DisplayResults.class.php:5105
+#: templates/table/chart/tbl_chart.phtml:12
 msgid "Display chart"
 msgstr ""
 
@@ -3681,7 +3691,7 @@ msgid "Click on the bar to scroll to top of page"
 msgstr ""
 
 #: libraries/Header.class.php:749
-#: libraries/plugins/auth/AuthenticationCookie.class.php:152
+#: libraries/plugins/auth/AuthenticationCookie.class.php:140
 msgid "Javascript must be enabled past this point!"
 msgstr ""
 
@@ -3703,11 +3713,11 @@ msgid "Keyname"
 msgstr ""
 
 #: libraries/Index.class.php:697
-#: libraries/controllers/StructureController.class.php:1962
-#: libraries/controllers/StructureController.class.php:1967
+#: libraries/controllers/TableStructureController.class.php:953
+#: libraries/controllers/TableStructureController.class.php:958
 #: libraries/tracking.lib.php:973
 #: templates/columns_definitions/column_indexes.phtml:11
-#: templates/structure/check_all_table_column.phtml:26
+#: templates/table/structure/check_all_table_column.phtml:26
 msgid "Unique"
 msgstr ""
 
@@ -3726,16 +3736,17 @@ msgstr ""
 #: libraries/server_collations.lib.php:35 libraries/tracking.lib.php:881
 #: libraries/tracking.lib.php:977
 #: templates/columns_definitions/table_fields_definitions.phtml:33
-#: templates/structure/row_stats_table.phtml:31
-#: templates/structure/table_header.phtml:55
-#: templates/structure/table_structure_header.phtml:7
-#: templates/table/table_header.phtml:8
+#: templates/database/structure/table_header.phtml:55
+#: templates/table/search/table_header.phtml:8
+#: templates/table/structure/row_stats_table.phtml:31
+#: templates/table/structure/table_structure_header.phtml:7
 msgid "Collation"
 msgstr ""
 
 #: libraries/Index.class.php:703 libraries/rte/rte_events.lib.php:496
-#: libraries/rte/rte_routines.lib.php:956 libraries/tracking.lib.php:885
-#: libraries/tracking.lib.php:979 templates/structure/table_header.phtml:84
+#: libraries/rte/rte_routines.lib.php:1047 libraries/tracking.lib.php:885
+#: libraries/tracking.lib.php:979
+#: templates/database/structure/table_header.phtml:84
 msgid "Comment"
 msgstr ""
 
@@ -3748,15 +3759,15 @@ msgstr ""
 msgid "Index %s has been dropped."
 msgstr ""
 
-#: libraries/Index.class.php:757 libraries/Util.class.php:3630
-#: libraries/Util.class.php:3631
-#: libraries/controllers/StructureController.class.php:1958
-#: libraries/controllers/StructureController.class.php:1959
+#: libraries/Index.class.php:757 libraries/Util.class.php:3636
+#: libraries/Util.class.php:3637
+#: libraries/controllers/TableStructureController.class.php:949
+#: libraries/controllers/TableStructureController.class.php:950
 #: libraries/operations.lib.php:1607 libraries/rte/rte_list.lib.php:150
 #: libraries/server_databases.lib.php:146
-#: templates/structure/check_all_table_column.phtml:15
-#: templates/structure/check_all_tables.phtml:16
-#: templates/tbl_relation/foreign_key_row.phtml:93
+#: templates/database/structure/check_all_tables.phtml:16
+#: templates/table/relation/foreign_key_row.phtml:93
+#: templates/table/structure/check_all_table_column.phtml:15
 msgid "Drop"
 msgstr ""
 
@@ -3785,16 +3796,16 @@ msgstr ""
 #: libraries/Menu.class.php:248
 #: libraries/navigation/Nodes/Node_View.class.php:32
 #: libraries/tbl_info.inc.php:63
-#: templates/structure/structure_table_row.phtml:97
-#: templates/structure/structure_table_row.phtml:159
+#: templates/database/structure/structure_table_row.phtml:97
+#: templates/database/structure/structure_table_row.phtml:159
 msgid "View"
 msgstr ""
 
 #: libraries/Menu.class.php:325 libraries/Menu.class.php:429
-#: libraries/Menu.class.php:548 libraries/Util.class.php:3334
-#: libraries/Util.class.php:3344 libraries/Util.class.php:3350
-#: libraries/Util.class.php:4313 libraries/Util.class.php:4328
-#: libraries/Util.class.php:4345 libraries/config.values.php:40
+#: libraries/Menu.class.php:548 libraries/Util.class.php:3340
+#: libraries/Util.class.php:3350 libraries/Util.class.php:3356
+#: libraries/Util.class.php:4319 libraries/Util.class.php:4334
+#: libraries/Util.class.php:4351 libraries/config.values.php:40
 #: libraries/config.values.php:48 libraries/config.values.php:110
 #: libraries/config.values.php:116 libraries/config/messages.inc.php:321
 #: libraries/navigation/Nodes/Node_Table.class.php:292
@@ -3802,19 +3813,19 @@ msgid "SQL"
 msgstr ""
 
 #: libraries/Menu.class.php:328 libraries/Menu.class.php:432
-#: libraries/Util.class.php:3335 libraries/Util.class.php:3345
-#: libraries/Util.class.php:3351 libraries/Util.class.php:3625
-#: libraries/Util.class.php:3626 libraries/Util.class.php:4329
-#: libraries/Util.class.php:4346 libraries/config.values.php:41
+#: libraries/Util.class.php:3341 libraries/Util.class.php:3351
+#: libraries/Util.class.php:3357 libraries/Util.class.php:3631
+#: libraries/Util.class.php:3632 libraries/Util.class.php:4335
+#: libraries/Util.class.php:4352 libraries/config.values.php:41
 #: libraries/config.values.php:49 libraries/config.values.php:111
 #: libraries/config.values.php:117
 #: libraries/navigation/Nodes/Node_Table.class.php:286
 msgid "Search"
 msgstr ""
 
-#: libraries/Menu.class.php:338 libraries/Util.class.php:3336
-#: libraries/Util.class.php:3346 libraries/Util.class.php:3627
-#: libraries/Util.class.php:3628 libraries/Util.class.php:4347
+#: libraries/Menu.class.php:338 libraries/Util.class.php:3342
+#: libraries/Util.class.php:3352 libraries/Util.class.php:3633
+#: libraries/Util.class.php:3634 libraries/Util.class.php:4353
 #: libraries/config.values.php:42 libraries/config.values.php:50
 #: libraries/config.values.php:118
 #: libraries/navigation/Nodes/Node_Table.class.php:289
@@ -3823,30 +3834,30 @@ msgid "Insert"
 msgstr ""
 
 #: libraries/Menu.class.php:362 libraries/Menu.class.php:467
-#: libraries/Util.class.php:4334 libraries/Util.class.php:4350
+#: libraries/Util.class.php:4340 libraries/Util.class.php:4356
 #: libraries/config.values.php:106 libraries/server_common.lib.php:51
 #: libraries/server_privileges.lib.php:2370
 #: libraries/server_privileges.lib.php:3158
-#: libraries/server_privileges.lib.php:4221
+#: libraries/server_privileges.lib.php:4247
 msgid "Privileges"
 msgstr ""
 
 #: libraries/Menu.class.php:371 libraries/Menu.class.php:379
-#: libraries/Menu.class.php:459 libraries/Util.class.php:3338
-#: libraries/Util.class.php:3352 libraries/Util.class.php:4333
-#: libraries/Util.class.php:4351 libraries/config.values.php:112
+#: libraries/Menu.class.php:459 libraries/Util.class.php:3344
+#: libraries/Util.class.php:3358 libraries/Util.class.php:4339
+#: libraries/Util.class.php:4357 libraries/config.values.php:112
 #: view_operations.php:92
 msgid "Operations"
 msgstr ""
 
 #: libraries/Menu.class.php:384 libraries/Menu.class.php:492
-#: libraries/Util.class.php:4338 libraries/Util.class.php:4352
+#: libraries/Util.class.php:4344 libraries/Util.class.php:4358
 #: libraries/relation.lib.php:255
 msgid "Tracking"
 msgstr ""
 
 #: libraries/Menu.class.php:397 libraries/Menu.class.php:486
-#: libraries/Util.class.php:4337 libraries/Util.class.php:4353
+#: libraries/Util.class.php:4343 libraries/Util.class.php:4359
 #: libraries/navigation/Nodes/Node_Trigger_Container.class.php:24
 #: libraries/plugins/export/ExportHtmlword.class.php:557
 #: libraries/plugins/export/ExportOdt.class.php:685
@@ -3863,16 +3874,16 @@ msgstr ""
 msgid "Database seems to be empty!"
 msgstr ""
 
-#: libraries/Menu.class.php:439 libraries/Util.class.php:4330
+#: libraries/Menu.class.php:439 libraries/Util.class.php:4336
 msgid "Query"
 msgstr ""
 
-#: libraries/Menu.class.php:472 libraries/Util.class.php:4335
+#: libraries/Menu.class.php:472 libraries/Util.class.php:4341
 #: libraries/rte/rte_words.lib.php:36
 msgid "Routines"
 msgstr ""
 
-#: libraries/Menu.class.php:479 libraries/Util.class.php:4336
+#: libraries/Menu.class.php:479 libraries/Util.class.php:4342
 #: libraries/navigation/Nodes/Node_Event_Container.class.php:26
 #: libraries/plugins/export/ExportSql.class.php:940
 #: libraries/plugins/export/ExportXml.class.php:107
@@ -3880,20 +3891,20 @@ msgstr ""
 msgid "Events"
 msgstr ""
 
-#: libraries/Menu.class.php:498 libraries/Util.class.php:4339
+#: libraries/Menu.class.php:498 libraries/Util.class.php:4345
 msgid "Designer"
 msgstr ""
 
-#: libraries/Menu.class.php:507 libraries/Util.class.php:4340
-#: templates/structure/check_all_tables.phtml:35
+#: libraries/Menu.class.php:507 libraries/Util.class.php:4346
+#: templates/database/structure/check_all_tables.phtml:35
 msgid "Central columns"
 msgstr ""
 
-#: libraries/Menu.class.php:544 libraries/Util.class.php:4312
+#: libraries/Menu.class.php:544 libraries/Util.class.php:4318
 #: libraries/config.values.php:103 libraries/config/messages.inc.php:266
 #: libraries/config/messages.inc.php:341
 #: libraries/navigation/NavigationTree.class.php:1239
-#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4332
+#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4358
 msgid "Databases"
 msgstr ""
 
@@ -3902,34 +3913,34 @@ msgid "User accounts"
 msgstr ""
 
 #: libraries/Menu.class.php:595 libraries/ServerStatusData.class.php:121
-#: libraries/Util.class.php:4319 libraries/server_common.lib.php:36
+#: libraries/Util.class.php:4325 libraries/server_common.lib.php:36
 msgid "Binary log"
 msgstr ""
 
 #: libraries/Menu.class.php:601 libraries/ServerStatusData.class.php:126
-#: libraries/Util.class.php:4320 libraries/server_common.lib.php:42
-#: templates/structure/body_for_table_summary.phtml:10
-#: templates/structure/table_header.phtml:27
+#: libraries/Util.class.php:4326 libraries/server_common.lib.php:42
+#: templates/database/structure/body_for_table_summary.phtml:10
+#: templates/database/structure/table_header.phtml:27
 msgid "Replication"
 msgstr ""
 
 #: libraries/Menu.class.php:606 libraries/ServerStatusData.class.php:193
-#: libraries/Util.class.php:4321 libraries/config.values.php:105
+#: libraries/Util.class.php:4327 libraries/config.values.php:105
 #: libraries/server_engines.lib.php:108 libraries/server_engines.lib.php:112
 #: libraries/sql_query_form.lib.php:421
 msgid "Variables"
 msgstr ""
 
-#: libraries/Menu.class.php:610 libraries/Util.class.php:4322
+#: libraries/Menu.class.php:610 libraries/Util.class.php:4328
 msgid "Charsets"
 msgstr ""
 
-#: libraries/Menu.class.php:615 libraries/Util.class.php:4323
+#: libraries/Menu.class.php:615 libraries/Util.class.php:4329
 #: libraries/server_common.lib.php:33 libraries/server_plugins.lib.php:27
 msgid "Plugins"
 msgstr ""
 
-#: libraries/Menu.class.php:626 libraries/Util.class.php:4324
+#: libraries/Menu.class.php:626 libraries/Util.class.php:4330
 msgid "Engines"
 msgstr ""
 
@@ -3954,7 +3965,7 @@ msgid_plural "%1$d rows inserted."
 msgstr[0] ""
 msgstr[1] ""
 
-#: libraries/PDF.class.php:70 libraries/Util.class.php:2521
+#: libraries/PDF.class.php:70 libraries/Util.class.php:2527
 #: libraries/browse_foreigners.lib.php:327
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:865
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:890
@@ -3975,7 +3986,7 @@ msgid "Could not save favorite table!"
 msgstr ""
 
 #: libraries/RecentFavoriteTable.class.php:212
-#: templates/structure/favorite_anchor.phtml:12
+#: templates/database/structure/favorite_anchor.phtml:12
 msgid "Remove from Favorites"
 msgstr ""
 
@@ -4140,7 +4151,7 @@ msgid ""
 msgstr ""
 
 #: libraries/StorageEngine.class.php:373
-#: templates/structure/body_for_table_summary.phtml:50
+#: templates/database/structure/body_for_table_summary.phtml:50
 #, php-format
 msgid "%s is the default storage engine on this MySQL server."
 msgstr ""
@@ -4552,10 +4563,10 @@ msgstr ""
 
 #: libraries/Util.class.php:726 libraries/rte/rte_events.lib.php:110
 #: libraries/rte/rte_events.lib.php:119 libraries/rte/rte_events.lib.php:150
-#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:153
-#: libraries/rte/rte_routines.lib.php:162
-#: libraries/rte/rte_routines.lib.php:235
-#: libraries/rte/rte_routines.lib.php:1366
+#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:223
+#: libraries/rte/rte_routines.lib.php:250
+#: libraries/rte/rte_routines.lib.php:372
+#: libraries/rte/rte_routines.lib.php:1457
 #: libraries/rte/rte_triggers.lib.php:86 libraries/rte/rte_triggers.lib.php:95
 #: libraries/rte/rte_triggers.lib.php:127
 msgid "MySQL said: "
@@ -4599,75 +4610,78 @@ msgstr "ರ"
 msgid "%B %d, %Y at %I:%M %p"
 msgstr ""
 
-#: libraries/Util.class.php:2019
+#: libraries/Util.class.php:2025
 #, php-format
 msgid "%s days, %s hours, %s minutes and %s seconds"
 msgstr ""
 
-#: libraries/Util.class.php:2112
+#: libraries/Util.class.php:2118
 msgid "Missing parameter:"
 msgstr ""
 
-#: libraries/Util.class.php:2645
+#: libraries/Util.class.php:2651
 #, php-format
 msgid "Jump to database \"%s\"."
 msgstr ""
 
-#: libraries/Util.class.php:2670
+#: libraries/Util.class.php:2676
 #, php-format
 msgid "The %s functionality is affected by a known bug, see %s"
 msgstr ""
 
-#: libraries/Util.class.php:2881
+#: libraries/Util.class.php:2887
 msgid "Click to toggle"
 msgstr ""
 
-#: libraries/Util.class.php:3542 prefs_manage.php:248
+#: libraries/Util.class.php:3548 prefs_manage.php:248
 msgid "Browse your computer:"
 msgstr ""
 
-#: libraries/Util.class.php:3567
+#: libraries/Util.class.php:3573
 #, php-format
 msgid "Select from the web server upload directory <b>%s</b>:"
 msgstr ""
 
-#: libraries/Util.class.php:3596 libraries/insert_edit.lib.php:1173
+#: libraries/Util.class.php:3602 libraries/insert_edit.lib.php:1171
 msgid "The directory you set for upload work cannot be reached."
 msgstr ""
 
-#: libraries/Util.class.php:3607
+#: libraries/Util.class.php:3613
 msgid "There are no files to upload!"
 msgstr ""
 
-#: libraries/Util.class.php:3632 libraries/Util.class.php:3633
-#: templates/structure/check_all_tables.phtml:15
+#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: templates/database/structure/check_all_tables.phtml:15
 msgid "Empty"
 msgstr ""
 
-#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: libraries/Util.class.php:3644 libraries/Util.class.php:3645
 msgid "Execute"
 msgstr ""
 
-#: libraries/Util.class.php:4152
+#: libraries/Util.class.php:4158
 msgid "Print"
 msgstr ""
 
-#: libraries/Util.class.php:4257 templates/structure/row_stats_table.phtml:80
-#: templates/structure/table_header.phtml:95
+#: libraries/Util.class.php:4263
+#: templates/database/structure/table_header.phtml:95
+#: templates/table/structure/row_stats_table.phtml:80
 msgid "Creation"
 msgstr ""
 
-#: libraries/Util.class.php:4263 templates/structure/row_stats_table.phtml:87
-#: templates/structure/table_header.phtml:106
+#: libraries/Util.class.php:4269
+#: templates/database/structure/table_header.phtml:106
+#: templates/table/structure/row_stats_table.phtml:87
 msgid "Last update"
 msgstr ""
 
-#: libraries/Util.class.php:4269 templates/structure/row_stats_table.phtml:94
-#: templates/structure/table_header.phtml:117
+#: libraries/Util.class.php:4275
+#: templates/database/structure/table_header.phtml:117
+#: templates/table/structure/row_stats_table.phtml:94
 msgid "Last check"
 msgstr ""
 
-#: libraries/Util.class.php:4315
+#: libraries/Util.class.php:4321
 msgid "Users"
 msgstr "ಬಳಕೆದಾರರು"
 
@@ -4688,16 +4702,16 @@ msgid "Use this value"
 msgstr ""
 
 #: libraries/build_html_for_db.lib.php:33 libraries/import.lib.php:193
-#: templates/structure/actions_in_table_structure.phtml:113
-#: templates/structure/row_stats_table.phtml:42
-#: templates/structure/table_header.phtml:36
+#: templates/database/structure/table_header.phtml:36
+#: templates/table/structure/actions_in_table_structure.phtml:113
+#: templates/table/structure/row_stats_table.phtml:42
 msgid "Rows"
 msgstr "ಸಾಲುಗಳು"
 
 #: libraries/build_html_for_db.lib.php:48 libraries/engines/innodb.lib.php:171
-#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:186
-#: libraries/server_status.lib.php:298
-#: templates/structure/display_table_stats.phtml:40
+#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:195
+#: libraries/server_status.lib.php:307
+#: templates/table/structure/display_table_stats.phtml:40
 msgid "Total"
 msgstr ""
 
@@ -4706,10 +4720,12 @@ msgid "Jump to database"
 msgstr ""
 
 #: libraries/build_html_for_db.lib.php:146
+#: templates/database/structure/structure_table_row.phtml:15
 msgid "Not replicated"
 msgstr ""
 
 #: libraries/build_html_for_db.lib.php:158
+#: templates/database/structure/structure_table_row.phtml:16
 msgid "Replicated"
 msgstr ""
 
@@ -4762,17 +4778,17 @@ msgstr "ಯಾವುದೇ"
 #: libraries/plugins/export/ExportTexytext.class.php:425
 #: libraries/plugins/export/PMA_ExportPdf.class.php:307
 #: libraries/rte/rte_list.lib.php:73 libraries/rte/rte_list.lib.php:85
-#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:830
-#: libraries/rte/rte_routines.lib.php:1492 setup/frames/index.inc.php:162
+#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:921
+#: libraries/rte/rte_routines.lib.php:1583 setup/frames/index.inc.php:162
 #: templates/columns_definitions/table_fields_definitions.phtml:8
-#: templates/structure/table_structure_header.phtml:5
-#: templates/table/create_table.phtml:11
+#: templates/database/create_table.phtml:11
+#: templates/table/structure/table_structure_header.phtml:5
 msgid "Name"
 msgstr ""
 
 #: libraries/central_columns.lib.php:699
 #: libraries/central_columns.lib.php:1381
-#: libraries/rte/rte_routines.lib.php:832
+#: libraries/rte/rte_routines.lib.php:923
 #: templates/columns_definitions/table_fields_definitions.phtml:14
 msgid "Length/Values"
 msgstr ""
@@ -4791,7 +4807,7 @@ msgid "Select a table"
 msgstr ""
 
 #: libraries/central_columns.lib.php:804
-#: templates/structure/add_column.phtml:4
+#: templates/table/structure/add_column.phtml:4
 msgid "Add column"
 msgstr ""
 
@@ -4807,7 +4823,7 @@ msgstr ""
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1002
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1025
 #: templates/columns_definitions/table_fields_definitions.phtml:36
-#: templates/structure/table_structure_header.phtml:8
+#: templates/table/structure/table_structure_header.phtml:8
 msgid "Attributes"
 msgstr ""
 
@@ -4916,7 +4932,7 @@ msgid "Double click"
 msgstr ""
 
 #: libraries/config.values.php:95 libraries/config.values.php:124
-#: libraries/config/FormDisplay.tpl.php:221 libraries/relation.lib.php:97
+#: libraries/config/FormDisplay.tpl.php:232 libraries/relation.lib.php:97
 #: libraries/relation.lib.php:105
 msgid "Disabled"
 msgstr ""
@@ -5086,21 +5102,21 @@ msgstr ""
 msgid "maximum %s"
 msgstr ""
 
-#: libraries/config/FormDisplay.tpl.php:219
+#: libraries/config/FormDisplay.tpl.php:230
 msgid "This setting is disabled, it will not be applied to your configuration."
 msgstr ""
 
-#: libraries/config/FormDisplay.tpl.php:313
+#: libraries/config/FormDisplay.tpl.php:324
 #, php-format
 msgid "Set value: %s"
 msgstr ""
 
-#: libraries/config/FormDisplay.tpl.php:318
+#: libraries/config/FormDisplay.tpl.php:329
 #: libraries/config/messages.inc.php:610
 msgid "Restore default value"
 msgstr ""
 
-#: libraries/config/FormDisplay.tpl.php:332
+#: libraries/config/FormDisplay.tpl.php:343
 msgid "Allow users to customize this value"
 msgstr ""
 
@@ -5516,7 +5532,7 @@ msgstr ""
 
 #: libraries/config/messages.inc.php:136 libraries/config/messages.inc.php:152
 #: libraries/sql_query_form.lib.php:247
-#: templates/structure/row_stats_table.phtml:7
+#: templates/table/structure/row_stats_table.phtml:7
 msgid "Format"
 msgstr ""
 
@@ -6011,7 +6027,7 @@ msgstr ""
 
 #: libraries/config/messages.inc.php:332
 #: libraries/plugins/export/ExportPdf.class.php:279
-#: templates/structure/secondary_tabs.phtml:8
+#: templates/table/secondary_tabs.phtml:8
 msgid "Table structure"
 msgstr ""
 
@@ -7507,101 +7523,33 @@ msgstr ""
 msgid "OpenDocument Text"
 msgstr ""
 
-#: libraries/controllers/StructureController.class.php:465
+#: libraries/controllers/DatabaseStructureController.class.php:405
 #: tbl_operations.php:382
 #, php-format
 msgid "Table %s has been emptied."
 msgstr ""
 
-#: libraries/controllers/StructureController.class.php:486
+#: libraries/controllers/DatabaseStructureController.class.php:426
 #: tbl_operations.php:400 view_operations.php:119
 #, php-format
 msgid "View %s has been dropped."
 msgstr ""
 
-#: libraries/controllers/StructureController.class.php:487
+#: libraries/controllers/DatabaseStructureController.class.php:427
 #: tbl_operations.php:401
 #, php-format
 msgid "Table %s has been dropped."
 msgstr ""
 
-#: libraries/controllers/StructureController.class.php:797
-#, php-format
-msgid "The name '%s' is a MySQL reserved keyword."
-msgid_plural "The names '%s' are MySQL reserved keywords."
-msgstr[0] ""
-msgstr[1] ""
-
-#: libraries/controllers/StructureController.class.php:875
-msgid "No column selected."
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1049
+#: libraries/controllers/DatabaseStructureController.class.php:733
 msgid "Favorite List is full!"
 msgstr ""
 
-#: libraries/controllers/StructureController.class.php:1272
-msgid "The columns have been moved successfully."
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1535
-#, php-format
-msgid ""
-"Table %1$s has been altered successfully. Privileges have been adjusted."
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1541
-#: libraries/controllers/TableIndexesController.class.php:161
-#: tbl_addfield.php:92
-#, php-format
-msgid "Table %1$s has been altered successfully."
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1588
-#: libraries/tracking.lib.php:1094
-msgid "Query error"
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1806
+#: libraries/controllers/DatabaseStructureController.class.php:947
 #: libraries/mysql_charsets.lib.php:366 libraries/mysql_charsets.lib.php:373
 msgid "unknown"
 msgstr ""
 
-#: libraries/controllers/StructureController.class.php:1957
-#: templates/structure/check_all_table_column.phtml:11
-msgid "Change"
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1961
-#: libraries/controllers/StructureController.class.php:1966
-#: libraries/navigation/Nodes/Node_Index.class.php:30
-#: libraries/tracking.lib.php:926
-#: templates/columns_definitions/column_indexes.phtml:16
-#: templates/columns_definitions/table_fields_definitions.phtml:57
-#: templates/structure/check_all_table_column.phtml:30
-#: templates/structure/display_structure.phtml:79
-#: templates/structure/display_table_stats.phtml:19
-msgid "Index"
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1963
-#: libraries/controllers/StructureController.class.php:1968
-#: templates/columns_definitions/column_indexes.phtml:27
-#: templates/structure/check_all_table_column.phtml:37
-msgid "Spatial"
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1964
-#: libraries/controllers/StructureController.class.php:1969
-#: templates/columns_definitions/column_indexes.phtml:22
-#: templates/structure/check_all_table_column.phtml:47
-msgid "Fulltext"
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1970
-msgid "Distinct values"
-msgstr ""
-
 #: libraries/controllers/TableChartController.class.php:82
 #: libraries/controllers/TableGisVisualizationController.class.php:101
 msgid "No SQL query was set to fetch data."
@@ -7615,11 +7563,18 @@ msgstr ""
 msgid "No data to display"
 msgstr ""
 
-#: libraries/controllers/TableRelationController.class.php:217
+#: libraries/controllers/TableIndexesController.class.php:161
+#: libraries/controllers/TableStructureController.class.php:736
+#: tbl_addfield.php:92
+#, php-format
+msgid "Table %1$s has been altered successfully."
+msgstr ""
+
+#: libraries/controllers/TableRelationController.class.php:218
 msgid "Display column was successfully updated."
 msgstr ""
 
-#: libraries/controllers/TableRelationController.class.php:283
+#: libraries/controllers/TableRelationController.class.php:288
 msgid "Internal relations were successfully updated."
 msgstr ""
 
@@ -7632,10 +7587,71 @@ msgid "Zoom search"
 msgstr ""
 
 #: libraries/controllers/TableSearchController.class.php:852
-#: templates/table/selection_form.phtml:59
+#: templates/table/search/selection_form.phtml:59
 msgid "Find and replace"
 msgstr ""
 
+#: libraries/controllers/TableStructureController.class.php:163
+#, php-format
+msgid "The name '%s' is a MySQL reserved keyword."
+msgid_plural "The names '%s' are MySQL reserved keywords."
+msgstr[0] ""
+msgstr[1] ""
+
+#: libraries/controllers/TableStructureController.class.php:241
+msgid "No column selected."
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:467
+msgid "The columns have been moved successfully."
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:730
+#, php-format
+msgid ""
+"Table %1$s has been altered successfully. Privileges have been adjusted."
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:783
+#: libraries/tracking.lib.php:1094
+msgid "Query error"
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:948
+#: templates/table/structure/check_all_table_column.phtml:11
+msgid "Change"
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:952
+#: libraries/controllers/TableStructureController.class.php:957
+#: libraries/navigation/Nodes/Node_Index.class.php:30
+#: libraries/tracking.lib.php:926
+#: templates/columns_definitions/column_indexes.phtml:16
+#: templates/columns_definitions/table_fields_definitions.phtml:57
+#: templates/table/structure/check_all_table_column.phtml:30
+#: templates/table/structure/display_structure.phtml:79
+#: templates/table/structure/display_table_stats.phtml:19
+msgid "Index"
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:954
+#: libraries/controllers/TableStructureController.class.php:959
+#: templates/columns_definitions/column_indexes.phtml:27
+#: templates/table/structure/check_all_table_column.phtml:37
+msgid "Spatial"
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:955
+#: libraries/controllers/TableStructureController.class.php:960
+#: templates/columns_definitions/column_indexes.phtml:22
+#: templates/table/structure/check_all_table_column.phtml:47
+msgid "Fulltext"
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:963
+msgid "Distinct values"
+msgstr ""
+
 #: libraries/core.lib.php:306
 #, php-format
 msgid "The %s extension is missing. Please check your PHP configuration."
@@ -7680,7 +7696,7 @@ msgid "No Password"
 msgstr ""
 
 #: libraries/display_change_password.lib.php:68
-#: libraries/plugins/auth/AuthenticationCookie.class.php:199
+#: libraries/plugins/auth/AuthenticationCookie.class.php:187
 #: libraries/replication_gui.lib.php:422 libraries/replication_gui.lib.php:862
 #: libraries/server_privileges.lib.php:1640
 msgid "Password:"
@@ -8398,12 +8414,12 @@ msgid "Dump has been saved to file %s."
 msgstr ""
 
 #: libraries/import.lib.php:202 libraries/insert_edit.lib.php:124
-#: libraries/rte/rte_routines.lib.php:1353 libraries/sql.lib.php:1312
+#: libraries/rte/rte_routines.lib.php:1444 libraries/sql.lib.php:1306
 #: tbl_get_field.php:44
 msgid "MySQL returned an empty result set (i.e. zero rows)."
 msgstr ""
 
-#: libraries/import.lib.php:265 libraries/sql.lib.php:1326
+#: libraries/import.lib.php:265 libraries/sql.lib.php:1320
 msgid "[ROLLBACK occurred.]"
 msgstr ""
 
@@ -8467,14 +8483,14 @@ msgstr ""
 
 #: libraries/insert_edit.lib.php:233
 #: libraries/navigation/Nodes/Node_DatabaseChild.class.php:48
-#: templates/designer/table_list.phtml:40
+#: templates/database/designer/table_list.phtml:40
 msgid "Hide"
 msgstr ""
 
 #: libraries/insert_edit.lib.php:249
 #: libraries/navigation/Nodes/Node_Function.class.php:32
-#: libraries/rte/rte_routines.lib.php:1495
-#: templates/table/table_header.phtml:4
+#: libraries/rte/rte_routines.lib.php:1586
+#: templates/table/search/table_header.phtml:4
 msgid "Function"
 msgstr ""
 
@@ -8487,82 +8503,83 @@ msgstr ""
 msgid "Because of its length,<br /> this column might not be editable."
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1050
+#: libraries/insert_edit.lib.php:1048
 msgid "Binary - do not edit"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1176 libraries/server_privileges.lib.php:470
-#: templates/table/options.phtml:36
+#: libraries/insert_edit.lib.php:1174 libraries/server_privileges.lib.php:470
+#: templates/table/search/options.phtml:36
 msgid "Or"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1177
+#: libraries/insert_edit.lib.php:1175
 msgid "web server upload directory:"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1348 templates/table/input_box.phtml:49
+#: libraries/insert_edit.lib.php:1346
+#: templates/table/search/input_box.phtml:49
 msgid "Edit/Insert"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1398
+#: libraries/insert_edit.lib.php:1396
 #, php-format
 msgid "Continue insertion with %s rows"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1428
+#: libraries/insert_edit.lib.php:1426
 msgid "and then"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1461
+#: libraries/insert_edit.lib.php:1459
 msgid "Insert as new row"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1464
+#: libraries/insert_edit.lib.php:1462
 msgid "Insert as new row and ignore errors"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1467
+#: libraries/insert_edit.lib.php:1465
 msgid "Show insert query"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1487
+#: libraries/insert_edit.lib.php:1485
 msgid "Go back to previous page"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1490
+#: libraries/insert_edit.lib.php:1488
 msgid "Insert another new row"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1495
+#: libraries/insert_edit.lib.php:1493
 msgid "Go back to this page"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1518
+#: libraries/insert_edit.lib.php:1516
 msgid "Edit next row"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1540
+#: libraries/insert_edit.lib.php:1538
 msgid ""
 "Use TAB key to move from value to value, or CTRL+arrows to move anywhere"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1577 libraries/replication_gui.lib.php:542
-#: libraries/rte/rte_routines.lib.php:1497
+#: libraries/insert_edit.lib.php:1575 libraries/replication_gui.lib.php:542
+#: libraries/rte/rte_routines.lib.php:1588
 #: libraries/server_status_variables.lib.php:220
-#: templates/designer/having_query_panel.phtml:100
-#: templates/designer/options_panel.phtml:73
-#: templates/designer/options_panel.phtml:239
-#: templates/designer/where_query_panel.phtml:69
-#: templates/table/table_header.phtml:10
-#: templates/table/zoom_result_form.phtml:35
+#: templates/database/designer/having_query_panel.phtml:100
+#: templates/database/designer/options_panel.phtml:73
+#: templates/database/designer/options_panel.phtml:239
+#: templates/database/designer/where_query_panel.phtml:69
+#: templates/table/search/table_header.phtml:10
+#: templates/table/search/zoom_result_form.phtml:35
 msgid "Value"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1937 libraries/sql.lib.php:1309
+#: libraries/insert_edit.lib.php:1935 libraries/sql.lib.php:1303
 msgid "Showing SQL query"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1962 libraries/sql.lib.php:1287
+#: libraries/insert_edit.lib.php:1960 libraries/sql.lib.php:1281
 #, php-format
 msgid "Inserted row id: %1$d"
 msgstr ""
@@ -8969,7 +8986,7 @@ msgstr ""
 #: libraries/navigation/Nodes/Node_View_Container.class.php:26
 #: libraries/navigation/Nodes/Node_View_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:129
-#: templates/structure/show_create.phtml:30
+#: templates/database/structure/show_create.phtml:30
 msgid "Views"
 msgstr ""
 
@@ -9255,7 +9272,7 @@ msgstr ""
 
 #: libraries/operations.lib.php:101 libraries/operations.lib.php:249
 #: libraries/operations.lib.php:869 libraries/operations.lib.php:963
-#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:907
+#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:998
 #: templates/columns_definitions/table_fields_definitions.phtml:47
 msgid "Adjust Privileges"
 msgstr ""
@@ -9345,22 +9362,22 @@ msgid "Switch to copied table"
 msgstr ""
 
 #: libraries/operations.lib.php:1360
-#: templates/structure/check_all_tables.phtml:18
+#: templates/database/structure/check_all_tables.phtml:18
 msgid "Table maintenance"
 msgstr ""
 
 #: libraries/operations.lib.php:1398
-#: templates/structure/check_all_tables.phtml:19
+#: templates/database/structure/check_all_tables.phtml:19
 msgid "Analyze table"
 msgstr ""
 
 #: libraries/operations.lib.php:1413
-#: templates/structure/check_all_tables.phtml:20
+#: templates/database/structure/check_all_tables.phtml:20
 msgid "Check table"
 msgstr ""
 
 #: libraries/operations.lib.php:1428
-#: templates/structure/check_all_tables.phtml:22
+#: templates/database/structure/check_all_tables.phtml:22
 msgid "Checksum table"
 msgstr ""
 
@@ -9378,18 +9395,19 @@ msgid "Flush the table (FLUSH)"
 msgstr ""
 
 #: libraries/operations.lib.php:1477
-#: templates/structure/check_all_tables.phtml:23
-#: templates/structure/display_table_stats.phtml:56
+#: templates/database/structure/check_all_tables.phtml:23
+#: templates/table/structure/display_table_stats.phtml:56
 msgid "Optimize table"
 msgstr ""
 
 #: libraries/operations.lib.php:1492
-#: templates/structure/check_all_tables.phtml:24
+#: templates/database/structure/check_all_tables.phtml:24
 msgid "Repair table"
 msgstr ""
 
 #: libraries/operations.lib.php:1538
-#: templates/structure/check_all_tables.phtml:14 view_operations.php:127
+#: templates/database/structure/check_all_tables.phtml:14
+#: view_operations.php:127
 msgid "Delete data or table"
 msgstr ""
 
@@ -9510,7 +9528,7 @@ msgid "Cannot connect: invalid settings."
 msgstr ""
 
 #: libraries/plugins/auth/AuthenticationConfig.class.php:108
-#: libraries/plugins/auth/AuthenticationCookie.class.php:134
+#: libraries/plugins/auth/AuthenticationCookie.class.php:122
 #: libraries/plugins/auth/AuthenticationHttp.class.php:96
 #, php-format
 msgid "Welcome to %s"
@@ -9535,36 +9553,36 @@ msgstr ""
 msgid "Retry to connect"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:146
+#: libraries/plugins/auth/AuthenticationCookie.class.php:134
 msgid "Your session has expired. Please log in again."
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:170
+#: libraries/plugins/auth/AuthenticationCookie.class.php:158
 msgid "Log in"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:178
-#: libraries/plugins/auth/AuthenticationCookie.class.php:188
+#: libraries/plugins/auth/AuthenticationCookie.class.php:166
+#: libraries/plugins/auth/AuthenticationCookie.class.php:176
 msgid "You can enter hostname/IP address and port separated by space."
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:193
+#: libraries/plugins/auth/AuthenticationCookie.class.php:181
 msgid "Username:"
 msgstr "ಬಳಕೆಯ ಹೆಸರು:"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:205
+#: libraries/plugins/auth/AuthenticationCookie.class.php:193
 msgid "Server Choice:"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:386
+#: libraries/plugins/auth/AuthenticationCookie.class.php:374
 msgid "Entered captcha is wrong, try again!"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:396
+#: libraries/plugins/auth/AuthenticationCookie.class.php:384
 msgid "Please enter correct captcha!"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:423
+#: libraries/plugins/auth/AuthenticationCookie.class.php:411
 msgid "You are not allowed to log in to this MySQL server!"
 msgstr ""
 
@@ -9660,7 +9678,7 @@ msgstr ""
 #: libraries/plugins/export/ExportOdt.class.php:593
 #: libraries/plugins/export/ExportTexytext.class.php:428
 #: libraries/plugins/export/PMA_ExportPdf.class.php:313
-#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:984
 #: libraries/rte/rte_triggers.lib.php:377
 msgid "Definition"
 msgstr ""
@@ -9957,7 +9975,7 @@ msgid "Last check:"
 msgstr "ಕೊನೆಯ ಪರಿಶೀಲನೆ:"
 
 #: libraries/plugins/export/ExportSql.class.php:1399
-#: templates/structure/structure_table_row.phtml:183
+#: templates/database/structure/structure_table_row.phtml:183
 msgid "in use"
 msgstr "ಬಳಕೆಯಲ್ಲಿ"
 
@@ -10137,18 +10155,14 @@ msgstr ""
 msgid "The imported file does not contain any data!"
 msgstr ""
 
-#: libraries/plugins/import/ImportSql.class.php:169
+#: libraries/plugins/import/ImportSql.class.php:72
 msgid "SQL compatibility mode:"
 msgstr ""
 
-#: libraries/plugins/import/ImportSql.class.php:181
+#: libraries/plugins/import/ImportSql.class.php:84
 msgid "Do not use <code>AUTO_INCREMENT</code> for zero values"
 msgstr ""
 
-#: libraries/plugins/import/ImportSql.class.php:195
-msgid "Read as multibytes"
-msgstr ""
-
 #: libraries/plugins/import/ImportXml.class.php:54
 msgid "XML"
 msgstr ""
@@ -10191,7 +10205,7 @@ msgid "Show grid"
 msgstr ""
 
 #: libraries/plugins/schema/SchemaPdf.class.php:94
-#: templates/structure/print_view_data_dictionary_link.phtml:6
+#: templates/database/structure/print_view_data_dictionary_link.phtml:6
 msgid "Data Dictionary"
 msgstr ""
 
@@ -10216,7 +10230,7 @@ msgid "The %s table doesn't exist!"
 msgstr ""
 
 #: libraries/plugins/schema/eps/Eps_Relation_Schema.class.php:321
-#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:309
+#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:323
 #, php-format
 msgid "Schema of the %s database - Page %s"
 msgstr ""
@@ -10242,7 +10256,7 @@ msgstr ""
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1005
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1028
 #: libraries/tracking.lib.php:884
-#: templates/structure/table_structure_header.phtml:11
+#: templates/table/structure/table_structure_header.phtml:11
 msgid "Extra"
 msgstr ""
 
@@ -10547,51 +10561,51 @@ msgstr ""
 msgid "Create the needed tables with the <code>%screate_tables.sql</code>."
 msgstr ""
 
-#: libraries/relation.lib.php:360
+#: libraries/relation.lib.php:357
 msgid "Create a pma user and give access to these tables."
 msgstr ""
 
-#: libraries/relation.lib.php:365
+#: libraries/relation.lib.php:360
 msgid ""
 "Enable advanced features in configuration file (<code>config.inc.php</"
 "code>), for example by starting from <code>config.sample.inc.php</code>."
 msgstr ""
 
-#: libraries/relation.lib.php:373
+#: libraries/relation.lib.php:365
 msgid "Re-login to phpMyAdmin to load the updated configuration file."
 msgstr ""
 
-#: libraries/relation.lib.php:1612
+#: libraries/relation.lib.php:1607
 msgid "no description"
 msgstr ""
 
-#: libraries/relation.lib.php:1811
+#: libraries/relation.lib.php:1806
 msgid ""
 "You do not have necessary privileges to create a database named "
 "'phpmyadmin'. You may go to 'Operations' tab of any database to set up the "
 "phpMyAdmin configuration storage there."
 msgstr ""
 
-#: libraries/relation.lib.php:1928
+#: libraries/relation.lib.php:1923
 #, php-format
 msgid ""
 "%sCreate%s a database named 'phpmyadmin' and setup the phpMyAdmin "
 "configuration storage there."
 msgstr ""
 
-#: libraries/relation.lib.php:1936
+#: libraries/relation.lib.php:1931
 #, php-format
 msgid ""
 "%sCreate%s the phpMyAdmin configuration storage in the current database."
 msgstr ""
 
-#: libraries/relation.lib.php:1944
+#: libraries/relation.lib.php:1939
 #, php-format
 msgid "%sCreate%s missing phpMyAdmin configuration storage tables."
 msgstr ""
 
 #: libraries/replication_gui.lib.php:46 libraries/replication_gui.lib.php:343
-#: libraries/server_databases.lib.php:387
+#: libraries/server_databases.lib.php:398
 msgid "Master replication"
 msgstr ""
 
@@ -10646,7 +10660,7 @@ msgid ""
 msgstr ""
 
 #: libraries/replication_gui.lib.php:141
-#: libraries/server_databases.lib.php:389
+#: libraries/server_databases.lib.php:400
 msgid "Slave replication"
 msgstr ""
 
@@ -10907,10 +10921,10 @@ msgid "Master server changed successfully to %s."
 msgstr ""
 
 #: libraries/rte/rte_events.lib.php:106 libraries/rte/rte_events.lib.php:115
-#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:149
-#: libraries/rte/rte_routines.lib.php:158
-#: libraries/rte/rte_routines.lib.php:231
-#: libraries/rte/rte_routines.lib.php:1362
+#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:219
+#: libraries/rte/rte_routines.lib.php:246
+#: libraries/rte/rte_routines.lib.php:368
+#: libraries/rte/rte_routines.lib.php:1453
 #: libraries/rte/rte_triggers.lib.php:82 libraries/rte/rte_triggers.lib.php:91
 #: libraries/rte/rte_triggers.lib.php:123
 #, php-format
@@ -10931,7 +10945,7 @@ msgstr ""
 msgid "Event %1$s has been created."
 msgstr ""
 
-#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:251
+#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:266
 #: libraries/rte/rte_triggers.lib.php:144
 msgid "One or more errors have occurred while processing your request:"
 msgstr ""
@@ -10940,7 +10954,7 @@ msgstr ""
 msgid "Edit event"
 msgstr ""
 
-#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:794
+#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:885
 #: libraries/rte/rte_triggers.lib.php:323 view_create.php:180
 msgid "Details"
 msgstr ""
@@ -10953,7 +10967,7 @@ msgstr ""
 msgid "Event type"
 msgstr ""
 
-#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:817
+#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:908
 #, php-format
 msgid "Change to %s"
 msgstr ""
@@ -10980,12 +10994,14 @@ msgstr ""
 msgid "On completion preserve"
 msgstr ""
 
-#: libraries/rte/rte_events.lib.php:491 libraries/rte/rte_routines.lib.php:930
+#: libraries/rte/rte_events.lib.php:491
+#: libraries/rte/rte_routines.lib.php:1021
 #: libraries/rte/rte_triggers.lib.php:383 view_create.php:209
 msgid "Definer"
 msgstr ""
 
-#: libraries/rte/rte_events.lib.php:535 libraries/rte/rte_routines.lib.php:997
+#: libraries/rte/rte_events.lib.php:535
+#: libraries/rte/rte_routines.lib.php:1088
 #: libraries/rte/rte_triggers.lib.php:422
 msgid "The definer must be in the \"username@hostname\" format!"
 msgstr ""
@@ -11011,9 +11027,9 @@ msgid "You must provide an event definition."
 msgstr ""
 
 #: libraries/rte/rte_export.lib.php:43 libraries/rte/rte_general.lib.php:72
-#: libraries/rte/rte_routines.lib.php:345
-#: libraries/rte/rte_routines.lib.php:1198
-#: libraries/rte/rte_routines.lib.php:1411
+#: libraries/rte/rte_routines.lib.php:153
+#: libraries/rte/rte_routines.lib.php:1289
+#: libraries/rte/rte_routines.lib.php:1502
 msgid "Error in processing request:"
 msgstr ""
 
@@ -11045,132 +11061,132 @@ msgid ""
 "problems."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:110
-#: libraries/rte/rte_routines.lib.php:1006
+#: libraries/rte/rte_routines.lib.php:123
+msgid "Edit routine"
+msgstr ""
+
+#: libraries/rte/rte_routines.lib.php:200
+#: libraries/rte/rte_routines.lib.php:1097
 #, php-format
 msgid "Invalid routine type: \"%s\""
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:170
-msgid "Sorry, we failed to restore the dropped routine."
-msgstr ""
-
-#: libraries/rte/rte_routines.lib.php:211
-#, php-format
-msgid "Routine %1$s has been modified. Privileges have been adjusted."
-msgstr ""
-
-#: libraries/rte/rte_routines.lib.php:216
-#, php-format
-msgid "Routine %1$s has been modified."
-msgstr ""
-
-#: libraries/rte/rte_routines.lib.php:238
+#: libraries/rte/rte_routines.lib.php:253
 #, php-format
 msgid "Routine %1$s has been created."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:315
-msgid "Edit routine"
+#: libraries/rte/rte_routines.lib.php:380
+msgid "Sorry, we failed to restore the dropped routine."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:797
+#: libraries/rte/rte_routines.lib.php:439
+#, php-format
+msgid "Routine %1$s has been modified. Privileges have been adjusted."
+msgstr ""
+
+#: libraries/rte/rte_routines.lib.php:444
+#, php-format
+msgid "Routine %1$s has been modified."
+msgstr ""
+
+#: libraries/rte/rte_routines.lib.php:888
 msgid "Routine name"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:823
+#: libraries/rte/rte_routines.lib.php:914
 msgid "Parameters"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:829
+#: libraries/rte/rte_routines.lib.php:920
 msgid "Direction"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:847
+#: libraries/rte/rte_routines.lib.php:938
 msgid "Add parameter"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:851
+#: libraries/rte/rte_routines.lib.php:942
 msgid "Remove last parameter"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:856
+#: libraries/rte/rte_routines.lib.php:947
 msgid "Return type"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:862
+#: libraries/rte/rte_routines.lib.php:953
 msgid "Return length/values"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:868
+#: libraries/rte/rte_routines.lib.php:959
 msgid "Return options"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:899
+#: libraries/rte/rte_routines.lib.php:990
 msgid "Is deterministic"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:920
+#: libraries/rte/rte_routines.lib.php:1011
 msgid ""
 "You do not have sufficient privileges to perform this operation; Please "
 "refer to the documentation for more details"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:935
+#: libraries/rte/rte_routines.lib.php:1026
 msgid "Security type"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:944
+#: libraries/rte/rte_routines.lib.php:1035
 msgid "SQL data access"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1013
+#: libraries/rte/rte_routines.lib.php:1104
 msgid "You must provide a routine name!"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1047
+#: libraries/rte/rte_routines.lib.php:1138
 #, php-format
 msgid "Invalid direction \"%s\" given for parameter."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1069
-#: libraries/rte/rte_routines.lib.php:1131
+#: libraries/rte/rte_routines.lib.php:1160
+#: libraries/rte/rte_routines.lib.php:1222
 msgid ""
 "You must provide length/values for routine parameters of type ENUM, SET, "
 "VARCHAR and VARBINARY."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1095
+#: libraries/rte/rte_routines.lib.php:1186
 msgid "You must provide a name and a type for each routine parameter."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1114
+#: libraries/rte/rte_routines.lib.php:1205
 msgid "You must provide a valid return type for the routine."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1174
+#: libraries/rte/rte_routines.lib.php:1265
 msgid "You must provide a routine definition."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1285
+#: libraries/rte/rte_routines.lib.php:1376
 #, php-format
 msgid "Execution results of routine %s"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1340
+#: libraries/rte/rte_routines.lib.php:1431
 #, php-format
 msgid "%d row affected by the last statement inside the procedure."
 msgid_plural "%d rows affected by the last statement inside the procedure."
 msgstr[0] ""
 msgstr[1] ""
 
-#: libraries/rte/rte_routines.lib.php:1398
-#: libraries/rte/rte_routines.lib.php:1406
+#: libraries/rte/rte_routines.lib.php:1489
+#: libraries/rte/rte_routines.lib.php:1497
 msgid "Execute routine"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1485
-#: libraries/rte/rte_routines.lib.php:1488
+#: libraries/rte/rte_routines.lib.php:1576
+#: libraries/rte/rte_routines.lib.php:1579
 msgid "Routine parameters"
 msgstr ""
 
@@ -11324,7 +11340,7 @@ msgid "Original position"
 msgstr ""
 
 #: libraries/server_bin_log.lib.php:133
-#: templates/structure/display_table_stats.phtml:4
+#: templates/table/structure/display_table_stats.phtml:4
 msgid "Information"
 msgstr ""
 
@@ -11360,12 +11376,12 @@ msgid ""
 "between the web server and the MySQL server."
 msgstr ""
 
-#: libraries/server_databases.lib.php:364
-#: libraries/server_databases.lib.php:365
+#: libraries/server_databases.lib.php:366
+#: libraries/server_databases.lib.php:371
 msgid "Enable Statistics"
 msgstr ""
 
-#: libraries/server_databases.lib.php:481
+#: libraries/server_databases.lib.php:492
 #, php-format
 msgid "%1$d database has been dropped successfully."
 msgid_plural "%1$d databases have been dropped successfully."
@@ -11725,7 +11741,7 @@ msgid "You have revoked the privileges for %s."
 msgstr ""
 
 #: libraries/server_privileges.lib.php:2059
-#: libraries/server_privileges.lib.php:4290
+#: libraries/server_privileges.lib.php:4316
 msgid "Add user account"
 msgstr ""
 
@@ -11888,53 +11904,53 @@ msgstr ""
 msgid "The privileges were reloaded successfully."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:3994
+#: libraries/server_privileges.lib.php:4003
 #, php-format
 msgid "The user %s already exists!"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4232
+#: libraries/server_privileges.lib.php:4258
 #, php-format
 msgid "Privileges for %s"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4241
+#: libraries/server_privileges.lib.php:4267
 #: libraries/server_status_processes.lib.php:72
 #: libraries/server_user_groups.lib.php:39
 msgid "User"
 msgstr "ಸದಸ್ಯ"
 
-#: libraries/server_privileges.lib.php:4282
+#: libraries/server_privileges.lib.php:4308
 msgctxt "Create new user"
 msgid "New"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4311
+#: libraries/server_privileges.lib.php:4337
 msgid "Edit privileges:"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4312
+#: libraries/server_privileges.lib.php:4338
 msgid "User account"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4371
+#: libraries/server_privileges.lib.php:4397
 msgid ""
 "Note: You are attempting to edit privileges of the user with which you are "
 "currently logged in."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4391 libraries/server_users.lib.php:25
+#: libraries/server_privileges.lib.php:4417 libraries/server_users.lib.php:25
 msgid "User accounts overview"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4459
+#: libraries/server_privileges.lib.php:4485
 msgid ""
 "A user account allowing any user from localhost to connect is present. This "
 "will prevent other users from connecting if the host part of their account "
 "allows a connection from any (%) host."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4500
+#: libraries/server_privileges.lib.php:4526
 #, php-format
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
@@ -11943,7 +11959,7 @@ msgid ""
 "%sreload the privileges%s before you continue."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4519
+#: libraries/server_privileges.lib.php:4545
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
 "tables. The content of these tables may differ from the privileges the "
@@ -11952,61 +11968,61 @@ msgid ""
 "privilege."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4569
+#: libraries/server_privileges.lib.php:4595
 msgid "The selected user was not found in the privilege table."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4801
+#: libraries/server_privileges.lib.php:4827
 msgid "You have added a new user."
 msgstr ""
 
-#: libraries/server_status.lib.php:53
+#: libraries/server_status.lib.php:60
 #, php-format
 msgid "Network traffic since startup: %s"
 msgstr ""
 
-#: libraries/server_status.lib.php:66
+#: libraries/server_status.lib.php:73
 #, php-format
 msgid "This MySQL server has been running for %1$s. It started up on %2$s."
 msgstr ""
 
-#: libraries/server_status.lib.php:80
+#: libraries/server_status.lib.php:94
 msgid ""
 "This MySQL server works as <b>master</b> and <b>slave</b> in <b>replication</"
 "b> process."
 msgstr ""
 
-#: libraries/server_status.lib.php:85
+#: libraries/server_status.lib.php:99
 msgid "This MySQL server works as <b>master</b> in <b>replication</b> process."
 msgstr ""
 
-#: libraries/server_status.lib.php:90
+#: libraries/server_status.lib.php:104
 msgid "This MySQL server works as <b>slave</b> in <b>replication</b> process."
 msgstr ""
 
-#: libraries/server_status.lib.php:106
+#: libraries/server_status.lib.php:116
 msgid "Replication status"
 msgstr ""
 
-#: libraries/server_status.lib.php:137
+#: libraries/server_status.lib.php:146
 msgid ""
 "On a busy server, the byte counters may overrun, so those statistics as "
 "reported by the MySQL server may be incorrect."
 msgstr ""
 
-#: libraries/server_status.lib.php:148
+#: libraries/server_status.lib.php:157
 msgid "Received"
 msgstr ""
 
-#: libraries/server_status.lib.php:167
+#: libraries/server_status.lib.php:176
 msgid "Sent"
 msgstr ""
 
-#: libraries/server_status.lib.php:234
+#: libraries/server_status.lib.php:243
 msgid "Max. concurrent connections"
 msgstr ""
 
-#: libraries/server_status.lib.php:244
+#: libraries/server_status.lib.php:253
 msgid "Failed attempts"
 msgstr ""
 
@@ -12926,7 +12942,7 @@ msgstr ""
 msgid "Not implemented yet."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/AlterOperation.php:193
+#: libraries/sql-parser/src/Components/AlterOperation.php:191
 msgid "Unrecognized alter operation."
 msgstr ""
 
@@ -12940,7 +12956,7 @@ msgid "An opening bracket followed by a set of values was expected."
 msgstr ""
 
 #: libraries/sql-parser/src/Components/ArrayObj.php:101
-#: libraries/sql-parser/src/Components/FieldDefinition.php:202
+#: libraries/sql-parser/src/Components/CreateDefinition.php:202
 msgid "An opening bracket was expected."
 msgstr ""
 
@@ -12948,25 +12964,33 @@ msgstr ""
 msgid "A comma or a closing bracket was expected"
 msgstr ""
 
+#: libraries/sql-parser/src/Components/CreateDefinition.php:246
+msgid "A comma or a closing bracket was expected."
+msgstr ""
+
+#: libraries/sql-parser/src/Components/CreateDefinition.php:262
+msgid "A closing bracket was expected."
+msgstr ""
+
 #: libraries/sql-parser/src/Components/DataType.php:125
 msgid "Unrecognized data type."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:225
+#: libraries/sql-parser/src/Components/Expression.php:227
 msgid "Unexpected closing bracket."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:246
-#: libraries/sql-parser/src/Components/Expression.php:283
-#: libraries/sql-parser/src/Components/Expression.php:303
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:285
+#: libraries/sql-parser/src/Components/Expression.php:305
 msgid "An alias was previously found."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:257
+#: libraries/sql-parser/src/Components/Expression.php:259
 msgid "Unexpected dot."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:327
+#: libraries/sql-parser/src/Components/Expression.php:329
 msgid "An alias was expected."
 msgstr ""
 
@@ -12974,14 +12998,6 @@ msgstr ""
 msgid "An expression was expected."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/FieldDefinition.php:246
-msgid "A comma or a closing bracket was expected."
-msgstr ""
-
-#: libraries/sql-parser/src/Components/FieldDefinition.php:262
-msgid "A closing bracket was expected."
-msgstr ""
-
 #: libraries/sql-parser/src/Components/Limit.php:90
 #: libraries/sql-parser/src/Components/Limit.php:112
 msgid "An offset was expected."
@@ -13021,24 +13037,24 @@ msgstr ""
 msgid "Expected delimiter."
 msgstr ""
 
-#: libraries/sql-parser/src/Lexer.php:753
+#: libraries/sql-parser/src/Lexer.php:777
 #, php-format
 msgid "Ending quote %1$s was expected."
 msgstr ""
 
-#: libraries/sql-parser/src/Lexer.php:789
+#: libraries/sql-parser/src/Lexer.php:813
 msgid "Variable name was expected."
 msgstr ""
 
-#: libraries/sql-parser/src/Parser.php:380
+#: libraries/sql-parser/src/Parser.php:391
 msgid "Unexpected beginning of statement."
 msgstr ""
 
-#: libraries/sql-parser/src/Parser.php:399
+#: libraries/sql-parser/src/Parser.php:410
 msgid "Unrecognized statement type."
 msgstr ""
 
-#: libraries/sql-parser/src/Parser.php:479
+#: libraries/sql-parser/src/Parser.php:489
 msgid "No transaction was previously started."
 msgstr ""
 
@@ -13064,7 +13080,7 @@ msgid "The name of the entity was expected."
 msgstr ""
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:310
-msgid "At least one field definition was expected."
+msgid "At least one column definition was expected."
 msgstr ""
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:329
@@ -13124,25 +13140,25 @@ msgstr ""
 msgid "Using bookmark \"%s\" as default browse query."
 msgstr ""
 
-#: libraries/sql.lib.php:1306
+#: libraries/sql.lib.php:1300
 msgid "Showing as PHP code"
 msgstr ""
 
-#: libraries/sql.lib.php:1638
+#: libraries/sql.lib.php:1632
 #, php-format
 msgid ""
 "Current selection does not contain a unique column. Grid edit, checkbox, "
 "Edit, Copy and Delete features are not available. %s"
 msgstr ""
 
-#: libraries/sql.lib.php:1649
+#: libraries/sql.lib.php:1643
 #, php-format
 msgid ""
 "Current selection does not contain a unique column. Grid edit, Edit, Copy "
 "and Delete features may result in undesired behavior. %s"
 msgstr ""
 
-#: libraries/sql.lib.php:1688
+#: libraries/sql.lib.php:1682
 #, php-format
 msgid "Problems with indexes of table `%s`"
 msgstr ""
@@ -13298,7 +13314,7 @@ msgid "Version %s snapshot (SQL code)"
 msgstr ""
 
 #: libraries/tracking.lib.php:947
-#: templates/structure/table_structure_row.phtml:33
+#: templates/table/structure/table_structure_row.phtml:33
 msgctxt "None for default"
 msgid "None"
 msgstr ""
@@ -13350,15 +13366,15 @@ msgstr ""
 msgid "Version %1$s was created, tracking for %2$s is active."
 msgstr ""
 
-#: libraries/user_preferences.inc.php:29
+#: libraries/user_preferences.inc.php:30
 msgid "Manage your settings"
 msgstr ""
 
-#: libraries/user_preferences.inc.php:46 prefs_manage.php:307
+#: libraries/user_preferences.inc.php:54 prefs_manage.php:307
 msgid "Configuration has been saved."
 msgstr ""
 
-#: libraries/user_preferences.inc.php:66
+#: libraries/user_preferences.inc.php:74
 #, php-format
 msgid ""
 "Your preferences will be saved for current session only. Storing them "
@@ -13732,7 +13748,7 @@ msgid "first"
 msgstr ""
 
 #: templates/columns_definitions/move_column.phtml:12
-#: templates/structure/add_column.phtml:21
+#: templates/table/structure/add_column.phtml:21
 #, php-format
 msgid "after %s"
 msgstr ""
@@ -13791,197 +13807,290 @@ msgstr ""
 msgid "Input transformation options"
 msgstr ""
 
-#: templates/designer/aggregate_query_panel.phtml:22
-#: templates/designer/options_panel.phtml:100
-msgid "Aggregate"
-msgstr ""
-
-#: templates/designer/aggregate_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:61
-#: templates/designer/options_panel.phtml:106
-#: templates/designer/options_panel.phtml:170
-#: templates/designer/where_query_panel.phtml:30
-#: templates/table/table_header.phtml:9
-msgid "Operator"
-msgstr ""
-
-#: templates/designer/database_tables.phtml:29
-msgid "Toggle"
-msgstr ""
-
-#: templates/designer/database_tables.phtml:40
-msgid "See table structure"
-msgstr ""
-
-#: templates/designer/delete_relation_panel.phtml:21
-msgid "Delete relation"
-msgstr ""
-
-#: templates/designer/edit_delete_pages.phtml:7
-msgid "Page to open"
-msgstr ""
-
-#: templates/designer/edit_delete_pages.phtml:7
-msgid "Page to delete"
-msgstr ""
-
-#: templates/designer/having_query_panel.phtml:90
-#: templates/designer/options_panel.phtml:63
-#: templates/designer/options_panel.phtml:229
-#: templates/designer/where_query_panel.phtml:59
-msgid "Except"
-msgstr ""
-
-#: templates/designer/having_query_panel.phtml:102
-#: templates/designer/options_panel.phtml:75
-#: templates/designer/options_panel.phtml:241
-#: templates/designer/where_query_panel.phtml:71
-msgid "subquery"
-msgstr ""
-
-#: templates/designer/new_relation_panel.phtml:22
-#: templates/designer/side_menu.phtml:84 templates/designer/side_menu.phtml:87
-msgid "Create relation"
-msgstr ""
-
-#: templates/designer/options_panel.phtml:34
-#: templates/designer/options_panel.phtml:200
-msgid "Relation operator"
-msgstr ""
-
-#: templates/designer/options_panel.phtml:85
-#: templates/designer/rename_to_panel.phtml:23
-msgid "Rename to"
-msgstr ""
-
-#: templates/designer/options_panel.phtml:91
-#: templates/designer/rename_to_panel.phtml:31
-msgid "New name"
-msgstr ""
-
-#: templates/designer/page_save_as.phtml:4
-msgid "Save to selected page"
-msgstr ""
-
-#: templates/designer/page_save_as.phtml:5
-msgid "Create a page and save to it"
-msgstr ""
-
-#: templates/designer/page_save_as.phtml:26
-msgid "New page name"
-msgstr ""
-
-#: templates/designer/page_selector.phtml:2
-msgid "Select page"
-msgstr ""
-
-#: templates/designer/query_details.phtml:10
-msgid "Active options"
-msgstr ""
-
-#: templates/designer/schema_export.phtml:4
-msgid "Select Export Relational Type"
-msgstr ""
-
-#: templates/designer/side_menu.phtml:19 templates/designer/side_menu.phtml:25
-msgid "Show/Hide tables list"
-msgstr ""
-
-#: templates/designer/side_menu.phtml:29 templates/designer/side_menu.phtml:35
-#: templates/designer/side_menu.phtml:36
-msgid "View in fullscreen"
-msgstr ""
-
-#: templates/designer/side_menu.phtml:34
-msgid "Exit fullscreen"
-msgstr ""
-
-#: templates/designer/side_menu.phtml:41 templates/designer/side_menu.phtml:45
-msgid "New page"
-msgstr ""
-
-#: templates/designer/side_menu.phtml:70 templates/designer/side_menu.phtml:73
-msgid "Delete pages"
-msgstr ""
-
-#: templates/designer/side_menu.phtml:77 templates/designer/side_menu.phtml:80
-#: templates/table/create_table.phtml:7
+#: templates/database/create_table.phtml:7
+#: templates/database/designer/side_menu.phtml:77
+#: templates/database/designer/side_menu.phtml:80
 msgid "Create table"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:98
-#: templates/designer/side_menu.phtml:101
+#: templates/database/create_table.phtml:15
+msgid "Number of columns"
+msgstr ""
+
+#: templates/database/designer/aggregate_query_panel.phtml:22
+#: templates/database/designer/options_panel.phtml:100
+msgid "Aggregate"
+msgstr ""
+
+#: templates/database/designer/aggregate_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:61
+#: templates/database/designer/options_panel.phtml:106
+#: templates/database/designer/options_panel.phtml:170
+#: templates/database/designer/where_query_panel.phtml:30
+#: templates/table/search/table_header.phtml:9
+msgid "Operator"
+msgstr ""
+
+#: templates/database/designer/database_tables.phtml:29
+msgid "Toggle"
+msgstr ""
+
+#: templates/database/designer/database_tables.phtml:40
+msgid "See table structure"
+msgstr ""
+
+#: templates/database/designer/delete_relation_panel.phtml:21
+msgid "Delete relation"
+msgstr ""
+
+#: templates/database/designer/edit_delete_pages.phtml:7
+msgid "Page to open"
+msgstr ""
+
+#: templates/database/designer/edit_delete_pages.phtml:7
+msgid "Page to delete"
+msgstr ""
+
+#: templates/database/designer/having_query_panel.phtml:90
+#: templates/database/designer/options_panel.phtml:63
+#: templates/database/designer/options_panel.phtml:229
+#: templates/database/designer/where_query_panel.phtml:59
+msgid "Except"
+msgstr ""
+
+#: templates/database/designer/having_query_panel.phtml:102
+#: templates/database/designer/options_panel.phtml:75
+#: templates/database/designer/options_panel.phtml:241
+#: templates/database/designer/where_query_panel.phtml:71
+msgid "subquery"
+msgstr ""
+
+#: templates/database/designer/new_relation_panel.phtml:22
+#: templates/database/designer/side_menu.phtml:84
+#: templates/database/designer/side_menu.phtml:87
+msgid "Create relation"
+msgstr ""
+
+#: templates/database/designer/options_panel.phtml:34
+#: templates/database/designer/options_panel.phtml:200
+msgid "Relation operator"
+msgstr ""
+
+#: templates/database/designer/options_panel.phtml:85
+#: templates/database/designer/rename_to_panel.phtml:23
+msgid "Rename to"
+msgstr ""
+
+#: templates/database/designer/options_panel.phtml:91
+#: templates/database/designer/rename_to_panel.phtml:31
+msgid "New name"
+msgstr ""
+
+#: templates/database/designer/page_save_as.phtml:4
+msgid "Save to selected page"
+msgstr ""
+
+#: templates/database/designer/page_save_as.phtml:5
+msgid "Create a page and save to it"
+msgstr ""
+
+#: templates/database/designer/page_save_as.phtml:26
+msgid "New page name"
+msgstr ""
+
+#: templates/database/designer/page_selector.phtml:2
+msgid "Select page"
+msgstr ""
+
+#: templates/database/designer/query_details.phtml:10
+msgid "Active options"
+msgstr ""
+
+#: templates/database/designer/schema_export.phtml:4
+msgid "Select Export Relational Type"
+msgstr ""
+
+#: templates/database/designer/side_menu.phtml:19
+#: templates/database/designer/side_menu.phtml:25
+msgid "Show/Hide tables list"
+msgstr ""
+
+#: templates/database/designer/side_menu.phtml:29
+#: templates/database/designer/side_menu.phtml:35
+#: templates/database/designer/side_menu.phtml:36
+msgid "View in fullscreen"
+msgstr ""
+
+#: templates/database/designer/side_menu.phtml:34
+msgid "Exit fullscreen"
+msgstr ""
+
+#: templates/database/designer/side_menu.phtml:41
+#: templates/database/designer/side_menu.phtml:45
+msgid "New page"
+msgstr ""
+
+#: templates/database/designer/side_menu.phtml:70
+#: templates/database/designer/side_menu.phtml:73
+msgid "Delete pages"
+msgstr ""
+
+#: templates/database/designer/side_menu.phtml:98
+#: templates/database/designer/side_menu.phtml:101
 msgid "Reload"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:107
-#: templates/designer/side_menu.phtml:110
+#: templates/database/designer/side_menu.phtml:107
+#: templates/database/designer/side_menu.phtml:110
 msgid "Help"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Angular links"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Direct links"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:122
-#: templates/designer/side_menu.phtml:124
+#: templates/database/designer/side_menu.phtml:122
+#: templates/database/designer/side_menu.phtml:124
 msgid "Snap to grid"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:128
-#: templates/designer/side_menu.phtml:134
+#: templates/database/designer/side_menu.phtml:128
+#: templates/database/designer/side_menu.phtml:134
 msgid "Small/Big All"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:138
-#: templates/designer/side_menu.phtml:141
+#: templates/database/designer/side_menu.phtml:138
+#: templates/database/designer/side_menu.phtml:141
 msgid "Toggle small/big"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:145
-#: templates/designer/side_menu.phtml:148
+#: templates/database/designer/side_menu.phtml:145
+#: templates/database/designer/side_menu.phtml:148
 msgid "Toggle relation lines"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:153
-#: templates/designer/side_menu.phtml:156
+#: templates/database/designer/side_menu.phtml:153
+#: templates/database/designer/side_menu.phtml:156
 msgid "Export schema"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:165
-#: templates/designer/side_menu.phtml:168
+#: templates/database/designer/side_menu.phtml:165
+#: templates/database/designer/side_menu.phtml:168
 msgid "Build Query"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:173
-#: templates/designer/side_menu.phtml:177
+#: templates/database/designer/side_menu.phtml:173
+#: templates/database/designer/side_menu.phtml:177
 msgid "Move Menu"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:181
-#: templates/designer/side_menu.phtml:186
+#: templates/database/designer/side_menu.phtml:181
+#: templates/database/designer/side_menu.phtml:186
 msgid "Pin text"
 msgstr ""
 
-#: templates/designer/table_list.phtml:4
+#: templates/database/designer/table_list.phtml:4
 msgid "Hide/Show all"
 msgstr ""
 
-#: templates/designer/table_list.phtml:14
+#: templates/database/designer/table_list.phtml:14
 msgid "Hide/Show Tables with no relation"
 msgstr ""
 
-#: templates/designer/table_list.phtml:59
+#: templates/database/designer/table_list.phtml:59
 msgid "Number of tables:"
 msgstr ""
 
+#: templates/database/structure/body_for_table_summary.phtml:6
+#, php-format
+msgid "%s table"
+msgid_plural "%s tables"
+msgstr[0] "%s ಕೋಷ್ಟಕ"
+msgstr[1] "%s ಕೋಷ್ಟಕಗಳು"
+
+#: templates/database/structure/body_for_table_summary.phtml:17
+msgid "Sum"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:6
+msgid "Check tables having overhead"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:10
+msgid "Show create"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:27
+msgid "Prefix"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:28
+msgid "Add prefix to table"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:29
+msgid "Replace table prefix"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:30
+msgid "Copy table with prefix"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:36
+msgid "Add columns to central list"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:37
+msgid "Remove columns from central list"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:38
+msgid "Make consistent with central list"
+msgstr ""
+
+#: templates/database/structure/favorite_anchor.phtml:12
+msgid "Add to Favorites"
+msgstr ""
+
+#: templates/database/structure/show_create.phtml:2
+msgid "Showing create queries"
+msgstr ""
+
+#: templates/database/structure/sortable_header.phtml:13
+msgid "Sort"
+msgstr ""
+
+#: templates/database/structure/table_header.phtml:42
+msgid ""
+"May be approximate. Click on the number to get the exact count. See "
+"[doc@faq3-11]FAQ 3.11[/doc]."
+msgstr ""
+
+#: templates/database/structure/table_header.phtml:66
+#: templates/table/index_form.phtml:127
+msgid "Size"
+msgstr "ಆಕಾರ"
+
+#: templates/database/structure/table_header.phtml:74
+#: templates/table/structure/display_table_stats.phtml:27
+msgid "Overhead"
+msgstr ""
+
+#: templates/database/structure/tracking_icon.phtml:4
+msgid "Tracking is active."
+msgstr ""
+
+#: templates/database/structure/tracking_icon.phtml:8
+msgid "Tracking is not active."
+msgstr ""
+
 #: templates/error/report_form.phtml:7
 msgid ""
 "phpMyAdmin has encountered an error. We have collected data about this error "
@@ -13997,59 +14106,6 @@ msgstr ""
 msgid "Please explain the steps that lead to the error:"
 msgstr ""
 
-#: templates/gis_visualization/gis_visualization.phtml:3
-msgid "Display GIS Visualization"
-msgstr ""
-
-#: templates/gis_visualization/gis_visualization.phtml:8
-msgid "Label column"
-msgstr ""
-
-#: templates/gis_visualization/gis_visualization.phtml:11
-msgid "-- None --"
-msgstr ""
-
-#: templates/gis_visualization/gis_visualization.phtml:19
-msgid "Spatial column"
-msgstr ""
-
-#: templates/index_form.phtml:16
-msgid "Index name:"
-msgstr ""
-
-#: templates/index_form.phtml:19
-msgid ""
-"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
-msgstr ""
-
-#: templates/index_form.phtml:40
-msgid "Index choice:"
-msgstr ""
-
-#: templates/index_form.phtml:57
-msgid "Key block size:"
-msgstr ""
-
-#: templates/index_form.phtml:74
-msgid "Index type:"
-msgstr ""
-
-#: templates/index_form.phtml:86
-msgid "Parser:"
-msgstr "ವಿಶ್ಲೇಷಕ:"
-
-#: templates/index_form.phtml:102
-msgid "Comment:"
-msgstr ""
-
-#: templates/index_form.phtml:127 templates/structure/table_header.phtml:66
-msgid "Size"
-msgstr "ಆಕಾರ"
-
-#: templates/index_form.phtml:149 templates/index_form.phtml:190
-msgid "Drag to reorder"
-msgstr ""
-
 #: templates/prefs_autoload.phtml:9
 msgid ""
 "Your browser has phpMyAdmin configuration for this domain. Would you like to "
@@ -14060,402 +14116,369 @@ msgstr ""
 msgid "Start row:"
 msgstr ""
 
-#: templates/structure/actions_in_table_structure.phtml:14
-#, php-format
-msgid "A primary key has been added on %s."
-msgstr ""
-
-#: templates/structure/actions_in_table_structure.phtml:34
-#: templates/structure/actions_in_table_structure.phtml:54
-#: templates/structure/actions_in_table_structure.phtml:79
-#: templates/structure/actions_in_table_structure.phtml:101
-#, php-format
-msgid "An index has been added on %s."
-msgstr ""
-
-#: templates/structure/actions_in_table_structure.phtml:130
-#: templates/structure/check_all_table_column.phtml:59
-msgid "Remove from central columns"
-msgstr ""
-
-#: templates/structure/actions_in_table_structure.phtml:138
-#: templates/structure/check_all_table_column.phtml:55
-msgid "Add to central columns"
-msgstr ""
-
-#: templates/structure/add_column.phtml:7
-#, php-format
-msgid "Add %s column(s)"
-msgstr ""
-
-#: templates/structure/add_column.phtml:12
-msgid "at beginning of table"
-msgstr ""
-
-#: templates/structure/body_for_table_summary.phtml:6
-#, php-format
-msgid "%s table"
-msgid_plural "%s tables"
-msgstr[0] "%s ಕೋಷ್ಟಕ"
-msgstr[1] "%s ಕೋಷ್ಟಕಗಳು"
-
-#: templates/structure/body_for_table_summary.phtml:17
-msgid "Sum"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:6
-msgid "Check tables having overhead"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:10
-msgid "Show create"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:27
-msgid "Prefix"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:28
-msgid "Add prefix to table"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:29
-msgid "Replace table prefix"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:30
-msgid "Copy table with prefix"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:36
-msgid "Add columns to central list"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:37
-msgid "Remove columns from central list"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:38
-msgid "Make consistent with central list"
-msgstr ""
-
-#: templates/structure/display_structure.phtml:140 view_create.php:181
-msgid "Edit view"
-msgstr ""
-
-#: templates/structure/display_table_stats.phtml:9
-msgid "Space usage"
-msgstr ""
-
-#: templates/structure/display_table_stats.phtml:27
-#: templates/structure/table_header.phtml:74
-msgid "Overhead"
-msgstr ""
-
-#: templates/structure/display_table_stats.phtml:32
-msgid "Effective"
-msgstr ""
-
-#: templates/structure/favorite_anchor.phtml:12
-msgid "Add to Favorites"
-msgstr ""
-
-#: templates/structure/move_columns_dialog.phtml:1
-#: templates/structure/optional_action_links.phtml:21
-msgid "Move columns"
-msgstr ""
-
-#: templates/structure/move_columns_dialog.phtml:2
-msgid "Move the columns by dragging them up and down."
-msgstr ""
-
-#: templates/structure/optional_action_links.phtml:9
-msgid "Propose table structure"
-msgstr ""
-
-#: templates/structure/optional_action_links.phtml:24
-msgid "Improve table structure"
-msgstr ""
-
-#: templates/structure/optional_action_links.phtml:30
-msgid "Track view"
-msgstr "ಮಾರ್ಗ ವೀಕ್ಷಣ"
-
-#: templates/structure/row_stats_table.phtml:3
-msgid "Row statistics"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:9
-msgid "static"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:11
-msgid "dynamic"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:22
-msgid "partitioned"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:54
-msgid "Row length"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:66
-msgid "Row size"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:73
-msgid "Next autoindex"
-msgstr ""
-
-#: templates/structure/secondary_tabs.phtml:14
-msgid "Relation view"
-msgstr ""
-
-#: templates/structure/show_create.phtml:2
-msgid "Showing create queries"
-msgstr ""
-
-#: templates/structure/sortable_header.phtml:13
-msgid "Sort"
-msgstr ""
-
-#: templates/structure/table_header.phtml:42
-msgid ""
-"May be approximate. Click on the number to get the exact count. See "
-"[doc@faq3-11]FAQ 3.11[/doc]."
-msgstr ""
-
-#: templates/structure/table_structure_row.phtml:46
-#, php-format
-msgid "Column %s has been dropped."
-msgstr ""
-
-#: templates/structure/tracking_icon.phtml:4
-msgid "Tracking is active."
-msgstr ""
-
-#: templates/structure/tracking_icon.phtml:8
-msgid "Tracking is not active."
-msgstr ""
-
-#: templates/table/create_table.phtml:15
-msgid "Number of columns"
-msgstr ""
-
-#: templates/table/options.phtml:8
-msgid "Select columns (at least one):"
-msgstr ""
-
-#: templates/table/options.phtml:37
-msgid "Add search conditions (body of the \"where\" clause):"
-msgstr ""
-
-#: templates/table/options.phtml:45
-msgid "Number of rows per page"
-msgstr ""
-
-#: templates/table/options.phtml:56
-msgid "Display order:"
-msgstr ""
-
-#: templates/table/options_zoom.phtml:6
-msgid "Use this column to label each point"
-msgstr ""
-
-#: templates/table/options_zoom.phtml:35
-msgid "Maximum rows to plot"
-msgstr ""
-
-#: templates/table/replace_preview.phtml:13
-msgid "Find and replace - preview"
-msgstr ""
-
-#: templates/table/replace_preview.phtml:18
-msgid "Original string"
-msgstr ""
-
-#: templates/table/replace_preview.phtml:19
-msgid "Replaced string"
-msgstr ""
-
-#: templates/table/replace_preview.phtml:40
-msgid "Replace"
-msgstr ""
-
-#: templates/table/rows_zoom.phtml:16
-msgid "Additional search criteria"
-msgstr ""
-
-#: templates/table/search_and_replace.phtml:3
-msgid "Replace with:"
-msgstr ""
-
-#: templates/table/search_and_replace.phtml:22
-msgid "Use regular expression"
-msgstr ""
-
-#: templates/table/selection_form.phtml:12
-msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
-msgstr ""
-
-#: templates/table/selection_form.phtml:34
-msgid "Do a \"query by example\" (wildcard: \"%\")"
-msgstr ""
-
-#: templates/table/zoom_result_form.phtml:7
-msgid "Browse/Edit the points"
-msgstr ""
-
-#: templates/table/zoom_result_form.phtml:15
-msgid "How to use"
-msgstr ""
-
-#: templates/table/zoom_result_form.phtml:23
-msgid "Reset zoom"
-msgstr ""
-
-#: templates/tbl_chart.phtml:17
+#: templates/table/chart/tbl_chart.phtml:17
 msgctxt "Chart type"
 msgid "Bar"
 msgstr ""
 
-#: templates/tbl_chart.phtml:21
+#: templates/table/chart/tbl_chart.phtml:21
 msgctxt "Chart type"
 msgid "Column"
 msgstr ""
 
-#: templates/tbl_chart.phtml:25
+#: templates/table/chart/tbl_chart.phtml:25
 msgctxt "Chart type"
 msgid "Line"
 msgstr ""
 
-#: templates/tbl_chart.phtml:29
+#: templates/table/chart/tbl_chart.phtml:29
 msgctxt "Chart type"
 msgid "Spline"
 msgstr ""
 
-#: templates/tbl_chart.phtml:33
+#: templates/table/chart/tbl_chart.phtml:33
 msgctxt "Chart type"
 msgid "Area"
 msgstr ""
 
-#: templates/tbl_chart.phtml:37
+#: templates/table/chart/tbl_chart.phtml:37
 msgctxt "Chart type"
 msgid "Pie"
 msgstr ""
 
-#: templates/tbl_chart.phtml:41
+#: templates/table/chart/tbl_chart.phtml:41
 msgctxt "Chart type"
 msgid "Timeline"
 msgstr ""
 
-#: templates/tbl_chart.phtml:45
+#: templates/table/chart/tbl_chart.phtml:45
 msgctxt "Chart type"
 msgid "Scatter"
 msgstr ""
 
-#: templates/tbl_chart.phtml:50
+#: templates/table/chart/tbl_chart.phtml:50
 msgid "Stacked"
 msgstr ""
 
-#: templates/tbl_chart.phtml:53
+#: templates/table/chart/tbl_chart.phtml:53
 msgid "Chart title"
 msgstr ""
 
-#: templates/tbl_chart.phtml:57
+#: templates/table/chart/tbl_chart.phtml:57
 msgid "X-Axis:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:72
+#: templates/table/chart/tbl_chart.phtml:72
 msgid "Series:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:102
+#: templates/table/chart/tbl_chart.phtml:102
 msgid "X-Axis label:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:104
+#: templates/table/chart/tbl_chart.phtml:104
 msgid "X Values"
 msgstr ""
 
-#: templates/tbl_chart.phtml:107
+#: templates/table/chart/tbl_chart.phtml:107
 msgid "Y-Axis label:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:115
+#: templates/table/chart/tbl_chart.phtml:115
 msgid "Series names are in a column"
 msgstr ""
 
-#: templates/tbl_chart.phtml:118
+#: templates/table/chart/tbl_chart.phtml:118
 msgid "Series column:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:130
+#: templates/table/chart/tbl_chart.phtml:130
 msgid "Value Column:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:150
+#: templates/table/chart/tbl_chart.phtml:150
 msgid "Save chart as image"
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:7
+#: templates/table/gis_visualization/gis_visualization.phtml:3
+msgid "Display GIS Visualization"
+msgstr ""
+
+#: templates/table/gis_visualization/gis_visualization.phtml:8
+msgid "Label column"
+msgstr ""
+
+#: templates/table/gis_visualization/gis_visualization.phtml:11
+msgid "-- None --"
+msgstr ""
+
+#: templates/table/gis_visualization/gis_visualization.phtml:19
+msgid "Spatial column"
+msgstr ""
+
+#: templates/table/index_form.phtml:16
+msgid "Index name:"
+msgstr ""
+
+#: templates/table/index_form.phtml:19
+msgid ""
+"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
+msgstr ""
+
+#: templates/table/index_form.phtml:40
+msgid "Index choice:"
+msgstr ""
+
+#: templates/table/index_form.phtml:57
+msgid "Key block size:"
+msgstr ""
+
+#: templates/table/index_form.phtml:74
+msgid "Index type:"
+msgstr ""
+
+#: templates/table/index_form.phtml:86
+msgid "Parser:"
+msgstr "ವಿಶ್ಲೇಷಕ:"
+
+#: templates/table/index_form.phtml:102
+msgid "Comment:"
+msgstr ""
+
+#: templates/table/index_form.phtml:149 templates/table/index_form.phtml:190
+msgid "Drag to reorder"
+msgstr ""
+
+#: templates/table/relation/common_form.phtml:7
 msgid "Internal relations"
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:11
+#: templates/table/relation/common_form.phtml:11
 msgid "Internal relation"
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:14
+#: templates/table/relation/common_form.phtml:14
 msgid ""
 "An internal relation is not necessary when a corresponding FOREIGN KEY "
 "relation exists."
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:37
+#: templates/table/relation/common_form.phtml:37
 msgid "Foreign key constraints"
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:40
+#: templates/table/relation/common_form.phtml:40
 msgid "Actions"
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:41
+#: templates/table/relation/common_form.phtml:41
 msgid "Constraint properties"
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:44
+#: templates/table/relation/common_form.phtml:44
 msgid ""
 "Only columns with index will be displayed. You can define an index below."
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:49
+#: templates/table/relation/common_form.phtml:49
 msgid "Foreign key constraint"
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:81
+#: templates/table/relation/common_form.phtml:81
 msgid "+ Add constraint"
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:91
+#: templates/table/relation/common_form.phtml:91
 msgid "Choose column to display:"
 msgstr ""
 
-#: templates/tbl_relation/foreign_key_row.phtml:13
+#: templates/table/relation/foreign_key_row.phtml:13
 #, php-format
 msgid "Foreign key constraint %s has been dropped"
 msgstr ""
 
-#: templates/tbl_relation/foreign_key_row.phtml:102
+#: templates/table/relation/foreign_key_row.phtml:102
 msgid "Constraint name"
 msgstr ""
 
-#: templates/tbl_relation/foreign_key_row.phtml:157
+#: templates/table/relation/foreign_key_row.phtml:157
 msgid "+ Add column"
 msgstr ""
 
+#: templates/table/search/options.phtml:8
+msgid "Select columns (at least one):"
+msgstr ""
+
+#: templates/table/search/options.phtml:37
+msgid "Add search conditions (body of the \"where\" clause):"
+msgstr ""
+
+#: templates/table/search/options.phtml:45
+msgid "Number of rows per page"
+msgstr ""
+
+#: templates/table/search/options.phtml:56
+msgid "Display order:"
+msgstr ""
+
+#: templates/table/search/options_zoom.phtml:6
+msgid "Use this column to label each point"
+msgstr ""
+
+#: templates/table/search/options_zoom.phtml:35
+msgid "Maximum rows to plot"
+msgstr ""
+
+#: templates/table/search/replace_preview.phtml:13
+msgid "Find and replace - preview"
+msgstr ""
+
+#: templates/table/search/replace_preview.phtml:18
+msgid "Original string"
+msgstr ""
+
+#: templates/table/search/replace_preview.phtml:19
+msgid "Replaced string"
+msgstr ""
+
+#: templates/table/search/replace_preview.phtml:40
+msgid "Replace"
+msgstr ""
+
+#: templates/table/search/rows_zoom.phtml:16
+msgid "Additional search criteria"
+msgstr ""
+
+#: templates/table/search/search_and_replace.phtml:3
+msgid "Replace with:"
+msgstr ""
+
+#: templates/table/search/search_and_replace.phtml:22
+msgid "Use regular expression"
+msgstr ""
+
+#: templates/table/search/selection_form.phtml:12
+msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
+msgstr ""
+
+#: templates/table/search/selection_form.phtml:34
+msgid "Do a \"query by example\" (wildcard: \"%\")"
+msgstr ""
+
+#: templates/table/search/zoom_result_form.phtml:7
+msgid "Browse/Edit the points"
+msgstr ""
+
+#: templates/table/search/zoom_result_form.phtml:15
+msgid "How to use"
+msgstr ""
+
+#: templates/table/search/zoom_result_form.phtml:23
+msgid "Reset zoom"
+msgstr ""
+
+#: templates/table/secondary_tabs.phtml:14
+msgid "Relation view"
+msgstr ""
+
+#: templates/table/structure/actions_in_table_structure.phtml:14
+#, php-format
+msgid "A primary key has been added on %s."
+msgstr ""
+
+#: templates/table/structure/actions_in_table_structure.phtml:34
+#: templates/table/structure/actions_in_table_structure.phtml:54
+#: templates/table/structure/actions_in_table_structure.phtml:79
+#: templates/table/structure/actions_in_table_structure.phtml:101
+#, php-format
+msgid "An index has been added on %s."
+msgstr ""
+
+#: templates/table/structure/actions_in_table_structure.phtml:130
+#: templates/table/structure/check_all_table_column.phtml:59
+msgid "Remove from central columns"
+msgstr ""
+
+#: templates/table/structure/actions_in_table_structure.phtml:138
+#: templates/table/structure/check_all_table_column.phtml:55
+msgid "Add to central columns"
+msgstr ""
+
+#: templates/table/structure/add_column.phtml:7
+#, php-format
+msgid "Add %s column(s)"
+msgstr ""
+
+#: templates/table/structure/add_column.phtml:12
+msgid "at beginning of table"
+msgstr ""
+
+#: templates/table/structure/display_structure.phtml:140 view_create.php:181
+msgid "Edit view"
+msgstr ""
+
+#: templates/table/structure/display_table_stats.phtml:9
+msgid "Space usage"
+msgstr ""
+
+#: templates/table/structure/display_table_stats.phtml:32
+msgid "Effective"
+msgstr ""
+
+#: templates/table/structure/move_columns_dialog.phtml:1
+#: templates/table/structure/optional_action_links.phtml:21
+msgid "Move columns"
+msgstr ""
+
+#: templates/table/structure/move_columns_dialog.phtml:2
+msgid "Move the columns by dragging them up and down."
+msgstr ""
+
+#: templates/table/structure/optional_action_links.phtml:9
+msgid "Propose table structure"
+msgstr ""
+
+#: templates/table/structure/optional_action_links.phtml:24
+msgid "Improve table structure"
+msgstr ""
+
+#: templates/table/structure/optional_action_links.phtml:30
+msgid "Track view"
+msgstr "ಮಾರ್ಗ ವೀಕ್ಷಣ"
+
+#: templates/table/structure/row_stats_table.phtml:3
+msgid "Row statistics"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:9
+msgid "static"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:11
+msgid "dynamic"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:22
+msgid "partitioned"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:54
+msgid "Row length"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:66
+msgid "Row size"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:73
+msgid "Next autoindex"
+msgstr ""
+
+#: templates/table/structure/table_structure_row.phtml:46
+#, php-format
+msgid "Column %s has been dropped."
+msgstr ""
+
 #: themes.php:17 themes.php:22
 msgid "Theme"
 msgstr ""
diff --git a/po/ko.po b/po/ko.po
index b4be8bb96d..abd32115cd 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 4.5.0-dev\n"
 "Report-Msgid-Bugs-To: developers@phpmyadmin.net\n"
-"POT-Creation-Date: 2015-08-08 13:53-0400\n"
+"POT-Creation-Date: 2015-08-12 08:10-0400\n"
 "PO-Revision-Date: 2015-07-22 08:21+0200\n"
 "Last-Translator: Koo Youngmin <youngminz.kr@gmail.com>\n"
 "Language-Team: Korean <https://hosted.weblate.org/projects/phpmyadmin/master/"
@@ -53,7 +53,7 @@ msgid "Table comments:"
 msgstr "테이블 설명:"
 
 #: db_datadict.php:104 libraries/Index.class.php:699
-#: libraries/insert_edit.lib.php:1567
+#: libraries/insert_edit.lib.php:1565
 #: libraries/navigation/Nodes/Node_Column.class.php:30
 #: libraries/plugins/export/ExportHtmlword.class.php:280
 #: libraries/plugins/export/ExportHtmlword.class.php:375
@@ -67,13 +67,14 @@ msgstr "테이블 설명:"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1023
 #: libraries/tracking.lib.php:879 libraries/tracking.lib.php:975
 #: templates/columns_definitions/column_name.phtml:18
-#: templates/index_form.phtml:124 templates/table/table_header.phtml:6
-#: templates/table/zoom_result_form.phtml:33
-#: templates/tbl_relation/common_form.phtml:10
-#: templates/tbl_relation/common_form.phtml:43
-#: templates/tbl_relation/foreign_key_row.phtml:194
-#: templates/tbl_relation/foreign_key_row.phtml:206
-#: templates/tbl_relation/internal_relational_row.phtml:71
+#: templates/table/index_form.phtml:124
+#: templates/table/relation/common_form.phtml:10
+#: templates/table/relation/common_form.phtml:43
+#: templates/table/relation/foreign_key_row.phtml:194
+#: templates/table/relation/foreign_key_row.phtml:206
+#: templates/table/relation/internal_relational_row.phtml:71
+#: templates/table/search/table_header.phtml:6
+#: templates/table/search/zoom_result_form.phtml:33
 msgid "Column"
 msgstr "컬럼명"
 
@@ -91,21 +92,21 @@ msgstr "컬럼명"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1001
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1024
 #: libraries/rte/rte_list.lib.php:75 libraries/rte/rte_list.lib.php:103
-#: libraries/rte/rte_routines.lib.php:802
-#: libraries/rte/rte_routines.lib.php:831
-#: libraries/rte/rte_routines.lib.php:1493
+#: libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_routines.lib.php:922
+#: libraries/rte/rte_routines.lib.php:1584
 #: libraries/server_privileges.lib.php:2369 libraries/tracking.lib.php:880
 #: libraries/tracking.lib.php:972
 #: templates/columns_definitions/table_fields_definitions.phtml:11
-#: templates/structure/table_header.phtml:48
-#: templates/structure/table_structure_header.phtml:6
-#: templates/table/table_header.phtml:7
+#: templates/database/structure/table_header.phtml:48
+#: templates/table/search/table_header.phtml:7
+#: templates/table/structure/table_structure_header.phtml:6
 msgid "Type"
 msgstr "종류"
 
 #: db_datadict.php:106 libraries/Index.class.php:702
 #: libraries/central_columns.lib.php:708
-#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1576
+#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1574
 #: libraries/plugins/export/ExportHtmlword.class.php:286
 #: libraries/plugins/export/ExportHtmlword.class.php:381
 #: libraries/plugins/export/ExportLatex.class.php:509
@@ -118,8 +119,8 @@ msgstr "종류"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1026
 #: libraries/tracking.lib.php:882 libraries/tracking.lib.php:978
 #: templates/columns_definitions/table_fields_definitions.phtml:39
-#: templates/structure/table_structure_header.phtml:9
-#: templates/table/zoom_result_form.phtml:34
+#: templates/table/search/zoom_result_form.phtml:34
+#: templates/table/structure/table_structure_header.phtml:9
 msgid "Null"
 msgstr "Null"
 
@@ -137,8 +138,8 @@ msgstr "Null"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1027
 #: libraries/replication_gui.lib.php:153 libraries/tracking.lib.php:883
 #: templates/columns_definitions/table_fields_definitions.phtml:25
-#: templates/structure/body_for_table_summary.phtml:55
-#: templates/structure/table_structure_header.phtml:10
+#: templates/database/structure/body_for_table_summary.phtml:55
+#: templates/table/structure/table_structure_header.phtml:10
 msgid "Default"
 msgstr "기본값"
 
@@ -166,19 +167,19 @@ msgid "Comments"
 msgstr "설명"
 
 #: db_datadict.php:146
-#: libraries/controllers/StructureController.class.php:1960
-#: libraries/controllers/StructureController.class.php:1965
+#: libraries/controllers/TableStructureController.class.php:951
+#: libraries/controllers/TableStructureController.class.php:956
 #: libraries/tracking.lib.php:922
 #: templates/columns_definitions/column_indexes.phtml:6
-#: templates/structure/check_all_table_column.phtml:22
-#: templates/structure/display_structure.phtml:74
+#: templates/table/structure/check_all_table_column.phtml:22
+#: templates/table/structure/display_structure.phtml:74
 msgid "Primary"
 msgstr "기본"
 
 #: db_datadict.php:156 js/messages.php:317 libraries/Index.class.php:567
 #: libraries/Index.class.php:606 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261 libraries/mult_submits.lib.php:403
+#: libraries/config/FormDisplay.tpl.php:272 libraries/mult_submits.lib.php:403
 #: libraries/mult_submits.lib.php:417
 #: libraries/plugins/export/ExportHtmlword.class.php:630
 #: libraries/plugins/export/ExportLatex.class.php:589
@@ -194,20 +195,20 @@ msgstr "기본"
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1010 libraries/tracking.lib.php:1015
 #: prefs_manage.php:140 templates/prefs_autoload.phtml:15
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "No"
 msgstr "아니오"
 
 #: db_datadict.php:156 js/messages.php:443 libraries/Index.class.php:568
 #: libraries/Index.class.php:605 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261
-#: libraries/controllers/StructureController.class.php:1344
-#: libraries/controllers/StructureController.class.php:2223
-#: libraries/controllers/StructureController.class.php:2232
-#: libraries/controllers/StructureController.class.php:2237
-#: libraries/controllers/StructureController.class.php:2242
-#: libraries/controllers/StructureController.class.php:2247
+#: libraries/config/FormDisplay.tpl.php:272
+#: libraries/controllers/TableStructureController.class.php:539
+#: libraries/controllers/TableStructureController.class.php:1201
+#: libraries/controllers/TableStructureController.class.php:1210
+#: libraries/controllers/TableStructureController.class.php:1215
+#: libraries/controllers/TableStructureController.class.php:1220
+#: libraries/controllers/TableStructureController.class.php:1225
 #: libraries/mult_submits.inc.php:82 libraries/mult_submits.inc.php:178
 #: libraries/mult_submits.lib.php:339 libraries/mult_submits.lib.php:372
 #: libraries/mult_submits.lib.php:401 libraries/mult_submits.lib.php:415
@@ -216,8 +217,8 @@ msgstr "아니오"
 #: libraries/plugins/export/ExportOdt.class.php:756
 #: libraries/plugins/export/ExportTexytext.class.php:567
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1077
-#: libraries/server_databases.lib.php:464
-#: libraries/server_databases.lib.php:474
+#: libraries/server_databases.lib.php:475
+#: libraries/server_databases.lib.php:485
 #: libraries/server_privileges.lib.php:2546
 #: libraries/server_privileges.lib.php:2727
 #: libraries/server_privileges.lib.php:2748
@@ -227,7 +228,7 @@ msgstr "아니오"
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1008 libraries/tracking.lib.php:1013
 #: prefs_manage.php:138 templates/prefs_autoload.phtml:14
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "Yes"
 msgstr "예"
 
@@ -237,7 +238,7 @@ msgstr "데이터베이스의 덤프(스키마) 데이터 보기"
 
 #: db_export.php:37 db_tracking.php:90 export.php:382
 #: libraries/DBQbe.class.php:326
-#: libraries/controllers/StructureController.class.php:231
+#: libraries/controllers/DatabaseStructureController.class.php:170
 #: libraries/navigation/NavigationTree.class.php:897
 msgid "No tables found in database."
 msgstr "데이터베이스에 테이블이 없습니다."
@@ -248,14 +249,14 @@ msgstr "데이터베이스에 테이블이 없습니다."
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:26
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:120
-#: templates/structure/show_create.phtml:18
+#: templates/database/structure/show_create.phtml:18
 msgid "Tables"
 msgstr "테이블"
 
 #: db_export.php:52 libraries/Menu.class.php:317 libraries/Menu.class.php:425
-#: libraries/Util.class.php:3333 libraries/Util.class.php:3343
-#: libraries/Util.class.php:3349 libraries/Util.class.php:3629
-#: libraries/Util.class.php:4327 libraries/Util.class.php:4344
+#: libraries/Util.class.php:3339 libraries/Util.class.php:3349
+#: libraries/Util.class.php:3355 libraries/Util.class.php:3635
+#: libraries/Util.class.php:4333 libraries/Util.class.php:4350
 #: libraries/central_columns.lib.php:728 libraries/config.values.php:39
 #: libraries/config.values.php:47 libraries/config.values.php:109
 #: libraries/config.values.php:115 libraries/config/setup.forms.php:323
@@ -269,7 +270,7 @@ msgstr "테이블"
 #: libraries/navigation/Nodes/Node_Table.class.php:283
 #: libraries/server_privileges.lib.php:1141 libraries/tracking.lib.php:874
 #: templates/columns_definitions/table_fields_definitions.phtml:3
-#: templates/designer/table_list.phtml:28
+#: templates/database/designer/table_list.phtml:28
 msgid "Structure"
 msgstr "구조"
 
@@ -281,7 +282,7 @@ msgstr "구조"
 #: libraries/config/user_preferences.forms.php:292
 #: libraries/config/user_preferences.forms.php:297
 #: libraries/server_privileges.lib.php:1140
-#: templates/structure/display_table_stats.phtml:12
+#: templates/table/structure/display_table_stats.phtml:12
 msgid "Data"
 msgstr "데이터"
 
@@ -355,10 +356,10 @@ msgstr "추적된 테이블"
 #: libraries/server_privileges.lib.php:2908
 #: libraries/server_privileges.lib.php:3145
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4346
-#: templates/structure/table_header.phtml:21
-#: templates/tbl_relation/foreign_key_row.phtml:176
-#: templates/tbl_relation/internal_relational_row.phtml:63
+#: libraries/server_privileges.lib.php:4372
+#: templates/database/structure/table_header.phtml:21
+#: templates/table/relation/foreign_key_row.phtml:176
+#: templates/table/relation/internal_relational_row.phtml:63
 msgid "Table"
 msgstr "테이블"
 
@@ -375,7 +376,7 @@ msgid "Updated"
 msgstr "수정됨"
 
 #: db_tracking.php:130 js/messages.php:243 libraries/Menu.class.php:552
-#: libraries/Util.class.php:4314 libraries/config.values.php:104
+#: libraries/Util.class.php:4320 libraries/config.values.php:104
 #: libraries/rte/rte_events.lib.php:393 libraries/rte/rte_list.lib.php:101
 #: libraries/server_status_processes.lib.php:92 libraries/tracking.lib.php:279
 msgid "Status"
@@ -384,14 +385,15 @@ msgstr "상태"
 #: db_tracking.php:131 db_tracking.php:290 libraries/Index.class.php:693
 #: libraries/central_columns.lib.php:687 libraries/rte/rte_list.lib.php:74
 #: libraries/rte/rte_list.lib.php:89 libraries/rte/rte_list.lib.php:102
-#: libraries/server_databases.lib.php:398
+#: libraries/server_databases.lib.php:409
 #: libraries/server_privileges.lib.php:2372
 #: libraries/server_privileges.lib.php:3166
 #: libraries/server_privileges.lib.php:3342
 #: libraries/server_user_groups.lib.php:82
 #: libraries/server_variables.lib.php:189 libraries/tracking.lib.php:280
-#: libraries/tracking.lib.php:793 templates/structure/table_header.phtml:30
-#: templates/structure/table_structure_header.phtml:23
+#: libraries/tracking.lib.php:793
+#: templates/database/structure/table_header.phtml:30
+#: templates/table/structure/table_structure_header.phtml:23
 msgid "Action"
 msgstr "실행"
 
@@ -433,7 +435,7 @@ msgid "Untracked tables"
 msgstr "추적되지 않은 테이블"
 
 #: db_tracking.php:305 db_tracking.php:336
-#: templates/structure/optional_action_links.phtml:17
+#: templates/table/structure/optional_action_links.phtml:17
 msgid "Track table"
 msgstr "테이블 추적"
 
@@ -483,7 +485,7 @@ msgid "Value for the column \"%s\""
 msgstr "\"%s\"행의 값"
 
 #: gis_data_editor.php:146
-#: templates/gis_visualization/gis_visualization.phtml:37
+#: templates/table/gis_visualization/gis_visualization.phtml:37
 msgid "Use OpenStreetMaps as Base Layer"
 msgstr "기본 레이어로 OpenStreetMaps를 사용"
 
@@ -563,35 +565,35 @@ msgstr "공간 데이터를 추가"
 #: libraries/display_change_password.lib.php:162
 #: libraries/display_export.lib.php:402 libraries/display_export.lib.php:408
 #: libraries/display_import.lib.php:392 libraries/index.lib.php:44
-#: libraries/insert_edit.lib.php:1546 libraries/insert_edit.lib.php:1583
+#: libraries/insert_edit.lib.php:1544 libraries/insert_edit.lib.php:1581
 #: libraries/normalization.lib.php:165 libraries/normalization.lib.php:821
 #: libraries/operations.lib.php:38 libraries/operations.lib.php:108
 #: libraries/operations.lib.php:263 libraries/operations.lib.php:306
 #: libraries/operations.lib.php:801 libraries/operations.lib.php:874
 #: libraries/operations.lib.php:923 libraries/operations.lib.php:1337
 #: libraries/operations.lib.php:1658
-#: libraries/plugins/auth/AuthenticationCookie.class.php:244
+#: libraries/plugins/auth/AuthenticationCookie.class.php:232
 #: libraries/replication_gui.lib.php:122 libraries/replication_gui.lib.php:161
 #: libraries/replication_gui.lib.php:324 libraries/replication_gui.lib.php:461
 #: libraries/replication_gui.lib.php:906 libraries/rte/rte_events.lib.php:509
-#: libraries/rte/rte_routines.lib.php:969
-#: libraries/rte/rte_routines.lib.php:1581
+#: libraries/rte/rte_routines.lib.php:1060
+#: libraries/rte/rte_routines.lib.php:1672
 #: libraries/rte/rte_triggers.lib.php:396 libraries/server_bin_log.lib.php:61
 #: libraries/server_privileges.lib.php:705
 #: libraries/server_privileges.lib.php:2106
 #: libraries/server_privileges.lib.php:2872
 #: libraries/server_privileges.lib.php:3553
-#: libraries/server_privileges.lib.php:4627
+#: libraries/server_privileges.lib.php:4653
 #: libraries/server_user_groups.lib.php:285
 #: libraries/sql_query_form.lib.php:369 libraries/sql_query_form.lib.php:429
 #: libraries/tracking.lib.php:533 libraries/tracking.lib.php:653
 #: prefs_manage.php:277 prefs_manage.php:355
 #: templates/columns_definitions/column_definitions_form.phtml:59
-#: templates/header_location.phtml:17 templates/index_form.phtml:238
+#: templates/database/create_table.phtml:21 templates/header_location.phtml:28
 #: templates/startAndNumberOfRowsPanel.phtml:14
-#: templates/structure/add_column.phtml:25
-#: templates/table/create_table.phtml:21
-#: templates/table/selection_form.phtml:75 view_create.php:275
+#: templates/table/index_form.phtml:238
+#: templates/table/search/selection_form.phtml:75
+#: templates/table/structure/add_column.phtml:25 view_create.php:275
 #: view_operations.php:106
 msgid "Go"
 msgstr "실행"
@@ -680,7 +682,7 @@ msgid "Could not load import plugins, please check your installation!"
 msgstr ""
 "가져오기 플러그인을 로드할 수 없습니다. 올바로 설치되었는지 확인해주세요!"
 
-#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1466
+#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1460
 #, php-format
 msgid "Bookmark %s has been created."
 msgstr "북마크 %s가 생성되었습니다."
@@ -718,11 +720,11 @@ msgstr "가져오기에 필요한 절차를 로드할 수 없습니다."
 msgid "Back"
 msgstr "뒤로"
 
-#: index.php:148 libraries/Footer.class.php:70
+#: index.php:149 libraries/Footer.class.php:70
 msgid "phpMyAdmin Demo Server"
 msgstr "phpMyAdmin 데모 서버"
 
-#: index.php:152
+#: index.php:153
 #, php-format
 msgid ""
 "You are using the demo server. You can do anything here, but please do not "
@@ -732,110 +734,110 @@ msgstr ""
 "데모서버를 사용중입니다. 뭐든지 할 수있으나 root, debian-sys-maint, pma사용자"
 "는 변경하지 마세요. 추가정보는 %s에서 있습니다."
 
-#: index.php:162
+#: index.php:163
 msgid "General Settings"
 msgstr "일반 설정"
 
-#: index.php:190 libraries/display_change_password.lib.php:50
+#: index.php:191 libraries/display_change_password.lib.php:50
 #: libraries/display_change_password.lib.php:53 user_password.php:247
 msgid "Change password"
 msgstr "암호 변경"
 
-#: index.php:206
+#: index.php:207
 msgid "Server connection collation"
 msgstr "서버 연결 콜레이션(언어)"
 
-#: index.php:228
+#: index.php:229
 msgid "Appearance Settings"
 msgstr "외관 설정"
 
-#: index.php:258 prefs_manage.php:285
+#: index.php:259 prefs_manage.php:285
 msgid "More settings"
 msgstr "자세한 설정"
 
-#: index.php:279
+#: index.php:280
 msgid "Database server"
 msgstr "데이터베이스 서버"
 
-#: index.php:282 libraries/plugins/auth/AuthenticationCookie.class.php:181
+#: index.php:283 libraries/plugins/auth/AuthenticationCookie.class.php:169
 msgid "Server:"
 msgstr "서버:"
 
-#: index.php:286
+#: index.php:287
 msgid "Server type:"
 msgstr "서버 타입:"
 
-#: index.php:290 libraries/plugins/export/ExportLatex.class.php:212
+#: index.php:291 libraries/plugins/export/ExportLatex.class.php:212
 #: libraries/plugins/export/ExportSql.class.php:687
 #: libraries/plugins/export/ExportXml.class.php:189
 msgid "Server version:"
 msgstr "서버 버전:"
 
-#: index.php:296
+#: index.php:297
 msgid "Protocol version:"
 msgstr "제품 버전:"
 
-#: index.php:300
+#: index.php:301
 msgid "User:"
 msgstr "사용자:"
 
-#: index.php:305
+#: index.php:306
 msgid "Server charset:"
 msgstr "서버 문자셋:"
 
-#: index.php:320
+#: index.php:321
 msgid "Web server"
 msgstr "웹서버"
 
-#: index.php:331
+#: index.php:332
 msgid "Database client version:"
 msgstr "데이터베이스 클라이언트 버전:"
 
-#: index.php:335
+#: index.php:336
 msgid "PHP extension:"
 msgstr "PHP 확장:"
 
-#: index.php:349
+#: index.php:350
 msgid "PHP version:"
 msgstr "PHP 버전:"
 
-#: index.php:360
+#: index.php:361
 msgid "Show PHP information"
 msgstr "PHP 정보 보기"
 
-#: index.php:383
+#: index.php:384
 msgid "Version information:"
 msgstr "버전 정보:"
 
-#: index.php:392 libraries/Util.class.php:432 libraries/Util.class.php:495
-#: libraries/config/FormDisplay.tpl.php:151
+#: index.php:393 libraries/Util.class.php:432 libraries/Util.class.php:495
+#: libraries/config/FormDisplay.tpl.php:162
 #: libraries/display_export.lib.php:577 libraries/engines/pbxt.lib.php:162
 #: libraries/navigation/NavigationHeader.class.php:196
 #: libraries/server_variables.lib.php:160
 msgid "Documentation"
 msgstr "문서"
 
-#: index.php:399
+#: index.php:400
 msgid "Wiki"
 msgstr "위키"
 
-#: index.php:408
+#: index.php:409
 msgid "Official Homepage"
 msgstr "phpMyAdmin 공식 홈"
 
-#: index.php:415
+#: index.php:416
 msgid "Contribute"
 msgstr "기여"
 
-#: index.php:422
+#: index.php:423
 msgid "Get support"
 msgstr "지원 받기"
 
-#: index.php:429
+#: index.php:430
 msgid "List of changes"
 msgstr "변경 목록"
 
-#: index.php:451
+#: index.php:452
 msgid ""
 "You are connected as 'root' with no password, which corresponds to the "
 "default MySQL privileged account. Your MySQL server is running with this "
@@ -847,7 +849,7 @@ msgstr ""
 "서 root 유저의 비밀번호를 설정하는 것으로 이 취약점을 최대한 빨리 고쳐야 합니"
 "다."
 
-#: index.php:468
+#: index.php:469
 msgid ""
 "You have enabled mbstring.func_overload in your PHP configuration. This "
 "option is incompatible with phpMyAdmin and might cause some data to be "
@@ -856,7 +858,7 @@ msgstr ""
 "PHP 설정에서 mbstring.func_overload를 활성화해야합니다. 이 옵션은 phpMyAdmin"
 "와 호환되지 않고 일부 데이터가 손상될 수 있습니다!"
 
-#: index.php:483
+#: index.php:484
 msgid ""
 "The mbstring PHP extension was not found and you seem to be using a "
 "multibyte charset. Without the mbstring extension phpMyAdmin is unable to "
@@ -866,7 +868,7 @@ msgstr ""
 "니다. mbstring PHP extension 이 없다면 phpMyAdmin 에서 문자열을 정확하게 나"
 "눌 수 없으며 이로 인해 예상하지 못한 결과가 발생 할 수 있습니다."
 
-#: index.php:500
+#: index.php:501
 msgid ""
 "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini."
 "session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower than "
@@ -878,7 +880,7 @@ msgstr ""
 "cookie 유효기간보다 작게 설정되어 있어, 로그인이 phpMyAdmin 설정값보다 빨리 "
 "만료될 수 있습니다."
 
-#: index.php:519
+#: index.php:520
 msgid ""
 "Login cookie store is lower than cookie validity configured in phpMyAdmin, "
 "because of this, your login will expire sooner than configured in phpMyAdmin."
@@ -886,11 +888,11 @@ msgstr ""
 "로그인 쿠키의 저장 시간이 phpMyAdmin에서 설정한 쿠키 유효 시간보다 짧게 설정"
 "되어 있어, 로그인이 설정한 것보다 일찍 만료됩니다."
 
-#: index.php:535
+#: index.php:536
 msgid "The configuration file now needs a secret passphrase (blowfish_secret)."
 msgstr "이제 설정 파일은 암호화 문자열(blowfish_scret) 을 필요로 합니다."
 
-#: index.php:548
+#: index.php:549
 msgid ""
 "Directory [code]config[/code], which is used by the setup script, still "
 "exists in your phpMyAdmin directory. It is strongly recommended to remove it "
@@ -901,7 +903,7 @@ msgstr ""
 "도 존재합니다. phpMyAdmin 설정 완료후 꼭 삭제하세요. 그렇지 않으며 보안에 취"
 "약해 집니다."
 
-#: index.php:564
+#: index.php:565
 #, php-format
 msgid ""
 "The phpMyAdmin configuration storage is not completely configured, some "
@@ -910,12 +912,12 @@ msgstr ""
 "phpMyAdmin 설정 스토리지가 완전히 설정되지 않아, 일부 확장 기능들이 비활성화 "
 "된 상태입니다. 원인을 확인하려면 %s여기%s를 클릭하세요. "
 
-#: index.php:571
+#: index.php:572
 msgid ""
 "Or alternately go to 'Operations' tab of any database to set it up there."
 msgstr ""
 
-#: index.php:620
+#: index.php:621
 #, php-format
 msgid ""
 "Your PHP MySQL library version %s differs from your MySQL server version %s. "
@@ -924,7 +926,7 @@ msgstr ""
 "PHP MySQL 라이브버리 버전(%s) 과 MySQL server version(%s) 이 다릅니다. 이것"
 "은 예상하지 못한 문제를 야기할 수 있습니다."
 
-#: index.php:648
+#: index.php:649
 #, php-format
 msgid ""
 "Server running with Suhosin. Please refer to %sdocumentation%s for possible "
@@ -1080,8 +1082,8 @@ msgstr ""
 msgid "Save & Close"
 msgstr "저장 & 종료"
 
-#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:404
-#: libraries/insert_edit.lib.php:1550 prefs_manage.php:361
+#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:415
+#: libraries/insert_edit.lib.php:1548 prefs_manage.php:361
 #: prefs_manage.php:372
 msgid "Reset"
 msgstr "초기화"
@@ -1114,7 +1116,7 @@ msgstr "인덱스 추가"
 msgid "Edit Index"
 msgstr "인덱스 수정"
 
-#: js/messages.php:99 templates/index_form.phtml:232
+#: js/messages.php:99 templates/table/index_form.phtml:232
 #, php-format
 msgid "Add %s column(s) to index"
 msgstr "인덱스에 %s 열 추가"
@@ -1135,13 +1137,14 @@ msgstr "이것과 합치기:"
 msgid "Please select column(s) for the index."
 msgstr "인덱스에 추가할 열을 선택해주세요."
 
-#: js/messages.php:106 templates/structure/add_column.phtml:1
+#: js/messages.php:106 templates/table/structure/add_column.phtml:1
 msgid "You have to add at least one column."
 msgstr "적어도 한 개 이상의 컬럼을 추가해야 합니다."
 
-#: js/messages.php:109 libraries/insert_edit.lib.php:1548
+#: js/messages.php:109 libraries/insert_edit.lib.php:1546
 #: templates/columns_definitions/column_definitions_form.phtml:162
-#: templates/index_form.phtml:237 templates/tbl_relation/common_form.phtml:106
+#: templates/table/index_form.phtml:237
+#: templates/table/relation/common_form.phtml:106
 msgid "Preview SQL"
 msgstr "SQL 미리보기"
 
@@ -1158,7 +1161,7 @@ msgid "SQL query:"
 msgstr "SQL 질의:"
 
 #. l10n: Default label for the y-Axis of Charts
-#: js/messages.php:118 templates/tbl_chart.phtml:109
+#: js/messages.php:118 templates/table/chart/tbl_chart.phtml:109
 msgid "Y Values"
 msgstr "Y값"
 
@@ -1318,7 +1321,7 @@ msgstr "바이트 보냄"
 msgid "Bytes received"
 msgstr "바이트 받음"
 
-#: js/messages.php:169 libraries/server_status.lib.php:226
+#: js/messages.php:169 libraries/server_status.lib.php:235
 msgid "Connections"
 msgstr "연결 수"
 
@@ -1375,12 +1378,12 @@ msgstr "%d개 테이블(s)"
 msgid "Questions"
 msgstr "질의"
 
-#: js/messages.php:184 libraries/server_status.lib.php:134
+#: js/messages.php:184 libraries/server_status.lib.php:143
 msgid "Traffic"
 msgstr "소통량"
 
 #: js/messages.php:185 libraries/Menu.class.php:586
-#: libraries/Util.class.php:4318 libraries/server_status_monitor.lib.php:257
+#: libraries/Util.class.php:4324 libraries/server_status_monitor.lib.php:257
 msgid "Settings"
 msgstr "설정"
 
@@ -1400,8 +1403,9 @@ msgstr "하나 이상의 변수를 시리즈에 추가하십시오!"
 #: libraries/server_status_monitor.lib.php:236
 #: libraries/server_status_processes.lib.php:308
 #: templates/columns_definitions/transformation.phtml:4
-#: templates/designer/options_panel.phtml:178
-#: templates/table/options_zoom.phtml:12 templates/table/rows_zoom.phtml:26
+#: templates/database/designer/options_panel.phtml:178
+#: templates/table/search/options_zoom.phtml:12
+#: templates/table/search/rows_zoom.phtml:26
 msgid "None"
 msgstr "없음"
 
@@ -1684,8 +1688,8 @@ msgstr "가져온 설정과 차트 격자를 그리는데 실패했습니다. 
 
 #: js/messages.php:270 libraries/Menu.class.php:352
 #: libraries/Menu.class.php:455 libraries/Menu.class.php:582
-#: libraries/Util.class.php:4317 libraries/Util.class.php:4332
-#: libraries/Util.class.php:4349 libraries/config/messages.inc.php:258
+#: libraries/Util.class.php:4323 libraries/Util.class.php:4338
+#: libraries/Util.class.php:4355 libraries/config/messages.inc.php:258
 #: libraries/display_import.lib.php:105
 #: libraries/server_status_monitor.lib.php:318 prefs_manage.php:238
 #: setup/frames/menu.inc.php:26
@@ -1745,13 +1749,13 @@ msgid "Formatting SQL..."
 msgstr ""
 
 #: js/messages.php:293 libraries/server_variables.lib.php:157
-#: templates/designer/aggregate_query_panel.phtml:63
-#: templates/designer/delete_relation_panel.phtml:28
-#: templates/designer/having_query_panel.phtml:117
-#: templates/designer/new_relation_panel.phtml:88
-#: templates/designer/options_panel.phtml:253
-#: templates/designer/rename_to_panel.phtml:45
-#: templates/designer/where_query_panel.phtml:83
+#: templates/database/designer/aggregate_query_panel.phtml:63
+#: templates/database/designer/delete_relation_panel.phtml:28
+#: templates/database/designer/having_query_panel.phtml:117
+#: templates/database/designer/new_relation_panel.phtml:88
+#: templates/database/designer/options_panel.phtml:253
+#: templates/database/designer/rename_to_panel.phtml:45
+#: templates/database/designer/where_query_panel.phtml:83
 msgid "Cancel"
 msgstr "취소"
 
@@ -1761,7 +1765,7 @@ msgstr "취소"
 msgid "Page-related settings"
 msgstr "설정 변경"
 
-#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:402
+#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:413
 msgid "Apply"
 msgstr "적용"
 
@@ -1798,8 +1802,8 @@ msgstr "오류 코드: %s"
 msgid "Error text: %s"
 msgstr "에러 메시지: %s"
 
-#: js/messages.php:307 libraries/db_common.inc.php:68
-#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:450
+#: js/messages.php:307 libraries/db_common.inc.php:69
+#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:461
 msgid "No databases selected."
 msgstr "데이터베이스를 선택하지 않았습니다."
 
@@ -1811,12 +1815,13 @@ msgstr "열을 삭제하고 있습니다"
 msgid "Adding Primary Key"
 msgstr "기본 키를 추가하고 있습니다"
 
-#: js/messages.php:310 templates/designer/aggregate_query_panel.phtml:59
-#: templates/designer/having_query_panel.phtml:113
-#: templates/designer/new_relation_panel.phtml:87
-#: templates/designer/options_panel.phtml:252
-#: templates/designer/rename_to_panel.phtml:41
-#: templates/designer/where_query_panel.phtml:82
+#: js/messages.php:310
+#: templates/database/designer/aggregate_query_panel.phtml:59
+#: templates/database/designer/having_query_panel.phtml:113
+#: templates/database/designer/new_relation_panel.phtml:87
+#: templates/database/designer/options_panel.phtml:252
+#: templates/database/designer/rename_to_panel.phtml:41
+#: templates/database/designer/where_query_panel.phtml:82
 msgid "OK"
 msgstr "확인"
 
@@ -1836,7 +1841,7 @@ msgstr "데이터베이스를 복사중입니다"
 msgid "Changing Charset"
 msgstr "언어를 변경하고 있습니다"
 
-#: js/messages.php:320 libraries/Util.class.php:3217
+#: js/messages.php:320 libraries/Util.class.php:3223
 #, fuzzy
 #| msgid "Disable foreign key checks"
 msgid "Enable foreign key checks"
@@ -1873,20 +1878,21 @@ msgstr "저장 함수의 정의는 RETURN문을 포함해야 합니다!"
 #: js/messages.php:334 libraries/DisplayResults.class.php:4834
 #: libraries/DisplayResults.class.php:5092 libraries/Menu.class.php:344
 #: libraries/Menu.class.php:446 libraries/Menu.class.php:578
-#: libraries/Util.class.php:3636 libraries/Util.class.php:3637
-#: libraries/Util.class.php:4316 libraries/Util.class.php:4331
-#: libraries/Util.class.php:4348 libraries/config/messages.inc.php:252
+#: libraries/Util.class.php:3642 libraries/Util.class.php:3643
+#: libraries/Util.class.php:4322 libraries/Util.class.php:4337
+#: libraries/Util.class.php:4354 libraries/config/messages.inc.php:252
 #: libraries/display_export.lib.php:173 libraries/rte/rte_list.lib.php:146
 #: libraries/server_privileges.lib.php:2211
 #: libraries/server_privileges.lib.php:2290
 #: libraries/server_privileges.lib.php:2632
 #: libraries/server_privileges.lib.php:3356
 #: libraries/server_status_monitor.lib.php:322 prefs_manage.php:303
-#: setup/frames/menu.inc.php:27 templates/structure/check_all_tables.phtml:11
+#: setup/frames/menu.inc.php:27
+#: templates/database/structure/check_all_tables.phtml:11
 msgid "Export"
 msgstr "내보내기"
 
-#: js/messages.php:337 libraries/rte/rte_routines.lib.php:652
+#: js/messages.php:337 libraries/rte/rte_routines.lib.php:743
 msgid "ENUM/SET editor"
 msgstr "ENUM/SET 수정"
 
@@ -1925,7 +1931,7 @@ msgstr "질의 상자 보이기"
 #: libraries/Console.class.php:214 libraries/DisplayResults.class.php:3474
 #: libraries/DisplayResults.class.php:4818 libraries/Index.class.php:723
 #: libraries/Util.class.php:706 libraries/Util.class.php:1202
-#: libraries/Util.class.php:3634 libraries/Util.class.php:3635
+#: libraries/Util.class.php:3640 libraries/Util.class.php:3641
 #: libraries/central_columns.lib.php:851
 #: libraries/central_columns.lib.php:1193
 #: libraries/config/messages.inc.php:892
@@ -1943,7 +1949,7 @@ msgstr "수정"
 #: libraries/server_user_groups.lib.php:129
 #: libraries/sql_query_form.lib.php:416 libraries/tracking.lib.php:477
 #: setup/frames/index.inc.php:183 setup/frames/index.inc.php:291
-#: templates/designer/delete_relation_panel.phtml:27
+#: templates/database/designer/delete_relation_panel.phtml:27
 msgid "Delete"
 msgstr "삭제"
 
@@ -2107,11 +2113,11 @@ msgid "No dependencies selected!"
 msgstr "의존성이 선택되지 않았습니다!"
 
 #: js/messages.php:394 libraries/central_columns.lib.php:1214
-#: libraries/insert_edit.lib.php:1458 libraries/server_variables.lib.php:155
+#: libraries/insert_edit.lib.php:1456 libraries/server_variables.lib.php:155
 #: setup/frames/config.inc.php:42 setup/frames/index.inc.php:279
 #: templates/columns_definitions/column_definitions_form.phtml:165
-#: templates/gis_visualization/gis_visualization.phtml:48
-#: templates/tbl_relation/common_form.phtml:107
+#: templates/table/gis_visualization/gis_visualization.phtml:48
+#: templates/table/relation/common_form.phtml:107
 msgid "Save"
 msgstr "저장"
 
@@ -2188,8 +2194,8 @@ msgid "Data point content"
 msgstr "데이터 포인트 내용"
 
 #: js/messages.php:430 js/messages.php:562 js/messages.php:579
-#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2573
-#: templates/index_form.phtml:154 templates/index_form.phtml:194
+#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2571
+#: templates/table/index_form.phtml:154 templates/table/index_form.phtml:194
 msgid "Ignore"
 msgstr "무시"
 
@@ -2248,8 +2254,8 @@ msgstr "외래키 선택"
 msgid "Please select the primary key or a unique key!"
 msgstr "기본키 혹은 유니크키를 선택하십시오!"
 
-#: js/messages.php:457 templates/designer/side_menu.phtml:91
-#: templates/designer/side_menu.phtml:94
+#: js/messages.php:457 templates/database/designer/side_menu.phtml:91
+#: templates/database/designer/side_menu.phtml:94
 msgid "Choose column to display"
 msgstr "출력할 필드 선택"
 
@@ -2265,20 +2271,20 @@ msgstr ""
 msgid "Page name"
 msgstr "페이지 이름"
 
-#: js/messages.php:463 templates/designer/side_menu.phtml:56
-#: templates/designer/side_menu.phtml:59
+#: js/messages.php:463 templates/database/designer/side_menu.phtml:56
+#: templates/database/designer/side_menu.phtml:59
 msgid "Save page"
 msgstr "페이지 저장"
 
-#: js/messages.php:464 templates/designer/side_menu.phtml:63
-#: templates/designer/side_menu.phtml:66
+#: js/messages.php:464 templates/database/designer/side_menu.phtml:63
+#: templates/database/designer/side_menu.phtml:66
 #, fuzzy
 #| msgid "Save page"
 msgid "Save page as"
 msgstr "페이지 저장"
 
-#: js/messages.php:465 templates/designer/side_menu.phtml:49
-#: templates/designer/side_menu.phtml:52
+#: js/messages.php:465 templates/database/designer/side_menu.phtml:49
+#: templates/database/designer/side_menu.phtml:52
 msgid "Open page"
 msgstr "페이지 열기"
 
@@ -2286,7 +2292,7 @@ msgstr "페이지 열기"
 msgid "Delete page"
 msgstr "페이지 삭제"
 
-#: js/messages.php:467 templates/designer/side_menu.phtml:10
+#: js/messages.php:467 templates/database/designer/side_menu.phtml:10
 msgid "Untitled"
 msgstr "제목 없음"
 
@@ -2411,7 +2417,7 @@ msgstr "원본 문자열"
 msgid "cancel"
 msgstr "취소"
 
-#: js/messages.php:499 libraries/server_status.lib.php:271
+#: js/messages.php:499 libraries/server_status.lib.php:280
 msgid "Aborted"
 msgstr "중지됨"
 
@@ -3006,7 +3012,7 @@ msgstr "올바른  숫자를 입력하세요!"
 
 #: js/messages.php:793 libraries/Message.class.php:199
 #: libraries/Util.class.php:654 libraries/core.lib.php:245
-#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1172
+#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1170
 #: tbl_operations.php:229 view_operations.php:63
 msgid "Error"
 msgstr "오류"
@@ -3067,8 +3073,8 @@ msgstr "초당"
 msgid "per minute"
 msgstr "분당"
 
-#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:143
-#: libraries/server_status.lib.php:228
+#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:152
+#: libraries/server_status.lib.php:237
 #: libraries/server_status_queries.lib.php:98
 msgid "per hour"
 msgstr "시간당"
@@ -3087,7 +3093,7 @@ msgid "Wrong permissions on configuration file, should not be world writable!"
 msgstr ""
 "설정 파일에 잘못된 권한이 지정되어있습니다. 익명 쓰기 권한이면 안됩니다!"
 
-#: libraries/Config.class.php:1799
+#: libraries/Config.class.php:1801
 msgid "Font size"
 msgstr "글꼴 크기"
 
@@ -3115,10 +3121,10 @@ msgstr "다시 쿼리하기"
 #: libraries/server_privileges.lib.php:2890
 #: libraries/server_privileges.lib.php:3144
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4332
+#: libraries/server_privileges.lib.php:4358
 #: libraries/server_status_processes.lib.php:80
-#: templates/tbl_relation/foreign_key_row.phtml:165
-#: templates/tbl_relation/internal_relational_row.phtml:55
+#: templates/table/relation/foreign_key_row.phtml:165
+#: templates/table/relation/internal_relational_row.phtml:55
 msgid "Database"
 msgstr "데이터베이스"
 
@@ -3210,11 +3216,11 @@ msgstr "최근 기록"
 #: libraries/plugins/import/ImportMediawiki.class.php:60
 #: libraries/plugins/import/ImportOds.class.php:59
 #: libraries/plugins/import/ImportShp.class.php:57
-#: libraries/plugins/import/ImportSql.class.php:148
+#: libraries/plugins/import/ImportSql.class.php:51
 #: libraries/plugins/import/ImportXml.class.php:58
-#: libraries/rte/rte_routines.lib.php:833 templates/index_form.phtml:49
-#: templates/structure/row_stats_table.phtml:20
-#: templates/table/options.phtml:2
+#: libraries/rte/rte_routines.lib.php:924 templates/table/index_form.phtml:49
+#: templates/table/search/options.phtml:2
+#: templates/table/structure/row_stats_table.phtml:20
 msgid "Options"
 msgstr "옵션"
 
@@ -3253,7 +3259,8 @@ msgstr "내림차순"
 msgid "Order:"
 msgstr "기타"
 
-#: libraries/Console.class.php:289 templates/table/replace_preview.phtml:17
+#: libraries/Console.class.php:289
+#: templates/table/search/replace_preview.phtml:17
 msgid "Count"
 msgstr "개수"
 
@@ -3364,9 +3371,9 @@ msgstr "복사한 테이블로 옮겨감"
 #: libraries/operations.lib.php:794 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:191
-#: templates/structure/sortable_header.phtml:21
-#: templates/structure/sortable_header.phtml:38
-#: templates/table/options.phtml:68
+#: templates/database/structure/sortable_header.phtml:21
+#: templates/database/structure/sortable_header.phtml:38
+#: templates/table/search/options.phtml:68
 msgid "Ascending"
 msgstr "오름차순"
 
@@ -3376,13 +3383,14 @@ msgstr "오름차순"
 #: libraries/operations.lib.php:797 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:188
-#: templates/structure/sortable_header.phtml:26
-#: templates/structure/sortable_header.phtml:43
-#: templates/table/options.phtml:69
+#: templates/database/structure/sortable_header.phtml:26
+#: templates/database/structure/sortable_header.phtml:43
+#: templates/table/search/options.phtml:69
 msgid "Descending"
 msgstr "내림차순"
 
-#: libraries/DBQbe.class.php:467 templates/table/search_and_replace.phtml:6
+#: libraries/DBQbe.class.php:467
+#: templates/table/search/search_and_replace.phtml:6
 msgid "Column:"
 msgstr "컬럼명:"
 
@@ -3539,12 +3547,12 @@ msgid_plural "%1$s matches in <strong>%2$s</strong>"
 msgstr[0] "<strong>%2$s</strong> 에서 %1$s 건 일치"
 
 #: libraries/DbSearch.class.php:354 libraries/Menu.class.php:311
-#: libraries/Util.class.php:3337 libraries/Util.class.php:3347
-#: libraries/Util.class.php:3623 libraries/Util.class.php:3624
-#: libraries/Util.class.php:4343 libraries/config.values.php:43
+#: libraries/Util.class.php:3343 libraries/Util.class.php:3353
+#: libraries/Util.class.php:3629 libraries/Util.class.php:3630
+#: libraries/Util.class.php:4349 libraries/config.values.php:43
 #: libraries/config.values.php:51 libraries/config.values.php:119
 #: libraries/navigation/Nodes/Node_Table.class.php:295
-#: templates/structure/check_all_table_column.phtml:5
+#: templates/table/structure/check_all_table_column.phtml:5
 msgid "Browse"
 msgstr "보기"
 
@@ -3561,7 +3569,8 @@ msgstr "데이터베이스 검색"
 msgid "Words or values to search for (wildcard: \"%\"):"
 msgstr "찾을 단어, 값 (와일드카드: \"%\"):"
 
-#: libraries/DbSearch.class.php:401 templates/table/search_and_replace.phtml:1
+#: libraries/DbSearch.class.php:401
+#: templates/table/search/search_and_replace.phtml:1
 msgid "Find:"
 msgstr "찾는 방식:"
 
@@ -3605,28 +3614,28 @@ msgstr "행 필터링"
 msgid "Search this table"
 msgstr "현재 테이블 검색"
 
-#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2532
-#: libraries/Util.class.php:2535
+#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2538
+#: libraries/Util.class.php:2541
 msgctxt "First page"
 msgid "Begin"
 msgstr "처음"
 
-#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2533
-#: libraries/Util.class.php:2536 libraries/server_bin_log.lib.php:170
+#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2539
+#: libraries/Util.class.php:2542 libraries/server_bin_log.lib.php:170
 #: libraries/server_bin_log.lib.php:172
 msgctxt "Previous page"
 msgid "Previous"
 msgstr "이전"
 
-#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2564
-#: libraries/Util.class.php:2574 libraries/server_bin_log.lib.php:204
+#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2570
+#: libraries/Util.class.php:2580 libraries/server_bin_log.lib.php:204
 #: libraries/server_bin_log.lib.php:206
 msgctxt "Next page"
 msgid "Next"
 msgstr "다음"
 
-#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2565
-#: libraries/Util.class.php:2575
+#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2571
+#: libraries/Util.class.php:2581
 msgctxt "Last page"
 msgid "End"
 msgstr "마지막"
@@ -3701,15 +3710,15 @@ msgid "May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]."
 msgstr "근사값입니다. [doc@faq3-11]FAQ 3.11[/doc]를 참조하세요."
 
 #: libraries/DisplayResults.class.php:4332 libraries/Message.class.php:180
-#: libraries/controllers/TableRelationController.class.php:258
+#: libraries/controllers/TableRelationController.class.php:259
 #: libraries/controllers/TableSearchController.class.php:655
-#: libraries/rte/rte_routines.lib.php:1332 libraries/sql_query_form.lib.php:89
+#: libraries/rte/rte_routines.lib.php:1423 libraries/sql_query_form.lib.php:89
 #: tbl_operations.php:227 tbl_row_action.php:138 view_operations.php:62
 msgid "Your SQL query has been executed successfully."
 msgstr "쿼리가 성공적으로 실행되었습니다."
 
 #: libraries/DisplayResults.class.php:4660
-#: libraries/controllers/StructureController.class.php:629
+#: libraries/controllers/DatabaseStructureController.class.php:564
 #, php-format
 msgid ""
 "This view has at least this number of rows. Please refer to %sdocumentation"
@@ -3732,33 +3741,33 @@ msgstr "총 %1$d개 중 현재 쿼리에 %2$d개"
 msgid "%d total"
 msgstr "합계 %d"
 
-#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1318
+#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1312
 #, php-format
 msgid "Query took %01.4f seconds."
 msgstr "질의 실행시간 %01.4f 초."
 
 #: libraries/DisplayResults.class.php:4807
-#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4767
-#: libraries/Util.class.php:4773 libraries/mult_submits.inc.php:50
-#: templates/structure/check_all_tables.phtml:2
-#: templates/structure/check_all_tables.phtml:9
+#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4773
+#: libraries/Util.class.php:4779 libraries/mult_submits.inc.php:50
+#: templates/database/structure/check_all_tables.phtml:2
+#: templates/database/structure/check_all_tables.phtml:9
 msgid "With selected:"
 msgstr "선택한 것을:"
 
 #: libraries/DisplayResults.class.php:4811
-#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4769
-#: libraries/Util.class.php:4770 libraries/server_privileges.lib.php:1174
+#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4775
+#: libraries/Util.class.php:4776 libraries/server_privileges.lib.php:1174
 #: libraries/server_privileges.lib.php:1175
 #: libraries/server_privileges.lib.php:1387
 #: libraries/server_user_groups.lib.php:231
-#: templates/structure/check_all_tables.phtml:3
-#: templates/structure/check_all_tables.phtml:4
+#: templates/database/structure/check_all_tables.phtml:3
+#: templates/database/structure/check_all_tables.phtml:4
 msgid "Check All"
 msgstr "모두 체크"
 
 #: libraries/DisplayResults.class.php:4985 libraries/Header.class.php:383
-#: templates/structure/optional_action_links.phtml:1
-#: templates/structure/print_view_data_dictionary_link.phtml:3
+#: templates/database/structure/print_view_data_dictionary_link.phtml:3
+#: templates/table/structure/optional_action_links.phtml:1
 msgid "Print view"
 msgstr "인쇄용 보기"
 
@@ -3766,7 +3775,8 @@ msgstr "인쇄용 보기"
 msgid "Query results operations"
 msgstr "쿼리 결과 처리방법"
 
-#: libraries/DisplayResults.class.php:5105 templates/tbl_chart.phtml:12
+#: libraries/DisplayResults.class.php:5105
+#: templates/table/chart/tbl_chart.phtml:12
 msgid "Display chart"
 msgstr "차트 표시"
 
@@ -3860,7 +3870,7 @@ msgid "Click on the bar to scroll to top of page"
 msgstr "클릭하여 페이지 상단으로 이동"
 
 #: libraries/Header.class.php:749
-#: libraries/plugins/auth/AuthenticationCookie.class.php:152
+#: libraries/plugins/auth/AuthenticationCookie.class.php:140
 msgid "Javascript must be enabled past this point!"
 msgstr "이 페이지를 넘기려면 Javascript 사용을 허용해야 합니다!"
 
@@ -3882,11 +3892,11 @@ msgid "Keyname"
 msgstr "키 이름"
 
 #: libraries/Index.class.php:697
-#: libraries/controllers/StructureController.class.php:1962
-#: libraries/controllers/StructureController.class.php:1967
+#: libraries/controllers/TableStructureController.class.php:953
+#: libraries/controllers/TableStructureController.class.php:958
 #: libraries/tracking.lib.php:973
 #: templates/columns_definitions/column_indexes.phtml:11
-#: templates/structure/check_all_table_column.phtml:26
+#: templates/table/structure/check_all_table_column.phtml:26
 msgid "Unique"
 msgstr "고유값"
 
@@ -3905,16 +3915,17 @@ msgstr "관계성"
 #: libraries/server_collations.lib.php:35 libraries/tracking.lib.php:881
 #: libraries/tracking.lib.php:977
 #: templates/columns_definitions/table_fields_definitions.phtml:33
-#: templates/structure/row_stats_table.phtml:31
-#: templates/structure/table_header.phtml:55
-#: templates/structure/table_structure_header.phtml:7
-#: templates/table/table_header.phtml:8
+#: templates/database/structure/table_header.phtml:55
+#: templates/table/search/table_header.phtml:8
+#: templates/table/structure/row_stats_table.phtml:31
+#: templates/table/structure/table_structure_header.phtml:7
 msgid "Collation"
 msgstr "데이터정렬방식"
 
 #: libraries/Index.class.php:703 libraries/rte/rte_events.lib.php:496
-#: libraries/rte/rte_routines.lib.php:956 libraries/tracking.lib.php:885
-#: libraries/tracking.lib.php:979 templates/structure/table_header.phtml:84
+#: libraries/rte/rte_routines.lib.php:1047 libraries/tracking.lib.php:885
+#: libraries/tracking.lib.php:979
+#: templates/database/structure/table_header.phtml:84
 msgid "Comment"
 msgstr "설명"
 
@@ -3927,15 +3938,15 @@ msgstr "기본 키를 제거했습니다."
 msgid "Index %s has been dropped."
 msgstr "인덱스 %s 를 제거했습니다."
 
-#: libraries/Index.class.php:757 libraries/Util.class.php:3630
-#: libraries/Util.class.php:3631
-#: libraries/controllers/StructureController.class.php:1958
-#: libraries/controllers/StructureController.class.php:1959
+#: libraries/Index.class.php:757 libraries/Util.class.php:3636
+#: libraries/Util.class.php:3637
+#: libraries/controllers/TableStructureController.class.php:949
+#: libraries/controllers/TableStructureController.class.php:950
 #: libraries/operations.lib.php:1607 libraries/rte/rte_list.lib.php:150
 #: libraries/server_databases.lib.php:146
-#: templates/structure/check_all_table_column.phtml:15
-#: templates/structure/check_all_tables.phtml:16
-#: templates/tbl_relation/foreign_key_row.phtml:93
+#: templates/database/structure/check_all_tables.phtml:16
+#: templates/table/relation/foreign_key_row.phtml:93
+#: templates/table/structure/check_all_table_column.phtml:15
 msgid "Drop"
 msgstr "삭제"
 
@@ -3965,16 +3976,16 @@ msgstr "서버"
 #: libraries/Menu.class.php:248
 #: libraries/navigation/Nodes/Node_View.class.php:32
 #: libraries/tbl_info.inc.php:63
-#: templates/structure/structure_table_row.phtml:97
-#: templates/structure/structure_table_row.phtml:159
+#: templates/database/structure/structure_table_row.phtml:97
+#: templates/database/structure/structure_table_row.phtml:159
 msgid "View"
 msgstr "뷰"
 
 #: libraries/Menu.class.php:325 libraries/Menu.class.php:429
-#: libraries/Menu.class.php:548 libraries/Util.class.php:3334
-#: libraries/Util.class.php:3344 libraries/Util.class.php:3350
-#: libraries/Util.class.php:4313 libraries/Util.class.php:4328
-#: libraries/Util.class.php:4345 libraries/config.values.php:40
+#: libraries/Menu.class.php:548 libraries/Util.class.php:3340
+#: libraries/Util.class.php:3350 libraries/Util.class.php:3356
+#: libraries/Util.class.php:4319 libraries/Util.class.php:4334
+#: libraries/Util.class.php:4351 libraries/config.values.php:40
 #: libraries/config.values.php:48 libraries/config.values.php:110
 #: libraries/config.values.php:116 libraries/config/messages.inc.php:321
 #: libraries/navigation/Nodes/Node_Table.class.php:292
@@ -3982,19 +3993,19 @@ msgid "SQL"
 msgstr "SQL"
 
 #: libraries/Menu.class.php:328 libraries/Menu.class.php:432
-#: libraries/Util.class.php:3335 libraries/Util.class.php:3345
-#: libraries/Util.class.php:3351 libraries/Util.class.php:3625
-#: libraries/Util.class.php:3626 libraries/Util.class.php:4329
-#: libraries/Util.class.php:4346 libraries/config.values.php:41
+#: libraries/Util.class.php:3341 libraries/Util.class.php:3351
+#: libraries/Util.class.php:3357 libraries/Util.class.php:3631
+#: libraries/Util.class.php:3632 libraries/Util.class.php:4335
+#: libraries/Util.class.php:4352 libraries/config.values.php:41
 #: libraries/config.values.php:49 libraries/config.values.php:111
 #: libraries/config.values.php:117
 #: libraries/navigation/Nodes/Node_Table.class.php:286
 msgid "Search"
 msgstr "검색"
 
-#: libraries/Menu.class.php:338 libraries/Util.class.php:3336
-#: libraries/Util.class.php:3346 libraries/Util.class.php:3627
-#: libraries/Util.class.php:3628 libraries/Util.class.php:4347
+#: libraries/Menu.class.php:338 libraries/Util.class.php:3342
+#: libraries/Util.class.php:3352 libraries/Util.class.php:3633
+#: libraries/Util.class.php:3634 libraries/Util.class.php:4353
 #: libraries/config.values.php:42 libraries/config.values.php:50
 #: libraries/config.values.php:118
 #: libraries/navigation/Nodes/Node_Table.class.php:289
@@ -4003,30 +4014,30 @@ msgid "Insert"
 msgstr "삽입"
 
 #: libraries/Menu.class.php:362 libraries/Menu.class.php:467
-#: libraries/Util.class.php:4334 libraries/Util.class.php:4350
+#: libraries/Util.class.php:4340 libraries/Util.class.php:4356
 #: libraries/config.values.php:106 libraries/server_common.lib.php:51
 #: libraries/server_privileges.lib.php:2370
 #: libraries/server_privileges.lib.php:3158
-#: libraries/server_privileges.lib.php:4221
+#: libraries/server_privileges.lib.php:4247
 msgid "Privileges"
 msgstr "사용권한"
 
 #: libraries/Menu.class.php:371 libraries/Menu.class.php:379
-#: libraries/Menu.class.php:459 libraries/Util.class.php:3338
-#: libraries/Util.class.php:3352 libraries/Util.class.php:4333
-#: libraries/Util.class.php:4351 libraries/config.values.php:112
+#: libraries/Menu.class.php:459 libraries/Util.class.php:3344
+#: libraries/Util.class.php:3358 libraries/Util.class.php:4339
+#: libraries/Util.class.php:4357 libraries/config.values.php:112
 #: view_operations.php:92
 msgid "Operations"
 msgstr "테이블 작업"
 
 #: libraries/Menu.class.php:384 libraries/Menu.class.php:492
-#: libraries/Util.class.php:4338 libraries/Util.class.php:4352
+#: libraries/Util.class.php:4344 libraries/Util.class.php:4358
 #: libraries/relation.lib.php:255
 msgid "Tracking"
 msgstr "SQL 명령어 트래킹"
 
 #: libraries/Menu.class.php:397 libraries/Menu.class.php:486
-#: libraries/Util.class.php:4337 libraries/Util.class.php:4353
+#: libraries/Util.class.php:4343 libraries/Util.class.php:4359
 #: libraries/navigation/Nodes/Node_Trigger_Container.class.php:24
 #: libraries/plugins/export/ExportHtmlword.class.php:557
 #: libraries/plugins/export/ExportOdt.class.php:685
@@ -4043,16 +4054,16 @@ msgstr "트리거"
 msgid "Database seems to be empty!"
 msgstr "데이터베이스가 비어있는 것 같습니다!"
 
-#: libraries/Menu.class.php:439 libraries/Util.class.php:4330
+#: libraries/Menu.class.php:439 libraries/Util.class.php:4336
 msgid "Query"
 msgstr "질의 마법사"
 
-#: libraries/Menu.class.php:472 libraries/Util.class.php:4335
+#: libraries/Menu.class.php:472 libraries/Util.class.php:4341
 #: libraries/rte/rte_words.lib.php:36
 msgid "Routines"
 msgstr "루틴"
 
-#: libraries/Menu.class.php:479 libraries/Util.class.php:4336
+#: libraries/Menu.class.php:479 libraries/Util.class.php:4342
 #: libraries/navigation/Nodes/Node_Event_Container.class.php:26
 #: libraries/plugins/export/ExportSql.class.php:940
 #: libraries/plugins/export/ExportXml.class.php:107
@@ -4060,20 +4071,20 @@ msgstr "루틴"
 msgid "Events"
 msgstr "이벤트"
 
-#: libraries/Menu.class.php:498 libraries/Util.class.php:4339
+#: libraries/Menu.class.php:498 libraries/Util.class.php:4345
 msgid "Designer"
 msgstr "디자이너"
 
-#: libraries/Menu.class.php:507 libraries/Util.class.php:4340
-#: templates/structure/check_all_tables.phtml:35
+#: libraries/Menu.class.php:507 libraries/Util.class.php:4346
+#: templates/database/structure/check_all_tables.phtml:35
 msgid "Central columns"
 msgstr "중심 열"
 
-#: libraries/Menu.class.php:544 libraries/Util.class.php:4312
+#: libraries/Menu.class.php:544 libraries/Util.class.php:4318
 #: libraries/config.values.php:103 libraries/config/messages.inc.php:266
 #: libraries/config/messages.inc.php:341
 #: libraries/navigation/NavigationTree.class.php:1239
-#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4332
+#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4358
 msgid "Databases"
 msgstr "데이터베이스"
 
@@ -4084,34 +4095,34 @@ msgid "User accounts"
 msgstr "사용자"
 
 #: libraries/Menu.class.php:595 libraries/ServerStatusData.class.php:121
-#: libraries/Util.class.php:4319 libraries/server_common.lib.php:36
+#: libraries/Util.class.php:4325 libraries/server_common.lib.php:36
 msgid "Binary log"
 msgstr "바이너리 로그"
 
 #: libraries/Menu.class.php:601 libraries/ServerStatusData.class.php:126
-#: libraries/Util.class.php:4320 libraries/server_common.lib.php:42
-#: templates/structure/body_for_table_summary.phtml:10
-#: templates/structure/table_header.phtml:27
+#: libraries/Util.class.php:4326 libraries/server_common.lib.php:42
+#: templates/database/structure/body_for_table_summary.phtml:10
+#: templates/database/structure/table_header.phtml:27
 msgid "Replication"
 msgstr "복제"
 
 #: libraries/Menu.class.php:606 libraries/ServerStatusData.class.php:193
-#: libraries/Util.class.php:4321 libraries/config.values.php:105
+#: libraries/Util.class.php:4327 libraries/config.values.php:105
 #: libraries/server_engines.lib.php:108 libraries/server_engines.lib.php:112
 #: libraries/sql_query_form.lib.php:421
 msgid "Variables"
 msgstr "환경설정값"
 
-#: libraries/Menu.class.php:610 libraries/Util.class.php:4322
+#: libraries/Menu.class.php:610 libraries/Util.class.php:4328
 msgid "Charsets"
 msgstr "문자셋"
 
-#: libraries/Menu.class.php:615 libraries/Util.class.php:4323
+#: libraries/Menu.class.php:615 libraries/Util.class.php:4329
 #: libraries/server_common.lib.php:33 libraries/server_plugins.lib.php:27
 msgid "Plugins"
 msgstr "플러그인"
 
-#: libraries/Menu.class.php:626 libraries/Util.class.php:4324
+#: libraries/Menu.class.php:626 libraries/Util.class.php:4330
 msgid "Engines"
 msgstr "엔진"
 
@@ -4133,7 +4144,7 @@ msgid "%1$d row inserted."
 msgid_plural "%1$d rows inserted."
 msgstr[0] "%1$d 열이 삽입되었습니다."
 
-#: libraries/PDF.class.php:70 libraries/Util.class.php:2521
+#: libraries/PDF.class.php:70 libraries/Util.class.php:2527
 #: libraries/browse_foreigners.lib.php:327
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:865
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:890
@@ -4154,7 +4165,7 @@ msgid "Could not save favorite table!"
 msgstr "즐겨찾기 테이블을 저장할 수 없습니다!"
 
 #: libraries/RecentFavoriteTable.class.php:212
-#: templates/structure/favorite_anchor.phtml:12
+#: templates/database/structure/favorite_anchor.phtml:12
 msgid "Remove from Favorites"
 msgstr "즐겨찾기에서 삭제"
 
@@ -4317,7 +4328,7 @@ msgid ""
 msgstr "이 유형의 스토리지 엔진은 자세한 상태 정보를 제공하지 않습니다."
 
 #: libraries/StorageEngine.class.php:373
-#: templates/structure/body_for_table_summary.phtml:50
+#: templates/database/structure/body_for_table_summary.phtml:50
 #, php-format
 msgid "%s is the default storage engine on this MySQL server."
 msgstr "%s는 이 MySQL 서버의 기본 스토리지 엔진입니다."
@@ -4784,10 +4795,10 @@ msgstr ""
 
 #: libraries/Util.class.php:726 libraries/rte/rte_events.lib.php:110
 #: libraries/rte/rte_events.lib.php:119 libraries/rte/rte_events.lib.php:150
-#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:153
-#: libraries/rte/rte_routines.lib.php:162
-#: libraries/rte/rte_routines.lib.php:235
-#: libraries/rte/rte_routines.lib.php:1366
+#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:223
+#: libraries/rte/rte_routines.lib.php:250
+#: libraries/rte/rte_routines.lib.php:372
+#: libraries/rte/rte_routines.lib.php:1457
 #: libraries/rte/rte_triggers.lib.php:86 libraries/rte/rte_triggers.lib.php:95
 #: libraries/rte/rte_triggers.lib.php:127
 msgid "MySQL said: "
@@ -4833,75 +4844,78 @@ msgstr "일"
 msgid "%B %d, %Y at %I:%M %p"
 msgstr "%y-%m-%d %H:%M"
 
-#: libraries/Util.class.php:2019
+#: libraries/Util.class.php:2025
 #, php-format
 msgid "%s days, %s hours, %s minutes and %s seconds"
 msgstr "%s일 %s시간 %s분 %s초"
 
-#: libraries/Util.class.php:2112
+#: libraries/Util.class.php:2118
 msgid "Missing parameter:"
 msgstr "매개 변수 누락:"
 
-#: libraries/Util.class.php:2645
+#: libraries/Util.class.php:2651
 #, php-format
 msgid "Jump to database \"%s\"."
 msgstr "데이터베이스 \"%s\" 로 이동."
 
-#: libraries/Util.class.php:2670
+#: libraries/Util.class.php:2676
 #, php-format
 msgid "The %s functionality is affected by a known bug, see %s"
 msgstr "%s 기능은 알려진 버그가 있습니다. %s 문서를 참조하십시오"
 
-#: libraries/Util.class.php:2881
+#: libraries/Util.class.php:2887
 msgid "Click to toggle"
 msgstr "토글하려면 클릭"
 
-#: libraries/Util.class.php:3542 prefs_manage.php:248
+#: libraries/Util.class.php:3548 prefs_manage.php:248
 msgid "Browse your computer:"
 msgstr "업로드 파일:"
 
-#: libraries/Util.class.php:3567
+#: libraries/Util.class.php:3573
 #, php-format
 msgid "Select from the web server upload directory <b>%s</b>:"
 msgstr "웹 서버 업로드 디렉토리중 <b>%s</b>에서 선택:"
 
-#: libraries/Util.class.php:3596 libraries/insert_edit.lib.php:1173
+#: libraries/Util.class.php:3602 libraries/insert_edit.lib.php:1171
 msgid "The directory you set for upload work cannot be reached."
 msgstr "설정한 업로드 디렉토리에 접근할 수 없습니다."
 
-#: libraries/Util.class.php:3607
+#: libraries/Util.class.php:3613
 msgid "There are no files to upload!"
 msgstr "업로드할 파일이 없습니다!"
 
-#: libraries/Util.class.php:3632 libraries/Util.class.php:3633
-#: templates/structure/check_all_tables.phtml:15
+#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: templates/database/structure/check_all_tables.phtml:15
 msgid "Empty"
 msgstr "비우기"
 
-#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: libraries/Util.class.php:3644 libraries/Util.class.php:3645
 msgid "Execute"
 msgstr "실행하기"
 
-#: libraries/Util.class.php:4152
+#: libraries/Util.class.php:4158
 msgid "Print"
 msgstr "인쇄"
 
-#: libraries/Util.class.php:4257 templates/structure/row_stats_table.phtml:80
-#: templates/structure/table_header.phtml:95
+#: libraries/Util.class.php:4263
+#: templates/database/structure/table_header.phtml:95
+#: templates/table/structure/row_stats_table.phtml:80
 msgid "Creation"
 msgstr "생성"
 
-#: libraries/Util.class.php:4263 templates/structure/row_stats_table.phtml:87
-#: templates/structure/table_header.phtml:106
+#: libraries/Util.class.php:4269
+#: templates/database/structure/table_header.phtml:106
+#: templates/table/structure/row_stats_table.phtml:87
 msgid "Last update"
 msgstr "마지막 업데이트"
 
-#: libraries/Util.class.php:4269 templates/structure/row_stats_table.phtml:94
-#: templates/structure/table_header.phtml:117
+#: libraries/Util.class.php:4275
+#: templates/database/structure/table_header.phtml:117
+#: templates/table/structure/row_stats_table.phtml:94
 msgid "Last check"
 msgstr "마지막 검사"
 
-#: libraries/Util.class.php:4315
+#: libraries/Util.class.php:4321
 msgid "Users"
 msgstr "사용자"
 
@@ -4922,16 +4936,16 @@ msgid "Use this value"
 msgstr "이 값을 사용합니다"
 
 #: libraries/build_html_for_db.lib.php:33 libraries/import.lib.php:193
-#: templates/structure/actions_in_table_structure.phtml:113
-#: templates/structure/row_stats_table.phtml:42
-#: templates/structure/table_header.phtml:36
+#: templates/database/structure/table_header.phtml:36
+#: templates/table/structure/actions_in_table_structure.phtml:113
+#: templates/table/structure/row_stats_table.phtml:42
 msgid "Rows"
 msgstr "행"
 
 #: libraries/build_html_for_db.lib.php:48 libraries/engines/innodb.lib.php:171
-#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:186
-#: libraries/server_status.lib.php:298
-#: templates/structure/display_table_stats.phtml:40
+#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:195
+#: libraries/server_status.lib.php:307
+#: templates/table/structure/display_table_stats.phtml:40
 msgid "Total"
 msgstr "전체 쿼리수"
 
@@ -4940,10 +4954,12 @@ msgid "Jump to database"
 msgstr "데이터베이스로 이동"
 
 #: libraries/build_html_for_db.lib.php:146
+#: templates/database/structure/structure_table_row.phtml:15
 msgid "Not replicated"
 msgstr "복제되지 않음"
 
 #: libraries/build_html_for_db.lib.php:158
+#: templates/database/structure/structure_table_row.phtml:16
 msgid "Replicated"
 msgstr "복제"
 
@@ -4996,17 +5012,17 @@ msgstr "아니오"
 #: libraries/plugins/export/ExportTexytext.class.php:425
 #: libraries/plugins/export/PMA_ExportPdf.class.php:307
 #: libraries/rte/rte_list.lib.php:73 libraries/rte/rte_list.lib.php:85
-#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:830
-#: libraries/rte/rte_routines.lib.php:1492 setup/frames/index.inc.php:162
+#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:921
+#: libraries/rte/rte_routines.lib.php:1583 setup/frames/index.inc.php:162
 #: templates/columns_definitions/table_fields_definitions.phtml:8
-#: templates/structure/table_structure_header.phtml:5
-#: templates/table/create_table.phtml:11
+#: templates/database/create_table.phtml:11
+#: templates/table/structure/table_structure_header.phtml:5
 msgid "Name"
 msgstr "이름"
 
 #: libraries/central_columns.lib.php:699
 #: libraries/central_columns.lib.php:1381
-#: libraries/rte/rte_routines.lib.php:832
+#: libraries/rte/rte_routines.lib.php:923
 #: templates/columns_definitions/table_fields_definitions.phtml:14
 msgid "Length/Values"
 msgstr "길이/값*"
@@ -5027,7 +5043,7 @@ msgid "Select a table"
 msgstr "테이블 선택"
 
 #: libraries/central_columns.lib.php:804
-#: templates/structure/add_column.phtml:4
+#: templates/table/structure/add_column.phtml:4
 msgid "Add column"
 msgstr "컬럼 추가"
 
@@ -5043,7 +5059,7 @@ msgstr "새 컬럼 추가"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1002
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1025
 #: templates/columns_definitions/table_fields_definitions.phtml:36
-#: templates/structure/table_structure_header.phtml:8
+#: templates/table/structure/table_structure_header.phtml:8
 msgid "Attributes"
 msgstr "보기"
 
@@ -5155,7 +5171,7 @@ msgid "Double click"
 msgstr "더블 클릭"
 
 #: libraries/config.values.php:95 libraries/config.values.php:124
-#: libraries/config/FormDisplay.tpl.php:221 libraries/relation.lib.php:97
+#: libraries/config/FormDisplay.tpl.php:232 libraries/relation.lib.php:97
 #: libraries/relation.lib.php:105
 msgid "Disabled"
 msgstr "사용불가"
@@ -5335,21 +5351,21 @@ msgstr "%s 기능이 누락되어 내보낼 수 없습니다."
 msgid "maximum %s"
 msgstr "최대 %s"
 
-#: libraries/config/FormDisplay.tpl.php:219
+#: libraries/config/FormDisplay.tpl.php:230
 msgid "This setting is disabled, it will not be applied to your configuration."
 msgstr "이 설정은 비활성화되어 있어, 설정에 적용되지 않습니다."
 
-#: libraries/config/FormDisplay.tpl.php:313
+#: libraries/config/FormDisplay.tpl.php:324
 #, php-format
 msgid "Set value: %s"
 msgstr "설정된 값: %s"
 
-#: libraries/config/FormDisplay.tpl.php:318
+#: libraries/config/FormDisplay.tpl.php:329
 #: libraries/config/messages.inc.php:610
 msgid "Restore default value"
 msgstr "기본값으로 복원"
 
-#: libraries/config/FormDisplay.tpl.php:332
+#: libraries/config/FormDisplay.tpl.php:343
 msgid "Allow users to customize this value"
 msgstr "이 값을 사용자화하기 위한 사용자 허용"
 
@@ -5830,7 +5846,7 @@ msgstr "파일 문자셋"
 
 #: libraries/config/messages.inc.php:136 libraries/config/messages.inc.php:152
 #: libraries/sql_query_form.lib.php:247
-#: templates/structure/row_stats_table.phtml:7
+#: templates/table/structure/row_stats_table.phtml:7
 msgid "Format"
 msgstr "형식"
 
@@ -6348,7 +6364,7 @@ msgstr "데이터베이스 구조(테이블 목록)란에서 어떤 정보를 
 
 #: libraries/config/messages.inc.php:332
 #: libraries/plugins/export/ExportPdf.class.php:279
-#: templates/structure/secondary_tabs.phtml:8
+#: templates/table/secondary_tabs.phtml:8
 msgid "Table structure"
 msgstr "테이블 구조"
 
@@ -8039,104 +8055,35 @@ msgstr "Microsoft Word 2000"
 msgid "OpenDocument Text"
 msgstr "OpenDocument 형식"
 
-#: libraries/controllers/StructureController.class.php:465
+#: libraries/controllers/DatabaseStructureController.class.php:405
 #: tbl_operations.php:382
 #, php-format
 msgid "Table %s has been emptied."
 msgstr "테이블 %s 을 비웠습니다."
 
-#: libraries/controllers/StructureController.class.php:486
+#: libraries/controllers/DatabaseStructureController.class.php:426
 #: tbl_operations.php:400 view_operations.php:119
 #, fuzzy, php-format
 #| msgid "View %s has been dropped."
 msgid "View %s has been dropped."
 msgstr "뷰 %s가 제거되었습니다."
 
-#: libraries/controllers/StructureController.class.php:487
+#: libraries/controllers/DatabaseStructureController.class.php:427
 #: tbl_operations.php:401
 #, fuzzy, php-format
 #| msgid "Table %s has been dropped."
 msgid "Table %s has been dropped."
 msgstr "테이블 %s를 삭제했습니다."
 
-#: libraries/controllers/StructureController.class.php:797
-#, fuzzy, php-format
-#| msgid "The column name '%s' is a MySQL reserved keyword."
-msgid "The name '%s' is a MySQL reserved keyword."
-msgid_plural "The names '%s' are MySQL reserved keywords."
-msgstr[0] "'%s'라는 컬럼명은 MySQL 예약어입니다."
-
-#: libraries/controllers/StructureController.class.php:875
-msgid "No column selected."
-msgstr "선택된 열이 없습니다."
-
-#: libraries/controllers/StructureController.class.php:1049
+#: libraries/controllers/DatabaseStructureController.class.php:733
 msgid "Favorite List is full!"
 msgstr "즐겨찾기 목록이 가득 찼습니다!"
 
-#: libraries/controllers/StructureController.class.php:1272
-msgid "The columns have been moved successfully."
-msgstr "컬럼을 이동했습니다."
-
-#: libraries/controllers/StructureController.class.php:1535
-#, fuzzy, php-format
-#| msgid "Table %1$s has been altered successfully."
-msgid ""
-"Table %1$s has been altered successfully. Privileges have been adjusted."
-msgstr "테이블 %1$s 가 성공적으로 수정되었습니다."
-
-#: libraries/controllers/StructureController.class.php:1541
-#: libraries/controllers/TableIndexesController.class.php:161
-#: tbl_addfield.php:92
-#, php-format
-msgid "Table %1$s has been altered successfully."
-msgstr "테이블 %1$s 가 성공적으로 수정되었습니다."
-
-#: libraries/controllers/StructureController.class.php:1588
-#: libraries/tracking.lib.php:1094
-msgid "Query error"
-msgstr "질의 오류"
-
-#: libraries/controllers/StructureController.class.php:1806
+#: libraries/controllers/DatabaseStructureController.class.php:947
 #: libraries/mysql_charsets.lib.php:366 libraries/mysql_charsets.lib.php:373
 msgid "unknown"
 msgstr "알수없음"
 
-#: libraries/controllers/StructureController.class.php:1957
-#: templates/structure/check_all_table_column.phtml:11
-msgid "Change"
-msgstr "변경"
-
-#: libraries/controllers/StructureController.class.php:1961
-#: libraries/controllers/StructureController.class.php:1966
-#: libraries/navigation/Nodes/Node_Index.class.php:30
-#: libraries/tracking.lib.php:926
-#: templates/columns_definitions/column_indexes.phtml:16
-#: templates/columns_definitions/table_fields_definitions.phtml:57
-#: templates/structure/check_all_table_column.phtml:30
-#: templates/structure/display_structure.phtml:79
-#: templates/structure/display_table_stats.phtml:19
-msgid "Index"
-msgstr "인덱스"
-
-#: libraries/controllers/StructureController.class.php:1963
-#: libraries/controllers/StructureController.class.php:1968
-#: templates/columns_definitions/column_indexes.phtml:27
-#: templates/structure/check_all_table_column.phtml:37
-msgid "Spatial"
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1964
-#: libraries/controllers/StructureController.class.php:1969
-#: templates/columns_definitions/column_indexes.phtml:22
-#: templates/structure/check_all_table_column.phtml:47
-msgid "Fulltext"
-msgstr "Fulltext"
-
-#: libraries/controllers/StructureController.class.php:1970
-msgid "Distinct values"
-msgstr "중복되지 않은 값"
-
 #: libraries/controllers/TableChartController.class.php:82
 #: libraries/controllers/TableGisVisualizationController.class.php:101
 msgid "No SQL query was set to fetch data."
@@ -8150,13 +8097,20 @@ msgstr "테이블에 숫자형 컬럼이 없어 표시할 수 없습니다."
 msgid "No data to display"
 msgstr "표시할 데이터 없음"
 
-#: libraries/controllers/TableRelationController.class.php:217
+#: libraries/controllers/TableIndexesController.class.php:161
+#: libraries/controllers/TableStructureController.class.php:736
+#: tbl_addfield.php:92
+#, php-format
+msgid "Table %1$s has been altered successfully."
+msgstr "테이블 %1$s 가 성공적으로 수정되었습니다."
+
+#: libraries/controllers/TableRelationController.class.php:218
 #, fuzzy
 #| msgid "Thread %s was successfully killed."
 msgid "Display column was successfully updated."
 msgstr "쓰레드 %s 를 죽였습니다."
 
-#: libraries/controllers/TableRelationController.class.php:283
+#: libraries/controllers/TableRelationController.class.php:288
 #, fuzzy
 #| msgid "Internal relation added"
 msgid "Internal relations were successfully updated."
@@ -8173,10 +8127,72 @@ msgid "Zoom search"
 msgstr "추가 검색"
 
 #: libraries/controllers/TableSearchController.class.php:852
-#: templates/table/selection_form.phtml:59
+#: templates/table/search/selection_form.phtml:59
 msgid "Find and replace"
 msgstr "찾기 및 바꾸기"
 
+#: libraries/controllers/TableStructureController.class.php:163
+#, fuzzy, php-format
+#| msgid "The column name '%s' is a MySQL reserved keyword."
+msgid "The name '%s' is a MySQL reserved keyword."
+msgid_plural "The names '%s' are MySQL reserved keywords."
+msgstr[0] "'%s'라는 컬럼명은 MySQL 예약어입니다."
+
+#: libraries/controllers/TableStructureController.class.php:241
+msgid "No column selected."
+msgstr "선택된 열이 없습니다."
+
+#: libraries/controllers/TableStructureController.class.php:467
+msgid "The columns have been moved successfully."
+msgstr "컬럼을 이동했습니다."
+
+#: libraries/controllers/TableStructureController.class.php:730
+#, fuzzy, php-format
+#| msgid "Table %1$s has been altered successfully."
+msgid ""
+"Table %1$s has been altered successfully. Privileges have been adjusted."
+msgstr "테이블 %1$s 가 성공적으로 수정되었습니다."
+
+#: libraries/controllers/TableStructureController.class.php:783
+#: libraries/tracking.lib.php:1094
+msgid "Query error"
+msgstr "질의 오류"
+
+#: libraries/controllers/TableStructureController.class.php:948
+#: templates/table/structure/check_all_table_column.phtml:11
+msgid "Change"
+msgstr "변경"
+
+#: libraries/controllers/TableStructureController.class.php:952
+#: libraries/controllers/TableStructureController.class.php:957
+#: libraries/navigation/Nodes/Node_Index.class.php:30
+#: libraries/tracking.lib.php:926
+#: templates/columns_definitions/column_indexes.phtml:16
+#: templates/columns_definitions/table_fields_definitions.phtml:57
+#: templates/table/structure/check_all_table_column.phtml:30
+#: templates/table/structure/display_structure.phtml:79
+#: templates/table/structure/display_table_stats.phtml:19
+msgid "Index"
+msgstr "인덱스"
+
+#: libraries/controllers/TableStructureController.class.php:954
+#: libraries/controllers/TableStructureController.class.php:959
+#: templates/columns_definitions/column_indexes.phtml:27
+#: templates/table/structure/check_all_table_column.phtml:37
+msgid "Spatial"
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:955
+#: libraries/controllers/TableStructureController.class.php:960
+#: templates/columns_definitions/column_indexes.phtml:22
+#: templates/table/structure/check_all_table_column.phtml:47
+msgid "Fulltext"
+msgstr "Fulltext"
+
+#: libraries/controllers/TableStructureController.class.php:963
+msgid "Distinct values"
+msgstr "중복되지 않은 값"
+
 #: libraries/core.lib.php:306
 #, php-format
 msgid "The %s extension is missing. Please check your PHP configuration."
@@ -8221,7 +8237,7 @@ msgid "No Password"
 msgstr "암호 없음"
 
 #: libraries/display_change_password.lib.php:68
-#: libraries/plugins/auth/AuthenticationCookie.class.php:199
+#: libraries/plugins/auth/AuthenticationCookie.class.php:187
 #: libraries/replication_gui.lib.php:422 libraries/replication_gui.lib.php:862
 #: libraries/server_privileges.lib.php:1640
 msgid "Password:"
@@ -9007,12 +9023,12 @@ msgid "Dump has been saved to file %s."
 msgstr "덤프 파일이 %s에 저장되었습니다."
 
 #: libraries/import.lib.php:202 libraries/insert_edit.lib.php:124
-#: libraries/rte/rte_routines.lib.php:1353 libraries/sql.lib.php:1312
+#: libraries/rte/rte_routines.lib.php:1444 libraries/sql.lib.php:1306
 #: tbl_get_field.php:44
 msgid "MySQL returned an empty result set (i.e. zero rows)."
 msgstr "결과값이 없습니다. (빈 레코드 리턴)."
 
-#: libraries/import.lib.php:265 libraries/sql.lib.php:1326
+#: libraries/import.lib.php:265 libraries/sql.lib.php:1320
 msgid "[ROLLBACK occurred.]"
 msgstr ""
 
@@ -9076,14 +9092,14 @@ msgstr "%s 개 열(칼럼)에 인덱스 만들기"
 
 #: libraries/insert_edit.lib.php:233
 #: libraries/navigation/Nodes/Node_DatabaseChild.class.php:48
-#: templates/designer/table_list.phtml:40
+#: templates/database/designer/table_list.phtml:40
 msgid "Hide"
 msgstr "숨기기"
 
 #: libraries/insert_edit.lib.php:249
 #: libraries/navigation/Nodes/Node_Function.class.php:32
-#: libraries/rte/rte_routines.lib.php:1495
-#: templates/table/table_header.phtml:4
+#: libraries/rte/rte_routines.lib.php:1586
+#: templates/table/search/table_header.phtml:4
 msgid "Function"
 msgstr "함수"
 
@@ -9096,82 +9112,83 @@ msgstr "바이너리"
 msgid "Because of its length,<br /> this column might not be editable."
 msgstr "컬럼의 길이 때문에,<br />이 컬럼을 편집할 수 없을 수도 있습니다."
 
-#: libraries/insert_edit.lib.php:1050
+#: libraries/insert_edit.lib.php:1048
 msgid "Binary - do not edit"
 msgstr "바이너리 - 편집 금지"
 
-#: libraries/insert_edit.lib.php:1176 libraries/server_privileges.lib.php:470
-#: templates/table/options.phtml:36
+#: libraries/insert_edit.lib.php:1174 libraries/server_privileges.lib.php:470
+#: templates/table/search/options.phtml:36
 msgid "Or"
 msgstr "또는"
 
-#: libraries/insert_edit.lib.php:1177
+#: libraries/insert_edit.lib.php:1175
 msgid "web server upload directory:"
 msgstr "웹 서버 업로드 디렉터리:"
 
-#: libraries/insert_edit.lib.php:1348 templates/table/input_box.phtml:49
+#: libraries/insert_edit.lib.php:1346
+#: templates/table/search/input_box.phtml:49
 msgid "Edit/Insert"
 msgstr "편집/삽입"
 
-#: libraries/insert_edit.lib.php:1398
+#: libraries/insert_edit.lib.php:1396
 #, php-format
 msgid "Continue insertion with %s rows"
 msgstr "%s 개의 행을 추가로 삽입"
 
-#: libraries/insert_edit.lib.php:1428
+#: libraries/insert_edit.lib.php:1426
 msgid "and then"
 msgstr "이어서"
 
-#: libraries/insert_edit.lib.php:1461
+#: libraries/insert_edit.lib.php:1459
 msgid "Insert as new row"
 msgstr "새 행을 삽입합니다"
 
-#: libraries/insert_edit.lib.php:1464
+#: libraries/insert_edit.lib.php:1462
 msgid "Insert as new row and ignore errors"
 msgstr "새 행을 삽입하고 에러를 무시합니다"
 
-#: libraries/insert_edit.lib.php:1467
+#: libraries/insert_edit.lib.php:1465
 msgid "Show insert query"
 msgstr "삽입 쿼리 보기"
 
-#: libraries/insert_edit.lib.php:1487
+#: libraries/insert_edit.lib.php:1485
 msgid "Go back to previous page"
 msgstr "이전 페이지로 되돌아가기"
 
-#: libraries/insert_edit.lib.php:1490
+#: libraries/insert_edit.lib.php:1488
 msgid "Insert another new row"
 msgstr "새 행(레코드) 삽입하기"
 
-#: libraries/insert_edit.lib.php:1495
+#: libraries/insert_edit.lib.php:1493
 msgid "Go back to this page"
 msgstr "이 페이지로 되돌아가기"
 
-#: libraries/insert_edit.lib.php:1518
+#: libraries/insert_edit.lib.php:1516
 msgid "Edit next row"
 msgstr "다음 행 수정"
 
-#: libraries/insert_edit.lib.php:1540
+#: libraries/insert_edit.lib.php:1538
 msgid ""
 "Use TAB key to move from value to value, or CTRL+arrows to move anywhere"
 msgstr "TAB 키나 CTRL+화살표로 값 사이를 이동할 수 있습니다"
 
-#: libraries/insert_edit.lib.php:1577 libraries/replication_gui.lib.php:542
-#: libraries/rte/rte_routines.lib.php:1497
+#: libraries/insert_edit.lib.php:1575 libraries/replication_gui.lib.php:542
+#: libraries/rte/rte_routines.lib.php:1588
 #: libraries/server_status_variables.lib.php:220
-#: templates/designer/having_query_panel.phtml:100
-#: templates/designer/options_panel.phtml:73
-#: templates/designer/options_panel.phtml:239
-#: templates/designer/where_query_panel.phtml:69
-#: templates/table/table_header.phtml:10
-#: templates/table/zoom_result_form.phtml:35
+#: templates/database/designer/having_query_panel.phtml:100
+#: templates/database/designer/options_panel.phtml:73
+#: templates/database/designer/options_panel.phtml:239
+#: templates/database/designer/where_query_panel.phtml:69
+#: templates/table/search/table_header.phtml:10
+#: templates/table/search/zoom_result_form.phtml:35
 msgid "Value"
 msgstr "값"
 
-#: libraries/insert_edit.lib.php:1937 libraries/sql.lib.php:1309
+#: libraries/insert_edit.lib.php:1935 libraries/sql.lib.php:1303
 msgid "Showing SQL query"
 msgstr "SQL 쿼리 보기"
 
-#: libraries/insert_edit.lib.php:1962 libraries/sql.lib.php:1287
+#: libraries/insert_edit.lib.php:1960 libraries/sql.lib.php:1281
 #, php-format
 msgid "Inserted row id: %1$d"
 msgstr "삽입된 행의 id: %1$d"
@@ -9592,7 +9609,7 @@ msgstr ""
 #: libraries/navigation/Nodes/Node_View_Container.class.php:26
 #: libraries/navigation/Nodes/Node_View_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:129
-#: templates/structure/show_create.phtml:30
+#: templates/database/structure/show_create.phtml:30
 msgid "Views"
 msgstr "뷰"
 
@@ -9890,7 +9907,7 @@ msgstr "어떻게 들어오셨어요? 지금 여기 있을 권한이 없습니
 
 #: libraries/operations.lib.php:101 libraries/operations.lib.php:249
 #: libraries/operations.lib.php:869 libraries/operations.lib.php:963
-#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:907
+#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:998
 #: templates/columns_definitions/table_fields_definitions.phtml:47
 #, fuzzy
 #| msgid "Edit Privileges"
@@ -9982,22 +9999,22 @@ msgid "Switch to copied table"
 msgstr "복사한 테이블로 옮겨감"
 
 #: libraries/operations.lib.php:1360
-#: templates/structure/check_all_tables.phtml:18
+#: templates/database/structure/check_all_tables.phtml:18
 msgid "Table maintenance"
 msgstr "테이블 유지보수"
 
 #: libraries/operations.lib.php:1398
-#: templates/structure/check_all_tables.phtml:19
+#: templates/database/structure/check_all_tables.phtml:19
 msgid "Analyze table"
 msgstr "테이블 분석"
 
 #: libraries/operations.lib.php:1413
-#: templates/structure/check_all_tables.phtml:20
+#: templates/database/structure/check_all_tables.phtml:20
 msgid "Check table"
 msgstr "테이블 검사"
 
 #: libraries/operations.lib.php:1428
-#: templates/structure/check_all_tables.phtml:22
+#: templates/database/structure/check_all_tables.phtml:22
 #, fuzzy
 #| msgid "Check table"
 msgid "Checksum table"
@@ -10017,18 +10034,19 @@ msgid "Flush the table (FLUSH)"
 msgstr "테이블 갱신 (캐시 삭제)"
 
 #: libraries/operations.lib.php:1477
-#: templates/structure/check_all_tables.phtml:23
-#: templates/structure/display_table_stats.phtml:56
+#: templates/database/structure/check_all_tables.phtml:23
+#: templates/table/structure/display_table_stats.phtml:56
 msgid "Optimize table"
 msgstr "테이블 최적화"
 
 #: libraries/operations.lib.php:1492
-#: templates/structure/check_all_tables.phtml:24
+#: templates/database/structure/check_all_tables.phtml:24
 msgid "Repair table"
 msgstr "테이블 복구"
 
 #: libraries/operations.lib.php:1538
-#: templates/structure/check_all_tables.phtml:14 view_operations.php:127
+#: templates/database/structure/check_all_tables.phtml:14
+#: view_operations.php:127
 msgid "Delete data or table"
 msgstr "데이터나 테이블 삭제"
 
@@ -10156,7 +10174,7 @@ msgid "Cannot connect: invalid settings."
 msgstr "연결할 수 없습니다: 잘못된 설정."
 
 #: libraries/plugins/auth/AuthenticationConfig.class.php:108
-#: libraries/plugins/auth/AuthenticationCookie.class.php:134
+#: libraries/plugins/auth/AuthenticationCookie.class.php:122
 #: libraries/plugins/auth/AuthenticationHttp.class.php:96
 #, php-format
 msgid "Welcome to %s"
@@ -10186,36 +10204,36 @@ msgstr ""
 msgid "Retry to connect"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:146
+#: libraries/plugins/auth/AuthenticationCookie.class.php:134
 msgid "Your session has expired. Please log in again."
 msgstr "세션유효기간이 만료되었습니다. 다시 로그인하세요."
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:170
+#: libraries/plugins/auth/AuthenticationCookie.class.php:158
 msgid "Log in"
 msgstr "로그인"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:178
-#: libraries/plugins/auth/AuthenticationCookie.class.php:188
+#: libraries/plugins/auth/AuthenticationCookie.class.php:166
+#: libraries/plugins/auth/AuthenticationCookie.class.php:176
 msgid "You can enter hostname/IP address and port separated by space."
 msgstr "호스트이름/IP주소와 포트를 공백으로 구분하여 입력할 수 있습니다."
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:193
+#: libraries/plugins/auth/AuthenticationCookie.class.php:181
 msgid "Username:"
 msgstr "사용자명:"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:205
+#: libraries/plugins/auth/AuthenticationCookie.class.php:193
 msgid "Server Choice:"
 msgstr "서버 선택:"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:386
+#: libraries/plugins/auth/AuthenticationCookie.class.php:374
 msgid "Entered captcha is wrong, try again!"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:396
+#: libraries/plugins/auth/AuthenticationCookie.class.php:384
 msgid "Please enter correct captcha!"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:423
+#: libraries/plugins/auth/AuthenticationCookie.class.php:411
 #, fuzzy
 #| msgid "Cannot log in to the MySQL server"
 msgid "You are not allowed to log in to this MySQL server!"
@@ -10315,7 +10333,7 @@ msgstr "이벤트"
 #: libraries/plugins/export/ExportOdt.class.php:593
 #: libraries/plugins/export/ExportTexytext.class.php:428
 #: libraries/plugins/export/PMA_ExportPdf.class.php:313
-#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:984
 #: libraries/rte/rte_triggers.lib.php:377
 msgid "Definition"
 msgstr "정의"
@@ -10637,7 +10655,7 @@ msgid "Last check:"
 msgstr "마지막 검사:"
 
 #: libraries/plugins/export/ExportSql.class.php:1399
-#: templates/structure/structure_table_row.phtml:183
+#: templates/database/structure/structure_table_row.phtml:183
 msgid "in use"
 msgstr "사용중"
 
@@ -10827,18 +10845,14 @@ msgstr ""
 msgid "The imported file does not contain any data!"
 msgstr "가져온 파일에 아무런 데이터도 없습니다!"
 
-#: libraries/plugins/import/ImportSql.class.php:169
+#: libraries/plugins/import/ImportSql.class.php:72
 msgid "SQL compatibility mode:"
 msgstr ""
 
-#: libraries/plugins/import/ImportSql.class.php:181
+#: libraries/plugins/import/ImportSql.class.php:84
 msgid "Do not use <code>AUTO_INCREMENT</code> for zero values"
 msgstr ""
 
-#: libraries/plugins/import/ImportSql.class.php:195
-msgid "Read as multibytes"
-msgstr ""
-
 #: libraries/plugins/import/ImportXml.class.php:54
 msgid "XML"
 msgstr "XML"
@@ -10885,7 +10899,7 @@ msgid "Show grid"
 msgstr "grid 보기"
 
 #: libraries/plugins/schema/SchemaPdf.class.php:94
-#: templates/structure/print_view_data_dictionary_link.phtml:6
+#: templates/database/structure/print_view_data_dictionary_link.phtml:6
 msgid "Data Dictionary"
 msgstr "데이터 사전 (전체 구조보기)"
 
@@ -10916,7 +10930,7 @@ msgid "The %s table doesn't exist!"
 msgstr "%s 테이블이 존재하지 않습니다!"
 
 #: libraries/plugins/schema/eps/Eps_Relation_Schema.class.php:321
-#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:309
+#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:323
 #, php-format
 msgid "Schema of the %s database - Page %s"
 msgstr "데이터베이스 %s의 스키마 - 페이지 %s"
@@ -10944,7 +10958,7 @@ msgstr "목차(차례)"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1005
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1028
 #: libraries/tracking.lib.php:884
-#: templates/structure/table_structure_header.phtml:11
+#: templates/table/structure/table_structure_header.phtml:11
 msgid "Extra"
 msgstr "추가"
 
@@ -11282,32 +11296,32 @@ msgstr "고급 기능을 설정을 쉽게 설정하기:"
 msgid "Create the needed tables with the <code>%screate_tables.sql</code>."
 msgstr "<code>%screate_tables.sql</code>에서 필요한 테이블을 생성하세요."
 
-#: libraries/relation.lib.php:360
+#: libraries/relation.lib.php:357
 msgid "Create a pma user and give access to these tables."
 msgstr "생성한 테이블에 접근할 수 있는 pma 사용자를 생성하세요."
 
-#: libraries/relation.lib.php:365
+#: libraries/relation.lib.php:360
 msgid ""
 "Enable advanced features in configuration file (<code>config.inc.php</"
 "code>), for example by starting from <code>config.sample.inc.php</code>."
 msgstr ""
 
-#: libraries/relation.lib.php:373
+#: libraries/relation.lib.php:365
 msgid "Re-login to phpMyAdmin to load the updated configuration file."
 msgstr "수정된 설정 파일을 적용하기 위해 phpMyAdmin에 다시 로그인해야 합니다."
 
-#: libraries/relation.lib.php:1612
+#: libraries/relation.lib.php:1607
 msgid "no description"
 msgstr "설명이 없습니다"
 
-#: libraries/relation.lib.php:1811
+#: libraries/relation.lib.php:1806
 msgid ""
 "You do not have necessary privileges to create a database named "
 "'phpmyadmin'. You may go to 'Operations' tab of any database to set up the "
 "phpMyAdmin configuration storage there."
 msgstr ""
 
-#: libraries/relation.lib.php:1928
+#: libraries/relation.lib.php:1923
 #, fuzzy, php-format
 #| msgid "Missing phpMyAdmin configuration storage tables"
 msgid ""
@@ -11315,21 +11329,21 @@ msgid ""
 "configuration storage there."
 msgstr "phpMyAdmin 설정 공간 테이블이 없습니다"
 
-#: libraries/relation.lib.php:1936
+#: libraries/relation.lib.php:1931
 #, fuzzy, php-format
 #| msgid "Missing phpMyAdmin configuration storage tables"
 msgid ""
 "%sCreate%s the phpMyAdmin configuration storage in the current database."
 msgstr "phpMyAdmin 설정 공간 테이블이 없습니다"
 
-#: libraries/relation.lib.php:1944
+#: libraries/relation.lib.php:1939
 #, fuzzy, php-format
 #| msgid "Missing phpMyAdmin configuration storage tables"
 msgid "%sCreate%s missing phpMyAdmin configuration storage tables."
 msgstr "phpMyAdmin 설정 공간 테이블이 없습니다"
 
 #: libraries/replication_gui.lib.php:46 libraries/replication_gui.lib.php:343
-#: libraries/server_databases.lib.php:387
+#: libraries/server_databases.lib.php:398
 msgid "Master replication"
 msgstr "마스터 리플리케이션"
 
@@ -11391,7 +11405,7 @@ msgstr ""
 "로 <b>설정되었다</b>는 안내 메시지를 볼 수 있을겁니다."
 
 #: libraries/replication_gui.lib.php:141
-#: libraries/server_databases.lib.php:389
+#: libraries/server_databases.lib.php:400
 msgid "Slave replication"
 msgstr "슬레이브 리플리케이션"
 
@@ -11671,10 +11685,10 @@ msgid "Master server changed successfully to %s."
 msgstr "마스터 서버가 성공적으로 %s로 변경되었습니다."
 
 #: libraries/rte/rte_events.lib.php:106 libraries/rte/rte_events.lib.php:115
-#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:149
-#: libraries/rte/rte_routines.lib.php:158
-#: libraries/rte/rte_routines.lib.php:231
-#: libraries/rte/rte_routines.lib.php:1362
+#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:219
+#: libraries/rte/rte_routines.lib.php:246
+#: libraries/rte/rte_routines.lib.php:368
+#: libraries/rte/rte_routines.lib.php:1453
 #: libraries/rte/rte_triggers.lib.php:82 libraries/rte/rte_triggers.lib.php:91
 #: libraries/rte/rte_triggers.lib.php:123
 #, php-format
@@ -11695,7 +11709,7 @@ msgstr "이벤트 %1$s 를 변경했습니다."
 msgid "Event %1$s has been created."
 msgstr "이벤트 %1$s 를 생성했습니다."
 
-#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:251
+#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:266
 #: libraries/rte/rte_triggers.lib.php:144
 msgid "One or more errors have occurred while processing your request:"
 msgstr "요청을 처리하는 중에 하나 혹은 그 이상의 오류가 발생했습니다:"
@@ -11704,7 +11718,7 @@ msgstr "요청을 처리하는 중에 하나 혹은 그 이상의 오류가 발
 msgid "Edit event"
 msgstr "이벤트 수정"
 
-#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:794
+#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:885
 #: libraries/rte/rte_triggers.lib.php:323 view_create.php:180
 msgid "Details"
 msgstr "자세한 내용"
@@ -11717,7 +11731,7 @@ msgstr "이벤트 이름"
 msgid "Event type"
 msgstr "이벤트 종류"
 
-#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:817
+#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:908
 #, php-format
 msgid "Change to %s"
 msgstr "%s 로 변경"
@@ -11744,12 +11758,14 @@ msgstr "완료"
 msgid "On completion preserve"
 msgstr "완료 후에 남기기"
 
-#: libraries/rte/rte_events.lib.php:491 libraries/rte/rte_routines.lib.php:930
+#: libraries/rte/rte_events.lib.php:491
+#: libraries/rte/rte_routines.lib.php:1021
 #: libraries/rte/rte_triggers.lib.php:383 view_create.php:209
 msgid "Definer"
 msgstr "디파이너"
 
-#: libraries/rte/rte_events.lib.php:535 libraries/rte/rte_routines.lib.php:997
+#: libraries/rte/rte_events.lib.php:535
+#: libraries/rte/rte_routines.lib.php:1088
 #: libraries/rte/rte_triggers.lib.php:422
 msgid "The definer must be in the \"username@hostname\" format!"
 msgstr "디파이너의 형식은 \"username@hostname\" 이어야 합니다!"
@@ -11775,9 +11791,9 @@ msgid "You must provide an event definition."
 msgstr "이벤트 정의를 입력하세요."
 
 #: libraries/rte/rte_export.lib.php:43 libraries/rte/rte_general.lib.php:72
-#: libraries/rte/rte_routines.lib.php:345
-#: libraries/rte/rte_routines.lib.php:1198
-#: libraries/rte/rte_routines.lib.php:1411
+#: libraries/rte/rte_routines.lib.php:153
+#: libraries/rte/rte_routines.lib.php:1289
+#: libraries/rte/rte_routines.lib.php:1502
 msgid "Error in processing request:"
 msgstr "요청 처리 중 에러가 발생:"
 
@@ -11812,120 +11828,120 @@ msgstr ""
 "니다. [strong]저장 루틴 수행중 일부가 실패할 수 있습니다![/strong] 향상된 "
 "'mysqli' 확장을 사용하여 문제를 해결하세요."
 
-#: libraries/rte/rte_routines.lib.php:110
-#: libraries/rte/rte_routines.lib.php:1006
+#: libraries/rte/rte_routines.lib.php:123
+msgid "Edit routine"
+msgstr "루틴 수정"
+
+#: libraries/rte/rte_routines.lib.php:200
+#: libraries/rte/rte_routines.lib.php:1097
 #, php-format
 msgid "Invalid routine type: \"%s\""
 msgstr "잘못된 루틴 타입: \"%s\""
 
-#: libraries/rte/rte_routines.lib.php:170
+#: libraries/rte/rte_routines.lib.php:253
+#, php-format
+msgid "Routine %1$s has been created."
+msgstr "루틴 %1$s가 생성되었습니다."
+
+#: libraries/rte/rte_routines.lib.php:380
 msgid "Sorry, we failed to restore the dropped routine."
 msgstr "죄송합니다만 삭제한 루틴을 복구하지 못했습니다."
 
-#: libraries/rte/rte_routines.lib.php:211
+#: libraries/rte/rte_routines.lib.php:439
 #, fuzzy, php-format
 #| msgid "Routine %1$s has been modified."
 msgid "Routine %1$s has been modified. Privileges have been adjusted."
 msgstr "루틴 %1$s가 수정되었습니다."
 
-#: libraries/rte/rte_routines.lib.php:216
+#: libraries/rte/rte_routines.lib.php:444
 #, php-format
 msgid "Routine %1$s has been modified."
 msgstr "루틴 %1$s가 수정되었습니다."
 
-#: libraries/rte/rte_routines.lib.php:238
-#, php-format
-msgid "Routine %1$s has been created."
-msgstr "루틴 %1$s가 생성되었습니다."
-
-#: libraries/rte/rte_routines.lib.php:315
-msgid "Edit routine"
-msgstr "루틴 수정"
-
-#: libraries/rte/rte_routines.lib.php:797
+#: libraries/rte/rte_routines.lib.php:888
 msgid "Routine name"
 msgstr "루틴 이름"
 
-#: libraries/rte/rte_routines.lib.php:823
+#: libraries/rte/rte_routines.lib.php:914
 msgid "Parameters"
 msgstr "파라미터"
 
-#: libraries/rte/rte_routines.lib.php:829
+#: libraries/rte/rte_routines.lib.php:920
 msgid "Direction"
 msgstr "방향"
 
-#: libraries/rte/rte_routines.lib.php:847
+#: libraries/rte/rte_routines.lib.php:938
 msgid "Add parameter"
 msgstr "파라미터 추가"
 
-#: libraries/rte/rte_routines.lib.php:851
+#: libraries/rte/rte_routines.lib.php:942
 msgid "Remove last parameter"
 msgstr "마지막 파라미터 제거"
 
-#: libraries/rte/rte_routines.lib.php:856
+#: libraries/rte/rte_routines.lib.php:947
 msgid "Return type"
 msgstr "반환(return) 종류"
 
-#: libraries/rte/rte_routines.lib.php:862
+#: libraries/rte/rte_routines.lib.php:953
 msgid "Return length/values"
 msgstr "반환(return) 길이/값"
 
-#: libraries/rte/rte_routines.lib.php:868
+#: libraries/rte/rte_routines.lib.php:959
 msgid "Return options"
 msgstr "반환(return) 옵션"
 
-#: libraries/rte/rte_routines.lib.php:899
+#: libraries/rte/rte_routines.lib.php:990
 msgid "Is deterministic"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:920
+#: libraries/rte/rte_routines.lib.php:1011
 msgid ""
 "You do not have sufficient privileges to perform this operation; Please "
 "refer to the documentation for more details"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:935
+#: libraries/rte/rte_routines.lib.php:1026
 msgid "Security type"
 msgstr "보안 타입"
 
-#: libraries/rte/rte_routines.lib.php:944
+#: libraries/rte/rte_routines.lib.php:1035
 msgid "SQL data access"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1013
+#: libraries/rte/rte_routines.lib.php:1104
 msgid "You must provide a routine name!"
 msgstr "루틴 이름이 필요합니다!"
 
-#: libraries/rte/rte_routines.lib.php:1047
+#: libraries/rte/rte_routines.lib.php:1138
 #, php-format
 msgid "Invalid direction \"%s\" given for parameter."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1069
-#: libraries/rte/rte_routines.lib.php:1131
+#: libraries/rte/rte_routines.lib.php:1160
+#: libraries/rte/rte_routines.lib.php:1222
 msgid ""
 "You must provide length/values for routine parameters of type ENUM, SET, "
 "VARCHAR and VARBINARY."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1095
+#: libraries/rte/rte_routines.lib.php:1186
 msgid "You must provide a name and a type for each routine parameter."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1114
+#: libraries/rte/rte_routines.lib.php:1205
 msgid "You must provide a valid return type for the routine."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1174
+#: libraries/rte/rte_routines.lib.php:1265
 msgid "You must provide a routine definition."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1285
+#: libraries/rte/rte_routines.lib.php:1376
 #, php-format
 msgid "Execution results of routine %s"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1340
+#: libraries/rte/rte_routines.lib.php:1431
 #, fuzzy, php-format
 #| msgid "%d row affected by the last statement inside the procedure"
 #| msgid_plural "%d rows affected by the last statement inside the procedure"
@@ -11933,13 +11949,13 @@ msgid "%d row affected by the last statement inside the procedure."
 msgid_plural "%d rows affected by the last statement inside the procedure."
 msgstr[0] "프로시저 수행 중 가장 최근의 구문에 의해 %d개의 로우가 영향을 받음"
 
-#: libraries/rte/rte_routines.lib.php:1398
-#: libraries/rte/rte_routines.lib.php:1406
+#: libraries/rte/rte_routines.lib.php:1489
+#: libraries/rte/rte_routines.lib.php:1497
 msgid "Execute routine"
 msgstr "루틴 실행"
 
-#: libraries/rte/rte_routines.lib.php:1485
-#: libraries/rte/rte_routines.lib.php:1488
+#: libraries/rte/rte_routines.lib.php:1576
+#: libraries/rte/rte_routines.lib.php:1579
 msgid "Routine parameters"
 msgstr "루틴 파라미터"
 
@@ -12093,7 +12109,7 @@ msgid "Original position"
 msgstr "원본 위치"
 
 #: libraries/server_bin_log.lib.php:133
-#: templates/structure/display_table_stats.phtml:4
+#: templates/table/structure/display_table_stats.phtml:4
 msgid "Information"
 msgstr "정보"
 
@@ -12130,12 +12146,12 @@ msgid ""
 msgstr ""
 "주의: 데이터베이스 통계 보기는 웹서버와 MySQL 서버 사이에 큰 부하를 줍니다."
 
-#: libraries/server_databases.lib.php:364
-#: libraries/server_databases.lib.php:365
+#: libraries/server_databases.lib.php:366
+#: libraries/server_databases.lib.php:371
 msgid "Enable Statistics"
 msgstr "통계 보기"
 
-#: libraries/server_databases.lib.php:481
+#: libraries/server_databases.lib.php:492
 #, php-format
 msgid "%1$d database has been dropped successfully."
 msgid_plural "%1$d databases have been dropped successfully."
@@ -12506,7 +12522,7 @@ msgid "You have revoked the privileges for %s."
 msgstr "%s의 권한을 제거했습니다."
 
 #: libraries/server_privileges.lib.php:2059
-#: libraries/server_privileges.lib.php:4290
+#: libraries/server_privileges.lib.php:4316
 #, fuzzy
 #| msgid "Add user"
 msgid "Add user account"
@@ -12686,59 +12702,59 @@ msgstr "%s 을 삭제합니다"
 msgid "The privileges were reloaded successfully."
 msgstr "권한을 다시 로딩했습니다."
 
-#: libraries/server_privileges.lib.php:3994
+#: libraries/server_privileges.lib.php:4003
 #, php-format
 msgid "The user %s already exists!"
 msgstr "사용자 %s 가 이미 존재합니다!"
 
-#: libraries/server_privileges.lib.php:4232
+#: libraries/server_privileges.lib.php:4258
 #, php-format
 msgid "Privileges for %s"
 msgstr "%s에 대한 권한"
 
-#: libraries/server_privileges.lib.php:4241
+#: libraries/server_privileges.lib.php:4267
 #: libraries/server_status_processes.lib.php:72
 #: libraries/server_user_groups.lib.php:39
 msgid "User"
 msgstr "사용자"
 
-#: libraries/server_privileges.lib.php:4282
+#: libraries/server_privileges.lib.php:4308
 msgctxt "Create new user"
 msgid "New"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4311
+#: libraries/server_privileges.lib.php:4337
 #, fuzzy
 #| msgid "Edit Privileges:"
 msgid "Edit privileges:"
 msgstr "권한 수정:"
 
-#: libraries/server_privileges.lib.php:4312
+#: libraries/server_privileges.lib.php:4338
 #, fuzzy
 #| msgid "Users"
 msgid "User account"
 msgstr "사용자"
 
-#: libraries/server_privileges.lib.php:4371
+#: libraries/server_privileges.lib.php:4397
 msgid ""
 "Note: You are attempting to edit privileges of the user with which you are "
 "currently logged in."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4391 libraries/server_users.lib.php:25
+#: libraries/server_privileges.lib.php:4417 libraries/server_users.lib.php:25
 #, fuzzy
 #| msgid "Users overview"
 msgid "User accounts overview"
 msgstr "사용자 개요"
 
-#: libraries/server_privileges.lib.php:4459
+#: libraries/server_privileges.lib.php:4485
 msgid ""
 "A user account allowing any user from localhost to connect is present. This "
 "will prevent other users from connecting if the host part of their account "
 "allows a connection from any (%) host."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4500
+#: libraries/server_privileges.lib.php:4526
 #, php-format
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
@@ -12750,7 +12766,7 @@ msgstr ""
 "다. 만약 수동으로 서버의 권한 정보를 수정하였다면, 서버의 정보와 맞지 않을 "
 "수 있습니다. 이 경우, %sreload the privileges%s를 먼저 수행하세요."
 
-#: libraries/server_privileges.lib.php:4519
+#: libraries/server_privileges.lib.php:4545
 #, fuzzy
 #| msgid ""
 #| "Note: phpMyAdmin gets the users' privileges directly from MySQL's "
@@ -12768,25 +12784,25 @@ msgstr ""
 "다. 만약 수동으로 서버의 권한 정보를 수정하였다면, 서버의 정보와 맞지 않을 "
 "수 있습니다. 이 경우, %sreload the privileges%s를 먼저 수행하세요."
 
-#: libraries/server_privileges.lib.php:4569
+#: libraries/server_privileges.lib.php:4595
 msgid "The selected user was not found in the privilege table."
 msgstr "선택한 사용자는 사용권한 테이블에 존재하지 않습니다."
 
-#: libraries/server_privileges.lib.php:4801
+#: libraries/server_privileges.lib.php:4827
 msgid "You have added a new user."
 msgstr "새 사용자를 추가했습니다."
 
-#: libraries/server_status.lib.php:53
+#: libraries/server_status.lib.php:60
 #, php-format
 msgid "Network traffic since startup: %s"
 msgstr "시작 이후 네트워크 전송량: %s"
 
-#: libraries/server_status.lib.php:66
+#: libraries/server_status.lib.php:73
 #, php-format
 msgid "This MySQL server has been running for %1$s. It started up on %2$s."
 msgstr "이 MySQL 서버는 %1$s 동안 구동되었습니다. 구동 시작날짜는 %2$s 입니다."
 
-#: libraries/server_status.lib.php:80
+#: libraries/server_status.lib.php:94
 msgid ""
 "This MySQL server works as <b>master</b> and <b>slave</b> in <b>replication</"
 "b> process."
@@ -12794,41 +12810,41 @@ msgstr ""
 "이 MySQL 서버는 <b>리플리케이션</b> 작업시 <b>마스터</b>와 <b>슬레이브</b>로 "
 "동작합니다."
 
-#: libraries/server_status.lib.php:85
+#: libraries/server_status.lib.php:99
 msgid "This MySQL server works as <b>master</b> in <b>replication</b> process."
 msgstr ""
 
-#: libraries/server_status.lib.php:90
+#: libraries/server_status.lib.php:104
 msgid "This MySQL server works as <b>slave</b> in <b>replication</b> process."
 msgstr ""
 
-#: libraries/server_status.lib.php:106
+#: libraries/server_status.lib.php:116
 #, fuzzy
 #| msgid "Replication"
 msgid "Replication status"
 msgstr "복제"
 
-#: libraries/server_status.lib.php:137
+#: libraries/server_status.lib.php:146
 msgid ""
 "On a busy server, the byte counters may overrun, so those statistics as "
 "reported by the MySQL server may be incorrect."
 msgstr ""
 
-#: libraries/server_status.lib.php:148
+#: libraries/server_status.lib.php:157
 msgid "Received"
 msgstr "받음"
 
-#: libraries/server_status.lib.php:167
+#: libraries/server_status.lib.php:176
 msgid "Sent"
 msgstr "보냄"
 
-#: libraries/server_status.lib.php:234
+#: libraries/server_status.lib.php:243
 #, fuzzy
 #| msgid "max. concurrent connections"
 msgid "Max. concurrent connections"
 msgstr "최대 동시 연결"
 
-#: libraries/server_status.lib.php:244
+#: libraries/server_status.lib.php:253
 msgid "Failed attempts"
 msgstr "실패한 시도"
 
@@ -13805,7 +13821,7 @@ msgstr ""
 msgid "Not implemented yet."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/AlterOperation.php:193
+#: libraries/sql-parser/src/Components/AlterOperation.php:191
 #, fuzzy
 #| msgid "Log table filter options"
 msgid "Unrecognized alter operation."
@@ -13821,7 +13837,7 @@ msgid "An opening bracket followed by a set of values was expected."
 msgstr ""
 
 #: libraries/sql-parser/src/Components/ArrayObj.php:101
-#: libraries/sql-parser/src/Components/FieldDefinition.php:202
+#: libraries/sql-parser/src/Components/CreateDefinition.php:202
 msgid "An opening bracket was expected."
 msgstr ""
 
@@ -13829,25 +13845,35 @@ msgstr ""
 msgid "A comma or a closing bracket was expected"
 msgstr ""
 
+#: libraries/sql-parser/src/Components/CreateDefinition.php:246
+#, fuzzy
+#| msgid "No tables selected."
+msgid "A comma or a closing bracket was expected."
+msgstr "테이블이 선택되지 않았습니다."
+
+#: libraries/sql-parser/src/Components/CreateDefinition.php:262
+msgid "A closing bracket was expected."
+msgstr ""
+
 #: libraries/sql-parser/src/Components/DataType.php:125
 msgid "Unrecognized data type."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:225
+#: libraries/sql-parser/src/Components/Expression.php:227
 msgid "Unexpected closing bracket."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:246
-#: libraries/sql-parser/src/Components/Expression.php:283
-#: libraries/sql-parser/src/Components/Expression.php:303
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:285
+#: libraries/sql-parser/src/Components/Expression.php:305
 msgid "An alias was previously found."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:257
+#: libraries/sql-parser/src/Components/Expression.php:259
 msgid "Unexpected dot."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:327
+#: libraries/sql-parser/src/Components/Expression.php:329
 #, fuzzy
 #| msgid "No tables selected."
 msgid "An alias was expected."
@@ -13859,16 +13885,6 @@ msgstr "테이블이 선택되지 않았습니다."
 msgid "An expression was expected."
 msgstr "선택된 행이 없습니다"
 
-#: libraries/sql-parser/src/Components/FieldDefinition.php:246
-#, fuzzy
-#| msgid "No tables selected."
-msgid "A comma or a closing bracket was expected."
-msgstr "테이블이 선택되지 않았습니다."
-
-#: libraries/sql-parser/src/Components/FieldDefinition.php:262
-msgid "A closing bracket was expected."
-msgstr ""
-
 #: libraries/sql-parser/src/Components/Limit.php:90
 #: libraries/sql-parser/src/Components/Limit.php:112
 msgid "An offset was expected."
@@ -13916,29 +13932,29 @@ msgstr ""
 msgid "Expected delimiter."
 msgstr ""
 
-#: libraries/sql-parser/src/Lexer.php:753
+#: libraries/sql-parser/src/Lexer.php:777
 #, fuzzy, php-format
 #| msgid "Event %1$s has been created."
 msgid "Ending quote %1$s was expected."
 msgstr "이벤트 %1$s 를 생성했습니다."
 
-#: libraries/sql-parser/src/Lexer.php:789
+#: libraries/sql-parser/src/Lexer.php:813
 #, fuzzy
 #| msgid "Table name template"
 msgid "Variable name was expected."
 msgstr "파일명 템플릿"
 
-#: libraries/sql-parser/src/Parser.php:380
+#: libraries/sql-parser/src/Parser.php:391
 #, fuzzy
 #| msgid "At Beginning of Table"
 msgid "Unexpected beginning of statement."
 msgstr "테이블의 처음"
 
-#: libraries/sql-parser/src/Parser.php:399
+#: libraries/sql-parser/src/Parser.php:410
 msgid "Unrecognized statement type."
 msgstr ""
 
-#: libraries/sql-parser/src/Parser.php:479
+#: libraries/sql-parser/src/Parser.php:489
 msgid "No transaction was previously started."
 msgstr ""
 
@@ -13968,8 +13984,10 @@ msgid "The name of the entity was expected."
 msgstr "열린 테이블 수."
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:310
-msgid "At least one field definition was expected."
-msgstr ""
+#, fuzzy
+#| msgid "The row has been deleted."
+msgid "At least one column definition was expected."
+msgstr "행을 삭제 하였습니다."
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:329
 msgid "A \"RETURNS\" keyword was expected."
@@ -14038,11 +14056,11 @@ msgstr "북마크 %s가 생성되었습니다."
 msgid "Using bookmark \"%s\" as default browse query."
 msgstr ""
 
-#: libraries/sql.lib.php:1306
+#: libraries/sql.lib.php:1300
 msgid "Showing as PHP code"
 msgstr "PHP 코드 보기"
 
-#: libraries/sql.lib.php:1638
+#: libraries/sql.lib.php:1632
 #, fuzzy, php-format
 #| msgid ""
 #| "This table does not contain a unique column. Grid edit, checkbox, Edit, "
@@ -14054,7 +14072,7 @@ msgstr ""
 "이 테이블에는 유일 속성을 가진 컬럼이 없습니다. 격자창 편집, 체크박스, 편집, "
 "복사, 삭제 기능을 사용할 수 없습니다."
 
-#: libraries/sql.lib.php:1649
+#: libraries/sql.lib.php:1643
 #, fuzzy, php-format
 #| msgid ""
 #| "This table does not contain a unique column. Grid edit, checkbox, Edit, "
@@ -14066,7 +14084,7 @@ msgstr ""
 "이 테이블에는 유일 속성을 가진 컬럼이 없습니다. 격자창 편집, 체크박스, 편집, "
 "복사, 삭제 기능을 사용할 수 없습니다."
 
-#: libraries/sql.lib.php:1688
+#: libraries/sql.lib.php:1682
 #, php-format
 msgid "Problems with indexes of table `%s`"
 msgstr ""
@@ -14230,7 +14248,7 @@ msgid "Version %s snapshot (SQL code)"
 msgstr "버전 %s 스냅샷 (SQL 코드)"
 
 #: libraries/tracking.lib.php:947
-#: templates/structure/table_structure_row.phtml:33
+#: templates/table/structure/table_structure_row.phtml:33
 msgctxt "None for default"
 msgid "None"
 msgstr "없음"
@@ -14284,15 +14302,15 @@ msgstr "%2$s의 %1$s 버전 생성"
 msgid "Version %1$s was created, tracking for %2$s is active."
 msgstr ""
 
-#: libraries/user_preferences.inc.php:29
+#: libraries/user_preferences.inc.php:30
 msgid "Manage your settings"
 msgstr "나만의 설정 관리"
 
-#: libraries/user_preferences.inc.php:46 prefs_manage.php:307
+#: libraries/user_preferences.inc.php:54 prefs_manage.php:307
 msgid "Configuration has been saved."
 msgstr "설정 저장 완료."
 
-#: libraries/user_preferences.inc.php:66
+#: libraries/user_preferences.inc.php:74
 #, php-format
 msgid ""
 "Your preferences will be saved for current session only. Storing them "
@@ -14692,7 +14710,7 @@ msgid "first"
 msgstr "맨 처음"
 
 #: templates/columns_definitions/move_column.phtml:12
-#: templates/structure/add_column.phtml:21
+#: templates/table/structure/add_column.phtml:21
 #, php-format
 msgid "after %s"
 msgstr "%s 다음에"
@@ -14767,205 +14785,307 @@ msgstr "브라우저 변형"
 msgid "Input transformation options"
 msgstr "변환 옵션"
 
-#: templates/designer/aggregate_query_panel.phtml:22
-#: templates/designer/options_panel.phtml:100
+#: templates/database/create_table.phtml:7
+#: templates/database/designer/side_menu.phtml:77
+#: templates/database/designer/side_menu.phtml:80
+msgid "Create table"
+msgstr "새 테이블 만들기"
+
+#: templates/database/create_table.phtml:15
+msgid "Number of columns"
+msgstr "컬럼수"
+
+#: templates/database/designer/aggregate_query_panel.phtml:22
+#: templates/database/designer/options_panel.phtml:100
 msgid "Aggregate"
 msgstr "합계"
 
-#: templates/designer/aggregate_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:61
-#: templates/designer/options_panel.phtml:106
-#: templates/designer/options_panel.phtml:170
-#: templates/designer/where_query_panel.phtml:30
-#: templates/table/table_header.phtml:9
+#: templates/database/designer/aggregate_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:61
+#: templates/database/designer/options_panel.phtml:106
+#: templates/database/designer/options_panel.phtml:170
+#: templates/database/designer/where_query_panel.phtml:30
+#: templates/table/search/table_header.phtml:9
 msgid "Operator"
 msgstr "연산자"
 
-#: templates/designer/database_tables.phtml:29
+#: templates/database/designer/database_tables.phtml:29
 msgid "Toggle"
 msgstr ""
 
-#: templates/designer/database_tables.phtml:40
+#: templates/database/designer/database_tables.phtml:40
 #, fuzzy
 #| msgid "Table structure"
 msgid "See table structure"
 msgstr "테이블 구조"
 
-#: templates/designer/delete_relation_panel.phtml:21
+#: templates/database/designer/delete_relation_panel.phtml:21
 msgid "Delete relation"
 msgstr "관계(relation) 삭제"
 
-#: templates/designer/edit_delete_pages.phtml:7
+#: templates/database/designer/edit_delete_pages.phtml:7
 msgid "Page to open"
 msgstr "열 페이지"
 
-#: templates/designer/edit_delete_pages.phtml:7
+#: templates/database/designer/edit_delete_pages.phtml:7
 msgid "Page to delete"
 msgstr "삭제할 페이지"
 
-#: templates/designer/having_query_panel.phtml:90
-#: templates/designer/options_panel.phtml:63
-#: templates/designer/options_panel.phtml:229
-#: templates/designer/where_query_panel.phtml:59
+#: templates/database/designer/having_query_panel.phtml:90
+#: templates/database/designer/options_panel.phtml:63
+#: templates/database/designer/options_panel.phtml:229
+#: templates/database/designer/where_query_panel.phtml:59
 msgid "Except"
 msgstr "제외"
 
-#: templates/designer/having_query_panel.phtml:102
-#: templates/designer/options_panel.phtml:75
-#: templates/designer/options_panel.phtml:241
-#: templates/designer/where_query_panel.phtml:71
+#: templates/database/designer/having_query_panel.phtml:102
+#: templates/database/designer/options_panel.phtml:75
+#: templates/database/designer/options_panel.phtml:241
+#: templates/database/designer/where_query_panel.phtml:71
 msgid "subquery"
 msgstr "서브쿼리"
 
-#: templates/designer/new_relation_panel.phtml:22
-#: templates/designer/side_menu.phtml:84 templates/designer/side_menu.phtml:87
+#: templates/database/designer/new_relation_panel.phtml:22
+#: templates/database/designer/side_menu.phtml:84
+#: templates/database/designer/side_menu.phtml:87
 msgid "Create relation"
 msgstr "관계 생성"
 
-#: templates/designer/options_panel.phtml:34
-#: templates/designer/options_panel.phtml:200
+#: templates/database/designer/options_panel.phtml:34
+#: templates/database/designer/options_panel.phtml:200
 msgid "Relation operator"
 msgstr "관계 연산"
 
-#: templates/designer/options_panel.phtml:85
-#: templates/designer/rename_to_panel.phtml:23
+#: templates/database/designer/options_panel.phtml:85
+#: templates/database/designer/rename_to_panel.phtml:23
 msgid "Rename to"
 msgstr "바뀔 이름"
 
-#: templates/designer/options_panel.phtml:91
-#: templates/designer/rename_to_panel.phtml:31
+#: templates/database/designer/options_panel.phtml:91
+#: templates/database/designer/rename_to_panel.phtml:31
 msgid "New name"
 msgstr "새 이름"
 
-#: templates/designer/page_save_as.phtml:4
+#: templates/database/designer/page_save_as.phtml:4
 msgid "Save to selected page"
 msgstr "선택된 페이지로 저장하기"
 
-#: templates/designer/page_save_as.phtml:5
+#: templates/database/designer/page_save_as.phtml:5
 msgid "Create a page and save to it"
 msgstr "새 페이지를 만들고 내보내기"
 
-#: templates/designer/page_save_as.phtml:26
+#: templates/database/designer/page_save_as.phtml:26
 msgid "New page name"
 msgstr "새 페이지 이름"
 
-#: templates/designer/page_selector.phtml:2
+#: templates/database/designer/page_selector.phtml:2
 msgid "Select page"
 msgstr "페이지를 선택하세요"
 
-#: templates/designer/query_details.phtml:10
+#: templates/database/designer/query_details.phtml:10
 msgid "Active options"
 msgstr "옵션 활성화"
 
-#: templates/designer/schema_export.phtml:4
+#: templates/database/designer/schema_export.phtml:4
 msgid "Select Export Relational Type"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:19 templates/designer/side_menu.phtml:25
+#: templates/database/designer/side_menu.phtml:19
+#: templates/database/designer/side_menu.phtml:25
 msgid "Show/Hide tables list"
 msgstr "테이블 목록 표시/숨김"
 
-#: templates/designer/side_menu.phtml:29 templates/designer/side_menu.phtml:35
-#: templates/designer/side_menu.phtml:36
+#: templates/database/designer/side_menu.phtml:29
+#: templates/database/designer/side_menu.phtml:35
+#: templates/database/designer/side_menu.phtml:36
 msgid "View in fullscreen"
 msgstr "전체 화면으로 보기"
 
-#: templates/designer/side_menu.phtml:34
+#: templates/database/designer/side_menu.phtml:34
 msgid "Exit fullscreen"
 msgstr "전체 화면으로부터 나가기"
 
-#: templates/designer/side_menu.phtml:41 templates/designer/side_menu.phtml:45
+#: templates/database/designer/side_menu.phtml:41
+#: templates/database/designer/side_menu.phtml:45
 msgid "New page"
 msgstr "새 페이지"
 
-#: templates/designer/side_menu.phtml:70 templates/designer/side_menu.phtml:73
+#: templates/database/designer/side_menu.phtml:70
+#: templates/database/designer/side_menu.phtml:73
 msgid "Delete pages"
 msgstr "페이지 삭제"
 
-#: templates/designer/side_menu.phtml:77 templates/designer/side_menu.phtml:80
-#: templates/table/create_table.phtml:7
-msgid "Create table"
-msgstr "새 테이블 만들기"
-
-#: templates/designer/side_menu.phtml:98
-#: templates/designer/side_menu.phtml:101
+#: templates/database/designer/side_menu.phtml:98
+#: templates/database/designer/side_menu.phtml:101
 msgid "Reload"
 msgstr "새로고침"
 
-#: templates/designer/side_menu.phtml:107
-#: templates/designer/side_menu.phtml:110
+#: templates/database/designer/side_menu.phtml:107
+#: templates/database/designer/side_menu.phtml:110
 msgid "Help"
 msgstr "도움말"
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Angular links"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Direct links"
 msgstr "다이렉트 링크"
 
-#: templates/designer/side_menu.phtml:122
-#: templates/designer/side_menu.phtml:124
+#: templates/database/designer/side_menu.phtml:122
+#: templates/database/designer/side_menu.phtml:124
 #, fuzzy
 #| msgid "Add chart to grid"
 msgid "Snap to grid"
 msgstr "차트에 그리드 추가"
 
-#: templates/designer/side_menu.phtml:128
-#: templates/designer/side_menu.phtml:134
+#: templates/database/designer/side_menu.phtml:128
+#: templates/database/designer/side_menu.phtml:134
 msgid "Small/Big All"
 msgstr "전체를 작게/크게"
 
-#: templates/designer/side_menu.phtml:138
-#: templates/designer/side_menu.phtml:141
+#: templates/database/designer/side_menu.phtml:138
+#: templates/database/designer/side_menu.phtml:141
 msgid "Toggle small/big"
 msgstr "대소 변경"
 
-#: templates/designer/side_menu.phtml:145
-#: templates/designer/side_menu.phtml:148
+#: templates/database/designer/side_menu.phtml:145
+#: templates/database/designer/side_menu.phtml:148
 msgid "Toggle relation lines"
 msgstr "릴레이션 라인 토글"
 
-#: templates/designer/side_menu.phtml:153
-#: templates/designer/side_menu.phtml:156
+#: templates/database/designer/side_menu.phtml:153
+#: templates/database/designer/side_menu.phtml:156
 #, fuzzy
 #| msgid "Export type"
 msgid "Export schema"
 msgstr "내보내기 형식"
 
-#: templates/designer/side_menu.phtml:165
-#: templates/designer/side_menu.phtml:168
+#: templates/database/designer/side_menu.phtml:165
+#: templates/database/designer/side_menu.phtml:168
 msgid "Build Query"
 msgstr "쿼리 생성"
 
-#: templates/designer/side_menu.phtml:173
-#: templates/designer/side_menu.phtml:177
+#: templates/database/designer/side_menu.phtml:173
+#: templates/database/designer/side_menu.phtml:177
 msgid "Move Menu"
 msgstr "메뉴 이동"
 
-#: templates/designer/side_menu.phtml:181
-#: templates/designer/side_menu.phtml:186
+#: templates/database/designer/side_menu.phtml:181
+#: templates/database/designer/side_menu.phtml:186
 #, fuzzy
 #| msgid "Partial texts"
 msgid "Pin text"
 msgstr "텍스트의 일부분"
 
-#: templates/designer/table_list.phtml:4
+#: templates/database/designer/table_list.phtml:4
 msgid "Hide/Show all"
 msgstr "모두 숨기기/보기"
 
-#: templates/designer/table_list.phtml:14
+#: templates/database/designer/table_list.phtml:14
 msgid "Hide/Show Tables with no relation"
 msgstr "릴레이션이 없는 테이블 숨기기/보이기"
 
-#: templates/designer/table_list.phtml:59
+#: templates/database/designer/table_list.phtml:59
 msgid "Number of tables:"
 msgstr "테이블 갯수:"
 
+#: templates/database/structure/body_for_table_summary.phtml:6
+#, php-format
+msgid "%s table"
+msgid_plural "%s tables"
+msgstr[0] "%s개 테이블"
+
+#: templates/database/structure/body_for_table_summary.phtml:17
+msgid "Sum"
+msgstr "계"
+
+#: templates/database/structure/check_all_tables.phtml:6
+msgid "Check tables having overhead"
+msgstr "오버헤드를 가진 테이블들을 체크"
+
+#: templates/database/structure/check_all_tables.phtml:10
+#, fuzzy
+#| msgid "Show color"
+msgid "Show create"
+msgstr "색깔 보기"
+
+#: templates/database/structure/check_all_tables.phtml:27
+#, fuzzy
+#| msgid "Add prefix"
+msgid "Prefix"
+msgstr "접두사 추가"
+
+#: templates/database/structure/check_all_tables.phtml:28
+msgid "Add prefix to table"
+msgstr "테이블에 접두사 추가"
+
+#: templates/database/structure/check_all_tables.phtml:29
+msgid "Replace table prefix"
+msgstr "테이블의 접두사를 교체"
+
+#: templates/database/structure/check_all_tables.phtml:30
+msgid "Copy table with prefix"
+msgstr "테이블에 접두사를 추가하여 복제"
+
+#: templates/database/structure/check_all_tables.phtml:36
+#, fuzzy
+#| msgid "CHAR textarea columns"
+msgid "Add columns to central list"
+msgstr "CHAR 텍스트입력 컬럼"
+
+#: templates/database/structure/check_all_tables.phtml:37
+msgid "Remove columns from central list"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:38
+#, fuzzy
+#| msgid "CHAR textarea columns"
+msgid "Make consistent with central list"
+msgstr "CHAR 텍스트입력 컬럼"
+
+#: templates/database/structure/favorite_anchor.phtml:12
+msgid "Add to Favorites"
+msgstr "즐겨찾기로 추가"
+
+#: templates/database/structure/show_create.phtml:2
+msgid "Showing create queries"
+msgstr "생성 쿼리 보이기"
+
+#: templates/database/structure/sortable_header.phtml:13
+msgid "Sort"
+msgstr "정렬"
+
+#: templates/database/structure/table_header.phtml:42
+msgid ""
+"May be approximate. Click on the number to get the exact count. See "
+"[doc@faq3-11]FAQ 3.11[/doc]."
+msgstr ""
+"근사값입니다. 정확한 값을 보시려면 숫자를 클릭하세요. [doc@faq3-11]FAQ 3.11[/"
+"doc]를 참조하세요."
+
+#: templates/database/structure/table_header.phtml:66
+#: templates/table/index_form.phtml:127
+msgid "Size"
+msgstr "크기"
+
+#: templates/database/structure/table_header.phtml:74
+#: templates/table/structure/display_table_stats.phtml:27
+msgid "Overhead"
+msgstr "부담"
+
+#: templates/database/structure/tracking_icon.phtml:4
+msgid "Tracking is active."
+msgstr "트래킹이 활성화되었습니다."
+
+#: templates/database/structure/tracking_icon.phtml:8
+msgid "Tracking is not active."
+msgstr "트래킹이 활성화되어 있지 않습니다."
+
 #: templates/error/report_form.phtml:7
 msgid ""
 "phpMyAdmin has encountered an error. We have collected data about this error "
@@ -14981,71 +15101,6 @@ msgstr ""
 msgid "Please explain the steps that lead to the error:"
 msgstr ""
 
-#: templates/gis_visualization/gis_visualization.phtml:3
-msgid "Display GIS Visualization"
-msgstr "공간정보 도식화 표시"
-
-#: templates/gis_visualization/gis_visualization.phtml:8
-#, fuzzy
-#| msgid "Inside column:"
-msgid "Label column"
-msgstr "검색할 컬럼:"
-
-#: templates/gis_visualization/gis_visualization.phtml:11
-msgid "-- None --"
-msgstr "-없음-"
-
-#: templates/gis_visualization/gis_visualization.phtml:19
-#, fuzzy
-#| msgid "Relational display column"
-msgid "Spatial column"
-msgstr "연관된 행 표시"
-
-#: templates/index_form.phtml:16
-msgid "Index name:"
-msgstr "인덱스 이름:"
-
-#: templates/index_form.phtml:19
-msgid ""
-"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
-msgstr ""
-"\"PRIMARY\"는 <b>반드시</b> 기본 키의 이름이어야 하며, 기본 키<b>만</b> 쓸 "
-"수 있는 이름입니다!"
-
-#: templates/index_form.phtml:40
-#, fuzzy
-#| msgid "Index cache size"
-msgid "Index choice:"
-msgstr "인덱스 캐시 크기"
-
-#: templates/index_form.phtml:57
-msgid "Key block size:"
-msgstr ""
-
-#: templates/index_form.phtml:74
-msgid "Index type:"
-msgstr "인덱스 종류:"
-
-#: templates/index_form.phtml:86
-#, fuzzy
-#| msgid "User:"
-msgid "Parser:"
-msgstr "사용자:"
-
-#: templates/index_form.phtml:102
-msgid "Comment:"
-msgstr "설명:"
-
-#: templates/index_form.phtml:127 templates/structure/table_header.phtml:66
-msgid "Size"
-msgstr "크기"
-
-#: templates/index_form.phtml:149 templates/index_form.phtml:190
-#, fuzzy
-#| msgid "Drag to reorder."
-msgid "Drag to reorder"
-msgstr "재정렬하려면 드래그하세요."
-
 #: templates/prefs_autoload.phtml:9
 msgid ""
 "Your browser has phpMyAdmin configuration for this domain. Would you like to "
@@ -15058,432 +15113,402 @@ msgstr ""
 msgid "Start row:"
 msgstr "시작 행:"
 
-#: templates/structure/actions_in_table_structure.phtml:14
-#, php-format
-msgid "A primary key has been added on %s."
-msgstr "%s에 기본 키가 추가되었습니다."
-
-#: templates/structure/actions_in_table_structure.phtml:34
-#: templates/structure/actions_in_table_structure.phtml:54
-#: templates/structure/actions_in_table_structure.phtml:79
-#: templates/structure/actions_in_table_structure.phtml:101
-#, php-format
-msgid "An index has been added on %s."
-msgstr "%s에 인덱스를 추가했습니다."
-
-#: templates/structure/actions_in_table_structure.phtml:130
-#: templates/structure/check_all_table_column.phtml:59
-#, fuzzy
-#| msgid "Remove from Favorites"
-msgid "Remove from central columns"
-msgstr "즐겨찾기에서 삭제"
-
-#: templates/structure/actions_in_table_structure.phtml:138
-#: templates/structure/check_all_table_column.phtml:55
-#, fuzzy
-#| msgid "CHAR textarea columns"
-msgid "Add to central columns"
-msgstr "CHAR 텍스트입력 컬럼"
-
-#: templates/structure/add_column.phtml:7
-#, php-format
-msgid "Add %s column(s)"
-msgstr "%s 컬럼 추가"
-
-#: templates/structure/add_column.phtml:12
-#, fuzzy
-#| msgid "At Beginning of Table"
-msgid "at beginning of table"
-msgstr "테이블의 처음"
-
-#: templates/structure/body_for_table_summary.phtml:6
-#, php-format
-msgid "%s table"
-msgid_plural "%s tables"
-msgstr[0] "%s개 테이블"
-
-#: templates/structure/body_for_table_summary.phtml:17
-msgid "Sum"
-msgstr "계"
-
-#: templates/structure/check_all_tables.phtml:6
-msgid "Check tables having overhead"
-msgstr "오버헤드를 가진 테이블들을 체크"
-
-#: templates/structure/check_all_tables.phtml:10
-#, fuzzy
-#| msgid "Show color"
-msgid "Show create"
-msgstr "색깔 보기"
-
-#: templates/structure/check_all_tables.phtml:27
-#, fuzzy
-#| msgid "Add prefix"
-msgid "Prefix"
-msgstr "접두사 추가"
-
-#: templates/structure/check_all_tables.phtml:28
-msgid "Add prefix to table"
-msgstr "테이블에 접두사 추가"
-
-#: templates/structure/check_all_tables.phtml:29
-msgid "Replace table prefix"
-msgstr "테이블의 접두사를 교체"
-
-#: templates/structure/check_all_tables.phtml:30
-msgid "Copy table with prefix"
-msgstr "테이블에 접두사를 추가하여 복제"
-
-#: templates/structure/check_all_tables.phtml:36
-#, fuzzy
-#| msgid "CHAR textarea columns"
-msgid "Add columns to central list"
-msgstr "CHAR 텍스트입력 컬럼"
-
-#: templates/structure/check_all_tables.phtml:37
-msgid "Remove columns from central list"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:38
-#, fuzzy
-#| msgid "CHAR textarea columns"
-msgid "Make consistent with central list"
-msgstr "CHAR 텍스트입력 컬럼"
-
-#: templates/structure/display_structure.phtml:140 view_create.php:181
-msgid "Edit view"
-msgstr "뷰 편집"
-
-#: templates/structure/display_table_stats.phtml:9
-msgid "Space usage"
-msgstr "공간 사용량"
-
-#: templates/structure/display_table_stats.phtml:27
-#: templates/structure/table_header.phtml:74
-msgid "Overhead"
-msgstr "부담"
-
-#: templates/structure/display_table_stats.phtml:32
-msgid "Effective"
-msgstr "실제량"
-
-#: templates/structure/favorite_anchor.phtml:12
-msgid "Add to Favorites"
-msgstr "즐겨찾기로 추가"
-
-#: templates/structure/move_columns_dialog.phtml:1
-#: templates/structure/optional_action_links.phtml:21
-msgid "Move columns"
-msgstr "컬럼 이동"
-
-#: templates/structure/move_columns_dialog.phtml:2
-msgid "Move the columns by dragging them up and down."
-msgstr "위아래로 드래그해서 컬럼을 옮기세요."
-
-#: templates/structure/optional_action_links.phtml:9
-msgid "Propose table structure"
-msgstr "제안하는 테이블 구조"
-
-#: templates/structure/optional_action_links.phtml:24
-msgid "Improve table structure"
-msgstr "테이블 구조 개선"
-
-#: templates/structure/optional_action_links.phtml:30
-#, fuzzy
-#| msgid "Track table"
-msgid "Track view"
-msgstr "테이블 추적"
-
-#: templates/structure/row_stats_table.phtml:3
-msgid "Row statistics"
-msgstr "행(레코드) 통계"
-
-#: templates/structure/row_stats_table.phtml:9
-msgid "static"
-msgstr "정적"
-
-#: templates/structure/row_stats_table.phtml:11
-msgid "dynamic"
-msgstr "동적(다이내믹)"
-
-#: templates/structure/row_stats_table.phtml:22
-msgid "partitioned"
-msgstr "파티션 있음"
-
-#: templates/structure/row_stats_table.phtml:54
-msgid "Row length"
-msgstr "행 길이"
-
-#: templates/structure/row_stats_table.phtml:66
-msgid "Row size"
-msgstr "행 크기"
-
-#: templates/structure/row_stats_table.phtml:73
-msgid "Next autoindex"
-msgstr "다음 자동인덱스"
-
-#: templates/structure/secondary_tabs.phtml:14
-#, fuzzy
-#| msgid "Relation view"
-msgid "Relation view"
-msgstr "릴레이션 뷰"
-
-#: templates/structure/show_create.phtml:2
-msgid "Showing create queries"
-msgstr "생성 쿼리 보이기"
-
-#: templates/structure/sortable_header.phtml:13
-msgid "Sort"
-msgstr "정렬"
-
-#: templates/structure/table_header.phtml:42
-msgid ""
-"May be approximate. Click on the number to get the exact count. See "
-"[doc@faq3-11]FAQ 3.11[/doc]."
-msgstr ""
-"근사값입니다. 정확한 값을 보시려면 숫자를 클릭하세요. [doc@faq3-11]FAQ 3.11[/"
-"doc]를 참조하세요."
-
-#: templates/structure/table_structure_row.phtml:46
-#, php-format
-msgid "Column %s has been dropped."
-msgstr "컬럼 %s을 삭제했습니다."
-
-#: templates/structure/tracking_icon.phtml:4
-msgid "Tracking is active."
-msgstr "트래킹이 활성화되었습니다."
-
-#: templates/structure/tracking_icon.phtml:8
-msgid "Tracking is not active."
-msgstr "트래킹이 활성화되어 있지 않습니다."
-
-#: templates/table/create_table.phtml:15
-msgid "Number of columns"
-msgstr "컬럼수"
-
-#: templates/table/options.phtml:8
-msgid "Select columns (at least one):"
-msgstr "컬럼 선택 (하나 이상):"
-
-#: templates/table/options.phtml:37
-msgid "Add search conditions (body of the \"where\" clause):"
-msgstr "검색 조건 추가 (\"where\" 조건):"
-
-#: templates/table/options.phtml:45
-msgid "Number of rows per page"
-msgstr "페이지당 레코드 수"
-
-#: templates/table/options.phtml:56
-msgid "Display order:"
-msgstr "출력 순서:"
-
-#: templates/table/options_zoom.phtml:6
-msgid "Use this column to label each point"
-msgstr "다음 컬럼을 통해 각 포인트 레이블"
-
-#: templates/table/options_zoom.phtml:35
-msgid "Maximum rows to plot"
-msgstr "표시할 최대 열(row) 수"
-
-#: templates/table/replace_preview.phtml:13
-msgid "Find and replace - preview"
-msgstr "찾기 및 바꾸기 - 미리보기"
-
-#: templates/table/replace_preview.phtml:18
-msgid "Original string"
-msgstr "원본 문자열"
-
-#: templates/table/replace_preview.phtml:19
-msgid "Replaced string"
-msgstr "문자열 변경"
-
-#: templates/table/replace_preview.phtml:40
-msgid "Replace"
-msgstr "변경"
-
-#: templates/table/rows_zoom.phtml:16
-msgid "Additional search criteria"
-msgstr "추가적인 검색 조건"
-
-#: templates/table/search_and_replace.phtml:3
-msgid "Replace with:"
-msgstr "변경:"
-
-#: templates/table/search_and_replace.phtml:22
-msgid "Use regular expression"
-msgstr "정규표현식 사용"
-
-#: templates/table/selection_form.phtml:12
-msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
-msgstr "두 개의 다른 컬럼을 위해 다음으로 질의를 만들기 (와일드카드: \"%\")"
-
-#: templates/table/selection_form.phtml:34
-msgid "Do a \"query by example\" (wildcard: \"%\")"
-msgstr "다음으로 질의를 만들기 (와일드카드: \"%\")"
-
-#: templates/table/zoom_result_form.phtml:7
-msgid "Browse/Edit the points"
-msgstr "포인트 참조/편집"
-
-#: templates/table/zoom_result_form.phtml:15
-msgid "How to use"
-msgstr "사용방법"
-
-#: templates/table/zoom_result_form.phtml:23
-msgid "Reset zoom"
-msgstr "줌 초기화"
-
-#: templates/tbl_chart.phtml:17
+#: templates/table/chart/tbl_chart.phtml:17
 msgctxt "Chart type"
 msgid "Bar"
 msgstr "가로 막대"
 
-#: templates/tbl_chart.phtml:21
+#: templates/table/chart/tbl_chart.phtml:21
 msgctxt "Chart type"
 msgid "Column"
 msgstr "세로 막대"
 
-#: templates/tbl_chart.phtml:25
+#: templates/table/chart/tbl_chart.phtml:25
 msgctxt "Chart type"
 msgid "Line"
 msgstr "선형"
 
-#: templates/tbl_chart.phtml:29
+#: templates/table/chart/tbl_chart.phtml:29
 msgctxt "Chart type"
 msgid "Spline"
 msgstr "곡선형"
 
-#: templates/tbl_chart.phtml:33
+#: templates/table/chart/tbl_chart.phtml:33
 msgctxt "Chart type"
 msgid "Area"
 msgstr "영역"
 
-#: templates/tbl_chart.phtml:37
+#: templates/table/chart/tbl_chart.phtml:37
 msgctxt "Chart type"
 msgid "Pie"
 msgstr "원형"
 
-#: templates/tbl_chart.phtml:41
+#: templates/table/chart/tbl_chart.phtml:41
 msgctxt "Chart type"
 msgid "Timeline"
 msgstr "타임라인"
 
-#: templates/tbl_chart.phtml:45
+#: templates/table/chart/tbl_chart.phtml:45
 msgctxt "Chart type"
 msgid "Scatter"
 msgstr "산포도(점도표)"
 
-#: templates/tbl_chart.phtml:50
+#: templates/table/chart/tbl_chart.phtml:50
 msgid "Stacked"
 msgstr "누적"
 
-#: templates/tbl_chart.phtml:53
+#: templates/table/chart/tbl_chart.phtml:53
 msgid "Chart title"
 msgstr "차트 제목"
 
-#: templates/tbl_chart.phtml:57
+#: templates/table/chart/tbl_chart.phtml:57
 msgid "X-Axis:"
 msgstr "X축:"
 
-#: templates/tbl_chart.phtml:72
+#: templates/table/chart/tbl_chart.phtml:72
 msgid "Series:"
 msgstr "시리즈:"
 
-#: templates/tbl_chart.phtml:102
+#: templates/table/chart/tbl_chart.phtml:102
 msgid "X-Axis label:"
 msgstr "X축 레이블:"
 
-#: templates/tbl_chart.phtml:104
+#: templates/table/chart/tbl_chart.phtml:104
 msgid "X Values"
 msgstr "X 값"
 
-#: templates/tbl_chart.phtml:107
+#: templates/table/chart/tbl_chart.phtml:107
 msgid "Y-Axis label:"
 msgstr "Y축 레이블:"
 
-#: templates/tbl_chart.phtml:115
+#: templates/table/chart/tbl_chart.phtml:115
 msgid "Series names are in a column"
 msgstr ""
 
-#: templates/tbl_chart.phtml:118
+#: templates/table/chart/tbl_chart.phtml:118
 #, fuzzy
 #| msgid "Inside column:"
 msgid "Series column:"
 msgstr "검색할 컬럼:"
 
-#: templates/tbl_chart.phtml:130
+#: templates/table/chart/tbl_chart.phtml:130
 #, fuzzy
 #| msgid "Values for column %s"
 msgid "Value Column:"
 msgstr "\"%s\" 열의 값"
 
-#: templates/tbl_chart.phtml:150
+#: templates/table/chart/tbl_chart.phtml:150
 msgid "Save chart as image"
 msgstr "차트를 이미지 파일로 저장"
 
-#: templates/tbl_relation/common_form.phtml:7
+#: templates/table/gis_visualization/gis_visualization.phtml:3
+msgid "Display GIS Visualization"
+msgstr "공간정보 도식화 표시"
+
+#: templates/table/gis_visualization/gis_visualization.phtml:8
+#, fuzzy
+#| msgid "Inside column:"
+msgid "Label column"
+msgstr "검색할 컬럼:"
+
+#: templates/table/gis_visualization/gis_visualization.phtml:11
+msgid "-- None --"
+msgstr "-없음-"
+
+#: templates/table/gis_visualization/gis_visualization.phtml:19
+#, fuzzy
+#| msgid "Relational display column"
+msgid "Spatial column"
+msgstr "연관된 행 표시"
+
+#: templates/table/index_form.phtml:16
+msgid "Index name:"
+msgstr "인덱스 이름:"
+
+#: templates/table/index_form.phtml:19
+msgid ""
+"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
+msgstr ""
+"\"PRIMARY\"는 <b>반드시</b> 기본 키의 이름이어야 하며, 기본 키<b>만</b> 쓸 "
+"수 있는 이름입니다!"
+
+#: templates/table/index_form.phtml:40
+#, fuzzy
+#| msgid "Index cache size"
+msgid "Index choice:"
+msgstr "인덱스 캐시 크기"
+
+#: templates/table/index_form.phtml:57
+msgid "Key block size:"
+msgstr ""
+
+#: templates/table/index_form.phtml:74
+msgid "Index type:"
+msgstr "인덱스 종류:"
+
+#: templates/table/index_form.phtml:86
+#, fuzzy
+#| msgid "User:"
+msgid "Parser:"
+msgstr "사용자:"
+
+#: templates/table/index_form.phtml:102
+msgid "Comment:"
+msgstr "설명:"
+
+#: templates/table/index_form.phtml:149 templates/table/index_form.phtml:190
+#, fuzzy
+#| msgid "Drag to reorder."
+msgid "Drag to reorder"
+msgstr "재정렬하려면 드래그하세요."
+
+#: templates/table/relation/common_form.phtml:7
 msgid "Internal relations"
 msgstr "내부 릴레이션"
 
-#: templates/tbl_relation/common_form.phtml:11
+#: templates/table/relation/common_form.phtml:11
 msgid "Internal relation"
 msgstr "내부 릴레이션"
 
-#: templates/tbl_relation/common_form.phtml:14
+#: templates/table/relation/common_form.phtml:14
 msgid ""
 "An internal relation is not necessary when a corresponding FOREIGN KEY "
 "relation exists."
 msgstr ""
 "외래키 릴레이션이 있을 경우, 거기에 해당하는 내부 릴레이션은 필요 없습니다."
 
-#: templates/tbl_relation/common_form.phtml:37
+#: templates/table/relation/common_form.phtml:37
 msgid "Foreign key constraints"
 msgstr "외래키 제약"
 
-#: templates/tbl_relation/common_form.phtml:40
+#: templates/table/relation/common_form.phtml:40
 #, fuzzy
 #| msgid "Action"
 msgid "Actions"
 msgstr "실행"
 
-#: templates/tbl_relation/common_form.phtml:41
+#: templates/table/relation/common_form.phtml:41
 #, fuzzy
 #| msgid "Constraints for table"
 msgid "Constraint properties"
 msgstr "테이블의 제약사항"
 
-#: templates/tbl_relation/common_form.phtml:44
+#: templates/table/relation/common_form.phtml:44
 msgid ""
 "Only columns with index will be displayed. You can define an index below."
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:49
+#: templates/table/relation/common_form.phtml:49
 msgid "Foreign key constraint"
 msgstr "외래키 제약"
 
-#: templates/tbl_relation/common_form.phtml:81
+#: templates/table/relation/common_form.phtml:81
 msgid "+ Add constraint"
 msgstr "+ 제약조건 추가"
 
-#: templates/tbl_relation/common_form.phtml:91
+#: templates/table/relation/common_form.phtml:91
 msgid "Choose column to display:"
 msgstr "출력할 필드 선택:"
 
-#: templates/tbl_relation/foreign_key_row.phtml:13
+#: templates/table/relation/foreign_key_row.phtml:13
 #, php-format
 msgid "Foreign key constraint %s has been dropped"
 msgstr "외래키 제약 %s 가 제거되었습니다"
 
-#: templates/tbl_relation/foreign_key_row.phtml:102
+#: templates/table/relation/foreign_key_row.phtml:102
 msgid "Constraint name"
 msgstr ""
 
-#: templates/tbl_relation/foreign_key_row.phtml:157
+#: templates/table/relation/foreign_key_row.phtml:157
 #, fuzzy
 #| msgid "Add column"
 msgid "+ Add column"
 msgstr "컬럼 추가"
 
+#: templates/table/search/options.phtml:8
+msgid "Select columns (at least one):"
+msgstr "컬럼 선택 (하나 이상):"
+
+#: templates/table/search/options.phtml:37
+msgid "Add search conditions (body of the \"where\" clause):"
+msgstr "검색 조건 추가 (\"where\" 조건):"
+
+#: templates/table/search/options.phtml:45
+msgid "Number of rows per page"
+msgstr "페이지당 레코드 수"
+
+#: templates/table/search/options.phtml:56
+msgid "Display order:"
+msgstr "출력 순서:"
+
+#: templates/table/search/options_zoom.phtml:6
+msgid "Use this column to label each point"
+msgstr "다음 컬럼을 통해 각 포인트 레이블"
+
+#: templates/table/search/options_zoom.phtml:35
+msgid "Maximum rows to plot"
+msgstr "표시할 최대 열(row) 수"
+
+#: templates/table/search/replace_preview.phtml:13
+msgid "Find and replace - preview"
+msgstr "찾기 및 바꾸기 - 미리보기"
+
+#: templates/table/search/replace_preview.phtml:18
+msgid "Original string"
+msgstr "원본 문자열"
+
+#: templates/table/search/replace_preview.phtml:19
+msgid "Replaced string"
+msgstr "문자열 변경"
+
+#: templates/table/search/replace_preview.phtml:40
+msgid "Replace"
+msgstr "변경"
+
+#: templates/table/search/rows_zoom.phtml:16
+msgid "Additional search criteria"
+msgstr "추가적인 검색 조건"
+
+#: templates/table/search/search_and_replace.phtml:3
+msgid "Replace with:"
+msgstr "변경:"
+
+#: templates/table/search/search_and_replace.phtml:22
+msgid "Use regular expression"
+msgstr "정규표현식 사용"
+
+#: templates/table/search/selection_form.phtml:12
+msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
+msgstr "두 개의 다른 컬럼을 위해 다음으로 질의를 만들기 (와일드카드: \"%\")"
+
+#: templates/table/search/selection_form.phtml:34
+msgid "Do a \"query by example\" (wildcard: \"%\")"
+msgstr "다음으로 질의를 만들기 (와일드카드: \"%\")"
+
+#: templates/table/search/zoom_result_form.phtml:7
+msgid "Browse/Edit the points"
+msgstr "포인트 참조/편집"
+
+#: templates/table/search/zoom_result_form.phtml:15
+msgid "How to use"
+msgstr "사용방법"
+
+#: templates/table/search/zoom_result_form.phtml:23
+msgid "Reset zoom"
+msgstr "줌 초기화"
+
+#: templates/table/secondary_tabs.phtml:14
+#, fuzzy
+#| msgid "Relation view"
+msgid "Relation view"
+msgstr "릴레이션 뷰"
+
+#: templates/table/structure/actions_in_table_structure.phtml:14
+#, php-format
+msgid "A primary key has been added on %s."
+msgstr "%s에 기본 키가 추가되었습니다."
+
+#: templates/table/structure/actions_in_table_structure.phtml:34
+#: templates/table/structure/actions_in_table_structure.phtml:54
+#: templates/table/structure/actions_in_table_structure.phtml:79
+#: templates/table/structure/actions_in_table_structure.phtml:101
+#, php-format
+msgid "An index has been added on %s."
+msgstr "%s에 인덱스를 추가했습니다."
+
+#: templates/table/structure/actions_in_table_structure.phtml:130
+#: templates/table/structure/check_all_table_column.phtml:59
+#, fuzzy
+#| msgid "Remove from Favorites"
+msgid "Remove from central columns"
+msgstr "즐겨찾기에서 삭제"
+
+#: templates/table/structure/actions_in_table_structure.phtml:138
+#: templates/table/structure/check_all_table_column.phtml:55
+#, fuzzy
+#| msgid "CHAR textarea columns"
+msgid "Add to central columns"
+msgstr "CHAR 텍스트입력 컬럼"
+
+#: templates/table/structure/add_column.phtml:7
+#, php-format
+msgid "Add %s column(s)"
+msgstr "%s 컬럼 추가"
+
+#: templates/table/structure/add_column.phtml:12
+#, fuzzy
+#| msgid "At Beginning of Table"
+msgid "at beginning of table"
+msgstr "테이블의 처음"
+
+#: templates/table/structure/display_structure.phtml:140 view_create.php:181
+msgid "Edit view"
+msgstr "뷰 편집"
+
+#: templates/table/structure/display_table_stats.phtml:9
+msgid "Space usage"
+msgstr "공간 사용량"
+
+#: templates/table/structure/display_table_stats.phtml:32
+msgid "Effective"
+msgstr "실제량"
+
+#: templates/table/structure/move_columns_dialog.phtml:1
+#: templates/table/structure/optional_action_links.phtml:21
+msgid "Move columns"
+msgstr "컬럼 이동"
+
+#: templates/table/structure/move_columns_dialog.phtml:2
+msgid "Move the columns by dragging them up and down."
+msgstr "위아래로 드래그해서 컬럼을 옮기세요."
+
+#: templates/table/structure/optional_action_links.phtml:9
+msgid "Propose table structure"
+msgstr "제안하는 테이블 구조"
+
+#: templates/table/structure/optional_action_links.phtml:24
+msgid "Improve table structure"
+msgstr "테이블 구조 개선"
+
+#: templates/table/structure/optional_action_links.phtml:30
+#, fuzzy
+#| msgid "Track table"
+msgid "Track view"
+msgstr "테이블 추적"
+
+#: templates/table/structure/row_stats_table.phtml:3
+msgid "Row statistics"
+msgstr "행(레코드) 통계"
+
+#: templates/table/structure/row_stats_table.phtml:9
+msgid "static"
+msgstr "정적"
+
+#: templates/table/structure/row_stats_table.phtml:11
+msgid "dynamic"
+msgstr "동적(다이내믹)"
+
+#: templates/table/structure/row_stats_table.phtml:22
+msgid "partitioned"
+msgstr "파티션 있음"
+
+#: templates/table/structure/row_stats_table.phtml:54
+msgid "Row length"
+msgstr "행 길이"
+
+#: templates/table/structure/row_stats_table.phtml:66
+msgid "Row size"
+msgstr "행 크기"
+
+#: templates/table/structure/row_stats_table.phtml:73
+msgid "Next autoindex"
+msgstr "다음 자동인덱스"
+
+#: templates/table/structure/table_structure_row.phtml:46
+#, php-format
+msgid "Column %s has been dropped."
+msgstr "컬럼 %s을 삭제했습니다."
+
 #: themes.php:17 themes.php:22
 msgid "Theme"
 msgstr "테마"
diff --git a/po/ksh.po b/po/ksh.po
index cbf83f8120..11d72b6284 100644
--- a/po/ksh.po
+++ b/po/ksh.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 4.5.0-dev\n"
 "Report-Msgid-Bugs-To: developers@phpmyadmin.net\n"
-"POT-Creation-Date: 2015-08-08 13:53-0400\n"
+"POT-Creation-Date: 2015-08-12 08:10-0400\n"
 "PO-Revision-Date: 2014-10-02 15:09+0200\n"
 "Last-Translator: Purodha <publi@web.de>\n"
 "Language-Team: Colognian <https://hosted.weblate.org/projects/phpmyadmin/"
@@ -58,7 +58,7 @@ msgid "Table comments:"
 msgstr ""
 
 #: db_datadict.php:104 libraries/Index.class.php:699
-#: libraries/insert_edit.lib.php:1567
+#: libraries/insert_edit.lib.php:1565
 #: libraries/navigation/Nodes/Node_Column.class.php:30
 #: libraries/plugins/export/ExportHtmlword.class.php:280
 #: libraries/plugins/export/ExportHtmlword.class.php:375
@@ -72,13 +72,14 @@ msgstr ""
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1023
 #: libraries/tracking.lib.php:879 libraries/tracking.lib.php:975
 #: templates/columns_definitions/column_name.phtml:18
-#: templates/index_form.phtml:124 templates/table/table_header.phtml:6
-#: templates/table/zoom_result_form.phtml:33
-#: templates/tbl_relation/common_form.phtml:10
-#: templates/tbl_relation/common_form.phtml:43
-#: templates/tbl_relation/foreign_key_row.phtml:194
-#: templates/tbl_relation/foreign_key_row.phtml:206
-#: templates/tbl_relation/internal_relational_row.phtml:71
+#: templates/table/index_form.phtml:124
+#: templates/table/relation/common_form.phtml:10
+#: templates/table/relation/common_form.phtml:43
+#: templates/table/relation/foreign_key_row.phtml:194
+#: templates/table/relation/foreign_key_row.phtml:206
+#: templates/table/relation/internal_relational_row.phtml:71
+#: templates/table/search/table_header.phtml:6
+#: templates/table/search/zoom_result_form.phtml:33
 msgid "Column"
 msgstr "Kolonn"
 
@@ -96,21 +97,21 @@ msgstr "Kolonn"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1001
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1024
 #: libraries/rte/rte_list.lib.php:75 libraries/rte/rte_list.lib.php:103
-#: libraries/rte/rte_routines.lib.php:802
-#: libraries/rte/rte_routines.lib.php:831
-#: libraries/rte/rte_routines.lib.php:1493
+#: libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_routines.lib.php:922
+#: libraries/rte/rte_routines.lib.php:1584
 #: libraries/server_privileges.lib.php:2369 libraries/tracking.lib.php:880
 #: libraries/tracking.lib.php:972
 #: templates/columns_definitions/table_fields_definitions.phtml:11
-#: templates/structure/table_header.phtml:48
-#: templates/structure/table_structure_header.phtml:6
-#: templates/table/table_header.phtml:7
+#: templates/database/structure/table_header.phtml:48
+#: templates/table/search/table_header.phtml:7
+#: templates/table/structure/table_structure_header.phtml:6
 msgid "Type"
 msgstr "Zoot"
 
 #: db_datadict.php:106 libraries/Index.class.php:702
 #: libraries/central_columns.lib.php:708
-#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1576
+#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1574
 #: libraries/plugins/export/ExportHtmlword.class.php:286
 #: libraries/plugins/export/ExportHtmlword.class.php:381
 #: libraries/plugins/export/ExportLatex.class.php:509
@@ -123,8 +124,8 @@ msgstr "Zoot"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1026
 #: libraries/tracking.lib.php:882 libraries/tracking.lib.php:978
 #: templates/columns_definitions/table_fields_definitions.phtml:39
-#: templates/structure/table_structure_header.phtml:9
-#: templates/table/zoom_result_form.phtml:34
+#: templates/table/search/zoom_result_form.phtml:34
+#: templates/table/structure/table_structure_header.phtml:9
 msgid "Null"
 msgstr "Null"
 
@@ -142,8 +143,8 @@ msgstr "Null"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1027
 #: libraries/replication_gui.lib.php:153 libraries/tracking.lib.php:883
 #: templates/columns_definitions/table_fields_definitions.phtml:25
-#: templates/structure/body_for_table_summary.phtml:55
-#: templates/structure/table_structure_header.phtml:10
+#: templates/database/structure/body_for_table_summary.phtml:55
+#: templates/table/structure/table_structure_header.phtml:10
 msgid "Default"
 msgstr "Schtandatt"
 
@@ -171,19 +172,19 @@ msgid "Comments"
 msgstr ""
 
 #: db_datadict.php:146
-#: libraries/controllers/StructureController.class.php:1960
-#: libraries/controllers/StructureController.class.php:1965
+#: libraries/controllers/TableStructureController.class.php:951
+#: libraries/controllers/TableStructureController.class.php:956
 #: libraries/tracking.lib.php:922
 #: templates/columns_definitions/column_indexes.phtml:6
-#: templates/structure/check_all_table_column.phtml:22
-#: templates/structure/display_structure.phtml:74
+#: templates/table/structure/check_all_table_column.phtml:22
+#: templates/table/structure/display_structure.phtml:74
 msgid "Primary"
 msgstr ""
 
 #: db_datadict.php:156 js/messages.php:317 libraries/Index.class.php:567
 #: libraries/Index.class.php:606 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261 libraries/mult_submits.lib.php:403
+#: libraries/config/FormDisplay.tpl.php:272 libraries/mult_submits.lib.php:403
 #: libraries/mult_submits.lib.php:417
 #: libraries/plugins/export/ExportHtmlword.class.php:630
 #: libraries/plugins/export/ExportLatex.class.php:589
@@ -199,20 +200,20 @@ msgstr ""
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1010 libraries/tracking.lib.php:1015
 #: prefs_manage.php:140 templates/prefs_autoload.phtml:15
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "No"
 msgstr "Nä"
 
 #: db_datadict.php:156 js/messages.php:443 libraries/Index.class.php:568
 #: libraries/Index.class.php:605 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261
-#: libraries/controllers/StructureController.class.php:1344
-#: libraries/controllers/StructureController.class.php:2223
-#: libraries/controllers/StructureController.class.php:2232
-#: libraries/controllers/StructureController.class.php:2237
-#: libraries/controllers/StructureController.class.php:2242
-#: libraries/controllers/StructureController.class.php:2247
+#: libraries/config/FormDisplay.tpl.php:272
+#: libraries/controllers/TableStructureController.class.php:539
+#: libraries/controllers/TableStructureController.class.php:1201
+#: libraries/controllers/TableStructureController.class.php:1210
+#: libraries/controllers/TableStructureController.class.php:1215
+#: libraries/controllers/TableStructureController.class.php:1220
+#: libraries/controllers/TableStructureController.class.php:1225
 #: libraries/mult_submits.inc.php:82 libraries/mult_submits.inc.php:178
 #: libraries/mult_submits.lib.php:339 libraries/mult_submits.lib.php:372
 #: libraries/mult_submits.lib.php:401 libraries/mult_submits.lib.php:415
@@ -221,8 +222,8 @@ msgstr "Nä"
 #: libraries/plugins/export/ExportOdt.class.php:756
 #: libraries/plugins/export/ExportTexytext.class.php:567
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1077
-#: libraries/server_databases.lib.php:464
-#: libraries/server_databases.lib.php:474
+#: libraries/server_databases.lib.php:475
+#: libraries/server_databases.lib.php:485
 #: libraries/server_privileges.lib.php:2546
 #: libraries/server_privileges.lib.php:2727
 #: libraries/server_privileges.lib.php:2748
@@ -232,7 +233,7 @@ msgstr "Nä"
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1008 libraries/tracking.lib.php:1013
 #: prefs_manage.php:138 templates/prefs_autoload.phtml:14
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "Yes"
 msgstr "Joh"
 
@@ -242,7 +243,7 @@ msgstr ""
 
 #: db_export.php:37 db_tracking.php:90 export.php:382
 #: libraries/DBQbe.class.php:326
-#: libraries/controllers/StructureController.class.php:231
+#: libraries/controllers/DatabaseStructureController.class.php:170
 #: libraries/navigation/NavigationTree.class.php:897
 msgid "No tables found in database."
 msgstr ""
@@ -253,14 +254,14 @@ msgstr ""
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:26
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:120
-#: templates/structure/show_create.phtml:18
+#: templates/database/structure/show_create.phtml:18
 msgid "Tables"
 msgstr ""
 
 #: db_export.php:52 libraries/Menu.class.php:317 libraries/Menu.class.php:425
-#: libraries/Util.class.php:3333 libraries/Util.class.php:3343
-#: libraries/Util.class.php:3349 libraries/Util.class.php:3629
-#: libraries/Util.class.php:4327 libraries/Util.class.php:4344
+#: libraries/Util.class.php:3339 libraries/Util.class.php:3349
+#: libraries/Util.class.php:3355 libraries/Util.class.php:3635
+#: libraries/Util.class.php:4333 libraries/Util.class.php:4350
 #: libraries/central_columns.lib.php:728 libraries/config.values.php:39
 #: libraries/config.values.php:47 libraries/config.values.php:109
 #: libraries/config.values.php:115 libraries/config/setup.forms.php:323
@@ -274,7 +275,7 @@ msgstr ""
 #: libraries/navigation/Nodes/Node_Table.class.php:283
 #: libraries/server_privileges.lib.php:1141 libraries/tracking.lib.php:874
 #: templates/columns_definitions/table_fields_definitions.phtml:3
-#: templates/designer/table_list.phtml:28
+#: templates/database/designer/table_list.phtml:28
 msgid "Structure"
 msgstr ""
 
@@ -286,7 +287,7 @@ msgstr ""
 #: libraries/config/user_preferences.forms.php:292
 #: libraries/config/user_preferences.forms.php:297
 #: libraries/server_privileges.lib.php:1140
-#: templates/structure/display_table_stats.phtml:12
+#: templates/table/structure/display_table_stats.phtml:12
 msgid "Data"
 msgstr ""
 
@@ -358,10 +359,10 @@ msgstr ""
 #: libraries/server_privileges.lib.php:2908
 #: libraries/server_privileges.lib.php:3145
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4346
-#: templates/structure/table_header.phtml:21
-#: templates/tbl_relation/foreign_key_row.phtml:176
-#: templates/tbl_relation/internal_relational_row.phtml:63
+#: libraries/server_privileges.lib.php:4372
+#: templates/database/structure/table_header.phtml:21
+#: templates/table/relation/foreign_key_row.phtml:176
+#: templates/table/relation/internal_relational_row.phtml:63
 msgid "Table"
 msgstr "Tabäll"
 
@@ -378,7 +379,7 @@ msgid "Updated"
 msgstr ""
 
 #: db_tracking.php:130 js/messages.php:243 libraries/Menu.class.php:552
-#: libraries/Util.class.php:4314 libraries/config.values.php:104
+#: libraries/Util.class.php:4320 libraries/config.values.php:104
 #: libraries/rte/rte_events.lib.php:393 libraries/rte/rte_list.lib.php:101
 #: libraries/server_status_processes.lib.php:92 libraries/tracking.lib.php:279
 msgid "Status"
@@ -387,14 +388,15 @@ msgstr ""
 #: db_tracking.php:131 db_tracking.php:290 libraries/Index.class.php:693
 #: libraries/central_columns.lib.php:687 libraries/rte/rte_list.lib.php:74
 #: libraries/rte/rte_list.lib.php:89 libraries/rte/rte_list.lib.php:102
-#: libraries/server_databases.lib.php:398
+#: libraries/server_databases.lib.php:409
 #: libraries/server_privileges.lib.php:2372
 #: libraries/server_privileges.lib.php:3166
 #: libraries/server_privileges.lib.php:3342
 #: libraries/server_user_groups.lib.php:82
 #: libraries/server_variables.lib.php:189 libraries/tracking.lib.php:280
-#: libraries/tracking.lib.php:793 templates/structure/table_header.phtml:30
-#: templates/structure/table_structure_header.phtml:23
+#: libraries/tracking.lib.php:793
+#: templates/database/structure/table_header.phtml:30
+#: templates/table/structure/table_structure_header.phtml:23
 msgid "Action"
 msgstr ""
 
@@ -436,7 +438,7 @@ msgid "Untracked tables"
 msgstr ""
 
 #: db_tracking.php:305 db_tracking.php:336
-#: templates/structure/optional_action_links.phtml:17
+#: templates/table/structure/optional_action_links.phtml:17
 msgid "Track table"
 msgstr ""
 
@@ -486,7 +488,7 @@ msgid "Value for the column \"%s\""
 msgstr ""
 
 #: gis_data_editor.php:146
-#: templates/gis_visualization/gis_visualization.phtml:37
+#: templates/table/gis_visualization/gis_visualization.phtml:37
 msgid "Use OpenStreetMaps as Base Layer"
 msgstr ""
 
@@ -566,35 +568,35 @@ msgstr ""
 #: libraries/display_change_password.lib.php:162
 #: libraries/display_export.lib.php:402 libraries/display_export.lib.php:408
 #: libraries/display_import.lib.php:392 libraries/index.lib.php:44
-#: libraries/insert_edit.lib.php:1546 libraries/insert_edit.lib.php:1583
+#: libraries/insert_edit.lib.php:1544 libraries/insert_edit.lib.php:1581
 #: libraries/normalization.lib.php:165 libraries/normalization.lib.php:821
 #: libraries/operations.lib.php:38 libraries/operations.lib.php:108
 #: libraries/operations.lib.php:263 libraries/operations.lib.php:306
 #: libraries/operations.lib.php:801 libraries/operations.lib.php:874
 #: libraries/operations.lib.php:923 libraries/operations.lib.php:1337
 #: libraries/operations.lib.php:1658
-#: libraries/plugins/auth/AuthenticationCookie.class.php:244
+#: libraries/plugins/auth/AuthenticationCookie.class.php:232
 #: libraries/replication_gui.lib.php:122 libraries/replication_gui.lib.php:161
 #: libraries/replication_gui.lib.php:324 libraries/replication_gui.lib.php:461
 #: libraries/replication_gui.lib.php:906 libraries/rte/rte_events.lib.php:509
-#: libraries/rte/rte_routines.lib.php:969
-#: libraries/rte/rte_routines.lib.php:1581
+#: libraries/rte/rte_routines.lib.php:1060
+#: libraries/rte/rte_routines.lib.php:1672
 #: libraries/rte/rte_triggers.lib.php:396 libraries/server_bin_log.lib.php:61
 #: libraries/server_privileges.lib.php:705
 #: libraries/server_privileges.lib.php:2106
 #: libraries/server_privileges.lib.php:2872
 #: libraries/server_privileges.lib.php:3553
-#: libraries/server_privileges.lib.php:4627
+#: libraries/server_privileges.lib.php:4653
 #: libraries/server_user_groups.lib.php:285
 #: libraries/sql_query_form.lib.php:369 libraries/sql_query_form.lib.php:429
 #: libraries/tracking.lib.php:533 libraries/tracking.lib.php:653
 #: prefs_manage.php:277 prefs_manage.php:355
 #: templates/columns_definitions/column_definitions_form.phtml:59
-#: templates/header_location.phtml:17 templates/index_form.phtml:238
+#: templates/database/create_table.phtml:21 templates/header_location.phtml:28
 #: templates/startAndNumberOfRowsPanel.phtml:14
-#: templates/structure/add_column.phtml:25
-#: templates/table/create_table.phtml:21
-#: templates/table/selection_form.phtml:75 view_create.php:275
+#: templates/table/index_form.phtml:238
+#: templates/table/search/selection_form.phtml:75
+#: templates/table/structure/add_column.phtml:25 view_create.php:275
 #: view_operations.php:106
 msgid "Go"
 msgstr ""
@@ -674,7 +676,7 @@ msgstr ""
 msgid "Could not load import plugins, please check your installation!"
 msgstr ""
 
-#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1466
+#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1460
 #, php-format
 msgid "Bookmark %s has been created."
 msgstr ""
@@ -708,11 +710,11 @@ msgstr ""
 msgid "Back"
 msgstr ""
 
-#: index.php:148 libraries/Footer.class.php:70
+#: index.php:149 libraries/Footer.class.php:70
 msgid "phpMyAdmin Demo Server"
 msgstr ""
 
-#: index.php:152
+#: index.php:153
 #, php-format
 msgid ""
 "You are using the demo server. You can do anything here, but please do not "
@@ -720,112 +722,112 @@ msgid ""
 "at %s."
 msgstr ""
 
-#: index.php:162
+#: index.php:163
 msgid "General Settings"
 msgstr ""
 
-#: index.php:190 libraries/display_change_password.lib.php:50
+#: index.php:191 libraries/display_change_password.lib.php:50
 #: libraries/display_change_password.lib.php:53 user_password.php:247
 msgid "Change password"
 msgstr ""
 
-#: index.php:206
+#: index.php:207
 msgid "Server connection collation"
 msgstr ""
 
-#: index.php:228
+#: index.php:229
 msgid "Appearance Settings"
 msgstr ""
 
-#: index.php:258 prefs_manage.php:285
+#: index.php:259 prefs_manage.php:285
 msgid "More settings"
 msgstr ""
 
-#: index.php:279
+#: index.php:280
 msgid "Database server"
 msgstr ""
 
-#: index.php:282 libraries/plugins/auth/AuthenticationCookie.class.php:181
+#: index.php:283 libraries/plugins/auth/AuthenticationCookie.class.php:169
 msgid "Server:"
 msgstr ""
 
-#: index.php:286
+#: index.php:287
 msgid "Server type:"
 msgstr ""
 
-#: index.php:290 libraries/plugins/export/ExportLatex.class.php:212
+#: index.php:291 libraries/plugins/export/ExportLatex.class.php:212
 #: libraries/plugins/export/ExportSql.class.php:687
 #: libraries/plugins/export/ExportXml.class.php:189
 msgid "Server version:"
 msgstr ""
 
-#: index.php:296
+#: index.php:297
 msgid "Protocol version:"
 msgstr ""
 
-#: index.php:300
+#: index.php:301
 msgid "User:"
 msgstr ""
 
-#: index.php:305
+#: index.php:306
 msgid "Server charset:"
 msgstr ""
 
-#: index.php:320
+#: index.php:321
 msgid "Web server"
 msgstr ""
 
-#: index.php:331
+#: index.php:332
 msgid "Database client version:"
 msgstr ""
 
-#: index.php:335
+#: index.php:336
 msgid "PHP extension:"
 msgstr ""
 
-#: index.php:349
+#: index.php:350
 #, fuzzy
 #| msgid "Versions"
 msgid "PHP version:"
 msgstr "Väsjohne"
 
-#: index.php:360
+#: index.php:361
 msgid "Show PHP information"
 msgstr ""
 
-#: index.php:383
+#: index.php:384
 msgid "Version information:"
 msgstr ""
 
-#: index.php:392 libraries/Util.class.php:432 libraries/Util.class.php:495
-#: libraries/config/FormDisplay.tpl.php:151
+#: index.php:393 libraries/Util.class.php:432 libraries/Util.class.php:495
+#: libraries/config/FormDisplay.tpl.php:162
 #: libraries/display_export.lib.php:577 libraries/engines/pbxt.lib.php:162
 #: libraries/navigation/NavigationHeader.class.php:196
 #: libraries/server_variables.lib.php:160
 msgid "Documentation"
 msgstr ""
 
-#: index.php:399
+#: index.php:400
 msgid "Wiki"
 msgstr ""
 
-#: index.php:408
+#: index.php:409
 msgid "Official Homepage"
 msgstr ""
 
-#: index.php:415
+#: index.php:416
 msgid "Contribute"
 msgstr ""
 
-#: index.php:422
+#: index.php:423
 msgid "Get support"
 msgstr ""
 
-#: index.php:429
+#: index.php:430
 msgid "List of changes"
 msgstr ""
 
-#: index.php:451
+#: index.php:452
 msgid ""
 "You are connected as 'root' with no password, which corresponds to the "
 "default MySQL privileged account. Your MySQL server is running with this "
@@ -833,21 +835,21 @@ msgid ""
 "by setting a password for user 'root'."
 msgstr ""
 
-#: index.php:468
+#: index.php:469
 msgid ""
 "You have enabled mbstring.func_overload in your PHP configuration. This "
 "option is incompatible with phpMyAdmin and might cause some data to be "
 "corrupted!"
 msgstr ""
 
-#: index.php:483
+#: index.php:484
 msgid ""
 "The mbstring PHP extension was not found and you seem to be using a "
 "multibyte charset. Without the mbstring extension phpMyAdmin is unable to "
 "split strings correctly and it may result in unexpected results."
 msgstr ""
 
-#: index.php:500
+#: index.php:501
 msgid ""
 "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini."
 "session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower than "
@@ -855,17 +857,17 @@ msgid ""
 "expire sooner than configured in phpMyAdmin."
 msgstr ""
 
-#: index.php:519
+#: index.php:520
 msgid ""
 "Login cookie store is lower than cookie validity configured in phpMyAdmin, "
 "because of this, your login will expire sooner than configured in phpMyAdmin."
 msgstr ""
 
-#: index.php:535
+#: index.php:536
 msgid "The configuration file now needs a secret passphrase (blowfish_secret)."
 msgstr ""
 
-#: index.php:548
+#: index.php:549
 msgid ""
 "Directory [code]config[/code], which is used by the setup script, still "
 "exists in your phpMyAdmin directory. It is strongly recommended to remove it "
@@ -873,26 +875,26 @@ msgid ""
 "may be compromised by unauthorized people downloading your configuration."
 msgstr ""
 
-#: index.php:564
+#: index.php:565
 #, php-format
 msgid ""
 "The phpMyAdmin configuration storage is not completely configured, some "
 "extended features have been deactivated. %sFind out why%s. "
 msgstr ""
 
-#: index.php:571
+#: index.php:572
 msgid ""
 "Or alternately go to 'Operations' tab of any database to set it up there."
 msgstr ""
 
-#: index.php:620
+#: index.php:621
 #, php-format
 msgid ""
 "Your PHP MySQL library version %s differs from your MySQL server version %s. "
 "This may cause unpredictable behavior."
 msgstr ""
 
-#: index.php:648
+#: index.php:649
 #, php-format
 msgid ""
 "Server running with Suhosin. Please refer to %sdocumentation%s for possible "
@@ -1033,8 +1035,8 @@ msgstr ""
 msgid "Save & Close"
 msgstr ""
 
-#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:404
-#: libraries/insert_edit.lib.php:1550 prefs_manage.php:361
+#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:415
+#: libraries/insert_edit.lib.php:1548 prefs_manage.php:361
 #: prefs_manage.php:372
 msgid "Reset"
 msgstr ""
@@ -1069,7 +1071,7 @@ msgstr ""
 msgid "Edit Index"
 msgstr ""
 
-#: js/messages.php:99 templates/index_form.phtml:232
+#: js/messages.php:99 templates/table/index_form.phtml:232
 #, php-format
 msgid "Add %s column(s) to index"
 msgstr ""
@@ -1090,13 +1092,14 @@ msgstr ""
 msgid "Please select column(s) for the index."
 msgstr ""
 
-#: js/messages.php:106 templates/structure/add_column.phtml:1
+#: js/messages.php:106 templates/table/structure/add_column.phtml:1
 msgid "You have to add at least one column."
 msgstr ""
 
-#: js/messages.php:109 libraries/insert_edit.lib.php:1548
+#: js/messages.php:109 libraries/insert_edit.lib.php:1546
 #: templates/columns_definitions/column_definitions_form.phtml:162
-#: templates/index_form.phtml:237 templates/tbl_relation/common_form.phtml:106
+#: templates/table/index_form.phtml:237
+#: templates/table/relation/common_form.phtml:106
 msgid "Preview SQL"
 msgstr ""
 
@@ -1113,7 +1116,7 @@ msgid "SQL query:"
 msgstr ""
 
 #. l10n: Default label for the y-Axis of Charts
-#: js/messages.php:118 templates/tbl_chart.phtml:109
+#: js/messages.php:118 templates/table/chart/tbl_chart.phtml:109
 msgid "Y Values"
 msgstr ""
 
@@ -1264,7 +1267,7 @@ msgstr ""
 msgid "Bytes received"
 msgstr ""
 
-#: js/messages.php:169 libraries/server_status.lib.php:226
+#: js/messages.php:169 libraries/server_status.lib.php:235
 msgid "Connections"
 msgstr ""
 
@@ -1321,12 +1324,12 @@ msgstr ""
 msgid "Questions"
 msgstr ""
 
-#: js/messages.php:184 libraries/server_status.lib.php:134
+#: js/messages.php:184 libraries/server_status.lib.php:143
 msgid "Traffic"
 msgstr ""
 
 #: js/messages.php:185 libraries/Menu.class.php:586
-#: libraries/Util.class.php:4318 libraries/server_status_monitor.lib.php:257
+#: libraries/Util.class.php:4324 libraries/server_status_monitor.lib.php:257
 msgid "Settings"
 msgstr ""
 
@@ -1346,8 +1349,9 @@ msgstr ""
 #: libraries/server_status_monitor.lib.php:236
 #: libraries/server_status_processes.lib.php:308
 #: templates/columns_definitions/transformation.phtml:4
-#: templates/designer/options_panel.phtml:178
-#: templates/table/options_zoom.phtml:12 templates/table/rows_zoom.phtml:26
+#: templates/database/designer/options_panel.phtml:178
+#: templates/table/search/options_zoom.phtml:12
+#: templates/table/search/rows_zoom.phtml:26
 msgid "None"
 msgstr ""
 
@@ -1615,8 +1619,8 @@ msgstr ""
 
 #: js/messages.php:270 libraries/Menu.class.php:352
 #: libraries/Menu.class.php:455 libraries/Menu.class.php:582
-#: libraries/Util.class.php:4317 libraries/Util.class.php:4332
-#: libraries/Util.class.php:4349 libraries/config/messages.inc.php:258
+#: libraries/Util.class.php:4323 libraries/Util.class.php:4338
+#: libraries/Util.class.php:4355 libraries/config/messages.inc.php:258
 #: libraries/display_import.lib.php:105
 #: libraries/server_status_monitor.lib.php:318 prefs_manage.php:238
 #: setup/frames/menu.inc.php:26
@@ -1676,13 +1680,13 @@ msgid "Formatting SQL..."
 msgstr ""
 
 #: js/messages.php:293 libraries/server_variables.lib.php:157
-#: templates/designer/aggregate_query_panel.phtml:63
-#: templates/designer/delete_relation_panel.phtml:28
-#: templates/designer/having_query_panel.phtml:117
-#: templates/designer/new_relation_panel.phtml:88
-#: templates/designer/options_panel.phtml:253
-#: templates/designer/rename_to_panel.phtml:45
-#: templates/designer/where_query_panel.phtml:83
+#: templates/database/designer/aggregate_query_panel.phtml:63
+#: templates/database/designer/delete_relation_panel.phtml:28
+#: templates/database/designer/having_query_panel.phtml:117
+#: templates/database/designer/new_relation_panel.phtml:88
+#: templates/database/designer/options_panel.phtml:253
+#: templates/database/designer/rename_to_panel.phtml:45
+#: templates/database/designer/where_query_panel.phtml:83
 msgid "Cancel"
 msgstr ""
 
@@ -1690,7 +1694,7 @@ msgstr ""
 msgid "Page-related settings"
 msgstr ""
 
-#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:402
+#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:413
 msgid "Apply"
 msgstr ""
 
@@ -1725,8 +1729,8 @@ msgstr ""
 msgid "Error text: %s"
 msgstr ""
 
-#: js/messages.php:307 libraries/db_common.inc.php:68
-#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:450
+#: js/messages.php:307 libraries/db_common.inc.php:69
+#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:461
 msgid "No databases selected."
 msgstr ""
 
@@ -1738,12 +1742,13 @@ msgstr ""
 msgid "Adding Primary Key"
 msgstr ""
 
-#: js/messages.php:310 templates/designer/aggregate_query_panel.phtml:59
-#: templates/designer/having_query_panel.phtml:113
-#: templates/designer/new_relation_panel.phtml:87
-#: templates/designer/options_panel.phtml:252
-#: templates/designer/rename_to_panel.phtml:41
-#: templates/designer/where_query_panel.phtml:82
+#: js/messages.php:310
+#: templates/database/designer/aggregate_query_panel.phtml:59
+#: templates/database/designer/having_query_panel.phtml:113
+#: templates/database/designer/new_relation_panel.phtml:87
+#: templates/database/designer/options_panel.phtml:252
+#: templates/database/designer/rename_to_panel.phtml:41
+#: templates/database/designer/where_query_panel.phtml:82
 msgid "OK"
 msgstr ""
 
@@ -1763,7 +1768,7 @@ msgstr ""
 msgid "Changing Charset"
 msgstr ""
 
-#: js/messages.php:320 libraries/Util.class.php:3217
+#: js/messages.php:320 libraries/Util.class.php:3223
 msgid "Enable foreign key checks"
 msgstr ""
 
@@ -1798,20 +1803,21 @@ msgstr ""
 #: js/messages.php:334 libraries/DisplayResults.class.php:4834
 #: libraries/DisplayResults.class.php:5092 libraries/Menu.class.php:344
 #: libraries/Menu.class.php:446 libraries/Menu.class.php:578
-#: libraries/Util.class.php:3636 libraries/Util.class.php:3637
-#: libraries/Util.class.php:4316 libraries/Util.class.php:4331
-#: libraries/Util.class.php:4348 libraries/config/messages.inc.php:252
+#: libraries/Util.class.php:3642 libraries/Util.class.php:3643
+#: libraries/Util.class.php:4322 libraries/Util.class.php:4337
+#: libraries/Util.class.php:4354 libraries/config/messages.inc.php:252
 #: libraries/display_export.lib.php:173 libraries/rte/rte_list.lib.php:146
 #: libraries/server_privileges.lib.php:2211
 #: libraries/server_privileges.lib.php:2290
 #: libraries/server_privileges.lib.php:2632
 #: libraries/server_privileges.lib.php:3356
 #: libraries/server_status_monitor.lib.php:322 prefs_manage.php:303
-#: setup/frames/menu.inc.php:27 templates/structure/check_all_tables.phtml:11
+#: setup/frames/menu.inc.php:27
+#: templates/database/structure/check_all_tables.phtml:11
 msgid "Export"
 msgstr ""
 
-#: js/messages.php:337 libraries/rte/rte_routines.lib.php:652
+#: js/messages.php:337 libraries/rte/rte_routines.lib.php:743
 msgid "ENUM/SET editor"
 msgstr ""
 
@@ -1850,7 +1856,7 @@ msgstr ""
 #: libraries/Console.class.php:214 libraries/DisplayResults.class.php:3474
 #: libraries/DisplayResults.class.php:4818 libraries/Index.class.php:723
 #: libraries/Util.class.php:706 libraries/Util.class.php:1202
-#: libraries/Util.class.php:3634 libraries/Util.class.php:3635
+#: libraries/Util.class.php:3640 libraries/Util.class.php:3641
 #: libraries/central_columns.lib.php:851
 #: libraries/central_columns.lib.php:1193
 #: libraries/config/messages.inc.php:892
@@ -1868,7 +1874,7 @@ msgstr ""
 #: libraries/server_user_groups.lib.php:129
 #: libraries/sql_query_form.lib.php:416 libraries/tracking.lib.php:477
 #: setup/frames/index.inc.php:183 setup/frames/index.inc.php:291
-#: templates/designer/delete_relation_panel.phtml:27
+#: templates/database/designer/delete_relation_panel.phtml:27
 msgid "Delete"
 msgstr ""
 
@@ -2029,11 +2035,11 @@ msgid "No dependencies selected!"
 msgstr ""
 
 #: js/messages.php:394 libraries/central_columns.lib.php:1214
-#: libraries/insert_edit.lib.php:1458 libraries/server_variables.lib.php:155
+#: libraries/insert_edit.lib.php:1456 libraries/server_variables.lib.php:155
 #: setup/frames/config.inc.php:42 setup/frames/index.inc.php:279
 #: templates/columns_definitions/column_definitions_form.phtml:165
-#: templates/gis_visualization/gis_visualization.phtml:48
-#: templates/tbl_relation/common_form.phtml:107
+#: templates/table/gis_visualization/gis_visualization.phtml:48
+#: templates/table/relation/common_form.phtml:107
 msgid "Save"
 msgstr ""
 
@@ -2110,8 +2116,8 @@ msgid "Data point content"
 msgstr ""
 
 #: js/messages.php:430 js/messages.php:562 js/messages.php:579
-#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2573
-#: templates/index_form.phtml:154 templates/index_form.phtml:194
+#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2571
+#: templates/table/index_form.phtml:154 templates/table/index_form.phtml:194
 msgid "Ignore"
 msgstr ""
 
@@ -2170,8 +2176,8 @@ msgstr ""
 msgid "Please select the primary key or a unique key!"
 msgstr ""
 
-#: js/messages.php:457 templates/designer/side_menu.phtml:91
-#: templates/designer/side_menu.phtml:94
+#: js/messages.php:457 templates/database/designer/side_menu.phtml:91
+#: templates/database/designer/side_menu.phtml:94
 msgid "Choose column to display"
 msgstr ""
 
@@ -2185,18 +2191,18 @@ msgstr ""
 msgid "Page name"
 msgstr ""
 
-#: js/messages.php:463 templates/designer/side_menu.phtml:56
-#: templates/designer/side_menu.phtml:59
+#: js/messages.php:463 templates/database/designer/side_menu.phtml:56
+#: templates/database/designer/side_menu.phtml:59
 msgid "Save page"
 msgstr ""
 
-#: js/messages.php:464 templates/designer/side_menu.phtml:63
-#: templates/designer/side_menu.phtml:66
+#: js/messages.php:464 templates/database/designer/side_menu.phtml:63
+#: templates/database/designer/side_menu.phtml:66
 msgid "Save page as"
 msgstr ""
 
-#: js/messages.php:465 templates/designer/side_menu.phtml:49
-#: templates/designer/side_menu.phtml:52
+#: js/messages.php:465 templates/database/designer/side_menu.phtml:49
+#: templates/database/designer/side_menu.phtml:52
 msgid "Open page"
 msgstr ""
 
@@ -2204,7 +2210,7 @@ msgstr ""
 msgid "Delete page"
 msgstr ""
 
-#: js/messages.php:467 templates/designer/side_menu.phtml:10
+#: js/messages.php:467 templates/database/designer/side_menu.phtml:10
 msgid "Untitled"
 msgstr ""
 
@@ -2315,7 +2321,7 @@ msgstr ""
 msgid "cancel"
 msgstr ""
 
-#: js/messages.php:499 libraries/server_status.lib.php:271
+#: js/messages.php:499 libraries/server_status.lib.php:280
 msgid "Aborted"
 msgstr ""
 
@@ -2871,7 +2877,7 @@ msgstr ""
 
 #: js/messages.php:793 libraries/Message.class.php:199
 #: libraries/Util.class.php:654 libraries/core.lib.php:245
-#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1172
+#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1170
 #: tbl_operations.php:229 view_operations.php:63
 msgid "Error"
 msgstr ""
@@ -2930,8 +2936,8 @@ msgstr ""
 msgid "per minute"
 msgstr ""
 
-#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:143
-#: libraries/server_status.lib.php:228
+#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:152
+#: libraries/server_status.lib.php:237
 #: libraries/server_status_queries.lib.php:98
 msgid "per hour"
 msgstr ""
@@ -2949,7 +2955,7 @@ msgstr ""
 msgid "Wrong permissions on configuration file, should not be world writable!"
 msgstr ""
 
-#: libraries/Config.class.php:1799
+#: libraries/Config.class.php:1801
 msgid "Font size"
 msgstr ""
 
@@ -2977,10 +2983,10 @@ msgstr ""
 #: libraries/server_privileges.lib.php:2890
 #: libraries/server_privileges.lib.php:3144
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4332
+#: libraries/server_privileges.lib.php:4358
 #: libraries/server_status_processes.lib.php:80
-#: templates/tbl_relation/foreign_key_row.phtml:165
-#: templates/tbl_relation/internal_relational_row.phtml:55
+#: templates/table/relation/foreign_key_row.phtml:165
+#: templates/table/relation/internal_relational_row.phtml:55
 msgid "Database"
 msgstr "Dahtebangk"
 
@@ -3074,11 +3080,11 @@ msgstr ""
 #: libraries/plugins/import/ImportMediawiki.class.php:60
 #: libraries/plugins/import/ImportOds.class.php:59
 #: libraries/plugins/import/ImportShp.class.php:57
-#: libraries/plugins/import/ImportSql.class.php:148
+#: libraries/plugins/import/ImportSql.class.php:51
 #: libraries/plugins/import/ImportXml.class.php:58
-#: libraries/rte/rte_routines.lib.php:833 templates/index_form.phtml:49
-#: templates/structure/row_stats_table.phtml:20
-#: templates/table/options.phtml:2
+#: libraries/rte/rte_routines.lib.php:924 templates/table/index_form.phtml:49
+#: templates/table/search/options.phtml:2
+#: templates/table/structure/row_stats_table.phtml:20
 msgid "Options"
 msgstr ""
 
@@ -3111,7 +3117,8 @@ msgstr ""
 msgid "Order:"
 msgstr ""
 
-#: libraries/Console.class.php:289 templates/table/replace_preview.phtml:17
+#: libraries/Console.class.php:289
+#: templates/table/search/replace_preview.phtml:17
 msgid "Count"
 msgstr ""
 
@@ -3212,9 +3219,9 @@ msgstr ""
 #: libraries/operations.lib.php:794 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:191
-#: templates/structure/sortable_header.phtml:21
-#: templates/structure/sortable_header.phtml:38
-#: templates/table/options.phtml:68
+#: templates/database/structure/sortable_header.phtml:21
+#: templates/database/structure/sortable_header.phtml:38
+#: templates/table/search/options.phtml:68
 msgid "Ascending"
 msgstr ""
 
@@ -3224,13 +3231,14 @@ msgstr ""
 #: libraries/operations.lib.php:797 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:188
-#: templates/structure/sortable_header.phtml:26
-#: templates/structure/sortable_header.phtml:43
-#: templates/table/options.phtml:69
+#: templates/database/structure/sortable_header.phtml:26
+#: templates/database/structure/sortable_header.phtml:43
+#: templates/table/search/options.phtml:69
 msgid "Descending"
 msgstr ""
 
-#: libraries/DBQbe.class.php:467 templates/table/search_and_replace.phtml:6
+#: libraries/DBQbe.class.php:467
+#: templates/table/search/search_and_replace.phtml:6
 msgid "Column:"
 msgstr ""
 
@@ -3387,12 +3395,12 @@ msgstr[1] ""
 msgstr[2] ""
 
 #: libraries/DbSearch.class.php:354 libraries/Menu.class.php:311
-#: libraries/Util.class.php:3337 libraries/Util.class.php:3347
-#: libraries/Util.class.php:3623 libraries/Util.class.php:3624
-#: libraries/Util.class.php:4343 libraries/config.values.php:43
+#: libraries/Util.class.php:3343 libraries/Util.class.php:3353
+#: libraries/Util.class.php:3629 libraries/Util.class.php:3630
+#: libraries/Util.class.php:4349 libraries/config.values.php:43
 #: libraries/config.values.php:51 libraries/config.values.php:119
 #: libraries/navigation/Nodes/Node_Table.class.php:295
-#: templates/structure/check_all_table_column.phtml:5
+#: templates/table/structure/check_all_table_column.phtml:5
 msgid "Browse"
 msgstr ""
 
@@ -3409,7 +3417,8 @@ msgstr ""
 msgid "Words or values to search for (wildcard: \"%\"):"
 msgstr ""
 
-#: libraries/DbSearch.class.php:401 templates/table/search_and_replace.phtml:1
+#: libraries/DbSearch.class.php:401
+#: templates/table/search/search_and_replace.phtml:1
 msgid "Find:"
 msgstr ""
 
@@ -3453,28 +3462,28 @@ msgstr ""
 msgid "Search this table"
 msgstr ""
 
-#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2532
-#: libraries/Util.class.php:2535
+#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2538
+#: libraries/Util.class.php:2541
 msgctxt "First page"
 msgid "Begin"
 msgstr ""
 
-#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2533
-#: libraries/Util.class.php:2536 libraries/server_bin_log.lib.php:170
+#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2539
+#: libraries/Util.class.php:2542 libraries/server_bin_log.lib.php:170
 #: libraries/server_bin_log.lib.php:172
 msgctxt "Previous page"
 msgid "Previous"
 msgstr ""
 
-#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2564
-#: libraries/Util.class.php:2574 libraries/server_bin_log.lib.php:204
+#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2570
+#: libraries/Util.class.php:2580 libraries/server_bin_log.lib.php:204
 #: libraries/server_bin_log.lib.php:206
 msgctxt "Next page"
 msgid "Next"
 msgstr ""
 
-#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2565
-#: libraries/Util.class.php:2575
+#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2571
+#: libraries/Util.class.php:2581
 msgctxt "Last page"
 msgid "End"
 msgstr ""
@@ -3549,15 +3558,15 @@ msgid "May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]."
 msgstr ""
 
 #: libraries/DisplayResults.class.php:4332 libraries/Message.class.php:180
-#: libraries/controllers/TableRelationController.class.php:258
+#: libraries/controllers/TableRelationController.class.php:259
 #: libraries/controllers/TableSearchController.class.php:655
-#: libraries/rte/rte_routines.lib.php:1332 libraries/sql_query_form.lib.php:89
+#: libraries/rte/rte_routines.lib.php:1423 libraries/sql_query_form.lib.php:89
 #: tbl_operations.php:227 tbl_row_action.php:138 view_operations.php:62
 msgid "Your SQL query has been executed successfully."
 msgstr ""
 
 #: libraries/DisplayResults.class.php:4660
-#: libraries/controllers/StructureController.class.php:629
+#: libraries/controllers/DatabaseStructureController.class.php:564
 #, php-format
 msgid ""
 "This view has at least this number of rows. Please refer to %sdocumentation"
@@ -3579,33 +3588,33 @@ msgstr ""
 msgid "%d total"
 msgstr ""
 
-#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1318
+#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1312
 #, php-format
 msgid "Query took %01.4f seconds."
 msgstr ""
 
 #: libraries/DisplayResults.class.php:4807
-#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4767
-#: libraries/Util.class.php:4773 libraries/mult_submits.inc.php:50
-#: templates/structure/check_all_tables.phtml:2
-#: templates/structure/check_all_tables.phtml:9
+#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4773
+#: libraries/Util.class.php:4779 libraries/mult_submits.inc.php:50
+#: templates/database/structure/check_all_tables.phtml:2
+#: templates/database/structure/check_all_tables.phtml:9
 msgid "With selected:"
 msgstr ""
 
 #: libraries/DisplayResults.class.php:4811
-#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4769
-#: libraries/Util.class.php:4770 libraries/server_privileges.lib.php:1174
+#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4775
+#: libraries/Util.class.php:4776 libraries/server_privileges.lib.php:1174
 #: libraries/server_privileges.lib.php:1175
 #: libraries/server_privileges.lib.php:1387
 #: libraries/server_user_groups.lib.php:231
-#: templates/structure/check_all_tables.phtml:3
-#: templates/structure/check_all_tables.phtml:4
+#: templates/database/structure/check_all_tables.phtml:3
+#: templates/database/structure/check_all_tables.phtml:4
 msgid "Check All"
 msgstr ""
 
 #: libraries/DisplayResults.class.php:4985 libraries/Header.class.php:383
-#: templates/structure/optional_action_links.phtml:1
-#: templates/structure/print_view_data_dictionary_link.phtml:3
+#: templates/database/structure/print_view_data_dictionary_link.phtml:3
+#: templates/table/structure/optional_action_links.phtml:1
 msgid "Print view"
 msgstr ""
 
@@ -3613,7 +3622,8 @@ msgstr ""
 msgid "Query results operations"
 msgstr ""
 
-#: libraries/DisplayResults.class.php:5105 templates/tbl_chart.phtml:12
+#: libraries/DisplayResults.class.php:5105
+#: templates/table/chart/tbl_chart.phtml:12
 msgid "Display chart"
 msgstr ""
 
@@ -3702,7 +3712,7 @@ msgid "Click on the bar to scroll to top of page"
 msgstr ""
 
 #: libraries/Header.class.php:749
-#: libraries/plugins/auth/AuthenticationCookie.class.php:152
+#: libraries/plugins/auth/AuthenticationCookie.class.php:140
 msgid "Javascript must be enabled past this point!"
 msgstr ""
 
@@ -3724,11 +3734,11 @@ msgid "Keyname"
 msgstr ""
 
 #: libraries/Index.class.php:697
-#: libraries/controllers/StructureController.class.php:1962
-#: libraries/controllers/StructureController.class.php:1967
+#: libraries/controllers/TableStructureController.class.php:953
+#: libraries/controllers/TableStructureController.class.php:958
 #: libraries/tracking.lib.php:973
 #: templates/columns_definitions/column_indexes.phtml:11
-#: templates/structure/check_all_table_column.phtml:26
+#: templates/table/structure/check_all_table_column.phtml:26
 msgid "Unique"
 msgstr ""
 
@@ -3747,16 +3757,17 @@ msgstr ""
 #: libraries/server_collations.lib.php:35 libraries/tracking.lib.php:881
 #: libraries/tracking.lib.php:977
 #: templates/columns_definitions/table_fields_definitions.phtml:33
-#: templates/structure/row_stats_table.phtml:31
-#: templates/structure/table_header.phtml:55
-#: templates/structure/table_structure_header.phtml:7
-#: templates/table/table_header.phtml:8
+#: templates/database/structure/table_header.phtml:55
+#: templates/table/search/table_header.phtml:8
+#: templates/table/structure/row_stats_table.phtml:31
+#: templates/table/structure/table_structure_header.phtml:7
 msgid "Collation"
 msgstr ""
 
 #: libraries/Index.class.php:703 libraries/rte/rte_events.lib.php:496
-#: libraries/rte/rte_routines.lib.php:956 libraries/tracking.lib.php:885
-#: libraries/tracking.lib.php:979 templates/structure/table_header.phtml:84
+#: libraries/rte/rte_routines.lib.php:1047 libraries/tracking.lib.php:885
+#: libraries/tracking.lib.php:979
+#: templates/database/structure/table_header.phtml:84
 msgid "Comment"
 msgstr ""
 
@@ -3769,15 +3780,15 @@ msgstr ""
 msgid "Index %s has been dropped."
 msgstr ""
 
-#: libraries/Index.class.php:757 libraries/Util.class.php:3630
-#: libraries/Util.class.php:3631
-#: libraries/controllers/StructureController.class.php:1958
-#: libraries/controllers/StructureController.class.php:1959
+#: libraries/Index.class.php:757 libraries/Util.class.php:3636
+#: libraries/Util.class.php:3637
+#: libraries/controllers/TableStructureController.class.php:949
+#: libraries/controllers/TableStructureController.class.php:950
 #: libraries/operations.lib.php:1607 libraries/rte/rte_list.lib.php:150
 #: libraries/server_databases.lib.php:146
-#: templates/structure/check_all_table_column.phtml:15
-#: templates/structure/check_all_tables.phtml:16
-#: templates/tbl_relation/foreign_key_row.phtml:93
+#: templates/database/structure/check_all_tables.phtml:16
+#: templates/table/relation/foreign_key_row.phtml:93
+#: templates/table/structure/check_all_table_column.phtml:15
 msgid "Drop"
 msgstr "Falle lohße"
 
@@ -3806,16 +3817,16 @@ msgstr ""
 #: libraries/Menu.class.php:248
 #: libraries/navigation/Nodes/Node_View.class.php:32
 #: libraries/tbl_info.inc.php:63
-#: templates/structure/structure_table_row.phtml:97
-#: templates/structure/structure_table_row.phtml:159
+#: templates/database/structure/structure_table_row.phtml:97
+#: templates/database/structure/structure_table_row.phtml:159
 msgid "View"
 msgstr ""
 
 #: libraries/Menu.class.php:325 libraries/Menu.class.php:429
-#: libraries/Menu.class.php:548 libraries/Util.class.php:3334
-#: libraries/Util.class.php:3344 libraries/Util.class.php:3350
-#: libraries/Util.class.php:4313 libraries/Util.class.php:4328
-#: libraries/Util.class.php:4345 libraries/config.values.php:40
+#: libraries/Menu.class.php:548 libraries/Util.class.php:3340
+#: libraries/Util.class.php:3350 libraries/Util.class.php:3356
+#: libraries/Util.class.php:4319 libraries/Util.class.php:4334
+#: libraries/Util.class.php:4351 libraries/config.values.php:40
 #: libraries/config.values.php:48 libraries/config.values.php:110
 #: libraries/config.values.php:116 libraries/config/messages.inc.php:321
 #: libraries/navigation/Nodes/Node_Table.class.php:292
@@ -3823,19 +3834,19 @@ msgid "SQL"
 msgstr ""
 
 #: libraries/Menu.class.php:328 libraries/Menu.class.php:432
-#: libraries/Util.class.php:3335 libraries/Util.class.php:3345
-#: libraries/Util.class.php:3351 libraries/Util.class.php:3625
-#: libraries/Util.class.php:3626 libraries/Util.class.php:4329
-#: libraries/Util.class.php:4346 libraries/config.values.php:41
+#: libraries/Util.class.php:3341 libraries/Util.class.php:3351
+#: libraries/Util.class.php:3357 libraries/Util.class.php:3631
+#: libraries/Util.class.php:3632 libraries/Util.class.php:4335
+#: libraries/Util.class.php:4352 libraries/config.values.php:41
 #: libraries/config.values.php:49 libraries/config.values.php:111
 #: libraries/config.values.php:117
 #: libraries/navigation/Nodes/Node_Table.class.php:286
 msgid "Search"
 msgstr ""
 
-#: libraries/Menu.class.php:338 libraries/Util.class.php:3336
-#: libraries/Util.class.php:3346 libraries/Util.class.php:3627
-#: libraries/Util.class.php:3628 libraries/Util.class.php:4347
+#: libraries/Menu.class.php:338 libraries/Util.class.php:3342
+#: libraries/Util.class.php:3352 libraries/Util.class.php:3633
+#: libraries/Util.class.php:3634 libraries/Util.class.php:4353
 #: libraries/config.values.php:42 libraries/config.values.php:50
 #: libraries/config.values.php:118
 #: libraries/navigation/Nodes/Node_Table.class.php:289
@@ -3844,30 +3855,30 @@ msgid "Insert"
 msgstr ""
 
 #: libraries/Menu.class.php:362 libraries/Menu.class.php:467
-#: libraries/Util.class.php:4334 libraries/Util.class.php:4350
+#: libraries/Util.class.php:4340 libraries/Util.class.php:4356
 #: libraries/config.values.php:106 libraries/server_common.lib.php:51
 #: libraries/server_privileges.lib.php:2370
 #: libraries/server_privileges.lib.php:3158
-#: libraries/server_privileges.lib.php:4221
+#: libraries/server_privileges.lib.php:4247
 msgid "Privileges"
 msgstr ""
 
 #: libraries/Menu.class.php:371 libraries/Menu.class.php:379
-#: libraries/Menu.class.php:459 libraries/Util.class.php:3338
-#: libraries/Util.class.php:3352 libraries/Util.class.php:4333
-#: libraries/Util.class.php:4351 libraries/config.values.php:112
+#: libraries/Menu.class.php:459 libraries/Util.class.php:3344
+#: libraries/Util.class.php:3358 libraries/Util.class.php:4339
+#: libraries/Util.class.php:4357 libraries/config.values.php:112
 #: view_operations.php:92
 msgid "Operations"
 msgstr ""
 
 #: libraries/Menu.class.php:384 libraries/Menu.class.php:492
-#: libraries/Util.class.php:4338 libraries/Util.class.php:4352
+#: libraries/Util.class.php:4344 libraries/Util.class.php:4358
 #: libraries/relation.lib.php:255
 msgid "Tracking"
 msgstr ""
 
 #: libraries/Menu.class.php:397 libraries/Menu.class.php:486
-#: libraries/Util.class.php:4337 libraries/Util.class.php:4353
+#: libraries/Util.class.php:4343 libraries/Util.class.php:4359
 #: libraries/navigation/Nodes/Node_Trigger_Container.class.php:24
 #: libraries/plugins/export/ExportHtmlword.class.php:557
 #: libraries/plugins/export/ExportOdt.class.php:685
@@ -3884,16 +3895,16 @@ msgstr ""
 msgid "Database seems to be empty!"
 msgstr ""
 
-#: libraries/Menu.class.php:439 libraries/Util.class.php:4330
+#: libraries/Menu.class.php:439 libraries/Util.class.php:4336
 msgid "Query"
 msgstr ""
 
-#: libraries/Menu.class.php:472 libraries/Util.class.php:4335
+#: libraries/Menu.class.php:472 libraries/Util.class.php:4341
 #: libraries/rte/rte_words.lib.php:36
 msgid "Routines"
 msgstr ""
 
-#: libraries/Menu.class.php:479 libraries/Util.class.php:4336
+#: libraries/Menu.class.php:479 libraries/Util.class.php:4342
 #: libraries/navigation/Nodes/Node_Event_Container.class.php:26
 #: libraries/plugins/export/ExportSql.class.php:940
 #: libraries/plugins/export/ExportXml.class.php:107
@@ -3901,20 +3912,20 @@ msgstr ""
 msgid "Events"
 msgstr ""
 
-#: libraries/Menu.class.php:498 libraries/Util.class.php:4339
+#: libraries/Menu.class.php:498 libraries/Util.class.php:4345
 msgid "Designer"
 msgstr ""
 
-#: libraries/Menu.class.php:507 libraries/Util.class.php:4340
-#: templates/structure/check_all_tables.phtml:35
+#: libraries/Menu.class.php:507 libraries/Util.class.php:4346
+#: templates/database/structure/check_all_tables.phtml:35
 msgid "Central columns"
 msgstr ""
 
-#: libraries/Menu.class.php:544 libraries/Util.class.php:4312
+#: libraries/Menu.class.php:544 libraries/Util.class.php:4318
 #: libraries/config.values.php:103 libraries/config/messages.inc.php:266
 #: libraries/config/messages.inc.php:341
 #: libraries/navigation/NavigationTree.class.php:1239
-#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4332
+#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4358
 msgid "Databases"
 msgstr ""
 
@@ -3923,34 +3934,34 @@ msgid "User accounts"
 msgstr ""
 
 #: libraries/Menu.class.php:595 libraries/ServerStatusData.class.php:121
-#: libraries/Util.class.php:4319 libraries/server_common.lib.php:36
+#: libraries/Util.class.php:4325 libraries/server_common.lib.php:36
 msgid "Binary log"
 msgstr ""
 
 #: libraries/Menu.class.php:601 libraries/ServerStatusData.class.php:126
-#: libraries/Util.class.php:4320 libraries/server_common.lib.php:42
-#: templates/structure/body_for_table_summary.phtml:10
-#: templates/structure/table_header.phtml:27
+#: libraries/Util.class.php:4326 libraries/server_common.lib.php:42
+#: templates/database/structure/body_for_table_summary.phtml:10
+#: templates/database/structure/table_header.phtml:27
 msgid "Replication"
 msgstr ""
 
 #: libraries/Menu.class.php:606 libraries/ServerStatusData.class.php:193
-#: libraries/Util.class.php:4321 libraries/config.values.php:105
+#: libraries/Util.class.php:4327 libraries/config.values.php:105
 #: libraries/server_engines.lib.php:108 libraries/server_engines.lib.php:112
 #: libraries/sql_query_form.lib.php:421
 msgid "Variables"
 msgstr ""
 
-#: libraries/Menu.class.php:610 libraries/Util.class.php:4322
+#: libraries/Menu.class.php:610 libraries/Util.class.php:4328
 msgid "Charsets"
 msgstr ""
 
-#: libraries/Menu.class.php:615 libraries/Util.class.php:4323
+#: libraries/Menu.class.php:615 libraries/Util.class.php:4329
 #: libraries/server_common.lib.php:33 libraries/server_plugins.lib.php:27
 msgid "Plugins"
 msgstr ""
 
-#: libraries/Menu.class.php:626 libraries/Util.class.php:4324
+#: libraries/Menu.class.php:626 libraries/Util.class.php:4330
 msgid "Engines"
 msgstr ""
 
@@ -3978,7 +3989,7 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: libraries/PDF.class.php:70 libraries/Util.class.php:2521
+#: libraries/PDF.class.php:70 libraries/Util.class.php:2527
 #: libraries/browse_foreigners.lib.php:327
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:865
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:890
@@ -3999,7 +4010,7 @@ msgid "Could not save favorite table!"
 msgstr ""
 
 #: libraries/RecentFavoriteTable.class.php:212
-#: templates/structure/favorite_anchor.phtml:12
+#: templates/database/structure/favorite_anchor.phtml:12
 msgid "Remove from Favorites"
 msgstr ""
 
@@ -4166,7 +4177,7 @@ msgid ""
 msgstr ""
 
 #: libraries/StorageEngine.class.php:373
-#: templates/structure/body_for_table_summary.phtml:50
+#: templates/database/structure/body_for_table_summary.phtml:50
 #, php-format
 msgid "%s is the default storage engine on this MySQL server."
 msgstr ""
@@ -4578,10 +4589,10 @@ msgstr ""
 
 #: libraries/Util.class.php:726 libraries/rte/rte_events.lib.php:110
 #: libraries/rte/rte_events.lib.php:119 libraries/rte/rte_events.lib.php:150
-#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:153
-#: libraries/rte/rte_routines.lib.php:162
-#: libraries/rte/rte_routines.lib.php:235
-#: libraries/rte/rte_routines.lib.php:1366
+#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:223
+#: libraries/rte/rte_routines.lib.php:250
+#: libraries/rte/rte_routines.lib.php:372
+#: libraries/rte/rte_routines.lib.php:1457
 #: libraries/rte/rte_triggers.lib.php:86 libraries/rte/rte_triggers.lib.php:95
 #: libraries/rte/rte_triggers.lib.php:127
 msgid "MySQL said: "
@@ -4625,75 +4636,78 @@ msgstr ""
 msgid "%B %d, %Y at %I:%M %p"
 msgstr ""
 
-#: libraries/Util.class.php:2019
+#: libraries/Util.class.php:2025
 #, php-format
 msgid "%s days, %s hours, %s minutes and %s seconds"
 msgstr ""
 
-#: libraries/Util.class.php:2112
+#: libraries/Util.class.php:2118
 msgid "Missing parameter:"
 msgstr ""
 
-#: libraries/Util.class.php:2645
+#: libraries/Util.class.php:2651
 #, php-format
 msgid "Jump to database \"%s\"."
 msgstr ""
 
-#: libraries/Util.class.php:2670
+#: libraries/Util.class.php:2676
 #, php-format
 msgid "The %s functionality is affected by a known bug, see %s"
 msgstr ""
 
-#: libraries/Util.class.php:2881
+#: libraries/Util.class.php:2887
 msgid "Click to toggle"
 msgstr ""
 
-#: libraries/Util.class.php:3542 prefs_manage.php:248
+#: libraries/Util.class.php:3548 prefs_manage.php:248
 msgid "Browse your computer:"
 msgstr ""
 
-#: libraries/Util.class.php:3567
+#: libraries/Util.class.php:3573
 #, php-format
 msgid "Select from the web server upload directory <b>%s</b>:"
 msgstr ""
 
-#: libraries/Util.class.php:3596 libraries/insert_edit.lib.php:1173
+#: libraries/Util.class.php:3602 libraries/insert_edit.lib.php:1171
 msgid "The directory you set for upload work cannot be reached."
 msgstr ""
 
-#: libraries/Util.class.php:3607
+#: libraries/Util.class.php:3613
 msgid "There are no files to upload!"
 msgstr ""
 
-#: libraries/Util.class.php:3632 libraries/Util.class.php:3633
-#: templates/structure/check_all_tables.phtml:15
+#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: templates/database/structure/check_all_tables.phtml:15
 msgid "Empty"
 msgstr ""
 
-#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: libraries/Util.class.php:3644 libraries/Util.class.php:3645
 msgid "Execute"
 msgstr ""
 
-#: libraries/Util.class.php:4152
+#: libraries/Util.class.php:4158
 msgid "Print"
 msgstr ""
 
-#: libraries/Util.class.php:4257 templates/structure/row_stats_table.phtml:80
-#: templates/structure/table_header.phtml:95
+#: libraries/Util.class.php:4263
+#: templates/database/structure/table_header.phtml:95
+#: templates/table/structure/row_stats_table.phtml:80
 msgid "Creation"
 msgstr ""
 
-#: libraries/Util.class.php:4263 templates/structure/row_stats_table.phtml:87
-#: templates/structure/table_header.phtml:106
+#: libraries/Util.class.php:4269
+#: templates/database/structure/table_header.phtml:106
+#: templates/table/structure/row_stats_table.phtml:87
 msgid "Last update"
 msgstr ""
 
-#: libraries/Util.class.php:4269 templates/structure/row_stats_table.phtml:94
-#: templates/structure/table_header.phtml:117
+#: libraries/Util.class.php:4275
+#: templates/database/structure/table_header.phtml:117
+#: templates/table/structure/row_stats_table.phtml:94
 msgid "Last check"
 msgstr ""
 
-#: libraries/Util.class.php:4315
+#: libraries/Util.class.php:4321
 msgid "Users"
 msgstr ""
 
@@ -4714,16 +4728,16 @@ msgid "Use this value"
 msgstr ""
 
 #: libraries/build_html_for_db.lib.php:33 libraries/import.lib.php:193
-#: templates/structure/actions_in_table_structure.phtml:113
-#: templates/structure/row_stats_table.phtml:42
-#: templates/structure/table_header.phtml:36
+#: templates/database/structure/table_header.phtml:36
+#: templates/table/structure/actions_in_table_structure.phtml:113
+#: templates/table/structure/row_stats_table.phtml:42
 msgid "Rows"
 msgstr "Reije"
 
 #: libraries/build_html_for_db.lib.php:48 libraries/engines/innodb.lib.php:171
-#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:186
-#: libraries/server_status.lib.php:298
-#: templates/structure/display_table_stats.phtml:40
+#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:195
+#: libraries/server_status.lib.php:307
+#: templates/table/structure/display_table_stats.phtml:40
 msgid "Total"
 msgstr ""
 
@@ -4732,10 +4746,12 @@ msgid "Jump to database"
 msgstr ""
 
 #: libraries/build_html_for_db.lib.php:146
+#: templates/database/structure/structure_table_row.phtml:15
 msgid "Not replicated"
 msgstr ""
 
 #: libraries/build_html_for_db.lib.php:158
+#: templates/database/structure/structure_table_row.phtml:16
 msgid "Replicated"
 msgstr ""
 
@@ -4788,17 +4804,17 @@ msgstr ""
 #: libraries/plugins/export/ExportTexytext.class.php:425
 #: libraries/plugins/export/PMA_ExportPdf.class.php:307
 #: libraries/rte/rte_list.lib.php:73 libraries/rte/rte_list.lib.php:85
-#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:830
-#: libraries/rte/rte_routines.lib.php:1492 setup/frames/index.inc.php:162
+#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:921
+#: libraries/rte/rte_routines.lib.php:1583 setup/frames/index.inc.php:162
 #: templates/columns_definitions/table_fields_definitions.phtml:8
-#: templates/structure/table_structure_header.phtml:5
-#: templates/table/create_table.phtml:11
+#: templates/database/create_table.phtml:11
+#: templates/table/structure/table_structure_header.phtml:5
 msgid "Name"
 msgstr ""
 
 #: libraries/central_columns.lib.php:699
 #: libraries/central_columns.lib.php:1381
-#: libraries/rte/rte_routines.lib.php:832
+#: libraries/rte/rte_routines.lib.php:923
 #: templates/columns_definitions/table_fields_definitions.phtml:14
 msgid "Length/Values"
 msgstr ""
@@ -4819,7 +4835,7 @@ msgid "Select a table"
 msgstr "Alle ußwähle"
 
 #: libraries/central_columns.lib.php:804
-#: templates/structure/add_column.phtml:4
+#: templates/table/structure/add_column.phtml:4
 msgid "Add column"
 msgstr ""
 
@@ -4837,7 +4853,7 @@ msgstr ""
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1002
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1025
 #: templates/columns_definitions/table_fields_definitions.phtml:36
-#: templates/structure/table_structure_header.phtml:8
+#: templates/table/structure/table_structure_header.phtml:8
 msgid "Attributes"
 msgstr ""
 
@@ -4946,7 +4962,7 @@ msgid "Double click"
 msgstr ""
 
 #: libraries/config.values.php:95 libraries/config.values.php:124
-#: libraries/config/FormDisplay.tpl.php:221 libraries/relation.lib.php:97
+#: libraries/config/FormDisplay.tpl.php:232 libraries/relation.lib.php:97
 #: libraries/relation.lib.php:105
 msgid "Disabled"
 msgstr ""
@@ -5124,21 +5140,21 @@ msgstr ""
 msgid "maximum %s"
 msgstr ""
 
-#: libraries/config/FormDisplay.tpl.php:219
+#: libraries/config/FormDisplay.tpl.php:230
 msgid "This setting is disabled, it will not be applied to your configuration."
 msgstr ""
 
-#: libraries/config/FormDisplay.tpl.php:313
+#: libraries/config/FormDisplay.tpl.php:324
 #, php-format
 msgid "Set value: %s"
 msgstr ""
 
-#: libraries/config/FormDisplay.tpl.php:318
+#: libraries/config/FormDisplay.tpl.php:329
 #: libraries/config/messages.inc.php:610
 msgid "Restore default value"
 msgstr ""
 
-#: libraries/config/FormDisplay.tpl.php:332
+#: libraries/config/FormDisplay.tpl.php:343
 msgid "Allow users to customize this value"
 msgstr ""
 
@@ -5556,7 +5572,7 @@ msgstr ""
 
 #: libraries/config/messages.inc.php:136 libraries/config/messages.inc.php:152
 #: libraries/sql_query_form.lib.php:247
-#: templates/structure/row_stats_table.phtml:7
+#: templates/table/structure/row_stats_table.phtml:7
 msgid "Format"
 msgstr ""
 
@@ -6051,7 +6067,7 @@ msgstr ""
 
 #: libraries/config/messages.inc.php:332
 #: libraries/plugins/export/ExportPdf.class.php:279
-#: templates/structure/secondary_tabs.phtml:8
+#: templates/table/secondary_tabs.phtml:8
 msgid "Table structure"
 msgstr ""
 
@@ -7548,102 +7564,33 @@ msgstr ""
 msgid "OpenDocument Text"
 msgstr ""
 
-#: libraries/controllers/StructureController.class.php:465
+#: libraries/controllers/DatabaseStructureController.class.php:405
 #: tbl_operations.php:382
 #, php-format
 msgid "Table %s has been emptied."
 msgstr ""
 
-#: libraries/controllers/StructureController.class.php:486
+#: libraries/controllers/DatabaseStructureController.class.php:426
 #: tbl_operations.php:400 view_operations.php:119
 #, php-format
 msgid "View %s has been dropped."
 msgstr ""
 
-#: libraries/controllers/StructureController.class.php:487
+#: libraries/controllers/DatabaseStructureController.class.php:427
 #: tbl_operations.php:401
 #, php-format
 msgid "Table %s has been dropped."
 msgstr ""
 
-#: libraries/controllers/StructureController.class.php:797
-#, php-format
-msgid "The name '%s' is a MySQL reserved keyword."
-msgid_plural "The names '%s' are MySQL reserved keywords."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: libraries/controllers/StructureController.class.php:875
-msgid "No column selected."
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1049
+#: libraries/controllers/DatabaseStructureController.class.php:733
 msgid "Favorite List is full!"
 msgstr ""
 
-#: libraries/controllers/StructureController.class.php:1272
-msgid "The columns have been moved successfully."
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1535
-#, php-format
-msgid ""
-"Table %1$s has been altered successfully. Privileges have been adjusted."
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1541
-#: libraries/controllers/TableIndexesController.class.php:161
-#: tbl_addfield.php:92
-#, php-format
-msgid "Table %1$s has been altered successfully."
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1588
-#: libraries/tracking.lib.php:1094
-msgid "Query error"
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1806
+#: libraries/controllers/DatabaseStructureController.class.php:947
 #: libraries/mysql_charsets.lib.php:366 libraries/mysql_charsets.lib.php:373
 msgid "unknown"
 msgstr ""
 
-#: libraries/controllers/StructureController.class.php:1957
-#: templates/structure/check_all_table_column.phtml:11
-msgid "Change"
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1961
-#: libraries/controllers/StructureController.class.php:1966
-#: libraries/navigation/Nodes/Node_Index.class.php:30
-#: libraries/tracking.lib.php:926
-#: templates/columns_definitions/column_indexes.phtml:16
-#: templates/columns_definitions/table_fields_definitions.phtml:57
-#: templates/structure/check_all_table_column.phtml:30
-#: templates/structure/display_structure.phtml:79
-#: templates/structure/display_table_stats.phtml:19
-msgid "Index"
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1963
-#: libraries/controllers/StructureController.class.php:1968
-#: templates/columns_definitions/column_indexes.phtml:27
-#: templates/structure/check_all_table_column.phtml:37
-msgid "Spatial"
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1964
-#: libraries/controllers/StructureController.class.php:1969
-#: templates/columns_definitions/column_indexes.phtml:22
-#: templates/structure/check_all_table_column.phtml:47
-msgid "Fulltext"
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1970
-msgid "Distinct values"
-msgstr ""
-
 #: libraries/controllers/TableChartController.class.php:82
 #: libraries/controllers/TableGisVisualizationController.class.php:101
 msgid "No SQL query was set to fetch data."
@@ -7657,11 +7604,18 @@ msgstr ""
 msgid "No data to display"
 msgstr ""
 
-#: libraries/controllers/TableRelationController.class.php:217
+#: libraries/controllers/TableIndexesController.class.php:161
+#: libraries/controllers/TableStructureController.class.php:736
+#: tbl_addfield.php:92
+#, php-format
+msgid "Table %1$s has been altered successfully."
+msgstr ""
+
+#: libraries/controllers/TableRelationController.class.php:218
 msgid "Display column was successfully updated."
 msgstr ""
 
-#: libraries/controllers/TableRelationController.class.php:283
+#: libraries/controllers/TableRelationController.class.php:288
 msgid "Internal relations were successfully updated."
 msgstr ""
 
@@ -7674,10 +7628,72 @@ msgid "Zoom search"
 msgstr ""
 
 #: libraries/controllers/TableSearchController.class.php:852
-#: templates/table/selection_form.phtml:59
+#: templates/table/search/selection_form.phtml:59
 msgid "Find and replace"
 msgstr ""
 
+#: libraries/controllers/TableStructureController.class.php:163
+#, php-format
+msgid "The name '%s' is a MySQL reserved keyword."
+msgid_plural "The names '%s' are MySQL reserved keywords."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: libraries/controllers/TableStructureController.class.php:241
+msgid "No column selected."
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:467
+msgid "The columns have been moved successfully."
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:730
+#, php-format
+msgid ""
+"Table %1$s has been altered successfully. Privileges have been adjusted."
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:783
+#: libraries/tracking.lib.php:1094
+msgid "Query error"
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:948
+#: templates/table/structure/check_all_table_column.phtml:11
+msgid "Change"
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:952
+#: libraries/controllers/TableStructureController.class.php:957
+#: libraries/navigation/Nodes/Node_Index.class.php:30
+#: libraries/tracking.lib.php:926
+#: templates/columns_definitions/column_indexes.phtml:16
+#: templates/columns_definitions/table_fields_definitions.phtml:57
+#: templates/table/structure/check_all_table_column.phtml:30
+#: templates/table/structure/display_structure.phtml:79
+#: templates/table/structure/display_table_stats.phtml:19
+msgid "Index"
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:954
+#: libraries/controllers/TableStructureController.class.php:959
+#: templates/columns_definitions/column_indexes.phtml:27
+#: templates/table/structure/check_all_table_column.phtml:37
+msgid "Spatial"
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:955
+#: libraries/controllers/TableStructureController.class.php:960
+#: templates/columns_definitions/column_indexes.phtml:22
+#: templates/table/structure/check_all_table_column.phtml:47
+msgid "Fulltext"
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:963
+msgid "Distinct values"
+msgstr ""
+
 #: libraries/core.lib.php:306
 #, php-format
 msgid "The %s extension is missing. Please check your PHP configuration."
@@ -7722,7 +7738,7 @@ msgid "No Password"
 msgstr ""
 
 #: libraries/display_change_password.lib.php:68
-#: libraries/plugins/auth/AuthenticationCookie.class.php:199
+#: libraries/plugins/auth/AuthenticationCookie.class.php:187
 #: libraries/replication_gui.lib.php:422 libraries/replication_gui.lib.php:862
 #: libraries/server_privileges.lib.php:1640
 msgid "Password:"
@@ -8450,12 +8466,12 @@ msgid "Dump has been saved to file %s."
 msgstr ""
 
 #: libraries/import.lib.php:202 libraries/insert_edit.lib.php:124
-#: libraries/rte/rte_routines.lib.php:1353 libraries/sql.lib.php:1312
+#: libraries/rte/rte_routines.lib.php:1444 libraries/sql.lib.php:1306
 #: tbl_get_field.php:44
 msgid "MySQL returned an empty result set (i.e. zero rows)."
 msgstr ""
 
-#: libraries/import.lib.php:265 libraries/sql.lib.php:1326
+#: libraries/import.lib.php:265 libraries/sql.lib.php:1320
 msgid "[ROLLBACK occurred.]"
 msgstr ""
 
@@ -8519,14 +8535,14 @@ msgstr ""
 
 #: libraries/insert_edit.lib.php:233
 #: libraries/navigation/Nodes/Node_DatabaseChild.class.php:48
-#: templates/designer/table_list.phtml:40
+#: templates/database/designer/table_list.phtml:40
 msgid "Hide"
 msgstr ""
 
 #: libraries/insert_edit.lib.php:249
 #: libraries/navigation/Nodes/Node_Function.class.php:32
-#: libraries/rte/rte_routines.lib.php:1495
-#: templates/table/table_header.phtml:4
+#: libraries/rte/rte_routines.lib.php:1586
+#: templates/table/search/table_header.phtml:4
 msgid "Function"
 msgstr ""
 
@@ -8539,82 +8555,83 @@ msgstr ""
 msgid "Because of its length,<br /> this column might not be editable."
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1050
+#: libraries/insert_edit.lib.php:1048
 msgid "Binary - do not edit"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1176 libraries/server_privileges.lib.php:470
-#: templates/table/options.phtml:36
+#: libraries/insert_edit.lib.php:1174 libraries/server_privileges.lib.php:470
+#: templates/table/search/options.phtml:36
 msgid "Or"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1177
+#: libraries/insert_edit.lib.php:1175
 msgid "web server upload directory:"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1348 templates/table/input_box.phtml:49
+#: libraries/insert_edit.lib.php:1346
+#: templates/table/search/input_box.phtml:49
 msgid "Edit/Insert"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1398
+#: libraries/insert_edit.lib.php:1396
 #, php-format
 msgid "Continue insertion with %s rows"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1428
+#: libraries/insert_edit.lib.php:1426
 msgid "and then"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1461
+#: libraries/insert_edit.lib.php:1459
 msgid "Insert as new row"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1464
+#: libraries/insert_edit.lib.php:1462
 msgid "Insert as new row and ignore errors"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1467
+#: libraries/insert_edit.lib.php:1465
 msgid "Show insert query"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1487
+#: libraries/insert_edit.lib.php:1485
 msgid "Go back to previous page"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1490
+#: libraries/insert_edit.lib.php:1488
 msgid "Insert another new row"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1495
+#: libraries/insert_edit.lib.php:1493
 msgid "Go back to this page"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1518
+#: libraries/insert_edit.lib.php:1516
 msgid "Edit next row"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1540
+#: libraries/insert_edit.lib.php:1538
 msgid ""
 "Use TAB key to move from value to value, or CTRL+arrows to move anywhere"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1577 libraries/replication_gui.lib.php:542
-#: libraries/rte/rte_routines.lib.php:1497
+#: libraries/insert_edit.lib.php:1575 libraries/replication_gui.lib.php:542
+#: libraries/rte/rte_routines.lib.php:1588
 #: libraries/server_status_variables.lib.php:220
-#: templates/designer/having_query_panel.phtml:100
-#: templates/designer/options_panel.phtml:73
-#: templates/designer/options_panel.phtml:239
-#: templates/designer/where_query_panel.phtml:69
-#: templates/table/table_header.phtml:10
-#: templates/table/zoom_result_form.phtml:35
+#: templates/database/designer/having_query_panel.phtml:100
+#: templates/database/designer/options_panel.phtml:73
+#: templates/database/designer/options_panel.phtml:239
+#: templates/database/designer/where_query_panel.phtml:69
+#: templates/table/search/table_header.phtml:10
+#: templates/table/search/zoom_result_form.phtml:35
 msgid "Value"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1937 libraries/sql.lib.php:1309
+#: libraries/insert_edit.lib.php:1935 libraries/sql.lib.php:1303
 msgid "Showing SQL query"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1962 libraries/sql.lib.php:1287
+#: libraries/insert_edit.lib.php:1960 libraries/sql.lib.php:1281
 #, php-format
 msgid "Inserted row id: %1$d"
 msgstr ""
@@ -9022,7 +9039,7 @@ msgstr ""
 #: libraries/navigation/Nodes/Node_View_Container.class.php:26
 #: libraries/navigation/Nodes/Node_View_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:129
-#: templates/structure/show_create.phtml:30
+#: templates/database/structure/show_create.phtml:30
 msgid "Views"
 msgstr ""
 
@@ -9310,7 +9327,7 @@ msgstr ""
 
 #: libraries/operations.lib.php:101 libraries/operations.lib.php:249
 #: libraries/operations.lib.php:869 libraries/operations.lib.php:963
-#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:907
+#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:998
 #: templates/columns_definitions/table_fields_definitions.phtml:47
 msgid "Adjust Privileges"
 msgstr ""
@@ -9400,22 +9417,22 @@ msgid "Switch to copied table"
 msgstr ""
 
 #: libraries/operations.lib.php:1360
-#: templates/structure/check_all_tables.phtml:18
+#: templates/database/structure/check_all_tables.phtml:18
 msgid "Table maintenance"
 msgstr ""
 
 #: libraries/operations.lib.php:1398
-#: templates/structure/check_all_tables.phtml:19
+#: templates/database/structure/check_all_tables.phtml:19
 msgid "Analyze table"
 msgstr ""
 
 #: libraries/operations.lib.php:1413
-#: templates/structure/check_all_tables.phtml:20
+#: templates/database/structure/check_all_tables.phtml:20
 msgid "Check table"
 msgstr ""
 
 #: libraries/operations.lib.php:1428
-#: templates/structure/check_all_tables.phtml:22
+#: templates/database/structure/check_all_tables.phtml:22
 #, fuzzy
 msgid "Checksum table"
 msgstr "Ein Tabäll"
@@ -9434,18 +9451,19 @@ msgid "Flush the table (FLUSH)"
 msgstr ""
 
 #: libraries/operations.lib.php:1477
-#: templates/structure/check_all_tables.phtml:23
-#: templates/structure/display_table_stats.phtml:56
+#: templates/database/structure/check_all_tables.phtml:23
+#: templates/table/structure/display_table_stats.phtml:56
 msgid "Optimize table"
 msgstr ""
 
 #: libraries/operations.lib.php:1492
-#: templates/structure/check_all_tables.phtml:24
+#: templates/database/structure/check_all_tables.phtml:24
 msgid "Repair table"
 msgstr ""
 
 #: libraries/operations.lib.php:1538
-#: templates/structure/check_all_tables.phtml:14 view_operations.php:127
+#: templates/database/structure/check_all_tables.phtml:14
+#: view_operations.php:127
 msgid "Delete data or table"
 msgstr ""
 
@@ -9566,7 +9584,7 @@ msgid "Cannot connect: invalid settings."
 msgstr ""
 
 #: libraries/plugins/auth/AuthenticationConfig.class.php:108
-#: libraries/plugins/auth/AuthenticationCookie.class.php:134
+#: libraries/plugins/auth/AuthenticationCookie.class.php:122
 #: libraries/plugins/auth/AuthenticationHttp.class.php:96
 #, php-format
 msgid "Welcome to %s"
@@ -9591,36 +9609,36 @@ msgstr ""
 msgid "Retry to connect"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:146
+#: libraries/plugins/auth/AuthenticationCookie.class.php:134
 msgid "Your session has expired. Please log in again."
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:170
+#: libraries/plugins/auth/AuthenticationCookie.class.php:158
 msgid "Log in"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:178
-#: libraries/plugins/auth/AuthenticationCookie.class.php:188
+#: libraries/plugins/auth/AuthenticationCookie.class.php:166
+#: libraries/plugins/auth/AuthenticationCookie.class.php:176
 msgid "You can enter hostname/IP address and port separated by space."
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:193
+#: libraries/plugins/auth/AuthenticationCookie.class.php:181
 msgid "Username:"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:205
+#: libraries/plugins/auth/AuthenticationCookie.class.php:193
 msgid "Server Choice:"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:386
+#: libraries/plugins/auth/AuthenticationCookie.class.php:374
 msgid "Entered captcha is wrong, try again!"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:396
+#: libraries/plugins/auth/AuthenticationCookie.class.php:384
 msgid "Please enter correct captcha!"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:423
+#: libraries/plugins/auth/AuthenticationCookie.class.php:411
 msgid "You are not allowed to log in to this MySQL server!"
 msgstr ""
 
@@ -9716,7 +9734,7 @@ msgstr ""
 #: libraries/plugins/export/ExportOdt.class.php:593
 #: libraries/plugins/export/ExportTexytext.class.php:428
 #: libraries/plugins/export/PMA_ExportPdf.class.php:313
-#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:984
 #: libraries/rte/rte_triggers.lib.php:377
 msgid "Definition"
 msgstr ""
@@ -10013,7 +10031,7 @@ msgid "Last check:"
 msgstr ""
 
 #: libraries/plugins/export/ExportSql.class.php:1399
-#: templates/structure/structure_table_row.phtml:183
+#: templates/database/structure/structure_table_row.phtml:183
 msgid "in use"
 msgstr "weed jebruch"
 
@@ -10193,18 +10211,14 @@ msgstr ""
 msgid "The imported file does not contain any data!"
 msgstr ""
 
-#: libraries/plugins/import/ImportSql.class.php:169
+#: libraries/plugins/import/ImportSql.class.php:72
 msgid "SQL compatibility mode:"
 msgstr ""
 
-#: libraries/plugins/import/ImportSql.class.php:181
+#: libraries/plugins/import/ImportSql.class.php:84
 msgid "Do not use <code>AUTO_INCREMENT</code> for zero values"
 msgstr ""
 
-#: libraries/plugins/import/ImportSql.class.php:195
-msgid "Read as multibytes"
-msgstr ""
-
 #: libraries/plugins/import/ImportXml.class.php:54
 msgid "XML"
 msgstr ""
@@ -10247,7 +10261,7 @@ msgid "Show grid"
 msgstr ""
 
 #: libraries/plugins/schema/SchemaPdf.class.php:94
-#: templates/structure/print_view_data_dictionary_link.phtml:6
+#: templates/database/structure/print_view_data_dictionary_link.phtml:6
 msgid "Data Dictionary"
 msgstr ""
 
@@ -10272,7 +10286,7 @@ msgid "The %s table doesn't exist!"
 msgstr ""
 
 #: libraries/plugins/schema/eps/Eps_Relation_Schema.class.php:321
-#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:309
+#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:323
 #, php-format
 msgid "Schema of the %s database - Page %s"
 msgstr ""
@@ -10299,7 +10313,7 @@ msgstr ""
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1005
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1028
 #: libraries/tracking.lib.php:884
-#: templates/structure/table_structure_header.phtml:11
+#: templates/table/structure/table_structure_header.phtml:11
 msgid "Extra"
 msgstr ""
 
@@ -10604,51 +10618,51 @@ msgstr ""
 msgid "Create the needed tables with the <code>%screate_tables.sql</code>."
 msgstr ""
 
-#: libraries/relation.lib.php:360
+#: libraries/relation.lib.php:357
 msgid "Create a pma user and give access to these tables."
 msgstr ""
 
-#: libraries/relation.lib.php:365
+#: libraries/relation.lib.php:360
 msgid ""
 "Enable advanced features in configuration file (<code>config.inc.php</"
 "code>), for example by starting from <code>config.sample.inc.php</code>."
 msgstr ""
 
-#: libraries/relation.lib.php:373
+#: libraries/relation.lib.php:365
 msgid "Re-login to phpMyAdmin to load the updated configuration file."
 msgstr ""
 
-#: libraries/relation.lib.php:1612
+#: libraries/relation.lib.php:1607
 msgid "no description"
 msgstr ""
 
-#: libraries/relation.lib.php:1811
+#: libraries/relation.lib.php:1806
 msgid ""
 "You do not have necessary privileges to create a database named "
 "'phpmyadmin'. You may go to 'Operations' tab of any database to set up the "
 "phpMyAdmin configuration storage there."
 msgstr ""
 
-#: libraries/relation.lib.php:1928
+#: libraries/relation.lib.php:1923
 #, php-format
 msgid ""
 "%sCreate%s a database named 'phpmyadmin' and setup the phpMyAdmin "
 "configuration storage there."
 msgstr ""
 
-#: libraries/relation.lib.php:1936
+#: libraries/relation.lib.php:1931
 #, php-format
 msgid ""
 "%sCreate%s the phpMyAdmin configuration storage in the current database."
 msgstr ""
 
-#: libraries/relation.lib.php:1944
+#: libraries/relation.lib.php:1939
 #, php-format
 msgid "%sCreate%s missing phpMyAdmin configuration storage tables."
 msgstr ""
 
 #: libraries/replication_gui.lib.php:46 libraries/replication_gui.lib.php:343
-#: libraries/server_databases.lib.php:387
+#: libraries/server_databases.lib.php:398
 msgid "Master replication"
 msgstr ""
 
@@ -10703,7 +10717,7 @@ msgid ""
 msgstr ""
 
 #: libraries/replication_gui.lib.php:141
-#: libraries/server_databases.lib.php:389
+#: libraries/server_databases.lib.php:400
 msgid "Slave replication"
 msgstr ""
 
@@ -10964,10 +10978,10 @@ msgid "Master server changed successfully to %s."
 msgstr ""
 
 #: libraries/rte/rte_events.lib.php:106 libraries/rte/rte_events.lib.php:115
-#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:149
-#: libraries/rte/rte_routines.lib.php:158
-#: libraries/rte/rte_routines.lib.php:231
-#: libraries/rte/rte_routines.lib.php:1362
+#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:219
+#: libraries/rte/rte_routines.lib.php:246
+#: libraries/rte/rte_routines.lib.php:368
+#: libraries/rte/rte_routines.lib.php:1453
 #: libraries/rte/rte_triggers.lib.php:82 libraries/rte/rte_triggers.lib.php:91
 #: libraries/rte/rte_triggers.lib.php:123
 #, php-format
@@ -10988,7 +11002,7 @@ msgstr ""
 msgid "Event %1$s has been created."
 msgstr ""
 
-#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:251
+#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:266
 #: libraries/rte/rte_triggers.lib.php:144
 msgid "One or more errors have occurred while processing your request:"
 msgstr ""
@@ -10997,7 +11011,7 @@ msgstr ""
 msgid "Edit event"
 msgstr ""
 
-#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:794
+#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:885
 #: libraries/rte/rte_triggers.lib.php:323 view_create.php:180
 msgid "Details"
 msgstr ""
@@ -11010,7 +11024,7 @@ msgstr ""
 msgid "Event type"
 msgstr ""
 
-#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:817
+#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:908
 #, php-format
 msgid "Change to %s"
 msgstr ""
@@ -11037,12 +11051,14 @@ msgstr ""
 msgid "On completion preserve"
 msgstr ""
 
-#: libraries/rte/rte_events.lib.php:491 libraries/rte/rte_routines.lib.php:930
+#: libraries/rte/rte_events.lib.php:491
+#: libraries/rte/rte_routines.lib.php:1021
 #: libraries/rte/rte_triggers.lib.php:383 view_create.php:209
 msgid "Definer"
 msgstr ""
 
-#: libraries/rte/rte_events.lib.php:535 libraries/rte/rte_routines.lib.php:997
+#: libraries/rte/rte_events.lib.php:535
+#: libraries/rte/rte_routines.lib.php:1088
 #: libraries/rte/rte_triggers.lib.php:422
 msgid "The definer must be in the \"username@hostname\" format!"
 msgstr ""
@@ -11068,9 +11084,9 @@ msgid "You must provide an event definition."
 msgstr ""
 
 #: libraries/rte/rte_export.lib.php:43 libraries/rte/rte_general.lib.php:72
-#: libraries/rte/rte_routines.lib.php:345
-#: libraries/rte/rte_routines.lib.php:1198
-#: libraries/rte/rte_routines.lib.php:1411
+#: libraries/rte/rte_routines.lib.php:153
+#: libraries/rte/rte_routines.lib.php:1289
+#: libraries/rte/rte_routines.lib.php:1502
 msgid "Error in processing request:"
 msgstr ""
 
@@ -11102,119 +11118,119 @@ msgid ""
 "problems."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:110
-#: libraries/rte/rte_routines.lib.php:1006
+#: libraries/rte/rte_routines.lib.php:123
+msgid "Edit routine"
+msgstr ""
+
+#: libraries/rte/rte_routines.lib.php:200
+#: libraries/rte/rte_routines.lib.php:1097
 #, php-format
 msgid "Invalid routine type: \"%s\""
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:170
-msgid "Sorry, we failed to restore the dropped routine."
-msgstr ""
-
-#: libraries/rte/rte_routines.lib.php:211
-#, php-format
-msgid "Routine %1$s has been modified. Privileges have been adjusted."
-msgstr ""
-
-#: libraries/rte/rte_routines.lib.php:216
-#, php-format
-msgid "Routine %1$s has been modified."
-msgstr ""
-
-#: libraries/rte/rte_routines.lib.php:238
+#: libraries/rte/rte_routines.lib.php:253
 #, php-format
 msgid "Routine %1$s has been created."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:315
-msgid "Edit routine"
+#: libraries/rte/rte_routines.lib.php:380
+msgid "Sorry, we failed to restore the dropped routine."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:797
+#: libraries/rte/rte_routines.lib.php:439
+#, php-format
+msgid "Routine %1$s has been modified. Privileges have been adjusted."
+msgstr ""
+
+#: libraries/rte/rte_routines.lib.php:444
+#, php-format
+msgid "Routine %1$s has been modified."
+msgstr ""
+
+#: libraries/rte/rte_routines.lib.php:888
 msgid "Routine name"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:823
+#: libraries/rte/rte_routines.lib.php:914
 msgid "Parameters"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:829
+#: libraries/rte/rte_routines.lib.php:920
 msgid "Direction"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:847
+#: libraries/rte/rte_routines.lib.php:938
 msgid "Add parameter"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:851
+#: libraries/rte/rte_routines.lib.php:942
 msgid "Remove last parameter"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:856
+#: libraries/rte/rte_routines.lib.php:947
 msgid "Return type"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:862
+#: libraries/rte/rte_routines.lib.php:953
 msgid "Return length/values"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:868
+#: libraries/rte/rte_routines.lib.php:959
 msgid "Return options"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:899
+#: libraries/rte/rte_routines.lib.php:990
 msgid "Is deterministic"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:920
+#: libraries/rte/rte_routines.lib.php:1011
 msgid ""
 "You do not have sufficient privileges to perform this operation; Please "
 "refer to the documentation for more details"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:935
+#: libraries/rte/rte_routines.lib.php:1026
 msgid "Security type"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:944
+#: libraries/rte/rte_routines.lib.php:1035
 msgid "SQL data access"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1013
+#: libraries/rte/rte_routines.lib.php:1104
 msgid "You must provide a routine name!"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1047
+#: libraries/rte/rte_routines.lib.php:1138
 #, php-format
 msgid "Invalid direction \"%s\" given for parameter."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1069
-#: libraries/rte/rte_routines.lib.php:1131
+#: libraries/rte/rte_routines.lib.php:1160
+#: libraries/rte/rte_routines.lib.php:1222
 msgid ""
 "You must provide length/values for routine parameters of type ENUM, SET, "
 "VARCHAR and VARBINARY."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1095
+#: libraries/rte/rte_routines.lib.php:1186
 msgid "You must provide a name and a type for each routine parameter."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1114
+#: libraries/rte/rte_routines.lib.php:1205
 msgid "You must provide a valid return type for the routine."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1174
+#: libraries/rte/rte_routines.lib.php:1265
 msgid "You must provide a routine definition."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1285
+#: libraries/rte/rte_routines.lib.php:1376
 #, php-format
 msgid "Execution results of routine %s"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1340
+#: libraries/rte/rte_routines.lib.php:1431
 #, php-format
 msgid "%d row affected by the last statement inside the procedure."
 msgid_plural "%d rows affected by the last statement inside the procedure."
@@ -11222,13 +11238,13 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: libraries/rte/rte_routines.lib.php:1398
-#: libraries/rte/rte_routines.lib.php:1406
+#: libraries/rte/rte_routines.lib.php:1489
+#: libraries/rte/rte_routines.lib.php:1497
 msgid "Execute routine"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1485
-#: libraries/rte/rte_routines.lib.php:1488
+#: libraries/rte/rte_routines.lib.php:1576
+#: libraries/rte/rte_routines.lib.php:1579
 msgid "Routine parameters"
 msgstr ""
 
@@ -11382,7 +11398,7 @@ msgid "Original position"
 msgstr ""
 
 #: libraries/server_bin_log.lib.php:133
-#: templates/structure/display_table_stats.phtml:4
+#: templates/table/structure/display_table_stats.phtml:4
 msgid "Information"
 msgstr ""
 
@@ -11418,12 +11434,12 @@ msgid ""
 "between the web server and the MySQL server."
 msgstr ""
 
-#: libraries/server_databases.lib.php:364
-#: libraries/server_databases.lib.php:365
+#: libraries/server_databases.lib.php:366
+#: libraries/server_databases.lib.php:371
 msgid "Enable Statistics"
 msgstr ""
 
-#: libraries/server_databases.lib.php:481
+#: libraries/server_databases.lib.php:492
 #, php-format
 msgid "%1$d database has been dropped successfully."
 msgid_plural "%1$d databases have been dropped successfully."
@@ -11780,7 +11796,7 @@ msgid "You have revoked the privileges for %s."
 msgstr ""
 
 #: libraries/server_privileges.lib.php:2059
-#: libraries/server_privileges.lib.php:4290
+#: libraries/server_privileges.lib.php:4316
 msgid "Add user account"
 msgstr ""
 
@@ -11943,53 +11959,53 @@ msgstr ""
 msgid "The privileges were reloaded successfully."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:3994
+#: libraries/server_privileges.lib.php:4003
 #, php-format
 msgid "The user %s already exists!"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4232
+#: libraries/server_privileges.lib.php:4258
 #, php-format
 msgid "Privileges for %s"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4241
+#: libraries/server_privileges.lib.php:4267
 #: libraries/server_status_processes.lib.php:72
 #: libraries/server_user_groups.lib.php:39
 msgid "User"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4282
+#: libraries/server_privileges.lib.php:4308
 msgctxt "Create new user"
 msgid "New"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4311
+#: libraries/server_privileges.lib.php:4337
 msgid "Edit privileges:"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4312
+#: libraries/server_privileges.lib.php:4338
 msgid "User account"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4371
+#: libraries/server_privileges.lib.php:4397
 msgid ""
 "Note: You are attempting to edit privileges of the user with which you are "
 "currently logged in."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4391 libraries/server_users.lib.php:25
+#: libraries/server_privileges.lib.php:4417 libraries/server_users.lib.php:25
 msgid "User accounts overview"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4459
+#: libraries/server_privileges.lib.php:4485
 msgid ""
 "A user account allowing any user from localhost to connect is present. This "
 "will prevent other users from connecting if the host part of their account "
 "allows a connection from any (%) host."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4500
+#: libraries/server_privileges.lib.php:4526
 #, php-format
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
@@ -11998,7 +12014,7 @@ msgid ""
 "%sreload the privileges%s before you continue."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4519
+#: libraries/server_privileges.lib.php:4545
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
 "tables. The content of these tables may differ from the privileges the "
@@ -12007,61 +12023,61 @@ msgid ""
 "privilege."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4569
+#: libraries/server_privileges.lib.php:4595
 msgid "The selected user was not found in the privilege table."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4801
+#: libraries/server_privileges.lib.php:4827
 msgid "You have added a new user."
 msgstr ""
 
-#: libraries/server_status.lib.php:53
+#: libraries/server_status.lib.php:60
 #, php-format
 msgid "Network traffic since startup: %s"
 msgstr ""
 
-#: libraries/server_status.lib.php:66
+#: libraries/server_status.lib.php:73
 #, php-format
 msgid "This MySQL server has been running for %1$s. It started up on %2$s."
 msgstr ""
 
-#: libraries/server_status.lib.php:80
+#: libraries/server_status.lib.php:94
 msgid ""
 "This MySQL server works as <b>master</b> and <b>slave</b> in <b>replication</"
 "b> process."
 msgstr ""
 
-#: libraries/server_status.lib.php:85
+#: libraries/server_status.lib.php:99
 msgid "This MySQL server works as <b>master</b> in <b>replication</b> process."
 msgstr ""
 
-#: libraries/server_status.lib.php:90
+#: libraries/server_status.lib.php:104
 msgid "This MySQL server works as <b>slave</b> in <b>replication</b> process."
 msgstr ""
 
-#: libraries/server_status.lib.php:106
+#: libraries/server_status.lib.php:116
 msgid "Replication status"
 msgstr ""
 
-#: libraries/server_status.lib.php:137
+#: libraries/server_status.lib.php:146
 msgid ""
 "On a busy server, the byte counters may overrun, so those statistics as "
 "reported by the MySQL server may be incorrect."
 msgstr ""
 
-#: libraries/server_status.lib.php:148
+#: libraries/server_status.lib.php:157
 msgid "Received"
 msgstr ""
 
-#: libraries/server_status.lib.php:167
+#: libraries/server_status.lib.php:176
 msgid "Sent"
 msgstr ""
 
-#: libraries/server_status.lib.php:234
+#: libraries/server_status.lib.php:243
 msgid "Max. concurrent connections"
 msgstr ""
 
-#: libraries/server_status.lib.php:244
+#: libraries/server_status.lib.php:253
 msgid "Failed attempts"
 msgstr ""
 
@@ -12983,7 +12999,7 @@ msgstr ""
 msgid "Not implemented yet."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/AlterOperation.php:193
+#: libraries/sql-parser/src/Components/AlterOperation.php:191
 msgid "Unrecognized alter operation."
 msgstr ""
 
@@ -12997,7 +13013,7 @@ msgid "An opening bracket followed by a set of values was expected."
 msgstr ""
 
 #: libraries/sql-parser/src/Components/ArrayObj.php:101
-#: libraries/sql-parser/src/Components/FieldDefinition.php:202
+#: libraries/sql-parser/src/Components/CreateDefinition.php:202
 msgid "An opening bracket was expected."
 msgstr ""
 
@@ -13005,25 +13021,33 @@ msgstr ""
 msgid "A comma or a closing bracket was expected"
 msgstr ""
 
+#: libraries/sql-parser/src/Components/CreateDefinition.php:246
+msgid "A comma or a closing bracket was expected."
+msgstr ""
+
+#: libraries/sql-parser/src/Components/CreateDefinition.php:262
+msgid "A closing bracket was expected."
+msgstr ""
+
 #: libraries/sql-parser/src/Components/DataType.php:125
 msgid "Unrecognized data type."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:225
+#: libraries/sql-parser/src/Components/Expression.php:227
 msgid "Unexpected closing bracket."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:246
-#: libraries/sql-parser/src/Components/Expression.php:283
-#: libraries/sql-parser/src/Components/Expression.php:303
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:285
+#: libraries/sql-parser/src/Components/Expression.php:305
 msgid "An alias was previously found."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:257
+#: libraries/sql-parser/src/Components/Expression.php:259
 msgid "Unexpected dot."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:327
+#: libraries/sql-parser/src/Components/Expression.php:329
 msgid "An alias was expected."
 msgstr ""
 
@@ -13031,14 +13055,6 @@ msgstr ""
 msgid "An expression was expected."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/FieldDefinition.php:246
-msgid "A comma or a closing bracket was expected."
-msgstr ""
-
-#: libraries/sql-parser/src/Components/FieldDefinition.php:262
-msgid "A closing bracket was expected."
-msgstr ""
-
 #: libraries/sql-parser/src/Components/Limit.php:90
 #: libraries/sql-parser/src/Components/Limit.php:112
 msgid "An offset was expected."
@@ -13078,24 +13094,24 @@ msgstr ""
 msgid "Expected delimiter."
 msgstr ""
 
-#: libraries/sql-parser/src/Lexer.php:753
+#: libraries/sql-parser/src/Lexer.php:777
 #, php-format
 msgid "Ending quote %1$s was expected."
 msgstr ""
 
-#: libraries/sql-parser/src/Lexer.php:789
+#: libraries/sql-parser/src/Lexer.php:813
 msgid "Variable name was expected."
 msgstr ""
 
-#: libraries/sql-parser/src/Parser.php:380
+#: libraries/sql-parser/src/Parser.php:391
 msgid "Unexpected beginning of statement."
 msgstr ""
 
-#: libraries/sql-parser/src/Parser.php:399
+#: libraries/sql-parser/src/Parser.php:410
 msgid "Unrecognized statement type."
 msgstr ""
 
-#: libraries/sql-parser/src/Parser.php:479
+#: libraries/sql-parser/src/Parser.php:489
 msgid "No transaction was previously started."
 msgstr ""
 
@@ -13121,7 +13137,7 @@ msgid "The name of the entity was expected."
 msgstr ""
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:310
-msgid "At least one field definition was expected."
+msgid "At least one column definition was expected."
 msgstr ""
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:329
@@ -13181,25 +13197,25 @@ msgstr ""
 msgid "Using bookmark \"%s\" as default browse query."
 msgstr ""
 
-#: libraries/sql.lib.php:1306
+#: libraries/sql.lib.php:1300
 msgid "Showing as PHP code"
 msgstr ""
 
-#: libraries/sql.lib.php:1638
+#: libraries/sql.lib.php:1632
 #, php-format
 msgid ""
 "Current selection does not contain a unique column. Grid edit, checkbox, "
 "Edit, Copy and Delete features are not available. %s"
 msgstr ""
 
-#: libraries/sql.lib.php:1649
+#: libraries/sql.lib.php:1643
 #, php-format
 msgid ""
 "Current selection does not contain a unique column. Grid edit, Edit, Copy "
 "and Delete features may result in undesired behavior. %s"
 msgstr ""
 
-#: libraries/sql.lib.php:1688
+#: libraries/sql.lib.php:1682
 #, php-format
 msgid "Problems with indexes of table `%s`"
 msgstr ""
@@ -13355,7 +13371,7 @@ msgid "Version %s snapshot (SQL code)"
 msgstr ""
 
 #: libraries/tracking.lib.php:947
-#: templates/structure/table_structure_row.phtml:33
+#: templates/table/structure/table_structure_row.phtml:33
 msgctxt "None for default"
 msgid "None"
 msgstr ""
@@ -13407,15 +13423,15 @@ msgstr ""
 msgid "Version %1$s was created, tracking for %2$s is active."
 msgstr ""
 
-#: libraries/user_preferences.inc.php:29
+#: libraries/user_preferences.inc.php:30
 msgid "Manage your settings"
 msgstr ""
 
-#: libraries/user_preferences.inc.php:46 prefs_manage.php:307
+#: libraries/user_preferences.inc.php:54 prefs_manage.php:307
 msgid "Configuration has been saved."
 msgstr ""
 
-#: libraries/user_preferences.inc.php:66
+#: libraries/user_preferences.inc.php:74
 #, php-format
 msgid ""
 "Your preferences will be saved for current session only. Storing them "
@@ -13787,7 +13803,7 @@ msgid "first"
 msgstr ""
 
 #: templates/columns_definitions/move_column.phtml:12
-#: templates/structure/add_column.phtml:21
+#: templates/table/structure/add_column.phtml:21
 #, php-format
 msgid "after %s"
 msgstr ""
@@ -13846,197 +13862,291 @@ msgstr ""
 msgid "Input transformation options"
 msgstr ""
 
-#: templates/designer/aggregate_query_panel.phtml:22
-#: templates/designer/options_panel.phtml:100
-msgid "Aggregate"
-msgstr ""
-
-#: templates/designer/aggregate_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:61
-#: templates/designer/options_panel.phtml:106
-#: templates/designer/options_panel.phtml:170
-#: templates/designer/where_query_panel.phtml:30
-#: templates/table/table_header.phtml:9
-msgid "Operator"
-msgstr ""
-
-#: templates/designer/database_tables.phtml:29
-msgid "Toggle"
-msgstr ""
-
-#: templates/designer/database_tables.phtml:40
-msgid "See table structure"
-msgstr ""
-
-#: templates/designer/delete_relation_panel.phtml:21
-msgid "Delete relation"
-msgstr ""
-
-#: templates/designer/edit_delete_pages.phtml:7
-msgid "Page to open"
-msgstr ""
-
-#: templates/designer/edit_delete_pages.phtml:7
-msgid "Page to delete"
-msgstr ""
-
-#: templates/designer/having_query_panel.phtml:90
-#: templates/designer/options_panel.phtml:63
-#: templates/designer/options_panel.phtml:229
-#: templates/designer/where_query_panel.phtml:59
-msgid "Except"
-msgstr ""
-
-#: templates/designer/having_query_panel.phtml:102
-#: templates/designer/options_panel.phtml:75
-#: templates/designer/options_panel.phtml:241
-#: templates/designer/where_query_panel.phtml:71
-msgid "subquery"
-msgstr ""
-
-#: templates/designer/new_relation_panel.phtml:22
-#: templates/designer/side_menu.phtml:84 templates/designer/side_menu.phtml:87
-msgid "Create relation"
-msgstr ""
-
-#: templates/designer/options_panel.phtml:34
-#: templates/designer/options_panel.phtml:200
-msgid "Relation operator"
-msgstr ""
-
-#: templates/designer/options_panel.phtml:85
-#: templates/designer/rename_to_panel.phtml:23
-msgid "Rename to"
-msgstr ""
-
-#: templates/designer/options_panel.phtml:91
-#: templates/designer/rename_to_panel.phtml:31
-msgid "New name"
-msgstr ""
-
-#: templates/designer/page_save_as.phtml:4
-msgid "Save to selected page"
-msgstr ""
-
-#: templates/designer/page_save_as.phtml:5
-msgid "Create a page and save to it"
-msgstr ""
-
-#: templates/designer/page_save_as.phtml:26
-msgid "New page name"
-msgstr ""
-
-#: templates/designer/page_selector.phtml:2
-msgid "Select page"
-msgstr ""
-
-#: templates/designer/query_details.phtml:10
-msgid "Active options"
-msgstr ""
-
-#: templates/designer/schema_export.phtml:4
-msgid "Select Export Relational Type"
-msgstr ""
-
-#: templates/designer/side_menu.phtml:19 templates/designer/side_menu.phtml:25
-msgid "Show/Hide tables list"
-msgstr ""
-
-#: templates/designer/side_menu.phtml:29 templates/designer/side_menu.phtml:35
-#: templates/designer/side_menu.phtml:36
-msgid "View in fullscreen"
-msgstr ""
-
-#: templates/designer/side_menu.phtml:34
-msgid "Exit fullscreen"
-msgstr ""
-
-#: templates/designer/side_menu.phtml:41 templates/designer/side_menu.phtml:45
-msgid "New page"
-msgstr ""
-
-#: templates/designer/side_menu.phtml:70 templates/designer/side_menu.phtml:73
-msgid "Delete pages"
-msgstr ""
-
-#: templates/designer/side_menu.phtml:77 templates/designer/side_menu.phtml:80
-#: templates/table/create_table.phtml:7
+#: templates/database/create_table.phtml:7
+#: templates/database/designer/side_menu.phtml:77
+#: templates/database/designer/side_menu.phtml:80
 msgid "Create table"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:98
-#: templates/designer/side_menu.phtml:101
+#: templates/database/create_table.phtml:15
+msgid "Number of columns"
+msgstr ""
+
+#: templates/database/designer/aggregate_query_panel.phtml:22
+#: templates/database/designer/options_panel.phtml:100
+msgid "Aggregate"
+msgstr ""
+
+#: templates/database/designer/aggregate_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:61
+#: templates/database/designer/options_panel.phtml:106
+#: templates/database/designer/options_panel.phtml:170
+#: templates/database/designer/where_query_panel.phtml:30
+#: templates/table/search/table_header.phtml:9
+msgid "Operator"
+msgstr ""
+
+#: templates/database/designer/database_tables.phtml:29
+msgid "Toggle"
+msgstr ""
+
+#: templates/database/designer/database_tables.phtml:40
+msgid "See table structure"
+msgstr ""
+
+#: templates/database/designer/delete_relation_panel.phtml:21
+msgid "Delete relation"
+msgstr ""
+
+#: templates/database/designer/edit_delete_pages.phtml:7
+msgid "Page to open"
+msgstr ""
+
+#: templates/database/designer/edit_delete_pages.phtml:7
+msgid "Page to delete"
+msgstr ""
+
+#: templates/database/designer/having_query_panel.phtml:90
+#: templates/database/designer/options_panel.phtml:63
+#: templates/database/designer/options_panel.phtml:229
+#: templates/database/designer/where_query_panel.phtml:59
+msgid "Except"
+msgstr ""
+
+#: templates/database/designer/having_query_panel.phtml:102
+#: templates/database/designer/options_panel.phtml:75
+#: templates/database/designer/options_panel.phtml:241
+#: templates/database/designer/where_query_panel.phtml:71
+msgid "subquery"
+msgstr ""
+
+#: templates/database/designer/new_relation_panel.phtml:22
+#: templates/database/designer/side_menu.phtml:84
+#: templates/database/designer/side_menu.phtml:87
+msgid "Create relation"
+msgstr ""
+
+#: templates/database/designer/options_panel.phtml:34
+#: templates/database/designer/options_panel.phtml:200
+msgid "Relation operator"
+msgstr ""
+
+#: templates/database/designer/options_panel.phtml:85
+#: templates/database/designer/rename_to_panel.phtml:23
+msgid "Rename to"
+msgstr ""
+
+#: templates/database/designer/options_panel.phtml:91
+#: templates/database/designer/rename_to_panel.phtml:31
+msgid "New name"
+msgstr ""
+
+#: templates/database/designer/page_save_as.phtml:4
+msgid "Save to selected page"
+msgstr ""
+
+#: templates/database/designer/page_save_as.phtml:5
+msgid "Create a page and save to it"
+msgstr ""
+
+#: templates/database/designer/page_save_as.phtml:26
+msgid "New page name"
+msgstr ""
+
+#: templates/database/designer/page_selector.phtml:2
+msgid "Select page"
+msgstr ""
+
+#: templates/database/designer/query_details.phtml:10
+msgid "Active options"
+msgstr ""
+
+#: templates/database/designer/schema_export.phtml:4
+msgid "Select Export Relational Type"
+msgstr ""
+
+#: templates/database/designer/side_menu.phtml:19
+#: templates/database/designer/side_menu.phtml:25
+msgid "Show/Hide tables list"
+msgstr ""
+
+#: templates/database/designer/side_menu.phtml:29
+#: templates/database/designer/side_menu.phtml:35
+#: templates/database/designer/side_menu.phtml:36
+msgid "View in fullscreen"
+msgstr ""
+
+#: templates/database/designer/side_menu.phtml:34
+msgid "Exit fullscreen"
+msgstr ""
+
+#: templates/database/designer/side_menu.phtml:41
+#: templates/database/designer/side_menu.phtml:45
+msgid "New page"
+msgstr ""
+
+#: templates/database/designer/side_menu.phtml:70
+#: templates/database/designer/side_menu.phtml:73
+msgid "Delete pages"
+msgstr ""
+
+#: templates/database/designer/side_menu.phtml:98
+#: templates/database/designer/side_menu.phtml:101
 msgid "Reload"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:107
-#: templates/designer/side_menu.phtml:110
+#: templates/database/designer/side_menu.phtml:107
+#: templates/database/designer/side_menu.phtml:110
 msgid "Help"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Angular links"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Direct links"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:122
-#: templates/designer/side_menu.phtml:124
+#: templates/database/designer/side_menu.phtml:122
+#: templates/database/designer/side_menu.phtml:124
 msgid "Snap to grid"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:128
-#: templates/designer/side_menu.phtml:134
+#: templates/database/designer/side_menu.phtml:128
+#: templates/database/designer/side_menu.phtml:134
 msgid "Small/Big All"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:138
-#: templates/designer/side_menu.phtml:141
+#: templates/database/designer/side_menu.phtml:138
+#: templates/database/designer/side_menu.phtml:141
 msgid "Toggle small/big"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:145
-#: templates/designer/side_menu.phtml:148
+#: templates/database/designer/side_menu.phtml:145
+#: templates/database/designer/side_menu.phtml:148
 msgid "Toggle relation lines"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:153
-#: templates/designer/side_menu.phtml:156
+#: templates/database/designer/side_menu.phtml:153
+#: templates/database/designer/side_menu.phtml:156
 msgid "Export schema"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:165
-#: templates/designer/side_menu.phtml:168
+#: templates/database/designer/side_menu.phtml:165
+#: templates/database/designer/side_menu.phtml:168
 msgid "Build Query"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:173
-#: templates/designer/side_menu.phtml:177
+#: templates/database/designer/side_menu.phtml:173
+#: templates/database/designer/side_menu.phtml:177
 msgid "Move Menu"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:181
-#: templates/designer/side_menu.phtml:186
+#: templates/database/designer/side_menu.phtml:181
+#: templates/database/designer/side_menu.phtml:186
 msgid "Pin text"
 msgstr ""
 
-#: templates/designer/table_list.phtml:4
+#: templates/database/designer/table_list.phtml:4
 msgid "Hide/Show all"
 msgstr ""
 
-#: templates/designer/table_list.phtml:14
+#: templates/database/designer/table_list.phtml:14
 msgid "Hide/Show Tables with no relation"
 msgstr ""
 
-#: templates/designer/table_list.phtml:59
+#: templates/database/designer/table_list.phtml:59
 msgid "Number of tables:"
 msgstr ""
 
+#: templates/database/structure/body_for_table_summary.phtml:6
+#, fuzzy, php-format
+msgid "%s table"
+msgid_plural "%s tables"
+msgstr[0] "Ein Tabäll"
+msgstr[1] "%s Tabälle"
+msgstr[2] ""
+
+#: templates/database/structure/body_for_table_summary.phtml:17
+msgid "Sum"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:6
+msgid "Check tables having overhead"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:10
+msgid "Show create"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:27
+msgid "Prefix"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:28
+msgid "Add prefix to table"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:29
+msgid "Replace table prefix"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:30
+msgid "Copy table with prefix"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:36
+msgid "Add columns to central list"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:37
+msgid "Remove columns from central list"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:38
+msgid "Make consistent with central list"
+msgstr ""
+
+#: templates/database/structure/favorite_anchor.phtml:12
+msgid "Add to Favorites"
+msgstr ""
+
+#: templates/database/structure/show_create.phtml:2
+msgid "Showing create queries"
+msgstr ""
+
+#: templates/database/structure/sortable_header.phtml:13
+msgid "Sort"
+msgstr ""
+
+#: templates/database/structure/table_header.phtml:42
+msgid ""
+"May be approximate. Click on the number to get the exact count. See "
+"[doc@faq3-11]FAQ 3.11[/doc]."
+msgstr ""
+
+#: templates/database/structure/table_header.phtml:66
+#: templates/table/index_form.phtml:127
+msgid "Size"
+msgstr "Ömfang"
+
+#: templates/database/structure/table_header.phtml:74
+#: templates/table/structure/display_table_stats.phtml:27
+msgid "Overhead"
+msgstr ""
+
+#: templates/database/structure/tracking_icon.phtml:4
+msgid "Tracking is active."
+msgstr ""
+
+#: templates/database/structure/tracking_icon.phtml:8
+msgid "Tracking is not active."
+msgstr ""
+
 #: templates/error/report_form.phtml:7
 msgid ""
 "phpMyAdmin has encountered an error. We have collected data about this error "
@@ -14052,59 +14162,6 @@ msgstr ""
 msgid "Please explain the steps that lead to the error:"
 msgstr ""
 
-#: templates/gis_visualization/gis_visualization.phtml:3
-msgid "Display GIS Visualization"
-msgstr ""
-
-#: templates/gis_visualization/gis_visualization.phtml:8
-msgid "Label column"
-msgstr ""
-
-#: templates/gis_visualization/gis_visualization.phtml:11
-msgid "-- None --"
-msgstr ""
-
-#: templates/gis_visualization/gis_visualization.phtml:19
-msgid "Spatial column"
-msgstr ""
-
-#: templates/index_form.phtml:16
-msgid "Index name:"
-msgstr ""
-
-#: templates/index_form.phtml:19
-msgid ""
-"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
-msgstr ""
-
-#: templates/index_form.phtml:40
-msgid "Index choice:"
-msgstr ""
-
-#: templates/index_form.phtml:57
-msgid "Key block size:"
-msgstr ""
-
-#: templates/index_form.phtml:74
-msgid "Index type:"
-msgstr ""
-
-#: templates/index_form.phtml:86
-msgid "Parser:"
-msgstr ""
-
-#: templates/index_form.phtml:102
-msgid "Comment:"
-msgstr ""
-
-#: templates/index_form.phtml:127 templates/structure/table_header.phtml:66
-msgid "Size"
-msgstr "Ömfang"
-
-#: templates/index_form.phtml:149 templates/index_form.phtml:190
-msgid "Drag to reorder"
-msgstr ""
-
 #: templates/prefs_autoload.phtml:9
 msgid ""
 "Your browser has phpMyAdmin configuration for this domain. Would you like to "
@@ -14115,405 +14172,371 @@ msgstr ""
 msgid "Start row:"
 msgstr ""
 
-#: templates/structure/actions_in_table_structure.phtml:14
-#, php-format
-msgid "A primary key has been added on %s."
-msgstr ""
-
-#: templates/structure/actions_in_table_structure.phtml:34
-#: templates/structure/actions_in_table_structure.phtml:54
-#: templates/structure/actions_in_table_structure.phtml:79
-#: templates/structure/actions_in_table_structure.phtml:101
-#, php-format
-msgid "An index has been added on %s."
-msgstr ""
-
-#: templates/structure/actions_in_table_structure.phtml:130
-#: templates/structure/check_all_table_column.phtml:59
-msgid "Remove from central columns"
-msgstr ""
-
-#: templates/structure/actions_in_table_structure.phtml:138
-#: templates/structure/check_all_table_column.phtml:55
-msgid "Add to central columns"
-msgstr ""
-
-#: templates/structure/add_column.phtml:7
-#, php-format
-msgid "Add %s column(s)"
-msgstr ""
-
-#: templates/structure/add_column.phtml:12
-msgid "at beginning of table"
-msgstr ""
-
-#: templates/structure/body_for_table_summary.phtml:6
-#, fuzzy, php-format
-msgid "%s table"
-msgid_plural "%s tables"
-msgstr[0] "Ein Tabäll"
-msgstr[1] "%s Tabälle"
-msgstr[2] ""
-
-#: templates/structure/body_for_table_summary.phtml:17
-msgid "Sum"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:6
-msgid "Check tables having overhead"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:10
-msgid "Show create"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:27
-msgid "Prefix"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:28
-msgid "Add prefix to table"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:29
-msgid "Replace table prefix"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:30
-msgid "Copy table with prefix"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:36
-msgid "Add columns to central list"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:37
-msgid "Remove columns from central list"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:38
-msgid "Make consistent with central list"
-msgstr ""
-
-#: templates/structure/display_structure.phtml:140 view_create.php:181
-msgid "Edit view"
-msgstr ""
-
-#: templates/structure/display_table_stats.phtml:9
-msgid "Space usage"
-msgstr ""
-
-#: templates/structure/display_table_stats.phtml:27
-#: templates/structure/table_header.phtml:74
-msgid "Overhead"
-msgstr ""
-
-#: templates/structure/display_table_stats.phtml:32
-msgid "Effective"
-msgstr ""
-
-#: templates/structure/favorite_anchor.phtml:12
-msgid "Add to Favorites"
-msgstr ""
-
-#: templates/structure/move_columns_dialog.phtml:1
-#: templates/structure/optional_action_links.phtml:21
-msgid "Move columns"
-msgstr ""
-
-#: templates/structure/move_columns_dialog.phtml:2
-msgid "Move the columns by dragging them up and down."
-msgstr ""
-
-#: templates/structure/optional_action_links.phtml:9
-msgid "Propose table structure"
-msgstr ""
-
-#: templates/structure/optional_action_links.phtml:24
-msgid "Improve table structure"
-msgstr ""
-
-#: templates/structure/optional_action_links.phtml:30
-msgid "Track view"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:3
-msgid "Row statistics"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:9
-msgid "static"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:11
-msgid "dynamic"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:22
-msgid "partitioned"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:54
-msgid "Row length"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:66
-msgid "Row size"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:73
-msgid "Next autoindex"
-msgstr ""
-
-#: templates/structure/secondary_tabs.phtml:14
-msgid "Relation view"
-msgstr ""
-
-#: templates/structure/show_create.phtml:2
-msgid "Showing create queries"
-msgstr ""
-
-#: templates/structure/sortable_header.phtml:13
-msgid "Sort"
-msgstr ""
-
-#: templates/structure/table_header.phtml:42
-msgid ""
-"May be approximate. Click on the number to get the exact count. See "
-"[doc@faq3-11]FAQ 3.11[/doc]."
-msgstr ""
-
-#: templates/structure/table_structure_row.phtml:46
-#, php-format
-msgid "Column %s has been dropped."
-msgstr ""
-
-#: templates/structure/tracking_icon.phtml:4
-msgid "Tracking is active."
-msgstr ""
-
-#: templates/structure/tracking_icon.phtml:8
-msgid "Tracking is not active."
-msgstr ""
-
-#: templates/table/create_table.phtml:15
-msgid "Number of columns"
-msgstr ""
-
-#: templates/table/options.phtml:8
-msgid "Select columns (at least one):"
-msgstr ""
-
-#: templates/table/options.phtml:37
-msgid "Add search conditions (body of the \"where\" clause):"
-msgstr ""
-
-#: templates/table/options.phtml:45
-msgid "Number of rows per page"
-msgstr ""
-
-#: templates/table/options.phtml:56
-msgid "Display order:"
-msgstr ""
-
-#: templates/table/options_zoom.phtml:6
-msgid "Use this column to label each point"
-msgstr ""
-
-#: templates/table/options_zoom.phtml:35
-msgid "Maximum rows to plot"
-msgstr ""
-
-#: templates/table/replace_preview.phtml:13
-msgid "Find and replace - preview"
-msgstr ""
-
-#: templates/table/replace_preview.phtml:18
-msgid "Original string"
-msgstr ""
-
-#: templates/table/replace_preview.phtml:19
-msgid "Replaced string"
-msgstr ""
-
-#: templates/table/replace_preview.phtml:40
-msgid "Replace"
-msgstr ""
-
-#: templates/table/rows_zoom.phtml:16
-msgid "Additional search criteria"
-msgstr ""
-
-#: templates/table/search_and_replace.phtml:3
-msgid "Replace with:"
-msgstr ""
-
-#: templates/table/search_and_replace.phtml:22
-msgid "Use regular expression"
-msgstr ""
-
-#: templates/table/selection_form.phtml:12
-msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
-msgstr ""
-
-#: templates/table/selection_form.phtml:34
-msgid "Do a \"query by example\" (wildcard: \"%\")"
-msgstr ""
-
-#: templates/table/zoom_result_form.phtml:7
-msgid "Browse/Edit the points"
-msgstr ""
-
-#: templates/table/zoom_result_form.phtml:15
-msgid "How to use"
-msgstr ""
-
-#: templates/table/zoom_result_form.phtml:23
-msgid "Reset zoom"
-msgstr ""
-
-#: templates/tbl_chart.phtml:17
+#: templates/table/chart/tbl_chart.phtml:17
 msgctxt "Chart type"
 msgid "Bar"
 msgstr ""
 
-#: templates/tbl_chart.phtml:21
+#: templates/table/chart/tbl_chart.phtml:21
 msgctxt "Chart type"
 msgid "Column"
 msgstr ""
 
-#: templates/tbl_chart.phtml:25
+#: templates/table/chart/tbl_chart.phtml:25
 msgctxt "Chart type"
 msgid "Line"
 msgstr ""
 
-#: templates/tbl_chart.phtml:29
+#: templates/table/chart/tbl_chart.phtml:29
 msgctxt "Chart type"
 msgid "Spline"
 msgstr ""
 
-#: templates/tbl_chart.phtml:33
+#: templates/table/chart/tbl_chart.phtml:33
 msgctxt "Chart type"
 msgid "Area"
 msgstr ""
 
-#: templates/tbl_chart.phtml:37
+#: templates/table/chart/tbl_chart.phtml:37
 msgctxt "Chart type"
 msgid "Pie"
 msgstr ""
 
-#: templates/tbl_chart.phtml:41
+#: templates/table/chart/tbl_chart.phtml:41
 msgctxt "Chart type"
 msgid "Timeline"
 msgstr ""
 
-#: templates/tbl_chart.phtml:45
+#: templates/table/chart/tbl_chart.phtml:45
 msgctxt "Chart type"
 msgid "Scatter"
 msgstr ""
 
-#: templates/tbl_chart.phtml:50
+#: templates/table/chart/tbl_chart.phtml:50
 msgid "Stacked"
 msgstr ""
 
-#: templates/tbl_chart.phtml:53
+#: templates/table/chart/tbl_chart.phtml:53
 msgid "Chart title"
 msgstr ""
 
-#: templates/tbl_chart.phtml:57
+#: templates/table/chart/tbl_chart.phtml:57
 msgid "X-Axis:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:72
+#: templates/table/chart/tbl_chart.phtml:72
 msgid "Series:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:102
+#: templates/table/chart/tbl_chart.phtml:102
 msgid "X-Axis label:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:104
+#: templates/table/chart/tbl_chart.phtml:104
 msgid "X Values"
 msgstr ""
 
-#: templates/tbl_chart.phtml:107
+#: templates/table/chart/tbl_chart.phtml:107
 msgid "Y-Axis label:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:115
+#: templates/table/chart/tbl_chart.phtml:115
 msgid "Series names are in a column"
 msgstr ""
 
-#: templates/tbl_chart.phtml:118
+#: templates/table/chart/tbl_chart.phtml:118
 msgid "Series column:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:130
+#: templates/table/chart/tbl_chart.phtml:130
 #, fuzzy
 #| msgid "Column"
 msgid "Value Column:"
 msgstr "Kolonn"
 
-#: templates/tbl_chart.phtml:150
+#: templates/table/chart/tbl_chart.phtml:150
 msgid "Save chart as image"
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:7
+#: templates/table/gis_visualization/gis_visualization.phtml:3
+msgid "Display GIS Visualization"
+msgstr ""
+
+#: templates/table/gis_visualization/gis_visualization.phtml:8
+msgid "Label column"
+msgstr ""
+
+#: templates/table/gis_visualization/gis_visualization.phtml:11
+msgid "-- None --"
+msgstr ""
+
+#: templates/table/gis_visualization/gis_visualization.phtml:19
+msgid "Spatial column"
+msgstr ""
+
+#: templates/table/index_form.phtml:16
+msgid "Index name:"
+msgstr ""
+
+#: templates/table/index_form.phtml:19
+msgid ""
+"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
+msgstr ""
+
+#: templates/table/index_form.phtml:40
+msgid "Index choice:"
+msgstr ""
+
+#: templates/table/index_form.phtml:57
+msgid "Key block size:"
+msgstr ""
+
+#: templates/table/index_form.phtml:74
+msgid "Index type:"
+msgstr ""
+
+#: templates/table/index_form.phtml:86
+msgid "Parser:"
+msgstr ""
+
+#: templates/table/index_form.phtml:102
+msgid "Comment:"
+msgstr ""
+
+#: templates/table/index_form.phtml:149 templates/table/index_form.phtml:190
+msgid "Drag to reorder"
+msgstr ""
+
+#: templates/table/relation/common_form.phtml:7
 msgid "Internal relations"
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:11
+#: templates/table/relation/common_form.phtml:11
 msgid "Internal relation"
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:14
+#: templates/table/relation/common_form.phtml:14
 msgid ""
 "An internal relation is not necessary when a corresponding FOREIGN KEY "
 "relation exists."
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:37
+#: templates/table/relation/common_form.phtml:37
 msgid "Foreign key constraints"
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:40
+#: templates/table/relation/common_form.phtml:40
 msgid "Actions"
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:41
+#: templates/table/relation/common_form.phtml:41
 msgid "Constraint properties"
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:44
+#: templates/table/relation/common_form.phtml:44
 msgid ""
 "Only columns with index will be displayed. You can define an index below."
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:49
+#: templates/table/relation/common_form.phtml:49
 msgid "Foreign key constraint"
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:81
+#: templates/table/relation/common_form.phtml:81
 msgid "+ Add constraint"
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:91
+#: templates/table/relation/common_form.phtml:91
 msgid "Choose column to display:"
 msgstr ""
 
-#: templates/tbl_relation/foreign_key_row.phtml:13
+#: templates/table/relation/foreign_key_row.phtml:13
 #, php-format
 msgid "Foreign key constraint %s has been dropped"
 msgstr ""
 
-#: templates/tbl_relation/foreign_key_row.phtml:102
+#: templates/table/relation/foreign_key_row.phtml:102
 msgid "Constraint name"
 msgstr ""
 
-#: templates/tbl_relation/foreign_key_row.phtml:157
+#: templates/table/relation/foreign_key_row.phtml:157
 msgid "+ Add column"
 msgstr ""
 
+#: templates/table/search/options.phtml:8
+msgid "Select columns (at least one):"
+msgstr ""
+
+#: templates/table/search/options.phtml:37
+msgid "Add search conditions (body of the \"where\" clause):"
+msgstr ""
+
+#: templates/table/search/options.phtml:45
+msgid "Number of rows per page"
+msgstr ""
+
+#: templates/table/search/options.phtml:56
+msgid "Display order:"
+msgstr ""
+
+#: templates/table/search/options_zoom.phtml:6
+msgid "Use this column to label each point"
+msgstr ""
+
+#: templates/table/search/options_zoom.phtml:35
+msgid "Maximum rows to plot"
+msgstr ""
+
+#: templates/table/search/replace_preview.phtml:13
+msgid "Find and replace - preview"
+msgstr ""
+
+#: templates/table/search/replace_preview.phtml:18
+msgid "Original string"
+msgstr ""
+
+#: templates/table/search/replace_preview.phtml:19
+msgid "Replaced string"
+msgstr ""
+
+#: templates/table/search/replace_preview.phtml:40
+msgid "Replace"
+msgstr ""
+
+#: templates/table/search/rows_zoom.phtml:16
+msgid "Additional search criteria"
+msgstr ""
+
+#: templates/table/search/search_and_replace.phtml:3
+msgid "Replace with:"
+msgstr ""
+
+#: templates/table/search/search_and_replace.phtml:22
+msgid "Use regular expression"
+msgstr ""
+
+#: templates/table/search/selection_form.phtml:12
+msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
+msgstr ""
+
+#: templates/table/search/selection_form.phtml:34
+msgid "Do a \"query by example\" (wildcard: \"%\")"
+msgstr ""
+
+#: templates/table/search/zoom_result_form.phtml:7
+msgid "Browse/Edit the points"
+msgstr ""
+
+#: templates/table/search/zoom_result_form.phtml:15
+msgid "How to use"
+msgstr ""
+
+#: templates/table/search/zoom_result_form.phtml:23
+msgid "Reset zoom"
+msgstr ""
+
+#: templates/table/secondary_tabs.phtml:14
+msgid "Relation view"
+msgstr ""
+
+#: templates/table/structure/actions_in_table_structure.phtml:14
+#, php-format
+msgid "A primary key has been added on %s."
+msgstr ""
+
+#: templates/table/structure/actions_in_table_structure.phtml:34
+#: templates/table/structure/actions_in_table_structure.phtml:54
+#: templates/table/structure/actions_in_table_structure.phtml:79
+#: templates/table/structure/actions_in_table_structure.phtml:101
+#, php-format
+msgid "An index has been added on %s."
+msgstr ""
+
+#: templates/table/structure/actions_in_table_structure.phtml:130
+#: templates/table/structure/check_all_table_column.phtml:59
+msgid "Remove from central columns"
+msgstr ""
+
+#: templates/table/structure/actions_in_table_structure.phtml:138
+#: templates/table/structure/check_all_table_column.phtml:55
+msgid "Add to central columns"
+msgstr ""
+
+#: templates/table/structure/add_column.phtml:7
+#, php-format
+msgid "Add %s column(s)"
+msgstr ""
+
+#: templates/table/structure/add_column.phtml:12
+msgid "at beginning of table"
+msgstr ""
+
+#: templates/table/structure/display_structure.phtml:140 view_create.php:181
+msgid "Edit view"
+msgstr ""
+
+#: templates/table/structure/display_table_stats.phtml:9
+msgid "Space usage"
+msgstr ""
+
+#: templates/table/structure/display_table_stats.phtml:32
+msgid "Effective"
+msgstr ""
+
+#: templates/table/structure/move_columns_dialog.phtml:1
+#: templates/table/structure/optional_action_links.phtml:21
+msgid "Move columns"
+msgstr ""
+
+#: templates/table/structure/move_columns_dialog.phtml:2
+msgid "Move the columns by dragging them up and down."
+msgstr ""
+
+#: templates/table/structure/optional_action_links.phtml:9
+msgid "Propose table structure"
+msgstr ""
+
+#: templates/table/structure/optional_action_links.phtml:24
+msgid "Improve table structure"
+msgstr ""
+
+#: templates/table/structure/optional_action_links.phtml:30
+msgid "Track view"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:3
+msgid "Row statistics"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:9
+msgid "static"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:11
+msgid "dynamic"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:22
+msgid "partitioned"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:54
+msgid "Row length"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:66
+msgid "Row size"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:73
+msgid "Next autoindex"
+msgstr ""
+
+#: templates/table/structure/table_structure_row.phtml:46
+#, php-format
+msgid "Column %s has been dropped."
+msgstr ""
+
 #: themes.php:17 themes.php:22
 msgid "Theme"
 msgstr ""
diff --git a/po/ky.po b/po/ky.po
index 735565013a..6944d24848 100644
--- a/po/ky.po
+++ b/po/ky.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 4.5.0-dev\n"
 "Report-Msgid-Bugs-To: developers@phpmyadmin.net\n"
-"POT-Creation-Date: 2015-08-08 13:53-0400\n"
+"POT-Creation-Date: 2015-08-12 08:10-0400\n"
 "PO-Revision-Date: 2014-02-03 16:59+0200\n"
 "Last-Translator: Michal Čihař <michal@cihar.com>\n"
 "Language-Team: Kyrgyz <http://hosted.weblate.org/projects/phpmyadmin/master/"
@@ -57,7 +57,7 @@ msgid "Table comments:"
 msgstr "Жадыбал жөнүндө маалымат:"
 
 #: db_datadict.php:104 libraries/Index.class.php:699
-#: libraries/insert_edit.lib.php:1567
+#: libraries/insert_edit.lib.php:1565
 #: libraries/navigation/Nodes/Node_Column.class.php:30
 #: libraries/plugins/export/ExportHtmlword.class.php:280
 #: libraries/plugins/export/ExportHtmlword.class.php:375
@@ -71,13 +71,14 @@ msgstr "Жадыбал жөнүндө маалымат:"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1023
 #: libraries/tracking.lib.php:879 libraries/tracking.lib.php:975
 #: templates/columns_definitions/column_name.phtml:18
-#: templates/index_form.phtml:124 templates/table/table_header.phtml:6
-#: templates/table/zoom_result_form.phtml:33
-#: templates/tbl_relation/common_form.phtml:10
-#: templates/tbl_relation/common_form.phtml:43
-#: templates/tbl_relation/foreign_key_row.phtml:194
-#: templates/tbl_relation/foreign_key_row.phtml:206
-#: templates/tbl_relation/internal_relational_row.phtml:71
+#: templates/table/index_form.phtml:124
+#: templates/table/relation/common_form.phtml:10
+#: templates/table/relation/common_form.phtml:43
+#: templates/table/relation/foreign_key_row.phtml:194
+#: templates/table/relation/foreign_key_row.phtml:206
+#: templates/table/relation/internal_relational_row.phtml:71
+#: templates/table/search/table_header.phtml:6
+#: templates/table/search/zoom_result_form.phtml:33
 msgid "Column"
 msgstr "Мамыча"
 
@@ -95,21 +96,21 @@ msgstr "Мамыча"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1001
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1024
 #: libraries/rte/rte_list.lib.php:75 libraries/rte/rte_list.lib.php:103
-#: libraries/rte/rte_routines.lib.php:802
-#: libraries/rte/rte_routines.lib.php:831
-#: libraries/rte/rte_routines.lib.php:1493
+#: libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_routines.lib.php:922
+#: libraries/rte/rte_routines.lib.php:1584
 #: libraries/server_privileges.lib.php:2369 libraries/tracking.lib.php:880
 #: libraries/tracking.lib.php:972
 #: templates/columns_definitions/table_fields_definitions.phtml:11
-#: templates/structure/table_header.phtml:48
-#: templates/structure/table_structure_header.phtml:6
-#: templates/table/table_header.phtml:7
+#: templates/database/structure/table_header.phtml:48
+#: templates/table/search/table_header.phtml:7
+#: templates/table/structure/table_structure_header.phtml:6
 msgid "Type"
 msgstr "Тиби"
 
 #: db_datadict.php:106 libraries/Index.class.php:702
 #: libraries/central_columns.lib.php:708
-#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1576
+#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1574
 #: libraries/plugins/export/ExportHtmlword.class.php:286
 #: libraries/plugins/export/ExportHtmlword.class.php:381
 #: libraries/plugins/export/ExportLatex.class.php:509
@@ -122,8 +123,8 @@ msgstr "Тиби"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1026
 #: libraries/tracking.lib.php:882 libraries/tracking.lib.php:978
 #: templates/columns_definitions/table_fields_definitions.phtml:39
-#: templates/structure/table_structure_header.phtml:9
-#: templates/table/zoom_result_form.phtml:34
+#: templates/table/search/zoom_result_form.phtml:34
+#: templates/table/structure/table_structure_header.phtml:9
 msgid "Null"
 msgstr "Null"
 
@@ -141,8 +142,8 @@ msgstr "Null"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1027
 #: libraries/replication_gui.lib.php:153 libraries/tracking.lib.php:883
 #: templates/columns_definitions/table_fields_definitions.phtml:25
-#: templates/structure/body_for_table_summary.phtml:55
-#: templates/structure/table_structure_header.phtml:10
+#: templates/database/structure/body_for_table_summary.phtml:55
+#: templates/table/structure/table_structure_header.phtml:10
 msgid "Default"
 msgstr "Default"
 
@@ -170,19 +171,19 @@ msgid "Comments"
 msgstr "Коментарийлер"
 
 #: db_datadict.php:146
-#: libraries/controllers/StructureController.class.php:1960
-#: libraries/controllers/StructureController.class.php:1965
+#: libraries/controllers/TableStructureController.class.php:951
+#: libraries/controllers/TableStructureController.class.php:956
 #: libraries/tracking.lib.php:922
 #: templates/columns_definitions/column_indexes.phtml:6
-#: templates/structure/check_all_table_column.phtml:22
-#: templates/structure/display_structure.phtml:74
+#: templates/table/structure/check_all_table_column.phtml:22
+#: templates/table/structure/display_structure.phtml:74
 msgid "Primary"
 msgstr ""
 
 #: db_datadict.php:156 js/messages.php:317 libraries/Index.class.php:567
 #: libraries/Index.class.php:606 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261 libraries/mult_submits.lib.php:403
+#: libraries/config/FormDisplay.tpl.php:272 libraries/mult_submits.lib.php:403
 #: libraries/mult_submits.lib.php:417
 #: libraries/plugins/export/ExportHtmlword.class.php:630
 #: libraries/plugins/export/ExportLatex.class.php:589
@@ -198,20 +199,20 @@ msgstr ""
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1010 libraries/tracking.lib.php:1015
 #: prefs_manage.php:140 templates/prefs_autoload.phtml:15
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "No"
 msgstr "Жок"
 
 #: db_datadict.php:156 js/messages.php:443 libraries/Index.class.php:568
 #: libraries/Index.class.php:605 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261
-#: libraries/controllers/StructureController.class.php:1344
-#: libraries/controllers/StructureController.class.php:2223
-#: libraries/controllers/StructureController.class.php:2232
-#: libraries/controllers/StructureController.class.php:2237
-#: libraries/controllers/StructureController.class.php:2242
-#: libraries/controllers/StructureController.class.php:2247
+#: libraries/config/FormDisplay.tpl.php:272
+#: libraries/controllers/TableStructureController.class.php:539
+#: libraries/controllers/TableStructureController.class.php:1201
+#: libraries/controllers/TableStructureController.class.php:1210
+#: libraries/controllers/TableStructureController.class.php:1215
+#: libraries/controllers/TableStructureController.class.php:1220
+#: libraries/controllers/TableStructureController.class.php:1225
 #: libraries/mult_submits.inc.php:82 libraries/mult_submits.inc.php:178
 #: libraries/mult_submits.lib.php:339 libraries/mult_submits.lib.php:372
 #: libraries/mult_submits.lib.php:401 libraries/mult_submits.lib.php:415
@@ -220,8 +221,8 @@ msgstr "Жок"
 #: libraries/plugins/export/ExportOdt.class.php:756
 #: libraries/plugins/export/ExportTexytext.class.php:567
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1077
-#: libraries/server_databases.lib.php:464
-#: libraries/server_databases.lib.php:474
+#: libraries/server_databases.lib.php:475
+#: libraries/server_databases.lib.php:485
 #: libraries/server_privileges.lib.php:2546
 #: libraries/server_privileges.lib.php:2727
 #: libraries/server_privileges.lib.php:2748
@@ -231,7 +232,7 @@ msgstr "Жок"
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1008 libraries/tracking.lib.php:1013
 #: prefs_manage.php:138 templates/prefs_autoload.phtml:14
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "Yes"
 msgstr "Ооба"
 
@@ -241,7 +242,7 @@ msgstr "Берилиштер базасынан жүктөлүүчү маалы
 
 #: db_export.php:37 db_tracking.php:90 export.php:382
 #: libraries/DBQbe.class.php:326
-#: libraries/controllers/StructureController.class.php:231
+#: libraries/controllers/DatabaseStructureController.class.php:170
 #: libraries/navigation/NavigationTree.class.php:897
 msgid "No tables found in database."
 msgstr "Берилиштер базасында жадыбал табылган жок."
@@ -252,14 +253,14 @@ msgstr "Берилиштер базасында жадыбал табылган
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:26
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:120
-#: templates/structure/show_create.phtml:18
+#: templates/database/structure/show_create.phtml:18
 msgid "Tables"
 msgstr ""
 
 #: db_export.php:52 libraries/Menu.class.php:317 libraries/Menu.class.php:425
-#: libraries/Util.class.php:3333 libraries/Util.class.php:3343
-#: libraries/Util.class.php:3349 libraries/Util.class.php:3629
-#: libraries/Util.class.php:4327 libraries/Util.class.php:4344
+#: libraries/Util.class.php:3339 libraries/Util.class.php:3349
+#: libraries/Util.class.php:3355 libraries/Util.class.php:3635
+#: libraries/Util.class.php:4333 libraries/Util.class.php:4350
 #: libraries/central_columns.lib.php:728 libraries/config.values.php:39
 #: libraries/config.values.php:47 libraries/config.values.php:109
 #: libraries/config.values.php:115 libraries/config/setup.forms.php:323
@@ -273,7 +274,7 @@ msgstr ""
 #: libraries/navigation/Nodes/Node_Table.class.php:283
 #: libraries/server_privileges.lib.php:1141 libraries/tracking.lib.php:874
 #: templates/columns_definitions/table_fields_definitions.phtml:3
-#: templates/designer/table_list.phtml:28
+#: templates/database/designer/table_list.phtml:28
 msgid "Structure"
 msgstr ""
 
@@ -285,7 +286,7 @@ msgstr ""
 #: libraries/config/user_preferences.forms.php:292
 #: libraries/config/user_preferences.forms.php:297
 #: libraries/server_privileges.lib.php:1140
-#: templates/structure/display_table_stats.phtml:12
+#: templates/table/structure/display_table_stats.phtml:12
 msgid "Data"
 msgstr ""
 
@@ -364,10 +365,10 @@ msgstr ""
 #: libraries/server_privileges.lib.php:2908
 #: libraries/server_privileges.lib.php:3145
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4346
-#: templates/structure/table_header.phtml:21
-#: templates/tbl_relation/foreign_key_row.phtml:176
-#: templates/tbl_relation/internal_relational_row.phtml:63
+#: libraries/server_privileges.lib.php:4372
+#: templates/database/structure/table_header.phtml:21
+#: templates/table/relation/foreign_key_row.phtml:176
+#: templates/table/relation/internal_relational_row.phtml:63
 msgid "Table"
 msgstr "Жадыбал"
 
@@ -384,7 +385,7 @@ msgid "Updated"
 msgstr "Жаңыланды"
 
 #: db_tracking.php:130 js/messages.php:243 libraries/Menu.class.php:552
-#: libraries/Util.class.php:4314 libraries/config.values.php:104
+#: libraries/Util.class.php:4320 libraries/config.values.php:104
 #: libraries/rte/rte_events.lib.php:393 libraries/rte/rte_list.lib.php:101
 #: libraries/server_status_processes.lib.php:92 libraries/tracking.lib.php:279
 msgid "Status"
@@ -393,14 +394,15 @@ msgstr "Статус"
 #: db_tracking.php:131 db_tracking.php:290 libraries/Index.class.php:693
 #: libraries/central_columns.lib.php:687 libraries/rte/rte_list.lib.php:74
 #: libraries/rte/rte_list.lib.php:89 libraries/rte/rte_list.lib.php:102
-#: libraries/server_databases.lib.php:398
+#: libraries/server_databases.lib.php:409
 #: libraries/server_privileges.lib.php:2372
 #: libraries/server_privileges.lib.php:3166
 #: libraries/server_privileges.lib.php:3342
 #: libraries/server_user_groups.lib.php:82
 #: libraries/server_variables.lib.php:189 libraries/tracking.lib.php:280
-#: libraries/tracking.lib.php:793 templates/structure/table_header.phtml:30
-#: templates/structure/table_structure_header.phtml:23
+#: libraries/tracking.lib.php:793
+#: templates/database/structure/table_header.phtml:30
+#: templates/table/structure/table_structure_header.phtml:23
 msgid "Action"
 msgstr "Кыймыл"
 
@@ -442,7 +444,7 @@ msgid "Untracked tables"
 msgstr ""
 
 #: db_tracking.php:305 db_tracking.php:336
-#: templates/structure/optional_action_links.phtml:17
+#: templates/table/structure/optional_action_links.phtml:17
 msgid "Track table"
 msgstr ""
 
@@ -492,7 +494,7 @@ msgid "Value for the column \"%s\""
 msgstr "\"%s\" мамычанын мааниси"
 
 #: gis_data_editor.php:146
-#: templates/gis_visualization/gis_visualization.phtml:37
+#: templates/table/gis_visualization/gis_visualization.phtml:37
 msgid "Use OpenStreetMaps as Base Layer"
 msgstr ""
 
@@ -575,35 +577,35 @@ msgstr ""
 #: libraries/display_change_password.lib.php:162
 #: libraries/display_export.lib.php:402 libraries/display_export.lib.php:408
 #: libraries/display_import.lib.php:392 libraries/index.lib.php:44
-#: libraries/insert_edit.lib.php:1546 libraries/insert_edit.lib.php:1583
+#: libraries/insert_edit.lib.php:1544 libraries/insert_edit.lib.php:1581
 #: libraries/normalization.lib.php:165 libraries/normalization.lib.php:821
 #: libraries/operations.lib.php:38 libraries/operations.lib.php:108
 #: libraries/operations.lib.php:263 libraries/operations.lib.php:306
 #: libraries/operations.lib.php:801 libraries/operations.lib.php:874
 #: libraries/operations.lib.php:923 libraries/operations.lib.php:1337
 #: libraries/operations.lib.php:1658
-#: libraries/plugins/auth/AuthenticationCookie.class.php:244
+#: libraries/plugins/auth/AuthenticationCookie.class.php:232
 #: libraries/replication_gui.lib.php:122 libraries/replication_gui.lib.php:161
 #: libraries/replication_gui.lib.php:324 libraries/replication_gui.lib.php:461
 #: libraries/replication_gui.lib.php:906 libraries/rte/rte_events.lib.php:509
-#: libraries/rte/rte_routines.lib.php:969
-#: libraries/rte/rte_routines.lib.php:1581
+#: libraries/rte/rte_routines.lib.php:1060
+#: libraries/rte/rte_routines.lib.php:1672
 #: libraries/rte/rte_triggers.lib.php:396 libraries/server_bin_log.lib.php:61
 #: libraries/server_privileges.lib.php:705
 #: libraries/server_privileges.lib.php:2106
 #: libraries/server_privileges.lib.php:2872
 #: libraries/server_privileges.lib.php:3553
-#: libraries/server_privileges.lib.php:4627
+#: libraries/server_privileges.lib.php:4653
 #: libraries/server_user_groups.lib.php:285
 #: libraries/sql_query_form.lib.php:369 libraries/sql_query_form.lib.php:429
 #: libraries/tracking.lib.php:533 libraries/tracking.lib.php:653
 #: prefs_manage.php:277 prefs_manage.php:355
 #: templates/columns_definitions/column_definitions_form.phtml:59
-#: templates/header_location.phtml:17 templates/index_form.phtml:238
+#: templates/database/create_table.phtml:21 templates/header_location.phtml:28
 #: templates/startAndNumberOfRowsPanel.phtml:14
-#: templates/structure/add_column.phtml:25
-#: templates/table/create_table.phtml:21
-#: templates/table/selection_form.phtml:75 view_create.php:275
+#: templates/table/index_form.phtml:238
+#: templates/table/search/selection_form.phtml:75
+#: templates/table/structure/add_column.phtml:25 view_create.php:275
 #: view_operations.php:106
 msgid "Go"
 msgstr "Кет"
@@ -685,7 +687,7 @@ msgstr ""
 msgid "Could not load import plugins, please check your installation!"
 msgstr ""
 
-#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1466
+#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1460
 #, fuzzy, php-format
 #| msgid "Database %1$s has been created."
 msgid "Bookmark %s has been created."
@@ -720,11 +722,11 @@ msgstr ""
 msgid "Back"
 msgstr ""
 
-#: index.php:148 libraries/Footer.class.php:70
+#: index.php:149 libraries/Footer.class.php:70
 msgid "phpMyAdmin Demo Server"
 msgstr ""
 
-#: index.php:152
+#: index.php:153
 #, php-format
 msgid ""
 "You are using the demo server. You can do anything here, but please do not "
@@ -732,112 +734,112 @@ msgid ""
 "at %s."
 msgstr ""
 
-#: index.php:162
+#: index.php:163
 msgid "General Settings"
 msgstr ""
 
-#: index.php:190 libraries/display_change_password.lib.php:50
+#: index.php:191 libraries/display_change_password.lib.php:50
 #: libraries/display_change_password.lib.php:53 user_password.php:247
 msgid "Change password"
 msgstr ""
 
-#: index.php:206
+#: index.php:207
 msgid "Server connection collation"
 msgstr ""
 
-#: index.php:228
+#: index.php:229
 msgid "Appearance Settings"
 msgstr ""
 
-#: index.php:258 prefs_manage.php:285
+#: index.php:259 prefs_manage.php:285
 msgid "More settings"
 msgstr ""
 
-#: index.php:279
+#: index.php:280
 msgid "Database server"
 msgstr ""
 
-#: index.php:282 libraries/plugins/auth/AuthenticationCookie.class.php:181
+#: index.php:283 libraries/plugins/auth/AuthenticationCookie.class.php:169
 msgid "Server:"
 msgstr ""
 
-#: index.php:286
+#: index.php:287
 msgid "Server type:"
 msgstr ""
 
-#: index.php:290 libraries/plugins/export/ExportLatex.class.php:212
+#: index.php:291 libraries/plugins/export/ExportLatex.class.php:212
 #: libraries/plugins/export/ExportSql.class.php:687
 #: libraries/plugins/export/ExportXml.class.php:189
 msgid "Server version:"
 msgstr ""
 
-#: index.php:296
+#: index.php:297
 msgid "Protocol version:"
 msgstr ""
 
-#: index.php:300
+#: index.php:301
 msgid "User:"
 msgstr ""
 
-#: index.php:305
+#: index.php:306
 msgid "Server charset:"
 msgstr ""
 
-#: index.php:320
+#: index.php:321
 msgid "Web server"
 msgstr ""
 
-#: index.php:331
+#: index.php:332
 msgid "Database client version:"
 msgstr ""
 
-#: index.php:335
+#: index.php:336
 msgid "PHP extension:"
 msgstr ""
 
-#: index.php:349
+#: index.php:350
 #, fuzzy
 #| msgid "Last version"
 msgid "PHP version:"
 msgstr "Акыркы версия"
 
-#: index.php:360
+#: index.php:361
 msgid "Show PHP information"
 msgstr ""
 
-#: index.php:383
+#: index.php:384
 msgid "Version information:"
 msgstr ""
 
-#: index.php:392 libraries/Util.class.php:432 libraries/Util.class.php:495
-#: libraries/config/FormDisplay.tpl.php:151
+#: index.php:393 libraries/Util.class.php:432 libraries/Util.class.php:495
+#: libraries/config/FormDisplay.tpl.php:162
 #: libraries/display_export.lib.php:577 libraries/engines/pbxt.lib.php:162
 #: libraries/navigation/NavigationHeader.class.php:196
 #: libraries/server_variables.lib.php:160
 msgid "Documentation"
 msgstr ""
 
-#: index.php:399
+#: index.php:400
 msgid "Wiki"
 msgstr ""
 
-#: index.php:408
+#: index.php:409
 msgid "Official Homepage"
 msgstr ""
 
-#: index.php:415
+#: index.php:416
 msgid "Contribute"
 msgstr ""
 
-#: index.php:422
+#: index.php:423
 msgid "Get support"
 msgstr ""
 
-#: index.php:429
+#: index.php:430
 msgid "List of changes"
 msgstr ""
 
-#: index.php:451
+#: index.php:452
 msgid ""
 "You are connected as 'root' with no password, which corresponds to the "
 "default MySQL privileged account. Your MySQL server is running with this "
@@ -845,21 +847,21 @@ msgid ""
 "by setting a password for user 'root'."
 msgstr ""
 
-#: index.php:468
+#: index.php:469
 msgid ""
 "You have enabled mbstring.func_overload in your PHP configuration. This "
 "option is incompatible with phpMyAdmin and might cause some data to be "
 "corrupted!"
 msgstr ""
 
-#: index.php:483
+#: index.php:484
 msgid ""
 "The mbstring PHP extension was not found and you seem to be using a "
 "multibyte charset. Without the mbstring extension phpMyAdmin is unable to "
 "split strings correctly and it may result in unexpected results."
 msgstr ""
 
-#: index.php:500
+#: index.php:501
 msgid ""
 "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini."
 "session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower than "
@@ -867,17 +869,17 @@ msgid ""
 "expire sooner than configured in phpMyAdmin."
 msgstr ""
 
-#: index.php:519
+#: index.php:520
 msgid ""
 "Login cookie store is lower than cookie validity configured in phpMyAdmin, "
 "because of this, your login will expire sooner than configured in phpMyAdmin."
 msgstr ""
 
-#: index.php:535
+#: index.php:536
 msgid "The configuration file now needs a secret passphrase (blowfish_secret)."
 msgstr ""
 
-#: index.php:548
+#: index.php:549
 msgid ""
 "Directory [code]config[/code], which is used by the setup script, still "
 "exists in your phpMyAdmin directory. It is strongly recommended to remove it "
@@ -885,7 +887,7 @@ msgid ""
 "may be compromised by unauthorized people downloading your configuration."
 msgstr ""
 
-#: index.php:564
+#: index.php:565
 #, fuzzy, php-format
 #| msgid ""
 #| "The phpMyAdmin configuration storage has been deactivated. To find out "
@@ -897,19 +899,19 @@ msgstr ""
 "пхпМенинАдминимдин конфигурацияларын сактоо очурулду. Табуу учун эмнеге "
 "%shere%s бастыныз."
 
-#: index.php:571
+#: index.php:572
 msgid ""
 "Or alternately go to 'Operations' tab of any database to set it up there."
 msgstr ""
 
-#: index.php:620
+#: index.php:621
 #, php-format
 msgid ""
 "Your PHP MySQL library version %s differs from your MySQL server version %s. "
 "This may cause unpredictable behavior."
 msgstr ""
 
-#: index.php:648
+#: index.php:649
 #, php-format
 msgid ""
 "Server running with Suhosin. Please refer to %sdocumentation%s for possible "
@@ -1050,8 +1052,8 @@ msgstr ""
 msgid "Save & Close"
 msgstr ""
 
-#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:404
-#: libraries/insert_edit.lib.php:1550 prefs_manage.php:361
+#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:415
+#: libraries/insert_edit.lib.php:1548 prefs_manage.php:361
 #: prefs_manage.php:372
 msgid "Reset"
 msgstr ""
@@ -1086,7 +1088,7 @@ msgstr ""
 msgid "Edit Index"
 msgstr ""
 
-#: js/messages.php:99 templates/index_form.phtml:232
+#: js/messages.php:99 templates/table/index_form.phtml:232
 #, php-format
 msgid "Add %s column(s) to index"
 msgstr ""
@@ -1107,13 +1109,14 @@ msgstr ""
 msgid "Please select column(s) for the index."
 msgstr ""
 
-#: js/messages.php:106 templates/structure/add_column.phtml:1
+#: js/messages.php:106 templates/table/structure/add_column.phtml:1
 msgid "You have to add at least one column."
 msgstr ""
 
-#: js/messages.php:109 libraries/insert_edit.lib.php:1548
+#: js/messages.php:109 libraries/insert_edit.lib.php:1546
 #: templates/columns_definitions/column_definitions_form.phtml:162
-#: templates/index_form.phtml:237 templates/tbl_relation/common_form.phtml:106
+#: templates/table/index_form.phtml:237
+#: templates/table/relation/common_form.phtml:106
 msgid "Preview SQL"
 msgstr ""
 
@@ -1130,7 +1133,7 @@ msgid "SQL query:"
 msgstr ""
 
 #. l10n: Default label for the y-Axis of Charts
-#: js/messages.php:118 templates/tbl_chart.phtml:109
+#: js/messages.php:118 templates/table/chart/tbl_chart.phtml:109
 msgid "Y Values"
 msgstr ""
 
@@ -1283,7 +1286,7 @@ msgstr ""
 msgid "Bytes received"
 msgstr ""
 
-#: js/messages.php:169 libraries/server_status.lib.php:226
+#: js/messages.php:169 libraries/server_status.lib.php:235
 msgid "Connections"
 msgstr ""
 
@@ -1340,12 +1343,12 @@ msgstr ""
 msgid "Questions"
 msgstr ""
 
-#: js/messages.php:184 libraries/server_status.lib.php:134
+#: js/messages.php:184 libraries/server_status.lib.php:143
 msgid "Traffic"
 msgstr ""
 
 #: js/messages.php:185 libraries/Menu.class.php:586
-#: libraries/Util.class.php:4318 libraries/server_status_monitor.lib.php:257
+#: libraries/Util.class.php:4324 libraries/server_status_monitor.lib.php:257
 msgid "Settings"
 msgstr ""
 
@@ -1365,8 +1368,9 @@ msgstr ""
 #: libraries/server_status_monitor.lib.php:236
 #: libraries/server_status_processes.lib.php:308
 #: templates/columns_definitions/transformation.phtml:4
-#: templates/designer/options_panel.phtml:178
-#: templates/table/options_zoom.phtml:12 templates/table/rows_zoom.phtml:26
+#: templates/database/designer/options_panel.phtml:178
+#: templates/table/search/options_zoom.phtml:12
+#: templates/table/search/rows_zoom.phtml:26
 msgid "None"
 msgstr ""
 
@@ -1634,8 +1638,8 @@ msgstr ""
 
 #: js/messages.php:270 libraries/Menu.class.php:352
 #: libraries/Menu.class.php:455 libraries/Menu.class.php:582
-#: libraries/Util.class.php:4317 libraries/Util.class.php:4332
-#: libraries/Util.class.php:4349 libraries/config/messages.inc.php:258
+#: libraries/Util.class.php:4323 libraries/Util.class.php:4338
+#: libraries/Util.class.php:4355 libraries/config/messages.inc.php:258
 #: libraries/display_import.lib.php:105
 #: libraries/server_status_monitor.lib.php:318 prefs_manage.php:238
 #: setup/frames/menu.inc.php:26
@@ -1695,13 +1699,13 @@ msgid "Formatting SQL..."
 msgstr ""
 
 #: js/messages.php:293 libraries/server_variables.lib.php:157
-#: templates/designer/aggregate_query_panel.phtml:63
-#: templates/designer/delete_relation_panel.phtml:28
-#: templates/designer/having_query_panel.phtml:117
-#: templates/designer/new_relation_panel.phtml:88
-#: templates/designer/options_panel.phtml:253
-#: templates/designer/rename_to_panel.phtml:45
-#: templates/designer/where_query_panel.phtml:83
+#: templates/database/designer/aggregate_query_panel.phtml:63
+#: templates/database/designer/delete_relation_panel.phtml:28
+#: templates/database/designer/having_query_panel.phtml:117
+#: templates/database/designer/new_relation_panel.phtml:88
+#: templates/database/designer/options_panel.phtml:253
+#: templates/database/designer/rename_to_panel.phtml:45
+#: templates/database/designer/where_query_panel.phtml:83
 msgid "Cancel"
 msgstr ""
 
@@ -1709,7 +1713,7 @@ msgstr ""
 msgid "Page-related settings"
 msgstr ""
 
-#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:402
+#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:413
 msgid "Apply"
 msgstr ""
 
@@ -1744,8 +1748,8 @@ msgstr ""
 msgid "Error text: %s"
 msgstr ""
 
-#: js/messages.php:307 libraries/db_common.inc.php:68
-#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:450
+#: js/messages.php:307 libraries/db_common.inc.php:69
+#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:461
 msgid "No databases selected."
 msgstr ""
 
@@ -1757,12 +1761,13 @@ msgstr ""
 msgid "Adding Primary Key"
 msgstr ""
 
-#: js/messages.php:310 templates/designer/aggregate_query_panel.phtml:59
-#: templates/designer/having_query_panel.phtml:113
-#: templates/designer/new_relation_panel.phtml:87
-#: templates/designer/options_panel.phtml:252
-#: templates/designer/rename_to_panel.phtml:41
-#: templates/designer/where_query_panel.phtml:82
+#: js/messages.php:310
+#: templates/database/designer/aggregate_query_panel.phtml:59
+#: templates/database/designer/having_query_panel.phtml:113
+#: templates/database/designer/new_relation_panel.phtml:87
+#: templates/database/designer/options_panel.phtml:252
+#: templates/database/designer/rename_to_panel.phtml:41
+#: templates/database/designer/where_query_panel.phtml:82
 msgid "OK"
 msgstr ""
 
@@ -1782,7 +1787,7 @@ msgstr ""
 msgid "Changing Charset"
 msgstr ""
 
-#: js/messages.php:320 libraries/Util.class.php:3217
+#: js/messages.php:320 libraries/Util.class.php:3223
 msgid "Enable foreign key checks"
 msgstr ""
 
@@ -1817,20 +1822,21 @@ msgstr ""
 #: js/messages.php:334 libraries/DisplayResults.class.php:4834
 #: libraries/DisplayResults.class.php:5092 libraries/Menu.class.php:344
 #: libraries/Menu.class.php:446 libraries/Menu.class.php:578
-#: libraries/Util.class.php:3636 libraries/Util.class.php:3637
-#: libraries/Util.class.php:4316 libraries/Util.class.php:4331
-#: libraries/Util.class.php:4348 libraries/config/messages.inc.php:252
+#: libraries/Util.class.php:3642 libraries/Util.class.php:3643
+#: libraries/Util.class.php:4322 libraries/Util.class.php:4337
+#: libraries/Util.class.php:4354 libraries/config/messages.inc.php:252
 #: libraries/display_export.lib.php:173 libraries/rte/rte_list.lib.php:146
 #: libraries/server_privileges.lib.php:2211
 #: libraries/server_privileges.lib.php:2290
 #: libraries/server_privileges.lib.php:2632
 #: libraries/server_privileges.lib.php:3356
 #: libraries/server_status_monitor.lib.php:322 prefs_manage.php:303
-#: setup/frames/menu.inc.php:27 templates/structure/check_all_tables.phtml:11
+#: setup/frames/menu.inc.php:27
+#: templates/database/structure/check_all_tables.phtml:11
 msgid "Export"
 msgstr ""
 
-#: js/messages.php:337 libraries/rte/rte_routines.lib.php:652
+#: js/messages.php:337 libraries/rte/rte_routines.lib.php:743
 msgid "ENUM/SET editor"
 msgstr ""
 
@@ -1869,7 +1875,7 @@ msgstr ""
 #: libraries/Console.class.php:214 libraries/DisplayResults.class.php:3474
 #: libraries/DisplayResults.class.php:4818 libraries/Index.class.php:723
 #: libraries/Util.class.php:706 libraries/Util.class.php:1202
-#: libraries/Util.class.php:3634 libraries/Util.class.php:3635
+#: libraries/Util.class.php:3640 libraries/Util.class.php:3641
 #: libraries/central_columns.lib.php:851
 #: libraries/central_columns.lib.php:1193
 #: libraries/config/messages.inc.php:892
@@ -1887,7 +1893,7 @@ msgstr ""
 #: libraries/server_user_groups.lib.php:129
 #: libraries/sql_query_form.lib.php:416 libraries/tracking.lib.php:477
 #: setup/frames/index.inc.php:183 setup/frames/index.inc.php:291
-#: templates/designer/delete_relation_panel.phtml:27
+#: templates/database/designer/delete_relation_panel.phtml:27
 msgid "Delete"
 msgstr ""
 
@@ -2048,11 +2054,11 @@ msgid "No dependencies selected!"
 msgstr ""
 
 #: js/messages.php:394 libraries/central_columns.lib.php:1214
-#: libraries/insert_edit.lib.php:1458 libraries/server_variables.lib.php:155
+#: libraries/insert_edit.lib.php:1456 libraries/server_variables.lib.php:155
 #: setup/frames/config.inc.php:42 setup/frames/index.inc.php:279
 #: templates/columns_definitions/column_definitions_form.phtml:165
-#: templates/gis_visualization/gis_visualization.phtml:48
-#: templates/tbl_relation/common_form.phtml:107
+#: templates/table/gis_visualization/gis_visualization.phtml:48
+#: templates/table/relation/common_form.phtml:107
 msgid "Save"
 msgstr ""
 
@@ -2129,8 +2135,8 @@ msgid "Data point content"
 msgstr ""
 
 #: js/messages.php:430 js/messages.php:562 js/messages.php:579
-#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2573
-#: templates/index_form.phtml:154 templates/index_form.phtml:194
+#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2571
+#: templates/table/index_form.phtml:154 templates/table/index_form.phtml:194
 msgid "Ignore"
 msgstr ""
 
@@ -2189,8 +2195,8 @@ msgstr ""
 msgid "Please select the primary key or a unique key!"
 msgstr ""
 
-#: js/messages.php:457 templates/designer/side_menu.phtml:91
-#: templates/designer/side_menu.phtml:94
+#: js/messages.php:457 templates/database/designer/side_menu.phtml:91
+#: templates/database/designer/side_menu.phtml:94
 msgid "Choose column to display"
 msgstr ""
 
@@ -2204,18 +2210,18 @@ msgstr ""
 msgid "Page name"
 msgstr ""
 
-#: js/messages.php:463 templates/designer/side_menu.phtml:56
-#: templates/designer/side_menu.phtml:59
+#: js/messages.php:463 templates/database/designer/side_menu.phtml:56
+#: templates/database/designer/side_menu.phtml:59
 msgid "Save page"
 msgstr ""
 
-#: js/messages.php:464 templates/designer/side_menu.phtml:63
-#: templates/designer/side_menu.phtml:66
+#: js/messages.php:464 templates/database/designer/side_menu.phtml:63
+#: templates/database/designer/side_menu.phtml:66
 msgid "Save page as"
 msgstr ""
 
-#: js/messages.php:465 templates/designer/side_menu.phtml:49
-#: templates/designer/side_menu.phtml:52
+#: js/messages.php:465 templates/database/designer/side_menu.phtml:49
+#: templates/database/designer/side_menu.phtml:52
 msgid "Open page"
 msgstr ""
 
@@ -2223,7 +2229,7 @@ msgstr ""
 msgid "Delete page"
 msgstr ""
 
-#: js/messages.php:467 templates/designer/side_menu.phtml:10
+#: js/messages.php:467 templates/database/designer/side_menu.phtml:10
 msgid "Untitled"
 msgstr ""
 
@@ -2335,7 +2341,7 @@ msgstr ""
 msgid "cancel"
 msgstr ""
 
-#: js/messages.php:499 libraries/server_status.lib.php:271
+#: js/messages.php:499 libraries/server_status.lib.php:280
 msgid "Aborted"
 msgstr ""
 
@@ -2895,7 +2901,7 @@ msgstr ""
 
 #: js/messages.php:793 libraries/Message.class.php:199
 #: libraries/Util.class.php:654 libraries/core.lib.php:245
-#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1172
+#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1170
 #: tbl_operations.php:229 view_operations.php:63
 msgid "Error"
 msgstr ""
@@ -2954,8 +2960,8 @@ msgstr ""
 msgid "per minute"
 msgstr ""
 
-#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:143
-#: libraries/server_status.lib.php:228
+#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:152
+#: libraries/server_status.lib.php:237
 #: libraries/server_status_queries.lib.php:98
 msgid "per hour"
 msgstr ""
@@ -2973,7 +2979,7 @@ msgstr ""
 msgid "Wrong permissions on configuration file, should not be world writable!"
 msgstr ""
 
-#: libraries/Config.class.php:1799
+#: libraries/Config.class.php:1801
 msgid "Font size"
 msgstr ""
 
@@ -3001,10 +3007,10 @@ msgstr ""
 #: libraries/server_privileges.lib.php:2890
 #: libraries/server_privileges.lib.php:3144
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4332
+#: libraries/server_privileges.lib.php:4358
 #: libraries/server_status_processes.lib.php:80
-#: templates/tbl_relation/foreign_key_row.phtml:165
-#: templates/tbl_relation/internal_relational_row.phtml:55
+#: templates/table/relation/foreign_key_row.phtml:165
+#: templates/table/relation/internal_relational_row.phtml:55
 msgid "Database"
 msgstr "Берилиштер базасы"
 
@@ -3097,11 +3103,11 @@ msgstr ""
 #: libraries/plugins/import/ImportMediawiki.class.php:60
 #: libraries/plugins/import/ImportOds.class.php:59
 #: libraries/plugins/import/ImportShp.class.php:57
-#: libraries/plugins/import/ImportSql.class.php:148
+#: libraries/plugins/import/ImportSql.class.php:51
 #: libraries/plugins/import/ImportXml.class.php:58
-#: libraries/rte/rte_routines.lib.php:833 templates/index_form.phtml:49
-#: templates/structure/row_stats_table.phtml:20
-#: templates/table/options.phtml:2
+#: libraries/rte/rte_routines.lib.php:924 templates/table/index_form.phtml:49
+#: templates/table/search/options.phtml:2
+#: templates/table/structure/row_stats_table.phtml:20
 msgid "Options"
 msgstr ""
 
@@ -3134,7 +3140,8 @@ msgstr ""
 msgid "Order:"
 msgstr ""
 
-#: libraries/Console.class.php:289 templates/table/replace_preview.phtml:17
+#: libraries/Console.class.php:289
+#: templates/table/search/replace_preview.phtml:17
 msgid "Count"
 msgstr ""
 
@@ -3235,9 +3242,9 @@ msgstr ""
 #: libraries/operations.lib.php:794 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:191
-#: templates/structure/sortable_header.phtml:21
-#: templates/structure/sortable_header.phtml:38
-#: templates/table/options.phtml:68
+#: templates/database/structure/sortable_header.phtml:21
+#: templates/database/structure/sortable_header.phtml:38
+#: templates/table/search/options.phtml:68
 msgid "Ascending"
 msgstr ""
 
@@ -3247,13 +3254,14 @@ msgstr ""
 #: libraries/operations.lib.php:797 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:188
-#: templates/structure/sortable_header.phtml:26
-#: templates/structure/sortable_header.phtml:43
-#: templates/table/options.phtml:69
+#: templates/database/structure/sortable_header.phtml:26
+#: templates/database/structure/sortable_header.phtml:43
+#: templates/table/search/options.phtml:69
 msgid "Descending"
 msgstr ""
 
-#: libraries/DBQbe.class.php:467 templates/table/search_and_replace.phtml:6
+#: libraries/DBQbe.class.php:467
+#: templates/table/search/search_and_replace.phtml:6
 msgid "Column:"
 msgstr ""
 
@@ -3408,12 +3416,12 @@ msgstr[0] ""
 msgstr[1] ""
 
 #: libraries/DbSearch.class.php:354 libraries/Menu.class.php:311
-#: libraries/Util.class.php:3337 libraries/Util.class.php:3347
-#: libraries/Util.class.php:3623 libraries/Util.class.php:3624
-#: libraries/Util.class.php:4343 libraries/config.values.php:43
+#: libraries/Util.class.php:3343 libraries/Util.class.php:3353
+#: libraries/Util.class.php:3629 libraries/Util.class.php:3630
+#: libraries/Util.class.php:4349 libraries/config.values.php:43
 #: libraries/config.values.php:51 libraries/config.values.php:119
 #: libraries/navigation/Nodes/Node_Table.class.php:295
-#: templates/structure/check_all_table_column.phtml:5
+#: templates/table/structure/check_all_table_column.phtml:5
 msgid "Browse"
 msgstr ""
 
@@ -3430,7 +3438,8 @@ msgstr ""
 msgid "Words or values to search for (wildcard: \"%\"):"
 msgstr ""
 
-#: libraries/DbSearch.class.php:401 templates/table/search_and_replace.phtml:1
+#: libraries/DbSearch.class.php:401
+#: templates/table/search/search_and_replace.phtml:1
 msgid "Find:"
 msgstr ""
 
@@ -3474,28 +3483,28 @@ msgstr ""
 msgid "Search this table"
 msgstr ""
 
-#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2532
-#: libraries/Util.class.php:2535
+#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2538
+#: libraries/Util.class.php:2541
 msgctxt "First page"
 msgid "Begin"
 msgstr ""
 
-#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2533
-#: libraries/Util.class.php:2536 libraries/server_bin_log.lib.php:170
+#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2539
+#: libraries/Util.class.php:2542 libraries/server_bin_log.lib.php:170
 #: libraries/server_bin_log.lib.php:172
 msgctxt "Previous page"
 msgid "Previous"
 msgstr ""
 
-#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2564
-#: libraries/Util.class.php:2574 libraries/server_bin_log.lib.php:204
+#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2570
+#: libraries/Util.class.php:2580 libraries/server_bin_log.lib.php:204
 #: libraries/server_bin_log.lib.php:206
 msgctxt "Next page"
 msgid "Next"
 msgstr ""
 
-#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2565
-#: libraries/Util.class.php:2575
+#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2571
+#: libraries/Util.class.php:2581
 msgctxt "Last page"
 msgid "End"
 msgstr ""
@@ -3572,15 +3581,15 @@ msgid "May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]."
 msgstr ""
 
 #: libraries/DisplayResults.class.php:4332 libraries/Message.class.php:180
-#: libraries/controllers/TableRelationController.class.php:258
+#: libraries/controllers/TableRelationController.class.php:259
 #: libraries/controllers/TableSearchController.class.php:655
-#: libraries/rte/rte_routines.lib.php:1332 libraries/sql_query_form.lib.php:89
+#: libraries/rte/rte_routines.lib.php:1423 libraries/sql_query_form.lib.php:89
 #: tbl_operations.php:227 tbl_row_action.php:138 view_operations.php:62
 msgid "Your SQL query has been executed successfully."
 msgstr ""
 
 #: libraries/DisplayResults.class.php:4660
-#: libraries/controllers/StructureController.class.php:629
+#: libraries/controllers/DatabaseStructureController.class.php:564
 #, php-format
 msgid ""
 "This view has at least this number of rows. Please refer to %sdocumentation"
@@ -3602,33 +3611,33 @@ msgstr ""
 msgid "%d total"
 msgstr ""
 
-#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1318
+#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1312
 #, php-format
 msgid "Query took %01.4f seconds."
 msgstr ""
 
 #: libraries/DisplayResults.class.php:4807
-#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4767
-#: libraries/Util.class.php:4773 libraries/mult_submits.inc.php:50
-#: templates/structure/check_all_tables.phtml:2
-#: templates/structure/check_all_tables.phtml:9
+#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4773
+#: libraries/Util.class.php:4779 libraries/mult_submits.inc.php:50
+#: templates/database/structure/check_all_tables.phtml:2
+#: templates/database/structure/check_all_tables.phtml:9
 msgid "With selected:"
 msgstr ""
 
 #: libraries/DisplayResults.class.php:4811
-#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4769
-#: libraries/Util.class.php:4770 libraries/server_privileges.lib.php:1174
+#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4775
+#: libraries/Util.class.php:4776 libraries/server_privileges.lib.php:1174
 #: libraries/server_privileges.lib.php:1175
 #: libraries/server_privileges.lib.php:1387
 #: libraries/server_user_groups.lib.php:231
-#: templates/structure/check_all_tables.phtml:3
-#: templates/structure/check_all_tables.phtml:4
+#: templates/database/structure/check_all_tables.phtml:3
+#: templates/database/structure/check_all_tables.phtml:4
 msgid "Check All"
 msgstr ""
 
 #: libraries/DisplayResults.class.php:4985 libraries/Header.class.php:383
-#: templates/structure/optional_action_links.phtml:1
-#: templates/structure/print_view_data_dictionary_link.phtml:3
+#: templates/database/structure/print_view_data_dictionary_link.phtml:3
+#: templates/table/structure/optional_action_links.phtml:1
 msgid "Print view"
 msgstr ""
 
@@ -3636,7 +3645,8 @@ msgstr ""
 msgid "Query results operations"
 msgstr ""
 
-#: libraries/DisplayResults.class.php:5105 templates/tbl_chart.phtml:12
+#: libraries/DisplayResults.class.php:5105
+#: templates/table/chart/tbl_chart.phtml:12
 msgid "Display chart"
 msgstr ""
 
@@ -3727,7 +3737,7 @@ msgid "Click on the bar to scroll to top of page"
 msgstr ""
 
 #: libraries/Header.class.php:749
-#: libraries/plugins/auth/AuthenticationCookie.class.php:152
+#: libraries/plugins/auth/AuthenticationCookie.class.php:140
 msgid "Javascript must be enabled past this point!"
 msgstr ""
 
@@ -3749,11 +3759,11 @@ msgid "Keyname"
 msgstr ""
 
 #: libraries/Index.class.php:697
-#: libraries/controllers/StructureController.class.php:1962
-#: libraries/controllers/StructureController.class.php:1967
+#: libraries/controllers/TableStructureController.class.php:953
+#: libraries/controllers/TableStructureController.class.php:958
 #: libraries/tracking.lib.php:973
 #: templates/columns_definitions/column_indexes.phtml:11
-#: templates/structure/check_all_table_column.phtml:26
+#: templates/table/structure/check_all_table_column.phtml:26
 msgid "Unique"
 msgstr ""
 
@@ -3772,16 +3782,17 @@ msgstr ""
 #: libraries/server_collations.lib.php:35 libraries/tracking.lib.php:881
 #: libraries/tracking.lib.php:977
 #: templates/columns_definitions/table_fields_definitions.phtml:33
-#: templates/structure/row_stats_table.phtml:31
-#: templates/structure/table_header.phtml:55
-#: templates/structure/table_structure_header.phtml:7
-#: templates/table/table_header.phtml:8
+#: templates/database/structure/table_header.phtml:55
+#: templates/table/search/table_header.phtml:8
+#: templates/table/structure/row_stats_table.phtml:31
+#: templates/table/structure/table_structure_header.phtml:7
 msgid "Collation"
 msgstr ""
 
 #: libraries/Index.class.php:703 libraries/rte/rte_events.lib.php:496
-#: libraries/rte/rte_routines.lib.php:956 libraries/tracking.lib.php:885
-#: libraries/tracking.lib.php:979 templates/structure/table_header.phtml:84
+#: libraries/rte/rte_routines.lib.php:1047 libraries/tracking.lib.php:885
+#: libraries/tracking.lib.php:979
+#: templates/database/structure/table_header.phtml:84
 msgid "Comment"
 msgstr ""
 
@@ -3794,15 +3805,15 @@ msgstr ""
 msgid "Index %s has been dropped."
 msgstr ""
 
-#: libraries/Index.class.php:757 libraries/Util.class.php:3630
-#: libraries/Util.class.php:3631
-#: libraries/controllers/StructureController.class.php:1958
-#: libraries/controllers/StructureController.class.php:1959
+#: libraries/Index.class.php:757 libraries/Util.class.php:3636
+#: libraries/Util.class.php:3637
+#: libraries/controllers/TableStructureController.class.php:949
+#: libraries/controllers/TableStructureController.class.php:950
 #: libraries/operations.lib.php:1607 libraries/rte/rte_list.lib.php:150
 #: libraries/server_databases.lib.php:146
-#: templates/structure/check_all_table_column.phtml:15
-#: templates/structure/check_all_tables.phtml:16
-#: templates/tbl_relation/foreign_key_row.phtml:93
+#: templates/database/structure/check_all_tables.phtml:16
+#: templates/table/relation/foreign_key_row.phtml:93
+#: templates/table/structure/check_all_table_column.phtml:15
 msgid "Drop"
 msgstr "Алып сал"
 
@@ -3831,16 +3842,16 @@ msgstr ""
 #: libraries/Menu.class.php:248
 #: libraries/navigation/Nodes/Node_View.class.php:32
 #: libraries/tbl_info.inc.php:63
-#: templates/structure/structure_table_row.phtml:97
-#: templates/structure/structure_table_row.phtml:159
+#: templates/database/structure/structure_table_row.phtml:97
+#: templates/database/structure/structure_table_row.phtml:159
 msgid "View"
 msgstr ""
 
 #: libraries/Menu.class.php:325 libraries/Menu.class.php:429
-#: libraries/Menu.class.php:548 libraries/Util.class.php:3334
-#: libraries/Util.class.php:3344 libraries/Util.class.php:3350
-#: libraries/Util.class.php:4313 libraries/Util.class.php:4328
-#: libraries/Util.class.php:4345 libraries/config.values.php:40
+#: libraries/Menu.class.php:548 libraries/Util.class.php:3340
+#: libraries/Util.class.php:3350 libraries/Util.class.php:3356
+#: libraries/Util.class.php:4319 libraries/Util.class.php:4334
+#: libraries/Util.class.php:4351 libraries/config.values.php:40
 #: libraries/config.values.php:48 libraries/config.values.php:110
 #: libraries/config.values.php:116 libraries/config/messages.inc.php:321
 #: libraries/navigation/Nodes/Node_Table.class.php:292
@@ -3848,19 +3859,19 @@ msgid "SQL"
 msgstr ""
 
 #: libraries/Menu.class.php:328 libraries/Menu.class.php:432
-#: libraries/Util.class.php:3335 libraries/Util.class.php:3345
-#: libraries/Util.class.php:3351 libraries/Util.class.php:3625
-#: libraries/Util.class.php:3626 libraries/Util.class.php:4329
-#: libraries/Util.class.php:4346 libraries/config.values.php:41
+#: libraries/Util.class.php:3341 libraries/Util.class.php:3351
+#: libraries/Util.class.php:3357 libraries/Util.class.php:3631
+#: libraries/Util.class.php:3632 libraries/Util.class.php:4335
+#: libraries/Util.class.php:4352 libraries/config.values.php:41
 #: libraries/config.values.php:49 libraries/config.values.php:111
 #: libraries/config.values.php:117
 #: libraries/navigation/Nodes/Node_Table.class.php:286
 msgid "Search"
 msgstr ""
 
-#: libraries/Menu.class.php:338 libraries/Util.class.php:3336
-#: libraries/Util.class.php:3346 libraries/Util.class.php:3627
-#: libraries/Util.class.php:3628 libraries/Util.class.php:4347
+#: libraries/Menu.class.php:338 libraries/Util.class.php:3342
+#: libraries/Util.class.php:3352 libraries/Util.class.php:3633
+#: libraries/Util.class.php:3634 libraries/Util.class.php:4353
 #: libraries/config.values.php:42 libraries/config.values.php:50
 #: libraries/config.values.php:118
 #: libraries/navigation/Nodes/Node_Table.class.php:289
@@ -3869,30 +3880,30 @@ msgid "Insert"
 msgstr ""
 
 #: libraries/Menu.class.php:362 libraries/Menu.class.php:467
-#: libraries/Util.class.php:4334 libraries/Util.class.php:4350
+#: libraries/Util.class.php:4340 libraries/Util.class.php:4356
 #: libraries/config.values.php:106 libraries/server_common.lib.php:51
 #: libraries/server_privileges.lib.php:2370
 #: libraries/server_privileges.lib.php:3158
-#: libraries/server_privileges.lib.php:4221
+#: libraries/server_privileges.lib.php:4247
 msgid "Privileges"
 msgstr ""
 
 #: libraries/Menu.class.php:371 libraries/Menu.class.php:379
-#: libraries/Menu.class.php:459 libraries/Util.class.php:3338
-#: libraries/Util.class.php:3352 libraries/Util.class.php:4333
-#: libraries/Util.class.php:4351 libraries/config.values.php:112
+#: libraries/Menu.class.php:459 libraries/Util.class.php:3344
+#: libraries/Util.class.php:3358 libraries/Util.class.php:4339
+#: libraries/Util.class.php:4357 libraries/config.values.php:112
 #: view_operations.php:92
 msgid "Operations"
 msgstr ""
 
 #: libraries/Menu.class.php:384 libraries/Menu.class.php:492
-#: libraries/Util.class.php:4338 libraries/Util.class.php:4352
+#: libraries/Util.class.php:4344 libraries/Util.class.php:4358
 #: libraries/relation.lib.php:255
 msgid "Tracking"
 msgstr ""
 
 #: libraries/Menu.class.php:397 libraries/Menu.class.php:486
-#: libraries/Util.class.php:4337 libraries/Util.class.php:4353
+#: libraries/Util.class.php:4343 libraries/Util.class.php:4359
 #: libraries/navigation/Nodes/Node_Trigger_Container.class.php:24
 #: libraries/plugins/export/ExportHtmlword.class.php:557
 #: libraries/plugins/export/ExportOdt.class.php:685
@@ -3909,16 +3920,16 @@ msgstr ""
 msgid "Database seems to be empty!"
 msgstr ""
 
-#: libraries/Menu.class.php:439 libraries/Util.class.php:4330
+#: libraries/Menu.class.php:439 libraries/Util.class.php:4336
 msgid "Query"
 msgstr ""
 
-#: libraries/Menu.class.php:472 libraries/Util.class.php:4335
+#: libraries/Menu.class.php:472 libraries/Util.class.php:4341
 #: libraries/rte/rte_words.lib.php:36
 msgid "Routines"
 msgstr ""
 
-#: libraries/Menu.class.php:479 libraries/Util.class.php:4336
+#: libraries/Menu.class.php:479 libraries/Util.class.php:4342
 #: libraries/navigation/Nodes/Node_Event_Container.class.php:26
 #: libraries/plugins/export/ExportSql.class.php:940
 #: libraries/plugins/export/ExportXml.class.php:107
@@ -3926,22 +3937,22 @@ msgstr ""
 msgid "Events"
 msgstr ""
 
-#: libraries/Menu.class.php:498 libraries/Util.class.php:4339
+#: libraries/Menu.class.php:498 libraries/Util.class.php:4345
 msgid "Designer"
 msgstr ""
 
-#: libraries/Menu.class.php:507 libraries/Util.class.php:4340
-#: templates/structure/check_all_tables.phtml:35
+#: libraries/Menu.class.php:507 libraries/Util.class.php:4346
+#: templates/database/structure/check_all_tables.phtml:35
 #, fuzzy
 #| msgid "Value for the column \"%s\""
 msgid "Central columns"
 msgstr "\"%s\" мамычанын мааниси"
 
-#: libraries/Menu.class.php:544 libraries/Util.class.php:4312
+#: libraries/Menu.class.php:544 libraries/Util.class.php:4318
 #: libraries/config.values.php:103 libraries/config/messages.inc.php:266
 #: libraries/config/messages.inc.php:341
 #: libraries/navigation/NavigationTree.class.php:1239
-#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4332
+#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4358
 msgid "Databases"
 msgstr ""
 
@@ -3950,34 +3961,34 @@ msgid "User accounts"
 msgstr ""
 
 #: libraries/Menu.class.php:595 libraries/ServerStatusData.class.php:121
-#: libraries/Util.class.php:4319 libraries/server_common.lib.php:36
+#: libraries/Util.class.php:4325 libraries/server_common.lib.php:36
 msgid "Binary log"
 msgstr ""
 
 #: libraries/Menu.class.php:601 libraries/ServerStatusData.class.php:126
-#: libraries/Util.class.php:4320 libraries/server_common.lib.php:42
-#: templates/structure/body_for_table_summary.phtml:10
-#: templates/structure/table_header.phtml:27
+#: libraries/Util.class.php:4326 libraries/server_common.lib.php:42
+#: templates/database/structure/body_for_table_summary.phtml:10
+#: templates/database/structure/table_header.phtml:27
 msgid "Replication"
 msgstr ""
 
 #: libraries/Menu.class.php:606 libraries/ServerStatusData.class.php:193
-#: libraries/Util.class.php:4321 libraries/config.values.php:105
+#: libraries/Util.class.php:4327 libraries/config.values.php:105
 #: libraries/server_engines.lib.php:108 libraries/server_engines.lib.php:112
 #: libraries/sql_query_form.lib.php:421
 msgid "Variables"
 msgstr ""
 
-#: libraries/Menu.class.php:610 libraries/Util.class.php:4322
+#: libraries/Menu.class.php:610 libraries/Util.class.php:4328
 msgid "Charsets"
 msgstr ""
 
-#: libraries/Menu.class.php:615 libraries/Util.class.php:4323
+#: libraries/Menu.class.php:615 libraries/Util.class.php:4329
 #: libraries/server_common.lib.php:33 libraries/server_plugins.lib.php:27
 msgid "Plugins"
 msgstr ""
 
-#: libraries/Menu.class.php:626 libraries/Util.class.php:4324
+#: libraries/Menu.class.php:626 libraries/Util.class.php:4330
 msgid "Engines"
 msgstr ""
 
@@ -4002,7 +4013,7 @@ msgid_plural "%1$d rows inserted."
 msgstr[0] ""
 msgstr[1] ""
 
-#: libraries/PDF.class.php:70 libraries/Util.class.php:2521
+#: libraries/PDF.class.php:70 libraries/Util.class.php:2527
 #: libraries/browse_foreigners.lib.php:327
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:865
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:890
@@ -4023,7 +4034,7 @@ msgid "Could not save favorite table!"
 msgstr ""
 
 #: libraries/RecentFavoriteTable.class.php:212
-#: templates/structure/favorite_anchor.phtml:12
+#: templates/database/structure/favorite_anchor.phtml:12
 msgid "Remove from Favorites"
 msgstr ""
 
@@ -4188,7 +4199,7 @@ msgid ""
 msgstr ""
 
 #: libraries/StorageEngine.class.php:373
-#: templates/structure/body_for_table_summary.phtml:50
+#: templates/database/structure/body_for_table_summary.phtml:50
 #, php-format
 msgid "%s is the default storage engine on this MySQL server."
 msgstr ""
@@ -4600,10 +4611,10 @@ msgstr ""
 
 #: libraries/Util.class.php:726 libraries/rte/rte_events.lib.php:110
 #: libraries/rte/rte_events.lib.php:119 libraries/rte/rte_events.lib.php:150
-#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:153
-#: libraries/rte/rte_routines.lib.php:162
-#: libraries/rte/rte_routines.lib.php:235
-#: libraries/rte/rte_routines.lib.php:1366
+#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:223
+#: libraries/rte/rte_routines.lib.php:250
+#: libraries/rte/rte_routines.lib.php:372
+#: libraries/rte/rte_routines.lib.php:1457
 #: libraries/rte/rte_triggers.lib.php:86 libraries/rte/rte_triggers.lib.php:95
 #: libraries/rte/rte_triggers.lib.php:127
 msgid "MySQL said: "
@@ -4647,75 +4658,78 @@ msgstr ""
 msgid "%B %d, %Y at %I:%M %p"
 msgstr ""
 
-#: libraries/Util.class.php:2019
+#: libraries/Util.class.php:2025
 #, php-format
 msgid "%s days, %s hours, %s minutes and %s seconds"
 msgstr ""
 
-#: libraries/Util.class.php:2112
+#: libraries/Util.class.php:2118
 msgid "Missing parameter:"
 msgstr ""
 
-#: libraries/Util.class.php:2645
+#: libraries/Util.class.php:2651
 #, php-format
 msgid "Jump to database \"%s\"."
 msgstr ""
 
-#: libraries/Util.class.php:2670
+#: libraries/Util.class.php:2676
 #, php-format
 msgid "The %s functionality is affected by a known bug, see %s"
 msgstr ""
 
-#: libraries/Util.class.php:2881
+#: libraries/Util.class.php:2887
 msgid "Click to toggle"
 msgstr ""
 
-#: libraries/Util.class.php:3542 prefs_manage.php:248
+#: libraries/Util.class.php:3548 prefs_manage.php:248
 msgid "Browse your computer:"
 msgstr ""
 
-#: libraries/Util.class.php:3567
+#: libraries/Util.class.php:3573
 #, php-format
 msgid "Select from the web server upload directory <b>%s</b>:"
 msgstr ""
 
-#: libraries/Util.class.php:3596 libraries/insert_edit.lib.php:1173
+#: libraries/Util.class.php:3602 libraries/insert_edit.lib.php:1171
 msgid "The directory you set for upload work cannot be reached."
 msgstr ""
 
-#: libraries/Util.class.php:3607
+#: libraries/Util.class.php:3613
 msgid "There are no files to upload!"
 msgstr ""
 
-#: libraries/Util.class.php:3632 libraries/Util.class.php:3633
-#: templates/structure/check_all_tables.phtml:15
+#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: templates/database/structure/check_all_tables.phtml:15
 msgid "Empty"
 msgstr ""
 
-#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: libraries/Util.class.php:3644 libraries/Util.class.php:3645
 msgid "Execute"
 msgstr ""
 
-#: libraries/Util.class.php:4152
+#: libraries/Util.class.php:4158
 msgid "Print"
 msgstr ""
 
-#: libraries/Util.class.php:4257 templates/structure/row_stats_table.phtml:80
-#: templates/structure/table_header.phtml:95
+#: libraries/Util.class.php:4263
+#: templates/database/structure/table_header.phtml:95
+#: templates/table/structure/row_stats_table.phtml:80
 msgid "Creation"
 msgstr ""
 
-#: libraries/Util.class.php:4263 templates/structure/row_stats_table.phtml:87
-#: templates/structure/table_header.phtml:106
+#: libraries/Util.class.php:4269
+#: templates/database/structure/table_header.phtml:106
+#: templates/table/structure/row_stats_table.phtml:87
 msgid "Last update"
 msgstr ""
 
-#: libraries/Util.class.php:4269 templates/structure/row_stats_table.phtml:94
-#: templates/structure/table_header.phtml:117
+#: libraries/Util.class.php:4275
+#: templates/database/structure/table_header.phtml:117
+#: templates/table/structure/row_stats_table.phtml:94
 msgid "Last check"
 msgstr ""
 
-#: libraries/Util.class.php:4315
+#: libraries/Util.class.php:4321
 msgid "Users"
 msgstr ""
 
@@ -4736,16 +4750,16 @@ msgid "Use this value"
 msgstr ""
 
 #: libraries/build_html_for_db.lib.php:33 libraries/import.lib.php:193
-#: templates/structure/actions_in_table_structure.phtml:113
-#: templates/structure/row_stats_table.phtml:42
-#: templates/structure/table_header.phtml:36
+#: templates/database/structure/table_header.phtml:36
+#: templates/table/structure/actions_in_table_structure.phtml:113
+#: templates/table/structure/row_stats_table.phtml:42
 msgid "Rows"
 msgstr "катарлар"
 
 #: libraries/build_html_for_db.lib.php:48 libraries/engines/innodb.lib.php:171
-#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:186
-#: libraries/server_status.lib.php:298
-#: templates/structure/display_table_stats.phtml:40
+#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:195
+#: libraries/server_status.lib.php:307
+#: templates/table/structure/display_table_stats.phtml:40
 msgid "Total"
 msgstr ""
 
@@ -4754,10 +4768,12 @@ msgid "Jump to database"
 msgstr ""
 
 #: libraries/build_html_for_db.lib.php:146
+#: templates/database/structure/structure_table_row.phtml:15
 msgid "Not replicated"
 msgstr ""
 
 #: libraries/build_html_for_db.lib.php:158
+#: templates/database/structure/structure_table_row.phtml:16
 msgid "Replicated"
 msgstr ""
 
@@ -4810,17 +4826,17 @@ msgstr ""
 #: libraries/plugins/export/ExportTexytext.class.php:425
 #: libraries/plugins/export/PMA_ExportPdf.class.php:307
 #: libraries/rte/rte_list.lib.php:73 libraries/rte/rte_list.lib.php:85
-#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:830
-#: libraries/rte/rte_routines.lib.php:1492 setup/frames/index.inc.php:162
+#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:921
+#: libraries/rte/rte_routines.lib.php:1583 setup/frames/index.inc.php:162
 #: templates/columns_definitions/table_fields_definitions.phtml:8
-#: templates/structure/table_structure_header.phtml:5
-#: templates/table/create_table.phtml:11
+#: templates/database/create_table.phtml:11
+#: templates/table/structure/table_structure_header.phtml:5
 msgid "Name"
 msgstr ""
 
 #: libraries/central_columns.lib.php:699
 #: libraries/central_columns.lib.php:1381
-#: libraries/rte/rte_routines.lib.php:832
+#: libraries/rte/rte_routines.lib.php:923
 #: templates/columns_definitions/table_fields_definitions.phtml:14
 msgid "Length/Values"
 msgstr ""
@@ -4841,7 +4857,7 @@ msgid "Select a table"
 msgstr "Баарын танда"
 
 #: libraries/central_columns.lib.php:804
-#: templates/structure/add_column.phtml:4
+#: templates/table/structure/add_column.phtml:4
 msgid "Add column"
 msgstr ""
 
@@ -4861,7 +4877,7 @@ msgstr "\"%s\" мамычанын мааниси"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1002
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1025
 #: templates/columns_definitions/table_fields_definitions.phtml:36
-#: templates/structure/table_structure_header.phtml:8
+#: templates/table/structure/table_structure_header.phtml:8
 msgid "Attributes"
 msgstr ""
 
@@ -4970,7 +4986,7 @@ msgid "Double click"
 msgstr ""
 
 #: libraries/config.values.php:95 libraries/config.values.php:124
-#: libraries/config/FormDisplay.tpl.php:221 libraries/relation.lib.php:97
+#: libraries/config/FormDisplay.tpl.php:232 libraries/relation.lib.php:97
 #: libraries/relation.lib.php:105
 msgid "Disabled"
 msgstr ""
@@ -5148,21 +5164,21 @@ msgstr ""
 msgid "maximum %s"
 msgstr ""
 
-#: libraries/config/FormDisplay.tpl.php:219
+#: libraries/config/FormDisplay.tpl.php:230
 msgid "This setting is disabled, it will not be applied to your configuration."
 msgstr ""
 
-#: libraries/config/FormDisplay.tpl.php:313
+#: libraries/config/FormDisplay.tpl.php:324
 #, php-format
 msgid "Set value: %s"
 msgstr ""
 
-#: libraries/config/FormDisplay.tpl.php:318
+#: libraries/config/FormDisplay.tpl.php:329
 #: libraries/config/messages.inc.php:610
 msgid "Restore default value"
 msgstr ""
 
-#: libraries/config/FormDisplay.tpl.php:332
+#: libraries/config/FormDisplay.tpl.php:343
 msgid "Allow users to customize this value"
 msgstr ""
 
@@ -5580,7 +5596,7 @@ msgstr ""
 
 #: libraries/config/messages.inc.php:136 libraries/config/messages.inc.php:152
 #: libraries/sql_query_form.lib.php:247
-#: templates/structure/row_stats_table.phtml:7
+#: templates/table/structure/row_stats_table.phtml:7
 msgid "Format"
 msgstr ""
 
@@ -6075,7 +6091,7 @@ msgstr ""
 
 #: libraries/config/messages.inc.php:332
 #: libraries/plugins/export/ExportPdf.class.php:279
-#: templates/structure/secondary_tabs.phtml:8
+#: templates/table/secondary_tabs.phtml:8
 msgid "Table structure"
 msgstr ""
 
@@ -7580,103 +7596,35 @@ msgstr ""
 msgid "OpenDocument Text"
 msgstr ""
 
-#: libraries/controllers/StructureController.class.php:465
+#: libraries/controllers/DatabaseStructureController.class.php:405
 #: tbl_operations.php:382
 #, php-format
 msgid "Table %s has been emptied."
 msgstr ""
 
-#: libraries/controllers/StructureController.class.php:486
+#: libraries/controllers/DatabaseStructureController.class.php:426
 #: tbl_operations.php:400 view_operations.php:119
 #, fuzzy, php-format
 #| msgid "Database %1$s has been created."
 msgid "View %s has been dropped."
 msgstr "%1$s аттуу берилиштер базасы түзүлдү."
 
-#: libraries/controllers/StructureController.class.php:487
+#: libraries/controllers/DatabaseStructureController.class.php:427
 #: tbl_operations.php:401
 #, fuzzy, php-format
 #| msgid "Database %1$s has been created."
 msgid "Table %s has been dropped."
 msgstr "%1$s аттуу берилиштер базасы түзүлдү."
 
-#: libraries/controllers/StructureController.class.php:797
-#, php-format
-msgid "The name '%s' is a MySQL reserved keyword."
-msgid_plural "The names '%s' are MySQL reserved keywords."
-msgstr[0] ""
-msgstr[1] ""
-
-#: libraries/controllers/StructureController.class.php:875
-msgid "No column selected."
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1049
+#: libraries/controllers/DatabaseStructureController.class.php:733
 msgid "Favorite List is full!"
 msgstr ""
 
-#: libraries/controllers/StructureController.class.php:1272
-msgid "The columns have been moved successfully."
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1535
-#, php-format
-msgid ""
-"Table %1$s has been altered successfully. Privileges have been adjusted."
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1541
-#: libraries/controllers/TableIndexesController.class.php:161
-#: tbl_addfield.php:92
-#, php-format
-msgid "Table %1$s has been altered successfully."
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1588
-#: libraries/tracking.lib.php:1094
-msgid "Query error"
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1806
+#: libraries/controllers/DatabaseStructureController.class.php:947
 #: libraries/mysql_charsets.lib.php:366 libraries/mysql_charsets.lib.php:373
 msgid "unknown"
 msgstr ""
 
-#: libraries/controllers/StructureController.class.php:1957
-#: templates/structure/check_all_table_column.phtml:11
-msgid "Change"
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1961
-#: libraries/controllers/StructureController.class.php:1966
-#: libraries/navigation/Nodes/Node_Index.class.php:30
-#: libraries/tracking.lib.php:926
-#: templates/columns_definitions/column_indexes.phtml:16
-#: templates/columns_definitions/table_fields_definitions.phtml:57
-#: templates/structure/check_all_table_column.phtml:30
-#: templates/structure/display_structure.phtml:79
-#: templates/structure/display_table_stats.phtml:19
-msgid "Index"
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1963
-#: libraries/controllers/StructureController.class.php:1968
-#: templates/columns_definitions/column_indexes.phtml:27
-#: templates/structure/check_all_table_column.phtml:37
-msgid "Spatial"
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1964
-#: libraries/controllers/StructureController.class.php:1969
-#: templates/columns_definitions/column_indexes.phtml:22
-#: templates/structure/check_all_table_column.phtml:47
-msgid "Fulltext"
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1970
-msgid "Distinct values"
-msgstr ""
-
 #: libraries/controllers/TableChartController.class.php:82
 #: libraries/controllers/TableGisVisualizationController.class.php:101
 msgid "No SQL query was set to fetch data."
@@ -7690,11 +7638,18 @@ msgstr ""
 msgid "No data to display"
 msgstr ""
 
-#: libraries/controllers/TableRelationController.class.php:217
+#: libraries/controllers/TableIndexesController.class.php:161
+#: libraries/controllers/TableStructureController.class.php:736
+#: tbl_addfield.php:92
+#, php-format
+msgid "Table %1$s has been altered successfully."
+msgstr ""
+
+#: libraries/controllers/TableRelationController.class.php:218
 msgid "Display column was successfully updated."
 msgstr ""
 
-#: libraries/controllers/TableRelationController.class.php:283
+#: libraries/controllers/TableRelationController.class.php:288
 #, fuzzy
 #| msgid "Database %1$s has been created."
 msgid "Internal relations were successfully updated."
@@ -7709,10 +7664,71 @@ msgid "Zoom search"
 msgstr ""
 
 #: libraries/controllers/TableSearchController.class.php:852
-#: templates/table/selection_form.phtml:59
+#: templates/table/search/selection_form.phtml:59
 msgid "Find and replace"
 msgstr ""
 
+#: libraries/controllers/TableStructureController.class.php:163
+#, php-format
+msgid "The name '%s' is a MySQL reserved keyword."
+msgid_plural "The names '%s' are MySQL reserved keywords."
+msgstr[0] ""
+msgstr[1] ""
+
+#: libraries/controllers/TableStructureController.class.php:241
+msgid "No column selected."
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:467
+msgid "The columns have been moved successfully."
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:730
+#, php-format
+msgid ""
+"Table %1$s has been altered successfully. Privileges have been adjusted."
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:783
+#: libraries/tracking.lib.php:1094
+msgid "Query error"
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:948
+#: templates/table/structure/check_all_table_column.phtml:11
+msgid "Change"
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:952
+#: libraries/controllers/TableStructureController.class.php:957
+#: libraries/navigation/Nodes/Node_Index.class.php:30
+#: libraries/tracking.lib.php:926
+#: templates/columns_definitions/column_indexes.phtml:16
+#: templates/columns_definitions/table_fields_definitions.phtml:57
+#: templates/table/structure/check_all_table_column.phtml:30
+#: templates/table/structure/display_structure.phtml:79
+#: templates/table/structure/display_table_stats.phtml:19
+msgid "Index"
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:954
+#: libraries/controllers/TableStructureController.class.php:959
+#: templates/columns_definitions/column_indexes.phtml:27
+#: templates/table/structure/check_all_table_column.phtml:37
+msgid "Spatial"
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:955
+#: libraries/controllers/TableStructureController.class.php:960
+#: templates/columns_definitions/column_indexes.phtml:22
+#: templates/table/structure/check_all_table_column.phtml:47
+msgid "Fulltext"
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:963
+msgid "Distinct values"
+msgstr ""
+
 #: libraries/core.lib.php:306
 #, php-format
 msgid "The %s extension is missing. Please check your PHP configuration."
@@ -7757,7 +7773,7 @@ msgid "No Password"
 msgstr ""
 
 #: libraries/display_change_password.lib.php:68
-#: libraries/plugins/auth/AuthenticationCookie.class.php:199
+#: libraries/plugins/auth/AuthenticationCookie.class.php:187
 #: libraries/replication_gui.lib.php:422 libraries/replication_gui.lib.php:862
 #: libraries/server_privileges.lib.php:1640
 msgid "Password:"
@@ -8491,12 +8507,12 @@ msgid "Dump has been saved to file %s."
 msgstr ""
 
 #: libraries/import.lib.php:202 libraries/insert_edit.lib.php:124
-#: libraries/rte/rte_routines.lib.php:1353 libraries/sql.lib.php:1312
+#: libraries/rte/rte_routines.lib.php:1444 libraries/sql.lib.php:1306
 #: tbl_get_field.php:44
 msgid "MySQL returned an empty result set (i.e. zero rows)."
 msgstr ""
 
-#: libraries/import.lib.php:265 libraries/sql.lib.php:1326
+#: libraries/import.lib.php:265 libraries/sql.lib.php:1320
 msgid "[ROLLBACK occurred.]"
 msgstr ""
 
@@ -8560,14 +8576,14 @@ msgstr ""
 
 #: libraries/insert_edit.lib.php:233
 #: libraries/navigation/Nodes/Node_DatabaseChild.class.php:48
-#: templates/designer/table_list.phtml:40
+#: templates/database/designer/table_list.phtml:40
 msgid "Hide"
 msgstr ""
 
 #: libraries/insert_edit.lib.php:249
 #: libraries/navigation/Nodes/Node_Function.class.php:32
-#: libraries/rte/rte_routines.lib.php:1495
-#: templates/table/table_header.phtml:4
+#: libraries/rte/rte_routines.lib.php:1586
+#: templates/table/search/table_header.phtml:4
 msgid "Function"
 msgstr ""
 
@@ -8580,82 +8596,83 @@ msgstr ""
 msgid "Because of its length,<br /> this column might not be editable."
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1050
+#: libraries/insert_edit.lib.php:1048
 msgid "Binary - do not edit"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1176 libraries/server_privileges.lib.php:470
-#: templates/table/options.phtml:36
+#: libraries/insert_edit.lib.php:1174 libraries/server_privileges.lib.php:470
+#: templates/table/search/options.phtml:36
 msgid "Or"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1177
+#: libraries/insert_edit.lib.php:1175
 msgid "web server upload directory:"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1348 templates/table/input_box.phtml:49
+#: libraries/insert_edit.lib.php:1346
+#: templates/table/search/input_box.phtml:49
 msgid "Edit/Insert"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1398
+#: libraries/insert_edit.lib.php:1396
 #, php-format
 msgid "Continue insertion with %s rows"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1428
+#: libraries/insert_edit.lib.php:1426
 msgid "and then"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1461
+#: libraries/insert_edit.lib.php:1459
 msgid "Insert as new row"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1464
+#: libraries/insert_edit.lib.php:1462
 msgid "Insert as new row and ignore errors"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1467
+#: libraries/insert_edit.lib.php:1465
 msgid "Show insert query"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1487
+#: libraries/insert_edit.lib.php:1485
 msgid "Go back to previous page"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1490
+#: libraries/insert_edit.lib.php:1488
 msgid "Insert another new row"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1495
+#: libraries/insert_edit.lib.php:1493
 msgid "Go back to this page"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1518
+#: libraries/insert_edit.lib.php:1516
 msgid "Edit next row"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1540
+#: libraries/insert_edit.lib.php:1538
 msgid ""
 "Use TAB key to move from value to value, or CTRL+arrows to move anywhere"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1577 libraries/replication_gui.lib.php:542
-#: libraries/rte/rte_routines.lib.php:1497
+#: libraries/insert_edit.lib.php:1575 libraries/replication_gui.lib.php:542
+#: libraries/rte/rte_routines.lib.php:1588
 #: libraries/server_status_variables.lib.php:220
-#: templates/designer/having_query_panel.phtml:100
-#: templates/designer/options_panel.phtml:73
-#: templates/designer/options_panel.phtml:239
-#: templates/designer/where_query_panel.phtml:69
-#: templates/table/table_header.phtml:10
-#: templates/table/zoom_result_form.phtml:35
+#: templates/database/designer/having_query_panel.phtml:100
+#: templates/database/designer/options_panel.phtml:73
+#: templates/database/designer/options_panel.phtml:239
+#: templates/database/designer/where_query_panel.phtml:69
+#: templates/table/search/table_header.phtml:10
+#: templates/table/search/zoom_result_form.phtml:35
 msgid "Value"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1937 libraries/sql.lib.php:1309
+#: libraries/insert_edit.lib.php:1935 libraries/sql.lib.php:1303
 msgid "Showing SQL query"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1962 libraries/sql.lib.php:1287
+#: libraries/insert_edit.lib.php:1960 libraries/sql.lib.php:1281
 #, php-format
 msgid "Inserted row id: %1$d"
 msgstr ""
@@ -9062,7 +9079,7 @@ msgstr ""
 #: libraries/navigation/Nodes/Node_View_Container.class.php:26
 #: libraries/navigation/Nodes/Node_View_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:129
-#: templates/structure/show_create.phtml:30
+#: templates/database/structure/show_create.phtml:30
 msgid "Views"
 msgstr ""
 
@@ -9354,7 +9371,7 @@ msgstr ""
 
 #: libraries/operations.lib.php:101 libraries/operations.lib.php:249
 #: libraries/operations.lib.php:869 libraries/operations.lib.php:963
-#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:907
+#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:998
 #: templates/columns_definitions/table_fields_definitions.phtml:47
 msgid "Adjust Privileges"
 msgstr ""
@@ -9444,22 +9461,22 @@ msgid "Switch to copied table"
 msgstr ""
 
 #: libraries/operations.lib.php:1360
-#: templates/structure/check_all_tables.phtml:18
+#: templates/database/structure/check_all_tables.phtml:18
 msgid "Table maintenance"
 msgstr ""
 
 #: libraries/operations.lib.php:1398
-#: templates/structure/check_all_tables.phtml:19
+#: templates/database/structure/check_all_tables.phtml:19
 msgid "Analyze table"
 msgstr ""
 
 #: libraries/operations.lib.php:1413
-#: templates/structure/check_all_tables.phtml:20
+#: templates/database/structure/check_all_tables.phtml:20
 msgid "Check table"
 msgstr ""
 
 #: libraries/operations.lib.php:1428
-#: templates/structure/check_all_tables.phtml:22
+#: templates/database/structure/check_all_tables.phtml:22
 #, fuzzy
 #| msgid "%s table"
 #| msgid_plural "%s tables"
@@ -9480,18 +9497,19 @@ msgid "Flush the table (FLUSH)"
 msgstr ""
 
 #: libraries/operations.lib.php:1477
-#: templates/structure/check_all_tables.phtml:23
-#: templates/structure/display_table_stats.phtml:56
+#: templates/database/structure/check_all_tables.phtml:23
+#: templates/table/structure/display_table_stats.phtml:56
 msgid "Optimize table"
 msgstr ""
 
 #: libraries/operations.lib.php:1492
-#: templates/structure/check_all_tables.phtml:24
+#: templates/database/structure/check_all_tables.phtml:24
 msgid "Repair table"
 msgstr ""
 
 #: libraries/operations.lib.php:1538
-#: templates/structure/check_all_tables.phtml:14 view_operations.php:127
+#: templates/database/structure/check_all_tables.phtml:14
+#: view_operations.php:127
 msgid "Delete data or table"
 msgstr ""
 
@@ -9612,7 +9630,7 @@ msgid "Cannot connect: invalid settings."
 msgstr ""
 
 #: libraries/plugins/auth/AuthenticationConfig.class.php:108
-#: libraries/plugins/auth/AuthenticationCookie.class.php:134
+#: libraries/plugins/auth/AuthenticationCookie.class.php:122
 #: libraries/plugins/auth/AuthenticationHttp.class.php:96
 #, php-format
 msgid "Welcome to %s"
@@ -9637,36 +9655,36 @@ msgstr ""
 msgid "Retry to connect"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:146
+#: libraries/plugins/auth/AuthenticationCookie.class.php:134
 msgid "Your session has expired. Please log in again."
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:170
+#: libraries/plugins/auth/AuthenticationCookie.class.php:158
 msgid "Log in"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:178
-#: libraries/plugins/auth/AuthenticationCookie.class.php:188
+#: libraries/plugins/auth/AuthenticationCookie.class.php:166
+#: libraries/plugins/auth/AuthenticationCookie.class.php:176
 msgid "You can enter hostname/IP address and port separated by space."
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:193
+#: libraries/plugins/auth/AuthenticationCookie.class.php:181
 msgid "Username:"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:205
+#: libraries/plugins/auth/AuthenticationCookie.class.php:193
 msgid "Server Choice:"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:386
+#: libraries/plugins/auth/AuthenticationCookie.class.php:374
 msgid "Entered captcha is wrong, try again!"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:396
+#: libraries/plugins/auth/AuthenticationCookie.class.php:384
 msgid "Please enter correct captcha!"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:423
+#: libraries/plugins/auth/AuthenticationCookie.class.php:411
 msgid "You are not allowed to log in to this MySQL server!"
 msgstr ""
 
@@ -9762,7 +9780,7 @@ msgstr ""
 #: libraries/plugins/export/ExportOdt.class.php:593
 #: libraries/plugins/export/ExportTexytext.class.php:428
 #: libraries/plugins/export/PMA_ExportPdf.class.php:313
-#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:984
 #: libraries/rte/rte_triggers.lib.php:377
 msgid "Definition"
 msgstr ""
@@ -10059,7 +10077,7 @@ msgid "Last check:"
 msgstr "Акыркы текшеруу:"
 
 #: libraries/plugins/export/ExportSql.class.php:1399
-#: templates/structure/structure_table_row.phtml:183
+#: templates/database/structure/structure_table_row.phtml:183
 msgid "in use"
 msgstr "колдонууда"
 
@@ -10239,18 +10257,14 @@ msgstr ""
 msgid "The imported file does not contain any data!"
 msgstr ""
 
-#: libraries/plugins/import/ImportSql.class.php:169
+#: libraries/plugins/import/ImportSql.class.php:72
 msgid "SQL compatibility mode:"
 msgstr ""
 
-#: libraries/plugins/import/ImportSql.class.php:181
+#: libraries/plugins/import/ImportSql.class.php:84
 msgid "Do not use <code>AUTO_INCREMENT</code> for zero values"
 msgstr ""
 
-#: libraries/plugins/import/ImportSql.class.php:195
-msgid "Read as multibytes"
-msgstr ""
-
 #: libraries/plugins/import/ImportXml.class.php:54
 msgid "XML"
 msgstr ""
@@ -10293,7 +10307,7 @@ msgid "Show grid"
 msgstr ""
 
 #: libraries/plugins/schema/SchemaPdf.class.php:94
-#: templates/structure/print_view_data_dictionary_link.phtml:6
+#: templates/database/structure/print_view_data_dictionary_link.phtml:6
 msgid "Data Dictionary"
 msgstr ""
 
@@ -10318,7 +10332,7 @@ msgid "The %s table doesn't exist!"
 msgstr ""
 
 #: libraries/plugins/schema/eps/Eps_Relation_Schema.class.php:321
-#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:309
+#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:323
 #, php-format
 msgid "Schema of the %s database - Page %s"
 msgstr ""
@@ -10345,7 +10359,7 @@ msgstr ""
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1005
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1028
 #: libraries/tracking.lib.php:884
-#: templates/structure/table_structure_header.phtml:11
+#: templates/table/structure/table_structure_header.phtml:11
 msgid "Extra"
 msgstr ""
 
@@ -10664,51 +10678,51 @@ msgstr ""
 msgid "Create the needed tables with the <code>%screate_tables.sql</code>."
 msgstr ""
 
-#: libraries/relation.lib.php:360
+#: libraries/relation.lib.php:357
 msgid "Create a pma user and give access to these tables."
 msgstr ""
 
-#: libraries/relation.lib.php:365
+#: libraries/relation.lib.php:360
 msgid ""
 "Enable advanced features in configuration file (<code>config.inc.php</"
 "code>), for example by starting from <code>config.sample.inc.php</code>."
 msgstr ""
 
-#: libraries/relation.lib.php:373
+#: libraries/relation.lib.php:365
 msgid "Re-login to phpMyAdmin to load the updated configuration file."
 msgstr ""
 
-#: libraries/relation.lib.php:1612
+#: libraries/relation.lib.php:1607
 msgid "no description"
 msgstr ""
 
-#: libraries/relation.lib.php:1811
+#: libraries/relation.lib.php:1806
 msgid ""
 "You do not have necessary privileges to create a database named "
 "'phpmyadmin'. You may go to 'Operations' tab of any database to set up the "
 "phpMyAdmin configuration storage there."
 msgstr ""
 
-#: libraries/relation.lib.php:1928
+#: libraries/relation.lib.php:1923
 #, php-format
 msgid ""
 "%sCreate%s a database named 'phpmyadmin' and setup the phpMyAdmin "
 "configuration storage there."
 msgstr ""
 
-#: libraries/relation.lib.php:1936
+#: libraries/relation.lib.php:1931
 #, php-format
 msgid ""
 "%sCreate%s the phpMyAdmin configuration storage in the current database."
 msgstr ""
 
-#: libraries/relation.lib.php:1944
+#: libraries/relation.lib.php:1939
 #, php-format
 msgid "%sCreate%s missing phpMyAdmin configuration storage tables."
 msgstr ""
 
 #: libraries/replication_gui.lib.php:46 libraries/replication_gui.lib.php:343
-#: libraries/server_databases.lib.php:387
+#: libraries/server_databases.lib.php:398
 msgid "Master replication"
 msgstr ""
 
@@ -10763,7 +10777,7 @@ msgid ""
 msgstr ""
 
 #: libraries/replication_gui.lib.php:141
-#: libraries/server_databases.lib.php:389
+#: libraries/server_databases.lib.php:400
 msgid "Slave replication"
 msgstr ""
 
@@ -11024,10 +11038,10 @@ msgid "Master server changed successfully to %s."
 msgstr ""
 
 #: libraries/rte/rte_events.lib.php:106 libraries/rte/rte_events.lib.php:115
-#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:149
-#: libraries/rte/rte_routines.lib.php:158
-#: libraries/rte/rte_routines.lib.php:231
-#: libraries/rte/rte_routines.lib.php:1362
+#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:219
+#: libraries/rte/rte_routines.lib.php:246
+#: libraries/rte/rte_routines.lib.php:368
+#: libraries/rte/rte_routines.lib.php:1453
 #: libraries/rte/rte_triggers.lib.php:82 libraries/rte/rte_triggers.lib.php:91
 #: libraries/rte/rte_triggers.lib.php:123
 #, php-format
@@ -11048,7 +11062,7 @@ msgstr ""
 msgid "Event %1$s has been created."
 msgstr ""
 
-#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:251
+#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:266
 #: libraries/rte/rte_triggers.lib.php:144
 msgid "One or more errors have occurred while processing your request:"
 msgstr ""
@@ -11057,7 +11071,7 @@ msgstr ""
 msgid "Edit event"
 msgstr ""
 
-#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:794
+#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:885
 #: libraries/rte/rte_triggers.lib.php:323 view_create.php:180
 msgid "Details"
 msgstr ""
@@ -11070,7 +11084,7 @@ msgstr ""
 msgid "Event type"
 msgstr ""
 
-#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:817
+#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:908
 #, php-format
 msgid "Change to %s"
 msgstr ""
@@ -11097,12 +11111,14 @@ msgstr ""
 msgid "On completion preserve"
 msgstr ""
 
-#: libraries/rte/rte_events.lib.php:491 libraries/rte/rte_routines.lib.php:930
+#: libraries/rte/rte_events.lib.php:491
+#: libraries/rte/rte_routines.lib.php:1021
 #: libraries/rte/rte_triggers.lib.php:383 view_create.php:209
 msgid "Definer"
 msgstr ""
 
-#: libraries/rte/rte_events.lib.php:535 libraries/rte/rte_routines.lib.php:997
+#: libraries/rte/rte_events.lib.php:535
+#: libraries/rte/rte_routines.lib.php:1088
 #: libraries/rte/rte_triggers.lib.php:422
 msgid "The definer must be in the \"username@hostname\" format!"
 msgstr ""
@@ -11128,9 +11144,9 @@ msgid "You must provide an event definition."
 msgstr ""
 
 #: libraries/rte/rte_export.lib.php:43 libraries/rte/rte_general.lib.php:72
-#: libraries/rte/rte_routines.lib.php:345
-#: libraries/rte/rte_routines.lib.php:1198
-#: libraries/rte/rte_routines.lib.php:1411
+#: libraries/rte/rte_routines.lib.php:153
+#: libraries/rte/rte_routines.lib.php:1289
+#: libraries/rte/rte_routines.lib.php:1502
 msgid "Error in processing request:"
 msgstr ""
 
@@ -11162,132 +11178,132 @@ msgid ""
 "problems."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:110
-#: libraries/rte/rte_routines.lib.php:1006
+#: libraries/rte/rte_routines.lib.php:123
+msgid "Edit routine"
+msgstr ""
+
+#: libraries/rte/rte_routines.lib.php:200
+#: libraries/rte/rte_routines.lib.php:1097
 #, php-format
 msgid "Invalid routine type: \"%s\""
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:170
-msgid "Sorry, we failed to restore the dropped routine."
-msgstr ""
-
-#: libraries/rte/rte_routines.lib.php:211
-#, php-format
-msgid "Routine %1$s has been modified. Privileges have been adjusted."
-msgstr ""
-
-#: libraries/rte/rte_routines.lib.php:216
-#, php-format
-msgid "Routine %1$s has been modified."
-msgstr ""
-
-#: libraries/rte/rte_routines.lib.php:238
+#: libraries/rte/rte_routines.lib.php:253
 #, php-format
 msgid "Routine %1$s has been created."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:315
-msgid "Edit routine"
+#: libraries/rte/rte_routines.lib.php:380
+msgid "Sorry, we failed to restore the dropped routine."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:797
+#: libraries/rte/rte_routines.lib.php:439
+#, php-format
+msgid "Routine %1$s has been modified. Privileges have been adjusted."
+msgstr ""
+
+#: libraries/rte/rte_routines.lib.php:444
+#, php-format
+msgid "Routine %1$s has been modified."
+msgstr ""
+
+#: libraries/rte/rte_routines.lib.php:888
 msgid "Routine name"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:823
+#: libraries/rte/rte_routines.lib.php:914
 msgid "Parameters"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:829
+#: libraries/rte/rte_routines.lib.php:920
 msgid "Direction"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:847
+#: libraries/rte/rte_routines.lib.php:938
 msgid "Add parameter"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:851
+#: libraries/rte/rte_routines.lib.php:942
 msgid "Remove last parameter"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:856
+#: libraries/rte/rte_routines.lib.php:947
 msgid "Return type"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:862
+#: libraries/rte/rte_routines.lib.php:953
 msgid "Return length/values"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:868
+#: libraries/rte/rte_routines.lib.php:959
 msgid "Return options"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:899
+#: libraries/rte/rte_routines.lib.php:990
 msgid "Is deterministic"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:920
+#: libraries/rte/rte_routines.lib.php:1011
 msgid ""
 "You do not have sufficient privileges to perform this operation; Please "
 "refer to the documentation for more details"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:935
+#: libraries/rte/rte_routines.lib.php:1026
 msgid "Security type"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:944
+#: libraries/rte/rte_routines.lib.php:1035
 msgid "SQL data access"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1013
+#: libraries/rte/rte_routines.lib.php:1104
 msgid "You must provide a routine name!"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1047
+#: libraries/rte/rte_routines.lib.php:1138
 #, php-format
 msgid "Invalid direction \"%s\" given for parameter."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1069
-#: libraries/rte/rte_routines.lib.php:1131
+#: libraries/rte/rte_routines.lib.php:1160
+#: libraries/rte/rte_routines.lib.php:1222
 msgid ""
 "You must provide length/values for routine parameters of type ENUM, SET, "
 "VARCHAR and VARBINARY."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1095
+#: libraries/rte/rte_routines.lib.php:1186
 msgid "You must provide a name and a type for each routine parameter."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1114
+#: libraries/rte/rte_routines.lib.php:1205
 msgid "You must provide a valid return type for the routine."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1174
+#: libraries/rte/rte_routines.lib.php:1265
 msgid "You must provide a routine definition."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1285
+#: libraries/rte/rte_routines.lib.php:1376
 #, php-format
 msgid "Execution results of routine %s"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1340
+#: libraries/rte/rte_routines.lib.php:1431
 #, php-format
 msgid "%d row affected by the last statement inside the procedure."
 msgid_plural "%d rows affected by the last statement inside the procedure."
 msgstr[0] ""
 msgstr[1] ""
 
-#: libraries/rte/rte_routines.lib.php:1398
-#: libraries/rte/rte_routines.lib.php:1406
+#: libraries/rte/rte_routines.lib.php:1489
+#: libraries/rte/rte_routines.lib.php:1497
 msgid "Execute routine"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1485
-#: libraries/rte/rte_routines.lib.php:1488
+#: libraries/rte/rte_routines.lib.php:1576
+#: libraries/rte/rte_routines.lib.php:1579
 msgid "Routine parameters"
 msgstr ""
 
@@ -11441,7 +11457,7 @@ msgid "Original position"
 msgstr ""
 
 #: libraries/server_bin_log.lib.php:133
-#: templates/structure/display_table_stats.phtml:4
+#: templates/table/structure/display_table_stats.phtml:4
 msgid "Information"
 msgstr ""
 
@@ -11477,12 +11493,12 @@ msgid ""
 "between the web server and the MySQL server."
 msgstr ""
 
-#: libraries/server_databases.lib.php:364
-#: libraries/server_databases.lib.php:365
+#: libraries/server_databases.lib.php:366
+#: libraries/server_databases.lib.php:371
 msgid "Enable Statistics"
 msgstr ""
 
-#: libraries/server_databases.lib.php:481
+#: libraries/server_databases.lib.php:492
 #, php-format
 msgid "%1$d database has been dropped successfully."
 msgid_plural "%1$d databases have been dropped successfully."
@@ -11838,7 +11854,7 @@ msgid "You have revoked the privileges for %s."
 msgstr ""
 
 #: libraries/server_privileges.lib.php:2059
-#: libraries/server_privileges.lib.php:4290
+#: libraries/server_privileges.lib.php:4316
 #, fuzzy
 #| msgid "Value for the column \"%s\""
 msgid "Add user account"
@@ -12005,53 +12021,53 @@ msgstr ""
 msgid "The privileges were reloaded successfully."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:3994
+#: libraries/server_privileges.lib.php:4003
 #, php-format
 msgid "The user %s already exists!"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4232
+#: libraries/server_privileges.lib.php:4258
 #, php-format
 msgid "Privileges for %s"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4241
+#: libraries/server_privileges.lib.php:4267
 #: libraries/server_status_processes.lib.php:72
 #: libraries/server_user_groups.lib.php:39
 msgid "User"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4282
+#: libraries/server_privileges.lib.php:4308
 msgctxt "Create new user"
 msgid "New"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4311
+#: libraries/server_privileges.lib.php:4337
 msgid "Edit privileges:"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4312
+#: libraries/server_privileges.lib.php:4338
 msgid "User account"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4371
+#: libraries/server_privileges.lib.php:4397
 msgid ""
 "Note: You are attempting to edit privileges of the user with which you are "
 "currently logged in."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4391 libraries/server_users.lib.php:25
+#: libraries/server_privileges.lib.php:4417 libraries/server_users.lib.php:25
 msgid "User accounts overview"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4459
+#: libraries/server_privileges.lib.php:4485
 msgid ""
 "A user account allowing any user from localhost to connect is present. This "
 "will prevent other users from connecting if the host part of their account "
 "allows a connection from any (%) host."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4500
+#: libraries/server_privileges.lib.php:4526
 #, php-format
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
@@ -12060,7 +12076,7 @@ msgid ""
 "%sreload the privileges%s before you continue."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4519
+#: libraries/server_privileges.lib.php:4545
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
 "tables. The content of these tables may differ from the privileges the "
@@ -12069,61 +12085,61 @@ msgid ""
 "privilege."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4569
+#: libraries/server_privileges.lib.php:4595
 msgid "The selected user was not found in the privilege table."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4801
+#: libraries/server_privileges.lib.php:4827
 msgid "You have added a new user."
 msgstr ""
 
-#: libraries/server_status.lib.php:53
+#: libraries/server_status.lib.php:60
 #, php-format
 msgid "Network traffic since startup: %s"
 msgstr ""
 
-#: libraries/server_status.lib.php:66
+#: libraries/server_status.lib.php:73
 #, php-format
 msgid "This MySQL server has been running for %1$s. It started up on %2$s."
 msgstr ""
 
-#: libraries/server_status.lib.php:80
+#: libraries/server_status.lib.php:94
 msgid ""
 "This MySQL server works as <b>master</b> and <b>slave</b> in <b>replication</"
 "b> process."
 msgstr ""
 
-#: libraries/server_status.lib.php:85
+#: libraries/server_status.lib.php:99
 msgid "This MySQL server works as <b>master</b> in <b>replication</b> process."
 msgstr ""
 
-#: libraries/server_status.lib.php:90
+#: libraries/server_status.lib.php:104
 msgid "This MySQL server works as <b>slave</b> in <b>replication</b> process."
 msgstr ""
 
-#: libraries/server_status.lib.php:106
+#: libraries/server_status.lib.php:116
 msgid "Replication status"
 msgstr ""
 
-#: libraries/server_status.lib.php:137
+#: libraries/server_status.lib.php:146
 msgid ""
 "On a busy server, the byte counters may overrun, so those statistics as "
 "reported by the MySQL server may be incorrect."
 msgstr ""
 
-#: libraries/server_status.lib.php:148
+#: libraries/server_status.lib.php:157
 msgid "Received"
 msgstr ""
 
-#: libraries/server_status.lib.php:167
+#: libraries/server_status.lib.php:176
 msgid "Sent"
 msgstr ""
 
-#: libraries/server_status.lib.php:234
+#: libraries/server_status.lib.php:243
 msgid "Max. concurrent connections"
 msgstr ""
 
-#: libraries/server_status.lib.php:244
+#: libraries/server_status.lib.php:253
 msgid "Failed attempts"
 msgstr ""
 
@@ -13045,7 +13061,7 @@ msgstr ""
 msgid "Not implemented yet."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/AlterOperation.php:193
+#: libraries/sql-parser/src/Components/AlterOperation.php:191
 msgid "Unrecognized alter operation."
 msgstr ""
 
@@ -13059,7 +13075,7 @@ msgid "An opening bracket followed by a set of values was expected."
 msgstr ""
 
 #: libraries/sql-parser/src/Components/ArrayObj.php:101
-#: libraries/sql-parser/src/Components/FieldDefinition.php:202
+#: libraries/sql-parser/src/Components/CreateDefinition.php:202
 msgid "An opening bracket was expected."
 msgstr ""
 
@@ -13067,25 +13083,35 @@ msgstr ""
 msgid "A comma or a closing bracket was expected"
 msgstr ""
 
+#: libraries/sql-parser/src/Components/CreateDefinition.php:246
+#, fuzzy
+#| msgid "Database %1$s has been created."
+msgid "A comma or a closing bracket was expected."
+msgstr "%1$s аттуу берилиштер базасы түзүлдү."
+
+#: libraries/sql-parser/src/Components/CreateDefinition.php:262
+msgid "A closing bracket was expected."
+msgstr ""
+
 #: libraries/sql-parser/src/Components/DataType.php:125
 msgid "Unrecognized data type."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:225
+#: libraries/sql-parser/src/Components/Expression.php:227
 msgid "Unexpected closing bracket."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:246
-#: libraries/sql-parser/src/Components/Expression.php:283
-#: libraries/sql-parser/src/Components/Expression.php:303
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:285
+#: libraries/sql-parser/src/Components/Expression.php:305
 msgid "An alias was previously found."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:257
+#: libraries/sql-parser/src/Components/Expression.php:259
 msgid "Unexpected dot."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:327
+#: libraries/sql-parser/src/Components/Expression.php:329
 #, fuzzy
 #| msgid "Database %1$s has been created."
 msgid "An alias was expected."
@@ -13095,16 +13121,6 @@ msgstr "%1$s аттуу берилиштер базасы түзүлдү."
 msgid "An expression was expected."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/FieldDefinition.php:246
-#, fuzzy
-#| msgid "Database %1$s has been created."
-msgid "A comma or a closing bracket was expected."
-msgstr "%1$s аттуу берилиштер базасы түзүлдү."
-
-#: libraries/sql-parser/src/Components/FieldDefinition.php:262
-msgid "A closing bracket was expected."
-msgstr ""
-
 #: libraries/sql-parser/src/Components/Limit.php:90
 #: libraries/sql-parser/src/Components/Limit.php:112
 msgid "An offset was expected."
@@ -13146,24 +13162,24 @@ msgstr ""
 msgid "Expected delimiter."
 msgstr ""
 
-#: libraries/sql-parser/src/Lexer.php:753
+#: libraries/sql-parser/src/Lexer.php:777
 #, php-format
 msgid "Ending quote %1$s was expected."
 msgstr ""
 
-#: libraries/sql-parser/src/Lexer.php:789
+#: libraries/sql-parser/src/Lexer.php:813
 msgid "Variable name was expected."
 msgstr ""
 
-#: libraries/sql-parser/src/Parser.php:380
+#: libraries/sql-parser/src/Parser.php:391
 msgid "Unexpected beginning of statement."
 msgstr ""
 
-#: libraries/sql-parser/src/Parser.php:399
+#: libraries/sql-parser/src/Parser.php:410
 msgid "Unrecognized statement type."
 msgstr ""
 
-#: libraries/sql-parser/src/Parser.php:479
+#: libraries/sql-parser/src/Parser.php:489
 msgid "No transaction was previously started."
 msgstr ""
 
@@ -13189,8 +13205,10 @@ msgid "The name of the entity was expected."
 msgstr ""
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:310
-msgid "At least one field definition was expected."
-msgstr ""
+#, fuzzy
+#| msgid "Database %1$s has been created."
+msgid "At least one column definition was expected."
+msgstr "%1$s аттуу берилиштер базасы түзүлдү."
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:329
 msgid "A \"RETURNS\" keyword was expected."
@@ -13249,25 +13267,25 @@ msgstr ""
 msgid "Using bookmark \"%s\" as default browse query."
 msgstr ""
 
-#: libraries/sql.lib.php:1306
+#: libraries/sql.lib.php:1300
 msgid "Showing as PHP code"
 msgstr ""
 
-#: libraries/sql.lib.php:1638
+#: libraries/sql.lib.php:1632
 #, php-format
 msgid ""
 "Current selection does not contain a unique column. Grid edit, checkbox, "
 "Edit, Copy and Delete features are not available. %s"
 msgstr ""
 
-#: libraries/sql.lib.php:1649
+#: libraries/sql.lib.php:1643
 #, php-format
 msgid ""
 "Current selection does not contain a unique column. Grid edit, Edit, Copy "
 "and Delete features may result in undesired behavior. %s"
 msgstr ""
 
-#: libraries/sql.lib.php:1688
+#: libraries/sql.lib.php:1682
 #, php-format
 msgid "Problems with indexes of table `%s`"
 msgstr ""
@@ -13428,7 +13446,7 @@ msgid "Version %s snapshot (SQL code)"
 msgstr ""
 
 #: libraries/tracking.lib.php:947
-#: templates/structure/table_structure_row.phtml:33
+#: templates/table/structure/table_structure_row.phtml:33
 msgctxt "None for default"
 msgid "None"
 msgstr ""
@@ -13480,15 +13498,15 @@ msgstr ""
 msgid "Version %1$s was created, tracking for %2$s is active."
 msgstr ""
 
-#: libraries/user_preferences.inc.php:29
+#: libraries/user_preferences.inc.php:30
 msgid "Manage your settings"
 msgstr ""
 
-#: libraries/user_preferences.inc.php:46 prefs_manage.php:307
+#: libraries/user_preferences.inc.php:54 prefs_manage.php:307
 msgid "Configuration has been saved."
 msgstr ""
 
-#: libraries/user_preferences.inc.php:66
+#: libraries/user_preferences.inc.php:74
 #, php-format
 msgid ""
 "Your preferences will be saved for current session only. Storing them "
@@ -13866,7 +13884,7 @@ msgid "first"
 msgstr ""
 
 #: templates/columns_definitions/move_column.phtml:12
-#: templates/structure/add_column.phtml:21
+#: templates/table/structure/add_column.phtml:21
 #, php-format
 msgid "after %s"
 msgstr ""
@@ -13925,197 +13943,294 @@ msgstr ""
 msgid "Input transformation options"
 msgstr ""
 
-#: templates/designer/aggregate_query_panel.phtml:22
-#: templates/designer/options_panel.phtml:100
-msgid "Aggregate"
-msgstr ""
-
-#: templates/designer/aggregate_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:61
-#: templates/designer/options_panel.phtml:106
-#: templates/designer/options_panel.phtml:170
-#: templates/designer/where_query_panel.phtml:30
-#: templates/table/table_header.phtml:9
-msgid "Operator"
-msgstr ""
-
-#: templates/designer/database_tables.phtml:29
-msgid "Toggle"
-msgstr ""
-
-#: templates/designer/database_tables.phtml:40
-msgid "See table structure"
-msgstr ""
-
-#: templates/designer/delete_relation_panel.phtml:21
-msgid "Delete relation"
-msgstr ""
-
-#: templates/designer/edit_delete_pages.phtml:7
-msgid "Page to open"
-msgstr ""
-
-#: templates/designer/edit_delete_pages.phtml:7
-msgid "Page to delete"
-msgstr ""
-
-#: templates/designer/having_query_panel.phtml:90
-#: templates/designer/options_panel.phtml:63
-#: templates/designer/options_panel.phtml:229
-#: templates/designer/where_query_panel.phtml:59
-msgid "Except"
-msgstr ""
-
-#: templates/designer/having_query_panel.phtml:102
-#: templates/designer/options_panel.phtml:75
-#: templates/designer/options_panel.phtml:241
-#: templates/designer/where_query_panel.phtml:71
-msgid "subquery"
-msgstr ""
-
-#: templates/designer/new_relation_panel.phtml:22
-#: templates/designer/side_menu.phtml:84 templates/designer/side_menu.phtml:87
-msgid "Create relation"
-msgstr ""
-
-#: templates/designer/options_panel.phtml:34
-#: templates/designer/options_panel.phtml:200
-msgid "Relation operator"
-msgstr ""
-
-#: templates/designer/options_panel.phtml:85
-#: templates/designer/rename_to_panel.phtml:23
-msgid "Rename to"
-msgstr ""
-
-#: templates/designer/options_panel.phtml:91
-#: templates/designer/rename_to_panel.phtml:31
-msgid "New name"
-msgstr ""
-
-#: templates/designer/page_save_as.phtml:4
-msgid "Save to selected page"
-msgstr ""
-
-#: templates/designer/page_save_as.phtml:5
-msgid "Create a page and save to it"
-msgstr ""
-
-#: templates/designer/page_save_as.phtml:26
-msgid "New page name"
-msgstr ""
-
-#: templates/designer/page_selector.phtml:2
-msgid "Select page"
-msgstr ""
-
-#: templates/designer/query_details.phtml:10
-msgid "Active options"
-msgstr ""
-
-#: templates/designer/schema_export.phtml:4
-msgid "Select Export Relational Type"
-msgstr ""
-
-#: templates/designer/side_menu.phtml:19 templates/designer/side_menu.phtml:25
-msgid "Show/Hide tables list"
-msgstr ""
-
-#: templates/designer/side_menu.phtml:29 templates/designer/side_menu.phtml:35
-#: templates/designer/side_menu.phtml:36
-msgid "View in fullscreen"
-msgstr ""
-
-#: templates/designer/side_menu.phtml:34
-msgid "Exit fullscreen"
-msgstr ""
-
-#: templates/designer/side_menu.phtml:41 templates/designer/side_menu.phtml:45
-msgid "New page"
-msgstr ""
-
-#: templates/designer/side_menu.phtml:70 templates/designer/side_menu.phtml:73
-msgid "Delete pages"
-msgstr ""
-
-#: templates/designer/side_menu.phtml:77 templates/designer/side_menu.phtml:80
-#: templates/table/create_table.phtml:7
+#: templates/database/create_table.phtml:7
+#: templates/database/designer/side_menu.phtml:77
+#: templates/database/designer/side_menu.phtml:80
 msgid "Create table"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:98
-#: templates/designer/side_menu.phtml:101
+#: templates/database/create_table.phtml:15
+msgid "Number of columns"
+msgstr ""
+
+#: templates/database/designer/aggregate_query_panel.phtml:22
+#: templates/database/designer/options_panel.phtml:100
+msgid "Aggregate"
+msgstr ""
+
+#: templates/database/designer/aggregate_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:61
+#: templates/database/designer/options_panel.phtml:106
+#: templates/database/designer/options_panel.phtml:170
+#: templates/database/designer/where_query_panel.phtml:30
+#: templates/table/search/table_header.phtml:9
+msgid "Operator"
+msgstr ""
+
+#: templates/database/designer/database_tables.phtml:29
+msgid "Toggle"
+msgstr ""
+
+#: templates/database/designer/database_tables.phtml:40
+msgid "See table structure"
+msgstr ""
+
+#: templates/database/designer/delete_relation_panel.phtml:21
+msgid "Delete relation"
+msgstr ""
+
+#: templates/database/designer/edit_delete_pages.phtml:7
+msgid "Page to open"
+msgstr ""
+
+#: templates/database/designer/edit_delete_pages.phtml:7
+msgid "Page to delete"
+msgstr ""
+
+#: templates/database/designer/having_query_panel.phtml:90
+#: templates/database/designer/options_panel.phtml:63
+#: templates/database/designer/options_panel.phtml:229
+#: templates/database/designer/where_query_panel.phtml:59
+msgid "Except"
+msgstr ""
+
+#: templates/database/designer/having_query_panel.phtml:102
+#: templates/database/designer/options_panel.phtml:75
+#: templates/database/designer/options_panel.phtml:241
+#: templates/database/designer/where_query_panel.phtml:71
+msgid "subquery"
+msgstr ""
+
+#: templates/database/designer/new_relation_panel.phtml:22
+#: templates/database/designer/side_menu.phtml:84
+#: templates/database/designer/side_menu.phtml:87
+msgid "Create relation"
+msgstr ""
+
+#: templates/database/designer/options_panel.phtml:34
+#: templates/database/designer/options_panel.phtml:200
+msgid "Relation operator"
+msgstr ""
+
+#: templates/database/designer/options_panel.phtml:85
+#: templates/database/designer/rename_to_panel.phtml:23
+msgid "Rename to"
+msgstr ""
+
+#: templates/database/designer/options_panel.phtml:91
+#: templates/database/designer/rename_to_panel.phtml:31
+msgid "New name"
+msgstr ""
+
+#: templates/database/designer/page_save_as.phtml:4
+msgid "Save to selected page"
+msgstr ""
+
+#: templates/database/designer/page_save_as.phtml:5
+msgid "Create a page and save to it"
+msgstr ""
+
+#: templates/database/designer/page_save_as.phtml:26
+msgid "New page name"
+msgstr ""
+
+#: templates/database/designer/page_selector.phtml:2
+msgid "Select page"
+msgstr ""
+
+#: templates/database/designer/query_details.phtml:10
+msgid "Active options"
+msgstr ""
+
+#: templates/database/designer/schema_export.phtml:4
+msgid "Select Export Relational Type"
+msgstr ""
+
+#: templates/database/designer/side_menu.phtml:19
+#: templates/database/designer/side_menu.phtml:25
+msgid "Show/Hide tables list"
+msgstr ""
+
+#: templates/database/designer/side_menu.phtml:29
+#: templates/database/designer/side_menu.phtml:35
+#: templates/database/designer/side_menu.phtml:36
+msgid "View in fullscreen"
+msgstr ""
+
+#: templates/database/designer/side_menu.phtml:34
+msgid "Exit fullscreen"
+msgstr ""
+
+#: templates/database/designer/side_menu.phtml:41
+#: templates/database/designer/side_menu.phtml:45
+msgid "New page"
+msgstr ""
+
+#: templates/database/designer/side_menu.phtml:70
+#: templates/database/designer/side_menu.phtml:73
+msgid "Delete pages"
+msgstr ""
+
+#: templates/database/designer/side_menu.phtml:98
+#: templates/database/designer/side_menu.phtml:101
 msgid "Reload"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:107
-#: templates/designer/side_menu.phtml:110
+#: templates/database/designer/side_menu.phtml:107
+#: templates/database/designer/side_menu.phtml:110
 msgid "Help"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Angular links"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Direct links"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:122
-#: templates/designer/side_menu.phtml:124
+#: templates/database/designer/side_menu.phtml:122
+#: templates/database/designer/side_menu.phtml:124
 msgid "Snap to grid"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:128
-#: templates/designer/side_menu.phtml:134
+#: templates/database/designer/side_menu.phtml:128
+#: templates/database/designer/side_menu.phtml:134
 msgid "Small/Big All"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:138
-#: templates/designer/side_menu.phtml:141
+#: templates/database/designer/side_menu.phtml:138
+#: templates/database/designer/side_menu.phtml:141
 msgid "Toggle small/big"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:145
-#: templates/designer/side_menu.phtml:148
+#: templates/database/designer/side_menu.phtml:145
+#: templates/database/designer/side_menu.phtml:148
 msgid "Toggle relation lines"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:153
-#: templates/designer/side_menu.phtml:156
+#: templates/database/designer/side_menu.phtml:153
+#: templates/database/designer/side_menu.phtml:156
 msgid "Export schema"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:165
-#: templates/designer/side_menu.phtml:168
+#: templates/database/designer/side_menu.phtml:165
+#: templates/database/designer/side_menu.phtml:168
 msgid "Build Query"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:173
-#: templates/designer/side_menu.phtml:177
+#: templates/database/designer/side_menu.phtml:173
+#: templates/database/designer/side_menu.phtml:177
 msgid "Move Menu"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:181
-#: templates/designer/side_menu.phtml:186
+#: templates/database/designer/side_menu.phtml:181
+#: templates/database/designer/side_menu.phtml:186
 msgid "Pin text"
 msgstr ""
 
-#: templates/designer/table_list.phtml:4
+#: templates/database/designer/table_list.phtml:4
 msgid "Hide/Show all"
 msgstr ""
 
-#: templates/designer/table_list.phtml:14
+#: templates/database/designer/table_list.phtml:14
 msgid "Hide/Show Tables with no relation"
 msgstr ""
 
-#: templates/designer/table_list.phtml:59
+#: templates/database/designer/table_list.phtml:59
 msgid "Number of tables:"
 msgstr ""
 
+#: templates/database/structure/body_for_table_summary.phtml:6
+#, php-format
+msgid "%s table"
+msgid_plural "%s tables"
+msgstr[0] "%s жадыбал"
+msgstr[1] "%s жадыбалдар"
+
+#: templates/database/structure/body_for_table_summary.phtml:17
+msgid "Sum"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:6
+msgid "Check tables having overhead"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:10
+msgid "Show create"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:27
+msgid "Prefix"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:28
+msgid "Add prefix to table"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:29
+msgid "Replace table prefix"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:30
+msgid "Copy table with prefix"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:36
+#, fuzzy
+#| msgid "Value for the column \"%s\""
+msgid "Add columns to central list"
+msgstr "\"%s\" мамычанын мааниси"
+
+#: templates/database/structure/check_all_tables.phtml:37
+msgid "Remove columns from central list"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:38
+#, fuzzy
+#| msgid "Value for the column \"%s\""
+msgid "Make consistent with central list"
+msgstr "\"%s\" мамычанын мааниси"
+
+#: templates/database/structure/favorite_anchor.phtml:12
+msgid "Add to Favorites"
+msgstr ""
+
+#: templates/database/structure/show_create.phtml:2
+msgid "Showing create queries"
+msgstr ""
+
+#: templates/database/structure/sortable_header.phtml:13
+msgid "Sort"
+msgstr ""
+
+#: templates/database/structure/table_header.phtml:42
+msgid ""
+"May be approximate. Click on the number to get the exact count. See "
+"[doc@faq3-11]FAQ 3.11[/doc]."
+msgstr ""
+
+#: templates/database/structure/table_header.phtml:66
+#: templates/table/index_form.phtml:127
+msgid "Size"
+msgstr "Олчом"
+
+#: templates/database/structure/table_header.phtml:74
+#: templates/table/structure/display_table_stats.phtml:27
+msgid "Overhead"
+msgstr ""
+
+#: templates/database/structure/tracking_icon.phtml:4
+msgid "Tracking is active."
+msgstr ""
+
+#: templates/database/structure/tracking_icon.phtml:8
+msgid "Tracking is not active."
+msgstr ""
+
 #: templates/error/report_form.phtml:7
 msgid ""
 "phpMyAdmin has encountered an error. We have collected data about this error "
@@ -14131,59 +14246,6 @@ msgstr ""
 msgid "Please explain the steps that lead to the error:"
 msgstr ""
 
-#: templates/gis_visualization/gis_visualization.phtml:3
-msgid "Display GIS Visualization"
-msgstr ""
-
-#: templates/gis_visualization/gis_visualization.phtml:8
-msgid "Label column"
-msgstr ""
-
-#: templates/gis_visualization/gis_visualization.phtml:11
-msgid "-- None --"
-msgstr ""
-
-#: templates/gis_visualization/gis_visualization.phtml:19
-msgid "Spatial column"
-msgstr ""
-
-#: templates/index_form.phtml:16
-msgid "Index name:"
-msgstr ""
-
-#: templates/index_form.phtml:19
-msgid ""
-"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
-msgstr ""
-
-#: templates/index_form.phtml:40
-msgid "Index choice:"
-msgstr ""
-
-#: templates/index_form.phtml:57
-msgid "Key block size:"
-msgstr ""
-
-#: templates/index_form.phtml:74
-msgid "Index type:"
-msgstr ""
-
-#: templates/index_form.phtml:86
-msgid "Parser:"
-msgstr ""
-
-#: templates/index_form.phtml:102
-msgid "Comment:"
-msgstr ""
-
-#: templates/index_form.phtml:127 templates/structure/table_header.phtml:66
-msgid "Size"
-msgstr "Олчом"
-
-#: templates/index_form.phtml:149 templates/index_form.phtml:190
-msgid "Drag to reorder"
-msgstr ""
-
 #: templates/prefs_autoload.phtml:9
 msgid ""
 "Your browser has phpMyAdmin configuration for this domain. Would you like to "
@@ -14194,419 +14256,382 @@ msgstr ""
 msgid "Start row:"
 msgstr ""
 
-#: templates/structure/actions_in_table_structure.phtml:14
-#, php-format
-msgid "A primary key has been added on %s."
-msgstr ""
-
-#: templates/structure/actions_in_table_structure.phtml:34
-#: templates/structure/actions_in_table_structure.phtml:54
-#: templates/structure/actions_in_table_structure.phtml:79
-#: templates/structure/actions_in_table_structure.phtml:101
-#, php-format
-msgid "An index has been added on %s."
-msgstr ""
-
-#: templates/structure/actions_in_table_structure.phtml:130
-#: templates/structure/check_all_table_column.phtml:59
-msgid "Remove from central columns"
-msgstr ""
-
-#: templates/structure/actions_in_table_structure.phtml:138
-#: templates/structure/check_all_table_column.phtml:55
-#, fuzzy
-#| msgid "Value for the column \"%s\""
-msgid "Add to central columns"
-msgstr "\"%s\" мамычанын мааниси"
-
-#: templates/structure/add_column.phtml:7
-#, php-format
-msgid "Add %s column(s)"
-msgstr ""
-
-#: templates/structure/add_column.phtml:12
-msgid "at beginning of table"
-msgstr ""
-
-#: templates/structure/body_for_table_summary.phtml:6
-#, php-format
-msgid "%s table"
-msgid_plural "%s tables"
-msgstr[0] "%s жадыбал"
-msgstr[1] "%s жадыбалдар"
-
-#: templates/structure/body_for_table_summary.phtml:17
-msgid "Sum"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:6
-msgid "Check tables having overhead"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:10
-msgid "Show create"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:27
-msgid "Prefix"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:28
-msgid "Add prefix to table"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:29
-msgid "Replace table prefix"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:30
-msgid "Copy table with prefix"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:36
-#, fuzzy
-#| msgid "Value for the column \"%s\""
-msgid "Add columns to central list"
-msgstr "\"%s\" мамычанын мааниси"
-
-#: templates/structure/check_all_tables.phtml:37
-msgid "Remove columns from central list"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:38
-#, fuzzy
-#| msgid "Value for the column \"%s\""
-msgid "Make consistent with central list"
-msgstr "\"%s\" мамычанын мааниси"
-
-#: templates/structure/display_structure.phtml:140 view_create.php:181
-msgid "Edit view"
-msgstr ""
-
-#: templates/structure/display_table_stats.phtml:9
-msgid "Space usage"
-msgstr ""
-
-#: templates/structure/display_table_stats.phtml:27
-#: templates/structure/table_header.phtml:74
-msgid "Overhead"
-msgstr ""
-
-#: templates/structure/display_table_stats.phtml:32
-msgid "Effective"
-msgstr ""
-
-#: templates/structure/favorite_anchor.phtml:12
-msgid "Add to Favorites"
-msgstr ""
-
-#: templates/structure/move_columns_dialog.phtml:1
-#: templates/structure/optional_action_links.phtml:21
-msgid "Move columns"
-msgstr ""
-
-#: templates/structure/move_columns_dialog.phtml:2
-msgid "Move the columns by dragging them up and down."
-msgstr ""
-
-#: templates/structure/optional_action_links.phtml:9
-msgid "Propose table structure"
-msgstr ""
-
-#: templates/structure/optional_action_links.phtml:24
-msgid "Improve table structure"
-msgstr ""
-
-#: templates/structure/optional_action_links.phtml:30
-msgid "Track view"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:3
-msgid "Row statistics"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:9
-msgid "static"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:11
-msgid "dynamic"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:22
-msgid "partitioned"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:54
-msgid "Row length"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:66
-msgid "Row size"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:73
-msgid "Next autoindex"
-msgstr ""
-
-#: templates/structure/secondary_tabs.phtml:14
-msgid "Relation view"
-msgstr ""
-
-#: templates/structure/show_create.phtml:2
-msgid "Showing create queries"
-msgstr ""
-
-#: templates/structure/sortable_header.phtml:13
-msgid "Sort"
-msgstr ""
-
-#: templates/structure/table_header.phtml:42
-msgid ""
-"May be approximate. Click on the number to get the exact count. See "
-"[doc@faq3-11]FAQ 3.11[/doc]."
-msgstr ""
-
-#: templates/structure/table_structure_row.phtml:46
-#, php-format
-msgid "Column %s has been dropped."
-msgstr ""
-
-#: templates/structure/tracking_icon.phtml:4
-msgid "Tracking is active."
-msgstr ""
-
-#: templates/structure/tracking_icon.phtml:8
-msgid "Tracking is not active."
-msgstr ""
-
-#: templates/table/create_table.phtml:15
-msgid "Number of columns"
-msgstr ""
-
-#: templates/table/options.phtml:8
-msgid "Select columns (at least one):"
-msgstr ""
-
-#: templates/table/options.phtml:37
-msgid "Add search conditions (body of the \"where\" clause):"
-msgstr ""
-
-#: templates/table/options.phtml:45
-msgid "Number of rows per page"
-msgstr ""
-
-#: templates/table/options.phtml:56
-msgid "Display order:"
-msgstr ""
-
-#: templates/table/options_zoom.phtml:6
-msgid "Use this column to label each point"
-msgstr ""
-
-#: templates/table/options_zoom.phtml:35
-msgid "Maximum rows to plot"
-msgstr ""
-
-#: templates/table/replace_preview.phtml:13
-msgid "Find and replace - preview"
-msgstr ""
-
-#: templates/table/replace_preview.phtml:18
-msgid "Original string"
-msgstr ""
-
-#: templates/table/replace_preview.phtml:19
-msgid "Replaced string"
-msgstr ""
-
-#: templates/table/replace_preview.phtml:40
-msgid "Replace"
-msgstr ""
-
-#: templates/table/rows_zoom.phtml:16
-msgid "Additional search criteria"
-msgstr ""
-
-#: templates/table/search_and_replace.phtml:3
-msgid "Replace with:"
-msgstr ""
-
-#: templates/table/search_and_replace.phtml:22
-msgid "Use regular expression"
-msgstr ""
-
-#: templates/table/selection_form.phtml:12
-msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
-msgstr ""
-
-#: templates/table/selection_form.phtml:34
-msgid "Do a \"query by example\" (wildcard: \"%\")"
-msgstr ""
-
-#: templates/table/zoom_result_form.phtml:7
-msgid "Browse/Edit the points"
-msgstr ""
-
-#: templates/table/zoom_result_form.phtml:15
-msgid "How to use"
-msgstr ""
-
-#: templates/table/zoom_result_form.phtml:23
-msgid "Reset zoom"
-msgstr ""
-
-#: templates/tbl_chart.phtml:17
+#: templates/table/chart/tbl_chart.phtml:17
 msgctxt "Chart type"
 msgid "Bar"
 msgstr ""
 
-#: templates/tbl_chart.phtml:21
+#: templates/table/chart/tbl_chart.phtml:21
 msgctxt "Chart type"
 msgid "Column"
 msgstr ""
 
-#: templates/tbl_chart.phtml:25
+#: templates/table/chart/tbl_chart.phtml:25
 msgctxt "Chart type"
 msgid "Line"
 msgstr ""
 
-#: templates/tbl_chart.phtml:29
+#: templates/table/chart/tbl_chart.phtml:29
 msgctxt "Chart type"
 msgid "Spline"
 msgstr ""
 
-#: templates/tbl_chart.phtml:33
+#: templates/table/chart/tbl_chart.phtml:33
 msgctxt "Chart type"
 msgid "Area"
 msgstr ""
 
-#: templates/tbl_chart.phtml:37
+#: templates/table/chart/tbl_chart.phtml:37
 msgctxt "Chart type"
 msgid "Pie"
 msgstr ""
 
-#: templates/tbl_chart.phtml:41
+#: templates/table/chart/tbl_chart.phtml:41
 msgctxt "Chart type"
 msgid "Timeline"
 msgstr ""
 
-#: templates/tbl_chart.phtml:45
+#: templates/table/chart/tbl_chart.phtml:45
 msgctxt "Chart type"
 msgid "Scatter"
 msgstr ""
 
-#: templates/tbl_chart.phtml:50
+#: templates/table/chart/tbl_chart.phtml:50
 msgid "Stacked"
 msgstr ""
 
-#: templates/tbl_chart.phtml:53
+#: templates/table/chart/tbl_chart.phtml:53
 msgid "Chart title"
 msgstr ""
 
-#: templates/tbl_chart.phtml:57
+#: templates/table/chart/tbl_chart.phtml:57
 msgid "X-Axis:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:72
+#: templates/table/chart/tbl_chart.phtml:72
 msgid "Series:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:102
+#: templates/table/chart/tbl_chart.phtml:102
 msgid "X-Axis label:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:104
+#: templates/table/chart/tbl_chart.phtml:104
 msgid "X Values"
 msgstr ""
 
-#: templates/tbl_chart.phtml:107
+#: templates/table/chart/tbl_chart.phtml:107
 msgid "Y-Axis label:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:115
+#: templates/table/chart/tbl_chart.phtml:115
 msgid "Series names are in a column"
 msgstr ""
 
-#: templates/tbl_chart.phtml:118
+#: templates/table/chart/tbl_chart.phtml:118
 msgid "Series column:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:130
+#: templates/table/chart/tbl_chart.phtml:130
 #, fuzzy
 #| msgid "Table comments:"
 msgid "Value Column:"
 msgstr "Жадыбал жөнүндө маалымат:"
 
-#: templates/tbl_chart.phtml:150
+#: templates/table/chart/tbl_chart.phtml:150
 msgid "Save chart as image"
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:7
+#: templates/table/gis_visualization/gis_visualization.phtml:3
+msgid "Display GIS Visualization"
+msgstr ""
+
+#: templates/table/gis_visualization/gis_visualization.phtml:8
+msgid "Label column"
+msgstr ""
+
+#: templates/table/gis_visualization/gis_visualization.phtml:11
+msgid "-- None --"
+msgstr ""
+
+#: templates/table/gis_visualization/gis_visualization.phtml:19
+msgid "Spatial column"
+msgstr ""
+
+#: templates/table/index_form.phtml:16
+msgid "Index name:"
+msgstr ""
+
+#: templates/table/index_form.phtml:19
+msgid ""
+"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
+msgstr ""
+
+#: templates/table/index_form.phtml:40
+msgid "Index choice:"
+msgstr ""
+
+#: templates/table/index_form.phtml:57
+msgid "Key block size:"
+msgstr ""
+
+#: templates/table/index_form.phtml:74
+msgid "Index type:"
+msgstr ""
+
+#: templates/table/index_form.phtml:86
+msgid "Parser:"
+msgstr ""
+
+#: templates/table/index_form.phtml:102
+msgid "Comment:"
+msgstr ""
+
+#: templates/table/index_form.phtml:149 templates/table/index_form.phtml:190
+msgid "Drag to reorder"
+msgstr ""
+
+#: templates/table/relation/common_form.phtml:7
 #, fuzzy
 #| msgid "Database %1$s has been created."
 msgid "Internal relations"
 msgstr "%1$s аттуу берилиштер базасы түзүлдү."
 
-#: templates/tbl_relation/common_form.phtml:11
+#: templates/table/relation/common_form.phtml:11
 msgid "Internal relation"
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:14
+#: templates/table/relation/common_form.phtml:14
 msgid ""
 "An internal relation is not necessary when a corresponding FOREIGN KEY "
 "relation exists."
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:37
+#: templates/table/relation/common_form.phtml:37
 msgid "Foreign key constraints"
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:40
+#: templates/table/relation/common_form.phtml:40
 #, fuzzy
 #| msgid "Action"
 msgid "Actions"
 msgstr "Кыймыл"
 
-#: templates/tbl_relation/common_form.phtml:41
+#: templates/table/relation/common_form.phtml:41
 msgid "Constraint properties"
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:44
+#: templates/table/relation/common_form.phtml:44
 msgid ""
 "Only columns with index will be displayed. You can define an index below."
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:49
+#: templates/table/relation/common_form.phtml:49
 msgid "Foreign key constraint"
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:81
+#: templates/table/relation/common_form.phtml:81
 #, fuzzy
 #| msgid "Value for the column \"%s\""
 msgid "+ Add constraint"
 msgstr "\"%s\" мамычанын мааниси"
 
-#: templates/tbl_relation/common_form.phtml:91
+#: templates/table/relation/common_form.phtml:91
 msgid "Choose column to display:"
 msgstr ""
 
-#: templates/tbl_relation/foreign_key_row.phtml:13
+#: templates/table/relation/foreign_key_row.phtml:13
 #, fuzzy, php-format
 #| msgid "Database %1$s has been created."
 msgid "Foreign key constraint %s has been dropped"
 msgstr "%1$s аттуу берилиштер базасы түзүлдү."
 
-#: templates/tbl_relation/foreign_key_row.phtml:102
+#: templates/table/relation/foreign_key_row.phtml:102
 msgid "Constraint name"
 msgstr ""
 
-#: templates/tbl_relation/foreign_key_row.phtml:157
+#: templates/table/relation/foreign_key_row.phtml:157
 #, fuzzy
 #| msgid "Value for the column \"%s\""
 msgid "+ Add column"
 msgstr "\"%s\" мамычанын мааниси"
 
+#: templates/table/search/options.phtml:8
+msgid "Select columns (at least one):"
+msgstr ""
+
+#: templates/table/search/options.phtml:37
+msgid "Add search conditions (body of the \"where\" clause):"
+msgstr ""
+
+#: templates/table/search/options.phtml:45
+msgid "Number of rows per page"
+msgstr ""
+
+#: templates/table/search/options.phtml:56
+msgid "Display order:"
+msgstr ""
+
+#: templates/table/search/options_zoom.phtml:6
+msgid "Use this column to label each point"
+msgstr ""
+
+#: templates/table/search/options_zoom.phtml:35
+msgid "Maximum rows to plot"
+msgstr ""
+
+#: templates/table/search/replace_preview.phtml:13
+msgid "Find and replace - preview"
+msgstr ""
+
+#: templates/table/search/replace_preview.phtml:18
+msgid "Original string"
+msgstr ""
+
+#: templates/table/search/replace_preview.phtml:19
+msgid "Replaced string"
+msgstr ""
+
+#: templates/table/search/replace_preview.phtml:40
+msgid "Replace"
+msgstr ""
+
+#: templates/table/search/rows_zoom.phtml:16
+msgid "Additional search criteria"
+msgstr ""
+
+#: templates/table/search/search_and_replace.phtml:3
+msgid "Replace with:"
+msgstr ""
+
+#: templates/table/search/search_and_replace.phtml:22
+msgid "Use regular expression"
+msgstr ""
+
+#: templates/table/search/selection_form.phtml:12
+msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
+msgstr ""
+
+#: templates/table/search/selection_form.phtml:34
+msgid "Do a \"query by example\" (wildcard: \"%\")"
+msgstr ""
+
+#: templates/table/search/zoom_result_form.phtml:7
+msgid "Browse/Edit the points"
+msgstr ""
+
+#: templates/table/search/zoom_result_form.phtml:15
+msgid "How to use"
+msgstr ""
+
+#: templates/table/search/zoom_result_form.phtml:23
+msgid "Reset zoom"
+msgstr ""
+
+#: templates/table/secondary_tabs.phtml:14
+msgid "Relation view"
+msgstr ""
+
+#: templates/table/structure/actions_in_table_structure.phtml:14
+#, php-format
+msgid "A primary key has been added on %s."
+msgstr ""
+
+#: templates/table/structure/actions_in_table_structure.phtml:34
+#: templates/table/structure/actions_in_table_structure.phtml:54
+#: templates/table/structure/actions_in_table_structure.phtml:79
+#: templates/table/structure/actions_in_table_structure.phtml:101
+#, php-format
+msgid "An index has been added on %s."
+msgstr ""
+
+#: templates/table/structure/actions_in_table_structure.phtml:130
+#: templates/table/structure/check_all_table_column.phtml:59
+msgid "Remove from central columns"
+msgstr ""
+
+#: templates/table/structure/actions_in_table_structure.phtml:138
+#: templates/table/structure/check_all_table_column.phtml:55
+#, fuzzy
+#| msgid "Value for the column \"%s\""
+msgid "Add to central columns"
+msgstr "\"%s\" мамычанын мааниси"
+
+#: templates/table/structure/add_column.phtml:7
+#, php-format
+msgid "Add %s column(s)"
+msgstr ""
+
+#: templates/table/structure/add_column.phtml:12
+msgid "at beginning of table"
+msgstr ""
+
+#: templates/table/structure/display_structure.phtml:140 view_create.php:181
+msgid "Edit view"
+msgstr ""
+
+#: templates/table/structure/display_table_stats.phtml:9
+msgid "Space usage"
+msgstr ""
+
+#: templates/table/structure/display_table_stats.phtml:32
+msgid "Effective"
+msgstr ""
+
+#: templates/table/structure/move_columns_dialog.phtml:1
+#: templates/table/structure/optional_action_links.phtml:21
+msgid "Move columns"
+msgstr ""
+
+#: templates/table/structure/move_columns_dialog.phtml:2
+msgid "Move the columns by dragging them up and down."
+msgstr ""
+
+#: templates/table/structure/optional_action_links.phtml:9
+msgid "Propose table structure"
+msgstr ""
+
+#: templates/table/structure/optional_action_links.phtml:24
+msgid "Improve table structure"
+msgstr ""
+
+#: templates/table/structure/optional_action_links.phtml:30
+msgid "Track view"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:3
+msgid "Row statistics"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:9
+msgid "static"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:11
+msgid "dynamic"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:22
+msgid "partitioned"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:54
+msgid "Row length"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:66
+msgid "Row size"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:73
+msgid "Next autoindex"
+msgstr ""
+
+#: templates/table/structure/table_structure_row.phtml:46
+#, php-format
+msgid "Column %s has been dropped."
+msgstr ""
+
 #: themes.php:17 themes.php:22
 msgid "Theme"
 msgstr ""
diff --git a/po/li.po b/po/li.po
index 28a3b906eb..a322f5c4fd 100644
--- a/po/li.po
+++ b/po/li.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 4.5.0-dev\n"
 "Report-Msgid-Bugs-To: developers@phpmyadmin.net\n"
-"POT-Creation-Date: 2015-08-08 13:53-0400\n"
+"POT-Creation-Date: 2015-08-12 08:10-0400\n"
 "PO-Revision-Date: 2014-12-21 13:06+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -53,7 +53,7 @@ msgid "Table comments:"
 msgstr ""
 
 #: db_datadict.php:104 libraries/Index.class.php:699
-#: libraries/insert_edit.lib.php:1567
+#: libraries/insert_edit.lib.php:1565
 #: libraries/navigation/Nodes/Node_Column.class.php:30
 #: libraries/plugins/export/ExportHtmlword.class.php:280
 #: libraries/plugins/export/ExportHtmlword.class.php:375
@@ -67,13 +67,14 @@ msgstr ""
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1023
 #: libraries/tracking.lib.php:879 libraries/tracking.lib.php:975
 #: templates/columns_definitions/column_name.phtml:18
-#: templates/index_form.phtml:124 templates/table/table_header.phtml:6
-#: templates/table/zoom_result_form.phtml:33
-#: templates/tbl_relation/common_form.phtml:10
-#: templates/tbl_relation/common_form.phtml:43
-#: templates/tbl_relation/foreign_key_row.phtml:194
-#: templates/tbl_relation/foreign_key_row.phtml:206
-#: templates/tbl_relation/internal_relational_row.phtml:71
+#: templates/table/index_form.phtml:124
+#: templates/table/relation/common_form.phtml:10
+#: templates/table/relation/common_form.phtml:43
+#: templates/table/relation/foreign_key_row.phtml:194
+#: templates/table/relation/foreign_key_row.phtml:206
+#: templates/table/relation/internal_relational_row.phtml:71
+#: templates/table/search/table_header.phtml:6
+#: templates/table/search/zoom_result_form.phtml:33
 msgid "Column"
 msgstr ""
 
@@ -91,21 +92,21 @@ msgstr ""
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1001
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1024
 #: libraries/rte/rte_list.lib.php:75 libraries/rte/rte_list.lib.php:103
-#: libraries/rte/rte_routines.lib.php:802
-#: libraries/rte/rte_routines.lib.php:831
-#: libraries/rte/rte_routines.lib.php:1493
+#: libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_routines.lib.php:922
+#: libraries/rte/rte_routines.lib.php:1584
 #: libraries/server_privileges.lib.php:2369 libraries/tracking.lib.php:880
 #: libraries/tracking.lib.php:972
 #: templates/columns_definitions/table_fields_definitions.phtml:11
-#: templates/structure/table_header.phtml:48
-#: templates/structure/table_structure_header.phtml:6
-#: templates/table/table_header.phtml:7
+#: templates/database/structure/table_header.phtml:48
+#: templates/table/search/table_header.phtml:7
+#: templates/table/structure/table_structure_header.phtml:6
 msgid "Type"
 msgstr ""
 
 #: db_datadict.php:106 libraries/Index.class.php:702
 #: libraries/central_columns.lib.php:708
-#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1576
+#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1574
 #: libraries/plugins/export/ExportHtmlword.class.php:286
 #: libraries/plugins/export/ExportHtmlword.class.php:381
 #: libraries/plugins/export/ExportLatex.class.php:509
@@ -118,8 +119,8 @@ msgstr ""
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1026
 #: libraries/tracking.lib.php:882 libraries/tracking.lib.php:978
 #: templates/columns_definitions/table_fields_definitions.phtml:39
-#: templates/structure/table_structure_header.phtml:9
-#: templates/table/zoom_result_form.phtml:34
+#: templates/table/search/zoom_result_form.phtml:34
+#: templates/table/structure/table_structure_header.phtml:9
 msgid "Null"
 msgstr ""
 
@@ -137,8 +138,8 @@ msgstr ""
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1027
 #: libraries/replication_gui.lib.php:153 libraries/tracking.lib.php:883
 #: templates/columns_definitions/table_fields_definitions.phtml:25
-#: templates/structure/body_for_table_summary.phtml:55
-#: templates/structure/table_structure_header.phtml:10
+#: templates/database/structure/body_for_table_summary.phtml:55
+#: templates/table/structure/table_structure_header.phtml:10
 msgid "Default"
 msgstr ""
 
@@ -166,19 +167,19 @@ msgid "Comments"
 msgstr ""
 
 #: db_datadict.php:146
-#: libraries/controllers/StructureController.class.php:1960
-#: libraries/controllers/StructureController.class.php:1965
+#: libraries/controllers/TableStructureController.class.php:951
+#: libraries/controllers/TableStructureController.class.php:956
 #: libraries/tracking.lib.php:922
 #: templates/columns_definitions/column_indexes.phtml:6
-#: templates/structure/check_all_table_column.phtml:22
-#: templates/structure/display_structure.phtml:74
+#: templates/table/structure/check_all_table_column.phtml:22
+#: templates/table/structure/display_structure.phtml:74
 msgid "Primary"
 msgstr ""
 
 #: db_datadict.php:156 js/messages.php:317 libraries/Index.class.php:567
 #: libraries/Index.class.php:606 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261 libraries/mult_submits.lib.php:403
+#: libraries/config/FormDisplay.tpl.php:272 libraries/mult_submits.lib.php:403
 #: libraries/mult_submits.lib.php:417
 #: libraries/plugins/export/ExportHtmlword.class.php:630
 #: libraries/plugins/export/ExportLatex.class.php:589
@@ -194,20 +195,20 @@ msgstr ""
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1010 libraries/tracking.lib.php:1015
 #: prefs_manage.php:140 templates/prefs_autoload.phtml:15
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "No"
 msgstr ""
 
 #: db_datadict.php:156 js/messages.php:443 libraries/Index.class.php:568
 #: libraries/Index.class.php:605 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261
-#: libraries/controllers/StructureController.class.php:1344
-#: libraries/controllers/StructureController.class.php:2223
-#: libraries/controllers/StructureController.class.php:2232
-#: libraries/controllers/StructureController.class.php:2237
-#: libraries/controllers/StructureController.class.php:2242
-#: libraries/controllers/StructureController.class.php:2247
+#: libraries/config/FormDisplay.tpl.php:272
+#: libraries/controllers/TableStructureController.class.php:539
+#: libraries/controllers/TableStructureController.class.php:1201
+#: libraries/controllers/TableStructureController.class.php:1210
+#: libraries/controllers/TableStructureController.class.php:1215
+#: libraries/controllers/TableStructureController.class.php:1220
+#: libraries/controllers/TableStructureController.class.php:1225
 #: libraries/mult_submits.inc.php:82 libraries/mult_submits.inc.php:178
 #: libraries/mult_submits.lib.php:339 libraries/mult_submits.lib.php:372
 #: libraries/mult_submits.lib.php:401 libraries/mult_submits.lib.php:415
@@ -216,8 +217,8 @@ msgstr ""
 #: libraries/plugins/export/ExportOdt.class.php:756
 #: libraries/plugins/export/ExportTexytext.class.php:567
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1077
-#: libraries/server_databases.lib.php:464
-#: libraries/server_databases.lib.php:474
+#: libraries/server_databases.lib.php:475
+#: libraries/server_databases.lib.php:485
 #: libraries/server_privileges.lib.php:2546
 #: libraries/server_privileges.lib.php:2727
 #: libraries/server_privileges.lib.php:2748
@@ -227,7 +228,7 @@ msgstr ""
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1008 libraries/tracking.lib.php:1013
 #: prefs_manage.php:138 templates/prefs_autoload.phtml:14
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "Yes"
 msgstr ""
 
@@ -237,7 +238,7 @@ msgstr ""
 
 #: db_export.php:37 db_tracking.php:90 export.php:382
 #: libraries/DBQbe.class.php:326
-#: libraries/controllers/StructureController.class.php:231
+#: libraries/controllers/DatabaseStructureController.class.php:170
 #: libraries/navigation/NavigationTree.class.php:897
 msgid "No tables found in database."
 msgstr ""
@@ -248,14 +249,14 @@ msgstr ""
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:26
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:120
-#: templates/structure/show_create.phtml:18
+#: templates/database/structure/show_create.phtml:18
 msgid "Tables"
 msgstr ""
 
 #: db_export.php:52 libraries/Menu.class.php:317 libraries/Menu.class.php:425
-#: libraries/Util.class.php:3333 libraries/Util.class.php:3343
-#: libraries/Util.class.php:3349 libraries/Util.class.php:3629
-#: libraries/Util.class.php:4327 libraries/Util.class.php:4344
+#: libraries/Util.class.php:3339 libraries/Util.class.php:3349
+#: libraries/Util.class.php:3355 libraries/Util.class.php:3635
+#: libraries/Util.class.php:4333 libraries/Util.class.php:4350
 #: libraries/central_columns.lib.php:728 libraries/config.values.php:39
 #: libraries/config.values.php:47 libraries/config.values.php:109
 #: libraries/config.values.php:115 libraries/config/setup.forms.php:323
@@ -269,7 +270,7 @@ msgstr ""
 #: libraries/navigation/Nodes/Node_Table.class.php:283
 #: libraries/server_privileges.lib.php:1141 libraries/tracking.lib.php:874
 #: templates/columns_definitions/table_fields_definitions.phtml:3
-#: templates/designer/table_list.phtml:28
+#: templates/database/designer/table_list.phtml:28
 msgid "Structure"
 msgstr ""
 
@@ -281,7 +282,7 @@ msgstr ""
 #: libraries/config/user_preferences.forms.php:292
 #: libraries/config/user_preferences.forms.php:297
 #: libraries/server_privileges.lib.php:1140
-#: templates/structure/display_table_stats.phtml:12
+#: templates/table/structure/display_table_stats.phtml:12
 msgid "Data"
 msgstr ""
 
@@ -351,10 +352,10 @@ msgstr ""
 #: libraries/server_privileges.lib.php:2908
 #: libraries/server_privileges.lib.php:3145
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4346
-#: templates/structure/table_header.phtml:21
-#: templates/tbl_relation/foreign_key_row.phtml:176
-#: templates/tbl_relation/internal_relational_row.phtml:63
+#: libraries/server_privileges.lib.php:4372
+#: templates/database/structure/table_header.phtml:21
+#: templates/table/relation/foreign_key_row.phtml:176
+#: templates/table/relation/internal_relational_row.phtml:63
 msgid "Table"
 msgstr ""
 
@@ -371,7 +372,7 @@ msgid "Updated"
 msgstr ""
 
 #: db_tracking.php:130 js/messages.php:243 libraries/Menu.class.php:552
-#: libraries/Util.class.php:4314 libraries/config.values.php:104
+#: libraries/Util.class.php:4320 libraries/config.values.php:104
 #: libraries/rte/rte_events.lib.php:393 libraries/rte/rte_list.lib.php:101
 #: libraries/server_status_processes.lib.php:92 libraries/tracking.lib.php:279
 msgid "Status"
@@ -380,14 +381,15 @@ msgstr ""
 #: db_tracking.php:131 db_tracking.php:290 libraries/Index.class.php:693
 #: libraries/central_columns.lib.php:687 libraries/rte/rte_list.lib.php:74
 #: libraries/rte/rte_list.lib.php:89 libraries/rte/rte_list.lib.php:102
-#: libraries/server_databases.lib.php:398
+#: libraries/server_databases.lib.php:409
 #: libraries/server_privileges.lib.php:2372
 #: libraries/server_privileges.lib.php:3166
 #: libraries/server_privileges.lib.php:3342
 #: libraries/server_user_groups.lib.php:82
 #: libraries/server_variables.lib.php:189 libraries/tracking.lib.php:280
-#: libraries/tracking.lib.php:793 templates/structure/table_header.phtml:30
-#: templates/structure/table_structure_header.phtml:23
+#: libraries/tracking.lib.php:793
+#: templates/database/structure/table_header.phtml:30
+#: templates/table/structure/table_structure_header.phtml:23
 msgid "Action"
 msgstr ""
 
@@ -429,7 +431,7 @@ msgid "Untracked tables"
 msgstr ""
 
 #: db_tracking.php:305 db_tracking.php:336
-#: templates/structure/optional_action_links.phtml:17
+#: templates/table/structure/optional_action_links.phtml:17
 msgid "Track table"
 msgstr ""
 
@@ -479,7 +481,7 @@ msgid "Value for the column \"%s\""
 msgstr ""
 
 #: gis_data_editor.php:146
-#: templates/gis_visualization/gis_visualization.phtml:37
+#: templates/table/gis_visualization/gis_visualization.phtml:37
 msgid "Use OpenStreetMaps as Base Layer"
 msgstr ""
 
@@ -559,35 +561,35 @@ msgstr ""
 #: libraries/display_change_password.lib.php:162
 #: libraries/display_export.lib.php:402 libraries/display_export.lib.php:408
 #: libraries/display_import.lib.php:392 libraries/index.lib.php:44
-#: libraries/insert_edit.lib.php:1546 libraries/insert_edit.lib.php:1583
+#: libraries/insert_edit.lib.php:1544 libraries/insert_edit.lib.php:1581
 #: libraries/normalization.lib.php:165 libraries/normalization.lib.php:821
 #: libraries/operations.lib.php:38 libraries/operations.lib.php:108
 #: libraries/operations.lib.php:263 libraries/operations.lib.php:306
 #: libraries/operations.lib.php:801 libraries/operations.lib.php:874
 #: libraries/operations.lib.php:923 libraries/operations.lib.php:1337
 #: libraries/operations.lib.php:1658
-#: libraries/plugins/auth/AuthenticationCookie.class.php:244
+#: libraries/plugins/auth/AuthenticationCookie.class.php:232
 #: libraries/replication_gui.lib.php:122 libraries/replication_gui.lib.php:161
 #: libraries/replication_gui.lib.php:324 libraries/replication_gui.lib.php:461
 #: libraries/replication_gui.lib.php:906 libraries/rte/rte_events.lib.php:509
-#: libraries/rte/rte_routines.lib.php:969
-#: libraries/rte/rte_routines.lib.php:1581
+#: libraries/rte/rte_routines.lib.php:1060
+#: libraries/rte/rte_routines.lib.php:1672
 #: libraries/rte/rte_triggers.lib.php:396 libraries/server_bin_log.lib.php:61
 #: libraries/server_privileges.lib.php:705
 #: libraries/server_privileges.lib.php:2106
 #: libraries/server_privileges.lib.php:2872
 #: libraries/server_privileges.lib.php:3553
-#: libraries/server_privileges.lib.php:4627
+#: libraries/server_privileges.lib.php:4653
 #: libraries/server_user_groups.lib.php:285
 #: libraries/sql_query_form.lib.php:369 libraries/sql_query_form.lib.php:429
 #: libraries/tracking.lib.php:533 libraries/tracking.lib.php:653
 #: prefs_manage.php:277 prefs_manage.php:355
 #: templates/columns_definitions/column_definitions_form.phtml:59
-#: templates/header_location.phtml:17 templates/index_form.phtml:238
+#: templates/database/create_table.phtml:21 templates/header_location.phtml:28
 #: templates/startAndNumberOfRowsPanel.phtml:14
-#: templates/structure/add_column.phtml:25
-#: templates/table/create_table.phtml:21
-#: templates/table/selection_form.phtml:75 view_create.php:275
+#: templates/table/index_form.phtml:238
+#: templates/table/search/selection_form.phtml:75
+#: templates/table/structure/add_column.phtml:25 view_create.php:275
 #: view_operations.php:106
 msgid "Go"
 msgstr ""
@@ -665,7 +667,7 @@ msgstr ""
 msgid "Could not load import plugins, please check your installation!"
 msgstr ""
 
-#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1466
+#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1460
 #, php-format
 msgid "Bookmark %s has been created."
 msgstr ""
@@ -699,11 +701,11 @@ msgstr ""
 msgid "Back"
 msgstr ""
 
-#: index.php:148 libraries/Footer.class.php:70
+#: index.php:149 libraries/Footer.class.php:70
 msgid "phpMyAdmin Demo Server"
 msgstr ""
 
-#: index.php:152
+#: index.php:153
 #, php-format
 msgid ""
 "You are using the demo server. You can do anything here, but please do not "
@@ -711,110 +713,110 @@ msgid ""
 "at %s."
 msgstr ""
 
-#: index.php:162
+#: index.php:163
 msgid "General Settings"
 msgstr ""
 
-#: index.php:190 libraries/display_change_password.lib.php:50
+#: index.php:191 libraries/display_change_password.lib.php:50
 #: libraries/display_change_password.lib.php:53 user_password.php:247
 msgid "Change password"
 msgstr ""
 
-#: index.php:206
+#: index.php:207
 msgid "Server connection collation"
 msgstr ""
 
-#: index.php:228
+#: index.php:229
 msgid "Appearance Settings"
 msgstr ""
 
-#: index.php:258 prefs_manage.php:285
+#: index.php:259 prefs_manage.php:285
 msgid "More settings"
 msgstr ""
 
-#: index.php:279
+#: index.php:280
 msgid "Database server"
 msgstr ""
 
-#: index.php:282 libraries/plugins/auth/AuthenticationCookie.class.php:181
+#: index.php:283 libraries/plugins/auth/AuthenticationCookie.class.php:169
 msgid "Server:"
 msgstr ""
 
-#: index.php:286
+#: index.php:287
 msgid "Server type:"
 msgstr ""
 
-#: index.php:290 libraries/plugins/export/ExportLatex.class.php:212
+#: index.php:291 libraries/plugins/export/ExportLatex.class.php:212
 #: libraries/plugins/export/ExportSql.class.php:687
 #: libraries/plugins/export/ExportXml.class.php:189
 msgid "Server version:"
 msgstr ""
 
-#: index.php:296
+#: index.php:297
 msgid "Protocol version:"
 msgstr ""
 
-#: index.php:300
+#: index.php:301
 msgid "User:"
 msgstr "Gebroeker:"
 
-#: index.php:305
+#: index.php:306
 msgid "Server charset:"
 msgstr ""
 
-#: index.php:320
+#: index.php:321
 msgid "Web server"
 msgstr ""
 
-#: index.php:331
+#: index.php:332
 msgid "Database client version:"
 msgstr ""
 
-#: index.php:335
+#: index.php:336
 msgid "PHP extension:"
 msgstr ""
 
-#: index.php:349
+#: index.php:350
 msgid "PHP version:"
 msgstr ""
 
-#: index.php:360
+#: index.php:361
 msgid "Show PHP information"
 msgstr ""
 
-#: index.php:383
+#: index.php:384
 msgid "Version information:"
 msgstr ""
 
-#: index.php:392 libraries/Util.class.php:432 libraries/Util.class.php:495
-#: libraries/config/FormDisplay.tpl.php:151
+#: index.php:393 libraries/Util.class.php:432 libraries/Util.class.php:495
+#: libraries/config/FormDisplay.tpl.php:162
 #: libraries/display_export.lib.php:577 libraries/engines/pbxt.lib.php:162
 #: libraries/navigation/NavigationHeader.class.php:196
 #: libraries/server_variables.lib.php:160
 msgid "Documentation"
 msgstr ""
 
-#: index.php:399
+#: index.php:400
 msgid "Wiki"
 msgstr ""
 
-#: index.php:408
+#: index.php:409
 msgid "Official Homepage"
 msgstr ""
 
-#: index.php:415
+#: index.php:416
 msgid "Contribute"
 msgstr ""
 
-#: index.php:422
+#: index.php:423
 msgid "Get support"
 msgstr ""
 
-#: index.php:429
+#: index.php:430
 msgid "List of changes"
 msgstr ""
 
-#: index.php:451
+#: index.php:452
 msgid ""
 "You are connected as 'root' with no password, which corresponds to the "
 "default MySQL privileged account. Your MySQL server is running with this "
@@ -822,21 +824,21 @@ msgid ""
 "by setting a password for user 'root'."
 msgstr ""
 
-#: index.php:468
+#: index.php:469
 msgid ""
 "You have enabled mbstring.func_overload in your PHP configuration. This "
 "option is incompatible with phpMyAdmin and might cause some data to be "
 "corrupted!"
 msgstr ""
 
-#: index.php:483
+#: index.php:484
 msgid ""
 "The mbstring PHP extension was not found and you seem to be using a "
 "multibyte charset. Without the mbstring extension phpMyAdmin is unable to "
 "split strings correctly and it may result in unexpected results."
 msgstr ""
 
-#: index.php:500
+#: index.php:501
 msgid ""
 "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini."
 "session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower than "
@@ -844,17 +846,17 @@ msgid ""
 "expire sooner than configured in phpMyAdmin."
 msgstr ""
 
-#: index.php:519
+#: index.php:520
 msgid ""
 "Login cookie store is lower than cookie validity configured in phpMyAdmin, "
 "because of this, your login will expire sooner than configured in phpMyAdmin."
 msgstr ""
 
-#: index.php:535
+#: index.php:536
 msgid "The configuration file now needs a secret passphrase (blowfish_secret)."
 msgstr ""
 
-#: index.php:548
+#: index.php:549
 msgid ""
 "Directory [code]config[/code], which is used by the setup script, still "
 "exists in your phpMyAdmin directory. It is strongly recommended to remove it "
@@ -862,26 +864,26 @@ msgid ""
 "may be compromised by unauthorized people downloading your configuration."
 msgstr ""
 
-#: index.php:564
+#: index.php:565
 #, php-format
 msgid ""
 "The phpMyAdmin configuration storage is not completely configured, some "
 "extended features have been deactivated. %sFind out why%s. "
 msgstr ""
 
-#: index.php:571
+#: index.php:572
 msgid ""
 "Or alternately go to 'Operations' tab of any database to set it up there."
 msgstr ""
 
-#: index.php:620
+#: index.php:621
 #, php-format
 msgid ""
 "Your PHP MySQL library version %s differs from your MySQL server version %s. "
 "This may cause unpredictable behavior."
 msgstr ""
 
-#: index.php:648
+#: index.php:649
 #, php-format
 msgid ""
 "Server running with Suhosin. Please refer to %sdocumentation%s for possible "
@@ -1022,8 +1024,8 @@ msgstr ""
 msgid "Save & Close"
 msgstr ""
 
-#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:404
-#: libraries/insert_edit.lib.php:1550 prefs_manage.php:361
+#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:415
+#: libraries/insert_edit.lib.php:1548 prefs_manage.php:361
 #: prefs_manage.php:372
 msgid "Reset"
 msgstr ""
@@ -1056,7 +1058,7 @@ msgstr ""
 msgid "Edit Index"
 msgstr ""
 
-#: js/messages.php:99 templates/index_form.phtml:232
+#: js/messages.php:99 templates/table/index_form.phtml:232
 #, php-format
 msgid "Add %s column(s) to index"
 msgstr ""
@@ -1077,13 +1079,14 @@ msgstr ""
 msgid "Please select column(s) for the index."
 msgstr ""
 
-#: js/messages.php:106 templates/structure/add_column.phtml:1
+#: js/messages.php:106 templates/table/structure/add_column.phtml:1
 msgid "You have to add at least one column."
 msgstr ""
 
-#: js/messages.php:109 libraries/insert_edit.lib.php:1548
+#: js/messages.php:109 libraries/insert_edit.lib.php:1546
 #: templates/columns_definitions/column_definitions_form.phtml:162
-#: templates/index_form.phtml:237 templates/tbl_relation/common_form.phtml:106
+#: templates/table/index_form.phtml:237
+#: templates/table/relation/common_form.phtml:106
 msgid "Preview SQL"
 msgstr ""
 
@@ -1100,7 +1103,7 @@ msgid "SQL query:"
 msgstr ""
 
 #. l10n: Default label for the y-Axis of Charts
-#: js/messages.php:118 templates/tbl_chart.phtml:109
+#: js/messages.php:118 templates/table/chart/tbl_chart.phtml:109
 msgid "Y Values"
 msgstr ""
 
@@ -1251,7 +1254,7 @@ msgstr ""
 msgid "Bytes received"
 msgstr ""
 
-#: js/messages.php:169 libraries/server_status.lib.php:226
+#: js/messages.php:169 libraries/server_status.lib.php:235
 msgid "Connections"
 msgstr ""
 
@@ -1308,12 +1311,12 @@ msgstr ""
 msgid "Questions"
 msgstr ""
 
-#: js/messages.php:184 libraries/server_status.lib.php:134
+#: js/messages.php:184 libraries/server_status.lib.php:143
 msgid "Traffic"
 msgstr ""
 
 #: js/messages.php:185 libraries/Menu.class.php:586
-#: libraries/Util.class.php:4318 libraries/server_status_monitor.lib.php:257
+#: libraries/Util.class.php:4324 libraries/server_status_monitor.lib.php:257
 msgid "Settings"
 msgstr ""
 
@@ -1333,8 +1336,9 @@ msgstr ""
 #: libraries/server_status_monitor.lib.php:236
 #: libraries/server_status_processes.lib.php:308
 #: templates/columns_definitions/transformation.phtml:4
-#: templates/designer/options_panel.phtml:178
-#: templates/table/options_zoom.phtml:12 templates/table/rows_zoom.phtml:26
+#: templates/database/designer/options_panel.phtml:178
+#: templates/table/search/options_zoom.phtml:12
+#: templates/table/search/rows_zoom.phtml:26
 msgid "None"
 msgstr ""
 
@@ -1602,8 +1606,8 @@ msgstr ""
 
 #: js/messages.php:270 libraries/Menu.class.php:352
 #: libraries/Menu.class.php:455 libraries/Menu.class.php:582
-#: libraries/Util.class.php:4317 libraries/Util.class.php:4332
-#: libraries/Util.class.php:4349 libraries/config/messages.inc.php:258
+#: libraries/Util.class.php:4323 libraries/Util.class.php:4338
+#: libraries/Util.class.php:4355 libraries/config/messages.inc.php:258
 #: libraries/display_import.lib.php:105
 #: libraries/server_status_monitor.lib.php:318 prefs_manage.php:238
 #: setup/frames/menu.inc.php:26
@@ -1663,13 +1667,13 @@ msgid "Formatting SQL..."
 msgstr ""
 
 #: js/messages.php:293 libraries/server_variables.lib.php:157
-#: templates/designer/aggregate_query_panel.phtml:63
-#: templates/designer/delete_relation_panel.phtml:28
-#: templates/designer/having_query_panel.phtml:117
-#: templates/designer/new_relation_panel.phtml:88
-#: templates/designer/options_panel.phtml:253
-#: templates/designer/rename_to_panel.phtml:45
-#: templates/designer/where_query_panel.phtml:83
+#: templates/database/designer/aggregate_query_panel.phtml:63
+#: templates/database/designer/delete_relation_panel.phtml:28
+#: templates/database/designer/having_query_panel.phtml:117
+#: templates/database/designer/new_relation_panel.phtml:88
+#: templates/database/designer/options_panel.phtml:253
+#: templates/database/designer/rename_to_panel.phtml:45
+#: templates/database/designer/where_query_panel.phtml:83
 msgid "Cancel"
 msgstr ""
 
@@ -1677,7 +1681,7 @@ msgstr ""
 msgid "Page-related settings"
 msgstr ""
 
-#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:402
+#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:413
 msgid "Apply"
 msgstr ""
 
@@ -1712,8 +1716,8 @@ msgstr ""
 msgid "Error text: %s"
 msgstr ""
 
-#: js/messages.php:307 libraries/db_common.inc.php:68
-#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:450
+#: js/messages.php:307 libraries/db_common.inc.php:69
+#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:461
 msgid "No databases selected."
 msgstr ""
 
@@ -1725,12 +1729,13 @@ msgstr ""
 msgid "Adding Primary Key"
 msgstr ""
 
-#: js/messages.php:310 templates/designer/aggregate_query_panel.phtml:59
-#: templates/designer/having_query_panel.phtml:113
-#: templates/designer/new_relation_panel.phtml:87
-#: templates/designer/options_panel.phtml:252
-#: templates/designer/rename_to_panel.phtml:41
-#: templates/designer/where_query_panel.phtml:82
+#: js/messages.php:310
+#: templates/database/designer/aggregate_query_panel.phtml:59
+#: templates/database/designer/having_query_panel.phtml:113
+#: templates/database/designer/new_relation_panel.phtml:87
+#: templates/database/designer/options_panel.phtml:252
+#: templates/database/designer/rename_to_panel.phtml:41
+#: templates/database/designer/where_query_panel.phtml:82
 msgid "OK"
 msgstr ""
 
@@ -1750,7 +1755,7 @@ msgstr ""
 msgid "Changing Charset"
 msgstr ""
 
-#: js/messages.php:320 libraries/Util.class.php:3217
+#: js/messages.php:320 libraries/Util.class.php:3223
 msgid "Enable foreign key checks"
 msgstr ""
 
@@ -1785,20 +1790,21 @@ msgstr ""
 #: js/messages.php:334 libraries/DisplayResults.class.php:4834
 #: libraries/DisplayResults.class.php:5092 libraries/Menu.class.php:344
 #: libraries/Menu.class.php:446 libraries/Menu.class.php:578
-#: libraries/Util.class.php:3636 libraries/Util.class.php:3637
-#: libraries/Util.class.php:4316 libraries/Util.class.php:4331
-#: libraries/Util.class.php:4348 libraries/config/messages.inc.php:252
+#: libraries/Util.class.php:3642 libraries/Util.class.php:3643
+#: libraries/Util.class.php:4322 libraries/Util.class.php:4337
+#: libraries/Util.class.php:4354 libraries/config/messages.inc.php:252
 #: libraries/display_export.lib.php:173 libraries/rte/rte_list.lib.php:146
 #: libraries/server_privileges.lib.php:2211
 #: libraries/server_privileges.lib.php:2290
 #: libraries/server_privileges.lib.php:2632
 #: libraries/server_privileges.lib.php:3356
 #: libraries/server_status_monitor.lib.php:322 prefs_manage.php:303
-#: setup/frames/menu.inc.php:27 templates/structure/check_all_tables.phtml:11
+#: setup/frames/menu.inc.php:27
+#: templates/database/structure/check_all_tables.phtml:11
 msgid "Export"
 msgstr ""
 
-#: js/messages.php:337 libraries/rte/rte_routines.lib.php:652
+#: js/messages.php:337 libraries/rte/rte_routines.lib.php:743
 msgid "ENUM/SET editor"
 msgstr ""
 
@@ -1837,7 +1843,7 @@ msgstr ""
 #: libraries/Console.class.php:214 libraries/DisplayResults.class.php:3474
 #: libraries/DisplayResults.class.php:4818 libraries/Index.class.php:723
 #: libraries/Util.class.php:706 libraries/Util.class.php:1202
-#: libraries/Util.class.php:3634 libraries/Util.class.php:3635
+#: libraries/Util.class.php:3640 libraries/Util.class.php:3641
 #: libraries/central_columns.lib.php:851
 #: libraries/central_columns.lib.php:1193
 #: libraries/config/messages.inc.php:892
@@ -1855,7 +1861,7 @@ msgstr ""
 #: libraries/server_user_groups.lib.php:129
 #: libraries/sql_query_form.lib.php:416 libraries/tracking.lib.php:477
 #: setup/frames/index.inc.php:183 setup/frames/index.inc.php:291
-#: templates/designer/delete_relation_panel.phtml:27
+#: templates/database/designer/delete_relation_panel.phtml:27
 msgid "Delete"
 msgstr ""
 
@@ -2016,11 +2022,11 @@ msgid "No dependencies selected!"
 msgstr ""
 
 #: js/messages.php:394 libraries/central_columns.lib.php:1214
-#: libraries/insert_edit.lib.php:1458 libraries/server_variables.lib.php:155
+#: libraries/insert_edit.lib.php:1456 libraries/server_variables.lib.php:155
 #: setup/frames/config.inc.php:42 setup/frames/index.inc.php:279
 #: templates/columns_definitions/column_definitions_form.phtml:165
-#: templates/gis_visualization/gis_visualization.phtml:48
-#: templates/tbl_relation/common_form.phtml:107
+#: templates/table/gis_visualization/gis_visualization.phtml:48
+#: templates/table/relation/common_form.phtml:107
 msgid "Save"
 msgstr ""
 
@@ -2097,8 +2103,8 @@ msgid "Data point content"
 msgstr ""
 
 #: js/messages.php:430 js/messages.php:562 js/messages.php:579
-#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2573
-#: templates/index_form.phtml:154 templates/index_form.phtml:194
+#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2571
+#: templates/table/index_form.phtml:154 templates/table/index_form.phtml:194
 msgid "Ignore"
 msgstr ""
 
@@ -2157,8 +2163,8 @@ msgstr ""
 msgid "Please select the primary key or a unique key!"
 msgstr ""
 
-#: js/messages.php:457 templates/designer/side_menu.phtml:91
-#: templates/designer/side_menu.phtml:94
+#: js/messages.php:457 templates/database/designer/side_menu.phtml:91
+#: templates/database/designer/side_menu.phtml:94
 msgid "Choose column to display"
 msgstr ""
 
@@ -2172,18 +2178,18 @@ msgstr ""
 msgid "Page name"
 msgstr ""
 
-#: js/messages.php:463 templates/designer/side_menu.phtml:56
-#: templates/designer/side_menu.phtml:59
+#: js/messages.php:463 templates/database/designer/side_menu.phtml:56
+#: templates/database/designer/side_menu.phtml:59
 msgid "Save page"
 msgstr ""
 
-#: js/messages.php:464 templates/designer/side_menu.phtml:63
-#: templates/designer/side_menu.phtml:66
+#: js/messages.php:464 templates/database/designer/side_menu.phtml:63
+#: templates/database/designer/side_menu.phtml:66
 msgid "Save page as"
 msgstr ""
 
-#: js/messages.php:465 templates/designer/side_menu.phtml:49
-#: templates/designer/side_menu.phtml:52
+#: js/messages.php:465 templates/database/designer/side_menu.phtml:49
+#: templates/database/designer/side_menu.phtml:52
 msgid "Open page"
 msgstr ""
 
@@ -2191,7 +2197,7 @@ msgstr ""
 msgid "Delete page"
 msgstr ""
 
-#: js/messages.php:467 templates/designer/side_menu.phtml:10
+#: js/messages.php:467 templates/database/designer/side_menu.phtml:10
 msgid "Untitled"
 msgstr ""
 
@@ -2302,7 +2308,7 @@ msgstr ""
 msgid "cancel"
 msgstr ""
 
-#: js/messages.php:499 libraries/server_status.lib.php:271
+#: js/messages.php:499 libraries/server_status.lib.php:280
 msgid "Aborted"
 msgstr ""
 
@@ -2852,7 +2858,7 @@ msgstr ""
 
 #: js/messages.php:793 libraries/Message.class.php:199
 #: libraries/Util.class.php:654 libraries/core.lib.php:245
-#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1172
+#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1170
 #: tbl_operations.php:229 view_operations.php:63
 msgid "Error"
 msgstr ""
@@ -2911,8 +2917,8 @@ msgstr ""
 msgid "per minute"
 msgstr ""
 
-#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:143
-#: libraries/server_status.lib.php:228
+#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:152
+#: libraries/server_status.lib.php:237
 #: libraries/server_status_queries.lib.php:98
 msgid "per hour"
 msgstr ""
@@ -2930,7 +2936,7 @@ msgstr ""
 msgid "Wrong permissions on configuration file, should not be world writable!"
 msgstr ""
 
-#: libraries/Config.class.php:1799
+#: libraries/Config.class.php:1801
 msgid "Font size"
 msgstr ""
 
@@ -2958,10 +2964,10 @@ msgstr ""
 #: libraries/server_privileges.lib.php:2890
 #: libraries/server_privileges.lib.php:3144
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4332
+#: libraries/server_privileges.lib.php:4358
 #: libraries/server_status_processes.lib.php:80
-#: templates/tbl_relation/foreign_key_row.phtml:165
-#: templates/tbl_relation/internal_relational_row.phtml:55
+#: templates/table/relation/foreign_key_row.phtml:165
+#: templates/table/relation/internal_relational_row.phtml:55
 msgid "Database"
 msgstr "Database"
 
@@ -3054,11 +3060,11 @@ msgstr ""
 #: libraries/plugins/import/ImportMediawiki.class.php:60
 #: libraries/plugins/import/ImportOds.class.php:59
 #: libraries/plugins/import/ImportShp.class.php:57
-#: libraries/plugins/import/ImportSql.class.php:148
+#: libraries/plugins/import/ImportSql.class.php:51
 #: libraries/plugins/import/ImportXml.class.php:58
-#: libraries/rte/rte_routines.lib.php:833 templates/index_form.phtml:49
-#: templates/structure/row_stats_table.phtml:20
-#: templates/table/options.phtml:2
+#: libraries/rte/rte_routines.lib.php:924 templates/table/index_form.phtml:49
+#: templates/table/search/options.phtml:2
+#: templates/table/structure/row_stats_table.phtml:20
 msgid "Options"
 msgstr ""
 
@@ -3091,7 +3097,8 @@ msgstr ""
 msgid "Order:"
 msgstr ""
 
-#: libraries/Console.class.php:289 templates/table/replace_preview.phtml:17
+#: libraries/Console.class.php:289
+#: templates/table/search/replace_preview.phtml:17
 msgid "Count"
 msgstr ""
 
@@ -3186,9 +3193,9 @@ msgstr ""
 #: libraries/operations.lib.php:794 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:191
-#: templates/structure/sortable_header.phtml:21
-#: templates/structure/sortable_header.phtml:38
-#: templates/table/options.phtml:68
+#: templates/database/structure/sortable_header.phtml:21
+#: templates/database/structure/sortable_header.phtml:38
+#: templates/table/search/options.phtml:68
 msgid "Ascending"
 msgstr ""
 
@@ -3198,13 +3205,14 @@ msgstr ""
 #: libraries/operations.lib.php:797 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:188
-#: templates/structure/sortable_header.phtml:26
-#: templates/structure/sortable_header.phtml:43
-#: templates/table/options.phtml:69
+#: templates/database/structure/sortable_header.phtml:26
+#: templates/database/structure/sortable_header.phtml:43
+#: templates/table/search/options.phtml:69
 msgid "Descending"
 msgstr ""
 
-#: libraries/DBQbe.class.php:467 templates/table/search_and_replace.phtml:6
+#: libraries/DBQbe.class.php:467
+#: templates/table/search/search_and_replace.phtml:6
 msgid "Column:"
 msgstr ""
 
@@ -3359,12 +3367,12 @@ msgstr[0] ""
 msgstr[1] ""
 
 #: libraries/DbSearch.class.php:354 libraries/Menu.class.php:311
-#: libraries/Util.class.php:3337 libraries/Util.class.php:3347
-#: libraries/Util.class.php:3623 libraries/Util.class.php:3624
-#: libraries/Util.class.php:4343 libraries/config.values.php:43
+#: libraries/Util.class.php:3343 libraries/Util.class.php:3353
+#: libraries/Util.class.php:3629 libraries/Util.class.php:3630
+#: libraries/Util.class.php:4349 libraries/config.values.php:43
 #: libraries/config.values.php:51 libraries/config.values.php:119
 #: libraries/navigation/Nodes/Node_Table.class.php:295
-#: templates/structure/check_all_table_column.phtml:5
+#: templates/table/structure/check_all_table_column.phtml:5
 msgid "Browse"
 msgstr ""
 
@@ -3381,7 +3389,8 @@ msgstr ""
 msgid "Words or values to search for (wildcard: \"%\"):"
 msgstr ""
 
-#: libraries/DbSearch.class.php:401 templates/table/search_and_replace.phtml:1
+#: libraries/DbSearch.class.php:401
+#: templates/table/search/search_and_replace.phtml:1
 msgid "Find:"
 msgstr ""
 
@@ -3425,28 +3434,28 @@ msgstr ""
 msgid "Search this table"
 msgstr ""
 
-#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2532
-#: libraries/Util.class.php:2535
+#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2538
+#: libraries/Util.class.php:2541
 msgctxt "First page"
 msgid "Begin"
 msgstr ""
 
-#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2533
-#: libraries/Util.class.php:2536 libraries/server_bin_log.lib.php:170
+#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2539
+#: libraries/Util.class.php:2542 libraries/server_bin_log.lib.php:170
 #: libraries/server_bin_log.lib.php:172
 msgctxt "Previous page"
 msgid "Previous"
 msgstr ""
 
-#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2564
-#: libraries/Util.class.php:2574 libraries/server_bin_log.lib.php:204
+#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2570
+#: libraries/Util.class.php:2580 libraries/server_bin_log.lib.php:204
 #: libraries/server_bin_log.lib.php:206
 msgctxt "Next page"
 msgid "Next"
 msgstr ""
 
-#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2565
-#: libraries/Util.class.php:2575
+#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2571
+#: libraries/Util.class.php:2581
 msgctxt "Last page"
 msgid "End"
 msgstr ""
@@ -3519,15 +3528,15 @@ msgid "May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]."
 msgstr ""
 
 #: libraries/DisplayResults.class.php:4332 libraries/Message.class.php:180
-#: libraries/controllers/TableRelationController.class.php:258
+#: libraries/controllers/TableRelationController.class.php:259
 #: libraries/controllers/TableSearchController.class.php:655
-#: libraries/rte/rte_routines.lib.php:1332 libraries/sql_query_form.lib.php:89
+#: libraries/rte/rte_routines.lib.php:1423 libraries/sql_query_form.lib.php:89
 #: tbl_operations.php:227 tbl_row_action.php:138 view_operations.php:62
 msgid "Your SQL query has been executed successfully."
 msgstr ""
 
 #: libraries/DisplayResults.class.php:4660
-#: libraries/controllers/StructureController.class.php:629
+#: libraries/controllers/DatabaseStructureController.class.php:564
 #, php-format
 msgid ""
 "This view has at least this number of rows. Please refer to %sdocumentation"
@@ -3549,33 +3558,33 @@ msgstr ""
 msgid "%d total"
 msgstr ""
 
-#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1318
+#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1312
 #, php-format
 msgid "Query took %01.4f seconds."
 msgstr ""
 
 #: libraries/DisplayResults.class.php:4807
-#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4767
-#: libraries/Util.class.php:4773 libraries/mult_submits.inc.php:50
-#: templates/structure/check_all_tables.phtml:2
-#: templates/structure/check_all_tables.phtml:9
+#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4773
+#: libraries/Util.class.php:4779 libraries/mult_submits.inc.php:50
+#: templates/database/structure/check_all_tables.phtml:2
+#: templates/database/structure/check_all_tables.phtml:9
 msgid "With selected:"
 msgstr ""
 
 #: libraries/DisplayResults.class.php:4811
-#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4769
-#: libraries/Util.class.php:4770 libraries/server_privileges.lib.php:1174
+#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4775
+#: libraries/Util.class.php:4776 libraries/server_privileges.lib.php:1174
 #: libraries/server_privileges.lib.php:1175
 #: libraries/server_privileges.lib.php:1387
 #: libraries/server_user_groups.lib.php:231
-#: templates/structure/check_all_tables.phtml:3
-#: templates/structure/check_all_tables.phtml:4
+#: templates/database/structure/check_all_tables.phtml:3
+#: templates/database/structure/check_all_tables.phtml:4
 msgid "Check All"
 msgstr ""
 
 #: libraries/DisplayResults.class.php:4985 libraries/Header.class.php:383
-#: templates/structure/optional_action_links.phtml:1
-#: templates/structure/print_view_data_dictionary_link.phtml:3
+#: templates/database/structure/print_view_data_dictionary_link.phtml:3
+#: templates/table/structure/optional_action_links.phtml:1
 msgid "Print view"
 msgstr ""
 
@@ -3583,7 +3592,8 @@ msgstr ""
 msgid "Query results operations"
 msgstr ""
 
-#: libraries/DisplayResults.class.php:5105 templates/tbl_chart.phtml:12
+#: libraries/DisplayResults.class.php:5105
+#: templates/table/chart/tbl_chart.phtml:12
 msgid "Display chart"
 msgstr ""
 
@@ -3672,7 +3682,7 @@ msgid "Click on the bar to scroll to top of page"
 msgstr ""
 
 #: libraries/Header.class.php:749
-#: libraries/plugins/auth/AuthenticationCookie.class.php:152
+#: libraries/plugins/auth/AuthenticationCookie.class.php:140
 msgid "Javascript must be enabled past this point!"
 msgstr ""
 
@@ -3694,11 +3704,11 @@ msgid "Keyname"
 msgstr ""
 
 #: libraries/Index.class.php:697
-#: libraries/controllers/StructureController.class.php:1962
-#: libraries/controllers/StructureController.class.php:1967
+#: libraries/controllers/TableStructureController.class.php:953
+#: libraries/controllers/TableStructureController.class.php:958
 #: libraries/tracking.lib.php:973
 #: templates/columns_definitions/column_indexes.phtml:11
-#: templates/structure/check_all_table_column.phtml:26
+#: templates/table/structure/check_all_table_column.phtml:26
 msgid "Unique"
 msgstr ""
 
@@ -3717,16 +3727,17 @@ msgstr ""
 #: libraries/server_collations.lib.php:35 libraries/tracking.lib.php:881
 #: libraries/tracking.lib.php:977
 #: templates/columns_definitions/table_fields_definitions.phtml:33
-#: templates/structure/row_stats_table.phtml:31
-#: templates/structure/table_header.phtml:55
-#: templates/structure/table_structure_header.phtml:7
-#: templates/table/table_header.phtml:8
+#: templates/database/structure/table_header.phtml:55
+#: templates/table/search/table_header.phtml:8
+#: templates/table/structure/row_stats_table.phtml:31
+#: templates/table/structure/table_structure_header.phtml:7
 msgid "Collation"
 msgstr ""
 
 #: libraries/Index.class.php:703 libraries/rte/rte_events.lib.php:496
-#: libraries/rte/rte_routines.lib.php:956 libraries/tracking.lib.php:885
-#: libraries/tracking.lib.php:979 templates/structure/table_header.phtml:84
+#: libraries/rte/rte_routines.lib.php:1047 libraries/tracking.lib.php:885
+#: libraries/tracking.lib.php:979
+#: templates/database/structure/table_header.phtml:84
 msgid "Comment"
 msgstr ""
 
@@ -3739,15 +3750,15 @@ msgstr ""
 msgid "Index %s has been dropped."
 msgstr ""
 
-#: libraries/Index.class.php:757 libraries/Util.class.php:3630
-#: libraries/Util.class.php:3631
-#: libraries/controllers/StructureController.class.php:1958
-#: libraries/controllers/StructureController.class.php:1959
+#: libraries/Index.class.php:757 libraries/Util.class.php:3636
+#: libraries/Util.class.php:3637
+#: libraries/controllers/TableStructureController.class.php:949
+#: libraries/controllers/TableStructureController.class.php:950
 #: libraries/operations.lib.php:1607 libraries/rte/rte_list.lib.php:150
 #: libraries/server_databases.lib.php:146
-#: templates/structure/check_all_table_column.phtml:15
-#: templates/structure/check_all_tables.phtml:16
-#: templates/tbl_relation/foreign_key_row.phtml:93
+#: templates/database/structure/check_all_tables.phtml:16
+#: templates/table/relation/foreign_key_row.phtml:93
+#: templates/table/structure/check_all_table_column.phtml:15
 msgid "Drop"
 msgstr ""
 
@@ -3776,16 +3787,16 @@ msgstr ""
 #: libraries/Menu.class.php:248
 #: libraries/navigation/Nodes/Node_View.class.php:32
 #: libraries/tbl_info.inc.php:63
-#: templates/structure/structure_table_row.phtml:97
-#: templates/structure/structure_table_row.phtml:159
+#: templates/database/structure/structure_table_row.phtml:97
+#: templates/database/structure/structure_table_row.phtml:159
 msgid "View"
 msgstr ""
 
 #: libraries/Menu.class.php:325 libraries/Menu.class.php:429
-#: libraries/Menu.class.php:548 libraries/Util.class.php:3334
-#: libraries/Util.class.php:3344 libraries/Util.class.php:3350
-#: libraries/Util.class.php:4313 libraries/Util.class.php:4328
-#: libraries/Util.class.php:4345 libraries/config.values.php:40
+#: libraries/Menu.class.php:548 libraries/Util.class.php:3340
+#: libraries/Util.class.php:3350 libraries/Util.class.php:3356
+#: libraries/Util.class.php:4319 libraries/Util.class.php:4334
+#: libraries/Util.class.php:4351 libraries/config.values.php:40
 #: libraries/config.values.php:48 libraries/config.values.php:110
 #: libraries/config.values.php:116 libraries/config/messages.inc.php:321
 #: libraries/navigation/Nodes/Node_Table.class.php:292
@@ -3793,19 +3804,19 @@ msgid "SQL"
 msgstr "SQL"
 
 #: libraries/Menu.class.php:328 libraries/Menu.class.php:432
-#: libraries/Util.class.php:3335 libraries/Util.class.php:3345
-#: libraries/Util.class.php:3351 libraries/Util.class.php:3625
-#: libraries/Util.class.php:3626 libraries/Util.class.php:4329
-#: libraries/Util.class.php:4346 libraries/config.values.php:41
+#: libraries/Util.class.php:3341 libraries/Util.class.php:3351
+#: libraries/Util.class.php:3357 libraries/Util.class.php:3631
+#: libraries/Util.class.php:3632 libraries/Util.class.php:4335
+#: libraries/Util.class.php:4352 libraries/config.values.php:41
 #: libraries/config.values.php:49 libraries/config.values.php:111
 #: libraries/config.values.php:117
 #: libraries/navigation/Nodes/Node_Table.class.php:286
 msgid "Search"
 msgstr ""
 
-#: libraries/Menu.class.php:338 libraries/Util.class.php:3336
-#: libraries/Util.class.php:3346 libraries/Util.class.php:3627
-#: libraries/Util.class.php:3628 libraries/Util.class.php:4347
+#: libraries/Menu.class.php:338 libraries/Util.class.php:3342
+#: libraries/Util.class.php:3352 libraries/Util.class.php:3633
+#: libraries/Util.class.php:3634 libraries/Util.class.php:4353
 #: libraries/config.values.php:42 libraries/config.values.php:50
 #: libraries/config.values.php:118
 #: libraries/navigation/Nodes/Node_Table.class.php:289
@@ -3814,30 +3825,30 @@ msgid "Insert"
 msgstr ""
 
 #: libraries/Menu.class.php:362 libraries/Menu.class.php:467
-#: libraries/Util.class.php:4334 libraries/Util.class.php:4350
+#: libraries/Util.class.php:4340 libraries/Util.class.php:4356
 #: libraries/config.values.php:106 libraries/server_common.lib.php:51
 #: libraries/server_privileges.lib.php:2370
 #: libraries/server_privileges.lib.php:3158
-#: libraries/server_privileges.lib.php:4221
+#: libraries/server_privileges.lib.php:4247
 msgid "Privileges"
 msgstr ""
 
 #: libraries/Menu.class.php:371 libraries/Menu.class.php:379
-#: libraries/Menu.class.php:459 libraries/Util.class.php:3338
-#: libraries/Util.class.php:3352 libraries/Util.class.php:4333
-#: libraries/Util.class.php:4351 libraries/config.values.php:112
+#: libraries/Menu.class.php:459 libraries/Util.class.php:3344
+#: libraries/Util.class.php:3358 libraries/Util.class.php:4339
+#: libraries/Util.class.php:4357 libraries/config.values.php:112
 #: view_operations.php:92
 msgid "Operations"
 msgstr ""
 
 #: libraries/Menu.class.php:384 libraries/Menu.class.php:492
-#: libraries/Util.class.php:4338 libraries/Util.class.php:4352
+#: libraries/Util.class.php:4344 libraries/Util.class.php:4358
 #: libraries/relation.lib.php:255
 msgid "Tracking"
 msgstr ""
 
 #: libraries/Menu.class.php:397 libraries/Menu.class.php:486
-#: libraries/Util.class.php:4337 libraries/Util.class.php:4353
+#: libraries/Util.class.php:4343 libraries/Util.class.php:4359
 #: libraries/navigation/Nodes/Node_Trigger_Container.class.php:24
 #: libraries/plugins/export/ExportHtmlword.class.php:557
 #: libraries/plugins/export/ExportOdt.class.php:685
@@ -3854,16 +3865,16 @@ msgstr ""
 msgid "Database seems to be empty!"
 msgstr ""
 
-#: libraries/Menu.class.php:439 libraries/Util.class.php:4330
+#: libraries/Menu.class.php:439 libraries/Util.class.php:4336
 msgid "Query"
 msgstr ""
 
-#: libraries/Menu.class.php:472 libraries/Util.class.php:4335
+#: libraries/Menu.class.php:472 libraries/Util.class.php:4341
 #: libraries/rte/rte_words.lib.php:36
 msgid "Routines"
 msgstr ""
 
-#: libraries/Menu.class.php:479 libraries/Util.class.php:4336
+#: libraries/Menu.class.php:479 libraries/Util.class.php:4342
 #: libraries/navigation/Nodes/Node_Event_Container.class.php:26
 #: libraries/plugins/export/ExportSql.class.php:940
 #: libraries/plugins/export/ExportXml.class.php:107
@@ -3871,20 +3882,20 @@ msgstr ""
 msgid "Events"
 msgstr ""
 
-#: libraries/Menu.class.php:498 libraries/Util.class.php:4339
+#: libraries/Menu.class.php:498 libraries/Util.class.php:4345
 msgid "Designer"
 msgstr ""
 
-#: libraries/Menu.class.php:507 libraries/Util.class.php:4340
-#: templates/structure/check_all_tables.phtml:35
+#: libraries/Menu.class.php:507 libraries/Util.class.php:4346
+#: templates/database/structure/check_all_tables.phtml:35
 msgid "Central columns"
 msgstr ""
 
-#: libraries/Menu.class.php:544 libraries/Util.class.php:4312
+#: libraries/Menu.class.php:544 libraries/Util.class.php:4318
 #: libraries/config.values.php:103 libraries/config/messages.inc.php:266
 #: libraries/config/messages.inc.php:341
 #: libraries/navigation/NavigationTree.class.php:1239
-#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4332
+#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4358
 msgid "Databases"
 msgstr ""
 
@@ -3893,34 +3904,34 @@ msgid "User accounts"
 msgstr ""
 
 #: libraries/Menu.class.php:595 libraries/ServerStatusData.class.php:121
-#: libraries/Util.class.php:4319 libraries/server_common.lib.php:36
+#: libraries/Util.class.php:4325 libraries/server_common.lib.php:36
 msgid "Binary log"
 msgstr ""
 
 #: libraries/Menu.class.php:601 libraries/ServerStatusData.class.php:126
-#: libraries/Util.class.php:4320 libraries/server_common.lib.php:42
-#: templates/structure/body_for_table_summary.phtml:10
-#: templates/structure/table_header.phtml:27
+#: libraries/Util.class.php:4326 libraries/server_common.lib.php:42
+#: templates/database/structure/body_for_table_summary.phtml:10
+#: templates/database/structure/table_header.phtml:27
 msgid "Replication"
 msgstr ""
 
 #: libraries/Menu.class.php:606 libraries/ServerStatusData.class.php:193
-#: libraries/Util.class.php:4321 libraries/config.values.php:105
+#: libraries/Util.class.php:4327 libraries/config.values.php:105
 #: libraries/server_engines.lib.php:108 libraries/server_engines.lib.php:112
 #: libraries/sql_query_form.lib.php:421
 msgid "Variables"
 msgstr ""
 
-#: libraries/Menu.class.php:610 libraries/Util.class.php:4322
+#: libraries/Menu.class.php:610 libraries/Util.class.php:4328
 msgid "Charsets"
 msgstr ""
 
-#: libraries/Menu.class.php:615 libraries/Util.class.php:4323
+#: libraries/Menu.class.php:615 libraries/Util.class.php:4329
 #: libraries/server_common.lib.php:33 libraries/server_plugins.lib.php:27
 msgid "Plugins"
 msgstr ""
 
-#: libraries/Menu.class.php:626 libraries/Util.class.php:4324
+#: libraries/Menu.class.php:626 libraries/Util.class.php:4330
 msgid "Engines"
 msgstr ""
 
@@ -3945,7 +3956,7 @@ msgid_plural "%1$d rows inserted."
 msgstr[0] ""
 msgstr[1] ""
 
-#: libraries/PDF.class.php:70 libraries/Util.class.php:2521
+#: libraries/PDF.class.php:70 libraries/Util.class.php:2527
 #: libraries/browse_foreigners.lib.php:327
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:865
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:890
@@ -3966,7 +3977,7 @@ msgid "Could not save favorite table!"
 msgstr ""
 
 #: libraries/RecentFavoriteTable.class.php:212
-#: templates/structure/favorite_anchor.phtml:12
+#: templates/database/structure/favorite_anchor.phtml:12
 msgid "Remove from Favorites"
 msgstr ""
 
@@ -4131,7 +4142,7 @@ msgid ""
 msgstr ""
 
 #: libraries/StorageEngine.class.php:373
-#: templates/structure/body_for_table_summary.phtml:50
+#: templates/database/structure/body_for_table_summary.phtml:50
 #, php-format
 msgid "%s is the default storage engine on this MySQL server."
 msgstr ""
@@ -4543,10 +4554,10 @@ msgstr ""
 
 #: libraries/Util.class.php:726 libraries/rte/rte_events.lib.php:110
 #: libraries/rte/rte_events.lib.php:119 libraries/rte/rte_events.lib.php:150
-#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:153
-#: libraries/rte/rte_routines.lib.php:162
-#: libraries/rte/rte_routines.lib.php:235
-#: libraries/rte/rte_routines.lib.php:1366
+#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:223
+#: libraries/rte/rte_routines.lib.php:250
+#: libraries/rte/rte_routines.lib.php:372
+#: libraries/rte/rte_routines.lib.php:1457
 #: libraries/rte/rte_triggers.lib.php:86 libraries/rte/rte_triggers.lib.php:95
 #: libraries/rte/rte_triggers.lib.php:127
 msgid "MySQL said: "
@@ -4590,75 +4601,78 @@ msgstr ""
 msgid "%B %d, %Y at %I:%M %p"
 msgstr ""
 
-#: libraries/Util.class.php:2019
+#: libraries/Util.class.php:2025
 #, php-format
 msgid "%s days, %s hours, %s minutes and %s seconds"
 msgstr ""
 
-#: libraries/Util.class.php:2112
+#: libraries/Util.class.php:2118
 msgid "Missing parameter:"
 msgstr ""
 
-#: libraries/Util.class.php:2645
+#: libraries/Util.class.php:2651
 #, php-format
 msgid "Jump to database \"%s\"."
 msgstr ""
 
-#: libraries/Util.class.php:2670
+#: libraries/Util.class.php:2676
 #, php-format
 msgid "The %s functionality is affected by a known bug, see %s"
 msgstr ""
 
-#: libraries/Util.class.php:2881
+#: libraries/Util.class.php:2887
 msgid "Click to toggle"
 msgstr ""
 
-#: libraries/Util.class.php:3542 prefs_manage.php:248
+#: libraries/Util.class.php:3548 prefs_manage.php:248
 msgid "Browse your computer:"
 msgstr ""
 
-#: libraries/Util.class.php:3567
+#: libraries/Util.class.php:3573
 #, php-format
 msgid "Select from the web server upload directory <b>%s</b>:"
 msgstr ""
 
-#: libraries/Util.class.php:3596 libraries/insert_edit.lib.php:1173
+#: libraries/Util.class.php:3602 libraries/insert_edit.lib.php:1171
 msgid "The directory you set for upload work cannot be reached."
 msgstr ""
 
-#: libraries/Util.class.php:3607
+#: libraries/Util.class.php:3613
 msgid "There are no files to upload!"
 msgstr ""
 
-#: libraries/Util.class.php:3632 libraries/Util.class.php:3633
-#: templates/structure/check_all_tables.phtml:15
+#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: templates/database/structure/check_all_tables.phtml:15
 msgid "Empty"
 msgstr ""
 
-#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: libraries/Util.class.php:3644 libraries/Util.class.php:3645
 msgid "Execute"
 msgstr ""
 
-#: libraries/Util.class.php:4152
+#: libraries/Util.class.php:4158
 msgid "Print"
 msgstr ""
 
-#: libraries/Util.class.php:4257 templates/structure/row_stats_table.phtml:80
-#: templates/structure/table_header.phtml:95
+#: libraries/Util.class.php:4263
+#: templates/database/structure/table_header.phtml:95
+#: templates/table/structure/row_stats_table.phtml:80
 msgid "Creation"
 msgstr ""
 
-#: libraries/Util.class.php:4263 templates/structure/row_stats_table.phtml:87
-#: templates/structure/table_header.phtml:106
+#: libraries/Util.class.php:4269
+#: templates/database/structure/table_header.phtml:106
+#: templates/table/structure/row_stats_table.phtml:87
 msgid "Last update"
 msgstr ""
 
-#: libraries/Util.class.php:4269 templates/structure/row_stats_table.phtml:94
-#: templates/structure/table_header.phtml:117
+#: libraries/Util.class.php:4275
+#: templates/database/structure/table_header.phtml:117
+#: templates/table/structure/row_stats_table.phtml:94
 msgid "Last check"
 msgstr ""
 
-#: libraries/Util.class.php:4315
+#: libraries/Util.class.php:4321
 msgid "Users"
 msgstr ""
 
@@ -4679,16 +4693,16 @@ msgid "Use this value"
 msgstr ""
 
 #: libraries/build_html_for_db.lib.php:33 libraries/import.lib.php:193
-#: templates/structure/actions_in_table_structure.phtml:113
-#: templates/structure/row_stats_table.phtml:42
-#: templates/structure/table_header.phtml:36
+#: templates/database/structure/table_header.phtml:36
+#: templates/table/structure/actions_in_table_structure.phtml:113
+#: templates/table/structure/row_stats_table.phtml:42
 msgid "Rows"
 msgstr ""
 
 #: libraries/build_html_for_db.lib.php:48 libraries/engines/innodb.lib.php:171
-#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:186
-#: libraries/server_status.lib.php:298
-#: templates/structure/display_table_stats.phtml:40
+#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:195
+#: libraries/server_status.lib.php:307
+#: templates/table/structure/display_table_stats.phtml:40
 msgid "Total"
 msgstr ""
 
@@ -4697,10 +4711,12 @@ msgid "Jump to database"
 msgstr ""
 
 #: libraries/build_html_for_db.lib.php:146
+#: templates/database/structure/structure_table_row.phtml:15
 msgid "Not replicated"
 msgstr ""
 
 #: libraries/build_html_for_db.lib.php:158
+#: templates/database/structure/structure_table_row.phtml:16
 msgid "Replicated"
 msgstr ""
 
@@ -4753,17 +4769,17 @@ msgstr ""
 #: libraries/plugins/export/ExportTexytext.class.php:425
 #: libraries/plugins/export/PMA_ExportPdf.class.php:307
 #: libraries/rte/rte_list.lib.php:73 libraries/rte/rte_list.lib.php:85
-#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:830
-#: libraries/rte/rte_routines.lib.php:1492 setup/frames/index.inc.php:162
+#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:921
+#: libraries/rte/rte_routines.lib.php:1583 setup/frames/index.inc.php:162
 #: templates/columns_definitions/table_fields_definitions.phtml:8
-#: templates/structure/table_structure_header.phtml:5
-#: templates/table/create_table.phtml:11
+#: templates/database/create_table.phtml:11
+#: templates/table/structure/table_structure_header.phtml:5
 msgid "Name"
 msgstr ""
 
 #: libraries/central_columns.lib.php:699
 #: libraries/central_columns.lib.php:1381
-#: libraries/rte/rte_routines.lib.php:832
+#: libraries/rte/rte_routines.lib.php:923
 #: templates/columns_definitions/table_fields_definitions.phtml:14
 msgid "Length/Values"
 msgstr ""
@@ -4782,7 +4798,7 @@ msgid "Select a table"
 msgstr ""
 
 #: libraries/central_columns.lib.php:804
-#: templates/structure/add_column.phtml:4
+#: templates/table/structure/add_column.phtml:4
 msgid "Add column"
 msgstr ""
 
@@ -4798,7 +4814,7 @@ msgstr ""
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1002
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1025
 #: templates/columns_definitions/table_fields_definitions.phtml:36
-#: templates/structure/table_structure_header.phtml:8
+#: templates/table/structure/table_structure_header.phtml:8
 msgid "Attributes"
 msgstr ""
 
@@ -4907,7 +4923,7 @@ msgid "Double click"
 msgstr ""
 
 #: libraries/config.values.php:95 libraries/config.values.php:124
-#: libraries/config/FormDisplay.tpl.php:221 libraries/relation.lib.php:97
+#: libraries/config/FormDisplay.tpl.php:232 libraries/relation.lib.php:97
 #: libraries/relation.lib.php:105
 msgid "Disabled"
 msgstr ""
@@ -5077,21 +5093,21 @@ msgstr ""
 msgid "maximum %s"
 msgstr ""
 
-#: libraries/config/FormDisplay.tpl.php:219
+#: libraries/config/FormDisplay.tpl.php:230
 msgid "This setting is disabled, it will not be applied to your configuration."
 msgstr ""
 
-#: libraries/config/FormDisplay.tpl.php:313
+#: libraries/config/FormDisplay.tpl.php:324
 #, php-format
 msgid "Set value: %s"
 msgstr ""
 
-#: libraries/config/FormDisplay.tpl.php:318
+#: libraries/config/FormDisplay.tpl.php:329
 #: libraries/config/messages.inc.php:610
 msgid "Restore default value"
 msgstr ""
 
-#: libraries/config/FormDisplay.tpl.php:332
+#: libraries/config/FormDisplay.tpl.php:343
 msgid "Allow users to customize this value"
 msgstr ""
 
@@ -5507,7 +5523,7 @@ msgstr ""
 
 #: libraries/config/messages.inc.php:136 libraries/config/messages.inc.php:152
 #: libraries/sql_query_form.lib.php:247
-#: templates/structure/row_stats_table.phtml:7
+#: templates/table/structure/row_stats_table.phtml:7
 msgid "Format"
 msgstr ""
 
@@ -6002,7 +6018,7 @@ msgstr ""
 
 #: libraries/config/messages.inc.php:332
 #: libraries/plugins/export/ExportPdf.class.php:279
-#: templates/structure/secondary_tabs.phtml:8
+#: templates/table/secondary_tabs.phtml:8
 msgid "Table structure"
 msgstr ""
 
@@ -7498,101 +7514,33 @@ msgstr ""
 msgid "OpenDocument Text"
 msgstr ""
 
-#: libraries/controllers/StructureController.class.php:465
+#: libraries/controllers/DatabaseStructureController.class.php:405
 #: tbl_operations.php:382
 #, php-format
 msgid "Table %s has been emptied."
 msgstr ""
 
-#: libraries/controllers/StructureController.class.php:486
+#: libraries/controllers/DatabaseStructureController.class.php:426
 #: tbl_operations.php:400 view_operations.php:119
 #, php-format
 msgid "View %s has been dropped."
 msgstr ""
 
-#: libraries/controllers/StructureController.class.php:487
+#: libraries/controllers/DatabaseStructureController.class.php:427
 #: tbl_operations.php:401
 #, php-format
 msgid "Table %s has been dropped."
 msgstr ""
 
-#: libraries/controllers/StructureController.class.php:797
-#, php-format
-msgid "The name '%s' is a MySQL reserved keyword."
-msgid_plural "The names '%s' are MySQL reserved keywords."
-msgstr[0] ""
-msgstr[1] ""
-
-#: libraries/controllers/StructureController.class.php:875
-msgid "No column selected."
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1049
+#: libraries/controllers/DatabaseStructureController.class.php:733
 msgid "Favorite List is full!"
 msgstr ""
 
-#: libraries/controllers/StructureController.class.php:1272
-msgid "The columns have been moved successfully."
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1535
-#, php-format
-msgid ""
-"Table %1$s has been altered successfully. Privileges have been adjusted."
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1541
-#: libraries/controllers/TableIndexesController.class.php:161
-#: tbl_addfield.php:92
-#, php-format
-msgid "Table %1$s has been altered successfully."
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1588
-#: libraries/tracking.lib.php:1094
-msgid "Query error"
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1806
+#: libraries/controllers/DatabaseStructureController.class.php:947
 #: libraries/mysql_charsets.lib.php:366 libraries/mysql_charsets.lib.php:373
 msgid "unknown"
 msgstr ""
 
-#: libraries/controllers/StructureController.class.php:1957
-#: templates/structure/check_all_table_column.phtml:11
-msgid "Change"
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1961
-#: libraries/controllers/StructureController.class.php:1966
-#: libraries/navigation/Nodes/Node_Index.class.php:30
-#: libraries/tracking.lib.php:926
-#: templates/columns_definitions/column_indexes.phtml:16
-#: templates/columns_definitions/table_fields_definitions.phtml:57
-#: templates/structure/check_all_table_column.phtml:30
-#: templates/structure/display_structure.phtml:79
-#: templates/structure/display_table_stats.phtml:19
-msgid "Index"
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1963
-#: libraries/controllers/StructureController.class.php:1968
-#: templates/columns_definitions/column_indexes.phtml:27
-#: templates/structure/check_all_table_column.phtml:37
-msgid "Spatial"
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1964
-#: libraries/controllers/StructureController.class.php:1969
-#: templates/columns_definitions/column_indexes.phtml:22
-#: templates/structure/check_all_table_column.phtml:47
-msgid "Fulltext"
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1970
-msgid "Distinct values"
-msgstr ""
-
 #: libraries/controllers/TableChartController.class.php:82
 #: libraries/controllers/TableGisVisualizationController.class.php:101
 msgid "No SQL query was set to fetch data."
@@ -7606,11 +7554,18 @@ msgstr ""
 msgid "No data to display"
 msgstr ""
 
-#: libraries/controllers/TableRelationController.class.php:217
+#: libraries/controllers/TableIndexesController.class.php:161
+#: libraries/controllers/TableStructureController.class.php:736
+#: tbl_addfield.php:92
+#, php-format
+msgid "Table %1$s has been altered successfully."
+msgstr ""
+
+#: libraries/controllers/TableRelationController.class.php:218
 msgid "Display column was successfully updated."
 msgstr ""
 
-#: libraries/controllers/TableRelationController.class.php:283
+#: libraries/controllers/TableRelationController.class.php:288
 msgid "Internal relations were successfully updated."
 msgstr ""
 
@@ -7623,10 +7578,71 @@ msgid "Zoom search"
 msgstr ""
 
 #: libraries/controllers/TableSearchController.class.php:852
-#: templates/table/selection_form.phtml:59
+#: templates/table/search/selection_form.phtml:59
 msgid "Find and replace"
 msgstr ""
 
+#: libraries/controllers/TableStructureController.class.php:163
+#, php-format
+msgid "The name '%s' is a MySQL reserved keyword."
+msgid_plural "The names '%s' are MySQL reserved keywords."
+msgstr[0] ""
+msgstr[1] ""
+
+#: libraries/controllers/TableStructureController.class.php:241
+msgid "No column selected."
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:467
+msgid "The columns have been moved successfully."
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:730
+#, php-format
+msgid ""
+"Table %1$s has been altered successfully. Privileges have been adjusted."
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:783
+#: libraries/tracking.lib.php:1094
+msgid "Query error"
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:948
+#: templates/table/structure/check_all_table_column.phtml:11
+msgid "Change"
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:952
+#: libraries/controllers/TableStructureController.class.php:957
+#: libraries/navigation/Nodes/Node_Index.class.php:30
+#: libraries/tracking.lib.php:926
+#: templates/columns_definitions/column_indexes.phtml:16
+#: templates/columns_definitions/table_fields_definitions.phtml:57
+#: templates/table/structure/check_all_table_column.phtml:30
+#: templates/table/structure/display_structure.phtml:79
+#: templates/table/structure/display_table_stats.phtml:19
+msgid "Index"
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:954
+#: libraries/controllers/TableStructureController.class.php:959
+#: templates/columns_definitions/column_indexes.phtml:27
+#: templates/table/structure/check_all_table_column.phtml:37
+msgid "Spatial"
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:955
+#: libraries/controllers/TableStructureController.class.php:960
+#: templates/columns_definitions/column_indexes.phtml:22
+#: templates/table/structure/check_all_table_column.phtml:47
+msgid "Fulltext"
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:963
+msgid "Distinct values"
+msgstr ""
+
 #: libraries/core.lib.php:306
 #, php-format
 msgid "The %s extension is missing. Please check your PHP configuration."
@@ -7671,7 +7687,7 @@ msgid "No Password"
 msgstr ""
 
 #: libraries/display_change_password.lib.php:68
-#: libraries/plugins/auth/AuthenticationCookie.class.php:199
+#: libraries/plugins/auth/AuthenticationCookie.class.php:187
 #: libraries/replication_gui.lib.php:422 libraries/replication_gui.lib.php:862
 #: libraries/server_privileges.lib.php:1640
 msgid "Password:"
@@ -8389,12 +8405,12 @@ msgid "Dump has been saved to file %s."
 msgstr ""
 
 #: libraries/import.lib.php:202 libraries/insert_edit.lib.php:124
-#: libraries/rte/rte_routines.lib.php:1353 libraries/sql.lib.php:1312
+#: libraries/rte/rte_routines.lib.php:1444 libraries/sql.lib.php:1306
 #: tbl_get_field.php:44
 msgid "MySQL returned an empty result set (i.e. zero rows)."
 msgstr ""
 
-#: libraries/import.lib.php:265 libraries/sql.lib.php:1326
+#: libraries/import.lib.php:265 libraries/sql.lib.php:1320
 msgid "[ROLLBACK occurred.]"
 msgstr ""
 
@@ -8458,14 +8474,14 @@ msgstr ""
 
 #: libraries/insert_edit.lib.php:233
 #: libraries/navigation/Nodes/Node_DatabaseChild.class.php:48
-#: templates/designer/table_list.phtml:40
+#: templates/database/designer/table_list.phtml:40
 msgid "Hide"
 msgstr ""
 
 #: libraries/insert_edit.lib.php:249
 #: libraries/navigation/Nodes/Node_Function.class.php:32
-#: libraries/rte/rte_routines.lib.php:1495
-#: templates/table/table_header.phtml:4
+#: libraries/rte/rte_routines.lib.php:1586
+#: templates/table/search/table_header.phtml:4
 msgid "Function"
 msgstr ""
 
@@ -8478,82 +8494,83 @@ msgstr ""
 msgid "Because of its length,<br /> this column might not be editable."
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1050
+#: libraries/insert_edit.lib.php:1048
 msgid "Binary - do not edit"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1176 libraries/server_privileges.lib.php:470
-#: templates/table/options.phtml:36
+#: libraries/insert_edit.lib.php:1174 libraries/server_privileges.lib.php:470
+#: templates/table/search/options.phtml:36
 msgid "Or"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1177
+#: libraries/insert_edit.lib.php:1175
 msgid "web server upload directory:"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1348 templates/table/input_box.phtml:49
+#: libraries/insert_edit.lib.php:1346
+#: templates/table/search/input_box.phtml:49
 msgid "Edit/Insert"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1398
+#: libraries/insert_edit.lib.php:1396
 #, php-format
 msgid "Continue insertion with %s rows"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1428
+#: libraries/insert_edit.lib.php:1426
 msgid "and then"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1461
+#: libraries/insert_edit.lib.php:1459
 msgid "Insert as new row"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1464
+#: libraries/insert_edit.lib.php:1462
 msgid "Insert as new row and ignore errors"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1467
+#: libraries/insert_edit.lib.php:1465
 msgid "Show insert query"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1487
+#: libraries/insert_edit.lib.php:1485
 msgid "Go back to previous page"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1490
+#: libraries/insert_edit.lib.php:1488
 msgid "Insert another new row"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1495
+#: libraries/insert_edit.lib.php:1493
 msgid "Go back to this page"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1518
+#: libraries/insert_edit.lib.php:1516
 msgid "Edit next row"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1540
+#: libraries/insert_edit.lib.php:1538
 msgid ""
 "Use TAB key to move from value to value, or CTRL+arrows to move anywhere"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1577 libraries/replication_gui.lib.php:542
-#: libraries/rte/rte_routines.lib.php:1497
+#: libraries/insert_edit.lib.php:1575 libraries/replication_gui.lib.php:542
+#: libraries/rte/rte_routines.lib.php:1588
 #: libraries/server_status_variables.lib.php:220
-#: templates/designer/having_query_panel.phtml:100
-#: templates/designer/options_panel.phtml:73
-#: templates/designer/options_panel.phtml:239
-#: templates/designer/where_query_panel.phtml:69
-#: templates/table/table_header.phtml:10
-#: templates/table/zoom_result_form.phtml:35
+#: templates/database/designer/having_query_panel.phtml:100
+#: templates/database/designer/options_panel.phtml:73
+#: templates/database/designer/options_panel.phtml:239
+#: templates/database/designer/where_query_panel.phtml:69
+#: templates/table/search/table_header.phtml:10
+#: templates/table/search/zoom_result_form.phtml:35
 msgid "Value"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1937 libraries/sql.lib.php:1309
+#: libraries/insert_edit.lib.php:1935 libraries/sql.lib.php:1303
 msgid "Showing SQL query"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1962 libraries/sql.lib.php:1287
+#: libraries/insert_edit.lib.php:1960 libraries/sql.lib.php:1281
 #, php-format
 msgid "Inserted row id: %1$d"
 msgstr ""
@@ -8960,7 +8977,7 @@ msgstr ""
 #: libraries/navigation/Nodes/Node_View_Container.class.php:26
 #: libraries/navigation/Nodes/Node_View_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:129
-#: templates/structure/show_create.phtml:30
+#: templates/database/structure/show_create.phtml:30
 msgid "Views"
 msgstr ""
 
@@ -9246,7 +9263,7 @@ msgstr ""
 
 #: libraries/operations.lib.php:101 libraries/operations.lib.php:249
 #: libraries/operations.lib.php:869 libraries/operations.lib.php:963
-#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:907
+#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:998
 #: templates/columns_definitions/table_fields_definitions.phtml:47
 msgid "Adjust Privileges"
 msgstr ""
@@ -9336,22 +9353,22 @@ msgid "Switch to copied table"
 msgstr ""
 
 #: libraries/operations.lib.php:1360
-#: templates/structure/check_all_tables.phtml:18
+#: templates/database/structure/check_all_tables.phtml:18
 msgid "Table maintenance"
 msgstr ""
 
 #: libraries/operations.lib.php:1398
-#: templates/structure/check_all_tables.phtml:19
+#: templates/database/structure/check_all_tables.phtml:19
 msgid "Analyze table"
 msgstr ""
 
 #: libraries/operations.lib.php:1413
-#: templates/structure/check_all_tables.phtml:20
+#: templates/database/structure/check_all_tables.phtml:20
 msgid "Check table"
 msgstr ""
 
 #: libraries/operations.lib.php:1428
-#: templates/structure/check_all_tables.phtml:22
+#: templates/database/structure/check_all_tables.phtml:22
 msgid "Checksum table"
 msgstr ""
 
@@ -9369,18 +9386,19 @@ msgid "Flush the table (FLUSH)"
 msgstr ""
 
 #: libraries/operations.lib.php:1477
-#: templates/structure/check_all_tables.phtml:23
-#: templates/structure/display_table_stats.phtml:56
+#: templates/database/structure/check_all_tables.phtml:23
+#: templates/table/structure/display_table_stats.phtml:56
 msgid "Optimize table"
 msgstr ""
 
 #: libraries/operations.lib.php:1492
-#: templates/structure/check_all_tables.phtml:24
+#: templates/database/structure/check_all_tables.phtml:24
 msgid "Repair table"
 msgstr ""
 
 #: libraries/operations.lib.php:1538
-#: templates/structure/check_all_tables.phtml:14 view_operations.php:127
+#: templates/database/structure/check_all_tables.phtml:14
+#: view_operations.php:127
 msgid "Delete data or table"
 msgstr ""
 
@@ -9501,7 +9519,7 @@ msgid "Cannot connect: invalid settings."
 msgstr ""
 
 #: libraries/plugins/auth/AuthenticationConfig.class.php:108
-#: libraries/plugins/auth/AuthenticationCookie.class.php:134
+#: libraries/plugins/auth/AuthenticationCookie.class.php:122
 #: libraries/plugins/auth/AuthenticationHttp.class.php:96
 #, php-format
 msgid "Welcome to %s"
@@ -9526,36 +9544,36 @@ msgstr ""
 msgid "Retry to connect"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:146
+#: libraries/plugins/auth/AuthenticationCookie.class.php:134
 msgid "Your session has expired. Please log in again."
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:170
+#: libraries/plugins/auth/AuthenticationCookie.class.php:158
 msgid "Log in"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:178
-#: libraries/plugins/auth/AuthenticationCookie.class.php:188
+#: libraries/plugins/auth/AuthenticationCookie.class.php:166
+#: libraries/plugins/auth/AuthenticationCookie.class.php:176
 msgid "You can enter hostname/IP address and port separated by space."
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:193
+#: libraries/plugins/auth/AuthenticationCookie.class.php:181
 msgid "Username:"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:205
+#: libraries/plugins/auth/AuthenticationCookie.class.php:193
 msgid "Server Choice:"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:386
+#: libraries/plugins/auth/AuthenticationCookie.class.php:374
 msgid "Entered captcha is wrong, try again!"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:396
+#: libraries/plugins/auth/AuthenticationCookie.class.php:384
 msgid "Please enter correct captcha!"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:423
+#: libraries/plugins/auth/AuthenticationCookie.class.php:411
 msgid "You are not allowed to log in to this MySQL server!"
 msgstr ""
 
@@ -9651,7 +9669,7 @@ msgstr ""
 #: libraries/plugins/export/ExportOdt.class.php:593
 #: libraries/plugins/export/ExportTexytext.class.php:428
 #: libraries/plugins/export/PMA_ExportPdf.class.php:313
-#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:984
 #: libraries/rte/rte_triggers.lib.php:377
 msgid "Definition"
 msgstr ""
@@ -9948,7 +9966,7 @@ msgid "Last check:"
 msgstr ""
 
 #: libraries/plugins/export/ExportSql.class.php:1399
-#: templates/structure/structure_table_row.phtml:183
+#: templates/database/structure/structure_table_row.phtml:183
 msgid "in use"
 msgstr ""
 
@@ -10128,18 +10146,14 @@ msgstr ""
 msgid "The imported file does not contain any data!"
 msgstr ""
 
-#: libraries/plugins/import/ImportSql.class.php:169
+#: libraries/plugins/import/ImportSql.class.php:72
 msgid "SQL compatibility mode:"
 msgstr ""
 
-#: libraries/plugins/import/ImportSql.class.php:181
+#: libraries/plugins/import/ImportSql.class.php:84
 msgid "Do not use <code>AUTO_INCREMENT</code> for zero values"
 msgstr ""
 
-#: libraries/plugins/import/ImportSql.class.php:195
-msgid "Read as multibytes"
-msgstr ""
-
 #: libraries/plugins/import/ImportXml.class.php:54
 msgid "XML"
 msgstr ""
@@ -10182,7 +10196,7 @@ msgid "Show grid"
 msgstr ""
 
 #: libraries/plugins/schema/SchemaPdf.class.php:94
-#: templates/structure/print_view_data_dictionary_link.phtml:6
+#: templates/database/structure/print_view_data_dictionary_link.phtml:6
 msgid "Data Dictionary"
 msgstr ""
 
@@ -10207,7 +10221,7 @@ msgid "The %s table doesn't exist!"
 msgstr ""
 
 #: libraries/plugins/schema/eps/Eps_Relation_Schema.class.php:321
-#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:309
+#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:323
 #, php-format
 msgid "Schema of the %s database - Page %s"
 msgstr ""
@@ -10233,7 +10247,7 @@ msgstr ""
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1005
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1028
 #: libraries/tracking.lib.php:884
-#: templates/structure/table_structure_header.phtml:11
+#: templates/table/structure/table_structure_header.phtml:11
 msgid "Extra"
 msgstr ""
 
@@ -10538,51 +10552,51 @@ msgstr ""
 msgid "Create the needed tables with the <code>%screate_tables.sql</code>."
 msgstr ""
 
-#: libraries/relation.lib.php:360
+#: libraries/relation.lib.php:357
 msgid "Create a pma user and give access to these tables."
 msgstr ""
 
-#: libraries/relation.lib.php:365
+#: libraries/relation.lib.php:360
 msgid ""
 "Enable advanced features in configuration file (<code>config.inc.php</"
 "code>), for example by starting from <code>config.sample.inc.php</code>."
 msgstr ""
 
-#: libraries/relation.lib.php:373
+#: libraries/relation.lib.php:365
 msgid "Re-login to phpMyAdmin to load the updated configuration file."
 msgstr ""
 
-#: libraries/relation.lib.php:1612
+#: libraries/relation.lib.php:1607
 msgid "no description"
 msgstr ""
 
-#: libraries/relation.lib.php:1811
+#: libraries/relation.lib.php:1806
 msgid ""
 "You do not have necessary privileges to create a database named "
 "'phpmyadmin'. You may go to 'Operations' tab of any database to set up the "
 "phpMyAdmin configuration storage there."
 msgstr ""
 
-#: libraries/relation.lib.php:1928
+#: libraries/relation.lib.php:1923
 #, php-format
 msgid ""
 "%sCreate%s a database named 'phpmyadmin' and setup the phpMyAdmin "
 "configuration storage there."
 msgstr ""
 
-#: libraries/relation.lib.php:1936
+#: libraries/relation.lib.php:1931
 #, php-format
 msgid ""
 "%sCreate%s the phpMyAdmin configuration storage in the current database."
 msgstr ""
 
-#: libraries/relation.lib.php:1944
+#: libraries/relation.lib.php:1939
 #, php-format
 msgid "%sCreate%s missing phpMyAdmin configuration storage tables."
 msgstr ""
 
 #: libraries/replication_gui.lib.php:46 libraries/replication_gui.lib.php:343
-#: libraries/server_databases.lib.php:387
+#: libraries/server_databases.lib.php:398
 msgid "Master replication"
 msgstr ""
 
@@ -10637,7 +10651,7 @@ msgid ""
 msgstr ""
 
 #: libraries/replication_gui.lib.php:141
-#: libraries/server_databases.lib.php:389
+#: libraries/server_databases.lib.php:400
 msgid "Slave replication"
 msgstr ""
 
@@ -10898,10 +10912,10 @@ msgid "Master server changed successfully to %s."
 msgstr ""
 
 #: libraries/rte/rte_events.lib.php:106 libraries/rte/rte_events.lib.php:115
-#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:149
-#: libraries/rte/rte_routines.lib.php:158
-#: libraries/rte/rte_routines.lib.php:231
-#: libraries/rte/rte_routines.lib.php:1362
+#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:219
+#: libraries/rte/rte_routines.lib.php:246
+#: libraries/rte/rte_routines.lib.php:368
+#: libraries/rte/rte_routines.lib.php:1453
 #: libraries/rte/rte_triggers.lib.php:82 libraries/rte/rte_triggers.lib.php:91
 #: libraries/rte/rte_triggers.lib.php:123
 #, php-format
@@ -10922,7 +10936,7 @@ msgstr ""
 msgid "Event %1$s has been created."
 msgstr ""
 
-#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:251
+#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:266
 #: libraries/rte/rte_triggers.lib.php:144
 msgid "One or more errors have occurred while processing your request:"
 msgstr ""
@@ -10931,7 +10945,7 @@ msgstr ""
 msgid "Edit event"
 msgstr ""
 
-#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:794
+#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:885
 #: libraries/rte/rte_triggers.lib.php:323 view_create.php:180
 msgid "Details"
 msgstr ""
@@ -10944,7 +10958,7 @@ msgstr ""
 msgid "Event type"
 msgstr ""
 
-#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:817
+#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:908
 #, php-format
 msgid "Change to %s"
 msgstr ""
@@ -10971,12 +10985,14 @@ msgstr ""
 msgid "On completion preserve"
 msgstr ""
 
-#: libraries/rte/rte_events.lib.php:491 libraries/rte/rte_routines.lib.php:930
+#: libraries/rte/rte_events.lib.php:491
+#: libraries/rte/rte_routines.lib.php:1021
 #: libraries/rte/rte_triggers.lib.php:383 view_create.php:209
 msgid "Definer"
 msgstr ""
 
-#: libraries/rte/rte_events.lib.php:535 libraries/rte/rte_routines.lib.php:997
+#: libraries/rte/rte_events.lib.php:535
+#: libraries/rte/rte_routines.lib.php:1088
 #: libraries/rte/rte_triggers.lib.php:422
 msgid "The definer must be in the \"username@hostname\" format!"
 msgstr ""
@@ -11002,9 +11018,9 @@ msgid "You must provide an event definition."
 msgstr ""
 
 #: libraries/rte/rte_export.lib.php:43 libraries/rte/rte_general.lib.php:72
-#: libraries/rte/rte_routines.lib.php:345
-#: libraries/rte/rte_routines.lib.php:1198
-#: libraries/rte/rte_routines.lib.php:1411
+#: libraries/rte/rte_routines.lib.php:153
+#: libraries/rte/rte_routines.lib.php:1289
+#: libraries/rte/rte_routines.lib.php:1502
 msgid "Error in processing request:"
 msgstr ""
 
@@ -11036,132 +11052,132 @@ msgid ""
 "problems."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:110
-#: libraries/rte/rte_routines.lib.php:1006
+#: libraries/rte/rte_routines.lib.php:123
+msgid "Edit routine"
+msgstr ""
+
+#: libraries/rte/rte_routines.lib.php:200
+#: libraries/rte/rte_routines.lib.php:1097
 #, php-format
 msgid "Invalid routine type: \"%s\""
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:170
-msgid "Sorry, we failed to restore the dropped routine."
-msgstr ""
-
-#: libraries/rte/rte_routines.lib.php:211
-#, php-format
-msgid "Routine %1$s has been modified. Privileges have been adjusted."
-msgstr ""
-
-#: libraries/rte/rte_routines.lib.php:216
-#, php-format
-msgid "Routine %1$s has been modified."
-msgstr ""
-
-#: libraries/rte/rte_routines.lib.php:238
+#: libraries/rte/rte_routines.lib.php:253
 #, php-format
 msgid "Routine %1$s has been created."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:315
-msgid "Edit routine"
+#: libraries/rte/rte_routines.lib.php:380
+msgid "Sorry, we failed to restore the dropped routine."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:797
+#: libraries/rte/rte_routines.lib.php:439
+#, php-format
+msgid "Routine %1$s has been modified. Privileges have been adjusted."
+msgstr ""
+
+#: libraries/rte/rte_routines.lib.php:444
+#, php-format
+msgid "Routine %1$s has been modified."
+msgstr ""
+
+#: libraries/rte/rte_routines.lib.php:888
 msgid "Routine name"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:823
+#: libraries/rte/rte_routines.lib.php:914
 msgid "Parameters"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:829
+#: libraries/rte/rte_routines.lib.php:920
 msgid "Direction"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:847
+#: libraries/rte/rte_routines.lib.php:938
 msgid "Add parameter"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:851
+#: libraries/rte/rte_routines.lib.php:942
 msgid "Remove last parameter"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:856
+#: libraries/rte/rte_routines.lib.php:947
 msgid "Return type"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:862
+#: libraries/rte/rte_routines.lib.php:953
 msgid "Return length/values"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:868
+#: libraries/rte/rte_routines.lib.php:959
 msgid "Return options"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:899
+#: libraries/rte/rte_routines.lib.php:990
 msgid "Is deterministic"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:920
+#: libraries/rte/rte_routines.lib.php:1011
 msgid ""
 "You do not have sufficient privileges to perform this operation; Please "
 "refer to the documentation for more details"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:935
+#: libraries/rte/rte_routines.lib.php:1026
 msgid "Security type"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:944
+#: libraries/rte/rte_routines.lib.php:1035
 msgid "SQL data access"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1013
+#: libraries/rte/rte_routines.lib.php:1104
 msgid "You must provide a routine name!"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1047
+#: libraries/rte/rte_routines.lib.php:1138
 #, php-format
 msgid "Invalid direction \"%s\" given for parameter."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1069
-#: libraries/rte/rte_routines.lib.php:1131
+#: libraries/rte/rte_routines.lib.php:1160
+#: libraries/rte/rte_routines.lib.php:1222
 msgid ""
 "You must provide length/values for routine parameters of type ENUM, SET, "
 "VARCHAR and VARBINARY."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1095
+#: libraries/rte/rte_routines.lib.php:1186
 msgid "You must provide a name and a type for each routine parameter."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1114
+#: libraries/rte/rte_routines.lib.php:1205
 msgid "You must provide a valid return type for the routine."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1174
+#: libraries/rte/rte_routines.lib.php:1265
 msgid "You must provide a routine definition."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1285
+#: libraries/rte/rte_routines.lib.php:1376
 #, php-format
 msgid "Execution results of routine %s"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1340
+#: libraries/rte/rte_routines.lib.php:1431
 #, php-format
 msgid "%d row affected by the last statement inside the procedure."
 msgid_plural "%d rows affected by the last statement inside the procedure."
 msgstr[0] ""
 msgstr[1] ""
 
-#: libraries/rte/rte_routines.lib.php:1398
-#: libraries/rte/rte_routines.lib.php:1406
+#: libraries/rte/rte_routines.lib.php:1489
+#: libraries/rte/rte_routines.lib.php:1497
 msgid "Execute routine"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1485
-#: libraries/rte/rte_routines.lib.php:1488
+#: libraries/rte/rte_routines.lib.php:1576
+#: libraries/rte/rte_routines.lib.php:1579
 msgid "Routine parameters"
 msgstr ""
 
@@ -11315,7 +11331,7 @@ msgid "Original position"
 msgstr ""
 
 #: libraries/server_bin_log.lib.php:133
-#: templates/structure/display_table_stats.phtml:4
+#: templates/table/structure/display_table_stats.phtml:4
 msgid "Information"
 msgstr ""
 
@@ -11351,12 +11367,12 @@ msgid ""
 "between the web server and the MySQL server."
 msgstr ""
 
-#: libraries/server_databases.lib.php:364
-#: libraries/server_databases.lib.php:365
+#: libraries/server_databases.lib.php:366
+#: libraries/server_databases.lib.php:371
 msgid "Enable Statistics"
 msgstr ""
 
-#: libraries/server_databases.lib.php:481
+#: libraries/server_databases.lib.php:492
 #, php-format
 msgid "%1$d database has been dropped successfully."
 msgid_plural "%1$d databases have been dropped successfully."
@@ -11712,7 +11728,7 @@ msgid "You have revoked the privileges for %s."
 msgstr ""
 
 #: libraries/server_privileges.lib.php:2059
-#: libraries/server_privileges.lib.php:4290
+#: libraries/server_privileges.lib.php:4316
 msgid "Add user account"
 msgstr ""
 
@@ -11875,53 +11891,53 @@ msgstr ""
 msgid "The privileges were reloaded successfully."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:3994
+#: libraries/server_privileges.lib.php:4003
 #, php-format
 msgid "The user %s already exists!"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4232
+#: libraries/server_privileges.lib.php:4258
 #, php-format
 msgid "Privileges for %s"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4241
+#: libraries/server_privileges.lib.php:4267
 #: libraries/server_status_processes.lib.php:72
 #: libraries/server_user_groups.lib.php:39
 msgid "User"
 msgstr "Gebroeker"
 
-#: libraries/server_privileges.lib.php:4282
+#: libraries/server_privileges.lib.php:4308
 msgctxt "Create new user"
 msgid "New"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4311
+#: libraries/server_privileges.lib.php:4337
 msgid "Edit privileges:"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4312
+#: libraries/server_privileges.lib.php:4338
 msgid "User account"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4371
+#: libraries/server_privileges.lib.php:4397
 msgid ""
 "Note: You are attempting to edit privileges of the user with which you are "
 "currently logged in."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4391 libraries/server_users.lib.php:25
+#: libraries/server_privileges.lib.php:4417 libraries/server_users.lib.php:25
 msgid "User accounts overview"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4459
+#: libraries/server_privileges.lib.php:4485
 msgid ""
 "A user account allowing any user from localhost to connect is present. This "
 "will prevent other users from connecting if the host part of their account "
 "allows a connection from any (%) host."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4500
+#: libraries/server_privileges.lib.php:4526
 #, php-format
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
@@ -11930,7 +11946,7 @@ msgid ""
 "%sreload the privileges%s before you continue."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4519
+#: libraries/server_privileges.lib.php:4545
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
 "tables. The content of these tables may differ from the privileges the "
@@ -11939,61 +11955,61 @@ msgid ""
 "privilege."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4569
+#: libraries/server_privileges.lib.php:4595
 msgid "The selected user was not found in the privilege table."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4801
+#: libraries/server_privileges.lib.php:4827
 msgid "You have added a new user."
 msgstr ""
 
-#: libraries/server_status.lib.php:53
+#: libraries/server_status.lib.php:60
 #, php-format
 msgid "Network traffic since startup: %s"
 msgstr ""
 
-#: libraries/server_status.lib.php:66
+#: libraries/server_status.lib.php:73
 #, php-format
 msgid "This MySQL server has been running for %1$s. It started up on %2$s."
 msgstr ""
 
-#: libraries/server_status.lib.php:80
+#: libraries/server_status.lib.php:94
 msgid ""
 "This MySQL server works as <b>master</b> and <b>slave</b> in <b>replication</"
 "b> process."
 msgstr ""
 
-#: libraries/server_status.lib.php:85
+#: libraries/server_status.lib.php:99
 msgid "This MySQL server works as <b>master</b> in <b>replication</b> process."
 msgstr ""
 
-#: libraries/server_status.lib.php:90
+#: libraries/server_status.lib.php:104
 msgid "This MySQL server works as <b>slave</b> in <b>replication</b> process."
 msgstr ""
 
-#: libraries/server_status.lib.php:106
+#: libraries/server_status.lib.php:116
 msgid "Replication status"
 msgstr ""
 
-#: libraries/server_status.lib.php:137
+#: libraries/server_status.lib.php:146
 msgid ""
 "On a busy server, the byte counters may overrun, so those statistics as "
 "reported by the MySQL server may be incorrect."
 msgstr ""
 
-#: libraries/server_status.lib.php:148
+#: libraries/server_status.lib.php:157
 msgid "Received"
 msgstr ""
 
-#: libraries/server_status.lib.php:167
+#: libraries/server_status.lib.php:176
 msgid "Sent"
 msgstr ""
 
-#: libraries/server_status.lib.php:234
+#: libraries/server_status.lib.php:243
 msgid "Max. concurrent connections"
 msgstr ""
 
-#: libraries/server_status.lib.php:244
+#: libraries/server_status.lib.php:253
 msgid "Failed attempts"
 msgstr ""
 
@@ -12913,7 +12929,7 @@ msgstr ""
 msgid "Not implemented yet."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/AlterOperation.php:193
+#: libraries/sql-parser/src/Components/AlterOperation.php:191
 msgid "Unrecognized alter operation."
 msgstr ""
 
@@ -12927,7 +12943,7 @@ msgid "An opening bracket followed by a set of values was expected."
 msgstr ""
 
 #: libraries/sql-parser/src/Components/ArrayObj.php:101
-#: libraries/sql-parser/src/Components/FieldDefinition.php:202
+#: libraries/sql-parser/src/Components/CreateDefinition.php:202
 msgid "An opening bracket was expected."
 msgstr ""
 
@@ -12935,25 +12951,33 @@ msgstr ""
 msgid "A comma or a closing bracket was expected"
 msgstr ""
 
+#: libraries/sql-parser/src/Components/CreateDefinition.php:246
+msgid "A comma or a closing bracket was expected."
+msgstr ""
+
+#: libraries/sql-parser/src/Components/CreateDefinition.php:262
+msgid "A closing bracket was expected."
+msgstr ""
+
 #: libraries/sql-parser/src/Components/DataType.php:125
 msgid "Unrecognized data type."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:225
+#: libraries/sql-parser/src/Components/Expression.php:227
 msgid "Unexpected closing bracket."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:246
-#: libraries/sql-parser/src/Components/Expression.php:283
-#: libraries/sql-parser/src/Components/Expression.php:303
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:285
+#: libraries/sql-parser/src/Components/Expression.php:305
 msgid "An alias was previously found."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:257
+#: libraries/sql-parser/src/Components/Expression.php:259
 msgid "Unexpected dot."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:327
+#: libraries/sql-parser/src/Components/Expression.php:329
 msgid "An alias was expected."
 msgstr ""
 
@@ -12961,14 +12985,6 @@ msgstr ""
 msgid "An expression was expected."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/FieldDefinition.php:246
-msgid "A comma or a closing bracket was expected."
-msgstr ""
-
-#: libraries/sql-parser/src/Components/FieldDefinition.php:262
-msgid "A closing bracket was expected."
-msgstr ""
-
 #: libraries/sql-parser/src/Components/Limit.php:90
 #: libraries/sql-parser/src/Components/Limit.php:112
 msgid "An offset was expected."
@@ -13008,24 +13024,24 @@ msgstr ""
 msgid "Expected delimiter."
 msgstr ""
 
-#: libraries/sql-parser/src/Lexer.php:753
+#: libraries/sql-parser/src/Lexer.php:777
 #, php-format
 msgid "Ending quote %1$s was expected."
 msgstr ""
 
-#: libraries/sql-parser/src/Lexer.php:789
+#: libraries/sql-parser/src/Lexer.php:813
 msgid "Variable name was expected."
 msgstr ""
 
-#: libraries/sql-parser/src/Parser.php:380
+#: libraries/sql-parser/src/Parser.php:391
 msgid "Unexpected beginning of statement."
 msgstr ""
 
-#: libraries/sql-parser/src/Parser.php:399
+#: libraries/sql-parser/src/Parser.php:410
 msgid "Unrecognized statement type."
 msgstr ""
 
-#: libraries/sql-parser/src/Parser.php:479
+#: libraries/sql-parser/src/Parser.php:489
 msgid "No transaction was previously started."
 msgstr ""
 
@@ -13051,7 +13067,7 @@ msgid "The name of the entity was expected."
 msgstr ""
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:310
-msgid "At least one field definition was expected."
+msgid "At least one column definition was expected."
 msgstr ""
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:329
@@ -13111,25 +13127,25 @@ msgstr ""
 msgid "Using bookmark \"%s\" as default browse query."
 msgstr ""
 
-#: libraries/sql.lib.php:1306
+#: libraries/sql.lib.php:1300
 msgid "Showing as PHP code"
 msgstr ""
 
-#: libraries/sql.lib.php:1638
+#: libraries/sql.lib.php:1632
 #, php-format
 msgid ""
 "Current selection does not contain a unique column. Grid edit, checkbox, "
 "Edit, Copy and Delete features are not available. %s"
 msgstr ""
 
-#: libraries/sql.lib.php:1649
+#: libraries/sql.lib.php:1643
 #, php-format
 msgid ""
 "Current selection does not contain a unique column. Grid edit, Edit, Copy "
 "and Delete features may result in undesired behavior. %s"
 msgstr ""
 
-#: libraries/sql.lib.php:1688
+#: libraries/sql.lib.php:1682
 #, php-format
 msgid "Problems with indexes of table `%s`"
 msgstr ""
@@ -13285,7 +13301,7 @@ msgid "Version %s snapshot (SQL code)"
 msgstr ""
 
 #: libraries/tracking.lib.php:947
-#: templates/structure/table_structure_row.phtml:33
+#: templates/table/structure/table_structure_row.phtml:33
 msgctxt "None for default"
 msgid "None"
 msgstr ""
@@ -13337,15 +13353,15 @@ msgstr ""
 msgid "Version %1$s was created, tracking for %2$s is active."
 msgstr ""
 
-#: libraries/user_preferences.inc.php:29
+#: libraries/user_preferences.inc.php:30
 msgid "Manage your settings"
 msgstr ""
 
-#: libraries/user_preferences.inc.php:46 prefs_manage.php:307
+#: libraries/user_preferences.inc.php:54 prefs_manage.php:307
 msgid "Configuration has been saved."
 msgstr ""
 
-#: libraries/user_preferences.inc.php:66
+#: libraries/user_preferences.inc.php:74
 #, php-format
 msgid ""
 "Your preferences will be saved for current session only. Storing them "
@@ -13717,7 +13733,7 @@ msgid "first"
 msgstr ""
 
 #: templates/columns_definitions/move_column.phtml:12
-#: templates/structure/add_column.phtml:21
+#: templates/table/structure/add_column.phtml:21
 #, php-format
 msgid "after %s"
 msgstr ""
@@ -13776,197 +13792,290 @@ msgstr ""
 msgid "Input transformation options"
 msgstr ""
 
-#: templates/designer/aggregate_query_panel.phtml:22
-#: templates/designer/options_panel.phtml:100
-msgid "Aggregate"
-msgstr ""
-
-#: templates/designer/aggregate_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:61
-#: templates/designer/options_panel.phtml:106
-#: templates/designer/options_panel.phtml:170
-#: templates/designer/where_query_panel.phtml:30
-#: templates/table/table_header.phtml:9
-msgid "Operator"
-msgstr ""
-
-#: templates/designer/database_tables.phtml:29
-msgid "Toggle"
-msgstr ""
-
-#: templates/designer/database_tables.phtml:40
-msgid "See table structure"
-msgstr ""
-
-#: templates/designer/delete_relation_panel.phtml:21
-msgid "Delete relation"
-msgstr ""
-
-#: templates/designer/edit_delete_pages.phtml:7
-msgid "Page to open"
-msgstr ""
-
-#: templates/designer/edit_delete_pages.phtml:7
-msgid "Page to delete"
-msgstr ""
-
-#: templates/designer/having_query_panel.phtml:90
-#: templates/designer/options_panel.phtml:63
-#: templates/designer/options_panel.phtml:229
-#: templates/designer/where_query_panel.phtml:59
-msgid "Except"
-msgstr ""
-
-#: templates/designer/having_query_panel.phtml:102
-#: templates/designer/options_panel.phtml:75
-#: templates/designer/options_panel.phtml:241
-#: templates/designer/where_query_panel.phtml:71
-msgid "subquery"
-msgstr ""
-
-#: templates/designer/new_relation_panel.phtml:22
-#: templates/designer/side_menu.phtml:84 templates/designer/side_menu.phtml:87
-msgid "Create relation"
-msgstr ""
-
-#: templates/designer/options_panel.phtml:34
-#: templates/designer/options_panel.phtml:200
-msgid "Relation operator"
-msgstr ""
-
-#: templates/designer/options_panel.phtml:85
-#: templates/designer/rename_to_panel.phtml:23
-msgid "Rename to"
-msgstr ""
-
-#: templates/designer/options_panel.phtml:91
-#: templates/designer/rename_to_panel.phtml:31
-msgid "New name"
-msgstr ""
-
-#: templates/designer/page_save_as.phtml:4
-msgid "Save to selected page"
-msgstr ""
-
-#: templates/designer/page_save_as.phtml:5
-msgid "Create a page and save to it"
-msgstr ""
-
-#: templates/designer/page_save_as.phtml:26
-msgid "New page name"
-msgstr ""
-
-#: templates/designer/page_selector.phtml:2
-msgid "Select page"
-msgstr ""
-
-#: templates/designer/query_details.phtml:10
-msgid "Active options"
-msgstr ""
-
-#: templates/designer/schema_export.phtml:4
-msgid "Select Export Relational Type"
-msgstr ""
-
-#: templates/designer/side_menu.phtml:19 templates/designer/side_menu.phtml:25
-msgid "Show/Hide tables list"
-msgstr ""
-
-#: templates/designer/side_menu.phtml:29 templates/designer/side_menu.phtml:35
-#: templates/designer/side_menu.phtml:36
-msgid "View in fullscreen"
-msgstr ""
-
-#: templates/designer/side_menu.phtml:34
-msgid "Exit fullscreen"
-msgstr ""
-
-#: templates/designer/side_menu.phtml:41 templates/designer/side_menu.phtml:45
-msgid "New page"
-msgstr ""
-
-#: templates/designer/side_menu.phtml:70 templates/designer/side_menu.phtml:73
-msgid "Delete pages"
-msgstr ""
-
-#: templates/designer/side_menu.phtml:77 templates/designer/side_menu.phtml:80
-#: templates/table/create_table.phtml:7
+#: templates/database/create_table.phtml:7
+#: templates/database/designer/side_menu.phtml:77
+#: templates/database/designer/side_menu.phtml:80
 msgid "Create table"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:98
-#: templates/designer/side_menu.phtml:101
+#: templates/database/create_table.phtml:15
+msgid "Number of columns"
+msgstr ""
+
+#: templates/database/designer/aggregate_query_panel.phtml:22
+#: templates/database/designer/options_panel.phtml:100
+msgid "Aggregate"
+msgstr ""
+
+#: templates/database/designer/aggregate_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:61
+#: templates/database/designer/options_panel.phtml:106
+#: templates/database/designer/options_panel.phtml:170
+#: templates/database/designer/where_query_panel.phtml:30
+#: templates/table/search/table_header.phtml:9
+msgid "Operator"
+msgstr ""
+
+#: templates/database/designer/database_tables.phtml:29
+msgid "Toggle"
+msgstr ""
+
+#: templates/database/designer/database_tables.phtml:40
+msgid "See table structure"
+msgstr ""
+
+#: templates/database/designer/delete_relation_panel.phtml:21
+msgid "Delete relation"
+msgstr ""
+
+#: templates/database/designer/edit_delete_pages.phtml:7
+msgid "Page to open"
+msgstr ""
+
+#: templates/database/designer/edit_delete_pages.phtml:7
+msgid "Page to delete"
+msgstr ""
+
+#: templates/database/designer/having_query_panel.phtml:90
+#: templates/database/designer/options_panel.phtml:63
+#: templates/database/designer/options_panel.phtml:229
+#: templates/database/designer/where_query_panel.phtml:59
+msgid "Except"
+msgstr ""
+
+#: templates/database/designer/having_query_panel.phtml:102
+#: templates/database/designer/options_panel.phtml:75
+#: templates/database/designer/options_panel.phtml:241
+#: templates/database/designer/where_query_panel.phtml:71
+msgid "subquery"
+msgstr ""
+
+#: templates/database/designer/new_relation_panel.phtml:22
+#: templates/database/designer/side_menu.phtml:84
+#: templates/database/designer/side_menu.phtml:87
+msgid "Create relation"
+msgstr ""
+
+#: templates/database/designer/options_panel.phtml:34
+#: templates/database/designer/options_panel.phtml:200
+msgid "Relation operator"
+msgstr ""
+
+#: templates/database/designer/options_panel.phtml:85
+#: templates/database/designer/rename_to_panel.phtml:23
+msgid "Rename to"
+msgstr ""
+
+#: templates/database/designer/options_panel.phtml:91
+#: templates/database/designer/rename_to_panel.phtml:31
+msgid "New name"
+msgstr ""
+
+#: templates/database/designer/page_save_as.phtml:4
+msgid "Save to selected page"
+msgstr ""
+
+#: templates/database/designer/page_save_as.phtml:5
+msgid "Create a page and save to it"
+msgstr ""
+
+#: templates/database/designer/page_save_as.phtml:26
+msgid "New page name"
+msgstr ""
+
+#: templates/database/designer/page_selector.phtml:2
+msgid "Select page"
+msgstr ""
+
+#: templates/database/designer/query_details.phtml:10
+msgid "Active options"
+msgstr ""
+
+#: templates/database/designer/schema_export.phtml:4
+msgid "Select Export Relational Type"
+msgstr ""
+
+#: templates/database/designer/side_menu.phtml:19
+#: templates/database/designer/side_menu.phtml:25
+msgid "Show/Hide tables list"
+msgstr ""
+
+#: templates/database/designer/side_menu.phtml:29
+#: templates/database/designer/side_menu.phtml:35
+#: templates/database/designer/side_menu.phtml:36
+msgid "View in fullscreen"
+msgstr ""
+
+#: templates/database/designer/side_menu.phtml:34
+msgid "Exit fullscreen"
+msgstr ""
+
+#: templates/database/designer/side_menu.phtml:41
+#: templates/database/designer/side_menu.phtml:45
+msgid "New page"
+msgstr ""
+
+#: templates/database/designer/side_menu.phtml:70
+#: templates/database/designer/side_menu.phtml:73
+msgid "Delete pages"
+msgstr ""
+
+#: templates/database/designer/side_menu.phtml:98
+#: templates/database/designer/side_menu.phtml:101
 msgid "Reload"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:107
-#: templates/designer/side_menu.phtml:110
+#: templates/database/designer/side_menu.phtml:107
+#: templates/database/designer/side_menu.phtml:110
 msgid "Help"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Angular links"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Direct links"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:122
-#: templates/designer/side_menu.phtml:124
+#: templates/database/designer/side_menu.phtml:122
+#: templates/database/designer/side_menu.phtml:124
 msgid "Snap to grid"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:128
-#: templates/designer/side_menu.phtml:134
+#: templates/database/designer/side_menu.phtml:128
+#: templates/database/designer/side_menu.phtml:134
 msgid "Small/Big All"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:138
-#: templates/designer/side_menu.phtml:141
+#: templates/database/designer/side_menu.phtml:138
+#: templates/database/designer/side_menu.phtml:141
 msgid "Toggle small/big"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:145
-#: templates/designer/side_menu.phtml:148
+#: templates/database/designer/side_menu.phtml:145
+#: templates/database/designer/side_menu.phtml:148
 msgid "Toggle relation lines"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:153
-#: templates/designer/side_menu.phtml:156
+#: templates/database/designer/side_menu.phtml:153
+#: templates/database/designer/side_menu.phtml:156
 msgid "Export schema"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:165
-#: templates/designer/side_menu.phtml:168
+#: templates/database/designer/side_menu.phtml:165
+#: templates/database/designer/side_menu.phtml:168
 msgid "Build Query"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:173
-#: templates/designer/side_menu.phtml:177
+#: templates/database/designer/side_menu.phtml:173
+#: templates/database/designer/side_menu.phtml:177
 msgid "Move Menu"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:181
-#: templates/designer/side_menu.phtml:186
+#: templates/database/designer/side_menu.phtml:181
+#: templates/database/designer/side_menu.phtml:186
 msgid "Pin text"
 msgstr ""
 
-#: templates/designer/table_list.phtml:4
+#: templates/database/designer/table_list.phtml:4
 msgid "Hide/Show all"
 msgstr ""
 
-#: templates/designer/table_list.phtml:14
+#: templates/database/designer/table_list.phtml:14
 msgid "Hide/Show Tables with no relation"
 msgstr ""
 
-#: templates/designer/table_list.phtml:59
+#: templates/database/designer/table_list.phtml:59
 msgid "Number of tables:"
 msgstr ""
 
+#: templates/database/structure/body_for_table_summary.phtml:6
+#, php-format
+msgid "%s table"
+msgid_plural "%s tables"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templates/database/structure/body_for_table_summary.phtml:17
+msgid "Sum"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:6
+msgid "Check tables having overhead"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:10
+msgid "Show create"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:27
+msgid "Prefix"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:28
+msgid "Add prefix to table"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:29
+msgid "Replace table prefix"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:30
+msgid "Copy table with prefix"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:36
+msgid "Add columns to central list"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:37
+msgid "Remove columns from central list"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:38
+msgid "Make consistent with central list"
+msgstr ""
+
+#: templates/database/structure/favorite_anchor.phtml:12
+msgid "Add to Favorites"
+msgstr ""
+
+#: templates/database/structure/show_create.phtml:2
+msgid "Showing create queries"
+msgstr ""
+
+#: templates/database/structure/sortable_header.phtml:13
+msgid "Sort"
+msgstr ""
+
+#: templates/database/structure/table_header.phtml:42
+msgid ""
+"May be approximate. Click on the number to get the exact count. See "
+"[doc@faq3-11]FAQ 3.11[/doc]."
+msgstr ""
+
+#: templates/database/structure/table_header.phtml:66
+#: templates/table/index_form.phtml:127
+msgid "Size"
+msgstr ""
+
+#: templates/database/structure/table_header.phtml:74
+#: templates/table/structure/display_table_stats.phtml:27
+msgid "Overhead"
+msgstr ""
+
+#: templates/database/structure/tracking_icon.phtml:4
+msgid "Tracking is active."
+msgstr ""
+
+#: templates/database/structure/tracking_icon.phtml:8
+msgid "Tracking is not active."
+msgstr ""
+
 #: templates/error/report_form.phtml:7
 msgid ""
 "phpMyAdmin has encountered an error. We have collected data about this error "
@@ -13982,61 +14091,6 @@ msgstr ""
 msgid "Please explain the steps that lead to the error:"
 msgstr ""
 
-#: templates/gis_visualization/gis_visualization.phtml:3
-msgid "Display GIS Visualization"
-msgstr ""
-
-#: templates/gis_visualization/gis_visualization.phtml:8
-msgid "Label column"
-msgstr ""
-
-#: templates/gis_visualization/gis_visualization.phtml:11
-msgid "-- None --"
-msgstr ""
-
-#: templates/gis_visualization/gis_visualization.phtml:19
-msgid "Spatial column"
-msgstr ""
-
-#: templates/index_form.phtml:16
-msgid "Index name:"
-msgstr ""
-
-#: templates/index_form.phtml:19
-msgid ""
-"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
-msgstr ""
-
-#: templates/index_form.phtml:40
-msgid "Index choice:"
-msgstr ""
-
-#: templates/index_form.phtml:57
-msgid "Key block size:"
-msgstr ""
-
-#: templates/index_form.phtml:74
-msgid "Index type:"
-msgstr ""
-
-#: templates/index_form.phtml:86
-#, fuzzy
-#| msgid "User:"
-msgid "Parser:"
-msgstr "Gebroeker:"
-
-#: templates/index_form.phtml:102
-msgid "Comment:"
-msgstr ""
-
-#: templates/index_form.phtml:127 templates/structure/table_header.phtml:66
-msgid "Size"
-msgstr ""
-
-#: templates/index_form.phtml:149 templates/index_form.phtml:190
-msgid "Drag to reorder"
-msgstr ""
-
 #: templates/prefs_autoload.phtml:9
 msgid ""
 "Your browser has phpMyAdmin configuration for this domain. Would you like to "
@@ -14047,402 +14101,371 @@ msgstr ""
 msgid "Start row:"
 msgstr ""
 
-#: templates/structure/actions_in_table_structure.phtml:14
-#, php-format
-msgid "A primary key has been added on %s."
-msgstr ""
-
-#: templates/structure/actions_in_table_structure.phtml:34
-#: templates/structure/actions_in_table_structure.phtml:54
-#: templates/structure/actions_in_table_structure.phtml:79
-#: templates/structure/actions_in_table_structure.phtml:101
-#, php-format
-msgid "An index has been added on %s."
-msgstr ""
-
-#: templates/structure/actions_in_table_structure.phtml:130
-#: templates/structure/check_all_table_column.phtml:59
-msgid "Remove from central columns"
-msgstr ""
-
-#: templates/structure/actions_in_table_structure.phtml:138
-#: templates/structure/check_all_table_column.phtml:55
-msgid "Add to central columns"
-msgstr ""
-
-#: templates/structure/add_column.phtml:7
-#, php-format
-msgid "Add %s column(s)"
-msgstr ""
-
-#: templates/structure/add_column.phtml:12
-msgid "at beginning of table"
-msgstr ""
-
-#: templates/structure/body_for_table_summary.phtml:6
-#, php-format
-msgid "%s table"
-msgid_plural "%s tables"
-msgstr[0] ""
-msgstr[1] ""
-
-#: templates/structure/body_for_table_summary.phtml:17
-msgid "Sum"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:6
-msgid "Check tables having overhead"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:10
-msgid "Show create"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:27
-msgid "Prefix"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:28
-msgid "Add prefix to table"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:29
-msgid "Replace table prefix"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:30
-msgid "Copy table with prefix"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:36
-msgid "Add columns to central list"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:37
-msgid "Remove columns from central list"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:38
-msgid "Make consistent with central list"
-msgstr ""
-
-#: templates/structure/display_structure.phtml:140 view_create.php:181
-msgid "Edit view"
-msgstr ""
-
-#: templates/structure/display_table_stats.phtml:9
-msgid "Space usage"
-msgstr ""
-
-#: templates/structure/display_table_stats.phtml:27
-#: templates/structure/table_header.phtml:74
-msgid "Overhead"
-msgstr ""
-
-#: templates/structure/display_table_stats.phtml:32
-msgid "Effective"
-msgstr ""
-
-#: templates/structure/favorite_anchor.phtml:12
-msgid "Add to Favorites"
-msgstr ""
-
-#: templates/structure/move_columns_dialog.phtml:1
-#: templates/structure/optional_action_links.phtml:21
-msgid "Move columns"
-msgstr ""
-
-#: templates/structure/move_columns_dialog.phtml:2
-msgid "Move the columns by dragging them up and down."
-msgstr ""
-
-#: templates/structure/optional_action_links.phtml:9
-msgid "Propose table structure"
-msgstr ""
-
-#: templates/structure/optional_action_links.phtml:24
-msgid "Improve table structure"
-msgstr ""
-
-#: templates/structure/optional_action_links.phtml:30
-msgid "Track view"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:3
-msgid "Row statistics"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:9
-msgid "static"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:11
-msgid "dynamic"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:22
-msgid "partitioned"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:54
-msgid "Row length"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:66
-msgid "Row size"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:73
-msgid "Next autoindex"
-msgstr ""
-
-#: templates/structure/secondary_tabs.phtml:14
-msgid "Relation view"
-msgstr ""
-
-#: templates/structure/show_create.phtml:2
-msgid "Showing create queries"
-msgstr ""
-
-#: templates/structure/sortable_header.phtml:13
-msgid "Sort"
-msgstr ""
-
-#: templates/structure/table_header.phtml:42
-msgid ""
-"May be approximate. Click on the number to get the exact count. See "
-"[doc@faq3-11]FAQ 3.11[/doc]."
-msgstr ""
-
-#: templates/structure/table_structure_row.phtml:46
-#, php-format
-msgid "Column %s has been dropped."
-msgstr ""
-
-#: templates/structure/tracking_icon.phtml:4
-msgid "Tracking is active."
-msgstr ""
-
-#: templates/structure/tracking_icon.phtml:8
-msgid "Tracking is not active."
-msgstr ""
-
-#: templates/table/create_table.phtml:15
-msgid "Number of columns"
-msgstr ""
-
-#: templates/table/options.phtml:8
-msgid "Select columns (at least one):"
-msgstr ""
-
-#: templates/table/options.phtml:37
-msgid "Add search conditions (body of the \"where\" clause):"
-msgstr ""
-
-#: templates/table/options.phtml:45
-msgid "Number of rows per page"
-msgstr ""
-
-#: templates/table/options.phtml:56
-msgid "Display order:"
-msgstr ""
-
-#: templates/table/options_zoom.phtml:6
-msgid "Use this column to label each point"
-msgstr ""
-
-#: templates/table/options_zoom.phtml:35
-msgid "Maximum rows to plot"
-msgstr ""
-
-#: templates/table/replace_preview.phtml:13
-msgid "Find and replace - preview"
-msgstr ""
-
-#: templates/table/replace_preview.phtml:18
-msgid "Original string"
-msgstr ""
-
-#: templates/table/replace_preview.phtml:19
-msgid "Replaced string"
-msgstr ""
-
-#: templates/table/replace_preview.phtml:40
-msgid "Replace"
-msgstr ""
-
-#: templates/table/rows_zoom.phtml:16
-msgid "Additional search criteria"
-msgstr ""
-
-#: templates/table/search_and_replace.phtml:3
-msgid "Replace with:"
-msgstr ""
-
-#: templates/table/search_and_replace.phtml:22
-msgid "Use regular expression"
-msgstr ""
-
-#: templates/table/selection_form.phtml:12
-msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
-msgstr ""
-
-#: templates/table/selection_form.phtml:34
-msgid "Do a \"query by example\" (wildcard: \"%\")"
-msgstr ""
-
-#: templates/table/zoom_result_form.phtml:7
-msgid "Browse/Edit the points"
-msgstr ""
-
-#: templates/table/zoom_result_form.phtml:15
-msgid "How to use"
-msgstr ""
-
-#: templates/table/zoom_result_form.phtml:23
-msgid "Reset zoom"
-msgstr ""
-
-#: templates/tbl_chart.phtml:17
+#: templates/table/chart/tbl_chart.phtml:17
 msgctxt "Chart type"
 msgid "Bar"
 msgstr ""
 
-#: templates/tbl_chart.phtml:21
+#: templates/table/chart/tbl_chart.phtml:21
 msgctxt "Chart type"
 msgid "Column"
 msgstr ""
 
-#: templates/tbl_chart.phtml:25
+#: templates/table/chart/tbl_chart.phtml:25
 msgctxt "Chart type"
 msgid "Line"
 msgstr ""
 
-#: templates/tbl_chart.phtml:29
+#: templates/table/chart/tbl_chart.phtml:29
 msgctxt "Chart type"
 msgid "Spline"
 msgstr ""
 
-#: templates/tbl_chart.phtml:33
+#: templates/table/chart/tbl_chart.phtml:33
 msgctxt "Chart type"
 msgid "Area"
 msgstr ""
 
-#: templates/tbl_chart.phtml:37
+#: templates/table/chart/tbl_chart.phtml:37
 msgctxt "Chart type"
 msgid "Pie"
 msgstr ""
 
-#: templates/tbl_chart.phtml:41
+#: templates/table/chart/tbl_chart.phtml:41
 msgctxt "Chart type"
 msgid "Timeline"
 msgstr ""
 
-#: templates/tbl_chart.phtml:45
+#: templates/table/chart/tbl_chart.phtml:45
 msgctxt "Chart type"
 msgid "Scatter"
 msgstr ""
 
-#: templates/tbl_chart.phtml:50
+#: templates/table/chart/tbl_chart.phtml:50
 msgid "Stacked"
 msgstr ""
 
-#: templates/tbl_chart.phtml:53
+#: templates/table/chart/tbl_chart.phtml:53
 msgid "Chart title"
 msgstr ""
 
-#: templates/tbl_chart.phtml:57
+#: templates/table/chart/tbl_chart.phtml:57
 msgid "X-Axis:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:72
+#: templates/table/chart/tbl_chart.phtml:72
 msgid "Series:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:102
+#: templates/table/chart/tbl_chart.phtml:102
 msgid "X-Axis label:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:104
+#: templates/table/chart/tbl_chart.phtml:104
 msgid "X Values"
 msgstr ""
 
-#: templates/tbl_chart.phtml:107
+#: templates/table/chart/tbl_chart.phtml:107
 msgid "Y-Axis label:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:115
+#: templates/table/chart/tbl_chart.phtml:115
 msgid "Series names are in a column"
 msgstr ""
 
-#: templates/tbl_chart.phtml:118
+#: templates/table/chart/tbl_chart.phtml:118
 msgid "Series column:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:130
+#: templates/table/chart/tbl_chart.phtml:130
 msgid "Value Column:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:150
+#: templates/table/chart/tbl_chart.phtml:150
 msgid "Save chart as image"
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:7
+#: templates/table/gis_visualization/gis_visualization.phtml:3
+msgid "Display GIS Visualization"
+msgstr ""
+
+#: templates/table/gis_visualization/gis_visualization.phtml:8
+msgid "Label column"
+msgstr ""
+
+#: templates/table/gis_visualization/gis_visualization.phtml:11
+msgid "-- None --"
+msgstr ""
+
+#: templates/table/gis_visualization/gis_visualization.phtml:19
+msgid "Spatial column"
+msgstr ""
+
+#: templates/table/index_form.phtml:16
+msgid "Index name:"
+msgstr ""
+
+#: templates/table/index_form.phtml:19
+msgid ""
+"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
+msgstr ""
+
+#: templates/table/index_form.phtml:40
+msgid "Index choice:"
+msgstr ""
+
+#: templates/table/index_form.phtml:57
+msgid "Key block size:"
+msgstr ""
+
+#: templates/table/index_form.phtml:74
+msgid "Index type:"
+msgstr ""
+
+#: templates/table/index_form.phtml:86
+#, fuzzy
+#| msgid "User:"
+msgid "Parser:"
+msgstr "Gebroeker:"
+
+#: templates/table/index_form.phtml:102
+msgid "Comment:"
+msgstr ""
+
+#: templates/table/index_form.phtml:149 templates/table/index_form.phtml:190
+msgid "Drag to reorder"
+msgstr ""
+
+#: templates/table/relation/common_form.phtml:7
 msgid "Internal relations"
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:11
+#: templates/table/relation/common_form.phtml:11
 msgid "Internal relation"
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:14
+#: templates/table/relation/common_form.phtml:14
 msgid ""
 "An internal relation is not necessary when a corresponding FOREIGN KEY "
 "relation exists."
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:37
+#: templates/table/relation/common_form.phtml:37
 msgid "Foreign key constraints"
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:40
+#: templates/table/relation/common_form.phtml:40
 msgid "Actions"
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:41
+#: templates/table/relation/common_form.phtml:41
 msgid "Constraint properties"
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:44
+#: templates/table/relation/common_form.phtml:44
 msgid ""
 "Only columns with index will be displayed. You can define an index below."
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:49
+#: templates/table/relation/common_form.phtml:49
 msgid "Foreign key constraint"
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:81
+#: templates/table/relation/common_form.phtml:81
 msgid "+ Add constraint"
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:91
+#: templates/table/relation/common_form.phtml:91
 msgid "Choose column to display:"
 msgstr ""
 
-#: templates/tbl_relation/foreign_key_row.phtml:13
+#: templates/table/relation/foreign_key_row.phtml:13
 #, php-format
 msgid "Foreign key constraint %s has been dropped"
 msgstr ""
 
-#: templates/tbl_relation/foreign_key_row.phtml:102
+#: templates/table/relation/foreign_key_row.phtml:102
 msgid "Constraint name"
 msgstr ""
 
-#: templates/tbl_relation/foreign_key_row.phtml:157
+#: templates/table/relation/foreign_key_row.phtml:157
 msgid "+ Add column"
 msgstr ""
 
+#: templates/table/search/options.phtml:8
+msgid "Select columns (at least one):"
+msgstr ""
+
+#: templates/table/search/options.phtml:37
+msgid "Add search conditions (body of the \"where\" clause):"
+msgstr ""
+
+#: templates/table/search/options.phtml:45
+msgid "Number of rows per page"
+msgstr ""
+
+#: templates/table/search/options.phtml:56
+msgid "Display order:"
+msgstr ""
+
+#: templates/table/search/options_zoom.phtml:6
+msgid "Use this column to label each point"
+msgstr ""
+
+#: templates/table/search/options_zoom.phtml:35
+msgid "Maximum rows to plot"
+msgstr ""
+
+#: templates/table/search/replace_preview.phtml:13
+msgid "Find and replace - preview"
+msgstr ""
+
+#: templates/table/search/replace_preview.phtml:18
+msgid "Original string"
+msgstr ""
+
+#: templates/table/search/replace_preview.phtml:19
+msgid "Replaced string"
+msgstr ""
+
+#: templates/table/search/replace_preview.phtml:40
+msgid "Replace"
+msgstr ""
+
+#: templates/table/search/rows_zoom.phtml:16
+msgid "Additional search criteria"
+msgstr ""
+
+#: templates/table/search/search_and_replace.phtml:3
+msgid "Replace with:"
+msgstr ""
+
+#: templates/table/search/search_and_replace.phtml:22
+msgid "Use regular expression"
+msgstr ""
+
+#: templates/table/search/selection_form.phtml:12
+msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
+msgstr ""
+
+#: templates/table/search/selection_form.phtml:34
+msgid "Do a \"query by example\" (wildcard: \"%\")"
+msgstr ""
+
+#: templates/table/search/zoom_result_form.phtml:7
+msgid "Browse/Edit the points"
+msgstr ""
+
+#: templates/table/search/zoom_result_form.phtml:15
+msgid "How to use"
+msgstr ""
+
+#: templates/table/search/zoom_result_form.phtml:23
+msgid "Reset zoom"
+msgstr ""
+
+#: templates/table/secondary_tabs.phtml:14
+msgid "Relation view"
+msgstr ""
+
+#: templates/table/structure/actions_in_table_structure.phtml:14
+#, php-format
+msgid "A primary key has been added on %s."
+msgstr ""
+
+#: templates/table/structure/actions_in_table_structure.phtml:34
+#: templates/table/structure/actions_in_table_structure.phtml:54
+#: templates/table/structure/actions_in_table_structure.phtml:79
+#: templates/table/structure/actions_in_table_structure.phtml:101
+#, php-format
+msgid "An index has been added on %s."
+msgstr ""
+
+#: templates/table/structure/actions_in_table_structure.phtml:130
+#: templates/table/structure/check_all_table_column.phtml:59
+msgid "Remove from central columns"
+msgstr ""
+
+#: templates/table/structure/actions_in_table_structure.phtml:138
+#: templates/table/structure/check_all_table_column.phtml:55
+msgid "Add to central columns"
+msgstr ""
+
+#: templates/table/structure/add_column.phtml:7
+#, php-format
+msgid "Add %s column(s)"
+msgstr ""
+
+#: templates/table/structure/add_column.phtml:12
+msgid "at beginning of table"
+msgstr ""
+
+#: templates/table/structure/display_structure.phtml:140 view_create.php:181
+msgid "Edit view"
+msgstr ""
+
+#: templates/table/structure/display_table_stats.phtml:9
+msgid "Space usage"
+msgstr ""
+
+#: templates/table/structure/display_table_stats.phtml:32
+msgid "Effective"
+msgstr ""
+
+#: templates/table/structure/move_columns_dialog.phtml:1
+#: templates/table/structure/optional_action_links.phtml:21
+msgid "Move columns"
+msgstr ""
+
+#: templates/table/structure/move_columns_dialog.phtml:2
+msgid "Move the columns by dragging them up and down."
+msgstr ""
+
+#: templates/table/structure/optional_action_links.phtml:9
+msgid "Propose table structure"
+msgstr ""
+
+#: templates/table/structure/optional_action_links.phtml:24
+msgid "Improve table structure"
+msgstr ""
+
+#: templates/table/structure/optional_action_links.phtml:30
+msgid "Track view"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:3
+msgid "Row statistics"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:9
+msgid "static"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:11
+msgid "dynamic"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:22
+msgid "partitioned"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:54
+msgid "Row length"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:66
+msgid "Row size"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:73
+msgid "Next autoindex"
+msgstr ""
+
+#: templates/table/structure/table_structure_row.phtml:46
+#, php-format
+msgid "Column %s has been dropped."
+msgstr ""
+
 #: themes.php:17 themes.php:22
 msgid "Theme"
 msgstr ""
diff --git a/po/lt.po b/po/lt.po
index 89600e6209..927eafa4d6 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 4.5.0-dev\n"
 "Report-Msgid-Bugs-To: developers@phpmyadmin.net\n"
-"POT-Creation-Date: 2015-08-08 13:53-0400\n"
+"POT-Creation-Date: 2015-08-12 08:10-0400\n"
 "PO-Revision-Date: 2015-02-15 18:57+0200\n"
 "Last-Translator: Vytautas Motuzas <v.motuzas@gmail.com>\n"
 "Language-Team: Lithuanian <https://hosted.weblate.org/projects/phpmyadmin/"
@@ -56,7 +56,7 @@ msgid "Table comments:"
 msgstr "Lentelės komentarai:"
 
 #: db_datadict.php:104 libraries/Index.class.php:699
-#: libraries/insert_edit.lib.php:1567
+#: libraries/insert_edit.lib.php:1565
 #: libraries/navigation/Nodes/Node_Column.class.php:30
 #: libraries/plugins/export/ExportHtmlword.class.php:280
 #: libraries/plugins/export/ExportHtmlword.class.php:375
@@ -70,13 +70,14 @@ msgstr "Lentelės komentarai:"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1023
 #: libraries/tracking.lib.php:879 libraries/tracking.lib.php:975
 #: templates/columns_definitions/column_name.phtml:18
-#: templates/index_form.phtml:124 templates/table/table_header.phtml:6
-#: templates/table/zoom_result_form.phtml:33
-#: templates/tbl_relation/common_form.phtml:10
-#: templates/tbl_relation/common_form.phtml:43
-#: templates/tbl_relation/foreign_key_row.phtml:194
-#: templates/tbl_relation/foreign_key_row.phtml:206
-#: templates/tbl_relation/internal_relational_row.phtml:71
+#: templates/table/index_form.phtml:124
+#: templates/table/relation/common_form.phtml:10
+#: templates/table/relation/common_form.phtml:43
+#: templates/table/relation/foreign_key_row.phtml:194
+#: templates/table/relation/foreign_key_row.phtml:206
+#: templates/table/relation/internal_relational_row.phtml:71
+#: templates/table/search/table_header.phtml:6
+#: templates/table/search/zoom_result_form.phtml:33
 msgid "Column"
 msgstr "Stulpelis"
 
@@ -94,21 +95,21 @@ msgstr "Stulpelis"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1001
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1024
 #: libraries/rte/rte_list.lib.php:75 libraries/rte/rte_list.lib.php:103
-#: libraries/rte/rte_routines.lib.php:802
-#: libraries/rte/rte_routines.lib.php:831
-#: libraries/rte/rte_routines.lib.php:1493
+#: libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_routines.lib.php:922
+#: libraries/rte/rte_routines.lib.php:1584
 #: libraries/server_privileges.lib.php:2369 libraries/tracking.lib.php:880
 #: libraries/tracking.lib.php:972
 #: templates/columns_definitions/table_fields_definitions.phtml:11
-#: templates/structure/table_header.phtml:48
-#: templates/structure/table_structure_header.phtml:6
-#: templates/table/table_header.phtml:7
+#: templates/database/structure/table_header.phtml:48
+#: templates/table/search/table_header.phtml:7
+#: templates/table/structure/table_structure_header.phtml:6
 msgid "Type"
 msgstr "Tipas"
 
 #: db_datadict.php:106 libraries/Index.class.php:702
 #: libraries/central_columns.lib.php:708
-#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1576
+#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1574
 #: libraries/plugins/export/ExportHtmlword.class.php:286
 #: libraries/plugins/export/ExportHtmlword.class.php:381
 #: libraries/plugins/export/ExportLatex.class.php:509
@@ -121,8 +122,8 @@ msgstr "Tipas"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1026
 #: libraries/tracking.lib.php:882 libraries/tracking.lib.php:978
 #: templates/columns_definitions/table_fields_definitions.phtml:39
-#: templates/structure/table_structure_header.phtml:9
-#: templates/table/zoom_result_form.phtml:34
+#: templates/table/search/zoom_result_form.phtml:34
+#: templates/table/structure/table_structure_header.phtml:9
 msgid "Null"
 msgstr "Null"
 
@@ -140,8 +141,8 @@ msgstr "Null"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1027
 #: libraries/replication_gui.lib.php:153 libraries/tracking.lib.php:883
 #: templates/columns_definitions/table_fields_definitions.phtml:25
-#: templates/structure/body_for_table_summary.phtml:55
-#: templates/structure/table_structure_header.phtml:10
+#: templates/database/structure/body_for_table_summary.phtml:55
+#: templates/table/structure/table_structure_header.phtml:10
 msgid "Default"
 msgstr "Nutylint"
 
@@ -169,19 +170,19 @@ msgid "Comments"
 msgstr "Komentarai"
 
 #: db_datadict.php:146
-#: libraries/controllers/StructureController.class.php:1960
-#: libraries/controllers/StructureController.class.php:1965
+#: libraries/controllers/TableStructureController.class.php:951
+#: libraries/controllers/TableStructureController.class.php:956
 #: libraries/tracking.lib.php:922
 #: templates/columns_definitions/column_indexes.phtml:6
-#: templates/structure/check_all_table_column.phtml:22
-#: templates/structure/display_structure.phtml:74
+#: templates/table/structure/check_all_table_column.phtml:22
+#: templates/table/structure/display_structure.phtml:74
 msgid "Primary"
 msgstr "Pirminis"
 
 #: db_datadict.php:156 js/messages.php:317 libraries/Index.class.php:567
 #: libraries/Index.class.php:606 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261 libraries/mult_submits.lib.php:403
+#: libraries/config/FormDisplay.tpl.php:272 libraries/mult_submits.lib.php:403
 #: libraries/mult_submits.lib.php:417
 #: libraries/plugins/export/ExportHtmlword.class.php:630
 #: libraries/plugins/export/ExportLatex.class.php:589
@@ -197,20 +198,20 @@ msgstr "Pirminis"
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1010 libraries/tracking.lib.php:1015
 #: prefs_manage.php:140 templates/prefs_autoload.phtml:15
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "No"
 msgstr "Ne"
 
 #: db_datadict.php:156 js/messages.php:443 libraries/Index.class.php:568
 #: libraries/Index.class.php:605 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261
-#: libraries/controllers/StructureController.class.php:1344
-#: libraries/controllers/StructureController.class.php:2223
-#: libraries/controllers/StructureController.class.php:2232
-#: libraries/controllers/StructureController.class.php:2237
-#: libraries/controllers/StructureController.class.php:2242
-#: libraries/controllers/StructureController.class.php:2247
+#: libraries/config/FormDisplay.tpl.php:272
+#: libraries/controllers/TableStructureController.class.php:539
+#: libraries/controllers/TableStructureController.class.php:1201
+#: libraries/controllers/TableStructureController.class.php:1210
+#: libraries/controllers/TableStructureController.class.php:1215
+#: libraries/controllers/TableStructureController.class.php:1220
+#: libraries/controllers/TableStructureController.class.php:1225
 #: libraries/mult_submits.inc.php:82 libraries/mult_submits.inc.php:178
 #: libraries/mult_submits.lib.php:339 libraries/mult_submits.lib.php:372
 #: libraries/mult_submits.lib.php:401 libraries/mult_submits.lib.php:415
@@ -219,8 +220,8 @@ msgstr "Ne"
 #: libraries/plugins/export/ExportOdt.class.php:756
 #: libraries/plugins/export/ExportTexytext.class.php:567
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1077
-#: libraries/server_databases.lib.php:464
-#: libraries/server_databases.lib.php:474
+#: libraries/server_databases.lib.php:475
+#: libraries/server_databases.lib.php:485
 #: libraries/server_privileges.lib.php:2546
 #: libraries/server_privileges.lib.php:2727
 #: libraries/server_privileges.lib.php:2748
@@ -230,7 +231,7 @@ msgstr "Ne"
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1008 libraries/tracking.lib.php:1013
 #: prefs_manage.php:138 templates/prefs_autoload.phtml:14
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "Yes"
 msgstr "Taip"
 
@@ -240,7 +241,7 @@ msgstr "Peržiūrėti duomenų bazės atvaizdį (schemą)"
 
 #: db_export.php:37 db_tracking.php:90 export.php:382
 #: libraries/DBQbe.class.php:326
-#: libraries/controllers/StructureController.class.php:231
+#: libraries/controllers/DatabaseStructureController.class.php:170
 #: libraries/navigation/NavigationTree.class.php:897
 msgid "No tables found in database."
 msgstr "Duomenų bazėje nerasta lentelių."
@@ -251,14 +252,14 @@ msgstr "Duomenų bazėje nerasta lentelių."
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:26
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:120
-#: templates/structure/show_create.phtml:18
+#: templates/database/structure/show_create.phtml:18
 msgid "Tables"
 msgstr "Lentelės"
 
 #: db_export.php:52 libraries/Menu.class.php:317 libraries/Menu.class.php:425
-#: libraries/Util.class.php:3333 libraries/Util.class.php:3343
-#: libraries/Util.class.php:3349 libraries/Util.class.php:3629
-#: libraries/Util.class.php:4327 libraries/Util.class.php:4344
+#: libraries/Util.class.php:3339 libraries/Util.class.php:3349
+#: libraries/Util.class.php:3355 libraries/Util.class.php:3635
+#: libraries/Util.class.php:4333 libraries/Util.class.php:4350
 #: libraries/central_columns.lib.php:728 libraries/config.values.php:39
 #: libraries/config.values.php:47 libraries/config.values.php:109
 #: libraries/config.values.php:115 libraries/config/setup.forms.php:323
@@ -272,7 +273,7 @@ msgstr "Lentelės"
 #: libraries/navigation/Nodes/Node_Table.class.php:283
 #: libraries/server_privileges.lib.php:1141 libraries/tracking.lib.php:874
 #: templates/columns_definitions/table_fields_definitions.phtml:3
-#: templates/designer/table_list.phtml:28
+#: templates/database/designer/table_list.phtml:28
 msgid "Structure"
 msgstr "Struktūra"
 
@@ -284,7 +285,7 @@ msgstr "Struktūra"
 #: libraries/config/user_preferences.forms.php:292
 #: libraries/config/user_preferences.forms.php:297
 #: libraries/server_privileges.lib.php:1140
-#: templates/structure/display_table_stats.phtml:12
+#: templates/table/structure/display_table_stats.phtml:12
 msgid "Data"
 msgstr "Duomenys"
 
@@ -360,10 +361,10 @@ msgstr "Sekamos lentelės"
 #: libraries/server_privileges.lib.php:2908
 #: libraries/server_privileges.lib.php:3145
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4346
-#: templates/structure/table_header.phtml:21
-#: templates/tbl_relation/foreign_key_row.phtml:176
-#: templates/tbl_relation/internal_relational_row.phtml:63
+#: libraries/server_privileges.lib.php:4372
+#: templates/database/structure/table_header.phtml:21
+#: templates/table/relation/foreign_key_row.phtml:176
+#: templates/table/relation/internal_relational_row.phtml:63
 msgid "Table"
 msgstr "Lentelė"
 
@@ -380,7 +381,7 @@ msgid "Updated"
 msgstr "Atnaujinta"
 
 #: db_tracking.php:130 js/messages.php:243 libraries/Menu.class.php:552
-#: libraries/Util.class.php:4314 libraries/config.values.php:104
+#: libraries/Util.class.php:4320 libraries/config.values.php:104
 #: libraries/rte/rte_events.lib.php:393 libraries/rte/rte_list.lib.php:101
 #: libraries/server_status_processes.lib.php:92 libraries/tracking.lib.php:279
 msgid "Status"
@@ -389,14 +390,15 @@ msgstr "Būsena"
 #: db_tracking.php:131 db_tracking.php:290 libraries/Index.class.php:693
 #: libraries/central_columns.lib.php:687 libraries/rte/rte_list.lib.php:74
 #: libraries/rte/rte_list.lib.php:89 libraries/rte/rte_list.lib.php:102
-#: libraries/server_databases.lib.php:398
+#: libraries/server_databases.lib.php:409
 #: libraries/server_privileges.lib.php:2372
 #: libraries/server_privileges.lib.php:3166
 #: libraries/server_privileges.lib.php:3342
 #: libraries/server_user_groups.lib.php:82
 #: libraries/server_variables.lib.php:189 libraries/tracking.lib.php:280
-#: libraries/tracking.lib.php:793 templates/structure/table_header.phtml:30
-#: templates/structure/table_structure_header.phtml:23
+#: libraries/tracking.lib.php:793
+#: templates/database/structure/table_header.phtml:30
+#: templates/table/structure/table_structure_header.phtml:23
 msgid "Action"
 msgstr "Veiksmas"
 
@@ -440,7 +442,7 @@ msgid "Untracked tables"
 msgstr "Nesekamos lentelės"
 
 #: db_tracking.php:305 db_tracking.php:336
-#: templates/structure/optional_action_links.phtml:17
+#: templates/table/structure/optional_action_links.phtml:17
 msgid "Track table"
 msgstr "Sekti lentelę"
 
@@ -490,7 +492,7 @@ msgid "Value for the column \"%s\""
 msgstr "Reikšmė „%s“ stulpeliui"
 
 #: gis_data_editor.php:146
-#: templates/gis_visualization/gis_visualization.phtml:37
+#: templates/table/gis_visualization/gis_visualization.phtml:37
 msgid "Use OpenStreetMaps as Base Layer"
 msgstr "Naudoti OpenStreetMaps kaip pagrindinį sluoksnį"
 
@@ -571,35 +573,35 @@ msgstr "Pridėti geometriją"
 #: libraries/display_change_password.lib.php:162
 #: libraries/display_export.lib.php:402 libraries/display_export.lib.php:408
 #: libraries/display_import.lib.php:392 libraries/index.lib.php:44
-#: libraries/insert_edit.lib.php:1546 libraries/insert_edit.lib.php:1583
+#: libraries/insert_edit.lib.php:1544 libraries/insert_edit.lib.php:1581
 #: libraries/normalization.lib.php:165 libraries/normalization.lib.php:821
 #: libraries/operations.lib.php:38 libraries/operations.lib.php:108
 #: libraries/operations.lib.php:263 libraries/operations.lib.php:306
 #: libraries/operations.lib.php:801 libraries/operations.lib.php:874
 #: libraries/operations.lib.php:923 libraries/operations.lib.php:1337
 #: libraries/operations.lib.php:1658
-#: libraries/plugins/auth/AuthenticationCookie.class.php:244
+#: libraries/plugins/auth/AuthenticationCookie.class.php:232
 #: libraries/replication_gui.lib.php:122 libraries/replication_gui.lib.php:161
 #: libraries/replication_gui.lib.php:324 libraries/replication_gui.lib.php:461
 #: libraries/replication_gui.lib.php:906 libraries/rte/rte_events.lib.php:509
-#: libraries/rte/rte_routines.lib.php:969
-#: libraries/rte/rte_routines.lib.php:1581
+#: libraries/rte/rte_routines.lib.php:1060
+#: libraries/rte/rte_routines.lib.php:1672
 #: libraries/rte/rte_triggers.lib.php:396 libraries/server_bin_log.lib.php:61
 #: libraries/server_privileges.lib.php:705
 #: libraries/server_privileges.lib.php:2106
 #: libraries/server_privileges.lib.php:2872
 #: libraries/server_privileges.lib.php:3553
-#: libraries/server_privileges.lib.php:4627
+#: libraries/server_privileges.lib.php:4653
 #: libraries/server_user_groups.lib.php:285
 #: libraries/sql_query_form.lib.php:369 libraries/sql_query_form.lib.php:429
 #: libraries/tracking.lib.php:533 libraries/tracking.lib.php:653
 #: prefs_manage.php:277 prefs_manage.php:355
 #: templates/columns_definitions/column_definitions_form.phtml:59
-#: templates/header_location.phtml:17 templates/index_form.phtml:238
+#: templates/database/create_table.phtml:21 templates/header_location.phtml:28
 #: templates/startAndNumberOfRowsPanel.phtml:14
-#: templates/structure/add_column.phtml:25
-#: templates/table/create_table.phtml:21
-#: templates/table/selection_form.phtml:75 view_create.php:275
+#: templates/table/index_form.phtml:238
+#: templates/table/search/selection_form.phtml:75
+#: templates/table/structure/add_column.phtml:25 view_create.php:275
 #: view_operations.php:106
 msgid "Go"
 msgstr "Vykdyti"
@@ -694,7 +696,7 @@ msgstr ""
 msgid "Could not load import plugins, please check your installation!"
 msgstr "Nepavyko įkelti importuotų įskiepių, prašome patikrinti įdiegimą!"
 
-#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1466
+#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1460
 #, fuzzy, php-format
 #| msgid "Bookmark %s created"
 msgid "Bookmark %s has been created."
@@ -737,13 +739,13 @@ msgstr ""
 msgid "Back"
 msgstr "Atgal"
 
-#: index.php:148 libraries/Footer.class.php:70
+#: index.php:149 libraries/Footer.class.php:70
 #, fuzzy
 #| msgid "phpMyAdmin homepage"
 msgid "phpMyAdmin Demo Server"
 msgstr "phpMyAdmin tinklalapis"
 
-#: index.php:152
+#: index.php:153
 #, php-format
 msgid ""
 "You are using the demo server. You can do anything here, but please do not "
@@ -751,42 +753,42 @@ msgid ""
 "at %s."
 msgstr ""
 
-#: index.php:162
+#: index.php:163
 msgid "General Settings"
 msgstr "Pagrindiniai nustatymai"
 
-#: index.php:190 libraries/display_change_password.lib.php:50
+#: index.php:191 libraries/display_change_password.lib.php:50
 #: libraries/display_change_password.lib.php:53 user_password.php:247
 msgid "Change password"
 msgstr "Pakeisti slaptažodį"
 
-#: index.php:206
+#: index.php:207
 msgid "Server connection collation"
 msgstr "Serverio ryšio palyginimas"
 
-#: index.php:228
+#: index.php:229
 msgid "Appearance Settings"
 msgstr "Išvaizdos nustatymai"
 
-#: index.php:258 prefs_manage.php:285
+#: index.php:259 prefs_manage.php:285
 msgid "More settings"
 msgstr "Daugiau nustatymų"
 
-#: index.php:279
+#: index.php:280
 msgid "Database server"
 msgstr "Duomenų bazės serveris"
 
-#: index.php:282 libraries/plugins/auth/AuthenticationCookie.class.php:181
+#: index.php:283 libraries/plugins/auth/AuthenticationCookie.class.php:169
 msgid "Server:"
 msgstr "Darbinė stotis:"
 
-#: index.php:286
+#: index.php:287
 #, fuzzy
 #| msgid "Server port"
 msgid "Server type:"
 msgstr "Serverio jungtis"
 
-#: index.php:290 libraries/plugins/export/ExportLatex.class.php:212
+#: index.php:291 libraries/plugins/export/ExportLatex.class.php:212
 #: libraries/plugins/export/ExportSql.class.php:687
 #: libraries/plugins/export/ExportXml.class.php:189
 #, fuzzy
@@ -794,83 +796,83 @@ msgstr "Serverio jungtis"
 msgid "Server version:"
 msgstr "Serverio versija"
 
-#: index.php:296
+#: index.php:297
 #, fuzzy
 #| msgid "Protocol version"
 msgid "Protocol version:"
 msgstr "Protokolo versija"
 
-#: index.php:300
+#: index.php:301
 #, fuzzy
 #| msgid "User"
 msgid "User:"
 msgstr "Naudotojas"
 
-#: index.php:305
+#: index.php:306
 #, fuzzy
 #| msgid "Server charset"
 msgid "Server charset:"
 msgstr "Serverio koduotė"
 
-#: index.php:320
+#: index.php:321
 msgid "Web server"
 msgstr "Interneto serveris"
 
-#: index.php:331
+#: index.php:332
 #, fuzzy
 #| msgid "Database client version"
 msgid "Database client version:"
 msgstr "Duomenų bazės kliento versija"
 
-#: index.php:335
+#: index.php:336
 #, fuzzy
 #| msgid "PHP extension"
 msgid "PHP extension:"
 msgstr "PHP plėtinys"
 
-#: index.php:349
+#: index.php:350
 #, fuzzy
 #| msgid "PHP Version"
 msgid "PHP version:"
 msgstr "PHP versija"
 
-#: index.php:360
+#: index.php:361
 msgid "Show PHP information"
 msgstr "Rodyti PHP informaciją"
 
-#: index.php:383
+#: index.php:384
 msgid "Version information:"
 msgstr "Versijos informacija:"
 
-#: index.php:392 libraries/Util.class.php:432 libraries/Util.class.php:495
-#: libraries/config/FormDisplay.tpl.php:151
+#: index.php:393 libraries/Util.class.php:432 libraries/Util.class.php:495
+#: libraries/config/FormDisplay.tpl.php:162
 #: libraries/display_export.lib.php:577 libraries/engines/pbxt.lib.php:162
 #: libraries/navigation/NavigationHeader.class.php:196
 #: libraries/server_variables.lib.php:160
 msgid "Documentation"
 msgstr "Dokumentacija"
 
-#: index.php:399
+#: index.php:400
 msgid "Wiki"
 msgstr "Wiki"
 
-#: index.php:408
+#: index.php:409
 msgid "Official Homepage"
 msgstr "Oficialus phpMyAdmin tinklalapis"
 
-#: index.php:415
+#: index.php:416
 msgid "Contribute"
 msgstr "Prisidėti"
 
-#: index.php:422
+#: index.php:423
 msgid "Get support"
 msgstr "Gauti pagalbą"
 
-#: index.php:429
+#: index.php:430
 msgid "List of changes"
 msgstr "Pakeitimų sąrašas"
 
-#: index.php:451
+#: index.php:452
 #, fuzzy
 #| msgid ""
 #| "Your configuration file contains settings (root with no password) that "
@@ -888,7 +890,7 @@ msgstr ""
 "nesaugi, bei gali būti atvira įsilaužimams, todėl rekomenduotina pakeisti "
 "šias parinktis."
 
-#: index.php:468
+#: index.php:469
 msgid ""
 "You have enabled mbstring.func_overload in your PHP configuration. This "
 "option is incompatible with phpMyAdmin and might cause some data to be "
@@ -897,7 +899,7 @@ msgstr ""
 "Savo PHP konfigūracijoje Jūs įjungėte mbstring.func_overload. Šis nustatymas "
 "nėra suderinamas su phpMyAdmin ir gali pažeisti Jūsų duomenis!"
 
-#: index.php:483
+#: index.php:484
 msgid ""
 "The mbstring PHP extension was not found and you seem to be using a "
 "multibyte charset. Without the mbstring extension phpMyAdmin is unable to "
@@ -907,7 +909,7 @@ msgstr ""
 "simbolių kodaciją. Be mbstring plėtinio phpMyAdmin negali tesingai skaidyti "
 "stringų, todėl galite sulaukti netikėtų rezultatų."
 
-#: index.php:500
+#: index.php:501
 msgid ""
 "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini."
 "session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower than "
@@ -915,17 +917,17 @@ msgid ""
 "expire sooner than configured in phpMyAdmin."
 msgstr ""
 
-#: index.php:519
+#: index.php:520
 msgid ""
 "Login cookie store is lower than cookie validity configured in phpMyAdmin, "
 "because of this, your login will expire sooner than configured in phpMyAdmin."
 msgstr ""
 
-#: index.php:535
+#: index.php:536
 msgid "The configuration file now needs a secret passphrase (blowfish_secret)."
 msgstr "Nustatymų faile nurodykite slaptą frazę (blowfish_secret)."
 
-#: index.php:548
+#: index.php:549
 #, fuzzy
 #| msgid ""
 #| "Directory [code]config[/code], which is used by the setup script, still "
@@ -941,7 +943,7 @@ msgstr ""
 "yra Jūsų phpMyAdmin kataloge. Jūs turėtumėte jį pašalinti iškart po to kai "
 "sukonfigūruosite phpMyAdmin."
 
-#: index.php:564
+#: index.php:565
 #, fuzzy, php-format
 #| msgid ""
 #| "The phpMyAdmin configuration storage is not completely configured, some "
@@ -953,12 +955,12 @@ msgstr ""
 "phpMyAdmin nustatymų saugykla nėra visiškai sukonfigūruota, išplėstinės "
 "funkcijos išjungtos. %sIšsiaiškinkite kodėl%s."
 
-#: index.php:571
+#: index.php:572
 msgid ""
 "Or alternately go to 'Operations' tab of any database to set it up there."
 msgstr ""
 
-#: index.php:620
+#: index.php:621
 #, php-format
 msgid ""
 "Your PHP MySQL library version %s differs from your MySQL server version %s. "
@@ -967,7 +969,7 @@ msgstr ""
 "Jūsų PHP MySQL bibliotekos versija %s skiriasi nuo Jūsų MySQL serverio "
 "versijos %s. Tai gali sukelti nenuspėjamą elgesį."
 
-#: index.php:648
+#: index.php:649
 #, php-format
 msgid ""
 "Server running with Suhosin. Please refer to %sdocumentation%s for possible "
@@ -1134,8 +1136,8 @@ msgstr ""
 msgid "Save & Close"
 msgstr "Išsaugoti į failą"
 
-#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:404
-#: libraries/insert_edit.lib.php:1550 prefs_manage.php:361
+#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:415
+#: libraries/insert_edit.lib.php:1548 prefs_manage.php:361
 #: prefs_manage.php:372
 msgid "Reset"
 msgstr "Atstatyti į pradinę būseną"
@@ -1176,7 +1178,7 @@ msgstr "Pridėti indeksą"
 msgid "Edit Index"
 msgstr "Redaguoti indeksą"
 
-#: js/messages.php:99 templates/index_form.phtml:232
+#: js/messages.php:99 templates/table/index_form.phtml:232
 #, php-format
 msgid "Add %s column(s) to index"
 msgstr "Pridėti %s stulpelį(-ius) į indeksą"
@@ -1205,13 +1207,14 @@ msgstr "Laukų reikšmės apskliaustos su:"
 msgid "Please select column(s) for the index."
 msgstr "Pridėti %s stulpelį(-ius) į indeksą"
 
-#: js/messages.php:106 templates/structure/add_column.phtml:1
+#: js/messages.php:106 templates/table/structure/add_column.phtml:1
 msgid "You have to add at least one column."
 msgstr "Jūs turite pridėti bent vieną stulpelį (ar skiltį)."
 
-#: js/messages.php:109 libraries/insert_edit.lib.php:1548
+#: js/messages.php:109 libraries/insert_edit.lib.php:1546
 #: templates/columns_definitions/column_definitions_form.phtml:162
-#: templates/index_form.phtml:237 templates/tbl_relation/common_form.phtml:106
+#: templates/table/index_form.phtml:237
+#: templates/table/relation/common_form.phtml:106
 msgid "Preview SQL"
 msgstr ""
 
@@ -1234,7 +1237,7 @@ msgid "SQL query:"
 msgstr "SQL užklausa"
 
 #. l10n: Default label for the y-Axis of Charts
-#: js/messages.php:118 templates/tbl_chart.phtml:109
+#: js/messages.php:118 templates/table/chart/tbl_chart.phtml:109
 msgid "Y Values"
 msgstr "Y Reikšmės"
 
@@ -1393,7 +1396,7 @@ msgstr "Išsiųsta baitų"
 msgid "Bytes received"
 msgstr "Gauta baitų"
 
-#: js/messages.php:169 libraries/server_status.lib.php:226
+#: js/messages.php:169 libraries/server_status.lib.php:235
 msgid "Connections"
 msgstr "Prisijungimai"
 
@@ -1450,12 +1453,12 @@ msgstr "%d lentelė(-ės)"
 msgid "Questions"
 msgstr ""
 
-#: js/messages.php:184 libraries/server_status.lib.php:134
+#: js/messages.php:184 libraries/server_status.lib.php:143
 msgid "Traffic"
 msgstr "Apkrovimas"
 
 #: js/messages.php:185 libraries/Menu.class.php:586
-#: libraries/Util.class.php:4318 libraries/server_status_monitor.lib.php:257
+#: libraries/Util.class.php:4324 libraries/server_status_monitor.lib.php:257
 msgid "Settings"
 msgstr "Nustatymai"
 
@@ -1479,8 +1482,9 @@ msgstr "Prašome pridėti bent vieną kintamąjį į eilę"
 #: libraries/server_status_monitor.lib.php:236
 #: libraries/server_status_processes.lib.php:308
 #: templates/columns_definitions/transformation.phtml:4
-#: templates/designer/options_panel.phtml:178
-#: templates/table/options_zoom.phtml:12 templates/table/rows_zoom.phtml:26
+#: templates/database/designer/options_panel.phtml:178
+#: templates/table/search/options_zoom.phtml:12
+#: templates/table/search/rows_zoom.phtml:26
 msgid "None"
 msgstr "Ne"
 
@@ -1759,8 +1763,8 @@ msgstr ""
 
 #: js/messages.php:270 libraries/Menu.class.php:352
 #: libraries/Menu.class.php:455 libraries/Menu.class.php:582
-#: libraries/Util.class.php:4317 libraries/Util.class.php:4332
-#: libraries/Util.class.php:4349 libraries/config/messages.inc.php:258
+#: libraries/Util.class.php:4323 libraries/Util.class.php:4338
+#: libraries/Util.class.php:4355 libraries/config/messages.inc.php:258
 #: libraries/display_import.lib.php:105
 #: libraries/server_status_monitor.lib.php:318 prefs_manage.php:238
 #: setup/frames/menu.inc.php:26
@@ -1828,13 +1832,13 @@ msgid "Formatting SQL..."
 msgstr ""
 
 #: js/messages.php:293 libraries/server_variables.lib.php:157
-#: templates/designer/aggregate_query_panel.phtml:63
-#: templates/designer/delete_relation_panel.phtml:28
-#: templates/designer/having_query_panel.phtml:117
-#: templates/designer/new_relation_panel.phtml:88
-#: templates/designer/options_panel.phtml:253
-#: templates/designer/rename_to_panel.phtml:45
-#: templates/designer/where_query_panel.phtml:83
+#: templates/database/designer/aggregate_query_panel.phtml:63
+#: templates/database/designer/delete_relation_panel.phtml:28
+#: templates/database/designer/having_query_panel.phtml:117
+#: templates/database/designer/new_relation_panel.phtml:88
+#: templates/database/designer/options_panel.phtml:253
+#: templates/database/designer/rename_to_panel.phtml:45
+#: templates/database/designer/where_query_panel.phtml:83
 msgid "Cancel"
 msgstr "Atšaukti"
 
@@ -1844,7 +1848,7 @@ msgstr "Atšaukti"
 msgid "Page-related settings"
 msgstr "Keisti nustatymus"
 
-#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:402
+#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:413
 msgid "Apply"
 msgstr ""
 
@@ -1879,8 +1883,8 @@ msgstr ""
 msgid "Error text: %s"
 msgstr ""
 
-#: js/messages.php:307 libraries/db_common.inc.php:68
-#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:450
+#: js/messages.php:307 libraries/db_common.inc.php:69
+#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:461
 msgid "No databases selected."
 msgstr "Nepažymėjote duomenų bazės."
 
@@ -1892,12 +1896,13 @@ msgstr "Šalinamas stulpelis"
 msgid "Adding Primary Key"
 msgstr "Pridedamas pirminis raktas"
 
-#: js/messages.php:310 templates/designer/aggregate_query_panel.phtml:59
-#: templates/designer/having_query_panel.phtml:113
-#: templates/designer/new_relation_panel.phtml:87
-#: templates/designer/options_panel.phtml:252
-#: templates/designer/rename_to_panel.phtml:41
-#: templates/designer/where_query_panel.phtml:82
+#: js/messages.php:310
+#: templates/database/designer/aggregate_query_panel.phtml:59
+#: templates/database/designer/having_query_panel.phtml:113
+#: templates/database/designer/new_relation_panel.phtml:87
+#: templates/database/designer/options_panel.phtml:252
+#: templates/database/designer/rename_to_panel.phtml:41
+#: templates/database/designer/where_query_panel.phtml:82
 msgid "OK"
 msgstr "Gerai"
 
@@ -1917,7 +1922,7 @@ msgstr "Kopijuojama duomenų bazė"
 msgid "Changing Charset"
 msgstr "Keičiama koduotė"
 
-#: js/messages.php:320 libraries/Util.class.php:3217
+#: js/messages.php:320 libraries/Util.class.php:3223
 #, fuzzy
 #| msgid "Disable foreign key checks"
 msgid "Enable foreign key checks"
@@ -1958,20 +1963,21 @@ msgstr "Apibrėžimas „stored“ funkcijos turi turėti RETURN teiginį!"
 #: js/messages.php:334 libraries/DisplayResults.class.php:4834
 #: libraries/DisplayResults.class.php:5092 libraries/Menu.class.php:344
 #: libraries/Menu.class.php:446 libraries/Menu.class.php:578
-#: libraries/Util.class.php:3636 libraries/Util.class.php:3637
-#: libraries/Util.class.php:4316 libraries/Util.class.php:4331
-#: libraries/Util.class.php:4348 libraries/config/messages.inc.php:252
+#: libraries/Util.class.php:3642 libraries/Util.class.php:3643
+#: libraries/Util.class.php:4322 libraries/Util.class.php:4337
+#: libraries/Util.class.php:4354 libraries/config/messages.inc.php:252
 #: libraries/display_export.lib.php:173 libraries/rte/rte_list.lib.php:146
 #: libraries/server_privileges.lib.php:2211
 #: libraries/server_privileges.lib.php:2290
 #: libraries/server_privileges.lib.php:2632
 #: libraries/server_privileges.lib.php:3356
 #: libraries/server_status_monitor.lib.php:322 prefs_manage.php:303
-#: setup/frames/menu.inc.php:27 templates/structure/check_all_tables.phtml:11
+#: setup/frames/menu.inc.php:27
+#: templates/database/structure/check_all_tables.phtml:11
 msgid "Export"
 msgstr "Eksportuoti"
 
-#: js/messages.php:337 libraries/rte/rte_routines.lib.php:652
+#: js/messages.php:337 libraries/rte/rte_routines.lib.php:743
 msgid "ENUM/SET editor"
 msgstr "ENUM/SET redaktorius"
 
@@ -2013,7 +2019,7 @@ msgstr "Rodyti užklausos laukelį"
 #: libraries/Console.class.php:214 libraries/DisplayResults.class.php:3474
 #: libraries/DisplayResults.class.php:4818 libraries/Index.class.php:723
 #: libraries/Util.class.php:706 libraries/Util.class.php:1202
-#: libraries/Util.class.php:3634 libraries/Util.class.php:3635
+#: libraries/Util.class.php:3640 libraries/Util.class.php:3641
 #: libraries/central_columns.lib.php:851
 #: libraries/central_columns.lib.php:1193
 #: libraries/config/messages.inc.php:892
@@ -2031,7 +2037,7 @@ msgstr "Redaguoti"
 #: libraries/server_user_groups.lib.php:129
 #: libraries/sql_query_form.lib.php:416 libraries/tracking.lib.php:477
 #: setup/frames/index.inc.php:183 setup/frames/index.inc.php:291
-#: templates/designer/delete_relation_panel.phtml:27
+#: templates/database/designer/delete_relation_panel.phtml:27
 msgid "Delete"
 msgstr "Trinti"
 
@@ -2215,11 +2221,11 @@ msgid "No dependencies selected!"
 msgstr "Nepažymėjote duomenų bazės."
 
 #: js/messages.php:394 libraries/central_columns.lib.php:1214
-#: libraries/insert_edit.lib.php:1458 libraries/server_variables.lib.php:155
+#: libraries/insert_edit.lib.php:1456 libraries/server_variables.lib.php:155
 #: setup/frames/config.inc.php:42 setup/frames/index.inc.php:279
 #: templates/columns_definitions/column_definitions_form.phtml:165
-#: templates/gis_visualization/gis_visualization.phtml:48
-#: templates/tbl_relation/common_form.phtml:107
+#: templates/table/gis_visualization/gis_visualization.phtml:48
+#: templates/table/relation/common_form.phtml:107
 msgid "Save"
 msgstr "Išsaugoti"
 
@@ -2312,8 +2318,8 @@ msgid "Data point content"
 msgstr "Duomenų rodyklės dydis"
 
 #: js/messages.php:430 js/messages.php:562 js/messages.php:579
-#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2573
-#: templates/index_form.phtml:154 templates/index_form.phtml:194
+#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2571
+#: templates/table/index_form.phtml:154 templates/table/index_form.phtml:194
 msgid "Ignore"
 msgstr "Ignoruoti"
 
@@ -2374,8 +2380,8 @@ msgstr "Pasirinkti Foreign Key"
 msgid "Please select the primary key or a unique key!"
 msgstr "Prašome pasirinkti pirminį raktą arba unikalųjį raktą"
 
-#: js/messages.php:457 templates/designer/side_menu.phtml:91
-#: templates/designer/side_menu.phtml:94
+#: js/messages.php:457 templates/database/designer/side_menu.phtml:91
+#: templates/database/designer/side_menu.phtml:94
 msgid "Choose column to display"
 msgstr "Pasirinkite laukus peržiūrai"
 
@@ -2389,22 +2395,22 @@ msgstr ""
 msgid "Page name"
 msgstr "Puslapio vardas"
 
-#: js/messages.php:463 templates/designer/side_menu.phtml:56
-#: templates/designer/side_menu.phtml:59
+#: js/messages.php:463 templates/database/designer/side_menu.phtml:56
+#: templates/database/designer/side_menu.phtml:59
 #, fuzzy
 #| msgid "Select page"
 msgid "Save page"
 msgstr "Pasirinkite puslapį"
 
-#: js/messages.php:464 templates/designer/side_menu.phtml:63
-#: templates/designer/side_menu.phtml:66
+#: js/messages.php:464 templates/database/designer/side_menu.phtml:63
+#: templates/database/designer/side_menu.phtml:66
 #, fuzzy
 #| msgid "Select page"
 msgid "Save page as"
 msgstr "Pasirinkite puslapį"
 
-#: js/messages.php:465 templates/designer/side_menu.phtml:49
-#: templates/designer/side_menu.phtml:52
+#: js/messages.php:465 templates/database/designer/side_menu.phtml:49
+#: templates/database/designer/side_menu.phtml:52
 #, fuzzy
 #| msgid "Free pages"
 msgid "Open page"
@@ -2416,7 +2422,7 @@ msgstr "Tušti puslapiai"
 msgid "Delete page"
 msgstr "Pasirinkite puslapį"
 
-#: js/messages.php:467 templates/designer/side_menu.phtml:10
+#: js/messages.php:467 templates/database/designer/side_menu.phtml:10
 #, fuzzy
 #| msgid "Unit"
 msgid "Untitled"
@@ -2548,7 +2554,7 @@ msgstr "Pirminė padėtis"
 msgid "cancel"
 msgstr "Atšaukti"
 
-#: js/messages.php:499 libraries/server_status.lib.php:271
+#: js/messages.php:499 libraries/server_status.lib.php:280
 msgid "Aborted"
 msgstr "Nutraukta"
 
@@ -3186,7 +3192,7 @@ msgstr "Neteisingas jungties skaičius"
 
 #: js/messages.php:793 libraries/Message.class.php:199
 #: libraries/Util.class.php:654 libraries/core.lib.php:245
-#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1172
+#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1170
 #: tbl_operations.php:229 view_operations.php:63
 msgid "Error"
 msgstr "Klaida"
@@ -3250,8 +3256,8 @@ msgstr "per sekundę"
 msgid "per minute"
 msgstr "per minutę"
 
-#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:143
-#: libraries/server_status.lib.php:228
+#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:152
+#: libraries/server_status.lib.php:237
 #: libraries/server_status_queries.lib.php:98
 msgid "per hour"
 msgstr "per valandą"
@@ -3270,7 +3276,7 @@ msgid "Wrong permissions on configuration file, should not be world writable!"
 msgstr ""
 "Blogos teisės konfigūracinio failo, neturėtų būti įrašymo galimybė visiems!"
 
-#: libraries/Config.class.php:1799
+#: libraries/Config.class.php:1801
 msgid "Font size"
 msgstr "Šrifto dydis"
 
@@ -3300,10 +3306,10 @@ msgstr "SQL užklausa"
 #: libraries/server_privileges.lib.php:2890
 #: libraries/server_privileges.lib.php:3144
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4332
+#: libraries/server_privileges.lib.php:4358
 #: libraries/server_status_processes.lib.php:80
-#: templates/tbl_relation/foreign_key_row.phtml:165
-#: templates/tbl_relation/internal_relational_row.phtml:55
+#: templates/table/relation/foreign_key_row.phtml:165
+#: templates/table/relation/internal_relational_row.phtml:55
 msgid "Database"
 msgstr "Duomenų bazė"
 
@@ -3415,11 +3421,11 @@ msgstr "SQL užklausų istorija"
 #: libraries/plugins/import/ImportMediawiki.class.php:60
 #: libraries/plugins/import/ImportOds.class.php:59
 #: libraries/plugins/import/ImportShp.class.php:57
-#: libraries/plugins/import/ImportSql.class.php:148
+#: libraries/plugins/import/ImportSql.class.php:51
 #: libraries/plugins/import/ImportXml.class.php:58
-#: libraries/rte/rte_routines.lib.php:833 templates/index_form.phtml:49
-#: templates/structure/row_stats_table.phtml:20
-#: templates/table/options.phtml:2
+#: libraries/rte/rte_routines.lib.php:924 templates/table/index_form.phtml:49
+#: templates/table/search/options.phtml:2
+#: templates/table/structure/row_stats_table.phtml:20
 msgid "Options"
 msgstr "Nustatymai"
 
@@ -3464,7 +3470,8 @@ msgstr "Mažėjimo tvarka"
 msgid "Order:"
 msgstr "Kita"
 
-#: libraries/Console.class.php:289 templates/table/replace_preview.phtml:17
+#: libraries/Console.class.php:289
+#: templates/table/search/replace_preview.phtml:17
 #, fuzzy
 #| msgid "Column"
 msgid "Count"
@@ -3589,9 +3596,9 @@ msgstr "Pereiti į lentelės kopiją"
 #: libraries/operations.lib.php:794 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:191
-#: templates/structure/sortable_header.phtml:21
-#: templates/structure/sortable_header.phtml:38
-#: templates/table/options.phtml:68
+#: templates/database/structure/sortable_header.phtml:21
+#: templates/database/structure/sortable_header.phtml:38
+#: templates/table/search/options.phtml:68
 msgid "Ascending"
 msgstr "Didėjimo tvarka"
 
@@ -3601,13 +3608,14 @@ msgstr "Didėjimo tvarka"
 #: libraries/operations.lib.php:797 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:188
-#: templates/structure/sortable_header.phtml:26
-#: templates/structure/sortable_header.phtml:43
-#: templates/table/options.phtml:69
+#: templates/database/structure/sortable_header.phtml:26
+#: templates/database/structure/sortable_header.phtml:43
+#: templates/table/search/options.phtml:69
 msgid "Descending"
 msgstr "Mažėjimo tvarka"
 
-#: libraries/DBQbe.class.php:467 templates/table/search_and_replace.phtml:6
+#: libraries/DBQbe.class.php:467
+#: templates/table/search/search_and_replace.phtml:6
 #, fuzzy
 #| msgid "Column"
 msgid "Column:"
@@ -3794,12 +3802,12 @@ msgstr[1] "%s atitikmenys lentelėse <i>%s</i>"
 msgstr[2] "%s atitikmenų lentelėse <i>%s</i>"
 
 #: libraries/DbSearch.class.php:354 libraries/Menu.class.php:311
-#: libraries/Util.class.php:3337 libraries/Util.class.php:3347
-#: libraries/Util.class.php:3623 libraries/Util.class.php:3624
-#: libraries/Util.class.php:4343 libraries/config.values.php:43
+#: libraries/Util.class.php:3343 libraries/Util.class.php:3353
+#: libraries/Util.class.php:3629 libraries/Util.class.php:3630
+#: libraries/Util.class.php:4349 libraries/config.values.php:43
 #: libraries/config.values.php:51 libraries/config.values.php:119
 #: libraries/navigation/Nodes/Node_Table.class.php:295
-#: templates/structure/check_all_table_column.phtml:5
+#: templates/table/structure/check_all_table_column.phtml:5
 msgid "Browse"
 msgstr "Peržiūrėti"
 
@@ -3816,7 +3824,8 @@ msgstr "Paieška duomenų bazėje"
 msgid "Words or values to search for (wildcard: \"%\"):"
 msgstr "Paieškos žodis(iai) arba reikšmė(ės) (pakaitos simboliui: \"%\"):"
 
-#: libraries/DbSearch.class.php:401 templates/table/search_and_replace.phtml:1
+#: libraries/DbSearch.class.php:401
+#: templates/table/search/search_and_replace.phtml:1
 msgid "Find:"
 msgstr "Rasti:"
 
@@ -3866,16 +3875,16 @@ msgstr "Filtrai"
 msgid "Search this table"
 msgstr "Paieška duomenų bazėje"
 
-#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2532
-#: libraries/Util.class.php:2535
+#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2538
+#: libraries/Util.class.php:2541
 #, fuzzy
 #| msgid "Begin"
 msgctxt "First page"
 msgid "Begin"
 msgstr "Pradžia"
 
-#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2533
-#: libraries/Util.class.php:2536 libraries/server_bin_log.lib.php:170
+#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2539
+#: libraries/Util.class.php:2542 libraries/server_bin_log.lib.php:170
 #: libraries/server_bin_log.lib.php:172
 #, fuzzy
 #| msgid "Previous"
@@ -3883,8 +3892,8 @@ msgctxt "Previous page"
 msgid "Previous"
 msgstr "Ankstesnis"
 
-#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2564
-#: libraries/Util.class.php:2574 libraries/server_bin_log.lib.php:204
+#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2570
+#: libraries/Util.class.php:2580 libraries/server_bin_log.lib.php:204
 #: libraries/server_bin_log.lib.php:206
 #, fuzzy
 #| msgid "Next"
@@ -3892,8 +3901,8 @@ msgctxt "Next page"
 msgid "Next"
 msgstr "Kitas"
 
-#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2565
-#: libraries/Util.class.php:2575
+#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2571
+#: libraries/Util.class.php:2581
 #, fuzzy
 #| msgid "End"
 msgctxt "Last page"
@@ -3976,9 +3985,9 @@ msgid "May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]."
 msgstr "Gali būti apytikslis. Žiūrėkite [doc@faq3-11]DUK 3.11[/doc]"
 
 #: libraries/DisplayResults.class.php:4332 libraries/Message.class.php:180
-#: libraries/controllers/TableRelationController.class.php:258
+#: libraries/controllers/TableRelationController.class.php:259
 #: libraries/controllers/TableSearchController.class.php:655
-#: libraries/rte/rte_routines.lib.php:1332 libraries/sql_query_form.lib.php:89
+#: libraries/rte/rte_routines.lib.php:1423 libraries/sql_query_form.lib.php:89
 #: tbl_operations.php:227 tbl_row_action.php:138 view_operations.php:62
 #, fuzzy
 #| msgid "Your SQL query has been executed successfully."
@@ -3986,7 +3995,7 @@ msgid "Your SQL query has been executed successfully."
 msgstr "Jūsų SQL užklausa sėkmingai įvykdyta"
 
 #: libraries/DisplayResults.class.php:4660
-#: libraries/controllers/StructureController.class.php:629
+#: libraries/controllers/DatabaseStructureController.class.php:564
 #, php-format
 msgid ""
 "This view has at least this number of rows. Please refer to %sdocumentation"
@@ -4012,34 +4021,34 @@ msgstr ""
 msgid "%d total"
 msgstr "iš viso"
 
-#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1318
+#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1312
 #, fuzzy, php-format
 #| msgid "Query took %01.4f sec"
 msgid "Query took %01.4f seconds."
 msgstr "Užklausa užtruko %01.4f sek."
 
 #: libraries/DisplayResults.class.php:4807
-#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4767
-#: libraries/Util.class.php:4773 libraries/mult_submits.inc.php:50
-#: templates/structure/check_all_tables.phtml:2
-#: templates/structure/check_all_tables.phtml:9
+#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4773
+#: libraries/Util.class.php:4779 libraries/mult_submits.inc.php:50
+#: templates/database/structure/check_all_tables.phtml:2
+#: templates/database/structure/check_all_tables.phtml:9
 msgid "With selected:"
 msgstr "Pasirinktus:"
 
 #: libraries/DisplayResults.class.php:4811
-#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4769
-#: libraries/Util.class.php:4770 libraries/server_privileges.lib.php:1174
+#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4775
+#: libraries/Util.class.php:4776 libraries/server_privileges.lib.php:1174
 #: libraries/server_privileges.lib.php:1175
 #: libraries/server_privileges.lib.php:1387
 #: libraries/server_user_groups.lib.php:231
-#: templates/structure/check_all_tables.phtml:3
-#: templates/structure/check_all_tables.phtml:4
+#: templates/database/structure/check_all_tables.phtml:3
+#: templates/database/structure/check_all_tables.phtml:4
 msgid "Check All"
 msgstr "Pažymėti visas"
 
 #: libraries/DisplayResults.class.php:4985 libraries/Header.class.php:383
-#: templates/structure/optional_action_links.phtml:1
-#: templates/structure/print_view_data_dictionary_link.phtml:3
+#: templates/database/structure/print_view_data_dictionary_link.phtml:3
+#: templates/table/structure/optional_action_links.phtml:1
 msgid "Print view"
 msgstr "Spausdinti struktūrą"
 
@@ -4047,7 +4056,8 @@ msgstr "Spausdinti struktūrą"
 msgid "Query results operations"
 msgstr "Veiksmai su užklausos rezultatais"
 
-#: libraries/DisplayResults.class.php:5105 templates/tbl_chart.phtml:12
+#: libraries/DisplayResults.class.php:5105
+#: templates/table/chart/tbl_chart.phtml:12
 msgid "Display chart"
 msgstr "Rodyti diagramą"
 
@@ -4150,7 +4160,7 @@ msgid "Click on the bar to scroll to top of page"
 msgstr ""
 
 #: libraries/Header.class.php:749
-#: libraries/plugins/auth/AuthenticationCookie.class.php:152
+#: libraries/plugins/auth/AuthenticationCookie.class.php:140
 #, fuzzy
 #| msgid "Cookies must be enabled past this point."
 msgid "Javascript must be enabled past this point!"
@@ -4174,11 +4184,11 @@ msgid "Keyname"
 msgstr "Indekso pavadinimas"
 
 #: libraries/Index.class.php:697
-#: libraries/controllers/StructureController.class.php:1962
-#: libraries/controllers/StructureController.class.php:1967
+#: libraries/controllers/TableStructureController.class.php:953
+#: libraries/controllers/TableStructureController.class.php:958
 #: libraries/tracking.lib.php:973
 #: templates/columns_definitions/column_indexes.phtml:11
-#: templates/structure/check_all_table_column.phtml:26
+#: templates/table/structure/check_all_table_column.phtml:26
 msgid "Unique"
 msgstr "Unikalus"
 
@@ -4197,16 +4207,17 @@ msgstr "Elementų skaičius"
 #: libraries/server_collations.lib.php:35 libraries/tracking.lib.php:881
 #: libraries/tracking.lib.php:977
 #: templates/columns_definitions/table_fields_definitions.phtml:33
-#: templates/structure/row_stats_table.phtml:31
-#: templates/structure/table_header.phtml:55
-#: templates/structure/table_structure_header.phtml:7
-#: templates/table/table_header.phtml:8
+#: templates/database/structure/table_header.phtml:55
+#: templates/table/search/table_header.phtml:8
+#: templates/table/structure/row_stats_table.phtml:31
+#: templates/table/structure/table_structure_header.phtml:7
 msgid "Collation"
 msgstr "Palyginimas"
 
 #: libraries/Index.class.php:703 libraries/rte/rte_events.lib.php:496
-#: libraries/rte/rte_routines.lib.php:956 libraries/tracking.lib.php:885
-#: libraries/tracking.lib.php:979 templates/structure/table_header.phtml:84
+#: libraries/rte/rte_routines.lib.php:1047 libraries/tracking.lib.php:885
+#: libraries/tracking.lib.php:979
+#: templates/database/structure/table_header.phtml:84
 msgid "Comment"
 msgstr "Komentaras"
 
@@ -4219,15 +4230,15 @@ msgstr "Panaikintas pirminis raktas."
 msgid "Index %s has been dropped."
 msgstr "Indeksas %s ištrintas."
 
-#: libraries/Index.class.php:757 libraries/Util.class.php:3630
-#: libraries/Util.class.php:3631
-#: libraries/controllers/StructureController.class.php:1958
-#: libraries/controllers/StructureController.class.php:1959
+#: libraries/Index.class.php:757 libraries/Util.class.php:3636
+#: libraries/Util.class.php:3637
+#: libraries/controllers/TableStructureController.class.php:949
+#: libraries/controllers/TableStructureController.class.php:950
 #: libraries/operations.lib.php:1607 libraries/rte/rte_list.lib.php:150
 #: libraries/server_databases.lib.php:146
-#: templates/structure/check_all_table_column.phtml:15
-#: templates/structure/check_all_tables.phtml:16
-#: templates/tbl_relation/foreign_key_row.phtml:93
+#: templates/database/structure/check_all_tables.phtml:16
+#: templates/table/relation/foreign_key_row.phtml:93
+#: templates/table/structure/check_all_table_column.phtml:15
 msgid "Drop"
 msgstr "Šalinti"
 
@@ -4257,16 +4268,16 @@ msgstr "Serveris"
 #: libraries/Menu.class.php:248
 #: libraries/navigation/Nodes/Node_View.class.php:32
 #: libraries/tbl_info.inc.php:63
-#: templates/structure/structure_table_row.phtml:97
-#: templates/structure/structure_table_row.phtml:159
+#: templates/database/structure/structure_table_row.phtml:97
+#: templates/database/structure/structure_table_row.phtml:159
 msgid "View"
 msgstr "Rodinys"
 
 #: libraries/Menu.class.php:325 libraries/Menu.class.php:429
-#: libraries/Menu.class.php:548 libraries/Util.class.php:3334
-#: libraries/Util.class.php:3344 libraries/Util.class.php:3350
-#: libraries/Util.class.php:4313 libraries/Util.class.php:4328
-#: libraries/Util.class.php:4345 libraries/config.values.php:40
+#: libraries/Menu.class.php:548 libraries/Util.class.php:3340
+#: libraries/Util.class.php:3350 libraries/Util.class.php:3356
+#: libraries/Util.class.php:4319 libraries/Util.class.php:4334
+#: libraries/Util.class.php:4351 libraries/config.values.php:40
 #: libraries/config.values.php:48 libraries/config.values.php:110
 #: libraries/config.values.php:116 libraries/config/messages.inc.php:321
 #: libraries/navigation/Nodes/Node_Table.class.php:292
@@ -4274,19 +4285,19 @@ msgid "SQL"
 msgstr "SQL"
 
 #: libraries/Menu.class.php:328 libraries/Menu.class.php:432
-#: libraries/Util.class.php:3335 libraries/Util.class.php:3345
-#: libraries/Util.class.php:3351 libraries/Util.class.php:3625
-#: libraries/Util.class.php:3626 libraries/Util.class.php:4329
-#: libraries/Util.class.php:4346 libraries/config.values.php:41
+#: libraries/Util.class.php:3341 libraries/Util.class.php:3351
+#: libraries/Util.class.php:3357 libraries/Util.class.php:3631
+#: libraries/Util.class.php:3632 libraries/Util.class.php:4335
+#: libraries/Util.class.php:4352 libraries/config.values.php:41
 #: libraries/config.values.php:49 libraries/config.values.php:111
 #: libraries/config.values.php:117
 #: libraries/navigation/Nodes/Node_Table.class.php:286
 msgid "Search"
 msgstr "Paieška"
 
-#: libraries/Menu.class.php:338 libraries/Util.class.php:3336
-#: libraries/Util.class.php:3346 libraries/Util.class.php:3627
-#: libraries/Util.class.php:3628 libraries/Util.class.php:4347
+#: libraries/Menu.class.php:338 libraries/Util.class.php:3342
+#: libraries/Util.class.php:3352 libraries/Util.class.php:3633
+#: libraries/Util.class.php:3634 libraries/Util.class.php:4353
 #: libraries/config.values.php:42 libraries/config.values.php:50
 #: libraries/config.values.php:118
 #: libraries/navigation/Nodes/Node_Table.class.php:289
@@ -4295,30 +4306,30 @@ msgid "Insert"
 msgstr "Įterpti"
 
 #: libraries/Menu.class.php:362 libraries/Menu.class.php:467
-#: libraries/Util.class.php:4334 libraries/Util.class.php:4350
+#: libraries/Util.class.php:4340 libraries/Util.class.php:4356
 #: libraries/config.values.php:106 libraries/server_common.lib.php:51
 #: libraries/server_privileges.lib.php:2370
 #: libraries/server_privileges.lib.php:3158
-#: libraries/server_privileges.lib.php:4221
+#: libraries/server_privileges.lib.php:4247
 msgid "Privileges"
 msgstr "Privilegijos"
 
 #: libraries/Menu.class.php:371 libraries/Menu.class.php:379
-#: libraries/Menu.class.php:459 libraries/Util.class.php:3338
-#: libraries/Util.class.php:3352 libraries/Util.class.php:4333
-#: libraries/Util.class.php:4351 libraries/config.values.php:112
+#: libraries/Menu.class.php:459 libraries/Util.class.php:3344
+#: libraries/Util.class.php:3358 libraries/Util.class.php:4339
+#: libraries/Util.class.php:4357 libraries/config.values.php:112
 #: view_operations.php:92
 msgid "Operations"
 msgstr "Veiksmai"
 
 #: libraries/Menu.class.php:384 libraries/Menu.class.php:492
-#: libraries/Util.class.php:4338 libraries/Util.class.php:4352
+#: libraries/Util.class.php:4344 libraries/Util.class.php:4358
 #: libraries/relation.lib.php:255
 msgid "Tracking"
 msgstr "Sekimas"
 
 #: libraries/Menu.class.php:397 libraries/Menu.class.php:486
-#: libraries/Util.class.php:4337 libraries/Util.class.php:4353
+#: libraries/Util.class.php:4343 libraries/Util.class.php:4359
 #: libraries/navigation/Nodes/Node_Trigger_Container.class.php:24
 #: libraries/plugins/export/ExportHtmlword.class.php:557
 #: libraries/plugins/export/ExportOdt.class.php:685
@@ -4335,16 +4346,16 @@ msgstr ""
 msgid "Database seems to be empty!"
 msgstr "Duomenų bazė atrodo tuščia!"
 
-#: libraries/Menu.class.php:439 libraries/Util.class.php:4330
+#: libraries/Menu.class.php:439 libraries/Util.class.php:4336
 msgid "Query"
 msgstr "SQL užklausa"
 
-#: libraries/Menu.class.php:472 libraries/Util.class.php:4335
+#: libraries/Menu.class.php:472 libraries/Util.class.php:4341
 #: libraries/rte/rte_words.lib.php:36
 msgid "Routines"
 msgstr ""
 
-#: libraries/Menu.class.php:479 libraries/Util.class.php:4336
+#: libraries/Menu.class.php:479 libraries/Util.class.php:4342
 #: libraries/navigation/Nodes/Node_Event_Container.class.php:26
 #: libraries/plugins/export/ExportSql.class.php:940
 #: libraries/plugins/export/ExportXml.class.php:107
@@ -4352,22 +4363,22 @@ msgstr ""
 msgid "Events"
 msgstr "Įvykiai"
 
-#: libraries/Menu.class.php:498 libraries/Util.class.php:4339
+#: libraries/Menu.class.php:498 libraries/Util.class.php:4345
 msgid "Designer"
 msgstr "Projektavimas"
 
-#: libraries/Menu.class.php:507 libraries/Util.class.php:4340
-#: templates/structure/check_all_tables.phtml:35
+#: libraries/Menu.class.php:507 libraries/Util.class.php:4346
+#: templates/database/structure/check_all_tables.phtml:35
 #, fuzzy
 #| msgid "Textarea columns"
 msgid "Central columns"
 msgstr "Textarea stulpeliai"
 
-#: libraries/Menu.class.php:544 libraries/Util.class.php:4312
+#: libraries/Menu.class.php:544 libraries/Util.class.php:4318
 #: libraries/config.values.php:103 libraries/config/messages.inc.php:266
 #: libraries/config/messages.inc.php:341
 #: libraries/navigation/NavigationTree.class.php:1239
-#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4332
+#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4358
 msgid "Databases"
 msgstr "Duomenų bazės"
 
@@ -4378,34 +4389,34 @@ msgid "User accounts"
 msgstr "Naudotojai"
 
 #: libraries/Menu.class.php:595 libraries/ServerStatusData.class.php:121
-#: libraries/Util.class.php:4319 libraries/server_common.lib.php:36
+#: libraries/Util.class.php:4325 libraries/server_common.lib.php:36
 msgid "Binary log"
 msgstr "Dvejetainis log'as"
 
 #: libraries/Menu.class.php:601 libraries/ServerStatusData.class.php:126
-#: libraries/Util.class.php:4320 libraries/server_common.lib.php:42
-#: templates/structure/body_for_table_summary.phtml:10
-#: templates/structure/table_header.phtml:27
+#: libraries/Util.class.php:4326 libraries/server_common.lib.php:42
+#: templates/database/structure/body_for_table_summary.phtml:10
+#: templates/database/structure/table_header.phtml:27
 msgid "Replication"
 msgstr "Replikavimas"
 
 #: libraries/Menu.class.php:606 libraries/ServerStatusData.class.php:193
-#: libraries/Util.class.php:4321 libraries/config.values.php:105
+#: libraries/Util.class.php:4327 libraries/config.values.php:105
 #: libraries/server_engines.lib.php:108 libraries/server_engines.lib.php:112
 #: libraries/sql_query_form.lib.php:421
 msgid "Variables"
 msgstr "Kintamieji"
 
-#: libraries/Menu.class.php:610 libraries/Util.class.php:4322
+#: libraries/Menu.class.php:610 libraries/Util.class.php:4328
 msgid "Charsets"
 msgstr "Koduotės"
 
-#: libraries/Menu.class.php:615 libraries/Util.class.php:4323
+#: libraries/Menu.class.php:615 libraries/Util.class.php:4329
 #: libraries/server_common.lib.php:33 libraries/server_plugins.lib.php:27
 msgid "Plugins"
 msgstr ""
 
-#: libraries/Menu.class.php:626 libraries/Util.class.php:4324
+#: libraries/Menu.class.php:626 libraries/Util.class.php:4330
 msgid "Engines"
 msgstr "Varikliai"
 
@@ -4433,7 +4444,7 @@ msgstr[0] "Įterpta %1$d eilutė."
 msgstr[1] "Įterptos %1$d eilutės."
 msgstr[2] "Įterpta %1$d eilučių."
 
-#: libraries/PDF.class.php:70 libraries/Util.class.php:2521
+#: libraries/PDF.class.php:70 libraries/Util.class.php:2527
 #: libraries/browse_foreigners.lib.php:327
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:865
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:890
@@ -4458,7 +4469,7 @@ msgid "Could not save favorite table!"
 msgstr "Negalėjo išsaugoti paskiausios lentelės"
 
 #: libraries/RecentFavoriteTable.class.php:212
-#: templates/structure/favorite_anchor.phtml:12
+#: templates/database/structure/favorite_anchor.phtml:12
 #, fuzzy
 #| msgid "Remove chart"
 msgid "Remove from Favorites"
@@ -4646,7 +4657,7 @@ msgid ""
 msgstr "Apie šio Saugojimo Variklio būseną nėra išsamios informacijos."
 
 #: libraries/StorageEngine.class.php:373
-#: templates/structure/body_for_table_summary.phtml:50
+#: templates/database/structure/body_for_table_summary.phtml:50
 #, php-format
 msgid "%s is the default storage engine on this MySQL server."
 msgstr "%s yra standartinis saugojimo variklis šiame MySQL serveryje."
@@ -5082,10 +5093,10 @@ msgstr ""
 
 #: libraries/Util.class.php:726 libraries/rte/rte_events.lib.php:110
 #: libraries/rte/rte_events.lib.php:119 libraries/rte/rte_events.lib.php:150
-#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:153
-#: libraries/rte/rte_routines.lib.php:162
-#: libraries/rte/rte_routines.lib.php:235
-#: libraries/rte/rte_routines.lib.php:1366
+#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:223
+#: libraries/rte/rte_routines.lib.php:250
+#: libraries/rte/rte_routines.lib.php:372
+#: libraries/rte/rte_routines.lib.php:1457
 #: libraries/rte/rte_triggers.lib.php:86 libraries/rte/rte_triggers.lib.php:95
 #: libraries/rte/rte_triggers.lib.php:127
 msgid "MySQL said: "
@@ -5131,77 +5142,80 @@ msgstr "Sek"
 msgid "%B %d, %Y at %I:%M %p"
 msgstr "%Y m. %B %d d. %H:%M"
 
-#: libraries/Util.class.php:2019
+#: libraries/Util.class.php:2025
 #, php-format
 msgid "%s days, %s hours, %s minutes and %s seconds"
 msgstr "%s d., %s val., %s min. ir %s s"
 
-#: libraries/Util.class.php:2112
+#: libraries/Util.class.php:2118
 msgid "Missing parameter:"
 msgstr "Trūkstamas parametras:"
 
-#: libraries/Util.class.php:2645
+#: libraries/Util.class.php:2651
 #, php-format
 msgid "Jump to database \"%s\"."
 msgstr "Pereiti į „%s“ duomenų bazę."
 
-#: libraries/Util.class.php:2670
+#: libraries/Util.class.php:2676
 #, php-format
 msgid "The %s functionality is affected by a known bug, see %s"
 msgstr "%s funkcionalumas paveiktas žinomos klaidos, žiūrėti %s"
 
-#: libraries/Util.class.php:2881
+#: libraries/Util.class.php:2887
 msgid "Click to toggle"
 msgstr "Spustelėkite suskleidimui/atskleidimui"
 
-#: libraries/Util.class.php:3542 prefs_manage.php:248
+#: libraries/Util.class.php:3548 prefs_manage.php:248
 msgid "Browse your computer:"
 msgstr "Naršyti savo kompiuteryje:"
 
-#: libraries/Util.class.php:3567
+#: libraries/Util.class.php:3573
 #, php-format
 msgid "Select from the web server upload directory <b>%s</b>:"
 msgstr "Pasirinkti iš saityno serverio atsisiuntimų katalogą <b>%s</b>:"
 
-#: libraries/Util.class.php:3596 libraries/insert_edit.lib.php:1173
+#: libraries/Util.class.php:3602 libraries/insert_edit.lib.php:1171
 msgid "The directory you set for upload work cannot be reached."
 msgstr "Aplankas, kuris nurodytas įkeliamiems failams, nepasiekiamas."
 
-#: libraries/Util.class.php:3607
+#: libraries/Util.class.php:3613
 #, fuzzy
 #| msgid "There are no files to upload"
 msgid "There are no files to upload!"
 msgstr "Nėra failų išsiuntimui"
 
-#: libraries/Util.class.php:3632 libraries/Util.class.php:3633
-#: templates/structure/check_all_tables.phtml:15
+#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: templates/database/structure/check_all_tables.phtml:15
 msgid "Empty"
 msgstr "Išvalyti"
 
-#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: libraries/Util.class.php:3644 libraries/Util.class.php:3645
 msgid "Execute"
 msgstr "Vykdyti"
 
-#: libraries/Util.class.php:4152
+#: libraries/Util.class.php:4158
 msgid "Print"
 msgstr "Spausdinti"
 
-#: libraries/Util.class.php:4257 templates/structure/row_stats_table.phtml:80
-#: templates/structure/table_header.phtml:95
+#: libraries/Util.class.php:4263
+#: templates/database/structure/table_header.phtml:95
+#: templates/table/structure/row_stats_table.phtml:80
 msgid "Creation"
 msgstr "Sukurta"
 
-#: libraries/Util.class.php:4263 templates/structure/row_stats_table.phtml:87
-#: templates/structure/table_header.phtml:106
+#: libraries/Util.class.php:4269
+#: templates/database/structure/table_header.phtml:106
+#: templates/table/structure/row_stats_table.phtml:87
 msgid "Last update"
 msgstr "Paskutinis atnaujinimas"
 
-#: libraries/Util.class.php:4269 templates/structure/row_stats_table.phtml:94
-#: templates/structure/table_header.phtml:117
+#: libraries/Util.class.php:4275
+#: templates/database/structure/table_header.phtml:117
+#: templates/table/structure/row_stats_table.phtml:94
 msgid "Last check"
 msgstr "Paskutinis patikrinimas"
 
-#: libraries/Util.class.php:4315
+#: libraries/Util.class.php:4321
 msgid "Users"
 msgstr "Naudotojai"
 
@@ -5224,16 +5238,16 @@ msgid "Use this value"
 msgstr "Naudokite šią reikšmę"
 
 #: libraries/build_html_for_db.lib.php:33 libraries/import.lib.php:193
-#: templates/structure/actions_in_table_structure.phtml:113
-#: templates/structure/row_stats_table.phtml:42
-#: templates/structure/table_header.phtml:36
+#: templates/database/structure/table_header.phtml:36
+#: templates/table/structure/actions_in_table_structure.phtml:113
+#: templates/table/structure/row_stats_table.phtml:42
 msgid "Rows"
 msgstr "Eilutės"
 
 #: libraries/build_html_for_db.lib.php:48 libraries/engines/innodb.lib.php:171
-#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:186
-#: libraries/server_status.lib.php:298
-#: templates/structure/display_table_stats.phtml:40
+#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:195
+#: libraries/server_status.lib.php:307
+#: templates/table/structure/display_table_stats.phtml:40
 msgid "Total"
 msgstr "Iš viso"
 
@@ -5242,10 +5256,12 @@ msgid "Jump to database"
 msgstr "Eiti į duomenų bazę"
 
 #: libraries/build_html_for_db.lib.php:146
+#: templates/database/structure/structure_table_row.phtml:15
 msgid "Not replicated"
 msgstr "Nepadaugintas"
 
 #: libraries/build_html_for_db.lib.php:158
+#: templates/database/structure/structure_table_row.phtml:16
 msgid "Replicated"
 msgstr "Padaugintas"
 
@@ -5302,17 +5318,17 @@ msgstr ""
 #: libraries/plugins/export/ExportTexytext.class.php:425
 #: libraries/plugins/export/PMA_ExportPdf.class.php:307
 #: libraries/rte/rte_list.lib.php:73 libraries/rte/rte_list.lib.php:85
-#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:830
-#: libraries/rte/rte_routines.lib.php:1492 setup/frames/index.inc.php:162
+#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:921
+#: libraries/rte/rte_routines.lib.php:1583 setup/frames/index.inc.php:162
 #: templates/columns_definitions/table_fields_definitions.phtml:8
-#: templates/structure/table_structure_header.phtml:5
-#: templates/table/create_table.phtml:11
+#: templates/database/create_table.phtml:11
+#: templates/table/structure/table_structure_header.phtml:5
 msgid "Name"
 msgstr "Pavadinimas"
 
 #: libraries/central_columns.lib.php:699
 #: libraries/central_columns.lib.php:1381
-#: libraries/rte/rte_routines.lib.php:832
+#: libraries/rte/rte_routines.lib.php:923
 #: templates/columns_definitions/table_fields_definitions.phtml:14
 msgid "Length/Values"
 msgstr "Ilgis/reikšmės*"
@@ -5335,7 +5351,7 @@ msgid "Select a table"
 msgstr "Pasirinkite lenteles"
 
 #: libraries/central_columns.lib.php:804
-#: templates/structure/add_column.phtml:4
+#: templates/table/structure/add_column.phtml:4
 msgid "Add column"
 msgstr "Pridėti stulpelį"
 
@@ -5355,7 +5371,7 @@ msgstr "Pridėti stulpelį"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1002
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1025
 #: templates/columns_definitions/table_fields_definitions.phtml:36
-#: templates/structure/table_structure_header.phtml:8
+#: templates/table/structure/table_structure_header.phtml:8
 msgid "Attributes"
 msgstr "Atributai"
 
@@ -5478,7 +5494,7 @@ msgid "Double click"
 msgstr ""
 
 #: libraries/config.values.php:95 libraries/config.values.php:124
-#: libraries/config/FormDisplay.tpl.php:221 libraries/relation.lib.php:97
+#: libraries/config/FormDisplay.tpl.php:232 libraries/relation.lib.php:97
 #: libraries/relation.lib.php:105
 msgid "Disabled"
 msgstr "Išjungta"
@@ -5670,21 +5686,21 @@ msgstr "eksportavimas neveiks, nerasta funkcija (%s)"
 msgid "maximum %s"
 msgstr "didžiausias %s"
 
-#: libraries/config/FormDisplay.tpl.php:219
+#: libraries/config/FormDisplay.tpl.php:230
 msgid "This setting is disabled, it will not be applied to your configuration."
 msgstr "Šis nustatymas išjungtas, tai nebus taikoma jūsų konfigūracijoje."
 
-#: libraries/config/FormDisplay.tpl.php:313
+#: libraries/config/FormDisplay.tpl.php:324
 #, php-format
 msgid "Set value: %s"
 msgstr "Nustatyti reikšmę: %s"
 
-#: libraries/config/FormDisplay.tpl.php:318
+#: libraries/config/FormDisplay.tpl.php:329
 #: libraries/config/messages.inc.php:610
 msgid "Restore default value"
 msgstr "Atstatyti numatytąsias reikšmes"
 
-#: libraries/config/FormDisplay.tpl.php:332
+#: libraries/config/FormDisplay.tpl.php:343
 msgid "Allow users to customize this value"
 msgstr "Leisti naudotojams adaptuoti šią reikšmę"
 
@@ -6234,7 +6250,7 @@ msgstr "Failo simbolių koduotė"
 
 #: libraries/config/messages.inc.php:136 libraries/config/messages.inc.php:152
 #: libraries/sql_query_form.lib.php:247
-#: templates/structure/row_stats_table.phtml:7
+#: templates/table/structure/row_stats_table.phtml:7
 msgid "Format"
 msgstr "Formatas"
 
@@ -6833,7 +6849,7 @@ msgstr ""
 
 #: libraries/config/messages.inc.php:332
 #: libraries/plugins/export/ExportPdf.class.php:279
-#: templates/structure/secondary_tabs.phtml:8
+#: templates/table/secondary_tabs.phtml:8
 #, fuzzy
 #| msgid "Database for user"
 msgid "Table structure"
@@ -8780,111 +8796,35 @@ msgstr "Microsoft Word 2000"
 msgid "OpenDocument Text"
 msgstr "Open Document rašyklė"
 
-#: libraries/controllers/StructureController.class.php:465
+#: libraries/controllers/DatabaseStructureController.class.php:405
 #: tbl_operations.php:382
 #, php-format
 msgid "Table %s has been emptied."
 msgstr "Lentelės reikšmės %s ištuštintos."
 
-#: libraries/controllers/StructureController.class.php:486
+#: libraries/controllers/DatabaseStructureController.class.php:426
 #: tbl_operations.php:400 view_operations.php:119
 #, fuzzy, php-format
 #| msgid "View %s has been dropped."
 msgid "View %s has been dropped."
 msgstr "Rodinys %s buvo panaikintas"
 
-#: libraries/controllers/StructureController.class.php:487
+#: libraries/controllers/DatabaseStructureController.class.php:427
 #: tbl_operations.php:401
 #, fuzzy, php-format
 #| msgid "Table %s has been dropped."
 msgid "Table %s has been dropped."
 msgstr "Lentelė %s panaikinta"
 
-#: libraries/controllers/StructureController.class.php:797
-#, php-format
-msgid "The name '%s' is a MySQL reserved keyword."
-msgid_plural "The names '%s' are MySQL reserved keywords."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: libraries/controllers/StructureController.class.php:875
-#, fuzzy
-#| msgid "No rows selected"
-msgid "No column selected."
-msgstr "Nepasirinkti įrašai"
-
-#: libraries/controllers/StructureController.class.php:1049
+#: libraries/controllers/DatabaseStructureController.class.php:733
 msgid "Favorite List is full!"
 msgstr ""
 
-#: libraries/controllers/StructureController.class.php:1272
-#, fuzzy
-#| msgid "The selected users have been deleted successfully."
-msgid "The columns have been moved successfully."
-msgstr "Pažymėti vartotojai sėkmingai pašalinti."
-
-#: libraries/controllers/StructureController.class.php:1535
-#, fuzzy, php-format
-#| msgid "Table %1$s has been altered successfully."
-msgid ""
-"Table %1$s has been altered successfully. Privileges have been adjusted."
-msgstr "Lentelė %1$s sėkmingai pakeista."
-
-#: libraries/controllers/StructureController.class.php:1541
-#: libraries/controllers/TableIndexesController.class.php:161
-#: tbl_addfield.php:92
-#, php-format
-msgid "Table %1$s has been altered successfully."
-msgstr "Lentelė %1$s sėkmingai pakeista."
-
-#: libraries/controllers/StructureController.class.php:1588
-#: libraries/tracking.lib.php:1094
-msgid "Query error"
-msgstr "Užklausos klaida"
-
-#: libraries/controllers/StructureController.class.php:1806
+#: libraries/controllers/DatabaseStructureController.class.php:947
 #: libraries/mysql_charsets.lib.php:366 libraries/mysql_charsets.lib.php:373
 msgid "unknown"
 msgstr "nežinoma"
 
-#: libraries/controllers/StructureController.class.php:1957
-#: templates/structure/check_all_table_column.phtml:11
-msgid "Change"
-msgstr "Redaguoti"
-
-#: libraries/controllers/StructureController.class.php:1961
-#: libraries/controllers/StructureController.class.php:1966
-#: libraries/navigation/Nodes/Node_Index.class.php:30
-#: libraries/tracking.lib.php:926
-#: templates/columns_definitions/column_indexes.phtml:16
-#: templates/columns_definitions/table_fields_definitions.phtml:57
-#: templates/structure/check_all_table_column.phtml:30
-#: templates/structure/display_structure.phtml:79
-#: templates/structure/display_table_stats.phtml:19
-msgid "Index"
-msgstr "Indeksas"
-
-#: libraries/controllers/StructureController.class.php:1963
-#: libraries/controllers/StructureController.class.php:1968
-#: templates/columns_definitions/column_indexes.phtml:27
-#: templates/structure/check_all_table_column.phtml:37
-msgid "Spatial"
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1964
-#: libraries/controllers/StructureController.class.php:1969
-#: templates/columns_definitions/column_indexes.phtml:22
-#: templates/structure/check_all_table_column.phtml:47
-msgid "Fulltext"
-msgstr "Fulltext"
-
-#: libraries/controllers/StructureController.class.php:1970
-#, fuzzy
-#| msgid "Browse distinct values"
-msgid "Distinct values"
-msgstr "Peržiūrėti skirtingas reikšmes"
-
 #: libraries/controllers/TableChartController.class.php:82
 #: libraries/controllers/TableGisVisualizationController.class.php:101
 msgid "No SQL query was set to fetch data."
@@ -8900,13 +8840,20 @@ msgstr ""
 msgid "No data to display"
 msgstr "Nėra duomenų"
 
-#: libraries/controllers/TableRelationController.class.php:217
+#: libraries/controllers/TableIndexesController.class.php:161
+#: libraries/controllers/TableStructureController.class.php:736
+#: tbl_addfield.php:92
+#, php-format
+msgid "Table %1$s has been altered successfully."
+msgstr "Lentelė %1$s sėkmingai pakeista."
+
+#: libraries/controllers/TableRelationController.class.php:218
 #, fuzzy
 #| msgid "Thread %s was successfully killed."
 msgid "Display column was successfully updated."
 msgstr "Gija %s buvo sėkmingai išjungta."
 
-#: libraries/controllers/TableRelationController.class.php:283
+#: libraries/controllers/TableRelationController.class.php:288
 #, fuzzy
 #| msgid "Internal relation added"
 msgid "Internal relations were successfully updated."
@@ -8925,12 +8872,81 @@ msgid "Zoom search"
 msgstr "Paieška"
 
 #: libraries/controllers/TableSearchController.class.php:852
-#: templates/table/selection_form.phtml:59
+#: templates/table/search/selection_form.phtml:59
 #, fuzzy
 #| msgid "Hide search criteria"
 msgid "Find and replace"
 msgstr "Slėpti paieškos kriterijų"
 
+#: libraries/controllers/TableStructureController.class.php:163
+#, php-format
+msgid "The name '%s' is a MySQL reserved keyword."
+msgid_plural "The names '%s' are MySQL reserved keywords."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: libraries/controllers/TableStructureController.class.php:241
+#, fuzzy
+#| msgid "No rows selected"
+msgid "No column selected."
+msgstr "Nepasirinkti įrašai"
+
+#: libraries/controllers/TableStructureController.class.php:467
+#, fuzzy
+#| msgid "The selected users have been deleted successfully."
+msgid "The columns have been moved successfully."
+msgstr "Pažymėti vartotojai sėkmingai pašalinti."
+
+#: libraries/controllers/TableStructureController.class.php:730
+#, fuzzy, php-format
+#| msgid "Table %1$s has been altered successfully."
+msgid ""
+"Table %1$s has been altered successfully. Privileges have been adjusted."
+msgstr "Lentelė %1$s sėkmingai pakeista."
+
+#: libraries/controllers/TableStructureController.class.php:783
+#: libraries/tracking.lib.php:1094
+msgid "Query error"
+msgstr "Užklausos klaida"
+
+#: libraries/controllers/TableStructureController.class.php:948
+#: templates/table/structure/check_all_table_column.phtml:11
+msgid "Change"
+msgstr "Redaguoti"
+
+#: libraries/controllers/TableStructureController.class.php:952
+#: libraries/controllers/TableStructureController.class.php:957
+#: libraries/navigation/Nodes/Node_Index.class.php:30
+#: libraries/tracking.lib.php:926
+#: templates/columns_definitions/column_indexes.phtml:16
+#: templates/columns_definitions/table_fields_definitions.phtml:57
+#: templates/table/structure/check_all_table_column.phtml:30
+#: templates/table/structure/display_structure.phtml:79
+#: templates/table/structure/display_table_stats.phtml:19
+msgid "Index"
+msgstr "Indeksas"
+
+#: libraries/controllers/TableStructureController.class.php:954
+#: libraries/controllers/TableStructureController.class.php:959
+#: templates/columns_definitions/column_indexes.phtml:27
+#: templates/table/structure/check_all_table_column.phtml:37
+msgid "Spatial"
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:955
+#: libraries/controllers/TableStructureController.class.php:960
+#: templates/columns_definitions/column_indexes.phtml:22
+#: templates/table/structure/check_all_table_column.phtml:47
+msgid "Fulltext"
+msgstr "Fulltext"
+
+#: libraries/controllers/TableStructureController.class.php:963
+#, fuzzy
+#| msgid "Browse distinct values"
+msgid "Distinct values"
+msgstr "Peržiūrėti skirtingas reikšmes"
+
 #: libraries/core.lib.php:306
 #, php-format
 msgid "The %s extension is missing. Please check your PHP configuration."
@@ -8977,7 +8993,7 @@ msgid "No Password"
 msgstr "Nėra slaptažodžio"
 
 #: libraries/display_change_password.lib.php:68
-#: libraries/plugins/auth/AuthenticationCookie.class.php:199
+#: libraries/plugins/auth/AuthenticationCookie.class.php:187
 #: libraries/replication_gui.lib.php:422 libraries/replication_gui.lib.php:862
 #: libraries/server_privileges.lib.php:1640
 msgid "Password:"
@@ -9778,12 +9794,12 @@ msgid "Dump has been saved to file %s."
 msgstr "Atvaizdis įrašytas faile %s."
 
 #: libraries/import.lib.php:202 libraries/insert_edit.lib.php:124
-#: libraries/rte/rte_routines.lib.php:1353 libraries/sql.lib.php:1312
+#: libraries/rte/rte_routines.lib.php:1444 libraries/sql.lib.php:1306
 #: tbl_get_field.php:44
 msgid "MySQL returned an empty result set (i.e. zero rows)."
 msgstr "MySQL gražino tuščią rezultatų rinkinį (nėra eilučių)."
 
-#: libraries/import.lib.php:265 libraries/sql.lib.php:1326
+#: libraries/import.lib.php:265 libraries/sql.lib.php:1320
 msgid "[ROLLBACK occurred.]"
 msgstr ""
 
@@ -9858,14 +9874,14 @@ msgstr "Sukurti indeksą &nbsp;%s&nbsp;stulpeliams"
 
 #: libraries/insert_edit.lib.php:233
 #: libraries/navigation/Nodes/Node_DatabaseChild.class.php:48
-#: templates/designer/table_list.phtml:40
+#: templates/database/designer/table_list.phtml:40
 msgid "Hide"
 msgstr "Paslėpti"
 
 #: libraries/insert_edit.lib.php:249
 #: libraries/navigation/Nodes/Node_Function.class.php:32
-#: libraries/rte/rte_routines.lib.php:1495
-#: templates/table/table_header.phtml:4
+#: libraries/rte/rte_routines.lib.php:1586
+#: templates/table/search/table_header.phtml:4
 msgid "Function"
 msgstr "Funkcija"
 
@@ -9880,87 +9896,88 @@ msgstr "Dvejetainis"
 msgid "Because of its length,<br /> this column might not be editable."
 msgstr "Dėl jo ilgio,<br /> šis laukelis gali būti neredaguojamas (tinas)"
 
-#: libraries/insert_edit.lib.php:1050
+#: libraries/insert_edit.lib.php:1048
 msgid "Binary - do not edit"
 msgstr "Dvejetainis - nekeisti"
 
-#: libraries/insert_edit.lib.php:1176 libraries/server_privileges.lib.php:470
-#: templates/table/options.phtml:36
+#: libraries/insert_edit.lib.php:1174 libraries/server_privileges.lib.php:470
+#: templates/table/search/options.phtml:36
 msgid "Or"
 msgstr "Arba"
 
-#: libraries/insert_edit.lib.php:1177
+#: libraries/insert_edit.lib.php:1175
 #, fuzzy
 #| msgid "web server upload directory"
 msgid "web server upload directory:"
 msgstr "web serverio katalogas atsiuntimams"
 
-#: libraries/insert_edit.lib.php:1348 templates/table/input_box.phtml:49
+#: libraries/insert_edit.lib.php:1346
+#: templates/table/search/input_box.phtml:49
 #, fuzzy
 #| msgid "Insert"
 msgid "Edit/Insert"
 msgstr "Įterpti"
 
-#: libraries/insert_edit.lib.php:1398
+#: libraries/insert_edit.lib.php:1396
 #, php-format
 msgid "Continue insertion with %s rows"
 msgstr "Tęstį įterpimą su %s eilučių"
 
-#: libraries/insert_edit.lib.php:1428
+#: libraries/insert_edit.lib.php:1426
 msgid "and then"
 msgstr "ir tada"
 
-#: libraries/insert_edit.lib.php:1461
+#: libraries/insert_edit.lib.php:1459
 msgid "Insert as new row"
 msgstr "Įterpti kaip naują įrašą"
 
-#: libraries/insert_edit.lib.php:1464
+#: libraries/insert_edit.lib.php:1462
 msgid "Insert as new row and ignore errors"
 msgstr "Įterpti kaip naują eilutę ir ignoruoti klaidas"
 
-#: libraries/insert_edit.lib.php:1467
+#: libraries/insert_edit.lib.php:1465
 msgid "Show insert query"
 msgstr "Rodyti įterptą užklausą"
 
-#: libraries/insert_edit.lib.php:1487
+#: libraries/insert_edit.lib.php:1485
 msgid "Go back to previous page"
 msgstr "Sugrįžti į buvusį puslapį"
 
-#: libraries/insert_edit.lib.php:1490
+#: libraries/insert_edit.lib.php:1488
 msgid "Insert another new row"
 msgstr "Įterpti kitą naują eilutę"
 
-#: libraries/insert_edit.lib.php:1495
+#: libraries/insert_edit.lib.php:1493
 msgid "Go back to this page"
 msgstr "Grįžti atgal į šį puslapį"
 
-#: libraries/insert_edit.lib.php:1518
+#: libraries/insert_edit.lib.php:1516
 msgid "Edit next row"
 msgstr "Redaguoti kitą įrašą"
 
-#: libraries/insert_edit.lib.php:1540
+#: libraries/insert_edit.lib.php:1538
 msgid ""
 "Use TAB key to move from value to value, or CTRL+arrows to move anywhere"
 msgstr ""
 "Šokinėjimui tarp reikšmių naudokite TAB mygtuką arba naudokite CTRL+rodyklės"
 
-#: libraries/insert_edit.lib.php:1577 libraries/replication_gui.lib.php:542
-#: libraries/rte/rte_routines.lib.php:1497
+#: libraries/insert_edit.lib.php:1575 libraries/replication_gui.lib.php:542
+#: libraries/rte/rte_routines.lib.php:1588
 #: libraries/server_status_variables.lib.php:220
-#: templates/designer/having_query_panel.phtml:100
-#: templates/designer/options_panel.phtml:73
-#: templates/designer/options_panel.phtml:239
-#: templates/designer/where_query_panel.phtml:69
-#: templates/table/table_header.phtml:10
-#: templates/table/zoom_result_form.phtml:35
+#: templates/database/designer/having_query_panel.phtml:100
+#: templates/database/designer/options_panel.phtml:73
+#: templates/database/designer/options_panel.phtml:239
+#: templates/database/designer/where_query_panel.phtml:69
+#: templates/table/search/table_header.phtml:10
+#: templates/table/search/zoom_result_form.phtml:35
 msgid "Value"
 msgstr "Reikšmė"
 
-#: libraries/insert_edit.lib.php:1937 libraries/sql.lib.php:1309
+#: libraries/insert_edit.lib.php:1935 libraries/sql.lib.php:1303
 msgid "Showing SQL query"
 msgstr "Rodoma SQL užklausa"
 
-#: libraries/insert_edit.lib.php:1962 libraries/sql.lib.php:1287
+#: libraries/insert_edit.lib.php:1960 libraries/sql.lib.php:1281
 #, php-format
 msgid "Inserted row id: %1$d"
 msgstr "Įterpto įrašo id: %1$d"
@@ -10406,7 +10423,7 @@ msgstr ""
 #: libraries/navigation/Nodes/Node_View_Container.class.php:26
 #: libraries/navigation/Nodes/Node_View_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:129
-#: templates/structure/show_create.phtml:30
+#: templates/database/structure/show_create.phtml:30
 msgid "Views"
 msgstr "Rodinys (Views)"
 
@@ -10718,7 +10735,7 @@ msgstr "Neturite pakankamai teisių čia būti!"
 
 #: libraries/operations.lib.php:101 libraries/operations.lib.php:249
 #: libraries/operations.lib.php:869 libraries/operations.lib.php:963
-#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:907
+#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:998
 #: templates/columns_definitions/table_fields_definitions.phtml:47
 #, fuzzy
 #| msgid "Edit Privileges"
@@ -10812,22 +10829,22 @@ msgid "Switch to copied table"
 msgstr "Pereiti į lentelės kopiją"
 
 #: libraries/operations.lib.php:1360
-#: templates/structure/check_all_tables.phtml:18
+#: templates/database/structure/check_all_tables.phtml:18
 msgid "Table maintenance"
 msgstr "Lentelės diagnostika"
 
 #: libraries/operations.lib.php:1398
-#: templates/structure/check_all_tables.phtml:19
+#: templates/database/structure/check_all_tables.phtml:19
 msgid "Analyze table"
 msgstr "Analizuoti lentelę"
 
 #: libraries/operations.lib.php:1413
-#: templates/structure/check_all_tables.phtml:20
+#: templates/database/structure/check_all_tables.phtml:20
 msgid "Check table"
 msgstr "Patikrinti lentelę"
 
 #: libraries/operations.lib.php:1428
-#: templates/structure/check_all_tables.phtml:22
+#: templates/database/structure/check_all_tables.phtml:22
 #, fuzzy
 #| msgid "Check table"
 msgid "Checksum table"
@@ -10847,18 +10864,19 @@ msgid "Flush the table (FLUSH)"
 msgstr "Išvalyti ir perkrauti lentelės podėlį (FLUSH)"
 
 #: libraries/operations.lib.php:1477
-#: templates/structure/check_all_tables.phtml:23
-#: templates/structure/display_table_stats.phtml:56
+#: templates/database/structure/check_all_tables.phtml:23
+#: templates/table/structure/display_table_stats.phtml:56
 msgid "Optimize table"
 msgstr "Optimizuoti"
 
 #: libraries/operations.lib.php:1492
-#: templates/structure/check_all_tables.phtml:24
+#: templates/database/structure/check_all_tables.phtml:24
 msgid "Repair table"
 msgstr "Taisyti lentelę"
 
 #: libraries/operations.lib.php:1538
-#: templates/structure/check_all_tables.phtml:14 view_operations.php:127
+#: templates/database/structure/check_all_tables.phtml:14
+#: view_operations.php:127
 msgid "Delete data or table"
 msgstr "Ištrinti duomenis arba lentelę"
 
@@ -10986,7 +11004,7 @@ msgid "Cannot connect: invalid settings."
 msgstr "Neįmanoma prisijungti: neteisingi duomenys."
 
 #: libraries/plugins/auth/AuthenticationConfig.class.php:108
-#: libraries/plugins/auth/AuthenticationCookie.class.php:134
+#: libraries/plugins/auth/AuthenticationCookie.class.php:122
 #: libraries/plugins/auth/AuthenticationHttp.class.php:96
 #, php-format
 msgid "Welcome to %s"
@@ -11018,38 +11036,38 @@ msgstr ""
 msgid "Retry to connect"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:146
+#: libraries/plugins/auth/AuthenticationCookie.class.php:134
 msgid "Your session has expired. Please log in again."
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:170
+#: libraries/plugins/auth/AuthenticationCookie.class.php:158
 msgid "Log in"
 msgstr "Prisijungti"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:178
-#: libraries/plugins/auth/AuthenticationCookie.class.php:188
+#: libraries/plugins/auth/AuthenticationCookie.class.php:166
+#: libraries/plugins/auth/AuthenticationCookie.class.php:176
 msgid "You can enter hostname/IP address and port separated by space."
 msgstr "Jūs galite įvesti serverio vardą/IP adresą ir prievadą atskirtą tarpu."
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:193
+#: libraries/plugins/auth/AuthenticationCookie.class.php:181
 msgid "Username:"
 msgstr "Naudotojo vardas:"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:205
+#: libraries/plugins/auth/AuthenticationCookie.class.php:193
 #, fuzzy
 #| msgid "Server Choice"
 msgid "Server Choice:"
 msgstr "Pasirinkti serverį"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:386
+#: libraries/plugins/auth/AuthenticationCookie.class.php:374
 msgid "Entered captcha is wrong, try again!"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:396
+#: libraries/plugins/auth/AuthenticationCookie.class.php:384
 msgid "Please enter correct captcha!"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:423
+#: libraries/plugins/auth/AuthenticationCookie.class.php:411
 #, fuzzy
 #| msgid "Cannot log in to the MySQL server"
 msgid "You are not allowed to log in to this MySQL server!"
@@ -11147,7 +11165,7 @@ msgstr "Įvykis"
 #: libraries/plugins/export/ExportOdt.class.php:593
 #: libraries/plugins/export/ExportTexytext.class.php:428
 #: libraries/plugins/export/PMA_ExportPdf.class.php:313
-#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:984
 #: libraries/rte/rte_triggers.lib.php:377
 #, fuzzy
 #| msgid "Description"
@@ -11505,7 +11523,7 @@ msgid "Last check:"
 msgstr "Paskutinis patikrinimas:"
 
 #: libraries/plugins/export/ExportSql.class.php:1399
-#: templates/structure/structure_table_row.phtml:183
+#: templates/database/structure/structure_table_row.phtml:183
 msgid "in use"
 msgstr "šiuo metu naudojama"
 
@@ -11710,20 +11728,14 @@ msgstr ""
 msgid "The imported file does not contain any data!"
 msgstr "Šis puslapis neturi jokių lentelių!"
 
-#: libraries/plugins/import/ImportSql.class.php:169
+#: libraries/plugins/import/ImportSql.class.php:72
 msgid "SQL compatibility mode:"
 msgstr "SQL suderinamumo režimas:"
 
-#: libraries/plugins/import/ImportSql.class.php:181
+#: libraries/plugins/import/ImportSql.class.php:84
 msgid "Do not use <code>AUTO_INCREMENT</code> for zero values"
 msgstr "Nenaudokite <code>AUTO_INCREMENT</code> nulinėms reikšmėms"
 
-#: libraries/plugins/import/ImportSql.class.php:195
-#, fuzzy
-#| msgid "Read misses"
-msgid "Read as multibytes"
-msgstr "Skaitymo nepataikymai"
-
 #: libraries/plugins/import/ImportXml.class.php:54
 msgid "XML"
 msgstr "XML"
@@ -11766,7 +11778,7 @@ msgid "Show grid"
 msgstr "Rodyti tinklelį"
 
 #: libraries/plugins/schema/SchemaPdf.class.php:94
-#: templates/structure/print_view_data_dictionary_link.phtml:6
+#: templates/database/structure/print_view_data_dictionary_link.phtml:6
 msgid "Data Dictionary"
 msgstr "Duomenų žodynas"
 
@@ -11797,7 +11809,7 @@ msgid "The %s table doesn't exist!"
 msgstr "Lentelė %s neegzistuoja!"
 
 #: libraries/plugins/schema/eps/Eps_Relation_Schema.class.php:321
-#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:309
+#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:323
 #, php-format
 msgid "Schema of the %s database - Page %s"
 msgstr "Duomenų bazės %s schema - %s puslapis"
@@ -11826,7 +11838,7 @@ msgstr "Turinys"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1005
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1028
 #: libraries/tracking.lib.php:884
-#: templates/structure/table_structure_header.phtml:11
+#: templates/table/structure/table_structure_header.phtml:11
 msgid "Extra"
 msgstr "Papildomai"
 
@@ -12249,11 +12261,11 @@ msgid "Create the needed tables with the <code>%screate_tables.sql</code>."
 msgstr ""
 "Sukurti reikalaujamas lenteles su <code>examples/create_tables.sql</code>."
 
-#: libraries/relation.lib.php:360
+#: libraries/relation.lib.php:357
 msgid "Create a pma user and give access to these tables."
 msgstr "Sukurti pma naudotoją ir suteikti prieigą prie šių lentelių."
 
-#: libraries/relation.lib.php:365
+#: libraries/relation.lib.php:360
 msgid ""
 "Enable advanced features in configuration file (<code>config.inc.php</"
 "code>), for example by starting from <code>config.sample.inc.php</code>."
@@ -12261,24 +12273,24 @@ msgstr ""
 "Įjungti išplėstines funkcijas konfigūraciniame faile (<code>config.inc.php</"
 "code>), pavyzdžiui, pradėti galite nuo <code>config.sample.inc.php</code>."
 
-#: libraries/relation.lib.php:373
+#: libraries/relation.lib.php:365
 msgid "Re-login to phpMyAdmin to load the updated configuration file."
 msgstr ""
 "Iš naujo prisijunkite prie phpMyAdmin tam, kad užkrautumėte atnaujintą "
 "konfigūracijos failą."
 
-#: libraries/relation.lib.php:1612
+#: libraries/relation.lib.php:1607
 msgid "no description"
 msgstr "Aprašymo nėra"
 
-#: libraries/relation.lib.php:1811
+#: libraries/relation.lib.php:1806
 msgid ""
 "You do not have necessary privileges to create a database named "
 "'phpmyadmin'. You may go to 'Operations' tab of any database to set up the "
 "phpMyAdmin configuration storage there."
 msgstr ""
 
-#: libraries/relation.lib.php:1928
+#: libraries/relation.lib.php:1923
 #, fuzzy, php-format
 #| msgid "Missing phpMyAdmin configuration storage tables"
 msgid ""
@@ -12286,21 +12298,21 @@ msgid ""
 "configuration storage there."
 msgstr "Trūksta phpMyAdmin nustatymų saugyklos lentelių"
 
-#: libraries/relation.lib.php:1936
+#: libraries/relation.lib.php:1931
 #, fuzzy, php-format
 #| msgid "Missing phpMyAdmin configuration storage tables"
 msgid ""
 "%sCreate%s the phpMyAdmin configuration storage in the current database."
 msgstr "Trūksta phpMyAdmin nustatymų saugyklos lentelių"
 
-#: libraries/relation.lib.php:1944
+#: libraries/relation.lib.php:1939
 #, fuzzy, php-format
 #| msgid "Missing phpMyAdmin configuration storage tables"
 msgid "%sCreate%s missing phpMyAdmin configuration storage tables."
 msgstr "Trūksta phpMyAdmin nustatymų saugyklos lentelių"
 
 #: libraries/replication_gui.lib.php:46 libraries/replication_gui.lib.php:343
-#: libraries/server_databases.lib.php:387
+#: libraries/server_databases.lib.php:398
 msgid "Master replication"
 msgstr "Pagrindinio serverio replikavimas"
 
@@ -12374,7 +12386,7 @@ msgstr ""
 "sukonfigūruotas kaip pagrindinis (master)."
 
 #: libraries/replication_gui.lib.php:141
-#: libraries/server_databases.lib.php:389
+#: libraries/server_databases.lib.php:400
 msgid "Slave replication"
 msgstr "Pavaldžiojo serverio replikavimas"
 
@@ -12676,10 +12688,10 @@ msgid "Master server changed successfully to %s."
 msgstr "Pagrindinis (master) serveris sėkmingai pakeistas į %s"
 
 #: libraries/rte/rte_events.lib.php:106 libraries/rte/rte_events.lib.php:115
-#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:149
-#: libraries/rte/rte_routines.lib.php:158
-#: libraries/rte/rte_routines.lib.php:231
-#: libraries/rte/rte_routines.lib.php:1362
+#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:219
+#: libraries/rte/rte_routines.lib.php:246
+#: libraries/rte/rte_routines.lib.php:368
+#: libraries/rte/rte_routines.lib.php:1453
 #: libraries/rte/rte_triggers.lib.php:82 libraries/rte/rte_triggers.lib.php:91
 #: libraries/rte/rte_triggers.lib.php:123
 #, php-format
@@ -12700,7 +12712,7 @@ msgstr "Įvykis %1$s buvo pakeistas."
 msgid "Event %1$s has been created."
 msgstr "Įvykis %1$s buvo sukurtas."
 
-#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:251
+#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:266
 #: libraries/rte/rte_triggers.lib.php:144
 #, fuzzy
 #| msgid ""
@@ -12712,7 +12724,7 @@ msgstr "<b>Viena ar daugiau klaidų įvyko vykdant Jūsų užklausą:</b>"
 msgid "Edit event"
 msgstr "Redaguoti įvykį"
 
-#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:794
+#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:885
 #: libraries/rte/rte_triggers.lib.php:323 view_create.php:180
 msgid "Details"
 msgstr "Detalės"
@@ -12727,7 +12739,7 @@ msgstr "Įvykio tipas"
 msgid "Event type"
 msgstr "Įvykio tipas"
 
-#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:817
+#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:908
 #, php-format
 msgid "Change to %s"
 msgstr "Pakeisti į %s"
@@ -12758,12 +12770,14 @@ msgstr "Pabaiga"
 msgid "On completion preserve"
 msgstr "Pabaigus išlaikyti"
 
-#: libraries/rte/rte_events.lib.php:491 libraries/rte/rte_routines.lib.php:930
+#: libraries/rte/rte_events.lib.php:491
+#: libraries/rte/rte_routines.lib.php:1021
 #: libraries/rte/rte_triggers.lib.php:383 view_create.php:209
 msgid "Definer"
 msgstr ""
 
-#: libraries/rte/rte_events.lib.php:535 libraries/rte/rte_routines.lib.php:997
+#: libraries/rte/rte_events.lib.php:535
+#: libraries/rte/rte_routines.lib.php:1088
 #: libraries/rte/rte_triggers.lib.php:422
 msgid "The definer must be in the \"username@hostname\" format!"
 msgstr ""
@@ -12791,9 +12805,9 @@ msgid "You must provide an event definition."
 msgstr ""
 
 #: libraries/rte/rte_export.lib.php:43 libraries/rte/rte_general.lib.php:72
-#: libraries/rte/rte_routines.lib.php:345
-#: libraries/rte/rte_routines.lib.php:1198
-#: libraries/rte/rte_routines.lib.php:1411
+#: libraries/rte/rte_routines.lib.php:153
+#: libraries/rte/rte_routines.lib.php:1289
+#: libraries/rte/rte_routines.lib.php:1502
 #, fuzzy
 #| msgid "Error in processing request"
 msgid "Error in processing request:"
@@ -12827,129 +12841,129 @@ msgid ""
 "problems."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:110
-#: libraries/rte/rte_routines.lib.php:1006
-#, fuzzy, php-format
-#| msgid "Invalid server index: %s"
-msgid "Invalid routine type: \"%s\""
-msgstr "Blogas serverio indeksas: %s"
-
-#: libraries/rte/rte_routines.lib.php:170
-msgid "Sorry, we failed to restore the dropped routine."
-msgstr ""
-
-#: libraries/rte/rte_routines.lib.php:211
-#, fuzzy, php-format
-#| msgid "Column %s has been dropped."
-msgid "Routine %1$s has been modified. Privileges have been adjusted."
-msgstr "Stulpelis %s panaikintas"
-
-#: libraries/rte/rte_routines.lib.php:216
-#, fuzzy, php-format
-#| msgid "Column %s has been dropped."
-msgid "Routine %1$s has been modified."
-msgstr "Stulpelis %s panaikintas"
-
-#: libraries/rte/rte_routines.lib.php:238
-#, fuzzy, php-format
-#| msgid "Table %1$s has been created."
-msgid "Routine %1$s has been created."
-msgstr "Sukurta %1$s lentelė."
-
-#: libraries/rte/rte_routines.lib.php:315
+#: libraries/rte/rte_routines.lib.php:123
 #, fuzzy
 #| msgid "Edit mode"
 msgid "Edit routine"
 msgstr "Redagavimo režimas"
 
-#: libraries/rte/rte_routines.lib.php:797
+#: libraries/rte/rte_routines.lib.php:200
+#: libraries/rte/rte_routines.lib.php:1097
+#, fuzzy, php-format
+#| msgid "Invalid server index: %s"
+msgid "Invalid routine type: \"%s\""
+msgstr "Blogas serverio indeksas: %s"
+
+#: libraries/rte/rte_routines.lib.php:253
+#, fuzzy, php-format
+#| msgid "Table %1$s has been created."
+msgid "Routine %1$s has been created."
+msgstr "Sukurta %1$s lentelė."
+
+#: libraries/rte/rte_routines.lib.php:380
+msgid "Sorry, we failed to restore the dropped routine."
+msgstr ""
+
+#: libraries/rte/rte_routines.lib.php:439
+#, fuzzy, php-format
+#| msgid "Column %s has been dropped."
+msgid "Routine %1$s has been modified. Privileges have been adjusted."
+msgstr "Stulpelis %s panaikintas"
+
+#: libraries/rte/rte_routines.lib.php:444
+#, fuzzy, php-format
+#| msgid "Column %s has been dropped."
+msgid "Routine %1$s has been modified."
+msgstr "Stulpelis %s panaikintas"
+
+#: libraries/rte/rte_routines.lib.php:888
 #, fuzzy
 #| msgid "Column names"
 msgid "Routine name"
 msgstr "Stulpelių vardai"
 
-#: libraries/rte/rte_routines.lib.php:823
+#: libraries/rte/rte_routines.lib.php:914
 msgid "Parameters"
 msgstr "Parametrai"
 
-#: libraries/rte/rte_routines.lib.php:829
+#: libraries/rte/rte_routines.lib.php:920
 msgid "Direction"
 msgstr "Nukreipimas"
 
-#: libraries/rte/rte_routines.lib.php:847
+#: libraries/rte/rte_routines.lib.php:938
 msgid "Add parameter"
 msgstr "Pridėti parametrą"
 
-#: libraries/rte/rte_routines.lib.php:851
+#: libraries/rte/rte_routines.lib.php:942
 msgid "Remove last parameter"
 msgstr "Pašalinti paskutinį parametrą"
 
-#: libraries/rte/rte_routines.lib.php:856
+#: libraries/rte/rte_routines.lib.php:947
 msgid "Return type"
 msgstr "Gražinimo tipas"
 
-#: libraries/rte/rte_routines.lib.php:862
+#: libraries/rte/rte_routines.lib.php:953
 msgid "Return length/values"
 msgstr "Grąžinimo Ilgis/reikšmės"
 
-#: libraries/rte/rte_routines.lib.php:868
+#: libraries/rte/rte_routines.lib.php:959
 msgid "Return options"
 msgstr "Grąžinimo parametrai"
 
-#: libraries/rte/rte_routines.lib.php:899
+#: libraries/rte/rte_routines.lib.php:990
 msgid "Is deterministic"
 msgstr "Yra apibrėžtas"
 
-#: libraries/rte/rte_routines.lib.php:920
+#: libraries/rte/rte_routines.lib.php:1011
 msgid ""
 "You do not have sufficient privileges to perform this operation; Please "
 "refer to the documentation for more details"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:935
+#: libraries/rte/rte_routines.lib.php:1026
 msgid "Security type"
 msgstr "Saugumo tipas"
 
-#: libraries/rte/rte_routines.lib.php:944
+#: libraries/rte/rte_routines.lib.php:1035
 msgid "SQL data access"
 msgstr "SQL duomenų priėjimas"
 
-#: libraries/rte/rte_routines.lib.php:1013
+#: libraries/rte/rte_routines.lib.php:1104
 #, fuzzy
 #| msgid "You must provide a valid table name"
 msgid "You must provide a routine name!"
 msgstr "Jūs privalote pateikti teisingą lentelės vardą"
 
-#: libraries/rte/rte_routines.lib.php:1047
+#: libraries/rte/rte_routines.lib.php:1138
 #, php-format
 msgid "Invalid direction \"%s\" given for parameter."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1069
-#: libraries/rte/rte_routines.lib.php:1131
+#: libraries/rte/rte_routines.lib.php:1160
+#: libraries/rte/rte_routines.lib.php:1222
 msgid ""
 "You must provide length/values for routine parameters of type ENUM, SET, "
 "VARCHAR and VARBINARY."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1095
+#: libraries/rte/rte_routines.lib.php:1186
 msgid "You must provide a name and a type for each routine parameter."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1114
+#: libraries/rte/rte_routines.lib.php:1205
 msgid "You must provide a valid return type for the routine."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1174
+#: libraries/rte/rte_routines.lib.php:1265
 msgid "You must provide a routine definition."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1285
+#: libraries/rte/rte_routines.lib.php:1376
 #, php-format
 msgid "Execution results of routine %s"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1340
+#: libraries/rte/rte_routines.lib.php:1431
 #, php-format
 msgid "%d row affected by the last statement inside the procedure."
 msgid_plural "%d rows affected by the last statement inside the procedure."
@@ -12957,13 +12971,13 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: libraries/rte/rte_routines.lib.php:1398
-#: libraries/rte/rte_routines.lib.php:1406
+#: libraries/rte/rte_routines.lib.php:1489
+#: libraries/rte/rte_routines.lib.php:1497
 msgid "Execute routine"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1485
-#: libraries/rte/rte_routines.lib.php:1488
+#: libraries/rte/rte_routines.lib.php:1576
+#: libraries/rte/rte_routines.lib.php:1579
 msgid "Routine parameters"
 msgstr ""
 
@@ -13129,7 +13143,7 @@ msgid "Original position"
 msgstr "Pirminė padėtis"
 
 #: libraries/server_bin_log.lib.php:133
-#: templates/structure/display_table_stats.phtml:4
+#: templates/table/structure/display_table_stats.phtml:4
 msgid "Information"
 msgstr "Informacija"
 
@@ -13167,12 +13181,12 @@ msgstr ""
 "Pastaba: jeigu duomenų bazės statistika įjungta, duomenų srautas tarp www ir "
 "MySQL darbinių stočių gali labai padidėti."
 
-#: libraries/server_databases.lib.php:364
-#: libraries/server_databases.lib.php:365
+#: libraries/server_databases.lib.php:366
+#: libraries/server_databases.lib.php:371
 msgid "Enable Statistics"
 msgstr "Leisti statistiką"
 
-#: libraries/server_databases.lib.php:481
+#: libraries/server_databases.lib.php:492
 #, fuzzy, php-format
 #| msgid "%s databases have been dropped successfully."
 msgid "%1$d database has been dropped successfully."
@@ -13561,7 +13575,7 @@ msgid "You have revoked the privileges for %s."
 msgstr "Jūs panaikinote privilegijas %s."
 
 #: libraries/server_privileges.lib.php:2059
-#: libraries/server_privileges.lib.php:4290
+#: libraries/server_privileges.lib.php:4316
 #, fuzzy
 #| msgid "Add user"
 msgid "Add user account"
@@ -13749,60 +13763,60 @@ msgstr "Šaliname: %s"
 msgid "The privileges were reloaded successfully."
 msgstr "Teisės sėkmingai perkrautos."
 
-#: libraries/server_privileges.lib.php:3994
+#: libraries/server_privileges.lib.php:4003
 #, php-format
 msgid "The user %s already exists!"
 msgstr "Vartotojas %s jau yra!"
 
-#: libraries/server_privileges.lib.php:4232
+#: libraries/server_privileges.lib.php:4258
 #, fuzzy, php-format
 #| msgid "Privileges"
 msgid "Privileges for %s"
 msgstr "Privilegijos"
 
-#: libraries/server_privileges.lib.php:4241
+#: libraries/server_privileges.lib.php:4267
 #: libraries/server_status_processes.lib.php:72
 #: libraries/server_user_groups.lib.php:39
 msgid "User"
 msgstr "Naudotojas"
 
-#: libraries/server_privileges.lib.php:4282
+#: libraries/server_privileges.lib.php:4308
 msgctxt "Create new user"
 msgid "New"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4311
+#: libraries/server_privileges.lib.php:4337
 #, fuzzy
 #| msgid "Edit Privileges"
 msgid "Edit privileges:"
 msgstr "Redaguoti privilegijas"
 
-#: libraries/server_privileges.lib.php:4312
+#: libraries/server_privileges.lib.php:4338
 #, fuzzy
 #| msgid "Users"
 msgid "User account"
 msgstr "Naudotojai"
 
-#: libraries/server_privileges.lib.php:4371
+#: libraries/server_privileges.lib.php:4397
 msgid ""
 "Note: You are attempting to edit privileges of the user with which you are "
 "currently logged in."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4391 libraries/server_users.lib.php:25
+#: libraries/server_privileges.lib.php:4417 libraries/server_users.lib.php:25
 #, fuzzy
 #| msgid "Users overview"
 msgid "User accounts overview"
 msgstr "Naudotojų apžvalga"
 
-#: libraries/server_privileges.lib.php:4459
+#: libraries/server_privileges.lib.php:4485
 msgid ""
 "A user account allowing any user from localhost to connect is present. This "
 "will prevent other users from connecting if the host part of their account "
 "allows a connection from any (%) host."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4500
+#: libraries/server_privileges.lib.php:4526
 #, php-format
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
@@ -13814,7 +13828,7 @@ msgstr ""
 "lentelės. Šiose lentelėse nurodytos teisės gali skirtis nuo nustatymų "
 "failuose nurodytų teisių. Todėl %sperkraukite teises%s, jeigu norite tęsti."
 
-#: libraries/server_privileges.lib.php:4519
+#: libraries/server_privileges.lib.php:4545
 #, fuzzy
 #| msgid ""
 #| "Note: phpMyAdmin gets the users' privileges directly from MySQL's "
@@ -13832,26 +13846,26 @@ msgstr ""
 "lentelės. Šiose lentelėse nurodytos teisės gali skirtis nuo nustatymų "
 "failuose nurodytų teisių. Todėl %sperkraukite teises%s, jeigu norite tęsti."
 
-#: libraries/server_privileges.lib.php:4569
+#: libraries/server_privileges.lib.php:4595
 msgid "The selected user was not found in the privilege table."
 msgstr "Privilegijų lentelėje pasirinktas vartotojas nerastas."
 
-#: libraries/server_privileges.lib.php:4801
+#: libraries/server_privileges.lib.php:4827
 msgid "You have added a new user."
 msgstr "Jūs sukūrėte naują vartotoją."
 
-#: libraries/server_status.lib.php:53
+#: libraries/server_status.lib.php:60
 #, php-format
 msgid "Network traffic since startup: %s"
 msgstr ""
 
-#: libraries/server_status.lib.php:66
+#: libraries/server_status.lib.php:73
 #, fuzzy, php-format
 #| msgid "s MySQL server has been running for %s. It started up on %s."
 msgid "This MySQL server has been running for %1$s. It started up on %2$s."
 msgstr "MySQL serverio veikimo trukmė: %s. Serveris pradėjo veikti: %s."
 
-#: libraries/server_status.lib.php:80
+#: libraries/server_status.lib.php:94
 msgid ""
 "This MySQL server works as <b>master</b> and <b>slave</b> in <b>replication</"
 "b> process."
@@ -13859,43 +13873,43 @@ msgstr ""
 "Šis MySQL serveris veikia kaip <b>pagrindinis</b> ir kaip <b>pavaldusis</b> "
 "serveris <b>dauginimo</b> procese."
 
-#: libraries/server_status.lib.php:85
+#: libraries/server_status.lib.php:99
 msgid "This MySQL server works as <b>master</b> in <b>replication</b> process."
 msgstr ""
 "Šis MySQL serveris veikia kaip <b>pagrindinis</b> serveris <b>dauginimo</b> "
 "procese."
 
-#: libraries/server_status.lib.php:90
+#: libraries/server_status.lib.php:104
 msgid "This MySQL server works as <b>slave</b> in <b>replication</b> process."
 msgstr ""
 "Šis MySQL serveris veikia kaip <b>pavaldusis</b> serveris <b>dauginimo</b> "
 "procese."
 
-#: libraries/server_status.lib.php:106
+#: libraries/server_status.lib.php:116
 msgid "Replication status"
 msgstr "Dauginimo būsena"
 
-#: libraries/server_status.lib.php:137
+#: libraries/server_status.lib.php:146
 msgid ""
 "On a busy server, the byte counters may overrun, so those statistics as "
 "reported by the MySQL server may be incorrect."
 msgstr ""
 
-#: libraries/server_status.lib.php:148
+#: libraries/server_status.lib.php:157
 msgid "Received"
 msgstr "Gauta"
 
-#: libraries/server_status.lib.php:167
+#: libraries/server_status.lib.php:176
 msgid "Sent"
 msgstr "Siųsta"
 
-#: libraries/server_status.lib.php:234
+#: libraries/server_status.lib.php:243
 #, fuzzy
 #| msgid "max. concurrent connections"
 msgid "Max. concurrent connections"
 msgstr "Daugiausia lygiagrečių prisijungimų"
 
-#: libraries/server_status.lib.php:244
+#: libraries/server_status.lib.php:253
 msgid "Failed attempts"
 msgstr "Nepavykę bandymai"
 
@@ -14862,7 +14876,7 @@ msgstr ""
 msgid "Not implemented yet."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/AlterOperation.php:193
+#: libraries/sql-parser/src/Components/AlterOperation.php:191
 #, fuzzy
 #| msgid "Iconic table operations"
 msgid "Unrecognized alter operation."
@@ -14878,7 +14892,7 @@ msgid "An opening bracket followed by a set of values was expected."
 msgstr ""
 
 #: libraries/sql-parser/src/Components/ArrayObj.php:101
-#: libraries/sql-parser/src/Components/FieldDefinition.php:202
+#: libraries/sql-parser/src/Components/CreateDefinition.php:202
 msgid "An opening bracket was expected."
 msgstr ""
 
@@ -14886,25 +14900,35 @@ msgstr ""
 msgid "A comma or a closing bracket was expected"
 msgstr ""
 
+#: libraries/sql-parser/src/Components/CreateDefinition.php:246
+#, fuzzy
+#| msgid "No databases selected."
+msgid "A comma or a closing bracket was expected."
+msgstr "Nepažymėjote duomenų bazės."
+
+#: libraries/sql-parser/src/Components/CreateDefinition.php:262
+msgid "A closing bracket was expected."
+msgstr ""
+
 #: libraries/sql-parser/src/Components/DataType.php:125
 msgid "Unrecognized data type."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:225
+#: libraries/sql-parser/src/Components/Expression.php:227
 msgid "Unexpected closing bracket."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:246
-#: libraries/sql-parser/src/Components/Expression.php:283
-#: libraries/sql-parser/src/Components/Expression.php:303
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:285
+#: libraries/sql-parser/src/Components/Expression.php:305
 msgid "An alias was previously found."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:257
+#: libraries/sql-parser/src/Components/Expression.php:259
 msgid "Unexpected dot."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:327
+#: libraries/sql-parser/src/Components/Expression.php:329
 #, fuzzy
 #| msgid "No databases selected."
 msgid "An alias was expected."
@@ -14916,16 +14940,6 @@ msgstr "Nepažymėjote duomenų bazės."
 msgid "An expression was expected."
 msgstr "Nepasirinkti įrašai"
 
-#: libraries/sql-parser/src/Components/FieldDefinition.php:246
-#, fuzzy
-#| msgid "No databases selected."
-msgid "A comma or a closing bracket was expected."
-msgstr "Nepažymėjote duomenų bazės."
-
-#: libraries/sql-parser/src/Components/FieldDefinition.php:262
-msgid "A closing bracket was expected."
-msgstr ""
-
 #: libraries/sql-parser/src/Components/Limit.php:90
 #: libraries/sql-parser/src/Components/Limit.php:112
 msgid "An offset was expected."
@@ -14971,29 +14985,29 @@ msgstr ""
 msgid "Expected delimiter."
 msgstr ""
 
-#: libraries/sql-parser/src/Lexer.php:753
+#: libraries/sql-parser/src/Lexer.php:777
 #, fuzzy, php-format
 #| msgid "Event %1$s has been created."
 msgid "Ending quote %1$s was expected."
 msgstr "Įvykis %1$s buvo sukurtas."
 
-#: libraries/sql-parser/src/Lexer.php:789
+#: libraries/sql-parser/src/Lexer.php:813
 #, fuzzy
 #| msgid "Table name template"
 msgid "Variable name was expected."
 msgstr "Lentelės vardo šablonas"
 
-#: libraries/sql-parser/src/Parser.php:380
+#: libraries/sql-parser/src/Parser.php:391
 #, fuzzy
 #| msgid "At Beginning of Table"
 msgid "Unexpected beginning of statement."
 msgstr "Lentelės pradžioje"
 
-#: libraries/sql-parser/src/Parser.php:399
+#: libraries/sql-parser/src/Parser.php:410
 msgid "Unrecognized statement type."
 msgstr ""
 
-#: libraries/sql-parser/src/Parser.php:479
+#: libraries/sql-parser/src/Parser.php:489
 msgid "No transaction was previously started."
 msgstr ""
 
@@ -15021,8 +15035,10 @@ msgid "The name of the entity was expected."
 msgstr "Lentelių kurios yra atidarytos skaičius."
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:310
-msgid "At least one field definition was expected."
-msgstr ""
+#, fuzzy
+#| msgid "The row has been deleted."
+msgid "At least one column definition was expected."
+msgstr "Eilutė buvo ištrinta"
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:329
 msgid "A \"RETURNS\" keyword was expected."
@@ -15099,25 +15115,25 @@ msgstr "Žymė %s sukurta"
 msgid "Using bookmark \"%s\" as default browse query."
 msgstr ""
 
-#: libraries/sql.lib.php:1306
+#: libraries/sql.lib.php:1300
 msgid "Showing as PHP code"
 msgstr "Rodomas PHP kodas"
 
-#: libraries/sql.lib.php:1638
+#: libraries/sql.lib.php:1632
 #, php-format
 msgid ""
 "Current selection does not contain a unique column. Grid edit, checkbox, "
 "Edit, Copy and Delete features are not available. %s"
 msgstr ""
 
-#: libraries/sql.lib.php:1649
+#: libraries/sql.lib.php:1643
 #, php-format
 msgid ""
 "Current selection does not contain a unique column. Grid edit, Edit, Copy "
 "and Delete features may result in undesired behavior. %s"
 msgstr ""
 
-#: libraries/sql.lib.php:1688
+#: libraries/sql.lib.php:1682
 #, php-format
 msgid "Problems with indexes of table `%s`"
 msgstr "Iškilo problemos su `%s` lentelės indeksais"
@@ -15284,7 +15300,7 @@ msgid "Version %s snapshot (SQL code)"
 msgstr ""
 
 #: libraries/tracking.lib.php:947
-#: templates/structure/table_structure_row.phtml:33
+#: templates/table/structure/table_structure_row.phtml:33
 msgctxt "None for default"
 msgid "None"
 msgstr "Jokio"
@@ -15339,15 +15355,15 @@ msgstr "Sukurti versiją"
 msgid "Version %1$s was created, tracking for %2$s is active."
 msgstr ""
 
-#: libraries/user_preferences.inc.php:29
+#: libraries/user_preferences.inc.php:30
 msgid "Manage your settings"
 msgstr "Keiskite savo nustatymus"
 
-#: libraries/user_preferences.inc.php:46 prefs_manage.php:307
+#: libraries/user_preferences.inc.php:54 prefs_manage.php:307
 msgid "Configuration has been saved."
 msgstr "Konfigūracija išsaugota."
 
-#: libraries/user_preferences.inc.php:66
+#: libraries/user_preferences.inc.php:74
 #, php-format
 msgid ""
 "Your preferences will be saved for current session only. Storing them "
@@ -15764,7 +15780,7 @@ msgid "first"
 msgstr ""
 
 #: templates/columns_definitions/move_column.phtml:12
-#: templates/structure/add_column.phtml:21
+#: templates/table/structure/add_column.phtml:21
 #, fuzzy, php-format
 #| msgid "After %s"
 msgid "after %s"
@@ -15848,228 +15864,336 @@ msgstr "Naršyklės transformacija"
 msgid "Input transformation options"
 msgstr "Transformacijos nustatymai"
 
-#: templates/designer/aggregate_query_panel.phtml:22
-#: templates/designer/options_panel.phtml:100
+#: templates/database/create_table.phtml:7
+#: templates/database/designer/side_menu.phtml:77
+#: templates/database/designer/side_menu.phtml:80
+msgid "Create table"
+msgstr "Sukurti lentelę"
+
+#: templates/database/create_table.phtml:15
+msgid "Number of columns"
+msgstr "Stulpelių skaičius"
+
+#: templates/database/designer/aggregate_query_panel.phtml:22
+#: templates/database/designer/options_panel.phtml:100
 msgid "Aggregate"
 msgstr ""
 
-#: templates/designer/aggregate_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:61
-#: templates/designer/options_panel.phtml:106
-#: templates/designer/options_panel.phtml:170
-#: templates/designer/where_query_panel.phtml:30
-#: templates/table/table_header.phtml:9
+#: templates/database/designer/aggregate_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:61
+#: templates/database/designer/options_panel.phtml:106
+#: templates/database/designer/options_panel.phtml:170
+#: templates/database/designer/where_query_panel.phtml:30
+#: templates/table/search/table_header.phtml:9
 msgid "Operator"
 msgstr "Operatorius"
 
-#: templates/designer/database_tables.phtml:29
+#: templates/database/designer/database_tables.phtml:29
 msgid "Toggle"
 msgstr ""
 
-#: templates/designer/database_tables.phtml:40
+#: templates/database/designer/database_tables.phtml:40
 #, fuzzy
 #| msgid "Database for user"
 msgid "See table structure"
 msgstr "Vartotojo duomenų bazė"
 
-#: templates/designer/delete_relation_panel.phtml:21
+#: templates/database/designer/delete_relation_panel.phtml:21
 msgid "Delete relation"
 msgstr "Ištrinti sąryšį"
 
-#: templates/designer/edit_delete_pages.phtml:7
+#: templates/database/designer/edit_delete_pages.phtml:7
 #, fuzzy
 #| msgid "Page titles"
 msgid "Page to open"
 msgstr "Puslapių pavadinimai"
 
-#: templates/designer/edit_delete_pages.phtml:7
+#: templates/database/designer/edit_delete_pages.phtml:7
 #, fuzzy
 #| msgid "Relation deleted"
 msgid "Page to delete"
 msgstr "Sąryšis ištrintas"
 
-#: templates/designer/having_query_panel.phtml:90
-#: templates/designer/options_panel.phtml:63
-#: templates/designer/options_panel.phtml:229
-#: templates/designer/where_query_panel.phtml:59
+#: templates/database/designer/having_query_panel.phtml:90
+#: templates/database/designer/options_panel.phtml:63
+#: templates/database/designer/options_panel.phtml:229
+#: templates/database/designer/where_query_panel.phtml:59
 msgid "Except"
 msgstr "Išskyrus"
 
-#: templates/designer/having_query_panel.phtml:102
-#: templates/designer/options_panel.phtml:75
-#: templates/designer/options_panel.phtml:241
-#: templates/designer/where_query_panel.phtml:71
+#: templates/database/designer/having_query_panel.phtml:102
+#: templates/database/designer/options_panel.phtml:75
+#: templates/database/designer/options_panel.phtml:241
+#: templates/database/designer/where_query_panel.phtml:71
 msgid "subquery"
 msgstr ""
 
-#: templates/designer/new_relation_panel.phtml:22
-#: templates/designer/side_menu.phtml:84 templates/designer/side_menu.phtml:87
+#: templates/database/designer/new_relation_panel.phtml:22
+#: templates/database/designer/side_menu.phtml:84
+#: templates/database/designer/side_menu.phtml:87
 msgid "Create relation"
 msgstr "Sukurti sąryšį"
 
-#: templates/designer/options_panel.phtml:34
-#: templates/designer/options_panel.phtml:200
+#: templates/database/designer/options_panel.phtml:34
+#: templates/database/designer/options_panel.phtml:200
 #, fuzzy
 #| msgid "Relation deleted"
 msgid "Relation operator"
 msgstr "Sąryšis ištrintas"
 
-#: templates/designer/options_panel.phtml:85
-#: templates/designer/rename_to_panel.phtml:23
+#: templates/database/designer/options_panel.phtml:85
+#: templates/database/designer/rename_to_panel.phtml:23
 msgid "Rename to"
 msgstr "Pervadinti į"
 
-#: templates/designer/options_panel.phtml:91
-#: templates/designer/rename_to_panel.phtml:31
+#: templates/database/designer/options_panel.phtml:91
+#: templates/database/designer/rename_to_panel.phtml:31
 msgid "New name"
 msgstr "Naujas vardas"
 
-#: templates/designer/page_save_as.phtml:4
+#: templates/database/designer/page_save_as.phtml:4
 #, fuzzy
 #| msgid "Export to selected page"
 msgid "Save to selected page"
 msgstr "Eksportuoti pasirinktą puslapį"
 
-#: templates/designer/page_save_as.phtml:5
+#: templates/database/designer/page_save_as.phtml:5
 #, fuzzy
 #| msgid "Create a page and export to it"
 msgid "Create a page and save to it"
 msgstr "Sukurti puslapį ir eksportuoti į jį"
 
-#: templates/designer/page_save_as.phtml:26
+#: templates/database/designer/page_save_as.phtml:26
 #, fuzzy
 #| msgid "New page name: "
 msgid "New page name"
 msgstr "Naujas puslapio vardas: "
 
-#: templates/designer/page_selector.phtml:2
+#: templates/database/designer/page_selector.phtml:2
 msgid "Select page"
 msgstr "Pasirinkite puslapį"
 
-#: templates/designer/query_details.phtml:10
+#: templates/database/designer/query_details.phtml:10
 msgid "Active options"
 msgstr ""
 
-#: templates/designer/schema_export.phtml:4
+#: templates/database/designer/schema_export.phtml:4
 msgid "Select Export Relational Type"
 msgstr "Pasirinkti eksportavimo sąryšinį tipą"
 
-#: templates/designer/side_menu.phtml:19 templates/designer/side_menu.phtml:25
+#: templates/database/designer/side_menu.phtml:19
+#: templates/database/designer/side_menu.phtml:25
 #, fuzzy
 #| msgid "Show tables"
 msgid "Show/Hide tables list"
 msgstr "Rodyti lentelės"
 
-#: templates/designer/side_menu.phtml:29 templates/designer/side_menu.phtml:35
-#: templates/designer/side_menu.phtml:36
+#: templates/database/designer/side_menu.phtml:29
+#: templates/database/designer/side_menu.phtml:35
+#: templates/database/designer/side_menu.phtml:36
 msgid "View in fullscreen"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:34
+#: templates/database/designer/side_menu.phtml:34
 msgid "Exit fullscreen"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:41 templates/designer/side_menu.phtml:45
+#: templates/database/designer/side_menu.phtml:41
+#: templates/database/designer/side_menu.phtml:45
 #, fuzzy
 #| msgid "New name"
 msgid "New page"
 msgstr "Naujas vardas"
 
-#: templates/designer/side_menu.phtml:70 templates/designer/side_menu.phtml:73
+#: templates/database/designer/side_menu.phtml:70
+#: templates/database/designer/side_menu.phtml:73
 #, fuzzy
 #| msgid "Select page"
 msgid "Delete pages"
 msgstr "Pasirinkite puslapį"
 
-#: templates/designer/side_menu.phtml:77 templates/designer/side_menu.phtml:80
-#: templates/table/create_table.phtml:7
-msgid "Create table"
-msgstr "Sukurti lentelę"
-
-#: templates/designer/side_menu.phtml:98
-#: templates/designer/side_menu.phtml:101
+#: templates/database/designer/side_menu.phtml:98
+#: templates/database/designer/side_menu.phtml:101
 msgid "Reload"
 msgstr "Įkrauti iš naujo"
 
-#: templates/designer/side_menu.phtml:107
-#: templates/designer/side_menu.phtml:110
+#: templates/database/designer/side_menu.phtml:107
+#: templates/database/designer/side_menu.phtml:110
 msgid "Help"
 msgstr "Pagalba"
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 #, fuzzy
 msgid "Angular links"
 msgstr "Kampuotos (angular) nuorodos"
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Direct links"
 msgstr "Tiesioginės nuorodos"
 
-#: templates/designer/side_menu.phtml:122
-#: templates/designer/side_menu.phtml:124
+#: templates/database/designer/side_menu.phtml:122
+#: templates/database/designer/side_menu.phtml:124
 msgid "Snap to grid"
 msgstr "Pritraukti prie tinklelio"
 
-#: templates/designer/side_menu.phtml:128
-#: templates/designer/side_menu.phtml:134
+#: templates/database/designer/side_menu.phtml:128
+#: templates/database/designer/side_menu.phtml:134
 msgid "Small/Big All"
 msgstr "Mažinti/didinti visus"
 
-#: templates/designer/side_menu.phtml:138
-#: templates/designer/side_menu.phtml:141
+#: templates/database/designer/side_menu.phtml:138
+#: templates/database/designer/side_menu.phtml:141
 msgid "Toggle small/big"
 msgstr "Suskleisti/Išskleisti"
 
-#: templates/designer/side_menu.phtml:145
-#: templates/designer/side_menu.phtml:148
+#: templates/database/designer/side_menu.phtml:145
+#: templates/database/designer/side_menu.phtml:148
 #, fuzzy
 #| msgid "To select relation, click :"
 msgid "Toggle relation lines"
 msgstr "Sąryšio pasirinkimui, paspauskite:"
 
-#: templates/designer/side_menu.phtml:153
-#: templates/designer/side_menu.phtml:156
+#: templates/database/designer/side_menu.phtml:153
+#: templates/database/designer/side_menu.phtml:156
 #, fuzzy
 #| msgid "Export"
 msgid "Export schema"
 msgstr "Eksportuoti"
 
-#: templates/designer/side_menu.phtml:165
-#: templates/designer/side_menu.phtml:168
+#: templates/database/designer/side_menu.phtml:165
+#: templates/database/designer/side_menu.phtml:168
 #, fuzzy
 #| msgid "Submit Query"
 msgid "Build Query"
 msgstr "Vykdyti užklausą"
 
-#: templates/designer/side_menu.phtml:173
-#: templates/designer/side_menu.phtml:177
+#: templates/database/designer/side_menu.phtml:173
+#: templates/database/designer/side_menu.phtml:177
 msgid "Move Menu"
 msgstr "Perkelti meniu"
 
-#: templates/designer/side_menu.phtml:181
-#: templates/designer/side_menu.phtml:186
+#: templates/database/designer/side_menu.phtml:181
+#: templates/database/designer/side_menu.phtml:186
 #, fuzzy
 #| msgid "Partial texts"
 msgid "Pin text"
 msgstr "Tekstus rodyti dalinai"
 
-#: templates/designer/table_list.phtml:4
+#: templates/database/designer/table_list.phtml:4
 msgid "Hide/Show all"
 msgstr "Paslėpti/rodyti visus"
 
-#: templates/designer/table_list.phtml:14
+#: templates/database/designer/table_list.phtml:14
 msgid "Hide/Show Tables with no relation"
 msgstr "Slėpti/rodyti lenteles be sąryšių"
 
-#: templates/designer/table_list.phtml:59
+#: templates/database/designer/table_list.phtml:59
 #, fuzzy
 #| msgid "Number of tables"
 msgid "Number of tables:"
 msgstr "Lentelių skaičius"
 
+#: templates/database/structure/body_for_table_summary.phtml:6
+#, php-format
+msgid "%s table"
+msgid_plural "%s tables"
+msgstr[0] "%s lentelė"
+msgstr[1] "%s lentelės"
+msgstr[2] "%s lentelių"
+
+#: templates/database/structure/body_for_table_summary.phtml:17
+msgid "Sum"
+msgstr "Sumos"
+
+#: templates/database/structure/check_all_tables.phtml:6
+msgid "Check tables having overhead"
+msgstr "Pažymėti turinčias perteklių"
+
+#: templates/database/structure/check_all_tables.phtml:10
+#, fuzzy
+#| msgid "Show color"
+msgid "Show create"
+msgstr "Rodyti spalvą"
+
+#: templates/database/structure/check_all_tables.phtml:27
+#, fuzzy
+#| msgid "Add prefix"
+msgid "Prefix"
+msgstr "Pridėti priešdėlį"
+
+#: templates/database/structure/check_all_tables.phtml:28
+msgid "Add prefix to table"
+msgstr "Pridėti priešdėlį lentelės pavadinimui"
+
+#: templates/database/structure/check_all_tables.phtml:29
+msgid "Replace table prefix"
+msgstr "Pakeisti lentelės pavadinimo priešdėlį"
+
+#: templates/database/structure/check_all_tables.phtml:30
+msgid "Copy table with prefix"
+msgstr "Kopijuoti lentelę su pavadinimo priešdėliu"
+
+#: templates/database/structure/check_all_tables.phtml:36
+#, fuzzy
+#| msgid "CHAR textarea columns"
+msgid "Add columns to central list"
+msgstr "CHAR tekstinio laukelio stulpelių skaičius"
+
+#: templates/database/structure/check_all_tables.phtml:37
+msgid "Remove columns from central list"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:38
+#, fuzzy
+#| msgid "CHAR textarea columns"
+msgid "Make consistent with central list"
+msgstr "CHAR tekstinio laukelio stulpelių skaičius"
+
+#: templates/database/structure/favorite_anchor.phtml:12
+#, fuzzy
+#| msgid "Add this series"
+msgid "Add to Favorites"
+msgstr "Pridėti šią eilę"
+
+#: templates/database/structure/show_create.phtml:2
+#, fuzzy
+#| msgid "Show SQL queries"
+msgid "Showing create queries"
+msgstr "Rodyti SQL užklausas"
+
+#: templates/database/structure/sortable_header.phtml:13
+msgid "Sort"
+msgstr "Rūšiuoti"
+
+#: templates/database/structure/table_header.phtml:42
+#, fuzzy
+#| msgid "May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]"
+msgid ""
+"May be approximate. Click on the number to get the exact count. See "
+"[doc@faq3-11]FAQ 3.11[/doc]."
+msgstr "Gali būti apytikslis. Žiūrėkite [doc@faq3-11]DUK 3.11[/doc]"
+
+#: templates/database/structure/table_header.phtml:66
+#: templates/table/index_form.phtml:127
+msgid "Size"
+msgstr "Dydis"
+
+#: templates/database/structure/table_header.phtml:74
+#: templates/table/structure/display_table_stats.phtml:27
+msgid "Overhead"
+msgstr "Perteklius"
+
+#: templates/database/structure/tracking_icon.phtml:4
+msgid "Tracking is active."
+msgstr "Sekimas yra aktyvus."
+
+#: templates/database/structure/tracking_icon.phtml:8
+msgid "Tracking is not active."
+msgstr "Sekimas yra neaktyvus."
+
 #: templates/error/report_form.phtml:7
 msgid ""
 "phpMyAdmin has encountered an error. We have collected data about this error "
@@ -16085,67 +16209,6 @@ msgstr ""
 msgid "Please explain the steps that lead to the error:"
 msgstr ""
 
-#: templates/gis_visualization/gis_visualization.phtml:3
-msgid "Display GIS Visualization"
-msgstr "Rodyti GIS vizualizaciją"
-
-#: templates/gis_visualization/gis_visualization.phtml:8
-msgid "Label column"
-msgstr "Etiketės stulpelis"
-
-#: templates/gis_visualization/gis_visualization.phtml:11
-msgid "-- None --"
-msgstr "-- Tuščia --"
-
-#: templates/gis_visualization/gis_visualization.phtml:19
-msgid "Spatial column"
-msgstr ""
-
-#: templates/index_form.phtml:16
-msgid "Index name:"
-msgstr "Indekso vardas&nbsp;:"
-
-#: templates/index_form.phtml:19
-msgid ""
-"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
-msgstr "\"PRIMARY\" <b>yra vienintelis</b> pirminio rakto tipas!"
-
-#: templates/index_form.phtml:40
-#, fuzzy
-#| msgid "Index cache size"
-msgid "Index choice:"
-msgstr "Indekso podėlio (cache) dydis"
-
-#: templates/index_form.phtml:57
-msgid "Key block size:"
-msgstr ""
-
-#: templates/index_form.phtml:74
-msgid "Index type:"
-msgstr "Indekso tipas&nbsp;:"
-
-#: templates/index_form.phtml:86
-#, fuzzy
-#| msgid "User"
-msgid "Parser:"
-msgstr "Naudotojas"
-
-#: templates/index_form.phtml:102
-#, fuzzy
-#| msgid "Comment"
-msgid "Comment:"
-msgstr "Komentaras"
-
-#: templates/index_form.phtml:127 templates/structure/table_header.phtml:66
-msgid "Size"
-msgstr "Dydis"
-
-#: templates/index_form.phtml:149 templates/index_form.phtml:190
-#, fuzzy
-#| msgid "Drag to reorder"
-msgid "Drag to reorder"
-msgstr "Vilkite, kad pertvarkytumėte"
-
 #: templates/prefs_autoload.phtml:9
 msgid ""
 "Your browser has phpMyAdmin configuration for this domain. Would you like to "
@@ -16158,335 +16221,28 @@ msgstr ""
 msgid "Start row:"
 msgstr "Pradėti eilute"
 
-#: templates/structure/actions_in_table_structure.phtml:14
-#, php-format
-msgid "A primary key has been added on %s."
-msgstr "Stulpeliui %s sukurtas PIRMINIS raktas."
-
-#: templates/structure/actions_in_table_structure.phtml:34
-#: templates/structure/actions_in_table_structure.phtml:54
-#: templates/structure/actions_in_table_structure.phtml:79
-#: templates/structure/actions_in_table_structure.phtml:101
-#, php-format
-msgid "An index has been added on %s."
-msgstr "Indeksas sukurtas %s stulpeliui."
-
-#: templates/structure/actions_in_table_structure.phtml:130
-#: templates/structure/check_all_table_column.phtml:59
-#, fuzzy
-#| msgid "Remove column(s)"
-msgid "Remove from central columns"
-msgstr "Pašalinti stulpelį(-ius)"
-
-#: templates/structure/actions_in_table_structure.phtml:138
-#: templates/structure/check_all_table_column.phtml:55
-#, fuzzy
-#| msgid "CHAR textarea columns"
-msgid "Add to central columns"
-msgstr "CHAR tekstinio laukelio stulpelių skaičius"
-
-#: templates/structure/add_column.phtml:7
-#, php-format
-msgid "Add %s column(s)"
-msgstr "Pridėti %s stulpelį(-ius)"
-
-#: templates/structure/add_column.phtml:12
-#, fuzzy
-#| msgid "At Beginning of Table"
-msgid "at beginning of table"
-msgstr "Lentelės pradžioje"
-
-#: templates/structure/body_for_table_summary.phtml:6
-#, php-format
-msgid "%s table"
-msgid_plural "%s tables"
-msgstr[0] "%s lentelė"
-msgstr[1] "%s lentelės"
-msgstr[2] "%s lentelių"
-
-#: templates/structure/body_for_table_summary.phtml:17
-msgid "Sum"
-msgstr "Sumos"
-
-#: templates/structure/check_all_tables.phtml:6
-msgid "Check tables having overhead"
-msgstr "Pažymėti turinčias perteklių"
-
-#: templates/structure/check_all_tables.phtml:10
-#, fuzzy
-#| msgid "Show color"
-msgid "Show create"
-msgstr "Rodyti spalvą"
-
-#: templates/structure/check_all_tables.phtml:27
-#, fuzzy
-#| msgid "Add prefix"
-msgid "Prefix"
-msgstr "Pridėti priešdėlį"
-
-#: templates/structure/check_all_tables.phtml:28
-msgid "Add prefix to table"
-msgstr "Pridėti priešdėlį lentelės pavadinimui"
-
-#: templates/structure/check_all_tables.phtml:29
-msgid "Replace table prefix"
-msgstr "Pakeisti lentelės pavadinimo priešdėlį"
-
-#: templates/structure/check_all_tables.phtml:30
-msgid "Copy table with prefix"
-msgstr "Kopijuoti lentelę su pavadinimo priešdėliu"
-
-#: templates/structure/check_all_tables.phtml:36
-#, fuzzy
-#| msgid "CHAR textarea columns"
-msgid "Add columns to central list"
-msgstr "CHAR tekstinio laukelio stulpelių skaičius"
-
-#: templates/structure/check_all_tables.phtml:37
-msgid "Remove columns from central list"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:38
-#, fuzzy
-#| msgid "CHAR textarea columns"
-msgid "Make consistent with central list"
-msgstr "CHAR tekstinio laukelio stulpelių skaičius"
-
-#: templates/structure/display_structure.phtml:140 view_create.php:181
-msgid "Edit view"
-msgstr "Keisti rodinį"
-
-#: templates/structure/display_table_stats.phtml:9
-msgid "Space usage"
-msgstr "Vietos naudojimas"
-
-#: templates/structure/display_table_stats.phtml:27
-#: templates/structure/table_header.phtml:74
-msgid "Overhead"
-msgstr "Perteklius"
-
-#: templates/structure/display_table_stats.phtml:32
-msgid "Effective"
-msgstr "Efektyvus"
-
-#: templates/structure/favorite_anchor.phtml:12
-#, fuzzy
-#| msgid "Add this series"
-msgid "Add to Favorites"
-msgstr "Pridėti šią eilę"
-
-#: templates/structure/move_columns_dialog.phtml:1
-#: templates/structure/optional_action_links.phtml:21
-#, fuzzy
-#| msgid "Remove column(s)"
-msgid "Move columns"
-msgstr "Pašalinti stulpelį(-ius)"
-
-#: templates/structure/move_columns_dialog.phtml:2
-msgid "Move the columns by dragging them up and down."
-msgstr ""
-
-#: templates/structure/optional_action_links.phtml:9
-msgid "Propose table structure"
-msgstr "Analizuoti lentelės struktūrą"
-
-#: templates/structure/optional_action_links.phtml:24
-#, fuzzy
-#| msgid "Propose table structure"
-msgid "Improve table structure"
-msgstr "Analizuoti lentelės struktūrą"
-
-#: templates/structure/optional_action_links.phtml:30
-#, fuzzy
-#| msgid "Track table"
-msgid "Track view"
-msgstr "Sekti lentelę"
-
-#: templates/structure/row_stats_table.phtml:3
-#, fuzzy
-#| msgid "Row Statistics"
-msgid "Row statistics"
-msgstr "Eilučių statistika"
-
-#: templates/structure/row_stats_table.phtml:9
-msgid "static"
-msgstr "pastovus"
-
-#: templates/structure/row_stats_table.phtml:11
-msgid "dynamic"
-msgstr "dinaminis"
-
-#: templates/structure/row_stats_table.phtml:22
-msgid "partitioned"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:54
-msgid "Row length"
-msgstr "Eilutės ilgis"
-
-#: templates/structure/row_stats_table.phtml:66
-msgid "Row size"
-msgstr "Eilutės dydis"
-
-#: templates/structure/row_stats_table.phtml:73
-msgid "Next autoindex"
-msgstr ""
-
-#: templates/structure/secondary_tabs.phtml:14
-#, fuzzy
-#| msgid "Relation view"
-msgid "Relation view"
-msgstr "Peržiūrėti sąryšius"
-
-#: templates/structure/show_create.phtml:2
-#, fuzzy
-#| msgid "Show SQL queries"
-msgid "Showing create queries"
-msgstr "Rodyti SQL užklausas"
-
-#: templates/structure/sortable_header.phtml:13
-msgid "Sort"
-msgstr "Rūšiuoti"
-
-#: templates/structure/table_header.phtml:42
-#, fuzzy
-#| msgid "May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]"
-msgid ""
-"May be approximate. Click on the number to get the exact count. See "
-"[doc@faq3-11]FAQ 3.11[/doc]."
-msgstr "Gali būti apytikslis. Žiūrėkite [doc@faq3-11]DUK 3.11[/doc]"
-
-#: templates/structure/table_structure_row.phtml:46
-#, php-format
-msgid "Column %s has been dropped."
-msgstr "Stulpelis %s panaikintas."
-
-#: templates/structure/tracking_icon.phtml:4
-msgid "Tracking is active."
-msgstr "Sekimas yra aktyvus."
-
-#: templates/structure/tracking_icon.phtml:8
-msgid "Tracking is not active."
-msgstr "Sekimas yra neaktyvus."
-
-#: templates/table/create_table.phtml:15
-msgid "Number of columns"
-msgstr "Stulpelių skaičius"
-
-#: templates/table/options.phtml:8
-msgid "Select columns (at least one):"
-msgstr "Pasirinkite stulpelius (bent vieną):"
-
-#: templates/table/options.phtml:37
-msgid "Add search conditions (body of the \"where\" clause):"
-msgstr "Įterpkite paieškos sąlygas į \"where\" sakinį:"
-
-#: templates/table/options.phtml:45
-msgid "Number of rows per page"
-msgstr "Eilučių skaičius puslapyje"
-
-#: templates/table/options.phtml:56
-msgid "Display order:"
-msgstr "Atvaizdavimo tvarka:"
-
-#: templates/table/options_zoom.phtml:6
-msgid "Use this column to label each point"
-msgstr ""
-
-#: templates/table/options_zoom.phtml:35
-#, fuzzy
-#| msgid "Maximum number of rows to display"
-msgid "Maximum rows to plot"
-msgstr "Maksimalus skaičius eilučių rodymui"
-
-#: templates/table/replace_preview.phtml:13
-msgid "Find and replace - preview"
-msgstr ""
-
-#: templates/table/replace_preview.phtml:18
-#, fuzzy
-#| msgid "Original position"
-msgid "Original string"
-msgstr "Pirminė padėtis"
-
-#: templates/table/replace_preview.phtml:19
-#, fuzzy
-#| msgid "Related Links"
-msgid "Replaced string"
-msgstr "Susijusios nuorodos"
-
-#: templates/table/replace_preview.phtml:40
-#, fuzzy
-#| msgid "Replicated"
-msgid "Replace"
-msgstr "Padaugintas"
-
-#: templates/table/rows_zoom.phtml:16
-#, fuzzy
-#| msgid "Hide search criteria"
-msgid "Additional search criteria"
-msgstr "Slėpti paieškos kriterijų"
-
-#: templates/table/search_and_replace.phtml:3
-#, fuzzy
-#| msgid "Replace NULL with:"
-msgid "Replace with:"
-msgstr "Pakeisti NULL į:"
-
-#: templates/table/search_and_replace.phtml:22
-#, fuzzy
-#| msgid "as regular expression"
-msgid "Use regular expression"
-msgstr "kaip reguliarųjį išsireiškimą"
-
-#: templates/table/selection_form.phtml:12
-#, fuzzy
-#| msgid "Do a \"query by example\" (wildcard: \"%\")"
-msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
-msgstr "Vykdyti „užklausą pagal pavyzdį“ (pakaitos simbolis: „%“)"
-
-#: templates/table/selection_form.phtml:34
-msgid "Do a \"query by example\" (wildcard: \"%\")"
-msgstr "Vykdyti „užklausą pagal pavyzdį“ (pakaitos simbolis: „%“)"
-
-#: templates/table/zoom_result_form.phtml:7
-msgid "Browse/Edit the points"
-msgstr ""
-
-#: templates/table/zoom_result_form.phtml:15
-#, fuzzy
-#| msgid "Control user"
-msgid "How to use"
-msgstr "Kontroliuoti naudotoją"
-
-#: templates/table/zoom_result_form.phtml:23
-#, fuzzy
-#| msgid "Reset"
-msgid "Reset zoom"
-msgstr "Atstatyti į pradinę būseną"
-
-#: templates/tbl_chart.phtml:17
+#: templates/table/chart/tbl_chart.phtml:17
 #, fuzzy
 #| msgid "Bar"
 msgctxt "Chart type"
 msgid "Bar"
 msgstr "Histograma"
 
-#: templates/tbl_chart.phtml:21
+#: templates/table/chart/tbl_chart.phtml:21
 #, fuzzy
 #| msgid "Column"
 msgctxt "Chart type"
 msgid "Column"
 msgstr "Stulpelis"
 
-#: templates/tbl_chart.phtml:25
+#: templates/table/chart/tbl_chart.phtml:25
 #, fuzzy
 #| msgid "Line"
 msgctxt "Chart type"
 msgid "Line"
 msgstr "Linijinė"
 
-#: templates/tbl_chart.phtml:29
+#: templates/table/chart/tbl_chart.phtml:29
 #, fuzzy
 #| msgctxt "Inline edit query"
 #| msgid "Inline"
@@ -16494,155 +16250,422 @@ msgctxt "Chart type"
 msgid "Spline"
 msgstr "Redaguoti čia"
 
-#: templates/tbl_chart.phtml:33
+#: templates/table/chart/tbl_chart.phtml:33
 msgctxt "Chart type"
 msgid "Area"
 msgstr ""
 
-#: templates/tbl_chart.phtml:37
+#: templates/table/chart/tbl_chart.phtml:37
 #, fuzzy
 #| msgid "Pie"
 msgctxt "Chart type"
 msgid "Pie"
 msgstr "Skritulinė"
 
-#: templates/tbl_chart.phtml:41
+#: templates/table/chart/tbl_chart.phtml:41
 #, fuzzy
 #| msgid "Time"
 msgctxt "Chart type"
 msgid "Timeline"
 msgstr "Laikas"
 
-#: templates/tbl_chart.phtml:45
+#: templates/table/chart/tbl_chart.phtml:45
 msgctxt "Chart type"
 msgid "Scatter"
 msgstr ""
 
-#: templates/tbl_chart.phtml:50
+#: templates/table/chart/tbl_chart.phtml:50
 #, fuzzy
 #| msgid "Packed"
 msgid "Stacked"
 msgstr "Suspausta"
 
-#: templates/tbl_chart.phtml:53
+#: templates/table/chart/tbl_chart.phtml:53
 msgid "Chart title"
 msgstr "Diagramos antraštė"
 
-#: templates/tbl_chart.phtml:57
+#: templates/table/chart/tbl_chart.phtml:57
 msgid "X-Axis:"
 msgstr "X-ašis:"
 
-#: templates/tbl_chart.phtml:72
+#: templates/table/chart/tbl_chart.phtml:72
 msgid "Series:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:102
+#: templates/table/chart/tbl_chart.phtml:102
 msgid "X-Axis label:"
 msgstr "X ašies etiketė:"
 
-#: templates/tbl_chart.phtml:104
+#: templates/table/chart/tbl_chart.phtml:104
 msgid "X Values"
 msgstr "X Reikšmės"
 
-#: templates/tbl_chart.phtml:107
+#: templates/table/chart/tbl_chart.phtml:107
 msgid "Y-Axis label:"
 msgstr "Y ašies etiketė:"
 
-#: templates/tbl_chart.phtml:115
+#: templates/table/chart/tbl_chart.phtml:115
 msgid "Series names are in a column"
 msgstr ""
 
-#: templates/tbl_chart.phtml:118
+#: templates/table/chart/tbl_chart.phtml:118
 #, fuzzy
 #| msgid "Inside column:"
 msgid "Series column:"
 msgstr "Stulpelio viduje:"
 
-#: templates/tbl_chart.phtml:130
+#: templates/table/chart/tbl_chart.phtml:130
 #, fuzzy
 #| msgid "Values for column %s"
 msgid "Value Column:"
 msgstr "Stulpelio „%s“ reikšmės"
 
-#: templates/tbl_chart.phtml:150
+#: templates/table/chart/tbl_chart.phtml:150
 #, fuzzy
 #| msgid "Save as file"
 msgid "Save chart as image"
 msgstr "Išsaugoti į failą"
 
-#: templates/tbl_relation/common_form.phtml:7
+#: templates/table/gis_visualization/gis_visualization.phtml:3
+msgid "Display GIS Visualization"
+msgstr "Rodyti GIS vizualizaciją"
+
+#: templates/table/gis_visualization/gis_visualization.phtml:8
+msgid "Label column"
+msgstr "Etiketės stulpelis"
+
+#: templates/table/gis_visualization/gis_visualization.phtml:11
+msgid "-- None --"
+msgstr "-- Tuščia --"
+
+#: templates/table/gis_visualization/gis_visualization.phtml:19
+msgid "Spatial column"
+msgstr ""
+
+#: templates/table/index_form.phtml:16
+msgid "Index name:"
+msgstr "Indekso vardas&nbsp;:"
+
+#: templates/table/index_form.phtml:19
+msgid ""
+"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
+msgstr "\"PRIMARY\" <b>yra vienintelis</b> pirminio rakto tipas!"
+
+#: templates/table/index_form.phtml:40
+#, fuzzy
+#| msgid "Index cache size"
+msgid "Index choice:"
+msgstr "Indekso podėlio (cache) dydis"
+
+#: templates/table/index_form.phtml:57
+msgid "Key block size:"
+msgstr ""
+
+#: templates/table/index_form.phtml:74
+msgid "Index type:"
+msgstr "Indekso tipas&nbsp;:"
+
+#: templates/table/index_form.phtml:86
+#, fuzzy
+#| msgid "User"
+msgid "Parser:"
+msgstr "Naudotojas"
+
+#: templates/table/index_form.phtml:102
+#, fuzzy
+#| msgid "Comment"
+msgid "Comment:"
+msgstr "Komentaras"
+
+#: templates/table/index_form.phtml:149 templates/table/index_form.phtml:190
+#, fuzzy
+#| msgid "Drag to reorder"
+msgid "Drag to reorder"
+msgstr "Vilkite, kad pertvarkytumėte"
+
+#: templates/table/relation/common_form.phtml:7
 msgid "Internal relations"
 msgstr "Vidiniai sąryšiai"
 
-#: templates/tbl_relation/common_form.phtml:11
+#: templates/table/relation/common_form.phtml:11
 #, fuzzy
 #| msgid "Internal relations"
 msgid "Internal relation"
 msgstr "Vidiniai sąryšiai"
 
-#: templates/tbl_relation/common_form.phtml:14
+#: templates/table/relation/common_form.phtml:14
 msgid ""
 "An internal relation is not necessary when a corresponding FOREIGN KEY "
 "relation exists."
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:37
+#: templates/table/relation/common_form.phtml:37
 #, fuzzy
 #| msgid "Foreign key limit"
 msgid "Foreign key constraints"
 msgstr "Svetimų raktų apribojimas"
 
-#: templates/tbl_relation/common_form.phtml:40
+#: templates/table/relation/common_form.phtml:40
 #, fuzzy
 #| msgid "Action"
 msgid "Actions"
 msgstr "Veiksmas"
 
-#: templates/tbl_relation/common_form.phtml:41
+#: templates/table/relation/common_form.phtml:41
 #, fuzzy
 #| msgid "Constraints for table"
 msgid "Constraint properties"
 msgstr "Apribojimai lentelei"
 
-#: templates/tbl_relation/common_form.phtml:44
+#: templates/table/relation/common_form.phtml:44
 msgid ""
 "Only columns with index will be displayed. You can define an index below."
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:49
+#: templates/table/relation/common_form.phtml:49
 msgid "Foreign key constraint"
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:81
+#: templates/table/relation/common_form.phtml:81
 #, fuzzy
 #| msgid "Add constraints"
 msgid "+ Add constraint"
 msgstr "Pridėti apribojimą"
 
-#: templates/tbl_relation/common_form.phtml:91
+#: templates/table/relation/common_form.phtml:91
 #, fuzzy
 #| msgid "Choose column to display"
 msgid "Choose column to display:"
 msgstr "Pasirinkite laukus peržiūrai"
 
-#: templates/tbl_relation/foreign_key_row.phtml:13
+#: templates/table/relation/foreign_key_row.phtml:13
 #, fuzzy, php-format
 #| msgid "Foreign key limit"
 msgid "Foreign key constraint %s has been dropped"
 msgstr "Svetimų raktų apribojimas"
 
-#: templates/tbl_relation/foreign_key_row.phtml:102
+#: templates/table/relation/foreign_key_row.phtml:102
 #, fuzzy
 #| msgid "Constraints for table"
 msgid "Constraint name"
 msgstr "Apribojimai lentelei"
 
-#: templates/tbl_relation/foreign_key_row.phtml:157
+#: templates/table/relation/foreign_key_row.phtml:157
 #, fuzzy
 #| msgid "Add column"
 msgid "+ Add column"
 msgstr "Pridėti stulpelį"
 
+#: templates/table/search/options.phtml:8
+msgid "Select columns (at least one):"
+msgstr "Pasirinkite stulpelius (bent vieną):"
+
+#: templates/table/search/options.phtml:37
+msgid "Add search conditions (body of the \"where\" clause):"
+msgstr "Įterpkite paieškos sąlygas į \"where\" sakinį:"
+
+#: templates/table/search/options.phtml:45
+msgid "Number of rows per page"
+msgstr "Eilučių skaičius puslapyje"
+
+#: templates/table/search/options.phtml:56
+msgid "Display order:"
+msgstr "Atvaizdavimo tvarka:"
+
+#: templates/table/search/options_zoom.phtml:6
+msgid "Use this column to label each point"
+msgstr ""
+
+#: templates/table/search/options_zoom.phtml:35
+#, fuzzy
+#| msgid "Maximum number of rows to display"
+msgid "Maximum rows to plot"
+msgstr "Maksimalus skaičius eilučių rodymui"
+
+#: templates/table/search/replace_preview.phtml:13
+msgid "Find and replace - preview"
+msgstr ""
+
+#: templates/table/search/replace_preview.phtml:18
+#, fuzzy
+#| msgid "Original position"
+msgid "Original string"
+msgstr "Pirminė padėtis"
+
+#: templates/table/search/replace_preview.phtml:19
+#, fuzzy
+#| msgid "Related Links"
+msgid "Replaced string"
+msgstr "Susijusios nuorodos"
+
+#: templates/table/search/replace_preview.phtml:40
+#, fuzzy
+#| msgid "Replicated"
+msgid "Replace"
+msgstr "Padaugintas"
+
+#: templates/table/search/rows_zoom.phtml:16
+#, fuzzy
+#| msgid "Hide search criteria"
+msgid "Additional search criteria"
+msgstr "Slėpti paieškos kriterijų"
+
+#: templates/table/search/search_and_replace.phtml:3
+#, fuzzy
+#| msgid "Replace NULL with:"
+msgid "Replace with:"
+msgstr "Pakeisti NULL į:"
+
+#: templates/table/search/search_and_replace.phtml:22
+#, fuzzy
+#| msgid "as regular expression"
+msgid "Use regular expression"
+msgstr "kaip reguliarųjį išsireiškimą"
+
+#: templates/table/search/selection_form.phtml:12
+#, fuzzy
+#| msgid "Do a \"query by example\" (wildcard: \"%\")"
+msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
+msgstr "Vykdyti „užklausą pagal pavyzdį“ (pakaitos simbolis: „%“)"
+
+#: templates/table/search/selection_form.phtml:34
+msgid "Do a \"query by example\" (wildcard: \"%\")"
+msgstr "Vykdyti „užklausą pagal pavyzdį“ (pakaitos simbolis: „%“)"
+
+#: templates/table/search/zoom_result_form.phtml:7
+msgid "Browse/Edit the points"
+msgstr ""
+
+#: templates/table/search/zoom_result_form.phtml:15
+#, fuzzy
+#| msgid "Control user"
+msgid "How to use"
+msgstr "Kontroliuoti naudotoją"
+
+#: templates/table/search/zoom_result_form.phtml:23
+#, fuzzy
+#| msgid "Reset"
+msgid "Reset zoom"
+msgstr "Atstatyti į pradinę būseną"
+
+#: templates/table/secondary_tabs.phtml:14
+#, fuzzy
+#| msgid "Relation view"
+msgid "Relation view"
+msgstr "Peržiūrėti sąryšius"
+
+#: templates/table/structure/actions_in_table_structure.phtml:14
+#, php-format
+msgid "A primary key has been added on %s."
+msgstr "Stulpeliui %s sukurtas PIRMINIS raktas."
+
+#: templates/table/structure/actions_in_table_structure.phtml:34
+#: templates/table/structure/actions_in_table_structure.phtml:54
+#: templates/table/structure/actions_in_table_structure.phtml:79
+#: templates/table/structure/actions_in_table_structure.phtml:101
+#, php-format
+msgid "An index has been added on %s."
+msgstr "Indeksas sukurtas %s stulpeliui."
+
+#: templates/table/structure/actions_in_table_structure.phtml:130
+#: templates/table/structure/check_all_table_column.phtml:59
+#, fuzzy
+#| msgid "Remove column(s)"
+msgid "Remove from central columns"
+msgstr "Pašalinti stulpelį(-ius)"
+
+#: templates/table/structure/actions_in_table_structure.phtml:138
+#: templates/table/structure/check_all_table_column.phtml:55
+#, fuzzy
+#| msgid "CHAR textarea columns"
+msgid "Add to central columns"
+msgstr "CHAR tekstinio laukelio stulpelių skaičius"
+
+#: templates/table/structure/add_column.phtml:7
+#, php-format
+msgid "Add %s column(s)"
+msgstr "Pridėti %s stulpelį(-ius)"
+
+#: templates/table/structure/add_column.phtml:12
+#, fuzzy
+#| msgid "At Beginning of Table"
+msgid "at beginning of table"
+msgstr "Lentelės pradžioje"
+
+#: templates/table/structure/display_structure.phtml:140 view_create.php:181
+msgid "Edit view"
+msgstr "Keisti rodinį"
+
+#: templates/table/structure/display_table_stats.phtml:9
+msgid "Space usage"
+msgstr "Vietos naudojimas"
+
+#: templates/table/structure/display_table_stats.phtml:32
+msgid "Effective"
+msgstr "Efektyvus"
+
+#: templates/table/structure/move_columns_dialog.phtml:1
+#: templates/table/structure/optional_action_links.phtml:21
+#, fuzzy
+#| msgid "Remove column(s)"
+msgid "Move columns"
+msgstr "Pašalinti stulpelį(-ius)"
+
+#: templates/table/structure/move_columns_dialog.phtml:2
+msgid "Move the columns by dragging them up and down."
+msgstr ""
+
+#: templates/table/structure/optional_action_links.phtml:9
+msgid "Propose table structure"
+msgstr "Analizuoti lentelės struktūrą"
+
+#: templates/table/structure/optional_action_links.phtml:24
+#, fuzzy
+#| msgid "Propose table structure"
+msgid "Improve table structure"
+msgstr "Analizuoti lentelės struktūrą"
+
+#: templates/table/structure/optional_action_links.phtml:30
+#, fuzzy
+#| msgid "Track table"
+msgid "Track view"
+msgstr "Sekti lentelę"
+
+#: templates/table/structure/row_stats_table.phtml:3
+#, fuzzy
+#| msgid "Row Statistics"
+msgid "Row statistics"
+msgstr "Eilučių statistika"
+
+#: templates/table/structure/row_stats_table.phtml:9
+msgid "static"
+msgstr "pastovus"
+
+#: templates/table/structure/row_stats_table.phtml:11
+msgid "dynamic"
+msgstr "dinaminis"
+
+#: templates/table/structure/row_stats_table.phtml:22
+msgid "partitioned"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:54
+msgid "Row length"
+msgstr "Eilutės ilgis"
+
+#: templates/table/structure/row_stats_table.phtml:66
+msgid "Row size"
+msgstr "Eilutės dydis"
+
+#: templates/table/structure/row_stats_table.phtml:73
+msgid "Next autoindex"
+msgstr ""
+
+#: templates/table/structure/table_structure_row.phtml:46
+#, php-format
+msgid "Column %s has been dropped."
+msgstr "Stulpelis %s panaikintas."
+
 #: themes.php:17 themes.php:22
 msgid "Theme"
 msgstr "Išvaizda"
@@ -17901,6 +17924,11 @@ msgstr ""
 msgid "concurrent_insert is set to 0"
 msgstr "MyISAM concurrent įterpimai"
 
+#, fuzzy
+#~| msgid "Read misses"
+#~ msgid "Read as multibytes"
+#~ msgstr "Skaitymo nepataikymai"
+
 #~ msgid "Relational display column"
 #~ msgstr "Ryšių rodymo stulpelis"
 
diff --git a/po/lv.po b/po/lv.po
index b009d78ae9..8b6aa2cd64 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 4.5.0-dev\n"
 "Report-Msgid-Bugs-To: developers@phpmyadmin.net\n"
-"POT-Creation-Date: 2015-08-08 13:53-0400\n"
+"POT-Creation-Date: 2015-08-12 08:10-0400\n"
 "PO-Revision-Date: 2015-04-04 18:47+0200\n"
 "Last-Translator: Latvian TV <dnighttv@gmail.com>\n"
 "Language-Team: Latvian <https://hosted.weblate.org/projects/phpmyadmin/"
@@ -53,7 +53,7 @@ msgid "Table comments:"
 msgstr "Tabulas komentāri:"
 
 #: db_datadict.php:104 libraries/Index.class.php:699
-#: libraries/insert_edit.lib.php:1567
+#: libraries/insert_edit.lib.php:1565
 #: libraries/navigation/Nodes/Node_Column.class.php:30
 #: libraries/plugins/export/ExportHtmlword.class.php:280
 #: libraries/plugins/export/ExportHtmlword.class.php:375
@@ -67,13 +67,14 @@ msgstr "Tabulas komentāri:"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1023
 #: libraries/tracking.lib.php:879 libraries/tracking.lib.php:975
 #: templates/columns_definitions/column_name.phtml:18
-#: templates/index_form.phtml:124 templates/table/table_header.phtml:6
-#: templates/table/zoom_result_form.phtml:33
-#: templates/tbl_relation/common_form.phtml:10
-#: templates/tbl_relation/common_form.phtml:43
-#: templates/tbl_relation/foreign_key_row.phtml:194
-#: templates/tbl_relation/foreign_key_row.phtml:206
-#: templates/tbl_relation/internal_relational_row.phtml:71
+#: templates/table/index_form.phtml:124
+#: templates/table/relation/common_form.phtml:10
+#: templates/table/relation/common_form.phtml:43
+#: templates/table/relation/foreign_key_row.phtml:194
+#: templates/table/relation/foreign_key_row.phtml:206
+#: templates/table/relation/internal_relational_row.phtml:71
+#: templates/table/search/table_header.phtml:6
+#: templates/table/search/zoom_result_form.phtml:33
 msgid "Column"
 msgstr "Lauks"
 
@@ -91,21 +92,21 @@ msgstr "Lauks"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1001
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1024
 #: libraries/rte/rte_list.lib.php:75 libraries/rte/rte_list.lib.php:103
-#: libraries/rte/rte_routines.lib.php:802
-#: libraries/rte/rte_routines.lib.php:831
-#: libraries/rte/rte_routines.lib.php:1493
+#: libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_routines.lib.php:922
+#: libraries/rte/rte_routines.lib.php:1584
 #: libraries/server_privileges.lib.php:2369 libraries/tracking.lib.php:880
 #: libraries/tracking.lib.php:972
 #: templates/columns_definitions/table_fields_definitions.phtml:11
-#: templates/structure/table_header.phtml:48
-#: templates/structure/table_structure_header.phtml:6
-#: templates/table/table_header.phtml:7
+#: templates/database/structure/table_header.phtml:48
+#: templates/table/search/table_header.phtml:7
+#: templates/table/structure/table_structure_header.phtml:6
 msgid "Type"
 msgstr "Tips"
 
 #: db_datadict.php:106 libraries/Index.class.php:702
 #: libraries/central_columns.lib.php:708
-#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1576
+#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1574
 #: libraries/plugins/export/ExportHtmlword.class.php:286
 #: libraries/plugins/export/ExportHtmlword.class.php:381
 #: libraries/plugins/export/ExportLatex.class.php:509
@@ -118,8 +119,8 @@ msgstr "Tips"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1026
 #: libraries/tracking.lib.php:882 libraries/tracking.lib.php:978
 #: templates/columns_definitions/table_fields_definitions.phtml:39
-#: templates/structure/table_structure_header.phtml:9
-#: templates/table/zoom_result_form.phtml:34
+#: templates/table/search/zoom_result_form.phtml:34
+#: templates/table/structure/table_structure_header.phtml:9
 msgid "Null"
 msgstr "Nulle"
 
@@ -137,8 +138,8 @@ msgstr "Nulle"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1027
 #: libraries/replication_gui.lib.php:153 libraries/tracking.lib.php:883
 #: templates/columns_definitions/table_fields_definitions.phtml:25
-#: templates/structure/body_for_table_summary.phtml:55
-#: templates/structure/table_structure_header.phtml:10
+#: templates/database/structure/body_for_table_summary.phtml:55
+#: templates/table/structure/table_structure_header.phtml:10
 msgid "Default"
 msgstr "Noklusēts"
 
@@ -166,19 +167,19 @@ msgid "Comments"
 msgstr "Komentāri"
 
 #: db_datadict.php:146
-#: libraries/controllers/StructureController.class.php:1960
-#: libraries/controllers/StructureController.class.php:1965
+#: libraries/controllers/TableStructureController.class.php:951
+#: libraries/controllers/TableStructureController.class.php:956
 #: libraries/tracking.lib.php:922
 #: templates/columns_definitions/column_indexes.phtml:6
-#: templates/structure/check_all_table_column.phtml:22
-#: templates/structure/display_structure.phtml:74
+#: templates/table/structure/check_all_table_column.phtml:22
+#: templates/table/structure/display_structure.phtml:74
 msgid "Primary"
 msgstr "Primārā"
 
 #: db_datadict.php:156 js/messages.php:317 libraries/Index.class.php:567
 #: libraries/Index.class.php:606 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261 libraries/mult_submits.lib.php:403
+#: libraries/config/FormDisplay.tpl.php:272 libraries/mult_submits.lib.php:403
 #: libraries/mult_submits.lib.php:417
 #: libraries/plugins/export/ExportHtmlword.class.php:630
 #: libraries/plugins/export/ExportLatex.class.php:589
@@ -194,20 +195,20 @@ msgstr "Primārā"
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1010 libraries/tracking.lib.php:1015
 #: prefs_manage.php:140 templates/prefs_autoload.phtml:15
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "No"
 msgstr "Nē"
 
 #: db_datadict.php:156 js/messages.php:443 libraries/Index.class.php:568
 #: libraries/Index.class.php:605 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261
-#: libraries/controllers/StructureController.class.php:1344
-#: libraries/controllers/StructureController.class.php:2223
-#: libraries/controllers/StructureController.class.php:2232
-#: libraries/controllers/StructureController.class.php:2237
-#: libraries/controllers/StructureController.class.php:2242
-#: libraries/controllers/StructureController.class.php:2247
+#: libraries/config/FormDisplay.tpl.php:272
+#: libraries/controllers/TableStructureController.class.php:539
+#: libraries/controllers/TableStructureController.class.php:1201
+#: libraries/controllers/TableStructureController.class.php:1210
+#: libraries/controllers/TableStructureController.class.php:1215
+#: libraries/controllers/TableStructureController.class.php:1220
+#: libraries/controllers/TableStructureController.class.php:1225
 #: libraries/mult_submits.inc.php:82 libraries/mult_submits.inc.php:178
 #: libraries/mult_submits.lib.php:339 libraries/mult_submits.lib.php:372
 #: libraries/mult_submits.lib.php:401 libraries/mult_submits.lib.php:415
@@ -216,8 +217,8 @@ msgstr "Nē"
 #: libraries/plugins/export/ExportOdt.class.php:756
 #: libraries/plugins/export/ExportTexytext.class.php:567
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1077
-#: libraries/server_databases.lib.php:464
-#: libraries/server_databases.lib.php:474
+#: libraries/server_databases.lib.php:475
+#: libraries/server_databases.lib.php:485
 #: libraries/server_privileges.lib.php:2546
 #: libraries/server_privileges.lib.php:2727
 #: libraries/server_privileges.lib.php:2748
@@ -227,7 +228,7 @@ msgstr "Nē"
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1008 libraries/tracking.lib.php:1013
 #: prefs_manage.php:138 templates/prefs_autoload.phtml:14
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "Yes"
 msgstr "Jā"
 
@@ -237,7 +238,7 @@ msgstr "Apskatīt datubāzes dampu (shēmu)"
 
 #: db_export.php:37 db_tracking.php:90 export.php:382
 #: libraries/DBQbe.class.php:326
-#: libraries/controllers/StructureController.class.php:231
+#: libraries/controllers/DatabaseStructureController.class.php:170
 #: libraries/navigation/NavigationTree.class.php:897
 msgid "No tables found in database."
 msgstr "Tabulas nav atrastas šajā datubāzē."
@@ -248,14 +249,14 @@ msgstr "Tabulas nav atrastas šajā datubāzē."
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:26
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:120
-#: templates/structure/show_create.phtml:18
+#: templates/database/structure/show_create.phtml:18
 msgid "Tables"
 msgstr "Tabulas"
 
 #: db_export.php:52 libraries/Menu.class.php:317 libraries/Menu.class.php:425
-#: libraries/Util.class.php:3333 libraries/Util.class.php:3343
-#: libraries/Util.class.php:3349 libraries/Util.class.php:3629
-#: libraries/Util.class.php:4327 libraries/Util.class.php:4344
+#: libraries/Util.class.php:3339 libraries/Util.class.php:3349
+#: libraries/Util.class.php:3355 libraries/Util.class.php:3635
+#: libraries/Util.class.php:4333 libraries/Util.class.php:4350
 #: libraries/central_columns.lib.php:728 libraries/config.values.php:39
 #: libraries/config.values.php:47 libraries/config.values.php:109
 #: libraries/config.values.php:115 libraries/config/setup.forms.php:323
@@ -269,7 +270,7 @@ msgstr "Tabulas"
 #: libraries/navigation/Nodes/Node_Table.class.php:283
 #: libraries/server_privileges.lib.php:1141 libraries/tracking.lib.php:874
 #: templates/columns_definitions/table_fields_definitions.phtml:3
-#: templates/designer/table_list.phtml:28
+#: templates/database/designer/table_list.phtml:28
 msgid "Structure"
 msgstr "Struktūra"
 
@@ -281,7 +282,7 @@ msgstr "Struktūra"
 #: libraries/config/user_preferences.forms.php:292
 #: libraries/config/user_preferences.forms.php:297
 #: libraries/server_privileges.lib.php:1140
-#: templates/structure/display_table_stats.phtml:12
+#: templates/table/structure/display_table_stats.phtml:12
 msgid "Data"
 msgstr "Dati"
 
@@ -363,10 +364,10 @@ msgstr "Izsekotās tabulas"
 #: libraries/server_privileges.lib.php:2908
 #: libraries/server_privileges.lib.php:3145
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4346
-#: templates/structure/table_header.phtml:21
-#: templates/tbl_relation/foreign_key_row.phtml:176
-#: templates/tbl_relation/internal_relational_row.phtml:63
+#: libraries/server_privileges.lib.php:4372
+#: templates/database/structure/table_header.phtml:21
+#: templates/table/relation/foreign_key_row.phtml:176
+#: templates/table/relation/internal_relational_row.phtml:63
 msgid "Table"
 msgstr "Tabula"
 
@@ -383,7 +384,7 @@ msgid "Updated"
 msgstr "Atjaunots"
 
 #: db_tracking.php:130 js/messages.php:243 libraries/Menu.class.php:552
-#: libraries/Util.class.php:4314 libraries/config.values.php:104
+#: libraries/Util.class.php:4320 libraries/config.values.php:104
 #: libraries/rte/rte_events.lib.php:393 libraries/rte/rte_list.lib.php:101
 #: libraries/server_status_processes.lib.php:92 libraries/tracking.lib.php:279
 msgid "Status"
@@ -392,14 +393,15 @@ msgstr "Statuss"
 #: db_tracking.php:131 db_tracking.php:290 libraries/Index.class.php:693
 #: libraries/central_columns.lib.php:687 libraries/rte/rte_list.lib.php:74
 #: libraries/rte/rte_list.lib.php:89 libraries/rte/rte_list.lib.php:102
-#: libraries/server_databases.lib.php:398
+#: libraries/server_databases.lib.php:409
 #: libraries/server_privileges.lib.php:2372
 #: libraries/server_privileges.lib.php:3166
 #: libraries/server_privileges.lib.php:3342
 #: libraries/server_user_groups.lib.php:82
 #: libraries/server_variables.lib.php:189 libraries/tracking.lib.php:280
-#: libraries/tracking.lib.php:793 templates/structure/table_header.phtml:30
-#: templates/structure/table_structure_header.phtml:23
+#: libraries/tracking.lib.php:793
+#: templates/database/structure/table_header.phtml:30
+#: templates/table/structure/table_structure_header.phtml:23
 msgid "Action"
 msgstr "Darbība"
 
@@ -444,7 +446,7 @@ msgid "Untracked tables"
 msgstr "Tabulas, kas netiek izsekotas"
 
 #: db_tracking.php:305 db_tracking.php:336
-#: templates/structure/optional_action_links.phtml:17
+#: templates/table/structure/optional_action_links.phtml:17
 msgid "Track table"
 msgstr "Pārbaudīt tabulu"
 
@@ -498,7 +500,7 @@ msgid "Value for the column \"%s\""
 msgstr "Kolonnas vērtība \"%s\""
 
 #: gis_data_editor.php:146
-#: templates/gis_visualization/gis_visualization.phtml:37
+#: templates/table/gis_visualization/gis_visualization.phtml:37
 msgid "Use OpenStreetMaps as Base Layer"
 msgstr "Izmantot OpenStreetMaps kā pamata pārklājumu"
 
@@ -578,35 +580,35 @@ msgstr "Pievienot jaunu ģeometriju"
 #: libraries/display_change_password.lib.php:162
 #: libraries/display_export.lib.php:402 libraries/display_export.lib.php:408
 #: libraries/display_import.lib.php:392 libraries/index.lib.php:44
-#: libraries/insert_edit.lib.php:1546 libraries/insert_edit.lib.php:1583
+#: libraries/insert_edit.lib.php:1544 libraries/insert_edit.lib.php:1581
 #: libraries/normalization.lib.php:165 libraries/normalization.lib.php:821
 #: libraries/operations.lib.php:38 libraries/operations.lib.php:108
 #: libraries/operations.lib.php:263 libraries/operations.lib.php:306
 #: libraries/operations.lib.php:801 libraries/operations.lib.php:874
 #: libraries/operations.lib.php:923 libraries/operations.lib.php:1337
 #: libraries/operations.lib.php:1658
-#: libraries/plugins/auth/AuthenticationCookie.class.php:244
+#: libraries/plugins/auth/AuthenticationCookie.class.php:232
 #: libraries/replication_gui.lib.php:122 libraries/replication_gui.lib.php:161
 #: libraries/replication_gui.lib.php:324 libraries/replication_gui.lib.php:461
 #: libraries/replication_gui.lib.php:906 libraries/rte/rte_events.lib.php:509
-#: libraries/rte/rte_routines.lib.php:969
-#: libraries/rte/rte_routines.lib.php:1581
+#: libraries/rte/rte_routines.lib.php:1060
+#: libraries/rte/rte_routines.lib.php:1672
 #: libraries/rte/rte_triggers.lib.php:396 libraries/server_bin_log.lib.php:61
 #: libraries/server_privileges.lib.php:705
 #: libraries/server_privileges.lib.php:2106
 #: libraries/server_privileges.lib.php:2872
 #: libraries/server_privileges.lib.php:3553
-#: libraries/server_privileges.lib.php:4627
+#: libraries/server_privileges.lib.php:4653
 #: libraries/server_user_groups.lib.php:285
 #: libraries/sql_query_form.lib.php:369 libraries/sql_query_form.lib.php:429
 #: libraries/tracking.lib.php:533 libraries/tracking.lib.php:653
 #: prefs_manage.php:277 prefs_manage.php:355
 #: templates/columns_definitions/column_definitions_form.phtml:59
-#: templates/header_location.phtml:17 templates/index_form.phtml:238
+#: templates/database/create_table.phtml:21 templates/header_location.phtml:28
 #: templates/startAndNumberOfRowsPanel.phtml:14
-#: templates/structure/add_column.phtml:25
-#: templates/table/create_table.phtml:21
-#: templates/table/selection_form.phtml:75 view_create.php:275
+#: templates/table/index_form.phtml:238
+#: templates/table/search/selection_form.phtml:75
+#: templates/table/structure/add_column.phtml:25 view_create.php:275
 #: view_operations.php:106
 msgid "Go"
 msgstr "Aiziet"
@@ -696,7 +698,7 @@ msgstr ""
 msgid "Could not load import plugins, please check your installation!"
 msgstr "Nevar ielādēt importētos spraudņus, lūdzu pārbaudi savu instalāciju!"
 
-#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1466
+#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1460
 #, php-format
 msgid "Bookmark %s has been created."
 msgstr "Grāmatzīme %s ir izveidota."
@@ -735,11 +737,11 @@ msgstr ""
 msgid "Back"
 msgstr "Atpakaļ"
 
-#: index.php:148 libraries/Footer.class.php:70
+#: index.php:149 libraries/Footer.class.php:70
 msgid "phpMyAdmin Demo Server"
 msgstr "phpMyAdmin Demo serveris"
 
-#: index.php:152
+#: index.php:153
 #, php-format
 msgid ""
 "You are using the demo server. You can do anything here, but please do not "
@@ -749,112 +751,112 @@ msgstr ""
 "Jūs izmantojat demo serveri. Jūs šeit varat darīt visu, bet lūdzu nemainat "
 "root, debian-sys-maint un pma users tabulas. Vairāk informācijas %s."
 
-#: index.php:162
+#: index.php:163
 msgid "General Settings"
 msgstr "Galvenie uzstādījumi"
 
-#: index.php:190 libraries/display_change_password.lib.php:50
+#: index.php:191 libraries/display_change_password.lib.php:50
 #: libraries/display_change_password.lib.php:53 user_password.php:247
 msgid "Change password"
 msgstr "Mainīt paroli"
 
-#: index.php:206
+#: index.php:207
 msgid "Server connection collation"
 msgstr "MySQL savienojuma kārtošana"
 
-#: index.php:228
+#: index.php:229
 msgid "Appearance Settings"
 msgstr "Izskata uzstādījumi"
 
-#: index.php:258 prefs_manage.php:285
+#: index.php:259 prefs_manage.php:285
 msgid "More settings"
 msgstr "Pārējie uzstādījumi"
 
-#: index.php:279
+#: index.php:280
 msgid "Database server"
 msgstr "Datubāzes serveris"
 
-#: index.php:282 libraries/plugins/auth/AuthenticationCookie.class.php:181
+#: index.php:283 libraries/plugins/auth/AuthenticationCookie.class.php:169
 msgid "Server:"
 msgstr "Serveris:"
 
-#: index.php:286
+#: index.php:287
 msgid "Server type:"
 msgstr "Servera tips:"
 
-#: index.php:290 libraries/plugins/export/ExportLatex.class.php:212
+#: index.php:291 libraries/plugins/export/ExportLatex.class.php:212
 #: libraries/plugins/export/ExportSql.class.php:687
 #: libraries/plugins/export/ExportXml.class.php:189
 msgid "Server version:"
 msgstr "Servera versija:"
 
-#: index.php:296
+#: index.php:297
 msgid "Protocol version:"
 msgstr "Protokola versija:"
 
-#: index.php:300
+#: index.php:301
 msgid "User:"
 msgstr "Lietotājs:"
 
-#: index.php:305
+#: index.php:306
 msgid "Server charset:"
 msgstr "Servera kodējums:"
 
-#: index.php:320
+#: index.php:321
 msgid "Web server"
 msgstr "Web serveris"
 
-#: index.php:331
+#: index.php:332
 msgid "Database client version:"
 msgstr "Datubāzes klienta versija:"
 
-#: index.php:335
+#: index.php:336
 msgid "PHP extension:"
 msgstr "PHP paplašinājums:"
 
-#: index.php:349
+#: index.php:350
 #, fuzzy
 #| msgid "PHP Version"
 msgid "PHP version:"
 msgstr "PHP Versija"
 
-#: index.php:360
+#: index.php:361
 msgid "Show PHP information"
 msgstr "Parādīt PHP informāciju"
 
-#: index.php:383
+#: index.php:384
 msgid "Version information:"
 msgstr "Versijas informācija:"
 
-#: index.php:392 libraries/Util.class.php:432 libraries/Util.class.php:495
-#: libraries/config/FormDisplay.tpl.php:151
+#: index.php:393 libraries/Util.class.php:432 libraries/Util.class.php:495
+#: libraries/config/FormDisplay.tpl.php:162
 #: libraries/display_export.lib.php:577 libraries/engines/pbxt.lib.php:162
 #: libraries/navigation/NavigationHeader.class.php:196
 #: libraries/server_variables.lib.php:160
 msgid "Documentation"
 msgstr "Dokumentācija"
 
-#: index.php:399
+#: index.php:400
 msgid "Wiki"
 msgstr "Wiki"
 
-#: index.php:408
+#: index.php:409
 msgid "Official Homepage"
 msgstr "Oficiālā phpMyAdmin mājaslapa"
 
-#: index.php:415
+#: index.php:416
 msgid "Contribute"
 msgstr "Piedalies"
 
-#: index.php:422
+#: index.php:423
 msgid "Get support"
 msgstr "Saņemt atbalstu"
 
-#: index.php:429
+#: index.php:430
 msgid "List of changes"
 msgstr "Izmaiņu saraksts"
 
-#: index.php:451
+#: index.php:452
 #, fuzzy
 #| msgid ""
 #| "Your configuration file contains settings (root with no password) that "
@@ -872,21 +874,21 @@ msgstr ""
 "MySQL serveris strādā ar šo noklusēto variantu, ir atvērts uzbrukumiem, un "
 "Jums tiešām jāaiztaisa šis drošības caurums."
 
-#: index.php:468
+#: index.php:469
 msgid ""
 "You have enabled mbstring.func_overload in your PHP configuration. This "
 "option is incompatible with phpMyAdmin and might cause some data to be "
 "corrupted!"
 msgstr ""
 
-#: index.php:483
+#: index.php:484
 msgid ""
 "The mbstring PHP extension was not found and you seem to be using a "
 "multibyte charset. Without the mbstring extension phpMyAdmin is unable to "
 "split strings correctly and it may result in unexpected results."
 msgstr ""
 
-#: index.php:500
+#: index.php:501
 msgid ""
 "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini."
 "session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower than "
@@ -894,17 +896,17 @@ msgid ""
 "expire sooner than configured in phpMyAdmin."
 msgstr ""
 
-#: index.php:519
+#: index.php:520
 msgid ""
 "Login cookie store is lower than cookie validity configured in phpMyAdmin, "
 "because of this, your login will expire sooner than configured in phpMyAdmin."
 msgstr ""
 
-#: index.php:535
+#: index.php:536
 msgid "The configuration file now needs a secret passphrase (blowfish_secret)."
 msgstr "Konfigurācijas fails tagad prasa slepeno paroli (blowfish_secret)."
 
-#: index.php:548
+#: index.php:549
 msgid ""
 "Directory [code]config[/code], which is used by the setup script, still "
 "exists in your phpMyAdmin directory. It is strongly recommended to remove it "
@@ -912,7 +914,7 @@ msgid ""
 "may be compromised by unauthorized people downloading your configuration."
 msgstr ""
 
-#: index.php:564
+#: index.php:565
 #, fuzzy, php-format
 #| msgid ""
 #| "The phpMyAdmin configuration storage is not completely configured, some "
@@ -924,19 +926,19 @@ msgstr ""
 "Papildiespējas darbam ar saistītām tabulām tika izslēgtas. Lai uzzinātu "
 "kāpēc, klikškiniet %sšeit%s."
 
-#: index.php:571
+#: index.php:572
 msgid ""
 "Or alternately go to 'Operations' tab of any database to set it up there."
 msgstr ""
 
-#: index.php:620
+#: index.php:621
 #, php-format
 msgid ""
 "Your PHP MySQL library version %s differs from your MySQL server version %s. "
 "This may cause unpredictable behavior."
 msgstr ""
 
-#: index.php:648
+#: index.php:649
 #, php-format
 msgid ""
 "Server running with Suhosin. Please refer to %sdocumentation%s for possible "
@@ -1100,8 +1102,8 @@ msgstr ""
 msgid "Save & Close"
 msgstr "Saglabāt kā failu"
 
-#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:404
-#: libraries/insert_edit.lib.php:1550 prefs_manage.php:361
+#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:415
+#: libraries/insert_edit.lib.php:1548 prefs_manage.php:361
 #: prefs_manage.php:372
 msgid "Reset"
 msgstr "Atcelt"
@@ -1142,7 +1144,7 @@ msgstr "Pievienot indeksu"
 msgid "Edit Index"
 msgstr "Labot indeksu"
 
-#: js/messages.php:99 templates/index_form.phtml:232
+#: js/messages.php:99 templates/table/index_form.phtml:232
 #, php-format
 msgid "Add %s column(s) to index"
 msgstr "Pievienot %s lauku(s) indeksam"
@@ -1171,15 +1173,16 @@ msgstr "Lauki iekļauti iekš"
 msgid "Please select column(s) for the index."
 msgstr "Pievienot %s lauku(s) indeksam"
 
-#: js/messages.php:106 templates/structure/add_column.phtml:1
+#: js/messages.php:106 templates/table/structure/add_column.phtml:1
 #, fuzzy
 #| msgid "You have to choose at least one column to display"
 msgid "You have to add at least one column."
 msgstr "Izvēlieties vismaz vienu kolonnu attēlošanai"
 
-#: js/messages.php:109 libraries/insert_edit.lib.php:1548
+#: js/messages.php:109 libraries/insert_edit.lib.php:1546
 #: templates/columns_definitions/column_definitions_form.phtml:162
-#: templates/index_form.phtml:237 templates/tbl_relation/common_form.phtml:106
+#: templates/table/index_form.phtml:237
+#: templates/table/relation/common_form.phtml:106
 msgid "Preview SQL"
 msgstr ""
 
@@ -1202,7 +1205,7 @@ msgid "SQL query:"
 msgstr "SQL vaicājums"
 
 #. l10n: Default label for the y-Axis of Charts
-#: js/messages.php:118 templates/tbl_chart.phtml:109
+#: js/messages.php:118 templates/table/chart/tbl_chart.phtml:109
 msgid "Y Values"
 msgstr "Y Vērtība"
 
@@ -1360,7 +1363,7 @@ msgstr "Nosūtītie baiti"
 msgid "Bytes received"
 msgstr "Saņemtie baiti"
 
-#: js/messages.php:169 libraries/server_status.lib.php:226
+#: js/messages.php:169 libraries/server_status.lib.php:235
 msgid "Connections"
 msgstr "Konekcijas"
 
@@ -1417,12 +1420,12 @@ msgstr "%d tabula(s)"
 msgid "Questions"
 msgstr "Jautājumi"
 
-#: js/messages.php:184 libraries/server_status.lib.php:134
+#: js/messages.php:184 libraries/server_status.lib.php:143
 msgid "Traffic"
 msgstr "Datu apmaiņa"
 
 #: js/messages.php:185 libraries/Menu.class.php:586
-#: libraries/Util.class.php:4318 libraries/server_status_monitor.lib.php:257
+#: libraries/Util.class.php:4324 libraries/server_status_monitor.lib.php:257
 msgid "Settings"
 msgstr "Uzstādījumi"
 
@@ -1442,8 +1445,9 @@ msgstr ""
 #: libraries/server_status_monitor.lib.php:236
 #: libraries/server_status_processes.lib.php:308
 #: templates/columns_definitions/transformation.phtml:4
-#: templates/designer/options_panel.phtml:178
-#: templates/table/options_zoom.phtml:12 templates/table/rows_zoom.phtml:26
+#: templates/database/designer/options_panel.phtml:178
+#: templates/table/search/options_zoom.phtml:12
+#: templates/table/search/rows_zoom.phtml:26
 msgid "None"
 msgstr "Nav"
 
@@ -1718,8 +1722,8 @@ msgstr ""
 
 #: js/messages.php:270 libraries/Menu.class.php:352
 #: libraries/Menu.class.php:455 libraries/Menu.class.php:582
-#: libraries/Util.class.php:4317 libraries/Util.class.php:4332
-#: libraries/Util.class.php:4349 libraries/config/messages.inc.php:258
+#: libraries/Util.class.php:4323 libraries/Util.class.php:4338
+#: libraries/Util.class.php:4355 libraries/config/messages.inc.php:258
 #: libraries/display_import.lib.php:105
 #: libraries/server_status_monitor.lib.php:318 prefs_manage.php:238
 #: setup/frames/menu.inc.php:26
@@ -1783,13 +1787,13 @@ msgid "Formatting SQL..."
 msgstr ""
 
 #: js/messages.php:293 libraries/server_variables.lib.php:157
-#: templates/designer/aggregate_query_panel.phtml:63
-#: templates/designer/delete_relation_panel.phtml:28
-#: templates/designer/having_query_panel.phtml:117
-#: templates/designer/new_relation_panel.phtml:88
-#: templates/designer/options_panel.phtml:253
-#: templates/designer/rename_to_panel.phtml:45
-#: templates/designer/where_query_panel.phtml:83
+#: templates/database/designer/aggregate_query_panel.phtml:63
+#: templates/database/designer/delete_relation_panel.phtml:28
+#: templates/database/designer/having_query_panel.phtml:117
+#: templates/database/designer/new_relation_panel.phtml:88
+#: templates/database/designer/options_panel.phtml:253
+#: templates/database/designer/rename_to_panel.phtml:45
+#: templates/database/designer/where_query_panel.phtml:83
 msgid "Cancel"
 msgstr "Atcelt"
 
@@ -1799,7 +1803,7 @@ msgstr "Atcelt"
 msgid "Page-related settings"
 msgstr "Mainīt uzstādījumus"
 
-#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:402
+#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:413
 msgid "Apply"
 msgstr ""
 
@@ -1834,8 +1838,8 @@ msgstr "Kļūdas kods: %s"
 msgid "Error text: %s"
 msgstr "Kļūdas teksts: %s"
 
-#: js/messages.php:307 libraries/db_common.inc.php:68
-#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:450
+#: js/messages.php:307 libraries/db_common.inc.php:69
+#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:461
 msgid "No databases selected."
 msgstr "Datubāze nav izvēlēta."
 
@@ -1847,12 +1851,13 @@ msgstr ""
 msgid "Adding Primary Key"
 msgstr ""
 
-#: js/messages.php:310 templates/designer/aggregate_query_panel.phtml:59
-#: templates/designer/having_query_panel.phtml:113
-#: templates/designer/new_relation_panel.phtml:87
-#: templates/designer/options_panel.phtml:252
-#: templates/designer/rename_to_panel.phtml:41
-#: templates/designer/where_query_panel.phtml:82
+#: js/messages.php:310
+#: templates/database/designer/aggregate_query_panel.phtml:59
+#: templates/database/designer/having_query_panel.phtml:113
+#: templates/database/designer/new_relation_panel.phtml:87
+#: templates/database/designer/options_panel.phtml:252
+#: templates/database/designer/rename_to_panel.phtml:41
+#: templates/database/designer/where_query_panel.phtml:82
 msgid "OK"
 msgstr "Labi"
 
@@ -1872,7 +1877,7 @@ msgstr "Kopē datubāzi"
 msgid "Changing Charset"
 msgstr "Maina kodējumu"
 
-#: js/messages.php:320 libraries/Util.class.php:3217
+#: js/messages.php:320 libraries/Util.class.php:3223
 #, fuzzy
 #| msgid "Disable foreign key checks"
 msgid "Enable foreign key checks"
@@ -1909,20 +1914,21 @@ msgstr ""
 #: js/messages.php:334 libraries/DisplayResults.class.php:4834
 #: libraries/DisplayResults.class.php:5092 libraries/Menu.class.php:344
 #: libraries/Menu.class.php:446 libraries/Menu.class.php:578
-#: libraries/Util.class.php:3636 libraries/Util.class.php:3637
-#: libraries/Util.class.php:4316 libraries/Util.class.php:4331
-#: libraries/Util.class.php:4348 libraries/config/messages.inc.php:252
+#: libraries/Util.class.php:3642 libraries/Util.class.php:3643
+#: libraries/Util.class.php:4322 libraries/Util.class.php:4337
+#: libraries/Util.class.php:4354 libraries/config/messages.inc.php:252
 #: libraries/display_export.lib.php:173 libraries/rte/rte_list.lib.php:146
 #: libraries/server_privileges.lib.php:2211
 #: libraries/server_privileges.lib.php:2290
 #: libraries/server_privileges.lib.php:2632
 #: libraries/server_privileges.lib.php:3356
 #: libraries/server_status_monitor.lib.php:322 prefs_manage.php:303
-#: setup/frames/menu.inc.php:27 templates/structure/check_all_tables.phtml:11
+#: setup/frames/menu.inc.php:27
+#: templates/database/structure/check_all_tables.phtml:11
 msgid "Export"
 msgstr "Eksports"
 
-#: js/messages.php:337 libraries/rte/rte_routines.lib.php:652
+#: js/messages.php:337 libraries/rte/rte_routines.lib.php:743
 msgid "ENUM/SET editor"
 msgstr ""
 
@@ -1961,7 +1967,7 @@ msgstr "Rādīt pieprasījumu logu"
 #: libraries/Console.class.php:214 libraries/DisplayResults.class.php:3474
 #: libraries/DisplayResults.class.php:4818 libraries/Index.class.php:723
 #: libraries/Util.class.php:706 libraries/Util.class.php:1202
-#: libraries/Util.class.php:3634 libraries/Util.class.php:3635
+#: libraries/Util.class.php:3640 libraries/Util.class.php:3641
 #: libraries/central_columns.lib.php:851
 #: libraries/central_columns.lib.php:1193
 #: libraries/config/messages.inc.php:892
@@ -1979,7 +1985,7 @@ msgstr "Labot"
 #: libraries/server_user_groups.lib.php:129
 #: libraries/sql_query_form.lib.php:416 libraries/tracking.lib.php:477
 #: setup/frames/index.inc.php:183 setup/frames/index.inc.php:291
-#: templates/designer/delete_relation_panel.phtml:27
+#: templates/database/designer/delete_relation_panel.phtml:27
 msgid "Delete"
 msgstr "Dzēst"
 
@@ -2163,11 +2169,11 @@ msgid "No dependencies selected!"
 msgstr "Datubāze nav izvēlēta."
 
 #: js/messages.php:394 libraries/central_columns.lib.php:1214
-#: libraries/insert_edit.lib.php:1458 libraries/server_variables.lib.php:155
+#: libraries/insert_edit.lib.php:1456 libraries/server_variables.lib.php:155
 #: setup/frames/config.inc.php:42 setup/frames/index.inc.php:279
 #: templates/columns_definitions/column_definitions_form.phtml:165
-#: templates/gis_visualization/gis_visualization.phtml:48
-#: templates/tbl_relation/common_form.phtml:107
+#: templates/table/gis_visualization/gis_visualization.phtml:48
+#: templates/table/relation/common_form.phtml:107
 msgid "Save"
 msgstr "Saglabāt"
 
@@ -2256,8 +2262,8 @@ msgid "Data point content"
 msgstr "Satura rādītājs"
 
 #: js/messages.php:430 js/messages.php:562 js/messages.php:579
-#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2573
-#: templates/index_form.phtml:154 templates/index_form.phtml:194
+#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2571
+#: templates/table/index_form.phtml:154 templates/table/index_form.phtml:194
 msgid "Ignore"
 msgstr "Ignorēt"
 
@@ -2316,8 +2322,8 @@ msgstr ""
 msgid "Please select the primary key or a unique key!"
 msgstr ""
 
-#: js/messages.php:457 templates/designer/side_menu.phtml:91
-#: templates/designer/side_menu.phtml:94
+#: js/messages.php:457 templates/database/designer/side_menu.phtml:91
+#: templates/database/designer/side_menu.phtml:94
 #, fuzzy
 #| msgid "Choose field to display"
 msgid "Choose column to display"
@@ -2335,22 +2341,22 @@ msgstr ""
 msgid "Page name"
 msgstr "Lapas numurs:"
 
-#: js/messages.php:463 templates/designer/side_menu.phtml:56
-#: templates/designer/side_menu.phtml:59
+#: js/messages.php:463 templates/database/designer/side_menu.phtml:56
+#: templates/database/designer/side_menu.phtml:59
 #, fuzzy
 #| msgid "Select All"
 msgid "Save page"
 msgstr "Iezīmēt visu"
 
-#: js/messages.php:464 templates/designer/side_menu.phtml:63
-#: templates/designer/side_menu.phtml:66
+#: js/messages.php:464 templates/database/designer/side_menu.phtml:63
+#: templates/database/designer/side_menu.phtml:66
 #, fuzzy
 #| msgid "Select All"
 msgid "Save page as"
 msgstr "Iezīmēt visu"
 
-#: js/messages.php:465 templates/designer/side_menu.phtml:49
-#: templates/designer/side_menu.phtml:52
+#: js/messages.php:465 templates/database/designer/side_menu.phtml:49
+#: templates/database/designer/side_menu.phtml:52
 #, fuzzy
 #| msgctxt "PDF"
 #| msgid "page"
@@ -2363,7 +2369,7 @@ msgstr "Aizņem"
 msgid "Delete page"
 msgstr "Iezīmēt visu"
 
-#: js/messages.php:467 templates/designer/side_menu.phtml:10
+#: js/messages.php:467 templates/database/designer/side_menu.phtml:10
 #, fuzzy
 #| msgid "Unit"
 msgid "Untitled"
@@ -2489,7 +2495,7 @@ msgstr "Oriģinālā pozīcija"
 msgid "cancel"
 msgstr "Atcelt"
 
-#: js/messages.php:499 libraries/server_status.lib.php:271
+#: js/messages.php:499 libraries/server_status.lib.php:280
 msgid "Aborted"
 msgstr "Pārtraukts"
 
@@ -3165,7 +3171,7 @@ msgstr "Lūdzu ievadiet derīgu numuru"
 
 #: js/messages.php:793 libraries/Message.class.php:199
 #: libraries/Util.class.php:654 libraries/core.lib.php:245
-#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1172
+#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1170
 #: tbl_operations.php:229 view_operations.php:63
 msgid "Error"
 msgstr "Kļūda"
@@ -3224,8 +3230,8 @@ msgstr "sekundē"
 msgid "per minute"
 msgstr "minūtē"
 
-#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:143
-#: libraries/server_status.lib.php:228
+#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:152
+#: libraries/server_status.lib.php:237
 #: libraries/server_status_queries.lib.php:98
 msgid "per hour"
 msgstr "stundā"
@@ -3243,7 +3249,7 @@ msgstr ""
 msgid "Wrong permissions on configuration file, should not be world writable!"
 msgstr ""
 
-#: libraries/Config.class.php:1799
+#: libraries/Config.class.php:1801
 msgid "Font size"
 msgstr ""
 
@@ -3273,10 +3279,10 @@ msgstr "vaicājumā"
 #: libraries/server_privileges.lib.php:2890
 #: libraries/server_privileges.lib.php:3144
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4332
+#: libraries/server_privileges.lib.php:4358
 #: libraries/server_status_processes.lib.php:80
-#: templates/tbl_relation/foreign_key_row.phtml:165
-#: templates/tbl_relation/internal_relational_row.phtml:55
+#: templates/table/relation/foreign_key_row.phtml:165
+#: templates/table/relation/internal_relational_row.phtml:55
 msgid "Database"
 msgstr "Datubāze"
 
@@ -3383,11 +3389,11 @@ msgstr "SQL vēsture"
 #: libraries/plugins/import/ImportMediawiki.class.php:60
 #: libraries/plugins/import/ImportOds.class.php:59
 #: libraries/plugins/import/ImportShp.class.php:57
-#: libraries/plugins/import/ImportSql.class.php:148
+#: libraries/plugins/import/ImportSql.class.php:51
 #: libraries/plugins/import/ImportXml.class.php:58
-#: libraries/rte/rte_routines.lib.php:833 templates/index_form.phtml:49
-#: templates/structure/row_stats_table.phtml:20
-#: templates/table/options.phtml:2
+#: libraries/rte/rte_routines.lib.php:924 templates/table/index_form.phtml:49
+#: templates/table/search/options.phtml:2
+#: templates/table/structure/row_stats_table.phtml:20
 #, fuzzy
 msgid "Options"
 msgstr "Darbības"
@@ -3433,7 +3439,8 @@ msgstr "Dilstošā secībā"
 msgid "Order:"
 msgstr "Cits"
 
-#: libraries/Console.class.php:289 templates/table/replace_preview.phtml:17
+#: libraries/Console.class.php:289
+#: templates/table/search/replace_preview.phtml:17
 #, fuzzy
 #| msgid "Column"
 msgid "Count"
@@ -3555,9 +3562,9 @@ msgstr "Pārslēgties uz nokopēto tabulu"
 #: libraries/operations.lib.php:794 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:191
-#: templates/structure/sortable_header.phtml:21
-#: templates/structure/sortable_header.phtml:38
-#: templates/table/options.phtml:68
+#: templates/database/structure/sortable_header.phtml:21
+#: templates/database/structure/sortable_header.phtml:38
+#: templates/table/search/options.phtml:68
 msgid "Ascending"
 msgstr "Augošā secībā"
 
@@ -3567,13 +3574,14 @@ msgstr "Augošā secībā"
 #: libraries/operations.lib.php:797 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:188
-#: templates/structure/sortable_header.phtml:26
-#: templates/structure/sortable_header.phtml:43
-#: templates/table/options.phtml:69
+#: templates/database/structure/sortable_header.phtml:26
+#: templates/database/structure/sortable_header.phtml:43
+#: templates/table/search/options.phtml:69
 msgid "Descending"
 msgstr "Dilstošā secībā"
 
-#: libraries/DBQbe.class.php:467 templates/table/search_and_replace.phtml:6
+#: libraries/DBQbe.class.php:467
+#: templates/table/search/search_and_replace.phtml:6
 #, fuzzy
 #| msgid "Column"
 msgid "Column:"
@@ -3760,12 +3768,12 @@ msgstr[0] "%s rezultāti tabulā <i>%s</i>"
 msgstr[1] "%s rezultāti tabulā <i>%s</i>"
 
 #: libraries/DbSearch.class.php:354 libraries/Menu.class.php:311
-#: libraries/Util.class.php:3337 libraries/Util.class.php:3347
-#: libraries/Util.class.php:3623 libraries/Util.class.php:3624
-#: libraries/Util.class.php:4343 libraries/config.values.php:43
+#: libraries/Util.class.php:3343 libraries/Util.class.php:3353
+#: libraries/Util.class.php:3629 libraries/Util.class.php:3630
+#: libraries/Util.class.php:4349 libraries/config.values.php:43
 #: libraries/config.values.php:51 libraries/config.values.php:119
 #: libraries/navigation/Nodes/Node_Table.class.php:295
-#: templates/structure/check_all_table_column.phtml:5
+#: templates/table/structure/check_all_table_column.phtml:5
 msgid "Browse"
 msgstr "Apskatīt"
 
@@ -3785,7 +3793,8 @@ msgstr "Meklēt datubāzē"
 msgid "Words or values to search for (wildcard: \"%\"):"
 msgstr "Vārdi vai vērtības meklēšanai (aizstājējzīme: \"%\"):"
 
-#: libraries/DbSearch.class.php:401 templates/table/search_and_replace.phtml:1
+#: libraries/DbSearch.class.php:401
+#: templates/table/search/search_and_replace.phtml:1
 msgid "Find:"
 msgstr "Atrast:"
 
@@ -3839,16 +3848,16 @@ msgstr "Filtrs"
 msgid "Search this table"
 msgstr "Meklēt datubāzē"
 
-#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2532
-#: libraries/Util.class.php:2535
+#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2538
+#: libraries/Util.class.php:2541
 #, fuzzy
 #| msgid "Begin"
 msgctxt "First page"
 msgid "Begin"
 msgstr "Sākums"
 
-#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2533
-#: libraries/Util.class.php:2536 libraries/server_bin_log.lib.php:170
+#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2539
+#: libraries/Util.class.php:2542 libraries/server_bin_log.lib.php:170
 #: libraries/server_bin_log.lib.php:172
 #, fuzzy
 #| msgid "Previous"
@@ -3856,8 +3865,8 @@ msgctxt "Previous page"
 msgid "Previous"
 msgstr "Iepriekšējie"
 
-#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2564
-#: libraries/Util.class.php:2574 libraries/server_bin_log.lib.php:204
+#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2570
+#: libraries/Util.class.php:2580 libraries/server_bin_log.lib.php:204
 #: libraries/server_bin_log.lib.php:206
 #, fuzzy
 #| msgid "Next"
@@ -3865,8 +3874,8 @@ msgctxt "Next page"
 msgid "Next"
 msgstr "Nākamie"
 
-#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2565
-#: libraries/Util.class.php:2575
+#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2571
+#: libraries/Util.class.php:2581
 #, fuzzy
 #| msgid "End"
 msgctxt "Last page"
@@ -3956,9 +3965,9 @@ msgid "May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]."
 msgstr "Var būt aptuvens skaits. Skatīt [doc@faq3-11]FAQ 3.11[/doc]"
 
 #: libraries/DisplayResults.class.php:4332 libraries/Message.class.php:180
-#: libraries/controllers/TableRelationController.class.php:258
+#: libraries/controllers/TableRelationController.class.php:259
 #: libraries/controllers/TableSearchController.class.php:655
-#: libraries/rte/rte_routines.lib.php:1332 libraries/sql_query_form.lib.php:89
+#: libraries/rte/rte_routines.lib.php:1423 libraries/sql_query_form.lib.php:89
 #: tbl_operations.php:227 tbl_row_action.php:138 view_operations.php:62
 #, fuzzy
 #| msgid "Your SQL query has been executed successfully."
@@ -3966,7 +3975,7 @@ msgid "Your SQL query has been executed successfully."
 msgstr "Jūsu SQL vaicājums tika veiksmīgi izpildīts"
 
 #: libraries/DisplayResults.class.php:4660
-#: libraries/controllers/StructureController.class.php:629
+#: libraries/controllers/DatabaseStructureController.class.php:564
 #, php-format
 msgid ""
 "This view has at least this number of rows. Please refer to %sdocumentation"
@@ -3990,34 +3999,34 @@ msgstr ""
 msgid "%d total"
 msgstr "kopā"
 
-#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1318
+#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1312
 #, fuzzy, php-format
 #| msgid "Query took %01.4f sec"
 msgid "Query took %01.4f seconds."
 msgstr "Vaicājums ilga %01.4f s"
 
 #: libraries/DisplayResults.class.php:4807
-#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4767
-#: libraries/Util.class.php:4773 libraries/mult_submits.inc.php:50
-#: templates/structure/check_all_tables.phtml:2
-#: templates/structure/check_all_tables.phtml:9
+#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4773
+#: libraries/Util.class.php:4779 libraries/mult_submits.inc.php:50
+#: templates/database/structure/check_all_tables.phtml:2
+#: templates/database/structure/check_all_tables.phtml:9
 msgid "With selected:"
 msgstr "Ar iezīmēto:"
 
 #: libraries/DisplayResults.class.php:4811
-#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4769
-#: libraries/Util.class.php:4770 libraries/server_privileges.lib.php:1174
+#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4775
+#: libraries/Util.class.php:4776 libraries/server_privileges.lib.php:1174
 #: libraries/server_privileges.lib.php:1175
 #: libraries/server_privileges.lib.php:1387
 #: libraries/server_user_groups.lib.php:231
-#: templates/structure/check_all_tables.phtml:3
-#: templates/structure/check_all_tables.phtml:4
+#: templates/database/structure/check_all_tables.phtml:3
+#: templates/database/structure/check_all_tables.phtml:4
 msgid "Check All"
 msgstr "Iezīmēt visu"
 
 #: libraries/DisplayResults.class.php:4985 libraries/Header.class.php:383
-#: templates/structure/optional_action_links.phtml:1
-#: templates/structure/print_view_data_dictionary_link.phtml:3
+#: templates/database/structure/print_view_data_dictionary_link.phtml:3
+#: templates/table/structure/optional_action_links.phtml:1
 msgid "Print view"
 msgstr "Izdrukas versija"
 
@@ -4025,7 +4034,8 @@ msgstr "Izdrukas versija"
 msgid "Query results operations"
 msgstr ""
 
-#: libraries/DisplayResults.class.php:5105 templates/tbl_chart.phtml:12
+#: libraries/DisplayResults.class.php:5105
+#: templates/table/chart/tbl_chart.phtml:12
 #, fuzzy
 #| msgid "Display PDF schema"
 msgid "Display chart"
@@ -4123,7 +4133,7 @@ msgid "Click on the bar to scroll to top of page"
 msgstr ""
 
 #: libraries/Header.class.php:749
-#: libraries/plugins/auth/AuthenticationCookie.class.php:152
+#: libraries/plugins/auth/AuthenticationCookie.class.php:140
 #, fuzzy
 #| msgid "Cookies must be enabled past this point."
 msgid "Javascript must be enabled past this point!"
@@ -4147,11 +4157,11 @@ msgid "Keyname"
 msgstr "Atslēgas nosaukums"
 
 #: libraries/Index.class.php:697
-#: libraries/controllers/StructureController.class.php:1962
-#: libraries/controllers/StructureController.class.php:1967
+#: libraries/controllers/TableStructureController.class.php:953
+#: libraries/controllers/TableStructureController.class.php:958
 #: libraries/tracking.lib.php:973
 #: templates/columns_definitions/column_indexes.phtml:11
-#: templates/structure/check_all_table_column.phtml:26
+#: templates/table/structure/check_all_table_column.phtml:26
 msgid "Unique"
 msgstr "Unikālais"
 
@@ -4170,16 +4180,17 @@ msgstr "Kardinalitāte"
 #: libraries/server_collations.lib.php:35 libraries/tracking.lib.php:881
 #: libraries/tracking.lib.php:977
 #: templates/columns_definitions/table_fields_definitions.phtml:33
-#: templates/structure/row_stats_table.phtml:31
-#: templates/structure/table_header.phtml:55
-#: templates/structure/table_structure_header.phtml:7
-#: templates/table/table_header.phtml:8
+#: templates/database/structure/table_header.phtml:55
+#: templates/table/search/table_header.phtml:8
+#: templates/table/structure/row_stats_table.phtml:31
+#: templates/table/structure/table_structure_header.phtml:7
 msgid "Collation"
 msgstr "Izkārtojumi"
 
 #: libraries/Index.class.php:703 libraries/rte/rte_events.lib.php:496
-#: libraries/rte/rte_routines.lib.php:956 libraries/tracking.lib.php:885
-#: libraries/tracking.lib.php:979 templates/structure/table_header.phtml:84
+#: libraries/rte/rte_routines.lib.php:1047 libraries/tracking.lib.php:885
+#: libraries/tracking.lib.php:979
+#: templates/database/structure/table_header.phtml:84
 #, fuzzy
 msgid "Comment"
 msgstr "Komentāri"
@@ -4193,15 +4204,15 @@ msgstr "Primārā atslēga tika izdzēsta."
 msgid "Index %s has been dropped."
 msgstr "Indekss %s tika izdzēsts."
 
-#: libraries/Index.class.php:757 libraries/Util.class.php:3630
-#: libraries/Util.class.php:3631
-#: libraries/controllers/StructureController.class.php:1958
-#: libraries/controllers/StructureController.class.php:1959
+#: libraries/Index.class.php:757 libraries/Util.class.php:3636
+#: libraries/Util.class.php:3637
+#: libraries/controllers/TableStructureController.class.php:949
+#: libraries/controllers/TableStructureController.class.php:950
 #: libraries/operations.lib.php:1607 libraries/rte/rte_list.lib.php:150
 #: libraries/server_databases.lib.php:146
-#: templates/structure/check_all_table_column.phtml:15
-#: templates/structure/check_all_tables.phtml:16
-#: templates/tbl_relation/foreign_key_row.phtml:93
+#: templates/database/structure/check_all_tables.phtml:16
+#: templates/table/relation/foreign_key_row.phtml:93
+#: templates/table/structure/check_all_table_column.phtml:15
 msgid "Drop"
 msgstr "Likvidēt"
 
@@ -4230,16 +4241,16 @@ msgstr "Serveris"
 #: libraries/Menu.class.php:248
 #: libraries/navigation/Nodes/Node_View.class.php:32
 #: libraries/tbl_info.inc.php:63
-#: templates/structure/structure_table_row.phtml:97
-#: templates/structure/structure_table_row.phtml:159
+#: templates/database/structure/structure_table_row.phtml:97
+#: templates/database/structure/structure_table_row.phtml:159
 msgid "View"
 msgstr ""
 
 #: libraries/Menu.class.php:325 libraries/Menu.class.php:429
-#: libraries/Menu.class.php:548 libraries/Util.class.php:3334
-#: libraries/Util.class.php:3344 libraries/Util.class.php:3350
-#: libraries/Util.class.php:4313 libraries/Util.class.php:4328
-#: libraries/Util.class.php:4345 libraries/config.values.php:40
+#: libraries/Menu.class.php:548 libraries/Util.class.php:3340
+#: libraries/Util.class.php:3350 libraries/Util.class.php:3356
+#: libraries/Util.class.php:4319 libraries/Util.class.php:4334
+#: libraries/Util.class.php:4351 libraries/config.values.php:40
 #: libraries/config.values.php:48 libraries/config.values.php:110
 #: libraries/config.values.php:116 libraries/config/messages.inc.php:321
 #: libraries/navigation/Nodes/Node_Table.class.php:292
@@ -4247,19 +4258,19 @@ msgid "SQL"
 msgstr "SQL"
 
 #: libraries/Menu.class.php:328 libraries/Menu.class.php:432
-#: libraries/Util.class.php:3335 libraries/Util.class.php:3345
-#: libraries/Util.class.php:3351 libraries/Util.class.php:3625
-#: libraries/Util.class.php:3626 libraries/Util.class.php:4329
-#: libraries/Util.class.php:4346 libraries/config.values.php:41
+#: libraries/Util.class.php:3341 libraries/Util.class.php:3351
+#: libraries/Util.class.php:3357 libraries/Util.class.php:3631
+#: libraries/Util.class.php:3632 libraries/Util.class.php:4335
+#: libraries/Util.class.php:4352 libraries/config.values.php:41
 #: libraries/config.values.php:49 libraries/config.values.php:111
 #: libraries/config.values.php:117
 #: libraries/navigation/Nodes/Node_Table.class.php:286
 msgid "Search"
 msgstr "Meklēt"
 
-#: libraries/Menu.class.php:338 libraries/Util.class.php:3336
-#: libraries/Util.class.php:3346 libraries/Util.class.php:3627
-#: libraries/Util.class.php:3628 libraries/Util.class.php:4347
+#: libraries/Menu.class.php:338 libraries/Util.class.php:3342
+#: libraries/Util.class.php:3352 libraries/Util.class.php:3633
+#: libraries/Util.class.php:3634 libraries/Util.class.php:4353
 #: libraries/config.values.php:42 libraries/config.values.php:50
 #: libraries/config.values.php:118
 #: libraries/navigation/Nodes/Node_Table.class.php:289
@@ -4268,30 +4279,30 @@ msgid "Insert"
 msgstr "Pievienot"
 
 #: libraries/Menu.class.php:362 libraries/Menu.class.php:467
-#: libraries/Util.class.php:4334 libraries/Util.class.php:4350
+#: libraries/Util.class.php:4340 libraries/Util.class.php:4356
 #: libraries/config.values.php:106 libraries/server_common.lib.php:51
 #: libraries/server_privileges.lib.php:2370
 #: libraries/server_privileges.lib.php:3158
-#: libraries/server_privileges.lib.php:4221
+#: libraries/server_privileges.lib.php:4247
 msgid "Privileges"
 msgstr "Privilēģijas"
 
 #: libraries/Menu.class.php:371 libraries/Menu.class.php:379
-#: libraries/Menu.class.php:459 libraries/Util.class.php:3338
-#: libraries/Util.class.php:3352 libraries/Util.class.php:4333
-#: libraries/Util.class.php:4351 libraries/config.values.php:112
+#: libraries/Menu.class.php:459 libraries/Util.class.php:3344
+#: libraries/Util.class.php:3358 libraries/Util.class.php:4339
+#: libraries/Util.class.php:4357 libraries/config.values.php:112
 #: view_operations.php:92
 msgid "Operations"
 msgstr "Darbības"
 
 #: libraries/Menu.class.php:384 libraries/Menu.class.php:492
-#: libraries/Util.class.php:4338 libraries/Util.class.php:4352
+#: libraries/Util.class.php:4344 libraries/Util.class.php:4358
 #: libraries/relation.lib.php:255
 msgid "Tracking"
 msgstr ""
 
 #: libraries/Menu.class.php:397 libraries/Menu.class.php:486
-#: libraries/Util.class.php:4337 libraries/Util.class.php:4353
+#: libraries/Util.class.php:4343 libraries/Util.class.php:4359
 #: libraries/navigation/Nodes/Node_Trigger_Container.class.php:24
 #: libraries/plugins/export/ExportHtmlword.class.php:557
 #: libraries/plugins/export/ExportOdt.class.php:685
@@ -4308,16 +4319,16 @@ msgstr ""
 msgid "Database seems to be empty!"
 msgstr ""
 
-#: libraries/Menu.class.php:439 libraries/Util.class.php:4330
+#: libraries/Menu.class.php:439 libraries/Util.class.php:4336
 msgid "Query"
 msgstr "Vaicājums pēc parauga"
 
-#: libraries/Menu.class.php:472 libraries/Util.class.php:4335
+#: libraries/Menu.class.php:472 libraries/Util.class.php:4341
 #: libraries/rte/rte_words.lib.php:36
 msgid "Routines"
 msgstr ""
 
-#: libraries/Menu.class.php:479 libraries/Util.class.php:4336
+#: libraries/Menu.class.php:479 libraries/Util.class.php:4342
 #: libraries/navigation/Nodes/Node_Event_Container.class.php:26
 #: libraries/plugins/export/ExportSql.class.php:940
 #: libraries/plugins/export/ExportXml.class.php:107
@@ -4325,22 +4336,22 @@ msgstr ""
 msgid "Events"
 msgstr ""
 
-#: libraries/Menu.class.php:498 libraries/Util.class.php:4339
+#: libraries/Menu.class.php:498 libraries/Util.class.php:4345
 msgid "Designer"
 msgstr ""
 
-#: libraries/Menu.class.php:507 libraries/Util.class.php:4340
-#: templates/structure/check_all_tables.phtml:35
+#: libraries/Menu.class.php:507 libraries/Util.class.php:4346
+#: templates/database/structure/check_all_tables.phtml:35
 #, fuzzy
 #| msgid "Add/Delete Field Columns"
 msgid "Central columns"
 msgstr "Pievienot/Dzēst laukus (kolonnas)"
 
-#: libraries/Menu.class.php:544 libraries/Util.class.php:4312
+#: libraries/Menu.class.php:544 libraries/Util.class.php:4318
 #: libraries/config.values.php:103 libraries/config/messages.inc.php:266
 #: libraries/config/messages.inc.php:341
 #: libraries/navigation/NavigationTree.class.php:1239
-#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4332
+#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4358
 msgid "Databases"
 msgstr "Datubāzes"
 
@@ -4351,35 +4362,35 @@ msgid "User accounts"
 msgstr "Lietotājs"
 
 #: libraries/Menu.class.php:595 libraries/ServerStatusData.class.php:121
-#: libraries/Util.class.php:4319 libraries/server_common.lib.php:36
+#: libraries/Util.class.php:4325 libraries/server_common.lib.php:36
 msgid "Binary log"
 msgstr "Binārais log-fails"
 
 #: libraries/Menu.class.php:601 libraries/ServerStatusData.class.php:126
-#: libraries/Util.class.php:4320 libraries/server_common.lib.php:42
-#: templates/structure/body_for_table_summary.phtml:10
-#: templates/structure/table_header.phtml:27
+#: libraries/Util.class.php:4326 libraries/server_common.lib.php:42
+#: templates/database/structure/body_for_table_summary.phtml:10
+#: templates/database/structure/table_header.phtml:27
 #, fuzzy
 msgid "Replication"
 msgstr "Relācijas"
 
 #: libraries/Menu.class.php:606 libraries/ServerStatusData.class.php:193
-#: libraries/Util.class.php:4321 libraries/config.values.php:105
+#: libraries/Util.class.php:4327 libraries/config.values.php:105
 #: libraries/server_engines.lib.php:108 libraries/server_engines.lib.php:112
 #: libraries/sql_query_form.lib.php:421
 msgid "Variables"
 msgstr "Mainīgie"
 
-#: libraries/Menu.class.php:610 libraries/Util.class.php:4322
+#: libraries/Menu.class.php:610 libraries/Util.class.php:4328
 msgid "Charsets"
 msgstr "Rakstzīmju kodējumi"
 
-#: libraries/Menu.class.php:615 libraries/Util.class.php:4323
+#: libraries/Menu.class.php:615 libraries/Util.class.php:4329
 #: libraries/server_common.lib.php:33 libraries/server_plugins.lib.php:27
 msgid "Plugins"
 msgstr ""
 
-#: libraries/Menu.class.php:626 libraries/Util.class.php:4324
+#: libraries/Menu.class.php:626 libraries/Util.class.php:4330
 msgid "Engines"
 msgstr ""
 
@@ -4406,7 +4417,7 @@ msgid_plural "%1$d rows inserted."
 msgstr[0] "Rindas nav iezīmētas"
 msgstr[1] "Rindas nav iezīmētas"
 
-#: libraries/PDF.class.php:70 libraries/Util.class.php:2521
+#: libraries/PDF.class.php:70 libraries/Util.class.php:2527
 #: libraries/browse_foreigners.lib.php:327
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:865
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:890
@@ -4433,7 +4444,7 @@ msgid "Could not save favorite table!"
 msgstr "Dokumentācija"
 
 #: libraries/RecentFavoriteTable.class.php:212
-#: templates/structure/favorite_anchor.phtml:12
+#: templates/database/structure/favorite_anchor.phtml:12
 #, fuzzy
 #| msgid "Remove chart"
 msgid "Remove from Favorites"
@@ -4621,7 +4632,7 @@ msgid ""
 msgstr ""
 
 #: libraries/StorageEngine.class.php:373
-#: templates/structure/body_for_table_summary.phtml:50
+#: templates/database/structure/body_for_table_summary.phtml:50
 #, php-format
 msgid "%s is the default storage engine on this MySQL server."
 msgstr ""
@@ -5047,10 +5058,10 @@ msgstr ""
 
 #: libraries/Util.class.php:726 libraries/rte/rte_events.lib.php:110
 #: libraries/rte/rte_events.lib.php:119 libraries/rte/rte_events.lib.php:150
-#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:153
-#: libraries/rte/rte_routines.lib.php:162
-#: libraries/rte/rte_routines.lib.php:235
-#: libraries/rte/rte_routines.lib.php:1366
+#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:223
+#: libraries/rte/rte_routines.lib.php:250
+#: libraries/rte/rte_routines.lib.php:372
+#: libraries/rte/rte_routines.lib.php:1457
 #: libraries/rte/rte_triggers.lib.php:86 libraries/rte/rte_triggers.lib.php:95
 #: libraries/rte/rte_triggers.lib.php:127
 msgid "MySQL said: "
@@ -5096,78 +5107,81 @@ msgstr "Sv"
 msgid "%B %d, %Y at %I:%M %p"
 msgstr "%d.%m.%Y %H:%M"
 
-#: libraries/Util.class.php:2019
+#: libraries/Util.class.php:2025
 #, php-format
 msgid "%s days, %s hours, %s minutes and %s seconds"
 msgstr "%s dienas, %s stundas, %s minūtes un %s sekundes"
 
-#: libraries/Util.class.php:2112
+#: libraries/Util.class.php:2118
 #, fuzzy
 #| msgid "Add new field"
 msgid "Missing parameter:"
 msgstr "Pievienot jaunu lauku"
 
-#: libraries/Util.class.php:2645
+#: libraries/Util.class.php:2651
 #, php-format
 msgid "Jump to database \"%s\"."
 msgstr "pāriet pie datubāzes \"%s\"."
 
-#: libraries/Util.class.php:2670
+#: libraries/Util.class.php:2676
 #, php-format
 msgid "The %s functionality is affected by a known bug, see %s"
 msgstr ""
 
-#: libraries/Util.class.php:2881
+#: libraries/Util.class.php:2887
 msgid "Click to toggle"
 msgstr ""
 
-#: libraries/Util.class.php:3542 prefs_manage.php:248
+#: libraries/Util.class.php:3548 prefs_manage.php:248
 msgid "Browse your computer:"
 msgstr ""
 
-#: libraries/Util.class.php:3567
+#: libraries/Util.class.php:3573
 #, fuzzy, php-format
 #| msgid "web server upload directory"
 msgid "Select from the web server upload directory <b>%s</b>:"
 msgstr "web servera augšupielādes direktorija"
 
-#: libraries/Util.class.php:3596 libraries/insert_edit.lib.php:1173
+#: libraries/Util.class.php:3602 libraries/insert_edit.lib.php:1171
 msgid "The directory you set for upload work cannot be reached."
 msgstr "Direktoija, kuru norādijāt augšupielādei, nav pieejama."
 
-#: libraries/Util.class.php:3607
+#: libraries/Util.class.php:3613
 msgid "There are no files to upload!"
 msgstr ""
 
-#: libraries/Util.class.php:3632 libraries/Util.class.php:3633
-#: templates/structure/check_all_tables.phtml:15
+#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: templates/database/structure/check_all_tables.phtml:15
 msgid "Empty"
 msgstr "Iztukšot"
 
-#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: libraries/Util.class.php:3644 libraries/Util.class.php:3645
 msgid "Execute"
 msgstr ""
 
-#: libraries/Util.class.php:4152
+#: libraries/Util.class.php:4158
 msgid "Print"
 msgstr "Drukāt"
 
-#: libraries/Util.class.php:4257 templates/structure/row_stats_table.phtml:80
-#: templates/structure/table_header.phtml:95
+#: libraries/Util.class.php:4263
+#: templates/database/structure/table_header.phtml:95
+#: templates/table/structure/row_stats_table.phtml:80
 msgid "Creation"
 msgstr "Izveidošana"
 
-#: libraries/Util.class.php:4263 templates/structure/row_stats_table.phtml:87
-#: templates/structure/table_header.phtml:106
+#: libraries/Util.class.php:4269
+#: templates/database/structure/table_header.phtml:106
+#: templates/table/structure/row_stats_table.phtml:87
 msgid "Last update"
 msgstr "Pēdējā atjaunošana"
 
-#: libraries/Util.class.php:4269 templates/structure/row_stats_table.phtml:94
-#: templates/structure/table_header.phtml:117
+#: libraries/Util.class.php:4275
+#: templates/database/structure/table_header.phtml:117
+#: templates/table/structure/row_stats_table.phtml:94
 msgid "Last check"
 msgstr "Pēdējā pārbaude"
 
-#: libraries/Util.class.php:4315
+#: libraries/Util.class.php:4321
 #, fuzzy
 #| msgid "User"
 msgid "Users"
@@ -5192,16 +5206,16 @@ msgid "Use this value"
 msgstr "Lietot šo vērtību"
 
 #: libraries/build_html_for_db.lib.php:33 libraries/import.lib.php:193
-#: templates/structure/actions_in_table_structure.phtml:113
-#: templates/structure/row_stats_table.phtml:42
-#: templates/structure/table_header.phtml:36
+#: templates/database/structure/table_header.phtml:36
+#: templates/table/structure/actions_in_table_structure.phtml:113
+#: templates/table/structure/row_stats_table.phtml:42
 msgid "Rows"
 msgstr "Rindas"
 
 #: libraries/build_html_for_db.lib.php:48 libraries/engines/innodb.lib.php:171
-#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:186
-#: libraries/server_status.lib.php:298
-#: templates/structure/display_table_stats.phtml:40
+#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:195
+#: libraries/server_status.lib.php:307
+#: templates/table/structure/display_table_stats.phtml:40
 msgid "Total"
 msgstr "Kopā"
 
@@ -5211,10 +5225,12 @@ msgid "Jump to database"
 msgstr "Nav datubāzu"
 
 #: libraries/build_html_for_db.lib.php:146
+#: templates/database/structure/structure_table_row.phtml:15
 msgid "Not replicated"
 msgstr ""
 
 #: libraries/build_html_for_db.lib.php:158
+#: templates/database/structure/structure_table_row.phtml:16
 #, fuzzy
 msgid "Replicated"
 msgstr "Relācijas"
@@ -5272,17 +5288,17 @@ msgstr ""
 #: libraries/plugins/export/ExportTexytext.class.php:425
 #: libraries/plugins/export/PMA_ExportPdf.class.php:307
 #: libraries/rte/rte_list.lib.php:73 libraries/rte/rte_list.lib.php:85
-#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:830
-#: libraries/rte/rte_routines.lib.php:1492 setup/frames/index.inc.php:162
+#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:921
+#: libraries/rte/rte_routines.lib.php:1583 setup/frames/index.inc.php:162
 #: templates/columns_definitions/table_fields_definitions.phtml:8
-#: templates/structure/table_structure_header.phtml:5
-#: templates/table/create_table.phtml:11
+#: templates/database/create_table.phtml:11
+#: templates/table/structure/table_structure_header.phtml:5
 msgid "Name"
 msgstr "Nosaukums"
 
 #: libraries/central_columns.lib.php:699
 #: libraries/central_columns.lib.php:1381
-#: libraries/rte/rte_routines.lib.php:832
+#: libraries/rte/rte_routines.lib.php:923
 #: templates/columns_definitions/table_fields_definitions.phtml:14
 msgid "Length/Values"
 msgstr "Garums/Vērtības*"
@@ -5305,7 +5321,7 @@ msgid "Select a table"
 msgstr "Izvēlieties tabulas"
 
 #: libraries/central_columns.lib.php:804
-#: templates/structure/add_column.phtml:4
+#: templates/table/structure/add_column.phtml:4
 #, fuzzy
 #| msgid "Add %s field(s)"
 msgid "Add column"
@@ -5327,7 +5343,7 @@ msgstr "Pievienot %s lauku(s)"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1002
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1025
 #: templates/columns_definitions/table_fields_definitions.phtml:36
-#: templates/structure/table_structure_header.phtml:8
+#: templates/table/structure/table_structure_header.phtml:8
 msgid "Attributes"
 msgstr "Atribūti"
 
@@ -5447,7 +5463,7 @@ msgid "Double click"
 msgstr ""
 
 #: libraries/config.values.php:95 libraries/config.values.php:124
-#: libraries/config/FormDisplay.tpl.php:221 libraries/relation.lib.php:97
+#: libraries/config/FormDisplay.tpl.php:232 libraries/relation.lib.php:97
 #: libraries/relation.lib.php:105
 msgid "Disabled"
 msgstr "Izslēgts"
@@ -5639,21 +5655,21 @@ msgstr ""
 msgid "maximum %s"
 msgstr ""
 
-#: libraries/config/FormDisplay.tpl.php:219
+#: libraries/config/FormDisplay.tpl.php:230
 msgid "This setting is disabled, it will not be applied to your configuration."
 msgstr ""
 
-#: libraries/config/FormDisplay.tpl.php:313
+#: libraries/config/FormDisplay.tpl.php:324
 #, php-format
 msgid "Set value: %s"
 msgstr ""
 
-#: libraries/config/FormDisplay.tpl.php:318
+#: libraries/config/FormDisplay.tpl.php:329
 #: libraries/config/messages.inc.php:610
 msgid "Restore default value"
 msgstr ""
 
-#: libraries/config/FormDisplay.tpl.php:332
+#: libraries/config/FormDisplay.tpl.php:343
 msgid "Allow users to customize this value"
 msgstr ""
 
@@ -6089,7 +6105,7 @@ msgstr "Tabulas kodējums:"
 
 #: libraries/config/messages.inc.php:136 libraries/config/messages.inc.php:152
 #: libraries/sql_query_form.lib.php:247
-#: templates/structure/row_stats_table.phtml:7
+#: templates/table/structure/row_stats_table.phtml:7
 msgid "Format"
 msgstr "Formats"
 
@@ -6649,7 +6665,7 @@ msgstr ""
 
 #: libraries/config/messages.inc.php:332
 #: libraries/plugins/export/ExportPdf.class.php:279
-#: templates/structure/secondary_tabs.phtml:8
+#: templates/table/secondary_tabs.phtml:8
 #, fuzzy
 #| msgid "Databases"
 msgid "Table structure"
@@ -8258,108 +8274,34 @@ msgstr ""
 msgid "OpenDocument Text"
 msgstr "Dokumentācija"
 
-#: libraries/controllers/StructureController.class.php:465
+#: libraries/controllers/DatabaseStructureController.class.php:405
 #: tbl_operations.php:382
 #, php-format
 msgid "Table %s has been emptied."
 msgstr "Tabula %s tika iztukšota."
 
-#: libraries/controllers/StructureController.class.php:486
+#: libraries/controllers/DatabaseStructureController.class.php:426
 #: tbl_operations.php:400 view_operations.php:119
 #, fuzzy, php-format
 msgid "View %s has been dropped."
 msgstr "Lauks %s tika izdzēsts"
 
-#: libraries/controllers/StructureController.class.php:487
+#: libraries/controllers/DatabaseStructureController.class.php:427
 #: tbl_operations.php:401
 #, fuzzy, php-format
 #| msgid "Table %s has been dropped."
 msgid "Table %s has been dropped."
 msgstr "Tabula %s tika izdzēsta"
 
-#: libraries/controllers/StructureController.class.php:797
-#, php-format
-msgid "The name '%s' is a MySQL reserved keyword."
-msgid_plural "The names '%s' are MySQL reserved keywords."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: libraries/controllers/StructureController.class.php:875
-msgid "No column selected."
-msgstr "Nav izvēlēta kolonna."
-
-#: libraries/controllers/StructureController.class.php:1049
+#: libraries/controllers/DatabaseStructureController.class.php:733
 msgid "Favorite List is full!"
 msgstr ""
 
-#: libraries/controllers/StructureController.class.php:1272
-#, fuzzy
-#| msgid "The selected users have been deleted successfully."
-msgid "The columns have been moved successfully."
-msgstr "Izvēlētie lietotāji tika veiksmīgi dzēsti."
-
-#: libraries/controllers/StructureController.class.php:1535
-#, fuzzy, php-format
-msgid ""
-"Table %1$s has been altered successfully. Privileges have been adjusted."
-msgstr "Izvēlētie lietotāji tika veiksmīgi dzēsti."
-
-#: libraries/controllers/StructureController.class.php:1541
-#: libraries/controllers/TableIndexesController.class.php:161
-#: tbl_addfield.php:92
-#, fuzzy, php-format
-msgid "Table %1$s has been altered successfully."
-msgstr "Izvēlētie lietotāji tika veiksmīgi dzēsti."
-
-#: libraries/controllers/StructureController.class.php:1588
-#: libraries/tracking.lib.php:1094
-#, fuzzy
-#| msgid "Query type"
-msgid "Query error"
-msgstr "Vaicājuma tips"
-
-#: libraries/controllers/StructureController.class.php:1806
+#: libraries/controllers/DatabaseStructureController.class.php:947
 #: libraries/mysql_charsets.lib.php:366 libraries/mysql_charsets.lib.php:373
 msgid "unknown"
 msgstr "nazināma"
 
-#: libraries/controllers/StructureController.class.php:1957
-#: templates/structure/check_all_table_column.phtml:11
-msgid "Change"
-msgstr "Labot"
-
-#: libraries/controllers/StructureController.class.php:1961
-#: libraries/controllers/StructureController.class.php:1966
-#: libraries/navigation/Nodes/Node_Index.class.php:30
-#: libraries/tracking.lib.php:926
-#: templates/columns_definitions/column_indexes.phtml:16
-#: templates/columns_definitions/table_fields_definitions.phtml:57
-#: templates/structure/check_all_table_column.phtml:30
-#: templates/structure/display_structure.phtml:79
-#: templates/structure/display_table_stats.phtml:19
-msgid "Index"
-msgstr "Indekss"
-
-#: libraries/controllers/StructureController.class.php:1963
-#: libraries/controllers/StructureController.class.php:1968
-#: templates/columns_definitions/column_indexes.phtml:27
-#: templates/structure/check_all_table_column.phtml:37
-msgid "Spatial"
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1964
-#: libraries/controllers/StructureController.class.php:1969
-#: templates/columns_definitions/column_indexes.phtml:22
-#: templates/structure/check_all_table_column.phtml:47
-msgid "Fulltext"
-msgstr "Pilni teksti"
-
-#: libraries/controllers/StructureController.class.php:1970
-#, fuzzy
-msgid "Distinct values"
-msgstr "Pārlūkot ārējās vērtības"
-
 #: libraries/controllers/TableChartController.class.php:82
 #: libraries/controllers/TableGisVisualizationController.class.php:101
 msgid "No SQL query was set to fetch data."
@@ -8375,13 +8317,20 @@ msgstr ""
 msgid "No data to display"
 msgstr "Dati netika atrasti"
 
-#: libraries/controllers/TableRelationController.class.php:217
+#: libraries/controllers/TableIndexesController.class.php:161
+#: libraries/controllers/TableStructureController.class.php:736
+#: tbl_addfield.php:92
+#, fuzzy, php-format
+msgid "Table %1$s has been altered successfully."
+msgstr "Izvēlētie lietotāji tika veiksmīgi dzēsti."
+
+#: libraries/controllers/TableRelationController.class.php:218
 #, fuzzy
 #| msgid "Thread %s was successfully killed."
 msgid "Display column was successfully updated."
 msgstr "Process %s tika veiksmīgi nogalināts."
 
-#: libraries/controllers/TableRelationController.class.php:283
+#: libraries/controllers/TableRelationController.class.php:288
 #, fuzzy
 msgid "Internal relations were successfully updated."
 msgstr "Iekšējās relācijas"
@@ -8399,12 +8348,79 @@ msgid "Zoom search"
 msgstr "Meklēt"
 
 #: libraries/controllers/TableSearchController.class.php:852
-#: templates/table/selection_form.phtml:59
+#: templates/table/search/selection_form.phtml:59
 #, fuzzy
 #| msgid "Hide search criteria"
 msgid "Find and replace"
 msgstr "Slēpt meklēšanas kritērijus"
 
+#: libraries/controllers/TableStructureController.class.php:163
+#, php-format
+msgid "The name '%s' is a MySQL reserved keyword."
+msgid_plural "The names '%s' are MySQL reserved keywords."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: libraries/controllers/TableStructureController.class.php:241
+msgid "No column selected."
+msgstr "Nav izvēlēta kolonna."
+
+#: libraries/controllers/TableStructureController.class.php:467
+#, fuzzy
+#| msgid "The selected users have been deleted successfully."
+msgid "The columns have been moved successfully."
+msgstr "Izvēlētie lietotāji tika veiksmīgi dzēsti."
+
+#: libraries/controllers/TableStructureController.class.php:730
+#, fuzzy, php-format
+msgid ""
+"Table %1$s has been altered successfully. Privileges have been adjusted."
+msgstr "Izvēlētie lietotāji tika veiksmīgi dzēsti."
+
+#: libraries/controllers/TableStructureController.class.php:783
+#: libraries/tracking.lib.php:1094
+#, fuzzy
+#| msgid "Query type"
+msgid "Query error"
+msgstr "Vaicājuma tips"
+
+#: libraries/controllers/TableStructureController.class.php:948
+#: templates/table/structure/check_all_table_column.phtml:11
+msgid "Change"
+msgstr "Labot"
+
+#: libraries/controllers/TableStructureController.class.php:952
+#: libraries/controllers/TableStructureController.class.php:957
+#: libraries/navigation/Nodes/Node_Index.class.php:30
+#: libraries/tracking.lib.php:926
+#: templates/columns_definitions/column_indexes.phtml:16
+#: templates/columns_definitions/table_fields_definitions.phtml:57
+#: templates/table/structure/check_all_table_column.phtml:30
+#: templates/table/structure/display_structure.phtml:79
+#: templates/table/structure/display_table_stats.phtml:19
+msgid "Index"
+msgstr "Indekss"
+
+#: libraries/controllers/TableStructureController.class.php:954
+#: libraries/controllers/TableStructureController.class.php:959
+#: templates/columns_definitions/column_indexes.phtml:27
+#: templates/table/structure/check_all_table_column.phtml:37
+msgid "Spatial"
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:955
+#: libraries/controllers/TableStructureController.class.php:960
+#: templates/columns_definitions/column_indexes.phtml:22
+#: templates/table/structure/check_all_table_column.phtml:47
+msgid "Fulltext"
+msgstr "Pilni teksti"
+
+#: libraries/controllers/TableStructureController.class.php:963
+#, fuzzy
+msgid "Distinct values"
+msgstr "Pārlūkot ārējās vērtības"
+
 #: libraries/core.lib.php:306
 #, php-format
 msgid "The %s extension is missing. Please check your PHP configuration."
@@ -8451,7 +8467,7 @@ msgid "No Password"
 msgstr "Nav paroles"
 
 #: libraries/display_change_password.lib.php:68
-#: libraries/plugins/auth/AuthenticationCookie.class.php:199
+#: libraries/plugins/auth/AuthenticationCookie.class.php:187
 #: libraries/replication_gui.lib.php:422 libraries/replication_gui.lib.php:862
 #: libraries/server_privileges.lib.php:1640
 msgid "Password:"
@@ -9254,12 +9270,12 @@ msgid "Dump has been saved to file %s."
 msgstr "Damps tika saglabāts failā %s."
 
 #: libraries/import.lib.php:202 libraries/insert_edit.lib.php:124
-#: libraries/rte/rte_routines.lib.php:1353 libraries/sql.lib.php:1312
+#: libraries/rte/rte_routines.lib.php:1444 libraries/sql.lib.php:1306
 #: tbl_get_field.php:44
 msgid "MySQL returned an empty result set (i.e. zero rows)."
 msgstr "MySQL atgrieza tukšo rezultātu (0 rindas)."
 
-#: libraries/import.lib.php:265 libraries/sql.lib.php:1326
+#: libraries/import.lib.php:265 libraries/sql.lib.php:1320
 msgid "[ROLLBACK occurred.]"
 msgstr ""
 
@@ -9325,14 +9341,14 @@ msgstr "Izveidot indeksu uz&nbsp;%s&nbsp;laukiem"
 
 #: libraries/insert_edit.lib.php:233
 #: libraries/navigation/Nodes/Node_DatabaseChild.class.php:48
-#: templates/designer/table_list.phtml:40
+#: templates/database/designer/table_list.phtml:40
 msgid "Hide"
 msgstr ""
 
 #: libraries/insert_edit.lib.php:249
 #: libraries/navigation/Nodes/Node_Function.class.php:32
-#: libraries/rte/rte_routines.lib.php:1495
-#: templates/table/table_header.phtml:4
+#: libraries/rte/rte_routines.lib.php:1586
+#: templates/table/search/table_header.phtml:4
 msgid "Function"
 msgstr "Funkcija"
 
@@ -9347,88 +9363,89 @@ msgstr "Binārais"
 msgid "Because of its length,<br /> this column might not be editable."
 msgstr "Sava garuma dēļ,<br /> šis lauks var būt nerediģējams "
 
-#: libraries/insert_edit.lib.php:1050
+#: libraries/insert_edit.lib.php:1048
 msgid "Binary - do not edit"
 msgstr "Binārais - netiek labots"
 
-#: libraries/insert_edit.lib.php:1176 libraries/server_privileges.lib.php:470
-#: templates/table/options.phtml:36
+#: libraries/insert_edit.lib.php:1174 libraries/server_privileges.lib.php:470
+#: templates/table/search/options.phtml:36
 msgid "Or"
 msgstr "Vai"
 
-#: libraries/insert_edit.lib.php:1177
+#: libraries/insert_edit.lib.php:1175
 #, fuzzy
 #| msgid "web server upload directory"
 msgid "web server upload directory:"
 msgstr "web servera augšupielādes direktorija"
 
-#: libraries/insert_edit.lib.php:1348 templates/table/input_box.phtml:49
+#: libraries/insert_edit.lib.php:1346
+#: templates/table/search/input_box.phtml:49
 #, fuzzy
 #| msgid "Insert"
 msgid "Edit/Insert"
 msgstr "Pievienot"
 
-#: libraries/insert_edit.lib.php:1398
+#: libraries/insert_edit.lib.php:1396
 #, php-format
 msgid "Continue insertion with %s rows"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1428
+#: libraries/insert_edit.lib.php:1426
 msgid "and then"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1461
+#: libraries/insert_edit.lib.php:1459
 msgid "Insert as new row"
 msgstr "Ievietot kā jaunu rindu"
 
-#: libraries/insert_edit.lib.php:1464
+#: libraries/insert_edit.lib.php:1462
 msgid "Insert as new row and ignore errors"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1467
+#: libraries/insert_edit.lib.php:1465
 msgid "Show insert query"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1487
+#: libraries/insert_edit.lib.php:1485
 msgid "Go back to previous page"
 msgstr "Atgriezties atpakaļ iepriekšējā lapā"
 
-#: libraries/insert_edit.lib.php:1490
+#: libraries/insert_edit.lib.php:1488
 msgid "Insert another new row"
 msgstr "Ievietot vēl vienu rindu"
 
-#: libraries/insert_edit.lib.php:1495
+#: libraries/insert_edit.lib.php:1493
 msgid "Go back to this page"
 msgstr "Atgriezties šajā lapā"
 
-#: libraries/insert_edit.lib.php:1518
+#: libraries/insert_edit.lib.php:1516
 msgid "Edit next row"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1540
+#: libraries/insert_edit.lib.php:1538
 msgid ""
 "Use TAB key to move from value to value, or CTRL+arrows to move anywhere"
 msgstr ""
 "Lietojiet TAB taustiņu, lai pārvietotos no vērtības līdz vērtībai, vai CTRL"
 "+bultiņas, lai pārvietotos jebkurā vietā"
 
-#: libraries/insert_edit.lib.php:1577 libraries/replication_gui.lib.php:542
-#: libraries/rte/rte_routines.lib.php:1497
+#: libraries/insert_edit.lib.php:1575 libraries/replication_gui.lib.php:542
+#: libraries/rte/rte_routines.lib.php:1588
 #: libraries/server_status_variables.lib.php:220
-#: templates/designer/having_query_panel.phtml:100
-#: templates/designer/options_panel.phtml:73
-#: templates/designer/options_panel.phtml:239
-#: templates/designer/where_query_panel.phtml:69
-#: templates/table/table_header.phtml:10
-#: templates/table/zoom_result_form.phtml:35
+#: templates/database/designer/having_query_panel.phtml:100
+#: templates/database/designer/options_panel.phtml:73
+#: templates/database/designer/options_panel.phtml:239
+#: templates/database/designer/where_query_panel.phtml:69
+#: templates/table/search/table_header.phtml:10
+#: templates/table/search/zoom_result_form.phtml:35
 msgid "Value"
 msgstr "Vērtība"
 
-#: libraries/insert_edit.lib.php:1937 libraries/sql.lib.php:1309
+#: libraries/insert_edit.lib.php:1935 libraries/sql.lib.php:1303
 msgid "Showing SQL query"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1962 libraries/sql.lib.php:1287
+#: libraries/insert_edit.lib.php:1960 libraries/sql.lib.php:1281
 #, php-format
 msgid "Inserted row id: %1$d"
 msgstr ""
@@ -9876,7 +9893,7 @@ msgstr ""
 #: libraries/navigation/Nodes/Node_View_Container.class.php:26
 #: libraries/navigation/Nodes/Node_View_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:129
-#: templates/structure/show_create.phtml:30
+#: templates/database/structure/show_create.phtml:30
 msgid "Views"
 msgstr ""
 
@@ -10185,7 +10202,7 @@ msgstr "Jums nav pietiekoši tiesību, lai atrastos šeit tagad!"
 
 #: libraries/operations.lib.php:101 libraries/operations.lib.php:249
 #: libraries/operations.lib.php:869 libraries/operations.lib.php:963
-#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:907
+#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:998
 #: templates/columns_definitions/table_fields_definitions.phtml:47
 #, fuzzy
 #| msgid "Edit Privileges"
@@ -10282,22 +10299,22 @@ msgid "Switch to copied table"
 msgstr "Pārslēgties uz nokopēto tabulu"
 
 #: libraries/operations.lib.php:1360
-#: templates/structure/check_all_tables.phtml:18
+#: templates/database/structure/check_all_tables.phtml:18
 msgid "Table maintenance"
 msgstr "Tabulas apkalpošana"
 
 #: libraries/operations.lib.php:1398
-#: templates/structure/check_all_tables.phtml:19
+#: templates/database/structure/check_all_tables.phtml:19
 msgid "Analyze table"
 msgstr "Analizēt tabulu"
 
 #: libraries/operations.lib.php:1413
-#: templates/structure/check_all_tables.phtml:20
+#: templates/database/structure/check_all_tables.phtml:20
 msgid "Check table"
 msgstr "Pārbaudīt tabulu"
 
 #: libraries/operations.lib.php:1428
-#: templates/structure/check_all_tables.phtml:22
+#: templates/database/structure/check_all_tables.phtml:22
 #, fuzzy
 #| msgid "Check table"
 msgid "Checksum table"
@@ -10317,18 +10334,19 @@ msgid "Flush the table (FLUSH)"
 msgstr "Atsvaidzināt tabulu (FLUSH)"
 
 #: libraries/operations.lib.php:1477
-#: templates/structure/check_all_tables.phtml:23
-#: templates/structure/display_table_stats.phtml:56
+#: templates/database/structure/check_all_tables.phtml:23
+#: templates/table/structure/display_table_stats.phtml:56
 msgid "Optimize table"
 msgstr "Optimizēt tabulu"
 
 #: libraries/operations.lib.php:1492
-#: templates/structure/check_all_tables.phtml:24
+#: templates/database/structure/check_all_tables.phtml:24
 msgid "Repair table"
 msgstr "Restaurēt tabulu"
 
 #: libraries/operations.lib.php:1538
-#: templates/structure/check_all_tables.phtml:14 view_operations.php:127
+#: templates/database/structure/check_all_tables.phtml:14
+#: view_operations.php:127
 #, fuzzy
 #| msgid "Dumping data for table"
 msgid "Delete data or table"
@@ -10462,7 +10480,7 @@ msgid "Cannot connect: invalid settings."
 msgstr "Nevar pieslēgties: kļūda konfigurācijā."
 
 #: libraries/plugins/auth/AuthenticationConfig.class.php:108
-#: libraries/plugins/auth/AuthenticationCookie.class.php:134
+#: libraries/plugins/auth/AuthenticationCookie.class.php:122
 #: libraries/plugins/auth/AuthenticationHttp.class.php:96
 #, php-format
 msgid "Welcome to %s"
@@ -10491,38 +10509,38 @@ msgstr ""
 msgid "Retry to connect"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:146
+#: libraries/plugins/auth/AuthenticationCookie.class.php:134
 msgid "Your session has expired. Please log in again."
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:170
+#: libraries/plugins/auth/AuthenticationCookie.class.php:158
 msgid "Log in"
 msgstr "Ieiet"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:178
-#: libraries/plugins/auth/AuthenticationCookie.class.php:188
+#: libraries/plugins/auth/AuthenticationCookie.class.php:166
+#: libraries/plugins/auth/AuthenticationCookie.class.php:176
 msgid "You can enter hostname/IP address and port separated by space."
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:193
+#: libraries/plugins/auth/AuthenticationCookie.class.php:181
 msgid "Username:"
 msgstr "Lietotājvārds:"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:205
+#: libraries/plugins/auth/AuthenticationCookie.class.php:193
 #, fuzzy
 #| msgid "Server Choice"
 msgid "Server Choice:"
 msgstr "Servera izvēle"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:386
+#: libraries/plugins/auth/AuthenticationCookie.class.php:374
 msgid "Entered captcha is wrong, try again!"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:396
+#: libraries/plugins/auth/AuthenticationCookie.class.php:384
 msgid "Please enter correct captcha!"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:423
+#: libraries/plugins/auth/AuthenticationCookie.class.php:411
 #, fuzzy
 #| msgid "Cannot log in to the MySQL server"
 msgid "You are not allowed to log in to this MySQL server!"
@@ -10634,7 +10652,7 @@ msgstr "Nosūtīts"
 #: libraries/plugins/export/ExportOdt.class.php:593
 #: libraries/plugins/export/ExportTexytext.class.php:428
 #: libraries/plugins/export/PMA_ExportPdf.class.php:313
-#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:984
 #: libraries/rte/rte_triggers.lib.php:377
 #, fuzzy
 #| msgid "Description"
@@ -10986,7 +11004,7 @@ msgid "Last check:"
 msgstr "Pēdējā pārbaude:"
 
 #: libraries/plugins/export/ExportSql.class.php:1399
-#: templates/structure/structure_table_row.phtml:183
+#: templates/database/structure/structure_table_row.phtml:183
 msgid "in use"
 msgstr "lietošanā"
 
@@ -11184,20 +11202,16 @@ msgstr ""
 msgid "The imported file does not contain any data!"
 msgstr ""
 
-#: libraries/plugins/import/ImportSql.class.php:169
+#: libraries/plugins/import/ImportSql.class.php:72
 #, fuzzy
 #| msgid "MySQL&nbsp;4.0 compatible"
 msgid "SQL compatibility mode:"
 msgstr "MySQL&nbsp;4.0 savietojams"
 
-#: libraries/plugins/import/ImportSql.class.php:181
+#: libraries/plugins/import/ImportSql.class.php:84
 msgid "Do not use <code>AUTO_INCREMENT</code> for zero values"
 msgstr ""
 
-#: libraries/plugins/import/ImportSql.class.php:195
-msgid "Read as multibytes"
-msgstr ""
-
 #: libraries/plugins/import/ImportXml.class.php:54
 msgid "XML"
 msgstr "XML"
@@ -11242,7 +11256,7 @@ msgid "Show grid"
 msgstr "Rādīt režģi"
 
 #: libraries/plugins/schema/SchemaPdf.class.php:94
-#: templates/structure/print_view_data_dictionary_link.phtml:6
+#: templates/database/structure/print_view_data_dictionary_link.phtml:6
 msgid "Data Dictionary"
 msgstr "Datu vārdnīca"
 
@@ -11274,7 +11288,7 @@ msgid "The %s table doesn't exist!"
 msgstr "Tabula \"%s\" neeksistē!"
 
 #: libraries/plugins/schema/eps/Eps_Relation_Schema.class.php:321
-#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:309
+#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:323
 #, fuzzy, php-format
 #| msgid "Schema of the \"%s\" database - Page %s"
 msgid "Schema of the %s database - Page %s"
@@ -11304,7 +11318,7 @@ msgstr "Satura rādītājs"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1005
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1028
 #: libraries/tracking.lib.php:884
-#: templates/structure/table_structure_header.phtml:11
+#: templates/table/structure/table_structure_header.phtml:11
 msgid "Extra"
 msgstr "Ekstras"
 
@@ -11698,51 +11712,51 @@ msgstr ""
 msgid "Create the needed tables with the <code>%screate_tables.sql</code>."
 msgstr ""
 
-#: libraries/relation.lib.php:360
+#: libraries/relation.lib.php:357
 msgid "Create a pma user and give access to these tables."
 msgstr ""
 
-#: libraries/relation.lib.php:365
+#: libraries/relation.lib.php:360
 msgid ""
 "Enable advanced features in configuration file (<code>config.inc.php</"
 "code>), for example by starting from <code>config.sample.inc.php</code>."
 msgstr ""
 
-#: libraries/relation.lib.php:373
+#: libraries/relation.lib.php:365
 msgid "Re-login to phpMyAdmin to load the updated configuration file."
 msgstr ""
 
-#: libraries/relation.lib.php:1612
+#: libraries/relation.lib.php:1607
 msgid "no description"
 msgstr "Bez apraksta"
 
-#: libraries/relation.lib.php:1811
+#: libraries/relation.lib.php:1806
 msgid ""
 "You do not have necessary privileges to create a database named "
 "'phpmyadmin'. You may go to 'Operations' tab of any database to set up the "
 "phpMyAdmin configuration storage there."
 msgstr ""
 
-#: libraries/relation.lib.php:1928
+#: libraries/relation.lib.php:1923
 #, php-format
 msgid ""
 "%sCreate%s a database named 'phpmyadmin' and setup the phpMyAdmin "
 "configuration storage there."
 msgstr ""
 
-#: libraries/relation.lib.php:1936
+#: libraries/relation.lib.php:1931
 #, php-format
 msgid ""
 "%sCreate%s the phpMyAdmin configuration storage in the current database."
 msgstr ""
 
-#: libraries/relation.lib.php:1944
+#: libraries/relation.lib.php:1939
 #, php-format
 msgid "%sCreate%s missing phpMyAdmin configuration storage tables."
 msgstr ""
 
 #: libraries/replication_gui.lib.php:46 libraries/replication_gui.lib.php:343
-#: libraries/server_databases.lib.php:387
+#: libraries/server_databases.lib.php:398
 msgid "Master replication"
 msgstr ""
 
@@ -11798,7 +11812,7 @@ msgid ""
 msgstr ""
 
 #: libraries/replication_gui.lib.php:141
-#: libraries/server_databases.lib.php:389
+#: libraries/server_databases.lib.php:400
 msgid "Slave replication"
 msgstr ""
 
@@ -12082,10 +12096,10 @@ msgid "Master server changed successfully to %s."
 msgstr "Privilēģijas tika veiksmīgi pārlādētas."
 
 #: libraries/rte/rte_events.lib.php:106 libraries/rte/rte_events.lib.php:115
-#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:149
-#: libraries/rte/rte_routines.lib.php:158
-#: libraries/rte/rte_routines.lib.php:231
-#: libraries/rte/rte_routines.lib.php:1362
+#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:219
+#: libraries/rte/rte_routines.lib.php:246
+#: libraries/rte/rte_routines.lib.php:368
+#: libraries/rte/rte_routines.lib.php:1453
 #: libraries/rte/rte_triggers.lib.php:82 libraries/rte/rte_triggers.lib.php:91
 #: libraries/rte/rte_triggers.lib.php:123
 #, php-format
@@ -12107,7 +12121,7 @@ msgstr "Tabula %s tika izdzēsta"
 msgid "Event %1$s has been created."
 msgstr "Tabula %s tika izdzēsta"
 
-#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:251
+#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:266
 #: libraries/rte/rte_triggers.lib.php:144
 msgid "One or more errors have occurred while processing your request:"
 msgstr ""
@@ -12117,7 +12131,7 @@ msgstr ""
 msgid "Edit event"
 msgstr "Nosūtīts"
 
-#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:794
+#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:885
 #: libraries/rte/rte_triggers.lib.php:323 view_create.php:180
 msgid "Details"
 msgstr ""
@@ -12132,7 +12146,7 @@ msgstr "Notikuma tips"
 msgid "Event type"
 msgstr "Notikuma tips"
 
-#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:817
+#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:908
 #, fuzzy, php-format
 #| msgid "Change"
 msgid "Change to %s"
@@ -12167,12 +12181,14 @@ msgstr "Beigas"
 msgid "On completion preserve"
 msgstr "Pilnas INSERT izteiksmes"
 
-#: libraries/rte/rte_events.lib.php:491 libraries/rte/rte_routines.lib.php:930
+#: libraries/rte/rte_events.lib.php:491
+#: libraries/rte/rte_routines.lib.php:1021
 #: libraries/rte/rte_triggers.lib.php:383 view_create.php:209
 msgid "Definer"
 msgstr ""
 
-#: libraries/rte/rte_events.lib.php:535 libraries/rte/rte_routines.lib.php:997
+#: libraries/rte/rte_events.lib.php:535
+#: libraries/rte/rte_routines.lib.php:1088
 #: libraries/rte/rte_triggers.lib.php:422
 msgid "The definer must be in the \"username@hostname\" format!"
 msgstr ""
@@ -12198,9 +12214,9 @@ msgid "You must provide an event definition."
 msgstr ""
 
 #: libraries/rte/rte_export.lib.php:43 libraries/rte/rte_general.lib.php:72
-#: libraries/rte/rte_routines.lib.php:345
-#: libraries/rte/rte_routines.lib.php:1198
-#: libraries/rte/rte_routines.lib.php:1411
+#: libraries/rte/rte_routines.lib.php:153
+#: libraries/rte/rte_routines.lib.php:1289
+#: libraries/rte/rte_routines.lib.php:1502
 #, fuzzy
 #| msgid "Processes"
 msgid "Error in processing request:"
@@ -12236,135 +12252,135 @@ msgid ""
 "problems."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:110
-#: libraries/rte/rte_routines.lib.php:1006
+#: libraries/rte/rte_routines.lib.php:123
+msgid "Edit routine"
+msgstr ""
+
+#: libraries/rte/rte_routines.lib.php:200
+#: libraries/rte/rte_routines.lib.php:1097
 #, php-format
 msgid "Invalid routine type: \"%s\""
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:170
+#: libraries/rte/rte_routines.lib.php:253
+#, fuzzy, php-format
+msgid "Routine %1$s has been created."
+msgstr "Tabula %s tika izdzēsta"
+
+#: libraries/rte/rte_routines.lib.php:380
 msgid "Sorry, we failed to restore the dropped routine."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:211
+#: libraries/rte/rte_routines.lib.php:439
 #, fuzzy, php-format
 #| msgid "Table %s has been dropped."
 msgid "Routine %1$s has been modified. Privileges have been adjusted."
 msgstr "Tabula %s tika izdzēsta"
 
-#: libraries/rte/rte_routines.lib.php:216
+#: libraries/rte/rte_routines.lib.php:444
 #, fuzzy, php-format
 #| msgid "Table %s has been dropped."
 msgid "Routine %1$s has been modified."
 msgstr "Tabula %s tika izdzēsta"
 
-#: libraries/rte/rte_routines.lib.php:238
-#, fuzzy, php-format
-msgid "Routine %1$s has been created."
-msgstr "Tabula %s tika izdzēsta"
-
-#: libraries/rte/rte_routines.lib.php:315
-msgid "Edit routine"
-msgstr ""
-
-#: libraries/rte/rte_routines.lib.php:797
+#: libraries/rte/rte_routines.lib.php:888
 #, fuzzy
 #| msgid "Column names"
 msgid "Routine name"
 msgstr "Kolonnu nosaukumi"
 
-#: libraries/rte/rte_routines.lib.php:823
+#: libraries/rte/rte_routines.lib.php:914
 msgid "Parameters"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:829
+#: libraries/rte/rte_routines.lib.php:920
 #, fuzzy
 #| msgid "Creation"
 msgid "Direction"
 msgstr "Izveidošana"
 
-#: libraries/rte/rte_routines.lib.php:847
+#: libraries/rte/rte_routines.lib.php:938
 #, fuzzy
 #| msgid "Add new field"
 msgid "Add parameter"
 msgstr "Pievienot jaunu lauku"
 
-#: libraries/rte/rte_routines.lib.php:851
+#: libraries/rte/rte_routines.lib.php:942
 #, fuzzy
 #| msgid "Rename database to"
 msgid "Remove last parameter"
 msgstr "Pārsaukt datubāzi par"
 
-#: libraries/rte/rte_routines.lib.php:856
+#: libraries/rte/rte_routines.lib.php:947
 msgid "Return type"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:862
+#: libraries/rte/rte_routines.lib.php:953
 #, fuzzy
 #| msgid "Length/Values"
 msgid "Return length/values"
 msgstr "Garums/Vērtības*"
 
-#: libraries/rte/rte_routines.lib.php:868
+#: libraries/rte/rte_routines.lib.php:959
 #, fuzzy
 #| msgid "Table options"
 msgid "Return options"
 msgstr "Tabulas opcijas"
 
-#: libraries/rte/rte_routines.lib.php:899
+#: libraries/rte/rte_routines.lib.php:990
 msgid "Is deterministic"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:920
+#: libraries/rte/rte_routines.lib.php:1011
 msgid ""
 "You do not have sufficient privileges to perform this operation; Please "
 "refer to the documentation for more details"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:935
+#: libraries/rte/rte_routines.lib.php:1026
 #, fuzzy
 #| msgid "Query type"
 msgid "Security type"
 msgstr "Vaicājuma tips"
 
-#: libraries/rte/rte_routines.lib.php:944
+#: libraries/rte/rte_routines.lib.php:1035
 msgid "SQL data access"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1013
+#: libraries/rte/rte_routines.lib.php:1104
 msgid "You must provide a routine name!"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1047
+#: libraries/rte/rte_routines.lib.php:1138
 #, php-format
 msgid "Invalid direction \"%s\" given for parameter."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1069
-#: libraries/rte/rte_routines.lib.php:1131
+#: libraries/rte/rte_routines.lib.php:1160
+#: libraries/rte/rte_routines.lib.php:1222
 msgid ""
 "You must provide length/values for routine parameters of type ENUM, SET, "
 "VARCHAR and VARBINARY."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1095
+#: libraries/rte/rte_routines.lib.php:1186
 msgid "You must provide a name and a type for each routine parameter."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1114
+#: libraries/rte/rte_routines.lib.php:1205
 msgid "You must provide a valid return type for the routine."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1174
+#: libraries/rte/rte_routines.lib.php:1265
 msgid "You must provide a routine definition."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1285
+#: libraries/rte/rte_routines.lib.php:1376
 #, php-format
 msgid "Execution results of routine %s"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1340
+#: libraries/rte/rte_routines.lib.php:1431
 #, php-format
 msgid "%d row affected by the last statement inside the procedure."
 msgid_plural "%d rows affected by the last statement inside the procedure."
@@ -12372,13 +12388,13 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: libraries/rte/rte_routines.lib.php:1398
-#: libraries/rte/rte_routines.lib.php:1406
+#: libraries/rte/rte_routines.lib.php:1489
+#: libraries/rte/rte_routines.lib.php:1497
 msgid "Execute routine"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1485
-#: libraries/rte/rte_routines.lib.php:1488
+#: libraries/rte/rte_routines.lib.php:1576
+#: libraries/rte/rte_routines.lib.php:1579
 msgid "Routine parameters"
 msgstr ""
 
@@ -12558,7 +12574,7 @@ msgid "Original position"
 msgstr "Oriģinālā pozīcija"
 
 #: libraries/server_bin_log.lib.php:133
-#: templates/structure/display_table_stats.phtml:4
+#: templates/table/structure/display_table_stats.phtml:4
 msgid "Information"
 msgstr "Informācija"
 
@@ -12596,12 +12612,12 @@ msgstr ""
 "Piezīme: Datubāzes statistikas ieslēgšana šeit var izsaukt palielināto datu "
 "apmaiņu starp webserveri un MySQL serveri."
 
-#: libraries/server_databases.lib.php:364
-#: libraries/server_databases.lib.php:365
+#: libraries/server_databases.lib.php:366
+#: libraries/server_databases.lib.php:371
 msgid "Enable Statistics"
 msgstr "Ieslēgt statistiku"
 
-#: libraries/server_databases.lib.php:481
+#: libraries/server_databases.lib.php:492
 #, fuzzy, php-format
 #| msgid "%s databases have been dropped successfully."
 msgid "%1$d database has been dropped successfully."
@@ -12993,7 +13009,7 @@ msgid "You have revoked the privileges for %s."
 msgstr "Jūs atņēmāt privilēgijas lietotājam %s."
 
 #: libraries/server_privileges.lib.php:2059
-#: libraries/server_privileges.lib.php:4290
+#: libraries/server_privileges.lib.php:4316
 #, fuzzy
 #| msgid "Add user"
 msgid "Add user account"
@@ -13180,60 +13196,60 @@ msgstr "Dzēšam %s"
 msgid "The privileges were reloaded successfully."
 msgstr "Privilēģijas tika veiksmīgi pārlādētas."
 
-#: libraries/server_privileges.lib.php:3994
+#: libraries/server_privileges.lib.php:4003
 #, php-format
 msgid "The user %s already exists!"
 msgstr "Lietotājs %s jau eksistē!"
 
-#: libraries/server_privileges.lib.php:4232
+#: libraries/server_privileges.lib.php:4258
 #, fuzzy, php-format
 #| msgid "Privileges"
 msgid "Privileges for %s"
 msgstr "Privilēģijas"
 
-#: libraries/server_privileges.lib.php:4241
+#: libraries/server_privileges.lib.php:4267
 #: libraries/server_status_processes.lib.php:72
 #: libraries/server_user_groups.lib.php:39
 msgid "User"
 msgstr "Lietotājs"
 
-#: libraries/server_privileges.lib.php:4282
+#: libraries/server_privileges.lib.php:4308
 msgctxt "Create new user"
 msgid "New"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4311
+#: libraries/server_privileges.lib.php:4337
 #, fuzzy
 #| msgid "Edit Privileges"
 msgid "Edit privileges:"
 msgstr "Mainīt privilēģijas"
 
-#: libraries/server_privileges.lib.php:4312
+#: libraries/server_privileges.lib.php:4338
 #, fuzzy
 #| msgid "User"
 msgid "User account"
 msgstr "Lietotājs"
 
-#: libraries/server_privileges.lib.php:4371
+#: libraries/server_privileges.lib.php:4397
 msgid ""
 "Note: You are attempting to edit privileges of the user with which you are "
 "currently logged in."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4391 libraries/server_users.lib.php:25
+#: libraries/server_privileges.lib.php:4417 libraries/server_users.lib.php:25
 #, fuzzy
 #| msgid "User overview"
 msgid "User accounts overview"
 msgstr "Lietotāju pārskats"
 
-#: libraries/server_privileges.lib.php:4459
+#: libraries/server_privileges.lib.php:4485
 msgid ""
 "A user account allowing any user from localhost to connect is present. This "
 "will prevent other users from connecting if the host part of their account "
 "allows a connection from any (%) host."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4500
+#: libraries/server_privileges.lib.php:4526
 #, php-format
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
@@ -13246,7 +13262,7 @@ msgstr ""
 "lieto serveris, ja tur tika veikti labojumi. Šajā gadījumā ir nepieciešams "
 "%spārlādēt privilēģijas%s pirms Jūs turpināt."
 
-#: libraries/server_privileges.lib.php:4519
+#: libraries/server_privileges.lib.php:4545
 #, fuzzy
 #| msgid ""
 #| "Note: phpMyAdmin gets the users' privileges directly from MySQL's "
@@ -13265,64 +13281,64 @@ msgstr ""
 "lieto serveris, ja tur tika veikti labojumi. Šajā gadījumā ir nepieciešams "
 "%spārlādēt privilēģijas%s pirms Jūs turpināt."
 
-#: libraries/server_privileges.lib.php:4569
+#: libraries/server_privileges.lib.php:4595
 msgid "The selected user was not found in the privilege table."
 msgstr "Izvēlētais lietotājs nav atrasts privilēģiju tabulā."
 
-#: libraries/server_privileges.lib.php:4801
+#: libraries/server_privileges.lib.php:4827
 msgid "You have added a new user."
 msgstr "Jūs pievienojāt jaunu lietotāju."
 
-#: libraries/server_status.lib.php:53
+#: libraries/server_status.lib.php:60
 #, php-format
 msgid "Network traffic since startup: %s"
 msgstr ""
 
-#: libraries/server_status.lib.php:66
+#: libraries/server_status.lib.php:73
 #, fuzzy, php-format
 #| msgid "This MySQL server has been running for %s. It started up on %s."
 msgid "This MySQL server has been running for %1$s. It started up on %2$s."
 msgstr "Šis MySQL serveris strādā %s. Tas tika palaists %s."
 
-#: libraries/server_status.lib.php:80
+#: libraries/server_status.lib.php:94
 msgid ""
 "This MySQL server works as <b>master</b> and <b>slave</b> in <b>replication</"
 "b> process."
 msgstr ""
 
-#: libraries/server_status.lib.php:85
+#: libraries/server_status.lib.php:99
 msgid "This MySQL server works as <b>master</b> in <b>replication</b> process."
 msgstr ""
 
-#: libraries/server_status.lib.php:90
+#: libraries/server_status.lib.php:104
 msgid "This MySQL server works as <b>slave</b> in <b>replication</b> process."
 msgstr ""
 
-#: libraries/server_status.lib.php:106
+#: libraries/server_status.lib.php:116
 msgid "Replication status"
 msgstr ""
 
-#: libraries/server_status.lib.php:137
+#: libraries/server_status.lib.php:146
 msgid ""
 "On a busy server, the byte counters may overrun, so those statistics as "
 "reported by the MySQL server may be incorrect."
 msgstr ""
 
-#: libraries/server_status.lib.php:148
+#: libraries/server_status.lib.php:157
 msgid "Received"
 msgstr "Saņemts"
 
-#: libraries/server_status.lib.php:167
+#: libraries/server_status.lib.php:176
 msgid "Sent"
 msgstr "Nosūtīts"
 
-#: libraries/server_status.lib.php:234
+#: libraries/server_status.lib.php:243
 #, fuzzy
 #| msgid "Connections"
 msgid "Max. concurrent connections"
 msgstr "Konekcijas"
 
-#: libraries/server_status.lib.php:244
+#: libraries/server_status.lib.php:253
 msgid "Failed attempts"
 msgstr "Neveiksmīgi mēģinājumi"
 
@@ -14305,7 +14321,7 @@ msgstr ""
 msgid "Not implemented yet."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/AlterOperation.php:193
+#: libraries/sql-parser/src/Components/AlterOperation.php:191
 msgid "Unrecognized alter operation."
 msgstr ""
 
@@ -14319,7 +14335,7 @@ msgid "An opening bracket followed by a set of values was expected."
 msgstr ""
 
 #: libraries/sql-parser/src/Components/ArrayObj.php:101
-#: libraries/sql-parser/src/Components/FieldDefinition.php:202
+#: libraries/sql-parser/src/Components/CreateDefinition.php:202
 msgid "An opening bracket was expected."
 msgstr ""
 
@@ -14327,25 +14343,35 @@ msgstr ""
 msgid "A comma or a closing bracket was expected"
 msgstr ""
 
+#: libraries/sql-parser/src/Components/CreateDefinition.php:246
+#, fuzzy
+#| msgid "No databases selected."
+msgid "A comma or a closing bracket was expected."
+msgstr "Datubāze nav izvēlēta."
+
+#: libraries/sql-parser/src/Components/CreateDefinition.php:262
+msgid "A closing bracket was expected."
+msgstr ""
+
 #: libraries/sql-parser/src/Components/DataType.php:125
 msgid "Unrecognized data type."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:225
+#: libraries/sql-parser/src/Components/Expression.php:227
 msgid "Unexpected closing bracket."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:246
-#: libraries/sql-parser/src/Components/Expression.php:283
-#: libraries/sql-parser/src/Components/Expression.php:303
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:285
+#: libraries/sql-parser/src/Components/Expression.php:305
 msgid "An alias was previously found."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:257
+#: libraries/sql-parser/src/Components/Expression.php:259
 msgid "Unexpected dot."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:327
+#: libraries/sql-parser/src/Components/Expression.php:329
 #, fuzzy
 #| msgid "No databases selected."
 msgid "An alias was expected."
@@ -14357,16 +14383,6 @@ msgstr "Datubāze nav izvēlēta."
 msgid "An expression was expected."
 msgstr "Rindas nav iezīmētas"
 
-#: libraries/sql-parser/src/Components/FieldDefinition.php:246
-#, fuzzy
-#| msgid "No databases selected."
-msgid "A comma or a closing bracket was expected."
-msgstr "Datubāze nav izvēlēta."
-
-#: libraries/sql-parser/src/Components/FieldDefinition.php:262
-msgid "A closing bracket was expected."
-msgstr ""
-
 #: libraries/sql-parser/src/Components/Limit.php:90
 #: libraries/sql-parser/src/Components/Limit.php:112
 msgid "An offset was expected."
@@ -14408,27 +14424,27 @@ msgstr ""
 msgid "Expected delimiter."
 msgstr ""
 
-#: libraries/sql-parser/src/Lexer.php:753
+#: libraries/sql-parser/src/Lexer.php:777
 #, fuzzy, php-format
 msgid "Ending quote %1$s was expected."
 msgstr "Tabula %s tika izdzēsta"
 
-#: libraries/sql-parser/src/Lexer.php:789
+#: libraries/sql-parser/src/Lexer.php:813
 #, fuzzy
 msgid "Variable name was expected."
 msgstr "Faila nosaukuma šablons"
 
-#: libraries/sql-parser/src/Parser.php:380
+#: libraries/sql-parser/src/Parser.php:391
 #, fuzzy
 #| msgid "At Beginning of Table"
 msgid "Unexpected beginning of statement."
 msgstr "Tabulas sākumā"
 
-#: libraries/sql-parser/src/Parser.php:399
+#: libraries/sql-parser/src/Parser.php:410
 msgid "Unrecognized statement type."
 msgstr ""
 
-#: libraries/sql-parser/src/Parser.php:479
+#: libraries/sql-parser/src/Parser.php:489
 msgid "No transaction was previously started."
 msgstr ""
 
@@ -14454,8 +14470,10 @@ msgid "The name of the entity was expected."
 msgstr ""
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:310
-msgid "At least one field definition was expected."
-msgstr ""
+#, fuzzy
+#| msgid "The row has been deleted."
+msgid "At least one column definition was expected."
+msgstr "Ieraksts tika dzēsts"
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:329
 msgid "A \"RETURNS\" keyword was expected."
@@ -14530,25 +14548,25 @@ msgstr "Grāmatzīme %s izveidota"
 msgid "Using bookmark \"%s\" as default browse query."
 msgstr ""
 
-#: libraries/sql.lib.php:1306
+#: libraries/sql.lib.php:1300
 msgid "Showing as PHP code"
 msgstr ""
 
-#: libraries/sql.lib.php:1638
+#: libraries/sql.lib.php:1632
 #, php-format
 msgid ""
 "Current selection does not contain a unique column. Grid edit, checkbox, "
 "Edit, Copy and Delete features are not available. %s"
 msgstr ""
 
-#: libraries/sql.lib.php:1649
+#: libraries/sql.lib.php:1643
 #, php-format
 msgid ""
 "Current selection does not contain a unique column. Grid edit, Edit, Copy "
 "and Delete features may result in undesired behavior. %s"
 msgstr ""
 
-#: libraries/sql.lib.php:1688
+#: libraries/sql.lib.php:1682
 #, php-format
 msgid "Problems with indexes of table `%s`"
 msgstr "Problēmas ar indeksiem tabulā `%s`"
@@ -14717,7 +14735,7 @@ msgid "Version %s snapshot (SQL code)"
 msgstr ""
 
 #: libraries/tracking.lib.php:947
-#: templates/structure/table_structure_row.phtml:33
+#: templates/table/structure/table_structure_row.phtml:33
 #, fuzzy
 #| msgid "None"
 msgctxt "None for default"
@@ -14771,19 +14789,19 @@ msgstr "Servera versija"
 msgid "Version %1$s was created, tracking for %2$s is active."
 msgstr ""
 
-#: libraries/user_preferences.inc.php:29
+#: libraries/user_preferences.inc.php:30
 #, fuzzy
 #| msgid "General relation features"
 msgid "Manage your settings"
 msgstr "Galvenās relāciju īpašības"
 
-#: libraries/user_preferences.inc.php:46 prefs_manage.php:307
+#: libraries/user_preferences.inc.php:54 prefs_manage.php:307
 #, fuzzy
 #| msgid "Modifications have been saved"
 msgid "Configuration has been saved."
 msgstr "Labojumi tika saglabāti"
 
-#: libraries/user_preferences.inc.php:66
+#: libraries/user_preferences.inc.php:74
 #, php-format
 msgid ""
 "Your preferences will be saved for current session only. Storing them "
@@ -15185,7 +15203,7 @@ msgid "first"
 msgstr ""
 
 #: templates/columns_definitions/move_column.phtml:12
-#: templates/structure/add_column.phtml:21
+#: templates/table/structure/add_column.phtml:21
 #, fuzzy, php-format
 #| msgid "After %s"
 msgid "after %s"
@@ -15273,240 +15291,352 @@ msgstr "Pārlūkprogrammas transformācija"
 msgid "Input transformation options"
 msgstr "Transformācijas opcijas"
 
-#: templates/designer/aggregate_query_panel.phtml:22
-#: templates/designer/options_panel.phtml:100
+#: templates/database/create_table.phtml:7
+#: templates/database/designer/side_menu.phtml:77
+#: templates/database/designer/side_menu.phtml:80
+#, fuzzy
+msgid "Create table"
+msgstr "Izveidot jaunu lapu"
+
+#: templates/database/create_table.phtml:15
+#, fuzzy
+#| msgid "Number of rows per page"
+msgid "Number of columns"
+msgstr "Rindu skaits vienā lapā"
+
+#: templates/database/designer/aggregate_query_panel.phtml:22
+#: templates/database/designer/options_panel.phtml:100
 #, fuzzy
 #| msgid "Create"
 msgid "Aggregate"
 msgstr "Izveidot"
 
-#: templates/designer/aggregate_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:61
-#: templates/designer/options_panel.phtml:106
-#: templates/designer/options_panel.phtml:170
-#: templates/designer/where_query_panel.phtml:30
-#: templates/table/table_header.phtml:9
+#: templates/database/designer/aggregate_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:61
+#: templates/database/designer/options_panel.phtml:106
+#: templates/database/designer/options_panel.phtml:170
+#: templates/database/designer/where_query_panel.phtml:30
+#: templates/table/search/table_header.phtml:9
 msgid "Operator"
 msgstr "Operators"
 
-#: templates/designer/database_tables.phtml:29
+#: templates/database/designer/database_tables.phtml:29
 msgid "Toggle"
 msgstr ""
 
-#: templates/designer/database_tables.phtml:40
+#: templates/database/designer/database_tables.phtml:40
 #, fuzzy
 #| msgid "Databases"
 msgid "See table structure"
 msgstr "Datubāzes"
 
-#: templates/designer/delete_relation_panel.phtml:21
+#: templates/database/designer/delete_relation_panel.phtml:21
 msgid "Delete relation"
 msgstr ""
 
-#: templates/designer/edit_delete_pages.phtml:7
+#: templates/database/designer/edit_delete_pages.phtml:7
 #, fuzzy
 #| msgid "Page number:"
 msgid "Page to open"
 msgstr "Lapas numurs:"
 
-#: templates/designer/edit_delete_pages.phtml:7
+#: templates/database/designer/edit_delete_pages.phtml:7
 #, fuzzy
 msgid "Page to delete"
 msgstr "Relāciju pārskats"
 
-#: templates/designer/having_query_panel.phtml:90
-#: templates/designer/options_panel.phtml:63
-#: templates/designer/options_panel.phtml:229
-#: templates/designer/where_query_panel.phtml:59
+#: templates/database/designer/having_query_panel.phtml:90
+#: templates/database/designer/options_panel.phtml:63
+#: templates/database/designer/options_panel.phtml:229
+#: templates/database/designer/where_query_panel.phtml:59
 #, fuzzy
 #| msgid "Export"
 msgid "Except"
 msgstr "Eksports"
 
-#: templates/designer/having_query_panel.phtml:102
-#: templates/designer/options_panel.phtml:75
-#: templates/designer/options_panel.phtml:241
-#: templates/designer/where_query_panel.phtml:71
+#: templates/database/designer/having_query_panel.phtml:102
+#: templates/database/designer/options_panel.phtml:75
+#: templates/database/designer/options_panel.phtml:241
+#: templates/database/designer/where_query_panel.phtml:71
 #, fuzzy
 #| msgid "in query"
 msgid "subquery"
 msgstr "vaicājumā"
 
-#: templates/designer/new_relation_panel.phtml:22
-#: templates/designer/side_menu.phtml:84 templates/designer/side_menu.phtml:87
+#: templates/database/designer/new_relation_panel.phtml:22
+#: templates/database/designer/side_menu.phtml:84
+#: templates/database/designer/side_menu.phtml:87
 msgid "Create relation"
 msgstr ""
 
-#: templates/designer/options_panel.phtml:34
-#: templates/designer/options_panel.phtml:200
+#: templates/database/designer/options_panel.phtml:34
+#: templates/database/designer/options_panel.phtml:200
 #, fuzzy
 msgid "Relation operator"
 msgstr "Relāciju pārskats"
 
-#: templates/designer/options_panel.phtml:85
-#: templates/designer/rename_to_panel.phtml:23
+#: templates/database/designer/options_panel.phtml:85
+#: templates/database/designer/rename_to_panel.phtml:23
 #, fuzzy
 msgid "Rename to"
 msgstr "Pārsaukt tabulu uz"
 
-#: templates/designer/options_panel.phtml:91
-#: templates/designer/rename_to_panel.phtml:31
+#: templates/database/designer/options_panel.phtml:91
+#: templates/database/designer/rename_to_panel.phtml:31
 #, fuzzy
 #| msgid "User name"
 msgid "New name"
 msgstr "Lietotājvārds"
 
-#: templates/designer/page_save_as.phtml:4
+#: templates/database/designer/page_save_as.phtml:4
 #, fuzzy
 #| msgid "No rows selected"
 msgid "Save to selected page"
 msgstr "Rindas nav iezīmētas"
 
-#: templates/designer/page_save_as.phtml:5
+#: templates/database/designer/page_save_as.phtml:5
 #, fuzzy
 #| msgid "Create a new index"
 msgid "Create a page and save to it"
 msgstr "Izveidot jaunu indeksu"
 
-#: templates/designer/page_save_as.phtml:26
+#: templates/database/designer/page_save_as.phtml:26
 #, fuzzy
 #| msgid "User name"
 msgid "New page name"
 msgstr "Lietotājvārds"
 
-#: templates/designer/page_selector.phtml:2
+#: templates/database/designer/page_selector.phtml:2
 #, fuzzy
 #| msgid "Select All"
 msgid "Select page"
 msgstr "Iezīmēt visu"
 
-#: templates/designer/query_details.phtml:10
+#: templates/database/designer/query_details.phtml:10
 #, fuzzy
 #| msgid "Table options"
 msgid "Active options"
 msgstr "Tabulas opcijas"
 
-#: templates/designer/schema_export.phtml:4
+#: templates/database/designer/schema_export.phtml:4
 msgid "Select Export Relational Type"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:19 templates/designer/side_menu.phtml:25
+#: templates/database/designer/side_menu.phtml:19
+#: templates/database/designer/side_menu.phtml:25
 #, fuzzy
 #| msgid "Show tables"
 msgid "Show/Hide tables list"
 msgstr "Rādīt tabulas"
 
-#: templates/designer/side_menu.phtml:29 templates/designer/side_menu.phtml:35
-#: templates/designer/side_menu.phtml:36
+#: templates/database/designer/side_menu.phtml:29
+#: templates/database/designer/side_menu.phtml:35
+#: templates/database/designer/side_menu.phtml:36
 msgid "View in fullscreen"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:34
+#: templates/database/designer/side_menu.phtml:34
 msgid "Exit fullscreen"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:41 templates/designer/side_menu.phtml:45
+#: templates/database/designer/side_menu.phtml:41
+#: templates/database/designer/side_menu.phtml:45
 #, fuzzy
 #| msgid "User name"
 msgid "New page"
 msgstr "Lietotājvārds"
 
-#: templates/designer/side_menu.phtml:70 templates/designer/side_menu.phtml:73
+#: templates/database/designer/side_menu.phtml:70
+#: templates/database/designer/side_menu.phtml:73
 #, fuzzy
 #| msgid "Select All"
 msgid "Delete pages"
 msgstr "Iezīmēt visu"
 
-#: templates/designer/side_menu.phtml:77 templates/designer/side_menu.phtml:80
-#: templates/table/create_table.phtml:7
-#, fuzzy
-msgid "Create table"
-msgstr "Izveidot jaunu lapu"
-
-#: templates/designer/side_menu.phtml:98
-#: templates/designer/side_menu.phtml:101
+#: templates/database/designer/side_menu.phtml:98
+#: templates/database/designer/side_menu.phtml:101
 msgid "Reload"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:107
-#: templates/designer/side_menu.phtml:110
+#: templates/database/designer/side_menu.phtml:107
+#: templates/database/designer/side_menu.phtml:110
 msgid "Help"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Angular links"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Direct links"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:122
-#: templates/designer/side_menu.phtml:124
+#: templates/database/designer/side_menu.phtml:122
+#: templates/database/designer/side_menu.phtml:124
 msgid "Snap to grid"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:128
-#: templates/designer/side_menu.phtml:134
+#: templates/database/designer/side_menu.phtml:128
+#: templates/database/designer/side_menu.phtml:134
 msgid "Small/Big All"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:138
-#: templates/designer/side_menu.phtml:141
+#: templates/database/designer/side_menu.phtml:138
+#: templates/database/designer/side_menu.phtml:141
 msgid "Toggle small/big"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:145
-#: templates/designer/side_menu.phtml:148
+#: templates/database/designer/side_menu.phtml:145
+#: templates/database/designer/side_menu.phtml:148
 #, fuzzy
 #| msgid "Traditional Chinese"
 msgid "Toggle relation lines"
 msgstr "Tradicionāla ķīniešu"
 
-#: templates/designer/side_menu.phtml:153
-#: templates/designer/side_menu.phtml:156
+#: templates/database/designer/side_menu.phtml:153
+#: templates/database/designer/side_menu.phtml:156
 #, fuzzy
 #| msgid "Export"
 msgid "Export schema"
 msgstr "Eksports"
 
-#: templates/designer/side_menu.phtml:165
-#: templates/designer/side_menu.phtml:168
+#: templates/database/designer/side_menu.phtml:165
+#: templates/database/designer/side_menu.phtml:168
 #, fuzzy
 #| msgid "Submit Query"
 msgid "Build Query"
 msgstr "Izpildīt vaicājumu"
 
-#: templates/designer/side_menu.phtml:173
-#: templates/designer/side_menu.phtml:177
+#: templates/database/designer/side_menu.phtml:173
+#: templates/database/designer/side_menu.phtml:177
 msgid "Move Menu"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:181
-#: templates/designer/side_menu.phtml:186
+#: templates/database/designer/side_menu.phtml:181
+#: templates/database/designer/side_menu.phtml:186
 #, fuzzy
 #| msgid "Partial Texts"
 msgid "Pin text"
 msgstr "Daļēji teksti"
 
-#: templates/designer/table_list.phtml:4
+#: templates/database/designer/table_list.phtml:4
 #, fuzzy
 msgid "Hide/Show all"
 msgstr "Rādīt visu"
 
-#: templates/designer/table_list.phtml:14
+#: templates/database/designer/table_list.phtml:14
 msgid "Hide/Show Tables with no relation"
 msgstr ""
 
-#: templates/designer/table_list.phtml:59
+#: templates/database/designer/table_list.phtml:59
 #, fuzzy
 #| msgid "Number of rows per page"
 msgid "Number of tables:"
 msgstr "Rindu skaits vienā lapā"
 
+#: templates/database/structure/body_for_table_summary.phtml:6
+#, php-format
+msgid "%s table"
+msgid_plural "%s tables"
+msgstr[0] "%s tabula"
+msgstr[1] "%s tabulas"
+msgstr[2] "%s tabulu"
+
+#: templates/database/structure/body_for_table_summary.phtml:17
+msgid "Sum"
+msgstr "Kopumā"
+
+#: templates/database/structure/check_all_tables.phtml:6
+msgid "Check tables having overhead"
+msgstr "Iezīmēt tabulas ar pārtēriņu"
+
+#: templates/database/structure/check_all_tables.phtml:10
+#, fuzzy
+#| msgid "Show color"
+msgid "Show create"
+msgstr "Rādīt krāsas"
+
+#: templates/database/structure/check_all_tables.phtml:27
+#, fuzzy
+#| msgid "Add new field"
+msgid "Prefix"
+msgstr "Pievienot jaunu lauku"
+
+#: templates/database/structure/check_all_tables.phtml:28
+msgid "Add prefix to table"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:29
+#, fuzzy
+#| msgid "Replace table data with file"
+msgid "Replace table prefix"
+msgstr "Aizvietot tabulas datus ar datiem no faila"
+
+#: templates/database/structure/check_all_tables.phtml:30
+#, fuzzy
+#| msgid "Replace table data with file"
+msgid "Copy table with prefix"
+msgstr "Aizvietot tabulas datus ar datiem no faila"
+
+#: templates/database/structure/check_all_tables.phtml:36
+#, fuzzy
+#| msgid "Add %s field(s)"
+msgid "Add columns to central list"
+msgstr "Pievienot %s lauku(s)"
+
+#: templates/database/structure/check_all_tables.phtml:37
+msgid "Remove columns from central list"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:38
+#, fuzzy
+#| msgid "Add %s field(s)"
+msgid "Make consistent with central list"
+msgstr "Pievienot %s lauku(s)"
+
+#: templates/database/structure/favorite_anchor.phtml:12
+#, fuzzy
+msgid "Add to Favorites"
+msgstr "Pievienot jaunu lietotāju"
+
+#: templates/database/structure/show_create.phtml:2
+#, fuzzy
+msgid "Showing create queries"
+msgstr "Rādīt pilnos vaicājumus"
+
+#: templates/database/structure/sortable_header.phtml:13
+msgid "Sort"
+msgstr "Kārtošana"
+
+#: templates/database/structure/table_header.phtml:42
+#, fuzzy
+#| msgid "May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]"
+msgid ""
+"May be approximate. Click on the number to get the exact count. See "
+"[doc@faq3-11]FAQ 3.11[/doc]."
+msgstr "Var būt aptuvens skaits. Skatīt [doc@faq3-11]FAQ 3.11[/doc]"
+
+#: templates/database/structure/table_header.phtml:66
+#: templates/table/index_form.phtml:127
+msgid "Size"
+msgstr "Izmērs"
+
+#: templates/database/structure/table_header.phtml:74
+#: templates/table/structure/display_table_stats.phtml:27
+msgid "Overhead"
+msgstr "Pārtēriņš"
+
+#: templates/database/structure/tracking_icon.phtml:4
+msgid "Tracking is active."
+msgstr ""
+
+#: templates/database/structure/tracking_icon.phtml:8
+msgid "Tracking is not active."
+msgstr ""
+
 #: templates/error/report_form.phtml:7
 msgid ""
 "phpMyAdmin has encountered an error. We have collected data about this error "
@@ -15522,70 +15652,6 @@ msgstr ""
 msgid "Please explain the steps that lead to the error:"
 msgstr ""
 
-#: templates/gis_visualization/gis_visualization.phtml:3
-msgid "Display GIS Visualization"
-msgstr ""
-
-#: templates/gis_visualization/gis_visualization.phtml:8
-#, fuzzy
-#| msgid "Add/Delete Field Columns"
-msgid "Label column"
-msgstr "Pievienot/Dzēst laukus (kolonnas)"
-
-#: templates/gis_visualization/gis_visualization.phtml:11
-msgid "-- None --"
-msgstr ""
-
-#: templates/gis_visualization/gis_visualization.phtml:19
-#, fuzzy
-#| msgid "Total"
-msgid "Spatial column"
-msgstr "Kopā"
-
-#: templates/index_form.phtml:16
-msgid "Index name:"
-msgstr "Indeksa nosaukums&nbsp;:"
-
-#: templates/index_form.phtml:19
-msgid ""
-"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
-msgstr ""
-"\"PRIMARY\" <b>jābūt</b> tikai un <b>vienīgi</b> primārās atslēgas indeksa "
-"nosaukumam!"
-
-#: templates/index_form.phtml:40
-#, fuzzy
-#| msgid "Index name:"
-msgid "Index choice:"
-msgstr "Indeksa nosaukums&nbsp;:"
-
-#: templates/index_form.phtml:57
-msgid "Key block size:"
-msgstr ""
-
-#: templates/index_form.phtml:74
-msgid "Index type:"
-msgstr "Indeksa tips&nbsp;:"
-
-#: templates/index_form.phtml:86
-#, fuzzy
-#| msgid "User:"
-msgid "Parser:"
-msgstr "Lietotājs:"
-
-#: templates/index_form.phtml:102
-#, fuzzy
-msgid "Comment:"
-msgstr "Komentāri"
-
-#: templates/index_form.phtml:127 templates/structure/table_header.phtml:66
-msgid "Size"
-msgstr "Izmērs"
-
-#: templates/index_form.phtml:149 templates/index_form.phtml:190
-msgid "Drag to reorder"
-msgstr ""
-
 #: templates/prefs_autoload.phtml:9
 msgid ""
 "Your browser has phpMyAdmin configuration for this domain. Would you like to "
@@ -15598,491 +15664,450 @@ msgstr ""
 msgid "Start row:"
 msgstr "S"
 
-#: templates/structure/actions_in_table_structure.phtml:14
-#, php-format
-msgid "A primary key has been added on %s."
-msgstr "Primārā atslēga pievienota uz lauka %s."
-
-#: templates/structure/actions_in_table_structure.phtml:34
-#: templates/structure/actions_in_table_structure.phtml:54
-#: templates/structure/actions_in_table_structure.phtml:79
-#: templates/structure/actions_in_table_structure.phtml:101
-#, php-format
-msgid "An index has been added on %s."
-msgstr "Indekss tieka pievienots uz %s."
-
-#: templates/structure/actions_in_table_structure.phtml:130
-#: templates/structure/check_all_table_column.phtml:59
-#, fuzzy
-#| msgid "Remove chart"
-msgid "Remove from central columns"
-msgstr "Noņemt diagrammu"
-
-#: templates/structure/actions_in_table_structure.phtml:138
-#: templates/structure/check_all_table_column.phtml:55
-#, fuzzy
-#| msgid "Add %s field(s)"
-msgid "Add to central columns"
-msgstr "Pievienot %s lauku(s)"
-
-#: templates/structure/add_column.phtml:7
-#, fuzzy, php-format
-#| msgid "Add %s field(s)"
-msgid "Add %s column(s)"
-msgstr "Pievienot %s lauku(s)"
-
-#: templates/structure/add_column.phtml:12
-#, fuzzy
-#| msgid "At Beginning of Table"
-msgid "at beginning of table"
-msgstr "Tabulas sākumā"
-
-#: templates/structure/body_for_table_summary.phtml:6
-#, php-format
-msgid "%s table"
-msgid_plural "%s tables"
-msgstr[0] "%s tabula"
-msgstr[1] "%s tabulas"
-msgstr[2] "%s tabulu"
-
-#: templates/structure/body_for_table_summary.phtml:17
-msgid "Sum"
-msgstr "Kopumā"
-
-#: templates/structure/check_all_tables.phtml:6
-msgid "Check tables having overhead"
-msgstr "Iezīmēt tabulas ar pārtēriņu"
-
-#: templates/structure/check_all_tables.phtml:10
-#, fuzzy
-#| msgid "Show color"
-msgid "Show create"
-msgstr "Rādīt krāsas"
-
-#: templates/structure/check_all_tables.phtml:27
-#, fuzzy
-#| msgid "Add new field"
-msgid "Prefix"
-msgstr "Pievienot jaunu lauku"
-
-#: templates/structure/check_all_tables.phtml:28
-msgid "Add prefix to table"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:29
-#, fuzzy
-#| msgid "Replace table data with file"
-msgid "Replace table prefix"
-msgstr "Aizvietot tabulas datus ar datiem no faila"
-
-#: templates/structure/check_all_tables.phtml:30
-#, fuzzy
-#| msgid "Replace table data with file"
-msgid "Copy table with prefix"
-msgstr "Aizvietot tabulas datus ar datiem no faila"
-
-#: templates/structure/check_all_tables.phtml:36
-#, fuzzy
-#| msgid "Add %s field(s)"
-msgid "Add columns to central list"
-msgstr "Pievienot %s lauku(s)"
-
-#: templates/structure/check_all_tables.phtml:37
-msgid "Remove columns from central list"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:38
-#, fuzzy
-#| msgid "Add %s field(s)"
-msgid "Make consistent with central list"
-msgstr "Pievienot %s lauku(s)"
-
-#: templates/structure/display_structure.phtml:140 view_create.php:181
-#, fuzzy
-#| msgid "Print view"
-msgid "Edit view"
-msgstr "Izdrukas versija"
-
-#: templates/structure/display_table_stats.phtml:9
-msgid "Space usage"
-msgstr "Diska vietas lietošana"
-
-#: templates/structure/display_table_stats.phtml:27
-#: templates/structure/table_header.phtml:74
-msgid "Overhead"
-msgstr "Pārtēriņš"
-
-#: templates/structure/display_table_stats.phtml:32
-msgid "Effective"
-msgstr "Efektīvs"
-
-#: templates/structure/favorite_anchor.phtml:12
-#, fuzzy
-msgid "Add to Favorites"
-msgstr "Pievienot jaunu lietotāju"
-
-#: templates/structure/move_columns_dialog.phtml:1
-#: templates/structure/optional_action_links.phtml:21
-#, fuzzy
-#| msgid "Add %s field(s)"
-msgid "Move columns"
-msgstr "Pievienot %s lauku(s)"
-
-#: templates/structure/move_columns_dialog.phtml:2
-msgid "Move the columns by dragging them up and down."
-msgstr ""
-
-#: templates/structure/optional_action_links.phtml:9
-msgid "Propose table structure"
-msgstr "Ieteikt tabulas sruktūru"
-
-#: templates/structure/optional_action_links.phtml:24
-#, fuzzy
-#| msgid "Propose table structure"
-msgid "Improve table structure"
-msgstr "Ieteikt tabulas sruktūru"
-
-#: templates/structure/optional_action_links.phtml:30
-#, fuzzy
-#| msgid "Track table"
-msgid "Track view"
-msgstr "Pārbaudīt tabulu"
-
-#: templates/structure/row_stats_table.phtml:3
-#, fuzzy
-#| msgid "Row Statistics"
-msgid "Row statistics"
-msgstr "Rindas statistika"
-
-#: templates/structure/row_stats_table.phtml:9
-msgid "static"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:11
-msgid "dynamic"
-msgstr "dinamisks"
-
-#: templates/structure/row_stats_table.phtml:22
-msgid "partitioned"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:54
-msgid "Row length"
-msgstr "Rindas garums"
-
-#: templates/structure/row_stats_table.phtml:66
-msgid "Row size"
-msgstr "Rindas izmērs"
-
-#: templates/structure/row_stats_table.phtml:73
-msgid "Next autoindex"
-msgstr ""
-
-#: templates/structure/secondary_tabs.phtml:14
-#, fuzzy
-#| msgid "Relation view"
-msgid "Relation view"
-msgstr "Relāciju pārskats"
-
-#: templates/structure/show_create.phtml:2
-#, fuzzy
-msgid "Showing create queries"
-msgstr "Rādīt pilnos vaicājumus"
-
-#: templates/structure/sortable_header.phtml:13
-msgid "Sort"
-msgstr "Kārtošana"
-
-#: templates/structure/table_header.phtml:42
-#, fuzzy
-#| msgid "May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]"
-msgid ""
-"May be approximate. Click on the number to get the exact count. See "
-"[doc@faq3-11]FAQ 3.11[/doc]."
-msgstr "Var būt aptuvens skaits. Skatīt [doc@faq3-11]FAQ 3.11[/doc]"
-
-#: templates/structure/table_structure_row.phtml:46
-#, fuzzy, php-format
-#| msgid "Table %s has been dropped."
-msgid "Column %s has been dropped."
-msgstr "Tabula %s tika izdzēsta"
-
-#: templates/structure/tracking_icon.phtml:4
-msgid "Tracking is active."
-msgstr ""
-
-#: templates/structure/tracking_icon.phtml:8
-msgid "Tracking is not active."
-msgstr ""
-
-#: templates/table/create_table.phtml:15
-#, fuzzy
-#| msgid "Number of rows per page"
-msgid "Number of columns"
-msgstr "Rindu skaits vienā lapā"
-
-#: templates/table/options.phtml:8
-#, fuzzy
-#| msgid "Select fields (at least one):"
-msgid "Select columns (at least one):"
-msgstr "Izvēlieties laukus (kaut vienu):"
-
-#: templates/table/options.phtml:37
-msgid "Add search conditions (body of the \"where\" clause):"
-msgstr "Pievienot meklēšanas nosacījumus (\"where\" izteiksmes ķermenis):"
-
-#: templates/table/options.phtml:45
-msgid "Number of rows per page"
-msgstr "Rindu skaits vienā lapā"
-
-#: templates/table/options.phtml:56
-msgid "Display order:"
-msgstr "Attēlošanas secība:"
-
-#: templates/table/options_zoom.phtml:6
-msgid "Use this column to label each point"
-msgstr ""
-
-#: templates/table/options_zoom.phtml:35
-msgid "Maximum rows to plot"
-msgstr ""
-
-#: templates/table/replace_preview.phtml:13
-msgid "Find and replace - preview"
-msgstr ""
-
-#: templates/table/replace_preview.phtml:18
-#, fuzzy
-#| msgid "Original position"
-msgid "Original string"
-msgstr "Oriģinālā pozīcija"
-
-#: templates/table/replace_preview.phtml:19
-#, fuzzy
-#| msgid "Relations"
-msgid "Replaced string"
-msgstr "Relācijas"
-
-#: templates/table/replace_preview.phtml:40
-#, fuzzy
-msgid "Replace"
-msgstr "Relācijas"
-
-#: templates/table/rows_zoom.phtml:16
-#, fuzzy
-msgid "Additional search criteria"
-msgstr "SQL vaicājums"
-
-#: templates/table/search_and_replace.phtml:3
-#, fuzzy
-#| msgid "Replace NULL by"
-msgid "Replace with:"
-msgstr "Aizvietot NULL ar"
-
-#: templates/table/search_and_replace.phtml:22
-#, fuzzy
-#| msgid "as regular expression"
-msgid "Use regular expression"
-msgstr "kā regulārā izteiksme"
-
-#: templates/table/selection_form.phtml:12
-#, fuzzy
-#| msgid "Do a \"query by example\" (wildcard: \"%\")"
-msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
-msgstr "Izpildīt \"vaicājumu pēc parauga\" (aizstājējzīme: \"%\")"
-
-#: templates/table/selection_form.phtml:34
-msgid "Do a \"query by example\" (wildcard: \"%\")"
-msgstr "Izpildīt \"vaicājumu pēc parauga\" (aizstājējzīme: \"%\")"
-
-#: templates/table/zoom_result_form.phtml:7
-msgid "Browse/Edit the points"
-msgstr ""
-
-#: templates/table/zoom_result_form.phtml:15
-msgid "How to use"
-msgstr "Kā lietot"
-
-#: templates/table/zoom_result_form.phtml:23
-#, fuzzy
-#| msgid "Reset"
-msgid "Reset zoom"
-msgstr "Atcelt"
-
-#: templates/tbl_chart.phtml:17
+#: templates/table/chart/tbl_chart.phtml:17
 #, fuzzy
 #| msgid "Mar"
 msgctxt "Chart type"
 msgid "Bar"
 msgstr "Mar"
 
-#: templates/tbl_chart.phtml:21
+#: templates/table/chart/tbl_chart.phtml:21
 #, fuzzy
 #| msgid "Column names"
 msgctxt "Chart type"
 msgid "Column"
 msgstr "Kolonnu nosaukumi"
 
-#: templates/tbl_chart.phtml:25
+#: templates/table/chart/tbl_chart.phtml:25
 msgctxt "Chart type"
 msgid "Line"
 msgstr ""
 
-#: templates/tbl_chart.phtml:29
+#: templates/table/chart/tbl_chart.phtml:29
 msgctxt "Chart type"
 msgid "Spline"
 msgstr ""
 
-#: templates/tbl_chart.phtml:33
+#: templates/table/chart/tbl_chart.phtml:33
 msgctxt "Chart type"
 msgid "Area"
 msgstr ""
 
-#: templates/tbl_chart.phtml:37
+#: templates/table/chart/tbl_chart.phtml:37
 #, fuzzy
 #| msgid "PiB"
 msgctxt "Chart type"
 msgid "Pie"
 msgstr "PB"
 
-#: templates/tbl_chart.phtml:41
+#: templates/table/chart/tbl_chart.phtml:41
 #, fuzzy
 #| msgid "Time"
 msgctxt "Chart type"
 msgid "Timeline"
 msgstr "Laiks"
 
-#: templates/tbl_chart.phtml:45
+#: templates/table/chart/tbl_chart.phtml:45
 msgctxt "Chart type"
 msgid "Scatter"
 msgstr ""
 
-#: templates/tbl_chart.phtml:50
+#: templates/table/chart/tbl_chart.phtml:50
 msgid "Stacked"
 msgstr ""
 
-#: templates/tbl_chart.phtml:53
+#: templates/table/chart/tbl_chart.phtml:53
 #, fuzzy
 #| msgid "Import files"
 msgid "Chart title"
 msgstr "Importēt failus"
 
-#: templates/tbl_chart.phtml:57
+#: templates/table/chart/tbl_chart.phtml:57
 msgid "X-Axis:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:72
+#: templates/table/chart/tbl_chart.phtml:72
 #, fuzzy
 msgid "Series:"
 msgstr "SQL vaicājums"
 
-#: templates/tbl_chart.phtml:102
+#: templates/table/chart/tbl_chart.phtml:102
 msgid "X-Axis label:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:104
+#: templates/table/chart/tbl_chart.phtml:104
 #, fuzzy
 #| msgid "Value"
 msgid "X Values"
 msgstr "Vērtība"
 
-#: templates/tbl_chart.phtml:107
+#: templates/table/chart/tbl_chart.phtml:107
 msgid "Y-Axis label:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:115
+#: templates/table/chart/tbl_chart.phtml:115
 msgid "Series names are in a column"
 msgstr ""
 
-#: templates/tbl_chart.phtml:118
+#: templates/table/chart/tbl_chart.phtml:118
 #, fuzzy
 #| msgid "Inside table(s):"
 msgid "Series column:"
 msgstr "Tabulā(s):"
 
-#: templates/tbl_chart.phtml:130
+#: templates/table/chart/tbl_chart.phtml:130
 #, fuzzy
 #| msgid "Values for column %s"
 msgid "Value Column:"
 msgstr "Tabulas %s vērtības"
 
-#: templates/tbl_chart.phtml:150
+#: templates/table/chart/tbl_chart.phtml:150
 #, fuzzy
 #| msgid "Save as file"
 msgid "Save chart as image"
 msgstr "Saglabāt kā failu"
 
-#: templates/tbl_relation/common_form.phtml:7
+#: templates/table/gis_visualization/gis_visualization.phtml:3
+msgid "Display GIS Visualization"
+msgstr ""
+
+#: templates/table/gis_visualization/gis_visualization.phtml:8
+#, fuzzy
+#| msgid "Add/Delete Field Columns"
+msgid "Label column"
+msgstr "Pievienot/Dzēst laukus (kolonnas)"
+
+#: templates/table/gis_visualization/gis_visualization.phtml:11
+msgid "-- None --"
+msgstr ""
+
+#: templates/table/gis_visualization/gis_visualization.phtml:19
+#, fuzzy
+#| msgid "Total"
+msgid "Spatial column"
+msgstr "Kopā"
+
+#: templates/table/index_form.phtml:16
+msgid "Index name:"
+msgstr "Indeksa nosaukums&nbsp;:"
+
+#: templates/table/index_form.phtml:19
+msgid ""
+"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
+msgstr ""
+"\"PRIMARY\" <b>jābūt</b> tikai un <b>vienīgi</b> primārās atslēgas indeksa "
+"nosaukumam!"
+
+#: templates/table/index_form.phtml:40
+#, fuzzy
+#| msgid "Index name:"
+msgid "Index choice:"
+msgstr "Indeksa nosaukums&nbsp;:"
+
+#: templates/table/index_form.phtml:57
+msgid "Key block size:"
+msgstr ""
+
+#: templates/table/index_form.phtml:74
+msgid "Index type:"
+msgstr "Indeksa tips&nbsp;:"
+
+#: templates/table/index_form.phtml:86
+#, fuzzy
+#| msgid "User:"
+msgid "Parser:"
+msgstr "Lietotājs:"
+
+#: templates/table/index_form.phtml:102
+#, fuzzy
+msgid "Comment:"
+msgstr "Komentāri"
+
+#: templates/table/index_form.phtml:149 templates/table/index_form.phtml:190
+msgid "Drag to reorder"
+msgstr ""
+
+#: templates/table/relation/common_form.phtml:7
 msgid "Internal relations"
 msgstr "Iekšējās relācijas"
 
-#: templates/tbl_relation/common_form.phtml:11
+#: templates/table/relation/common_form.phtml:11
 #, fuzzy
 #| msgid "Internal relations"
 msgid "Internal relation"
 msgstr "Iekšējās relācijas"
 
-#: templates/tbl_relation/common_form.phtml:14
+#: templates/table/relation/common_form.phtml:14
 msgid ""
 "An internal relation is not necessary when a corresponding FOREIGN KEY "
 "relation exists."
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:37
+#: templates/table/relation/common_form.phtml:37
 #, fuzzy
 #| msgid "Foreign key check:"
 msgid "Foreign key constraints"
 msgstr "Svešo atslēgu pārbaude:"
 
-#: templates/tbl_relation/common_form.phtml:40
+#: templates/table/relation/common_form.phtml:40
 msgid "Actions"
 msgstr "Darbība"
 
-#: templates/tbl_relation/common_form.phtml:41
+#: templates/table/relation/common_form.phtml:41
 #, fuzzy
 #| msgid "Constraints for table"
 msgid "Constraint properties"
 msgstr "Ierobežojumi tabulai"
 
-#: templates/tbl_relation/common_form.phtml:44
+#: templates/table/relation/common_form.phtml:44
 msgid ""
 "Only columns with index will be displayed. You can define an index below."
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:49
+#: templates/table/relation/common_form.phtml:49
 msgid "Foreign key constraint"
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:81
+#: templates/table/relation/common_form.phtml:81
 #, fuzzy
 #| msgid "Add constraints"
 msgid "+ Add constraint"
 msgstr "Pievienot ierobežojumus"
 
-#: templates/tbl_relation/common_form.phtml:91
+#: templates/table/relation/common_form.phtml:91
 #, fuzzy
 #| msgid "Choose field to display"
 msgid "Choose column to display:"
 msgstr "Izvēlieties, kuru lauku rādīt"
 
-#: templates/tbl_relation/foreign_key_row.phtml:13
+#: templates/table/relation/foreign_key_row.phtml:13
 #, fuzzy, php-format
 #| msgid "Foreign key check:"
 msgid "Foreign key constraint %s has been dropped"
 msgstr "Svešo atslēgu pārbaude:"
 
-#: templates/tbl_relation/foreign_key_row.phtml:102
+#: templates/table/relation/foreign_key_row.phtml:102
 #, fuzzy
 #| msgid "Constraints for table"
 msgid "Constraint name"
 msgstr "Ierobežojumi tabulai"
 
-#: templates/tbl_relation/foreign_key_row.phtml:157
+#: templates/table/relation/foreign_key_row.phtml:157
 #, fuzzy
 #| msgid "Add %s field(s)"
 msgid "+ Add column"
 msgstr "Pievienot %s lauku(s)"
 
+#: templates/table/search/options.phtml:8
+#, fuzzy
+#| msgid "Select fields (at least one):"
+msgid "Select columns (at least one):"
+msgstr "Izvēlieties laukus (kaut vienu):"
+
+#: templates/table/search/options.phtml:37
+msgid "Add search conditions (body of the \"where\" clause):"
+msgstr "Pievienot meklēšanas nosacījumus (\"where\" izteiksmes ķermenis):"
+
+#: templates/table/search/options.phtml:45
+msgid "Number of rows per page"
+msgstr "Rindu skaits vienā lapā"
+
+#: templates/table/search/options.phtml:56
+msgid "Display order:"
+msgstr "Attēlošanas secība:"
+
+#: templates/table/search/options_zoom.phtml:6
+msgid "Use this column to label each point"
+msgstr ""
+
+#: templates/table/search/options_zoom.phtml:35
+msgid "Maximum rows to plot"
+msgstr ""
+
+#: templates/table/search/replace_preview.phtml:13
+msgid "Find and replace - preview"
+msgstr ""
+
+#: templates/table/search/replace_preview.phtml:18
+#, fuzzy
+#| msgid "Original position"
+msgid "Original string"
+msgstr "Oriģinālā pozīcija"
+
+#: templates/table/search/replace_preview.phtml:19
+#, fuzzy
+#| msgid "Relations"
+msgid "Replaced string"
+msgstr "Relācijas"
+
+#: templates/table/search/replace_preview.phtml:40
+#, fuzzy
+msgid "Replace"
+msgstr "Relācijas"
+
+#: templates/table/search/rows_zoom.phtml:16
+#, fuzzy
+msgid "Additional search criteria"
+msgstr "SQL vaicājums"
+
+#: templates/table/search/search_and_replace.phtml:3
+#, fuzzy
+#| msgid "Replace NULL by"
+msgid "Replace with:"
+msgstr "Aizvietot NULL ar"
+
+#: templates/table/search/search_and_replace.phtml:22
+#, fuzzy
+#| msgid "as regular expression"
+msgid "Use regular expression"
+msgstr "kā regulārā izteiksme"
+
+#: templates/table/search/selection_form.phtml:12
+#, fuzzy
+#| msgid "Do a \"query by example\" (wildcard: \"%\")"
+msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
+msgstr "Izpildīt \"vaicājumu pēc parauga\" (aizstājējzīme: \"%\")"
+
+#: templates/table/search/selection_form.phtml:34
+msgid "Do a \"query by example\" (wildcard: \"%\")"
+msgstr "Izpildīt \"vaicājumu pēc parauga\" (aizstājējzīme: \"%\")"
+
+#: templates/table/search/zoom_result_form.phtml:7
+msgid "Browse/Edit the points"
+msgstr ""
+
+#: templates/table/search/zoom_result_form.phtml:15
+msgid "How to use"
+msgstr "Kā lietot"
+
+#: templates/table/search/zoom_result_form.phtml:23
+#, fuzzy
+#| msgid "Reset"
+msgid "Reset zoom"
+msgstr "Atcelt"
+
+#: templates/table/secondary_tabs.phtml:14
+#, fuzzy
+#| msgid "Relation view"
+msgid "Relation view"
+msgstr "Relāciju pārskats"
+
+#: templates/table/structure/actions_in_table_structure.phtml:14
+#, php-format
+msgid "A primary key has been added on %s."
+msgstr "Primārā atslēga pievienota uz lauka %s."
+
+#: templates/table/structure/actions_in_table_structure.phtml:34
+#: templates/table/structure/actions_in_table_structure.phtml:54
+#: templates/table/structure/actions_in_table_structure.phtml:79
+#: templates/table/structure/actions_in_table_structure.phtml:101
+#, php-format
+msgid "An index has been added on %s."
+msgstr "Indekss tieka pievienots uz %s."
+
+#: templates/table/structure/actions_in_table_structure.phtml:130
+#: templates/table/structure/check_all_table_column.phtml:59
+#, fuzzy
+#| msgid "Remove chart"
+msgid "Remove from central columns"
+msgstr "Noņemt diagrammu"
+
+#: templates/table/structure/actions_in_table_structure.phtml:138
+#: templates/table/structure/check_all_table_column.phtml:55
+#, fuzzy
+#| msgid "Add %s field(s)"
+msgid "Add to central columns"
+msgstr "Pievienot %s lauku(s)"
+
+#: templates/table/structure/add_column.phtml:7
+#, fuzzy, php-format
+#| msgid "Add %s field(s)"
+msgid "Add %s column(s)"
+msgstr "Pievienot %s lauku(s)"
+
+#: templates/table/structure/add_column.phtml:12
+#, fuzzy
+#| msgid "At Beginning of Table"
+msgid "at beginning of table"
+msgstr "Tabulas sākumā"
+
+#: templates/table/structure/display_structure.phtml:140 view_create.php:181
+#, fuzzy
+#| msgid "Print view"
+msgid "Edit view"
+msgstr "Izdrukas versija"
+
+#: templates/table/structure/display_table_stats.phtml:9
+msgid "Space usage"
+msgstr "Diska vietas lietošana"
+
+#: templates/table/structure/display_table_stats.phtml:32
+msgid "Effective"
+msgstr "Efektīvs"
+
+#: templates/table/structure/move_columns_dialog.phtml:1
+#: templates/table/structure/optional_action_links.phtml:21
+#, fuzzy
+#| msgid "Add %s field(s)"
+msgid "Move columns"
+msgstr "Pievienot %s lauku(s)"
+
+#: templates/table/structure/move_columns_dialog.phtml:2
+msgid "Move the columns by dragging them up and down."
+msgstr ""
+
+#: templates/table/structure/optional_action_links.phtml:9
+msgid "Propose table structure"
+msgstr "Ieteikt tabulas sruktūru"
+
+#: templates/table/structure/optional_action_links.phtml:24
+#, fuzzy
+#| msgid "Propose table structure"
+msgid "Improve table structure"
+msgstr "Ieteikt tabulas sruktūru"
+
+#: templates/table/structure/optional_action_links.phtml:30
+#, fuzzy
+#| msgid "Track table"
+msgid "Track view"
+msgstr "Pārbaudīt tabulu"
+
+#: templates/table/structure/row_stats_table.phtml:3
+#, fuzzy
+#| msgid "Row Statistics"
+msgid "Row statistics"
+msgstr "Rindas statistika"
+
+#: templates/table/structure/row_stats_table.phtml:9
+msgid "static"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:11
+msgid "dynamic"
+msgstr "dinamisks"
+
+#: templates/table/structure/row_stats_table.phtml:22
+msgid "partitioned"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:54
+msgid "Row length"
+msgstr "Rindas garums"
+
+#: templates/table/structure/row_stats_table.phtml:66
+msgid "Row size"
+msgstr "Rindas izmērs"
+
+#: templates/table/structure/row_stats_table.phtml:73
+msgid "Next autoindex"
+msgstr ""
+
+#: templates/table/structure/table_structure_row.phtml:46
+#, fuzzy, php-format
+#| msgid "Table %s has been dropped."
+msgid "Column %s has been dropped."
+msgstr "Tabula %s tika izdzēsta"
+
 #: themes.php:17 themes.php:22
 msgid "Theme"
 msgstr ""
diff --git a/po/mk.po b/po/mk.po
index 970bf6ce76..69b46a607a 100644
--- a/po/mk.po
+++ b/po/mk.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 4.5.0-dev\n"
 "Report-Msgid-Bugs-To: developers@phpmyadmin.net\n"
-"POT-Creation-Date: 2015-08-08 13:53-0400\n"
+"POT-Creation-Date: 2015-08-12 08:10-0400\n"
 "PO-Revision-Date: 2014-11-05 10:33+0200\n"
 "Last-Translator: Michal Čihař <michal@cihar.com>\n"
 "Language-Team: Macedonian <https://hosted.weblate.org/projects/phpmyadmin/"
@@ -54,7 +54,7 @@ msgid "Table comments:"
 msgstr "Коментар на табелата"
 
 #: db_datadict.php:104 libraries/Index.class.php:699
-#: libraries/insert_edit.lib.php:1567
+#: libraries/insert_edit.lib.php:1565
 #: libraries/navigation/Nodes/Node_Column.class.php:30
 #: libraries/plugins/export/ExportHtmlword.class.php:280
 #: libraries/plugins/export/ExportHtmlword.class.php:375
@@ -68,13 +68,14 @@ msgstr "Коментар на табелата"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1023
 #: libraries/tracking.lib.php:879 libraries/tracking.lib.php:975
 #: templates/columns_definitions/column_name.phtml:18
-#: templates/index_form.phtml:124 templates/table/table_header.phtml:6
-#: templates/table/zoom_result_form.phtml:33
-#: templates/tbl_relation/common_form.phtml:10
-#: templates/tbl_relation/common_form.phtml:43
-#: templates/tbl_relation/foreign_key_row.phtml:194
-#: templates/tbl_relation/foreign_key_row.phtml:206
-#: templates/tbl_relation/internal_relational_row.phtml:71
+#: templates/table/index_form.phtml:124
+#: templates/table/relation/common_form.phtml:10
+#: templates/table/relation/common_form.phtml:43
+#: templates/table/relation/foreign_key_row.phtml:194
+#: templates/table/relation/foreign_key_row.phtml:206
+#: templates/table/relation/internal_relational_row.phtml:71
+#: templates/table/search/table_header.phtml:6
+#: templates/table/search/zoom_result_form.phtml:33
 #, fuzzy
 #| msgid "Column names"
 msgid "Column"
@@ -94,21 +95,21 @@ msgstr "Имиња на колони"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1001
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1024
 #: libraries/rte/rte_list.lib.php:75 libraries/rte/rte_list.lib.php:103
-#: libraries/rte/rte_routines.lib.php:802
-#: libraries/rte/rte_routines.lib.php:831
-#: libraries/rte/rte_routines.lib.php:1493
+#: libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_routines.lib.php:922
+#: libraries/rte/rte_routines.lib.php:1584
 #: libraries/server_privileges.lib.php:2369 libraries/tracking.lib.php:880
 #: libraries/tracking.lib.php:972
 #: templates/columns_definitions/table_fields_definitions.phtml:11
-#: templates/structure/table_header.phtml:48
-#: templates/structure/table_structure_header.phtml:6
-#: templates/table/table_header.phtml:7
+#: templates/database/structure/table_header.phtml:48
+#: templates/table/search/table_header.phtml:7
+#: templates/table/structure/table_structure_header.phtml:6
 msgid "Type"
 msgstr "Тип"
 
 #: db_datadict.php:106 libraries/Index.class.php:702
 #: libraries/central_columns.lib.php:708
-#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1576
+#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1574
 #: libraries/plugins/export/ExportHtmlword.class.php:286
 #: libraries/plugins/export/ExportHtmlword.class.php:381
 #: libraries/plugins/export/ExportLatex.class.php:509
@@ -121,8 +122,8 @@ msgstr "Тип"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1026
 #: libraries/tracking.lib.php:882 libraries/tracking.lib.php:978
 #: templates/columns_definitions/table_fields_definitions.phtml:39
-#: templates/structure/table_structure_header.phtml:9
-#: templates/table/zoom_result_form.phtml:34
+#: templates/table/search/zoom_result_form.phtml:34
+#: templates/table/structure/table_structure_header.phtml:9
 msgid "Null"
 msgstr "Null"
 
@@ -140,8 +141,8 @@ msgstr "Null"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1027
 #: libraries/replication_gui.lib.php:153 libraries/tracking.lib.php:883
 #: templates/columns_definitions/table_fields_definitions.phtml:25
-#: templates/structure/body_for_table_summary.phtml:55
-#: templates/structure/table_structure_header.phtml:10
+#: templates/database/structure/body_for_table_summary.phtml:55
+#: templates/table/structure/table_structure_header.phtml:10
 msgid "Default"
 msgstr "Стандардно"
 
@@ -169,19 +170,19 @@ msgid "Comments"
 msgstr "Коментари"
 
 #: db_datadict.php:146
-#: libraries/controllers/StructureController.class.php:1960
-#: libraries/controllers/StructureController.class.php:1965
+#: libraries/controllers/TableStructureController.class.php:951
+#: libraries/controllers/TableStructureController.class.php:956
 #: libraries/tracking.lib.php:922
 #: templates/columns_definitions/column_indexes.phtml:6
-#: templates/structure/check_all_table_column.phtml:22
-#: templates/structure/display_structure.phtml:74
+#: templates/table/structure/check_all_table_column.phtml:22
+#: templates/table/structure/display_structure.phtml:74
 msgid "Primary"
 msgstr "Примарен"
 
 #: db_datadict.php:156 js/messages.php:317 libraries/Index.class.php:567
 #: libraries/Index.class.php:606 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261 libraries/mult_submits.lib.php:403
+#: libraries/config/FormDisplay.tpl.php:272 libraries/mult_submits.lib.php:403
 #: libraries/mult_submits.lib.php:417
 #: libraries/plugins/export/ExportHtmlword.class.php:630
 #: libraries/plugins/export/ExportLatex.class.php:589
@@ -197,20 +198,20 @@ msgstr "Примарен"
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1010 libraries/tracking.lib.php:1015
 #: prefs_manage.php:140 templates/prefs_autoload.phtml:15
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "No"
 msgstr "Не"
 
 #: db_datadict.php:156 js/messages.php:443 libraries/Index.class.php:568
 #: libraries/Index.class.php:605 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261
-#: libraries/controllers/StructureController.class.php:1344
-#: libraries/controllers/StructureController.class.php:2223
-#: libraries/controllers/StructureController.class.php:2232
-#: libraries/controllers/StructureController.class.php:2237
-#: libraries/controllers/StructureController.class.php:2242
-#: libraries/controllers/StructureController.class.php:2247
+#: libraries/config/FormDisplay.tpl.php:272
+#: libraries/controllers/TableStructureController.class.php:539
+#: libraries/controllers/TableStructureController.class.php:1201
+#: libraries/controllers/TableStructureController.class.php:1210
+#: libraries/controllers/TableStructureController.class.php:1215
+#: libraries/controllers/TableStructureController.class.php:1220
+#: libraries/controllers/TableStructureController.class.php:1225
 #: libraries/mult_submits.inc.php:82 libraries/mult_submits.inc.php:178
 #: libraries/mult_submits.lib.php:339 libraries/mult_submits.lib.php:372
 #: libraries/mult_submits.lib.php:401 libraries/mult_submits.lib.php:415
@@ -219,8 +220,8 @@ msgstr "Не"
 #: libraries/plugins/export/ExportOdt.class.php:756
 #: libraries/plugins/export/ExportTexytext.class.php:567
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1077
-#: libraries/server_databases.lib.php:464
-#: libraries/server_databases.lib.php:474
+#: libraries/server_databases.lib.php:475
+#: libraries/server_databases.lib.php:485
 #: libraries/server_privileges.lib.php:2546
 #: libraries/server_privileges.lib.php:2727
 #: libraries/server_privileges.lib.php:2748
@@ -230,7 +231,7 @@ msgstr "Не"
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1008 libraries/tracking.lib.php:1013
 #: prefs_manage.php:138 templates/prefs_autoload.phtml:14
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "Yes"
 msgstr "Да"
 
@@ -240,7 +241,7 @@ msgstr "Прикажи содржина (шема) на базата"
 
 #: db_export.php:37 db_tracking.php:90 export.php:382
 #: libraries/DBQbe.class.php:326
-#: libraries/controllers/StructureController.class.php:231
+#: libraries/controllers/DatabaseStructureController.class.php:170
 #: libraries/navigation/NavigationTree.class.php:897
 msgid "No tables found in database."
 msgstr "Табелите не се пронајдени во базата на податоци."
@@ -251,14 +252,14 @@ msgstr "Табелите не се пронајдени во базата на 
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:26
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:120
-#: templates/structure/show_create.phtml:18
+#: templates/database/structure/show_create.phtml:18
 msgid "Tables"
 msgstr "Табели"
 
 #: db_export.php:52 libraries/Menu.class.php:317 libraries/Menu.class.php:425
-#: libraries/Util.class.php:3333 libraries/Util.class.php:3343
-#: libraries/Util.class.php:3349 libraries/Util.class.php:3629
-#: libraries/Util.class.php:4327 libraries/Util.class.php:4344
+#: libraries/Util.class.php:3339 libraries/Util.class.php:3349
+#: libraries/Util.class.php:3355 libraries/Util.class.php:3635
+#: libraries/Util.class.php:4333 libraries/Util.class.php:4350
 #: libraries/central_columns.lib.php:728 libraries/config.values.php:39
 #: libraries/config.values.php:47 libraries/config.values.php:109
 #: libraries/config.values.php:115 libraries/config/setup.forms.php:323
@@ -272,7 +273,7 @@ msgstr "Табели"
 #: libraries/navigation/Nodes/Node_Table.class.php:283
 #: libraries/server_privileges.lib.php:1141 libraries/tracking.lib.php:874
 #: templates/columns_definitions/table_fields_definitions.phtml:3
-#: templates/designer/table_list.phtml:28
+#: templates/database/designer/table_list.phtml:28
 msgid "Structure"
 msgstr "Структура"
 
@@ -284,7 +285,7 @@ msgstr "Структура"
 #: libraries/config/user_preferences.forms.php:292
 #: libraries/config/user_preferences.forms.php:297
 #: libraries/server_privileges.lib.php:1140
-#: templates/structure/display_table_stats.phtml:12
+#: templates/table/structure/display_table_stats.phtml:12
 msgid "Data"
 msgstr "Податоци"
 
@@ -370,10 +371,10 @@ msgstr ""
 #: libraries/server_privileges.lib.php:2908
 #: libraries/server_privileges.lib.php:3145
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4346
-#: templates/structure/table_header.phtml:21
-#: templates/tbl_relation/foreign_key_row.phtml:176
-#: templates/tbl_relation/internal_relational_row.phtml:63
+#: libraries/server_privileges.lib.php:4372
+#: templates/database/structure/table_header.phtml:21
+#: templates/table/relation/foreign_key_row.phtml:176
+#: templates/table/relation/internal_relational_row.phtml:63
 msgid "Table"
 msgstr "Табела"
 
@@ -390,7 +391,7 @@ msgid "Updated"
 msgstr "Ажурирано"
 
 #: db_tracking.php:130 js/messages.php:243 libraries/Menu.class.php:552
-#: libraries/Util.class.php:4314 libraries/config.values.php:104
+#: libraries/Util.class.php:4320 libraries/config.values.php:104
 #: libraries/rte/rte_events.lib.php:393 libraries/rte/rte_list.lib.php:101
 #: libraries/server_status_processes.lib.php:92 libraries/tracking.lib.php:279
 msgid "Status"
@@ -399,14 +400,15 @@ msgstr "Статус"
 #: db_tracking.php:131 db_tracking.php:290 libraries/Index.class.php:693
 #: libraries/central_columns.lib.php:687 libraries/rte/rte_list.lib.php:74
 #: libraries/rte/rte_list.lib.php:89 libraries/rte/rte_list.lib.php:102
-#: libraries/server_databases.lib.php:398
+#: libraries/server_databases.lib.php:409
 #: libraries/server_privileges.lib.php:2372
 #: libraries/server_privileges.lib.php:3166
 #: libraries/server_privileges.lib.php:3342
 #: libraries/server_user_groups.lib.php:82
 #: libraries/server_variables.lib.php:189 libraries/tracking.lib.php:280
-#: libraries/tracking.lib.php:793 templates/structure/table_header.phtml:30
-#: templates/structure/table_structure_header.phtml:23
+#: libraries/tracking.lib.php:793
+#: templates/database/structure/table_header.phtml:30
+#: templates/table/structure/table_structure_header.phtml:23
 msgid "Action"
 msgstr "Акција"
 
@@ -452,7 +454,7 @@ msgid "Untracked tables"
 msgstr ""
 
 #: db_tracking.php:305 db_tracking.php:336
-#: templates/structure/optional_action_links.phtml:17
+#: templates/table/structure/optional_action_links.phtml:17
 #, fuzzy
 msgid "Track table"
 msgstr "Проверка на табелата"
@@ -509,7 +511,7 @@ msgid "Value for the column \"%s\""
 msgstr ""
 
 #: gis_data_editor.php:146
-#: templates/gis_visualization/gis_visualization.phtml:37
+#: templates/table/gis_visualization/gis_visualization.phtml:37
 msgid "Use OpenStreetMaps as Base Layer"
 msgstr ""
 
@@ -600,35 +602,35 @@ msgstr "Додади нов корисник"
 #: libraries/display_change_password.lib.php:162
 #: libraries/display_export.lib.php:402 libraries/display_export.lib.php:408
 #: libraries/display_import.lib.php:392 libraries/index.lib.php:44
-#: libraries/insert_edit.lib.php:1546 libraries/insert_edit.lib.php:1583
+#: libraries/insert_edit.lib.php:1544 libraries/insert_edit.lib.php:1581
 #: libraries/normalization.lib.php:165 libraries/normalization.lib.php:821
 #: libraries/operations.lib.php:38 libraries/operations.lib.php:108
 #: libraries/operations.lib.php:263 libraries/operations.lib.php:306
 #: libraries/operations.lib.php:801 libraries/operations.lib.php:874
 #: libraries/operations.lib.php:923 libraries/operations.lib.php:1337
 #: libraries/operations.lib.php:1658
-#: libraries/plugins/auth/AuthenticationCookie.class.php:244
+#: libraries/plugins/auth/AuthenticationCookie.class.php:232
 #: libraries/replication_gui.lib.php:122 libraries/replication_gui.lib.php:161
 #: libraries/replication_gui.lib.php:324 libraries/replication_gui.lib.php:461
 #: libraries/replication_gui.lib.php:906 libraries/rte/rte_events.lib.php:509
-#: libraries/rte/rte_routines.lib.php:969
-#: libraries/rte/rte_routines.lib.php:1581
+#: libraries/rte/rte_routines.lib.php:1060
+#: libraries/rte/rte_routines.lib.php:1672
 #: libraries/rte/rte_triggers.lib.php:396 libraries/server_bin_log.lib.php:61
 #: libraries/server_privileges.lib.php:705
 #: libraries/server_privileges.lib.php:2106
 #: libraries/server_privileges.lib.php:2872
 #: libraries/server_privileges.lib.php:3553
-#: libraries/server_privileges.lib.php:4627
+#: libraries/server_privileges.lib.php:4653
 #: libraries/server_user_groups.lib.php:285
 #: libraries/sql_query_form.lib.php:369 libraries/sql_query_form.lib.php:429
 #: libraries/tracking.lib.php:533 libraries/tracking.lib.php:653
 #: prefs_manage.php:277 prefs_manage.php:355
 #: templates/columns_definitions/column_definitions_form.phtml:59
-#: templates/header_location.phtml:17 templates/index_form.phtml:238
+#: templates/database/create_table.phtml:21 templates/header_location.phtml:28
 #: templates/startAndNumberOfRowsPanel.phtml:14
-#: templates/structure/add_column.phtml:25
-#: templates/table/create_table.phtml:21
-#: templates/table/selection_form.phtml:75 view_create.php:275
+#: templates/table/index_form.phtml:238
+#: templates/table/search/selection_form.phtml:75
+#: templates/table/structure/add_column.phtml:25 view_create.php:275
 #: view_operations.php:106
 msgid "Go"
 msgstr "OK"
@@ -712,7 +714,7 @@ msgstr ""
 msgid "Could not load import plugins, please check your installation!"
 msgstr ""
 
-#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1466
+#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1460
 #, fuzzy, php-format
 msgid "Bookmark %s has been created."
 msgstr "Табелата %s е избришана"
@@ -746,12 +748,12 @@ msgstr ""
 msgid "Back"
 msgstr "Назад"
 
-#: index.php:148 libraries/Footer.class.php:70
+#: index.php:149 libraries/Footer.class.php:70
 #, fuzzy
 msgid "phpMyAdmin Demo Server"
 msgstr "phpMyAdmin документација"
 
-#: index.php:152
+#: index.php:153
 #, php-format
 msgid ""
 "You are using the demo server. You can do anything here, but please do not "
@@ -759,49 +761,49 @@ msgid ""
 "at %s."
 msgstr ""
 
-#: index.php:162
+#: index.php:163
 #, fuzzy
 #| msgid "General relation features"
 msgid "General Settings"
 msgstr "Општи особини на релациите"
 
-#: index.php:190 libraries/display_change_password.lib.php:50
+#: index.php:191 libraries/display_change_password.lib.php:50
 #: libraries/display_change_password.lib.php:53 user_password.php:247
 msgid "Change password"
 msgstr "Промена на лозинка"
 
-#: index.php:206
+#: index.php:207
 #, fuzzy
 #| msgid "MySQL connection collation"
 msgid "Server connection collation"
 msgstr "Колација за MySQL врска"
 
-#: index.php:228
+#: index.php:229
 msgid "Appearance Settings"
 msgstr ""
 
-#: index.php:258 prefs_manage.php:285
+#: index.php:259 prefs_manage.php:285
 #, fuzzy
 #| msgid "General relation features"
 msgid "More settings"
 msgstr "Општи особини на релациите"
 
-#: index.php:279
+#: index.php:280
 #, fuzzy
 #| msgid "Databases"
 msgid "Database server"
 msgstr "База на податоци"
 
-#: index.php:282 libraries/plugins/auth/AuthenticationCookie.class.php:181
+#: index.php:283 libraries/plugins/auth/AuthenticationCookie.class.php:169
 msgid "Server:"
 msgstr "Сервер:"
 
-#: index.php:286
+#: index.php:287
 #, fuzzy
 msgid "Server type:"
 msgstr "ID на серверот"
 
-#: index.php:290 libraries/plugins/export/ExportLatex.class.php:212
+#: index.php:291 libraries/plugins/export/ExportLatex.class.php:212
 #: libraries/plugins/export/ExportSql.class.php:687
 #: libraries/plugins/export/ExportXml.class.php:189
 #, fuzzy
@@ -809,86 +811,86 @@ msgstr "ID на серверот"
 msgid "Server version:"
 msgstr "Верзија на серверот"
 
-#: index.php:296
+#: index.php:297
 #, fuzzy
 msgid "Protocol version:"
 msgstr "Верзија на серверот"
 
-#: index.php:300
+#: index.php:301
 #, fuzzy
 #| msgid "User"
 msgid "User:"
 msgstr "Корисник"
 
-#: index.php:305
+#: index.php:306
 #, fuzzy
 msgid "Server charset:"
 msgstr "Избор на сервер"
 
-#: index.php:320
+#: index.php:321
 msgid "Web server"
 msgstr ""
 
-#: index.php:331
+#: index.php:332
 #, fuzzy
 #| msgid "Database comment"
 msgid "Database client version:"
 msgstr "Коментар на базата на податоци:"
 
-#: index.php:335
+#: index.php:336
 #, fuzzy
 msgid "PHP extension:"
 msgstr "PHP верзија"
 
-#: index.php:349
+#: index.php:350
 #, fuzzy
 #| msgid "PHP Version"
 msgid "PHP version:"
 msgstr "PHP верзија"
 
-#: index.php:360
+#: index.php:361
 msgid "Show PHP information"
 msgstr "Прикажи информации за PHP"
 
-#: index.php:383
+#: index.php:384
 #, fuzzy
 #| msgid "Version information"
 msgid "Version information:"
 msgstr "Информации за верзијата"
 
-#: index.php:392 libraries/Util.class.php:432 libraries/Util.class.php:495
-#: libraries/config/FormDisplay.tpl.php:151
+#: index.php:393 libraries/Util.class.php:432 libraries/Util.class.php:495
+#: libraries/config/FormDisplay.tpl.php:162
 #: libraries/display_export.lib.php:577 libraries/engines/pbxt.lib.php:162
 #: libraries/navigation/NavigationHeader.class.php:196
 #: libraries/server_variables.lib.php:160
 msgid "Documentation"
 msgstr "Документација"
 
-#: index.php:399
+#: index.php:400
 msgid "Wiki"
 msgstr ""
 
-#: index.php:408
+#: index.php:409
 msgid "Official Homepage"
 msgstr "официјален веб сајт на phpMyAdmin"
 
-#: index.php:415
+#: index.php:416
 #, fuzzy
 #| msgid "Attributes"
 msgid "Contribute"
 msgstr "Атрибути"
 
-#: index.php:422
+#: index.php:423
 msgid "Get support"
 msgstr ""
 
-#: index.php:429
+#: index.php:430
 #, fuzzy
 #| msgid "No change"
 msgid "List of changes"
 msgstr "Нема измени"
 
-#: index.php:451
+#: index.php:452
 #, fuzzy
 #| msgid ""
 #| "Your configuration file contains settings (root with no password) that "
@@ -906,7 +908,7 @@ msgstr ""
 "работи со овие подесувања, отворен е за упди, и навистина треба да го "
 "поправите овој сигурносен ризик."
 
-#: index.php:468
+#: index.php:469
 msgid ""
 "You have enabled mbstring.func_overload in your PHP configuration. This "
 "option is incompatible with phpMyAdmin and might cause some data to be "
@@ -916,7 +918,7 @@ msgstr ""
 "опција не е компатибилна со phpMyAdmin и може да доведе до грешки во некои "
 "податоци!"
 
-#: index.php:483
+#: index.php:484
 msgid ""
 "The mbstring PHP extension was not found and you seem to be using a "
 "multibyte charset. Without the mbstring extension phpMyAdmin is unable to "
@@ -926,7 +928,7 @@ msgstr ""
 "мултибајт каратер сет. Без mbstring екстензиите phpMyAdmin не може исправно "
 "да ги раздвојува стринговите и тоа може да доведе до неочекувани резултати."
 
-#: index.php:500
+#: index.php:501
 msgid ""
 "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini."
 "session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower than "
@@ -934,17 +936,17 @@ msgid ""
 "expire sooner than configured in phpMyAdmin."
 msgstr ""
 
-#: index.php:519
+#: index.php:520
 msgid ""
 "Login cookie store is lower than cookie validity configured in phpMyAdmin, "
 "because of this, your login will expire sooner than configured in phpMyAdmin."
 msgstr ""
 
-#: index.php:535
+#: index.php:536
 msgid "The configuration file now needs a secret passphrase (blowfish_secret)."
 msgstr "Конфигурациската податотека бара лозинка (blowfish_secret)."
 
-#: index.php:548
+#: index.php:549
 msgid ""
 "Directory [code]config[/code], which is used by the setup script, still "
 "exists in your phpMyAdmin directory. It is strongly recommended to remove it "
@@ -952,7 +954,7 @@ msgid ""
 "may be compromised by unauthorized people downloading your configuration."
 msgstr ""
 
-#: index.php:564
+#: index.php:565
 #, fuzzy, php-format
 #| msgid ""
 #| " additional features for working with linked tables have been ctivated. "
@@ -964,19 +966,19 @@ msgstr ""
 "Дополнителните можности за работа со поврзаните табели се исклучени. За да "
 "дознаете зошто, кликнете %sовде%s."
 
-#: index.php:571
+#: index.php:572
 msgid ""
 "Or alternately go to 'Operations' tab of any database to set it up there."
 msgstr ""
 
-#: index.php:620
+#: index.php:621
 #, php-format
 msgid ""
 "Your PHP MySQL library version %s differs from your MySQL server version %s. "
 "This may cause unpredictable behavior."
 msgstr ""
 
-#: index.php:648
+#: index.php:649
 #, php-format
 msgid ""
 "Server running with Suhosin. Please refer to %sdocumentation%s for possible "
@@ -1148,8 +1150,8 @@ msgstr ""
 msgid "Save & Close"
 msgstr "Сочувај како податотека"
 
-#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:404
-#: libraries/insert_edit.lib.php:1550 prefs_manage.php:361
+#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:415
+#: libraries/insert_edit.lib.php:1548 prefs_manage.php:361
 #: prefs_manage.php:372
 msgid "Reset"
 msgstr "Поништи"
@@ -1190,7 +1192,7 @@ msgstr "Додади ново поле"
 msgid "Edit Index"
 msgstr "Ажурирање на следниот запис"
 
-#: js/messages.php:99 templates/index_form.phtml:232
+#: js/messages.php:99 templates/table/index_form.phtml:232
 #, fuzzy, php-format
 #| msgid "Add %s field(s)"
 msgid "Add %s column(s) to index"
@@ -1220,15 +1222,16 @@ msgstr "Полињата се раздвоени со"
 msgid "Please select column(s) for the index."
 msgstr "Додади %s полиња"
 
-#: js/messages.php:106 templates/structure/add_column.phtml:1
+#: js/messages.php:106 templates/table/structure/add_column.phtml:1
 #, fuzzy
 #| msgid "You have to choose at least one column to display"
 msgid "You have to add at least one column."
 msgstr "Морате да изберете барем една колона за приказ"
 
-#: js/messages.php:109 libraries/insert_edit.lib.php:1548
+#: js/messages.php:109 libraries/insert_edit.lib.php:1546
 #: templates/columns_definitions/column_definitions_form.phtml:162
-#: templates/index_form.phtml:237 templates/tbl_relation/common_form.phtml:106
+#: templates/table/index_form.phtml:237
+#: templates/table/relation/common_form.phtml:106
 msgid "Preview SQL"
 msgstr ""
 
@@ -1251,7 +1254,7 @@ msgid "SQL query:"
 msgstr "SQL упит"
 
 #. l10n: Default label for the y-Axis of Charts
-#: js/messages.php:118 templates/tbl_chart.phtml:109
+#: js/messages.php:118 templates/table/chart/tbl_chart.phtml:109
 #, fuzzy
 #| msgid "Value"
 msgid "Y Values"
@@ -1426,7 +1429,7 @@ msgstr ""
 msgid "Bytes received"
 msgstr "Примено"
 
-#: js/messages.php:169 libraries/server_status.lib.php:226
+#: js/messages.php:169 libraries/server_status.lib.php:235
 msgid "Connections"
 msgstr "Конекции"
 
@@ -1486,12 +1489,12 @@ msgstr "%s табела"
 msgid "Questions"
 msgstr "Персиски"
 
-#: js/messages.php:184 libraries/server_status.lib.php:134
+#: js/messages.php:184 libraries/server_status.lib.php:143
 msgid "Traffic"
 msgstr "Сообраќај"
 
 #: js/messages.php:185 libraries/Menu.class.php:586
-#: libraries/Util.class.php:4318 libraries/server_status_monitor.lib.php:257
+#: libraries/Util.class.php:4324 libraries/server_status_monitor.lib.php:257
 #, fuzzy
 #| msgid "General relation features"
 msgid "Settings"
@@ -1513,8 +1516,9 @@ msgstr ""
 #: libraries/server_status_monitor.lib.php:236
 #: libraries/server_status_processes.lib.php:308
 #: templates/columns_definitions/transformation.phtml:4
-#: templates/designer/options_panel.phtml:178
-#: templates/table/options_zoom.phtml:12 templates/table/rows_zoom.phtml:26
+#: templates/database/designer/options_panel.phtml:178
+#: templates/table/search/options_zoom.phtml:12
+#: templates/table/search/rows_zoom.phtml:26
 msgid "None"
 msgstr "нема"
 
@@ -1817,8 +1821,8 @@ msgstr ""
 
 #: js/messages.php:270 libraries/Menu.class.php:352
 #: libraries/Menu.class.php:455 libraries/Menu.class.php:582
-#: libraries/Util.class.php:4317 libraries/Util.class.php:4332
-#: libraries/Util.class.php:4349 libraries/config/messages.inc.php:258
+#: libraries/Util.class.php:4323 libraries/Util.class.php:4338
+#: libraries/Util.class.php:4355 libraries/config/messages.inc.php:258
 #: libraries/display_import.lib.php:105
 #: libraries/server_status_monitor.lib.php:318 prefs_manage.php:238
 #: setup/frames/menu.inc.php:26
@@ -1885,13 +1889,13 @@ msgid "Formatting SQL..."
 msgstr ""
 
 #: js/messages.php:293 libraries/server_variables.lib.php:157
-#: templates/designer/aggregate_query_panel.phtml:63
-#: templates/designer/delete_relation_panel.phtml:28
-#: templates/designer/having_query_panel.phtml:117
-#: templates/designer/new_relation_panel.phtml:88
-#: templates/designer/options_panel.phtml:253
-#: templates/designer/rename_to_panel.phtml:45
-#: templates/designer/where_query_panel.phtml:83
+#: templates/database/designer/aggregate_query_panel.phtml:63
+#: templates/database/designer/delete_relation_panel.phtml:28
+#: templates/database/designer/having_query_panel.phtml:117
+#: templates/database/designer/new_relation_panel.phtml:88
+#: templates/database/designer/options_panel.phtml:253
+#: templates/database/designer/rename_to_panel.phtml:45
+#: templates/database/designer/where_query_panel.phtml:83
 msgid "Cancel"
 msgstr ""
 
@@ -1901,7 +1905,7 @@ msgstr ""
 msgid "Page-related settings"
 msgstr "Општи особини на релациите"
 
-#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:402
+#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:413
 msgid "Apply"
 msgstr ""
 
@@ -1938,8 +1942,8 @@ msgstr ""
 msgid "Error text: %s"
 msgstr ""
 
-#: js/messages.php:307 libraries/db_common.inc.php:68
-#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:450
+#: js/messages.php:307 libraries/db_common.inc.php:69
+#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:461
 msgid "No databases selected."
 msgstr "Не е избрана ни една база на податоци."
 
@@ -1951,12 +1955,13 @@ msgstr ""
 msgid "Adding Primary Key"
 msgstr ""
 
-#: js/messages.php:310 templates/designer/aggregate_query_panel.phtml:59
-#: templates/designer/having_query_panel.phtml:113
-#: templates/designer/new_relation_panel.phtml:87
-#: templates/designer/options_panel.phtml:252
-#: templates/designer/rename_to_panel.phtml:41
-#: templates/designer/where_query_panel.phtml:82
+#: js/messages.php:310
+#: templates/database/designer/aggregate_query_panel.phtml:59
+#: templates/database/designer/having_query_panel.phtml:113
+#: templates/database/designer/new_relation_panel.phtml:87
+#: templates/database/designer/options_panel.phtml:252
+#: templates/database/designer/rename_to_panel.phtml:41
+#: templates/database/designer/where_query_panel.phtml:82
 msgid "OK"
 msgstr "ОК"
 
@@ -1982,7 +1987,7 @@ msgstr "Копирај ја базата на податоци во"
 msgid "Changing Charset"
 msgstr "Кодна страна"
 
-#: js/messages.php:320 libraries/Util.class.php:3217
+#: js/messages.php:320 libraries/Util.class.php:3223
 #, fuzzy
 #| msgid "Disable foreign key checks"
 msgid "Enable foreign key checks"
@@ -2027,20 +2032,21 @@ msgstr ""
 #: js/messages.php:334 libraries/DisplayResults.class.php:4834
 #: libraries/DisplayResults.class.php:5092 libraries/Menu.class.php:344
 #: libraries/Menu.class.php:446 libraries/Menu.class.php:578
-#: libraries/Util.class.php:3636 libraries/Util.class.php:3637
-#: libraries/Util.class.php:4316 libraries/Util.class.php:4331
-#: libraries/Util.class.php:4348 libraries/config/messages.inc.php:252
+#: libraries/Util.class.php:3642 libraries/Util.class.php:3643
+#: libraries/Util.class.php:4322 libraries/Util.class.php:4337
+#: libraries/Util.class.php:4354 libraries/config/messages.inc.php:252
 #: libraries/display_export.lib.php:173 libraries/rte/rte_list.lib.php:146
 #: libraries/server_privileges.lib.php:2211
 #: libraries/server_privileges.lib.php:2290
 #: libraries/server_privileges.lib.php:2632
 #: libraries/server_privileges.lib.php:3356
 #: libraries/server_status_monitor.lib.php:322 prefs_manage.php:303
-#: setup/frames/menu.inc.php:27 templates/structure/check_all_tables.phtml:11
+#: setup/frames/menu.inc.php:27
+#: templates/database/structure/check_all_tables.phtml:11
 msgid "Export"
 msgstr "Извоз"
 
-#: js/messages.php:337 libraries/rte/rte_routines.lib.php:652
+#: js/messages.php:337 libraries/rte/rte_routines.lib.php:743
 msgid "ENUM/SET editor"
 msgstr ""
 
@@ -2082,7 +2088,7 @@ msgstr "SQL упит"
 #: libraries/Console.class.php:214 libraries/DisplayResults.class.php:3474
 #: libraries/DisplayResults.class.php:4818 libraries/Index.class.php:723
 #: libraries/Util.class.php:706 libraries/Util.class.php:1202
-#: libraries/Util.class.php:3634 libraries/Util.class.php:3635
+#: libraries/Util.class.php:3640 libraries/Util.class.php:3641
 #: libraries/central_columns.lib.php:851
 #: libraries/central_columns.lib.php:1193
 #: libraries/config/messages.inc.php:892
@@ -2100,7 +2106,7 @@ msgstr "Промени"
 #: libraries/server_user_groups.lib.php:129
 #: libraries/sql_query_form.lib.php:416 libraries/tracking.lib.php:477
 #: setup/frames/index.inc.php:183 setup/frames/index.inc.php:291
-#: templates/designer/delete_relation_panel.phtml:27
+#: templates/database/designer/delete_relation_panel.phtml:27
 msgid "Delete"
 msgstr "избриши"
 
@@ -2282,11 +2288,11 @@ msgid "No dependencies selected!"
 msgstr "Не е избрана ни една база на податоци."
 
 #: js/messages.php:394 libraries/central_columns.lib.php:1214
-#: libraries/insert_edit.lib.php:1458 libraries/server_variables.lib.php:155
+#: libraries/insert_edit.lib.php:1456 libraries/server_variables.lib.php:155
 #: setup/frames/config.inc.php:42 setup/frames/index.inc.php:279
 #: templates/columns_definitions/column_definitions_form.phtml:165
-#: templates/gis_visualization/gis_visualization.phtml:48
-#: templates/tbl_relation/common_form.phtml:107
+#: templates/table/gis_visualization/gis_visualization.phtml:48
+#: templates/table/relation/common_form.phtml:107
 msgid "Save"
 msgstr "Сочувај"
 
@@ -2377,8 +2383,8 @@ msgid "Data point content"
 msgstr "Големина на покажувачите на податоци"
 
 #: js/messages.php:430 js/messages.php:562 js/messages.php:579
-#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2573
-#: templates/index_form.phtml:154 templates/index_form.phtml:194
+#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2571
+#: templates/table/index_form.phtml:154 templates/table/index_form.phtml:194
 msgid "Ignore"
 msgstr "Игнорирај"
 
@@ -2439,8 +2445,8 @@ msgstr ""
 msgid "Please select the primary key or a unique key!"
 msgstr ""
 
-#: js/messages.php:457 templates/designer/side_menu.phtml:91
-#: templates/designer/side_menu.phtml:94
+#: js/messages.php:457 templates/database/designer/side_menu.phtml:91
+#: templates/database/designer/side_menu.phtml:94
 #, fuzzy
 #| msgid "Choose field to display"
 msgid "Choose column to display"
@@ -2458,22 +2464,22 @@ msgstr ""
 msgid "Page name"
 msgstr "Број на страници:"
 
-#: js/messages.php:463 templates/designer/side_menu.phtml:56
-#: templates/designer/side_menu.phtml:59
+#: js/messages.php:463 templates/database/designer/side_menu.phtml:56
+#: templates/database/designer/side_menu.phtml:59
 #, fuzzy
 #| msgid "Select All"
 msgid "Save page"
 msgstr "избери се"
 
-#: js/messages.php:464 templates/designer/side_menu.phtml:63
-#: templates/designer/side_menu.phtml:66
+#: js/messages.php:464 templates/database/designer/side_menu.phtml:63
+#: templates/database/designer/side_menu.phtml:66
 #, fuzzy
 #| msgid "Select All"
 msgid "Save page as"
 msgstr "избери се"
 
-#: js/messages.php:465 templates/designer/side_menu.phtml:49
-#: templates/designer/side_menu.phtml:52
+#: js/messages.php:465 templates/database/designer/side_menu.phtml:49
+#: templates/database/designer/side_menu.phtml:52
 #, fuzzy
 #| msgid "Free pages"
 msgid "Open page"
@@ -2485,7 +2491,7 @@ msgstr "Слободни страници"
 msgid "Delete page"
 msgstr "избери се"
 
-#: js/messages.php:467 templates/designer/side_menu.phtml:10
+#: js/messages.php:467 templates/database/designer/side_menu.phtml:10
 msgid "Untitled"
 msgstr ""
 
@@ -2605,7 +2611,7 @@ msgstr "Оргинална позиција"
 msgid "cancel"
 msgstr ""
 
-#: js/messages.php:499 libraries/server_status.lib.php:271
+#: js/messages.php:499 libraries/server_status.lib.php:280
 msgid "Aborted"
 msgstr "Прекинато"
 
@@ -3258,7 +3264,7 @@ msgstr ""
 
 #: js/messages.php:793 libraries/Message.class.php:199
 #: libraries/Util.class.php:654 libraries/core.lib.php:245
-#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1172
+#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1170
 #: tbl_operations.php:229 view_operations.php:63
 msgid "Error"
 msgstr "Грешка"
@@ -3317,8 +3323,8 @@ msgstr "во секунда"
 msgid "per minute"
 msgstr "во минута"
 
-#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:143
-#: libraries/server_status.lib.php:228
+#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:152
+#: libraries/server_status.lib.php:237
 #: libraries/server_status_queries.lib.php:98
 msgid "per hour"
 msgstr "на час"
@@ -3336,7 +3342,7 @@ msgstr ""
 msgid "Wrong permissions on configuration file, should not be world writable!"
 msgstr ""
 
-#: libraries/Config.class.php:1799
+#: libraries/Config.class.php:1801
 msgid "Font size"
 msgstr ""
 
@@ -3366,10 +3372,10 @@ msgstr "во упитот"
 #: libraries/server_privileges.lib.php:2890
 #: libraries/server_privileges.lib.php:3144
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4332
+#: libraries/server_privileges.lib.php:4358
 #: libraries/server_status_processes.lib.php:80
-#: templates/tbl_relation/foreign_key_row.phtml:165
-#: templates/tbl_relation/internal_relational_row.phtml:55
+#: templates/table/relation/foreign_key_row.phtml:165
+#: templates/table/relation/internal_relational_row.phtml:55
 msgid "Database"
 msgstr "База на податоци"
 
@@ -3475,11 +3481,11 @@ msgstr "SQL историја"
 #: libraries/plugins/import/ImportMediawiki.class.php:60
 #: libraries/plugins/import/ImportOds.class.php:59
 #: libraries/plugins/import/ImportShp.class.php:57
-#: libraries/plugins/import/ImportSql.class.php:148
+#: libraries/plugins/import/ImportSql.class.php:51
 #: libraries/plugins/import/ImportXml.class.php:58
-#: libraries/rte/rte_routines.lib.php:833 templates/index_form.phtml:49
-#: templates/structure/row_stats_table.phtml:20
-#: templates/table/options.phtml:2
+#: libraries/rte/rte_routines.lib.php:924 templates/table/index_form.phtml:49
+#: templates/table/search/options.phtml:2
+#: templates/table/structure/row_stats_table.phtml:20
 #, fuzzy
 msgid "Options"
 msgstr "Операции"
@@ -3523,7 +3529,8 @@ msgstr "Опаѓачки редослед"
 msgid "Order:"
 msgstr ""
 
-#: libraries/Console.class.php:289 templates/table/replace_preview.phtml:17
+#: libraries/Console.class.php:289
+#: templates/table/search/replace_preview.phtml:17
 #, fuzzy
 #| msgid "Column names"
 msgid "Count"
@@ -3643,9 +3650,9 @@ msgstr "Премини на копираната табела"
 #: libraries/operations.lib.php:794 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:191
-#: templates/structure/sortable_header.phtml:21
-#: templates/structure/sortable_header.phtml:38
-#: templates/table/options.phtml:68
+#: templates/database/structure/sortable_header.phtml:21
+#: templates/database/structure/sortable_header.phtml:38
+#: templates/table/search/options.phtml:68
 msgid "Ascending"
 msgstr "Растечки редослед"
 
@@ -3655,13 +3662,14 @@ msgstr "Растечки редослед"
 #: libraries/operations.lib.php:797 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:188
-#: templates/structure/sortable_header.phtml:26
-#: templates/structure/sortable_header.phtml:43
-#: templates/table/options.phtml:69
+#: templates/database/structure/sortable_header.phtml:26
+#: templates/database/structure/sortable_header.phtml:43
+#: templates/table/search/options.phtml:69
 msgid "Descending"
 msgstr "Опаѓачки редослед"
 
-#: libraries/DBQbe.class.php:467 templates/table/search_and_replace.phtml:6
+#: libraries/DBQbe.class.php:467
+#: templates/table/search/search_and_replace.phtml:6
 #, fuzzy
 #| msgid "Column names"
 msgid "Column:"
@@ -3850,12 +3858,12 @@ msgstr[0] "%s погодоци во табелата <i>%s</i>"
 msgstr[1] "%s погодоци во табелата <i>%s</i>"
 
 #: libraries/DbSearch.class.php:354 libraries/Menu.class.php:311
-#: libraries/Util.class.php:3337 libraries/Util.class.php:3347
-#: libraries/Util.class.php:3623 libraries/Util.class.php:3624
-#: libraries/Util.class.php:4343 libraries/config.values.php:43
+#: libraries/Util.class.php:3343 libraries/Util.class.php:3353
+#: libraries/Util.class.php:3629 libraries/Util.class.php:3630
+#: libraries/Util.class.php:4349 libraries/config.values.php:43
 #: libraries/config.values.php:51 libraries/config.values.php:119
 #: libraries/navigation/Nodes/Node_Table.class.php:295
-#: templates/structure/check_all_table_column.phtml:5
+#: templates/table/structure/check_all_table_column.phtml:5
 msgid "Browse"
 msgstr "Преглед"
 
@@ -3875,7 +3883,8 @@ msgstr "Пребарување низ базата на податоци"
 msgid "Words or values to search for (wildcard: \"%\"):"
 msgstr "Зборови или вредности кои се бараат (џокер знак \"%\"):"
 
-#: libraries/DbSearch.class.php:401 templates/table/search_and_replace.phtml:1
+#: libraries/DbSearch.class.php:401
+#: templates/table/search/search_and_replace.phtml:1
 msgid "Find:"
 msgstr "Барај:"
 
@@ -3929,16 +3938,16 @@ msgstr "Полиња"
 msgid "Search this table"
 msgstr "Пребарување низ базата на податоци"
 
-#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2532
-#: libraries/Util.class.php:2535
+#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2538
+#: libraries/Util.class.php:2541
 #, fuzzy
 #| msgid "Begin"
 msgctxt "First page"
 msgid "Begin"
 msgstr "Почеток"
 
-#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2533
-#: libraries/Util.class.php:2536 libraries/server_bin_log.lib.php:170
+#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2539
+#: libraries/Util.class.php:2542 libraries/server_bin_log.lib.php:170
 #: libraries/server_bin_log.lib.php:172
 #, fuzzy
 #| msgid "Previous"
@@ -3946,8 +3955,8 @@ msgctxt "Previous page"
 msgid "Previous"
 msgstr "Претходна"
 
-#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2564
-#: libraries/Util.class.php:2574 libraries/server_bin_log.lib.php:204
+#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2570
+#: libraries/Util.class.php:2580 libraries/server_bin_log.lib.php:204
 #: libraries/server_bin_log.lib.php:206
 #, fuzzy
 #| msgid "Next"
@@ -3955,8 +3964,8 @@ msgctxt "Next page"
 msgid "Next"
 msgstr "Следен"
 
-#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2565
-#: libraries/Util.class.php:2575
+#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2571
+#: libraries/Util.class.php:2581
 #, fuzzy
 #| msgid "End"
 msgctxt "Last page"
@@ -4048,9 +4057,9 @@ msgstr ""
 "[doc@faq3-11]FAQ 3.11[/doc]"
 
 #: libraries/DisplayResults.class.php:4332 libraries/Message.class.php:180
-#: libraries/controllers/TableRelationController.class.php:258
+#: libraries/controllers/TableRelationController.class.php:259
 #: libraries/controllers/TableSearchController.class.php:655
-#: libraries/rte/rte_routines.lib.php:1332 libraries/sql_query_form.lib.php:89
+#: libraries/rte/rte_routines.lib.php:1423 libraries/sql_query_form.lib.php:89
 #: tbl_operations.php:227 tbl_row_action.php:138 view_operations.php:62
 #, fuzzy
 #| msgid "Your SQL query has been executed successfully."
@@ -4058,7 +4067,7 @@ msgid "Your SQL query has been executed successfully."
 msgstr "Вашиот SQL упит успешно е извршен"
 
 #: libraries/DisplayResults.class.php:4660
-#: libraries/controllers/StructureController.class.php:629
+#: libraries/controllers/DatabaseStructureController.class.php:564
 #, php-format
 msgid ""
 "This view has at least this number of rows. Please refer to %sdocumentation"
@@ -4082,34 +4091,34 @@ msgstr ""
 msgid "%d total"
 msgstr "вкупно"
 
-#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1318
+#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1312
 #, fuzzy, php-format
 #| msgid "Query took %01.4f sec"
 msgid "Query took %01.4f seconds."
 msgstr "време на извршување на упитот %01.4f секунди"
 
 #: libraries/DisplayResults.class.php:4807
-#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4767
-#: libraries/Util.class.php:4773 libraries/mult_submits.inc.php:50
-#: templates/structure/check_all_tables.phtml:2
-#: templates/structure/check_all_tables.phtml:9
+#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4773
+#: libraries/Util.class.php:4779 libraries/mult_submits.inc.php:50
+#: templates/database/structure/check_all_tables.phtml:2
+#: templates/database/structure/check_all_tables.phtml:9
 msgid "With selected:"
 msgstr "Обележаното:"
 
 #: libraries/DisplayResults.class.php:4811
-#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4769
-#: libraries/Util.class.php:4770 libraries/server_privileges.lib.php:1174
+#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4775
+#: libraries/Util.class.php:4776 libraries/server_privileges.lib.php:1174
 #: libraries/server_privileges.lib.php:1175
 #: libraries/server_privileges.lib.php:1387
 #: libraries/server_user_groups.lib.php:231
-#: templates/structure/check_all_tables.phtml:3
-#: templates/structure/check_all_tables.phtml:4
+#: templates/database/structure/check_all_tables.phtml:3
+#: templates/database/structure/check_all_tables.phtml:4
 msgid "Check All"
 msgstr "обележи ги сите"
 
 #: libraries/DisplayResults.class.php:4985 libraries/Header.class.php:383
-#: templates/structure/optional_action_links.phtml:1
-#: templates/structure/print_view_data_dictionary_link.phtml:3
+#: templates/database/structure/print_view_data_dictionary_link.phtml:3
+#: templates/table/structure/optional_action_links.phtml:1
 msgid "Print view"
 msgstr "Преглед за печатење"
 
@@ -4117,7 +4126,8 @@ msgstr "Преглед за печатење"
 msgid "Query results operations"
 msgstr ""
 
-#: libraries/DisplayResults.class.php:5105 templates/tbl_chart.phtml:12
+#: libraries/DisplayResults.class.php:5105
+#: templates/table/chart/tbl_chart.phtml:12
 #, fuzzy
 #| msgid "Display PDF schema"
 msgid "Display chart"
@@ -4218,7 +4228,7 @@ msgid "Click on the bar to scroll to top of page"
 msgstr ""
 
 #: libraries/Header.class.php:749
-#: libraries/plugins/auth/AuthenticationCookie.class.php:152
+#: libraries/plugins/auth/AuthenticationCookie.class.php:140
 #, fuzzy
 #| msgid "Cookies must be enabled past this point."
 msgid "Javascript must be enabled past this point!"
@@ -4242,11 +4252,11 @@ msgid "Keyname"
 msgstr "Име на клуч"
 
 #: libraries/Index.class.php:697
-#: libraries/controllers/StructureController.class.php:1962
-#: libraries/controllers/StructureController.class.php:1967
+#: libraries/controllers/TableStructureController.class.php:953
+#: libraries/controllers/TableStructureController.class.php:958
 #: libraries/tracking.lib.php:973
 #: templates/columns_definitions/column_indexes.phtml:11
-#: templates/structure/check_all_table_column.phtml:26
+#: templates/table/structure/check_all_table_column.phtml:26
 msgid "Unique"
 msgstr "Единствен"
 
@@ -4265,16 +4275,17 @@ msgstr "Кардиналност"
 #: libraries/server_collations.lib.php:35 libraries/tracking.lib.php:881
 #: libraries/tracking.lib.php:977
 #: templates/columns_definitions/table_fields_definitions.phtml:33
-#: templates/structure/row_stats_table.phtml:31
-#: templates/structure/table_header.phtml:55
-#: templates/structure/table_structure_header.phtml:7
-#: templates/table/table_header.phtml:8
+#: templates/database/structure/table_header.phtml:55
+#: templates/table/search/table_header.phtml:8
+#: templates/table/structure/row_stats_table.phtml:31
+#: templates/table/structure/table_structure_header.phtml:7
 msgid "Collation"
 msgstr "Подредување"
 
 #: libraries/Index.class.php:703 libraries/rte/rte_events.lib.php:496
-#: libraries/rte/rte_routines.lib.php:956 libraries/tracking.lib.php:885
-#: libraries/tracking.lib.php:979 templates/structure/table_header.phtml:84
+#: libraries/rte/rte_routines.lib.php:1047 libraries/tracking.lib.php:885
+#: libraries/tracking.lib.php:979
+#: templates/database/structure/table_header.phtml:84
 #, fuzzy
 msgid "Comment"
 msgstr "Коментари"
@@ -4288,15 +4299,15 @@ msgstr "Примарниот клуч е избришан."
 msgid "Index %s has been dropped."
 msgstr "Клучот %s е избиршан."
 
-#: libraries/Index.class.php:757 libraries/Util.class.php:3630
-#: libraries/Util.class.php:3631
-#: libraries/controllers/StructureController.class.php:1958
-#: libraries/controllers/StructureController.class.php:1959
+#: libraries/Index.class.php:757 libraries/Util.class.php:3636
+#: libraries/Util.class.php:3637
+#: libraries/controllers/TableStructureController.class.php:949
+#: libraries/controllers/TableStructureController.class.php:950
 #: libraries/operations.lib.php:1607 libraries/rte/rte_list.lib.php:150
 #: libraries/server_databases.lib.php:146
-#: templates/structure/check_all_table_column.phtml:15
-#: templates/structure/check_all_tables.phtml:16
-#: templates/tbl_relation/foreign_key_row.phtml:93
+#: templates/database/structure/check_all_tables.phtml:16
+#: templates/table/relation/foreign_key_row.phtml:93
+#: templates/table/structure/check_all_table_column.phtml:15
 msgid "Drop"
 msgstr "Бриши"
 
@@ -4325,16 +4336,16 @@ msgstr "Сервер"
 #: libraries/Menu.class.php:248
 #: libraries/navigation/Nodes/Node_View.class.php:32
 #: libraries/tbl_info.inc.php:63
-#: templates/structure/structure_table_row.phtml:97
-#: templates/structure/structure_table_row.phtml:159
+#: templates/database/structure/structure_table_row.phtml:97
+#: templates/database/structure/structure_table_row.phtml:159
 msgid "View"
 msgstr "Поглед"
 
 #: libraries/Menu.class.php:325 libraries/Menu.class.php:429
-#: libraries/Menu.class.php:548 libraries/Util.class.php:3334
-#: libraries/Util.class.php:3344 libraries/Util.class.php:3350
-#: libraries/Util.class.php:4313 libraries/Util.class.php:4328
-#: libraries/Util.class.php:4345 libraries/config.values.php:40
+#: libraries/Menu.class.php:548 libraries/Util.class.php:3340
+#: libraries/Util.class.php:3350 libraries/Util.class.php:3356
+#: libraries/Util.class.php:4319 libraries/Util.class.php:4334
+#: libraries/Util.class.php:4351 libraries/config.values.php:40
 #: libraries/config.values.php:48 libraries/config.values.php:110
 #: libraries/config.values.php:116 libraries/config/messages.inc.php:321
 #: libraries/navigation/Nodes/Node_Table.class.php:292
@@ -4342,19 +4353,19 @@ msgid "SQL"
 msgstr "SQL"
 
 #: libraries/Menu.class.php:328 libraries/Menu.class.php:432
-#: libraries/Util.class.php:3335 libraries/Util.class.php:3345
-#: libraries/Util.class.php:3351 libraries/Util.class.php:3625
-#: libraries/Util.class.php:3626 libraries/Util.class.php:4329
-#: libraries/Util.class.php:4346 libraries/config.values.php:41
+#: libraries/Util.class.php:3341 libraries/Util.class.php:3351
+#: libraries/Util.class.php:3357 libraries/Util.class.php:3631
+#: libraries/Util.class.php:3632 libraries/Util.class.php:4335
+#: libraries/Util.class.php:4352 libraries/config.values.php:41
 #: libraries/config.values.php:49 libraries/config.values.php:111
 #: libraries/config.values.php:117
 #: libraries/navigation/Nodes/Node_Table.class.php:286
 msgid "Search"
 msgstr "Пребарување"
 
-#: libraries/Menu.class.php:338 libraries/Util.class.php:3336
-#: libraries/Util.class.php:3346 libraries/Util.class.php:3627
-#: libraries/Util.class.php:3628 libraries/Util.class.php:4347
+#: libraries/Menu.class.php:338 libraries/Util.class.php:3342
+#: libraries/Util.class.php:3352 libraries/Util.class.php:3633
+#: libraries/Util.class.php:3634 libraries/Util.class.php:4353
 #: libraries/config.values.php:42 libraries/config.values.php:50
 #: libraries/config.values.php:118
 #: libraries/navigation/Nodes/Node_Table.class.php:289
@@ -4363,30 +4374,30 @@ msgid "Insert"
 msgstr "Нов запис"
 
 #: libraries/Menu.class.php:362 libraries/Menu.class.php:467
-#: libraries/Util.class.php:4334 libraries/Util.class.php:4350
+#: libraries/Util.class.php:4340 libraries/Util.class.php:4356
 #: libraries/config.values.php:106 libraries/server_common.lib.php:51
 #: libraries/server_privileges.lib.php:2370
 #: libraries/server_privileges.lib.php:3158
-#: libraries/server_privileges.lib.php:4221
+#: libraries/server_privileges.lib.php:4247
 msgid "Privileges"
 msgstr "Привилегии"
 
 #: libraries/Menu.class.php:371 libraries/Menu.class.php:379
-#: libraries/Menu.class.php:459 libraries/Util.class.php:3338
-#: libraries/Util.class.php:3352 libraries/Util.class.php:4333
-#: libraries/Util.class.php:4351 libraries/config.values.php:112
+#: libraries/Menu.class.php:459 libraries/Util.class.php:3344
+#: libraries/Util.class.php:3358 libraries/Util.class.php:4339
+#: libraries/Util.class.php:4357 libraries/config.values.php:112
 #: view_operations.php:92
 msgid "Operations"
 msgstr "Операции"
 
 #: libraries/Menu.class.php:384 libraries/Menu.class.php:492
-#: libraries/Util.class.php:4338 libraries/Util.class.php:4352
+#: libraries/Util.class.php:4344 libraries/Util.class.php:4358
 #: libraries/relation.lib.php:255
 msgid "Tracking"
 msgstr ""
 
 #: libraries/Menu.class.php:397 libraries/Menu.class.php:486
-#: libraries/Util.class.php:4337 libraries/Util.class.php:4353
+#: libraries/Util.class.php:4343 libraries/Util.class.php:4359
 #: libraries/navigation/Nodes/Node_Trigger_Container.class.php:24
 #: libraries/plugins/export/ExportHtmlword.class.php:557
 #: libraries/plugins/export/ExportOdt.class.php:685
@@ -4403,16 +4414,16 @@ msgstr ""
 msgid "Database seems to be empty!"
 msgstr ""
 
-#: libraries/Menu.class.php:439 libraries/Util.class.php:4330
+#: libraries/Menu.class.php:439 libraries/Util.class.php:4336
 msgid "Query"
 msgstr "Упит по пример"
 
-#: libraries/Menu.class.php:472 libraries/Util.class.php:4335
+#: libraries/Menu.class.php:472 libraries/Util.class.php:4341
 #: libraries/rte/rte_words.lib.php:36
 msgid "Routines"
 msgstr "Рутини"
 
-#: libraries/Menu.class.php:479 libraries/Util.class.php:4336
+#: libraries/Menu.class.php:479 libraries/Util.class.php:4342
 #: libraries/navigation/Nodes/Node_Event_Container.class.php:26
 #: libraries/plugins/export/ExportSql.class.php:940
 #: libraries/plugins/export/ExportXml.class.php:107
@@ -4420,22 +4431,22 @@ msgstr "Рутини"
 msgid "Events"
 msgstr ""
 
-#: libraries/Menu.class.php:498 libraries/Util.class.php:4339
+#: libraries/Menu.class.php:498 libraries/Util.class.php:4345
 msgid "Designer"
 msgstr ""
 
-#: libraries/Menu.class.php:507 libraries/Util.class.php:4340
-#: templates/structure/check_all_tables.phtml:35
+#: libraries/Menu.class.php:507 libraries/Util.class.php:4346
+#: templates/database/structure/check_all_tables.phtml:35
 #, fuzzy
 #| msgid "Add/Delete Field Columns"
 msgid "Central columns"
 msgstr "Додади/избриши колона"
 
-#: libraries/Menu.class.php:544 libraries/Util.class.php:4312
+#: libraries/Menu.class.php:544 libraries/Util.class.php:4318
 #: libraries/config.values.php:103 libraries/config/messages.inc.php:266
 #: libraries/config/messages.inc.php:341
 #: libraries/navigation/NavigationTree.class.php:1239
-#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4332
+#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4358
 msgid "Databases"
 msgstr "База на податоци"
 
@@ -4446,35 +4457,35 @@ msgid "User accounts"
 msgstr "Корисник"
 
 #: libraries/Menu.class.php:595 libraries/ServerStatusData.class.php:121
-#: libraries/Util.class.php:4319 libraries/server_common.lib.php:36
+#: libraries/Util.class.php:4325 libraries/server_common.lib.php:36
 msgid "Binary log"
 msgstr "Бинарен дневник"
 
 #: libraries/Menu.class.php:601 libraries/ServerStatusData.class.php:126
-#: libraries/Util.class.php:4320 libraries/server_common.lib.php:42
-#: templates/structure/body_for_table_summary.phtml:10
-#: templates/structure/table_header.phtml:27
+#: libraries/Util.class.php:4326 libraries/server_common.lib.php:42
+#: templates/database/structure/body_for_table_summary.phtml:10
+#: templates/database/structure/table_header.phtml:27
 #, fuzzy
 msgid "Replication"
 msgstr "Релации"
 
 #: libraries/Menu.class.php:606 libraries/ServerStatusData.class.php:193
-#: libraries/Util.class.php:4321 libraries/config.values.php:105
+#: libraries/Util.class.php:4327 libraries/config.values.php:105
 #: libraries/server_engines.lib.php:108 libraries/server_engines.lib.php:112
 #: libraries/sql_query_form.lib.php:421
 msgid "Variables"
 msgstr "Променливи"
 
-#: libraries/Menu.class.php:610 libraries/Util.class.php:4322
+#: libraries/Menu.class.php:610 libraries/Util.class.php:4328
 msgid "Charsets"
 msgstr "Кодни страници"
 
-#: libraries/Menu.class.php:615 libraries/Util.class.php:4323
+#: libraries/Menu.class.php:615 libraries/Util.class.php:4329
 #: libraries/server_common.lib.php:33 libraries/server_plugins.lib.php:27
 msgid "Plugins"
 msgstr ""
 
-#: libraries/Menu.class.php:626 libraries/Util.class.php:4324
+#: libraries/Menu.class.php:626 libraries/Util.class.php:4330
 msgid "Engines"
 msgstr "Складишта"
 
@@ -4501,7 +4512,7 @@ msgid_plural "%1$d rows inserted."
 msgstr[0] "Нема селектирани записи"
 msgstr[1] "Нема селектирани записи"
 
-#: libraries/PDF.class.php:70 libraries/Util.class.php:2521
+#: libraries/PDF.class.php:70 libraries/Util.class.php:2527
 #: libraries/browse_foreigners.lib.php:327
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:865
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:890
@@ -4528,7 +4539,7 @@ msgid "Could not save favorite table!"
 msgstr "Документација"
 
 #: libraries/RecentFavoriteTable.class.php:212
-#: templates/structure/favorite_anchor.phtml:12
+#: templates/database/structure/favorite_anchor.phtml:12
 #, fuzzy
 #| msgid "Remove database"
 msgid "Remove from Favorites"
@@ -4717,7 +4728,7 @@ msgid ""
 msgstr "Нема детални информации за статусот на овој вид на складиште."
 
 #: libraries/StorageEngine.class.php:373
-#: templates/structure/body_for_table_summary.phtml:50
+#: templates/database/structure/body_for_table_summary.phtml:50
 #, php-format
 msgid "%s is the default storage engine on this MySQL server."
 msgstr "%s е основно складиште на овој MySQL сервер."
@@ -5143,10 +5154,10 @@ msgstr ""
 
 #: libraries/Util.class.php:726 libraries/rte/rte_events.lib.php:110
 #: libraries/rte/rte_events.lib.php:119 libraries/rte/rte_events.lib.php:150
-#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:153
-#: libraries/rte/rte_routines.lib.php:162
-#: libraries/rte/rte_routines.lib.php:235
-#: libraries/rte/rte_routines.lib.php:1366
+#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:223
+#: libraries/rte/rte_routines.lib.php:250
+#: libraries/rte/rte_routines.lib.php:372
+#: libraries/rte/rte_routines.lib.php:1457
 #: libraries/rte/rte_triggers.lib.php:86 libraries/rte/rte_triggers.lib.php:95
 #: libraries/rte/rte_triggers.lib.php:127
 msgid "MySQL said: "
@@ -5192,78 +5203,81 @@ msgstr "Нед"
 msgid "%B %d, %Y at %I:%M %p"
 msgstr "%d. %B %Y. во %H:%M"
 
-#: libraries/Util.class.php:2019
+#: libraries/Util.class.php:2025
 #, php-format
 msgid "%s days, %s hours, %s minutes and %s seconds"
 msgstr "%s денови, %s часови, %s минути и %s секунди"
 
-#: libraries/Util.class.php:2112
+#: libraries/Util.class.php:2118
 #, fuzzy
 #| msgid "Routines"
 msgid "Missing parameter:"
 msgstr "Рутини"
 
-#: libraries/Util.class.php:2645
+#: libraries/Util.class.php:2651
 #, php-format
 msgid "Jump to database \"%s\"."
 msgstr "Премин на базата \"%s\"."
 
-#: libraries/Util.class.php:2670
+#: libraries/Util.class.php:2676
 #, php-format
 msgid "The %s functionality is affected by a known bug, see %s"
 msgstr ""
 
-#: libraries/Util.class.php:2881
+#: libraries/Util.class.php:2887
 msgid "Click to toggle"
 msgstr ""
 
-#: libraries/Util.class.php:3542 prefs_manage.php:248
+#: libraries/Util.class.php:3548 prefs_manage.php:248
 msgid "Browse your computer:"
 msgstr ""
 
-#: libraries/Util.class.php:3567
+#: libraries/Util.class.php:3573
 #, fuzzy, php-format
 #| msgid "web server upload directory"
 msgid "Select from the web server upload directory <b>%s</b>:"
 msgstr "директориум за праќање на веб серверот "
 
-#: libraries/Util.class.php:3596 libraries/insert_edit.lib.php:1173
+#: libraries/Util.class.php:3602 libraries/insert_edit.lib.php:1171
 msgid "The directory you set for upload work cannot be reached."
 msgstr "Директориумот кој го избравте за праќање не е достапен."
 
-#: libraries/Util.class.php:3607
+#: libraries/Util.class.php:3613
 msgid "There are no files to upload!"
 msgstr ""
 
-#: libraries/Util.class.php:3632 libraries/Util.class.php:3633
-#: templates/structure/check_all_tables.phtml:15
+#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: templates/database/structure/check_all_tables.phtml:15
 msgid "Empty"
 msgstr "Испразни"
 
-#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: libraries/Util.class.php:3644 libraries/Util.class.php:3645
 msgid "Execute"
 msgstr ""
 
-#: libraries/Util.class.php:4152
+#: libraries/Util.class.php:4158
 msgid "Print"
 msgstr "Печати"
 
-#: libraries/Util.class.php:4257 templates/structure/row_stats_table.phtml:80
-#: templates/structure/table_header.phtml:95
+#: libraries/Util.class.php:4263
+#: templates/database/structure/table_header.phtml:95
+#: templates/table/structure/row_stats_table.phtml:80
 msgid "Creation"
 msgstr "Направено"
 
-#: libraries/Util.class.php:4263 templates/structure/row_stats_table.phtml:87
-#: templates/structure/table_header.phtml:106
+#: libraries/Util.class.php:4269
+#: templates/database/structure/table_header.phtml:106
+#: templates/table/structure/row_stats_table.phtml:87
 msgid "Last update"
 msgstr "Последна измена"
 
-#: libraries/Util.class.php:4269 templates/structure/row_stats_table.phtml:94
-#: templates/structure/table_header.phtml:117
+#: libraries/Util.class.php:4275
+#: templates/database/structure/table_header.phtml:117
+#: templates/table/structure/row_stats_table.phtml:94
 msgid "Last check"
 msgstr "Последна проверка"
 
-#: libraries/Util.class.php:4315
+#: libraries/Util.class.php:4321
 #, fuzzy
 #| msgid "User"
 msgid "Users"
@@ -5288,16 +5302,16 @@ msgid "Use this value"
 msgstr "Користи ја оваа вредност"
 
 #: libraries/build_html_for_db.lib.php:33 libraries/import.lib.php:193
-#: templates/structure/actions_in_table_structure.phtml:113
-#: templates/structure/row_stats_table.phtml:42
-#: templates/structure/table_header.phtml:36
+#: templates/database/structure/table_header.phtml:36
+#: templates/table/structure/actions_in_table_structure.phtml:113
+#: templates/table/structure/row_stats_table.phtml:42
 msgid "Rows"
 msgstr "Записи"
 
 #: libraries/build_html_for_db.lib.php:48 libraries/engines/innodb.lib.php:171
-#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:186
-#: libraries/server_status.lib.php:298
-#: templates/structure/display_table_stats.phtml:40
+#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:195
+#: libraries/server_status.lib.php:307
+#: templates/table/structure/display_table_stats.phtml:40
 msgid "Total"
 msgstr "Вкупно"
 
@@ -5307,10 +5321,12 @@ msgid "Jump to database"
 msgstr "Базата на податоци не постои"
 
 #: libraries/build_html_for_db.lib.php:146
+#: templates/database/structure/structure_table_row.phtml:15
 msgid "Not replicated"
 msgstr ""
 
 #: libraries/build_html_for_db.lib.php:158
+#: templates/database/structure/structure_table_row.phtml:16
 #, fuzzy
 msgid "Replicated"
 msgstr "Релации"
@@ -5368,17 +5384,17 @@ msgstr ""
 #: libraries/plugins/export/ExportTexytext.class.php:425
 #: libraries/plugins/export/PMA_ExportPdf.class.php:307
 #: libraries/rte/rte_list.lib.php:73 libraries/rte/rte_list.lib.php:85
-#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:830
-#: libraries/rte/rte_routines.lib.php:1492 setup/frames/index.inc.php:162
+#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:921
+#: libraries/rte/rte_routines.lib.php:1583 setup/frames/index.inc.php:162
 #: templates/columns_definitions/table_fields_definitions.phtml:8
-#: templates/structure/table_structure_header.phtml:5
-#: templates/table/create_table.phtml:11
+#: templates/database/create_table.phtml:11
+#: templates/table/structure/table_structure_header.phtml:5
 msgid "Name"
 msgstr "Име"
 
 #: libraries/central_columns.lib.php:699
 #: libraries/central_columns.lib.php:1381
-#: libraries/rte/rte_routines.lib.php:832
+#: libraries/rte/rte_routines.lib.php:923
 #: templates/columns_definitions/table_fields_definitions.phtml:14
 msgid "Length/Values"
 msgstr "Должина/Вредност*"
@@ -5401,7 +5417,7 @@ msgid "Select a table"
 msgstr "Избери табели"
 
 #: libraries/central_columns.lib.php:804
-#: templates/structure/add_column.phtml:4
+#: templates/table/structure/add_column.phtml:4
 #, fuzzy
 #| msgid "Add %s field(s)"
 msgid "Add column"
@@ -5423,7 +5439,7 @@ msgstr "Додади %s полиња"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1002
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1025
 #: templates/columns_definitions/table_fields_definitions.phtml:36
-#: templates/structure/table_structure_header.phtml:8
+#: templates/table/structure/table_structure_header.phtml:8
 msgid "Attributes"
 msgstr "Атрибути"
 
@@ -5544,7 +5560,7 @@ msgid "Double click"
 msgstr ""
 
 #: libraries/config.values.php:95 libraries/config.values.php:124
-#: libraries/config/FormDisplay.tpl.php:221 libraries/relation.lib.php:97
+#: libraries/config/FormDisplay.tpl.php:232 libraries/relation.lib.php:97
 #: libraries/relation.lib.php:105
 msgid "Disabled"
 msgstr "Оневозможено"
@@ -5734,21 +5750,21 @@ msgstr ""
 msgid "maximum %s"
 msgstr ""
 
-#: libraries/config/FormDisplay.tpl.php:219
+#: libraries/config/FormDisplay.tpl.php:230
 msgid "This setting is disabled, it will not be applied to your configuration."
 msgstr ""
 
-#: libraries/config/FormDisplay.tpl.php:313
+#: libraries/config/FormDisplay.tpl.php:324
 #, php-format
 msgid "Set value: %s"
 msgstr ""
 
-#: libraries/config/FormDisplay.tpl.php:318
+#: libraries/config/FormDisplay.tpl.php:329
 #: libraries/config/messages.inc.php:610
 msgid "Restore default value"
 msgstr ""
 
-#: libraries/config/FormDisplay.tpl.php:332
+#: libraries/config/FormDisplay.tpl.php:343
 msgid "Allow users to customize this value"
 msgstr ""
 
@@ -6185,7 +6201,7 @@ msgstr "Кодна страна на податотеката:"
 
 #: libraries/config/messages.inc.php:136 libraries/config/messages.inc.php:152
 #: libraries/sql_query_form.lib.php:247
-#: templates/structure/row_stats_table.phtml:7
+#: templates/table/structure/row_stats_table.phtml:7
 msgid "Format"
 msgstr "Формат"
 
@@ -6750,7 +6766,7 @@ msgstr ""
 
 #: libraries/config/messages.inc.php:332
 #: libraries/plugins/export/ExportPdf.class.php:279
-#: templates/structure/secondary_tabs.phtml:8
+#: templates/table/secondary_tabs.phtml:8
 #, fuzzy
 #| msgid "Databases"
 msgid "Table structure"
@@ -8365,110 +8381,35 @@ msgstr "Microsoft Word 2000"
 msgid "OpenDocument Text"
 msgstr "Документација"
 
-#: libraries/controllers/StructureController.class.php:465
+#: libraries/controllers/DatabaseStructureController.class.php:405
 #: tbl_operations.php:382
 #, php-format
 msgid "Table %s has been emptied."
 msgstr "Табелата %s е испразнета."
 
-#: libraries/controllers/StructureController.class.php:486
+#: libraries/controllers/DatabaseStructureController.class.php:426
 #: tbl_operations.php:400 view_operations.php:119
 #, fuzzy, php-format
 #| msgid "View %s has been dropped."
 msgid "View %s has been dropped."
 msgstr "Прегледот %s е избришан"
 
-#: libraries/controllers/StructureController.class.php:487
+#: libraries/controllers/DatabaseStructureController.class.php:427
 #: tbl_operations.php:401
 #, fuzzy, php-format
 #| msgid "Table %s has been dropped."
 msgid "Table %s has been dropped."
 msgstr "Табелата %s е избришана"
 
-#: libraries/controllers/StructureController.class.php:797
-#, php-format
-msgid "The name '%s' is a MySQL reserved keyword."
-msgid_plural "The names '%s' are MySQL reserved keywords."
-msgstr[0] ""
-msgstr[1] ""
-
-#: libraries/controllers/StructureController.class.php:875
-#, fuzzy
-#| msgid "No rows selected"
-msgid "No column selected."
-msgstr "Нема селектирани записи"
-
-#: libraries/controllers/StructureController.class.php:1049
+#: libraries/controllers/DatabaseStructureController.class.php:733
 msgid "Favorite List is full!"
 msgstr ""
 
-#: libraries/controllers/StructureController.class.php:1272
-#, fuzzy
-#| msgid "The selected users have been deleted successfully."
-msgid "The columns have been moved successfully."
-msgstr "Изабраните корисници успешно се избришани."
-
-#: libraries/controllers/StructureController.class.php:1535
-#, fuzzy, php-format
-msgid ""
-"Table %1$s has been altered successfully. Privileges have been adjusted."
-msgstr "Изабраните корисници успешно се избришани."
-
-#: libraries/controllers/StructureController.class.php:1541
-#: libraries/controllers/TableIndexesController.class.php:161
-#: tbl_addfield.php:92
-#, fuzzy, php-format
-msgid "Table %1$s has been altered successfully."
-msgstr "Изабраните корисници успешно се избришани."
-
-#: libraries/controllers/StructureController.class.php:1588
-#: libraries/tracking.lib.php:1094
-#, fuzzy
-#| msgid "Query type"
-msgid "Query error"
-msgstr "Вид на упит"
-
-#: libraries/controllers/StructureController.class.php:1806
+#: libraries/controllers/DatabaseStructureController.class.php:947
 #: libraries/mysql_charsets.lib.php:366 libraries/mysql_charsets.lib.php:373
 msgid "unknown"
 msgstr "непознат"
 
-#: libraries/controllers/StructureController.class.php:1957
-#: templates/structure/check_all_table_column.phtml:11
-msgid "Change"
-msgstr "Промени"
-
-#: libraries/controllers/StructureController.class.php:1961
-#: libraries/controllers/StructureController.class.php:1966
-#: libraries/navigation/Nodes/Node_Index.class.php:30
-#: libraries/tracking.lib.php:926
-#: templates/columns_definitions/column_indexes.phtml:16
-#: templates/columns_definitions/table_fields_definitions.phtml:57
-#: templates/structure/check_all_table_column.phtml:30
-#: templates/structure/display_structure.phtml:79
-#: templates/structure/display_table_stats.phtml:19
-msgid "Index"
-msgstr "Клуч"
-
-#: libraries/controllers/StructureController.class.php:1963
-#: libraries/controllers/StructureController.class.php:1968
-#: templates/columns_definitions/column_indexes.phtml:27
-#: templates/structure/check_all_table_column.phtml:37
-msgid "Spatial"
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1964
-#: libraries/controllers/StructureController.class.php:1969
-#: templates/columns_definitions/column_indexes.phtml:22
-#: templates/structure/check_all_table_column.phtml:47
-msgid "Fulltext"
-msgstr "Текст клуч"
-
-#: libraries/controllers/StructureController.class.php:1970
-#, fuzzy
-msgid "Distinct values"
-msgstr "Прегледни ги надворешните вредности"
-
 #: libraries/controllers/TableChartController.class.php:82
 #: libraries/controllers/TableGisVisualizationController.class.php:101
 msgid "No SQL query was set to fetch data."
@@ -8484,13 +8425,20 @@ msgstr ""
 msgid "No data to display"
 msgstr "Базата на податоци не постои"
 
-#: libraries/controllers/TableRelationController.class.php:217
+#: libraries/controllers/TableIndexesController.class.php:161
+#: libraries/controllers/TableStructureController.class.php:736
+#: tbl_addfield.php:92
+#, fuzzy, php-format
+msgid "Table %1$s has been altered successfully."
+msgstr "Изабраните корисници успешно се избришани."
+
+#: libraries/controllers/TableRelationController.class.php:218
 #, fuzzy
 #| msgid "Thread %s was successfully killed."
 msgid "Display column was successfully updated."
 msgstr "Процесот %s е успешно прекинат."
 
-#: libraries/controllers/TableRelationController.class.php:283
+#: libraries/controllers/TableRelationController.class.php:288
 #, fuzzy
 msgid "Internal relations were successfully updated."
 msgstr "Внатрешни релации"
@@ -8508,11 +8456,79 @@ msgid "Zoom search"
 msgstr "Пребарување"
 
 #: libraries/controllers/TableSearchController.class.php:852
-#: templates/table/selection_form.phtml:59
+#: templates/table/search/selection_form.phtml:59
 #, fuzzy
 msgid "Find and replace"
 msgstr "SQL упит"
 
+#: libraries/controllers/TableStructureController.class.php:163
+#, php-format
+msgid "The name '%s' is a MySQL reserved keyword."
+msgid_plural "The names '%s' are MySQL reserved keywords."
+msgstr[0] ""
+msgstr[1] ""
+
+#: libraries/controllers/TableStructureController.class.php:241
+#, fuzzy
+#| msgid "No rows selected"
+msgid "No column selected."
+msgstr "Нема селектирани записи"
+
+#: libraries/controllers/TableStructureController.class.php:467
+#, fuzzy
+#| msgid "The selected users have been deleted successfully."
+msgid "The columns have been moved successfully."
+msgstr "Изабраните корисници успешно се избришани."
+
+#: libraries/controllers/TableStructureController.class.php:730
+#, fuzzy, php-format
+msgid ""
+"Table %1$s has been altered successfully. Privileges have been adjusted."
+msgstr "Изабраните корисници успешно се избришани."
+
+#: libraries/controllers/TableStructureController.class.php:783
+#: libraries/tracking.lib.php:1094
+#, fuzzy
+#| msgid "Query type"
+msgid "Query error"
+msgstr "Вид на упит"
+
+#: libraries/controllers/TableStructureController.class.php:948
+#: templates/table/structure/check_all_table_column.phtml:11
+msgid "Change"
+msgstr "Промени"
+
+#: libraries/controllers/TableStructureController.class.php:952
+#: libraries/controllers/TableStructureController.class.php:957
+#: libraries/navigation/Nodes/Node_Index.class.php:30
+#: libraries/tracking.lib.php:926
+#: templates/columns_definitions/column_indexes.phtml:16
+#: templates/columns_definitions/table_fields_definitions.phtml:57
+#: templates/table/structure/check_all_table_column.phtml:30
+#: templates/table/structure/display_structure.phtml:79
+#: templates/table/structure/display_table_stats.phtml:19
+msgid "Index"
+msgstr "Клуч"
+
+#: libraries/controllers/TableStructureController.class.php:954
+#: libraries/controllers/TableStructureController.class.php:959
+#: templates/columns_definitions/column_indexes.phtml:27
+#: templates/table/structure/check_all_table_column.phtml:37
+msgid "Spatial"
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:955
+#: libraries/controllers/TableStructureController.class.php:960
+#: templates/columns_definitions/column_indexes.phtml:22
+#: templates/table/structure/check_all_table_column.phtml:47
+msgid "Fulltext"
+msgstr "Текст клуч"
+
+#: libraries/controllers/TableStructureController.class.php:963
+#, fuzzy
+msgid "Distinct values"
+msgstr "Прегледни ги надворешните вредности"
+
 #: libraries/core.lib.php:306
 #, php-format
 msgid "The %s extension is missing. Please check your PHP configuration."
@@ -8557,7 +8573,7 @@ msgid "No Password"
 msgstr "Нема лозинка"
 
 #: libraries/display_change_password.lib.php:68
-#: libraries/plugins/auth/AuthenticationCookie.class.php:199
+#: libraries/plugins/auth/AuthenticationCookie.class.php:187
 #: libraries/replication_gui.lib.php:422 libraries/replication_gui.lib.php:862
 #: libraries/server_privileges.lib.php:1640
 msgid "Password:"
@@ -9380,12 +9396,12 @@ msgid "Dump has been saved to file %s."
 msgstr "Содржината на базата на податоци е сочувана во податотеката %s."
 
 #: libraries/import.lib.php:202 libraries/insert_edit.lib.php:124
-#: libraries/rte/rte_routines.lib.php:1353 libraries/sql.lib.php:1312
+#: libraries/rte/rte_routines.lib.php:1444 libraries/sql.lib.php:1306
 #: tbl_get_field.php:44
 msgid "MySQL returned an empty result set (i.e. zero rows)."
 msgstr "MySQL врати празен резултат (нула записи)."
 
-#: libraries/import.lib.php:265 libraries/sql.lib.php:1326
+#: libraries/import.lib.php:265 libraries/sql.lib.php:1320
 msgid "[ROLLBACK occurred.]"
 msgstr ""
 
@@ -9451,14 +9467,14 @@ msgstr "Направи клуч на&nbsp;%s&nbsp;колони"
 
 #: libraries/insert_edit.lib.php:233
 #: libraries/navigation/Nodes/Node_DatabaseChild.class.php:48
-#: templates/designer/table_list.phtml:40
+#: templates/database/designer/table_list.phtml:40
 msgid "Hide"
 msgstr ""
 
 #: libraries/insert_edit.lib.php:249
 #: libraries/navigation/Nodes/Node_Function.class.php:32
-#: libraries/rte/rte_routines.lib.php:1495
-#: templates/table/table_header.phtml:4
+#: libraries/rte/rte_routines.lib.php:1586
+#: templates/table/search/table_header.phtml:4
 msgid "Function"
 msgstr "Функција"
 
@@ -9475,88 +9491,89 @@ msgstr ""
 "Поради големина на полето<br />можеби нема да може да ја менувате неговата "
 "содржина"
 
-#: libraries/insert_edit.lib.php:1050
+#: libraries/insert_edit.lib.php:1048
 msgid "Binary - do not edit"
 msgstr "Бинарен - не менувај"
 
-#: libraries/insert_edit.lib.php:1176 libraries/server_privileges.lib.php:470
-#: templates/table/options.phtml:36
+#: libraries/insert_edit.lib.php:1174 libraries/server_privileges.lib.php:470
+#: templates/table/search/options.phtml:36
 msgid "Or"
 msgstr "или"
 
-#: libraries/insert_edit.lib.php:1177
+#: libraries/insert_edit.lib.php:1175
 #, fuzzy
 #| msgid "web server upload directory"
 msgid "web server upload directory:"
 msgstr "директориум за праќање на веб серверот"
 
-#: libraries/insert_edit.lib.php:1348 templates/table/input_box.phtml:49
+#: libraries/insert_edit.lib.php:1346
+#: templates/table/search/input_box.phtml:49
 #, fuzzy
 #| msgid "Insert"
 msgid "Edit/Insert"
 msgstr "Нов запис"
 
-#: libraries/insert_edit.lib.php:1398
+#: libraries/insert_edit.lib.php:1396
 #, php-format
 msgid "Continue insertion with %s rows"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1428
+#: libraries/insert_edit.lib.php:1426
 msgid "and then"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1461
+#: libraries/insert_edit.lib.php:1459
 msgid "Insert as new row"
 msgstr "Внеси како нов запис"
 
-#: libraries/insert_edit.lib.php:1464
+#: libraries/insert_edit.lib.php:1462
 msgid "Insert as new row and ignore errors"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1467
+#: libraries/insert_edit.lib.php:1465
 msgid "Show insert query"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1487
+#: libraries/insert_edit.lib.php:1485
 msgid "Go back to previous page"
 msgstr "Назад на претходната страница"
 
-#: libraries/insert_edit.lib.php:1490
+#: libraries/insert_edit.lib.php:1488
 msgid "Insert another new row"
 msgstr "Додади уште еден нов запис"
 
-#: libraries/insert_edit.lib.php:1495
+#: libraries/insert_edit.lib.php:1493
 msgid "Go back to this page"
 msgstr "Врати се на оваа страница"
 
-#: libraries/insert_edit.lib.php:1518
+#: libraries/insert_edit.lib.php:1516
 msgid "Edit next row"
 msgstr "Ажурирање на следниот запис"
 
-#: libraries/insert_edit.lib.php:1540
+#: libraries/insert_edit.lib.php:1538
 msgid ""
 "Use TAB key to move from value to value, or CTRL+arrows to move anywhere"
 msgstr ""
 "Користете го TAB тастерот за движење од поле во поле, или CTRL+стрелка за "
 "слободно движење"
 
-#: libraries/insert_edit.lib.php:1577 libraries/replication_gui.lib.php:542
-#: libraries/rte/rte_routines.lib.php:1497
+#: libraries/insert_edit.lib.php:1575 libraries/replication_gui.lib.php:542
+#: libraries/rte/rte_routines.lib.php:1588
 #: libraries/server_status_variables.lib.php:220
-#: templates/designer/having_query_panel.phtml:100
-#: templates/designer/options_panel.phtml:73
-#: templates/designer/options_panel.phtml:239
-#: templates/designer/where_query_panel.phtml:69
-#: templates/table/table_header.phtml:10
-#: templates/table/zoom_result_form.phtml:35
+#: templates/database/designer/having_query_panel.phtml:100
+#: templates/database/designer/options_panel.phtml:73
+#: templates/database/designer/options_panel.phtml:239
+#: templates/database/designer/where_query_panel.phtml:69
+#: templates/table/search/table_header.phtml:10
+#: templates/table/search/zoom_result_form.phtml:35
 msgid "Value"
 msgstr "Вредност"
 
-#: libraries/insert_edit.lib.php:1937 libraries/sql.lib.php:1309
+#: libraries/insert_edit.lib.php:1935 libraries/sql.lib.php:1303
 msgid "Showing SQL query"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1962 libraries/sql.lib.php:1287
+#: libraries/insert_edit.lib.php:1960 libraries/sql.lib.php:1281
 #, php-format
 msgid "Inserted row id: %1$d"
 msgstr ""
@@ -10004,7 +10021,7 @@ msgstr ""
 #: libraries/navigation/Nodes/Node_View_Container.class.php:26
 #: libraries/navigation/Nodes/Node_View_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:129
-#: templates/structure/show_create.phtml:30
+#: templates/database/structure/show_create.phtml:30
 #, fuzzy
 #| msgid "View"
 msgid "Views"
@@ -10314,7 +10331,7 @@ msgstr "Немате право на пристап овде!"
 
 #: libraries/operations.lib.php:101 libraries/operations.lib.php:249
 #: libraries/operations.lib.php:869 libraries/operations.lib.php:963
-#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:907
+#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:998
 #: templates/columns_definitions/table_fields_definitions.phtml:47
 #, fuzzy
 #| msgid "Edit Privileges"
@@ -10409,22 +10426,22 @@ msgid "Switch to copied table"
 msgstr "Премини на копираната табела"
 
 #: libraries/operations.lib.php:1360
-#: templates/structure/check_all_tables.phtml:18
+#: templates/database/structure/check_all_tables.phtml:18
 msgid "Table maintenance"
 msgstr "Можете да извршите"
 
 #: libraries/operations.lib.php:1398
-#: templates/structure/check_all_tables.phtml:19
+#: templates/database/structure/check_all_tables.phtml:19
 msgid "Analyze table"
 msgstr "Анализа на табелата"
 
 #: libraries/operations.lib.php:1413
-#: templates/structure/check_all_tables.phtml:20
+#: templates/database/structure/check_all_tables.phtml:20
 msgid "Check table"
 msgstr "Проверка на табелата"
 
 #: libraries/operations.lib.php:1428
-#: templates/structure/check_all_tables.phtml:22
+#: templates/database/structure/check_all_tables.phtml:22
 #, fuzzy
 #| msgid "Check table"
 msgid "Checksum table"
@@ -10446,18 +10463,19 @@ msgid "Flush the table (FLUSH)"
 msgstr "Освежување на табелата (\"FLUSH\")"
 
 #: libraries/operations.lib.php:1477
-#: templates/structure/check_all_tables.phtml:23
-#: templates/structure/display_table_stats.phtml:56
+#: templates/database/structure/check_all_tables.phtml:23
+#: templates/table/structure/display_table_stats.phtml:56
 msgid "Optimize table"
 msgstr "Оптимизација на табелата"
 
 #: libraries/operations.lib.php:1492
-#: templates/structure/check_all_tables.phtml:24
+#: templates/database/structure/check_all_tables.phtml:24
 msgid "Repair table"
 msgstr "Поправка на табелата"
 
 #: libraries/operations.lib.php:1538
-#: templates/structure/check_all_tables.phtml:14 view_operations.php:127
+#: templates/database/structure/check_all_tables.phtml:14
+#: view_operations.php:127
 #, fuzzy
 #| msgid "Dumping data for table"
 msgid "Delete data or table"
@@ -10591,7 +10609,7 @@ msgid "Cannot connect: invalid settings."
 msgstr "Не може да се поврзам: лоши подесувања."
 
 #: libraries/plugins/auth/AuthenticationConfig.class.php:108
-#: libraries/plugins/auth/AuthenticationCookie.class.php:134
+#: libraries/plugins/auth/AuthenticationCookie.class.php:122
 #: libraries/plugins/auth/AuthenticationHttp.class.php:96
 #, php-format
 msgid "Welcome to %s"
@@ -10620,38 +10638,38 @@ msgstr ""
 msgid "Retry to connect"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:146
+#: libraries/plugins/auth/AuthenticationCookie.class.php:134
 msgid "Your session has expired. Please log in again."
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:170
+#: libraries/plugins/auth/AuthenticationCookie.class.php:158
 msgid "Log in"
 msgstr "Најави се"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:178
-#: libraries/plugins/auth/AuthenticationCookie.class.php:188
+#: libraries/plugins/auth/AuthenticationCookie.class.php:166
+#: libraries/plugins/auth/AuthenticationCookie.class.php:176
 msgid "You can enter hostname/IP address and port separated by space."
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:193
+#: libraries/plugins/auth/AuthenticationCookie.class.php:181
 msgid "Username:"
 msgstr "Корисничко име:"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:205
+#: libraries/plugins/auth/AuthenticationCookie.class.php:193
 #, fuzzy
 #| msgid "Server Choice"
 msgid "Server Choice:"
 msgstr "Избор на сервер"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:386
+#: libraries/plugins/auth/AuthenticationCookie.class.php:374
 msgid "Entered captcha is wrong, try again!"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:396
+#: libraries/plugins/auth/AuthenticationCookie.class.php:384
 msgid "Please enter correct captcha!"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:423
+#: libraries/plugins/auth/AuthenticationCookie.class.php:411
 #, fuzzy
 #| msgid "Cannot log in to the MySQL server"
 msgid "You are not allowed to log in to this MySQL server!"
@@ -10763,7 +10781,7 @@ msgstr "Пратено"
 #: libraries/plugins/export/ExportOdt.class.php:593
 #: libraries/plugins/export/ExportTexytext.class.php:428
 #: libraries/plugins/export/PMA_ExportPdf.class.php:313
-#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:984
 #: libraries/rte/rte_triggers.lib.php:377
 #, fuzzy
 #| msgid "Description"
@@ -11121,7 +11139,7 @@ msgid "Last check:"
 msgstr "Последна проверка"
 
 #: libraries/plugins/export/ExportSql.class.php:1399
-#: templates/structure/structure_table_row.phtml:183
+#: templates/database/structure/structure_table_row.phtml:183
 msgid "in use"
 msgstr "се користи"
 
@@ -11319,22 +11337,16 @@ msgstr ""
 msgid "The imported file does not contain any data!"
 msgstr ""
 
-#: libraries/plugins/import/ImportSql.class.php:169
+#: libraries/plugins/import/ImportSql.class.php:72
 #, fuzzy
 #| msgid "MySQL&nbsp;4.0 compatible"
 msgid "SQL compatibility mode:"
 msgstr "MySQL&nbsp;4.0 компатибилно"
 
-#: libraries/plugins/import/ImportSql.class.php:181
+#: libraries/plugins/import/ImportSql.class.php:84
 msgid "Do not use <code>AUTO_INCREMENT</code> for zero values"
 msgstr ""
 
-#: libraries/plugins/import/ImportSql.class.php:195
-#, fuzzy
-#| msgid "Read misses"
-msgid "Read as multibytes"
-msgstr "Промашувања при читање"
-
 #: libraries/plugins/import/ImportXml.class.php:54
 msgid "XML"
 msgstr "XML"
@@ -11379,7 +11391,7 @@ msgid "Show grid"
 msgstr "Прикажи мрежа"
 
 #: libraries/plugins/schema/SchemaPdf.class.php:94
-#: templates/structure/print_view_data_dictionary_link.phtml:6
+#: templates/database/structure/print_view_data_dictionary_link.phtml:6
 msgid "Data Dictionary"
 msgstr "Речник на податоци"
 
@@ -11411,7 +11423,7 @@ msgid "The %s table doesn't exist!"
 msgstr "Табелата \"%s\" не постои!"
 
 #: libraries/plugins/schema/eps/Eps_Relation_Schema.class.php:321
-#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:309
+#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:323
 #, fuzzy, php-format
 #| msgid "Schema of the \"%s\" database - Page %s"
 msgid "Schema of the %s database - Page %s"
@@ -11440,7 +11452,7 @@ msgstr "Содржина"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1005
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1028
 #: libraries/tracking.lib.php:884
-#: templates/structure/table_structure_header.phtml:11
+#: templates/table/structure/table_structure_header.phtml:11
 msgid "Extra"
 msgstr "Дополнително"
 
@@ -11850,51 +11862,51 @@ msgstr ""
 msgid "Create the needed tables with the <code>%screate_tables.sql</code>."
 msgstr ""
 
-#: libraries/relation.lib.php:360
+#: libraries/relation.lib.php:357
 msgid "Create a pma user and give access to these tables."
 msgstr ""
 
-#: libraries/relation.lib.php:365
+#: libraries/relation.lib.php:360
 msgid ""
 "Enable advanced features in configuration file (<code>config.inc.php</"
 "code>), for example by starting from <code>config.sample.inc.php</code>."
 msgstr ""
 
-#: libraries/relation.lib.php:373
+#: libraries/relation.lib.php:365
 msgid "Re-login to phpMyAdmin to load the updated configuration file."
 msgstr ""
 
-#: libraries/relation.lib.php:1612
+#: libraries/relation.lib.php:1607
 msgid "no description"
 msgstr "нема опис"
 
-#: libraries/relation.lib.php:1811
+#: libraries/relation.lib.php:1806
 msgid ""
 "You do not have necessary privileges to create a database named "
 "'phpmyadmin'. You may go to 'Operations' tab of any database to set up the "
 "phpMyAdmin configuration storage there."
 msgstr ""
 
-#: libraries/relation.lib.php:1928
+#: libraries/relation.lib.php:1923
 #, php-format
 msgid ""
 "%sCreate%s a database named 'phpmyadmin' and setup the phpMyAdmin "
 "configuration storage there."
 msgstr ""
 
-#: libraries/relation.lib.php:1936
+#: libraries/relation.lib.php:1931
 #, php-format
 msgid ""
 "%sCreate%s the phpMyAdmin configuration storage in the current database."
 msgstr ""
 
-#: libraries/relation.lib.php:1944
+#: libraries/relation.lib.php:1939
 #, php-format
 msgid "%sCreate%s missing phpMyAdmin configuration storage tables."
 msgstr ""
 
 #: libraries/replication_gui.lib.php:46 libraries/replication_gui.lib.php:343
-#: libraries/server_databases.lib.php:387
+#: libraries/server_databases.lib.php:398
 msgid "Master replication"
 msgstr ""
 
@@ -11950,7 +11962,7 @@ msgid ""
 msgstr ""
 
 #: libraries/replication_gui.lib.php:141
-#: libraries/server_databases.lib.php:389
+#: libraries/server_databases.lib.php:400
 msgid "Slave replication"
 msgstr ""
 
@@ -12234,10 +12246,10 @@ msgid "Master server changed successfully to %s."
 msgstr "Привилегиите се успешно вчитани."
 
 #: libraries/rte/rte_events.lib.php:106 libraries/rte/rte_events.lib.php:115
-#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:149
-#: libraries/rte/rte_routines.lib.php:158
-#: libraries/rte/rte_routines.lib.php:231
-#: libraries/rte/rte_routines.lib.php:1362
+#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:219
+#: libraries/rte/rte_routines.lib.php:246
+#: libraries/rte/rte_routines.lib.php:368
+#: libraries/rte/rte_routines.lib.php:1453
 #: libraries/rte/rte_triggers.lib.php:82 libraries/rte/rte_triggers.lib.php:91
 #: libraries/rte/rte_triggers.lib.php:123
 #, php-format
@@ -12259,7 +12271,7 @@ msgstr "Табелата %s е избришана"
 msgid "Event %1$s has been created."
 msgstr "Табелата %s е избришана"
 
-#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:251
+#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:266
 #: libraries/rte/rte_triggers.lib.php:144
 msgid "One or more errors have occurred while processing your request:"
 msgstr ""
@@ -12269,7 +12281,7 @@ msgstr ""
 msgid "Edit event"
 msgstr "Пратено"
 
-#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:794
+#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:885
 #: libraries/rte/rte_triggers.lib.php:323 view_create.php:180
 msgid "Details"
 msgstr ""
@@ -12284,7 +12296,7 @@ msgstr "Вид на настан"
 msgid "Event type"
 msgstr "Вид на настан"
 
-#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:817
+#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:908
 #, fuzzy, php-format
 #| msgid "Change"
 msgid "Change to %s"
@@ -12319,12 +12331,14 @@ msgstr "Крај"
 msgid "On completion preserve"
 msgstr "Комплетен INSERT (со имиња на полињата)"
 
-#: libraries/rte/rte_events.lib.php:491 libraries/rte/rte_routines.lib.php:930
+#: libraries/rte/rte_events.lib.php:491
+#: libraries/rte/rte_routines.lib.php:1021
 #: libraries/rte/rte_triggers.lib.php:383 view_create.php:209
 msgid "Definer"
 msgstr ""
 
-#: libraries/rte/rte_events.lib.php:535 libraries/rte/rte_routines.lib.php:997
+#: libraries/rte/rte_events.lib.php:535
+#: libraries/rte/rte_routines.lib.php:1088
 #: libraries/rte/rte_triggers.lib.php:422
 msgid "The definer must be in the \"username@hostname\" format!"
 msgstr ""
@@ -12350,9 +12364,9 @@ msgid "You must provide an event definition."
 msgstr ""
 
 #: libraries/rte/rte_export.lib.php:43 libraries/rte/rte_general.lib.php:72
-#: libraries/rte/rte_routines.lib.php:345
-#: libraries/rte/rte_routines.lib.php:1198
-#: libraries/rte/rte_routines.lib.php:1411
+#: libraries/rte/rte_routines.lib.php:153
+#: libraries/rte/rte_routines.lib.php:1289
+#: libraries/rte/rte_routines.lib.php:1502
 #, fuzzy
 msgid "Error in processing request:"
 msgstr "Листа на процеси"
@@ -12387,151 +12401,151 @@ msgid ""
 "problems."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:110
-#: libraries/rte/rte_routines.lib.php:1006
-#, php-format
-msgid "Invalid routine type: \"%s\""
-msgstr ""
-
-#: libraries/rte/rte_routines.lib.php:170
-msgid "Sorry, we failed to restore the dropped routine."
-msgstr ""
-
-#: libraries/rte/rte_routines.lib.php:211
-#, fuzzy, php-format
-#| msgid "Table %s has been dropped."
-msgid "Routine %1$s has been modified. Privileges have been adjusted."
-msgstr "Табелата %s е избришана"
-
-#: libraries/rte/rte_routines.lib.php:216
-#, fuzzy, php-format
-#| msgid "Table %s has been dropped."
-msgid "Routine %1$s has been modified."
-msgstr "Табелата %s е избришана"
-
-#: libraries/rte/rte_routines.lib.php:238
-#, fuzzy, php-format
-msgid "Routine %1$s has been created."
-msgstr "Табелата %s е избришана"
-
-#: libraries/rte/rte_routines.lib.php:315
+#: libraries/rte/rte_routines.lib.php:123
 #, fuzzy
 #| msgid "Routines"
 msgid "Edit routine"
 msgstr "Рутини"
 
-#: libraries/rte/rte_routines.lib.php:797
+#: libraries/rte/rte_routines.lib.php:200
+#: libraries/rte/rte_routines.lib.php:1097
+#, php-format
+msgid "Invalid routine type: \"%s\""
+msgstr ""
+
+#: libraries/rte/rte_routines.lib.php:253
+#, fuzzy, php-format
+msgid "Routine %1$s has been created."
+msgstr "Табелата %s е избришана"
+
+#: libraries/rte/rte_routines.lib.php:380
+msgid "Sorry, we failed to restore the dropped routine."
+msgstr ""
+
+#: libraries/rte/rte_routines.lib.php:439
+#, fuzzy, php-format
+#| msgid "Table %s has been dropped."
+msgid "Routine %1$s has been modified. Privileges have been adjusted."
+msgstr "Табелата %s е избришана"
+
+#: libraries/rte/rte_routines.lib.php:444
+#, fuzzy, php-format
+#| msgid "Table %s has been dropped."
+msgid "Routine %1$s has been modified."
+msgstr "Табелата %s е избришана"
+
+#: libraries/rte/rte_routines.lib.php:888
 #, fuzzy
 #| msgid "Routines"
 msgid "Routine name"
 msgstr "Рутини"
 
-#: libraries/rte/rte_routines.lib.php:823
+#: libraries/rte/rte_routines.lib.php:914
 msgid "Parameters"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:829
+#: libraries/rte/rte_routines.lib.php:920
 #, fuzzy
 #| msgid "Creation"
 msgid "Direction"
 msgstr "Направено"
 
-#: libraries/rte/rte_routines.lib.php:847
+#: libraries/rte/rte_routines.lib.php:938
 #, fuzzy
 #| msgid "Add new field"
 msgid "Add parameter"
 msgstr "Додади ново поле"
 
-#: libraries/rte/rte_routines.lib.php:851
+#: libraries/rte/rte_routines.lib.php:942
 #, fuzzy
 #| msgid "Remove database"
 msgid "Remove last parameter"
 msgstr "Избриши ја базата на податоци."
 
-#: libraries/rte/rte_routines.lib.php:856
+#: libraries/rte/rte_routines.lib.php:947
 msgid "Return type"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:862
+#: libraries/rte/rte_routines.lib.php:953
 #, fuzzy
 #| msgid "Length/Values"
 msgid "Return length/values"
 msgstr "Должина/Вредност*"
 
-#: libraries/rte/rte_routines.lib.php:868
+#: libraries/rte/rte_routines.lib.php:959
 #, fuzzy
 #| msgid "Table options"
 msgid "Return options"
 msgstr "Опции на табелата"
 
-#: libraries/rte/rte_routines.lib.php:899
+#: libraries/rte/rte_routines.lib.php:990
 msgid "Is deterministic"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:920
+#: libraries/rte/rte_routines.lib.php:1011
 msgid ""
 "You do not have sufficient privileges to perform this operation; Please "
 "refer to the documentation for more details"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:935
+#: libraries/rte/rte_routines.lib.php:1026
 #, fuzzy
 #| msgid "Query type"
 msgid "Security type"
 msgstr "Вид на упит"
 
-#: libraries/rte/rte_routines.lib.php:944
+#: libraries/rte/rte_routines.lib.php:1035
 msgid "SQL data access"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1013
+#: libraries/rte/rte_routines.lib.php:1104
 msgid "You must provide a routine name!"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1047
+#: libraries/rte/rte_routines.lib.php:1138
 #, php-format
 msgid "Invalid direction \"%s\" given for parameter."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1069
-#: libraries/rte/rte_routines.lib.php:1131
+#: libraries/rte/rte_routines.lib.php:1160
+#: libraries/rte/rte_routines.lib.php:1222
 msgid ""
 "You must provide length/values for routine parameters of type ENUM, SET, "
 "VARCHAR and VARBINARY."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1095
+#: libraries/rte/rte_routines.lib.php:1186
 msgid "You must provide a name and a type for each routine parameter."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1114
+#: libraries/rte/rte_routines.lib.php:1205
 msgid "You must provide a valid return type for the routine."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1174
+#: libraries/rte/rte_routines.lib.php:1265
 msgid "You must provide a routine definition."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1285
+#: libraries/rte/rte_routines.lib.php:1376
 #, fuzzy, php-format
 #| msgid "Allows executing stored routines."
 msgid "Execution results of routine %s"
 msgstr "Дозволува извршување на stored рутини."
 
-#: libraries/rte/rte_routines.lib.php:1340
+#: libraries/rte/rte_routines.lib.php:1431
 #, php-format
 msgid "%d row affected by the last statement inside the procedure."
 msgid_plural "%d rows affected by the last statement inside the procedure."
 msgstr[0] ""
 msgstr[1] ""
 
-#: libraries/rte/rte_routines.lib.php:1398
-#: libraries/rte/rte_routines.lib.php:1406
+#: libraries/rte/rte_routines.lib.php:1489
+#: libraries/rte/rte_routines.lib.php:1497
 msgid "Execute routine"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1485
-#: libraries/rte/rte_routines.lib.php:1488
+#: libraries/rte/rte_routines.lib.php:1576
+#: libraries/rte/rte_routines.lib.php:1579
 #, fuzzy
 #| msgid "Routines"
 msgid "Routine parameters"
@@ -12713,7 +12727,7 @@ msgid "Original position"
 msgstr "Оргинална позиција"
 
 #: libraries/server_bin_log.lib.php:133
-#: templates/structure/display_table_stats.phtml:4
+#: templates/table/structure/display_table_stats.phtml:4
 msgid "Information"
 msgstr "Информации"
 
@@ -12751,12 +12765,12 @@ msgstr ""
 "Напомена: вклучувањето на статистиките може да доведе до зголемување на "
 "сообраќајот помеѓу веб серверот и MySQL серверот."
 
-#: libraries/server_databases.lib.php:364
-#: libraries/server_databases.lib.php:365
+#: libraries/server_databases.lib.php:366
+#: libraries/server_databases.lib.php:371
 msgid "Enable Statistics"
 msgstr "Вклучи статистики"
 
-#: libraries/server_databases.lib.php:481
+#: libraries/server_databases.lib.php:492
 #, fuzzy, php-format
 #| msgid "%s databases have been dropped successfully."
 msgid "%1$d database has been dropped successfully."
@@ -13152,7 +13166,7 @@ msgid "You have revoked the privileges for %s."
 msgstr "Ги забранивте привилегиите за %s."
 
 #: libraries/server_privileges.lib.php:2059
-#: libraries/server_privileges.lib.php:4290
+#: libraries/server_privileges.lib.php:4316
 #, fuzzy
 #| msgid "Any user"
 msgid "Add user account"
@@ -13341,60 +13355,60 @@ msgstr "Бришам %s"
 msgid "The privileges were reloaded successfully."
 msgstr "Привилегиите се успешно вчитани."
 
-#: libraries/server_privileges.lib.php:3994
+#: libraries/server_privileges.lib.php:4003
 #, php-format
 msgid "The user %s already exists!"
 msgstr "Корисник %s веќе постои!"
 
-#: libraries/server_privileges.lib.php:4232
+#: libraries/server_privileges.lib.php:4258
 #, fuzzy, php-format
 #| msgid "Privileges"
 msgid "Privileges for %s"
 msgstr "Привилегии"
 
-#: libraries/server_privileges.lib.php:4241
+#: libraries/server_privileges.lib.php:4267
 #: libraries/server_status_processes.lib.php:72
 #: libraries/server_user_groups.lib.php:39
 msgid "User"
 msgstr "Корисник"
 
-#: libraries/server_privileges.lib.php:4282
+#: libraries/server_privileges.lib.php:4308
 msgctxt "Create new user"
 msgid "New"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4311
+#: libraries/server_privileges.lib.php:4337
 #, fuzzy
 #| msgid "Edit Privileges"
 msgid "Edit privileges:"
 msgstr "Промена на привилегии"
 
-#: libraries/server_privileges.lib.php:4312
+#: libraries/server_privileges.lib.php:4338
 #, fuzzy
 #| msgid "User"
 msgid "User account"
 msgstr "Корисник"
 
-#: libraries/server_privileges.lib.php:4371
+#: libraries/server_privileges.lib.php:4397
 msgid ""
 "Note: You are attempting to edit privileges of the user with which you are "
 "currently logged in."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4391 libraries/server_users.lib.php:25
+#: libraries/server_privileges.lib.php:4417 libraries/server_users.lib.php:25
 #, fuzzy
 #| msgid "User overview"
 msgid "User accounts overview"
 msgstr "Преглед на корисници"
 
-#: libraries/server_privileges.lib.php:4459
+#: libraries/server_privileges.lib.php:4485
 msgid ""
 "A user account allowing any user from localhost to connect is present. This "
 "will prevent other users from connecting if the host part of their account "
 "allows a connection from any (%) host."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4500
+#: libraries/server_privileges.lib.php:4526
 #, php-format
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
@@ -13408,7 +13422,7 @@ msgstr ""
 "измени. Во тој случај %sповторно вчитајте ги привилегиите%s пред да "
 "продолжите со работа."
 
-#: libraries/server_privileges.lib.php:4519
+#: libraries/server_privileges.lib.php:4545
 #, fuzzy
 #| msgid ""
 #| "Note: phpMyAdmin gets the users' privileges directly from MySQL's "
@@ -13428,64 +13442,64 @@ msgstr ""
 "измени. Во тој случај %sповторно вчитајте ги привилегиите%s пред да "
 "продолжите со работа."
 
-#: libraries/server_privileges.lib.php:4569
+#: libraries/server_privileges.lib.php:4595
 msgid "The selected user was not found in the privilege table."
 msgstr "Изабраниот корисник не е пронајден во табелата на привилегии."
 
-#: libraries/server_privileges.lib.php:4801
+#: libraries/server_privileges.lib.php:4827
 msgid "You have added a new user."
 msgstr "Додадовте нов корисник."
 
-#: libraries/server_status.lib.php:53
+#: libraries/server_status.lib.php:60
 #, php-format
 msgid "Network traffic since startup: %s"
 msgstr ""
 
-#: libraries/server_status.lib.php:66
+#: libraries/server_status.lib.php:73
 #, fuzzy, php-format
 #| msgid "This MySQL server has been running for %s. It started up on %s."
 msgid "This MySQL server has been running for %1$s. It started up on %2$s."
 msgstr "Овој MySQL сервер работи %s. Стартуван е на %s."
 
-#: libraries/server_status.lib.php:80
+#: libraries/server_status.lib.php:94
 msgid ""
 "This MySQL server works as <b>master</b> and <b>slave</b> in <b>replication</"
 "b> process."
 msgstr ""
 
-#: libraries/server_status.lib.php:85
+#: libraries/server_status.lib.php:99
 msgid "This MySQL server works as <b>master</b> in <b>replication</b> process."
 msgstr ""
 
-#: libraries/server_status.lib.php:90
+#: libraries/server_status.lib.php:104
 msgid "This MySQL server works as <b>slave</b> in <b>replication</b> process."
 msgstr ""
 
-#: libraries/server_status.lib.php:106
+#: libraries/server_status.lib.php:116
 msgid "Replication status"
 msgstr ""
 
-#: libraries/server_status.lib.php:137
+#: libraries/server_status.lib.php:146
 msgid ""
 "On a busy server, the byte counters may overrun, so those statistics as "
 "reported by the MySQL server may be incorrect."
 msgstr ""
 
-#: libraries/server_status.lib.php:148
+#: libraries/server_status.lib.php:157
 msgid "Received"
 msgstr "Примено"
 
-#: libraries/server_status.lib.php:167
+#: libraries/server_status.lib.php:176
 msgid "Sent"
 msgstr "Пратено"
 
-#: libraries/server_status.lib.php:234
+#: libraries/server_status.lib.php:243
 #, fuzzy
 #| msgid "Connections"
 msgid "Max. concurrent connections"
 msgstr "Конекции"
 
-#: libraries/server_status.lib.php:244
+#: libraries/server_status.lib.php:253
 msgid "Failed attempts"
 msgstr "Неуспешни обиди"
 
@@ -14470,7 +14484,7 @@ msgstr ""
 msgid "Not implemented yet."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/AlterOperation.php:193
+#: libraries/sql-parser/src/Components/AlterOperation.php:191
 msgid "Unrecognized alter operation."
 msgstr ""
 
@@ -14484,7 +14498,7 @@ msgid "An opening bracket followed by a set of values was expected."
 msgstr ""
 
 #: libraries/sql-parser/src/Components/ArrayObj.php:101
-#: libraries/sql-parser/src/Components/FieldDefinition.php:202
+#: libraries/sql-parser/src/Components/CreateDefinition.php:202
 msgid "An opening bracket was expected."
 msgstr ""
 
@@ -14492,25 +14506,35 @@ msgstr ""
 msgid "A comma or a closing bracket was expected"
 msgstr ""
 
+#: libraries/sql-parser/src/Components/CreateDefinition.php:246
+#, fuzzy
+#| msgid "No databases selected."
+msgid "A comma or a closing bracket was expected."
+msgstr "Не е избрана ни една база на податоци."
+
+#: libraries/sql-parser/src/Components/CreateDefinition.php:262
+msgid "A closing bracket was expected."
+msgstr ""
+
 #: libraries/sql-parser/src/Components/DataType.php:125
 msgid "Unrecognized data type."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:225
+#: libraries/sql-parser/src/Components/Expression.php:227
 msgid "Unexpected closing bracket."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:246
-#: libraries/sql-parser/src/Components/Expression.php:283
-#: libraries/sql-parser/src/Components/Expression.php:303
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:285
+#: libraries/sql-parser/src/Components/Expression.php:305
 msgid "An alias was previously found."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:257
+#: libraries/sql-parser/src/Components/Expression.php:259
 msgid "Unexpected dot."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:327
+#: libraries/sql-parser/src/Components/Expression.php:329
 #, fuzzy
 #| msgid "No databases selected."
 msgid "An alias was expected."
@@ -14522,16 +14546,6 @@ msgstr "Не е избрана ни една база на податоци."
 msgid "An expression was expected."
 msgstr "Нема селектирани записи"
 
-#: libraries/sql-parser/src/Components/FieldDefinition.php:246
-#, fuzzy
-#| msgid "No databases selected."
-msgid "A comma or a closing bracket was expected."
-msgstr "Не е избрана ни една база на податоци."
-
-#: libraries/sql-parser/src/Components/FieldDefinition.php:262
-msgid "A closing bracket was expected."
-msgstr ""
-
 #: libraries/sql-parser/src/Components/Limit.php:90
 #: libraries/sql-parser/src/Components/Limit.php:112
 msgid "An offset was expected."
@@ -14573,27 +14587,27 @@ msgstr ""
 msgid "Expected delimiter."
 msgstr ""
 
-#: libraries/sql-parser/src/Lexer.php:753
+#: libraries/sql-parser/src/Lexer.php:777
 #, fuzzy, php-format
 msgid "Ending quote %1$s was expected."
 msgstr "Табелата %s е избришана"
 
-#: libraries/sql-parser/src/Lexer.php:789
+#: libraries/sql-parser/src/Lexer.php:813
 #, fuzzy
 msgid "Variable name was expected."
 msgstr "Шаблон на име на податотека"
 
-#: libraries/sql-parser/src/Parser.php:380
+#: libraries/sql-parser/src/Parser.php:391
 #, fuzzy
 #| msgid "At Beginning of Table"
 msgid "Unexpected beginning of statement."
 msgstr "на почетокот од табелата"
 
-#: libraries/sql-parser/src/Parser.php:399
+#: libraries/sql-parser/src/Parser.php:410
 msgid "Unrecognized statement type."
 msgstr ""
 
-#: libraries/sql-parser/src/Parser.php:479
+#: libraries/sql-parser/src/Parser.php:489
 msgid "No transaction was previously started."
 msgstr ""
 
@@ -14619,8 +14633,10 @@ msgid "The name of the entity was expected."
 msgstr ""
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:310
-msgid "At least one field definition was expected."
-msgstr ""
+#, fuzzy
+#| msgid "The row has been deleted."
+msgid "At least one column definition was expected."
+msgstr "Записот е избришан"
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:329
 msgid "A \"RETURNS\" keyword was expected."
@@ -14690,25 +14706,25 @@ msgstr ""
 msgid "Using bookmark \"%s\" as default browse query."
 msgstr ""
 
-#: libraries/sql.lib.php:1306
+#: libraries/sql.lib.php:1300
 msgid "Showing as PHP code"
 msgstr ""
 
-#: libraries/sql.lib.php:1638
+#: libraries/sql.lib.php:1632
 #, php-format
 msgid ""
 "Current selection does not contain a unique column. Grid edit, checkbox, "
 "Edit, Copy and Delete features are not available. %s"
 msgstr ""
 
-#: libraries/sql.lib.php:1649
+#: libraries/sql.lib.php:1643
 #, php-format
 msgid ""
 "Current selection does not contain a unique column. Grid edit, Edit, Copy "
 "and Delete features may result in undesired behavior. %s"
 msgstr ""
 
-#: libraries/sql.lib.php:1688
+#: libraries/sql.lib.php:1682
 #, php-format
 msgid "Problems with indexes of table `%s`"
 msgstr "Проблем при индексирање на табелата `%s`"
@@ -14878,7 +14894,7 @@ msgid "Version %s snapshot (SQL code)"
 msgstr ""
 
 #: libraries/tracking.lib.php:947
-#: templates/structure/table_structure_row.phtml:33
+#: templates/table/structure/table_structure_row.phtml:33
 #, fuzzy
 #| msgid "None"
 msgctxt "None for default"
@@ -14932,19 +14948,19 @@ msgstr "Верзија на серверот"
 msgid "Version %1$s was created, tracking for %2$s is active."
 msgstr ""
 
-#: libraries/user_preferences.inc.php:29
+#: libraries/user_preferences.inc.php:30
 #, fuzzy
 #| msgid "General relation features"
 msgid "Manage your settings"
 msgstr "Општи особини на релациите"
 
-#: libraries/user_preferences.inc.php:46 prefs_manage.php:307
+#: libraries/user_preferences.inc.php:54 prefs_manage.php:307
 #, fuzzy
 #| msgid "Modifications have been saved"
 msgid "Configuration has been saved."
 msgstr "Измените се сочувани"
 
-#: libraries/user_preferences.inc.php:66
+#: libraries/user_preferences.inc.php:74
 #, php-format
 msgid ""
 "Your preferences will be saved for current session only. Storing them "
@@ -15347,7 +15363,7 @@ msgid "first"
 msgstr ""
 
 #: templates/columns_definitions/move_column.phtml:12
-#: templates/structure/add_column.phtml:21
+#: templates/table/structure/add_column.phtml:21
 #, fuzzy, php-format
 #| msgid "After %s"
 msgid "after %s"
@@ -15434,240 +15450,350 @@ msgstr "Транформации на веб прелистувачот"
 msgid "Input transformation options"
 msgstr "Опции на трансформацијата"
 
-#: templates/designer/aggregate_query_panel.phtml:22
-#: templates/designer/options_panel.phtml:100
+#: templates/database/create_table.phtml:7
+#: templates/database/designer/side_menu.phtml:77
+#: templates/database/designer/side_menu.phtml:80
+#, fuzzy
+msgid "Create table"
+msgstr "Направи нова страница"
+
+#: templates/database/create_table.phtml:15
+#, fuzzy
+#| msgid "Number of rows per page"
+msgid "Number of columns"
+msgstr "Број на записи на страница"
+
+#: templates/database/designer/aggregate_query_panel.phtml:22
+#: templates/database/designer/options_panel.phtml:100
 #, fuzzy
 #| msgid "Create"
 msgid "Aggregate"
 msgstr "Креирај"
 
-#: templates/designer/aggregate_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:61
-#: templates/designer/options_panel.phtml:106
-#: templates/designer/options_panel.phtml:170
-#: templates/designer/where_query_panel.phtml:30
-#: templates/table/table_header.phtml:9
+#: templates/database/designer/aggregate_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:61
+#: templates/database/designer/options_panel.phtml:106
+#: templates/database/designer/options_panel.phtml:170
+#: templates/database/designer/where_query_panel.phtml:30
+#: templates/table/search/table_header.phtml:9
 msgid "Operator"
 msgstr "Оператор"
 
-#: templates/designer/database_tables.phtml:29
+#: templates/database/designer/database_tables.phtml:29
 msgid "Toggle"
 msgstr ""
 
-#: templates/designer/database_tables.phtml:40
+#: templates/database/designer/database_tables.phtml:40
 #, fuzzy
 #| msgid "Databases"
 msgid "See table structure"
 msgstr "База на податоци"
 
-#: templates/designer/delete_relation_panel.phtml:21
+#: templates/database/designer/delete_relation_panel.phtml:21
 msgid "Delete relation"
 msgstr ""
 
-#: templates/designer/edit_delete_pages.phtml:7
+#: templates/database/designer/edit_delete_pages.phtml:7
 #, fuzzy
 #| msgid "Page number:"
 msgid "Page to open"
 msgstr "Број на страници:"
 
-#: templates/designer/edit_delete_pages.phtml:7
+#: templates/database/designer/edit_delete_pages.phtml:7
 #, fuzzy
 msgid "Page to delete"
 msgstr "Релационен поглед"
 
-#: templates/designer/having_query_panel.phtml:90
-#: templates/designer/options_panel.phtml:63
-#: templates/designer/options_panel.phtml:229
-#: templates/designer/where_query_panel.phtml:59
+#: templates/database/designer/having_query_panel.phtml:90
+#: templates/database/designer/options_panel.phtml:63
+#: templates/database/designer/options_panel.phtml:229
+#: templates/database/designer/where_query_panel.phtml:59
 #, fuzzy
 #| msgid "Export"
 msgid "Except"
 msgstr "Извоз"
 
-#: templates/designer/having_query_panel.phtml:102
-#: templates/designer/options_panel.phtml:75
-#: templates/designer/options_panel.phtml:241
-#: templates/designer/where_query_panel.phtml:71
+#: templates/database/designer/having_query_panel.phtml:102
+#: templates/database/designer/options_panel.phtml:75
+#: templates/database/designer/options_panel.phtml:241
+#: templates/database/designer/where_query_panel.phtml:71
 #, fuzzy
 #| msgid "in query"
 msgid "subquery"
 msgstr "во упитот"
 
-#: templates/designer/new_relation_panel.phtml:22
-#: templates/designer/side_menu.phtml:84 templates/designer/side_menu.phtml:87
+#: templates/database/designer/new_relation_panel.phtml:22
+#: templates/database/designer/side_menu.phtml:84
+#: templates/database/designer/side_menu.phtml:87
 msgid "Create relation"
 msgstr ""
 
-#: templates/designer/options_panel.phtml:34
-#: templates/designer/options_panel.phtml:200
+#: templates/database/designer/options_panel.phtml:34
+#: templates/database/designer/options_panel.phtml:200
 #, fuzzy
 msgid "Relation operator"
 msgstr "Релационен поглед"
 
-#: templates/designer/options_panel.phtml:85
-#: templates/designer/rename_to_panel.phtml:23
+#: templates/database/designer/options_panel.phtml:85
+#: templates/database/designer/rename_to_panel.phtml:23
 #, fuzzy
 msgid "Rename to"
 msgstr "Промени го името на табелата во "
 
-#: templates/designer/options_panel.phtml:91
-#: templates/designer/rename_to_panel.phtml:31
+#: templates/database/designer/options_panel.phtml:91
+#: templates/database/designer/rename_to_panel.phtml:31
 #, fuzzy
 #| msgid "User name"
 msgid "New name"
 msgstr "Назив на корисник"
 
-#: templates/designer/page_save_as.phtml:4
+#: templates/database/designer/page_save_as.phtml:4
 #, fuzzy
 #| msgid "No rows selected"
 msgid "Save to selected page"
 msgstr "Нема селектирани записи"
 
-#: templates/designer/page_save_as.phtml:5
+#: templates/database/designer/page_save_as.phtml:5
 #, fuzzy
 #| msgid "Create a new index"
 msgid "Create a page and save to it"
 msgstr "Креирај нов клуч"
 
-#: templates/designer/page_save_as.phtml:26
+#: templates/database/designer/page_save_as.phtml:26
 #, fuzzy
 #| msgid "User name"
 msgid "New page name"
 msgstr "Назив на корисник"
 
-#: templates/designer/page_selector.phtml:2
+#: templates/database/designer/page_selector.phtml:2
 #, fuzzy
 #| msgid "Select All"
 msgid "Select page"
 msgstr "избери се"
 
-#: templates/designer/query_details.phtml:10
+#: templates/database/designer/query_details.phtml:10
 #, fuzzy
 #| msgid "Table options"
 msgid "Active options"
 msgstr "Опции на табелата"
 
-#: templates/designer/schema_export.phtml:4
+#: templates/database/designer/schema_export.phtml:4
 msgid "Select Export Relational Type"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:19 templates/designer/side_menu.phtml:25
+#: templates/database/designer/side_menu.phtml:19
+#: templates/database/designer/side_menu.phtml:25
 #, fuzzy
 #| msgid "Show tables"
 msgid "Show/Hide tables list"
 msgstr "Прикажи табели"
 
-#: templates/designer/side_menu.phtml:29 templates/designer/side_menu.phtml:35
-#: templates/designer/side_menu.phtml:36
+#: templates/database/designer/side_menu.phtml:29
+#: templates/database/designer/side_menu.phtml:35
+#: templates/database/designer/side_menu.phtml:36
 msgid "View in fullscreen"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:34
+#: templates/database/designer/side_menu.phtml:34
 msgid "Exit fullscreen"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:41 templates/designer/side_menu.phtml:45
+#: templates/database/designer/side_menu.phtml:41
+#: templates/database/designer/side_menu.phtml:45
 #, fuzzy
 #| msgid "User name"
 msgid "New page"
 msgstr "Назив на корисник"
 
-#: templates/designer/side_menu.phtml:70 templates/designer/side_menu.phtml:73
+#: templates/database/designer/side_menu.phtml:70
+#: templates/database/designer/side_menu.phtml:73
 #, fuzzy
 #| msgid "Select All"
 msgid "Delete pages"
 msgstr "избери се"
 
-#: templates/designer/side_menu.phtml:77 templates/designer/side_menu.phtml:80
-#: templates/table/create_table.phtml:7
-#, fuzzy
-msgid "Create table"
-msgstr "Направи нова страница"
-
-#: templates/designer/side_menu.phtml:98
-#: templates/designer/side_menu.phtml:101
+#: templates/database/designer/side_menu.phtml:98
+#: templates/database/designer/side_menu.phtml:101
 msgid "Reload"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:107
-#: templates/designer/side_menu.phtml:110
+#: templates/database/designer/side_menu.phtml:107
+#: templates/database/designer/side_menu.phtml:110
 msgid "Help"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Angular links"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Direct links"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:122
-#: templates/designer/side_menu.phtml:124
+#: templates/database/designer/side_menu.phtml:122
+#: templates/database/designer/side_menu.phtml:124
 msgid "Snap to grid"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:128
-#: templates/designer/side_menu.phtml:134
+#: templates/database/designer/side_menu.phtml:128
+#: templates/database/designer/side_menu.phtml:134
 msgid "Small/Big All"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:138
-#: templates/designer/side_menu.phtml:141
+#: templates/database/designer/side_menu.phtml:138
+#: templates/database/designer/side_menu.phtml:141
 msgid "Toggle small/big"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:145
-#: templates/designer/side_menu.phtml:148
+#: templates/database/designer/side_menu.phtml:145
+#: templates/database/designer/side_menu.phtml:148
 #, fuzzy
 #| msgid "Traditional Chinese"
 msgid "Toggle relation lines"
 msgstr "Традиционален кинески"
 
-#: templates/designer/side_menu.phtml:153
-#: templates/designer/side_menu.phtml:156
+#: templates/database/designer/side_menu.phtml:153
+#: templates/database/designer/side_menu.phtml:156
 #, fuzzy
 #| msgid "Export"
 msgid "Export schema"
 msgstr "Извоз"
 
-#: templates/designer/side_menu.phtml:165
-#: templates/designer/side_menu.phtml:168
+#: templates/database/designer/side_menu.phtml:165
+#: templates/database/designer/side_menu.phtml:168
 #, fuzzy
 #| msgid "Submit Query"
 msgid "Build Query"
 msgstr "Изврши SQL"
 
-#: templates/designer/side_menu.phtml:173
-#: templates/designer/side_menu.phtml:177
+#: templates/database/designer/side_menu.phtml:173
+#: templates/database/designer/side_menu.phtml:177
 msgid "Move Menu"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:181
-#: templates/designer/side_menu.phtml:186
+#: templates/database/designer/side_menu.phtml:181
+#: templates/database/designer/side_menu.phtml:186
 #, fuzzy
 #| msgid "Partial Texts"
 msgid "Pin text"
 msgstr "Дел на текстот"
 
-#: templates/designer/table_list.phtml:4
+#: templates/database/designer/table_list.phtml:4
 #, fuzzy
 msgid "Hide/Show all"
 msgstr "прикажи ги сите"
 
-#: templates/designer/table_list.phtml:14
+#: templates/database/designer/table_list.phtml:14
 msgid "Hide/Show Tables with no relation"
 msgstr ""
 
-#: templates/designer/table_list.phtml:59
+#: templates/database/designer/table_list.phtml:59
 #, fuzzy
 #| msgid "Number of rows per page"
 msgid "Number of tables:"
 msgstr "Број на записи на страница"
 
+#: templates/database/structure/body_for_table_summary.phtml:6
+#, fuzzy, php-format
+#| msgid "%s table(s)"
+msgid "%s table"
+msgid_plural "%s tables"
+msgstr[0] "%s табела"
+msgstr[1] "%s табела"
+
+#: templates/database/structure/body_for_table_summary.phtml:17
+msgid "Sum"
+msgstr "Вкупно"
+
+#: templates/database/structure/check_all_tables.phtml:6
+msgid "Check tables having overhead"
+msgstr "табели кои имаат пречекорувања"
+
+#: templates/database/structure/check_all_tables.phtml:10
+#, fuzzy
+#| msgid "Show color"
+msgid "Show create"
+msgstr "Прикажи боја"
+
+#: templates/database/structure/check_all_tables.phtml:27
+#, fuzzy
+#| msgid "Add new field"
+msgid "Prefix"
+msgstr "Додади ново поле"
+
+#: templates/database/structure/check_all_tables.phtml:28
+msgid "Add prefix to table"
+msgstr "Додај префикс кон табелата"
+
+#: templates/database/structure/check_all_tables.phtml:29
+msgid "Replace table prefix"
+msgstr "Замени го префиксот на табелата"
+
+#: templates/database/structure/check_all_tables.phtml:30
+msgid "Copy table with prefix"
+msgstr "Копирај табела со префикс"
+
+#: templates/database/structure/check_all_tables.phtml:36
+#, fuzzy
+#| msgid "Add %s field(s)"
+msgid "Add columns to central list"
+msgstr "Додади %s полиња"
+
+#: templates/database/structure/check_all_tables.phtml:37
+msgid "Remove columns from central list"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:38
+#, fuzzy
+#| msgid "Add %s field(s)"
+msgid "Make consistent with central list"
+msgstr "Додади %s полиња"
+
+#: templates/database/structure/favorite_anchor.phtml:12
+#, fuzzy
+msgid "Add to Favorites"
+msgstr "Додади нов корисник"
+
+#: templates/database/structure/show_create.phtml:2
+#, fuzzy
+msgid "Showing create queries"
+msgstr "Прикажи комплетни упити"
+
+#: templates/database/structure/sortable_header.phtml:13
+msgid "Sort"
+msgstr "Подредуваање"
+
+#: templates/database/structure/table_header.phtml:42
+#, fuzzy
+#| msgid "May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]"
+msgid ""
+"May be approximate. Click on the number to get the exact count. See "
+"[doc@faq3-11]FAQ 3.11[/doc]."
+msgstr ""
+"Бројот на записи може да биде приближен. За подетални информации види "
+"[doc@faq3-11]FAQ 3.11[/doc]"
+
+#: templates/database/structure/table_header.phtml:66
+#: templates/table/index_form.phtml:127
+msgid "Size"
+msgstr "Големина"
+
+#: templates/database/structure/table_header.phtml:74
+#: templates/table/structure/display_table_stats.phtml:27
+msgid "Overhead"
+msgstr "Пречекорување"
+
+#: templates/database/structure/tracking_icon.phtml:4
+msgid "Tracking is active."
+msgstr ""
+
+#: templates/database/structure/tracking_icon.phtml:8
+msgid "Tracking is not active."
+msgstr ""
+
 #: templates/error/report_form.phtml:7
 msgid ""
 "phpMyAdmin has encountered an error. We have collected data about this error "
@@ -15683,68 +15809,6 @@ msgstr ""
 msgid "Please explain the steps that lead to the error:"
 msgstr ""
 
-#: templates/gis_visualization/gis_visualization.phtml:3
-msgid "Display GIS Visualization"
-msgstr ""
-
-#: templates/gis_visualization/gis_visualization.phtml:8
-#, fuzzy
-#| msgid "Add/Delete Field Columns"
-msgid "Label column"
-msgstr "Додади/избриши колона"
-
-#: templates/gis_visualization/gis_visualization.phtml:11
-msgid "-- None --"
-msgstr ""
-
-#: templates/gis_visualization/gis_visualization.phtml:19
-#, fuzzy
-#| msgid "Total"
-msgid "Spatial column"
-msgstr "Вкупно"
-
-#: templates/index_form.phtml:16
-msgid "Index name:"
-msgstr "Име на клуч :"
-
-#: templates/index_form.phtml:19
-msgid ""
-"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
-msgstr "\"PRIMARY\" <b>може</b> да биде име <b>само</b> на примарниот клуч!"
-
-#: templates/index_form.phtml:40
-#, fuzzy
-#| msgid "Index name:"
-msgid "Index choice:"
-msgstr "Име на клуч :"
-
-#: templates/index_form.phtml:57
-msgid "Key block size:"
-msgstr ""
-
-#: templates/index_form.phtml:74
-msgid "Index type:"
-msgstr "Тип на клуч :"
-
-#: templates/index_form.phtml:86
-#, fuzzy
-#| msgid "User"
-msgid "Parser:"
-msgstr "Корисник"
-
-#: templates/index_form.phtml:102
-#, fuzzy
-msgid "Comment:"
-msgstr "Коментари"
-
-#: templates/index_form.phtml:127 templates/structure/table_header.phtml:66
-msgid "Size"
-msgstr "Големина"
-
-#: templates/index_form.phtml:149 templates/index_form.phtml:190
-msgid "Drag to reorder"
-msgstr ""
-
 #: templates/prefs_autoload.phtml:9
 msgid ""
 "Your browser has phpMyAdmin configuration for this domain. Would you like to "
@@ -15757,490 +15821,449 @@ msgstr ""
 msgid "Start row:"
 msgstr "Саб"
 
-#: templates/structure/actions_in_table_structure.phtml:14
-#, php-format
-msgid "A primary key has been added on %s."
-msgstr "Примарниот клуч %s е додаден."
-
-#: templates/structure/actions_in_table_structure.phtml:34
-#: templates/structure/actions_in_table_structure.phtml:54
-#: templates/structure/actions_in_table_structure.phtml:79
-#: templates/structure/actions_in_table_structure.phtml:101
-#, php-format
-msgid "An index has been added on %s."
-msgstr "Клучот е додаден %s."
-
-#: templates/structure/actions_in_table_structure.phtml:130
-#: templates/structure/check_all_table_column.phtml:59
-#, fuzzy
-#| msgid "Remove database"
-msgid "Remove from central columns"
-msgstr "Избриши ја базата на податоци."
-
-#: templates/structure/actions_in_table_structure.phtml:138
-#: templates/structure/check_all_table_column.phtml:55
-#, fuzzy
-#| msgid "Add %s field(s)"
-msgid "Add to central columns"
-msgstr "Додади %s полиња"
-
-#: templates/structure/add_column.phtml:7
-#, fuzzy, php-format
-#| msgid "Add %s field(s)"
-msgid "Add %s column(s)"
-msgstr "Додади %s полиња"
-
-#: templates/structure/add_column.phtml:12
-#, fuzzy
-#| msgid "At Beginning of Table"
-msgid "at beginning of table"
-msgstr "на почетокот од табелата"
-
-#: templates/structure/body_for_table_summary.phtml:6
-#, fuzzy, php-format
-#| msgid "%s table(s)"
-msgid "%s table"
-msgid_plural "%s tables"
-msgstr[0] "%s табела"
-msgstr[1] "%s табела"
-
-#: templates/structure/body_for_table_summary.phtml:17
-msgid "Sum"
-msgstr "Вкупно"
-
-#: templates/structure/check_all_tables.phtml:6
-msgid "Check tables having overhead"
-msgstr "табели кои имаат пречекорувања"
-
-#: templates/structure/check_all_tables.phtml:10
-#, fuzzy
-#| msgid "Show color"
-msgid "Show create"
-msgstr "Прикажи боја"
-
-#: templates/structure/check_all_tables.phtml:27
-#, fuzzy
-#| msgid "Add new field"
-msgid "Prefix"
-msgstr "Додади ново поле"
-
-#: templates/structure/check_all_tables.phtml:28
-msgid "Add prefix to table"
-msgstr "Додај префикс кон табелата"
-
-#: templates/structure/check_all_tables.phtml:29
-msgid "Replace table prefix"
-msgstr "Замени го префиксот на табелата"
-
-#: templates/structure/check_all_tables.phtml:30
-msgid "Copy table with prefix"
-msgstr "Копирај табела со префикс"
-
-#: templates/structure/check_all_tables.phtml:36
-#, fuzzy
-#| msgid "Add %s field(s)"
-msgid "Add columns to central list"
-msgstr "Додади %s полиња"
-
-#: templates/structure/check_all_tables.phtml:37
-msgid "Remove columns from central list"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:38
-#, fuzzy
-#| msgid "Add %s field(s)"
-msgid "Make consistent with central list"
-msgstr "Додади %s полиња"
-
-#: templates/structure/display_structure.phtml:140 view_create.php:181
-#, fuzzy
-#| msgid "Print view"
-msgid "Edit view"
-msgstr "Преглед за печатење"
-
-#: templates/structure/display_table_stats.phtml:9
-msgid "Space usage"
-msgstr "Големина"
-
-#: templates/structure/display_table_stats.phtml:27
-#: templates/structure/table_header.phtml:74
-msgid "Overhead"
-msgstr "Пречекорување"
-
-#: templates/structure/display_table_stats.phtml:32
-msgid "Effective"
-msgstr "Ефективни"
-
-#: templates/structure/favorite_anchor.phtml:12
-#, fuzzy
-msgid "Add to Favorites"
-msgstr "Додади нов корисник"
-
-#: templates/structure/move_columns_dialog.phtml:1
-#: templates/structure/optional_action_links.phtml:21
-#, fuzzy
-#| msgid "Add %s field(s)"
-msgid "Move columns"
-msgstr "Додади %s полиња"
-
-#: templates/structure/move_columns_dialog.phtml:2
-msgid "Move the columns by dragging them up and down."
-msgstr ""
-
-#: templates/structure/optional_action_links.phtml:9
-msgid "Propose table structure"
-msgstr "Предложи структура на табелата"
-
-#: templates/structure/optional_action_links.phtml:24
-#, fuzzy
-#| msgid "Propose table structure"
-msgid "Improve table structure"
-msgstr "Предложи структура на табелата"
-
-#: templates/structure/optional_action_links.phtml:30
-#, fuzzy
-msgid "Track view"
-msgstr "Проверка на табелата"
-
-#: templates/structure/row_stats_table.phtml:3
-#, fuzzy
-#| msgid "Row Statistics"
-msgid "Row statistics"
-msgstr "Статистики за записите"
-
-#: templates/structure/row_stats_table.phtml:9
-msgid "static"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:11
-msgid "dynamic"
-msgstr "динамички"
-
-#: templates/structure/row_stats_table.phtml:22
-msgid "partitioned"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:54
-msgid "Row length"
-msgstr "Должина на запис"
-
-#: templates/structure/row_stats_table.phtml:66
-msgid "Row size"
-msgstr "Големина на запис"
-
-#: templates/structure/row_stats_table.phtml:73
-msgid "Next autoindex"
-msgstr ""
-
-#: templates/structure/secondary_tabs.phtml:14
-#, fuzzy
-#| msgid "Relation view"
-msgid "Relation view"
-msgstr "Релационен поглед"
-
-#: templates/structure/show_create.phtml:2
-#, fuzzy
-msgid "Showing create queries"
-msgstr "Прикажи комплетни упити"
-
-#: templates/structure/sortable_header.phtml:13
-msgid "Sort"
-msgstr "Подредуваање"
-
-#: templates/structure/table_header.phtml:42
-#, fuzzy
-#| msgid "May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]"
-msgid ""
-"May be approximate. Click on the number to get the exact count. See "
-"[doc@faq3-11]FAQ 3.11[/doc]."
-msgstr ""
-"Бројот на записи може да биде приближен. За подетални информации види "
-"[doc@faq3-11]FAQ 3.11[/doc]"
-
-#: templates/structure/table_structure_row.phtml:46
-#, fuzzy, php-format
-#| msgid "Table %s has been dropped."
-msgid "Column %s has been dropped."
-msgstr "Табелата %s е избришана"
-
-#: templates/structure/tracking_icon.phtml:4
-msgid "Tracking is active."
-msgstr ""
-
-#: templates/structure/tracking_icon.phtml:8
-msgid "Tracking is not active."
-msgstr ""
-
-#: templates/table/create_table.phtml:15
-#, fuzzy
-#| msgid "Number of rows per page"
-msgid "Number of columns"
-msgstr "Број на записи на страница"
-
-#: templates/table/options.phtml:8
-#, fuzzy
-#| msgid "Select fields (at least one):"
-msgid "Select columns (at least one):"
-msgstr "Избери полиња (најмалку едно)"
-
-#: templates/table/options.phtml:37
-msgid "Add search conditions (body of the \"where\" clause):"
-msgstr "Додади услови за пребарување (делот \"WHERE\" од упитот):"
-
-#: templates/table/options.phtml:45
-msgid "Number of rows per page"
-msgstr "Број на записи на страница"
-
-#: templates/table/options.phtml:56
-msgid "Display order:"
-msgstr "Редослед на приказ:"
-
-#: templates/table/options_zoom.phtml:6
-msgid "Use this column to label each point"
-msgstr ""
-
-#: templates/table/options_zoom.phtml:35
-msgid "Maximum rows to plot"
-msgstr ""
-
-#: templates/table/replace_preview.phtml:13
-msgid "Find and replace - preview"
-msgstr ""
-
-#: templates/table/replace_preview.phtml:18
-#, fuzzy
-#| msgid "Original position"
-msgid "Original string"
-msgstr "Оргинална позиција"
-
-#: templates/table/replace_preview.phtml:19
-#, fuzzy
-#| msgid "Relations"
-msgid "Replaced string"
-msgstr "Релации"
-
-#: templates/table/replace_preview.phtml:40
-#, fuzzy
-msgid "Replace"
-msgstr "Релации"
-
-#: templates/table/rows_zoom.phtml:16
-#, fuzzy
-msgid "Additional search criteria"
-msgstr "SQL упит"
-
-#: templates/table/search_and_replace.phtml:3
-#, fuzzy
-#| msgid "Replace NULL by"
-msgid "Replace with:"
-msgstr "Замени NULL со"
-
-#: templates/table/search_and_replace.phtml:22
-#, fuzzy
-#| msgid "as regular expression"
-msgid "Use regular expression"
-msgstr "како регуларен израз"
-
-#: templates/table/selection_form.phtml:12
-#, fuzzy
-#| msgid "Do a \"query by example\" (wildcard: \"%\")"
-msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
-msgstr "Направи \"упит по пример\" (џокер знак: \"%\")"
-
-#: templates/table/selection_form.phtml:34
-msgid "Do a \"query by example\" (wildcard: \"%\")"
-msgstr "Направи \"упит по пример\" (џокер знак: \"%\")"
-
-#: templates/table/zoom_result_form.phtml:7
-msgid "Browse/Edit the points"
-msgstr ""
-
-#: templates/table/zoom_result_form.phtml:15
-msgid "How to use"
-msgstr ""
-
-#: templates/table/zoom_result_form.phtml:23
-#, fuzzy
-#| msgid "Reset"
-msgid "Reset zoom"
-msgstr "Поништи"
-
-#: templates/tbl_chart.phtml:17
+#: templates/table/chart/tbl_chart.phtml:17
 #, fuzzy
 #| msgid "Mar"
 msgctxt "Chart type"
 msgid "Bar"
 msgstr "мар"
 
-#: templates/tbl_chart.phtml:21
+#: templates/table/chart/tbl_chart.phtml:21
 #, fuzzy
 #| msgid "Column names"
 msgctxt "Chart type"
 msgid "Column"
 msgstr "Имиња на колони"
 
-#: templates/tbl_chart.phtml:25
+#: templates/table/chart/tbl_chart.phtml:25
 msgctxt "Chart type"
 msgid "Line"
 msgstr ""
 
-#: templates/tbl_chart.phtml:29
+#: templates/table/chart/tbl_chart.phtml:29
 #, fuzzy
 #| msgid "Engines"
 msgctxt "Chart type"
 msgid "Spline"
 msgstr "Складишта"
 
-#: templates/tbl_chart.phtml:33
+#: templates/table/chart/tbl_chart.phtml:33
 msgctxt "Chart type"
 msgid "Area"
 msgstr ""
 
-#: templates/tbl_chart.phtml:37
+#: templates/table/chart/tbl_chart.phtml:37
 #, fuzzy
 #| msgid "PiB"
 msgctxt "Chart type"
 msgid "Pie"
 msgstr "PB"
 
-#: templates/tbl_chart.phtml:41
+#: templates/table/chart/tbl_chart.phtml:41
 #, fuzzy
 #| msgid "Time"
 msgctxt "Chart type"
 msgid "Timeline"
 msgstr "Време"
 
-#: templates/tbl_chart.phtml:45
+#: templates/table/chart/tbl_chart.phtml:45
 msgctxt "Chart type"
 msgid "Scatter"
 msgstr ""
 
-#: templates/tbl_chart.phtml:50
+#: templates/table/chart/tbl_chart.phtml:50
 msgid "Stacked"
 msgstr ""
 
-#: templates/tbl_chart.phtml:53
+#: templates/table/chart/tbl_chart.phtml:53
 #, fuzzy
 #| msgid "Import files"
 msgid "Chart title"
 msgstr "Увоз на податотека"
 
-#: templates/tbl_chart.phtml:57
+#: templates/table/chart/tbl_chart.phtml:57
 msgid "X-Axis:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:72
+#: templates/table/chart/tbl_chart.phtml:72
 #, fuzzy
 msgid "Series:"
 msgstr "SQL упит"
 
-#: templates/tbl_chart.phtml:102
+#: templates/table/chart/tbl_chart.phtml:102
 msgid "X-Axis label:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:104
+#: templates/table/chart/tbl_chart.phtml:104
 #, fuzzy
 #| msgid "Value"
 msgid "X Values"
 msgstr "Вредност"
 
-#: templates/tbl_chart.phtml:107
+#: templates/table/chart/tbl_chart.phtml:107
 msgid "Y-Axis label:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:115
+#: templates/table/chart/tbl_chart.phtml:115
 msgid "Series names are in a column"
 msgstr ""
 
-#: templates/tbl_chart.phtml:118
+#: templates/table/chart/tbl_chart.phtml:118
 #, fuzzy
 #| msgid "Inside table(s):"
 msgid "Series column:"
 msgstr "во табела(и):"
 
-#: templates/tbl_chart.phtml:130
+#: templates/table/chart/tbl_chart.phtml:130
 #, fuzzy
 #| msgid "Number of rows per page"
 msgid "Value Column:"
 msgstr "Број на записи на страница"
 
-#: templates/tbl_chart.phtml:150
+#: templates/table/chart/tbl_chart.phtml:150
 #, fuzzy
 #| msgid "Save as file"
 msgid "Save chart as image"
 msgstr "Сочувај како податотека"
 
-#: templates/tbl_relation/common_form.phtml:7
+#: templates/table/gis_visualization/gis_visualization.phtml:3
+msgid "Display GIS Visualization"
+msgstr ""
+
+#: templates/table/gis_visualization/gis_visualization.phtml:8
+#, fuzzy
+#| msgid "Add/Delete Field Columns"
+msgid "Label column"
+msgstr "Додади/избриши колона"
+
+#: templates/table/gis_visualization/gis_visualization.phtml:11
+msgid "-- None --"
+msgstr ""
+
+#: templates/table/gis_visualization/gis_visualization.phtml:19
+#, fuzzy
+#| msgid "Total"
+msgid "Spatial column"
+msgstr "Вкупно"
+
+#: templates/table/index_form.phtml:16
+msgid "Index name:"
+msgstr "Име на клуч :"
+
+#: templates/table/index_form.phtml:19
+msgid ""
+"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
+msgstr "\"PRIMARY\" <b>може</b> да биде име <b>само</b> на примарниот клуч!"
+
+#: templates/table/index_form.phtml:40
+#, fuzzy
+#| msgid "Index name:"
+msgid "Index choice:"
+msgstr "Име на клуч :"
+
+#: templates/table/index_form.phtml:57
+msgid "Key block size:"
+msgstr ""
+
+#: templates/table/index_form.phtml:74
+msgid "Index type:"
+msgstr "Тип на клуч :"
+
+#: templates/table/index_form.phtml:86
+#, fuzzy
+#| msgid "User"
+msgid "Parser:"
+msgstr "Корисник"
+
+#: templates/table/index_form.phtml:102
+#, fuzzy
+msgid "Comment:"
+msgstr "Коментари"
+
+#: templates/table/index_form.phtml:149 templates/table/index_form.phtml:190
+msgid "Drag to reorder"
+msgstr ""
+
+#: templates/table/relation/common_form.phtml:7
 msgid "Internal relations"
 msgstr "Внатрешни релации"
 
-#: templates/tbl_relation/common_form.phtml:11
+#: templates/table/relation/common_form.phtml:11
 #, fuzzy
 #| msgid "Internal relations"
 msgid "Internal relation"
 msgstr "Внатрешни релации"
 
-#: templates/tbl_relation/common_form.phtml:14
+#: templates/table/relation/common_form.phtml:14
 msgid ""
 "An internal relation is not necessary when a corresponding FOREIGN KEY "
 "relation exists."
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:37
+#: templates/table/relation/common_form.phtml:37
 #, fuzzy
 #| msgid "Disable foreign key checks"
 msgid "Foreign key constraints"
 msgstr "Исклучи проверка на надворешни клучеви"
 
-#: templates/tbl_relation/common_form.phtml:40
+#: templates/table/relation/common_form.phtml:40
 msgid "Actions"
 msgstr "Акција"
 
-#: templates/tbl_relation/common_form.phtml:41
+#: templates/table/relation/common_form.phtml:41
 #, fuzzy
 #| msgid "Constraints for table"
 msgid "Constraint properties"
 msgstr "Ограничувања за табелите"
 
-#: templates/tbl_relation/common_form.phtml:44
+#: templates/table/relation/common_form.phtml:44
 msgid ""
 "Only columns with index will be displayed. You can define an index below."
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:49
+#: templates/table/relation/common_form.phtml:49
 msgid "Foreign key constraint"
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:81
+#: templates/table/relation/common_form.phtml:81
 #, fuzzy
 #| msgid "Add constraints"
 msgid "+ Add constraint"
 msgstr "Додади ограничувања"
 
-#: templates/tbl_relation/common_form.phtml:91
+#: templates/table/relation/common_form.phtml:91
 #, fuzzy
 #| msgid "Choose field to display"
 msgid "Choose column to display:"
 msgstr "Избери полиња за прикажување"
 
-#: templates/tbl_relation/foreign_key_row.phtml:13
+#: templates/table/relation/foreign_key_row.phtml:13
 #, fuzzy, php-format
 #| msgid "Disable foreign key checks"
 msgid "Foreign key constraint %s has been dropped"
 msgstr "Исклучи проверка на надворешни клучеви"
 
-#: templates/tbl_relation/foreign_key_row.phtml:102
+#: templates/table/relation/foreign_key_row.phtml:102
 #, fuzzy
 #| msgid "Constraints for table"
 msgid "Constraint name"
 msgstr "Ограничувања за табелите"
 
-#: templates/tbl_relation/foreign_key_row.phtml:157
+#: templates/table/relation/foreign_key_row.phtml:157
 #, fuzzy
 #| msgid "Add %s field(s)"
 msgid "+ Add column"
 msgstr "Додади %s полиња"
 
+#: templates/table/search/options.phtml:8
+#, fuzzy
+#| msgid "Select fields (at least one):"
+msgid "Select columns (at least one):"
+msgstr "Избери полиња (најмалку едно)"
+
+#: templates/table/search/options.phtml:37
+msgid "Add search conditions (body of the \"where\" clause):"
+msgstr "Додади услови за пребарување (делот \"WHERE\" од упитот):"
+
+#: templates/table/search/options.phtml:45
+msgid "Number of rows per page"
+msgstr "Број на записи на страница"
+
+#: templates/table/search/options.phtml:56
+msgid "Display order:"
+msgstr "Редослед на приказ:"
+
+#: templates/table/search/options_zoom.phtml:6
+msgid "Use this column to label each point"
+msgstr ""
+
+#: templates/table/search/options_zoom.phtml:35
+msgid "Maximum rows to plot"
+msgstr ""
+
+#: templates/table/search/replace_preview.phtml:13
+msgid "Find and replace - preview"
+msgstr ""
+
+#: templates/table/search/replace_preview.phtml:18
+#, fuzzy
+#| msgid "Original position"
+msgid "Original string"
+msgstr "Оргинална позиција"
+
+#: templates/table/search/replace_preview.phtml:19
+#, fuzzy
+#| msgid "Relations"
+msgid "Replaced string"
+msgstr "Релации"
+
+#: templates/table/search/replace_preview.phtml:40
+#, fuzzy
+msgid "Replace"
+msgstr "Релации"
+
+#: templates/table/search/rows_zoom.phtml:16
+#, fuzzy
+msgid "Additional search criteria"
+msgstr "SQL упит"
+
+#: templates/table/search/search_and_replace.phtml:3
+#, fuzzy
+#| msgid "Replace NULL by"
+msgid "Replace with:"
+msgstr "Замени NULL со"
+
+#: templates/table/search/search_and_replace.phtml:22
+#, fuzzy
+#| msgid "as regular expression"
+msgid "Use regular expression"
+msgstr "како регуларен израз"
+
+#: templates/table/search/selection_form.phtml:12
+#, fuzzy
+#| msgid "Do a \"query by example\" (wildcard: \"%\")"
+msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
+msgstr "Направи \"упит по пример\" (џокер знак: \"%\")"
+
+#: templates/table/search/selection_form.phtml:34
+msgid "Do a \"query by example\" (wildcard: \"%\")"
+msgstr "Направи \"упит по пример\" (џокер знак: \"%\")"
+
+#: templates/table/search/zoom_result_form.phtml:7
+msgid "Browse/Edit the points"
+msgstr ""
+
+#: templates/table/search/zoom_result_form.phtml:15
+msgid "How to use"
+msgstr ""
+
+#: templates/table/search/zoom_result_form.phtml:23
+#, fuzzy
+#| msgid "Reset"
+msgid "Reset zoom"
+msgstr "Поништи"
+
+#: templates/table/secondary_tabs.phtml:14
+#, fuzzy
+#| msgid "Relation view"
+msgid "Relation view"
+msgstr "Релационен поглед"
+
+#: templates/table/structure/actions_in_table_structure.phtml:14
+#, php-format
+msgid "A primary key has been added on %s."
+msgstr "Примарниот клуч %s е додаден."
+
+#: templates/table/structure/actions_in_table_structure.phtml:34
+#: templates/table/structure/actions_in_table_structure.phtml:54
+#: templates/table/structure/actions_in_table_structure.phtml:79
+#: templates/table/structure/actions_in_table_structure.phtml:101
+#, php-format
+msgid "An index has been added on %s."
+msgstr "Клучот е додаден %s."
+
+#: templates/table/structure/actions_in_table_structure.phtml:130
+#: templates/table/structure/check_all_table_column.phtml:59
+#, fuzzy
+#| msgid "Remove database"
+msgid "Remove from central columns"
+msgstr "Избриши ја базата на податоци."
+
+#: templates/table/structure/actions_in_table_structure.phtml:138
+#: templates/table/structure/check_all_table_column.phtml:55
+#, fuzzy
+#| msgid "Add %s field(s)"
+msgid "Add to central columns"
+msgstr "Додади %s полиња"
+
+#: templates/table/structure/add_column.phtml:7
+#, fuzzy, php-format
+#| msgid "Add %s field(s)"
+msgid "Add %s column(s)"
+msgstr "Додади %s полиња"
+
+#: templates/table/structure/add_column.phtml:12
+#, fuzzy
+#| msgid "At Beginning of Table"
+msgid "at beginning of table"
+msgstr "на почетокот од табелата"
+
+#: templates/table/structure/display_structure.phtml:140 view_create.php:181
+#, fuzzy
+#| msgid "Print view"
+msgid "Edit view"
+msgstr "Преглед за печатење"
+
+#: templates/table/structure/display_table_stats.phtml:9
+msgid "Space usage"
+msgstr "Големина"
+
+#: templates/table/structure/display_table_stats.phtml:32
+msgid "Effective"
+msgstr "Ефективни"
+
+#: templates/table/structure/move_columns_dialog.phtml:1
+#: templates/table/structure/optional_action_links.phtml:21
+#, fuzzy
+#| msgid "Add %s field(s)"
+msgid "Move columns"
+msgstr "Додади %s полиња"
+
+#: templates/table/structure/move_columns_dialog.phtml:2
+msgid "Move the columns by dragging them up and down."
+msgstr ""
+
+#: templates/table/structure/optional_action_links.phtml:9
+msgid "Propose table structure"
+msgstr "Предложи структура на табелата"
+
+#: templates/table/structure/optional_action_links.phtml:24
+#, fuzzy
+#| msgid "Propose table structure"
+msgid "Improve table structure"
+msgstr "Предложи структура на табелата"
+
+#: templates/table/structure/optional_action_links.phtml:30
+#, fuzzy
+msgid "Track view"
+msgstr "Проверка на табелата"
+
+#: templates/table/structure/row_stats_table.phtml:3
+#, fuzzy
+#| msgid "Row Statistics"
+msgid "Row statistics"
+msgstr "Статистики за записите"
+
+#: templates/table/structure/row_stats_table.phtml:9
+msgid "static"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:11
+msgid "dynamic"
+msgstr "динамички"
+
+#: templates/table/structure/row_stats_table.phtml:22
+msgid "partitioned"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:54
+msgid "Row length"
+msgstr "Должина на запис"
+
+#: templates/table/structure/row_stats_table.phtml:66
+msgid "Row size"
+msgstr "Големина на запис"
+
+#: templates/table/structure/row_stats_table.phtml:73
+msgid "Next autoindex"
+msgstr ""
+
+#: templates/table/structure/table_structure_row.phtml:46
+#, fuzzy, php-format
+#| msgid "Table %s has been dropped."
+msgid "Column %s has been dropped."
+msgstr "Табелата %s е избришана"
+
 #: themes.php:17 themes.php:22
 msgid "Theme"
 msgstr ""
@@ -17458,6 +17481,11 @@ msgstr ""
 msgid "concurrent_insert is set to 0"
 msgstr ""
 
+#, fuzzy
+#~| msgid "Read misses"
+#~ msgid "Read as multibytes"
+#~ msgstr "Промашувања при читање"
+
 #, fuzzy
 #~| msgid "Relational schema"
 #~ msgid "Relational display column"
diff --git a/po/ml.po b/po/ml.po
index c1db02bb1a..78056628a6 100644
--- a/po/ml.po
+++ b/po/ml.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 4.5.0-dev\n"
 "Report-Msgid-Bugs-To: developers@phpmyadmin.net\n"
-"POT-Creation-Date: 2015-08-08 13:53-0400\n"
+"POT-Creation-Date: 2015-08-12 08:10-0400\n"
 "PO-Revision-Date: 2014-02-27 10:56+0200\n"
 "Last-Translator: Michal Čihař <michal@cihar.com>\n"
 "Language-Team: Malayalam <https://hosted.weblate.org/projects/phpmyadmin/"
@@ -55,7 +55,7 @@ msgid "Table comments:"
 msgstr "പട്ടിക അഭിപ്രയങ്ങൾ"
 
 #: db_datadict.php:104 libraries/Index.class.php:699
-#: libraries/insert_edit.lib.php:1567
+#: libraries/insert_edit.lib.php:1565
 #: libraries/navigation/Nodes/Node_Column.class.php:30
 #: libraries/plugins/export/ExportHtmlword.class.php:280
 #: libraries/plugins/export/ExportHtmlword.class.php:375
@@ -69,13 +69,14 @@ msgstr "പട്ടിക അഭിപ്രയങ്ങൾ"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1023
 #: libraries/tracking.lib.php:879 libraries/tracking.lib.php:975
 #: templates/columns_definitions/column_name.phtml:18
-#: templates/index_form.phtml:124 templates/table/table_header.phtml:6
-#: templates/table/zoom_result_form.phtml:33
-#: templates/tbl_relation/common_form.phtml:10
-#: templates/tbl_relation/common_form.phtml:43
-#: templates/tbl_relation/foreign_key_row.phtml:194
-#: templates/tbl_relation/foreign_key_row.phtml:206
-#: templates/tbl_relation/internal_relational_row.phtml:71
+#: templates/table/index_form.phtml:124
+#: templates/table/relation/common_form.phtml:10
+#: templates/table/relation/common_form.phtml:43
+#: templates/table/relation/foreign_key_row.phtml:194
+#: templates/table/relation/foreign_key_row.phtml:206
+#: templates/table/relation/internal_relational_row.phtml:71
+#: templates/table/search/table_header.phtml:6
+#: templates/table/search/zoom_result_form.phtml:33
 msgid "Column"
 msgstr "നിര"
 
@@ -93,21 +94,21 @@ msgstr "നിര"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1001
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1024
 #: libraries/rte/rte_list.lib.php:75 libraries/rte/rte_list.lib.php:103
-#: libraries/rte/rte_routines.lib.php:802
-#: libraries/rte/rte_routines.lib.php:831
-#: libraries/rte/rte_routines.lib.php:1493
+#: libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_routines.lib.php:922
+#: libraries/rte/rte_routines.lib.php:1584
 #: libraries/server_privileges.lib.php:2369 libraries/tracking.lib.php:880
 #: libraries/tracking.lib.php:972
 #: templates/columns_definitions/table_fields_definitions.phtml:11
-#: templates/structure/table_header.phtml:48
-#: templates/structure/table_structure_header.phtml:6
-#: templates/table/table_header.phtml:7
+#: templates/database/structure/table_header.phtml:48
+#: templates/table/search/table_header.phtml:7
+#: templates/table/structure/table_structure_header.phtml:6
 msgid "Type"
 msgstr "തരം"
 
 #: db_datadict.php:106 libraries/Index.class.php:702
 #: libraries/central_columns.lib.php:708
-#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1576
+#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1574
 #: libraries/plugins/export/ExportHtmlword.class.php:286
 #: libraries/plugins/export/ExportHtmlword.class.php:381
 #: libraries/plugins/export/ExportLatex.class.php:509
@@ -120,8 +121,8 @@ msgstr "തരം"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1026
 #: libraries/tracking.lib.php:882 libraries/tracking.lib.php:978
 #: templates/columns_definitions/table_fields_definitions.phtml:39
-#: templates/structure/table_structure_header.phtml:9
-#: templates/table/zoom_result_form.phtml:34
+#: templates/table/search/zoom_result_form.phtml:34
+#: templates/table/structure/table_structure_header.phtml:9
 msgid "Null"
 msgstr "ശൂന്യം"
 
@@ -139,8 +140,8 @@ msgstr "ശൂന്യം"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1027
 #: libraries/replication_gui.lib.php:153 libraries/tracking.lib.php:883
 #: templates/columns_definitions/table_fields_definitions.phtml:25
-#: templates/structure/body_for_table_summary.phtml:55
-#: templates/structure/table_structure_header.phtml:10
+#: templates/database/structure/body_for_table_summary.phtml:55
+#: templates/table/structure/table_structure_header.phtml:10
 msgid "Default"
 msgstr "സ്വതേ"
 
@@ -168,19 +169,19 @@ msgid "Comments"
 msgstr "അഭിപ്രായങ്ങൾ"
 
 #: db_datadict.php:146
-#: libraries/controllers/StructureController.class.php:1960
-#: libraries/controllers/StructureController.class.php:1965
+#: libraries/controllers/TableStructureController.class.php:951
+#: libraries/controllers/TableStructureController.class.php:956
 #: libraries/tracking.lib.php:922
 #: templates/columns_definitions/column_indexes.phtml:6
-#: templates/structure/check_all_table_column.phtml:22
-#: templates/structure/display_structure.phtml:74
+#: templates/table/structure/check_all_table_column.phtml:22
+#: templates/table/structure/display_structure.phtml:74
 msgid "Primary"
 msgstr ""
 
 #: db_datadict.php:156 js/messages.php:317 libraries/Index.class.php:567
 #: libraries/Index.class.php:606 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261 libraries/mult_submits.lib.php:403
+#: libraries/config/FormDisplay.tpl.php:272 libraries/mult_submits.lib.php:403
 #: libraries/mult_submits.lib.php:417
 #: libraries/plugins/export/ExportHtmlword.class.php:630
 #: libraries/plugins/export/ExportLatex.class.php:589
@@ -196,20 +197,20 @@ msgstr ""
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1010 libraries/tracking.lib.php:1015
 #: prefs_manage.php:140 templates/prefs_autoload.phtml:15
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "No"
 msgstr "ഇല്ല"
 
 #: db_datadict.php:156 js/messages.php:443 libraries/Index.class.php:568
 #: libraries/Index.class.php:605 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261
-#: libraries/controllers/StructureController.class.php:1344
-#: libraries/controllers/StructureController.class.php:2223
-#: libraries/controllers/StructureController.class.php:2232
-#: libraries/controllers/StructureController.class.php:2237
-#: libraries/controllers/StructureController.class.php:2242
-#: libraries/controllers/StructureController.class.php:2247
+#: libraries/config/FormDisplay.tpl.php:272
+#: libraries/controllers/TableStructureController.class.php:539
+#: libraries/controllers/TableStructureController.class.php:1201
+#: libraries/controllers/TableStructureController.class.php:1210
+#: libraries/controllers/TableStructureController.class.php:1215
+#: libraries/controllers/TableStructureController.class.php:1220
+#: libraries/controllers/TableStructureController.class.php:1225
 #: libraries/mult_submits.inc.php:82 libraries/mult_submits.inc.php:178
 #: libraries/mult_submits.lib.php:339 libraries/mult_submits.lib.php:372
 #: libraries/mult_submits.lib.php:401 libraries/mult_submits.lib.php:415
@@ -218,8 +219,8 @@ msgstr "ഇല്ല"
 #: libraries/plugins/export/ExportOdt.class.php:756
 #: libraries/plugins/export/ExportTexytext.class.php:567
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1077
-#: libraries/server_databases.lib.php:464
-#: libraries/server_databases.lib.php:474
+#: libraries/server_databases.lib.php:475
+#: libraries/server_databases.lib.php:485
 #: libraries/server_privileges.lib.php:2546
 #: libraries/server_privileges.lib.php:2727
 #: libraries/server_privileges.lib.php:2748
@@ -229,7 +230,7 @@ msgstr "ഇല്ല"
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1008 libraries/tracking.lib.php:1013
 #: prefs_manage.php:138 templates/prefs_autoload.phtml:14
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "Yes"
 msgstr "അതേ"
 
@@ -239,7 +240,7 @@ msgstr ""
 
 #: db_export.php:37 db_tracking.php:90 export.php:382
 #: libraries/DBQbe.class.php:326
-#: libraries/controllers/StructureController.class.php:231
+#: libraries/controllers/DatabaseStructureController.class.php:170
 #: libraries/navigation/NavigationTree.class.php:897
 msgid "No tables found in database."
 msgstr "വിവരശേഖരത്തിൽ ഒരു പട്ടികയും കണ്ടെത്താനായില്ല."
@@ -250,14 +251,14 @@ msgstr "വിവരശേഖരത്തിൽ ഒരു പട്ടികയ
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:26
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:120
-#: templates/structure/show_create.phtml:18
+#: templates/database/structure/show_create.phtml:18
 msgid "Tables"
 msgstr ""
 
 #: db_export.php:52 libraries/Menu.class.php:317 libraries/Menu.class.php:425
-#: libraries/Util.class.php:3333 libraries/Util.class.php:3343
-#: libraries/Util.class.php:3349 libraries/Util.class.php:3629
-#: libraries/Util.class.php:4327 libraries/Util.class.php:4344
+#: libraries/Util.class.php:3339 libraries/Util.class.php:3349
+#: libraries/Util.class.php:3355 libraries/Util.class.php:3635
+#: libraries/Util.class.php:4333 libraries/Util.class.php:4350
 #: libraries/central_columns.lib.php:728 libraries/config.values.php:39
 #: libraries/config.values.php:47 libraries/config.values.php:109
 #: libraries/config.values.php:115 libraries/config/setup.forms.php:323
@@ -271,7 +272,7 @@ msgstr ""
 #: libraries/navigation/Nodes/Node_Table.class.php:283
 #: libraries/server_privileges.lib.php:1141 libraries/tracking.lib.php:874
 #: templates/columns_definitions/table_fields_definitions.phtml:3
-#: templates/designer/table_list.phtml:28
+#: templates/database/designer/table_list.phtml:28
 msgid "Structure"
 msgstr ""
 
@@ -283,7 +284,7 @@ msgstr ""
 #: libraries/config/user_preferences.forms.php:292
 #: libraries/config/user_preferences.forms.php:297
 #: libraries/server_privileges.lib.php:1140
-#: templates/structure/display_table_stats.phtml:12
+#: templates/table/structure/display_table_stats.phtml:12
 msgid "Data"
 msgstr ""
 
@@ -361,10 +362,10 @@ msgstr ""
 #: libraries/server_privileges.lib.php:2908
 #: libraries/server_privileges.lib.php:3145
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4346
-#: templates/structure/table_header.phtml:21
-#: templates/tbl_relation/foreign_key_row.phtml:176
-#: templates/tbl_relation/internal_relational_row.phtml:63
+#: libraries/server_privileges.lib.php:4372
+#: templates/database/structure/table_header.phtml:21
+#: templates/table/relation/foreign_key_row.phtml:176
+#: templates/table/relation/internal_relational_row.phtml:63
 msgid "Table"
 msgstr "പട്ടിക"
 
@@ -381,7 +382,7 @@ msgid "Updated"
 msgstr ""
 
 #: db_tracking.php:130 js/messages.php:243 libraries/Menu.class.php:552
-#: libraries/Util.class.php:4314 libraries/config.values.php:104
+#: libraries/Util.class.php:4320 libraries/config.values.php:104
 #: libraries/rte/rte_events.lib.php:393 libraries/rte/rte_list.lib.php:101
 #: libraries/server_status_processes.lib.php:92 libraries/tracking.lib.php:279
 msgid "Status"
@@ -390,14 +391,15 @@ msgstr ""
 #: db_tracking.php:131 db_tracking.php:290 libraries/Index.class.php:693
 #: libraries/central_columns.lib.php:687 libraries/rte/rte_list.lib.php:74
 #: libraries/rte/rte_list.lib.php:89 libraries/rte/rte_list.lib.php:102
-#: libraries/server_databases.lib.php:398
+#: libraries/server_databases.lib.php:409
 #: libraries/server_privileges.lib.php:2372
 #: libraries/server_privileges.lib.php:3166
 #: libraries/server_privileges.lib.php:3342
 #: libraries/server_user_groups.lib.php:82
 #: libraries/server_variables.lib.php:189 libraries/tracking.lib.php:280
-#: libraries/tracking.lib.php:793 templates/structure/table_header.phtml:30
-#: templates/structure/table_structure_header.phtml:23
+#: libraries/tracking.lib.php:793
+#: templates/database/structure/table_header.phtml:30
+#: templates/table/structure/table_structure_header.phtml:23
 msgid "Action"
 msgstr ""
 
@@ -439,7 +441,7 @@ msgid "Untracked tables"
 msgstr ""
 
 #: db_tracking.php:305 db_tracking.php:336
-#: templates/structure/optional_action_links.phtml:17
+#: templates/table/structure/optional_action_links.phtml:17
 msgid "Track table"
 msgstr ""
 
@@ -489,7 +491,7 @@ msgid "Value for the column \"%s\""
 msgstr ""
 
 #: gis_data_editor.php:146
-#: templates/gis_visualization/gis_visualization.phtml:37
+#: templates/table/gis_visualization/gis_visualization.phtml:37
 msgid "Use OpenStreetMaps as Base Layer"
 msgstr ""
 
@@ -569,35 +571,35 @@ msgstr ""
 #: libraries/display_change_password.lib.php:162
 #: libraries/display_export.lib.php:402 libraries/display_export.lib.php:408
 #: libraries/display_import.lib.php:392 libraries/index.lib.php:44
-#: libraries/insert_edit.lib.php:1546 libraries/insert_edit.lib.php:1583
+#: libraries/insert_edit.lib.php:1544 libraries/insert_edit.lib.php:1581
 #: libraries/normalization.lib.php:165 libraries/normalization.lib.php:821
 #: libraries/operations.lib.php:38 libraries/operations.lib.php:108
 #: libraries/operations.lib.php:263 libraries/operations.lib.php:306
 #: libraries/operations.lib.php:801 libraries/operations.lib.php:874
 #: libraries/operations.lib.php:923 libraries/operations.lib.php:1337
 #: libraries/operations.lib.php:1658
-#: libraries/plugins/auth/AuthenticationCookie.class.php:244
+#: libraries/plugins/auth/AuthenticationCookie.class.php:232
 #: libraries/replication_gui.lib.php:122 libraries/replication_gui.lib.php:161
 #: libraries/replication_gui.lib.php:324 libraries/replication_gui.lib.php:461
 #: libraries/replication_gui.lib.php:906 libraries/rte/rte_events.lib.php:509
-#: libraries/rte/rte_routines.lib.php:969
-#: libraries/rte/rte_routines.lib.php:1581
+#: libraries/rte/rte_routines.lib.php:1060
+#: libraries/rte/rte_routines.lib.php:1672
 #: libraries/rte/rte_triggers.lib.php:396 libraries/server_bin_log.lib.php:61
 #: libraries/server_privileges.lib.php:705
 #: libraries/server_privileges.lib.php:2106
 #: libraries/server_privileges.lib.php:2872
 #: libraries/server_privileges.lib.php:3553
-#: libraries/server_privileges.lib.php:4627
+#: libraries/server_privileges.lib.php:4653
 #: libraries/server_user_groups.lib.php:285
 #: libraries/sql_query_form.lib.php:369 libraries/sql_query_form.lib.php:429
 #: libraries/tracking.lib.php:533 libraries/tracking.lib.php:653
 #: prefs_manage.php:277 prefs_manage.php:355
 #: templates/columns_definitions/column_definitions_form.phtml:59
-#: templates/header_location.phtml:17 templates/index_form.phtml:238
+#: templates/database/create_table.phtml:21 templates/header_location.phtml:28
 #: templates/startAndNumberOfRowsPanel.phtml:14
-#: templates/structure/add_column.phtml:25
-#: templates/table/create_table.phtml:21
-#: templates/table/selection_form.phtml:75 view_create.php:275
+#: templates/table/index_form.phtml:238
+#: templates/table/search/selection_form.phtml:75
+#: templates/table/structure/add_column.phtml:25 view_create.php:275
 #: view_operations.php:106
 msgid "Go"
 msgstr "പോകൂ"
@@ -675,7 +677,7 @@ msgstr ""
 msgid "Could not load import plugins, please check your installation!"
 msgstr ""
 
-#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1466
+#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1460
 #, fuzzy, php-format
 #| msgid "Database %1$s has been created."
 msgid "Bookmark %s has been created."
@@ -710,11 +712,11 @@ msgstr ""
 msgid "Back"
 msgstr ""
 
-#: index.php:148 libraries/Footer.class.php:70
+#: index.php:149 libraries/Footer.class.php:70
 msgid "phpMyAdmin Demo Server"
 msgstr ""
 
-#: index.php:152
+#: index.php:153
 #, php-format
 msgid ""
 "You are using the demo server. You can do anything here, but please do not "
@@ -722,114 +724,114 @@ msgid ""
 "at %s."
 msgstr ""
 
-#: index.php:162
+#: index.php:163
 msgid "General Settings"
 msgstr ""
 
-#: index.php:190 libraries/display_change_password.lib.php:50
+#: index.php:191 libraries/display_change_password.lib.php:50
 #: libraries/display_change_password.lib.php:53 user_password.php:247
 msgid "Change password"
 msgstr ""
 
-#: index.php:206
+#: index.php:207
 msgid "Server connection collation"
 msgstr ""
 
-#: index.php:228
+#: index.php:229
 msgid "Appearance Settings"
 msgstr ""
 
-#: index.php:258 prefs_manage.php:285
+#: index.php:259 prefs_manage.php:285
 msgid "More settings"
 msgstr ""
 
-#: index.php:279
+#: index.php:280
 msgid "Database server"
 msgstr ""
 
-#: index.php:282 libraries/plugins/auth/AuthenticationCookie.class.php:181
+#: index.php:283 libraries/plugins/auth/AuthenticationCookie.class.php:169
 msgid "Server:"
 msgstr ""
 
-#: index.php:286
+#: index.php:287
 msgid "Server type:"
 msgstr ""
 
-#: index.php:290 libraries/plugins/export/ExportLatex.class.php:212
+#: index.php:291 libraries/plugins/export/ExportLatex.class.php:212
 #: libraries/plugins/export/ExportSql.class.php:687
 #: libraries/plugins/export/ExportXml.class.php:189
 msgid "Server version:"
 msgstr ""
 
-#: index.php:296
+#: index.php:297
 msgid "Protocol version:"
 msgstr ""
 
-#: index.php:300
+#: index.php:301
 msgid "User:"
 msgstr ""
 
-#: index.php:305
+#: index.php:306
 msgid "Server charset:"
 msgstr ""
 
-#: index.php:320
+#: index.php:321
 msgid "Web server"
 msgstr ""
 
-#: index.php:331
+#: index.php:332
 #, fuzzy
 #| msgid "Database comment"
 msgid "Database client version:"
 msgstr "വിവരശേഖര അഭിപ്രായം: "
 
-#: index.php:335
+#: index.php:336
 msgid "PHP extension:"
 msgstr ""
 
-#: index.php:349
+#: index.php:350
 #, fuzzy
 #| msgid "Database comment"
 msgid "PHP version:"
 msgstr "വിവരശേഖര അഭിപ്രായം: "
 
-#: index.php:360
+#: index.php:361
 msgid "Show PHP information"
 msgstr ""
 
-#: index.php:383
+#: index.php:384
 msgid "Version information:"
 msgstr ""
 
-#: index.php:392 libraries/Util.class.php:432 libraries/Util.class.php:495
-#: libraries/config/FormDisplay.tpl.php:151
+#: index.php:393 libraries/Util.class.php:432 libraries/Util.class.php:495
+#: libraries/config/FormDisplay.tpl.php:162
 #: libraries/display_export.lib.php:577 libraries/engines/pbxt.lib.php:162
 #: libraries/navigation/NavigationHeader.class.php:196
 #: libraries/server_variables.lib.php:160
 msgid "Documentation"
 msgstr ""
 
-#: index.php:399
+#: index.php:400
 msgid "Wiki"
 msgstr ""
 
-#: index.php:408
+#: index.php:409
 msgid "Official Homepage"
 msgstr ""
 
-#: index.php:415
+#: index.php:416
 msgid "Contribute"
 msgstr ""
 
-#: index.php:422
+#: index.php:423
 msgid "Get support"
 msgstr ""
 
-#: index.php:429
+#: index.php:430
 msgid "List of changes"
 msgstr ""
 
-#: index.php:451
+#: index.php:452
 msgid ""
 "You are connected as 'root' with no password, which corresponds to the "
 "default MySQL privileged account. Your MySQL server is running with this "
@@ -837,21 +839,21 @@ msgid ""
 "by setting a password for user 'root'."
 msgstr ""
 
-#: index.php:468
+#: index.php:469
 msgid ""
 "You have enabled mbstring.func_overload in your PHP configuration. This "
 "option is incompatible with phpMyAdmin and might cause some data to be "
 "corrupted!"
 msgstr ""
 
-#: index.php:483
+#: index.php:484
 msgid ""
 "The mbstring PHP extension was not found and you seem to be using a "
 "multibyte charset. Without the mbstring extension phpMyAdmin is unable to "
 "split strings correctly and it may result in unexpected results."
 msgstr ""
 
-#: index.php:500
+#: index.php:501
 msgid ""
 "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini."
 "session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower than "
@@ -859,17 +861,17 @@ msgid ""
 "expire sooner than configured in phpMyAdmin."
 msgstr ""
 
-#: index.php:519
+#: index.php:520
 msgid ""
 "Login cookie store is lower than cookie validity configured in phpMyAdmin, "
 "because of this, your login will expire sooner than configured in phpMyAdmin."
 msgstr ""
 
-#: index.php:535
+#: index.php:536
 msgid "The configuration file now needs a secret passphrase (blowfish_secret)."
 msgstr ""
 
-#: index.php:548
+#: index.php:549
 msgid ""
 "Directory [code]config[/code], which is used by the setup script, still "
 "exists in your phpMyAdmin directory. It is strongly recommended to remove it "
@@ -877,26 +879,26 @@ msgid ""
 "may be compromised by unauthorized people downloading your configuration."
 msgstr ""
 
-#: index.php:564
+#: index.php:565
 #, php-format
 msgid ""
 "The phpMyAdmin configuration storage is not completely configured, some "
 "extended features have been deactivated. %sFind out why%s. "
 msgstr ""
 
-#: index.php:571
+#: index.php:572
 msgid ""
 "Or alternately go to 'Operations' tab of any database to set it up there."
 msgstr ""
 
-#: index.php:620
+#: index.php:621
 #, php-format
 msgid ""
 "Your PHP MySQL library version %s differs from your MySQL server version %s. "
 "This may cause unpredictable behavior."
 msgstr ""
 
-#: index.php:648
+#: index.php:649
 #, php-format
 msgid ""
 "Server running with Suhosin. Please refer to %sdocumentation%s for possible "
@@ -1037,8 +1039,8 @@ msgstr ""
 msgid "Save & Close"
 msgstr ""
 
-#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:404
-#: libraries/insert_edit.lib.php:1550 prefs_manage.php:361
+#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:415
+#: libraries/insert_edit.lib.php:1548 prefs_manage.php:361
 #: prefs_manage.php:372
 msgid "Reset"
 msgstr ""
@@ -1073,7 +1075,7 @@ msgstr ""
 msgid "Edit Index"
 msgstr ""
 
-#: js/messages.php:99 templates/index_form.phtml:232
+#: js/messages.php:99 templates/table/index_form.phtml:232
 #, php-format
 msgid "Add %s column(s) to index"
 msgstr ""
@@ -1094,13 +1096,14 @@ msgstr ""
 msgid "Please select column(s) for the index."
 msgstr ""
 
-#: js/messages.php:106 templates/structure/add_column.phtml:1
+#: js/messages.php:106 templates/table/structure/add_column.phtml:1
 msgid "You have to add at least one column."
 msgstr ""
 
-#: js/messages.php:109 libraries/insert_edit.lib.php:1548
+#: js/messages.php:109 libraries/insert_edit.lib.php:1546
 #: templates/columns_definitions/column_definitions_form.phtml:162
-#: templates/index_form.phtml:237 templates/tbl_relation/common_form.phtml:106
+#: templates/table/index_form.phtml:237
+#: templates/table/relation/common_form.phtml:106
 msgid "Preview SQL"
 msgstr ""
 
@@ -1121,7 +1124,7 @@ msgid "SQL query:"
 msgstr ""
 
 #. l10n: Default label for the y-Axis of Charts
-#: js/messages.php:118 templates/tbl_chart.phtml:109
+#: js/messages.php:118 templates/table/chart/tbl_chart.phtml:109
 msgid "Y Values"
 msgstr ""
 
@@ -1274,7 +1277,7 @@ msgstr ""
 msgid "Bytes received"
 msgstr ""
 
-#: js/messages.php:169 libraries/server_status.lib.php:226
+#: js/messages.php:169 libraries/server_status.lib.php:235
 msgid "Connections"
 msgstr ""
 
@@ -1333,12 +1336,12 @@ msgstr "%s പട്ടിക"
 msgid "Questions"
 msgstr ""
 
-#: js/messages.php:184 libraries/server_status.lib.php:134
+#: js/messages.php:184 libraries/server_status.lib.php:143
 msgid "Traffic"
 msgstr ""
 
 #: js/messages.php:185 libraries/Menu.class.php:586
-#: libraries/Util.class.php:4318 libraries/server_status_monitor.lib.php:257
+#: libraries/Util.class.php:4324 libraries/server_status_monitor.lib.php:257
 msgid "Settings"
 msgstr ""
 
@@ -1358,8 +1361,9 @@ msgstr ""
 #: libraries/server_status_monitor.lib.php:236
 #: libraries/server_status_processes.lib.php:308
 #: templates/columns_definitions/transformation.phtml:4
-#: templates/designer/options_panel.phtml:178
-#: templates/table/options_zoom.phtml:12 templates/table/rows_zoom.phtml:26
+#: templates/database/designer/options_panel.phtml:178
+#: templates/table/search/options_zoom.phtml:12
+#: templates/table/search/rows_zoom.phtml:26
 msgid "None"
 msgstr ""
 
@@ -1629,8 +1633,8 @@ msgstr ""
 
 #: js/messages.php:270 libraries/Menu.class.php:352
 #: libraries/Menu.class.php:455 libraries/Menu.class.php:582
-#: libraries/Util.class.php:4317 libraries/Util.class.php:4332
-#: libraries/Util.class.php:4349 libraries/config/messages.inc.php:258
+#: libraries/Util.class.php:4323 libraries/Util.class.php:4338
+#: libraries/Util.class.php:4355 libraries/config/messages.inc.php:258
 #: libraries/display_import.lib.php:105
 #: libraries/server_status_monitor.lib.php:318 prefs_manage.php:238
 #: setup/frames/menu.inc.php:26
@@ -1690,13 +1694,13 @@ msgid "Formatting SQL..."
 msgstr ""
 
 #: js/messages.php:293 libraries/server_variables.lib.php:157
-#: templates/designer/aggregate_query_panel.phtml:63
-#: templates/designer/delete_relation_panel.phtml:28
-#: templates/designer/having_query_panel.phtml:117
-#: templates/designer/new_relation_panel.phtml:88
-#: templates/designer/options_panel.phtml:253
-#: templates/designer/rename_to_panel.phtml:45
-#: templates/designer/where_query_panel.phtml:83
+#: templates/database/designer/aggregate_query_panel.phtml:63
+#: templates/database/designer/delete_relation_panel.phtml:28
+#: templates/database/designer/having_query_panel.phtml:117
+#: templates/database/designer/new_relation_panel.phtml:88
+#: templates/database/designer/options_panel.phtml:253
+#: templates/database/designer/rename_to_panel.phtml:45
+#: templates/database/designer/where_query_panel.phtml:83
 msgid "Cancel"
 msgstr ""
 
@@ -1704,7 +1708,7 @@ msgstr ""
 msgid "Page-related settings"
 msgstr ""
 
-#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:402
+#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:413
 msgid "Apply"
 msgstr ""
 
@@ -1739,8 +1743,8 @@ msgstr ""
 msgid "Error text: %s"
 msgstr ""
 
-#: js/messages.php:307 libraries/db_common.inc.php:68
-#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:450
+#: js/messages.php:307 libraries/db_common.inc.php:69
+#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:461
 msgid "No databases selected."
 msgstr ""
 
@@ -1752,12 +1756,13 @@ msgstr ""
 msgid "Adding Primary Key"
 msgstr ""
 
-#: js/messages.php:310 templates/designer/aggregate_query_panel.phtml:59
-#: templates/designer/having_query_panel.phtml:113
-#: templates/designer/new_relation_panel.phtml:87
-#: templates/designer/options_panel.phtml:252
-#: templates/designer/rename_to_panel.phtml:41
-#: templates/designer/where_query_panel.phtml:82
+#: js/messages.php:310
+#: templates/database/designer/aggregate_query_panel.phtml:59
+#: templates/database/designer/having_query_panel.phtml:113
+#: templates/database/designer/new_relation_panel.phtml:87
+#: templates/database/designer/options_panel.phtml:252
+#: templates/database/designer/rename_to_panel.phtml:41
+#: templates/database/designer/where_query_panel.phtml:82
 msgid "OK"
 msgstr ""
 
@@ -1777,7 +1782,7 @@ msgstr ""
 msgid "Changing Charset"
 msgstr ""
 
-#: js/messages.php:320 libraries/Util.class.php:3217
+#: js/messages.php:320 libraries/Util.class.php:3223
 msgid "Enable foreign key checks"
 msgstr ""
 
@@ -1812,20 +1817,21 @@ msgstr ""
 #: js/messages.php:334 libraries/DisplayResults.class.php:4834
 #: libraries/DisplayResults.class.php:5092 libraries/Menu.class.php:344
 #: libraries/Menu.class.php:446 libraries/Menu.class.php:578
-#: libraries/Util.class.php:3636 libraries/Util.class.php:3637
-#: libraries/Util.class.php:4316 libraries/Util.class.php:4331
-#: libraries/Util.class.php:4348 libraries/config/messages.inc.php:252
+#: libraries/Util.class.php:3642 libraries/Util.class.php:3643
+#: libraries/Util.class.php:4322 libraries/Util.class.php:4337
+#: libraries/Util.class.php:4354 libraries/config/messages.inc.php:252
 #: libraries/display_export.lib.php:173 libraries/rte/rte_list.lib.php:146
 #: libraries/server_privileges.lib.php:2211
 #: libraries/server_privileges.lib.php:2290
 #: libraries/server_privileges.lib.php:2632
 #: libraries/server_privileges.lib.php:3356
 #: libraries/server_status_monitor.lib.php:322 prefs_manage.php:303
-#: setup/frames/menu.inc.php:27 templates/structure/check_all_tables.phtml:11
+#: setup/frames/menu.inc.php:27
+#: templates/database/structure/check_all_tables.phtml:11
 msgid "Export"
 msgstr ""
 
-#: js/messages.php:337 libraries/rte/rte_routines.lib.php:652
+#: js/messages.php:337 libraries/rte/rte_routines.lib.php:743
 msgid "ENUM/SET editor"
 msgstr ""
 
@@ -1864,7 +1870,7 @@ msgstr ""
 #: libraries/Console.class.php:214 libraries/DisplayResults.class.php:3474
 #: libraries/DisplayResults.class.php:4818 libraries/Index.class.php:723
 #: libraries/Util.class.php:706 libraries/Util.class.php:1202
-#: libraries/Util.class.php:3634 libraries/Util.class.php:3635
+#: libraries/Util.class.php:3640 libraries/Util.class.php:3641
 #: libraries/central_columns.lib.php:851
 #: libraries/central_columns.lib.php:1193
 #: libraries/config/messages.inc.php:892
@@ -1882,7 +1888,7 @@ msgstr ""
 #: libraries/server_user_groups.lib.php:129
 #: libraries/sql_query_form.lib.php:416 libraries/tracking.lib.php:477
 #: setup/frames/index.inc.php:183 setup/frames/index.inc.php:291
-#: templates/designer/delete_relation_panel.phtml:27
+#: templates/database/designer/delete_relation_panel.phtml:27
 msgid "Delete"
 msgstr ""
 
@@ -2047,11 +2053,11 @@ msgid "No dependencies selected!"
 msgstr ""
 
 #: js/messages.php:394 libraries/central_columns.lib.php:1214
-#: libraries/insert_edit.lib.php:1458 libraries/server_variables.lib.php:155
+#: libraries/insert_edit.lib.php:1456 libraries/server_variables.lib.php:155
 #: setup/frames/config.inc.php:42 setup/frames/index.inc.php:279
 #: templates/columns_definitions/column_definitions_form.phtml:165
-#: templates/gis_visualization/gis_visualization.phtml:48
-#: templates/tbl_relation/common_form.phtml:107
+#: templates/table/gis_visualization/gis_visualization.phtml:48
+#: templates/table/relation/common_form.phtml:107
 msgid "Save"
 msgstr ""
 
@@ -2132,8 +2138,8 @@ msgid "Data point content"
 msgstr ""
 
 #: js/messages.php:430 js/messages.php:562 js/messages.php:579
-#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2573
-#: templates/index_form.phtml:154 templates/index_form.phtml:194
+#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2571
+#: templates/table/index_form.phtml:154 templates/table/index_form.phtml:194
 msgid "Ignore"
 msgstr ""
 
@@ -2192,8 +2198,8 @@ msgstr ""
 msgid "Please select the primary key or a unique key!"
 msgstr ""
 
-#: js/messages.php:457 templates/designer/side_menu.phtml:91
-#: templates/designer/side_menu.phtml:94
+#: js/messages.php:457 templates/database/designer/side_menu.phtml:91
+#: templates/database/designer/side_menu.phtml:94
 msgid "Choose column to display"
 msgstr ""
 
@@ -2207,18 +2213,18 @@ msgstr ""
 msgid "Page name"
 msgstr ""
 
-#: js/messages.php:463 templates/designer/side_menu.phtml:56
-#: templates/designer/side_menu.phtml:59
+#: js/messages.php:463 templates/database/designer/side_menu.phtml:56
+#: templates/database/designer/side_menu.phtml:59
 msgid "Save page"
 msgstr ""
 
-#: js/messages.php:464 templates/designer/side_menu.phtml:63
-#: templates/designer/side_menu.phtml:66
+#: js/messages.php:464 templates/database/designer/side_menu.phtml:63
+#: templates/database/designer/side_menu.phtml:66
 msgid "Save page as"
 msgstr ""
 
-#: js/messages.php:465 templates/designer/side_menu.phtml:49
-#: templates/designer/side_menu.phtml:52
+#: js/messages.php:465 templates/database/designer/side_menu.phtml:49
+#: templates/database/designer/side_menu.phtml:52
 msgid "Open page"
 msgstr ""
 
@@ -2226,7 +2232,7 @@ msgstr ""
 msgid "Delete page"
 msgstr ""
 
-#: js/messages.php:467 templates/designer/side_menu.phtml:10
+#: js/messages.php:467 templates/database/designer/side_menu.phtml:10
 msgid "Untitled"
 msgstr ""
 
@@ -2337,7 +2343,7 @@ msgstr ""
 msgid "cancel"
 msgstr ""
 
-#: js/messages.php:499 libraries/server_status.lib.php:271
+#: js/messages.php:499 libraries/server_status.lib.php:280
 msgid "Aborted"
 msgstr ""
 
@@ -2899,7 +2905,7 @@ msgstr ""
 
 #: js/messages.php:793 libraries/Message.class.php:199
 #: libraries/Util.class.php:654 libraries/core.lib.php:245
-#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1172
+#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1170
 #: tbl_operations.php:229 view_operations.php:63
 msgid "Error"
 msgstr ""
@@ -2958,8 +2964,8 @@ msgstr ""
 msgid "per minute"
 msgstr ""
 
-#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:143
-#: libraries/server_status.lib.php:228
+#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:152
+#: libraries/server_status.lib.php:237
 #: libraries/server_status_queries.lib.php:98
 msgid "per hour"
 msgstr ""
@@ -2977,7 +2983,7 @@ msgstr ""
 msgid "Wrong permissions on configuration file, should not be world writable!"
 msgstr ""
 
-#: libraries/Config.class.php:1799
+#: libraries/Config.class.php:1801
 msgid "Font size"
 msgstr ""
 
@@ -3005,10 +3011,10 @@ msgstr ""
 #: libraries/server_privileges.lib.php:2890
 #: libraries/server_privileges.lib.php:3144
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4332
+#: libraries/server_privileges.lib.php:4358
 #: libraries/server_status_processes.lib.php:80
-#: templates/tbl_relation/foreign_key_row.phtml:165
-#: templates/tbl_relation/internal_relational_row.phtml:55
+#: templates/table/relation/foreign_key_row.phtml:165
+#: templates/table/relation/internal_relational_row.phtml:55
 msgid "Database"
 msgstr ""
 
@@ -3101,11 +3107,11 @@ msgstr ""
 #: libraries/plugins/import/ImportMediawiki.class.php:60
 #: libraries/plugins/import/ImportOds.class.php:59
 #: libraries/plugins/import/ImportShp.class.php:57
-#: libraries/plugins/import/ImportSql.class.php:148
+#: libraries/plugins/import/ImportSql.class.php:51
 #: libraries/plugins/import/ImportXml.class.php:58
-#: libraries/rte/rte_routines.lib.php:833 templates/index_form.phtml:49
-#: templates/structure/row_stats_table.phtml:20
-#: templates/table/options.phtml:2
+#: libraries/rte/rte_routines.lib.php:924 templates/table/index_form.phtml:49
+#: templates/table/search/options.phtml:2
+#: templates/table/structure/row_stats_table.phtml:20
 msgid "Options"
 msgstr ""
 
@@ -3146,7 +3152,8 @@ msgstr "അവരോഹണം"
 msgid "Order:"
 msgstr ""
 
-#: libraries/Console.class.php:289 templates/table/replace_preview.phtml:17
+#: libraries/Console.class.php:289
+#: templates/table/search/replace_preview.phtml:17
 #, fuzzy
 #| msgid "Column"
 msgid "Count"
@@ -3253,9 +3260,9 @@ msgstr ""
 #: libraries/operations.lib.php:794 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:191
-#: templates/structure/sortable_header.phtml:21
-#: templates/structure/sortable_header.phtml:38
-#: templates/table/options.phtml:68
+#: templates/database/structure/sortable_header.phtml:21
+#: templates/database/structure/sortable_header.phtml:38
+#: templates/table/search/options.phtml:68
 msgid "Ascending"
 msgstr "ആരോഹണം"
 
@@ -3265,13 +3272,14 @@ msgstr "ആരോഹണം"
 #: libraries/operations.lib.php:797 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:188
-#: templates/structure/sortable_header.phtml:26
-#: templates/structure/sortable_header.phtml:43
-#: templates/table/options.phtml:69
+#: templates/database/structure/sortable_header.phtml:26
+#: templates/database/structure/sortable_header.phtml:43
+#: templates/table/search/options.phtml:69
 msgid "Descending"
 msgstr "അവരോഹണം"
 
-#: libraries/DBQbe.class.php:467 templates/table/search_and_replace.phtml:6
+#: libraries/DBQbe.class.php:467
+#: templates/table/search/search_and_replace.phtml:6
 #, fuzzy
 #| msgid "Column"
 msgid "Column:"
@@ -3442,12 +3450,12 @@ msgstr[0] ""
 msgstr[1] ""
 
 #: libraries/DbSearch.class.php:354 libraries/Menu.class.php:311
-#: libraries/Util.class.php:3337 libraries/Util.class.php:3347
-#: libraries/Util.class.php:3623 libraries/Util.class.php:3624
-#: libraries/Util.class.php:4343 libraries/config.values.php:43
+#: libraries/Util.class.php:3343 libraries/Util.class.php:3353
+#: libraries/Util.class.php:3629 libraries/Util.class.php:3630
+#: libraries/Util.class.php:4349 libraries/config.values.php:43
 #: libraries/config.values.php:51 libraries/config.values.php:119
 #: libraries/navigation/Nodes/Node_Table.class.php:295
-#: templates/structure/check_all_table_column.phtml:5
+#: templates/table/structure/check_all_table_column.phtml:5
 msgid "Browse"
 msgstr ""
 
@@ -3464,7 +3472,8 @@ msgstr ""
 msgid "Words or values to search for (wildcard: \"%\"):"
 msgstr ""
 
-#: libraries/DbSearch.class.php:401 templates/table/search_and_replace.phtml:1
+#: libraries/DbSearch.class.php:401
+#: templates/table/search/search_and_replace.phtml:1
 msgid "Find:"
 msgstr ""
 
@@ -3512,28 +3521,28 @@ msgstr "തരംതിരിക്കുക"
 msgid "Search this table"
 msgstr "ഈ വില ഉപയോഗിക്കൂ"
 
-#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2532
-#: libraries/Util.class.php:2535
+#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2538
+#: libraries/Util.class.php:2541
 msgctxt "First page"
 msgid "Begin"
 msgstr ""
 
-#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2533
-#: libraries/Util.class.php:2536 libraries/server_bin_log.lib.php:170
+#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2539
+#: libraries/Util.class.php:2542 libraries/server_bin_log.lib.php:170
 #: libraries/server_bin_log.lib.php:172
 msgctxt "Previous page"
 msgid "Previous"
 msgstr ""
 
-#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2564
-#: libraries/Util.class.php:2574 libraries/server_bin_log.lib.php:204
+#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2570
+#: libraries/Util.class.php:2580 libraries/server_bin_log.lib.php:204
 #: libraries/server_bin_log.lib.php:206
 msgctxt "Next page"
 msgid "Next"
 msgstr ""
 
-#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2565
-#: libraries/Util.class.php:2575
+#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2571
+#: libraries/Util.class.php:2581
 msgctxt "Last page"
 msgid "End"
 msgstr ""
@@ -3610,9 +3619,9 @@ msgid "May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]."
 msgstr ""
 
 #: libraries/DisplayResults.class.php:4332 libraries/Message.class.php:180
-#: libraries/controllers/TableRelationController.class.php:258
+#: libraries/controllers/TableRelationController.class.php:259
 #: libraries/controllers/TableSearchController.class.php:655
-#: libraries/rte/rte_routines.lib.php:1332 libraries/sql_query_form.lib.php:89
+#: libraries/rte/rte_routines.lib.php:1423 libraries/sql_query_form.lib.php:89
 #: tbl_operations.php:227 tbl_row_action.php:138 view_operations.php:62
 #, fuzzy
 #| msgid "Database %s has been dropped."
@@ -3620,7 +3629,7 @@ msgid "Your SQL query has been executed successfully."
 msgstr "%s എന്ന വിവരശേഖരം ഉപേക്ഷിച്ചിരിക്കുന്നു."
 
 #: libraries/DisplayResults.class.php:4660
-#: libraries/controllers/StructureController.class.php:629
+#: libraries/controllers/DatabaseStructureController.class.php:564
 #, php-format
 msgid ""
 "This view has at least this number of rows. Please refer to %sdocumentation"
@@ -3644,33 +3653,33 @@ msgstr ""
 msgid "%d total"
 msgstr "%s പട്ടിക"
 
-#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1318
+#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1312
 #, php-format
 msgid "Query took %01.4f seconds."
 msgstr ""
 
 #: libraries/DisplayResults.class.php:4807
-#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4767
-#: libraries/Util.class.php:4773 libraries/mult_submits.inc.php:50
-#: templates/structure/check_all_tables.phtml:2
-#: templates/structure/check_all_tables.phtml:9
+#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4773
+#: libraries/Util.class.php:4779 libraries/mult_submits.inc.php:50
+#: templates/database/structure/check_all_tables.phtml:2
+#: templates/database/structure/check_all_tables.phtml:9
 msgid "With selected:"
 msgstr ""
 
 #: libraries/DisplayResults.class.php:4811
-#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4769
-#: libraries/Util.class.php:4770 libraries/server_privileges.lib.php:1174
+#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4775
+#: libraries/Util.class.php:4776 libraries/server_privileges.lib.php:1174
 #: libraries/server_privileges.lib.php:1175
 #: libraries/server_privileges.lib.php:1387
 #: libraries/server_user_groups.lib.php:231
-#: templates/structure/check_all_tables.phtml:3
-#: templates/structure/check_all_tables.phtml:4
+#: templates/database/structure/check_all_tables.phtml:3
+#: templates/database/structure/check_all_tables.phtml:4
 msgid "Check All"
 msgstr ""
 
 #: libraries/DisplayResults.class.php:4985 libraries/Header.class.php:383
-#: templates/structure/optional_action_links.phtml:1
-#: templates/structure/print_view_data_dictionary_link.phtml:3
+#: templates/database/structure/print_view_data_dictionary_link.phtml:3
+#: templates/table/structure/optional_action_links.phtml:1
 msgid "Print view"
 msgstr ""
 
@@ -3678,7 +3687,8 @@ msgstr ""
 msgid "Query results operations"
 msgstr ""
 
-#: libraries/DisplayResults.class.php:5105 templates/tbl_chart.phtml:12
+#: libraries/DisplayResults.class.php:5105
+#: templates/table/chart/tbl_chart.phtml:12
 msgid "Display chart"
 msgstr ""
 
@@ -3769,7 +3779,7 @@ msgid "Click on the bar to scroll to top of page"
 msgstr ""
 
 #: libraries/Header.class.php:749
-#: libraries/plugins/auth/AuthenticationCookie.class.php:152
+#: libraries/plugins/auth/AuthenticationCookie.class.php:140
 msgid "Javascript must be enabled past this point!"
 msgstr ""
 
@@ -3791,11 +3801,11 @@ msgid "Keyname"
 msgstr "കീനാമം"
 
 #: libraries/Index.class.php:697
-#: libraries/controllers/StructureController.class.php:1962
-#: libraries/controllers/StructureController.class.php:1967
+#: libraries/controllers/TableStructureController.class.php:953
+#: libraries/controllers/TableStructureController.class.php:958
 #: libraries/tracking.lib.php:973
 #: templates/columns_definitions/column_indexes.phtml:11
-#: templates/structure/check_all_table_column.phtml:26
+#: templates/table/structure/check_all_table_column.phtml:26
 msgid "Unique"
 msgstr ""
 
@@ -3814,16 +3824,17 @@ msgstr ""
 #: libraries/server_collations.lib.php:35 libraries/tracking.lib.php:881
 #: libraries/tracking.lib.php:977
 #: templates/columns_definitions/table_fields_definitions.phtml:33
-#: templates/structure/row_stats_table.phtml:31
-#: templates/structure/table_header.phtml:55
-#: templates/structure/table_structure_header.phtml:7
-#: templates/table/table_header.phtml:8
+#: templates/database/structure/table_header.phtml:55
+#: templates/table/search/table_header.phtml:8
+#: templates/table/structure/row_stats_table.phtml:31
+#: templates/table/structure/table_structure_header.phtml:7
 msgid "Collation"
 msgstr "നിബന്ധന"
 
 #: libraries/Index.class.php:703 libraries/rte/rte_events.lib.php:496
-#: libraries/rte/rte_routines.lib.php:956 libraries/tracking.lib.php:885
-#: libraries/tracking.lib.php:979 templates/structure/table_header.phtml:84
+#: libraries/rte/rte_routines.lib.php:1047 libraries/tracking.lib.php:885
+#: libraries/tracking.lib.php:979
+#: templates/database/structure/table_header.phtml:84
 msgid "Comment"
 msgstr ""
 
@@ -3836,15 +3847,15 @@ msgstr ""
 msgid "Index %s has been dropped."
 msgstr ""
 
-#: libraries/Index.class.php:757 libraries/Util.class.php:3630
-#: libraries/Util.class.php:3631
-#: libraries/controllers/StructureController.class.php:1958
-#: libraries/controllers/StructureController.class.php:1959
+#: libraries/Index.class.php:757 libraries/Util.class.php:3636
+#: libraries/Util.class.php:3637
+#: libraries/controllers/TableStructureController.class.php:949
+#: libraries/controllers/TableStructureController.class.php:950
 #: libraries/operations.lib.php:1607 libraries/rte/rte_list.lib.php:150
 #: libraries/server_databases.lib.php:146
-#: templates/structure/check_all_table_column.phtml:15
-#: templates/structure/check_all_tables.phtml:16
-#: templates/tbl_relation/foreign_key_row.phtml:93
+#: templates/database/structure/check_all_tables.phtml:16
+#: templates/table/relation/foreign_key_row.phtml:93
+#: templates/table/structure/check_all_table_column.phtml:15
 msgid "Drop"
 msgstr ""
 
@@ -3873,16 +3884,16 @@ msgstr ""
 #: libraries/Menu.class.php:248
 #: libraries/navigation/Nodes/Node_View.class.php:32
 #: libraries/tbl_info.inc.php:63
-#: templates/structure/structure_table_row.phtml:97
-#: templates/structure/structure_table_row.phtml:159
+#: templates/database/structure/structure_table_row.phtml:97
+#: templates/database/structure/structure_table_row.phtml:159
 msgid "View"
 msgstr ""
 
 #: libraries/Menu.class.php:325 libraries/Menu.class.php:429
-#: libraries/Menu.class.php:548 libraries/Util.class.php:3334
-#: libraries/Util.class.php:3344 libraries/Util.class.php:3350
-#: libraries/Util.class.php:4313 libraries/Util.class.php:4328
-#: libraries/Util.class.php:4345 libraries/config.values.php:40
+#: libraries/Menu.class.php:548 libraries/Util.class.php:3340
+#: libraries/Util.class.php:3350 libraries/Util.class.php:3356
+#: libraries/Util.class.php:4319 libraries/Util.class.php:4334
+#: libraries/Util.class.php:4351 libraries/config.values.php:40
 #: libraries/config.values.php:48 libraries/config.values.php:110
 #: libraries/config.values.php:116 libraries/config/messages.inc.php:321
 #: libraries/navigation/Nodes/Node_Table.class.php:292
@@ -3890,19 +3901,19 @@ msgid "SQL"
 msgstr ""
 
 #: libraries/Menu.class.php:328 libraries/Menu.class.php:432
-#: libraries/Util.class.php:3335 libraries/Util.class.php:3345
-#: libraries/Util.class.php:3351 libraries/Util.class.php:3625
-#: libraries/Util.class.php:3626 libraries/Util.class.php:4329
-#: libraries/Util.class.php:4346 libraries/config.values.php:41
+#: libraries/Util.class.php:3341 libraries/Util.class.php:3351
+#: libraries/Util.class.php:3357 libraries/Util.class.php:3631
+#: libraries/Util.class.php:3632 libraries/Util.class.php:4335
+#: libraries/Util.class.php:4352 libraries/config.values.php:41
 #: libraries/config.values.php:49 libraries/config.values.php:111
 #: libraries/config.values.php:117
 #: libraries/navigation/Nodes/Node_Table.class.php:286
 msgid "Search"
 msgstr "തിരയൂ"
 
-#: libraries/Menu.class.php:338 libraries/Util.class.php:3336
-#: libraries/Util.class.php:3346 libraries/Util.class.php:3627
-#: libraries/Util.class.php:3628 libraries/Util.class.php:4347
+#: libraries/Menu.class.php:338 libraries/Util.class.php:3342
+#: libraries/Util.class.php:3352 libraries/Util.class.php:3633
+#: libraries/Util.class.php:3634 libraries/Util.class.php:4353
 #: libraries/config.values.php:42 libraries/config.values.php:50
 #: libraries/config.values.php:118
 #: libraries/navigation/Nodes/Node_Table.class.php:289
@@ -3911,30 +3922,30 @@ msgid "Insert"
 msgstr ""
 
 #: libraries/Menu.class.php:362 libraries/Menu.class.php:467
-#: libraries/Util.class.php:4334 libraries/Util.class.php:4350
+#: libraries/Util.class.php:4340 libraries/Util.class.php:4356
 #: libraries/config.values.php:106 libraries/server_common.lib.php:51
 #: libraries/server_privileges.lib.php:2370
 #: libraries/server_privileges.lib.php:3158
-#: libraries/server_privileges.lib.php:4221
+#: libraries/server_privileges.lib.php:4247
 msgid "Privileges"
 msgstr ""
 
 #: libraries/Menu.class.php:371 libraries/Menu.class.php:379
-#: libraries/Menu.class.php:459 libraries/Util.class.php:3338
-#: libraries/Util.class.php:3352 libraries/Util.class.php:4333
-#: libraries/Util.class.php:4351 libraries/config.values.php:112
+#: libraries/Menu.class.php:459 libraries/Util.class.php:3344
+#: libraries/Util.class.php:3358 libraries/Util.class.php:4339
+#: libraries/Util.class.php:4357 libraries/config.values.php:112
 #: view_operations.php:92
 msgid "Operations"
 msgstr ""
 
 #: libraries/Menu.class.php:384 libraries/Menu.class.php:492
-#: libraries/Util.class.php:4338 libraries/Util.class.php:4352
+#: libraries/Util.class.php:4344 libraries/Util.class.php:4358
 #: libraries/relation.lib.php:255
 msgid "Tracking"
 msgstr ""
 
 #: libraries/Menu.class.php:397 libraries/Menu.class.php:486
-#: libraries/Util.class.php:4337 libraries/Util.class.php:4353
+#: libraries/Util.class.php:4343 libraries/Util.class.php:4359
 #: libraries/navigation/Nodes/Node_Trigger_Container.class.php:24
 #: libraries/plugins/export/ExportHtmlword.class.php:557
 #: libraries/plugins/export/ExportOdt.class.php:685
@@ -3951,16 +3962,16 @@ msgstr ""
 msgid "Database seems to be empty!"
 msgstr ""
 
-#: libraries/Menu.class.php:439 libraries/Util.class.php:4330
+#: libraries/Menu.class.php:439 libraries/Util.class.php:4336
 msgid "Query"
 msgstr ""
 
-#: libraries/Menu.class.php:472 libraries/Util.class.php:4335
+#: libraries/Menu.class.php:472 libraries/Util.class.php:4341
 #: libraries/rte/rte_words.lib.php:36
 msgid "Routines"
 msgstr ""
 
-#: libraries/Menu.class.php:479 libraries/Util.class.php:4336
+#: libraries/Menu.class.php:479 libraries/Util.class.php:4342
 #: libraries/navigation/Nodes/Node_Event_Container.class.php:26
 #: libraries/plugins/export/ExportSql.class.php:940
 #: libraries/plugins/export/ExportXml.class.php:107
@@ -3968,22 +3979,22 @@ msgstr ""
 msgid "Events"
 msgstr ""
 
-#: libraries/Menu.class.php:498 libraries/Util.class.php:4339
+#: libraries/Menu.class.php:498 libraries/Util.class.php:4345
 msgid "Designer"
 msgstr ""
 
-#: libraries/Menu.class.php:507 libraries/Util.class.php:4340
-#: templates/structure/check_all_tables.phtml:35
+#: libraries/Menu.class.php:507 libraries/Util.class.php:4346
+#: templates/database/structure/check_all_tables.phtml:35
 #, fuzzy
 #| msgid "Add/Delete columns"
 msgid "Central columns"
 msgstr "നിരകൾ ചേർക്കുക/മായക്കുക"
 
-#: libraries/Menu.class.php:544 libraries/Util.class.php:4312
+#: libraries/Menu.class.php:544 libraries/Util.class.php:4318
 #: libraries/config.values.php:103 libraries/config/messages.inc.php:266
 #: libraries/config/messages.inc.php:341
 #: libraries/navigation/NavigationTree.class.php:1239
-#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4332
+#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4358
 msgid "Databases"
 msgstr ""
 
@@ -3992,34 +4003,34 @@ msgid "User accounts"
 msgstr ""
 
 #: libraries/Menu.class.php:595 libraries/ServerStatusData.class.php:121
-#: libraries/Util.class.php:4319 libraries/server_common.lib.php:36
+#: libraries/Util.class.php:4325 libraries/server_common.lib.php:36
 msgid "Binary log"
 msgstr ""
 
 #: libraries/Menu.class.php:601 libraries/ServerStatusData.class.php:126
-#: libraries/Util.class.php:4320 libraries/server_common.lib.php:42
-#: templates/structure/body_for_table_summary.phtml:10
-#: templates/structure/table_header.phtml:27
+#: libraries/Util.class.php:4326 libraries/server_common.lib.php:42
+#: templates/database/structure/body_for_table_summary.phtml:10
+#: templates/database/structure/table_header.phtml:27
 msgid "Replication"
 msgstr ""
 
 #: libraries/Menu.class.php:606 libraries/ServerStatusData.class.php:193
-#: libraries/Util.class.php:4321 libraries/config.values.php:105
+#: libraries/Util.class.php:4327 libraries/config.values.php:105
 #: libraries/server_engines.lib.php:108 libraries/server_engines.lib.php:112
 #: libraries/sql_query_form.lib.php:421
 msgid "Variables"
 msgstr ""
 
-#: libraries/Menu.class.php:610 libraries/Util.class.php:4322
+#: libraries/Menu.class.php:610 libraries/Util.class.php:4328
 msgid "Charsets"
 msgstr ""
 
-#: libraries/Menu.class.php:615 libraries/Util.class.php:4323
+#: libraries/Menu.class.php:615 libraries/Util.class.php:4329
 #: libraries/server_common.lib.php:33 libraries/server_plugins.lib.php:27
 msgid "Plugins"
 msgstr ""
 
-#: libraries/Menu.class.php:626 libraries/Util.class.php:4324
+#: libraries/Menu.class.php:626 libraries/Util.class.php:4330
 msgid "Engines"
 msgstr ""
 
@@ -4044,7 +4055,7 @@ msgid_plural "%1$d rows inserted."
 msgstr[0] ""
 msgstr[1] ""
 
-#: libraries/PDF.class.php:70 libraries/Util.class.php:2521
+#: libraries/PDF.class.php:70 libraries/Util.class.php:2527
 #: libraries/browse_foreigners.lib.php:327
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:865
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:890
@@ -4065,7 +4076,7 @@ msgid "Could not save favorite table!"
 msgstr ""
 
 #: libraries/RecentFavoriteTable.class.php:212
-#: templates/structure/favorite_anchor.phtml:12
+#: templates/database/structure/favorite_anchor.phtml:12
 msgid "Remove from Favorites"
 msgstr ""
 
@@ -4234,7 +4245,7 @@ msgid ""
 msgstr ""
 
 #: libraries/StorageEngine.class.php:373
-#: templates/structure/body_for_table_summary.phtml:50
+#: templates/database/structure/body_for_table_summary.phtml:50
 #, php-format
 msgid "%s is the default storage engine on this MySQL server."
 msgstr ""
@@ -4651,10 +4662,10 @@ msgstr ""
 
 #: libraries/Util.class.php:726 libraries/rte/rte_events.lib.php:110
 #: libraries/rte/rte_events.lib.php:119 libraries/rte/rte_events.lib.php:150
-#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:153
-#: libraries/rte/rte_routines.lib.php:162
-#: libraries/rte/rte_routines.lib.php:235
-#: libraries/rte/rte_routines.lib.php:1366
+#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:223
+#: libraries/rte/rte_routines.lib.php:250
+#: libraries/rte/rte_routines.lib.php:372
+#: libraries/rte/rte_routines.lib.php:1457
 #: libraries/rte/rte_triggers.lib.php:86 libraries/rte/rte_triggers.lib.php:95
 #: libraries/rte/rte_triggers.lib.php:127
 msgid "MySQL said: "
@@ -4698,75 +4709,78 @@ msgstr ""
 msgid "%B %d, %Y at %I:%M %p"
 msgstr ""
 
-#: libraries/Util.class.php:2019
+#: libraries/Util.class.php:2025
 #, php-format
 msgid "%s days, %s hours, %s minutes and %s seconds"
 msgstr ""
 
-#: libraries/Util.class.php:2112
+#: libraries/Util.class.php:2118
 msgid "Missing parameter:"
 msgstr ""
 
-#: libraries/Util.class.php:2645
+#: libraries/Util.class.php:2651
 #, php-format
 msgid "Jump to database \"%s\"."
 msgstr ""
 
-#: libraries/Util.class.php:2670
+#: libraries/Util.class.php:2676
 #, php-format
 msgid "The %s functionality is affected by a known bug, see %s"
 msgstr ""
 
-#: libraries/Util.class.php:2881
+#: libraries/Util.class.php:2887
 msgid "Click to toggle"
 msgstr ""
 
-#: libraries/Util.class.php:3542 prefs_manage.php:248
+#: libraries/Util.class.php:3548 prefs_manage.php:248
 msgid "Browse your computer:"
 msgstr ""
 
-#: libraries/Util.class.php:3567
+#: libraries/Util.class.php:3573
 #, php-format
 msgid "Select from the web server upload directory <b>%s</b>:"
 msgstr ""
 
-#: libraries/Util.class.php:3596 libraries/insert_edit.lib.php:1173
+#: libraries/Util.class.php:3602 libraries/insert_edit.lib.php:1171
 msgid "The directory you set for upload work cannot be reached."
 msgstr ""
 
-#: libraries/Util.class.php:3607
+#: libraries/Util.class.php:3613
 msgid "There are no files to upload!"
 msgstr ""
 
-#: libraries/Util.class.php:3632 libraries/Util.class.php:3633
-#: templates/structure/check_all_tables.phtml:15
+#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: templates/database/structure/check_all_tables.phtml:15
 msgid "Empty"
 msgstr ""
 
-#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: libraries/Util.class.php:3644 libraries/Util.class.php:3645
 msgid "Execute"
 msgstr ""
 
-#: libraries/Util.class.php:4152
+#: libraries/Util.class.php:4158
 msgid "Print"
 msgstr "അച്ചടിക്കുക"
 
-#: libraries/Util.class.php:4257 templates/structure/row_stats_table.phtml:80
-#: templates/structure/table_header.phtml:95
+#: libraries/Util.class.php:4263
+#: templates/database/structure/table_header.phtml:95
+#: templates/table/structure/row_stats_table.phtml:80
 msgid "Creation"
 msgstr "സൃഷ്‌ടി"
 
-#: libraries/Util.class.php:4263 templates/structure/row_stats_table.phtml:87
-#: templates/structure/table_header.phtml:106
+#: libraries/Util.class.php:4269
+#: templates/database/structure/table_header.phtml:106
+#: templates/table/structure/row_stats_table.phtml:87
 msgid "Last update"
 msgstr "അവസാനം നവീകരിച്ചത്"
 
-#: libraries/Util.class.php:4269 templates/structure/row_stats_table.phtml:94
-#: templates/structure/table_header.phtml:117
+#: libraries/Util.class.php:4275
+#: templates/database/structure/table_header.phtml:117
+#: templates/table/structure/row_stats_table.phtml:94
 msgid "Last check"
 msgstr "അന്തിമ പരിശോധന"
 
-#: libraries/Util.class.php:4315
+#: libraries/Util.class.php:4321
 msgid "Users"
 msgstr ""
 
@@ -4789,16 +4803,16 @@ msgid "Use this value"
 msgstr "ഈ വില ഉപയോഗിക്കൂ"
 
 #: libraries/build_html_for_db.lib.php:33 libraries/import.lib.php:193
-#: templates/structure/actions_in_table_structure.phtml:113
-#: templates/structure/row_stats_table.phtml:42
-#: templates/structure/table_header.phtml:36
+#: templates/database/structure/table_header.phtml:36
+#: templates/table/structure/actions_in_table_structure.phtml:113
+#: templates/table/structure/row_stats_table.phtml:42
 msgid "Rows"
 msgstr "വരികൾ"
 
 #: libraries/build_html_for_db.lib.php:48 libraries/engines/innodb.lib.php:171
-#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:186
-#: libraries/server_status.lib.php:298
-#: templates/structure/display_table_stats.phtml:40
+#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:195
+#: libraries/server_status.lib.php:307
+#: templates/table/structure/display_table_stats.phtml:40
 msgid "Total"
 msgstr ""
 
@@ -4807,10 +4821,12 @@ msgid "Jump to database"
 msgstr ""
 
 #: libraries/build_html_for_db.lib.php:146
+#: templates/database/structure/structure_table_row.phtml:15
 msgid "Not replicated"
 msgstr ""
 
 #: libraries/build_html_for_db.lib.php:158
+#: templates/database/structure/structure_table_row.phtml:16
 msgid "Replicated"
 msgstr ""
 
@@ -4863,17 +4879,17 @@ msgstr ""
 #: libraries/plugins/export/ExportTexytext.class.php:425
 #: libraries/plugins/export/PMA_ExportPdf.class.php:307
 #: libraries/rte/rte_list.lib.php:73 libraries/rte/rte_list.lib.php:85
-#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:830
-#: libraries/rte/rte_routines.lib.php:1492 setup/frames/index.inc.php:162
+#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:921
+#: libraries/rte/rte_routines.lib.php:1583 setup/frames/index.inc.php:162
 #: templates/columns_definitions/table_fields_definitions.phtml:8
-#: templates/structure/table_structure_header.phtml:5
-#: templates/table/create_table.phtml:11
+#: templates/database/create_table.phtml:11
+#: templates/table/structure/table_structure_header.phtml:5
 msgid "Name"
 msgstr ""
 
 #: libraries/central_columns.lib.php:699
 #: libraries/central_columns.lib.php:1381
-#: libraries/rte/rte_routines.lib.php:832
+#: libraries/rte/rte_routines.lib.php:923
 #: templates/columns_definitions/table_fields_definitions.phtml:14
 msgid "Length/Values"
 msgstr ""
@@ -4894,7 +4910,7 @@ msgid "Select a table"
 msgstr "എല്ലാം തിരഞ്ഞെടുക്കുക"
 
 #: libraries/central_columns.lib.php:804
-#: templates/structure/add_column.phtml:4
+#: templates/table/structure/add_column.phtml:4
 msgid "Add column"
 msgstr ""
 
@@ -4914,7 +4930,7 @@ msgstr "നിരകൾ ചേർക്കുക/മായക്കുക"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1002
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1025
 #: templates/columns_definitions/table_fields_definitions.phtml:36
-#: templates/structure/table_structure_header.phtml:8
+#: templates/table/structure/table_structure_header.phtml:8
 msgid "Attributes"
 msgstr ""
 
@@ -5025,7 +5041,7 @@ msgid "Double click"
 msgstr ""
 
 #: libraries/config.values.php:95 libraries/config.values.php:124
-#: libraries/config/FormDisplay.tpl.php:221 libraries/relation.lib.php:97
+#: libraries/config/FormDisplay.tpl.php:232 libraries/relation.lib.php:97
 #: libraries/relation.lib.php:105
 msgid "Disabled"
 msgstr ""
@@ -5203,21 +5219,21 @@ msgstr ""
 msgid "maximum %s"
 msgstr ""
 
-#: libraries/config/FormDisplay.tpl.php:219
+#: libraries/config/FormDisplay.tpl.php:230
 msgid "This setting is disabled, it will not be applied to your configuration."
 msgstr ""
 
-#: libraries/config/FormDisplay.tpl.php:313
+#: libraries/config/FormDisplay.tpl.php:324
 #, php-format
 msgid "Set value: %s"
 msgstr ""
 
-#: libraries/config/FormDisplay.tpl.php:318
+#: libraries/config/FormDisplay.tpl.php:329
 #: libraries/config/messages.inc.php:610
 msgid "Restore default value"
 msgstr ""
 
-#: libraries/config/FormDisplay.tpl.php:332
+#: libraries/config/FormDisplay.tpl.php:343
 msgid "Allow users to customize this value"
 msgstr ""
 
@@ -5639,7 +5655,7 @@ msgstr ""
 
 #: libraries/config/messages.inc.php:136 libraries/config/messages.inc.php:152
 #: libraries/sql_query_form.lib.php:247
-#: templates/structure/row_stats_table.phtml:7
+#: templates/table/structure/row_stats_table.phtml:7
 msgid "Format"
 msgstr ""
 
@@ -6144,7 +6160,7 @@ msgstr ""
 
 #: libraries/config/messages.inc.php:332
 #: libraries/plugins/export/ExportPdf.class.php:279
-#: templates/structure/secondary_tabs.phtml:8
+#: templates/table/secondary_tabs.phtml:8
 #, fuzzy
 #| msgid "Database comment"
 msgid "Table structure"
@@ -7672,107 +7688,35 @@ msgstr ""
 msgid "OpenDocument Text"
 msgstr ""
 
-#: libraries/controllers/StructureController.class.php:465
+#: libraries/controllers/DatabaseStructureController.class.php:405
 #: tbl_operations.php:382
 #, php-format
 msgid "Table %s has been emptied."
 msgstr ""
 
-#: libraries/controllers/StructureController.class.php:486
+#: libraries/controllers/DatabaseStructureController.class.php:426
 #: tbl_operations.php:400 view_operations.php:119
 #, fuzzy, php-format
 #| msgid "Database %s has been dropped."
 msgid "View %s has been dropped."
 msgstr "%s എന്ന വിവരശേഖരം ഉപേക്ഷിച്ചിരിക്കുന്നു."
 
-#: libraries/controllers/StructureController.class.php:487
+#: libraries/controllers/DatabaseStructureController.class.php:427
 #: tbl_operations.php:401
 #, fuzzy, php-format
 #| msgid "Database %s has been dropped."
 msgid "Table %s has been dropped."
 msgstr "%s എന്ന വിവരശേഖരം ഉപേക്ഷിച്ചിരിക്കുന്നു."
 
-#: libraries/controllers/StructureController.class.php:797
-#, php-format
-msgid "The name '%s' is a MySQL reserved keyword."
-msgid_plural "The names '%s' are MySQL reserved keywords."
-msgstr[0] ""
-msgstr[1] ""
-
-#: libraries/controllers/StructureController.class.php:875
-msgid "No column selected."
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1049
+#: libraries/controllers/DatabaseStructureController.class.php:733
 msgid "Favorite List is full!"
 msgstr ""
 
-#: libraries/controllers/StructureController.class.php:1272
-#, fuzzy
-#| msgid "Database %s has been dropped."
-msgid "The columns have been moved successfully."
-msgstr "%s എന്ന വിവരശേഖരം ഉപേക്ഷിച്ചിരിക്കുന്നു."
-
-#: libraries/controllers/StructureController.class.php:1535
-#, php-format
-msgid ""
-"Table %1$s has been altered successfully. Privileges have been adjusted."
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1541
-#: libraries/controllers/TableIndexesController.class.php:161
-#: tbl_addfield.php:92
-#, php-format
-msgid "Table %1$s has been altered successfully."
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1588
-#: libraries/tracking.lib.php:1094
-msgid "Query error"
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1806
+#: libraries/controllers/DatabaseStructureController.class.php:947
 #: libraries/mysql_charsets.lib.php:366 libraries/mysql_charsets.lib.php:373
 msgid "unknown"
 msgstr ""
 
-#: libraries/controllers/StructureController.class.php:1957
-#: templates/structure/check_all_table_column.phtml:11
-msgid "Change"
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1961
-#: libraries/controllers/StructureController.class.php:1966
-#: libraries/navigation/Nodes/Node_Index.class.php:30
-#: libraries/tracking.lib.php:926
-#: templates/columns_definitions/column_indexes.phtml:16
-#: templates/columns_definitions/table_fields_definitions.phtml:57
-#: templates/structure/check_all_table_column.phtml:30
-#: templates/structure/display_structure.phtml:79
-#: templates/structure/display_table_stats.phtml:19
-msgid "Index"
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1963
-#: libraries/controllers/StructureController.class.php:1968
-#: templates/columns_definitions/column_indexes.phtml:27
-#: templates/structure/check_all_table_column.phtml:37
-msgid "Spatial"
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1964
-#: libraries/controllers/StructureController.class.php:1969
-#: templates/columns_definitions/column_indexes.phtml:22
-#: templates/structure/check_all_table_column.phtml:47
-msgid "Fulltext"
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1970
-#, fuzzy
-#| msgid "Use this value"
-msgid "Distinct values"
-msgstr "ഈ വില ഉപയോഗിക്കൂ"
-
 #: libraries/controllers/TableChartController.class.php:82
 #: libraries/controllers/TableGisVisualizationController.class.php:101
 msgid "No SQL query was set to fetch data."
@@ -7786,11 +7730,18 @@ msgstr ""
 msgid "No data to display"
 msgstr ""
 
-#: libraries/controllers/TableRelationController.class.php:217
+#: libraries/controllers/TableIndexesController.class.php:161
+#: libraries/controllers/TableStructureController.class.php:736
+#: tbl_addfield.php:92
+#, php-format
+msgid "Table %1$s has been altered successfully."
+msgstr ""
+
+#: libraries/controllers/TableRelationController.class.php:218
 msgid "Display column was successfully updated."
 msgstr ""
 
-#: libraries/controllers/TableRelationController.class.php:283
+#: libraries/controllers/TableRelationController.class.php:288
 #, fuzzy
 #| msgid "Database %1$s has been created."
 msgid "Internal relations were successfully updated."
@@ -7807,10 +7758,75 @@ msgid "Zoom search"
 msgstr ""
 
 #: libraries/controllers/TableSearchController.class.php:852
-#: templates/table/selection_form.phtml:59
+#: templates/table/search/selection_form.phtml:59
 msgid "Find and replace"
 msgstr ""
 
+#: libraries/controllers/TableStructureController.class.php:163
+#, php-format
+msgid "The name '%s' is a MySQL reserved keyword."
+msgid_plural "The names '%s' are MySQL reserved keywords."
+msgstr[0] ""
+msgstr[1] ""
+
+#: libraries/controllers/TableStructureController.class.php:241
+msgid "No column selected."
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:467
+#, fuzzy
+#| msgid "Database %s has been dropped."
+msgid "The columns have been moved successfully."
+msgstr "%s എന്ന വിവരശേഖരം ഉപേക്ഷിച്ചിരിക്കുന്നു."
+
+#: libraries/controllers/TableStructureController.class.php:730
+#, php-format
+msgid ""
+"Table %1$s has been altered successfully. Privileges have been adjusted."
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:783
+#: libraries/tracking.lib.php:1094
+msgid "Query error"
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:948
+#: templates/table/structure/check_all_table_column.phtml:11
+msgid "Change"
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:952
+#: libraries/controllers/TableStructureController.class.php:957
+#: libraries/navigation/Nodes/Node_Index.class.php:30
+#: libraries/tracking.lib.php:926
+#: templates/columns_definitions/column_indexes.phtml:16
+#: templates/columns_definitions/table_fields_definitions.phtml:57
+#: templates/table/structure/check_all_table_column.phtml:30
+#: templates/table/structure/display_structure.phtml:79
+#: templates/table/structure/display_table_stats.phtml:19
+msgid "Index"
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:954
+#: libraries/controllers/TableStructureController.class.php:959
+#: templates/columns_definitions/column_indexes.phtml:27
+#: templates/table/structure/check_all_table_column.phtml:37
+msgid "Spatial"
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:955
+#: libraries/controllers/TableStructureController.class.php:960
+#: templates/columns_definitions/column_indexes.phtml:22
+#: templates/table/structure/check_all_table_column.phtml:47
+msgid "Fulltext"
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:963
+#, fuzzy
+#| msgid "Use this value"
+msgid "Distinct values"
+msgstr "ഈ വില ഉപയോഗിക്കൂ"
+
 #: libraries/core.lib.php:306
 #, php-format
 msgid "The %s extension is missing. Please check your PHP configuration."
@@ -7855,7 +7871,7 @@ msgid "No Password"
 msgstr ""
 
 #: libraries/display_change_password.lib.php:68
-#: libraries/plugins/auth/AuthenticationCookie.class.php:199
+#: libraries/plugins/auth/AuthenticationCookie.class.php:187
 #: libraries/replication_gui.lib.php:422 libraries/replication_gui.lib.php:862
 #: libraries/server_privileges.lib.php:1640
 msgid "Password:"
@@ -8587,12 +8603,12 @@ msgid "Dump has been saved to file %s."
 msgstr ""
 
 #: libraries/import.lib.php:202 libraries/insert_edit.lib.php:124
-#: libraries/rte/rte_routines.lib.php:1353 libraries/sql.lib.php:1312
+#: libraries/rte/rte_routines.lib.php:1444 libraries/sql.lib.php:1306
 #: tbl_get_field.php:44
 msgid "MySQL returned an empty result set (i.e. zero rows)."
 msgstr ""
 
-#: libraries/import.lib.php:265 libraries/sql.lib.php:1326
+#: libraries/import.lib.php:265 libraries/sql.lib.php:1320
 msgid "[ROLLBACK occurred.]"
 msgstr ""
 
@@ -8657,14 +8673,14 @@ msgstr ""
 
 #: libraries/insert_edit.lib.php:233
 #: libraries/navigation/Nodes/Node_DatabaseChild.class.php:48
-#: templates/designer/table_list.phtml:40
+#: templates/database/designer/table_list.phtml:40
 msgid "Hide"
 msgstr ""
 
 #: libraries/insert_edit.lib.php:249
 #: libraries/navigation/Nodes/Node_Function.class.php:32
-#: libraries/rte/rte_routines.lib.php:1495
-#: templates/table/table_header.phtml:4
+#: libraries/rte/rte_routines.lib.php:1586
+#: templates/table/search/table_header.phtml:4
 msgid "Function"
 msgstr ""
 
@@ -8677,82 +8693,83 @@ msgstr ""
 msgid "Because of its length,<br /> this column might not be editable."
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1050
+#: libraries/insert_edit.lib.php:1048
 msgid "Binary - do not edit"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1176 libraries/server_privileges.lib.php:470
-#: templates/table/options.phtml:36
+#: libraries/insert_edit.lib.php:1174 libraries/server_privileges.lib.php:470
+#: templates/table/search/options.phtml:36
 msgid "Or"
 msgstr "അല്ലെനങ്കിൽ"
 
-#: libraries/insert_edit.lib.php:1177
+#: libraries/insert_edit.lib.php:1175
 msgid "web server upload directory:"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1348 templates/table/input_box.phtml:49
+#: libraries/insert_edit.lib.php:1346
+#: templates/table/search/input_box.phtml:49
 msgid "Edit/Insert"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1398
+#: libraries/insert_edit.lib.php:1396
 #, php-format
 msgid "Continue insertion with %s rows"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1428
+#: libraries/insert_edit.lib.php:1426
 msgid "and then"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1461
+#: libraries/insert_edit.lib.php:1459
 msgid "Insert as new row"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1464
+#: libraries/insert_edit.lib.php:1462
 msgid "Insert as new row and ignore errors"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1467
+#: libraries/insert_edit.lib.php:1465
 msgid "Show insert query"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1487
+#: libraries/insert_edit.lib.php:1485
 msgid "Go back to previous page"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1490
+#: libraries/insert_edit.lib.php:1488
 msgid "Insert another new row"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1495
+#: libraries/insert_edit.lib.php:1493
 msgid "Go back to this page"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1518
+#: libraries/insert_edit.lib.php:1516
 msgid "Edit next row"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1540
+#: libraries/insert_edit.lib.php:1538
 msgid ""
 "Use TAB key to move from value to value, or CTRL+arrows to move anywhere"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1577 libraries/replication_gui.lib.php:542
-#: libraries/rte/rte_routines.lib.php:1497
+#: libraries/insert_edit.lib.php:1575 libraries/replication_gui.lib.php:542
+#: libraries/rte/rte_routines.lib.php:1588
 #: libraries/server_status_variables.lib.php:220
-#: templates/designer/having_query_panel.phtml:100
-#: templates/designer/options_panel.phtml:73
-#: templates/designer/options_panel.phtml:239
-#: templates/designer/where_query_panel.phtml:69
-#: templates/table/table_header.phtml:10
-#: templates/table/zoom_result_form.phtml:35
+#: templates/database/designer/having_query_panel.phtml:100
+#: templates/database/designer/options_panel.phtml:73
+#: templates/database/designer/options_panel.phtml:239
+#: templates/database/designer/where_query_panel.phtml:69
+#: templates/table/search/table_header.phtml:10
+#: templates/table/search/zoom_result_form.phtml:35
 msgid "Value"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1937 libraries/sql.lib.php:1309
+#: libraries/insert_edit.lib.php:1935 libraries/sql.lib.php:1303
 msgid "Showing SQL query"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1962 libraries/sql.lib.php:1287
+#: libraries/insert_edit.lib.php:1960 libraries/sql.lib.php:1281
 #, php-format
 msgid "Inserted row id: %1$d"
 msgstr ""
@@ -9175,7 +9192,7 @@ msgstr ""
 #: libraries/navigation/Nodes/Node_View_Container.class.php:26
 #: libraries/navigation/Nodes/Node_View_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:129
-#: templates/structure/show_create.phtml:30
+#: templates/database/structure/show_create.phtml:30
 msgid "Views"
 msgstr ""
 
@@ -9477,7 +9494,7 @@ msgstr ""
 
 #: libraries/operations.lib.php:101 libraries/operations.lib.php:249
 #: libraries/operations.lib.php:869 libraries/operations.lib.php:963
-#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:907
+#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:998
 #: templates/columns_definitions/table_fields_definitions.phtml:47
 msgid "Adjust Privileges"
 msgstr ""
@@ -9569,22 +9586,22 @@ msgid "Switch to copied table"
 msgstr ""
 
 #: libraries/operations.lib.php:1360
-#: templates/structure/check_all_tables.phtml:18
+#: templates/database/structure/check_all_tables.phtml:18
 msgid "Table maintenance"
 msgstr ""
 
 #: libraries/operations.lib.php:1398
-#: templates/structure/check_all_tables.phtml:19
+#: templates/database/structure/check_all_tables.phtml:19
 msgid "Analyze table"
 msgstr ""
 
 #: libraries/operations.lib.php:1413
-#: templates/structure/check_all_tables.phtml:20
+#: templates/database/structure/check_all_tables.phtml:20
 msgid "Check table"
 msgstr ""
 
 #: libraries/operations.lib.php:1428
-#: templates/structure/check_all_tables.phtml:22
+#: templates/database/structure/check_all_tables.phtml:22
 #, fuzzy
 #| msgid "Use Tables"
 msgid "Checksum table"
@@ -9604,18 +9621,19 @@ msgid "Flush the table (FLUSH)"
 msgstr ""
 
 #: libraries/operations.lib.php:1477
-#: templates/structure/check_all_tables.phtml:23
-#: templates/structure/display_table_stats.phtml:56
+#: templates/database/structure/check_all_tables.phtml:23
+#: templates/table/structure/display_table_stats.phtml:56
 msgid "Optimize table"
 msgstr ""
 
 #: libraries/operations.lib.php:1492
-#: templates/structure/check_all_tables.phtml:24
+#: templates/database/structure/check_all_tables.phtml:24
 msgid "Repair table"
 msgstr ""
 
 #: libraries/operations.lib.php:1538
-#: templates/structure/check_all_tables.phtml:14 view_operations.php:127
+#: templates/database/structure/check_all_tables.phtml:14
+#: view_operations.php:127
 msgid "Delete data or table"
 msgstr ""
 
@@ -9736,7 +9754,7 @@ msgid "Cannot connect: invalid settings."
 msgstr ""
 
 #: libraries/plugins/auth/AuthenticationConfig.class.php:108
-#: libraries/plugins/auth/AuthenticationCookie.class.php:134
+#: libraries/plugins/auth/AuthenticationCookie.class.php:122
 #: libraries/plugins/auth/AuthenticationHttp.class.php:96
 #, php-format
 msgid "Welcome to %s"
@@ -9761,36 +9779,36 @@ msgstr ""
 msgid "Retry to connect"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:146
+#: libraries/plugins/auth/AuthenticationCookie.class.php:134
 msgid "Your session has expired. Please log in again."
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:170
+#: libraries/plugins/auth/AuthenticationCookie.class.php:158
 msgid "Log in"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:178
-#: libraries/plugins/auth/AuthenticationCookie.class.php:188
+#: libraries/plugins/auth/AuthenticationCookie.class.php:166
+#: libraries/plugins/auth/AuthenticationCookie.class.php:176
 msgid "You can enter hostname/IP address and port separated by space."
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:193
+#: libraries/plugins/auth/AuthenticationCookie.class.php:181
 msgid "Username:"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:205
+#: libraries/plugins/auth/AuthenticationCookie.class.php:193
 msgid "Server Choice:"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:386
+#: libraries/plugins/auth/AuthenticationCookie.class.php:374
 msgid "Entered captcha is wrong, try again!"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:396
+#: libraries/plugins/auth/AuthenticationCookie.class.php:384
 msgid "Please enter correct captcha!"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:423
+#: libraries/plugins/auth/AuthenticationCookie.class.php:411
 msgid "You are not allowed to log in to this MySQL server!"
 msgstr ""
 
@@ -9886,7 +9904,7 @@ msgstr ""
 #: libraries/plugins/export/ExportOdt.class.php:593
 #: libraries/plugins/export/ExportTexytext.class.php:428
 #: libraries/plugins/export/PMA_ExportPdf.class.php:313
-#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:984
 #: libraries/rte/rte_triggers.lib.php:377
 msgid "Definition"
 msgstr ""
@@ -10197,7 +10215,7 @@ msgid "Last check:"
 msgstr "അന്തിമ പരിശോധന"
 
 #: libraries/plugins/export/ExportSql.class.php:1399
-#: templates/structure/structure_table_row.phtml:183
+#: templates/database/structure/structure_table_row.phtml:183
 msgid "in use"
 msgstr "ഉപയോഗത്തിൽ"
 
@@ -10379,18 +10397,14 @@ msgstr ""
 msgid "The imported file does not contain any data!"
 msgstr ""
 
-#: libraries/plugins/import/ImportSql.class.php:169
+#: libraries/plugins/import/ImportSql.class.php:72
 msgid "SQL compatibility mode:"
 msgstr ""
 
-#: libraries/plugins/import/ImportSql.class.php:181
+#: libraries/plugins/import/ImportSql.class.php:84
 msgid "Do not use <code>AUTO_INCREMENT</code> for zero values"
 msgstr ""
 
-#: libraries/plugins/import/ImportSql.class.php:195
-msgid "Read as multibytes"
-msgstr ""
-
 #: libraries/plugins/import/ImportXml.class.php:54
 msgid "XML"
 msgstr ""
@@ -10435,7 +10449,7 @@ msgid "Show grid"
 msgstr ""
 
 #: libraries/plugins/schema/SchemaPdf.class.php:94
-#: templates/structure/print_view_data_dictionary_link.phtml:6
+#: templates/database/structure/print_view_data_dictionary_link.phtml:6
 msgid "Data Dictionary"
 msgstr ""
 
@@ -10466,7 +10480,7 @@ msgid "The %s table doesn't exist!"
 msgstr ""
 
 #: libraries/plugins/schema/eps/Eps_Relation_Schema.class.php:321
-#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:309
+#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:323
 #, php-format
 msgid "Schema of the %s database - Page %s"
 msgstr ""
@@ -10493,7 +10507,7 @@ msgstr ""
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1005
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1028
 #: libraries/tracking.lib.php:884
-#: templates/structure/table_structure_header.phtml:11
+#: templates/table/structure/table_structure_header.phtml:11
 msgid "Extra"
 msgstr ""
 
@@ -10810,51 +10824,51 @@ msgstr ""
 msgid "Create the needed tables with the <code>%screate_tables.sql</code>."
 msgstr ""
 
-#: libraries/relation.lib.php:360
+#: libraries/relation.lib.php:357
 msgid "Create a pma user and give access to these tables."
 msgstr ""
 
-#: libraries/relation.lib.php:365
+#: libraries/relation.lib.php:360
 msgid ""
 "Enable advanced features in configuration file (<code>config.inc.php</"
 "code>), for example by starting from <code>config.sample.inc.php</code>."
 msgstr ""
 
-#: libraries/relation.lib.php:373
+#: libraries/relation.lib.php:365
 msgid "Re-login to phpMyAdmin to load the updated configuration file."
 msgstr ""
 
-#: libraries/relation.lib.php:1612
+#: libraries/relation.lib.php:1607
 msgid "no description"
 msgstr ""
 
-#: libraries/relation.lib.php:1811
+#: libraries/relation.lib.php:1806
 msgid ""
 "You do not have necessary privileges to create a database named "
 "'phpmyadmin'. You may go to 'Operations' tab of any database to set up the "
 "phpMyAdmin configuration storage there."
 msgstr ""
 
-#: libraries/relation.lib.php:1928
+#: libraries/relation.lib.php:1923
 #, php-format
 msgid ""
 "%sCreate%s a database named 'phpmyadmin' and setup the phpMyAdmin "
 "configuration storage there."
 msgstr ""
 
-#: libraries/relation.lib.php:1936
+#: libraries/relation.lib.php:1931
 #, php-format
 msgid ""
 "%sCreate%s the phpMyAdmin configuration storage in the current database."
 msgstr ""
 
-#: libraries/relation.lib.php:1944
+#: libraries/relation.lib.php:1939
 #, php-format
 msgid "%sCreate%s missing phpMyAdmin configuration storage tables."
 msgstr ""
 
 #: libraries/replication_gui.lib.php:46 libraries/replication_gui.lib.php:343
-#: libraries/server_databases.lib.php:387
+#: libraries/server_databases.lib.php:398
 msgid "Master replication"
 msgstr ""
 
@@ -10909,7 +10923,7 @@ msgid ""
 msgstr ""
 
 #: libraries/replication_gui.lib.php:141
-#: libraries/server_databases.lib.php:389
+#: libraries/server_databases.lib.php:400
 msgid "Slave replication"
 msgstr ""
 
@@ -11170,10 +11184,10 @@ msgid "Master server changed successfully to %s."
 msgstr ""
 
 #: libraries/rte/rte_events.lib.php:106 libraries/rte/rte_events.lib.php:115
-#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:149
-#: libraries/rte/rte_routines.lib.php:158
-#: libraries/rte/rte_routines.lib.php:231
-#: libraries/rte/rte_routines.lib.php:1362
+#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:219
+#: libraries/rte/rte_routines.lib.php:246
+#: libraries/rte/rte_routines.lib.php:368
+#: libraries/rte/rte_routines.lib.php:1453
 #: libraries/rte/rte_triggers.lib.php:82 libraries/rte/rte_triggers.lib.php:91
 #: libraries/rte/rte_triggers.lib.php:123
 #, php-format
@@ -11194,7 +11208,7 @@ msgstr ""
 msgid "Event %1$s has been created."
 msgstr ""
 
-#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:251
+#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:266
 #: libraries/rte/rte_triggers.lib.php:144
 msgid "One or more errors have occurred while processing your request:"
 msgstr ""
@@ -11203,7 +11217,7 @@ msgstr ""
 msgid "Edit event"
 msgstr ""
 
-#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:794
+#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:885
 #: libraries/rte/rte_triggers.lib.php:323 view_create.php:180
 msgid "Details"
 msgstr ""
@@ -11216,7 +11230,7 @@ msgstr ""
 msgid "Event type"
 msgstr ""
 
-#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:817
+#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:908
 #, php-format
 msgid "Change to %s"
 msgstr ""
@@ -11243,12 +11257,14 @@ msgstr ""
 msgid "On completion preserve"
 msgstr ""
 
-#: libraries/rte/rte_events.lib.php:491 libraries/rte/rte_routines.lib.php:930
+#: libraries/rte/rte_events.lib.php:491
+#: libraries/rte/rte_routines.lib.php:1021
 #: libraries/rte/rte_triggers.lib.php:383 view_create.php:209
 msgid "Definer"
 msgstr ""
 
-#: libraries/rte/rte_events.lib.php:535 libraries/rte/rte_routines.lib.php:997
+#: libraries/rte/rte_events.lib.php:535
+#: libraries/rte/rte_routines.lib.php:1088
 #: libraries/rte/rte_triggers.lib.php:422
 msgid "The definer must be in the \"username@hostname\" format!"
 msgstr ""
@@ -11274,9 +11290,9 @@ msgid "You must provide an event definition."
 msgstr ""
 
 #: libraries/rte/rte_export.lib.php:43 libraries/rte/rte_general.lib.php:72
-#: libraries/rte/rte_routines.lib.php:345
-#: libraries/rte/rte_routines.lib.php:1198
-#: libraries/rte/rte_routines.lib.php:1411
+#: libraries/rte/rte_routines.lib.php:153
+#: libraries/rte/rte_routines.lib.php:1289
+#: libraries/rte/rte_routines.lib.php:1502
 msgid "Error in processing request:"
 msgstr ""
 
@@ -11308,132 +11324,132 @@ msgid ""
 "problems."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:110
-#: libraries/rte/rte_routines.lib.php:1006
+#: libraries/rte/rte_routines.lib.php:123
+msgid "Edit routine"
+msgstr ""
+
+#: libraries/rte/rte_routines.lib.php:200
+#: libraries/rte/rte_routines.lib.php:1097
 #, php-format
 msgid "Invalid routine type: \"%s\""
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:170
-msgid "Sorry, we failed to restore the dropped routine."
-msgstr ""
-
-#: libraries/rte/rte_routines.lib.php:211
-#, php-format
-msgid "Routine %1$s has been modified. Privileges have been adjusted."
-msgstr ""
-
-#: libraries/rte/rte_routines.lib.php:216
-#, php-format
-msgid "Routine %1$s has been modified."
-msgstr ""
-
-#: libraries/rte/rte_routines.lib.php:238
+#: libraries/rte/rte_routines.lib.php:253
 #, php-format
 msgid "Routine %1$s has been created."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:315
-msgid "Edit routine"
+#: libraries/rte/rte_routines.lib.php:380
+msgid "Sorry, we failed to restore the dropped routine."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:797
+#: libraries/rte/rte_routines.lib.php:439
+#, php-format
+msgid "Routine %1$s has been modified. Privileges have been adjusted."
+msgstr ""
+
+#: libraries/rte/rte_routines.lib.php:444
+#, php-format
+msgid "Routine %1$s has been modified."
+msgstr ""
+
+#: libraries/rte/rte_routines.lib.php:888
 msgid "Routine name"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:823
+#: libraries/rte/rte_routines.lib.php:914
 msgid "Parameters"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:829
+#: libraries/rte/rte_routines.lib.php:920
 msgid "Direction"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:847
+#: libraries/rte/rte_routines.lib.php:938
 msgid "Add parameter"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:851
+#: libraries/rte/rte_routines.lib.php:942
 msgid "Remove last parameter"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:856
+#: libraries/rte/rte_routines.lib.php:947
 msgid "Return type"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:862
+#: libraries/rte/rte_routines.lib.php:953
 msgid "Return length/values"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:868
+#: libraries/rte/rte_routines.lib.php:959
 msgid "Return options"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:899
+#: libraries/rte/rte_routines.lib.php:990
 msgid "Is deterministic"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:920
+#: libraries/rte/rte_routines.lib.php:1011
 msgid ""
 "You do not have sufficient privileges to perform this operation; Please "
 "refer to the documentation for more details"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:935
+#: libraries/rte/rte_routines.lib.php:1026
 msgid "Security type"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:944
+#: libraries/rte/rte_routines.lib.php:1035
 msgid "SQL data access"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1013
+#: libraries/rte/rte_routines.lib.php:1104
 msgid "You must provide a routine name!"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1047
+#: libraries/rte/rte_routines.lib.php:1138
 #, php-format
 msgid "Invalid direction \"%s\" given for parameter."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1069
-#: libraries/rte/rte_routines.lib.php:1131
+#: libraries/rte/rte_routines.lib.php:1160
+#: libraries/rte/rte_routines.lib.php:1222
 msgid ""
 "You must provide length/values for routine parameters of type ENUM, SET, "
 "VARCHAR and VARBINARY."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1095
+#: libraries/rte/rte_routines.lib.php:1186
 msgid "You must provide a name and a type for each routine parameter."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1114
+#: libraries/rte/rte_routines.lib.php:1205
 msgid "You must provide a valid return type for the routine."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1174
+#: libraries/rte/rte_routines.lib.php:1265
 msgid "You must provide a routine definition."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1285
+#: libraries/rte/rte_routines.lib.php:1376
 #, php-format
 msgid "Execution results of routine %s"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1340
+#: libraries/rte/rte_routines.lib.php:1431
 #, php-format
 msgid "%d row affected by the last statement inside the procedure."
 msgid_plural "%d rows affected by the last statement inside the procedure."
 msgstr[0] ""
 msgstr[1] ""
 
-#: libraries/rte/rte_routines.lib.php:1398
-#: libraries/rte/rte_routines.lib.php:1406
+#: libraries/rte/rte_routines.lib.php:1489
+#: libraries/rte/rte_routines.lib.php:1497
 msgid "Execute routine"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1485
-#: libraries/rte/rte_routines.lib.php:1488
+#: libraries/rte/rte_routines.lib.php:1576
+#: libraries/rte/rte_routines.lib.php:1579
 msgid "Routine parameters"
 msgstr ""
 
@@ -11587,7 +11603,7 @@ msgid "Original position"
 msgstr ""
 
 #: libraries/server_bin_log.lib.php:133
-#: templates/structure/display_table_stats.phtml:4
+#: templates/table/structure/display_table_stats.phtml:4
 msgid "Information"
 msgstr ""
 
@@ -11623,12 +11639,12 @@ msgid ""
 "between the web server and the MySQL server."
 msgstr ""
 
-#: libraries/server_databases.lib.php:364
-#: libraries/server_databases.lib.php:365
+#: libraries/server_databases.lib.php:366
+#: libraries/server_databases.lib.php:371
 msgid "Enable Statistics"
 msgstr ""
 
-#: libraries/server_databases.lib.php:481
+#: libraries/server_databases.lib.php:492
 #, fuzzy, php-format
 #| msgid "Database %s has been dropped."
 msgid "%1$d database has been dropped successfully."
@@ -11985,7 +12001,7 @@ msgid "You have revoked the privileges for %s."
 msgstr ""
 
 #: libraries/server_privileges.lib.php:2059
-#: libraries/server_privileges.lib.php:4290
+#: libraries/server_privileges.lib.php:4316
 #, fuzzy
 #| msgid "Add/Delete columns"
 msgid "Add user account"
@@ -12154,53 +12170,53 @@ msgstr ""
 msgid "The privileges were reloaded successfully."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:3994
+#: libraries/server_privileges.lib.php:4003
 #, php-format
 msgid "The user %s already exists!"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4232
+#: libraries/server_privileges.lib.php:4258
 #, php-format
 msgid "Privileges for %s"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4241
+#: libraries/server_privileges.lib.php:4267
 #: libraries/server_status_processes.lib.php:72
 #: libraries/server_user_groups.lib.php:39
 msgid "User"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4282
+#: libraries/server_privileges.lib.php:4308
 msgctxt "Create new user"
 msgid "New"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4311
+#: libraries/server_privileges.lib.php:4337
 msgid "Edit privileges:"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4312
+#: libraries/server_privileges.lib.php:4338
 msgid "User account"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4371
+#: libraries/server_privileges.lib.php:4397
 msgid ""
 "Note: You are attempting to edit privileges of the user with which you are "
 "currently logged in."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4391 libraries/server_users.lib.php:25
+#: libraries/server_privileges.lib.php:4417 libraries/server_users.lib.php:25
 msgid "User accounts overview"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4459
+#: libraries/server_privileges.lib.php:4485
 msgid ""
 "A user account allowing any user from localhost to connect is present. This "
 "will prevent other users from connecting if the host part of their account "
 "allows a connection from any (%) host."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4500
+#: libraries/server_privileges.lib.php:4526
 #, php-format
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
@@ -12209,7 +12225,7 @@ msgid ""
 "%sreload the privileges%s before you continue."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4519
+#: libraries/server_privileges.lib.php:4545
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
 "tables. The content of these tables may differ from the privileges the "
@@ -12218,61 +12234,61 @@ msgid ""
 "privilege."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4569
+#: libraries/server_privileges.lib.php:4595
 msgid "The selected user was not found in the privilege table."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4801
+#: libraries/server_privileges.lib.php:4827
 msgid "You have added a new user."
 msgstr ""
 
-#: libraries/server_status.lib.php:53
+#: libraries/server_status.lib.php:60
 #, php-format
 msgid "Network traffic since startup: %s"
 msgstr ""
 
-#: libraries/server_status.lib.php:66
+#: libraries/server_status.lib.php:73
 #, php-format
 msgid "This MySQL server has been running for %1$s. It started up on %2$s."
 msgstr ""
 
-#: libraries/server_status.lib.php:80
+#: libraries/server_status.lib.php:94
 msgid ""
 "This MySQL server works as <b>master</b> and <b>slave</b> in <b>replication</"
 "b> process."
 msgstr ""
 
-#: libraries/server_status.lib.php:85
+#: libraries/server_status.lib.php:99
 msgid "This MySQL server works as <b>master</b> in <b>replication</b> process."
 msgstr ""
 
-#: libraries/server_status.lib.php:90
+#: libraries/server_status.lib.php:104
 msgid "This MySQL server works as <b>slave</b> in <b>replication</b> process."
 msgstr ""
 
-#: libraries/server_status.lib.php:106
+#: libraries/server_status.lib.php:116
 msgid "Replication status"
 msgstr ""
 
-#: libraries/server_status.lib.php:137
+#: libraries/server_status.lib.php:146
 msgid ""
 "On a busy server, the byte counters may overrun, so those statistics as "
 "reported by the MySQL server may be incorrect."
 msgstr ""
 
-#: libraries/server_status.lib.php:148
+#: libraries/server_status.lib.php:157
 msgid "Received"
 msgstr ""
 
-#: libraries/server_status.lib.php:167
+#: libraries/server_status.lib.php:176
 msgid "Sent"
 msgstr ""
 
-#: libraries/server_status.lib.php:234
+#: libraries/server_status.lib.php:243
 msgid "Max. concurrent connections"
 msgstr ""
 
-#: libraries/server_status.lib.php:244
+#: libraries/server_status.lib.php:253
 msgid "Failed attempts"
 msgstr ""
 
@@ -13206,7 +13222,7 @@ msgstr ""
 msgid "Not implemented yet."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/AlterOperation.php:193
+#: libraries/sql-parser/src/Components/AlterOperation.php:191
 msgid "Unrecognized alter operation."
 msgstr ""
 
@@ -13220,7 +13236,7 @@ msgid "An opening bracket followed by a set of values was expected."
 msgstr ""
 
 #: libraries/sql-parser/src/Components/ArrayObj.php:101
-#: libraries/sql-parser/src/Components/FieldDefinition.php:202
+#: libraries/sql-parser/src/Components/CreateDefinition.php:202
 msgid "An opening bracket was expected."
 msgstr ""
 
@@ -13228,25 +13244,35 @@ msgstr ""
 msgid "A comma or a closing bracket was expected"
 msgstr ""
 
+#: libraries/sql-parser/src/Components/CreateDefinition.php:246
+#, fuzzy
+#| msgid "Remove database"
+msgid "A comma or a closing bracket was expected."
+msgstr "വിവരശേഖരം നീക്കുക"
+
+#: libraries/sql-parser/src/Components/CreateDefinition.php:262
+msgid "A closing bracket was expected."
+msgstr ""
+
 #: libraries/sql-parser/src/Components/DataType.php:125
 msgid "Unrecognized data type."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:225
+#: libraries/sql-parser/src/Components/Expression.php:227
 msgid "Unexpected closing bracket."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:246
-#: libraries/sql-parser/src/Components/Expression.php:283
-#: libraries/sql-parser/src/Components/Expression.php:303
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:285
+#: libraries/sql-parser/src/Components/Expression.php:305
 msgid "An alias was previously found."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:257
+#: libraries/sql-parser/src/Components/Expression.php:259
 msgid "Unexpected dot."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:327
+#: libraries/sql-parser/src/Components/Expression.php:329
 #, fuzzy
 #| msgid "Remove database"
 msgid "An alias was expected."
@@ -13258,16 +13284,6 @@ msgstr "വിവരശേഖരം നീക്കുക"
 msgid "An expression was expected."
 msgstr "വിവരശേഖരം നീക്കുക"
 
-#: libraries/sql-parser/src/Components/FieldDefinition.php:246
-#, fuzzy
-#| msgid "Remove database"
-msgid "A comma or a closing bracket was expected."
-msgstr "വിവരശേഖരം നീക്കുക"
-
-#: libraries/sql-parser/src/Components/FieldDefinition.php:262
-msgid "A closing bracket was expected."
-msgstr ""
-
 #: libraries/sql-parser/src/Components/Limit.php:90
 #: libraries/sql-parser/src/Components/Limit.php:112
 msgid "An offset was expected."
@@ -13309,24 +13325,24 @@ msgstr ""
 msgid "Expected delimiter."
 msgstr ""
 
-#: libraries/sql-parser/src/Lexer.php:753
+#: libraries/sql-parser/src/Lexer.php:777
 #, php-format
 msgid "Ending quote %1$s was expected."
 msgstr ""
 
-#: libraries/sql-parser/src/Lexer.php:789
+#: libraries/sql-parser/src/Lexer.php:813
 msgid "Variable name was expected."
 msgstr ""
 
-#: libraries/sql-parser/src/Parser.php:380
+#: libraries/sql-parser/src/Parser.php:391
 msgid "Unexpected beginning of statement."
 msgstr ""
 
-#: libraries/sql-parser/src/Parser.php:399
+#: libraries/sql-parser/src/Parser.php:410
 msgid "Unrecognized statement type."
 msgstr ""
 
-#: libraries/sql-parser/src/Parser.php:479
+#: libraries/sql-parser/src/Parser.php:489
 msgid "No transaction was previously started."
 msgstr ""
 
@@ -13352,8 +13368,10 @@ msgid "The name of the entity was expected."
 msgstr ""
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:310
-msgid "At least one field definition was expected."
-msgstr ""
+#, fuzzy
+#| msgid "Database %1$s has been created."
+msgid "At least one column definition was expected."
+msgstr "വിവരശേഖരം(ങ്ങൾ) %1$s സൃഷ്ടിച്ചിരിക്കുന്നു."
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:329
 msgid "A \"RETURNS\" keyword was expected."
@@ -13412,25 +13430,25 @@ msgstr ""
 msgid "Using bookmark \"%s\" as default browse query."
 msgstr ""
 
-#: libraries/sql.lib.php:1306
+#: libraries/sql.lib.php:1300
 msgid "Showing as PHP code"
 msgstr ""
 
-#: libraries/sql.lib.php:1638
+#: libraries/sql.lib.php:1632
 #, php-format
 msgid ""
 "Current selection does not contain a unique column. Grid edit, checkbox, "
 "Edit, Copy and Delete features are not available. %s"
 msgstr ""
 
-#: libraries/sql.lib.php:1649
+#: libraries/sql.lib.php:1643
 #, php-format
 msgid ""
 "Current selection does not contain a unique column. Grid edit, Edit, Copy "
 "and Delete features may result in undesired behavior. %s"
 msgstr ""
 
-#: libraries/sql.lib.php:1688
+#: libraries/sql.lib.php:1682
 #, php-format
 msgid "Problems with indexes of table `%s`"
 msgstr ""
@@ -13588,7 +13606,7 @@ msgid "Version %s snapshot (SQL code)"
 msgstr ""
 
 #: libraries/tracking.lib.php:947
-#: templates/structure/table_structure_row.phtml:33
+#: templates/table/structure/table_structure_row.phtml:33
 msgctxt "None for default"
 msgid "None"
 msgstr ""
@@ -13640,15 +13658,15 @@ msgstr ""
 msgid "Version %1$s was created, tracking for %2$s is active."
 msgstr ""
 
-#: libraries/user_preferences.inc.php:29
+#: libraries/user_preferences.inc.php:30
 msgid "Manage your settings"
 msgstr ""
 
-#: libraries/user_preferences.inc.php:46 prefs_manage.php:307
+#: libraries/user_preferences.inc.php:54 prefs_manage.php:307
 msgid "Configuration has been saved."
 msgstr ""
 
-#: libraries/user_preferences.inc.php:66
+#: libraries/user_preferences.inc.php:74
 #, php-format
 msgid ""
 "Your preferences will be saved for current session only. Storing them "
@@ -14032,7 +14050,7 @@ msgid "first"
 msgstr ""
 
 #: templates/columns_definitions/move_column.phtml:12
-#: templates/structure/add_column.phtml:21
+#: templates/table/structure/add_column.phtml:21
 #, php-format
 msgid "after %s"
 msgstr ""
@@ -14091,203 +14109,302 @@ msgstr ""
 msgid "Input transformation options"
 msgstr ""
 
-#: templates/designer/aggregate_query_panel.phtml:22
-#: templates/designer/options_panel.phtml:100
+#: templates/database/create_table.phtml:7
+#: templates/database/designer/side_menu.phtml:77
+#: templates/database/designer/side_menu.phtml:80
+msgid "Create table"
+msgstr ""
+
+#: templates/database/create_table.phtml:15
+msgid "Number of columns"
+msgstr ""
+
+#: templates/database/designer/aggregate_query_panel.phtml:22
+#: templates/database/designer/options_panel.phtml:100
 msgid "Aggregate"
 msgstr ""
 
-#: templates/designer/aggregate_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:61
-#: templates/designer/options_panel.phtml:106
-#: templates/designer/options_panel.phtml:170
-#: templates/designer/where_query_panel.phtml:30
-#: templates/table/table_header.phtml:9
+#: templates/database/designer/aggregate_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:61
+#: templates/database/designer/options_panel.phtml:106
+#: templates/database/designer/options_panel.phtml:170
+#: templates/database/designer/where_query_panel.phtml:30
+#: templates/table/search/table_header.phtml:9
 msgid "Operator"
 msgstr ""
 
-#: templates/designer/database_tables.phtml:29
+#: templates/database/designer/database_tables.phtml:29
 msgid "Toggle"
 msgstr ""
 
-#: templates/designer/database_tables.phtml:40
+#: templates/database/designer/database_tables.phtml:40
 #, fuzzy
 #| msgid "Database comment"
 msgid "See table structure"
 msgstr "വിവരശേഖര അഭിപ്രായം: "
 
-#: templates/designer/delete_relation_panel.phtml:21
+#: templates/database/designer/delete_relation_panel.phtml:21
 msgid "Delete relation"
 msgstr ""
 
-#: templates/designer/edit_delete_pages.phtml:7
+#: templates/database/designer/edit_delete_pages.phtml:7
 msgid "Page to open"
 msgstr ""
 
-#: templates/designer/edit_delete_pages.phtml:7
+#: templates/database/designer/edit_delete_pages.phtml:7
 msgid "Page to delete"
 msgstr ""
 
-#: templates/designer/having_query_panel.phtml:90
-#: templates/designer/options_panel.phtml:63
-#: templates/designer/options_panel.phtml:229
-#: templates/designer/where_query_panel.phtml:59
+#: templates/database/designer/having_query_panel.phtml:90
+#: templates/database/designer/options_panel.phtml:63
+#: templates/database/designer/options_panel.phtml:229
+#: templates/database/designer/where_query_panel.phtml:59
 msgid "Except"
 msgstr ""
 
-#: templates/designer/having_query_panel.phtml:102
-#: templates/designer/options_panel.phtml:75
-#: templates/designer/options_panel.phtml:241
-#: templates/designer/where_query_panel.phtml:71
+#: templates/database/designer/having_query_panel.phtml:102
+#: templates/database/designer/options_panel.phtml:75
+#: templates/database/designer/options_panel.phtml:241
+#: templates/database/designer/where_query_panel.phtml:71
 msgid "subquery"
 msgstr ""
 
-#: templates/designer/new_relation_panel.phtml:22
-#: templates/designer/side_menu.phtml:84 templates/designer/side_menu.phtml:87
+#: templates/database/designer/new_relation_panel.phtml:22
+#: templates/database/designer/side_menu.phtml:84
+#: templates/database/designer/side_menu.phtml:87
 msgid "Create relation"
 msgstr ""
 
-#: templates/designer/options_panel.phtml:34
-#: templates/designer/options_panel.phtml:200
+#: templates/database/designer/options_panel.phtml:34
+#: templates/database/designer/options_panel.phtml:200
 msgid "Relation operator"
 msgstr ""
 
-#: templates/designer/options_panel.phtml:85
-#: templates/designer/rename_to_panel.phtml:23
+#: templates/database/designer/options_panel.phtml:85
+#: templates/database/designer/rename_to_panel.phtml:23
 msgid "Rename to"
 msgstr ""
 
-#: templates/designer/options_panel.phtml:91
-#: templates/designer/rename_to_panel.phtml:31
+#: templates/database/designer/options_panel.phtml:91
+#: templates/database/designer/rename_to_panel.phtml:31
 msgid "New name"
 msgstr ""
 
-#: templates/designer/page_save_as.phtml:4
+#: templates/database/designer/page_save_as.phtml:4
 msgid "Save to selected page"
 msgstr ""
 
-#: templates/designer/page_save_as.phtml:5
+#: templates/database/designer/page_save_as.phtml:5
 msgid "Create a page and save to it"
 msgstr ""
 
-#: templates/designer/page_save_as.phtml:26
+#: templates/database/designer/page_save_as.phtml:26
 msgid "New page name"
 msgstr ""
 
-#: templates/designer/page_selector.phtml:2
+#: templates/database/designer/page_selector.phtml:2
 msgid "Select page"
 msgstr ""
 
-#: templates/designer/query_details.phtml:10
+#: templates/database/designer/query_details.phtml:10
 msgid "Active options"
 msgstr ""
 
-#: templates/designer/schema_export.phtml:4
+#: templates/database/designer/schema_export.phtml:4
 msgid "Select Export Relational Type"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:19 templates/designer/side_menu.phtml:25
+#: templates/database/designer/side_menu.phtml:19
+#: templates/database/designer/side_menu.phtml:25
 #, fuzzy
 #| msgid "Show all"
 msgid "Show/Hide tables list"
 msgstr "എല്ലാം കാണിക്കൂ"
 
-#: templates/designer/side_menu.phtml:29 templates/designer/side_menu.phtml:35
-#: templates/designer/side_menu.phtml:36
+#: templates/database/designer/side_menu.phtml:29
+#: templates/database/designer/side_menu.phtml:35
+#: templates/database/designer/side_menu.phtml:36
 msgid "View in fullscreen"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:34
+#: templates/database/designer/side_menu.phtml:34
 msgid "Exit fullscreen"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:41 templates/designer/side_menu.phtml:45
+#: templates/database/designer/side_menu.phtml:41
+#: templates/database/designer/side_menu.phtml:45
 msgid "New page"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:70 templates/designer/side_menu.phtml:73
+#: templates/database/designer/side_menu.phtml:70
+#: templates/database/designer/side_menu.phtml:73
 msgid "Delete pages"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:77 templates/designer/side_menu.phtml:80
-#: templates/table/create_table.phtml:7
-msgid "Create table"
-msgstr ""
-
-#: templates/designer/side_menu.phtml:98
-#: templates/designer/side_menu.phtml:101
+#: templates/database/designer/side_menu.phtml:98
+#: templates/database/designer/side_menu.phtml:101
 msgid "Reload"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:107
-#: templates/designer/side_menu.phtml:110
+#: templates/database/designer/side_menu.phtml:107
+#: templates/database/designer/side_menu.phtml:110
 msgid "Help"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Angular links"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Direct links"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:122
-#: templates/designer/side_menu.phtml:124
+#: templates/database/designer/side_menu.phtml:122
+#: templates/database/designer/side_menu.phtml:124
 msgid "Snap to grid"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:128
-#: templates/designer/side_menu.phtml:134
+#: templates/database/designer/side_menu.phtml:128
+#: templates/database/designer/side_menu.phtml:134
 msgid "Small/Big All"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:138
-#: templates/designer/side_menu.phtml:141
+#: templates/database/designer/side_menu.phtml:138
+#: templates/database/designer/side_menu.phtml:141
 msgid "Toggle small/big"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:145
-#: templates/designer/side_menu.phtml:148
+#: templates/database/designer/side_menu.phtml:145
+#: templates/database/designer/side_menu.phtml:148
 msgid "Toggle relation lines"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:153
-#: templates/designer/side_menu.phtml:156
+#: templates/database/designer/side_menu.phtml:153
+#: templates/database/designer/side_menu.phtml:156
 msgid "Export schema"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:165
-#: templates/designer/side_menu.phtml:168
+#: templates/database/designer/side_menu.phtml:165
+#: templates/database/designer/side_menu.phtml:168
 msgid "Build Query"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:173
-#: templates/designer/side_menu.phtml:177
+#: templates/database/designer/side_menu.phtml:173
+#: templates/database/designer/side_menu.phtml:177
 msgid "Move Menu"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:181
-#: templates/designer/side_menu.phtml:186
+#: templates/database/designer/side_menu.phtml:181
+#: templates/database/designer/side_menu.phtml:186
 #, fuzzy
 #| msgid "Print"
 msgid "Pin text"
 msgstr "അച്ചടിക്കുക"
 
-#: templates/designer/table_list.phtml:4
+#: templates/database/designer/table_list.phtml:4
 msgid "Hide/Show all"
 msgstr ""
 
-#: templates/designer/table_list.phtml:14
+#: templates/database/designer/table_list.phtml:14
 msgid "Hide/Show Tables with no relation"
 msgstr ""
 
-#: templates/designer/table_list.phtml:59
+#: templates/database/designer/table_list.phtml:59
 msgid "Number of tables:"
 msgstr ""
 
+#: templates/database/structure/body_for_table_summary.phtml:6
+#, php-format
+msgid "%s table"
+msgid_plural "%s tables"
+msgstr[0] "%s പട്ടിക"
+msgstr[1] "%s പട്ടികകൾ"
+
+#: templates/database/structure/body_for_table_summary.phtml:17
+msgid "Sum"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:6
+msgid "Check tables having overhead"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:10
+#, fuzzy
+#| msgid "Show all"
+msgid "Show create"
+msgstr "എല്ലാം കാണിക്കൂ"
+
+#: templates/database/structure/check_all_tables.phtml:27
+msgid "Prefix"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:28
+msgid "Add prefix to table"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:29
+msgid "Replace table prefix"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:30
+msgid "Copy table with prefix"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:36
+#, fuzzy
+#| msgid "Add/Delete columns"
+msgid "Add columns to central list"
+msgstr "നിരകൾ ചേർക്കുക/മായക്കുക"
+
+#: templates/database/structure/check_all_tables.phtml:37
+msgid "Remove columns from central list"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:38
+#, fuzzy
+#| msgid "Add/Delete columns"
+msgid "Make consistent with central list"
+msgstr "നിരകൾ ചേർക്കുക/മായക്കുക"
+
+#: templates/database/structure/favorite_anchor.phtml:12
+msgid "Add to Favorites"
+msgstr ""
+
+#: templates/database/structure/show_create.phtml:2
+msgid "Showing create queries"
+msgstr ""
+
+#: templates/database/structure/sortable_header.phtml:13
+msgid "Sort"
+msgstr "തരംതിരിക്കുക"
+
+#: templates/database/structure/table_header.phtml:42
+msgid ""
+"May be approximate. Click on the number to get the exact count. See "
+"[doc@faq3-11]FAQ 3.11[/doc]."
+msgstr ""
+
+#: templates/database/structure/table_header.phtml:66
+#: templates/table/index_form.phtml:127
+msgid "Size"
+msgstr "വലിപ്പം"
+
+#: templates/database/structure/table_header.phtml:74
+#: templates/table/structure/display_table_stats.phtml:27
+msgid "Overhead"
+msgstr ""
+
+#: templates/database/structure/tracking_icon.phtml:4
+msgid "Tracking is active."
+msgstr ""
+
+#: templates/database/structure/tracking_icon.phtml:8
+msgid "Tracking is not active."
+msgstr ""
+
 #: templates/error/report_form.phtml:7
 msgid ""
 "phpMyAdmin has encountered an error. We have collected data about this error "
@@ -14303,61 +14420,6 @@ msgstr ""
 msgid "Please explain the steps that lead to the error:"
 msgstr ""
 
-#: templates/gis_visualization/gis_visualization.phtml:3
-msgid "Display GIS Visualization"
-msgstr ""
-
-#: templates/gis_visualization/gis_visualization.phtml:8
-msgid "Label column"
-msgstr ""
-
-#: templates/gis_visualization/gis_visualization.phtml:11
-msgid "-- None --"
-msgstr ""
-
-#: templates/gis_visualization/gis_visualization.phtml:19
-msgid "Spatial column"
-msgstr ""
-
-#: templates/index_form.phtml:16
-msgid "Index name:"
-msgstr ""
-
-#: templates/index_form.phtml:19
-msgid ""
-"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
-msgstr ""
-
-#: templates/index_form.phtml:40
-msgid "Index choice:"
-msgstr ""
-
-#: templates/index_form.phtml:57
-msgid "Key block size:"
-msgstr ""
-
-#: templates/index_form.phtml:74
-msgid "Index type:"
-msgstr ""
-
-#: templates/index_form.phtml:86
-msgid "Parser:"
-msgstr ""
-
-#: templates/index_form.phtml:102
-#, fuzzy
-#| msgid "Comments"
-msgid "Comment:"
-msgstr "അഭിപ്രായങ്ങൾ"
-
-#: templates/index_form.phtml:127 templates/structure/table_header.phtml:66
-msgid "Size"
-msgstr "വലിപ്പം"
-
-#: templates/index_form.phtml:149 templates/index_form.phtml:190
-msgid "Drag to reorder"
-msgstr ""
-
 #: templates/prefs_autoload.phtml:9
 msgid ""
 "Your browser has phpMyAdmin configuration for this domain. Would you like to "
@@ -14370,427 +14432,390 @@ msgstr ""
 msgid "Start row:"
 msgstr "തരംതിരിക്കുക"
 
-#: templates/structure/actions_in_table_structure.phtml:14
-#, php-format
-msgid "A primary key has been added on %s."
-msgstr ""
-
-#: templates/structure/actions_in_table_structure.phtml:34
-#: templates/structure/actions_in_table_structure.phtml:54
-#: templates/structure/actions_in_table_structure.phtml:79
-#: templates/structure/actions_in_table_structure.phtml:101
-#, php-format
-msgid "An index has been added on %s."
-msgstr ""
-
-#: templates/structure/actions_in_table_structure.phtml:130
-#: templates/structure/check_all_table_column.phtml:59
-msgid "Remove from central columns"
-msgstr ""
-
-#: templates/structure/actions_in_table_structure.phtml:138
-#: templates/structure/check_all_table_column.phtml:55
-#, fuzzy
-#| msgid "Add/Delete columns"
-msgid "Add to central columns"
-msgstr "നിരകൾ ചേർക്കുക/മായക്കുക"
-
-#: templates/structure/add_column.phtml:7
-#, php-format
-msgid "Add %s column(s)"
-msgstr ""
-
-#: templates/structure/add_column.phtml:12
-msgid "at beginning of table"
-msgstr ""
-
-#: templates/structure/body_for_table_summary.phtml:6
-#, php-format
-msgid "%s table"
-msgid_plural "%s tables"
-msgstr[0] "%s പട്ടിക"
-msgstr[1] "%s പട്ടികകൾ"
-
-#: templates/structure/body_for_table_summary.phtml:17
-msgid "Sum"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:6
-msgid "Check tables having overhead"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:10
-#, fuzzy
-#| msgid "Show all"
-msgid "Show create"
-msgstr "എല്ലാം കാണിക്കൂ"
-
-#: templates/structure/check_all_tables.phtml:27
-msgid "Prefix"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:28
-msgid "Add prefix to table"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:29
-msgid "Replace table prefix"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:30
-msgid "Copy table with prefix"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:36
-#, fuzzy
-#| msgid "Add/Delete columns"
-msgid "Add columns to central list"
-msgstr "നിരകൾ ചേർക്കുക/മായക്കുക"
-
-#: templates/structure/check_all_tables.phtml:37
-msgid "Remove columns from central list"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:38
-#, fuzzy
-#| msgid "Add/Delete columns"
-msgid "Make consistent with central list"
-msgstr "നിരകൾ ചേർക്കുക/മായക്കുക"
-
-#: templates/structure/display_structure.phtml:140 view_create.php:181
-msgid "Edit view"
-msgstr ""
-
-#: templates/structure/display_table_stats.phtml:9
-msgid "Space usage"
-msgstr ""
-
-#: templates/structure/display_table_stats.phtml:27
-#: templates/structure/table_header.phtml:74
-msgid "Overhead"
-msgstr ""
-
-#: templates/structure/display_table_stats.phtml:32
-msgid "Effective"
-msgstr ""
-
-#: templates/structure/favorite_anchor.phtml:12
-msgid "Add to Favorites"
-msgstr ""
-
-#: templates/structure/move_columns_dialog.phtml:1
-#: templates/structure/optional_action_links.phtml:21
-#, fuzzy
-#| msgid "Add/Delete columns"
-msgid "Move columns"
-msgstr "നിരകൾ ചേർക്കുക/മായക്കുക"
-
-#: templates/structure/move_columns_dialog.phtml:2
-msgid "Move the columns by dragging them up and down."
-msgstr ""
-
-#: templates/structure/optional_action_links.phtml:9
-msgid "Propose table structure"
-msgstr ""
-
-#: templates/structure/optional_action_links.phtml:24
-#, fuzzy
-#| msgid "Database comment"
-msgid "Improve table structure"
-msgstr "വിവരശേഖര അഭിപ്രായം: "
-
-#: templates/structure/optional_action_links.phtml:30
-msgid "Track view"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:3
-msgid "Row statistics"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:9
-msgid "static"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:11
-msgid "dynamic"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:22
-msgid "partitioned"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:54
-msgid "Row length"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:66
-msgid "Row size"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:73
-msgid "Next autoindex"
-msgstr ""
-
-#: templates/structure/secondary_tabs.phtml:14
-msgid "Relation view"
-msgstr ""
-
-#: templates/structure/show_create.phtml:2
-msgid "Showing create queries"
-msgstr ""
-
-#: templates/structure/sortable_header.phtml:13
-msgid "Sort"
-msgstr "തരംതിരിക്കുക"
-
-#: templates/structure/table_header.phtml:42
-msgid ""
-"May be approximate. Click on the number to get the exact count. See "
-"[doc@faq3-11]FAQ 3.11[/doc]."
-msgstr ""
-
-#: templates/structure/table_structure_row.phtml:46
-#, php-format
-msgid "Column %s has been dropped."
-msgstr ""
-
-#: templates/structure/tracking_icon.phtml:4
-msgid "Tracking is active."
-msgstr ""
-
-#: templates/structure/tracking_icon.phtml:8
-msgid "Tracking is not active."
-msgstr ""
-
-#: templates/table/create_table.phtml:15
-msgid "Number of columns"
-msgstr ""
-
-#: templates/table/options.phtml:8
-msgid "Select columns (at least one):"
-msgstr ""
-
-#: templates/table/options.phtml:37
-msgid "Add search conditions (body of the \"where\" clause):"
-msgstr ""
-
-#: templates/table/options.phtml:45
-msgid "Number of rows per page"
-msgstr ""
-
-#: templates/table/options.phtml:56
-msgid "Display order:"
-msgstr ""
-
-#: templates/table/options_zoom.phtml:6
-msgid "Use this column to label each point"
-msgstr ""
-
-#: templates/table/options_zoom.phtml:35
-msgid "Maximum rows to plot"
-msgstr ""
-
-#: templates/table/replace_preview.phtml:13
-msgid "Find and replace - preview"
-msgstr ""
-
-#: templates/table/replace_preview.phtml:18
-msgid "Original string"
-msgstr ""
-
-#: templates/table/replace_preview.phtml:19
-msgid "Replaced string"
-msgstr ""
-
-#: templates/table/replace_preview.phtml:40
-msgid "Replace"
-msgstr ""
-
-#: templates/table/rows_zoom.phtml:16
-msgid "Additional search criteria"
-msgstr ""
-
-#: templates/table/search_and_replace.phtml:3
-msgid "Replace with:"
-msgstr ""
-
-#: templates/table/search_and_replace.phtml:22
-msgid "Use regular expression"
-msgstr ""
-
-#: templates/table/selection_form.phtml:12
-msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
-msgstr ""
-
-#: templates/table/selection_form.phtml:34
-msgid "Do a \"query by example\" (wildcard: \"%\")"
-msgstr ""
-
-#: templates/table/zoom_result_form.phtml:7
-msgid "Browse/Edit the points"
-msgstr ""
-
-#: templates/table/zoom_result_form.phtml:15
-msgid "How to use"
-msgstr ""
-
-#: templates/table/zoom_result_form.phtml:23
-msgid "Reset zoom"
-msgstr ""
-
-#: templates/tbl_chart.phtml:17
+#: templates/table/chart/tbl_chart.phtml:17
 msgctxt "Chart type"
 msgid "Bar"
 msgstr ""
 
-#: templates/tbl_chart.phtml:21
+#: templates/table/chart/tbl_chart.phtml:21
 #, fuzzy
 #| msgid "Column"
 msgctxt "Chart type"
 msgid "Column"
 msgstr "നിര"
 
-#: templates/tbl_chart.phtml:25
+#: templates/table/chart/tbl_chart.phtml:25
 msgctxt "Chart type"
 msgid "Line"
 msgstr ""
 
-#: templates/tbl_chart.phtml:29
+#: templates/table/chart/tbl_chart.phtml:29
 msgctxt "Chart type"
 msgid "Spline"
 msgstr ""
 
-#: templates/tbl_chart.phtml:33
+#: templates/table/chart/tbl_chart.phtml:33
 msgctxt "Chart type"
 msgid "Area"
 msgstr ""
 
-#: templates/tbl_chart.phtml:37
+#: templates/table/chart/tbl_chart.phtml:37
 msgctxt "Chart type"
 msgid "Pie"
 msgstr ""
 
-#: templates/tbl_chart.phtml:41
+#: templates/table/chart/tbl_chart.phtml:41
 msgctxt "Chart type"
 msgid "Timeline"
 msgstr ""
 
-#: templates/tbl_chart.phtml:45
+#: templates/table/chart/tbl_chart.phtml:45
 msgctxt "Chart type"
 msgid "Scatter"
 msgstr ""
 
-#: templates/tbl_chart.phtml:50
+#: templates/table/chart/tbl_chart.phtml:50
 msgid "Stacked"
 msgstr ""
 
-#: templates/tbl_chart.phtml:53
+#: templates/table/chart/tbl_chart.phtml:53
 msgid "Chart title"
 msgstr ""
 
-#: templates/tbl_chart.phtml:57
+#: templates/table/chart/tbl_chart.phtml:57
 msgid "X-Axis:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:72
+#: templates/table/chart/tbl_chart.phtml:72
 msgid "Series:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:102
+#: templates/table/chart/tbl_chart.phtml:102
 msgid "X-Axis label:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:104
+#: templates/table/chart/tbl_chart.phtml:104
 msgid "X Values"
 msgstr ""
 
-#: templates/tbl_chart.phtml:107
+#: templates/table/chart/tbl_chart.phtml:107
 msgid "Y-Axis label:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:115
+#: templates/table/chart/tbl_chart.phtml:115
 msgid "Series names are in a column"
 msgstr ""
 
-#: templates/tbl_chart.phtml:118
+#: templates/table/chart/tbl_chart.phtml:118
 #, fuzzy
 #| msgid "Add/Delete columns"
 msgid "Series column:"
 msgstr "നിരകൾ ചേർക്കുക/മായക്കുക"
 
-#: templates/tbl_chart.phtml:130
+#: templates/table/chart/tbl_chart.phtml:130
 #, fuzzy
 #| msgid "Table comments"
 msgid "Value Column:"
 msgstr "പട്ടിക അഭിപ്രയങ്ങൾ"
 
-#: templates/tbl_chart.phtml:150
+#: templates/table/chart/tbl_chart.phtml:150
 msgid "Save chart as image"
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:7
+#: templates/table/gis_visualization/gis_visualization.phtml:3
+msgid "Display GIS Visualization"
+msgstr ""
+
+#: templates/table/gis_visualization/gis_visualization.phtml:8
+msgid "Label column"
+msgstr ""
+
+#: templates/table/gis_visualization/gis_visualization.phtml:11
+msgid "-- None --"
+msgstr ""
+
+#: templates/table/gis_visualization/gis_visualization.phtml:19
+msgid "Spatial column"
+msgstr ""
+
+#: templates/table/index_form.phtml:16
+msgid "Index name:"
+msgstr ""
+
+#: templates/table/index_form.phtml:19
+msgid ""
+"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
+msgstr ""
+
+#: templates/table/index_form.phtml:40
+msgid "Index choice:"
+msgstr ""
+
+#: templates/table/index_form.phtml:57
+msgid "Key block size:"
+msgstr ""
+
+#: templates/table/index_form.phtml:74
+msgid "Index type:"
+msgstr ""
+
+#: templates/table/index_form.phtml:86
+msgid "Parser:"
+msgstr ""
+
+#: templates/table/index_form.phtml:102
+#, fuzzy
+#| msgid "Comments"
+msgid "Comment:"
+msgstr "അഭിപ്രായങ്ങൾ"
+
+#: templates/table/index_form.phtml:149 templates/table/index_form.phtml:190
+msgid "Drag to reorder"
+msgstr ""
+
+#: templates/table/relation/common_form.phtml:7
 #, fuzzy
 #| msgid "Database %1$s has been created."
 msgid "Internal relations"
 msgstr "വിവരശേഖരം(ങ്ങൾ) %1$s സൃഷ്ടിച്ചിരിക്കുന്നു."
 
-#: templates/tbl_relation/common_form.phtml:11
+#: templates/table/relation/common_form.phtml:11
 msgid "Internal relation"
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:14
+#: templates/table/relation/common_form.phtml:14
 msgid ""
 "An internal relation is not necessary when a corresponding FOREIGN KEY "
 "relation exists."
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:37
+#: templates/table/relation/common_form.phtml:37
 msgid "Foreign key constraints"
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:40
+#: templates/table/relation/common_form.phtml:40
 msgid "Actions"
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:41
+#: templates/table/relation/common_form.phtml:41
 msgid "Constraint properties"
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:44
+#: templates/table/relation/common_form.phtml:44
 msgid ""
 "Only columns with index will be displayed. You can define an index below."
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:49
+#: templates/table/relation/common_form.phtml:49
 msgid "Foreign key constraint"
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:81
+#: templates/table/relation/common_form.phtml:81
 #, fuzzy
 #| msgid "Add/Delete columns"
 msgid "+ Add constraint"
 msgstr "നിരകൾ ചേർക്കുക/മായക്കുക"
 
-#: templates/tbl_relation/common_form.phtml:91
+#: templates/table/relation/common_form.phtml:91
 msgid "Choose column to display:"
 msgstr ""
 
-#: templates/tbl_relation/foreign_key_row.phtml:13
+#: templates/table/relation/foreign_key_row.phtml:13
 #, fuzzy, php-format
 #| msgid "Database %s has been dropped."
 msgid "Foreign key constraint %s has been dropped"
 msgstr "%s എന്ന വിവരശേഖരം ഉപേക്ഷിച്ചിരിക്കുന്നു."
 
-#: templates/tbl_relation/foreign_key_row.phtml:102
+#: templates/table/relation/foreign_key_row.phtml:102
 msgid "Constraint name"
 msgstr ""
 
-#: templates/tbl_relation/foreign_key_row.phtml:157
+#: templates/table/relation/foreign_key_row.phtml:157
 #, fuzzy
 #| msgid "Add/Delete columns"
 msgid "+ Add column"
 msgstr "നിരകൾ ചേർക്കുക/മായക്കുക"
 
+#: templates/table/search/options.phtml:8
+msgid "Select columns (at least one):"
+msgstr ""
+
+#: templates/table/search/options.phtml:37
+msgid "Add search conditions (body of the \"where\" clause):"
+msgstr ""
+
+#: templates/table/search/options.phtml:45
+msgid "Number of rows per page"
+msgstr ""
+
+#: templates/table/search/options.phtml:56
+msgid "Display order:"
+msgstr ""
+
+#: templates/table/search/options_zoom.phtml:6
+msgid "Use this column to label each point"
+msgstr ""
+
+#: templates/table/search/options_zoom.phtml:35
+msgid "Maximum rows to plot"
+msgstr ""
+
+#: templates/table/search/replace_preview.phtml:13
+msgid "Find and replace - preview"
+msgstr ""
+
+#: templates/table/search/replace_preview.phtml:18
+msgid "Original string"
+msgstr ""
+
+#: templates/table/search/replace_preview.phtml:19
+msgid "Replaced string"
+msgstr ""
+
+#: templates/table/search/replace_preview.phtml:40
+msgid "Replace"
+msgstr ""
+
+#: templates/table/search/rows_zoom.phtml:16
+msgid "Additional search criteria"
+msgstr ""
+
+#: templates/table/search/search_and_replace.phtml:3
+msgid "Replace with:"
+msgstr ""
+
+#: templates/table/search/search_and_replace.phtml:22
+msgid "Use regular expression"
+msgstr ""
+
+#: templates/table/search/selection_form.phtml:12
+msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
+msgstr ""
+
+#: templates/table/search/selection_form.phtml:34
+msgid "Do a \"query by example\" (wildcard: \"%\")"
+msgstr ""
+
+#: templates/table/search/zoom_result_form.phtml:7
+msgid "Browse/Edit the points"
+msgstr ""
+
+#: templates/table/search/zoom_result_form.phtml:15
+msgid "How to use"
+msgstr ""
+
+#: templates/table/search/zoom_result_form.phtml:23
+msgid "Reset zoom"
+msgstr ""
+
+#: templates/table/secondary_tabs.phtml:14
+msgid "Relation view"
+msgstr ""
+
+#: templates/table/structure/actions_in_table_structure.phtml:14
+#, php-format
+msgid "A primary key has been added on %s."
+msgstr ""
+
+#: templates/table/structure/actions_in_table_structure.phtml:34
+#: templates/table/structure/actions_in_table_structure.phtml:54
+#: templates/table/structure/actions_in_table_structure.phtml:79
+#: templates/table/structure/actions_in_table_structure.phtml:101
+#, php-format
+msgid "An index has been added on %s."
+msgstr ""
+
+#: templates/table/structure/actions_in_table_structure.phtml:130
+#: templates/table/structure/check_all_table_column.phtml:59
+msgid "Remove from central columns"
+msgstr ""
+
+#: templates/table/structure/actions_in_table_structure.phtml:138
+#: templates/table/structure/check_all_table_column.phtml:55
+#, fuzzy
+#| msgid "Add/Delete columns"
+msgid "Add to central columns"
+msgstr "നിരകൾ ചേർക്കുക/മായക്കുക"
+
+#: templates/table/structure/add_column.phtml:7
+#, php-format
+msgid "Add %s column(s)"
+msgstr ""
+
+#: templates/table/structure/add_column.phtml:12
+msgid "at beginning of table"
+msgstr ""
+
+#: templates/table/structure/display_structure.phtml:140 view_create.php:181
+msgid "Edit view"
+msgstr ""
+
+#: templates/table/structure/display_table_stats.phtml:9
+msgid "Space usage"
+msgstr ""
+
+#: templates/table/structure/display_table_stats.phtml:32
+msgid "Effective"
+msgstr ""
+
+#: templates/table/structure/move_columns_dialog.phtml:1
+#: templates/table/structure/optional_action_links.phtml:21
+#, fuzzy
+#| msgid "Add/Delete columns"
+msgid "Move columns"
+msgstr "നിരകൾ ചേർക്കുക/മായക്കുക"
+
+#: templates/table/structure/move_columns_dialog.phtml:2
+msgid "Move the columns by dragging them up and down."
+msgstr ""
+
+#: templates/table/structure/optional_action_links.phtml:9
+msgid "Propose table structure"
+msgstr ""
+
+#: templates/table/structure/optional_action_links.phtml:24
+#, fuzzy
+#| msgid "Database comment"
+msgid "Improve table structure"
+msgstr "വിവരശേഖര അഭിപ്രായം: "
+
+#: templates/table/structure/optional_action_links.phtml:30
+msgid "Track view"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:3
+msgid "Row statistics"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:9
+msgid "static"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:11
+msgid "dynamic"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:22
+msgid "partitioned"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:54
+msgid "Row length"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:66
+msgid "Row size"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:73
+msgid "Next autoindex"
+msgstr ""
+
+#: templates/table/structure/table_structure_row.phtml:46
+#, php-format
+msgid "Column %s has been dropped."
+msgstr ""
+
 #: themes.php:17 themes.php:22
 msgid "Theme"
 msgstr ""
diff --git a/po/mn.po b/po/mn.po
index 1a63bbd7ec..2e126c62ab 100644
--- a/po/mn.po
+++ b/po/mn.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 4.5.0-dev\n"
 "Report-Msgid-Bugs-To: developers@phpmyadmin.net\n"
-"POT-Creation-Date: 2015-08-08 13:53-0400\n"
+"POT-Creation-Date: 2015-08-12 08:10-0400\n"
 "PO-Revision-Date: 2014-11-05 10:28+0200\n"
 "Last-Translator: Michal Čihař <michal@cihar.com>\n"
 "Language-Team: Mongolian <https://hosted.weblate.org/projects/phpmyadmin/"
@@ -56,7 +56,7 @@ msgid "Table comments:"
 msgstr "Хүснэгтийн тайлбар"
 
 #: db_datadict.php:104 libraries/Index.class.php:699
-#: libraries/insert_edit.lib.php:1567
+#: libraries/insert_edit.lib.php:1565
 #: libraries/navigation/Nodes/Node_Column.class.php:30
 #: libraries/plugins/export/ExportHtmlword.class.php:280
 #: libraries/plugins/export/ExportHtmlword.class.php:375
@@ -70,13 +70,14 @@ msgstr "Хүснэгтийн тайлбар"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1023
 #: libraries/tracking.lib.php:879 libraries/tracking.lib.php:975
 #: templates/columns_definitions/column_name.phtml:18
-#: templates/index_form.phtml:124 templates/table/table_header.phtml:6
-#: templates/table/zoom_result_form.phtml:33
-#: templates/tbl_relation/common_form.phtml:10
-#: templates/tbl_relation/common_form.phtml:43
-#: templates/tbl_relation/foreign_key_row.phtml:194
-#: templates/tbl_relation/foreign_key_row.phtml:206
-#: templates/tbl_relation/internal_relational_row.phtml:71
+#: templates/table/index_form.phtml:124
+#: templates/table/relation/common_form.phtml:10
+#: templates/table/relation/common_form.phtml:43
+#: templates/table/relation/foreign_key_row.phtml:194
+#: templates/table/relation/foreign_key_row.phtml:206
+#: templates/table/relation/internal_relational_row.phtml:71
+#: templates/table/search/table_header.phtml:6
+#: templates/table/search/zoom_result_form.phtml:33
 msgid "Column"
 msgstr "Багана"
 
@@ -94,21 +95,21 @@ msgstr "Багана"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1001
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1024
 #: libraries/rte/rte_list.lib.php:75 libraries/rte/rte_list.lib.php:103
-#: libraries/rte/rte_routines.lib.php:802
-#: libraries/rte/rte_routines.lib.php:831
-#: libraries/rte/rte_routines.lib.php:1493
+#: libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_routines.lib.php:922
+#: libraries/rte/rte_routines.lib.php:1584
 #: libraries/server_privileges.lib.php:2369 libraries/tracking.lib.php:880
 #: libraries/tracking.lib.php:972
 #: templates/columns_definitions/table_fields_definitions.phtml:11
-#: templates/structure/table_header.phtml:48
-#: templates/structure/table_structure_header.phtml:6
-#: templates/table/table_header.phtml:7
+#: templates/database/structure/table_header.phtml:48
+#: templates/table/search/table_header.phtml:7
+#: templates/table/structure/table_structure_header.phtml:6
 msgid "Type"
 msgstr "Төрөл"
 
 #: db_datadict.php:106 libraries/Index.class.php:702
 #: libraries/central_columns.lib.php:708
-#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1576
+#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1574
 #: libraries/plugins/export/ExportHtmlword.class.php:286
 #: libraries/plugins/export/ExportHtmlword.class.php:381
 #: libraries/plugins/export/ExportLatex.class.php:509
@@ -121,8 +122,8 @@ msgstr "Төрөл"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1026
 #: libraries/tracking.lib.php:882 libraries/tracking.lib.php:978
 #: templates/columns_definitions/table_fields_definitions.phtml:39
-#: templates/structure/table_structure_header.phtml:9
-#: templates/table/zoom_result_form.phtml:34
+#: templates/table/search/zoom_result_form.phtml:34
+#: templates/table/structure/table_structure_header.phtml:9
 msgid "Null"
 msgstr "Хоосон"
 
@@ -140,8 +141,8 @@ msgstr "Хоосон"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1027
 #: libraries/replication_gui.lib.php:153 libraries/tracking.lib.php:883
 #: templates/columns_definitions/table_fields_definitions.phtml:25
-#: templates/structure/body_for_table_summary.phtml:55
-#: templates/structure/table_structure_header.phtml:10
+#: templates/database/structure/body_for_table_summary.phtml:55
+#: templates/table/structure/table_structure_header.phtml:10
 msgid "Default"
 msgstr "Анхдагч"
 
@@ -169,19 +170,19 @@ msgid "Comments"
 msgstr "Тайлбар"
 
 #: db_datadict.php:146
-#: libraries/controllers/StructureController.class.php:1960
-#: libraries/controllers/StructureController.class.php:1965
+#: libraries/controllers/TableStructureController.class.php:951
+#: libraries/controllers/TableStructureController.class.php:956
 #: libraries/tracking.lib.php:922
 #: templates/columns_definitions/column_indexes.phtml:6
-#: templates/structure/check_all_table_column.phtml:22
-#: templates/structure/display_structure.phtml:74
+#: templates/table/structure/check_all_table_column.phtml:22
+#: templates/table/structure/display_structure.phtml:74
 msgid "Primary"
 msgstr "Үндсэн"
 
 #: db_datadict.php:156 js/messages.php:317 libraries/Index.class.php:567
 #: libraries/Index.class.php:606 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261 libraries/mult_submits.lib.php:403
+#: libraries/config/FormDisplay.tpl.php:272 libraries/mult_submits.lib.php:403
 #: libraries/mult_submits.lib.php:417
 #: libraries/plugins/export/ExportHtmlword.class.php:630
 #: libraries/plugins/export/ExportLatex.class.php:589
@@ -197,20 +198,20 @@ msgstr "Үндсэн"
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1010 libraries/tracking.lib.php:1015
 #: prefs_manage.php:140 templates/prefs_autoload.phtml:15
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "No"
 msgstr "Үгүй"
 
 #: db_datadict.php:156 js/messages.php:443 libraries/Index.class.php:568
 #: libraries/Index.class.php:605 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261
-#: libraries/controllers/StructureController.class.php:1344
-#: libraries/controllers/StructureController.class.php:2223
-#: libraries/controllers/StructureController.class.php:2232
-#: libraries/controllers/StructureController.class.php:2237
-#: libraries/controllers/StructureController.class.php:2242
-#: libraries/controllers/StructureController.class.php:2247
+#: libraries/config/FormDisplay.tpl.php:272
+#: libraries/controllers/TableStructureController.class.php:539
+#: libraries/controllers/TableStructureController.class.php:1201
+#: libraries/controllers/TableStructureController.class.php:1210
+#: libraries/controllers/TableStructureController.class.php:1215
+#: libraries/controllers/TableStructureController.class.php:1220
+#: libraries/controllers/TableStructureController.class.php:1225
 #: libraries/mult_submits.inc.php:82 libraries/mult_submits.inc.php:178
 #: libraries/mult_submits.lib.php:339 libraries/mult_submits.lib.php:372
 #: libraries/mult_submits.lib.php:401 libraries/mult_submits.lib.php:415
@@ -219,8 +220,8 @@ msgstr "Үгүй"
 #: libraries/plugins/export/ExportOdt.class.php:756
 #: libraries/plugins/export/ExportTexytext.class.php:567
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1077
-#: libraries/server_databases.lib.php:464
-#: libraries/server_databases.lib.php:474
+#: libraries/server_databases.lib.php:475
+#: libraries/server_databases.lib.php:485
 #: libraries/server_privileges.lib.php:2546
 #: libraries/server_privileges.lib.php:2727
 #: libraries/server_privileges.lib.php:2748
@@ -230,7 +231,7 @@ msgstr "Үгүй"
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1008 libraries/tracking.lib.php:1013
 #: prefs_manage.php:138 templates/prefs_autoload.phtml:14
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "Yes"
 msgstr "Тийм"
 
@@ -240,7 +241,7 @@ msgstr "ӨС-ийн схем харах"
 
 #: db_export.php:37 db_tracking.php:90 export.php:382
 #: libraries/DBQbe.class.php:326
-#: libraries/controllers/StructureController.class.php:231
+#: libraries/controllers/DatabaseStructureController.class.php:170
 #: libraries/navigation/NavigationTree.class.php:897
 msgid "No tables found in database."
 msgstr "ӨС-д хүснэгт олдсонгүй."
@@ -251,14 +252,14 @@ msgstr "ӨС-д хүснэгт олдсонгүй."
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:26
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:120
-#: templates/structure/show_create.phtml:18
+#: templates/database/structure/show_create.phtml:18
 msgid "Tables"
 msgstr "Хүснэгт"
 
 #: db_export.php:52 libraries/Menu.class.php:317 libraries/Menu.class.php:425
-#: libraries/Util.class.php:3333 libraries/Util.class.php:3343
-#: libraries/Util.class.php:3349 libraries/Util.class.php:3629
-#: libraries/Util.class.php:4327 libraries/Util.class.php:4344
+#: libraries/Util.class.php:3339 libraries/Util.class.php:3349
+#: libraries/Util.class.php:3355 libraries/Util.class.php:3635
+#: libraries/Util.class.php:4333 libraries/Util.class.php:4350
 #: libraries/central_columns.lib.php:728 libraries/config.values.php:39
 #: libraries/config.values.php:47 libraries/config.values.php:109
 #: libraries/config.values.php:115 libraries/config/setup.forms.php:323
@@ -272,7 +273,7 @@ msgstr "Хүснэгт"
 #: libraries/navigation/Nodes/Node_Table.class.php:283
 #: libraries/server_privileges.lib.php:1141 libraries/tracking.lib.php:874
 #: templates/columns_definitions/table_fields_definitions.phtml:3
-#: templates/designer/table_list.phtml:28
+#: templates/database/designer/table_list.phtml:28
 msgid "Structure"
 msgstr "Бүтэц"
 
@@ -284,7 +285,7 @@ msgstr "Бүтэц"
 #: libraries/config/user_preferences.forms.php:292
 #: libraries/config/user_preferences.forms.php:297
 #: libraries/server_privileges.lib.php:1140
-#: templates/structure/display_table_stats.phtml:12
+#: templates/table/structure/display_table_stats.phtml:12
 msgid "Data"
 msgstr "Өгөгдөл"
 
@@ -369,10 +370,10 @@ msgstr "Хөөсөн хүснэгтүүд"
 #: libraries/server_privileges.lib.php:2908
 #: libraries/server_privileges.lib.php:3145
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4346
-#: templates/structure/table_header.phtml:21
-#: templates/tbl_relation/foreign_key_row.phtml:176
-#: templates/tbl_relation/internal_relational_row.phtml:63
+#: libraries/server_privileges.lib.php:4372
+#: templates/database/structure/table_header.phtml:21
+#: templates/table/relation/foreign_key_row.phtml:176
+#: templates/table/relation/internal_relational_row.phtml:63
 msgid "Table"
 msgstr "Хүснэгт"
 
@@ -389,7 +390,7 @@ msgid "Updated"
 msgstr "Шинэчлэгдсэн"
 
 #: db_tracking.php:130 js/messages.php:243 libraries/Menu.class.php:552
-#: libraries/Util.class.php:4314 libraries/config.values.php:104
+#: libraries/Util.class.php:4320 libraries/config.values.php:104
 #: libraries/rte/rte_events.lib.php:393 libraries/rte/rte_list.lib.php:101
 #: libraries/server_status_processes.lib.php:92 libraries/tracking.lib.php:279
 msgid "Status"
@@ -398,14 +399,15 @@ msgstr "Статус"
 #: db_tracking.php:131 db_tracking.php:290 libraries/Index.class.php:693
 #: libraries/central_columns.lib.php:687 libraries/rte/rte_list.lib.php:74
 #: libraries/rte/rte_list.lib.php:89 libraries/rte/rte_list.lib.php:102
-#: libraries/server_databases.lib.php:398
+#: libraries/server_databases.lib.php:409
 #: libraries/server_privileges.lib.php:2372
 #: libraries/server_privileges.lib.php:3166
 #: libraries/server_privileges.lib.php:3342
 #: libraries/server_user_groups.lib.php:82
 #: libraries/server_variables.lib.php:189 libraries/tracking.lib.php:280
-#: libraries/tracking.lib.php:793 templates/structure/table_header.phtml:30
-#: templates/structure/table_structure_header.phtml:23
+#: libraries/tracking.lib.php:793
+#: templates/database/structure/table_header.phtml:30
+#: templates/table/structure/table_structure_header.phtml:23
 msgid "Action"
 msgstr "Үйлдэл"
 
@@ -449,7 +451,7 @@ msgid "Untracked tables"
 msgstr "Хөөгөөгүй хүснэгтүүд"
 
 #: db_tracking.php:305 db_tracking.php:336
-#: templates/structure/optional_action_links.phtml:17
+#: templates/table/structure/optional_action_links.phtml:17
 msgid "Track table"
 msgstr "Хүснэгтийг хөөх"
 
@@ -499,7 +501,7 @@ msgid "Value for the column \"%s\""
 msgstr "\"%s\" баганын утга"
 
 #: gis_data_editor.php:146
-#: templates/gis_visualization/gis_visualization.phtml:37
+#: templates/table/gis_visualization/gis_visualization.phtml:37
 msgid "Use OpenStreetMaps as Base Layer"
 msgstr "OpenStreetMaps-г суурь давхрагаар хэрэглэх"
 
@@ -581,35 +583,35 @@ msgstr "Геометр нэмэх"
 #: libraries/display_change_password.lib.php:162
 #: libraries/display_export.lib.php:402 libraries/display_export.lib.php:408
 #: libraries/display_import.lib.php:392 libraries/index.lib.php:44
-#: libraries/insert_edit.lib.php:1546 libraries/insert_edit.lib.php:1583
+#: libraries/insert_edit.lib.php:1544 libraries/insert_edit.lib.php:1581
 #: libraries/normalization.lib.php:165 libraries/normalization.lib.php:821
 #: libraries/operations.lib.php:38 libraries/operations.lib.php:108
 #: libraries/operations.lib.php:263 libraries/operations.lib.php:306
 #: libraries/operations.lib.php:801 libraries/operations.lib.php:874
 #: libraries/operations.lib.php:923 libraries/operations.lib.php:1337
 #: libraries/operations.lib.php:1658
-#: libraries/plugins/auth/AuthenticationCookie.class.php:244
+#: libraries/plugins/auth/AuthenticationCookie.class.php:232
 #: libraries/replication_gui.lib.php:122 libraries/replication_gui.lib.php:161
 #: libraries/replication_gui.lib.php:324 libraries/replication_gui.lib.php:461
 #: libraries/replication_gui.lib.php:906 libraries/rte/rte_events.lib.php:509
-#: libraries/rte/rte_routines.lib.php:969
-#: libraries/rte/rte_routines.lib.php:1581
+#: libraries/rte/rte_routines.lib.php:1060
+#: libraries/rte/rte_routines.lib.php:1672
 #: libraries/rte/rte_triggers.lib.php:396 libraries/server_bin_log.lib.php:61
 #: libraries/server_privileges.lib.php:705
 #: libraries/server_privileges.lib.php:2106
 #: libraries/server_privileges.lib.php:2872
 #: libraries/server_privileges.lib.php:3553
-#: libraries/server_privileges.lib.php:4627
+#: libraries/server_privileges.lib.php:4653
 #: libraries/server_user_groups.lib.php:285
 #: libraries/sql_query_form.lib.php:369 libraries/sql_query_form.lib.php:429
 #: libraries/tracking.lib.php:533 libraries/tracking.lib.php:653
 #: prefs_manage.php:277 prefs_manage.php:355
 #: templates/columns_definitions/column_definitions_form.phtml:59
-#: templates/header_location.phtml:17 templates/index_form.phtml:238
+#: templates/database/create_table.phtml:21 templates/header_location.phtml:28
 #: templates/startAndNumberOfRowsPanel.phtml:14
-#: templates/structure/add_column.phtml:25
-#: templates/table/create_table.phtml:21
-#: templates/table/selection_form.phtml:75 view_create.php:275
+#: templates/table/index_form.phtml:238
+#: templates/table/search/selection_form.phtml:75
+#: templates/table/structure/add_column.phtml:25 view_create.php:275
 #: view_operations.php:106
 msgid "Go"
 msgstr "Яв"
@@ -703,7 +705,7 @@ msgstr ""
 msgid "Could not load import plugins, please check your installation!"
 msgstr "Оруулах нэмэлтүүд дуудагдсангүй, суулгацаа шалгана уу!"
 
-#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1466
+#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1460
 #, fuzzy, php-format
 #| msgid "Bookmark %s created"
 msgid "Bookmark %s has been created."
@@ -738,11 +740,11 @@ msgstr ""
 msgid "Back"
 msgstr "Өмнөх"
 
-#: index.php:148 libraries/Footer.class.php:70
+#: index.php:149 libraries/Footer.class.php:70
 msgid "phpMyAdmin Demo Server"
 msgstr ""
 
-#: index.php:152
+#: index.php:153
 #, php-format
 msgid ""
 "You are using the demo server. You can do anything here, but please do not "
@@ -750,50 +752,50 @@ msgid ""
 "at %s."
 msgstr ""
 
-#: index.php:162
+#: index.php:163
 #, fuzzy
 #| msgid "General relation features"
 msgid "General Settings"
 msgstr "Ерөнхий хамаатай онцлог"
 
-#: index.php:190 libraries/display_change_password.lib.php:50
+#: index.php:191 libraries/display_change_password.lib.php:50
 #: libraries/display_change_password.lib.php:53 user_password.php:247
 msgid "Change password"
 msgstr "Нууц үг солих"
 
-#: index.php:206
+#: index.php:207
 #, fuzzy
 #| msgid "MySQL connection collation"
 msgid "Server connection collation"
 msgstr "MySQL холболтын кодлол"
 
-#: index.php:228
+#: index.php:229
 msgid "Appearance Settings"
 msgstr ""
 
-#: index.php:258 prefs_manage.php:285
+#: index.php:259 prefs_manage.php:285
 #, fuzzy
 #| msgid "General relation features"
 msgid "More settings"
 msgstr "Ерөнхий хамаатай онцлог"
 
-#: index.php:279
+#: index.php:280
 #, fuzzy
 #| msgid "Database for user"
 msgid "Database server"
 msgstr "Хэрэглэгчийн өгөгдлийн сан"
 
-#: index.php:282 libraries/plugins/auth/AuthenticationCookie.class.php:181
+#: index.php:283 libraries/plugins/auth/AuthenticationCookie.class.php:169
 msgid "Server:"
 msgstr "Сервэр:"
 
-#: index.php:286
+#: index.php:287
 #, fuzzy
 #| msgid "Server"
 msgid "Server type:"
 msgstr "Сервэр"
 
-#: index.php:290 libraries/plugins/export/ExportLatex.class.php:212
+#: index.php:291 libraries/plugins/export/ExportLatex.class.php:212
 #: libraries/plugins/export/ExportSql.class.php:687
 #: libraries/plugins/export/ExportXml.class.php:189
 #, fuzzy
@@ -801,90 +803,90 @@ msgstr "Сервэр"
 msgid "Server version:"
 msgstr "Сервэрийн хувилбар"
 
-#: index.php:296
+#: index.php:297
 #, fuzzy
 #| msgid "Protocol version"
 msgid "Protocol version:"
 msgstr "Протоколын хувилбар"
 
-#: index.php:300
+#: index.php:301
 #, fuzzy
 #| msgid "User"
 msgid "User:"
 msgstr "Хэрэглэгч"
 
-#: index.php:305
+#: index.php:306
 #, fuzzy
 #| msgid "Rename database to"
 msgid "Server charset:"
 msgstr "Өгөгдлийн санг д.нэрлэх нь"
 
-#: index.php:320
+#: index.php:321
 msgid "Web server"
 msgstr ""
 
-#: index.php:331
+#: index.php:332
 #, fuzzy
 #| msgid "MySQL client version"
 msgid "Database client version:"
 msgstr "MySQL клиент хувилбар"
 
-#: index.php:335
+#: index.php:336
 #, fuzzy
 #| msgid "PHP Version"
 msgid "PHP extension:"
 msgstr "PHP хувилбар"
 
-#: index.php:349
+#: index.php:350
 #, fuzzy
 #| msgid "PHP Version"
 msgid "PHP version:"
 msgstr "PHP хувилбар"
 
-#: index.php:360
+#: index.php:361
 msgid "Show PHP information"
 msgstr "PHP -ийн мэдээлэл харах"
 
-#: index.php:383
+#: index.php:384
 #, fuzzy
 #| msgid "Version information"
 msgid "Version information:"
 msgstr "Хувилбарын мэдээлэл"
 
-#: index.php:392 libraries/Util.class.php:432 libraries/Util.class.php:495
-#: libraries/config/FormDisplay.tpl.php:151
+#: index.php:393 libraries/Util.class.php:432 libraries/Util.class.php:495
+#: libraries/config/FormDisplay.tpl.php:162
 #: libraries/display_export.lib.php:577 libraries/engines/pbxt.lib.php:162
 #: libraries/navigation/NavigationHeader.class.php:196
 #: libraries/server_variables.lib.php:160
 msgid "Documentation"
 msgstr "Баримт"
 
-#: index.php:399
+#: index.php:400
 msgid "Wiki"
 msgstr ""
 
-#: index.php:408
+#: index.php:409
 msgid "Official Homepage"
 msgstr "phpMyAdmin-ын албан ёсны вэб сайт"
 
-#: index.php:415
+#: index.php:416
 #, fuzzy
 #| msgid "Attributes"
 msgid "Contribute"
 msgstr "Атрибутууд"
 
-#: index.php:422
+#: index.php:423
 #, fuzzy
 msgid "Get support"
 msgstr "Гаргах"
 
-#: index.php:429
+#: index.php:430
 #, fuzzy
 #| msgid "No change"
 msgid "List of changes"
 msgstr "Солигдохгүй"
 
-#: index.php:451
+#: index.php:452
 #, fuzzy
 #| msgid ""
 #| "Your configuration file contains settings (root with no password) that "
@@ -901,7 +903,7 @@ msgstr ""
 "нууц үггүй) агуулжээ. Таны MySQL сервэр энэ анхдагчаар ажиллаж байгаа нь хэн "
 "ч урилгагүй орох боломжийг өгнө. Та хамгаалалтын асуудлаа засах хэрэгтэй."
 
-#: index.php:468
+#: index.php:469
 msgid ""
 "You have enabled mbstring.func_overload in your PHP configuration. This "
 "option is incompatible with phpMyAdmin and might cause some data to be "
@@ -910,7 +912,7 @@ msgstr ""
 "Таны PHP тохируулгад mbstring.func_overload нээлттэй байна. Энэ сонголт "
 "phpMyAdmin -д бүрэн боломжгүй бөгөөд зарим өгөгдөл алдагдаж болзошгүй!"
 
-#: index.php:483
+#: index.php:484
 msgid ""
 "The mbstring PHP extension was not found and you seem to be using a "
 "multibyte charset. Without the mbstring extension phpMyAdmin is unable to "
@@ -920,7 +922,7 @@ msgstr ""
 "mbstring extension үгүйгээр phpMyAdmin нь тэмдэгт мөрийг зөв хувааж чадахгүй "
 "буюу буруу үр дүн гарч магадгүй."
 
-#: index.php:500
+#: index.php:501
 msgid ""
 "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini."
 "session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower than "
@@ -928,17 +930,17 @@ msgid ""
 "expire sooner than configured in phpMyAdmin."
 msgstr ""
 
-#: index.php:519
+#: index.php:520
 msgid ""
 "Login cookie store is lower than cookie validity configured in phpMyAdmin, "
 "because of this, your login will expire sooner than configured in phpMyAdmin."
 msgstr ""
 
-#: index.php:535
+#: index.php:536
 msgid "The configuration file now needs a secret passphrase (blowfish_secret)."
 msgstr "Тохиргооны файл одоо нууцлал шаардаж байна (blowfish_secret)."
 
-#: index.php:548
+#: index.php:549
 msgid ""
 "Directory [code]config[/code], which is used by the setup script, still "
 "exists in your phpMyAdmin directory. It is strongly recommended to remove it "
@@ -946,7 +948,7 @@ msgid ""
 "may be compromised by unauthorized people downloading your configuration."
 msgstr ""
 
-#: index.php:564
+#: index.php:565
 #, fuzzy, php-format
 #| msgid ""
 #| "ditional features for working with linked tables have been ctivated. To d "
@@ -958,19 +960,19 @@ msgstr ""
 "Холбогдсон хүснэгтүүдтэй ажиллах нэмэлт онцлогууд идэвхгүй болжээ. %sЭнд%s "
 "дарж шалгах."
 
-#: index.php:571
+#: index.php:572
 msgid ""
 "Or alternately go to 'Operations' tab of any database to set it up there."
 msgstr ""
 
-#: index.php:620
+#: index.php:621
 #, php-format
 msgid ""
 "Your PHP MySQL library version %s differs from your MySQL server version %s. "
 "This may cause unpredictable behavior."
 msgstr ""
 
-#: index.php:648
+#: index.php:649
 #, php-format
 msgid ""
 "Server running with Suhosin. Please refer to %sdocumentation%s for possible "
@@ -1142,8 +1144,8 @@ msgstr ""
 msgid "Save & Close"
 msgstr "Илгээх"
 
-#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:404
-#: libraries/insert_edit.lib.php:1550 prefs_manage.php:361
+#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:415
+#: libraries/insert_edit.lib.php:1548 prefs_manage.php:361
 #: prefs_manage.php:372
 msgid "Reset"
 msgstr "Да.эхлэх"
@@ -1188,7 +1190,7 @@ msgstr "Шинэ талбар нэмэх"
 msgid "Edit Index"
 msgstr "Дараагийн мөрийг засах"
 
-#: js/messages.php:99 templates/index_form.phtml:232
+#: js/messages.php:99 templates/table/index_form.phtml:232
 #, fuzzy, php-format
 #| msgid "Add %s field(s)"
 msgid "Add %s column(s) to index"
@@ -1218,15 +1220,16 @@ msgstr "Талбарыг хаасан"
 msgid "Please select column(s) for the index."
 msgstr "%s талбар(ууд) нэмэх"
 
-#: js/messages.php:106 templates/structure/add_column.phtml:1
+#: js/messages.php:106 templates/table/structure/add_column.phtml:1
 #, fuzzy
 #| msgid "You have to add at least one field."
 msgid "You have to add at least one column."
 msgstr "Та багадаа нэг талбар нэм."
 
-#: js/messages.php:109 libraries/insert_edit.lib.php:1548
+#: js/messages.php:109 libraries/insert_edit.lib.php:1546
 #: templates/columns_definitions/column_definitions_form.phtml:162
-#: templates/index_form.phtml:237 templates/tbl_relation/common_form.phtml:106
+#: templates/table/index_form.phtml:237
+#: templates/table/relation/common_form.phtml:106
 msgid "Preview SQL"
 msgstr ""
 
@@ -1249,7 +1252,7 @@ msgid "SQL query:"
 msgstr "SQL-асуулт"
 
 #. l10n: Default label for the y-Axis of Charts
-#: js/messages.php:118 templates/tbl_chart.phtml:109
+#: js/messages.php:118 templates/table/chart/tbl_chart.phtml:109
 #, fuzzy
 #| msgid "Value"
 msgid "Y Values"
@@ -1430,7 +1433,7 @@ msgstr ""
 msgid "Bytes received"
 msgstr "Ирсэн"
 
-#: js/messages.php:169 libraries/server_status.lib.php:226
+#: js/messages.php:169 libraries/server_status.lib.php:235
 msgid "Connections"
 msgstr "Холболт"
 
@@ -1490,12 +1493,12 @@ msgstr "%s хүснэгт(үүд)"
 msgid "Questions"
 msgstr "Хамаарал"
 
-#: js/messages.php:184 libraries/server_status.lib.php:134
+#: js/messages.php:184 libraries/server_status.lib.php:143
 msgid "Traffic"
 msgstr "Гуйвуулга"
 
 #: js/messages.php:185 libraries/Menu.class.php:586
-#: libraries/Util.class.php:4318 libraries/server_status_monitor.lib.php:257
+#: libraries/Util.class.php:4324 libraries/server_status_monitor.lib.php:257
 #, fuzzy
 #| msgid "General relation features"
 msgid "Settings"
@@ -1517,8 +1520,9 @@ msgstr ""
 #: libraries/server_status_monitor.lib.php:236
 #: libraries/server_status_processes.lib.php:308
 #: templates/columns_definitions/transformation.phtml:4
-#: templates/designer/options_panel.phtml:178
-#: templates/table/options_zoom.phtml:12 templates/table/rows_zoom.phtml:26
+#: templates/database/designer/options_panel.phtml:178
+#: templates/table/search/options_zoom.phtml:12
+#: templates/table/search/rows_zoom.phtml:26
 msgid "None"
 msgstr "Байхгүй"
 
@@ -1823,8 +1827,8 @@ msgstr ""
 
 #: js/messages.php:270 libraries/Menu.class.php:352
 #: libraries/Menu.class.php:455 libraries/Menu.class.php:582
-#: libraries/Util.class.php:4317 libraries/Util.class.php:4332
-#: libraries/Util.class.php:4349 libraries/config/messages.inc.php:258
+#: libraries/Util.class.php:4323 libraries/Util.class.php:4338
+#: libraries/Util.class.php:4355 libraries/config/messages.inc.php:258
 #: libraries/display_import.lib.php:105
 #: libraries/server_status_monitor.lib.php:318 prefs_manage.php:238
 #: setup/frames/menu.inc.php:26
@@ -1894,13 +1898,13 @@ msgid "Formatting SQL..."
 msgstr ""
 
 #: js/messages.php:293 libraries/server_variables.lib.php:157
-#: templates/designer/aggregate_query_panel.phtml:63
-#: templates/designer/delete_relation_panel.phtml:28
-#: templates/designer/having_query_panel.phtml:117
-#: templates/designer/new_relation_panel.phtml:88
-#: templates/designer/options_panel.phtml:253
-#: templates/designer/rename_to_panel.phtml:45
-#: templates/designer/where_query_panel.phtml:83
+#: templates/database/designer/aggregate_query_panel.phtml:63
+#: templates/database/designer/delete_relation_panel.phtml:28
+#: templates/database/designer/having_query_panel.phtml:117
+#: templates/database/designer/new_relation_panel.phtml:88
+#: templates/database/designer/options_panel.phtml:253
+#: templates/database/designer/rename_to_panel.phtml:45
+#: templates/database/designer/where_query_panel.phtml:83
 msgid "Cancel"
 msgstr "Болих"
 
@@ -1910,7 +1914,7 @@ msgstr "Болих"
 msgid "Page-related settings"
 msgstr "Ерөнхий хамаатай онцлог"
 
-#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:402
+#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:413
 msgid "Apply"
 msgstr ""
 
@@ -1949,8 +1953,8 @@ msgstr ""
 msgid "Error text: %s"
 msgstr ""
 
-#: js/messages.php:307 libraries/db_common.inc.php:68
-#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:450
+#: js/messages.php:307 libraries/db_common.inc.php:69
+#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:461
 msgid "No databases selected."
 msgstr "ӨС сонгогдоогүй."
 
@@ -1962,12 +1966,13 @@ msgstr ""
 msgid "Adding Primary Key"
 msgstr ""
 
-#: js/messages.php:310 templates/designer/aggregate_query_panel.phtml:59
-#: templates/designer/having_query_panel.phtml:113
-#: templates/designer/new_relation_panel.phtml:87
-#: templates/designer/options_panel.phtml:252
-#: templates/designer/rename_to_panel.phtml:41
-#: templates/designer/where_query_panel.phtml:82
+#: js/messages.php:310
+#: templates/database/designer/aggregate_query_panel.phtml:59
+#: templates/database/designer/having_query_panel.phtml:113
+#: templates/database/designer/new_relation_panel.phtml:87
+#: templates/database/designer/options_panel.phtml:252
+#: templates/database/designer/rename_to_panel.phtml:41
+#: templates/database/designer/where_query_panel.phtml:82
 msgid "OK"
 msgstr "Бэлэн"
 
@@ -1993,7 +1998,7 @@ msgstr "Өгөгдлийн сан хуулах нь"
 msgid "Changing Charset"
 msgstr "Кодлол"
 
-#: js/messages.php:320 libraries/Util.class.php:3217
+#: js/messages.php:320 libraries/Util.class.php:3223
 #, fuzzy
 #| msgid "Disable foreign key checks"
 msgid "Enable foreign key checks"
@@ -2040,20 +2045,21 @@ msgstr ""
 #: js/messages.php:334 libraries/DisplayResults.class.php:4834
 #: libraries/DisplayResults.class.php:5092 libraries/Menu.class.php:344
 #: libraries/Menu.class.php:446 libraries/Menu.class.php:578
-#: libraries/Util.class.php:3636 libraries/Util.class.php:3637
-#: libraries/Util.class.php:4316 libraries/Util.class.php:4331
-#: libraries/Util.class.php:4348 libraries/config/messages.inc.php:252
+#: libraries/Util.class.php:3642 libraries/Util.class.php:3643
+#: libraries/Util.class.php:4322 libraries/Util.class.php:4337
+#: libraries/Util.class.php:4354 libraries/config/messages.inc.php:252
 #: libraries/display_export.lib.php:173 libraries/rte/rte_list.lib.php:146
 #: libraries/server_privileges.lib.php:2211
 #: libraries/server_privileges.lib.php:2290
 #: libraries/server_privileges.lib.php:2632
 #: libraries/server_privileges.lib.php:3356
 #: libraries/server_status_monitor.lib.php:322 prefs_manage.php:303
-#: setup/frames/menu.inc.php:27 templates/structure/check_all_tables.phtml:11
+#: setup/frames/menu.inc.php:27
+#: templates/database/structure/check_all_tables.phtml:11
 msgid "Export"
 msgstr "Гаргах"
 
-#: js/messages.php:337 libraries/rte/rte_routines.lib.php:652
+#: js/messages.php:337 libraries/rte/rte_routines.lib.php:743
 msgid "ENUM/SET editor"
 msgstr ""
 
@@ -2098,7 +2104,7 @@ msgstr "SQL асуудал харуулах"
 #: libraries/Console.class.php:214 libraries/DisplayResults.class.php:3474
 #: libraries/DisplayResults.class.php:4818 libraries/Index.class.php:723
 #: libraries/Util.class.php:706 libraries/Util.class.php:1202
-#: libraries/Util.class.php:3634 libraries/Util.class.php:3635
+#: libraries/Util.class.php:3640 libraries/Util.class.php:3641
 #: libraries/central_columns.lib.php:851
 #: libraries/central_columns.lib.php:1193
 #: libraries/config/messages.inc.php:892
@@ -2116,7 +2122,7 @@ msgstr "Засах"
 #: libraries/server_user_groups.lib.php:129
 #: libraries/sql_query_form.lib.php:416 libraries/tracking.lib.php:477
 #: setup/frames/index.inc.php:183 setup/frames/index.inc.php:291
-#: templates/designer/delete_relation_panel.phtml:27
+#: templates/database/designer/delete_relation_panel.phtml:27
 msgid "Delete"
 msgstr "Устгах"
 
@@ -2298,11 +2304,11 @@ msgid "No dependencies selected!"
 msgstr "ӨС сонгогдоогүй."
 
 #: js/messages.php:394 libraries/central_columns.lib.php:1214
-#: libraries/insert_edit.lib.php:1458 libraries/server_variables.lib.php:155
+#: libraries/insert_edit.lib.php:1456 libraries/server_variables.lib.php:155
 #: setup/frames/config.inc.php:42 setup/frames/index.inc.php:279
 #: templates/columns_definitions/column_definitions_form.phtml:165
-#: templates/gis_visualization/gis_visualization.phtml:48
-#: templates/tbl_relation/common_form.phtml:107
+#: templates/table/gis_visualization/gis_visualization.phtml:48
+#: templates/table/relation/common_form.phtml:107
 msgid "Save"
 msgstr "Хадгалах"
 
@@ -2397,8 +2403,8 @@ msgid "Data point content"
 msgstr "Өгөгдөл заагчийн хэмжээ"
 
 #: js/messages.php:430 js/messages.php:562 js/messages.php:579
-#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2573
-#: templates/index_form.phtml:154 templates/index_form.phtml:194
+#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2571
+#: templates/table/index_form.phtml:154 templates/table/index_form.phtml:194
 msgid "Ignore"
 msgstr "Үл тоох"
 
@@ -2459,8 +2465,8 @@ msgstr "Гадаад түлхүүр сонгох"
 msgid "Please select the primary key or a unique key!"
 msgstr "Үндсэн түлхүүр эсвэл орь ганц түлхүүр сонгон уу"
 
-#: js/messages.php:457 templates/designer/side_menu.phtml:91
-#: templates/designer/side_menu.phtml:94
+#: js/messages.php:457 templates/database/designer/side_menu.phtml:91
+#: templates/database/designer/side_menu.phtml:94
 #, fuzzy
 #| msgid "Choose field to display"
 msgid "Choose column to display"
@@ -2478,22 +2484,22 @@ msgstr ""
 msgid "Page name"
 msgstr "Хуудасны дугаар:"
 
-#: js/messages.php:463 templates/designer/side_menu.phtml:56
-#: templates/designer/side_menu.phtml:59
+#: js/messages.php:463 templates/database/designer/side_menu.phtml:56
+#: templates/database/designer/side_menu.phtml:59
 #, fuzzy
 #| msgid "Select All"
 msgid "Save page"
 msgstr "Бүгдийг сонгох"
 
-#: js/messages.php:464 templates/designer/side_menu.phtml:63
-#: templates/designer/side_menu.phtml:66
+#: js/messages.php:464 templates/database/designer/side_menu.phtml:63
+#: templates/database/designer/side_menu.phtml:66
 #, fuzzy
 #| msgid "Select All"
 msgid "Save page as"
 msgstr "Бүгдийг сонгох"
 
-#: js/messages.php:465 templates/designer/side_menu.phtml:49
-#: templates/designer/side_menu.phtml:52
+#: js/messages.php:465 templates/database/designer/side_menu.phtml:49
+#: templates/database/designer/side_menu.phtml:52
 #, fuzzy
 #| msgid "Free pages"
 msgid "Open page"
@@ -2505,7 +2511,7 @@ msgstr "Чөлөөт хуудсууд"
 msgid "Delete page"
 msgstr "Бүгдийг сонгох"
 
-#: js/messages.php:467 templates/designer/side_menu.phtml:10
+#: js/messages.php:467 templates/database/designer/side_menu.phtml:10
 msgid "Untitled"
 msgstr ""
 
@@ -2629,7 +2635,7 @@ msgstr "Жинхэнэ байрлал"
 msgid "cancel"
 msgstr "Болих"
 
-#: js/messages.php:499 libraries/server_status.lib.php:271
+#: js/messages.php:499 libraries/server_status.lib.php:280
 msgid "Aborted"
 msgstr "Таслагдсан"
 
@@ -3317,7 +3323,7 @@ msgstr "%d нь мөрийн буруу дугаар байна."
 
 #: js/messages.php:793 libraries/Message.class.php:199
 #: libraries/Util.class.php:654 libraries/core.lib.php:245
-#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1172
+#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1170
 #: tbl_operations.php:229 view_operations.php:63
 msgid "Error"
 msgstr "Алдаа"
@@ -3377,8 +3383,8 @@ msgstr "секундэд"
 msgid "per minute"
 msgstr "минутад"
 
-#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:143
-#: libraries/server_status.lib.php:228
+#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:152
+#: libraries/server_status.lib.php:237
 #: libraries/server_status_queries.lib.php:98
 msgid "per hour"
 msgstr "цагт"
@@ -3396,7 +3402,7 @@ msgstr ""
 msgid "Wrong permissions on configuration file, should not be world writable!"
 msgstr ""
 
-#: libraries/Config.class.php:1799
+#: libraries/Config.class.php:1801
 msgid "Font size"
 msgstr "Үсгийн хэмжээ"
 
@@ -3426,10 +3432,10 @@ msgstr "асуултад"
 #: libraries/server_privileges.lib.php:2890
 #: libraries/server_privileges.lib.php:3144
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4332
+#: libraries/server_privileges.lib.php:4358
 #: libraries/server_status_processes.lib.php:80
-#: templates/tbl_relation/foreign_key_row.phtml:165
-#: templates/tbl_relation/internal_relational_row.phtml:55
+#: templates/table/relation/foreign_key_row.phtml:165
+#: templates/table/relation/internal_relational_row.phtml:55
 msgid "Database"
 msgstr "ӨС"
 
@@ -3536,11 +3542,11 @@ msgstr "SQL түүх"
 #: libraries/plugins/import/ImportMediawiki.class.php:60
 #: libraries/plugins/import/ImportOds.class.php:59
 #: libraries/plugins/import/ImportShp.class.php:57
-#: libraries/plugins/import/ImportSql.class.php:148
+#: libraries/plugins/import/ImportSql.class.php:51
 #: libraries/plugins/import/ImportXml.class.php:58
-#: libraries/rte/rte_routines.lib.php:833 templates/index_form.phtml:49
-#: templates/structure/row_stats_table.phtml:20
-#: templates/table/options.phtml:2
+#: libraries/rte/rte_routines.lib.php:924 templates/table/index_form.phtml:49
+#: templates/table/search/options.phtml:2
+#: templates/table/structure/row_stats_table.phtml:20
 msgid "Options"
 msgstr "Сонголтууд"
 
@@ -3583,7 +3589,8 @@ msgstr "Буурахаар"
 msgid "Order:"
 msgstr ""
 
-#: libraries/Console.class.php:289 templates/table/replace_preview.phtml:17
+#: libraries/Console.class.php:289
+#: templates/table/search/replace_preview.phtml:17
 #, fuzzy
 #| msgid "Column names"
 msgid "Count"
@@ -3708,9 +3715,9 @@ msgstr "Хуулагдсан хүснэгт рүү шилжих"
 #: libraries/operations.lib.php:794 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:191
-#: templates/structure/sortable_header.phtml:21
-#: templates/structure/sortable_header.phtml:38
-#: templates/table/options.phtml:68
+#: templates/database/structure/sortable_header.phtml:21
+#: templates/database/structure/sortable_header.phtml:38
+#: templates/table/search/options.phtml:68
 msgid "Ascending"
 msgstr "Өсөхөөр"
 
@@ -3720,13 +3727,14 @@ msgstr "Өсөхөөр"
 #: libraries/operations.lib.php:797 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:188
-#: templates/structure/sortable_header.phtml:26
-#: templates/structure/sortable_header.phtml:43
-#: templates/table/options.phtml:69
+#: templates/database/structure/sortable_header.phtml:26
+#: templates/database/structure/sortable_header.phtml:43
+#: templates/table/search/options.phtml:69
 msgid "Descending"
 msgstr "Буурахаар"
 
-#: libraries/DBQbe.class.php:467 templates/table/search_and_replace.phtml:6
+#: libraries/DBQbe.class.php:467
+#: templates/table/search/search_and_replace.phtml:6
 #, fuzzy
 #| msgid "Column names"
 msgid "Column:"
@@ -3915,12 +3923,12 @@ msgstr[0] "%s олдоц(ууд) хүснэгт <i>%s</i>-д"
 msgstr[1] "%s олдоц(ууд) хүснэгт <i>%s</i>-д"
 
 #: libraries/DbSearch.class.php:354 libraries/Menu.class.php:311
-#: libraries/Util.class.php:3337 libraries/Util.class.php:3347
-#: libraries/Util.class.php:3623 libraries/Util.class.php:3624
-#: libraries/Util.class.php:4343 libraries/config.values.php:43
+#: libraries/Util.class.php:3343 libraries/Util.class.php:3353
+#: libraries/Util.class.php:3629 libraries/Util.class.php:3630
+#: libraries/Util.class.php:4349 libraries/config.values.php:43
 #: libraries/config.values.php:51 libraries/config.values.php:119
 #: libraries/navigation/Nodes/Node_Table.class.php:295
-#: templates/structure/check_all_table_column.phtml:5
+#: templates/table/structure/check_all_table_column.phtml:5
 msgid "Browse"
 msgstr "Хөтлөх"
 
@@ -3940,7 +3948,8 @@ msgstr "Өгөгдлийн санд хайх"
 msgid "Words or values to search for (wildcard: \"%\"):"
 msgstr "Үг(үүд) ба утга(ууд) -ыг хайх (түлхүүр \"%\"):"
 
-#: libraries/DbSearch.class.php:401 templates/table/search_and_replace.phtml:1
+#: libraries/DbSearch.class.php:401
+#: templates/table/search/search_and_replace.phtml:1
 msgid "Find:"
 msgstr "Хайх:"
 
@@ -3994,16 +4003,16 @@ msgstr "Файлууд"
 msgid "Search this table"
 msgstr "Өгөгдлийн санд хайх"
 
-#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2532
-#: libraries/Util.class.php:2535
+#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2538
+#: libraries/Util.class.php:2541
 #, fuzzy
 #| msgid "Begin"
 msgctxt "First page"
 msgid "Begin"
 msgstr "Эхлэл"
 
-#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2533
-#: libraries/Util.class.php:2536 libraries/server_bin_log.lib.php:170
+#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2539
+#: libraries/Util.class.php:2542 libraries/server_bin_log.lib.php:170
 #: libraries/server_bin_log.lib.php:172
 #, fuzzy
 #| msgid "Previous"
@@ -4011,8 +4020,8 @@ msgctxt "Previous page"
 msgid "Previous"
 msgstr "Өмнөх"
 
-#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2564
-#: libraries/Util.class.php:2574 libraries/server_bin_log.lib.php:204
+#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2570
+#: libraries/Util.class.php:2580 libraries/server_bin_log.lib.php:204
 #: libraries/server_bin_log.lib.php:206
 #, fuzzy
 #| msgid "Next"
@@ -4020,8 +4029,8 @@ msgctxt "Next page"
 msgid "Next"
 msgstr "Цааш"
 
-#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2565
-#: libraries/Util.class.php:2575
+#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2571
+#: libraries/Util.class.php:2581
 #, fuzzy
 #| msgid "End"
 msgctxt "Last page"
@@ -4108,9 +4117,9 @@ msgid "May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]."
 msgstr ""
 
 #: libraries/DisplayResults.class.php:4332 libraries/Message.class.php:180
-#: libraries/controllers/TableRelationController.class.php:258
+#: libraries/controllers/TableRelationController.class.php:259
 #: libraries/controllers/TableSearchController.class.php:655
-#: libraries/rte/rte_routines.lib.php:1332 libraries/sql_query_form.lib.php:89
+#: libraries/rte/rte_routines.lib.php:1423 libraries/sql_query_form.lib.php:89
 #: tbl_operations.php:227 tbl_row_action.php:138 view_operations.php:62
 #, fuzzy
 #| msgid "Your SQL query has been executed successfully."
@@ -4118,7 +4127,7 @@ msgid "Your SQL query has been executed successfully."
 msgstr "Таны SQL-асуулт амжилттай ажиллав"
 
 #: libraries/DisplayResults.class.php:4660
-#: libraries/controllers/StructureController.class.php:629
+#: libraries/controllers/DatabaseStructureController.class.php:564
 #, php-format
 msgid ""
 "This view has at least this number of rows. Please refer to %sdocumentation"
@@ -4142,34 +4151,34 @@ msgstr ""
 msgid "%d total"
 msgstr "Нийт"
 
-#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1318
+#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1312
 #, fuzzy, php-format
 #| msgid "Query took %01.4f sec"
 msgid "Query took %01.4f seconds."
 msgstr "Асуулт нь %01.4f сек авлаа"
 
 #: libraries/DisplayResults.class.php:4807
-#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4767
-#: libraries/Util.class.php:4773 libraries/mult_submits.inc.php:50
-#: templates/structure/check_all_tables.phtml:2
-#: templates/structure/check_all_tables.phtml:9
+#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4773
+#: libraries/Util.class.php:4779 libraries/mult_submits.inc.php:50
+#: templates/database/structure/check_all_tables.phtml:2
+#: templates/database/structure/check_all_tables.phtml:9
 msgid "With selected:"
 msgstr "Сонгогдсонтой:"
 
 #: libraries/DisplayResults.class.php:4811
-#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4769
-#: libraries/Util.class.php:4770 libraries/server_privileges.lib.php:1174
+#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4775
+#: libraries/Util.class.php:4776 libraries/server_privileges.lib.php:1174
 #: libraries/server_privileges.lib.php:1175
 #: libraries/server_privileges.lib.php:1387
 #: libraries/server_user_groups.lib.php:231
-#: templates/structure/check_all_tables.phtml:3
-#: templates/structure/check_all_tables.phtml:4
+#: templates/database/structure/check_all_tables.phtml:3
+#: templates/database/structure/check_all_tables.phtml:4
 msgid "Check All"
 msgstr "Бүгдийг чагтлах"
 
 #: libraries/DisplayResults.class.php:4985 libraries/Header.class.php:383
-#: templates/structure/optional_action_links.phtml:1
-#: templates/structure/print_view_data_dictionary_link.phtml:3
+#: templates/database/structure/print_view_data_dictionary_link.phtml:3
+#: templates/table/structure/optional_action_links.phtml:1
 msgid "Print view"
 msgstr "Хэвлэхээр харах"
 
@@ -4177,7 +4186,8 @@ msgstr "Хэвлэхээр харах"
 msgid "Query results operations"
 msgstr "Асуудлын үр дүнгийн үйлдэл"
 
-#: libraries/DisplayResults.class.php:5105 templates/tbl_chart.phtml:12
+#: libraries/DisplayResults.class.php:5105
+#: templates/table/chart/tbl_chart.phtml:12
 #, fuzzy
 #| msgid "Display PDF schema"
 msgid "Display chart"
@@ -4276,7 +4286,7 @@ msgid "Click on the bar to scroll to top of page"
 msgstr ""
 
 #: libraries/Header.class.php:749
-#: libraries/plugins/auth/AuthenticationCookie.class.php:152
+#: libraries/plugins/auth/AuthenticationCookie.class.php:140
 #, fuzzy
 #| msgid "Cookies must be enabled past this point."
 msgid "Javascript must be enabled past this point!"
@@ -4300,11 +4310,11 @@ msgid "Keyname"
 msgstr "Түлхүүрийн нэр"
 
 #: libraries/Index.class.php:697
-#: libraries/controllers/StructureController.class.php:1962
-#: libraries/controllers/StructureController.class.php:1967
+#: libraries/controllers/TableStructureController.class.php:953
+#: libraries/controllers/TableStructureController.class.php:958
 #: libraries/tracking.lib.php:973
 #: templates/columns_definitions/column_indexes.phtml:11
-#: templates/structure/check_all_table_column.phtml:26
+#: templates/table/structure/check_all_table_column.phtml:26
 msgid "Unique"
 msgstr "Үл давтагдах"
 
@@ -4323,16 +4333,17 @@ msgstr "Ерөнхий"
 #: libraries/server_collations.lib.php:35 libraries/tracking.lib.php:881
 #: libraries/tracking.lib.php:977
 #: templates/columns_definitions/table_fields_definitions.phtml:33
-#: templates/structure/row_stats_table.phtml:31
-#: templates/structure/table_header.phtml:55
-#: templates/structure/table_structure_header.phtml:7
-#: templates/table/table_header.phtml:8
+#: templates/database/structure/table_header.phtml:55
+#: templates/table/search/table_header.phtml:8
+#: templates/table/structure/row_stats_table.phtml:31
+#: templates/table/structure/table_structure_header.phtml:7
 msgid "Collation"
 msgstr "Жишилт"
 
 #: libraries/Index.class.php:703 libraries/rte/rte_events.lib.php:496
-#: libraries/rte/rte_routines.lib.php:956 libraries/tracking.lib.php:885
-#: libraries/tracking.lib.php:979 templates/structure/table_header.phtml:84
+#: libraries/rte/rte_routines.lib.php:1047 libraries/tracking.lib.php:885
+#: libraries/tracking.lib.php:979
+#: templates/database/structure/table_header.phtml:84
 msgid "Comment"
 msgstr ""
 
@@ -4345,15 +4356,15 @@ msgstr "Үндсэн түлхүүр устгагдлаа."
 msgid "Index %s has been dropped."
 msgstr "Индекс %s нь устгагдсан."
 
-#: libraries/Index.class.php:757 libraries/Util.class.php:3630
-#: libraries/Util.class.php:3631
-#: libraries/controllers/StructureController.class.php:1958
-#: libraries/controllers/StructureController.class.php:1959
+#: libraries/Index.class.php:757 libraries/Util.class.php:3636
+#: libraries/Util.class.php:3637
+#: libraries/controllers/TableStructureController.class.php:949
+#: libraries/controllers/TableStructureController.class.php:950
 #: libraries/operations.lib.php:1607 libraries/rte/rte_list.lib.php:150
 #: libraries/server_databases.lib.php:146
-#: templates/structure/check_all_table_column.phtml:15
-#: templates/structure/check_all_tables.phtml:16
-#: templates/tbl_relation/foreign_key_row.phtml:93
+#: templates/database/structure/check_all_tables.phtml:16
+#: templates/table/relation/foreign_key_row.phtml:93
+#: templates/table/structure/check_all_table_column.phtml:15
 msgid "Drop"
 msgstr "Устгах"
 
@@ -4382,16 +4393,16 @@ msgstr "Сервэр"
 #: libraries/Menu.class.php:248
 #: libraries/navigation/Nodes/Node_View.class.php:32
 #: libraries/tbl_info.inc.php:63
-#: templates/structure/structure_table_row.phtml:97
-#: templates/structure/structure_table_row.phtml:159
+#: templates/database/structure/structure_table_row.phtml:97
+#: templates/database/structure/structure_table_row.phtml:159
 msgid "View"
 msgstr "Харц"
 
 #: libraries/Menu.class.php:325 libraries/Menu.class.php:429
-#: libraries/Menu.class.php:548 libraries/Util.class.php:3334
-#: libraries/Util.class.php:3344 libraries/Util.class.php:3350
-#: libraries/Util.class.php:4313 libraries/Util.class.php:4328
-#: libraries/Util.class.php:4345 libraries/config.values.php:40
+#: libraries/Menu.class.php:548 libraries/Util.class.php:3340
+#: libraries/Util.class.php:3350 libraries/Util.class.php:3356
+#: libraries/Util.class.php:4319 libraries/Util.class.php:4334
+#: libraries/Util.class.php:4351 libraries/config.values.php:40
 #: libraries/config.values.php:48 libraries/config.values.php:110
 #: libraries/config.values.php:116 libraries/config/messages.inc.php:321
 #: libraries/navigation/Nodes/Node_Table.class.php:292
@@ -4399,19 +4410,19 @@ msgid "SQL"
 msgstr "SQL"
 
 #: libraries/Menu.class.php:328 libraries/Menu.class.php:432
-#: libraries/Util.class.php:3335 libraries/Util.class.php:3345
-#: libraries/Util.class.php:3351 libraries/Util.class.php:3625
-#: libraries/Util.class.php:3626 libraries/Util.class.php:4329
-#: libraries/Util.class.php:4346 libraries/config.values.php:41
+#: libraries/Util.class.php:3341 libraries/Util.class.php:3351
+#: libraries/Util.class.php:3357 libraries/Util.class.php:3631
+#: libraries/Util.class.php:3632 libraries/Util.class.php:4335
+#: libraries/Util.class.php:4352 libraries/config.values.php:41
 #: libraries/config.values.php:49 libraries/config.values.php:111
 #: libraries/config.values.php:117
 #: libraries/navigation/Nodes/Node_Table.class.php:286
 msgid "Search"
 msgstr "Хайх"
 
-#: libraries/Menu.class.php:338 libraries/Util.class.php:3336
-#: libraries/Util.class.php:3346 libraries/Util.class.php:3627
-#: libraries/Util.class.php:3628 libraries/Util.class.php:4347
+#: libraries/Menu.class.php:338 libraries/Util.class.php:3342
+#: libraries/Util.class.php:3352 libraries/Util.class.php:3633
+#: libraries/Util.class.php:3634 libraries/Util.class.php:4353
 #: libraries/config.values.php:42 libraries/config.values.php:50
 #: libraries/config.values.php:118
 #: libraries/navigation/Nodes/Node_Table.class.php:289
@@ -4420,30 +4431,30 @@ msgid "Insert"
 msgstr "Оруулах"
 
 #: libraries/Menu.class.php:362 libraries/Menu.class.php:467
-#: libraries/Util.class.php:4334 libraries/Util.class.php:4350
+#: libraries/Util.class.php:4340 libraries/Util.class.php:4356
 #: libraries/config.values.php:106 libraries/server_common.lib.php:51
 #: libraries/server_privileges.lib.php:2370
 #: libraries/server_privileges.lib.php:3158
-#: libraries/server_privileges.lib.php:4221
+#: libraries/server_privileges.lib.php:4247
 msgid "Privileges"
 msgstr "Онцгой эрхүүд"
 
 #: libraries/Menu.class.php:371 libraries/Menu.class.php:379
-#: libraries/Menu.class.php:459 libraries/Util.class.php:3338
-#: libraries/Util.class.php:3352 libraries/Util.class.php:4333
-#: libraries/Util.class.php:4351 libraries/config.values.php:112
+#: libraries/Menu.class.php:459 libraries/Util.class.php:3344
+#: libraries/Util.class.php:3358 libraries/Util.class.php:4339
+#: libraries/Util.class.php:4357 libraries/config.values.php:112
 #: view_operations.php:92
 msgid "Operations"
 msgstr "Үйлдлүүд"
 
 #: libraries/Menu.class.php:384 libraries/Menu.class.php:492
-#: libraries/Util.class.php:4338 libraries/Util.class.php:4352
+#: libraries/Util.class.php:4344 libraries/Util.class.php:4358
 #: libraries/relation.lib.php:255
 msgid "Tracking"
 msgstr ""
 
 #: libraries/Menu.class.php:397 libraries/Menu.class.php:486
-#: libraries/Util.class.php:4337 libraries/Util.class.php:4353
+#: libraries/Util.class.php:4343 libraries/Util.class.php:4359
 #: libraries/navigation/Nodes/Node_Trigger_Container.class.php:24
 #: libraries/plugins/export/ExportHtmlword.class.php:557
 #: libraries/plugins/export/ExportOdt.class.php:685
@@ -4460,16 +4471,16 @@ msgstr ""
 msgid "Database seems to be empty!"
 msgstr "Өгөгдлийн сан хоосон санагдаж байна!"
 
-#: libraries/Menu.class.php:439 libraries/Util.class.php:4330
+#: libraries/Menu.class.php:439 libraries/Util.class.php:4336
 msgid "Query"
 msgstr "Асуулт (Query)"
 
-#: libraries/Menu.class.php:472 libraries/Util.class.php:4335
+#: libraries/Menu.class.php:472 libraries/Util.class.php:4341
 #: libraries/rte/rte_words.lib.php:36
 msgid "Routines"
 msgstr ""
 
-#: libraries/Menu.class.php:479 libraries/Util.class.php:4336
+#: libraries/Menu.class.php:479 libraries/Util.class.php:4342
 #: libraries/navigation/Nodes/Node_Event_Container.class.php:26
 #: libraries/plugins/export/ExportSql.class.php:940
 #: libraries/plugins/export/ExportXml.class.php:107
@@ -4477,22 +4488,22 @@ msgstr ""
 msgid "Events"
 msgstr ""
 
-#: libraries/Menu.class.php:498 libraries/Util.class.php:4339
+#: libraries/Menu.class.php:498 libraries/Util.class.php:4345
 msgid "Designer"
 msgstr "Дизайнч"
 
-#: libraries/Menu.class.php:507 libraries/Util.class.php:4340
-#: templates/structure/check_all_tables.phtml:35
+#: libraries/Menu.class.php:507 libraries/Util.class.php:4346
+#: templates/database/structure/check_all_tables.phtml:35
 #, fuzzy
 #| msgid "Add/Delete Field Columns"
 msgid "Central columns"
 msgstr "Багана нэмэх/устгах"
 
-#: libraries/Menu.class.php:544 libraries/Util.class.php:4312
+#: libraries/Menu.class.php:544 libraries/Util.class.php:4318
 #: libraries/config.values.php:103 libraries/config/messages.inc.php:266
 #: libraries/config/messages.inc.php:341
 #: libraries/navigation/NavigationTree.class.php:1239
-#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4332
+#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4358
 msgid "Databases"
 msgstr "Өгөгдлийн сангууд"
 
@@ -4503,34 +4514,34 @@ msgid "User accounts"
 msgstr "Хэрэглэгч"
 
 #: libraries/Menu.class.php:595 libraries/ServerStatusData.class.php:121
-#: libraries/Util.class.php:4319 libraries/server_common.lib.php:36
+#: libraries/Util.class.php:4325 libraries/server_common.lib.php:36
 msgid "Binary log"
 msgstr "Хоёртын log"
 
 #: libraries/Menu.class.php:601 libraries/ServerStatusData.class.php:126
-#: libraries/Util.class.php:4320 libraries/server_common.lib.php:42
-#: templates/structure/body_for_table_summary.phtml:10
-#: templates/structure/table_header.phtml:27
+#: libraries/Util.class.php:4326 libraries/server_common.lib.php:42
+#: templates/database/structure/body_for_table_summary.phtml:10
+#: templates/database/structure/table_header.phtml:27
 msgid "Replication"
 msgstr "Олшруулалт"
 
 #: libraries/Menu.class.php:606 libraries/ServerStatusData.class.php:193
-#: libraries/Util.class.php:4321 libraries/config.values.php:105
+#: libraries/Util.class.php:4327 libraries/config.values.php:105
 #: libraries/server_engines.lib.php:108 libraries/server_engines.lib.php:112
 #: libraries/sql_query_form.lib.php:421
 msgid "Variables"
 msgstr "Утгууд"
 
-#: libraries/Menu.class.php:610 libraries/Util.class.php:4322
+#: libraries/Menu.class.php:610 libraries/Util.class.php:4328
 msgid "Charsets"
 msgstr "Кодлолууд"
 
-#: libraries/Menu.class.php:615 libraries/Util.class.php:4323
+#: libraries/Menu.class.php:615 libraries/Util.class.php:4329
 #: libraries/server_common.lib.php:33 libraries/server_plugins.lib.php:27
 msgid "Plugins"
 msgstr ""
 
-#: libraries/Menu.class.php:626 libraries/Util.class.php:4324
+#: libraries/Menu.class.php:626 libraries/Util.class.php:4330
 msgid "Engines"
 msgstr "Хөдөлгүүрүүд"
 
@@ -4557,7 +4568,7 @@ msgid_plural "%1$d rows inserted."
 msgstr[0] "Сонгогдсон мөргүй"
 msgstr[1] "Сонгогдсон мөргүй"
 
-#: libraries/PDF.class.php:70 libraries/Util.class.php:2521
+#: libraries/PDF.class.php:70 libraries/Util.class.php:2527
 #: libraries/browse_foreigners.lib.php:327
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:865
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:890
@@ -4584,7 +4595,7 @@ msgid "Could not save favorite table!"
 msgstr "Анхдагч тохиргоо дуудагдсангүй нь: \"%1$s\""
 
 #: libraries/RecentFavoriteTable.class.php:212
-#: templates/structure/favorite_anchor.phtml:12
+#: templates/database/structure/favorite_anchor.phtml:12
 #, fuzzy
 #| msgid "Rename database to"
 msgid "Remove from Favorites"
@@ -4771,7 +4782,7 @@ msgid ""
 msgstr "Энд уг агуулах хөдөлгүүрийн дэлгэрэнгүй төлвийн мэдээлэл алга."
 
 #: libraries/StorageEngine.class.php:373
-#: templates/structure/body_for_table_summary.phtml:50
+#: templates/database/structure/body_for_table_summary.phtml:50
 #, php-format
 msgid "%s is the default storage engine on this MySQL server."
 msgstr "%s нь уг MySQL сервэрийн анхдагч агуулах хөдөлгүүр байна."
@@ -5204,10 +5215,10 @@ msgstr ""
 
 #: libraries/Util.class.php:726 libraries/rte/rte_events.lib.php:110
 #: libraries/rte/rte_events.lib.php:119 libraries/rte/rte_events.lib.php:150
-#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:153
-#: libraries/rte/rte_routines.lib.php:162
-#: libraries/rte/rte_routines.lib.php:235
-#: libraries/rte/rte_routines.lib.php:1366
+#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:223
+#: libraries/rte/rte_routines.lib.php:250
+#: libraries/rte/rte_routines.lib.php:372
+#: libraries/rte/rte_routines.lib.php:1457
 #: libraries/rte/rte_triggers.lib.php:86 libraries/rte/rte_triggers.lib.php:95
 #: libraries/rte/rte_triggers.lib.php:127
 msgid "MySQL said: "
@@ -5253,78 +5264,81 @@ msgstr "Ня"
 msgid "%B %d, %Y at %I:%M %p"
 msgstr "%Y оны %B сарын %d., %H:%M"
 
-#: libraries/Util.class.php:2019
+#: libraries/Util.class.php:2025
 #, php-format
 msgid "%s days, %s hours, %s minutes and %s seconds"
 msgstr "%s өдөр, %s цаг, %s минут, %s секунд"
 
-#: libraries/Util.class.php:2112
+#: libraries/Util.class.php:2118
 #, fuzzy
 #| msgid "Add new field"
 msgid "Missing parameter:"
 msgstr "Шинэ талбар нэмэх"
 
-#: libraries/Util.class.php:2645
+#: libraries/Util.class.php:2651
 #, php-format
 msgid "Jump to database \"%s\"."
 msgstr "\"%s\" өгөгдлийн сан руу үсрэх."
 
-#: libraries/Util.class.php:2670
+#: libraries/Util.class.php:2676
 #, php-format
 msgid "The %s functionality is affected by a known bug, see %s"
 msgstr ""
 
-#: libraries/Util.class.php:2881
+#: libraries/Util.class.php:2887
 msgid "Click to toggle"
 msgstr ""
 
-#: libraries/Util.class.php:3542 prefs_manage.php:248
+#: libraries/Util.class.php:3548 prefs_manage.php:248
 msgid "Browse your computer:"
 msgstr ""
 
-#: libraries/Util.class.php:3567
+#: libraries/Util.class.php:3573
 #, fuzzy, php-format
 #| msgid "web server upload directory"
 msgid "Select from the web server upload directory <b>%s</b>:"
 msgstr "web-сервэр түлхэх хавтас"
 
-#: libraries/Util.class.php:3596 libraries/insert_edit.lib.php:1173
+#: libraries/Util.class.php:3602 libraries/insert_edit.lib.php:1171
 msgid "The directory you set for upload work cannot be reached."
 msgstr "Таны сонгосон хавтас \"upload\" хийгдэхгүй байна."
 
-#: libraries/Util.class.php:3607
+#: libraries/Util.class.php:3613
 msgid "There are no files to upload!"
 msgstr ""
 
-#: libraries/Util.class.php:3632 libraries/Util.class.php:3633
-#: templates/structure/check_all_tables.phtml:15
+#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: templates/database/structure/check_all_tables.phtml:15
 msgid "Empty"
 msgstr "Хоосон"
 
-#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: libraries/Util.class.php:3644 libraries/Util.class.php:3645
 msgid "Execute"
 msgstr ""
 
-#: libraries/Util.class.php:4152
+#: libraries/Util.class.php:4158
 msgid "Print"
 msgstr "Хэвлэх"
 
-#: libraries/Util.class.php:4257 templates/structure/row_stats_table.phtml:80
-#: templates/structure/table_header.phtml:95
+#: libraries/Util.class.php:4263
+#: templates/database/structure/table_header.phtml:95
+#: templates/table/structure/row_stats_table.phtml:80
 msgid "Creation"
 msgstr "Үүсгэлт"
 
-#: libraries/Util.class.php:4263 templates/structure/row_stats_table.phtml:87
-#: templates/structure/table_header.phtml:106
+#: libraries/Util.class.php:4269
+#: templates/database/structure/table_header.phtml:106
+#: templates/table/structure/row_stats_table.phtml:87
 msgid "Last update"
 msgstr "Сүүлийн шинэчлэл"
 
-#: libraries/Util.class.php:4269 templates/structure/row_stats_table.phtml:94
-#: templates/structure/table_header.phtml:117
+#: libraries/Util.class.php:4275
+#: templates/database/structure/table_header.phtml:117
+#: templates/table/structure/row_stats_table.phtml:94
 msgid "Last check"
 msgstr "Сүүлийн шалгалт"
 
-#: libraries/Util.class.php:4315
+#: libraries/Util.class.php:4321
 #, fuzzy
 #| msgid "User"
 msgid "Users"
@@ -5349,16 +5363,16 @@ msgid "Use this value"
 msgstr "Уг утгыг хэрэглэх"
 
 #: libraries/build_html_for_db.lib.php:33 libraries/import.lib.php:193
-#: templates/structure/actions_in_table_structure.phtml:113
-#: templates/structure/row_stats_table.phtml:42
-#: templates/structure/table_header.phtml:36
+#: templates/database/structure/table_header.phtml:36
+#: templates/table/structure/actions_in_table_structure.phtml:113
+#: templates/table/structure/row_stats_table.phtml:42
 msgid "Rows"
 msgstr "Мөрүүд"
 
 #: libraries/build_html_for_db.lib.php:48 libraries/engines/innodb.lib.php:171
-#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:186
-#: libraries/server_status.lib.php:298
-#: templates/structure/display_table_stats.phtml:40
+#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:195
+#: libraries/server_status.lib.php:307
+#: templates/table/structure/display_table_stats.phtml:40
 msgid "Total"
 msgstr "Нийт"
 
@@ -5369,10 +5383,12 @@ msgid "Jump to database"
 msgstr "ӨС байхгүй"
 
 #: libraries/build_html_for_db.lib.php:146
+#: templates/database/structure/structure_table_row.phtml:15
 msgid "Not replicated"
 msgstr ""
 
 #: libraries/build_html_for_db.lib.php:158
+#: templates/database/structure/structure_table_row.phtml:16
 #, fuzzy
 #| msgid "Replication"
 msgid "Replicated"
@@ -5431,17 +5447,17 @@ msgstr ""
 #: libraries/plugins/export/ExportTexytext.class.php:425
 #: libraries/plugins/export/PMA_ExportPdf.class.php:307
 #: libraries/rte/rte_list.lib.php:73 libraries/rte/rte_list.lib.php:85
-#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:830
-#: libraries/rte/rte_routines.lib.php:1492 setup/frames/index.inc.php:162
+#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:921
+#: libraries/rte/rte_routines.lib.php:1583 setup/frames/index.inc.php:162
 #: templates/columns_definitions/table_fields_definitions.phtml:8
-#: templates/structure/table_structure_header.phtml:5
-#: templates/table/create_table.phtml:11
+#: templates/database/create_table.phtml:11
+#: templates/table/structure/table_structure_header.phtml:5
 msgid "Name"
 msgstr "Нэр"
 
 #: libraries/central_columns.lib.php:699
 #: libraries/central_columns.lib.php:1381
-#: libraries/rte/rte_routines.lib.php:832
+#: libraries/rte/rte_routines.lib.php:923
 #: templates/columns_definitions/table_fields_definitions.phtml:14
 msgid "Length/Values"
 msgstr "Урт/Утгууд*"
@@ -5464,7 +5480,7 @@ msgid "Select a table"
 msgstr "Хүснэгтүүд сонго"
 
 #: libraries/central_columns.lib.php:804
-#: templates/structure/add_column.phtml:4
+#: templates/table/structure/add_column.phtml:4
 #, fuzzy
 #| msgid "Add %s field(s)"
 msgid "Add column"
@@ -5486,7 +5502,7 @@ msgstr "%s талбар(ууд) нэмэх"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1002
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1025
 #: templates/columns_definitions/table_fields_definitions.phtml:36
-#: templates/structure/table_structure_header.phtml:8
+#: templates/table/structure/table_structure_header.phtml:8
 msgid "Attributes"
 msgstr "Атрибутууд"
 
@@ -5609,7 +5625,7 @@ msgid "Double click"
 msgstr ""
 
 #: libraries/config.values.php:95 libraries/config.values.php:124
-#: libraries/config/FormDisplay.tpl.php:221 libraries/relation.lib.php:97
+#: libraries/config/FormDisplay.tpl.php:232 libraries/relation.lib.php:97
 #: libraries/relation.lib.php:105
 msgid "Disabled"
 msgstr "Хаагдсан"
@@ -5801,21 +5817,21 @@ msgstr ""
 msgid "maximum %s"
 msgstr ""
 
-#: libraries/config/FormDisplay.tpl.php:219
+#: libraries/config/FormDisplay.tpl.php:230
 msgid "This setting is disabled, it will not be applied to your configuration."
 msgstr ""
 
-#: libraries/config/FormDisplay.tpl.php:313
+#: libraries/config/FormDisplay.tpl.php:324
 #, php-format
 msgid "Set value: %s"
 msgstr ""
 
-#: libraries/config/FormDisplay.tpl.php:318
+#: libraries/config/FormDisplay.tpl.php:329
 #: libraries/config/messages.inc.php:610
 msgid "Restore default value"
 msgstr ""
 
-#: libraries/config/FormDisplay.tpl.php:332
+#: libraries/config/FormDisplay.tpl.php:343
 msgid "Allow users to customize this value"
 msgstr ""
 
@@ -6250,7 +6266,7 @@ msgstr ""
 
 #: libraries/config/messages.inc.php:136 libraries/config/messages.inc.php:152
 #: libraries/sql_query_form.lib.php:247
-#: templates/structure/row_stats_table.phtml:7
+#: templates/table/structure/row_stats_table.phtml:7
 msgid "Format"
 msgstr "Тогтнол"
 
@@ -6819,7 +6835,7 @@ msgstr ""
 
 #: libraries/config/messages.inc.php:332
 #: libraries/plugins/export/ExportPdf.class.php:279
-#: templates/structure/secondary_tabs.phtml:8
+#: templates/table/secondary_tabs.phtml:8
 #, fuzzy
 #| msgid "Database for user"
 msgid "Table structure"
@@ -8431,112 +8447,35 @@ msgstr "Microsoft Word 2000"
 msgid "OpenDocument Text"
 msgstr "Баримт"
 
-#: libraries/controllers/StructureController.class.php:465
+#: libraries/controllers/DatabaseStructureController.class.php:405
 #: tbl_operations.php:382
 #, php-format
 msgid "Table %s has been emptied."
 msgstr "Хүснэгт %s нь хоослогдлоо."
 
-#: libraries/controllers/StructureController.class.php:486
+#: libraries/controllers/DatabaseStructureController.class.php:426
 #: tbl_operations.php:400 view_operations.php:119
 #, fuzzy, php-format
 #| msgid "View %s has been dropped."
 msgid "View %s has been dropped."
 msgstr "Харц %s нь устгагдсан"
 
-#: libraries/controllers/StructureController.class.php:487
+#: libraries/controllers/DatabaseStructureController.class.php:427
 #: tbl_operations.php:401
 #, fuzzy, php-format
 #| msgid "Table %s has been dropped."
 msgid "Table %s has been dropped."
 msgstr "Хүснэгт %s нь устгагдлаа"
 
-#: libraries/controllers/StructureController.class.php:797
-#, php-format
-msgid "The name '%s' is a MySQL reserved keyword."
-msgid_plural "The names '%s' are MySQL reserved keywords."
-msgstr[0] ""
-msgstr[1] ""
-
-#: libraries/controllers/StructureController.class.php:875
-#, fuzzy
-#| msgid "No rows selected"
-msgid "No column selected."
-msgstr "Сонгогдсон мөргүй"
-
-#: libraries/controllers/StructureController.class.php:1049
+#: libraries/controllers/DatabaseStructureController.class.php:733
 msgid "Favorite List is full!"
 msgstr ""
 
-#: libraries/controllers/StructureController.class.php:1272
-#, fuzzy
-#| msgid "The selected users have been deleted successfully."
-msgid "The columns have been moved successfully."
-msgstr "Сонгогдсон хэрэглэгч устгагдлаа."
-
-#: libraries/controllers/StructureController.class.php:1535
-#, fuzzy, php-format
-#| msgid "Table %s has been moved to %s."
-msgid ""
-"Table %1$s has been altered successfully. Privileges have been adjusted."
-msgstr "Хүснэгт %s нь %s руу зөөгдөв."
-
-#: libraries/controllers/StructureController.class.php:1541
-#: libraries/controllers/TableIndexesController.class.php:161
-#: tbl_addfield.php:92
-#, php-format
-msgid "Table %1$s has been altered successfully."
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1588
-#: libraries/tracking.lib.php:1094
-#, fuzzy
-#| msgid "Query type"
-msgid "Query error"
-msgstr "Асуултын төрөл"
-
-#: libraries/controllers/StructureController.class.php:1806
+#: libraries/controllers/DatabaseStructureController.class.php:947
 #: libraries/mysql_charsets.lib.php:366 libraries/mysql_charsets.lib.php:373
 msgid "unknown"
 msgstr "үлмэдэх"
 
-#: libraries/controllers/StructureController.class.php:1957
-#: templates/structure/check_all_table_column.phtml:11
-msgid "Change"
-msgstr "Солих"
-
-#: libraries/controllers/StructureController.class.php:1961
-#: libraries/controllers/StructureController.class.php:1966
-#: libraries/navigation/Nodes/Node_Index.class.php:30
-#: libraries/tracking.lib.php:926
-#: templates/columns_definitions/column_indexes.phtml:16
-#: templates/columns_definitions/table_fields_definitions.phtml:57
-#: templates/structure/check_all_table_column.phtml:30
-#: templates/structure/display_structure.phtml:79
-#: templates/structure/display_table_stats.phtml:19
-msgid "Index"
-msgstr "Индекс"
-
-#: libraries/controllers/StructureController.class.php:1963
-#: libraries/controllers/StructureController.class.php:1968
-#: templates/columns_definitions/column_indexes.phtml:27
-#: templates/structure/check_all_table_column.phtml:37
-msgid "Spatial"
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1964
-#: libraries/controllers/StructureController.class.php:1969
-#: templates/columns_definitions/column_indexes.phtml:22
-#: templates/structure/check_all_table_column.phtml:47
-msgid "Fulltext"
-msgstr "Бүтэнбичвэр"
-
-#: libraries/controllers/StructureController.class.php:1970
-#, fuzzy
-#| msgid "Browse distinct values"
-msgid "Distinct values"
-msgstr "Онцгой утгуудыг харах"
-
 #: libraries/controllers/TableChartController.class.php:82
 #: libraries/controllers/TableGisVisualizationController.class.php:101
 msgid "No SQL query was set to fetch data."
@@ -8552,13 +8491,20 @@ msgstr ""
 msgid "No data to display"
 msgstr "ӨС байхгүй"
 
-#: libraries/controllers/TableRelationController.class.php:217
+#: libraries/controllers/TableIndexesController.class.php:161
+#: libraries/controllers/TableStructureController.class.php:736
+#: tbl_addfield.php:92
+#, php-format
+msgid "Table %1$s has been altered successfully."
+msgstr ""
+
+#: libraries/controllers/TableRelationController.class.php:218
 #, fuzzy
 #| msgid "Thread %s was successfully killed."
 msgid "Display column was successfully updated."
 msgstr "Thread %s нь устгагдав."
 
-#: libraries/controllers/TableRelationController.class.php:283
+#: libraries/controllers/TableRelationController.class.php:288
 #, fuzzy
 #| msgid "Internal relation added"
 msgid "Internal relations were successfully updated."
@@ -8577,12 +8523,82 @@ msgid "Zoom search"
 msgstr "Хайх"
 
 #: libraries/controllers/TableSearchController.class.php:852
-#: templates/table/selection_form.phtml:59
+#: templates/table/search/selection_form.phtml:59
 #, fuzzy
 #| msgid "in query"
 msgid "Find and replace"
 msgstr "асуултад"
 
+#: libraries/controllers/TableStructureController.class.php:163
+#, php-format
+msgid "The name '%s' is a MySQL reserved keyword."
+msgid_plural "The names '%s' are MySQL reserved keywords."
+msgstr[0] ""
+msgstr[1] ""
+
+#: libraries/controllers/TableStructureController.class.php:241
+#, fuzzy
+#| msgid "No rows selected"
+msgid "No column selected."
+msgstr "Сонгогдсон мөргүй"
+
+#: libraries/controllers/TableStructureController.class.php:467
+#, fuzzy
+#| msgid "The selected users have been deleted successfully."
+msgid "The columns have been moved successfully."
+msgstr "Сонгогдсон хэрэглэгч устгагдлаа."
+
+#: libraries/controllers/TableStructureController.class.php:730
+#, fuzzy, php-format
+#| msgid "Table %s has been moved to %s."
+msgid ""
+"Table %1$s has been altered successfully. Privileges have been adjusted."
+msgstr "Хүснэгт %s нь %s руу зөөгдөв."
+
+#: libraries/controllers/TableStructureController.class.php:783
+#: libraries/tracking.lib.php:1094
+#, fuzzy
+#| msgid "Query type"
+msgid "Query error"
+msgstr "Асуултын төрөл"
+
+#: libraries/controllers/TableStructureController.class.php:948
+#: templates/table/structure/check_all_table_column.phtml:11
+msgid "Change"
+msgstr "Солих"
+
+#: libraries/controllers/TableStructureController.class.php:952
+#: libraries/controllers/TableStructureController.class.php:957
+#: libraries/navigation/Nodes/Node_Index.class.php:30
+#: libraries/tracking.lib.php:926
+#: templates/columns_definitions/column_indexes.phtml:16
+#: templates/columns_definitions/table_fields_definitions.phtml:57
+#: templates/table/structure/check_all_table_column.phtml:30
+#: templates/table/structure/display_structure.phtml:79
+#: templates/table/structure/display_table_stats.phtml:19
+msgid "Index"
+msgstr "Индекс"
+
+#: libraries/controllers/TableStructureController.class.php:954
+#: libraries/controllers/TableStructureController.class.php:959
+#: templates/columns_definitions/column_indexes.phtml:27
+#: templates/table/structure/check_all_table_column.phtml:37
+msgid "Spatial"
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:955
+#: libraries/controllers/TableStructureController.class.php:960
+#: templates/columns_definitions/column_indexes.phtml:22
+#: templates/table/structure/check_all_table_column.phtml:47
+msgid "Fulltext"
+msgstr "Бүтэнбичвэр"
+
+#: libraries/controllers/TableStructureController.class.php:963
+#, fuzzy
+#| msgid "Browse distinct values"
+msgid "Distinct values"
+msgstr "Онцгой утгуудыг харах"
+
 #: libraries/core.lib.php:306
 #, php-format
 msgid "The %s extension is missing. Please check your PHP configuration."
@@ -8629,7 +8645,7 @@ msgid "No Password"
 msgstr "Нууц үггүй"
 
 #: libraries/display_change_password.lib.php:68
-#: libraries/plugins/auth/AuthenticationCookie.class.php:199
+#: libraries/plugins/auth/AuthenticationCookie.class.php:187
 #: libraries/replication_gui.lib.php:422 libraries/replication_gui.lib.php:862
 #: libraries/server_privileges.lib.php:1640
 msgid "Password:"
@@ -9468,12 +9484,12 @@ msgid "Dump has been saved to file %s."
 msgstr "Асгалт %s файлд хадгалагдсан."
 
 #: libraries/import.lib.php:202 libraries/insert_edit.lib.php:124
-#: libraries/rte/rte_routines.lib.php:1353 libraries/sql.lib.php:1312
+#: libraries/rte/rte_routines.lib.php:1444 libraries/sql.lib.php:1306
 #: tbl_get_field.php:44
 msgid "MySQL returned an empty result set (i.e. zero rows)."
 msgstr "MySQL хоосон үр дүн буцаалаа (тэг мөрүүд г.м.)."
 
-#: libraries/import.lib.php:265 libraries/sql.lib.php:1326
+#: libraries/import.lib.php:265 libraries/sql.lib.php:1320
 msgid "[ROLLBACK occurred.]"
 msgstr ""
 
@@ -9541,14 +9557,14 @@ msgstr "&nbsp;%s&nbsp;багануудад индекс үүсгэх"
 
 #: libraries/insert_edit.lib.php:233
 #: libraries/navigation/Nodes/Node_DatabaseChild.class.php:48
-#: templates/designer/table_list.phtml:40
+#: templates/database/designer/table_list.phtml:40
 msgid "Hide"
 msgstr "Нуух"
 
 #: libraries/insert_edit.lib.php:249
 #: libraries/navigation/Nodes/Node_Function.class.php:32
-#: libraries/rte/rte_routines.lib.php:1495
-#: templates/table/table_header.phtml:4
+#: libraries/rte/rte_routines.lib.php:1586
+#: templates/table/search/table_header.phtml:4
 msgid "Function"
 msgstr "Функц"
 
@@ -9563,88 +9579,89 @@ msgstr "Хоёртын"
 msgid "Because of its length,<br /> this column might not be editable."
 msgstr "Яагаад гэвэл урт нь их,<br /> энэ талбар засагдахгүй "
 
-#: libraries/insert_edit.lib.php:1050
+#: libraries/insert_edit.lib.php:1048
 msgid "Binary - do not edit"
 msgstr "Хоёртын өгөгдөл - засагдахгүй"
 
-#: libraries/insert_edit.lib.php:1176 libraries/server_privileges.lib.php:470
-#: templates/table/options.phtml:36
+#: libraries/insert_edit.lib.php:1174 libraries/server_privileges.lib.php:470
+#: templates/table/search/options.phtml:36
 msgid "Or"
 msgstr "Эсвэл"
 
-#: libraries/insert_edit.lib.php:1177
+#: libraries/insert_edit.lib.php:1175
 #, fuzzy
 #| msgid "web server upload directory"
 msgid "web server upload directory:"
 msgstr "web-сервэр түлхэх хавтас"
 
-#: libraries/insert_edit.lib.php:1348 templates/table/input_box.phtml:49
+#: libraries/insert_edit.lib.php:1346
+#: templates/table/search/input_box.phtml:49
 #, fuzzy
 #| msgid "Insert"
 msgid "Edit/Insert"
 msgstr "Оруулах"
 
-#: libraries/insert_edit.lib.php:1398
+#: libraries/insert_edit.lib.php:1396
 #, php-format
 msgid "Continue insertion with %s rows"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1428
+#: libraries/insert_edit.lib.php:1426
 msgid "and then"
 msgstr "ба тэгээд"
 
-#: libraries/insert_edit.lib.php:1461
+#: libraries/insert_edit.lib.php:1459
 msgid "Insert as new row"
 msgstr "Шинэ мөр оруулаад"
 
-#: libraries/insert_edit.lib.php:1464
+#: libraries/insert_edit.lib.php:1462
 msgid "Insert as new row and ignore errors"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1467
+#: libraries/insert_edit.lib.php:1465
 msgid "Show insert query"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1487
+#: libraries/insert_edit.lib.php:1485
 msgid "Go back to previous page"
 msgstr "Буцах"
 
-#: libraries/insert_edit.lib.php:1490
+#: libraries/insert_edit.lib.php:1488
 msgid "Insert another new row"
 msgstr "Өөр шинэ мөр оруулах"
 
-#: libraries/insert_edit.lib.php:1495
+#: libraries/insert_edit.lib.php:1493
 msgid "Go back to this page"
 msgstr "Энэ хуудас руу буцах"
 
-#: libraries/insert_edit.lib.php:1518
+#: libraries/insert_edit.lib.php:1516
 msgid "Edit next row"
 msgstr "Дараагийн мөрийг засах"
 
-#: libraries/insert_edit.lib.php:1540
+#: libraries/insert_edit.lib.php:1538
 msgid ""
 "Use TAB key to move from value to value, or CTRL+arrows to move anywhere"
 msgstr ""
 "TAB товчийг хэрэглэн утгаас утгын хооронд шилжинэ, эсвэл CTRL+сумууд-аар "
 "зөөгдөнө"
 
-#: libraries/insert_edit.lib.php:1577 libraries/replication_gui.lib.php:542
-#: libraries/rte/rte_routines.lib.php:1497
+#: libraries/insert_edit.lib.php:1575 libraries/replication_gui.lib.php:542
+#: libraries/rte/rte_routines.lib.php:1588
 #: libraries/server_status_variables.lib.php:220
-#: templates/designer/having_query_panel.phtml:100
-#: templates/designer/options_panel.phtml:73
-#: templates/designer/options_panel.phtml:239
-#: templates/designer/where_query_panel.phtml:69
-#: templates/table/table_header.phtml:10
-#: templates/table/zoom_result_form.phtml:35
+#: templates/database/designer/having_query_panel.phtml:100
+#: templates/database/designer/options_panel.phtml:73
+#: templates/database/designer/options_panel.phtml:239
+#: templates/database/designer/where_query_panel.phtml:69
+#: templates/table/search/table_header.phtml:10
+#: templates/table/search/zoom_result_form.phtml:35
 msgid "Value"
 msgstr "Утга"
 
-#: libraries/insert_edit.lib.php:1937 libraries/sql.lib.php:1309
+#: libraries/insert_edit.lib.php:1935 libraries/sql.lib.php:1303
 msgid "Showing SQL query"
 msgstr "SQL асуудал харуулах"
 
-#: libraries/insert_edit.lib.php:1962 libraries/sql.lib.php:1287
+#: libraries/insert_edit.lib.php:1960 libraries/sql.lib.php:1281
 #, php-format
 msgid "Inserted row id: %1$d"
 msgstr ""
@@ -10097,7 +10114,7 @@ msgstr ""
 #: libraries/navigation/Nodes/Node_View_Container.class.php:26
 #: libraries/navigation/Nodes/Node_View_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:129
-#: templates/structure/show_create.phtml:30
+#: templates/database/structure/show_create.phtml:30
 #, fuzzy
 #| msgid "View"
 msgid "Views"
@@ -10409,7 +10426,7 @@ msgstr "Танд хангалттай эрх байхгүй!"
 
 #: libraries/operations.lib.php:101 libraries/operations.lib.php:249
 #: libraries/operations.lib.php:869 libraries/operations.lib.php:963
-#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:907
+#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:998
 #: templates/columns_definitions/table_fields_definitions.phtml:47
 #, fuzzy
 #| msgid "Edit Privileges"
@@ -10507,22 +10524,22 @@ msgid "Switch to copied table"
 msgstr "Хуулагдсан хүснэгт рүү шилжих"
 
 #: libraries/operations.lib.php:1360
-#: templates/structure/check_all_tables.phtml:18
+#: templates/database/structure/check_all_tables.phtml:18
 msgid "Table maintenance"
 msgstr "Хүснэгтийн ашиглалт"
 
 #: libraries/operations.lib.php:1398
-#: templates/structure/check_all_tables.phtml:19
+#: templates/database/structure/check_all_tables.phtml:19
 msgid "Analyze table"
 msgstr "Хүснэгтийг задлах"
 
 #: libraries/operations.lib.php:1413
-#: templates/structure/check_all_tables.phtml:20
+#: templates/database/structure/check_all_tables.phtml:20
 msgid "Check table"
 msgstr "Хүснэгт шалгах"
 
 #: libraries/operations.lib.php:1428
-#: templates/structure/check_all_tables.phtml:22
+#: templates/database/structure/check_all_tables.phtml:22
 #, fuzzy
 #| msgid "Check table"
 msgid "Checksum table"
@@ -10544,18 +10561,19 @@ msgid "Flush the table (FLUSH)"
 msgstr "Flush the table (\"FLUSH\")"
 
 #: libraries/operations.lib.php:1477
-#: templates/structure/check_all_tables.phtml:23
-#: templates/structure/display_table_stats.phtml:56
+#: templates/database/structure/check_all_tables.phtml:23
+#: templates/table/structure/display_table_stats.phtml:56
 msgid "Optimize table"
 msgstr "Хүснэгтийг зүгшрүүлэх"
 
 #: libraries/operations.lib.php:1492
-#: templates/structure/check_all_tables.phtml:24
+#: templates/database/structure/check_all_tables.phtml:24
 msgid "Repair table"
 msgstr "Хүснэгт засах"
 
 #: libraries/operations.lib.php:1538
-#: templates/structure/check_all_tables.phtml:14 view_operations.php:127
+#: templates/database/structure/check_all_tables.phtml:14
+#: view_operations.php:127
 #, fuzzy
 #| msgid "Dumping data for table"
 msgid "Delete data or table"
@@ -10684,7 +10702,7 @@ msgid "Cannot connect: invalid settings."
 msgstr "Холбогдсонгүй: тохируулга буруу."
 
 #: libraries/plugins/auth/AuthenticationConfig.class.php:108
-#: libraries/plugins/auth/AuthenticationCookie.class.php:134
+#: libraries/plugins/auth/AuthenticationCookie.class.php:122
 #: libraries/plugins/auth/AuthenticationHttp.class.php:96
 #, php-format
 msgid "Welcome to %s"
@@ -10713,38 +10731,38 @@ msgstr ""
 msgid "Retry to connect"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:146
+#: libraries/plugins/auth/AuthenticationCookie.class.php:134
 msgid "Your session has expired. Please log in again."
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:170
+#: libraries/plugins/auth/AuthenticationCookie.class.php:158
 msgid "Log in"
 msgstr "Нэвтрэх"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:178
-#: libraries/plugins/auth/AuthenticationCookie.class.php:188
+#: libraries/plugins/auth/AuthenticationCookie.class.php:166
+#: libraries/plugins/auth/AuthenticationCookie.class.php:176
 msgid "You can enter hostname/IP address and port separated by space."
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:193
+#: libraries/plugins/auth/AuthenticationCookie.class.php:181
 msgid "Username:"
 msgstr "Нэвтрэгч:"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:205
+#: libraries/plugins/auth/AuthenticationCookie.class.php:193
 #, fuzzy
 #| msgid "Server Choice"
 msgid "Server Choice:"
 msgstr "Сервэр сонго"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:386
+#: libraries/plugins/auth/AuthenticationCookie.class.php:374
 msgid "Entered captcha is wrong, try again!"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:396
+#: libraries/plugins/auth/AuthenticationCookie.class.php:384
 msgid "Please enter correct captcha!"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:423
+#: libraries/plugins/auth/AuthenticationCookie.class.php:411
 #, fuzzy
 #| msgid "Cannot log in to the MySQL server"
 msgid "You are not allowed to log in to this MySQL server!"
@@ -10856,7 +10874,7 @@ msgstr "Үзэгдэл"
 #: libraries/plugins/export/ExportOdt.class.php:593
 #: libraries/plugins/export/ExportTexytext.class.php:428
 #: libraries/plugins/export/PMA_ExportPdf.class.php:313
-#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:984
 #: libraries/rte/rte_triggers.lib.php:377
 #, fuzzy
 #| msgid "Description"
@@ -11216,7 +11234,7 @@ msgid "Last check:"
 msgstr "Сүүлийн шалгалт"
 
 #: libraries/plugins/export/ExportSql.class.php:1399
-#: templates/structure/structure_table_row.phtml:183
+#: templates/database/structure/structure_table_row.phtml:183
 msgid "in use"
 msgstr "хэрэглэгдэж байна"
 
@@ -11417,22 +11435,16 @@ msgstr ""
 msgid "The imported file does not contain any data!"
 msgstr ""
 
-#: libraries/plugins/import/ImportSql.class.php:169
+#: libraries/plugins/import/ImportSql.class.php:72
 #, fuzzy
 #| msgid "SQL compatibility mode"
 msgid "SQL compatibility mode:"
 msgstr "SQL нийцтэй горим"
 
-#: libraries/plugins/import/ImportSql.class.php:181
+#: libraries/plugins/import/ImportSql.class.php:84
 msgid "Do not use <code>AUTO_INCREMENT</code> for zero values"
 msgstr ""
 
-#: libraries/plugins/import/ImportSql.class.php:195
-#, fuzzy
-#| msgid "Read misses"
-msgid "Read as multibytes"
-msgstr "Уншилт алдагдсан"
-
 #: libraries/plugins/import/ImportXml.class.php:54
 msgid "XML"
 msgstr "XML"
@@ -11477,7 +11489,7 @@ msgid "Show grid"
 msgstr "Тор харуулах"
 
 #: libraries/plugins/schema/SchemaPdf.class.php:94
-#: templates/structure/print_view_data_dictionary_link.phtml:6
+#: templates/database/structure/print_view_data_dictionary_link.phtml:6
 msgid "Data Dictionary"
 msgstr "Өгөгдлийн толь"
 
@@ -11509,7 +11521,7 @@ msgid "The %s table doesn't exist!"
 msgstr "Хүснэгт \"%s\" байхгүй байна!"
 
 #: libraries/plugins/schema/eps/Eps_Relation_Schema.class.php:321
-#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:309
+#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:323
 #, fuzzy, php-format
 #| msgid "Schema of the \"%s\" database - Page %s"
 msgid "Schema of the %s database - Page %s"
@@ -11539,7 +11551,7 @@ msgstr "Агуулгын хүснэгт"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1005
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1028
 #: libraries/tracking.lib.php:884
-#: templates/structure/table_structure_header.phtml:11
+#: templates/table/structure/table_structure_header.phtml:11
 msgid "Extra"
 msgstr "Нэмэлт"
 
@@ -11936,51 +11948,51 @@ msgstr ""
 msgid "Create the needed tables with the <code>%screate_tables.sql</code>."
 msgstr ""
 
-#: libraries/relation.lib.php:360
+#: libraries/relation.lib.php:357
 msgid "Create a pma user and give access to these tables."
 msgstr ""
 
-#: libraries/relation.lib.php:365
+#: libraries/relation.lib.php:360
 msgid ""
 "Enable advanced features in configuration file (<code>config.inc.php</"
 "code>), for example by starting from <code>config.sample.inc.php</code>."
 msgstr ""
 
-#: libraries/relation.lib.php:373
+#: libraries/relation.lib.php:365
 msgid "Re-login to phpMyAdmin to load the updated configuration file."
 msgstr ""
 
-#: libraries/relation.lib.php:1612
+#: libraries/relation.lib.php:1607
 msgid "no description"
 msgstr "тайлбаргүй"
 
-#: libraries/relation.lib.php:1811
+#: libraries/relation.lib.php:1806
 msgid ""
 "You do not have necessary privileges to create a database named "
 "'phpmyadmin'. You may go to 'Operations' tab of any database to set up the "
 "phpMyAdmin configuration storage there."
 msgstr ""
 
-#: libraries/relation.lib.php:1928
+#: libraries/relation.lib.php:1923
 #, php-format
 msgid ""
 "%sCreate%s a database named 'phpmyadmin' and setup the phpMyAdmin "
 "configuration storage there."
 msgstr ""
 
-#: libraries/relation.lib.php:1936
+#: libraries/relation.lib.php:1931
 #, php-format
 msgid ""
 "%sCreate%s the phpMyAdmin configuration storage in the current database."
 msgstr ""
 
-#: libraries/relation.lib.php:1944
+#: libraries/relation.lib.php:1939
 #, php-format
 msgid "%sCreate%s missing phpMyAdmin configuration storage tables."
 msgstr ""
 
 #: libraries/replication_gui.lib.php:46 libraries/replication_gui.lib.php:343
-#: libraries/server_databases.lib.php:387
+#: libraries/server_databases.lib.php:398
 msgid "Master replication"
 msgstr ""
 
@@ -12035,7 +12047,7 @@ msgid ""
 msgstr ""
 
 #: libraries/replication_gui.lib.php:141
-#: libraries/server_databases.lib.php:389
+#: libraries/server_databases.lib.php:400
 msgid "Slave replication"
 msgstr ""
 
@@ -12319,10 +12331,10 @@ msgid "Master server changed successfully to %s."
 msgstr "Онцгой эрхүүд дахин дуудагдлаа."
 
 #: libraries/rte/rte_events.lib.php:106 libraries/rte/rte_events.lib.php:115
-#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:149
-#: libraries/rte/rte_routines.lib.php:158
-#: libraries/rte/rte_routines.lib.php:231
-#: libraries/rte/rte_routines.lib.php:1362
+#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:219
+#: libraries/rte/rte_routines.lib.php:246
+#: libraries/rte/rte_routines.lib.php:368
+#: libraries/rte/rte_routines.lib.php:1453
 #: libraries/rte/rte_triggers.lib.php:82 libraries/rte/rte_triggers.lib.php:91
 #: libraries/rte/rte_triggers.lib.php:123
 #, php-format
@@ -12345,7 +12357,7 @@ msgstr "Хүснэгт %s нь устгагдлаа"
 msgid "Event %1$s has been created."
 msgstr "Хүснэгт %s нь устгагдлаа"
 
-#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:251
+#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:266
 #: libraries/rte/rte_triggers.lib.php:144
 msgid "One or more errors have occurred while processing your request:"
 msgstr ""
@@ -12356,7 +12368,7 @@ msgstr ""
 msgid "Edit event"
 msgstr "Үзэгдэл"
 
-#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:794
+#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:885
 #: libraries/rte/rte_triggers.lib.php:323 view_create.php:180
 msgid "Details"
 msgstr ""
@@ -12371,7 +12383,7 @@ msgstr "Хэрэг явдлын төрөл"
 msgid "Event type"
 msgstr "Хэрэг явдлын төрөл"
 
-#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:817
+#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:908
 #, fuzzy, php-format
 #| msgid "Change"
 msgid "Change to %s"
@@ -12405,12 +12417,14 @@ msgstr "Төгс"
 msgid "On completion preserve"
 msgstr "Оруулалтыг дуусгах"
 
-#: libraries/rte/rte_events.lib.php:491 libraries/rte/rte_routines.lib.php:930
+#: libraries/rte/rte_events.lib.php:491
+#: libraries/rte/rte_routines.lib.php:1021
 #: libraries/rte/rte_triggers.lib.php:383 view_create.php:209
 msgid "Definer"
 msgstr ""
 
-#: libraries/rte/rte_events.lib.php:535 libraries/rte/rte_routines.lib.php:997
+#: libraries/rte/rte_events.lib.php:535
+#: libraries/rte/rte_routines.lib.php:1088
 #: libraries/rte/rte_triggers.lib.php:422
 msgid "The definer must be in the \"username@hostname\" format!"
 msgstr ""
@@ -12438,9 +12452,9 @@ msgid "You must provide an event definition."
 msgstr ""
 
 #: libraries/rte/rte_export.lib.php:43 libraries/rte/rte_general.lib.php:72
-#: libraries/rte/rte_routines.lib.php:345
-#: libraries/rte/rte_routines.lib.php:1198
-#: libraries/rte/rte_routines.lib.php:1411
+#: libraries/rte/rte_routines.lib.php:153
+#: libraries/rte/rte_routines.lib.php:1289
+#: libraries/rte/rte_routines.lib.php:1502
 #, fuzzy
 #| msgid "Processes"
 msgid "Error in processing request:"
@@ -12476,153 +12490,153 @@ msgid ""
 "problems."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:110
-#: libraries/rte/rte_routines.lib.php:1006
+#: libraries/rte/rte_routines.lib.php:123
+msgid "Edit routine"
+msgstr ""
+
+#: libraries/rte/rte_routines.lib.php:200
+#: libraries/rte/rte_routines.lib.php:1097
 #, fuzzy, php-format
 #| msgid "Invalid server index: \"%s\""
 msgid "Invalid routine type: \"%s\""
 msgstr "Сервэрийн буруу индекс нь: \"%s\""
 
-#: libraries/rte/rte_routines.lib.php:170
-msgid "Sorry, we failed to restore the dropped routine."
-msgstr ""
-
-#: libraries/rte/rte_routines.lib.php:211
-#, fuzzy, php-format
-#| msgid "Table %s has been dropped."
-msgid "Routine %1$s has been modified. Privileges have been adjusted."
-msgstr "Хүснэгт %s нь устгагдлаа"
-
-#: libraries/rte/rte_routines.lib.php:216
-#, fuzzy, php-format
-#| msgid "Table %s has been dropped."
-msgid "Routine %1$s has been modified."
-msgstr "Хүснэгт %s нь устгагдлаа"
-
-#: libraries/rte/rte_routines.lib.php:238
+#: libraries/rte/rte_routines.lib.php:253
 #, fuzzy, php-format
 #| msgid "Table %s has been dropped."
 msgid "Routine %1$s has been created."
 msgstr "Хүснэгт %s нь устгагдлаа"
 
-#: libraries/rte/rte_routines.lib.php:315
-msgid "Edit routine"
+#: libraries/rte/rte_routines.lib.php:380
+msgid "Sorry, we failed to restore the dropped routine."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:797
+#: libraries/rte/rte_routines.lib.php:439
+#, fuzzy, php-format
+#| msgid "Table %s has been dropped."
+msgid "Routine %1$s has been modified. Privileges have been adjusted."
+msgstr "Хүснэгт %s нь устгагдлаа"
+
+#: libraries/rte/rte_routines.lib.php:444
+#, fuzzy, php-format
+#| msgid "Table %s has been dropped."
+msgid "Routine %1$s has been modified."
+msgstr "Хүснэгт %s нь устгагдлаа"
+
+#: libraries/rte/rte_routines.lib.php:888
 #, fuzzy
 #| msgid "Column names"
 msgid "Routine name"
 msgstr "Баганын нэрс"
 
-#: libraries/rte/rte_routines.lib.php:823
+#: libraries/rte/rte_routines.lib.php:914
 msgid "Parameters"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:829
+#: libraries/rte/rte_routines.lib.php:920
 #, fuzzy
 #| msgid "Direct links"
 msgid "Direction"
 msgstr "Шууд холбоос"
 
-#: libraries/rte/rte_routines.lib.php:847
+#: libraries/rte/rte_routines.lib.php:938
 #, fuzzy
 #| msgid "Add new field"
 msgid "Add parameter"
 msgstr "Шинэ талбар нэмэх"
 
-#: libraries/rte/rte_routines.lib.php:851
+#: libraries/rte/rte_routines.lib.php:942
 #, fuzzy
 #| msgid "Rename database to"
 msgid "Remove last parameter"
 msgstr "Өгөгдлийн санг д.нэрлэх нь"
 
-#: libraries/rte/rte_routines.lib.php:856
+#: libraries/rte/rte_routines.lib.php:947
 msgid "Return type"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:862
+#: libraries/rte/rte_routines.lib.php:953
 #, fuzzy
 #| msgid "Length/Values"
 msgid "Return length/values"
 msgstr "Урт/Утгууд*"
 
-#: libraries/rte/rte_routines.lib.php:868
+#: libraries/rte/rte_routines.lib.php:959
 #, fuzzy
 #| msgid "Table options"
 msgid "Return options"
 msgstr "Хүснэгтийн сонголтууд"
 
-#: libraries/rte/rte_routines.lib.php:899
+#: libraries/rte/rte_routines.lib.php:990
 msgid "Is deterministic"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:920
+#: libraries/rte/rte_routines.lib.php:1011
 msgid ""
 "You do not have sufficient privileges to perform this operation; Please "
 "refer to the documentation for more details"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:935
+#: libraries/rte/rte_routines.lib.php:1026
 #, fuzzy
 #| msgid "Query type"
 msgid "Security type"
 msgstr "Асуултын төрөл"
 
-#: libraries/rte/rte_routines.lib.php:944
+#: libraries/rte/rte_routines.lib.php:1035
 msgid "SQL data access"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1013
+#: libraries/rte/rte_routines.lib.php:1104
 #, fuzzy
 #| msgid "Invalid table name"
 msgid "You must provide a routine name!"
 msgstr "Хүснэгтийн буруу нэр"
 
-#: libraries/rte/rte_routines.lib.php:1047
+#: libraries/rte/rte_routines.lib.php:1138
 #, php-format
 msgid "Invalid direction \"%s\" given for parameter."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1069
-#: libraries/rte/rte_routines.lib.php:1131
+#: libraries/rte/rte_routines.lib.php:1160
+#: libraries/rte/rte_routines.lib.php:1222
 msgid ""
 "You must provide length/values for routine parameters of type ENUM, SET, "
 "VARCHAR and VARBINARY."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1095
+#: libraries/rte/rte_routines.lib.php:1186
 msgid "You must provide a name and a type for each routine parameter."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1114
+#: libraries/rte/rte_routines.lib.php:1205
 msgid "You must provide a valid return type for the routine."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1174
+#: libraries/rte/rte_routines.lib.php:1265
 msgid "You must provide a routine definition."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1285
+#: libraries/rte/rte_routines.lib.php:1376
 #, fuzzy, php-format
 #| msgid "Allows executing stored routines."
 msgid "Execution results of routine %s"
 msgstr "Хадгалагдсан заншлыг ажиллуулахыг зөвшөөрөх."
 
-#: libraries/rte/rte_routines.lib.php:1340
+#: libraries/rte/rte_routines.lib.php:1431
 #, php-format
 msgid "%d row affected by the last statement inside the procedure."
 msgid_plural "%d rows affected by the last statement inside the procedure."
 msgstr[0] ""
 msgstr[1] ""
 
-#: libraries/rte/rte_routines.lib.php:1398
-#: libraries/rte/rte_routines.lib.php:1406
+#: libraries/rte/rte_routines.lib.php:1489
+#: libraries/rte/rte_routines.lib.php:1497
 msgid "Execute routine"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1485
-#: libraries/rte/rte_routines.lib.php:1488
+#: libraries/rte/rte_routines.lib.php:1576
+#: libraries/rte/rte_routines.lib.php:1579
 msgid "Routine parameters"
 msgstr ""
 
@@ -12816,7 +12830,7 @@ msgid "Original position"
 msgstr "Жинхэнэ байрлал"
 
 #: libraries/server_bin_log.lib.php:133
-#: templates/structure/display_table_stats.phtml:4
+#: templates/table/structure/display_table_stats.phtml:4
 msgid "Information"
 msgstr "Мэдээлэл"
 
@@ -12853,12 +12867,12 @@ msgid ""
 msgstr ""
 "Тэмдэглэл: Вэб сервэр, MySQL-ийн хоорондох өгөгдөл дамжуулах статистик."
 
-#: libraries/server_databases.lib.php:364
-#: libraries/server_databases.lib.php:365
+#: libraries/server_databases.lib.php:366
+#: libraries/server_databases.lib.php:371
 msgid "Enable Statistics"
 msgstr "Нээлттэй статистик"
 
-#: libraries/server_databases.lib.php:481
+#: libraries/server_databases.lib.php:492
 #, fuzzy, php-format
 #| msgid "%s databases have been dropped successfully."
 msgid "%1$d database has been dropped successfully."
@@ -13241,7 +13255,7 @@ msgid "You have revoked the privileges for %s."
 msgstr "Онцгой эрх %s -ыг хүчингүй болголоо."
 
 #: libraries/server_privileges.lib.php:2059
-#: libraries/server_privileges.lib.php:4290
+#: libraries/server_privileges.lib.php:4316
 #, fuzzy
 #| msgid "Any user"
 msgid "Add user account"
@@ -13430,60 +13444,60 @@ msgstr "%s-г устгаж байна"
 msgid "The privileges were reloaded successfully."
 msgstr "Онцгой эрхүүд дахин дуудагдлаа."
 
-#: libraries/server_privileges.lib.php:3994
+#: libraries/server_privileges.lib.php:4003
 #, php-format
 msgid "The user %s already exists!"
 msgstr "Хэрэглэгч %s оршин байна!"
 
-#: libraries/server_privileges.lib.php:4232
+#: libraries/server_privileges.lib.php:4258
 #, fuzzy, php-format
 #| msgid "Privileges"
 msgid "Privileges for %s"
 msgstr "Онцгой эрхүүд"
 
-#: libraries/server_privileges.lib.php:4241
+#: libraries/server_privileges.lib.php:4267
 #: libraries/server_status_processes.lib.php:72
 #: libraries/server_user_groups.lib.php:39
 msgid "User"
 msgstr "Хэрэглэгч"
 
-#: libraries/server_privileges.lib.php:4282
+#: libraries/server_privileges.lib.php:4308
 msgctxt "Create new user"
 msgid "New"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4311
+#: libraries/server_privileges.lib.php:4337
 #, fuzzy
 #| msgid "Edit Privileges"
 msgid "Edit privileges:"
 msgstr "Онцгой эрхүүдийг засах"
 
-#: libraries/server_privileges.lib.php:4312
+#: libraries/server_privileges.lib.php:4338
 #, fuzzy
 #| msgid "User"
 msgid "User account"
 msgstr "Хэрэглэгч"
 
-#: libraries/server_privileges.lib.php:4371
+#: libraries/server_privileges.lib.php:4397
 msgid ""
 "Note: You are attempting to edit privileges of the user with which you are "
 "currently logged in."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4391 libraries/server_users.lib.php:25
+#: libraries/server_privileges.lib.php:4417 libraries/server_users.lib.php:25
 #, fuzzy
 #| msgid "User overview"
 msgid "User accounts overview"
 msgstr "User overview"
 
-#: libraries/server_privileges.lib.php:4459
+#: libraries/server_privileges.lib.php:4485
 msgid ""
 "A user account allowing any user from localhost to connect is present. This "
 "will prevent other users from connecting if the host part of their account "
 "allows a connection from any (%) host."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4500
+#: libraries/server_privileges.lib.php:4526
 #, php-format
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
@@ -13496,7 +13510,7 @@ msgstr ""
 "агуулга нь сервэрт хэрэглэгдэж буйгаас өөр байна. Энэ тохиолдолд %sдахин "
 "дуудаж%s үргэлжлүүлнэ үү."
 
-#: libraries/server_privileges.lib.php:4519
+#: libraries/server_privileges.lib.php:4545
 #, fuzzy
 #| msgid ""
 #| "Note: phpMyAdmin gets the users' privileges directly from MySQL's "
@@ -13515,64 +13529,64 @@ msgstr ""
 "агуулга нь сервэрт хэрэглэгдэж буйгаас өөр байна. Энэ тохиолдолд %sдахин "
 "дуудаж%s үргэлжлүүлнэ үү."
 
-#: libraries/server_privileges.lib.php:4569
+#: libraries/server_privileges.lib.php:4595
 msgid "The selected user was not found in the privilege table."
 msgstr "Сонгогдсон хэрэглэгч онцгой эрхийн хүснэгтэд алга байна."
 
-#: libraries/server_privileges.lib.php:4801
+#: libraries/server_privileges.lib.php:4827
 msgid "You have added a new user."
 msgstr "Шинэ хэрэглэгч нэмэгдлээ."
 
-#: libraries/server_status.lib.php:53
+#: libraries/server_status.lib.php:60
 #, php-format
 msgid "Network traffic since startup: %s"
 msgstr ""
 
-#: libraries/server_status.lib.php:66
+#: libraries/server_status.lib.php:73
 #, fuzzy, php-format
 #| msgid "s MySQL server has been running for %s. It started up on %s."
 msgid "This MySQL server has been running for %1$s. It started up on %2$s."
 msgstr "Энэ MySQL сервэр %s-д ажиллаж байна. Эхэлсэн нь %s."
 
-#: libraries/server_status.lib.php:80
+#: libraries/server_status.lib.php:94
 msgid ""
 "This MySQL server works as <b>master</b> and <b>slave</b> in <b>replication</"
 "b> process."
 msgstr ""
 
-#: libraries/server_status.lib.php:85
+#: libraries/server_status.lib.php:99
 msgid "This MySQL server works as <b>master</b> in <b>replication</b> process."
 msgstr ""
 
-#: libraries/server_status.lib.php:90
+#: libraries/server_status.lib.php:104
 msgid "This MySQL server works as <b>slave</b> in <b>replication</b> process."
 msgstr ""
 
-#: libraries/server_status.lib.php:106
+#: libraries/server_status.lib.php:116
 msgid "Replication status"
 msgstr ""
 
-#: libraries/server_status.lib.php:137
+#: libraries/server_status.lib.php:146
 msgid ""
 "On a busy server, the byte counters may overrun, so those statistics as "
 "reported by the MySQL server may be incorrect."
 msgstr ""
 
-#: libraries/server_status.lib.php:148
+#: libraries/server_status.lib.php:157
 msgid "Received"
 msgstr "Ирсэн"
 
-#: libraries/server_status.lib.php:167
+#: libraries/server_status.lib.php:176
 msgid "Sent"
 msgstr "Илгээгдэв"
 
-#: libraries/server_status.lib.php:234
+#: libraries/server_status.lib.php:243
 #, fuzzy
 #| msgid "max. concurrent connections"
 msgid "Max. concurrent connections"
 msgstr "ХИ. давхацсан холболтууд"
 
-#: libraries/server_status.lib.php:244
+#: libraries/server_status.lib.php:253
 msgid "Failed attempts"
 msgstr "Бүтэлгүйтсэн оролдлого"
 
@@ -14609,7 +14623,7 @@ msgstr ""
 msgid "Not implemented yet."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/AlterOperation.php:193
+#: libraries/sql-parser/src/Components/AlterOperation.php:191
 msgid "Unrecognized alter operation."
 msgstr ""
 
@@ -14623,7 +14637,7 @@ msgid "An opening bracket followed by a set of values was expected."
 msgstr ""
 
 #: libraries/sql-parser/src/Components/ArrayObj.php:101
-#: libraries/sql-parser/src/Components/FieldDefinition.php:202
+#: libraries/sql-parser/src/Components/CreateDefinition.php:202
 msgid "An opening bracket was expected."
 msgstr ""
 
@@ -14631,25 +14645,35 @@ msgstr ""
 msgid "A comma or a closing bracket was expected"
 msgstr ""
 
+#: libraries/sql-parser/src/Components/CreateDefinition.php:246
+#, fuzzy
+#| msgid "No databases selected."
+msgid "A comma or a closing bracket was expected."
+msgstr "ӨС сонгогдоогүй."
+
+#: libraries/sql-parser/src/Components/CreateDefinition.php:262
+msgid "A closing bracket was expected."
+msgstr ""
+
 #: libraries/sql-parser/src/Components/DataType.php:125
 msgid "Unrecognized data type."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:225
+#: libraries/sql-parser/src/Components/Expression.php:227
 msgid "Unexpected closing bracket."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:246
-#: libraries/sql-parser/src/Components/Expression.php:283
-#: libraries/sql-parser/src/Components/Expression.php:303
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:285
+#: libraries/sql-parser/src/Components/Expression.php:305
 msgid "An alias was previously found."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:257
+#: libraries/sql-parser/src/Components/Expression.php:259
 msgid "Unexpected dot."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:327
+#: libraries/sql-parser/src/Components/Expression.php:329
 #, fuzzy
 #| msgid "No databases selected."
 msgid "An alias was expected."
@@ -14661,16 +14685,6 @@ msgstr "ӨС сонгогдоогүй."
 msgid "An expression was expected."
 msgstr "Сонгогдсон мөргүй"
 
-#: libraries/sql-parser/src/Components/FieldDefinition.php:246
-#, fuzzy
-#| msgid "No databases selected."
-msgid "A comma or a closing bracket was expected."
-msgstr "ӨС сонгогдоогүй."
-
-#: libraries/sql-parser/src/Components/FieldDefinition.php:262
-msgid "A closing bracket was expected."
-msgstr ""
-
 #: libraries/sql-parser/src/Components/Limit.php:90
 #: libraries/sql-parser/src/Components/Limit.php:112
 msgid "An offset was expected."
@@ -14712,27 +14726,27 @@ msgstr ""
 msgid "Expected delimiter."
 msgstr ""
 
-#: libraries/sql-parser/src/Lexer.php:753
+#: libraries/sql-parser/src/Lexer.php:777
 #, fuzzy, php-format
 #| msgid "Table %s has been dropped."
 msgid "Ending quote %1$s was expected."
 msgstr "Хүснэгт %s нь устгагдлаа"
 
-#: libraries/sql-parser/src/Lexer.php:789
+#: libraries/sql-parser/src/Lexer.php:813
 msgid "Variable name was expected."
 msgstr ""
 
-#: libraries/sql-parser/src/Parser.php:380
+#: libraries/sql-parser/src/Parser.php:391
 #, fuzzy
 #| msgid "At Beginning of Table"
 msgid "Unexpected beginning of statement."
 msgstr "Хүснэгтийн эхэнд"
 
-#: libraries/sql-parser/src/Parser.php:399
+#: libraries/sql-parser/src/Parser.php:410
 msgid "Unrecognized statement type."
 msgstr ""
 
-#: libraries/sql-parser/src/Parser.php:479
+#: libraries/sql-parser/src/Parser.php:489
 msgid "No transaction was previously started."
 msgstr ""
 
@@ -14758,8 +14772,10 @@ msgid "The name of the entity was expected."
 msgstr ""
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:310
-msgid "At least one field definition was expected."
-msgstr ""
+#, fuzzy
+#| msgid "The row has been deleted."
+msgid "At least one column definition was expected."
+msgstr "Мөр устгагдсан"
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:329
 msgid "A \"RETURNS\" keyword was expected."
@@ -14832,25 +14848,25 @@ msgstr "Тэмдэглэл %s нь үүсгэгдлээ"
 msgid "Using bookmark \"%s\" as default browse query."
 msgstr ""
 
-#: libraries/sql.lib.php:1306
+#: libraries/sql.lib.php:1300
 msgid "Showing as PHP code"
 msgstr "PHP кодоор харуулах"
 
-#: libraries/sql.lib.php:1638
+#: libraries/sql.lib.php:1632
 #, php-format
 msgid ""
 "Current selection does not contain a unique column. Grid edit, checkbox, "
 "Edit, Copy and Delete features are not available. %s"
 msgstr ""
 
-#: libraries/sql.lib.php:1649
+#: libraries/sql.lib.php:1643
 #, php-format
 msgid ""
 "Current selection does not contain a unique column. Grid edit, Edit, Copy "
 "and Delete features may result in undesired behavior. %s"
 msgstr ""
 
-#: libraries/sql.lib.php:1688
+#: libraries/sql.lib.php:1682
 #, php-format
 msgid "Problems with indexes of table `%s`"
 msgstr "Хүснэгт `%s`-ийн индекс асуудалтай"
@@ -15019,7 +15035,7 @@ msgid "Version %s snapshot (SQL code)"
 msgstr ""
 
 #: libraries/tracking.lib.php:947
-#: templates/structure/table_structure_row.phtml:33
+#: templates/table/structure/table_structure_row.phtml:33
 #, fuzzy
 #| msgid "None"
 msgctxt "None for default"
@@ -15074,19 +15090,19 @@ msgstr "Ерөнхий хамаатай онцлог"
 msgid "Version %1$s was created, tracking for %2$s is active."
 msgstr ""
 
-#: libraries/user_preferences.inc.php:29
+#: libraries/user_preferences.inc.php:30
 #, fuzzy
 #| msgid "General relation features"
 msgid "Manage your settings"
 msgstr "Ерөнхий хамаатай онцлог"
 
-#: libraries/user_preferences.inc.php:46 prefs_manage.php:307
+#: libraries/user_preferences.inc.php:54 prefs_manage.php:307
 #, fuzzy
 #| msgid "Modifications have been saved"
 msgid "Configuration has been saved."
 msgstr "Өөрчлөлт хадгалагдав"
 
-#: libraries/user_preferences.inc.php:66
+#: libraries/user_preferences.inc.php:74
 #, php-format
 msgid ""
 "Your preferences will be saved for current session only. Storing them "
@@ -15490,7 +15506,7 @@ msgid "first"
 msgstr ""
 
 #: templates/columns_definitions/move_column.phtml:12
-#: templates/structure/add_column.phtml:21
+#: templates/table/structure/add_column.phtml:21
 #, fuzzy, php-format
 #| msgid "After %s"
 msgid "after %s"
@@ -15577,241 +15593,352 @@ msgstr "Хөтчийн өөрчлөл"
 msgid "Input transformation options"
 msgstr "Өөрчлөлийн сонголтууд"
 
-#: templates/designer/aggregate_query_panel.phtml:22
-#: templates/designer/options_panel.phtml:100
+#: templates/database/create_table.phtml:7
+#: templates/database/designer/side_menu.phtml:77
+#: templates/database/designer/side_menu.phtml:80
+msgid "Create table"
+msgstr "Хүснэгт үүсгэх"
+
+#: templates/database/create_table.phtml:15
+#, fuzzy
+#| msgid "Number of fields"
+msgid "Number of columns"
+msgstr "Талбаруудын тоо"
+
+#: templates/database/designer/aggregate_query_panel.phtml:22
+#: templates/database/designer/options_panel.phtml:100
 #, fuzzy
 #| msgid "Create"
 msgid "Aggregate"
 msgstr "Үүсгэх"
 
-#: templates/designer/aggregate_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:61
-#: templates/designer/options_panel.phtml:106
-#: templates/designer/options_panel.phtml:170
-#: templates/designer/where_query_panel.phtml:30
-#: templates/table/table_header.phtml:9
+#: templates/database/designer/aggregate_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:61
+#: templates/database/designer/options_panel.phtml:106
+#: templates/database/designer/options_panel.phtml:170
+#: templates/database/designer/where_query_panel.phtml:30
+#: templates/table/search/table_header.phtml:9
 msgid "Operator"
 msgstr "Оператор"
 
-#: templates/designer/database_tables.phtml:29
+#: templates/database/designer/database_tables.phtml:29
 msgid "Toggle"
 msgstr ""
 
-#: templates/designer/database_tables.phtml:40
+#: templates/database/designer/database_tables.phtml:40
 #, fuzzy
 #| msgid "Database for user"
 msgid "See table structure"
 msgstr "Хэрэглэгчийн өгөгдлийн сан"
 
-#: templates/designer/delete_relation_panel.phtml:21
+#: templates/database/designer/delete_relation_panel.phtml:21
 msgid "Delete relation"
 msgstr "Холбоог устгах"
 
-#: templates/designer/edit_delete_pages.phtml:7
+#: templates/database/designer/edit_delete_pages.phtml:7
 #, fuzzy
 #| msgid "Page number:"
 msgid "Page to open"
 msgstr "Хуудасны дугаар:"
 
-#: templates/designer/edit_delete_pages.phtml:7
+#: templates/database/designer/edit_delete_pages.phtml:7
 #, fuzzy
 #| msgid "Relation deleted"
 msgid "Page to delete"
 msgstr "Холбоо устав"
 
-#: templates/designer/having_query_panel.phtml:90
-#: templates/designer/options_panel.phtml:63
-#: templates/designer/options_panel.phtml:229
-#: templates/designer/where_query_panel.phtml:59
+#: templates/database/designer/having_query_panel.phtml:90
+#: templates/database/designer/options_panel.phtml:63
+#: templates/database/designer/options_panel.phtml:229
+#: templates/database/designer/where_query_panel.phtml:59
 #, fuzzy
 #| msgid "Export"
 msgid "Except"
 msgstr "Гаргах"
 
-#: templates/designer/having_query_panel.phtml:102
-#: templates/designer/options_panel.phtml:75
-#: templates/designer/options_panel.phtml:241
-#: templates/designer/where_query_panel.phtml:71
+#: templates/database/designer/having_query_panel.phtml:102
+#: templates/database/designer/options_panel.phtml:75
+#: templates/database/designer/options_panel.phtml:241
+#: templates/database/designer/where_query_panel.phtml:71
 #, fuzzy
 #| msgid "in query"
 msgid "subquery"
 msgstr "асуултад"
 
-#: templates/designer/new_relation_panel.phtml:22
-#: templates/designer/side_menu.phtml:84 templates/designer/side_menu.phtml:87
+#: templates/database/designer/new_relation_panel.phtml:22
+#: templates/database/designer/side_menu.phtml:84
+#: templates/database/designer/side_menu.phtml:87
 msgid "Create relation"
 msgstr "Холбоо үүсгэх"
 
-#: templates/designer/options_panel.phtml:34
-#: templates/designer/options_panel.phtml:200
+#: templates/database/designer/options_panel.phtml:34
+#: templates/database/designer/options_panel.phtml:200
 #, fuzzy
 #| msgid "Relation deleted"
 msgid "Relation operator"
 msgstr "Холбоо устав"
 
-#: templates/designer/options_panel.phtml:85
-#: templates/designer/rename_to_panel.phtml:23
+#: templates/database/designer/options_panel.phtml:85
+#: templates/database/designer/rename_to_panel.phtml:23
 #, fuzzy
 #| msgid "Rename table to"
 msgid "Rename to"
 msgstr "Хүснэгтийг да.нэрлэх"
 
-#: templates/designer/options_panel.phtml:91
-#: templates/designer/rename_to_panel.phtml:31
+#: templates/database/designer/options_panel.phtml:91
+#: templates/database/designer/rename_to_panel.phtml:31
 #, fuzzy
 #| msgid "User name"
 msgid "New name"
 msgstr "Хэрэглэгчийн нэр"
 
-#: templates/designer/page_save_as.phtml:4
+#: templates/database/designer/page_save_as.phtml:4
 #, fuzzy
 #| msgid "Export/Import to scale"
 msgid "Save to selected page"
 msgstr "Гаргах/Оруулах хэмжээс"
 
-#: templates/designer/page_save_as.phtml:5
+#: templates/database/designer/page_save_as.phtml:5
 #, fuzzy
 #| msgid "Create a new index"
 msgid "Create a page and save to it"
 msgstr "Шинэ индекс үүсгэх"
 
-#: templates/designer/page_save_as.phtml:26
+#: templates/database/designer/page_save_as.phtml:26
 #, fuzzy
 #| msgid "User name"
 msgid "New page name"
 msgstr "Хэрэглэгчийн нэр"
 
-#: templates/designer/page_selector.phtml:2
+#: templates/database/designer/page_selector.phtml:2
 #, fuzzy
 #| msgid "Select All"
 msgid "Select page"
 msgstr "Бүгдийг сонгох"
 
-#: templates/designer/query_details.phtml:10
+#: templates/database/designer/query_details.phtml:10
 #, fuzzy
 #| msgid "Table options"
 msgid "Active options"
 msgstr "Хүснэгтийн сонголтууд"
 
-#: templates/designer/schema_export.phtml:4
+#: templates/database/designer/schema_export.phtml:4
 msgid "Select Export Relational Type"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:19 templates/designer/side_menu.phtml:25
+#: templates/database/designer/side_menu.phtml:19
+#: templates/database/designer/side_menu.phtml:25
 #, fuzzy
 #| msgid "Show tables"
 msgid "Show/Hide tables list"
 msgstr "Хүснэгтүүдийг харуулах"
 
-#: templates/designer/side_menu.phtml:29 templates/designer/side_menu.phtml:35
-#: templates/designer/side_menu.phtml:36
+#: templates/database/designer/side_menu.phtml:29
+#: templates/database/designer/side_menu.phtml:35
+#: templates/database/designer/side_menu.phtml:36
 msgid "View in fullscreen"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:34
+#: templates/database/designer/side_menu.phtml:34
 msgid "Exit fullscreen"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:41 templates/designer/side_menu.phtml:45
+#: templates/database/designer/side_menu.phtml:41
+#: templates/database/designer/side_menu.phtml:45
 #, fuzzy
 #| msgid "User name"
 msgid "New page"
 msgstr "Хэрэглэгчийн нэр"
 
-#: templates/designer/side_menu.phtml:70 templates/designer/side_menu.phtml:73
+#: templates/database/designer/side_menu.phtml:70
+#: templates/database/designer/side_menu.phtml:73
 #, fuzzy
 #| msgid "Select All"
 msgid "Delete pages"
 msgstr "Бүгдийг сонгох"
 
-#: templates/designer/side_menu.phtml:77 templates/designer/side_menu.phtml:80
-#: templates/table/create_table.phtml:7
-msgid "Create table"
-msgstr "Хүснэгт үүсгэх"
-
-#: templates/designer/side_menu.phtml:98
-#: templates/designer/side_menu.phtml:101
+#: templates/database/designer/side_menu.phtml:98
+#: templates/database/designer/side_menu.phtml:101
 msgid "Reload"
 msgstr "Да.дууд"
 
-#: templates/designer/side_menu.phtml:107
-#: templates/designer/side_menu.phtml:110
+#: templates/database/designer/side_menu.phtml:107
+#: templates/database/designer/side_menu.phtml:110
 msgid "Help"
 msgstr "Тусламж"
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Angular links"
 msgstr "Шууд бус холбоос"
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Direct links"
 msgstr "Шууд холбоос"
 
-#: templates/designer/side_menu.phtml:122
-#: templates/designer/side_menu.phtml:124
+#: templates/database/designer/side_menu.phtml:122
+#: templates/database/designer/side_menu.phtml:124
 msgid "Snap to grid"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:128
-#: templates/designer/side_menu.phtml:134
+#: templates/database/designer/side_menu.phtml:128
+#: templates/database/designer/side_menu.phtml:134
 msgid "Small/Big All"
 msgstr "Жижиш/Том Бүгдийг"
 
-#: templates/designer/side_menu.phtml:138
-#: templates/designer/side_menu.phtml:141
+#: templates/database/designer/side_menu.phtml:138
+#: templates/database/designer/side_menu.phtml:141
 msgid "Toggle small/big"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:145
-#: templates/designer/side_menu.phtml:148
+#: templates/database/designer/side_menu.phtml:145
+#: templates/database/designer/side_menu.phtml:148
 #, fuzzy
 #| msgid "To select relation, click :"
 msgid "Toggle relation lines"
 msgstr "Холбоо сонгохдоо, дарах нь :"
 
-#: templates/designer/side_menu.phtml:153
-#: templates/designer/side_menu.phtml:156
+#: templates/database/designer/side_menu.phtml:153
+#: templates/database/designer/side_menu.phtml:156
 #, fuzzy
 #| msgid "Export"
 msgid "Export schema"
 msgstr "Гаргах"
 
-#: templates/designer/side_menu.phtml:165
-#: templates/designer/side_menu.phtml:168
+#: templates/database/designer/side_menu.phtml:165
+#: templates/database/designer/side_menu.phtml:168
 #, fuzzy
 #| msgid "Submit Query"
 msgid "Build Query"
 msgstr "Асуултыг илгээх"
 
-#: templates/designer/side_menu.phtml:173
-#: templates/designer/side_menu.phtml:177
+#: templates/database/designer/side_menu.phtml:173
+#: templates/database/designer/side_menu.phtml:177
 msgid "Move Menu"
 msgstr "Цэс зөөх"
 
-#: templates/designer/side_menu.phtml:181
-#: templates/designer/side_menu.phtml:186
+#: templates/database/designer/side_menu.phtml:181
+#: templates/database/designer/side_menu.phtml:186
 #, fuzzy
 #| msgid "Partial Texts"
 msgid "Pin text"
 msgstr "Бичвэрийн зарим хэсэг"
 
-#: templates/designer/table_list.phtml:4
+#: templates/database/designer/table_list.phtml:4
 msgid "Hide/Show all"
 msgstr "Нуух/Харуулах бүгдийг"
 
-#: templates/designer/table_list.phtml:14
+#: templates/database/designer/table_list.phtml:14
 msgid "Hide/Show Tables with no relation"
 msgstr "Нуух/Харуулах Холбоо байхгүй Хүснэгтүүд"
 
-#: templates/designer/table_list.phtml:59
+#: templates/database/designer/table_list.phtml:59
 #, fuzzy
 #| msgid "Number of tables"
 msgid "Number of tables:"
 msgstr "Хүснэгтийн тоо"
 
+#: templates/database/structure/body_for_table_summary.phtml:6
+#, php-format
+msgid "%s table"
+msgid_plural "%s tables"
+msgstr[0] "%s хүснэгт"
+msgstr[1] "%s хүснэгтүүд"
+
+#: templates/database/structure/body_for_table_summary.phtml:17
+msgid "Sum"
+msgstr "Нийт"
+
+#: templates/database/structure/check_all_tables.phtml:6
+msgid "Check tables having overhead"
+msgstr "Дээдхийг шалгах"
+
+#: templates/database/structure/check_all_tables.phtml:10
+#, fuzzy
+#| msgid "Show color"
+msgid "Show create"
+msgstr "Өнгө харах"
+
+#: templates/database/structure/check_all_tables.phtml:27
+#, fuzzy
+#| msgid "Add new field"
+msgid "Prefix"
+msgstr "Шинэ талбар нэмэх"
+
+#: templates/database/structure/check_all_tables.phtml:28
+msgid "Add prefix to table"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:29
+#, fuzzy
+#| msgid "Replace table data with file"
+msgid "Replace table prefix"
+msgstr "Хүснэгтийн өгөгдлийг орлуулах файл"
+
+#: templates/database/structure/check_all_tables.phtml:30
+#, fuzzy
+#| msgid "Replace table data with file"
+msgid "Copy table with prefix"
+msgstr "Хүснэгтийн өгөгдлийг орлуулах файл"
+
+#: templates/database/structure/check_all_tables.phtml:36
+#, fuzzy
+#| msgid "Add %s field(s)"
+msgid "Add columns to central list"
+msgstr "%s талбар(ууд) нэмэх"
+
+#: templates/database/structure/check_all_tables.phtml:37
+msgid "Remove columns from central list"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:38
+#, fuzzy
+#| msgid "Add %s field(s)"
+msgid "Make consistent with central list"
+msgstr "%s талбар(ууд) нэмэх"
+
+#: templates/database/structure/favorite_anchor.phtml:12
+#, fuzzy
+#| msgid "Add a new User"
+msgid "Add to Favorites"
+msgstr "Шинэ хэрэглэгч нэмэх"
+
+#: templates/database/structure/show_create.phtml:2
+#, fuzzy
+#| msgid "Showing SQL query"
+msgid "Showing create queries"
+msgstr "SQL асуудал харуулах"
+
+#: templates/database/structure/sortable_header.phtml:13
+msgid "Sort"
+msgstr "Эрэмбэлэх"
+
+#: templates/database/structure/table_header.phtml:42
+msgid ""
+"May be approximate. Click on the number to get the exact count. See "
+"[doc@faq3-11]FAQ 3.11[/doc]."
+msgstr ""
+
+#: templates/database/structure/table_header.phtml:66
+#: templates/table/index_form.phtml:127
+msgid "Size"
+msgstr "Хэмжээ"
+
+#: templates/database/structure/table_header.phtml:74
+#: templates/table/structure/display_table_stats.phtml:27
+msgid "Overhead"
+msgstr "Толгой дээр"
+
+#: templates/database/structure/tracking_icon.phtml:4
+msgid "Tracking is active."
+msgstr ""
+
+#: templates/database/structure/tracking_icon.phtml:8
+msgid "Tracking is not active."
+msgstr ""
+
 #: templates/error/report_form.phtml:7
 msgid ""
 "phpMyAdmin has encountered an error. We have collected data about this error "
@@ -15827,70 +15954,6 @@ msgstr ""
 msgid "Please explain the steps that lead to the error:"
 msgstr ""
 
-#: templates/gis_visualization/gis_visualization.phtml:3
-msgid "Display GIS Visualization"
-msgstr ""
-
-#: templates/gis_visualization/gis_visualization.phtml:8
-#, fuzzy
-#| msgid "Add/Delete Field Columns"
-msgid "Label column"
-msgstr "Багана нэмэх/устгах"
-
-#: templates/gis_visualization/gis_visualization.phtml:11
-msgid "-- None --"
-msgstr ""
-
-#: templates/gis_visualization/gis_visualization.phtml:19
-#, fuzzy
-#| msgid "Total"
-msgid "Spatial column"
-msgstr "Нийт"
-
-#: templates/index_form.phtml:16
-msgid "Index name:"
-msgstr "Индексийн нэр&nbsp;:"
-
-#: templates/index_form.phtml:19
-msgid ""
-"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
-msgstr ""
-"\"PRIMARY\" нь үндсэн түлхүүрийн нэр ба <b>зөвхөн</b> байх <b>хэрэгтэй</b>!"
-
-#: templates/index_form.phtml:40
-#, fuzzy
-#| msgid "Index name:"
-msgid "Index choice:"
-msgstr "Индексийн нэр&nbsp;:"
-
-#: templates/index_form.phtml:57
-msgid "Key block size:"
-msgstr ""
-
-#: templates/index_form.phtml:74
-msgid "Index type:"
-msgstr "Индексийн төрөл&nbsp;:"
-
-#: templates/index_form.phtml:86
-#, fuzzy
-#| msgid "User"
-msgid "Parser:"
-msgstr "Хэрэглэгч"
-
-#: templates/index_form.phtml:102
-#, fuzzy
-#| msgid "Comments"
-msgid "Comment:"
-msgstr "Тайлбар"
-
-#: templates/index_form.phtml:127 templates/structure/table_header.phtml:66
-msgid "Size"
-msgstr "Хэмжээ"
-
-#: templates/index_form.phtml:149 templates/index_form.phtml:190
-msgid "Drag to reorder"
-msgstr ""
-
 #: templates/prefs_autoload.phtml:9
 msgid ""
 "Your browser has phpMyAdmin configuration for this domain. Would you like to "
@@ -15903,493 +15966,453 @@ msgstr ""
 msgid "Start row:"
 msgstr "Мөрүүдийг харуулж байна "
 
-#: templates/structure/actions_in_table_structure.phtml:14
-#, php-format
-msgid "A primary key has been added on %s."
-msgstr "%s-д үндсэн түлхүүр нэмэгдлээ."
-
-#: templates/structure/actions_in_table_structure.phtml:34
-#: templates/structure/actions_in_table_structure.phtml:54
-#: templates/structure/actions_in_table_structure.phtml:79
-#: templates/structure/actions_in_table_structure.phtml:101
-#, php-format
-msgid "An index has been added on %s."
-msgstr "%s-д индекс нэмэгдсэн байна."
-
-#: templates/structure/actions_in_table_structure.phtml:130
-#: templates/structure/check_all_table_column.phtml:59
-#, fuzzy
-#| msgid "Rename database to"
-msgid "Remove from central columns"
-msgstr "Өгөгдлийн санг д.нэрлэх нь"
-
-#: templates/structure/actions_in_table_structure.phtml:138
-#: templates/structure/check_all_table_column.phtml:55
-#, fuzzy
-#| msgid "Add %s field(s)"
-msgid "Add to central columns"
-msgstr "%s талбар(ууд) нэмэх"
-
-#: templates/structure/add_column.phtml:7
-#, fuzzy, php-format
-#| msgid "Add %s field(s)"
-msgid "Add %s column(s)"
-msgstr "%s талбар(ууд) нэмэх"
-
-#: templates/structure/add_column.phtml:12
-#, fuzzy
-#| msgid "At Beginning of Table"
-msgid "at beginning of table"
-msgstr "Хүснэгтийн эхэнд"
-
-#: templates/structure/body_for_table_summary.phtml:6
-#, php-format
-msgid "%s table"
-msgid_plural "%s tables"
-msgstr[0] "%s хүснэгт"
-msgstr[1] "%s хүснэгтүүд"
-
-#: templates/structure/body_for_table_summary.phtml:17
-msgid "Sum"
-msgstr "Нийт"
-
-#: templates/structure/check_all_tables.phtml:6
-msgid "Check tables having overhead"
-msgstr "Дээдхийг шалгах"
-
-#: templates/structure/check_all_tables.phtml:10
-#, fuzzy
-#| msgid "Show color"
-msgid "Show create"
-msgstr "Өнгө харах"
-
-#: templates/structure/check_all_tables.phtml:27
-#, fuzzy
-#| msgid "Add new field"
-msgid "Prefix"
-msgstr "Шинэ талбар нэмэх"
-
-#: templates/structure/check_all_tables.phtml:28
-msgid "Add prefix to table"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:29
-#, fuzzy
-#| msgid "Replace table data with file"
-msgid "Replace table prefix"
-msgstr "Хүснэгтийн өгөгдлийг орлуулах файл"
-
-#: templates/structure/check_all_tables.phtml:30
-#, fuzzy
-#| msgid "Replace table data with file"
-msgid "Copy table with prefix"
-msgstr "Хүснэгтийн өгөгдлийг орлуулах файл"
-
-#: templates/structure/check_all_tables.phtml:36
-#, fuzzy
-#| msgid "Add %s field(s)"
-msgid "Add columns to central list"
-msgstr "%s талбар(ууд) нэмэх"
-
-#: templates/structure/check_all_tables.phtml:37
-msgid "Remove columns from central list"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:38
-#, fuzzy
-#| msgid "Add %s field(s)"
-msgid "Make consistent with central list"
-msgstr "%s талбар(ууд) нэмэх"
-
-#: templates/structure/display_structure.phtml:140 view_create.php:181
-#, fuzzy
-#| msgid "Print view"
-msgid "Edit view"
-msgstr "Хэвлэхээр харах"
-
-#: templates/structure/display_table_stats.phtml:9
-msgid "Space usage"
-msgstr "Ашиглалтын зай"
-
-#: templates/structure/display_table_stats.phtml:27
-#: templates/structure/table_header.phtml:74
-msgid "Overhead"
-msgstr "Толгой дээр"
-
-#: templates/structure/display_table_stats.phtml:32
-msgid "Effective"
-msgstr "Эффекттэй"
-
-#: templates/structure/favorite_anchor.phtml:12
-#, fuzzy
-#| msgid "Add a new User"
-msgid "Add to Favorites"
-msgstr "Шинэ хэрэглэгч нэмэх"
-
-#: templates/structure/move_columns_dialog.phtml:1
-#: templates/structure/optional_action_links.phtml:21
-#, fuzzy
-#| msgid "Add %s field(s)"
-msgid "Move columns"
-msgstr "%s талбар(ууд) нэмэх"
-
-#: templates/structure/move_columns_dialog.phtml:2
-msgid "Move the columns by dragging them up and down."
-msgstr ""
-
-#: templates/structure/optional_action_links.phtml:9
-msgid "Propose table structure"
-msgstr "Хүснэгтийн бүтцийг таниулах"
-
-#: templates/structure/optional_action_links.phtml:24
-#, fuzzy
-#| msgid "Propose table structure"
-msgid "Improve table structure"
-msgstr "Хүснэгтийн бүтцийг таниулах"
-
-#: templates/structure/optional_action_links.phtml:30
-#, fuzzy
-#| msgid "Track table"
-msgid "Track view"
-msgstr "Хүснэгтийг хөөх"
-
-#: templates/structure/row_stats_table.phtml:3
-#, fuzzy
-#| msgid "Row Statistics"
-msgid "Row statistics"
-msgstr "Мөрийн статистик"
-
-#: templates/structure/row_stats_table.phtml:9
-msgid "static"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:11
-msgid "dynamic"
-msgstr "динамик"
-
-#: templates/structure/row_stats_table.phtml:22
-msgid "partitioned"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:54
-msgid "Row length"
-msgstr "Мөрийн урт"
-
-#: templates/structure/row_stats_table.phtml:66
-msgid "Row size"
-msgstr "Мөрийн хэмжээ"
-
-#: templates/structure/row_stats_table.phtml:73
-msgid "Next autoindex"
-msgstr ""
-
-#: templates/structure/secondary_tabs.phtml:14
-#, fuzzy
-#| msgid "Relation view"
-msgid "Relation view"
-msgstr "Хамаарал харах"
-
-#: templates/structure/show_create.phtml:2
-#, fuzzy
-#| msgid "Showing SQL query"
-msgid "Showing create queries"
-msgstr "SQL асуудал харуулах"
-
-#: templates/structure/sortable_header.phtml:13
-msgid "Sort"
-msgstr "Эрэмбэлэх"
-
-#: templates/structure/table_header.phtml:42
-msgid ""
-"May be approximate. Click on the number to get the exact count. See "
-"[doc@faq3-11]FAQ 3.11[/doc]."
-msgstr ""
-
-#: templates/structure/table_structure_row.phtml:46
-#, fuzzy, php-format
-#| msgid "Table %s has been dropped."
-msgid "Column %s has been dropped."
-msgstr "Хүснэгт %s нь устгагдлаа"
-
-#: templates/structure/tracking_icon.phtml:4
-msgid "Tracking is active."
-msgstr ""
-
-#: templates/structure/tracking_icon.phtml:8
-msgid "Tracking is not active."
-msgstr ""
-
-#: templates/table/create_table.phtml:15
-#, fuzzy
-#| msgid "Number of fields"
-msgid "Number of columns"
-msgstr "Талбаруудын тоо"
-
-#: templates/table/options.phtml:8
-#, fuzzy
-#| msgid "Select fields (at least one):"
-msgid "Select columns (at least one):"
-msgstr "Талбар сонгох (ядаж нэгийг):"
-
-#: templates/table/options.phtml:37
-msgid "Add search conditions (body of the \"where\" clause):"
-msgstr "Хайлтын нөхцөл нэмэх(\"where\" хэсгийн бие):"
-
-#: templates/table/options.phtml:45
-msgid "Number of rows per page"
-msgstr "Хуудас дахь мөрийн тоо"
-
-#: templates/table/options.phtml:56
-msgid "Display order:"
-msgstr "Харуулах эрэмбэ:"
-
-#: templates/table/options_zoom.phtml:6
-msgid "Use this column to label each point"
-msgstr ""
-
-#: templates/table/options_zoom.phtml:35
-msgid "Maximum rows to plot"
-msgstr ""
-
-#: templates/table/replace_preview.phtml:13
-msgid "Find and replace - preview"
-msgstr ""
-
-#: templates/table/replace_preview.phtml:18
-#, fuzzy
-#| msgid "Original position"
-msgid "Original string"
-msgstr "Жинхэнэ байрлал"
-
-#: templates/table/replace_preview.phtml:19
-#, fuzzy
-#| msgid "Relations"
-msgid "Replaced string"
-msgstr "Хамаарал"
-
-#: templates/table/replace_preview.phtml:40
-#, fuzzy
-#| msgid "Replication"
-msgid "Replace"
-msgstr "Олшруулалт"
-
-#: templates/table/rows_zoom.phtml:16
-#, fuzzy
-#| msgid "in query"
-msgid "Additional search criteria"
-msgstr "асуултад"
-
-#: templates/table/search_and_replace.phtml:3
-#, fuzzy
-#| msgid "Replace NULL by"
-msgid "Replace with:"
-msgstr "NULL-ыг орлуулах нь"
-
-#: templates/table/search_and_replace.phtml:22
-msgid "Use regular expression"
-msgstr ""
-
-#: templates/table/selection_form.phtml:12
-#, fuzzy
-#| msgid "Do a \"query by example\" (wildcard: \"%\")"
-msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
-msgstr "\"жишээ асуулт\" хийх (тэмдэгт: \"%\")"
-
-#: templates/table/selection_form.phtml:34
-msgid "Do a \"query by example\" (wildcard: \"%\")"
-msgstr "\"жишээ асуулт\" хийх (тэмдэгт: \"%\")"
-
-#: templates/table/zoom_result_form.phtml:7
-msgid "Browse/Edit the points"
-msgstr ""
-
-#: templates/table/zoom_result_form.phtml:15
-msgid "How to use"
-msgstr ""
-
-#: templates/table/zoom_result_form.phtml:23
-#, fuzzy
-#| msgid "Reset"
-msgid "Reset zoom"
-msgstr "Да.эхлэх"
-
-#: templates/tbl_chart.phtml:17
+#: templates/table/chart/tbl_chart.phtml:17
 #, fuzzy
 #| msgid "Mar"
 msgctxt "Chart type"
 msgid "Bar"
 msgstr "3-р"
 
-#: templates/tbl_chart.phtml:21
+#: templates/table/chart/tbl_chart.phtml:21
 #, fuzzy
 #| msgid "Column names"
 msgctxt "Chart type"
 msgid "Column"
 msgstr "Баганын нэрс"
 
-#: templates/tbl_chart.phtml:25
+#: templates/table/chart/tbl_chart.phtml:25
 msgctxt "Chart type"
 msgid "Line"
 msgstr ""
 
-#: templates/tbl_chart.phtml:29
+#: templates/table/chart/tbl_chart.phtml:29
 #, fuzzy
 #| msgid "Engines"
 msgctxt "Chart type"
 msgid "Spline"
 msgstr "Хөдөлгүүрүүд"
 
-#: templates/tbl_chart.phtml:33
+#: templates/table/chart/tbl_chart.phtml:33
 msgctxt "Chart type"
 msgid "Area"
 msgstr ""
 
-#: templates/tbl_chart.phtml:37
+#: templates/table/chart/tbl_chart.phtml:37
 #, fuzzy
 #| msgid "PiB"
 msgctxt "Chart type"
 msgid "Pie"
 msgstr "PB"
 
-#: templates/tbl_chart.phtml:41
+#: templates/table/chart/tbl_chart.phtml:41
 #, fuzzy
 #| msgid "Time"
 msgctxt "Chart type"
 msgid "Timeline"
 msgstr "Цаг"
 
-#: templates/tbl_chart.phtml:45
+#: templates/table/chart/tbl_chart.phtml:45
 msgctxt "Chart type"
 msgid "Scatter"
 msgstr ""
 
-#: templates/tbl_chart.phtml:50
+#: templates/table/chart/tbl_chart.phtml:50
 msgid "Stacked"
 msgstr ""
 
-#: templates/tbl_chart.phtml:53
+#: templates/table/chart/tbl_chart.phtml:53
 #, fuzzy
 #| msgid "Report title"
 msgid "Chart title"
 msgstr "Тайлангийн гарчиг"
 
-#: templates/tbl_chart.phtml:57
+#: templates/table/chart/tbl_chart.phtml:57
 msgid "X-Axis:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:72
+#: templates/table/chart/tbl_chart.phtml:72
 msgid "Series:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:102
+#: templates/table/chart/tbl_chart.phtml:102
 msgid "X-Axis label:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:104
+#: templates/table/chart/tbl_chart.phtml:104
 #, fuzzy
 #| msgid "Value"
 msgid "X Values"
 msgstr "Утга"
 
-#: templates/tbl_chart.phtml:107
+#: templates/table/chart/tbl_chart.phtml:107
 msgid "Y-Axis label:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:115
+#: templates/table/chart/tbl_chart.phtml:115
 msgid "Series names are in a column"
 msgstr ""
 
-#: templates/tbl_chart.phtml:118
+#: templates/table/chart/tbl_chart.phtml:118
 #, fuzzy
 #| msgid "Inside table(s):"
 msgid "Series column:"
 msgstr "Хүснэгт(үүд) дотор:"
 
-#: templates/tbl_chart.phtml:130
+#: templates/table/chart/tbl_chart.phtml:130
 #, fuzzy
 #| msgid "Number of fields"
 msgid "Value Column:"
 msgstr "Талбаруудын тоо"
 
-#: templates/tbl_chart.phtml:150
+#: templates/table/chart/tbl_chart.phtml:150
 #, fuzzy
 #| msgid "Save as file"
 msgid "Save chart as image"
 msgstr "Илгээх"
 
-#: templates/tbl_relation/common_form.phtml:7
+#: templates/table/gis_visualization/gis_visualization.phtml:3
+msgid "Display GIS Visualization"
+msgstr ""
+
+#: templates/table/gis_visualization/gis_visualization.phtml:8
+#, fuzzy
+#| msgid "Add/Delete Field Columns"
+msgid "Label column"
+msgstr "Багана нэмэх/устгах"
+
+#: templates/table/gis_visualization/gis_visualization.phtml:11
+msgid "-- None --"
+msgstr ""
+
+#: templates/table/gis_visualization/gis_visualization.phtml:19
+#, fuzzy
+#| msgid "Total"
+msgid "Spatial column"
+msgstr "Нийт"
+
+#: templates/table/index_form.phtml:16
+msgid "Index name:"
+msgstr "Индексийн нэр&nbsp;:"
+
+#: templates/table/index_form.phtml:19
+msgid ""
+"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
+msgstr ""
+"\"PRIMARY\" нь үндсэн түлхүүрийн нэр ба <b>зөвхөн</b> байх <b>хэрэгтэй</b>!"
+
+#: templates/table/index_form.phtml:40
+#, fuzzy
+#| msgid "Index name:"
+msgid "Index choice:"
+msgstr "Индексийн нэр&nbsp;:"
+
+#: templates/table/index_form.phtml:57
+msgid "Key block size:"
+msgstr ""
+
+#: templates/table/index_form.phtml:74
+msgid "Index type:"
+msgstr "Индексийн төрөл&nbsp;:"
+
+#: templates/table/index_form.phtml:86
+#, fuzzy
+#| msgid "User"
+msgid "Parser:"
+msgstr "Хэрэглэгч"
+
+#: templates/table/index_form.phtml:102
+#, fuzzy
+#| msgid "Comments"
+msgid "Comment:"
+msgstr "Тайлбар"
+
+#: templates/table/index_form.phtml:149 templates/table/index_form.phtml:190
+msgid "Drag to reorder"
+msgstr ""
+
+#: templates/table/relation/common_form.phtml:7
 msgid "Internal relations"
 msgstr "Дотоод хамаарал"
 
-#: templates/tbl_relation/common_form.phtml:11
+#: templates/table/relation/common_form.phtml:11
 #, fuzzy
 #| msgid "Internal relations"
 msgid "Internal relation"
 msgstr "Дотоод хамаарал"
 
-#: templates/tbl_relation/common_form.phtml:14
+#: templates/table/relation/common_form.phtml:14
 msgid ""
 "An internal relation is not necessary when a corresponding FOREIGN KEY "
 "relation exists."
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:37
+#: templates/table/relation/common_form.phtml:37
 #, fuzzy
 #| msgid "Disable foreign key checks"
 msgid "Foreign key constraints"
 msgstr "Гадаад түлхүүр шалгалтыг хаах"
 
-#: templates/tbl_relation/common_form.phtml:40
+#: templates/table/relation/common_form.phtml:40
 #, fuzzy
 #| msgid "Action"
 msgid "Actions"
 msgstr "Үйлдэл"
 
-#: templates/tbl_relation/common_form.phtml:41
+#: templates/table/relation/common_form.phtml:41
 #, fuzzy
 #| msgid "Constraints for dumped tables"
 msgid "Constraint properties"
 msgstr "Асгарсан хүснэгтийг хүчлэх"
 
-#: templates/tbl_relation/common_form.phtml:44
+#: templates/table/relation/common_form.phtml:44
 msgid ""
 "Only columns with index will be displayed. You can define an index below."
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:49
+#: templates/table/relation/common_form.phtml:49
 msgid "Foreign key constraint"
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:81
+#: templates/table/relation/common_form.phtml:81
 #, fuzzy
 #| msgid "Add constraints"
 msgid "+ Add constraint"
 msgstr "Тогтмол нэмэх"
 
-#: templates/tbl_relation/common_form.phtml:91
+#: templates/table/relation/common_form.phtml:91
 #, fuzzy
 #| msgid "Choose field to display"
 msgid "Choose column to display:"
 msgstr "Харуулах талбарыг соль"
 
-#: templates/tbl_relation/foreign_key_row.phtml:13
+#: templates/table/relation/foreign_key_row.phtml:13
 #, fuzzy, php-format
 #| msgid "Disable foreign key checks"
 msgid "Foreign key constraint %s has been dropped"
 msgstr "Гадаад түлхүүр шалгалтыг хаах"
 
-#: templates/tbl_relation/foreign_key_row.phtml:102
+#: templates/table/relation/foreign_key_row.phtml:102
 #, fuzzy
 #| msgid "Column names"
 msgid "Constraint name"
 msgstr "Баганын нэрс"
 
-#: templates/tbl_relation/foreign_key_row.phtml:157
+#: templates/table/relation/foreign_key_row.phtml:157
 #, fuzzy
 #| msgid "Add %s field(s)"
 msgid "+ Add column"
 msgstr "%s талбар(ууд) нэмэх"
 
+#: templates/table/search/options.phtml:8
+#, fuzzy
+#| msgid "Select fields (at least one):"
+msgid "Select columns (at least one):"
+msgstr "Талбар сонгох (ядаж нэгийг):"
+
+#: templates/table/search/options.phtml:37
+msgid "Add search conditions (body of the \"where\" clause):"
+msgstr "Хайлтын нөхцөл нэмэх(\"where\" хэсгийн бие):"
+
+#: templates/table/search/options.phtml:45
+msgid "Number of rows per page"
+msgstr "Хуудас дахь мөрийн тоо"
+
+#: templates/table/search/options.phtml:56
+msgid "Display order:"
+msgstr "Харуулах эрэмбэ:"
+
+#: templates/table/search/options_zoom.phtml:6
+msgid "Use this column to label each point"
+msgstr ""
+
+#: templates/table/search/options_zoom.phtml:35
+msgid "Maximum rows to plot"
+msgstr ""
+
+#: templates/table/search/replace_preview.phtml:13
+msgid "Find and replace - preview"
+msgstr ""
+
+#: templates/table/search/replace_preview.phtml:18
+#, fuzzy
+#| msgid "Original position"
+msgid "Original string"
+msgstr "Жинхэнэ байрлал"
+
+#: templates/table/search/replace_preview.phtml:19
+#, fuzzy
+#| msgid "Relations"
+msgid "Replaced string"
+msgstr "Хамаарал"
+
+#: templates/table/search/replace_preview.phtml:40
+#, fuzzy
+#| msgid "Replication"
+msgid "Replace"
+msgstr "Олшруулалт"
+
+#: templates/table/search/rows_zoom.phtml:16
+#, fuzzy
+#| msgid "in query"
+msgid "Additional search criteria"
+msgstr "асуултад"
+
+#: templates/table/search/search_and_replace.phtml:3
+#, fuzzy
+#| msgid "Replace NULL by"
+msgid "Replace with:"
+msgstr "NULL-ыг орлуулах нь"
+
+#: templates/table/search/search_and_replace.phtml:22
+msgid "Use regular expression"
+msgstr ""
+
+#: templates/table/search/selection_form.phtml:12
+#, fuzzy
+#| msgid "Do a \"query by example\" (wildcard: \"%\")"
+msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
+msgstr "\"жишээ асуулт\" хийх (тэмдэгт: \"%\")"
+
+#: templates/table/search/selection_form.phtml:34
+msgid "Do a \"query by example\" (wildcard: \"%\")"
+msgstr "\"жишээ асуулт\" хийх (тэмдэгт: \"%\")"
+
+#: templates/table/search/zoom_result_form.phtml:7
+msgid "Browse/Edit the points"
+msgstr ""
+
+#: templates/table/search/zoom_result_form.phtml:15
+msgid "How to use"
+msgstr ""
+
+#: templates/table/search/zoom_result_form.phtml:23
+#, fuzzy
+#| msgid "Reset"
+msgid "Reset zoom"
+msgstr "Да.эхлэх"
+
+#: templates/table/secondary_tabs.phtml:14
+#, fuzzy
+#| msgid "Relation view"
+msgid "Relation view"
+msgstr "Хамаарал харах"
+
+#: templates/table/structure/actions_in_table_structure.phtml:14
+#, php-format
+msgid "A primary key has been added on %s."
+msgstr "%s-д үндсэн түлхүүр нэмэгдлээ."
+
+#: templates/table/structure/actions_in_table_structure.phtml:34
+#: templates/table/structure/actions_in_table_structure.phtml:54
+#: templates/table/structure/actions_in_table_structure.phtml:79
+#: templates/table/structure/actions_in_table_structure.phtml:101
+#, php-format
+msgid "An index has been added on %s."
+msgstr "%s-д индекс нэмэгдсэн байна."
+
+#: templates/table/structure/actions_in_table_structure.phtml:130
+#: templates/table/structure/check_all_table_column.phtml:59
+#, fuzzy
+#| msgid "Rename database to"
+msgid "Remove from central columns"
+msgstr "Өгөгдлийн санг д.нэрлэх нь"
+
+#: templates/table/structure/actions_in_table_structure.phtml:138
+#: templates/table/structure/check_all_table_column.phtml:55
+#, fuzzy
+#| msgid "Add %s field(s)"
+msgid "Add to central columns"
+msgstr "%s талбар(ууд) нэмэх"
+
+#: templates/table/structure/add_column.phtml:7
+#, fuzzy, php-format
+#| msgid "Add %s field(s)"
+msgid "Add %s column(s)"
+msgstr "%s талбар(ууд) нэмэх"
+
+#: templates/table/structure/add_column.phtml:12
+#, fuzzy
+#| msgid "At Beginning of Table"
+msgid "at beginning of table"
+msgstr "Хүснэгтийн эхэнд"
+
+#: templates/table/structure/display_structure.phtml:140 view_create.php:181
+#, fuzzy
+#| msgid "Print view"
+msgid "Edit view"
+msgstr "Хэвлэхээр харах"
+
+#: templates/table/structure/display_table_stats.phtml:9
+msgid "Space usage"
+msgstr "Ашиглалтын зай"
+
+#: templates/table/structure/display_table_stats.phtml:32
+msgid "Effective"
+msgstr "Эффекттэй"
+
+#: templates/table/structure/move_columns_dialog.phtml:1
+#: templates/table/structure/optional_action_links.phtml:21
+#, fuzzy
+#| msgid "Add %s field(s)"
+msgid "Move columns"
+msgstr "%s талбар(ууд) нэмэх"
+
+#: templates/table/structure/move_columns_dialog.phtml:2
+msgid "Move the columns by dragging them up and down."
+msgstr ""
+
+#: templates/table/structure/optional_action_links.phtml:9
+msgid "Propose table structure"
+msgstr "Хүснэгтийн бүтцийг таниулах"
+
+#: templates/table/structure/optional_action_links.phtml:24
+#, fuzzy
+#| msgid "Propose table structure"
+msgid "Improve table structure"
+msgstr "Хүснэгтийн бүтцийг таниулах"
+
+#: templates/table/structure/optional_action_links.phtml:30
+#, fuzzy
+#| msgid "Track table"
+msgid "Track view"
+msgstr "Хүснэгтийг хөөх"
+
+#: templates/table/structure/row_stats_table.phtml:3
+#, fuzzy
+#| msgid "Row Statistics"
+msgid "Row statistics"
+msgstr "Мөрийн статистик"
+
+#: templates/table/structure/row_stats_table.phtml:9
+msgid "static"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:11
+msgid "dynamic"
+msgstr "динамик"
+
+#: templates/table/structure/row_stats_table.phtml:22
+msgid "partitioned"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:54
+msgid "Row length"
+msgstr "Мөрийн урт"
+
+#: templates/table/structure/row_stats_table.phtml:66
+msgid "Row size"
+msgstr "Мөрийн хэмжээ"
+
+#: templates/table/structure/row_stats_table.phtml:73
+msgid "Next autoindex"
+msgstr ""
+
+#: templates/table/structure/table_structure_row.phtml:46
+#, fuzzy, php-format
+#| msgid "Table %s has been dropped."
+msgid "Column %s has been dropped."
+msgstr "Хүснэгт %s нь устгагдлаа"
+
 #: themes.php:17 themes.php:22
 msgid "Theme"
 msgstr ""
@@ -17646,6 +17669,11 @@ msgstr ""
 msgid "concurrent_insert is set to 0"
 msgstr "ХИ. давхацсан холболтууд"
 
+#, fuzzy
+#~| msgid "Read misses"
+#~ msgid "Read as multibytes"
+#~ msgstr "Уншилт алдагдсан"
+
 #, fuzzy
 #~| msgid "Relational schema"
 #~ msgid "Relational display column"
diff --git a/po/ms.po b/po/ms.po
index 0f5475ffd9..e5e64d1e20 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 4.5.0-dev\n"
 "Report-Msgid-Bugs-To: developers@phpmyadmin.net\n"
-"POT-Creation-Date: 2015-08-08 13:53-0400\n"
+"POT-Creation-Date: 2015-08-12 08:10-0400\n"
 "PO-Revision-Date: 2014-11-05 10:35+0200\n"
 "Last-Translator: Michal Čihař <michal@cihar.com>\n"
 "Language-Team: Malay <https://hosted.weblate.org/projects/phpmyadmin/master/"
@@ -56,7 +56,7 @@ msgid "Table comments:"
 msgstr "Komen jadual"
 
 #: db_datadict.php:104 libraries/Index.class.php:699
-#: libraries/insert_edit.lib.php:1567
+#: libraries/insert_edit.lib.php:1565
 #: libraries/navigation/Nodes/Node_Column.class.php:30
 #: libraries/plugins/export/ExportHtmlword.class.php:280
 #: libraries/plugins/export/ExportHtmlword.class.php:375
@@ -70,13 +70,14 @@ msgstr "Komen jadual"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1023
 #: libraries/tracking.lib.php:879 libraries/tracking.lib.php:975
 #: templates/columns_definitions/column_name.phtml:18
-#: templates/index_form.phtml:124 templates/table/table_header.phtml:6
-#: templates/table/zoom_result_form.phtml:33
-#: templates/tbl_relation/common_form.phtml:10
-#: templates/tbl_relation/common_form.phtml:43
-#: templates/tbl_relation/foreign_key_row.phtml:194
-#: templates/tbl_relation/foreign_key_row.phtml:206
-#: templates/tbl_relation/internal_relational_row.phtml:71
+#: templates/table/index_form.phtml:124
+#: templates/table/relation/common_form.phtml:10
+#: templates/table/relation/common_form.phtml:43
+#: templates/table/relation/foreign_key_row.phtml:194
+#: templates/table/relation/foreign_key_row.phtml:206
+#: templates/table/relation/internal_relational_row.phtml:71
+#: templates/table/search/table_header.phtml:6
+#: templates/table/search/zoom_result_form.phtml:33
 #, fuzzy
 msgid "Column"
 msgstr "Pangkalan data %1$s telah dijana."
@@ -95,21 +96,21 @@ msgstr "Pangkalan data %1$s telah dijana."
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1001
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1024
 #: libraries/rte/rte_list.lib.php:75 libraries/rte/rte_list.lib.php:103
-#: libraries/rte/rte_routines.lib.php:802
-#: libraries/rte/rte_routines.lib.php:831
-#: libraries/rte/rte_routines.lib.php:1493
+#: libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_routines.lib.php:922
+#: libraries/rte/rte_routines.lib.php:1584
 #: libraries/server_privileges.lib.php:2369 libraries/tracking.lib.php:880
 #: libraries/tracking.lib.php:972
 #: templates/columns_definitions/table_fields_definitions.phtml:11
-#: templates/structure/table_header.phtml:48
-#: templates/structure/table_structure_header.phtml:6
-#: templates/table/table_header.phtml:7
+#: templates/database/structure/table_header.phtml:48
+#: templates/table/search/table_header.phtml:7
+#: templates/table/structure/table_structure_header.phtml:6
 msgid "Type"
 msgstr "Jenis"
 
 #: db_datadict.php:106 libraries/Index.class.php:702
 #: libraries/central_columns.lib.php:708
-#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1576
+#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1574
 #: libraries/plugins/export/ExportHtmlword.class.php:286
 #: libraries/plugins/export/ExportHtmlword.class.php:381
 #: libraries/plugins/export/ExportLatex.class.php:509
@@ -122,8 +123,8 @@ msgstr "Jenis"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1026
 #: libraries/tracking.lib.php:882 libraries/tracking.lib.php:978
 #: templates/columns_definitions/table_fields_definitions.phtml:39
-#: templates/structure/table_structure_header.phtml:9
-#: templates/table/zoom_result_form.phtml:34
+#: templates/table/search/zoom_result_form.phtml:34
+#: templates/table/structure/table_structure_header.phtml:9
 msgid "Null"
 msgstr "Null"
 
@@ -141,8 +142,8 @@ msgstr "Null"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1027
 #: libraries/replication_gui.lib.php:153 libraries/tracking.lib.php:883
 #: templates/columns_definitions/table_fields_definitions.phtml:25
-#: templates/structure/body_for_table_summary.phtml:55
-#: templates/structure/table_structure_header.phtml:10
+#: templates/database/structure/body_for_table_summary.phtml:55
+#: templates/table/structure/table_structure_header.phtml:10
 msgid "Default"
 msgstr "Asal"
 
@@ -170,19 +171,19 @@ msgid "Comments"
 msgstr "Komen"
 
 #: db_datadict.php:146
-#: libraries/controllers/StructureController.class.php:1960
-#: libraries/controllers/StructureController.class.php:1965
+#: libraries/controllers/TableStructureController.class.php:951
+#: libraries/controllers/TableStructureController.class.php:956
 #: libraries/tracking.lib.php:922
 #: templates/columns_definitions/column_indexes.phtml:6
-#: templates/structure/check_all_table_column.phtml:22
-#: templates/structure/display_structure.phtml:74
+#: templates/table/structure/check_all_table_column.phtml:22
+#: templates/table/structure/display_structure.phtml:74
 msgid "Primary"
 msgstr "Utama"
 
 #: db_datadict.php:156 js/messages.php:317 libraries/Index.class.php:567
 #: libraries/Index.class.php:606 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261 libraries/mult_submits.lib.php:403
+#: libraries/config/FormDisplay.tpl.php:272 libraries/mult_submits.lib.php:403
 #: libraries/mult_submits.lib.php:417
 #: libraries/plugins/export/ExportHtmlword.class.php:630
 #: libraries/plugins/export/ExportLatex.class.php:589
@@ -198,20 +199,20 @@ msgstr "Utama"
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1010 libraries/tracking.lib.php:1015
 #: prefs_manage.php:140 templates/prefs_autoload.phtml:15
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "No"
 msgstr "Tidak"
 
 #: db_datadict.php:156 js/messages.php:443 libraries/Index.class.php:568
 #: libraries/Index.class.php:605 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261
-#: libraries/controllers/StructureController.class.php:1344
-#: libraries/controllers/StructureController.class.php:2223
-#: libraries/controllers/StructureController.class.php:2232
-#: libraries/controllers/StructureController.class.php:2237
-#: libraries/controllers/StructureController.class.php:2242
-#: libraries/controllers/StructureController.class.php:2247
+#: libraries/config/FormDisplay.tpl.php:272
+#: libraries/controllers/TableStructureController.class.php:539
+#: libraries/controllers/TableStructureController.class.php:1201
+#: libraries/controllers/TableStructureController.class.php:1210
+#: libraries/controllers/TableStructureController.class.php:1215
+#: libraries/controllers/TableStructureController.class.php:1220
+#: libraries/controllers/TableStructureController.class.php:1225
 #: libraries/mult_submits.inc.php:82 libraries/mult_submits.inc.php:178
 #: libraries/mult_submits.lib.php:339 libraries/mult_submits.lib.php:372
 #: libraries/mult_submits.lib.php:401 libraries/mult_submits.lib.php:415
@@ -220,8 +221,8 @@ msgstr "Tidak"
 #: libraries/plugins/export/ExportOdt.class.php:756
 #: libraries/plugins/export/ExportTexytext.class.php:567
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1077
-#: libraries/server_databases.lib.php:464
-#: libraries/server_databases.lib.php:474
+#: libraries/server_databases.lib.php:475
+#: libraries/server_databases.lib.php:485
 #: libraries/server_privileges.lib.php:2546
 #: libraries/server_privileges.lib.php:2727
 #: libraries/server_privileges.lib.php:2748
@@ -231,7 +232,7 @@ msgstr "Tidak"
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1008 libraries/tracking.lib.php:1013
 #: prefs_manage.php:138 templates/prefs_autoload.phtml:14
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "Yes"
 msgstr "Ya"
 
@@ -241,7 +242,7 @@ msgstr "Lihat longgokan (skema) pangkalan data"
 
 #: db_export.php:37 db_tracking.php:90 export.php:382
 #: libraries/DBQbe.class.php:326
-#: libraries/controllers/StructureController.class.php:231
+#: libraries/controllers/DatabaseStructureController.class.php:170
 #: libraries/navigation/NavigationTree.class.php:897
 msgid "No tables found in database."
 msgstr "Tiada jadual dijumpai pada pangkalan data."
@@ -252,14 +253,14 @@ msgstr "Tiada jadual dijumpai pada pangkalan data."
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:26
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:120
-#: templates/structure/show_create.phtml:18
+#: templates/database/structure/show_create.phtml:18
 msgid "Tables"
 msgstr "Jadual-jadual"
 
 #: db_export.php:52 libraries/Menu.class.php:317 libraries/Menu.class.php:425
-#: libraries/Util.class.php:3333 libraries/Util.class.php:3343
-#: libraries/Util.class.php:3349 libraries/Util.class.php:3629
-#: libraries/Util.class.php:4327 libraries/Util.class.php:4344
+#: libraries/Util.class.php:3339 libraries/Util.class.php:3349
+#: libraries/Util.class.php:3355 libraries/Util.class.php:3635
+#: libraries/Util.class.php:4333 libraries/Util.class.php:4350
 #: libraries/central_columns.lib.php:728 libraries/config.values.php:39
 #: libraries/config.values.php:47 libraries/config.values.php:109
 #: libraries/config.values.php:115 libraries/config/setup.forms.php:323
@@ -273,7 +274,7 @@ msgstr "Jadual-jadual"
 #: libraries/navigation/Nodes/Node_Table.class.php:283
 #: libraries/server_privileges.lib.php:1141 libraries/tracking.lib.php:874
 #: templates/columns_definitions/table_fields_definitions.phtml:3
-#: templates/designer/table_list.phtml:28
+#: templates/database/designer/table_list.phtml:28
 msgid "Structure"
 msgstr "Struktur"
 
@@ -285,7 +286,7 @@ msgstr "Struktur"
 #: libraries/config/user_preferences.forms.php:292
 #: libraries/config/user_preferences.forms.php:297
 #: libraries/server_privileges.lib.php:1140
-#: templates/structure/display_table_stats.phtml:12
+#: templates/table/structure/display_table_stats.phtml:12
 msgid "Data"
 msgstr "Data"
 
@@ -371,10 +372,10 @@ msgstr "Jadual dikesan"
 #: libraries/server_privileges.lib.php:2908
 #: libraries/server_privileges.lib.php:3145
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4346
-#: templates/structure/table_header.phtml:21
-#: templates/tbl_relation/foreign_key_row.phtml:176
-#: templates/tbl_relation/internal_relational_row.phtml:63
+#: libraries/server_privileges.lib.php:4372
+#: templates/database/structure/table_header.phtml:21
+#: templates/table/relation/foreign_key_row.phtml:176
+#: templates/table/relation/internal_relational_row.phtml:63
 msgid "Table"
 msgstr "Jadual"
 
@@ -391,7 +392,7 @@ msgid "Updated"
 msgstr "dikemaskini"
 
 #: db_tracking.php:130 js/messages.php:243 libraries/Menu.class.php:552
-#: libraries/Util.class.php:4314 libraries/config.values.php:104
+#: libraries/Util.class.php:4320 libraries/config.values.php:104
 #: libraries/rte/rte_events.lib.php:393 libraries/rte/rte_list.lib.php:101
 #: libraries/server_status_processes.lib.php:92 libraries/tracking.lib.php:279
 msgid "Status"
@@ -400,14 +401,15 @@ msgstr "Status"
 #: db_tracking.php:131 db_tracking.php:290 libraries/Index.class.php:693
 #: libraries/central_columns.lib.php:687 libraries/rte/rte_list.lib.php:74
 #: libraries/rte/rte_list.lib.php:89 libraries/rte/rte_list.lib.php:102
-#: libraries/server_databases.lib.php:398
+#: libraries/server_databases.lib.php:409
 #: libraries/server_privileges.lib.php:2372
 #: libraries/server_privileges.lib.php:3166
 #: libraries/server_privileges.lib.php:3342
 #: libraries/server_user_groups.lib.php:82
 #: libraries/server_variables.lib.php:189 libraries/tracking.lib.php:280
-#: libraries/tracking.lib.php:793 templates/structure/table_header.phtml:30
-#: templates/structure/table_structure_header.phtml:23
+#: libraries/tracking.lib.php:793
+#: templates/database/structure/table_header.phtml:30
+#: templates/table/structure/table_structure_header.phtml:23
 msgid "Action"
 msgstr "Aksi"
 
@@ -452,7 +454,7 @@ msgid "Untracked tables"
 msgstr "Jadual terlacak"
 
 #: db_tracking.php:305 db_tracking.php:336
-#: templates/structure/optional_action_links.phtml:17
+#: templates/table/structure/optional_action_links.phtml:17
 msgid "Track table"
 msgstr "Kesan jadual"
 
@@ -502,7 +504,7 @@ msgid "Value for the column \"%s\""
 msgstr "Nilai pada kolum \"%s\""
 
 #: gis_data_editor.php:146
-#: templates/gis_visualization/gis_visualization.phtml:37
+#: templates/table/gis_visualization/gis_visualization.phtml:37
 msgid "Use OpenStreetMaps as Base Layer"
 msgstr "Menggunakan OpenStreetMaps sebagai Base Layer"
 
@@ -592,35 +594,35 @@ msgstr "Tambah geometri"
 #: libraries/display_change_password.lib.php:162
 #: libraries/display_export.lib.php:402 libraries/display_export.lib.php:408
 #: libraries/display_import.lib.php:392 libraries/index.lib.php:44
-#: libraries/insert_edit.lib.php:1546 libraries/insert_edit.lib.php:1583
+#: libraries/insert_edit.lib.php:1544 libraries/insert_edit.lib.php:1581
 #: libraries/normalization.lib.php:165 libraries/normalization.lib.php:821
 #: libraries/operations.lib.php:38 libraries/operations.lib.php:108
 #: libraries/operations.lib.php:263 libraries/operations.lib.php:306
 #: libraries/operations.lib.php:801 libraries/operations.lib.php:874
 #: libraries/operations.lib.php:923 libraries/operations.lib.php:1337
 #: libraries/operations.lib.php:1658
-#: libraries/plugins/auth/AuthenticationCookie.class.php:244
+#: libraries/plugins/auth/AuthenticationCookie.class.php:232
 #: libraries/replication_gui.lib.php:122 libraries/replication_gui.lib.php:161
 #: libraries/replication_gui.lib.php:324 libraries/replication_gui.lib.php:461
 #: libraries/replication_gui.lib.php:906 libraries/rte/rte_events.lib.php:509
-#: libraries/rte/rte_routines.lib.php:969
-#: libraries/rte/rte_routines.lib.php:1581
+#: libraries/rte/rte_routines.lib.php:1060
+#: libraries/rte/rte_routines.lib.php:1672
 #: libraries/rte/rte_triggers.lib.php:396 libraries/server_bin_log.lib.php:61
 #: libraries/server_privileges.lib.php:705
 #: libraries/server_privileges.lib.php:2106
 #: libraries/server_privileges.lib.php:2872
 #: libraries/server_privileges.lib.php:3553
-#: libraries/server_privileges.lib.php:4627
+#: libraries/server_privileges.lib.php:4653
 #: libraries/server_user_groups.lib.php:285
 #: libraries/sql_query_form.lib.php:369 libraries/sql_query_form.lib.php:429
 #: libraries/tracking.lib.php:533 libraries/tracking.lib.php:653
 #: prefs_manage.php:277 prefs_manage.php:355
 #: templates/columns_definitions/column_definitions_form.phtml:59
-#: templates/header_location.phtml:17 templates/index_form.phtml:238
+#: templates/database/create_table.phtml:21 templates/header_location.phtml:28
 #: templates/startAndNumberOfRowsPanel.phtml:14
-#: templates/structure/add_column.phtml:25
-#: templates/table/create_table.phtml:21
-#: templates/table/selection_form.phtml:75 view_create.php:275
+#: templates/table/index_form.phtml:238
+#: templates/table/search/selection_form.phtml:75
+#: templates/table/structure/add_column.phtml:25 view_create.php:275
 #: view_operations.php:106
 msgid "Go"
 msgstr "Pergi"
@@ -714,7 +716,7 @@ msgstr ""
 msgid "Could not load import plugins, please check your installation!"
 msgstr ""
 
-#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1466
+#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1460
 #, fuzzy, php-format
 msgid "Bookmark %s has been created."
 msgstr "Jadual %s telah digugurkan"
@@ -748,12 +750,12 @@ msgstr ""
 msgid "Back"
 msgstr "Undur"
 
-#: index.php:148 libraries/Footer.class.php:70
+#: index.php:149 libraries/Footer.class.php:70
 #, fuzzy
 msgid "phpMyAdmin Demo Server"
 msgstr "Dokumentasi phpMyAdmin"
 
-#: index.php:152
+#: index.php:153
 #, php-format
 msgid ""
 "You are using the demo server. You can do anything here, but please do not "
@@ -761,48 +763,48 @@ msgid ""
 "at %s."
 msgstr ""
 
-#: index.php:162
+#: index.php:163
 #, fuzzy
 #| msgid "General relation features"
 msgid "General Settings"
 msgstr "Ciri-ciri hubungan am"
 
-#: index.php:190 libraries/display_change_password.lib.php:50
+#: index.php:191 libraries/display_change_password.lib.php:50
 #: libraries/display_change_password.lib.php:53 user_password.php:247
 msgid "Change password"
 msgstr "Ubah Katalaluan"
 
-#: index.php:206
+#: index.php:207
 msgid "Server connection collation"
 msgstr ""
 
-#: index.php:228
+#: index.php:229
 msgid "Appearance Settings"
 msgstr ""
 
-#: index.php:258 prefs_manage.php:285
+#: index.php:259 prefs_manage.php:285
 #, fuzzy
 #| msgid "General relation features"
 msgid "More settings"
 msgstr "Ciri-ciri hubungan am"
 
-#: index.php:279
+#: index.php:280
 #, fuzzy
 #| msgid "Databases"
 msgid "Database server"
 msgstr "pangkalan data"
 
-#: index.php:282 libraries/plugins/auth/AuthenticationCookie.class.php:181
+#: index.php:283 libraries/plugins/auth/AuthenticationCookie.class.php:169
 #, fuzzy
 msgid "Server:"
 msgstr "Pelayan"
 
-#: index.php:286
+#: index.php:287
 #, fuzzy
 msgid "Server type:"
 msgstr "Pilihan Pelayan"
 
-#: index.php:290 libraries/plugins/export/ExportLatex.class.php:212
+#: index.php:291 libraries/plugins/export/ExportLatex.class.php:212
 #: libraries/plugins/export/ExportSql.class.php:687
 #: libraries/plugins/export/ExportXml.class.php:189
 #, fuzzy
@@ -810,84 +812,84 @@ msgstr "Pilihan Pelayan"
 msgid "Server version:"
 msgstr "Versi Pelayan"
 
-#: index.php:296
+#: index.php:297
 #, fuzzy
 msgid "Protocol version:"
 msgstr "Versi Pelayan"
 
-#: index.php:300
+#: index.php:301
 #, fuzzy
 #| msgid "User"
 msgid "User:"
 msgstr "Pengguna"
 
-#: index.php:305
+#: index.php:306
 #, fuzzy
 msgid "Server charset:"
 msgstr "Pilihan Pelayan"
 
-#: index.php:320
+#: index.php:321
 msgid "Web server"
 msgstr ""
 
-#: index.php:331
+#: index.php:332
 #, fuzzy
 msgid "Database client version:"
 msgstr "Komen jadual"
 
-#: index.php:335
+#: index.php:336
 #, fuzzy
 msgid "PHP extension:"
 msgstr "Versi PHP"
 
-#: index.php:349
+#: index.php:350
 #, fuzzy
 #| msgid "PHP Version"
 msgid "PHP version:"
 msgstr "Versi PHP"
 
-#: index.php:360
+#: index.php:361
 msgid "Show PHP information"
 msgstr "Papar maklumat PHP"
 
-#: index.php:383
+#: index.php:384
 #, fuzzy
 msgid "Version information:"
 msgstr "Informasi MasaJana"
 
-#: index.php:392 libraries/Util.class.php:432 libraries/Util.class.php:495
-#: libraries/config/FormDisplay.tpl.php:151
+#: index.php:393 libraries/Util.class.php:432 libraries/Util.class.php:495
+#: libraries/config/FormDisplay.tpl.php:162
 #: libraries/display_export.lib.php:577 libraries/engines/pbxt.lib.php:162
 #: libraries/navigation/NavigationHeader.class.php:196
 #: libraries/server_variables.lib.php:160
 msgid "Documentation"
 msgstr "Dokumentasi"
 
-#: index.php:399
+#: index.php:400
 msgid "Wiki"
 msgstr ""
 
-#: index.php:408
+#: index.php:409
 msgid "Official Homepage"
 msgstr "Laman Rasmi phpMyAdmin"
 
-#: index.php:415
+#: index.php:416
 #, fuzzy
 #| msgid "Attributes"
 msgid "Contribute"
 msgstr "Atribut"
 
-#: index.php:422
+#: index.php:423
 msgid "Get support"
 msgstr ""
 
-#: index.php:429
+#: index.php:430
 #, fuzzy
 #| msgid "No change"
 msgid "List of changes"
 msgstr "Tiada perubahan"
 
-#: index.php:451
+#: index.php:452
 #, fuzzy
 #| msgid ""
 #| "Your configuration file contains settings (root with no password) that "
@@ -905,21 +907,21 @@ msgstr ""
 "dilaksanakan dengan pelengkapan asas, ianya terdedah kepada pencerobohan, "
 "dan anda hendaklah membetulkan lubang keselamatan ini."
 
-#: index.php:468
+#: index.php:469
 msgid ""
 "You have enabled mbstring.func_overload in your PHP configuration. This "
 "option is incompatible with phpMyAdmin and might cause some data to be "
 "corrupted!"
 msgstr ""
 
-#: index.php:483
+#: index.php:484
 msgid ""
 "The mbstring PHP extension was not found and you seem to be using a "
 "multibyte charset. Without the mbstring extension phpMyAdmin is unable to "
 "split strings correctly and it may result in unexpected results."
 msgstr ""
 
-#: index.php:500
+#: index.php:501
 msgid ""
 "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini."
 "session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower than "
@@ -927,17 +929,17 @@ msgid ""
 "expire sooner than configured in phpMyAdmin."
 msgstr ""
 
-#: index.php:519
+#: index.php:520
 msgid ""
 "Login cookie store is lower than cookie validity configured in phpMyAdmin, "
 "because of this, your login will expire sooner than configured in phpMyAdmin."
 msgstr ""
 
-#: index.php:535
+#: index.php:536
 msgid "The configuration file now needs a secret passphrase (blowfish_secret)."
 msgstr ""
 
-#: index.php:548
+#: index.php:549
 msgid ""
 "Directory [code]config[/code], which is used by the setup script, still "
 "exists in your phpMyAdmin directory. It is strongly recommended to remove it "
@@ -945,7 +947,7 @@ msgid ""
 "may be compromised by unauthorized people downloading your configuration."
 msgstr ""
 
-#: index.php:564
+#: index.php:565
 #, fuzzy, php-format
 #| msgid ""
 #| " additional features for working with linked tables have been ctivated. "
@@ -957,19 +959,19 @@ msgstr ""
 "Ciri-ciri tambahan ini adalah untuk bekerja dengan pautan jadual yang telah "
 "tidak diaktifkan. Untuk mengetahuinya klik %shere%s."
 
-#: index.php:571
+#: index.php:572
 msgid ""
 "Or alternately go to 'Operations' tab of any database to set it up there."
 msgstr ""
 
-#: index.php:620
+#: index.php:621
 #, php-format
 msgid ""
 "Your PHP MySQL library version %s differs from your MySQL server version %s. "
 "This may cause unpredictable behavior."
 msgstr ""
 
-#: index.php:648
+#: index.php:649
 #, php-format
 msgid ""
 "Server running with Suhosin. Please refer to %sdocumentation%s for possible "
@@ -1131,8 +1133,8 @@ msgstr ""
 msgid "Save & Close"
 msgstr "Simpan sebagai fail"
 
-#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:404
-#: libraries/insert_edit.lib.php:1550 prefs_manage.php:361
+#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:415
+#: libraries/insert_edit.lib.php:1548 prefs_manage.php:361
 #: prefs_manage.php:372
 msgid "Reset"
 msgstr "Ulangtetap"
@@ -1173,7 +1175,7 @@ msgstr "Indeks"
 msgid "Edit Index"
 msgstr "Indeks"
 
-#: js/messages.php:99 templates/index_form.phtml:232
+#: js/messages.php:99 templates/table/index_form.phtml:232
 #, fuzzy, php-format
 msgid "Add %s column(s) to index"
 msgstr "Tambah medan baru"
@@ -1201,15 +1203,16 @@ msgstr "Medan disertai oleh"
 msgid "Please select column(s) for the index."
 msgstr "Tambah medan baru"
 
-#: js/messages.php:106 templates/structure/add_column.phtml:1
+#: js/messages.php:106 templates/table/structure/add_column.phtml:1
 #, fuzzy
 #| msgid "You have to choose at least one column to display"
 msgid "You have to add at least one column."
 msgstr "Anda mesti pilih sekurang-kurangnya satu Kolum untuk dipapar"
 
-#: js/messages.php:109 libraries/insert_edit.lib.php:1548
+#: js/messages.php:109 libraries/insert_edit.lib.php:1546
 #: templates/columns_definitions/column_definitions_form.phtml:162
-#: templates/index_form.phtml:237 templates/tbl_relation/common_form.phtml:106
+#: templates/table/index_form.phtml:237
+#: templates/table/relation/common_form.phtml:106
 msgid "Preview SQL"
 msgstr ""
 
@@ -1232,7 +1235,7 @@ msgid "SQL query:"
 msgstr "kueri-SQL"
 
 #. l10n: Default label for the y-Axis of Charts
-#: js/messages.php:118 templates/tbl_chart.phtml:109
+#: js/messages.php:118 templates/table/chart/tbl_chart.phtml:109
 #, fuzzy
 #| msgid "Value"
 msgid "Y Values"
@@ -1401,7 +1404,7 @@ msgstr ""
 msgid "Bytes received"
 msgstr "DiTerima"
 
-#: js/messages.php:169 libraries/server_status.lib.php:226
+#: js/messages.php:169 libraries/server_status.lib.php:235
 msgid "Connections"
 msgstr "Hubungan"
 
@@ -1460,12 +1463,12 @@ msgstr "%s jadual"
 msgid "Questions"
 msgstr "Operasi"
 
-#: js/messages.php:184 libraries/server_status.lib.php:134
+#: js/messages.php:184 libraries/server_status.lib.php:143
 msgid "Traffic"
 msgstr "Kesibukan"
 
 #: js/messages.php:185 libraries/Menu.class.php:586
-#: libraries/Util.class.php:4318 libraries/server_status_monitor.lib.php:257
+#: libraries/Util.class.php:4324 libraries/server_status_monitor.lib.php:257
 #, fuzzy
 #| msgid "General relation features"
 msgid "Settings"
@@ -1487,8 +1490,9 @@ msgstr ""
 #: libraries/server_status_monitor.lib.php:236
 #: libraries/server_status_processes.lib.php:308
 #: templates/columns_definitions/transformation.phtml:4
-#: templates/designer/options_panel.phtml:178
-#: templates/table/options_zoom.phtml:12 templates/table/rows_zoom.phtml:26
+#: templates/database/designer/options_panel.phtml:178
+#: templates/table/search/options_zoom.phtml:12
+#: templates/table/search/rows_zoom.phtml:26
 msgid "None"
 msgstr "Tiada"
 
@@ -1784,8 +1788,8 @@ msgstr ""
 
 #: js/messages.php:270 libraries/Menu.class.php:352
 #: libraries/Menu.class.php:455 libraries/Menu.class.php:582
-#: libraries/Util.class.php:4317 libraries/Util.class.php:4332
-#: libraries/Util.class.php:4349 libraries/config/messages.inc.php:258
+#: libraries/Util.class.php:4323 libraries/Util.class.php:4338
+#: libraries/Util.class.php:4355 libraries/config/messages.inc.php:258
 #: libraries/display_import.lib.php:105
 #: libraries/server_status_monitor.lib.php:318 prefs_manage.php:238
 #: setup/frames/menu.inc.php:26
@@ -1852,13 +1856,13 @@ msgid "Formatting SQL..."
 msgstr ""
 
 #: js/messages.php:293 libraries/server_variables.lib.php:157
-#: templates/designer/aggregate_query_panel.phtml:63
-#: templates/designer/delete_relation_panel.phtml:28
-#: templates/designer/having_query_panel.phtml:117
-#: templates/designer/new_relation_panel.phtml:88
-#: templates/designer/options_panel.phtml:253
-#: templates/designer/rename_to_panel.phtml:45
-#: templates/designer/where_query_panel.phtml:83
+#: templates/database/designer/aggregate_query_panel.phtml:63
+#: templates/database/designer/delete_relation_panel.phtml:28
+#: templates/database/designer/having_query_panel.phtml:117
+#: templates/database/designer/new_relation_panel.phtml:88
+#: templates/database/designer/options_panel.phtml:253
+#: templates/database/designer/rename_to_panel.phtml:45
+#: templates/database/designer/where_query_panel.phtml:83
 msgid "Cancel"
 msgstr ""
 
@@ -1868,7 +1872,7 @@ msgstr ""
 msgid "Page-related settings"
 msgstr "Ciri-ciri hubungan am"
 
-#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:402
+#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:413
 msgid "Apply"
 msgstr ""
 
@@ -1906,8 +1910,8 @@ msgstr ""
 msgid "Error text: %s"
 msgstr ""
 
-#: js/messages.php:307 libraries/db_common.inc.php:68
-#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:450
+#: js/messages.php:307 libraries/db_common.inc.php:69
+#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:461
 msgid "No databases selected."
 msgstr ""
 
@@ -1919,12 +1923,13 @@ msgstr ""
 msgid "Adding Primary Key"
 msgstr ""
 
-#: js/messages.php:310 templates/designer/aggregate_query_panel.phtml:59
-#: templates/designer/having_query_panel.phtml:113
-#: templates/designer/new_relation_panel.phtml:87
-#: templates/designer/options_panel.phtml:252
-#: templates/designer/rename_to_panel.phtml:41
-#: templates/designer/where_query_panel.phtml:82
+#: js/messages.php:310
+#: templates/database/designer/aggregate_query_panel.phtml:59
+#: templates/database/designer/having_query_panel.phtml:113
+#: templates/database/designer/new_relation_panel.phtml:87
+#: templates/database/designer/options_panel.phtml:252
+#: templates/database/designer/rename_to_panel.phtml:41
+#: templates/database/designer/where_query_panel.phtml:82
 msgid "OK"
 msgstr "OK"
 
@@ -1946,7 +1951,7 @@ msgstr "Tiada pangkalan data"
 msgid "Changing Charset"
 msgstr ""
 
-#: js/messages.php:320 libraries/Util.class.php:3217
+#: js/messages.php:320 libraries/Util.class.php:3223
 msgid "Enable foreign key checks"
 msgstr ""
 
@@ -1989,20 +1994,21 @@ msgstr ""
 #: js/messages.php:334 libraries/DisplayResults.class.php:4834
 #: libraries/DisplayResults.class.php:5092 libraries/Menu.class.php:344
 #: libraries/Menu.class.php:446 libraries/Menu.class.php:578
-#: libraries/Util.class.php:3636 libraries/Util.class.php:3637
-#: libraries/Util.class.php:4316 libraries/Util.class.php:4331
-#: libraries/Util.class.php:4348 libraries/config/messages.inc.php:252
+#: libraries/Util.class.php:3642 libraries/Util.class.php:3643
+#: libraries/Util.class.php:4322 libraries/Util.class.php:4337
+#: libraries/Util.class.php:4354 libraries/config/messages.inc.php:252
 #: libraries/display_export.lib.php:173 libraries/rte/rte_list.lib.php:146
 #: libraries/server_privileges.lib.php:2211
 #: libraries/server_privileges.lib.php:2290
 #: libraries/server_privileges.lib.php:2632
 #: libraries/server_privileges.lib.php:3356
 #: libraries/server_status_monitor.lib.php:322 prefs_manage.php:303
-#: setup/frames/menu.inc.php:27 templates/structure/check_all_tables.phtml:11
+#: setup/frames/menu.inc.php:27
+#: templates/database/structure/check_all_tables.phtml:11
 msgid "Export"
 msgstr "Eksport"
 
-#: js/messages.php:337 libraries/rte/rte_routines.lib.php:652
+#: js/messages.php:337 libraries/rte/rte_routines.lib.php:743
 msgid "ENUM/SET editor"
 msgstr ""
 
@@ -2044,7 +2050,7 @@ msgstr "kueri-SQL"
 #: libraries/Console.class.php:214 libraries/DisplayResults.class.php:3474
 #: libraries/DisplayResults.class.php:4818 libraries/Index.class.php:723
 #: libraries/Util.class.php:706 libraries/Util.class.php:1202
-#: libraries/Util.class.php:3634 libraries/Util.class.php:3635
+#: libraries/Util.class.php:3640 libraries/Util.class.php:3641
 #: libraries/central_columns.lib.php:851
 #: libraries/central_columns.lib.php:1193
 #: libraries/config/messages.inc.php:892
@@ -2062,7 +2068,7 @@ msgstr "Ubah"
 #: libraries/server_user_groups.lib.php:129
 #: libraries/sql_query_form.lib.php:416 libraries/tracking.lib.php:477
 #: setup/frames/index.inc.php:183 setup/frames/index.inc.php:291
-#: templates/designer/delete_relation_panel.phtml:27
+#: templates/database/designer/delete_relation_panel.phtml:27
 msgid "Delete"
 msgstr "Padam"
 
@@ -2240,11 +2246,11 @@ msgid "No dependencies selected!"
 msgstr ""
 
 #: js/messages.php:394 libraries/central_columns.lib.php:1214
-#: libraries/insert_edit.lib.php:1458 libraries/server_variables.lib.php:155
+#: libraries/insert_edit.lib.php:1456 libraries/server_variables.lib.php:155
 #: setup/frames/config.inc.php:42 setup/frames/index.inc.php:279
 #: templates/columns_definitions/column_definitions_form.phtml:165
-#: templates/gis_visualization/gis_visualization.phtml:48
-#: templates/tbl_relation/common_form.phtml:107
+#: templates/table/gis_visualization/gis_visualization.phtml:48
+#: templates/table/relation/common_form.phtml:107
 msgid "Save"
 msgstr "Simpan"
 
@@ -2335,8 +2341,8 @@ msgid "Data point content"
 msgstr "Kandungan"
 
 #: js/messages.php:430 js/messages.php:562 js/messages.php:579
-#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2573
-#: templates/index_form.phtml:154 templates/index_form.phtml:194
+#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2571
+#: templates/table/index_form.phtml:154 templates/table/index_form.phtml:194
 msgid "Ignore"
 msgstr "Abai"
 
@@ -2395,8 +2401,8 @@ msgstr ""
 msgid "Please select the primary key or a unique key!"
 msgstr ""
 
-#: js/messages.php:457 templates/designer/side_menu.phtml:91
-#: templates/designer/side_menu.phtml:94
+#: js/messages.php:457 templates/database/designer/side_menu.phtml:91
+#: templates/database/designer/side_menu.phtml:94
 #, fuzzy
 #| msgid "Choose field to display"
 msgid "Choose column to display"
@@ -2414,22 +2420,22 @@ msgstr ""
 msgid "Page name"
 msgstr "Muka Surat:"
 
-#: js/messages.php:463 templates/designer/side_menu.phtml:56
-#: templates/designer/side_menu.phtml:59
+#: js/messages.php:463 templates/database/designer/side_menu.phtml:56
+#: templates/database/designer/side_menu.phtml:59
 #, fuzzy
 #| msgid "Select All"
 msgid "Save page"
 msgstr "Sila pilih pangkalan data"
 
-#: js/messages.php:464 templates/designer/side_menu.phtml:63
-#: templates/designer/side_menu.phtml:66
+#: js/messages.php:464 templates/database/designer/side_menu.phtml:63
+#: templates/database/designer/side_menu.phtml:66
 #, fuzzy
 #| msgid "Select All"
 msgid "Save page as"
 msgstr "Sila pilih pangkalan data"
 
-#: js/messages.php:465 templates/designer/side_menu.phtml:49
-#: templates/designer/side_menu.phtml:52
+#: js/messages.php:465 templates/database/designer/side_menu.phtml:49
+#: templates/database/designer/side_menu.phtml:52
 #, fuzzy
 #| msgctxt "PDF"
 #| msgid "page"
@@ -2442,7 +2448,7 @@ msgstr "Penggunaan"
 msgid "Delete page"
 msgstr "Sila pilih pangkalan data"
 
-#: js/messages.php:467 templates/designer/side_menu.phtml:10
+#: js/messages.php:467 templates/database/designer/side_menu.phtml:10
 msgid "Untitled"
 msgstr ""
 
@@ -2562,7 +2568,7 @@ msgstr "Rentetan talian"
 msgid "cancel"
 msgstr ""
 
-#: js/messages.php:499 libraries/server_status.lib.php:271
+#: js/messages.php:499 libraries/server_status.lib.php:280
 msgid "Aborted"
 msgstr "DiBatalkan"
 
@@ -3215,7 +3221,7 @@ msgstr ""
 
 #: js/messages.php:793 libraries/Message.class.php:199
 #: libraries/Util.class.php:654 libraries/core.lib.php:245
-#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1172
+#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1170
 #: tbl_operations.php:229 view_operations.php:63
 msgid "Error"
 msgstr "Ralat"
@@ -3274,8 +3280,8 @@ msgstr ""
 msgid "per minute"
 msgstr ""
 
-#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:143
-#: libraries/server_status.lib.php:228
+#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:152
+#: libraries/server_status.lib.php:237
 #: libraries/server_status_queries.lib.php:98
 msgid "per hour"
 msgstr "per jam"
@@ -3293,7 +3299,7 @@ msgstr ""
 msgid "Wrong permissions on configuration file, should not be world writable!"
 msgstr ""
 
-#: libraries/Config.class.php:1799
+#: libraries/Config.class.php:1801
 msgid "Font size"
 msgstr ""
 
@@ -3323,10 +3329,10 @@ msgstr "pada kueri"
 #: libraries/server_privileges.lib.php:2890
 #: libraries/server_privileges.lib.php:3144
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4332
+#: libraries/server_privileges.lib.php:4358
 #: libraries/server_status_processes.lib.php:80
-#: templates/tbl_relation/foreign_key_row.phtml:165
-#: templates/tbl_relation/internal_relational_row.phtml:55
+#: templates/table/relation/foreign_key_row.phtml:165
+#: templates/table/relation/internal_relational_row.phtml:55
 msgid "Database"
 msgstr "Pangkalan Data"
 
@@ -3430,11 +3436,11 @@ msgstr "Melangkau Pengesahan SQL"
 #: libraries/plugins/import/ImportMediawiki.class.php:60
 #: libraries/plugins/import/ImportOds.class.php:59
 #: libraries/plugins/import/ImportShp.class.php:57
-#: libraries/plugins/import/ImportSql.class.php:148
+#: libraries/plugins/import/ImportSql.class.php:51
 #: libraries/plugins/import/ImportXml.class.php:58
-#: libraries/rte/rte_routines.lib.php:833 templates/index_form.phtml:49
-#: templates/structure/row_stats_table.phtml:20
-#: templates/table/options.phtml:2
+#: libraries/rte/rte_routines.lib.php:924 templates/table/index_form.phtml:49
+#: templates/table/search/options.phtml:2
+#: templates/table/structure/row_stats_table.phtml:20
 #, fuzzy
 msgid "Options"
 msgstr "Operasi"
@@ -3476,7 +3482,8 @@ msgstr "Menurun"
 msgid "Order:"
 msgstr ""
 
-#: libraries/Console.class.php:289 templates/table/replace_preview.phtml:17
+#: libraries/Console.class.php:289
+#: templates/table/search/replace_preview.phtml:17
 #, fuzzy
 msgid "Count"
 msgstr "Pangkalan data %1$s telah dijana."
@@ -3593,9 +3600,9 @@ msgstr "Tukar kepada pengkalan data yang di salin"
 #: libraries/operations.lib.php:794 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:191
-#: templates/structure/sortable_header.phtml:21
-#: templates/structure/sortable_header.phtml:38
-#: templates/table/options.phtml:68
+#: templates/database/structure/sortable_header.phtml:21
+#: templates/database/structure/sortable_header.phtml:38
+#: templates/table/search/options.phtml:68
 msgid "Ascending"
 msgstr "Menaik"
 
@@ -3605,13 +3612,14 @@ msgstr "Menaik"
 #: libraries/operations.lib.php:797 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:188
-#: templates/structure/sortable_header.phtml:26
-#: templates/structure/sortable_header.phtml:43
-#: templates/table/options.phtml:69
+#: templates/database/structure/sortable_header.phtml:26
+#: templates/database/structure/sortable_header.phtml:43
+#: templates/table/search/options.phtml:69
 msgid "Descending"
 msgstr "Menurun"
 
-#: libraries/DBQbe.class.php:467 templates/table/search_and_replace.phtml:6
+#: libraries/DBQbe.class.php:467
+#: templates/table/search/search_and_replace.phtml:6
 #, fuzzy
 #| msgid "Column"
 msgid "Column:"
@@ -3790,12 +3798,12 @@ msgstr[0] "%s padanan di dalam jadual <i>%s</i>"
 msgstr[1] "%s padanan di dalam jadual <i>%s</i>"
 
 #: libraries/DbSearch.class.php:354 libraries/Menu.class.php:311
-#: libraries/Util.class.php:3337 libraries/Util.class.php:3347
-#: libraries/Util.class.php:3623 libraries/Util.class.php:3624
-#: libraries/Util.class.php:4343 libraries/config.values.php:43
+#: libraries/Util.class.php:3343 libraries/Util.class.php:3353
+#: libraries/Util.class.php:3629 libraries/Util.class.php:3630
+#: libraries/Util.class.php:4349 libraries/config.values.php:43
 #: libraries/config.values.php:51 libraries/config.values.php:119
 #: libraries/navigation/Nodes/Node_Table.class.php:295
-#: templates/structure/check_all_table_column.phtml:5
+#: templates/table/structure/check_all_table_column.phtml:5
 msgid "Browse"
 msgstr "Lungsur"
 
@@ -3812,7 +3820,8 @@ msgstr "Cari di pangkalan data"
 msgid "Words or values to search for (wildcard: \"%\"):"
 msgstr "Perkataan atau nilai yang dicari untuk (wildcard: \"%\"):"
 
-#: libraries/DbSearch.class.php:401 templates/table/search_and_replace.phtml:1
+#: libraries/DbSearch.class.php:401
+#: templates/table/search/search_and_replace.phtml:1
 msgid "Find:"
 msgstr "Cari:"
 
@@ -3861,16 +3870,16 @@ msgstr "Medan"
 msgid "Search this table"
 msgstr "Cari di pangkalan data"
 
-#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2532
-#: libraries/Util.class.php:2535
+#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2538
+#: libraries/Util.class.php:2541
 #, fuzzy
 #| msgid "Begin"
 msgctxt "First page"
 msgid "Begin"
 msgstr "Mula"
 
-#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2533
-#: libraries/Util.class.php:2536 libraries/server_bin_log.lib.php:170
+#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2539
+#: libraries/Util.class.php:2542 libraries/server_bin_log.lib.php:170
 #: libraries/server_bin_log.lib.php:172
 #, fuzzy
 #| msgid "Previous"
@@ -3878,8 +3887,8 @@ msgctxt "Previous page"
 msgid "Previous"
 msgstr "Terdahulu"
 
-#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2564
-#: libraries/Util.class.php:2574 libraries/server_bin_log.lib.php:204
+#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2570
+#: libraries/Util.class.php:2580 libraries/server_bin_log.lib.php:204
 #: libraries/server_bin_log.lib.php:206
 #, fuzzy
 #| msgid "Next"
@@ -3887,8 +3896,8 @@ msgctxt "Next page"
 msgid "Next"
 msgstr "Berikut"
 
-#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2565
-#: libraries/Util.class.php:2575
+#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2571
+#: libraries/Util.class.php:2581
 #, fuzzy
 #| msgid "End"
 msgctxt "Last page"
@@ -3975,9 +3984,9 @@ msgid "May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]."
 msgstr ""
 
 #: libraries/DisplayResults.class.php:4332 libraries/Message.class.php:180
-#: libraries/controllers/TableRelationController.class.php:258
+#: libraries/controllers/TableRelationController.class.php:259
 #: libraries/controllers/TableSearchController.class.php:655
-#: libraries/rte/rte_routines.lib.php:1332 libraries/sql_query_form.lib.php:89
+#: libraries/rte/rte_routines.lib.php:1423 libraries/sql_query_form.lib.php:89
 #: tbl_operations.php:227 tbl_row_action.php:138 view_operations.php:62
 #, fuzzy
 #| msgid "Your SQL query has been executed successfully."
@@ -3985,7 +3994,7 @@ msgid "Your SQL query has been executed successfully."
 msgstr "Kueri-SQL anda telah dilaksanakan dengan jaya"
 
 #: libraries/DisplayResults.class.php:4660
-#: libraries/controllers/StructureController.class.php:629
+#: libraries/controllers/DatabaseStructureController.class.php:564
 #, php-format
 msgid ""
 "This view has at least this number of rows. Please refer to %sdocumentation"
@@ -4009,33 +4018,33 @@ msgstr ""
 msgid "%d total"
 msgstr "jumlah"
 
-#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1318
+#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1312
 #, php-format
 msgid "Query took %01.4f seconds."
 msgstr ""
 
 #: libraries/DisplayResults.class.php:4807
-#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4767
-#: libraries/Util.class.php:4773 libraries/mult_submits.inc.php:50
-#: templates/structure/check_all_tables.phtml:2
-#: templates/structure/check_all_tables.phtml:9
+#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4773
+#: libraries/Util.class.php:4779 libraries/mult_submits.inc.php:50
+#: templates/database/structure/check_all_tables.phtml:2
+#: templates/database/structure/check_all_tables.phtml:9
 msgid "With selected:"
 msgstr "Dengan pilihan:"
 
 #: libraries/DisplayResults.class.php:4811
-#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4769
-#: libraries/Util.class.php:4770 libraries/server_privileges.lib.php:1174
+#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4775
+#: libraries/Util.class.php:4776 libraries/server_privileges.lib.php:1174
 #: libraries/server_privileges.lib.php:1175
 #: libraries/server_privileges.lib.php:1387
 #: libraries/server_user_groups.lib.php:231
-#: templates/structure/check_all_tables.phtml:3
-#: templates/structure/check_all_tables.phtml:4
+#: templates/database/structure/check_all_tables.phtml:3
+#: templates/database/structure/check_all_tables.phtml:4
 msgid "Check All"
 msgstr "Tanda Semua"
 
 #: libraries/DisplayResults.class.php:4985 libraries/Header.class.php:383
-#: templates/structure/optional_action_links.phtml:1
-#: templates/structure/print_view_data_dictionary_link.phtml:3
+#: templates/database/structure/print_view_data_dictionary_link.phtml:3
+#: templates/table/structure/optional_action_links.phtml:1
 msgid "Print view"
 msgstr "Paparan Cetak"
 
@@ -4043,7 +4052,8 @@ msgstr "Paparan Cetak"
 msgid "Query results operations"
 msgstr ""
 
-#: libraries/DisplayResults.class.php:5105 templates/tbl_chart.phtml:12
+#: libraries/DisplayResults.class.php:5105
+#: templates/table/chart/tbl_chart.phtml:12
 #, fuzzy
 #| msgid "Display PDF schema"
 msgid "Display chart"
@@ -4139,7 +4149,7 @@ msgid "Click on the bar to scroll to top of page"
 msgstr ""
 
 #: libraries/Header.class.php:749
-#: libraries/plugins/auth/AuthenticationCookie.class.php:152
+#: libraries/plugins/auth/AuthenticationCookie.class.php:140
 #, fuzzy
 #| msgid "Cookies must be enabled past this point."
 msgid "Javascript must be enabled past this point!"
@@ -4163,11 +4173,11 @@ msgid "Keyname"
 msgstr "Nama Kekunci"
 
 #: libraries/Index.class.php:697
-#: libraries/controllers/StructureController.class.php:1962
-#: libraries/controllers/StructureController.class.php:1967
+#: libraries/controllers/TableStructureController.class.php:953
+#: libraries/controllers/TableStructureController.class.php:958
 #: libraries/tracking.lib.php:973
 #: templates/columns_definitions/column_indexes.phtml:11
-#: templates/structure/check_all_table_column.phtml:26
+#: templates/table/structure/check_all_table_column.phtml:26
 msgid "Unique"
 msgstr "Unik"
 
@@ -4186,16 +4196,17 @@ msgstr "Kardinaliti"
 #: libraries/server_collations.lib.php:35 libraries/tracking.lib.php:881
 #: libraries/tracking.lib.php:977
 #: templates/columns_definitions/table_fields_definitions.phtml:33
-#: templates/structure/row_stats_table.phtml:31
-#: templates/structure/table_header.phtml:55
-#: templates/structure/table_structure_header.phtml:7
-#: templates/table/table_header.phtml:8
+#: templates/database/structure/table_header.phtml:55
+#: templates/table/search/table_header.phtml:8
+#: templates/table/structure/row_stats_table.phtml:31
+#: templates/table/structure/table_structure_header.phtml:7
 msgid "Collation"
 msgstr "Pengumpulan"
 
 #: libraries/Index.class.php:703 libraries/rte/rte_events.lib.php:496
-#: libraries/rte/rte_routines.lib.php:956 libraries/tracking.lib.php:885
-#: libraries/tracking.lib.php:979 templates/structure/table_header.phtml:84
+#: libraries/rte/rte_routines.lib.php:1047 libraries/tracking.lib.php:885
+#: libraries/tracking.lib.php:979
+#: templates/database/structure/table_header.phtml:84
 #, fuzzy
 msgid "Comment"
 msgstr "Komen"
@@ -4209,15 +4220,15 @@ msgstr "Kekunci utama telah digugurkan."
 msgid "Index %s has been dropped."
 msgstr "Indeks %s telah digugurkan."
 
-#: libraries/Index.class.php:757 libraries/Util.class.php:3630
-#: libraries/Util.class.php:3631
-#: libraries/controllers/StructureController.class.php:1958
-#: libraries/controllers/StructureController.class.php:1959
+#: libraries/Index.class.php:757 libraries/Util.class.php:3636
+#: libraries/Util.class.php:3637
+#: libraries/controllers/TableStructureController.class.php:949
+#: libraries/controllers/TableStructureController.class.php:950
 #: libraries/operations.lib.php:1607 libraries/rte/rte_list.lib.php:150
 #: libraries/server_databases.lib.php:146
-#: templates/structure/check_all_table_column.phtml:15
-#: templates/structure/check_all_tables.phtml:16
-#: templates/tbl_relation/foreign_key_row.phtml:93
+#: templates/database/structure/check_all_tables.phtml:16
+#: templates/table/relation/foreign_key_row.phtml:93
+#: templates/table/structure/check_all_table_column.phtml:15
 msgid "Drop"
 msgstr "Gugur"
 
@@ -4246,16 +4257,16 @@ msgstr "Pelayan"
 #: libraries/Menu.class.php:248
 #: libraries/navigation/Nodes/Node_View.class.php:32
 #: libraries/tbl_info.inc.php:63
-#: templates/structure/structure_table_row.phtml:97
-#: templates/structure/structure_table_row.phtml:159
+#: templates/database/structure/structure_table_row.phtml:97
+#: templates/database/structure/structure_table_row.phtml:159
 msgid "View"
 msgstr ""
 
 #: libraries/Menu.class.php:325 libraries/Menu.class.php:429
-#: libraries/Menu.class.php:548 libraries/Util.class.php:3334
-#: libraries/Util.class.php:3344 libraries/Util.class.php:3350
-#: libraries/Util.class.php:4313 libraries/Util.class.php:4328
-#: libraries/Util.class.php:4345 libraries/config.values.php:40
+#: libraries/Menu.class.php:548 libraries/Util.class.php:3340
+#: libraries/Util.class.php:3350 libraries/Util.class.php:3356
+#: libraries/Util.class.php:4319 libraries/Util.class.php:4334
+#: libraries/Util.class.php:4351 libraries/config.values.php:40
 #: libraries/config.values.php:48 libraries/config.values.php:110
 #: libraries/config.values.php:116 libraries/config/messages.inc.php:321
 #: libraries/navigation/Nodes/Node_Table.class.php:292
@@ -4263,19 +4274,19 @@ msgid "SQL"
 msgstr "SQL"
 
 #: libraries/Menu.class.php:328 libraries/Menu.class.php:432
-#: libraries/Util.class.php:3335 libraries/Util.class.php:3345
-#: libraries/Util.class.php:3351 libraries/Util.class.php:3625
-#: libraries/Util.class.php:3626 libraries/Util.class.php:4329
-#: libraries/Util.class.php:4346 libraries/config.values.php:41
+#: libraries/Util.class.php:3341 libraries/Util.class.php:3351
+#: libraries/Util.class.php:3357 libraries/Util.class.php:3631
+#: libraries/Util.class.php:3632 libraries/Util.class.php:4335
+#: libraries/Util.class.php:4352 libraries/config.values.php:41
 #: libraries/config.values.php:49 libraries/config.values.php:111
 #: libraries/config.values.php:117
 #: libraries/navigation/Nodes/Node_Table.class.php:286
 msgid "Search"
 msgstr "Cari"
 
-#: libraries/Menu.class.php:338 libraries/Util.class.php:3336
-#: libraries/Util.class.php:3346 libraries/Util.class.php:3627
-#: libraries/Util.class.php:3628 libraries/Util.class.php:4347
+#: libraries/Menu.class.php:338 libraries/Util.class.php:3342
+#: libraries/Util.class.php:3352 libraries/Util.class.php:3633
+#: libraries/Util.class.php:3634 libraries/Util.class.php:4353
 #: libraries/config.values.php:42 libraries/config.values.php:50
 #: libraries/config.values.php:118
 #: libraries/navigation/Nodes/Node_Table.class.php:289
@@ -4284,30 +4295,30 @@ msgid "Insert"
 msgstr "Selit"
 
 #: libraries/Menu.class.php:362 libraries/Menu.class.php:467
-#: libraries/Util.class.php:4334 libraries/Util.class.php:4350
+#: libraries/Util.class.php:4340 libraries/Util.class.php:4356
 #: libraries/config.values.php:106 libraries/server_common.lib.php:51
 #: libraries/server_privileges.lib.php:2370
 #: libraries/server_privileges.lib.php:3158
-#: libraries/server_privileges.lib.php:4221
+#: libraries/server_privileges.lib.php:4247
 msgid "Privileges"
 msgstr "Privilej"
 
 #: libraries/Menu.class.php:371 libraries/Menu.class.php:379
-#: libraries/Menu.class.php:459 libraries/Util.class.php:3338
-#: libraries/Util.class.php:3352 libraries/Util.class.php:4333
-#: libraries/Util.class.php:4351 libraries/config.values.php:112
+#: libraries/Menu.class.php:459 libraries/Util.class.php:3344
+#: libraries/Util.class.php:3358 libraries/Util.class.php:4339
+#: libraries/Util.class.php:4357 libraries/config.values.php:112
 #: view_operations.php:92
 msgid "Operations"
 msgstr "Operasi"
 
 #: libraries/Menu.class.php:384 libraries/Menu.class.php:492
-#: libraries/Util.class.php:4338 libraries/Util.class.php:4352
+#: libraries/Util.class.php:4344 libraries/Util.class.php:4358
 #: libraries/relation.lib.php:255
 msgid "Tracking"
 msgstr ""
 
 #: libraries/Menu.class.php:397 libraries/Menu.class.php:486
-#: libraries/Util.class.php:4337 libraries/Util.class.php:4353
+#: libraries/Util.class.php:4343 libraries/Util.class.php:4359
 #: libraries/navigation/Nodes/Node_Trigger_Container.class.php:24
 #: libraries/plugins/export/ExportHtmlword.class.php:557
 #: libraries/plugins/export/ExportOdt.class.php:685
@@ -4324,16 +4335,16 @@ msgstr ""
 msgid "Database seems to be empty!"
 msgstr ""
 
-#: libraries/Menu.class.php:439 libraries/Util.class.php:4330
+#: libraries/Menu.class.php:439 libraries/Util.class.php:4336
 msgid "Query"
 msgstr "Kueri"
 
-#: libraries/Menu.class.php:472 libraries/Util.class.php:4335
+#: libraries/Menu.class.php:472 libraries/Util.class.php:4341
 #: libraries/rte/rte_words.lib.php:36
 msgid "Routines"
 msgstr ""
 
-#: libraries/Menu.class.php:479 libraries/Util.class.php:4336
+#: libraries/Menu.class.php:479 libraries/Util.class.php:4342
 #: libraries/navigation/Nodes/Node_Event_Container.class.php:26
 #: libraries/plugins/export/ExportSql.class.php:940
 #: libraries/plugins/export/ExportXml.class.php:107
@@ -4341,22 +4352,22 @@ msgstr ""
 msgid "Events"
 msgstr ""
 
-#: libraries/Menu.class.php:498 libraries/Util.class.php:4339
+#: libraries/Menu.class.php:498 libraries/Util.class.php:4345
 msgid "Designer"
 msgstr ""
 
-#: libraries/Menu.class.php:507 libraries/Util.class.php:4340
-#: templates/structure/check_all_tables.phtml:35
+#: libraries/Menu.class.php:507 libraries/Util.class.php:4346
+#: templates/database/structure/check_all_tables.phtml:35
 #, fuzzy
 #| msgid "Add/Delete Field Columns"
 msgid "Central columns"
 msgstr "Tambah/Padam Kolum Medan"
 
-#: libraries/Menu.class.php:544 libraries/Util.class.php:4312
+#: libraries/Menu.class.php:544 libraries/Util.class.php:4318
 #: libraries/config.values.php:103 libraries/config/messages.inc.php:266
 #: libraries/config/messages.inc.php:341
 #: libraries/navigation/NavigationTree.class.php:1239
-#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4332
+#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4358
 msgid "Databases"
 msgstr "pangkalan data"
 
@@ -4367,35 +4378,35 @@ msgid "User accounts"
 msgstr "Pengguna"
 
 #: libraries/Menu.class.php:595 libraries/ServerStatusData.class.php:121
-#: libraries/Util.class.php:4319 libraries/server_common.lib.php:36
+#: libraries/Util.class.php:4325 libraries/server_common.lib.php:36
 #, fuzzy
 msgid "Binary log"
 msgstr "Binari"
 
 #: libraries/Menu.class.php:601 libraries/ServerStatusData.class.php:126
-#: libraries/Util.class.php:4320 libraries/server_common.lib.php:42
-#: templates/structure/body_for_table_summary.phtml:10
-#: templates/structure/table_header.phtml:27
+#: libraries/Util.class.php:4326 libraries/server_common.lib.php:42
+#: templates/database/structure/body_for_table_summary.phtml:10
+#: templates/database/structure/table_header.phtml:27
 msgid "Replication"
 msgstr "Replikasi"
 
 #: libraries/Menu.class.php:606 libraries/ServerStatusData.class.php:193
-#: libraries/Util.class.php:4321 libraries/config.values.php:105
+#: libraries/Util.class.php:4327 libraries/config.values.php:105
 #: libraries/server_engines.lib.php:108 libraries/server_engines.lib.php:112
 #: libraries/sql_query_form.lib.php:421
 msgid "Variables"
 msgstr "Pemboleh-pembolehubah"
 
-#: libraries/Menu.class.php:610 libraries/Util.class.php:4322
+#: libraries/Menu.class.php:610 libraries/Util.class.php:4328
 msgid "Charsets"
 msgstr ""
 
-#: libraries/Menu.class.php:615 libraries/Util.class.php:4323
+#: libraries/Menu.class.php:615 libraries/Util.class.php:4329
 #: libraries/server_common.lib.php:33 libraries/server_plugins.lib.php:27
 msgid "Plugins"
 msgstr ""
 
-#: libraries/Menu.class.php:626 libraries/Util.class.php:4324
+#: libraries/Menu.class.php:626 libraries/Util.class.php:4330
 msgid "Engines"
 msgstr ""
 
@@ -4420,7 +4431,7 @@ msgid_plural "%1$d rows inserted."
 msgstr[0] ""
 msgstr[1] ""
 
-#: libraries/PDF.class.php:70 libraries/Util.class.php:2521
+#: libraries/PDF.class.php:70 libraries/Util.class.php:2527
 #: libraries/browse_foreigners.lib.php:327
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:865
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:890
@@ -4445,7 +4456,7 @@ msgid "Could not save favorite table!"
 msgstr "Dokumentasi"
 
 #: libraries/RecentFavoriteTable.class.php:212
-#: templates/structure/favorite_anchor.phtml:12
+#: templates/database/structure/favorite_anchor.phtml:12
 #, fuzzy
 msgid "Remove from Favorites"
 msgstr "Tukarnama jadual ke"
@@ -4627,7 +4638,7 @@ msgid ""
 msgstr ""
 
 #: libraries/StorageEngine.class.php:373
-#: templates/structure/body_for_table_summary.phtml:50
+#: templates/database/structure/body_for_table_summary.phtml:50
 #, php-format
 msgid "%s is the default storage engine on this MySQL server."
 msgstr "%s adalah pelalai untuk enjin simpanan di dalam MySQL server."
@@ -5052,10 +5063,10 @@ msgstr ""
 
 #: libraries/Util.class.php:726 libraries/rte/rte_events.lib.php:110
 #: libraries/rte/rte_events.lib.php:119 libraries/rte/rte_events.lib.php:150
-#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:153
-#: libraries/rte/rte_routines.lib.php:162
-#: libraries/rte/rte_routines.lib.php:235
-#: libraries/rte/rte_routines.lib.php:1366
+#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:223
+#: libraries/rte/rte_routines.lib.php:250
+#: libraries/rte/rte_routines.lib.php:372
+#: libraries/rte/rte_routines.lib.php:1457
 #: libraries/rte/rte_triggers.lib.php:86 libraries/rte/rte_triggers.lib.php:95
 #: libraries/rte/rte_triggers.lib.php:127
 msgid "MySQL said: "
@@ -5101,76 +5112,79 @@ msgstr "Aha"
 msgid "%B %d, %Y at %I:%M %p"
 msgstr ""
 
-#: libraries/Util.class.php:2019
+#: libraries/Util.class.php:2025
 #, php-format
 msgid "%s days, %s hours, %s minutes and %s seconds"
 msgstr "%s hari, %s jam, %s minit dan %s saat"
 
-#: libraries/Util.class.php:2112
+#: libraries/Util.class.php:2118
 msgid "Missing parameter:"
 msgstr ""
 
-#: libraries/Util.class.php:2645
+#: libraries/Util.class.php:2651
 #, php-format
 msgid "Jump to database \"%s\"."
 msgstr ""
 
-#: libraries/Util.class.php:2670
+#: libraries/Util.class.php:2676
 #, php-format
 msgid "The %s functionality is affected by a known bug, see %s"
 msgstr ""
 
-#: libraries/Util.class.php:2881
+#: libraries/Util.class.php:2887
 msgid "Click to toggle"
 msgstr ""
 
-#: libraries/Util.class.php:3542 prefs_manage.php:248
+#: libraries/Util.class.php:3548 prefs_manage.php:248
 msgid "Browse your computer:"
 msgstr ""
 
-#: libraries/Util.class.php:3567
+#: libraries/Util.class.php:3573
 #, fuzzy, php-format
 #| msgid "web server upload directory"
 msgid "Select from the web server upload directory <b>%s</b>:"
 msgstr "direktori muatnaik pelayan-web"
 
-#: libraries/Util.class.php:3596 libraries/insert_edit.lib.php:1173
+#: libraries/Util.class.php:3602 libraries/insert_edit.lib.php:1171
 msgid "The directory you set for upload work cannot be reached."
 msgstr "Direktori muatnaik yang telah ditetapkan tidak dapat dicapai."
 
-#: libraries/Util.class.php:3607
+#: libraries/Util.class.php:3613
 msgid "There are no files to upload!"
 msgstr ""
 
-#: libraries/Util.class.php:3632 libraries/Util.class.php:3633
-#: templates/structure/check_all_tables.phtml:15
+#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: templates/database/structure/check_all_tables.phtml:15
 msgid "Empty"
 msgstr "Kosong"
 
-#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: libraries/Util.class.php:3644 libraries/Util.class.php:3645
 msgid "Execute"
 msgstr ""
 
-#: libraries/Util.class.php:4152
+#: libraries/Util.class.php:4158
 msgid "Print"
 msgstr "Cetak"
 
-#: libraries/Util.class.php:4257 templates/structure/row_stats_table.phtml:80
-#: templates/structure/table_header.phtml:95
+#: libraries/Util.class.php:4263
+#: templates/database/structure/table_header.phtml:95
+#: templates/table/structure/row_stats_table.phtml:80
 msgid "Creation"
 msgstr "Mewujudkan"
 
-#: libraries/Util.class.php:4263 templates/structure/row_stats_table.phtml:87
-#: templates/structure/table_header.phtml:106
+#: libraries/Util.class.php:4269
+#: templates/database/structure/table_header.phtml:106
+#: templates/table/structure/row_stats_table.phtml:87
 msgid "Last update"
 msgstr "Kemaskini terakhir"
 
-#: libraries/Util.class.php:4269 templates/structure/row_stats_table.phtml:94
-#: templates/structure/table_header.phtml:117
+#: libraries/Util.class.php:4275
+#: templates/database/structure/table_header.phtml:117
+#: templates/table/structure/row_stats_table.phtml:94
 msgid "Last check"
 msgstr "Semakan Terakhir"
 
-#: libraries/Util.class.php:4315
+#: libraries/Util.class.php:4321
 #, fuzzy
 #| msgid "User"
 msgid "Users"
@@ -5195,16 +5209,16 @@ msgid "Use this value"
 msgstr "Guna nilai ini"
 
 #: libraries/build_html_for_db.lib.php:33 libraries/import.lib.php:193
-#: templates/structure/actions_in_table_structure.phtml:113
-#: templates/structure/row_stats_table.phtml:42
-#: templates/structure/table_header.phtml:36
+#: templates/database/structure/table_header.phtml:36
+#: templates/table/structure/actions_in_table_structure.phtml:113
+#: templates/table/structure/row_stats_table.phtml:42
 msgid "Rows"
 msgstr "Baris"
 
 #: libraries/build_html_for_db.lib.php:48 libraries/engines/innodb.lib.php:171
-#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:186
-#: libraries/server_status.lib.php:298
-#: templates/structure/display_table_stats.phtml:40
+#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:195
+#: libraries/server_status.lib.php:307
+#: templates/table/structure/display_table_stats.phtml:40
 msgid "Total"
 msgstr "Jumlah"
 
@@ -5214,10 +5228,12 @@ msgid "Jump to database"
 msgstr "Tiada pangkalan data"
 
 #: libraries/build_html_for_db.lib.php:146
+#: templates/database/structure/structure_table_row.phtml:15
 msgid "Not replicated"
 msgstr ""
 
 #: libraries/build_html_for_db.lib.php:158
+#: templates/database/structure/structure_table_row.phtml:16
 msgid "Replicated"
 msgstr ""
 
@@ -5274,17 +5290,17 @@ msgstr ""
 #: libraries/plugins/export/ExportTexytext.class.php:425
 #: libraries/plugins/export/PMA_ExportPdf.class.php:307
 #: libraries/rte/rte_list.lib.php:73 libraries/rte/rte_list.lib.php:85
-#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:830
-#: libraries/rte/rte_routines.lib.php:1492 setup/frames/index.inc.php:162
+#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:921
+#: libraries/rte/rte_routines.lib.php:1583 setup/frames/index.inc.php:162
 #: templates/columns_definitions/table_fields_definitions.phtml:8
-#: templates/structure/table_structure_header.phtml:5
-#: templates/table/create_table.phtml:11
+#: templates/database/create_table.phtml:11
+#: templates/table/structure/table_structure_header.phtml:5
 msgid "Name"
 msgstr "Nama"
 
 #: libraries/central_columns.lib.php:699
 #: libraries/central_columns.lib.php:1381
-#: libraries/rte/rte_routines.lib.php:832
+#: libraries/rte/rte_routines.lib.php:923
 #: templates/columns_definitions/table_fields_definitions.phtml:14
 msgid "Length/Values"
 msgstr "Panjang/Nilai*"
@@ -5307,7 +5323,7 @@ msgid "Select a table"
 msgstr "Pilih Jadual"
 
 #: libraries/central_columns.lib.php:804
-#: templates/structure/add_column.phtml:4
+#: templates/table/structure/add_column.phtml:4
 #, fuzzy
 msgid "Add column"
 msgstr "Tambah medan baru"
@@ -5327,7 +5343,7 @@ msgstr "Tambah medan baru"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1002
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1025
 #: templates/columns_definitions/table_fields_definitions.phtml:36
-#: templates/structure/table_structure_header.phtml:8
+#: templates/table/structure/table_structure_header.phtml:8
 msgid "Attributes"
 msgstr "Atribut"
 
@@ -5446,7 +5462,7 @@ msgid "Double click"
 msgstr ""
 
 #: libraries/config.values.php:95 libraries/config.values.php:124
-#: libraries/config/FormDisplay.tpl.php:221 libraries/relation.lib.php:97
+#: libraries/config/FormDisplay.tpl.php:232 libraries/relation.lib.php:97
 #: libraries/relation.lib.php:105
 msgid "Disabled"
 msgstr "Tidak Membenarkan"
@@ -5637,21 +5653,21 @@ msgstr ""
 msgid "maximum %s"
 msgstr ""
 
-#: libraries/config/FormDisplay.tpl.php:219
+#: libraries/config/FormDisplay.tpl.php:230
 msgid "This setting is disabled, it will not be applied to your configuration."
 msgstr ""
 
-#: libraries/config/FormDisplay.tpl.php:313
+#: libraries/config/FormDisplay.tpl.php:324
 #, php-format
 msgid "Set value: %s"
 msgstr ""
 
-#: libraries/config/FormDisplay.tpl.php:318
+#: libraries/config/FormDisplay.tpl.php:329
 #: libraries/config/messages.inc.php:610
 msgid "Restore default value"
 msgstr ""
 
-#: libraries/config/FormDisplay.tpl.php:332
+#: libraries/config/FormDisplay.tpl.php:343
 msgid "Allow users to customize this value"
 msgstr ""
 
@@ -6084,7 +6100,7 @@ msgstr "Fail bagi set Aksara:"
 
 #: libraries/config/messages.inc.php:136 libraries/config/messages.inc.php:152
 #: libraries/sql_query_form.lib.php:247
-#: templates/structure/row_stats_table.phtml:7
+#: templates/table/structure/row_stats_table.phtml:7
 msgid "Format"
 msgstr "Format"
 
@@ -6631,7 +6647,7 @@ msgstr ""
 
 #: libraries/config/messages.inc.php:332
 #: libraries/plugins/export/ExportPdf.class.php:279
-#: templates/structure/secondary_tabs.phtml:8
+#: templates/table/secondary_tabs.phtml:8
 #, fuzzy
 #| msgid "Databases"
 msgid "Table structure"
@@ -8231,109 +8247,35 @@ msgstr ""
 msgid "OpenDocument Text"
 msgstr "Dokumentasi"
 
-#: libraries/controllers/StructureController.class.php:465
+#: libraries/controllers/DatabaseStructureController.class.php:405
 #: tbl_operations.php:382
 #, php-format
 msgid "Table %s has been emptied."
 msgstr "Jadual %s telah dikosongkan."
 
-#: libraries/controllers/StructureController.class.php:486
+#: libraries/controllers/DatabaseStructureController.class.php:426
 #: tbl_operations.php:400 view_operations.php:119
 #, fuzzy, php-format
 #| msgid "View %s has been dropped."
 msgid "View %s has been dropped."
 msgstr "Medan %s telah digugurkan"
 
-#: libraries/controllers/StructureController.class.php:487
+#: libraries/controllers/DatabaseStructureController.class.php:427
 #: tbl_operations.php:401
 #, fuzzy, php-format
 #| msgid "Table %s has been dropped."
 msgid "Table %s has been dropped."
 msgstr "Jadual %s telah digugurkan"
 
-#: libraries/controllers/StructureController.class.php:797
-#, php-format
-msgid "The name '%s' is a MySQL reserved keyword."
-msgid_plural "The names '%s' are MySQL reserved keywords."
-msgstr[0] ""
-
-#: libraries/controllers/StructureController.class.php:875
-msgid "No column selected."
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1049
+#: libraries/controllers/DatabaseStructureController.class.php:733
 msgid "Favorite List is full!"
 msgstr ""
 
-#: libraries/controllers/StructureController.class.php:1272
-#, fuzzy
-#| msgid "Database %s has been dropped."
-msgid "The columns have been moved successfully."
-msgstr "angkalan data %s telah digugurkan."
-
-#: libraries/controllers/StructureController.class.php:1535
-#, fuzzy, php-format
-#| msgid "Table %s has been moved to %s."
-msgid ""
-"Table %1$s has been altered successfully. Privileges have been adjusted."
-msgstr "Jadual %s telah dipindahkan ke %s."
-
-#: libraries/controllers/StructureController.class.php:1541
-#: libraries/controllers/TableIndexesController.class.php:161
-#: tbl_addfield.php:92
-#, php-format
-msgid "Table %1$s has been altered successfully."
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1588
-#: libraries/tracking.lib.php:1094
-#, fuzzy
-#| msgid "Query type"
-msgid "Query error"
-msgstr "Jenis Kueri"
-
-#: libraries/controllers/StructureController.class.php:1806
+#: libraries/controllers/DatabaseStructureController.class.php:947
 #: libraries/mysql_charsets.lib.php:366 libraries/mysql_charsets.lib.php:373
 msgid "unknown"
 msgstr "tidak diketahui"
 
-#: libraries/controllers/StructureController.class.php:1957
-#: templates/structure/check_all_table_column.phtml:11
-msgid "Change"
-msgstr "Ubah"
-
-#: libraries/controllers/StructureController.class.php:1961
-#: libraries/controllers/StructureController.class.php:1966
-#: libraries/navigation/Nodes/Node_Index.class.php:30
-#: libraries/tracking.lib.php:926
-#: templates/columns_definitions/column_indexes.phtml:16
-#: templates/columns_definitions/table_fields_definitions.phtml:57
-#: templates/structure/check_all_table_column.phtml:30
-#: templates/structure/display_structure.phtml:79
-#: templates/structure/display_table_stats.phtml:19
-msgid "Index"
-msgstr "Indeks"
-
-#: libraries/controllers/StructureController.class.php:1963
-#: libraries/controllers/StructureController.class.php:1968
-#: templates/columns_definitions/column_indexes.phtml:27
-#: templates/structure/check_all_table_column.phtml:37
-msgid "Spatial"
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1964
-#: libraries/controllers/StructureController.class.php:1969
-#: templates/columns_definitions/column_indexes.phtml:22
-#: templates/structure/check_all_table_column.phtml:47
-msgid "Fulltext"
-msgstr "Tekspenuh"
-
-#: libraries/controllers/StructureController.class.php:1970
-#, fuzzy
-#| msgid "Session value"
-msgid "Distinct values"
-msgstr "Nilai Sessi"
-
 #: libraries/controllers/TableChartController.class.php:82
 #: libraries/controllers/TableGisVisualizationController.class.php:101
 msgid "No SQL query was set to fetch data."
@@ -8349,13 +8291,20 @@ msgstr ""
 msgid "No data to display"
 msgstr "Tiada pangkalan data"
 
-#: libraries/controllers/TableRelationController.class.php:217
+#: libraries/controllers/TableIndexesController.class.php:161
+#: libraries/controllers/TableStructureController.class.php:736
+#: tbl_addfield.php:92
+#, php-format
+msgid "Table %1$s has been altered successfully."
+msgstr ""
+
+#: libraries/controllers/TableRelationController.class.php:218
 #, fuzzy
 #| msgid "Thread %s was successfully killed."
 msgid "Display column was successfully updated."
 msgstr "Bebenang %s telah berjaya dimatikan."
 
-#: libraries/controllers/TableRelationController.class.php:283
+#: libraries/controllers/TableRelationController.class.php:288
 #, fuzzy
 msgid "Internal relations were successfully updated."
 msgstr "Ciri-ciri hubungan am"
@@ -8373,11 +8322,78 @@ msgid "Zoom search"
 msgstr "Cari"
 
 #: libraries/controllers/TableSearchController.class.php:852
-#: templates/table/selection_form.phtml:59
+#: templates/table/search/selection_form.phtml:59
 #, fuzzy
 msgid "Find and replace"
 msgstr "kueri-SQL"
 
+#: libraries/controllers/TableStructureController.class.php:163
+#, php-format
+msgid "The name '%s' is a MySQL reserved keyword."
+msgid_plural "The names '%s' are MySQL reserved keywords."
+msgstr[0] ""
+
+#: libraries/controllers/TableStructureController.class.php:241
+msgid "No column selected."
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:467
+#, fuzzy
+#| msgid "Database %s has been dropped."
+msgid "The columns have been moved successfully."
+msgstr "angkalan data %s telah digugurkan."
+
+#: libraries/controllers/TableStructureController.class.php:730
+#, fuzzy, php-format
+#| msgid "Table %s has been moved to %s."
+msgid ""
+"Table %1$s has been altered successfully. Privileges have been adjusted."
+msgstr "Jadual %s telah dipindahkan ke %s."
+
+#: libraries/controllers/TableStructureController.class.php:783
+#: libraries/tracking.lib.php:1094
+#, fuzzy
+#| msgid "Query type"
+msgid "Query error"
+msgstr "Jenis Kueri"
+
+#: libraries/controllers/TableStructureController.class.php:948
+#: templates/table/structure/check_all_table_column.phtml:11
+msgid "Change"
+msgstr "Ubah"
+
+#: libraries/controllers/TableStructureController.class.php:952
+#: libraries/controllers/TableStructureController.class.php:957
+#: libraries/navigation/Nodes/Node_Index.class.php:30
+#: libraries/tracking.lib.php:926
+#: templates/columns_definitions/column_indexes.phtml:16
+#: templates/columns_definitions/table_fields_definitions.phtml:57
+#: templates/table/structure/check_all_table_column.phtml:30
+#: templates/table/structure/display_structure.phtml:79
+#: templates/table/structure/display_table_stats.phtml:19
+msgid "Index"
+msgstr "Indeks"
+
+#: libraries/controllers/TableStructureController.class.php:954
+#: libraries/controllers/TableStructureController.class.php:959
+#: templates/columns_definitions/column_indexes.phtml:27
+#: templates/table/structure/check_all_table_column.phtml:37
+msgid "Spatial"
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:955
+#: libraries/controllers/TableStructureController.class.php:960
+#: templates/columns_definitions/column_indexes.phtml:22
+#: templates/table/structure/check_all_table_column.phtml:47
+msgid "Fulltext"
+msgstr "Tekspenuh"
+
+#: libraries/controllers/TableStructureController.class.php:963
+#, fuzzy
+#| msgid "Session value"
+msgid "Distinct values"
+msgstr "Nilai Sessi"
+
 #: libraries/core.lib.php:306
 #, php-format
 msgid "The %s extension is missing. Please check your PHP configuration."
@@ -8422,7 +8438,7 @@ msgid "No Password"
 msgstr "Tiada Katalaluan"
 
 #: libraries/display_change_password.lib.php:68
-#: libraries/plugins/auth/AuthenticationCookie.class.php:199
+#: libraries/plugins/auth/AuthenticationCookie.class.php:187
 #: libraries/replication_gui.lib.php:422 libraries/replication_gui.lib.php:862
 #: libraries/server_privileges.lib.php:1640
 msgid "Password:"
@@ -9220,12 +9236,12 @@ msgid "Dump has been saved to file %s."
 msgstr "Longgokan telah disimpan ke fail %s."
 
 #: libraries/import.lib.php:202 libraries/insert_edit.lib.php:124
-#: libraries/rte/rte_routines.lib.php:1353 libraries/sql.lib.php:1312
+#: libraries/rte/rte_routines.lib.php:1444 libraries/sql.lib.php:1306
 #: tbl_get_field.php:44
 msgid "MySQL returned an empty result set (i.e. zero rows)."
 msgstr "MySQL memulangkan set hasil kosong (i.e. sifar baris)."
 
-#: libraries/import.lib.php:265 libraries/sql.lib.php:1326
+#: libraries/import.lib.php:265 libraries/sql.lib.php:1320
 msgid "[ROLLBACK occurred.]"
 msgstr ""
 
@@ -9291,14 +9307,14 @@ msgstr "Cipta indeks pada &nbsp;%s&nbsp;"
 
 #: libraries/insert_edit.lib.php:233
 #: libraries/navigation/Nodes/Node_DatabaseChild.class.php:48
-#: templates/designer/table_list.phtml:40
+#: templates/database/designer/table_list.phtml:40
 msgid "Hide"
 msgstr ""
 
 #: libraries/insert_edit.lib.php:249
 #: libraries/navigation/Nodes/Node_Function.class.php:32
-#: libraries/rte/rte_routines.lib.php:1495
-#: templates/table/table_header.phtml:4
+#: libraries/rte/rte_routines.lib.php:1586
+#: templates/table/search/table_header.phtml:4
 msgid "Function"
 msgstr "Fungsi"
 
@@ -9313,87 +9329,88 @@ msgstr "Binari"
 msgid "Because of its length,<br /> this column might not be editable."
 msgstr "Kerana kepanjangannya, <br />medan ini tidak boleh diedit "
 
-#: libraries/insert_edit.lib.php:1050
+#: libraries/insert_edit.lib.php:1048
 msgid "Binary - do not edit"
 msgstr "Binari - jgn diubah"
 
-#: libraries/insert_edit.lib.php:1176 libraries/server_privileges.lib.php:470
-#: templates/table/options.phtml:36
+#: libraries/insert_edit.lib.php:1174 libraries/server_privileges.lib.php:470
+#: templates/table/search/options.phtml:36
 msgid "Or"
 msgstr "Atau"
 
-#: libraries/insert_edit.lib.php:1177
+#: libraries/insert_edit.lib.php:1175
 #, fuzzy
 #| msgid "web server upload directory"
 msgid "web server upload directory:"
 msgstr "direktori muatnaik pelayan-web"
 
-#: libraries/insert_edit.lib.php:1348 templates/table/input_box.phtml:49
+#: libraries/insert_edit.lib.php:1346
+#: templates/table/search/input_box.phtml:49
 #, fuzzy
 #| msgid "Insert"
 msgid "Edit/Insert"
 msgstr "Selit"
 
-#: libraries/insert_edit.lib.php:1398
+#: libraries/insert_edit.lib.php:1396
 #, php-format
 msgid "Continue insertion with %s rows"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1428
+#: libraries/insert_edit.lib.php:1426
 msgid "and then"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1461
+#: libraries/insert_edit.lib.php:1459
 msgid "Insert as new row"
 msgstr "Selitkan baris baru"
 
-#: libraries/insert_edit.lib.php:1464
+#: libraries/insert_edit.lib.php:1462
 msgid "Insert as new row and ignore errors"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1467
+#: libraries/insert_edit.lib.php:1465
 msgid "Show insert query"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1487
+#: libraries/insert_edit.lib.php:1485
 msgid "Go back to previous page"
 msgstr "Kembali ke muka sebelumnya"
 
-#: libraries/insert_edit.lib.php:1490
+#: libraries/insert_edit.lib.php:1488
 msgid "Insert another new row"
 msgstr "Tambah baris yang baru"
 
-#: libraries/insert_edit.lib.php:1495
+#: libraries/insert_edit.lib.php:1493
 #, fuzzy
 msgid "Go back to this page"
 msgstr "Kembali ke muka sebelumnya"
 
-#: libraries/insert_edit.lib.php:1518
+#: libraries/insert_edit.lib.php:1516
 msgid "Edit next row"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1540
+#: libraries/insert_edit.lib.php:1538
 msgid ""
 "Use TAB key to move from value to value, or CTRL+arrows to move anywhere"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1577 libraries/replication_gui.lib.php:542
-#: libraries/rte/rte_routines.lib.php:1497
+#: libraries/insert_edit.lib.php:1575 libraries/replication_gui.lib.php:542
+#: libraries/rte/rte_routines.lib.php:1588
 #: libraries/server_status_variables.lib.php:220
-#: templates/designer/having_query_panel.phtml:100
-#: templates/designer/options_panel.phtml:73
-#: templates/designer/options_panel.phtml:239
-#: templates/designer/where_query_panel.phtml:69
-#: templates/table/table_header.phtml:10
-#: templates/table/zoom_result_form.phtml:35
+#: templates/database/designer/having_query_panel.phtml:100
+#: templates/database/designer/options_panel.phtml:73
+#: templates/database/designer/options_panel.phtml:239
+#: templates/database/designer/where_query_panel.phtml:69
+#: templates/table/search/table_header.phtml:10
+#: templates/table/search/zoom_result_form.phtml:35
 msgid "Value"
 msgstr "Nilai"
 
-#: libraries/insert_edit.lib.php:1937 libraries/sql.lib.php:1309
+#: libraries/insert_edit.lib.php:1935 libraries/sql.lib.php:1303
 msgid "Showing SQL query"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1962 libraries/sql.lib.php:1287
+#: libraries/insert_edit.lib.php:1960 libraries/sql.lib.php:1281
 #, php-format
 msgid "Inserted row id: %1$d"
 msgstr ""
@@ -9839,7 +9856,7 @@ msgstr ""
 #: libraries/navigation/Nodes/Node_View_Container.class.php:26
 #: libraries/navigation/Nodes/Node_View_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:129
-#: templates/structure/show_create.phtml:30
+#: templates/database/structure/show_create.phtml:30
 msgid "Views"
 msgstr ""
 
@@ -10144,7 +10161,7 @@ msgstr "Anda tidak mempunyai hak mencukupi untuk berada disini sekarang!"
 
 #: libraries/operations.lib.php:101 libraries/operations.lib.php:249
 #: libraries/operations.lib.php:869 libraries/operations.lib.php:963
-#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:907
+#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:998
 #: templates/columns_definitions/table_fields_definitions.phtml:47
 #, fuzzy
 #| msgid "Edit Privileges"
@@ -10238,22 +10255,22 @@ msgid "Switch to copied table"
 msgstr ""
 
 #: libraries/operations.lib.php:1360
-#: templates/structure/check_all_tables.phtml:18
+#: templates/database/structure/check_all_tables.phtml:18
 msgid "Table maintenance"
 msgstr "Penyenggaraan Jadual"
 
 #: libraries/operations.lib.php:1398
-#: templates/structure/check_all_tables.phtml:19
+#: templates/database/structure/check_all_tables.phtml:19
 msgid "Analyze table"
 msgstr ""
 
 #: libraries/operations.lib.php:1413
-#: templates/structure/check_all_tables.phtml:20
+#: templates/database/structure/check_all_tables.phtml:20
 msgid "Check table"
 msgstr "Periksa Jadual"
 
 #: libraries/operations.lib.php:1428
-#: templates/structure/check_all_tables.phtml:22
+#: templates/database/structure/check_all_tables.phtml:22
 #, fuzzy
 #| msgid "Check table"
 msgid "Checksum table"
@@ -10275,18 +10292,19 @@ msgid "Flush the table (FLUSH)"
 msgstr "Buang jadual (\"FLUSH\")"
 
 #: libraries/operations.lib.php:1477
-#: templates/structure/check_all_tables.phtml:23
-#: templates/structure/display_table_stats.phtml:56
+#: templates/database/structure/check_all_tables.phtml:23
+#: templates/table/structure/display_table_stats.phtml:56
 msgid "Optimize table"
 msgstr "Optimakan jadual"
 
 #: libraries/operations.lib.php:1492
-#: templates/structure/check_all_tables.phtml:24
+#: templates/database/structure/check_all_tables.phtml:24
 msgid "Repair table"
 msgstr "Baiki jadual"
 
 #: libraries/operations.lib.php:1538
-#: templates/structure/check_all_tables.phtml:14 view_operations.php:127
+#: templates/database/structure/check_all_tables.phtml:14
+#: view_operations.php:127
 #, fuzzy
 #| msgid "Dumping data for table"
 msgid "Delete data or table"
@@ -10415,7 +10433,7 @@ msgid "Cannot connect: invalid settings."
 msgstr ""
 
 #: libraries/plugins/auth/AuthenticationConfig.class.php:108
-#: libraries/plugins/auth/AuthenticationCookie.class.php:134
+#: libraries/plugins/auth/AuthenticationCookie.class.php:122
 #: libraries/plugins/auth/AuthenticationHttp.class.php:96
 #, php-format
 msgid "Welcome to %s"
@@ -10440,38 +10458,38 @@ msgstr ""
 msgid "Retry to connect"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:146
+#: libraries/plugins/auth/AuthenticationCookie.class.php:134
 msgid "Your session has expired. Please log in again."
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:170
+#: libraries/plugins/auth/AuthenticationCookie.class.php:158
 msgid "Log in"
 msgstr "Logmasuk"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:178
-#: libraries/plugins/auth/AuthenticationCookie.class.php:188
+#: libraries/plugins/auth/AuthenticationCookie.class.php:166
+#: libraries/plugins/auth/AuthenticationCookie.class.php:176
 msgid "You can enter hostname/IP address and port separated by space."
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:193
+#: libraries/plugins/auth/AuthenticationCookie.class.php:181
 msgid "Username:"
 msgstr "Namapengguna:"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:205
+#: libraries/plugins/auth/AuthenticationCookie.class.php:193
 #, fuzzy
 #| msgid "Server Choice"
 msgid "Server Choice:"
 msgstr "Pilihan Pelayan"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:386
+#: libraries/plugins/auth/AuthenticationCookie.class.php:374
 msgid "Entered captcha is wrong, try again!"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:396
+#: libraries/plugins/auth/AuthenticationCookie.class.php:384
 msgid "Please enter correct captcha!"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:423
+#: libraries/plugins/auth/AuthenticationCookie.class.php:411
 #, fuzzy
 #| msgid "Cannot log in to the MySQL server"
 msgid "You are not allowed to log in to this MySQL server!"
@@ -10579,7 +10597,7 @@ msgstr "Hantar"
 #: libraries/plugins/export/ExportOdt.class.php:593
 #: libraries/plugins/export/ExportTexytext.class.php:428
 #: libraries/plugins/export/PMA_ExportPdf.class.php:313
-#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:984
 #: libraries/rte/rte_triggers.lib.php:377
 #, fuzzy
 #| msgid "Description"
@@ -10927,7 +10945,7 @@ msgid "Last check:"
 msgstr "Semakan Terakhir"
 
 #: libraries/plugins/export/ExportSql.class.php:1399
-#: templates/structure/structure_table_row.phtml:183
+#: templates/database/structure/structure_table_row.phtml:183
 msgid "in use"
 msgstr "sedang digunakan"
 
@@ -11121,18 +11139,14 @@ msgstr ""
 msgid "The imported file does not contain any data!"
 msgstr ""
 
-#: libraries/plugins/import/ImportSql.class.php:169
+#: libraries/plugins/import/ImportSql.class.php:72
 msgid "SQL compatibility mode:"
 msgstr ""
 
-#: libraries/plugins/import/ImportSql.class.php:181
+#: libraries/plugins/import/ImportSql.class.php:84
 msgid "Do not use <code>AUTO_INCREMENT</code> for zero values"
 msgstr ""
 
-#: libraries/plugins/import/ImportSql.class.php:195
-msgid "Read as multibytes"
-msgstr ""
-
 #: libraries/plugins/import/ImportXml.class.php:54
 msgid "XML"
 msgstr ""
@@ -11176,7 +11190,7 @@ msgid "Show grid"
 msgstr "Papar grid"
 
 #: libraries/plugins/schema/SchemaPdf.class.php:94
-#: templates/structure/print_view_data_dictionary_link.phtml:6
+#: templates/database/structure/print_view_data_dictionary_link.phtml:6
 msgid "Data Dictionary"
 msgstr "Kamus Data"
 
@@ -11208,7 +11222,7 @@ msgid "The %s table doesn't exist!"
 msgstr "Jadual \"%s\" tidak wujud!"
 
 #: libraries/plugins/schema/eps/Eps_Relation_Schema.class.php:321
-#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:309
+#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:323
 #, fuzzy, php-format
 #| msgid "Schema of the \"%s\" database - Page %s"
 msgid "Schema of the %s database - Page %s"
@@ -11238,7 +11252,7 @@ msgstr "Kandungan"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1005
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1028
 #: libraries/tracking.lib.php:884
-#: templates/structure/table_structure_header.phtml:11
+#: templates/table/structure/table_structure_header.phtml:11
 msgid "Extra"
 msgstr "Ekstra"
 
@@ -11570,51 +11584,51 @@ msgstr ""
 msgid "Create the needed tables with the <code>%screate_tables.sql</code>."
 msgstr ""
 
-#: libraries/relation.lib.php:360
+#: libraries/relation.lib.php:357
 msgid "Create a pma user and give access to these tables."
 msgstr ""
 
-#: libraries/relation.lib.php:365
+#: libraries/relation.lib.php:360
 msgid ""
 "Enable advanced features in configuration file (<code>config.inc.php</"
 "code>), for example by starting from <code>config.sample.inc.php</code>."
 msgstr ""
 
-#: libraries/relation.lib.php:373
+#: libraries/relation.lib.php:365
 msgid "Re-login to phpMyAdmin to load the updated configuration file."
 msgstr ""
 
-#: libraries/relation.lib.php:1612
+#: libraries/relation.lib.php:1607
 msgid "no description"
 msgstr "tiada keterangan"
 
-#: libraries/relation.lib.php:1811
+#: libraries/relation.lib.php:1806
 msgid ""
 "You do not have necessary privileges to create a database named "
 "'phpmyadmin'. You may go to 'Operations' tab of any database to set up the "
 "phpMyAdmin configuration storage there."
 msgstr ""
 
-#: libraries/relation.lib.php:1928
+#: libraries/relation.lib.php:1923
 #, php-format
 msgid ""
 "%sCreate%s a database named 'phpmyadmin' and setup the phpMyAdmin "
 "configuration storage there."
 msgstr ""
 
-#: libraries/relation.lib.php:1936
+#: libraries/relation.lib.php:1931
 #, php-format
 msgid ""
 "%sCreate%s the phpMyAdmin configuration storage in the current database."
 msgstr ""
 
-#: libraries/relation.lib.php:1944
+#: libraries/relation.lib.php:1939
 #, php-format
 msgid "%sCreate%s missing phpMyAdmin configuration storage tables."
 msgstr ""
 
 #: libraries/replication_gui.lib.php:46 libraries/replication_gui.lib.php:343
-#: libraries/server_databases.lib.php:387
+#: libraries/server_databases.lib.php:398
 msgid "Master replication"
 msgstr ""
 
@@ -11670,7 +11684,7 @@ msgid ""
 msgstr ""
 
 #: libraries/replication_gui.lib.php:141
-#: libraries/server_databases.lib.php:389
+#: libraries/server_databases.lib.php:400
 msgid "Slave replication"
 msgstr ""
 
@@ -11955,10 +11969,10 @@ msgid "Master server changed successfully to %s."
 msgstr "Bebenang %s telah berjaya dimatikan."
 
 #: libraries/rte/rte_events.lib.php:106 libraries/rte/rte_events.lib.php:115
-#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:149
-#: libraries/rte/rte_routines.lib.php:158
-#: libraries/rte/rte_routines.lib.php:231
-#: libraries/rte/rte_routines.lib.php:1362
+#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:219
+#: libraries/rte/rte_routines.lib.php:246
+#: libraries/rte/rte_routines.lib.php:368
+#: libraries/rte/rte_routines.lib.php:1453
 #: libraries/rte/rte_triggers.lib.php:82 libraries/rte/rte_triggers.lib.php:91
 #: libraries/rte/rte_triggers.lib.php:123
 #, php-format
@@ -11980,7 +11994,7 @@ msgstr "Jadual %s telah digugurkan"
 msgid "Event %1$s has been created."
 msgstr "Jadual %s telah digugurkan"
 
-#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:251
+#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:266
 #: libraries/rte/rte_triggers.lib.php:144
 msgid "One or more errors have occurred while processing your request:"
 msgstr ""
@@ -11990,7 +12004,7 @@ msgstr ""
 msgid "Edit event"
 msgstr "Hantar"
 
-#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:794
+#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:885
 #: libraries/rte/rte_triggers.lib.php:323 view_create.php:180
 msgid "Details"
 msgstr ""
@@ -12005,7 +12019,7 @@ msgstr "Jenis Kueri"
 msgid "Event type"
 msgstr "Jenis Kueri"
 
-#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:817
+#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:908
 #, fuzzy, php-format
 #| msgid "Change"
 msgid "Change to %s"
@@ -12038,12 +12052,14 @@ msgstr "Tamat"
 msgid "On completion preserve"
 msgstr "Kemasukkan Selesai"
 
-#: libraries/rte/rte_events.lib.php:491 libraries/rte/rte_routines.lib.php:930
+#: libraries/rte/rte_events.lib.php:491
+#: libraries/rte/rte_routines.lib.php:1021
 #: libraries/rte/rte_triggers.lib.php:383 view_create.php:209
 msgid "Definer"
 msgstr ""
 
-#: libraries/rte/rte_events.lib.php:535 libraries/rte/rte_routines.lib.php:997
+#: libraries/rte/rte_events.lib.php:535
+#: libraries/rte/rte_routines.lib.php:1088
 #: libraries/rte/rte_triggers.lib.php:422
 msgid "The definer must be in the \"username@hostname\" format!"
 msgstr ""
@@ -12069,9 +12085,9 @@ msgid "You must provide an event definition."
 msgstr ""
 
 #: libraries/rte/rte_export.lib.php:43 libraries/rte/rte_general.lib.php:72
-#: libraries/rte/rte_routines.lib.php:345
-#: libraries/rte/rte_routines.lib.php:1198
-#: libraries/rte/rte_routines.lib.php:1411
+#: libraries/rte/rte_routines.lib.php:153
+#: libraries/rte/rte_routines.lib.php:1289
+#: libraries/rte/rte_routines.lib.php:1502
 #, fuzzy
 #| msgid "Processes"
 msgid "Error in processing request:"
@@ -12106,142 +12122,142 @@ msgid ""
 "problems."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:110
-#: libraries/rte/rte_routines.lib.php:1006
+#: libraries/rte/rte_routines.lib.php:123
+msgid "Edit routine"
+msgstr ""
+
+#: libraries/rte/rte_routines.lib.php:200
+#: libraries/rte/rte_routines.lib.php:1097
 #, php-format
 msgid "Invalid routine type: \"%s\""
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:170
+#: libraries/rte/rte_routines.lib.php:253
+#, fuzzy, php-format
+msgid "Routine %1$s has been created."
+msgstr "Jadual %s telah digugurkan"
+
+#: libraries/rte/rte_routines.lib.php:380
 msgid "Sorry, we failed to restore the dropped routine."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:211
+#: libraries/rte/rte_routines.lib.php:439
 #, fuzzy, php-format
 #| msgid "Table %s has been dropped."
 msgid "Routine %1$s has been modified. Privileges have been adjusted."
 msgstr "Jadual %s telah digugurkan"
 
-#: libraries/rte/rte_routines.lib.php:216
+#: libraries/rte/rte_routines.lib.php:444
 #, fuzzy, php-format
 #| msgid "Table %s has been dropped."
 msgid "Routine %1$s has been modified."
 msgstr "Jadual %s telah digugurkan"
 
-#: libraries/rte/rte_routines.lib.php:238
-#, fuzzy, php-format
-msgid "Routine %1$s has been created."
-msgstr "Jadual %s telah digugurkan"
-
-#: libraries/rte/rte_routines.lib.php:315
-msgid "Edit routine"
-msgstr ""
-
-#: libraries/rte/rte_routines.lib.php:797
+#: libraries/rte/rte_routines.lib.php:888
 #, fuzzy
 #| msgid "Column names"
 msgid "Routine name"
 msgstr "Nama Kolum"
 
-#: libraries/rte/rte_routines.lib.php:823
+#: libraries/rte/rte_routines.lib.php:914
 msgid "Parameters"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:829
+#: libraries/rte/rte_routines.lib.php:920
 #, fuzzy
 msgid "Direction"
 msgstr "Cipta"
 
-#: libraries/rte/rte_routines.lib.php:847
+#: libraries/rte/rte_routines.lib.php:938
 msgid "Add parameter"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:851
+#: libraries/rte/rte_routines.lib.php:942
 #, fuzzy
 msgid "Remove last parameter"
 msgstr "Tukarnama jadual ke"
 
-#: libraries/rte/rte_routines.lib.php:856
+#: libraries/rte/rte_routines.lib.php:947
 msgid "Return type"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:862
+#: libraries/rte/rte_routines.lib.php:953
 #, fuzzy
 #| msgid "Length/Values"
 msgid "Return length/values"
 msgstr "Panjang/Nilai*"
 
-#: libraries/rte/rte_routines.lib.php:868
+#: libraries/rte/rte_routines.lib.php:959
 #, fuzzy
 msgid "Return options"
 msgstr "Statistik pangkalan data"
 
-#: libraries/rte/rte_routines.lib.php:899
+#: libraries/rte/rte_routines.lib.php:990
 msgid "Is deterministic"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:920
+#: libraries/rte/rte_routines.lib.php:1011
 msgid ""
 "You do not have sufficient privileges to perform this operation; Please "
 "refer to the documentation for more details"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:935
+#: libraries/rte/rte_routines.lib.php:1026
 #, fuzzy
 #| msgid "Query type"
 msgid "Security type"
 msgstr "Jenis Kueri"
 
-#: libraries/rte/rte_routines.lib.php:944
+#: libraries/rte/rte_routines.lib.php:1035
 msgid "SQL data access"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1013
+#: libraries/rte/rte_routines.lib.php:1104
 msgid "You must provide a routine name!"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1047
+#: libraries/rte/rte_routines.lib.php:1138
 #, php-format
 msgid "Invalid direction \"%s\" given for parameter."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1069
-#: libraries/rte/rte_routines.lib.php:1131
+#: libraries/rte/rte_routines.lib.php:1160
+#: libraries/rte/rte_routines.lib.php:1222
 msgid ""
 "You must provide length/values for routine parameters of type ENUM, SET, "
 "VARCHAR and VARBINARY."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1095
+#: libraries/rte/rte_routines.lib.php:1186
 msgid "You must provide a name and a type for each routine parameter."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1114
+#: libraries/rte/rte_routines.lib.php:1205
 msgid "You must provide a valid return type for the routine."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1174
+#: libraries/rte/rte_routines.lib.php:1265
 msgid "You must provide a routine definition."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1285
+#: libraries/rte/rte_routines.lib.php:1376
 #, php-format
 msgid "Execution results of routine %s"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1340
+#: libraries/rte/rte_routines.lib.php:1431
 #, php-format
 msgid "%d row affected by the last statement inside the procedure."
 msgid_plural "%d rows affected by the last statement inside the procedure."
 msgstr[0] ""
 
-#: libraries/rte/rte_routines.lib.php:1398
-#: libraries/rte/rte_routines.lib.php:1406
+#: libraries/rte/rte_routines.lib.php:1489
+#: libraries/rte/rte_routines.lib.php:1497
 msgid "Execute routine"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1485
-#: libraries/rte/rte_routines.lib.php:1488
+#: libraries/rte/rte_routines.lib.php:1576
+#: libraries/rte/rte_routines.lib.php:1579
 msgid "Routine parameters"
 msgstr ""
 
@@ -12418,7 +12434,7 @@ msgid "Original position"
 msgstr ""
 
 #: libraries/server_bin_log.lib.php:133
-#: templates/structure/display_table_stats.phtml:4
+#: templates/table/structure/display_table_stats.phtml:4
 msgid "Information"
 msgstr ""
 
@@ -12454,13 +12470,13 @@ msgid ""
 "between the web server and the MySQL server."
 msgstr ""
 
-#: libraries/server_databases.lib.php:364
-#: libraries/server_databases.lib.php:365
+#: libraries/server_databases.lib.php:366
+#: libraries/server_databases.lib.php:371
 #, fuzzy
 msgid "Enable Statistics"
 msgstr "Statistik pangkalan data"
 
-#: libraries/server_databases.lib.php:481
+#: libraries/server_databases.lib.php:492
 #, fuzzy, php-format
 #| msgid "Database %s has been dropped."
 msgid "%1$d database has been dropped successfully."
@@ -12838,7 +12854,7 @@ msgid "You have revoked the privileges for %s."
 msgstr "Anda telah menarikbalik privilej Keistimewaan untuk %s."
 
 #: libraries/server_privileges.lib.php:2059
-#: libraries/server_privileges.lib.php:4290
+#: libraries/server_privileges.lib.php:4316
 #, fuzzy
 #| msgid "Any user"
 msgid "Add user account"
@@ -13010,58 +13026,58 @@ msgstr ""
 msgid "The privileges were reloaded successfully."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:3994
+#: libraries/server_privileges.lib.php:4003
 #, php-format
 msgid "The user %s already exists!"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4232
+#: libraries/server_privileges.lib.php:4258
 #, fuzzy, php-format
 #| msgid "Privileges"
 msgid "Privileges for %s"
 msgstr "Privilej"
 
-#: libraries/server_privileges.lib.php:4241
+#: libraries/server_privileges.lib.php:4267
 #: libraries/server_status_processes.lib.php:72
 #: libraries/server_user_groups.lib.php:39
 msgid "User"
 msgstr "Pengguna"
 
-#: libraries/server_privileges.lib.php:4282
+#: libraries/server_privileges.lib.php:4308
 msgctxt "Create new user"
 msgid "New"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4311
+#: libraries/server_privileges.lib.php:4337
 #, fuzzy
 #| msgid "Edit Privileges"
 msgid "Edit privileges:"
 msgstr "Ubah Privilej"
 
-#: libraries/server_privileges.lib.php:4312
+#: libraries/server_privileges.lib.php:4338
 #, fuzzy
 #| msgid "User"
 msgid "User account"
 msgstr "Pengguna"
 
-#: libraries/server_privileges.lib.php:4371
+#: libraries/server_privileges.lib.php:4397
 msgid ""
 "Note: You are attempting to edit privileges of the user with which you are "
 "currently logged in."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4391 libraries/server_users.lib.php:25
+#: libraries/server_privileges.lib.php:4417 libraries/server_users.lib.php:25
 msgid "User accounts overview"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4459
+#: libraries/server_privileges.lib.php:4485
 msgid ""
 "A user account allowing any user from localhost to connect is present. This "
 "will prevent other users from connecting if the host part of their account "
 "allows a connection from any (%) host."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4500
+#: libraries/server_privileges.lib.php:4526
 #, php-format
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
@@ -13070,7 +13086,7 @@ msgid ""
 "%sreload the privileges%s before you continue."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4519
+#: libraries/server_privileges.lib.php:4545
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
 "tables. The content of these tables may differ from the privileges the "
@@ -13079,64 +13095,64 @@ msgid ""
 "privilege."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4569
+#: libraries/server_privileges.lib.php:4595
 msgid "The selected user was not found in the privilege table."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4801
+#: libraries/server_privileges.lib.php:4827
 msgid "You have added a new user."
 msgstr "Anda telah menambah pengguna baru."
 
-#: libraries/server_status.lib.php:53
+#: libraries/server_status.lib.php:60
 #, php-format
 msgid "Network traffic since startup: %s"
 msgstr ""
 
-#: libraries/server_status.lib.php:66
+#: libraries/server_status.lib.php:73
 #, fuzzy, php-format
 #| msgid "This MySQL server has been running for %s. It started up on %s."
 msgid "This MySQL server has been running for %1$s. It started up on %2$s."
 msgstr "Pelayan MySQL ini telah berjalan selama %s. Ia dihidupkan pada %s."
 
-#: libraries/server_status.lib.php:80
+#: libraries/server_status.lib.php:94
 msgid ""
 "This MySQL server works as <b>master</b> and <b>slave</b> in <b>replication</"
 "b> process."
 msgstr ""
 
-#: libraries/server_status.lib.php:85
+#: libraries/server_status.lib.php:99
 msgid "This MySQL server works as <b>master</b> in <b>replication</b> process."
 msgstr ""
 
-#: libraries/server_status.lib.php:90
+#: libraries/server_status.lib.php:104
 msgid "This MySQL server works as <b>slave</b> in <b>replication</b> process."
 msgstr ""
 
-#: libraries/server_status.lib.php:106
+#: libraries/server_status.lib.php:116
 msgid "Replication status"
 msgstr ""
 
-#: libraries/server_status.lib.php:137
+#: libraries/server_status.lib.php:146
 msgid ""
 "On a busy server, the byte counters may overrun, so those statistics as "
 "reported by the MySQL server may be incorrect."
 msgstr ""
 
-#: libraries/server_status.lib.php:148
+#: libraries/server_status.lib.php:157
 msgid "Received"
 msgstr "DiTerima"
 
-#: libraries/server_status.lib.php:167
+#: libraries/server_status.lib.php:176
 msgid "Sent"
 msgstr "Hantar"
 
-#: libraries/server_status.lib.php:234
+#: libraries/server_status.lib.php:243
 #, fuzzy
 #| msgid "Connections"
 msgid "Max. concurrent connections"
 msgstr "Hubungan"
 
-#: libraries/server_status.lib.php:244
+#: libraries/server_status.lib.php:253
 msgid "Failed attempts"
 msgstr "Percubaan Gagal"
 
@@ -14108,7 +14124,7 @@ msgstr ""
 msgid "Not implemented yet."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/AlterOperation.php:193
+#: libraries/sql-parser/src/Components/AlterOperation.php:191
 msgid "Unrecognized alter operation."
 msgstr ""
 
@@ -14122,7 +14138,7 @@ msgid "An opening bracket followed by a set of values was expected."
 msgstr ""
 
 #: libraries/sql-parser/src/Components/ArrayObj.php:101
-#: libraries/sql-parser/src/Components/FieldDefinition.php:202
+#: libraries/sql-parser/src/Components/CreateDefinition.php:202
 msgid "An opening bracket was expected."
 msgstr ""
 
@@ -14130,25 +14146,35 @@ msgstr ""
 msgid "A comma or a closing bracket was expected"
 msgstr ""
 
+#: libraries/sql-parser/src/Components/CreateDefinition.php:246
+#, fuzzy
+#| msgid "With selected:"
+msgid "A comma or a closing bracket was expected."
+msgstr "Dengan pilihan:"
+
+#: libraries/sql-parser/src/Components/CreateDefinition.php:262
+msgid "A closing bracket was expected."
+msgstr ""
+
 #: libraries/sql-parser/src/Components/DataType.php:125
 msgid "Unrecognized data type."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:225
+#: libraries/sql-parser/src/Components/Expression.php:227
 msgid "Unexpected closing bracket."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:246
-#: libraries/sql-parser/src/Components/Expression.php:283
-#: libraries/sql-parser/src/Components/Expression.php:303
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:285
+#: libraries/sql-parser/src/Components/Expression.php:305
 msgid "An alias was previously found."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:257
+#: libraries/sql-parser/src/Components/Expression.php:259
 msgid "Unexpected dot."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:327
+#: libraries/sql-parser/src/Components/Expression.php:329
 #, fuzzy
 #| msgid "With selected:"
 msgid "An alias was expected."
@@ -14160,16 +14186,6 @@ msgstr "Dengan pilihan:"
 msgid "An expression was expected."
 msgstr "Dengan pilihan:"
 
-#: libraries/sql-parser/src/Components/FieldDefinition.php:246
-#, fuzzy
-#| msgid "With selected:"
-msgid "A comma or a closing bracket was expected."
-msgstr "Dengan pilihan:"
-
-#: libraries/sql-parser/src/Components/FieldDefinition.php:262
-msgid "A closing bracket was expected."
-msgstr ""
-
 #: libraries/sql-parser/src/Components/Limit.php:90
 #: libraries/sql-parser/src/Components/Limit.php:112
 msgid "An offset was expected."
@@ -14211,26 +14227,26 @@ msgstr ""
 msgid "Expected delimiter."
 msgstr ""
 
-#: libraries/sql-parser/src/Lexer.php:753
+#: libraries/sql-parser/src/Lexer.php:777
 #, fuzzy, php-format
 msgid "Ending quote %1$s was expected."
 msgstr "Jadual %s telah digugurkan"
 
-#: libraries/sql-parser/src/Lexer.php:789
+#: libraries/sql-parser/src/Lexer.php:813
 msgid "Variable name was expected."
 msgstr ""
 
-#: libraries/sql-parser/src/Parser.php:380
+#: libraries/sql-parser/src/Parser.php:391
 #, fuzzy
 #| msgid "At Beginning of Table"
 msgid "Unexpected beginning of statement."
 msgstr "Pada Awalan Jadual"
 
-#: libraries/sql-parser/src/Parser.php:399
+#: libraries/sql-parser/src/Parser.php:410
 msgid "Unrecognized statement type."
 msgstr ""
 
-#: libraries/sql-parser/src/Parser.php:479
+#: libraries/sql-parser/src/Parser.php:489
 msgid "No transaction was previously started."
 msgstr ""
 
@@ -14256,8 +14272,10 @@ msgid "The name of the entity was expected."
 msgstr ""
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:310
-msgid "At least one field definition was expected."
-msgstr ""
+#, fuzzy
+#| msgid "The row has been deleted."
+msgid "At least one column definition was expected."
+msgstr "Baris telah dipadam"
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:329
 msgid "A \"RETURNS\" keyword was expected."
@@ -14326,25 +14344,25 @@ msgstr ""
 msgid "Using bookmark \"%s\" as default browse query."
 msgstr ""
 
-#: libraries/sql.lib.php:1306
+#: libraries/sql.lib.php:1300
 msgid "Showing as PHP code"
 msgstr ""
 
-#: libraries/sql.lib.php:1638
+#: libraries/sql.lib.php:1632
 #, php-format
 msgid ""
 "Current selection does not contain a unique column. Grid edit, checkbox, "
 "Edit, Copy and Delete features are not available. %s"
 msgstr ""
 
-#: libraries/sql.lib.php:1649
+#: libraries/sql.lib.php:1643
 #, php-format
 msgid ""
 "Current selection does not contain a unique column. Grid edit, Edit, Copy "
 "and Delete features may result in undesired behavior. %s"
 msgstr ""
 
-#: libraries/sql.lib.php:1688
+#: libraries/sql.lib.php:1682
 #, php-format
 msgid "Problems with indexes of table `%s`"
 msgstr ""
@@ -14511,7 +14529,7 @@ msgid "Version %s snapshot (SQL code)"
 msgstr ""
 
 #: libraries/tracking.lib.php:947
-#: templates/structure/table_structure_row.phtml:33
+#: templates/table/structure/table_structure_row.phtml:33
 #, fuzzy
 #| msgid "None"
 msgctxt "None for default"
@@ -14565,19 +14583,19 @@ msgstr "Versi Pelayan"
 msgid "Version %1$s was created, tracking for %2$s is active."
 msgstr ""
 
-#: libraries/user_preferences.inc.php:29
+#: libraries/user_preferences.inc.php:30
 #, fuzzy
 #| msgid "General relation features"
 msgid "Manage your settings"
 msgstr "Ciri-ciri hubungan am"
 
-#: libraries/user_preferences.inc.php:46 prefs_manage.php:307
+#: libraries/user_preferences.inc.php:54 prefs_manage.php:307
 #, fuzzy
 #| msgid "Modifications have been saved"
 msgid "Configuration has been saved."
 msgstr "Pengubahsuaian telah disimpan"
 
-#: libraries/user_preferences.inc.php:66
+#: libraries/user_preferences.inc.php:74
 #, php-format
 msgid ""
 "Your preferences will be saved for current session only. Storing them "
@@ -14974,7 +14992,7 @@ msgid "first"
 msgstr ""
 
 #: templates/columns_definitions/move_column.phtml:12
-#: templates/structure/add_column.phtml:21
+#: templates/table/structure/add_column.phtml:21
 #, fuzzy, php-format
 #| msgid "After %s"
 msgid "after %s"
@@ -15056,238 +15074,341 @@ msgstr "Informasi MasaJana"
 msgid "Input transformation options"
 msgstr "Statistik pangkalan data"
 
-#: templates/designer/aggregate_query_panel.phtml:22
-#: templates/designer/options_panel.phtml:100
+#: templates/database/create_table.phtml:7
+#: templates/database/designer/side_menu.phtml:77
+#: templates/database/designer/side_menu.phtml:80
+#, fuzzy
+msgid "Create table"
+msgstr "Cipta Halaman baru"
+
+#: templates/database/create_table.phtml:15
+#, fuzzy
+#| msgid "Number of rows per page"
+msgid "Number of columns"
+msgstr "Bilangan baris per halaman"
+
+#: templates/database/designer/aggregate_query_panel.phtml:22
+#: templates/database/designer/options_panel.phtml:100
 #, fuzzy
 #| msgid "Create"
 msgid "Aggregate"
 msgstr "Cipta"
 
-#: templates/designer/aggregate_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:61
-#: templates/designer/options_panel.phtml:106
-#: templates/designer/options_panel.phtml:170
-#: templates/designer/where_query_panel.phtml:30
-#: templates/table/table_header.phtml:9
+#: templates/database/designer/aggregate_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:61
+#: templates/database/designer/options_panel.phtml:106
+#: templates/database/designer/options_panel.phtml:170
+#: templates/database/designer/where_query_panel.phtml:30
+#: templates/table/search/table_header.phtml:9
 #, fuzzy
 msgid "Operator"
 msgstr "Operasi"
 
-#: templates/designer/database_tables.phtml:29
+#: templates/database/designer/database_tables.phtml:29
 msgid "Toggle"
 msgstr ""
 
-#: templates/designer/database_tables.phtml:40
+#: templates/database/designer/database_tables.phtml:40
 #, fuzzy
 #| msgid "Databases"
 msgid "See table structure"
 msgstr "pangkalan data"
 
-#: templates/designer/delete_relation_panel.phtml:21
+#: templates/database/designer/delete_relation_panel.phtml:21
 msgid "Delete relation"
 msgstr ""
 
-#: templates/designer/edit_delete_pages.phtml:7
+#: templates/database/designer/edit_delete_pages.phtml:7
 #, fuzzy
 #| msgid "Page number:"
 msgid "Page to open"
 msgstr "Muka Surat:"
 
-#: templates/designer/edit_delete_pages.phtml:7
+#: templates/database/designer/edit_delete_pages.phtml:7
 #, fuzzy
 msgid "Page to delete"
 msgstr "Paparan Hubungan"
 
-#: templates/designer/having_query_panel.phtml:90
-#: templates/designer/options_panel.phtml:63
-#: templates/designer/options_panel.phtml:229
-#: templates/designer/where_query_panel.phtml:59
+#: templates/database/designer/having_query_panel.phtml:90
+#: templates/database/designer/options_panel.phtml:63
+#: templates/database/designer/options_panel.phtml:229
+#: templates/database/designer/where_query_panel.phtml:59
 #, fuzzy
 #| msgid "Export"
 msgid "Except"
 msgstr "Eksport"
 
-#: templates/designer/having_query_panel.phtml:102
-#: templates/designer/options_panel.phtml:75
-#: templates/designer/options_panel.phtml:241
-#: templates/designer/where_query_panel.phtml:71
+#: templates/database/designer/having_query_panel.phtml:102
+#: templates/database/designer/options_panel.phtml:75
+#: templates/database/designer/options_panel.phtml:241
+#: templates/database/designer/where_query_panel.phtml:71
 #, fuzzy
 #| msgid "in query"
 msgid "subquery"
 msgstr "pada kueri"
 
-#: templates/designer/new_relation_panel.phtml:22
-#: templates/designer/side_menu.phtml:84 templates/designer/side_menu.phtml:87
+#: templates/database/designer/new_relation_panel.phtml:22
+#: templates/database/designer/side_menu.phtml:84
+#: templates/database/designer/side_menu.phtml:87
 msgid "Create relation"
 msgstr ""
 
-#: templates/designer/options_panel.phtml:34
-#: templates/designer/options_panel.phtml:200
+#: templates/database/designer/options_panel.phtml:34
+#: templates/database/designer/options_panel.phtml:200
 #, fuzzy
 msgid "Relation operator"
 msgstr "Paparan Hubungan"
 
-#: templates/designer/options_panel.phtml:85
-#: templates/designer/rename_to_panel.phtml:23
+#: templates/database/designer/options_panel.phtml:85
+#: templates/database/designer/rename_to_panel.phtml:23
 #, fuzzy
 msgid "Rename to"
 msgstr "Tukarnama jadual ke"
 
-#: templates/designer/options_panel.phtml:91
-#: templates/designer/rename_to_panel.phtml:31
+#: templates/database/designer/options_panel.phtml:91
+#: templates/database/designer/rename_to_panel.phtml:31
 #, fuzzy
 #| msgid "User name"
 msgid "New name"
 msgstr "Kata Pengenalan"
 
-#: templates/designer/page_save_as.phtml:4
+#: templates/database/designer/page_save_as.phtml:4
 #, fuzzy
 #| msgid "Export"
 msgid "Save to selected page"
 msgstr "Eksport"
 
-#: templates/designer/page_save_as.phtml:5
+#: templates/database/designer/page_save_as.phtml:5
 #, fuzzy
 #| msgid "Create a new index"
 msgid "Create a page and save to it"
 msgstr "Cipta indeks baru"
 
-#: templates/designer/page_save_as.phtml:26
+#: templates/database/designer/page_save_as.phtml:26
 #, fuzzy
 #| msgid "User name"
 msgid "New page name"
 msgstr "Kata Pengenalan"
 
-#: templates/designer/page_selector.phtml:2
+#: templates/database/designer/page_selector.phtml:2
 #, fuzzy
 #| msgid "Select All"
 msgid "Select page"
 msgstr "Sila pilih pangkalan data"
 
-#: templates/designer/query_details.phtml:10
+#: templates/database/designer/query_details.phtml:10
 #, fuzzy
 msgid "Active options"
 msgstr "Aksi"
 
-#: templates/designer/schema_export.phtml:4
+#: templates/database/designer/schema_export.phtml:4
 msgid "Select Export Relational Type"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:19 templates/designer/side_menu.phtml:25
+#: templates/database/designer/side_menu.phtml:19
+#: templates/database/designer/side_menu.phtml:25
 #, fuzzy
 #| msgid "Show tables"
 msgid "Show/Hide tables list"
 msgstr "Papar jadual"
 
-#: templates/designer/side_menu.phtml:29 templates/designer/side_menu.phtml:35
-#: templates/designer/side_menu.phtml:36
+#: templates/database/designer/side_menu.phtml:29
+#: templates/database/designer/side_menu.phtml:35
+#: templates/database/designer/side_menu.phtml:36
 msgid "View in fullscreen"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:34
+#: templates/database/designer/side_menu.phtml:34
 msgid "Exit fullscreen"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:41 templates/designer/side_menu.phtml:45
+#: templates/database/designer/side_menu.phtml:41
+#: templates/database/designer/side_menu.phtml:45
 #, fuzzy
 #| msgid "User name"
 msgid "New page"
 msgstr "Kata Pengenalan"
 
-#: templates/designer/side_menu.phtml:70 templates/designer/side_menu.phtml:73
+#: templates/database/designer/side_menu.phtml:70
+#: templates/database/designer/side_menu.phtml:73
 #, fuzzy
 #| msgid "Select All"
 msgid "Delete pages"
 msgstr "Sila pilih pangkalan data"
 
-#: templates/designer/side_menu.phtml:77 templates/designer/side_menu.phtml:80
-#: templates/table/create_table.phtml:7
-#, fuzzy
-msgid "Create table"
-msgstr "Cipta Halaman baru"
-
-#: templates/designer/side_menu.phtml:98
-#: templates/designer/side_menu.phtml:101
+#: templates/database/designer/side_menu.phtml:98
+#: templates/database/designer/side_menu.phtml:101
 msgid "Reload"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:107
-#: templates/designer/side_menu.phtml:110
+#: templates/database/designer/side_menu.phtml:107
+#: templates/database/designer/side_menu.phtml:110
 msgid "Help"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Angular links"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Direct links"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:122
-#: templates/designer/side_menu.phtml:124
+#: templates/database/designer/side_menu.phtml:122
+#: templates/database/designer/side_menu.phtml:124
 msgid "Snap to grid"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:128
-#: templates/designer/side_menu.phtml:134
+#: templates/database/designer/side_menu.phtml:128
+#: templates/database/designer/side_menu.phtml:134
 msgid "Small/Big All"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:138
-#: templates/designer/side_menu.phtml:141
+#: templates/database/designer/side_menu.phtml:138
+#: templates/database/designer/side_menu.phtml:141
 msgid "Toggle small/big"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:145
-#: templates/designer/side_menu.phtml:148
+#: templates/database/designer/side_menu.phtml:145
+#: templates/database/designer/side_menu.phtml:148
 msgid "Toggle relation lines"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:153
-#: templates/designer/side_menu.phtml:156
+#: templates/database/designer/side_menu.phtml:153
+#: templates/database/designer/side_menu.phtml:156
 #, fuzzy
 #| msgid "Export"
 msgid "Export schema"
 msgstr "Eksport"
 
-#: templates/designer/side_menu.phtml:165
-#: templates/designer/side_menu.phtml:168
+#: templates/database/designer/side_menu.phtml:165
+#: templates/database/designer/side_menu.phtml:168
 #, fuzzy
 #| msgid "Submit Query"
 msgid "Build Query"
 msgstr "Hantar Kueri"
 
-#: templates/designer/side_menu.phtml:173
-#: templates/designer/side_menu.phtml:177
+#: templates/database/designer/side_menu.phtml:173
+#: templates/database/designer/side_menu.phtml:177
 msgid "Move Menu"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:181
-#: templates/designer/side_menu.phtml:186
+#: templates/database/designer/side_menu.phtml:181
+#: templates/database/designer/side_menu.phtml:186
 #, fuzzy
 #| msgid "Partial Texts"
 msgid "Pin text"
 msgstr "Sebahagian Teks"
 
-#: templates/designer/table_list.phtml:4
+#: templates/database/designer/table_list.phtml:4
 #, fuzzy
 msgid "Hide/Show all"
 msgstr "Papar semua"
 
-#: templates/designer/table_list.phtml:14
+#: templates/database/designer/table_list.phtml:14
 msgid "Hide/Show Tables with no relation"
 msgstr ""
 
-#: templates/designer/table_list.phtml:59
+#: templates/database/designer/table_list.phtml:59
 #, fuzzy
 #| msgid "Number of rows per page"
 msgid "Number of tables:"
 msgstr "Bilangan baris per halaman"
 
+#: templates/database/structure/body_for_table_summary.phtml:6
+#, php-format
+msgid "%s table"
+msgid_plural "%s tables"
+msgstr[0] "%s jadual"
+
+#: templates/database/structure/body_for_table_summary.phtml:17
+msgid "Sum"
+msgstr "Jumlah"
+
+#: templates/database/structure/check_all_tables.phtml:6
+msgid "Check tables having overhead"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:10
+#, fuzzy
+#| msgid "Show color"
+msgid "Show create"
+msgstr "Papar warna"
+
+#: templates/database/structure/check_all_tables.phtml:27
+msgid "Prefix"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:28
+msgid "Add prefix to table"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:29
+#, fuzzy
+#| msgid "Replace table data with file"
+msgid "Replace table prefix"
+msgstr "Ganti data jadual dengan fail"
+
+#: templates/database/structure/check_all_tables.phtml:30
+#, fuzzy
+#| msgid "Replace table data with file"
+msgid "Copy table with prefix"
+msgstr "Ganti data jadual dengan fail"
+
+#: templates/database/structure/check_all_tables.phtml:36
+#, fuzzy
+msgid "Add columns to central list"
+msgstr "Tambah medan baru"
+
+#: templates/database/structure/check_all_tables.phtml:37
+msgid "Remove columns from central list"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:38
+#, fuzzy
+msgid "Make consistent with central list"
+msgstr "Tambah medan baru"
+
+#: templates/database/structure/favorite_anchor.phtml:12
+#, fuzzy
+msgid "Add to Favorites"
+msgstr "Tambah Pengguna Baru"
+
+#: templates/database/structure/show_create.phtml:2
+msgid "Showing create queries"
+msgstr ""
+
+#: templates/database/structure/sortable_header.phtml:13
+msgid "Sort"
+msgstr "Isih"
+
+#: templates/database/structure/table_header.phtml:42
+msgid ""
+"May be approximate. Click on the number to get the exact count. See "
+"[doc@faq3-11]FAQ 3.11[/doc]."
+msgstr ""
+
+#: templates/database/structure/table_header.phtml:66
+#: templates/table/index_form.phtml:127
+msgid "Size"
+msgstr "Saiz"
+
+#: templates/database/structure/table_header.phtml:74
+#: templates/table/structure/display_table_stats.phtml:27
+msgid "Overhead"
+msgstr "Melebihi"
+
+#: templates/database/structure/tracking_icon.phtml:4
+msgid "Tracking is active."
+msgstr "Pengesan telah diaktifkan."
+
+#: templates/database/structure/tracking_icon.phtml:8
+msgid "Tracking is not active."
+msgstr "Pengesan tidak aktif."
+
 #: templates/error/report_form.phtml:7
 msgid ""
 "phpMyAdmin has encountered an error. We have collected data about this error "
@@ -15303,68 +15424,6 @@ msgstr ""
 msgid "Please explain the steps that lead to the error:"
 msgstr ""
 
-#: templates/gis_visualization/gis_visualization.phtml:3
-msgid "Display GIS Visualization"
-msgstr ""
-
-#: templates/gis_visualization/gis_visualization.phtml:8
-#, fuzzy
-#| msgid "Add/Delete Field Columns"
-msgid "Label column"
-msgstr "Tambah/Padam Kolum Medan"
-
-#: templates/gis_visualization/gis_visualization.phtml:11
-msgid "-- None --"
-msgstr ""
-
-#: templates/gis_visualization/gis_visualization.phtml:19
-#, fuzzy
-#| msgid "Total"
-msgid "Spatial column"
-msgstr "Jumlah"
-
-#: templates/index_form.phtml:16
-msgid "Index name:"
-msgstr "Nama indeks&nbsp;:"
-
-#: templates/index_form.phtml:19
-msgid ""
-"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
-msgstr "\"PRIMARY\" <b>mesti</b> nama dan <b>semesti</b> dari kekunci utama!"
-
-#: templates/index_form.phtml:40
-#, fuzzy
-#| msgid "Index name:"
-msgid "Index choice:"
-msgstr "Nama indeks&nbsp;:"
-
-#: templates/index_form.phtml:57
-msgid "Key block size:"
-msgstr ""
-
-#: templates/index_form.phtml:74
-msgid "Index type:"
-msgstr "Jenis indeks&nbsp;:"
-
-#: templates/index_form.phtml:86
-#, fuzzy
-#| msgid "User"
-msgid "Parser:"
-msgstr "Pengguna"
-
-#: templates/index_form.phtml:102
-#, fuzzy
-msgid "Comment:"
-msgstr "Komen"
-
-#: templates/index_form.phtml:127 templates/structure/table_header.phtml:66
-msgid "Size"
-msgstr "Saiz"
-
-#: templates/index_form.phtml:149 templates/index_form.phtml:190
-msgid "Drag to reorder"
-msgstr ""
-
 #: templates/prefs_autoload.phtml:9
 msgid ""
 "Your browser has phpMyAdmin configuration for this domain. Would you like to "
@@ -15377,477 +15436,443 @@ msgstr ""
 msgid "Start row:"
 msgstr "Sab"
 
-#: templates/structure/actions_in_table_structure.phtml:14
-#, php-format
-msgid "A primary key has been added on %s."
-msgstr "Kekunci utama telah ditambah pada %s."
-
-#: templates/structure/actions_in_table_structure.phtml:34
-#: templates/structure/actions_in_table_structure.phtml:54
-#: templates/structure/actions_in_table_structure.phtml:79
-#: templates/structure/actions_in_table_structure.phtml:101
-#, php-format
-msgid "An index has been added on %s."
-msgstr "Indeks telah ditambah pada %s."
-
-#: templates/structure/actions_in_table_structure.phtml:130
-#: templates/structure/check_all_table_column.phtml:59
-#, fuzzy
-msgid "Remove from central columns"
-msgstr "Tukarnama jadual ke"
-
-#: templates/structure/actions_in_table_structure.phtml:138
-#: templates/structure/check_all_table_column.phtml:55
-#, fuzzy
-msgid "Add to central columns"
-msgstr "Tambah medan baru"
-
-#: templates/structure/add_column.phtml:7
-#, fuzzy, php-format
-msgid "Add %s column(s)"
-msgstr "Tambah medan baru"
-
-#: templates/structure/add_column.phtml:12
-#, fuzzy
-#| msgid "At Beginning of Table"
-msgid "at beginning of table"
-msgstr "Pada Awalan Jadual"
-
-#: templates/structure/body_for_table_summary.phtml:6
-#, php-format
-msgid "%s table"
-msgid_plural "%s tables"
-msgstr[0] "%s jadual"
-
-#: templates/structure/body_for_table_summary.phtml:17
-msgid "Sum"
-msgstr "Jumlah"
-
-#: templates/structure/check_all_tables.phtml:6
-msgid "Check tables having overhead"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:10
-#, fuzzy
-#| msgid "Show color"
-msgid "Show create"
-msgstr "Papar warna"
-
-#: templates/structure/check_all_tables.phtml:27
-msgid "Prefix"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:28
-msgid "Add prefix to table"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:29
-#, fuzzy
-#| msgid "Replace table data with file"
-msgid "Replace table prefix"
-msgstr "Ganti data jadual dengan fail"
-
-#: templates/structure/check_all_tables.phtml:30
-#, fuzzy
-#| msgid "Replace table data with file"
-msgid "Copy table with prefix"
-msgstr "Ganti data jadual dengan fail"
-
-#: templates/structure/check_all_tables.phtml:36
-#, fuzzy
-msgid "Add columns to central list"
-msgstr "Tambah medan baru"
-
-#: templates/structure/check_all_tables.phtml:37
-msgid "Remove columns from central list"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:38
-#, fuzzy
-msgid "Make consistent with central list"
-msgstr "Tambah medan baru"
-
-#: templates/structure/display_structure.phtml:140 view_create.php:181
-#, fuzzy
-#| msgid "Print view"
-msgid "Edit view"
-msgstr "Paparan Cetak"
-
-#: templates/structure/display_table_stats.phtml:9
-msgid "Space usage"
-msgstr "Penggunaan ruang"
-
-#: templates/structure/display_table_stats.phtml:27
-#: templates/structure/table_header.phtml:74
-msgid "Overhead"
-msgstr "Melebihi"
-
-#: templates/structure/display_table_stats.phtml:32
-msgid "Effective"
-msgstr "Berkesan"
-
-#: templates/structure/favorite_anchor.phtml:12
-#, fuzzy
-msgid "Add to Favorites"
-msgstr "Tambah Pengguna Baru"
-
-#: templates/structure/move_columns_dialog.phtml:1
-#: templates/structure/optional_action_links.phtml:21
-#, fuzzy
-msgid "Move columns"
-msgstr "Tambah medan baru"
-
-#: templates/structure/move_columns_dialog.phtml:2
-msgid "Move the columns by dragging them up and down."
-msgstr ""
-
-#: templates/structure/optional_action_links.phtml:9
-msgid "Propose table structure"
-msgstr "Cadangkan struktur jadual"
-
-#: templates/structure/optional_action_links.phtml:24
-#, fuzzy
-#| msgid "Propose table structure"
-msgid "Improve table structure"
-msgstr "Cadangkan struktur jadual"
-
-#: templates/structure/optional_action_links.phtml:30
-#, fuzzy
-#| msgid "Track table"
-msgid "Track view"
-msgstr "Kesan jadual"
-
-#: templates/structure/row_stats_table.phtml:3
-#, fuzzy
-#| msgid "Row Statistics"
-msgid "Row statistics"
-msgstr "Statistik Baris"
-
-#: templates/structure/row_stats_table.phtml:9
-msgid "static"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:11
-msgid "dynamic"
-msgstr "dinamik"
-
-#: templates/structure/row_stats_table.phtml:22
-msgid "partitioned"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:54
-msgid "Row length"
-msgstr "Panjang baris"
-
-#: templates/structure/row_stats_table.phtml:66
-msgid "Row size"
-msgstr "Saiz baris"
-
-#: templates/structure/row_stats_table.phtml:73
-msgid "Next autoindex"
-msgstr ""
-
-#: templates/structure/secondary_tabs.phtml:14
-#, fuzzy
-#| msgid "Relation view"
-msgid "Relation view"
-msgstr "Paparan Hubungan"
-
-#: templates/structure/show_create.phtml:2
-msgid "Showing create queries"
-msgstr ""
-
-#: templates/structure/sortable_header.phtml:13
-msgid "Sort"
-msgstr "Isih"
-
-#: templates/structure/table_header.phtml:42
-msgid ""
-"May be approximate. Click on the number to get the exact count. See "
-"[doc@faq3-11]FAQ 3.11[/doc]."
-msgstr ""
-
-#: templates/structure/table_structure_row.phtml:46
-#, fuzzy, php-format
-#| msgid "Table %s has been dropped."
-msgid "Column %s has been dropped."
-msgstr "Jadual %s telah digugurkan"
-
-#: templates/structure/tracking_icon.phtml:4
-msgid "Tracking is active."
-msgstr "Pengesan telah diaktifkan."
-
-#: templates/structure/tracking_icon.phtml:8
-msgid "Tracking is not active."
-msgstr "Pengesan tidak aktif."
-
-#: templates/table/create_table.phtml:15
-#, fuzzy
-#| msgid "Number of rows per page"
-msgid "Number of columns"
-msgstr "Bilangan baris per halaman"
-
-#: templates/table/options.phtml:8
-#, fuzzy
-#| msgid "Select fields (at least one):"
-msgid "Select columns (at least one):"
-msgstr "Pilih medan (sekurang-kurangnya satu):"
-
-#: templates/table/options.phtml:37
-msgid "Add search conditions (body of the \"where\" clause):"
-msgstr "Tambah kriteria carian (badan bagi klausa \"where\"):"
-
-#: templates/table/options.phtml:45
-msgid "Number of rows per page"
-msgstr "Bilangan baris per halaman"
-
-#: templates/table/options.phtml:56
-msgid "Display order:"
-msgstr "Turutan paparan:"
-
-#: templates/table/options_zoom.phtml:6
-msgid "Use this column to label each point"
-msgstr ""
-
-#: templates/table/options_zoom.phtml:35
-msgid "Maximum rows to plot"
-msgstr ""
-
-#: templates/table/replace_preview.phtml:13
-msgid "Find and replace - preview"
-msgstr ""
-
-#: templates/table/replace_preview.phtml:18
-#, fuzzy
-#| msgid "Linestring"
-msgid "Original string"
-msgstr "Rentetan talian"
-
-#: templates/table/replace_preview.phtml:19
-#, fuzzy
-msgid "Replaced string"
-msgstr "Operasi"
-
-#: templates/table/replace_preview.phtml:40
-#, fuzzy
-msgid "Replace"
-msgstr "Baiki jadual"
-
-#: templates/table/rows_zoom.phtml:16
-#, fuzzy
-msgid "Additional search criteria"
-msgstr "kueri-SQL"
-
-#: templates/table/search_and_replace.phtml:3
-#, fuzzy
-#| msgid "Replace table data with file"
-msgid "Replace with:"
-msgstr "Ganti data jadual dengan fail"
-
-#: templates/table/search_and_replace.phtml:22
-#, fuzzy
-#| msgid "as regular expression"
-msgid "Use regular expression"
-msgstr "sebagai penyataan regular (regexp)"
-
-#: templates/table/selection_form.phtml:12
-#, fuzzy
-#| msgid "Do a \"query by example\" (wildcard: \"%\")"
-msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
-msgstr "Lakukan \"kueri melalui contoh\" (wilidcard: \"%\")"
-
-#: templates/table/selection_form.phtml:34
-msgid "Do a \"query by example\" (wildcard: \"%\")"
-msgstr "Lakukan \"kueri melalui contoh\" (wilidcard: \"%\")"
-
-#: templates/table/zoom_result_form.phtml:7
-msgid "Browse/Edit the points"
-msgstr ""
-
-#: templates/table/zoom_result_form.phtml:15
-msgid "How to use"
-msgstr ""
-
-#: templates/table/zoom_result_form.phtml:23
-#, fuzzy
-#| msgid "Reset"
-msgid "Reset zoom"
-msgstr "Ulangtetap"
-
-#: templates/tbl_chart.phtml:17
+#: templates/table/chart/tbl_chart.phtml:17
 #, fuzzy
 #| msgid "Mar"
 msgctxt "Chart type"
 msgid "Bar"
 msgstr "Mac"
 
-#: templates/tbl_chart.phtml:21
+#: templates/table/chart/tbl_chart.phtml:21
 #, fuzzy
 #| msgid "Column names"
 msgctxt "Chart type"
 msgid "Column"
 msgstr "Nama Kolum"
 
-#: templates/tbl_chart.phtml:25
+#: templates/table/chart/tbl_chart.phtml:25
 msgctxt "Chart type"
 msgid "Line"
 msgstr ""
 
-#: templates/tbl_chart.phtml:29
+#: templates/table/chart/tbl_chart.phtml:29
 msgctxt "Chart type"
 msgid "Spline"
 msgstr ""
 
-#: templates/tbl_chart.phtml:33
+#: templates/table/chart/tbl_chart.phtml:33
 msgctxt "Chart type"
 msgid "Area"
 msgstr ""
 
-#: templates/tbl_chart.phtml:37
+#: templates/table/chart/tbl_chart.phtml:37
 #, fuzzy
 #| msgid "PiB"
 msgctxt "Chart type"
 msgid "Pie"
 msgstr "PB"
 
-#: templates/tbl_chart.phtml:41
+#: templates/table/chart/tbl_chart.phtml:41
 #, fuzzy
 #| msgid "Time"
 msgctxt "Chart type"
 msgid "Timeline"
 msgstr "Masa"
 
-#: templates/tbl_chart.phtml:45
+#: templates/table/chart/tbl_chart.phtml:45
 msgctxt "Chart type"
 msgid "Scatter"
 msgstr ""
 
-#: templates/tbl_chart.phtml:50
+#: templates/table/chart/tbl_chart.phtml:50
 msgid "Stacked"
 msgstr ""
 
-#: templates/tbl_chart.phtml:53
+#: templates/table/chart/tbl_chart.phtml:53
 #, fuzzy
 msgid "Chart title"
 msgstr "Tiada Jadual"
 
-#: templates/tbl_chart.phtml:57
+#: templates/table/chart/tbl_chart.phtml:57
 msgid "X-Axis:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:72
+#: templates/table/chart/tbl_chart.phtml:72
 #, fuzzy
 msgid "Series:"
 msgstr "kueri-SQL"
 
-#: templates/tbl_chart.phtml:102
+#: templates/table/chart/tbl_chart.phtml:102
 msgid "X-Axis label:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:104
+#: templates/table/chart/tbl_chart.phtml:104
 #, fuzzy
 #| msgid "Value"
 msgid "X Values"
 msgstr "Nilai"
 
-#: templates/tbl_chart.phtml:107
+#: templates/table/chart/tbl_chart.phtml:107
 msgid "Y-Axis label:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:115
+#: templates/table/chart/tbl_chart.phtml:115
 msgid "Series names are in a column"
 msgstr ""
 
-#: templates/tbl_chart.phtml:118
+#: templates/table/chart/tbl_chart.phtml:118
 #, fuzzy
 #| msgid "Inside column:"
 msgid "Series column:"
 msgstr "Di dalam kolum:"
 
-#: templates/tbl_chart.phtml:130
+#: templates/table/chart/tbl_chart.phtml:130
 #, fuzzy
 #| msgid "Number of rows per page"
 msgid "Value Column:"
 msgstr "Bilangan baris per halaman"
 
-#: templates/tbl_chart.phtml:150
+#: templates/table/chart/tbl_chart.phtml:150
 #, fuzzy
 #| msgid "Save as file"
 msgid "Save chart as image"
 msgstr "Simpan sebagai fail"
 
-#: templates/tbl_relation/common_form.phtml:7
+#: templates/table/gis_visualization/gis_visualization.phtml:3
+msgid "Display GIS Visualization"
+msgstr ""
+
+#: templates/table/gis_visualization/gis_visualization.phtml:8
+#, fuzzy
+#| msgid "Add/Delete Field Columns"
+msgid "Label column"
+msgstr "Tambah/Padam Kolum Medan"
+
+#: templates/table/gis_visualization/gis_visualization.phtml:11
+msgid "-- None --"
+msgstr ""
+
+#: templates/table/gis_visualization/gis_visualization.phtml:19
+#, fuzzy
+#| msgid "Total"
+msgid "Spatial column"
+msgstr "Jumlah"
+
+#: templates/table/index_form.phtml:16
+msgid "Index name:"
+msgstr "Nama indeks&nbsp;:"
+
+#: templates/table/index_form.phtml:19
+msgid ""
+"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
+msgstr "\"PRIMARY\" <b>mesti</b> nama dan <b>semesti</b> dari kekunci utama!"
+
+#: templates/table/index_form.phtml:40
+#, fuzzy
+#| msgid "Index name:"
+msgid "Index choice:"
+msgstr "Nama indeks&nbsp;:"
+
+#: templates/table/index_form.phtml:57
+msgid "Key block size:"
+msgstr ""
+
+#: templates/table/index_form.phtml:74
+msgid "Index type:"
+msgstr "Jenis indeks&nbsp;:"
+
+#: templates/table/index_form.phtml:86
+#, fuzzy
+#| msgid "User"
+msgid "Parser:"
+msgstr "Pengguna"
+
+#: templates/table/index_form.phtml:102
+#, fuzzy
+msgid "Comment:"
+msgstr "Komen"
+
+#: templates/table/index_form.phtml:149 templates/table/index_form.phtml:190
+msgid "Drag to reorder"
+msgstr ""
+
+#: templates/table/relation/common_form.phtml:7
 #, fuzzy
 msgid "Internal relations"
 msgstr "Ciri-ciri hubungan am"
 
-#: templates/tbl_relation/common_form.phtml:11
+#: templates/table/relation/common_form.phtml:11
 #, fuzzy
 msgid "Internal relation"
 msgstr "Ciri-ciri hubungan am"
 
-#: templates/tbl_relation/common_form.phtml:14
+#: templates/table/relation/common_form.phtml:14
 msgid ""
 "An internal relation is not necessary when a corresponding FOREIGN KEY "
 "relation exists."
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:37
+#: templates/table/relation/common_form.phtml:37
 #, fuzzy
 #| msgid "Add constraints"
 msgid "Foreign key constraints"
 msgstr "Tambahkan kekangan"
 
-#: templates/tbl_relation/common_form.phtml:40
+#: templates/table/relation/common_form.phtml:40
 #, fuzzy
 #| msgid "Action"
 msgid "Actions"
 msgstr "Aksi"
 
-#: templates/tbl_relation/common_form.phtml:41
+#: templates/table/relation/common_form.phtml:41
 #, fuzzy
 #| msgid "Column names"
 msgid "Constraint properties"
 msgstr "Nama Kolum"
 
-#: templates/tbl_relation/common_form.phtml:44
+#: templates/table/relation/common_form.phtml:44
 msgid ""
 "Only columns with index will be displayed. You can define an index below."
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:49
+#: templates/table/relation/common_form.phtml:49
 msgid "Foreign key constraint"
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:81
+#: templates/table/relation/common_form.phtml:81
 #, fuzzy
 #| msgid "Add constraints"
 msgid "+ Add constraint"
 msgstr "Tambahkan kekangan"
 
-#: templates/tbl_relation/common_form.phtml:91
+#: templates/table/relation/common_form.phtml:91
 #, fuzzy
 #| msgid "Choose field to display"
 msgid "Choose column to display:"
 msgstr "Pilih Medan untuk dipapar"
 
-#: templates/tbl_relation/foreign_key_row.phtml:13
+#: templates/table/relation/foreign_key_row.phtml:13
 #, fuzzy, php-format
 #| msgid "Add constraints"
 msgid "Foreign key constraint %s has been dropped"
 msgstr "Tambahkan kekangan"
 
-#: templates/tbl_relation/foreign_key_row.phtml:102
+#: templates/table/relation/foreign_key_row.phtml:102
 #, fuzzy
 #| msgid "Column names"
 msgid "Constraint name"
 msgstr "Nama Kolum"
 
-#: templates/tbl_relation/foreign_key_row.phtml:157
+#: templates/table/relation/foreign_key_row.phtml:157
 #, fuzzy
 msgid "+ Add column"
 msgstr "Tambah medan baru"
 
+#: templates/table/search/options.phtml:8
+#, fuzzy
+#| msgid "Select fields (at least one):"
+msgid "Select columns (at least one):"
+msgstr "Pilih medan (sekurang-kurangnya satu):"
+
+#: templates/table/search/options.phtml:37
+msgid "Add search conditions (body of the \"where\" clause):"
+msgstr "Tambah kriteria carian (badan bagi klausa \"where\"):"
+
+#: templates/table/search/options.phtml:45
+msgid "Number of rows per page"
+msgstr "Bilangan baris per halaman"
+
+#: templates/table/search/options.phtml:56
+msgid "Display order:"
+msgstr "Turutan paparan:"
+
+#: templates/table/search/options_zoom.phtml:6
+msgid "Use this column to label each point"
+msgstr ""
+
+#: templates/table/search/options_zoom.phtml:35
+msgid "Maximum rows to plot"
+msgstr ""
+
+#: templates/table/search/replace_preview.phtml:13
+msgid "Find and replace - preview"
+msgstr ""
+
+#: templates/table/search/replace_preview.phtml:18
+#, fuzzy
+#| msgid "Linestring"
+msgid "Original string"
+msgstr "Rentetan talian"
+
+#: templates/table/search/replace_preview.phtml:19
+#, fuzzy
+msgid "Replaced string"
+msgstr "Operasi"
+
+#: templates/table/search/replace_preview.phtml:40
+#, fuzzy
+msgid "Replace"
+msgstr "Baiki jadual"
+
+#: templates/table/search/rows_zoom.phtml:16
+#, fuzzy
+msgid "Additional search criteria"
+msgstr "kueri-SQL"
+
+#: templates/table/search/search_and_replace.phtml:3
+#, fuzzy
+#| msgid "Replace table data with file"
+msgid "Replace with:"
+msgstr "Ganti data jadual dengan fail"
+
+#: templates/table/search/search_and_replace.phtml:22
+#, fuzzy
+#| msgid "as regular expression"
+msgid "Use regular expression"
+msgstr "sebagai penyataan regular (regexp)"
+
+#: templates/table/search/selection_form.phtml:12
+#, fuzzy
+#| msgid "Do a \"query by example\" (wildcard: \"%\")"
+msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
+msgstr "Lakukan \"kueri melalui contoh\" (wilidcard: \"%\")"
+
+#: templates/table/search/selection_form.phtml:34
+msgid "Do a \"query by example\" (wildcard: \"%\")"
+msgstr "Lakukan \"kueri melalui contoh\" (wilidcard: \"%\")"
+
+#: templates/table/search/zoom_result_form.phtml:7
+msgid "Browse/Edit the points"
+msgstr ""
+
+#: templates/table/search/zoom_result_form.phtml:15
+msgid "How to use"
+msgstr ""
+
+#: templates/table/search/zoom_result_form.phtml:23
+#, fuzzy
+#| msgid "Reset"
+msgid "Reset zoom"
+msgstr "Ulangtetap"
+
+#: templates/table/secondary_tabs.phtml:14
+#, fuzzy
+#| msgid "Relation view"
+msgid "Relation view"
+msgstr "Paparan Hubungan"
+
+#: templates/table/structure/actions_in_table_structure.phtml:14
+#, php-format
+msgid "A primary key has been added on %s."
+msgstr "Kekunci utama telah ditambah pada %s."
+
+#: templates/table/structure/actions_in_table_structure.phtml:34
+#: templates/table/structure/actions_in_table_structure.phtml:54
+#: templates/table/structure/actions_in_table_structure.phtml:79
+#: templates/table/structure/actions_in_table_structure.phtml:101
+#, php-format
+msgid "An index has been added on %s."
+msgstr "Indeks telah ditambah pada %s."
+
+#: templates/table/structure/actions_in_table_structure.phtml:130
+#: templates/table/structure/check_all_table_column.phtml:59
+#, fuzzy
+msgid "Remove from central columns"
+msgstr "Tukarnama jadual ke"
+
+#: templates/table/structure/actions_in_table_structure.phtml:138
+#: templates/table/structure/check_all_table_column.phtml:55
+#, fuzzy
+msgid "Add to central columns"
+msgstr "Tambah medan baru"
+
+#: templates/table/structure/add_column.phtml:7
+#, fuzzy, php-format
+msgid "Add %s column(s)"
+msgstr "Tambah medan baru"
+
+#: templates/table/structure/add_column.phtml:12
+#, fuzzy
+#| msgid "At Beginning of Table"
+msgid "at beginning of table"
+msgstr "Pada Awalan Jadual"
+
+#: templates/table/structure/display_structure.phtml:140 view_create.php:181
+#, fuzzy
+#| msgid "Print view"
+msgid "Edit view"
+msgstr "Paparan Cetak"
+
+#: templates/table/structure/display_table_stats.phtml:9
+msgid "Space usage"
+msgstr "Penggunaan ruang"
+
+#: templates/table/structure/display_table_stats.phtml:32
+msgid "Effective"
+msgstr "Berkesan"
+
+#: templates/table/structure/move_columns_dialog.phtml:1
+#: templates/table/structure/optional_action_links.phtml:21
+#, fuzzy
+msgid "Move columns"
+msgstr "Tambah medan baru"
+
+#: templates/table/structure/move_columns_dialog.phtml:2
+msgid "Move the columns by dragging them up and down."
+msgstr ""
+
+#: templates/table/structure/optional_action_links.phtml:9
+msgid "Propose table structure"
+msgstr "Cadangkan struktur jadual"
+
+#: templates/table/structure/optional_action_links.phtml:24
+#, fuzzy
+#| msgid "Propose table structure"
+msgid "Improve table structure"
+msgstr "Cadangkan struktur jadual"
+
+#: templates/table/structure/optional_action_links.phtml:30
+#, fuzzy
+#| msgid "Track table"
+msgid "Track view"
+msgstr "Kesan jadual"
+
+#: templates/table/structure/row_stats_table.phtml:3
+#, fuzzy
+#| msgid "Row Statistics"
+msgid "Row statistics"
+msgstr "Statistik Baris"
+
+#: templates/table/structure/row_stats_table.phtml:9
+msgid "static"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:11
+msgid "dynamic"
+msgstr "dinamik"
+
+#: templates/table/structure/row_stats_table.phtml:22
+msgid "partitioned"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:54
+msgid "Row length"
+msgstr "Panjang baris"
+
+#: templates/table/structure/row_stats_table.phtml:66
+msgid "Row size"
+msgstr "Saiz baris"
+
+#: templates/table/structure/row_stats_table.phtml:73
+msgid "Next autoindex"
+msgstr ""
+
+#: templates/table/structure/table_structure_row.phtml:46
+#, fuzzy, php-format
+#| msgid "Table %s has been dropped."
+msgid "Column %s has been dropped."
+msgstr "Jadual %s telah digugurkan"
+
 #: themes.php:17 themes.php:22
 msgid "Theme"
 msgstr ""
diff --git a/po/nb.po b/po/nb.po
index c95e4ffb44..027c953026 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 4.5.0-dev\n"
 "Report-Msgid-Bugs-To: developers@phpmyadmin.net\n"
-"POT-Creation-Date: 2015-08-08 13:53-0400\n"
+"POT-Creation-Date: 2015-08-12 08:10-0400\n"
 "PO-Revision-Date: 2015-06-22 04:13+0200\n"
 "Last-Translator: Sebastian <sebastian@sgundersen.com>\n"
 "Language-Team: Norwegian Bokmål <https://hosted.weblate.org/projects/"
@@ -53,7 +53,7 @@ msgid "Table comments:"
 msgstr "Tabellkommentarer:"
 
 #: db_datadict.php:104 libraries/Index.class.php:699
-#: libraries/insert_edit.lib.php:1567
+#: libraries/insert_edit.lib.php:1565
 #: libraries/navigation/Nodes/Node_Column.class.php:30
 #: libraries/plugins/export/ExportHtmlword.class.php:280
 #: libraries/plugins/export/ExportHtmlword.class.php:375
@@ -67,13 +67,14 @@ msgstr "Tabellkommentarer:"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1023
 #: libraries/tracking.lib.php:879 libraries/tracking.lib.php:975
 #: templates/columns_definitions/column_name.phtml:18
-#: templates/index_form.phtml:124 templates/table/table_header.phtml:6
-#: templates/table/zoom_result_form.phtml:33
-#: templates/tbl_relation/common_form.phtml:10
-#: templates/tbl_relation/common_form.phtml:43
-#: templates/tbl_relation/foreign_key_row.phtml:194
-#: templates/tbl_relation/foreign_key_row.phtml:206
-#: templates/tbl_relation/internal_relational_row.phtml:71
+#: templates/table/index_form.phtml:124
+#: templates/table/relation/common_form.phtml:10
+#: templates/table/relation/common_form.phtml:43
+#: templates/table/relation/foreign_key_row.phtml:194
+#: templates/table/relation/foreign_key_row.phtml:206
+#: templates/table/relation/internal_relational_row.phtml:71
+#: templates/table/search/table_header.phtml:6
+#: templates/table/search/zoom_result_form.phtml:33
 msgid "Column"
 msgstr "Kolonne"
 
@@ -91,21 +92,21 @@ msgstr "Kolonne"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1001
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1024
 #: libraries/rte/rte_list.lib.php:75 libraries/rte/rte_list.lib.php:103
-#: libraries/rte/rte_routines.lib.php:802
-#: libraries/rte/rte_routines.lib.php:831
-#: libraries/rte/rte_routines.lib.php:1493
+#: libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_routines.lib.php:922
+#: libraries/rte/rte_routines.lib.php:1584
 #: libraries/server_privileges.lib.php:2369 libraries/tracking.lib.php:880
 #: libraries/tracking.lib.php:972
 #: templates/columns_definitions/table_fields_definitions.phtml:11
-#: templates/structure/table_header.phtml:48
-#: templates/structure/table_structure_header.phtml:6
-#: templates/table/table_header.phtml:7
+#: templates/database/structure/table_header.phtml:48
+#: templates/table/search/table_header.phtml:7
+#: templates/table/structure/table_structure_header.phtml:6
 msgid "Type"
 msgstr "Type"
 
 #: db_datadict.php:106 libraries/Index.class.php:702
 #: libraries/central_columns.lib.php:708
-#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1576
+#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1574
 #: libraries/plugins/export/ExportHtmlword.class.php:286
 #: libraries/plugins/export/ExportHtmlword.class.php:381
 #: libraries/plugins/export/ExportLatex.class.php:509
@@ -118,8 +119,8 @@ msgstr "Type"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1026
 #: libraries/tracking.lib.php:882 libraries/tracking.lib.php:978
 #: templates/columns_definitions/table_fields_definitions.phtml:39
-#: templates/structure/table_structure_header.phtml:9
-#: templates/table/zoom_result_form.phtml:34
+#: templates/table/search/zoom_result_form.phtml:34
+#: templates/table/structure/table_structure_header.phtml:9
 msgid "Null"
 msgstr "Null"
 
@@ -137,8 +138,8 @@ msgstr "Null"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1027
 #: libraries/replication_gui.lib.php:153 libraries/tracking.lib.php:883
 #: templates/columns_definitions/table_fields_definitions.phtml:25
-#: templates/structure/body_for_table_summary.phtml:55
-#: templates/structure/table_structure_header.phtml:10
+#: templates/database/structure/body_for_table_summary.phtml:55
+#: templates/table/structure/table_structure_header.phtml:10
 msgid "Default"
 msgstr "Standard"
 
@@ -166,19 +167,19 @@ msgid "Comments"
 msgstr "Kommentarer"
 
 #: db_datadict.php:146
-#: libraries/controllers/StructureController.class.php:1960
-#: libraries/controllers/StructureController.class.php:1965
+#: libraries/controllers/TableStructureController.class.php:951
+#: libraries/controllers/TableStructureController.class.php:956
 #: libraries/tracking.lib.php:922
 #: templates/columns_definitions/column_indexes.phtml:6
-#: templates/structure/check_all_table_column.phtml:22
-#: templates/structure/display_structure.phtml:74
+#: templates/table/structure/check_all_table_column.phtml:22
+#: templates/table/structure/display_structure.phtml:74
 msgid "Primary"
 msgstr "Primær"
 
 #: db_datadict.php:156 js/messages.php:317 libraries/Index.class.php:567
 #: libraries/Index.class.php:606 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261 libraries/mult_submits.lib.php:403
+#: libraries/config/FormDisplay.tpl.php:272 libraries/mult_submits.lib.php:403
 #: libraries/mult_submits.lib.php:417
 #: libraries/plugins/export/ExportHtmlword.class.php:630
 #: libraries/plugins/export/ExportLatex.class.php:589
@@ -194,20 +195,20 @@ msgstr "Primær"
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1010 libraries/tracking.lib.php:1015
 #: prefs_manage.php:140 templates/prefs_autoload.phtml:15
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "No"
 msgstr "Nei"
 
 #: db_datadict.php:156 js/messages.php:443 libraries/Index.class.php:568
 #: libraries/Index.class.php:605 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261
-#: libraries/controllers/StructureController.class.php:1344
-#: libraries/controllers/StructureController.class.php:2223
-#: libraries/controllers/StructureController.class.php:2232
-#: libraries/controllers/StructureController.class.php:2237
-#: libraries/controllers/StructureController.class.php:2242
-#: libraries/controllers/StructureController.class.php:2247
+#: libraries/config/FormDisplay.tpl.php:272
+#: libraries/controllers/TableStructureController.class.php:539
+#: libraries/controllers/TableStructureController.class.php:1201
+#: libraries/controllers/TableStructureController.class.php:1210
+#: libraries/controllers/TableStructureController.class.php:1215
+#: libraries/controllers/TableStructureController.class.php:1220
+#: libraries/controllers/TableStructureController.class.php:1225
 #: libraries/mult_submits.inc.php:82 libraries/mult_submits.inc.php:178
 #: libraries/mult_submits.lib.php:339 libraries/mult_submits.lib.php:372
 #: libraries/mult_submits.lib.php:401 libraries/mult_submits.lib.php:415
@@ -216,8 +217,8 @@ msgstr "Nei"
 #: libraries/plugins/export/ExportOdt.class.php:756
 #: libraries/plugins/export/ExportTexytext.class.php:567
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1077
-#: libraries/server_databases.lib.php:464
-#: libraries/server_databases.lib.php:474
+#: libraries/server_databases.lib.php:475
+#: libraries/server_databases.lib.php:485
 #: libraries/server_privileges.lib.php:2546
 #: libraries/server_privileges.lib.php:2727
 #: libraries/server_privileges.lib.php:2748
@@ -227,7 +228,7 @@ msgstr "Nei"
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1008 libraries/tracking.lib.php:1013
 #: prefs_manage.php:138 templates/prefs_autoload.phtml:14
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "Yes"
 msgstr "Ja"
 
@@ -237,7 +238,7 @@ msgstr "Vis dump (skjema) av database"
 
 #: db_export.php:37 db_tracking.php:90 export.php:382
 #: libraries/DBQbe.class.php:326
-#: libraries/controllers/StructureController.class.php:231
+#: libraries/controllers/DatabaseStructureController.class.php:170
 #: libraries/navigation/NavigationTree.class.php:897
 msgid "No tables found in database."
 msgstr "Databasen har ingen tabeller."
@@ -248,14 +249,14 @@ msgstr "Databasen har ingen tabeller."
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:26
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:120
-#: templates/structure/show_create.phtml:18
+#: templates/database/structure/show_create.phtml:18
 msgid "Tables"
 msgstr "Tabeller"
 
 #: db_export.php:52 libraries/Menu.class.php:317 libraries/Menu.class.php:425
-#: libraries/Util.class.php:3333 libraries/Util.class.php:3343
-#: libraries/Util.class.php:3349 libraries/Util.class.php:3629
-#: libraries/Util.class.php:4327 libraries/Util.class.php:4344
+#: libraries/Util.class.php:3339 libraries/Util.class.php:3349
+#: libraries/Util.class.php:3355 libraries/Util.class.php:3635
+#: libraries/Util.class.php:4333 libraries/Util.class.php:4350
 #: libraries/central_columns.lib.php:728 libraries/config.values.php:39
 #: libraries/config.values.php:47 libraries/config.values.php:109
 #: libraries/config.values.php:115 libraries/config/setup.forms.php:323
@@ -269,7 +270,7 @@ msgstr "Tabeller"
 #: libraries/navigation/Nodes/Node_Table.class.php:283
 #: libraries/server_privileges.lib.php:1141 libraries/tracking.lib.php:874
 #: templates/columns_definitions/table_fields_definitions.phtml:3
-#: templates/designer/table_list.phtml:28
+#: templates/database/designer/table_list.phtml:28
 msgid "Structure"
 msgstr "Struktur"
 
@@ -281,7 +282,7 @@ msgstr "Struktur"
 #: libraries/config/user_preferences.forms.php:292
 #: libraries/config/user_preferences.forms.php:297
 #: libraries/server_privileges.lib.php:1140
-#: templates/structure/display_table_stats.phtml:12
+#: templates/table/structure/display_table_stats.phtml:12
 msgid "Data"
 msgstr "Data"
 
@@ -355,10 +356,10 @@ msgstr "Overvåkede tabeller"
 #: libraries/server_privileges.lib.php:2908
 #: libraries/server_privileges.lib.php:3145
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4346
-#: templates/structure/table_header.phtml:21
-#: templates/tbl_relation/foreign_key_row.phtml:176
-#: templates/tbl_relation/internal_relational_row.phtml:63
+#: libraries/server_privileges.lib.php:4372
+#: templates/database/structure/table_header.phtml:21
+#: templates/table/relation/foreign_key_row.phtml:176
+#: templates/table/relation/internal_relational_row.phtml:63
 msgid "Table"
 msgstr "Tabell"
 
@@ -375,7 +376,7 @@ msgid "Updated"
 msgstr "Oppdatert"
 
 #: db_tracking.php:130 js/messages.php:243 libraries/Menu.class.php:552
-#: libraries/Util.class.php:4314 libraries/config.values.php:104
+#: libraries/Util.class.php:4320 libraries/config.values.php:104
 #: libraries/rte/rte_events.lib.php:393 libraries/rte/rte_list.lib.php:101
 #: libraries/server_status_processes.lib.php:92 libraries/tracking.lib.php:279
 msgid "Status"
@@ -384,14 +385,15 @@ msgstr "Status"
 #: db_tracking.php:131 db_tracking.php:290 libraries/Index.class.php:693
 #: libraries/central_columns.lib.php:687 libraries/rte/rte_list.lib.php:74
 #: libraries/rte/rte_list.lib.php:89 libraries/rte/rte_list.lib.php:102
-#: libraries/server_databases.lib.php:398
+#: libraries/server_databases.lib.php:409
 #: libraries/server_privileges.lib.php:2372
 #: libraries/server_privileges.lib.php:3166
 #: libraries/server_privileges.lib.php:3342
 #: libraries/server_user_groups.lib.php:82
 #: libraries/server_variables.lib.php:189 libraries/tracking.lib.php:280
-#: libraries/tracking.lib.php:793 templates/structure/table_header.phtml:30
-#: templates/structure/table_structure_header.phtml:23
+#: libraries/tracking.lib.php:793
+#: templates/database/structure/table_header.phtml:30
+#: templates/table/structure/table_structure_header.phtml:23
 msgid "Action"
 msgstr "Handling"
 
@@ -433,7 +435,7 @@ msgid "Untracked tables"
 msgstr "Ikke overvåkede tabeller"
 
 #: db_tracking.php:305 db_tracking.php:336
-#: templates/structure/optional_action_links.phtml:17
+#: templates/table/structure/optional_action_links.phtml:17
 msgid "Track table"
 msgstr "Overvåk tabell"
 
@@ -486,7 +488,7 @@ msgid "Value for the column \"%s\""
 msgstr "Verdien for kolonnen \"%s\""
 
 #: gis_data_editor.php:146
-#: templates/gis_visualization/gis_visualization.phtml:37
+#: templates/table/gis_visualization/gis_visualization.phtml:37
 msgid "Use OpenStreetMaps as Base Layer"
 msgstr "Bruk OpenStreetMaps som baselag"
 
@@ -566,35 +568,35 @@ msgstr "Legg til geometri"
 #: libraries/display_change_password.lib.php:162
 #: libraries/display_export.lib.php:402 libraries/display_export.lib.php:408
 #: libraries/display_import.lib.php:392 libraries/index.lib.php:44
-#: libraries/insert_edit.lib.php:1546 libraries/insert_edit.lib.php:1583
+#: libraries/insert_edit.lib.php:1544 libraries/insert_edit.lib.php:1581
 #: libraries/normalization.lib.php:165 libraries/normalization.lib.php:821
 #: libraries/operations.lib.php:38 libraries/operations.lib.php:108
 #: libraries/operations.lib.php:263 libraries/operations.lib.php:306
 #: libraries/operations.lib.php:801 libraries/operations.lib.php:874
 #: libraries/operations.lib.php:923 libraries/operations.lib.php:1337
 #: libraries/operations.lib.php:1658
-#: libraries/plugins/auth/AuthenticationCookie.class.php:244
+#: libraries/plugins/auth/AuthenticationCookie.class.php:232
 #: libraries/replication_gui.lib.php:122 libraries/replication_gui.lib.php:161
 #: libraries/replication_gui.lib.php:324 libraries/replication_gui.lib.php:461
 #: libraries/replication_gui.lib.php:906 libraries/rte/rte_events.lib.php:509
-#: libraries/rte/rte_routines.lib.php:969
-#: libraries/rte/rte_routines.lib.php:1581
+#: libraries/rte/rte_routines.lib.php:1060
+#: libraries/rte/rte_routines.lib.php:1672
 #: libraries/rte/rte_triggers.lib.php:396 libraries/server_bin_log.lib.php:61
 #: libraries/server_privileges.lib.php:705
 #: libraries/server_privileges.lib.php:2106
 #: libraries/server_privileges.lib.php:2872
 #: libraries/server_privileges.lib.php:3553
-#: libraries/server_privileges.lib.php:4627
+#: libraries/server_privileges.lib.php:4653
 #: libraries/server_user_groups.lib.php:285
 #: libraries/sql_query_form.lib.php:369 libraries/sql_query_form.lib.php:429
 #: libraries/tracking.lib.php:533 libraries/tracking.lib.php:653
 #: prefs_manage.php:277 prefs_manage.php:355
 #: templates/columns_definitions/column_definitions_form.phtml:59
-#: templates/header_location.phtml:17 templates/index_form.phtml:238
+#: templates/database/create_table.phtml:21 templates/header_location.phtml:28
 #: templates/startAndNumberOfRowsPanel.phtml:14
-#: templates/structure/add_column.phtml:25
-#: templates/table/create_table.phtml:21
-#: templates/table/selection_form.phtml:75 view_create.php:275
+#: templates/table/index_form.phtml:238
+#: templates/table/search/selection_form.phtml:75
+#: templates/table/structure/add_column.phtml:25 view_create.php:275
 #: view_operations.php:106
 msgid "Go"
 msgstr "Gjør"
@@ -684,7 +686,7 @@ msgstr ""
 msgid "Could not load import plugins, please check your installation!"
 msgstr "Kan ikke starte importerings-tilleggene, kontroller din installasjon!"
 
-#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1466
+#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1460
 #, php-format
 msgid "Bookmark %s has been created."
 msgstr "Bokmerke %s har blitt opprettet."
@@ -723,11 +725,11 @@ msgstr "Kan ikke laste importprogresjon."
 msgid "Back"
 msgstr "Tilbake"
 
-#: index.php:148 libraries/Footer.class.php:70
+#: index.php:149 libraries/Footer.class.php:70
 msgid "phpMyAdmin Demo Server"
 msgstr "phpMyAdmin Demo-server"
 
-#: index.php:152
+#: index.php:153
 #, php-format
 msgid ""
 "You are using the demo server. You can do anything here, but please do not "
@@ -738,110 +740,110 @@ msgstr ""
 "på root, debian-sys-maint og pma -brukerne. Mer informasjon er tilgjengelig "
 "på %s."
 
-#: index.php:162
+#: index.php:163
 msgid "General Settings"
 msgstr "Generelle innstillinger"
 
-#: index.php:190 libraries/display_change_password.lib.php:50
+#: index.php:191 libraries/display_change_password.lib.php:50
 #: libraries/display_change_password.lib.php:53 user_password.php:247
 msgid "Change password"
 msgstr "Endre passord"
 
-#: index.php:206
+#: index.php:207
 msgid "Server connection collation"
 msgstr "Servertilkobling kollasjon"
 
-#: index.php:228
+#: index.php:229
 msgid "Appearance Settings"
 msgstr "Innstillinger for visning"
 
-#: index.php:258 prefs_manage.php:285
+#: index.php:259 prefs_manage.php:285
 msgid "More settings"
 msgstr "Flere innstillinger"
 
-#: index.php:279
+#: index.php:280
 msgid "Database server"
 msgstr "Database-server"
 
-#: index.php:282 libraries/plugins/auth/AuthenticationCookie.class.php:181
+#: index.php:283 libraries/plugins/auth/AuthenticationCookie.class.php:169
 msgid "Server:"
 msgstr "Server:"
 
-#: index.php:286
+#: index.php:287
 msgid "Server type:"
 msgstr "Server-type:"
 
-#: index.php:290 libraries/plugins/export/ExportLatex.class.php:212
+#: index.php:291 libraries/plugins/export/ExportLatex.class.php:212
 #: libraries/plugins/export/ExportSql.class.php:687
 #: libraries/plugins/export/ExportXml.class.php:189
 msgid "Server version:"
 msgstr "Server-versjon:"
 
-#: index.php:296
+#: index.php:297
 msgid "Protocol version:"
 msgstr "Protokoll-versjon:"
 
-#: index.php:300
+#: index.php:301
 msgid "User:"
 msgstr "Bruker:"
 
-#: index.php:305
+#: index.php:306
 msgid "Server charset:"
 msgstr "Server-tegnsett:"
 
-#: index.php:320
+#: index.php:321
 msgid "Web server"
 msgstr "Webserver"
 
-#: index.php:331
+#: index.php:332
 msgid "Database client version:"
 msgstr "Databaseklient-versjon:"
 
-#: index.php:335
+#: index.php:336
 msgid "PHP extension:"
 msgstr "PHP tillegg:"
 
-#: index.php:349
+#: index.php:350
 msgid "PHP version:"
 msgstr "PHP-versjon:"
 
-#: index.php:360
+#: index.php:361
 msgid "Show PHP information"
 msgstr "Vis PHP-informasjon"
 
-#: index.php:383
+#: index.php:384
 msgid "Version information:"
 msgstr "Versjonsinformasjon:"
 
-#: index.php:392 libraries/Util.class.php:432 libraries/Util.class.php:495
-#: libraries/config/FormDisplay.tpl.php:151
+#: index.php:393 libraries/Util.class.php:432 libraries/Util.class.php:495
+#: libraries/config/FormDisplay.tpl.php:162
 #: libraries/display_export.lib.php:577 libraries/engines/pbxt.lib.php:162
 #: libraries/navigation/NavigationHeader.class.php:196
 #: libraries/server_variables.lib.php:160
 msgid "Documentation"
 msgstr "Dokumentasjon"
 
-#: index.php:399
+#: index.php:400
 msgid "Wiki"
 msgstr "Wiki"
 
-#: index.php:408
+#: index.php:409
 msgid "Official Homepage"
 msgstr "Offisiell hjemmeside"
 
-#: index.php:415
+#: index.php:416
 msgid "Contribute"
 msgstr "Bidra"
 
-#: index.php:422
+#: index.php:423
 msgid "Get support"
 msgstr "Brukerstøtte"
 
-#: index.php:429
+#: index.php:430
 msgid "List of changes"
 msgstr "Endringsliste"
 
-#: index.php:451
+#: index.php:452
 msgid ""
 "You are connected as 'root' with no password, which corresponds to the "
 "default MySQL privileged account. Your MySQL server is running with this "
@@ -853,7 +855,7 @@ msgstr ""
 "standardoppsett, og er dermed sårbar for angrep. Du bør fikse dette "
 "sikkerhetshullet ved å sette passord for brukeren 'root'."
 
-#: index.php:468
+#: index.php:469
 msgid ""
 "You have enabled mbstring.func_overload in your PHP configuration. This "
 "option is incompatible with phpMyAdmin and might cause some data to be "
@@ -862,7 +864,7 @@ msgstr ""
 "Du har slått på mbstring.func_overload i din PHP konfigurasjon. Dette er "
 "ikke kompatibelt med phpMyAdmin og kan medføre at data ødelegges!"
 
-#: index.php:483
+#: index.php:484
 msgid ""
 "The mbstring PHP extension was not found and you seem to be using a "
 "multibyte charset. Without the mbstring extension phpMyAdmin is unable to "
@@ -872,7 +874,7 @@ msgstr ""
 "mangetegns tegnsett. Uten mbstring-tillegget kan ikke phpMyAdmin splitte "
 "strenger korrekt, dette kan medføre uønskede resultater."
 
-#: index.php:500
+#: index.php:501
 msgid ""
 "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini."
 "session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower than "
@@ -884,7 +886,7 @@ msgstr ""
 "cookie gyldighet konfigurert i phpMyAdmin. På grunn av dette så kan "
 "innlogging utløpe raskere enn det som er satt i phpMyAdmin."
 
-#: index.php:519
+#: index.php:520
 msgid ""
 "Login cookie store is lower than cookie validity configured in phpMyAdmin, "
 "because of this, your login will expire sooner than configured in phpMyAdmin."
@@ -893,12 +895,12 @@ msgstr ""
 "phpMyAdmin. Innloggingen din vil dermed utløpe raskere enn det som er satt i "
 "phpMyAdmin."
 
-#: index.php:535
+#: index.php:536
 msgid "The configuration file now needs a secret passphrase (blowfish_secret)."
 msgstr ""
 "Konfigurasjonsfilen trenger nå et hemmelig passordfrase (blowfish_secret)."
 
-#: index.php:548
+#: index.php:549
 msgid ""
 "Directory [code]config[/code], which is used by the setup script, still "
 "exists in your phpMyAdmin directory. It is strongly recommended to remove it "
@@ -910,7 +912,7 @@ msgstr ""
 "phpMyAdmin har blitt konfigurert. Ellers kan uautoriserte personer få tak i "
 "konfigurasjonen din og endre serveren."
 
-#: index.php:564
+#: index.php:565
 #, php-format
 msgid ""
 "The phpMyAdmin configuration storage is not completely configured, some "
@@ -919,14 +921,14 @@ msgstr ""
 "Lagring av phpMyAdmin-oppsett er ikke konfigurert riktig i innstillingene, "
 "og noen tilleggsfunksjoner er deaktivert. %sFinn ut hvorfor%s. "
 
-#: index.php:571
+#: index.php:572
 msgid ""
 "Or alternately go to 'Operations' tab of any database to set it up there."
 msgstr ""
 "Alternativt kan du gå til 'Operasjoner'-fanen for en database og sette det "
 "opp der."
 
-#: index.php:620
+#: index.php:621
 #, php-format
 msgid ""
 "Your PHP MySQL library version %s differs from your MySQL server version %s. "
@@ -935,7 +937,7 @@ msgstr ""
 "Din PHP MySQL bibliotekfilversjon %s er forskjellig fra din MySQL "
 "tjenerversjon %s. Dette kan forårsake uforutsett oppførsel."
 
-#: index.php:648
+#: index.php:649
 #, php-format
 msgid ""
 "Server running with Suhosin. Please refer to %sdocumentation%s for possible "
@@ -1082,8 +1084,8 @@ msgstr ""
 msgid "Save & Close"
 msgstr "Lagre & Lukk"
 
-#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:404
-#: libraries/insert_edit.lib.php:1550 prefs_manage.php:361
+#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:415
+#: libraries/insert_edit.lib.php:1548 prefs_manage.php:361
 #: prefs_manage.php:372
 msgid "Reset"
 msgstr "Tilbakestill"
@@ -1116,7 +1118,7 @@ msgstr "Legg til index"
 msgid "Edit Index"
 msgstr "Rediger indeks"
 
-#: js/messages.php:99 templates/index_form.phtml:232
+#: js/messages.php:99 templates/table/index_form.phtml:232
 #, php-format
 msgid "Add %s column(s) to index"
 msgstr "Legg %s kolonne(r) til index"
@@ -1137,13 +1139,14 @@ msgstr "Kompositt med:"
 msgid "Please select column(s) for the index."
 msgstr "Vennligst velg kolonne(r) for indexen."
 
-#: js/messages.php:106 templates/structure/add_column.phtml:1
+#: js/messages.php:106 templates/table/structure/add_column.phtml:1
 msgid "You have to add at least one column."
 msgstr "Du må sette inn minst en kolonne."
 
-#: js/messages.php:109 libraries/insert_edit.lib.php:1548
+#: js/messages.php:109 libraries/insert_edit.lib.php:1546
 #: templates/columns_definitions/column_definitions_form.phtml:162
-#: templates/index_form.phtml:237 templates/tbl_relation/common_form.phtml:106
+#: templates/table/index_form.phtml:237
+#: templates/table/relation/common_form.phtml:106
 msgid "Preview SQL"
 msgstr "Forhåndsvis SQL"
 
@@ -1160,7 +1163,7 @@ msgid "SQL query:"
 msgstr "SQL-spørring:"
 
 #. l10n: Default label for the y-Axis of Charts
-#: js/messages.php:118 templates/tbl_chart.phtml:109
+#: js/messages.php:118 templates/table/chart/tbl_chart.phtml:109
 msgid "Y Values"
 msgstr "Y-verdier"
 
@@ -1322,7 +1325,7 @@ msgstr "Bytes sendt"
 msgid "Bytes received"
 msgstr "Bytes mottatt"
 
-#: js/messages.php:169 libraries/server_status.lib.php:226
+#: js/messages.php:169 libraries/server_status.lib.php:235
 msgid "Connections"
 msgstr "tilkoblinger"
 
@@ -1379,12 +1382,12 @@ msgstr "%d tabell(er)"
 msgid "Questions"
 msgstr "Spørringer"
 
-#: js/messages.php:184 libraries/server_status.lib.php:134
+#: js/messages.php:184 libraries/server_status.lib.php:143
 msgid "Traffic"
 msgstr "Trafikk"
 
 #: js/messages.php:185 libraries/Menu.class.php:586
-#: libraries/Util.class.php:4318 libraries/server_status_monitor.lib.php:257
+#: libraries/Util.class.php:4324 libraries/server_status_monitor.lib.php:257
 msgid "Settings"
 msgstr "Innstillinger"
 
@@ -1404,8 +1407,9 @@ msgstr "Legg minst én variabel til serien!"
 #: libraries/server_status_monitor.lib.php:236
 #: libraries/server_status_processes.lib.php:308
 #: templates/columns_definitions/transformation.phtml:4
-#: templates/designer/options_panel.phtml:178
-#: templates/table/options_zoom.phtml:12 templates/table/rows_zoom.phtml:26
+#: templates/database/designer/options_panel.phtml:178
+#: templates/table/search/options_zoom.phtml:12
+#: templates/table/search/rows_zoom.phtml:26
 msgid "None"
 msgstr "Ingen"
 
@@ -1695,8 +1699,8 @@ msgstr ""
 
 #: js/messages.php:270 libraries/Menu.class.php:352
 #: libraries/Menu.class.php:455 libraries/Menu.class.php:582
-#: libraries/Util.class.php:4317 libraries/Util.class.php:4332
-#: libraries/Util.class.php:4349 libraries/config/messages.inc.php:258
+#: libraries/Util.class.php:4323 libraries/Util.class.php:4338
+#: libraries/Util.class.php:4355 libraries/config/messages.inc.php:258
 #: libraries/display_import.lib.php:105
 #: libraries/server_status_monitor.lib.php:318 prefs_manage.php:238
 #: setup/frames/menu.inc.php:26
@@ -1756,13 +1760,13 @@ msgid "Formatting SQL..."
 msgstr "Formaterer SQL..."
 
 #: js/messages.php:293 libraries/server_variables.lib.php:157
-#: templates/designer/aggregate_query_panel.phtml:63
-#: templates/designer/delete_relation_panel.phtml:28
-#: templates/designer/having_query_panel.phtml:117
-#: templates/designer/new_relation_panel.phtml:88
-#: templates/designer/options_panel.phtml:253
-#: templates/designer/rename_to_panel.phtml:45
-#: templates/designer/where_query_panel.phtml:83
+#: templates/database/designer/aggregate_query_panel.phtml:63
+#: templates/database/designer/delete_relation_panel.phtml:28
+#: templates/database/designer/having_query_panel.phtml:117
+#: templates/database/designer/new_relation_panel.phtml:88
+#: templates/database/designer/options_panel.phtml:253
+#: templates/database/designer/rename_to_panel.phtml:45
+#: templates/database/designer/where_query_panel.phtml:83
 msgid "Cancel"
 msgstr "Avbryt"
 
@@ -1770,7 +1774,7 @@ msgstr "Avbryt"
 msgid "Page-related settings"
 msgstr "Side-relaterte innstillinger"
 
-#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:402
+#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:413
 msgid "Apply"
 msgstr ""
 
@@ -1805,8 +1809,8 @@ msgstr "Feilkode: %s"
 msgid "Error text: %s"
 msgstr "Feilmelding: %s"
 
-#: js/messages.php:307 libraries/db_common.inc.php:68
-#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:450
+#: js/messages.php:307 libraries/db_common.inc.php:69
+#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:461
 msgid "No databases selected."
 msgstr "Ingen databaser er valgt."
 
@@ -1818,12 +1822,13 @@ msgstr "Dropper kolonne"
 msgid "Adding Primary Key"
 msgstr "Legger til primærnøkkel"
 
-#: js/messages.php:310 templates/designer/aggregate_query_panel.phtml:59
-#: templates/designer/having_query_panel.phtml:113
-#: templates/designer/new_relation_panel.phtml:87
-#: templates/designer/options_panel.phtml:252
-#: templates/designer/rename_to_panel.phtml:41
-#: templates/designer/where_query_panel.phtml:82
+#: js/messages.php:310
+#: templates/database/designer/aggregate_query_panel.phtml:59
+#: templates/database/designer/having_query_panel.phtml:113
+#: templates/database/designer/new_relation_panel.phtml:87
+#: templates/database/designer/options_panel.phtml:252
+#: templates/database/designer/rename_to_panel.phtml:41
+#: templates/database/designer/where_query_panel.phtml:82
 msgid "OK"
 msgstr "OK"
 
@@ -1843,7 +1848,7 @@ msgstr "Kopierer database"
 msgid "Changing Charset"
 msgstr "Endrer tegnsett"
 
-#: js/messages.php:320 libraries/Util.class.php:3217
+#: js/messages.php:320 libraries/Util.class.php:3223
 msgid "Enable foreign key checks"
 msgstr "Slå på kontroll av fremmednøkler"
 
@@ -1878,20 +1883,21 @@ msgstr "Definisjonen av en lagret funksjon må inneholde RETURN erklæring!"
 #: js/messages.php:334 libraries/DisplayResults.class.php:4834
 #: libraries/DisplayResults.class.php:5092 libraries/Menu.class.php:344
 #: libraries/Menu.class.php:446 libraries/Menu.class.php:578
-#: libraries/Util.class.php:3636 libraries/Util.class.php:3637
-#: libraries/Util.class.php:4316 libraries/Util.class.php:4331
-#: libraries/Util.class.php:4348 libraries/config/messages.inc.php:252
+#: libraries/Util.class.php:3642 libraries/Util.class.php:3643
+#: libraries/Util.class.php:4322 libraries/Util.class.php:4337
+#: libraries/Util.class.php:4354 libraries/config/messages.inc.php:252
 #: libraries/display_export.lib.php:173 libraries/rte/rte_list.lib.php:146
 #: libraries/server_privileges.lib.php:2211
 #: libraries/server_privileges.lib.php:2290
 #: libraries/server_privileges.lib.php:2632
 #: libraries/server_privileges.lib.php:3356
 #: libraries/server_status_monitor.lib.php:322 prefs_manage.php:303
-#: setup/frames/menu.inc.php:27 templates/structure/check_all_tables.phtml:11
+#: setup/frames/menu.inc.php:27
+#: templates/database/structure/check_all_tables.phtml:11
 msgid "Export"
 msgstr "Eksporter"
 
-#: js/messages.php:337 libraries/rte/rte_routines.lib.php:652
+#: js/messages.php:337 libraries/rte/rte_routines.lib.php:743
 msgid "ENUM/SET editor"
 msgstr "ENUM/SET-editor"
 
@@ -1932,7 +1938,7 @@ msgstr "Vis spørringsboks"
 #: libraries/Console.class.php:214 libraries/DisplayResults.class.php:3474
 #: libraries/DisplayResults.class.php:4818 libraries/Index.class.php:723
 #: libraries/Util.class.php:706 libraries/Util.class.php:1202
-#: libraries/Util.class.php:3634 libraries/Util.class.php:3635
+#: libraries/Util.class.php:3640 libraries/Util.class.php:3641
 #: libraries/central_columns.lib.php:851
 #: libraries/central_columns.lib.php:1193
 #: libraries/config/messages.inc.php:892
@@ -1950,7 +1956,7 @@ msgstr "Rediger"
 #: libraries/server_user_groups.lib.php:129
 #: libraries/sql_query_form.lib.php:416 libraries/tracking.lib.php:477
 #: setup/frames/index.inc.php:183 setup/frames/index.inc.php:291
-#: templates/designer/delete_relation_panel.phtml:27
+#: templates/database/designer/delete_relation_panel.phtml:27
 msgid "Delete"
 msgstr "Slett"
 
@@ -2119,11 +2125,11 @@ msgid "No dependencies selected!"
 msgstr "Ingen avhengigheter er valgt!"
 
 #: js/messages.php:394 libraries/central_columns.lib.php:1214
-#: libraries/insert_edit.lib.php:1458 libraries/server_variables.lib.php:155
+#: libraries/insert_edit.lib.php:1456 libraries/server_variables.lib.php:155
 #: setup/frames/config.inc.php:42 setup/frames/index.inc.php:279
 #: templates/columns_definitions/column_definitions_form.phtml:165
-#: templates/gis_visualization/gis_visualization.phtml:48
-#: templates/tbl_relation/common_form.phtml:107
+#: templates/table/gis_visualization/gis_visualization.phtml:48
+#: templates/table/relation/common_form.phtml:107
 msgid "Save"
 msgstr "Lagre"
 
@@ -2203,8 +2209,8 @@ msgid "Data point content"
 msgstr "Datapunktinnhold"
 
 #: js/messages.php:430 js/messages.php:562 js/messages.php:579
-#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2573
-#: templates/index_form.phtml:154 templates/index_form.phtml:194
+#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2571
+#: templates/table/index_form.phtml:154 templates/table/index_form.phtml:194
 msgid "Ignore"
 msgstr "Ignorer"
 
@@ -2265,8 +2271,8 @@ msgstr "Velg fremmednøkkel"
 msgid "Please select the primary key or a unique key!"
 msgstr "Velg primærnøkkelen eller en unik nøkkel!"
 
-#: js/messages.php:457 templates/designer/side_menu.phtml:91
-#: templates/designer/side_menu.phtml:94
+#: js/messages.php:457 templates/database/designer/side_menu.phtml:91
+#: templates/database/designer/side_menu.phtml:94
 msgid "Choose column to display"
 msgstr "Velg kolonne for visning"
 
@@ -2282,18 +2288,18 @@ msgstr ""
 msgid "Page name"
 msgstr "Sidenummer"
 
-#: js/messages.php:463 templates/designer/side_menu.phtml:56
-#: templates/designer/side_menu.phtml:59
+#: js/messages.php:463 templates/database/designer/side_menu.phtml:56
+#: templates/database/designer/side_menu.phtml:59
 msgid "Save page"
 msgstr "Lagre side"
 
-#: js/messages.php:464 templates/designer/side_menu.phtml:63
-#: templates/designer/side_menu.phtml:66
+#: js/messages.php:464 templates/database/designer/side_menu.phtml:63
+#: templates/database/designer/side_menu.phtml:66
 msgid "Save page as"
 msgstr "Lagre side som"
 
-#: js/messages.php:465 templates/designer/side_menu.phtml:49
-#: templates/designer/side_menu.phtml:52
+#: js/messages.php:465 templates/database/designer/side_menu.phtml:49
+#: templates/database/designer/side_menu.phtml:52
 msgid "Open page"
 msgstr "Åpne siden"
 
@@ -2301,7 +2307,7 @@ msgstr "Åpne siden"
 msgid "Delete page"
 msgstr "Slett side"
 
-#: js/messages.php:467 templates/designer/side_menu.phtml:10
+#: js/messages.php:467 templates/database/designer/side_menu.phtml:10
 msgid "Untitled"
 msgstr "Ikke navngitt"
 
@@ -2422,7 +2428,7 @@ msgstr "Opprinnelig lengde"
 msgid "cancel"
 msgstr "avbryt"
 
-#: js/messages.php:499 libraries/server_status.lib.php:271
+#: js/messages.php:499 libraries/server_status.lib.php:280
 msgid "Aborted"
 msgstr "Avbrutt"
 
@@ -2993,7 +2999,7 @@ msgstr "Vennligst tast inn et gyldig tall!"
 
 #: js/messages.php:793 libraries/Message.class.php:199
 #: libraries/Util.class.php:654 libraries/core.lib.php:245
-#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1172
+#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1170
 #: tbl_operations.php:229 view_operations.php:63
 msgid "Error"
 msgstr "Feil"
@@ -3054,8 +3060,8 @@ msgstr "per sekund"
 msgid "per minute"
 msgstr "per minutt"
 
-#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:143
-#: libraries/server_status.lib.php:228
+#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:152
+#: libraries/server_status.lib.php:237
 #: libraries/server_status_queries.lib.php:98
 msgid "per hour"
 msgstr "per time"
@@ -3073,7 +3079,7 @@ msgstr "Nåværende konfigurasjonsfil (%s) er ikke lesbar."
 msgid "Wrong permissions on configuration file, should not be world writable!"
 msgstr "Gale tillatelser på konfigurasjonsfilen, den burde ikke være skrivbar!"
 
-#: libraries/Config.class.php:1799
+#: libraries/Config.class.php:1801
 msgid "Font size"
 msgstr "Fontstørrelse"
 
@@ -3101,10 +3107,10 @@ msgstr "Spør igjen"
 #: libraries/server_privileges.lib.php:2890
 #: libraries/server_privileges.lib.php:3144
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4332
+#: libraries/server_privileges.lib.php:4358
 #: libraries/server_status_processes.lib.php:80
-#: templates/tbl_relation/foreign_key_row.phtml:165
-#: templates/tbl_relation/internal_relational_row.phtml:55
+#: templates/table/relation/foreign_key_row.phtml:165
+#: templates/table/relation/internal_relational_row.phtml:55
 msgid "Database"
 msgstr "Database"
 
@@ -3197,11 +3203,11 @@ msgstr "Historikk"
 #: libraries/plugins/import/ImportMediawiki.class.php:60
 #: libraries/plugins/import/ImportOds.class.php:59
 #: libraries/plugins/import/ImportShp.class.php:57
-#: libraries/plugins/import/ImportSql.class.php:148
+#: libraries/plugins/import/ImportSql.class.php:51
 #: libraries/plugins/import/ImportXml.class.php:58
-#: libraries/rte/rte_routines.lib.php:833 templates/index_form.phtml:49
-#: templates/structure/row_stats_table.phtml:20
-#: templates/table/options.phtml:2
+#: libraries/rte/rte_routines.lib.php:924 templates/table/index_form.phtml:49
+#: templates/table/search/options.phtml:2
+#: templates/table/structure/row_stats_table.phtml:20
 msgid "Options"
 msgstr "Innstillinger"
 
@@ -3241,7 +3247,8 @@ msgstr "Synkende"
 msgid "Order:"
 msgstr "Annet"
 
-#: libraries/Console.class.php:289 templates/table/replace_preview.phtml:17
+#: libraries/Console.class.php:289
+#: templates/table/search/replace_preview.phtml:17
 msgid "Count"
 msgstr "Antall"
 
@@ -3352,9 +3359,9 @@ msgstr "Bytt til kopiert tabell"
 #: libraries/operations.lib.php:794 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:191
-#: templates/structure/sortable_header.phtml:21
-#: templates/structure/sortable_header.phtml:38
-#: templates/table/options.phtml:68
+#: templates/database/structure/sortable_header.phtml:21
+#: templates/database/structure/sortable_header.phtml:38
+#: templates/table/search/options.phtml:68
 msgid "Ascending"
 msgstr "Stigende"
 
@@ -3364,13 +3371,14 @@ msgstr "Stigende"
 #: libraries/operations.lib.php:797 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:188
-#: templates/structure/sortable_header.phtml:26
-#: templates/structure/sortable_header.phtml:43
-#: templates/table/options.phtml:69
+#: templates/database/structure/sortable_header.phtml:26
+#: templates/database/structure/sortable_header.phtml:43
+#: templates/table/search/options.phtml:69
 msgid "Descending"
 msgstr "Synkende"
 
-#: libraries/DBQbe.class.php:467 templates/table/search_and_replace.phtml:6
+#: libraries/DBQbe.class.php:467
+#: templates/table/search/search_and_replace.phtml:6
 msgid "Column:"
 msgstr "Kolonne:"
 
@@ -3530,12 +3538,12 @@ msgstr[0] "%1$s treff i <strong>%2$s</strong>"
 msgstr[1] "%1$s treff i <strong>%2$s</strong>"
 
 #: libraries/DbSearch.class.php:354 libraries/Menu.class.php:311
-#: libraries/Util.class.php:3337 libraries/Util.class.php:3347
-#: libraries/Util.class.php:3623 libraries/Util.class.php:3624
-#: libraries/Util.class.php:4343 libraries/config.values.php:43
+#: libraries/Util.class.php:3343 libraries/Util.class.php:3353
+#: libraries/Util.class.php:3629 libraries/Util.class.php:3630
+#: libraries/Util.class.php:4349 libraries/config.values.php:43
 #: libraries/config.values.php:51 libraries/config.values.php:119
 #: libraries/navigation/Nodes/Node_Table.class.php:295
-#: templates/structure/check_all_table_column.phtml:5
+#: templates/table/structure/check_all_table_column.phtml:5
 msgid "Browse"
 msgstr "Se på"
 
@@ -3552,7 +3560,8 @@ msgstr "Søk i database"
 msgid "Words or values to search for (wildcard: \"%\"):"
 msgstr "Ord eller verdier å søke med (jokertegn: \"%\"):"
 
-#: libraries/DbSearch.class.php:401 templates/table/search_and_replace.phtml:1
+#: libraries/DbSearch.class.php:401
+#: templates/table/search/search_and_replace.phtml:1
 msgid "Find:"
 msgstr "Finn:"
 
@@ -3596,28 +3605,28 @@ msgstr "Filter rader"
 msgid "Search this table"
 msgstr "Søk i denne tabellen"
 
-#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2532
-#: libraries/Util.class.php:2535
+#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2538
+#: libraries/Util.class.php:2541
 msgctxt "First page"
 msgid "Begin"
 msgstr "Start"
 
-#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2533
-#: libraries/Util.class.php:2536 libraries/server_bin_log.lib.php:170
+#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2539
+#: libraries/Util.class.php:2542 libraries/server_bin_log.lib.php:170
 #: libraries/server_bin_log.lib.php:172
 msgctxt "Previous page"
 msgid "Previous"
 msgstr "Forrige"
 
-#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2564
-#: libraries/Util.class.php:2574 libraries/server_bin_log.lib.php:204
+#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2570
+#: libraries/Util.class.php:2580 libraries/server_bin_log.lib.php:204
 #: libraries/server_bin_log.lib.php:206
 msgctxt "Next page"
 msgid "Next"
 msgstr "Neste"
 
-#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2565
-#: libraries/Util.class.php:2575
+#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2571
+#: libraries/Util.class.php:2581
 msgctxt "Last page"
 msgid "End"
 msgstr "Siste"
@@ -3692,15 +3701,15 @@ msgid "May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]."
 msgstr "Kan være unøyaktig. Se [doc@faq3-11]FAQ 3.11[/doc]."
 
 #: libraries/DisplayResults.class.php:4332 libraries/Message.class.php:180
-#: libraries/controllers/TableRelationController.class.php:258
+#: libraries/controllers/TableRelationController.class.php:259
 #: libraries/controllers/TableSearchController.class.php:655
-#: libraries/rte/rte_routines.lib.php:1332 libraries/sql_query_form.lib.php:89
+#: libraries/rte/rte_routines.lib.php:1423 libraries/sql_query_form.lib.php:89
 #: tbl_operations.php:227 tbl_row_action.php:138 view_operations.php:62
 msgid "Your SQL query has been executed successfully."
 msgstr "Kommandoen/spørringen er utført."
 
 #: libraries/DisplayResults.class.php:4660
-#: libraries/controllers/StructureController.class.php:629
+#: libraries/controllers/DatabaseStructureController.class.php:564
 #, php-format
 msgid ""
 "This view has at least this number of rows. Please refer to %sdocumentation"
@@ -3722,33 +3731,33 @@ msgstr "%1$d total, %2$d i spørring"
 msgid "%d total"
 msgstr "%d totalt"
 
-#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1318
+#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1312
 #, php-format
 msgid "Query took %01.4f seconds."
 msgstr "Spørring tok %01.4f sekunder."
 
 #: libraries/DisplayResults.class.php:4807
-#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4767
-#: libraries/Util.class.php:4773 libraries/mult_submits.inc.php:50
-#: templates/structure/check_all_tables.phtml:2
-#: templates/structure/check_all_tables.phtml:9
+#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4773
+#: libraries/Util.class.php:4779 libraries/mult_submits.inc.php:50
+#: templates/database/structure/check_all_tables.phtml:2
+#: templates/database/structure/check_all_tables.phtml:9
 msgid "With selected:"
 msgstr "Med avkrysset:"
 
 #: libraries/DisplayResults.class.php:4811
-#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4769
-#: libraries/Util.class.php:4770 libraries/server_privileges.lib.php:1174
+#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4775
+#: libraries/Util.class.php:4776 libraries/server_privileges.lib.php:1174
 #: libraries/server_privileges.lib.php:1175
 #: libraries/server_privileges.lib.php:1387
 #: libraries/server_user_groups.lib.php:231
-#: templates/structure/check_all_tables.phtml:3
-#: templates/structure/check_all_tables.phtml:4
+#: templates/database/structure/check_all_tables.phtml:3
+#: templates/database/structure/check_all_tables.phtml:4
 msgid "Check All"
 msgstr "Merk alle"
 
 #: libraries/DisplayResults.class.php:4985 libraries/Header.class.php:383
-#: templates/structure/optional_action_links.phtml:1
-#: templates/structure/print_view_data_dictionary_link.phtml:3
+#: templates/database/structure/print_view_data_dictionary_link.phtml:3
+#: templates/table/structure/optional_action_links.phtml:1
 msgid "Print view"
 msgstr "Utskriftsvennlig forhåndsvisning"
 
@@ -3756,7 +3765,8 @@ msgstr "Utskriftsvennlig forhåndsvisning"
 msgid "Query results operations"
 msgstr "Spørringsresultatshandlinger"
 
-#: libraries/DisplayResults.class.php:5105 templates/tbl_chart.phtml:12
+#: libraries/DisplayResults.class.php:5105
+#: templates/table/chart/tbl_chart.phtml:12
 msgid "Display chart"
 msgstr "Vis diagram"
 
@@ -3853,7 +3863,7 @@ msgid "Click on the bar to scroll to top of page"
 msgstr "Klikk på linjen for å bla til toppen av siden"
 
 #: libraries/Header.class.php:749
-#: libraries/plugins/auth/AuthenticationCookie.class.php:152
+#: libraries/plugins/auth/AuthenticationCookie.class.php:140
 msgid "Javascript must be enabled past this point!"
 msgstr "JavaScript må være slått på forbi dette punktet!"
 
@@ -3875,11 +3885,11 @@ msgid "Keyname"
 msgstr "Nøkkel"
 
 #: libraries/Index.class.php:697
-#: libraries/controllers/StructureController.class.php:1962
-#: libraries/controllers/StructureController.class.php:1967
+#: libraries/controllers/TableStructureController.class.php:953
+#: libraries/controllers/TableStructureController.class.php:958
 #: libraries/tracking.lib.php:973
 #: templates/columns_definitions/column_indexes.phtml:11
-#: templates/structure/check_all_table_column.phtml:26
+#: templates/table/structure/check_all_table_column.phtml:26
 msgid "Unique"
 msgstr "Unik"
 
@@ -3898,16 +3908,17 @@ msgstr "Kardinalitet"
 #: libraries/server_collations.lib.php:35 libraries/tracking.lib.php:881
 #: libraries/tracking.lib.php:977
 #: templates/columns_definitions/table_fields_definitions.phtml:33
-#: templates/structure/row_stats_table.phtml:31
-#: templates/structure/table_header.phtml:55
-#: templates/structure/table_structure_header.phtml:7
-#: templates/table/table_header.phtml:8
+#: templates/database/structure/table_header.phtml:55
+#: templates/table/search/table_header.phtml:8
+#: templates/table/structure/row_stats_table.phtml:31
+#: templates/table/structure/table_structure_header.phtml:7
 msgid "Collation"
 msgstr "Sammenligning"
 
 #: libraries/Index.class.php:703 libraries/rte/rte_events.lib.php:496
-#: libraries/rte/rte_routines.lib.php:956 libraries/tracking.lib.php:885
-#: libraries/tracking.lib.php:979 templates/structure/table_header.phtml:84
+#: libraries/rte/rte_routines.lib.php:1047 libraries/tracking.lib.php:885
+#: libraries/tracking.lib.php:979
+#: templates/database/structure/table_header.phtml:84
 msgid "Comment"
 msgstr "Kommentar"
 
@@ -3920,15 +3931,15 @@ msgstr "Primærnøkkelen har blitt slettet."
 msgid "Index %s has been dropped."
 msgstr "Indeksen %s har blitt slettet."
 
-#: libraries/Index.class.php:757 libraries/Util.class.php:3630
-#: libraries/Util.class.php:3631
-#: libraries/controllers/StructureController.class.php:1958
-#: libraries/controllers/StructureController.class.php:1959
+#: libraries/Index.class.php:757 libraries/Util.class.php:3636
+#: libraries/Util.class.php:3637
+#: libraries/controllers/TableStructureController.class.php:949
+#: libraries/controllers/TableStructureController.class.php:950
 #: libraries/operations.lib.php:1607 libraries/rte/rte_list.lib.php:150
 #: libraries/server_databases.lib.php:146
-#: templates/structure/check_all_table_column.phtml:15
-#: templates/structure/check_all_tables.phtml:16
-#: templates/tbl_relation/foreign_key_row.phtml:93
+#: templates/database/structure/check_all_tables.phtml:16
+#: templates/table/relation/foreign_key_row.phtml:93
+#: templates/table/structure/check_all_table_column.phtml:15
 msgid "Drop"
 msgstr "Slett"
 
@@ -3959,16 +3970,16 @@ msgstr "Tjener"
 #: libraries/Menu.class.php:248
 #: libraries/navigation/Nodes/Node_View.class.php:32
 #: libraries/tbl_info.inc.php:63
-#: templates/structure/structure_table_row.phtml:97
-#: templates/structure/structure_table_row.phtml:159
+#: templates/database/structure/structure_table_row.phtml:97
+#: templates/database/structure/structure_table_row.phtml:159
 msgid "View"
 msgstr "Vis"
 
 #: libraries/Menu.class.php:325 libraries/Menu.class.php:429
-#: libraries/Menu.class.php:548 libraries/Util.class.php:3334
-#: libraries/Util.class.php:3344 libraries/Util.class.php:3350
-#: libraries/Util.class.php:4313 libraries/Util.class.php:4328
-#: libraries/Util.class.php:4345 libraries/config.values.php:40
+#: libraries/Menu.class.php:548 libraries/Util.class.php:3340
+#: libraries/Util.class.php:3350 libraries/Util.class.php:3356
+#: libraries/Util.class.php:4319 libraries/Util.class.php:4334
+#: libraries/Util.class.php:4351 libraries/config.values.php:40
 #: libraries/config.values.php:48 libraries/config.values.php:110
 #: libraries/config.values.php:116 libraries/config/messages.inc.php:321
 #: libraries/navigation/Nodes/Node_Table.class.php:292
@@ -3976,19 +3987,19 @@ msgid "SQL"
 msgstr "SQL"
 
 #: libraries/Menu.class.php:328 libraries/Menu.class.php:432
-#: libraries/Util.class.php:3335 libraries/Util.class.php:3345
-#: libraries/Util.class.php:3351 libraries/Util.class.php:3625
-#: libraries/Util.class.php:3626 libraries/Util.class.php:4329
-#: libraries/Util.class.php:4346 libraries/config.values.php:41
+#: libraries/Util.class.php:3341 libraries/Util.class.php:3351
+#: libraries/Util.class.php:3357 libraries/Util.class.php:3631
+#: libraries/Util.class.php:3632 libraries/Util.class.php:4335
+#: libraries/Util.class.php:4352 libraries/config.values.php:41
 #: libraries/config.values.php:49 libraries/config.values.php:111
 #: libraries/config.values.php:117
 #: libraries/navigation/Nodes/Node_Table.class.php:286
 msgid "Search"
 msgstr "Søk"
 
-#: libraries/Menu.class.php:338 libraries/Util.class.php:3336
-#: libraries/Util.class.php:3346 libraries/Util.class.php:3627
-#: libraries/Util.class.php:3628 libraries/Util.class.php:4347
+#: libraries/Menu.class.php:338 libraries/Util.class.php:3342
+#: libraries/Util.class.php:3352 libraries/Util.class.php:3633
+#: libraries/Util.class.php:3634 libraries/Util.class.php:4353
 #: libraries/config.values.php:42 libraries/config.values.php:50
 #: libraries/config.values.php:118
 #: libraries/navigation/Nodes/Node_Table.class.php:289
@@ -3997,30 +4008,30 @@ msgid "Insert"
 msgstr "Sett inn"
 
 #: libraries/Menu.class.php:362 libraries/Menu.class.php:467
-#: libraries/Util.class.php:4334 libraries/Util.class.php:4350
+#: libraries/Util.class.php:4340 libraries/Util.class.php:4356
 #: libraries/config.values.php:106 libraries/server_common.lib.php:51
 #: libraries/server_privileges.lib.php:2370
 #: libraries/server_privileges.lib.php:3158
-#: libraries/server_privileges.lib.php:4221
+#: libraries/server_privileges.lib.php:4247
 msgid "Privileges"
 msgstr "Privilegier"
 
 #: libraries/Menu.class.php:371 libraries/Menu.class.php:379
-#: libraries/Menu.class.php:459 libraries/Util.class.php:3338
-#: libraries/Util.class.php:3352 libraries/Util.class.php:4333
-#: libraries/Util.class.php:4351 libraries/config.values.php:112
+#: libraries/Menu.class.php:459 libraries/Util.class.php:3344
+#: libraries/Util.class.php:3358 libraries/Util.class.php:4339
+#: libraries/Util.class.php:4357 libraries/config.values.php:112
 #: view_operations.php:92
 msgid "Operations"
 msgstr "Operasjoner"
 
 #: libraries/Menu.class.php:384 libraries/Menu.class.php:492
-#: libraries/Util.class.php:4338 libraries/Util.class.php:4352
+#: libraries/Util.class.php:4344 libraries/Util.class.php:4358
 #: libraries/relation.lib.php:255
 msgid "Tracking"
 msgstr "Overvåkning"
 
 #: libraries/Menu.class.php:397 libraries/Menu.class.php:486
-#: libraries/Util.class.php:4337 libraries/Util.class.php:4353
+#: libraries/Util.class.php:4343 libraries/Util.class.php:4359
 #: libraries/navigation/Nodes/Node_Trigger_Container.class.php:24
 #: libraries/plugins/export/ExportHtmlword.class.php:557
 #: libraries/plugins/export/ExportOdt.class.php:685
@@ -4037,16 +4048,16 @@ msgstr "Triggere"
 msgid "Database seems to be empty!"
 msgstr "Databasen ser ut til å være tom!"
 
-#: libraries/Menu.class.php:439 libraries/Util.class.php:4330
+#: libraries/Menu.class.php:439 libraries/Util.class.php:4336
 msgid "Query"
 msgstr "Spørring ved eksempel (Query by Example)"
 
-#: libraries/Menu.class.php:472 libraries/Util.class.php:4335
+#: libraries/Menu.class.php:472 libraries/Util.class.php:4341
 #: libraries/rte/rte_words.lib.php:36
 msgid "Routines"
 msgstr "Rutiner"
 
-#: libraries/Menu.class.php:479 libraries/Util.class.php:4336
+#: libraries/Menu.class.php:479 libraries/Util.class.php:4342
 #: libraries/navigation/Nodes/Node_Event_Container.class.php:26
 #: libraries/plugins/export/ExportSql.class.php:940
 #: libraries/plugins/export/ExportXml.class.php:107
@@ -4054,20 +4065,20 @@ msgstr "Rutiner"
 msgid "Events"
 msgstr "Hendelser"
 
-#: libraries/Menu.class.php:498 libraries/Util.class.php:4339
+#: libraries/Menu.class.php:498 libraries/Util.class.php:4345
 msgid "Designer"
 msgstr "Designer"
 
-#: libraries/Menu.class.php:507 libraries/Util.class.php:4340
-#: templates/structure/check_all_tables.phtml:35
+#: libraries/Menu.class.php:507 libraries/Util.class.php:4346
+#: templates/database/structure/check_all_tables.phtml:35
 msgid "Central columns"
 msgstr "Senter kolonner"
 
-#: libraries/Menu.class.php:544 libraries/Util.class.php:4312
+#: libraries/Menu.class.php:544 libraries/Util.class.php:4318
 #: libraries/config.values.php:103 libraries/config/messages.inc.php:266
 #: libraries/config/messages.inc.php:341
 #: libraries/navigation/NavigationTree.class.php:1239
-#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4332
+#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4358
 msgid "Databases"
 msgstr "Databaser"
 
@@ -4078,34 +4089,34 @@ msgid "User accounts"
 msgstr "Brukere"
 
 #: libraries/Menu.class.php:595 libraries/ServerStatusData.class.php:121
-#: libraries/Util.class.php:4319 libraries/server_common.lib.php:36
+#: libraries/Util.class.php:4325 libraries/server_common.lib.php:36
 msgid "Binary log"
 msgstr "Binærlogg"
 
 #: libraries/Menu.class.php:601 libraries/ServerStatusData.class.php:126
-#: libraries/Util.class.php:4320 libraries/server_common.lib.php:42
-#: templates/structure/body_for_table_summary.phtml:10
-#: templates/structure/table_header.phtml:27
+#: libraries/Util.class.php:4326 libraries/server_common.lib.php:42
+#: templates/database/structure/body_for_table_summary.phtml:10
+#: templates/database/structure/table_header.phtml:27
 msgid "Replication"
 msgstr "Replikering"
 
 #: libraries/Menu.class.php:606 libraries/ServerStatusData.class.php:193
-#: libraries/Util.class.php:4321 libraries/config.values.php:105
+#: libraries/Util.class.php:4327 libraries/config.values.php:105
 #: libraries/server_engines.lib.php:108 libraries/server_engines.lib.php:112
 #: libraries/sql_query_form.lib.php:421
 msgid "Variables"
 msgstr "Variabler"
 
-#: libraries/Menu.class.php:610 libraries/Util.class.php:4322
+#: libraries/Menu.class.php:610 libraries/Util.class.php:4328
 msgid "Charsets"
 msgstr "Tegnsett"
 
-#: libraries/Menu.class.php:615 libraries/Util.class.php:4323
+#: libraries/Menu.class.php:615 libraries/Util.class.php:4329
 #: libraries/server_common.lib.php:33 libraries/server_plugins.lib.php:27
 msgid "Plugins"
 msgstr "Programtillegg"
 
-#: libraries/Menu.class.php:626 libraries/Util.class.php:4324
+#: libraries/Menu.class.php:626 libraries/Util.class.php:4330
 msgid "Engines"
 msgstr "Motorer"
 
@@ -4130,7 +4141,7 @@ msgid_plural "%1$d rows inserted."
 msgstr[0] "%1$d rader innsatt."
 msgstr[1] "%1$d rader innsatt."
 
-#: libraries/PDF.class.php:70 libraries/Util.class.php:2521
+#: libraries/PDF.class.php:70 libraries/Util.class.php:2527
 #: libraries/browse_foreigners.lib.php:327
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:865
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:890
@@ -4151,7 +4162,7 @@ msgid "Could not save favorite table!"
 msgstr "Kunne ikke lagre favorittabell!"
 
 #: libraries/RecentFavoriteTable.class.php:212
-#: templates/structure/favorite_anchor.phtml:12
+#: templates/database/structure/favorite_anchor.phtml:12
 msgid "Remove from Favorites"
 msgstr "Fjern fra favoritter"
 
@@ -4317,7 +4328,7 @@ msgstr ""
 "Det er ikke noen detaljert statusinformasjon for denne lagringsmotoren."
 
 #: libraries/StorageEngine.class.php:373
-#: templates/structure/body_for_table_summary.phtml:50
+#: templates/database/structure/body_for_table_summary.phtml:50
 #, php-format
 msgid "%s is the default storage engine on this MySQL server."
 msgstr "%s er standard lagringsmotor for denne MySQL tjeneren."
@@ -4799,10 +4810,10 @@ msgstr ""
 
 #: libraries/Util.class.php:726 libraries/rte/rte_events.lib.php:110
 #: libraries/rte/rte_events.lib.php:119 libraries/rte/rte_events.lib.php:150
-#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:153
-#: libraries/rte/rte_routines.lib.php:162
-#: libraries/rte/rte_routines.lib.php:235
-#: libraries/rte/rte_routines.lib.php:1366
+#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:223
+#: libraries/rte/rte_routines.lib.php:250
+#: libraries/rte/rte_routines.lib.php:372
+#: libraries/rte/rte_routines.lib.php:1457
 #: libraries/rte/rte_triggers.lib.php:86 libraries/rte/rte_triggers.lib.php:95
 #: libraries/rte/rte_triggers.lib.php:127
 msgid "MySQL said: "
@@ -4846,75 +4857,78 @@ msgstr "Søn"
 msgid "%B %d, %Y at %I:%M %p"
 msgstr "%d. %B, %Y %H:%M %p"
 
-#: libraries/Util.class.php:2019
+#: libraries/Util.class.php:2025
 #, php-format
 msgid "%s days, %s hours, %s minutes and %s seconds"
 msgstr "%s dager, %s timer, %s minutter og %s sekunder"
 
-#: libraries/Util.class.php:2112
+#: libraries/Util.class.php:2118
 msgid "Missing parameter:"
 msgstr "Mangler parametere:"
 
-#: libraries/Util.class.php:2645
+#: libraries/Util.class.php:2651
 #, php-format
 msgid "Jump to database \"%s\"."
 msgstr "Hopp til databasen \"%s\"."
 
-#: libraries/Util.class.php:2670
+#: libraries/Util.class.php:2676
 #, php-format
 msgid "The %s functionality is affected by a known bug, see %s"
 msgstr "Funksjonaliteten %s er påvirket av en kjent feil, se %s"
 
-#: libraries/Util.class.php:2881
+#: libraries/Util.class.php:2887
 msgid "Click to toggle"
 msgstr "Klikk for å endre"
 
-#: libraries/Util.class.php:3542 prefs_manage.php:248
+#: libraries/Util.class.php:3548 prefs_manage.php:248
 msgid "Browse your computer:"
 msgstr "Bla gjennom datamaskinen:"
 
-#: libraries/Util.class.php:3567
+#: libraries/Util.class.php:3573
 #, php-format
 msgid "Select from the web server upload directory <b>%s</b>:"
 msgstr "Merk fra opplastingskatalogen på vevtjeneren <b>%s</b>:"
 
-#: libraries/Util.class.php:3596 libraries/insert_edit.lib.php:1173
+#: libraries/Util.class.php:3602 libraries/insert_edit.lib.php:1171
 msgid "The directory you set for upload work cannot be reached."
 msgstr "Katalogen du anga for opplasting kan ikke nåes."
 
-#: libraries/Util.class.php:3607
+#: libraries/Util.class.php:3613
 msgid "There are no files to upload!"
 msgstr "Det er ingen filer å laste opp!"
 
-#: libraries/Util.class.php:3632 libraries/Util.class.php:3633
-#: templates/structure/check_all_tables.phtml:15
+#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: templates/database/structure/check_all_tables.phtml:15
 msgid "Empty"
 msgstr "Tøm"
 
-#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: libraries/Util.class.php:3644 libraries/Util.class.php:3645
 msgid "Execute"
 msgstr "Utfør"
 
-#: libraries/Util.class.php:4152
+#: libraries/Util.class.php:4158
 msgid "Print"
 msgstr "Skriv ut"
 
-#: libraries/Util.class.php:4257 templates/structure/row_stats_table.phtml:80
-#: templates/structure/table_header.phtml:95
+#: libraries/Util.class.php:4263
+#: templates/database/structure/table_header.phtml:95
+#: templates/table/structure/row_stats_table.phtml:80
 msgid "Creation"
 msgstr "Opprettet"
 
-#: libraries/Util.class.php:4263 templates/structure/row_stats_table.phtml:87
-#: templates/structure/table_header.phtml:106
+#: libraries/Util.class.php:4269
+#: templates/database/structure/table_header.phtml:106
+#: templates/table/structure/row_stats_table.phtml:87
 msgid "Last update"
 msgstr "Sist oppdatert"
 
-#: libraries/Util.class.php:4269 templates/structure/row_stats_table.phtml:94
-#: templates/structure/table_header.phtml:117
+#: libraries/Util.class.php:4275
+#: templates/database/structure/table_header.phtml:117
+#: templates/table/structure/row_stats_table.phtml:94
 msgid "Last check"
 msgstr "Sist kontrollert"
 
-#: libraries/Util.class.php:4315
+#: libraries/Util.class.php:4321
 msgid "Users"
 msgstr "Brukere"
 
@@ -4935,16 +4949,16 @@ msgid "Use this value"
 msgstr "Bruk denne verdien"
 
 #: libraries/build_html_for_db.lib.php:33 libraries/import.lib.php:193
-#: templates/structure/actions_in_table_structure.phtml:113
-#: templates/structure/row_stats_table.phtml:42
-#: templates/structure/table_header.phtml:36
+#: templates/database/structure/table_header.phtml:36
+#: templates/table/structure/actions_in_table_structure.phtml:113
+#: templates/table/structure/row_stats_table.phtml:42
 msgid "Rows"
 msgstr "Rader"
 
 #: libraries/build_html_for_db.lib.php:48 libraries/engines/innodb.lib.php:171
-#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:186
-#: libraries/server_status.lib.php:298
-#: templates/structure/display_table_stats.phtml:40
+#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:195
+#: libraries/server_status.lib.php:307
+#: templates/table/structure/display_table_stats.phtml:40
 msgid "Total"
 msgstr "Totalt"
 
@@ -4953,10 +4967,12 @@ msgid "Jump to database"
 msgstr "Gå til database"
 
 #: libraries/build_html_for_db.lib.php:146
+#: templates/database/structure/structure_table_row.phtml:15
 msgid "Not replicated"
 msgstr "Ikke replikert"
 
 #: libraries/build_html_for_db.lib.php:158
+#: templates/database/structure/structure_table_row.phtml:16
 msgid "Replicated"
 msgstr "Replikert"
 
@@ -5014,17 +5030,17 @@ msgstr ""
 #: libraries/plugins/export/ExportTexytext.class.php:425
 #: libraries/plugins/export/PMA_ExportPdf.class.php:307
 #: libraries/rte/rte_list.lib.php:73 libraries/rte/rte_list.lib.php:85
-#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:830
-#: libraries/rte/rte_routines.lib.php:1492 setup/frames/index.inc.php:162
+#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:921
+#: libraries/rte/rte_routines.lib.php:1583 setup/frames/index.inc.php:162
 #: templates/columns_definitions/table_fields_definitions.phtml:8
-#: templates/structure/table_structure_header.phtml:5
-#: templates/table/create_table.phtml:11
+#: templates/database/create_table.phtml:11
+#: templates/table/structure/table_structure_header.phtml:5
 msgid "Name"
 msgstr "Navn"
 
 #: libraries/central_columns.lib.php:699
 #: libraries/central_columns.lib.php:1381
-#: libraries/rte/rte_routines.lib.php:832
+#: libraries/rte/rte_routines.lib.php:923
 #: templates/columns_definitions/table_fields_definitions.phtml:14
 msgid "Length/Values"
 msgstr "Lengde/Sett*"
@@ -5043,7 +5059,7 @@ msgid "Select a table"
 msgstr "Velg en tabell"
 
 #: libraries/central_columns.lib.php:804
-#: templates/structure/add_column.phtml:4
+#: templates/table/structure/add_column.phtml:4
 msgid "Add column"
 msgstr "Legg til kolonne(r)"
 
@@ -5059,7 +5075,7 @@ msgstr "Legg til ny kolonne"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1002
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1025
 #: templates/columns_definitions/table_fields_definitions.phtml:36
-#: templates/structure/table_structure_header.phtml:8
+#: templates/table/structure/table_structure_header.phtml:8
 msgid "Attributes"
 msgstr "Attributter"
 
@@ -5172,7 +5188,7 @@ msgid "Double click"
 msgstr ""
 
 #: libraries/config.values.php:95 libraries/config.values.php:124
-#: libraries/config/FormDisplay.tpl.php:221 libraries/relation.lib.php:97
+#: libraries/config/FormDisplay.tpl.php:232 libraries/relation.lib.php:97
 #: libraries/relation.lib.php:105
 msgid "Disabled"
 msgstr "Avslått"
@@ -5350,22 +5366,22 @@ msgstr "Komprimert eksport vil ikke fungere,funksjonen (%s) mangler."
 msgid "maximum %s"
 msgstr "maksimum %s"
 
-#: libraries/config/FormDisplay.tpl.php:219
+#: libraries/config/FormDisplay.tpl.php:230
 msgid "This setting is disabled, it will not be applied to your configuration."
 msgstr ""
 "Denne innstillingen er avslått, den vil ikke bli lagt til din konfigurasjon."
 
-#: libraries/config/FormDisplay.tpl.php:313
+#: libraries/config/FormDisplay.tpl.php:324
 #, php-format
 msgid "Set value: %s"
 msgstr "Sett verdi: %s"
 
-#: libraries/config/FormDisplay.tpl.php:318
+#: libraries/config/FormDisplay.tpl.php:329
 #: libraries/config/messages.inc.php:610
 msgid "Restore default value"
 msgstr "Gjennopprett standard verdi"
 
-#: libraries/config/FormDisplay.tpl.php:332
+#: libraries/config/FormDisplay.tpl.php:343
 msgid "Allow users to customize this value"
 msgstr "Tillat brukere å endre denne verdien"
 
@@ -5972,7 +5988,7 @@ msgstr "Filens tegnsett"
 
 #: libraries/config/messages.inc.php:136 libraries/config/messages.inc.php:152
 #: libraries/sql_query_form.lib.php:247
-#: templates/structure/row_stats_table.phtml:7
+#: templates/table/structure/row_stats_table.phtml:7
 msgid "Format"
 msgstr "Format"
 
@@ -6559,7 +6575,7 @@ msgstr ""
 
 #: libraries/config/messages.inc.php:332
 #: libraries/plugins/export/ExportPdf.class.php:279
-#: templates/structure/secondary_tabs.phtml:8
+#: templates/table/secondary_tabs.phtml:8
 msgid "Table structure"
 msgstr "Tabellstruktur"
 
@@ -8528,112 +8544,35 @@ msgstr "Microsoft Word 2000"
 msgid "OpenDocument Text"
 msgstr "Open Document tekst"
 
-#: libraries/controllers/StructureController.class.php:465
+#: libraries/controllers/DatabaseStructureController.class.php:405
 #: tbl_operations.php:382
 #, php-format
 msgid "Table %s has been emptied."
 msgstr "Tabellen %s har blitt tømt."
 
-#: libraries/controllers/StructureController.class.php:486
+#: libraries/controllers/DatabaseStructureController.class.php:426
 #: tbl_operations.php:400 view_operations.php:119
 #, fuzzy, php-format
 #| msgid "View %s has been dropped."
 msgid "View %s has been dropped."
 msgstr "Visningen %s har blitt slettet"
 
-#: libraries/controllers/StructureController.class.php:487
+#: libraries/controllers/DatabaseStructureController.class.php:427
 #: tbl_operations.php:401
 #, fuzzy, php-format
 #| msgid "Table %s has been dropped."
 msgid "Table %s has been dropped."
 msgstr "Tabellen %s har blitt slettet"
 
-#: libraries/controllers/StructureController.class.php:797
-#, php-format
-msgid "The name '%s' is a MySQL reserved keyword."
-msgid_plural "The names '%s' are MySQL reserved keywords."
-msgstr[0] ""
-msgstr[1] ""
-
-#: libraries/controllers/StructureController.class.php:875
-#, fuzzy
-#| msgid "No rows selected"
-msgid "No column selected."
-msgstr "Ingen rader valgt"
-
-#: libraries/controllers/StructureController.class.php:1049
+#: libraries/controllers/DatabaseStructureController.class.php:733
 msgid "Favorite List is full!"
 msgstr "Favotittlisten er full!"
 
-#: libraries/controllers/StructureController.class.php:1272
-#, fuzzy
-#| msgid "The selected users have been deleted successfully."
-msgid "The columns have been moved successfully."
-msgstr "De valgte brukerne har blitt slettet."
-
-#: libraries/controllers/StructureController.class.php:1535
-#, fuzzy, php-format
-#| msgid "Table %1$s has been altered successfully."
-msgid ""
-"Table %1$s has been altered successfully. Privileges have been adjusted."
-msgstr "Tabellen %1$s har blitt endret."
-
-#: libraries/controllers/StructureController.class.php:1541
-#: libraries/controllers/TableIndexesController.class.php:161
-#: tbl_addfield.php:92
-#, php-format
-msgid "Table %1$s has been altered successfully."
-msgstr "Tabellen %1$s har blitt endret."
-
-#: libraries/controllers/StructureController.class.php:1588
-#: libraries/tracking.lib.php:1094
-#, fuzzy
-#| msgid "Gather errors"
-msgid "Query error"
-msgstr "Samle feilmeldinger"
-
-#: libraries/controllers/StructureController.class.php:1806
+#: libraries/controllers/DatabaseStructureController.class.php:947
 #: libraries/mysql_charsets.lib.php:366 libraries/mysql_charsets.lib.php:373
 msgid "unknown"
 msgstr "ukjent"
 
-#: libraries/controllers/StructureController.class.php:1957
-#: templates/structure/check_all_table_column.phtml:11
-msgid "Change"
-msgstr "Endre"
-
-#: libraries/controllers/StructureController.class.php:1961
-#: libraries/controllers/StructureController.class.php:1966
-#: libraries/navigation/Nodes/Node_Index.class.php:30
-#: libraries/tracking.lib.php:926
-#: templates/columns_definitions/column_indexes.phtml:16
-#: templates/columns_definitions/table_fields_definitions.phtml:57
-#: templates/structure/check_all_table_column.phtml:30
-#: templates/structure/display_structure.phtml:79
-#: templates/structure/display_table_stats.phtml:19
-msgid "Index"
-msgstr "Indeks"
-
-#: libraries/controllers/StructureController.class.php:1963
-#: libraries/controllers/StructureController.class.php:1968
-#: templates/columns_definitions/column_indexes.phtml:27
-#: templates/structure/check_all_table_column.phtml:37
-msgid "Spatial"
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1964
-#: libraries/controllers/StructureController.class.php:1969
-#: templates/columns_definitions/column_indexes.phtml:22
-#: templates/structure/check_all_table_column.phtml:47
-msgid "Fulltext"
-msgstr "Fulltekst"
-
-#: libraries/controllers/StructureController.class.php:1970
-#, fuzzy
-#| msgid "Browse distinct values"
-msgid "Distinct values"
-msgstr "Se gjennom distinkte verdier"
-
 #: libraries/controllers/TableChartController.class.php:82
 #: libraries/controllers/TableGisVisualizationController.class.php:101
 msgid "No SQL query was set to fetch data."
@@ -8649,13 +8588,20 @@ msgstr ""
 msgid "No data to display"
 msgstr "Ingen data funnet"
 
-#: libraries/controllers/TableRelationController.class.php:217
+#: libraries/controllers/TableIndexesController.class.php:161
+#: libraries/controllers/TableStructureController.class.php:736
+#: tbl_addfield.php:92
+#, php-format
+msgid "Table %1$s has been altered successfully."
+msgstr "Tabellen %1$s har blitt endret."
+
+#: libraries/controllers/TableRelationController.class.php:218
 #, fuzzy
 #| msgid "Thread %s was successfully killed."
 msgid "Display column was successfully updated."
 msgstr "Tråd %s ble avsluttet med suksess."
 
-#: libraries/controllers/TableRelationController.class.php:283
+#: libraries/controllers/TableRelationController.class.php:288
 #, fuzzy
 #| msgid "Internal relation added"
 msgid "Internal relations were successfully updated."
@@ -8670,10 +8616,80 @@ msgid "Zoom search"
 msgstr "Utvidet søk"
 
 #: libraries/controllers/TableSearchController.class.php:852
-#: templates/table/selection_form.phtml:59
+#: templates/table/search/selection_form.phtml:59
 msgid "Find and replace"
 msgstr "Finn og erstatt"
 
+#: libraries/controllers/TableStructureController.class.php:163
+#, php-format
+msgid "The name '%s' is a MySQL reserved keyword."
+msgid_plural "The names '%s' are MySQL reserved keywords."
+msgstr[0] ""
+msgstr[1] ""
+
+#: libraries/controllers/TableStructureController.class.php:241
+#, fuzzy
+#| msgid "No rows selected"
+msgid "No column selected."
+msgstr "Ingen rader valgt"
+
+#: libraries/controllers/TableStructureController.class.php:467
+#, fuzzy
+#| msgid "The selected users have been deleted successfully."
+msgid "The columns have been moved successfully."
+msgstr "De valgte brukerne har blitt slettet."
+
+#: libraries/controllers/TableStructureController.class.php:730
+#, fuzzy, php-format
+#| msgid "Table %1$s has been altered successfully."
+msgid ""
+"Table %1$s has been altered successfully. Privileges have been adjusted."
+msgstr "Tabellen %1$s har blitt endret."
+
+#: libraries/controllers/TableStructureController.class.php:783
+#: libraries/tracking.lib.php:1094
+#, fuzzy
+#| msgid "Gather errors"
+msgid "Query error"
+msgstr "Samle feilmeldinger"
+
+#: libraries/controllers/TableStructureController.class.php:948
+#: templates/table/structure/check_all_table_column.phtml:11
+msgid "Change"
+msgstr "Endre"
+
+#: libraries/controllers/TableStructureController.class.php:952
+#: libraries/controllers/TableStructureController.class.php:957
+#: libraries/navigation/Nodes/Node_Index.class.php:30
+#: libraries/tracking.lib.php:926
+#: templates/columns_definitions/column_indexes.phtml:16
+#: templates/columns_definitions/table_fields_definitions.phtml:57
+#: templates/table/structure/check_all_table_column.phtml:30
+#: templates/table/structure/display_structure.phtml:79
+#: templates/table/structure/display_table_stats.phtml:19
+msgid "Index"
+msgstr "Indeks"
+
+#: libraries/controllers/TableStructureController.class.php:954
+#: libraries/controllers/TableStructureController.class.php:959
+#: templates/columns_definitions/column_indexes.phtml:27
+#: templates/table/structure/check_all_table_column.phtml:37
+msgid "Spatial"
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:955
+#: libraries/controllers/TableStructureController.class.php:960
+#: templates/columns_definitions/column_indexes.phtml:22
+#: templates/table/structure/check_all_table_column.phtml:47
+msgid "Fulltext"
+msgstr "Fulltekst"
+
+#: libraries/controllers/TableStructureController.class.php:963
+#, fuzzy
+#| msgid "Browse distinct values"
+msgid "Distinct values"
+msgstr "Se gjennom distinkte verdier"
+
 #: libraries/core.lib.php:306
 #, php-format
 msgid "The %s extension is missing. Please check your PHP configuration."
@@ -8720,7 +8736,7 @@ msgid "No Password"
 msgstr "Intet passord"
 
 #: libraries/display_change_password.lib.php:68
-#: libraries/plugins/auth/AuthenticationCookie.class.php:199
+#: libraries/plugins/auth/AuthenticationCookie.class.php:187
 #: libraries/replication_gui.lib.php:422 libraries/replication_gui.lib.php:862
 #: libraries/server_privileges.lib.php:1640
 msgid "Password:"
@@ -9559,12 +9575,12 @@ msgid "Dump has been saved to file %s."
 msgstr "Dump har blitt lagret til filen %s."
 
 #: libraries/import.lib.php:202 libraries/insert_edit.lib.php:124
-#: libraries/rte/rte_routines.lib.php:1353 libraries/sql.lib.php:1312
+#: libraries/rte/rte_routines.lib.php:1444 libraries/sql.lib.php:1306
 #: tbl_get_field.php:44
 msgid "MySQL returned an empty result set (i.e. zero rows)."
 msgstr "MySQL returnerte ett tomt resultat (m.a.o. ingen rader)."
 
-#: libraries/import.lib.php:265 libraries/sql.lib.php:1326
+#: libraries/import.lib.php:265 libraries/sql.lib.php:1320
 msgid "[ROLLBACK occurred.]"
 msgstr ""
 
@@ -9643,14 +9659,14 @@ msgstr "Lag en indeks på&nbsp;%s&nbsp;kolonner"
 
 #: libraries/insert_edit.lib.php:233
 #: libraries/navigation/Nodes/Node_DatabaseChild.class.php:48
-#: templates/designer/table_list.phtml:40
+#: templates/database/designer/table_list.phtml:40
 msgid "Hide"
 msgstr "Skjul"
 
 #: libraries/insert_edit.lib.php:249
 #: libraries/navigation/Nodes/Node_Function.class.php:32
-#: libraries/rte/rte_routines.lib.php:1495
-#: templates/table/table_header.phtml:4
+#: libraries/rte/rte_routines.lib.php:1586
+#: templates/table/search/table_header.phtml:4
 msgid "Function"
 msgstr "Funksjon"
 
@@ -9667,87 +9683,88 @@ msgstr ""
 "På grunn av sin lengde,<br /> så vil muligens denne kolonnen ikke være "
 "redigerbar"
 
-#: libraries/insert_edit.lib.php:1050
+#: libraries/insert_edit.lib.php:1048
 msgid "Binary - do not edit"
 msgstr "Binær - må ikke redigeres"
 
-#: libraries/insert_edit.lib.php:1176 libraries/server_privileges.lib.php:470
-#: templates/table/options.phtml:36
+#: libraries/insert_edit.lib.php:1174 libraries/server_privileges.lib.php:470
+#: templates/table/search/options.phtml:36
 msgid "Or"
 msgstr "Eller"
 
-#: libraries/insert_edit.lib.php:1177
+#: libraries/insert_edit.lib.php:1175
 #, fuzzy
 #| msgid "web server upload directory"
 msgid "web server upload directory:"
 msgstr "webtjener opplastingskatalog"
 
-#: libraries/insert_edit.lib.php:1348 templates/table/input_box.phtml:49
+#: libraries/insert_edit.lib.php:1346
+#: templates/table/search/input_box.phtml:49
 msgid "Edit/Insert"
 msgstr "Rediger/Sett inn"
 
-#: libraries/insert_edit.lib.php:1398
+#: libraries/insert_edit.lib.php:1396
 #, fuzzy, php-format
 #| msgid "Restart insertion with %s rows"
 msgid "Continue insertion with %s rows"
 msgstr "Restarte innsettinga med %s rader"
 
-#: libraries/insert_edit.lib.php:1428
+#: libraries/insert_edit.lib.php:1426
 msgid "and then"
 msgstr "og så"
 
-#: libraries/insert_edit.lib.php:1461
+#: libraries/insert_edit.lib.php:1459
 msgid "Insert as new row"
 msgstr "Sett inn som ny rad"
 
-#: libraries/insert_edit.lib.php:1464
+#: libraries/insert_edit.lib.php:1462
 msgid "Insert as new row and ignore errors"
 msgstr "Sett inn som ny rad og ignorer feil"
 
-#: libraries/insert_edit.lib.php:1467
+#: libraries/insert_edit.lib.php:1465
 msgid "Show insert query"
 msgstr "Viser SQL spørring"
 
-#: libraries/insert_edit.lib.php:1487
+#: libraries/insert_edit.lib.php:1485
 msgid "Go back to previous page"
 msgstr "Returner"
 
-#: libraries/insert_edit.lib.php:1490
+#: libraries/insert_edit.lib.php:1488
 msgid "Insert another new row"
 msgstr "Sett inn en ny post"
 
-#: libraries/insert_edit.lib.php:1495
+#: libraries/insert_edit.lib.php:1493
 msgid "Go back to this page"
 msgstr "Tilbake til denne siden"
 
-#: libraries/insert_edit.lib.php:1518
+#: libraries/insert_edit.lib.php:1516
 msgid "Edit next row"
 msgstr "Rediger neste rad"
 
-#: libraries/insert_edit.lib.php:1540
+#: libraries/insert_edit.lib.php:1538
 msgid ""
 "Use TAB key to move from value to value, or CTRL+arrows to move anywhere"
 msgstr ""
 "Bruk TAB tasten for å flytte fra verdi til verdi, eller CTRL+piltastene for "
 "å bevege deg hvor som helst"
 
-#: libraries/insert_edit.lib.php:1577 libraries/replication_gui.lib.php:542
-#: libraries/rte/rte_routines.lib.php:1497
+#: libraries/insert_edit.lib.php:1575 libraries/replication_gui.lib.php:542
+#: libraries/rte/rte_routines.lib.php:1588
 #: libraries/server_status_variables.lib.php:220
-#: templates/designer/having_query_panel.phtml:100
-#: templates/designer/options_panel.phtml:73
-#: templates/designer/options_panel.phtml:239
-#: templates/designer/where_query_panel.phtml:69
-#: templates/table/table_header.phtml:10
-#: templates/table/zoom_result_form.phtml:35
+#: templates/database/designer/having_query_panel.phtml:100
+#: templates/database/designer/options_panel.phtml:73
+#: templates/database/designer/options_panel.phtml:239
+#: templates/database/designer/where_query_panel.phtml:69
+#: templates/table/search/table_header.phtml:10
+#: templates/table/search/zoom_result_form.phtml:35
 msgid "Value"
 msgstr "Verdi"
 
-#: libraries/insert_edit.lib.php:1937 libraries/sql.lib.php:1309
+#: libraries/insert_edit.lib.php:1935 libraries/sql.lib.php:1303
 msgid "Showing SQL query"
 msgstr "Viser SQL spørring"
 
-#: libraries/insert_edit.lib.php:1962 libraries/sql.lib.php:1287
+#: libraries/insert_edit.lib.php:1960 libraries/sql.lib.php:1281
 #, php-format
 msgid "Inserted row id: %1$d"
 msgstr "Insatt rad id: %1$d"
@@ -10194,7 +10211,7 @@ msgstr ""
 #: libraries/navigation/Nodes/Node_View_Container.class.php:26
 #: libraries/navigation/Nodes/Node_View_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:129
-#: templates/structure/show_create.phtml:30
+#: templates/database/structure/show_create.phtml:30
 msgid "Views"
 msgstr "Visning"
 
@@ -10507,7 +10524,7 @@ msgstr "Du har ikke nok rettigheter til å være her nå!"
 
 #: libraries/operations.lib.php:101 libraries/operations.lib.php:249
 #: libraries/operations.lib.php:869 libraries/operations.lib.php:963
-#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:907
+#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:998
 #: templates/columns_definitions/table_fields_definitions.phtml:47
 #, fuzzy
 #| msgid "Edit Privileges"
@@ -10601,22 +10618,22 @@ msgid "Switch to copied table"
 msgstr "Bytt til kopiert tabell"
 
 #: libraries/operations.lib.php:1360
-#: templates/structure/check_all_tables.phtml:18
+#: templates/database/structure/check_all_tables.phtml:18
 msgid "Table maintenance"
 msgstr "Tabellvedlikehold"
 
 #: libraries/operations.lib.php:1398
-#: templates/structure/check_all_tables.phtml:19
+#: templates/database/structure/check_all_tables.phtml:19
 msgid "Analyze table"
 msgstr "Analyser tabell"
 
 #: libraries/operations.lib.php:1413
-#: templates/structure/check_all_tables.phtml:20
+#: templates/database/structure/check_all_tables.phtml:20
 msgid "Check table"
 msgstr "Kontroller tabell"
 
 #: libraries/operations.lib.php:1428
-#: templates/structure/check_all_tables.phtml:22
+#: templates/database/structure/check_all_tables.phtml:22
 #, fuzzy
 #| msgid "Check table"
 msgid "Checksum table"
@@ -10636,18 +10653,19 @@ msgid "Flush the table (FLUSH)"
 msgstr "Oppfrisk tabellen (\"FLUSH\")"
 
 #: libraries/operations.lib.php:1477
-#: templates/structure/check_all_tables.phtml:23
-#: templates/structure/display_table_stats.phtml:56
+#: templates/database/structure/check_all_tables.phtml:23
+#: templates/table/structure/display_table_stats.phtml:56
 msgid "Optimize table"
 msgstr "Optimiser tabell"
 
 #: libraries/operations.lib.php:1492
-#: templates/structure/check_all_tables.phtml:24
+#: templates/database/structure/check_all_tables.phtml:24
 msgid "Repair table"
 msgstr "Reparer tabell"
 
 #: libraries/operations.lib.php:1538
-#: templates/structure/check_all_tables.phtml:14 view_operations.php:127
+#: templates/database/structure/check_all_tables.phtml:14
+#: view_operations.php:127
 #, fuzzy
 #| msgid "Delete tracking data for this table"
 msgid "Delete data or table"
@@ -10779,7 +10797,7 @@ msgid "Cannot connect: invalid settings."
 msgstr "Kan ikke koble til: ugyldige innstillinger."
 
 #: libraries/plugins/auth/AuthenticationConfig.class.php:108
-#: libraries/plugins/auth/AuthenticationCookie.class.php:134
+#: libraries/plugins/auth/AuthenticationCookie.class.php:122
 #: libraries/plugins/auth/AuthenticationHttp.class.php:96
 #, php-format
 msgid "Welcome to %s"
@@ -10810,38 +10828,38 @@ msgstr ""
 msgid "Retry to connect"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:146
+#: libraries/plugins/auth/AuthenticationCookie.class.php:134
 msgid "Your session has expired. Please log in again."
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:170
+#: libraries/plugins/auth/AuthenticationCookie.class.php:158
 msgid "Log in"
 msgstr "Logg inn"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:178
-#: libraries/plugins/auth/AuthenticationCookie.class.php:188
+#: libraries/plugins/auth/AuthenticationCookie.class.php:166
+#: libraries/plugins/auth/AuthenticationCookie.class.php:176
 msgid "You can enter hostname/IP address and port separated by space."
 msgstr "Du kan skrive vertsnavn/IP adresse og port separert med mellomrom."
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:193
+#: libraries/plugins/auth/AuthenticationCookie.class.php:181
 msgid "Username:"
 msgstr "Brukernavn:"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:205
+#: libraries/plugins/auth/AuthenticationCookie.class.php:193
 #, fuzzy
 #| msgid "Server Choice"
 msgid "Server Choice:"
 msgstr "Tjenervalg"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:386
+#: libraries/plugins/auth/AuthenticationCookie.class.php:374
 msgid "Entered captcha is wrong, try again!"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:396
+#: libraries/plugins/auth/AuthenticationCookie.class.php:384
 msgid "Please enter correct captcha!"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:423
+#: libraries/plugins/auth/AuthenticationCookie.class.php:411
 #, fuzzy
 #| msgid "Cannot log in to the MySQL server"
 msgid "You are not allowed to log in to this MySQL server!"
@@ -10949,7 +10967,7 @@ msgstr "Hendelse"
 #: libraries/plugins/export/ExportOdt.class.php:593
 #: libraries/plugins/export/ExportTexytext.class.php:428
 #: libraries/plugins/export/PMA_ExportPdf.class.php:313
-#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:984
 #: libraries/rte/rte_triggers.lib.php:377
 #, fuzzy
 #| msgid "Description"
@@ -11298,7 +11316,7 @@ msgid "Last check:"
 msgstr "Sist sjekket:"
 
 #: libraries/plugins/export/ExportSql.class.php:1399
-#: templates/structure/structure_table_row.phtml:183
+#: templates/database/structure/structure_table_row.phtml:183
 msgid "in use"
 msgstr "i bruk"
 
@@ -11502,24 +11520,18 @@ msgstr ""
 msgid "The imported file does not contain any data!"
 msgstr "Den importerte filen inneholder ingen data!"
 
-#: libraries/plugins/import/ImportSql.class.php:169
+#: libraries/plugins/import/ImportSql.class.php:72
 #, fuzzy
 #| msgid "SQL compatibility mode"
 msgid "SQL compatibility mode:"
 msgstr "SQL kompatibilitetsmodus"
 
-#: libraries/plugins/import/ImportSql.class.php:181
+#: libraries/plugins/import/ImportSql.class.php:84
 #, fuzzy
 #| msgid "Do not use AUTO_INCREMENT for zero values"
 msgid "Do not use <code>AUTO_INCREMENT</code> for zero values"
 msgstr "Ikke bruk AUTO_INCREMENT for nullverdier"
 
-#: libraries/plugins/import/ImportSql.class.php:195
-#, fuzzy
-#| msgid "Read misses"
-msgid "Read as multibytes"
-msgstr "Lesebommer"
-
 #: libraries/plugins/import/ImportXml.class.php:54
 msgid "XML"
 msgstr "XML"
@@ -11564,7 +11576,7 @@ msgid "Show grid"
 msgstr "Vis rutenett"
 
 #: libraries/plugins/schema/SchemaPdf.class.php:94
-#: templates/structure/print_view_data_dictionary_link.phtml:6
+#: templates/database/structure/print_view_data_dictionary_link.phtml:6
 msgid "Data Dictionary"
 msgstr "Dataordbok"
 
@@ -11595,7 +11607,7 @@ msgid "The %s table doesn't exist!"
 msgstr "Tabellen %s eksisterer ikke!"
 
 #: libraries/plugins/schema/eps/Eps_Relation_Schema.class.php:321
-#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:309
+#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:323
 #, php-format
 msgid "Schema of the %s database - Page %s"
 msgstr "Skjema for %s databasen - Side %s"
@@ -11624,7 +11636,7 @@ msgstr "Innholdsfortegnelse"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1005
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1028
 #: libraries/tracking.lib.php:884
-#: templates/structure/table_structure_header.phtml:11
+#: templates/table/structure/table_structure_header.phtml:11
 msgid "Extra"
 msgstr "Ekstra"
 
@@ -12038,11 +12050,11 @@ msgid "Create the needed tables with the <code>%screate_tables.sql</code>."
 msgstr ""
 "Opprett nødvendige tabeller med <code>examples/create_tables.sql</code>."
 
-#: libraries/relation.lib.php:360
+#: libraries/relation.lib.php:357
 msgid "Create a pma user and give access to these tables."
 msgstr "Opprett en pma bruker og gi tilgang til disse tabellene."
 
-#: libraries/relation.lib.php:365
+#: libraries/relation.lib.php:360
 msgid ""
 "Enable advanced features in configuration file (<code>config.inc.php</"
 "code>), for example by starting from <code>config.sample.inc.php</code>."
@@ -12050,23 +12062,23 @@ msgstr ""
 "Slå på avansert funksjonalitet i konfigurasjonsfilen (<code>config.inc.php</"
 "code>), f.eks. med eksempel fra <code>config.sample.inc.php</code>."
 
-#: libraries/relation.lib.php:373
+#: libraries/relation.lib.php:365
 msgid "Re-login to phpMyAdmin to load the updated configuration file."
 msgstr ""
 "Re-logginn til phpMyAdmin for å laste den oppdaterte konfigurasjonsfila."
 
-#: libraries/relation.lib.php:1612
+#: libraries/relation.lib.php:1607
 msgid "no description"
 msgstr "ingen beskrivelse"
 
-#: libraries/relation.lib.php:1811
+#: libraries/relation.lib.php:1806
 msgid ""
 "You do not have necessary privileges to create a database named "
 "'phpmyadmin'. You may go to 'Operations' tab of any database to set up the "
 "phpMyAdmin configuration storage there."
 msgstr ""
 
-#: libraries/relation.lib.php:1928
+#: libraries/relation.lib.php:1923
 #, fuzzy, php-format
 #| msgid "Missing phpMyAdmin configuration storage tables"
 msgid ""
@@ -12074,21 +12086,21 @@ msgid ""
 "configuration storage there."
 msgstr "Mangler phpMyAdmin konfigurasjonslagertabeller"
 
-#: libraries/relation.lib.php:1936
+#: libraries/relation.lib.php:1931
 #, fuzzy, php-format
 #| msgid "Missing phpMyAdmin configuration storage tables"
 msgid ""
 "%sCreate%s the phpMyAdmin configuration storage in the current database."
 msgstr "Mangler phpMyAdmin konfigurasjonslagertabeller"
 
-#: libraries/relation.lib.php:1944
+#: libraries/relation.lib.php:1939
 #, fuzzy, php-format
 #| msgid "Missing phpMyAdmin configuration storage tables"
 msgid "%sCreate%s missing phpMyAdmin configuration storage tables."
 msgstr "Mangler phpMyAdmin konfigurasjonslagertabeller"
 
 #: libraries/replication_gui.lib.php:46 libraries/replication_gui.lib.php:343
-#: libraries/server_databases.lib.php:387
+#: libraries/server_databases.lib.php:398
 msgid "Master replication"
 msgstr "Masterreplikasjon"
 
@@ -12160,7 +12172,7 @@ msgstr ""
 "konfigurert som master."
 
 #: libraries/replication_gui.lib.php:141
-#: libraries/server_databases.lib.php:389
+#: libraries/server_databases.lib.php:400
 msgid "Slave replication"
 msgstr "Slavereplikasjon"
 
@@ -12468,10 +12480,10 @@ msgid "Master server changed successfully to %s."
 msgstr "Mastertjener endret til %s"
 
 #: libraries/rte/rte_events.lib.php:106 libraries/rte/rte_events.lib.php:115
-#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:149
-#: libraries/rte/rte_routines.lib.php:158
-#: libraries/rte/rte_routines.lib.php:231
-#: libraries/rte/rte_routines.lib.php:1362
+#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:219
+#: libraries/rte/rte_routines.lib.php:246
+#: libraries/rte/rte_routines.lib.php:368
+#: libraries/rte/rte_routines.lib.php:1453
 #: libraries/rte/rte_triggers.lib.php:82 libraries/rte/rte_triggers.lib.php:91
 #: libraries/rte/rte_triggers.lib.php:123
 #, fuzzy, php-format
@@ -12495,7 +12507,7 @@ msgstr "Kolonne %s har blitt slettet"
 msgid "Event %1$s has been created."
 msgstr "Tabellen %1$s har blitt opprettet."
 
-#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:251
+#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:266
 #: libraries/rte/rte_triggers.lib.php:144
 msgid "One or more errors have occurred while processing your request:"
 msgstr ""
@@ -12506,7 +12518,7 @@ msgstr ""
 msgid "Edit event"
 msgstr "Rediger tjener"
 
-#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:794
+#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:885
 #: libraries/rte/rte_triggers.lib.php:323 view_create.php:180
 #, fuzzy
 #| msgid "Details…"
@@ -12523,7 +12535,7 @@ msgstr "Hendelsestype"
 msgid "Event type"
 msgstr "Hendelsestype"
 
-#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:817
+#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:908
 #, fuzzy, php-format
 #| msgid "Change"
 msgid "Change to %s"
@@ -12557,12 +12569,14 @@ msgstr "Slutt"
 msgid "On completion preserve"
 msgstr "Komplette inserts"
 
-#: libraries/rte/rte_events.lib.php:491 libraries/rte/rte_routines.lib.php:930
+#: libraries/rte/rte_events.lib.php:491
+#: libraries/rte/rte_routines.lib.php:1021
 #: libraries/rte/rte_triggers.lib.php:383 view_create.php:209
 msgid "Definer"
 msgstr ""
 
-#: libraries/rte/rte_events.lib.php:535 libraries/rte/rte_routines.lib.php:997
+#: libraries/rte/rte_events.lib.php:535
+#: libraries/rte/rte_routines.lib.php:1088
 #: libraries/rte/rte_triggers.lib.php:422
 msgid "The definer must be in the \"username@hostname\" format!"
 msgstr ""
@@ -12590,9 +12604,9 @@ msgid "You must provide an event definition."
 msgstr ""
 
 #: libraries/rte/rte_export.lib.php:43 libraries/rte/rte_general.lib.php:72
-#: libraries/rte/rte_routines.lib.php:345
-#: libraries/rte/rte_routines.lib.php:1198
-#: libraries/rte/rte_routines.lib.php:1411
+#: libraries/rte/rte_routines.lib.php:153
+#: libraries/rte/rte_routines.lib.php:1289
+#: libraries/rte/rte_routines.lib.php:1502
 #, fuzzy
 #| msgid "Error in Processing Request"
 msgid "Error in processing request:"
@@ -12628,155 +12642,155 @@ msgid ""
 "problems."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:110
-#: libraries/rte/rte_routines.lib.php:1006
-#, fuzzy, php-format
-#| msgid "Invalid server index: %s"
-msgid "Invalid routine type: \"%s\""
-msgstr "Ugyldig tjenerindeks: \"%s\""
-
-#: libraries/rte/rte_routines.lib.php:170
-msgid "Sorry, we failed to restore the dropped routine."
-msgstr ""
-
-#: libraries/rte/rte_routines.lib.php:211
-#, fuzzy, php-format
-#| msgid "Column %s has been dropped."
-msgid "Routine %1$s has been modified. Privileges have been adjusted."
-msgstr "Kolonne %s har blitt slettet"
-
-#: libraries/rte/rte_routines.lib.php:216
-#, fuzzy, php-format
-#| msgid "Column %s has been dropped."
-msgid "Routine %1$s has been modified."
-msgstr "Kolonne %s har blitt slettet"
-
-#: libraries/rte/rte_routines.lib.php:238
-#, fuzzy, php-format
-#| msgid "Table %1$s has been created."
-msgid "Routine %1$s has been created."
-msgstr "Tabellen %1$s har blitt opprettet."
-
-#: libraries/rte/rte_routines.lib.php:315
+#: libraries/rte/rte_routines.lib.php:123
 #, fuzzy
 #| msgid "Edit mode"
 msgid "Edit routine"
 msgstr "Redigeringsmodus"
 
-#: libraries/rte/rte_routines.lib.php:797
+#: libraries/rte/rte_routines.lib.php:200
+#: libraries/rte/rte_routines.lib.php:1097
+#, fuzzy, php-format
+#| msgid "Invalid server index: %s"
+msgid "Invalid routine type: \"%s\""
+msgstr "Ugyldig tjenerindeks: \"%s\""
+
+#: libraries/rte/rte_routines.lib.php:253
+#, fuzzy, php-format
+#| msgid "Table %1$s has been created."
+msgid "Routine %1$s has been created."
+msgstr "Tabellen %1$s har blitt opprettet."
+
+#: libraries/rte/rte_routines.lib.php:380
+msgid "Sorry, we failed to restore the dropped routine."
+msgstr ""
+
+#: libraries/rte/rte_routines.lib.php:439
+#, fuzzy, php-format
+#| msgid "Column %s has been dropped."
+msgid "Routine %1$s has been modified. Privileges have been adjusted."
+msgstr "Kolonne %s har blitt slettet"
+
+#: libraries/rte/rte_routines.lib.php:444
+#, fuzzy, php-format
+#| msgid "Column %s has been dropped."
+msgid "Routine %1$s has been modified."
+msgstr "Kolonne %s har blitt slettet"
+
+#: libraries/rte/rte_routines.lib.php:888
 #, fuzzy
 #| msgid "Routines"
 msgid "Routine name"
 msgstr "Rutiner"
 
-#: libraries/rte/rte_routines.lib.php:823
+#: libraries/rte/rte_routines.lib.php:914
 msgid "Parameters"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:829
+#: libraries/rte/rte_routines.lib.php:920
 #, fuzzy
 #| msgid "Direct links"
 msgid "Direction"
 msgstr "Direkte linker"
 
-#: libraries/rte/rte_routines.lib.php:847
+#: libraries/rte/rte_routines.lib.php:938
 #, fuzzy
 #| msgid "Apply index(s)"
 msgid "Add parameter"
 msgstr "Utfør indeks(er)"
 
-#: libraries/rte/rte_routines.lib.php:851
+#: libraries/rte/rte_routines.lib.php:942
 #, fuzzy
 #| msgid "Remove database"
 msgid "Remove last parameter"
 msgstr "Fjern database"
 
-#: libraries/rte/rte_routines.lib.php:856
+#: libraries/rte/rte_routines.lib.php:947
 msgid "Return type"
 msgstr "Returtype"
 
-#: libraries/rte/rte_routines.lib.php:862
+#: libraries/rte/rte_routines.lib.php:953
 #, fuzzy
 #| msgid "Length/Values"
 msgid "Return length/values"
 msgstr "Lengde/Sett*"
 
-#: libraries/rte/rte_routines.lib.php:868
+#: libraries/rte/rte_routines.lib.php:959
 #, fuzzy
 #| msgid "Table options"
 msgid "Return options"
 msgstr "Tabellinnstillinger"
 
-#: libraries/rte/rte_routines.lib.php:899
+#: libraries/rte/rte_routines.lib.php:990
 msgid "Is deterministic"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:920
+#: libraries/rte/rte_routines.lib.php:1011
 msgid ""
 "You do not have sufficient privileges to perform this operation; Please "
 "refer to the documentation for more details"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:935
+#: libraries/rte/rte_routines.lib.php:1026
 #, fuzzy
 #| msgid "Security"
 msgid "Security type"
 msgstr "Sikkerhet"
 
-#: libraries/rte/rte_routines.lib.php:944
+#: libraries/rte/rte_routines.lib.php:1035
 msgid "SQL data access"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1013
+#: libraries/rte/rte_routines.lib.php:1104
 #, fuzzy
 #| msgid "Invalid table name"
 msgid "You must provide a routine name!"
 msgstr "Ugylding tabellnavn"
 
-#: libraries/rte/rte_routines.lib.php:1047
+#: libraries/rte/rte_routines.lib.php:1138
 #, php-format
 msgid "Invalid direction \"%s\" given for parameter."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1069
-#: libraries/rte/rte_routines.lib.php:1131
+#: libraries/rte/rte_routines.lib.php:1160
+#: libraries/rte/rte_routines.lib.php:1222
 msgid ""
 "You must provide length/values for routine parameters of type ENUM, SET, "
 "VARCHAR and VARBINARY."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1095
+#: libraries/rte/rte_routines.lib.php:1186
 msgid "You must provide a name and a type for each routine parameter."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1114
+#: libraries/rte/rte_routines.lib.php:1205
 msgid "You must provide a valid return type for the routine."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1174
+#: libraries/rte/rte_routines.lib.php:1265
 msgid "You must provide a routine definition."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1285
+#: libraries/rte/rte_routines.lib.php:1376
 #, fuzzy, php-format
 #| msgid "Allows executing stored routines."
 msgid "Execution results of routine %s"
 msgstr "Tillater utføring av lagrede rutiner."
 
-#: libraries/rte/rte_routines.lib.php:1340
+#: libraries/rte/rte_routines.lib.php:1431
 #, php-format
 msgid "%d row affected by the last statement inside the procedure."
 msgid_plural "%d rows affected by the last statement inside the procedure."
 msgstr[0] ""
 msgstr[1] ""
 
-#: libraries/rte/rte_routines.lib.php:1398
-#: libraries/rte/rte_routines.lib.php:1406
+#: libraries/rte/rte_routines.lib.php:1489
+#: libraries/rte/rte_routines.lib.php:1497
 msgid "Execute routine"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1485
-#: libraries/rte/rte_routines.lib.php:1488
+#: libraries/rte/rte_routines.lib.php:1576
+#: libraries/rte/rte_routines.lib.php:1579
 #, fuzzy
 #| msgid "Routines"
 msgid "Routine parameters"
@@ -12980,7 +12994,7 @@ msgid "Original position"
 msgstr "Original posisjon"
 
 #: libraries/server_bin_log.lib.php:133
-#: templates/structure/display_table_stats.phtml:4
+#: templates/table/structure/display_table_stats.phtml:4
 msgid "Information"
 msgstr "Informasjon"
 
@@ -13018,12 +13032,12 @@ msgstr ""
 "OBS: Når du slår på databasestatistikk så kan det medføre stor traffik "
 "mellom webtjeneren og MySQL-tjeneren."
 
-#: libraries/server_databases.lib.php:364
-#: libraries/server_databases.lib.php:365
+#: libraries/server_databases.lib.php:366
+#: libraries/server_databases.lib.php:371
 msgid "Enable Statistics"
 msgstr "Slå på statistikk"
 
-#: libraries/server_databases.lib.php:481
+#: libraries/server_databases.lib.php:492
 #, fuzzy, php-format
 #| msgid "%s databases have been dropped successfully."
 msgid "%1$d database has been dropped successfully."
@@ -13410,7 +13424,7 @@ msgid "You have revoked the privileges for %s."
 msgstr "Du har fjernet privilegiene til %s."
 
 #: libraries/server_privileges.lib.php:2059
-#: libraries/server_privileges.lib.php:4290
+#: libraries/server_privileges.lib.php:4316
 #, fuzzy
 #| msgid "Add user"
 msgid "Add user account"
@@ -13595,60 +13609,60 @@ msgstr "Sletter %s"
 msgid "The privileges were reloaded successfully."
 msgstr "Oppfriskingen av privilegiene lyktes."
 
-#: libraries/server_privileges.lib.php:3994
+#: libraries/server_privileges.lib.php:4003
 #, php-format
 msgid "The user %s already exists!"
 msgstr "Brukeren %s finnes fra før!"
 
-#: libraries/server_privileges.lib.php:4232
+#: libraries/server_privileges.lib.php:4258
 #, fuzzy, php-format
 #| msgid "Privileges"
 msgid "Privileges for %s"
 msgstr "Privilegier"
 
-#: libraries/server_privileges.lib.php:4241
+#: libraries/server_privileges.lib.php:4267
 #: libraries/server_status_processes.lib.php:72
 #: libraries/server_user_groups.lib.php:39
 msgid "User"
 msgstr "Bruker"
 
-#: libraries/server_privileges.lib.php:4282
+#: libraries/server_privileges.lib.php:4308
 msgctxt "Create new user"
 msgid "New"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4311
+#: libraries/server_privileges.lib.php:4337
 #, fuzzy
 #| msgid "Edit Privileges"
 msgid "Edit privileges:"
 msgstr "Rediger privilegier"
 
-#: libraries/server_privileges.lib.php:4312
+#: libraries/server_privileges.lib.php:4338
 #, fuzzy
 #| msgid "Users"
 msgid "User account"
 msgstr "Brukere"
 
-#: libraries/server_privileges.lib.php:4371
+#: libraries/server_privileges.lib.php:4397
 msgid ""
 "Note: You are attempting to edit privileges of the user with which you are "
 "currently logged in."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4391 libraries/server_users.lib.php:25
+#: libraries/server_privileges.lib.php:4417 libraries/server_users.lib.php:25
 #, fuzzy
 #| msgid "User overview"
 msgid "User accounts overview"
 msgstr "Brukeroversikt"
 
-#: libraries/server_privileges.lib.php:4459
+#: libraries/server_privileges.lib.php:4485
 msgid ""
 "A user account allowing any user from localhost to connect is present. This "
 "will prevent other users from connecting if the host part of their account "
 "allows a connection from any (%) host."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4500
+#: libraries/server_privileges.lib.php:4526
 #, php-format
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
@@ -13661,7 +13675,7 @@ msgstr ""
 "privilegiene tjeneren bruker hvis det er utført manuelle endringer på den. I "
 "så fall bør du %soppfriske privilegiene%s før du fortsetter."
 
-#: libraries/server_privileges.lib.php:4519
+#: libraries/server_privileges.lib.php:4545
 #, fuzzy
 #| msgid ""
 #| "Note: phpMyAdmin gets the users' privileges directly from MySQL's "
@@ -13680,26 +13694,26 @@ msgstr ""
 "privilegiene tjeneren bruker hvis det er utført manuelle endringer på den. I "
 "så fall bør du %soppfriske privilegiene%s før du fortsetter."
 
-#: libraries/server_privileges.lib.php:4569
+#: libraries/server_privileges.lib.php:4595
 msgid "The selected user was not found in the privilege table."
 msgstr "Den valgte brukeren ble ikke funnet i privilegietabellen."
 
-#: libraries/server_privileges.lib.php:4801
+#: libraries/server_privileges.lib.php:4827
 msgid "You have added a new user."
 msgstr "Du har lagt til en ny bruker."
 
-#: libraries/server_status.lib.php:53
+#: libraries/server_status.lib.php:60
 #, php-format
 msgid "Network traffic since startup: %s"
 msgstr ""
 
-#: libraries/server_status.lib.php:66
+#: libraries/server_status.lib.php:73
 #, fuzzy, php-format
 #| msgid "s MySQL server has been running for %s. It started up on %s."
 msgid "This MySQL server has been running for %1$s. It started up on %2$s."
 msgstr "Denne MySQL tjeneren har kjørt i %s. Den startet opp den %s."
 
-#: libraries/server_status.lib.php:80
+#: libraries/server_status.lib.php:94
 msgid ""
 "This MySQL server works as <b>master</b> and <b>slave</b> in <b>replication</"
 "b> process."
@@ -13707,23 +13721,23 @@ msgstr ""
 "Denne tjeneren jobber både som <b>tjener</b> og <b>slave</b> i "
 "<b>replikasjons</b>prosessen."
 
-#: libraries/server_status.lib.php:85
+#: libraries/server_status.lib.php:99
 msgid "This MySQL server works as <b>master</b> in <b>replication</b> process."
 msgstr ""
 "Denne tjeneren er konfigurert som <b>tjener</b> i en <b>replikasjons</"
 "b>prosess."
 
-#: libraries/server_status.lib.php:90
+#: libraries/server_status.lib.php:104
 msgid "This MySQL server works as <b>slave</b> in <b>replication</b> process."
 msgstr ""
 "Denne tjeneren er konfigurert som <b>slave</b> i en <b>replikasjons</"
 "b>prosess."
 
-#: libraries/server_status.lib.php:106
+#: libraries/server_status.lib.php:116
 msgid "Replication status"
 msgstr "Replikasjonsstatus"
 
-#: libraries/server_status.lib.php:137
+#: libraries/server_status.lib.php:146
 msgid ""
 "On a busy server, the byte counters may overrun, so those statistics as "
 "reported by the MySQL server may be incorrect."
@@ -13731,21 +13745,21 @@ msgstr ""
 "På en travel tjener så kan byte-tellerene overflyte, så denne statistikken "
 "som rapportert av MySQL tjeneren kan være unøyaktig."
 
-#: libraries/server_status.lib.php:148
+#: libraries/server_status.lib.php:157
 msgid "Received"
 msgstr "Mottatt"
 
-#: libraries/server_status.lib.php:167
+#: libraries/server_status.lib.php:176
 msgid "Sent"
 msgstr "Sendt"
 
-#: libraries/server_status.lib.php:234
+#: libraries/server_status.lib.php:243
 #, fuzzy
 #| msgid "max. concurrent connections"
 msgid "Max. concurrent connections"
 msgstr "maks. samtidige tilkoblinger"
 
-#: libraries/server_status.lib.php:244
+#: libraries/server_status.lib.php:253
 msgid "Failed attempts"
 msgstr "Feilede forsøk"
 
@@ -14862,7 +14876,7 @@ msgstr ""
 msgid "Not implemented yet."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/AlterOperation.php:193
+#: libraries/sql-parser/src/Components/AlterOperation.php:191
 #, fuzzy
 #| msgid "Iconic table operations"
 msgid "Unrecognized alter operation."
@@ -14878,7 +14892,7 @@ msgid "An opening bracket followed by a set of values was expected."
 msgstr ""
 
 #: libraries/sql-parser/src/Components/ArrayObj.php:101
-#: libraries/sql-parser/src/Components/FieldDefinition.php:202
+#: libraries/sql-parser/src/Components/CreateDefinition.php:202
 msgid "An opening bracket was expected."
 msgstr ""
 
@@ -14886,25 +14900,35 @@ msgstr ""
 msgid "A comma or a closing bracket was expected"
 msgstr ""
 
+#: libraries/sql-parser/src/Components/CreateDefinition.php:246
+#, fuzzy
+#| msgid "No tables selected."
+msgid "A comma or a closing bracket was expected."
+msgstr "Ingen tabeller er valgt."
+
+#: libraries/sql-parser/src/Components/CreateDefinition.php:262
+msgid "A closing bracket was expected."
+msgstr ""
+
 #: libraries/sql-parser/src/Components/DataType.php:125
 msgid "Unrecognized data type."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:225
+#: libraries/sql-parser/src/Components/Expression.php:227
 msgid "Unexpected closing bracket."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:246
-#: libraries/sql-parser/src/Components/Expression.php:283
-#: libraries/sql-parser/src/Components/Expression.php:303
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:285
+#: libraries/sql-parser/src/Components/Expression.php:305
 msgid "An alias was previously found."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:257
+#: libraries/sql-parser/src/Components/Expression.php:259
 msgid "Unexpected dot."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:327
+#: libraries/sql-parser/src/Components/Expression.php:329
 #, fuzzy
 #| msgid "No tables selected."
 msgid "An alias was expected."
@@ -14916,16 +14940,6 @@ msgstr "Ingen tabeller er valgt."
 msgid "An expression was expected."
 msgstr "Ingen rader valgt"
 
-#: libraries/sql-parser/src/Components/FieldDefinition.php:246
-#, fuzzy
-#| msgid "No tables selected."
-msgid "A comma or a closing bracket was expected."
-msgstr "Ingen tabeller er valgt."
-
-#: libraries/sql-parser/src/Components/FieldDefinition.php:262
-msgid "A closing bracket was expected."
-msgstr ""
-
 #: libraries/sql-parser/src/Components/Limit.php:90
 #: libraries/sql-parser/src/Components/Limit.php:112
 msgid "An offset was expected."
@@ -14973,29 +14987,29 @@ msgstr ""
 msgid "Expected delimiter."
 msgstr ""
 
-#: libraries/sql-parser/src/Lexer.php:753
+#: libraries/sql-parser/src/Lexer.php:777
 #, fuzzy, php-format
 #| msgid "Table %1$s has been created."
 msgid "Ending quote %1$s was expected."
 msgstr "Tabellen %1$s har blitt opprettet."
 
-#: libraries/sql-parser/src/Lexer.php:789
+#: libraries/sql-parser/src/Lexer.php:813
 #, fuzzy
 #| msgid "Table name template"
 msgid "Variable name was expected."
 msgstr "Tabellnavnmal"
 
-#: libraries/sql-parser/src/Parser.php:380
+#: libraries/sql-parser/src/Parser.php:391
 #, fuzzy
 #| msgid "At Beginning of Table"
 msgid "Unexpected beginning of statement."
 msgstr "Ved begynnelsen av tabellen"
 
-#: libraries/sql-parser/src/Parser.php:399
+#: libraries/sql-parser/src/Parser.php:410
 msgid "Unrecognized statement type."
 msgstr ""
 
-#: libraries/sql-parser/src/Parser.php:479
+#: libraries/sql-parser/src/Parser.php:489
 msgid "No transaction was previously started."
 msgstr ""
 
@@ -15025,8 +15039,10 @@ msgid "The name of the entity was expected."
 msgstr "Antall åpne tabeller."
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:310
-msgid "At least one field definition was expected."
-msgstr ""
+#, fuzzy
+#| msgid "The row has been deleted."
+msgid "At least one column definition was expected."
+msgstr "Raden er slettet."
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:329
 msgid "A \"RETURNS\" keyword was expected."
@@ -15103,11 +15119,11 @@ msgstr "Bokmerke %s opprettet"
 msgid "Using bookmark \"%s\" as default browse query."
 msgstr ""
 
-#: libraries/sql.lib.php:1306
+#: libraries/sql.lib.php:1300
 msgid "Showing as PHP code"
 msgstr "Viser som PHP kode"
 
-#: libraries/sql.lib.php:1638
+#: libraries/sql.lib.php:1632
 #, fuzzy, php-format
 #| msgid ""
 #| "This table does not contain a unique column. Features related to the grid "
@@ -15120,7 +15136,7 @@ msgstr ""
 "valgene Endring, avkrysningsruten, redigere, kopiere og slette koblinger "
 "virker kanskje ikke etter lagring."
 
-#: libraries/sql.lib.php:1649
+#: libraries/sql.lib.php:1643
 #, fuzzy, php-format
 #| msgid ""
 #| "This table does not contain a unique column. Features related to the grid "
@@ -15133,7 +15149,7 @@ msgstr ""
 "valgene Endring, avkrysningsruten, redigere, kopiere og slette koblinger "
 "virker kanskje ikke etter lagring."
 
-#: libraries/sql.lib.php:1688
+#: libraries/sql.lib.php:1682
 #, php-format
 msgid "Problems with indexes of table `%s`"
 msgstr "Problemer med indeksene i tabellen `%s`"
@@ -15305,7 +15321,7 @@ msgid "Version %s snapshot (SQL code)"
 msgstr "Versjon %s øyeblikksbilde (SQL kode)"
 
 #: libraries/tracking.lib.php:947
-#: templates/structure/table_structure_row.phtml:33
+#: templates/table/structure/table_structure_row.phtml:33
 msgctxt "None for default"
 msgid "None"
 msgstr "Ingen"
@@ -15367,17 +15383,17 @@ msgstr "Opprett versjon %s av %s.%s"
 msgid "Version %1$s was created, tracking for %2$s is active."
 msgstr "Versjon %s er opprettet, overvåking av %s.%s er aktivert."
 
-#: libraries/user_preferences.inc.php:29
+#: libraries/user_preferences.inc.php:30
 msgid "Manage your settings"
 msgstr "Endre dine innstillinger"
 
-#: libraries/user_preferences.inc.php:46 prefs_manage.php:307
+#: libraries/user_preferences.inc.php:54 prefs_manage.php:307
 #, fuzzy
 #| msgid "Modifications have been saved"
 msgid "Configuration has been saved."
 msgstr "Endringene er lagret"
 
-#: libraries/user_preferences.inc.php:66
+#: libraries/user_preferences.inc.php:74
 #, php-format
 msgid ""
 "Your preferences will be saved for current session only. Storing them "
@@ -15803,7 +15819,7 @@ msgid "first"
 msgstr ""
 
 #: templates/columns_definitions/move_column.phtml:12
-#: templates/structure/add_column.phtml:21
+#: templates/table/structure/add_column.phtml:21
 #, fuzzy, php-format
 #| msgid "After %s"
 msgid "after %s"
@@ -15885,239 +15901,346 @@ msgstr "Nettvisertransformasjon"
 msgid "Input transformation options"
 msgstr "Transformasjonsvalg"
 
-#: templates/designer/aggregate_query_panel.phtml:22
-#: templates/designer/options_panel.phtml:100
+#: templates/database/create_table.phtml:7
+#: templates/database/designer/side_menu.phtml:77
+#: templates/database/designer/side_menu.phtml:80
+msgid "Create table"
+msgstr "Opprett tabell"
+
+#: templates/database/create_table.phtml:15
+msgid "Number of columns"
+msgstr "Antall kolonner"
+
+#: templates/database/designer/aggregate_query_panel.phtml:22
+#: templates/database/designer/options_panel.phtml:100
 #, fuzzy
 #| msgid "Create"
 msgid "Aggregate"
 msgstr "Opprett"
 
-#: templates/designer/aggregate_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:61
-#: templates/designer/options_panel.phtml:106
-#: templates/designer/options_panel.phtml:170
-#: templates/designer/where_query_panel.phtml:30
-#: templates/table/table_header.phtml:9
+#: templates/database/designer/aggregate_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:61
+#: templates/database/designer/options_panel.phtml:106
+#: templates/database/designer/options_panel.phtml:170
+#: templates/database/designer/where_query_panel.phtml:30
+#: templates/table/search/table_header.phtml:9
 msgid "Operator"
 msgstr "Operatør"
 
-#: templates/designer/database_tables.phtml:29
+#: templates/database/designer/database_tables.phtml:29
 msgid "Toggle"
 msgstr ""
 
-#: templates/designer/database_tables.phtml:40
+#: templates/database/designer/database_tables.phtml:40
 #, fuzzy
 #| msgid "Table structure"
 msgid "See table structure"
 msgstr "Tabellstruktur"
 
-#: templates/designer/delete_relation_panel.phtml:21
+#: templates/database/designer/delete_relation_panel.phtml:21
 msgid "Delete relation"
 msgstr "Slett relasjon"
 
-#: templates/designer/edit_delete_pages.phtml:7
+#: templates/database/designer/edit_delete_pages.phtml:7
 #, fuzzy
 #| msgid "Page titles"
 msgid "Page to open"
 msgstr "Sidetitler"
 
-#: templates/designer/edit_delete_pages.phtml:7
+#: templates/database/designer/edit_delete_pages.phtml:7
 #, fuzzy
 #| msgid "Relation deleted"
 msgid "Page to delete"
 msgstr "Relasjon slettet"
 
-#: templates/designer/having_query_panel.phtml:90
-#: templates/designer/options_panel.phtml:63
-#: templates/designer/options_panel.phtml:229
-#: templates/designer/where_query_panel.phtml:59
+#: templates/database/designer/having_query_panel.phtml:90
+#: templates/database/designer/options_panel.phtml:63
+#: templates/database/designer/options_panel.phtml:229
+#: templates/database/designer/where_query_panel.phtml:59
 #, fuzzy
 #| msgid "Export"
 msgid "Except"
 msgstr "Eksporter"
 
-#: templates/designer/having_query_panel.phtml:102
-#: templates/designer/options_panel.phtml:75
-#: templates/designer/options_panel.phtml:241
-#: templates/designer/where_query_panel.phtml:71
+#: templates/database/designer/having_query_panel.phtml:102
+#: templates/database/designer/options_panel.phtml:75
+#: templates/database/designer/options_panel.phtml:241
+#: templates/database/designer/where_query_panel.phtml:71
 #, fuzzy
 #| msgid "in query"
 msgid "subquery"
 msgstr "i spørring"
 
-#: templates/designer/new_relation_panel.phtml:22
-#: templates/designer/side_menu.phtml:84 templates/designer/side_menu.phtml:87
+#: templates/database/designer/new_relation_panel.phtml:22
+#: templates/database/designer/side_menu.phtml:84
+#: templates/database/designer/side_menu.phtml:87
 msgid "Create relation"
 msgstr "Opprett relasjon"
 
-#: templates/designer/options_panel.phtml:34
-#: templates/designer/options_panel.phtml:200
+#: templates/database/designer/options_panel.phtml:34
+#: templates/database/designer/options_panel.phtml:200
 #, fuzzy
 #| msgid "Relation deleted"
 msgid "Relation operator"
 msgstr "Relasjon slettet"
 
-#: templates/designer/options_panel.phtml:85
-#: templates/designer/rename_to_panel.phtml:23
+#: templates/database/designer/options_panel.phtml:85
+#: templates/database/designer/rename_to_panel.phtml:23
 #, fuzzy
 #| msgid "Rename view to"
 msgid "Rename to"
 msgstr "Endre tabellens navn"
 
-#: templates/designer/options_panel.phtml:91
-#: templates/designer/rename_to_panel.phtml:31
+#: templates/database/designer/options_panel.phtml:91
+#: templates/database/designer/rename_to_panel.phtml:31
 #, fuzzy
 #| msgid "User name"
 msgid "New name"
 msgstr "Brukernavn"
 
-#: templates/designer/page_save_as.phtml:4
+#: templates/database/designer/page_save_as.phtml:4
 #, fuzzy
 #| msgid "Export/Import to scale"
 msgid "Save to selected page"
 msgstr "Eksporter/Importer til skala"
 
-#: templates/designer/page_save_as.phtml:5
+#: templates/database/designer/page_save_as.phtml:5
 #, fuzzy
 #| msgid "Create a new index"
 msgid "Create a page and save to it"
 msgstr "Lag en ny indeks"
 
-#: templates/designer/page_save_as.phtml:26
+#: templates/database/designer/page_save_as.phtml:26
 #, fuzzy
 #| msgid "User name"
 msgid "New page name"
 msgstr "Brukernavn"
 
-#: templates/designer/page_selector.phtml:2
+#: templates/database/designer/page_selector.phtml:2
 msgid "Select page"
 msgstr "Velg side"
 
-#: templates/designer/query_details.phtml:10
+#: templates/database/designer/query_details.phtml:10
 #, fuzzy
 #| msgid "Table options"
 msgid "Active options"
 msgstr "Tabellinnstillinger"
 
-#: templates/designer/schema_export.phtml:4
+#: templates/database/designer/schema_export.phtml:4
 msgid "Select Export Relational Type"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:19 templates/designer/side_menu.phtml:25
+#: templates/database/designer/side_menu.phtml:19
+#: templates/database/designer/side_menu.phtml:25
 #, fuzzy
 #| msgid "Show tables"
 msgid "Show/Hide tables list"
 msgstr "Vis tabeller"
 
-#: templates/designer/side_menu.phtml:29 templates/designer/side_menu.phtml:35
-#: templates/designer/side_menu.phtml:36
+#: templates/database/designer/side_menu.phtml:29
+#: templates/database/designer/side_menu.phtml:35
+#: templates/database/designer/side_menu.phtml:36
 msgid "View in fullscreen"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:34
+#: templates/database/designer/side_menu.phtml:34
 msgid "Exit fullscreen"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:41 templates/designer/side_menu.phtml:45
+#: templates/database/designer/side_menu.phtml:41
+#: templates/database/designer/side_menu.phtml:45
 #, fuzzy
 #| msgid "User name"
 msgid "New page"
 msgstr "Brukernavn"
 
-#: templates/designer/side_menu.phtml:70 templates/designer/side_menu.phtml:73
+#: templates/database/designer/side_menu.phtml:70
+#: templates/database/designer/side_menu.phtml:73
 #, fuzzy
 #| msgid "Select page"
 msgid "Delete pages"
 msgstr "Velg side"
 
-#: templates/designer/side_menu.phtml:77 templates/designer/side_menu.phtml:80
-#: templates/table/create_table.phtml:7
-msgid "Create table"
-msgstr "Opprett tabell"
-
-#: templates/designer/side_menu.phtml:98
-#: templates/designer/side_menu.phtml:101
+#: templates/database/designer/side_menu.phtml:98
+#: templates/database/designer/side_menu.phtml:101
 msgid "Reload"
 msgstr "Oppdater"
 
-#: templates/designer/side_menu.phtml:107
-#: templates/designer/side_menu.phtml:110
+#: templates/database/designer/side_menu.phtml:107
+#: templates/database/designer/side_menu.phtml:110
 msgid "Help"
 msgstr "Hjelp"
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Angular links"
 msgstr "Vinklede linker"
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Direct links"
 msgstr "Direkte linker"
 
-#: templates/designer/side_menu.phtml:122
-#: templates/designer/side_menu.phtml:124
+#: templates/database/designer/side_menu.phtml:122
+#: templates/database/designer/side_menu.phtml:124
 msgid "Snap to grid"
 msgstr "Lås til ruter"
 
-#: templates/designer/side_menu.phtml:128
-#: templates/designer/side_menu.phtml:134
+#: templates/database/designer/side_menu.phtml:128
+#: templates/database/designer/side_menu.phtml:134
 msgid "Small/Big All"
 msgstr "Liten/Stor alle"
 
-#: templates/designer/side_menu.phtml:138
-#: templates/designer/side_menu.phtml:141
+#: templates/database/designer/side_menu.phtml:138
+#: templates/database/designer/side_menu.phtml:141
 msgid "Toggle small/big"
 msgstr "Veksle mellom liten/stor"
 
-#: templates/designer/side_menu.phtml:145
-#: templates/designer/side_menu.phtml:148
+#: templates/database/designer/side_menu.phtml:145
+#: templates/database/designer/side_menu.phtml:148
 #, fuzzy
 #| msgid "To select relation, click :"
 msgid "Toggle relation lines"
 msgstr "For å velge relasjon, klikk :"
 
-#: templates/designer/side_menu.phtml:153
-#: templates/designer/side_menu.phtml:156
+#: templates/database/designer/side_menu.phtml:153
+#: templates/database/designer/side_menu.phtml:156
 #, fuzzy
 #| msgid "Export"
 msgid "Export schema"
 msgstr "Eksporter"
 
-#: templates/designer/side_menu.phtml:165
-#: templates/designer/side_menu.phtml:168
+#: templates/database/designer/side_menu.phtml:165
+#: templates/database/designer/side_menu.phtml:168
 #, fuzzy
 #| msgid "Submit Query"
 msgid "Build Query"
 msgstr "Kjør spørring"
 
-#: templates/designer/side_menu.phtml:173
-#: templates/designer/side_menu.phtml:177
+#: templates/database/designer/side_menu.phtml:173
+#: templates/database/designer/side_menu.phtml:177
 msgid "Move Menu"
 msgstr "Flytt meny"
 
-#: templates/designer/side_menu.phtml:181
-#: templates/designer/side_menu.phtml:186
+#: templates/database/designer/side_menu.phtml:181
+#: templates/database/designer/side_menu.phtml:186
 #, fuzzy
 #| msgid "Partial texts"
 msgid "Pin text"
 msgstr "Delvise tekster"
 
-#: templates/designer/table_list.phtml:4
+#: templates/database/designer/table_list.phtml:4
 msgid "Hide/Show all"
 msgstr "Skjul/Vis alle"
 
-#: templates/designer/table_list.phtml:14
+#: templates/database/designer/table_list.phtml:14
 msgid "Hide/Show Tables with no relation"
 msgstr "Skjul/Vis tabeller uten relasjoner"
 
-#: templates/designer/table_list.phtml:59
+#: templates/database/designer/table_list.phtml:59
 #, fuzzy
 #| msgid "Number of tables"
 msgid "Number of tables:"
 msgstr "Antall tabeller"
 
+#: templates/database/structure/body_for_table_summary.phtml:6
+#, php-format
+msgid "%s table"
+msgid_plural "%s tables"
+msgstr[0] "%s tabell"
+msgstr[1] "%s tabeller"
+
+#: templates/database/structure/body_for_table_summary.phtml:17
+msgid "Sum"
+msgstr "Sum"
+
+#: templates/database/structure/check_all_tables.phtml:6
+msgid "Check tables having overhead"
+msgstr "Merk overheng"
+
+#: templates/database/structure/check_all_tables.phtml:10
+#, fuzzy
+#| msgid "Show color"
+msgid "Show create"
+msgstr "Vis farger"
+
+#: templates/database/structure/check_all_tables.phtml:27
+#, fuzzy
+#| msgid "Apply index(s)"
+msgid "Prefix"
+msgstr "Utfør indeks(er)"
+
+#: templates/database/structure/check_all_tables.phtml:28
+msgid "Add prefix to table"
+msgstr "Legg prefiks til tabell"
+
+#: templates/database/structure/check_all_tables.phtml:29
+msgid "Replace table prefix"
+msgstr "Erstatt tabellprefiks"
+
+#: templates/database/structure/check_all_tables.phtml:30
+msgid "Copy table with prefix"
+msgstr "Kopier tabell med prefiks"
+
+#: templates/database/structure/check_all_tables.phtml:36
+#, fuzzy
+#| msgid "CHAR textarea columns"
+msgid "Add columns to central list"
+msgstr "CHAR textarea kolonner"
+
+#: templates/database/structure/check_all_tables.phtml:37
+msgid "Remove columns from central list"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:38
+#, fuzzy
+#| msgid "CHAR textarea columns"
+msgid "Make consistent with central list"
+msgstr "CHAR textarea kolonner"
+
+#: templates/database/structure/favorite_anchor.phtml:12
+#, fuzzy
+#| msgid "Add a new server"
+msgid "Add to Favorites"
+msgstr "Legg til en ny tjener"
+
+#: templates/database/structure/show_create.phtml:2
+#, fuzzy
+#| msgid "Show SQL queries"
+msgid "Showing create queries"
+msgstr "Vis SQL spørringer"
+
+#: templates/database/structure/sortable_header.phtml:13
+msgid "Sort"
+msgstr "Sorter"
+
+#: templates/database/structure/table_header.phtml:42
+#, fuzzy
+#| msgid "May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]"
+msgid ""
+"May be approximate. Click on the number to get the exact count. See "
+"[doc@faq3-11]FAQ 3.11[/doc]."
+msgstr "Kan være unøyaktig. Se [doc@faq3-11]FAQ 3.11[/doc]"
+
+#: templates/database/structure/table_header.phtml:66
+#: templates/table/index_form.phtml:127
+msgid "Size"
+msgstr "Størrelse"
+
+#: templates/database/structure/table_header.phtml:74
+#: templates/table/structure/display_table_stats.phtml:27
+msgid "Overhead"
+msgstr "Overheng"
+
+#: templates/database/structure/tracking_icon.phtml:4
+msgid "Tracking is active."
+msgstr "Overvåkning er aktiv."
+
+#: templates/database/structure/tracking_icon.phtml:8
+msgid "Tracking is not active."
+msgstr "Overvåkning er ikke aktiv."
+
 #: templates/error/report_form.phtml:7
 msgid ""
 "phpMyAdmin has encountered an error. We have collected data about this error "
@@ -16133,76 +16256,6 @@ msgstr ""
 msgid "Please explain the steps that lead to the error:"
 msgstr ""
 
-#: templates/gis_visualization/gis_visualization.phtml:3
-#, fuzzy
-#| msgid "Display servers selection"
-msgid "Display GIS Visualization"
-msgstr "Vis tjenerutvalg"
-
-#: templates/gis_visualization/gis_visualization.phtml:8
-#, fuzzy
-#| msgid "CHAR textarea columns"
-msgid "Label column"
-msgstr "CHAR textarea kolonner"
-
-#: templates/gis_visualization/gis_visualization.phtml:11
-#, fuzzy
-#| msgid "- none -"
-msgid "-- None --"
-msgstr "- ingen -"
-
-#: templates/gis_visualization/gis_visualization.phtml:19
-#, fuzzy
-#| msgid "Log file count"
-msgid "Spatial column"
-msgstr "Antall loggfiler"
-
-#: templates/index_form.phtml:16
-msgid "Index name:"
-msgstr "Indeksnavn&nbsp;:"
-
-#: templates/index_form.phtml:19
-msgid ""
-"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
-msgstr ""
-"\"PRIMARY\" <b>må</b> være navnet til og <b>bare til</b> en primærnøkkel!"
-
-#: templates/index_form.phtml:40
-#, fuzzy
-#| msgid "Index cache size"
-msgid "Index choice:"
-msgstr "Indeksmellomlagerstørrelse"
-
-#: templates/index_form.phtml:57
-msgid "Key block size:"
-msgstr ""
-
-#: templates/index_form.phtml:74
-msgid "Index type:"
-msgstr "Indekstype&nbsp;:"
-
-#: templates/index_form.phtml:86
-#, fuzzy
-#| msgid "User:"
-msgid "Parser:"
-msgstr "Bruker:"
-
-#: templates/index_form.phtml:102
-#, fuzzy
-#| msgid "Comment"
-msgid "Comment:"
-msgstr "Kommentar"
-
-#: templates/index_form.phtml:127 templates/structure/table_header.phtml:66
-msgid "Size"
-msgstr "Størrelse"
-
-#: templates/index_form.phtml:149 templates/index_form.phtml:190
-#, fuzzy
-#| msgid "Drag to reorder"
-msgid "Drag to reorder"
-msgstr "Dra for å omplassere"
-
 #: templates/prefs_autoload.phtml:9
 msgid ""
 "Your browser has phpMyAdmin configuration for this domain. Would you like to "
@@ -16215,411 +16268,189 @@ msgstr ""
 msgid "Start row:"
 msgstr "Startrad"
 
-#: templates/structure/actions_in_table_structure.phtml:14
-#, php-format
-msgid "A primary key has been added on %s."
-msgstr "En primærnøkkel har blitt lagt til %s."
-
-#: templates/structure/actions_in_table_structure.phtml:34
-#: templates/structure/actions_in_table_structure.phtml:54
-#: templates/structure/actions_in_table_structure.phtml:79
-#: templates/structure/actions_in_table_structure.phtml:101
-#, php-format
-msgid "An index has been added on %s."
-msgstr "En indeks har blitt lagt til %s."
-
-#: templates/structure/actions_in_table_structure.phtml:130
-#: templates/structure/check_all_table_column.phtml:59
-#, fuzzy
-#| msgid "Remove column(s)"
-msgid "Remove from central columns"
-msgstr "Fjern kolonne(r)"
-
-#: templates/structure/actions_in_table_structure.phtml:138
-#: templates/structure/check_all_table_column.phtml:55
-#, fuzzy
-#| msgid "CHAR textarea columns"
-msgid "Add to central columns"
-msgstr "CHAR textarea kolonner"
-
-#: templates/structure/add_column.phtml:7
-#, php-format
-msgid "Add %s column(s)"
-msgstr "Legg til %s kolonne(r)"
-
-#: templates/structure/add_column.phtml:12
-#, fuzzy
-#| msgid "At Beginning of Table"
-msgid "at beginning of table"
-msgstr "Ved begynnelsen av tabellen"
-
-#: templates/structure/body_for_table_summary.phtml:6
-#, php-format
-msgid "%s table"
-msgid_plural "%s tables"
-msgstr[0] "%s tabell"
-msgstr[1] "%s tabeller"
-
-#: templates/structure/body_for_table_summary.phtml:17
-msgid "Sum"
-msgstr "Sum"
-
-#: templates/structure/check_all_tables.phtml:6
-msgid "Check tables having overhead"
-msgstr "Merk overheng"
-
-#: templates/structure/check_all_tables.phtml:10
-#, fuzzy
-#| msgid "Show color"
-msgid "Show create"
-msgstr "Vis farger"
-
-#: templates/structure/check_all_tables.phtml:27
-#, fuzzy
-#| msgid "Apply index(s)"
-msgid "Prefix"
-msgstr "Utfør indeks(er)"
-
-#: templates/structure/check_all_tables.phtml:28
-msgid "Add prefix to table"
-msgstr "Legg prefiks til tabell"
-
-#: templates/structure/check_all_tables.phtml:29
-msgid "Replace table prefix"
-msgstr "Erstatt tabellprefiks"
-
-#: templates/structure/check_all_tables.phtml:30
-msgid "Copy table with prefix"
-msgstr "Kopier tabell med prefiks"
-
-#: templates/structure/check_all_tables.phtml:36
-#, fuzzy
-#| msgid "CHAR textarea columns"
-msgid "Add columns to central list"
-msgstr "CHAR textarea kolonner"
-
-#: templates/structure/check_all_tables.phtml:37
-msgid "Remove columns from central list"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:38
-#, fuzzy
-#| msgid "CHAR textarea columns"
-msgid "Make consistent with central list"
-msgstr "CHAR textarea kolonner"
-
-#: templates/structure/display_structure.phtml:140 view_create.php:181
-#, fuzzy
-#| msgid "Print view"
-msgid "Edit view"
-msgstr "Utskriftsvennlig forhåndsvisning"
-
-#: templates/structure/display_table_stats.phtml:9
-msgid "Space usage"
-msgstr "Plassbruk"
-
-#: templates/structure/display_table_stats.phtml:27
-#: templates/structure/table_header.phtml:74
-msgid "Overhead"
-msgstr "Overheng"
-
-#: templates/structure/display_table_stats.phtml:32
-msgid "Effective"
-msgstr "Effektiv"
-
-#: templates/structure/favorite_anchor.phtml:12
-#, fuzzy
-#| msgid "Add a new server"
-msgid "Add to Favorites"
-msgstr "Legg til en ny tjener"
-
-#: templates/structure/move_columns_dialog.phtml:1
-#: templates/structure/optional_action_links.phtml:21
-#, fuzzy
-#| msgid "Remove column(s)"
-msgid "Move columns"
-msgstr "Fjern kolonne(r)"
-
-#: templates/structure/move_columns_dialog.phtml:2
-msgid "Move the columns by dragging them up and down."
-msgstr ""
-
-#: templates/structure/optional_action_links.phtml:9
-msgid "Propose table structure"
-msgstr "Foreslå tabellstruktur"
-
-#: templates/structure/optional_action_links.phtml:24
-#, fuzzy
-#| msgid "Propose table structure"
-msgid "Improve table structure"
-msgstr "Foreslå tabellstruktur"
-
-#: templates/structure/optional_action_links.phtml:30
-msgid "Track view"
-msgstr "Spor visning"
-
-#: templates/structure/row_stats_table.phtml:3
-#, fuzzy
-#| msgid "Row Statistics"
-msgid "Row statistics"
-msgstr "Radstatistikk"
-
-#: templates/structure/row_stats_table.phtml:9
-msgid "static"
-msgstr "statisk"
-
-#: templates/structure/row_stats_table.phtml:11
-msgid "dynamic"
-msgstr "dynamisk"
-
-#: templates/structure/row_stats_table.phtml:22
-msgid "partitioned"
-msgstr "partisjonert"
-
-#: templates/structure/row_stats_table.phtml:54
-msgid "Row length"
-msgstr "Radlengde"
-
-#: templates/structure/row_stats_table.phtml:66
-msgid "Row size"
-msgstr "Radstørrelse"
-
-#: templates/structure/row_stats_table.phtml:73
-msgid "Next autoindex"
-msgstr ""
-
-#: templates/structure/secondary_tabs.phtml:14
-#, fuzzy
-#| msgid "Relation view"
-msgid "Relation view"
-msgstr "Relasjonsvisning"
-
-#: templates/structure/show_create.phtml:2
-#, fuzzy
-#| msgid "Show SQL queries"
-msgid "Showing create queries"
-msgstr "Vis SQL spørringer"
-
-#: templates/structure/sortable_header.phtml:13
-msgid "Sort"
-msgstr "Sorter"
-
-#: templates/structure/table_header.phtml:42
-#, fuzzy
-#| msgid "May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]"
-msgid ""
-"May be approximate. Click on the number to get the exact count. See "
-"[doc@faq3-11]FAQ 3.11[/doc]."
-msgstr "Kan være unøyaktig. Se [doc@faq3-11]FAQ 3.11[/doc]"
-
-#: templates/structure/table_structure_row.phtml:46
-#, php-format
-msgid "Column %s has been dropped."
-msgstr "Kolonne %s har blitt slettet."
-
-#: templates/structure/tracking_icon.phtml:4
-msgid "Tracking is active."
-msgstr "Overvåkning er aktiv."
-
-#: templates/structure/tracking_icon.phtml:8
-msgid "Tracking is not active."
-msgstr "Overvåkning er ikke aktiv."
-
-#: templates/table/create_table.phtml:15
-msgid "Number of columns"
-msgstr "Antall kolonner"
-
-#: templates/table/options.phtml:8
-msgid "Select columns (at least one):"
-msgstr "Velg kolonner (minst ett):"
-
-#: templates/table/options.phtml:37
-msgid "Add search conditions (body of the \"where\" clause):"
-msgstr "Legg til søkekriterier (innhold i \"where\"-setningen):"
-
-#: templates/table/options.phtml:45
-msgid "Number of rows per page"
-msgstr "Antall poster per side"
-
-#: templates/table/options.phtml:56
-msgid "Display order:"
-msgstr "Visningsrekkefølge:"
-
-#: templates/table/options_zoom.phtml:6
-msgid "Use this column to label each point"
-msgstr "Bruk denne kolonnen til å merke hvert punkt"
-
-#: templates/table/options_zoom.phtml:35
-msgid "Maximum rows to plot"
-msgstr "Maks antall rader som vises"
-
-#: templates/table/replace_preview.phtml:13
-msgid "Find and replace - preview"
-msgstr "Finn og erstatt - forhåndsvisning"
-
-#: templates/table/replace_preview.phtml:18
-msgid "Original string"
-msgstr "Opprinnelig"
-
-#: templates/table/replace_preview.phtml:19
-msgid "Replaced string"
-msgstr "Erstattet"
-
-#: templates/table/replace_preview.phtml:40
-msgid "Replace"
-msgstr "Erstatt"
-
-#: templates/table/rows_zoom.phtml:16
-msgid "Additional search criteria"
-msgstr "Ytterligere søkekriterier"
-
-#: templates/table/search_and_replace.phtml:3
-msgid "Replace with:"
-msgstr "Erstatt med:"
-
-#: templates/table/search_and_replace.phtml:22
-msgid "Use regular expression"
-msgstr "Bruk \"regulert uttrykk\""
-
-#: templates/table/selection_form.phtml:12
-msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
-msgstr ""
-"Utfør en \"spørring ved eksempel\" (jokertegn: \"%\") for to forskjellige "
-"kolonner"
-
-#: templates/table/selection_form.phtml:34
-msgid "Do a \"query by example\" (wildcard: \"%\")"
-msgstr "Utfør en \"spørring ved eksempel\" (jokertegn: \"%\")"
-
-#: templates/table/zoom_result_form.phtml:7
-msgid "Browse/Edit the points"
-msgstr "Bla gjennom/rediger punktene"
-
-#: templates/table/zoom_result_form.phtml:15
-msgid "How to use"
-msgstr "Bruksforklaring"
-
-#: templates/table/zoom_result_form.phtml:23
-msgid "Reset zoom"
-msgstr "Tilbakestill zoom"
-
-#: templates/tbl_chart.phtml:17
+#: templates/table/chart/tbl_chart.phtml:17
 #, fuzzy
 #| msgid "Mar"
 msgctxt "Chart type"
 msgid "Bar"
 msgstr "Mar"
 
-#: templates/tbl_chart.phtml:21
+#: templates/table/chart/tbl_chart.phtml:21
 #, fuzzy
 #| msgid "Column"
 msgctxt "Chart type"
 msgid "Column"
 msgstr "Kolonne"
 
-#: templates/tbl_chart.phtml:25
+#: templates/table/chart/tbl_chart.phtml:25
 msgctxt "Chart type"
 msgid "Line"
 msgstr ""
 
-#: templates/tbl_chart.phtml:29
+#: templates/table/chart/tbl_chart.phtml:29
 #, fuzzy
 #| msgid "Inline"
 msgctxt "Chart type"
 msgid "Spline"
 msgstr "Inline"
 
-#: templates/tbl_chart.phtml:33
+#: templates/table/chart/tbl_chart.phtml:33
 msgctxt "Chart type"
 msgid "Area"
 msgstr ""
 
-#: templates/tbl_chart.phtml:37
+#: templates/table/chart/tbl_chart.phtml:37
 #, fuzzy
 #| msgid "PiB"
 msgctxt "Chart type"
 msgid "Pie"
 msgstr "PiB"
 
-#: templates/tbl_chart.phtml:41
+#: templates/table/chart/tbl_chart.phtml:41
 #, fuzzy
 #| msgid "Time"
 msgctxt "Chart type"
 msgid "Timeline"
 msgstr "Tid"
 
-#: templates/tbl_chart.phtml:45
+#: templates/table/chart/tbl_chart.phtml:45
 msgctxt "Chart type"
 msgid "Scatter"
 msgstr ""
 
-#: templates/tbl_chart.phtml:50
+#: templates/table/chart/tbl_chart.phtml:50
 #, fuzzy
 #| msgid "Packed"
 msgid "Stacked"
 msgstr "Pakket"
 
-#: templates/tbl_chart.phtml:53
+#: templates/table/chart/tbl_chart.phtml:53
 #, fuzzy
 #| msgid "Report title"
 msgid "Chart title"
 msgstr "Rapporttittel"
 
-#: templates/tbl_chart.phtml:57
+#: templates/table/chart/tbl_chart.phtml:57
 msgid "X-Axis:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:72
+#: templates/table/chart/tbl_chart.phtml:72
 #, fuzzy
 #| msgid "SQL queries"
 msgid "Series:"
 msgstr "SQL spørringer"
 
-#: templates/tbl_chart.phtml:102
+#: templates/table/chart/tbl_chart.phtml:102
 msgid "X-Axis label:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:104
+#: templates/table/chart/tbl_chart.phtml:104
 #, fuzzy
 #| msgid "Value"
 msgid "X Values"
 msgstr "Verdi"
 
-#: templates/tbl_chart.phtml:107
+#: templates/table/chart/tbl_chart.phtml:107
 msgid "Y-Axis label:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:115
+#: templates/table/chart/tbl_chart.phtml:115
 msgid "Series names are in a column"
 msgstr ""
 
-#: templates/tbl_chart.phtml:118
+#: templates/table/chart/tbl_chart.phtml:118
 #, fuzzy
 #| msgid "Inside column:"
 msgid "Series column:"
 msgstr "I kolonne:"
 
-#: templates/tbl_chart.phtml:130
+#: templates/table/chart/tbl_chart.phtml:130
 #, fuzzy
 #| msgid "Values for column %s"
 msgid "Value Column:"
 msgstr "Verdier for kolonne %s"
 
-#: templates/tbl_chart.phtml:150
+#: templates/table/chart/tbl_chart.phtml:150
 #, fuzzy
 #| msgid "Save as file"
 msgid "Save chart as image"
 msgstr "Lagre som fil"
 
-#: templates/tbl_relation/common_form.phtml:7
+#: templates/table/gis_visualization/gis_visualization.phtml:3
+#, fuzzy
+#| msgid "Display servers selection"
+msgid "Display GIS Visualization"
+msgstr "Vis tjenerutvalg"
+
+#: templates/table/gis_visualization/gis_visualization.phtml:8
+#, fuzzy
+#| msgid "CHAR textarea columns"
+msgid "Label column"
+msgstr "CHAR textarea kolonner"
+
+#: templates/table/gis_visualization/gis_visualization.phtml:11
+#, fuzzy
+#| msgid "- none -"
+msgid "-- None --"
+msgstr "- ingen -"
+
+#: templates/table/gis_visualization/gis_visualization.phtml:19
+#, fuzzy
+#| msgid "Log file count"
+msgid "Spatial column"
+msgstr "Antall loggfiler"
+
+#: templates/table/index_form.phtml:16
+msgid "Index name:"
+msgstr "Indeksnavn&nbsp;:"
+
+#: templates/table/index_form.phtml:19
+msgid ""
+"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
+msgstr ""
+"\"PRIMARY\" <b>må</b> være navnet til og <b>bare til</b> en primærnøkkel!"
+
+#: templates/table/index_form.phtml:40
+#, fuzzy
+#| msgid "Index cache size"
+msgid "Index choice:"
+msgstr "Indeksmellomlagerstørrelse"
+
+#: templates/table/index_form.phtml:57
+msgid "Key block size:"
+msgstr ""
+
+#: templates/table/index_form.phtml:74
+msgid "Index type:"
+msgstr "Indekstype&nbsp;:"
+
+#: templates/table/index_form.phtml:86
+#, fuzzy
+#| msgid "User:"
+msgid "Parser:"
+msgstr "Bruker:"
+
+#: templates/table/index_form.phtml:102
+#, fuzzy
+#| msgid "Comment"
+msgid "Comment:"
+msgstr "Kommentar"
+
+#: templates/table/index_form.phtml:149 templates/table/index_form.phtml:190
+#, fuzzy
+#| msgid "Drag to reorder"
+msgid "Drag to reorder"
+msgstr "Dra for å omplassere"
+
+#: templates/table/relation/common_form.phtml:7
 msgid "Internal relations"
 msgstr "Interne relasjoner"
 
-#: templates/tbl_relation/common_form.phtml:11
+#: templates/table/relation/common_form.phtml:11
 msgid "Internal relation"
 msgstr "Interne relasjoner"
 
-#: templates/tbl_relation/common_form.phtml:14
+#: templates/table/relation/common_form.phtml:14
 msgid ""
 "An internal relation is not necessary when a corresponding FOREIGN KEY "
 "relation exists."
@@ -16627,63 +16458,255 @@ msgstr ""
 "En intern relasjon er ikke nødvendig når en tilsvarende FOREIGN KEY relasjon "
 "eksisterer."
 
-#: templates/tbl_relation/common_form.phtml:37
+#: templates/table/relation/common_form.phtml:37
 #, fuzzy
 #| msgid "Foreign key constraint"
 msgid "Foreign key constraints"
 msgstr "Fremmednøkkelbegrensning"
 
-#: templates/tbl_relation/common_form.phtml:40
+#: templates/table/relation/common_form.phtml:40
 #, fuzzy
 #| msgid "Action"
 msgid "Actions"
 msgstr "Handling"
 
-#: templates/tbl_relation/common_form.phtml:41
+#: templates/table/relation/common_form.phtml:41
 #, fuzzy
 #| msgid "Constraints for table"
 msgid "Constraint properties"
 msgstr "Begrensninger for tabell"
 
-#: templates/tbl_relation/common_form.phtml:44
+#: templates/table/relation/common_form.phtml:44
 msgid ""
 "Only columns with index will be displayed. You can define an index below."
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:49
+#: templates/table/relation/common_form.phtml:49
 msgid "Foreign key constraint"
 msgstr "Fremmednøkkelbegrensning"
 
-#: templates/tbl_relation/common_form.phtml:81
+#: templates/table/relation/common_form.phtml:81
 #, fuzzy
 #| msgid "Add constraints"
 msgid "+ Add constraint"
 msgstr "Legg til begrensninger"
 
-#: templates/tbl_relation/common_form.phtml:91
+#: templates/table/relation/common_form.phtml:91
 #, fuzzy
 #| msgid "Choose column to display"
 msgid "Choose column to display:"
 msgstr "Velg kolonne for visning"
 
-#: templates/tbl_relation/foreign_key_row.phtml:13
+#: templates/table/relation/foreign_key_row.phtml:13
 #, fuzzy, php-format
 #| msgid "Foreign key constraint"
 msgid "Foreign key constraint %s has been dropped"
 msgstr "Fremmednøkkelbegrensning"
 
-#: templates/tbl_relation/foreign_key_row.phtml:102
+#: templates/table/relation/foreign_key_row.phtml:102
 #, fuzzy
 #| msgid "Constraints for table"
 msgid "Constraint name"
 msgstr "Begrensninger for tabell"
 
-#: templates/tbl_relation/foreign_key_row.phtml:157
+#: templates/table/relation/foreign_key_row.phtml:157
 #, fuzzy
 #| msgid "Add column"
 msgid "+ Add column"
 msgstr "Legg til kolonne(r)"
 
+#: templates/table/search/options.phtml:8
+msgid "Select columns (at least one):"
+msgstr "Velg kolonner (minst ett):"
+
+#: templates/table/search/options.phtml:37
+msgid "Add search conditions (body of the \"where\" clause):"
+msgstr "Legg til søkekriterier (innhold i \"where\"-setningen):"
+
+#: templates/table/search/options.phtml:45
+msgid "Number of rows per page"
+msgstr "Antall poster per side"
+
+#: templates/table/search/options.phtml:56
+msgid "Display order:"
+msgstr "Visningsrekkefølge:"
+
+#: templates/table/search/options_zoom.phtml:6
+msgid "Use this column to label each point"
+msgstr "Bruk denne kolonnen til å merke hvert punkt"
+
+#: templates/table/search/options_zoom.phtml:35
+msgid "Maximum rows to plot"
+msgstr "Maks antall rader som vises"
+
+#: templates/table/search/replace_preview.phtml:13
+msgid "Find and replace - preview"
+msgstr "Finn og erstatt - forhåndsvisning"
+
+#: templates/table/search/replace_preview.phtml:18
+msgid "Original string"
+msgstr "Opprinnelig"
+
+#: templates/table/search/replace_preview.phtml:19
+msgid "Replaced string"
+msgstr "Erstattet"
+
+#: templates/table/search/replace_preview.phtml:40
+msgid "Replace"
+msgstr "Erstatt"
+
+#: templates/table/search/rows_zoom.phtml:16
+msgid "Additional search criteria"
+msgstr "Ytterligere søkekriterier"
+
+#: templates/table/search/search_and_replace.phtml:3
+msgid "Replace with:"
+msgstr "Erstatt med:"
+
+#: templates/table/search/search_and_replace.phtml:22
+msgid "Use regular expression"
+msgstr "Bruk \"regulert uttrykk\""
+
+#: templates/table/search/selection_form.phtml:12
+msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
+msgstr ""
+"Utfør en \"spørring ved eksempel\" (jokertegn: \"%\") for to forskjellige "
+"kolonner"
+
+#: templates/table/search/selection_form.phtml:34
+msgid "Do a \"query by example\" (wildcard: \"%\")"
+msgstr "Utfør en \"spørring ved eksempel\" (jokertegn: \"%\")"
+
+#: templates/table/search/zoom_result_form.phtml:7
+msgid "Browse/Edit the points"
+msgstr "Bla gjennom/rediger punktene"
+
+#: templates/table/search/zoom_result_form.phtml:15
+msgid "How to use"
+msgstr "Bruksforklaring"
+
+#: templates/table/search/zoom_result_form.phtml:23
+msgid "Reset zoom"
+msgstr "Tilbakestill zoom"
+
+#: templates/table/secondary_tabs.phtml:14
+#, fuzzy
+#| msgid "Relation view"
+msgid "Relation view"
+msgstr "Relasjonsvisning"
+
+#: templates/table/structure/actions_in_table_structure.phtml:14
+#, php-format
+msgid "A primary key has been added on %s."
+msgstr "En primærnøkkel har blitt lagt til %s."
+
+#: templates/table/structure/actions_in_table_structure.phtml:34
+#: templates/table/structure/actions_in_table_structure.phtml:54
+#: templates/table/structure/actions_in_table_structure.phtml:79
+#: templates/table/structure/actions_in_table_structure.phtml:101
+#, php-format
+msgid "An index has been added on %s."
+msgstr "En indeks har blitt lagt til %s."
+
+#: templates/table/structure/actions_in_table_structure.phtml:130
+#: templates/table/structure/check_all_table_column.phtml:59
+#, fuzzy
+#| msgid "Remove column(s)"
+msgid "Remove from central columns"
+msgstr "Fjern kolonne(r)"
+
+#: templates/table/structure/actions_in_table_structure.phtml:138
+#: templates/table/structure/check_all_table_column.phtml:55
+#, fuzzy
+#| msgid "CHAR textarea columns"
+msgid "Add to central columns"
+msgstr "CHAR textarea kolonner"
+
+#: templates/table/structure/add_column.phtml:7
+#, php-format
+msgid "Add %s column(s)"
+msgstr "Legg til %s kolonne(r)"
+
+#: templates/table/structure/add_column.phtml:12
+#, fuzzy
+#| msgid "At Beginning of Table"
+msgid "at beginning of table"
+msgstr "Ved begynnelsen av tabellen"
+
+#: templates/table/structure/display_structure.phtml:140 view_create.php:181
+#, fuzzy
+#| msgid "Print view"
+msgid "Edit view"
+msgstr "Utskriftsvennlig forhåndsvisning"
+
+#: templates/table/structure/display_table_stats.phtml:9
+msgid "Space usage"
+msgstr "Plassbruk"
+
+#: templates/table/structure/display_table_stats.phtml:32
+msgid "Effective"
+msgstr "Effektiv"
+
+#: templates/table/structure/move_columns_dialog.phtml:1
+#: templates/table/structure/optional_action_links.phtml:21
+#, fuzzy
+#| msgid "Remove column(s)"
+msgid "Move columns"
+msgstr "Fjern kolonne(r)"
+
+#: templates/table/structure/move_columns_dialog.phtml:2
+msgid "Move the columns by dragging them up and down."
+msgstr ""
+
+#: templates/table/structure/optional_action_links.phtml:9
+msgid "Propose table structure"
+msgstr "Foreslå tabellstruktur"
+
+#: templates/table/structure/optional_action_links.phtml:24
+#, fuzzy
+#| msgid "Propose table structure"
+msgid "Improve table structure"
+msgstr "Foreslå tabellstruktur"
+
+#: templates/table/structure/optional_action_links.phtml:30
+msgid "Track view"
+msgstr "Spor visning"
+
+#: templates/table/structure/row_stats_table.phtml:3
+#, fuzzy
+#| msgid "Row Statistics"
+msgid "Row statistics"
+msgstr "Radstatistikk"
+
+#: templates/table/structure/row_stats_table.phtml:9
+msgid "static"
+msgstr "statisk"
+
+#: templates/table/structure/row_stats_table.phtml:11
+msgid "dynamic"
+msgstr "dynamisk"
+
+#: templates/table/structure/row_stats_table.phtml:22
+msgid "partitioned"
+msgstr "partisjonert"
+
+#: templates/table/structure/row_stats_table.phtml:54
+msgid "Row length"
+msgstr "Radlengde"
+
+#: templates/table/structure/row_stats_table.phtml:66
+msgid "Row size"
+msgstr "Radstørrelse"
+
+#: templates/table/structure/row_stats_table.phtml:73
+msgid "Next autoindex"
+msgstr ""
+
+#: templates/table/structure/table_structure_row.phtml:46
+#, php-format
+msgid "Column %s has been dropped."
+msgstr "Kolonne %s har blitt slettet."
+
 #: themes.php:17 themes.php:22
 msgid "Theme"
 msgstr "Tema"
@@ -17962,6 +17985,11 @@ msgstr ""
 msgid "concurrent_insert is set to 0"
 msgstr "concurrent_insert er satt til 0"
 
+#, fuzzy
+#~| msgid "Read misses"
+#~ msgid "Read as multibytes"
+#~ msgstr "Lesebommer"
+
 #~ msgid "Relational display column"
 #~ msgstr "Relasjonsvisningskolonne"
 
diff --git a/po/ne.po b/po/ne.po
index 6a1df02d46..e11183b82e 100644
--- a/po/ne.po
+++ b/po/ne.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 4.5.0-dev\n"
 "Report-Msgid-Bugs-To: developers@phpmyadmin.net\n"
-"POT-Creation-Date: 2015-08-08 13:53-0400\n"
+"POT-Creation-Date: 2015-08-12 08:10-0400\n"
 "PO-Revision-Date: 2014-08-26 15:28+0200\n"
 "Last-Translator: Nabin Ghimire <nnabinn@hotmail.com>\n"
 "Language-Team: Nepali <https://hosted.weblate.org/projects/phpmyadmin/master/"
@@ -58,7 +58,7 @@ msgid "Table comments:"
 msgstr "टेबलको टिप्पणीहरु:"
 
 #: db_datadict.php:104 libraries/Index.class.php:699
-#: libraries/insert_edit.lib.php:1567
+#: libraries/insert_edit.lib.php:1565
 #: libraries/navigation/Nodes/Node_Column.class.php:30
 #: libraries/plugins/export/ExportHtmlword.class.php:280
 #: libraries/plugins/export/ExportHtmlword.class.php:375
@@ -72,13 +72,14 @@ msgstr "टेबलको टिप्पणीहरु:"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1023
 #: libraries/tracking.lib.php:879 libraries/tracking.lib.php:975
 #: templates/columns_definitions/column_name.phtml:18
-#: templates/index_form.phtml:124 templates/table/table_header.phtml:6
-#: templates/table/zoom_result_form.phtml:33
-#: templates/tbl_relation/common_form.phtml:10
-#: templates/tbl_relation/common_form.phtml:43
-#: templates/tbl_relation/foreign_key_row.phtml:194
-#: templates/tbl_relation/foreign_key_row.phtml:206
-#: templates/tbl_relation/internal_relational_row.phtml:71
+#: templates/table/index_form.phtml:124
+#: templates/table/relation/common_form.phtml:10
+#: templates/table/relation/common_form.phtml:43
+#: templates/table/relation/foreign_key_row.phtml:194
+#: templates/table/relation/foreign_key_row.phtml:206
+#: templates/table/relation/internal_relational_row.phtml:71
+#: templates/table/search/table_header.phtml:6
+#: templates/table/search/zoom_result_form.phtml:33
 msgid "Column"
 msgstr "स्तम्भ"
 
@@ -96,21 +97,21 @@ msgstr "स्तम्भ"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1001
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1024
 #: libraries/rte/rte_list.lib.php:75 libraries/rte/rte_list.lib.php:103
-#: libraries/rte/rte_routines.lib.php:802
-#: libraries/rte/rte_routines.lib.php:831
-#: libraries/rte/rte_routines.lib.php:1493
+#: libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_routines.lib.php:922
+#: libraries/rte/rte_routines.lib.php:1584
 #: libraries/server_privileges.lib.php:2369 libraries/tracking.lib.php:880
 #: libraries/tracking.lib.php:972
 #: templates/columns_definitions/table_fields_definitions.phtml:11
-#: templates/structure/table_header.phtml:48
-#: templates/structure/table_structure_header.phtml:6
-#: templates/table/table_header.phtml:7
+#: templates/database/structure/table_header.phtml:48
+#: templates/table/search/table_header.phtml:7
+#: templates/table/structure/table_structure_header.phtml:6
 msgid "Type"
 msgstr "प्रकार"
 
 #: db_datadict.php:106 libraries/Index.class.php:702
 #: libraries/central_columns.lib.php:708
-#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1576
+#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1574
 #: libraries/plugins/export/ExportHtmlword.class.php:286
 #: libraries/plugins/export/ExportHtmlword.class.php:381
 #: libraries/plugins/export/ExportLatex.class.php:509
@@ -123,8 +124,8 @@ msgstr "प्रकार"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1026
 #: libraries/tracking.lib.php:882 libraries/tracking.lib.php:978
 #: templates/columns_definitions/table_fields_definitions.phtml:39
-#: templates/structure/table_structure_header.phtml:9
-#: templates/table/zoom_result_form.phtml:34
+#: templates/table/search/zoom_result_form.phtml:34
+#: templates/table/structure/table_structure_header.phtml:9
 msgid "Null"
 msgstr "रिक्त"
 
@@ -142,8 +143,8 @@ msgstr "रिक्त"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1027
 #: libraries/replication_gui.lib.php:153 libraries/tracking.lib.php:883
 #: templates/columns_definitions/table_fields_definitions.phtml:25
-#: templates/structure/body_for_table_summary.phtml:55
-#: templates/structure/table_structure_header.phtml:10
+#: templates/database/structure/body_for_table_summary.phtml:55
+#: templates/table/structure/table_structure_header.phtml:10
 msgid "Default"
 msgstr "पूर्वनिर्धारित"
 
@@ -171,19 +172,19 @@ msgid "Comments"
 msgstr "टिप्पणीहरु"
 
 #: db_datadict.php:146
-#: libraries/controllers/StructureController.class.php:1960
-#: libraries/controllers/StructureController.class.php:1965
+#: libraries/controllers/TableStructureController.class.php:951
+#: libraries/controllers/TableStructureController.class.php:956
 #: libraries/tracking.lib.php:922
 #: templates/columns_definitions/column_indexes.phtml:6
-#: templates/structure/check_all_table_column.phtml:22
-#: templates/structure/display_structure.phtml:74
+#: templates/table/structure/check_all_table_column.phtml:22
+#: templates/table/structure/display_structure.phtml:74
 msgid "Primary"
 msgstr "प्राथमिक"
 
 #: db_datadict.php:156 js/messages.php:317 libraries/Index.class.php:567
 #: libraries/Index.class.php:606 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261 libraries/mult_submits.lib.php:403
+#: libraries/config/FormDisplay.tpl.php:272 libraries/mult_submits.lib.php:403
 #: libraries/mult_submits.lib.php:417
 #: libraries/plugins/export/ExportHtmlword.class.php:630
 #: libraries/plugins/export/ExportLatex.class.php:589
@@ -199,20 +200,20 @@ msgstr "प्राथमिक"
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1010 libraries/tracking.lib.php:1015
 #: prefs_manage.php:140 templates/prefs_autoload.phtml:15
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "No"
 msgstr "छैन"
 
 #: db_datadict.php:156 js/messages.php:443 libraries/Index.class.php:568
 #: libraries/Index.class.php:605 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261
-#: libraries/controllers/StructureController.class.php:1344
-#: libraries/controllers/StructureController.class.php:2223
-#: libraries/controllers/StructureController.class.php:2232
-#: libraries/controllers/StructureController.class.php:2237
-#: libraries/controllers/StructureController.class.php:2242
-#: libraries/controllers/StructureController.class.php:2247
+#: libraries/config/FormDisplay.tpl.php:272
+#: libraries/controllers/TableStructureController.class.php:539
+#: libraries/controllers/TableStructureController.class.php:1201
+#: libraries/controllers/TableStructureController.class.php:1210
+#: libraries/controllers/TableStructureController.class.php:1215
+#: libraries/controllers/TableStructureController.class.php:1220
+#: libraries/controllers/TableStructureController.class.php:1225
 #: libraries/mult_submits.inc.php:82 libraries/mult_submits.inc.php:178
 #: libraries/mult_submits.lib.php:339 libraries/mult_submits.lib.php:372
 #: libraries/mult_submits.lib.php:401 libraries/mult_submits.lib.php:415
@@ -221,8 +222,8 @@ msgstr "छैन"
 #: libraries/plugins/export/ExportOdt.class.php:756
 #: libraries/plugins/export/ExportTexytext.class.php:567
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1077
-#: libraries/server_databases.lib.php:464
-#: libraries/server_databases.lib.php:474
+#: libraries/server_databases.lib.php:475
+#: libraries/server_databases.lib.php:485
 #: libraries/server_privileges.lib.php:2546
 #: libraries/server_privileges.lib.php:2727
 #: libraries/server_privileges.lib.php:2748
@@ -232,7 +233,7 @@ msgstr "छैन"
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1008 libraries/tracking.lib.php:1013
 #: prefs_manage.php:138 templates/prefs_autoload.phtml:14
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "Yes"
 msgstr "हो/छ"
 
@@ -242,7 +243,7 @@ msgstr "डेटाबेसको डम्प (स्कीमा) हेर
 
 #: db_export.php:37 db_tracking.php:90 export.php:382
 #: libraries/DBQbe.class.php:326
-#: libraries/controllers/StructureController.class.php:231
+#: libraries/controllers/DatabaseStructureController.class.php:170
 #: libraries/navigation/NavigationTree.class.php:897
 msgid "No tables found in database."
 msgstr "डेटाबेसमा कुनैपनि टेबल भेटिइएन।"
@@ -253,14 +254,14 @@ msgstr "डेटाबेसमा कुनैपनि टेबल भेट
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:26
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:120
-#: templates/structure/show_create.phtml:18
+#: templates/database/structure/show_create.phtml:18
 msgid "Tables"
 msgstr ""
 
 #: db_export.php:52 libraries/Menu.class.php:317 libraries/Menu.class.php:425
-#: libraries/Util.class.php:3333 libraries/Util.class.php:3343
-#: libraries/Util.class.php:3349 libraries/Util.class.php:3629
-#: libraries/Util.class.php:4327 libraries/Util.class.php:4344
+#: libraries/Util.class.php:3339 libraries/Util.class.php:3349
+#: libraries/Util.class.php:3355 libraries/Util.class.php:3635
+#: libraries/Util.class.php:4333 libraries/Util.class.php:4350
 #: libraries/central_columns.lib.php:728 libraries/config.values.php:39
 #: libraries/config.values.php:47 libraries/config.values.php:109
 #: libraries/config.values.php:115 libraries/config/setup.forms.php:323
@@ -274,7 +275,7 @@ msgstr ""
 #: libraries/navigation/Nodes/Node_Table.class.php:283
 #: libraries/server_privileges.lib.php:1141 libraries/tracking.lib.php:874
 #: templates/columns_definitions/table_fields_definitions.phtml:3
-#: templates/designer/table_list.phtml:28
+#: templates/database/designer/table_list.phtml:28
 msgid "Structure"
 msgstr ""
 
@@ -286,7 +287,7 @@ msgstr ""
 #: libraries/config/user_preferences.forms.php:292
 #: libraries/config/user_preferences.forms.php:297
 #: libraries/server_privileges.lib.php:1140
-#: templates/structure/display_table_stats.phtml:12
+#: templates/table/structure/display_table_stats.phtml:12
 msgid "Data"
 msgstr ""
 
@@ -358,10 +359,10 @@ msgstr "पछ्याईएका तालिकाहरू हेर्न
 #: libraries/server_privileges.lib.php:2908
 #: libraries/server_privileges.lib.php:3145
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4346
-#: templates/structure/table_header.phtml:21
-#: templates/tbl_relation/foreign_key_row.phtml:176
-#: templates/tbl_relation/internal_relational_row.phtml:63
+#: libraries/server_privileges.lib.php:4372
+#: templates/database/structure/table_header.phtml:21
+#: templates/table/relation/foreign_key_row.phtml:176
+#: templates/table/relation/internal_relational_row.phtml:63
 msgid "Table"
 msgstr "टेबल"
 
@@ -378,7 +379,7 @@ msgid "Updated"
 msgstr ""
 
 #: db_tracking.php:130 js/messages.php:243 libraries/Menu.class.php:552
-#: libraries/Util.class.php:4314 libraries/config.values.php:104
+#: libraries/Util.class.php:4320 libraries/config.values.php:104
 #: libraries/rte/rte_events.lib.php:393 libraries/rte/rte_list.lib.php:101
 #: libraries/server_status_processes.lib.php:92 libraries/tracking.lib.php:279
 msgid "Status"
@@ -387,14 +388,15 @@ msgstr "स्थिति"
 #: db_tracking.php:131 db_tracking.php:290 libraries/Index.class.php:693
 #: libraries/central_columns.lib.php:687 libraries/rte/rte_list.lib.php:74
 #: libraries/rte/rte_list.lib.php:89 libraries/rte/rte_list.lib.php:102
-#: libraries/server_databases.lib.php:398
+#: libraries/server_databases.lib.php:409
 #: libraries/server_privileges.lib.php:2372
 #: libraries/server_privileges.lib.php:3166
 #: libraries/server_privileges.lib.php:3342
 #: libraries/server_user_groups.lib.php:82
 #: libraries/server_variables.lib.php:189 libraries/tracking.lib.php:280
-#: libraries/tracking.lib.php:793 templates/structure/table_header.phtml:30
-#: templates/structure/table_structure_header.phtml:23
+#: libraries/tracking.lib.php:793
+#: templates/database/structure/table_header.phtml:30
+#: templates/table/structure/table_structure_header.phtml:23
 msgid "Action"
 msgstr "कार्य"
 
@@ -441,7 +443,7 @@ msgid "Untracked tables"
 msgstr "Untracked तालिकाहरू हेर्नुहोस्"
 
 #: db_tracking.php:305 db_tracking.php:336
-#: templates/structure/optional_action_links.phtml:17
+#: templates/table/structure/optional_action_links.phtml:17
 #, fuzzy
 msgid "Track table"
 msgstr "ट्रैक तालिका"
@@ -495,7 +497,7 @@ msgid "Value for the column \"%s\""
 msgstr ""
 
 #: gis_data_editor.php:146
-#: templates/gis_visualization/gis_visualization.phtml:37
+#: templates/table/gis_visualization/gis_visualization.phtml:37
 msgid "Use OpenStreetMaps as Base Layer"
 msgstr ""
 
@@ -575,35 +577,35 @@ msgstr ""
 #: libraries/display_change_password.lib.php:162
 #: libraries/display_export.lib.php:402 libraries/display_export.lib.php:408
 #: libraries/display_import.lib.php:392 libraries/index.lib.php:44
-#: libraries/insert_edit.lib.php:1546 libraries/insert_edit.lib.php:1583
+#: libraries/insert_edit.lib.php:1544 libraries/insert_edit.lib.php:1581
 #: libraries/normalization.lib.php:165 libraries/normalization.lib.php:821
 #: libraries/operations.lib.php:38 libraries/operations.lib.php:108
 #: libraries/operations.lib.php:263 libraries/operations.lib.php:306
 #: libraries/operations.lib.php:801 libraries/operations.lib.php:874
 #: libraries/operations.lib.php:923 libraries/operations.lib.php:1337
 #: libraries/operations.lib.php:1658
-#: libraries/plugins/auth/AuthenticationCookie.class.php:244
+#: libraries/plugins/auth/AuthenticationCookie.class.php:232
 #: libraries/replication_gui.lib.php:122 libraries/replication_gui.lib.php:161
 #: libraries/replication_gui.lib.php:324 libraries/replication_gui.lib.php:461
 #: libraries/replication_gui.lib.php:906 libraries/rte/rte_events.lib.php:509
-#: libraries/rte/rte_routines.lib.php:969
-#: libraries/rte/rte_routines.lib.php:1581
+#: libraries/rte/rte_routines.lib.php:1060
+#: libraries/rte/rte_routines.lib.php:1672
 #: libraries/rte/rte_triggers.lib.php:396 libraries/server_bin_log.lib.php:61
 #: libraries/server_privileges.lib.php:705
 #: libraries/server_privileges.lib.php:2106
 #: libraries/server_privileges.lib.php:2872
 #: libraries/server_privileges.lib.php:3553
-#: libraries/server_privileges.lib.php:4627
+#: libraries/server_privileges.lib.php:4653
 #: libraries/server_user_groups.lib.php:285
 #: libraries/sql_query_form.lib.php:369 libraries/sql_query_form.lib.php:429
 #: libraries/tracking.lib.php:533 libraries/tracking.lib.php:653
 #: prefs_manage.php:277 prefs_manage.php:355
 #: templates/columns_definitions/column_definitions_form.phtml:59
-#: templates/header_location.phtml:17 templates/index_form.phtml:238
+#: templates/database/create_table.phtml:21 templates/header_location.phtml:28
 #: templates/startAndNumberOfRowsPanel.phtml:14
-#: templates/structure/add_column.phtml:25
-#: templates/table/create_table.phtml:21
-#: templates/table/selection_form.phtml:75 view_create.php:275
+#: templates/table/index_form.phtml:238
+#: templates/table/search/selection_form.phtml:75
+#: templates/table/structure/add_column.phtml:25 view_create.php:275
 #: view_operations.php:106
 msgid "Go"
 msgstr ""
@@ -681,7 +683,7 @@ msgstr ""
 msgid "Could not load import plugins, please check your installation!"
 msgstr ""
 
-#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1466
+#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1460
 #, php-format
 msgid "Bookmark %s has been created."
 msgstr ""
@@ -715,11 +717,11 @@ msgstr ""
 msgid "Back"
 msgstr ""
 
-#: index.php:148 libraries/Footer.class.php:70
+#: index.php:149 libraries/Footer.class.php:70
 msgid "phpMyAdmin Demo Server"
 msgstr ""
 
-#: index.php:152
+#: index.php:153
 #, php-format
 msgid ""
 "You are using the demo server. You can do anything here, but please do not "
@@ -727,112 +729,112 @@ msgid ""
 "at %s."
 msgstr ""
 
-#: index.php:162
+#: index.php:163
 msgid "General Settings"
 msgstr ""
 
-#: index.php:190 libraries/display_change_password.lib.php:50
+#: index.php:191 libraries/display_change_password.lib.php:50
 #: libraries/display_change_password.lib.php:53 user_password.php:247
 msgid "Change password"
 msgstr ""
 
-#: index.php:206
+#: index.php:207
 msgid "Server connection collation"
 msgstr ""
 
-#: index.php:228
+#: index.php:229
 msgid "Appearance Settings"
 msgstr ""
 
-#: index.php:258 prefs_manage.php:285
+#: index.php:259 prefs_manage.php:285
 msgid "More settings"
 msgstr ""
 
-#: index.php:279
+#: index.php:280
 msgid "Database server"
 msgstr ""
 
-#: index.php:282 libraries/plugins/auth/AuthenticationCookie.class.php:181
+#: index.php:283 libraries/plugins/auth/AuthenticationCookie.class.php:169
 msgid "Server:"
 msgstr ""
 
-#: index.php:286
+#: index.php:287
 msgid "Server type:"
 msgstr ""
 
-#: index.php:290 libraries/plugins/export/ExportLatex.class.php:212
+#: index.php:291 libraries/plugins/export/ExportLatex.class.php:212
 #: libraries/plugins/export/ExportSql.class.php:687
 #: libraries/plugins/export/ExportXml.class.php:189
 msgid "Server version:"
 msgstr ""
 
-#: index.php:296
+#: index.php:297
 msgid "Protocol version:"
 msgstr ""
 
-#: index.php:300
+#: index.php:301
 msgid "User:"
 msgstr ""
 
-#: index.php:305
+#: index.php:306
 msgid "Server charset:"
 msgstr ""
 
-#: index.php:320
+#: index.php:321
 msgid "Web server"
 msgstr ""
 
-#: index.php:331
+#: index.php:332
 msgid "Database client version:"
 msgstr ""
 
-#: index.php:335
+#: index.php:336
 msgid "PHP extension:"
 msgstr ""
 
-#: index.php:349
+#: index.php:350
 #, fuzzy
 #| msgid "Last version"
 msgid "PHP version:"
 msgstr "पछिल्लो संस्करण"
 
-#: index.php:360
+#: index.php:361
 msgid "Show PHP information"
 msgstr ""
 
-#: index.php:383
+#: index.php:384
 msgid "Version information:"
 msgstr ""
 
-#: index.php:392 libraries/Util.class.php:432 libraries/Util.class.php:495
-#: libraries/config/FormDisplay.tpl.php:151
+#: index.php:393 libraries/Util.class.php:432 libraries/Util.class.php:495
+#: libraries/config/FormDisplay.tpl.php:162
 #: libraries/display_export.lib.php:577 libraries/engines/pbxt.lib.php:162
 #: libraries/navigation/NavigationHeader.class.php:196
 #: libraries/server_variables.lib.php:160
 msgid "Documentation"
 msgstr ""
 
-#: index.php:399
+#: index.php:400
 msgid "Wiki"
 msgstr ""
 
-#: index.php:408
+#: index.php:409
 msgid "Official Homepage"
 msgstr ""
 
-#: index.php:415
+#: index.php:416
 msgid "Contribute"
 msgstr ""
 
-#: index.php:422
+#: index.php:423
 msgid "Get support"
 msgstr ""
 
-#: index.php:429
+#: index.php:430
 msgid "List of changes"
 msgstr ""
 
-#: index.php:451
+#: index.php:452
 msgid ""
 "You are connected as 'root' with no password, which corresponds to the "
 "default MySQL privileged account. Your MySQL server is running with this "
@@ -840,21 +842,21 @@ msgid ""
 "by setting a password for user 'root'."
 msgstr ""
 
-#: index.php:468
+#: index.php:469
 msgid ""
 "You have enabled mbstring.func_overload in your PHP configuration. This "
 "option is incompatible with phpMyAdmin and might cause some data to be "
 "corrupted!"
 msgstr ""
 
-#: index.php:483
+#: index.php:484
 msgid ""
 "The mbstring PHP extension was not found and you seem to be using a "
 "multibyte charset. Without the mbstring extension phpMyAdmin is unable to "
 "split strings correctly and it may result in unexpected results."
 msgstr ""
 
-#: index.php:500
+#: index.php:501
 msgid ""
 "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini."
 "session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower than "
@@ -862,17 +864,17 @@ msgid ""
 "expire sooner than configured in phpMyAdmin."
 msgstr ""
 
-#: index.php:519
+#: index.php:520
 msgid ""
 "Login cookie store is lower than cookie validity configured in phpMyAdmin, "
 "because of this, your login will expire sooner than configured in phpMyAdmin."
 msgstr ""
 
-#: index.php:535
+#: index.php:536
 msgid "The configuration file now needs a secret passphrase (blowfish_secret)."
 msgstr ""
 
-#: index.php:548
+#: index.php:549
 msgid ""
 "Directory [code]config[/code], which is used by the setup script, still "
 "exists in your phpMyAdmin directory. It is strongly recommended to remove it "
@@ -880,26 +882,26 @@ msgid ""
 "may be compromised by unauthorized people downloading your configuration."
 msgstr ""
 
-#: index.php:564
+#: index.php:565
 #, php-format
 msgid ""
 "The phpMyAdmin configuration storage is not completely configured, some "
 "extended features have been deactivated. %sFind out why%s. "
 msgstr ""
 
-#: index.php:571
+#: index.php:572
 msgid ""
 "Or alternately go to 'Operations' tab of any database to set it up there."
 msgstr ""
 
-#: index.php:620
+#: index.php:621
 #, php-format
 msgid ""
 "Your PHP MySQL library version %s differs from your MySQL server version %s. "
 "This may cause unpredictable behavior."
 msgstr ""
 
-#: index.php:648
+#: index.php:649
 #, php-format
 msgid ""
 "Server running with Suhosin. Please refer to %sdocumentation%s for possible "
@@ -1050,8 +1052,8 @@ msgstr ""
 msgid "Save & Close"
 msgstr ""
 
-#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:404
-#: libraries/insert_edit.lib.php:1550 prefs_manage.php:361
+#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:415
+#: libraries/insert_edit.lib.php:1548 prefs_manage.php:361
 #: prefs_manage.php:372
 msgid "Reset"
 msgstr ""
@@ -1084,7 +1086,7 @@ msgstr ""
 msgid "Edit Index"
 msgstr ""
 
-#: js/messages.php:99 templates/index_form.phtml:232
+#: js/messages.php:99 templates/table/index_form.phtml:232
 #, php-format
 msgid "Add %s column(s) to index"
 msgstr ""
@@ -1105,13 +1107,14 @@ msgstr ""
 msgid "Please select column(s) for the index."
 msgstr ""
 
-#: js/messages.php:106 templates/structure/add_column.phtml:1
+#: js/messages.php:106 templates/table/structure/add_column.phtml:1
 msgid "You have to add at least one column."
 msgstr ""
 
-#: js/messages.php:109 libraries/insert_edit.lib.php:1548
+#: js/messages.php:109 libraries/insert_edit.lib.php:1546
 #: templates/columns_definitions/column_definitions_form.phtml:162
-#: templates/index_form.phtml:237 templates/tbl_relation/common_form.phtml:106
+#: templates/table/index_form.phtml:237
+#: templates/table/relation/common_form.phtml:106
 msgid "Preview SQL"
 msgstr ""
 
@@ -1128,7 +1131,7 @@ msgid "SQL query:"
 msgstr ""
 
 #. l10n: Default label for the y-Axis of Charts
-#: js/messages.php:118 templates/tbl_chart.phtml:109
+#: js/messages.php:118 templates/table/chart/tbl_chart.phtml:109
 msgid "Y Values"
 msgstr ""
 
@@ -1279,7 +1282,7 @@ msgstr ""
 msgid "Bytes received"
 msgstr ""
 
-#: js/messages.php:169 libraries/server_status.lib.php:226
+#: js/messages.php:169 libraries/server_status.lib.php:235
 msgid "Connections"
 msgstr ""
 
@@ -1336,12 +1339,12 @@ msgstr ""
 msgid "Questions"
 msgstr ""
 
-#: js/messages.php:184 libraries/server_status.lib.php:134
+#: js/messages.php:184 libraries/server_status.lib.php:143
 msgid "Traffic"
 msgstr ""
 
 #: js/messages.php:185 libraries/Menu.class.php:586
-#: libraries/Util.class.php:4318 libraries/server_status_monitor.lib.php:257
+#: libraries/Util.class.php:4324 libraries/server_status_monitor.lib.php:257
 msgid "Settings"
 msgstr ""
 
@@ -1361,8 +1364,9 @@ msgstr ""
 #: libraries/server_status_monitor.lib.php:236
 #: libraries/server_status_processes.lib.php:308
 #: templates/columns_definitions/transformation.phtml:4
-#: templates/designer/options_panel.phtml:178
-#: templates/table/options_zoom.phtml:12 templates/table/rows_zoom.phtml:26
+#: templates/database/designer/options_panel.phtml:178
+#: templates/table/search/options_zoom.phtml:12
+#: templates/table/search/rows_zoom.phtml:26
 msgid "None"
 msgstr ""
 
@@ -1630,8 +1634,8 @@ msgstr ""
 
 #: js/messages.php:270 libraries/Menu.class.php:352
 #: libraries/Menu.class.php:455 libraries/Menu.class.php:582
-#: libraries/Util.class.php:4317 libraries/Util.class.php:4332
-#: libraries/Util.class.php:4349 libraries/config/messages.inc.php:258
+#: libraries/Util.class.php:4323 libraries/Util.class.php:4338
+#: libraries/Util.class.php:4355 libraries/config/messages.inc.php:258
 #: libraries/display_import.lib.php:105
 #: libraries/server_status_monitor.lib.php:318 prefs_manage.php:238
 #: setup/frames/menu.inc.php:26
@@ -1691,13 +1695,13 @@ msgid "Formatting SQL..."
 msgstr ""
 
 #: js/messages.php:293 libraries/server_variables.lib.php:157
-#: templates/designer/aggregate_query_panel.phtml:63
-#: templates/designer/delete_relation_panel.phtml:28
-#: templates/designer/having_query_panel.phtml:117
-#: templates/designer/new_relation_panel.phtml:88
-#: templates/designer/options_panel.phtml:253
-#: templates/designer/rename_to_panel.phtml:45
-#: templates/designer/where_query_panel.phtml:83
+#: templates/database/designer/aggregate_query_panel.phtml:63
+#: templates/database/designer/delete_relation_panel.phtml:28
+#: templates/database/designer/having_query_panel.phtml:117
+#: templates/database/designer/new_relation_panel.phtml:88
+#: templates/database/designer/options_panel.phtml:253
+#: templates/database/designer/rename_to_panel.phtml:45
+#: templates/database/designer/where_query_panel.phtml:83
 msgid "Cancel"
 msgstr ""
 
@@ -1705,7 +1709,7 @@ msgstr ""
 msgid "Page-related settings"
 msgstr ""
 
-#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:402
+#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:413
 msgid "Apply"
 msgstr ""
 
@@ -1740,8 +1744,8 @@ msgstr ""
 msgid "Error text: %s"
 msgstr ""
 
-#: js/messages.php:307 libraries/db_common.inc.php:68
-#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:450
+#: js/messages.php:307 libraries/db_common.inc.php:69
+#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:461
 msgid "No databases selected."
 msgstr ""
 
@@ -1753,12 +1757,13 @@ msgstr ""
 msgid "Adding Primary Key"
 msgstr ""
 
-#: js/messages.php:310 templates/designer/aggregate_query_panel.phtml:59
-#: templates/designer/having_query_panel.phtml:113
-#: templates/designer/new_relation_panel.phtml:87
-#: templates/designer/options_panel.phtml:252
-#: templates/designer/rename_to_panel.phtml:41
-#: templates/designer/where_query_panel.phtml:82
+#: js/messages.php:310
+#: templates/database/designer/aggregate_query_panel.phtml:59
+#: templates/database/designer/having_query_panel.phtml:113
+#: templates/database/designer/new_relation_panel.phtml:87
+#: templates/database/designer/options_panel.phtml:252
+#: templates/database/designer/rename_to_panel.phtml:41
+#: templates/database/designer/where_query_panel.phtml:82
 msgid "OK"
 msgstr ""
 
@@ -1778,7 +1783,7 @@ msgstr ""
 msgid "Changing Charset"
 msgstr ""
 
-#: js/messages.php:320 libraries/Util.class.php:3217
+#: js/messages.php:320 libraries/Util.class.php:3223
 msgid "Enable foreign key checks"
 msgstr ""
 
@@ -1813,20 +1818,21 @@ msgstr ""
 #: js/messages.php:334 libraries/DisplayResults.class.php:4834
 #: libraries/DisplayResults.class.php:5092 libraries/Menu.class.php:344
 #: libraries/Menu.class.php:446 libraries/Menu.class.php:578
-#: libraries/Util.class.php:3636 libraries/Util.class.php:3637
-#: libraries/Util.class.php:4316 libraries/Util.class.php:4331
-#: libraries/Util.class.php:4348 libraries/config/messages.inc.php:252
+#: libraries/Util.class.php:3642 libraries/Util.class.php:3643
+#: libraries/Util.class.php:4322 libraries/Util.class.php:4337
+#: libraries/Util.class.php:4354 libraries/config/messages.inc.php:252
 #: libraries/display_export.lib.php:173 libraries/rte/rte_list.lib.php:146
 #: libraries/server_privileges.lib.php:2211
 #: libraries/server_privileges.lib.php:2290
 #: libraries/server_privileges.lib.php:2632
 #: libraries/server_privileges.lib.php:3356
 #: libraries/server_status_monitor.lib.php:322 prefs_manage.php:303
-#: setup/frames/menu.inc.php:27 templates/structure/check_all_tables.phtml:11
+#: setup/frames/menu.inc.php:27
+#: templates/database/structure/check_all_tables.phtml:11
 msgid "Export"
 msgstr ""
 
-#: js/messages.php:337 libraries/rte/rte_routines.lib.php:652
+#: js/messages.php:337 libraries/rte/rte_routines.lib.php:743
 msgid "ENUM/SET editor"
 msgstr ""
 
@@ -1865,7 +1871,7 @@ msgstr ""
 #: libraries/Console.class.php:214 libraries/DisplayResults.class.php:3474
 #: libraries/DisplayResults.class.php:4818 libraries/Index.class.php:723
 #: libraries/Util.class.php:706 libraries/Util.class.php:1202
-#: libraries/Util.class.php:3634 libraries/Util.class.php:3635
+#: libraries/Util.class.php:3640 libraries/Util.class.php:3641
 #: libraries/central_columns.lib.php:851
 #: libraries/central_columns.lib.php:1193
 #: libraries/config/messages.inc.php:892
@@ -1883,7 +1889,7 @@ msgstr ""
 #: libraries/server_user_groups.lib.php:129
 #: libraries/sql_query_form.lib.php:416 libraries/tracking.lib.php:477
 #: setup/frames/index.inc.php:183 setup/frames/index.inc.php:291
-#: templates/designer/delete_relation_panel.phtml:27
+#: templates/database/designer/delete_relation_panel.phtml:27
 msgid "Delete"
 msgstr ""
 
@@ -2044,11 +2050,11 @@ msgid "No dependencies selected!"
 msgstr ""
 
 #: js/messages.php:394 libraries/central_columns.lib.php:1214
-#: libraries/insert_edit.lib.php:1458 libraries/server_variables.lib.php:155
+#: libraries/insert_edit.lib.php:1456 libraries/server_variables.lib.php:155
 #: setup/frames/config.inc.php:42 setup/frames/index.inc.php:279
 #: templates/columns_definitions/column_definitions_form.phtml:165
-#: templates/gis_visualization/gis_visualization.phtml:48
-#: templates/tbl_relation/common_form.phtml:107
+#: templates/table/gis_visualization/gis_visualization.phtml:48
+#: templates/table/relation/common_form.phtml:107
 msgid "Save"
 msgstr ""
 
@@ -2125,8 +2131,8 @@ msgid "Data point content"
 msgstr ""
 
 #: js/messages.php:430 js/messages.php:562 js/messages.php:579
-#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2573
-#: templates/index_form.phtml:154 templates/index_form.phtml:194
+#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2571
+#: templates/table/index_form.phtml:154 templates/table/index_form.phtml:194
 msgid "Ignore"
 msgstr ""
 
@@ -2185,8 +2191,8 @@ msgstr ""
 msgid "Please select the primary key or a unique key!"
 msgstr ""
 
-#: js/messages.php:457 templates/designer/side_menu.phtml:91
-#: templates/designer/side_menu.phtml:94
+#: js/messages.php:457 templates/database/designer/side_menu.phtml:91
+#: templates/database/designer/side_menu.phtml:94
 msgid "Choose column to display"
 msgstr ""
 
@@ -2200,18 +2206,18 @@ msgstr ""
 msgid "Page name"
 msgstr ""
 
-#: js/messages.php:463 templates/designer/side_menu.phtml:56
-#: templates/designer/side_menu.phtml:59
+#: js/messages.php:463 templates/database/designer/side_menu.phtml:56
+#: templates/database/designer/side_menu.phtml:59
 msgid "Save page"
 msgstr ""
 
-#: js/messages.php:464 templates/designer/side_menu.phtml:63
-#: templates/designer/side_menu.phtml:66
+#: js/messages.php:464 templates/database/designer/side_menu.phtml:63
+#: templates/database/designer/side_menu.phtml:66
 msgid "Save page as"
 msgstr ""
 
-#: js/messages.php:465 templates/designer/side_menu.phtml:49
-#: templates/designer/side_menu.phtml:52
+#: js/messages.php:465 templates/database/designer/side_menu.phtml:49
+#: templates/database/designer/side_menu.phtml:52
 msgid "Open page"
 msgstr ""
 
@@ -2219,7 +2225,7 @@ msgstr ""
 msgid "Delete page"
 msgstr ""
 
-#: js/messages.php:467 templates/designer/side_menu.phtml:10
+#: js/messages.php:467 templates/database/designer/side_menu.phtml:10
 msgid "Untitled"
 msgstr ""
 
@@ -2330,7 +2336,7 @@ msgstr ""
 msgid "cancel"
 msgstr ""
 
-#: js/messages.php:499 libraries/server_status.lib.php:271
+#: js/messages.php:499 libraries/server_status.lib.php:280
 msgid "Aborted"
 msgstr ""
 
@@ -2886,7 +2892,7 @@ msgstr ""
 
 #: js/messages.php:793 libraries/Message.class.php:199
 #: libraries/Util.class.php:654 libraries/core.lib.php:245
-#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1172
+#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1170
 #: tbl_operations.php:229 view_operations.php:63
 msgid "Error"
 msgstr ""
@@ -2945,8 +2951,8 @@ msgstr ""
 msgid "per minute"
 msgstr ""
 
-#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:143
-#: libraries/server_status.lib.php:228
+#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:152
+#: libraries/server_status.lib.php:237
 #: libraries/server_status_queries.lib.php:98
 msgid "per hour"
 msgstr ""
@@ -2964,7 +2970,7 @@ msgstr ""
 msgid "Wrong permissions on configuration file, should not be world writable!"
 msgstr ""
 
-#: libraries/Config.class.php:1799
+#: libraries/Config.class.php:1801
 msgid "Font size"
 msgstr ""
 
@@ -2992,10 +2998,10 @@ msgstr ""
 #: libraries/server_privileges.lib.php:2890
 #: libraries/server_privileges.lib.php:3144
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4332
+#: libraries/server_privileges.lib.php:4358
 #: libraries/server_status_processes.lib.php:80
-#: templates/tbl_relation/foreign_key_row.phtml:165
-#: templates/tbl_relation/internal_relational_row.phtml:55
+#: templates/table/relation/foreign_key_row.phtml:165
+#: templates/table/relation/internal_relational_row.phtml:55
 msgid "Database"
 msgstr "तथ्याङ्क भण्डार"
 
@@ -3088,11 +3094,11 @@ msgstr ""
 #: libraries/plugins/import/ImportMediawiki.class.php:60
 #: libraries/plugins/import/ImportOds.class.php:59
 #: libraries/plugins/import/ImportShp.class.php:57
-#: libraries/plugins/import/ImportSql.class.php:148
+#: libraries/plugins/import/ImportSql.class.php:51
 #: libraries/plugins/import/ImportXml.class.php:58
-#: libraries/rte/rte_routines.lib.php:833 templates/index_form.phtml:49
-#: templates/structure/row_stats_table.phtml:20
-#: templates/table/options.phtml:2
+#: libraries/rte/rte_routines.lib.php:924 templates/table/index_form.phtml:49
+#: templates/table/search/options.phtml:2
+#: templates/table/structure/row_stats_table.phtml:20
 msgid "Options"
 msgstr ""
 
@@ -3125,7 +3131,8 @@ msgstr ""
 msgid "Order:"
 msgstr ""
 
-#: libraries/Console.class.php:289 templates/table/replace_preview.phtml:17
+#: libraries/Console.class.php:289
+#: templates/table/search/replace_preview.phtml:17
 msgid "Count"
 msgstr ""
 
@@ -3222,9 +3229,9 @@ msgstr ""
 #: libraries/operations.lib.php:794 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:191
-#: templates/structure/sortable_header.phtml:21
-#: templates/structure/sortable_header.phtml:38
-#: templates/table/options.phtml:68
+#: templates/database/structure/sortable_header.phtml:21
+#: templates/database/structure/sortable_header.phtml:38
+#: templates/table/search/options.phtml:68
 msgid "Ascending"
 msgstr ""
 
@@ -3234,13 +3241,14 @@ msgstr ""
 #: libraries/operations.lib.php:797 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:188
-#: templates/structure/sortable_header.phtml:26
-#: templates/structure/sortable_header.phtml:43
-#: templates/table/options.phtml:69
+#: templates/database/structure/sortable_header.phtml:26
+#: templates/database/structure/sortable_header.phtml:43
+#: templates/table/search/options.phtml:69
 msgid "Descending"
 msgstr ""
 
-#: libraries/DBQbe.class.php:467 templates/table/search_and_replace.phtml:6
+#: libraries/DBQbe.class.php:467
+#: templates/table/search/search_and_replace.phtml:6
 msgid "Column:"
 msgstr ""
 
@@ -3395,12 +3403,12 @@ msgstr[0] ""
 msgstr[1] ""
 
 #: libraries/DbSearch.class.php:354 libraries/Menu.class.php:311
-#: libraries/Util.class.php:3337 libraries/Util.class.php:3347
-#: libraries/Util.class.php:3623 libraries/Util.class.php:3624
-#: libraries/Util.class.php:4343 libraries/config.values.php:43
+#: libraries/Util.class.php:3343 libraries/Util.class.php:3353
+#: libraries/Util.class.php:3629 libraries/Util.class.php:3630
+#: libraries/Util.class.php:4349 libraries/config.values.php:43
 #: libraries/config.values.php:51 libraries/config.values.php:119
 #: libraries/navigation/Nodes/Node_Table.class.php:295
-#: templates/structure/check_all_table_column.phtml:5
+#: templates/table/structure/check_all_table_column.phtml:5
 msgid "Browse"
 msgstr ""
 
@@ -3417,7 +3425,8 @@ msgstr ""
 msgid "Words or values to search for (wildcard: \"%\"):"
 msgstr ""
 
-#: libraries/DbSearch.class.php:401 templates/table/search_and_replace.phtml:1
+#: libraries/DbSearch.class.php:401
+#: templates/table/search/search_and_replace.phtml:1
 msgid "Find:"
 msgstr ""
 
@@ -3461,28 +3470,28 @@ msgstr ""
 msgid "Search this table"
 msgstr ""
 
-#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2532
-#: libraries/Util.class.php:2535
+#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2538
+#: libraries/Util.class.php:2541
 msgctxt "First page"
 msgid "Begin"
 msgstr ""
 
-#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2533
-#: libraries/Util.class.php:2536 libraries/server_bin_log.lib.php:170
+#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2539
+#: libraries/Util.class.php:2542 libraries/server_bin_log.lib.php:170
 #: libraries/server_bin_log.lib.php:172
 msgctxt "Previous page"
 msgid "Previous"
 msgstr ""
 
-#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2564
-#: libraries/Util.class.php:2574 libraries/server_bin_log.lib.php:204
+#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2570
+#: libraries/Util.class.php:2580 libraries/server_bin_log.lib.php:204
 #: libraries/server_bin_log.lib.php:206
 msgctxt "Next page"
 msgid "Next"
 msgstr ""
 
-#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2565
-#: libraries/Util.class.php:2575
+#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2571
+#: libraries/Util.class.php:2581
 msgctxt "Last page"
 msgid "End"
 msgstr ""
@@ -3555,15 +3564,15 @@ msgid "May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]."
 msgstr ""
 
 #: libraries/DisplayResults.class.php:4332 libraries/Message.class.php:180
-#: libraries/controllers/TableRelationController.class.php:258
+#: libraries/controllers/TableRelationController.class.php:259
 #: libraries/controllers/TableSearchController.class.php:655
-#: libraries/rte/rte_routines.lib.php:1332 libraries/sql_query_form.lib.php:89
+#: libraries/rte/rte_routines.lib.php:1423 libraries/sql_query_form.lib.php:89
 #: tbl_operations.php:227 tbl_row_action.php:138 view_operations.php:62
 msgid "Your SQL query has been executed successfully."
 msgstr ""
 
 #: libraries/DisplayResults.class.php:4660
-#: libraries/controllers/StructureController.class.php:629
+#: libraries/controllers/DatabaseStructureController.class.php:564
 #, php-format
 msgid ""
 "This view has at least this number of rows. Please refer to %sdocumentation"
@@ -3585,33 +3594,33 @@ msgstr ""
 msgid "%d total"
 msgstr ""
 
-#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1318
+#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1312
 #, php-format
 msgid "Query took %01.4f seconds."
 msgstr ""
 
 #: libraries/DisplayResults.class.php:4807
-#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4767
-#: libraries/Util.class.php:4773 libraries/mult_submits.inc.php:50
-#: templates/structure/check_all_tables.phtml:2
-#: templates/structure/check_all_tables.phtml:9
+#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4773
+#: libraries/Util.class.php:4779 libraries/mult_submits.inc.php:50
+#: templates/database/structure/check_all_tables.phtml:2
+#: templates/database/structure/check_all_tables.phtml:9
 msgid "With selected:"
 msgstr ""
 
 #: libraries/DisplayResults.class.php:4811
-#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4769
-#: libraries/Util.class.php:4770 libraries/server_privileges.lib.php:1174
+#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4775
+#: libraries/Util.class.php:4776 libraries/server_privileges.lib.php:1174
 #: libraries/server_privileges.lib.php:1175
 #: libraries/server_privileges.lib.php:1387
 #: libraries/server_user_groups.lib.php:231
-#: templates/structure/check_all_tables.phtml:3
-#: templates/structure/check_all_tables.phtml:4
+#: templates/database/structure/check_all_tables.phtml:3
+#: templates/database/structure/check_all_tables.phtml:4
 msgid "Check All"
 msgstr ""
 
 #: libraries/DisplayResults.class.php:4985 libraries/Header.class.php:383
-#: templates/structure/optional_action_links.phtml:1
-#: templates/structure/print_view_data_dictionary_link.phtml:3
+#: templates/database/structure/print_view_data_dictionary_link.phtml:3
+#: templates/table/structure/optional_action_links.phtml:1
 msgid "Print view"
 msgstr ""
 
@@ -3619,7 +3628,8 @@ msgstr ""
 msgid "Query results operations"
 msgstr ""
 
-#: libraries/DisplayResults.class.php:5105 templates/tbl_chart.phtml:12
+#: libraries/DisplayResults.class.php:5105
+#: templates/table/chart/tbl_chart.phtml:12
 msgid "Display chart"
 msgstr ""
 
@@ -3708,7 +3718,7 @@ msgid "Click on the bar to scroll to top of page"
 msgstr ""
 
 #: libraries/Header.class.php:749
-#: libraries/plugins/auth/AuthenticationCookie.class.php:152
+#: libraries/plugins/auth/AuthenticationCookie.class.php:140
 msgid "Javascript must be enabled past this point!"
 msgstr ""
 
@@ -3730,11 +3740,11 @@ msgid "Keyname"
 msgstr ""
 
 #: libraries/Index.class.php:697
-#: libraries/controllers/StructureController.class.php:1962
-#: libraries/controllers/StructureController.class.php:1967
+#: libraries/controllers/TableStructureController.class.php:953
+#: libraries/controllers/TableStructureController.class.php:958
 #: libraries/tracking.lib.php:973
 #: templates/columns_definitions/column_indexes.phtml:11
-#: templates/structure/check_all_table_column.phtml:26
+#: templates/table/structure/check_all_table_column.phtml:26
 msgid "Unique"
 msgstr ""
 
@@ -3753,16 +3763,17 @@ msgstr ""
 #: libraries/server_collations.lib.php:35 libraries/tracking.lib.php:881
 #: libraries/tracking.lib.php:977
 #: templates/columns_definitions/table_fields_definitions.phtml:33
-#: templates/structure/row_stats_table.phtml:31
-#: templates/structure/table_header.phtml:55
-#: templates/structure/table_structure_header.phtml:7
-#: templates/table/table_header.phtml:8
+#: templates/database/structure/table_header.phtml:55
+#: templates/table/search/table_header.phtml:8
+#: templates/table/structure/row_stats_table.phtml:31
+#: templates/table/structure/table_structure_header.phtml:7
 msgid "Collation"
 msgstr ""
 
 #: libraries/Index.class.php:703 libraries/rte/rte_events.lib.php:496
-#: libraries/rte/rte_routines.lib.php:956 libraries/tracking.lib.php:885
-#: libraries/tracking.lib.php:979 templates/structure/table_header.phtml:84
+#: libraries/rte/rte_routines.lib.php:1047 libraries/tracking.lib.php:885
+#: libraries/tracking.lib.php:979
+#: templates/database/structure/table_header.phtml:84
 msgid "Comment"
 msgstr ""
 
@@ -3775,15 +3786,15 @@ msgstr ""
 msgid "Index %s has been dropped."
 msgstr ""
 
-#: libraries/Index.class.php:757 libraries/Util.class.php:3630
-#: libraries/Util.class.php:3631
-#: libraries/controllers/StructureController.class.php:1958
-#: libraries/controllers/StructureController.class.php:1959
+#: libraries/Index.class.php:757 libraries/Util.class.php:3636
+#: libraries/Util.class.php:3637
+#: libraries/controllers/TableStructureController.class.php:949
+#: libraries/controllers/TableStructureController.class.php:950
 #: libraries/operations.lib.php:1607 libraries/rte/rte_list.lib.php:150
 #: libraries/server_databases.lib.php:146
-#: templates/structure/check_all_table_column.phtml:15
-#: templates/structure/check_all_tables.phtml:16
-#: templates/tbl_relation/foreign_key_row.phtml:93
+#: templates/database/structure/check_all_tables.phtml:16
+#: templates/table/relation/foreign_key_row.phtml:93
+#: templates/table/structure/check_all_table_column.phtml:15
 msgid "Drop"
 msgstr "हटाउ"
 
@@ -3812,16 +3823,16 @@ msgstr ""
 #: libraries/Menu.class.php:248
 #: libraries/navigation/Nodes/Node_View.class.php:32
 #: libraries/tbl_info.inc.php:63
-#: templates/structure/structure_table_row.phtml:97
-#: templates/structure/structure_table_row.phtml:159
+#: templates/database/structure/structure_table_row.phtml:97
+#: templates/database/structure/structure_table_row.phtml:159
 msgid "View"
 msgstr ""
 
 #: libraries/Menu.class.php:325 libraries/Menu.class.php:429
-#: libraries/Menu.class.php:548 libraries/Util.class.php:3334
-#: libraries/Util.class.php:3344 libraries/Util.class.php:3350
-#: libraries/Util.class.php:4313 libraries/Util.class.php:4328
-#: libraries/Util.class.php:4345 libraries/config.values.php:40
+#: libraries/Menu.class.php:548 libraries/Util.class.php:3340
+#: libraries/Util.class.php:3350 libraries/Util.class.php:3356
+#: libraries/Util.class.php:4319 libraries/Util.class.php:4334
+#: libraries/Util.class.php:4351 libraries/config.values.php:40
 #: libraries/config.values.php:48 libraries/config.values.php:110
 #: libraries/config.values.php:116 libraries/config/messages.inc.php:321
 #: libraries/navigation/Nodes/Node_Table.class.php:292
@@ -3829,19 +3840,19 @@ msgid "SQL"
 msgstr ""
 
 #: libraries/Menu.class.php:328 libraries/Menu.class.php:432
-#: libraries/Util.class.php:3335 libraries/Util.class.php:3345
-#: libraries/Util.class.php:3351 libraries/Util.class.php:3625
-#: libraries/Util.class.php:3626 libraries/Util.class.php:4329
-#: libraries/Util.class.php:4346 libraries/config.values.php:41
+#: libraries/Util.class.php:3341 libraries/Util.class.php:3351
+#: libraries/Util.class.php:3357 libraries/Util.class.php:3631
+#: libraries/Util.class.php:3632 libraries/Util.class.php:4335
+#: libraries/Util.class.php:4352 libraries/config.values.php:41
 #: libraries/config.values.php:49 libraries/config.values.php:111
 #: libraries/config.values.php:117
 #: libraries/navigation/Nodes/Node_Table.class.php:286
 msgid "Search"
 msgstr ""
 
-#: libraries/Menu.class.php:338 libraries/Util.class.php:3336
-#: libraries/Util.class.php:3346 libraries/Util.class.php:3627
-#: libraries/Util.class.php:3628 libraries/Util.class.php:4347
+#: libraries/Menu.class.php:338 libraries/Util.class.php:3342
+#: libraries/Util.class.php:3352 libraries/Util.class.php:3633
+#: libraries/Util.class.php:3634 libraries/Util.class.php:4353
 #: libraries/config.values.php:42 libraries/config.values.php:50
 #: libraries/config.values.php:118
 #: libraries/navigation/Nodes/Node_Table.class.php:289
@@ -3850,30 +3861,30 @@ msgid "Insert"
 msgstr ""
 
 #: libraries/Menu.class.php:362 libraries/Menu.class.php:467
-#: libraries/Util.class.php:4334 libraries/Util.class.php:4350
+#: libraries/Util.class.php:4340 libraries/Util.class.php:4356
 #: libraries/config.values.php:106 libraries/server_common.lib.php:51
 #: libraries/server_privileges.lib.php:2370
 #: libraries/server_privileges.lib.php:3158
-#: libraries/server_privileges.lib.php:4221
+#: libraries/server_privileges.lib.php:4247
 msgid "Privileges"
 msgstr ""
 
 #: libraries/Menu.class.php:371 libraries/Menu.class.php:379
-#: libraries/Menu.class.php:459 libraries/Util.class.php:3338
-#: libraries/Util.class.php:3352 libraries/Util.class.php:4333
-#: libraries/Util.class.php:4351 libraries/config.values.php:112
+#: libraries/Menu.class.php:459 libraries/Util.class.php:3344
+#: libraries/Util.class.php:3358 libraries/Util.class.php:4339
+#: libraries/Util.class.php:4357 libraries/config.values.php:112
 #: view_operations.php:92
 msgid "Operations"
 msgstr ""
 
 #: libraries/Menu.class.php:384 libraries/Menu.class.php:492
-#: libraries/Util.class.php:4338 libraries/Util.class.php:4352
+#: libraries/Util.class.php:4344 libraries/Util.class.php:4358
 #: libraries/relation.lib.php:255
 msgid "Tracking"
 msgstr ""
 
 #: libraries/Menu.class.php:397 libraries/Menu.class.php:486
-#: libraries/Util.class.php:4337 libraries/Util.class.php:4353
+#: libraries/Util.class.php:4343 libraries/Util.class.php:4359
 #: libraries/navigation/Nodes/Node_Trigger_Container.class.php:24
 #: libraries/plugins/export/ExportHtmlword.class.php:557
 #: libraries/plugins/export/ExportOdt.class.php:685
@@ -3890,16 +3901,16 @@ msgstr ""
 msgid "Database seems to be empty!"
 msgstr ""
 
-#: libraries/Menu.class.php:439 libraries/Util.class.php:4330
+#: libraries/Menu.class.php:439 libraries/Util.class.php:4336
 msgid "Query"
 msgstr ""
 
-#: libraries/Menu.class.php:472 libraries/Util.class.php:4335
+#: libraries/Menu.class.php:472 libraries/Util.class.php:4341
 #: libraries/rte/rte_words.lib.php:36
 msgid "Routines"
 msgstr ""
 
-#: libraries/Menu.class.php:479 libraries/Util.class.php:4336
+#: libraries/Menu.class.php:479 libraries/Util.class.php:4342
 #: libraries/navigation/Nodes/Node_Event_Container.class.php:26
 #: libraries/plugins/export/ExportSql.class.php:940
 #: libraries/plugins/export/ExportXml.class.php:107
@@ -3907,20 +3918,20 @@ msgstr ""
 msgid "Events"
 msgstr ""
 
-#: libraries/Menu.class.php:498 libraries/Util.class.php:4339
+#: libraries/Menu.class.php:498 libraries/Util.class.php:4345
 msgid "Designer"
 msgstr ""
 
-#: libraries/Menu.class.php:507 libraries/Util.class.php:4340
-#: templates/structure/check_all_tables.phtml:35
+#: libraries/Menu.class.php:507 libraries/Util.class.php:4346
+#: templates/database/structure/check_all_tables.phtml:35
 msgid "Central columns"
 msgstr ""
 
-#: libraries/Menu.class.php:544 libraries/Util.class.php:4312
+#: libraries/Menu.class.php:544 libraries/Util.class.php:4318
 #: libraries/config.values.php:103 libraries/config/messages.inc.php:266
 #: libraries/config/messages.inc.php:341
 #: libraries/navigation/NavigationTree.class.php:1239
-#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4332
+#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4358
 msgid "Databases"
 msgstr ""
 
@@ -3929,34 +3940,34 @@ msgid "User accounts"
 msgstr ""
 
 #: libraries/Menu.class.php:595 libraries/ServerStatusData.class.php:121
-#: libraries/Util.class.php:4319 libraries/server_common.lib.php:36
+#: libraries/Util.class.php:4325 libraries/server_common.lib.php:36
 msgid "Binary log"
 msgstr ""
 
 #: libraries/Menu.class.php:601 libraries/ServerStatusData.class.php:126
-#: libraries/Util.class.php:4320 libraries/server_common.lib.php:42
-#: templates/structure/body_for_table_summary.phtml:10
-#: templates/structure/table_header.phtml:27
+#: libraries/Util.class.php:4326 libraries/server_common.lib.php:42
+#: templates/database/structure/body_for_table_summary.phtml:10
+#: templates/database/structure/table_header.phtml:27
 msgid "Replication"
 msgstr ""
 
 #: libraries/Menu.class.php:606 libraries/ServerStatusData.class.php:193
-#: libraries/Util.class.php:4321 libraries/config.values.php:105
+#: libraries/Util.class.php:4327 libraries/config.values.php:105
 #: libraries/server_engines.lib.php:108 libraries/server_engines.lib.php:112
 #: libraries/sql_query_form.lib.php:421
 msgid "Variables"
 msgstr ""
 
-#: libraries/Menu.class.php:610 libraries/Util.class.php:4322
+#: libraries/Menu.class.php:610 libraries/Util.class.php:4328
 msgid "Charsets"
 msgstr ""
 
-#: libraries/Menu.class.php:615 libraries/Util.class.php:4323
+#: libraries/Menu.class.php:615 libraries/Util.class.php:4329
 #: libraries/server_common.lib.php:33 libraries/server_plugins.lib.php:27
 msgid "Plugins"
 msgstr ""
 
-#: libraries/Menu.class.php:626 libraries/Util.class.php:4324
+#: libraries/Menu.class.php:626 libraries/Util.class.php:4330
 msgid "Engines"
 msgstr ""
 
@@ -3981,7 +3992,7 @@ msgid_plural "%1$d rows inserted."
 msgstr[0] ""
 msgstr[1] ""
 
-#: libraries/PDF.class.php:70 libraries/Util.class.php:2521
+#: libraries/PDF.class.php:70 libraries/Util.class.php:2527
 #: libraries/browse_foreigners.lib.php:327
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:865
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:890
@@ -4002,7 +4013,7 @@ msgid "Could not save favorite table!"
 msgstr ""
 
 #: libraries/RecentFavoriteTable.class.php:212
-#: templates/structure/favorite_anchor.phtml:12
+#: templates/database/structure/favorite_anchor.phtml:12
 msgid "Remove from Favorites"
 msgstr ""
 
@@ -4167,7 +4178,7 @@ msgid ""
 msgstr ""
 
 #: libraries/StorageEngine.class.php:373
-#: templates/structure/body_for_table_summary.phtml:50
+#: templates/database/structure/body_for_table_summary.phtml:50
 #, php-format
 msgid "%s is the default storage engine on this MySQL server."
 msgstr ""
@@ -4579,10 +4590,10 @@ msgstr ""
 
 #: libraries/Util.class.php:726 libraries/rte/rte_events.lib.php:110
 #: libraries/rte/rte_events.lib.php:119 libraries/rte/rte_events.lib.php:150
-#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:153
-#: libraries/rte/rte_routines.lib.php:162
-#: libraries/rte/rte_routines.lib.php:235
-#: libraries/rte/rte_routines.lib.php:1366
+#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:223
+#: libraries/rte/rte_routines.lib.php:250
+#: libraries/rte/rte_routines.lib.php:372
+#: libraries/rte/rte_routines.lib.php:1457
 #: libraries/rte/rte_triggers.lib.php:86 libraries/rte/rte_triggers.lib.php:95
 #: libraries/rte/rte_triggers.lib.php:127
 msgid "MySQL said: "
@@ -4626,75 +4637,78 @@ msgstr ""
 msgid "%B %d, %Y at %I:%M %p"
 msgstr ""
 
-#: libraries/Util.class.php:2019
+#: libraries/Util.class.php:2025
 #, php-format
 msgid "%s days, %s hours, %s minutes and %s seconds"
 msgstr ""
 
-#: libraries/Util.class.php:2112
+#: libraries/Util.class.php:2118
 msgid "Missing parameter:"
 msgstr ""
 
-#: libraries/Util.class.php:2645
+#: libraries/Util.class.php:2651
 #, php-format
 msgid "Jump to database \"%s\"."
 msgstr ""
 
-#: libraries/Util.class.php:2670
+#: libraries/Util.class.php:2676
 #, php-format
 msgid "The %s functionality is affected by a known bug, see %s"
 msgstr ""
 
-#: libraries/Util.class.php:2881
+#: libraries/Util.class.php:2887
 msgid "Click to toggle"
 msgstr ""
 
-#: libraries/Util.class.php:3542 prefs_manage.php:248
+#: libraries/Util.class.php:3548 prefs_manage.php:248
 msgid "Browse your computer:"
 msgstr ""
 
-#: libraries/Util.class.php:3567
+#: libraries/Util.class.php:3573
 #, php-format
 msgid "Select from the web server upload directory <b>%s</b>:"
 msgstr ""
 
-#: libraries/Util.class.php:3596 libraries/insert_edit.lib.php:1173
+#: libraries/Util.class.php:3602 libraries/insert_edit.lib.php:1171
 msgid "The directory you set for upload work cannot be reached."
 msgstr ""
 
-#: libraries/Util.class.php:3607
+#: libraries/Util.class.php:3613
 msgid "There are no files to upload!"
 msgstr ""
 
-#: libraries/Util.class.php:3632 libraries/Util.class.php:3633
-#: templates/structure/check_all_tables.phtml:15
+#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: templates/database/structure/check_all_tables.phtml:15
 msgid "Empty"
 msgstr ""
 
-#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: libraries/Util.class.php:3644 libraries/Util.class.php:3645
 msgid "Execute"
 msgstr ""
 
-#: libraries/Util.class.php:4152
+#: libraries/Util.class.php:4158
 msgid "Print"
 msgstr ""
 
-#: libraries/Util.class.php:4257 templates/structure/row_stats_table.phtml:80
-#: templates/structure/table_header.phtml:95
+#: libraries/Util.class.php:4263
+#: templates/database/structure/table_header.phtml:95
+#: templates/table/structure/row_stats_table.phtml:80
 msgid "Creation"
 msgstr ""
 
-#: libraries/Util.class.php:4263 templates/structure/row_stats_table.phtml:87
-#: templates/structure/table_header.phtml:106
+#: libraries/Util.class.php:4269
+#: templates/database/structure/table_header.phtml:106
+#: templates/table/structure/row_stats_table.phtml:87
 msgid "Last update"
 msgstr ""
 
-#: libraries/Util.class.php:4269 templates/structure/row_stats_table.phtml:94
-#: templates/structure/table_header.phtml:117
+#: libraries/Util.class.php:4275
+#: templates/database/structure/table_header.phtml:117
+#: templates/table/structure/row_stats_table.phtml:94
 msgid "Last check"
 msgstr ""
 
-#: libraries/Util.class.php:4315
+#: libraries/Util.class.php:4321
 msgid "Users"
 msgstr ""
 
@@ -4715,16 +4729,16 @@ msgid "Use this value"
 msgstr ""
 
 #: libraries/build_html_for_db.lib.php:33 libraries/import.lib.php:193
-#: templates/structure/actions_in_table_structure.phtml:113
-#: templates/structure/row_stats_table.phtml:42
-#: templates/structure/table_header.phtml:36
+#: templates/database/structure/table_header.phtml:36
+#: templates/table/structure/actions_in_table_structure.phtml:113
+#: templates/table/structure/row_stats_table.phtml:42
 msgid "Rows"
 msgstr "पङ्क्तिहरू"
 
 #: libraries/build_html_for_db.lib.php:48 libraries/engines/innodb.lib.php:171
-#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:186
-#: libraries/server_status.lib.php:298
-#: templates/structure/display_table_stats.phtml:40
+#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:195
+#: libraries/server_status.lib.php:307
+#: templates/table/structure/display_table_stats.phtml:40
 msgid "Total"
 msgstr ""
 
@@ -4733,10 +4747,12 @@ msgid "Jump to database"
 msgstr ""
 
 #: libraries/build_html_for_db.lib.php:146
+#: templates/database/structure/structure_table_row.phtml:15
 msgid "Not replicated"
 msgstr ""
 
 #: libraries/build_html_for_db.lib.php:158
+#: templates/database/structure/structure_table_row.phtml:16
 msgid "Replicated"
 msgstr ""
 
@@ -4789,17 +4805,17 @@ msgstr ""
 #: libraries/plugins/export/ExportTexytext.class.php:425
 #: libraries/plugins/export/PMA_ExportPdf.class.php:307
 #: libraries/rte/rte_list.lib.php:73 libraries/rte/rte_list.lib.php:85
-#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:830
-#: libraries/rte/rte_routines.lib.php:1492 setup/frames/index.inc.php:162
+#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:921
+#: libraries/rte/rte_routines.lib.php:1583 setup/frames/index.inc.php:162
 #: templates/columns_definitions/table_fields_definitions.phtml:8
-#: templates/structure/table_structure_header.phtml:5
-#: templates/table/create_table.phtml:11
+#: templates/database/create_table.phtml:11
+#: templates/table/structure/table_structure_header.phtml:5
 msgid "Name"
 msgstr ""
 
 #: libraries/central_columns.lib.php:699
 #: libraries/central_columns.lib.php:1381
-#: libraries/rte/rte_routines.lib.php:832
+#: libraries/rte/rte_routines.lib.php:923
 #: templates/columns_definitions/table_fields_definitions.phtml:14
 msgid "Length/Values"
 msgstr ""
@@ -4818,7 +4834,7 @@ msgid "Select a table"
 msgstr ""
 
 #: libraries/central_columns.lib.php:804
-#: templates/structure/add_column.phtml:4
+#: templates/table/structure/add_column.phtml:4
 msgid "Add column"
 msgstr ""
 
@@ -4834,7 +4850,7 @@ msgstr ""
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1002
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1025
 #: templates/columns_definitions/table_fields_definitions.phtml:36
-#: templates/structure/table_structure_header.phtml:8
+#: templates/table/structure/table_structure_header.phtml:8
 msgid "Attributes"
 msgstr ""
 
@@ -4943,7 +4959,7 @@ msgid "Double click"
 msgstr ""
 
 #: libraries/config.values.php:95 libraries/config.values.php:124
-#: libraries/config/FormDisplay.tpl.php:221 libraries/relation.lib.php:97
+#: libraries/config/FormDisplay.tpl.php:232 libraries/relation.lib.php:97
 #: libraries/relation.lib.php:105
 msgid "Disabled"
 msgstr ""
@@ -5117,21 +5133,21 @@ msgstr ""
 msgid "maximum %s"
 msgstr ""
 
-#: libraries/config/FormDisplay.tpl.php:219
+#: libraries/config/FormDisplay.tpl.php:230
 msgid "This setting is disabled, it will not be applied to your configuration."
 msgstr ""
 
-#: libraries/config/FormDisplay.tpl.php:313
+#: libraries/config/FormDisplay.tpl.php:324
 #, php-format
 msgid "Set value: %s"
 msgstr ""
 
-#: libraries/config/FormDisplay.tpl.php:318
+#: libraries/config/FormDisplay.tpl.php:329
 #: libraries/config/messages.inc.php:610
 msgid "Restore default value"
 msgstr ""
 
-#: libraries/config/FormDisplay.tpl.php:332
+#: libraries/config/FormDisplay.tpl.php:343
 msgid "Allow users to customize this value"
 msgstr ""
 
@@ -5549,7 +5565,7 @@ msgstr ""
 
 #: libraries/config/messages.inc.php:136 libraries/config/messages.inc.php:152
 #: libraries/sql_query_form.lib.php:247
-#: templates/structure/row_stats_table.phtml:7
+#: templates/table/structure/row_stats_table.phtml:7
 msgid "Format"
 msgstr ""
 
@@ -6044,7 +6060,7 @@ msgstr ""
 
 #: libraries/config/messages.inc.php:332
 #: libraries/plugins/export/ExportPdf.class.php:279
-#: templates/structure/secondary_tabs.phtml:8
+#: templates/table/secondary_tabs.phtml:8
 msgid "Table structure"
 msgstr ""
 
@@ -7547,101 +7563,33 @@ msgstr ""
 msgid "OpenDocument Text"
 msgstr ""
 
-#: libraries/controllers/StructureController.class.php:465
+#: libraries/controllers/DatabaseStructureController.class.php:405
 #: tbl_operations.php:382
 #, php-format
 msgid "Table %s has been emptied."
 msgstr ""
 
-#: libraries/controllers/StructureController.class.php:486
+#: libraries/controllers/DatabaseStructureController.class.php:426
 #: tbl_operations.php:400 view_operations.php:119
 #, php-format
 msgid "View %s has been dropped."
 msgstr ""
 
-#: libraries/controllers/StructureController.class.php:487
+#: libraries/controllers/DatabaseStructureController.class.php:427
 #: tbl_operations.php:401
 #, php-format
 msgid "Table %s has been dropped."
 msgstr ""
 
-#: libraries/controllers/StructureController.class.php:797
-#, php-format
-msgid "The name '%s' is a MySQL reserved keyword."
-msgid_plural "The names '%s' are MySQL reserved keywords."
-msgstr[0] ""
-msgstr[1] ""
-
-#: libraries/controllers/StructureController.class.php:875
-msgid "No column selected."
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1049
+#: libraries/controllers/DatabaseStructureController.class.php:733
 msgid "Favorite List is full!"
 msgstr ""
 
-#: libraries/controllers/StructureController.class.php:1272
-msgid "The columns have been moved successfully."
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1535
-#, php-format
-msgid ""
-"Table %1$s has been altered successfully. Privileges have been adjusted."
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1541
-#: libraries/controllers/TableIndexesController.class.php:161
-#: tbl_addfield.php:92
-#, php-format
-msgid "Table %1$s has been altered successfully."
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1588
-#: libraries/tracking.lib.php:1094
-msgid "Query error"
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1806
+#: libraries/controllers/DatabaseStructureController.class.php:947
 #: libraries/mysql_charsets.lib.php:366 libraries/mysql_charsets.lib.php:373
 msgid "unknown"
 msgstr ""
 
-#: libraries/controllers/StructureController.class.php:1957
-#: templates/structure/check_all_table_column.phtml:11
-msgid "Change"
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1961
-#: libraries/controllers/StructureController.class.php:1966
-#: libraries/navigation/Nodes/Node_Index.class.php:30
-#: libraries/tracking.lib.php:926
-#: templates/columns_definitions/column_indexes.phtml:16
-#: templates/columns_definitions/table_fields_definitions.phtml:57
-#: templates/structure/check_all_table_column.phtml:30
-#: templates/structure/display_structure.phtml:79
-#: templates/structure/display_table_stats.phtml:19
-msgid "Index"
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1963
-#: libraries/controllers/StructureController.class.php:1968
-#: templates/columns_definitions/column_indexes.phtml:27
-#: templates/structure/check_all_table_column.phtml:37
-msgid "Spatial"
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1964
-#: libraries/controllers/StructureController.class.php:1969
-#: templates/columns_definitions/column_indexes.phtml:22
-#: templates/structure/check_all_table_column.phtml:47
-msgid "Fulltext"
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1970
-msgid "Distinct values"
-msgstr ""
-
 #: libraries/controllers/TableChartController.class.php:82
 #: libraries/controllers/TableGisVisualizationController.class.php:101
 msgid "No SQL query was set to fetch data."
@@ -7655,11 +7603,18 @@ msgstr ""
 msgid "No data to display"
 msgstr ""
 
-#: libraries/controllers/TableRelationController.class.php:217
+#: libraries/controllers/TableIndexesController.class.php:161
+#: libraries/controllers/TableStructureController.class.php:736
+#: tbl_addfield.php:92
+#, php-format
+msgid "Table %1$s has been altered successfully."
+msgstr ""
+
+#: libraries/controllers/TableRelationController.class.php:218
 msgid "Display column was successfully updated."
 msgstr ""
 
-#: libraries/controllers/TableRelationController.class.php:283
+#: libraries/controllers/TableRelationController.class.php:288
 msgid "Internal relations were successfully updated."
 msgstr ""
 
@@ -7672,10 +7627,71 @@ msgid "Zoom search"
 msgstr ""
 
 #: libraries/controllers/TableSearchController.class.php:852
-#: templates/table/selection_form.phtml:59
+#: templates/table/search/selection_form.phtml:59
 msgid "Find and replace"
 msgstr ""
 
+#: libraries/controllers/TableStructureController.class.php:163
+#, php-format
+msgid "The name '%s' is a MySQL reserved keyword."
+msgid_plural "The names '%s' are MySQL reserved keywords."
+msgstr[0] ""
+msgstr[1] ""
+
+#: libraries/controllers/TableStructureController.class.php:241
+msgid "No column selected."
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:467
+msgid "The columns have been moved successfully."
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:730
+#, php-format
+msgid ""
+"Table %1$s has been altered successfully. Privileges have been adjusted."
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:783
+#: libraries/tracking.lib.php:1094
+msgid "Query error"
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:948
+#: templates/table/structure/check_all_table_column.phtml:11
+msgid "Change"
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:952
+#: libraries/controllers/TableStructureController.class.php:957
+#: libraries/navigation/Nodes/Node_Index.class.php:30
+#: libraries/tracking.lib.php:926
+#: templates/columns_definitions/column_indexes.phtml:16
+#: templates/columns_definitions/table_fields_definitions.phtml:57
+#: templates/table/structure/check_all_table_column.phtml:30
+#: templates/table/structure/display_structure.phtml:79
+#: templates/table/structure/display_table_stats.phtml:19
+msgid "Index"
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:954
+#: libraries/controllers/TableStructureController.class.php:959
+#: templates/columns_definitions/column_indexes.phtml:27
+#: templates/table/structure/check_all_table_column.phtml:37
+msgid "Spatial"
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:955
+#: libraries/controllers/TableStructureController.class.php:960
+#: templates/columns_definitions/column_indexes.phtml:22
+#: templates/table/structure/check_all_table_column.phtml:47
+msgid "Fulltext"
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:963
+msgid "Distinct values"
+msgstr ""
+
 #: libraries/core.lib.php:306
 #, php-format
 msgid "The %s extension is missing. Please check your PHP configuration."
@@ -7720,7 +7736,7 @@ msgid "No Password"
 msgstr ""
 
 #: libraries/display_change_password.lib.php:68
-#: libraries/plugins/auth/AuthenticationCookie.class.php:199
+#: libraries/plugins/auth/AuthenticationCookie.class.php:187
 #: libraries/replication_gui.lib.php:422 libraries/replication_gui.lib.php:862
 #: libraries/server_privileges.lib.php:1640
 msgid "Password:"
@@ -8440,12 +8456,12 @@ msgid "Dump has been saved to file %s."
 msgstr ""
 
 #: libraries/import.lib.php:202 libraries/insert_edit.lib.php:124
-#: libraries/rte/rte_routines.lib.php:1353 libraries/sql.lib.php:1312
+#: libraries/rte/rte_routines.lib.php:1444 libraries/sql.lib.php:1306
 #: tbl_get_field.php:44
 msgid "MySQL returned an empty result set (i.e. zero rows)."
 msgstr ""
 
-#: libraries/import.lib.php:265 libraries/sql.lib.php:1326
+#: libraries/import.lib.php:265 libraries/sql.lib.php:1320
 msgid "[ROLLBACK occurred.]"
 msgstr ""
 
@@ -8509,14 +8525,14 @@ msgstr ""
 
 #: libraries/insert_edit.lib.php:233
 #: libraries/navigation/Nodes/Node_DatabaseChild.class.php:48
-#: templates/designer/table_list.phtml:40
+#: templates/database/designer/table_list.phtml:40
 msgid "Hide"
 msgstr ""
 
 #: libraries/insert_edit.lib.php:249
 #: libraries/navigation/Nodes/Node_Function.class.php:32
-#: libraries/rte/rte_routines.lib.php:1495
-#: templates/table/table_header.phtml:4
+#: libraries/rte/rte_routines.lib.php:1586
+#: templates/table/search/table_header.phtml:4
 msgid "Function"
 msgstr ""
 
@@ -8529,82 +8545,83 @@ msgstr ""
 msgid "Because of its length,<br /> this column might not be editable."
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1050
+#: libraries/insert_edit.lib.php:1048
 msgid "Binary - do not edit"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1176 libraries/server_privileges.lib.php:470
-#: templates/table/options.phtml:36
+#: libraries/insert_edit.lib.php:1174 libraries/server_privileges.lib.php:470
+#: templates/table/search/options.phtml:36
 msgid "Or"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1177
+#: libraries/insert_edit.lib.php:1175
 msgid "web server upload directory:"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1348 templates/table/input_box.phtml:49
+#: libraries/insert_edit.lib.php:1346
+#: templates/table/search/input_box.phtml:49
 msgid "Edit/Insert"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1398
+#: libraries/insert_edit.lib.php:1396
 #, php-format
 msgid "Continue insertion with %s rows"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1428
+#: libraries/insert_edit.lib.php:1426
 msgid "and then"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1461
+#: libraries/insert_edit.lib.php:1459
 msgid "Insert as new row"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1464
+#: libraries/insert_edit.lib.php:1462
 msgid "Insert as new row and ignore errors"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1467
+#: libraries/insert_edit.lib.php:1465
 msgid "Show insert query"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1487
+#: libraries/insert_edit.lib.php:1485
 msgid "Go back to previous page"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1490
+#: libraries/insert_edit.lib.php:1488
 msgid "Insert another new row"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1495
+#: libraries/insert_edit.lib.php:1493
 msgid "Go back to this page"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1518
+#: libraries/insert_edit.lib.php:1516
 msgid "Edit next row"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1540
+#: libraries/insert_edit.lib.php:1538
 msgid ""
 "Use TAB key to move from value to value, or CTRL+arrows to move anywhere"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1577 libraries/replication_gui.lib.php:542
-#: libraries/rte/rte_routines.lib.php:1497
+#: libraries/insert_edit.lib.php:1575 libraries/replication_gui.lib.php:542
+#: libraries/rte/rte_routines.lib.php:1588
 #: libraries/server_status_variables.lib.php:220
-#: templates/designer/having_query_panel.phtml:100
-#: templates/designer/options_panel.phtml:73
-#: templates/designer/options_panel.phtml:239
-#: templates/designer/where_query_panel.phtml:69
-#: templates/table/table_header.phtml:10
-#: templates/table/zoom_result_form.phtml:35
+#: templates/database/designer/having_query_panel.phtml:100
+#: templates/database/designer/options_panel.phtml:73
+#: templates/database/designer/options_panel.phtml:239
+#: templates/database/designer/where_query_panel.phtml:69
+#: templates/table/search/table_header.phtml:10
+#: templates/table/search/zoom_result_form.phtml:35
 msgid "Value"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1937 libraries/sql.lib.php:1309
+#: libraries/insert_edit.lib.php:1935 libraries/sql.lib.php:1303
 msgid "Showing SQL query"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1962 libraries/sql.lib.php:1287
+#: libraries/insert_edit.lib.php:1960 libraries/sql.lib.php:1281
 #, php-format
 msgid "Inserted row id: %1$d"
 msgstr ""
@@ -9011,7 +9028,7 @@ msgstr ""
 #: libraries/navigation/Nodes/Node_View_Container.class.php:26
 #: libraries/navigation/Nodes/Node_View_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:129
-#: templates/structure/show_create.phtml:30
+#: templates/database/structure/show_create.phtml:30
 msgid "Views"
 msgstr ""
 
@@ -9297,7 +9314,7 @@ msgstr ""
 
 #: libraries/operations.lib.php:101 libraries/operations.lib.php:249
 #: libraries/operations.lib.php:869 libraries/operations.lib.php:963
-#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:907
+#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:998
 #: templates/columns_definitions/table_fields_definitions.phtml:47
 msgid "Adjust Privileges"
 msgstr ""
@@ -9387,22 +9404,22 @@ msgid "Switch to copied table"
 msgstr ""
 
 #: libraries/operations.lib.php:1360
-#: templates/structure/check_all_tables.phtml:18
+#: templates/database/structure/check_all_tables.phtml:18
 msgid "Table maintenance"
 msgstr ""
 
 #: libraries/operations.lib.php:1398
-#: templates/structure/check_all_tables.phtml:19
+#: templates/database/structure/check_all_tables.phtml:19
 msgid "Analyze table"
 msgstr ""
 
 #: libraries/operations.lib.php:1413
-#: templates/structure/check_all_tables.phtml:20
+#: templates/database/structure/check_all_tables.phtml:20
 msgid "Check table"
 msgstr ""
 
 #: libraries/operations.lib.php:1428
-#: templates/structure/check_all_tables.phtml:22
+#: templates/database/structure/check_all_tables.phtml:22
 #, fuzzy
 msgid "Checksum table"
 msgstr "ट्रैक तालिका"
@@ -9421,18 +9438,19 @@ msgid "Flush the table (FLUSH)"
 msgstr ""
 
 #: libraries/operations.lib.php:1477
-#: templates/structure/check_all_tables.phtml:23
-#: templates/structure/display_table_stats.phtml:56
+#: templates/database/structure/check_all_tables.phtml:23
+#: templates/table/structure/display_table_stats.phtml:56
 msgid "Optimize table"
 msgstr ""
 
 #: libraries/operations.lib.php:1492
-#: templates/structure/check_all_tables.phtml:24
+#: templates/database/structure/check_all_tables.phtml:24
 msgid "Repair table"
 msgstr ""
 
 #: libraries/operations.lib.php:1538
-#: templates/structure/check_all_tables.phtml:14 view_operations.php:127
+#: templates/database/structure/check_all_tables.phtml:14
+#: view_operations.php:127
 msgid "Delete data or table"
 msgstr ""
 
@@ -9553,7 +9571,7 @@ msgid "Cannot connect: invalid settings."
 msgstr ""
 
 #: libraries/plugins/auth/AuthenticationConfig.class.php:108
-#: libraries/plugins/auth/AuthenticationCookie.class.php:134
+#: libraries/plugins/auth/AuthenticationCookie.class.php:122
 #: libraries/plugins/auth/AuthenticationHttp.class.php:96
 #, php-format
 msgid "Welcome to %s"
@@ -9578,36 +9596,36 @@ msgstr ""
 msgid "Retry to connect"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:146
+#: libraries/plugins/auth/AuthenticationCookie.class.php:134
 msgid "Your session has expired. Please log in again."
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:170
+#: libraries/plugins/auth/AuthenticationCookie.class.php:158
 msgid "Log in"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:178
-#: libraries/plugins/auth/AuthenticationCookie.class.php:188
+#: libraries/plugins/auth/AuthenticationCookie.class.php:166
+#: libraries/plugins/auth/AuthenticationCookie.class.php:176
 msgid "You can enter hostname/IP address and port separated by space."
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:193
+#: libraries/plugins/auth/AuthenticationCookie.class.php:181
 msgid "Username:"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:205
+#: libraries/plugins/auth/AuthenticationCookie.class.php:193
 msgid "Server Choice:"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:386
+#: libraries/plugins/auth/AuthenticationCookie.class.php:374
 msgid "Entered captcha is wrong, try again!"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:396
+#: libraries/plugins/auth/AuthenticationCookie.class.php:384
 msgid "Please enter correct captcha!"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:423
+#: libraries/plugins/auth/AuthenticationCookie.class.php:411
 msgid "You are not allowed to log in to this MySQL server!"
 msgstr ""
 
@@ -9703,7 +9721,7 @@ msgstr ""
 #: libraries/plugins/export/ExportOdt.class.php:593
 #: libraries/plugins/export/ExportTexytext.class.php:428
 #: libraries/plugins/export/PMA_ExportPdf.class.php:313
-#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:984
 #: libraries/rte/rte_triggers.lib.php:377
 msgid "Definition"
 msgstr ""
@@ -10000,7 +10018,7 @@ msgid "Last check:"
 msgstr "पछिल्लो जाँच:"
 
 #: libraries/plugins/export/ExportSql.class.php:1399
-#: templates/structure/structure_table_row.phtml:183
+#: templates/database/structure/structure_table_row.phtml:183
 msgid "in use"
 msgstr "प्रयोगमा"
 
@@ -10180,18 +10198,14 @@ msgstr ""
 msgid "The imported file does not contain any data!"
 msgstr ""
 
-#: libraries/plugins/import/ImportSql.class.php:169
+#: libraries/plugins/import/ImportSql.class.php:72
 msgid "SQL compatibility mode:"
 msgstr ""
 
-#: libraries/plugins/import/ImportSql.class.php:181
+#: libraries/plugins/import/ImportSql.class.php:84
 msgid "Do not use <code>AUTO_INCREMENT</code> for zero values"
 msgstr ""
 
-#: libraries/plugins/import/ImportSql.class.php:195
-msgid "Read as multibytes"
-msgstr ""
-
 #: libraries/plugins/import/ImportXml.class.php:54
 msgid "XML"
 msgstr ""
@@ -10234,7 +10248,7 @@ msgid "Show grid"
 msgstr ""
 
 #: libraries/plugins/schema/SchemaPdf.class.php:94
-#: templates/structure/print_view_data_dictionary_link.phtml:6
+#: templates/database/structure/print_view_data_dictionary_link.phtml:6
 msgid "Data Dictionary"
 msgstr ""
 
@@ -10259,7 +10273,7 @@ msgid "The %s table doesn't exist!"
 msgstr ""
 
 #: libraries/plugins/schema/eps/Eps_Relation_Schema.class.php:321
-#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:309
+#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:323
 #, php-format
 msgid "Schema of the %s database - Page %s"
 msgstr ""
@@ -10285,7 +10299,7 @@ msgstr ""
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1005
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1028
 #: libraries/tracking.lib.php:884
-#: templates/structure/table_structure_header.phtml:11
+#: templates/table/structure/table_structure_header.phtml:11
 msgid "Extra"
 msgstr ""
 
@@ -10592,51 +10606,51 @@ msgstr ""
 msgid "Create the needed tables with the <code>%screate_tables.sql</code>."
 msgstr ""
 
-#: libraries/relation.lib.php:360
+#: libraries/relation.lib.php:357
 msgid "Create a pma user and give access to these tables."
 msgstr ""
 
-#: libraries/relation.lib.php:365
+#: libraries/relation.lib.php:360
 msgid ""
 "Enable advanced features in configuration file (<code>config.inc.php</"
 "code>), for example by starting from <code>config.sample.inc.php</code>."
 msgstr ""
 
-#: libraries/relation.lib.php:373
+#: libraries/relation.lib.php:365
 msgid "Re-login to phpMyAdmin to load the updated configuration file."
 msgstr ""
 
-#: libraries/relation.lib.php:1612
+#: libraries/relation.lib.php:1607
 msgid "no description"
 msgstr ""
 
-#: libraries/relation.lib.php:1811
+#: libraries/relation.lib.php:1806
 msgid ""
 "You do not have necessary privileges to create a database named "
 "'phpmyadmin'. You may go to 'Operations' tab of any database to set up the "
 "phpMyAdmin configuration storage there."
 msgstr ""
 
-#: libraries/relation.lib.php:1928
+#: libraries/relation.lib.php:1923
 #, php-format
 msgid ""
 "%sCreate%s a database named 'phpmyadmin' and setup the phpMyAdmin "
 "configuration storage there."
 msgstr ""
 
-#: libraries/relation.lib.php:1936
+#: libraries/relation.lib.php:1931
 #, php-format
 msgid ""
 "%sCreate%s the phpMyAdmin configuration storage in the current database."
 msgstr ""
 
-#: libraries/relation.lib.php:1944
+#: libraries/relation.lib.php:1939
 #, php-format
 msgid "%sCreate%s missing phpMyAdmin configuration storage tables."
 msgstr ""
 
 #: libraries/replication_gui.lib.php:46 libraries/replication_gui.lib.php:343
-#: libraries/server_databases.lib.php:387
+#: libraries/server_databases.lib.php:398
 msgid "Master replication"
 msgstr ""
 
@@ -10691,7 +10705,7 @@ msgid ""
 msgstr ""
 
 #: libraries/replication_gui.lib.php:141
-#: libraries/server_databases.lib.php:389
+#: libraries/server_databases.lib.php:400
 msgid "Slave replication"
 msgstr ""
 
@@ -10952,10 +10966,10 @@ msgid "Master server changed successfully to %s."
 msgstr ""
 
 #: libraries/rte/rte_events.lib.php:106 libraries/rte/rte_events.lib.php:115
-#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:149
-#: libraries/rte/rte_routines.lib.php:158
-#: libraries/rte/rte_routines.lib.php:231
-#: libraries/rte/rte_routines.lib.php:1362
+#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:219
+#: libraries/rte/rte_routines.lib.php:246
+#: libraries/rte/rte_routines.lib.php:368
+#: libraries/rte/rte_routines.lib.php:1453
 #: libraries/rte/rte_triggers.lib.php:82 libraries/rte/rte_triggers.lib.php:91
 #: libraries/rte/rte_triggers.lib.php:123
 #, php-format
@@ -10976,7 +10990,7 @@ msgstr ""
 msgid "Event %1$s has been created."
 msgstr ""
 
-#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:251
+#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:266
 #: libraries/rte/rte_triggers.lib.php:144
 msgid "One or more errors have occurred while processing your request:"
 msgstr ""
@@ -10985,7 +10999,7 @@ msgstr ""
 msgid "Edit event"
 msgstr ""
 
-#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:794
+#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:885
 #: libraries/rte/rte_triggers.lib.php:323 view_create.php:180
 msgid "Details"
 msgstr ""
@@ -10998,7 +11012,7 @@ msgstr ""
 msgid "Event type"
 msgstr ""
 
-#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:817
+#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:908
 #, php-format
 msgid "Change to %s"
 msgstr ""
@@ -11025,12 +11039,14 @@ msgstr ""
 msgid "On completion preserve"
 msgstr ""
 
-#: libraries/rte/rte_events.lib.php:491 libraries/rte/rte_routines.lib.php:930
+#: libraries/rte/rte_events.lib.php:491
+#: libraries/rte/rte_routines.lib.php:1021
 #: libraries/rte/rte_triggers.lib.php:383 view_create.php:209
 msgid "Definer"
 msgstr ""
 
-#: libraries/rte/rte_events.lib.php:535 libraries/rte/rte_routines.lib.php:997
+#: libraries/rte/rte_events.lib.php:535
+#: libraries/rte/rte_routines.lib.php:1088
 #: libraries/rte/rte_triggers.lib.php:422
 msgid "The definer must be in the \"username@hostname\" format!"
 msgstr ""
@@ -11056,9 +11072,9 @@ msgid "You must provide an event definition."
 msgstr ""
 
 #: libraries/rte/rte_export.lib.php:43 libraries/rte/rte_general.lib.php:72
-#: libraries/rte/rte_routines.lib.php:345
-#: libraries/rte/rte_routines.lib.php:1198
-#: libraries/rte/rte_routines.lib.php:1411
+#: libraries/rte/rte_routines.lib.php:153
+#: libraries/rte/rte_routines.lib.php:1289
+#: libraries/rte/rte_routines.lib.php:1502
 msgid "Error in processing request:"
 msgstr ""
 
@@ -11090,132 +11106,132 @@ msgid ""
 "problems."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:110
-#: libraries/rte/rte_routines.lib.php:1006
+#: libraries/rte/rte_routines.lib.php:123
+msgid "Edit routine"
+msgstr ""
+
+#: libraries/rte/rte_routines.lib.php:200
+#: libraries/rte/rte_routines.lib.php:1097
 #, php-format
 msgid "Invalid routine type: \"%s\""
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:170
-msgid "Sorry, we failed to restore the dropped routine."
-msgstr ""
-
-#: libraries/rte/rte_routines.lib.php:211
-#, php-format
-msgid "Routine %1$s has been modified. Privileges have been adjusted."
-msgstr ""
-
-#: libraries/rte/rte_routines.lib.php:216
-#, php-format
-msgid "Routine %1$s has been modified."
-msgstr ""
-
-#: libraries/rte/rte_routines.lib.php:238
+#: libraries/rte/rte_routines.lib.php:253
 #, php-format
 msgid "Routine %1$s has been created."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:315
-msgid "Edit routine"
+#: libraries/rte/rte_routines.lib.php:380
+msgid "Sorry, we failed to restore the dropped routine."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:797
+#: libraries/rte/rte_routines.lib.php:439
+#, php-format
+msgid "Routine %1$s has been modified. Privileges have been adjusted."
+msgstr ""
+
+#: libraries/rte/rte_routines.lib.php:444
+#, php-format
+msgid "Routine %1$s has been modified."
+msgstr ""
+
+#: libraries/rte/rte_routines.lib.php:888
 msgid "Routine name"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:823
+#: libraries/rte/rte_routines.lib.php:914
 msgid "Parameters"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:829
+#: libraries/rte/rte_routines.lib.php:920
 msgid "Direction"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:847
+#: libraries/rte/rte_routines.lib.php:938
 msgid "Add parameter"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:851
+#: libraries/rte/rte_routines.lib.php:942
 msgid "Remove last parameter"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:856
+#: libraries/rte/rte_routines.lib.php:947
 msgid "Return type"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:862
+#: libraries/rte/rte_routines.lib.php:953
 msgid "Return length/values"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:868
+#: libraries/rte/rte_routines.lib.php:959
 msgid "Return options"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:899
+#: libraries/rte/rte_routines.lib.php:990
 msgid "Is deterministic"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:920
+#: libraries/rte/rte_routines.lib.php:1011
 msgid ""
 "You do not have sufficient privileges to perform this operation; Please "
 "refer to the documentation for more details"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:935
+#: libraries/rte/rte_routines.lib.php:1026
 msgid "Security type"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:944
+#: libraries/rte/rte_routines.lib.php:1035
 msgid "SQL data access"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1013
+#: libraries/rte/rte_routines.lib.php:1104
 msgid "You must provide a routine name!"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1047
+#: libraries/rte/rte_routines.lib.php:1138
 #, php-format
 msgid "Invalid direction \"%s\" given for parameter."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1069
-#: libraries/rte/rte_routines.lib.php:1131
+#: libraries/rte/rte_routines.lib.php:1160
+#: libraries/rte/rte_routines.lib.php:1222
 msgid ""
 "You must provide length/values for routine parameters of type ENUM, SET, "
 "VARCHAR and VARBINARY."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1095
+#: libraries/rte/rte_routines.lib.php:1186
 msgid "You must provide a name and a type for each routine parameter."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1114
+#: libraries/rte/rte_routines.lib.php:1205
 msgid "You must provide a valid return type for the routine."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1174
+#: libraries/rte/rte_routines.lib.php:1265
 msgid "You must provide a routine definition."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1285
+#: libraries/rte/rte_routines.lib.php:1376
 #, php-format
 msgid "Execution results of routine %s"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1340
+#: libraries/rte/rte_routines.lib.php:1431
 #, php-format
 msgid "%d row affected by the last statement inside the procedure."
 msgid_plural "%d rows affected by the last statement inside the procedure."
 msgstr[0] ""
 msgstr[1] ""
 
-#: libraries/rte/rte_routines.lib.php:1398
-#: libraries/rte/rte_routines.lib.php:1406
+#: libraries/rte/rte_routines.lib.php:1489
+#: libraries/rte/rte_routines.lib.php:1497
 msgid "Execute routine"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1485
-#: libraries/rte/rte_routines.lib.php:1488
+#: libraries/rte/rte_routines.lib.php:1576
+#: libraries/rte/rte_routines.lib.php:1579
 msgid "Routine parameters"
 msgstr ""
 
@@ -11369,7 +11385,7 @@ msgid "Original position"
 msgstr ""
 
 #: libraries/server_bin_log.lib.php:133
-#: templates/structure/display_table_stats.phtml:4
+#: templates/table/structure/display_table_stats.phtml:4
 msgid "Information"
 msgstr ""
 
@@ -11405,12 +11421,12 @@ msgid ""
 "between the web server and the MySQL server."
 msgstr ""
 
-#: libraries/server_databases.lib.php:364
-#: libraries/server_databases.lib.php:365
+#: libraries/server_databases.lib.php:366
+#: libraries/server_databases.lib.php:371
 msgid "Enable Statistics"
 msgstr ""
 
-#: libraries/server_databases.lib.php:481
+#: libraries/server_databases.lib.php:492
 #, php-format
 msgid "%1$d database has been dropped successfully."
 msgid_plural "%1$d databases have been dropped successfully."
@@ -11766,7 +11782,7 @@ msgid "You have revoked the privileges for %s."
 msgstr ""
 
 #: libraries/server_privileges.lib.php:2059
-#: libraries/server_privileges.lib.php:4290
+#: libraries/server_privileges.lib.php:4316
 msgid "Add user account"
 msgstr ""
 
@@ -11931,53 +11947,53 @@ msgstr ""
 msgid "The privileges were reloaded successfully."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:3994
+#: libraries/server_privileges.lib.php:4003
 #, php-format
 msgid "The user %s already exists!"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4232
+#: libraries/server_privileges.lib.php:4258
 #, php-format
 msgid "Privileges for %s"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4241
+#: libraries/server_privileges.lib.php:4267
 #: libraries/server_status_processes.lib.php:72
 #: libraries/server_user_groups.lib.php:39
 msgid "User"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4282
+#: libraries/server_privileges.lib.php:4308
 msgctxt "Create new user"
 msgid "New"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4311
+#: libraries/server_privileges.lib.php:4337
 msgid "Edit privileges:"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4312
+#: libraries/server_privileges.lib.php:4338
 msgid "User account"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4371
+#: libraries/server_privileges.lib.php:4397
 msgid ""
 "Note: You are attempting to edit privileges of the user with which you are "
 "currently logged in."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4391 libraries/server_users.lib.php:25
+#: libraries/server_privileges.lib.php:4417 libraries/server_users.lib.php:25
 msgid "User accounts overview"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4459
+#: libraries/server_privileges.lib.php:4485
 msgid ""
 "A user account allowing any user from localhost to connect is present. This "
 "will prevent other users from connecting if the host part of their account "
 "allows a connection from any (%) host."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4500
+#: libraries/server_privileges.lib.php:4526
 #, php-format
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
@@ -11986,7 +12002,7 @@ msgid ""
 "%sreload the privileges%s before you continue."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4519
+#: libraries/server_privileges.lib.php:4545
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
 "tables. The content of these tables may differ from the privileges the "
@@ -11995,61 +12011,61 @@ msgid ""
 "privilege."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4569
+#: libraries/server_privileges.lib.php:4595
 msgid "The selected user was not found in the privilege table."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4801
+#: libraries/server_privileges.lib.php:4827
 msgid "You have added a new user."
 msgstr ""
 
-#: libraries/server_status.lib.php:53
+#: libraries/server_status.lib.php:60
 #, php-format
 msgid "Network traffic since startup: %s"
 msgstr ""
 
-#: libraries/server_status.lib.php:66
+#: libraries/server_status.lib.php:73
 #, php-format
 msgid "This MySQL server has been running for %1$s. It started up on %2$s."
 msgstr ""
 
-#: libraries/server_status.lib.php:80
+#: libraries/server_status.lib.php:94
 msgid ""
 "This MySQL server works as <b>master</b> and <b>slave</b> in <b>replication</"
 "b> process."
 msgstr ""
 
-#: libraries/server_status.lib.php:85
+#: libraries/server_status.lib.php:99
 msgid "This MySQL server works as <b>master</b> in <b>replication</b> process."
 msgstr ""
 
-#: libraries/server_status.lib.php:90
+#: libraries/server_status.lib.php:104
 msgid "This MySQL server works as <b>slave</b> in <b>replication</b> process."
 msgstr ""
 
-#: libraries/server_status.lib.php:106
+#: libraries/server_status.lib.php:116
 msgid "Replication status"
 msgstr ""
 
-#: libraries/server_status.lib.php:137
+#: libraries/server_status.lib.php:146
 msgid ""
 "On a busy server, the byte counters may overrun, so those statistics as "
 "reported by the MySQL server may be incorrect."
 msgstr ""
 
-#: libraries/server_status.lib.php:148
+#: libraries/server_status.lib.php:157
 msgid "Received"
 msgstr ""
 
-#: libraries/server_status.lib.php:167
+#: libraries/server_status.lib.php:176
 msgid "Sent"
 msgstr ""
 
-#: libraries/server_status.lib.php:234
+#: libraries/server_status.lib.php:243
 msgid "Max. concurrent connections"
 msgstr ""
 
-#: libraries/server_status.lib.php:244
+#: libraries/server_status.lib.php:253
 msgid "Failed attempts"
 msgstr ""
 
@@ -12971,7 +12987,7 @@ msgstr ""
 msgid "Not implemented yet."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/AlterOperation.php:193
+#: libraries/sql-parser/src/Components/AlterOperation.php:191
 msgid "Unrecognized alter operation."
 msgstr ""
 
@@ -12985,7 +13001,7 @@ msgid "An opening bracket followed by a set of values was expected."
 msgstr ""
 
 #: libraries/sql-parser/src/Components/ArrayObj.php:101
-#: libraries/sql-parser/src/Components/FieldDefinition.php:202
+#: libraries/sql-parser/src/Components/CreateDefinition.php:202
 msgid "An opening bracket was expected."
 msgstr ""
 
@@ -12993,25 +13009,33 @@ msgstr ""
 msgid "A comma or a closing bracket was expected"
 msgstr ""
 
+#: libraries/sql-parser/src/Components/CreateDefinition.php:246
+msgid "A comma or a closing bracket was expected."
+msgstr ""
+
+#: libraries/sql-parser/src/Components/CreateDefinition.php:262
+msgid "A closing bracket was expected."
+msgstr ""
+
 #: libraries/sql-parser/src/Components/DataType.php:125
 msgid "Unrecognized data type."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:225
+#: libraries/sql-parser/src/Components/Expression.php:227
 msgid "Unexpected closing bracket."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:246
-#: libraries/sql-parser/src/Components/Expression.php:283
-#: libraries/sql-parser/src/Components/Expression.php:303
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:285
+#: libraries/sql-parser/src/Components/Expression.php:305
 msgid "An alias was previously found."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:257
+#: libraries/sql-parser/src/Components/Expression.php:259
 msgid "Unexpected dot."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:327
+#: libraries/sql-parser/src/Components/Expression.php:329
 msgid "An alias was expected."
 msgstr ""
 
@@ -13019,14 +13043,6 @@ msgstr ""
 msgid "An expression was expected."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/FieldDefinition.php:246
-msgid "A comma or a closing bracket was expected."
-msgstr ""
-
-#: libraries/sql-parser/src/Components/FieldDefinition.php:262
-msgid "A closing bracket was expected."
-msgstr ""
-
 #: libraries/sql-parser/src/Components/Limit.php:90
 #: libraries/sql-parser/src/Components/Limit.php:112
 msgid "An offset was expected."
@@ -13066,24 +13082,24 @@ msgstr ""
 msgid "Expected delimiter."
 msgstr ""
 
-#: libraries/sql-parser/src/Lexer.php:753
+#: libraries/sql-parser/src/Lexer.php:777
 #, php-format
 msgid "Ending quote %1$s was expected."
 msgstr ""
 
-#: libraries/sql-parser/src/Lexer.php:789
+#: libraries/sql-parser/src/Lexer.php:813
 msgid "Variable name was expected."
 msgstr ""
 
-#: libraries/sql-parser/src/Parser.php:380
+#: libraries/sql-parser/src/Parser.php:391
 msgid "Unexpected beginning of statement."
 msgstr ""
 
-#: libraries/sql-parser/src/Parser.php:399
+#: libraries/sql-parser/src/Parser.php:410
 msgid "Unrecognized statement type."
 msgstr ""
 
-#: libraries/sql-parser/src/Parser.php:479
+#: libraries/sql-parser/src/Parser.php:489
 msgid "No transaction was previously started."
 msgstr ""
 
@@ -13109,7 +13125,7 @@ msgid "The name of the entity was expected."
 msgstr ""
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:310
-msgid "At least one field definition was expected."
+msgid "At least one column definition was expected."
 msgstr ""
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:329
@@ -13169,25 +13185,25 @@ msgstr ""
 msgid "Using bookmark \"%s\" as default browse query."
 msgstr ""
 
-#: libraries/sql.lib.php:1306
+#: libraries/sql.lib.php:1300
 msgid "Showing as PHP code"
 msgstr ""
 
-#: libraries/sql.lib.php:1638
+#: libraries/sql.lib.php:1632
 #, php-format
 msgid ""
 "Current selection does not contain a unique column. Grid edit, checkbox, "
 "Edit, Copy and Delete features are not available. %s"
 msgstr ""
 
-#: libraries/sql.lib.php:1649
+#: libraries/sql.lib.php:1643
 #, php-format
 msgid ""
 "Current selection does not contain a unique column. Grid edit, Edit, Copy "
 "and Delete features may result in undesired behavior. %s"
 msgstr ""
 
-#: libraries/sql.lib.php:1688
+#: libraries/sql.lib.php:1682
 #, php-format
 msgid "Problems with indexes of table `%s`"
 msgstr ""
@@ -13348,7 +13364,7 @@ msgid "Version %s snapshot (SQL code)"
 msgstr ""
 
 #: libraries/tracking.lib.php:947
-#: templates/structure/table_structure_row.phtml:33
+#: templates/table/structure/table_structure_row.phtml:33
 msgctxt "None for default"
 msgid "None"
 msgstr ""
@@ -13400,15 +13416,15 @@ msgstr ""
 msgid "Version %1$s was created, tracking for %2$s is active."
 msgstr ""
 
-#: libraries/user_preferences.inc.php:29
+#: libraries/user_preferences.inc.php:30
 msgid "Manage your settings"
 msgstr ""
 
-#: libraries/user_preferences.inc.php:46 prefs_manage.php:307
+#: libraries/user_preferences.inc.php:54 prefs_manage.php:307
 msgid "Configuration has been saved."
 msgstr ""
 
-#: libraries/user_preferences.inc.php:66
+#: libraries/user_preferences.inc.php:74
 #, php-format
 msgid ""
 "Your preferences will be saved for current session only. Storing them "
@@ -13782,7 +13798,7 @@ msgid "first"
 msgstr ""
 
 #: templates/columns_definitions/move_column.phtml:12
-#: templates/structure/add_column.phtml:21
+#: templates/table/structure/add_column.phtml:21
 #, php-format
 msgid "after %s"
 msgstr ""
@@ -13841,197 +13857,290 @@ msgstr ""
 msgid "Input transformation options"
 msgstr ""
 
-#: templates/designer/aggregate_query_panel.phtml:22
-#: templates/designer/options_panel.phtml:100
-msgid "Aggregate"
-msgstr ""
-
-#: templates/designer/aggregate_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:61
-#: templates/designer/options_panel.phtml:106
-#: templates/designer/options_panel.phtml:170
-#: templates/designer/where_query_panel.phtml:30
-#: templates/table/table_header.phtml:9
-msgid "Operator"
-msgstr ""
-
-#: templates/designer/database_tables.phtml:29
-msgid "Toggle"
-msgstr ""
-
-#: templates/designer/database_tables.phtml:40
-msgid "See table structure"
-msgstr ""
-
-#: templates/designer/delete_relation_panel.phtml:21
-msgid "Delete relation"
-msgstr ""
-
-#: templates/designer/edit_delete_pages.phtml:7
-msgid "Page to open"
-msgstr ""
-
-#: templates/designer/edit_delete_pages.phtml:7
-msgid "Page to delete"
-msgstr ""
-
-#: templates/designer/having_query_panel.phtml:90
-#: templates/designer/options_panel.phtml:63
-#: templates/designer/options_panel.phtml:229
-#: templates/designer/where_query_panel.phtml:59
-msgid "Except"
-msgstr ""
-
-#: templates/designer/having_query_panel.phtml:102
-#: templates/designer/options_panel.phtml:75
-#: templates/designer/options_panel.phtml:241
-#: templates/designer/where_query_panel.phtml:71
-msgid "subquery"
-msgstr ""
-
-#: templates/designer/new_relation_panel.phtml:22
-#: templates/designer/side_menu.phtml:84 templates/designer/side_menu.phtml:87
-msgid "Create relation"
-msgstr ""
-
-#: templates/designer/options_panel.phtml:34
-#: templates/designer/options_panel.phtml:200
-msgid "Relation operator"
-msgstr ""
-
-#: templates/designer/options_panel.phtml:85
-#: templates/designer/rename_to_panel.phtml:23
-msgid "Rename to"
-msgstr ""
-
-#: templates/designer/options_panel.phtml:91
-#: templates/designer/rename_to_panel.phtml:31
-msgid "New name"
-msgstr ""
-
-#: templates/designer/page_save_as.phtml:4
-msgid "Save to selected page"
-msgstr ""
-
-#: templates/designer/page_save_as.phtml:5
-msgid "Create a page and save to it"
-msgstr ""
-
-#: templates/designer/page_save_as.phtml:26
-msgid "New page name"
-msgstr ""
-
-#: templates/designer/page_selector.phtml:2
-msgid "Select page"
-msgstr ""
-
-#: templates/designer/query_details.phtml:10
-msgid "Active options"
-msgstr ""
-
-#: templates/designer/schema_export.phtml:4
-msgid "Select Export Relational Type"
-msgstr ""
-
-#: templates/designer/side_menu.phtml:19 templates/designer/side_menu.phtml:25
-msgid "Show/Hide tables list"
-msgstr ""
-
-#: templates/designer/side_menu.phtml:29 templates/designer/side_menu.phtml:35
-#: templates/designer/side_menu.phtml:36
-msgid "View in fullscreen"
-msgstr ""
-
-#: templates/designer/side_menu.phtml:34
-msgid "Exit fullscreen"
-msgstr ""
-
-#: templates/designer/side_menu.phtml:41 templates/designer/side_menu.phtml:45
-msgid "New page"
-msgstr ""
-
-#: templates/designer/side_menu.phtml:70 templates/designer/side_menu.phtml:73
-msgid "Delete pages"
-msgstr ""
-
-#: templates/designer/side_menu.phtml:77 templates/designer/side_menu.phtml:80
-#: templates/table/create_table.phtml:7
+#: templates/database/create_table.phtml:7
+#: templates/database/designer/side_menu.phtml:77
+#: templates/database/designer/side_menu.phtml:80
 msgid "Create table"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:98
-#: templates/designer/side_menu.phtml:101
+#: templates/database/create_table.phtml:15
+msgid "Number of columns"
+msgstr ""
+
+#: templates/database/designer/aggregate_query_panel.phtml:22
+#: templates/database/designer/options_panel.phtml:100
+msgid "Aggregate"
+msgstr ""
+
+#: templates/database/designer/aggregate_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:61
+#: templates/database/designer/options_panel.phtml:106
+#: templates/database/designer/options_panel.phtml:170
+#: templates/database/designer/where_query_panel.phtml:30
+#: templates/table/search/table_header.phtml:9
+msgid "Operator"
+msgstr ""
+
+#: templates/database/designer/database_tables.phtml:29
+msgid "Toggle"
+msgstr ""
+
+#: templates/database/designer/database_tables.phtml:40
+msgid "See table structure"
+msgstr ""
+
+#: templates/database/designer/delete_relation_panel.phtml:21
+msgid "Delete relation"
+msgstr ""
+
+#: templates/database/designer/edit_delete_pages.phtml:7
+msgid "Page to open"
+msgstr ""
+
+#: templates/database/designer/edit_delete_pages.phtml:7
+msgid "Page to delete"
+msgstr ""
+
+#: templates/database/designer/having_query_panel.phtml:90
+#: templates/database/designer/options_panel.phtml:63
+#: templates/database/designer/options_panel.phtml:229
+#: templates/database/designer/where_query_panel.phtml:59
+msgid "Except"
+msgstr ""
+
+#: templates/database/designer/having_query_panel.phtml:102
+#: templates/database/designer/options_panel.phtml:75
+#: templates/database/designer/options_panel.phtml:241
+#: templates/database/designer/where_query_panel.phtml:71
+msgid "subquery"
+msgstr ""
+
+#: templates/database/designer/new_relation_panel.phtml:22
+#: templates/database/designer/side_menu.phtml:84
+#: templates/database/designer/side_menu.phtml:87
+msgid "Create relation"
+msgstr ""
+
+#: templates/database/designer/options_panel.phtml:34
+#: templates/database/designer/options_panel.phtml:200
+msgid "Relation operator"
+msgstr ""
+
+#: templates/database/designer/options_panel.phtml:85
+#: templates/database/designer/rename_to_panel.phtml:23
+msgid "Rename to"
+msgstr ""
+
+#: templates/database/designer/options_panel.phtml:91
+#: templates/database/designer/rename_to_panel.phtml:31
+msgid "New name"
+msgstr ""
+
+#: templates/database/designer/page_save_as.phtml:4
+msgid "Save to selected page"
+msgstr ""
+
+#: templates/database/designer/page_save_as.phtml:5
+msgid "Create a page and save to it"
+msgstr ""
+
+#: templates/database/designer/page_save_as.phtml:26
+msgid "New page name"
+msgstr ""
+
+#: templates/database/designer/page_selector.phtml:2
+msgid "Select page"
+msgstr ""
+
+#: templates/database/designer/query_details.phtml:10
+msgid "Active options"
+msgstr ""
+
+#: templates/database/designer/schema_export.phtml:4
+msgid "Select Export Relational Type"
+msgstr ""
+
+#: templates/database/designer/side_menu.phtml:19
+#: templates/database/designer/side_menu.phtml:25
+msgid "Show/Hide tables list"
+msgstr ""
+
+#: templates/database/designer/side_menu.phtml:29
+#: templates/database/designer/side_menu.phtml:35
+#: templates/database/designer/side_menu.phtml:36
+msgid "View in fullscreen"
+msgstr ""
+
+#: templates/database/designer/side_menu.phtml:34
+msgid "Exit fullscreen"
+msgstr ""
+
+#: templates/database/designer/side_menu.phtml:41
+#: templates/database/designer/side_menu.phtml:45
+msgid "New page"
+msgstr ""
+
+#: templates/database/designer/side_menu.phtml:70
+#: templates/database/designer/side_menu.phtml:73
+msgid "Delete pages"
+msgstr ""
+
+#: templates/database/designer/side_menu.phtml:98
+#: templates/database/designer/side_menu.phtml:101
 msgid "Reload"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:107
-#: templates/designer/side_menu.phtml:110
+#: templates/database/designer/side_menu.phtml:107
+#: templates/database/designer/side_menu.phtml:110
 msgid "Help"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Angular links"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Direct links"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:122
-#: templates/designer/side_menu.phtml:124
+#: templates/database/designer/side_menu.phtml:122
+#: templates/database/designer/side_menu.phtml:124
 msgid "Snap to grid"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:128
-#: templates/designer/side_menu.phtml:134
+#: templates/database/designer/side_menu.phtml:128
+#: templates/database/designer/side_menu.phtml:134
 msgid "Small/Big All"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:138
-#: templates/designer/side_menu.phtml:141
+#: templates/database/designer/side_menu.phtml:138
+#: templates/database/designer/side_menu.phtml:141
 msgid "Toggle small/big"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:145
-#: templates/designer/side_menu.phtml:148
+#: templates/database/designer/side_menu.phtml:145
+#: templates/database/designer/side_menu.phtml:148
 msgid "Toggle relation lines"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:153
-#: templates/designer/side_menu.phtml:156
+#: templates/database/designer/side_menu.phtml:153
+#: templates/database/designer/side_menu.phtml:156
 msgid "Export schema"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:165
-#: templates/designer/side_menu.phtml:168
+#: templates/database/designer/side_menu.phtml:165
+#: templates/database/designer/side_menu.phtml:168
 msgid "Build Query"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:173
-#: templates/designer/side_menu.phtml:177
+#: templates/database/designer/side_menu.phtml:173
+#: templates/database/designer/side_menu.phtml:177
 msgid "Move Menu"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:181
-#: templates/designer/side_menu.phtml:186
+#: templates/database/designer/side_menu.phtml:181
+#: templates/database/designer/side_menu.phtml:186
 msgid "Pin text"
 msgstr ""
 
-#: templates/designer/table_list.phtml:4
+#: templates/database/designer/table_list.phtml:4
 msgid "Hide/Show all"
 msgstr ""
 
-#: templates/designer/table_list.phtml:14
+#: templates/database/designer/table_list.phtml:14
 msgid "Hide/Show Tables with no relation"
 msgstr ""
 
-#: templates/designer/table_list.phtml:59
+#: templates/database/designer/table_list.phtml:59
 msgid "Number of tables:"
 msgstr ""
 
+#: templates/database/structure/body_for_table_summary.phtml:6
+#, php-format
+msgid "%s table"
+msgid_plural "%s tables"
+msgstr[0] "%s टेबल"
+msgstr[1] "%s टेबल"
+
+#: templates/database/structure/body_for_table_summary.phtml:17
+msgid "Sum"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:6
+msgid "Check tables having overhead"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:10
+msgid "Show create"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:27
+msgid "Prefix"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:28
+msgid "Add prefix to table"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:29
+msgid "Replace table prefix"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:30
+msgid "Copy table with prefix"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:36
+msgid "Add columns to central list"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:37
+msgid "Remove columns from central list"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:38
+msgid "Make consistent with central list"
+msgstr ""
+
+#: templates/database/structure/favorite_anchor.phtml:12
+msgid "Add to Favorites"
+msgstr ""
+
+#: templates/database/structure/show_create.phtml:2
+msgid "Showing create queries"
+msgstr ""
+
+#: templates/database/structure/sortable_header.phtml:13
+msgid "Sort"
+msgstr ""
+
+#: templates/database/structure/table_header.phtml:42
+msgid ""
+"May be approximate. Click on the number to get the exact count. See "
+"[doc@faq3-11]FAQ 3.11[/doc]."
+msgstr ""
+
+#: templates/database/structure/table_header.phtml:66
+#: templates/table/index_form.phtml:127
+msgid "Size"
+msgstr "आकार"
+
+#: templates/database/structure/table_header.phtml:74
+#: templates/table/structure/display_table_stats.phtml:27
+msgid "Overhead"
+msgstr ""
+
+#: templates/database/structure/tracking_icon.phtml:4
+msgid "Tracking is active."
+msgstr ""
+
+#: templates/database/structure/tracking_icon.phtml:8
+msgid "Tracking is not active."
+msgstr ""
+
 #: templates/error/report_form.phtml:7
 msgid ""
 "phpMyAdmin has encountered an error. We have collected data about this error "
@@ -14047,59 +14156,6 @@ msgstr ""
 msgid "Please explain the steps that lead to the error:"
 msgstr ""
 
-#: templates/gis_visualization/gis_visualization.phtml:3
-msgid "Display GIS Visualization"
-msgstr ""
-
-#: templates/gis_visualization/gis_visualization.phtml:8
-msgid "Label column"
-msgstr ""
-
-#: templates/gis_visualization/gis_visualization.phtml:11
-msgid "-- None --"
-msgstr ""
-
-#: templates/gis_visualization/gis_visualization.phtml:19
-msgid "Spatial column"
-msgstr ""
-
-#: templates/index_form.phtml:16
-msgid "Index name:"
-msgstr ""
-
-#: templates/index_form.phtml:19
-msgid ""
-"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
-msgstr ""
-
-#: templates/index_form.phtml:40
-msgid "Index choice:"
-msgstr ""
-
-#: templates/index_form.phtml:57
-msgid "Key block size:"
-msgstr ""
-
-#: templates/index_form.phtml:74
-msgid "Index type:"
-msgstr ""
-
-#: templates/index_form.phtml:86
-msgid "Parser:"
-msgstr ""
-
-#: templates/index_form.phtml:102
-msgid "Comment:"
-msgstr ""
-
-#: templates/index_form.phtml:127 templates/structure/table_header.phtml:66
-msgid "Size"
-msgstr "आकार"
-
-#: templates/index_form.phtml:149 templates/index_form.phtml:190
-msgid "Drag to reorder"
-msgstr ""
-
 #: templates/prefs_autoload.phtml:9
 msgid ""
 "Your browser has phpMyAdmin configuration for this domain. Would you like to "
@@ -14110,405 +14166,372 @@ msgstr ""
 msgid "Start row:"
 msgstr ""
 
-#: templates/structure/actions_in_table_structure.phtml:14
-#, php-format
-msgid "A primary key has been added on %s."
-msgstr ""
-
-#: templates/structure/actions_in_table_structure.phtml:34
-#: templates/structure/actions_in_table_structure.phtml:54
-#: templates/structure/actions_in_table_structure.phtml:79
-#: templates/structure/actions_in_table_structure.phtml:101
-#, php-format
-msgid "An index has been added on %s."
-msgstr ""
-
-#: templates/structure/actions_in_table_structure.phtml:130
-#: templates/structure/check_all_table_column.phtml:59
-msgid "Remove from central columns"
-msgstr ""
-
-#: templates/structure/actions_in_table_structure.phtml:138
-#: templates/structure/check_all_table_column.phtml:55
-msgid "Add to central columns"
-msgstr ""
-
-#: templates/structure/add_column.phtml:7
-#, php-format
-msgid "Add %s column(s)"
-msgstr ""
-
-#: templates/structure/add_column.phtml:12
-msgid "at beginning of table"
-msgstr ""
-
-#: templates/structure/body_for_table_summary.phtml:6
-#, php-format
-msgid "%s table"
-msgid_plural "%s tables"
-msgstr[0] "%s टेबल"
-msgstr[1] "%s टेबल"
-
-#: templates/structure/body_for_table_summary.phtml:17
-msgid "Sum"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:6
-msgid "Check tables having overhead"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:10
-msgid "Show create"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:27
-msgid "Prefix"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:28
-msgid "Add prefix to table"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:29
-msgid "Replace table prefix"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:30
-msgid "Copy table with prefix"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:36
-msgid "Add columns to central list"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:37
-msgid "Remove columns from central list"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:38
-msgid "Make consistent with central list"
-msgstr ""
-
-#: templates/structure/display_structure.phtml:140 view_create.php:181
-msgid "Edit view"
-msgstr ""
-
-#: templates/structure/display_table_stats.phtml:9
-msgid "Space usage"
-msgstr ""
-
-#: templates/structure/display_table_stats.phtml:27
-#: templates/structure/table_header.phtml:74
-msgid "Overhead"
-msgstr ""
-
-#: templates/structure/display_table_stats.phtml:32
-msgid "Effective"
-msgstr ""
-
-#: templates/structure/favorite_anchor.phtml:12
-msgid "Add to Favorites"
-msgstr ""
-
-#: templates/structure/move_columns_dialog.phtml:1
-#: templates/structure/optional_action_links.phtml:21
-msgid "Move columns"
-msgstr ""
-
-#: templates/structure/move_columns_dialog.phtml:2
-msgid "Move the columns by dragging them up and down."
-msgstr ""
-
-#: templates/structure/optional_action_links.phtml:9
-msgid "Propose table structure"
-msgstr ""
-
-#: templates/structure/optional_action_links.phtml:24
-msgid "Improve table structure"
-msgstr ""
-
-#: templates/structure/optional_action_links.phtml:30
-#, fuzzy
-msgid "Track view"
-msgstr "ट्रैक तालिका"
-
-#: templates/structure/row_stats_table.phtml:3
-msgid "Row statistics"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:9
-msgid "static"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:11
-msgid "dynamic"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:22
-msgid "partitioned"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:54
-msgid "Row length"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:66
-msgid "Row size"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:73
-msgid "Next autoindex"
-msgstr ""
-
-#: templates/structure/secondary_tabs.phtml:14
-msgid "Relation view"
-msgstr ""
-
-#: templates/structure/show_create.phtml:2
-msgid "Showing create queries"
-msgstr ""
-
-#: templates/structure/sortable_header.phtml:13
-msgid "Sort"
-msgstr ""
-
-#: templates/structure/table_header.phtml:42
-msgid ""
-"May be approximate. Click on the number to get the exact count. See "
-"[doc@faq3-11]FAQ 3.11[/doc]."
-msgstr ""
-
-#: templates/structure/table_structure_row.phtml:46
-#, php-format
-msgid "Column %s has been dropped."
-msgstr ""
-
-#: templates/structure/tracking_icon.phtml:4
-msgid "Tracking is active."
-msgstr ""
-
-#: templates/structure/tracking_icon.phtml:8
-msgid "Tracking is not active."
-msgstr ""
-
-#: templates/table/create_table.phtml:15
-msgid "Number of columns"
-msgstr ""
-
-#: templates/table/options.phtml:8
-msgid "Select columns (at least one):"
-msgstr ""
-
-#: templates/table/options.phtml:37
-msgid "Add search conditions (body of the \"where\" clause):"
-msgstr ""
-
-#: templates/table/options.phtml:45
-msgid "Number of rows per page"
-msgstr ""
-
-#: templates/table/options.phtml:56
-msgid "Display order:"
-msgstr ""
-
-#: templates/table/options_zoom.phtml:6
-msgid "Use this column to label each point"
-msgstr ""
-
-#: templates/table/options_zoom.phtml:35
-msgid "Maximum rows to plot"
-msgstr ""
-
-#: templates/table/replace_preview.phtml:13
-msgid "Find and replace - preview"
-msgstr ""
-
-#: templates/table/replace_preview.phtml:18
-msgid "Original string"
-msgstr ""
-
-#: templates/table/replace_preview.phtml:19
-msgid "Replaced string"
-msgstr ""
-
-#: templates/table/replace_preview.phtml:40
-msgid "Replace"
-msgstr ""
-
-#: templates/table/rows_zoom.phtml:16
-msgid "Additional search criteria"
-msgstr ""
-
-#: templates/table/search_and_replace.phtml:3
-msgid "Replace with:"
-msgstr ""
-
-#: templates/table/search_and_replace.phtml:22
-msgid "Use regular expression"
-msgstr ""
-
-#: templates/table/selection_form.phtml:12
-msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
-msgstr ""
-
-#: templates/table/selection_form.phtml:34
-msgid "Do a \"query by example\" (wildcard: \"%\")"
-msgstr ""
-
-#: templates/table/zoom_result_form.phtml:7
-msgid "Browse/Edit the points"
-msgstr ""
-
-#: templates/table/zoom_result_form.phtml:15
-msgid "How to use"
-msgstr ""
-
-#: templates/table/zoom_result_form.phtml:23
-msgid "Reset zoom"
-msgstr ""
-
-#: templates/tbl_chart.phtml:17
+#: templates/table/chart/tbl_chart.phtml:17
 msgctxt "Chart type"
 msgid "Bar"
 msgstr ""
 
-#: templates/tbl_chart.phtml:21
+#: templates/table/chart/tbl_chart.phtml:21
 msgctxt "Chart type"
 msgid "Column"
 msgstr ""
 
-#: templates/tbl_chart.phtml:25
+#: templates/table/chart/tbl_chart.phtml:25
 msgctxt "Chart type"
 msgid "Line"
 msgstr ""
 
-#: templates/tbl_chart.phtml:29
+#: templates/table/chart/tbl_chart.phtml:29
 msgctxt "Chart type"
 msgid "Spline"
 msgstr ""
 
-#: templates/tbl_chart.phtml:33
+#: templates/table/chart/tbl_chart.phtml:33
 msgctxt "Chart type"
 msgid "Area"
 msgstr ""
 
-#: templates/tbl_chart.phtml:37
+#: templates/table/chart/tbl_chart.phtml:37
 msgctxt "Chart type"
 msgid "Pie"
 msgstr ""
 
-#: templates/tbl_chart.phtml:41
+#: templates/table/chart/tbl_chart.phtml:41
 msgctxt "Chart type"
 msgid "Timeline"
 msgstr ""
 
-#: templates/tbl_chart.phtml:45
+#: templates/table/chart/tbl_chart.phtml:45
 msgctxt "Chart type"
 msgid "Scatter"
 msgstr ""
 
-#: templates/tbl_chart.phtml:50
+#: templates/table/chart/tbl_chart.phtml:50
 msgid "Stacked"
 msgstr ""
 
-#: templates/tbl_chart.phtml:53
+#: templates/table/chart/tbl_chart.phtml:53
 msgid "Chart title"
 msgstr ""
 
-#: templates/tbl_chart.phtml:57
+#: templates/table/chart/tbl_chart.phtml:57
 msgid "X-Axis:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:72
+#: templates/table/chart/tbl_chart.phtml:72
 msgid "Series:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:102
+#: templates/table/chart/tbl_chart.phtml:102
 msgid "X-Axis label:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:104
+#: templates/table/chart/tbl_chart.phtml:104
 msgid "X Values"
 msgstr ""
 
-#: templates/tbl_chart.phtml:107
+#: templates/table/chart/tbl_chart.phtml:107
 msgid "Y-Axis label:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:115
+#: templates/table/chart/tbl_chart.phtml:115
 msgid "Series names are in a column"
 msgstr ""
 
-#: templates/tbl_chart.phtml:118
+#: templates/table/chart/tbl_chart.phtml:118
 msgid "Series column:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:130
+#: templates/table/chart/tbl_chart.phtml:130
 #, fuzzy
 #| msgid "Column"
 msgid "Value Column:"
 msgstr "स्तम्भ"
 
-#: templates/tbl_chart.phtml:150
+#: templates/table/chart/tbl_chart.phtml:150
 msgid "Save chart as image"
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:7
+#: templates/table/gis_visualization/gis_visualization.phtml:3
+msgid "Display GIS Visualization"
+msgstr ""
+
+#: templates/table/gis_visualization/gis_visualization.phtml:8
+msgid "Label column"
+msgstr ""
+
+#: templates/table/gis_visualization/gis_visualization.phtml:11
+msgid "-- None --"
+msgstr ""
+
+#: templates/table/gis_visualization/gis_visualization.phtml:19
+msgid "Spatial column"
+msgstr ""
+
+#: templates/table/index_form.phtml:16
+msgid "Index name:"
+msgstr ""
+
+#: templates/table/index_form.phtml:19
+msgid ""
+"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
+msgstr ""
+
+#: templates/table/index_form.phtml:40
+msgid "Index choice:"
+msgstr ""
+
+#: templates/table/index_form.phtml:57
+msgid "Key block size:"
+msgstr ""
+
+#: templates/table/index_form.phtml:74
+msgid "Index type:"
+msgstr ""
+
+#: templates/table/index_form.phtml:86
+msgid "Parser:"
+msgstr ""
+
+#: templates/table/index_form.phtml:102
+msgid "Comment:"
+msgstr ""
+
+#: templates/table/index_form.phtml:149 templates/table/index_form.phtml:190
+msgid "Drag to reorder"
+msgstr ""
+
+#: templates/table/relation/common_form.phtml:7
 msgid "Internal relations"
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:11
+#: templates/table/relation/common_form.phtml:11
 msgid "Internal relation"
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:14
+#: templates/table/relation/common_form.phtml:14
 msgid ""
 "An internal relation is not necessary when a corresponding FOREIGN KEY "
 "relation exists."
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:37
+#: templates/table/relation/common_form.phtml:37
 msgid "Foreign key constraints"
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:40
+#: templates/table/relation/common_form.phtml:40
 msgid "Actions"
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:41
+#: templates/table/relation/common_form.phtml:41
 msgid "Constraint properties"
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:44
+#: templates/table/relation/common_form.phtml:44
 msgid ""
 "Only columns with index will be displayed. You can define an index below."
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:49
+#: templates/table/relation/common_form.phtml:49
 msgid "Foreign key constraint"
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:81
+#: templates/table/relation/common_form.phtml:81
 msgid "+ Add constraint"
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:91
+#: templates/table/relation/common_form.phtml:91
 msgid "Choose column to display:"
 msgstr ""
 
-#: templates/tbl_relation/foreign_key_row.phtml:13
+#: templates/table/relation/foreign_key_row.phtml:13
 #, php-format
 msgid "Foreign key constraint %s has been dropped"
 msgstr ""
 
-#: templates/tbl_relation/foreign_key_row.phtml:102
+#: templates/table/relation/foreign_key_row.phtml:102
 msgid "Constraint name"
 msgstr ""
 
-#: templates/tbl_relation/foreign_key_row.phtml:157
+#: templates/table/relation/foreign_key_row.phtml:157
 msgid "+ Add column"
 msgstr ""
 
+#: templates/table/search/options.phtml:8
+msgid "Select columns (at least one):"
+msgstr ""
+
+#: templates/table/search/options.phtml:37
+msgid "Add search conditions (body of the \"where\" clause):"
+msgstr ""
+
+#: templates/table/search/options.phtml:45
+msgid "Number of rows per page"
+msgstr ""
+
+#: templates/table/search/options.phtml:56
+msgid "Display order:"
+msgstr ""
+
+#: templates/table/search/options_zoom.phtml:6
+msgid "Use this column to label each point"
+msgstr ""
+
+#: templates/table/search/options_zoom.phtml:35
+msgid "Maximum rows to plot"
+msgstr ""
+
+#: templates/table/search/replace_preview.phtml:13
+msgid "Find and replace - preview"
+msgstr ""
+
+#: templates/table/search/replace_preview.phtml:18
+msgid "Original string"
+msgstr ""
+
+#: templates/table/search/replace_preview.phtml:19
+msgid "Replaced string"
+msgstr ""
+
+#: templates/table/search/replace_preview.phtml:40
+msgid "Replace"
+msgstr ""
+
+#: templates/table/search/rows_zoom.phtml:16
+msgid "Additional search criteria"
+msgstr ""
+
+#: templates/table/search/search_and_replace.phtml:3
+msgid "Replace with:"
+msgstr ""
+
+#: templates/table/search/search_and_replace.phtml:22
+msgid "Use regular expression"
+msgstr ""
+
+#: templates/table/search/selection_form.phtml:12
+msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
+msgstr ""
+
+#: templates/table/search/selection_form.phtml:34
+msgid "Do a \"query by example\" (wildcard: \"%\")"
+msgstr ""
+
+#: templates/table/search/zoom_result_form.phtml:7
+msgid "Browse/Edit the points"
+msgstr ""
+
+#: templates/table/search/zoom_result_form.phtml:15
+msgid "How to use"
+msgstr ""
+
+#: templates/table/search/zoom_result_form.phtml:23
+msgid "Reset zoom"
+msgstr ""
+
+#: templates/table/secondary_tabs.phtml:14
+msgid "Relation view"
+msgstr ""
+
+#: templates/table/structure/actions_in_table_structure.phtml:14
+#, php-format
+msgid "A primary key has been added on %s."
+msgstr ""
+
+#: templates/table/structure/actions_in_table_structure.phtml:34
+#: templates/table/structure/actions_in_table_structure.phtml:54
+#: templates/table/structure/actions_in_table_structure.phtml:79
+#: templates/table/structure/actions_in_table_structure.phtml:101
+#, php-format
+msgid "An index has been added on %s."
+msgstr ""
+
+#: templates/table/structure/actions_in_table_structure.phtml:130
+#: templates/table/structure/check_all_table_column.phtml:59
+msgid "Remove from central columns"
+msgstr ""
+
+#: templates/table/structure/actions_in_table_structure.phtml:138
+#: templates/table/structure/check_all_table_column.phtml:55
+msgid "Add to central columns"
+msgstr ""
+
+#: templates/table/structure/add_column.phtml:7
+#, php-format
+msgid "Add %s column(s)"
+msgstr ""
+
+#: templates/table/structure/add_column.phtml:12
+msgid "at beginning of table"
+msgstr ""
+
+#: templates/table/structure/display_structure.phtml:140 view_create.php:181
+msgid "Edit view"
+msgstr ""
+
+#: templates/table/structure/display_table_stats.phtml:9
+msgid "Space usage"
+msgstr ""
+
+#: templates/table/structure/display_table_stats.phtml:32
+msgid "Effective"
+msgstr ""
+
+#: templates/table/structure/move_columns_dialog.phtml:1
+#: templates/table/structure/optional_action_links.phtml:21
+msgid "Move columns"
+msgstr ""
+
+#: templates/table/structure/move_columns_dialog.phtml:2
+msgid "Move the columns by dragging them up and down."
+msgstr ""
+
+#: templates/table/structure/optional_action_links.phtml:9
+msgid "Propose table structure"
+msgstr ""
+
+#: templates/table/structure/optional_action_links.phtml:24
+msgid "Improve table structure"
+msgstr ""
+
+#: templates/table/structure/optional_action_links.phtml:30
+#, fuzzy
+msgid "Track view"
+msgstr "ट्रैक तालिका"
+
+#: templates/table/structure/row_stats_table.phtml:3
+msgid "Row statistics"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:9
+msgid "static"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:11
+msgid "dynamic"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:22
+msgid "partitioned"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:54
+msgid "Row length"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:66
+msgid "Row size"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:73
+msgid "Next autoindex"
+msgstr ""
+
+#: templates/table/structure/table_structure_row.phtml:46
+#, php-format
+msgid "Column %s has been dropped."
+msgstr ""
+
 #: themes.php:17 themes.php:22
 msgid "Theme"
 msgstr ""
diff --git a/po/nl.po b/po/nl.po
index cd33ef4716..aa0a15fa0e 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -2,12 +2,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 4.5.0-dev\n"
-"Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
-"POT-Creation-Date: 2015-08-08 13:53-0400\n"
+"Report-Msgid-Bugs-To: developers@phpmyadmin.net\n"
+"POT-Creation-Date: 2015-08-12 08:10-0400\n"
 "PO-Revision-Date: 2015-08-10 14:38+0200\n"
 "Last-Translator: dingo thirteen <dingo13@gmail.com>\n"
-"Language-Team: Dutch "
-"<https://hosted.weblate.org/projects/phpmyadmin/master/nl/>\n"
+"Language-Team: Dutch <https://hosted.weblate.org/projects/phpmyadmin/master/"
+"nl/>\n"
 "Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -53,7 +53,7 @@ msgid "Table comments:"
 msgstr "Tabelopmerkingen:"
 
 #: db_datadict.php:104 libraries/Index.class.php:699
-#: libraries/insert_edit.lib.php:1567
+#: libraries/insert_edit.lib.php:1565
 #: libraries/navigation/Nodes/Node_Column.class.php:30
 #: libraries/plugins/export/ExportHtmlword.class.php:280
 #: libraries/plugins/export/ExportHtmlword.class.php:375
@@ -67,13 +67,14 @@ msgstr "Tabelopmerkingen:"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1023
 #: libraries/tracking.lib.php:879 libraries/tracking.lib.php:975
 #: templates/columns_definitions/column_name.phtml:18
-#: templates/index_form.phtml:124 templates/table/table_header.phtml:6
-#: templates/table/zoom_result_form.phtml:33
-#: templates/tbl_relation/common_form.phtml:10
-#: templates/tbl_relation/common_form.phtml:43
-#: templates/tbl_relation/foreign_key_row.phtml:194
-#: templates/tbl_relation/foreign_key_row.phtml:206
-#: templates/tbl_relation/internal_relational_row.phtml:71
+#: templates/table/index_form.phtml:124
+#: templates/table/relation/common_form.phtml:10
+#: templates/table/relation/common_form.phtml:43
+#: templates/table/relation/foreign_key_row.phtml:194
+#: templates/table/relation/foreign_key_row.phtml:206
+#: templates/table/relation/internal_relational_row.phtml:71
+#: templates/table/search/table_header.phtml:6
+#: templates/table/search/zoom_result_form.phtml:33
 msgid "Column"
 msgstr "Kolom"
 
@@ -91,21 +92,21 @@ msgstr "Kolom"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1001
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1024
 #: libraries/rte/rte_list.lib.php:75 libraries/rte/rte_list.lib.php:103
-#: libraries/rte/rte_routines.lib.php:802
-#: libraries/rte/rte_routines.lib.php:831
-#: libraries/rte/rte_routines.lib.php:1493
+#: libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_routines.lib.php:922
+#: libraries/rte/rte_routines.lib.php:1584
 #: libraries/server_privileges.lib.php:2369 libraries/tracking.lib.php:880
 #: libraries/tracking.lib.php:972
 #: templates/columns_definitions/table_fields_definitions.phtml:11
-#: templates/structure/table_header.phtml:48
-#: templates/structure/table_structure_header.phtml:6
-#: templates/table/table_header.phtml:7
+#: templates/database/structure/table_header.phtml:48
+#: templates/table/search/table_header.phtml:7
+#: templates/table/structure/table_structure_header.phtml:6
 msgid "Type"
 msgstr "Type"
 
 #: db_datadict.php:106 libraries/Index.class.php:702
 #: libraries/central_columns.lib.php:708
-#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1576
+#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1574
 #: libraries/plugins/export/ExportHtmlword.class.php:286
 #: libraries/plugins/export/ExportHtmlword.class.php:381
 #: libraries/plugins/export/ExportLatex.class.php:509
@@ -118,8 +119,8 @@ msgstr "Type"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1026
 #: libraries/tracking.lib.php:882 libraries/tracking.lib.php:978
 #: templates/columns_definitions/table_fields_definitions.phtml:39
-#: templates/structure/table_structure_header.phtml:9
-#: templates/table/zoom_result_form.phtml:34
+#: templates/table/search/zoom_result_form.phtml:34
+#: templates/table/structure/table_structure_header.phtml:9
 msgid "Null"
 msgstr "Leeg"
 
@@ -137,8 +138,8 @@ msgstr "Leeg"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1027
 #: libraries/replication_gui.lib.php:153 libraries/tracking.lib.php:883
 #: templates/columns_definitions/table_fields_definitions.phtml:25
-#: templates/structure/body_for_table_summary.phtml:55
-#: templates/structure/table_structure_header.phtml:10
+#: templates/database/structure/body_for_table_summary.phtml:55
+#: templates/table/structure/table_structure_header.phtml:10
 msgid "Default"
 msgstr "Standaardwaarde"
 
@@ -166,19 +167,19 @@ msgid "Comments"
 msgstr "Opmerkingen"
 
 #: db_datadict.php:146
-#: libraries/controllers/StructureController.class.php:1960
-#: libraries/controllers/StructureController.class.php:1965
+#: libraries/controllers/TableStructureController.class.php:951
+#: libraries/controllers/TableStructureController.class.php:956
 #: libraries/tracking.lib.php:922
 #: templates/columns_definitions/column_indexes.phtml:6
-#: templates/structure/check_all_table_column.phtml:22
-#: templates/structure/display_structure.phtml:74
+#: templates/table/structure/check_all_table_column.phtml:22
+#: templates/table/structure/display_structure.phtml:74
 msgid "Primary"
 msgstr "Primaire sleutel"
 
 #: db_datadict.php:156 js/messages.php:317 libraries/Index.class.php:567
 #: libraries/Index.class.php:606 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261 libraries/mult_submits.lib.php:403
+#: libraries/config/FormDisplay.tpl.php:272 libraries/mult_submits.lib.php:403
 #: libraries/mult_submits.lib.php:417
 #: libraries/plugins/export/ExportHtmlword.class.php:630
 #: libraries/plugins/export/ExportLatex.class.php:589
@@ -194,20 +195,20 @@ msgstr "Primaire sleutel"
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1010 libraries/tracking.lib.php:1015
 #: prefs_manage.php:140 templates/prefs_autoload.phtml:15
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "No"
 msgstr "Nee"
 
 #: db_datadict.php:156 js/messages.php:443 libraries/Index.class.php:568
 #: libraries/Index.class.php:605 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261
-#: libraries/controllers/StructureController.class.php:1344
-#: libraries/controllers/StructureController.class.php:2223
-#: libraries/controllers/StructureController.class.php:2232
-#: libraries/controllers/StructureController.class.php:2237
-#: libraries/controllers/StructureController.class.php:2242
-#: libraries/controllers/StructureController.class.php:2247
+#: libraries/config/FormDisplay.tpl.php:272
+#: libraries/controllers/TableStructureController.class.php:539
+#: libraries/controllers/TableStructureController.class.php:1201
+#: libraries/controllers/TableStructureController.class.php:1210
+#: libraries/controllers/TableStructureController.class.php:1215
+#: libraries/controllers/TableStructureController.class.php:1220
+#: libraries/controllers/TableStructureController.class.php:1225
 #: libraries/mult_submits.inc.php:82 libraries/mult_submits.inc.php:178
 #: libraries/mult_submits.lib.php:339 libraries/mult_submits.lib.php:372
 #: libraries/mult_submits.lib.php:401 libraries/mult_submits.lib.php:415
@@ -216,8 +217,8 @@ msgstr "Nee"
 #: libraries/plugins/export/ExportOdt.class.php:756
 #: libraries/plugins/export/ExportTexytext.class.php:567
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1077
-#: libraries/server_databases.lib.php:464
-#: libraries/server_databases.lib.php:474
+#: libraries/server_databases.lib.php:475
+#: libraries/server_databases.lib.php:485
 #: libraries/server_privileges.lib.php:2546
 #: libraries/server_privileges.lib.php:2727
 #: libraries/server_privileges.lib.php:2748
@@ -227,7 +228,7 @@ msgstr "Nee"
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1008 libraries/tracking.lib.php:1013
 #: prefs_manage.php:138 templates/prefs_autoload.phtml:14
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "Yes"
 msgstr "Ja"
 
@@ -237,7 +238,7 @@ msgstr "Bekijk export (schema) van database"
 
 #: db_export.php:37 db_tracking.php:90 export.php:382
 #: libraries/DBQbe.class.php:326
-#: libraries/controllers/StructureController.class.php:231
+#: libraries/controllers/DatabaseStructureController.class.php:170
 #: libraries/navigation/NavigationTree.class.php:897
 msgid "No tables found in database."
 msgstr "Geen tabellen gevonden in de database."
@@ -248,14 +249,14 @@ msgstr "Geen tabellen gevonden in de database."
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:26
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:120
-#: templates/structure/show_create.phtml:18
+#: templates/database/structure/show_create.phtml:18
 msgid "Tables"
 msgstr "Tabellen"
 
 #: db_export.php:52 libraries/Menu.class.php:317 libraries/Menu.class.php:425
-#: libraries/Util.class.php:3333 libraries/Util.class.php:3343
-#: libraries/Util.class.php:3349 libraries/Util.class.php:3629
-#: libraries/Util.class.php:4327 libraries/Util.class.php:4344
+#: libraries/Util.class.php:3339 libraries/Util.class.php:3349
+#: libraries/Util.class.php:3355 libraries/Util.class.php:3635
+#: libraries/Util.class.php:4333 libraries/Util.class.php:4350
 #: libraries/central_columns.lib.php:728 libraries/config.values.php:39
 #: libraries/config.values.php:47 libraries/config.values.php:109
 #: libraries/config.values.php:115 libraries/config/setup.forms.php:323
@@ -269,7 +270,7 @@ msgstr "Tabellen"
 #: libraries/navigation/Nodes/Node_Table.class.php:283
 #: libraries/server_privileges.lib.php:1141 libraries/tracking.lib.php:874
 #: templates/columns_definitions/table_fields_definitions.phtml:3
-#: templates/designer/table_list.phtml:28
+#: templates/database/designer/table_list.phtml:28
 msgid "Structure"
 msgstr "Structuur"
 
@@ -281,7 +282,7 @@ msgstr "Structuur"
 #: libraries/config/user_preferences.forms.php:292
 #: libraries/config/user_preferences.forms.php:297
 #: libraries/server_privileges.lib.php:1140
-#: templates/structure/display_table_stats.phtml:12
+#: templates/table/structure/display_table_stats.phtml:12
 msgid "Data"
 msgstr "Data"
 
@@ -354,10 +355,10 @@ msgstr "Tabellen met tracker"
 #: libraries/server_privileges.lib.php:2908
 #: libraries/server_privileges.lib.php:3145
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4346
-#: templates/structure/table_header.phtml:21
-#: templates/tbl_relation/foreign_key_row.phtml:176
-#: templates/tbl_relation/internal_relational_row.phtml:63
+#: libraries/server_privileges.lib.php:4372
+#: templates/database/structure/table_header.phtml:21
+#: templates/table/relation/foreign_key_row.phtml:176
+#: templates/table/relation/internal_relational_row.phtml:63
 msgid "Table"
 msgstr "Tabel"
 
@@ -374,7 +375,7 @@ msgid "Updated"
 msgstr "Bijgewerkt"
 
 #: db_tracking.php:130 js/messages.php:243 libraries/Menu.class.php:552
-#: libraries/Util.class.php:4314 libraries/config.values.php:104
+#: libraries/Util.class.php:4320 libraries/config.values.php:104
 #: libraries/rte/rte_events.lib.php:393 libraries/rte/rte_list.lib.php:101
 #: libraries/server_status_processes.lib.php:92 libraries/tracking.lib.php:279
 msgid "Status"
@@ -383,14 +384,15 @@ msgstr "Status"
 #: db_tracking.php:131 db_tracking.php:290 libraries/Index.class.php:693
 #: libraries/central_columns.lib.php:687 libraries/rte/rte_list.lib.php:74
 #: libraries/rte/rte_list.lib.php:89 libraries/rte/rte_list.lib.php:102
-#: libraries/server_databases.lib.php:398
+#: libraries/server_databases.lib.php:409
 #: libraries/server_privileges.lib.php:2372
 #: libraries/server_privileges.lib.php:3166
 #: libraries/server_privileges.lib.php:3342
 #: libraries/server_user_groups.lib.php:82
 #: libraries/server_variables.lib.php:189 libraries/tracking.lib.php:280
-#: libraries/tracking.lib.php:793 templates/structure/table_header.phtml:30
-#: templates/structure/table_structure_header.phtml:23
+#: libraries/tracking.lib.php:793
+#: templates/database/structure/table_header.phtml:30
+#: templates/table/structure/table_structure_header.phtml:23
 msgid "Action"
 msgstr "Actie"
 
@@ -432,7 +434,7 @@ msgid "Untracked tables"
 msgstr "Tabellen zonder tracker"
 
 #: db_tracking.php:305 db_tracking.php:336
-#: templates/structure/optional_action_links.phtml:17
+#: templates/table/structure/optional_action_links.phtml:17
 msgid "Track table"
 msgstr "Tabel tracken"
 
@@ -486,7 +488,7 @@ msgid "Value for the column \"%s\""
 msgstr "Waarde voor kolom \"%s\""
 
 #: gis_data_editor.php:146
-#: templates/gis_visualization/gis_visualization.phtml:37
+#: templates/table/gis_visualization/gis_visualization.phtml:37
 msgid "Use OpenStreetMaps as Base Layer"
 msgstr "Gebruik OpenStreetMaps als basislayer"
 
@@ -568,35 +570,35 @@ msgstr "Geometrie toevoegen"
 #: libraries/display_change_password.lib.php:162
 #: libraries/display_export.lib.php:402 libraries/display_export.lib.php:408
 #: libraries/display_import.lib.php:392 libraries/index.lib.php:44
-#: libraries/insert_edit.lib.php:1546 libraries/insert_edit.lib.php:1583
+#: libraries/insert_edit.lib.php:1544 libraries/insert_edit.lib.php:1581
 #: libraries/normalization.lib.php:165 libraries/normalization.lib.php:821
 #: libraries/operations.lib.php:38 libraries/operations.lib.php:108
 #: libraries/operations.lib.php:263 libraries/operations.lib.php:306
 #: libraries/operations.lib.php:801 libraries/operations.lib.php:874
 #: libraries/operations.lib.php:923 libraries/operations.lib.php:1337
 #: libraries/operations.lib.php:1658
-#: libraries/plugins/auth/AuthenticationCookie.class.php:244
+#: libraries/plugins/auth/AuthenticationCookie.class.php:232
 #: libraries/replication_gui.lib.php:122 libraries/replication_gui.lib.php:161
 #: libraries/replication_gui.lib.php:324 libraries/replication_gui.lib.php:461
 #: libraries/replication_gui.lib.php:906 libraries/rte/rte_events.lib.php:509
-#: libraries/rte/rte_routines.lib.php:969
-#: libraries/rte/rte_routines.lib.php:1581
+#: libraries/rte/rte_routines.lib.php:1060
+#: libraries/rte/rte_routines.lib.php:1672
 #: libraries/rte/rte_triggers.lib.php:396 libraries/server_bin_log.lib.php:61
 #: libraries/server_privileges.lib.php:705
 #: libraries/server_privileges.lib.php:2106
 #: libraries/server_privileges.lib.php:2872
 #: libraries/server_privileges.lib.php:3553
-#: libraries/server_privileges.lib.php:4627
+#: libraries/server_privileges.lib.php:4653
 #: libraries/server_user_groups.lib.php:285
 #: libraries/sql_query_form.lib.php:369 libraries/sql_query_form.lib.php:429
 #: libraries/tracking.lib.php:533 libraries/tracking.lib.php:653
 #: prefs_manage.php:277 prefs_manage.php:355
 #: templates/columns_definitions/column_definitions_form.phtml:59
-#: templates/header_location.phtml:17 templates/index_form.phtml:238
+#: templates/database/create_table.phtml:21 templates/header_location.phtml:28
 #: templates/startAndNumberOfRowsPanel.phtml:14
-#: templates/structure/add_column.phtml:25
-#: templates/table/create_table.phtml:21
-#: templates/table/selection_form.phtml:75 view_create.php:275
+#: templates/table/index_form.phtml:238
+#: templates/table/search/selection_form.phtml:75
+#: templates/table/structure/add_column.phtml:25 view_create.php:275
 #: view_operations.php:106
 msgid "Go"
 msgstr "Starten"
@@ -691,7 +693,7 @@ msgid "Could not load import plugins, please check your installation!"
 msgstr ""
 "De importeer-plugins konden niet worden geladen, controleer de installatie!"
 
-#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1466
+#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1460
 #, php-format
 msgid "Bookmark %s has been created."
 msgstr "Bladwijzer %s is aangemaakt."
@@ -730,11 +732,11 @@ msgstr "Voortgang van de import kon niet worden ingelezen."
 msgid "Back"
 msgstr "Terug"
 
-#: index.php:148 libraries/Footer.class.php:70
+#: index.php:149 libraries/Footer.class.php:70
 msgid "phpMyAdmin Demo Server"
 msgstr "phpMyAdmin-demo-server"
 
-#: index.php:152
+#: index.php:153
 #, php-format
 msgid ""
 "You are using the demo server. You can do anything here, but please do not "
@@ -744,110 +746,110 @@ msgstr ""
 "U gebruikt de demoserver. U kunt alles doen, maar wijzigt u de root, debian-"
 "sys-maint en pma-gebruikers niet. Meer informatie is beschikbaar op %s."
 
-#: index.php:162
+#: index.php:163
 msgid "General Settings"
 msgstr "Algemene instellingen"
 
-#: index.php:190 libraries/display_change_password.lib.php:50
+#: index.php:191 libraries/display_change_password.lib.php:50
 #: libraries/display_change_password.lib.php:53 user_password.php:247
 msgid "Change password"
 msgstr "Wachtwoord wijzigen"
 
-#: index.php:206
+#: index.php:207
 msgid "Server connection collation"
 msgstr "Collatie van de serververbinding"
 
-#: index.php:228
+#: index.php:229
 msgid "Appearance Settings"
 msgstr "Opmaakinstellingen"
 
-#: index.php:258 prefs_manage.php:285
+#: index.php:259 prefs_manage.php:285
 msgid "More settings"
 msgstr "Overige instellingen"
 
-#: index.php:279
+#: index.php:280
 msgid "Database server"
 msgstr "Databaseserver"
 
-#: index.php:282 libraries/plugins/auth/AuthenticationCookie.class.php:181
+#: index.php:283 libraries/plugins/auth/AuthenticationCookie.class.php:169
 msgid "Server:"
 msgstr "Server:"
 
-#: index.php:286
+#: index.php:287
 msgid "Server type:"
 msgstr "Servertype:"
 
-#: index.php:290 libraries/plugins/export/ExportLatex.class.php:212
+#: index.php:291 libraries/plugins/export/ExportLatex.class.php:212
 #: libraries/plugins/export/ExportSql.class.php:687
 #: libraries/plugins/export/ExportXml.class.php:189
 msgid "Server version:"
 msgstr "Serverversie:"
 
-#: index.php:296
+#: index.php:297
 msgid "Protocol version:"
 msgstr "Protocolversie:"
 
-#: index.php:300
+#: index.php:301
 msgid "User:"
 msgstr "Gebruiker:"
 
-#: index.php:305
+#: index.php:306
 msgid "Server charset:"
 msgstr "Karakterset van server:"
 
-#: index.php:320
+#: index.php:321
 msgid "Web server"
 msgstr "Webserver"
 
-#: index.php:331
+#: index.php:332
 msgid "Database client version:"
 msgstr "Clientversie van database:"
 
-#: index.php:335
+#: index.php:336
 msgid "PHP extension:"
 msgstr "PHP-uitbreiding:"
 
-#: index.php:349
+#: index.php:350
 msgid "PHP version:"
 msgstr "PHP-versie:"
 
-#: index.php:360
+#: index.php:361
 msgid "Show PHP information"
 msgstr "Informatie over PHP weergeven"
 
-#: index.php:383
+#: index.php:384
 msgid "Version information:"
 msgstr "Versie-informatie:"
 
-#: index.php:392 libraries/Util.class.php:432 libraries/Util.class.php:495
-#: libraries/config/FormDisplay.tpl.php:151
+#: index.php:393 libraries/Util.class.php:432 libraries/Util.class.php:495
+#: libraries/config/FormDisplay.tpl.php:162
 #: libraries/display_export.lib.php:577 libraries/engines/pbxt.lib.php:162
 #: libraries/navigation/NavigationHeader.class.php:196
 #: libraries/server_variables.lib.php:160
 msgid "Documentation"
 msgstr "Documentatie"
 
-#: index.php:399
+#: index.php:400
 msgid "Wiki"
 msgstr "Wiki"
 
-#: index.php:408
+#: index.php:409
 msgid "Official Homepage"
 msgstr "Officiële phpMyAdmin-website"
 
-#: index.php:415
+#: index.php:416
 msgid "Contribute"
 msgstr "Bijdragen"
 
-#: index.php:422
+#: index.php:423
 msgid "Get support"
 msgstr "Ondersteuning krijgen"
 
-#: index.php:429
+#: index.php:430
 msgid "List of changes"
 msgstr "Lijst met wijzigingen"
 
-#: index.php:451
+#: index.php:452
 msgid ""
 "You are connected as 'root' with no password, which corresponds to the "
 "default MySQL privileged account. Your MySQL server is running with this "
@@ -859,7 +861,7 @@ msgstr ""
 "is open voor ongewilde toegang. U moet dit beveiligingslek echt dichten door "
 "een wachtwoord in te stellen voor gebruiker 'root'."
 
-#: index.php:468
+#: index.php:469
 msgid ""
 "You have enabled mbstring.func_overload in your PHP configuration. This "
 "option is incompatible with phpMyAdmin and might cause some data to be "
@@ -869,7 +871,7 @@ msgstr ""
 "optie is incompatibel met phpMyAdmin en kan ervoor zorgen dat sommige "
 "gegevens corrupt raken!"
 
-#: index.php:483
+#: index.php:484
 msgid ""
 "The mbstring PHP extension was not found and you seem to be using a "
 "multibyte charset. Without the mbstring extension phpMyAdmin is unable to "
@@ -879,7 +881,7 @@ msgstr ""
 "karakterset te gebruiken. Zonder de uitbreiding mbstring kan phpMyAdmin "
 "strings niet correct splitsen, wat tot onverwachte resultaten kan leiden."
 
-#: index.php:500
+#: index.php:501
 msgid ""
 "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini."
 "session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower than "
@@ -891,7 +893,7 @@ msgstr ""
 "ingestelde cookie validatie in phpMyAdmin. Hierdoor verloopt uw sessie "
 "eerder dan in phpMyAdmin is ingesteld."
 
-#: index.php:519
+#: index.php:520
 msgid ""
 "Login cookie store is lower than cookie validity configured in phpMyAdmin, "
 "because of this, your login will expire sooner than configured in phpMyAdmin."
@@ -900,13 +902,13 @@ msgstr ""
 "dan die instelling in phpMyAdmin. Hierdoor verloopt uw sessie eerder dan in "
 "phpMyAdmin is ingesteld."
 
-#: index.php:535
+#: index.php:536
 msgid "The configuration file now needs a secret passphrase (blowfish_secret)."
 msgstr ""
 "Het configuratiebestand heeft nu een geheime wachtwoordzin nodig "
 "(blowfish_secret)."
 
-#: index.php:548
+#: index.php:549
 msgid ""
 "Directory [code]config[/code], which is used by the setup script, still "
 "exists in your phpMyAdmin directory. It is strongly recommended to remove it "
@@ -919,7 +921,7 @@ msgstr ""
 "aangetast worden omdat ongepriviligieerde personen uw configuratie kunnen "
 "downloaden."
 
-#: index.php:564
+#: index.php:565
 #, php-format
 msgid ""
 "The phpMyAdmin configuration storage is not completely configured, some "
@@ -928,14 +930,14 @@ msgstr ""
 "De configuratie-opslag van phpMyAdmin is niet volledig ingesteld, sommige "
 "uitgebreide mogelijkheden zijn uitgeschakeld. %sOntdek waarom%s. "
 
-#: index.php:571
+#: index.php:572
 msgid ""
 "Or alternately go to 'Operations' tab of any database to set it up there."
 msgstr ""
 "Of als alternatief ga naar de tab 'Handelingen' van een database en stel het "
 "daar in."
 
-#: index.php:620
+#: index.php:621
 #, php-format
 msgid ""
 "Your PHP MySQL library version %s differs from your MySQL server version %s. "
@@ -944,7 +946,7 @@ msgstr ""
 "Uw MySQL-bibliotheekversie %s in PHP verschilt van uw MySQL-serverversie %s. "
 "Dit kan onvoorspelbaar gedrag veroorzaken."
 
-#: index.php:648
+#: index.php:649
 #, php-format
 msgid ""
 "Server running with Suhosin. Please refer to %sdocumentation%s for possible "
@@ -1106,8 +1108,8 @@ msgstr ""
 msgid "Save & Close"
 msgstr "Opslaan & sluiten"
 
-#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:404
-#: libraries/insert_edit.lib.php:1550 prefs_manage.php:361
+#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:415
+#: libraries/insert_edit.lib.php:1548 prefs_manage.php:361
 #: prefs_manage.php:372
 msgid "Reset"
 msgstr "Herstellen"
@@ -1140,7 +1142,7 @@ msgstr "Index toevoegen"
 msgid "Edit Index"
 msgstr "Index bewerken"
 
-#: js/messages.php:99 templates/index_form.phtml:232
+#: js/messages.php:99 templates/table/index_form.phtml:232
 #, php-format
 msgid "Add %s column(s) to index"
 msgstr "Voeg %s kolom(men) toe aan index"
@@ -1161,13 +1163,14 @@ msgstr "Samenstellen met:"
 msgid "Please select column(s) for the index."
 msgstr "Gelieve de kolom(men) voor de index te selecteren."
 
-#: js/messages.php:106 templates/structure/add_column.phtml:1
+#: js/messages.php:106 templates/table/structure/add_column.phtml:1
 msgid "You have to add at least one column."
 msgstr "U moet minstens één kolom toevoegen."
 
-#: js/messages.php:109 libraries/insert_edit.lib.php:1548
+#: js/messages.php:109 libraries/insert_edit.lib.php:1546
 #: templates/columns_definitions/column_definitions_form.phtml:162
-#: templates/index_form.phtml:237 templates/tbl_relation/common_form.phtml:106
+#: templates/table/index_form.phtml:237
+#: templates/table/relation/common_form.phtml:106
 msgid "Preview SQL"
 msgstr "SQL voorbeeld"
 
@@ -1184,7 +1187,7 @@ msgid "SQL query:"
 msgstr "SQL-query:"
 
 #. l10n: Default label for the y-Axis of Charts
-#: js/messages.php:118 templates/tbl_chart.phtml:109
+#: js/messages.php:118 templates/table/chart/tbl_chart.phtml:109
 msgid "Y Values"
 msgstr "Y-waarden"
 
@@ -1340,7 +1343,7 @@ msgstr "Doorgestuurde bytes"
 msgid "Bytes received"
 msgstr "Ontvangen bytes"
 
-#: js/messages.php:169 libraries/server_status.lib.php:226
+#: js/messages.php:169 libraries/server_status.lib.php:235
 msgid "Connections"
 msgstr "Verbindingen"
 
@@ -1397,12 +1400,12 @@ msgstr "%d tabel(len)"
 msgid "Questions"
 msgstr "Questions"
 
-#: js/messages.php:184 libraries/server_status.lib.php:134
+#: js/messages.php:184 libraries/server_status.lib.php:143
 msgid "Traffic"
 msgstr "Verkeer"
 
 #: js/messages.php:185 libraries/Menu.class.php:586
-#: libraries/Util.class.php:4318 libraries/server_status_monitor.lib.php:257
+#: libraries/Util.class.php:4324 libraries/server_status_monitor.lib.php:257
 msgid "Settings"
 msgstr "Instellingen"
 
@@ -1422,8 +1425,9 @@ msgstr "Voeg tenminste één variabele toe aan de reeks!"
 #: libraries/server_status_monitor.lib.php:236
 #: libraries/server_status_processes.lib.php:308
 #: templates/columns_definitions/transformation.phtml:4
-#: templates/designer/options_panel.phtml:178
-#: templates/table/options_zoom.phtml:12 templates/table/rows_zoom.phtml:26
+#: templates/database/designer/options_panel.phtml:178
+#: templates/table/search/options_zoom.phtml:12
+#: templates/table/search/rows_zoom.phtml:26
 msgid "None"
 msgstr "Geen"
 
@@ -1714,8 +1718,8 @@ msgstr ""
 
 #: js/messages.php:270 libraries/Menu.class.php:352
 #: libraries/Menu.class.php:455 libraries/Menu.class.php:582
-#: libraries/Util.class.php:4317 libraries/Util.class.php:4332
-#: libraries/Util.class.php:4349 libraries/config/messages.inc.php:258
+#: libraries/Util.class.php:4323 libraries/Util.class.php:4338
+#: libraries/Util.class.php:4355 libraries/config/messages.inc.php:258
 #: libraries/display_import.lib.php:105
 #: libraries/server_status_monitor.lib.php:318 prefs_manage.php:238
 #: setup/frames/menu.inc.php:26
@@ -1775,13 +1779,13 @@ msgid "Formatting SQL..."
 msgstr "Aanmaken SQL..."
 
 #: js/messages.php:293 libraries/server_variables.lib.php:157
-#: templates/designer/aggregate_query_panel.phtml:63
-#: templates/designer/delete_relation_panel.phtml:28
-#: templates/designer/having_query_panel.phtml:117
-#: templates/designer/new_relation_panel.phtml:88
-#: templates/designer/options_panel.phtml:253
-#: templates/designer/rename_to_panel.phtml:45
-#: templates/designer/where_query_panel.phtml:83
+#: templates/database/designer/aggregate_query_panel.phtml:63
+#: templates/database/designer/delete_relation_panel.phtml:28
+#: templates/database/designer/having_query_panel.phtml:117
+#: templates/database/designer/new_relation_panel.phtml:88
+#: templates/database/designer/options_panel.phtml:253
+#: templates/database/designer/rename_to_panel.phtml:45
+#: templates/database/designer/where_query_panel.phtml:83
 msgid "Cancel"
 msgstr "Annuleren"
 
@@ -1789,7 +1793,7 @@ msgstr "Annuleren"
 msgid "Page-related settings"
 msgstr "Pagina gerelateerde instellingen"
 
-#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:402
+#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:413
 msgid "Apply"
 msgstr "Toepassen"
 
@@ -1824,8 +1828,8 @@ msgstr "Foutcode: %s"
 msgid "Error text: %s"
 msgstr "Foutomschrijving: %s"
 
-#: js/messages.php:307 libraries/db_common.inc.php:68
-#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:450
+#: js/messages.php:307 libraries/db_common.inc.php:69
+#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:461
 msgid "No databases selected."
 msgstr "Er zijn geen databases geselecteerd."
 
@@ -1837,12 +1841,13 @@ msgstr "Kolom komt te vervallen"
 msgid "Adding Primary Key"
 msgstr "Primaire sleutel wordt toegevoegd"
 
-#: js/messages.php:310 templates/designer/aggregate_query_panel.phtml:59
-#: templates/designer/having_query_panel.phtml:113
-#: templates/designer/new_relation_panel.phtml:87
-#: templates/designer/options_panel.phtml:252
-#: templates/designer/rename_to_panel.phtml:41
-#: templates/designer/where_query_panel.phtml:82
+#: js/messages.php:310
+#: templates/database/designer/aggregate_query_panel.phtml:59
+#: templates/database/designer/having_query_panel.phtml:113
+#: templates/database/designer/new_relation_panel.phtml:87
+#: templates/database/designer/options_panel.phtml:252
+#: templates/database/designer/rename_to_panel.phtml:41
+#: templates/database/designer/where_query_panel.phtml:82
 msgid "OK"
 msgstr "Correct"
 
@@ -1862,7 +1867,7 @@ msgstr "Database kopiëren"
 msgid "Changing Charset"
 msgstr "Karakterset aanpassen"
 
-#: js/messages.php:320 libraries/Util.class.php:3217
+#: js/messages.php:320 libraries/Util.class.php:3223
 msgid "Enable foreign key checks"
 msgstr "Controle op externe sleutelvelden inschakelen"
 
@@ -1898,20 +1903,21 @@ msgstr ""
 #: js/messages.php:334 libraries/DisplayResults.class.php:4834
 #: libraries/DisplayResults.class.php:5092 libraries/Menu.class.php:344
 #: libraries/Menu.class.php:446 libraries/Menu.class.php:578
-#: libraries/Util.class.php:3636 libraries/Util.class.php:3637
-#: libraries/Util.class.php:4316 libraries/Util.class.php:4331
-#: libraries/Util.class.php:4348 libraries/config/messages.inc.php:252
+#: libraries/Util.class.php:3642 libraries/Util.class.php:3643
+#: libraries/Util.class.php:4322 libraries/Util.class.php:4337
+#: libraries/Util.class.php:4354 libraries/config/messages.inc.php:252
 #: libraries/display_export.lib.php:173 libraries/rte/rte_list.lib.php:146
 #: libraries/server_privileges.lib.php:2211
 #: libraries/server_privileges.lib.php:2290
 #: libraries/server_privileges.lib.php:2632
 #: libraries/server_privileges.lib.php:3356
 #: libraries/server_status_monitor.lib.php:322 prefs_manage.php:303
-#: setup/frames/menu.inc.php:27 templates/structure/check_all_tables.phtml:11
+#: setup/frames/menu.inc.php:27
+#: templates/database/structure/check_all_tables.phtml:11
 msgid "Export"
 msgstr "Exporteren"
 
-#: js/messages.php:337 libraries/rte/rte_routines.lib.php:652
+#: js/messages.php:337 libraries/rte/rte_routines.lib.php:743
 msgid "ENUM/SET editor"
 msgstr "ENUM/SET-editor"
 
@@ -1952,7 +1958,7 @@ msgstr "SQL-queryveld tonen"
 #: libraries/Console.class.php:214 libraries/DisplayResults.class.php:3474
 #: libraries/DisplayResults.class.php:4818 libraries/Index.class.php:723
 #: libraries/Util.class.php:706 libraries/Util.class.php:1202
-#: libraries/Util.class.php:3634 libraries/Util.class.php:3635
+#: libraries/Util.class.php:3640 libraries/Util.class.php:3641
 #: libraries/central_columns.lib.php:851
 #: libraries/central_columns.lib.php:1193
 #: libraries/config/messages.inc.php:892
@@ -1970,7 +1976,7 @@ msgstr "Wijzigen"
 #: libraries/server_user_groups.lib.php:129
 #: libraries/sql_query_form.lib.php:416 libraries/tracking.lib.php:477
 #: setup/frames/index.inc.php:183 setup/frames/index.inc.php:291
-#: templates/designer/delete_relation_panel.phtml:27
+#: templates/database/designer/delete_relation_panel.phtml:27
 msgid "Delete"
 msgstr "Verwijderen"
 
@@ -2142,11 +2148,11 @@ msgid "No dependencies selected!"
 msgstr "Er zijn geen afhankelijkheden geselecteerd!"
 
 #: js/messages.php:394 libraries/central_columns.lib.php:1214
-#: libraries/insert_edit.lib.php:1458 libraries/server_variables.lib.php:155
+#: libraries/insert_edit.lib.php:1456 libraries/server_variables.lib.php:155
 #: setup/frames/config.inc.php:42 setup/frames/index.inc.php:279
 #: templates/columns_definitions/column_definitions_form.phtml:165
-#: templates/gis_visualization/gis_visualization.phtml:48
-#: templates/tbl_relation/common_form.phtml:107
+#: templates/table/gis_visualization/gis_visualization.phtml:48
+#: templates/table/relation/common_form.phtml:107
 msgid "Save"
 msgstr "Opslaan"
 
@@ -2227,8 +2233,8 @@ msgid "Data point content"
 msgstr "Inhoud gegevenspunt"
 
 #: js/messages.php:430 js/messages.php:562 js/messages.php:579
-#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2573
-#: templates/index_form.phtml:154 templates/index_form.phtml:194
+#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2571
+#: templates/table/index_form.phtml:154 templates/table/index_form.phtml:194
 msgid "Ignore"
 msgstr "Negeren"
 
@@ -2291,8 +2297,8 @@ msgstr "Selecteer vreemde sleutel"
 msgid "Please select the primary key or a unique key!"
 msgstr "Selecteer de primaire sleutel of een unieke sleutel!"
 
-#: js/messages.php:457 templates/designer/side_menu.phtml:91
-#: templates/designer/side_menu.phtml:94
+#: js/messages.php:457 templates/database/designer/side_menu.phtml:91
+#: templates/database/designer/side_menu.phtml:94
 msgid "Choose column to display"
 msgstr "Kies weer te geven kolom"
 
@@ -2308,18 +2314,18 @@ msgstr ""
 msgid "Page name"
 msgstr "Paginanaam"
 
-#: js/messages.php:463 templates/designer/side_menu.phtml:56
-#: templates/designer/side_menu.phtml:59
+#: js/messages.php:463 templates/database/designer/side_menu.phtml:56
+#: templates/database/designer/side_menu.phtml:59
 msgid "Save page"
 msgstr "Pagina opslaan"
 
-#: js/messages.php:464 templates/designer/side_menu.phtml:63
-#: templates/designer/side_menu.phtml:66
+#: js/messages.php:464 templates/database/designer/side_menu.phtml:63
+#: templates/database/designer/side_menu.phtml:66
 msgid "Save page as"
 msgstr "Pagina opslaan als"
 
-#: js/messages.php:465 templates/designer/side_menu.phtml:49
-#: templates/designer/side_menu.phtml:52
+#: js/messages.php:465 templates/database/designer/side_menu.phtml:49
+#: templates/database/designer/side_menu.phtml:52
 msgid "Open page"
 msgstr "Pagina openen"
 
@@ -2327,7 +2333,7 @@ msgstr "Pagina openen"
 msgid "Delete page"
 msgstr "Pagina verwijderen"
 
-#: js/messages.php:467 templates/designer/side_menu.phtml:10
+#: js/messages.php:467 templates/database/designer/side_menu.phtml:10
 msgid "Untitled"
 msgstr "Naamloos"
 
@@ -2450,7 +2456,7 @@ msgstr "Oorspronkelijke lengte"
 msgid "cancel"
 msgstr "annuleren"
 
-#: js/messages.php:499 libraries/server_status.lib.php:271
+#: js/messages.php:499 libraries/server_status.lib.php:280
 msgid "Aborted"
 msgstr "Afgehaakte"
 
@@ -3021,7 +3027,7 @@ msgstr "Vul a.u.b.een geldige waarde in HEX in"
 
 #: js/messages.php:793 libraries/Message.class.php:199
 #: libraries/Util.class.php:654 libraries/core.lib.php:245
-#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1172
+#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1170
 #: tbl_operations.php:229 view_operations.php:63
 msgid "Error"
 msgstr "Fout"
@@ -3082,8 +3088,8 @@ msgstr "per seconde"
 msgid "per minute"
 msgstr "per minuut"
 
-#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:143
-#: libraries/server_status.lib.php:228
+#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:152
+#: libraries/server_status.lib.php:237
 #: libraries/server_status_queries.lib.php:98
 msgid "per hour"
 msgstr "per uur"
@@ -3103,7 +3109,7 @@ msgstr ""
 "Verkeerde rechten ingesteld op het configuratiebestand, dit mag niet "
 "leesbaar zijn voor iedereen!"
 
-#: libraries/Config.class.php:1799
+#: libraries/Config.class.php:1801
 msgid "Font size"
 msgstr "Lettertypegrootte"
 
@@ -3131,10 +3137,10 @@ msgstr "Query opnieuw uitvoeren"
 #: libraries/server_privileges.lib.php:2890
 #: libraries/server_privileges.lib.php:3144
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4332
+#: libraries/server_privileges.lib.php:4358
 #: libraries/server_status_processes.lib.php:80
-#: templates/tbl_relation/foreign_key_row.phtml:165
-#: templates/tbl_relation/internal_relational_row.phtml:55
+#: templates/table/relation/foreign_key_row.phtml:165
+#: templates/table/relation/internal_relational_row.phtml:55
 msgid "Database"
 msgstr "Database"
 
@@ -3227,11 +3233,11 @@ msgstr "Geschiedenis"
 #: libraries/plugins/import/ImportMediawiki.class.php:60
 #: libraries/plugins/import/ImportOds.class.php:59
 #: libraries/plugins/import/ImportShp.class.php:57
-#: libraries/plugins/import/ImportSql.class.php:148
+#: libraries/plugins/import/ImportSql.class.php:51
 #: libraries/plugins/import/ImportXml.class.php:58
-#: libraries/rte/rte_routines.lib.php:833 templates/index_form.phtml:49
-#: templates/structure/row_stats_table.phtml:20
-#: templates/table/options.phtml:2
+#: libraries/rte/rte_routines.lib.php:924 templates/table/index_form.phtml:49
+#: templates/table/search/options.phtml:2
+#: templates/table/structure/row_stats_table.phtml:20
 msgid "Options"
 msgstr "Opties"
 
@@ -3264,7 +3270,8 @@ msgstr "aflopend"
 msgid "Order:"
 msgstr "Volgorde:"
 
-#: libraries/Console.class.php:289 templates/table/replace_preview.phtml:17
+#: libraries/Console.class.php:289
+#: templates/table/search/replace_preview.phtml:17
 msgid "Count"
 msgstr "Aantal"
 
@@ -3361,9 +3368,9 @@ msgstr "Wissel naar donker thema"
 #: libraries/operations.lib.php:794 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:191
-#: templates/structure/sortable_header.phtml:21
-#: templates/structure/sortable_header.phtml:38
-#: templates/table/options.phtml:68
+#: templates/database/structure/sortable_header.phtml:21
+#: templates/database/structure/sortable_header.phtml:38
+#: templates/table/search/options.phtml:68
 msgid "Ascending"
 msgstr "Oplopend"
 
@@ -3373,13 +3380,14 @@ msgstr "Oplopend"
 #: libraries/operations.lib.php:797 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:188
-#: templates/structure/sortable_header.phtml:26
-#: templates/structure/sortable_header.phtml:43
-#: templates/table/options.phtml:69
+#: templates/database/structure/sortable_header.phtml:26
+#: templates/database/structure/sortable_header.phtml:43
+#: templates/table/search/options.phtml:69
 msgid "Descending"
 msgstr "Aflopend"
 
-#: libraries/DBQbe.class.php:467 templates/table/search_and_replace.phtml:6
+#: libraries/DBQbe.class.php:467
+#: templates/table/search/search_and_replace.phtml:6
 msgid "Column:"
 msgstr "Kolom:"
 
@@ -3537,12 +3545,12 @@ msgstr[0] "%1$s overeenkomst in <strong>%2$s</strong>"
 msgstr[1] "%1$s overeenkomsten in <strong>%2$s</strong>"
 
 #: libraries/DbSearch.class.php:354 libraries/Menu.class.php:311
-#: libraries/Util.class.php:3337 libraries/Util.class.php:3347
-#: libraries/Util.class.php:3623 libraries/Util.class.php:3624
-#: libraries/Util.class.php:4343 libraries/config.values.php:43
+#: libraries/Util.class.php:3343 libraries/Util.class.php:3353
+#: libraries/Util.class.php:3629 libraries/Util.class.php:3630
+#: libraries/Util.class.php:4349 libraries/config.values.php:43
 #: libraries/config.values.php:51 libraries/config.values.php:119
 #: libraries/navigation/Nodes/Node_Table.class.php:295
-#: templates/structure/check_all_table_column.phtml:5
+#: templates/table/structure/check_all_table_column.phtml:5
 msgid "Browse"
 msgstr "Verkennen"
 
@@ -3559,7 +3567,8 @@ msgstr "Zoeken in de database"
 msgid "Words or values to search for (wildcard: \"%\"):"
 msgstr "Woorden of waarden waarnaar gezocht moet worden (wildcard: \"%\"):"
 
-#: libraries/DbSearch.class.php:401 templates/table/search_and_replace.phtml:1
+#: libraries/DbSearch.class.php:401
+#: templates/table/search/search_and_replace.phtml:1
 msgid "Find:"
 msgstr "Zoek:"
 
@@ -3603,28 +3612,28 @@ msgstr "Filter rijen"
 msgid "Search this table"
 msgstr "Zoek in deze tabel"
 
-#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2532
-#: libraries/Util.class.php:2535
+#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2538
+#: libraries/Util.class.php:2541
 msgctxt "First page"
 msgid "Begin"
 msgstr "Begin"
 
-#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2533
-#: libraries/Util.class.php:2536 libraries/server_bin_log.lib.php:170
+#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2539
+#: libraries/Util.class.php:2542 libraries/server_bin_log.lib.php:170
 #: libraries/server_bin_log.lib.php:172
 msgctxt "Previous page"
 msgid "Previous"
 msgstr "Vorige"
 
-#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2564
-#: libraries/Util.class.php:2574 libraries/server_bin_log.lib.php:204
+#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2570
+#: libraries/Util.class.php:2580 libraries/server_bin_log.lib.php:204
 #: libraries/server_bin_log.lib.php:206
 msgctxt "Next page"
 msgid "Next"
 msgstr "Volgende"
 
-#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2565
-#: libraries/Util.class.php:2575
+#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2571
+#: libraries/Util.class.php:2581
 msgctxt "Last page"
 msgid "End"
 msgstr "Einde"
@@ -3658,7 +3667,6 @@ msgid "Relational key"
 msgstr "Relationele sleutel"
 
 #: libraries/DisplayResults.class.php:1744
-#| msgid "Display foreign key relationships"
 msgid "Display column for relations"
 msgstr "Toon kolom voor relaties"
 
@@ -3698,15 +3706,15 @@ msgid "May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]."
 msgstr "Bij benadering. Zie [doc@faq3-11]FAQ 3.11[/doc]."
 
 #: libraries/DisplayResults.class.php:4332 libraries/Message.class.php:180
-#: libraries/controllers/TableRelationController.class.php:258
+#: libraries/controllers/TableRelationController.class.php:259
 #: libraries/controllers/TableSearchController.class.php:655
-#: libraries/rte/rte_routines.lib.php:1332 libraries/sql_query_form.lib.php:89
+#: libraries/rte/rte_routines.lib.php:1423 libraries/sql_query_form.lib.php:89
 #: tbl_operations.php:227 tbl_row_action.php:138 view_operations.php:62
 msgid "Your SQL query has been executed successfully."
 msgstr "Uw SQL-query is succesvol uitgevoerd."
 
 #: libraries/DisplayResults.class.php:4660
-#: libraries/controllers/StructureController.class.php:629
+#: libraries/controllers/DatabaseStructureController.class.php:564
 #, php-format
 msgid ""
 "This view has at least this number of rows. Please refer to %sdocumentation"
@@ -3729,33 +3737,33 @@ msgstr "%1$d in totaal, %2$d in de query"
 msgid "%d total"
 msgstr "%d totaal"
 
-#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1318
+#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1312
 #, php-format
 msgid "Query took %01.4f seconds."
 msgstr "Query duurde %01.4f seconden."
 
 #: libraries/DisplayResults.class.php:4807
-#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4767
-#: libraries/Util.class.php:4773 libraries/mult_submits.inc.php:50
-#: templates/structure/check_all_tables.phtml:2
-#: templates/structure/check_all_tables.phtml:9
+#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4773
+#: libraries/Util.class.php:4779 libraries/mult_submits.inc.php:50
+#: templates/database/structure/check_all_tables.phtml:2
+#: templates/database/structure/check_all_tables.phtml:9
 msgid "With selected:"
 msgstr "Met geselecteerd:"
 
 #: libraries/DisplayResults.class.php:4811
-#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4769
-#: libraries/Util.class.php:4770 libraries/server_privileges.lib.php:1174
+#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4775
+#: libraries/Util.class.php:4776 libraries/server_privileges.lib.php:1174
 #: libraries/server_privileges.lib.php:1175
 #: libraries/server_privileges.lib.php:1387
 #: libraries/server_user_groups.lib.php:231
-#: templates/structure/check_all_tables.phtml:3
-#: templates/structure/check_all_tables.phtml:4
+#: templates/database/structure/check_all_tables.phtml:3
+#: templates/database/structure/check_all_tables.phtml:4
 msgid "Check All"
 msgstr "Selecteer alles"
 
 #: libraries/DisplayResults.class.php:4985 libraries/Header.class.php:383
-#: templates/structure/optional_action_links.phtml:1
-#: templates/structure/print_view_data_dictionary_link.phtml:3
+#: templates/database/structure/print_view_data_dictionary_link.phtml:3
+#: templates/table/structure/optional_action_links.phtml:1
 msgid "Print view"
 msgstr "Afdrukken"
 
@@ -3763,7 +3771,8 @@ msgstr "Afdrukken"
 msgid "Query results operations"
 msgstr "Handelingen voor queryresultaat"
 
-#: libraries/DisplayResults.class.php:5105 templates/tbl_chart.phtml:12
+#: libraries/DisplayResults.class.php:5105
+#: templates/table/chart/tbl_chart.phtml:12
 msgid "Display chart"
 msgstr "Grafiek weergeven"
 
@@ -3836,7 +3845,6 @@ msgid "Error while moving uploaded file."
 msgstr "Fout bij het verplaatsen van het geüploade bestand."
 
 #: libraries/File.class.php:487
-#| msgid "Cannot read (moved) upload file."
 msgid "Cannot read uploaded file."
 msgstr "Kan het geüploade bestand niet lezen."
 
@@ -3859,7 +3867,7 @@ msgid "Click on the bar to scroll to top of page"
 msgstr "Klik op de balk om te scrollen naar het begin van de pagina"
 
 #: libraries/Header.class.php:749
-#: libraries/plugins/auth/AuthenticationCookie.class.php:152
+#: libraries/plugins/auth/AuthenticationCookie.class.php:140
 msgid "Javascript must be enabled past this point!"
 msgstr "Javascript moet ingeschakeld zijn voorbij dit punt!"
 
@@ -3881,11 +3889,11 @@ msgid "Keyname"
 msgstr "Sleutelnaam"
 
 #: libraries/Index.class.php:697
-#: libraries/controllers/StructureController.class.php:1962
-#: libraries/controllers/StructureController.class.php:1967
+#: libraries/controllers/TableStructureController.class.php:953
+#: libraries/controllers/TableStructureController.class.php:958
 #: libraries/tracking.lib.php:973
 #: templates/columns_definitions/column_indexes.phtml:11
-#: templates/structure/check_all_table_column.phtml:26
+#: templates/table/structure/check_all_table_column.phtml:26
 msgid "Unique"
 msgstr "Unieke waarde"
 
@@ -3904,16 +3912,17 @@ msgstr "Kardinaliteit"
 #: libraries/server_collations.lib.php:35 libraries/tracking.lib.php:881
 #: libraries/tracking.lib.php:977
 #: templates/columns_definitions/table_fields_definitions.phtml:33
-#: templates/structure/row_stats_table.phtml:31
-#: templates/structure/table_header.phtml:55
-#: templates/structure/table_structure_header.phtml:7
-#: templates/table/table_header.phtml:8
+#: templates/database/structure/table_header.phtml:55
+#: templates/table/search/table_header.phtml:8
+#: templates/table/structure/row_stats_table.phtml:31
+#: templates/table/structure/table_structure_header.phtml:7
 msgid "Collation"
 msgstr "Collatie"
 
 #: libraries/Index.class.php:703 libraries/rte/rte_events.lib.php:496
-#: libraries/rte/rte_routines.lib.php:956 libraries/tracking.lib.php:885
-#: libraries/tracking.lib.php:979 templates/structure/table_header.phtml:84
+#: libraries/rte/rte_routines.lib.php:1047 libraries/tracking.lib.php:885
+#: libraries/tracking.lib.php:979
+#: templates/database/structure/table_header.phtml:84
 msgid "Comment"
 msgstr "Opmerking"
 
@@ -3926,15 +3935,15 @@ msgstr "De primaire sleutel werd verwijderd."
 msgid "Index %s has been dropped."
 msgstr "Index %s is verwijderd."
 
-#: libraries/Index.class.php:757 libraries/Util.class.php:3630
-#: libraries/Util.class.php:3631
-#: libraries/controllers/StructureController.class.php:1958
-#: libraries/controllers/StructureController.class.php:1959
+#: libraries/Index.class.php:757 libraries/Util.class.php:3636
+#: libraries/Util.class.php:3637
+#: libraries/controllers/TableStructureController.class.php:949
+#: libraries/controllers/TableStructureController.class.php:950
 #: libraries/operations.lib.php:1607 libraries/rte/rte_list.lib.php:150
 #: libraries/server_databases.lib.php:146
-#: templates/structure/check_all_table_column.phtml:15
-#: templates/structure/check_all_tables.phtml:16
-#: templates/tbl_relation/foreign_key_row.phtml:93
+#: templates/database/structure/check_all_tables.phtml:16
+#: templates/table/relation/foreign_key_row.phtml:93
+#: templates/table/structure/check_all_table_column.phtml:15
 msgid "Drop"
 msgstr "Verwijderen"
 
@@ -3967,16 +3976,16 @@ msgstr "Server"
 #: libraries/Menu.class.php:248
 #: libraries/navigation/Nodes/Node_View.class.php:32
 #: libraries/tbl_info.inc.php:63
-#: templates/structure/structure_table_row.phtml:97
-#: templates/structure/structure_table_row.phtml:159
+#: templates/database/structure/structure_table_row.phtml:97
+#: templates/database/structure/structure_table_row.phtml:159
 msgid "View"
 msgstr "View"
 
 #: libraries/Menu.class.php:325 libraries/Menu.class.php:429
-#: libraries/Menu.class.php:548 libraries/Util.class.php:3334
-#: libraries/Util.class.php:3344 libraries/Util.class.php:3350
-#: libraries/Util.class.php:4313 libraries/Util.class.php:4328
-#: libraries/Util.class.php:4345 libraries/config.values.php:40
+#: libraries/Menu.class.php:548 libraries/Util.class.php:3340
+#: libraries/Util.class.php:3350 libraries/Util.class.php:3356
+#: libraries/Util.class.php:4319 libraries/Util.class.php:4334
+#: libraries/Util.class.php:4351 libraries/config.values.php:40
 #: libraries/config.values.php:48 libraries/config.values.php:110
 #: libraries/config.values.php:116 libraries/config/messages.inc.php:321
 #: libraries/navigation/Nodes/Node_Table.class.php:292
@@ -3984,19 +3993,19 @@ msgid "SQL"
 msgstr "SQL"
 
 #: libraries/Menu.class.php:328 libraries/Menu.class.php:432
-#: libraries/Util.class.php:3335 libraries/Util.class.php:3345
-#: libraries/Util.class.php:3351 libraries/Util.class.php:3625
-#: libraries/Util.class.php:3626 libraries/Util.class.php:4329
-#: libraries/Util.class.php:4346 libraries/config.values.php:41
+#: libraries/Util.class.php:3341 libraries/Util.class.php:3351
+#: libraries/Util.class.php:3357 libraries/Util.class.php:3631
+#: libraries/Util.class.php:3632 libraries/Util.class.php:4335
+#: libraries/Util.class.php:4352 libraries/config.values.php:41
 #: libraries/config.values.php:49 libraries/config.values.php:111
 #: libraries/config.values.php:117
 #: libraries/navigation/Nodes/Node_Table.class.php:286
 msgid "Search"
 msgstr "Zoeken"
 
-#: libraries/Menu.class.php:338 libraries/Util.class.php:3336
-#: libraries/Util.class.php:3346 libraries/Util.class.php:3627
-#: libraries/Util.class.php:3628 libraries/Util.class.php:4347
+#: libraries/Menu.class.php:338 libraries/Util.class.php:3342
+#: libraries/Util.class.php:3352 libraries/Util.class.php:3633
+#: libraries/Util.class.php:3634 libraries/Util.class.php:4353
 #: libraries/config.values.php:42 libraries/config.values.php:50
 #: libraries/config.values.php:118
 #: libraries/navigation/Nodes/Node_Table.class.php:289
@@ -4005,30 +4014,30 @@ msgid "Insert"
 msgstr "Invoegen"
 
 #: libraries/Menu.class.php:362 libraries/Menu.class.php:467
-#: libraries/Util.class.php:4334 libraries/Util.class.php:4350
+#: libraries/Util.class.php:4340 libraries/Util.class.php:4356
 #: libraries/config.values.php:106 libraries/server_common.lib.php:51
 #: libraries/server_privileges.lib.php:2370
 #: libraries/server_privileges.lib.php:3158
-#: libraries/server_privileges.lib.php:4221
+#: libraries/server_privileges.lib.php:4247
 msgid "Privileges"
 msgstr "Rechten"
 
 #: libraries/Menu.class.php:371 libraries/Menu.class.php:379
-#: libraries/Menu.class.php:459 libraries/Util.class.php:3338
-#: libraries/Util.class.php:3352 libraries/Util.class.php:4333
-#: libraries/Util.class.php:4351 libraries/config.values.php:112
+#: libraries/Menu.class.php:459 libraries/Util.class.php:3344
+#: libraries/Util.class.php:3358 libraries/Util.class.php:4339
+#: libraries/Util.class.php:4357 libraries/config.values.php:112
 #: view_operations.php:92
 msgid "Operations"
 msgstr "Handelingen"
 
 #: libraries/Menu.class.php:384 libraries/Menu.class.php:492
-#: libraries/Util.class.php:4338 libraries/Util.class.php:4352
+#: libraries/Util.class.php:4344 libraries/Util.class.php:4358
 #: libraries/relation.lib.php:255
 msgid "Tracking"
 msgstr "Traceren"
 
 #: libraries/Menu.class.php:397 libraries/Menu.class.php:486
-#: libraries/Util.class.php:4337 libraries/Util.class.php:4353
+#: libraries/Util.class.php:4343 libraries/Util.class.php:4359
 #: libraries/navigation/Nodes/Node_Trigger_Container.class.php:24
 #: libraries/plugins/export/ExportHtmlword.class.php:557
 #: libraries/plugins/export/ExportOdt.class.php:685
@@ -4045,16 +4054,16 @@ msgstr "Triggers"
 msgid "Database seems to be empty!"
 msgstr "Database lijkt leeg te zijn!"
 
-#: libraries/Menu.class.php:439 libraries/Util.class.php:4330
+#: libraries/Menu.class.php:439 libraries/Util.class.php:4336
 msgid "Query"
 msgstr "Query opbouwen"
 
-#: libraries/Menu.class.php:472 libraries/Util.class.php:4335
+#: libraries/Menu.class.php:472 libraries/Util.class.php:4341
 #: libraries/rte/rte_words.lib.php:36
 msgid "Routines"
 msgstr "Routines"
 
-#: libraries/Menu.class.php:479 libraries/Util.class.php:4336
+#: libraries/Menu.class.php:479 libraries/Util.class.php:4342
 #: libraries/navigation/Nodes/Node_Event_Container.class.php:26
 #: libraries/plugins/export/ExportSql.class.php:940
 #: libraries/plugins/export/ExportXml.class.php:107
@@ -4062,20 +4071,20 @@ msgstr "Routines"
 msgid "Events"
 msgstr "Gebeurtenissen"
 
-#: libraries/Menu.class.php:498 libraries/Util.class.php:4339
+#: libraries/Menu.class.php:498 libraries/Util.class.php:4345
 msgid "Designer"
 msgstr "Ontwerper"
 
-#: libraries/Menu.class.php:507 libraries/Util.class.php:4340
-#: templates/structure/check_all_tables.phtml:35
+#: libraries/Menu.class.php:507 libraries/Util.class.php:4346
+#: templates/database/structure/check_all_tables.phtml:35
 msgid "Central columns"
 msgstr "Centrale kolommen"
 
-#: libraries/Menu.class.php:544 libraries/Util.class.php:4312
+#: libraries/Menu.class.php:544 libraries/Util.class.php:4318
 #: libraries/config.values.php:103 libraries/config/messages.inc.php:266
 #: libraries/config/messages.inc.php:341
 #: libraries/navigation/NavigationTree.class.php:1239
-#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4332
+#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4358
 msgid "Databases"
 msgstr "Databases"
 
@@ -4084,34 +4093,34 @@ msgid "User accounts"
 msgstr "Gebruikersaccounts"
 
 #: libraries/Menu.class.php:595 libraries/ServerStatusData.class.php:121
-#: libraries/Util.class.php:4319 libraries/server_common.lib.php:36
+#: libraries/Util.class.php:4325 libraries/server_common.lib.php:36
 msgid "Binary log"
 msgstr "Binaire log"
 
 #: libraries/Menu.class.php:601 libraries/ServerStatusData.class.php:126
-#: libraries/Util.class.php:4320 libraries/server_common.lib.php:42
-#: templates/structure/body_for_table_summary.phtml:10
-#: templates/structure/table_header.phtml:27
+#: libraries/Util.class.php:4326 libraries/server_common.lib.php:42
+#: templates/database/structure/body_for_table_summary.phtml:10
+#: templates/database/structure/table_header.phtml:27
 msgid "Replication"
 msgstr "Replicatie"
 
 #: libraries/Menu.class.php:606 libraries/ServerStatusData.class.php:193
-#: libraries/Util.class.php:4321 libraries/config.values.php:105
+#: libraries/Util.class.php:4327 libraries/config.values.php:105
 #: libraries/server_engines.lib.php:108 libraries/server_engines.lib.php:112
 #: libraries/sql_query_form.lib.php:421
 msgid "Variables"
 msgstr "Variabelen"
 
-#: libraries/Menu.class.php:610 libraries/Util.class.php:4322
+#: libraries/Menu.class.php:610 libraries/Util.class.php:4328
 msgid "Charsets"
 msgstr "Karaktersets"
 
-#: libraries/Menu.class.php:615 libraries/Util.class.php:4323
+#: libraries/Menu.class.php:615 libraries/Util.class.php:4329
 #: libraries/server_common.lib.php:33 libraries/server_plugins.lib.php:27
 msgid "Plugins"
 msgstr "Plug-ins"
 
-#: libraries/Menu.class.php:626 libraries/Util.class.php:4324
+#: libraries/Menu.class.php:626 libraries/Util.class.php:4330
 msgid "Engines"
 msgstr "Engines"
 
@@ -4136,7 +4145,7 @@ msgid_plural "%1$d rows inserted."
 msgstr[0] "%1$d rij toegevoegd."
 msgstr[1] "%1$d rijen toegevoegd."
 
-#: libraries/PDF.class.php:70 libraries/Util.class.php:2521
+#: libraries/PDF.class.php:70 libraries/Util.class.php:2527
 #: libraries/browse_foreigners.lib.php:327
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:865
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:890
@@ -4157,7 +4166,7 @@ msgid "Could not save favorite table!"
 msgstr "Favoriete tabel kon niet opgeslagen worden!"
 
 #: libraries/RecentFavoriteTable.class.php:212
-#: templates/structure/favorite_anchor.phtml:12
+#: templates/database/structure/favorite_anchor.phtml:12
 msgid "Remove from Favorites"
 msgstr "Verwijderen uit favorieten"
 
@@ -4324,7 +4333,7 @@ msgstr ""
 "engine."
 
 #: libraries/StorageEngine.class.php:373
-#: templates/structure/body_for_table_summary.phtml:50
+#: templates/database/structure/body_for_table_summary.phtml:50
 #, php-format
 msgid "%s is the default storage engine on this MySQL server."
 msgstr "%s is de standaard storage engine op deze MySQL-server."
@@ -4812,10 +4821,10 @@ msgstr "%d fouten werden gevonden tijdens de analyse."
 
 #: libraries/Util.class.php:726 libraries/rte/rte_events.lib.php:110
 #: libraries/rte/rte_events.lib.php:119 libraries/rte/rte_events.lib.php:150
-#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:153
-#: libraries/rte/rte_routines.lib.php:162
-#: libraries/rte/rte_routines.lib.php:235
-#: libraries/rte/rte_routines.lib.php:1366
+#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:223
+#: libraries/rte/rte_routines.lib.php:250
+#: libraries/rte/rte_routines.lib.php:372
+#: libraries/rte/rte_routines.lib.php:1457
 #: libraries/rte/rte_triggers.lib.php:86 libraries/rte/rte_triggers.lib.php:95
 #: libraries/rte/rte_triggers.lib.php:127
 msgid "MySQL said: "
@@ -4859,75 +4868,78 @@ msgstr "zo"
 msgid "%B %d, %Y at %I:%M %p"
 msgstr "%d %B %Y om %H:%M"
 
-#: libraries/Util.class.php:2019
+#: libraries/Util.class.php:2025
 #, php-format
 msgid "%s days, %s hours, %s minutes and %s seconds"
 msgstr "%s dagen, %s uren, %s minuten en %s seconden"
 
-#: libraries/Util.class.php:2112
+#: libraries/Util.class.php:2118
 msgid "Missing parameter:"
 msgstr "Ontbrekende parameter:"
 
-#: libraries/Util.class.php:2645
+#: libraries/Util.class.php:2651
 #, php-format
 msgid "Jump to database \"%s\"."
 msgstr "Ga naar database \"%s\"."
 
-#: libraries/Util.class.php:2670
+#: libraries/Util.class.php:2676
 #, php-format
 msgid "The %s functionality is affected by a known bug, see %s"
 msgstr "De %s functionaliteit heeft last van een bekend probleem, zie %s"
 
-#: libraries/Util.class.php:2881
+#: libraries/Util.class.php:2887
 msgid "Click to toggle"
 msgstr "Klik om te wisselen"
 
-#: libraries/Util.class.php:3542 prefs_manage.php:248
+#: libraries/Util.class.php:3548 prefs_manage.php:248
 msgid "Browse your computer:"
 msgstr "Blader op uw eigen pc:"
 
-#: libraries/Util.class.php:3567
+#: libraries/Util.class.php:3573
 #, php-format
 msgid "Select from the web server upload directory <b>%s</b>:"
 msgstr "Selecteer uit de webserver uploadmap <b>%s</b>:"
 
-#: libraries/Util.class.php:3596 libraries/insert_edit.lib.php:1173
+#: libraries/Util.class.php:3602 libraries/insert_edit.lib.php:1171
 msgid "The directory you set for upload work cannot be reached."
 msgstr "De map die u heeft ingesteld om te uploaden kan niet worden bereikt."
 
-#: libraries/Util.class.php:3607
+#: libraries/Util.class.php:3613
 msgid "There are no files to upload!"
 msgstr "Er zijn geen bestanden om te uploaden!"
 
-#: libraries/Util.class.php:3632 libraries/Util.class.php:3633
-#: templates/structure/check_all_tables.phtml:15
+#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: templates/database/structure/check_all_tables.phtml:15
 msgid "Empty"
 msgstr "Legen"
 
-#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: libraries/Util.class.php:3644 libraries/Util.class.php:3645
 msgid "Execute"
 msgstr "Uitvoeren"
 
-#: libraries/Util.class.php:4152
+#: libraries/Util.class.php:4158
 msgid "Print"
 msgstr "Afdrukken"
 
-#: libraries/Util.class.php:4257 templates/structure/row_stats_table.phtml:80
-#: templates/structure/table_header.phtml:95
+#: libraries/Util.class.php:4263
+#: templates/database/structure/table_header.phtml:95
+#: templates/table/structure/row_stats_table.phtml:80
 msgid "Creation"
 msgstr "Gecreëerd"
 
-#: libraries/Util.class.php:4263 templates/structure/row_stats_table.phtml:87
-#: templates/structure/table_header.phtml:106
+#: libraries/Util.class.php:4269
+#: templates/database/structure/table_header.phtml:106
+#: templates/table/structure/row_stats_table.phtml:87
 msgid "Last update"
 msgstr "Laatst bijgewerkt"
 
-#: libraries/Util.class.php:4269 templates/structure/row_stats_table.phtml:94
-#: templates/structure/table_header.phtml:117
+#: libraries/Util.class.php:4275
+#: templates/database/structure/table_header.phtml:117
+#: templates/table/structure/row_stats_table.phtml:94
 msgid "Last check"
 msgstr "Laatst gecontroleerd"
 
-#: libraries/Util.class.php:4315
+#: libraries/Util.class.php:4321
 msgid "Users"
 msgstr "Gebruikers"
 
@@ -4948,16 +4960,16 @@ msgid "Use this value"
 msgstr "Gebruik deze waarde"
 
 #: libraries/build_html_for_db.lib.php:33 libraries/import.lib.php:193
-#: templates/structure/actions_in_table_structure.phtml:113
-#: templates/structure/row_stats_table.phtml:42
-#: templates/structure/table_header.phtml:36
+#: templates/database/structure/table_header.phtml:36
+#: templates/table/structure/actions_in_table_structure.phtml:113
+#: templates/table/structure/row_stats_table.phtml:42
 msgid "Rows"
 msgstr "Rijen"
 
 #: libraries/build_html_for_db.lib.php:48 libraries/engines/innodb.lib.php:171
-#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:186
-#: libraries/server_status.lib.php:298
-#: templates/structure/display_table_stats.phtml:40
+#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:195
+#: libraries/server_status.lib.php:307
+#: templates/table/structure/display_table_stats.phtml:40
 msgid "Total"
 msgstr "Totaal"
 
@@ -4966,10 +4978,12 @@ msgid "Jump to database"
 msgstr "Ga naar database"
 
 #: libraries/build_html_for_db.lib.php:146
+#: templates/database/structure/structure_table_row.phtml:15
 msgid "Not replicated"
 msgstr "Niet gerepliceerd"
 
 #: libraries/build_html_for_db.lib.php:158
+#: templates/database/structure/structure_table_row.phtml:16
 msgid "Replicated"
 msgstr "Gerepliceerd"
 
@@ -5026,17 +5040,17 @@ msgstr "NEE"
 #: libraries/plugins/export/ExportTexytext.class.php:425
 #: libraries/plugins/export/PMA_ExportPdf.class.php:307
 #: libraries/rte/rte_list.lib.php:73 libraries/rte/rte_list.lib.php:85
-#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:830
-#: libraries/rte/rte_routines.lib.php:1492 setup/frames/index.inc.php:162
+#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:921
+#: libraries/rte/rte_routines.lib.php:1583 setup/frames/index.inc.php:162
 #: templates/columns_definitions/table_fields_definitions.phtml:8
-#: templates/structure/table_structure_header.phtml:5
-#: templates/table/create_table.phtml:11
+#: templates/database/create_table.phtml:11
+#: templates/table/structure/table_structure_header.phtml:5
 msgid "Name"
 msgstr "Naam"
 
 #: libraries/central_columns.lib.php:699
 #: libraries/central_columns.lib.php:1381
-#: libraries/rte/rte_routines.lib.php:832
+#: libraries/rte/rte_routines.lib.php:923
 #: templates/columns_definitions/table_fields_definitions.phtml:14
 msgid "Length/Values"
 msgstr "Lengte/Waarden"
@@ -5055,7 +5069,7 @@ msgid "Select a table"
 msgstr "Selecteer een tabel"
 
 #: libraries/central_columns.lib.php:804
-#: templates/structure/add_column.phtml:4
+#: templates/table/structure/add_column.phtml:4
 msgid "Add column"
 msgstr "Kolom toevoegen"
 
@@ -5071,7 +5085,7 @@ msgstr "Nieuwe kolom toevoegen"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1002
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1025
 #: templates/columns_definitions/table_fields_definitions.phtml:36
-#: templates/structure/table_structure_header.phtml:8
+#: templates/table/structure/table_structure_header.phtml:8
 msgid "Attributes"
 msgstr "Attributen"
 
@@ -5189,7 +5203,7 @@ msgid "Double click"
 msgstr "Dubbelklik"
 
 #: libraries/config.values.php:95 libraries/config.values.php:124
-#: libraries/config/FormDisplay.tpl.php:221 libraries/relation.lib.php:97
+#: libraries/config/FormDisplay.tpl.php:232 libraries/relation.lib.php:97
 #: libraries/relation.lib.php:105
 msgid "Disabled"
 msgstr "Uitgeschakeld"
@@ -5359,23 +5373,23 @@ msgstr "Gecomprimeerd exporteren is niet mogelijk omdat functie %s ontbreekt."
 msgid "maximum %s"
 msgstr "maximum %s"
 
-#: libraries/config/FormDisplay.tpl.php:219
+#: libraries/config/FormDisplay.tpl.php:230
 msgid "This setting is disabled, it will not be applied to your configuration."
 msgstr ""
 "Deze instelling is uitgeschakeld, het is niet van toepassing op uw "
 "configuratie."
 
-#: libraries/config/FormDisplay.tpl.php:313
+#: libraries/config/FormDisplay.tpl.php:324
 #, php-format
 msgid "Set value: %s"
 msgstr "Waarde instellen op: %s"
 
-#: libraries/config/FormDisplay.tpl.php:318
+#: libraries/config/FormDisplay.tpl.php:329
 #: libraries/config/messages.inc.php:610
 msgid "Restore default value"
 msgstr "Standaard waarde herstellen"
 
-#: libraries/config/FormDisplay.tpl.php:332
+#: libraries/config/FormDisplay.tpl.php:343
 msgid "Allow users to customize this value"
 msgstr "Gebruikers toestaan deze waarde aan te passen"
 
@@ -5877,7 +5891,7 @@ msgstr "Karakterset voor het bestand"
 
 #: libraries/config/messages.inc.php:136 libraries/config/messages.inc.php:152
 #: libraries/sql_query_form.lib.php:247
-#: templates/structure/row_stats_table.phtml:7
+#: templates/table/structure/row_stats_table.phtml:7
 msgid "Format"
 msgstr "Opmaak"
 
@@ -6392,7 +6406,7 @@ msgstr ""
 
 #: libraries/config/messages.inc.php:332
 #: libraries/plugins/export/ExportPdf.class.php:279
-#: templates/structure/secondary_tabs.phtml:8
+#: templates/table/secondary_tabs.phtml:8
 msgid "Table structure"
 msgstr "Tabelstructuur"
 
@@ -8095,101 +8109,33 @@ msgstr "Microsoft Word 2000"
 msgid "OpenDocument Text"
 msgstr "OpenDocument Tekst"
 
-#: libraries/controllers/StructureController.class.php:465
+#: libraries/controllers/DatabaseStructureController.class.php:405
 #: tbl_operations.php:382
 #, php-format
 msgid "Table %s has been emptied."
 msgstr "Tabel %s is leeggemaakt."
 
-#: libraries/controllers/StructureController.class.php:486
+#: libraries/controllers/DatabaseStructureController.class.php:426
 #: tbl_operations.php:400 view_operations.php:119
 #, php-format
 msgid "View %s has been dropped."
 msgstr "View %s werd verwijderd."
 
-#: libraries/controllers/StructureController.class.php:487
+#: libraries/controllers/DatabaseStructureController.class.php:427
 #: tbl_operations.php:401
 #, php-format
 msgid "Table %s has been dropped."
 msgstr "Tabel %s werd verwijderd."
 
-#: libraries/controllers/StructureController.class.php:797
-#, php-format
-msgid "The name '%s' is a MySQL reserved keyword."
-msgid_plural "The names '%s' are MySQL reserved keywords."
-msgstr[0] "De naam '%s' is een gereserveerd MySQL sleutelwoord."
-msgstr[1] "De namen '%s' zijn gereserveerde MySQL sleutelwoorden."
-
-#: libraries/controllers/StructureController.class.php:875
-msgid "No column selected."
-msgstr "Geen kolom geselecteerd."
-
-#: libraries/controllers/StructureController.class.php:1049
+#: libraries/controllers/DatabaseStructureController.class.php:733
 msgid "Favorite List is full!"
 msgstr "De lijst met favorieten is vol!"
 
-#: libraries/controllers/StructureController.class.php:1272
-msgid "The columns have been moved successfully."
-msgstr "De geselecteerde kolommen zijn met succes verplaatst."
-
-#: libraries/controllers/StructureController.class.php:1535
-#, php-format
-msgid ""
-"Table %1$s has been altered successfully. Privileges have been adjusted."
-msgstr "Tabel %1$s is succesvol bijgewerkt. Rechten zijn aangepast."
-
-#: libraries/controllers/StructureController.class.php:1541
-#: libraries/controllers/TableIndexesController.class.php:161
-#: tbl_addfield.php:92
-#, php-format
-msgid "Table %1$s has been altered successfully."
-msgstr "Tabel %1$s is succesvol bijgewerkt."
-
-#: libraries/controllers/StructureController.class.php:1588
-#: libraries/tracking.lib.php:1094
-msgid "Query error"
-msgstr "Fout in query"
-
-#: libraries/controllers/StructureController.class.php:1806
+#: libraries/controllers/DatabaseStructureController.class.php:947
 #: libraries/mysql_charsets.lib.php:366 libraries/mysql_charsets.lib.php:373
 msgid "unknown"
 msgstr "onbekend"
 
-#: libraries/controllers/StructureController.class.php:1957
-#: templates/structure/check_all_table_column.phtml:11
-msgid "Change"
-msgstr "Veranderen"
-
-#: libraries/controllers/StructureController.class.php:1961
-#: libraries/controllers/StructureController.class.php:1966
-#: libraries/navigation/Nodes/Node_Index.class.php:30
-#: libraries/tracking.lib.php:926
-#: templates/columns_definitions/column_indexes.phtml:16
-#: templates/columns_definitions/table_fields_definitions.phtml:57
-#: templates/structure/check_all_table_column.phtml:30
-#: templates/structure/display_structure.phtml:79
-#: templates/structure/display_table_stats.phtml:19
-msgid "Index"
-msgstr "Index"
-
-#: libraries/controllers/StructureController.class.php:1963
-#: libraries/controllers/StructureController.class.php:1968
-#: templates/columns_definitions/column_indexes.phtml:27
-#: templates/structure/check_all_table_column.phtml:37
-msgid "Spatial"
-msgstr "Ruimtelijk"
-
-#: libraries/controllers/StructureController.class.php:1964
-#: libraries/controllers/StructureController.class.php:1969
-#: templates/columns_definitions/column_indexes.phtml:22
-#: templates/structure/check_all_table_column.phtml:47
-msgid "Fulltext"
-msgstr "Volledige tekst"
-
-#: libraries/controllers/StructureController.class.php:1970
-msgid "Distinct values"
-msgstr "Onderscheidbare waarden"
-
 #: libraries/controllers/TableChartController.class.php:82
 #: libraries/controllers/TableGisVisualizationController.class.php:101
 msgid "No SQL query was set to fetch data."
@@ -8204,11 +8150,18 @@ msgstr ""
 msgid "No data to display"
 msgstr "Geen gegevens om weer te geven"
 
-#: libraries/controllers/TableRelationController.class.php:217
+#: libraries/controllers/TableIndexesController.class.php:161
+#: libraries/controllers/TableStructureController.class.php:736
+#: tbl_addfield.php:92
+#, php-format
+msgid "Table %1$s has been altered successfully."
+msgstr "Tabel %1$s is succesvol bijgewerkt."
+
+#: libraries/controllers/TableRelationController.class.php:218
 msgid "Display column was successfully updated."
 msgstr "De weergavekolom is succesvol bijgewerkt."
 
-#: libraries/controllers/TableRelationController.class.php:283
+#: libraries/controllers/TableRelationController.class.php:288
 msgid "Internal relations were successfully updated."
 msgstr "Interne relaties werden succesvol bijgewerkt."
 
@@ -8221,10 +8174,71 @@ msgid "Zoom search"
 msgstr "Zoeken door in te zoomen"
 
 #: libraries/controllers/TableSearchController.class.php:852
-#: templates/table/selection_form.phtml:59
+#: templates/table/search/selection_form.phtml:59
 msgid "Find and replace"
 msgstr "Zoek en vervang"
 
+#: libraries/controllers/TableStructureController.class.php:163
+#, php-format
+msgid "The name '%s' is a MySQL reserved keyword."
+msgid_plural "The names '%s' are MySQL reserved keywords."
+msgstr[0] "De naam '%s' is een gereserveerd MySQL sleutelwoord."
+msgstr[1] "De namen '%s' zijn gereserveerde MySQL sleutelwoorden."
+
+#: libraries/controllers/TableStructureController.class.php:241
+msgid "No column selected."
+msgstr "Geen kolom geselecteerd."
+
+#: libraries/controllers/TableStructureController.class.php:467
+msgid "The columns have been moved successfully."
+msgstr "De geselecteerde kolommen zijn met succes verplaatst."
+
+#: libraries/controllers/TableStructureController.class.php:730
+#, php-format
+msgid ""
+"Table %1$s has been altered successfully. Privileges have been adjusted."
+msgstr "Tabel %1$s is succesvol bijgewerkt. Rechten zijn aangepast."
+
+#: libraries/controllers/TableStructureController.class.php:783
+#: libraries/tracking.lib.php:1094
+msgid "Query error"
+msgstr "Fout in query"
+
+#: libraries/controllers/TableStructureController.class.php:948
+#: templates/table/structure/check_all_table_column.phtml:11
+msgid "Change"
+msgstr "Veranderen"
+
+#: libraries/controllers/TableStructureController.class.php:952
+#: libraries/controllers/TableStructureController.class.php:957
+#: libraries/navigation/Nodes/Node_Index.class.php:30
+#: libraries/tracking.lib.php:926
+#: templates/columns_definitions/column_indexes.phtml:16
+#: templates/columns_definitions/table_fields_definitions.phtml:57
+#: templates/table/structure/check_all_table_column.phtml:30
+#: templates/table/structure/display_structure.phtml:79
+#: templates/table/structure/display_table_stats.phtml:19
+msgid "Index"
+msgstr "Index"
+
+#: libraries/controllers/TableStructureController.class.php:954
+#: libraries/controllers/TableStructureController.class.php:959
+#: templates/columns_definitions/column_indexes.phtml:27
+#: templates/table/structure/check_all_table_column.phtml:37
+msgid "Spatial"
+msgstr "Ruimtelijk"
+
+#: libraries/controllers/TableStructureController.class.php:955
+#: libraries/controllers/TableStructureController.class.php:960
+#: templates/columns_definitions/column_indexes.phtml:22
+#: templates/table/structure/check_all_table_column.phtml:47
+msgid "Fulltext"
+msgstr "Volledige tekst"
+
+#: libraries/controllers/TableStructureController.class.php:963
+msgid "Distinct values"
+msgstr "Onderscheidbare waarden"
+
 #: libraries/core.lib.php:306
 #, php-format
 msgid "The %s extension is missing. Please check your PHP configuration."
@@ -8273,7 +8287,7 @@ msgid "No Password"
 msgstr "Geen wachtwoord"
 
 #: libraries/display_change_password.lib.php:68
-#: libraries/plugins/auth/AuthenticationCookie.class.php:199
+#: libraries/plugins/auth/AuthenticationCookie.class.php:187
 #: libraries/replication_gui.lib.php:422 libraries/replication_gui.lib.php:862
 #: libraries/server_privileges.lib.php:1640
 msgid "Password:"
@@ -8293,13 +8307,11 @@ msgstr "Wachtwoord-hashing:"
 
 #: libraries/display_change_password.lib.php:96
 #: libraries/server_privileges.lib.php:1700
-#| msgid "mysql_native_password"
 msgid "MySQL native password"
 msgstr "MySQL wachtwoord"
 
 #: libraries/display_change_password.lib.php:110
 #: libraries/server_privileges.lib.php:1706
-#| msgid "sha256_password"
 msgid "SHA256 password"
 msgstr "SHA256 wachtwoord"
 
@@ -9077,12 +9089,12 @@ msgid "Dump has been saved to file %s."
 msgstr "Het exportbestand is bewaard als %s."
 
 #: libraries/import.lib.php:202 libraries/insert_edit.lib.php:124
-#: libraries/rte/rte_routines.lib.php:1353 libraries/sql.lib.php:1312
+#: libraries/rte/rte_routines.lib.php:1444 libraries/sql.lib.php:1306
 #: tbl_get_field.php:44
 msgid "MySQL returned an empty result set (i.e. zero rows)."
 msgstr "MySQL gaf een lege resultatenset terug (0 rijen)."
 
-#: libraries/import.lib.php:265 libraries/sql.lib.php:1326
+#: libraries/import.lib.php:265 libraries/sql.lib.php:1320
 msgid "[ROLLBACK occurred.]"
 msgstr "[ROLLBACK is uitgevoerd]"
 
@@ -9150,14 +9162,14 @@ msgstr "Een index aanmaken op kolommen&nbsp;%s&nbsp;"
 
 #: libraries/insert_edit.lib.php:233
 #: libraries/navigation/Nodes/Node_DatabaseChild.class.php:48
-#: templates/designer/table_list.phtml:40
+#: templates/database/designer/table_list.phtml:40
 msgid "Hide"
 msgstr "Verbergen"
 
 #: libraries/insert_edit.lib.php:249
 #: libraries/navigation/Nodes/Node_Function.class.php:32
-#: libraries/rte/rte_routines.lib.php:1495
-#: templates/table/table_header.phtml:4
+#: libraries/rte/rte_routines.lib.php:1586
+#: templates/table/search/table_header.phtml:4
 msgid "Function"
 msgstr "Functie"
 
@@ -9171,84 +9183,85 @@ msgid "Because of its length,<br /> this column might not be editable."
 msgstr ""
 "Vanwege z'n lengte,<br /> kan deze kolom mogelijk niet gewijzigd worden."
 
-#: libraries/insert_edit.lib.php:1050
+#: libraries/insert_edit.lib.php:1048
 msgid "Binary - do not edit"
 msgstr "Binair - niet aanpassen"
 
-#: libraries/insert_edit.lib.php:1176 libraries/server_privileges.lib.php:470
-#: templates/table/options.phtml:36
+#: libraries/insert_edit.lib.php:1174 libraries/server_privileges.lib.php:470
+#: templates/table/search/options.phtml:36
 msgid "Or"
 msgstr "Of"
 
-#: libraries/insert_edit.lib.php:1177
+#: libraries/insert_edit.lib.php:1175
 msgid "web server upload directory:"
 msgstr "uploadmap op webserver:"
 
-#: libraries/insert_edit.lib.php:1348 templates/table/input_box.phtml:49
+#: libraries/insert_edit.lib.php:1346
+#: templates/table/search/input_box.phtml:49
 msgid "Edit/Insert"
 msgstr "Aanpassen/Invoegen"
 
-#: libraries/insert_edit.lib.php:1398
+#: libraries/insert_edit.lib.php:1396
 #, php-format
 msgid "Continue insertion with %s rows"
 msgstr "Herstart invoegen met %s rijen"
 
-#: libraries/insert_edit.lib.php:1428
+#: libraries/insert_edit.lib.php:1426
 msgid "and then"
 msgstr "en dan"
 
-#: libraries/insert_edit.lib.php:1461
+#: libraries/insert_edit.lib.php:1459
 msgid "Insert as new row"
 msgstr "Toevoegen als nieuwe rij"
 
-#: libraries/insert_edit.lib.php:1464
+#: libraries/insert_edit.lib.php:1462
 msgid "Insert as new row and ignore errors"
 msgstr "Toevoegen als nieuwe rij en foutmeldingen negeren"
 
-#: libraries/insert_edit.lib.php:1467
+#: libraries/insert_edit.lib.php:1465
 msgid "Show insert query"
 msgstr "Toon insert-query"
 
-#: libraries/insert_edit.lib.php:1487
+#: libraries/insert_edit.lib.php:1485
 msgid "Go back to previous page"
 msgstr "Terug"
 
-#: libraries/insert_edit.lib.php:1490
+#: libraries/insert_edit.lib.php:1488
 msgid "Insert another new row"
 msgstr "Een nieuwe rij toevoegen"
 
-#: libraries/insert_edit.lib.php:1495
+#: libraries/insert_edit.lib.php:1493
 msgid "Go back to this page"
 msgstr "Ga terug naar deze pagina"
 
-#: libraries/insert_edit.lib.php:1518
+#: libraries/insert_edit.lib.php:1516
 msgid "Edit next row"
 msgstr "Volgende rij bewerken"
 
-#: libraries/insert_edit.lib.php:1540
+#: libraries/insert_edit.lib.php:1538
 msgid ""
 "Use TAB key to move from value to value, or CTRL+arrows to move anywhere"
 msgstr ""
 "Gebruik de TAB-toets om van waarde naar waarde te navigeren of CTRL+pijltjes "
 "om vrijuit te navigeren"
 
-#: libraries/insert_edit.lib.php:1577 libraries/replication_gui.lib.php:542
-#: libraries/rte/rte_routines.lib.php:1497
+#: libraries/insert_edit.lib.php:1575 libraries/replication_gui.lib.php:542
+#: libraries/rte/rte_routines.lib.php:1588
 #: libraries/server_status_variables.lib.php:220
-#: templates/designer/having_query_panel.phtml:100
-#: templates/designer/options_panel.phtml:73
-#: templates/designer/options_panel.phtml:239
-#: templates/designer/where_query_panel.phtml:69
-#: templates/table/table_header.phtml:10
-#: templates/table/zoom_result_form.phtml:35
+#: templates/database/designer/having_query_panel.phtml:100
+#: templates/database/designer/options_panel.phtml:73
+#: templates/database/designer/options_panel.phtml:239
+#: templates/database/designer/where_query_panel.phtml:69
+#: templates/table/search/table_header.phtml:10
+#: templates/table/search/zoom_result_form.phtml:35
 msgid "Value"
 msgstr "Waarde"
 
-#: libraries/insert_edit.lib.php:1937 libraries/sql.lib.php:1309
+#: libraries/insert_edit.lib.php:1935 libraries/sql.lib.php:1303
 msgid "Showing SQL query"
 msgstr "Toont SQL-query"
 
-#: libraries/insert_edit.lib.php:1962 libraries/sql.lib.php:1287
+#: libraries/insert_edit.lib.php:1960 libraries/sql.lib.php:1281
 #, php-format
 msgid "Inserted row id: %1$d"
 msgstr "Toegevoegd rijnummer: %1$d"
@@ -9661,7 +9674,7 @@ msgstr "Nieuw"
 #: libraries/navigation/Nodes/Node_View_Container.class.php:26
 #: libraries/navigation/Nodes/Node_View_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:129
-#: templates/structure/show_create.phtml:30
+#: templates/database/structure/show_create.phtml:30
 msgid "Views"
 msgstr "Views"
 
@@ -10002,7 +10015,7 @@ msgstr ""
 
 #: libraries/operations.lib.php:101 libraries/operations.lib.php:249
 #: libraries/operations.lib.php:869 libraries/operations.lib.php:963
-#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:907
+#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:998
 #: templates/columns_definitions/table_fields_definitions.phtml:47
 msgid "Adjust Privileges"
 msgstr "Aanpassen rechten"
@@ -10092,22 +10105,22 @@ msgid "Switch to copied table"
 msgstr "Wissel naar de gekopieerde tabel"
 
 #: libraries/operations.lib.php:1360
-#: templates/structure/check_all_tables.phtml:18
+#: templates/database/structure/check_all_tables.phtml:18
 msgid "Table maintenance"
 msgstr "Tabelonderhoud"
 
 #: libraries/operations.lib.php:1398
-#: templates/structure/check_all_tables.phtml:19
+#: templates/database/structure/check_all_tables.phtml:19
 msgid "Analyze table"
 msgstr "Analyseer tabel"
 
 #: libraries/operations.lib.php:1413
-#: templates/structure/check_all_tables.phtml:20
+#: templates/database/structure/check_all_tables.phtml:20
 msgid "Check table"
 msgstr "Controleer tabel"
 
 #: libraries/operations.lib.php:1428
-#: templates/structure/check_all_tables.phtml:22
+#: templates/database/structure/check_all_tables.phtml:22
 msgid "Checksum table"
 msgstr "Checksum tabel"
 
@@ -10125,18 +10138,19 @@ msgid "Flush the table (FLUSH)"
 msgstr "De tabel leegmaken (FLUSH)"
 
 #: libraries/operations.lib.php:1477
-#: templates/structure/check_all_tables.phtml:23
-#: templates/structure/display_table_stats.phtml:56
+#: templates/database/structure/check_all_tables.phtml:23
+#: templates/table/structure/display_table_stats.phtml:56
 msgid "Optimize table"
 msgstr "Optimaliseer tabel"
 
 #: libraries/operations.lib.php:1492
-#: templates/structure/check_all_tables.phtml:24
+#: templates/database/structure/check_all_tables.phtml:24
 msgid "Repair table"
 msgstr "Repareer tabel"
 
 #: libraries/operations.lib.php:1538
-#: templates/structure/check_all_tables.phtml:14 view_operations.php:127
+#: templates/database/structure/check_all_tables.phtml:14
+#: view_operations.php:127
 msgid "Delete data or table"
 msgstr "Gegevens of tabel verwijderen"
 
@@ -10259,7 +10273,7 @@ msgid "Cannot connect: invalid settings."
 msgstr "Kan niet verbinden: ongeldige instellingen."
 
 #: libraries/plugins/auth/AuthenticationConfig.class.php:108
-#: libraries/plugins/auth/AuthenticationCookie.class.php:134
+#: libraries/plugins/auth/AuthenticationCookie.class.php:122
 #: libraries/plugins/auth/AuthenticationHttp.class.php:96
 #, php-format
 msgid "Welcome to %s"
@@ -10290,38 +10304,38 @@ msgstr ""
 msgid "Retry to connect"
 msgstr "Opnieuw proberen te verbinden"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:146
+#: libraries/plugins/auth/AuthenticationCookie.class.php:134
 msgid "Your session has expired. Please log in again."
 msgstr "Uw sessie is verlopen. Log opnieuw in."
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:170
+#: libraries/plugins/auth/AuthenticationCookie.class.php:158
 msgid "Log in"
 msgstr "Aanmelden"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:178
-#: libraries/plugins/auth/AuthenticationCookie.class.php:188
+#: libraries/plugins/auth/AuthenticationCookie.class.php:166
+#: libraries/plugins/auth/AuthenticationCookie.class.php:176
 msgid "You can enter hostname/IP address and port separated by space."
 msgstr ""
 "U kunt een hostnaam/IP-adres en poortnummer gescheiden door een spatie "
 "opgeven."
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:193
+#: libraries/plugins/auth/AuthenticationCookie.class.php:181
 msgid "Username:"
 msgstr "Gebruikersnaam:"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:205
+#: libraries/plugins/auth/AuthenticationCookie.class.php:193
 msgid "Server Choice:"
 msgstr "Serverkeuze:"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:386
+#: libraries/plugins/auth/AuthenticationCookie.class.php:374
 msgid "Entered captcha is wrong, try again!"
 msgstr "Invoer is verkeerd, probeer opnieuw!"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:396
+#: libraries/plugins/auth/AuthenticationCookie.class.php:384
 msgid "Please enter correct captcha!"
 msgstr "Vul een correcte captcha in!"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:423
+#: libraries/plugins/auth/AuthenticationCookie.class.php:411
 msgid "You are not allowed to log in to this MySQL server!"
 msgstr "Aanmelden op de MySQL-server niet toegestaan!"
 
@@ -10417,7 +10431,7 @@ msgstr "Gebeurtenis"
 #: libraries/plugins/export/ExportOdt.class.php:593
 #: libraries/plugins/export/ExportTexytext.class.php:428
 #: libraries/plugins/export/PMA_ExportPdf.class.php:313
-#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:984
 #: libraries/rte/rte_triggers.lib.php:377
 msgid "Definition"
 msgstr "Definitie"
@@ -10738,7 +10752,7 @@ msgid "Last check:"
 msgstr "Laatst gecontroleerd:"
 
 #: libraries/plugins/export/ExportSql.class.php:1399
-#: templates/structure/structure_table_row.phtml:183
+#: templates/database/structure/structure_table_row.phtml:183
 msgid "in use"
 msgstr "in gebruik"
 
@@ -10934,18 +10948,14 @@ msgstr "De extensie MySQL Spatial ondersteunt ESRI-type \"%s\" niet."
 msgid "The imported file does not contain any data!"
 msgstr "Het geïmporteerde bestand bevat geen gegevens!"
 
-#: libraries/plugins/import/ImportSql.class.php:169
+#: libraries/plugins/import/ImportSql.class.php:72
 msgid "SQL compatibility mode:"
 msgstr "SQL-compatibiliteitsmodus:"
 
-#: libraries/plugins/import/ImportSql.class.php:181
+#: libraries/plugins/import/ImportSql.class.php:84
 msgid "Do not use <code>AUTO_INCREMENT</code> for zero values"
 msgstr "Gebruik geen <code>AUTO_INCREMENT</code> voor 0-waarden"
 
-#: libraries/plugins/import/ImportSql.class.php:195
-msgid "Read as multibytes"
-msgstr "Lees als mulitbytes"
-
 #: libraries/plugins/import/ImportXml.class.php:54
 msgid "XML"
 msgstr "XML"
@@ -10988,7 +10998,7 @@ msgid "Show grid"
 msgstr "Toon raster"
 
 #: libraries/plugins/schema/SchemaPdf.class.php:94
-#: templates/structure/print_view_data_dictionary_link.phtml:6
+#: templates/database/structure/print_view_data_dictionary_link.phtml:6
 msgid "Data Dictionary"
 msgstr "Data Woordenboek"
 
@@ -11013,7 +11023,7 @@ msgid "The %s table doesn't exist!"
 msgstr "De tabel %s bestaat niet!"
 
 #: libraries/plugins/schema/eps/Eps_Relation_Schema.class.php:321
-#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:309
+#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:323
 #, php-format
 msgid "Schema of the %s database - Page %s"
 msgstr "Schema van de database %s - Pagina %s"
@@ -11039,7 +11049,7 @@ msgstr "Inhoudsopgave"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1005
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1028
 #: libraries/tracking.lib.php:884
-#: templates/structure/table_structure_header.phtml:11
+#: templates/table/structure/table_structure_header.phtml:11
 msgid "Extra"
 msgstr "Extra"
 
@@ -11406,11 +11416,11 @@ msgstr "Maak de benodigde tabellen aan met <code>%screate_tables.sql</code>."
 
 # hem/haar/het past beter maar het geslacht van de gebruiker is
 # onvoorspelbaar.
-#: libraries/relation.lib.php:360
+#: libraries/relation.lib.php:357
 msgid "Create a pma user and give access to these tables."
 msgstr "Maak een pma-gebruiker aan en verleen die toegang tot deze tabellen."
 
-#: libraries/relation.lib.php:365
+#: libraries/relation.lib.php:360
 msgid ""
 "Enable advanced features in configuration file (<code>config.inc.php</"
 "code>), for example by starting from <code>config.sample.inc.php</code>."
@@ -11419,17 +11429,17 @@ msgstr ""
 "inc.php</code>) ingeschakeld worden, als voorbeeld kunt u gebruik maken van "
 "<code>config.sample.inc.php</code>."
 
-#: libraries/relation.lib.php:373
+#: libraries/relation.lib.php:365
 msgid "Re-login to phpMyAdmin to load the updated configuration file."
 msgstr ""
 "Meld opnieuw aan bij phpMyAdmin om het bijgewerkte configuratiebestand te "
 "laden."
 
-#: libraries/relation.lib.php:1612
+#: libraries/relation.lib.php:1607
 msgid "no description"
 msgstr "Geen beschrijving aanwezig"
 
-#: libraries/relation.lib.php:1811
+#: libraries/relation.lib.php:1806
 msgid ""
 "You do not have necessary privileges to create a database named "
 "'phpmyadmin'. You may go to 'Operations' tab of any database to set up the "
@@ -11439,7 +11449,7 @@ msgstr ""
 "aan te maken. Je kunt naar de 'Operations' tab gaan van enige database om "
 "phpMyAdmin configuratie opslag in te stellen."
 
-#: libraries/relation.lib.php:1928
+#: libraries/relation.lib.php:1923
 #, php-format
 msgid ""
 "%sCreate%s a database named 'phpmyadmin' and setup the phpMyAdmin "
@@ -11448,20 +11458,20 @@ msgstr ""
 "%sCreate%s  een database met de naam 'phpmyadmin' en stel daar de phpMyAdmin "
 "configuratie opslag in."
 
-#: libraries/relation.lib.php:1936
+#: libraries/relation.lib.php:1931
 #, php-format
 msgid ""
 "%sCreate%s the phpMyAdmin configuration storage in the current database."
 msgstr ""
 "%sMaak%s de configuratie-opslag van phpMyAdmin aan in de huidige database."
 
-#: libraries/relation.lib.php:1944
+#: libraries/relation.lib.php:1939
 #, php-format
 msgid "%sCreate%s missing phpMyAdmin configuration storage tables."
 msgstr "%sCreate%s ontbrekende phpMyAdmin configuratie opslag tabellen."
 
 #: libraries/replication_gui.lib.php:46 libraries/replication_gui.lib.php:343
-#: libraries/server_databases.lib.php:387
+#: libraries/server_databases.lib.php:398
 msgid "Master replication"
 msgstr "Masterreplicatie"
 
@@ -11525,7 +11535,7 @@ msgstr ""
 "melding moeten krijgen dat de server  ingesteld <b>is</b> als master."
 
 #: libraries/replication_gui.lib.php:141
-#: libraries/server_databases.lib.php:389
+#: libraries/server_databases.lib.php:400
 msgid "Slave replication"
 msgstr "Slave-replicatie"
 
@@ -11803,10 +11813,10 @@ msgid "Master server changed successfully to %s."
 msgstr "Masterserver succesvol gewijzigd in %s."
 
 #: libraries/rte/rte_events.lib.php:106 libraries/rte/rte_events.lib.php:115
-#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:149
-#: libraries/rte/rte_routines.lib.php:158
-#: libraries/rte/rte_routines.lib.php:231
-#: libraries/rte/rte_routines.lib.php:1362
+#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:219
+#: libraries/rte/rte_routines.lib.php:246
+#: libraries/rte/rte_routines.lib.php:368
+#: libraries/rte/rte_routines.lib.php:1453
 #: libraries/rte/rte_triggers.lib.php:82 libraries/rte/rte_triggers.lib.php:91
 #: libraries/rte/rte_triggers.lib.php:123
 #, php-format
@@ -11827,7 +11837,7 @@ msgstr "Gebeurtenis %1$s werd gewijzigd."
 msgid "Event %1$s has been created."
 msgstr "Gebeurtenis %1$s werd aangemaakt."
 
-#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:251
+#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:266
 #: libraries/rte/rte_triggers.lib.php:144
 msgid "One or more errors have occurred while processing your request:"
 msgstr ""
@@ -11837,7 +11847,7 @@ msgstr ""
 msgid "Edit event"
 msgstr "Gebeurtenis bewerken"
 
-#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:794
+#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:885
 #: libraries/rte/rte_triggers.lib.php:323 view_create.php:180
 msgid "Details"
 msgstr "Details"
@@ -11850,7 +11860,7 @@ msgstr "Gebeurtenisnaam"
 msgid "Event type"
 msgstr "Gebeurtenistype"
 
-#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:817
+#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:908
 #, php-format
 msgid "Change to %s"
 msgstr "Veranderen naar %s"
@@ -11878,12 +11888,14 @@ msgid "On completion preserve"
 msgstr "Na afloop behouden"
 
 # Not the best translation, suggestions are welcome
-#: libraries/rte/rte_events.lib.php:491 libraries/rte/rte_routines.lib.php:930
+#: libraries/rte/rte_events.lib.php:491
+#: libraries/rte/rte_routines.lib.php:1021
 #: libraries/rte/rte_triggers.lib.php:383 view_create.php:209
 msgid "Definer"
 msgstr "Naam"
 
-#: libraries/rte/rte_events.lib.php:535 libraries/rte/rte_routines.lib.php:997
+#: libraries/rte/rte_events.lib.php:535
+#: libraries/rte/rte_routines.lib.php:1088
 #: libraries/rte/rte_triggers.lib.php:422
 msgid "The definer must be in the \"username@hostname\" format!"
 msgstr "De naam moet het formaat \"gebruikersnaam@computernaam\" hebben!"
@@ -11909,9 +11921,9 @@ msgid "You must provide an event definition."
 msgstr "Vul een definitie voor de gebeurtenis in."
 
 #: libraries/rte/rte_export.lib.php:43 libraries/rte/rte_general.lib.php:72
-#: libraries/rte/rte_routines.lib.php:345
-#: libraries/rte/rte_routines.lib.php:1198
-#: libraries/rte/rte_routines.lib.php:1411
+#: libraries/rte/rte_routines.lib.php:153
+#: libraries/rte/rte_routines.lib.php:1289
+#: libraries/rte/rte_routines.lib.php:1502
 msgid "Error in processing request:"
 msgstr "Fout tijdens het uitvoeren van de opdracht:"
 
@@ -11947,72 +11959,72 @@ msgstr ""
 "routines kan mislukken![/strong] Gebruik de verbeterde 'mysqli'-uitbreiding "
 "om problemen te voorkomen."
 
-#: libraries/rte/rte_routines.lib.php:110
-#: libraries/rte/rte_routines.lib.php:1006
+#: libraries/rte/rte_routines.lib.php:123
+msgid "Edit routine"
+msgstr "Routine aanpassen"
+
+#: libraries/rte/rte_routines.lib.php:200
+#: libraries/rte/rte_routines.lib.php:1097
 #, php-format
 msgid "Invalid routine type: \"%s\""
 msgstr "Ongeldig routine-type: \"%s\""
 
-#: libraries/rte/rte_routines.lib.php:170
-msgid "Sorry, we failed to restore the dropped routine."
-msgstr "Het terugzetten van de verwijderde routine is mislukt."
-
-#: libraries/rte/rte_routines.lib.php:211
-#, php-format
-msgid "Routine %1$s has been modified. Privileges have been adjusted."
-msgstr "Routine %1$s werd gewijzigd. Rechten zijn aangepast."
-
-#: libraries/rte/rte_routines.lib.php:216
-#, php-format
-msgid "Routine %1$s has been modified."
-msgstr "Routine %1$s werd gewijzigd."
-
-#: libraries/rte/rte_routines.lib.php:238
+#: libraries/rte/rte_routines.lib.php:253
 #, php-format
 msgid "Routine %1$s has been created."
 msgstr "Routine %1$s werd aangemaakt."
 
-#: libraries/rte/rte_routines.lib.php:315
-msgid "Edit routine"
-msgstr "Routine aanpassen"
+#: libraries/rte/rte_routines.lib.php:380
+msgid "Sorry, we failed to restore the dropped routine."
+msgstr "Het terugzetten van de verwijderde routine is mislukt."
 
-#: libraries/rte/rte_routines.lib.php:797
+#: libraries/rte/rte_routines.lib.php:439
+#, php-format
+msgid "Routine %1$s has been modified. Privileges have been adjusted."
+msgstr "Routine %1$s werd gewijzigd. Rechten zijn aangepast."
+
+#: libraries/rte/rte_routines.lib.php:444
+#, php-format
+msgid "Routine %1$s has been modified."
+msgstr "Routine %1$s werd gewijzigd."
+
+#: libraries/rte/rte_routines.lib.php:888
 msgid "Routine name"
 msgstr "Routinenaam"
 
-#: libraries/rte/rte_routines.lib.php:823
+#: libraries/rte/rte_routines.lib.php:914
 msgid "Parameters"
 msgstr "Parameters"
 
-#: libraries/rte/rte_routines.lib.php:829
+#: libraries/rte/rte_routines.lib.php:920
 msgid "Direction"
 msgstr "Richting"
 
-#: libraries/rte/rte_routines.lib.php:847
+#: libraries/rte/rte_routines.lib.php:938
 msgid "Add parameter"
 msgstr "Parameter toevoegen"
 
-#: libraries/rte/rte_routines.lib.php:851
+#: libraries/rte/rte_routines.lib.php:942
 msgid "Remove last parameter"
 msgstr "Laatste parameter verwijderen"
 
-#: libraries/rte/rte_routines.lib.php:856
+#: libraries/rte/rte_routines.lib.php:947
 msgid "Return type"
 msgstr "Returntype"
 
-#: libraries/rte/rte_routines.lib.php:862
+#: libraries/rte/rte_routines.lib.php:953
 msgid "Return length/values"
 msgstr "Return-lengte/waarden"
 
-#: libraries/rte/rte_routines.lib.php:868
+#: libraries/rte/rte_routines.lib.php:959
 msgid "Return options"
 msgstr "Return-opties"
 
-#: libraries/rte/rte_routines.lib.php:899
+#: libraries/rte/rte_routines.lib.php:990
 msgid "Is deterministic"
 msgstr "Is vast bepaald"
 
-#: libraries/rte/rte_routines.lib.php:920
+#: libraries/rte/rte_routines.lib.php:1011
 msgid ""
 "You do not have sufficient privileges to perform this operation; Please "
 "refer to the documentation for more details"
@@ -12020,25 +12032,25 @@ msgstr ""
 "U heeft niet genoeg rechten om deze actie uit te voeren; Kijk a.u.b. naar de "
 "documentatie voor meer details"
 
-#: libraries/rte/rte_routines.lib.php:935
+#: libraries/rte/rte_routines.lib.php:1026
 msgid "Security type"
 msgstr "Beveiligingstype"
 
-#: libraries/rte/rte_routines.lib.php:944
+#: libraries/rte/rte_routines.lib.php:1035
 msgid "SQL data access"
 msgstr "SQL-gegevenstoegang"
 
-#: libraries/rte/rte_routines.lib.php:1013
+#: libraries/rte/rte_routines.lib.php:1104
 msgid "You must provide a routine name!"
 msgstr "Vul een routinenaam in!"
 
-#: libraries/rte/rte_routines.lib.php:1047
+#: libraries/rte/rte_routines.lib.php:1138
 #, php-format
 msgid "Invalid direction \"%s\" given for parameter."
 msgstr "Ongeldige richting \"%s\" opgegeven voor parameter."
 
-#: libraries/rte/rte_routines.lib.php:1069
-#: libraries/rte/rte_routines.lib.php:1131
+#: libraries/rte/rte_routines.lib.php:1160
+#: libraries/rte/rte_routines.lib.php:1222
 msgid ""
 "You must provide length/values for routine parameters of type ENUM, SET, "
 "VARCHAR and VARBINARY."
@@ -12046,37 +12058,37 @@ msgstr ""
 "Vul de lengte/waarden in voor routineparameters van het type ENUM, SET, "
 "VARCHAR en VARBINARY."
 
-#: libraries/rte/rte_routines.lib.php:1095
+#: libraries/rte/rte_routines.lib.php:1186
 msgid "You must provide a name and a type for each routine parameter."
 msgstr "Vul een naam en type in voor elke routineparameter."
 
-#: libraries/rte/rte_routines.lib.php:1114
+#: libraries/rte/rte_routines.lib.php:1205
 msgid "You must provide a valid return type for the routine."
 msgstr "Vul een geldig returntype in voor de routine."
 
-#: libraries/rte/rte_routines.lib.php:1174
+#: libraries/rte/rte_routines.lib.php:1265
 msgid "You must provide a routine definition."
 msgstr "Vul een routinedefinitie in."
 
-#: libraries/rte/rte_routines.lib.php:1285
+#: libraries/rte/rte_routines.lib.php:1376
 #, php-format
 msgid "Execution results of routine %s"
 msgstr "Resultaten van uitgevoerde routine %s"
 
-#: libraries/rte/rte_routines.lib.php:1340
+#: libraries/rte/rte_routines.lib.php:1431
 #, php-format
 msgid "%d row affected by the last statement inside the procedure."
 msgid_plural "%d rows affected by the last statement inside the procedure."
 msgstr[0] "%d regel beïnvloed door het laatste statement in de procedure."
 msgstr[1] "%d regels beïnvloed door het laatste statement in de procedure."
 
-#: libraries/rte/rte_routines.lib.php:1398
-#: libraries/rte/rte_routines.lib.php:1406
+#: libraries/rte/rte_routines.lib.php:1489
+#: libraries/rte/rte_routines.lib.php:1497
 msgid "Execute routine"
 msgstr "Routine uitvoeren"
 
-#: libraries/rte/rte_routines.lib.php:1485
-#: libraries/rte/rte_routines.lib.php:1488
+#: libraries/rte/rte_routines.lib.php:1576
+#: libraries/rte/rte_routines.lib.php:1579
 msgid "Routine parameters"
 msgstr "Routineparameters"
 
@@ -12230,7 +12242,7 @@ msgid "Original position"
 msgstr "Oorspronkelijke positie"
 
 #: libraries/server_bin_log.lib.php:133
-#: templates/structure/display_table_stats.phtml:4
+#: templates/table/structure/display_table_stats.phtml:4
 msgid "Information"
 msgstr "Informatie"
 
@@ -12268,12 +12280,12 @@ msgstr ""
 "Let op: het inschakelen van databasestatistieken kan zorgen voor veel "
 "gegevensverkeer tussen de webserver en de MySQL-server."
 
-#: libraries/server_databases.lib.php:364
-#: libraries/server_databases.lib.php:365
+#: libraries/server_databases.lib.php:366
+#: libraries/server_databases.lib.php:371
 msgid "Enable Statistics"
 msgstr "Statistieken inschakelen"
 
-#: libraries/server_databases.lib.php:481
+#: libraries/server_databases.lib.php:492
 #, php-format
 msgid "%1$d database has been dropped successfully."
 msgid_plural "%1$d databases have been dropped successfully."
@@ -12656,7 +12668,7 @@ msgid "You have revoked the privileges for %s."
 msgstr "U heeft de rechten ingetrokken voor %s."
 
 #: libraries/server_privileges.lib.php:2059
-#: libraries/server_privileges.lib.php:4290
+#: libraries/server_privileges.lib.php:4316
 msgid "Add user account"
 msgstr "Gebruikersaccount toevoegen"
 
@@ -12826,36 +12838,36 @@ msgstr "Verwijderen van %s"
 msgid "The privileges were reloaded successfully."
 msgstr "De rechten werden succesvol opnieuw ingeladen."
 
-#: libraries/server_privileges.lib.php:3994
+#: libraries/server_privileges.lib.php:4003
 #, php-format
 msgid "The user %s already exists!"
 msgstr "De gebruiker %s bestaat al!"
 
-#: libraries/server_privileges.lib.php:4232
+#: libraries/server_privileges.lib.php:4258
 #, php-format
 msgid "Privileges for %s"
 msgstr "Rechten voor %s"
 
-#: libraries/server_privileges.lib.php:4241
+#: libraries/server_privileges.lib.php:4267
 #: libraries/server_status_processes.lib.php:72
 #: libraries/server_user_groups.lib.php:39
 msgid "User"
 msgstr "Gebruiker"
 
-#: libraries/server_privileges.lib.php:4282
+#: libraries/server_privileges.lib.php:4308
 msgctxt "Create new user"
 msgid "New"
 msgstr "Nieuw"
 
-#: libraries/server_privileges.lib.php:4311
+#: libraries/server_privileges.lib.php:4337
 msgid "Edit privileges:"
 msgstr "Rechten bewerken:"
 
-#: libraries/server_privileges.lib.php:4312
+#: libraries/server_privileges.lib.php:4338
 msgid "User account"
 msgstr "Gebruikersaccount"
 
-#: libraries/server_privileges.lib.php:4371
+#: libraries/server_privileges.lib.php:4397
 msgid ""
 "Note: You are attempting to edit privileges of the user with which you are "
 "currently logged in."
@@ -12863,11 +12875,11 @@ msgstr ""
 "Opmerking: U probeert de rechten te wijzigen van de gebruikersnaam waarmee u "
 "op dit moment ingelogd bent."
 
-#: libraries/server_privileges.lib.php:4391 libraries/server_users.lib.php:25
+#: libraries/server_privileges.lib.php:4417 libraries/server_users.lib.php:25
 msgid "User accounts overview"
 msgstr "Gebruikersaccount overzicht"
 
-#: libraries/server_privileges.lib.php:4459
+#: libraries/server_privileges.lib.php:4485
 msgid ""
 "A user account allowing any user from localhost to connect is present. This "
 "will prevent other users from connecting if the host part of their account "
@@ -12878,7 +12890,7 @@ msgstr ""
 "maken als het server deel van hun account een verbinding toestaat vanaf elke "
 "server (%)."
 
-#: libraries/server_privileges.lib.php:4500
+#: libraries/server_privileges.lib.php:4526
 #, php-format
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
@@ -12892,7 +12904,7 @@ msgstr ""
 "geval zijn dan moet men %sde rechtentabel vernieuwen%s voordat men verder "
 "gaat."
 
-#: libraries/server_privileges.lib.php:4519
+#: libraries/server_privileges.lib.php:4545
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
 "tables. The content of these tables may differ from the privileges the "
@@ -12906,25 +12918,25 @@ msgstr ""
 "dit het geval zijn dan moet de gebruikersrechten opnieuw geladen worden, "
 "maar op dit moment heeft u niet het RELOAD gebruikersrecht."
 
-#: libraries/server_privileges.lib.php:4569
+#: libraries/server_privileges.lib.php:4595
 msgid "The selected user was not found in the privilege table."
 msgstr "De geselecteerde gebruiker werd niet aangetroffen in de rechtentabel."
 
-#: libraries/server_privileges.lib.php:4801
+#: libraries/server_privileges.lib.php:4827
 msgid "You have added a new user."
 msgstr "U heeft een nieuwe gebruiker toegevoegd."
 
-#: libraries/server_status.lib.php:53
+#: libraries/server_status.lib.php:60
 #, php-format
 msgid "Network traffic since startup: %s"
 msgstr "Netwerkverkeer sinds opstart: %s"
 
-#: libraries/server_status.lib.php:66
+#: libraries/server_status.lib.php:73
 #, php-format
 msgid "This MySQL server has been running for %1$s. It started up on %2$s."
 msgstr "Deze MySQL-server draait inmiddels %1$s. Deze is gestart op %2$s."
 
-#: libraries/server_status.lib.php:80
+#: libraries/server_status.lib.php:94
 msgid ""
 "This MySQL server works as <b>master</b> and <b>slave</b> in <b>replication</"
 "b> process."
@@ -12932,23 +12944,23 @@ msgstr ""
 "Deze MySQL-server is ingesteld als <b>master</b> en <b>slave</b> in een "
 "<b>replicatie</b>proces."
 
-#: libraries/server_status.lib.php:85
+#: libraries/server_status.lib.php:99
 msgid "This MySQL server works as <b>master</b> in <b>replication</b> process."
 msgstr ""
 "Deze MySQL-server is ingesteld als <b>master</b> in een <b>replicatie</"
 "b>proces."
 
-#: libraries/server_status.lib.php:90
+#: libraries/server_status.lib.php:104
 msgid "This MySQL server works as <b>slave</b> in <b>replication</b> process."
 msgstr ""
 "Deze MySQL-server is ingesteld als <b>slave</b> in een <b>replicatie</"
 "b>proces."
 
-#: libraries/server_status.lib.php:106
+#: libraries/server_status.lib.php:116
 msgid "Replication status"
 msgstr "Replicatiestatus"
 
-#: libraries/server_status.lib.php:137
+#: libraries/server_status.lib.php:146
 msgid ""
 "On a busy server, the byte counters may overrun, so those statistics as "
 "reported by the MySQL server may be incorrect."
@@ -12956,19 +12968,19 @@ msgstr ""
 "Op drukke servers kunnen de byte-tellers over hun maximum heengaan. Hierdoor "
 "kunnen de gerapporteerde statistieken afwijken."
 
-#: libraries/server_status.lib.php:148
+#: libraries/server_status.lib.php:157
 msgid "Received"
 msgstr "Ontvangen"
 
-#: libraries/server_status.lib.php:167
+#: libraries/server_status.lib.php:176
 msgid "Sent"
 msgstr "Verzonden"
 
-#: libraries/server_status.lib.php:234
+#: libraries/server_status.lib.php:243
 msgid "Max. concurrent connections"
 msgstr "Max. gelijktijdige verbindingen"
 
-#: libraries/server_status.lib.php:244
+#: libraries/server_status.lib.php:253
 msgid "Failed attempts"
 msgstr "Mislukte pogingen"
 
@@ -14063,7 +14075,7 @@ msgstr "Dit is een alleen-lezen variabele en kan niet worden gewijzigd"
 msgid "Not implemented yet."
 msgstr "Nog niet geïmplementeerd."
 
-#: libraries/sql-parser/src/Components/AlterOperation.php:193
+#: libraries/sql-parser/src/Components/AlterOperation.php:191
 msgid "Unrecognized alter operation."
 msgstr "Onbekende bewerking."
 
@@ -14077,7 +14089,7 @@ msgid "An opening bracket followed by a set of values was expected."
 msgstr "Een openingshaakje gevolgd door een set met waardes werd verwacht."
 
 #: libraries/sql-parser/src/Components/ArrayObj.php:101
-#: libraries/sql-parser/src/Components/FieldDefinition.php:202
+#: libraries/sql-parser/src/Components/CreateDefinition.php:202
 msgid "An opening bracket was expected."
 msgstr "Een openingshaakje werd verwacht."
 
@@ -14085,25 +14097,33 @@ msgstr "Een openingshaakje werd verwacht."
 msgid "A comma or a closing bracket was expected"
 msgstr "Een komma  of een sluitingshaakje werd verwacht"
 
+#: libraries/sql-parser/src/Components/CreateDefinition.php:246
+msgid "A comma or a closing bracket was expected."
+msgstr "Een komma of een sluitingshaakje werd verwacht."
+
+#: libraries/sql-parser/src/Components/CreateDefinition.php:262
+msgid "A closing bracket was expected."
+msgstr "Een sluitingshaakje werd verwacht."
+
 #: libraries/sql-parser/src/Components/DataType.php:125
 msgid "Unrecognized data type."
 msgstr "Onbekend gegevenstype."
 
-#: libraries/sql-parser/src/Components/Expression.php:225
+#: libraries/sql-parser/src/Components/Expression.php:227
 msgid "Unexpected closing bracket."
 msgstr "Onverwacht sluitingshaakje."
 
-#: libraries/sql-parser/src/Components/Expression.php:246
-#: libraries/sql-parser/src/Components/Expression.php:283
-#: libraries/sql-parser/src/Components/Expression.php:303
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:285
+#: libraries/sql-parser/src/Components/Expression.php:305
 msgid "An alias was previously found."
 msgstr "Een alias was eerder al gevonden."
 
-#: libraries/sql-parser/src/Components/Expression.php:257
+#: libraries/sql-parser/src/Components/Expression.php:259
 msgid "Unexpected dot."
 msgstr "Onverwachte punt."
 
-#: libraries/sql-parser/src/Components/Expression.php:327
+#: libraries/sql-parser/src/Components/Expression.php:329
 msgid "An alias was expected."
 msgstr "Een alias werd verwacht."
 
@@ -14111,14 +14131,6 @@ msgstr "Een alias werd verwacht."
 msgid "An expression was expected."
 msgstr "Een expressie werd verwacht."
 
-#: libraries/sql-parser/src/Components/FieldDefinition.php:246
-msgid "A comma or a closing bracket was expected."
-msgstr "Een komma of een sluitingshaakje werd verwacht."
-
-#: libraries/sql-parser/src/Components/FieldDefinition.php:262
-msgid "A closing bracket was expected."
-msgstr "Een sluitingshaakje werd verwacht."
-
 #: libraries/sql-parser/src/Components/Limit.php:90
 #: libraries/sql-parser/src/Components/Limit.php:112
 msgid "An offset was expected."
@@ -14158,24 +14170,24 @@ msgstr "Spatie(s) werd(en) verwacht voor het scheidingsteken."
 msgid "Expected delimiter."
 msgstr "Scheidingsteken verwacht."
 
-#: libraries/sql-parser/src/Lexer.php:753
+#: libraries/sql-parser/src/Lexer.php:777
 #, php-format
 msgid "Ending quote %1$s was expected."
 msgstr "Eindquote %1$s werd verwacht."
 
-#: libraries/sql-parser/src/Lexer.php:789
+#: libraries/sql-parser/src/Lexer.php:813
 msgid "Variable name was expected."
 msgstr "Naam van variabele  werd verwacht."
 
-#: libraries/sql-parser/src/Parser.php:380
+#: libraries/sql-parser/src/Parser.php:391
 msgid "Unexpected beginning of statement."
 msgstr "Onverwacht begin van opdracht."
 
-#: libraries/sql-parser/src/Parser.php:399
+#: libraries/sql-parser/src/Parser.php:410
 msgid "Unrecognized statement type."
 msgstr "Opdracht type niet herkent."
 
-#: libraries/sql-parser/src/Parser.php:479
+#: libraries/sql-parser/src/Parser.php:489
 msgid "No transaction was previously started."
 msgstr "Er is geen transactie gestart."
 
@@ -14184,12 +14196,10 @@ msgid "Unexpected token."
 msgstr "Onverwacht token."
 
 #: libraries/sql-parser/src/Statement.php:238
-#| msgid "No transaction was previously started."
 msgid "This type of clause was previously parsed."
 msgstr "Dit type van voorwaarde is eerder uitgevoerd."
 
 #: libraries/sql-parser/src/Statement.php:265
-#| msgid "A new statement was found, but no delimiter between them."
 msgid ""
 "A new statement was found, but no delimiter between it and the previous one."
 msgstr ""
@@ -14205,7 +14215,9 @@ msgid "The name of the entity was expected."
 msgstr "De naam van de entiteit werd verwacht."
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:310
-msgid "At least one field definition was expected."
+#, fuzzy
+#| msgid "At least one field definition was expected."
+msgid "At least one column definition was expected."
 msgstr "Er werd minimaal één velddefinitie verwacht."
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:329
@@ -14265,11 +14277,11 @@ msgstr "Bladwijzer niet aangemaakt!"
 msgid "Using bookmark \"%s\" as default browse query."
 msgstr "Bladwijzer \"%s\" wordt gebruikt als standaard browsequery."
 
-#: libraries/sql.lib.php:1306
+#: libraries/sql.lib.php:1300
 msgid "Showing as PHP code"
 msgstr "Getoond als PHP-code"
 
-#: libraries/sql.lib.php:1638
+#: libraries/sql.lib.php:1632
 #, php-format
 msgid ""
 "Current selection does not contain a unique column. Grid edit, checkbox, "
@@ -14279,7 +14291,7 @@ msgstr ""
 "rasterbewerkingen, checkboxen, Bewerken, Kopiëren en Verwijderen, zijn niet "
 "beschikbaar. %s"
 
-#: libraries/sql.lib.php:1649
+#: libraries/sql.lib.php:1643
 #, php-format
 msgid ""
 "Current selection does not contain a unique column. Grid edit, Edit, Copy "
@@ -14289,7 +14301,7 @@ msgstr ""
 "rasterbewerkingen, checkboxen, Bewerken, Kopiëren en Verwijderen, kunnen "
 "resulteren in onwenselijke acties. %s"
 
-#: libraries/sql.lib.php:1688
+#: libraries/sql.lib.php:1682
 #, php-format
 msgid "Problems with indexes of table `%s`"
 msgstr "Problemen met de indexen van de tabel `%s`"
@@ -14445,7 +14457,7 @@ msgid "Version %s snapshot (SQL code)"
 msgstr "Versie %s snapshot (SQL-code)"
 
 #: libraries/tracking.lib.php:947
-#: templates/structure/table_structure_row.phtml:33
+#: templates/table/structure/table_structure_row.phtml:33
 msgctxt "None for default"
 msgid "None"
 msgstr "Geen"
@@ -14502,15 +14514,15 @@ msgstr "Versie %1$s van %2$s werd verwijderd."
 msgid "Version %1$s was created, tracking for %2$s is active."
 msgstr "Versie %1$s is aangemaakt, tracking van %2$s is ingeschakeld."
 
-#: libraries/user_preferences.inc.php:29
+#: libraries/user_preferences.inc.php:30
 msgid "Manage your settings"
 msgstr "Uw instellingen beheren"
 
-#: libraries/user_preferences.inc.php:46 prefs_manage.php:307
+#: libraries/user_preferences.inc.php:54 prefs_manage.php:307
 msgid "Configuration has been saved."
 msgstr "De configuratie werd opgeslagen."
 
-#: libraries/user_preferences.inc.php:66
+#: libraries/user_preferences.inc.php:74
 #, php-format
 msgid ""
 "Your preferences will be saved for current session only. Storing them "
@@ -14836,7 +14848,6 @@ msgid "Row: %1$s, Column: %2$s, Error: %3$s"
 msgstr "Rij: %1$s, Kolom: %2$s, Fout: %3$s"
 
 #: tbl_row_action.php:70
-#| msgid "No versions selected."
 msgid "No row selected."
 msgstr "Geen rij geselecteerd."
 
@@ -14913,7 +14924,7 @@ msgid "first"
 msgstr "eerste"
 
 #: templates/columns_definitions/move_column.phtml:12
-#: templates/structure/add_column.phtml:21
+#: templates/table/structure/add_column.phtml:21
 #, php-format
 msgid "after %s"
 msgstr "na %s"
@@ -14982,197 +14993,292 @@ msgstr "Invoertransformaties"
 msgid "Input transformation options"
 msgstr "Invoertransformatieopties"
 
-#: templates/designer/aggregate_query_panel.phtml:22
-#: templates/designer/options_panel.phtml:100
-msgid "Aggregate"
-msgstr "Samenvoegen"
-
-#: templates/designer/aggregate_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:61
-#: templates/designer/options_panel.phtml:106
-#: templates/designer/options_panel.phtml:170
-#: templates/designer/where_query_panel.phtml:30
-#: templates/table/table_header.phtml:9
-msgid "Operator"
-msgstr "Operator"
-
-#: templates/designer/database_tables.phtml:29
-msgid "Toggle"
-msgstr "Schakel"
-
-#: templates/designer/database_tables.phtml:40
-msgid "See table structure"
-msgstr "Zie tabelstructuur"
-
-#: templates/designer/delete_relation_panel.phtml:21
-msgid "Delete relation"
-msgstr "Relatie verwijderen"
-
-#: templates/designer/edit_delete_pages.phtml:7
-msgid "Page to open"
-msgstr "Pagina om te openen"
-
-#: templates/designer/edit_delete_pages.phtml:7
-msgid "Page to delete"
-msgstr "Pagina om te verwijderen"
-
-#: templates/designer/having_query_panel.phtml:90
-#: templates/designer/options_panel.phtml:63
-#: templates/designer/options_panel.phtml:229
-#: templates/designer/where_query_panel.phtml:59
-msgid "Except"
-msgstr "Behalve"
-
-#: templates/designer/having_query_panel.phtml:102
-#: templates/designer/options_panel.phtml:75
-#: templates/designer/options_panel.phtml:241
-#: templates/designer/where_query_panel.phtml:71
-msgid "subquery"
-msgstr "subquery"
-
-#: templates/designer/new_relation_panel.phtml:22
-#: templates/designer/side_menu.phtml:84 templates/designer/side_menu.phtml:87
-msgid "Create relation"
-msgstr "Maak relatie"
-
-#: templates/designer/options_panel.phtml:34
-#: templates/designer/options_panel.phtml:200
-msgid "Relation operator"
-msgstr "Relatiebeheerder"
-
-#: templates/designer/options_panel.phtml:85
-#: templates/designer/rename_to_panel.phtml:23
-msgid "Rename to"
-msgstr "Hernoemen naar"
-
-#: templates/designer/options_panel.phtml:91
-#: templates/designer/rename_to_panel.phtml:31
-msgid "New name"
-msgstr "Nieuwe naam"
-
-#: templates/designer/page_save_as.phtml:4
-msgid "Save to selected page"
-msgstr "Opslaan naar geselecteerde pagina"
-
-#: templates/designer/page_save_as.phtml:5
-msgid "Create a page and save to it"
-msgstr "Een pagina aanmaken en ernaar opslaan"
-
-#: templates/designer/page_save_as.phtml:26
-msgid "New page name"
-msgstr "Nieuwe paginanaam"
-
-#: templates/designer/page_selector.phtml:2
-msgid "Select page"
-msgstr "Selecteer pagina"
-
-#: templates/designer/query_details.phtml:10
-msgid "Active options"
-msgstr "Actieve opties"
-
-#: templates/designer/schema_export.phtml:4
-msgid "Select Export Relational Type"
-msgstr "Selecteer uitvoer relationeel type"
-
-#: templates/designer/side_menu.phtml:19 templates/designer/side_menu.phtml:25
-msgid "Show/Hide tables list"
-msgstr "Toon/verberg lijst met tabellen"
-
-#: templates/designer/side_menu.phtml:29 templates/designer/side_menu.phtml:35
-#: templates/designer/side_menu.phtml:36
-msgid "View in fullscreen"
-msgstr "In volledig scherm bekijken"
-
-#: templates/designer/side_menu.phtml:34
-msgid "Exit fullscreen"
-msgstr "Volledig scherm modus verlaten"
-
-#: templates/designer/side_menu.phtml:41 templates/designer/side_menu.phtml:45
-msgid "New page"
-msgstr "Nieuwe pagina"
-
-#: templates/designer/side_menu.phtml:70 templates/designer/side_menu.phtml:73
-msgid "Delete pages"
-msgstr "Pagina's verwijderen"
-
-#: templates/designer/side_menu.phtml:77 templates/designer/side_menu.phtml:80
-#: templates/table/create_table.phtml:7
+#: templates/database/create_table.phtml:7
+#: templates/database/designer/side_menu.phtml:77
+#: templates/database/designer/side_menu.phtml:80
 msgid "Create table"
 msgstr "Tabel aanmaken"
 
-#: templates/designer/side_menu.phtml:98
-#: templates/designer/side_menu.phtml:101
+#: templates/database/create_table.phtml:15
+msgid "Number of columns"
+msgstr "Aantal kolommen"
+
+#: templates/database/designer/aggregate_query_panel.phtml:22
+#: templates/database/designer/options_panel.phtml:100
+msgid "Aggregate"
+msgstr "Samenvoegen"
+
+#: templates/database/designer/aggregate_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:61
+#: templates/database/designer/options_panel.phtml:106
+#: templates/database/designer/options_panel.phtml:170
+#: templates/database/designer/where_query_panel.phtml:30
+#: templates/table/search/table_header.phtml:9
+msgid "Operator"
+msgstr "Operator"
+
+#: templates/database/designer/database_tables.phtml:29
+msgid "Toggle"
+msgstr "Schakel"
+
+#: templates/database/designer/database_tables.phtml:40
+msgid "See table structure"
+msgstr "Zie tabelstructuur"
+
+#: templates/database/designer/delete_relation_panel.phtml:21
+msgid "Delete relation"
+msgstr "Relatie verwijderen"
+
+#: templates/database/designer/edit_delete_pages.phtml:7
+msgid "Page to open"
+msgstr "Pagina om te openen"
+
+#: templates/database/designer/edit_delete_pages.phtml:7
+msgid "Page to delete"
+msgstr "Pagina om te verwijderen"
+
+#: templates/database/designer/having_query_panel.phtml:90
+#: templates/database/designer/options_panel.phtml:63
+#: templates/database/designer/options_panel.phtml:229
+#: templates/database/designer/where_query_panel.phtml:59
+msgid "Except"
+msgstr "Behalve"
+
+#: templates/database/designer/having_query_panel.phtml:102
+#: templates/database/designer/options_panel.phtml:75
+#: templates/database/designer/options_panel.phtml:241
+#: templates/database/designer/where_query_panel.phtml:71
+msgid "subquery"
+msgstr "subquery"
+
+#: templates/database/designer/new_relation_panel.phtml:22
+#: templates/database/designer/side_menu.phtml:84
+#: templates/database/designer/side_menu.phtml:87
+msgid "Create relation"
+msgstr "Maak relatie"
+
+#: templates/database/designer/options_panel.phtml:34
+#: templates/database/designer/options_panel.phtml:200
+msgid "Relation operator"
+msgstr "Relatiebeheerder"
+
+#: templates/database/designer/options_panel.phtml:85
+#: templates/database/designer/rename_to_panel.phtml:23
+msgid "Rename to"
+msgstr "Hernoemen naar"
+
+#: templates/database/designer/options_panel.phtml:91
+#: templates/database/designer/rename_to_panel.phtml:31
+msgid "New name"
+msgstr "Nieuwe naam"
+
+#: templates/database/designer/page_save_as.phtml:4
+msgid "Save to selected page"
+msgstr "Opslaan naar geselecteerde pagina"
+
+#: templates/database/designer/page_save_as.phtml:5
+msgid "Create a page and save to it"
+msgstr "Een pagina aanmaken en ernaar opslaan"
+
+#: templates/database/designer/page_save_as.phtml:26
+msgid "New page name"
+msgstr "Nieuwe paginanaam"
+
+#: templates/database/designer/page_selector.phtml:2
+msgid "Select page"
+msgstr "Selecteer pagina"
+
+#: templates/database/designer/query_details.phtml:10
+msgid "Active options"
+msgstr "Actieve opties"
+
+#: templates/database/designer/schema_export.phtml:4
+msgid "Select Export Relational Type"
+msgstr "Selecteer uitvoer relationeel type"
+
+#: templates/database/designer/side_menu.phtml:19
+#: templates/database/designer/side_menu.phtml:25
+msgid "Show/Hide tables list"
+msgstr "Toon/verberg lijst met tabellen"
+
+#: templates/database/designer/side_menu.phtml:29
+#: templates/database/designer/side_menu.phtml:35
+#: templates/database/designer/side_menu.phtml:36
+msgid "View in fullscreen"
+msgstr "In volledig scherm bekijken"
+
+#: templates/database/designer/side_menu.phtml:34
+msgid "Exit fullscreen"
+msgstr "Volledig scherm modus verlaten"
+
+#: templates/database/designer/side_menu.phtml:41
+#: templates/database/designer/side_menu.phtml:45
+msgid "New page"
+msgstr "Nieuwe pagina"
+
+#: templates/database/designer/side_menu.phtml:70
+#: templates/database/designer/side_menu.phtml:73
+msgid "Delete pages"
+msgstr "Pagina's verwijderen"
+
+#: templates/database/designer/side_menu.phtml:98
+#: templates/database/designer/side_menu.phtml:101
 msgid "Reload"
 msgstr "Verversen"
 
-#: templates/designer/side_menu.phtml:107
-#: templates/designer/side_menu.phtml:110
+#: templates/database/designer/side_menu.phtml:107
+#: templates/database/designer/side_menu.phtml:110
 msgid "Help"
 msgstr "Help"
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Angular links"
 msgstr "Hoekige verbindingen"
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Direct links"
 msgstr "Directe verbindingen"
 
-#: templates/designer/side_menu.phtml:122
-#: templates/designer/side_menu.phtml:124
+#: templates/database/designer/side_menu.phtml:122
+#: templates/database/designer/side_menu.phtml:124
 msgid "Snap to grid"
 msgstr "Kleef aan raster"
 
-#: templates/designer/side_menu.phtml:128
-#: templates/designer/side_menu.phtml:134
+#: templates/database/designer/side_menu.phtml:128
+#: templates/database/designer/side_menu.phtml:134
 msgid "Small/Big All"
 msgstr "Alles in-/uitklappen"
 
-#: templates/designer/side_menu.phtml:138
-#: templates/designer/side_menu.phtml:141
+#: templates/database/designer/side_menu.phtml:138
+#: templates/database/designer/side_menu.phtml:141
 msgid "Toggle small/big"
 msgstr "Wissel klein/groot"
 
-#: templates/designer/side_menu.phtml:145
-#: templates/designer/side_menu.phtml:148
+#: templates/database/designer/side_menu.phtml:145
+#: templates/database/designer/side_menu.phtml:148
 msgid "Toggle relation lines"
 msgstr "Relatielijnen wisselen"
 
-#: templates/designer/side_menu.phtml:153
-#: templates/designer/side_menu.phtml:156
+#: templates/database/designer/side_menu.phtml:153
+#: templates/database/designer/side_menu.phtml:156
 msgid "Export schema"
 msgstr "Schema exporteren"
 
-#: templates/designer/side_menu.phtml:165
-#: templates/designer/side_menu.phtml:168
+#: templates/database/designer/side_menu.phtml:165
+#: templates/database/designer/side_menu.phtml:168
 msgid "Build Query"
 msgstr "Query opbouwen"
 
-#: templates/designer/side_menu.phtml:173
-#: templates/designer/side_menu.phtml:177
+#: templates/database/designer/side_menu.phtml:173
+#: templates/database/designer/side_menu.phtml:177
 msgid "Move Menu"
 msgstr "Menu verplaatsen"
 
-#: templates/designer/side_menu.phtml:181
-#: templates/designer/side_menu.phtml:186
+#: templates/database/designer/side_menu.phtml:181
+#: templates/database/designer/side_menu.phtml:186
 msgid "Pin text"
 msgstr "Pin tekst"
 
-#: templates/designer/table_list.phtml:4
+#: templates/database/designer/table_list.phtml:4
 msgid "Hide/Show all"
 msgstr "Alles tonen/verbergen"
 
-#: templates/designer/table_list.phtml:14
+#: templates/database/designer/table_list.phtml:14
 msgid "Hide/Show Tables with no relation"
 msgstr "Tabellen zonder relatie tonen/verbergen"
 
-#: templates/designer/table_list.phtml:59
+#: templates/database/designer/table_list.phtml:59
 msgid "Number of tables:"
 msgstr "Aantal tabellen:"
 
+#: templates/database/structure/body_for_table_summary.phtml:6
+#, php-format
+msgid "%s table"
+msgid_plural "%s tables"
+msgstr[0] "%s tabel"
+msgstr[1] "%s tabellen"
+
+#: templates/database/structure/body_for_table_summary.phtml:17
+msgid "Sum"
+msgstr "Som"
+
+#: templates/database/structure/check_all_tables.phtml:6
+msgid "Check tables having overhead"
+msgstr "Selecteer tabellen met overhead"
+
+#: templates/database/structure/check_all_tables.phtml:10
+msgid "Show create"
+msgstr "Toon aanmaken"
+
+#: templates/database/structure/check_all_tables.phtml:27
+msgid "Prefix"
+msgstr "Voorvoegsel"
+
+#: templates/database/structure/check_all_tables.phtml:28
+msgid "Add prefix to table"
+msgstr "Voeg voorvoegsel toe aan tabel"
+
+#: templates/database/structure/check_all_tables.phtml:29
+msgid "Replace table prefix"
+msgstr "Vervang tabelvoorvoegsel"
+
+#: templates/database/structure/check_all_tables.phtml:30
+msgid "Copy table with prefix"
+msgstr "Vervang tabel met voorvoegsel"
+
+#: templates/database/structure/check_all_tables.phtml:36
+msgid "Add columns to central list"
+msgstr "Voeg kolommen toe aan centrale lijst"
+
+#: templates/database/structure/check_all_tables.phtml:37
+msgid "Remove columns from central list"
+msgstr "Verwijder kolommen uit de centrale lijst"
+
+#: templates/database/structure/check_all_tables.phtml:38
+msgid "Make consistent with central list"
+msgstr "Maak in overeenstemming met centrale lijst"
+
+#: templates/database/structure/favorite_anchor.phtml:12
+msgid "Add to Favorites"
+msgstr "Voeg toe aan favorieten"
+
+#: templates/database/structure/show_create.phtml:2
+msgid "Showing create queries"
+msgstr "Aanmaakquery's worden getoond"
+
+#: templates/database/structure/sortable_header.phtml:13
+msgid "Sort"
+msgstr "Sorteren"
+
+#: templates/database/structure/table_header.phtml:42
+msgid ""
+"May be approximate. Click on the number to get the exact count. See "
+"[doc@faq3-11]FAQ 3.11[/doc]."
+msgstr ""
+"Bij benadering. Klik op het getal voor de exacte hoeveelheid. Zie "
+"[doc@faq3-11]FAQ 3.11[/doc]."
+
+#: templates/database/structure/table_header.phtml:66
+#: templates/table/index_form.phtml:127
+msgid "Size"
+msgstr "Grootte"
+
+#: templates/database/structure/table_header.phtml:74
+#: templates/table/structure/display_table_stats.phtml:27
+msgid "Overhead"
+msgstr "Overhead"
+
+#: templates/database/structure/tracking_icon.phtml:4
+msgid "Tracking is active."
+msgstr "Tracking is ingeschakeld."
+
+#: templates/database/structure/tracking_icon.phtml:8
+msgid "Tracking is not active."
+msgstr "Tracking is niet actief."
+
 #: templates/error/report_form.phtml:7
 msgid ""
 "phpMyAdmin has encountered an error. We have collected data about this error "
@@ -15192,61 +15298,6 @@ msgstr "U kan de gegevens in het foutmeldingsverslag bekijken:"
 msgid "Please explain the steps that lead to the error:"
 msgstr "Geef de stappen aan die tot de fout leiden:"
 
-#: templates/gis_visualization/gis_visualization.phtml:3
-msgid "Display GIS Visualization"
-msgstr "GIS-visualisatie tonen"
-
-#: templates/gis_visualization/gis_visualization.phtml:8
-msgid "Label column"
-msgstr "Kolom naam geven"
-
-#: templates/gis_visualization/gis_visualization.phtml:11
-msgid "-- None --"
-msgstr "-- Geen --"
-
-#: templates/gis_visualization/gis_visualization.phtml:19
-msgid "Spatial column"
-msgstr "Plaatshoudende kolom"
-
-#: templates/index_form.phtml:16
-msgid "Index name:"
-msgstr "Indexnaam:"
-
-#: templates/index_form.phtml:19
-msgid ""
-"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
-msgstr ""
-"\"PRIMARY\" <b>moet</b> de naam van en <b>alleen van</b> een primaire "
-"sleutel zijn!"
-
-#: templates/index_form.phtml:40
-msgid "Index choice:"
-msgstr "Index keuze:"
-
-#: templates/index_form.phtml:57
-msgid "Key block size:"
-msgstr "Sleutelveld grootte:"
-
-#: templates/index_form.phtml:74
-msgid "Index type:"
-msgstr "Indextype:"
-
-#: templates/index_form.phtml:86
-msgid "Parser:"
-msgstr "Lezer:"
-
-#: templates/index_form.phtml:102
-msgid "Comment:"
-msgstr "Opmerking:"
-
-#: templates/index_form.phtml:127 templates/structure/table_header.phtml:66
-msgid "Size"
-msgstr "Grootte"
-
-#: templates/index_form.phtml:149 templates/index_form.phtml:190
-msgid "Drag to reorder"
-msgstr "Sleep om te herschikken"
-
 #: templates/prefs_autoload.phtml:9
 msgid ""
 "Your browser has phpMyAdmin configuration for this domain. Would you like to "
@@ -15259,361 +15310,152 @@ msgstr ""
 msgid "Start row:"
 msgstr "Startregel:"
 
-#: templates/structure/actions_in_table_structure.phtml:14
-#, php-format
-msgid "A primary key has been added on %s."
-msgstr "Een primaire sleutel is toegevoegd aan %s."
-
-#: templates/structure/actions_in_table_structure.phtml:34
-#: templates/structure/actions_in_table_structure.phtml:54
-#: templates/structure/actions_in_table_structure.phtml:79
-#: templates/structure/actions_in_table_structure.phtml:101
-#, php-format
-msgid "An index has been added on %s."
-msgstr "Een index is toegevoegd aan %s."
-
-#: templates/structure/actions_in_table_structure.phtml:130
-#: templates/structure/check_all_table_column.phtml:59
-msgid "Remove from central columns"
-msgstr "Verwijderen uit centrale kolommen"
-
-#: templates/structure/actions_in_table_structure.phtml:138
-#: templates/structure/check_all_table_column.phtml:55
-msgid "Add to central columns"
-msgstr "Toevoegen aan centrale kolommen"
-
-#: templates/structure/add_column.phtml:7
-#, php-format
-msgid "Add %s column(s)"
-msgstr "%s kolom(men) toevoegen"
-
-#: templates/structure/add_column.phtml:12
-msgid "at beginning of table"
-msgstr "bij begin van de tabel"
-
-#: templates/structure/body_for_table_summary.phtml:6
-#, php-format
-msgid "%s table"
-msgid_plural "%s tables"
-msgstr[0] "%s tabel"
-msgstr[1] "%s tabellen"
-
-#: templates/structure/body_for_table_summary.phtml:17
-msgid "Sum"
-msgstr "Som"
-
-#: templates/structure/check_all_tables.phtml:6
-msgid "Check tables having overhead"
-msgstr "Selecteer tabellen met overhead"
-
-#: templates/structure/check_all_tables.phtml:10
-msgid "Show create"
-msgstr "Toon aanmaken"
-
-#: templates/structure/check_all_tables.phtml:27
-msgid "Prefix"
-msgstr "Voorvoegsel"
-
-#: templates/structure/check_all_tables.phtml:28
-msgid "Add prefix to table"
-msgstr "Voeg voorvoegsel toe aan tabel"
-
-#: templates/structure/check_all_tables.phtml:29
-msgid "Replace table prefix"
-msgstr "Vervang tabelvoorvoegsel"
-
-#: templates/structure/check_all_tables.phtml:30
-msgid "Copy table with prefix"
-msgstr "Vervang tabel met voorvoegsel"
-
-#: templates/structure/check_all_tables.phtml:36
-msgid "Add columns to central list"
-msgstr "Voeg kolommen toe aan centrale lijst"
-
-#: templates/structure/check_all_tables.phtml:37
-msgid "Remove columns from central list"
-msgstr "Verwijder kolommen uit de centrale lijst"
-
-#: templates/structure/check_all_tables.phtml:38
-msgid "Make consistent with central list"
-msgstr "Maak in overeenstemming met centrale lijst"
-
-#: templates/structure/display_structure.phtml:140 view_create.php:181
-msgid "Edit view"
-msgstr "View bewerken"
-
-#: templates/structure/display_table_stats.phtml:9
-msgid "Space usage"
-msgstr "Ruimtegebruik"
-
-#: templates/structure/display_table_stats.phtml:27
-#: templates/structure/table_header.phtml:74
-msgid "Overhead"
-msgstr "Overhead"
-
-#: templates/structure/display_table_stats.phtml:32
-msgid "Effective"
-msgstr "Effectief"
-
-#: templates/structure/favorite_anchor.phtml:12
-msgid "Add to Favorites"
-msgstr "Voeg toe aan favorieten"
-
-#: templates/structure/move_columns_dialog.phtml:1
-#: templates/structure/optional_action_links.phtml:21
-msgid "Move columns"
-msgstr "Kolommen verplaatsen"
-
-#: templates/structure/move_columns_dialog.phtml:2
-msgid "Move the columns by dragging them up and down."
-msgstr "De kolommen verplaatsen door ze omhoog en omlaag te slepen."
-
-#: templates/structure/optional_action_links.phtml:9
-msgid "Propose table structure"
-msgstr "Tabelstructuur voorstellen"
-
-#: templates/structure/optional_action_links.phtml:24
-msgid "Improve table structure"
-msgstr "Tabelstructuur verbeteren"
-
-#: templates/structure/optional_action_links.phtml:30
-msgid "Track view"
-msgstr "View volgen"
-
-#: templates/structure/row_stats_table.phtml:3
-msgid "Row statistics"
-msgstr "Rijstatistieken"
-
-#: templates/structure/row_stats_table.phtml:9
-msgid "static"
-msgstr "statisch"
-
-#: templates/structure/row_stats_table.phtml:11
-msgid "dynamic"
-msgstr "dynamisch"
-
-#: templates/structure/row_stats_table.phtml:22
-msgid "partitioned"
-msgstr "gepartitioneerd"
-
-#: templates/structure/row_stats_table.phtml:54
-msgid "Row length"
-msgstr "Lengte van de rij"
-
-#: templates/structure/row_stats_table.phtml:66
-msgid "Row size"
-msgstr "Grootte van de rij"
-
-#: templates/structure/row_stats_table.phtml:73
-msgid "Next autoindex"
-msgstr "Volgende automatische indexwaarde"
-
-#: templates/structure/secondary_tabs.phtml:14
-msgid "Relation view"
-msgstr "Relatie overzicht"
-
-#: templates/structure/show_create.phtml:2
-msgid "Showing create queries"
-msgstr "Aanmaakquery's worden getoond"
-
-#: templates/structure/sortable_header.phtml:13
-msgid "Sort"
-msgstr "Sorteren"
-
-#: templates/structure/table_header.phtml:42
-msgid ""
-"May be approximate. Click on the number to get the exact count. See "
-"[doc@faq3-11]FAQ 3.11[/doc]."
-msgstr ""
-"Bij benadering. Klik op het getal voor de exacte hoeveelheid. Zie "
-"[doc@faq3-11]FAQ 3.11[/doc]."
-
-#: templates/structure/table_structure_row.phtml:46
-#, php-format
-msgid "Column %s has been dropped."
-msgstr "Kolom %s is verwijderd."
-
-#: templates/structure/tracking_icon.phtml:4
-msgid "Tracking is active."
-msgstr "Tracking is ingeschakeld."
-
-#: templates/structure/tracking_icon.phtml:8
-msgid "Tracking is not active."
-msgstr "Tracking is niet actief."
-
-#: templates/table/create_table.phtml:15
-msgid "Number of columns"
-msgstr "Aantal kolommen"
-
-#: templates/table/options.phtml:8
-msgid "Select columns (at least one):"
-msgstr "Selecteer kolommen (minstens één):"
-
-#: templates/table/options.phtml:37
-msgid "Add search conditions (body of the \"where\" clause):"
-msgstr "Zoekcondities toevoegen (het \"where\"-gedeelte van de query):"
-
-#: templates/table/options.phtml:45
-msgid "Number of rows per page"
-msgstr "Aantal rijen per pagina"
-
-#: templates/table/options.phtml:56
-msgid "Display order:"
-msgstr "Volgorde van weergave:"
-
-#: templates/table/options_zoom.phtml:6
-msgid "Use this column to label each point"
-msgstr "Gebruik deze kolom om ieder punt een naam te geven"
-
-#: templates/table/options_zoom.phtml:35
-msgid "Maximum rows to plot"
-msgstr "Maximum aantal af te drukken regels"
-
-#: templates/table/replace_preview.phtml:13
-msgid "Find and replace - preview"
-msgstr "Zoeken en vervangen - voorbeeld"
-
-#: templates/table/replace_preview.phtml:18
-msgid "Original string"
-msgstr "Oorspronkelijke tekenreeks"
-
-#: templates/table/replace_preview.phtml:19
-msgid "Replaced string"
-msgstr "Vervangen tekenreeks"
-
-#: templates/table/replace_preview.phtml:40
-msgid "Replace"
-msgstr "Vervang"
-
-#: templates/table/rows_zoom.phtml:16
-msgid "Additional search criteria"
-msgstr "Bijkomende zoekcriteria"
-
-#: templates/table/search_and_replace.phtml:3
-msgid "Replace with:"
-msgstr "Vervang door:"
-
-#: templates/table/search_and_replace.phtml:22
-msgid "Use regular expression"
-msgstr "Gebruik een reguliere expressie"
-
-#: templates/table/selection_form.phtml:12
-msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
-msgstr ""
-"Voer een \"query als voorbeeld\" (wildcard: \"%\") uit op twee verschillende "
-"kolommen"
-
-#: templates/table/selection_form.phtml:34
-msgid "Do a \"query by example\" (wildcard: \"%\")"
-msgstr "Voer een query op basis van een vergelijking uit (wildcard: \"%\")"
-
-#: templates/table/zoom_result_form.phtml:7
-msgid "Browse/Edit the points"
-msgstr "Doorzoek/bewerk de punten"
-
-#: templates/table/zoom_result_form.phtml:15
-msgid "How to use"
-msgstr "Hoe te gebruiken"
-
-#: templates/table/zoom_result_form.phtml:23
-msgid "Reset zoom"
-msgstr "Herstel zoom"
-
-#: templates/tbl_chart.phtml:17
+#: templates/table/chart/tbl_chart.phtml:17
 msgctxt "Chart type"
 msgid "Bar"
 msgstr "Balk"
 
-#: templates/tbl_chart.phtml:21
+#: templates/table/chart/tbl_chart.phtml:21
 msgctxt "Chart type"
 msgid "Column"
 msgstr "Kolom"
 
-#: templates/tbl_chart.phtml:25
+#: templates/table/chart/tbl_chart.phtml:25
 msgctxt "Chart type"
 msgid "Line"
 msgstr "Lijn"
 
 # "Inline" vertaalt naar "rechtstreeks in het document", als het ware binnen
 # iets anders.
-#: templates/tbl_chart.phtml:29
+#: templates/table/chart/tbl_chart.phtml:29
 msgctxt "Chart type"
 msgid "Spline"
 msgstr "Spline"
 
-#: templates/tbl_chart.phtml:33
+#: templates/table/chart/tbl_chart.phtml:33
 msgctxt "Chart type"
 msgid "Area"
 msgstr "Grafiektype"
 
-#: templates/tbl_chart.phtml:37
+#: templates/table/chart/tbl_chart.phtml:37
 msgctxt "Chart type"
 msgid "Pie"
 msgstr "Taart"
 
-#: templates/tbl_chart.phtml:41
+#: templates/table/chart/tbl_chart.phtml:41
 msgctxt "Chart type"
 msgid "Timeline"
 msgstr "Tijdlijn"
 
-#: templates/tbl_chart.phtml:45
+#: templates/table/chart/tbl_chart.phtml:45
 msgctxt "Chart type"
 msgid "Scatter"
 msgstr "Puntenwolk"
 
-#: templates/tbl_chart.phtml:50
+#: templates/table/chart/tbl_chart.phtml:50
 msgid "Stacked"
 msgstr "Opgestapeld"
 
-#: templates/tbl_chart.phtml:53
+#: templates/table/chart/tbl_chart.phtml:53
 msgid "Chart title"
 msgstr "Grafiektitel"
 
-#: templates/tbl_chart.phtml:57
+#: templates/table/chart/tbl_chart.phtml:57
 msgid "X-Axis:"
 msgstr "X-as:"
 
-#: templates/tbl_chart.phtml:72
+#: templates/table/chart/tbl_chart.phtml:72
 msgid "Series:"
 msgstr "Series:"
 
-#: templates/tbl_chart.phtml:102
+#: templates/table/chart/tbl_chart.phtml:102
 msgid "X-Axis label:"
 msgstr "Label X-as:"
 
-#: templates/tbl_chart.phtml:104
+#: templates/table/chart/tbl_chart.phtml:104
 msgid "X Values"
 msgstr "X-waarden"
 
-#: templates/tbl_chart.phtml:107
+#: templates/table/chart/tbl_chart.phtml:107
 msgid "Y-Axis label:"
 msgstr "Label van Y-as:"
 
-#: templates/tbl_chart.phtml:115
+#: templates/table/chart/tbl_chart.phtml:115
 msgid "Series names are in a column"
 msgstr "Namen van de series zitten in een kolom"
 
-#: templates/tbl_chart.phtml:118
+#: templates/table/chart/tbl_chart.phtml:118
 msgid "Series column:"
 msgstr "Kolom met series:"
 
-#: templates/tbl_chart.phtml:130
+#: templates/table/chart/tbl_chart.phtml:130
 msgid "Value Column:"
 msgstr "Kolom met waarden:"
 
-#: templates/tbl_chart.phtml:150
+#: templates/table/chart/tbl_chart.phtml:150
 msgid "Save chart as image"
 msgstr "Sla grafiek op als afbeelding"
 
-#: templates/tbl_relation/common_form.phtml:7
+#: templates/table/gis_visualization/gis_visualization.phtml:3
+msgid "Display GIS Visualization"
+msgstr "GIS-visualisatie tonen"
+
+#: templates/table/gis_visualization/gis_visualization.phtml:8
+msgid "Label column"
+msgstr "Kolom naam geven"
+
+#: templates/table/gis_visualization/gis_visualization.phtml:11
+msgid "-- None --"
+msgstr "-- Geen --"
+
+#: templates/table/gis_visualization/gis_visualization.phtml:19
+msgid "Spatial column"
+msgstr "Plaatshoudende kolom"
+
+#: templates/table/index_form.phtml:16
+msgid "Index name:"
+msgstr "Indexnaam:"
+
+#: templates/table/index_form.phtml:19
+msgid ""
+"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
+msgstr ""
+"\"PRIMARY\" <b>moet</b> de naam van en <b>alleen van</b> een primaire "
+"sleutel zijn!"
+
+#: templates/table/index_form.phtml:40
+msgid "Index choice:"
+msgstr "Index keuze:"
+
+#: templates/table/index_form.phtml:57
+msgid "Key block size:"
+msgstr "Sleutelveld grootte:"
+
+#: templates/table/index_form.phtml:74
+msgid "Index type:"
+msgstr "Indextype:"
+
+#: templates/table/index_form.phtml:86
+msgid "Parser:"
+msgstr "Lezer:"
+
+#: templates/table/index_form.phtml:102
+msgid "Comment:"
+msgstr "Opmerking:"
+
+#: templates/table/index_form.phtml:149 templates/table/index_form.phtml:190
+msgid "Drag to reorder"
+msgstr "Sleep om te herschikken"
+
+#: templates/table/relation/common_form.phtml:7
 msgid "Internal relations"
 msgstr "Interne relaties"
 
-#: templates/tbl_relation/common_form.phtml:11
+#: templates/table/relation/common_form.phtml:11
 msgid "Internal relation"
 msgstr "Interne relatie"
 
-#: templates/tbl_relation/common_form.phtml:14
+#: templates/table/relation/common_form.phtml:14
 msgid ""
 "An internal relation is not necessary when a corresponding FOREIGN KEY "
 "relation exists."
@@ -15621,50 +15463,226 @@ msgstr ""
 "Een interne relatie is niet noodzakelijk wanneer er reeds een FOREIGN KEY-"
 "relatie bestaat."
 
-#: templates/tbl_relation/common_form.phtml:37
+#: templates/table/relation/common_form.phtml:37
 msgid "Foreign key constraints"
 msgstr "Beperkingen voor vreemde sleutel"
 
-#: templates/tbl_relation/common_form.phtml:40
+#: templates/table/relation/common_form.phtml:40
 msgid "Actions"
 msgstr "Acties"
 
-#: templates/tbl_relation/common_form.phtml:41
+#: templates/table/relation/common_form.phtml:41
 msgid "Constraint properties"
 msgstr "Beperkingseigenschappen"
 
-#: templates/tbl_relation/common_form.phtml:44
+#: templates/table/relation/common_form.phtml:44
 msgid ""
 "Only columns with index will be displayed. You can define an index below."
 msgstr ""
 "Alleen kolommen met een index zullen worden weergegeven. U kunt hieronder "
 "een index definiëren."
 
-#: templates/tbl_relation/common_form.phtml:49
+#: templates/table/relation/common_form.phtml:49
 msgid "Foreign key constraint"
 msgstr "Beperking voor vreemde sleutel"
 
-#: templates/tbl_relation/common_form.phtml:81
+#: templates/table/relation/common_form.phtml:81
 msgid "+ Add constraint"
 msgstr "+ Voeg beperking toe"
 
-#: templates/tbl_relation/common_form.phtml:91
+#: templates/table/relation/common_form.phtml:91
 msgid "Choose column to display:"
 msgstr "Kies weer te geven kolom:"
 
-#: templates/tbl_relation/foreign_key_row.phtml:13
+#: templates/table/relation/foreign_key_row.phtml:13
 #, php-format
 msgid "Foreign key constraint %s has been dropped"
 msgstr "Beperkingen voor vreemde sleutel %s werd verwijderd"
 
-#: templates/tbl_relation/foreign_key_row.phtml:102
+#: templates/table/relation/foreign_key_row.phtml:102
 msgid "Constraint name"
 msgstr "Naam van de beperking"
 
-#: templates/tbl_relation/foreign_key_row.phtml:157
+#: templates/table/relation/foreign_key_row.phtml:157
 msgid "+ Add column"
 msgstr "+ Kolom toevoegen"
 
+#: templates/table/search/options.phtml:8
+msgid "Select columns (at least one):"
+msgstr "Selecteer kolommen (minstens één):"
+
+#: templates/table/search/options.phtml:37
+msgid "Add search conditions (body of the \"where\" clause):"
+msgstr "Zoekcondities toevoegen (het \"where\"-gedeelte van de query):"
+
+#: templates/table/search/options.phtml:45
+msgid "Number of rows per page"
+msgstr "Aantal rijen per pagina"
+
+#: templates/table/search/options.phtml:56
+msgid "Display order:"
+msgstr "Volgorde van weergave:"
+
+#: templates/table/search/options_zoom.phtml:6
+msgid "Use this column to label each point"
+msgstr "Gebruik deze kolom om ieder punt een naam te geven"
+
+#: templates/table/search/options_zoom.phtml:35
+msgid "Maximum rows to plot"
+msgstr "Maximum aantal af te drukken regels"
+
+#: templates/table/search/replace_preview.phtml:13
+msgid "Find and replace - preview"
+msgstr "Zoeken en vervangen - voorbeeld"
+
+#: templates/table/search/replace_preview.phtml:18
+msgid "Original string"
+msgstr "Oorspronkelijke tekenreeks"
+
+#: templates/table/search/replace_preview.phtml:19
+msgid "Replaced string"
+msgstr "Vervangen tekenreeks"
+
+#: templates/table/search/replace_preview.phtml:40
+msgid "Replace"
+msgstr "Vervang"
+
+#: templates/table/search/rows_zoom.phtml:16
+msgid "Additional search criteria"
+msgstr "Bijkomende zoekcriteria"
+
+#: templates/table/search/search_and_replace.phtml:3
+msgid "Replace with:"
+msgstr "Vervang door:"
+
+#: templates/table/search/search_and_replace.phtml:22
+msgid "Use regular expression"
+msgstr "Gebruik een reguliere expressie"
+
+#: templates/table/search/selection_form.phtml:12
+msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
+msgstr ""
+"Voer een \"query als voorbeeld\" (wildcard: \"%\") uit op twee verschillende "
+"kolommen"
+
+#: templates/table/search/selection_form.phtml:34
+msgid "Do a \"query by example\" (wildcard: \"%\")"
+msgstr "Voer een query op basis van een vergelijking uit (wildcard: \"%\")"
+
+#: templates/table/search/zoom_result_form.phtml:7
+msgid "Browse/Edit the points"
+msgstr "Doorzoek/bewerk de punten"
+
+#: templates/table/search/zoom_result_form.phtml:15
+msgid "How to use"
+msgstr "Hoe te gebruiken"
+
+#: templates/table/search/zoom_result_form.phtml:23
+msgid "Reset zoom"
+msgstr "Herstel zoom"
+
+#: templates/table/secondary_tabs.phtml:14
+msgid "Relation view"
+msgstr "Relatie overzicht"
+
+#: templates/table/structure/actions_in_table_structure.phtml:14
+#, php-format
+msgid "A primary key has been added on %s."
+msgstr "Een primaire sleutel is toegevoegd aan %s."
+
+#: templates/table/structure/actions_in_table_structure.phtml:34
+#: templates/table/structure/actions_in_table_structure.phtml:54
+#: templates/table/structure/actions_in_table_structure.phtml:79
+#: templates/table/structure/actions_in_table_structure.phtml:101
+#, php-format
+msgid "An index has been added on %s."
+msgstr "Een index is toegevoegd aan %s."
+
+#: templates/table/structure/actions_in_table_structure.phtml:130
+#: templates/table/structure/check_all_table_column.phtml:59
+msgid "Remove from central columns"
+msgstr "Verwijderen uit centrale kolommen"
+
+#: templates/table/structure/actions_in_table_structure.phtml:138
+#: templates/table/structure/check_all_table_column.phtml:55
+msgid "Add to central columns"
+msgstr "Toevoegen aan centrale kolommen"
+
+#: templates/table/structure/add_column.phtml:7
+#, php-format
+msgid "Add %s column(s)"
+msgstr "%s kolom(men) toevoegen"
+
+#: templates/table/structure/add_column.phtml:12
+msgid "at beginning of table"
+msgstr "bij begin van de tabel"
+
+#: templates/table/structure/display_structure.phtml:140 view_create.php:181
+msgid "Edit view"
+msgstr "View bewerken"
+
+#: templates/table/structure/display_table_stats.phtml:9
+msgid "Space usage"
+msgstr "Ruimtegebruik"
+
+#: templates/table/structure/display_table_stats.phtml:32
+msgid "Effective"
+msgstr "Effectief"
+
+#: templates/table/structure/move_columns_dialog.phtml:1
+#: templates/table/structure/optional_action_links.phtml:21
+msgid "Move columns"
+msgstr "Kolommen verplaatsen"
+
+#: templates/table/structure/move_columns_dialog.phtml:2
+msgid "Move the columns by dragging them up and down."
+msgstr "De kolommen verplaatsen door ze omhoog en omlaag te slepen."
+
+#: templates/table/structure/optional_action_links.phtml:9
+msgid "Propose table structure"
+msgstr "Tabelstructuur voorstellen"
+
+#: templates/table/structure/optional_action_links.phtml:24
+msgid "Improve table structure"
+msgstr "Tabelstructuur verbeteren"
+
+#: templates/table/structure/optional_action_links.phtml:30
+msgid "Track view"
+msgstr "View volgen"
+
+#: templates/table/structure/row_stats_table.phtml:3
+msgid "Row statistics"
+msgstr "Rijstatistieken"
+
+#: templates/table/structure/row_stats_table.phtml:9
+msgid "static"
+msgstr "statisch"
+
+#: templates/table/structure/row_stats_table.phtml:11
+msgid "dynamic"
+msgstr "dynamisch"
+
+#: templates/table/structure/row_stats_table.phtml:22
+msgid "partitioned"
+msgstr "gepartitioneerd"
+
+#: templates/table/structure/row_stats_table.phtml:54
+msgid "Row length"
+msgstr "Lengte van de rij"
+
+#: templates/table/structure/row_stats_table.phtml:66
+msgid "Row size"
+msgstr "Grootte van de rij"
+
+#: templates/table/structure/row_stats_table.phtml:73
+msgid "Next autoindex"
+msgstr "Volgende automatische indexwaarde"
+
+#: templates/table/structure/table_structure_row.phtml:46
+#, php-format
+msgid "Column %s has been dropped."
+msgstr "Kolom %s is verwijderd."
+
 #: themes.php:17 themes.php:22
 msgid "Theme"
 msgstr "Thema"
@@ -17025,6 +17043,9 @@ msgstr ""
 msgid "concurrent_insert is set to 0"
 msgstr "concurrent_insert is ingesteld op 0"
 
+#~ msgid "Read as multibytes"
+#~ msgstr "Lees als mulitbytes"
+
 #~ msgid "Relational display column"
 #~ msgstr "Relationele weergave-kolom"
 
diff --git a/po/pa.po b/po/pa.po
index ddd6391b0d..c3fb4a3a33 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 4.5.0-dev\n"
 "Report-Msgid-Bugs-To: developers@phpmyadmin.net\n"
-"POT-Creation-Date: 2015-08-08 13:53-0400\n"
+"POT-Creation-Date: 2015-08-12 08:10-0400\n"
 "PO-Revision-Date: 2014-01-06 12:13+0200\n"
 "Last-Translator: Michal Čihař <michal@cihar.com>\n"
 "Language-Team: Punjabi <http://hosted.weblate.org/projects/phpmyadmin/master/"
@@ -55,7 +55,7 @@ msgid "Table comments:"
 msgstr ""
 
 #: db_datadict.php:104 libraries/Index.class.php:699
-#: libraries/insert_edit.lib.php:1567
+#: libraries/insert_edit.lib.php:1565
 #: libraries/navigation/Nodes/Node_Column.class.php:30
 #: libraries/plugins/export/ExportHtmlword.class.php:280
 #: libraries/plugins/export/ExportHtmlword.class.php:375
@@ -69,13 +69,14 @@ msgstr ""
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1023
 #: libraries/tracking.lib.php:879 libraries/tracking.lib.php:975
 #: templates/columns_definitions/column_name.phtml:18
-#: templates/index_form.phtml:124 templates/table/table_header.phtml:6
-#: templates/table/zoom_result_form.phtml:33
-#: templates/tbl_relation/common_form.phtml:10
-#: templates/tbl_relation/common_form.phtml:43
-#: templates/tbl_relation/foreign_key_row.phtml:194
-#: templates/tbl_relation/foreign_key_row.phtml:206
-#: templates/tbl_relation/internal_relational_row.phtml:71
+#: templates/table/index_form.phtml:124
+#: templates/table/relation/common_form.phtml:10
+#: templates/table/relation/common_form.phtml:43
+#: templates/table/relation/foreign_key_row.phtml:194
+#: templates/table/relation/foreign_key_row.phtml:206
+#: templates/table/relation/internal_relational_row.phtml:71
+#: templates/table/search/table_header.phtml:6
+#: templates/table/search/zoom_result_form.phtml:33
 msgid "Column"
 msgstr ""
 
@@ -93,21 +94,21 @@ msgstr ""
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1001
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1024
 #: libraries/rte/rte_list.lib.php:75 libraries/rte/rte_list.lib.php:103
-#: libraries/rte/rte_routines.lib.php:802
-#: libraries/rte/rte_routines.lib.php:831
-#: libraries/rte/rte_routines.lib.php:1493
+#: libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_routines.lib.php:922
+#: libraries/rte/rte_routines.lib.php:1584
 #: libraries/server_privileges.lib.php:2369 libraries/tracking.lib.php:880
 #: libraries/tracking.lib.php:972
 #: templates/columns_definitions/table_fields_definitions.phtml:11
-#: templates/structure/table_header.phtml:48
-#: templates/structure/table_structure_header.phtml:6
-#: templates/table/table_header.phtml:7
+#: templates/database/structure/table_header.phtml:48
+#: templates/table/search/table_header.phtml:7
+#: templates/table/structure/table_structure_header.phtml:6
 msgid "Type"
 msgstr ""
 
 #: db_datadict.php:106 libraries/Index.class.php:702
 #: libraries/central_columns.lib.php:708
-#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1576
+#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1574
 #: libraries/plugins/export/ExportHtmlword.class.php:286
 #: libraries/plugins/export/ExportHtmlword.class.php:381
 #: libraries/plugins/export/ExportLatex.class.php:509
@@ -120,8 +121,8 @@ msgstr ""
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1026
 #: libraries/tracking.lib.php:882 libraries/tracking.lib.php:978
 #: templates/columns_definitions/table_fields_definitions.phtml:39
-#: templates/structure/table_structure_header.phtml:9
-#: templates/table/zoom_result_form.phtml:34
+#: templates/table/search/zoom_result_form.phtml:34
+#: templates/table/structure/table_structure_header.phtml:9
 msgid "Null"
 msgstr ""
 
@@ -139,8 +140,8 @@ msgstr ""
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1027
 #: libraries/replication_gui.lib.php:153 libraries/tracking.lib.php:883
 #: templates/columns_definitions/table_fields_definitions.phtml:25
-#: templates/structure/body_for_table_summary.phtml:55
-#: templates/structure/table_structure_header.phtml:10
+#: templates/database/structure/body_for_table_summary.phtml:55
+#: templates/table/structure/table_structure_header.phtml:10
 msgid "Default"
 msgstr ""
 
@@ -168,19 +169,19 @@ msgid "Comments"
 msgstr ""
 
 #: db_datadict.php:146
-#: libraries/controllers/StructureController.class.php:1960
-#: libraries/controllers/StructureController.class.php:1965
+#: libraries/controllers/TableStructureController.class.php:951
+#: libraries/controllers/TableStructureController.class.php:956
 #: libraries/tracking.lib.php:922
 #: templates/columns_definitions/column_indexes.phtml:6
-#: templates/structure/check_all_table_column.phtml:22
-#: templates/structure/display_structure.phtml:74
+#: templates/table/structure/check_all_table_column.phtml:22
+#: templates/table/structure/display_structure.phtml:74
 msgid "Primary"
 msgstr ""
 
 #: db_datadict.php:156 js/messages.php:317 libraries/Index.class.php:567
 #: libraries/Index.class.php:606 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261 libraries/mult_submits.lib.php:403
+#: libraries/config/FormDisplay.tpl.php:272 libraries/mult_submits.lib.php:403
 #: libraries/mult_submits.lib.php:417
 #: libraries/plugins/export/ExportHtmlword.class.php:630
 #: libraries/plugins/export/ExportLatex.class.php:589
@@ -196,20 +197,20 @@ msgstr ""
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1010 libraries/tracking.lib.php:1015
 #: prefs_manage.php:140 templates/prefs_autoload.phtml:15
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "No"
 msgstr ""
 
 #: db_datadict.php:156 js/messages.php:443 libraries/Index.class.php:568
 #: libraries/Index.class.php:605 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261
-#: libraries/controllers/StructureController.class.php:1344
-#: libraries/controllers/StructureController.class.php:2223
-#: libraries/controllers/StructureController.class.php:2232
-#: libraries/controllers/StructureController.class.php:2237
-#: libraries/controllers/StructureController.class.php:2242
-#: libraries/controllers/StructureController.class.php:2247
+#: libraries/config/FormDisplay.tpl.php:272
+#: libraries/controllers/TableStructureController.class.php:539
+#: libraries/controllers/TableStructureController.class.php:1201
+#: libraries/controllers/TableStructureController.class.php:1210
+#: libraries/controllers/TableStructureController.class.php:1215
+#: libraries/controllers/TableStructureController.class.php:1220
+#: libraries/controllers/TableStructureController.class.php:1225
 #: libraries/mult_submits.inc.php:82 libraries/mult_submits.inc.php:178
 #: libraries/mult_submits.lib.php:339 libraries/mult_submits.lib.php:372
 #: libraries/mult_submits.lib.php:401 libraries/mult_submits.lib.php:415
@@ -218,8 +219,8 @@ msgstr ""
 #: libraries/plugins/export/ExportOdt.class.php:756
 #: libraries/plugins/export/ExportTexytext.class.php:567
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1077
-#: libraries/server_databases.lib.php:464
-#: libraries/server_databases.lib.php:474
+#: libraries/server_databases.lib.php:475
+#: libraries/server_databases.lib.php:485
 #: libraries/server_privileges.lib.php:2546
 #: libraries/server_privileges.lib.php:2727
 #: libraries/server_privileges.lib.php:2748
@@ -229,7 +230,7 @@ msgstr ""
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1008 libraries/tracking.lib.php:1013
 #: prefs_manage.php:138 templates/prefs_autoload.phtml:14
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "Yes"
 msgstr ""
 
@@ -239,7 +240,7 @@ msgstr ""
 
 #: db_export.php:37 db_tracking.php:90 export.php:382
 #: libraries/DBQbe.class.php:326
-#: libraries/controllers/StructureController.class.php:231
+#: libraries/controllers/DatabaseStructureController.class.php:170
 #: libraries/navigation/NavigationTree.class.php:897
 msgid "No tables found in database."
 msgstr ""
@@ -250,14 +251,14 @@ msgstr ""
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:26
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:120
-#: templates/structure/show_create.phtml:18
+#: templates/database/structure/show_create.phtml:18
 msgid "Tables"
 msgstr ""
 
 #: db_export.php:52 libraries/Menu.class.php:317 libraries/Menu.class.php:425
-#: libraries/Util.class.php:3333 libraries/Util.class.php:3343
-#: libraries/Util.class.php:3349 libraries/Util.class.php:3629
-#: libraries/Util.class.php:4327 libraries/Util.class.php:4344
+#: libraries/Util.class.php:3339 libraries/Util.class.php:3349
+#: libraries/Util.class.php:3355 libraries/Util.class.php:3635
+#: libraries/Util.class.php:4333 libraries/Util.class.php:4350
 #: libraries/central_columns.lib.php:728 libraries/config.values.php:39
 #: libraries/config.values.php:47 libraries/config.values.php:109
 #: libraries/config.values.php:115 libraries/config/setup.forms.php:323
@@ -271,7 +272,7 @@ msgstr ""
 #: libraries/navigation/Nodes/Node_Table.class.php:283
 #: libraries/server_privileges.lib.php:1141 libraries/tracking.lib.php:874
 #: templates/columns_definitions/table_fields_definitions.phtml:3
-#: templates/designer/table_list.phtml:28
+#: templates/database/designer/table_list.phtml:28
 msgid "Structure"
 msgstr ""
 
@@ -283,7 +284,7 @@ msgstr ""
 #: libraries/config/user_preferences.forms.php:292
 #: libraries/config/user_preferences.forms.php:297
 #: libraries/server_privileges.lib.php:1140
-#: templates/structure/display_table_stats.phtml:12
+#: templates/table/structure/display_table_stats.phtml:12
 msgid "Data"
 msgstr ""
 
@@ -355,10 +356,10 @@ msgstr ""
 #: libraries/server_privileges.lib.php:2908
 #: libraries/server_privileges.lib.php:3145
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4346
-#: templates/structure/table_header.phtml:21
-#: templates/tbl_relation/foreign_key_row.phtml:176
-#: templates/tbl_relation/internal_relational_row.phtml:63
+#: libraries/server_privileges.lib.php:4372
+#: templates/database/structure/table_header.phtml:21
+#: templates/table/relation/foreign_key_row.phtml:176
+#: templates/table/relation/internal_relational_row.phtml:63
 msgid "Table"
 msgstr ""
 
@@ -375,7 +376,7 @@ msgid "Updated"
 msgstr ""
 
 #: db_tracking.php:130 js/messages.php:243 libraries/Menu.class.php:552
-#: libraries/Util.class.php:4314 libraries/config.values.php:104
+#: libraries/Util.class.php:4320 libraries/config.values.php:104
 #: libraries/rte/rte_events.lib.php:393 libraries/rte/rte_list.lib.php:101
 #: libraries/server_status_processes.lib.php:92 libraries/tracking.lib.php:279
 msgid "Status"
@@ -384,14 +385,15 @@ msgstr ""
 #: db_tracking.php:131 db_tracking.php:290 libraries/Index.class.php:693
 #: libraries/central_columns.lib.php:687 libraries/rte/rte_list.lib.php:74
 #: libraries/rte/rte_list.lib.php:89 libraries/rte/rte_list.lib.php:102
-#: libraries/server_databases.lib.php:398
+#: libraries/server_databases.lib.php:409
 #: libraries/server_privileges.lib.php:2372
 #: libraries/server_privileges.lib.php:3166
 #: libraries/server_privileges.lib.php:3342
 #: libraries/server_user_groups.lib.php:82
 #: libraries/server_variables.lib.php:189 libraries/tracking.lib.php:280
-#: libraries/tracking.lib.php:793 templates/structure/table_header.phtml:30
-#: templates/structure/table_structure_header.phtml:23
+#: libraries/tracking.lib.php:793
+#: templates/database/structure/table_header.phtml:30
+#: templates/table/structure/table_structure_header.phtml:23
 msgid "Action"
 msgstr ""
 
@@ -433,7 +435,7 @@ msgid "Untracked tables"
 msgstr ""
 
 #: db_tracking.php:305 db_tracking.php:336
-#: templates/structure/optional_action_links.phtml:17
+#: templates/table/structure/optional_action_links.phtml:17
 msgid "Track table"
 msgstr ""
 
@@ -483,7 +485,7 @@ msgid "Value for the column \"%s\""
 msgstr ""
 
 #: gis_data_editor.php:146
-#: templates/gis_visualization/gis_visualization.phtml:37
+#: templates/table/gis_visualization/gis_visualization.phtml:37
 msgid "Use OpenStreetMaps as Base Layer"
 msgstr ""
 
@@ -563,35 +565,35 @@ msgstr ""
 #: libraries/display_change_password.lib.php:162
 #: libraries/display_export.lib.php:402 libraries/display_export.lib.php:408
 #: libraries/display_import.lib.php:392 libraries/index.lib.php:44
-#: libraries/insert_edit.lib.php:1546 libraries/insert_edit.lib.php:1583
+#: libraries/insert_edit.lib.php:1544 libraries/insert_edit.lib.php:1581
 #: libraries/normalization.lib.php:165 libraries/normalization.lib.php:821
 #: libraries/operations.lib.php:38 libraries/operations.lib.php:108
 #: libraries/operations.lib.php:263 libraries/operations.lib.php:306
 #: libraries/operations.lib.php:801 libraries/operations.lib.php:874
 #: libraries/operations.lib.php:923 libraries/operations.lib.php:1337
 #: libraries/operations.lib.php:1658
-#: libraries/plugins/auth/AuthenticationCookie.class.php:244
+#: libraries/plugins/auth/AuthenticationCookie.class.php:232
 #: libraries/replication_gui.lib.php:122 libraries/replication_gui.lib.php:161
 #: libraries/replication_gui.lib.php:324 libraries/replication_gui.lib.php:461
 #: libraries/replication_gui.lib.php:906 libraries/rte/rte_events.lib.php:509
-#: libraries/rte/rte_routines.lib.php:969
-#: libraries/rte/rte_routines.lib.php:1581
+#: libraries/rte/rte_routines.lib.php:1060
+#: libraries/rte/rte_routines.lib.php:1672
 #: libraries/rte/rte_triggers.lib.php:396 libraries/server_bin_log.lib.php:61
 #: libraries/server_privileges.lib.php:705
 #: libraries/server_privileges.lib.php:2106
 #: libraries/server_privileges.lib.php:2872
 #: libraries/server_privileges.lib.php:3553
-#: libraries/server_privileges.lib.php:4627
+#: libraries/server_privileges.lib.php:4653
 #: libraries/server_user_groups.lib.php:285
 #: libraries/sql_query_form.lib.php:369 libraries/sql_query_form.lib.php:429
 #: libraries/tracking.lib.php:533 libraries/tracking.lib.php:653
 #: prefs_manage.php:277 prefs_manage.php:355
 #: templates/columns_definitions/column_definitions_form.phtml:59
-#: templates/header_location.phtml:17 templates/index_form.phtml:238
+#: templates/database/create_table.phtml:21 templates/header_location.phtml:28
 #: templates/startAndNumberOfRowsPanel.phtml:14
-#: templates/structure/add_column.phtml:25
-#: templates/table/create_table.phtml:21
-#: templates/table/selection_form.phtml:75 view_create.php:275
+#: templates/table/index_form.phtml:238
+#: templates/table/search/selection_form.phtml:75
+#: templates/table/structure/add_column.phtml:25 view_create.php:275
 #: view_operations.php:106
 msgid "Go"
 msgstr "ਚੱਲੋ"
@@ -669,7 +671,7 @@ msgstr ""
 msgid "Could not load import plugins, please check your installation!"
 msgstr ""
 
-#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1466
+#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1460
 #, fuzzy, php-format
 #| msgid "Database %1$s has been created."
 msgid "Bookmark %s has been created."
@@ -704,11 +706,11 @@ msgstr ""
 msgid "Back"
 msgstr ""
 
-#: index.php:148 libraries/Footer.class.php:70
+#: index.php:149 libraries/Footer.class.php:70
 msgid "phpMyAdmin Demo Server"
 msgstr ""
 
-#: index.php:152
+#: index.php:153
 #, php-format
 msgid ""
 "You are using the demo server. You can do anything here, but please do not "
@@ -716,110 +718,110 @@ msgid ""
 "at %s."
 msgstr ""
 
-#: index.php:162
+#: index.php:163
 msgid "General Settings"
 msgstr ""
 
-#: index.php:190 libraries/display_change_password.lib.php:50
+#: index.php:191 libraries/display_change_password.lib.php:50
 #: libraries/display_change_password.lib.php:53 user_password.php:247
 msgid "Change password"
 msgstr ""
 
-#: index.php:206
+#: index.php:207
 msgid "Server connection collation"
 msgstr ""
 
-#: index.php:228
+#: index.php:229
 msgid "Appearance Settings"
 msgstr ""
 
-#: index.php:258 prefs_manage.php:285
+#: index.php:259 prefs_manage.php:285
 msgid "More settings"
 msgstr ""
 
-#: index.php:279
+#: index.php:280
 msgid "Database server"
 msgstr ""
 
-#: index.php:282 libraries/plugins/auth/AuthenticationCookie.class.php:181
+#: index.php:283 libraries/plugins/auth/AuthenticationCookie.class.php:169
 msgid "Server:"
 msgstr ""
 
-#: index.php:286
+#: index.php:287
 msgid "Server type:"
 msgstr ""
 
-#: index.php:290 libraries/plugins/export/ExportLatex.class.php:212
+#: index.php:291 libraries/plugins/export/ExportLatex.class.php:212
 #: libraries/plugins/export/ExportSql.class.php:687
 #: libraries/plugins/export/ExportXml.class.php:189
 msgid "Server version:"
 msgstr ""
 
-#: index.php:296
+#: index.php:297
 msgid "Protocol version:"
 msgstr ""
 
-#: index.php:300
+#: index.php:301
 msgid "User:"
 msgstr ""
 
-#: index.php:305
+#: index.php:306
 msgid "Server charset:"
 msgstr ""
 
-#: index.php:320
+#: index.php:321
 msgid "Web server"
 msgstr ""
 
-#: index.php:331
+#: index.php:332
 msgid "Database client version:"
 msgstr ""
 
-#: index.php:335
+#: index.php:336
 msgid "PHP extension:"
 msgstr ""
 
-#: index.php:349
+#: index.php:350
 msgid "PHP version:"
 msgstr ""
 
-#: index.php:360
+#: index.php:361
 msgid "Show PHP information"
 msgstr ""
 
-#: index.php:383
+#: index.php:384
 msgid "Version information:"
 msgstr ""
 
-#: index.php:392 libraries/Util.class.php:432 libraries/Util.class.php:495
-#: libraries/config/FormDisplay.tpl.php:151
+#: index.php:393 libraries/Util.class.php:432 libraries/Util.class.php:495
+#: libraries/config/FormDisplay.tpl.php:162
 #: libraries/display_export.lib.php:577 libraries/engines/pbxt.lib.php:162
 #: libraries/navigation/NavigationHeader.class.php:196
 #: libraries/server_variables.lib.php:160
 msgid "Documentation"
 msgstr ""
 
-#: index.php:399
+#: index.php:400
 msgid "Wiki"
 msgstr ""
 
-#: index.php:408
+#: index.php:409
 msgid "Official Homepage"
 msgstr ""
 
-#: index.php:415
+#: index.php:416
 msgid "Contribute"
 msgstr ""
 
-#: index.php:422
+#: index.php:423
 msgid "Get support"
 msgstr ""
 
-#: index.php:429
+#: index.php:430
 msgid "List of changes"
 msgstr ""
 
-#: index.php:451
+#: index.php:452
 msgid ""
 "You are connected as 'root' with no password, which corresponds to the "
 "default MySQL privileged account. Your MySQL server is running with this "
@@ -827,21 +829,21 @@ msgid ""
 "by setting a password for user 'root'."
 msgstr ""
 
-#: index.php:468
+#: index.php:469
 msgid ""
 "You have enabled mbstring.func_overload in your PHP configuration. This "
 "option is incompatible with phpMyAdmin and might cause some data to be "
 "corrupted!"
 msgstr ""
 
-#: index.php:483
+#: index.php:484
 msgid ""
 "The mbstring PHP extension was not found and you seem to be using a "
 "multibyte charset. Without the mbstring extension phpMyAdmin is unable to "
 "split strings correctly and it may result in unexpected results."
 msgstr ""
 
-#: index.php:500
+#: index.php:501
 msgid ""
 "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini."
 "session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower than "
@@ -849,17 +851,17 @@ msgid ""
 "expire sooner than configured in phpMyAdmin."
 msgstr ""
 
-#: index.php:519
+#: index.php:520
 msgid ""
 "Login cookie store is lower than cookie validity configured in phpMyAdmin, "
 "because of this, your login will expire sooner than configured in phpMyAdmin."
 msgstr ""
 
-#: index.php:535
+#: index.php:536
 msgid "The configuration file now needs a secret passphrase (blowfish_secret)."
 msgstr ""
 
-#: index.php:548
+#: index.php:549
 msgid ""
 "Directory [code]config[/code], which is used by the setup script, still "
 "exists in your phpMyAdmin directory. It is strongly recommended to remove it "
@@ -867,26 +869,26 @@ msgid ""
 "may be compromised by unauthorized people downloading your configuration."
 msgstr ""
 
-#: index.php:564
+#: index.php:565
 #, php-format
 msgid ""
 "The phpMyAdmin configuration storage is not completely configured, some "
 "extended features have been deactivated. %sFind out why%s. "
 msgstr ""
 
-#: index.php:571
+#: index.php:572
 msgid ""
 "Or alternately go to 'Operations' tab of any database to set it up there."
 msgstr ""
 
-#: index.php:620
+#: index.php:621
 #, php-format
 msgid ""
 "Your PHP MySQL library version %s differs from your MySQL server version %s. "
 "This may cause unpredictable behavior."
 msgstr ""
 
-#: index.php:648
+#: index.php:649
 #, php-format
 msgid ""
 "Server running with Suhosin. Please refer to %sdocumentation%s for possible "
@@ -1027,8 +1029,8 @@ msgstr ""
 msgid "Save & Close"
 msgstr ""
 
-#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:404
-#: libraries/insert_edit.lib.php:1550 prefs_manage.php:361
+#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:415
+#: libraries/insert_edit.lib.php:1548 prefs_manage.php:361
 #: prefs_manage.php:372
 msgid "Reset"
 msgstr ""
@@ -1061,7 +1063,7 @@ msgstr ""
 msgid "Edit Index"
 msgstr ""
 
-#: js/messages.php:99 templates/index_form.phtml:232
+#: js/messages.php:99 templates/table/index_form.phtml:232
 #, php-format
 msgid "Add %s column(s) to index"
 msgstr ""
@@ -1082,13 +1084,14 @@ msgstr ""
 msgid "Please select column(s) for the index."
 msgstr ""
 
-#: js/messages.php:106 templates/structure/add_column.phtml:1
+#: js/messages.php:106 templates/table/structure/add_column.phtml:1
 msgid "You have to add at least one column."
 msgstr ""
 
-#: js/messages.php:109 libraries/insert_edit.lib.php:1548
+#: js/messages.php:109 libraries/insert_edit.lib.php:1546
 #: templates/columns_definitions/column_definitions_form.phtml:162
-#: templates/index_form.phtml:237 templates/tbl_relation/common_form.phtml:106
+#: templates/table/index_form.phtml:237
+#: templates/table/relation/common_form.phtml:106
 msgid "Preview SQL"
 msgstr ""
 
@@ -1105,7 +1108,7 @@ msgid "SQL query:"
 msgstr ""
 
 #. l10n: Default label for the y-Axis of Charts
-#: js/messages.php:118 templates/tbl_chart.phtml:109
+#: js/messages.php:118 templates/table/chart/tbl_chart.phtml:109
 msgid "Y Values"
 msgstr ""
 
@@ -1258,7 +1261,7 @@ msgstr ""
 msgid "Bytes received"
 msgstr ""
 
-#: js/messages.php:169 libraries/server_status.lib.php:226
+#: js/messages.php:169 libraries/server_status.lib.php:235
 msgid "Connections"
 msgstr ""
 
@@ -1315,12 +1318,12 @@ msgstr ""
 msgid "Questions"
 msgstr ""
 
-#: js/messages.php:184 libraries/server_status.lib.php:134
+#: js/messages.php:184 libraries/server_status.lib.php:143
 msgid "Traffic"
 msgstr ""
 
 #: js/messages.php:185 libraries/Menu.class.php:586
-#: libraries/Util.class.php:4318 libraries/server_status_monitor.lib.php:257
+#: libraries/Util.class.php:4324 libraries/server_status_monitor.lib.php:257
 msgid "Settings"
 msgstr ""
 
@@ -1340,8 +1343,9 @@ msgstr ""
 #: libraries/server_status_monitor.lib.php:236
 #: libraries/server_status_processes.lib.php:308
 #: templates/columns_definitions/transformation.phtml:4
-#: templates/designer/options_panel.phtml:178
-#: templates/table/options_zoom.phtml:12 templates/table/rows_zoom.phtml:26
+#: templates/database/designer/options_panel.phtml:178
+#: templates/table/search/options_zoom.phtml:12
+#: templates/table/search/rows_zoom.phtml:26
 msgid "None"
 msgstr ""
 
@@ -1609,8 +1613,8 @@ msgstr ""
 
 #: js/messages.php:270 libraries/Menu.class.php:352
 #: libraries/Menu.class.php:455 libraries/Menu.class.php:582
-#: libraries/Util.class.php:4317 libraries/Util.class.php:4332
-#: libraries/Util.class.php:4349 libraries/config/messages.inc.php:258
+#: libraries/Util.class.php:4323 libraries/Util.class.php:4338
+#: libraries/Util.class.php:4355 libraries/config/messages.inc.php:258
 #: libraries/display_import.lib.php:105
 #: libraries/server_status_monitor.lib.php:318 prefs_manage.php:238
 #: setup/frames/menu.inc.php:26
@@ -1670,13 +1674,13 @@ msgid "Formatting SQL..."
 msgstr ""
 
 #: js/messages.php:293 libraries/server_variables.lib.php:157
-#: templates/designer/aggregate_query_panel.phtml:63
-#: templates/designer/delete_relation_panel.phtml:28
-#: templates/designer/having_query_panel.phtml:117
-#: templates/designer/new_relation_panel.phtml:88
-#: templates/designer/options_panel.phtml:253
-#: templates/designer/rename_to_panel.phtml:45
-#: templates/designer/where_query_panel.phtml:83
+#: templates/database/designer/aggregate_query_panel.phtml:63
+#: templates/database/designer/delete_relation_panel.phtml:28
+#: templates/database/designer/having_query_panel.phtml:117
+#: templates/database/designer/new_relation_panel.phtml:88
+#: templates/database/designer/options_panel.phtml:253
+#: templates/database/designer/rename_to_panel.phtml:45
+#: templates/database/designer/where_query_panel.phtml:83
 msgid "Cancel"
 msgstr ""
 
@@ -1684,7 +1688,7 @@ msgstr ""
 msgid "Page-related settings"
 msgstr ""
 
-#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:402
+#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:413
 msgid "Apply"
 msgstr ""
 
@@ -1719,8 +1723,8 @@ msgstr ""
 msgid "Error text: %s"
 msgstr ""
 
-#: js/messages.php:307 libraries/db_common.inc.php:68
-#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:450
+#: js/messages.php:307 libraries/db_common.inc.php:69
+#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:461
 msgid "No databases selected."
 msgstr ""
 
@@ -1732,12 +1736,13 @@ msgstr ""
 msgid "Adding Primary Key"
 msgstr ""
 
-#: js/messages.php:310 templates/designer/aggregate_query_panel.phtml:59
-#: templates/designer/having_query_panel.phtml:113
-#: templates/designer/new_relation_panel.phtml:87
-#: templates/designer/options_panel.phtml:252
-#: templates/designer/rename_to_panel.phtml:41
-#: templates/designer/where_query_panel.phtml:82
+#: js/messages.php:310
+#: templates/database/designer/aggregate_query_panel.phtml:59
+#: templates/database/designer/having_query_panel.phtml:113
+#: templates/database/designer/new_relation_panel.phtml:87
+#: templates/database/designer/options_panel.phtml:252
+#: templates/database/designer/rename_to_panel.phtml:41
+#: templates/database/designer/where_query_panel.phtml:82
 msgid "OK"
 msgstr ""
 
@@ -1757,7 +1762,7 @@ msgstr ""
 msgid "Changing Charset"
 msgstr ""
 
-#: js/messages.php:320 libraries/Util.class.php:3217
+#: js/messages.php:320 libraries/Util.class.php:3223
 msgid "Enable foreign key checks"
 msgstr ""
 
@@ -1792,20 +1797,21 @@ msgstr ""
 #: js/messages.php:334 libraries/DisplayResults.class.php:4834
 #: libraries/DisplayResults.class.php:5092 libraries/Menu.class.php:344
 #: libraries/Menu.class.php:446 libraries/Menu.class.php:578
-#: libraries/Util.class.php:3636 libraries/Util.class.php:3637
-#: libraries/Util.class.php:4316 libraries/Util.class.php:4331
-#: libraries/Util.class.php:4348 libraries/config/messages.inc.php:252
+#: libraries/Util.class.php:3642 libraries/Util.class.php:3643
+#: libraries/Util.class.php:4322 libraries/Util.class.php:4337
+#: libraries/Util.class.php:4354 libraries/config/messages.inc.php:252
 #: libraries/display_export.lib.php:173 libraries/rte/rte_list.lib.php:146
 #: libraries/server_privileges.lib.php:2211
 #: libraries/server_privileges.lib.php:2290
 #: libraries/server_privileges.lib.php:2632
 #: libraries/server_privileges.lib.php:3356
 #: libraries/server_status_monitor.lib.php:322 prefs_manage.php:303
-#: setup/frames/menu.inc.php:27 templates/structure/check_all_tables.phtml:11
+#: setup/frames/menu.inc.php:27
+#: templates/database/structure/check_all_tables.phtml:11
 msgid "Export"
 msgstr ""
 
-#: js/messages.php:337 libraries/rte/rte_routines.lib.php:652
+#: js/messages.php:337 libraries/rte/rte_routines.lib.php:743
 msgid "ENUM/SET editor"
 msgstr ""
 
@@ -1844,7 +1850,7 @@ msgstr ""
 #: libraries/Console.class.php:214 libraries/DisplayResults.class.php:3474
 #: libraries/DisplayResults.class.php:4818 libraries/Index.class.php:723
 #: libraries/Util.class.php:706 libraries/Util.class.php:1202
-#: libraries/Util.class.php:3634 libraries/Util.class.php:3635
+#: libraries/Util.class.php:3640 libraries/Util.class.php:3641
 #: libraries/central_columns.lib.php:851
 #: libraries/central_columns.lib.php:1193
 #: libraries/config/messages.inc.php:892
@@ -1862,7 +1868,7 @@ msgstr ""
 #: libraries/server_user_groups.lib.php:129
 #: libraries/sql_query_form.lib.php:416 libraries/tracking.lib.php:477
 #: setup/frames/index.inc.php:183 setup/frames/index.inc.php:291
-#: templates/designer/delete_relation_panel.phtml:27
+#: templates/database/designer/delete_relation_panel.phtml:27
 msgid "Delete"
 msgstr ""
 
@@ -2023,11 +2029,11 @@ msgid "No dependencies selected!"
 msgstr ""
 
 #: js/messages.php:394 libraries/central_columns.lib.php:1214
-#: libraries/insert_edit.lib.php:1458 libraries/server_variables.lib.php:155
+#: libraries/insert_edit.lib.php:1456 libraries/server_variables.lib.php:155
 #: setup/frames/config.inc.php:42 setup/frames/index.inc.php:279
 #: templates/columns_definitions/column_definitions_form.phtml:165
-#: templates/gis_visualization/gis_visualization.phtml:48
-#: templates/tbl_relation/common_form.phtml:107
+#: templates/table/gis_visualization/gis_visualization.phtml:48
+#: templates/table/relation/common_form.phtml:107
 msgid "Save"
 msgstr ""
 
@@ -2104,8 +2110,8 @@ msgid "Data point content"
 msgstr ""
 
 #: js/messages.php:430 js/messages.php:562 js/messages.php:579
-#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2573
-#: templates/index_form.phtml:154 templates/index_form.phtml:194
+#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2571
+#: templates/table/index_form.phtml:154 templates/table/index_form.phtml:194
 msgid "Ignore"
 msgstr ""
 
@@ -2164,8 +2170,8 @@ msgstr ""
 msgid "Please select the primary key or a unique key!"
 msgstr ""
 
-#: js/messages.php:457 templates/designer/side_menu.phtml:91
-#: templates/designer/side_menu.phtml:94
+#: js/messages.php:457 templates/database/designer/side_menu.phtml:91
+#: templates/database/designer/side_menu.phtml:94
 msgid "Choose column to display"
 msgstr ""
 
@@ -2179,18 +2185,18 @@ msgstr ""
 msgid "Page name"
 msgstr ""
 
-#: js/messages.php:463 templates/designer/side_menu.phtml:56
-#: templates/designer/side_menu.phtml:59
+#: js/messages.php:463 templates/database/designer/side_menu.phtml:56
+#: templates/database/designer/side_menu.phtml:59
 msgid "Save page"
 msgstr ""
 
-#: js/messages.php:464 templates/designer/side_menu.phtml:63
-#: templates/designer/side_menu.phtml:66
+#: js/messages.php:464 templates/database/designer/side_menu.phtml:63
+#: templates/database/designer/side_menu.phtml:66
 msgid "Save page as"
 msgstr ""
 
-#: js/messages.php:465 templates/designer/side_menu.phtml:49
-#: templates/designer/side_menu.phtml:52
+#: js/messages.php:465 templates/database/designer/side_menu.phtml:49
+#: templates/database/designer/side_menu.phtml:52
 msgid "Open page"
 msgstr ""
 
@@ -2198,7 +2204,7 @@ msgstr ""
 msgid "Delete page"
 msgstr ""
 
-#: js/messages.php:467 templates/designer/side_menu.phtml:10
+#: js/messages.php:467 templates/database/designer/side_menu.phtml:10
 msgid "Untitled"
 msgstr ""
 
@@ -2309,7 +2315,7 @@ msgstr ""
 msgid "cancel"
 msgstr ""
 
-#: js/messages.php:499 libraries/server_status.lib.php:271
+#: js/messages.php:499 libraries/server_status.lib.php:280
 msgid "Aborted"
 msgstr ""
 
@@ -2865,7 +2871,7 @@ msgstr ""
 
 #: js/messages.php:793 libraries/Message.class.php:199
 #: libraries/Util.class.php:654 libraries/core.lib.php:245
-#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1172
+#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1170
 #: tbl_operations.php:229 view_operations.php:63
 msgid "Error"
 msgstr ""
@@ -2924,8 +2930,8 @@ msgstr ""
 msgid "per minute"
 msgstr ""
 
-#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:143
-#: libraries/server_status.lib.php:228
+#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:152
+#: libraries/server_status.lib.php:237
 #: libraries/server_status_queries.lib.php:98
 msgid "per hour"
 msgstr ""
@@ -2943,7 +2949,7 @@ msgstr ""
 msgid "Wrong permissions on configuration file, should not be world writable!"
 msgstr ""
 
-#: libraries/Config.class.php:1799
+#: libraries/Config.class.php:1801
 msgid "Font size"
 msgstr ""
 
@@ -2971,10 +2977,10 @@ msgstr ""
 #: libraries/server_privileges.lib.php:2890
 #: libraries/server_privileges.lib.php:3144
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4332
+#: libraries/server_privileges.lib.php:4358
 #: libraries/server_status_processes.lib.php:80
-#: templates/tbl_relation/foreign_key_row.phtml:165
-#: templates/tbl_relation/internal_relational_row.phtml:55
+#: templates/table/relation/foreign_key_row.phtml:165
+#: templates/table/relation/internal_relational_row.phtml:55
 msgid "Database"
 msgstr ""
 
@@ -3067,11 +3073,11 @@ msgstr "ਅਤੀਤ ਵੇਖੋ"
 #: libraries/plugins/import/ImportMediawiki.class.php:60
 #: libraries/plugins/import/ImportOds.class.php:59
 #: libraries/plugins/import/ImportShp.class.php:57
-#: libraries/plugins/import/ImportSql.class.php:148
+#: libraries/plugins/import/ImportSql.class.php:51
 #: libraries/plugins/import/ImportXml.class.php:58
-#: libraries/rte/rte_routines.lib.php:833 templates/index_form.phtml:49
-#: templates/structure/row_stats_table.phtml:20
-#: templates/table/options.phtml:2
+#: libraries/rte/rte_routines.lib.php:924 templates/table/index_form.phtml:49
+#: templates/table/search/options.phtml:2
+#: templates/table/structure/row_stats_table.phtml:20
 msgid "Options"
 msgstr ""
 
@@ -3104,7 +3110,8 @@ msgstr ""
 msgid "Order:"
 msgstr ""
 
-#: libraries/Console.class.php:289 templates/table/replace_preview.phtml:17
+#: libraries/Console.class.php:289
+#: templates/table/search/replace_preview.phtml:17
 msgid "Count"
 msgstr ""
 
@@ -3201,9 +3208,9 @@ msgstr ""
 #: libraries/operations.lib.php:794 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:191
-#: templates/structure/sortable_header.phtml:21
-#: templates/structure/sortable_header.phtml:38
-#: templates/table/options.phtml:68
+#: templates/database/structure/sortable_header.phtml:21
+#: templates/database/structure/sortable_header.phtml:38
+#: templates/table/search/options.phtml:68
 msgid "Ascending"
 msgstr ""
 
@@ -3213,13 +3220,14 @@ msgstr ""
 #: libraries/operations.lib.php:797 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:188
-#: templates/structure/sortable_header.phtml:26
-#: templates/structure/sortable_header.phtml:43
-#: templates/table/options.phtml:69
+#: templates/database/structure/sortable_header.phtml:26
+#: templates/database/structure/sortable_header.phtml:43
+#: templates/table/search/options.phtml:69
 msgid "Descending"
 msgstr ""
 
-#: libraries/DBQbe.class.php:467 templates/table/search_and_replace.phtml:6
+#: libraries/DBQbe.class.php:467
+#: templates/table/search/search_and_replace.phtml:6
 msgid "Column:"
 msgstr ""
 
@@ -3378,12 +3386,12 @@ msgstr[0] ""
 msgstr[1] ""
 
 #: libraries/DbSearch.class.php:354 libraries/Menu.class.php:311
-#: libraries/Util.class.php:3337 libraries/Util.class.php:3347
-#: libraries/Util.class.php:3623 libraries/Util.class.php:3624
-#: libraries/Util.class.php:4343 libraries/config.values.php:43
+#: libraries/Util.class.php:3343 libraries/Util.class.php:3353
+#: libraries/Util.class.php:3629 libraries/Util.class.php:3630
+#: libraries/Util.class.php:4349 libraries/config.values.php:43
 #: libraries/config.values.php:51 libraries/config.values.php:119
 #: libraries/navigation/Nodes/Node_Table.class.php:295
-#: templates/structure/check_all_table_column.phtml:5
+#: templates/table/structure/check_all_table_column.phtml:5
 msgid "Browse"
 msgstr ""
 
@@ -3400,7 +3408,8 @@ msgstr ""
 msgid "Words or values to search for (wildcard: \"%\"):"
 msgstr ""
 
-#: libraries/DbSearch.class.php:401 templates/table/search_and_replace.phtml:1
+#: libraries/DbSearch.class.php:401
+#: templates/table/search/search_and_replace.phtml:1
 msgid "Find:"
 msgstr ""
 
@@ -3444,28 +3453,28 @@ msgstr ""
 msgid "Search this table"
 msgstr ""
 
-#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2532
-#: libraries/Util.class.php:2535
+#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2538
+#: libraries/Util.class.php:2541
 msgctxt "First page"
 msgid "Begin"
 msgstr ""
 
-#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2533
-#: libraries/Util.class.php:2536 libraries/server_bin_log.lib.php:170
+#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2539
+#: libraries/Util.class.php:2542 libraries/server_bin_log.lib.php:170
 #: libraries/server_bin_log.lib.php:172
 msgctxt "Previous page"
 msgid "Previous"
 msgstr ""
 
-#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2564
-#: libraries/Util.class.php:2574 libraries/server_bin_log.lib.php:204
+#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2570
+#: libraries/Util.class.php:2580 libraries/server_bin_log.lib.php:204
 #: libraries/server_bin_log.lib.php:206
 msgctxt "Next page"
 msgid "Next"
 msgstr ""
 
-#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2565
-#: libraries/Util.class.php:2575
+#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2571
+#: libraries/Util.class.php:2581
 msgctxt "Last page"
 msgid "End"
 msgstr ""
@@ -3540,15 +3549,15 @@ msgid "May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]."
 msgstr ""
 
 #: libraries/DisplayResults.class.php:4332 libraries/Message.class.php:180
-#: libraries/controllers/TableRelationController.class.php:258
+#: libraries/controllers/TableRelationController.class.php:259
 #: libraries/controllers/TableSearchController.class.php:655
-#: libraries/rte/rte_routines.lib.php:1332 libraries/sql_query_form.lib.php:89
+#: libraries/rte/rte_routines.lib.php:1423 libraries/sql_query_form.lib.php:89
 #: tbl_operations.php:227 tbl_row_action.php:138 view_operations.php:62
 msgid "Your SQL query has been executed successfully."
 msgstr ""
 
 #: libraries/DisplayResults.class.php:4660
-#: libraries/controllers/StructureController.class.php:629
+#: libraries/controllers/DatabaseStructureController.class.php:564
 #, php-format
 msgid ""
 "This view has at least this number of rows. Please refer to %sdocumentation"
@@ -3570,33 +3579,33 @@ msgstr ""
 msgid "%d total"
 msgstr ""
 
-#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1318
+#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1312
 #, php-format
 msgid "Query took %01.4f seconds."
 msgstr ""
 
 #: libraries/DisplayResults.class.php:4807
-#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4767
-#: libraries/Util.class.php:4773 libraries/mult_submits.inc.php:50
-#: templates/structure/check_all_tables.phtml:2
-#: templates/structure/check_all_tables.phtml:9
+#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4773
+#: libraries/Util.class.php:4779 libraries/mult_submits.inc.php:50
+#: templates/database/structure/check_all_tables.phtml:2
+#: templates/database/structure/check_all_tables.phtml:9
 msgid "With selected:"
 msgstr ""
 
 #: libraries/DisplayResults.class.php:4811
-#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4769
-#: libraries/Util.class.php:4770 libraries/server_privileges.lib.php:1174
+#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4775
+#: libraries/Util.class.php:4776 libraries/server_privileges.lib.php:1174
 #: libraries/server_privileges.lib.php:1175
 #: libraries/server_privileges.lib.php:1387
 #: libraries/server_user_groups.lib.php:231
-#: templates/structure/check_all_tables.phtml:3
-#: templates/structure/check_all_tables.phtml:4
+#: templates/database/structure/check_all_tables.phtml:3
+#: templates/database/structure/check_all_tables.phtml:4
 msgid "Check All"
 msgstr ""
 
 #: libraries/DisplayResults.class.php:4985 libraries/Header.class.php:383
-#: templates/structure/optional_action_links.phtml:1
-#: templates/structure/print_view_data_dictionary_link.phtml:3
+#: templates/database/structure/print_view_data_dictionary_link.phtml:3
+#: templates/table/structure/optional_action_links.phtml:1
 msgid "Print view"
 msgstr ""
 
@@ -3604,7 +3613,8 @@ msgstr ""
 msgid "Query results operations"
 msgstr ""
 
-#: libraries/DisplayResults.class.php:5105 templates/tbl_chart.phtml:12
+#: libraries/DisplayResults.class.php:5105
+#: templates/table/chart/tbl_chart.phtml:12
 msgid "Display chart"
 msgstr ""
 
@@ -3693,7 +3703,7 @@ msgid "Click on the bar to scroll to top of page"
 msgstr ""
 
 #: libraries/Header.class.php:749
-#: libraries/plugins/auth/AuthenticationCookie.class.php:152
+#: libraries/plugins/auth/AuthenticationCookie.class.php:140
 msgid "Javascript must be enabled past this point!"
 msgstr ""
 
@@ -3715,11 +3725,11 @@ msgid "Keyname"
 msgstr ""
 
 #: libraries/Index.class.php:697
-#: libraries/controllers/StructureController.class.php:1962
-#: libraries/controllers/StructureController.class.php:1967
+#: libraries/controllers/TableStructureController.class.php:953
+#: libraries/controllers/TableStructureController.class.php:958
 #: libraries/tracking.lib.php:973
 #: templates/columns_definitions/column_indexes.phtml:11
-#: templates/structure/check_all_table_column.phtml:26
+#: templates/table/structure/check_all_table_column.phtml:26
 msgid "Unique"
 msgstr ""
 
@@ -3738,16 +3748,17 @@ msgstr ""
 #: libraries/server_collations.lib.php:35 libraries/tracking.lib.php:881
 #: libraries/tracking.lib.php:977
 #: templates/columns_definitions/table_fields_definitions.phtml:33
-#: templates/structure/row_stats_table.phtml:31
-#: templates/structure/table_header.phtml:55
-#: templates/structure/table_structure_header.phtml:7
-#: templates/table/table_header.phtml:8
+#: templates/database/structure/table_header.phtml:55
+#: templates/table/search/table_header.phtml:8
+#: templates/table/structure/row_stats_table.phtml:31
+#: templates/table/structure/table_structure_header.phtml:7
 msgid "Collation"
 msgstr ""
 
 #: libraries/Index.class.php:703 libraries/rte/rte_events.lib.php:496
-#: libraries/rte/rte_routines.lib.php:956 libraries/tracking.lib.php:885
-#: libraries/tracking.lib.php:979 templates/structure/table_header.phtml:84
+#: libraries/rte/rte_routines.lib.php:1047 libraries/tracking.lib.php:885
+#: libraries/tracking.lib.php:979
+#: templates/database/structure/table_header.phtml:84
 msgid "Comment"
 msgstr ""
 
@@ -3760,15 +3771,15 @@ msgstr ""
 msgid "Index %s has been dropped."
 msgstr ""
 
-#: libraries/Index.class.php:757 libraries/Util.class.php:3630
-#: libraries/Util.class.php:3631
-#: libraries/controllers/StructureController.class.php:1958
-#: libraries/controllers/StructureController.class.php:1959
+#: libraries/Index.class.php:757 libraries/Util.class.php:3636
+#: libraries/Util.class.php:3637
+#: libraries/controllers/TableStructureController.class.php:949
+#: libraries/controllers/TableStructureController.class.php:950
 #: libraries/operations.lib.php:1607 libraries/rte/rte_list.lib.php:150
 #: libraries/server_databases.lib.php:146
-#: templates/structure/check_all_table_column.phtml:15
-#: templates/structure/check_all_tables.phtml:16
-#: templates/tbl_relation/foreign_key_row.phtml:93
+#: templates/database/structure/check_all_tables.phtml:16
+#: templates/table/relation/foreign_key_row.phtml:93
+#: templates/table/structure/check_all_table_column.phtml:15
 msgid "Drop"
 msgstr ""
 
@@ -3797,16 +3808,16 @@ msgstr ""
 #: libraries/Menu.class.php:248
 #: libraries/navigation/Nodes/Node_View.class.php:32
 #: libraries/tbl_info.inc.php:63
-#: templates/structure/structure_table_row.phtml:97
-#: templates/structure/structure_table_row.phtml:159
+#: templates/database/structure/structure_table_row.phtml:97
+#: templates/database/structure/structure_table_row.phtml:159
 msgid "View"
 msgstr ""
 
 #: libraries/Menu.class.php:325 libraries/Menu.class.php:429
-#: libraries/Menu.class.php:548 libraries/Util.class.php:3334
-#: libraries/Util.class.php:3344 libraries/Util.class.php:3350
-#: libraries/Util.class.php:4313 libraries/Util.class.php:4328
-#: libraries/Util.class.php:4345 libraries/config.values.php:40
+#: libraries/Menu.class.php:548 libraries/Util.class.php:3340
+#: libraries/Util.class.php:3350 libraries/Util.class.php:3356
+#: libraries/Util.class.php:4319 libraries/Util.class.php:4334
+#: libraries/Util.class.php:4351 libraries/config.values.php:40
 #: libraries/config.values.php:48 libraries/config.values.php:110
 #: libraries/config.values.php:116 libraries/config/messages.inc.php:321
 #: libraries/navigation/Nodes/Node_Table.class.php:292
@@ -3814,19 +3825,19 @@ msgid "SQL"
 msgstr ""
 
 #: libraries/Menu.class.php:328 libraries/Menu.class.php:432
-#: libraries/Util.class.php:3335 libraries/Util.class.php:3345
-#: libraries/Util.class.php:3351 libraries/Util.class.php:3625
-#: libraries/Util.class.php:3626 libraries/Util.class.php:4329
-#: libraries/Util.class.php:4346 libraries/config.values.php:41
+#: libraries/Util.class.php:3341 libraries/Util.class.php:3351
+#: libraries/Util.class.php:3357 libraries/Util.class.php:3631
+#: libraries/Util.class.php:3632 libraries/Util.class.php:4335
+#: libraries/Util.class.php:4352 libraries/config.values.php:41
 #: libraries/config.values.php:49 libraries/config.values.php:111
 #: libraries/config.values.php:117
 #: libraries/navigation/Nodes/Node_Table.class.php:286
 msgid "Search"
 msgstr "ਲੱਭੋ"
 
-#: libraries/Menu.class.php:338 libraries/Util.class.php:3336
-#: libraries/Util.class.php:3346 libraries/Util.class.php:3627
-#: libraries/Util.class.php:3628 libraries/Util.class.php:4347
+#: libraries/Menu.class.php:338 libraries/Util.class.php:3342
+#: libraries/Util.class.php:3352 libraries/Util.class.php:3633
+#: libraries/Util.class.php:3634 libraries/Util.class.php:4353
 #: libraries/config.values.php:42 libraries/config.values.php:50
 #: libraries/config.values.php:118
 #: libraries/navigation/Nodes/Node_Table.class.php:289
@@ -3835,30 +3846,30 @@ msgid "Insert"
 msgstr ""
 
 #: libraries/Menu.class.php:362 libraries/Menu.class.php:467
-#: libraries/Util.class.php:4334 libraries/Util.class.php:4350
+#: libraries/Util.class.php:4340 libraries/Util.class.php:4356
 #: libraries/config.values.php:106 libraries/server_common.lib.php:51
 #: libraries/server_privileges.lib.php:2370
 #: libraries/server_privileges.lib.php:3158
-#: libraries/server_privileges.lib.php:4221
+#: libraries/server_privileges.lib.php:4247
 msgid "Privileges"
 msgstr ""
 
 #: libraries/Menu.class.php:371 libraries/Menu.class.php:379
-#: libraries/Menu.class.php:459 libraries/Util.class.php:3338
-#: libraries/Util.class.php:3352 libraries/Util.class.php:4333
-#: libraries/Util.class.php:4351 libraries/config.values.php:112
+#: libraries/Menu.class.php:459 libraries/Util.class.php:3344
+#: libraries/Util.class.php:3358 libraries/Util.class.php:4339
+#: libraries/Util.class.php:4357 libraries/config.values.php:112
 #: view_operations.php:92
 msgid "Operations"
 msgstr ""
 
 #: libraries/Menu.class.php:384 libraries/Menu.class.php:492
-#: libraries/Util.class.php:4338 libraries/Util.class.php:4352
+#: libraries/Util.class.php:4344 libraries/Util.class.php:4358
 #: libraries/relation.lib.php:255
 msgid "Tracking"
 msgstr ""
 
 #: libraries/Menu.class.php:397 libraries/Menu.class.php:486
-#: libraries/Util.class.php:4337 libraries/Util.class.php:4353
+#: libraries/Util.class.php:4343 libraries/Util.class.php:4359
 #: libraries/navigation/Nodes/Node_Trigger_Container.class.php:24
 #: libraries/plugins/export/ExportHtmlword.class.php:557
 #: libraries/plugins/export/ExportOdt.class.php:685
@@ -3875,16 +3886,16 @@ msgstr ""
 msgid "Database seems to be empty!"
 msgstr ""
 
-#: libraries/Menu.class.php:439 libraries/Util.class.php:4330
+#: libraries/Menu.class.php:439 libraries/Util.class.php:4336
 msgid "Query"
 msgstr ""
 
-#: libraries/Menu.class.php:472 libraries/Util.class.php:4335
+#: libraries/Menu.class.php:472 libraries/Util.class.php:4341
 #: libraries/rte/rte_words.lib.php:36
 msgid "Routines"
 msgstr ""
 
-#: libraries/Menu.class.php:479 libraries/Util.class.php:4336
+#: libraries/Menu.class.php:479 libraries/Util.class.php:4342
 #: libraries/navigation/Nodes/Node_Event_Container.class.php:26
 #: libraries/plugins/export/ExportSql.class.php:940
 #: libraries/plugins/export/ExportXml.class.php:107
@@ -3892,20 +3903,20 @@ msgstr ""
 msgid "Events"
 msgstr ""
 
-#: libraries/Menu.class.php:498 libraries/Util.class.php:4339
+#: libraries/Menu.class.php:498 libraries/Util.class.php:4345
 msgid "Designer"
 msgstr ""
 
-#: libraries/Menu.class.php:507 libraries/Util.class.php:4340
-#: templates/structure/check_all_tables.phtml:35
+#: libraries/Menu.class.php:507 libraries/Util.class.php:4346
+#: templates/database/structure/check_all_tables.phtml:35
 msgid "Central columns"
 msgstr ""
 
-#: libraries/Menu.class.php:544 libraries/Util.class.php:4312
+#: libraries/Menu.class.php:544 libraries/Util.class.php:4318
 #: libraries/config.values.php:103 libraries/config/messages.inc.php:266
 #: libraries/config/messages.inc.php:341
 #: libraries/navigation/NavigationTree.class.php:1239
-#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4332
+#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4358
 msgid "Databases"
 msgstr ""
 
@@ -3914,34 +3925,34 @@ msgid "User accounts"
 msgstr ""
 
 #: libraries/Menu.class.php:595 libraries/ServerStatusData.class.php:121
-#: libraries/Util.class.php:4319 libraries/server_common.lib.php:36
+#: libraries/Util.class.php:4325 libraries/server_common.lib.php:36
 msgid "Binary log"
 msgstr ""
 
 #: libraries/Menu.class.php:601 libraries/ServerStatusData.class.php:126
-#: libraries/Util.class.php:4320 libraries/server_common.lib.php:42
-#: templates/structure/body_for_table_summary.phtml:10
-#: templates/structure/table_header.phtml:27
+#: libraries/Util.class.php:4326 libraries/server_common.lib.php:42
+#: templates/database/structure/body_for_table_summary.phtml:10
+#: templates/database/structure/table_header.phtml:27
 msgid "Replication"
 msgstr ""
 
 #: libraries/Menu.class.php:606 libraries/ServerStatusData.class.php:193
-#: libraries/Util.class.php:4321 libraries/config.values.php:105
+#: libraries/Util.class.php:4327 libraries/config.values.php:105
 #: libraries/server_engines.lib.php:108 libraries/server_engines.lib.php:112
 #: libraries/sql_query_form.lib.php:421
 msgid "Variables"
 msgstr ""
 
-#: libraries/Menu.class.php:610 libraries/Util.class.php:4322
+#: libraries/Menu.class.php:610 libraries/Util.class.php:4328
 msgid "Charsets"
 msgstr ""
 
-#: libraries/Menu.class.php:615 libraries/Util.class.php:4323
+#: libraries/Menu.class.php:615 libraries/Util.class.php:4329
 #: libraries/server_common.lib.php:33 libraries/server_plugins.lib.php:27
 msgid "Plugins"
 msgstr ""
 
-#: libraries/Menu.class.php:626 libraries/Util.class.php:4324
+#: libraries/Menu.class.php:626 libraries/Util.class.php:4330
 msgid "Engines"
 msgstr ""
 
@@ -3966,7 +3977,7 @@ msgid_plural "%1$d rows inserted."
 msgstr[0] ""
 msgstr[1] ""
 
-#: libraries/PDF.class.php:70 libraries/Util.class.php:2521
+#: libraries/PDF.class.php:70 libraries/Util.class.php:2527
 #: libraries/browse_foreigners.lib.php:327
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:865
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:890
@@ -3987,7 +3998,7 @@ msgid "Could not save favorite table!"
 msgstr ""
 
 #: libraries/RecentFavoriteTable.class.php:212
-#: templates/structure/favorite_anchor.phtml:12
+#: templates/database/structure/favorite_anchor.phtml:12
 msgid "Remove from Favorites"
 msgstr ""
 
@@ -4156,7 +4167,7 @@ msgid ""
 msgstr ""
 
 #: libraries/StorageEngine.class.php:373
-#: templates/structure/body_for_table_summary.phtml:50
+#: templates/database/structure/body_for_table_summary.phtml:50
 #, php-format
 msgid "%s is the default storage engine on this MySQL server."
 msgstr ""
@@ -4570,10 +4581,10 @@ msgstr ""
 
 #: libraries/Util.class.php:726 libraries/rte/rte_events.lib.php:110
 #: libraries/rte/rte_events.lib.php:119 libraries/rte/rte_events.lib.php:150
-#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:153
-#: libraries/rte/rte_routines.lib.php:162
-#: libraries/rte/rte_routines.lib.php:235
-#: libraries/rte/rte_routines.lib.php:1366
+#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:223
+#: libraries/rte/rte_routines.lib.php:250
+#: libraries/rte/rte_routines.lib.php:372
+#: libraries/rte/rte_routines.lib.php:1457
 #: libraries/rte/rte_triggers.lib.php:86 libraries/rte/rte_triggers.lib.php:95
 #: libraries/rte/rte_triggers.lib.php:127
 msgid "MySQL said: "
@@ -4617,75 +4628,78 @@ msgstr "ਐਤ"
 msgid "%B %d, %Y at %I:%M %p"
 msgstr ""
 
-#: libraries/Util.class.php:2019
+#: libraries/Util.class.php:2025
 #, php-format
 msgid "%s days, %s hours, %s minutes and %s seconds"
 msgstr ""
 
-#: libraries/Util.class.php:2112
+#: libraries/Util.class.php:2118
 msgid "Missing parameter:"
 msgstr ""
 
-#: libraries/Util.class.php:2645
+#: libraries/Util.class.php:2651
 #, php-format
 msgid "Jump to database \"%s\"."
 msgstr ""
 
-#: libraries/Util.class.php:2670
+#: libraries/Util.class.php:2676
 #, php-format
 msgid "The %s functionality is affected by a known bug, see %s"
 msgstr ""
 
-#: libraries/Util.class.php:2881
+#: libraries/Util.class.php:2887
 msgid "Click to toggle"
 msgstr ""
 
-#: libraries/Util.class.php:3542 prefs_manage.php:248
+#: libraries/Util.class.php:3548 prefs_manage.php:248
 msgid "Browse your computer:"
 msgstr ""
 
-#: libraries/Util.class.php:3567
+#: libraries/Util.class.php:3573
 #, php-format
 msgid "Select from the web server upload directory <b>%s</b>:"
 msgstr ""
 
-#: libraries/Util.class.php:3596 libraries/insert_edit.lib.php:1173
+#: libraries/Util.class.php:3602 libraries/insert_edit.lib.php:1171
 msgid "The directory you set for upload work cannot be reached."
 msgstr ""
 
-#: libraries/Util.class.php:3607
+#: libraries/Util.class.php:3613
 msgid "There are no files to upload!"
 msgstr ""
 
-#: libraries/Util.class.php:3632 libraries/Util.class.php:3633
-#: templates/structure/check_all_tables.phtml:15
+#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: templates/database/structure/check_all_tables.phtml:15
 msgid "Empty"
 msgstr ""
 
-#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: libraries/Util.class.php:3644 libraries/Util.class.php:3645
 msgid "Execute"
 msgstr ""
 
-#: libraries/Util.class.php:4152
+#: libraries/Util.class.php:4158
 msgid "Print"
 msgstr ""
 
-#: libraries/Util.class.php:4257 templates/structure/row_stats_table.phtml:80
-#: templates/structure/table_header.phtml:95
+#: libraries/Util.class.php:4263
+#: templates/database/structure/table_header.phtml:95
+#: templates/table/structure/row_stats_table.phtml:80
 msgid "Creation"
 msgstr ""
 
-#: libraries/Util.class.php:4263 templates/structure/row_stats_table.phtml:87
-#: templates/structure/table_header.phtml:106
+#: libraries/Util.class.php:4269
+#: templates/database/structure/table_header.phtml:106
+#: templates/table/structure/row_stats_table.phtml:87
 msgid "Last update"
 msgstr ""
 
-#: libraries/Util.class.php:4269 templates/structure/row_stats_table.phtml:94
-#: templates/structure/table_header.phtml:117
+#: libraries/Util.class.php:4275
+#: templates/database/structure/table_header.phtml:117
+#: templates/table/structure/row_stats_table.phtml:94
 msgid "Last check"
 msgstr ""
 
-#: libraries/Util.class.php:4315
+#: libraries/Util.class.php:4321
 msgid "Users"
 msgstr ""
 
@@ -4708,16 +4722,16 @@ msgid "Use this value"
 msgstr ""
 
 #: libraries/build_html_for_db.lib.php:33 libraries/import.lib.php:193
-#: templates/structure/actions_in_table_structure.phtml:113
-#: templates/structure/row_stats_table.phtml:42
-#: templates/structure/table_header.phtml:36
+#: templates/database/structure/table_header.phtml:36
+#: templates/table/structure/actions_in_table_structure.phtml:113
+#: templates/table/structure/row_stats_table.phtml:42
 msgid "Rows"
 msgstr ""
 
 #: libraries/build_html_for_db.lib.php:48 libraries/engines/innodb.lib.php:171
-#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:186
-#: libraries/server_status.lib.php:298
-#: templates/structure/display_table_stats.phtml:40
+#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:195
+#: libraries/server_status.lib.php:307
+#: templates/table/structure/display_table_stats.phtml:40
 msgid "Total"
 msgstr ""
 
@@ -4726,10 +4740,12 @@ msgid "Jump to database"
 msgstr ""
 
 #: libraries/build_html_for_db.lib.php:146
+#: templates/database/structure/structure_table_row.phtml:15
 msgid "Not replicated"
 msgstr ""
 
 #: libraries/build_html_for_db.lib.php:158
+#: templates/database/structure/structure_table_row.phtml:16
 msgid "Replicated"
 msgstr ""
 
@@ -4782,17 +4798,17 @@ msgstr ""
 #: libraries/plugins/export/ExportTexytext.class.php:425
 #: libraries/plugins/export/PMA_ExportPdf.class.php:307
 #: libraries/rte/rte_list.lib.php:73 libraries/rte/rte_list.lib.php:85
-#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:830
-#: libraries/rte/rte_routines.lib.php:1492 setup/frames/index.inc.php:162
+#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:921
+#: libraries/rte/rte_routines.lib.php:1583 setup/frames/index.inc.php:162
 #: templates/columns_definitions/table_fields_definitions.phtml:8
-#: templates/structure/table_structure_header.phtml:5
-#: templates/table/create_table.phtml:11
+#: templates/database/create_table.phtml:11
+#: templates/table/structure/table_structure_header.phtml:5
 msgid "Name"
 msgstr ""
 
 #: libraries/central_columns.lib.php:699
 #: libraries/central_columns.lib.php:1381
-#: libraries/rte/rte_routines.lib.php:832
+#: libraries/rte/rte_routines.lib.php:923
 #: templates/columns_definitions/table_fields_definitions.phtml:14
 msgid "Length/Values"
 msgstr ""
@@ -4811,7 +4827,7 @@ msgid "Select a table"
 msgstr ""
 
 #: libraries/central_columns.lib.php:804
-#: templates/structure/add_column.phtml:4
+#: templates/table/structure/add_column.phtml:4
 msgid "Add column"
 msgstr ""
 
@@ -4827,7 +4843,7 @@ msgstr ""
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1002
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1025
 #: templates/columns_definitions/table_fields_definitions.phtml:36
-#: templates/structure/table_structure_header.phtml:8
+#: templates/table/structure/table_structure_header.phtml:8
 msgid "Attributes"
 msgstr ""
 
@@ -4936,7 +4952,7 @@ msgid "Double click"
 msgstr ""
 
 #: libraries/config.values.php:95 libraries/config.values.php:124
-#: libraries/config/FormDisplay.tpl.php:221 libraries/relation.lib.php:97
+#: libraries/config/FormDisplay.tpl.php:232 libraries/relation.lib.php:97
 #: libraries/relation.lib.php:105
 msgid "Disabled"
 msgstr ""
@@ -5106,21 +5122,21 @@ msgstr ""
 msgid "maximum %s"
 msgstr ""
 
-#: libraries/config/FormDisplay.tpl.php:219
+#: libraries/config/FormDisplay.tpl.php:230
 msgid "This setting is disabled, it will not be applied to your configuration."
 msgstr ""
 
-#: libraries/config/FormDisplay.tpl.php:313
+#: libraries/config/FormDisplay.tpl.php:324
 #, php-format
 msgid "Set value: %s"
 msgstr ""
 
-#: libraries/config/FormDisplay.tpl.php:318
+#: libraries/config/FormDisplay.tpl.php:329
 #: libraries/config/messages.inc.php:610
 msgid "Restore default value"
 msgstr ""
 
-#: libraries/config/FormDisplay.tpl.php:332
+#: libraries/config/FormDisplay.tpl.php:343
 msgid "Allow users to customize this value"
 msgstr ""
 
@@ -5536,7 +5552,7 @@ msgstr ""
 
 #: libraries/config/messages.inc.php:136 libraries/config/messages.inc.php:152
 #: libraries/sql_query_form.lib.php:247
-#: templates/structure/row_stats_table.phtml:7
+#: templates/table/structure/row_stats_table.phtml:7
 msgid "Format"
 msgstr ""
 
@@ -6033,7 +6049,7 @@ msgstr ""
 
 #: libraries/config/messages.inc.php:332
 #: libraries/plugins/export/ExportPdf.class.php:279
-#: templates/structure/secondary_tabs.phtml:8
+#: templates/table/secondary_tabs.phtml:8
 msgid "Table structure"
 msgstr ""
 
@@ -7549,103 +7565,35 @@ msgstr ""
 msgid "OpenDocument Text"
 msgstr ""
 
-#: libraries/controllers/StructureController.class.php:465
+#: libraries/controllers/DatabaseStructureController.class.php:405
 #: tbl_operations.php:382
 #, php-format
 msgid "Table %s has been emptied."
 msgstr ""
 
-#: libraries/controllers/StructureController.class.php:486
+#: libraries/controllers/DatabaseStructureController.class.php:426
 #: tbl_operations.php:400 view_operations.php:119
 #, fuzzy, php-format
 #| msgid "Database %1$s has been created."
 msgid "View %s has been dropped."
 msgstr "%1$s ਡਾਟਾਬੇਸ ਬਣ ਚੁੱਕਾ ਹੈ."
 
-#: libraries/controllers/StructureController.class.php:487
+#: libraries/controllers/DatabaseStructureController.class.php:427
 #: tbl_operations.php:401
 #, fuzzy, php-format
 #| msgid "Database %1$s has been created."
 msgid "Table %s has been dropped."
 msgstr "%1$s ਡਾਟਾਬੇਸ ਬਣ ਚੁੱਕਾ ਹੈ."
 
-#: libraries/controllers/StructureController.class.php:797
-#, php-format
-msgid "The name '%s' is a MySQL reserved keyword."
-msgid_plural "The names '%s' are MySQL reserved keywords."
-msgstr[0] ""
-msgstr[1] ""
-
-#: libraries/controllers/StructureController.class.php:875
-msgid "No column selected."
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1049
+#: libraries/controllers/DatabaseStructureController.class.php:733
 msgid "Favorite List is full!"
 msgstr ""
 
-#: libraries/controllers/StructureController.class.php:1272
-msgid "The columns have been moved successfully."
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1535
-#, php-format
-msgid ""
-"Table %1$s has been altered successfully. Privileges have been adjusted."
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1541
-#: libraries/controllers/TableIndexesController.class.php:161
-#: tbl_addfield.php:92
-#, php-format
-msgid "Table %1$s has been altered successfully."
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1588
-#: libraries/tracking.lib.php:1094
-msgid "Query error"
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1806
+#: libraries/controllers/DatabaseStructureController.class.php:947
 #: libraries/mysql_charsets.lib.php:366 libraries/mysql_charsets.lib.php:373
 msgid "unknown"
 msgstr ""
 
-#: libraries/controllers/StructureController.class.php:1957
-#: templates/structure/check_all_table_column.phtml:11
-msgid "Change"
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1961
-#: libraries/controllers/StructureController.class.php:1966
-#: libraries/navigation/Nodes/Node_Index.class.php:30
-#: libraries/tracking.lib.php:926
-#: templates/columns_definitions/column_indexes.phtml:16
-#: templates/columns_definitions/table_fields_definitions.phtml:57
-#: templates/structure/check_all_table_column.phtml:30
-#: templates/structure/display_structure.phtml:79
-#: templates/structure/display_table_stats.phtml:19
-msgid "Index"
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1963
-#: libraries/controllers/StructureController.class.php:1968
-#: templates/columns_definitions/column_indexes.phtml:27
-#: templates/structure/check_all_table_column.phtml:37
-msgid "Spatial"
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1964
-#: libraries/controllers/StructureController.class.php:1969
-#: templates/columns_definitions/column_indexes.phtml:22
-#: templates/structure/check_all_table_column.phtml:47
-msgid "Fulltext"
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1970
-msgid "Distinct values"
-msgstr ""
-
 #: libraries/controllers/TableChartController.class.php:82
 #: libraries/controllers/TableGisVisualizationController.class.php:101
 msgid "No SQL query was set to fetch data."
@@ -7659,11 +7607,18 @@ msgstr ""
 msgid "No data to display"
 msgstr ""
 
-#: libraries/controllers/TableRelationController.class.php:217
+#: libraries/controllers/TableIndexesController.class.php:161
+#: libraries/controllers/TableStructureController.class.php:736
+#: tbl_addfield.php:92
+#, php-format
+msgid "Table %1$s has been altered successfully."
+msgstr ""
+
+#: libraries/controllers/TableRelationController.class.php:218
 msgid "Display column was successfully updated."
 msgstr ""
 
-#: libraries/controllers/TableRelationController.class.php:283
+#: libraries/controllers/TableRelationController.class.php:288
 #, fuzzy
 #| msgid "Database %1$s has been created."
 msgid "Internal relations were successfully updated."
@@ -7678,10 +7633,71 @@ msgid "Zoom search"
 msgstr ""
 
 #: libraries/controllers/TableSearchController.class.php:852
-#: templates/table/selection_form.phtml:59
+#: templates/table/search/selection_form.phtml:59
 msgid "Find and replace"
 msgstr ""
 
+#: libraries/controllers/TableStructureController.class.php:163
+#, php-format
+msgid "The name '%s' is a MySQL reserved keyword."
+msgid_plural "The names '%s' are MySQL reserved keywords."
+msgstr[0] ""
+msgstr[1] ""
+
+#: libraries/controllers/TableStructureController.class.php:241
+msgid "No column selected."
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:467
+msgid "The columns have been moved successfully."
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:730
+#, php-format
+msgid ""
+"Table %1$s has been altered successfully. Privileges have been adjusted."
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:783
+#: libraries/tracking.lib.php:1094
+msgid "Query error"
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:948
+#: templates/table/structure/check_all_table_column.phtml:11
+msgid "Change"
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:952
+#: libraries/controllers/TableStructureController.class.php:957
+#: libraries/navigation/Nodes/Node_Index.class.php:30
+#: libraries/tracking.lib.php:926
+#: templates/columns_definitions/column_indexes.phtml:16
+#: templates/columns_definitions/table_fields_definitions.phtml:57
+#: templates/table/structure/check_all_table_column.phtml:30
+#: templates/table/structure/display_structure.phtml:79
+#: templates/table/structure/display_table_stats.phtml:19
+msgid "Index"
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:954
+#: libraries/controllers/TableStructureController.class.php:959
+#: templates/columns_definitions/column_indexes.phtml:27
+#: templates/table/structure/check_all_table_column.phtml:37
+msgid "Spatial"
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:955
+#: libraries/controllers/TableStructureController.class.php:960
+#: templates/columns_definitions/column_indexes.phtml:22
+#: templates/table/structure/check_all_table_column.phtml:47
+msgid "Fulltext"
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:963
+msgid "Distinct values"
+msgstr ""
+
 #: libraries/core.lib.php:306
 #, php-format
 msgid "The %s extension is missing. Please check your PHP configuration."
@@ -7726,7 +7742,7 @@ msgid "No Password"
 msgstr ""
 
 #: libraries/display_change_password.lib.php:68
-#: libraries/plugins/auth/AuthenticationCookie.class.php:199
+#: libraries/plugins/auth/AuthenticationCookie.class.php:187
 #: libraries/replication_gui.lib.php:422 libraries/replication_gui.lib.php:862
 #: libraries/server_privileges.lib.php:1640
 msgid "Password:"
@@ -8444,12 +8460,12 @@ msgid "Dump has been saved to file %s."
 msgstr ""
 
 #: libraries/import.lib.php:202 libraries/insert_edit.lib.php:124
-#: libraries/rte/rte_routines.lib.php:1353 libraries/sql.lib.php:1312
+#: libraries/rte/rte_routines.lib.php:1444 libraries/sql.lib.php:1306
 #: tbl_get_field.php:44
 msgid "MySQL returned an empty result set (i.e. zero rows)."
 msgstr ""
 
-#: libraries/import.lib.php:265 libraries/sql.lib.php:1326
+#: libraries/import.lib.php:265 libraries/sql.lib.php:1320
 msgid "[ROLLBACK occurred.]"
 msgstr ""
 
@@ -8513,14 +8529,14 @@ msgstr ""
 
 #: libraries/insert_edit.lib.php:233
 #: libraries/navigation/Nodes/Node_DatabaseChild.class.php:48
-#: templates/designer/table_list.phtml:40
+#: templates/database/designer/table_list.phtml:40
 msgid "Hide"
 msgstr ""
 
 #: libraries/insert_edit.lib.php:249
 #: libraries/navigation/Nodes/Node_Function.class.php:32
-#: libraries/rte/rte_routines.lib.php:1495
-#: templates/table/table_header.phtml:4
+#: libraries/rte/rte_routines.lib.php:1586
+#: templates/table/search/table_header.phtml:4
 msgid "Function"
 msgstr ""
 
@@ -8533,82 +8549,83 @@ msgstr ""
 msgid "Because of its length,<br /> this column might not be editable."
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1050
+#: libraries/insert_edit.lib.php:1048
 msgid "Binary - do not edit"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1176 libraries/server_privileges.lib.php:470
-#: templates/table/options.phtml:36
+#: libraries/insert_edit.lib.php:1174 libraries/server_privileges.lib.php:470
+#: templates/table/search/options.phtml:36
 msgid "Or"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1177
+#: libraries/insert_edit.lib.php:1175
 msgid "web server upload directory:"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1348 templates/table/input_box.phtml:49
+#: libraries/insert_edit.lib.php:1346
+#: templates/table/search/input_box.phtml:49
 msgid "Edit/Insert"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1398
+#: libraries/insert_edit.lib.php:1396
 #, php-format
 msgid "Continue insertion with %s rows"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1428
+#: libraries/insert_edit.lib.php:1426
 msgid "and then"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1461
+#: libraries/insert_edit.lib.php:1459
 msgid "Insert as new row"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1464
+#: libraries/insert_edit.lib.php:1462
 msgid "Insert as new row and ignore errors"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1467
+#: libraries/insert_edit.lib.php:1465
 msgid "Show insert query"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1487
+#: libraries/insert_edit.lib.php:1485
 msgid "Go back to previous page"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1490
+#: libraries/insert_edit.lib.php:1488
 msgid "Insert another new row"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1495
+#: libraries/insert_edit.lib.php:1493
 msgid "Go back to this page"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1518
+#: libraries/insert_edit.lib.php:1516
 msgid "Edit next row"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1540
+#: libraries/insert_edit.lib.php:1538
 msgid ""
 "Use TAB key to move from value to value, or CTRL+arrows to move anywhere"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1577 libraries/replication_gui.lib.php:542
-#: libraries/rte/rte_routines.lib.php:1497
+#: libraries/insert_edit.lib.php:1575 libraries/replication_gui.lib.php:542
+#: libraries/rte/rte_routines.lib.php:1588
 #: libraries/server_status_variables.lib.php:220
-#: templates/designer/having_query_panel.phtml:100
-#: templates/designer/options_panel.phtml:73
-#: templates/designer/options_panel.phtml:239
-#: templates/designer/where_query_panel.phtml:69
-#: templates/table/table_header.phtml:10
-#: templates/table/zoom_result_form.phtml:35
+#: templates/database/designer/having_query_panel.phtml:100
+#: templates/database/designer/options_panel.phtml:73
+#: templates/database/designer/options_panel.phtml:239
+#: templates/database/designer/where_query_panel.phtml:69
+#: templates/table/search/table_header.phtml:10
+#: templates/table/search/zoom_result_form.phtml:35
 msgid "Value"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1937 libraries/sql.lib.php:1309
+#: libraries/insert_edit.lib.php:1935 libraries/sql.lib.php:1303
 msgid "Showing SQL query"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1962 libraries/sql.lib.php:1287
+#: libraries/insert_edit.lib.php:1960 libraries/sql.lib.php:1281
 #, php-format
 msgid "Inserted row id: %1$d"
 msgstr ""
@@ -9017,7 +9034,7 @@ msgstr ""
 #: libraries/navigation/Nodes/Node_View_Container.class.php:26
 #: libraries/navigation/Nodes/Node_View_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:129
-#: templates/structure/show_create.phtml:30
+#: templates/database/structure/show_create.phtml:30
 msgid "Views"
 msgstr ""
 
@@ -9303,7 +9320,7 @@ msgstr ""
 
 #: libraries/operations.lib.php:101 libraries/operations.lib.php:249
 #: libraries/operations.lib.php:869 libraries/operations.lib.php:963
-#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:907
+#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:998
 #: templates/columns_definitions/table_fields_definitions.phtml:47
 msgid "Adjust Privileges"
 msgstr ""
@@ -9393,22 +9410,22 @@ msgid "Switch to copied table"
 msgstr ""
 
 #: libraries/operations.lib.php:1360
-#: templates/structure/check_all_tables.phtml:18
+#: templates/database/structure/check_all_tables.phtml:18
 msgid "Table maintenance"
 msgstr ""
 
 #: libraries/operations.lib.php:1398
-#: templates/structure/check_all_tables.phtml:19
+#: templates/database/structure/check_all_tables.phtml:19
 msgid "Analyze table"
 msgstr ""
 
 #: libraries/operations.lib.php:1413
-#: templates/structure/check_all_tables.phtml:20
+#: templates/database/structure/check_all_tables.phtml:20
 msgid "Check table"
 msgstr ""
 
 #: libraries/operations.lib.php:1428
-#: templates/structure/check_all_tables.phtml:22
+#: templates/database/structure/check_all_tables.phtml:22
 msgid "Checksum table"
 msgstr ""
 
@@ -9426,18 +9443,19 @@ msgid "Flush the table (FLUSH)"
 msgstr ""
 
 #: libraries/operations.lib.php:1477
-#: templates/structure/check_all_tables.phtml:23
-#: templates/structure/display_table_stats.phtml:56
+#: templates/database/structure/check_all_tables.phtml:23
+#: templates/table/structure/display_table_stats.phtml:56
 msgid "Optimize table"
 msgstr ""
 
 #: libraries/operations.lib.php:1492
-#: templates/structure/check_all_tables.phtml:24
+#: templates/database/structure/check_all_tables.phtml:24
 msgid "Repair table"
 msgstr ""
 
 #: libraries/operations.lib.php:1538
-#: templates/structure/check_all_tables.phtml:14 view_operations.php:127
+#: templates/database/structure/check_all_tables.phtml:14
+#: view_operations.php:127
 msgid "Delete data or table"
 msgstr ""
 
@@ -9558,7 +9576,7 @@ msgid "Cannot connect: invalid settings."
 msgstr ""
 
 #: libraries/plugins/auth/AuthenticationConfig.class.php:108
-#: libraries/plugins/auth/AuthenticationCookie.class.php:134
+#: libraries/plugins/auth/AuthenticationCookie.class.php:122
 #: libraries/plugins/auth/AuthenticationHttp.class.php:96
 #, php-format
 msgid "Welcome to %s"
@@ -9583,36 +9601,36 @@ msgstr ""
 msgid "Retry to connect"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:146
+#: libraries/plugins/auth/AuthenticationCookie.class.php:134
 msgid "Your session has expired. Please log in again."
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:170
+#: libraries/plugins/auth/AuthenticationCookie.class.php:158
 msgid "Log in"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:178
-#: libraries/plugins/auth/AuthenticationCookie.class.php:188
+#: libraries/plugins/auth/AuthenticationCookie.class.php:166
+#: libraries/plugins/auth/AuthenticationCookie.class.php:176
 msgid "You can enter hostname/IP address and port separated by space."
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:193
+#: libraries/plugins/auth/AuthenticationCookie.class.php:181
 msgid "Username:"
 msgstr "ਵਰਤੋਂਕਾਰ ਦਾ ਨਾਂ:"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:205
+#: libraries/plugins/auth/AuthenticationCookie.class.php:193
 msgid "Server Choice:"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:386
+#: libraries/plugins/auth/AuthenticationCookie.class.php:374
 msgid "Entered captcha is wrong, try again!"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:396
+#: libraries/plugins/auth/AuthenticationCookie.class.php:384
 msgid "Please enter correct captcha!"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:423
+#: libraries/plugins/auth/AuthenticationCookie.class.php:411
 msgid "You are not allowed to log in to this MySQL server!"
 msgstr ""
 
@@ -9708,7 +9726,7 @@ msgstr ""
 #: libraries/plugins/export/ExportOdt.class.php:593
 #: libraries/plugins/export/ExportTexytext.class.php:428
 #: libraries/plugins/export/PMA_ExportPdf.class.php:313
-#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:984
 #: libraries/rte/rte_triggers.lib.php:377
 msgid "Definition"
 msgstr ""
@@ -10005,7 +10023,7 @@ msgid "Last check:"
 msgstr ""
 
 #: libraries/plugins/export/ExportSql.class.php:1399
-#: templates/structure/structure_table_row.phtml:183
+#: templates/database/structure/structure_table_row.phtml:183
 msgid "in use"
 msgstr ""
 
@@ -10185,18 +10203,14 @@ msgstr ""
 msgid "The imported file does not contain any data!"
 msgstr ""
 
-#: libraries/plugins/import/ImportSql.class.php:169
+#: libraries/plugins/import/ImportSql.class.php:72
 msgid "SQL compatibility mode:"
 msgstr ""
 
-#: libraries/plugins/import/ImportSql.class.php:181
+#: libraries/plugins/import/ImportSql.class.php:84
 msgid "Do not use <code>AUTO_INCREMENT</code> for zero values"
 msgstr ""
 
-#: libraries/plugins/import/ImportSql.class.php:195
-msgid "Read as multibytes"
-msgstr ""
-
 #: libraries/plugins/import/ImportXml.class.php:54
 msgid "XML"
 msgstr ""
@@ -10239,7 +10253,7 @@ msgid "Show grid"
 msgstr ""
 
 #: libraries/plugins/schema/SchemaPdf.class.php:94
-#: templates/structure/print_view_data_dictionary_link.phtml:6
+#: templates/database/structure/print_view_data_dictionary_link.phtml:6
 msgid "Data Dictionary"
 msgstr ""
 
@@ -10264,7 +10278,7 @@ msgid "The %s table doesn't exist!"
 msgstr ""
 
 #: libraries/plugins/schema/eps/Eps_Relation_Schema.class.php:321
-#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:309
+#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:323
 #, php-format
 msgid "Schema of the %s database - Page %s"
 msgstr ""
@@ -10290,7 +10304,7 @@ msgstr ""
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1005
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1028
 #: libraries/tracking.lib.php:884
-#: templates/structure/table_structure_header.phtml:11
+#: templates/table/structure/table_structure_header.phtml:11
 msgid "Extra"
 msgstr ""
 
@@ -10607,51 +10621,51 @@ msgstr ""
 msgid "Create the needed tables with the <code>%screate_tables.sql</code>."
 msgstr ""
 
-#: libraries/relation.lib.php:360
+#: libraries/relation.lib.php:357
 msgid "Create a pma user and give access to these tables."
 msgstr ""
 
-#: libraries/relation.lib.php:365
+#: libraries/relation.lib.php:360
 msgid ""
 "Enable advanced features in configuration file (<code>config.inc.php</"
 "code>), for example by starting from <code>config.sample.inc.php</code>."
 msgstr ""
 
-#: libraries/relation.lib.php:373
+#: libraries/relation.lib.php:365
 msgid "Re-login to phpMyAdmin to load the updated configuration file."
 msgstr ""
 
-#: libraries/relation.lib.php:1612
+#: libraries/relation.lib.php:1607
 msgid "no description"
 msgstr ""
 
-#: libraries/relation.lib.php:1811
+#: libraries/relation.lib.php:1806
 msgid ""
 "You do not have necessary privileges to create a database named "
 "'phpmyadmin'. You may go to 'Operations' tab of any database to set up the "
 "phpMyAdmin configuration storage there."
 msgstr ""
 
-#: libraries/relation.lib.php:1928
+#: libraries/relation.lib.php:1923
 #, php-format
 msgid ""
 "%sCreate%s a database named 'phpmyadmin' and setup the phpMyAdmin "
 "configuration storage there."
 msgstr ""
 
-#: libraries/relation.lib.php:1936
+#: libraries/relation.lib.php:1931
 #, php-format
 msgid ""
 "%sCreate%s the phpMyAdmin configuration storage in the current database."
 msgstr ""
 
-#: libraries/relation.lib.php:1944
+#: libraries/relation.lib.php:1939
 #, php-format
 msgid "%sCreate%s missing phpMyAdmin configuration storage tables."
 msgstr ""
 
 #: libraries/replication_gui.lib.php:46 libraries/replication_gui.lib.php:343
-#: libraries/server_databases.lib.php:387
+#: libraries/server_databases.lib.php:398
 msgid "Master replication"
 msgstr ""
 
@@ -10706,7 +10720,7 @@ msgid ""
 msgstr ""
 
 #: libraries/replication_gui.lib.php:141
-#: libraries/server_databases.lib.php:389
+#: libraries/server_databases.lib.php:400
 msgid "Slave replication"
 msgstr ""
 
@@ -10967,10 +10981,10 @@ msgid "Master server changed successfully to %s."
 msgstr ""
 
 #: libraries/rte/rte_events.lib.php:106 libraries/rte/rte_events.lib.php:115
-#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:149
-#: libraries/rte/rte_routines.lib.php:158
-#: libraries/rte/rte_routines.lib.php:231
-#: libraries/rte/rte_routines.lib.php:1362
+#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:219
+#: libraries/rte/rte_routines.lib.php:246
+#: libraries/rte/rte_routines.lib.php:368
+#: libraries/rte/rte_routines.lib.php:1453
 #: libraries/rte/rte_triggers.lib.php:82 libraries/rte/rte_triggers.lib.php:91
 #: libraries/rte/rte_triggers.lib.php:123
 #, php-format
@@ -10991,7 +11005,7 @@ msgstr ""
 msgid "Event %1$s has been created."
 msgstr ""
 
-#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:251
+#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:266
 #: libraries/rte/rte_triggers.lib.php:144
 msgid "One or more errors have occurred while processing your request:"
 msgstr ""
@@ -11000,7 +11014,7 @@ msgstr ""
 msgid "Edit event"
 msgstr ""
 
-#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:794
+#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:885
 #: libraries/rte/rte_triggers.lib.php:323 view_create.php:180
 msgid "Details"
 msgstr ""
@@ -11013,7 +11027,7 @@ msgstr ""
 msgid "Event type"
 msgstr ""
 
-#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:817
+#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:908
 #, php-format
 msgid "Change to %s"
 msgstr ""
@@ -11040,12 +11054,14 @@ msgstr ""
 msgid "On completion preserve"
 msgstr ""
 
-#: libraries/rte/rte_events.lib.php:491 libraries/rte/rte_routines.lib.php:930
+#: libraries/rte/rte_events.lib.php:491
+#: libraries/rte/rte_routines.lib.php:1021
 #: libraries/rte/rte_triggers.lib.php:383 view_create.php:209
 msgid "Definer"
 msgstr ""
 
-#: libraries/rte/rte_events.lib.php:535 libraries/rte/rte_routines.lib.php:997
+#: libraries/rte/rte_events.lib.php:535
+#: libraries/rte/rte_routines.lib.php:1088
 #: libraries/rte/rte_triggers.lib.php:422
 msgid "The definer must be in the \"username@hostname\" format!"
 msgstr ""
@@ -11071,9 +11087,9 @@ msgid "You must provide an event definition."
 msgstr ""
 
 #: libraries/rte/rte_export.lib.php:43 libraries/rte/rte_general.lib.php:72
-#: libraries/rte/rte_routines.lib.php:345
-#: libraries/rte/rte_routines.lib.php:1198
-#: libraries/rte/rte_routines.lib.php:1411
+#: libraries/rte/rte_routines.lib.php:153
+#: libraries/rte/rte_routines.lib.php:1289
+#: libraries/rte/rte_routines.lib.php:1502
 msgid "Error in processing request:"
 msgstr ""
 
@@ -11105,132 +11121,132 @@ msgid ""
 "problems."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:110
-#: libraries/rte/rte_routines.lib.php:1006
+#: libraries/rte/rte_routines.lib.php:123
+msgid "Edit routine"
+msgstr ""
+
+#: libraries/rte/rte_routines.lib.php:200
+#: libraries/rte/rte_routines.lib.php:1097
 #, php-format
 msgid "Invalid routine type: \"%s\""
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:170
-msgid "Sorry, we failed to restore the dropped routine."
-msgstr ""
-
-#: libraries/rte/rte_routines.lib.php:211
-#, php-format
-msgid "Routine %1$s has been modified. Privileges have been adjusted."
-msgstr ""
-
-#: libraries/rte/rte_routines.lib.php:216
-#, php-format
-msgid "Routine %1$s has been modified."
-msgstr ""
-
-#: libraries/rte/rte_routines.lib.php:238
+#: libraries/rte/rte_routines.lib.php:253
 #, php-format
 msgid "Routine %1$s has been created."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:315
-msgid "Edit routine"
+#: libraries/rte/rte_routines.lib.php:380
+msgid "Sorry, we failed to restore the dropped routine."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:797
+#: libraries/rte/rte_routines.lib.php:439
+#, php-format
+msgid "Routine %1$s has been modified. Privileges have been adjusted."
+msgstr ""
+
+#: libraries/rte/rte_routines.lib.php:444
+#, php-format
+msgid "Routine %1$s has been modified."
+msgstr ""
+
+#: libraries/rte/rte_routines.lib.php:888
 msgid "Routine name"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:823
+#: libraries/rte/rte_routines.lib.php:914
 msgid "Parameters"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:829
+#: libraries/rte/rte_routines.lib.php:920
 msgid "Direction"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:847
+#: libraries/rte/rte_routines.lib.php:938
 msgid "Add parameter"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:851
+#: libraries/rte/rte_routines.lib.php:942
 msgid "Remove last parameter"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:856
+#: libraries/rte/rte_routines.lib.php:947
 msgid "Return type"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:862
+#: libraries/rte/rte_routines.lib.php:953
 msgid "Return length/values"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:868
+#: libraries/rte/rte_routines.lib.php:959
 msgid "Return options"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:899
+#: libraries/rte/rte_routines.lib.php:990
 msgid "Is deterministic"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:920
+#: libraries/rte/rte_routines.lib.php:1011
 msgid ""
 "You do not have sufficient privileges to perform this operation; Please "
 "refer to the documentation for more details"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:935
+#: libraries/rte/rte_routines.lib.php:1026
 msgid "Security type"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:944
+#: libraries/rte/rte_routines.lib.php:1035
 msgid "SQL data access"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1013
+#: libraries/rte/rte_routines.lib.php:1104
 msgid "You must provide a routine name!"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1047
+#: libraries/rte/rte_routines.lib.php:1138
 #, php-format
 msgid "Invalid direction \"%s\" given for parameter."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1069
-#: libraries/rte/rte_routines.lib.php:1131
+#: libraries/rte/rte_routines.lib.php:1160
+#: libraries/rte/rte_routines.lib.php:1222
 msgid ""
 "You must provide length/values for routine parameters of type ENUM, SET, "
 "VARCHAR and VARBINARY."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1095
+#: libraries/rte/rte_routines.lib.php:1186
 msgid "You must provide a name and a type for each routine parameter."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1114
+#: libraries/rte/rte_routines.lib.php:1205
 msgid "You must provide a valid return type for the routine."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1174
+#: libraries/rte/rte_routines.lib.php:1265
 msgid "You must provide a routine definition."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1285
+#: libraries/rte/rte_routines.lib.php:1376
 #, php-format
 msgid "Execution results of routine %s"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1340
+#: libraries/rte/rte_routines.lib.php:1431
 #, php-format
 msgid "%d row affected by the last statement inside the procedure."
 msgid_plural "%d rows affected by the last statement inside the procedure."
 msgstr[0] ""
 msgstr[1] ""
 
-#: libraries/rte/rte_routines.lib.php:1398
-#: libraries/rte/rte_routines.lib.php:1406
+#: libraries/rte/rte_routines.lib.php:1489
+#: libraries/rte/rte_routines.lib.php:1497
 msgid "Execute routine"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1485
-#: libraries/rte/rte_routines.lib.php:1488
+#: libraries/rte/rte_routines.lib.php:1576
+#: libraries/rte/rte_routines.lib.php:1579
 msgid "Routine parameters"
 msgstr ""
 
@@ -11384,7 +11400,7 @@ msgid "Original position"
 msgstr ""
 
 #: libraries/server_bin_log.lib.php:133
-#: templates/structure/display_table_stats.phtml:4
+#: templates/table/structure/display_table_stats.phtml:4
 msgid "Information"
 msgstr ""
 
@@ -11420,12 +11436,12 @@ msgid ""
 "between the web server and the MySQL server."
 msgstr ""
 
-#: libraries/server_databases.lib.php:364
-#: libraries/server_databases.lib.php:365
+#: libraries/server_databases.lib.php:366
+#: libraries/server_databases.lib.php:371
 msgid "Enable Statistics"
 msgstr ""
 
-#: libraries/server_databases.lib.php:481
+#: libraries/server_databases.lib.php:492
 #, php-format
 msgid "%1$d database has been dropped successfully."
 msgid_plural "%1$d databases have been dropped successfully."
@@ -11785,7 +11801,7 @@ msgid "You have revoked the privileges for %s."
 msgstr ""
 
 #: libraries/server_privileges.lib.php:2059
-#: libraries/server_privileges.lib.php:4290
+#: libraries/server_privileges.lib.php:4316
 msgid "Add user account"
 msgstr ""
 
@@ -11948,53 +11964,53 @@ msgstr ""
 msgid "The privileges were reloaded successfully."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:3994
+#: libraries/server_privileges.lib.php:4003
 #, php-format
 msgid "The user %s already exists!"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4232
+#: libraries/server_privileges.lib.php:4258
 #, php-format
 msgid "Privileges for %s"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4241
+#: libraries/server_privileges.lib.php:4267
 #: libraries/server_status_processes.lib.php:72
 #: libraries/server_user_groups.lib.php:39
 msgid "User"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4282
+#: libraries/server_privileges.lib.php:4308
 msgctxt "Create new user"
 msgid "New"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4311
+#: libraries/server_privileges.lib.php:4337
 msgid "Edit privileges:"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4312
+#: libraries/server_privileges.lib.php:4338
 msgid "User account"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4371
+#: libraries/server_privileges.lib.php:4397
 msgid ""
 "Note: You are attempting to edit privileges of the user with which you are "
 "currently logged in."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4391 libraries/server_users.lib.php:25
+#: libraries/server_privileges.lib.php:4417 libraries/server_users.lib.php:25
 msgid "User accounts overview"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4459
+#: libraries/server_privileges.lib.php:4485
 msgid ""
 "A user account allowing any user from localhost to connect is present. This "
 "will prevent other users from connecting if the host part of their account "
 "allows a connection from any (%) host."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4500
+#: libraries/server_privileges.lib.php:4526
 #, php-format
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
@@ -12003,7 +12019,7 @@ msgid ""
 "%sreload the privileges%s before you continue."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4519
+#: libraries/server_privileges.lib.php:4545
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
 "tables. The content of these tables may differ from the privileges the "
@@ -12012,61 +12028,61 @@ msgid ""
 "privilege."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4569
+#: libraries/server_privileges.lib.php:4595
 msgid "The selected user was not found in the privilege table."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4801
+#: libraries/server_privileges.lib.php:4827
 msgid "You have added a new user."
 msgstr ""
 
-#: libraries/server_status.lib.php:53
+#: libraries/server_status.lib.php:60
 #, php-format
 msgid "Network traffic since startup: %s"
 msgstr ""
 
-#: libraries/server_status.lib.php:66
+#: libraries/server_status.lib.php:73
 #, php-format
 msgid "This MySQL server has been running for %1$s. It started up on %2$s."
 msgstr ""
 
-#: libraries/server_status.lib.php:80
+#: libraries/server_status.lib.php:94
 msgid ""
 "This MySQL server works as <b>master</b> and <b>slave</b> in <b>replication</"
 "b> process."
 msgstr ""
 
-#: libraries/server_status.lib.php:85
+#: libraries/server_status.lib.php:99
 msgid "This MySQL server works as <b>master</b> in <b>replication</b> process."
 msgstr ""
 
-#: libraries/server_status.lib.php:90
+#: libraries/server_status.lib.php:104
 msgid "This MySQL server works as <b>slave</b> in <b>replication</b> process."
 msgstr ""
 
-#: libraries/server_status.lib.php:106
+#: libraries/server_status.lib.php:116
 msgid "Replication status"
 msgstr ""
 
-#: libraries/server_status.lib.php:137
+#: libraries/server_status.lib.php:146
 msgid ""
 "On a busy server, the byte counters may overrun, so those statistics as "
 "reported by the MySQL server may be incorrect."
 msgstr ""
 
-#: libraries/server_status.lib.php:148
+#: libraries/server_status.lib.php:157
 msgid "Received"
 msgstr ""
 
-#: libraries/server_status.lib.php:167
+#: libraries/server_status.lib.php:176
 msgid "Sent"
 msgstr ""
 
-#: libraries/server_status.lib.php:234
+#: libraries/server_status.lib.php:243
 msgid "Max. concurrent connections"
 msgstr ""
 
-#: libraries/server_status.lib.php:244
+#: libraries/server_status.lib.php:253
 msgid "Failed attempts"
 msgstr ""
 
@@ -12986,7 +13002,7 @@ msgstr ""
 msgid "Not implemented yet."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/AlterOperation.php:193
+#: libraries/sql-parser/src/Components/AlterOperation.php:191
 msgid "Unrecognized alter operation."
 msgstr ""
 
@@ -13000,7 +13016,7 @@ msgid "An opening bracket followed by a set of values was expected."
 msgstr ""
 
 #: libraries/sql-parser/src/Components/ArrayObj.php:101
-#: libraries/sql-parser/src/Components/FieldDefinition.php:202
+#: libraries/sql-parser/src/Components/CreateDefinition.php:202
 msgid "An opening bracket was expected."
 msgstr ""
 
@@ -13008,25 +13024,35 @@ msgstr ""
 msgid "A comma or a closing bracket was expected"
 msgstr ""
 
+#: libraries/sql-parser/src/Components/CreateDefinition.php:246
+#, fuzzy
+#| msgid "Database %1$s has been created."
+msgid "A comma or a closing bracket was expected."
+msgstr "%1$s ਡਾਟਾਬੇਸ ਬਣ ਚੁੱਕਾ ਹੈ."
+
+#: libraries/sql-parser/src/Components/CreateDefinition.php:262
+msgid "A closing bracket was expected."
+msgstr ""
+
 #: libraries/sql-parser/src/Components/DataType.php:125
 msgid "Unrecognized data type."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:225
+#: libraries/sql-parser/src/Components/Expression.php:227
 msgid "Unexpected closing bracket."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:246
-#: libraries/sql-parser/src/Components/Expression.php:283
-#: libraries/sql-parser/src/Components/Expression.php:303
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:285
+#: libraries/sql-parser/src/Components/Expression.php:305
 msgid "An alias was previously found."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:257
+#: libraries/sql-parser/src/Components/Expression.php:259
 msgid "Unexpected dot."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:327
+#: libraries/sql-parser/src/Components/Expression.php:329
 #, fuzzy
 #| msgid "Database %1$s has been created."
 msgid "An alias was expected."
@@ -13036,16 +13062,6 @@ msgstr "%1$s ਡਾਟਾਬੇਸ ਬਣ ਚੁੱਕਾ ਹੈ."
 msgid "An expression was expected."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/FieldDefinition.php:246
-#, fuzzy
-#| msgid "Database %1$s has been created."
-msgid "A comma or a closing bracket was expected."
-msgstr "%1$s ਡਾਟਾਬੇਸ ਬਣ ਚੁੱਕਾ ਹੈ."
-
-#: libraries/sql-parser/src/Components/FieldDefinition.php:262
-msgid "A closing bracket was expected."
-msgstr ""
-
 #: libraries/sql-parser/src/Components/Limit.php:90
 #: libraries/sql-parser/src/Components/Limit.php:112
 msgid "An offset was expected."
@@ -13087,24 +13103,24 @@ msgstr ""
 msgid "Expected delimiter."
 msgstr ""
 
-#: libraries/sql-parser/src/Lexer.php:753
+#: libraries/sql-parser/src/Lexer.php:777
 #, php-format
 msgid "Ending quote %1$s was expected."
 msgstr ""
 
-#: libraries/sql-parser/src/Lexer.php:789
+#: libraries/sql-parser/src/Lexer.php:813
 msgid "Variable name was expected."
 msgstr ""
 
-#: libraries/sql-parser/src/Parser.php:380
+#: libraries/sql-parser/src/Parser.php:391
 msgid "Unexpected beginning of statement."
 msgstr ""
 
-#: libraries/sql-parser/src/Parser.php:399
+#: libraries/sql-parser/src/Parser.php:410
 msgid "Unrecognized statement type."
 msgstr ""
 
-#: libraries/sql-parser/src/Parser.php:479
+#: libraries/sql-parser/src/Parser.php:489
 msgid "No transaction was previously started."
 msgstr ""
 
@@ -13130,8 +13146,10 @@ msgid "The name of the entity was expected."
 msgstr ""
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:310
-msgid "At least one field definition was expected."
-msgstr ""
+#, fuzzy
+#| msgid "Database %1$s has been created."
+msgid "At least one column definition was expected."
+msgstr "%1$s ਡਾਟਾਬੇਸ ਬਣ ਚੁੱਕਾ ਹੈ."
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:329
 msgid "A \"RETURNS\" keyword was expected."
@@ -13190,25 +13208,25 @@ msgstr ""
 msgid "Using bookmark \"%s\" as default browse query."
 msgstr ""
 
-#: libraries/sql.lib.php:1306
+#: libraries/sql.lib.php:1300
 msgid "Showing as PHP code"
 msgstr ""
 
-#: libraries/sql.lib.php:1638
+#: libraries/sql.lib.php:1632
 #, php-format
 msgid ""
 "Current selection does not contain a unique column. Grid edit, checkbox, "
 "Edit, Copy and Delete features are not available. %s"
 msgstr ""
 
-#: libraries/sql.lib.php:1649
+#: libraries/sql.lib.php:1643
 #, php-format
 msgid ""
 "Current selection does not contain a unique column. Grid edit, Edit, Copy "
 "and Delete features may result in undesired behavior. %s"
 msgstr ""
 
-#: libraries/sql.lib.php:1688
+#: libraries/sql.lib.php:1682
 #, php-format
 msgid "Problems with indexes of table `%s`"
 msgstr ""
@@ -13364,7 +13382,7 @@ msgid "Version %s snapshot (SQL code)"
 msgstr ""
 
 #: libraries/tracking.lib.php:947
-#: templates/structure/table_structure_row.phtml:33
+#: templates/table/structure/table_structure_row.phtml:33
 msgctxt "None for default"
 msgid "None"
 msgstr ""
@@ -13416,15 +13434,15 @@ msgstr ""
 msgid "Version %1$s was created, tracking for %2$s is active."
 msgstr ""
 
-#: libraries/user_preferences.inc.php:29
+#: libraries/user_preferences.inc.php:30
 msgid "Manage your settings"
 msgstr ""
 
-#: libraries/user_preferences.inc.php:46 prefs_manage.php:307
+#: libraries/user_preferences.inc.php:54 prefs_manage.php:307
 msgid "Configuration has been saved."
 msgstr ""
 
-#: libraries/user_preferences.inc.php:66
+#: libraries/user_preferences.inc.php:74
 #, php-format
 msgid ""
 "Your preferences will be saved for current session only. Storing them "
@@ -13798,7 +13816,7 @@ msgid "first"
 msgstr ""
 
 #: templates/columns_definitions/move_column.phtml:12
-#: templates/structure/add_column.phtml:21
+#: templates/table/structure/add_column.phtml:21
 #, php-format
 msgid "after %s"
 msgstr ""
@@ -13857,199 +13875,294 @@ msgstr ""
 msgid "Input transformation options"
 msgstr ""
 
-#: templates/designer/aggregate_query_panel.phtml:22
-#: templates/designer/options_panel.phtml:100
+#: templates/database/create_table.phtml:7
+#: templates/database/designer/side_menu.phtml:77
+#: templates/database/designer/side_menu.phtml:80
+msgid "Create table"
+msgstr ""
+
+#: templates/database/create_table.phtml:15
+msgid "Number of columns"
+msgstr ""
+
+#: templates/database/designer/aggregate_query_panel.phtml:22
+#: templates/database/designer/options_panel.phtml:100
 msgid "Aggregate"
 msgstr ""
 
-#: templates/designer/aggregate_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:61
-#: templates/designer/options_panel.phtml:106
-#: templates/designer/options_panel.phtml:170
-#: templates/designer/where_query_panel.phtml:30
-#: templates/table/table_header.phtml:9
+#: templates/database/designer/aggregate_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:61
+#: templates/database/designer/options_panel.phtml:106
+#: templates/database/designer/options_panel.phtml:170
+#: templates/database/designer/where_query_panel.phtml:30
+#: templates/table/search/table_header.phtml:9
 msgid "Operator"
 msgstr ""
 
-#: templates/designer/database_tables.phtml:29
+#: templates/database/designer/database_tables.phtml:29
 msgid "Toggle"
 msgstr ""
 
-#: templates/designer/database_tables.phtml:40
+#: templates/database/designer/database_tables.phtml:40
 msgid "See table structure"
 msgstr ""
 
-#: templates/designer/delete_relation_panel.phtml:21
+#: templates/database/designer/delete_relation_panel.phtml:21
 msgid "Delete relation"
 msgstr ""
 
-#: templates/designer/edit_delete_pages.phtml:7
+#: templates/database/designer/edit_delete_pages.phtml:7
 msgid "Page to open"
 msgstr ""
 
-#: templates/designer/edit_delete_pages.phtml:7
+#: templates/database/designer/edit_delete_pages.phtml:7
 msgid "Page to delete"
 msgstr ""
 
-#: templates/designer/having_query_panel.phtml:90
-#: templates/designer/options_panel.phtml:63
-#: templates/designer/options_panel.phtml:229
-#: templates/designer/where_query_panel.phtml:59
+#: templates/database/designer/having_query_panel.phtml:90
+#: templates/database/designer/options_panel.phtml:63
+#: templates/database/designer/options_panel.phtml:229
+#: templates/database/designer/where_query_panel.phtml:59
 msgid "Except"
 msgstr ""
 
-#: templates/designer/having_query_panel.phtml:102
-#: templates/designer/options_panel.phtml:75
-#: templates/designer/options_panel.phtml:241
-#: templates/designer/where_query_panel.phtml:71
+#: templates/database/designer/having_query_panel.phtml:102
+#: templates/database/designer/options_panel.phtml:75
+#: templates/database/designer/options_panel.phtml:241
+#: templates/database/designer/where_query_panel.phtml:71
 msgid "subquery"
 msgstr ""
 
-#: templates/designer/new_relation_panel.phtml:22
-#: templates/designer/side_menu.phtml:84 templates/designer/side_menu.phtml:87
+#: templates/database/designer/new_relation_panel.phtml:22
+#: templates/database/designer/side_menu.phtml:84
+#: templates/database/designer/side_menu.phtml:87
 msgid "Create relation"
 msgstr ""
 
-#: templates/designer/options_panel.phtml:34
-#: templates/designer/options_panel.phtml:200
+#: templates/database/designer/options_panel.phtml:34
+#: templates/database/designer/options_panel.phtml:200
 msgid "Relation operator"
 msgstr ""
 
-#: templates/designer/options_panel.phtml:85
-#: templates/designer/rename_to_panel.phtml:23
+#: templates/database/designer/options_panel.phtml:85
+#: templates/database/designer/rename_to_panel.phtml:23
 msgid "Rename to"
 msgstr ""
 
-#: templates/designer/options_panel.phtml:91
-#: templates/designer/rename_to_panel.phtml:31
+#: templates/database/designer/options_panel.phtml:91
+#: templates/database/designer/rename_to_panel.phtml:31
 msgid "New name"
 msgstr ""
 
-#: templates/designer/page_save_as.phtml:4
+#: templates/database/designer/page_save_as.phtml:4
 msgid "Save to selected page"
 msgstr ""
 
-#: templates/designer/page_save_as.phtml:5
+#: templates/database/designer/page_save_as.phtml:5
 msgid "Create a page and save to it"
 msgstr ""
 
-#: templates/designer/page_save_as.phtml:26
+#: templates/database/designer/page_save_as.phtml:26
 msgid "New page name"
 msgstr ""
 
-#: templates/designer/page_selector.phtml:2
+#: templates/database/designer/page_selector.phtml:2
 msgid "Select page"
 msgstr ""
 
-#: templates/designer/query_details.phtml:10
+#: templates/database/designer/query_details.phtml:10
 msgid "Active options"
 msgstr ""
 
-#: templates/designer/schema_export.phtml:4
+#: templates/database/designer/schema_export.phtml:4
 msgid "Select Export Relational Type"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:19 templates/designer/side_menu.phtml:25
+#: templates/database/designer/side_menu.phtml:19
+#: templates/database/designer/side_menu.phtml:25
 #, fuzzy
 #| msgid "Show all"
 msgid "Show/Hide tables list"
 msgstr "ਸਾਰੇ ਦਿਖ਼ਾਓ"
 
-#: templates/designer/side_menu.phtml:29 templates/designer/side_menu.phtml:35
-#: templates/designer/side_menu.phtml:36
+#: templates/database/designer/side_menu.phtml:29
+#: templates/database/designer/side_menu.phtml:35
+#: templates/database/designer/side_menu.phtml:36
 msgid "View in fullscreen"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:34
+#: templates/database/designer/side_menu.phtml:34
 msgid "Exit fullscreen"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:41 templates/designer/side_menu.phtml:45
+#: templates/database/designer/side_menu.phtml:41
+#: templates/database/designer/side_menu.phtml:45
 msgid "New page"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:70 templates/designer/side_menu.phtml:73
+#: templates/database/designer/side_menu.phtml:70
+#: templates/database/designer/side_menu.phtml:73
 msgid "Delete pages"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:77 templates/designer/side_menu.phtml:80
-#: templates/table/create_table.phtml:7
-msgid "Create table"
-msgstr ""
-
-#: templates/designer/side_menu.phtml:98
-#: templates/designer/side_menu.phtml:101
+#: templates/database/designer/side_menu.phtml:98
+#: templates/database/designer/side_menu.phtml:101
 msgid "Reload"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:107
-#: templates/designer/side_menu.phtml:110
+#: templates/database/designer/side_menu.phtml:107
+#: templates/database/designer/side_menu.phtml:110
 msgid "Help"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Angular links"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Direct links"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:122
-#: templates/designer/side_menu.phtml:124
+#: templates/database/designer/side_menu.phtml:122
+#: templates/database/designer/side_menu.phtml:124
 msgid "Snap to grid"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:128
-#: templates/designer/side_menu.phtml:134
+#: templates/database/designer/side_menu.phtml:128
+#: templates/database/designer/side_menu.phtml:134
 msgid "Small/Big All"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:138
-#: templates/designer/side_menu.phtml:141
+#: templates/database/designer/side_menu.phtml:138
+#: templates/database/designer/side_menu.phtml:141
 msgid "Toggle small/big"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:145
-#: templates/designer/side_menu.phtml:148
+#: templates/database/designer/side_menu.phtml:145
+#: templates/database/designer/side_menu.phtml:148
 msgid "Toggle relation lines"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:153
-#: templates/designer/side_menu.phtml:156
+#: templates/database/designer/side_menu.phtml:153
+#: templates/database/designer/side_menu.phtml:156
 msgid "Export schema"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:165
-#: templates/designer/side_menu.phtml:168
+#: templates/database/designer/side_menu.phtml:165
+#: templates/database/designer/side_menu.phtml:168
 msgid "Build Query"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:173
-#: templates/designer/side_menu.phtml:177
+#: templates/database/designer/side_menu.phtml:173
+#: templates/database/designer/side_menu.phtml:177
 msgid "Move Menu"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:181
-#: templates/designer/side_menu.phtml:186
+#: templates/database/designer/side_menu.phtml:181
+#: templates/database/designer/side_menu.phtml:186
 msgid "Pin text"
 msgstr ""
 
-#: templates/designer/table_list.phtml:4
+#: templates/database/designer/table_list.phtml:4
 msgid "Hide/Show all"
 msgstr ""
 
-#: templates/designer/table_list.phtml:14
+#: templates/database/designer/table_list.phtml:14
 msgid "Hide/Show Tables with no relation"
 msgstr ""
 
-#: templates/designer/table_list.phtml:59
+#: templates/database/designer/table_list.phtml:59
 msgid "Number of tables:"
 msgstr ""
 
+#: templates/database/structure/body_for_table_summary.phtml:6
+#, php-format
+msgid "%s table"
+msgid_plural "%s tables"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templates/database/structure/body_for_table_summary.phtml:17
+msgid "Sum"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:6
+msgid "Check tables having overhead"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:10
+#, fuzzy
+#| msgid "Show all"
+msgid "Show create"
+msgstr "ਸਾਰੇ ਦਿਖ਼ਾਓ"
+
+#: templates/database/structure/check_all_tables.phtml:27
+msgid "Prefix"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:28
+msgid "Add prefix to table"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:29
+msgid "Replace table prefix"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:30
+msgid "Copy table with prefix"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:36
+msgid "Add columns to central list"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:37
+msgid "Remove columns from central list"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:38
+msgid "Make consistent with central list"
+msgstr ""
+
+#: templates/database/structure/favorite_anchor.phtml:12
+msgid "Add to Favorites"
+msgstr ""
+
+#: templates/database/structure/show_create.phtml:2
+msgid "Showing create queries"
+msgstr ""
+
+#: templates/database/structure/sortable_header.phtml:13
+msgid "Sort"
+msgstr ""
+
+#: templates/database/structure/table_header.phtml:42
+msgid ""
+"May be approximate. Click on the number to get the exact count. See "
+"[doc@faq3-11]FAQ 3.11[/doc]."
+msgstr ""
+
+#: templates/database/structure/table_header.phtml:66
+#: templates/table/index_form.phtml:127
+msgid "Size"
+msgstr ""
+
+#: templates/database/structure/table_header.phtml:74
+#: templates/table/structure/display_table_stats.phtml:27
+msgid "Overhead"
+msgstr ""
+
+#: templates/database/structure/tracking_icon.phtml:4
+msgid "Tracking is active."
+msgstr ""
+
+#: templates/database/structure/tracking_icon.phtml:8
+msgid "Tracking is not active."
+msgstr ""
+
 #: templates/error/report_form.phtml:7
 msgid ""
 "phpMyAdmin has encountered an error. We have collected data about this error "
@@ -14065,59 +14178,6 @@ msgstr ""
 msgid "Please explain the steps that lead to the error:"
 msgstr ""
 
-#: templates/gis_visualization/gis_visualization.phtml:3
-msgid "Display GIS Visualization"
-msgstr ""
-
-#: templates/gis_visualization/gis_visualization.phtml:8
-msgid "Label column"
-msgstr ""
-
-#: templates/gis_visualization/gis_visualization.phtml:11
-msgid "-- None --"
-msgstr ""
-
-#: templates/gis_visualization/gis_visualization.phtml:19
-msgid "Spatial column"
-msgstr ""
-
-#: templates/index_form.phtml:16
-msgid "Index name:"
-msgstr ""
-
-#: templates/index_form.phtml:19
-msgid ""
-"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
-msgstr ""
-
-#: templates/index_form.phtml:40
-msgid "Index choice:"
-msgstr ""
-
-#: templates/index_form.phtml:57
-msgid "Key block size:"
-msgstr ""
-
-#: templates/index_form.phtml:74
-msgid "Index type:"
-msgstr ""
-
-#: templates/index_form.phtml:86
-msgid "Parser:"
-msgstr ""
-
-#: templates/index_form.phtml:102
-msgid "Comment:"
-msgstr ""
-
-#: templates/index_form.phtml:127 templates/structure/table_header.phtml:66
-msgid "Size"
-msgstr ""
-
-#: templates/index_form.phtml:149 templates/index_form.phtml:190
-msgid "Drag to reorder"
-msgstr ""
-
 #: templates/prefs_autoload.phtml:9
 msgid ""
 "Your browser has phpMyAdmin configuration for this domain. Would you like to "
@@ -14128,407 +14188,372 @@ msgstr ""
 msgid "Start row:"
 msgstr ""
 
-#: templates/structure/actions_in_table_structure.phtml:14
-#, php-format
-msgid "A primary key has been added on %s."
-msgstr ""
-
-#: templates/structure/actions_in_table_structure.phtml:34
-#: templates/structure/actions_in_table_structure.phtml:54
-#: templates/structure/actions_in_table_structure.phtml:79
-#: templates/structure/actions_in_table_structure.phtml:101
-#, php-format
-msgid "An index has been added on %s."
-msgstr ""
-
-#: templates/structure/actions_in_table_structure.phtml:130
-#: templates/structure/check_all_table_column.phtml:59
-msgid "Remove from central columns"
-msgstr ""
-
-#: templates/structure/actions_in_table_structure.phtml:138
-#: templates/structure/check_all_table_column.phtml:55
-msgid "Add to central columns"
-msgstr ""
-
-#: templates/structure/add_column.phtml:7
-#, php-format
-msgid "Add %s column(s)"
-msgstr ""
-
-#: templates/structure/add_column.phtml:12
-msgid "at beginning of table"
-msgstr ""
-
-#: templates/structure/body_for_table_summary.phtml:6
-#, php-format
-msgid "%s table"
-msgid_plural "%s tables"
-msgstr[0] ""
-msgstr[1] ""
-
-#: templates/structure/body_for_table_summary.phtml:17
-msgid "Sum"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:6
-msgid "Check tables having overhead"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:10
-#, fuzzy
-#| msgid "Show all"
-msgid "Show create"
-msgstr "ਸਾਰੇ ਦਿਖ਼ਾਓ"
-
-#: templates/structure/check_all_tables.phtml:27
-msgid "Prefix"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:28
-msgid "Add prefix to table"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:29
-msgid "Replace table prefix"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:30
-msgid "Copy table with prefix"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:36
-msgid "Add columns to central list"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:37
-msgid "Remove columns from central list"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:38
-msgid "Make consistent with central list"
-msgstr ""
-
-#: templates/structure/display_structure.phtml:140 view_create.php:181
-msgid "Edit view"
-msgstr ""
-
-#: templates/structure/display_table_stats.phtml:9
-msgid "Space usage"
-msgstr ""
-
-#: templates/structure/display_table_stats.phtml:27
-#: templates/structure/table_header.phtml:74
-msgid "Overhead"
-msgstr ""
-
-#: templates/structure/display_table_stats.phtml:32
-msgid "Effective"
-msgstr ""
-
-#: templates/structure/favorite_anchor.phtml:12
-msgid "Add to Favorites"
-msgstr ""
-
-#: templates/structure/move_columns_dialog.phtml:1
-#: templates/structure/optional_action_links.phtml:21
-msgid "Move columns"
-msgstr ""
-
-#: templates/structure/move_columns_dialog.phtml:2
-msgid "Move the columns by dragging them up and down."
-msgstr ""
-
-#: templates/structure/optional_action_links.phtml:9
-msgid "Propose table structure"
-msgstr ""
-
-#: templates/structure/optional_action_links.phtml:24
-msgid "Improve table structure"
-msgstr ""
-
-#: templates/structure/optional_action_links.phtml:30
-msgid "Track view"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:3
-msgid "Row statistics"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:9
-msgid "static"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:11
-msgid "dynamic"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:22
-msgid "partitioned"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:54
-msgid "Row length"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:66
-msgid "Row size"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:73
-msgid "Next autoindex"
-msgstr ""
-
-#: templates/structure/secondary_tabs.phtml:14
-msgid "Relation view"
-msgstr ""
-
-#: templates/structure/show_create.phtml:2
-msgid "Showing create queries"
-msgstr ""
-
-#: templates/structure/sortable_header.phtml:13
-msgid "Sort"
-msgstr ""
-
-#: templates/structure/table_header.phtml:42
-msgid ""
-"May be approximate. Click on the number to get the exact count. See "
-"[doc@faq3-11]FAQ 3.11[/doc]."
-msgstr ""
-
-#: templates/structure/table_structure_row.phtml:46
-#, php-format
-msgid "Column %s has been dropped."
-msgstr ""
-
-#: templates/structure/tracking_icon.phtml:4
-msgid "Tracking is active."
-msgstr ""
-
-#: templates/structure/tracking_icon.phtml:8
-msgid "Tracking is not active."
-msgstr ""
-
-#: templates/table/create_table.phtml:15
-msgid "Number of columns"
-msgstr ""
-
-#: templates/table/options.phtml:8
-msgid "Select columns (at least one):"
-msgstr ""
-
-#: templates/table/options.phtml:37
-msgid "Add search conditions (body of the \"where\" clause):"
-msgstr ""
-
-#: templates/table/options.phtml:45
-msgid "Number of rows per page"
-msgstr ""
-
-#: templates/table/options.phtml:56
-msgid "Display order:"
-msgstr ""
-
-#: templates/table/options_zoom.phtml:6
-msgid "Use this column to label each point"
-msgstr ""
-
-#: templates/table/options_zoom.phtml:35
-msgid "Maximum rows to plot"
-msgstr ""
-
-#: templates/table/replace_preview.phtml:13
-msgid "Find and replace - preview"
-msgstr ""
-
-#: templates/table/replace_preview.phtml:18
-msgid "Original string"
-msgstr ""
-
-#: templates/table/replace_preview.phtml:19
-msgid "Replaced string"
-msgstr ""
-
-#: templates/table/replace_preview.phtml:40
-msgid "Replace"
-msgstr ""
-
-#: templates/table/rows_zoom.phtml:16
-msgid "Additional search criteria"
-msgstr ""
-
-#: templates/table/search_and_replace.phtml:3
-msgid "Replace with:"
-msgstr ""
-
-#: templates/table/search_and_replace.phtml:22
-msgid "Use regular expression"
-msgstr ""
-
-#: templates/table/selection_form.phtml:12
-msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
-msgstr ""
-
-#: templates/table/selection_form.phtml:34
-msgid "Do a \"query by example\" (wildcard: \"%\")"
-msgstr ""
-
-#: templates/table/zoom_result_form.phtml:7
-msgid "Browse/Edit the points"
-msgstr ""
-
-#: templates/table/zoom_result_form.phtml:15
-msgid "How to use"
-msgstr ""
-
-#: templates/table/zoom_result_form.phtml:23
-msgid "Reset zoom"
-msgstr ""
-
-#: templates/tbl_chart.phtml:17
+#: templates/table/chart/tbl_chart.phtml:17
 msgctxt "Chart type"
 msgid "Bar"
 msgstr ""
 
-#: templates/tbl_chart.phtml:21
+#: templates/table/chart/tbl_chart.phtml:21
 msgctxt "Chart type"
 msgid "Column"
 msgstr ""
 
-#: templates/tbl_chart.phtml:25
+#: templates/table/chart/tbl_chart.phtml:25
 msgctxt "Chart type"
 msgid "Line"
 msgstr ""
 
-#: templates/tbl_chart.phtml:29
+#: templates/table/chart/tbl_chart.phtml:29
 msgctxt "Chart type"
 msgid "Spline"
 msgstr ""
 
-#: templates/tbl_chart.phtml:33
+#: templates/table/chart/tbl_chart.phtml:33
 msgctxt "Chart type"
 msgid "Area"
 msgstr ""
 
-#: templates/tbl_chart.phtml:37
+#: templates/table/chart/tbl_chart.phtml:37
 msgctxt "Chart type"
 msgid "Pie"
 msgstr ""
 
-#: templates/tbl_chart.phtml:41
+#: templates/table/chart/tbl_chart.phtml:41
 msgctxt "Chart type"
 msgid "Timeline"
 msgstr ""
 
-#: templates/tbl_chart.phtml:45
+#: templates/table/chart/tbl_chart.phtml:45
 msgctxt "Chart type"
 msgid "Scatter"
 msgstr ""
 
-#: templates/tbl_chart.phtml:50
+#: templates/table/chart/tbl_chart.phtml:50
 msgid "Stacked"
 msgstr ""
 
-#: templates/tbl_chart.phtml:53
+#: templates/table/chart/tbl_chart.phtml:53
 msgid "Chart title"
 msgstr ""
 
-#: templates/tbl_chart.phtml:57
+#: templates/table/chart/tbl_chart.phtml:57
 msgid "X-Axis:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:72
+#: templates/table/chart/tbl_chart.phtml:72
 msgid "Series:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:102
+#: templates/table/chart/tbl_chart.phtml:102
 msgid "X-Axis label:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:104
+#: templates/table/chart/tbl_chart.phtml:104
 msgid "X Values"
 msgstr ""
 
-#: templates/tbl_chart.phtml:107
+#: templates/table/chart/tbl_chart.phtml:107
 msgid "Y-Axis label:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:115
+#: templates/table/chart/tbl_chart.phtml:115
 msgid "Series names are in a column"
 msgstr ""
 
-#: templates/tbl_chart.phtml:118
+#: templates/table/chart/tbl_chart.phtml:118
 msgid "Series column:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:130
+#: templates/table/chart/tbl_chart.phtml:130
 msgid "Value Column:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:150
+#: templates/table/chart/tbl_chart.phtml:150
 msgid "Save chart as image"
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:7
+#: templates/table/gis_visualization/gis_visualization.phtml:3
+msgid "Display GIS Visualization"
+msgstr ""
+
+#: templates/table/gis_visualization/gis_visualization.phtml:8
+msgid "Label column"
+msgstr ""
+
+#: templates/table/gis_visualization/gis_visualization.phtml:11
+msgid "-- None --"
+msgstr ""
+
+#: templates/table/gis_visualization/gis_visualization.phtml:19
+msgid "Spatial column"
+msgstr ""
+
+#: templates/table/index_form.phtml:16
+msgid "Index name:"
+msgstr ""
+
+#: templates/table/index_form.phtml:19
+msgid ""
+"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
+msgstr ""
+
+#: templates/table/index_form.phtml:40
+msgid "Index choice:"
+msgstr ""
+
+#: templates/table/index_form.phtml:57
+msgid "Key block size:"
+msgstr ""
+
+#: templates/table/index_form.phtml:74
+msgid "Index type:"
+msgstr ""
+
+#: templates/table/index_form.phtml:86
+msgid "Parser:"
+msgstr ""
+
+#: templates/table/index_form.phtml:102
+msgid "Comment:"
+msgstr ""
+
+#: templates/table/index_form.phtml:149 templates/table/index_form.phtml:190
+msgid "Drag to reorder"
+msgstr ""
+
+#: templates/table/relation/common_form.phtml:7
 #, fuzzy
 #| msgid "Database %1$s has been created."
 msgid "Internal relations"
 msgstr "%1$s ਡਾਟਾਬੇਸ ਬਣ ਚੁੱਕਾ ਹੈ."
 
-#: templates/tbl_relation/common_form.phtml:11
+#: templates/table/relation/common_form.phtml:11
 msgid "Internal relation"
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:14
+#: templates/table/relation/common_form.phtml:14
 msgid ""
 "An internal relation is not necessary when a corresponding FOREIGN KEY "
 "relation exists."
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:37
+#: templates/table/relation/common_form.phtml:37
 msgid "Foreign key constraints"
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:40
+#: templates/table/relation/common_form.phtml:40
 msgid "Actions"
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:41
+#: templates/table/relation/common_form.phtml:41
 msgid "Constraint properties"
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:44
+#: templates/table/relation/common_form.phtml:44
 msgid ""
 "Only columns with index will be displayed. You can define an index below."
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:49
+#: templates/table/relation/common_form.phtml:49
 msgid "Foreign key constraint"
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:81
+#: templates/table/relation/common_form.phtml:81
 msgid "+ Add constraint"
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:91
+#: templates/table/relation/common_form.phtml:91
 msgid "Choose column to display:"
 msgstr ""
 
-#: templates/tbl_relation/foreign_key_row.phtml:13
+#: templates/table/relation/foreign_key_row.phtml:13
 #, fuzzy, php-format
 #| msgid "Database %1$s has been created."
 msgid "Foreign key constraint %s has been dropped"
 msgstr "%1$s ਡਾਟਾਬੇਸ ਬਣ ਚੁੱਕਾ ਹੈ."
 
-#: templates/tbl_relation/foreign_key_row.phtml:102
+#: templates/table/relation/foreign_key_row.phtml:102
 msgid "Constraint name"
 msgstr ""
 
-#: templates/tbl_relation/foreign_key_row.phtml:157
+#: templates/table/relation/foreign_key_row.phtml:157
 msgid "+ Add column"
 msgstr ""
 
+#: templates/table/search/options.phtml:8
+msgid "Select columns (at least one):"
+msgstr ""
+
+#: templates/table/search/options.phtml:37
+msgid "Add search conditions (body of the \"where\" clause):"
+msgstr ""
+
+#: templates/table/search/options.phtml:45
+msgid "Number of rows per page"
+msgstr ""
+
+#: templates/table/search/options.phtml:56
+msgid "Display order:"
+msgstr ""
+
+#: templates/table/search/options_zoom.phtml:6
+msgid "Use this column to label each point"
+msgstr ""
+
+#: templates/table/search/options_zoom.phtml:35
+msgid "Maximum rows to plot"
+msgstr ""
+
+#: templates/table/search/replace_preview.phtml:13
+msgid "Find and replace - preview"
+msgstr ""
+
+#: templates/table/search/replace_preview.phtml:18
+msgid "Original string"
+msgstr ""
+
+#: templates/table/search/replace_preview.phtml:19
+msgid "Replaced string"
+msgstr ""
+
+#: templates/table/search/replace_preview.phtml:40
+msgid "Replace"
+msgstr ""
+
+#: templates/table/search/rows_zoom.phtml:16
+msgid "Additional search criteria"
+msgstr ""
+
+#: templates/table/search/search_and_replace.phtml:3
+msgid "Replace with:"
+msgstr ""
+
+#: templates/table/search/search_and_replace.phtml:22
+msgid "Use regular expression"
+msgstr ""
+
+#: templates/table/search/selection_form.phtml:12
+msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
+msgstr ""
+
+#: templates/table/search/selection_form.phtml:34
+msgid "Do a \"query by example\" (wildcard: \"%\")"
+msgstr ""
+
+#: templates/table/search/zoom_result_form.phtml:7
+msgid "Browse/Edit the points"
+msgstr ""
+
+#: templates/table/search/zoom_result_form.phtml:15
+msgid "How to use"
+msgstr ""
+
+#: templates/table/search/zoom_result_form.phtml:23
+msgid "Reset zoom"
+msgstr ""
+
+#: templates/table/secondary_tabs.phtml:14
+msgid "Relation view"
+msgstr ""
+
+#: templates/table/structure/actions_in_table_structure.phtml:14
+#, php-format
+msgid "A primary key has been added on %s."
+msgstr ""
+
+#: templates/table/structure/actions_in_table_structure.phtml:34
+#: templates/table/structure/actions_in_table_structure.phtml:54
+#: templates/table/structure/actions_in_table_structure.phtml:79
+#: templates/table/structure/actions_in_table_structure.phtml:101
+#, php-format
+msgid "An index has been added on %s."
+msgstr ""
+
+#: templates/table/structure/actions_in_table_structure.phtml:130
+#: templates/table/structure/check_all_table_column.phtml:59
+msgid "Remove from central columns"
+msgstr ""
+
+#: templates/table/structure/actions_in_table_structure.phtml:138
+#: templates/table/structure/check_all_table_column.phtml:55
+msgid "Add to central columns"
+msgstr ""
+
+#: templates/table/structure/add_column.phtml:7
+#, php-format
+msgid "Add %s column(s)"
+msgstr ""
+
+#: templates/table/structure/add_column.phtml:12
+msgid "at beginning of table"
+msgstr ""
+
+#: templates/table/structure/display_structure.phtml:140 view_create.php:181
+msgid "Edit view"
+msgstr ""
+
+#: templates/table/structure/display_table_stats.phtml:9
+msgid "Space usage"
+msgstr ""
+
+#: templates/table/structure/display_table_stats.phtml:32
+msgid "Effective"
+msgstr ""
+
+#: templates/table/structure/move_columns_dialog.phtml:1
+#: templates/table/structure/optional_action_links.phtml:21
+msgid "Move columns"
+msgstr ""
+
+#: templates/table/structure/move_columns_dialog.phtml:2
+msgid "Move the columns by dragging them up and down."
+msgstr ""
+
+#: templates/table/structure/optional_action_links.phtml:9
+msgid "Propose table structure"
+msgstr ""
+
+#: templates/table/structure/optional_action_links.phtml:24
+msgid "Improve table structure"
+msgstr ""
+
+#: templates/table/structure/optional_action_links.phtml:30
+msgid "Track view"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:3
+msgid "Row statistics"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:9
+msgid "static"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:11
+msgid "dynamic"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:22
+msgid "partitioned"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:54
+msgid "Row length"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:66
+msgid "Row size"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:73
+msgid "Next autoindex"
+msgstr ""
+
+#: templates/table/structure/table_structure_row.phtml:46
+#, php-format
+msgid "Column %s has been dropped."
+msgstr ""
+
 #: themes.php:17 themes.php:22
 msgid "Theme"
 msgstr ""
diff --git a/po/phpmyadmin.pot b/po/phpmyadmin.pot
index 76d0792174..5ef240d683 100644
--- a/po/phpmyadmin.pot
+++ b/po/phpmyadmin.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 4.5.0-dev\n"
 "Report-Msgid-Bugs-To: developers@phpmyadmin.net\n"
-"POT-Creation-Date: 2015-08-08 13:53-0400\n"
+"POT-Creation-Date: 2015-08-12 08:10-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -54,7 +54,7 @@ msgid "Table comments:"
 msgstr ""
 
 #: db_datadict.php:104 libraries/Index.class.php:699
-#: libraries/insert_edit.lib.php:1567
+#: libraries/insert_edit.lib.php:1565
 #: libraries/navigation/Nodes/Node_Column.class.php:30
 #: libraries/plugins/export/ExportHtmlword.class.php:280
 #: libraries/plugins/export/ExportHtmlword.class.php:375
@@ -68,13 +68,14 @@ msgstr ""
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1023
 #: libraries/tracking.lib.php:879 libraries/tracking.lib.php:975
 #: templates/columns_definitions/column_name.phtml:18
-#: templates/index_form.phtml:124 templates/table/table_header.phtml:6
-#: templates/table/zoom_result_form.phtml:33
-#: templates/tbl_relation/common_form.phtml:10
-#: templates/tbl_relation/common_form.phtml:43
-#: templates/tbl_relation/foreign_key_row.phtml:194
-#: templates/tbl_relation/foreign_key_row.phtml:206
-#: templates/tbl_relation/internal_relational_row.phtml:71
+#: templates/table/index_form.phtml:124
+#: templates/table/relation/common_form.phtml:10
+#: templates/table/relation/common_form.phtml:43
+#: templates/table/relation/foreign_key_row.phtml:194
+#: templates/table/relation/foreign_key_row.phtml:206
+#: templates/table/relation/internal_relational_row.phtml:71
+#: templates/table/search/table_header.phtml:6
+#: templates/table/search/zoom_result_form.phtml:33
 msgid "Column"
 msgstr ""
 
@@ -92,21 +93,21 @@ msgstr ""
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1001
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1024
 #: libraries/rte/rte_list.lib.php:75 libraries/rte/rte_list.lib.php:103
-#: libraries/rte/rte_routines.lib.php:802
-#: libraries/rte/rte_routines.lib.php:831
-#: libraries/rte/rte_routines.lib.php:1493
+#: libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_routines.lib.php:922
+#: libraries/rte/rte_routines.lib.php:1584
 #: libraries/server_privileges.lib.php:2369 libraries/tracking.lib.php:880
 #: libraries/tracking.lib.php:972
 #: templates/columns_definitions/table_fields_definitions.phtml:11
-#: templates/structure/table_header.phtml:48
-#: templates/structure/table_structure_header.phtml:6
-#: templates/table/table_header.phtml:7
+#: templates/database/structure/table_header.phtml:48
+#: templates/table/search/table_header.phtml:7
+#: templates/table/structure/table_structure_header.phtml:6
 msgid "Type"
 msgstr ""
 
 #: db_datadict.php:106 libraries/Index.class.php:702
 #: libraries/central_columns.lib.php:708
-#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1576
+#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1574
 #: libraries/plugins/export/ExportHtmlword.class.php:286
 #: libraries/plugins/export/ExportHtmlword.class.php:381
 #: libraries/plugins/export/ExportLatex.class.php:509
@@ -119,8 +120,8 @@ msgstr ""
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1026
 #: libraries/tracking.lib.php:882 libraries/tracking.lib.php:978
 #: templates/columns_definitions/table_fields_definitions.phtml:39
-#: templates/structure/table_structure_header.phtml:9
-#: templates/table/zoom_result_form.phtml:34
+#: templates/table/search/zoom_result_form.phtml:34
+#: templates/table/structure/table_structure_header.phtml:9
 msgid "Null"
 msgstr ""
 
@@ -138,8 +139,8 @@ msgstr ""
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1027
 #: libraries/replication_gui.lib.php:153 libraries/tracking.lib.php:883
 #: templates/columns_definitions/table_fields_definitions.phtml:25
-#: templates/structure/body_for_table_summary.phtml:55
-#: templates/structure/table_structure_header.phtml:10
+#: templates/database/structure/body_for_table_summary.phtml:55
+#: templates/table/structure/table_structure_header.phtml:10
 msgid "Default"
 msgstr ""
 
@@ -167,19 +168,19 @@ msgid "Comments"
 msgstr ""
 
 #: db_datadict.php:146
-#: libraries/controllers/StructureController.class.php:1960
-#: libraries/controllers/StructureController.class.php:1965
+#: libraries/controllers/TableStructureController.class.php:951
+#: libraries/controllers/TableStructureController.class.php:956
 #: libraries/tracking.lib.php:922
 #: templates/columns_definitions/column_indexes.phtml:6
-#: templates/structure/check_all_table_column.phtml:22
-#: templates/structure/display_structure.phtml:74
+#: templates/table/structure/check_all_table_column.phtml:22
+#: templates/table/structure/display_structure.phtml:74
 msgid "Primary"
 msgstr ""
 
 #: db_datadict.php:156 js/messages.php:317 libraries/Index.class.php:567
 #: libraries/Index.class.php:606 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261 libraries/mult_submits.lib.php:403
+#: libraries/config/FormDisplay.tpl.php:272 libraries/mult_submits.lib.php:403
 #: libraries/mult_submits.lib.php:417
 #: libraries/plugins/export/ExportHtmlword.class.php:630
 #: libraries/plugins/export/ExportLatex.class.php:589
@@ -195,20 +196,20 @@ msgstr ""
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1010 libraries/tracking.lib.php:1015
 #: prefs_manage.php:140 templates/prefs_autoload.phtml:15
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "No"
 msgstr ""
 
 #: db_datadict.php:156 js/messages.php:443 libraries/Index.class.php:568
 #: libraries/Index.class.php:605 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261
-#: libraries/controllers/StructureController.class.php:1344
-#: libraries/controllers/StructureController.class.php:2223
-#: libraries/controllers/StructureController.class.php:2232
-#: libraries/controllers/StructureController.class.php:2237
-#: libraries/controllers/StructureController.class.php:2242
-#: libraries/controllers/StructureController.class.php:2247
+#: libraries/config/FormDisplay.tpl.php:272
+#: libraries/controllers/TableStructureController.class.php:539
+#: libraries/controllers/TableStructureController.class.php:1201
+#: libraries/controllers/TableStructureController.class.php:1210
+#: libraries/controllers/TableStructureController.class.php:1215
+#: libraries/controllers/TableStructureController.class.php:1220
+#: libraries/controllers/TableStructureController.class.php:1225
 #: libraries/mult_submits.inc.php:82 libraries/mult_submits.inc.php:178
 #: libraries/mult_submits.lib.php:339 libraries/mult_submits.lib.php:372
 #: libraries/mult_submits.lib.php:401 libraries/mult_submits.lib.php:415
@@ -217,8 +218,8 @@ msgstr ""
 #: libraries/plugins/export/ExportOdt.class.php:756
 #: libraries/plugins/export/ExportTexytext.class.php:567
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1077
-#: libraries/server_databases.lib.php:464
-#: libraries/server_databases.lib.php:474
+#: libraries/server_databases.lib.php:475
+#: libraries/server_databases.lib.php:485
 #: libraries/server_privileges.lib.php:2546
 #: libraries/server_privileges.lib.php:2727
 #: libraries/server_privileges.lib.php:2748
@@ -228,7 +229,7 @@ msgstr ""
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1008 libraries/tracking.lib.php:1013
 #: prefs_manage.php:138 templates/prefs_autoload.phtml:14
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "Yes"
 msgstr ""
 
@@ -238,7 +239,7 @@ msgstr ""
 
 #: db_export.php:37 db_tracking.php:90 export.php:382
 #: libraries/DBQbe.class.php:326
-#: libraries/controllers/StructureController.class.php:231
+#: libraries/controllers/DatabaseStructureController.class.php:170
 #: libraries/navigation/NavigationTree.class.php:897
 msgid "No tables found in database."
 msgstr ""
@@ -249,14 +250,14 @@ msgstr ""
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:26
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:120
-#: templates/structure/show_create.phtml:18
+#: templates/database/structure/show_create.phtml:18
 msgid "Tables"
 msgstr ""
 
 #: db_export.php:52 libraries/Menu.class.php:317 libraries/Menu.class.php:425
-#: libraries/Util.class.php:3333 libraries/Util.class.php:3343
-#: libraries/Util.class.php:3349 libraries/Util.class.php:3629
-#: libraries/Util.class.php:4327 libraries/Util.class.php:4344
+#: libraries/Util.class.php:3339 libraries/Util.class.php:3349
+#: libraries/Util.class.php:3355 libraries/Util.class.php:3635
+#: libraries/Util.class.php:4333 libraries/Util.class.php:4350
 #: libraries/central_columns.lib.php:728 libraries/config.values.php:39
 #: libraries/config.values.php:47 libraries/config.values.php:109
 #: libraries/config.values.php:115 libraries/config/setup.forms.php:323
@@ -270,7 +271,7 @@ msgstr ""
 #: libraries/navigation/Nodes/Node_Table.class.php:283
 #: libraries/server_privileges.lib.php:1141 libraries/tracking.lib.php:874
 #: templates/columns_definitions/table_fields_definitions.phtml:3
-#: templates/designer/table_list.phtml:28
+#: templates/database/designer/table_list.phtml:28
 msgid "Structure"
 msgstr ""
 
@@ -282,7 +283,7 @@ msgstr ""
 #: libraries/config/user_preferences.forms.php:292
 #: libraries/config/user_preferences.forms.php:297
 #: libraries/server_privileges.lib.php:1140
-#: templates/structure/display_table_stats.phtml:12
+#: templates/table/structure/display_table_stats.phtml:12
 msgid "Data"
 msgstr ""
 
@@ -352,10 +353,10 @@ msgstr ""
 #: libraries/server_privileges.lib.php:2908
 #: libraries/server_privileges.lib.php:3145
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4346
-#: templates/structure/table_header.phtml:21
-#: templates/tbl_relation/foreign_key_row.phtml:176
-#: templates/tbl_relation/internal_relational_row.phtml:63
+#: libraries/server_privileges.lib.php:4372
+#: templates/database/structure/table_header.phtml:21
+#: templates/table/relation/foreign_key_row.phtml:176
+#: templates/table/relation/internal_relational_row.phtml:63
 msgid "Table"
 msgstr ""
 
@@ -372,7 +373,7 @@ msgid "Updated"
 msgstr ""
 
 #: db_tracking.php:130 js/messages.php:243 libraries/Menu.class.php:552
-#: libraries/Util.class.php:4314 libraries/config.values.php:104
+#: libraries/Util.class.php:4320 libraries/config.values.php:104
 #: libraries/rte/rte_events.lib.php:393 libraries/rte/rte_list.lib.php:101
 #: libraries/server_status_processes.lib.php:92 libraries/tracking.lib.php:279
 msgid "Status"
@@ -381,14 +382,15 @@ msgstr ""
 #: db_tracking.php:131 db_tracking.php:290 libraries/Index.class.php:693
 #: libraries/central_columns.lib.php:687 libraries/rte/rte_list.lib.php:74
 #: libraries/rte/rte_list.lib.php:89 libraries/rte/rte_list.lib.php:102
-#: libraries/server_databases.lib.php:398
+#: libraries/server_databases.lib.php:409
 #: libraries/server_privileges.lib.php:2372
 #: libraries/server_privileges.lib.php:3166
 #: libraries/server_privileges.lib.php:3342
 #: libraries/server_user_groups.lib.php:82
 #: libraries/server_variables.lib.php:189 libraries/tracking.lib.php:280
-#: libraries/tracking.lib.php:793 templates/structure/table_header.phtml:30
-#: templates/structure/table_structure_header.phtml:23
+#: libraries/tracking.lib.php:793
+#: templates/database/structure/table_header.phtml:30
+#: templates/table/structure/table_structure_header.phtml:23
 msgid "Action"
 msgstr ""
 
@@ -430,7 +432,7 @@ msgid "Untracked tables"
 msgstr ""
 
 #: db_tracking.php:305 db_tracking.php:336
-#: templates/structure/optional_action_links.phtml:17
+#: templates/table/structure/optional_action_links.phtml:17
 msgid "Track table"
 msgstr ""
 
@@ -480,7 +482,7 @@ msgid "Value for the column \"%s\""
 msgstr ""
 
 #: gis_data_editor.php:146
-#: templates/gis_visualization/gis_visualization.phtml:37
+#: templates/table/gis_visualization/gis_visualization.phtml:37
 msgid "Use OpenStreetMaps as Base Layer"
 msgstr ""
 
@@ -560,35 +562,35 @@ msgstr ""
 #: libraries/display_change_password.lib.php:162
 #: libraries/display_export.lib.php:402 libraries/display_export.lib.php:408
 #: libraries/display_import.lib.php:392 libraries/index.lib.php:44
-#: libraries/insert_edit.lib.php:1546 libraries/insert_edit.lib.php:1583
+#: libraries/insert_edit.lib.php:1544 libraries/insert_edit.lib.php:1581
 #: libraries/normalization.lib.php:165 libraries/normalization.lib.php:821
 #: libraries/operations.lib.php:38 libraries/operations.lib.php:108
 #: libraries/operations.lib.php:263 libraries/operations.lib.php:306
 #: libraries/operations.lib.php:801 libraries/operations.lib.php:874
 #: libraries/operations.lib.php:923 libraries/operations.lib.php:1337
 #: libraries/operations.lib.php:1658
-#: libraries/plugins/auth/AuthenticationCookie.class.php:244
+#: libraries/plugins/auth/AuthenticationCookie.class.php:232
 #: libraries/replication_gui.lib.php:122 libraries/replication_gui.lib.php:161
 #: libraries/replication_gui.lib.php:324 libraries/replication_gui.lib.php:461
 #: libraries/replication_gui.lib.php:906 libraries/rte/rte_events.lib.php:509
-#: libraries/rte/rte_routines.lib.php:969
-#: libraries/rte/rte_routines.lib.php:1581
+#: libraries/rte/rte_routines.lib.php:1060
+#: libraries/rte/rte_routines.lib.php:1672
 #: libraries/rte/rte_triggers.lib.php:396 libraries/server_bin_log.lib.php:61
 #: libraries/server_privileges.lib.php:705
 #: libraries/server_privileges.lib.php:2106
 #: libraries/server_privileges.lib.php:2872
 #: libraries/server_privileges.lib.php:3553
-#: libraries/server_privileges.lib.php:4627
+#: libraries/server_privileges.lib.php:4653
 #: libraries/server_user_groups.lib.php:285
 #: libraries/sql_query_form.lib.php:369 libraries/sql_query_form.lib.php:429
 #: libraries/tracking.lib.php:533 libraries/tracking.lib.php:653
 #: prefs_manage.php:277 prefs_manage.php:355
 #: templates/columns_definitions/column_definitions_form.phtml:59
-#: templates/header_location.phtml:17 templates/index_form.phtml:238
+#: templates/database/create_table.phtml:21 templates/header_location.phtml:28
 #: templates/startAndNumberOfRowsPanel.phtml:14
-#: templates/structure/add_column.phtml:25
-#: templates/table/create_table.phtml:21
-#: templates/table/selection_form.phtml:75 view_create.php:275
+#: templates/table/index_form.phtml:238
+#: templates/table/search/selection_form.phtml:75
+#: templates/table/structure/add_column.phtml:25 view_create.php:275
 #: view_operations.php:106
 msgid "Go"
 msgstr ""
@@ -666,7 +668,7 @@ msgstr ""
 msgid "Could not load import plugins, please check your installation!"
 msgstr ""
 
-#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1466
+#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1460
 #, possible-php-format
 msgid "Bookmark %s has been created."
 msgstr ""
@@ -700,11 +702,11 @@ msgstr ""
 msgid "Back"
 msgstr ""
 
-#: index.php:148 libraries/Footer.class.php:70
+#: index.php:149 libraries/Footer.class.php:70
 msgid "phpMyAdmin Demo Server"
 msgstr ""
 
-#: index.php:152
+#: index.php:153
 #, possible-php-format
 msgid ""
 "You are using the demo server. You can do anything here, but please do not "
@@ -712,110 +714,110 @@ msgid ""
 "at %s."
 msgstr ""
 
-#: index.php:162
+#: index.php:163
 msgid "General Settings"
 msgstr ""
 
-#: index.php:190 libraries/display_change_password.lib.php:50
+#: index.php:191 libraries/display_change_password.lib.php:50
 #: libraries/display_change_password.lib.php:53 user_password.php:247
 msgid "Change password"
 msgstr ""
 
-#: index.php:206
+#: index.php:207
 msgid "Server connection collation"
 msgstr ""
 
-#: index.php:228
+#: index.php:229
 msgid "Appearance Settings"
 msgstr ""
 
-#: index.php:258 prefs_manage.php:285
+#: index.php:259 prefs_manage.php:285
 msgid "More settings"
 msgstr ""
 
-#: index.php:279
+#: index.php:280
 msgid "Database server"
 msgstr ""
 
-#: index.php:282 libraries/plugins/auth/AuthenticationCookie.class.php:181
+#: index.php:283 libraries/plugins/auth/AuthenticationCookie.class.php:169
 msgid "Server:"
 msgstr ""
 
-#: index.php:286
+#: index.php:287
 msgid "Server type:"
 msgstr ""
 
-#: index.php:290 libraries/plugins/export/ExportLatex.class.php:212
+#: index.php:291 libraries/plugins/export/ExportLatex.class.php:212
 #: libraries/plugins/export/ExportSql.class.php:687
 #: libraries/plugins/export/ExportXml.class.php:189
 msgid "Server version:"
 msgstr ""
 
-#: index.php:296
+#: index.php:297
 msgid "Protocol version:"
 msgstr ""
 
-#: index.php:300
+#: index.php:301
 msgid "User:"
 msgstr ""
 
-#: index.php:305
+#: index.php:306
 msgid "Server charset:"
 msgstr ""
 
-#: index.php:320
+#: index.php:321
 msgid "Web server"
 msgstr ""
 
-#: index.php:331
+#: index.php:332
 msgid "Database client version:"
 msgstr ""
 
-#: index.php:335
+#: index.php:336
 msgid "PHP extension:"
 msgstr ""
 
-#: index.php:349
+#: index.php:350
 msgid "PHP version:"
 msgstr ""
 
-#: index.php:360
+#: index.php:361
 msgid "Show PHP information"
 msgstr ""
 
-#: index.php:383
+#: index.php:384
 msgid "Version information:"
 msgstr ""
 
-#: index.php:392 libraries/Util.class.php:432 libraries/Util.class.php:495
-#: libraries/config/FormDisplay.tpl.php:151
+#: index.php:393 libraries/Util.class.php:432 libraries/Util.class.php:495
+#: libraries/config/FormDisplay.tpl.php:162
 #: libraries/display_export.lib.php:577 libraries/engines/pbxt.lib.php:162
 #: libraries/navigation/NavigationHeader.class.php:196
 #: libraries/server_variables.lib.php:160
 msgid "Documentation"
 msgstr ""
 
-#: index.php:399
+#: index.php:400
 msgid "Wiki"
 msgstr ""
 
-#: index.php:408
+#: index.php:409
 msgid "Official Homepage"
 msgstr ""
 
-#: index.php:415
+#: index.php:416
 msgid "Contribute"
 msgstr ""
 
-#: index.php:422
+#: index.php:423
 msgid "Get support"
 msgstr ""
 
-#: index.php:429
+#: index.php:430
 msgid "List of changes"
 msgstr ""
 
-#: index.php:451
+#: index.php:452
 msgid ""
 "You are connected as 'root' with no password, which corresponds to the "
 "default MySQL privileged account. Your MySQL server is running with this "
@@ -823,21 +825,21 @@ msgid ""
 "by setting a password for user 'root'."
 msgstr ""
 
-#: index.php:468
+#: index.php:469
 msgid ""
 "You have enabled mbstring.func_overload in your PHP configuration. This "
 "option is incompatible with phpMyAdmin and might cause some data to be "
 "corrupted!"
 msgstr ""
 
-#: index.php:483
+#: index.php:484
 msgid ""
 "The mbstring PHP extension was not found and you seem to be using a "
 "multibyte charset. Without the mbstring extension phpMyAdmin is unable to "
 "split strings correctly and it may result in unexpected results."
 msgstr ""
 
-#: index.php:500
+#: index.php:501
 msgid ""
 "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini."
 "session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower than "
@@ -845,17 +847,17 @@ msgid ""
 "expire sooner than configured in phpMyAdmin."
 msgstr ""
 
-#: index.php:519
+#: index.php:520
 msgid ""
 "Login cookie store is lower than cookie validity configured in phpMyAdmin, "
 "because of this, your login will expire sooner than configured in phpMyAdmin."
 msgstr ""
 
-#: index.php:535
+#: index.php:536
 msgid "The configuration file now needs a secret passphrase (blowfish_secret)."
 msgstr ""
 
-#: index.php:548
+#: index.php:549
 msgid ""
 "Directory [code]config[/code], which is used by the setup script, still "
 "exists in your phpMyAdmin directory. It is strongly recommended to remove it "
@@ -863,26 +865,26 @@ msgid ""
 "may be compromised by unauthorized people downloading your configuration."
 msgstr ""
 
-#: index.php:564
+#: index.php:565
 #, possible-php-format
 msgid ""
 "The phpMyAdmin configuration storage is not completely configured, some "
 "extended features have been deactivated. %sFind out why%s. "
 msgstr ""
 
-#: index.php:571
+#: index.php:572
 msgid ""
 "Or alternately go to 'Operations' tab of any database to set it up there."
 msgstr ""
 
-#: index.php:620
+#: index.php:621
 #, possible-php-format
 msgid ""
 "Your PHP MySQL library version %s differs from your MySQL server version %s. "
 "This may cause unpredictable behavior."
 msgstr ""
 
-#: index.php:648
+#: index.php:649
 #, possible-php-format
 msgid ""
 "Server running with Suhosin. Please refer to %sdocumentation%s for possible "
@@ -1023,8 +1025,8 @@ msgstr ""
 msgid "Save & Close"
 msgstr ""
 
-#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:404
-#: libraries/insert_edit.lib.php:1550 prefs_manage.php:361
+#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:415
+#: libraries/insert_edit.lib.php:1548 prefs_manage.php:361
 #: prefs_manage.php:372
 msgid "Reset"
 msgstr ""
@@ -1057,7 +1059,7 @@ msgstr ""
 msgid "Edit Index"
 msgstr ""
 
-#: js/messages.php:99 templates/index_form.phtml:232
+#: js/messages.php:99 templates/table/index_form.phtml:232
 #, possible-php-format
 msgid "Add %s column(s) to index"
 msgstr ""
@@ -1078,13 +1080,14 @@ msgstr ""
 msgid "Please select column(s) for the index."
 msgstr ""
 
-#: js/messages.php:106 templates/structure/add_column.phtml:1
+#: js/messages.php:106 templates/table/structure/add_column.phtml:1
 msgid "You have to add at least one column."
 msgstr ""
 
-#: js/messages.php:109 libraries/insert_edit.lib.php:1548
+#: js/messages.php:109 libraries/insert_edit.lib.php:1546
 #: templates/columns_definitions/column_definitions_form.phtml:162
-#: templates/index_form.phtml:237 templates/tbl_relation/common_form.phtml:106
+#: templates/table/index_form.phtml:237
+#: templates/table/relation/common_form.phtml:106
 msgid "Preview SQL"
 msgstr ""
 
@@ -1101,7 +1104,7 @@ msgid "SQL query:"
 msgstr ""
 
 #. l10n: Default label for the y-Axis of Charts
-#: js/messages.php:118 templates/tbl_chart.phtml:109
+#: js/messages.php:118 templates/table/chart/tbl_chart.phtml:109
 msgid "Y Values"
 msgstr ""
 
@@ -1252,7 +1255,7 @@ msgstr ""
 msgid "Bytes received"
 msgstr ""
 
-#: js/messages.php:169 libraries/server_status.lib.php:226
+#: js/messages.php:169 libraries/server_status.lib.php:235
 msgid "Connections"
 msgstr ""
 
@@ -1309,12 +1312,12 @@ msgstr ""
 msgid "Questions"
 msgstr ""
 
-#: js/messages.php:184 libraries/server_status.lib.php:134
+#: js/messages.php:184 libraries/server_status.lib.php:143
 msgid "Traffic"
 msgstr ""
 
 #: js/messages.php:185 libraries/Menu.class.php:586
-#: libraries/Util.class.php:4318 libraries/server_status_monitor.lib.php:257
+#: libraries/Util.class.php:4324 libraries/server_status_monitor.lib.php:257
 msgid "Settings"
 msgstr ""
 
@@ -1334,8 +1337,9 @@ msgstr ""
 #: libraries/server_status_monitor.lib.php:236
 #: libraries/server_status_processes.lib.php:308
 #: templates/columns_definitions/transformation.phtml:4
-#: templates/designer/options_panel.phtml:178
-#: templates/table/options_zoom.phtml:12 templates/table/rows_zoom.phtml:26
+#: templates/database/designer/options_panel.phtml:178
+#: templates/table/search/options_zoom.phtml:12
+#: templates/table/search/rows_zoom.phtml:26
 msgid "None"
 msgstr ""
 
@@ -1603,8 +1607,8 @@ msgstr ""
 
 #: js/messages.php:270 libraries/Menu.class.php:352
 #: libraries/Menu.class.php:455 libraries/Menu.class.php:582
-#: libraries/Util.class.php:4317 libraries/Util.class.php:4332
-#: libraries/Util.class.php:4349 libraries/config/messages.inc.php:258
+#: libraries/Util.class.php:4323 libraries/Util.class.php:4338
+#: libraries/Util.class.php:4355 libraries/config/messages.inc.php:258
 #: libraries/display_import.lib.php:105
 #: libraries/server_status_monitor.lib.php:318 prefs_manage.php:238
 #: setup/frames/menu.inc.php:26
@@ -1664,13 +1668,13 @@ msgid "Formatting SQL..."
 msgstr ""
 
 #: js/messages.php:293 libraries/server_variables.lib.php:157
-#: templates/designer/aggregate_query_panel.phtml:63
-#: templates/designer/delete_relation_panel.phtml:28
-#: templates/designer/having_query_panel.phtml:117
-#: templates/designer/new_relation_panel.phtml:88
-#: templates/designer/options_panel.phtml:253
-#: templates/designer/rename_to_panel.phtml:45
-#: templates/designer/where_query_panel.phtml:83
+#: templates/database/designer/aggregate_query_panel.phtml:63
+#: templates/database/designer/delete_relation_panel.phtml:28
+#: templates/database/designer/having_query_panel.phtml:117
+#: templates/database/designer/new_relation_panel.phtml:88
+#: templates/database/designer/options_panel.phtml:253
+#: templates/database/designer/rename_to_panel.phtml:45
+#: templates/database/designer/where_query_panel.phtml:83
 msgid "Cancel"
 msgstr ""
 
@@ -1678,7 +1682,7 @@ msgstr ""
 msgid "Page-related settings"
 msgstr ""
 
-#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:402
+#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:413
 msgid "Apply"
 msgstr ""
 
@@ -1713,8 +1717,8 @@ msgstr ""
 msgid "Error text: %s"
 msgstr ""
 
-#: js/messages.php:307 libraries/db_common.inc.php:68
-#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:450
+#: js/messages.php:307 libraries/db_common.inc.php:69
+#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:461
 msgid "No databases selected."
 msgstr ""
 
@@ -1726,12 +1730,13 @@ msgstr ""
 msgid "Adding Primary Key"
 msgstr ""
 
-#: js/messages.php:310 templates/designer/aggregate_query_panel.phtml:59
-#: templates/designer/having_query_panel.phtml:113
-#: templates/designer/new_relation_panel.phtml:87
-#: templates/designer/options_panel.phtml:252
-#: templates/designer/rename_to_panel.phtml:41
-#: templates/designer/where_query_panel.phtml:82
+#: js/messages.php:310
+#: templates/database/designer/aggregate_query_panel.phtml:59
+#: templates/database/designer/having_query_panel.phtml:113
+#: templates/database/designer/new_relation_panel.phtml:87
+#: templates/database/designer/options_panel.phtml:252
+#: templates/database/designer/rename_to_panel.phtml:41
+#: templates/database/designer/where_query_panel.phtml:82
 msgid "OK"
 msgstr ""
 
@@ -1751,7 +1756,7 @@ msgstr ""
 msgid "Changing Charset"
 msgstr ""
 
-#: js/messages.php:320 libraries/Util.class.php:3217
+#: js/messages.php:320 libraries/Util.class.php:3223
 msgid "Enable foreign key checks"
 msgstr ""
 
@@ -1786,20 +1791,21 @@ msgstr ""
 #: js/messages.php:334 libraries/DisplayResults.class.php:4834
 #: libraries/DisplayResults.class.php:5092 libraries/Menu.class.php:344
 #: libraries/Menu.class.php:446 libraries/Menu.class.php:578
-#: libraries/Util.class.php:3636 libraries/Util.class.php:3637
-#: libraries/Util.class.php:4316 libraries/Util.class.php:4331
-#: libraries/Util.class.php:4348 libraries/config/messages.inc.php:252
+#: libraries/Util.class.php:3642 libraries/Util.class.php:3643
+#: libraries/Util.class.php:4322 libraries/Util.class.php:4337
+#: libraries/Util.class.php:4354 libraries/config/messages.inc.php:252
 #: libraries/display_export.lib.php:173 libraries/rte/rte_list.lib.php:146
 #: libraries/server_privileges.lib.php:2211
 #: libraries/server_privileges.lib.php:2290
 #: libraries/server_privileges.lib.php:2632
 #: libraries/server_privileges.lib.php:3356
 #: libraries/server_status_monitor.lib.php:322 prefs_manage.php:303
-#: setup/frames/menu.inc.php:27 templates/structure/check_all_tables.phtml:11
+#: setup/frames/menu.inc.php:27
+#: templates/database/structure/check_all_tables.phtml:11
 msgid "Export"
 msgstr ""
 
-#: js/messages.php:337 libraries/rte/rte_routines.lib.php:652
+#: js/messages.php:337 libraries/rte/rte_routines.lib.php:743
 msgid "ENUM/SET editor"
 msgstr ""
 
@@ -1838,7 +1844,7 @@ msgstr ""
 #: libraries/Console.class.php:214 libraries/DisplayResults.class.php:3474
 #: libraries/DisplayResults.class.php:4818 libraries/Index.class.php:723
 #: libraries/Util.class.php:706 libraries/Util.class.php:1202
-#: libraries/Util.class.php:3634 libraries/Util.class.php:3635
+#: libraries/Util.class.php:3640 libraries/Util.class.php:3641
 #: libraries/central_columns.lib.php:851
 #: libraries/central_columns.lib.php:1193
 #: libraries/config/messages.inc.php:892
@@ -1856,7 +1862,7 @@ msgstr ""
 #: libraries/server_user_groups.lib.php:129
 #: libraries/sql_query_form.lib.php:416 libraries/tracking.lib.php:477
 #: setup/frames/index.inc.php:183 setup/frames/index.inc.php:291
-#: templates/designer/delete_relation_panel.phtml:27
+#: templates/database/designer/delete_relation_panel.phtml:27
 msgid "Delete"
 msgstr ""
 
@@ -2017,11 +2023,11 @@ msgid "No dependencies selected!"
 msgstr ""
 
 #: js/messages.php:394 libraries/central_columns.lib.php:1214
-#: libraries/insert_edit.lib.php:1458 libraries/server_variables.lib.php:155
+#: libraries/insert_edit.lib.php:1456 libraries/server_variables.lib.php:155
 #: setup/frames/config.inc.php:42 setup/frames/index.inc.php:279
 #: templates/columns_definitions/column_definitions_form.phtml:165
-#: templates/gis_visualization/gis_visualization.phtml:48
-#: templates/tbl_relation/common_form.phtml:107
+#: templates/table/gis_visualization/gis_visualization.phtml:48
+#: templates/table/relation/common_form.phtml:107
 msgid "Save"
 msgstr ""
 
@@ -2098,8 +2104,8 @@ msgid "Data point content"
 msgstr ""
 
 #: js/messages.php:430 js/messages.php:562 js/messages.php:579
-#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2573
-#: templates/index_form.phtml:154 templates/index_form.phtml:194
+#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2571
+#: templates/table/index_form.phtml:154 templates/table/index_form.phtml:194
 msgid "Ignore"
 msgstr ""
 
@@ -2158,8 +2164,8 @@ msgstr ""
 msgid "Please select the primary key or a unique key!"
 msgstr ""
 
-#: js/messages.php:457 templates/designer/side_menu.phtml:91
-#: templates/designer/side_menu.phtml:94
+#: js/messages.php:457 templates/database/designer/side_menu.phtml:91
+#: templates/database/designer/side_menu.phtml:94
 msgid "Choose column to display"
 msgstr ""
 
@@ -2173,18 +2179,18 @@ msgstr ""
 msgid "Page name"
 msgstr ""
 
-#: js/messages.php:463 templates/designer/side_menu.phtml:56
-#: templates/designer/side_menu.phtml:59
+#: js/messages.php:463 templates/database/designer/side_menu.phtml:56
+#: templates/database/designer/side_menu.phtml:59
 msgid "Save page"
 msgstr ""
 
-#: js/messages.php:464 templates/designer/side_menu.phtml:63
-#: templates/designer/side_menu.phtml:66
+#: js/messages.php:464 templates/database/designer/side_menu.phtml:63
+#: templates/database/designer/side_menu.phtml:66
 msgid "Save page as"
 msgstr ""
 
-#: js/messages.php:465 templates/designer/side_menu.phtml:49
-#: templates/designer/side_menu.phtml:52
+#: js/messages.php:465 templates/database/designer/side_menu.phtml:49
+#: templates/database/designer/side_menu.phtml:52
 msgid "Open page"
 msgstr ""
 
@@ -2192,7 +2198,7 @@ msgstr ""
 msgid "Delete page"
 msgstr ""
 
-#: js/messages.php:467 templates/designer/side_menu.phtml:10
+#: js/messages.php:467 templates/database/designer/side_menu.phtml:10
 msgid "Untitled"
 msgstr ""
 
@@ -2303,7 +2309,7 @@ msgstr ""
 msgid "cancel"
 msgstr ""
 
-#: js/messages.php:499 libraries/server_status.lib.php:271
+#: js/messages.php:499 libraries/server_status.lib.php:280
 msgid "Aborted"
 msgstr ""
 
@@ -2853,7 +2859,7 @@ msgstr ""
 
 #: js/messages.php:793 libraries/Message.class.php:199
 #: libraries/Util.class.php:654 libraries/core.lib.php:245
-#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1172
+#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1170
 #: tbl_operations.php:229 view_operations.php:63
 msgid "Error"
 msgstr ""
@@ -2912,8 +2918,8 @@ msgstr ""
 msgid "per minute"
 msgstr ""
 
-#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:143
-#: libraries/server_status.lib.php:228
+#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:152
+#: libraries/server_status.lib.php:237
 #: libraries/server_status_queries.lib.php:98
 msgid "per hour"
 msgstr ""
@@ -2931,7 +2937,7 @@ msgstr ""
 msgid "Wrong permissions on configuration file, should not be world writable!"
 msgstr ""
 
-#: libraries/Config.class.php:1799
+#: libraries/Config.class.php:1801
 msgid "Font size"
 msgstr ""
 
@@ -2959,10 +2965,10 @@ msgstr ""
 #: libraries/server_privileges.lib.php:2890
 #: libraries/server_privileges.lib.php:3144
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4332
+#: libraries/server_privileges.lib.php:4358
 #: libraries/server_status_processes.lib.php:80
-#: templates/tbl_relation/foreign_key_row.phtml:165
-#: templates/tbl_relation/internal_relational_row.phtml:55
+#: templates/table/relation/foreign_key_row.phtml:165
+#: templates/table/relation/internal_relational_row.phtml:55
 msgid "Database"
 msgstr ""
 
@@ -3055,11 +3061,11 @@ msgstr ""
 #: libraries/plugins/import/ImportMediawiki.class.php:60
 #: libraries/plugins/import/ImportOds.class.php:59
 #: libraries/plugins/import/ImportShp.class.php:57
-#: libraries/plugins/import/ImportSql.class.php:148
+#: libraries/plugins/import/ImportSql.class.php:51
 #: libraries/plugins/import/ImportXml.class.php:58
-#: libraries/rte/rte_routines.lib.php:833 templates/index_form.phtml:49
-#: templates/structure/row_stats_table.phtml:20
-#: templates/table/options.phtml:2
+#: libraries/rte/rte_routines.lib.php:924 templates/table/index_form.phtml:49
+#: templates/table/search/options.phtml:2
+#: templates/table/structure/row_stats_table.phtml:20
 msgid "Options"
 msgstr ""
 
@@ -3092,7 +3098,8 @@ msgstr ""
 msgid "Order:"
 msgstr ""
 
-#: libraries/Console.class.php:289 templates/table/replace_preview.phtml:17
+#: libraries/Console.class.php:289
+#: templates/table/search/replace_preview.phtml:17
 msgid "Count"
 msgstr ""
 
@@ -3187,9 +3194,9 @@ msgstr ""
 #: libraries/operations.lib.php:794 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:191
-#: templates/structure/sortable_header.phtml:21
-#: templates/structure/sortable_header.phtml:38
-#: templates/table/options.phtml:68
+#: templates/database/structure/sortable_header.phtml:21
+#: templates/database/structure/sortable_header.phtml:38
+#: templates/table/search/options.phtml:68
 msgid "Ascending"
 msgstr ""
 
@@ -3199,13 +3206,14 @@ msgstr ""
 #: libraries/operations.lib.php:797 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:188
-#: templates/structure/sortable_header.phtml:26
-#: templates/structure/sortable_header.phtml:43
-#: templates/table/options.phtml:69
+#: templates/database/structure/sortable_header.phtml:26
+#: templates/database/structure/sortable_header.phtml:43
+#: templates/table/search/options.phtml:69
 msgid "Descending"
 msgstr ""
 
-#: libraries/DBQbe.class.php:467 templates/table/search_and_replace.phtml:6
+#: libraries/DBQbe.class.php:467
+#: templates/table/search/search_and_replace.phtml:6
 msgid "Column:"
 msgstr ""
 
@@ -3360,12 +3368,12 @@ msgstr[0] ""
 msgstr[1] ""
 
 #: libraries/DbSearch.class.php:354 libraries/Menu.class.php:311
-#: libraries/Util.class.php:3337 libraries/Util.class.php:3347
-#: libraries/Util.class.php:3623 libraries/Util.class.php:3624
-#: libraries/Util.class.php:4343 libraries/config.values.php:43
+#: libraries/Util.class.php:3343 libraries/Util.class.php:3353
+#: libraries/Util.class.php:3629 libraries/Util.class.php:3630
+#: libraries/Util.class.php:4349 libraries/config.values.php:43
 #: libraries/config.values.php:51 libraries/config.values.php:119
 #: libraries/navigation/Nodes/Node_Table.class.php:295
-#: templates/structure/check_all_table_column.phtml:5
+#: templates/table/structure/check_all_table_column.phtml:5
 msgid "Browse"
 msgstr ""
 
@@ -3382,7 +3390,8 @@ msgstr ""
 msgid "Words or values to search for (wildcard: \"%\"):"
 msgstr ""
 
-#: libraries/DbSearch.class.php:401 templates/table/search_and_replace.phtml:1
+#: libraries/DbSearch.class.php:401
+#: templates/table/search/search_and_replace.phtml:1
 msgid "Find:"
 msgstr ""
 
@@ -3426,28 +3435,28 @@ msgstr ""
 msgid "Search this table"
 msgstr ""
 
-#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2532
-#: libraries/Util.class.php:2535
+#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2538
+#: libraries/Util.class.php:2541
 msgctxt "First page"
 msgid "Begin"
 msgstr ""
 
-#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2533
-#: libraries/Util.class.php:2536 libraries/server_bin_log.lib.php:170
+#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2539
+#: libraries/Util.class.php:2542 libraries/server_bin_log.lib.php:170
 #: libraries/server_bin_log.lib.php:172
 msgctxt "Previous page"
 msgid "Previous"
 msgstr ""
 
-#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2564
-#: libraries/Util.class.php:2574 libraries/server_bin_log.lib.php:204
+#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2570
+#: libraries/Util.class.php:2580 libraries/server_bin_log.lib.php:204
 #: libraries/server_bin_log.lib.php:206
 msgctxt "Next page"
 msgid "Next"
 msgstr ""
 
-#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2565
-#: libraries/Util.class.php:2575
+#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2571
+#: libraries/Util.class.php:2581
 msgctxt "Last page"
 msgid "End"
 msgstr ""
@@ -3520,15 +3529,15 @@ msgid "May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]."
 msgstr ""
 
 #: libraries/DisplayResults.class.php:4332 libraries/Message.class.php:180
-#: libraries/controllers/TableRelationController.class.php:258
+#: libraries/controllers/TableRelationController.class.php:259
 #: libraries/controllers/TableSearchController.class.php:655
-#: libraries/rte/rte_routines.lib.php:1332 libraries/sql_query_form.lib.php:89
+#: libraries/rte/rte_routines.lib.php:1423 libraries/sql_query_form.lib.php:89
 #: tbl_operations.php:227 tbl_row_action.php:138 view_operations.php:62
 msgid "Your SQL query has been executed successfully."
 msgstr ""
 
 #: libraries/DisplayResults.class.php:4660
-#: libraries/controllers/StructureController.class.php:629
+#: libraries/controllers/DatabaseStructureController.class.php:564
 #, possible-php-format
 msgid ""
 "This view has at least this number of rows. Please refer to %sdocumentation"
@@ -3550,33 +3559,33 @@ msgstr ""
 msgid "%d total"
 msgstr ""
 
-#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1318
+#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1312
 #, possible-php-format
 msgid "Query took %01.4f seconds."
 msgstr ""
 
 #: libraries/DisplayResults.class.php:4807
-#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4767
-#: libraries/Util.class.php:4773 libraries/mult_submits.inc.php:50
-#: templates/structure/check_all_tables.phtml:2
-#: templates/structure/check_all_tables.phtml:9
+#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4773
+#: libraries/Util.class.php:4779 libraries/mult_submits.inc.php:50
+#: templates/database/structure/check_all_tables.phtml:2
+#: templates/database/structure/check_all_tables.phtml:9
 msgid "With selected:"
 msgstr ""
 
 #: libraries/DisplayResults.class.php:4811
-#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4769
-#: libraries/Util.class.php:4770 libraries/server_privileges.lib.php:1174
+#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4775
+#: libraries/Util.class.php:4776 libraries/server_privileges.lib.php:1174
 #: libraries/server_privileges.lib.php:1175
 #: libraries/server_privileges.lib.php:1387
 #: libraries/server_user_groups.lib.php:231
-#: templates/structure/check_all_tables.phtml:3
-#: templates/structure/check_all_tables.phtml:4
+#: templates/database/structure/check_all_tables.phtml:3
+#: templates/database/structure/check_all_tables.phtml:4
 msgid "Check All"
 msgstr ""
 
 #: libraries/DisplayResults.class.php:4985 libraries/Header.class.php:383
-#: templates/structure/optional_action_links.phtml:1
-#: templates/structure/print_view_data_dictionary_link.phtml:3
+#: templates/database/structure/print_view_data_dictionary_link.phtml:3
+#: templates/table/structure/optional_action_links.phtml:1
 msgid "Print view"
 msgstr ""
 
@@ -3584,7 +3593,8 @@ msgstr ""
 msgid "Query results operations"
 msgstr ""
 
-#: libraries/DisplayResults.class.php:5105 templates/tbl_chart.phtml:12
+#: libraries/DisplayResults.class.php:5105
+#: templates/table/chart/tbl_chart.phtml:12
 msgid "Display chart"
 msgstr ""
 
@@ -3673,7 +3683,7 @@ msgid "Click on the bar to scroll to top of page"
 msgstr ""
 
 #: libraries/Header.class.php:749
-#: libraries/plugins/auth/AuthenticationCookie.class.php:152
+#: libraries/plugins/auth/AuthenticationCookie.class.php:140
 msgid "Javascript must be enabled past this point!"
 msgstr ""
 
@@ -3695,11 +3705,11 @@ msgid "Keyname"
 msgstr ""
 
 #: libraries/Index.class.php:697
-#: libraries/controllers/StructureController.class.php:1962
-#: libraries/controllers/StructureController.class.php:1967
+#: libraries/controllers/TableStructureController.class.php:953
+#: libraries/controllers/TableStructureController.class.php:958
 #: libraries/tracking.lib.php:973
 #: templates/columns_definitions/column_indexes.phtml:11
-#: templates/structure/check_all_table_column.phtml:26
+#: templates/table/structure/check_all_table_column.phtml:26
 msgid "Unique"
 msgstr ""
 
@@ -3718,16 +3728,17 @@ msgstr ""
 #: libraries/server_collations.lib.php:35 libraries/tracking.lib.php:881
 #: libraries/tracking.lib.php:977
 #: templates/columns_definitions/table_fields_definitions.phtml:33
-#: templates/structure/row_stats_table.phtml:31
-#: templates/structure/table_header.phtml:55
-#: templates/structure/table_structure_header.phtml:7
-#: templates/table/table_header.phtml:8
+#: templates/database/structure/table_header.phtml:55
+#: templates/table/search/table_header.phtml:8
+#: templates/table/structure/row_stats_table.phtml:31
+#: templates/table/structure/table_structure_header.phtml:7
 msgid "Collation"
 msgstr ""
 
 #: libraries/Index.class.php:703 libraries/rte/rte_events.lib.php:496
-#: libraries/rte/rte_routines.lib.php:956 libraries/tracking.lib.php:885
-#: libraries/tracking.lib.php:979 templates/structure/table_header.phtml:84
+#: libraries/rte/rte_routines.lib.php:1047 libraries/tracking.lib.php:885
+#: libraries/tracking.lib.php:979
+#: templates/database/structure/table_header.phtml:84
 msgid "Comment"
 msgstr ""
 
@@ -3740,15 +3751,15 @@ msgstr ""
 msgid "Index %s has been dropped."
 msgstr ""
 
-#: libraries/Index.class.php:757 libraries/Util.class.php:3630
-#: libraries/Util.class.php:3631
-#: libraries/controllers/StructureController.class.php:1958
-#: libraries/controllers/StructureController.class.php:1959
+#: libraries/Index.class.php:757 libraries/Util.class.php:3636
+#: libraries/Util.class.php:3637
+#: libraries/controllers/TableStructureController.class.php:949
+#: libraries/controllers/TableStructureController.class.php:950
 #: libraries/operations.lib.php:1607 libraries/rte/rte_list.lib.php:150
 #: libraries/server_databases.lib.php:146
-#: templates/structure/check_all_table_column.phtml:15
-#: templates/structure/check_all_tables.phtml:16
-#: templates/tbl_relation/foreign_key_row.phtml:93
+#: templates/database/structure/check_all_tables.phtml:16
+#: templates/table/relation/foreign_key_row.phtml:93
+#: templates/table/structure/check_all_table_column.phtml:15
 msgid "Drop"
 msgstr ""
 
@@ -3777,16 +3788,16 @@ msgstr ""
 #: libraries/Menu.class.php:248
 #: libraries/navigation/Nodes/Node_View.class.php:32
 #: libraries/tbl_info.inc.php:63
-#: templates/structure/structure_table_row.phtml:97
-#: templates/structure/structure_table_row.phtml:159
+#: templates/database/structure/structure_table_row.phtml:97
+#: templates/database/structure/structure_table_row.phtml:159
 msgid "View"
 msgstr ""
 
 #: libraries/Menu.class.php:325 libraries/Menu.class.php:429
-#: libraries/Menu.class.php:548 libraries/Util.class.php:3334
-#: libraries/Util.class.php:3344 libraries/Util.class.php:3350
-#: libraries/Util.class.php:4313 libraries/Util.class.php:4328
-#: libraries/Util.class.php:4345 libraries/config.values.php:40
+#: libraries/Menu.class.php:548 libraries/Util.class.php:3340
+#: libraries/Util.class.php:3350 libraries/Util.class.php:3356
+#: libraries/Util.class.php:4319 libraries/Util.class.php:4334
+#: libraries/Util.class.php:4351 libraries/config.values.php:40
 #: libraries/config.values.php:48 libraries/config.values.php:110
 #: libraries/config.values.php:116 libraries/config/messages.inc.php:321
 #: libraries/navigation/Nodes/Node_Table.class.php:292
@@ -3794,19 +3805,19 @@ msgid "SQL"
 msgstr ""
 
 #: libraries/Menu.class.php:328 libraries/Menu.class.php:432
-#: libraries/Util.class.php:3335 libraries/Util.class.php:3345
-#: libraries/Util.class.php:3351 libraries/Util.class.php:3625
-#: libraries/Util.class.php:3626 libraries/Util.class.php:4329
-#: libraries/Util.class.php:4346 libraries/config.values.php:41
+#: libraries/Util.class.php:3341 libraries/Util.class.php:3351
+#: libraries/Util.class.php:3357 libraries/Util.class.php:3631
+#: libraries/Util.class.php:3632 libraries/Util.class.php:4335
+#: libraries/Util.class.php:4352 libraries/config.values.php:41
 #: libraries/config.values.php:49 libraries/config.values.php:111
 #: libraries/config.values.php:117
 #: libraries/navigation/Nodes/Node_Table.class.php:286
 msgid "Search"
 msgstr ""
 
-#: libraries/Menu.class.php:338 libraries/Util.class.php:3336
-#: libraries/Util.class.php:3346 libraries/Util.class.php:3627
-#: libraries/Util.class.php:3628 libraries/Util.class.php:4347
+#: libraries/Menu.class.php:338 libraries/Util.class.php:3342
+#: libraries/Util.class.php:3352 libraries/Util.class.php:3633
+#: libraries/Util.class.php:3634 libraries/Util.class.php:4353
 #: libraries/config.values.php:42 libraries/config.values.php:50
 #: libraries/config.values.php:118
 #: libraries/navigation/Nodes/Node_Table.class.php:289
@@ -3815,30 +3826,30 @@ msgid "Insert"
 msgstr ""
 
 #: libraries/Menu.class.php:362 libraries/Menu.class.php:467
-#: libraries/Util.class.php:4334 libraries/Util.class.php:4350
+#: libraries/Util.class.php:4340 libraries/Util.class.php:4356
 #: libraries/config.values.php:106 libraries/server_common.lib.php:51
 #: libraries/server_privileges.lib.php:2370
 #: libraries/server_privileges.lib.php:3158
-#: libraries/server_privileges.lib.php:4221
+#: libraries/server_privileges.lib.php:4247
 msgid "Privileges"
 msgstr ""
 
 #: libraries/Menu.class.php:371 libraries/Menu.class.php:379
-#: libraries/Menu.class.php:459 libraries/Util.class.php:3338
-#: libraries/Util.class.php:3352 libraries/Util.class.php:4333
-#: libraries/Util.class.php:4351 libraries/config.values.php:112
+#: libraries/Menu.class.php:459 libraries/Util.class.php:3344
+#: libraries/Util.class.php:3358 libraries/Util.class.php:4339
+#: libraries/Util.class.php:4357 libraries/config.values.php:112
 #: view_operations.php:92
 msgid "Operations"
 msgstr ""
 
 #: libraries/Menu.class.php:384 libraries/Menu.class.php:492
-#: libraries/Util.class.php:4338 libraries/Util.class.php:4352
+#: libraries/Util.class.php:4344 libraries/Util.class.php:4358
 #: libraries/relation.lib.php:255
 msgid "Tracking"
 msgstr ""
 
 #: libraries/Menu.class.php:397 libraries/Menu.class.php:486
-#: libraries/Util.class.php:4337 libraries/Util.class.php:4353
+#: libraries/Util.class.php:4343 libraries/Util.class.php:4359
 #: libraries/navigation/Nodes/Node_Trigger_Container.class.php:24
 #: libraries/plugins/export/ExportHtmlword.class.php:557
 #: libraries/plugins/export/ExportOdt.class.php:685
@@ -3855,16 +3866,16 @@ msgstr ""
 msgid "Database seems to be empty!"
 msgstr ""
 
-#: libraries/Menu.class.php:439 libraries/Util.class.php:4330
+#: libraries/Menu.class.php:439 libraries/Util.class.php:4336
 msgid "Query"
 msgstr ""
 
-#: libraries/Menu.class.php:472 libraries/Util.class.php:4335
+#: libraries/Menu.class.php:472 libraries/Util.class.php:4341
 #: libraries/rte/rte_words.lib.php:36
 msgid "Routines"
 msgstr ""
 
-#: libraries/Menu.class.php:479 libraries/Util.class.php:4336
+#: libraries/Menu.class.php:479 libraries/Util.class.php:4342
 #: libraries/navigation/Nodes/Node_Event_Container.class.php:26
 #: libraries/plugins/export/ExportSql.class.php:940
 #: libraries/plugins/export/ExportXml.class.php:107
@@ -3872,20 +3883,20 @@ msgstr ""
 msgid "Events"
 msgstr ""
 
-#: libraries/Menu.class.php:498 libraries/Util.class.php:4339
+#: libraries/Menu.class.php:498 libraries/Util.class.php:4345
 msgid "Designer"
 msgstr ""
 
-#: libraries/Menu.class.php:507 libraries/Util.class.php:4340
-#: templates/structure/check_all_tables.phtml:35
+#: libraries/Menu.class.php:507 libraries/Util.class.php:4346
+#: templates/database/structure/check_all_tables.phtml:35
 msgid "Central columns"
 msgstr ""
 
-#: libraries/Menu.class.php:544 libraries/Util.class.php:4312
+#: libraries/Menu.class.php:544 libraries/Util.class.php:4318
 #: libraries/config.values.php:103 libraries/config/messages.inc.php:266
 #: libraries/config/messages.inc.php:341
 #: libraries/navigation/NavigationTree.class.php:1239
-#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4332
+#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4358
 msgid "Databases"
 msgstr ""
 
@@ -3894,34 +3905,34 @@ msgid "User accounts"
 msgstr ""
 
 #: libraries/Menu.class.php:595 libraries/ServerStatusData.class.php:121
-#: libraries/Util.class.php:4319 libraries/server_common.lib.php:36
+#: libraries/Util.class.php:4325 libraries/server_common.lib.php:36
 msgid "Binary log"
 msgstr ""
 
 #: libraries/Menu.class.php:601 libraries/ServerStatusData.class.php:126
-#: libraries/Util.class.php:4320 libraries/server_common.lib.php:42
-#: templates/structure/body_for_table_summary.phtml:10
-#: templates/structure/table_header.phtml:27
+#: libraries/Util.class.php:4326 libraries/server_common.lib.php:42
+#: templates/database/structure/body_for_table_summary.phtml:10
+#: templates/database/structure/table_header.phtml:27
 msgid "Replication"
 msgstr ""
 
 #: libraries/Menu.class.php:606 libraries/ServerStatusData.class.php:193
-#: libraries/Util.class.php:4321 libraries/config.values.php:105
+#: libraries/Util.class.php:4327 libraries/config.values.php:105
 #: libraries/server_engines.lib.php:108 libraries/server_engines.lib.php:112
 #: libraries/sql_query_form.lib.php:421
 msgid "Variables"
 msgstr ""
 
-#: libraries/Menu.class.php:610 libraries/Util.class.php:4322
+#: libraries/Menu.class.php:610 libraries/Util.class.php:4328
 msgid "Charsets"
 msgstr ""
 
-#: libraries/Menu.class.php:615 libraries/Util.class.php:4323
+#: libraries/Menu.class.php:615 libraries/Util.class.php:4329
 #: libraries/server_common.lib.php:33 libraries/server_plugins.lib.php:27
 msgid "Plugins"
 msgstr ""
 
-#: libraries/Menu.class.php:626 libraries/Util.class.php:4324
+#: libraries/Menu.class.php:626 libraries/Util.class.php:4330
 msgid "Engines"
 msgstr ""
 
@@ -3946,7 +3957,7 @@ msgid_plural "%1$d rows inserted."
 msgstr[0] ""
 msgstr[1] ""
 
-#: libraries/PDF.class.php:70 libraries/Util.class.php:2521
+#: libraries/PDF.class.php:70 libraries/Util.class.php:2527
 #: libraries/browse_foreigners.lib.php:327
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:865
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:890
@@ -3967,7 +3978,7 @@ msgid "Could not save favorite table!"
 msgstr ""
 
 #: libraries/RecentFavoriteTable.class.php:212
-#: templates/structure/favorite_anchor.phtml:12
+#: templates/database/structure/favorite_anchor.phtml:12
 msgid "Remove from Favorites"
 msgstr ""
 
@@ -4132,7 +4143,7 @@ msgid ""
 msgstr ""
 
 #: libraries/StorageEngine.class.php:373
-#: templates/structure/body_for_table_summary.phtml:50
+#: templates/database/structure/body_for_table_summary.phtml:50
 #, possible-php-format
 msgid "%s is the default storage engine on this MySQL server."
 msgstr ""
@@ -4544,10 +4555,10 @@ msgstr ""
 
 #: libraries/Util.class.php:726 libraries/rte/rte_events.lib.php:110
 #: libraries/rte/rte_events.lib.php:119 libraries/rte/rte_events.lib.php:150
-#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:153
-#: libraries/rte/rte_routines.lib.php:162
-#: libraries/rte/rte_routines.lib.php:235
-#: libraries/rte/rte_routines.lib.php:1366
+#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:223
+#: libraries/rte/rte_routines.lib.php:250
+#: libraries/rte/rte_routines.lib.php:372
+#: libraries/rte/rte_routines.lib.php:1457
 #: libraries/rte/rte_triggers.lib.php:86 libraries/rte/rte_triggers.lib.php:95
 #: libraries/rte/rte_triggers.lib.php:127
 msgid "MySQL said: "
@@ -4591,75 +4602,78 @@ msgstr ""
 msgid "%B %d, %Y at %I:%M %p"
 msgstr ""
 
-#: libraries/Util.class.php:2019
+#: libraries/Util.class.php:2025
 #, possible-php-format
 msgid "%s days, %s hours, %s minutes and %s seconds"
 msgstr ""
 
-#: libraries/Util.class.php:2112
+#: libraries/Util.class.php:2118
 msgid "Missing parameter:"
 msgstr ""
 
-#: libraries/Util.class.php:2645
+#: libraries/Util.class.php:2651
 #, possible-php-format
 msgid "Jump to database \"%s\"."
 msgstr ""
 
-#: libraries/Util.class.php:2670
+#: libraries/Util.class.php:2676
 #, possible-php-format
 msgid "The %s functionality is affected by a known bug, see %s"
 msgstr ""
 
-#: libraries/Util.class.php:2881
+#: libraries/Util.class.php:2887
 msgid "Click to toggle"
 msgstr ""
 
-#: libraries/Util.class.php:3542 prefs_manage.php:248
+#: libraries/Util.class.php:3548 prefs_manage.php:248
 msgid "Browse your computer:"
 msgstr ""
 
-#: libraries/Util.class.php:3567
+#: libraries/Util.class.php:3573
 #, possible-php-format
 msgid "Select from the web server upload directory <b>%s</b>:"
 msgstr ""
 
-#: libraries/Util.class.php:3596 libraries/insert_edit.lib.php:1173
+#: libraries/Util.class.php:3602 libraries/insert_edit.lib.php:1171
 msgid "The directory you set for upload work cannot be reached."
 msgstr ""
 
-#: libraries/Util.class.php:3607
+#: libraries/Util.class.php:3613
 msgid "There are no files to upload!"
 msgstr ""
 
-#: libraries/Util.class.php:3632 libraries/Util.class.php:3633
-#: templates/structure/check_all_tables.phtml:15
+#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: templates/database/structure/check_all_tables.phtml:15
 msgid "Empty"
 msgstr ""
 
-#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: libraries/Util.class.php:3644 libraries/Util.class.php:3645
 msgid "Execute"
 msgstr ""
 
-#: libraries/Util.class.php:4152
+#: libraries/Util.class.php:4158
 msgid "Print"
 msgstr ""
 
-#: libraries/Util.class.php:4257 templates/structure/row_stats_table.phtml:80
-#: templates/structure/table_header.phtml:95
+#: libraries/Util.class.php:4263
+#: templates/database/structure/table_header.phtml:95
+#: templates/table/structure/row_stats_table.phtml:80
 msgid "Creation"
 msgstr ""
 
-#: libraries/Util.class.php:4263 templates/structure/row_stats_table.phtml:87
-#: templates/structure/table_header.phtml:106
+#: libraries/Util.class.php:4269
+#: templates/database/structure/table_header.phtml:106
+#: templates/table/structure/row_stats_table.phtml:87
 msgid "Last update"
 msgstr ""
 
-#: libraries/Util.class.php:4269 templates/structure/row_stats_table.phtml:94
-#: templates/structure/table_header.phtml:117
+#: libraries/Util.class.php:4275
+#: templates/database/structure/table_header.phtml:117
+#: templates/table/structure/row_stats_table.phtml:94
 msgid "Last check"
 msgstr ""
 
-#: libraries/Util.class.php:4315
+#: libraries/Util.class.php:4321
 msgid "Users"
 msgstr ""
 
@@ -4680,16 +4694,16 @@ msgid "Use this value"
 msgstr ""
 
 #: libraries/build_html_for_db.lib.php:33 libraries/import.lib.php:193
-#: templates/structure/actions_in_table_structure.phtml:113
-#: templates/structure/row_stats_table.phtml:42
-#: templates/structure/table_header.phtml:36
+#: templates/database/structure/table_header.phtml:36
+#: templates/table/structure/actions_in_table_structure.phtml:113
+#: templates/table/structure/row_stats_table.phtml:42
 msgid "Rows"
 msgstr ""
 
 #: libraries/build_html_for_db.lib.php:48 libraries/engines/innodb.lib.php:171
-#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:186
-#: libraries/server_status.lib.php:298
-#: templates/structure/display_table_stats.phtml:40
+#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:195
+#: libraries/server_status.lib.php:307
+#: templates/table/structure/display_table_stats.phtml:40
 msgid "Total"
 msgstr ""
 
@@ -4698,10 +4712,12 @@ msgid "Jump to database"
 msgstr ""
 
 #: libraries/build_html_for_db.lib.php:146
+#: templates/database/structure/structure_table_row.phtml:15
 msgid "Not replicated"
 msgstr ""
 
 #: libraries/build_html_for_db.lib.php:158
+#: templates/database/structure/structure_table_row.phtml:16
 msgid "Replicated"
 msgstr ""
 
@@ -4754,17 +4770,17 @@ msgstr ""
 #: libraries/plugins/export/ExportTexytext.class.php:425
 #: libraries/plugins/export/PMA_ExportPdf.class.php:307
 #: libraries/rte/rte_list.lib.php:73 libraries/rte/rte_list.lib.php:85
-#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:830
-#: libraries/rte/rte_routines.lib.php:1492 setup/frames/index.inc.php:162
+#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:921
+#: libraries/rte/rte_routines.lib.php:1583 setup/frames/index.inc.php:162
 #: templates/columns_definitions/table_fields_definitions.phtml:8
-#: templates/structure/table_structure_header.phtml:5
-#: templates/table/create_table.phtml:11
+#: templates/database/create_table.phtml:11
+#: templates/table/structure/table_structure_header.phtml:5
 msgid "Name"
 msgstr ""
 
 #: libraries/central_columns.lib.php:699
 #: libraries/central_columns.lib.php:1381
-#: libraries/rte/rte_routines.lib.php:832
+#: libraries/rte/rte_routines.lib.php:923
 #: templates/columns_definitions/table_fields_definitions.phtml:14
 msgid "Length/Values"
 msgstr ""
@@ -4783,7 +4799,7 @@ msgid "Select a table"
 msgstr ""
 
 #: libraries/central_columns.lib.php:804
-#: templates/structure/add_column.phtml:4
+#: templates/table/structure/add_column.phtml:4
 msgid "Add column"
 msgstr ""
 
@@ -4799,7 +4815,7 @@ msgstr ""
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1002
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1025
 #: templates/columns_definitions/table_fields_definitions.phtml:36
-#: templates/structure/table_structure_header.phtml:8
+#: templates/table/structure/table_structure_header.phtml:8
 msgid "Attributes"
 msgstr ""
 
@@ -4908,7 +4924,7 @@ msgid "Double click"
 msgstr ""
 
 #: libraries/config.values.php:95 libraries/config.values.php:124
-#: libraries/config/FormDisplay.tpl.php:221 libraries/relation.lib.php:97
+#: libraries/config/FormDisplay.tpl.php:232 libraries/relation.lib.php:97
 #: libraries/relation.lib.php:105
 msgid "Disabled"
 msgstr ""
@@ -5078,21 +5094,21 @@ msgstr ""
 msgid "maximum %s"
 msgstr ""
 
-#: libraries/config/FormDisplay.tpl.php:219
+#: libraries/config/FormDisplay.tpl.php:230
 msgid "This setting is disabled, it will not be applied to your configuration."
 msgstr ""
 
-#: libraries/config/FormDisplay.tpl.php:313
+#: libraries/config/FormDisplay.tpl.php:324
 #, possible-php-format
 msgid "Set value: %s"
 msgstr ""
 
-#: libraries/config/FormDisplay.tpl.php:318
+#: libraries/config/FormDisplay.tpl.php:329
 #: libraries/config/messages.inc.php:610
 msgid "Restore default value"
 msgstr ""
 
-#: libraries/config/FormDisplay.tpl.php:332
+#: libraries/config/FormDisplay.tpl.php:343
 msgid "Allow users to customize this value"
 msgstr ""
 
@@ -5508,7 +5524,7 @@ msgstr ""
 
 #: libraries/config/messages.inc.php:136 libraries/config/messages.inc.php:152
 #: libraries/sql_query_form.lib.php:247
-#: templates/structure/row_stats_table.phtml:7
+#: templates/table/structure/row_stats_table.phtml:7
 msgid "Format"
 msgstr ""
 
@@ -6003,7 +6019,7 @@ msgstr ""
 
 #: libraries/config/messages.inc.php:332
 #: libraries/plugins/export/ExportPdf.class.php:279
-#: templates/structure/secondary_tabs.phtml:8
+#: templates/table/secondary_tabs.phtml:8
 msgid "Table structure"
 msgstr ""
 
@@ -7499,101 +7515,33 @@ msgstr ""
 msgid "OpenDocument Text"
 msgstr ""
 
-#: libraries/controllers/StructureController.class.php:465
+#: libraries/controllers/DatabaseStructureController.class.php:405
 #: tbl_operations.php:382
 #, possible-php-format
 msgid "Table %s has been emptied."
 msgstr ""
 
-#: libraries/controllers/StructureController.class.php:486
+#: libraries/controllers/DatabaseStructureController.class.php:426
 #: tbl_operations.php:400 view_operations.php:119
 #, possible-php-format
 msgid "View %s has been dropped."
 msgstr ""
 
-#: libraries/controllers/StructureController.class.php:487
+#: libraries/controllers/DatabaseStructureController.class.php:427
 #: tbl_operations.php:401
 #, possible-php-format
 msgid "Table %s has been dropped."
 msgstr ""
 
-#: libraries/controllers/StructureController.class.php:797
-#, possible-php-format
-msgid "The name '%s' is a MySQL reserved keyword."
-msgid_plural "The names '%s' are MySQL reserved keywords."
-msgstr[0] ""
-msgstr[1] ""
-
-#: libraries/controllers/StructureController.class.php:875
-msgid "No column selected."
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1049
+#: libraries/controllers/DatabaseStructureController.class.php:733
 msgid "Favorite List is full!"
 msgstr ""
 
-#: libraries/controllers/StructureController.class.php:1272
-msgid "The columns have been moved successfully."
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1535
-#, possible-php-format
-msgid ""
-"Table %1$s has been altered successfully. Privileges have been adjusted."
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1541
-#: libraries/controllers/TableIndexesController.class.php:161
-#: tbl_addfield.php:92
-#, possible-php-format
-msgid "Table %1$s has been altered successfully."
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1588
-#: libraries/tracking.lib.php:1094
-msgid "Query error"
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1806
+#: libraries/controllers/DatabaseStructureController.class.php:947
 #: libraries/mysql_charsets.lib.php:366 libraries/mysql_charsets.lib.php:373
 msgid "unknown"
 msgstr ""
 
-#: libraries/controllers/StructureController.class.php:1957
-#: templates/structure/check_all_table_column.phtml:11
-msgid "Change"
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1961
-#: libraries/controllers/StructureController.class.php:1966
-#: libraries/navigation/Nodes/Node_Index.class.php:30
-#: libraries/tracking.lib.php:926
-#: templates/columns_definitions/column_indexes.phtml:16
-#: templates/columns_definitions/table_fields_definitions.phtml:57
-#: templates/structure/check_all_table_column.phtml:30
-#: templates/structure/display_structure.phtml:79
-#: templates/structure/display_table_stats.phtml:19
-msgid "Index"
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1963
-#: libraries/controllers/StructureController.class.php:1968
-#: templates/columns_definitions/column_indexes.phtml:27
-#: templates/structure/check_all_table_column.phtml:37
-msgid "Spatial"
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1964
-#: libraries/controllers/StructureController.class.php:1969
-#: templates/columns_definitions/column_indexes.phtml:22
-#: templates/structure/check_all_table_column.phtml:47
-msgid "Fulltext"
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1970
-msgid "Distinct values"
-msgstr ""
-
 #: libraries/controllers/TableChartController.class.php:82
 #: libraries/controllers/TableGisVisualizationController.class.php:101
 msgid "No SQL query was set to fetch data."
@@ -7607,11 +7555,18 @@ msgstr ""
 msgid "No data to display"
 msgstr ""
 
-#: libraries/controllers/TableRelationController.class.php:217
+#: libraries/controllers/TableIndexesController.class.php:161
+#: libraries/controllers/TableStructureController.class.php:736
+#: tbl_addfield.php:92
+#, possible-php-format
+msgid "Table %1$s has been altered successfully."
+msgstr ""
+
+#: libraries/controllers/TableRelationController.class.php:218
 msgid "Display column was successfully updated."
 msgstr ""
 
-#: libraries/controllers/TableRelationController.class.php:283
+#: libraries/controllers/TableRelationController.class.php:288
 msgid "Internal relations were successfully updated."
 msgstr ""
 
@@ -7624,10 +7579,71 @@ msgid "Zoom search"
 msgstr ""
 
 #: libraries/controllers/TableSearchController.class.php:852
-#: templates/table/selection_form.phtml:59
+#: templates/table/search/selection_form.phtml:59
 msgid "Find and replace"
 msgstr ""
 
+#: libraries/controllers/TableStructureController.class.php:163
+#, possible-php-format
+msgid "The name '%s' is a MySQL reserved keyword."
+msgid_plural "The names '%s' are MySQL reserved keywords."
+msgstr[0] ""
+msgstr[1] ""
+
+#: libraries/controllers/TableStructureController.class.php:241
+msgid "No column selected."
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:467
+msgid "The columns have been moved successfully."
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:730
+#, possible-php-format
+msgid ""
+"Table %1$s has been altered successfully. Privileges have been adjusted."
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:783
+#: libraries/tracking.lib.php:1094
+msgid "Query error"
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:948
+#: templates/table/structure/check_all_table_column.phtml:11
+msgid "Change"
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:952
+#: libraries/controllers/TableStructureController.class.php:957
+#: libraries/navigation/Nodes/Node_Index.class.php:30
+#: libraries/tracking.lib.php:926
+#: templates/columns_definitions/column_indexes.phtml:16
+#: templates/columns_definitions/table_fields_definitions.phtml:57
+#: templates/table/structure/check_all_table_column.phtml:30
+#: templates/table/structure/display_structure.phtml:79
+#: templates/table/structure/display_table_stats.phtml:19
+msgid "Index"
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:954
+#: libraries/controllers/TableStructureController.class.php:959
+#: templates/columns_definitions/column_indexes.phtml:27
+#: templates/table/structure/check_all_table_column.phtml:37
+msgid "Spatial"
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:955
+#: libraries/controllers/TableStructureController.class.php:960
+#: templates/columns_definitions/column_indexes.phtml:22
+#: templates/table/structure/check_all_table_column.phtml:47
+msgid "Fulltext"
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:963
+msgid "Distinct values"
+msgstr ""
+
 #: libraries/core.lib.php:306
 #, possible-php-format
 msgid "The %s extension is missing. Please check your PHP configuration."
@@ -7672,7 +7688,7 @@ msgid "No Password"
 msgstr ""
 
 #: libraries/display_change_password.lib.php:68
-#: libraries/plugins/auth/AuthenticationCookie.class.php:199
+#: libraries/plugins/auth/AuthenticationCookie.class.php:187
 #: libraries/replication_gui.lib.php:422 libraries/replication_gui.lib.php:862
 #: libraries/server_privileges.lib.php:1640
 msgid "Password:"
@@ -8390,12 +8406,12 @@ msgid "Dump has been saved to file %s."
 msgstr ""
 
 #: libraries/import.lib.php:202 libraries/insert_edit.lib.php:124
-#: libraries/rte/rte_routines.lib.php:1353 libraries/sql.lib.php:1312
+#: libraries/rte/rte_routines.lib.php:1444 libraries/sql.lib.php:1306
 #: tbl_get_field.php:44
 msgid "MySQL returned an empty result set (i.e. zero rows)."
 msgstr ""
 
-#: libraries/import.lib.php:265 libraries/sql.lib.php:1326
+#: libraries/import.lib.php:265 libraries/sql.lib.php:1320
 msgid "[ROLLBACK occurred.]"
 msgstr ""
 
@@ -8459,14 +8475,14 @@ msgstr ""
 
 #: libraries/insert_edit.lib.php:233
 #: libraries/navigation/Nodes/Node_DatabaseChild.class.php:48
-#: templates/designer/table_list.phtml:40
+#: templates/database/designer/table_list.phtml:40
 msgid "Hide"
 msgstr ""
 
 #: libraries/insert_edit.lib.php:249
 #: libraries/navigation/Nodes/Node_Function.class.php:32
-#: libraries/rte/rte_routines.lib.php:1495
-#: templates/table/table_header.phtml:4
+#: libraries/rte/rte_routines.lib.php:1586
+#: templates/table/search/table_header.phtml:4
 msgid "Function"
 msgstr ""
 
@@ -8479,82 +8495,83 @@ msgstr ""
 msgid "Because of its length,<br /> this column might not be editable."
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1050
+#: libraries/insert_edit.lib.php:1048
 msgid "Binary - do not edit"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1176 libraries/server_privileges.lib.php:470
-#: templates/table/options.phtml:36
+#: libraries/insert_edit.lib.php:1174 libraries/server_privileges.lib.php:470
+#: templates/table/search/options.phtml:36
 msgid "Or"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1177
+#: libraries/insert_edit.lib.php:1175
 msgid "web server upload directory:"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1348 templates/table/input_box.phtml:49
+#: libraries/insert_edit.lib.php:1346
+#: templates/table/search/input_box.phtml:49
 msgid "Edit/Insert"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1398
+#: libraries/insert_edit.lib.php:1396
 #, possible-php-format
 msgid "Continue insertion with %s rows"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1428
+#: libraries/insert_edit.lib.php:1426
 msgid "and then"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1461
+#: libraries/insert_edit.lib.php:1459
 msgid "Insert as new row"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1464
+#: libraries/insert_edit.lib.php:1462
 msgid "Insert as new row and ignore errors"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1467
+#: libraries/insert_edit.lib.php:1465
 msgid "Show insert query"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1487
+#: libraries/insert_edit.lib.php:1485
 msgid "Go back to previous page"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1490
+#: libraries/insert_edit.lib.php:1488
 msgid "Insert another new row"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1495
+#: libraries/insert_edit.lib.php:1493
 msgid "Go back to this page"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1518
+#: libraries/insert_edit.lib.php:1516
 msgid "Edit next row"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1540
+#: libraries/insert_edit.lib.php:1538
 msgid ""
 "Use TAB key to move from value to value, or CTRL+arrows to move anywhere"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1577 libraries/replication_gui.lib.php:542
-#: libraries/rte/rte_routines.lib.php:1497
+#: libraries/insert_edit.lib.php:1575 libraries/replication_gui.lib.php:542
+#: libraries/rte/rte_routines.lib.php:1588
 #: libraries/server_status_variables.lib.php:220
-#: templates/designer/having_query_panel.phtml:100
-#: templates/designer/options_panel.phtml:73
-#: templates/designer/options_panel.phtml:239
-#: templates/designer/where_query_panel.phtml:69
-#: templates/table/table_header.phtml:10
-#: templates/table/zoom_result_form.phtml:35
+#: templates/database/designer/having_query_panel.phtml:100
+#: templates/database/designer/options_panel.phtml:73
+#: templates/database/designer/options_panel.phtml:239
+#: templates/database/designer/where_query_panel.phtml:69
+#: templates/table/search/table_header.phtml:10
+#: templates/table/search/zoom_result_form.phtml:35
 msgid "Value"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1937 libraries/sql.lib.php:1309
+#: libraries/insert_edit.lib.php:1935 libraries/sql.lib.php:1303
 msgid "Showing SQL query"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1962 libraries/sql.lib.php:1287
+#: libraries/insert_edit.lib.php:1960 libraries/sql.lib.php:1281
 #, possible-php-format
 msgid "Inserted row id: %1$d"
 msgstr ""
@@ -8961,7 +8978,7 @@ msgstr ""
 #: libraries/navigation/Nodes/Node_View_Container.class.php:26
 #: libraries/navigation/Nodes/Node_View_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:129
-#: templates/structure/show_create.phtml:30
+#: templates/database/structure/show_create.phtml:30
 msgid "Views"
 msgstr ""
 
@@ -9247,7 +9264,7 @@ msgstr ""
 
 #: libraries/operations.lib.php:101 libraries/operations.lib.php:249
 #: libraries/operations.lib.php:869 libraries/operations.lib.php:963
-#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:907
+#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:998
 #: templates/columns_definitions/table_fields_definitions.phtml:47
 msgid "Adjust Privileges"
 msgstr ""
@@ -9337,22 +9354,22 @@ msgid "Switch to copied table"
 msgstr ""
 
 #: libraries/operations.lib.php:1360
-#: templates/structure/check_all_tables.phtml:18
+#: templates/database/structure/check_all_tables.phtml:18
 msgid "Table maintenance"
 msgstr ""
 
 #: libraries/operations.lib.php:1398
-#: templates/structure/check_all_tables.phtml:19
+#: templates/database/structure/check_all_tables.phtml:19
 msgid "Analyze table"
 msgstr ""
 
 #: libraries/operations.lib.php:1413
-#: templates/structure/check_all_tables.phtml:20
+#: templates/database/structure/check_all_tables.phtml:20
 msgid "Check table"
 msgstr ""
 
 #: libraries/operations.lib.php:1428
-#: templates/structure/check_all_tables.phtml:22
+#: templates/database/structure/check_all_tables.phtml:22
 msgid "Checksum table"
 msgstr ""
 
@@ -9370,18 +9387,19 @@ msgid "Flush the table (FLUSH)"
 msgstr ""
 
 #: libraries/operations.lib.php:1477
-#: templates/structure/check_all_tables.phtml:23
-#: templates/structure/display_table_stats.phtml:56
+#: templates/database/structure/check_all_tables.phtml:23
+#: templates/table/structure/display_table_stats.phtml:56
 msgid "Optimize table"
 msgstr ""
 
 #: libraries/operations.lib.php:1492
-#: templates/structure/check_all_tables.phtml:24
+#: templates/database/structure/check_all_tables.phtml:24
 msgid "Repair table"
 msgstr ""
 
 #: libraries/operations.lib.php:1538
-#: templates/structure/check_all_tables.phtml:14 view_operations.php:127
+#: templates/database/structure/check_all_tables.phtml:14
+#: view_operations.php:127
 msgid "Delete data or table"
 msgstr ""
 
@@ -9502,7 +9520,7 @@ msgid "Cannot connect: invalid settings."
 msgstr ""
 
 #: libraries/plugins/auth/AuthenticationConfig.class.php:108
-#: libraries/plugins/auth/AuthenticationCookie.class.php:134
+#: libraries/plugins/auth/AuthenticationCookie.class.php:122
 #: libraries/plugins/auth/AuthenticationHttp.class.php:96
 #, possible-php-format
 msgid "Welcome to %s"
@@ -9527,36 +9545,36 @@ msgstr ""
 msgid "Retry to connect"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:146
+#: libraries/plugins/auth/AuthenticationCookie.class.php:134
 msgid "Your session has expired. Please log in again."
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:170
+#: libraries/plugins/auth/AuthenticationCookie.class.php:158
 msgid "Log in"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:178
-#: libraries/plugins/auth/AuthenticationCookie.class.php:188
+#: libraries/plugins/auth/AuthenticationCookie.class.php:166
+#: libraries/plugins/auth/AuthenticationCookie.class.php:176
 msgid "You can enter hostname/IP address and port separated by space."
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:193
+#: libraries/plugins/auth/AuthenticationCookie.class.php:181
 msgid "Username:"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:205
+#: libraries/plugins/auth/AuthenticationCookie.class.php:193
 msgid "Server Choice:"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:386
+#: libraries/plugins/auth/AuthenticationCookie.class.php:374
 msgid "Entered captcha is wrong, try again!"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:396
+#: libraries/plugins/auth/AuthenticationCookie.class.php:384
 msgid "Please enter correct captcha!"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:423
+#: libraries/plugins/auth/AuthenticationCookie.class.php:411
 msgid "You are not allowed to log in to this MySQL server!"
 msgstr ""
 
@@ -9652,7 +9670,7 @@ msgstr ""
 #: libraries/plugins/export/ExportOdt.class.php:593
 #: libraries/plugins/export/ExportTexytext.class.php:428
 #: libraries/plugins/export/PMA_ExportPdf.class.php:313
-#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:984
 #: libraries/rte/rte_triggers.lib.php:377
 msgid "Definition"
 msgstr ""
@@ -9949,7 +9967,7 @@ msgid "Last check:"
 msgstr ""
 
 #: libraries/plugins/export/ExportSql.class.php:1399
-#: templates/structure/structure_table_row.phtml:183
+#: templates/database/structure/structure_table_row.phtml:183
 msgid "in use"
 msgstr ""
 
@@ -10129,18 +10147,14 @@ msgstr ""
 msgid "The imported file does not contain any data!"
 msgstr ""
 
-#: libraries/plugins/import/ImportSql.class.php:169
+#: libraries/plugins/import/ImportSql.class.php:72
 msgid "SQL compatibility mode:"
 msgstr ""
 
-#: libraries/plugins/import/ImportSql.class.php:181
+#: libraries/plugins/import/ImportSql.class.php:84
 msgid "Do not use <code>AUTO_INCREMENT</code> for zero values"
 msgstr ""
 
-#: libraries/plugins/import/ImportSql.class.php:195
-msgid "Read as multibytes"
-msgstr ""
-
 #: libraries/plugins/import/ImportXml.class.php:54
 msgid "XML"
 msgstr ""
@@ -10183,7 +10197,7 @@ msgid "Show grid"
 msgstr ""
 
 #: libraries/plugins/schema/SchemaPdf.class.php:94
-#: templates/structure/print_view_data_dictionary_link.phtml:6
+#: templates/database/structure/print_view_data_dictionary_link.phtml:6
 msgid "Data Dictionary"
 msgstr ""
 
@@ -10208,7 +10222,7 @@ msgid "The %s table doesn't exist!"
 msgstr ""
 
 #: libraries/plugins/schema/eps/Eps_Relation_Schema.class.php:321
-#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:309
+#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:323
 #, possible-php-format
 msgid "Schema of the %s database - Page %s"
 msgstr ""
@@ -10234,7 +10248,7 @@ msgstr ""
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1005
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1028
 #: libraries/tracking.lib.php:884
-#: templates/structure/table_structure_header.phtml:11
+#: templates/table/structure/table_structure_header.phtml:11
 msgid "Extra"
 msgstr ""
 
@@ -10539,51 +10553,51 @@ msgstr ""
 msgid "Create the needed tables with the <code>%screate_tables.sql</code>."
 msgstr ""
 
-#: libraries/relation.lib.php:360
+#: libraries/relation.lib.php:357
 msgid "Create a pma user and give access to these tables."
 msgstr ""
 
-#: libraries/relation.lib.php:365
+#: libraries/relation.lib.php:360
 msgid ""
 "Enable advanced features in configuration file (<code>config.inc.php</"
 "code>), for example by starting from <code>config.sample.inc.php</code>."
 msgstr ""
 
-#: libraries/relation.lib.php:373
+#: libraries/relation.lib.php:365
 msgid "Re-login to phpMyAdmin to load the updated configuration file."
 msgstr ""
 
-#: libraries/relation.lib.php:1612
+#: libraries/relation.lib.php:1607
 msgid "no description"
 msgstr ""
 
-#: libraries/relation.lib.php:1811
+#: libraries/relation.lib.php:1806
 msgid ""
 "You do not have necessary privileges to create a database named "
 "'phpmyadmin'. You may go to 'Operations' tab of any database to set up the "
 "phpMyAdmin configuration storage there."
 msgstr ""
 
-#: libraries/relation.lib.php:1928
+#: libraries/relation.lib.php:1923
 #, possible-php-format
 msgid ""
 "%sCreate%s a database named 'phpmyadmin' and setup the phpMyAdmin "
 "configuration storage there."
 msgstr ""
 
-#: libraries/relation.lib.php:1936
+#: libraries/relation.lib.php:1931
 #, possible-php-format
 msgid ""
 "%sCreate%s the phpMyAdmin configuration storage in the current database."
 msgstr ""
 
-#: libraries/relation.lib.php:1944
+#: libraries/relation.lib.php:1939
 #, possible-php-format
 msgid "%sCreate%s missing phpMyAdmin configuration storage tables."
 msgstr ""
 
 #: libraries/replication_gui.lib.php:46 libraries/replication_gui.lib.php:343
-#: libraries/server_databases.lib.php:387
+#: libraries/server_databases.lib.php:398
 msgid "Master replication"
 msgstr ""
 
@@ -10638,7 +10652,7 @@ msgid ""
 msgstr ""
 
 #: libraries/replication_gui.lib.php:141
-#: libraries/server_databases.lib.php:389
+#: libraries/server_databases.lib.php:400
 msgid "Slave replication"
 msgstr ""
 
@@ -10899,10 +10913,10 @@ msgid "Master server changed successfully to %s."
 msgstr ""
 
 #: libraries/rte/rte_events.lib.php:106 libraries/rte/rte_events.lib.php:115
-#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:149
-#: libraries/rte/rte_routines.lib.php:158
-#: libraries/rte/rte_routines.lib.php:231
-#: libraries/rte/rte_routines.lib.php:1362
+#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:219
+#: libraries/rte/rte_routines.lib.php:246
+#: libraries/rte/rte_routines.lib.php:368
+#: libraries/rte/rte_routines.lib.php:1453
 #: libraries/rte/rte_triggers.lib.php:82 libraries/rte/rte_triggers.lib.php:91
 #: libraries/rte/rte_triggers.lib.php:123
 #, possible-php-format
@@ -10923,7 +10937,7 @@ msgstr ""
 msgid "Event %1$s has been created."
 msgstr ""
 
-#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:251
+#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:266
 #: libraries/rte/rte_triggers.lib.php:144
 msgid "One or more errors have occurred while processing your request:"
 msgstr ""
@@ -10932,7 +10946,7 @@ msgstr ""
 msgid "Edit event"
 msgstr ""
 
-#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:794
+#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:885
 #: libraries/rte/rte_triggers.lib.php:323 view_create.php:180
 msgid "Details"
 msgstr ""
@@ -10945,7 +10959,7 @@ msgstr ""
 msgid "Event type"
 msgstr ""
 
-#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:817
+#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:908
 #, possible-php-format
 msgid "Change to %s"
 msgstr ""
@@ -10972,12 +10986,14 @@ msgstr ""
 msgid "On completion preserve"
 msgstr ""
 
-#: libraries/rte/rte_events.lib.php:491 libraries/rte/rte_routines.lib.php:930
+#: libraries/rte/rte_events.lib.php:491
+#: libraries/rte/rte_routines.lib.php:1021
 #: libraries/rte/rte_triggers.lib.php:383 view_create.php:209
 msgid "Definer"
 msgstr ""
 
-#: libraries/rte/rte_events.lib.php:535 libraries/rte/rte_routines.lib.php:997
+#: libraries/rte/rte_events.lib.php:535
+#: libraries/rte/rte_routines.lib.php:1088
 #: libraries/rte/rte_triggers.lib.php:422
 msgid "The definer must be in the \"username@hostname\" format!"
 msgstr ""
@@ -11003,9 +11019,9 @@ msgid "You must provide an event definition."
 msgstr ""
 
 #: libraries/rte/rte_export.lib.php:43 libraries/rte/rte_general.lib.php:72
-#: libraries/rte/rte_routines.lib.php:345
-#: libraries/rte/rte_routines.lib.php:1198
-#: libraries/rte/rte_routines.lib.php:1411
+#: libraries/rte/rte_routines.lib.php:153
+#: libraries/rte/rte_routines.lib.php:1289
+#: libraries/rte/rte_routines.lib.php:1502
 msgid "Error in processing request:"
 msgstr ""
 
@@ -11037,132 +11053,132 @@ msgid ""
 "problems."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:110
-#: libraries/rte/rte_routines.lib.php:1006
+#: libraries/rte/rte_routines.lib.php:123
+msgid "Edit routine"
+msgstr ""
+
+#: libraries/rte/rte_routines.lib.php:200
+#: libraries/rte/rte_routines.lib.php:1097
 #, possible-php-format
 msgid "Invalid routine type: \"%s\""
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:170
-msgid "Sorry, we failed to restore the dropped routine."
-msgstr ""
-
-#: libraries/rte/rte_routines.lib.php:211
-#, possible-php-format
-msgid "Routine %1$s has been modified. Privileges have been adjusted."
-msgstr ""
-
-#: libraries/rte/rte_routines.lib.php:216
-#, possible-php-format
-msgid "Routine %1$s has been modified."
-msgstr ""
-
-#: libraries/rte/rte_routines.lib.php:238
+#: libraries/rte/rte_routines.lib.php:253
 #, possible-php-format
 msgid "Routine %1$s has been created."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:315
-msgid "Edit routine"
+#: libraries/rte/rte_routines.lib.php:380
+msgid "Sorry, we failed to restore the dropped routine."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:797
+#: libraries/rte/rte_routines.lib.php:439
+#, possible-php-format
+msgid "Routine %1$s has been modified. Privileges have been adjusted."
+msgstr ""
+
+#: libraries/rte/rte_routines.lib.php:444
+#, possible-php-format
+msgid "Routine %1$s has been modified."
+msgstr ""
+
+#: libraries/rte/rte_routines.lib.php:888
 msgid "Routine name"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:823
+#: libraries/rte/rte_routines.lib.php:914
 msgid "Parameters"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:829
+#: libraries/rte/rte_routines.lib.php:920
 msgid "Direction"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:847
+#: libraries/rte/rte_routines.lib.php:938
 msgid "Add parameter"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:851
+#: libraries/rte/rte_routines.lib.php:942
 msgid "Remove last parameter"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:856
+#: libraries/rte/rte_routines.lib.php:947
 msgid "Return type"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:862
+#: libraries/rte/rte_routines.lib.php:953
 msgid "Return length/values"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:868
+#: libraries/rte/rte_routines.lib.php:959
 msgid "Return options"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:899
+#: libraries/rte/rte_routines.lib.php:990
 msgid "Is deterministic"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:920
+#: libraries/rte/rte_routines.lib.php:1011
 msgid ""
 "You do not have sufficient privileges to perform this operation; Please "
 "refer to the documentation for more details"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:935
+#: libraries/rte/rte_routines.lib.php:1026
 msgid "Security type"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:944
+#: libraries/rte/rte_routines.lib.php:1035
 msgid "SQL data access"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1013
+#: libraries/rte/rte_routines.lib.php:1104
 msgid "You must provide a routine name!"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1047
+#: libraries/rte/rte_routines.lib.php:1138
 #, possible-php-format
 msgid "Invalid direction \"%s\" given for parameter."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1069
-#: libraries/rte/rte_routines.lib.php:1131
+#: libraries/rte/rte_routines.lib.php:1160
+#: libraries/rte/rte_routines.lib.php:1222
 msgid ""
 "You must provide length/values for routine parameters of type ENUM, SET, "
 "VARCHAR and VARBINARY."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1095
+#: libraries/rte/rte_routines.lib.php:1186
 msgid "You must provide a name and a type for each routine parameter."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1114
+#: libraries/rte/rte_routines.lib.php:1205
 msgid "You must provide a valid return type for the routine."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1174
+#: libraries/rte/rte_routines.lib.php:1265
 msgid "You must provide a routine definition."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1285
+#: libraries/rte/rte_routines.lib.php:1376
 #, possible-php-format
 msgid "Execution results of routine %s"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1340
+#: libraries/rte/rte_routines.lib.php:1431
 #, possible-php-format
 msgid "%d row affected by the last statement inside the procedure."
 msgid_plural "%d rows affected by the last statement inside the procedure."
 msgstr[0] ""
 msgstr[1] ""
 
-#: libraries/rte/rte_routines.lib.php:1398
-#: libraries/rte/rte_routines.lib.php:1406
+#: libraries/rte/rte_routines.lib.php:1489
+#: libraries/rte/rte_routines.lib.php:1497
 msgid "Execute routine"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1485
-#: libraries/rte/rte_routines.lib.php:1488
+#: libraries/rte/rte_routines.lib.php:1576
+#: libraries/rte/rte_routines.lib.php:1579
 msgid "Routine parameters"
 msgstr ""
 
@@ -11316,7 +11332,7 @@ msgid "Original position"
 msgstr ""
 
 #: libraries/server_bin_log.lib.php:133
-#: templates/structure/display_table_stats.phtml:4
+#: templates/table/structure/display_table_stats.phtml:4
 msgid "Information"
 msgstr ""
 
@@ -11352,12 +11368,12 @@ msgid ""
 "between the web server and the MySQL server."
 msgstr ""
 
-#: libraries/server_databases.lib.php:364
-#: libraries/server_databases.lib.php:365
+#: libraries/server_databases.lib.php:366
+#: libraries/server_databases.lib.php:371
 msgid "Enable Statistics"
 msgstr ""
 
-#: libraries/server_databases.lib.php:481
+#: libraries/server_databases.lib.php:492
 #, possible-php-format
 msgid "%1$d database has been dropped successfully."
 msgid_plural "%1$d databases have been dropped successfully."
@@ -11713,7 +11729,7 @@ msgid "You have revoked the privileges for %s."
 msgstr ""
 
 #: libraries/server_privileges.lib.php:2059
-#: libraries/server_privileges.lib.php:4290
+#: libraries/server_privileges.lib.php:4316
 msgid "Add user account"
 msgstr ""
 
@@ -11876,53 +11892,53 @@ msgstr ""
 msgid "The privileges were reloaded successfully."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:3994
+#: libraries/server_privileges.lib.php:4003
 #, possible-php-format
 msgid "The user %s already exists!"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4232
+#: libraries/server_privileges.lib.php:4258
 #, possible-php-format
 msgid "Privileges for %s"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4241
+#: libraries/server_privileges.lib.php:4267
 #: libraries/server_status_processes.lib.php:72
 #: libraries/server_user_groups.lib.php:39
 msgid "User"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4282
+#: libraries/server_privileges.lib.php:4308
 msgctxt "Create new user"
 msgid "New"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4311
+#: libraries/server_privileges.lib.php:4337
 msgid "Edit privileges:"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4312
+#: libraries/server_privileges.lib.php:4338
 msgid "User account"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4371
+#: libraries/server_privileges.lib.php:4397
 msgid ""
 "Note: You are attempting to edit privileges of the user with which you are "
 "currently logged in."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4391 libraries/server_users.lib.php:25
+#: libraries/server_privileges.lib.php:4417 libraries/server_users.lib.php:25
 msgid "User accounts overview"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4459
+#: libraries/server_privileges.lib.php:4485
 msgid ""
 "A user account allowing any user from localhost to connect is present. This "
 "will prevent other users from connecting if the host part of their account "
 "allows a connection from any (%) host."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4500
+#: libraries/server_privileges.lib.php:4526
 #, possible-php-format
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
@@ -11931,7 +11947,7 @@ msgid ""
 "%sreload the privileges%s before you continue."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4519
+#: libraries/server_privileges.lib.php:4545
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
 "tables. The content of these tables may differ from the privileges the "
@@ -11940,61 +11956,61 @@ msgid ""
 "privilege."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4569
+#: libraries/server_privileges.lib.php:4595
 msgid "The selected user was not found in the privilege table."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4801
+#: libraries/server_privileges.lib.php:4827
 msgid "You have added a new user."
 msgstr ""
 
-#: libraries/server_status.lib.php:53
+#: libraries/server_status.lib.php:60
 #, possible-php-format
 msgid "Network traffic since startup: %s"
 msgstr ""
 
-#: libraries/server_status.lib.php:66
+#: libraries/server_status.lib.php:73
 #, possible-php-format
 msgid "This MySQL server has been running for %1$s. It started up on %2$s."
 msgstr ""
 
-#: libraries/server_status.lib.php:80
+#: libraries/server_status.lib.php:94
 msgid ""
 "This MySQL server works as <b>master</b> and <b>slave</b> in <b>replication</"
 "b> process."
 msgstr ""
 
-#: libraries/server_status.lib.php:85
+#: libraries/server_status.lib.php:99
 msgid "This MySQL server works as <b>master</b> in <b>replication</b> process."
 msgstr ""
 
-#: libraries/server_status.lib.php:90
+#: libraries/server_status.lib.php:104
 msgid "This MySQL server works as <b>slave</b> in <b>replication</b> process."
 msgstr ""
 
-#: libraries/server_status.lib.php:106
+#: libraries/server_status.lib.php:116
 msgid "Replication status"
 msgstr ""
 
-#: libraries/server_status.lib.php:137
+#: libraries/server_status.lib.php:146
 msgid ""
 "On a busy server, the byte counters may overrun, so those statistics as "
 "reported by the MySQL server may be incorrect."
 msgstr ""
 
-#: libraries/server_status.lib.php:148
+#: libraries/server_status.lib.php:157
 msgid "Received"
 msgstr ""
 
-#: libraries/server_status.lib.php:167
+#: libraries/server_status.lib.php:176
 msgid "Sent"
 msgstr ""
 
-#: libraries/server_status.lib.php:234
+#: libraries/server_status.lib.php:243
 msgid "Max. concurrent connections"
 msgstr ""
 
-#: libraries/server_status.lib.php:244
+#: libraries/server_status.lib.php:253
 msgid "Failed attempts"
 msgstr ""
 
@@ -12914,7 +12930,7 @@ msgstr ""
 msgid "Not implemented yet."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/AlterOperation.php:193
+#: libraries/sql-parser/src/Components/AlterOperation.php:191
 msgid "Unrecognized alter operation."
 msgstr ""
 
@@ -12928,7 +12944,7 @@ msgid "An opening bracket followed by a set of values was expected."
 msgstr ""
 
 #: libraries/sql-parser/src/Components/ArrayObj.php:101
-#: libraries/sql-parser/src/Components/FieldDefinition.php:202
+#: libraries/sql-parser/src/Components/CreateDefinition.php:202
 msgid "An opening bracket was expected."
 msgstr ""
 
@@ -12936,25 +12952,33 @@ msgstr ""
 msgid "A comma or a closing bracket was expected"
 msgstr ""
 
+#: libraries/sql-parser/src/Components/CreateDefinition.php:246
+msgid "A comma or a closing bracket was expected."
+msgstr ""
+
+#: libraries/sql-parser/src/Components/CreateDefinition.php:262
+msgid "A closing bracket was expected."
+msgstr ""
+
 #: libraries/sql-parser/src/Components/DataType.php:125
 msgid "Unrecognized data type."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:225
+#: libraries/sql-parser/src/Components/Expression.php:227
 msgid "Unexpected closing bracket."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:246
-#: libraries/sql-parser/src/Components/Expression.php:283
-#: libraries/sql-parser/src/Components/Expression.php:303
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:285
+#: libraries/sql-parser/src/Components/Expression.php:305
 msgid "An alias was previously found."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:257
+#: libraries/sql-parser/src/Components/Expression.php:259
 msgid "Unexpected dot."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:327
+#: libraries/sql-parser/src/Components/Expression.php:329
 msgid "An alias was expected."
 msgstr ""
 
@@ -12962,14 +12986,6 @@ msgstr ""
 msgid "An expression was expected."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/FieldDefinition.php:246
-msgid "A comma or a closing bracket was expected."
-msgstr ""
-
-#: libraries/sql-parser/src/Components/FieldDefinition.php:262
-msgid "A closing bracket was expected."
-msgstr ""
-
 #: libraries/sql-parser/src/Components/Limit.php:90
 #: libraries/sql-parser/src/Components/Limit.php:112
 msgid "An offset was expected."
@@ -13009,24 +13025,24 @@ msgstr ""
 msgid "Expected delimiter."
 msgstr ""
 
-#: libraries/sql-parser/src/Lexer.php:753
+#: libraries/sql-parser/src/Lexer.php:777
 #, possible-php-format
 msgid "Ending quote %1$s was expected."
 msgstr ""
 
-#: libraries/sql-parser/src/Lexer.php:789
+#: libraries/sql-parser/src/Lexer.php:813
 msgid "Variable name was expected."
 msgstr ""
 
-#: libraries/sql-parser/src/Parser.php:380
+#: libraries/sql-parser/src/Parser.php:391
 msgid "Unexpected beginning of statement."
 msgstr ""
 
-#: libraries/sql-parser/src/Parser.php:399
+#: libraries/sql-parser/src/Parser.php:410
 msgid "Unrecognized statement type."
 msgstr ""
 
-#: libraries/sql-parser/src/Parser.php:479
+#: libraries/sql-parser/src/Parser.php:489
 msgid "No transaction was previously started."
 msgstr ""
 
@@ -13052,7 +13068,7 @@ msgid "The name of the entity was expected."
 msgstr ""
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:310
-msgid "At least one field definition was expected."
+msgid "At least one column definition was expected."
 msgstr ""
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:329
@@ -13112,25 +13128,25 @@ msgstr ""
 msgid "Using bookmark \"%s\" as default browse query."
 msgstr ""
 
-#: libraries/sql.lib.php:1306
+#: libraries/sql.lib.php:1300
 msgid "Showing as PHP code"
 msgstr ""
 
-#: libraries/sql.lib.php:1638
+#: libraries/sql.lib.php:1632
 #, possible-php-format
 msgid ""
 "Current selection does not contain a unique column. Grid edit, checkbox, "
 "Edit, Copy and Delete features are not available. %s"
 msgstr ""
 
-#: libraries/sql.lib.php:1649
+#: libraries/sql.lib.php:1643
 #, possible-php-format
 msgid ""
 "Current selection does not contain a unique column. Grid edit, Edit, Copy "
 "and Delete features may result in undesired behavior. %s"
 msgstr ""
 
-#: libraries/sql.lib.php:1688
+#: libraries/sql.lib.php:1682
 #, possible-php-format
 msgid "Problems with indexes of table `%s`"
 msgstr ""
@@ -13286,7 +13302,7 @@ msgid "Version %s snapshot (SQL code)"
 msgstr ""
 
 #: libraries/tracking.lib.php:947
-#: templates/structure/table_structure_row.phtml:33
+#: templates/table/structure/table_structure_row.phtml:33
 msgctxt "None for default"
 msgid "None"
 msgstr ""
@@ -13338,15 +13354,15 @@ msgstr ""
 msgid "Version %1$s was created, tracking for %2$s is active."
 msgstr ""
 
-#: libraries/user_preferences.inc.php:29
+#: libraries/user_preferences.inc.php:30
 msgid "Manage your settings"
 msgstr ""
 
-#: libraries/user_preferences.inc.php:46 prefs_manage.php:307
+#: libraries/user_preferences.inc.php:54 prefs_manage.php:307
 msgid "Configuration has been saved."
 msgstr ""
 
-#: libraries/user_preferences.inc.php:66
+#: libraries/user_preferences.inc.php:74
 #, possible-php-format
 msgid ""
 "Your preferences will be saved for current session only. Storing them "
@@ -13718,7 +13734,7 @@ msgid "first"
 msgstr ""
 
 #: templates/columns_definitions/move_column.phtml:12
-#: templates/structure/add_column.phtml:21
+#: templates/table/structure/add_column.phtml:21
 #, possible-php-format
 msgid "after %s"
 msgstr ""
@@ -13777,197 +13793,290 @@ msgstr ""
 msgid "Input transformation options"
 msgstr ""
 
-#: templates/designer/aggregate_query_panel.phtml:22
-#: templates/designer/options_panel.phtml:100
-msgid "Aggregate"
-msgstr ""
-
-#: templates/designer/aggregate_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:61
-#: templates/designer/options_panel.phtml:106
-#: templates/designer/options_panel.phtml:170
-#: templates/designer/where_query_panel.phtml:30
-#: templates/table/table_header.phtml:9
-msgid "Operator"
-msgstr ""
-
-#: templates/designer/database_tables.phtml:29
-msgid "Toggle"
-msgstr ""
-
-#: templates/designer/database_tables.phtml:40
-msgid "See table structure"
-msgstr ""
-
-#: templates/designer/delete_relation_panel.phtml:21
-msgid "Delete relation"
-msgstr ""
-
-#: templates/designer/edit_delete_pages.phtml:7
-msgid "Page to open"
-msgstr ""
-
-#: templates/designer/edit_delete_pages.phtml:7
-msgid "Page to delete"
-msgstr ""
-
-#: templates/designer/having_query_panel.phtml:90
-#: templates/designer/options_panel.phtml:63
-#: templates/designer/options_panel.phtml:229
-#: templates/designer/where_query_panel.phtml:59
-msgid "Except"
-msgstr ""
-
-#: templates/designer/having_query_panel.phtml:102
-#: templates/designer/options_panel.phtml:75
-#: templates/designer/options_panel.phtml:241
-#: templates/designer/where_query_panel.phtml:71
-msgid "subquery"
-msgstr ""
-
-#: templates/designer/new_relation_panel.phtml:22
-#: templates/designer/side_menu.phtml:84 templates/designer/side_menu.phtml:87
-msgid "Create relation"
-msgstr ""
-
-#: templates/designer/options_panel.phtml:34
-#: templates/designer/options_panel.phtml:200
-msgid "Relation operator"
-msgstr ""
-
-#: templates/designer/options_panel.phtml:85
-#: templates/designer/rename_to_panel.phtml:23
-msgid "Rename to"
-msgstr ""
-
-#: templates/designer/options_panel.phtml:91
-#: templates/designer/rename_to_panel.phtml:31
-msgid "New name"
-msgstr ""
-
-#: templates/designer/page_save_as.phtml:4
-msgid "Save to selected page"
-msgstr ""
-
-#: templates/designer/page_save_as.phtml:5
-msgid "Create a page and save to it"
-msgstr ""
-
-#: templates/designer/page_save_as.phtml:26
-msgid "New page name"
-msgstr ""
-
-#: templates/designer/page_selector.phtml:2
-msgid "Select page"
-msgstr ""
-
-#: templates/designer/query_details.phtml:10
-msgid "Active options"
-msgstr ""
-
-#: templates/designer/schema_export.phtml:4
-msgid "Select Export Relational Type"
-msgstr ""
-
-#: templates/designer/side_menu.phtml:19 templates/designer/side_menu.phtml:25
-msgid "Show/Hide tables list"
-msgstr ""
-
-#: templates/designer/side_menu.phtml:29 templates/designer/side_menu.phtml:35
-#: templates/designer/side_menu.phtml:36
-msgid "View in fullscreen"
-msgstr ""
-
-#: templates/designer/side_menu.phtml:34
-msgid "Exit fullscreen"
-msgstr ""
-
-#: templates/designer/side_menu.phtml:41 templates/designer/side_menu.phtml:45
-msgid "New page"
-msgstr ""
-
-#: templates/designer/side_menu.phtml:70 templates/designer/side_menu.phtml:73
-msgid "Delete pages"
-msgstr ""
-
-#: templates/designer/side_menu.phtml:77 templates/designer/side_menu.phtml:80
-#: templates/table/create_table.phtml:7
+#: templates/database/create_table.phtml:7
+#: templates/database/designer/side_menu.phtml:77
+#: templates/database/designer/side_menu.phtml:80
 msgid "Create table"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:98
-#: templates/designer/side_menu.phtml:101
+#: templates/database/create_table.phtml:15
+msgid "Number of columns"
+msgstr ""
+
+#: templates/database/designer/aggregate_query_panel.phtml:22
+#: templates/database/designer/options_panel.phtml:100
+msgid "Aggregate"
+msgstr ""
+
+#: templates/database/designer/aggregate_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:61
+#: templates/database/designer/options_panel.phtml:106
+#: templates/database/designer/options_panel.phtml:170
+#: templates/database/designer/where_query_panel.phtml:30
+#: templates/table/search/table_header.phtml:9
+msgid "Operator"
+msgstr ""
+
+#: templates/database/designer/database_tables.phtml:29
+msgid "Toggle"
+msgstr ""
+
+#: templates/database/designer/database_tables.phtml:40
+msgid "See table structure"
+msgstr ""
+
+#: templates/database/designer/delete_relation_panel.phtml:21
+msgid "Delete relation"
+msgstr ""
+
+#: templates/database/designer/edit_delete_pages.phtml:7
+msgid "Page to open"
+msgstr ""
+
+#: templates/database/designer/edit_delete_pages.phtml:7
+msgid "Page to delete"
+msgstr ""
+
+#: templates/database/designer/having_query_panel.phtml:90
+#: templates/database/designer/options_panel.phtml:63
+#: templates/database/designer/options_panel.phtml:229
+#: templates/database/designer/where_query_panel.phtml:59
+msgid "Except"
+msgstr ""
+
+#: templates/database/designer/having_query_panel.phtml:102
+#: templates/database/designer/options_panel.phtml:75
+#: templates/database/designer/options_panel.phtml:241
+#: templates/database/designer/where_query_panel.phtml:71
+msgid "subquery"
+msgstr ""
+
+#: templates/database/designer/new_relation_panel.phtml:22
+#: templates/database/designer/side_menu.phtml:84
+#: templates/database/designer/side_menu.phtml:87
+msgid "Create relation"
+msgstr ""
+
+#: templates/database/designer/options_panel.phtml:34
+#: templates/database/designer/options_panel.phtml:200
+msgid "Relation operator"
+msgstr ""
+
+#: templates/database/designer/options_panel.phtml:85
+#: templates/database/designer/rename_to_panel.phtml:23
+msgid "Rename to"
+msgstr ""
+
+#: templates/database/designer/options_panel.phtml:91
+#: templates/database/designer/rename_to_panel.phtml:31
+msgid "New name"
+msgstr ""
+
+#: templates/database/designer/page_save_as.phtml:4
+msgid "Save to selected page"
+msgstr ""
+
+#: templates/database/designer/page_save_as.phtml:5
+msgid "Create a page and save to it"
+msgstr ""
+
+#: templates/database/designer/page_save_as.phtml:26
+msgid "New page name"
+msgstr ""
+
+#: templates/database/designer/page_selector.phtml:2
+msgid "Select page"
+msgstr ""
+
+#: templates/database/designer/query_details.phtml:10
+msgid "Active options"
+msgstr ""
+
+#: templates/database/designer/schema_export.phtml:4
+msgid "Select Export Relational Type"
+msgstr ""
+
+#: templates/database/designer/side_menu.phtml:19
+#: templates/database/designer/side_menu.phtml:25
+msgid "Show/Hide tables list"
+msgstr ""
+
+#: templates/database/designer/side_menu.phtml:29
+#: templates/database/designer/side_menu.phtml:35
+#: templates/database/designer/side_menu.phtml:36
+msgid "View in fullscreen"
+msgstr ""
+
+#: templates/database/designer/side_menu.phtml:34
+msgid "Exit fullscreen"
+msgstr ""
+
+#: templates/database/designer/side_menu.phtml:41
+#: templates/database/designer/side_menu.phtml:45
+msgid "New page"
+msgstr ""
+
+#: templates/database/designer/side_menu.phtml:70
+#: templates/database/designer/side_menu.phtml:73
+msgid "Delete pages"
+msgstr ""
+
+#: templates/database/designer/side_menu.phtml:98
+#: templates/database/designer/side_menu.phtml:101
 msgid "Reload"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:107
-#: templates/designer/side_menu.phtml:110
+#: templates/database/designer/side_menu.phtml:107
+#: templates/database/designer/side_menu.phtml:110
 msgid "Help"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Angular links"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Direct links"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:122
-#: templates/designer/side_menu.phtml:124
+#: templates/database/designer/side_menu.phtml:122
+#: templates/database/designer/side_menu.phtml:124
 msgid "Snap to grid"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:128
-#: templates/designer/side_menu.phtml:134
+#: templates/database/designer/side_menu.phtml:128
+#: templates/database/designer/side_menu.phtml:134
 msgid "Small/Big All"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:138
-#: templates/designer/side_menu.phtml:141
+#: templates/database/designer/side_menu.phtml:138
+#: templates/database/designer/side_menu.phtml:141
 msgid "Toggle small/big"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:145
-#: templates/designer/side_menu.phtml:148
+#: templates/database/designer/side_menu.phtml:145
+#: templates/database/designer/side_menu.phtml:148
 msgid "Toggle relation lines"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:153
-#: templates/designer/side_menu.phtml:156
+#: templates/database/designer/side_menu.phtml:153
+#: templates/database/designer/side_menu.phtml:156
 msgid "Export schema"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:165
-#: templates/designer/side_menu.phtml:168
+#: templates/database/designer/side_menu.phtml:165
+#: templates/database/designer/side_menu.phtml:168
 msgid "Build Query"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:173
-#: templates/designer/side_menu.phtml:177
+#: templates/database/designer/side_menu.phtml:173
+#: templates/database/designer/side_menu.phtml:177
 msgid "Move Menu"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:181
-#: templates/designer/side_menu.phtml:186
+#: templates/database/designer/side_menu.phtml:181
+#: templates/database/designer/side_menu.phtml:186
 msgid "Pin text"
 msgstr ""
 
-#: templates/designer/table_list.phtml:4
+#: templates/database/designer/table_list.phtml:4
 msgid "Hide/Show all"
 msgstr ""
 
-#: templates/designer/table_list.phtml:14
+#: templates/database/designer/table_list.phtml:14
 msgid "Hide/Show Tables with no relation"
 msgstr ""
 
-#: templates/designer/table_list.phtml:59
+#: templates/database/designer/table_list.phtml:59
 msgid "Number of tables:"
 msgstr ""
 
+#: templates/database/structure/body_for_table_summary.phtml:6
+#, possible-php-format
+msgid "%s table"
+msgid_plural "%s tables"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templates/database/structure/body_for_table_summary.phtml:17
+msgid "Sum"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:6
+msgid "Check tables having overhead"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:10
+msgid "Show create"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:27
+msgid "Prefix"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:28
+msgid "Add prefix to table"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:29
+msgid "Replace table prefix"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:30
+msgid "Copy table with prefix"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:36
+msgid "Add columns to central list"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:37
+msgid "Remove columns from central list"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:38
+msgid "Make consistent with central list"
+msgstr ""
+
+#: templates/database/structure/favorite_anchor.phtml:12
+msgid "Add to Favorites"
+msgstr ""
+
+#: templates/database/structure/show_create.phtml:2
+msgid "Showing create queries"
+msgstr ""
+
+#: templates/database/structure/sortable_header.phtml:13
+msgid "Sort"
+msgstr ""
+
+#: templates/database/structure/table_header.phtml:42
+msgid ""
+"May be approximate. Click on the number to get the exact count. See "
+"[doc@faq3-11]FAQ 3.11[/doc]."
+msgstr ""
+
+#: templates/database/structure/table_header.phtml:66
+#: templates/table/index_form.phtml:127
+msgid "Size"
+msgstr ""
+
+#: templates/database/structure/table_header.phtml:74
+#: templates/table/structure/display_table_stats.phtml:27
+msgid "Overhead"
+msgstr ""
+
+#: templates/database/structure/tracking_icon.phtml:4
+msgid "Tracking is active."
+msgstr ""
+
+#: templates/database/structure/tracking_icon.phtml:8
+msgid "Tracking is not active."
+msgstr ""
+
 #: templates/error/report_form.phtml:7
 msgid ""
 "phpMyAdmin has encountered an error. We have collected data about this error "
@@ -13983,59 +14092,6 @@ msgstr ""
 msgid "Please explain the steps that lead to the error:"
 msgstr ""
 
-#: templates/gis_visualization/gis_visualization.phtml:3
-msgid "Display GIS Visualization"
-msgstr ""
-
-#: templates/gis_visualization/gis_visualization.phtml:8
-msgid "Label column"
-msgstr ""
-
-#: templates/gis_visualization/gis_visualization.phtml:11
-msgid "-- None --"
-msgstr ""
-
-#: templates/gis_visualization/gis_visualization.phtml:19
-msgid "Spatial column"
-msgstr ""
-
-#: templates/index_form.phtml:16
-msgid "Index name:"
-msgstr ""
-
-#: templates/index_form.phtml:19
-msgid ""
-"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
-msgstr ""
-
-#: templates/index_form.phtml:40
-msgid "Index choice:"
-msgstr ""
-
-#: templates/index_form.phtml:57
-msgid "Key block size:"
-msgstr ""
-
-#: templates/index_form.phtml:74
-msgid "Index type:"
-msgstr ""
-
-#: templates/index_form.phtml:86
-msgid "Parser:"
-msgstr ""
-
-#: templates/index_form.phtml:102
-msgid "Comment:"
-msgstr ""
-
-#: templates/index_form.phtml:127 templates/structure/table_header.phtml:66
-msgid "Size"
-msgstr ""
-
-#: templates/index_form.phtml:149 templates/index_form.phtml:190
-msgid "Drag to reorder"
-msgstr ""
-
 #: templates/prefs_autoload.phtml:9
 msgid ""
 "Your browser has phpMyAdmin configuration for this domain. Would you like to "
@@ -14046,402 +14102,369 @@ msgstr ""
 msgid "Start row:"
 msgstr ""
 
-#: templates/structure/actions_in_table_structure.phtml:14
-#, possible-php-format
-msgid "A primary key has been added on %s."
-msgstr ""
-
-#: templates/structure/actions_in_table_structure.phtml:34
-#: templates/structure/actions_in_table_structure.phtml:54
-#: templates/structure/actions_in_table_structure.phtml:79
-#: templates/structure/actions_in_table_structure.phtml:101
-#, possible-php-format
-msgid "An index has been added on %s."
-msgstr ""
-
-#: templates/structure/actions_in_table_structure.phtml:130
-#: templates/structure/check_all_table_column.phtml:59
-msgid "Remove from central columns"
-msgstr ""
-
-#: templates/structure/actions_in_table_structure.phtml:138
-#: templates/structure/check_all_table_column.phtml:55
-msgid "Add to central columns"
-msgstr ""
-
-#: templates/structure/add_column.phtml:7
-#, possible-php-format
-msgid "Add %s column(s)"
-msgstr ""
-
-#: templates/structure/add_column.phtml:12
-msgid "at beginning of table"
-msgstr ""
-
-#: templates/structure/body_for_table_summary.phtml:6
-#, possible-php-format
-msgid "%s table"
-msgid_plural "%s tables"
-msgstr[0] ""
-msgstr[1] ""
-
-#: templates/structure/body_for_table_summary.phtml:17
-msgid "Sum"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:6
-msgid "Check tables having overhead"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:10
-msgid "Show create"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:27
-msgid "Prefix"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:28
-msgid "Add prefix to table"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:29
-msgid "Replace table prefix"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:30
-msgid "Copy table with prefix"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:36
-msgid "Add columns to central list"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:37
-msgid "Remove columns from central list"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:38
-msgid "Make consistent with central list"
-msgstr ""
-
-#: templates/structure/display_structure.phtml:140 view_create.php:181
-msgid "Edit view"
-msgstr ""
-
-#: templates/structure/display_table_stats.phtml:9
-msgid "Space usage"
-msgstr ""
-
-#: templates/structure/display_table_stats.phtml:27
-#: templates/structure/table_header.phtml:74
-msgid "Overhead"
-msgstr ""
-
-#: templates/structure/display_table_stats.phtml:32
-msgid "Effective"
-msgstr ""
-
-#: templates/structure/favorite_anchor.phtml:12
-msgid "Add to Favorites"
-msgstr ""
-
-#: templates/structure/move_columns_dialog.phtml:1
-#: templates/structure/optional_action_links.phtml:21
-msgid "Move columns"
-msgstr ""
-
-#: templates/structure/move_columns_dialog.phtml:2
-msgid "Move the columns by dragging them up and down."
-msgstr ""
-
-#: templates/structure/optional_action_links.phtml:9
-msgid "Propose table structure"
-msgstr ""
-
-#: templates/structure/optional_action_links.phtml:24
-msgid "Improve table structure"
-msgstr ""
-
-#: templates/structure/optional_action_links.phtml:30
-msgid "Track view"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:3
-msgid "Row statistics"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:9
-msgid "static"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:11
-msgid "dynamic"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:22
-msgid "partitioned"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:54
-msgid "Row length"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:66
-msgid "Row size"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:73
-msgid "Next autoindex"
-msgstr ""
-
-#: templates/structure/secondary_tabs.phtml:14
-msgid "Relation view"
-msgstr ""
-
-#: templates/structure/show_create.phtml:2
-msgid "Showing create queries"
-msgstr ""
-
-#: templates/structure/sortable_header.phtml:13
-msgid "Sort"
-msgstr ""
-
-#: templates/structure/table_header.phtml:42
-msgid ""
-"May be approximate. Click on the number to get the exact count. See "
-"[doc@faq3-11]FAQ 3.11[/doc]."
-msgstr ""
-
-#: templates/structure/table_structure_row.phtml:46
-#, possible-php-format
-msgid "Column %s has been dropped."
-msgstr ""
-
-#: templates/structure/tracking_icon.phtml:4
-msgid "Tracking is active."
-msgstr ""
-
-#: templates/structure/tracking_icon.phtml:8
-msgid "Tracking is not active."
-msgstr ""
-
-#: templates/table/create_table.phtml:15
-msgid "Number of columns"
-msgstr ""
-
-#: templates/table/options.phtml:8
-msgid "Select columns (at least one):"
-msgstr ""
-
-#: templates/table/options.phtml:37
-msgid "Add search conditions (body of the \"where\" clause):"
-msgstr ""
-
-#: templates/table/options.phtml:45
-msgid "Number of rows per page"
-msgstr ""
-
-#: templates/table/options.phtml:56
-msgid "Display order:"
-msgstr ""
-
-#: templates/table/options_zoom.phtml:6
-msgid "Use this column to label each point"
-msgstr ""
-
-#: templates/table/options_zoom.phtml:35
-msgid "Maximum rows to plot"
-msgstr ""
-
-#: templates/table/replace_preview.phtml:13
-msgid "Find and replace - preview"
-msgstr ""
-
-#: templates/table/replace_preview.phtml:18
-msgid "Original string"
-msgstr ""
-
-#: templates/table/replace_preview.phtml:19
-msgid "Replaced string"
-msgstr ""
-
-#: templates/table/replace_preview.phtml:40
-msgid "Replace"
-msgstr ""
-
-#: templates/table/rows_zoom.phtml:16
-msgid "Additional search criteria"
-msgstr ""
-
-#: templates/table/search_and_replace.phtml:3
-msgid "Replace with:"
-msgstr ""
-
-#: templates/table/search_and_replace.phtml:22
-msgid "Use regular expression"
-msgstr ""
-
-#: templates/table/selection_form.phtml:12
-msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
-msgstr ""
-
-#: templates/table/selection_form.phtml:34
-msgid "Do a \"query by example\" (wildcard: \"%\")"
-msgstr ""
-
-#: templates/table/zoom_result_form.phtml:7
-msgid "Browse/Edit the points"
-msgstr ""
-
-#: templates/table/zoom_result_form.phtml:15
-msgid "How to use"
-msgstr ""
-
-#: templates/table/zoom_result_form.phtml:23
-msgid "Reset zoom"
-msgstr ""
-
-#: templates/tbl_chart.phtml:17
+#: templates/table/chart/tbl_chart.phtml:17
 msgctxt "Chart type"
 msgid "Bar"
 msgstr ""
 
-#: templates/tbl_chart.phtml:21
+#: templates/table/chart/tbl_chart.phtml:21
 msgctxt "Chart type"
 msgid "Column"
 msgstr ""
 
-#: templates/tbl_chart.phtml:25
+#: templates/table/chart/tbl_chart.phtml:25
 msgctxt "Chart type"
 msgid "Line"
 msgstr ""
 
-#: templates/tbl_chart.phtml:29
+#: templates/table/chart/tbl_chart.phtml:29
 msgctxt "Chart type"
 msgid "Spline"
 msgstr ""
 
-#: templates/tbl_chart.phtml:33
+#: templates/table/chart/tbl_chart.phtml:33
 msgctxt "Chart type"
 msgid "Area"
 msgstr ""
 
-#: templates/tbl_chart.phtml:37
+#: templates/table/chart/tbl_chart.phtml:37
 msgctxt "Chart type"
 msgid "Pie"
 msgstr ""
 
-#: templates/tbl_chart.phtml:41
+#: templates/table/chart/tbl_chart.phtml:41
 msgctxt "Chart type"
 msgid "Timeline"
 msgstr ""
 
-#: templates/tbl_chart.phtml:45
+#: templates/table/chart/tbl_chart.phtml:45
 msgctxt "Chart type"
 msgid "Scatter"
 msgstr ""
 
-#: templates/tbl_chart.phtml:50
+#: templates/table/chart/tbl_chart.phtml:50
 msgid "Stacked"
 msgstr ""
 
-#: templates/tbl_chart.phtml:53
+#: templates/table/chart/tbl_chart.phtml:53
 msgid "Chart title"
 msgstr ""
 
-#: templates/tbl_chart.phtml:57
+#: templates/table/chart/tbl_chart.phtml:57
 msgid "X-Axis:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:72
+#: templates/table/chart/tbl_chart.phtml:72
 msgid "Series:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:102
+#: templates/table/chart/tbl_chart.phtml:102
 msgid "X-Axis label:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:104
+#: templates/table/chart/tbl_chart.phtml:104
 msgid "X Values"
 msgstr ""
 
-#: templates/tbl_chart.phtml:107
+#: templates/table/chart/tbl_chart.phtml:107
 msgid "Y-Axis label:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:115
+#: templates/table/chart/tbl_chart.phtml:115
 msgid "Series names are in a column"
 msgstr ""
 
-#: templates/tbl_chart.phtml:118
+#: templates/table/chart/tbl_chart.phtml:118
 msgid "Series column:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:130
+#: templates/table/chart/tbl_chart.phtml:130
 msgid "Value Column:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:150
+#: templates/table/chart/tbl_chart.phtml:150
 msgid "Save chart as image"
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:7
+#: templates/table/gis_visualization/gis_visualization.phtml:3
+msgid "Display GIS Visualization"
+msgstr ""
+
+#: templates/table/gis_visualization/gis_visualization.phtml:8
+msgid "Label column"
+msgstr ""
+
+#: templates/table/gis_visualization/gis_visualization.phtml:11
+msgid "-- None --"
+msgstr ""
+
+#: templates/table/gis_visualization/gis_visualization.phtml:19
+msgid "Spatial column"
+msgstr ""
+
+#: templates/table/index_form.phtml:16
+msgid "Index name:"
+msgstr ""
+
+#: templates/table/index_form.phtml:19
+msgid ""
+"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
+msgstr ""
+
+#: templates/table/index_form.phtml:40
+msgid "Index choice:"
+msgstr ""
+
+#: templates/table/index_form.phtml:57
+msgid "Key block size:"
+msgstr ""
+
+#: templates/table/index_form.phtml:74
+msgid "Index type:"
+msgstr ""
+
+#: templates/table/index_form.phtml:86
+msgid "Parser:"
+msgstr ""
+
+#: templates/table/index_form.phtml:102
+msgid "Comment:"
+msgstr ""
+
+#: templates/table/index_form.phtml:149 templates/table/index_form.phtml:190
+msgid "Drag to reorder"
+msgstr ""
+
+#: templates/table/relation/common_form.phtml:7
 msgid "Internal relations"
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:11
+#: templates/table/relation/common_form.phtml:11
 msgid "Internal relation"
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:14
+#: templates/table/relation/common_form.phtml:14
 msgid ""
 "An internal relation is not necessary when a corresponding FOREIGN KEY "
 "relation exists."
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:37
+#: templates/table/relation/common_form.phtml:37
 msgid "Foreign key constraints"
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:40
+#: templates/table/relation/common_form.phtml:40
 msgid "Actions"
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:41
+#: templates/table/relation/common_form.phtml:41
 msgid "Constraint properties"
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:44
+#: templates/table/relation/common_form.phtml:44
 msgid ""
 "Only columns with index will be displayed. You can define an index below."
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:49
+#: templates/table/relation/common_form.phtml:49
 msgid "Foreign key constraint"
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:81
+#: templates/table/relation/common_form.phtml:81
 msgid "+ Add constraint"
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:91
+#: templates/table/relation/common_form.phtml:91
 msgid "Choose column to display:"
 msgstr ""
 
-#: templates/tbl_relation/foreign_key_row.phtml:13
+#: templates/table/relation/foreign_key_row.phtml:13
 #, possible-php-format
 msgid "Foreign key constraint %s has been dropped"
 msgstr ""
 
-#: templates/tbl_relation/foreign_key_row.phtml:102
+#: templates/table/relation/foreign_key_row.phtml:102
 msgid "Constraint name"
 msgstr ""
 
-#: templates/tbl_relation/foreign_key_row.phtml:157
+#: templates/table/relation/foreign_key_row.phtml:157
 msgid "+ Add column"
 msgstr ""
 
+#: templates/table/search/options.phtml:8
+msgid "Select columns (at least one):"
+msgstr ""
+
+#: templates/table/search/options.phtml:37
+msgid "Add search conditions (body of the \"where\" clause):"
+msgstr ""
+
+#: templates/table/search/options.phtml:45
+msgid "Number of rows per page"
+msgstr ""
+
+#: templates/table/search/options.phtml:56
+msgid "Display order:"
+msgstr ""
+
+#: templates/table/search/options_zoom.phtml:6
+msgid "Use this column to label each point"
+msgstr ""
+
+#: templates/table/search/options_zoom.phtml:35
+msgid "Maximum rows to plot"
+msgstr ""
+
+#: templates/table/search/replace_preview.phtml:13
+msgid "Find and replace - preview"
+msgstr ""
+
+#: templates/table/search/replace_preview.phtml:18
+msgid "Original string"
+msgstr ""
+
+#: templates/table/search/replace_preview.phtml:19
+msgid "Replaced string"
+msgstr ""
+
+#: templates/table/search/replace_preview.phtml:40
+msgid "Replace"
+msgstr ""
+
+#: templates/table/search/rows_zoom.phtml:16
+msgid "Additional search criteria"
+msgstr ""
+
+#: templates/table/search/search_and_replace.phtml:3
+msgid "Replace with:"
+msgstr ""
+
+#: templates/table/search/search_and_replace.phtml:22
+msgid "Use regular expression"
+msgstr ""
+
+#: templates/table/search/selection_form.phtml:12
+msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
+msgstr ""
+
+#: templates/table/search/selection_form.phtml:34
+msgid "Do a \"query by example\" (wildcard: \"%\")"
+msgstr ""
+
+#: templates/table/search/zoom_result_form.phtml:7
+msgid "Browse/Edit the points"
+msgstr ""
+
+#: templates/table/search/zoom_result_form.phtml:15
+msgid "How to use"
+msgstr ""
+
+#: templates/table/search/zoom_result_form.phtml:23
+msgid "Reset zoom"
+msgstr ""
+
+#: templates/table/secondary_tabs.phtml:14
+msgid "Relation view"
+msgstr ""
+
+#: templates/table/structure/actions_in_table_structure.phtml:14
+#, possible-php-format
+msgid "A primary key has been added on %s."
+msgstr ""
+
+#: templates/table/structure/actions_in_table_structure.phtml:34
+#: templates/table/structure/actions_in_table_structure.phtml:54
+#: templates/table/structure/actions_in_table_structure.phtml:79
+#: templates/table/structure/actions_in_table_structure.phtml:101
+#, possible-php-format
+msgid "An index has been added on %s."
+msgstr ""
+
+#: templates/table/structure/actions_in_table_structure.phtml:130
+#: templates/table/structure/check_all_table_column.phtml:59
+msgid "Remove from central columns"
+msgstr ""
+
+#: templates/table/structure/actions_in_table_structure.phtml:138
+#: templates/table/structure/check_all_table_column.phtml:55
+msgid "Add to central columns"
+msgstr ""
+
+#: templates/table/structure/add_column.phtml:7
+#, possible-php-format
+msgid "Add %s column(s)"
+msgstr ""
+
+#: templates/table/structure/add_column.phtml:12
+msgid "at beginning of table"
+msgstr ""
+
+#: templates/table/structure/display_structure.phtml:140 view_create.php:181
+msgid "Edit view"
+msgstr ""
+
+#: templates/table/structure/display_table_stats.phtml:9
+msgid "Space usage"
+msgstr ""
+
+#: templates/table/structure/display_table_stats.phtml:32
+msgid "Effective"
+msgstr ""
+
+#: templates/table/structure/move_columns_dialog.phtml:1
+#: templates/table/structure/optional_action_links.phtml:21
+msgid "Move columns"
+msgstr ""
+
+#: templates/table/structure/move_columns_dialog.phtml:2
+msgid "Move the columns by dragging them up and down."
+msgstr ""
+
+#: templates/table/structure/optional_action_links.phtml:9
+msgid "Propose table structure"
+msgstr ""
+
+#: templates/table/structure/optional_action_links.phtml:24
+msgid "Improve table structure"
+msgstr ""
+
+#: templates/table/structure/optional_action_links.phtml:30
+msgid "Track view"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:3
+msgid "Row statistics"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:9
+msgid "static"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:11
+msgid "dynamic"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:22
+msgid "partitioned"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:54
+msgid "Row length"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:66
+msgid "Row size"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:73
+msgid "Next autoindex"
+msgstr ""
+
+#: templates/table/structure/table_structure_row.phtml:46
+#, possible-php-format
+msgid "Column %s has been dropped."
+msgstr ""
+
 #: themes.php:17 themes.php:22
 msgid "Theme"
 msgstr ""
diff --git a/po/pl.po b/po/pl.po
index 58587c2baa..285ae7eb22 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 4.5.0-dev\n"
 "Report-Msgid-Bugs-To: developers@phpmyadmin.net\n"
-"POT-Creation-Date: 2015-08-08 13:53-0400\n"
+"POT-Creation-Date: 2015-08-12 08:10-0400\n"
 "PO-Revision-Date: 2015-01-21 02:11+0200\n"
 "Last-Translator: Krystian Biesaga <krystian4842@gmail.com>\n"
 "Language-Team: Polish <https://hosted.weblate.org/projects/phpmyadmin/master/"
@@ -54,7 +54,7 @@ msgid "Table comments:"
 msgstr "Komentarze tabeli:"
 
 #: db_datadict.php:104 libraries/Index.class.php:699
-#: libraries/insert_edit.lib.php:1567
+#: libraries/insert_edit.lib.php:1565
 #: libraries/navigation/Nodes/Node_Column.class.php:30
 #: libraries/plugins/export/ExportHtmlword.class.php:280
 #: libraries/plugins/export/ExportHtmlword.class.php:375
@@ -68,13 +68,14 @@ msgstr "Komentarze tabeli:"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1023
 #: libraries/tracking.lib.php:879 libraries/tracking.lib.php:975
 #: templates/columns_definitions/column_name.phtml:18
-#: templates/index_form.phtml:124 templates/table/table_header.phtml:6
-#: templates/table/zoom_result_form.phtml:33
-#: templates/tbl_relation/common_form.phtml:10
-#: templates/tbl_relation/common_form.phtml:43
-#: templates/tbl_relation/foreign_key_row.phtml:194
-#: templates/tbl_relation/foreign_key_row.phtml:206
-#: templates/tbl_relation/internal_relational_row.phtml:71
+#: templates/table/index_form.phtml:124
+#: templates/table/relation/common_form.phtml:10
+#: templates/table/relation/common_form.phtml:43
+#: templates/table/relation/foreign_key_row.phtml:194
+#: templates/table/relation/foreign_key_row.phtml:206
+#: templates/table/relation/internal_relational_row.phtml:71
+#: templates/table/search/table_header.phtml:6
+#: templates/table/search/zoom_result_form.phtml:33
 msgid "Column"
 msgstr "Kolumna"
 
@@ -92,21 +93,21 @@ msgstr "Kolumna"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1001
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1024
 #: libraries/rte/rte_list.lib.php:75 libraries/rte/rte_list.lib.php:103
-#: libraries/rte/rte_routines.lib.php:802
-#: libraries/rte/rte_routines.lib.php:831
-#: libraries/rte/rte_routines.lib.php:1493
+#: libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_routines.lib.php:922
+#: libraries/rte/rte_routines.lib.php:1584
 #: libraries/server_privileges.lib.php:2369 libraries/tracking.lib.php:880
 #: libraries/tracking.lib.php:972
 #: templates/columns_definitions/table_fields_definitions.phtml:11
-#: templates/structure/table_header.phtml:48
-#: templates/structure/table_structure_header.phtml:6
-#: templates/table/table_header.phtml:7
+#: templates/database/structure/table_header.phtml:48
+#: templates/table/search/table_header.phtml:7
+#: templates/table/structure/table_structure_header.phtml:6
 msgid "Type"
 msgstr "Typ"
 
 #: db_datadict.php:106 libraries/Index.class.php:702
 #: libraries/central_columns.lib.php:708
-#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1576
+#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1574
 #: libraries/plugins/export/ExportHtmlword.class.php:286
 #: libraries/plugins/export/ExportHtmlword.class.php:381
 #: libraries/plugins/export/ExportLatex.class.php:509
@@ -119,8 +120,8 @@ msgstr "Typ"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1026
 #: libraries/tracking.lib.php:882 libraries/tracking.lib.php:978
 #: templates/columns_definitions/table_fields_definitions.phtml:39
-#: templates/structure/table_structure_header.phtml:9
-#: templates/table/zoom_result_form.phtml:34
+#: templates/table/search/zoom_result_form.phtml:34
+#: templates/table/structure/table_structure_header.phtml:9
 msgid "Null"
 msgstr "Null"
 
@@ -138,8 +139,8 @@ msgstr "Null"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1027
 #: libraries/replication_gui.lib.php:153 libraries/tracking.lib.php:883
 #: templates/columns_definitions/table_fields_definitions.phtml:25
-#: templates/structure/body_for_table_summary.phtml:55
-#: templates/structure/table_structure_header.phtml:10
+#: templates/database/structure/body_for_table_summary.phtml:55
+#: templates/table/structure/table_structure_header.phtml:10
 msgid "Default"
 msgstr "Ustawienia domyślne"
 
@@ -167,19 +168,19 @@ msgid "Comments"
 msgstr "Komentarze"
 
 #: db_datadict.php:146
-#: libraries/controllers/StructureController.class.php:1960
-#: libraries/controllers/StructureController.class.php:1965
+#: libraries/controllers/TableStructureController.class.php:951
+#: libraries/controllers/TableStructureController.class.php:956
 #: libraries/tracking.lib.php:922
 #: templates/columns_definitions/column_indexes.phtml:6
-#: templates/structure/check_all_table_column.phtml:22
-#: templates/structure/display_structure.phtml:74
+#: templates/table/structure/check_all_table_column.phtml:22
+#: templates/table/structure/display_structure.phtml:74
 msgid "Primary"
 msgstr "Podstawowy"
 
 #: db_datadict.php:156 js/messages.php:317 libraries/Index.class.php:567
 #: libraries/Index.class.php:606 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261 libraries/mult_submits.lib.php:403
+#: libraries/config/FormDisplay.tpl.php:272 libraries/mult_submits.lib.php:403
 #: libraries/mult_submits.lib.php:417
 #: libraries/plugins/export/ExportHtmlword.class.php:630
 #: libraries/plugins/export/ExportLatex.class.php:589
@@ -195,20 +196,20 @@ msgstr "Podstawowy"
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1010 libraries/tracking.lib.php:1015
 #: prefs_manage.php:140 templates/prefs_autoload.phtml:15
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "No"
 msgstr "Nie"
 
 #: db_datadict.php:156 js/messages.php:443 libraries/Index.class.php:568
 #: libraries/Index.class.php:605 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261
-#: libraries/controllers/StructureController.class.php:1344
-#: libraries/controllers/StructureController.class.php:2223
-#: libraries/controllers/StructureController.class.php:2232
-#: libraries/controllers/StructureController.class.php:2237
-#: libraries/controllers/StructureController.class.php:2242
-#: libraries/controllers/StructureController.class.php:2247
+#: libraries/config/FormDisplay.tpl.php:272
+#: libraries/controllers/TableStructureController.class.php:539
+#: libraries/controllers/TableStructureController.class.php:1201
+#: libraries/controllers/TableStructureController.class.php:1210
+#: libraries/controllers/TableStructureController.class.php:1215
+#: libraries/controllers/TableStructureController.class.php:1220
+#: libraries/controllers/TableStructureController.class.php:1225
 #: libraries/mult_submits.inc.php:82 libraries/mult_submits.inc.php:178
 #: libraries/mult_submits.lib.php:339 libraries/mult_submits.lib.php:372
 #: libraries/mult_submits.lib.php:401 libraries/mult_submits.lib.php:415
@@ -217,8 +218,8 @@ msgstr "Nie"
 #: libraries/plugins/export/ExportOdt.class.php:756
 #: libraries/plugins/export/ExportTexytext.class.php:567
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1077
-#: libraries/server_databases.lib.php:464
-#: libraries/server_databases.lib.php:474
+#: libraries/server_databases.lib.php:475
+#: libraries/server_databases.lib.php:485
 #: libraries/server_privileges.lib.php:2546
 #: libraries/server_privileges.lib.php:2727
 #: libraries/server_privileges.lib.php:2748
@@ -228,7 +229,7 @@ msgstr "Nie"
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1008 libraries/tracking.lib.php:1013
 #: prefs_manage.php:138 templates/prefs_autoload.phtml:14
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "Yes"
 msgstr "Tak"
 
@@ -238,7 +239,7 @@ msgstr "Zobacz zrzut (schemat) bazy danych"
 
 #: db_export.php:37 db_tracking.php:90 export.php:382
 #: libraries/DBQbe.class.php:326
-#: libraries/controllers/StructureController.class.php:231
+#: libraries/controllers/DatabaseStructureController.class.php:170
 #: libraries/navigation/NavigationTree.class.php:897
 msgid "No tables found in database."
 msgstr "Nie znaleziono żadnych tabel w bazie danych."
@@ -249,14 +250,14 @@ msgstr "Nie znaleziono żadnych tabel w bazie danych."
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:26
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:120
-#: templates/structure/show_create.phtml:18
+#: templates/database/structure/show_create.phtml:18
 msgid "Tables"
 msgstr "Tabele"
 
 #: db_export.php:52 libraries/Menu.class.php:317 libraries/Menu.class.php:425
-#: libraries/Util.class.php:3333 libraries/Util.class.php:3343
-#: libraries/Util.class.php:3349 libraries/Util.class.php:3629
-#: libraries/Util.class.php:4327 libraries/Util.class.php:4344
+#: libraries/Util.class.php:3339 libraries/Util.class.php:3349
+#: libraries/Util.class.php:3355 libraries/Util.class.php:3635
+#: libraries/Util.class.php:4333 libraries/Util.class.php:4350
 #: libraries/central_columns.lib.php:728 libraries/config.values.php:39
 #: libraries/config.values.php:47 libraries/config.values.php:109
 #: libraries/config.values.php:115 libraries/config/setup.forms.php:323
@@ -270,7 +271,7 @@ msgstr "Tabele"
 #: libraries/navigation/Nodes/Node_Table.class.php:283
 #: libraries/server_privileges.lib.php:1141 libraries/tracking.lib.php:874
 #: templates/columns_definitions/table_fields_definitions.phtml:3
-#: templates/designer/table_list.phtml:28
+#: templates/database/designer/table_list.phtml:28
 msgid "Structure"
 msgstr "Struktura"
 
@@ -282,7 +283,7 @@ msgstr "Struktura"
 #: libraries/config/user_preferences.forms.php:292
 #: libraries/config/user_preferences.forms.php:297
 #: libraries/server_privileges.lib.php:1140
-#: templates/structure/display_table_stats.phtml:12
+#: templates/table/structure/display_table_stats.phtml:12
 msgid "Data"
 msgstr "Dane"
 
@@ -361,10 +362,10 @@ msgstr "Tabele śledzone"
 #: libraries/server_privileges.lib.php:2908
 #: libraries/server_privileges.lib.php:3145
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4346
-#: templates/structure/table_header.phtml:21
-#: templates/tbl_relation/foreign_key_row.phtml:176
-#: templates/tbl_relation/internal_relational_row.phtml:63
+#: libraries/server_privileges.lib.php:4372
+#: templates/database/structure/table_header.phtml:21
+#: templates/table/relation/foreign_key_row.phtml:176
+#: templates/table/relation/internal_relational_row.phtml:63
 msgid "Table"
 msgstr "Tabela"
 
@@ -381,7 +382,7 @@ msgid "Updated"
 msgstr "Zaktualizowana"
 
 #: db_tracking.php:130 js/messages.php:243 libraries/Menu.class.php:552
-#: libraries/Util.class.php:4314 libraries/config.values.php:104
+#: libraries/Util.class.php:4320 libraries/config.values.php:104
 #: libraries/rte/rte_events.lib.php:393 libraries/rte/rte_list.lib.php:101
 #: libraries/server_status_processes.lib.php:92 libraries/tracking.lib.php:279
 msgid "Status"
@@ -390,14 +391,15 @@ msgstr "Status"
 #: db_tracking.php:131 db_tracking.php:290 libraries/Index.class.php:693
 #: libraries/central_columns.lib.php:687 libraries/rte/rte_list.lib.php:74
 #: libraries/rte/rte_list.lib.php:89 libraries/rte/rte_list.lib.php:102
-#: libraries/server_databases.lib.php:398
+#: libraries/server_databases.lib.php:409
 #: libraries/server_privileges.lib.php:2372
 #: libraries/server_privileges.lib.php:3166
 #: libraries/server_privileges.lib.php:3342
 #: libraries/server_user_groups.lib.php:82
 #: libraries/server_variables.lib.php:189 libraries/tracking.lib.php:280
-#: libraries/tracking.lib.php:793 templates/structure/table_header.phtml:30
-#: templates/structure/table_structure_header.phtml:23
+#: libraries/tracking.lib.php:793
+#: templates/database/structure/table_header.phtml:30
+#: templates/table/structure/table_structure_header.phtml:23
 msgid "Action"
 msgstr "Działanie"
 
@@ -441,7 +443,7 @@ msgid "Untracked tables"
 msgstr "Tabele nieśledzone"
 
 #: db_tracking.php:305 db_tracking.php:336
-#: templates/structure/optional_action_links.phtml:17
+#: templates/table/structure/optional_action_links.phtml:17
 msgid "Track table"
 msgstr "Śledź tabelę"
 
@@ -497,7 +499,7 @@ msgid "Value for the column \"%s\""
 msgstr "Wartość dla kolumny \"%s\""
 
 #: gis_data_editor.php:146
-#: templates/gis_visualization/gis_visualization.phtml:37
+#: templates/table/gis_visualization/gis_visualization.phtml:37
 msgid "Use OpenStreetMaps as Base Layer"
 msgstr "Użyj OpenStreetMaps jako Podstawowej Warstwy"
 
@@ -577,35 +579,35 @@ msgstr "Dodaj geometrię"
 #: libraries/display_change_password.lib.php:162
 #: libraries/display_export.lib.php:402 libraries/display_export.lib.php:408
 #: libraries/display_import.lib.php:392 libraries/index.lib.php:44
-#: libraries/insert_edit.lib.php:1546 libraries/insert_edit.lib.php:1583
+#: libraries/insert_edit.lib.php:1544 libraries/insert_edit.lib.php:1581
 #: libraries/normalization.lib.php:165 libraries/normalization.lib.php:821
 #: libraries/operations.lib.php:38 libraries/operations.lib.php:108
 #: libraries/operations.lib.php:263 libraries/operations.lib.php:306
 #: libraries/operations.lib.php:801 libraries/operations.lib.php:874
 #: libraries/operations.lib.php:923 libraries/operations.lib.php:1337
 #: libraries/operations.lib.php:1658
-#: libraries/plugins/auth/AuthenticationCookie.class.php:244
+#: libraries/plugins/auth/AuthenticationCookie.class.php:232
 #: libraries/replication_gui.lib.php:122 libraries/replication_gui.lib.php:161
 #: libraries/replication_gui.lib.php:324 libraries/replication_gui.lib.php:461
 #: libraries/replication_gui.lib.php:906 libraries/rte/rte_events.lib.php:509
-#: libraries/rte/rte_routines.lib.php:969
-#: libraries/rte/rte_routines.lib.php:1581
+#: libraries/rte/rte_routines.lib.php:1060
+#: libraries/rte/rte_routines.lib.php:1672
 #: libraries/rte/rte_triggers.lib.php:396 libraries/server_bin_log.lib.php:61
 #: libraries/server_privileges.lib.php:705
 #: libraries/server_privileges.lib.php:2106
 #: libraries/server_privileges.lib.php:2872
 #: libraries/server_privileges.lib.php:3553
-#: libraries/server_privileges.lib.php:4627
+#: libraries/server_privileges.lib.php:4653
 #: libraries/server_user_groups.lib.php:285
 #: libraries/sql_query_form.lib.php:369 libraries/sql_query_form.lib.php:429
 #: libraries/tracking.lib.php:533 libraries/tracking.lib.php:653
 #: prefs_manage.php:277 prefs_manage.php:355
 #: templates/columns_definitions/column_definitions_form.phtml:59
-#: templates/header_location.phtml:17 templates/index_form.phtml:238
+#: templates/database/create_table.phtml:21 templates/header_location.phtml:28
 #: templates/startAndNumberOfRowsPanel.phtml:14
-#: templates/structure/add_column.phtml:25
-#: templates/table/create_table.phtml:21
-#: templates/table/selection_form.phtml:75 view_create.php:275
+#: templates/table/index_form.phtml:238
+#: templates/table/search/selection_form.phtml:75
+#: templates/table/structure/add_column.phtml:25 view_create.php:275
 #: view_operations.php:106
 msgid "Go"
 msgstr "Wykonaj"
@@ -693,7 +695,7 @@ msgstr ""
 msgid "Could not load import plugins, please check your installation!"
 msgstr "Nie udało się wczytać wtyczek importu. Proszę sprawdzić instalację!"
 
-#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1466
+#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1460
 #, php-format
 msgid "Bookmark %s has been created."
 msgstr "Zakładka %s została utworzona."
@@ -735,11 +737,11 @@ msgstr ""
 msgid "Back"
 msgstr "Powrót"
 
-#: index.php:148 libraries/Footer.class.php:70
+#: index.php:149 libraries/Footer.class.php:70
 msgid "phpMyAdmin Demo Server"
 msgstr "Serwer demo phpMyAdmina"
 
-#: index.php:152
+#: index.php:153
 #, php-format
 msgid ""
 "You are using the demo server. You can do anything here, but please do not "
@@ -750,112 +752,112 @@ msgstr ""
 "niedokonywanie zmian dla kont root, debian-sys-maint oraz pma. Więcej "
 "informacji na %s."
 
-#: index.php:162
+#: index.php:163
 msgid "General Settings"
 msgstr "Ustawienia ogólne"
 
-#: index.php:190 libraries/display_change_password.lib.php:50
+#: index.php:191 libraries/display_change_password.lib.php:50
 #: libraries/display_change_password.lib.php:53 user_password.php:247
 msgid "Change password"
 msgstr "Zmień hasło"
 
-#: index.php:206
+#: index.php:207
 msgid "Server connection collation"
 msgstr "Sortowanie połączenie z serwerem"
 
-#: index.php:228
+#: index.php:229
 msgid "Appearance Settings"
 msgstr "Ustawienia wyglądu"
 
-#: index.php:258 prefs_manage.php:285
+#: index.php:259 prefs_manage.php:285
 msgid "More settings"
 msgstr "Więcej ustawień"
 
-#: index.php:279
+#: index.php:280
 msgid "Database server"
 msgstr "Serwer bazy danych"
 
-#: index.php:282 libraries/plugins/auth/AuthenticationCookie.class.php:181
+#: index.php:283 libraries/plugins/auth/AuthenticationCookie.class.php:169
 msgid "Server:"
 msgstr "Serwer:"
 
-#: index.php:286
+#: index.php:287
 msgid "Server type:"
 msgstr "Typ serwera:"
 
-#: index.php:290 libraries/plugins/export/ExportLatex.class.php:212
+#: index.php:291 libraries/plugins/export/ExportLatex.class.php:212
 #: libraries/plugins/export/ExportSql.class.php:687
 #: libraries/plugins/export/ExportXml.class.php:189
 msgid "Server version:"
 msgstr "Wersja serwera:"
 
-#: index.php:296
+#: index.php:297
 msgid "Protocol version:"
 msgstr "Wersja protokołu:"
 
-#: index.php:300
+#: index.php:301
 msgid "User:"
 msgstr "Użytkownik:"
 
-#: index.php:305
+#: index.php:306
 msgid "Server charset:"
 msgstr "Kodowanie znaków serwera:"
 
-#: index.php:320
+#: index.php:321
 msgid "Web server"
 msgstr "Serwer WWW"
 
-#: index.php:331
+#: index.php:332
 msgid "Database client version:"
 msgstr "Wersja klienta bazy danych:"
 
-#: index.php:335
+#: index.php:336
 msgid "PHP extension:"
 msgstr "Rozszerzenie PHP:"
 
-#: index.php:349
+#: index.php:350
 #, fuzzy
 #| msgid "PHP Version:"
 msgid "PHP version:"
 msgstr "Wersja PHP:"
 
-#: index.php:360
+#: index.php:361
 msgid "Show PHP information"
 msgstr "Pokaż informacje o PHP"
 
-#: index.php:383
+#: index.php:384
 msgid "Version information:"
 msgstr "Informacja o wersji:"
 
-#: index.php:392 libraries/Util.class.php:432 libraries/Util.class.php:495
-#: libraries/config/FormDisplay.tpl.php:151
+#: index.php:393 libraries/Util.class.php:432 libraries/Util.class.php:495
+#: libraries/config/FormDisplay.tpl.php:162
 #: libraries/display_export.lib.php:577 libraries/engines/pbxt.lib.php:162
 #: libraries/navigation/NavigationHeader.class.php:196
 #: libraries/server_variables.lib.php:160
 msgid "Documentation"
 msgstr "Dokumentacja"
 
-#: index.php:399
+#: index.php:400
 msgid "Wiki"
 msgstr "Wiki"
 
-#: index.php:408
+#: index.php:409
 msgid "Official Homepage"
 msgstr "Oficjalna strona phpMyAdmina"
 
-#: index.php:415
+#: index.php:416
 msgid "Contribute"
 msgstr "Współpraca"
 
-#: index.php:422
+#: index.php:423
 msgid "Get support"
 msgstr "Pomoc techniczna"
 
-#: index.php:429
+#: index.php:430
 msgid "List of changes"
 msgstr "Lista zmian"
 
-#: index.php:451
+#: index.php:452
 #, fuzzy
 #| msgid ""
 #| "Your configuration file contains settings (root with no password) that "
@@ -874,7 +876,7 @@ msgstr ""
 "naprawić tę lukę w zabezpieczeniach poprzez ustawienie hasła dla użytkownika "
 "'root'."
 
-#: index.php:468
+#: index.php:469
 msgid ""
 "You have enabled mbstring.func_overload in your PHP configuration. This "
 "option is incompatible with phpMyAdmin and might cause some data to be "
@@ -884,7 +886,7 @@ msgstr ""
 "jest niezgodna z phpMyAdminem i może spowodować uszkodzenie niektórych "
 "danych!"
 
-#: index.php:483
+#: index.php:484
 msgid ""
 "The mbstring PHP extension was not found and you seem to be using a "
 "multibyte charset. Without the mbstring extension phpMyAdmin is unable to "
@@ -895,7 +897,7 @@ msgstr ""
 "phpMyAdmin nie ma możliwości poprawnego rozbijania napisów, co może "
 "skutkować niespodziewanymi rezultatami."
 
-#: index.php:500
+#: index.php:501
 #, fuzzy
 #| msgid ""
 #| "Your PHP parameter [a@http://php.net/manual/en/session.configuration."
@@ -913,7 +915,7 @@ msgstr ""
 "niż czas przechowywania ciasteczka skonfigurowany w phpMyAdmin. Z tego "
 "powodu sesja wygaśnie wcześniej niż jest to skonfigurowane w phpMyAdmin."
 
-#: index.php:519
+#: index.php:520
 msgid ""
 "Login cookie store is lower than cookie validity configured in phpMyAdmin, "
 "because of this, your login will expire sooner than configured in phpMyAdmin."
@@ -922,12 +924,12 @@ msgstr ""
 "ciasteczek skonfigurowanego w phpMyAdmin, z tego powodu, swój login wygasa "
 "wcześniej niż skonfigurowane w phpMyAdmin."
 
-#: index.php:535
+#: index.php:536
 msgid "The configuration file now needs a secret passphrase (blowfish_secret)."
 msgstr ""
 "Plik konfiguracyjny wymaga teraz tajnej frazy kodującej (blowfish_secret)."
 
-#: index.php:548
+#: index.php:549
 msgid ""
 "Directory [code]config[/code], which is used by the setup script, still "
 "exists in your phpMyAdmin directory. It is strongly recommended to remove it "
@@ -940,7 +942,7 @@ msgstr ""
 "serwera jest zagrożone przez osoby nieupoważnione ściągające twoją "
 "konfigurację."
 
-#: index.php:564
+#: index.php:565
 #, php-format
 msgid ""
 "The phpMyAdmin configuration storage is not completely configured, some "
@@ -949,12 +951,12 @@ msgstr ""
 "Przechowywania konfiguracji phpMyAdmin nie jest w pełni skonfigurowane, "
 "niektóre rozszerzone funkcje zostały wyłączone. %sDowiedz się dlaczego%s. "
 
-#: index.php:571
+#: index.php:572
 msgid ""
 "Or alternately go to 'Operations' tab of any database to set it up there."
 msgstr ""
 
-#: index.php:620
+#: index.php:621
 #, php-format
 msgid ""
 "Your PHP MySQL library version %s differs from your MySQL server version %s. "
@@ -963,7 +965,7 @@ msgstr ""
 "PHP MySQL w wersji biblioteki %s różni się od serwera MySQL w wersji %s. "
 "Może to spowodować nieprzewidywalne zachowanie."
 
-#: index.php:648
+#: index.php:649
 #, php-format
 msgid ""
 "Server running with Suhosin. Please refer to %sdocumentation%s for possible "
@@ -1124,8 +1126,8 @@ msgstr ""
 msgid "Save & Close"
 msgstr "Zapisz i zamknij"
 
-#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:404
-#: libraries/insert_edit.lib.php:1550 prefs_manage.php:361
+#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:415
+#: libraries/insert_edit.lib.php:1548 prefs_manage.php:361
 #: prefs_manage.php:372
 msgid "Reset"
 msgstr "Resetuj"
@@ -1158,7 +1160,7 @@ msgstr "Dodaj indeks"
 msgid "Edit Index"
 msgstr "Edytuj indeks"
 
-#: js/messages.php:99 templates/index_form.phtml:232
+#: js/messages.php:99 templates/table/index_form.phtml:232
 #, php-format
 msgid "Add %s column(s) to index"
 msgstr "Dodaj %s kolumny do indeksu"
@@ -1181,13 +1183,14 @@ msgstr "Kolumny dołączyć:"
 msgid "Please select column(s) for the index."
 msgstr "Wybierz kolumny dla indeksu."
 
-#: js/messages.php:106 templates/structure/add_column.phtml:1
+#: js/messages.php:106 templates/table/structure/add_column.phtml:1
 msgid "You have to add at least one column."
 msgstr "Musisz dodać co najmniej jedną kolumnę."
 
-#: js/messages.php:109 libraries/insert_edit.lib.php:1548
+#: js/messages.php:109 libraries/insert_edit.lib.php:1546
 #: templates/columns_definitions/column_definitions_form.phtml:162
-#: templates/index_form.phtml:237 templates/tbl_relation/common_form.phtml:106
+#: templates/table/index_form.phtml:237
+#: templates/table/relation/common_form.phtml:106
 msgid "Preview SQL"
 msgstr ""
 
@@ -1204,7 +1207,7 @@ msgid "SQL query:"
 msgstr "Zapytanie SQL:"
 
 #. l10n: Default label for the y-Axis of Charts
-#: js/messages.php:118 templates/tbl_chart.phtml:109
+#: js/messages.php:118 templates/table/chart/tbl_chart.phtml:109
 msgid "Y Values"
 msgstr "Wartość Y"
 
@@ -1365,7 +1368,7 @@ msgstr "Bajty przesłane"
 msgid "Bytes received"
 msgstr "Bajty otrzymane"
 
-#: js/messages.php:169 libraries/server_status.lib.php:226
+#: js/messages.php:169 libraries/server_status.lib.php:235
 msgid "Connections"
 msgstr "Połączenia"
 
@@ -1422,12 +1425,12 @@ msgstr "%d tabeli(l)"
 msgid "Questions"
 msgstr "Pytania"
 
-#: js/messages.php:184 libraries/server_status.lib.php:134
+#: js/messages.php:184 libraries/server_status.lib.php:143
 msgid "Traffic"
 msgstr "Ruch"
 
 #: js/messages.php:185 libraries/Menu.class.php:586
-#: libraries/Util.class.php:4318 libraries/server_status_monitor.lib.php:257
+#: libraries/Util.class.php:4324 libraries/server_status_monitor.lib.php:257
 msgid "Settings"
 msgstr "Ustawienia"
 
@@ -1447,8 +1450,9 @@ msgstr "Dodaj co najmniej jedną zmienną do serii!"
 #: libraries/server_status_monitor.lib.php:236
 #: libraries/server_status_processes.lib.php:308
 #: templates/columns_definitions/transformation.phtml:4
-#: templates/designer/options_panel.phtml:178
-#: templates/table/options_zoom.phtml:12 templates/table/rows_zoom.phtml:26
+#: templates/database/designer/options_panel.phtml:178
+#: templates/table/search/options_zoom.phtml:12
+#: templates/table/search/rows_zoom.phtml:26
 msgid "None"
 msgstr "Żaden"
 
@@ -1738,8 +1742,8 @@ msgstr ""
 
 #: js/messages.php:270 libraries/Menu.class.php:352
 #: libraries/Menu.class.php:455 libraries/Menu.class.php:582
-#: libraries/Util.class.php:4317 libraries/Util.class.php:4332
-#: libraries/Util.class.php:4349 libraries/config/messages.inc.php:258
+#: libraries/Util.class.php:4323 libraries/Util.class.php:4338
+#: libraries/Util.class.php:4355 libraries/config/messages.inc.php:258
 #: libraries/display_import.lib.php:105
 #: libraries/server_status_monitor.lib.php:318 prefs_manage.php:238
 #: setup/frames/menu.inc.php:26
@@ -1799,13 +1803,13 @@ msgid "Formatting SQL..."
 msgstr ""
 
 #: js/messages.php:293 libraries/server_variables.lib.php:157
-#: templates/designer/aggregate_query_panel.phtml:63
-#: templates/designer/delete_relation_panel.phtml:28
-#: templates/designer/having_query_panel.phtml:117
-#: templates/designer/new_relation_panel.phtml:88
-#: templates/designer/options_panel.phtml:253
-#: templates/designer/rename_to_panel.phtml:45
-#: templates/designer/where_query_panel.phtml:83
+#: templates/database/designer/aggregate_query_panel.phtml:63
+#: templates/database/designer/delete_relation_panel.phtml:28
+#: templates/database/designer/having_query_panel.phtml:117
+#: templates/database/designer/new_relation_panel.phtml:88
+#: templates/database/designer/options_panel.phtml:253
+#: templates/database/designer/rename_to_panel.phtml:45
+#: templates/database/designer/where_query_panel.phtml:83
 msgid "Cancel"
 msgstr "Anuluj"
 
@@ -1815,7 +1819,7 @@ msgstr "Anuluj"
 msgid "Page-related settings"
 msgstr "Zmiana ustawień"
 
-#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:402
+#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:413
 msgid "Apply"
 msgstr "Zastosuj"
 
@@ -1852,8 +1856,8 @@ msgstr "Kod błędu: %s"
 msgid "Error text: %s"
 msgstr "Błąd tekstu: %s"
 
-#: js/messages.php:307 libraries/db_common.inc.php:68
-#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:450
+#: js/messages.php:307 libraries/db_common.inc.php:69
+#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:461
 msgid "No databases selected."
 msgstr "Żadna baza danych nie został wybrana."
 
@@ -1865,12 +1869,13 @@ msgstr "Usuwanie kolumny"
 msgid "Adding Primary Key"
 msgstr "Dodawanie klucza głównego"
 
-#: js/messages.php:310 templates/designer/aggregate_query_panel.phtml:59
-#: templates/designer/having_query_panel.phtml:113
-#: templates/designer/new_relation_panel.phtml:87
-#: templates/designer/options_panel.phtml:252
-#: templates/designer/rename_to_panel.phtml:41
-#: templates/designer/where_query_panel.phtml:82
+#: js/messages.php:310
+#: templates/database/designer/aggregate_query_panel.phtml:59
+#: templates/database/designer/having_query_panel.phtml:113
+#: templates/database/designer/new_relation_panel.phtml:87
+#: templates/database/designer/options_panel.phtml:252
+#: templates/database/designer/rename_to_panel.phtml:41
+#: templates/database/designer/where_query_panel.phtml:82
 msgid "OK"
 msgstr "OK"
 
@@ -1890,7 +1895,7 @@ msgstr "Kopiowanie bazy danych"
 msgid "Changing Charset"
 msgstr "Zmiana kodowania"
 
-#: js/messages.php:320 libraries/Util.class.php:3217
+#: js/messages.php:320 libraries/Util.class.php:3223
 #, fuzzy
 #| msgid "Disable foreign key checks"
 msgid "Enable foreign key checks"
@@ -1927,20 +1932,21 @@ msgstr "Definicja przechowywania funkcji musi zawierać deklarację RETURN!"
 #: js/messages.php:334 libraries/DisplayResults.class.php:4834
 #: libraries/DisplayResults.class.php:5092 libraries/Menu.class.php:344
 #: libraries/Menu.class.php:446 libraries/Menu.class.php:578
-#: libraries/Util.class.php:3636 libraries/Util.class.php:3637
-#: libraries/Util.class.php:4316 libraries/Util.class.php:4331
-#: libraries/Util.class.php:4348 libraries/config/messages.inc.php:252
+#: libraries/Util.class.php:3642 libraries/Util.class.php:3643
+#: libraries/Util.class.php:4322 libraries/Util.class.php:4337
+#: libraries/Util.class.php:4354 libraries/config/messages.inc.php:252
 #: libraries/display_export.lib.php:173 libraries/rte/rte_list.lib.php:146
 #: libraries/server_privileges.lib.php:2211
 #: libraries/server_privileges.lib.php:2290
 #: libraries/server_privileges.lib.php:2632
 #: libraries/server_privileges.lib.php:3356
 #: libraries/server_status_monitor.lib.php:322 prefs_manage.php:303
-#: setup/frames/menu.inc.php:27 templates/structure/check_all_tables.phtml:11
+#: setup/frames/menu.inc.php:27
+#: templates/database/structure/check_all_tables.phtml:11
 msgid "Export"
 msgstr "Eksport"
 
-#: js/messages.php:337 libraries/rte/rte_routines.lib.php:652
+#: js/messages.php:337 libraries/rte/rte_routines.lib.php:743
 msgid "ENUM/SET editor"
 msgstr "Edytor ENUM/SET"
 
@@ -1979,7 +1985,7 @@ msgstr "Pokaż okno zapytań"
 #: libraries/Console.class.php:214 libraries/DisplayResults.class.php:3474
 #: libraries/DisplayResults.class.php:4818 libraries/Index.class.php:723
 #: libraries/Util.class.php:706 libraries/Util.class.php:1202
-#: libraries/Util.class.php:3634 libraries/Util.class.php:3635
+#: libraries/Util.class.php:3640 libraries/Util.class.php:3641
 #: libraries/central_columns.lib.php:851
 #: libraries/central_columns.lib.php:1193
 #: libraries/config/messages.inc.php:892
@@ -1997,7 +2003,7 @@ msgstr "Edytuj"
 #: libraries/server_user_groups.lib.php:129
 #: libraries/sql_query_form.lib.php:416 libraries/tracking.lib.php:477
 #: setup/frames/index.inc.php:183 setup/frames/index.inc.php:291
-#: templates/designer/delete_relation_panel.phtml:27
+#: templates/database/designer/delete_relation_panel.phtml:27
 msgid "Delete"
 msgstr "Usuń"
 
@@ -2161,11 +2167,11 @@ msgid "No dependencies selected!"
 msgstr "Nie wybrano żadnych zależności!"
 
 #: js/messages.php:394 libraries/central_columns.lib.php:1214
-#: libraries/insert_edit.lib.php:1458 libraries/server_variables.lib.php:155
+#: libraries/insert_edit.lib.php:1456 libraries/server_variables.lib.php:155
 #: setup/frames/config.inc.php:42 setup/frames/index.inc.php:279
 #: templates/columns_definitions/column_definitions_form.phtml:165
-#: templates/gis_visualization/gis_visualization.phtml:48
-#: templates/tbl_relation/common_form.phtml:107
+#: templates/table/gis_visualization/gis_visualization.phtml:48
+#: templates/table/relation/common_form.phtml:107
 msgid "Save"
 msgstr "Zapisz"
 
@@ -2252,8 +2258,8 @@ msgid "Data point content"
 msgstr "Treść punktu danych"
 
 #: js/messages.php:430 js/messages.php:562 js/messages.php:579
-#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2573
-#: templates/index_form.phtml:154 templates/index_form.phtml:194
+#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2571
+#: templates/table/index_form.phtml:154 templates/table/index_form.phtml:194
 msgid "Ignore"
 msgstr "Ignoruj"
 
@@ -2312,8 +2318,8 @@ msgstr "Wybierz klucz zewnętrzny"
 msgid "Please select the primary key or a unique key!"
 msgstr "Wybierz klucz podstawowy lub unikalny klucz!"
 
-#: js/messages.php:457 templates/designer/side_menu.phtml:91
-#: templates/designer/side_menu.phtml:94
+#: js/messages.php:457 templates/database/designer/side_menu.phtml:91
+#: templates/database/designer/side_menu.phtml:94
 msgid "Choose column to display"
 msgstr "Wybierz kolumny do wyświetlenia"
 
@@ -2329,20 +2335,20 @@ msgstr ""
 msgid "Page name"
 msgstr "Nazwa strony"
 
-#: js/messages.php:463 templates/designer/side_menu.phtml:56
-#: templates/designer/side_menu.phtml:59
+#: js/messages.php:463 templates/database/designer/side_menu.phtml:56
+#: templates/database/designer/side_menu.phtml:59
 msgid "Save page"
 msgstr "Zapisz stronę"
 
-#: js/messages.php:464 templates/designer/side_menu.phtml:63
-#: templates/designer/side_menu.phtml:66
+#: js/messages.php:464 templates/database/designer/side_menu.phtml:63
+#: templates/database/designer/side_menu.phtml:66
 #, fuzzy
 #| msgid "Save page"
 msgid "Save page as"
 msgstr "Zapisz stronę"
 
-#: js/messages.php:465 templates/designer/side_menu.phtml:49
-#: templates/designer/side_menu.phtml:52
+#: js/messages.php:465 templates/database/designer/side_menu.phtml:49
+#: templates/database/designer/side_menu.phtml:52
 msgid "Open page"
 msgstr "Otwórz stronę"
 
@@ -2350,7 +2356,7 @@ msgstr "Otwórz stronę"
 msgid "Delete page"
 msgstr "Usuń stronę"
 
-#: js/messages.php:467 templates/designer/side_menu.phtml:10
+#: js/messages.php:467 templates/database/designer/side_menu.phtml:10
 msgid "Untitled"
 msgstr "Bez nazwy"
 
@@ -2468,7 +2474,7 @@ msgstr "Oryginalny ciąg"
 msgid "cancel"
 msgstr "anuluj"
 
-#: js/messages.php:499 libraries/server_status.lib.php:271
+#: js/messages.php:499 libraries/server_status.lib.php:280
 msgid "Aborted"
 msgstr "Przerwane"
 
@@ -3074,7 +3080,7 @@ msgstr "Proszę podać poprawny numer!"
 
 #: js/messages.php:793 libraries/Message.class.php:199
 #: libraries/Util.class.php:654 libraries/core.lib.php:245
-#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1172
+#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1170
 #: tbl_operations.php:229 view_operations.php:63
 msgid "Error"
 msgstr "Błąd"
@@ -3137,8 +3143,8 @@ msgstr "na sekundę"
 msgid "per minute"
 msgstr "na minutę"
 
-#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:143
-#: libraries/server_status.lib.php:228
+#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:152
+#: libraries/server_status.lib.php:237
 #: libraries/server_status_queries.lib.php:98
 msgid "per hour"
 msgstr "na godzinę"
@@ -3156,7 +3162,7 @@ msgstr "Istniejący plik konfiguracyjny (%s) nie jest czytelny."
 msgid "Wrong permissions on configuration file, should not be world writable!"
 msgstr "Złe uprawnienia pliku konfiguracyjnego, nie powinien być zapisywalny!"
 
-#: libraries/Config.class.php:1799
+#: libraries/Config.class.php:1801
 msgid "Font size"
 msgstr "Rozmiar czcionki"
 
@@ -3184,10 +3190,10 @@ msgstr "Wykonaj zapytanie ponownie"
 #: libraries/server_privileges.lib.php:2890
 #: libraries/server_privileges.lib.php:3144
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4332
+#: libraries/server_privileges.lib.php:4358
 #: libraries/server_status_processes.lib.php:80
-#: templates/tbl_relation/foreign_key_row.phtml:165
-#: templates/tbl_relation/internal_relational_row.phtml:55
+#: templates/table/relation/foreign_key_row.phtml:165
+#: templates/table/relation/internal_relational_row.phtml:55
 msgid "Database"
 msgstr "Baza danych"
 
@@ -3281,11 +3287,11 @@ msgstr "Historia"
 #: libraries/plugins/import/ImportMediawiki.class.php:60
 #: libraries/plugins/import/ImportOds.class.php:59
 #: libraries/plugins/import/ImportShp.class.php:57
-#: libraries/plugins/import/ImportSql.class.php:148
+#: libraries/plugins/import/ImportSql.class.php:51
 #: libraries/plugins/import/ImportXml.class.php:58
-#: libraries/rte/rte_routines.lib.php:833 templates/index_form.phtml:49
-#: templates/structure/row_stats_table.phtml:20
-#: templates/table/options.phtml:2
+#: libraries/rte/rte_routines.lib.php:924 templates/table/index_form.phtml:49
+#: templates/table/search/options.phtml:2
+#: templates/table/structure/row_stats_table.phtml:20
 msgid "Options"
 msgstr "Opcje"
 
@@ -3326,7 +3332,8 @@ msgstr "Malejąco"
 msgid "Order:"
 msgstr "Kolejność"
 
-#: libraries/Console.class.php:289 templates/table/replace_preview.phtml:17
+#: libraries/Console.class.php:289
+#: templates/table/search/replace_preview.phtml:17
 #, fuzzy
 #| msgid "Column"
 msgid "Count"
@@ -3439,9 +3446,9 @@ msgstr "Przełącz na przekopiowaną tabelę"
 #: libraries/operations.lib.php:794 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:191
-#: templates/structure/sortable_header.phtml:21
-#: templates/structure/sortable_header.phtml:38
-#: templates/table/options.phtml:68
+#: templates/database/structure/sortable_header.phtml:21
+#: templates/database/structure/sortable_header.phtml:38
+#: templates/table/search/options.phtml:68
 msgid "Ascending"
 msgstr "Rosnąco"
 
@@ -3451,13 +3458,14 @@ msgstr "Rosnąco"
 #: libraries/operations.lib.php:797 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:188
-#: templates/structure/sortable_header.phtml:26
-#: templates/structure/sortable_header.phtml:43
-#: templates/table/options.phtml:69
+#: templates/database/structure/sortable_header.phtml:26
+#: templates/database/structure/sortable_header.phtml:43
+#: templates/table/search/options.phtml:69
 msgid "Descending"
 msgstr "Malejąco"
 
-#: libraries/DBQbe.class.php:467 templates/table/search_and_replace.phtml:6
+#: libraries/DBQbe.class.php:467
+#: templates/table/search/search_and_replace.phtml:6
 msgid "Column:"
 msgstr "Kolumna:"
 
@@ -3620,12 +3628,12 @@ msgstr[1] "%1$s dopasowania w <strong>%2$s</strong>"
 msgstr[2] "%1$s dopasowań w <strong>%2$s</strong>"
 
 #: libraries/DbSearch.class.php:354 libraries/Menu.class.php:311
-#: libraries/Util.class.php:3337 libraries/Util.class.php:3347
-#: libraries/Util.class.php:3623 libraries/Util.class.php:3624
-#: libraries/Util.class.php:4343 libraries/config.values.php:43
+#: libraries/Util.class.php:3343 libraries/Util.class.php:3353
+#: libraries/Util.class.php:3629 libraries/Util.class.php:3630
+#: libraries/Util.class.php:4349 libraries/config.values.php:43
 #: libraries/config.values.php:51 libraries/config.values.php:119
 #: libraries/navigation/Nodes/Node_Table.class.php:295
-#: templates/structure/check_all_table_column.phtml:5
+#: templates/table/structure/check_all_table_column.phtml:5
 msgid "Browse"
 msgstr "Przeglądaj"
 
@@ -3642,7 +3650,8 @@ msgstr "Szukaj w bazie danych"
 msgid "Words or values to search for (wildcard: \"%\"):"
 msgstr "Wyrazy lub wartości do wyszukania (wildcard: \"%\"):"
 
-#: libraries/DbSearch.class.php:401 templates/table/search_and_replace.phtml:1
+#: libraries/DbSearch.class.php:401
+#: templates/table/search/search_and_replace.phtml:1
 msgid "Find:"
 msgstr "Znajdź:"
 
@@ -3686,28 +3695,28 @@ msgstr "Filtrowanie wierszy"
 msgid "Search this table"
 msgstr "Szukaj w tej tabeli"
 
-#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2532
-#: libraries/Util.class.php:2535
+#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2538
+#: libraries/Util.class.php:2541
 msgctxt "First page"
 msgid "Begin"
 msgstr "Początek"
 
-#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2533
-#: libraries/Util.class.php:2536 libraries/server_bin_log.lib.php:170
+#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2539
+#: libraries/Util.class.php:2542 libraries/server_bin_log.lib.php:170
 #: libraries/server_bin_log.lib.php:172
 msgctxt "Previous page"
 msgid "Previous"
 msgstr "Poprzednie"
 
-#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2564
-#: libraries/Util.class.php:2574 libraries/server_bin_log.lib.php:204
+#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2570
+#: libraries/Util.class.php:2580 libraries/server_bin_log.lib.php:204
 #: libraries/server_bin_log.lib.php:206
 msgctxt "Next page"
 msgid "Next"
 msgstr "Następne"
 
-#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2565
-#: libraries/Util.class.php:2575
+#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2571
+#: libraries/Util.class.php:2581
 msgctxt "Last page"
 msgid "End"
 msgstr "Koniec"
@@ -3782,15 +3791,15 @@ msgid "May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]."
 msgstr "Może być w przybliżeniu. Zobacz [doc@faq3-11]FAQ 3.11[/doc]."
 
 #: libraries/DisplayResults.class.php:4332 libraries/Message.class.php:180
-#: libraries/controllers/TableRelationController.class.php:258
+#: libraries/controllers/TableRelationController.class.php:259
 #: libraries/controllers/TableSearchController.class.php:655
-#: libraries/rte/rte_routines.lib.php:1332 libraries/sql_query_form.lib.php:89
+#: libraries/rte/rte_routines.lib.php:1423 libraries/sql_query_form.lib.php:89
 #: tbl_operations.php:227 tbl_row_action.php:138 view_operations.php:62
 msgid "Your SQL query has been executed successfully."
 msgstr "Zapytanie SQL zostało wykonane pomyślnie."
 
 #: libraries/DisplayResults.class.php:4660
-#: libraries/controllers/StructureController.class.php:629
+#: libraries/controllers/DatabaseStructureController.class.php:564
 #, php-format
 msgid ""
 "This view has at least this number of rows. Please refer to %sdocumentation"
@@ -3814,33 +3823,33 @@ msgstr "%1$d ogółem, %2$d w zapytaniu"
 msgid "%d total"
 msgstr "%d ogółem"
 
-#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1318
+#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1312
 #, php-format
 msgid "Query took %01.4f seconds."
 msgstr "Wykonanie zapytania trwało %01.4f sekund(y)."
 
 #: libraries/DisplayResults.class.php:4807
-#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4767
-#: libraries/Util.class.php:4773 libraries/mult_submits.inc.php:50
-#: templates/structure/check_all_tables.phtml:2
-#: templates/structure/check_all_tables.phtml:9
+#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4773
+#: libraries/Util.class.php:4779 libraries/mult_submits.inc.php:50
+#: templates/database/structure/check_all_tables.phtml:2
+#: templates/database/structure/check_all_tables.phtml:9
 msgid "With selected:"
 msgstr "Z zaznaczonymi:"
 
 #: libraries/DisplayResults.class.php:4811
-#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4769
-#: libraries/Util.class.php:4770 libraries/server_privileges.lib.php:1174
+#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4775
+#: libraries/Util.class.php:4776 libraries/server_privileges.lib.php:1174
 #: libraries/server_privileges.lib.php:1175
 #: libraries/server_privileges.lib.php:1387
 #: libraries/server_user_groups.lib.php:231
-#: templates/structure/check_all_tables.phtml:3
-#: templates/structure/check_all_tables.phtml:4
+#: templates/database/structure/check_all_tables.phtml:3
+#: templates/database/structure/check_all_tables.phtml:4
 msgid "Check All"
 msgstr "Zaznacz wszystkie"
 
 #: libraries/DisplayResults.class.php:4985 libraries/Header.class.php:383
-#: templates/structure/optional_action_links.phtml:1
-#: templates/structure/print_view_data_dictionary_link.phtml:3
+#: templates/database/structure/print_view_data_dictionary_link.phtml:3
+#: templates/table/structure/optional_action_links.phtml:1
 msgid "Print view"
 msgstr "Podgląd wydruku"
 
@@ -3848,7 +3857,8 @@ msgstr "Podgląd wydruku"
 msgid "Query results operations"
 msgstr "Operacja na wynikach zapytania"
 
-#: libraries/DisplayResults.class.php:5105 templates/tbl_chart.phtml:12
+#: libraries/DisplayResults.class.php:5105
+#: templates/table/chart/tbl_chart.phtml:12
 msgid "Display chart"
 msgstr "Wyświetlanie wykresu"
 
@@ -3943,7 +3953,7 @@ msgid "Click on the bar to scroll to top of page"
 msgstr "Kliknij na pasku, aby przewinąć do góry strony"
 
 #: libraries/Header.class.php:749
-#: libraries/plugins/auth/AuthenticationCookie.class.php:152
+#: libraries/plugins/auth/AuthenticationCookie.class.php:140
 msgid "Javascript must be enabled past this point!"
 msgstr "Obsługa javascript musi być włączona!"
 
@@ -3965,11 +3975,11 @@ msgid "Keyname"
 msgstr "Nazwa klucza"
 
 #: libraries/Index.class.php:697
-#: libraries/controllers/StructureController.class.php:1962
-#: libraries/controllers/StructureController.class.php:1967
+#: libraries/controllers/TableStructureController.class.php:953
+#: libraries/controllers/TableStructureController.class.php:958
 #: libraries/tracking.lib.php:973
 #: templates/columns_definitions/column_indexes.phtml:11
-#: templates/structure/check_all_table_column.phtml:26
+#: templates/table/structure/check_all_table_column.phtml:26
 msgid "Unique"
 msgstr "Jednoznaczny"
 
@@ -3988,16 +3998,17 @@ msgstr "Moc"
 #: libraries/server_collations.lib.php:35 libraries/tracking.lib.php:881
 #: libraries/tracking.lib.php:977
 #: templates/columns_definitions/table_fields_definitions.phtml:33
-#: templates/structure/row_stats_table.phtml:31
-#: templates/structure/table_header.phtml:55
-#: templates/structure/table_structure_header.phtml:7
-#: templates/table/table_header.phtml:8
+#: templates/database/structure/table_header.phtml:55
+#: templates/table/search/table_header.phtml:8
+#: templates/table/structure/row_stats_table.phtml:31
+#: templates/table/structure/table_structure_header.phtml:7
 msgid "Collation"
 msgstr "Metoda porównywania napisów"
 
 #: libraries/Index.class.php:703 libraries/rte/rte_events.lib.php:496
-#: libraries/rte/rte_routines.lib.php:956 libraries/tracking.lib.php:885
-#: libraries/tracking.lib.php:979 templates/structure/table_header.phtml:84
+#: libraries/rte/rte_routines.lib.php:1047 libraries/tracking.lib.php:885
+#: libraries/tracking.lib.php:979
+#: templates/database/structure/table_header.phtml:84
 msgid "Comment"
 msgstr "Komentarz"
 
@@ -4010,15 +4021,15 @@ msgstr "Klucz podstawowy został usunięty."
 msgid "Index %s has been dropped."
 msgstr "Klucz %s został usunięty."
 
-#: libraries/Index.class.php:757 libraries/Util.class.php:3630
-#: libraries/Util.class.php:3631
-#: libraries/controllers/StructureController.class.php:1958
-#: libraries/controllers/StructureController.class.php:1959
+#: libraries/Index.class.php:757 libraries/Util.class.php:3636
+#: libraries/Util.class.php:3637
+#: libraries/controllers/TableStructureController.class.php:949
+#: libraries/controllers/TableStructureController.class.php:950
 #: libraries/operations.lib.php:1607 libraries/rte/rte_list.lib.php:150
 #: libraries/server_databases.lib.php:146
-#: templates/structure/check_all_table_column.phtml:15
-#: templates/structure/check_all_tables.phtml:16
-#: templates/tbl_relation/foreign_key_row.phtml:93
+#: templates/database/structure/check_all_tables.phtml:16
+#: templates/table/relation/foreign_key_row.phtml:93
+#: templates/table/structure/check_all_table_column.phtml:15
 msgid "Drop"
 msgstr "Usuń"
 
@@ -4049,16 +4060,16 @@ msgstr "Serwer"
 #: libraries/Menu.class.php:248
 #: libraries/navigation/Nodes/Node_View.class.php:32
 #: libraries/tbl_info.inc.php:63
-#: templates/structure/structure_table_row.phtml:97
-#: templates/structure/structure_table_row.phtml:159
+#: templates/database/structure/structure_table_row.phtml:97
+#: templates/database/structure/structure_table_row.phtml:159
 msgid "View"
 msgstr "Widok"
 
 #: libraries/Menu.class.php:325 libraries/Menu.class.php:429
-#: libraries/Menu.class.php:548 libraries/Util.class.php:3334
-#: libraries/Util.class.php:3344 libraries/Util.class.php:3350
-#: libraries/Util.class.php:4313 libraries/Util.class.php:4328
-#: libraries/Util.class.php:4345 libraries/config.values.php:40
+#: libraries/Menu.class.php:548 libraries/Util.class.php:3340
+#: libraries/Util.class.php:3350 libraries/Util.class.php:3356
+#: libraries/Util.class.php:4319 libraries/Util.class.php:4334
+#: libraries/Util.class.php:4351 libraries/config.values.php:40
 #: libraries/config.values.php:48 libraries/config.values.php:110
 #: libraries/config.values.php:116 libraries/config/messages.inc.php:321
 #: libraries/navigation/Nodes/Node_Table.class.php:292
@@ -4066,19 +4077,19 @@ msgid "SQL"
 msgstr "SQL"
 
 #: libraries/Menu.class.php:328 libraries/Menu.class.php:432
-#: libraries/Util.class.php:3335 libraries/Util.class.php:3345
-#: libraries/Util.class.php:3351 libraries/Util.class.php:3625
-#: libraries/Util.class.php:3626 libraries/Util.class.php:4329
-#: libraries/Util.class.php:4346 libraries/config.values.php:41
+#: libraries/Util.class.php:3341 libraries/Util.class.php:3351
+#: libraries/Util.class.php:3357 libraries/Util.class.php:3631
+#: libraries/Util.class.php:3632 libraries/Util.class.php:4335
+#: libraries/Util.class.php:4352 libraries/config.values.php:41
 #: libraries/config.values.php:49 libraries/config.values.php:111
 #: libraries/config.values.php:117
 #: libraries/navigation/Nodes/Node_Table.class.php:286
 msgid "Search"
 msgstr "Szukaj"
 
-#: libraries/Menu.class.php:338 libraries/Util.class.php:3336
-#: libraries/Util.class.php:3346 libraries/Util.class.php:3627
-#: libraries/Util.class.php:3628 libraries/Util.class.php:4347
+#: libraries/Menu.class.php:338 libraries/Util.class.php:3342
+#: libraries/Util.class.php:3352 libraries/Util.class.php:3633
+#: libraries/Util.class.php:3634 libraries/Util.class.php:4353
 #: libraries/config.values.php:42 libraries/config.values.php:50
 #: libraries/config.values.php:118
 #: libraries/navigation/Nodes/Node_Table.class.php:289
@@ -4087,30 +4098,30 @@ msgid "Insert"
 msgstr "Wstaw"
 
 #: libraries/Menu.class.php:362 libraries/Menu.class.php:467
-#: libraries/Util.class.php:4334 libraries/Util.class.php:4350
+#: libraries/Util.class.php:4340 libraries/Util.class.php:4356
 #: libraries/config.values.php:106 libraries/server_common.lib.php:51
 #: libraries/server_privileges.lib.php:2370
 #: libraries/server_privileges.lib.php:3158
-#: libraries/server_privileges.lib.php:4221
+#: libraries/server_privileges.lib.php:4247
 msgid "Privileges"
 msgstr "Uprawnienia"
 
 #: libraries/Menu.class.php:371 libraries/Menu.class.php:379
-#: libraries/Menu.class.php:459 libraries/Util.class.php:3338
-#: libraries/Util.class.php:3352 libraries/Util.class.php:4333
-#: libraries/Util.class.php:4351 libraries/config.values.php:112
+#: libraries/Menu.class.php:459 libraries/Util.class.php:3344
+#: libraries/Util.class.php:3358 libraries/Util.class.php:4339
+#: libraries/Util.class.php:4357 libraries/config.values.php:112
 #: view_operations.php:92
 msgid "Operations"
 msgstr "Operacje"
 
 #: libraries/Menu.class.php:384 libraries/Menu.class.php:492
-#: libraries/Util.class.php:4338 libraries/Util.class.php:4352
+#: libraries/Util.class.php:4344 libraries/Util.class.php:4358
 #: libraries/relation.lib.php:255
 msgid "Tracking"
 msgstr "Śledzenie"
 
 #: libraries/Menu.class.php:397 libraries/Menu.class.php:486
-#: libraries/Util.class.php:4337 libraries/Util.class.php:4353
+#: libraries/Util.class.php:4343 libraries/Util.class.php:4359
 #: libraries/navigation/Nodes/Node_Trigger_Container.class.php:24
 #: libraries/plugins/export/ExportHtmlword.class.php:557
 #: libraries/plugins/export/ExportOdt.class.php:685
@@ -4127,16 +4138,16 @@ msgstr "Wyzwalacze"
 msgid "Database seems to be empty!"
 msgstr "Baza danych wydaje się pusta!"
 
-#: libraries/Menu.class.php:439 libraries/Util.class.php:4330
+#: libraries/Menu.class.php:439 libraries/Util.class.php:4336
 msgid "Query"
 msgstr "Zapytanie"
 
-#: libraries/Menu.class.php:472 libraries/Util.class.php:4335
+#: libraries/Menu.class.php:472 libraries/Util.class.php:4341
 #: libraries/rte/rte_words.lib.php:36
 msgid "Routines"
 msgstr "Procedury i funkcje"
 
-#: libraries/Menu.class.php:479 libraries/Util.class.php:4336
+#: libraries/Menu.class.php:479 libraries/Util.class.php:4342
 #: libraries/navigation/Nodes/Node_Event_Container.class.php:26
 #: libraries/plugins/export/ExportSql.class.php:940
 #: libraries/plugins/export/ExportXml.class.php:107
@@ -4144,20 +4155,20 @@ msgstr "Procedury i funkcje"
 msgid "Events"
 msgstr "Zdarzenia"
 
-#: libraries/Menu.class.php:498 libraries/Util.class.php:4339
+#: libraries/Menu.class.php:498 libraries/Util.class.php:4345
 msgid "Designer"
 msgstr "Widok projektu"
 
-#: libraries/Menu.class.php:507 libraries/Util.class.php:4340
-#: templates/structure/check_all_tables.phtml:35
+#: libraries/Menu.class.php:507 libraries/Util.class.php:4346
+#: templates/database/structure/check_all_tables.phtml:35
 msgid "Central columns"
 msgstr "Centralne kolumny"
 
-#: libraries/Menu.class.php:544 libraries/Util.class.php:4312
+#: libraries/Menu.class.php:544 libraries/Util.class.php:4318
 #: libraries/config.values.php:103 libraries/config/messages.inc.php:266
 #: libraries/config/messages.inc.php:341
 #: libraries/navigation/NavigationTree.class.php:1239
-#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4332
+#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4358
 msgid "Databases"
 msgstr "Bazy danych"
 
@@ -4168,34 +4179,34 @@ msgid "User accounts"
 msgstr "Grupy użytkowników"
 
 #: libraries/Menu.class.php:595 libraries/ServerStatusData.class.php:121
-#: libraries/Util.class.php:4319 libraries/server_common.lib.php:36
+#: libraries/Util.class.php:4325 libraries/server_common.lib.php:36
 msgid "Binary log"
 msgstr "Dziennik binarny"
 
 #: libraries/Menu.class.php:601 libraries/ServerStatusData.class.php:126
-#: libraries/Util.class.php:4320 libraries/server_common.lib.php:42
-#: templates/structure/body_for_table_summary.phtml:10
-#: templates/structure/table_header.phtml:27
+#: libraries/Util.class.php:4326 libraries/server_common.lib.php:42
+#: templates/database/structure/body_for_table_summary.phtml:10
+#: templates/database/structure/table_header.phtml:27
 msgid "Replication"
 msgstr "Replikacja"
 
 #: libraries/Menu.class.php:606 libraries/ServerStatusData.class.php:193
-#: libraries/Util.class.php:4321 libraries/config.values.php:105
+#: libraries/Util.class.php:4327 libraries/config.values.php:105
 #: libraries/server_engines.lib.php:108 libraries/server_engines.lib.php:112
 #: libraries/sql_query_form.lib.php:421
 msgid "Variables"
 msgstr "Zmienne"
 
-#: libraries/Menu.class.php:610 libraries/Util.class.php:4322
+#: libraries/Menu.class.php:610 libraries/Util.class.php:4328
 msgid "Charsets"
 msgstr "Kodowania znaków"
 
-#: libraries/Menu.class.php:615 libraries/Util.class.php:4323
+#: libraries/Menu.class.php:615 libraries/Util.class.php:4329
 #: libraries/server_common.lib.php:33 libraries/server_plugins.lib.php:27
 msgid "Plugins"
 msgstr "Wtyczki"
 
-#: libraries/Menu.class.php:626 libraries/Util.class.php:4324
+#: libraries/Menu.class.php:626 libraries/Util.class.php:4330
 msgid "Engines"
 msgstr "Mechanizmy"
 
@@ -4223,7 +4234,7 @@ msgstr[0] "Wstawionych rekordów: %1$d."
 msgstr[1] "Wstawionych rekordów: %1$d."
 msgstr[2] "Wstawionych rekordów: %1$d."
 
-#: libraries/PDF.class.php:70 libraries/Util.class.php:2521
+#: libraries/PDF.class.php:70 libraries/Util.class.php:2527
 #: libraries/browse_foreigners.lib.php:327
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:865
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:890
@@ -4244,7 +4255,7 @@ msgid "Could not save favorite table!"
 msgstr "Nie można zapisać tabeli ulubionych!"
 
 #: libraries/RecentFavoriteTable.class.php:212
-#: templates/structure/favorite_anchor.phtml:12
+#: templates/database/structure/favorite_anchor.phtml:12
 msgid "Remove from Favorites"
 msgstr "Usuń z ulubionych"
 
@@ -4411,7 +4422,7 @@ msgid ""
 msgstr "Brak szczegółowych informacji o tym mechanizmie składowania."
 
 #: libraries/StorageEngine.class.php:373
-#: templates/structure/body_for_table_summary.phtml:50
+#: templates/database/structure/body_for_table_summary.phtml:50
 #, php-format
 msgid "%s is the default storage engine on this MySQL server."
 msgstr "%s to domyślny silnik składowania tego serwera MySQL."
@@ -4894,10 +4905,10 @@ msgstr ""
 
 #: libraries/Util.class.php:726 libraries/rte/rte_events.lib.php:110
 #: libraries/rte/rte_events.lib.php:119 libraries/rte/rte_events.lib.php:150
-#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:153
-#: libraries/rte/rte_routines.lib.php:162
-#: libraries/rte/rte_routines.lib.php:235
-#: libraries/rte/rte_routines.lib.php:1366
+#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:223
+#: libraries/rte/rte_routines.lib.php:250
+#: libraries/rte/rte_routines.lib.php:372
+#: libraries/rte/rte_routines.lib.php:1457
 #: libraries/rte/rte_triggers.lib.php:86 libraries/rte/rte_triggers.lib.php:95
 #: libraries/rte/rte_triggers.lib.php:127
 msgid "MySQL said: "
@@ -4943,75 +4954,78 @@ msgstr "Nie"
 msgid "%B %d, %Y at %I:%M %p"
 msgstr "%d %B %Y, %H:%M"
 
-#: libraries/Util.class.php:2019
+#: libraries/Util.class.php:2025
 #, php-format
 msgid "%s days, %s hours, %s minutes and %s seconds"
 msgstr "%s dni, %s godzin, %s minut i %s sekund"
 
-#: libraries/Util.class.php:2112
+#: libraries/Util.class.php:2118
 msgid "Missing parameter:"
 msgstr "Brakuje parametru:"
 
-#: libraries/Util.class.php:2645
+#: libraries/Util.class.php:2651
 #, php-format
 msgid "Jump to database \"%s\"."
 msgstr "Przejście do bazy danych \"%s\"."
 
-#: libraries/Util.class.php:2670
+#: libraries/Util.class.php:2676
 #, php-format
 msgid "The %s functionality is affected by a known bug, see %s"
 msgstr "Funkcja %s jest dotknięta przez znany błąd, zobacz %s"
 
-#: libraries/Util.class.php:2881
+#: libraries/Util.class.php:2887
 msgid "Click to toggle"
 msgstr "Kliknij, aby przełączać"
 
-#: libraries/Util.class.php:3542 prefs_manage.php:248
+#: libraries/Util.class.php:3548 prefs_manage.php:248
 msgid "Browse your computer:"
 msgstr "Wyszukaj w komputerze:"
 
-#: libraries/Util.class.php:3567
+#: libraries/Util.class.php:3573
 #, php-format
 msgid "Select from the web server upload directory <b>%s</b>:"
 msgstr "Wybierz katalog serwera WWW dla uploadu <b>%s</b>:"
 
-#: libraries/Util.class.php:3596 libraries/insert_edit.lib.php:1173
+#: libraries/Util.class.php:3602 libraries/insert_edit.lib.php:1171
 msgid "The directory you set for upload work cannot be reached."
 msgstr "Nie można znaleźć katalogu do zapisu przesyłanych plików."
 
-#: libraries/Util.class.php:3607
+#: libraries/Util.class.php:3613
 msgid "There are no files to upload!"
 msgstr "Brak plików do załadowania!"
 
-#: libraries/Util.class.php:3632 libraries/Util.class.php:3633
-#: templates/structure/check_all_tables.phtml:15
+#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: templates/database/structure/check_all_tables.phtml:15
 msgid "Empty"
 msgstr "Opróżnij"
 
-#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: libraries/Util.class.php:3644 libraries/Util.class.php:3645
 msgid "Execute"
 msgstr "Wykonaj"
 
-#: libraries/Util.class.php:4152
+#: libraries/Util.class.php:4158
 msgid "Print"
 msgstr "Drukuj"
 
-#: libraries/Util.class.php:4257 templates/structure/row_stats_table.phtml:80
-#: templates/structure/table_header.phtml:95
+#: libraries/Util.class.php:4263
+#: templates/database/structure/table_header.phtml:95
+#: templates/table/structure/row_stats_table.phtml:80
 msgid "Creation"
 msgstr "Data utworzenia"
 
-#: libraries/Util.class.php:4263 templates/structure/row_stats_table.phtml:87
-#: templates/structure/table_header.phtml:106
+#: libraries/Util.class.php:4269
+#: templates/database/structure/table_header.phtml:106
+#: templates/table/structure/row_stats_table.phtml:87
 msgid "Last update"
 msgstr "Ostatnia aktualizacja"
 
-#: libraries/Util.class.php:4269 templates/structure/row_stats_table.phtml:94
-#: templates/structure/table_header.phtml:117
+#: libraries/Util.class.php:4275
+#: templates/database/structure/table_header.phtml:117
+#: templates/table/structure/row_stats_table.phtml:94
 msgid "Last check"
 msgstr "Ostatnie sprawdzanie"
 
-#: libraries/Util.class.php:4315
+#: libraries/Util.class.php:4321
 msgid "Users"
 msgstr "Użytkownicy"
 
@@ -5032,16 +5046,16 @@ msgid "Use this value"
 msgstr "Użyj tej wartości"
 
 #: libraries/build_html_for_db.lib.php:33 libraries/import.lib.php:193
-#: templates/structure/actions_in_table_structure.phtml:113
-#: templates/structure/row_stats_table.phtml:42
-#: templates/structure/table_header.phtml:36
+#: templates/database/structure/table_header.phtml:36
+#: templates/table/structure/actions_in_table_structure.phtml:113
+#: templates/table/structure/row_stats_table.phtml:42
 msgid "Rows"
 msgstr "Rekordy"
 
 #: libraries/build_html_for_db.lib.php:48 libraries/engines/innodb.lib.php:171
-#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:186
-#: libraries/server_status.lib.php:298
-#: templates/structure/display_table_stats.phtml:40
+#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:195
+#: libraries/server_status.lib.php:307
+#: templates/table/structure/display_table_stats.phtml:40
 msgid "Total"
 msgstr "Ogółem"
 
@@ -5050,10 +5064,12 @@ msgid "Jump to database"
 msgstr "Przejdź do bazy danych"
 
 #: libraries/build_html_for_db.lib.php:146
+#: templates/database/structure/structure_table_row.phtml:15
 msgid "Not replicated"
 msgstr "Nie zreplikowane"
 
 #: libraries/build_html_for_db.lib.php:158
+#: templates/database/structure/structure_table_row.phtml:16
 msgid "Replicated"
 msgstr "Replikowane"
 
@@ -5106,17 +5122,17 @@ msgstr ""
 #: libraries/plugins/export/ExportTexytext.class.php:425
 #: libraries/plugins/export/PMA_ExportPdf.class.php:307
 #: libraries/rte/rte_list.lib.php:73 libraries/rte/rte_list.lib.php:85
-#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:830
-#: libraries/rte/rte_routines.lib.php:1492 setup/frames/index.inc.php:162
+#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:921
+#: libraries/rte/rte_routines.lib.php:1583 setup/frames/index.inc.php:162
 #: templates/columns_definitions/table_fields_definitions.phtml:8
-#: templates/structure/table_structure_header.phtml:5
-#: templates/table/create_table.phtml:11
+#: templates/database/create_table.phtml:11
+#: templates/table/structure/table_structure_header.phtml:5
 msgid "Name"
 msgstr "Nazwa"
 
 #: libraries/central_columns.lib.php:699
 #: libraries/central_columns.lib.php:1381
-#: libraries/rte/rte_routines.lib.php:832
+#: libraries/rte/rte_routines.lib.php:923
 #: templates/columns_definitions/table_fields_definitions.phtml:14
 msgid "Length/Values"
 msgstr "Długość/Wartości"
@@ -5137,7 +5153,7 @@ msgid "Select a table"
 msgstr "Wybierz tabele"
 
 #: libraries/central_columns.lib.php:804
-#: templates/structure/add_column.phtml:4
+#: templates/table/structure/add_column.phtml:4
 msgid "Add column"
 msgstr "Dodaj kolumnę"
 
@@ -5153,7 +5169,7 @@ msgstr "Dodaj nową kolumnę"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1002
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1025
 #: templates/columns_definitions/table_fields_definitions.phtml:36
-#: templates/structure/table_structure_header.phtml:8
+#: templates/table/structure/table_structure_header.phtml:8
 msgid "Attributes"
 msgstr "Atrybuty"
 
@@ -5267,7 +5283,7 @@ msgid "Double click"
 msgstr "Podwójnie kliknij"
 
 #: libraries/config.values.php:95 libraries/config.values.php:124
-#: libraries/config/FormDisplay.tpl.php:221 libraries/relation.lib.php:97
+#: libraries/config/FormDisplay.tpl.php:232 libraries/relation.lib.php:97
 #: libraries/relation.lib.php:105
 msgid "Disabled"
 msgstr "Wyłączone"
@@ -5447,21 +5463,21 @@ msgstr "Skompresowany eksport nie będzie działać z powodu braku funkcji %s."
 msgid "maximum %s"
 msgstr "maksimum %s"
 
-#: libraries/config/FormDisplay.tpl.php:219
+#: libraries/config/FormDisplay.tpl.php:230
 msgid "This setting is disabled, it will not be applied to your configuration."
 msgstr "To ustawienie jest wyłączone, nie będzie stosowane w konfiguracji."
 
-#: libraries/config/FormDisplay.tpl.php:313
+#: libraries/config/FormDisplay.tpl.php:324
 #, php-format
 msgid "Set value: %s"
 msgstr "Ustaw wartość: %s"
 
-#: libraries/config/FormDisplay.tpl.php:318
+#: libraries/config/FormDisplay.tpl.php:329
 #: libraries/config/messages.inc.php:610
 msgid "Restore default value"
 msgstr "Przywróć wartość domyślną"
 
-#: libraries/config/FormDisplay.tpl.php:332
+#: libraries/config/FormDisplay.tpl.php:343
 msgid "Allow users to customize this value"
 msgstr "Zezwól użytkownikom na zmianę tej wartości"
 
@@ -6012,7 +6028,7 @@ msgstr "Kodowanie znaków pliku"
 
 #: libraries/config/messages.inc.php:136 libraries/config/messages.inc.php:152
 #: libraries/sql_query_form.lib.php:247
-#: templates/structure/row_stats_table.phtml:7
+#: templates/table/structure/row_stats_table.phtml:7
 msgid "Format"
 msgstr "Format"
 
@@ -6552,7 +6568,7 @@ msgstr ""
 
 #: libraries/config/messages.inc.php:332
 #: libraries/plugins/export/ExportPdf.class.php:279
-#: templates/structure/secondary_tabs.phtml:8
+#: templates/table/secondary_tabs.phtml:8
 msgid "Table structure"
 msgstr "Struktura tabeli"
 
@@ -8460,106 +8476,35 @@ msgstr "Microsoft Word 2000"
 msgid "OpenDocument Text"
 msgstr "Otwórz dokument tekstowy"
 
-#: libraries/controllers/StructureController.class.php:465
+#: libraries/controllers/DatabaseStructureController.class.php:405
 #: tbl_operations.php:382
 #, php-format
 msgid "Table %s has been emptied."
 msgstr "Tabela %s została opróżniona."
 
-#: libraries/controllers/StructureController.class.php:486
+#: libraries/controllers/DatabaseStructureController.class.php:426
 #: tbl_operations.php:400 view_operations.php:119
 #, fuzzy, php-format
 #| msgid "View %s has been dropped."
 msgid "View %s has been dropped."
 msgstr "Widok %s został usunięty"
 
-#: libraries/controllers/StructureController.class.php:487
+#: libraries/controllers/DatabaseStructureController.class.php:427
 #: tbl_operations.php:401
 #, fuzzy, php-format
 #| msgid "Table %s has been dropped."
 msgid "Table %s has been dropped."
 msgstr "Tabela %s została usunięta"
 
-#: libraries/controllers/StructureController.class.php:797
-#, fuzzy, php-format
-#| msgid "The column name '%s' is a MySQL reserved keyword."
-msgid "The name '%s' is a MySQL reserved keyword."
-msgid_plural "The names '%s' are MySQL reserved keywords."
-msgstr[0] "Nazwa kolumny '%s' jest słowem kluczowym MySQL."
-msgstr[1] "Nazwa kolumny '%s' jest słowem kluczowym MySQL."
-msgstr[2] "Nazwa kolumny '%s' jest słowem kluczowym MySQL."
-
-#: libraries/controllers/StructureController.class.php:875
-msgid "No column selected."
-msgstr "Nie wybrano żadnej kolumny."
-
-#: libraries/controllers/StructureController.class.php:1049
+#: libraries/controllers/DatabaseStructureController.class.php:733
 msgid "Favorite List is full!"
 msgstr "Lista ulubionych jest pełna!"
 
-#: libraries/controllers/StructureController.class.php:1272
-msgid "The columns have been moved successfully."
-msgstr "Kolumny przeniesiono pomyślnie."
-
-#: libraries/controllers/StructureController.class.php:1535
-#, fuzzy, php-format
-#| msgid "Table %1$s has been altered successfully."
-msgid ""
-"Table %1$s has been altered successfully. Privileges have been adjusted."
-msgstr "Tabela %1$s została pomyślnie zmodyfikowana."
-
-#: libraries/controllers/StructureController.class.php:1541
-#: libraries/controllers/TableIndexesController.class.php:161
-#: tbl_addfield.php:92
-#, php-format
-msgid "Table %1$s has been altered successfully."
-msgstr "Tabela %1$s została pomyślnie zmodyfikowana."
-
-#: libraries/controllers/StructureController.class.php:1588
-#: libraries/tracking.lib.php:1094
-msgid "Query error"
-msgstr "Błąd zapytania"
-
-#: libraries/controllers/StructureController.class.php:1806
+#: libraries/controllers/DatabaseStructureController.class.php:947
 #: libraries/mysql_charsets.lib.php:366 libraries/mysql_charsets.lib.php:373
 msgid "unknown"
 msgstr "nieznany"
 
-#: libraries/controllers/StructureController.class.php:1957
-#: templates/structure/check_all_table_column.phtml:11
-msgid "Change"
-msgstr "Zmień"
-
-#: libraries/controllers/StructureController.class.php:1961
-#: libraries/controllers/StructureController.class.php:1966
-#: libraries/navigation/Nodes/Node_Index.class.php:30
-#: libraries/tracking.lib.php:926
-#: templates/columns_definitions/column_indexes.phtml:16
-#: templates/columns_definitions/table_fields_definitions.phtml:57
-#: templates/structure/check_all_table_column.phtml:30
-#: templates/structure/display_structure.phtml:79
-#: templates/structure/display_table_stats.phtml:19
-msgid "Index"
-msgstr "Indeks"
-
-#: libraries/controllers/StructureController.class.php:1963
-#: libraries/controllers/StructureController.class.php:1968
-#: templates/columns_definitions/column_indexes.phtml:27
-#: templates/structure/check_all_table_column.phtml:37
-msgid "Spatial"
-msgstr "Przestrzenny"
-
-#: libraries/controllers/StructureController.class.php:1964
-#: libraries/controllers/StructureController.class.php:1969
-#: templates/columns_definitions/column_indexes.phtml:22
-#: templates/structure/check_all_table_column.phtml:47
-msgid "Fulltext"
-msgstr "Pełny tekst"
-
-#: libraries/controllers/StructureController.class.php:1970
-msgid "Distinct values"
-msgstr "Różne wartości"
-
 #: libraries/controllers/TableChartController.class.php:82
 #: libraries/controllers/TableGisVisualizationController.class.php:101
 msgid "No SQL query was set to fetch data."
@@ -8573,13 +8518,20 @@ msgstr "Kolumny liczbowe nie występujących w tabeli wykreślić."
 msgid "No data to display"
 msgstr "Brak danych do wyświetlenia"
 
-#: libraries/controllers/TableRelationController.class.php:217
+#: libraries/controllers/TableIndexesController.class.php:161
+#: libraries/controllers/TableStructureController.class.php:736
+#: tbl_addfield.php:92
+#, php-format
+msgid "Table %1$s has been altered successfully."
+msgstr "Tabela %1$s została pomyślnie zmodyfikowana."
+
+#: libraries/controllers/TableRelationController.class.php:218
 #, fuzzy
 #| msgid "Thread %s was successfully killed."
 msgid "Display column was successfully updated."
 msgstr "Wątek %s został pomyślnie zabity."
 
-#: libraries/controllers/TableRelationController.class.php:283
+#: libraries/controllers/TableRelationController.class.php:288
 #, fuzzy
 #| msgid "Internal relation has been added."
 msgid "Internal relations were successfully updated."
@@ -8598,12 +8550,76 @@ msgid "Zoom search"
 msgstr "Powiększ szukanie"
 
 #: libraries/controllers/TableSearchController.class.php:852
-#: templates/table/selection_form.phtml:59
+#: templates/table/search/selection_form.phtml:59
 #, fuzzy
 #| msgid "Find and Replace"
 msgid "Find and replace"
 msgstr "Znajdź i zamień"
 
+#: libraries/controllers/TableStructureController.class.php:163
+#, fuzzy, php-format
+#| msgid "The column name '%s' is a MySQL reserved keyword."
+msgid "The name '%s' is a MySQL reserved keyword."
+msgid_plural "The names '%s' are MySQL reserved keywords."
+msgstr[0] "Nazwa kolumny '%s' jest słowem kluczowym MySQL."
+msgstr[1] "Nazwa kolumny '%s' jest słowem kluczowym MySQL."
+msgstr[2] "Nazwa kolumny '%s' jest słowem kluczowym MySQL."
+
+#: libraries/controllers/TableStructureController.class.php:241
+msgid "No column selected."
+msgstr "Nie wybrano żadnej kolumny."
+
+#: libraries/controllers/TableStructureController.class.php:467
+msgid "The columns have been moved successfully."
+msgstr "Kolumny przeniesiono pomyślnie."
+
+#: libraries/controllers/TableStructureController.class.php:730
+#, fuzzy, php-format
+#| msgid "Table %1$s has been altered successfully."
+msgid ""
+"Table %1$s has been altered successfully. Privileges have been adjusted."
+msgstr "Tabela %1$s została pomyślnie zmodyfikowana."
+
+#: libraries/controllers/TableStructureController.class.php:783
+#: libraries/tracking.lib.php:1094
+msgid "Query error"
+msgstr "Błąd zapytania"
+
+#: libraries/controllers/TableStructureController.class.php:948
+#: templates/table/structure/check_all_table_column.phtml:11
+msgid "Change"
+msgstr "Zmień"
+
+#: libraries/controllers/TableStructureController.class.php:952
+#: libraries/controllers/TableStructureController.class.php:957
+#: libraries/navigation/Nodes/Node_Index.class.php:30
+#: libraries/tracking.lib.php:926
+#: templates/columns_definitions/column_indexes.phtml:16
+#: templates/columns_definitions/table_fields_definitions.phtml:57
+#: templates/table/structure/check_all_table_column.phtml:30
+#: templates/table/structure/display_structure.phtml:79
+#: templates/table/structure/display_table_stats.phtml:19
+msgid "Index"
+msgstr "Indeks"
+
+#: libraries/controllers/TableStructureController.class.php:954
+#: libraries/controllers/TableStructureController.class.php:959
+#: templates/columns_definitions/column_indexes.phtml:27
+#: templates/table/structure/check_all_table_column.phtml:37
+msgid "Spatial"
+msgstr "Przestrzenny"
+
+#: libraries/controllers/TableStructureController.class.php:955
+#: libraries/controllers/TableStructureController.class.php:960
+#: templates/columns_definitions/column_indexes.phtml:22
+#: templates/table/structure/check_all_table_column.phtml:47
+msgid "Fulltext"
+msgstr "Pełny tekst"
+
+#: libraries/controllers/TableStructureController.class.php:963
+msgid "Distinct values"
+msgstr "Różne wartości"
+
 #: libraries/core.lib.php:306
 #, php-format
 msgid "The %s extension is missing. Please check your PHP configuration."
@@ -8652,7 +8668,7 @@ msgid "No Password"
 msgstr "Brak hasła"
 
 #: libraries/display_change_password.lib.php:68
-#: libraries/plugins/auth/AuthenticationCookie.class.php:199
+#: libraries/plugins/auth/AuthenticationCookie.class.php:187
 #: libraries/replication_gui.lib.php:422 libraries/replication_gui.lib.php:862
 #: libraries/server_privileges.lib.php:1640
 msgid "Password:"
@@ -9481,12 +9497,12 @@ msgid "Dump has been saved to file %s."
 msgstr "Zrzut został zapisany do pliku %s."
 
 #: libraries/import.lib.php:202 libraries/insert_edit.lib.php:124
-#: libraries/rte/rte_routines.lib.php:1353 libraries/sql.lib.php:1312
+#: libraries/rte/rte_routines.lib.php:1444 libraries/sql.lib.php:1306
 #: tbl_get_field.php:44
 msgid "MySQL returned an empty result set (i.e. zero rows)."
 msgstr "MySQL zwrócił pusty wynik (zero wierszy)."
 
-#: libraries/import.lib.php:265 libraries/sql.lib.php:1326
+#: libraries/import.lib.php:265 libraries/sql.lib.php:1320
 msgid "[ROLLBACK occurred.]"
 msgstr ""
 
@@ -9556,14 +9572,14 @@ msgstr "Utwórz indeks na kolumnach %s"
 
 #: libraries/insert_edit.lib.php:233
 #: libraries/navigation/Nodes/Node_DatabaseChild.class.php:48
-#: templates/designer/table_list.phtml:40
+#: templates/database/designer/table_list.phtml:40
 msgid "Hide"
 msgstr "Ukryj"
 
 #: libraries/insert_edit.lib.php:249
 #: libraries/navigation/Nodes/Node_Function.class.php:32
-#: libraries/rte/rte_routines.lib.php:1495
-#: templates/table/table_header.phtml:4
+#: libraries/rte/rte_routines.lib.php:1586
+#: templates/table/search/table_header.phtml:4
 msgid "Function"
 msgstr "Funkcja"
 
@@ -9578,84 +9594,85 @@ msgstr "Binarne"
 msgid "Because of its length,<br /> this column might not be editable."
 msgstr "Ze względu na jego długość, <br /> kolumna ta może nie być edytowalne"
 
-#: libraries/insert_edit.lib.php:1050
+#: libraries/insert_edit.lib.php:1048
 msgid "Binary - do not edit"
 msgstr "Binarne - nie do edycji"
 
-#: libraries/insert_edit.lib.php:1176 libraries/server_privileges.lib.php:470
-#: templates/table/options.phtml:36
+#: libraries/insert_edit.lib.php:1174 libraries/server_privileges.lib.php:470
+#: templates/table/search/options.phtml:36
 msgid "Or"
 msgstr "Lub"
 
-#: libraries/insert_edit.lib.php:1177
+#: libraries/insert_edit.lib.php:1175
 msgid "web server upload directory:"
 msgstr "katalog przesyłania serwera web:"
 
-#: libraries/insert_edit.lib.php:1348 templates/table/input_box.phtml:49
+#: libraries/insert_edit.lib.php:1346
+#: templates/table/search/input_box.phtml:49
 msgid "Edit/Insert"
 msgstr "Edycja/Wstaw"
 
-#: libraries/insert_edit.lib.php:1398
+#: libraries/insert_edit.lib.php:1396
 #, php-format
 msgid "Continue insertion with %s rows"
 msgstr "Kontynuuj wstawianie %s wierszy"
 
-#: libraries/insert_edit.lib.php:1428
+#: libraries/insert_edit.lib.php:1426
 msgid "and then"
 msgstr "i potem"
 
-#: libraries/insert_edit.lib.php:1461
+#: libraries/insert_edit.lib.php:1459
 msgid "Insert as new row"
 msgstr "Wstaw jako nowy wiersz"
 
-#: libraries/insert_edit.lib.php:1464
+#: libraries/insert_edit.lib.php:1462
 msgid "Insert as new row and ignore errors"
 msgstr "Wstaw jko nowy wiersz i ignoruj błędy"
 
-#: libraries/insert_edit.lib.php:1467
+#: libraries/insert_edit.lib.php:1465
 msgid "Show insert query"
 msgstr "Pokaż wstawiane zapytanie"
 
-#: libraries/insert_edit.lib.php:1487
+#: libraries/insert_edit.lib.php:1485
 msgid "Go back to previous page"
 msgstr "Wróć"
 
-#: libraries/insert_edit.lib.php:1490
+#: libraries/insert_edit.lib.php:1488
 msgid "Insert another new row"
 msgstr "Wstaw nowy wiersz"
 
-#: libraries/insert_edit.lib.php:1495
+#: libraries/insert_edit.lib.php:1493
 msgid "Go back to this page"
 msgstr "Powrót do tej strony"
 
-#: libraries/insert_edit.lib.php:1518
+#: libraries/insert_edit.lib.php:1516
 msgid "Edit next row"
 msgstr "Edytuj następny wiersz"
 
-#: libraries/insert_edit.lib.php:1540
+#: libraries/insert_edit.lib.php:1538
 msgid ""
 "Use TAB key to move from value to value, or CTRL+arrows to move anywhere"
 msgstr ""
 "Użyj TAB, aby przejść z wartości do wartości, lub CTRL+strzałki do "
 "poruszania się w dowolnym miejscu"
 
-#: libraries/insert_edit.lib.php:1577 libraries/replication_gui.lib.php:542
-#: libraries/rte/rte_routines.lib.php:1497
+#: libraries/insert_edit.lib.php:1575 libraries/replication_gui.lib.php:542
+#: libraries/rte/rte_routines.lib.php:1588
 #: libraries/server_status_variables.lib.php:220
-#: templates/designer/having_query_panel.phtml:100
-#: templates/designer/options_panel.phtml:73
-#: templates/designer/options_panel.phtml:239
-#: templates/designer/where_query_panel.phtml:69
-#: templates/table/table_header.phtml:10
-#: templates/table/zoom_result_form.phtml:35
+#: templates/database/designer/having_query_panel.phtml:100
+#: templates/database/designer/options_panel.phtml:73
+#: templates/database/designer/options_panel.phtml:239
+#: templates/database/designer/where_query_panel.phtml:69
+#: templates/table/search/table_header.phtml:10
+#: templates/table/search/zoom_result_form.phtml:35
 msgid "Value"
 msgstr "Wartość"
 
-#: libraries/insert_edit.lib.php:1937 libraries/sql.lib.php:1309
+#: libraries/insert_edit.lib.php:1935 libraries/sql.lib.php:1303
 msgid "Showing SQL query"
 msgstr "Wyświetl zapytanie SQL"
 
-#: libraries/insert_edit.lib.php:1962 libraries/sql.lib.php:1287
+#: libraries/insert_edit.lib.php:1960 libraries/sql.lib.php:1281
 #, php-format
 msgid "Inserted row id: %1$d"
 msgstr "Id wstawionego wiersza: %1$d"
@@ -10081,7 +10098,7 @@ msgstr "Nowy"
 #: libraries/navigation/Nodes/Node_View_Container.class.php:26
 #: libraries/navigation/Nodes/Node_View_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:129
-#: templates/structure/show_create.phtml:30
+#: templates/database/structure/show_create.phtml:30
 msgid "Views"
 msgstr "Widoki"
 
@@ -10393,7 +10410,7 @@ msgstr "Nie masz wystarczających uprawnień, aby być tu i teraz!"
 
 #: libraries/operations.lib.php:101 libraries/operations.lib.php:249
 #: libraries/operations.lib.php:869 libraries/operations.lib.php:963
-#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:907
+#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:998
 #: templates/columns_definitions/table_fields_definitions.phtml:47
 #, fuzzy
 #| msgid "Edit Privileges"
@@ -10485,22 +10502,22 @@ msgid "Switch to copied table"
 msgstr "Przełącz na przekopiowaną tabelę"
 
 #: libraries/operations.lib.php:1360
-#: templates/structure/check_all_tables.phtml:18
+#: templates/database/structure/check_all_tables.phtml:18
 msgid "Table maintenance"
 msgstr "Zarządzanie tabelą"
 
 #: libraries/operations.lib.php:1398
-#: templates/structure/check_all_tables.phtml:19
+#: templates/database/structure/check_all_tables.phtml:19
 msgid "Analyze table"
 msgstr "Analizuj tabelę"
 
 #: libraries/operations.lib.php:1413
-#: templates/structure/check_all_tables.phtml:20
+#: templates/database/structure/check_all_tables.phtml:20
 msgid "Check table"
 msgstr "Sprawdź tabelę"
 
 #: libraries/operations.lib.php:1428
-#: templates/structure/check_all_tables.phtml:22
+#: templates/database/structure/check_all_tables.phtml:22
 #, fuzzy
 #| msgid "Check table"
 msgid "Checksum table"
@@ -10520,18 +10537,19 @@ msgid "Flush the table (FLUSH)"
 msgstr ""
 
 #: libraries/operations.lib.php:1477
-#: templates/structure/check_all_tables.phtml:23
-#: templates/structure/display_table_stats.phtml:56
+#: templates/database/structure/check_all_tables.phtml:23
+#: templates/table/structure/display_table_stats.phtml:56
 msgid "Optimize table"
 msgstr "Optymalizuj tabelę"
 
 #: libraries/operations.lib.php:1492
-#: templates/structure/check_all_tables.phtml:24
+#: templates/database/structure/check_all_tables.phtml:24
 msgid "Repair table"
 msgstr "Napraw tabelę"
 
 #: libraries/operations.lib.php:1538
-#: templates/structure/check_all_tables.phtml:14 view_operations.php:127
+#: templates/database/structure/check_all_tables.phtml:14
+#: view_operations.php:127
 msgid "Delete data or table"
 msgstr "Usuń dane lub tabelę"
 
@@ -10658,7 +10676,7 @@ msgid "Cannot connect: invalid settings."
 msgstr "Nie udało się nawiązać połączenia: błędne ustawienia."
 
 #: libraries/plugins/auth/AuthenticationConfig.class.php:108
-#: libraries/plugins/auth/AuthenticationCookie.class.php:134
+#: libraries/plugins/auth/AuthenticationCookie.class.php:122
 #: libraries/plugins/auth/AuthenticationHttp.class.php:96
 #, php-format
 msgid "Welcome to %s"
@@ -10689,36 +10707,36 @@ msgstr ""
 msgid "Retry to connect"
 msgstr "Ponów podłączenie"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:146
+#: libraries/plugins/auth/AuthenticationCookie.class.php:134
 msgid "Your session has expired. Please log in again."
 msgstr "Twoja sesja wygasła. Zaloguj się ponownie."
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:170
+#: libraries/plugins/auth/AuthenticationCookie.class.php:158
 msgid "Log in"
 msgstr "Login"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:178
-#: libraries/plugins/auth/AuthenticationCookie.class.php:188
+#: libraries/plugins/auth/AuthenticationCookie.class.php:166
+#: libraries/plugins/auth/AuthenticationCookie.class.php:176
 msgid "You can enter hostname/IP address and port separated by space."
 msgstr "Możesz wprowadzić nazwę hosta/adres IP i port oddzielając spacją."
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:193
+#: libraries/plugins/auth/AuthenticationCookie.class.php:181
 msgid "Username:"
 msgstr "Użytkownik:"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:205
+#: libraries/plugins/auth/AuthenticationCookie.class.php:193
 msgid "Server Choice:"
 msgstr "Wybór serwera:"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:386
+#: libraries/plugins/auth/AuthenticationCookie.class.php:374
 msgid "Entered captcha is wrong, try again!"
 msgstr "Wprowadzona captcha jest niewłaściwa, spróbuj ponownie!"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:396
+#: libraries/plugins/auth/AuthenticationCookie.class.php:384
 msgid "Please enter correct captcha!"
 msgstr "Proszę podać poprawną captcha!"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:423
+#: libraries/plugins/auth/AuthenticationCookie.class.php:411
 #, fuzzy
 #| msgid "Cannot log in to the MySQL server"
 msgid "You are not allowed to log in to this MySQL server!"
@@ -10816,7 +10834,7 @@ msgstr "Zdarzenie"
 #: libraries/plugins/export/ExportOdt.class.php:593
 #: libraries/plugins/export/ExportTexytext.class.php:428
 #: libraries/plugins/export/PMA_ExportPdf.class.php:313
-#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:984
 #: libraries/rte/rte_triggers.lib.php:377
 msgid "Definition"
 msgstr "Określenie"
@@ -11152,7 +11170,7 @@ msgid "Last check:"
 msgstr "Ostatnie sprawdzanie:"
 
 #: libraries/plugins/export/ExportSql.class.php:1399
-#: templates/structure/structure_table_row.phtml:183
+#: templates/database/structure/structure_table_row.phtml:183
 msgid "in use"
 msgstr "w użyciu"
 
@@ -11353,20 +11371,14 @@ msgstr "MySQL Spatial Extension nie obsługuje typu ESRI \"%s\"."
 msgid "The imported file does not contain any data!"
 msgstr "Importowany plik nie zawiera żadnych danych!"
 
-#: libraries/plugins/import/ImportSql.class.php:169
+#: libraries/plugins/import/ImportSql.class.php:72
 msgid "SQL compatibility mode:"
 msgstr "Tryb zgodności SQL:"
 
-#: libraries/plugins/import/ImportSql.class.php:181
+#: libraries/plugins/import/ImportSql.class.php:84
 msgid "Do not use <code>AUTO_INCREMENT</code> for zero values"
 msgstr "Nie używaj <code>AUTO_INCREMENT</code> dla wartości zerowych"
 
-#: libraries/plugins/import/ImportSql.class.php:195
-#, fuzzy
-#| msgid "Read misses"
-msgid "Read as multibytes"
-msgstr "Pominięty odczyt"
-
 #: libraries/plugins/import/ImportXml.class.php:54
 msgid "XML"
 msgstr "XML"
@@ -11409,7 +11421,7 @@ msgid "Show grid"
 msgstr "Pokaż siatkę"
 
 #: libraries/plugins/schema/SchemaPdf.class.php:94
-#: templates/structure/print_view_data_dictionary_link.phtml:6
+#: templates/database/structure/print_view_data_dictionary_link.phtml:6
 msgid "Data Dictionary"
 msgstr "Słownik danych"
 
@@ -11440,7 +11452,7 @@ msgid "The %s table doesn't exist!"
 msgstr "Tabela '%s' nie istnieje!"
 
 #: libraries/plugins/schema/eps/Eps_Relation_Schema.class.php:321
-#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:309
+#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:323
 #, php-format
 msgid "Schema of the %s database - Page %s"
 msgstr "Schemat bazy danych %s - Strona %s"
@@ -11469,7 +11481,7 @@ msgstr "Spis treści"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1005
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1028
 #: libraries/tracking.lib.php:884
-#: templates/structure/table_structure_header.phtml:11
+#: templates/table/structure/table_structure_header.phtml:11
 msgid "Extra"
 msgstr "Dodatkowo"
 
@@ -11877,11 +11889,11 @@ msgid "Create the needed tables with the <code>%screate_tables.sql</code>."
 msgstr ""
 "Utwórz wymagane tabele używając <code>examples/create_tables.sql</code>."
 
-#: libraries/relation.lib.php:360
+#: libraries/relation.lib.php:357
 msgid "Create a pma user and give access to these tables."
 msgstr "Utwórz użytkownika pma i nadaj mu prawa do tych tabel."
 
-#: libraries/relation.lib.php:365
+#: libraries/relation.lib.php:360
 msgid ""
 "Enable advanced features in configuration file (<code>config.inc.php</"
 "code>), for example by starting from <code>config.sample.inc.php</code>."
@@ -11889,24 +11901,24 @@ msgstr ""
 "Włącz zaawansowane funkcje w pliku konfiguracyjnym (<code>config.inc.php</"
 "code>), na przykład zaczynając od <code>config.sample.inc.php</code>."
 
-#: libraries/relation.lib.php:373
+#: libraries/relation.lib.php:365
 msgid "Re-login to phpMyAdmin to load the updated configuration file."
 msgstr ""
 "Zaloguj się ponownie do phpMyAdmin, żeby załadować zmieniony plik "
 "konfiguracyjny."
 
-#: libraries/relation.lib.php:1612
+#: libraries/relation.lib.php:1607
 msgid "no description"
 msgstr "brak opisu"
 
-#: libraries/relation.lib.php:1811
+#: libraries/relation.lib.php:1806
 msgid ""
 "You do not have necessary privileges to create a database named "
 "'phpmyadmin'. You may go to 'Operations' tab of any database to set up the "
 "phpMyAdmin configuration storage there."
 msgstr ""
 
-#: libraries/relation.lib.php:1928
+#: libraries/relation.lib.php:1923
 #, fuzzy, php-format
 #| msgid "Missing phpMyAdmin configuration storage tables"
 msgid ""
@@ -11914,21 +11926,21 @@ msgid ""
 "configuration storage there."
 msgstr "Brakuje tabel przechowujących konfigurację phpMyAdmin"
 
-#: libraries/relation.lib.php:1936
+#: libraries/relation.lib.php:1931
 #, fuzzy, php-format
 #| msgid "Missing phpMyAdmin configuration storage tables"
 msgid ""
 "%sCreate%s the phpMyAdmin configuration storage in the current database."
 msgstr "Brakuje tabel przechowujących konfigurację phpMyAdmin"
 
-#: libraries/relation.lib.php:1944
+#: libraries/relation.lib.php:1939
 #, fuzzy, php-format
 #| msgid "Missing phpMyAdmin configuration storage tables"
 msgid "%sCreate%s missing phpMyAdmin configuration storage tables."
 msgstr "Brakuje tabel przechowujących konfigurację phpMyAdmin"
 
 #: libraries/replication_gui.lib.php:46 libraries/replication_gui.lib.php:343
-#: libraries/server_databases.lib.php:387
+#: libraries/server_databases.lib.php:398
 msgid "Master replication"
 msgstr "Replikacja serwera głównego"
 
@@ -11999,7 +12011,7 @@ msgstr ""
 "komunikat informujący, że serwer <b>jest</b> skonfigurowany jako główny."
 
 #: libraries/replication_gui.lib.php:141
-#: libraries/server_databases.lib.php:389
+#: libraries/server_databases.lib.php:400
 msgid "Slave replication"
 msgstr "Replikacja serwera podrzędnego"
 
@@ -12291,10 +12303,10 @@ msgid "Master server changed successfully to %s."
 msgstr "Serwer główny zmieniony pomyślnie na %s"
 
 #: libraries/rte/rte_events.lib.php:106 libraries/rte/rte_events.lib.php:115
-#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:149
-#: libraries/rte/rte_routines.lib.php:158
-#: libraries/rte/rte_routines.lib.php:231
-#: libraries/rte/rte_routines.lib.php:1362
+#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:219
+#: libraries/rte/rte_routines.lib.php:246
+#: libraries/rte/rte_routines.lib.php:368
+#: libraries/rte/rte_routines.lib.php:1453
 #: libraries/rte/rte_triggers.lib.php:82 libraries/rte/rte_triggers.lib.php:91
 #: libraries/rte/rte_triggers.lib.php:123
 #, php-format
@@ -12315,7 +12327,7 @@ msgstr "Zdarzenie %1$s zostało zmodyfikowane."
 msgid "Event %1$s has been created."
 msgstr "Zdarzenie %1$s zostało utworzone."
 
-#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:251
+#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:266
 #: libraries/rte/rte_triggers.lib.php:144
 msgid "One or more errors have occurred while processing your request:"
 msgstr "Jeden lub więcej błędów miały miejsce podczas przetwarzania żądania:"
@@ -12324,7 +12336,7 @@ msgstr "Jeden lub więcej błędów miały miejsce podczas przetwarzania żądan
 msgid "Edit event"
 msgstr "Edytuj wydarzenie"
 
-#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:794
+#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:885
 #: libraries/rte/rte_triggers.lib.php:323 view_create.php:180
 msgid "Details"
 msgstr "Szczegóły"
@@ -12337,7 +12349,7 @@ msgstr "Nazwa zdarzenia"
 msgid "Event type"
 msgstr "Typ zdarzenia"
 
-#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:817
+#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:908
 #, php-format
 msgid "Change to %s"
 msgstr "Zmień na %s"
@@ -12364,12 +12376,14 @@ msgstr "Koniec"
 msgid "On completion preserve"
 msgstr "Po zakończeniu zachować"
 
-#: libraries/rte/rte_events.lib.php:491 libraries/rte/rte_routines.lib.php:930
+#: libraries/rte/rte_events.lib.php:491
+#: libraries/rte/rte_routines.lib.php:1021
 #: libraries/rte/rte_triggers.lib.php:383 view_create.php:209
 msgid "Definer"
 msgstr "Definiujący"
 
-#: libraries/rte/rte_events.lib.php:535 libraries/rte/rte_routines.lib.php:997
+#: libraries/rte/rte_events.lib.php:535
+#: libraries/rte/rte_routines.lib.php:1088
 #: libraries/rte/rte_triggers.lib.php:422
 #, fuzzy
 #| msgid "The definer must be in the \"username@hostname\" format"
@@ -12397,9 +12411,9 @@ msgid "You must provide an event definition."
 msgstr "Należy podać definicję zdarzeń."
 
 #: libraries/rte/rte_export.lib.php:43 libraries/rte/rte_general.lib.php:72
-#: libraries/rte/rte_routines.lib.php:345
-#: libraries/rte/rte_routines.lib.php:1198
-#: libraries/rte/rte_routines.lib.php:1411
+#: libraries/rte/rte_routines.lib.php:153
+#: libraries/rte/rte_routines.lib.php:1289
+#: libraries/rte/rte_routines.lib.php:1502
 msgid "Error in processing request:"
 msgstr "Błąd na żądanie przetwarzania:"
 
@@ -12435,97 +12449,97 @@ msgstr ""
 "procedur może się nie udać![/strong] Proszę skorzystać z nowszego "
 "rozszerzenia 'mysqli', aby uniknąć problemów."
 
-#: libraries/rte/rte_routines.lib.php:110
-#: libraries/rte/rte_routines.lib.php:1006
+#: libraries/rte/rte_routines.lib.php:123
+msgid "Edit routine"
+msgstr "Edycja procedury"
+
+#: libraries/rte/rte_routines.lib.php:200
+#: libraries/rte/rte_routines.lib.php:1097
 #, php-format
 msgid "Invalid routine type: \"%s\""
 msgstr "Nieprawidłowy typ procedury: %s"
 
-#: libraries/rte/rte_routines.lib.php:170
+#: libraries/rte/rte_routines.lib.php:253
+#, php-format
+msgid "Routine %1$s has been created."
+msgstr "Tabela %1$s została utworzona."
+
+#: libraries/rte/rte_routines.lib.php:380
 msgid "Sorry, we failed to restore the dropped routine."
 msgstr "Przepraszamy, nie udało nam się przywrócić upuszczony procedury."
 
-#: libraries/rte/rte_routines.lib.php:211
+#: libraries/rte/rte_routines.lib.php:439
 #, fuzzy, php-format
 #| msgid "Routine %1$s has been modified."
 msgid "Routine %1$s has been modified. Privileges have been adjusted."
 msgstr "Kolumna %1$s została zmodyfikowana."
 
-#: libraries/rte/rte_routines.lib.php:216
+#: libraries/rte/rte_routines.lib.php:444
 #, php-format
 msgid "Routine %1$s has been modified."
 msgstr "Kolumna %1$s została zmodyfikowana."
 
-#: libraries/rte/rte_routines.lib.php:238
-#, php-format
-msgid "Routine %1$s has been created."
-msgstr "Tabela %1$s została utworzona."
-
-#: libraries/rte/rte_routines.lib.php:315
-msgid "Edit routine"
-msgstr "Edycja procedury"
-
-#: libraries/rte/rte_routines.lib.php:797
+#: libraries/rte/rte_routines.lib.php:888
 msgid "Routine name"
 msgstr "Nazwa procedury"
 
-#: libraries/rte/rte_routines.lib.php:823
+#: libraries/rte/rte_routines.lib.php:914
 msgid "Parameters"
 msgstr "Parametry"
 
-#: libraries/rte/rte_routines.lib.php:829
+#: libraries/rte/rte_routines.lib.php:920
 msgid "Direction"
 msgstr "Kierunek"
 
-#: libraries/rte/rte_routines.lib.php:847
+#: libraries/rte/rte_routines.lib.php:938
 msgid "Add parameter"
 msgstr "Dodaj parametr"
 
-#: libraries/rte/rte_routines.lib.php:851
+#: libraries/rte/rte_routines.lib.php:942
 msgid "Remove last parameter"
 msgstr "Usuń ostatni parametr"
 
-#: libraries/rte/rte_routines.lib.php:856
+#: libraries/rte/rte_routines.lib.php:947
 msgid "Return type"
 msgstr "Zwracany typ"
 
-#: libraries/rte/rte_routines.lib.php:862
+#: libraries/rte/rte_routines.lib.php:953
 msgid "Return length/values"
 msgstr "Powrót długości/wartości"
 
-#: libraries/rte/rte_routines.lib.php:868
+#: libraries/rte/rte_routines.lib.php:959
 msgid "Return options"
 msgstr "Powrót opcji"
 
-#: libraries/rte/rte_routines.lib.php:899
+#: libraries/rte/rte_routines.lib.php:990
 msgid "Is deterministic"
 msgstr "Jest deterministyczna"
 
-#: libraries/rte/rte_routines.lib.php:920
+#: libraries/rte/rte_routines.lib.php:1011
 msgid ""
 "You do not have sufficient privileges to perform this operation; Please "
 "refer to the documentation for more details"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:935
+#: libraries/rte/rte_routines.lib.php:1026
 msgid "Security type"
 msgstr "Rodzaj zabezpieczenia"
 
-#: libraries/rte/rte_routines.lib.php:944
+#: libraries/rte/rte_routines.lib.php:1035
 msgid "SQL data access"
 msgstr "Dostęp SQL do danych"
 
-#: libraries/rte/rte_routines.lib.php:1013
+#: libraries/rte/rte_routines.lib.php:1104
 msgid "You must provide a routine name!"
 msgstr "Musisz podać rutynowe nazwę!"
 
-#: libraries/rte/rte_routines.lib.php:1047
+#: libraries/rte/rte_routines.lib.php:1138
 #, php-format
 msgid "Invalid direction \"%s\" given for parameter."
 msgstr "Nieprawidłowy kierunek \"%s\" podany dla parametru."
 
-#: libraries/rte/rte_routines.lib.php:1069
-#: libraries/rte/rte_routines.lib.php:1131
+#: libraries/rte/rte_routines.lib.php:1160
+#: libraries/rte/rte_routines.lib.php:1222
 msgid ""
 "You must provide length/values for routine parameters of type ENUM, SET, "
 "VARCHAR and VARBINARY."
@@ -12533,24 +12547,24 @@ msgstr ""
 "Należy podać długość/wartość parametrów procedury typu ENUM, SET, VARCHAR i "
 "VARBINARY."
 
-#: libraries/rte/rte_routines.lib.php:1095
+#: libraries/rte/rte_routines.lib.php:1186
 msgid "You must provide a name and a type for each routine parameter."
 msgstr "Należy podać nazwę i typ dla każdego parametru procedury."
 
-#: libraries/rte/rte_routines.lib.php:1114
+#: libraries/rte/rte_routines.lib.php:1205
 msgid "You must provide a valid return type for the routine."
 msgstr "Musisz podać poprawny typ wartości zwracanej do procedury."
 
-#: libraries/rte/rte_routines.lib.php:1174
+#: libraries/rte/rte_routines.lib.php:1265
 msgid "You must provide a routine definition."
 msgstr "Należy podać definicję procedury."
 
-#: libraries/rte/rte_routines.lib.php:1285
+#: libraries/rte/rte_routines.lib.php:1376
 #, php-format
 msgid "Execution results of routine %s"
 msgstr "Wynik wykonanych procedur %s"
 
-#: libraries/rte/rte_routines.lib.php:1340
+#: libraries/rte/rte_routines.lib.php:1431
 #, fuzzy, php-format
 #| msgid "%d row affected by the last statement inside the procedure"
 #| msgid_plural "%d rows affected by the last statement inside the procedure"
@@ -12560,13 +12574,13 @@ msgstr[0] "%d wiersz dotyczy ostatniego sprawozdania wewnątrz procedury"
 msgstr[1] "%d wierszy dotyczy ostatniego sprawozdania wewnątrz procedury"
 msgstr[2] "%d wierszy dotyczy ostatniego sprawozdania wewnątrz procedury"
 
-#: libraries/rte/rte_routines.lib.php:1398
-#: libraries/rte/rte_routines.lib.php:1406
+#: libraries/rte/rte_routines.lib.php:1489
+#: libraries/rte/rte_routines.lib.php:1497
 msgid "Execute routine"
 msgstr "Wykonaj procedurę"
 
-#: libraries/rte/rte_routines.lib.php:1485
-#: libraries/rte/rte_routines.lib.php:1488
+#: libraries/rte/rte_routines.lib.php:1576
+#: libraries/rte/rte_routines.lib.php:1579
 msgid "Routine parameters"
 msgstr "Parametry procedury"
 
@@ -12726,7 +12740,7 @@ msgid "Original position"
 msgstr "Oryginalna pozycja"
 
 #: libraries/server_bin_log.lib.php:133
-#: templates/structure/display_table_stats.phtml:4
+#: templates/table/structure/display_table_stats.phtml:4
 msgid "Information"
 msgstr "Informacje"
 
@@ -12764,12 +12778,12 @@ msgstr ""
 "Uwaga: Włączenie statystyk baz danych może spowodować duży ruch pomiędzy "
 "serwerem WWW a serwerem MySQL."
 
-#: libraries/server_databases.lib.php:364
-#: libraries/server_databases.lib.php:365
+#: libraries/server_databases.lib.php:366
+#: libraries/server_databases.lib.php:371
 msgid "Enable Statistics"
 msgstr "Włącz statystyki"
 
-#: libraries/server_databases.lib.php:481
+#: libraries/server_databases.lib.php:492
 #, php-format
 msgid "%1$d database has been dropped successfully."
 msgid_plural "%1$d databases have been dropped successfully."
@@ -13153,7 +13167,7 @@ msgid "You have revoked the privileges for %s."
 msgstr "Masz cofnięte uprawnienia dla %s."
 
 #: libraries/server_privileges.lib.php:2059
-#: libraries/server_privileges.lib.php:4290
+#: libraries/server_privileges.lib.php:4316
 #, fuzzy
 #| msgid "Add user group"
 msgid "Add user account"
@@ -13335,59 +13349,59 @@ msgstr "Usuwanie %s"
 msgid "The privileges were reloaded successfully."
 msgstr "Uprawnienia były przeładowane pomyślnie."
 
-#: libraries/server_privileges.lib.php:3994
+#: libraries/server_privileges.lib.php:4003
 #, php-format
 msgid "The user %s already exists!"
 msgstr "Użytkownik %s już istnieje!"
 
-#: libraries/server_privileges.lib.php:4232
+#: libraries/server_privileges.lib.php:4258
 #, php-format
 msgid "Privileges for %s"
 msgstr "Uprawnienia dla %s"
 
-#: libraries/server_privileges.lib.php:4241
+#: libraries/server_privileges.lib.php:4267
 #: libraries/server_status_processes.lib.php:72
 #: libraries/server_user_groups.lib.php:39
 msgid "User"
 msgstr "Użytkownik"
 
-#: libraries/server_privileges.lib.php:4282
+#: libraries/server_privileges.lib.php:4308
 msgctxt "Create new user"
 msgid "New"
 msgstr "Nowy"
 
-#: libraries/server_privileges.lib.php:4311
+#: libraries/server_privileges.lib.php:4337
 #, fuzzy
 #| msgid "Edit Privileges:"
 msgid "Edit privileges:"
 msgstr "Edytuj uprawnienia:"
 
-#: libraries/server_privileges.lib.php:4312
+#: libraries/server_privileges.lib.php:4338
 #, fuzzy
 #| msgid "User group"
 msgid "User account"
 msgstr "Grupa użytkownika"
 
-#: libraries/server_privileges.lib.php:4371
+#: libraries/server_privileges.lib.php:4397
 msgid ""
 "Note: You are attempting to edit privileges of the user with which you are "
 "currently logged in."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4391 libraries/server_users.lib.php:25
+#: libraries/server_privileges.lib.php:4417 libraries/server_users.lib.php:25
 #, fuzzy
 #| msgid "Users overview"
 msgid "User accounts overview"
 msgstr "Omówienie użytkowników"
 
-#: libraries/server_privileges.lib.php:4459
+#: libraries/server_privileges.lib.php:4485
 msgid ""
 "A user account allowing any user from localhost to connect is present. This "
 "will prevent other users from connecting if the host part of their account "
 "allows a connection from any (%) host."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4500
+#: libraries/server_privileges.lib.php:4526
 #, php-format
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
@@ -13400,7 +13414,7 @@ msgstr ""
 "może się różnić od uprawnień jakich faktycznie używa serwer. W takim "
 "przypadku powinieneś przed dalszą pracą %sprzeładować uprawnienia%s."
 
-#: libraries/server_privileges.lib.php:4519
+#: libraries/server_privileges.lib.php:4545
 #, fuzzy
 #| msgid ""
 #| "Note: phpMyAdmin gets the users' privileges directly from MySQL's "
@@ -13419,25 +13433,25 @@ msgstr ""
 "może się różnić od uprawnień jakich faktycznie używa serwer. W takim "
 "przypadku powinieneś przed dalszą pracą %sprzeładować uprawnienia%s."
 
-#: libraries/server_privileges.lib.php:4569
+#: libraries/server_privileges.lib.php:4595
 msgid "The selected user was not found in the privilege table."
 msgstr "Wybrany użytkownik nie został znaleziony w tabeli uprawnień."
 
-#: libraries/server_privileges.lib.php:4801
+#: libraries/server_privileges.lib.php:4827
 msgid "You have added a new user."
 msgstr "Dodałeś nowego użytkownika."
 
-#: libraries/server_status.lib.php:53
+#: libraries/server_status.lib.php:60
 #, php-format
 msgid "Network traffic since startup: %s"
 msgstr "Ruch sieciowy od uruchomienia: %s"
 
-#: libraries/server_status.lib.php:66
+#: libraries/server_status.lib.php:73
 #, php-format
 msgid "This MySQL server has been running for %1$s. It started up on %2$s."
 msgstr "Ten serwer MySQL działa już od: %1$s. Uruchomiony został o: %2$s."
 
-#: libraries/server_status.lib.php:80
+#: libraries/server_status.lib.php:94
 msgid ""
 "This MySQL server works as <b>master</b> and <b>slave</b> in <b>replication</"
 "b> process."
@@ -13445,23 +13459,23 @@ msgstr ""
 "Ten serwer MySQL jest ustawiony jako <b>główny</b> i <b>podrzędny</b> w "
 "procesie <b>replikacji</b>."
 
-#: libraries/server_status.lib.php:85
+#: libraries/server_status.lib.php:99
 msgid "This MySQL server works as <b>master</b> in <b>replication</b> process."
 msgstr ""
 "Ten serwer MySQL jest ustawiony jako <b>master</b> w procesie <b>replikacji</"
 "b>."
 
-#: libraries/server_status.lib.php:90
+#: libraries/server_status.lib.php:104
 msgid "This MySQL server works as <b>slave</b> in <b>replication</b> process."
 msgstr ""
 "Ten serwer MySQL jest pracuje jako <b>podrzędny</b> w procesie "
 "<b>replikacji</b>."
 
-#: libraries/server_status.lib.php:106
+#: libraries/server_status.lib.php:116
 msgid "Replication status"
 msgstr "Stan replikacji"
 
-#: libraries/server_status.lib.php:137
+#: libraries/server_status.lib.php:146
 msgid ""
 "On a busy server, the byte counters may overrun, so those statistics as "
 "reported by the MySQL server may be incorrect."
@@ -13469,21 +13483,21 @@ msgstr ""
 "Na aktywnym serwerze liczniki bajtów mogą się przekręcić, więc statystyki "
 "jakich dostarcza serwer MySQL nie są wiarygodne."
 
-#: libraries/server_status.lib.php:148
+#: libraries/server_status.lib.php:157
 msgid "Received"
 msgstr "Otrzymane"
 
-#: libraries/server_status.lib.php:167
+#: libraries/server_status.lib.php:176
 msgid "Sent"
 msgstr "Wysłane"
 
-#: libraries/server_status.lib.php:234
+#: libraries/server_status.lib.php:243
 #, fuzzy
 #| msgid "max. concurrent connections"
 msgid "Max. concurrent connections"
 msgstr "maks. równoczesnych połączeń"
 
-#: libraries/server_status.lib.php:244
+#: libraries/server_status.lib.php:253
 msgid "Failed attempts"
 msgstr "Nieudane próby"
 
@@ -14580,7 +14594,7 @@ msgstr ""
 msgid "Not implemented yet."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/AlterOperation.php:193
+#: libraries/sql-parser/src/Components/AlterOperation.php:191
 #, fuzzy
 #| msgid "Iconic table operations"
 msgid "Unrecognized alter operation."
@@ -14596,7 +14610,7 @@ msgid "An opening bracket followed by a set of values was expected."
 msgstr ""
 
 #: libraries/sql-parser/src/Components/ArrayObj.php:101
-#: libraries/sql-parser/src/Components/FieldDefinition.php:202
+#: libraries/sql-parser/src/Components/CreateDefinition.php:202
 msgid "An opening bracket was expected."
 msgstr ""
 
@@ -14604,25 +14618,35 @@ msgstr ""
 msgid "A comma or a closing bracket was expected"
 msgstr ""
 
+#: libraries/sql-parser/src/Components/CreateDefinition.php:246
+#, fuzzy
+#| msgid "No databases selected."
+msgid "A comma or a closing bracket was expected."
+msgstr "Żadna baza danych nie został wybrana."
+
+#: libraries/sql-parser/src/Components/CreateDefinition.php:262
+msgid "A closing bracket was expected."
+msgstr ""
+
 #: libraries/sql-parser/src/Components/DataType.php:125
 msgid "Unrecognized data type."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:225
+#: libraries/sql-parser/src/Components/Expression.php:227
 msgid "Unexpected closing bracket."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:246
-#: libraries/sql-parser/src/Components/Expression.php:283
-#: libraries/sql-parser/src/Components/Expression.php:303
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:285
+#: libraries/sql-parser/src/Components/Expression.php:305
 msgid "An alias was previously found."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:257
+#: libraries/sql-parser/src/Components/Expression.php:259
 msgid "Unexpected dot."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:327
+#: libraries/sql-parser/src/Components/Expression.php:329
 #, fuzzy
 #| msgid "No databases selected."
 msgid "An alias was expected."
@@ -14634,16 +14658,6 @@ msgstr "Żadna baza danych nie został wybrana."
 msgid "An expression was expected."
 msgstr "Nie wybrano żadnego rekordu"
 
-#: libraries/sql-parser/src/Components/FieldDefinition.php:246
-#, fuzzy
-#| msgid "No databases selected."
-msgid "A comma or a closing bracket was expected."
-msgstr "Żadna baza danych nie został wybrana."
-
-#: libraries/sql-parser/src/Components/FieldDefinition.php:262
-msgid "A closing bracket was expected."
-msgstr ""
-
 #: libraries/sql-parser/src/Components/Limit.php:90
 #: libraries/sql-parser/src/Components/Limit.php:112
 msgid "An offset was expected."
@@ -14691,29 +14705,29 @@ msgstr ""
 msgid "Expected delimiter."
 msgstr ""
 
-#: libraries/sql-parser/src/Lexer.php:753
+#: libraries/sql-parser/src/Lexer.php:777
 #, fuzzy, php-format
 #| msgid "Event %1$s has been created."
 msgid "Ending quote %1$s was expected."
 msgstr "Zdarzenie %1$s zostało utworzone."
 
-#: libraries/sql-parser/src/Lexer.php:789
+#: libraries/sql-parser/src/Lexer.php:813
 #, fuzzy
 #| msgid "Table name template"
 msgid "Variable name was expected."
 msgstr "Nazwa szablonu tabeli"
 
-#: libraries/sql-parser/src/Parser.php:380
+#: libraries/sql-parser/src/Parser.php:391
 #, fuzzy
 #| msgid "At Beginning of Table"
 msgid "Unexpected beginning of statement."
 msgstr "Na początku tabeli"
 
-#: libraries/sql-parser/src/Parser.php:399
+#: libraries/sql-parser/src/Parser.php:410
 msgid "Unrecognized statement type."
 msgstr ""
 
-#: libraries/sql-parser/src/Parser.php:479
+#: libraries/sql-parser/src/Parser.php:489
 msgid "No transaction was previously started."
 msgstr ""
 
@@ -14743,8 +14757,10 @@ msgid "The name of the entity was expected."
 msgstr "Liczba otwartych tabel."
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:310
-msgid "At least one field definition was expected."
-msgstr ""
+#, fuzzy
+#| msgid "The row has been deleted."
+msgid "At least one column definition was expected."
+msgstr "Wiersz został usunięty."
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:329
 msgid "A \"RETURNS\" keyword was expected."
@@ -14805,11 +14821,11 @@ msgstr "Zakładka nie utworzona!"
 msgid "Using bookmark \"%s\" as default browse query."
 msgstr "Korzystanie z zakładki \"%s\" jako domyślne przeglądanie zapytania."
 
-#: libraries/sql.lib.php:1306
+#: libraries/sql.lib.php:1300
 msgid "Showing as PHP code"
 msgstr "Pokaż jako kod PHP"
 
-#: libraries/sql.lib.php:1638
+#: libraries/sql.lib.php:1632
 #, fuzzy, php-format
 #| msgid ""
 #| "This table does not contain a unique column. Grid edit, checkbox, Edit, "
@@ -14821,7 +14837,7 @@ msgstr ""
 "Tabela ta nie zawiera unikalnej kolumny. Funkcje związane z edycją siatki, "
 "pól wyboru, edycji, kopiowania i usuwania łącza może nie działać."
 
-#: libraries/sql.lib.php:1649
+#: libraries/sql.lib.php:1643
 #, fuzzy, php-format
 #| msgid ""
 #| "This table does not contain a unique column. Grid edit, checkbox, Edit, "
@@ -14833,7 +14849,7 @@ msgstr ""
 "Tabela ta nie zawiera unikalnej kolumny. Funkcje związane z edycją siatki, "
 "pól wyboru, edycji, kopiowania i usuwania łącza może nie działać."
 
-#: libraries/sql.lib.php:1688
+#: libraries/sql.lib.php:1682
 #, php-format
 msgid "Problems with indexes of table `%s`"
 msgstr "Problemy z indeksami tabeli `%s`"
@@ -14995,7 +15011,7 @@ msgid "Version %s snapshot (SQL code)"
 msgstr "Wersja %s migawki (kod SQL)"
 
 #: libraries/tracking.lib.php:947
-#: templates/structure/table_structure_row.phtml:33
+#: templates/table/structure/table_structure_row.phtml:33
 msgctxt "None for default"
 msgid "None"
 msgstr "Brak"
@@ -15051,15 +15067,15 @@ msgstr "Utwórz wersję %1$s dla %2$s"
 msgid "Version %1$s was created, tracking for %2$s is active."
 msgstr "Wersja %1$s stworzona, śledzenie dla %2$s jest aktywne."
 
-#: libraries/user_preferences.inc.php:29
+#: libraries/user_preferences.inc.php:30
 msgid "Manage your settings"
 msgstr "Zarządzaj ustawieniami"
 
-#: libraries/user_preferences.inc.php:46 prefs_manage.php:307
+#: libraries/user_preferences.inc.php:54 prefs_manage.php:307
 msgid "Configuration has been saved."
 msgstr "Konfiguracja została zapamiętana."
 
-#: libraries/user_preferences.inc.php:66
+#: libraries/user_preferences.inc.php:74
 #, php-format
 msgid ""
 "Your preferences will be saved for current session only. Storing them "
@@ -15473,7 +15489,7 @@ msgid "first"
 msgstr "pierwszy"
 
 #: templates/columns_definitions/move_column.phtml:12
-#: templates/structure/add_column.phtml:21
+#: templates/table/structure/add_column.phtml:21
 #, php-format
 msgid "after %s"
 msgstr "po %s"
@@ -15551,219 +15567,325 @@ msgstr "Sposób prezentacji danych"
 msgid "Input transformation options"
 msgstr "Opcje transformacji"
 
-#: templates/designer/aggregate_query_panel.phtml:22
-#: templates/designer/options_panel.phtml:100
+#: templates/database/create_table.phtml:7
+#: templates/database/designer/side_menu.phtml:77
+#: templates/database/designer/side_menu.phtml:80
+msgid "Create table"
+msgstr "Utwórz tabelę"
+
+#: templates/database/create_table.phtml:15
+msgid "Number of columns"
+msgstr "Liczba kolumn"
+
+#: templates/database/designer/aggregate_query_panel.phtml:22
+#: templates/database/designer/options_panel.phtml:100
 msgid "Aggregate"
 msgstr "Utwórz"
 
-#: templates/designer/aggregate_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:61
-#: templates/designer/options_panel.phtml:106
-#: templates/designer/options_panel.phtml:170
-#: templates/designer/where_query_panel.phtml:30
-#: templates/table/table_header.phtml:9
+#: templates/database/designer/aggregate_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:61
+#: templates/database/designer/options_panel.phtml:106
+#: templates/database/designer/options_panel.phtml:170
+#: templates/database/designer/where_query_panel.phtml:30
+#: templates/table/search/table_header.phtml:9
 msgid "Operator"
 msgstr "Operator"
 
-#: templates/designer/database_tables.phtml:29
+#: templates/database/designer/database_tables.phtml:29
 msgid "Toggle"
 msgstr ""
 
-#: templates/designer/database_tables.phtml:40
+#: templates/database/designer/database_tables.phtml:40
 #, fuzzy
 #| msgid "Table structure"
 msgid "See table structure"
 msgstr "Struktura tabeli"
 
-#: templates/designer/delete_relation_panel.phtml:21
+#: templates/database/designer/delete_relation_panel.phtml:21
 msgid "Delete relation"
 msgstr "Usuń relację"
 
-#: templates/designer/edit_delete_pages.phtml:7
+#: templates/database/designer/edit_delete_pages.phtml:7
 #, fuzzy
 #| msgid "Page titles"
 msgid "Page to open"
 msgstr "Tytuły stron"
 
-#: templates/designer/edit_delete_pages.phtml:7
+#: templates/database/designer/edit_delete_pages.phtml:7
 #, fuzzy
 #| msgid "Relation deleted"
 msgid "Page to delete"
 msgstr "Usunięto powiązanie"
 
-#: templates/designer/having_query_panel.phtml:90
-#: templates/designer/options_panel.phtml:63
-#: templates/designer/options_panel.phtml:229
-#: templates/designer/where_query_panel.phtml:59
+#: templates/database/designer/having_query_panel.phtml:90
+#: templates/database/designer/options_panel.phtml:63
+#: templates/database/designer/options_panel.phtml:229
+#: templates/database/designer/where_query_panel.phtml:59
 msgid "Except"
 msgstr "Oprócz"
 
-#: templates/designer/having_query_panel.phtml:102
-#: templates/designer/options_panel.phtml:75
-#: templates/designer/options_panel.phtml:241
-#: templates/designer/where_query_panel.phtml:71
+#: templates/database/designer/having_query_panel.phtml:102
+#: templates/database/designer/options_panel.phtml:75
+#: templates/database/designer/options_panel.phtml:241
+#: templates/database/designer/where_query_panel.phtml:71
 msgid "subquery"
 msgstr "w zapytaniu"
 
-#: templates/designer/new_relation_panel.phtml:22
-#: templates/designer/side_menu.phtml:84 templates/designer/side_menu.phtml:87
+#: templates/database/designer/new_relation_panel.phtml:22
+#: templates/database/designer/side_menu.phtml:84
+#: templates/database/designer/side_menu.phtml:87
 msgid "Create relation"
 msgstr "Utwórz relację"
 
-#: templates/designer/options_panel.phtml:34
-#: templates/designer/options_panel.phtml:200
+#: templates/database/designer/options_panel.phtml:34
+#: templates/database/designer/options_panel.phtml:200
 msgid "Relation operator"
 msgstr "Operator relacji"
 
-#: templates/designer/options_panel.phtml:85
-#: templates/designer/rename_to_panel.phtml:23
+#: templates/database/designer/options_panel.phtml:85
+#: templates/database/designer/rename_to_panel.phtml:23
 msgid "Rename to"
 msgstr "Zmień nazwę na"
 
-#: templates/designer/options_panel.phtml:91
-#: templates/designer/rename_to_panel.phtml:31
+#: templates/database/designer/options_panel.phtml:91
+#: templates/database/designer/rename_to_panel.phtml:31
 msgid "New name"
 msgstr "Nowa nazwa"
 
-#: templates/designer/page_save_as.phtml:4
+#: templates/database/designer/page_save_as.phtml:4
 #, fuzzy
 #| msgid "Export to selected page."
 msgid "Save to selected page"
 msgstr "Eksport do wybranej strony."
 
-#: templates/designer/page_save_as.phtml:5
+#: templates/database/designer/page_save_as.phtml:5
 #, fuzzy
 #| msgid "Create a page and export to it."
 msgid "Create a page and save to it"
 msgstr "Utwórz stronę i eksportu do niej."
 
-#: templates/designer/page_save_as.phtml:26
+#: templates/database/designer/page_save_as.phtml:26
 #, fuzzy
 #| msgid "New page name: "
 msgid "New page name"
 msgstr "Nowa nazwa strony: "
 
-#: templates/designer/page_selector.phtml:2
+#: templates/database/designer/page_selector.phtml:2
 msgid "Select page"
 msgstr "Wybierz stronę"
 
-#: templates/designer/query_details.phtml:10
+#: templates/database/designer/query_details.phtml:10
 msgid "Active options"
 msgstr "Aktywne opcje"
 
-#: templates/designer/schema_export.phtml:4
+#: templates/database/designer/schema_export.phtml:4
 msgid "Select Export Relational Type"
 msgstr "Wybierz typ eksportu relacyjnych"
 
-#: templates/designer/side_menu.phtml:19 templates/designer/side_menu.phtml:25
+#: templates/database/designer/side_menu.phtml:19
+#: templates/database/designer/side_menu.phtml:25
 #, fuzzy
 #| msgid "Showing tables:"
 msgid "Show/Hide tables list"
 msgstr "Pokaż tabele:"
 
-#: templates/designer/side_menu.phtml:29 templates/designer/side_menu.phtml:35
-#: templates/designer/side_menu.phtml:36
+#: templates/database/designer/side_menu.phtml:29
+#: templates/database/designer/side_menu.phtml:35
+#: templates/database/designer/side_menu.phtml:36
 msgid "View in fullscreen"
 msgstr "Wyświetl w trybie pełnoekranowym"
 
-#: templates/designer/side_menu.phtml:34
+#: templates/database/designer/side_menu.phtml:34
 msgid "Exit fullscreen"
 msgstr "Zamknij pełny ekran"
 
-#: templates/designer/side_menu.phtml:41 templates/designer/side_menu.phtml:45
+#: templates/database/designer/side_menu.phtml:41
+#: templates/database/designer/side_menu.phtml:45
 #, fuzzy
 #| msgid "New name"
 msgid "New page"
 msgstr "Nowa nazwa"
 
-#: templates/designer/side_menu.phtml:70 templates/designer/side_menu.phtml:73
+#: templates/database/designer/side_menu.phtml:70
+#: templates/database/designer/side_menu.phtml:73
 #, fuzzy
 #| msgid "Select page"
 msgid "Delete pages"
 msgstr "Wybierz stronę"
 
-#: templates/designer/side_menu.phtml:77 templates/designer/side_menu.phtml:80
-#: templates/table/create_table.phtml:7
-msgid "Create table"
-msgstr "Utwórz tabelę"
-
-#: templates/designer/side_menu.phtml:98
-#: templates/designer/side_menu.phtml:101
+#: templates/database/designer/side_menu.phtml:98
+#: templates/database/designer/side_menu.phtml:101
 msgid "Reload"
 msgstr "Przeładuj"
 
-#: templates/designer/side_menu.phtml:107
-#: templates/designer/side_menu.phtml:110
+#: templates/database/designer/side_menu.phtml:107
+#: templates/database/designer/side_menu.phtml:110
 msgid "Help"
 msgstr "Pomoc"
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Angular links"
 msgstr "Kanciaste połączenia"
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Direct links"
 msgstr "Bezpośrednie połączenia"
 
-#: templates/designer/side_menu.phtml:122
-#: templates/designer/side_menu.phtml:124
+#: templates/database/designer/side_menu.phtml:122
+#: templates/database/designer/side_menu.phtml:124
 msgid "Snap to grid"
 msgstr "Przyciągaj do siatki"
 
-#: templates/designer/side_menu.phtml:128
-#: templates/designer/side_menu.phtml:134
+#: templates/database/designer/side_menu.phtml:128
+#: templates/database/designer/side_menu.phtml:134
 msgid "Small/Big All"
 msgstr "Wszystko małe/duże"
 
-#: templates/designer/side_menu.phtml:138
-#: templates/designer/side_menu.phtml:141
+#: templates/database/designer/side_menu.phtml:138
+#: templates/database/designer/side_menu.phtml:141
 msgid "Toggle small/big"
 msgstr "Przełączanie małe/duże"
 
-#: templates/designer/side_menu.phtml:145
-#: templates/designer/side_menu.phtml:148
+#: templates/database/designer/side_menu.phtml:145
+#: templates/database/designer/side_menu.phtml:148
 msgid "Toggle relation lines"
 msgstr "Przełączanie linii relacji"
 
-#: templates/designer/side_menu.phtml:153
-#: templates/designer/side_menu.phtml:156
+#: templates/database/designer/side_menu.phtml:153
+#: templates/database/designer/side_menu.phtml:156
 #, fuzzy
 #| msgid "Export all"
 msgid "Export schema"
 msgstr "Eksport wszystkiego"
 
-#: templates/designer/side_menu.phtml:165
-#: templates/designer/side_menu.phtml:168
+#: templates/database/designer/side_menu.phtml:165
+#: templates/database/designer/side_menu.phtml:168
 msgid "Build Query"
 msgstr "Wykonaj zapytania"
 
-#: templates/designer/side_menu.phtml:173
-#: templates/designer/side_menu.phtml:177
+#: templates/database/designer/side_menu.phtml:173
+#: templates/database/designer/side_menu.phtml:177
 msgid "Move Menu"
 msgstr "Przesuń menu"
 
-#: templates/designer/side_menu.phtml:181
-#: templates/designer/side_menu.phtml:186
+#: templates/database/designer/side_menu.phtml:181
+#: templates/database/designer/side_menu.phtml:186
 #, fuzzy
 #| msgid "Partial texts"
 msgid "Pin text"
 msgstr "Częściowe teksty"
 
-#: templates/designer/table_list.phtml:4
+#: templates/database/designer/table_list.phtml:4
 msgid "Hide/Show all"
 msgstr "Ukryj/pokaż wszystko"
 
-#: templates/designer/table_list.phtml:14
+#: templates/database/designer/table_list.phtml:14
 msgid "Hide/Show Tables with no relation"
 msgstr "Ukryj/pokaż tabele bez relacji"
 
-#: templates/designer/table_list.phtml:59
+#: templates/database/designer/table_list.phtml:59
 msgid "Number of tables:"
 msgstr "Liczba tabel:"
 
+#: templates/database/structure/body_for_table_summary.phtml:6
+#, php-format
+msgid "%s table"
+msgid_plural "%s tables"
+msgstr[0] "%s tabela"
+msgstr[1] "%s tabel"
+msgstr[2] "%s tabele"
+
+#: templates/database/structure/body_for_table_summary.phtml:17
+msgid "Sum"
+msgstr "Suma"
+
+#: templates/database/structure/check_all_tables.phtml:6
+msgid "Check tables having overhead"
+msgstr "Zaznacz tabele nieoptymalne"
+
+#: templates/database/structure/check_all_tables.phtml:10
+#, fuzzy
+#| msgid "Show color"
+msgid "Show create"
+msgstr "Pokaż kolor"
+
+#: templates/database/structure/check_all_tables.phtml:27
+#, fuzzy
+#| msgid "Add prefix"
+msgid "Prefix"
+msgstr "Dodaj prefiks"
+
+#: templates/database/structure/check_all_tables.phtml:28
+msgid "Add prefix to table"
+msgstr "Dodaj przedrostek do tabeli"
+
+#: templates/database/structure/check_all_tables.phtml:29
+msgid "Replace table prefix"
+msgstr "Zamień przedrostek tabeli"
+
+#: templates/database/structure/check_all_tables.phtml:30
+msgid "Copy table with prefix"
+msgstr "Kopiuj tabelę z przedrostkiem"
+
+#: templates/database/structure/check_all_tables.phtml:36
+#, fuzzy
+#| msgid "CHAR textarea columns"
+msgid "Add columns to central list"
+msgstr "Kolumny w polu textarea CHAR/VARCHAR"
+
+#: templates/database/structure/check_all_tables.phtml:37
+msgid "Remove columns from central list"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:38
+#, fuzzy
+#| msgid "CHAR textarea columns"
+msgid "Make consistent with central list"
+msgstr "Kolumny w polu textarea CHAR/VARCHAR"
+
+#: templates/database/structure/favorite_anchor.phtml:12
+msgid "Add to Favorites"
+msgstr "Dodaj do ulubionych"
+
+#: templates/database/structure/show_create.phtml:2
+#, fuzzy
+#| msgid "Show SQL queries"
+msgid "Showing create queries"
+msgstr "Pokaż zapytania SQL"
+
+#: templates/database/structure/sortable_header.phtml:13
+msgid "Sort"
+msgstr "Sortuj"
+
+#: templates/database/structure/table_header.phtml:42
+#, fuzzy
+#| msgid "May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]"
+msgid ""
+"May be approximate. Click on the number to get the exact count. See "
+"[doc@faq3-11]FAQ 3.11[/doc]."
+msgstr "Może być w przybliżeniu. Zobacz [doc@faq3-11]FAQ 3.11[/doc]"
+
+#: templates/database/structure/table_header.phtml:66
+#: templates/table/index_form.phtml:127
+msgid "Size"
+msgstr "Rozmiar"
+
+#: templates/database/structure/table_header.phtml:74
+#: templates/table/structure/display_table_stats.phtml:27
+msgid "Overhead"
+msgstr "Nadmiar"
+
+#: templates/database/structure/tracking_icon.phtml:4
+msgid "Tracking is active."
+msgstr "Śledzenie jest aktywne."
+
+#: templates/database/structure/tracking_icon.phtml:8
+msgid "Tracking is not active."
+msgstr "Śledzenie nie jest aktywne."
+
 #: templates/error/report_form.phtml:7
 msgid ""
 "phpMyAdmin has encountered an error. We have collected data about this error "
@@ -15782,65 +15904,6 @@ msgstr "Możesz zbadać dane w raporcie o błędzie:"
 msgid "Please explain the steps that lead to the error:"
 msgstr "Proszę wyjaśnić, jakie kroki prowadzą do błędu:"
 
-#: templates/gis_visualization/gis_visualization.phtml:3
-msgid "Display GIS Visualization"
-msgstr "Wyświetlaj wizualizację GIS"
-
-#: templates/gis_visualization/gis_visualization.phtml:8
-msgid "Label column"
-msgstr "Etykieta kolumny"
-
-#: templates/gis_visualization/gis_visualization.phtml:11
-msgid "-- None --"
-msgstr "-- Brak --"
-
-#: templates/gis_visualization/gis_visualization.phtml:19
-msgid "Spatial column"
-msgstr "Przestrzenna kolumna"
-
-#: templates/index_form.phtml:16
-msgid "Index name:"
-msgstr "Nazwa indeksu :"
-
-#: templates/index_form.phtml:19
-msgid ""
-"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
-msgstr "\"PRIMARY\" <b>musi</b> być nazwą <b>jedynie</b> klucza podstawowego!"
-
-#: templates/index_form.phtml:40
-#, fuzzy
-#| msgid "Index cache size"
-msgid "Index choice:"
-msgstr "Rozmiar pamięci podręcznej indeksów"
-
-#: templates/index_form.phtml:57
-msgid "Key block size:"
-msgstr ""
-
-#: templates/index_form.phtml:74
-msgid "Index type:"
-msgstr "Rodzaj indeksu :"
-
-#: templates/index_form.phtml:86
-#, fuzzy
-#| msgid "User:"
-msgid "Parser:"
-msgstr "Użytkownik:"
-
-#: templates/index_form.phtml:102
-msgid "Comment:"
-msgstr "Komentarz:"
-
-#: templates/index_form.phtml:127 templates/structure/table_header.phtml:66
-msgid "Size"
-msgstr "Rozmiar"
-
-#: templates/index_form.phtml:149 templates/index_form.phtml:190
-#, fuzzy
-#| msgid "Drag to reorder."
-msgid "Drag to reorder"
-msgstr "Przeciągnij, aby uporządkować."
-
 #: templates/prefs_autoload.phtml:9
 msgid ""
 "Your browser has phpMyAdmin configuration for this domain. Would you like to "
@@ -15853,447 +15916,407 @@ msgstr ""
 msgid "Start row:"
 msgstr "Początkowy wiersz:"
 
-#: templates/structure/actions_in_table_structure.phtml:14
-#, php-format
-msgid "A primary key has been added on %s."
-msgstr "Do %s dodany został klucz podstawowy."
-
-#: templates/structure/actions_in_table_structure.phtml:34
-#: templates/structure/actions_in_table_structure.phtml:54
-#: templates/structure/actions_in_table_structure.phtml:79
-#: templates/structure/actions_in_table_structure.phtml:101
-#, php-format
-msgid "An index has been added on %s."
-msgstr "Do %s dodany został indeks."
-
-#: templates/structure/actions_in_table_structure.phtml:130
-#: templates/structure/check_all_table_column.phtml:59
-#, fuzzy
-#| msgid "Remove column(s)"
-msgid "Remove from central columns"
-msgstr "Usuń kolumnę(y)"
-
-#: templates/structure/actions_in_table_structure.phtml:138
-#: templates/structure/check_all_table_column.phtml:55
-#, fuzzy
-#| msgid "CHAR textarea columns"
-msgid "Add to central columns"
-msgstr "Kolumny w polu textarea CHAR/VARCHAR"
-
-#: templates/structure/add_column.phtml:7
-#, php-format
-msgid "Add %s column(s)"
-msgstr "Dodaj %s kolumnę(y)"
-
-#: templates/structure/add_column.phtml:12
-#, fuzzy
-#| msgid "At Beginning of Table"
-msgid "at beginning of table"
-msgstr "Na początku tabeli"
-
-#: templates/structure/body_for_table_summary.phtml:6
-#, php-format
-msgid "%s table"
-msgid_plural "%s tables"
-msgstr[0] "%s tabela"
-msgstr[1] "%s tabel"
-msgstr[2] "%s tabele"
-
-#: templates/structure/body_for_table_summary.phtml:17
-msgid "Sum"
-msgstr "Suma"
-
-#: templates/structure/check_all_tables.phtml:6
-msgid "Check tables having overhead"
-msgstr "Zaznacz tabele nieoptymalne"
-
-#: templates/structure/check_all_tables.phtml:10
-#, fuzzy
-#| msgid "Show color"
-msgid "Show create"
-msgstr "Pokaż kolor"
-
-#: templates/structure/check_all_tables.phtml:27
-#, fuzzy
-#| msgid "Add prefix"
-msgid "Prefix"
-msgstr "Dodaj prefiks"
-
-#: templates/structure/check_all_tables.phtml:28
-msgid "Add prefix to table"
-msgstr "Dodaj przedrostek do tabeli"
-
-#: templates/structure/check_all_tables.phtml:29
-msgid "Replace table prefix"
-msgstr "Zamień przedrostek tabeli"
-
-#: templates/structure/check_all_tables.phtml:30
-msgid "Copy table with prefix"
-msgstr "Kopiuj tabelę z przedrostkiem"
-
-#: templates/structure/check_all_tables.phtml:36
-#, fuzzy
-#| msgid "CHAR textarea columns"
-msgid "Add columns to central list"
-msgstr "Kolumny w polu textarea CHAR/VARCHAR"
-
-#: templates/structure/check_all_tables.phtml:37
-msgid "Remove columns from central list"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:38
-#, fuzzy
-#| msgid "CHAR textarea columns"
-msgid "Make consistent with central list"
-msgstr "Kolumny w polu textarea CHAR/VARCHAR"
-
-#: templates/structure/display_structure.phtml:140 view_create.php:181
-msgid "Edit view"
-msgstr "Edycja widoku"
-
-#: templates/structure/display_table_stats.phtml:9
-msgid "Space usage"
-msgstr "Wykorzystanie przestrzeni"
-
-#: templates/structure/display_table_stats.phtml:27
-#: templates/structure/table_header.phtml:74
-msgid "Overhead"
-msgstr "Nadmiar"
-
-#: templates/structure/display_table_stats.phtml:32
-msgid "Effective"
-msgstr "Efektywne"
-
-#: templates/structure/favorite_anchor.phtml:12
-msgid "Add to Favorites"
-msgstr "Dodaj do ulubionych"
-
-#: templates/structure/move_columns_dialog.phtml:1
-#: templates/structure/optional_action_links.phtml:21
-msgid "Move columns"
-msgstr "Przenieś kolumny"
-
-#: templates/structure/move_columns_dialog.phtml:2
-msgid "Move the columns by dragging them up and down."
-msgstr "Aby przenieś kolumny, przeciągając je w górę i w dół."
-
-#: templates/structure/optional_action_links.phtml:9
-msgid "Propose table structure"
-msgstr "Zaproponowanie struktury tabeli"
-
-#: templates/structure/optional_action_links.phtml:24
-#, fuzzy
-#| msgid "Propose table structure"
-msgid "Improve table structure"
-msgstr "Zaproponowanie struktury tabeli"
-
-#: templates/structure/optional_action_links.phtml:30
-#, fuzzy
-#| msgid "Track table"
-msgid "Track view"
-msgstr "Śledź tabelę"
-
-#: templates/structure/row_stats_table.phtml:3
-msgid "Row statistics"
-msgstr "Statystyki wiersza"
-
-#: templates/structure/row_stats_table.phtml:9
-msgid "static"
-msgstr "statycznie"
-
-#: templates/structure/row_stats_table.phtml:11
-msgid "dynamic"
-msgstr "dynamiczny"
-
-#: templates/structure/row_stats_table.phtml:22
-msgid "partitioned"
-msgstr "partycjonowanie"
-
-#: templates/structure/row_stats_table.phtml:54
-msgid "Row length"
-msgstr "Długość wiersza"
-
-#: templates/structure/row_stats_table.phtml:66
-msgid "Row size"
-msgstr "Rozmiar wiersza"
-
-#: templates/structure/row_stats_table.phtml:73
-msgid "Next autoindex"
-msgstr "Następny autoindeks"
-
-#: templates/structure/secondary_tabs.phtml:14
-#, fuzzy
-#| msgid "Relation view"
-msgid "Relation view"
-msgstr "Widok relacyjny"
-
-#: templates/structure/show_create.phtml:2
-#, fuzzy
-#| msgid "Show SQL queries"
-msgid "Showing create queries"
-msgstr "Pokaż zapytania SQL"
-
-#: templates/structure/sortable_header.phtml:13
-msgid "Sort"
-msgstr "Sortuj"
-
-#: templates/structure/table_header.phtml:42
-#, fuzzy
-#| msgid "May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]"
-msgid ""
-"May be approximate. Click on the number to get the exact count. See "
-"[doc@faq3-11]FAQ 3.11[/doc]."
-msgstr "Może być w przybliżeniu. Zobacz [doc@faq3-11]FAQ 3.11[/doc]"
-
-#: templates/structure/table_structure_row.phtml:46
-#, php-format
-msgid "Column %s has been dropped."
-msgstr "Kolumna %s została upuszczona."
-
-#: templates/structure/tracking_icon.phtml:4
-msgid "Tracking is active."
-msgstr "Śledzenie jest aktywne."
-
-#: templates/structure/tracking_icon.phtml:8
-msgid "Tracking is not active."
-msgstr "Śledzenie nie jest aktywne."
-
-#: templates/table/create_table.phtml:15
-msgid "Number of columns"
-msgstr "Liczba kolumn"
-
-#: templates/table/options.phtml:8
-msgid "Select columns (at least one):"
-msgstr "Wybierz kolumny (przynajmniej jedną):"
-
-#: templates/table/options.phtml:37
-msgid "Add search conditions (body of the \"where\" clause):"
-msgstr "Dodaj warunki przeszukiwania (warunek dla \"WHERE\"):"
-
-#: templates/table/options.phtml:45
-msgid "Number of rows per page"
-msgstr "Liczba wierszy na stronie"
-
-#: templates/table/options.phtml:56
-msgid "Display order:"
-msgstr "Kolejność wyświetlania:"
-
-#: templates/table/options_zoom.phtml:6
-msgid "Use this column to label each point"
-msgstr "W tej kolumnie oznacz każdy punkt"
-
-#: templates/table/options_zoom.phtml:35
-msgid "Maximum rows to plot"
-msgstr "Maksymalna liczba wierszy do wykreślenia"
-
-#: templates/table/replace_preview.phtml:13
-msgid "Find and replace - preview"
-msgstr "Znajdź i zamień - podgląd"
-
-#: templates/table/replace_preview.phtml:18
-msgid "Original string"
-msgstr "Oryginalny ciąg"
-
-#: templates/table/replace_preview.phtml:19
-msgid "Replaced string"
-msgstr "Zastępuje ciąg"
-
-#: templates/table/replace_preview.phtml:40
-msgid "Replace"
-msgstr "Zastąp"
-
-#: templates/table/rows_zoom.phtml:16
-msgid "Additional search criteria"
-msgstr "Dodatkowe kryteria wyszukiwania"
-
-#: templates/table/search_and_replace.phtml:3
-msgid "Replace with:"
-msgstr "Zamień na:"
-
-#: templates/table/search_and_replace.phtml:22
-msgid "Use regular expression"
-msgstr "Użyj wyrażeń regularnych"
-
-#: templates/table/selection_form.phtml:12
-msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
-msgstr ""
-"Wykonaj \"zapytanie wg przykładu\" (symbol wieloznaczny \"%\") dla dwóch "
-"różnych kolumn"
-
-#: templates/table/selection_form.phtml:34
-msgid "Do a \"query by example\" (wildcard: \"%\")"
-msgstr "Wykonaj \"zapytanie przez przykład\" (znak globalny: \"%\")"
-
-#: templates/table/zoom_result_form.phtml:7
-msgid "Browse/Edit the points"
-msgstr "Przeglądaj/Edytuj punkty"
-
-#: templates/table/zoom_result_form.phtml:15
-msgid "How to use"
-msgstr "Jak korzystać"
-
-#: templates/table/zoom_result_form.phtml:23
-msgid "Reset zoom"
-msgstr "Reset powiększenia"
-
-#: templates/tbl_chart.phtml:17
+#: templates/table/chart/tbl_chart.phtml:17
 msgctxt "Chart type"
 msgid "Bar"
 msgstr "Słupkowy"
 
-#: templates/tbl_chart.phtml:21
+#: templates/table/chart/tbl_chart.phtml:21
 msgctxt "Chart type"
 msgid "Column"
 msgstr "Kolumna"
 
-#: templates/tbl_chart.phtml:25
+#: templates/table/chart/tbl_chart.phtml:25
 msgctxt "Chart type"
 msgid "Line"
 msgstr "Linia"
 
-#: templates/tbl_chart.phtml:29
+#: templates/table/chart/tbl_chart.phtml:29
 msgctxt "Chart type"
 msgid "Spline"
 msgstr "Klin"
 
-#: templates/tbl_chart.phtml:33
+#: templates/table/chart/tbl_chart.phtml:33
 msgctxt "Chart type"
 msgid "Area"
 msgstr "Obszar"
 
-#: templates/tbl_chart.phtml:37
+#: templates/table/chart/tbl_chart.phtml:37
 msgctxt "Chart type"
 msgid "Pie"
 msgstr "Kołowy"
 
-#: templates/tbl_chart.phtml:41
+#: templates/table/chart/tbl_chart.phtml:41
 msgctxt "Chart type"
 msgid "Timeline"
 msgstr "Kalendarium"
 
-#: templates/tbl_chart.phtml:45
+#: templates/table/chart/tbl_chart.phtml:45
 msgctxt "Chart type"
 msgid "Scatter"
 msgstr "Rozproszony"
 
-#: templates/tbl_chart.phtml:50
+#: templates/table/chart/tbl_chart.phtml:50
 msgid "Stacked"
 msgstr "Spakowany"
 
-#: templates/tbl_chart.phtml:53
+#: templates/table/chart/tbl_chart.phtml:53
 msgid "Chart title"
 msgstr "Tytuł wykresu"
 
-#: templates/tbl_chart.phtml:57
+#: templates/table/chart/tbl_chart.phtml:57
 msgid "X-Axis:"
 msgstr "Oś X:"
 
-#: templates/tbl_chart.phtml:72
+#: templates/table/chart/tbl_chart.phtml:72
 msgid "Series:"
 msgstr "Serie:"
 
-#: templates/tbl_chart.phtml:102
+#: templates/table/chart/tbl_chart.phtml:102
 msgid "X-Axis label:"
 msgstr "Etykieta osi X:"
 
-#: templates/tbl_chart.phtml:104
+#: templates/table/chart/tbl_chart.phtml:104
 msgid "X Values"
 msgstr "Wartość X"
 
-#: templates/tbl_chart.phtml:107
+#: templates/table/chart/tbl_chart.phtml:107
 msgid "Y-Axis label:"
 msgstr "Etykieta osi Y:"
 
-#: templates/tbl_chart.phtml:115
+#: templates/table/chart/tbl_chart.phtml:115
 msgid "Series names are in a column"
 msgstr ""
 
-#: templates/tbl_chart.phtml:118
+#: templates/table/chart/tbl_chart.phtml:118
 #, fuzzy
 #| msgid "Inside column:"
 msgid "Series column:"
 msgstr "Wewnątrz kolumny:"
 
-#: templates/tbl_chart.phtml:130
+#: templates/table/chart/tbl_chart.phtml:130
 #, fuzzy
 #| msgid "Values for column %s"
 msgid "Value Column:"
 msgstr "Wartości dla kolumny %s"
 
-#: templates/tbl_chart.phtml:150
+#: templates/table/chart/tbl_chart.phtml:150
 #, fuzzy
 #| msgid "Save as file"
 msgid "Save chart as image"
 msgstr "Zapisz jako plik"
 
-#: templates/tbl_relation/common_form.phtml:7
+#: templates/table/gis_visualization/gis_visualization.phtml:3
+msgid "Display GIS Visualization"
+msgstr "Wyświetlaj wizualizację GIS"
+
+#: templates/table/gis_visualization/gis_visualization.phtml:8
+msgid "Label column"
+msgstr "Etykieta kolumny"
+
+#: templates/table/gis_visualization/gis_visualization.phtml:11
+msgid "-- None --"
+msgstr "-- Brak --"
+
+#: templates/table/gis_visualization/gis_visualization.phtml:19
+msgid "Spatial column"
+msgstr "Przestrzenna kolumna"
+
+#: templates/table/index_form.phtml:16
+msgid "Index name:"
+msgstr "Nazwa indeksu :"
+
+#: templates/table/index_form.phtml:19
+msgid ""
+"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
+msgstr "\"PRIMARY\" <b>musi</b> być nazwą <b>jedynie</b> klucza podstawowego!"
+
+#: templates/table/index_form.phtml:40
+#, fuzzy
+#| msgid "Index cache size"
+msgid "Index choice:"
+msgstr "Rozmiar pamięci podręcznej indeksów"
+
+#: templates/table/index_form.phtml:57
+msgid "Key block size:"
+msgstr ""
+
+#: templates/table/index_form.phtml:74
+msgid "Index type:"
+msgstr "Rodzaj indeksu :"
+
+#: templates/table/index_form.phtml:86
+#, fuzzy
+#| msgid "User:"
+msgid "Parser:"
+msgstr "Użytkownik:"
+
+#: templates/table/index_form.phtml:102
+msgid "Comment:"
+msgstr "Komentarz:"
+
+#: templates/table/index_form.phtml:149 templates/table/index_form.phtml:190
+#, fuzzy
+#| msgid "Drag to reorder."
+msgid "Drag to reorder"
+msgstr "Przeciągnij, aby uporządkować."
+
+#: templates/table/relation/common_form.phtml:7
 msgid "Internal relations"
 msgstr "Wewnętrzne relacje"
 
-#: templates/tbl_relation/common_form.phtml:11
+#: templates/table/relation/common_form.phtml:11
 msgid "Internal relation"
 msgstr "Wewnętrzne relacje"
 
-#: templates/tbl_relation/common_form.phtml:14
+#: templates/table/relation/common_form.phtml:14
 msgid ""
 "An internal relation is not necessary when a corresponding FOREIGN KEY "
 "relation exists."
 msgstr ""
 "Wewnętrzna relacja jest zbędna gdy istnieje odpowiednia relacja FOREIGN KEY."
 
-#: templates/tbl_relation/common_form.phtml:37
+#: templates/table/relation/common_form.phtml:37
 #, fuzzy
 #| msgid "Foreign key constraint"
 msgid "Foreign key constraints"
 msgstr "Ograniczenie klucza obcego"
 
-#: templates/tbl_relation/common_form.phtml:40
+#: templates/table/relation/common_form.phtml:40
 #, fuzzy
 #| msgid "Action"
 msgid "Actions"
 msgstr "Działanie"
 
-#: templates/tbl_relation/common_form.phtml:41
+#: templates/table/relation/common_form.phtml:41
 #, fuzzy
 #| msgid "Constraints for table"
 msgid "Constraint properties"
 msgstr "Ograniczenia dla tabeli"
 
-#: templates/tbl_relation/common_form.phtml:44
+#: templates/table/relation/common_form.phtml:44
 msgid ""
 "Only columns with index will be displayed. You can define an index below."
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:49
+#: templates/table/relation/common_form.phtml:49
 msgid "Foreign key constraint"
 msgstr "Ograniczenie klucza obcego"
 
-#: templates/tbl_relation/common_form.phtml:81
+#: templates/table/relation/common_form.phtml:81
 #, fuzzy
 #| msgid "Add constraints"
 msgid "+ Add constraint"
 msgstr "Dodaj ograniczenia"
 
-#: templates/tbl_relation/common_form.phtml:91
+#: templates/table/relation/common_form.phtml:91
 msgid "Choose column to display:"
 msgstr "Wybierz kolumny do wyświetlenia:"
 
-#: templates/tbl_relation/foreign_key_row.phtml:13
+#: templates/table/relation/foreign_key_row.phtml:13
 #, fuzzy, php-format
 #| msgid "Foreign key constraint"
 msgid "Foreign key constraint %s has been dropped"
 msgstr "Ograniczenie klucza obcego"
 
-#: templates/tbl_relation/foreign_key_row.phtml:102
+#: templates/table/relation/foreign_key_row.phtml:102
 msgid "Constraint name"
 msgstr "Ograniczenia nazwy"
 
-#: templates/tbl_relation/foreign_key_row.phtml:157
+#: templates/table/relation/foreign_key_row.phtml:157
 #, fuzzy
 #| msgid "Add column"
 msgid "+ Add column"
 msgstr "Dodaj kolumnę"
 
+#: templates/table/search/options.phtml:8
+msgid "Select columns (at least one):"
+msgstr "Wybierz kolumny (przynajmniej jedną):"
+
+#: templates/table/search/options.phtml:37
+msgid "Add search conditions (body of the \"where\" clause):"
+msgstr "Dodaj warunki przeszukiwania (warunek dla \"WHERE\"):"
+
+#: templates/table/search/options.phtml:45
+msgid "Number of rows per page"
+msgstr "Liczba wierszy na stronie"
+
+#: templates/table/search/options.phtml:56
+msgid "Display order:"
+msgstr "Kolejność wyświetlania:"
+
+#: templates/table/search/options_zoom.phtml:6
+msgid "Use this column to label each point"
+msgstr "W tej kolumnie oznacz każdy punkt"
+
+#: templates/table/search/options_zoom.phtml:35
+msgid "Maximum rows to plot"
+msgstr "Maksymalna liczba wierszy do wykreślenia"
+
+#: templates/table/search/replace_preview.phtml:13
+msgid "Find and replace - preview"
+msgstr "Znajdź i zamień - podgląd"
+
+#: templates/table/search/replace_preview.phtml:18
+msgid "Original string"
+msgstr "Oryginalny ciąg"
+
+#: templates/table/search/replace_preview.phtml:19
+msgid "Replaced string"
+msgstr "Zastępuje ciąg"
+
+#: templates/table/search/replace_preview.phtml:40
+msgid "Replace"
+msgstr "Zastąp"
+
+#: templates/table/search/rows_zoom.phtml:16
+msgid "Additional search criteria"
+msgstr "Dodatkowe kryteria wyszukiwania"
+
+#: templates/table/search/search_and_replace.phtml:3
+msgid "Replace with:"
+msgstr "Zamień na:"
+
+#: templates/table/search/search_and_replace.phtml:22
+msgid "Use regular expression"
+msgstr "Użyj wyrażeń regularnych"
+
+#: templates/table/search/selection_form.phtml:12
+msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
+msgstr ""
+"Wykonaj \"zapytanie wg przykładu\" (symbol wieloznaczny \"%\") dla dwóch "
+"różnych kolumn"
+
+#: templates/table/search/selection_form.phtml:34
+msgid "Do a \"query by example\" (wildcard: \"%\")"
+msgstr "Wykonaj \"zapytanie przez przykład\" (znak globalny: \"%\")"
+
+#: templates/table/search/zoom_result_form.phtml:7
+msgid "Browse/Edit the points"
+msgstr "Przeglądaj/Edytuj punkty"
+
+#: templates/table/search/zoom_result_form.phtml:15
+msgid "How to use"
+msgstr "Jak korzystać"
+
+#: templates/table/search/zoom_result_form.phtml:23
+msgid "Reset zoom"
+msgstr "Reset powiększenia"
+
+#: templates/table/secondary_tabs.phtml:14
+#, fuzzy
+#| msgid "Relation view"
+msgid "Relation view"
+msgstr "Widok relacyjny"
+
+#: templates/table/structure/actions_in_table_structure.phtml:14
+#, php-format
+msgid "A primary key has been added on %s."
+msgstr "Do %s dodany został klucz podstawowy."
+
+#: templates/table/structure/actions_in_table_structure.phtml:34
+#: templates/table/structure/actions_in_table_structure.phtml:54
+#: templates/table/structure/actions_in_table_structure.phtml:79
+#: templates/table/structure/actions_in_table_structure.phtml:101
+#, php-format
+msgid "An index has been added on %s."
+msgstr "Do %s dodany został indeks."
+
+#: templates/table/structure/actions_in_table_structure.phtml:130
+#: templates/table/structure/check_all_table_column.phtml:59
+#, fuzzy
+#| msgid "Remove column(s)"
+msgid "Remove from central columns"
+msgstr "Usuń kolumnę(y)"
+
+#: templates/table/structure/actions_in_table_structure.phtml:138
+#: templates/table/structure/check_all_table_column.phtml:55
+#, fuzzy
+#| msgid "CHAR textarea columns"
+msgid "Add to central columns"
+msgstr "Kolumny w polu textarea CHAR/VARCHAR"
+
+#: templates/table/structure/add_column.phtml:7
+#, php-format
+msgid "Add %s column(s)"
+msgstr "Dodaj %s kolumnę(y)"
+
+#: templates/table/structure/add_column.phtml:12
+#, fuzzy
+#| msgid "At Beginning of Table"
+msgid "at beginning of table"
+msgstr "Na początku tabeli"
+
+#: templates/table/structure/display_structure.phtml:140 view_create.php:181
+msgid "Edit view"
+msgstr "Edycja widoku"
+
+#: templates/table/structure/display_table_stats.phtml:9
+msgid "Space usage"
+msgstr "Wykorzystanie przestrzeni"
+
+#: templates/table/structure/display_table_stats.phtml:32
+msgid "Effective"
+msgstr "Efektywne"
+
+#: templates/table/structure/move_columns_dialog.phtml:1
+#: templates/table/structure/optional_action_links.phtml:21
+msgid "Move columns"
+msgstr "Przenieś kolumny"
+
+#: templates/table/structure/move_columns_dialog.phtml:2
+msgid "Move the columns by dragging them up and down."
+msgstr "Aby przenieś kolumny, przeciągając je w górę i w dół."
+
+#: templates/table/structure/optional_action_links.phtml:9
+msgid "Propose table structure"
+msgstr "Zaproponowanie struktury tabeli"
+
+#: templates/table/structure/optional_action_links.phtml:24
+#, fuzzy
+#| msgid "Propose table structure"
+msgid "Improve table structure"
+msgstr "Zaproponowanie struktury tabeli"
+
+#: templates/table/structure/optional_action_links.phtml:30
+#, fuzzy
+#| msgid "Track table"
+msgid "Track view"
+msgstr "Śledź tabelę"
+
+#: templates/table/structure/row_stats_table.phtml:3
+msgid "Row statistics"
+msgstr "Statystyki wiersza"
+
+#: templates/table/structure/row_stats_table.phtml:9
+msgid "static"
+msgstr "statycznie"
+
+#: templates/table/structure/row_stats_table.phtml:11
+msgid "dynamic"
+msgstr "dynamiczny"
+
+#: templates/table/structure/row_stats_table.phtml:22
+msgid "partitioned"
+msgstr "partycjonowanie"
+
+#: templates/table/structure/row_stats_table.phtml:54
+msgid "Row length"
+msgstr "Długość wiersza"
+
+#: templates/table/structure/row_stats_table.phtml:66
+msgid "Row size"
+msgstr "Rozmiar wiersza"
+
+#: templates/table/structure/row_stats_table.phtml:73
+msgid "Next autoindex"
+msgstr "Następny autoindeks"
+
+#: templates/table/structure/table_structure_row.phtml:46
+#, php-format
+msgid "Column %s has been dropped."
+msgstr "Kolumna %s została upuszczona."
+
 #: themes.php:17 themes.php:22
 msgid "Theme"
 msgstr "Motyw"
@@ -17672,6 +17695,11 @@ msgstr ""
 msgid "concurrent_insert is set to 0"
 msgstr "concurrent_insert jest ustawiony na 0"
 
+#, fuzzy
+#~| msgid "Read misses"
+#~ msgid "Read as multibytes"
+#~ msgstr "Pominięty odczyt"
+
 #~ msgid "Relational display column"
 #~ msgstr "Relacje wyświetlania kolumn"
 
diff --git a/po/pt.po b/po/pt.po
index 9db3db6928..5183a4ee3d 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 4.5.0-dev\n"
 "Report-Msgid-Bugs-To: developers@phpmyadmin.net\n"
-"POT-Creation-Date: 2015-08-08 13:53-0400\n"
+"POT-Creation-Date: 2015-08-12 08:10-0400\n"
 "PO-Revision-Date: 2015-06-11 18:18+0200\n"
 "Last-Translator: Pedro Ribeiro <p.m42.ribeiro@gmail.com>\n"
 "Language-Team: Portuguese <https://hosted.weblate.org/projects/phpmyadmin/"
@@ -53,7 +53,7 @@ msgid "Table comments:"
 msgstr "Comentários da tabela:"
 
 #: db_datadict.php:104 libraries/Index.class.php:699
-#: libraries/insert_edit.lib.php:1567
+#: libraries/insert_edit.lib.php:1565
 #: libraries/navigation/Nodes/Node_Column.class.php:30
 #: libraries/plugins/export/ExportHtmlword.class.php:280
 #: libraries/plugins/export/ExportHtmlword.class.php:375
@@ -67,13 +67,14 @@ msgstr "Comentários da tabela:"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1023
 #: libraries/tracking.lib.php:879 libraries/tracking.lib.php:975
 #: templates/columns_definitions/column_name.phtml:18
-#: templates/index_form.phtml:124 templates/table/table_header.phtml:6
-#: templates/table/zoom_result_form.phtml:33
-#: templates/tbl_relation/common_form.phtml:10
-#: templates/tbl_relation/common_form.phtml:43
-#: templates/tbl_relation/foreign_key_row.phtml:194
-#: templates/tbl_relation/foreign_key_row.phtml:206
-#: templates/tbl_relation/internal_relational_row.phtml:71
+#: templates/table/index_form.phtml:124
+#: templates/table/relation/common_form.phtml:10
+#: templates/table/relation/common_form.phtml:43
+#: templates/table/relation/foreign_key_row.phtml:194
+#: templates/table/relation/foreign_key_row.phtml:206
+#: templates/table/relation/internal_relational_row.phtml:71
+#: templates/table/search/table_header.phtml:6
+#: templates/table/search/zoom_result_form.phtml:33
 msgid "Column"
 msgstr "Coluna"
 
@@ -91,21 +92,21 @@ msgstr "Coluna"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1001
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1024
 #: libraries/rte/rte_list.lib.php:75 libraries/rte/rte_list.lib.php:103
-#: libraries/rte/rte_routines.lib.php:802
-#: libraries/rte/rte_routines.lib.php:831
-#: libraries/rte/rte_routines.lib.php:1493
+#: libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_routines.lib.php:922
+#: libraries/rte/rte_routines.lib.php:1584
 #: libraries/server_privileges.lib.php:2369 libraries/tracking.lib.php:880
 #: libraries/tracking.lib.php:972
 #: templates/columns_definitions/table_fields_definitions.phtml:11
-#: templates/structure/table_header.phtml:48
-#: templates/structure/table_structure_header.phtml:6
-#: templates/table/table_header.phtml:7
+#: templates/database/structure/table_header.phtml:48
+#: templates/table/search/table_header.phtml:7
+#: templates/table/structure/table_structure_header.phtml:6
 msgid "Type"
 msgstr "Tipo"
 
 #: db_datadict.php:106 libraries/Index.class.php:702
 #: libraries/central_columns.lib.php:708
-#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1576
+#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1574
 #: libraries/plugins/export/ExportHtmlword.class.php:286
 #: libraries/plugins/export/ExportHtmlword.class.php:381
 #: libraries/plugins/export/ExportLatex.class.php:509
@@ -118,8 +119,8 @@ msgstr "Tipo"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1026
 #: libraries/tracking.lib.php:882 libraries/tracking.lib.php:978
 #: templates/columns_definitions/table_fields_definitions.phtml:39
-#: templates/structure/table_structure_header.phtml:9
-#: templates/table/zoom_result_form.phtml:34
+#: templates/table/search/zoom_result_form.phtml:34
+#: templates/table/structure/table_structure_header.phtml:9
 msgid "Null"
 msgstr "Nulo"
 
@@ -137,8 +138,8 @@ msgstr "Nulo"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1027
 #: libraries/replication_gui.lib.php:153 libraries/tracking.lib.php:883
 #: templates/columns_definitions/table_fields_definitions.phtml:25
-#: templates/structure/body_for_table_summary.phtml:55
-#: templates/structure/table_structure_header.phtml:10
+#: templates/database/structure/body_for_table_summary.phtml:55
+#: templates/table/structure/table_structure_header.phtml:10
 msgid "Default"
 msgstr "Predefinido"
 
@@ -166,19 +167,19 @@ msgid "Comments"
 msgstr "Comentários"
 
 #: db_datadict.php:146
-#: libraries/controllers/StructureController.class.php:1960
-#: libraries/controllers/StructureController.class.php:1965
+#: libraries/controllers/TableStructureController.class.php:951
+#: libraries/controllers/TableStructureController.class.php:956
 #: libraries/tracking.lib.php:922
 #: templates/columns_definitions/column_indexes.phtml:6
-#: templates/structure/check_all_table_column.phtml:22
-#: templates/structure/display_structure.phtml:74
+#: templates/table/structure/check_all_table_column.phtml:22
+#: templates/table/structure/display_structure.phtml:74
 msgid "Primary"
 msgstr "Primária"
 
 #: db_datadict.php:156 js/messages.php:317 libraries/Index.class.php:567
 #: libraries/Index.class.php:606 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261 libraries/mult_submits.lib.php:403
+#: libraries/config/FormDisplay.tpl.php:272 libraries/mult_submits.lib.php:403
 #: libraries/mult_submits.lib.php:417
 #: libraries/plugins/export/ExportHtmlword.class.php:630
 #: libraries/plugins/export/ExportLatex.class.php:589
@@ -194,20 +195,20 @@ msgstr "Primária"
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1010 libraries/tracking.lib.php:1015
 #: prefs_manage.php:140 templates/prefs_autoload.phtml:15
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "No"
 msgstr "Não"
 
 #: db_datadict.php:156 js/messages.php:443 libraries/Index.class.php:568
 #: libraries/Index.class.php:605 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261
-#: libraries/controllers/StructureController.class.php:1344
-#: libraries/controllers/StructureController.class.php:2223
-#: libraries/controllers/StructureController.class.php:2232
-#: libraries/controllers/StructureController.class.php:2237
-#: libraries/controllers/StructureController.class.php:2242
-#: libraries/controllers/StructureController.class.php:2247
+#: libraries/config/FormDisplay.tpl.php:272
+#: libraries/controllers/TableStructureController.class.php:539
+#: libraries/controllers/TableStructureController.class.php:1201
+#: libraries/controllers/TableStructureController.class.php:1210
+#: libraries/controllers/TableStructureController.class.php:1215
+#: libraries/controllers/TableStructureController.class.php:1220
+#: libraries/controllers/TableStructureController.class.php:1225
 #: libraries/mult_submits.inc.php:82 libraries/mult_submits.inc.php:178
 #: libraries/mult_submits.lib.php:339 libraries/mult_submits.lib.php:372
 #: libraries/mult_submits.lib.php:401 libraries/mult_submits.lib.php:415
@@ -216,8 +217,8 @@ msgstr "Não"
 #: libraries/plugins/export/ExportOdt.class.php:756
 #: libraries/plugins/export/ExportTexytext.class.php:567
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1077
-#: libraries/server_databases.lib.php:464
-#: libraries/server_databases.lib.php:474
+#: libraries/server_databases.lib.php:475
+#: libraries/server_databases.lib.php:485
 #: libraries/server_privileges.lib.php:2546
 #: libraries/server_privileges.lib.php:2727
 #: libraries/server_privileges.lib.php:2748
@@ -227,7 +228,7 @@ msgstr "Não"
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1008 libraries/tracking.lib.php:1013
 #: prefs_manage.php:138 templates/prefs_autoload.phtml:14
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "Yes"
 msgstr "Sim"
 
@@ -237,7 +238,7 @@ msgstr "Ver o esquema da base de dados"
 
 #: db_export.php:37 db_tracking.php:90 export.php:382
 #: libraries/DBQbe.class.php:326
-#: libraries/controllers/StructureController.class.php:231
+#: libraries/controllers/DatabaseStructureController.class.php:170
 #: libraries/navigation/NavigationTree.class.php:897
 msgid "No tables found in database."
 msgstr "Nenhuma tabela encontrada na base de dados."
@@ -248,14 +249,14 @@ msgstr "Nenhuma tabela encontrada na base de dados."
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:26
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:120
-#: templates/structure/show_create.phtml:18
+#: templates/database/structure/show_create.phtml:18
 msgid "Tables"
 msgstr "Tabelas"
 
 #: db_export.php:52 libraries/Menu.class.php:317 libraries/Menu.class.php:425
-#: libraries/Util.class.php:3333 libraries/Util.class.php:3343
-#: libraries/Util.class.php:3349 libraries/Util.class.php:3629
-#: libraries/Util.class.php:4327 libraries/Util.class.php:4344
+#: libraries/Util.class.php:3339 libraries/Util.class.php:3349
+#: libraries/Util.class.php:3355 libraries/Util.class.php:3635
+#: libraries/Util.class.php:4333 libraries/Util.class.php:4350
 #: libraries/central_columns.lib.php:728 libraries/config.values.php:39
 #: libraries/config.values.php:47 libraries/config.values.php:109
 #: libraries/config.values.php:115 libraries/config/setup.forms.php:323
@@ -269,7 +270,7 @@ msgstr "Tabelas"
 #: libraries/navigation/Nodes/Node_Table.class.php:283
 #: libraries/server_privileges.lib.php:1141 libraries/tracking.lib.php:874
 #: templates/columns_definitions/table_fields_definitions.phtml:3
-#: templates/designer/table_list.phtml:28
+#: templates/database/designer/table_list.phtml:28
 msgid "Structure"
 msgstr "Estrutura"
 
@@ -281,7 +282,7 @@ msgstr "Estrutura"
 #: libraries/config/user_preferences.forms.php:292
 #: libraries/config/user_preferences.forms.php:297
 #: libraries/server_privileges.lib.php:1140
-#: templates/structure/display_table_stats.phtml:12
+#: templates/table/structure/display_table_stats.phtml:12
 msgid "Data"
 msgstr "Dados"
 
@@ -357,10 +358,10 @@ msgstr "Tabelas em tracking"
 #: libraries/server_privileges.lib.php:2908
 #: libraries/server_privileges.lib.php:3145
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4346
-#: templates/structure/table_header.phtml:21
-#: templates/tbl_relation/foreign_key_row.phtml:176
-#: templates/tbl_relation/internal_relational_row.phtml:63
+#: libraries/server_privileges.lib.php:4372
+#: templates/database/structure/table_header.phtml:21
+#: templates/table/relation/foreign_key_row.phtml:176
+#: templates/table/relation/internal_relational_row.phtml:63
 msgid "Table"
 msgstr "Tabela"
 
@@ -377,7 +378,7 @@ msgid "Updated"
 msgstr "Actualizado"
 
 #: db_tracking.php:130 js/messages.php:243 libraries/Menu.class.php:552
-#: libraries/Util.class.php:4314 libraries/config.values.php:104
+#: libraries/Util.class.php:4320 libraries/config.values.php:104
 #: libraries/rte/rte_events.lib.php:393 libraries/rte/rte_list.lib.php:101
 #: libraries/server_status_processes.lib.php:92 libraries/tracking.lib.php:279
 msgid "Status"
@@ -386,14 +387,15 @@ msgstr "Estado"
 #: db_tracking.php:131 db_tracking.php:290 libraries/Index.class.php:693
 #: libraries/central_columns.lib.php:687 libraries/rte/rte_list.lib.php:74
 #: libraries/rte/rte_list.lib.php:89 libraries/rte/rte_list.lib.php:102
-#: libraries/server_databases.lib.php:398
+#: libraries/server_databases.lib.php:409
 #: libraries/server_privileges.lib.php:2372
 #: libraries/server_privileges.lib.php:3166
 #: libraries/server_privileges.lib.php:3342
 #: libraries/server_user_groups.lib.php:82
 #: libraries/server_variables.lib.php:189 libraries/tracking.lib.php:280
-#: libraries/tracking.lib.php:793 templates/structure/table_header.phtml:30
-#: templates/structure/table_structure_header.phtml:23
+#: libraries/tracking.lib.php:793
+#: templates/database/structure/table_header.phtml:30
+#: templates/table/structure/table_structure_header.phtml:23
 msgid "Action"
 msgstr "Acções"
 
@@ -435,7 +437,7 @@ msgid "Untracked tables"
 msgstr "Tabelas sem acompanhamento"
 
 #: db_tracking.php:305 db_tracking.php:336
-#: templates/structure/optional_action_links.phtml:17
+#: templates/table/structure/optional_action_links.phtml:17
 msgid "Track table"
 msgstr "Acompanhar tabela"
 
@@ -491,7 +493,7 @@ msgid "Value for the column \"%s\""
 msgstr "Valor para a coluna \"%s\""
 
 #: gis_data_editor.php:146
-#: templates/gis_visualization/gis_visualization.phtml:37
+#: templates/table/gis_visualization/gis_visualization.phtml:37
 msgid "Use OpenStreetMaps as Base Layer"
 msgstr "Usar OpenStreetMaps como camada base"
 
@@ -571,35 +573,35 @@ msgstr "Adicionar geometria"
 #: libraries/display_change_password.lib.php:162
 #: libraries/display_export.lib.php:402 libraries/display_export.lib.php:408
 #: libraries/display_import.lib.php:392 libraries/index.lib.php:44
-#: libraries/insert_edit.lib.php:1546 libraries/insert_edit.lib.php:1583
+#: libraries/insert_edit.lib.php:1544 libraries/insert_edit.lib.php:1581
 #: libraries/normalization.lib.php:165 libraries/normalization.lib.php:821
 #: libraries/operations.lib.php:38 libraries/operations.lib.php:108
 #: libraries/operations.lib.php:263 libraries/operations.lib.php:306
 #: libraries/operations.lib.php:801 libraries/operations.lib.php:874
 #: libraries/operations.lib.php:923 libraries/operations.lib.php:1337
 #: libraries/operations.lib.php:1658
-#: libraries/plugins/auth/AuthenticationCookie.class.php:244
+#: libraries/plugins/auth/AuthenticationCookie.class.php:232
 #: libraries/replication_gui.lib.php:122 libraries/replication_gui.lib.php:161
 #: libraries/replication_gui.lib.php:324 libraries/replication_gui.lib.php:461
 #: libraries/replication_gui.lib.php:906 libraries/rte/rte_events.lib.php:509
-#: libraries/rte/rte_routines.lib.php:969
-#: libraries/rte/rte_routines.lib.php:1581
+#: libraries/rte/rte_routines.lib.php:1060
+#: libraries/rte/rte_routines.lib.php:1672
 #: libraries/rte/rte_triggers.lib.php:396 libraries/server_bin_log.lib.php:61
 #: libraries/server_privileges.lib.php:705
 #: libraries/server_privileges.lib.php:2106
 #: libraries/server_privileges.lib.php:2872
 #: libraries/server_privileges.lib.php:3553
-#: libraries/server_privileges.lib.php:4627
+#: libraries/server_privileges.lib.php:4653
 #: libraries/server_user_groups.lib.php:285
 #: libraries/sql_query_form.lib.php:369 libraries/sql_query_form.lib.php:429
 #: libraries/tracking.lib.php:533 libraries/tracking.lib.php:653
 #: prefs_manage.php:277 prefs_manage.php:355
 #: templates/columns_definitions/column_definitions_form.phtml:59
-#: templates/header_location.phtml:17 templates/index_form.phtml:238
+#: templates/database/create_table.phtml:21 templates/header_location.phtml:28
 #: templates/startAndNumberOfRowsPanel.phtml:14
-#: templates/structure/add_column.phtml:25
-#: templates/table/create_table.phtml:21
-#: templates/table/selection_form.phtml:75 view_create.php:275
+#: templates/table/index_form.phtml:238
+#: templates/table/search/selection_form.phtml:75
+#: templates/table/structure/add_column.phtml:25 view_create.php:275
 #: view_operations.php:106
 msgid "Go"
 msgstr "Executar"
@@ -693,7 +695,7 @@ msgstr ""
 "Não foi possível carregar os import plugins, por favor verifique a sua "
 "instalação!"
 
-#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1466
+#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1460
 #, php-format
 msgid "Bookmark %s has been created."
 msgstr "Marcador %s foi criado."
@@ -732,11 +734,11 @@ msgstr ""
 msgid "Back"
 msgstr "Voltar"
 
-#: index.php:148 libraries/Footer.class.php:70
+#: index.php:149 libraries/Footer.class.php:70
 msgid "phpMyAdmin Demo Server"
 msgstr "Servidor demonstrativo do phpMyAdmin"
 
-#: index.php:152
+#: index.php:153
 #, php-format
 msgid ""
 "You are using the demo server. You can do anything here, but please do not "
@@ -747,112 +749,112 @@ msgstr ""
 "excepto, alterar os utilizadores root, debian-sys-maint e pma. Para mais "
 "informações, veja %s."
 
-#: index.php:162
+#: index.php:163
 msgid "General Settings"
 msgstr "Definições gerais"
 
-#: index.php:190 libraries/display_change_password.lib.php:50
+#: index.php:191 libraries/display_change_password.lib.php:50
 #: libraries/display_change_password.lib.php:53 user_password.php:247
 msgid "Change password"
 msgstr "Alterar a palavra-passe"
 
-#: index.php:206
+#: index.php:207
 msgid "Server connection collation"
 msgstr "Ordenação de caracteres da ligação ao servidor"
 
-#: index.php:228
+#: index.php:229
 msgid "Appearance Settings"
 msgstr "Definições de aspecto"
 
-#: index.php:258 prefs_manage.php:285
+#: index.php:259 prefs_manage.php:285
 msgid "More settings"
 msgstr "Mais definições"
 
-#: index.php:279
+#: index.php:280
 msgid "Database server"
 msgstr "Servidor de base de dados"
 
-#: index.php:282 libraries/plugins/auth/AuthenticationCookie.class.php:181
+#: index.php:283 libraries/plugins/auth/AuthenticationCookie.class.php:169
 msgid "Server:"
 msgstr "Servidor:"
 
-#: index.php:286
+#: index.php:287
 msgid "Server type:"
 msgstr "Tipo de servidor:"
 
-#: index.php:290 libraries/plugins/export/ExportLatex.class.php:212
+#: index.php:291 libraries/plugins/export/ExportLatex.class.php:212
 #: libraries/plugins/export/ExportSql.class.php:687
 #: libraries/plugins/export/ExportXml.class.php:189
 msgid "Server version:"
 msgstr "Versão do servidor:"
 
-#: index.php:296
+#: index.php:297
 msgid "Protocol version:"
 msgstr "Versão do protocolo:"
 
-#: index.php:300
+#: index.php:301
 msgid "User:"
 msgstr "Utilizador:"
 
-#: index.php:305
+#: index.php:306
 msgid "Server charset:"
 msgstr "Conjunto de caracteres do servidor:"
 
-#: index.php:320
+#: index.php:321
 msgid "Web server"
 msgstr "Servidor web"
 
-#: index.php:331
+#: index.php:332
 msgid "Database client version:"
 msgstr "Versão do cliente de base de dados:"
 
-#: index.php:335
+#: index.php:336
 msgid "PHP extension:"
 msgstr "Extensão de PHP:"
 
-#: index.php:349
+#: index.php:350
 #, fuzzy
 #| msgid "PHP Version"
 msgid "PHP version:"
 msgstr "versão do PHP"
 
-#: index.php:360
+#: index.php:361
 msgid "Show PHP information"
 msgstr "Mostra informação do PHP"
 
-#: index.php:383
+#: index.php:384
 msgid "Version information:"
 msgstr "Informação da versão:"
 
-#: index.php:392 libraries/Util.class.php:432 libraries/Util.class.php:495
-#: libraries/config/FormDisplay.tpl.php:151
+#: index.php:393 libraries/Util.class.php:432 libraries/Util.class.php:495
+#: libraries/config/FormDisplay.tpl.php:162
 #: libraries/display_export.lib.php:577 libraries/engines/pbxt.lib.php:162
 #: libraries/navigation/NavigationHeader.class.php:196
 #: libraries/server_variables.lib.php:160
 msgid "Documentation"
 msgstr "Documentação"
 
-#: index.php:399
+#: index.php:400
 msgid "Wiki"
 msgstr "Wiki"
 
-#: index.php:408
+#: index.php:409
 msgid "Official Homepage"
 msgstr "Página Oficial do phpMyAdmin"
 
-#: index.php:415
+#: index.php:416
 msgid "Contribute"
 msgstr "Contributo"
 
-#: index.php:422
+#: index.php:423
 msgid "Get support"
 msgstr "Obter suporte"
 
-#: index.php:429
+#: index.php:430
 msgid "List of changes"
 msgstr "Lista de alterações"
 
-#: index.php:451
+#: index.php:452
 #, fuzzy
 #| msgid ""
 #| "Your configuration file contains settings (root with no password) that "
@@ -870,7 +872,7 @@ msgstr ""
 "está a correr com este valor por defeito, assim aberto a intrusões, deveria "
 "corrigir este buraco de segurança."
 
-#: index.php:468
+#: index.php:469
 msgid ""
 "You have enabled mbstring.func_overload in your PHP configuration. This "
 "option is incompatible with phpMyAdmin and might cause some data to be "
@@ -879,7 +881,7 @@ msgstr ""
 "Activou a função mbstring.func_overload na sua configuração PHP. Esta opção "
 "é incompatível com o phpMyAdmin e pode causar alguns danos aos dados!"
 
-#: index.php:483
+#: index.php:484
 msgid ""
 "The mbstring PHP extension was not found and you seem to be using a "
 "multibyte charset. Without the mbstring extension phpMyAdmin is unable to "
@@ -889,7 +891,7 @@ msgstr ""
 "um charset multibyte. Sem a extensão mbstring, o phpMyAdmin não é capaz de "
 "separar correctamente as strings e pode resultar em resultados inesperados."
 
-#: index.php:500
+#: index.php:501
 #, fuzzy
 #| msgid ""
 #| "Your PHP parameter [a@http://php.net/manual/en/session.configuration."
@@ -907,7 +909,7 @@ msgstr ""
 "o valor válido para o cookie configurado no phpMyAdmin, e por isso, a sua "
 "autenticação expirará mais cedo que o configurado no phpMyAdmin."
 
-#: index.php:519
+#: index.php:520
 msgid ""
 "Login cookie store is lower than cookie validity configured in phpMyAdmin, "
 "because of this, your login will expire sooner than configured in phpMyAdmin."
@@ -915,13 +917,13 @@ msgstr ""
 "Os parâmetros de validade do cookie de início de sessão armazenado não "
 "correspondem aos do cookie de validade configurado no phpMyAdmin."
 
-#: index.php:535
+#: index.php:536
 msgid "The configuration file now needs a secret passphrase (blowfish_secret)."
 msgstr ""
 "O ficheiro de configuração precisa agora de uma frase-passe secreta "
 "(blowfish_secret)."
 
-#: index.php:548
+#: index.php:549
 msgid ""
 "Directory [code]config[/code], which is used by the setup script, still "
 "exists in your phpMyAdmin directory. It is strongly recommended to remove it "
@@ -934,7 +936,7 @@ msgstr ""
 "segurança do seu servidor pode ser comprometida por pessoas não autorizadas "
 "ao transferir a configuração."
 
-#: index.php:564
+#: index.php:565
 #, php-format
 msgid ""
 "The phpMyAdmin configuration storage is not completely configured, some "
@@ -944,14 +946,14 @@ msgstr ""
 "configurada, algumas funcionalidades adicionais foram desactivadas. %sSaiba "
 "porquê%s. "
 
-#: index.php:571
+#: index.php:572
 msgid ""
 "Or alternately go to 'Operations' tab of any database to set it up there."
 msgstr ""
 "Ou, alternativamente, vá ao separador 'Operações' de qualquer base de dados "
 "para o configurar."
 
-#: index.php:620
+#: index.php:621
 #, php-format
 msgid ""
 "Your PHP MySQL library version %s differs from your MySQL server version %s. "
@@ -960,7 +962,7 @@ msgstr ""
 "A versão %s da biblioteca MySQL do PHP difere da versão %s do servidor "
 "MySQL. Isto pode causar comportamento imprevisível."
 
-#: index.php:648
+#: index.php:649
 #, php-format
 msgid ""
 "Server running with Suhosin. Please refer to %sdocumentation%s for possible "
@@ -1121,8 +1123,8 @@ msgstr ""
 msgid "Save & Close"
 msgstr "Guardar & Fechar"
 
-#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:404
-#: libraries/insert_edit.lib.php:1550 prefs_manage.php:361
+#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:415
+#: libraries/insert_edit.lib.php:1548 prefs_manage.php:361
 #: prefs_manage.php:372
 msgid "Reset"
 msgstr "Limpa"
@@ -1155,7 +1157,7 @@ msgstr "Adicionar Índice"
 msgid "Edit Index"
 msgstr "Editar Índice"
 
-#: js/messages.php:99 templates/index_form.phtml:232
+#: js/messages.php:99 templates/table/index_form.phtml:232
 #, php-format
 msgid "Add %s column(s) to index"
 msgstr "Adiciona %s coluna(s) ao Índice"
@@ -1176,13 +1178,14 @@ msgstr "Composto com:"
 msgid "Please select column(s) for the index."
 msgstr "Seleciona a(s) coluna(s) para o índice."
 
-#: js/messages.php:106 templates/structure/add_column.phtml:1
+#: js/messages.php:106 templates/table/structure/add_column.phtml:1
 msgid "You have to add at least one column."
 msgstr "Tem que adicionar pelo menos uma coluna."
 
-#: js/messages.php:109 libraries/insert_edit.lib.php:1548
+#: js/messages.php:109 libraries/insert_edit.lib.php:1546
 #: templates/columns_definitions/column_definitions_form.phtml:162
-#: templates/index_form.phtml:237 templates/tbl_relation/common_form.phtml:106
+#: templates/table/index_form.phtml:237
+#: templates/table/relation/common_form.phtml:106
 msgid "Preview SQL"
 msgstr "Pré-visualização SQL"
 
@@ -1199,7 +1202,7 @@ msgid "SQL query:"
 msgstr "Comando SQL:"
 
 #. l10n: Default label for the y-Axis of Charts
-#: js/messages.php:118 templates/tbl_chart.phtml:109
+#: js/messages.php:118 templates/table/chart/tbl_chart.phtml:109
 msgid "Y Values"
 msgstr "Valores para Y"
 
@@ -1360,7 +1363,7 @@ msgstr "Bytes enviados"
 msgid "Bytes received"
 msgstr "Bytes recebidos"
 
-#: js/messages.php:169 libraries/server_status.lib.php:226
+#: js/messages.php:169 libraries/server_status.lib.php:235
 msgid "Connections"
 msgstr "Ligações"
 
@@ -1417,12 +1420,12 @@ msgstr "%d tabela(s)"
 msgid "Questions"
 msgstr "Perguntas"
 
-#: js/messages.php:184 libraries/server_status.lib.php:134
+#: js/messages.php:184 libraries/server_status.lib.php:143
 msgid "Traffic"
 msgstr "Tráfego"
 
 #: js/messages.php:185 libraries/Menu.class.php:586
-#: libraries/Util.class.php:4318 libraries/server_status_monitor.lib.php:257
+#: libraries/Util.class.php:4324 libraries/server_status_monitor.lib.php:257
 msgid "Settings"
 msgstr "Configurações"
 
@@ -1442,8 +1445,9 @@ msgstr "Adicione pelo menos uma variável à serie!"
 #: libraries/server_status_monitor.lib.php:236
 #: libraries/server_status_processes.lib.php:308
 #: templates/columns_definitions/transformation.phtml:4
-#: templates/designer/options_panel.phtml:178
-#: templates/table/options_zoom.phtml:12 templates/table/rows_zoom.phtml:26
+#: templates/database/designer/options_panel.phtml:178
+#: templates/table/search/options_zoom.phtml:12
+#: templates/table/search/rows_zoom.phtml:26
 msgid "None"
 msgstr "Nenhum"
 
@@ -1736,8 +1740,8 @@ msgstr ""
 
 #: js/messages.php:270 libraries/Menu.class.php:352
 #: libraries/Menu.class.php:455 libraries/Menu.class.php:582
-#: libraries/Util.class.php:4317 libraries/Util.class.php:4332
-#: libraries/Util.class.php:4349 libraries/config/messages.inc.php:258
+#: libraries/Util.class.php:4323 libraries/Util.class.php:4338
+#: libraries/Util.class.php:4355 libraries/config/messages.inc.php:258
 #: libraries/display_import.lib.php:105
 #: libraries/server_status_monitor.lib.php:318 prefs_manage.php:238
 #: setup/frames/menu.inc.php:26
@@ -1797,13 +1801,13 @@ msgid "Formatting SQL..."
 msgstr ""
 
 #: js/messages.php:293 libraries/server_variables.lib.php:157
-#: templates/designer/aggregate_query_panel.phtml:63
-#: templates/designer/delete_relation_panel.phtml:28
-#: templates/designer/having_query_panel.phtml:117
-#: templates/designer/new_relation_panel.phtml:88
-#: templates/designer/options_panel.phtml:253
-#: templates/designer/rename_to_panel.phtml:45
-#: templates/designer/where_query_panel.phtml:83
+#: templates/database/designer/aggregate_query_panel.phtml:63
+#: templates/database/designer/delete_relation_panel.phtml:28
+#: templates/database/designer/having_query_panel.phtml:117
+#: templates/database/designer/new_relation_panel.phtml:88
+#: templates/database/designer/options_panel.phtml:253
+#: templates/database/designer/rename_to_panel.phtml:45
+#: templates/database/designer/where_query_panel.phtml:83
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -1813,7 +1817,7 @@ msgstr "Cancelar"
 msgid "Page-related settings"
 msgstr "Modificar configurações"
 
-#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:402
+#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:413
 msgid "Apply"
 msgstr "Aplicar"
 
@@ -1850,8 +1854,8 @@ msgstr "Código de erro: %s"
 msgid "Error text: %s"
 msgstr "Texto do erro: %s"
 
-#: js/messages.php:307 libraries/db_common.inc.php:68
-#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:450
+#: js/messages.php:307 libraries/db_common.inc.php:69
+#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:461
 msgid "No databases selected."
 msgstr "Nenhuma base de dados selecionada."
 
@@ -1863,12 +1867,13 @@ msgstr "Apagando Coluna"
 msgid "Adding Primary Key"
 msgstr "Adicionando Chave Primária"
 
-#: js/messages.php:310 templates/designer/aggregate_query_panel.phtml:59
-#: templates/designer/having_query_panel.phtml:113
-#: templates/designer/new_relation_panel.phtml:87
-#: templates/designer/options_panel.phtml:252
-#: templates/designer/rename_to_panel.phtml:41
-#: templates/designer/where_query_panel.phtml:82
+#: js/messages.php:310
+#: templates/database/designer/aggregate_query_panel.phtml:59
+#: templates/database/designer/having_query_panel.phtml:113
+#: templates/database/designer/new_relation_panel.phtml:87
+#: templates/database/designer/options_panel.phtml:252
+#: templates/database/designer/rename_to_panel.phtml:41
+#: templates/database/designer/where_query_panel.phtml:82
 msgid "OK"
 msgstr "OK"
 
@@ -1888,7 +1893,7 @@ msgstr "Copiando Bases de Dados"
 msgid "Changing Charset"
 msgstr "Mudando Mapa de Caracteres"
 
-#: js/messages.php:320 libraries/Util.class.php:3217
+#: js/messages.php:320 libraries/Util.class.php:3223
 #, fuzzy
 #| msgid "Disable foreign key checks"
 msgid "Enable foreign key checks"
@@ -1925,20 +1930,21 @@ msgstr "A definição de uma função armazenada deve conter uma instrução RET
 #: js/messages.php:334 libraries/DisplayResults.class.php:4834
 #: libraries/DisplayResults.class.php:5092 libraries/Menu.class.php:344
 #: libraries/Menu.class.php:446 libraries/Menu.class.php:578
-#: libraries/Util.class.php:3636 libraries/Util.class.php:3637
-#: libraries/Util.class.php:4316 libraries/Util.class.php:4331
-#: libraries/Util.class.php:4348 libraries/config/messages.inc.php:252
+#: libraries/Util.class.php:3642 libraries/Util.class.php:3643
+#: libraries/Util.class.php:4322 libraries/Util.class.php:4337
+#: libraries/Util.class.php:4354 libraries/config/messages.inc.php:252
 #: libraries/display_export.lib.php:173 libraries/rte/rte_list.lib.php:146
 #: libraries/server_privileges.lib.php:2211
 #: libraries/server_privileges.lib.php:2290
 #: libraries/server_privileges.lib.php:2632
 #: libraries/server_privileges.lib.php:3356
 #: libraries/server_status_monitor.lib.php:322 prefs_manage.php:303
-#: setup/frames/menu.inc.php:27 templates/structure/check_all_tables.phtml:11
+#: setup/frames/menu.inc.php:27
+#: templates/database/structure/check_all_tables.phtml:11
 msgid "Export"
 msgstr "Exportar"
 
-#: js/messages.php:337 libraries/rte/rte_routines.lib.php:652
+#: js/messages.php:337 libraries/rte/rte_routines.lib.php:743
 msgid "ENUM/SET editor"
 msgstr "Editor ENUM/SET"
 
@@ -1977,7 +1983,7 @@ msgstr "Mostrar Caixa do query"
 #: libraries/Console.class.php:214 libraries/DisplayResults.class.php:3474
 #: libraries/DisplayResults.class.php:4818 libraries/Index.class.php:723
 #: libraries/Util.class.php:706 libraries/Util.class.php:1202
-#: libraries/Util.class.php:3634 libraries/Util.class.php:3635
+#: libraries/Util.class.php:3640 libraries/Util.class.php:3641
 #: libraries/central_columns.lib.php:851
 #: libraries/central_columns.lib.php:1193
 #: libraries/config/messages.inc.php:892
@@ -1995,7 +2001,7 @@ msgstr "Edita"
 #: libraries/server_user_groups.lib.php:129
 #: libraries/sql_query_form.lib.php:416 libraries/tracking.lib.php:477
 #: setup/frames/index.inc.php:183 setup/frames/index.inc.php:291
-#: templates/designer/delete_relation_panel.phtml:27
+#: templates/database/designer/delete_relation_panel.phtml:27
 msgid "Delete"
 msgstr "Apagar"
 
@@ -2169,11 +2175,11 @@ msgid "No dependencies selected!"
 msgstr "Nenhuma dependência selecionada!"
 
 #: js/messages.php:394 libraries/central_columns.lib.php:1214
-#: libraries/insert_edit.lib.php:1458 libraries/server_variables.lib.php:155
+#: libraries/insert_edit.lib.php:1456 libraries/server_variables.lib.php:155
 #: setup/frames/config.inc.php:42 setup/frames/index.inc.php:279
 #: templates/columns_definitions/column_definitions_form.phtml:165
-#: templates/gis_visualization/gis_visualization.phtml:48
-#: templates/tbl_relation/common_form.phtml:107
+#: templates/table/gis_visualization/gis_visualization.phtml:48
+#: templates/table/relation/common_form.phtml:107
 msgid "Save"
 msgstr "Guarda"
 
@@ -2255,8 +2261,8 @@ msgid "Data point content"
 msgstr "Conteúdo do ponto de dados"
 
 #: js/messages.php:430 js/messages.php:562 js/messages.php:579
-#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2573
-#: templates/index_form.phtml:154 templates/index_form.phtml:194
+#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2571
+#: templates/table/index_form.phtml:154 templates/table/index_form.phtml:194
 msgid "Ignore"
 msgstr "Ignora"
 
@@ -2315,8 +2321,8 @@ msgstr "Seleccione Foreign Key"
 msgid "Please select the primary key or a unique key!"
 msgstr "Seleccione a chave primária ou uma chave única!"
 
-#: js/messages.php:457 templates/designer/side_menu.phtml:91
-#: templates/designer/side_menu.phtml:94
+#: js/messages.php:457 templates/database/designer/side_menu.phtml:91
+#: templates/database/designer/side_menu.phtml:94
 msgid "Choose column to display"
 msgstr "Escolha a coluna para mostrar"
 
@@ -2332,20 +2338,20 @@ msgstr ""
 msgid "Page name"
 msgstr "Nome da página"
 
-#: js/messages.php:463 templates/designer/side_menu.phtml:56
-#: templates/designer/side_menu.phtml:59
+#: js/messages.php:463 templates/database/designer/side_menu.phtml:56
+#: templates/database/designer/side_menu.phtml:59
 msgid "Save page"
 msgstr "Guardar página"
 
-#: js/messages.php:464 templates/designer/side_menu.phtml:63
-#: templates/designer/side_menu.phtml:66
+#: js/messages.php:464 templates/database/designer/side_menu.phtml:63
+#: templates/database/designer/side_menu.phtml:66
 #, fuzzy
 #| msgid "Save page"
 msgid "Save page as"
 msgstr "Guardar página"
 
-#: js/messages.php:465 templates/designer/side_menu.phtml:49
-#: templates/designer/side_menu.phtml:52
+#: js/messages.php:465 templates/database/designer/side_menu.phtml:49
+#: templates/database/designer/side_menu.phtml:52
 msgid "Open page"
 msgstr "Abrir página"
 
@@ -2353,7 +2359,7 @@ msgstr "Abrir página"
 msgid "Delete page"
 msgstr "Eliminar página"
 
-#: js/messages.php:467 templates/designer/side_menu.phtml:10
+#: js/messages.php:467 templates/database/designer/side_menu.phtml:10
 msgid "Untitled"
 msgstr "Sem título"
 
@@ -2475,7 +2481,7 @@ msgstr "Segmento original"
 msgid "cancel"
 msgstr "cancelar"
 
-#: js/messages.php:499 libraries/server_status.lib.php:271
+#: js/messages.php:499 libraries/server_status.lib.php:280
 msgid "Aborted"
 msgstr "Abortado"
 
@@ -3081,7 +3087,7 @@ msgstr "Introduza um número válido!"
 
 #: js/messages.php:793 libraries/Message.class.php:199
 #: libraries/Util.class.php:654 libraries/core.lib.php:245
-#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1172
+#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1170
 #: tbl_operations.php:229 view_operations.php:63
 msgid "Error"
 msgstr "Erro"
@@ -3144,8 +3150,8 @@ msgstr "por segundo"
 msgid "per minute"
 msgstr "por minuto"
 
-#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:143
-#: libraries/server_status.lib.php:228
+#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:152
+#: libraries/server_status.lib.php:237
 #: libraries/server_status_queries.lib.php:98
 msgid "per hour"
 msgstr "por hora"
@@ -3165,7 +3171,7 @@ msgstr ""
 "Permissões erradas no ficheiro de configuração. Não deve ser editável por "
 "todos!"
 
-#: libraries/Config.class.php:1799
+#: libraries/Config.class.php:1801
 msgid "Font size"
 msgstr "Tamanho da fonte"
 
@@ -3193,10 +3199,10 @@ msgstr "Re-consultar"
 #: libraries/server_privileges.lib.php:2890
 #: libraries/server_privileges.lib.php:3144
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4332
+#: libraries/server_privileges.lib.php:4358
 #: libraries/server_status_processes.lib.php:80
-#: templates/tbl_relation/foreign_key_row.phtml:165
-#: templates/tbl_relation/internal_relational_row.phtml:55
+#: templates/table/relation/foreign_key_row.phtml:165
+#: templates/table/relation/internal_relational_row.phtml:55
 msgid "Database"
 msgstr "Base de Dados"
 
@@ -3291,11 +3297,11 @@ msgstr "Histórico"
 #: libraries/plugins/import/ImportMediawiki.class.php:60
 #: libraries/plugins/import/ImportOds.class.php:59
 #: libraries/plugins/import/ImportShp.class.php:57
-#: libraries/plugins/import/ImportSql.class.php:148
+#: libraries/plugins/import/ImportSql.class.php:51
 #: libraries/plugins/import/ImportXml.class.php:58
-#: libraries/rte/rte_routines.lib.php:833 templates/index_form.phtml:49
-#: templates/structure/row_stats_table.phtml:20
-#: templates/table/options.phtml:2
+#: libraries/rte/rte_routines.lib.php:924 templates/table/index_form.phtml:49
+#: templates/table/search/options.phtml:2
+#: templates/table/structure/row_stats_table.phtml:20
 msgid "Options"
 msgstr "Opções"
 
@@ -3336,7 +3342,8 @@ msgstr "Descendente"
 msgid "Order:"
 msgstr "Outros"
 
-#: libraries/Console.class.php:289 templates/table/replace_preview.phtml:17
+#: libraries/Console.class.php:289
+#: templates/table/search/replace_preview.phtml:17
 msgid "Count"
 msgstr "Contagem"
 
@@ -3450,9 +3457,9 @@ msgstr "Mudar para a tabela copiada"
 #: libraries/operations.lib.php:794 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:191
-#: templates/structure/sortable_header.phtml:21
-#: templates/structure/sortable_header.phtml:38
-#: templates/table/options.phtml:68
+#: templates/database/structure/sortable_header.phtml:21
+#: templates/database/structure/sortable_header.phtml:38
+#: templates/table/search/options.phtml:68
 msgid "Ascending"
 msgstr "Ascendente"
 
@@ -3462,13 +3469,14 @@ msgstr "Ascendente"
 #: libraries/operations.lib.php:797 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:188
-#: templates/structure/sortable_header.phtml:26
-#: templates/structure/sortable_header.phtml:43
-#: templates/table/options.phtml:69
+#: templates/database/structure/sortable_header.phtml:26
+#: templates/database/structure/sortable_header.phtml:43
+#: templates/table/search/options.phtml:69
 msgid "Descending"
 msgstr "Descendente"
 
-#: libraries/DBQbe.class.php:467 templates/table/search_and_replace.phtml:6
+#: libraries/DBQbe.class.php:467
+#: templates/table/search/search_and_replace.phtml:6
 msgid "Column:"
 msgstr "Coluna:"
 
@@ -3628,12 +3636,12 @@ msgstr[0] "%1$s resultado em <strong>%2$s</strong>"
 msgstr[1] "%1$s resultados em <strong>%2$s</strong>"
 
 #: libraries/DbSearch.class.php:354 libraries/Menu.class.php:311
-#: libraries/Util.class.php:3337 libraries/Util.class.php:3347
-#: libraries/Util.class.php:3623 libraries/Util.class.php:3624
-#: libraries/Util.class.php:4343 libraries/config.values.php:43
+#: libraries/Util.class.php:3343 libraries/Util.class.php:3353
+#: libraries/Util.class.php:3629 libraries/Util.class.php:3630
+#: libraries/Util.class.php:4349 libraries/config.values.php:43
 #: libraries/config.values.php:51 libraries/config.values.php:119
 #: libraries/navigation/Nodes/Node_Table.class.php:295
-#: templates/structure/check_all_table_column.phtml:5
+#: templates/table/structure/check_all_table_column.phtml:5
 msgid "Browse"
 msgstr "Procurar"
 
@@ -3650,7 +3658,8 @@ msgstr "Pesquisar na Base de Dados"
 msgid "Words or values to search for (wildcard: \"%\"):"
 msgstr "Palavra(s) ou valor(es) a pesquisar (wildcard: \"%\"):"
 
-#: libraries/DbSearch.class.php:401 templates/table/search_and_replace.phtml:1
+#: libraries/DbSearch.class.php:401
+#: templates/table/search/search_and_replace.phtml:1
 msgid "Find:"
 msgstr "Procurar:"
 
@@ -3694,28 +3703,28 @@ msgstr "Filtrar registos"
 msgid "Search this table"
 msgstr "Pesquisar esta tabela"
 
-#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2532
-#: libraries/Util.class.php:2535
+#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2538
+#: libraries/Util.class.php:2541
 msgctxt "First page"
 msgid "Begin"
 msgstr "Início"
 
-#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2533
-#: libraries/Util.class.php:2536 libraries/server_bin_log.lib.php:170
+#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2539
+#: libraries/Util.class.php:2542 libraries/server_bin_log.lib.php:170
 #: libraries/server_bin_log.lib.php:172
 msgctxt "Previous page"
 msgid "Previous"
 msgstr "Anterior"
 
-#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2564
-#: libraries/Util.class.php:2574 libraries/server_bin_log.lib.php:204
+#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2570
+#: libraries/Util.class.php:2580 libraries/server_bin_log.lib.php:204
 #: libraries/server_bin_log.lib.php:206
 msgctxt "Next page"
 msgid "Next"
 msgstr "Seguinte"
 
-#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2565
-#: libraries/Util.class.php:2575
+#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2571
+#: libraries/Util.class.php:2581
 msgctxt "Last page"
 msgid "End"
 msgstr "Fim"
@@ -3790,15 +3799,15 @@ msgid "May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]."
 msgstr "Pode ser aproximado. Veja o [doc@faq3-11]FAQ 3.11[/doc]."
 
 #: libraries/DisplayResults.class.php:4332 libraries/Message.class.php:180
-#: libraries/controllers/TableRelationController.class.php:258
+#: libraries/controllers/TableRelationController.class.php:259
 #: libraries/controllers/TableSearchController.class.php:655
-#: libraries/rte/rte_routines.lib.php:1332 libraries/sql_query_form.lib.php:89
+#: libraries/rte/rte_routines.lib.php:1423 libraries/sql_query_form.lib.php:89
 #: tbl_operations.php:227 tbl_row_action.php:138 view_operations.php:62
 msgid "Your SQL query has been executed successfully."
 msgstr "A sua consulta SQL foi executada com êxito."
 
 #: libraries/DisplayResults.class.php:4660
-#: libraries/controllers/StructureController.class.php:629
+#: libraries/controllers/DatabaseStructureController.class.php:564
 #, php-format
 msgid ""
 "This view has at least this number of rows. Please refer to %sdocumentation"
@@ -3822,33 +3831,33 @@ msgstr "%1$d no total, %2$d na consulta"
 msgid "%d total"
 msgstr "%d total"
 
-#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1318
+#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1312
 #, php-format
 msgid "Query took %01.4f seconds."
 msgstr "A consulta demorou %01.4f segundos."
 
 #: libraries/DisplayResults.class.php:4807
-#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4767
-#: libraries/Util.class.php:4773 libraries/mult_submits.inc.php:50
-#: templates/structure/check_all_tables.phtml:2
-#: templates/structure/check_all_tables.phtml:9
+#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4773
+#: libraries/Util.class.php:4779 libraries/mult_submits.inc.php:50
+#: templates/database/structure/check_all_tables.phtml:2
+#: templates/database/structure/check_all_tables.phtml:9
 msgid "With selected:"
 msgstr "Com os seleccionados:"
 
 #: libraries/DisplayResults.class.php:4811
-#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4769
-#: libraries/Util.class.php:4770 libraries/server_privileges.lib.php:1174
+#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4775
+#: libraries/Util.class.php:4776 libraries/server_privileges.lib.php:1174
 #: libraries/server_privileges.lib.php:1175
 #: libraries/server_privileges.lib.php:1387
 #: libraries/server_user_groups.lib.php:231
-#: templates/structure/check_all_tables.phtml:3
-#: templates/structure/check_all_tables.phtml:4
+#: templates/database/structure/check_all_tables.phtml:3
+#: templates/database/structure/check_all_tables.phtml:4
 msgid "Check All"
 msgstr "Todos"
 
 #: libraries/DisplayResults.class.php:4985 libraries/Header.class.php:383
-#: templates/structure/optional_action_links.phtml:1
-#: templates/structure/print_view_data_dictionary_link.phtml:3
+#: templates/database/structure/print_view_data_dictionary_link.phtml:3
+#: templates/table/structure/optional_action_links.phtml:1
 msgid "Print view"
 msgstr "Vista de impressão"
 
@@ -3856,7 +3865,8 @@ msgstr "Vista de impressão"
 msgid "Query results operations"
 msgstr "Operações resultantes das consultas"
 
-#: libraries/DisplayResults.class.php:5105 templates/tbl_chart.phtml:12
+#: libraries/DisplayResults.class.php:5105
+#: templates/table/chart/tbl_chart.phtml:12
 msgid "Display chart"
 msgstr "Mostrar gráfico"
 
@@ -3951,7 +3961,7 @@ msgid "Click on the bar to scroll to top of page"
 msgstr "Clique na barra para deslizar para o topo da página"
 
 #: libraries/Header.class.php:749
-#: libraries/plugins/auth/AuthenticationCookie.class.php:152
+#: libraries/plugins/auth/AuthenticationCookie.class.php:140
 msgid "Javascript must be enabled past this point!"
 msgstr "O Javascript tem de estar activo a partir deste ponto!"
 
@@ -3973,11 +3983,11 @@ msgid "Keyname"
 msgstr "Nome da chave"
 
 #: libraries/Index.class.php:697
-#: libraries/controllers/StructureController.class.php:1962
-#: libraries/controllers/StructureController.class.php:1967
+#: libraries/controllers/TableStructureController.class.php:953
+#: libraries/controllers/TableStructureController.class.php:958
 #: libraries/tracking.lib.php:973
 #: templates/columns_definitions/column_indexes.phtml:11
-#: templates/structure/check_all_table_column.phtml:26
+#: templates/table/structure/check_all_table_column.phtml:26
 msgid "Unique"
 msgstr "Único"
 
@@ -3996,16 +4006,17 @@ msgstr "Quantidade"
 #: libraries/server_collations.lib.php:35 libraries/tracking.lib.php:881
 #: libraries/tracking.lib.php:977
 #: templates/columns_definitions/table_fields_definitions.phtml:33
-#: templates/structure/row_stats_table.phtml:31
-#: templates/structure/table_header.phtml:55
-#: templates/structure/table_structure_header.phtml:7
-#: templates/table/table_header.phtml:8
+#: templates/database/structure/table_header.phtml:55
+#: templates/table/search/table_header.phtml:8
+#: templates/table/structure/row_stats_table.phtml:31
+#: templates/table/structure/table_structure_header.phtml:7
 msgid "Collation"
 msgstr "Agrupamento (Collation)"
 
 #: libraries/Index.class.php:703 libraries/rte/rte_events.lib.php:496
-#: libraries/rte/rte_routines.lib.php:956 libraries/tracking.lib.php:885
-#: libraries/tracking.lib.php:979 templates/structure/table_header.phtml:84
+#: libraries/rte/rte_routines.lib.php:1047 libraries/tracking.lib.php:885
+#: libraries/tracking.lib.php:979
+#: templates/database/structure/table_header.phtml:84
 msgid "Comment"
 msgstr "Comentário"
 
@@ -4018,15 +4029,15 @@ msgstr "A chave primária foi eliminada."
 msgid "Index %s has been dropped."
 msgstr "O Índice %s foi eliminado."
 
-#: libraries/Index.class.php:757 libraries/Util.class.php:3630
-#: libraries/Util.class.php:3631
-#: libraries/controllers/StructureController.class.php:1958
-#: libraries/controllers/StructureController.class.php:1959
+#: libraries/Index.class.php:757 libraries/Util.class.php:3636
+#: libraries/Util.class.php:3637
+#: libraries/controllers/TableStructureController.class.php:949
+#: libraries/controllers/TableStructureController.class.php:950
 #: libraries/operations.lib.php:1607 libraries/rte/rte_list.lib.php:150
 #: libraries/server_databases.lib.php:146
-#: templates/structure/check_all_table_column.phtml:15
-#: templates/structure/check_all_tables.phtml:16
-#: templates/tbl_relation/foreign_key_row.phtml:93
+#: templates/database/structure/check_all_tables.phtml:16
+#: templates/table/relation/foreign_key_row.phtml:93
+#: templates/table/structure/check_all_table_column.phtml:15
 msgid "Drop"
 msgstr "Elimina"
 
@@ -4056,16 +4067,16 @@ msgstr "Servidor"
 #: libraries/Menu.class.php:248
 #: libraries/navigation/Nodes/Node_View.class.php:32
 #: libraries/tbl_info.inc.php:63
-#: templates/structure/structure_table_row.phtml:97
-#: templates/structure/structure_table_row.phtml:159
+#: templates/database/structure/structure_table_row.phtml:97
+#: templates/database/structure/structure_table_row.phtml:159
 msgid "View"
 msgstr "Vista"
 
 #: libraries/Menu.class.php:325 libraries/Menu.class.php:429
-#: libraries/Menu.class.php:548 libraries/Util.class.php:3334
-#: libraries/Util.class.php:3344 libraries/Util.class.php:3350
-#: libraries/Util.class.php:4313 libraries/Util.class.php:4328
-#: libraries/Util.class.php:4345 libraries/config.values.php:40
+#: libraries/Menu.class.php:548 libraries/Util.class.php:3340
+#: libraries/Util.class.php:3350 libraries/Util.class.php:3356
+#: libraries/Util.class.php:4319 libraries/Util.class.php:4334
+#: libraries/Util.class.php:4351 libraries/config.values.php:40
 #: libraries/config.values.php:48 libraries/config.values.php:110
 #: libraries/config.values.php:116 libraries/config/messages.inc.php:321
 #: libraries/navigation/Nodes/Node_Table.class.php:292
@@ -4073,19 +4084,19 @@ msgid "SQL"
 msgstr "SQL"
 
 #: libraries/Menu.class.php:328 libraries/Menu.class.php:432
-#: libraries/Util.class.php:3335 libraries/Util.class.php:3345
-#: libraries/Util.class.php:3351 libraries/Util.class.php:3625
-#: libraries/Util.class.php:3626 libraries/Util.class.php:4329
-#: libraries/Util.class.php:4346 libraries/config.values.php:41
+#: libraries/Util.class.php:3341 libraries/Util.class.php:3351
+#: libraries/Util.class.php:3357 libraries/Util.class.php:3631
+#: libraries/Util.class.php:3632 libraries/Util.class.php:4335
+#: libraries/Util.class.php:4352 libraries/config.values.php:41
 #: libraries/config.values.php:49 libraries/config.values.php:111
 #: libraries/config.values.php:117
 #: libraries/navigation/Nodes/Node_Table.class.php:286
 msgid "Search"
 msgstr "Pesquisar"
 
-#: libraries/Menu.class.php:338 libraries/Util.class.php:3336
-#: libraries/Util.class.php:3346 libraries/Util.class.php:3627
-#: libraries/Util.class.php:3628 libraries/Util.class.php:4347
+#: libraries/Menu.class.php:338 libraries/Util.class.php:3342
+#: libraries/Util.class.php:3352 libraries/Util.class.php:3633
+#: libraries/Util.class.php:3634 libraries/Util.class.php:4353
 #: libraries/config.values.php:42 libraries/config.values.php:50
 #: libraries/config.values.php:118
 #: libraries/navigation/Nodes/Node_Table.class.php:289
@@ -4094,30 +4105,30 @@ msgid "Insert"
 msgstr "Insere"
 
 #: libraries/Menu.class.php:362 libraries/Menu.class.php:467
-#: libraries/Util.class.php:4334 libraries/Util.class.php:4350
+#: libraries/Util.class.php:4340 libraries/Util.class.php:4356
 #: libraries/config.values.php:106 libraries/server_common.lib.php:51
 #: libraries/server_privileges.lib.php:2370
 #: libraries/server_privileges.lib.php:3158
-#: libraries/server_privileges.lib.php:4221
+#: libraries/server_privileges.lib.php:4247
 msgid "Privileges"
 msgstr "Privilégios"
 
 #: libraries/Menu.class.php:371 libraries/Menu.class.php:379
-#: libraries/Menu.class.php:459 libraries/Util.class.php:3338
-#: libraries/Util.class.php:3352 libraries/Util.class.php:4333
-#: libraries/Util.class.php:4351 libraries/config.values.php:112
+#: libraries/Menu.class.php:459 libraries/Util.class.php:3344
+#: libraries/Util.class.php:3358 libraries/Util.class.php:4339
+#: libraries/Util.class.php:4357 libraries/config.values.php:112
 #: view_operations.php:92
 msgid "Operations"
 msgstr "Operações"
 
 #: libraries/Menu.class.php:384 libraries/Menu.class.php:492
-#: libraries/Util.class.php:4338 libraries/Util.class.php:4352
+#: libraries/Util.class.php:4344 libraries/Util.class.php:4358
 #: libraries/relation.lib.php:255
 msgid "Tracking"
 msgstr "Rastreando"
 
 #: libraries/Menu.class.php:397 libraries/Menu.class.php:486
-#: libraries/Util.class.php:4337 libraries/Util.class.php:4353
+#: libraries/Util.class.php:4343 libraries/Util.class.php:4359
 #: libraries/navigation/Nodes/Node_Trigger_Container.class.php:24
 #: libraries/plugins/export/ExportHtmlword.class.php:557
 #: libraries/plugins/export/ExportOdt.class.php:685
@@ -4134,16 +4145,16 @@ msgstr "Acionadores"
 msgid "Database seems to be empty!"
 msgstr "A Base de Dados aparenta estar vazia!"
 
-#: libraries/Menu.class.php:439 libraries/Util.class.php:4330
+#: libraries/Menu.class.php:439 libraries/Util.class.php:4336
 msgid "Query"
 msgstr "Pesquisa por formulário"
 
-#: libraries/Menu.class.php:472 libraries/Util.class.php:4335
+#: libraries/Menu.class.php:472 libraries/Util.class.php:4341
 #: libraries/rte/rte_words.lib.php:36
 msgid "Routines"
 msgstr "Rotinas"
 
-#: libraries/Menu.class.php:479 libraries/Util.class.php:4336
+#: libraries/Menu.class.php:479 libraries/Util.class.php:4342
 #: libraries/navigation/Nodes/Node_Event_Container.class.php:26
 #: libraries/plugins/export/ExportSql.class.php:940
 #: libraries/plugins/export/ExportXml.class.php:107
@@ -4151,20 +4162,20 @@ msgstr "Rotinas"
 msgid "Events"
 msgstr "Eventos"
 
-#: libraries/Menu.class.php:498 libraries/Util.class.php:4339
+#: libraries/Menu.class.php:498 libraries/Util.class.php:4345
 msgid "Designer"
 msgstr "Desenhador"
 
-#: libraries/Menu.class.php:507 libraries/Util.class.php:4340
-#: templates/structure/check_all_tables.phtml:35
+#: libraries/Menu.class.php:507 libraries/Util.class.php:4346
+#: templates/database/structure/check_all_tables.phtml:35
 msgid "Central columns"
 msgstr "Colunas centrais"
 
-#: libraries/Menu.class.php:544 libraries/Util.class.php:4312
+#: libraries/Menu.class.php:544 libraries/Util.class.php:4318
 #: libraries/config.values.php:103 libraries/config/messages.inc.php:266
 #: libraries/config/messages.inc.php:341
 #: libraries/navigation/NavigationTree.class.php:1239
-#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4332
+#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4358
 msgid "Databases"
 msgstr "Base de Dados"
 
@@ -4175,34 +4186,34 @@ msgid "User accounts"
 msgstr "Utilizadores"
 
 #: libraries/Menu.class.php:595 libraries/ServerStatusData.class.php:121
-#: libraries/Util.class.php:4319 libraries/server_common.lib.php:36
+#: libraries/Util.class.php:4325 libraries/server_common.lib.php:36
 msgid "Binary log"
 msgstr "Registo binário"
 
 #: libraries/Menu.class.php:601 libraries/ServerStatusData.class.php:126
-#: libraries/Util.class.php:4320 libraries/server_common.lib.php:42
-#: templates/structure/body_for_table_summary.phtml:10
-#: templates/structure/table_header.phtml:27
+#: libraries/Util.class.php:4326 libraries/server_common.lib.php:42
+#: templates/database/structure/body_for_table_summary.phtml:10
+#: templates/database/structure/table_header.phtml:27
 msgid "Replication"
 msgstr "Replicação"
 
 #: libraries/Menu.class.php:606 libraries/ServerStatusData.class.php:193
-#: libraries/Util.class.php:4321 libraries/config.values.php:105
+#: libraries/Util.class.php:4327 libraries/config.values.php:105
 #: libraries/server_engines.lib.php:108 libraries/server_engines.lib.php:112
 #: libraries/sql_query_form.lib.php:421
 msgid "Variables"
 msgstr "Variáveis"
 
-#: libraries/Menu.class.php:610 libraries/Util.class.php:4322
+#: libraries/Menu.class.php:610 libraries/Util.class.php:4328
 msgid "Charsets"
 msgstr "Mapas de Caracteres"
 
-#: libraries/Menu.class.php:615 libraries/Util.class.php:4323
+#: libraries/Menu.class.php:615 libraries/Util.class.php:4329
 #: libraries/server_common.lib.php:33 libraries/server_plugins.lib.php:27
 msgid "Plugins"
 msgstr "Plugins"
 
-#: libraries/Menu.class.php:626 libraries/Util.class.php:4324
+#: libraries/Menu.class.php:626 libraries/Util.class.php:4330
 msgid "Engines"
 msgstr "Motores"
 
@@ -4227,7 +4238,7 @@ msgid_plural "%1$d rows inserted."
 msgstr[0] "%1$d linha inserida."
 msgstr[1] "%1$d linha(s) inseridas."
 
-#: libraries/PDF.class.php:70 libraries/Util.class.php:2521
+#: libraries/PDF.class.php:70 libraries/Util.class.php:2527
 #: libraries/browse_foreigners.lib.php:327
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:865
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:890
@@ -4248,7 +4259,7 @@ msgid "Could not save favorite table!"
 msgstr "Não foi possível guardar a tabela favorita!"
 
 #: libraries/RecentFavoriteTable.class.php:212
-#: templates/structure/favorite_anchor.phtml:12
+#: templates/database/structure/favorite_anchor.phtml:12
 msgid "Remove from Favorites"
 msgstr "Remover dos Favoritos"
 
@@ -4415,7 +4426,7 @@ msgstr ""
 "armazenamento."
 
 #: libraries/StorageEngine.class.php:373
-#: templates/structure/body_for_table_summary.phtml:50
+#: templates/database/structure/body_for_table_summary.phtml:50
 #, php-format
 msgid "%s is the default storage engine on this MySQL server."
 msgstr "%s é o storage engine por defeito neste MySQL server."
@@ -4902,10 +4913,10 @@ msgstr ""
 
 #: libraries/Util.class.php:726 libraries/rte/rte_events.lib.php:110
 #: libraries/rte/rte_events.lib.php:119 libraries/rte/rte_events.lib.php:150
-#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:153
-#: libraries/rte/rte_routines.lib.php:162
-#: libraries/rte/rte_routines.lib.php:235
-#: libraries/rte/rte_routines.lib.php:1366
+#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:223
+#: libraries/rte/rte_routines.lib.php:250
+#: libraries/rte/rte_routines.lib.php:372
+#: libraries/rte/rte_routines.lib.php:1457
 #: libraries/rte/rte_triggers.lib.php:86 libraries/rte/rte_triggers.lib.php:95
 #: libraries/rte/rte_triggers.lib.php:127
 msgid "MySQL said: "
@@ -4951,75 +4962,78 @@ msgstr "Dom"
 msgid "%B %d, %Y at %I:%M %p"
 msgstr "%d-%B-%Y às %H:%M"
 
-#: libraries/Util.class.php:2019
+#: libraries/Util.class.php:2025
 #, php-format
 msgid "%s days, %s hours, %s minutes and %s seconds"
 msgstr "%s dias, %s horas, %s minutos e %s segundos"
 
-#: libraries/Util.class.php:2112
+#: libraries/Util.class.php:2118
 msgid "Missing parameter:"
 msgstr "Parâmetros em falta:"
 
-#: libraries/Util.class.php:2645
+#: libraries/Util.class.php:2651
 #, php-format
 msgid "Jump to database \"%s\"."
 msgstr "Saltar para a Base de Dados \"%s\"."
 
-#: libraries/Util.class.php:2670
+#: libraries/Util.class.php:2676
 #, php-format
 msgid "The %s functionality is affected by a known bug, see %s"
 msgstr "A funcionalidade %s é afectada por um bug conhecido, veja %s"
 
-#: libraries/Util.class.php:2881
+#: libraries/Util.class.php:2887
 msgid "Click to toggle"
 msgstr "Clique para alternar"
 
-#: libraries/Util.class.php:3542 prefs_manage.php:248
+#: libraries/Util.class.php:3548 prefs_manage.php:248
 msgid "Browse your computer:"
 msgstr "Procurar no seu computador:"
 
-#: libraries/Util.class.php:3567
+#: libraries/Util.class.php:3573
 #, php-format
 msgid "Select from the web server upload directory <b>%s</b>:"
 msgstr "Selecionar a partir da directoria de upload do servidor <b>%s</b>:"
 
-#: libraries/Util.class.php:3596 libraries/insert_edit.lib.php:1173
+#: libraries/Util.class.php:3602 libraries/insert_edit.lib.php:1171
 msgid "The directory you set for upload work cannot be reached."
 msgstr "Não é possivel alcançar a directoria que configurou para fazer upload."
 
-#: libraries/Util.class.php:3607
+#: libraries/Util.class.php:3613
 msgid "There are no files to upload!"
 msgstr "Não existem ficheiros para fazer upload!"
 
-#: libraries/Util.class.php:3632 libraries/Util.class.php:3633
-#: templates/structure/check_all_tables.phtml:15
+#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: templates/database/structure/check_all_tables.phtml:15
 msgid "Empty"
 msgstr "Limpa"
 
-#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: libraries/Util.class.php:3644 libraries/Util.class.php:3645
 msgid "Execute"
 msgstr "Executar"
 
-#: libraries/Util.class.php:4152
+#: libraries/Util.class.php:4158
 msgid "Print"
 msgstr "Imprimir"
 
-#: libraries/Util.class.php:4257 templates/structure/row_stats_table.phtml:80
-#: templates/structure/table_header.phtml:95
+#: libraries/Util.class.php:4263
+#: templates/database/structure/table_header.phtml:95
+#: templates/table/structure/row_stats_table.phtml:80
 msgid "Creation"
 msgstr "Criação"
 
-#: libraries/Util.class.php:4263 templates/structure/row_stats_table.phtml:87
-#: templates/structure/table_header.phtml:106
+#: libraries/Util.class.php:4269
+#: templates/database/structure/table_header.phtml:106
+#: templates/table/structure/row_stats_table.phtml:87
 msgid "Last update"
 msgstr "Última actualização"
 
-#: libraries/Util.class.php:4269 templates/structure/row_stats_table.phtml:94
-#: templates/structure/table_header.phtml:117
+#: libraries/Util.class.php:4275
+#: templates/database/structure/table_header.phtml:117
+#: templates/table/structure/row_stats_table.phtml:94
 msgid "Last check"
 msgstr "Última Verificação"
 
-#: libraries/Util.class.php:4315
+#: libraries/Util.class.php:4321
 msgid "Users"
 msgstr "Utilizadores"
 
@@ -5040,16 +5054,16 @@ msgid "Use this value"
 msgstr "Utilizar este valor"
 
 #: libraries/build_html_for_db.lib.php:33 libraries/import.lib.php:193
-#: templates/structure/actions_in_table_structure.phtml:113
-#: templates/structure/row_stats_table.phtml:42
-#: templates/structure/table_header.phtml:36
+#: templates/database/structure/table_header.phtml:36
+#: templates/table/structure/actions_in_table_structure.phtml:113
+#: templates/table/structure/row_stats_table.phtml:42
 msgid "Rows"
 msgstr "Registos"
 
 #: libraries/build_html_for_db.lib.php:48 libraries/engines/innodb.lib.php:171
-#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:186
-#: libraries/server_status.lib.php:298
-#: templates/structure/display_table_stats.phtml:40
+#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:195
+#: libraries/server_status.lib.php:307
+#: templates/table/structure/display_table_stats.phtml:40
 msgid "Total"
 msgstr "Total"
 
@@ -5058,10 +5072,12 @@ msgid "Jump to database"
 msgstr "Ir para base de dados"
 
 #: libraries/build_html_for_db.lib.php:146
+#: templates/database/structure/structure_table_row.phtml:15
 msgid "Not replicated"
 msgstr "Não replicado"
 
 #: libraries/build_html_for_db.lib.php:158
+#: templates/database/structure/structure_table_row.phtml:16
 msgid "Replicated"
 msgstr "Replicado"
 
@@ -5118,17 +5134,17 @@ msgstr ""
 #: libraries/plugins/export/ExportTexytext.class.php:425
 #: libraries/plugins/export/PMA_ExportPdf.class.php:307
 #: libraries/rte/rte_list.lib.php:73 libraries/rte/rte_list.lib.php:85
-#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:830
-#: libraries/rte/rte_routines.lib.php:1492 setup/frames/index.inc.php:162
+#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:921
+#: libraries/rte/rte_routines.lib.php:1583 setup/frames/index.inc.php:162
 #: templates/columns_definitions/table_fields_definitions.phtml:8
-#: templates/structure/table_structure_header.phtml:5
-#: templates/table/create_table.phtml:11
+#: templates/database/create_table.phtml:11
+#: templates/table/structure/table_structure_header.phtml:5
 msgid "Name"
 msgstr "Nome"
 
 #: libraries/central_columns.lib.php:699
 #: libraries/central_columns.lib.php:1381
-#: libraries/rte/rte_routines.lib.php:832
+#: libraries/rte/rte_routines.lib.php:923
 #: templates/columns_definitions/table_fields_definitions.phtml:14
 msgid "Length/Values"
 msgstr "Tamanho/Valores*"
@@ -5151,7 +5167,7 @@ msgid "Select a table"
 msgstr "Seleccionar Tabelas"
 
 #: libraries/central_columns.lib.php:804
-#: templates/structure/add_column.phtml:4
+#: templates/table/structure/add_column.phtml:4
 #, fuzzy
 msgid "Add column"
 msgstr "Adiciona novo campo"
@@ -5171,7 +5187,7 @@ msgstr "Adiciona novo campo"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1002
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1025
 #: templates/columns_definitions/table_fields_definitions.phtml:36
-#: templates/structure/table_structure_header.phtml:8
+#: templates/table/structure/table_structure_header.phtml:8
 msgid "Attributes"
 msgstr "Atributos"
 
@@ -5286,7 +5302,7 @@ msgid "Double click"
 msgstr "Duplo clique"
 
 #: libraries/config.values.php:95 libraries/config.values.php:124
-#: libraries/config/FormDisplay.tpl.php:221 libraries/relation.lib.php:97
+#: libraries/config/FormDisplay.tpl.php:232 libraries/relation.lib.php:97
 #: libraries/relation.lib.php:105
 msgid "Disabled"
 msgstr "Desactidado"
@@ -5466,22 +5482,22 @@ msgstr "A exportação comprimida não funcionará devido à falta da função %
 msgid "maximum %s"
 msgstr "máximo %s"
 
-#: libraries/config/FormDisplay.tpl.php:219
+#: libraries/config/FormDisplay.tpl.php:230
 msgid "This setting is disabled, it will not be applied to your configuration."
 msgstr ""
 "Esta configuração está desactivada, não será aplicada à sua configuração."
 
-#: libraries/config/FormDisplay.tpl.php:313
+#: libraries/config/FormDisplay.tpl.php:324
 #, php-format
 msgid "Set value: %s"
 msgstr "Definir valor: %s"
 
-#: libraries/config/FormDisplay.tpl.php:318
+#: libraries/config/FormDisplay.tpl.php:329
 #: libraries/config/messages.inc.php:610
 msgid "Restore default value"
 msgstr "Restaurar valor padrão"
 
-#: libraries/config/FormDisplay.tpl.php:332
+#: libraries/config/FormDisplay.tpl.php:343
 msgid "Allow users to customize this value"
 msgstr "Permitir utilizadores personalizar este valor"
 
@@ -5986,7 +6002,7 @@ msgstr "Configurar o Mapa de Caracteres do ficheiro"
 
 #: libraries/config/messages.inc.php:136 libraries/config/messages.inc.php:152
 #: libraries/sql_query_form.lib.php:247
-#: templates/structure/row_stats_table.phtml:7
+#: templates/table/structure/row_stats_table.phtml:7
 msgid "Format"
 msgstr "Formato"
 
@@ -6519,7 +6535,7 @@ msgstr ""
 
 #: libraries/config/messages.inc.php:332
 #: libraries/plugins/export/ExportPdf.class.php:279
-#: templates/structure/secondary_tabs.phtml:8
+#: templates/table/secondary_tabs.phtml:8
 msgid "Table structure"
 msgstr "Estrutura da tabela"
 
@@ -8289,109 +8305,35 @@ msgstr "Microsoft Word 2000"
 msgid "OpenDocument Text"
 msgstr "Texto OpenDocument"
 
-#: libraries/controllers/StructureController.class.php:465
+#: libraries/controllers/DatabaseStructureController.class.php:405
 #: tbl_operations.php:382
 #, php-format
 msgid "Table %s has been emptied."
 msgstr "A tabela %s foi limpa."
 
-#: libraries/controllers/StructureController.class.php:486
+#: libraries/controllers/DatabaseStructureController.class.php:426
 #: tbl_operations.php:400 view_operations.php:119
 #, fuzzy, php-format
 #| msgid "View %s has been dropped."
 msgid "View %s has been dropped."
 msgstr "A Vista %s foi eliminada"
 
-#: libraries/controllers/StructureController.class.php:487
+#: libraries/controllers/DatabaseStructureController.class.php:427
 #: tbl_operations.php:401
 #, fuzzy, php-format
 #| msgid "Table %s has been dropped."
 msgid "Table %s has been dropped."
 msgstr "A tabela %s foi eliminada"
 
-#: libraries/controllers/StructureController.class.php:797
-#, php-format
-msgid "The name '%s' is a MySQL reserved keyword."
-msgid_plural "The names '%s' are MySQL reserved keywords."
-msgstr[0] ""
-msgstr[1] ""
-
-#: libraries/controllers/StructureController.class.php:875
-msgid "No column selected."
-msgstr "Nenhuma coluna seleccionada."
-
-#: libraries/controllers/StructureController.class.php:1049
+#: libraries/controllers/DatabaseStructureController.class.php:733
 msgid "Favorite List is full!"
 msgstr "Lista de Favoritos está cheia!"
 
-#: libraries/controllers/StructureController.class.php:1272
-#, fuzzy
-#| msgid "The selected users have been deleted successfully."
-msgid "The columns have been moved successfully."
-msgstr "Os utilizadores selecionado foram apagados com sucesso."
-
-#: libraries/controllers/StructureController.class.php:1535
-#, fuzzy, php-format
-msgid ""
-"Table %1$s has been altered successfully. Privileges have been adjusted."
-msgstr "Os utilizadores selecionado foram apagados com sucesso."
-
-#: libraries/controllers/StructureController.class.php:1541
-#: libraries/controllers/TableIndexesController.class.php:161
-#: tbl_addfield.php:92
-#, fuzzy, php-format
-msgid "Table %1$s has been altered successfully."
-msgstr "Os utilizadores selecionado foram apagados com sucesso."
-
-#: libraries/controllers/StructureController.class.php:1588
-#: libraries/tracking.lib.php:1094
-#, fuzzy
-#| msgid "Query type"
-msgid "Query error"
-msgstr "Tipo de Query"
-
-#: libraries/controllers/StructureController.class.php:1806
+#: libraries/controllers/DatabaseStructureController.class.php:947
 #: libraries/mysql_charsets.lib.php:366 libraries/mysql_charsets.lib.php:373
 msgid "unknown"
 msgstr "desconhecido"
 
-#: libraries/controllers/StructureController.class.php:1957
-#: templates/structure/check_all_table_column.phtml:11
-msgid "Change"
-msgstr "Muda"
-
-#: libraries/controllers/StructureController.class.php:1961
-#: libraries/controllers/StructureController.class.php:1966
-#: libraries/navigation/Nodes/Node_Index.class.php:30
-#: libraries/tracking.lib.php:926
-#: templates/columns_definitions/column_indexes.phtml:16
-#: templates/columns_definitions/table_fields_definitions.phtml:57
-#: templates/structure/check_all_table_column.phtml:30
-#: templates/structure/display_structure.phtml:79
-#: templates/structure/display_table_stats.phtml:19
-msgid "Index"
-msgstr "Índice"
-
-#: libraries/controllers/StructureController.class.php:1963
-#: libraries/controllers/StructureController.class.php:1968
-#: templates/columns_definitions/column_indexes.phtml:27
-#: templates/structure/check_all_table_column.phtml:37
-msgid "Spatial"
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1964
-#: libraries/controllers/StructureController.class.php:1969
-#: templates/columns_definitions/column_indexes.phtml:22
-#: templates/structure/check_all_table_column.phtml:47
-msgid "Fulltext"
-msgstr "Texto Completo"
-
-#: libraries/controllers/StructureController.class.php:1970
-#, fuzzy
-#| msgid "Session value"
-msgid "Distinct values"
-msgstr "Valor de sessão"
-
 #: libraries/controllers/TableChartController.class.php:82
 #: libraries/controllers/TableGisVisualizationController.class.php:101
 msgid "No SQL query was set to fetch data."
@@ -8407,11 +8349,18 @@ msgstr ""
 msgid "No data to display"
 msgstr "Dados não encontrados."
 
-#: libraries/controllers/TableRelationController.class.php:217
+#: libraries/controllers/TableIndexesController.class.php:161
+#: libraries/controllers/TableStructureController.class.php:736
+#: tbl_addfield.php:92
+#, fuzzy, php-format
+msgid "Table %1$s has been altered successfully."
+msgstr "Os utilizadores selecionado foram apagados com sucesso."
+
+#: libraries/controllers/TableRelationController.class.php:218
 msgid "Display column was successfully updated."
 msgstr ""
 
-#: libraries/controllers/TableRelationController.class.php:283
+#: libraries/controllers/TableRelationController.class.php:288
 #, fuzzy
 #| msgid "Internal relation added"
 msgid "Internal relations were successfully updated."
@@ -8430,12 +8379,79 @@ msgid "Zoom search"
 msgstr "Pesquisa Avançada"
 
 #: libraries/controllers/TableSearchController.class.php:852
-#: templates/table/selection_form.phtml:59
+#: templates/table/search/selection_form.phtml:59
 #, fuzzy
 #| msgid "Find and Replace"
 msgid "Find and replace"
 msgstr "Localizar e substituir"
 
+#: libraries/controllers/TableStructureController.class.php:163
+#, php-format
+msgid "The name '%s' is a MySQL reserved keyword."
+msgid_plural "The names '%s' are MySQL reserved keywords."
+msgstr[0] ""
+msgstr[1] ""
+
+#: libraries/controllers/TableStructureController.class.php:241
+msgid "No column selected."
+msgstr "Nenhuma coluna seleccionada."
+
+#: libraries/controllers/TableStructureController.class.php:467
+#, fuzzy
+#| msgid "The selected users have been deleted successfully."
+msgid "The columns have been moved successfully."
+msgstr "Os utilizadores selecionado foram apagados com sucesso."
+
+#: libraries/controllers/TableStructureController.class.php:730
+#, fuzzy, php-format
+msgid ""
+"Table %1$s has been altered successfully. Privileges have been adjusted."
+msgstr "Os utilizadores selecionado foram apagados com sucesso."
+
+#: libraries/controllers/TableStructureController.class.php:783
+#: libraries/tracking.lib.php:1094
+#, fuzzy
+#| msgid "Query type"
+msgid "Query error"
+msgstr "Tipo de Query"
+
+#: libraries/controllers/TableStructureController.class.php:948
+#: templates/table/structure/check_all_table_column.phtml:11
+msgid "Change"
+msgstr "Muda"
+
+#: libraries/controllers/TableStructureController.class.php:952
+#: libraries/controllers/TableStructureController.class.php:957
+#: libraries/navigation/Nodes/Node_Index.class.php:30
+#: libraries/tracking.lib.php:926
+#: templates/columns_definitions/column_indexes.phtml:16
+#: templates/columns_definitions/table_fields_definitions.phtml:57
+#: templates/table/structure/check_all_table_column.phtml:30
+#: templates/table/structure/display_structure.phtml:79
+#: templates/table/structure/display_table_stats.phtml:19
+msgid "Index"
+msgstr "Índice"
+
+#: libraries/controllers/TableStructureController.class.php:954
+#: libraries/controllers/TableStructureController.class.php:959
+#: templates/columns_definitions/column_indexes.phtml:27
+#: templates/table/structure/check_all_table_column.phtml:37
+msgid "Spatial"
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:955
+#: libraries/controllers/TableStructureController.class.php:960
+#: templates/columns_definitions/column_indexes.phtml:22
+#: templates/table/structure/check_all_table_column.phtml:47
+msgid "Fulltext"
+msgstr "Texto Completo"
+
+#: libraries/controllers/TableStructureController.class.php:963
+#, fuzzy
+#| msgid "Session value"
+msgid "Distinct values"
+msgstr "Valor de sessão"
+
 #: libraries/core.lib.php:306
 #, php-format
 msgid "The %s extension is missing. Please check your PHP configuration."
@@ -8488,7 +8504,7 @@ msgid "No Password"
 msgstr "Sem palavra-passe"
 
 #: libraries/display_change_password.lib.php:68
-#: libraries/plugins/auth/AuthenticationCookie.class.php:199
+#: libraries/plugins/auth/AuthenticationCookie.class.php:187
 #: libraries/replication_gui.lib.php:422 libraries/replication_gui.lib.php:862
 #: libraries/server_privileges.lib.php:1640
 msgid "Password:"
@@ -9276,12 +9292,12 @@ msgid "Dump has been saved to file %s."
 msgstr "O Dump foi gravado para o ficheiro %s."
 
 #: libraries/import.lib.php:202 libraries/insert_edit.lib.php:124
-#: libraries/rte/rte_routines.lib.php:1353 libraries/sql.lib.php:1312
+#: libraries/rte/rte_routines.lib.php:1444 libraries/sql.lib.php:1306
 #: tbl_get_field.php:44
 msgid "MySQL returned an empty result set (i.e. zero rows)."
 msgstr "MySQL não retornou nenhum registo."
 
-#: libraries/import.lib.php:265 libraries/sql.lib.php:1326
+#: libraries/import.lib.php:265 libraries/sql.lib.php:1320
 msgid "[ROLLBACK occurred.]"
 msgstr ""
 
@@ -9347,14 +9363,14 @@ msgstr "Criar um índice com&nbsp;%s&nbsp;coluna(s)"
 
 #: libraries/insert_edit.lib.php:233
 #: libraries/navigation/Nodes/Node_DatabaseChild.class.php:48
-#: templates/designer/table_list.phtml:40
+#: templates/database/designer/table_list.phtml:40
 msgid "Hide"
 msgstr "Esconder"
 
 #: libraries/insert_edit.lib.php:249
 #: libraries/navigation/Nodes/Node_Function.class.php:32
-#: libraries/rte/rte_routines.lib.php:1495
-#: templates/table/table_header.phtml:4
+#: libraries/rte/rte_routines.lib.php:1586
+#: templates/table/search/table_header.phtml:4
 msgid "Function"
 msgstr "Funções"
 
@@ -9369,86 +9385,87 @@ msgstr "Binário"
 msgid "Because of its length,<br /> this column might not be editable."
 msgstr "Devido ao seu tamanho,<br /> este campo pode não ser editável "
 
-#: libraries/insert_edit.lib.php:1050
+#: libraries/insert_edit.lib.php:1048
 msgid "Binary - do not edit"
 msgstr "Binário - não editar"
 
-#: libraries/insert_edit.lib.php:1176 libraries/server_privileges.lib.php:470
-#: templates/table/options.phtml:36
+#: libraries/insert_edit.lib.php:1174 libraries/server_privileges.lib.php:470
+#: templates/table/search/options.phtml:36
 msgid "Or"
 msgstr "Ou"
 
-#: libraries/insert_edit.lib.php:1177
+#: libraries/insert_edit.lib.php:1175
 #, fuzzy
 #| msgid "web server upload directory"
 msgid "web server upload directory:"
 msgstr "Directoria no servidor web para fazer upload"
 
-#: libraries/insert_edit.lib.php:1348 templates/table/input_box.phtml:49
+#: libraries/insert_edit.lib.php:1346
+#: templates/table/search/input_box.phtml:49
 msgid "Edit/Insert"
 msgstr "Inserir/Editar"
 
-#: libraries/insert_edit.lib.php:1398
+#: libraries/insert_edit.lib.php:1396
 #, php-format
 msgid "Continue insertion with %s rows"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1428
+#: libraries/insert_edit.lib.php:1426
 msgid "and then"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1461
+#: libraries/insert_edit.lib.php:1459
 msgid "Insert as new row"
 msgstr "Insere como novo registo"
 
-#: libraries/insert_edit.lib.php:1464
+#: libraries/insert_edit.lib.php:1462
 msgid "Insert as new row and ignore errors"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1467
+#: libraries/insert_edit.lib.php:1465
 msgid "Show insert query"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1487
+#: libraries/insert_edit.lib.php:1485
 msgid "Go back to previous page"
 msgstr "Voltar atrás"
 
-#: libraries/insert_edit.lib.php:1490
+#: libraries/insert_edit.lib.php:1488
 msgid "Insert another new row"
 msgstr "Inserir novo registo"
 
-#: libraries/insert_edit.lib.php:1495
+#: libraries/insert_edit.lib.php:1493
 #, fuzzy
 msgid "Go back to this page"
 msgstr "Voltar atrás"
 
-#: libraries/insert_edit.lib.php:1518
+#: libraries/insert_edit.lib.php:1516
 msgid "Edit next row"
 msgstr "Editar próxima coluna"
 
-#: libraries/insert_edit.lib.php:1540
+#: libraries/insert_edit.lib.php:1538
 msgid ""
 "Use TAB key to move from value to value, or CTRL+arrows to move anywhere"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1577 libraries/replication_gui.lib.php:542
-#: libraries/rte/rte_routines.lib.php:1497
+#: libraries/insert_edit.lib.php:1575 libraries/replication_gui.lib.php:542
+#: libraries/rte/rte_routines.lib.php:1588
 #: libraries/server_status_variables.lib.php:220
-#: templates/designer/having_query_panel.phtml:100
-#: templates/designer/options_panel.phtml:73
-#: templates/designer/options_panel.phtml:239
-#: templates/designer/where_query_panel.phtml:69
-#: templates/table/table_header.phtml:10
-#: templates/table/zoom_result_form.phtml:35
+#: templates/database/designer/having_query_panel.phtml:100
+#: templates/database/designer/options_panel.phtml:73
+#: templates/database/designer/options_panel.phtml:239
+#: templates/database/designer/where_query_panel.phtml:69
+#: templates/table/search/table_header.phtml:10
+#: templates/table/search/zoom_result_form.phtml:35
 msgid "Value"
 msgstr "Valor"
 
-#: libraries/insert_edit.lib.php:1937 libraries/sql.lib.php:1309
+#: libraries/insert_edit.lib.php:1935 libraries/sql.lib.php:1303
 #, fuzzy
 msgid "Showing SQL query"
 msgstr "Mostrar queries completos"
 
-#: libraries/insert_edit.lib.php:1962 libraries/sql.lib.php:1287
+#: libraries/insert_edit.lib.php:1960 libraries/sql.lib.php:1281
 #, php-format
 msgid "Inserted row id: %1$d"
 msgstr ""
@@ -9902,7 +9919,7 @@ msgstr ""
 #: libraries/navigation/Nodes/Node_View_Container.class.php:26
 #: libraries/navigation/Nodes/Node_View_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:129
-#: templates/structure/show_create.phtml:30
+#: templates/database/structure/show_create.phtml:30
 msgid "Views"
 msgstr ""
 
@@ -10210,7 +10227,7 @@ msgstr "Não tem permissões suficientes para aceder aqui, neste momento!"
 
 #: libraries/operations.lib.php:101 libraries/operations.lib.php:249
 #: libraries/operations.lib.php:869 libraries/operations.lib.php:963
-#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:907
+#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:998
 #: templates/columns_definitions/table_fields_definitions.phtml:47
 #, fuzzy
 #| msgid "Edit Privileges"
@@ -10304,22 +10321,22 @@ msgid "Switch to copied table"
 msgstr "Mudar para a tabela copiada"
 
 #: libraries/operations.lib.php:1360
-#: templates/structure/check_all_tables.phtml:18
+#: templates/database/structure/check_all_tables.phtml:18
 msgid "Table maintenance"
 msgstr "Manutenção da tabela"
 
 #: libraries/operations.lib.php:1398
-#: templates/structure/check_all_tables.phtml:19
+#: templates/database/structure/check_all_tables.phtml:19
 msgid "Analyze table"
 msgstr "Analizar tabela"
 
 #: libraries/operations.lib.php:1413
-#: templates/structure/check_all_tables.phtml:20
+#: templates/database/structure/check_all_tables.phtml:20
 msgid "Check table"
 msgstr "Verificar tabela"
 
 #: libraries/operations.lib.php:1428
-#: templates/structure/check_all_tables.phtml:22
+#: templates/database/structure/check_all_tables.phtml:22
 #, fuzzy
 #| msgid "Check table"
 msgid "Checksum table"
@@ -10341,18 +10358,19 @@ msgid "Flush the table (FLUSH)"
 msgstr "Fecha a tabela (\"FLUSH\")"
 
 #: libraries/operations.lib.php:1477
-#: templates/structure/check_all_tables.phtml:23
-#: templates/structure/display_table_stats.phtml:56
+#: templates/database/structure/check_all_tables.phtml:23
+#: templates/table/structure/display_table_stats.phtml:56
 msgid "Optimize table"
 msgstr "Optimizar tabela"
 
 #: libraries/operations.lib.php:1492
-#: templates/structure/check_all_tables.phtml:24
+#: templates/database/structure/check_all_tables.phtml:24
 msgid "Repair table"
 msgstr "Reparar tabela"
 
 #: libraries/operations.lib.php:1538
-#: templates/structure/check_all_tables.phtml:14 view_operations.php:127
+#: templates/database/structure/check_all_tables.phtml:14
+#: view_operations.php:127
 #, fuzzy
 #| msgid "Dumping data for table"
 msgid "Delete data or table"
@@ -10488,7 +10506,7 @@ msgid "Cannot connect: invalid settings."
 msgstr "Não é possível realizar a ligação: configurações inválidas."
 
 #: libraries/plugins/auth/AuthenticationConfig.class.php:108
-#: libraries/plugins/auth/AuthenticationCookie.class.php:134
+#: libraries/plugins/auth/AuthenticationCookie.class.php:122
 #: libraries/plugins/auth/AuthenticationHttp.class.php:96
 #, php-format
 msgid "Welcome to %s"
@@ -10519,38 +10537,38 @@ msgstr ""
 msgid "Retry to connect"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:146
+#: libraries/plugins/auth/AuthenticationCookie.class.php:134
 msgid "Your session has expired. Please log in again."
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:170
+#: libraries/plugins/auth/AuthenticationCookie.class.php:158
 msgid "Log in"
 msgstr "Entrada"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:178
-#: libraries/plugins/auth/AuthenticationCookie.class.php:188
+#: libraries/plugins/auth/AuthenticationCookie.class.php:166
+#: libraries/plugins/auth/AuthenticationCookie.class.php:176
 msgid "You can enter hostname/IP address and port separated by space."
 msgstr "Pode digitar a nome/Endereço IP e a porta separados por um espaço."
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:193
+#: libraries/plugins/auth/AuthenticationCookie.class.php:181
 msgid "Username:"
 msgstr "Utilizador&nbsp;:"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:205
+#: libraries/plugins/auth/AuthenticationCookie.class.php:193
 #, fuzzy
 #| msgid "Server Choice"
 msgid "Server Choice:"
 msgstr "Escolha do Servidor"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:386
+#: libraries/plugins/auth/AuthenticationCookie.class.php:374
 msgid "Entered captcha is wrong, try again!"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:396
+#: libraries/plugins/auth/AuthenticationCookie.class.php:384
 msgid "Please enter correct captcha!"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:423
+#: libraries/plugins/auth/AuthenticationCookie.class.php:411
 #, fuzzy
 #| msgid "Cannot log in to the MySQL server"
 msgid "You are not allowed to log in to this MySQL server!"
@@ -10662,7 +10680,7 @@ msgstr "Enviado"
 #: libraries/plugins/export/ExportOdt.class.php:593
 #: libraries/plugins/export/ExportTexytext.class.php:428
 #: libraries/plugins/export/PMA_ExportPdf.class.php:313
-#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:984
 #: libraries/rte/rte_triggers.lib.php:377
 #, fuzzy
 #| msgid "Description"
@@ -11014,7 +11032,7 @@ msgid "Last check:"
 msgstr "Última verificação:"
 
 #: libraries/plugins/export/ExportSql.class.php:1399
-#: templates/structure/structure_table_row.phtml:183
+#: templates/database/structure/structure_table_row.phtml:183
 msgid "in use"
 msgstr "em utilização"
 
@@ -11215,20 +11233,14 @@ msgstr ""
 msgid "The imported file does not contain any data!"
 msgstr "Esta página não contém tabelas!"
 
-#: libraries/plugins/import/ImportSql.class.php:169
+#: libraries/plugins/import/ImportSql.class.php:72
 msgid "SQL compatibility mode:"
 msgstr ""
 
-#: libraries/plugins/import/ImportSql.class.php:181
+#: libraries/plugins/import/ImportSql.class.php:84
 msgid "Do not use <code>AUTO_INCREMENT</code> for zero values"
 msgstr ""
 
-#: libraries/plugins/import/ImportSql.class.php:195
-#, fuzzy
-#| msgid "Read misses"
-msgid "Read as multibytes"
-msgstr "Falhas de leitura"
-
 #: libraries/plugins/import/ImportXml.class.php:54
 msgid "XML"
 msgstr "XML"
@@ -11271,7 +11283,7 @@ msgid "Show grid"
 msgstr "Mostrar grelha"
 
 #: libraries/plugins/schema/SchemaPdf.class.php:94
-#: templates/structure/print_view_data_dictionary_link.phtml:6
+#: templates/database/structure/print_view_data_dictionary_link.phtml:6
 msgid "Data Dictionary"
 msgstr "Dicionario de dados"
 
@@ -11303,7 +11315,7 @@ msgid "The %s table doesn't exist!"
 msgstr "A tabela \"%s\" não existe!"
 
 #: libraries/plugins/schema/eps/Eps_Relation_Schema.class.php:321
-#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:309
+#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:323
 #, fuzzy, php-format
 #| msgid "Schema of the \"%s\" database - Page %s"
 msgid "Schema of the %s database - Page %s"
@@ -11333,7 +11345,7 @@ msgstr "Índice"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1005
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1028
 #: libraries/tracking.lib.php:884
-#: templates/structure/table_structure_header.phtml:11
+#: templates/table/structure/table_structure_header.phtml:11
 msgid "Extra"
 msgstr "Extra"
 
@@ -11678,32 +11690,32 @@ msgstr ""
 msgid "Create the needed tables with the <code>%screate_tables.sql</code>."
 msgstr ""
 
-#: libraries/relation.lib.php:360
+#: libraries/relation.lib.php:357
 msgid "Create a pma user and give access to these tables."
 msgstr ""
 
-#: libraries/relation.lib.php:365
+#: libraries/relation.lib.php:360
 msgid ""
 "Enable advanced features in configuration file (<code>config.inc.php</"
 "code>), for example by starting from <code>config.sample.inc.php</code>."
 msgstr ""
 
-#: libraries/relation.lib.php:373
+#: libraries/relation.lib.php:365
 msgid "Re-login to phpMyAdmin to load the updated configuration file."
 msgstr ""
 
-#: libraries/relation.lib.php:1612
+#: libraries/relation.lib.php:1607
 msgid "no description"
 msgstr "sem Descrição"
 
-#: libraries/relation.lib.php:1811
+#: libraries/relation.lib.php:1806
 msgid ""
 "You do not have necessary privileges to create a database named "
 "'phpmyadmin'. You may go to 'Operations' tab of any database to set up the "
 "phpMyAdmin configuration storage there."
 msgstr ""
 
-#: libraries/relation.lib.php:1928
+#: libraries/relation.lib.php:1923
 #, fuzzy, php-format
 #| msgid "Missing phpMyAdmin configuration storage tables"
 msgid ""
@@ -11711,21 +11723,21 @@ msgid ""
 "configuration storage there."
 msgstr "Tabelas de configuração de armazenamento phpMyAdmin em falta"
 
-#: libraries/relation.lib.php:1936
+#: libraries/relation.lib.php:1931
 #, fuzzy, php-format
 #| msgid "Missing phpMyAdmin configuration storage tables"
 msgid ""
 "%sCreate%s the phpMyAdmin configuration storage in the current database."
 msgstr "Tabelas de configuração de armazenamento phpMyAdmin em falta"
 
-#: libraries/relation.lib.php:1944
+#: libraries/relation.lib.php:1939
 #, fuzzy, php-format
 #| msgid "Missing phpMyAdmin configuration storage tables"
 msgid "%sCreate%s missing phpMyAdmin configuration storage tables."
 msgstr "Tabelas de configuração de armazenamento phpMyAdmin em falta"
 
 #: libraries/replication_gui.lib.php:46 libraries/replication_gui.lib.php:343
-#: libraries/server_databases.lib.php:387
+#: libraries/server_databases.lib.php:398
 msgid "Master replication"
 msgstr ""
 
@@ -11781,7 +11793,7 @@ msgid ""
 msgstr ""
 
 #: libraries/replication_gui.lib.php:141
-#: libraries/server_databases.lib.php:389
+#: libraries/server_databases.lib.php:400
 msgid "Slave replication"
 msgstr ""
 
@@ -12065,10 +12077,10 @@ msgid "Master server changed successfully to %s."
 msgstr "O privilégios foram recarregados com sucesso."
 
 #: libraries/rte/rte_events.lib.php:106 libraries/rte/rte_events.lib.php:115
-#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:149
-#: libraries/rte/rte_routines.lib.php:158
-#: libraries/rte/rte_routines.lib.php:231
-#: libraries/rte/rte_routines.lib.php:1362
+#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:219
+#: libraries/rte/rte_routines.lib.php:246
+#: libraries/rte/rte_routines.lib.php:368
+#: libraries/rte/rte_routines.lib.php:1453
 #: libraries/rte/rte_triggers.lib.php:82 libraries/rte/rte_triggers.lib.php:91
 #: libraries/rte/rte_triggers.lib.php:123
 #, php-format
@@ -12090,7 +12102,7 @@ msgstr "A tabela %s foi eliminada"
 msgid "Event %1$s has been created."
 msgstr "A tabela %s foi eliminada"
 
-#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:251
+#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:266
 #: libraries/rte/rte_triggers.lib.php:144
 msgid "One or more errors have occurred while processing your request:"
 msgstr ""
@@ -12100,7 +12112,7 @@ msgstr ""
 msgid "Edit event"
 msgstr "Enviado"
 
-#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:794
+#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:885
 #: libraries/rte/rte_triggers.lib.php:323 view_create.php:180
 msgid "Details"
 msgstr ""
@@ -12115,7 +12127,7 @@ msgstr "Tipo de Exportação"
 msgid "Event type"
 msgstr "Tipo de Exportação"
 
-#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:817
+#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:908
 #, fuzzy, php-format
 #| msgid "Change"
 msgid "Change to %s"
@@ -12148,12 +12160,14 @@ msgstr "Fim"
 msgid "On completion preserve"
 msgstr "Instrucções de inserção completas"
 
-#: libraries/rte/rte_events.lib.php:491 libraries/rte/rte_routines.lib.php:930
+#: libraries/rte/rte_events.lib.php:491
+#: libraries/rte/rte_routines.lib.php:1021
 #: libraries/rte/rte_triggers.lib.php:383 view_create.php:209
 msgid "Definer"
 msgstr ""
 
-#: libraries/rte/rte_events.lib.php:535 libraries/rte/rte_routines.lib.php:997
+#: libraries/rte/rte_events.lib.php:535
+#: libraries/rte/rte_routines.lib.php:1088
 #: libraries/rte/rte_triggers.lib.php:422
 msgid "The definer must be in the \"username@hostname\" format!"
 msgstr ""
@@ -12179,9 +12193,9 @@ msgid "You must provide an event definition."
 msgstr ""
 
 #: libraries/rte/rte_export.lib.php:43 libraries/rte/rte_general.lib.php:72
-#: libraries/rte/rte_routines.lib.php:345
-#: libraries/rte/rte_routines.lib.php:1198
-#: libraries/rte/rte_routines.lib.php:1411
+#: libraries/rte/rte_routines.lib.php:153
+#: libraries/rte/rte_routines.lib.php:1289
+#: libraries/rte/rte_routines.lib.php:1502
 #, fuzzy
 #| msgid "Error in Processing Request"
 msgid "Error in processing request:"
@@ -12217,146 +12231,146 @@ msgid ""
 "problems."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:110
-#: libraries/rte/rte_routines.lib.php:1006
+#: libraries/rte/rte_routines.lib.php:123
+msgid "Edit routine"
+msgstr ""
+
+#: libraries/rte/rte_routines.lib.php:200
+#: libraries/rte/rte_routines.lib.php:1097
 #, php-format
 msgid "Invalid routine type: \"%s\""
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:170
+#: libraries/rte/rte_routines.lib.php:253
+#, fuzzy, php-format
+msgid "Routine %1$s has been created."
+msgstr "A tabela %s foi eliminada"
+
+#: libraries/rte/rte_routines.lib.php:380
 msgid "Sorry, we failed to restore the dropped routine."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:211
+#: libraries/rte/rte_routines.lib.php:439
 #, fuzzy, php-format
 #| msgid "Table %s has been dropped."
 msgid "Routine %1$s has been modified. Privileges have been adjusted."
 msgstr "A tabela %s foi eliminada"
 
-#: libraries/rte/rte_routines.lib.php:216
+#: libraries/rte/rte_routines.lib.php:444
 #, fuzzy, php-format
 #| msgid "Table %s has been dropped."
 msgid "Routine %1$s has been modified."
 msgstr "A tabela %s foi eliminada"
 
-#: libraries/rte/rte_routines.lib.php:238
-#, fuzzy, php-format
-msgid "Routine %1$s has been created."
-msgstr "A tabela %s foi eliminada"
-
-#: libraries/rte/rte_routines.lib.php:315
-msgid "Edit routine"
-msgstr ""
-
-#: libraries/rte/rte_routines.lib.php:797
+#: libraries/rte/rte_routines.lib.php:888
 #, fuzzy
 #| msgid "Column names"
 msgid "Routine name"
 msgstr "Nome dos Campos"
 
-#: libraries/rte/rte_routines.lib.php:823
+#: libraries/rte/rte_routines.lib.php:914
 msgid "Parameters"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:829
+#: libraries/rte/rte_routines.lib.php:920
 #, fuzzy
 #| msgid "Creation"
 msgid "Direction"
 msgstr "Criação"
 
-#: libraries/rte/rte_routines.lib.php:847
+#: libraries/rte/rte_routines.lib.php:938
 msgid "Add parameter"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:851
+#: libraries/rte/rte_routines.lib.php:942
 #, fuzzy
 #| msgid "Remove database"
 msgid "Remove last parameter"
 msgstr "Remover a Base de Dados"
 
-#: libraries/rte/rte_routines.lib.php:856
+#: libraries/rte/rte_routines.lib.php:947
 msgid "Return type"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:862
+#: libraries/rte/rte_routines.lib.php:953
 #, fuzzy
 #| msgid "Length/Values"
 msgid "Return length/values"
 msgstr "Tamanho/Valores*"
 
-#: libraries/rte/rte_routines.lib.php:868
+#: libraries/rte/rte_routines.lib.php:959
 #, fuzzy
 #| msgid "Table options"
 msgid "Return options"
 msgstr "Opções da tabela"
 
-#: libraries/rte/rte_routines.lib.php:899
+#: libraries/rte/rte_routines.lib.php:990
 msgid "Is deterministic"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:920
+#: libraries/rte/rte_routines.lib.php:1011
 msgid ""
 "You do not have sufficient privileges to perform this operation; Please "
 "refer to the documentation for more details"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:935
+#: libraries/rte/rte_routines.lib.php:1026
 #, fuzzy
 #| msgid "Query type"
 msgid "Security type"
 msgstr "Tipo de Query"
 
-#: libraries/rte/rte_routines.lib.php:944
+#: libraries/rte/rte_routines.lib.php:1035
 msgid "SQL data access"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1013
+#: libraries/rte/rte_routines.lib.php:1104
 msgid "You must provide a routine name!"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1047
+#: libraries/rte/rte_routines.lib.php:1138
 #, php-format
 msgid "Invalid direction \"%s\" given for parameter."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1069
-#: libraries/rte/rte_routines.lib.php:1131
+#: libraries/rte/rte_routines.lib.php:1160
+#: libraries/rte/rte_routines.lib.php:1222
 msgid ""
 "You must provide length/values for routine parameters of type ENUM, SET, "
 "VARCHAR and VARBINARY."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1095
+#: libraries/rte/rte_routines.lib.php:1186
 msgid "You must provide a name and a type for each routine parameter."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1114
+#: libraries/rte/rte_routines.lib.php:1205
 msgid "You must provide a valid return type for the routine."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1174
+#: libraries/rte/rte_routines.lib.php:1265
 msgid "You must provide a routine definition."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1285
+#: libraries/rte/rte_routines.lib.php:1376
 #, fuzzy, php-format
 msgid "Execution results of routine %s"
 msgstr "Permite criar novas tabelas."
 
-#: libraries/rte/rte_routines.lib.php:1340
+#: libraries/rte/rte_routines.lib.php:1431
 #, php-format
 msgid "%d row affected by the last statement inside the procedure."
 msgid_plural "%d rows affected by the last statement inside the procedure."
 msgstr[0] ""
 msgstr[1] ""
 
-#: libraries/rte/rte_routines.lib.php:1398
-#: libraries/rte/rte_routines.lib.php:1406
+#: libraries/rte/rte_routines.lib.php:1489
+#: libraries/rte/rte_routines.lib.php:1497
 msgid "Execute routine"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1485
-#: libraries/rte/rte_routines.lib.php:1488
+#: libraries/rte/rte_routines.lib.php:1576
+#: libraries/rte/rte_routines.lib.php:1579
 msgid "Routine parameters"
 msgstr ""
 
@@ -12539,7 +12553,7 @@ msgid "Original position"
 msgstr "Posição original"
 
 #: libraries/server_bin_log.lib.php:133
-#: templates/structure/display_table_stats.phtml:4
+#: templates/table/structure/display_table_stats.phtml:4
 #, fuzzy
 msgid "Information"
 msgstr "Informação de Login "
@@ -12578,12 +12592,12 @@ msgstr ""
 "Nota: Activar as estatísticas aqui pode causar um grande volume de tráfego "
 "entre os servidores web e MySQL."
 
-#: libraries/server_databases.lib.php:364
-#: libraries/server_databases.lib.php:365
+#: libraries/server_databases.lib.php:366
+#: libraries/server_databases.lib.php:371
 msgid "Enable Statistics"
 msgstr "Activar as estatísticas"
 
-#: libraries/server_databases.lib.php:481
+#: libraries/server_databases.lib.php:492
 #, fuzzy, php-format
 #| msgid "%s databases have been dropped successfully."
 msgid "%1$d database has been dropped successfully."
@@ -12967,7 +12981,7 @@ msgid "You have revoked the privileges for %s."
 msgstr "Anulou os privilégios para %s."
 
 #: libraries/server_privileges.lib.php:2059
-#: libraries/server_privileges.lib.php:4290
+#: libraries/server_privileges.lib.php:4316
 #, fuzzy
 #| msgid "Add user"
 msgid "Add user account"
@@ -13155,58 +13169,58 @@ msgstr "A apagar %s"
 msgid "The privileges were reloaded successfully."
 msgstr "O privilégios foram recarregados com sucesso."
 
-#: libraries/server_privileges.lib.php:3994
+#: libraries/server_privileges.lib.php:4003
 #, php-format
 msgid "The user %s already exists!"
 msgstr "O utilizador %s já existe!"
 
-#: libraries/server_privileges.lib.php:4232
+#: libraries/server_privileges.lib.php:4258
 #, fuzzy, php-format
 #| msgid "Privileges"
 msgid "Privileges for %s"
 msgstr "Privilégios"
 
-#: libraries/server_privileges.lib.php:4241
+#: libraries/server_privileges.lib.php:4267
 #: libraries/server_status_processes.lib.php:72
 #: libraries/server_user_groups.lib.php:39
 msgid "User"
 msgstr "Utilizador"
 
-#: libraries/server_privileges.lib.php:4282
+#: libraries/server_privileges.lib.php:4308
 msgctxt "Create new user"
 msgid "New"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4311
+#: libraries/server_privileges.lib.php:4337
 #, fuzzy
 #| msgid "Edit Privileges"
 msgid "Edit privileges:"
 msgstr "Alterar Privilegios"
 
-#: libraries/server_privileges.lib.php:4312
+#: libraries/server_privileges.lib.php:4338
 #, fuzzy
 #| msgid "Users"
 msgid "User account"
 msgstr "Utilizadores"
 
-#: libraries/server_privileges.lib.php:4371
+#: libraries/server_privileges.lib.php:4397
 msgid ""
 "Note: You are attempting to edit privileges of the user with which you are "
 "currently logged in."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4391 libraries/server_users.lib.php:25
+#: libraries/server_privileges.lib.php:4417 libraries/server_users.lib.php:25
 msgid "User accounts overview"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4459
+#: libraries/server_privileges.lib.php:4485
 msgid ""
 "A user account allowing any user from localhost to connect is present. This "
 "will prevent other users from connecting if the host part of their account "
 "allows a connection from any (%) host."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4500
+#: libraries/server_privileges.lib.php:4526
 #, php-format
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
@@ -13219,7 +13233,7 @@ msgstr ""
 "privilégios que o servidor usa se alterações manuais nele forem feitas. "
 "Neste caso, deve  %sreload the privileges%s antes de continuar."
 
-#: libraries/server_privileges.lib.php:4519
+#: libraries/server_privileges.lib.php:4545
 #, fuzzy
 #| msgid ""
 #| "Note: phpMyAdmin gets the users' privileges directly from MySQL's "
@@ -13238,65 +13252,65 @@ msgstr ""
 "privilégios que o servidor usa se alterações manuais nele forem feitas. "
 "Neste caso, deve  %sreload the privileges%s antes de continuar."
 
-#: libraries/server_privileges.lib.php:4569
+#: libraries/server_privileges.lib.php:4595
 msgid "The selected user was not found in the privilege table."
 msgstr "O utilizador selecionado não se encontra na tabela de privilégios."
 
-#: libraries/server_privileges.lib.php:4801
+#: libraries/server_privileges.lib.php:4827
 msgid "You have added a new user."
 msgstr "Acrescentou um novo utilizador."
 
-#: libraries/server_status.lib.php:53
+#: libraries/server_status.lib.php:60
 #, php-format
 msgid "Network traffic since startup: %s"
 msgstr ""
 
-#: libraries/server_status.lib.php:66
+#: libraries/server_status.lib.php:73
 #, fuzzy, php-format
 #| msgid "s MySQL server has been running for %s. It started up on %s."
 msgid "This MySQL server has been running for %1$s. It started up on %2$s."
 msgstr "Este servidor de mySQL estar a correr há %s. Foi iniciado em/a %s."
 
-#: libraries/server_status.lib.php:80
+#: libraries/server_status.lib.php:94
 msgid ""
 "This MySQL server works as <b>master</b> and <b>slave</b> in <b>replication</"
 "b> process."
 msgstr ""
 
-#: libraries/server_status.lib.php:85
+#: libraries/server_status.lib.php:99
 msgid "This MySQL server works as <b>master</b> in <b>replication</b> process."
 msgstr ""
 
-#: libraries/server_status.lib.php:90
+#: libraries/server_status.lib.php:104
 msgid "This MySQL server works as <b>slave</b> in <b>replication</b> process."
 msgstr ""
 
-#: libraries/server_status.lib.php:106
+#: libraries/server_status.lib.php:116
 #, fuzzy
 msgid "Replication status"
 msgstr "Relações"
 
-#: libraries/server_status.lib.php:137
+#: libraries/server_status.lib.php:146
 msgid ""
 "On a busy server, the byte counters may overrun, so those statistics as "
 "reported by the MySQL server may be incorrect."
 msgstr ""
 
-#: libraries/server_status.lib.php:148
+#: libraries/server_status.lib.php:157
 msgid "Received"
 msgstr "Recebido"
 
-#: libraries/server_status.lib.php:167
+#: libraries/server_status.lib.php:176
 msgid "Sent"
 msgstr "Enviado"
 
-#: libraries/server_status.lib.php:234
+#: libraries/server_status.lib.php:243
 #, fuzzy
 #| msgid "Connections"
 msgid "Max. concurrent connections"
 msgstr "Ligações"
 
-#: libraries/server_status.lib.php:244
+#: libraries/server_status.lib.php:253
 msgid "Failed attempts"
 msgstr "Tentativas falhadas"
 
@@ -14280,7 +14294,7 @@ msgstr ""
 msgid "Not implemented yet."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/AlterOperation.php:193
+#: libraries/sql-parser/src/Components/AlterOperation.php:191
 #, fuzzy
 #| msgid "Iconic table operations"
 msgid "Unrecognized alter operation."
@@ -14296,7 +14310,7 @@ msgid "An opening bracket followed by a set of values was expected."
 msgstr ""
 
 #: libraries/sql-parser/src/Components/ArrayObj.php:101
-#: libraries/sql-parser/src/Components/FieldDefinition.php:202
+#: libraries/sql-parser/src/Components/CreateDefinition.php:202
 msgid "An opening bracket was expected."
 msgstr ""
 
@@ -14304,25 +14318,35 @@ msgstr ""
 msgid "A comma or a closing bracket was expected"
 msgstr ""
 
+#: libraries/sql-parser/src/Components/CreateDefinition.php:246
+#, fuzzy
+#| msgid "No tables selected."
+msgid "A comma or a closing bracket was expected."
+msgstr "Nenhuma tabela selecionada."
+
+#: libraries/sql-parser/src/Components/CreateDefinition.php:262
+msgid "A closing bracket was expected."
+msgstr ""
+
 #: libraries/sql-parser/src/Components/DataType.php:125
 msgid "Unrecognized data type."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:225
+#: libraries/sql-parser/src/Components/Expression.php:227
 msgid "Unexpected closing bracket."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:246
-#: libraries/sql-parser/src/Components/Expression.php:283
-#: libraries/sql-parser/src/Components/Expression.php:303
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:285
+#: libraries/sql-parser/src/Components/Expression.php:305
 msgid "An alias was previously found."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:257
+#: libraries/sql-parser/src/Components/Expression.php:259
 msgid "Unexpected dot."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:327
+#: libraries/sql-parser/src/Components/Expression.php:329
 #, fuzzy
 #| msgid "No tables selected."
 msgid "An alias was expected."
@@ -14334,16 +14358,6 @@ msgstr "Nenhuma tabela selecionada."
 msgid "An expression was expected."
 msgstr "Nenhum registo(linha) seleccionado"
 
-#: libraries/sql-parser/src/Components/FieldDefinition.php:246
-#, fuzzy
-#| msgid "No tables selected."
-msgid "A comma or a closing bracket was expected."
-msgstr "Nenhuma tabela selecionada."
-
-#: libraries/sql-parser/src/Components/FieldDefinition.php:262
-msgid "A closing bracket was expected."
-msgstr ""
-
 #: libraries/sql-parser/src/Components/Limit.php:90
 #: libraries/sql-parser/src/Components/Limit.php:112
 msgid "An offset was expected."
@@ -14389,28 +14403,28 @@ msgstr ""
 msgid "Expected delimiter."
 msgstr ""
 
-#: libraries/sql-parser/src/Lexer.php:753
+#: libraries/sql-parser/src/Lexer.php:777
 #, fuzzy, php-format
 msgid "Ending quote %1$s was expected."
 msgstr "A tabela %s foi eliminada"
 
-#: libraries/sql-parser/src/Lexer.php:789
+#: libraries/sql-parser/src/Lexer.php:813
 #, fuzzy
 #| msgid "Table name template"
 msgid "Variable name was expected."
 msgstr "Modelo de nome da tabela"
 
-#: libraries/sql-parser/src/Parser.php:380
+#: libraries/sql-parser/src/Parser.php:391
 #, fuzzy
 #| msgid "At Beginning of Table"
 msgid "Unexpected beginning of statement."
 msgstr "No Início da Tabela"
 
-#: libraries/sql-parser/src/Parser.php:399
+#: libraries/sql-parser/src/Parser.php:410
 msgid "Unrecognized statement type."
 msgstr ""
 
-#: libraries/sql-parser/src/Parser.php:479
+#: libraries/sql-parser/src/Parser.php:489
 msgid "No transaction was previously started."
 msgstr ""
 
@@ -14438,8 +14452,10 @@ msgid "The name of the entity was expected."
 msgstr ""
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:310
-msgid "At least one field definition was expected."
-msgstr ""
+#, fuzzy
+#| msgid "The row has been deleted."
+msgid "At least one column definition was expected."
+msgstr "Registo eliminado."
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:329
 msgid "A \"RETURNS\" keyword was expected."
@@ -14514,11 +14530,11 @@ msgstr "Marcador %s criado"
 msgid "Using bookmark \"%s\" as default browse query."
 msgstr ""
 
-#: libraries/sql.lib.php:1306
+#: libraries/sql.lib.php:1300
 msgid "Showing as PHP code"
 msgstr ""
 
-#: libraries/sql.lib.php:1638
+#: libraries/sql.lib.php:1632
 #, fuzzy, php-format
 #| msgid ""
 #| "This table does not contain a unique column. Features related to the grid "
@@ -14531,7 +14547,7 @@ msgstr ""
 "edição da tabela, checkbox, Editar, Copiar e Eliminar links podem não "
 "funcionar depois de guardar."
 
-#: libraries/sql.lib.php:1649
+#: libraries/sql.lib.php:1643
 #, fuzzy, php-format
 #| msgid ""
 #| "This table does not contain a unique column. Features related to the grid "
@@ -14544,7 +14560,7 @@ msgstr ""
 "edição da tabela, checkbox, Editar, Copiar e Eliminar links podem não "
 "funcionar depois de guardar."
 
-#: libraries/sql.lib.php:1688
+#: libraries/sql.lib.php:1682
 #, php-format
 msgid "Problems with indexes of table `%s`"
 msgstr ""
@@ -14715,7 +14731,7 @@ msgid "Version %s snapshot (SQL code)"
 msgstr ""
 
 #: libraries/tracking.lib.php:947
-#: templates/structure/table_structure_row.phtml:33
+#: templates/table/structure/table_structure_row.phtml:33
 #, fuzzy
 #| msgid "None"
 msgctxt "None for default"
@@ -14772,19 +14788,19 @@ msgstr "Criar versão"
 msgid "Version %1$s was created, tracking for %2$s is active."
 msgstr ""
 
-#: libraries/user_preferences.inc.php:29
+#: libraries/user_preferences.inc.php:30
 #, fuzzy
 #| msgid "General relation features"
 msgid "Manage your settings"
 msgstr "Características gerais de Relação"
 
-#: libraries/user_preferences.inc.php:46 prefs_manage.php:307
+#: libraries/user_preferences.inc.php:54 prefs_manage.php:307
 #, fuzzy
 #| msgid "Modifications have been saved"
 msgid "Configuration has been saved."
 msgstr "Modificações foram guardadas"
 
-#: libraries/user_preferences.inc.php:66
+#: libraries/user_preferences.inc.php:74
 #, php-format
 msgid ""
 "Your preferences will be saved for current session only. Storing them "
@@ -15194,7 +15210,7 @@ msgid "first"
 msgstr ""
 
 #: templates/columns_definitions/move_column.phtml:12
-#: templates/structure/add_column.phtml:21
+#: templates/table/structure/add_column.phtml:21
 #, fuzzy, php-format
 #| msgid "After %s"
 msgid "after %s"
@@ -15280,236 +15296,340 @@ msgstr "Transformação do navegador"
 msgid "Input transformation options"
 msgstr "Opções de tranformação"
 
-#: templates/designer/aggregate_query_panel.phtml:22
-#: templates/designer/options_panel.phtml:100
+#: templates/database/create_table.phtml:7
+#: templates/database/designer/side_menu.phtml:77
+#: templates/database/designer/side_menu.phtml:80
+msgid "Create table"
+msgstr "Criar tabela"
+
+#: templates/database/create_table.phtml:15
+msgid "Number of columns"
+msgstr "Número de colunas"
+
+#: templates/database/designer/aggregate_query_panel.phtml:22
+#: templates/database/designer/options_panel.phtml:100
 #, fuzzy
 #| msgid "Create"
 msgid "Aggregate"
 msgstr "Criar"
 
-#: templates/designer/aggregate_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:61
-#: templates/designer/options_panel.phtml:106
-#: templates/designer/options_panel.phtml:170
-#: templates/designer/where_query_panel.phtml:30
-#: templates/table/table_header.phtml:9
+#: templates/database/designer/aggregate_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:61
+#: templates/database/designer/options_panel.phtml:106
+#: templates/database/designer/options_panel.phtml:170
+#: templates/database/designer/where_query_panel.phtml:30
+#: templates/table/search/table_header.phtml:9
 msgid "Operator"
 msgstr "Operador"
 
-#: templates/designer/database_tables.phtml:29
+#: templates/database/designer/database_tables.phtml:29
 msgid "Toggle"
 msgstr ""
 
-#: templates/designer/database_tables.phtml:40
+#: templates/database/designer/database_tables.phtml:40
 #, fuzzy
 #| msgid "Table structure"
 msgid "See table structure"
 msgstr "Estrutura da tabela"
 
-#: templates/designer/delete_relation_panel.phtml:21
+#: templates/database/designer/delete_relation_panel.phtml:21
 msgid "Delete relation"
 msgstr "Eliminar relação"
 
-#: templates/designer/edit_delete_pages.phtml:7
+#: templates/database/designer/edit_delete_pages.phtml:7
 #, fuzzy
 #| msgid "Page titles"
 msgid "Page to open"
 msgstr "Títulos das páginas"
 
-#: templates/designer/edit_delete_pages.phtml:7
+#: templates/database/designer/edit_delete_pages.phtml:7
 #, fuzzy
 #| msgid "Relation deleted"
 msgid "Page to delete"
 msgstr "Relação apagada"
 
-#: templates/designer/having_query_panel.phtml:90
-#: templates/designer/options_panel.phtml:63
-#: templates/designer/options_panel.phtml:229
-#: templates/designer/where_query_panel.phtml:59
+#: templates/database/designer/having_query_panel.phtml:90
+#: templates/database/designer/options_panel.phtml:63
+#: templates/database/designer/options_panel.phtml:229
+#: templates/database/designer/where_query_panel.phtml:59
 #, fuzzy
 #| msgid "Export"
 msgid "Except"
 msgstr "Exportar"
 
-#: templates/designer/having_query_panel.phtml:102
-#: templates/designer/options_panel.phtml:75
-#: templates/designer/options_panel.phtml:241
-#: templates/designer/where_query_panel.phtml:71
+#: templates/database/designer/having_query_panel.phtml:102
+#: templates/database/designer/options_panel.phtml:75
+#: templates/database/designer/options_panel.phtml:241
+#: templates/database/designer/where_query_panel.phtml:71
 #, fuzzy
 #| msgid "in query"
 msgid "subquery"
 msgstr "na pesquisa"
 
-#: templates/designer/new_relation_panel.phtml:22
-#: templates/designer/side_menu.phtml:84 templates/designer/side_menu.phtml:87
+#: templates/database/designer/new_relation_panel.phtml:22
+#: templates/database/designer/side_menu.phtml:84
+#: templates/database/designer/side_menu.phtml:87
 #, fuzzy
 msgid "Create relation"
 msgstr "Versão do servidor"
 
-#: templates/designer/options_panel.phtml:34
-#: templates/designer/options_panel.phtml:200
+#: templates/database/designer/options_panel.phtml:34
+#: templates/database/designer/options_panel.phtml:200
 #, fuzzy
 msgid "Relation operator"
 msgstr "Vista de Relação"
 
-#: templates/designer/options_panel.phtml:85
-#: templates/designer/rename_to_panel.phtml:23
+#: templates/database/designer/options_panel.phtml:85
+#: templates/database/designer/rename_to_panel.phtml:23
 #, fuzzy
 msgid "Rename to"
 msgstr "Renomeia a tabela para "
 
-#: templates/designer/options_panel.phtml:91
-#: templates/designer/rename_to_panel.phtml:31
+#: templates/database/designer/options_panel.phtml:91
+#: templates/database/designer/rename_to_panel.phtml:31
 #, fuzzy
 #| msgid "User name"
 msgid "New name"
 msgstr "Nome do Utilizador"
 
-#: templates/designer/page_save_as.phtml:4
+#: templates/database/designer/page_save_as.phtml:4
 #, fuzzy
 #| msgid "Export to selected page"
 msgid "Save to selected page"
 msgstr "Exportar para a página seleccionada"
 
-#: templates/designer/page_save_as.phtml:5
+#: templates/database/designer/page_save_as.phtml:5
 #, fuzzy
 #| msgid "Create a page and export to it"
 msgid "Create a page and save to it"
 msgstr "Criar e exportar uma página"
 
-#: templates/designer/page_save_as.phtml:26
+#: templates/database/designer/page_save_as.phtml:26
 #, fuzzy
 #| msgid "New page name: "
 msgid "New page name"
 msgstr "Nome da nova página: "
 
-#: templates/designer/page_selector.phtml:2
+#: templates/database/designer/page_selector.phtml:2
 #, fuzzy
 #| msgid "Select Tables"
 msgid "Select page"
 msgstr "Seleccionar Tabelas"
 
-#: templates/designer/query_details.phtml:10
+#: templates/database/designer/query_details.phtml:10
 #, fuzzy
 #| msgid "Table options"
 msgid "Active options"
 msgstr "Opções da tabela"
 
-#: templates/designer/schema_export.phtml:4
+#: templates/database/designer/schema_export.phtml:4
 msgid "Select Export Relational Type"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:19 templates/designer/side_menu.phtml:25
+#: templates/database/designer/side_menu.phtml:19
+#: templates/database/designer/side_menu.phtml:25
 #, fuzzy
 #| msgid "Show tables"
 msgid "Show/Hide tables list"
 msgstr "Mostra tabelas"
 
-#: templates/designer/side_menu.phtml:29 templates/designer/side_menu.phtml:35
-#: templates/designer/side_menu.phtml:36
+#: templates/database/designer/side_menu.phtml:29
+#: templates/database/designer/side_menu.phtml:35
+#: templates/database/designer/side_menu.phtml:36
 msgid "View in fullscreen"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:34
+#: templates/database/designer/side_menu.phtml:34
 msgid "Exit fullscreen"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:41 templates/designer/side_menu.phtml:45
+#: templates/database/designer/side_menu.phtml:41
+#: templates/database/designer/side_menu.phtml:45
 #, fuzzy
 #| msgid "User name"
 msgid "New page"
 msgstr "Nome do Utilizador"
 
-#: templates/designer/side_menu.phtml:70 templates/designer/side_menu.phtml:73
+#: templates/database/designer/side_menu.phtml:70
+#: templates/database/designer/side_menu.phtml:73
 #, fuzzy
 #| msgid "Select Tables"
 msgid "Delete pages"
 msgstr "Seleccionar Tabelas"
 
-#: templates/designer/side_menu.phtml:77 templates/designer/side_menu.phtml:80
-#: templates/table/create_table.phtml:7
-msgid "Create table"
-msgstr "Criar tabela"
-
-#: templates/designer/side_menu.phtml:98
-#: templates/designer/side_menu.phtml:101
+#: templates/database/designer/side_menu.phtml:98
+#: templates/database/designer/side_menu.phtml:101
 msgid "Reload"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:107
-#: templates/designer/side_menu.phtml:110
+#: templates/database/designer/side_menu.phtml:107
+#: templates/database/designer/side_menu.phtml:110
 msgid "Help"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Angular links"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Direct links"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:122
-#: templates/designer/side_menu.phtml:124
+#: templates/database/designer/side_menu.phtml:122
+#: templates/database/designer/side_menu.phtml:124
 msgid "Snap to grid"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:128
-#: templates/designer/side_menu.phtml:134
+#: templates/database/designer/side_menu.phtml:128
+#: templates/database/designer/side_menu.phtml:134
 msgid "Small/Big All"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:138
-#: templates/designer/side_menu.phtml:141
+#: templates/database/designer/side_menu.phtml:138
+#: templates/database/designer/side_menu.phtml:141
 msgid "Toggle small/big"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:145
-#: templates/designer/side_menu.phtml:148
+#: templates/database/designer/side_menu.phtml:145
+#: templates/database/designer/side_menu.phtml:148
 #, fuzzy
 #| msgid "Traditional Chinese"
 msgid "Toggle relation lines"
 msgstr "Chinês Tradicional"
 
-#: templates/designer/side_menu.phtml:153
-#: templates/designer/side_menu.phtml:156
+#: templates/database/designer/side_menu.phtml:153
+#: templates/database/designer/side_menu.phtml:156
 #, fuzzy
 #| msgid "Export"
 msgid "Export schema"
 msgstr "Exportar"
 
-#: templates/designer/side_menu.phtml:165
-#: templates/designer/side_menu.phtml:168
+#: templates/database/designer/side_menu.phtml:165
+#: templates/database/designer/side_menu.phtml:168
 msgid "Build Query"
 msgstr "Construir a consulta"
 
-#: templates/designer/side_menu.phtml:173
-#: templates/designer/side_menu.phtml:177
+#: templates/database/designer/side_menu.phtml:173
+#: templates/database/designer/side_menu.phtml:177
 msgid "Move Menu"
 msgstr "Mover o menu"
 
-#: templates/designer/side_menu.phtml:181
-#: templates/designer/side_menu.phtml:186
+#: templates/database/designer/side_menu.phtml:181
+#: templates/database/designer/side_menu.phtml:186
 #, fuzzy
 #| msgid "Partial texts"
 msgid "Pin text"
 msgstr "Textos parciais"
 
-#: templates/designer/table_list.phtml:4
+#: templates/database/designer/table_list.phtml:4
 msgid "Hide/Show all"
 msgstr "Ocultar/mostrar tudo"
 
-#: templates/designer/table_list.phtml:14
+#: templates/database/designer/table_list.phtml:14
 msgid "Hide/Show Tables with no relation"
 msgstr "Ocultar/mostrar as tabelas sem relações"
 
-#: templates/designer/table_list.phtml:59
+#: templates/database/designer/table_list.phtml:59
 msgid "Number of tables:"
 msgstr "Número de tabelas:"
 
+#: templates/database/structure/body_for_table_summary.phtml:6
+#, php-format
+msgid "%s table"
+msgid_plural "%s tables"
+msgstr[0] "%s tabela"
+msgstr[1] "%s tabelas"
+
+#: templates/database/structure/body_for_table_summary.phtml:17
+msgid "Sum"
+msgstr "Soma"
+
+#: templates/database/structure/check_all_tables.phtml:6
+msgid "Check tables having overhead"
+msgstr "Verificar tabelas com overhead"
+
+#: templates/database/structure/check_all_tables.phtml:10
+#, fuzzy
+#| msgid "Show color"
+msgid "Show create"
+msgstr "Mostrar côr"
+
+#: templates/database/structure/check_all_tables.phtml:27
+msgid "Prefix"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:28
+msgid "Add prefix to table"
+msgstr "Adicionar prefixo à tabela"
+
+#: templates/database/structure/check_all_tables.phtml:29
+msgid "Replace table prefix"
+msgstr "Substituir prefixo da tabela"
+
+#: templates/database/structure/check_all_tables.phtml:30
+msgid "Copy table with prefix"
+msgstr "Copiar tabela com prefixo"
+
+#: templates/database/structure/check_all_tables.phtml:36
+#, fuzzy
+#| msgid "CHAR textarea columns"
+msgid "Add columns to central list"
+msgstr "Colunas da caixa de texto para CHAR"
+
+#: templates/database/structure/check_all_tables.phtml:37
+msgid "Remove columns from central list"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:38
+#, fuzzy
+#| msgid "CHAR textarea columns"
+msgid "Make consistent with central list"
+msgstr "Colunas da caixa de texto para CHAR"
+
+#: templates/database/structure/favorite_anchor.phtml:12
+#, fuzzy
+msgid "Add to Favorites"
+msgstr "Acrescenta um utilizador"
+
+#: templates/database/structure/show_create.phtml:2
+#, fuzzy
+#| msgid "Show SQL queries"
+msgid "Showing create queries"
+msgstr "Mostrar consultas SQL"
+
+#: templates/database/structure/sortable_header.phtml:13
+msgid "Sort"
+msgstr "Ordenação"
+
+#: templates/database/structure/table_header.phtml:42
+#, fuzzy
+#| msgid "May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]."
+msgid ""
+"May be approximate. Click on the number to get the exact count. See "
+"[doc@faq3-11]FAQ 3.11[/doc]."
+msgstr "Pode ser aproximado. Veja o [doc@faq3-11]FAQ 3.11[/doc]."
+
+#: templates/database/structure/table_header.phtml:66
+#: templates/table/index_form.phtml:127
+msgid "Size"
+msgstr "Tamanho"
+
+#: templates/database/structure/table_header.phtml:74
+#: templates/table/structure/display_table_stats.phtml:27
+msgid "Overhead"
+msgstr "Suspenso"
+
+#: templates/database/structure/tracking_icon.phtml:4
+msgid "Tracking is active."
+msgstr "Detecção de Alterações está activa."
+
+#: templates/database/structure/tracking_icon.phtml:8
+msgid "Tracking is not active."
+msgstr "Detecção de Alterações está desactivada."
+
 #: templates/error/report_form.phtml:7
 msgid ""
 "phpMyAdmin has encountered an error. We have collected data about this error "
@@ -15525,73 +15645,6 @@ msgstr ""
 msgid "Please explain the steps that lead to the error:"
 msgstr ""
 
-#: templates/gis_visualization/gis_visualization.phtml:3
-msgid "Display GIS Visualization"
-msgstr ""
-
-#: templates/gis_visualization/gis_visualization.phtml:8
-#, fuzzy
-#| msgid "Add/Delete Field Columns"
-msgid "Label column"
-msgstr "Adicionar/Remover Campos"
-
-#: templates/gis_visualization/gis_visualization.phtml:11
-msgid "-- None --"
-msgstr ""
-
-#: templates/gis_visualization/gis_visualization.phtml:19
-#, fuzzy
-#| msgid "Total"
-msgid "Spatial column"
-msgstr "Total"
-
-#: templates/index_form.phtml:16
-msgid "Index name:"
-msgstr "Nome do Índice&nbsp;:"
-
-#: templates/index_form.phtml:19
-msgid ""
-"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
-msgstr ""
-"\"PRIMARY\" <b>tem</b> de ser o nome de e <b>apenas de</b> uma chave "
-"primária!"
-
-#: templates/index_form.phtml:40
-#, fuzzy
-#| msgid "Index name:"
-msgid "Index choice:"
-msgstr "Nome do Índice&nbsp;:"
-
-#: templates/index_form.phtml:57
-msgid "Key block size:"
-msgstr ""
-
-#: templates/index_form.phtml:74
-msgid "Index type:"
-msgstr "Tipo de Índice&nbsp;:"
-
-#: templates/index_form.phtml:86
-#, fuzzy
-#| msgid "User:"
-msgid "Parser:"
-msgstr "Utilizador:"
-
-#: templates/index_form.phtml:102
-#, fuzzy
-#| msgid "Comment"
-msgid "Comment:"
-msgstr "Comentário"
-
-#: templates/index_form.phtml:127 templates/structure/table_header.phtml:66
-msgid "Size"
-msgstr "Tamanho"
-
-#: templates/index_form.phtml:149 templates/index_form.phtml:190
-#, fuzzy
-#| msgid "Drag to reorder."
-msgid "Drag to reorder"
-msgstr "Arraste para re-ordenar."
-
 #: templates/prefs_autoload.phtml:9
 msgid ""
 "Your browser has phpMyAdmin configuration for this domain. Would you like to "
@@ -15604,469 +15657,439 @@ msgstr ""
 msgid "Start row:"
 msgstr "Linha inicial"
 
-#: templates/structure/actions_in_table_structure.phtml:14
-#, php-format
-msgid "A primary key has been added on %s."
-msgstr "Uma chave primária foi adicionada a %s."
-
-#: templates/structure/actions_in_table_structure.phtml:34
-#: templates/structure/actions_in_table_structure.phtml:54
-#: templates/structure/actions_in_table_structure.phtml:79
-#: templates/structure/actions_in_table_structure.phtml:101
-#, php-format
-msgid "An index has been added on %s."
-msgstr "Um índice foi adicionado a %s."
-
-#: templates/structure/actions_in_table_structure.phtml:130
-#: templates/structure/check_all_table_column.phtml:59
-#, fuzzy
-#| msgid "Remove from Favorites"
-msgid "Remove from central columns"
-msgstr "Remover dos Favoritos"
-
-#: templates/structure/actions_in_table_structure.phtml:138
-#: templates/structure/check_all_table_column.phtml:55
-#, fuzzy
-#| msgid "CHAR textarea columns"
-msgid "Add to central columns"
-msgstr "Colunas da caixa de texto para CHAR"
-
-#: templates/structure/add_column.phtml:7
-#, fuzzy, php-format
-msgid "Add %s column(s)"
-msgstr "Adiciona novo campo"
-
-#: templates/structure/add_column.phtml:12
-#, fuzzy
-#| msgid "At Beginning of Table"
-msgid "at beginning of table"
-msgstr "No Início da Tabela"
-
-#: templates/structure/body_for_table_summary.phtml:6
-#, php-format
-msgid "%s table"
-msgid_plural "%s tables"
-msgstr[0] "%s tabela"
-msgstr[1] "%s tabelas"
-
-#: templates/structure/body_for_table_summary.phtml:17
-msgid "Sum"
-msgstr "Soma"
-
-#: templates/structure/check_all_tables.phtml:6
-msgid "Check tables having overhead"
-msgstr "Verificar tabelas com overhead"
-
-#: templates/structure/check_all_tables.phtml:10
-#, fuzzy
-#| msgid "Show color"
-msgid "Show create"
-msgstr "Mostrar côr"
-
-#: templates/structure/check_all_tables.phtml:27
-msgid "Prefix"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:28
-msgid "Add prefix to table"
-msgstr "Adicionar prefixo à tabela"
-
-#: templates/structure/check_all_tables.phtml:29
-msgid "Replace table prefix"
-msgstr "Substituir prefixo da tabela"
-
-#: templates/structure/check_all_tables.phtml:30
-msgid "Copy table with prefix"
-msgstr "Copiar tabela com prefixo"
-
-#: templates/structure/check_all_tables.phtml:36
-#, fuzzy
-#| msgid "CHAR textarea columns"
-msgid "Add columns to central list"
-msgstr "Colunas da caixa de texto para CHAR"
-
-#: templates/structure/check_all_tables.phtml:37
-msgid "Remove columns from central list"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:38
-#, fuzzy
-#| msgid "CHAR textarea columns"
-msgid "Make consistent with central list"
-msgstr "Colunas da caixa de texto para CHAR"
-
-#: templates/structure/display_structure.phtml:140 view_create.php:181
-#, fuzzy
-#| msgid "Print view"
-msgid "Edit view"
-msgstr "Vista de impressão"
-
-#: templates/structure/display_table_stats.phtml:9
-msgid "Space usage"
-msgstr "Espaço ocupado"
-
-#: templates/structure/display_table_stats.phtml:27
-#: templates/structure/table_header.phtml:74
-msgid "Overhead"
-msgstr "Suspenso"
-
-#: templates/structure/display_table_stats.phtml:32
-msgid "Effective"
-msgstr "Em uso"
-
-#: templates/structure/favorite_anchor.phtml:12
-#, fuzzy
-msgid "Add to Favorites"
-msgstr "Acrescenta um utilizador"
-
-#: templates/structure/move_columns_dialog.phtml:1
-#: templates/structure/optional_action_links.phtml:21
-#, fuzzy
-#| msgid "Add columns"
-msgid "Move columns"
-msgstr "Adicionar colunas"
-
-#: templates/structure/move_columns_dialog.phtml:2
-msgid "Move the columns by dragging them up and down."
-msgstr ""
-
-#: templates/structure/optional_action_links.phtml:9
-msgid "Propose table structure"
-msgstr "Propor uma estrutura de tabela"
-
-#: templates/structure/optional_action_links.phtml:24
-#, fuzzy
-#| msgid "Propose table structure"
-msgid "Improve table structure"
-msgstr "Propor uma estrutura de tabela"
-
-#: templates/structure/optional_action_links.phtml:30
-#, fuzzy
-#| msgid "Track table"
-msgid "Track view"
-msgstr "Acompanhar tabela"
-
-#: templates/structure/row_stats_table.phtml:3
-#, fuzzy
-#| msgid "Row Statistics"
-msgid "Row statistics"
-msgstr "Estatísticas dos registos"
-
-#: templates/structure/row_stats_table.phtml:9
-msgid "static"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:11
-msgid "dynamic"
-msgstr "dinâmico"
-
-#: templates/structure/row_stats_table.phtml:22
-msgid "partitioned"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:54
-#, fuzzy
-msgid "Row length"
-msgstr "Comprimento de linha"
-
-#: templates/structure/row_stats_table.phtml:66
-msgid "Row size"
-msgstr "Tamanho dos registos"
-
-#: templates/structure/row_stats_table.phtml:73
-msgid "Next autoindex"
-msgstr ""
-
-#: templates/structure/secondary_tabs.phtml:14
-#, fuzzy
-#| msgid "Relation view"
-msgid "Relation view"
-msgstr "Vista de Relação"
-
-#: templates/structure/show_create.phtml:2
-#, fuzzy
-#| msgid "Show SQL queries"
-msgid "Showing create queries"
-msgstr "Mostrar consultas SQL"
-
-#: templates/structure/sortable_header.phtml:13
-msgid "Sort"
-msgstr "Ordenação"
-
-#: templates/structure/table_header.phtml:42
-#, fuzzy
-#| msgid "May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]."
-msgid ""
-"May be approximate. Click on the number to get the exact count. See "
-"[doc@faq3-11]FAQ 3.11[/doc]."
-msgstr "Pode ser aproximado. Veja o [doc@faq3-11]FAQ 3.11[/doc]."
-
-#: templates/structure/table_structure_row.phtml:46
-#, fuzzy, php-format
-#| msgid "Table %s has been dropped."
-msgid "Column %s has been dropped."
-msgstr "A tabela %s foi eliminada"
-
-#: templates/structure/tracking_icon.phtml:4
-msgid "Tracking is active."
-msgstr "Detecção de Alterações está activa."
-
-#: templates/structure/tracking_icon.phtml:8
-msgid "Tracking is not active."
-msgstr "Detecção de Alterações está desactivada."
-
-#: templates/table/create_table.phtml:15
-msgid "Number of columns"
-msgstr "Número de colunas"
-
-#: templates/table/options.phtml:8
-msgid "Select columns (at least one):"
-msgstr "Seleccione colunas (no mínimo um):"
-
-#: templates/table/options.phtml:37
-msgid "Add search conditions (body of the \"where\" clause):"
-msgstr "Condição de Pesquisa (Complemento da cláusula \"where\"):"
-
-#: templates/table/options.phtml:45
-msgid "Number of rows per page"
-msgstr "Número de registos por página"
-
-#: templates/table/options.phtml:56
-msgid "Display order:"
-msgstr "Ordem de visualização:"
-
-#: templates/table/options_zoom.phtml:6
-msgid "Use this column to label each point"
-msgstr "Use esta coluna para rotular cada ponto"
-
-#: templates/table/options_zoom.phtml:35
-msgid "Maximum rows to plot"
-msgstr "Número máximo de linhas para traçar"
-
-#: templates/table/replace_preview.phtml:13
-msgid "Find and replace - preview"
-msgstr "Localizar e substituir (pré-visualização)"
-
-#: templates/table/replace_preview.phtml:18
-msgid "Original string"
-msgstr "Segmento original"
-
-#: templates/table/replace_preview.phtml:19
-msgid "Replaced string"
-msgstr "Segmento de substituição"
-
-#: templates/table/replace_preview.phtml:40
-msgid "Replace"
-msgstr "Substituir"
-
-#: templates/table/rows_zoom.phtml:16
-msgid "Additional search criteria"
-msgstr "Critérios de pesquisa adicionais"
-
-#: templates/table/search_and_replace.phtml:3
-msgid "Replace with:"
-msgstr "Substituir por:"
-
-#: templates/table/search_and_replace.phtml:22
-msgid "Use regular expression"
-msgstr "Usar expressão regular"
-
-#: templates/table/selection_form.phtml:12
-msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
-msgstr ""
-"Faça uma \"pesquisa por formulário\" (carácter universal: \"%\") para duas "
-"colunas diferentes"
-
-#: templates/table/selection_form.phtml:34
-msgid "Do a \"query by example\" (wildcard: \"%\")"
-msgstr "Faça uma \"pesquisa por formulário\" (caractere universal: \"%\")"
-
-#: templates/table/zoom_result_form.phtml:7
-msgid "Browse/Edit the points"
-msgstr "Navegar/editar os pontos"
-
-#: templates/table/zoom_result_form.phtml:15
-msgid "How to use"
-msgstr "Como usar"
-
-#: templates/table/zoom_result_form.phtml:23
-msgid "Reset zoom"
-msgstr "Restaurar ampliação"
-
-#: templates/tbl_chart.phtml:17
+#: templates/table/chart/tbl_chart.phtml:17
 #, fuzzy
 #| msgid "Mar"
 msgctxt "Chart type"
 msgid "Bar"
 msgstr "Mar"
 
-#: templates/tbl_chart.phtml:21
+#: templates/table/chart/tbl_chart.phtml:21
 #, fuzzy
 #| msgid "Column"
 msgctxt "Chart type"
 msgid "Column"
 msgstr "Coluna"
 
-#: templates/tbl_chart.phtml:25
+#: templates/table/chart/tbl_chart.phtml:25
 msgctxt "Chart type"
 msgid "Line"
 msgstr ""
 
-#: templates/tbl_chart.phtml:29
+#: templates/table/chart/tbl_chart.phtml:29
 msgctxt "Chart type"
 msgid "Spline"
 msgstr ""
 
-#: templates/tbl_chart.phtml:33
+#: templates/table/chart/tbl_chart.phtml:33
 msgctxt "Chart type"
 msgid "Area"
 msgstr ""
 
-#: templates/tbl_chart.phtml:37
+#: templates/table/chart/tbl_chart.phtml:37
 #, fuzzy
 #| msgid "PiB"
 msgctxt "Chart type"
 msgid "Pie"
 msgstr "PB"
 
-#: templates/tbl_chart.phtml:41
+#: templates/table/chart/tbl_chart.phtml:41
 #, fuzzy
 #| msgid "Time"
 msgctxt "Chart type"
 msgid "Timeline"
 msgstr "Tempo"
 
-#: templates/tbl_chart.phtml:45
+#: templates/table/chart/tbl_chart.phtml:45
 msgctxt "Chart type"
 msgid "Scatter"
 msgstr ""
 
-#: templates/tbl_chart.phtml:50
+#: templates/table/chart/tbl_chart.phtml:50
 msgid "Stacked"
 msgstr ""
 
-#: templates/tbl_chart.phtml:53
+#: templates/table/chart/tbl_chart.phtml:53
 #, fuzzy
 msgid "Chart title"
 msgstr "Tipo de Exportação"
 
-#: templates/tbl_chart.phtml:57
+#: templates/table/chart/tbl_chart.phtml:57
 msgid "X-Axis:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:72
+#: templates/table/chart/tbl_chart.phtml:72
 #, fuzzy
 msgid "Series:"
 msgstr "Comando SQL"
 
-#: templates/tbl_chart.phtml:102
+#: templates/table/chart/tbl_chart.phtml:102
 msgid "X-Axis label:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:104
+#: templates/table/chart/tbl_chart.phtml:104
 #, fuzzy
 #| msgid "Value"
 msgid "X Values"
 msgstr "Valor"
 
-#: templates/tbl_chart.phtml:107
+#: templates/table/chart/tbl_chart.phtml:107
 msgid "Y-Axis label:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:115
+#: templates/table/chart/tbl_chart.phtml:115
 msgid "Series names are in a column"
 msgstr ""
 
-#: templates/tbl_chart.phtml:118
+#: templates/table/chart/tbl_chart.phtml:118
 #, fuzzy
 #| msgid "Inside column:"
 msgid "Series column:"
 msgstr "Dentro da coluna:"
 
-#: templates/tbl_chart.phtml:130
+#: templates/table/chart/tbl_chart.phtml:130
 #, fuzzy
 #| msgid "Values for column %s"
 msgid "Value Column:"
 msgstr "Valores para a coluna \"%s\""
 
-#: templates/tbl_chart.phtml:150
+#: templates/table/chart/tbl_chart.phtml:150
 #, fuzzy
 #| msgid "Save as file"
 msgid "Save chart as image"
 msgstr "envia"
 
-#: templates/tbl_relation/common_form.phtml:7
+#: templates/table/gis_visualization/gis_visualization.phtml:3
+msgid "Display GIS Visualization"
+msgstr ""
+
+#: templates/table/gis_visualization/gis_visualization.phtml:8
+#, fuzzy
+#| msgid "Add/Delete Field Columns"
+msgid "Label column"
+msgstr "Adicionar/Remover Campos"
+
+#: templates/table/gis_visualization/gis_visualization.phtml:11
+msgid "-- None --"
+msgstr ""
+
+#: templates/table/gis_visualization/gis_visualization.phtml:19
+#, fuzzy
+#| msgid "Total"
+msgid "Spatial column"
+msgstr "Total"
+
+#: templates/table/index_form.phtml:16
+msgid "Index name:"
+msgstr "Nome do Índice&nbsp;:"
+
+#: templates/table/index_form.phtml:19
+msgid ""
+"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
+msgstr ""
+"\"PRIMARY\" <b>tem</b> de ser o nome de e <b>apenas de</b> uma chave "
+"primária!"
+
+#: templates/table/index_form.phtml:40
+#, fuzzy
+#| msgid "Index name:"
+msgid "Index choice:"
+msgstr "Nome do Índice&nbsp;:"
+
+#: templates/table/index_form.phtml:57
+msgid "Key block size:"
+msgstr ""
+
+#: templates/table/index_form.phtml:74
+msgid "Index type:"
+msgstr "Tipo de Índice&nbsp;:"
+
+#: templates/table/index_form.phtml:86
+#, fuzzy
+#| msgid "User:"
+msgid "Parser:"
+msgstr "Utilizador:"
+
+#: templates/table/index_form.phtml:102
+#, fuzzy
+#| msgid "Comment"
+msgid "Comment:"
+msgstr "Comentário"
+
+#: templates/table/index_form.phtml:149 templates/table/index_form.phtml:190
+#, fuzzy
+#| msgid "Drag to reorder."
+msgid "Drag to reorder"
+msgstr "Arraste para re-ordenar."
+
+#: templates/table/relation/common_form.phtml:7
 msgid "Internal relations"
 msgstr "Relações internas"
 
-#: templates/tbl_relation/common_form.phtml:11
+#: templates/table/relation/common_form.phtml:11
 #, fuzzy
 #| msgid "Internal relations"
 msgid "Internal relation"
 msgstr "Relações internas"
 
-#: templates/tbl_relation/common_form.phtml:14
+#: templates/table/relation/common_form.phtml:14
 msgid ""
 "An internal relation is not necessary when a corresponding FOREIGN KEY "
 "relation exists."
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:37
+#: templates/table/relation/common_form.phtml:37
 #, fuzzy
 #| msgid "Foreign key limit"
 msgid "Foreign key constraints"
 msgstr "Limite de chave estrangeira"
 
-#: templates/tbl_relation/common_form.phtml:40
+#: templates/table/relation/common_form.phtml:40
 #, fuzzy
 #| msgid "Action"
 msgid "Actions"
 msgstr "Acções"
 
-#: templates/tbl_relation/common_form.phtml:41
+#: templates/table/relation/common_form.phtml:41
 #, fuzzy
 #| msgid "Constraints for table"
 msgid "Constraint properties"
 msgstr "Limitadores para a tabela"
 
-#: templates/tbl_relation/common_form.phtml:44
+#: templates/table/relation/common_form.phtml:44
 msgid ""
 "Only columns with index will be displayed. You can define an index below."
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:49
+#: templates/table/relation/common_form.phtml:49
 msgid "Foreign key constraint"
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:81
+#: templates/table/relation/common_form.phtml:81
 #, fuzzy
 #| msgid "Add constraints"
 msgid "+ Add constraint"
 msgstr "Adicionar restrições (constraints)"
 
-#: templates/tbl_relation/common_form.phtml:91
+#: templates/table/relation/common_form.phtml:91
 #, fuzzy
 #| msgid "Choose column to display"
 msgid "Choose column to display:"
 msgstr "Escolha a coluna para mostrar"
 
-#: templates/tbl_relation/foreign_key_row.phtml:13
+#: templates/table/relation/foreign_key_row.phtml:13
 #, fuzzy, php-format
 #| msgid "Foreign key limit"
 msgid "Foreign key constraint %s has been dropped"
 msgstr "Limite de chave estrangeira"
 
-#: templates/tbl_relation/foreign_key_row.phtml:102
+#: templates/table/relation/foreign_key_row.phtml:102
 #, fuzzy
 #| msgid "Constraints for table"
 msgid "Constraint name"
 msgstr "Limitadores para a tabela"
 
-#: templates/tbl_relation/foreign_key_row.phtml:157
+#: templates/table/relation/foreign_key_row.phtml:157
 #, fuzzy
 msgid "+ Add column"
 msgstr "Adiciona novo campo"
 
+#: templates/table/search/options.phtml:8
+msgid "Select columns (at least one):"
+msgstr "Seleccione colunas (no mínimo um):"
+
+#: templates/table/search/options.phtml:37
+msgid "Add search conditions (body of the \"where\" clause):"
+msgstr "Condição de Pesquisa (Complemento da cláusula \"where\"):"
+
+#: templates/table/search/options.phtml:45
+msgid "Number of rows per page"
+msgstr "Número de registos por página"
+
+#: templates/table/search/options.phtml:56
+msgid "Display order:"
+msgstr "Ordem de visualização:"
+
+#: templates/table/search/options_zoom.phtml:6
+msgid "Use this column to label each point"
+msgstr "Use esta coluna para rotular cada ponto"
+
+#: templates/table/search/options_zoom.phtml:35
+msgid "Maximum rows to plot"
+msgstr "Número máximo de linhas para traçar"
+
+#: templates/table/search/replace_preview.phtml:13
+msgid "Find and replace - preview"
+msgstr "Localizar e substituir (pré-visualização)"
+
+#: templates/table/search/replace_preview.phtml:18
+msgid "Original string"
+msgstr "Segmento original"
+
+#: templates/table/search/replace_preview.phtml:19
+msgid "Replaced string"
+msgstr "Segmento de substituição"
+
+#: templates/table/search/replace_preview.phtml:40
+msgid "Replace"
+msgstr "Substituir"
+
+#: templates/table/search/rows_zoom.phtml:16
+msgid "Additional search criteria"
+msgstr "Critérios de pesquisa adicionais"
+
+#: templates/table/search/search_and_replace.phtml:3
+msgid "Replace with:"
+msgstr "Substituir por:"
+
+#: templates/table/search/search_and_replace.phtml:22
+msgid "Use regular expression"
+msgstr "Usar expressão regular"
+
+#: templates/table/search/selection_form.phtml:12
+msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
+msgstr ""
+"Faça uma \"pesquisa por formulário\" (carácter universal: \"%\") para duas "
+"colunas diferentes"
+
+#: templates/table/search/selection_form.phtml:34
+msgid "Do a \"query by example\" (wildcard: \"%\")"
+msgstr "Faça uma \"pesquisa por formulário\" (caractere universal: \"%\")"
+
+#: templates/table/search/zoom_result_form.phtml:7
+msgid "Browse/Edit the points"
+msgstr "Navegar/editar os pontos"
+
+#: templates/table/search/zoom_result_form.phtml:15
+msgid "How to use"
+msgstr "Como usar"
+
+#: templates/table/search/zoom_result_form.phtml:23
+msgid "Reset zoom"
+msgstr "Restaurar ampliação"
+
+#: templates/table/secondary_tabs.phtml:14
+#, fuzzy
+#| msgid "Relation view"
+msgid "Relation view"
+msgstr "Vista de Relação"
+
+#: templates/table/structure/actions_in_table_structure.phtml:14
+#, php-format
+msgid "A primary key has been added on %s."
+msgstr "Uma chave primária foi adicionada a %s."
+
+#: templates/table/structure/actions_in_table_structure.phtml:34
+#: templates/table/structure/actions_in_table_structure.phtml:54
+#: templates/table/structure/actions_in_table_structure.phtml:79
+#: templates/table/structure/actions_in_table_structure.phtml:101
+#, php-format
+msgid "An index has been added on %s."
+msgstr "Um índice foi adicionado a %s."
+
+#: templates/table/structure/actions_in_table_structure.phtml:130
+#: templates/table/structure/check_all_table_column.phtml:59
+#, fuzzy
+#| msgid "Remove from Favorites"
+msgid "Remove from central columns"
+msgstr "Remover dos Favoritos"
+
+#: templates/table/structure/actions_in_table_structure.phtml:138
+#: templates/table/structure/check_all_table_column.phtml:55
+#, fuzzy
+#| msgid "CHAR textarea columns"
+msgid "Add to central columns"
+msgstr "Colunas da caixa de texto para CHAR"
+
+#: templates/table/structure/add_column.phtml:7
+#, fuzzy, php-format
+msgid "Add %s column(s)"
+msgstr "Adiciona novo campo"
+
+#: templates/table/structure/add_column.phtml:12
+#, fuzzy
+#| msgid "At Beginning of Table"
+msgid "at beginning of table"
+msgstr "No Início da Tabela"
+
+#: templates/table/structure/display_structure.phtml:140 view_create.php:181
+#, fuzzy
+#| msgid "Print view"
+msgid "Edit view"
+msgstr "Vista de impressão"
+
+#: templates/table/structure/display_table_stats.phtml:9
+msgid "Space usage"
+msgstr "Espaço ocupado"
+
+#: templates/table/structure/display_table_stats.phtml:32
+msgid "Effective"
+msgstr "Em uso"
+
+#: templates/table/structure/move_columns_dialog.phtml:1
+#: templates/table/structure/optional_action_links.phtml:21
+#, fuzzy
+#| msgid "Add columns"
+msgid "Move columns"
+msgstr "Adicionar colunas"
+
+#: templates/table/structure/move_columns_dialog.phtml:2
+msgid "Move the columns by dragging them up and down."
+msgstr ""
+
+#: templates/table/structure/optional_action_links.phtml:9
+msgid "Propose table structure"
+msgstr "Propor uma estrutura de tabela"
+
+#: templates/table/structure/optional_action_links.phtml:24
+#, fuzzy
+#| msgid "Propose table structure"
+msgid "Improve table structure"
+msgstr "Propor uma estrutura de tabela"
+
+#: templates/table/structure/optional_action_links.phtml:30
+#, fuzzy
+#| msgid "Track table"
+msgid "Track view"
+msgstr "Acompanhar tabela"
+
+#: templates/table/structure/row_stats_table.phtml:3
+#, fuzzy
+#| msgid "Row Statistics"
+msgid "Row statistics"
+msgstr "Estatísticas dos registos"
+
+#: templates/table/structure/row_stats_table.phtml:9
+msgid "static"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:11
+msgid "dynamic"
+msgstr "dinâmico"
+
+#: templates/table/structure/row_stats_table.phtml:22
+msgid "partitioned"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:54
+#, fuzzy
+msgid "Row length"
+msgstr "Comprimento de linha"
+
+#: templates/table/structure/row_stats_table.phtml:66
+msgid "Row size"
+msgstr "Tamanho dos registos"
+
+#: templates/table/structure/row_stats_table.phtml:73
+msgid "Next autoindex"
+msgstr ""
+
+#: templates/table/structure/table_structure_row.phtml:46
+#, fuzzy, php-format
+#| msgid "Table %s has been dropped."
+msgid "Column %s has been dropped."
+msgstr "A tabela %s foi eliminada"
+
 #: themes.php:17 themes.php:22
 msgid "Theme"
 msgstr "Tema"
@@ -17357,6 +17380,11 @@ msgstr ""
 msgid "concurrent_insert is set to 0"
 msgstr "concurrent_insert é definido como 0"
 
+#, fuzzy
+#~| msgid "Read misses"
+#~ msgid "Read as multibytes"
+#~ msgstr "Falhas de leitura"
+
 #~ msgid "Relational display column"
 #~ msgstr "Coluna de visualização relacional"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 091b4eaf78..79895578c6 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 4.5.0-dev\n"
 "Report-Msgid-Bugs-To: developers@phpmyadmin.net\n"
-"POT-Creation-Date: 2015-08-08 13:53-0400\n"
+"POT-Creation-Date: 2015-08-12 08:10-0400\n"
 "PO-Revision-Date: 2015-08-03 23:39+0200\n"
 "Last-Translator: Guilherme Seibt <gui@webseibt.net>\n"
 "Language-Team: Portuguese (Brazil) <https://hosted.weblate.org/projects/"
@@ -53,7 +53,7 @@ msgid "Table comments:"
 msgstr "Comentários de tabela:"
 
 #: db_datadict.php:104 libraries/Index.class.php:699
-#: libraries/insert_edit.lib.php:1567
+#: libraries/insert_edit.lib.php:1565
 #: libraries/navigation/Nodes/Node_Column.class.php:30
 #: libraries/plugins/export/ExportHtmlword.class.php:280
 #: libraries/plugins/export/ExportHtmlword.class.php:375
@@ -67,13 +67,14 @@ msgstr "Comentários de tabela:"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1023
 #: libraries/tracking.lib.php:879 libraries/tracking.lib.php:975
 #: templates/columns_definitions/column_name.phtml:18
-#: templates/index_form.phtml:124 templates/table/table_header.phtml:6
-#: templates/table/zoom_result_form.phtml:33
-#: templates/tbl_relation/common_form.phtml:10
-#: templates/tbl_relation/common_form.phtml:43
-#: templates/tbl_relation/foreign_key_row.phtml:194
-#: templates/tbl_relation/foreign_key_row.phtml:206
-#: templates/tbl_relation/internal_relational_row.phtml:71
+#: templates/table/index_form.phtml:124
+#: templates/table/relation/common_form.phtml:10
+#: templates/table/relation/common_form.phtml:43
+#: templates/table/relation/foreign_key_row.phtml:194
+#: templates/table/relation/foreign_key_row.phtml:206
+#: templates/table/relation/internal_relational_row.phtml:71
+#: templates/table/search/table_header.phtml:6
+#: templates/table/search/zoom_result_form.phtml:33
 msgid "Column"
 msgstr "Coluna"
 
@@ -91,21 +92,21 @@ msgstr "Coluna"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1001
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1024
 #: libraries/rte/rte_list.lib.php:75 libraries/rte/rte_list.lib.php:103
-#: libraries/rte/rte_routines.lib.php:802
-#: libraries/rte/rte_routines.lib.php:831
-#: libraries/rte/rte_routines.lib.php:1493
+#: libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_routines.lib.php:922
+#: libraries/rte/rte_routines.lib.php:1584
 #: libraries/server_privileges.lib.php:2369 libraries/tracking.lib.php:880
 #: libraries/tracking.lib.php:972
 #: templates/columns_definitions/table_fields_definitions.phtml:11
-#: templates/structure/table_header.phtml:48
-#: templates/structure/table_structure_header.phtml:6
-#: templates/table/table_header.phtml:7
+#: templates/database/structure/table_header.phtml:48
+#: templates/table/search/table_header.phtml:7
+#: templates/table/structure/table_structure_header.phtml:6
 msgid "Type"
 msgstr "Tipo"
 
 #: db_datadict.php:106 libraries/Index.class.php:702
 #: libraries/central_columns.lib.php:708
-#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1576
+#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1574
 #: libraries/plugins/export/ExportHtmlword.class.php:286
 #: libraries/plugins/export/ExportHtmlword.class.php:381
 #: libraries/plugins/export/ExportLatex.class.php:509
@@ -118,8 +119,8 @@ msgstr "Tipo"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1026
 #: libraries/tracking.lib.php:882 libraries/tracking.lib.php:978
 #: templates/columns_definitions/table_fields_definitions.phtml:39
-#: templates/structure/table_structure_header.phtml:9
-#: templates/table/zoom_result_form.phtml:34
+#: templates/table/search/zoom_result_form.phtml:34
+#: templates/table/structure/table_structure_header.phtml:9
 msgid "Null"
 msgstr "Nulo"
 
@@ -137,8 +138,8 @@ msgstr "Nulo"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1027
 #: libraries/replication_gui.lib.php:153 libraries/tracking.lib.php:883
 #: templates/columns_definitions/table_fields_definitions.phtml:25
-#: templates/structure/body_for_table_summary.phtml:55
-#: templates/structure/table_structure_header.phtml:10
+#: templates/database/structure/body_for_table_summary.phtml:55
+#: templates/table/structure/table_structure_header.phtml:10
 msgid "Default"
 msgstr "Padrão"
 
@@ -166,19 +167,19 @@ msgid "Comments"
 msgstr "Comentários"
 
 #: db_datadict.php:146
-#: libraries/controllers/StructureController.class.php:1960
-#: libraries/controllers/StructureController.class.php:1965
+#: libraries/controllers/TableStructureController.class.php:951
+#: libraries/controllers/TableStructureController.class.php:956
 #: libraries/tracking.lib.php:922
 #: templates/columns_definitions/column_indexes.phtml:6
-#: templates/structure/check_all_table_column.phtml:22
-#: templates/structure/display_structure.phtml:74
+#: templates/table/structure/check_all_table_column.phtml:22
+#: templates/table/structure/display_structure.phtml:74
 msgid "Primary"
 msgstr "Primária"
 
 #: db_datadict.php:156 js/messages.php:317 libraries/Index.class.php:567
 #: libraries/Index.class.php:606 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261 libraries/mult_submits.lib.php:403
+#: libraries/config/FormDisplay.tpl.php:272 libraries/mult_submits.lib.php:403
 #: libraries/mult_submits.lib.php:417
 #: libraries/plugins/export/ExportHtmlword.class.php:630
 #: libraries/plugins/export/ExportLatex.class.php:589
@@ -194,20 +195,20 @@ msgstr "Primária"
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1010 libraries/tracking.lib.php:1015
 #: prefs_manage.php:140 templates/prefs_autoload.phtml:15
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "No"
 msgstr "Não"
 
 #: db_datadict.php:156 js/messages.php:443 libraries/Index.class.php:568
 #: libraries/Index.class.php:605 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261
-#: libraries/controllers/StructureController.class.php:1344
-#: libraries/controllers/StructureController.class.php:2223
-#: libraries/controllers/StructureController.class.php:2232
-#: libraries/controllers/StructureController.class.php:2237
-#: libraries/controllers/StructureController.class.php:2242
-#: libraries/controllers/StructureController.class.php:2247
+#: libraries/config/FormDisplay.tpl.php:272
+#: libraries/controllers/TableStructureController.class.php:539
+#: libraries/controllers/TableStructureController.class.php:1201
+#: libraries/controllers/TableStructureController.class.php:1210
+#: libraries/controllers/TableStructureController.class.php:1215
+#: libraries/controllers/TableStructureController.class.php:1220
+#: libraries/controllers/TableStructureController.class.php:1225
 #: libraries/mult_submits.inc.php:82 libraries/mult_submits.inc.php:178
 #: libraries/mult_submits.lib.php:339 libraries/mult_submits.lib.php:372
 #: libraries/mult_submits.lib.php:401 libraries/mult_submits.lib.php:415
@@ -216,8 +217,8 @@ msgstr "Não"
 #: libraries/plugins/export/ExportOdt.class.php:756
 #: libraries/plugins/export/ExportTexytext.class.php:567
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1077
-#: libraries/server_databases.lib.php:464
-#: libraries/server_databases.lib.php:474
+#: libraries/server_databases.lib.php:475
+#: libraries/server_databases.lib.php:485
 #: libraries/server_privileges.lib.php:2546
 #: libraries/server_privileges.lib.php:2727
 #: libraries/server_privileges.lib.php:2748
@@ -227,7 +228,7 @@ msgstr "Não"
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1008 libraries/tracking.lib.php:1013
 #: prefs_manage.php:138 templates/prefs_autoload.phtml:14
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "Yes"
 msgstr "Sim"
 
@@ -237,7 +238,7 @@ msgstr "Ver despejo (estrutura) do banco de dados"
 
 #: db_export.php:37 db_tracking.php:90 export.php:382
 #: libraries/DBQbe.class.php:326
-#: libraries/controllers/StructureController.class.php:231
+#: libraries/controllers/DatabaseStructureController.class.php:170
 #: libraries/navigation/NavigationTree.class.php:897
 msgid "No tables found in database."
 msgstr "Nenhuma tabela encontrada no banco de dados."
@@ -248,14 +249,14 @@ msgstr "Nenhuma tabela encontrada no banco de dados."
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:26
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:120
-#: templates/structure/show_create.phtml:18
+#: templates/database/structure/show_create.phtml:18
 msgid "Tables"
 msgstr "Tabelas"
 
 #: db_export.php:52 libraries/Menu.class.php:317 libraries/Menu.class.php:425
-#: libraries/Util.class.php:3333 libraries/Util.class.php:3343
-#: libraries/Util.class.php:3349 libraries/Util.class.php:3629
-#: libraries/Util.class.php:4327 libraries/Util.class.php:4344
+#: libraries/Util.class.php:3339 libraries/Util.class.php:3349
+#: libraries/Util.class.php:3355 libraries/Util.class.php:3635
+#: libraries/Util.class.php:4333 libraries/Util.class.php:4350
 #: libraries/central_columns.lib.php:728 libraries/config.values.php:39
 #: libraries/config.values.php:47 libraries/config.values.php:109
 #: libraries/config.values.php:115 libraries/config/setup.forms.php:323
@@ -269,7 +270,7 @@ msgstr "Tabelas"
 #: libraries/navigation/Nodes/Node_Table.class.php:283
 #: libraries/server_privileges.lib.php:1141 libraries/tracking.lib.php:874
 #: templates/columns_definitions/table_fields_definitions.phtml:3
-#: templates/designer/table_list.phtml:28
+#: templates/database/designer/table_list.phtml:28
 msgid "Structure"
 msgstr "Estrutura"
 
@@ -281,7 +282,7 @@ msgstr "Estrutura"
 #: libraries/config/user_preferences.forms.php:292
 #: libraries/config/user_preferences.forms.php:297
 #: libraries/server_privileges.lib.php:1140
-#: templates/structure/display_table_stats.phtml:12
+#: templates/table/structure/display_table_stats.phtml:12
 msgid "Data"
 msgstr "Dados"
 
@@ -355,10 +356,10 @@ msgstr "Tabelas rastreadas"
 #: libraries/server_privileges.lib.php:2908
 #: libraries/server_privileges.lib.php:3145
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4346
-#: templates/structure/table_header.phtml:21
-#: templates/tbl_relation/foreign_key_row.phtml:176
-#: templates/tbl_relation/internal_relational_row.phtml:63
+#: libraries/server_privileges.lib.php:4372
+#: templates/database/structure/table_header.phtml:21
+#: templates/table/relation/foreign_key_row.phtml:176
+#: templates/table/relation/internal_relational_row.phtml:63
 msgid "Table"
 msgstr "Tabela"
 
@@ -375,7 +376,7 @@ msgid "Updated"
 msgstr "Atualizado"
 
 #: db_tracking.php:130 js/messages.php:243 libraries/Menu.class.php:552
-#: libraries/Util.class.php:4314 libraries/config.values.php:104
+#: libraries/Util.class.php:4320 libraries/config.values.php:104
 #: libraries/rte/rte_events.lib.php:393 libraries/rte/rte_list.lib.php:101
 #: libraries/server_status_processes.lib.php:92 libraries/tracking.lib.php:279
 msgid "Status"
@@ -384,14 +385,15 @@ msgstr "Status"
 #: db_tracking.php:131 db_tracking.php:290 libraries/Index.class.php:693
 #: libraries/central_columns.lib.php:687 libraries/rte/rte_list.lib.php:74
 #: libraries/rte/rte_list.lib.php:89 libraries/rte/rte_list.lib.php:102
-#: libraries/server_databases.lib.php:398
+#: libraries/server_databases.lib.php:409
 #: libraries/server_privileges.lib.php:2372
 #: libraries/server_privileges.lib.php:3166
 #: libraries/server_privileges.lib.php:3342
 #: libraries/server_user_groups.lib.php:82
 #: libraries/server_variables.lib.php:189 libraries/tracking.lib.php:280
-#: libraries/tracking.lib.php:793 templates/structure/table_header.phtml:30
-#: templates/structure/table_structure_header.phtml:23
+#: libraries/tracking.lib.php:793
+#: templates/database/structure/table_header.phtml:30
+#: templates/table/structure/table_structure_header.phtml:23
 msgid "Action"
 msgstr "Ação"
 
@@ -433,7 +435,7 @@ msgid "Untracked tables"
 msgstr "Tabelas não monitoradas"
 
 #: db_tracking.php:305 db_tracking.php:336
-#: templates/structure/optional_action_links.phtml:17
+#: templates/table/structure/optional_action_links.phtml:17
 msgid "Track table"
 msgstr "Monitorar tabela"
 
@@ -489,7 +491,7 @@ msgid "Value for the column \"%s\""
 msgstr "Valores da coluna \"%s\""
 
 #: gis_data_editor.php:146
-#: templates/gis_visualization/gis_visualization.phtml:37
+#: templates/table/gis_visualization/gis_visualization.phtml:37
 msgid "Use OpenStreetMaps as Base Layer"
 msgstr "Use o OpenStreetMaps como camada base"
 
@@ -569,35 +571,35 @@ msgstr "Adicionar geometria"
 #: libraries/display_change_password.lib.php:162
 #: libraries/display_export.lib.php:402 libraries/display_export.lib.php:408
 #: libraries/display_import.lib.php:392 libraries/index.lib.php:44
-#: libraries/insert_edit.lib.php:1546 libraries/insert_edit.lib.php:1583
+#: libraries/insert_edit.lib.php:1544 libraries/insert_edit.lib.php:1581
 #: libraries/normalization.lib.php:165 libraries/normalization.lib.php:821
 #: libraries/operations.lib.php:38 libraries/operations.lib.php:108
 #: libraries/operations.lib.php:263 libraries/operations.lib.php:306
 #: libraries/operations.lib.php:801 libraries/operations.lib.php:874
 #: libraries/operations.lib.php:923 libraries/operations.lib.php:1337
 #: libraries/operations.lib.php:1658
-#: libraries/plugins/auth/AuthenticationCookie.class.php:244
+#: libraries/plugins/auth/AuthenticationCookie.class.php:232
 #: libraries/replication_gui.lib.php:122 libraries/replication_gui.lib.php:161
 #: libraries/replication_gui.lib.php:324 libraries/replication_gui.lib.php:461
 #: libraries/replication_gui.lib.php:906 libraries/rte/rte_events.lib.php:509
-#: libraries/rte/rte_routines.lib.php:969
-#: libraries/rte/rte_routines.lib.php:1581
+#: libraries/rte/rte_routines.lib.php:1060
+#: libraries/rte/rte_routines.lib.php:1672
 #: libraries/rte/rte_triggers.lib.php:396 libraries/server_bin_log.lib.php:61
 #: libraries/server_privileges.lib.php:705
 #: libraries/server_privileges.lib.php:2106
 #: libraries/server_privileges.lib.php:2872
 #: libraries/server_privileges.lib.php:3553
-#: libraries/server_privileges.lib.php:4627
+#: libraries/server_privileges.lib.php:4653
 #: libraries/server_user_groups.lib.php:285
 #: libraries/sql_query_form.lib.php:369 libraries/sql_query_form.lib.php:429
 #: libraries/tracking.lib.php:533 libraries/tracking.lib.php:653
 #: prefs_manage.php:277 prefs_manage.php:355
 #: templates/columns_definitions/column_definitions_form.phtml:59
-#: templates/header_location.phtml:17 templates/index_form.phtml:238
+#: templates/database/create_table.phtml:21 templates/header_location.phtml:28
 #: templates/startAndNumberOfRowsPanel.phtml:14
-#: templates/structure/add_column.phtml:25
-#: templates/table/create_table.phtml:21
-#: templates/table/selection_form.phtml:75 view_create.php:275
+#: templates/table/index_form.phtml:238
+#: templates/table/search/selection_form.phtml:75
+#: templates/table/structure/add_column.phtml:25 view_create.php:275
 #: view_operations.php:106
 msgid "Go"
 msgstr "Executar"
@@ -690,7 +692,7 @@ msgstr ""
 msgid "Could not load import plugins, please check your installation!"
 msgstr "Não foi possível carregar os plugins, verifique sua instalação!"
 
-#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1466
+#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1460
 #, php-format
 msgid "Bookmark %s has been created."
 msgstr "Marcador %s criado."
@@ -729,11 +731,11 @@ msgstr "Não foi possível carregar o progresso da importação."
 msgid "Back"
 msgstr "Voltar"
 
-#: index.php:148 libraries/Footer.class.php:70
+#: index.php:149 libraries/Footer.class.php:70
 msgid "phpMyAdmin Demo Server"
 msgstr "Servidor de Demonstração do phpMyAdmin"
 
-#: index.php:152
+#: index.php:153
 #, php-format
 msgid ""
 "You are using the demo server. You can do anything here, but please do not "
@@ -744,110 +746,110 @@ msgstr ""
 "desejar aqui mas, por favor, não altere os usuários root, debian-sys-maint e "
 "pma. Mais informações disponíveis em %s."
 
-#: index.php:162
+#: index.php:163
 msgid "General Settings"
 msgstr "Configurações gerais"
 
-#: index.php:190 libraries/display_change_password.lib.php:50
+#: index.php:191 libraries/display_change_password.lib.php:50
 #: libraries/display_change_password.lib.php:53 user_password.php:247
 msgid "Change password"
 msgstr "Alterar a senha"
 
-#: index.php:206
+#: index.php:207
 msgid "Server connection collation"
 msgstr "Collation de conexão do servidor MySQL"
 
-#: index.php:228
+#: index.php:229
 msgid "Appearance Settings"
 msgstr "Configurações de aparência"
 
-#: index.php:258 prefs_manage.php:285
+#: index.php:259 prefs_manage.php:285
 msgid "More settings"
 msgstr "Mais configurações"
 
-#: index.php:279
+#: index.php:280
 msgid "Database server"
 msgstr "Servidor de banco de dados"
 
-#: index.php:282 libraries/plugins/auth/AuthenticationCookie.class.php:181
+#: index.php:283 libraries/plugins/auth/AuthenticationCookie.class.php:169
 msgid "Server:"
 msgstr "Servidor:"
 
-#: index.php:286
+#: index.php:287
 msgid "Server type:"
 msgstr "Tipo de servidor:"
 
-#: index.php:290 libraries/plugins/export/ExportLatex.class.php:212
+#: index.php:291 libraries/plugins/export/ExportLatex.class.php:212
 #: libraries/plugins/export/ExportSql.class.php:687
 #: libraries/plugins/export/ExportXml.class.php:189
 msgid "Server version:"
 msgstr "Versão do servidor:"
 
-#: index.php:296
+#: index.php:297
 msgid "Protocol version:"
 msgstr "Versão de protocolo:"
 
-#: index.php:300
+#: index.php:301
 msgid "User:"
 msgstr "Usuário:"
 
-#: index.php:305
+#: index.php:306
 msgid "Server charset:"
 msgstr "Charset do servidor:"
 
-#: index.php:320
+#: index.php:321
 msgid "Web server"
 msgstr "Servidor web"
 
-#: index.php:331
+#: index.php:332
 msgid "Database client version:"
 msgstr "Versão do cliente de banco de dados:"
 
-#: index.php:335
+#: index.php:336
 msgid "PHP extension:"
 msgstr "Extensão do PHP:"
 
-#: index.php:349
+#: index.php:350
 msgid "PHP version:"
 msgstr "Versão do PHP:"
 
-#: index.php:360
+#: index.php:361
 msgid "Show PHP information"
 msgstr "Mostrar informações do PHP"
 
-#: index.php:383
+#: index.php:384
 msgid "Version information:"
 msgstr "Informações da versão:"
 
-#: index.php:392 libraries/Util.class.php:432 libraries/Util.class.php:495
-#: libraries/config/FormDisplay.tpl.php:151
+#: index.php:393 libraries/Util.class.php:432 libraries/Util.class.php:495
+#: libraries/config/FormDisplay.tpl.php:162
 #: libraries/display_export.lib.php:577 libraries/engines/pbxt.lib.php:162
 #: libraries/navigation/NavigationHeader.class.php:196
 #: libraries/server_variables.lib.php:160
 msgid "Documentation"
 msgstr "Documentação"
 
-#: index.php:399
+#: index.php:400
 msgid "Wiki"
 msgstr "Wiki"
 
-#: index.php:408
+#: index.php:409
 msgid "Official Homepage"
 msgstr "Página Oficial do phpMyAdmin"
 
-#: index.php:415
+#: index.php:416
 msgid "Contribute"
 msgstr "Contribuir"
 
-#: index.php:422
+#: index.php:423
 msgid "Get support"
 msgstr "Obter suporte"
 
-#: index.php:429
+#: index.php:430
 msgid "List of changes"
 msgstr "Lista de mudanças"
 
-#: index.php:451
+#: index.php:452
 msgid ""
 "You are connected as 'root' with no password, which corresponds to the "
 "default MySQL privileged account. Your MySQL server is running with this "
@@ -859,7 +861,7 @@ msgstr ""
 "padrão, está aberto a intrusões e você realmente deve corrigir esta falha de "
 "segurança definindo uma senha para o usuário 'root'."
 
-#: index.php:468
+#: index.php:469
 msgid ""
 "You have enabled mbstring.func_overload in your PHP configuration. This "
 "option is incompatible with phpMyAdmin and might cause some data to be "
@@ -868,7 +870,7 @@ msgstr ""
 "Você habilitou mbstring.func_overload nas configurações do PHP. Essa opção é "
 "incompatível com o phpMyAdmin e certamente causará a perda de algum dado!"
 
-#: index.php:483
+#: index.php:484
 msgid ""
 "The mbstring PHP extension was not found and you seem to be using a "
 "multibyte charset. Without the mbstring extension phpMyAdmin is unable to "
@@ -879,7 +881,7 @@ msgstr ""
 "será capaz de dividir as strings corretamente e isso pode causar resultados "
 "inesperados."
 
-#: index.php:500
+#: index.php:501
 msgid ""
 "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini."
 "session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower than "
@@ -891,7 +893,7 @@ msgstr ""
 "validade de cookies configurada no phpMyAdmin, por isso, o seu login poderá "
 "expirar mais cedo do que o configurado no phpMyAdmin."
 
-#: index.php:519
+#: index.php:520
 msgid ""
 "Login cookie store is lower than cookie validity configured in phpMyAdmin, "
 "because of this, your login will expire sooner than configured in phpMyAdmin."
@@ -900,13 +902,13 @@ msgstr ""
 "phpMyAdmin, por isso, o seu login expirará mais cedo do que o configurado no "
 "phpMyAdmin."
 
-#: index.php:535
+#: index.php:536
 msgid "The configuration file now needs a secret passphrase (blowfish_secret)."
 msgstr ""
 "O arquivo de configuração agora precisa de uma frase secreta com senha "
 "(blowfish_secret)."
 
-#: index.php:548
+#: index.php:549
 msgid ""
 "Directory [code]config[/code], which is used by the setup script, still "
 "exists in your phpMyAdmin directory. It is strongly recommended to remove it "
@@ -919,7 +921,7 @@ msgstr ""
 "servidor pode ser comprometida por indivíduos não autorizados realizando "
 "downloads de suas configurações."
 
-#: index.php:564
+#: index.php:565
 #, php-format
 msgid ""
 "The phpMyAdmin configuration storage is not completely configured, some "
@@ -929,14 +931,14 @@ msgstr ""
 "configurado, algumas funções avançadas foram desativadas. %sDescubra porque"
 "%s. "
 
-#: index.php:571
+#: index.php:572
 msgid ""
 "Or alternately go to 'Operations' tab of any database to set it up there."
 msgstr ""
 "Ou, alternativamente, vá à aba 'Operações' de qualquer banco de dados para "
 "configurá-lo lá."
 
-#: index.php:620
+#: index.php:621
 #, php-format
 msgid ""
 "Your PHP MySQL library version %s differs from your MySQL server version %s. "
@@ -945,7 +947,7 @@ msgstr ""
 "Sua versão %s da biblioteca MySQL do PHP é diferente da versão %s do seu "
 "servidor MySQL. Isso pode causar comportamentos imprevistos."
 
-#: index.php:648
+#: index.php:649
 #, php-format
 msgid ""
 "Server running with Suhosin. Please refer to %sdocumentation%s for possible "
@@ -1092,8 +1094,8 @@ msgstr ""
 msgid "Save & Close"
 msgstr "Salvar & Fechar"
 
-#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:404
-#: libraries/insert_edit.lib.php:1550 prefs_manage.php:361
+#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:415
+#: libraries/insert_edit.lib.php:1548 prefs_manage.php:361
 #: prefs_manage.php:372
 msgid "Reset"
 msgstr "Resetar"
@@ -1126,7 +1128,7 @@ msgstr "Adicionar índice"
 msgid "Edit Index"
 msgstr "Editar índice"
 
-#: js/messages.php:99 templates/index_form.phtml:232
+#: js/messages.php:99 templates/table/index_form.phtml:232
 #, php-format
 msgid "Add %s column(s) to index"
 msgstr "Adicionar %s coluna(s) ao índice"
@@ -1147,13 +1149,14 @@ msgstr "Composto com:"
 msgid "Please select column(s) for the index."
 msgstr "Por favor. Selecione a(as) coluna(as)para o Índice."
 
-#: js/messages.php:106 templates/structure/add_column.phtml:1
+#: js/messages.php:106 templates/table/structure/add_column.phtml:1
 msgid "You have to add at least one column."
 msgstr "Você deve adicionar pelo menos uma coluna."
 
-#: js/messages.php:109 libraries/insert_edit.lib.php:1548
+#: js/messages.php:109 libraries/insert_edit.lib.php:1546
 #: templates/columns_definitions/column_definitions_form.phtml:162
-#: templates/index_form.phtml:237 templates/tbl_relation/common_form.phtml:106
+#: templates/table/index_form.phtml:237
+#: templates/table/relation/common_form.phtml:106
 msgid "Preview SQL"
 msgstr "Ver SQL"
 
@@ -1170,7 +1173,7 @@ msgid "SQL query:"
 msgstr "Query SQL:"
 
 #. l10n: Default label for the y-Axis of Charts
-#: js/messages.php:118 templates/tbl_chart.phtml:109
+#: js/messages.php:118 templates/table/chart/tbl_chart.phtml:109
 msgid "Y Values"
 msgstr "Valores Y"
 
@@ -1331,7 +1334,7 @@ msgstr "Bytes enviados"
 msgid "Bytes received"
 msgstr "Bytes recebidos"
 
-#: js/messages.php:169 libraries/server_status.lib.php:226
+#: js/messages.php:169 libraries/server_status.lib.php:235
 msgid "Connections"
 msgstr "Conexões"
 
@@ -1388,12 +1391,12 @@ msgstr "%d tabela(s)"
 msgid "Questions"
 msgstr "Requisições"
 
-#: js/messages.php:184 libraries/server_status.lib.php:134
+#: js/messages.php:184 libraries/server_status.lib.php:143
 msgid "Traffic"
 msgstr "Tráfego"
 
 #: js/messages.php:185 libraries/Menu.class.php:586
-#: libraries/Util.class.php:4318 libraries/server_status_monitor.lib.php:257
+#: libraries/Util.class.php:4324 libraries/server_status_monitor.lib.php:257
 msgid "Settings"
 msgstr "Configurações"
 
@@ -1416,8 +1419,9 @@ msgstr "Por favor adicione no mínimo uma variável à série!"
 #: libraries/server_status_monitor.lib.php:236
 #: libraries/server_status_processes.lib.php:308
 #: templates/columns_definitions/transformation.phtml:4
-#: templates/designer/options_panel.phtml:178
-#: templates/table/options_zoom.phtml:12 templates/table/rows_zoom.phtml:26
+#: templates/database/designer/options_panel.phtml:178
+#: templates/table/search/options_zoom.phtml:12
+#: templates/table/search/rows_zoom.phtml:26
 msgid "None"
 msgstr "Nenhum"
 
@@ -1714,8 +1718,8 @@ msgstr ""
 
 #: js/messages.php:270 libraries/Menu.class.php:352
 #: libraries/Menu.class.php:455 libraries/Menu.class.php:582
-#: libraries/Util.class.php:4317 libraries/Util.class.php:4332
-#: libraries/Util.class.php:4349 libraries/config/messages.inc.php:258
+#: libraries/Util.class.php:4323 libraries/Util.class.php:4338
+#: libraries/Util.class.php:4355 libraries/config/messages.inc.php:258
 #: libraries/display_import.lib.php:105
 #: libraries/server_status_monitor.lib.php:318 prefs_manage.php:238
 #: setup/frames/menu.inc.php:26
@@ -1775,13 +1779,13 @@ msgid "Formatting SQL..."
 msgstr "Formatando SQL..."
 
 #: js/messages.php:293 libraries/server_variables.lib.php:157
-#: templates/designer/aggregate_query_panel.phtml:63
-#: templates/designer/delete_relation_panel.phtml:28
-#: templates/designer/having_query_panel.phtml:117
-#: templates/designer/new_relation_panel.phtml:88
-#: templates/designer/options_panel.phtml:253
-#: templates/designer/rename_to_panel.phtml:45
-#: templates/designer/where_query_panel.phtml:83
+#: templates/database/designer/aggregate_query_panel.phtml:63
+#: templates/database/designer/delete_relation_panel.phtml:28
+#: templates/database/designer/having_query_panel.phtml:117
+#: templates/database/designer/new_relation_panel.phtml:88
+#: templates/database/designer/options_panel.phtml:253
+#: templates/database/designer/rename_to_panel.phtml:45
+#: templates/database/designer/where_query_panel.phtml:83
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -1789,7 +1793,7 @@ msgstr "Cancelar"
 msgid "Page-related settings"
 msgstr "Configurações da página"
 
-#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:402
+#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:413
 msgid "Apply"
 msgstr "Aplicar"
 
@@ -1824,8 +1828,8 @@ msgstr "Código do erro: %s"
 msgid "Error text: %s"
 msgstr "Texto do erro: %s"
 
-#: js/messages.php:307 libraries/db_common.inc.php:68
-#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:450
+#: js/messages.php:307 libraries/db_common.inc.php:69
+#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:461
 msgid "No databases selected."
 msgstr "Nenhum banco de dados selecionado."
 
@@ -1837,12 +1841,13 @@ msgstr "Excluindo coluna"
 msgid "Adding Primary Key"
 msgstr "Adicionar chave primária"
 
-#: js/messages.php:310 templates/designer/aggregate_query_panel.phtml:59
-#: templates/designer/having_query_panel.phtml:113
-#: templates/designer/new_relation_panel.phtml:87
-#: templates/designer/options_panel.phtml:252
-#: templates/designer/rename_to_panel.phtml:41
-#: templates/designer/where_query_panel.phtml:82
+#: js/messages.php:310
+#: templates/database/designer/aggregate_query_panel.phtml:59
+#: templates/database/designer/having_query_panel.phtml:113
+#: templates/database/designer/new_relation_panel.phtml:87
+#: templates/database/designer/options_panel.phtml:252
+#: templates/database/designer/rename_to_panel.phtml:41
+#: templates/database/designer/where_query_panel.phtml:82
 msgid "OK"
 msgstr "OK"
 
@@ -1862,7 +1867,7 @@ msgstr "Copiando o banco de dados"
 msgid "Changing Charset"
 msgstr "Mudando o conjunto de caracteres"
 
-#: js/messages.php:320 libraries/Util.class.php:3217
+#: js/messages.php:320 libraries/Util.class.php:3223
 msgid "Enable foreign key checks"
 msgstr "Habilitar verificação de chaves estrangeiras"
 
@@ -1898,20 +1903,21 @@ msgstr ""
 #: js/messages.php:334 libraries/DisplayResults.class.php:4834
 #: libraries/DisplayResults.class.php:5092 libraries/Menu.class.php:344
 #: libraries/Menu.class.php:446 libraries/Menu.class.php:578
-#: libraries/Util.class.php:3636 libraries/Util.class.php:3637
-#: libraries/Util.class.php:4316 libraries/Util.class.php:4331
-#: libraries/Util.class.php:4348 libraries/config/messages.inc.php:252
+#: libraries/Util.class.php:3642 libraries/Util.class.php:3643
+#: libraries/Util.class.php:4322 libraries/Util.class.php:4337
+#: libraries/Util.class.php:4354 libraries/config/messages.inc.php:252
 #: libraries/display_export.lib.php:173 libraries/rte/rte_list.lib.php:146
 #: libraries/server_privileges.lib.php:2211
 #: libraries/server_privileges.lib.php:2290
 #: libraries/server_privileges.lib.php:2632
 #: libraries/server_privileges.lib.php:3356
 #: libraries/server_status_monitor.lib.php:322 prefs_manage.php:303
-#: setup/frames/menu.inc.php:27 templates/structure/check_all_tables.phtml:11
+#: setup/frames/menu.inc.php:27
+#: templates/database/structure/check_all_tables.phtml:11
 msgid "Export"
 msgstr "Exportar"
 
-#: js/messages.php:337 libraries/rte/rte_routines.lib.php:652
+#: js/messages.php:337 libraries/rte/rte_routines.lib.php:743
 msgid "ENUM/SET editor"
 msgstr "Editor ENUM/SET"
 
@@ -1951,7 +1957,7 @@ msgstr "Mostrar caixa de consulta"
 #: libraries/Console.class.php:214 libraries/DisplayResults.class.php:3474
 #: libraries/DisplayResults.class.php:4818 libraries/Index.class.php:723
 #: libraries/Util.class.php:706 libraries/Util.class.php:1202
-#: libraries/Util.class.php:3634 libraries/Util.class.php:3635
+#: libraries/Util.class.php:3640 libraries/Util.class.php:3641
 #: libraries/central_columns.lib.php:851
 #: libraries/central_columns.lib.php:1193
 #: libraries/config/messages.inc.php:892
@@ -1969,7 +1975,7 @@ msgstr "Editar"
 #: libraries/server_user_groups.lib.php:129
 #: libraries/sql_query_form.lib.php:416 libraries/tracking.lib.php:477
 #: setup/frames/index.inc.php:183 setup/frames/index.inc.php:291
-#: templates/designer/delete_relation_panel.phtml:27
+#: templates/database/designer/delete_relation_panel.phtml:27
 msgid "Delete"
 msgstr "Remover"
 
@@ -2140,11 +2146,11 @@ msgid "No dependencies selected!"
 msgstr "Nenhuma dependência selecionada!"
 
 #: js/messages.php:394 libraries/central_columns.lib.php:1214
-#: libraries/insert_edit.lib.php:1458 libraries/server_variables.lib.php:155
+#: libraries/insert_edit.lib.php:1456 libraries/server_variables.lib.php:155
 #: setup/frames/config.inc.php:42 setup/frames/index.inc.php:279
 #: templates/columns_definitions/column_definitions_form.phtml:165
-#: templates/gis_visualization/gis_visualization.phtml:48
-#: templates/tbl_relation/common_form.phtml:107
+#: templates/table/gis_visualization/gis_visualization.phtml:48
+#: templates/table/relation/common_form.phtml:107
 msgid "Save"
 msgstr "Salvar"
 
@@ -2224,8 +2230,8 @@ msgid "Data point content"
 msgstr "Conteúdo do ponteiro de dados"
 
 #: js/messages.php:430 js/messages.php:562 js/messages.php:579
-#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2573
-#: templates/index_form.phtml:154 templates/index_form.phtml:194
+#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2571
+#: templates/table/index_form.phtml:154 templates/table/index_form.phtml:194
 msgid "Ignore"
 msgstr "Ignorar"
 
@@ -2286,8 +2292,8 @@ msgstr "Selecionar chave estrangeira"
 msgid "Please select the primary key or a unique key!"
 msgstr "Por favor, selecione uma chave primária ou uma chave única!"
 
-#: js/messages.php:457 templates/designer/side_menu.phtml:91
-#: templates/designer/side_menu.phtml:94
+#: js/messages.php:457 templates/database/designer/side_menu.phtml:91
+#: templates/database/designer/side_menu.phtml:94
 msgid "Choose column to display"
 msgstr "Marque a coluna para exibir"
 
@@ -2303,18 +2309,18 @@ msgstr ""
 msgid "Page name"
 msgstr "Nome da página"
 
-#: js/messages.php:463 templates/designer/side_menu.phtml:56
-#: templates/designer/side_menu.phtml:59
+#: js/messages.php:463 templates/database/designer/side_menu.phtml:56
+#: templates/database/designer/side_menu.phtml:59
 msgid "Save page"
 msgstr "Selecionar página"
 
-#: js/messages.php:464 templates/designer/side_menu.phtml:63
-#: templates/designer/side_menu.phtml:66
+#: js/messages.php:464 templates/database/designer/side_menu.phtml:63
+#: templates/database/designer/side_menu.phtml:66
 msgid "Save page as"
 msgstr "Salvar página como"
 
-#: js/messages.php:465 templates/designer/side_menu.phtml:49
-#: templates/designer/side_menu.phtml:52
+#: js/messages.php:465 templates/database/designer/side_menu.phtml:49
+#: templates/database/designer/side_menu.phtml:52
 msgid "Open page"
 msgstr "Páginas livres"
 
@@ -2322,7 +2328,7 @@ msgstr "Páginas livres"
 msgid "Delete page"
 msgstr "Apagar página"
 
-#: js/messages.php:467 templates/designer/side_menu.phtml:10
+#: js/messages.php:467 templates/database/designer/side_menu.phtml:10
 msgid "Untitled"
 msgstr "Sem título"
 
@@ -2446,7 +2452,7 @@ msgstr "Tamanho original"
 msgid "cancel"
 msgstr "Cancelar"
 
-#: js/messages.php:499 libraries/server_status.lib.php:271
+#: js/messages.php:499 libraries/server_status.lib.php:280
 msgid "Aborted"
 msgstr "Abortado"
 
@@ -3026,7 +3032,7 @@ msgstr "Por favor, digite um número válido!"
 
 #: js/messages.php:793 libraries/Message.class.php:199
 #: libraries/Util.class.php:654 libraries/core.lib.php:245
-#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1172
+#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1170
 #: tbl_operations.php:229 view_operations.php:63
 msgid "Error"
 msgstr "Erro"
@@ -3089,8 +3095,8 @@ msgstr "por segundo"
 msgid "per minute"
 msgstr "por minuto"
 
-#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:143
-#: libraries/server_status.lib.php:228
+#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:152
+#: libraries/server_status.lib.php:237
 #: libraries/server_status_queries.lib.php:98
 msgid "per hour"
 msgstr "por hora"
@@ -3110,7 +3116,7 @@ msgstr ""
 "Permissões incorretas no arquivo de configuração, não deveria permitir "
 "escrita por qualquer um!"
 
-#: libraries/Config.class.php:1799
+#: libraries/Config.class.php:1801
 msgid "Font size"
 msgstr "Tamanho da fonte"
 
@@ -3138,10 +3144,10 @@ msgstr "Fazer novo consulta"
 #: libraries/server_privileges.lib.php:2890
 #: libraries/server_privileges.lib.php:3144
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4332
+#: libraries/server_privileges.lib.php:4358
 #: libraries/server_status_processes.lib.php:80
-#: templates/tbl_relation/foreign_key_row.phtml:165
-#: templates/tbl_relation/internal_relational_row.phtml:55
+#: templates/table/relation/foreign_key_row.phtml:165
+#: templates/table/relation/internal_relational_row.phtml:55
 msgid "Database"
 msgstr "Banco de dados"
 
@@ -3234,11 +3240,11 @@ msgstr "Histórico"
 #: libraries/plugins/import/ImportMediawiki.class.php:60
 #: libraries/plugins/import/ImportOds.class.php:59
 #: libraries/plugins/import/ImportShp.class.php:57
-#: libraries/plugins/import/ImportSql.class.php:148
+#: libraries/plugins/import/ImportSql.class.php:51
 #: libraries/plugins/import/ImportXml.class.php:58
-#: libraries/rte/rte_routines.lib.php:833 templates/index_form.phtml:49
-#: templates/structure/row_stats_table.phtml:20
-#: templates/table/options.phtml:2
+#: libraries/rte/rte_routines.lib.php:924 templates/table/index_form.phtml:49
+#: templates/table/search/options.phtml:2
+#: templates/table/structure/row_stats_table.phtml:20
 msgid "Options"
 msgstr "Opções"
 
@@ -3277,7 +3283,8 @@ msgstr "Descendente"
 msgid "Order:"
 msgstr "Ordem"
 
-#: libraries/Console.class.php:289 templates/table/replace_preview.phtml:17
+#: libraries/Console.class.php:289
+#: templates/table/search/replace_preview.phtml:17
 msgid "Count"
 msgstr "Contagem"
 
@@ -3388,9 +3395,9 @@ msgstr "Mudar para o tema escuro"
 #: libraries/operations.lib.php:794 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:191
-#: templates/structure/sortable_header.phtml:21
-#: templates/structure/sortable_header.phtml:38
-#: templates/table/options.phtml:68
+#: templates/database/structure/sortable_header.phtml:21
+#: templates/database/structure/sortable_header.phtml:38
+#: templates/table/search/options.phtml:68
 msgid "Ascending"
 msgstr "Ascendente"
 
@@ -3400,13 +3407,14 @@ msgstr "Ascendente"
 #: libraries/operations.lib.php:797 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:188
-#: templates/structure/sortable_header.phtml:26
-#: templates/structure/sortable_header.phtml:43
-#: templates/table/options.phtml:69
+#: templates/database/structure/sortable_header.phtml:26
+#: templates/database/structure/sortable_header.phtml:43
+#: templates/table/search/options.phtml:69
 msgid "Descending"
 msgstr "Descendente"
 
-#: libraries/DBQbe.class.php:467 templates/table/search_and_replace.phtml:6
+#: libraries/DBQbe.class.php:467
+#: templates/table/search/search_and_replace.phtml:6
 msgid "Column:"
 msgstr "Campo:"
 
@@ -3568,12 +3576,12 @@ msgstr[0] "%1$s resultado em <strong>%2$s</strong>"
 msgstr[1] "%1$s resultados em <strong>%2$s</strong>"
 
 #: libraries/DbSearch.class.php:354 libraries/Menu.class.php:311
-#: libraries/Util.class.php:3337 libraries/Util.class.php:3347
-#: libraries/Util.class.php:3623 libraries/Util.class.php:3624
-#: libraries/Util.class.php:4343 libraries/config.values.php:43
+#: libraries/Util.class.php:3343 libraries/Util.class.php:3353
+#: libraries/Util.class.php:3629 libraries/Util.class.php:3630
+#: libraries/Util.class.php:4349 libraries/config.values.php:43
 #: libraries/config.values.php:51 libraries/config.values.php:119
 #: libraries/navigation/Nodes/Node_Table.class.php:295
-#: templates/structure/check_all_table_column.phtml:5
+#: templates/table/structure/check_all_table_column.phtml:5
 msgid "Browse"
 msgstr "Visualizar"
 
@@ -3590,7 +3598,8 @@ msgstr "Procurar no banco de dados"
 msgid "Words or values to search for (wildcard: \"%\"):"
 msgstr "Palavra(s) ou valor(es) para procurar (coringa: \"%\"):"
 
-#: libraries/DbSearch.class.php:401 templates/table/search_and_replace.phtml:1
+#: libraries/DbSearch.class.php:401
+#: templates/table/search/search_and_replace.phtml:1
 msgid "Find:"
 msgstr "Procurar:"
 
@@ -3634,28 +3643,28 @@ msgstr "Filtrar linhas"
 msgid "Search this table"
 msgstr "Procurar nesta tabela"
 
-#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2532
-#: libraries/Util.class.php:2535
+#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2538
+#: libraries/Util.class.php:2541
 msgctxt "First page"
 msgid "Begin"
 msgstr "Início"
 
-#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2533
-#: libraries/Util.class.php:2536 libraries/server_bin_log.lib.php:170
+#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2539
+#: libraries/Util.class.php:2542 libraries/server_bin_log.lib.php:170
 #: libraries/server_bin_log.lib.php:172
 msgctxt "Previous page"
 msgid "Previous"
 msgstr "Anterior"
 
-#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2564
-#: libraries/Util.class.php:2574 libraries/server_bin_log.lib.php:204
+#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2570
+#: libraries/Util.class.php:2580 libraries/server_bin_log.lib.php:204
 #: libraries/server_bin_log.lib.php:206
 msgctxt "Next page"
 msgid "Next"
 msgstr "Próximo"
 
-#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2565
-#: libraries/Util.class.php:2575
+#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2571
+#: libraries/Util.class.php:2581
 msgctxt "Last page"
 msgid "End"
 msgstr "Fim"
@@ -3730,15 +3739,15 @@ msgid "May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]."
 msgstr "Pode ser aproximado. Veja a [doc@faq3-11]FAQ 3.11[/doc]."
 
 #: libraries/DisplayResults.class.php:4332 libraries/Message.class.php:180
-#: libraries/controllers/TableRelationController.class.php:258
+#: libraries/controllers/TableRelationController.class.php:259
 #: libraries/controllers/TableSearchController.class.php:655
-#: libraries/rte/rte_routines.lib.php:1332 libraries/sql_query_form.lib.php:89
+#: libraries/rte/rte_routines.lib.php:1423 libraries/sql_query_form.lib.php:89
 #: tbl_operations.php:227 tbl_row_action.php:138 view_operations.php:62
 msgid "Your SQL query has been executed successfully."
 msgstr "Seu comando SQL foi executado com sucesso."
 
 #: libraries/DisplayResults.class.php:4660
-#: libraries/controllers/StructureController.class.php:629
+#: libraries/controllers/DatabaseStructureController.class.php:564
 #, php-format
 msgid ""
 "This view has at least this number of rows. Please refer to %sdocumentation"
@@ -3762,33 +3771,33 @@ msgstr "%1$d no total, %2$d na consulta"
 msgid "%d total"
 msgstr "%d no total"
 
-#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1318
+#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1312
 #, php-format
 msgid "Query took %01.4f seconds."
 msgstr "Consulta levou %01.4f segundos."
 
 #: libraries/DisplayResults.class.php:4807
-#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4767
-#: libraries/Util.class.php:4773 libraries/mult_submits.inc.php:50
-#: templates/structure/check_all_tables.phtml:2
-#: templates/structure/check_all_tables.phtml:9
+#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4773
+#: libraries/Util.class.php:4779 libraries/mult_submits.inc.php:50
+#: templates/database/structure/check_all_tables.phtml:2
+#: templates/database/structure/check_all_tables.phtml:9
 msgid "With selected:"
 msgstr "Com marcados:"
 
 #: libraries/DisplayResults.class.php:4811
-#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4769
-#: libraries/Util.class.php:4770 libraries/server_privileges.lib.php:1174
+#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4775
+#: libraries/Util.class.php:4776 libraries/server_privileges.lib.php:1174
 #: libraries/server_privileges.lib.php:1175
 #: libraries/server_privileges.lib.php:1387
 #: libraries/server_user_groups.lib.php:231
-#: templates/structure/check_all_tables.phtml:3
-#: templates/structure/check_all_tables.phtml:4
+#: templates/database/structure/check_all_tables.phtml:3
+#: templates/database/structure/check_all_tables.phtml:4
 msgid "Check All"
 msgstr "Marcar todos"
 
 #: libraries/DisplayResults.class.php:4985 libraries/Header.class.php:383
-#: templates/structure/optional_action_links.phtml:1
-#: templates/structure/print_view_data_dictionary_link.phtml:3
+#: templates/database/structure/print_view_data_dictionary_link.phtml:3
+#: templates/table/structure/optional_action_links.phtml:1
 msgid "Print view"
 msgstr "Imprimir view"
 
@@ -3796,7 +3805,8 @@ msgstr "Imprimir view"
 msgid "Query results operations"
 msgstr "Operações resultantes das consultas"
 
-#: libraries/DisplayResults.class.php:5105 templates/tbl_chart.phtml:12
+#: libraries/DisplayResults.class.php:5105
+#: templates/table/chart/tbl_chart.phtml:12
 msgid "Display chart"
 msgstr "Exibir gráfico"
 
@@ -3891,7 +3901,7 @@ msgid "Click on the bar to scroll to top of page"
 msgstr "Clique na barra para rolar até o topo da página"
 
 #: libraries/Header.class.php:749
-#: libraries/plugins/auth/AuthenticationCookie.class.php:152
+#: libraries/plugins/auth/AuthenticationCookie.class.php:140
 msgid "Javascript must be enabled past this point!"
 msgstr "O JavaScript deve estar ativo após este ponto!"
 
@@ -3913,11 +3923,11 @@ msgid "Keyname"
 msgstr "Nome da chave"
 
 #: libraries/Index.class.php:697
-#: libraries/controllers/StructureController.class.php:1962
-#: libraries/controllers/StructureController.class.php:1967
+#: libraries/controllers/TableStructureController.class.php:953
+#: libraries/controllers/TableStructureController.class.php:958
 #: libraries/tracking.lib.php:973
 #: templates/columns_definitions/column_indexes.phtml:11
-#: templates/structure/check_all_table_column.phtml:26
+#: templates/table/structure/check_all_table_column.phtml:26
 msgid "Unique"
 msgstr "Único"
 
@@ -3936,16 +3946,17 @@ msgstr "Cardinalidade"
 #: libraries/server_collations.lib.php:35 libraries/tracking.lib.php:881
 #: libraries/tracking.lib.php:977
 #: templates/columns_definitions/table_fields_definitions.phtml:33
-#: templates/structure/row_stats_table.phtml:31
-#: templates/structure/table_header.phtml:55
-#: templates/structure/table_structure_header.phtml:7
-#: templates/table/table_header.phtml:8
+#: templates/database/structure/table_header.phtml:55
+#: templates/table/search/table_header.phtml:8
+#: templates/table/structure/row_stats_table.phtml:31
+#: templates/table/structure/table_structure_header.phtml:7
 msgid "Collation"
 msgstr "Colação"
 
 #: libraries/Index.class.php:703 libraries/rte/rte_events.lib.php:496
-#: libraries/rte/rte_routines.lib.php:956 libraries/tracking.lib.php:885
-#: libraries/tracking.lib.php:979 templates/structure/table_header.phtml:84
+#: libraries/rte/rte_routines.lib.php:1047 libraries/tracking.lib.php:885
+#: libraries/tracking.lib.php:979
+#: templates/database/structure/table_header.phtml:84
 msgid "Comment"
 msgstr "Comentário"
 
@@ -3958,15 +3969,15 @@ msgstr "A chave primária foi deletada."
 msgid "Index %s has been dropped."
 msgstr "Índice %s foi eliminado."
 
-#: libraries/Index.class.php:757 libraries/Util.class.php:3630
-#: libraries/Util.class.php:3631
-#: libraries/controllers/StructureController.class.php:1958
-#: libraries/controllers/StructureController.class.php:1959
+#: libraries/Index.class.php:757 libraries/Util.class.php:3636
+#: libraries/Util.class.php:3637
+#: libraries/controllers/TableStructureController.class.php:949
+#: libraries/controllers/TableStructureController.class.php:950
 #: libraries/operations.lib.php:1607 libraries/rte/rte_list.lib.php:150
 #: libraries/server_databases.lib.php:146
-#: templates/structure/check_all_table_column.phtml:15
-#: templates/structure/check_all_tables.phtml:16
-#: templates/tbl_relation/foreign_key_row.phtml:93
+#: templates/database/structure/check_all_tables.phtml:16
+#: templates/table/relation/foreign_key_row.phtml:93
+#: templates/table/structure/check_all_table_column.phtml:15
 msgid "Drop"
 msgstr "Eliminar"
 
@@ -3997,16 +4008,16 @@ msgstr "Servidor"
 #: libraries/Menu.class.php:248
 #: libraries/navigation/Nodes/Node_View.class.php:32
 #: libraries/tbl_info.inc.php:63
-#: templates/structure/structure_table_row.phtml:97
-#: templates/structure/structure_table_row.phtml:159
+#: templates/database/structure/structure_table_row.phtml:97
+#: templates/database/structure/structure_table_row.phtml:159
 msgid "View"
 msgstr "Visualizar"
 
 #: libraries/Menu.class.php:325 libraries/Menu.class.php:429
-#: libraries/Menu.class.php:548 libraries/Util.class.php:3334
-#: libraries/Util.class.php:3344 libraries/Util.class.php:3350
-#: libraries/Util.class.php:4313 libraries/Util.class.php:4328
-#: libraries/Util.class.php:4345 libraries/config.values.php:40
+#: libraries/Menu.class.php:548 libraries/Util.class.php:3340
+#: libraries/Util.class.php:3350 libraries/Util.class.php:3356
+#: libraries/Util.class.php:4319 libraries/Util.class.php:4334
+#: libraries/Util.class.php:4351 libraries/config.values.php:40
 #: libraries/config.values.php:48 libraries/config.values.php:110
 #: libraries/config.values.php:116 libraries/config/messages.inc.php:321
 #: libraries/navigation/Nodes/Node_Table.class.php:292
@@ -4014,19 +4025,19 @@ msgid "SQL"
 msgstr "SQL"
 
 #: libraries/Menu.class.php:328 libraries/Menu.class.php:432
-#: libraries/Util.class.php:3335 libraries/Util.class.php:3345
-#: libraries/Util.class.php:3351 libraries/Util.class.php:3625
-#: libraries/Util.class.php:3626 libraries/Util.class.php:4329
-#: libraries/Util.class.php:4346 libraries/config.values.php:41
+#: libraries/Util.class.php:3341 libraries/Util.class.php:3351
+#: libraries/Util.class.php:3357 libraries/Util.class.php:3631
+#: libraries/Util.class.php:3632 libraries/Util.class.php:4335
+#: libraries/Util.class.php:4352 libraries/config.values.php:41
 #: libraries/config.values.php:49 libraries/config.values.php:111
 #: libraries/config.values.php:117
 #: libraries/navigation/Nodes/Node_Table.class.php:286
 msgid "Search"
 msgstr "Procurar"
 
-#: libraries/Menu.class.php:338 libraries/Util.class.php:3336
-#: libraries/Util.class.php:3346 libraries/Util.class.php:3627
-#: libraries/Util.class.php:3628 libraries/Util.class.php:4347
+#: libraries/Menu.class.php:338 libraries/Util.class.php:3342
+#: libraries/Util.class.php:3352 libraries/Util.class.php:3633
+#: libraries/Util.class.php:3634 libraries/Util.class.php:4353
 #: libraries/config.values.php:42 libraries/config.values.php:50
 #: libraries/config.values.php:118
 #: libraries/navigation/Nodes/Node_Table.class.php:289
@@ -4035,30 +4046,30 @@ msgid "Insert"
 msgstr "Inserir"
 
 #: libraries/Menu.class.php:362 libraries/Menu.class.php:467
-#: libraries/Util.class.php:4334 libraries/Util.class.php:4350
+#: libraries/Util.class.php:4340 libraries/Util.class.php:4356
 #: libraries/config.values.php:106 libraries/server_common.lib.php:51
 #: libraries/server_privileges.lib.php:2370
 #: libraries/server_privileges.lib.php:3158
-#: libraries/server_privileges.lib.php:4221
+#: libraries/server_privileges.lib.php:4247
 msgid "Privileges"
 msgstr "Privilégios"
 
 #: libraries/Menu.class.php:371 libraries/Menu.class.php:379
-#: libraries/Menu.class.php:459 libraries/Util.class.php:3338
-#: libraries/Util.class.php:3352 libraries/Util.class.php:4333
-#: libraries/Util.class.php:4351 libraries/config.values.php:112
+#: libraries/Menu.class.php:459 libraries/Util.class.php:3344
+#: libraries/Util.class.php:3358 libraries/Util.class.php:4339
+#: libraries/Util.class.php:4357 libraries/config.values.php:112
 #: view_operations.php:92
 msgid "Operations"
 msgstr "Operações"
 
 #: libraries/Menu.class.php:384 libraries/Menu.class.php:492
-#: libraries/Util.class.php:4338 libraries/Util.class.php:4352
+#: libraries/Util.class.php:4344 libraries/Util.class.php:4358
 #: libraries/relation.lib.php:255
 msgid "Tracking"
 msgstr "Monitoramento"
 
 #: libraries/Menu.class.php:397 libraries/Menu.class.php:486
-#: libraries/Util.class.php:4337 libraries/Util.class.php:4353
+#: libraries/Util.class.php:4343 libraries/Util.class.php:4359
 #: libraries/navigation/Nodes/Node_Trigger_Container.class.php:24
 #: libraries/plugins/export/ExportHtmlword.class.php:557
 #: libraries/plugins/export/ExportOdt.class.php:685
@@ -4075,16 +4086,16 @@ msgstr "Gatilhos"
 msgid "Database seems to be empty!"
 msgstr "O banco de dados parece estar vazio!"
 
-#: libraries/Menu.class.php:439 libraries/Util.class.php:4330
+#: libraries/Menu.class.php:439 libraries/Util.class.php:4336
 msgid "Query"
 msgstr "Consulta"
 
-#: libraries/Menu.class.php:472 libraries/Util.class.php:4335
+#: libraries/Menu.class.php:472 libraries/Util.class.php:4341
 #: libraries/rte/rte_words.lib.php:36
 msgid "Routines"
 msgstr "Rotinas"
 
-#: libraries/Menu.class.php:479 libraries/Util.class.php:4336
+#: libraries/Menu.class.php:479 libraries/Util.class.php:4342
 #: libraries/navigation/Nodes/Node_Event_Container.class.php:26
 #: libraries/plugins/export/ExportSql.class.php:940
 #: libraries/plugins/export/ExportXml.class.php:107
@@ -4092,20 +4103,20 @@ msgstr "Rotinas"
 msgid "Events"
 msgstr "Eventos"
 
-#: libraries/Menu.class.php:498 libraries/Util.class.php:4339
+#: libraries/Menu.class.php:498 libraries/Util.class.php:4345
 msgid "Designer"
 msgstr "Designer"
 
-#: libraries/Menu.class.php:507 libraries/Util.class.php:4340
-#: templates/structure/check_all_tables.phtml:35
+#: libraries/Menu.class.php:507 libraries/Util.class.php:4346
+#: templates/database/structure/check_all_tables.phtml:35
 msgid "Central columns"
 msgstr "Colunas centrais"
 
-#: libraries/Menu.class.php:544 libraries/Util.class.php:4312
+#: libraries/Menu.class.php:544 libraries/Util.class.php:4318
 #: libraries/config.values.php:103 libraries/config/messages.inc.php:266
 #: libraries/config/messages.inc.php:341
 #: libraries/navigation/NavigationTree.class.php:1239
-#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4332
+#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4358
 msgid "Databases"
 msgstr "Bancos de dados"
 
@@ -4116,34 +4127,34 @@ msgid "User accounts"
 msgstr "Grupos de usuários"
 
 #: libraries/Menu.class.php:595 libraries/ServerStatusData.class.php:121
-#: libraries/Util.class.php:4319 libraries/server_common.lib.php:36
+#: libraries/Util.class.php:4325 libraries/server_common.lib.php:36
 msgid "Binary log"
 msgstr "Log binário"
 
 #: libraries/Menu.class.php:601 libraries/ServerStatusData.class.php:126
-#: libraries/Util.class.php:4320 libraries/server_common.lib.php:42
-#: templates/structure/body_for_table_summary.phtml:10
-#: templates/structure/table_header.phtml:27
+#: libraries/Util.class.php:4326 libraries/server_common.lib.php:42
+#: templates/database/structure/body_for_table_summary.phtml:10
+#: templates/database/structure/table_header.phtml:27
 msgid "Replication"
 msgstr "Replicação"
 
 #: libraries/Menu.class.php:606 libraries/ServerStatusData.class.php:193
-#: libraries/Util.class.php:4321 libraries/config.values.php:105
+#: libraries/Util.class.php:4327 libraries/config.values.php:105
 #: libraries/server_engines.lib.php:108 libraries/server_engines.lib.php:112
 #: libraries/sql_query_form.lib.php:421
 msgid "Variables"
 msgstr "Variáveis"
 
-#: libraries/Menu.class.php:610 libraries/Util.class.php:4322
+#: libraries/Menu.class.php:610 libraries/Util.class.php:4328
 msgid "Charsets"
 msgstr "Charsets"
 
-#: libraries/Menu.class.php:615 libraries/Util.class.php:4323
+#: libraries/Menu.class.php:615 libraries/Util.class.php:4329
 #: libraries/server_common.lib.php:33 libraries/server_plugins.lib.php:27
 msgid "Plugins"
 msgstr "Plugins"
 
-#: libraries/Menu.class.php:626 libraries/Util.class.php:4324
+#: libraries/Menu.class.php:626 libraries/Util.class.php:4330
 msgid "Engines"
 msgstr "Motores"
 
@@ -4168,7 +4179,7 @@ msgid_plural "%1$d rows inserted."
 msgstr[0] "%1$d linha inserida."
 msgstr[1] "%1$d linhas inseridas."
 
-#: libraries/PDF.class.php:70 libraries/Util.class.php:2521
+#: libraries/PDF.class.php:70 libraries/Util.class.php:2527
 #: libraries/browse_foreigners.lib.php:327
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:865
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:890
@@ -4192,7 +4203,7 @@ msgstr "Não foi possível salvar a tabela favorita!"
 # "Report = relatório" or "Chart = gráfico" or "Diagram = diagrama". So, it
 # depends of the context.
 #: libraries/RecentFavoriteTable.class.php:212
-#: templates/structure/favorite_anchor.phtml:12
+#: templates/database/structure/favorite_anchor.phtml:12
 msgid "Remove from Favorites"
 msgstr "Remover dos Favorites"
 
@@ -4359,7 +4370,7 @@ msgstr ""
 "armazenamento."
 
 #: libraries/StorageEngine.class.php:373
-#: templates/structure/body_for_table_summary.phtml:50
+#: templates/database/structure/body_for_table_summary.phtml:50
 #, php-format
 msgid "%s is the default storage engine on this MySQL server."
 msgstr "%s é o mecanismo de armazenamento padrão neste servidor MySQL."
@@ -4848,10 +4859,10 @@ msgstr ""
 
 #: libraries/Util.class.php:726 libraries/rte/rte_events.lib.php:110
 #: libraries/rte/rte_events.lib.php:119 libraries/rte/rte_events.lib.php:150
-#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:153
-#: libraries/rte/rte_routines.lib.php:162
-#: libraries/rte/rte_routines.lib.php:235
-#: libraries/rte/rte_routines.lib.php:1366
+#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:223
+#: libraries/rte/rte_routines.lib.php:250
+#: libraries/rte/rte_routines.lib.php:372
+#: libraries/rte/rte_routines.lib.php:1457
 #: libraries/rte/rte_triggers.lib.php:86 libraries/rte/rte_triggers.lib.php:95
 #: libraries/rte/rte_triggers.lib.php:127
 msgid "MySQL said: "
@@ -4895,76 +4906,79 @@ msgstr "Dom"
 msgid "%B %d, %Y at %I:%M %p"
 msgstr "%d/%m/%Y às %H:%M"
 
-#: libraries/Util.class.php:2019
+#: libraries/Util.class.php:2025
 #, php-format
 msgid "%s days, %s hours, %s minutes and %s seconds"
 msgstr "%s dias, %s horas, %s minutos e %s segundos"
 
-#: libraries/Util.class.php:2112
+#: libraries/Util.class.php:2118
 msgid "Missing parameter:"
 msgstr "Parâmetro ausente:"
 
-#: libraries/Util.class.php:2645
+#: libraries/Util.class.php:2651
 #, php-format
 msgid "Jump to database \"%s\"."
 msgstr "Ir para o banco de dados '%s'."
 
-#: libraries/Util.class.php:2670
+#: libraries/Util.class.php:2676
 #, php-format
 msgid "The %s functionality is affected by a known bug, see %s"
 msgstr "A funcionalidade %s é afetada por um bug conhecido, veja %s"
 
-#: libraries/Util.class.php:2881
+#: libraries/Util.class.php:2887
 msgid "Click to toggle"
 msgstr "Clique para alternar"
 
-#: libraries/Util.class.php:3542 prefs_manage.php:248
+#: libraries/Util.class.php:3548 prefs_manage.php:248
 msgid "Browse your computer:"
 msgstr "Procurar no seu computador:"
 
-#: libraries/Util.class.php:3567
+#: libraries/Util.class.php:3573
 #, php-format
 msgid "Select from the web server upload directory <b>%s</b>:"
 msgstr "Selecionar a partir do diretório de upload do servidor <b>%s</b>:"
 
-#: libraries/Util.class.php:3596 libraries/insert_edit.lib.php:1173
+#: libraries/Util.class.php:3602 libraries/insert_edit.lib.php:1171
 msgid "The directory you set for upload work cannot be reached."
 msgstr ""
 "O diretório que você especificou para subir arquivos não foi encontrado."
 
-#: libraries/Util.class.php:3607
+#: libraries/Util.class.php:3613
 msgid "There are no files to upload!"
 msgstr "Não existem arquivos para envio!"
 
-#: libraries/Util.class.php:3632 libraries/Util.class.php:3633
-#: templates/structure/check_all_tables.phtml:15
+#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: templates/database/structure/check_all_tables.phtml:15
 msgid "Empty"
 msgstr "Limpar"
 
-#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: libraries/Util.class.php:3644 libraries/Util.class.php:3645
 msgid "Execute"
 msgstr "Executar"
 
-#: libraries/Util.class.php:4152
+#: libraries/Util.class.php:4158
 msgid "Print"
 msgstr "Imprimir"
 
-#: libraries/Util.class.php:4257 templates/structure/row_stats_table.phtml:80
-#: templates/structure/table_header.phtml:95
+#: libraries/Util.class.php:4263
+#: templates/database/structure/table_header.phtml:95
+#: templates/table/structure/row_stats_table.phtml:80
 msgid "Creation"
 msgstr "Criação"
 
-#: libraries/Util.class.php:4263 templates/structure/row_stats_table.phtml:87
-#: templates/structure/table_header.phtml:106
+#: libraries/Util.class.php:4269
+#: templates/database/structure/table_header.phtml:106
+#: templates/table/structure/row_stats_table.phtml:87
 msgid "Last update"
 msgstr "Última atualização"
 
-#: libraries/Util.class.php:4269 templates/structure/row_stats_table.phtml:94
-#: templates/structure/table_header.phtml:117
+#: libraries/Util.class.php:4275
+#: templates/database/structure/table_header.phtml:117
+#: templates/table/structure/row_stats_table.phtml:94
 msgid "Last check"
 msgstr "Última verificação"
 
-#: libraries/Util.class.php:4315
+#: libraries/Util.class.php:4321
 msgid "Users"
 msgstr "Usuários"
 
@@ -4985,16 +4999,16 @@ msgid "Use this value"
 msgstr "Usar este valor"
 
 #: libraries/build_html_for_db.lib.php:33 libraries/import.lib.php:193
-#: templates/structure/actions_in_table_structure.phtml:113
-#: templates/structure/row_stats_table.phtml:42
-#: templates/structure/table_header.phtml:36
+#: templates/database/structure/table_header.phtml:36
+#: templates/table/structure/actions_in_table_structure.phtml:113
+#: templates/table/structure/row_stats_table.phtml:42
 msgid "Rows"
 msgstr "Linhas"
 
 #: libraries/build_html_for_db.lib.php:48 libraries/engines/innodb.lib.php:171
-#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:186
-#: libraries/server_status.lib.php:298
-#: templates/structure/display_table_stats.phtml:40
+#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:195
+#: libraries/server_status.lib.php:307
+#: templates/table/structure/display_table_stats.phtml:40
 msgid "Total"
 msgstr "Total"
 
@@ -5003,10 +5017,12 @@ msgid "Jump to database"
 msgstr "Ir para banco de dados"
 
 #: libraries/build_html_for_db.lib.php:146
+#: templates/database/structure/structure_table_row.phtml:15
 msgid "Not replicated"
 msgstr "Não replicado"
 
 #: libraries/build_html_for_db.lib.php:158
+#: templates/database/structure/structure_table_row.phtml:16
 msgid "Replicated"
 msgstr "Replicado"
 
@@ -5063,17 +5079,17 @@ msgstr "Não"
 #: libraries/plugins/export/ExportTexytext.class.php:425
 #: libraries/plugins/export/PMA_ExportPdf.class.php:307
 #: libraries/rte/rte_list.lib.php:73 libraries/rte/rte_list.lib.php:85
-#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:830
-#: libraries/rte/rte_routines.lib.php:1492 setup/frames/index.inc.php:162
+#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:921
+#: libraries/rte/rte_routines.lib.php:1583 setup/frames/index.inc.php:162
 #: templates/columns_definitions/table_fields_definitions.phtml:8
-#: templates/structure/table_structure_header.phtml:5
-#: templates/table/create_table.phtml:11
+#: templates/database/create_table.phtml:11
+#: templates/table/structure/table_structure_header.phtml:5
 msgid "Name"
 msgstr "Nome"
 
 #: libraries/central_columns.lib.php:699
 #: libraries/central_columns.lib.php:1381
-#: libraries/rte/rte_routines.lib.php:832
+#: libraries/rte/rte_routines.lib.php:923
 #: templates/columns_definitions/table_fields_definitions.phtml:14
 msgid "Length/Values"
 msgstr "Tamanho/Valores"
@@ -5092,7 +5108,7 @@ msgid "Select a table"
 msgstr "Selecionar tabela"
 
 #: libraries/central_columns.lib.php:804
-#: templates/structure/add_column.phtml:4
+#: templates/table/structure/add_column.phtml:4
 msgid "Add column"
 msgstr "Adicionar coluna"
 
@@ -5108,7 +5124,7 @@ msgstr "Adicionar nova coluna"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1002
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1025
 #: templates/columns_definitions/table_fields_definitions.phtml:36
-#: templates/structure/table_structure_header.phtml:8
+#: templates/table/structure/table_structure_header.phtml:8
 msgid "Attributes"
 msgstr "Atributos"
 
@@ -5226,7 +5242,7 @@ msgid "Double click"
 msgstr "Clique duplo"
 
 #: libraries/config.values.php:95 libraries/config.values.php:124
-#: libraries/config/FormDisplay.tpl.php:221 libraries/relation.lib.php:97
+#: libraries/config/FormDisplay.tpl.php:232 libraries/relation.lib.php:97
 #: libraries/relation.lib.php:105
 msgid "Disabled"
 msgstr "Desabilitado"
@@ -5400,22 +5416,22 @@ msgstr ""
 msgid "maximum %s"
 msgstr "máximo %s"
 
-#: libraries/config/FormDisplay.tpl.php:219
+#: libraries/config/FormDisplay.tpl.php:230
 msgid "This setting is disabled, it will not be applied to your configuration."
 msgstr ""
 "Essa configuração está desativada, não será aplicada à sua configuração."
 
-#: libraries/config/FormDisplay.tpl.php:313
+#: libraries/config/FormDisplay.tpl.php:324
 #, php-format
 msgid "Set value: %s"
 msgstr "Definir valor: %s"
 
-#: libraries/config/FormDisplay.tpl.php:318
+#: libraries/config/FormDisplay.tpl.php:329
 #: libraries/config/messages.inc.php:610
 msgid "Restore default value"
 msgstr "Restaurar valor padrão"
 
-#: libraries/config/FormDisplay.tpl.php:332
+#: libraries/config/FormDisplay.tpl.php:343
 msgid "Allow users to customize this value"
 msgstr "Permitir usuários customizar esse valor"
 
@@ -5916,7 +5932,7 @@ msgstr "Conjunto de caracteres do arquivo"
 
 #: libraries/config/messages.inc.php:136 libraries/config/messages.inc.php:152
 #: libraries/sql_query_form.lib.php:247
-#: templates/structure/row_stats_table.phtml:7
+#: templates/table/structure/row_stats_table.phtml:7
 msgid "Format"
 msgstr "Formato"
 
@@ -6440,7 +6456,7 @@ msgstr ""
 
 #: libraries/config/messages.inc.php:332
 #: libraries/plugins/export/ExportPdf.class.php:279
-#: templates/structure/secondary_tabs.phtml:8
+#: templates/table/secondary_tabs.phtml:8
 msgid "Table structure"
 msgstr "Estrutura da tabela"
 
@@ -8174,102 +8190,33 @@ msgstr "Microsoft Word 2000"
 msgid "OpenDocument Text"
 msgstr "Texto Open-Document"
 
-#: libraries/controllers/StructureController.class.php:465
+#: libraries/controllers/DatabaseStructureController.class.php:405
 #: tbl_operations.php:382
 #, php-format
 msgid "Table %s has been emptied."
 msgstr "A tabela %s foi esvaziada."
 
-#: libraries/controllers/StructureController.class.php:486
+#: libraries/controllers/DatabaseStructureController.class.php:426
 #: tbl_operations.php:400 view_operations.php:119
 #, php-format
 msgid "View %s has been dropped."
 msgstr "A view %s foi apagada."
 
-#: libraries/controllers/StructureController.class.php:487
+#: libraries/controllers/DatabaseStructureController.class.php:427
 #: tbl_operations.php:401
 #, php-format
 msgid "Table %s has been dropped."
 msgstr "A tabela %s foi apagada."
 
-#: libraries/controllers/StructureController.class.php:797
-#, php-format
-msgid "The name '%s' is a MySQL reserved keyword."
-msgid_plural "The names '%s' are MySQL reserved keywords."
-msgstr[0] "O nome '%s' é uma palavra-chave reservada do MySQL."
-msgstr[1] "Os nomes '%s' são palavras-chaves reservadas do MySQL."
-
-#: libraries/controllers/StructureController.class.php:875
-msgid "No column selected."
-msgstr "Nenhuma coluna selecionada."
-
-#: libraries/controllers/StructureController.class.php:1049
+#: libraries/controllers/DatabaseStructureController.class.php:733
 msgid "Favorite List is full!"
 msgstr "A lista de favoritos está cheia!"
 
-#: libraries/controllers/StructureController.class.php:1272
-msgid "The columns have been moved successfully."
-msgstr "As colunas foram movidas com sucesso."
-
-#: libraries/controllers/StructureController.class.php:1535
-#, fuzzy, php-format
-#| msgid "Table %1$s has been altered successfully."
-msgid ""
-"Table %1$s has been altered successfully. Privileges have been adjusted."
-msgstr "A tabela %1$s foi alterada com sucesso."
-
-#: libraries/controllers/StructureController.class.php:1541
-#: libraries/controllers/TableIndexesController.class.php:161
-#: tbl_addfield.php:92
-#, php-format
-msgid "Table %1$s has been altered successfully."
-msgstr "A tabela %1$s foi alterada com sucesso."
-
-#: libraries/controllers/StructureController.class.php:1588
-#: libraries/tracking.lib.php:1094
-msgid "Query error"
-msgstr "Erro de consulta"
-
-#: libraries/controllers/StructureController.class.php:1806
+#: libraries/controllers/DatabaseStructureController.class.php:947
 #: libraries/mysql_charsets.lib.php:366 libraries/mysql_charsets.lib.php:373
 msgid "unknown"
 msgstr "desconhecido"
 
-#: libraries/controllers/StructureController.class.php:1957
-#: templates/structure/check_all_table_column.phtml:11
-msgid "Change"
-msgstr "Alterar"
-
-#: libraries/controllers/StructureController.class.php:1961
-#: libraries/controllers/StructureController.class.php:1966
-#: libraries/navigation/Nodes/Node_Index.class.php:30
-#: libraries/tracking.lib.php:926
-#: templates/columns_definitions/column_indexes.phtml:16
-#: templates/columns_definitions/table_fields_definitions.phtml:57
-#: templates/structure/check_all_table_column.phtml:30
-#: templates/structure/display_structure.phtml:79
-#: templates/structure/display_table_stats.phtml:19
-msgid "Index"
-msgstr "Índice"
-
-#: libraries/controllers/StructureController.class.php:1963
-#: libraries/controllers/StructureController.class.php:1968
-#: templates/columns_definitions/column_indexes.phtml:27
-#: templates/structure/check_all_table_column.phtml:37
-msgid "Spatial"
-msgstr "Espacial"
-
-#: libraries/controllers/StructureController.class.php:1964
-#: libraries/controllers/StructureController.class.php:1969
-#: templates/columns_definitions/column_indexes.phtml:22
-#: templates/structure/check_all_table_column.phtml:47
-msgid "Fulltext"
-msgstr "Texto completo"
-
-#: libraries/controllers/StructureController.class.php:1970
-msgid "Distinct values"
-msgstr "Procurar valores distintos"
-
 #: libraries/controllers/TableChartController.class.php:82
 #: libraries/controllers/TableGisVisualizationController.class.php:101
 msgid "No SQL query was set to fetch data."
@@ -8283,11 +8230,18 @@ msgstr "Nenhuma coluna numérica presente na tabela para calcular."
 msgid "No data to display"
 msgstr "Sem dados para mostrar"
 
-#: libraries/controllers/TableRelationController.class.php:217
+#: libraries/controllers/TableIndexesController.class.php:161
+#: libraries/controllers/TableStructureController.class.php:736
+#: tbl_addfield.php:92
+#, php-format
+msgid "Table %1$s has been altered successfully."
+msgstr "A tabela %1$s foi alterada com sucesso."
+
+#: libraries/controllers/TableRelationController.class.php:218
 msgid "Display column was successfully updated."
 msgstr "A coluna de exibição foi atualizada com sucesso."
 
-#: libraries/controllers/TableRelationController.class.php:283
+#: libraries/controllers/TableRelationController.class.php:288
 msgid "Internal relations were successfully updated."
 msgstr "As relações internas foram atualizadas com êxito."
 
@@ -8300,10 +8254,72 @@ msgid "Zoom search"
 msgstr "pesquisa detalhada"
 
 #: libraries/controllers/TableSearchController.class.php:852
-#: templates/table/selection_form.phtml:59
+#: templates/table/search/selection_form.phtml:59
 msgid "Find and replace"
 msgstr "Pesquisar e substituir"
 
+#: libraries/controllers/TableStructureController.class.php:163
+#, php-format
+msgid "The name '%s' is a MySQL reserved keyword."
+msgid_plural "The names '%s' are MySQL reserved keywords."
+msgstr[0] "O nome '%s' é uma palavra-chave reservada do MySQL."
+msgstr[1] "Os nomes '%s' são palavras-chaves reservadas do MySQL."
+
+#: libraries/controllers/TableStructureController.class.php:241
+msgid "No column selected."
+msgstr "Nenhuma coluna selecionada."
+
+#: libraries/controllers/TableStructureController.class.php:467
+msgid "The columns have been moved successfully."
+msgstr "As colunas foram movidas com sucesso."
+
+#: libraries/controllers/TableStructureController.class.php:730
+#, fuzzy, php-format
+#| msgid "Table %1$s has been altered successfully."
+msgid ""
+"Table %1$s has been altered successfully. Privileges have been adjusted."
+msgstr "A tabela %1$s foi alterada com sucesso."
+
+#: libraries/controllers/TableStructureController.class.php:783
+#: libraries/tracking.lib.php:1094
+msgid "Query error"
+msgstr "Erro de consulta"
+
+#: libraries/controllers/TableStructureController.class.php:948
+#: templates/table/structure/check_all_table_column.phtml:11
+msgid "Change"
+msgstr "Alterar"
+
+#: libraries/controllers/TableStructureController.class.php:952
+#: libraries/controllers/TableStructureController.class.php:957
+#: libraries/navigation/Nodes/Node_Index.class.php:30
+#: libraries/tracking.lib.php:926
+#: templates/columns_definitions/column_indexes.phtml:16
+#: templates/columns_definitions/table_fields_definitions.phtml:57
+#: templates/table/structure/check_all_table_column.phtml:30
+#: templates/table/structure/display_structure.phtml:79
+#: templates/table/structure/display_table_stats.phtml:19
+msgid "Index"
+msgstr "Índice"
+
+#: libraries/controllers/TableStructureController.class.php:954
+#: libraries/controllers/TableStructureController.class.php:959
+#: templates/columns_definitions/column_indexes.phtml:27
+#: templates/table/structure/check_all_table_column.phtml:37
+msgid "Spatial"
+msgstr "Espacial"
+
+#: libraries/controllers/TableStructureController.class.php:955
+#: libraries/controllers/TableStructureController.class.php:960
+#: templates/columns_definitions/column_indexes.phtml:22
+#: templates/table/structure/check_all_table_column.phtml:47
+msgid "Fulltext"
+msgstr "Texto completo"
+
+#: libraries/controllers/TableStructureController.class.php:963
+msgid "Distinct values"
+msgstr "Procurar valores distintos"
+
 #: libraries/core.lib.php:306
 #, php-format
 msgid "The %s extension is missing. Please check your PHP configuration."
@@ -8354,7 +8370,7 @@ msgid "No Password"
 msgstr "Sem senha"
 
 #: libraries/display_change_password.lib.php:68
-#: libraries/plugins/auth/AuthenticationCookie.class.php:199
+#: libraries/plugins/auth/AuthenticationCookie.class.php:187
 #: libraries/replication_gui.lib.php:422 libraries/replication_gui.lib.php:862
 #: libraries/server_privileges.lib.php:1640
 msgid "Password:"
@@ -9169,12 +9185,12 @@ msgid "Dump has been saved to file %s."
 msgstr "Dump foi salvo no arquivo %s."
 
 #: libraries/import.lib.php:202 libraries/insert_edit.lib.php:124
-#: libraries/rte/rte_routines.lib.php:1353 libraries/sql.lib.php:1312
+#: libraries/rte/rte_routines.lib.php:1444 libraries/sql.lib.php:1306
 #: tbl_get_field.php:44
 msgid "MySQL returned an empty result set (i.e. zero rows)."
 msgstr "O MySQL retornou um conjunto vazio (ex. zero registros)."
 
-#: libraries/import.lib.php:265 libraries/sql.lib.php:1326
+#: libraries/import.lib.php:265 libraries/sql.lib.php:1320
 msgid "[ROLLBACK occurred.]"
 msgstr "[Ocorreu um ROLLBACK.]"
 
@@ -9243,14 +9259,14 @@ msgstr "Criar um índice nas colunas %s"
 
 #: libraries/insert_edit.lib.php:233
 #: libraries/navigation/Nodes/Node_DatabaseChild.class.php:48
-#: templates/designer/table_list.phtml:40
+#: templates/database/designer/table_list.phtml:40
 msgid "Hide"
 msgstr "Ocultar"
 
 #: libraries/insert_edit.lib.php:249
 #: libraries/navigation/Nodes/Node_Function.class.php:32
-#: libraries/rte/rte_routines.lib.php:1495
-#: templates/table/table_header.phtml:4
+#: libraries/rte/rte_routines.lib.php:1586
+#: templates/table/search/table_header.phtml:4
 msgid "Function"
 msgstr "Função"
 
@@ -9263,84 +9279,85 @@ msgstr "Binário"
 msgid "Because of its length,<br /> this column might not be editable."
 msgstr "Por causa da sua largura,<br/> esta coluna pode não ser editável."
 
-#: libraries/insert_edit.lib.php:1050
+#: libraries/insert_edit.lib.php:1048
 msgid "Binary - do not edit"
 msgstr "Binário - não edite"
 
-#: libraries/insert_edit.lib.php:1176 libraries/server_privileges.lib.php:470
-#: templates/table/options.phtml:36
+#: libraries/insert_edit.lib.php:1174 libraries/server_privileges.lib.php:470
+#: templates/table/search/options.phtml:36
 msgid "Or"
 msgstr "Ou"
 
-#: libraries/insert_edit.lib.php:1177
+#: libraries/insert_edit.lib.php:1175
 msgid "web server upload directory:"
 msgstr "diretório de upload do servidor web:"
 
-#: libraries/insert_edit.lib.php:1348 templates/table/input_box.phtml:49
+#: libraries/insert_edit.lib.php:1346
+#: templates/table/search/input_box.phtml:49
 msgid "Edit/Insert"
 msgstr "Inserir/Editar"
 
-#: libraries/insert_edit.lib.php:1398
+#: libraries/insert_edit.lib.php:1396
 #, php-format
 msgid "Continue insertion with %s rows"
 msgstr "Continuar a inserção com %s linhas"
 
-#: libraries/insert_edit.lib.php:1428
+#: libraries/insert_edit.lib.php:1426
 msgid "and then"
 msgstr "e então"
 
-#: libraries/insert_edit.lib.php:1461
+#: libraries/insert_edit.lib.php:1459
 msgid "Insert as new row"
 msgstr "Inserir como um novo registro"
 
-#: libraries/insert_edit.lib.php:1464
+#: libraries/insert_edit.lib.php:1462
 msgid "Insert as new row and ignore errors"
 msgstr "Inserir como uma linha nova e ignorar erros"
 
-#: libraries/insert_edit.lib.php:1467
+#: libraries/insert_edit.lib.php:1465
 msgid "Show insert query"
 msgstr "Exibir consulta insert"
 
-#: libraries/insert_edit.lib.php:1487
+#: libraries/insert_edit.lib.php:1485
 msgid "Go back to previous page"
 msgstr "Ir para a página anterior"
 
-#: libraries/insert_edit.lib.php:1490
+#: libraries/insert_edit.lib.php:1488
 msgid "Insert another new row"
 msgstr "Inserir um registro novo"
 
-#: libraries/insert_edit.lib.php:1495
+#: libraries/insert_edit.lib.php:1493
 msgid "Go back to this page"
 msgstr "Voltar para esta página"
 
-#: libraries/insert_edit.lib.php:1518
+#: libraries/insert_edit.lib.php:1516
 msgid "Edit next row"
 msgstr "Editar o próximo registro"
 
-#: libraries/insert_edit.lib.php:1540
+#: libraries/insert_edit.lib.php:1538
 msgid ""
 "Use TAB key to move from value to value, or CTRL+arrows to move anywhere"
 msgstr ""
 "Usar a tecla TAB para se mover de valor em valor, ou CTRL+setas para mover "
 "em qualquer direção"
 
-#: libraries/insert_edit.lib.php:1577 libraries/replication_gui.lib.php:542
-#: libraries/rte/rte_routines.lib.php:1497
+#: libraries/insert_edit.lib.php:1575 libraries/replication_gui.lib.php:542
+#: libraries/rte/rte_routines.lib.php:1588
 #: libraries/server_status_variables.lib.php:220
-#: templates/designer/having_query_panel.phtml:100
-#: templates/designer/options_panel.phtml:73
-#: templates/designer/options_panel.phtml:239
-#: templates/designer/where_query_panel.phtml:69
-#: templates/table/table_header.phtml:10
-#: templates/table/zoom_result_form.phtml:35
+#: templates/database/designer/having_query_panel.phtml:100
+#: templates/database/designer/options_panel.phtml:73
+#: templates/database/designer/options_panel.phtml:239
+#: templates/database/designer/where_query_panel.phtml:69
+#: templates/table/search/table_header.phtml:10
+#: templates/table/search/zoom_result_form.phtml:35
 msgid "Value"
 msgstr "Valor"
 
-#: libraries/insert_edit.lib.php:1937 libraries/sql.lib.php:1309
+#: libraries/insert_edit.lib.php:1935 libraries/sql.lib.php:1303
 msgid "Showing SQL query"
 msgstr "Exibindo consulta SQL"
 
-#: libraries/insert_edit.lib.php:1962 libraries/sql.lib.php:1287
+#: libraries/insert_edit.lib.php:1960 libraries/sql.lib.php:1281
 #, php-format
 msgid "Inserted row id: %1$d"
 msgstr "Id da linha inserida: %1$d"
@@ -9757,7 +9774,7 @@ msgstr "Novo trigger"
 #: libraries/navigation/Nodes/Node_View_Container.class.php:26
 #: libraries/navigation/Nodes/Node_View_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:129
-#: templates/structure/show_create.phtml:30
+#: templates/database/structure/show_create.phtml:30
 msgid "Views"
 msgstr "Views"
 
@@ -10096,7 +10113,7 @@ msgstr "Você não tem direitos suficientes para estar aqui agora!"
 
 #: libraries/operations.lib.php:101 libraries/operations.lib.php:249
 #: libraries/operations.lib.php:869 libraries/operations.lib.php:963
-#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:907
+#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:998
 #: templates/columns_definitions/table_fields_definitions.phtml:47
 #, fuzzy
 #| msgid "Edit Privileges"
@@ -10190,22 +10207,22 @@ msgid "Switch to copied table"
 msgstr "Mudar para a tabela copiada"
 
 #: libraries/operations.lib.php:1360
-#: templates/structure/check_all_tables.phtml:18
+#: templates/database/structure/check_all_tables.phtml:18
 msgid "Table maintenance"
 msgstr "Manutenção de tabelas"
 
 #: libraries/operations.lib.php:1398
-#: templates/structure/check_all_tables.phtml:19
+#: templates/database/structure/check_all_tables.phtml:19
 msgid "Analyze table"
 msgstr "Analizar tabela"
 
 #: libraries/operations.lib.php:1413
-#: templates/structure/check_all_tables.phtml:20
+#: templates/database/structure/check_all_tables.phtml:20
 msgid "Check table"
 msgstr "Verificar tabela"
 
 #: libraries/operations.lib.php:1428
-#: templates/structure/check_all_tables.phtml:22
+#: templates/database/structure/check_all_tables.phtml:22
 #, fuzzy
 #| msgid "Check table"
 msgid "Checksum table"
@@ -10225,18 +10242,19 @@ msgid "Flush the table (FLUSH)"
 msgstr "Limpar a tabela (FLUSH)"
 
 #: libraries/operations.lib.php:1477
-#: templates/structure/check_all_tables.phtml:23
-#: templates/structure/display_table_stats.phtml:56
+#: templates/database/structure/check_all_tables.phtml:23
+#: templates/table/structure/display_table_stats.phtml:56
 msgid "Optimize table"
 msgstr "Otimizar tabela"
 
 #: libraries/operations.lib.php:1492
-#: templates/structure/check_all_tables.phtml:24
+#: templates/database/structure/check_all_tables.phtml:24
 msgid "Repair table"
 msgstr "Reparar tabela"
 
 #: libraries/operations.lib.php:1538
-#: templates/structure/check_all_tables.phtml:14 view_operations.php:127
+#: templates/database/structure/check_all_tables.phtml:14
+#: view_operations.php:127
 msgid "Delete data or table"
 msgstr "Remover dados ou tabela"
 
@@ -10363,7 +10381,7 @@ msgid "Cannot connect: invalid settings."
 msgstr "Não pode conectar: configurações inválidas."
 
 #: libraries/plugins/auth/AuthenticationConfig.class.php:108
-#: libraries/plugins/auth/AuthenticationCookie.class.php:134
+#: libraries/plugins/auth/AuthenticationCookie.class.php:122
 #: libraries/plugins/auth/AuthenticationHttp.class.php:96
 #, php-format
 msgid "Welcome to %s"
@@ -10394,39 +10412,39 @@ msgstr ""
 msgid "Retry to connect"
 msgstr "Tente se conectar novamente"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:146
+#: libraries/plugins/auth/AuthenticationCookie.class.php:134
 msgid "Your session has expired. Please log in again."
 msgstr "Sua sessão expirou. Por favor, faça login novamente."
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:170
+#: libraries/plugins/auth/AuthenticationCookie.class.php:158
 msgid "Log in"
 msgstr "Entrar"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:178
-#: libraries/plugins/auth/AuthenticationCookie.class.php:188
+#: libraries/plugins/auth/AuthenticationCookie.class.php:166
+#: libraries/plugins/auth/AuthenticationCookie.class.php:176
 msgid "You can enter hostname/IP address and port separated by space."
 msgstr ""
 "Você pode digitar o nome do servidor/endereço IP e a porta separados por um "
 "espaço."
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:193
+#: libraries/plugins/auth/AuthenticationCookie.class.php:181
 msgid "Username:"
 msgstr "Usuário:"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:205
+#: libraries/plugins/auth/AuthenticationCookie.class.php:193
 msgid "Server Choice:"
 msgstr "Escolha de servidor:"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:386
+#: libraries/plugins/auth/AuthenticationCookie.class.php:374
 msgid "Entered captcha is wrong, try again!"
 msgstr ""
 "O valor digitado na imagem de verificação está errado, tente novamente!"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:396
+#: libraries/plugins/auth/AuthenticationCookie.class.php:384
 msgid "Please enter correct captcha!"
 msgstr "Por favor, digite o valor correto da imagem de verificação!"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:423
+#: libraries/plugins/auth/AuthenticationCookie.class.php:411
 msgid "You are not allowed to log in to this MySQL server!"
 msgstr "Você não tem permissão para fazer logon no servidor MySQL!"
 
@@ -10523,7 +10541,7 @@ msgstr "Evento"
 #: libraries/plugins/export/ExportOdt.class.php:593
 #: libraries/plugins/export/ExportTexytext.class.php:428
 #: libraries/plugins/export/PMA_ExportPdf.class.php:313
-#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:984
 #: libraries/rte/rte_triggers.lib.php:377
 msgid "Definition"
 msgstr "Definição"
@@ -10852,7 +10870,7 @@ msgid "Last check:"
 msgstr "Última verificação:"
 
 #: libraries/plugins/export/ExportSql.class.php:1399
-#: templates/structure/structure_table_row.phtml:183
+#: templates/database/structure/structure_table_row.phtml:183
 msgid "in use"
 msgstr "em uso"
 
@@ -11047,18 +11065,14 @@ msgstr "Extensão Espacial MySQL não suporta o tipo ESRI \"%s\"."
 msgid "The imported file does not contain any data!"
 msgstr "O arquivo importado não contém nenhum dado!"
 
-#: libraries/plugins/import/ImportSql.class.php:169
+#: libraries/plugins/import/ImportSql.class.php:72
 msgid "SQL compatibility mode:"
 msgstr "Modo de compatibilidade SQL:"
 
-#: libraries/plugins/import/ImportSql.class.php:181
+#: libraries/plugins/import/ImportSql.class.php:84
 msgid "Do not use <code>AUTO_INCREMENT</code> for zero values"
 msgstr "Não use <code>AUTO_INCREMENT</code> para valores zerados"
 
-#: libraries/plugins/import/ImportSql.class.php:195
-msgid "Read as multibytes"
-msgstr "Ler como multibytes"
-
 #: libraries/plugins/import/ImportXml.class.php:54
 msgid "XML"
 msgstr "XML"
@@ -11101,7 +11115,7 @@ msgid "Show grid"
 msgstr "Mostrar grade"
 
 #: libraries/plugins/schema/SchemaPdf.class.php:94
-#: templates/structure/print_view_data_dictionary_link.phtml:6
+#: templates/database/structure/print_view_data_dictionary_link.phtml:6
 msgid "Data Dictionary"
 msgstr "Dicionário de dados"
 
@@ -11132,7 +11146,7 @@ msgid "The %s table doesn't exist!"
 msgstr "A tabela \"%s\" não existe!"
 
 #: libraries/plugins/schema/eps/Eps_Relation_Schema.class.php:321
-#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:309
+#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:323
 #, php-format
 msgid "Schema of the %s database - Page %s"
 msgstr "Esquema do banco de dados \"%s\" - Página %s"
@@ -11158,7 +11172,7 @@ msgstr "Tabela de conteúdos"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1005
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1028
 #: libraries/tracking.lib.php:884
-#: templates/structure/table_structure_header.phtml:11
+#: templates/table/structure/table_structure_header.phtml:11
 msgid "Extra"
 msgstr "Extra"
 
@@ -11534,11 +11548,11 @@ msgstr "Passos rápidos para a instalação de funcionalidades avançadas:"
 msgid "Create the needed tables with the <code>%screate_tables.sql</code>."
 msgstr "Criar tabelas necessárias com <code>%screate_tables.sql</code>."
 
-#: libraries/relation.lib.php:360
+#: libraries/relation.lib.php:357
 msgid "Create a pma user and give access to these tables."
 msgstr "Criar um usuário pma e dar acesso a essas tabelas."
 
-#: libraries/relation.lib.php:365
+#: libraries/relation.lib.php:360
 msgid ""
 "Enable advanced features in configuration file (<code>config.inc.php</"
 "code>), for example by starting from <code>config.sample.inc.php</code>."
@@ -11546,24 +11560,24 @@ msgstr ""
 "Ativar recursos avançados no arquivo de configuração (<code>config.inc.php</"
 "code>), por exemplo iniciando em <code>config.sample.inc.php</code>."
 
-#: libraries/relation.lib.php:373
+#: libraries/relation.lib.php:365
 msgid "Re-login to phpMyAdmin to load the updated configuration file."
 msgstr ""
 "Logar novamente no phpMyAdmin para carregar o arquivo de configuração "
 "atualizado."
 
-#: libraries/relation.lib.php:1612
+#: libraries/relation.lib.php:1607
 msgid "no description"
 msgstr "sem descrição"
 
-#: libraries/relation.lib.php:1811
+#: libraries/relation.lib.php:1806
 msgid ""
 "You do not have necessary privileges to create a database named "
 "'phpmyadmin'. You may go to 'Operations' tab of any database to set up the "
 "phpMyAdmin configuration storage there."
 msgstr ""
 
-#: libraries/relation.lib.php:1928
+#: libraries/relation.lib.php:1923
 #, fuzzy, php-format
 #| msgid "%sCreate%s missing phpMyAdmin configuration storage tables."
 msgid ""
@@ -11573,7 +11587,7 @@ msgstr ""
 "%sCreate%s as tabelas de armazenamento de configuração do phpMyAdmin "
 "perdidas."
 
-#: libraries/relation.lib.php:1936
+#: libraries/relation.lib.php:1931
 #, php-format
 msgid ""
 "%sCreate%s the phpMyAdmin configuration storage in the current database."
@@ -11581,7 +11595,7 @@ msgstr ""
 "%sCreate%s o armazenamento de configuração do phpMyAdmin no banco de dados "
 "atual."
 
-#: libraries/relation.lib.php:1944
+#: libraries/relation.lib.php:1939
 #, php-format
 msgid "%sCreate%s missing phpMyAdmin configuration storage tables."
 msgstr ""
@@ -11589,7 +11603,7 @@ msgstr ""
 "perdidas."
 
 #: libraries/replication_gui.lib.php:46 libraries/replication_gui.lib.php:343
-#: libraries/server_databases.lib.php:387
+#: libraries/server_databases.lib.php:398
 msgid "Master replication"
 msgstr "Replicação de master"
 
@@ -11661,7 +11675,7 @@ msgstr ""
 "<b>está</b> configurado como master."
 
 #: libraries/replication_gui.lib.php:141
-#: libraries/server_databases.lib.php:389
+#: libraries/server_databases.lib.php:400
 msgid "Slave replication"
 msgstr "Replicação de slave"
 
@@ -11937,10 +11951,10 @@ msgid "Master server changed successfully to %s."
 msgstr "Servidor mestre alterado com sucesso para %s."
 
 #: libraries/rte/rte_events.lib.php:106 libraries/rte/rte_events.lib.php:115
-#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:149
-#: libraries/rte/rte_routines.lib.php:158
-#: libraries/rte/rte_routines.lib.php:231
-#: libraries/rte/rte_routines.lib.php:1362
+#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:219
+#: libraries/rte/rte_routines.lib.php:246
+#: libraries/rte/rte_routines.lib.php:368
+#: libraries/rte/rte_routines.lib.php:1453
 #: libraries/rte/rte_triggers.lib.php:82 libraries/rte/rte_triggers.lib.php:91
 #: libraries/rte/rte_triggers.lib.php:123
 #, php-format
@@ -11961,7 +11975,7 @@ msgstr "O evento %1$s foi modificado."
 msgid "Event %1$s has been created."
 msgstr "O evento %1$s foi criado."
 
-#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:251
+#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:266
 #: libraries/rte/rte_triggers.lib.php:144
 msgid "One or more errors have occurred while processing your request:"
 msgstr "Um ou mais erros ocorreram durante o processamento da sua solicitação:"
@@ -11970,7 +11984,7 @@ msgstr "Um ou mais erros ocorreram durante o processamento da sua solicitação:
 msgid "Edit event"
 msgstr "Editar evento"
 
-#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:794
+#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:885
 #: libraries/rte/rte_triggers.lib.php:323 view_create.php:180
 msgid "Details"
 msgstr "Detalhes"
@@ -11983,7 +11997,7 @@ msgstr "Nome do evento"
 msgid "Event type"
 msgstr "Tipo de evento"
 
-#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:817
+#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:908
 #, php-format
 msgid "Change to %s"
 msgstr "Alterar para %s"
@@ -12010,12 +12024,14 @@ msgstr "Final"
 msgid "On completion preserve"
 msgstr "Guardar após a conclusão"
 
-#: libraries/rte/rte_events.lib.php:491 libraries/rte/rte_routines.lib.php:930
+#: libraries/rte/rte_events.lib.php:491
+#: libraries/rte/rte_routines.lib.php:1021
 #: libraries/rte/rte_triggers.lib.php:383 view_create.php:209
 msgid "Definer"
 msgstr "Definidor"
 
-#: libraries/rte/rte_events.lib.php:535 libraries/rte/rte_routines.lib.php:997
+#: libraries/rte/rte_events.lib.php:535
+#: libraries/rte/rte_routines.lib.php:1088
 #: libraries/rte/rte_triggers.lib.php:422
 msgid "The definer must be in the \"username@hostname\" format!"
 msgstr "O definidor deve estar no formato \"username@hostname\"!"
@@ -12041,9 +12057,9 @@ msgid "You must provide an event definition."
 msgstr "Você deve informar uma definição do evento."
 
 #: libraries/rte/rte_export.lib.php:43 libraries/rte/rte_general.lib.php:72
-#: libraries/rte/rte_routines.lib.php:345
-#: libraries/rte/rte_routines.lib.php:1198
-#: libraries/rte/rte_routines.lib.php:1411
+#: libraries/rte/rte_routines.lib.php:153
+#: libraries/rte/rte_routines.lib.php:1289
+#: libraries/rte/rte_routines.lib.php:1502
 msgid "Error in processing request:"
 msgstr "Erro no processamento do request:"
 
@@ -12079,97 +12095,97 @@ msgstr ""
 "armazenamento podem falhar![/strong] Por favor, use a extensão melhorada "
 "'mysqli' para evitar quaisquer problemas."
 
-#: libraries/rte/rte_routines.lib.php:110
-#: libraries/rte/rte_routines.lib.php:1006
+#: libraries/rte/rte_routines.lib.php:123
+msgid "Edit routine"
+msgstr "Editar rotina"
+
+#: libraries/rte/rte_routines.lib.php:200
+#: libraries/rte/rte_routines.lib.php:1097
 #, php-format
 msgid "Invalid routine type: \"%s\""
 msgstr "Tipo de rotina inválido: \"%s\""
 
-#: libraries/rte/rte_routines.lib.php:170
+#: libraries/rte/rte_routines.lib.php:253
+#, php-format
+msgid "Routine %1$s has been created."
+msgstr "A rotina %1$s foi criada."
+
+#: libraries/rte/rte_routines.lib.php:380
 msgid "Sorry, we failed to restore the dropped routine."
 msgstr "Desculpe, mas falhamos em restaurar a rotina eliminada."
 
-#: libraries/rte/rte_routines.lib.php:211
+#: libraries/rte/rte_routines.lib.php:439
 #, fuzzy, php-format
 #| msgid "Routine %1$s has been modified."
 msgid "Routine %1$s has been modified. Privileges have been adjusted."
 msgstr "A rotina %1$s foi modificada."
 
-#: libraries/rte/rte_routines.lib.php:216
+#: libraries/rte/rte_routines.lib.php:444
 #, php-format
 msgid "Routine %1$s has been modified."
 msgstr "A rotina %1$s foi modificada."
 
-#: libraries/rte/rte_routines.lib.php:238
-#, php-format
-msgid "Routine %1$s has been created."
-msgstr "A rotina %1$s foi criada."
-
-#: libraries/rte/rte_routines.lib.php:315
-msgid "Edit routine"
-msgstr "Editar rotina"
-
-#: libraries/rte/rte_routines.lib.php:797
+#: libraries/rte/rte_routines.lib.php:888
 msgid "Routine name"
 msgstr "Nome das rotinas"
 
-#: libraries/rte/rte_routines.lib.php:823
+#: libraries/rte/rte_routines.lib.php:914
 msgid "Parameters"
 msgstr "Parâmetros"
 
-#: libraries/rte/rte_routines.lib.php:829
+#: libraries/rte/rte_routines.lib.php:920
 msgid "Direction"
 msgstr "Direção"
 
-#: libraries/rte/rte_routines.lib.php:847
+#: libraries/rte/rte_routines.lib.php:938
 msgid "Add parameter"
 msgstr "Adicionar parâmetro"
 
-#: libraries/rte/rte_routines.lib.php:851
+#: libraries/rte/rte_routines.lib.php:942
 msgid "Remove last parameter"
 msgstr "Remover último parâmetro"
 
-#: libraries/rte/rte_routines.lib.php:856
+#: libraries/rte/rte_routines.lib.php:947
 msgid "Return type"
 msgstr "Tipo de returno"
 
-#: libraries/rte/rte_routines.lib.php:862
+#: libraries/rte/rte_routines.lib.php:953
 msgid "Return length/values"
 msgstr "Retornar comprimento/valores"
 
-#: libraries/rte/rte_routines.lib.php:868
+#: libraries/rte/rte_routines.lib.php:959
 msgid "Return options"
 msgstr "Opções de retorno"
 
-#: libraries/rte/rte_routines.lib.php:899
+#: libraries/rte/rte_routines.lib.php:990
 msgid "Is deterministic"
 msgstr "É determinístico"
 
-#: libraries/rte/rte_routines.lib.php:920
+#: libraries/rte/rte_routines.lib.php:1011
 msgid ""
 "You do not have sufficient privileges to perform this operation; Please "
 "refer to the documentation for more details"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:935
+#: libraries/rte/rte_routines.lib.php:1026
 msgid "Security type"
 msgstr "Tipo de segurança"
 
-#: libraries/rte/rte_routines.lib.php:944
+#: libraries/rte/rte_routines.lib.php:1035
 msgid "SQL data access"
 msgstr "Acesso de dados SQL"
 
-#: libraries/rte/rte_routines.lib.php:1013
+#: libraries/rte/rte_routines.lib.php:1104
 msgid "You must provide a routine name!"
 msgstr "Você deve informar o nome da rotina!"
 
-#: libraries/rte/rte_routines.lib.php:1047
+#: libraries/rte/rte_routines.lib.php:1138
 #, php-format
 msgid "Invalid direction \"%s\" given for parameter."
 msgstr "Direção inválida \"%s\" dada para o parâmetro."
 
-#: libraries/rte/rte_routines.lib.php:1069
-#: libraries/rte/rte_routines.lib.php:1131
+#: libraries/rte/rte_routines.lib.php:1160
+#: libraries/rte/rte_routines.lib.php:1222
 msgid ""
 "You must provide length/values for routine parameters of type ENUM, SET, "
 "VARCHAR and VARBINARY."
@@ -12177,37 +12193,37 @@ msgstr ""
 "Você deve informar tamanhos/comprimentos para os parâmetros de rotina do "
 "tipo ENUM, SET, VARCHAR and VARBINARY."
 
-#: libraries/rte/rte_routines.lib.php:1095
+#: libraries/rte/rte_routines.lib.php:1186
 msgid "You must provide a name and a type for each routine parameter."
 msgstr "Você deve informar um nome e um tipo para cada parâmetro de rotina."
 
-#: libraries/rte/rte_routines.lib.php:1114
+#: libraries/rte/rte_routines.lib.php:1205
 msgid "You must provide a valid return type for the routine."
 msgstr "Você deve informar um tipo de retorno válido para a rotina."
 
-#: libraries/rte/rte_routines.lib.php:1174
+#: libraries/rte/rte_routines.lib.php:1265
 msgid "You must provide a routine definition."
 msgstr "Você deve informar uma definição da rotina."
 
-#: libraries/rte/rte_routines.lib.php:1285
+#: libraries/rte/rte_routines.lib.php:1376
 #, php-format
 msgid "Execution results of routine %s"
 msgstr "Resultados da execução da rotina %s"
 
-#: libraries/rte/rte_routines.lib.php:1340
+#: libraries/rte/rte_routines.lib.php:1431
 #, php-format
 msgid "%d row affected by the last statement inside the procedure."
 msgid_plural "%d rows affected by the last statement inside the procedure."
 msgstr[0] "%d linha afetada pela última instrução dentro do procedimento."
 msgstr[1] "%d linhas afetadas pela última instrução dentro do procedimento."
 
-#: libraries/rte/rte_routines.lib.php:1398
-#: libraries/rte/rte_routines.lib.php:1406
+#: libraries/rte/rte_routines.lib.php:1489
+#: libraries/rte/rte_routines.lib.php:1497
 msgid "Execute routine"
 msgstr "Executar rotina"
 
-#: libraries/rte/rte_routines.lib.php:1485
-#: libraries/rte/rte_routines.lib.php:1488
+#: libraries/rte/rte_routines.lib.php:1576
+#: libraries/rte/rte_routines.lib.php:1579
 msgid "Routine parameters"
 msgstr "Parâmetros da rotina"
 
@@ -12361,7 +12377,7 @@ msgid "Original position"
 msgstr "Posição original"
 
 #: libraries/server_bin_log.lib.php:133
-#: templates/structure/display_table_stats.phtml:4
+#: templates/table/structure/display_table_stats.phtml:4
 msgid "Information"
 msgstr "Informação"
 
@@ -12399,12 +12415,12 @@ msgstr ""
 "Nota: Ativar as estatísticas pode causar um grande volume de tráfego de "
 "dados entre o servidor web e o servidor MySQL."
 
-#: libraries/server_databases.lib.php:364
-#: libraries/server_databases.lib.php:365
+#: libraries/server_databases.lib.php:366
+#: libraries/server_databases.lib.php:371
 msgid "Enable Statistics"
 msgstr "Habilitar estatísticas"
 
-#: libraries/server_databases.lib.php:481
+#: libraries/server_databases.lib.php:492
 #, php-format
 msgid "%1$d database has been dropped successfully."
 msgid_plural "%1$d databases have been dropped successfully."
@@ -12780,7 +12796,7 @@ msgid "You have revoked the privileges for %s."
 msgstr "Você revogou os privilégios para %s."
 
 #: libraries/server_privileges.lib.php:2059
-#: libraries/server_privileges.lib.php:4290
+#: libraries/server_privileges.lib.php:4316
 #, fuzzy
 #| msgid "Add user group"
 msgid "Add user account"
@@ -12957,60 +12973,60 @@ msgstr "Eliminando %s"
 msgid "The privileges were reloaded successfully."
 msgstr "Os privilégios foram recarregados com sucesso."
 
-#: libraries/server_privileges.lib.php:3994
+#: libraries/server_privileges.lib.php:4003
 #, php-format
 msgid "The user %s already exists!"
 msgstr "O usuário %s já existe!"
 
-#: libraries/server_privileges.lib.php:4232
+#: libraries/server_privileges.lib.php:4258
 #, php-format
 msgid "Privileges for %s"
 msgstr "Privilégios para %s"
 
-#: libraries/server_privileges.lib.php:4241
+#: libraries/server_privileges.lib.php:4267
 #: libraries/server_status_processes.lib.php:72
 #: libraries/server_user_groups.lib.php:39
 msgid "User"
 msgstr "Usuário"
 
-#: libraries/server_privileges.lib.php:4282
+#: libraries/server_privileges.lib.php:4308
 msgctxt "Create new user"
 msgid "New"
 msgstr "Novo usuário"
 
-#: libraries/server_privileges.lib.php:4311
+#: libraries/server_privileges.lib.php:4337
 #, fuzzy
 #| msgid "Edit Privileges:"
 msgid "Edit privileges:"
 msgstr "Editar privilégios:"
 
-#: libraries/server_privileges.lib.php:4312
+#: libraries/server_privileges.lib.php:4338
 #, fuzzy
 #| msgid "User group"
 msgid "User account"
 msgstr "Grupo de usuários"
 
-#: libraries/server_privileges.lib.php:4371
+#: libraries/server_privileges.lib.php:4397
 msgid ""
 "Note: You are attempting to edit privileges of the user with which you are "
 "currently logged in."
 msgstr ""
 "Nota: Você está tentando editar os privilégios do usuário da sessão atual."
 
-#: libraries/server_privileges.lib.php:4391 libraries/server_users.lib.php:25
+#: libraries/server_privileges.lib.php:4417 libraries/server_users.lib.php:25
 #, fuzzy
 #| msgid "Users overview"
 msgid "User accounts overview"
 msgstr "Visão geral dos usuários"
 
-#: libraries/server_privileges.lib.php:4459
+#: libraries/server_privileges.lib.php:4485
 msgid ""
 "A user account allowing any user from localhost to connect is present. This "
 "will prevent other users from connecting if the host part of their account "
 "allows a connection from any (%) host."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4500
+#: libraries/server_privileges.lib.php:4526
 #, php-format
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
@@ -13023,7 +13039,7 @@ msgstr ""
 "privilégios que o servidor usa se eles foram mudados manualmente. Neste "
 "caso, você deve usar %sAtualizar privilégios%s antes de continuar."
 
-#: libraries/server_privileges.lib.php:4519
+#: libraries/server_privileges.lib.php:4545
 #, fuzzy
 #| msgid ""
 #| "Note: phpMyAdmin gets the users' privileges directly from MySQL's "
@@ -13042,25 +13058,25 @@ msgstr ""
 "privilégios que o servidor usa se eles foram mudados manualmente. Neste "
 "caso, você deve usar %sAtualizar privilégios%s antes de continuar."
 
-#: libraries/server_privileges.lib.php:4569
+#: libraries/server_privileges.lib.php:4595
 msgid "The selected user was not found in the privilege table."
 msgstr "O usuário selecionado não foi encontrado na tabela de privilégios."
 
-#: libraries/server_privileges.lib.php:4801
+#: libraries/server_privileges.lib.php:4827
 msgid "You have added a new user."
 msgstr "Você adicionou um novo usuário."
 
-#: libraries/server_status.lib.php:53
+#: libraries/server_status.lib.php:60
 #, php-format
 msgid "Network traffic since startup: %s"
 msgstr "Tráfico de rede desde inicialização: %s"
 
-#: libraries/server_status.lib.php:66
+#: libraries/server_status.lib.php:73
 #, php-format
 msgid "This MySQL server has been running for %1$s. It started up on %2$s."
 msgstr "Esse servidor MySQL está rodando por %1$s. Ele foi iniciado em %2$s."
 
-#: libraries/server_status.lib.php:80
+#: libraries/server_status.lib.php:94
 msgid ""
 "This MySQL server works as <b>master</b> and <b>slave</b> in <b>replication</"
 "b> process."
@@ -13068,23 +13084,23 @@ msgstr ""
 "Este servidor MySQL funciona como <b>mestre</b> e <b>escravo</b> em processo "
 "de <b>replicação</b>."
 
-#: libraries/server_status.lib.php:85
+#: libraries/server_status.lib.php:99
 msgid "This MySQL server works as <b>master</b> in <b>replication</b> process."
 msgstr ""
 "Este servidor MySQL funciona como <b>mestre</b> em processo de "
 "<b>replicação</b>."
 
-#: libraries/server_status.lib.php:90
+#: libraries/server_status.lib.php:104
 msgid "This MySQL server works as <b>slave</b> in <b>replication</b> process."
 msgstr ""
 "Este servidor MySQL funciona como <b>escravo</b> em processo de "
 "<b>replicação</b>."
 
-#: libraries/server_status.lib.php:106
+#: libraries/server_status.lib.php:116
 msgid "Replication status"
 msgstr "Status de replicação"
 
-#: libraries/server_status.lib.php:137
+#: libraries/server_status.lib.php:146
 msgid ""
 "On a busy server, the byte counters may overrun, so those statistics as "
 "reported by the MySQL server may be incorrect."
@@ -13092,21 +13108,21 @@ msgstr ""
 "Em servidores ocupados, os contadores de byte podem sobrecarregar, então as "
 "estatísticas relatadas pelo servidor MySQL como estão podem estar incorretas."
 
-#: libraries/server_status.lib.php:148
+#: libraries/server_status.lib.php:157
 msgid "Received"
 msgstr "Recebido"
 
-#: libraries/server_status.lib.php:167
+#: libraries/server_status.lib.php:176
 msgid "Sent"
 msgstr "Enviar"
 
-#: libraries/server_status.lib.php:234
+#: libraries/server_status.lib.php:243
 #, fuzzy
 #| msgid "max. concurrent connections"
 msgid "Max. concurrent connections"
 msgstr "máx. de conexões concorrentes"
 
-#: libraries/server_status.lib.php:244
+#: libraries/server_status.lib.php:253
 msgid "Failed attempts"
 msgstr "Tentativas falhadas"
 
@@ -14193,7 +14209,7 @@ msgstr ""
 msgid "Not implemented yet."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/AlterOperation.php:193
+#: libraries/sql-parser/src/Components/AlterOperation.php:191
 #, fuzzy
 #| msgid "Iconic table operations"
 msgid "Unrecognized alter operation."
@@ -14209,7 +14225,7 @@ msgid "An opening bracket followed by a set of values was expected."
 msgstr ""
 
 #: libraries/sql-parser/src/Components/ArrayObj.php:101
-#: libraries/sql-parser/src/Components/FieldDefinition.php:202
+#: libraries/sql-parser/src/Components/CreateDefinition.php:202
 msgid "An opening bracket was expected."
 msgstr ""
 
@@ -14217,25 +14233,35 @@ msgstr ""
 msgid "A comma or a closing bracket was expected"
 msgstr ""
 
+#: libraries/sql-parser/src/Components/CreateDefinition.php:246
+#, fuzzy
+#| msgid "No tables selected."
+msgid "A comma or a closing bracket was expected."
+msgstr "Nenhum banco de dados selecionado."
+
+#: libraries/sql-parser/src/Components/CreateDefinition.php:262
+msgid "A closing bracket was expected."
+msgstr ""
+
 #: libraries/sql-parser/src/Components/DataType.php:125
 msgid "Unrecognized data type."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:225
+#: libraries/sql-parser/src/Components/Expression.php:227
 msgid "Unexpected closing bracket."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:246
-#: libraries/sql-parser/src/Components/Expression.php:283
-#: libraries/sql-parser/src/Components/Expression.php:303
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:285
+#: libraries/sql-parser/src/Components/Expression.php:305
 msgid "An alias was previously found."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:257
+#: libraries/sql-parser/src/Components/Expression.php:259
 msgid "Unexpected dot."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:327
+#: libraries/sql-parser/src/Components/Expression.php:329
 #, fuzzy
 #| msgid "No tables selected."
 msgid "An alias was expected."
@@ -14247,16 +14273,6 @@ msgstr "Nenhum banco de dados selecionado."
 msgid "An expression was expected."
 msgstr "Não há versões selecionadas."
 
-#: libraries/sql-parser/src/Components/FieldDefinition.php:246
-#, fuzzy
-#| msgid "No tables selected."
-msgid "A comma or a closing bracket was expected."
-msgstr "Nenhum banco de dados selecionado."
-
-#: libraries/sql-parser/src/Components/FieldDefinition.php:262
-msgid "A closing bracket was expected."
-msgstr ""
-
 #: libraries/sql-parser/src/Components/Limit.php:90
 #: libraries/sql-parser/src/Components/Limit.php:112
 msgid "An offset was expected."
@@ -14304,29 +14320,29 @@ msgstr ""
 msgid "Expected delimiter."
 msgstr ""
 
-#: libraries/sql-parser/src/Lexer.php:753
+#: libraries/sql-parser/src/Lexer.php:777
 #, fuzzy, php-format
 #| msgid "Event %1$s has been created."
 msgid "Ending quote %1$s was expected."
 msgstr "O evento %1$s foi criado."
 
-#: libraries/sql-parser/src/Lexer.php:789
+#: libraries/sql-parser/src/Lexer.php:813
 #, fuzzy
 #| msgid "Table name template"
 msgid "Variable name was expected."
 msgstr "Modelo de nome da tabela"
 
-#: libraries/sql-parser/src/Parser.php:380
+#: libraries/sql-parser/src/Parser.php:391
 #, fuzzy
 #| msgid "at beginning of table"
 msgid "Unexpected beginning of statement."
 msgstr "No início da tabela"
 
-#: libraries/sql-parser/src/Parser.php:399
+#: libraries/sql-parser/src/Parser.php:410
 msgid "Unrecognized statement type."
 msgstr ""
 
-#: libraries/sql-parser/src/Parser.php:479
+#: libraries/sql-parser/src/Parser.php:489
 msgid "No transaction was previously started."
 msgstr ""
 
@@ -14356,8 +14372,10 @@ msgid "The name of the entity was expected."
 msgstr "O número de tabelas que estão abertas."
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:310
-msgid "At least one field definition was expected."
-msgstr ""
+#, fuzzy
+#| msgid "The row has been deleted."
+msgid "At least one column definition was expected."
+msgstr "Registro eliminado."
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:329
 msgid "A \"RETURNS\" keyword was expected."
@@ -14416,11 +14434,11 @@ msgstr "Marcador não criado!"
 msgid "Using bookmark \"%s\" as default browse query."
 msgstr "Usando marcador \"%s\" como query padrão de navegação."
 
-#: libraries/sql.lib.php:1306
+#: libraries/sql.lib.php:1300
 msgid "Showing as PHP code"
 msgstr "Exibindo como código PHP"
 
-#: libraries/sql.lib.php:1638
+#: libraries/sql.lib.php:1632
 #, fuzzy, php-format
 #| msgid ""
 #| "Current selection does not contain a unique column. Grid edit, checkbox, "
@@ -14432,7 +14450,7 @@ msgstr ""
 "A seleção atual não contém uma única coluna. As funções edição em grade, "
 "checkbox, editar, copiar e apagar não estão disponíveis."
 
-#: libraries/sql.lib.php:1649
+#: libraries/sql.lib.php:1643
 #, fuzzy, php-format
 #| msgid ""
 #| "Current selection does not contain a unique column. Grid edit, checkbox, "
@@ -14444,7 +14462,7 @@ msgstr ""
 "A seleção atual não contém uma única coluna. As funções edição em grade, "
 "checkbox, editar, copiar e apagar não estão disponíveis."
 
-#: libraries/sql.lib.php:1688
+#: libraries/sql.lib.php:1682
 #, php-format
 msgid "Problems with indexes of table `%s`"
 msgstr "Problemas com os índices da tabela `%s`"
@@ -14603,7 +14621,7 @@ msgid "Version %s snapshot (SQL code)"
 msgstr "Instantâneo (código SQL) da versão %s"
 
 #: libraries/tracking.lib.php:947
-#: templates/structure/table_structure_row.phtml:33
+#: templates/table/structure/table_structure_row.phtml:33
 msgctxt "None for default"
 msgid "None"
 msgstr "Nenhum wrap (padrão: none)"
@@ -14657,15 +14675,15 @@ msgstr "Versão %1$s de %2$s foi excluída."
 msgid "Version %1$s was created, tracking for %2$s is active."
 msgstr "Versão %1$s foi criada, rastreamento para %2$s está ativado(a)."
 
-#: libraries/user_preferences.inc.php:29
+#: libraries/user_preferences.inc.php:30
 msgid "Manage your settings"
 msgstr "Gerencie suas configurações"
 
-#: libraries/user_preferences.inc.php:46 prefs_manage.php:307
+#: libraries/user_preferences.inc.php:54 prefs_manage.php:307
 msgid "Configuration has been saved."
 msgstr "A configuração foi salva."
 
-#: libraries/user_preferences.inc.php:66
+#: libraries/user_preferences.inc.php:74
 #, php-format
 msgid ""
 "Your preferences will be saved for current session only. Storing them "
@@ -15068,7 +15086,7 @@ msgid "first"
 msgstr "primeiro"
 
 #: templates/columns_definitions/move_column.phtml:12
-#: templates/structure/add_column.phtml:21
+#: templates/table/structure/add_column.phtml:21
 #, php-format
 msgid "after %s"
 msgstr "depois de %s"
@@ -15137,199 +15155,296 @@ msgstr "Transformação de dado"
 msgid "Input transformation options"
 msgstr "Opções de transformação de dado"
 
-#: templates/designer/aggregate_query_panel.phtml:22
-#: templates/designer/options_panel.phtml:100
+#: templates/database/create_table.phtml:7
+#: templates/database/designer/side_menu.phtml:77
+#: templates/database/designer/side_menu.phtml:80
+msgid "Create table"
+msgstr "Criar tabela"
+
+#: templates/database/create_table.phtml:15
+msgid "Number of columns"
+msgstr "Número de colunas"
+
+#: templates/database/designer/aggregate_query_panel.phtml:22
+#: templates/database/designer/options_panel.phtml:100
 msgid "Aggregate"
 msgstr "Agregar"
 
-#: templates/designer/aggregate_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:61
-#: templates/designer/options_panel.phtml:106
-#: templates/designer/options_panel.phtml:170
-#: templates/designer/where_query_panel.phtml:30
-#: templates/table/table_header.phtml:9
+#: templates/database/designer/aggregate_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:61
+#: templates/database/designer/options_panel.phtml:106
+#: templates/database/designer/options_panel.phtml:170
+#: templates/database/designer/where_query_panel.phtml:30
+#: templates/table/search/table_header.phtml:9
 msgid "Operator"
 msgstr "Operador"
 
-#: templates/designer/database_tables.phtml:29
+#: templates/database/designer/database_tables.phtml:29
 msgid "Toggle"
 msgstr ""
 
-#: templates/designer/database_tables.phtml:40
+#: templates/database/designer/database_tables.phtml:40
 #, fuzzy
 #| msgid "Table structure"
 msgid "See table structure"
 msgstr "Estrutura da tabela"
 
-#: templates/designer/delete_relation_panel.phtml:21
+#: templates/database/designer/delete_relation_panel.phtml:21
 msgid "Delete relation"
 msgstr "Apagar relacionamento"
 
-#: templates/designer/edit_delete_pages.phtml:7
+#: templates/database/designer/edit_delete_pages.phtml:7
 msgid "Page to open"
 msgstr "Páginas para abrir"
 
-#: templates/designer/edit_delete_pages.phtml:7
+#: templates/database/designer/edit_delete_pages.phtml:7
 msgid "Page to delete"
 msgstr "Páginas para remover"
 
-#: templates/designer/having_query_panel.phtml:90
-#: templates/designer/options_panel.phtml:63
-#: templates/designer/options_panel.phtml:229
-#: templates/designer/where_query_panel.phtml:59
+#: templates/database/designer/having_query_panel.phtml:90
+#: templates/database/designer/options_panel.phtml:63
+#: templates/database/designer/options_panel.phtml:229
+#: templates/database/designer/where_query_panel.phtml:59
 msgid "Except"
 msgstr "Exceto"
 
-#: templates/designer/having_query_panel.phtml:102
-#: templates/designer/options_panel.phtml:75
-#: templates/designer/options_panel.phtml:241
-#: templates/designer/where_query_panel.phtml:71
+#: templates/database/designer/having_query_panel.phtml:102
+#: templates/database/designer/options_panel.phtml:75
+#: templates/database/designer/options_panel.phtml:241
+#: templates/database/designer/where_query_panel.phtml:71
 msgid "subquery"
 msgstr "sub-consulta"
 
-#: templates/designer/new_relation_panel.phtml:22
-#: templates/designer/side_menu.phtml:84 templates/designer/side_menu.phtml:87
+#: templates/database/designer/new_relation_panel.phtml:22
+#: templates/database/designer/side_menu.phtml:84
+#: templates/database/designer/side_menu.phtml:87
 msgid "Create relation"
 msgstr "Criar relacionamento"
 
-#: templates/designer/options_panel.phtml:34
-#: templates/designer/options_panel.phtml:200
+#: templates/database/designer/options_panel.phtml:34
+#: templates/database/designer/options_panel.phtml:200
 msgid "Relation operator"
 msgstr "Operador de relacionamento"
 
-#: templates/designer/options_panel.phtml:85
-#: templates/designer/rename_to_panel.phtml:23
+#: templates/database/designer/options_panel.phtml:85
+#: templates/database/designer/rename_to_panel.phtml:23
 msgid "Rename to"
 msgstr "Renomear para"
 
-#: templates/designer/options_panel.phtml:91
-#: templates/designer/rename_to_panel.phtml:31
+#: templates/database/designer/options_panel.phtml:91
+#: templates/database/designer/rename_to_panel.phtml:31
 msgid "New name"
 msgstr "Novo nome"
 
-#: templates/designer/page_save_as.phtml:4
+#: templates/database/designer/page_save_as.phtml:4
 msgid "Save to selected page"
 msgstr "Salvar para a página selecionada"
 
-#: templates/designer/page_save_as.phtml:5
+#: templates/database/designer/page_save_as.phtml:5
 msgid "Create a page and save to it"
 msgstr "Criar uma página e exportar para ela"
 
-#: templates/designer/page_save_as.phtml:26
+#: templates/database/designer/page_save_as.phtml:26
 msgid "New page name"
 msgstr "Novo nome da página"
 
-#: templates/designer/page_selector.phtml:2
+#: templates/database/designer/page_selector.phtml:2
 msgid "Select page"
 msgstr "Selecionar página"
 
-#: templates/designer/query_details.phtml:10
+#: templates/database/designer/query_details.phtml:10
 msgid "Active options"
 msgstr "Opções ativas"
 
-#: templates/designer/schema_export.phtml:4
+#: templates/database/designer/schema_export.phtml:4
 msgid "Select Export Relational Type"
 msgstr "Selecione o tipo de exportação relacional"
 
-#: templates/designer/side_menu.phtml:19 templates/designer/side_menu.phtml:25
+#: templates/database/designer/side_menu.phtml:19
+#: templates/database/designer/side_menu.phtml:25
 msgid "Show/Hide tables list"
 msgstr "Mostrar/ocultar lista de tabelas"
 
-#: templates/designer/side_menu.phtml:29 templates/designer/side_menu.phtml:35
-#: templates/designer/side_menu.phtml:36
+#: templates/database/designer/side_menu.phtml:29
+#: templates/database/designer/side_menu.phtml:35
+#: templates/database/designer/side_menu.phtml:36
 msgid "View in fullscreen"
 msgstr "Ver em tela cheia"
 
-#: templates/designer/side_menu.phtml:34
+#: templates/database/designer/side_menu.phtml:34
 msgid "Exit fullscreen"
 msgstr "Sair da tela cheia"
 
-#: templates/designer/side_menu.phtml:41 templates/designer/side_menu.phtml:45
+#: templates/database/designer/side_menu.phtml:41
+#: templates/database/designer/side_menu.phtml:45
 msgid "New page"
 msgstr "Nova página"
 
-#: templates/designer/side_menu.phtml:70 templates/designer/side_menu.phtml:73
+#: templates/database/designer/side_menu.phtml:70
+#: templates/database/designer/side_menu.phtml:73
 msgid "Delete pages"
 msgstr "Apagar páginas"
 
-#: templates/designer/side_menu.phtml:77 templates/designer/side_menu.phtml:80
-#: templates/table/create_table.phtml:7
-msgid "Create table"
-msgstr "Criar tabela"
-
-#: templates/designer/side_menu.phtml:98
-#: templates/designer/side_menu.phtml:101
+#: templates/database/designer/side_menu.phtml:98
+#: templates/database/designer/side_menu.phtml:101
 msgid "Reload"
 msgstr "Recarregar"
 
-#: templates/designer/side_menu.phtml:107
-#: templates/designer/side_menu.phtml:110
+#: templates/database/designer/side_menu.phtml:107
+#: templates/database/designer/side_menu.phtml:110
 msgid "Help"
 msgstr "Ajuda"
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Angular links"
 msgstr "Links angulares"
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Direct links"
 msgstr "Links diretos"
 
-#: templates/designer/side_menu.phtml:122
-#: templates/designer/side_menu.phtml:124
+#: templates/database/designer/side_menu.phtml:122
+#: templates/database/designer/side_menu.phtml:124
 msgid "Snap to grid"
 msgstr "Ajustar à grade"
 
-#: templates/designer/side_menu.phtml:128
-#: templates/designer/side_menu.phtml:134
+#: templates/database/designer/side_menu.phtml:128
+#: templates/database/designer/side_menu.phtml:134
 msgid "Small/Big All"
 msgstr "Tudo pequeno/grande"
 
-#: templates/designer/side_menu.phtml:138
-#: templates/designer/side_menu.phtml:141
+#: templates/database/designer/side_menu.phtml:138
+#: templates/database/designer/side_menu.phtml:141
 msgid "Toggle small/big"
 msgstr "Mudar para pequeno/grande"
 
-#: templates/designer/side_menu.phtml:145
-#: templates/designer/side_menu.phtml:148
+#: templates/database/designer/side_menu.phtml:145
+#: templates/database/designer/side_menu.phtml:148
 msgid "Toggle relation lines"
 msgstr "Alternar linhas de relação"
 
-#: templates/designer/side_menu.phtml:153
-#: templates/designer/side_menu.phtml:156
+#: templates/database/designer/side_menu.phtml:153
+#: templates/database/designer/side_menu.phtml:156
 msgid "Export schema"
 msgstr "Exportar estrutura"
 
-#: templates/designer/side_menu.phtml:165
-#: templates/designer/side_menu.phtml:168
+#: templates/database/designer/side_menu.phtml:165
+#: templates/database/designer/side_menu.phtml:168
 msgid "Build Query"
 msgstr "Construir consulta"
 
-#: templates/designer/side_menu.phtml:173
-#: templates/designer/side_menu.phtml:177
+#: templates/database/designer/side_menu.phtml:173
+#: templates/database/designer/side_menu.phtml:177
 msgid "Move Menu"
 msgstr "Mover Menu"
 
-#: templates/designer/side_menu.phtml:181
-#: templates/designer/side_menu.phtml:186
+#: templates/database/designer/side_menu.phtml:181
+#: templates/database/designer/side_menu.phtml:186
 msgid "Pin text"
 msgstr "Texto fixado"
 
-#: templates/designer/table_list.phtml:4
+#: templates/database/designer/table_list.phtml:4
 msgid "Hide/Show all"
 msgstr "Ocultar/Exibir tudo"
 
-#: templates/designer/table_list.phtml:14
+#: templates/database/designer/table_list.phtml:14
 msgid "Hide/Show Tables with no relation"
 msgstr "Ocultar/Exibir tabelas sem relacionamento"
 
-#: templates/designer/table_list.phtml:59
+#: templates/database/designer/table_list.phtml:59
 msgid "Number of tables:"
 msgstr "Número de tabelas:"
 
+#: templates/database/structure/body_for_table_summary.phtml:6
+#, php-format
+msgid "%s table"
+msgid_plural "%s tables"
+msgstr[0] "%s tabela"
+msgstr[1] "%s tabelas"
+
+#: templates/database/structure/body_for_table_summary.phtml:17
+msgid "Sum"
+msgstr "Soma"
+
+#: templates/database/structure/check_all_tables.phtml:6
+msgid "Check tables having overhead"
+msgstr "Verificar tabelas com sobrecarga"
+
+#: templates/database/structure/check_all_tables.phtml:10
+msgid "Show create"
+msgstr "Mostrar create"
+
+#: templates/database/structure/check_all_tables.phtml:27
+#, fuzzy
+#| msgid "Add prefix"
+msgid "Prefix"
+msgstr "Adicionar índice"
+
+#: templates/database/structure/check_all_tables.phtml:28
+msgid "Add prefix to table"
+msgstr "Adicionar prefixo à tabela"
+
+#: templates/database/structure/check_all_tables.phtml:29
+msgid "Replace table prefix"
+msgstr "Substituir o prefixo de tabelas"
+
+#: templates/database/structure/check_all_tables.phtml:30
+msgid "Copy table with prefix"
+msgstr "Copiar tabelas com prefixo"
+
+#: templates/database/structure/check_all_tables.phtml:36
+msgid "Add columns to central list"
+msgstr "Adicionar colunas a lista central"
+
+#: templates/database/structure/check_all_tables.phtml:37
+msgid "Remove columns from central list"
+msgstr "Remover colunas da lista central"
+
+#: templates/database/structure/check_all_tables.phtml:38
+msgid "Make consistent with central list"
+msgstr "Tornar consistente com a lista central"
+
+#: templates/database/structure/favorite_anchor.phtml:12
+msgid "Add to Favorites"
+msgstr "Adicionar aos Favoritos"
+
+#: templates/database/structure/show_create.phtml:2
+msgid "Showing create queries"
+msgstr "Mostrar consultas create"
+
+#: templates/database/structure/sortable_header.phtml:13
+msgid "Sort"
+msgstr "Ordenar"
+
+#: templates/database/structure/table_header.phtml:42
+msgid ""
+"May be approximate. Click on the number to get the exact count. See "
+"[doc@faq3-11]FAQ 3.11[/doc]."
+msgstr ""
+"Pode ser aproximado. Clique no número para obter a contagem exata. Veja a "
+"[doc@faq3-11]FAQ 3.11[/doc]."
+
+#: templates/database/structure/table_header.phtml:66
+#: templates/table/index_form.phtml:127
+msgid "Size"
+msgstr "Tamanho"
+
+#: templates/database/structure/table_header.phtml:74
+#: templates/table/structure/display_table_stats.phtml:27
+msgid "Overhead"
+msgstr "Sobrecarga"
+
+#: templates/database/structure/tracking_icon.phtml:4
+msgid "Tracking is active."
+msgstr "Rastreamento está ativo."
+
+#: templates/database/structure/tracking_icon.phtml:8
+msgid "Tracking is not active."
+msgstr "Rastreamento não está ativo."
+
 #: templates/error/report_form.phtml:7
 msgid ""
 "phpMyAdmin has encountered an error. We have collected data about this error "
@@ -15348,60 +15463,6 @@ msgstr "Você pode examinar os dados no relatório de erros:"
 msgid "Please explain the steps that lead to the error:"
 msgstr "Favor explique os passos que levaram ao erro:"
 
-#: templates/gis_visualization/gis_visualization.phtml:3
-msgid "Display GIS Visualization"
-msgstr "Mostrar visualização GIS"
-
-#: templates/gis_visualization/gis_visualization.phtml:8
-msgid "Label column"
-msgstr "Rótulo da coluna"
-
-#: templates/gis_visualization/gis_visualization.phtml:11
-msgid "-- None --"
-msgstr "-- nenhum --"
-
-#: templates/gis_visualization/gis_visualization.phtml:19
-msgid "Spatial column"
-msgstr "Coluna espacial"
-
-#: templates/index_form.phtml:16
-msgid "Index name:"
-msgstr "Nome do índice:"
-
-#: templates/index_form.phtml:19
-msgid ""
-"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
-msgstr ""
-"\"PRIMARY\" <b>precisa</b> ser o nome <b>de e apenas da</b> chave primária!"
-
-#: templates/index_form.phtml:40
-msgid "Index choice:"
-msgstr "Escolha de índice:"
-
-#: templates/index_form.phtml:57
-msgid "Key block size:"
-msgstr "Tamanho do bloco chave:"
-
-#: templates/index_form.phtml:74
-msgid "Index type:"
-msgstr "Tipo de índice:"
-
-#: templates/index_form.phtml:86
-msgid "Parser:"
-msgstr "Verificador:"
-
-#: templates/index_form.phtml:102
-msgid "Comment:"
-msgstr "Cometário:"
-
-#: templates/index_form.phtml:127 templates/structure/table_header.phtml:66
-msgid "Size"
-msgstr "Tamanho"
-
-#: templates/index_form.phtml:149 templates/index_form.phtml:190
-msgid "Drag to reorder"
-msgstr "Arraste para reordenar"
-
 #: templates/prefs_autoload.phtml:9
 msgid ""
 "Your browser has phpMyAdmin configuration for this domain. Would you like to "
@@ -15414,363 +15475,151 @@ msgstr ""
 msgid "Start row:"
 msgstr "Linha inicial:"
 
-#: templates/structure/actions_in_table_structure.phtml:14
-#, php-format
-msgid "A primary key has been added on %s."
-msgstr "Uma chave primária foi adicionada a %s."
-
-#: templates/structure/actions_in_table_structure.phtml:34
-#: templates/structure/actions_in_table_structure.phtml:54
-#: templates/structure/actions_in_table_structure.phtml:79
-#: templates/structure/actions_in_table_structure.phtml:101
-#, php-format
-msgid "An index has been added on %s."
-msgstr "Um índice foi adicionado a %s."
-
-#: templates/structure/actions_in_table_structure.phtml:130
-#: templates/structure/check_all_table_column.phtml:59
-msgid "Remove from central columns"
-msgstr "Remover da(s) coluna(s) central(is)"
-
-#: templates/structure/actions_in_table_structure.phtml:138
-#: templates/structure/check_all_table_column.phtml:55
-msgid "Add to central columns"
-msgstr "Adicionar coluna(s) central(is)"
-
-#: templates/structure/add_column.phtml:7
-#, php-format
-msgid "Add %s column(s)"
-msgstr "Adicionar campo(s) %s"
-
-#: templates/structure/add_column.phtml:12
-msgid "at beginning of table"
-msgstr "No início da tabela"
-
-#: templates/structure/body_for_table_summary.phtml:6
-#, php-format
-msgid "%s table"
-msgid_plural "%s tables"
-msgstr[0] "%s tabela"
-msgstr[1] "%s tabelas"
-
-#: templates/structure/body_for_table_summary.phtml:17
-msgid "Sum"
-msgstr "Soma"
-
-#: templates/structure/check_all_tables.phtml:6
-msgid "Check tables having overhead"
-msgstr "Verificar tabelas com sobrecarga"
-
-#: templates/structure/check_all_tables.phtml:10
-msgid "Show create"
-msgstr "Mostrar create"
-
-#: templates/structure/check_all_tables.phtml:27
-#, fuzzy
-#| msgid "Add prefix"
-msgid "Prefix"
-msgstr "Adicionar índice"
-
-#: templates/structure/check_all_tables.phtml:28
-msgid "Add prefix to table"
-msgstr "Adicionar prefixo à tabela"
-
-#: templates/structure/check_all_tables.phtml:29
-msgid "Replace table prefix"
-msgstr "Substituir o prefixo de tabelas"
-
-#: templates/structure/check_all_tables.phtml:30
-msgid "Copy table with prefix"
-msgstr "Copiar tabelas com prefixo"
-
-#: templates/structure/check_all_tables.phtml:36
-msgid "Add columns to central list"
-msgstr "Adicionar colunas a lista central"
-
-#: templates/structure/check_all_tables.phtml:37
-msgid "Remove columns from central list"
-msgstr "Remover colunas da lista central"
-
-#: templates/structure/check_all_tables.phtml:38
-msgid "Make consistent with central list"
-msgstr "Tornar consistente com a lista central"
-
-#: templates/structure/display_structure.phtml:140 view_create.php:181
-msgid "Edit view"
-msgstr "Tela de edição"
-
-#: templates/structure/display_table_stats.phtml:9
-msgid "Space usage"
-msgstr "Uso do espaço"
-
-#: templates/structure/display_table_stats.phtml:27
-#: templates/structure/table_header.phtml:74
-msgid "Overhead"
-msgstr "Sobrecarga"
-
-#: templates/structure/display_table_stats.phtml:32
-msgid "Effective"
-msgstr "Efetivo"
-
-#: templates/structure/favorite_anchor.phtml:12
-msgid "Add to Favorites"
-msgstr "Adicionar aos Favoritos"
-
-#: templates/structure/move_columns_dialog.phtml:1
-#: templates/structure/optional_action_links.phtml:21
-msgid "Move columns"
-msgstr "Mover campo(s)"
-
-#: templates/structure/move_columns_dialog.phtml:2
-msgid "Move the columns by dragging them up and down."
-msgstr "Mover o(s) campo(s) arrastando ele(s) para cima e para baixo."
-
-#: templates/structure/optional_action_links.phtml:9
-msgid "Propose table structure"
-msgstr "Propor estrutura de tabela"
-
-#: templates/structure/optional_action_links.phtml:24
-msgid "Improve table structure"
-msgstr "Melhorar a estrutura da tabela"
-
-#: templates/structure/optional_action_links.phtml:30
-msgid "Track view"
-msgstr "Ver Rastrear"
-
-#: templates/structure/row_stats_table.phtml:3
-msgid "Row statistics"
-msgstr "Estatísticas do registro"
-
-#: templates/structure/row_stats_table.phtml:9
-msgid "static"
-msgstr "estático"
-
-#: templates/structure/row_stats_table.phtml:11
-msgid "dynamic"
-msgstr "dinâmico"
-
-#: templates/structure/row_stats_table.phtml:22
-msgid "partitioned"
-msgstr "particionado"
-
-#: templates/structure/row_stats_table.phtml:54
-msgid "Row length"
-msgstr "Comprimento do registro"
-
-#: templates/structure/row_stats_table.phtml:66
-msgid "Row size"
-msgstr "Tamanho do registro"
-
-#: templates/structure/row_stats_table.phtml:73
-msgid "Next autoindex"
-msgstr "Próximo auto-índice"
-
-#: templates/structure/secondary_tabs.phtml:14
-msgid "Relation view"
-msgstr "Visão de relação(ões)"
-
-#: templates/structure/show_create.phtml:2
-msgid "Showing create queries"
-msgstr "Mostrar consultas create"
-
-#: templates/structure/sortable_header.phtml:13
-msgid "Sort"
-msgstr "Ordenar"
-
-#: templates/structure/table_header.phtml:42
-msgid ""
-"May be approximate. Click on the number to get the exact count. See "
-"[doc@faq3-11]FAQ 3.11[/doc]."
-msgstr ""
-"Pode ser aproximado. Clique no número para obter a contagem exata. Veja a "
-"[doc@faq3-11]FAQ 3.11[/doc]."
-
-#: templates/structure/table_structure_row.phtml:46
-#, php-format
-msgid "Column %s has been dropped."
-msgstr "A coluna %s foi eliminada."
-
-#: templates/structure/tracking_icon.phtml:4
-msgid "Tracking is active."
-msgstr "Rastreamento está ativo."
-
-#: templates/structure/tracking_icon.phtml:8
-msgid "Tracking is not active."
-msgstr "Rastreamento não está ativo."
-
-#: templates/table/create_table.phtml:15
-msgid "Number of columns"
-msgstr "Número de colunas"
-
-#: templates/table/options.phtml:8
-msgid "Select columns (at least one):"
-msgstr "Selecionar colunas (no mínimo 1):"
-
-#: templates/table/options.phtml:37
-msgid "Add search conditions (body of the \"where\" clause):"
-msgstr "Adicionar condições de pesquisa (corpo da cláusula \"where\"):"
-
-#: templates/table/options.phtml:45
-msgid "Number of rows per page"
-msgstr "Número de registros por página"
-
-#: templates/table/options.phtml:56
-msgid "Display order:"
-msgstr "Ordenado por:"
-
-#: templates/table/options_zoom.phtml:6
-msgid "Use this column to label each point"
-msgstr "Use esta coluna para rotular cada ponto"
-
-#: templates/table/options_zoom.phtml:35
-msgid "Maximum rows to plot"
-msgstr "Número máximo de linhas para traçar"
-
-#: templates/table/replace_preview.phtml:13
-msgid "Find and replace - preview"
-msgstr "Pesquisar e substituir - preview"
-
-#: templates/table/replace_preview.phtml:18
-msgid "Original string"
-msgstr "String original"
-
-#: templates/table/replace_preview.phtml:19
-msgid "Replaced string"
-msgstr "String substituída"
-
-#: templates/table/replace_preview.phtml:40
-msgid "Replace"
-msgstr "Substituir"
-
-#: templates/table/rows_zoom.phtml:16
-msgid "Additional search criteria"
-msgstr "Critérios de pesquisa adicionais"
-
-#: templates/table/search_and_replace.phtml:3
-msgid "Replace with:"
-msgstr "Substituir com:"
-
-#: templates/table/search_and_replace.phtml:22
-msgid "Use regular expression"
-msgstr "Use expressões regulares"
-
-#: templates/table/selection_form.phtml:12
-msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
-msgstr ""
-"Execute uma \"consulta por exemplo\" (coringa: \"%\") para duas colunas "
-"diferentes"
-
-#: templates/table/selection_form.phtml:34
-msgid "Do a \"query by example\" (wildcard: \"%\")"
-msgstr "Faça uma \"consulta por exemplo\" (coringa: \"%\")"
-
-#: templates/table/zoom_result_form.phtml:7
-msgid "Browse/Edit the points"
-msgstr "Visualizar/Editar os pontos"
-
-#: templates/table/zoom_result_form.phtml:15
-msgid "How to use"
-msgstr "Como usar"
-
-#: templates/table/zoom_result_form.phtml:23
-msgid "Reset zoom"
-msgstr "Resetar zoom"
-
-#: templates/tbl_chart.phtml:17
+#: templates/table/chart/tbl_chart.phtml:17
 msgctxt "Chart type"
 msgid "Bar"
 msgstr "Barra"
 
-#: templates/tbl_chart.phtml:21
+#: templates/table/chart/tbl_chart.phtml:21
 msgctxt "Chart type"
 msgid "Column"
 msgstr "Coluna"
 
-#: templates/tbl_chart.phtml:25
+#: templates/table/chart/tbl_chart.phtml:25
 msgctxt "Chart type"
 msgid "Line"
 msgstr "Linha"
 
-#: templates/tbl_chart.phtml:29
+#: templates/table/chart/tbl_chart.phtml:29
 msgctxt "Chart type"
 msgid "Spline"
 msgstr "Spline"
 
-#: templates/tbl_chart.phtml:33
+#: templates/table/chart/tbl_chart.phtml:33
 msgctxt "Chart type"
 msgid "Area"
 msgstr "Área"
 
-#: templates/tbl_chart.phtml:37
+#: templates/table/chart/tbl_chart.phtml:37
 msgctxt "Chart type"
 msgid "Pie"
 msgstr "Setor"
 
-#: templates/tbl_chart.phtml:41
+#: templates/table/chart/tbl_chart.phtml:41
 msgctxt "Chart type"
 msgid "Timeline"
 msgstr "Cronologia"
 
-#: templates/tbl_chart.phtml:45
+#: templates/table/chart/tbl_chart.phtml:45
 msgctxt "Chart type"
 msgid "Scatter"
 msgstr "Espalhado"
 
-#: templates/tbl_chart.phtml:50
+#: templates/table/chart/tbl_chart.phtml:50
 msgid "Stacked"
 msgstr "Empilhado"
 
-#: templates/tbl_chart.phtml:53
+#: templates/table/chart/tbl_chart.phtml:53
 msgid "Chart title"
 msgstr "Título do gráfico"
 
-#: templates/tbl_chart.phtml:57
+#: templates/table/chart/tbl_chart.phtml:57
 msgid "X-Axis:"
 msgstr "Eixo X:"
 
-#: templates/tbl_chart.phtml:72
+#: templates/table/chart/tbl_chart.phtml:72
 msgid "Series:"
 msgstr "Série:"
 
-#: templates/tbl_chart.phtml:102
+#: templates/table/chart/tbl_chart.phtml:102
 msgid "X-Axis label:"
 msgstr "Rótulo do Eixo X:"
 
-#: templates/tbl_chart.phtml:104
+#: templates/table/chart/tbl_chart.phtml:104
 msgid "X Values"
 msgstr "Valores X"
 
-#: templates/tbl_chart.phtml:107
+#: templates/table/chart/tbl_chart.phtml:107
 msgid "Y-Axis label:"
 msgstr "Rótulo do Eixo Y:"
 
-#: templates/tbl_chart.phtml:115
+#: templates/table/chart/tbl_chart.phtml:115
 msgid "Series names are in a column"
 msgstr "Nomes em série estão em uma coluna"
 
-#: templates/tbl_chart.phtml:118
+#: templates/table/chart/tbl_chart.phtml:118
 msgid "Series column:"
 msgstr "Coluna de série:"
 
-#: templates/tbl_chart.phtml:130
+#: templates/table/chart/tbl_chart.phtml:130
 #, fuzzy
 #| msgid "Value column:"
 msgid "Value Column:"
 msgstr "Coluna de valor:"
 
-#: templates/tbl_chart.phtml:150
+#: templates/table/chart/tbl_chart.phtml:150
 msgid "Save chart as image"
 msgstr "Salvar gráfico como imagem"
 
-#: templates/tbl_relation/common_form.phtml:7
+#: templates/table/gis_visualization/gis_visualization.phtml:3
+msgid "Display GIS Visualization"
+msgstr "Mostrar visualização GIS"
+
+#: templates/table/gis_visualization/gis_visualization.phtml:8
+msgid "Label column"
+msgstr "Rótulo da coluna"
+
+#: templates/table/gis_visualization/gis_visualization.phtml:11
+msgid "-- None --"
+msgstr "-- nenhum --"
+
+#: templates/table/gis_visualization/gis_visualization.phtml:19
+msgid "Spatial column"
+msgstr "Coluna espacial"
+
+#: templates/table/index_form.phtml:16
+msgid "Index name:"
+msgstr "Nome do índice:"
+
+#: templates/table/index_form.phtml:19
+msgid ""
+"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
+msgstr ""
+"\"PRIMARY\" <b>precisa</b> ser o nome <b>de e apenas da</b> chave primária!"
+
+#: templates/table/index_form.phtml:40
+msgid "Index choice:"
+msgstr "Escolha de índice:"
+
+#: templates/table/index_form.phtml:57
+msgid "Key block size:"
+msgstr "Tamanho do bloco chave:"
+
+#: templates/table/index_form.phtml:74
+msgid "Index type:"
+msgstr "Tipo de índice:"
+
+#: templates/table/index_form.phtml:86
+msgid "Parser:"
+msgstr "Verificador:"
+
+#: templates/table/index_form.phtml:102
+msgid "Comment:"
+msgstr "Cometário:"
+
+#: templates/table/index_form.phtml:149 templates/table/index_form.phtml:190
+msgid "Drag to reorder"
+msgstr "Arraste para reordenar"
+
+#: templates/table/relation/common_form.phtml:7
 msgid "Internal relations"
 msgstr "Relações internas"
 
-#: templates/tbl_relation/common_form.phtml:11
+#: templates/table/relation/common_form.phtml:11
 msgid "Internal relation"
 msgstr "Relações internas"
 
-#: templates/tbl_relation/common_form.phtml:14
+#: templates/table/relation/common_form.phtml:14
 msgid ""
 "An internal relation is not necessary when a corresponding FOREIGN KEY "
 "relation exists."
@@ -15778,50 +15627,226 @@ msgstr ""
 "Uma relação interna é desnecessária quando uma relação de CHAVE ESTRANGEIRA "
 "correspondente existe."
 
-#: templates/tbl_relation/common_form.phtml:37
+#: templates/table/relation/common_form.phtml:37
 msgid "Foreign key constraints"
 msgstr "Restrições de chave estrangeira"
 
-#: templates/tbl_relation/common_form.phtml:40
+#: templates/table/relation/common_form.phtml:40
 msgid "Actions"
 msgstr "Ações"
 
-#: templates/tbl_relation/common_form.phtml:41
+#: templates/table/relation/common_form.phtml:41
 msgid "Constraint properties"
 msgstr "Propriedades da restrição"
 
-#: templates/tbl_relation/common_form.phtml:44
+#: templates/table/relation/common_form.phtml:44
 msgid ""
 "Only columns with index will be displayed. You can define an index below."
 msgstr ""
 "Somente colunas com índice serão exibidas. Você pode definir um índice "
 "abaixo."
 
-#: templates/tbl_relation/common_form.phtml:49
+#: templates/table/relation/common_form.phtml:49
 msgid "Foreign key constraint"
 msgstr "Restrição de chave estrangeira"
 
-#: templates/tbl_relation/common_form.phtml:81
+#: templates/table/relation/common_form.phtml:81
 msgid "+ Add constraint"
 msgstr "+ Adicionar restrição"
 
-#: templates/tbl_relation/common_form.phtml:91
+#: templates/table/relation/common_form.phtml:91
 msgid "Choose column to display:"
 msgstr "Marque a coluna para exibir:"
 
-#: templates/tbl_relation/foreign_key_row.phtml:13
+#: templates/table/relation/foreign_key_row.phtml:13
 #, php-format
 msgid "Foreign key constraint %s has been dropped"
 msgstr "Restrição de chave estrangeira %s foi eliminada"
 
-#: templates/tbl_relation/foreign_key_row.phtml:102
+#: templates/table/relation/foreign_key_row.phtml:102
 msgid "Constraint name"
 msgstr "Nome da restrição"
 
-#: templates/tbl_relation/foreign_key_row.phtml:157
+#: templates/table/relation/foreign_key_row.phtml:157
 msgid "+ Add column"
 msgstr "+ Adicionar coluna"
 
+#: templates/table/search/options.phtml:8
+msgid "Select columns (at least one):"
+msgstr "Selecionar colunas (no mínimo 1):"
+
+#: templates/table/search/options.phtml:37
+msgid "Add search conditions (body of the \"where\" clause):"
+msgstr "Adicionar condições de pesquisa (corpo da cláusula \"where\"):"
+
+#: templates/table/search/options.phtml:45
+msgid "Number of rows per page"
+msgstr "Número de registros por página"
+
+#: templates/table/search/options.phtml:56
+msgid "Display order:"
+msgstr "Ordenado por:"
+
+#: templates/table/search/options_zoom.phtml:6
+msgid "Use this column to label each point"
+msgstr "Use esta coluna para rotular cada ponto"
+
+#: templates/table/search/options_zoom.phtml:35
+msgid "Maximum rows to plot"
+msgstr "Número máximo de linhas para traçar"
+
+#: templates/table/search/replace_preview.phtml:13
+msgid "Find and replace - preview"
+msgstr "Pesquisar e substituir - preview"
+
+#: templates/table/search/replace_preview.phtml:18
+msgid "Original string"
+msgstr "String original"
+
+#: templates/table/search/replace_preview.phtml:19
+msgid "Replaced string"
+msgstr "String substituída"
+
+#: templates/table/search/replace_preview.phtml:40
+msgid "Replace"
+msgstr "Substituir"
+
+#: templates/table/search/rows_zoom.phtml:16
+msgid "Additional search criteria"
+msgstr "Critérios de pesquisa adicionais"
+
+#: templates/table/search/search_and_replace.phtml:3
+msgid "Replace with:"
+msgstr "Substituir com:"
+
+#: templates/table/search/search_and_replace.phtml:22
+msgid "Use regular expression"
+msgstr "Use expressões regulares"
+
+#: templates/table/search/selection_form.phtml:12
+msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
+msgstr ""
+"Execute uma \"consulta por exemplo\" (coringa: \"%\") para duas colunas "
+"diferentes"
+
+#: templates/table/search/selection_form.phtml:34
+msgid "Do a \"query by example\" (wildcard: \"%\")"
+msgstr "Faça uma \"consulta por exemplo\" (coringa: \"%\")"
+
+#: templates/table/search/zoom_result_form.phtml:7
+msgid "Browse/Edit the points"
+msgstr "Visualizar/Editar os pontos"
+
+#: templates/table/search/zoom_result_form.phtml:15
+msgid "How to use"
+msgstr "Como usar"
+
+#: templates/table/search/zoom_result_form.phtml:23
+msgid "Reset zoom"
+msgstr "Resetar zoom"
+
+#: templates/table/secondary_tabs.phtml:14
+msgid "Relation view"
+msgstr "Visão de relação(ões)"
+
+#: templates/table/structure/actions_in_table_structure.phtml:14
+#, php-format
+msgid "A primary key has been added on %s."
+msgstr "Uma chave primária foi adicionada a %s."
+
+#: templates/table/structure/actions_in_table_structure.phtml:34
+#: templates/table/structure/actions_in_table_structure.phtml:54
+#: templates/table/structure/actions_in_table_structure.phtml:79
+#: templates/table/structure/actions_in_table_structure.phtml:101
+#, php-format
+msgid "An index has been added on %s."
+msgstr "Um índice foi adicionado a %s."
+
+#: templates/table/structure/actions_in_table_structure.phtml:130
+#: templates/table/structure/check_all_table_column.phtml:59
+msgid "Remove from central columns"
+msgstr "Remover da(s) coluna(s) central(is)"
+
+#: templates/table/structure/actions_in_table_structure.phtml:138
+#: templates/table/structure/check_all_table_column.phtml:55
+msgid "Add to central columns"
+msgstr "Adicionar coluna(s) central(is)"
+
+#: templates/table/structure/add_column.phtml:7
+#, php-format
+msgid "Add %s column(s)"
+msgstr "Adicionar campo(s) %s"
+
+#: templates/table/structure/add_column.phtml:12
+msgid "at beginning of table"
+msgstr "No início da tabela"
+
+#: templates/table/structure/display_structure.phtml:140 view_create.php:181
+msgid "Edit view"
+msgstr "Tela de edição"
+
+#: templates/table/structure/display_table_stats.phtml:9
+msgid "Space usage"
+msgstr "Uso do espaço"
+
+#: templates/table/structure/display_table_stats.phtml:32
+msgid "Effective"
+msgstr "Efetivo"
+
+#: templates/table/structure/move_columns_dialog.phtml:1
+#: templates/table/structure/optional_action_links.phtml:21
+msgid "Move columns"
+msgstr "Mover campo(s)"
+
+#: templates/table/structure/move_columns_dialog.phtml:2
+msgid "Move the columns by dragging them up and down."
+msgstr "Mover o(s) campo(s) arrastando ele(s) para cima e para baixo."
+
+#: templates/table/structure/optional_action_links.phtml:9
+msgid "Propose table structure"
+msgstr "Propor estrutura de tabela"
+
+#: templates/table/structure/optional_action_links.phtml:24
+msgid "Improve table structure"
+msgstr "Melhorar a estrutura da tabela"
+
+#: templates/table/structure/optional_action_links.phtml:30
+msgid "Track view"
+msgstr "Ver Rastrear"
+
+#: templates/table/structure/row_stats_table.phtml:3
+msgid "Row statistics"
+msgstr "Estatísticas do registro"
+
+#: templates/table/structure/row_stats_table.phtml:9
+msgid "static"
+msgstr "estático"
+
+#: templates/table/structure/row_stats_table.phtml:11
+msgid "dynamic"
+msgstr "dinâmico"
+
+#: templates/table/structure/row_stats_table.phtml:22
+msgid "partitioned"
+msgstr "particionado"
+
+#: templates/table/structure/row_stats_table.phtml:54
+msgid "Row length"
+msgstr "Comprimento do registro"
+
+#: templates/table/structure/row_stats_table.phtml:66
+msgid "Row size"
+msgstr "Tamanho do registro"
+
+#: templates/table/structure/row_stats_table.phtml:73
+msgid "Next autoindex"
+msgstr "Próximo auto-índice"
+
+#: templates/table/structure/table_structure_row.phtml:46
+#, php-format
+msgid "Column %s has been dropped."
+msgstr "A coluna %s foi eliminada."
+
 #: themes.php:17 themes.php:22
 msgid "Theme"
 msgstr "Tema"
@@ -17174,6 +17199,9 @@ msgstr ""
 msgid "concurrent_insert is set to 0"
 msgstr "concurrent_insert está com valor 0"
 
+#~ msgid "Read as multibytes"
+#~ msgstr "Ler como multibytes"
+
 #~ msgid "Relational display column"
 #~ msgstr "Coluna de exibição relacional"
 
diff --git a/po/ro.po b/po/ro.po
index 6b492e626b..e7ea857471 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 4.5.0-dev\n"
 "Report-Msgid-Bugs-To: developers@phpmyadmin.net\n"
-"POT-Creation-Date: 2015-08-08 13:53-0400\n"
+"POT-Creation-Date: 2015-08-12 08:10-0400\n"
 "PO-Revision-Date: 2015-08-05 12:38+0200\n"
 "Last-Translator: Stefan Murariu <stefan.murariu@yahoo.com>\n"
 "Language-Team: Romanian <https://hosted.weblate.org/projects/phpmyadmin/"
@@ -54,7 +54,7 @@ msgid "Table comments:"
 msgstr "Comentarii tabel:"
 
 #: db_datadict.php:104 libraries/Index.class.php:699
-#: libraries/insert_edit.lib.php:1567
+#: libraries/insert_edit.lib.php:1565
 #: libraries/navigation/Nodes/Node_Column.class.php:30
 #: libraries/plugins/export/ExportHtmlword.class.php:280
 #: libraries/plugins/export/ExportHtmlword.class.php:375
@@ -68,13 +68,14 @@ msgstr "Comentarii tabel:"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1023
 #: libraries/tracking.lib.php:879 libraries/tracking.lib.php:975
 #: templates/columns_definitions/column_name.phtml:18
-#: templates/index_form.phtml:124 templates/table/table_header.phtml:6
-#: templates/table/zoom_result_form.phtml:33
-#: templates/tbl_relation/common_form.phtml:10
-#: templates/tbl_relation/common_form.phtml:43
-#: templates/tbl_relation/foreign_key_row.phtml:194
-#: templates/tbl_relation/foreign_key_row.phtml:206
-#: templates/tbl_relation/internal_relational_row.phtml:71
+#: templates/table/index_form.phtml:124
+#: templates/table/relation/common_form.phtml:10
+#: templates/table/relation/common_form.phtml:43
+#: templates/table/relation/foreign_key_row.phtml:194
+#: templates/table/relation/foreign_key_row.phtml:206
+#: templates/table/relation/internal_relational_row.phtml:71
+#: templates/table/search/table_header.phtml:6
+#: templates/table/search/zoom_result_form.phtml:33
 msgid "Column"
 msgstr "Coloană"
 
@@ -92,21 +93,21 @@ msgstr "Coloană"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1001
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1024
 #: libraries/rte/rte_list.lib.php:75 libraries/rte/rte_list.lib.php:103
-#: libraries/rte/rte_routines.lib.php:802
-#: libraries/rte/rte_routines.lib.php:831
-#: libraries/rte/rte_routines.lib.php:1493
+#: libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_routines.lib.php:922
+#: libraries/rte/rte_routines.lib.php:1584
 #: libraries/server_privileges.lib.php:2369 libraries/tracking.lib.php:880
 #: libraries/tracking.lib.php:972
 #: templates/columns_definitions/table_fields_definitions.phtml:11
-#: templates/structure/table_header.phtml:48
-#: templates/structure/table_structure_header.phtml:6
-#: templates/table/table_header.phtml:7
+#: templates/database/structure/table_header.phtml:48
+#: templates/table/search/table_header.phtml:7
+#: templates/table/structure/table_structure_header.phtml:6
 msgid "Type"
 msgstr "Tip"
 
 #: db_datadict.php:106 libraries/Index.class.php:702
 #: libraries/central_columns.lib.php:708
-#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1576
+#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1574
 #: libraries/plugins/export/ExportHtmlword.class.php:286
 #: libraries/plugins/export/ExportHtmlword.class.php:381
 #: libraries/plugins/export/ExportLatex.class.php:509
@@ -119,8 +120,8 @@ msgstr "Tip"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1026
 #: libraries/tracking.lib.php:882 libraries/tracking.lib.php:978
 #: templates/columns_definitions/table_fields_definitions.phtml:39
-#: templates/structure/table_structure_header.phtml:9
-#: templates/table/zoom_result_form.phtml:34
+#: templates/table/search/zoom_result_form.phtml:34
+#: templates/table/structure/table_structure_header.phtml:9
 msgid "Null"
 msgstr "Nul"
 
@@ -138,8 +139,8 @@ msgstr "Nul"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1027
 #: libraries/replication_gui.lib.php:153 libraries/tracking.lib.php:883
 #: templates/columns_definitions/table_fields_definitions.phtml:25
-#: templates/structure/body_for_table_summary.phtml:55
-#: templates/structure/table_structure_header.phtml:10
+#: templates/database/structure/body_for_table_summary.phtml:55
+#: templates/table/structure/table_structure_header.phtml:10
 msgid "Default"
 msgstr "Implicit"
 
@@ -167,19 +168,19 @@ msgid "Comments"
 msgstr "Comentarii"
 
 #: db_datadict.php:146
-#: libraries/controllers/StructureController.class.php:1960
-#: libraries/controllers/StructureController.class.php:1965
+#: libraries/controllers/TableStructureController.class.php:951
+#: libraries/controllers/TableStructureController.class.php:956
 #: libraries/tracking.lib.php:922
 #: templates/columns_definitions/column_indexes.phtml:6
-#: templates/structure/check_all_table_column.phtml:22
-#: templates/structure/display_structure.phtml:74
+#: templates/table/structure/check_all_table_column.phtml:22
+#: templates/table/structure/display_structure.phtml:74
 msgid "Primary"
 msgstr "Primar"
 
 #: db_datadict.php:156 js/messages.php:317 libraries/Index.class.php:567
 #: libraries/Index.class.php:606 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261 libraries/mult_submits.lib.php:403
+#: libraries/config/FormDisplay.tpl.php:272 libraries/mult_submits.lib.php:403
 #: libraries/mult_submits.lib.php:417
 #: libraries/plugins/export/ExportHtmlword.class.php:630
 #: libraries/plugins/export/ExportLatex.class.php:589
@@ -195,20 +196,20 @@ msgstr "Primar"
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1010 libraries/tracking.lib.php:1015
 #: prefs_manage.php:140 templates/prefs_autoload.phtml:15
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "No"
 msgstr "Nu"
 
 #: db_datadict.php:156 js/messages.php:443 libraries/Index.class.php:568
 #: libraries/Index.class.php:605 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261
-#: libraries/controllers/StructureController.class.php:1344
-#: libraries/controllers/StructureController.class.php:2223
-#: libraries/controllers/StructureController.class.php:2232
-#: libraries/controllers/StructureController.class.php:2237
-#: libraries/controllers/StructureController.class.php:2242
-#: libraries/controllers/StructureController.class.php:2247
+#: libraries/config/FormDisplay.tpl.php:272
+#: libraries/controllers/TableStructureController.class.php:539
+#: libraries/controllers/TableStructureController.class.php:1201
+#: libraries/controllers/TableStructureController.class.php:1210
+#: libraries/controllers/TableStructureController.class.php:1215
+#: libraries/controllers/TableStructureController.class.php:1220
+#: libraries/controllers/TableStructureController.class.php:1225
 #: libraries/mult_submits.inc.php:82 libraries/mult_submits.inc.php:178
 #: libraries/mult_submits.lib.php:339 libraries/mult_submits.lib.php:372
 #: libraries/mult_submits.lib.php:401 libraries/mult_submits.lib.php:415
@@ -217,8 +218,8 @@ msgstr "Nu"
 #: libraries/plugins/export/ExportOdt.class.php:756
 #: libraries/plugins/export/ExportTexytext.class.php:567
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1077
-#: libraries/server_databases.lib.php:464
-#: libraries/server_databases.lib.php:474
+#: libraries/server_databases.lib.php:475
+#: libraries/server_databases.lib.php:485
 #: libraries/server_privileges.lib.php:2546
 #: libraries/server_privileges.lib.php:2727
 #: libraries/server_privileges.lib.php:2748
@@ -228,7 +229,7 @@ msgstr "Nu"
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1008 libraries/tracking.lib.php:1013
 #: prefs_manage.php:138 templates/prefs_autoload.phtml:14
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "Yes"
 msgstr "Da"
 
@@ -238,7 +239,7 @@ msgstr "Vizualizarea schemei bazei de date"
 
 #: db_export.php:37 db_tracking.php:90 export.php:382
 #: libraries/DBQbe.class.php:326
-#: libraries/controllers/StructureController.class.php:231
+#: libraries/controllers/DatabaseStructureController.class.php:170
 #: libraries/navigation/NavigationTree.class.php:897
 msgid "No tables found in database."
 msgstr "Nu s-a găsit niciun tabel în baza de date."
@@ -249,14 +250,14 @@ msgstr "Nu s-a găsit niciun tabel în baza de date."
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:26
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:120
-#: templates/structure/show_create.phtml:18
+#: templates/database/structure/show_create.phtml:18
 msgid "Tables"
 msgstr "Tabele"
 
 #: db_export.php:52 libraries/Menu.class.php:317 libraries/Menu.class.php:425
-#: libraries/Util.class.php:3333 libraries/Util.class.php:3343
-#: libraries/Util.class.php:3349 libraries/Util.class.php:3629
-#: libraries/Util.class.php:4327 libraries/Util.class.php:4344
+#: libraries/Util.class.php:3339 libraries/Util.class.php:3349
+#: libraries/Util.class.php:3355 libraries/Util.class.php:3635
+#: libraries/Util.class.php:4333 libraries/Util.class.php:4350
 #: libraries/central_columns.lib.php:728 libraries/config.values.php:39
 #: libraries/config.values.php:47 libraries/config.values.php:109
 #: libraries/config.values.php:115 libraries/config/setup.forms.php:323
@@ -270,7 +271,7 @@ msgstr "Tabele"
 #: libraries/navigation/Nodes/Node_Table.class.php:283
 #: libraries/server_privileges.lib.php:1141 libraries/tracking.lib.php:874
 #: templates/columns_definitions/table_fields_definitions.phtml:3
-#: templates/designer/table_list.phtml:28
+#: templates/database/designer/table_list.phtml:28
 msgid "Structure"
 msgstr "Structură"
 
@@ -282,7 +283,7 @@ msgstr "Structură"
 #: libraries/config/user_preferences.forms.php:292
 #: libraries/config/user_preferences.forms.php:297
 #: libraries/server_privileges.lib.php:1140
-#: templates/structure/display_table_stats.phtml:12
+#: templates/table/structure/display_table_stats.phtml:12
 msgid "Data"
 msgstr "Date"
 
@@ -356,10 +357,10 @@ msgstr "Tabele monitorizate"
 #: libraries/server_privileges.lib.php:2908
 #: libraries/server_privileges.lib.php:3145
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4346
-#: templates/structure/table_header.phtml:21
-#: templates/tbl_relation/foreign_key_row.phtml:176
-#: templates/tbl_relation/internal_relational_row.phtml:63
+#: libraries/server_privileges.lib.php:4372
+#: templates/database/structure/table_header.phtml:21
+#: templates/table/relation/foreign_key_row.phtml:176
+#: templates/table/relation/internal_relational_row.phtml:63
 msgid "Table"
 msgstr "Tabel"
 
@@ -376,7 +377,7 @@ msgid "Updated"
 msgstr "Actualizat"
 
 #: db_tracking.php:130 js/messages.php:243 libraries/Menu.class.php:552
-#: libraries/Util.class.php:4314 libraries/config.values.php:104
+#: libraries/Util.class.php:4320 libraries/config.values.php:104
 #: libraries/rte/rte_events.lib.php:393 libraries/rte/rte_list.lib.php:101
 #: libraries/server_status_processes.lib.php:92 libraries/tracking.lib.php:279
 msgid "Status"
@@ -385,14 +386,15 @@ msgstr "Stare"
 #: db_tracking.php:131 db_tracking.php:290 libraries/Index.class.php:693
 #: libraries/central_columns.lib.php:687 libraries/rte/rte_list.lib.php:74
 #: libraries/rte/rte_list.lib.php:89 libraries/rte/rte_list.lib.php:102
-#: libraries/server_databases.lib.php:398
+#: libraries/server_databases.lib.php:409
 #: libraries/server_privileges.lib.php:2372
 #: libraries/server_privileges.lib.php:3166
 #: libraries/server_privileges.lib.php:3342
 #: libraries/server_user_groups.lib.php:82
 #: libraries/server_variables.lib.php:189 libraries/tracking.lib.php:280
-#: libraries/tracking.lib.php:793 templates/structure/table_header.phtml:30
-#: templates/structure/table_structure_header.phtml:23
+#: libraries/tracking.lib.php:793
+#: templates/database/structure/table_header.phtml:30
+#: templates/table/structure/table_structure_header.phtml:23
 msgid "Action"
 msgstr "Acțiune"
 
@@ -434,7 +436,7 @@ msgid "Untracked tables"
 msgstr "Tabele fără monitorizare"
 
 #: db_tracking.php:305 db_tracking.php:336
-#: templates/structure/optional_action_links.phtml:17
+#: templates/table/structure/optional_action_links.phtml:17
 msgid "Track table"
 msgstr "Monitorizează tabel"
 
@@ -490,7 +492,7 @@ msgid "Value for the column \"%s\""
 msgstr "Valoare pentru coloana „%s”"
 
 #: gis_data_editor.php:146
-#: templates/gis_visualization/gis_visualization.phtml:37
+#: templates/table/gis_visualization/gis_visualization.phtml:37
 msgid "Use OpenStreetMaps as Base Layer"
 msgstr "Folosește OpenStreetMap ca strat de bază"
 
@@ -570,35 +572,35 @@ msgstr "Adaugă geometrie"
 #: libraries/display_change_password.lib.php:162
 #: libraries/display_export.lib.php:402 libraries/display_export.lib.php:408
 #: libraries/display_import.lib.php:392 libraries/index.lib.php:44
-#: libraries/insert_edit.lib.php:1546 libraries/insert_edit.lib.php:1583
+#: libraries/insert_edit.lib.php:1544 libraries/insert_edit.lib.php:1581
 #: libraries/normalization.lib.php:165 libraries/normalization.lib.php:821
 #: libraries/operations.lib.php:38 libraries/operations.lib.php:108
 #: libraries/operations.lib.php:263 libraries/operations.lib.php:306
 #: libraries/operations.lib.php:801 libraries/operations.lib.php:874
 #: libraries/operations.lib.php:923 libraries/operations.lib.php:1337
 #: libraries/operations.lib.php:1658
-#: libraries/plugins/auth/AuthenticationCookie.class.php:244
+#: libraries/plugins/auth/AuthenticationCookie.class.php:232
 #: libraries/replication_gui.lib.php:122 libraries/replication_gui.lib.php:161
 #: libraries/replication_gui.lib.php:324 libraries/replication_gui.lib.php:461
 #: libraries/replication_gui.lib.php:906 libraries/rte/rte_events.lib.php:509
-#: libraries/rte/rte_routines.lib.php:969
-#: libraries/rte/rte_routines.lib.php:1581
+#: libraries/rte/rte_routines.lib.php:1060
+#: libraries/rte/rte_routines.lib.php:1672
 #: libraries/rte/rte_triggers.lib.php:396 libraries/server_bin_log.lib.php:61
 #: libraries/server_privileges.lib.php:705
 #: libraries/server_privileges.lib.php:2106
 #: libraries/server_privileges.lib.php:2872
 #: libraries/server_privileges.lib.php:3553
-#: libraries/server_privileges.lib.php:4627
+#: libraries/server_privileges.lib.php:4653
 #: libraries/server_user_groups.lib.php:285
 #: libraries/sql_query_form.lib.php:369 libraries/sql_query_form.lib.php:429
 #: libraries/tracking.lib.php:533 libraries/tracking.lib.php:653
 #: prefs_manage.php:277 prefs_manage.php:355
 #: templates/columns_definitions/column_definitions_form.phtml:59
-#: templates/header_location.phtml:17 templates/index_form.phtml:238
+#: templates/database/create_table.phtml:21 templates/header_location.phtml:28
 #: templates/startAndNumberOfRowsPanel.phtml:14
-#: templates/structure/add_column.phtml:25
-#: templates/table/create_table.phtml:21
-#: templates/table/selection_form.phtml:75 view_create.php:275
+#: templates/table/index_form.phtml:238
+#: templates/table/search/selection_form.phtml:75
+#: templates/table/structure/add_column.phtml:25 view_create.php:275
 #: view_operations.php:106
 msgid "Go"
 msgstr "Execută"
@@ -694,7 +696,7 @@ msgstr ""
 "Nu au putut fi încărcate extensii suplimentare de import, verificați "
 "instalarea!"
 
-#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1466
+#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1460
 #, php-format
 msgid "Bookmark %s has been created."
 msgstr "Semnul de carte %s a fost creat."
@@ -734,11 +736,11 @@ msgstr "Nu se poate determina progresul încărcării."
 msgid "Back"
 msgstr "Înapoi"
 
-#: index.php:148 libraries/Footer.class.php:70
+#: index.php:149 libraries/Footer.class.php:70
 msgid "phpMyAdmin Demo Server"
 msgstr "Server Demo phpMyAdmin"
 
-#: index.php:152
+#: index.php:153
 #, php-format
 msgid ""
 "You are using the demo server. You can do anything here, but please do not "
@@ -749,110 +751,110 @@ msgstr ""
 "schimbaţi root, devian-sys-maint sau utilizatorii pma. Mai multe informaţii "
 "sunt disponibile at %s."
 
-#: index.php:162
+#: index.php:163
 msgid "General Settings"
 msgstr "Setări generale"
 
-#: index.php:190 libraries/display_change_password.lib.php:50
+#: index.php:191 libraries/display_change_password.lib.php:50
 #: libraries/display_change_password.lib.php:53 user_password.php:247
 msgid "Change password"
 msgstr "Modifică parola"
 
-#: index.php:206
+#: index.php:207
 msgid "Server connection collation"
 msgstr "Conexiune colaționare server"
 
-#: index.php:228
+#: index.php:229
 msgid "Appearance Settings"
 msgstr "Setări aspect"
 
-#: index.php:258 prefs_manage.php:285
+#: index.php:259 prefs_manage.php:285
 msgid "More settings"
 msgstr "Mai multe setări"
 
-#: index.php:279
+#: index.php:280
 msgid "Database server"
 msgstr "Server de baze de date"
 
-#: index.php:282 libraries/plugins/auth/AuthenticationCookie.class.php:181
+#: index.php:283 libraries/plugins/auth/AuthenticationCookie.class.php:169
 msgid "Server:"
 msgstr "Server:"
 
-#: index.php:286
+#: index.php:287
 msgid "Server type:"
 msgstr "Tipul server-ului:"
 
-#: index.php:290 libraries/plugins/export/ExportLatex.class.php:212
+#: index.php:291 libraries/plugins/export/ExportLatex.class.php:212
 #: libraries/plugins/export/ExportSql.class.php:687
 #: libraries/plugins/export/ExportXml.class.php:189
 msgid "Server version:"
 msgstr "Versiune server:"
 
-#: index.php:296
+#: index.php:297
 msgid "Protocol version:"
 msgstr "Versiune protocol:"
 
-#: index.php:300
+#: index.php:301
 msgid "User:"
 msgstr "Utilizator:"
 
-#: index.php:305
+#: index.php:306
 msgid "Server charset:"
 msgstr "Setul de caractere al serverului:"
 
-#: index.php:320
+#: index.php:321
 msgid "Web server"
 msgstr "Server web"
 
-#: index.php:331
+#: index.php:332
 msgid "Database client version:"
 msgstr "Versiunea client-ului bazei de date:"
 
-#: index.php:335
+#: index.php:336
 msgid "PHP extension:"
 msgstr "Extensie PHP:"
 
-#: index.php:349
+#: index.php:350
 msgid "PHP version:"
 msgstr "Versiune PHP:"
 
-#: index.php:360
+#: index.php:361
 msgid "Show PHP information"
 msgstr "Arată informații PHP"
 
-#: index.php:383
+#: index.php:384
 msgid "Version information:"
 msgstr "Informații despre versiune:"
 
-#: index.php:392 libraries/Util.class.php:432 libraries/Util.class.php:495
-#: libraries/config/FormDisplay.tpl.php:151
+#: index.php:393 libraries/Util.class.php:432 libraries/Util.class.php:495
+#: libraries/config/FormDisplay.tpl.php:162
 #: libraries/display_export.lib.php:577 libraries/engines/pbxt.lib.php:162
 #: libraries/navigation/NavigationHeader.class.php:196
 #: libraries/server_variables.lib.php:160
 msgid "Documentation"
 msgstr "Documentație"
 
-#: index.php:399
+#: index.php:400
 msgid "Wiki"
 msgstr "Wiki"
 
-#: index.php:408
+#: index.php:409
 msgid "Official Homepage"
 msgstr "Pagina oficială"
 
-#: index.php:415
+#: index.php:416
 msgid "Contribute"
 msgstr "Contribuie"
 
-#: index.php:422
+#: index.php:423
 msgid "Get support"
 msgstr "Obține asistență"
 
-#: index.php:429
+#: index.php:430
 msgid "List of changes"
 msgstr "Lista modificărilor"
 
-#: index.php:451
+#: index.php:452
 msgid ""
 "You are connected as 'root' with no password, which corresponds to the "
 "default MySQL privileged account. Your MySQL server is running with this "
@@ -864,7 +866,7 @@ msgstr ""
 "implicit, este deschis la intruziune și trebuie să închideți neapărat "
 "această breșă de securitate stabilind o parolă pentru utilizatorul „root”."
 
-#: index.php:468
+#: index.php:469
 msgid ""
 "You have enabled mbstring.func_overload in your PHP configuration. This "
 "option is incompatible with phpMyAdmin and might cause some data to be "
@@ -873,7 +875,7 @@ msgstr ""
 "Ați activat mbstring.func_overload în configurația PHP. Această opțiune nu "
 "este compatibilă cu phpMyAdmin și poate duce la deteriorarea unor date!"
 
-#: index.php:483
+#: index.php:484
 msgid ""
 "The mbstring PHP extension was not found and you seem to be using a "
 "multibyte charset. Without the mbstring extension phpMyAdmin is unable to "
@@ -883,7 +885,7 @@ msgstr ""
 "charactere multi-octet. Fără extensia mbstring, phpMyAdmin nu poate diviza "
 "șirurile de caractere corect, fapt ce poate duce la rezultate neașteptate."
 
-#: index.php:500
+#: index.php:501
 msgid ""
 "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini."
 "session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower than "
@@ -896,7 +898,7 @@ msgstr ""
 "dumneavoastră ar putea expira mai devreme decât este configurat în "
 "phpMyAdmin."
 
-#: index.php:519
+#: index.php:520
 msgid ""
 "Login cookie store is lower than cookie validity configured in phpMyAdmin, "
 "because of this, your login will expire sooner than configured in phpMyAdmin."
@@ -905,12 +907,12 @@ msgstr ""
 "validitate a cookie-urilor configurată in phpMyAdmim, din această cauză "
 "sesiunea dumneavoastră va expira înainte de cum este stabilit în phpMyAdmin."
 
-#: index.php:535
+#: index.php:536
 msgid "The configuration file now needs a secret passphrase (blowfish_secret)."
 msgstr ""
 "Fișierul de configurare necesită o frază de acces secretă (blowfish_secret)."
 
-#: index.php:548
+#: index.php:549
 msgid ""
 "Directory [code]config[/code], which is used by the setup script, still "
 "exists in your phpMyAdmin directory. It is strongly recommended to remove it "
@@ -922,7 +924,7 @@ msgstr ""
 "odată ce phpMyAdmin a fost configurat. Altfel, securitatea serverului poate "
 "fi compromisă de persoane neautorizate care descarcă respectiva configurație."
 
-#: index.php:564
+#: index.php:565
 #, fuzzy, php-format
 #| msgid ""
 #| "The phpMyAdmin configuration storage is not completely configured, some "
@@ -934,14 +936,14 @@ msgstr ""
 "Stocarea configurarilor phpMyAdmin nu este complet configurată, astfel că "
 "unele caracteristici avansate au fost dezactivate.  %Află de ce%s. "
 
-#: index.php:571
+#: index.php:572
 msgid ""
 "Or alternately go to 'Operations' tab of any database to set it up there."
 msgstr ""
 "Sau, altfel, puteți accesa panoul 'Operațiuni' al oricărei baze de date si "
 "configura-o de acolo."
 
-#: index.php:620
+#: index.php:621
 #, php-format
 msgid ""
 "Your PHP MySQL library version %s differs from your MySQL server version %s. "
@@ -951,7 +953,7 @@ msgstr ""
 "a serverului MySQL. Această diferență poate cauza un comportament "
 "imprevizibil."
 
-#: index.php:648
+#: index.php:649
 #, php-format
 msgid ""
 "Server running with Suhosin. Please refer to %sdocumentation%s for possible "
@@ -1109,8 +1111,8 @@ msgstr ""
 msgid "Save & Close"
 msgstr "Salvează & Închide"
 
-#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:404
-#: libraries/insert_edit.lib.php:1550 prefs_manage.php:361
+#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:415
+#: libraries/insert_edit.lib.php:1548 prefs_manage.php:361
 #: prefs_manage.php:372
 msgid "Reset"
 msgstr "Resetare"
@@ -1143,7 +1145,7 @@ msgstr "Adaugă index"
 msgid "Edit Index"
 msgstr "Modifică index"
 
-#: js/messages.php:99 templates/index_form.phtml:232
+#: js/messages.php:99 templates/table/index_form.phtml:232
 #, php-format
 msgid "Add %s column(s) to index"
 msgstr "Adaugă %s coloane la index"
@@ -1164,15 +1166,16 @@ msgstr "Compus cu:"
 msgid "Please select column(s) for the index."
 msgstr "Selectați coloana(ele) pentru index."
 
-#: js/messages.php:106 templates/structure/add_column.phtml:1
+#: js/messages.php:106 templates/table/structure/add_column.phtml:1
 #, fuzzy
 #| msgid "You have to add at least one field."
 msgid "You have to add at least one column."
 msgstr "Trebuie să adăugați cel puțin un câmp."
 
-#: js/messages.php:109 libraries/insert_edit.lib.php:1548
+#: js/messages.php:109 libraries/insert_edit.lib.php:1546
 #: templates/columns_definitions/column_definitions_form.phtml:162
-#: templates/index_form.phtml:237 templates/tbl_relation/common_form.phtml:106
+#: templates/table/index_form.phtml:237
+#: templates/table/relation/common_form.phtml:106
 msgid "Preview SQL"
 msgstr "Previzualizare SQL"
 
@@ -1189,7 +1192,7 @@ msgid "SQL query:"
 msgstr "Interogare SQL:"
 
 #. l10n: Default label for the y-Axis of Charts
-#: js/messages.php:118 templates/tbl_chart.phtml:109
+#: js/messages.php:118 templates/table/chart/tbl_chart.phtml:109
 msgid "Y Values"
 msgstr "Valori Y"
 
@@ -1346,7 +1349,7 @@ msgstr "Octeți trimiși"
 msgid "Bytes received"
 msgstr "Octeți primiți"
 
-#: js/messages.php:169 libraries/server_status.lib.php:226
+#: js/messages.php:169 libraries/server_status.lib.php:235
 msgid "Connections"
 msgstr "Conexiuni"
 
@@ -1403,12 +1406,12 @@ msgstr "%d tabel(e)"
 msgid "Questions"
 msgstr "Întrebări"
 
-#: js/messages.php:184 libraries/server_status.lib.php:134
+#: js/messages.php:184 libraries/server_status.lib.php:143
 msgid "Traffic"
 msgstr "Trafic"
 
 #: js/messages.php:185 libraries/Menu.class.php:586
-#: libraries/Util.class.php:4318 libraries/server_status_monitor.lib.php:257
+#: libraries/Util.class.php:4324 libraries/server_status_monitor.lib.php:257
 msgid "Settings"
 msgstr "Configurări"
 
@@ -1428,8 +1431,9 @@ msgstr "Adăugați cel puțin o variabilă la serie!"
 #: libraries/server_status_monitor.lib.php:236
 #: libraries/server_status_processes.lib.php:308
 #: templates/columns_definitions/transformation.phtml:4
-#: templates/designer/options_panel.phtml:178
-#: templates/table/options_zoom.phtml:12 templates/table/rows_zoom.phtml:26
+#: templates/database/designer/options_panel.phtml:178
+#: templates/table/search/options_zoom.phtml:12
+#: templates/table/search/rows_zoom.phtml:26
 msgid "None"
 msgstr "Niciunul"
 
@@ -1724,8 +1728,8 @@ msgstr ""
 
 #: js/messages.php:270 libraries/Menu.class.php:352
 #: libraries/Menu.class.php:455 libraries/Menu.class.php:582
-#: libraries/Util.class.php:4317 libraries/Util.class.php:4332
-#: libraries/Util.class.php:4349 libraries/config/messages.inc.php:258
+#: libraries/Util.class.php:4323 libraries/Util.class.php:4338
+#: libraries/Util.class.php:4355 libraries/config/messages.inc.php:258
 #: libraries/display_import.lib.php:105
 #: libraries/server_status_monitor.lib.php:318 prefs_manage.php:238
 #: setup/frames/menu.inc.php:26
@@ -1785,13 +1789,13 @@ msgid "Formatting SQL..."
 msgstr ""
 
 #: js/messages.php:293 libraries/server_variables.lib.php:157
-#: templates/designer/aggregate_query_panel.phtml:63
-#: templates/designer/delete_relation_panel.phtml:28
-#: templates/designer/having_query_panel.phtml:117
-#: templates/designer/new_relation_panel.phtml:88
-#: templates/designer/options_panel.phtml:253
-#: templates/designer/rename_to_panel.phtml:45
-#: templates/designer/where_query_panel.phtml:83
+#: templates/database/designer/aggregate_query_panel.phtml:63
+#: templates/database/designer/delete_relation_panel.phtml:28
+#: templates/database/designer/having_query_panel.phtml:117
+#: templates/database/designer/new_relation_panel.phtml:88
+#: templates/database/designer/options_panel.phtml:253
+#: templates/database/designer/rename_to_panel.phtml:45
+#: templates/database/designer/where_query_panel.phtml:83
 msgid "Cancel"
 msgstr "Renunță"
 
@@ -1801,7 +1805,7 @@ msgstr "Renunță"
 msgid "Page-related settings"
 msgstr "Modificare configurări"
 
-#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:402
+#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:413
 msgid "Apply"
 msgstr ""
 
@@ -1838,8 +1842,8 @@ msgstr "Cod eroare: %s"
 msgid "Error text: %s"
 msgstr "Text eroare: %s"
 
-#: js/messages.php:307 libraries/db_common.inc.php:68
-#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:450
+#: js/messages.php:307 libraries/db_common.inc.php:69
+#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:461
 msgid "No databases selected."
 msgstr "Nu a fost aleasă nici o bază de date."
 
@@ -1851,12 +1855,13 @@ msgstr "Se aruncă coloana"
 msgid "Adding Primary Key"
 msgstr "Se adaugă cheia primară"
 
-#: js/messages.php:310 templates/designer/aggregate_query_panel.phtml:59
-#: templates/designer/having_query_panel.phtml:113
-#: templates/designer/new_relation_panel.phtml:87
-#: templates/designer/options_panel.phtml:252
-#: templates/designer/rename_to_panel.phtml:41
-#: templates/designer/where_query_panel.phtml:82
+#: js/messages.php:310
+#: templates/database/designer/aggregate_query_panel.phtml:59
+#: templates/database/designer/having_query_panel.phtml:113
+#: templates/database/designer/new_relation_panel.phtml:87
+#: templates/database/designer/options_panel.phtml:252
+#: templates/database/designer/rename_to_panel.phtml:41
+#: templates/database/designer/where_query_panel.phtml:82
 msgid "OK"
 msgstr "Bine"
 
@@ -1876,7 +1881,7 @@ msgstr "Se copiază baza de date"
 msgid "Changing Charset"
 msgstr "Se schimbă setul de caractere"
 
-#: js/messages.php:320 libraries/Util.class.php:3217
+#: js/messages.php:320 libraries/Util.class.php:3223
 #, fuzzy
 #| msgid "Disable foreign key checks"
 msgid "Enable foreign key checks"
@@ -1913,20 +1918,21 @@ msgstr "Definiția unei funcții stocate trebuie să conțină o declarație RET
 #: js/messages.php:334 libraries/DisplayResults.class.php:4834
 #: libraries/DisplayResults.class.php:5092 libraries/Menu.class.php:344
 #: libraries/Menu.class.php:446 libraries/Menu.class.php:578
-#: libraries/Util.class.php:3636 libraries/Util.class.php:3637
-#: libraries/Util.class.php:4316 libraries/Util.class.php:4331
-#: libraries/Util.class.php:4348 libraries/config/messages.inc.php:252
+#: libraries/Util.class.php:3642 libraries/Util.class.php:3643
+#: libraries/Util.class.php:4322 libraries/Util.class.php:4337
+#: libraries/Util.class.php:4354 libraries/config/messages.inc.php:252
 #: libraries/display_export.lib.php:173 libraries/rte/rte_list.lib.php:146
 #: libraries/server_privileges.lib.php:2211
 #: libraries/server_privileges.lib.php:2290
 #: libraries/server_privileges.lib.php:2632
 #: libraries/server_privileges.lib.php:3356
 #: libraries/server_status_monitor.lib.php:322 prefs_manage.php:303
-#: setup/frames/menu.inc.php:27 templates/structure/check_all_tables.phtml:11
+#: setup/frames/menu.inc.php:27
+#: templates/database/structure/check_all_tables.phtml:11
 msgid "Export"
 msgstr "Exportă"
 
-#: js/messages.php:337 libraries/rte/rte_routines.lib.php:652
+#: js/messages.php:337 libraries/rte/rte_routines.lib.php:743
 msgid "ENUM/SET editor"
 msgstr "Editor ENUM/SET"
 
@@ -1967,7 +1973,7 @@ msgstr "Arată caseta de interogare"
 #: libraries/Console.class.php:214 libraries/DisplayResults.class.php:3474
 #: libraries/DisplayResults.class.php:4818 libraries/Index.class.php:723
 #: libraries/Util.class.php:706 libraries/Util.class.php:1202
-#: libraries/Util.class.php:3634 libraries/Util.class.php:3635
+#: libraries/Util.class.php:3640 libraries/Util.class.php:3641
 #: libraries/central_columns.lib.php:851
 #: libraries/central_columns.lib.php:1193
 #: libraries/config/messages.inc.php:892
@@ -1985,7 +1991,7 @@ msgstr "Modifică"
 #: libraries/server_user_groups.lib.php:129
 #: libraries/sql_query_form.lib.php:416 libraries/tracking.lib.php:477
 #: setup/frames/index.inc.php:183 setup/frames/index.inc.php:291
-#: templates/designer/delete_relation_panel.phtml:27
+#: templates/database/designer/delete_relation_panel.phtml:27
 msgid "Delete"
 msgstr "Șterge"
 
@@ -2156,11 +2162,11 @@ msgid "No dependencies selected!"
 msgstr "Nici o dependenţă selectată!"
 
 #: js/messages.php:394 libraries/central_columns.lib.php:1214
-#: libraries/insert_edit.lib.php:1458 libraries/server_variables.lib.php:155
+#: libraries/insert_edit.lib.php:1456 libraries/server_variables.lib.php:155
 #: setup/frames/config.inc.php:42 setup/frames/index.inc.php:279
 #: templates/columns_definitions/column_definitions_form.phtml:165
-#: templates/gis_visualization/gis_visualization.phtml:48
-#: templates/tbl_relation/common_form.phtml:107
+#: templates/table/gis_visualization/gis_visualization.phtml:48
+#: templates/table/relation/common_form.phtml:107
 msgid "Save"
 msgstr "Salvează"
 
@@ -2241,8 +2247,8 @@ msgid "Data point content"
 msgstr "Mărime pointer date"
 
 #: js/messages.php:430 js/messages.php:562 js/messages.php:579
-#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2573
-#: templates/index_form.phtml:154 templates/index_form.phtml:194
+#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2571
+#: templates/table/index_form.phtml:154 templates/table/index_form.phtml:194
 msgid "Ignore"
 msgstr "Ignoră"
 
@@ -2303,8 +2309,8 @@ msgstr "Alegeți cheia străină"
 msgid "Please select the primary key or a unique key!"
 msgstr "Vă rugăm să alegeți cheia primară sau o cheie unică!"
 
-#: js/messages.php:457 templates/designer/side_menu.phtml:91
-#: templates/designer/side_menu.phtml:94
+#: js/messages.php:457 templates/database/designer/side_menu.phtml:91
+#: templates/database/designer/side_menu.phtml:94
 msgid "Choose column to display"
 msgstr "Selectează coloana pentru afișare"
 
@@ -2320,20 +2326,20 @@ msgstr ""
 msgid "Page name"
 msgstr "Numele paginii"
 
-#: js/messages.php:463 templates/designer/side_menu.phtml:56
-#: templates/designer/side_menu.phtml:59
+#: js/messages.php:463 templates/database/designer/side_menu.phtml:56
+#: templates/database/designer/side_menu.phtml:59
 msgid "Save page"
 msgstr "Salvează pagina"
 
-#: js/messages.php:464 templates/designer/side_menu.phtml:63
-#: templates/designer/side_menu.phtml:66
+#: js/messages.php:464 templates/database/designer/side_menu.phtml:63
+#: templates/database/designer/side_menu.phtml:66
 #, fuzzy
 #| msgid "Save page"
 msgid "Save page as"
 msgstr "Salvează pagina"
 
-#: js/messages.php:465 templates/designer/side_menu.phtml:49
-#: templates/designer/side_menu.phtml:52
+#: js/messages.php:465 templates/database/designer/side_menu.phtml:49
+#: templates/database/designer/side_menu.phtml:52
 msgid "Open page"
 msgstr "Pagina de deschidere"
 
@@ -2341,7 +2347,7 @@ msgstr "Pagina de deschidere"
 msgid "Delete page"
 msgstr "Șterge pagina"
 
-#: js/messages.php:467 templates/designer/side_menu.phtml:10
+#: js/messages.php:467 templates/database/designer/side_menu.phtml:10
 #, fuzzy
 #| msgid "*Untitled"
 msgid "Untitled"
@@ -2471,7 +2477,7 @@ msgstr "Textul original"
 msgid "cancel"
 msgstr "anulează"
 
-#: js/messages.php:499 libraries/server_status.lib.php:271
+#: js/messages.php:499 libraries/server_status.lib.php:280
 msgid "Aborted"
 msgstr "Întrerupt"
 
@@ -3080,7 +3086,7 @@ msgstr "Introduceţi un număr valid!"
 
 #: js/messages.php:793 libraries/Message.class.php:199
 #: libraries/Util.class.php:654 libraries/core.lib.php:245
-#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1172
+#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1170
 #: tbl_operations.php:229 view_operations.php:63
 msgid "Error"
 msgstr "Eroare"
@@ -3142,8 +3148,8 @@ msgstr "pe secundă"
 msgid "per minute"
 msgstr "pe minut"
 
-#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:143
-#: libraries/server_status.lib.php:228
+#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:152
+#: libraries/server_status.lib.php:237
 #: libraries/server_status_queries.lib.php:98
 msgid "per hour"
 msgstr "pe oră"
@@ -3163,7 +3169,7 @@ msgstr ""
 "Permisiuni greșite asupra fișierului de configurare, acesta nu ar trebui să "
 "aibă permisiuni de scriere pentru oricine!"
 
-#: libraries/Config.class.php:1799
+#: libraries/Config.class.php:1801
 msgid "Font size"
 msgstr "Dimensiune font"
 
@@ -3191,10 +3197,10 @@ msgstr "Reinterogare"
 #: libraries/server_privileges.lib.php:2890
 #: libraries/server_privileges.lib.php:3144
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4332
+#: libraries/server_privileges.lib.php:4358
 #: libraries/server_status_processes.lib.php:80
-#: templates/tbl_relation/foreign_key_row.phtml:165
-#: templates/tbl_relation/internal_relational_row.phtml:55
+#: templates/table/relation/foreign_key_row.phtml:165
+#: templates/table/relation/internal_relational_row.phtml:55
 msgid "Database"
 msgstr "Bază de date"
 
@@ -3288,11 +3294,11 @@ msgstr "Istoric"
 #: libraries/plugins/import/ImportMediawiki.class.php:60
 #: libraries/plugins/import/ImportOds.class.php:59
 #: libraries/plugins/import/ImportShp.class.php:57
-#: libraries/plugins/import/ImportSql.class.php:148
+#: libraries/plugins/import/ImportSql.class.php:51
 #: libraries/plugins/import/ImportXml.class.php:58
-#: libraries/rte/rte_routines.lib.php:833 templates/index_form.phtml:49
-#: templates/structure/row_stats_table.phtml:20
-#: templates/table/options.phtml:2
+#: libraries/rte/rte_routines.lib.php:924 templates/table/index_form.phtml:49
+#: templates/table/search/options.phtml:2
+#: templates/table/structure/row_stats_table.phtml:20
 msgid "Options"
 msgstr "Opțiuni"
 
@@ -3331,7 +3337,8 @@ msgstr "Descrescător"
 msgid "Order:"
 msgstr ""
 
-#: libraries/Console.class.php:289 templates/table/replace_preview.phtml:17
+#: libraries/Console.class.php:289
+#: templates/table/search/replace_preview.phtml:17
 msgid "Count"
 msgstr "Numără"
 
@@ -3440,9 +3447,9 @@ msgstr "Schimbă la tabela copiată"
 #: libraries/operations.lib.php:794 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:191
-#: templates/structure/sortable_header.phtml:21
-#: templates/structure/sortable_header.phtml:38
-#: templates/table/options.phtml:68
+#: templates/database/structure/sortable_header.phtml:21
+#: templates/database/structure/sortable_header.phtml:38
+#: templates/table/search/options.phtml:68
 msgid "Ascending"
 msgstr "Crescătoare"
 
@@ -3452,13 +3459,14 @@ msgstr "Crescătoare"
 #: libraries/operations.lib.php:797 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:188
-#: templates/structure/sortable_header.phtml:26
-#: templates/structure/sortable_header.phtml:43
-#: templates/table/options.phtml:69
+#: templates/database/structure/sortable_header.phtml:26
+#: templates/database/structure/sortable_header.phtml:43
+#: templates/table/search/options.phtml:69
 msgid "Descending"
 msgstr "Descrescător"
 
-#: libraries/DBQbe.class.php:467 templates/table/search_and_replace.phtml:6
+#: libraries/DBQbe.class.php:467
+#: templates/table/search/search_and_replace.phtml:6
 msgid "Column:"
 msgstr "Coloană:"
 
@@ -3622,12 +3630,12 @@ msgstr[1] "%s rezultat(e) în interiorul tabelului <i>%s</i>"
 msgstr[2] "%s rezultat(e) în interiorul tabelului <i>%s</i>"
 
 #: libraries/DbSearch.class.php:354 libraries/Menu.class.php:311
-#: libraries/Util.class.php:3337 libraries/Util.class.php:3347
-#: libraries/Util.class.php:3623 libraries/Util.class.php:3624
-#: libraries/Util.class.php:4343 libraries/config.values.php:43
+#: libraries/Util.class.php:3343 libraries/Util.class.php:3353
+#: libraries/Util.class.php:3629 libraries/Util.class.php:3630
+#: libraries/Util.class.php:4349 libraries/config.values.php:43
 #: libraries/config.values.php:51 libraries/config.values.php:119
 #: libraries/navigation/Nodes/Node_Table.class.php:295
-#: templates/structure/check_all_table_column.phtml:5
+#: templates/table/structure/check_all_table_column.phtml:5
 msgid "Browse"
 msgstr "Navigare"
 
@@ -3644,7 +3652,8 @@ msgstr "Caută în baza de date"
 msgid "Words or values to search for (wildcard: \"%\"):"
 msgstr "Cuvinte sau valori de căutat (metacaracter: \"%\"):"
 
-#: libraries/DbSearch.class.php:401 templates/table/search_and_replace.phtml:1
+#: libraries/DbSearch.class.php:401
+#: templates/table/search/search_and_replace.phtml:1
 msgid "Find:"
 msgstr "Găsește:"
 
@@ -3688,28 +3697,28 @@ msgstr "Filtrare înregistrări"
 msgid "Search this table"
 msgstr "Caută în tabelă"
 
-#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2532
-#: libraries/Util.class.php:2535
+#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2538
+#: libraries/Util.class.php:2541
 msgctxt "First page"
 msgid "Begin"
 msgstr "Început"
 
-#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2533
-#: libraries/Util.class.php:2536 libraries/server_bin_log.lib.php:170
+#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2539
+#: libraries/Util.class.php:2542 libraries/server_bin_log.lib.php:170
 #: libraries/server_bin_log.lib.php:172
 msgctxt "Previous page"
 msgid "Previous"
 msgstr "Anterior"
 
-#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2564
-#: libraries/Util.class.php:2574 libraries/server_bin_log.lib.php:204
+#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2570
+#: libraries/Util.class.php:2580 libraries/server_bin_log.lib.php:204
 #: libraries/server_bin_log.lib.php:206
 msgctxt "Next page"
 msgid "Next"
 msgstr "Următoarea"
 
-#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2565
-#: libraries/Util.class.php:2575
+#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2571
+#: libraries/Util.class.php:2581
 msgctxt "Last page"
 msgid "End"
 msgstr "Sfârșit"
@@ -3784,15 +3793,15 @@ msgid "May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]."
 msgstr "Poate fi aproximativ. Vezi [doc@faq3-11]FAQ 3.11[/doc]."
 
 #: libraries/DisplayResults.class.php:4332 libraries/Message.class.php:180
-#: libraries/controllers/TableRelationController.class.php:258
+#: libraries/controllers/TableRelationController.class.php:259
 #: libraries/controllers/TableSearchController.class.php:655
-#: libraries/rte/rte_routines.lib.php:1332 libraries/sql_query_form.lib.php:89
+#: libraries/rte/rte_routines.lib.php:1423 libraries/sql_query_form.lib.php:89
 #: tbl_operations.php:227 tbl_row_action.php:138 view_operations.php:62
 msgid "Your SQL query has been executed successfully."
 msgstr "Comanda SQL a fost executată cu succes."
 
 #: libraries/DisplayResults.class.php:4660
-#: libraries/controllers/StructureController.class.php:629
+#: libraries/controllers/DatabaseStructureController.class.php:564
 #, php-format
 msgid ""
 "This view has at least this number of rows. Please refer to %sdocumentation"
@@ -3815,33 +3824,33 @@ msgstr "%1$d în total, %2$d în interogare"
 msgid "%d total"
 msgstr "total de %d"
 
-#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1318
+#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1312
 #, php-format
 msgid "Query took %01.4f seconds."
 msgstr "Interogarea a durat %01.4f secunde."
 
 #: libraries/DisplayResults.class.php:4807
-#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4767
-#: libraries/Util.class.php:4773 libraries/mult_submits.inc.php:50
-#: templates/structure/check_all_tables.phtml:2
-#: templates/structure/check_all_tables.phtml:9
+#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4773
+#: libraries/Util.class.php:4779 libraries/mult_submits.inc.php:50
+#: templates/database/structure/check_all_tables.phtml:2
+#: templates/database/structure/check_all_tables.phtml:9
 msgid "With selected:"
 msgstr "Cele bifate:"
 
 #: libraries/DisplayResults.class.php:4811
-#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4769
-#: libraries/Util.class.php:4770 libraries/server_privileges.lib.php:1174
+#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4775
+#: libraries/Util.class.php:4776 libraries/server_privileges.lib.php:1174
 #: libraries/server_privileges.lib.php:1175
 #: libraries/server_privileges.lib.php:1387
 #: libraries/server_user_groups.lib.php:231
-#: templates/structure/check_all_tables.phtml:3
-#: templates/structure/check_all_tables.phtml:4
+#: templates/database/structure/check_all_tables.phtml:3
+#: templates/database/structure/check_all_tables.phtml:4
 msgid "Check All"
 msgstr "Marchează toate"
 
 #: libraries/DisplayResults.class.php:4985 libraries/Header.class.php:383
-#: templates/structure/optional_action_links.phtml:1
-#: templates/structure/print_view_data_dictionary_link.phtml:3
+#: templates/database/structure/print_view_data_dictionary_link.phtml:3
+#: templates/table/structure/optional_action_links.phtml:1
 msgid "Print view"
 msgstr "Vizualizare imprimare"
 
@@ -3849,7 +3858,8 @@ msgstr "Vizualizare imprimare"
 msgid "Query results operations"
 msgstr "Operațiuni asupra rezultatelor interogării"
 
-#: libraries/DisplayResults.class.php:5105 templates/tbl_chart.phtml:12
+#: libraries/DisplayResults.class.php:5105
+#: templates/table/chart/tbl_chart.phtml:12
 msgid "Display chart"
 msgstr "Arată diagramă"
 
@@ -3943,7 +3953,7 @@ msgid "Click on the bar to scroll to top of page"
 msgstr "Faceţi click pe bară pentru a defila la partea de sus a paginii"
 
 #: libraries/Header.class.php:749
-#: libraries/plugins/auth/AuthenticationCookie.class.php:152
+#: libraries/plugins/auth/AuthenticationCookie.class.php:140
 msgid "Javascript must be enabled past this point!"
 msgstr "Trebuie să aveți activat Javascript!"
 
@@ -3965,11 +3975,11 @@ msgid "Keyname"
 msgstr "Nume cheie"
 
 #: libraries/Index.class.php:697
-#: libraries/controllers/StructureController.class.php:1962
-#: libraries/controllers/StructureController.class.php:1967
+#: libraries/controllers/TableStructureController.class.php:953
+#: libraries/controllers/TableStructureController.class.php:958
 #: libraries/tracking.lib.php:973
 #: templates/columns_definitions/column_indexes.phtml:11
-#: templates/structure/check_all_table_column.phtml:26
+#: templates/table/structure/check_all_table_column.phtml:26
 msgid "Unique"
 msgstr "Unic"
 
@@ -3988,16 +3998,17 @@ msgstr "Cardinalitate"
 #: libraries/server_collations.lib.php:35 libraries/tracking.lib.php:881
 #: libraries/tracking.lib.php:977
 #: templates/columns_definitions/table_fields_definitions.phtml:33
-#: templates/structure/row_stats_table.phtml:31
-#: templates/structure/table_header.phtml:55
-#: templates/structure/table_structure_header.phtml:7
-#: templates/table/table_header.phtml:8
+#: templates/database/structure/table_header.phtml:55
+#: templates/table/search/table_header.phtml:8
+#: templates/table/structure/row_stats_table.phtml:31
+#: templates/table/structure/table_structure_header.phtml:7
 msgid "Collation"
 msgstr "Interclasare"
 
 #: libraries/Index.class.php:703 libraries/rte/rte_events.lib.php:496
-#: libraries/rte/rte_routines.lib.php:956 libraries/tracking.lib.php:885
-#: libraries/tracking.lib.php:979 templates/structure/table_header.phtml:84
+#: libraries/rte/rte_routines.lib.php:1047 libraries/tracking.lib.php:885
+#: libraries/tracking.lib.php:979
+#: templates/database/structure/table_header.phtml:84
 msgid "Comment"
 msgstr "Comentariu"
 
@@ -4010,15 +4021,15 @@ msgstr "Cheia primară a fost aruncată."
 msgid "Index %s has been dropped."
 msgstr "Indexul %s a fost aruncat."
 
-#: libraries/Index.class.php:757 libraries/Util.class.php:3630
-#: libraries/Util.class.php:3631
-#: libraries/controllers/StructureController.class.php:1958
-#: libraries/controllers/StructureController.class.php:1959
+#: libraries/Index.class.php:757 libraries/Util.class.php:3636
+#: libraries/Util.class.php:3637
+#: libraries/controllers/TableStructureController.class.php:949
+#: libraries/controllers/TableStructureController.class.php:950
 #: libraries/operations.lib.php:1607 libraries/rte/rte_list.lib.php:150
 #: libraries/server_databases.lib.php:146
-#: templates/structure/check_all_table_column.phtml:15
-#: templates/structure/check_all_tables.phtml:16
-#: templates/tbl_relation/foreign_key_row.phtml:93
+#: templates/database/structure/check_all_tables.phtml:16
+#: templates/table/relation/foreign_key_row.phtml:93
+#: templates/table/structure/check_all_table_column.phtml:15
 msgid "Drop"
 msgstr "Aruncă"
 
@@ -4049,16 +4060,16 @@ msgstr "Server"
 #: libraries/Menu.class.php:248
 #: libraries/navigation/Nodes/Node_View.class.php:32
 #: libraries/tbl_info.inc.php:63
-#: templates/structure/structure_table_row.phtml:97
-#: templates/structure/structure_table_row.phtml:159
+#: templates/database/structure/structure_table_row.phtml:97
+#: templates/database/structure/structure_table_row.phtml:159
 msgid "View"
 msgstr "Vizualizare"
 
 #: libraries/Menu.class.php:325 libraries/Menu.class.php:429
-#: libraries/Menu.class.php:548 libraries/Util.class.php:3334
-#: libraries/Util.class.php:3344 libraries/Util.class.php:3350
-#: libraries/Util.class.php:4313 libraries/Util.class.php:4328
-#: libraries/Util.class.php:4345 libraries/config.values.php:40
+#: libraries/Menu.class.php:548 libraries/Util.class.php:3340
+#: libraries/Util.class.php:3350 libraries/Util.class.php:3356
+#: libraries/Util.class.php:4319 libraries/Util.class.php:4334
+#: libraries/Util.class.php:4351 libraries/config.values.php:40
 #: libraries/config.values.php:48 libraries/config.values.php:110
 #: libraries/config.values.php:116 libraries/config/messages.inc.php:321
 #: libraries/navigation/Nodes/Node_Table.class.php:292
@@ -4066,19 +4077,19 @@ msgid "SQL"
 msgstr "SQL"
 
 #: libraries/Menu.class.php:328 libraries/Menu.class.php:432
-#: libraries/Util.class.php:3335 libraries/Util.class.php:3345
-#: libraries/Util.class.php:3351 libraries/Util.class.php:3625
-#: libraries/Util.class.php:3626 libraries/Util.class.php:4329
-#: libraries/Util.class.php:4346 libraries/config.values.php:41
+#: libraries/Util.class.php:3341 libraries/Util.class.php:3351
+#: libraries/Util.class.php:3357 libraries/Util.class.php:3631
+#: libraries/Util.class.php:3632 libraries/Util.class.php:4335
+#: libraries/Util.class.php:4352 libraries/config.values.php:41
 #: libraries/config.values.php:49 libraries/config.values.php:111
 #: libraries/config.values.php:117
 #: libraries/navigation/Nodes/Node_Table.class.php:286
 msgid "Search"
 msgstr "Caută"
 
-#: libraries/Menu.class.php:338 libraries/Util.class.php:3336
-#: libraries/Util.class.php:3346 libraries/Util.class.php:3627
-#: libraries/Util.class.php:3628 libraries/Util.class.php:4347
+#: libraries/Menu.class.php:338 libraries/Util.class.php:3342
+#: libraries/Util.class.php:3352 libraries/Util.class.php:3633
+#: libraries/Util.class.php:3634 libraries/Util.class.php:4353
 #: libraries/config.values.php:42 libraries/config.values.php:50
 #: libraries/config.values.php:118
 #: libraries/navigation/Nodes/Node_Table.class.php:289
@@ -4087,30 +4098,30 @@ msgid "Insert"
 msgstr "Inserare"
 
 #: libraries/Menu.class.php:362 libraries/Menu.class.php:467
-#: libraries/Util.class.php:4334 libraries/Util.class.php:4350
+#: libraries/Util.class.php:4340 libraries/Util.class.php:4356
 #: libraries/config.values.php:106 libraries/server_common.lib.php:51
 #: libraries/server_privileges.lib.php:2370
 #: libraries/server_privileges.lib.php:3158
-#: libraries/server_privileges.lib.php:4221
+#: libraries/server_privileges.lib.php:4247
 msgid "Privileges"
 msgstr "Drepturi de acces"
 
 #: libraries/Menu.class.php:371 libraries/Menu.class.php:379
-#: libraries/Menu.class.php:459 libraries/Util.class.php:3338
-#: libraries/Util.class.php:3352 libraries/Util.class.php:4333
-#: libraries/Util.class.php:4351 libraries/config.values.php:112
+#: libraries/Menu.class.php:459 libraries/Util.class.php:3344
+#: libraries/Util.class.php:3358 libraries/Util.class.php:4339
+#: libraries/Util.class.php:4357 libraries/config.values.php:112
 #: view_operations.php:92
 msgid "Operations"
 msgstr "Operații"
 
 #: libraries/Menu.class.php:384 libraries/Menu.class.php:492
-#: libraries/Util.class.php:4338 libraries/Util.class.php:4352
+#: libraries/Util.class.php:4344 libraries/Util.class.php:4358
 #: libraries/relation.lib.php:255
 msgid "Tracking"
 msgstr "Urmărire"
 
 #: libraries/Menu.class.php:397 libraries/Menu.class.php:486
-#: libraries/Util.class.php:4337 libraries/Util.class.php:4353
+#: libraries/Util.class.php:4343 libraries/Util.class.php:4359
 #: libraries/navigation/Nodes/Node_Trigger_Container.class.php:24
 #: libraries/plugins/export/ExportHtmlword.class.php:557
 #: libraries/plugins/export/ExportOdt.class.php:685
@@ -4127,16 +4138,16 @@ msgstr "Declanșatori"
 msgid "Database seems to be empty!"
 msgstr "Baza de date pare a fi goală!"
 
-#: libraries/Menu.class.php:439 libraries/Util.class.php:4330
+#: libraries/Menu.class.php:439 libraries/Util.class.php:4336
 msgid "Query"
 msgstr "Interogare prin exemplu"
 
-#: libraries/Menu.class.php:472 libraries/Util.class.php:4335
+#: libraries/Menu.class.php:472 libraries/Util.class.php:4341
 #: libraries/rte/rte_words.lib.php:36
 msgid "Routines"
 msgstr "Rutine"
 
-#: libraries/Menu.class.php:479 libraries/Util.class.php:4336
+#: libraries/Menu.class.php:479 libraries/Util.class.php:4342
 #: libraries/navigation/Nodes/Node_Event_Container.class.php:26
 #: libraries/plugins/export/ExportSql.class.php:940
 #: libraries/plugins/export/ExportXml.class.php:107
@@ -4144,20 +4155,20 @@ msgstr "Rutine"
 msgid "Events"
 msgstr "Evenimente"
 
-#: libraries/Menu.class.php:498 libraries/Util.class.php:4339
+#: libraries/Menu.class.php:498 libraries/Util.class.php:4345
 msgid "Designer"
 msgstr "Designer"
 
-#: libraries/Menu.class.php:507 libraries/Util.class.php:4340
-#: templates/structure/check_all_tables.phtml:35
+#: libraries/Menu.class.php:507 libraries/Util.class.php:4346
+#: templates/database/structure/check_all_tables.phtml:35
 msgid "Central columns"
 msgstr "Coloane centrale"
 
-#: libraries/Menu.class.php:544 libraries/Util.class.php:4312
+#: libraries/Menu.class.php:544 libraries/Util.class.php:4318
 #: libraries/config.values.php:103 libraries/config/messages.inc.php:266
 #: libraries/config/messages.inc.php:341
 #: libraries/navigation/NavigationTree.class.php:1239
-#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4332
+#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4358
 msgid "Databases"
 msgstr "Baze de date"
 
@@ -4168,34 +4179,34 @@ msgid "User accounts"
 msgstr "Utilizatori"
 
 #: libraries/Menu.class.php:595 libraries/ServerStatusData.class.php:121
-#: libraries/Util.class.php:4319 libraries/server_common.lib.php:36
+#: libraries/Util.class.php:4325 libraries/server_common.lib.php:36
 msgid "Binary log"
 msgstr "Jurnal binar"
 
 #: libraries/Menu.class.php:601 libraries/ServerStatusData.class.php:126
-#: libraries/Util.class.php:4320 libraries/server_common.lib.php:42
-#: templates/structure/body_for_table_summary.phtml:10
-#: templates/structure/table_header.phtml:27
+#: libraries/Util.class.php:4326 libraries/server_common.lib.php:42
+#: templates/database/structure/body_for_table_summary.phtml:10
+#: templates/database/structure/table_header.phtml:27
 msgid "Replication"
 msgstr "Replicare"
 
 #: libraries/Menu.class.php:606 libraries/ServerStatusData.class.php:193
-#: libraries/Util.class.php:4321 libraries/config.values.php:105
+#: libraries/Util.class.php:4327 libraries/config.values.php:105
 #: libraries/server_engines.lib.php:108 libraries/server_engines.lib.php:112
 #: libraries/sql_query_form.lib.php:421
 msgid "Variables"
 msgstr "Variabile"
 
-#: libraries/Menu.class.php:610 libraries/Util.class.php:4322
+#: libraries/Menu.class.php:610 libraries/Util.class.php:4328
 msgid "Charsets"
 msgstr "Seturi de caractere"
 
-#: libraries/Menu.class.php:615 libraries/Util.class.php:4323
+#: libraries/Menu.class.php:615 libraries/Util.class.php:4329
 #: libraries/server_common.lib.php:33 libraries/server_plugins.lib.php:27
 msgid "Plugins"
 msgstr "Extensii"
 
-#: libraries/Menu.class.php:626 libraries/Util.class.php:4324
+#: libraries/Menu.class.php:626 libraries/Util.class.php:4330
 msgid "Engines"
 msgstr "Motoare"
 
@@ -4223,7 +4234,7 @@ msgstr[0] "%1$d rânduri inserate."
 msgstr[1] "%1$d rând inserat."
 msgstr[2] "%1$d rânduri inserate."
 
-#: libraries/PDF.class.php:70 libraries/Util.class.php:2521
+#: libraries/PDF.class.php:70 libraries/Util.class.php:2527
 #: libraries/browse_foreigners.lib.php:327
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:865
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:890
@@ -4244,7 +4255,7 @@ msgid "Could not save favorite table!"
 msgstr "Nu s-a putut salva tabelul favorit!"
 
 #: libraries/RecentFavoriteTable.class.php:212
-#: templates/structure/favorite_anchor.phtml:12
+#: templates/database/structure/favorite_anchor.phtml:12
 msgid "Remove from Favorites"
 msgstr "Elimină de la favorite"
 
@@ -4415,7 +4426,7 @@ msgstr ""
 "stocare."
 
 #: libraries/StorageEngine.class.php:373
-#: templates/structure/body_for_table_summary.phtml:50
+#: templates/database/structure/body_for_table_summary.phtml:50
 #, php-format
 msgid "%s is the default storage engine on this MySQL server."
 msgstr "%s este motorul de stocare stabilit implicit pe acest server MySQL."
@@ -4868,10 +4879,10 @@ msgstr ""
 
 #: libraries/Util.class.php:726 libraries/rte/rte_events.lib.php:110
 #: libraries/rte/rte_events.lib.php:119 libraries/rte/rte_events.lib.php:150
-#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:153
-#: libraries/rte/rte_routines.lib.php:162
-#: libraries/rte/rte_routines.lib.php:235
-#: libraries/rte/rte_routines.lib.php:1366
+#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:223
+#: libraries/rte/rte_routines.lib.php:250
+#: libraries/rte/rte_routines.lib.php:372
+#: libraries/rte/rte_routines.lib.php:1457
 #: libraries/rte/rte_triggers.lib.php:86 libraries/rte/rte_triggers.lib.php:95
 #: libraries/rte/rte_triggers.lib.php:127
 msgid "MySQL said: "
@@ -4917,75 +4928,78 @@ msgstr "Dum"
 msgid "%B %d, %Y at %I:%M %p"
 msgstr "%d %B %Y la %H:%M"
 
-#: libraries/Util.class.php:2019
+#: libraries/Util.class.php:2025
 #, php-format
 msgid "%s days, %s hours, %s minutes and %s seconds"
 msgstr "%s zile, %s ore, %s minute și %s secunde"
 
-#: libraries/Util.class.php:2112
+#: libraries/Util.class.php:2118
 msgid "Missing parameter:"
 msgstr "Parametru lipsă:"
 
-#: libraries/Util.class.php:2645
+#: libraries/Util.class.php:2651
 #, php-format
 msgid "Jump to database \"%s\"."
 msgstr "Sari la baza de date \"%s\"."
 
-#: libraries/Util.class.php:2670
+#: libraries/Util.class.php:2676
 #, php-format
 msgid "The %s functionality is affected by a known bug, see %s"
 msgstr "Funcționalitatea %s este afectată de o eroare cunoscută, vedeți %s"
 
-#: libraries/Util.class.php:2881
+#: libraries/Util.class.php:2887
 msgid "Click to toggle"
 msgstr "Faceţi click pentru a comuta"
 
-#: libraries/Util.class.php:3542 prefs_manage.php:248
+#: libraries/Util.class.php:3548 prefs_manage.php:248
 msgid "Browse your computer:"
 msgstr "Caută în calculatorul tău:"
 
-#: libraries/Util.class.php:3567
+#: libraries/Util.class.php:3573
 #, php-format
 msgid "Select from the web server upload directory <b>%s</b>:"
 msgstr "Selectați de pe serverul web un director <b>%s</b>: pentru încărcări:"
 
-#: libraries/Util.class.php:3596 libraries/insert_edit.lib.php:1173
+#: libraries/Util.class.php:3602 libraries/insert_edit.lib.php:1171
 msgid "The directory you set for upload work cannot be reached."
 msgstr "Directorul stabilit pentru încărcare nu poate fi găsit."
 
-#: libraries/Util.class.php:3607
+#: libraries/Util.class.php:3613
 msgid "There are no files to upload!"
 msgstr "Nu sunt fișiere pentru încărcare!"
 
-#: libraries/Util.class.php:3632 libraries/Util.class.php:3633
-#: templates/structure/check_all_tables.phtml:15
+#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: templates/database/structure/check_all_tables.phtml:15
 msgid "Empty"
 msgstr "Golește"
 
-#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: libraries/Util.class.php:3644 libraries/Util.class.php:3645
 msgid "Execute"
 msgstr "Execută"
 
-#: libraries/Util.class.php:4152
+#: libraries/Util.class.php:4158
 msgid "Print"
 msgstr "Listare"
 
-#: libraries/Util.class.php:4257 templates/structure/row_stats_table.phtml:80
-#: templates/structure/table_header.phtml:95
+#: libraries/Util.class.php:4263
+#: templates/database/structure/table_header.phtml:95
+#: templates/table/structure/row_stats_table.phtml:80
 msgid "Creation"
 msgstr "Creare"
 
-#: libraries/Util.class.php:4263 templates/structure/row_stats_table.phtml:87
-#: templates/structure/table_header.phtml:106
+#: libraries/Util.class.php:4269
+#: templates/database/structure/table_header.phtml:106
+#: templates/table/structure/row_stats_table.phtml:87
 msgid "Last update"
 msgstr "Ultima actualizare"
 
-#: libraries/Util.class.php:4269 templates/structure/row_stats_table.phtml:94
-#: templates/structure/table_header.phtml:117
+#: libraries/Util.class.php:4275
+#: templates/database/structure/table_header.phtml:117
+#: templates/table/structure/row_stats_table.phtml:94
 msgid "Last check"
 msgstr "Ultima verficare"
 
-#: libraries/Util.class.php:4315
+#: libraries/Util.class.php:4321
 msgid "Users"
 msgstr "Utilizatori"
 
@@ -5006,16 +5020,16 @@ msgid "Use this value"
 msgstr "Folosește această valoare"
 
 #: libraries/build_html_for_db.lib.php:33 libraries/import.lib.php:193
-#: templates/structure/actions_in_table_structure.phtml:113
-#: templates/structure/row_stats_table.phtml:42
-#: templates/structure/table_header.phtml:36
+#: templates/database/structure/table_header.phtml:36
+#: templates/table/structure/actions_in_table_structure.phtml:113
+#: templates/table/structure/row_stats_table.phtml:42
 msgid "Rows"
 msgstr "Rânduri"
 
 #: libraries/build_html_for_db.lib.php:48 libraries/engines/innodb.lib.php:171
-#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:186
-#: libraries/server_status.lib.php:298
-#: templates/structure/display_table_stats.phtml:40
+#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:195
+#: libraries/server_status.lib.php:307
+#: templates/table/structure/display_table_stats.phtml:40
 msgid "Total"
 msgstr "Total"
 
@@ -5024,10 +5038,12 @@ msgid "Jump to database"
 msgstr "Sari la baza de date"
 
 #: libraries/build_html_for_db.lib.php:146
+#: templates/database/structure/structure_table_row.phtml:15
 msgid "Not replicated"
 msgstr "Fără replicare"
 
 #: libraries/build_html_for_db.lib.php:158
+#: templates/database/structure/structure_table_row.phtml:16
 msgid "Replicated"
 msgstr "Replicat"
 
@@ -5080,17 +5096,17 @@ msgstr ""
 #: libraries/plugins/export/ExportTexytext.class.php:425
 #: libraries/plugins/export/PMA_ExportPdf.class.php:307
 #: libraries/rte/rte_list.lib.php:73 libraries/rte/rte_list.lib.php:85
-#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:830
-#: libraries/rte/rte_routines.lib.php:1492 setup/frames/index.inc.php:162
+#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:921
+#: libraries/rte/rte_routines.lib.php:1583 setup/frames/index.inc.php:162
 #: templates/columns_definitions/table_fields_definitions.phtml:8
-#: templates/structure/table_structure_header.phtml:5
-#: templates/table/create_table.phtml:11
+#: templates/database/create_table.phtml:11
+#: templates/table/structure/table_structure_header.phtml:5
 msgid "Name"
 msgstr "Nume"
 
 #: libraries/central_columns.lib.php:699
 #: libraries/central_columns.lib.php:1381
-#: libraries/rte/rte_routines.lib.php:832
+#: libraries/rte/rte_routines.lib.php:923
 #: templates/columns_definitions/table_fields_definitions.phtml:14
 msgid "Length/Values"
 msgstr "Lungime/Setare"
@@ -5111,7 +5127,7 @@ msgid "Select a table"
 msgstr "Selectaţi un tabel"
 
 #: libraries/central_columns.lib.php:804
-#: templates/structure/add_column.phtml:4
+#: templates/table/structure/add_column.phtml:4
 msgid "Add column"
 msgstr "Adaugă coloană"
 
@@ -5127,7 +5143,7 @@ msgstr "Adăugați o coloană nouă"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1002
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1025
 #: templates/columns_definitions/table_fields_definitions.phtml:36
-#: templates/structure/table_structure_header.phtml:8
+#: templates/table/structure/table_structure_header.phtml:8
 msgid "Attributes"
 msgstr "Proprietăți"
 
@@ -5244,7 +5260,7 @@ msgid "Double click"
 msgstr "Click dublu"
 
 #: libraries/config.values.php:95 libraries/config.values.php:124
-#: libraries/config/FormDisplay.tpl.php:221 libraries/relation.lib.php:97
+#: libraries/config/FormDisplay.tpl.php:232 libraries/relation.lib.php:97
 #: libraries/relation.lib.php:105
 msgid "Disabled"
 msgstr "Dezactivat"
@@ -5426,23 +5442,23 @@ msgstr ""
 msgid "maximum %s"
 msgstr "maxim %s"
 
-#: libraries/config/FormDisplay.tpl.php:219
+#: libraries/config/FormDisplay.tpl.php:230
 msgid "This setting is disabled, it will not be applied to your configuration."
 msgstr ""
 "Această setare este dezactivată, nu va fi aplicată la configurarea "
 "dumneavoastră."
 
-#: libraries/config/FormDisplay.tpl.php:313
+#: libraries/config/FormDisplay.tpl.php:324
 #, php-format
 msgid "Set value: %s"
 msgstr "Seteaza valoarea: %s"
 
-#: libraries/config/FormDisplay.tpl.php:318
+#: libraries/config/FormDisplay.tpl.php:329
 #: libraries/config/messages.inc.php:610
 msgid "Restore default value"
 msgstr "Restaurează valoarea implicită"
 
-#: libraries/config/FormDisplay.tpl.php:332
+#: libraries/config/FormDisplay.tpl.php:343
 msgid "Allow users to customize this value"
 msgstr "Permite utilizatorilor să personalizeze această valoare"
 
@@ -5917,7 +5933,7 @@ msgstr "Setul de caractere al fișierului"
 
 #: libraries/config/messages.inc.php:136 libraries/config/messages.inc.php:152
 #: libraries/sql_query_form.lib.php:247
-#: templates/structure/row_stats_table.phtml:7
+#: templates/table/structure/row_stats_table.phtml:7
 msgid "Format"
 msgstr "Format"
 
@@ -6468,7 +6484,7 @@ msgstr ""
 
 #: libraries/config/messages.inc.php:332
 #: libraries/plugins/export/ExportPdf.class.php:279
-#: templates/structure/secondary_tabs.phtml:8
+#: templates/table/secondary_tabs.phtml:8
 #, fuzzy
 #| msgid "Database for user"
 msgid "Table structure"
@@ -8528,111 +8544,35 @@ msgstr "Microsoft Word 2000"
 msgid "OpenDocument Text"
 msgstr "Text Open Document"
 
-#: libraries/controllers/StructureController.class.php:465
+#: libraries/controllers/DatabaseStructureController.class.php:405
 #: tbl_operations.php:382
 #, php-format
 msgid "Table %s has been emptied."
 msgstr "Tabelul %s a fost golit."
 
-#: libraries/controllers/StructureController.class.php:486
+#: libraries/controllers/DatabaseStructureController.class.php:426
 #: tbl_operations.php:400 view_operations.php:119
 #, fuzzy, php-format
 #| msgid "View %s has been dropped."
 msgid "View %s has been dropped."
 msgstr "Vizualizarea %s a fost eliminată"
 
-#: libraries/controllers/StructureController.class.php:487
+#: libraries/controllers/DatabaseStructureController.class.php:427
 #: tbl_operations.php:401
 #, fuzzy, php-format
 #| msgid "Table %s has been dropped."
 msgid "Table %s has been dropped."
 msgstr "Tabelul %s a fost aruncat"
 
-#: libraries/controllers/StructureController.class.php:797
-#, php-format
-msgid "The name '%s' is a MySQL reserved keyword."
-msgid_plural "The names '%s' are MySQL reserved keywords."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: libraries/controllers/StructureController.class.php:875
-msgid "No column selected."
-msgstr "Nicio coloană aleasă."
-
-#: libraries/controllers/StructureController.class.php:1049
+#: libraries/controllers/DatabaseStructureController.class.php:733
 msgid "Favorite List is full!"
 msgstr "Lista favoritelor este plină!"
 
-#: libraries/controllers/StructureController.class.php:1272
-#, fuzzy
-#| msgid "The selected users have been deleted successfully."
-msgid "The columns have been moved successfully."
-msgstr "Utilizatorii selectați au fost eliminați."
-
-#: libraries/controllers/StructureController.class.php:1535
-#, fuzzy, php-format
-#| msgid "Table %1$s has been altered successfully."
-msgid ""
-"Table %1$s has been altered successfully. Privileges have been adjusted."
-msgstr "Tabelul %1$s a fost alterat cu succes."
-
-#: libraries/controllers/StructureController.class.php:1541
-#: libraries/controllers/TableIndexesController.class.php:161
-#: tbl_addfield.php:92
-#, php-format
-msgid "Table %1$s has been altered successfully."
-msgstr "Tabelul %1$s a fost alterat cu succes."
-
-#: libraries/controllers/StructureController.class.php:1588
-#: libraries/tracking.lib.php:1094
-#, fuzzy
-#| msgid "Query type"
-msgid "Query error"
-msgstr "Tip interogare"
-
-#: libraries/controllers/StructureController.class.php:1806
+#: libraries/controllers/DatabaseStructureController.class.php:947
 #: libraries/mysql_charsets.lib.php:366 libraries/mysql_charsets.lib.php:373
 msgid "unknown"
 msgstr "necunoscut"
 
-#: libraries/controllers/StructureController.class.php:1957
-#: templates/structure/check_all_table_column.phtml:11
-msgid "Change"
-msgstr "Schimbă"
-
-#: libraries/controllers/StructureController.class.php:1961
-#: libraries/controllers/StructureController.class.php:1966
-#: libraries/navigation/Nodes/Node_Index.class.php:30
-#: libraries/tracking.lib.php:926
-#: templates/columns_definitions/column_indexes.phtml:16
-#: templates/columns_definitions/table_fields_definitions.phtml:57
-#: templates/structure/check_all_table_column.phtml:30
-#: templates/structure/display_structure.phtml:79
-#: templates/structure/display_table_stats.phtml:19
-msgid "Index"
-msgstr "Index"
-
-#: libraries/controllers/StructureController.class.php:1963
-#: libraries/controllers/StructureController.class.php:1968
-#: templates/columns_definitions/column_indexes.phtml:27
-#: templates/structure/check_all_table_column.phtml:37
-msgid "Spatial"
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1964
-#: libraries/controllers/StructureController.class.php:1969
-#: templates/columns_definitions/column_indexes.phtml:22
-#: templates/structure/check_all_table_column.phtml:47
-msgid "Fulltext"
-msgstr "Tot textul"
-
-#: libraries/controllers/StructureController.class.php:1970
-#, fuzzy
-#| msgid "Browse distinct values"
-msgid "Distinct values"
-msgstr "Răsfoiește valori distincte"
-
 #: libraries/controllers/TableChartController.class.php:82
 #: libraries/controllers/TableGisVisualizationController.class.php:101
 msgid "No SQL query was set to fetch data."
@@ -8646,13 +8586,20 @@ msgstr ""
 msgid "No data to display"
 msgstr "Nu sînt date de afișat"
 
-#: libraries/controllers/TableRelationController.class.php:217
+#: libraries/controllers/TableIndexesController.class.php:161
+#: libraries/controllers/TableStructureController.class.php:736
+#: tbl_addfield.php:92
+#, php-format
+msgid "Table %1$s has been altered successfully."
+msgstr "Tabelul %1$s a fost alterat cu succes."
+
+#: libraries/controllers/TableRelationController.class.php:218
 #, fuzzy
 #| msgid "Thread %s was successfully killed."
 msgid "Display column was successfully updated."
 msgstr "Firul de execuție %s a fost oprit cu succes."
 
-#: libraries/controllers/TableRelationController.class.php:283
+#: libraries/controllers/TableRelationController.class.php:288
 #, fuzzy
 #| msgid "Internal relation added"
 msgid "Internal relations were successfully updated."
@@ -8671,12 +8618,81 @@ msgid "Zoom search"
 msgstr "Caută"
 
 #: libraries/controllers/TableSearchController.class.php:852
-#: templates/table/selection_form.phtml:59
+#: templates/table/search/selection_form.phtml:59
 #, fuzzy
 #| msgid "Find and Replace"
 msgid "Find and replace"
 msgstr "Caută şi Înlocuieşte"
 
+#: libraries/controllers/TableStructureController.class.php:163
+#, php-format
+msgid "The name '%s' is a MySQL reserved keyword."
+msgid_plural "The names '%s' are MySQL reserved keywords."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: libraries/controllers/TableStructureController.class.php:241
+msgid "No column selected."
+msgstr "Nicio coloană aleasă."
+
+#: libraries/controllers/TableStructureController.class.php:467
+#, fuzzy
+#| msgid "The selected users have been deleted successfully."
+msgid "The columns have been moved successfully."
+msgstr "Utilizatorii selectați au fost eliminați."
+
+#: libraries/controllers/TableStructureController.class.php:730
+#, fuzzy, php-format
+#| msgid "Table %1$s has been altered successfully."
+msgid ""
+"Table %1$s has been altered successfully. Privileges have been adjusted."
+msgstr "Tabelul %1$s a fost alterat cu succes."
+
+#: libraries/controllers/TableStructureController.class.php:783
+#: libraries/tracking.lib.php:1094
+#, fuzzy
+#| msgid "Query type"
+msgid "Query error"
+msgstr "Tip interogare"
+
+#: libraries/controllers/TableStructureController.class.php:948
+#: templates/table/structure/check_all_table_column.phtml:11
+msgid "Change"
+msgstr "Schimbă"
+
+#: libraries/controllers/TableStructureController.class.php:952
+#: libraries/controllers/TableStructureController.class.php:957
+#: libraries/navigation/Nodes/Node_Index.class.php:30
+#: libraries/tracking.lib.php:926
+#: templates/columns_definitions/column_indexes.phtml:16
+#: templates/columns_definitions/table_fields_definitions.phtml:57
+#: templates/table/structure/check_all_table_column.phtml:30
+#: templates/table/structure/display_structure.phtml:79
+#: templates/table/structure/display_table_stats.phtml:19
+msgid "Index"
+msgstr "Index"
+
+#: libraries/controllers/TableStructureController.class.php:954
+#: libraries/controllers/TableStructureController.class.php:959
+#: templates/columns_definitions/column_indexes.phtml:27
+#: templates/table/structure/check_all_table_column.phtml:37
+msgid "Spatial"
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:955
+#: libraries/controllers/TableStructureController.class.php:960
+#: templates/columns_definitions/column_indexes.phtml:22
+#: templates/table/structure/check_all_table_column.phtml:47
+msgid "Fulltext"
+msgstr "Tot textul"
+
+#: libraries/controllers/TableStructureController.class.php:963
+#, fuzzy
+#| msgid "Browse distinct values"
+msgid "Distinct values"
+msgstr "Răsfoiește valori distincte"
+
 #: libraries/core.lib.php:306
 #, php-format
 msgid "The %s extension is missing. Please check your PHP configuration."
@@ -8725,7 +8741,7 @@ msgid "No Password"
 msgstr "Nu există parolă"
 
 #: libraries/display_change_password.lib.php:68
-#: libraries/plugins/auth/AuthenticationCookie.class.php:199
+#: libraries/plugins/auth/AuthenticationCookie.class.php:187
 #: libraries/replication_gui.lib.php:422 libraries/replication_gui.lib.php:862
 #: libraries/server_privileges.lib.php:1640
 msgid "Password:"
@@ -9579,12 +9595,12 @@ msgid "Dump has been saved to file %s."
 msgstr "Copia a fost salvată în fișierul %s."
 
 #: libraries/import.lib.php:202 libraries/insert_edit.lib.php:124
-#: libraries/rte/rte_routines.lib.php:1353 libraries/sql.lib.php:1312
+#: libraries/rte/rte_routines.lib.php:1444 libraries/sql.lib.php:1306
 #: tbl_get_field.php:44
 msgid "MySQL returned an empty result set (i.e. zero rows)."
 msgstr "MySQL a dat un set de rezultate gol (zero linii)."
 
-#: libraries/import.lib.php:265 libraries/sql.lib.php:1326
+#: libraries/import.lib.php:265 libraries/sql.lib.php:1320
 msgid "[ROLLBACK occurred.]"
 msgstr ""
 
@@ -9651,14 +9667,14 @@ msgstr "Creează un index pe&nbsp;%s&nbsp;coloană"
 
 #: libraries/insert_edit.lib.php:233
 #: libraries/navigation/Nodes/Node_DatabaseChild.class.php:48
-#: templates/designer/table_list.phtml:40
+#: templates/database/designer/table_list.phtml:40
 msgid "Hide"
 msgstr "Ascunde"
 
 #: libraries/insert_edit.lib.php:249
 #: libraries/navigation/Nodes/Node_Function.class.php:32
-#: libraries/rte/rte_routines.lib.php:1495
-#: templates/table/table_header.phtml:4
+#: libraries/rte/rte_routines.lib.php:1586
+#: templates/table/search/table_header.phtml:4
 msgid "Function"
 msgstr "Funcție"
 
@@ -9674,88 +9690,89 @@ msgid "Because of its length,<br /> this column might not be editable."
 msgstr ""
 "Datorită lungimii sale, <br /> acest câmp s-ar putea să nu fie editabil"
 
-#: libraries/insert_edit.lib.php:1050
+#: libraries/insert_edit.lib.php:1048
 msgid "Binary - do not edit"
 msgstr "Binar - a nu se edita"
 
-#: libraries/insert_edit.lib.php:1176 libraries/server_privileges.lib.php:470
-#: templates/table/options.phtml:36
+#: libraries/insert_edit.lib.php:1174 libraries/server_privileges.lib.php:470
+#: templates/table/search/options.phtml:36
 msgid "Or"
 msgstr "Sau"
 
-#: libraries/insert_edit.lib.php:1177
+#: libraries/insert_edit.lib.php:1175
 #, fuzzy
 #| msgid "web server upload directory"
 msgid "web server upload directory:"
 msgstr "director de încărcare al serverului Web"
 
-#: libraries/insert_edit.lib.php:1348 templates/table/input_box.phtml:49
+#: libraries/insert_edit.lib.php:1346
+#: templates/table/search/input_box.phtml:49
 msgid "Edit/Insert"
 msgstr "Editare/Inserare"
 
-#: libraries/insert_edit.lib.php:1398
+#: libraries/insert_edit.lib.php:1396
 #, fuzzy, php-format
 #| msgid "Restart insertion with %s rows"
 msgid "Continue insertion with %s rows"
 msgstr "Repornește inserția cu %s rânduri"
 
-#: libraries/insert_edit.lib.php:1428
+#: libraries/insert_edit.lib.php:1426
 msgid "and then"
 msgstr "și apoi"
 
-#: libraries/insert_edit.lib.php:1461
+#: libraries/insert_edit.lib.php:1459
 msgid "Insert as new row"
 msgstr "Inserează ca o nouă linie"
 
-#: libraries/insert_edit.lib.php:1464
+#: libraries/insert_edit.lib.php:1462
 msgid "Insert as new row and ignore errors"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1467
+#: libraries/insert_edit.lib.php:1465
 #, fuzzy
 msgid "Show insert query"
 msgstr "Afișare interogare SQL"
 
-#: libraries/insert_edit.lib.php:1487
+#: libraries/insert_edit.lib.php:1485
 msgid "Go back to previous page"
 msgstr "Revenire"
 
-#: libraries/insert_edit.lib.php:1490
+#: libraries/insert_edit.lib.php:1488
 msgid "Insert another new row"
 msgstr "Adaugă o nouă înregistrare"
 
-#: libraries/insert_edit.lib.php:1495
+#: libraries/insert_edit.lib.php:1493
 msgid "Go back to this page"
 msgstr "Înapoi la această pagină"
 
-#: libraries/insert_edit.lib.php:1518
+#: libraries/insert_edit.lib.php:1516
 msgid "Edit next row"
 msgstr "Editează rândul următor"
 
-#: libraries/insert_edit.lib.php:1540
+#: libraries/insert_edit.lib.php:1538
 msgid ""
 "Use TAB key to move from value to value, or CTRL+arrows to move anywhere"
 msgstr ""
 "Folosiți tasta TAB pentru a trece de la o valoare la alta sau CTRL+săgeți "
 "pentru a merge în oricare direcție"
 
-#: libraries/insert_edit.lib.php:1577 libraries/replication_gui.lib.php:542
-#: libraries/rte/rte_routines.lib.php:1497
+#: libraries/insert_edit.lib.php:1575 libraries/replication_gui.lib.php:542
+#: libraries/rte/rte_routines.lib.php:1588
 #: libraries/server_status_variables.lib.php:220
-#: templates/designer/having_query_panel.phtml:100
-#: templates/designer/options_panel.phtml:73
-#: templates/designer/options_panel.phtml:239
-#: templates/designer/where_query_panel.phtml:69
-#: templates/table/table_header.phtml:10
-#: templates/table/zoom_result_form.phtml:35
+#: templates/database/designer/having_query_panel.phtml:100
+#: templates/database/designer/options_panel.phtml:73
+#: templates/database/designer/options_panel.phtml:239
+#: templates/database/designer/where_query_panel.phtml:69
+#: templates/table/search/table_header.phtml:10
+#: templates/table/search/zoom_result_form.phtml:35
 msgid "Value"
 msgstr "Valoare"
 
-#: libraries/insert_edit.lib.php:1937 libraries/sql.lib.php:1309
+#: libraries/insert_edit.lib.php:1935 libraries/sql.lib.php:1303
 msgid "Showing SQL query"
 msgstr "Afișare interogare SQL"
 
-#: libraries/insert_edit.lib.php:1962 libraries/sql.lib.php:1287
+#: libraries/insert_edit.lib.php:1960 libraries/sql.lib.php:1281
 #, php-format
 msgid "Inserted row id: %1$d"
 msgstr "ID rând inserat: %1$d"
@@ -10222,7 +10239,7 @@ msgstr "Nou"
 #: libraries/navigation/Nodes/Node_View_Container.class.php:26
 #: libraries/navigation/Nodes/Node_View_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:129
-#: templates/structure/show_create.phtml:30
+#: templates/database/structure/show_create.phtml:30
 #, fuzzy
 #| msgid "View"
 msgid "Views"
@@ -10536,7 +10553,7 @@ msgstr "Nu dețineți drepturi de acces pentru a vă afla aici!"
 
 #: libraries/operations.lib.php:101 libraries/operations.lib.php:249
 #: libraries/operations.lib.php:869 libraries/operations.lib.php:963
-#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:907
+#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:998
 #: templates/columns_definitions/table_fields_definitions.phtml:47
 #, fuzzy
 #| msgid "Edit Privileges"
@@ -10630,22 +10647,22 @@ msgid "Switch to copied table"
 msgstr "Schimbă la tabela copiată"
 
 #: libraries/operations.lib.php:1360
-#: templates/structure/check_all_tables.phtml:18
+#: templates/database/structure/check_all_tables.phtml:18
 msgid "Table maintenance"
 msgstr "Administrare tabel"
 
 #: libraries/operations.lib.php:1398
-#: templates/structure/check_all_tables.phtml:19
+#: templates/database/structure/check_all_tables.phtml:19
 msgid "Analyze table"
 msgstr "Analizare tabel"
 
 #: libraries/operations.lib.php:1413
-#: templates/structure/check_all_tables.phtml:20
+#: templates/database/structure/check_all_tables.phtml:20
 msgid "Check table"
 msgstr "Verificare tabel"
 
 #: libraries/operations.lib.php:1428
-#: templates/structure/check_all_tables.phtml:22
+#: templates/database/structure/check_all_tables.phtml:22
 #, fuzzy
 #| msgid "Check table"
 msgid "Checksum table"
@@ -10667,18 +10684,19 @@ msgid "Flush the table (FLUSH)"
 msgstr "Curățarea tabelului (\"FLUSH\")"
 
 #: libraries/operations.lib.php:1477
-#: templates/structure/check_all_tables.phtml:23
-#: templates/structure/display_table_stats.phtml:56
+#: templates/database/structure/check_all_tables.phtml:23
+#: templates/table/structure/display_table_stats.phtml:56
 msgid "Optimize table"
 msgstr "Optimizare tabel"
 
 #: libraries/operations.lib.php:1492
-#: templates/structure/check_all_tables.phtml:24
+#: templates/database/structure/check_all_tables.phtml:24
 msgid "Repair table"
 msgstr "Reparare tabel"
 
 #: libraries/operations.lib.php:1538
-#: templates/structure/check_all_tables.phtml:14 view_operations.php:127
+#: templates/database/structure/check_all_tables.phtml:14
+#: view_operations.php:127
 #, fuzzy
 msgid "Delete data or table"
 msgstr "Șterge datele urmărite din acest tabel"
@@ -10809,7 +10827,7 @@ msgid "Cannot connect: invalid settings."
 msgstr "Conexiune esuata: setari invalide."
 
 #: libraries/plugins/auth/AuthenticationConfig.class.php:108
-#: libraries/plugins/auth/AuthenticationCookie.class.php:134
+#: libraries/plugins/auth/AuthenticationCookie.class.php:122
 #: libraries/plugins/auth/AuthenticationHttp.class.php:96
 #, php-format
 msgid "Welcome to %s"
@@ -10841,38 +10859,38 @@ msgstr ""
 msgid "Retry to connect"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:146
+#: libraries/plugins/auth/AuthenticationCookie.class.php:134
 msgid "Your session has expired. Please log in again."
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:170
+#: libraries/plugins/auth/AuthenticationCookie.class.php:158
 msgid "Log in"
 msgstr "Autentificare"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:178
-#: libraries/plugins/auth/AuthenticationCookie.class.php:188
+#: libraries/plugins/auth/AuthenticationCookie.class.php:166
+#: libraries/plugins/auth/AuthenticationCookie.class.php:176
 msgid "You can enter hostname/IP address and port separated by space."
 msgstr "Puteți introduce adresă gazdă/IP și port separate de spațiu."
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:193
+#: libraries/plugins/auth/AuthenticationCookie.class.php:181
 msgid "Username:"
 msgstr "Nume utilizator:"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:205
+#: libraries/plugins/auth/AuthenticationCookie.class.php:193
 #, fuzzy
 #| msgid "Server Choice"
 msgid "Server Choice:"
 msgstr "Alegerea serverului"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:386
+#: libraries/plugins/auth/AuthenticationCookie.class.php:374
 msgid "Entered captcha is wrong, try again!"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:396
+#: libraries/plugins/auth/AuthenticationCookie.class.php:384
 msgid "Please enter correct captcha!"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:423
+#: libraries/plugins/auth/AuthenticationCookie.class.php:411
 #, fuzzy
 #| msgid "Cannot log in to the MySQL server"
 msgid "You are not allowed to log in to this MySQL server!"
@@ -10985,7 +11003,7 @@ msgstr "Eveniment"
 #: libraries/plugins/export/ExportOdt.class.php:593
 #: libraries/plugins/export/ExportTexytext.class.php:428
 #: libraries/plugins/export/PMA_ExportPdf.class.php:313
-#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:984
 #: libraries/rte/rte_triggers.lib.php:377
 msgid "Definition"
 msgstr "Definiție"
@@ -11333,7 +11351,7 @@ msgid "Last check:"
 msgstr "Ultima verificare:"
 
 #: libraries/plugins/export/ExportSql.class.php:1399
-#: templates/structure/structure_table_row.phtml:183
+#: templates/database/structure/structure_table_row.phtml:183
 msgid "in use"
 msgstr "în uz"
 
@@ -11537,21 +11555,16 @@ msgstr ""
 msgid "The imported file does not contain any data!"
 msgstr "File %s does not contain any key id"
 
-#: libraries/plugins/import/ImportSql.class.php:169
+#: libraries/plugins/import/ImportSql.class.php:72
 #, fuzzy
 #| msgid "SQL compatibility mode"
 msgid "SQL compatibility mode:"
 msgstr "Regim de compatibilitate SQL"
 
-#: libraries/plugins/import/ImportSql.class.php:181
+#: libraries/plugins/import/ImportSql.class.php:84
 msgid "Do not use <code>AUTO_INCREMENT</code> for zero values"
 msgstr ""
 
-#: libraries/plugins/import/ImportSql.class.php:195
-#, fuzzy
-msgid "Read as multibytes"
-msgstr "Citiri gresite"
-
 #: libraries/plugins/import/ImportXml.class.php:54
 msgid "XML"
 msgstr "XML"
@@ -11596,7 +11609,7 @@ msgid "Show grid"
 msgstr "Arată grila"
 
 #: libraries/plugins/schema/SchemaPdf.class.php:94
-#: templates/structure/print_view_data_dictionary_link.phtml:6
+#: templates/database/structure/print_view_data_dictionary_link.phtml:6
 msgid "Data Dictionary"
 msgstr "Dicționar de date"
 
@@ -11628,7 +11641,7 @@ msgid "The %s table doesn't exist!"
 msgstr "Tabelul „%s” nu există!"
 
 #: libraries/plugins/schema/eps/Eps_Relation_Schema.class.php:321
-#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:309
+#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:323
 #, fuzzy, php-format
 #| msgid "Schema of the \"%s\" database - Page %s"
 msgid "Schema of the %s database - Page %s"
@@ -11658,7 +11671,7 @@ msgstr "Sumar"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1005
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1028
 #: libraries/tracking.lib.php:884
-#: templates/structure/table_structure_header.phtml:11
+#: templates/table/structure/table_structure_header.phtml:11
 msgid "Extra"
 msgstr "Extra"
 
@@ -12080,32 +12093,32 @@ msgstr ""
 msgid "Create the needed tables with the <code>%screate_tables.sql</code>."
 msgstr ""
 
-#: libraries/relation.lib.php:360
+#: libraries/relation.lib.php:357
 msgid "Create a pma user and give access to these tables."
 msgstr ""
 
-#: libraries/relation.lib.php:365
+#: libraries/relation.lib.php:360
 msgid ""
 "Enable advanced features in configuration file (<code>config.inc.php</"
 "code>), for example by starting from <code>config.sample.inc.php</code>."
 msgstr ""
 
-#: libraries/relation.lib.php:373
+#: libraries/relation.lib.php:365
 msgid "Re-login to phpMyAdmin to load the updated configuration file."
 msgstr ""
 
-#: libraries/relation.lib.php:1612
+#: libraries/relation.lib.php:1607
 msgid "no description"
 msgstr "Nu există descriere"
 
-#: libraries/relation.lib.php:1811
+#: libraries/relation.lib.php:1806
 msgid ""
 "You do not have necessary privileges to create a database named "
 "'phpmyadmin'. You may go to 'Operations' tab of any database to set up the "
 "phpMyAdmin configuration storage there."
 msgstr ""
 
-#: libraries/relation.lib.php:1928
+#: libraries/relation.lib.php:1923
 #, fuzzy, php-format
 #| msgid "Missing phpMyAdmin configuration storage tables"
 msgid ""
@@ -12113,21 +12126,21 @@ msgid ""
 "configuration storage there."
 msgstr "Tabele de stocare a configurării phpMyAdmin absente"
 
-#: libraries/relation.lib.php:1936
+#: libraries/relation.lib.php:1931
 #, fuzzy, php-format
 #| msgid "Missing phpMyAdmin configuration storage tables"
 msgid ""
 "%sCreate%s the phpMyAdmin configuration storage in the current database."
 msgstr "Tabele de stocare a configurării phpMyAdmin absente"
 
-#: libraries/relation.lib.php:1944
+#: libraries/relation.lib.php:1939
 #, fuzzy, php-format
 #| msgid "Missing phpMyAdmin configuration storage tables"
 msgid "%sCreate%s missing phpMyAdmin configuration storage tables."
 msgstr "Tabele de stocare a configurării phpMyAdmin absente"
 
 #: libraries/replication_gui.lib.php:46 libraries/replication_gui.lib.php:343
-#: libraries/server_databases.lib.php:387
+#: libraries/server_databases.lib.php:398
 msgid "Master replication"
 msgstr ""
 
@@ -12200,7 +12213,7 @@ msgstr ""
 "configurat ca master."
 
 #: libraries/replication_gui.lib.php:141
-#: libraries/server_databases.lib.php:389
+#: libraries/server_databases.lib.php:400
 msgid "Slave replication"
 msgstr ""
 
@@ -12495,10 +12508,10 @@ msgid "Master server changed successfully to %s."
 msgstr "Server master schimbat cu succes în %s"
 
 #: libraries/rte/rte_events.lib.php:106 libraries/rte/rte_events.lib.php:115
-#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:149
-#: libraries/rte/rte_routines.lib.php:158
-#: libraries/rte/rte_routines.lib.php:231
-#: libraries/rte/rte_routines.lib.php:1362
+#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:219
+#: libraries/rte/rte_routines.lib.php:246
+#: libraries/rte/rte_routines.lib.php:368
+#: libraries/rte/rte_routines.lib.php:1453
 #: libraries/rte/rte_triggers.lib.php:82 libraries/rte/rte_triggers.lib.php:91
 #: libraries/rte/rte_triggers.lib.php:123
 #, php-format
@@ -12519,7 +12532,7 @@ msgstr "Evenimentul %1$s a fost modificat."
 msgid "Event %1$s has been created."
 msgstr "Evenimentul %1$s a fost creat."
 
-#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:251
+#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:266
 #: libraries/rte/rte_triggers.lib.php:144
 #, fuzzy
 #| msgid ""
@@ -12533,7 +12546,7 @@ msgstr ""
 msgid "Edit event"
 msgstr "Editează evenimentul"
 
-#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:794
+#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:885
 #: libraries/rte/rte_triggers.lib.php:323 view_create.php:180
 msgid "Details"
 msgstr "Detalii"
@@ -12548,7 +12561,7 @@ msgstr "Tip eveniment"
 msgid "Event type"
 msgstr "Tip eveniment"
 
-#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:817
+#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:908
 #, php-format
 msgid "Change to %s"
 msgstr "Schimbați în %s"
@@ -12577,12 +12590,14 @@ msgstr "Sfârșitul"
 msgid "On completion preserve"
 msgstr "Inserări complete"
 
-#: libraries/rte/rte_events.lib.php:491 libraries/rte/rte_routines.lib.php:930
+#: libraries/rte/rte_events.lib.php:491
+#: libraries/rte/rte_routines.lib.php:1021
 #: libraries/rte/rte_triggers.lib.php:383 view_create.php:209
 msgid "Definer"
 msgstr "Definitor"
 
-#: libraries/rte/rte_events.lib.php:535 libraries/rte/rte_routines.lib.php:997
+#: libraries/rte/rte_events.lib.php:535
+#: libraries/rte/rte_routines.lib.php:1088
 #: libraries/rte/rte_triggers.lib.php:422
 #, fuzzy
 #| msgid "The definer must be in the \"username@hostname\" format"
@@ -12614,9 +12629,9 @@ msgid "You must provide an event definition."
 msgstr "Trebuie să introduceți o definiție pentru eveniment."
 
 #: libraries/rte/rte_export.lib.php:43 libraries/rte/rte_general.lib.php:72
-#: libraries/rte/rte_routines.lib.php:345
-#: libraries/rte/rte_routines.lib.php:1198
-#: libraries/rte/rte_routines.lib.php:1411
+#: libraries/rte/rte_routines.lib.php:153
+#: libraries/rte/rte_routines.lib.php:1289
+#: libraries/rte/rte_routines.lib.php:1502
 #, fuzzy
 #| msgid "Error in processing request"
 msgid "Error in processing request:"
@@ -12654,111 +12669,111 @@ msgstr ""
 "eșua![/strong] Vă rugăm să folosiți extensia îmbunătățită 'mysqli' pentru a "
 "evita orice problemă."
 
-#: libraries/rte/rte_routines.lib.php:110
-#: libraries/rte/rte_routines.lib.php:1006
-#, fuzzy, php-format
-#| msgid "Invalid server index: \"%s\""
-msgid "Invalid routine type: \"%s\""
-msgstr "Index de server nevalid: „%s”"
-
-#: libraries/rte/rte_routines.lib.php:170
-msgid "Sorry, we failed to restore the dropped routine."
-msgstr "Ne pare rău, am eșuat încercând să recuperăm rutina ștearsă."
-
-#: libraries/rte/rte_routines.lib.php:211
-#, fuzzy, php-format
-#| msgid "Routine %1$s has been modified."
-msgid "Routine %1$s has been modified. Privileges have been adjusted."
-msgstr "Tabelul %1$s a fost modificat."
-
-#: libraries/rte/rte_routines.lib.php:216
-#, php-format
-msgid "Routine %1$s has been modified."
-msgstr "Tabelul %1$s a fost modificat."
-
-#: libraries/rte/rte_routines.lib.php:238
-#, fuzzy, php-format
-#| msgid "Table %1$s has been created."
-msgid "Routine %1$s has been created."
-msgstr "Tabelul %1$s a fost creat."
-
-#: libraries/rte/rte_routines.lib.php:315
+#: libraries/rte/rte_routines.lib.php:123
 #, fuzzy
 #| msgid "Edit mode"
 msgid "Edit routine"
 msgstr "Regim de redactare"
 
-#: libraries/rte/rte_routines.lib.php:797
+#: libraries/rte/rte_routines.lib.php:200
+#: libraries/rte/rte_routines.lib.php:1097
+#, fuzzy, php-format
+#| msgid "Invalid server index: \"%s\""
+msgid "Invalid routine type: \"%s\""
+msgstr "Index de server nevalid: „%s”"
+
+#: libraries/rte/rte_routines.lib.php:253
+#, fuzzy, php-format
+#| msgid "Table %1$s has been created."
+msgid "Routine %1$s has been created."
+msgstr "Tabelul %1$s a fost creat."
+
+#: libraries/rte/rte_routines.lib.php:380
+msgid "Sorry, we failed to restore the dropped routine."
+msgstr "Ne pare rău, am eșuat încercând să recuperăm rutina ștearsă."
+
+#: libraries/rte/rte_routines.lib.php:439
+#, fuzzy, php-format
+#| msgid "Routine %1$s has been modified."
+msgid "Routine %1$s has been modified. Privileges have been adjusted."
+msgstr "Tabelul %1$s a fost modificat."
+
+#: libraries/rte/rte_routines.lib.php:444
+#, php-format
+msgid "Routine %1$s has been modified."
+msgstr "Tabelul %1$s a fost modificat."
+
+#: libraries/rte/rte_routines.lib.php:888
 #, fuzzy
 #| msgid "Routines"
 msgid "Routine name"
 msgstr "Rutine"
 
-#: libraries/rte/rte_routines.lib.php:823
+#: libraries/rte/rte_routines.lib.php:914
 msgid "Parameters"
 msgstr "Parametrii"
 
-#: libraries/rte/rte_routines.lib.php:829
+#: libraries/rte/rte_routines.lib.php:920
 #, fuzzy
 #| msgid "Direct links"
 msgid "Direction"
 msgstr "Legături directe"
 
-#: libraries/rte/rte_routines.lib.php:847
+#: libraries/rte/rte_routines.lib.php:938
 msgid "Add parameter"
 msgstr "Adăugați parametru"
 
-#: libraries/rte/rte_routines.lib.php:851
+#: libraries/rte/rte_routines.lib.php:942
 msgid "Remove last parameter"
 msgstr "Ștergeți ultimul parametru"
 
-#: libraries/rte/rte_routines.lib.php:856
+#: libraries/rte/rte_routines.lib.php:947
 msgid "Return type"
 msgstr "Tipul întors"
 
-#: libraries/rte/rte_routines.lib.php:862
+#: libraries/rte/rte_routines.lib.php:953
 #, fuzzy
 #| msgid "Length/Values"
 msgid "Return length/values"
 msgstr "Lungime/Setare"
 
-#: libraries/rte/rte_routines.lib.php:868
+#: libraries/rte/rte_routines.lib.php:959
 #, fuzzy
 #| msgid "Table options"
 msgid "Return options"
 msgstr "Opțiuni tabel"
 
-#: libraries/rte/rte_routines.lib.php:899
+#: libraries/rte/rte_routines.lib.php:990
 msgid "Is deterministic"
 msgstr "Este determinist"
 
-#: libraries/rte/rte_routines.lib.php:920
+#: libraries/rte/rte_routines.lib.php:1011
 msgid ""
 "You do not have sufficient privileges to perform this operation; Please "
 "refer to the documentation for more details"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:935
+#: libraries/rte/rte_routines.lib.php:1026
 msgid "Security type"
 msgstr "Tip de securitate"
 
-#: libraries/rte/rte_routines.lib.php:944
+#: libraries/rte/rte_routines.lib.php:1035
 msgid "SQL data access"
 msgstr "Acces date SQL"
 
-#: libraries/rte/rte_routines.lib.php:1013
+#: libraries/rte/rte_routines.lib.php:1104
 #, fuzzy
 #| msgid "You must provide a routine name"
 msgid "You must provide a routine name!"
 msgstr "Trebuie să introduceți un nume de rutină"
 
-#: libraries/rte/rte_routines.lib.php:1047
+#: libraries/rte/rte_routines.lib.php:1138
 #, php-format
 msgid "Invalid direction \"%s\" given for parameter."
 msgstr "Direcție invalidă \"%s\" dată pentru parametru."
 
-#: libraries/rte/rte_routines.lib.php:1069
-#: libraries/rte/rte_routines.lib.php:1131
+#: libraries/rte/rte_routines.lib.php:1160
+#: libraries/rte/rte_routines.lib.php:1222
 msgid ""
 "You must provide length/values for routine parameters of type ENUM, SET, "
 "VARCHAR and VARBINARY."
@@ -12766,25 +12781,25 @@ msgstr ""
 "Trebuie să oferiți lungime/valori pentru parametrii de tipul ENUM, SET, "
 "VARCHAR și VARBINARY ai rutinei."
 
-#: libraries/rte/rte_routines.lib.php:1095
+#: libraries/rte/rte_routines.lib.php:1186
 msgid "You must provide a name and a type for each routine parameter."
 msgstr ""
 "Trebuie să introduceți un nume și un tip pentru fiecare parametru al rutinei."
 
-#: libraries/rte/rte_routines.lib.php:1114
+#: libraries/rte/rte_routines.lib.php:1205
 msgid "You must provide a valid return type for the routine."
 msgstr "Rutina trebuie să întoarcă un tip valid."
 
-#: libraries/rte/rte_routines.lib.php:1174
+#: libraries/rte/rte_routines.lib.php:1265
 msgid "You must provide a routine definition."
 msgstr "Trebuie să introduceți o definiție a rutinei."
 
-#: libraries/rte/rte_routines.lib.php:1285
+#: libraries/rte/rte_routines.lib.php:1376
 #, php-format
 msgid "Execution results of routine %s"
 msgstr "Rezultatele execuției rutinei %s"
 
-#: libraries/rte/rte_routines.lib.php:1340
+#: libraries/rte/rte_routines.lib.php:1431
 #, fuzzy, php-format
 #| msgid "%d row affected by the last statement inside the procedure"
 #| msgid_plural "%d rows affected by the last statement inside the procedure"
@@ -12794,13 +12809,13 @@ msgstr[0] "%d rând afectat de ultima declarație din cadrul procedurii"
 msgstr[1] "%d rânduri afectate de ultima declarație din cadrul procedurii"
 msgstr[2] "%d rânduri afectate de ultima declarație din cadrul procedurii"
 
-#: libraries/rte/rte_routines.lib.php:1398
-#: libraries/rte/rte_routines.lib.php:1406
+#: libraries/rte/rte_routines.lib.php:1489
+#: libraries/rte/rte_routines.lib.php:1497
 msgid "Execute routine"
 msgstr "Executați rutina"
 
-#: libraries/rte/rte_routines.lib.php:1485
-#: libraries/rte/rte_routines.lib.php:1488
+#: libraries/rte/rte_routines.lib.php:1576
+#: libraries/rte/rte_routines.lib.php:1579
 msgid "Routine parameters"
 msgstr "Parametrii rutinei"
 
@@ -12990,7 +13005,7 @@ msgid "Original position"
 msgstr "Pozitie originală"
 
 #: libraries/server_bin_log.lib.php:133
-#: templates/structure/display_table_stats.phtml:4
+#: templates/table/structure/display_table_stats.phtml:4
 msgid "Information"
 msgstr "Informație"
 
@@ -13028,12 +13043,12 @@ msgstr ""
 "Notă: Activarea statisticilor pentru baza de date poate cauza creșterea "
 "traficului între MySQL și serverul Web."
 
-#: libraries/server_databases.lib.php:364
-#: libraries/server_databases.lib.php:365
+#: libraries/server_databases.lib.php:366
+#: libraries/server_databases.lib.php:371
 msgid "Enable Statistics"
 msgstr "Activează statisticile"
 
-#: libraries/server_databases.lib.php:481
+#: libraries/server_databases.lib.php:492
 #, fuzzy, php-format
 #| msgid "%s databases have been dropped successfully."
 msgid "%1$d database has been dropped successfully."
@@ -13431,7 +13446,7 @@ msgid "You have revoked the privileges for %s."
 msgstr "Drepturile tale au fost revocate pentru %s."
 
 #: libraries/server_privileges.lib.php:2059
-#: libraries/server_privileges.lib.php:4290
+#: libraries/server_privileges.lib.php:4316
 #, fuzzy
 #| msgid "Add user"
 msgid "Add user account"
@@ -13621,62 +13636,62 @@ msgstr "Șterge %s"
 msgid "The privileges were reloaded successfully."
 msgstr "Drepturile au fost reîncarcate cu succes."
 
-#: libraries/server_privileges.lib.php:3994
+#: libraries/server_privileges.lib.php:4003
 #, php-format
 msgid "The user %s already exists!"
 msgstr "Utilizatorul %s există deja!"
 
-#: libraries/server_privileges.lib.php:4232
+#: libraries/server_privileges.lib.php:4258
 #, fuzzy, php-format
 #| msgid "Privileges"
 msgid "Privileges for %s"
 msgstr "Drepturi de acces"
 
-#: libraries/server_privileges.lib.php:4241
+#: libraries/server_privileges.lib.php:4267
 #: libraries/server_status_processes.lib.php:72
 #: libraries/server_user_groups.lib.php:39
 msgid "User"
 msgstr "Utilizator"
 
-#: libraries/server_privileges.lib.php:4282
+#: libraries/server_privileges.lib.php:4308
 #, fuzzy
 #| msgid "New"
 msgctxt "Create new user"
 msgid "New"
 msgstr "Nou"
 
-#: libraries/server_privileges.lib.php:4311
+#: libraries/server_privileges.lib.php:4337
 #, fuzzy
 #| msgid "Edit Privileges"
 msgid "Edit privileges:"
 msgstr "Editează drepturile de acces"
 
-#: libraries/server_privileges.lib.php:4312
+#: libraries/server_privileges.lib.php:4338
 #, fuzzy
 #| msgid "Users"
 msgid "User account"
 msgstr "Utilizatori"
 
-#: libraries/server_privileges.lib.php:4371
+#: libraries/server_privileges.lib.php:4397
 msgid ""
 "Note: You are attempting to edit privileges of the user with which you are "
 "currently logged in."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4391 libraries/server_users.lib.php:25
+#: libraries/server_privileges.lib.php:4417 libraries/server_users.lib.php:25
 #, fuzzy
 #| msgid "User overview"
 msgid "User accounts overview"
 msgstr "Descriere utilizator"
 
-#: libraries/server_privileges.lib.php:4459
+#: libraries/server_privileges.lib.php:4485
 msgid ""
 "A user account allowing any user from localhost to connect is present. This "
 "will prevent other users from connecting if the host part of their account "
 "allows a connection from any (%) host."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4500
+#: libraries/server_privileges.lib.php:4526
 #, php-format
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
@@ -13689,7 +13704,7 @@ msgstr ""
 "În acest caz, reîncărcați de aici înainte de a continua %sreîncărcarea "
 "drepturilor%s."
 
-#: libraries/server_privileges.lib.php:4519
+#: libraries/server_privileges.lib.php:4545
 #, fuzzy
 #| msgid ""
 #| "Note: phpMyAdmin gets the users' privileges directly from MySQL's "
@@ -13708,65 +13723,65 @@ msgstr ""
 "În acest caz, reîncărcați de aici înainte de a continua %sreîncărcarea "
 "drepturilor%s."
 
-#: libraries/server_privileges.lib.php:4569
+#: libraries/server_privileges.lib.php:4595
 msgid "The selected user was not found in the privilege table."
 msgstr "Utilizatorul selectat nu a fost găsit în tabelul de drepturi."
 
-#: libraries/server_privileges.lib.php:4801
+#: libraries/server_privileges.lib.php:4827
 msgid "You have added a new user."
 msgstr "Ați adăugat un nou utilizator."
 
-#: libraries/server_status.lib.php:53
+#: libraries/server_status.lib.php:60
 #, php-format
 msgid "Network traffic since startup: %s"
 msgstr ""
 
-#: libraries/server_status.lib.php:66
+#: libraries/server_status.lib.php:73
 #, fuzzy, php-format
 #| msgid "This MySQL server has been running for %s. It started up on %s."
 msgid "This MySQL server has been running for %1$s. It started up on %2$s."
 msgstr "Acest server MySQL rulează de %s. S-a lansat la %s."
 
-#: libraries/server_status.lib.php:80
+#: libraries/server_status.lib.php:94
 msgid ""
 "This MySQL server works as <b>master</b> and <b>slave</b> in <b>replication</"
 "b> process."
 msgstr ""
 
-#: libraries/server_status.lib.php:85
+#: libraries/server_status.lib.php:99
 msgid "This MySQL server works as <b>master</b> in <b>replication</b> process."
 msgstr ""
 
-#: libraries/server_status.lib.php:90
+#: libraries/server_status.lib.php:104
 msgid "This MySQL server works as <b>slave</b> in <b>replication</b> process."
 msgstr ""
 
-#: libraries/server_status.lib.php:106
+#: libraries/server_status.lib.php:116
 #, fuzzy
 msgid "Replication status"
 msgstr "Replicare"
 
-#: libraries/server_status.lib.php:137
+#: libraries/server_status.lib.php:146
 msgid ""
 "On a busy server, the byte counters may overrun, so those statistics as "
 "reported by the MySQL server may be incorrect."
 msgstr ""
 
-#: libraries/server_status.lib.php:148
+#: libraries/server_status.lib.php:157
 msgid "Received"
 msgstr "Recepționat"
 
-#: libraries/server_status.lib.php:167
+#: libraries/server_status.lib.php:176
 msgid "Sent"
 msgstr "Trimis"
 
-#: libraries/server_status.lib.php:234
+#: libraries/server_status.lib.php:243
 #, fuzzy
 #| msgid "max. concurrent connections"
 msgid "Max. concurrent connections"
 msgstr "conexiuni concurente (maxim)"
 
-#: libraries/server_status.lib.php:244
+#: libraries/server_status.lib.php:253
 msgid "Failed attempts"
 msgstr "Încercări nereușite"
 
@@ -14770,7 +14785,7 @@ msgstr ""
 msgid "Not implemented yet."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/AlterOperation.php:193
+#: libraries/sql-parser/src/Components/AlterOperation.php:191
 #, fuzzy
 msgid "Unrecognized alter operation."
 msgstr "Operații tabelare cu iconițe"
@@ -14785,7 +14800,7 @@ msgid "An opening bracket followed by a set of values was expected."
 msgstr ""
 
 #: libraries/sql-parser/src/Components/ArrayObj.php:101
-#: libraries/sql-parser/src/Components/FieldDefinition.php:202
+#: libraries/sql-parser/src/Components/CreateDefinition.php:202
 msgid "An opening bracket was expected."
 msgstr ""
 
@@ -14793,25 +14808,35 @@ msgstr ""
 msgid "A comma or a closing bracket was expected"
 msgstr ""
 
+#: libraries/sql-parser/src/Components/CreateDefinition.php:246
+#, fuzzy
+#| msgid "No tables selected."
+msgid "A comma or a closing bracket was expected."
+msgstr "Nici o bază de date selectată."
+
+#: libraries/sql-parser/src/Components/CreateDefinition.php:262
+msgid "A closing bracket was expected."
+msgstr ""
+
 #: libraries/sql-parser/src/Components/DataType.php:125
 msgid "Unrecognized data type."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:225
+#: libraries/sql-parser/src/Components/Expression.php:227
 msgid "Unexpected closing bracket."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:246
-#: libraries/sql-parser/src/Components/Expression.php:283
-#: libraries/sql-parser/src/Components/Expression.php:303
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:285
+#: libraries/sql-parser/src/Components/Expression.php:305
 msgid "An alias was previously found."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:257
+#: libraries/sql-parser/src/Components/Expression.php:259
 msgid "Unexpected dot."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:327
+#: libraries/sql-parser/src/Components/Expression.php:329
 #, fuzzy
 #| msgid "No tables selected."
 msgid "An alias was expected."
@@ -14823,16 +14848,6 @@ msgstr "Nici o bază de date selectată."
 msgid "An expression was expected."
 msgstr "Nici un rând selectat"
 
-#: libraries/sql-parser/src/Components/FieldDefinition.php:246
-#, fuzzy
-#| msgid "No tables selected."
-msgid "A comma or a closing bracket was expected."
-msgstr "Nici o bază de date selectată."
-
-#: libraries/sql-parser/src/Components/FieldDefinition.php:262
-msgid "A closing bracket was expected."
-msgstr ""
-
 #: libraries/sql-parser/src/Components/Limit.php:90
 #: libraries/sql-parser/src/Components/Limit.php:112
 msgid "An offset was expected."
@@ -14880,29 +14895,29 @@ msgstr ""
 msgid "Expected delimiter."
 msgstr ""
 
-#: libraries/sql-parser/src/Lexer.php:753
+#: libraries/sql-parser/src/Lexer.php:777
 #, fuzzy, php-format
 #| msgid "Event %1$s has been created."
 msgid "Ending quote %1$s was expected."
 msgstr "Evenimentul %1$s a fost creat."
 
-#: libraries/sql-parser/src/Lexer.php:789
+#: libraries/sql-parser/src/Lexer.php:813
 #, fuzzy
 #| msgid "Table name template"
 msgid "Variable name was expected."
 msgstr "Șablon nume tabel"
 
-#: libraries/sql-parser/src/Parser.php:380
+#: libraries/sql-parser/src/Parser.php:391
 #, fuzzy
 #| msgid "At Beginning of Table"
 msgid "Unexpected beginning of statement."
 msgstr "La începutul tabelului"
 
-#: libraries/sql-parser/src/Parser.php:399
+#: libraries/sql-parser/src/Parser.php:410
 msgid "Unrecognized statement type."
 msgstr ""
 
-#: libraries/sql-parser/src/Parser.php:479
+#: libraries/sql-parser/src/Parser.php:489
 msgid "No transaction was previously started."
 msgstr ""
 
@@ -14932,8 +14947,10 @@ msgid "The name of the entity was expected."
 msgstr "Numărul de tabele ce sînt deschise."
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:310
-msgid "At least one field definition was expected."
-msgstr ""
+#, fuzzy
+#| msgid "The row has been deleted."
+msgid "At least one column definition was expected."
+msgstr "Înregistrarea a fost ștearsă."
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:329
 msgid "A \"RETURNS\" keyword was expected."
@@ -15009,11 +15026,11 @@ msgstr "Semnul de carte nu a fost creat"
 msgid "Using bookmark \"%s\" as default browse query."
 msgstr "Se folosește semnul de carte „%s” ca interogare de răsfoire implicită."
 
-#: libraries/sql.lib.php:1306
+#: libraries/sql.lib.php:1300
 msgid "Showing as PHP code"
 msgstr "Afișare ca cod PHP"
 
-#: libraries/sql.lib.php:1638
+#: libraries/sql.lib.php:1632
 #, fuzzy, php-format
 #| msgid ""
 #| "This table does not contain a unique column. Features related to the grid "
@@ -15026,7 +15043,7 @@ msgstr ""
 "checkbox, sau link-urile de Editare, Copiere si Ștergere pot să nu "
 "funcționeze după salvare."
 
-#: libraries/sql.lib.php:1649
+#: libraries/sql.lib.php:1643
 #, fuzzy, php-format
 #| msgid ""
 #| "This table does not contain a unique column. Features related to the grid "
@@ -15039,7 +15056,7 @@ msgstr ""
 "checkbox, sau link-urile de Editare, Copiere si Ștergere pot să nu "
 "funcționeze după salvare."
 
-#: libraries/sql.lib.php:1688
+#: libraries/sql.lib.php:1682
 #, php-format
 msgid "Problems with indexes of table `%s`"
 msgstr "Probleme cu indexul tabelului „%s”"
@@ -15205,7 +15222,7 @@ msgid "Version %s snapshot (SQL code)"
 msgstr ""
 
 #: libraries/tracking.lib.php:947
-#: templates/structure/table_structure_row.phtml:33
+#: templates/table/structure/table_structure_row.phtml:33
 #, fuzzy
 #| msgid "None"
 msgctxt "None for default"
@@ -15261,19 +15278,19 @@ msgstr "Creare relație"
 msgid "Version %1$s was created, tracking for %2$s is active."
 msgstr ""
 
-#: libraries/user_preferences.inc.php:29
+#: libraries/user_preferences.inc.php:30
 #, fuzzy
 #| msgid "General relation features"
 msgid "Manage your settings"
 msgstr "Facilități generale"
 
-#: libraries/user_preferences.inc.php:46 prefs_manage.php:307
+#: libraries/user_preferences.inc.php:54 prefs_manage.php:307
 #, fuzzy
 #| msgid "Modifications have been saved"
 msgid "Configuration has been saved."
 msgstr "Modificările au fost salvate"
 
-#: libraries/user_preferences.inc.php:66
+#: libraries/user_preferences.inc.php:74
 #, php-format
 msgid ""
 "Your preferences will be saved for current session only. Storing them "
@@ -15685,7 +15702,7 @@ msgid "first"
 msgstr ""
 
 #: templates/columns_definitions/move_column.phtml:12
-#: templates/structure/add_column.phtml:21
+#: templates/table/structure/add_column.phtml:21
 #, fuzzy, php-format
 #| msgid "After %s"
 msgid "after %s"
@@ -15773,230 +15790,338 @@ msgstr "Transformare navigator"
 msgid "Input transformation options"
 msgstr "Opțiuni de transformare"
 
-#: templates/designer/aggregate_query_panel.phtml:22
-#: templates/designer/options_panel.phtml:100
+#: templates/database/create_table.phtml:7
+#: templates/database/designer/side_menu.phtml:77
+#: templates/database/designer/side_menu.phtml:80
+msgid "Create table"
+msgstr "Creare tabel"
+
+#: templates/database/create_table.phtml:15
+#, fuzzy
+#| msgid "Number of fields"
+msgid "Number of columns"
+msgstr "Număr de câmpuri"
+
+#: templates/database/designer/aggregate_query_panel.phtml:22
+#: templates/database/designer/options_panel.phtml:100
 msgid "Aggregate"
 msgstr "Agregat"
 
-#: templates/designer/aggregate_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:61
-#: templates/designer/options_panel.phtml:106
-#: templates/designer/options_panel.phtml:170
-#: templates/designer/where_query_panel.phtml:30
-#: templates/table/table_header.phtml:9
+#: templates/database/designer/aggregate_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:61
+#: templates/database/designer/options_panel.phtml:106
+#: templates/database/designer/options_panel.phtml:170
+#: templates/database/designer/where_query_panel.phtml:30
+#: templates/table/search/table_header.phtml:9
 msgid "Operator"
 msgstr "Operand"
 
-#: templates/designer/database_tables.phtml:29
+#: templates/database/designer/database_tables.phtml:29
 msgid "Toggle"
 msgstr ""
 
-#: templates/designer/database_tables.phtml:40
+#: templates/database/designer/database_tables.phtml:40
 #, fuzzy
 #| msgid "Database for user"
 msgid "See table structure"
 msgstr "Bază de date pentru utilizatorul"
 
-#: templates/designer/delete_relation_panel.phtml:21
+#: templates/database/designer/delete_relation_panel.phtml:21
 msgid "Delete relation"
 msgstr "Șterge relația"
 
-#: templates/designer/edit_delete_pages.phtml:7
+#: templates/database/designer/edit_delete_pages.phtml:7
 #, fuzzy
 #| msgid "Page titles"
 msgid "Page to open"
 msgstr "Titluri de pagini"
 
-#: templates/designer/edit_delete_pages.phtml:7
+#: templates/database/designer/edit_delete_pages.phtml:7
 #, fuzzy
 #| msgid "Relation deleted"
 msgid "Page to delete"
 msgstr "Relație ștearsă"
 
-#: templates/designer/having_query_panel.phtml:90
-#: templates/designer/options_panel.phtml:63
-#: templates/designer/options_panel.phtml:229
-#: templates/designer/where_query_panel.phtml:59
+#: templates/database/designer/having_query_panel.phtml:90
+#: templates/database/designer/options_panel.phtml:63
+#: templates/database/designer/options_panel.phtml:229
+#: templates/database/designer/where_query_panel.phtml:59
 msgid "Except"
 msgstr "Cu excepția"
 
-#: templates/designer/having_query_panel.phtml:102
-#: templates/designer/options_panel.phtml:75
-#: templates/designer/options_panel.phtml:241
-#: templates/designer/where_query_panel.phtml:71
+#: templates/database/designer/having_query_panel.phtml:102
+#: templates/database/designer/options_panel.phtml:75
+#: templates/database/designer/options_panel.phtml:241
+#: templates/database/designer/where_query_panel.phtml:71
 msgid "subquery"
 msgstr "subinterogare"
 
-#: templates/designer/new_relation_panel.phtml:22
-#: templates/designer/side_menu.phtml:84 templates/designer/side_menu.phtml:87
+#: templates/database/designer/new_relation_panel.phtml:22
+#: templates/database/designer/side_menu.phtml:84
+#: templates/database/designer/side_menu.phtml:87
 msgid "Create relation"
 msgstr "Creare relație"
 
-#: templates/designer/options_panel.phtml:34
-#: templates/designer/options_panel.phtml:200
+#: templates/database/designer/options_panel.phtml:34
+#: templates/database/designer/options_panel.phtml:200
 msgid "Relation operator"
 msgstr "Operator relațional"
 
-#: templates/designer/options_panel.phtml:85
-#: templates/designer/rename_to_panel.phtml:23
+#: templates/database/designer/options_panel.phtml:85
+#: templates/database/designer/rename_to_panel.phtml:23
 #, fuzzy
 msgid "Rename to"
 msgstr "Redenumire tabel la"
 
-#: templates/designer/options_panel.phtml:91
-#: templates/designer/rename_to_panel.phtml:31
+#: templates/database/designer/options_panel.phtml:91
+#: templates/database/designer/rename_to_panel.phtml:31
 msgid "New name"
 msgstr "Nume nou"
 
-#: templates/designer/page_save_as.phtml:4
+#: templates/database/designer/page_save_as.phtml:4
 #, fuzzy
 #| msgid "Export/Import to scale"
 msgid "Save to selected page"
 msgstr "Exportă/Importă la scală"
 
-#: templates/designer/page_save_as.phtml:5
+#: templates/database/designer/page_save_as.phtml:5
 #, fuzzy
 #| msgid "Create a new index"
 msgid "Create a page and save to it"
 msgstr "Creează un nou index"
 
-#: templates/designer/page_save_as.phtml:26
+#: templates/database/designer/page_save_as.phtml:26
 #, fuzzy
 #| msgid "User name"
 msgid "New page name"
 msgstr "Nume utilizator"
 
-#: templates/designer/page_selector.phtml:2
+#: templates/database/designer/page_selector.phtml:2
 #, fuzzy
 #| msgid "Select Tables"
 msgid "Select page"
 msgstr "Selectează tabele"
 
-#: templates/designer/query_details.phtml:10
+#: templates/database/designer/query_details.phtml:10
 #, fuzzy
 #| msgid "Table options"
 msgid "Active options"
 msgstr "Opțiuni tabel"
 
-#: templates/designer/schema_export.phtml:4
+#: templates/database/designer/schema_export.phtml:4
 msgid "Select Export Relational Type"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:19 templates/designer/side_menu.phtml:25
+#: templates/database/designer/side_menu.phtml:19
+#: templates/database/designer/side_menu.phtml:25
 #, fuzzy
 #| msgid "Show tables"
 msgid "Show/Hide tables list"
 msgstr "Arată tabelele"
 
-#: templates/designer/side_menu.phtml:29 templates/designer/side_menu.phtml:35
-#: templates/designer/side_menu.phtml:36
+#: templates/database/designer/side_menu.phtml:29
+#: templates/database/designer/side_menu.phtml:35
+#: templates/database/designer/side_menu.phtml:36
 msgid "View in fullscreen"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:34
+#: templates/database/designer/side_menu.phtml:34
 msgid "Exit fullscreen"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:41 templates/designer/side_menu.phtml:45
+#: templates/database/designer/side_menu.phtml:41
+#: templates/database/designer/side_menu.phtml:45
 #, fuzzy
 #| msgid "New name"
 msgid "New page"
 msgstr "Nume nou"
 
-#: templates/designer/side_menu.phtml:70 templates/designer/side_menu.phtml:73
+#: templates/database/designer/side_menu.phtml:70
+#: templates/database/designer/side_menu.phtml:73
 #, fuzzy
 #| msgid "Select Tables"
 msgid "Delete pages"
 msgstr "Selectează tabele"
 
-#: templates/designer/side_menu.phtml:77 templates/designer/side_menu.phtml:80
-#: templates/table/create_table.phtml:7
-msgid "Create table"
-msgstr "Creare tabel"
-
-#: templates/designer/side_menu.phtml:98
-#: templates/designer/side_menu.phtml:101
+#: templates/database/designer/side_menu.phtml:98
+#: templates/database/designer/side_menu.phtml:101
 msgid "Reload"
 msgstr "Reîncarcă"
 
-#: templates/designer/side_menu.phtml:107
-#: templates/designer/side_menu.phtml:110
+#: templates/database/designer/side_menu.phtml:107
+#: templates/database/designer/side_menu.phtml:110
 msgid "Help"
 msgstr "Ajutor"
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Angular links"
 msgstr "Legături unghiulare"
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Direct links"
 msgstr "Legături directe"
 
-#: templates/designer/side_menu.phtml:122
-#: templates/designer/side_menu.phtml:124
+#: templates/database/designer/side_menu.phtml:122
+#: templates/database/designer/side_menu.phtml:124
 msgid "Snap to grid"
 msgstr "Aliniere la grilă"
 
-#: templates/designer/side_menu.phtml:128
-#: templates/designer/side_menu.phtml:134
+#: templates/database/designer/side_menu.phtml:128
+#: templates/database/designer/side_menu.phtml:134
 msgid "Small/Big All"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:138
-#: templates/designer/side_menu.phtml:141
+#: templates/database/designer/side_menu.phtml:138
+#: templates/database/designer/side_menu.phtml:141
 msgid "Toggle small/big"
 msgstr "Comutare mare/mică"
 
-#: templates/designer/side_menu.phtml:145
-#: templates/designer/side_menu.phtml:148
+#: templates/database/designer/side_menu.phtml:145
+#: templates/database/designer/side_menu.phtml:148
 #, fuzzy
 #| msgid "To select relation, click :"
 msgid "Toggle relation lines"
 msgstr "Pentru a alege relația, faceți clic:"
 
-#: templates/designer/side_menu.phtml:153
-#: templates/designer/side_menu.phtml:156
+#: templates/database/designer/side_menu.phtml:153
+#: templates/database/designer/side_menu.phtml:156
 #, fuzzy
 #| msgid "Export"
 msgid "Export schema"
 msgstr "Exportă"
 
-#: templates/designer/side_menu.phtml:165
-#: templates/designer/side_menu.phtml:168
+#: templates/database/designer/side_menu.phtml:165
+#: templates/database/designer/side_menu.phtml:168
 #, fuzzy
 #| msgid "Submit Query"
 msgid "Build Query"
 msgstr "Trimite comanda"
 
-#: templates/designer/side_menu.phtml:173
-#: templates/designer/side_menu.phtml:177
+#: templates/database/designer/side_menu.phtml:173
+#: templates/database/designer/side_menu.phtml:177
 msgid "Move Menu"
 msgstr "Mutare meniu"
 
-#: templates/designer/side_menu.phtml:181
-#: templates/designer/side_menu.phtml:186
+#: templates/database/designer/side_menu.phtml:181
+#: templates/database/designer/side_menu.phtml:186
 #, fuzzy
 #| msgid "Partial texts"
 msgid "Pin text"
 msgstr "Texte parțiale"
 
-#: templates/designer/table_list.phtml:4
+#: templates/database/designer/table_list.phtml:4
 msgid "Hide/Show all"
 msgstr "Arată/ascunde toate"
 
-#: templates/designer/table_list.phtml:14
+#: templates/database/designer/table_list.phtml:14
 msgid "Hide/Show Tables with no relation"
 msgstr "Arată/ascunde tabele fără realție"
 
-#: templates/designer/table_list.phtml:59
+#: templates/database/designer/table_list.phtml:59
 #, fuzzy
 #| msgid "Number of tables"
 msgid "Number of tables:"
 msgstr "Număr de tabele"
 
+#: templates/database/structure/body_for_table_summary.phtml:6
+#, php-format
+msgid "%s table"
+msgid_plural "%s tables"
+msgstr[0] "%s tabel"
+msgstr[1] "%s tabele"
+msgstr[2] "%s de tabele"
+
+#: templates/database/structure/body_for_table_summary.phtml:17
+msgid "Sum"
+msgstr "Sumă"
+
+#: templates/database/structure/check_all_tables.phtml:6
+msgid "Check tables having overhead"
+msgstr "Verificare depășit"
+
+#: templates/database/structure/check_all_tables.phtml:10
+#, fuzzy
+#| msgid "Show color"
+msgid "Show create"
+msgstr "Arată culoarea"
+
+#: templates/database/structure/check_all_tables.phtml:27
+msgid "Prefix"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:28
+msgid "Add prefix to table"
+msgstr "Adaugă prefix la tabelă"
+
+#: templates/database/structure/check_all_tables.phtml:29
+msgid "Replace table prefix"
+msgstr "Înlocuiește prefixul tabelei"
+
+#: templates/database/structure/check_all_tables.phtml:30
+msgid "Copy table with prefix"
+msgstr "Copiază tabelul cu prefix"
+
+#: templates/database/structure/check_all_tables.phtml:36
+#, fuzzy
+#| msgid "CHAR textarea columns"
+msgid "Add columns to central list"
+msgstr "coloane textarea CHAR"
+
+#: templates/database/structure/check_all_tables.phtml:37
+msgid "Remove columns from central list"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:38
+#, fuzzy
+#| msgid "CHAR textarea columns"
+msgid "Make consistent with central list"
+msgstr "coloane textarea CHAR"
+
+#: templates/database/structure/favorite_anchor.phtml:12
+#, fuzzy
+#| msgid "Add a new server"
+msgid "Add to Favorites"
+msgstr "Adaugă un server nou"
+
+#: templates/database/structure/show_create.phtml:2
+#, fuzzy
+#| msgid "Show SQL queries"
+msgid "Showing create queries"
+msgstr "Afișează interogările SQL"
+
+#: templates/database/structure/sortable_header.phtml:13
+msgid "Sort"
+msgstr "Sortare"
+
+#: templates/database/structure/table_header.phtml:42
+#, fuzzy
+#| msgid "May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]"
+msgid ""
+"May be approximate. Click on the number to get the exact count. See "
+"[doc@faq3-11]FAQ 3.11[/doc]."
+msgstr "Poate fi aproximativ. Vezi [doc@faq3-11]FAQ 3.11[/doc]"
+
+#: templates/database/structure/table_header.phtml:66
+#: templates/table/index_form.phtml:127
+msgid "Size"
+msgstr "Dimensiune"
+
+#: templates/database/structure/table_header.phtml:74
+#: templates/table/structure/display_table_stats.phtml:27
+msgid "Overhead"
+msgstr "Asupra"
+
+#: templates/database/structure/tracking_icon.phtml:4
+msgid "Tracking is active."
+msgstr "Monitorizarea este activată."
+
+#: templates/database/structure/tracking_icon.phtml:8
+msgid "Tracking is not active."
+msgstr "Monitorizarea nu este activată."
+
 #: templates/error/report_form.phtml:7
 msgid ""
 "phpMyAdmin has encountered an error. We have collected data about this error "
@@ -16012,69 +16137,6 @@ msgstr ""
 msgid "Please explain the steps that lead to the error:"
 msgstr ""
 
-#: templates/gis_visualization/gis_visualization.phtml:3
-msgid "Display GIS Visualization"
-msgstr "Afișează Vizualizarea GIS"
-
-#: templates/gis_visualization/gis_visualization.phtml:8
-#, fuzzy
-#| msgid "Add/Delete Field Columns"
-msgid "Label column"
-msgstr "Adaugă/șterge coloane"
-
-#: templates/gis_visualization/gis_visualization.phtml:11
-msgid "-- None --"
-msgstr "-- Niciunul --"
-
-#: templates/gis_visualization/gis_visualization.phtml:19
-#, fuzzy
-#| msgid "Log file count"
-msgid "Spatial column"
-msgstr "Număr de fișiere-jurnal"
-
-#: templates/index_form.phtml:16
-msgid "Index name:"
-msgstr "Denumire index:"
-
-#: templates/index_form.phtml:19
-msgid ""
-"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
-msgstr "Numele „PRIMARY” <b>trebuie</b> să fie <b>numai</b> la cheia primară!"
-
-#: templates/index_form.phtml:40
-#, fuzzy
-#| msgid "Index cache size"
-msgid "Index choice:"
-msgstr "Dimensiune cache index"
-
-#: templates/index_form.phtml:57
-msgid "Key block size:"
-msgstr ""
-
-#: templates/index_form.phtml:74
-msgid "Index type:"
-msgstr "Tip index:"
-
-#: templates/index_form.phtml:86
-#, fuzzy
-#| msgid "User:"
-msgid "Parser:"
-msgstr "Utilizator:"
-
-#: templates/index_form.phtml:102
-msgid "Comment:"
-msgstr "Comentariu:"
-
-#: templates/index_form.phtml:127 templates/structure/table_header.phtml:66
-msgid "Size"
-msgstr "Dimensiune"
-
-#: templates/index_form.phtml:149 templates/index_form.phtml:190
-#, fuzzy
-#| msgid "Drag to reorder"
-msgid "Drag to reorder"
-msgstr "Drag and drop pentru reordonare"
-
 #: templates/prefs_autoload.phtml:9
 msgid ""
 "Your browser has phpMyAdmin configuration for this domain. Would you like to "
@@ -16087,400 +16149,168 @@ msgstr ""
 msgid "Start row:"
 msgstr "Dum"
 
-#: templates/structure/actions_in_table_structure.phtml:14
-#, php-format
-msgid "A primary key has been added on %s."
-msgstr "A fost adăugată o cheie primară la %s."
-
-#: templates/structure/actions_in_table_structure.phtml:34
-#: templates/structure/actions_in_table_structure.phtml:54
-#: templates/structure/actions_in_table_structure.phtml:79
-#: templates/structure/actions_in_table_structure.phtml:101
-#, php-format
-msgid "An index has been added on %s."
-msgstr "A fost adăugat un index la %s."
-
-#: templates/structure/actions_in_table_structure.phtml:130
-#: templates/structure/check_all_table_column.phtml:59
-#, fuzzy
-#| msgid "Remove chart"
-msgid "Remove from central columns"
-msgstr "Elimină graficul"
-
-#: templates/structure/actions_in_table_structure.phtml:138
-#: templates/structure/check_all_table_column.phtml:55
-#, fuzzy
-#| msgid "CHAR textarea columns"
-msgid "Add to central columns"
-msgstr "coloane textarea CHAR"
-
-#: templates/structure/add_column.phtml:7
-#, fuzzy, php-format
-#| msgid "Add %s field(s)"
-msgid "Add %s column(s)"
-msgstr "Adaugă %s câmp(uri)"
-
-#: templates/structure/add_column.phtml:12
-#, fuzzy
-#| msgid "At Beginning of Table"
-msgid "at beginning of table"
-msgstr "La începutul tabelului"
-
-#: templates/structure/body_for_table_summary.phtml:6
-#, php-format
-msgid "%s table"
-msgid_plural "%s tables"
-msgstr[0] "%s tabel"
-msgstr[1] "%s tabele"
-msgstr[2] "%s de tabele"
-
-#: templates/structure/body_for_table_summary.phtml:17
-msgid "Sum"
-msgstr "Sumă"
-
-#: templates/structure/check_all_tables.phtml:6
-msgid "Check tables having overhead"
-msgstr "Verificare depășit"
-
-#: templates/structure/check_all_tables.phtml:10
-#, fuzzy
-#| msgid "Show color"
-msgid "Show create"
-msgstr "Arată culoarea"
-
-#: templates/structure/check_all_tables.phtml:27
-msgid "Prefix"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:28
-msgid "Add prefix to table"
-msgstr "Adaugă prefix la tabelă"
-
-#: templates/structure/check_all_tables.phtml:29
-msgid "Replace table prefix"
-msgstr "Înlocuiește prefixul tabelei"
-
-#: templates/structure/check_all_tables.phtml:30
-msgid "Copy table with prefix"
-msgstr "Copiază tabelul cu prefix"
-
-#: templates/structure/check_all_tables.phtml:36
-#, fuzzy
-#| msgid "CHAR textarea columns"
-msgid "Add columns to central list"
-msgstr "coloane textarea CHAR"
-
-#: templates/structure/check_all_tables.phtml:37
-msgid "Remove columns from central list"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:38
-#, fuzzy
-#| msgid "CHAR textarea columns"
-msgid "Make consistent with central list"
-msgstr "coloane textarea CHAR"
-
-#: templates/structure/display_structure.phtml:140 view_create.php:181
-#, fuzzy
-#| msgid "Print view"
-msgid "Edit view"
-msgstr "Vizualizare imprimare"
-
-#: templates/structure/display_table_stats.phtml:9
-msgid "Space usage"
-msgstr "Utilizare spațiu"
-
-#: templates/structure/display_table_stats.phtml:27
-#: templates/structure/table_header.phtml:74
-msgid "Overhead"
-msgstr "Asupra"
-
-#: templates/structure/display_table_stats.phtml:32
-msgid "Effective"
-msgstr "Efectiv"
-
-#: templates/structure/favorite_anchor.phtml:12
-#, fuzzy
-#| msgid "Add a new server"
-msgid "Add to Favorites"
-msgstr "Adaugă un server nou"
-
-#: templates/structure/move_columns_dialog.phtml:1
-#: templates/structure/optional_action_links.phtml:21
-#, fuzzy
-#| msgid "Add columns"
-msgid "Move columns"
-msgstr "Adaugă coloane"
-
-#: templates/structure/move_columns_dialog.phtml:2
-msgid "Move the columns by dragging them up and down."
-msgstr ""
-
-#: templates/structure/optional_action_links.phtml:9
-msgid "Propose table structure"
-msgstr "Propune structura de tabele"
-
-#: templates/structure/optional_action_links.phtml:24
-#, fuzzy
-#| msgid "Propose table structure"
-msgid "Improve table structure"
-msgstr "Propune structura de tabele"
-
-#: templates/structure/optional_action_links.phtml:30
-msgid "Track view"
-msgstr "Vedere de monitorizare"
-
-#: templates/structure/row_stats_table.phtml:3
-#, fuzzy
-#| msgid "Row Statistics"
-msgid "Row statistics"
-msgstr "Statisticile rândului"
-
-#: templates/structure/row_stats_table.phtml:9
-msgid "static"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:11
-msgid "dynamic"
-msgstr "dinamic"
-
-#: templates/structure/row_stats_table.phtml:22
-msgid "partitioned"
-msgstr "partiționat"
-
-#: templates/structure/row_stats_table.phtml:54
-msgid "Row length"
-msgstr "Lungime linie"
-
-#: templates/structure/row_stats_table.phtml:66
-msgid "Row size"
-msgstr "Mărime rând"
-
-#: templates/structure/row_stats_table.phtml:73
-msgid "Next autoindex"
-msgstr ""
-
-#: templates/structure/secondary_tabs.phtml:14
-#, fuzzy
-#| msgid "Relation view"
-msgid "Relation view"
-msgstr "Vizualizare relațională"
-
-#: templates/structure/show_create.phtml:2
-#, fuzzy
-#| msgid "Show SQL queries"
-msgid "Showing create queries"
-msgstr "Afișează interogările SQL"
-
-#: templates/structure/sortable_header.phtml:13
-msgid "Sort"
-msgstr "Sortare"
-
-#: templates/structure/table_header.phtml:42
-#, fuzzy
-#| msgid "May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]"
-msgid ""
-"May be approximate. Click on the number to get the exact count. See "
-"[doc@faq3-11]FAQ 3.11[/doc]."
-msgstr "Poate fi aproximativ. Vezi [doc@faq3-11]FAQ 3.11[/doc]"
-
-#: templates/structure/table_structure_row.phtml:46
-#, fuzzy, php-format
-#| msgid "Table %s has been dropped."
-msgid "Column %s has been dropped."
-msgstr "Tabelul %s a fost aruncat"
-
-#: templates/structure/tracking_icon.phtml:4
-msgid "Tracking is active."
-msgstr "Monitorizarea este activată."
-
-#: templates/structure/tracking_icon.phtml:8
-msgid "Tracking is not active."
-msgstr "Monitorizarea nu este activată."
-
-#: templates/table/create_table.phtml:15
-#, fuzzy
-#| msgid "Number of fields"
-msgid "Number of columns"
-msgstr "Număr de câmpuri"
-
-#: templates/table/options.phtml:8
-msgid "Select columns (at least one):"
-msgstr "Selectaţi coloanele (cel puţin una):"
-
-#: templates/table/options.phtml:37
-msgid "Add search conditions (body of the \"where\" clause):"
-msgstr "Adaugă condiție de căutare (parte a comenzii \"where\"):"
-
-#: templates/table/options.phtml:45
-msgid "Number of rows per page"
-msgstr "Numărul de înregistrări pe pagină"
-
-#: templates/table/options.phtml:56
-msgid "Display order:"
-msgstr "Ordine de afișare:"
-
-#: templates/table/options_zoom.phtml:6
-msgid "Use this column to label each point"
-msgstr "Foloseşte această coloana pentru a eticheta fiecare punct"
-
-#: templates/table/options_zoom.phtml:35
-msgid "Maximum rows to plot"
-msgstr "Numărul maxim de afişat"
-
-#: templates/table/replace_preview.phtml:13
-msgid "Find and replace - preview"
-msgstr "Caută şi înlocuieşte - previzualizare"
-
-#: templates/table/replace_preview.phtml:18
-msgid "Original string"
-msgstr "Textul original"
-
-#: templates/table/replace_preview.phtml:19
-msgid "Replaced string"
-msgstr "Text înlocuit"
-
-#: templates/table/replace_preview.phtml:40
-msgid "Replace"
-msgstr "Înlocuire"
-
-#: templates/table/rows_zoom.phtml:16
-msgid "Additional search criteria"
-msgstr "Criterii de căutare suplimentare"
-
-#: templates/table/search_and_replace.phtml:3
-msgid "Replace with:"
-msgstr "Înlocuiţi cu:"
-
-#: templates/table/search_and_replace.phtml:22
-msgid "Use regular expression"
-msgstr "Utilizați o expresie regulată"
-
-#: templates/table/selection_form.phtml:12
-msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
-msgstr ""
-"Faceți o \"interogare prin exemplu\" (metacaracter: \"%\") pentru două "
-"coloane diferite"
-
-#: templates/table/selection_form.phtml:34
-msgid "Do a \"query by example\" (wildcard: \"%\")"
-msgstr "Execută o interogare prin exemplu (metacaracter: \"%\")"
-
-#: templates/table/zoom_result_form.phtml:7
-msgid "Browse/Edit the points"
-msgstr "Parcurge/Editează punctele"
-
-#: templates/table/zoom_result_form.phtml:15
-msgid "How to use"
-msgstr "Cum să utilizaţi"
-
-#: templates/table/zoom_result_form.phtml:23
-msgid "Reset zoom"
-msgstr "Resetare zoom"
-
-#: templates/tbl_chart.phtml:17
+#: templates/table/chart/tbl_chart.phtml:17
 msgctxt "Chart type"
 msgid "Bar"
 msgstr "Bară"
 
-#: templates/tbl_chart.phtml:21
+#: templates/table/chart/tbl_chart.phtml:21
 msgctxt "Chart type"
 msgid "Column"
 msgstr "Coloană"
 
-#: templates/tbl_chart.phtml:25
+#: templates/table/chart/tbl_chart.phtml:25
 msgctxt "Chart type"
 msgid "Line"
 msgstr "Linie"
 
-#: templates/tbl_chart.phtml:29
+#: templates/table/chart/tbl_chart.phtml:29
 #, fuzzy
 #| msgid "Engines"
 msgctxt "Chart type"
 msgid "Spline"
 msgstr "Motoare"
 
-#: templates/tbl_chart.phtml:33
+#: templates/table/chart/tbl_chart.phtml:33
 msgctxt "Chart type"
 msgid "Area"
 msgstr "Suprafață"
 
-#: templates/tbl_chart.phtml:37
+#: templates/table/chart/tbl_chart.phtml:37
 msgctxt "Chart type"
 msgid "Pie"
 msgstr "Diagramă circulară"
 
-#: templates/tbl_chart.phtml:41
+#: templates/table/chart/tbl_chart.phtml:41
 msgctxt "Chart type"
 msgid "Timeline"
 msgstr "Cronologie"
 
-#: templates/tbl_chart.phtml:45
+#: templates/table/chart/tbl_chart.phtml:45
 msgctxt "Chart type"
 msgid "Scatter"
 msgstr ""
 
-#: templates/tbl_chart.phtml:50
+#: templates/table/chart/tbl_chart.phtml:50
 #, fuzzy
 #| msgid "Packed"
 msgid "Stacked"
 msgstr "Împachetat"
 
-#: templates/tbl_chart.phtml:53
+#: templates/table/chart/tbl_chart.phtml:53
 msgid "Chart title"
 msgstr "Titlul diagramei"
 
-#: templates/tbl_chart.phtml:57
+#: templates/table/chart/tbl_chart.phtml:57
 msgid "X-Axis:"
 msgstr "Axa X:"
 
-#: templates/tbl_chart.phtml:72
+#: templates/table/chart/tbl_chart.phtml:72
 msgid "Series:"
 msgstr "Serii:"
 
-#: templates/tbl_chart.phtml:102
+#: templates/table/chart/tbl_chart.phtml:102
 msgid "X-Axis label:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:104
+#: templates/table/chart/tbl_chart.phtml:104
 msgid "X Values"
 msgstr "Valori X"
 
-#: templates/tbl_chart.phtml:107
+#: templates/table/chart/tbl_chart.phtml:107
 msgid "Y-Axis label:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:115
+#: templates/table/chart/tbl_chart.phtml:115
 msgid "Series names are in a column"
 msgstr ""
 
-#: templates/tbl_chart.phtml:118
+#: templates/table/chart/tbl_chart.phtml:118
 #, fuzzy
 #| msgid "Inside column:"
 msgid "Series column:"
 msgstr "In interiorul coloanei::"
 
-#: templates/tbl_chart.phtml:130
+#: templates/table/chart/tbl_chart.phtml:130
 #, fuzzy
 #| msgid "Values for column %s"
 msgid "Value Column:"
 msgstr "Valori pentru coloana %s"
 
-#: templates/tbl_chart.phtml:150
+#: templates/table/chart/tbl_chart.phtml:150
 #, fuzzy
 #| msgid "Save as file"
 msgid "Save chart as image"
 msgstr "Salvează ca fișier"
 
-#: templates/tbl_relation/common_form.phtml:7
+#: templates/table/gis_visualization/gis_visualization.phtml:3
+msgid "Display GIS Visualization"
+msgstr "Afișează Vizualizarea GIS"
+
+#: templates/table/gis_visualization/gis_visualization.phtml:8
+#, fuzzy
+#| msgid "Add/Delete Field Columns"
+msgid "Label column"
+msgstr "Adaugă/șterge coloane"
+
+#: templates/table/gis_visualization/gis_visualization.phtml:11
+msgid "-- None --"
+msgstr "-- Niciunul --"
+
+#: templates/table/gis_visualization/gis_visualization.phtml:19
+#, fuzzy
+#| msgid "Log file count"
+msgid "Spatial column"
+msgstr "Număr de fișiere-jurnal"
+
+#: templates/table/index_form.phtml:16
+msgid "Index name:"
+msgstr "Denumire index:"
+
+#: templates/table/index_form.phtml:19
+msgid ""
+"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
+msgstr "Numele „PRIMARY” <b>trebuie</b> să fie <b>numai</b> la cheia primară!"
+
+#: templates/table/index_form.phtml:40
+#, fuzzy
+#| msgid "Index cache size"
+msgid "Index choice:"
+msgstr "Dimensiune cache index"
+
+#: templates/table/index_form.phtml:57
+msgid "Key block size:"
+msgstr ""
+
+#: templates/table/index_form.phtml:74
+msgid "Index type:"
+msgstr "Tip index:"
+
+#: templates/table/index_form.phtml:86
+#, fuzzy
+#| msgid "User:"
+msgid "Parser:"
+msgstr "Utilizator:"
+
+#: templates/table/index_form.phtml:102
+msgid "Comment:"
+msgstr "Comentariu:"
+
+#: templates/table/index_form.phtml:149 templates/table/index_form.phtml:190
+#, fuzzy
+#| msgid "Drag to reorder"
+msgid "Drag to reorder"
+msgstr "Drag and drop pentru reordonare"
+
+#: templates/table/relation/common_form.phtml:7
 msgid "Internal relations"
 msgstr "Relații interne"
 
-#: templates/tbl_relation/common_form.phtml:11
+#: templates/table/relation/common_form.phtml:11
 msgid "Internal relation"
 msgstr "Relație internă"
 
-#: templates/tbl_relation/common_form.phtml:14
+#: templates/table/relation/common_form.phtml:14
 msgid ""
 "An internal relation is not necessary when a corresponding FOREIGN KEY "
 "relation exists."
@@ -16488,59 +16318,253 @@ msgstr ""
 "Nu este necesară o relație internă atunci cînd există o cheie externă "
 "corespondentă."
 
-#: templates/tbl_relation/common_form.phtml:37
+#: templates/table/relation/common_form.phtml:37
 #, fuzzy
 #| msgid "Foreign key constraint"
 msgid "Foreign key constraints"
 msgstr "Constrîngere de cheie străină"
 
-#: templates/tbl_relation/common_form.phtml:40
+#: templates/table/relation/common_form.phtml:40
 msgid "Actions"
 msgstr "Acțiuni"
 
-#: templates/tbl_relation/common_form.phtml:41
+#: templates/table/relation/common_form.phtml:41
 #, fuzzy
 #| msgid "Constraints for table"
 msgid "Constraint properties"
 msgstr "Restrictii pentru tabele"
 
-#: templates/tbl_relation/common_form.phtml:44
+#: templates/table/relation/common_form.phtml:44
 msgid ""
 "Only columns with index will be displayed. You can define an index below."
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:49
+#: templates/table/relation/common_form.phtml:49
 msgid "Foreign key constraint"
 msgstr "Constrîngere de cheie străină"
 
-#: templates/tbl_relation/common_form.phtml:81
+#: templates/table/relation/common_form.phtml:81
 #, fuzzy
 #| msgid "Add constraints"
 msgid "+ Add constraint"
 msgstr "Adaugă constrângeri"
 
-#: templates/tbl_relation/common_form.phtml:91
+#: templates/table/relation/common_form.phtml:91
 #, fuzzy
 #| msgid "Choose column to display"
 msgid "Choose column to display:"
 msgstr "Selectează coloana pentru afișare"
 
-#: templates/tbl_relation/foreign_key_row.phtml:13
+#: templates/table/relation/foreign_key_row.phtml:13
 #, fuzzy, php-format
 #| msgid "Foreign key constraint"
 msgid "Foreign key constraint %s has been dropped"
 msgstr "Constrîngere de cheie străină"
 
-#: templates/tbl_relation/foreign_key_row.phtml:102
+#: templates/table/relation/foreign_key_row.phtml:102
 msgid "Constraint name"
 msgstr "Denumire constrîngere"
 
-#: templates/tbl_relation/foreign_key_row.phtml:157
+#: templates/table/relation/foreign_key_row.phtml:157
 #, fuzzy
 #| msgid "Add %s field(s)"
 msgid "+ Add column"
 msgstr "Adaugă %s câmp(uri)"
 
+#: templates/table/search/options.phtml:8
+msgid "Select columns (at least one):"
+msgstr "Selectaţi coloanele (cel puţin una):"
+
+#: templates/table/search/options.phtml:37
+msgid "Add search conditions (body of the \"where\" clause):"
+msgstr "Adaugă condiție de căutare (parte a comenzii \"where\"):"
+
+#: templates/table/search/options.phtml:45
+msgid "Number of rows per page"
+msgstr "Numărul de înregistrări pe pagină"
+
+#: templates/table/search/options.phtml:56
+msgid "Display order:"
+msgstr "Ordine de afișare:"
+
+#: templates/table/search/options_zoom.phtml:6
+msgid "Use this column to label each point"
+msgstr "Foloseşte această coloana pentru a eticheta fiecare punct"
+
+#: templates/table/search/options_zoom.phtml:35
+msgid "Maximum rows to plot"
+msgstr "Numărul maxim de afişat"
+
+#: templates/table/search/replace_preview.phtml:13
+msgid "Find and replace - preview"
+msgstr "Caută şi înlocuieşte - previzualizare"
+
+#: templates/table/search/replace_preview.phtml:18
+msgid "Original string"
+msgstr "Textul original"
+
+#: templates/table/search/replace_preview.phtml:19
+msgid "Replaced string"
+msgstr "Text înlocuit"
+
+#: templates/table/search/replace_preview.phtml:40
+msgid "Replace"
+msgstr "Înlocuire"
+
+#: templates/table/search/rows_zoom.phtml:16
+msgid "Additional search criteria"
+msgstr "Criterii de căutare suplimentare"
+
+#: templates/table/search/search_and_replace.phtml:3
+msgid "Replace with:"
+msgstr "Înlocuiţi cu:"
+
+#: templates/table/search/search_and_replace.phtml:22
+msgid "Use regular expression"
+msgstr "Utilizați o expresie regulată"
+
+#: templates/table/search/selection_form.phtml:12
+msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
+msgstr ""
+"Faceți o \"interogare prin exemplu\" (metacaracter: \"%\") pentru două "
+"coloane diferite"
+
+#: templates/table/search/selection_form.phtml:34
+msgid "Do a \"query by example\" (wildcard: \"%\")"
+msgstr "Execută o interogare prin exemplu (metacaracter: \"%\")"
+
+#: templates/table/search/zoom_result_form.phtml:7
+msgid "Browse/Edit the points"
+msgstr "Parcurge/Editează punctele"
+
+#: templates/table/search/zoom_result_form.phtml:15
+msgid "How to use"
+msgstr "Cum să utilizaţi"
+
+#: templates/table/search/zoom_result_form.phtml:23
+msgid "Reset zoom"
+msgstr "Resetare zoom"
+
+#: templates/table/secondary_tabs.phtml:14
+#, fuzzy
+#| msgid "Relation view"
+msgid "Relation view"
+msgstr "Vizualizare relațională"
+
+#: templates/table/structure/actions_in_table_structure.phtml:14
+#, php-format
+msgid "A primary key has been added on %s."
+msgstr "A fost adăugată o cheie primară la %s."
+
+#: templates/table/structure/actions_in_table_structure.phtml:34
+#: templates/table/structure/actions_in_table_structure.phtml:54
+#: templates/table/structure/actions_in_table_structure.phtml:79
+#: templates/table/structure/actions_in_table_structure.phtml:101
+#, php-format
+msgid "An index has been added on %s."
+msgstr "A fost adăugat un index la %s."
+
+#: templates/table/structure/actions_in_table_structure.phtml:130
+#: templates/table/structure/check_all_table_column.phtml:59
+#, fuzzy
+#| msgid "Remove chart"
+msgid "Remove from central columns"
+msgstr "Elimină graficul"
+
+#: templates/table/structure/actions_in_table_structure.phtml:138
+#: templates/table/structure/check_all_table_column.phtml:55
+#, fuzzy
+#| msgid "CHAR textarea columns"
+msgid "Add to central columns"
+msgstr "coloane textarea CHAR"
+
+#: templates/table/structure/add_column.phtml:7
+#, fuzzy, php-format
+#| msgid "Add %s field(s)"
+msgid "Add %s column(s)"
+msgstr "Adaugă %s câmp(uri)"
+
+#: templates/table/structure/add_column.phtml:12
+#, fuzzy
+#| msgid "At Beginning of Table"
+msgid "at beginning of table"
+msgstr "La începutul tabelului"
+
+#: templates/table/structure/display_structure.phtml:140 view_create.php:181
+#, fuzzy
+#| msgid "Print view"
+msgid "Edit view"
+msgstr "Vizualizare imprimare"
+
+#: templates/table/structure/display_table_stats.phtml:9
+msgid "Space usage"
+msgstr "Utilizare spațiu"
+
+#: templates/table/structure/display_table_stats.phtml:32
+msgid "Effective"
+msgstr "Efectiv"
+
+#: templates/table/structure/move_columns_dialog.phtml:1
+#: templates/table/structure/optional_action_links.phtml:21
+#, fuzzy
+#| msgid "Add columns"
+msgid "Move columns"
+msgstr "Adaugă coloane"
+
+#: templates/table/structure/move_columns_dialog.phtml:2
+msgid "Move the columns by dragging them up and down."
+msgstr ""
+
+#: templates/table/structure/optional_action_links.phtml:9
+msgid "Propose table structure"
+msgstr "Propune structura de tabele"
+
+#: templates/table/structure/optional_action_links.phtml:24
+#, fuzzy
+#| msgid "Propose table structure"
+msgid "Improve table structure"
+msgstr "Propune structura de tabele"
+
+#: templates/table/structure/optional_action_links.phtml:30
+msgid "Track view"
+msgstr "Vedere de monitorizare"
+
+#: templates/table/structure/row_stats_table.phtml:3
+#, fuzzy
+#| msgid "Row Statistics"
+msgid "Row statistics"
+msgstr "Statisticile rândului"
+
+#: templates/table/structure/row_stats_table.phtml:9
+msgid "static"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:11
+msgid "dynamic"
+msgstr "dinamic"
+
+#: templates/table/structure/row_stats_table.phtml:22
+msgid "partitioned"
+msgstr "partiționat"
+
+#: templates/table/structure/row_stats_table.phtml:54
+msgid "Row length"
+msgstr "Lungime linie"
+
+#: templates/table/structure/row_stats_table.phtml:66
+msgid "Row size"
+msgstr "Mărime rând"
+
+#: templates/table/structure/row_stats_table.phtml:73
+msgid "Next autoindex"
+msgstr ""
+
+#: templates/table/structure/table_structure_row.phtml:46
+#, fuzzy, php-format
+#| msgid "Table %s has been dropped."
+msgid "Column %s has been dropped."
+msgstr "Tabelul %s a fost aruncat"
+
 #: themes.php:17 themes.php:22
 msgid "Theme"
 msgstr "Temă"
@@ -17863,6 +17887,10 @@ msgstr ""
 msgid "concurrent_insert is set to 0"
 msgstr "concurrent_insert este setat cu 0"
 
+#, fuzzy
+#~ msgid "Read as multibytes"
+#~ msgstr "Citiri gresite"
+
 #~ msgid "Relational display column"
 #~ msgstr "Afișarea câmpului relațional"
 
diff --git a/po/ru.po b/po/ru.po
index 1639d954c5..57ce781f03 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 4.5.0-dev\n"
 "Report-Msgid-Bugs-To: developers@phpmyadmin.net\n"
-"POT-Creation-Date: 2015-08-08 13:53-0400\n"
+"POT-Creation-Date: 2015-08-12 08:10-0400\n"
 "PO-Revision-Date: 2015-07-25 20:50+0200\n"
 "Last-Translator: Andrey Aleksanyants <aaleksanyants@yahoo.com>\n"
 "Language-Team: Russian <https://hosted.weblate.org/projects/phpmyadmin/"
@@ -54,7 +54,7 @@ msgid "Table comments:"
 msgstr "Комментарии к таблице:"
 
 #: db_datadict.php:104 libraries/Index.class.php:699
-#: libraries/insert_edit.lib.php:1567
+#: libraries/insert_edit.lib.php:1565
 #: libraries/navigation/Nodes/Node_Column.class.php:30
 #: libraries/plugins/export/ExportHtmlword.class.php:280
 #: libraries/plugins/export/ExportHtmlword.class.php:375
@@ -68,13 +68,14 @@ msgstr "Комментарии к таблице:"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1023
 #: libraries/tracking.lib.php:879 libraries/tracking.lib.php:975
 #: templates/columns_definitions/column_name.phtml:18
-#: templates/index_form.phtml:124 templates/table/table_header.phtml:6
-#: templates/table/zoom_result_form.phtml:33
-#: templates/tbl_relation/common_form.phtml:10
-#: templates/tbl_relation/common_form.phtml:43
-#: templates/tbl_relation/foreign_key_row.phtml:194
-#: templates/tbl_relation/foreign_key_row.phtml:206
-#: templates/tbl_relation/internal_relational_row.phtml:71
+#: templates/table/index_form.phtml:124
+#: templates/table/relation/common_form.phtml:10
+#: templates/table/relation/common_form.phtml:43
+#: templates/table/relation/foreign_key_row.phtml:194
+#: templates/table/relation/foreign_key_row.phtml:206
+#: templates/table/relation/internal_relational_row.phtml:71
+#: templates/table/search/table_header.phtml:6
+#: templates/table/search/zoom_result_form.phtml:33
 msgid "Column"
 msgstr "Столбец"
 
@@ -92,21 +93,21 @@ msgstr "Столбец"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1001
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1024
 #: libraries/rte/rte_list.lib.php:75 libraries/rte/rte_list.lib.php:103
-#: libraries/rte/rte_routines.lib.php:802
-#: libraries/rte/rte_routines.lib.php:831
-#: libraries/rte/rte_routines.lib.php:1493
+#: libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_routines.lib.php:922
+#: libraries/rte/rte_routines.lib.php:1584
 #: libraries/server_privileges.lib.php:2369 libraries/tracking.lib.php:880
 #: libraries/tracking.lib.php:972
 #: templates/columns_definitions/table_fields_definitions.phtml:11
-#: templates/structure/table_header.phtml:48
-#: templates/structure/table_structure_header.phtml:6
-#: templates/table/table_header.phtml:7
+#: templates/database/structure/table_header.phtml:48
+#: templates/table/search/table_header.phtml:7
+#: templates/table/structure/table_structure_header.phtml:6
 msgid "Type"
 msgstr "Тип"
 
 #: db_datadict.php:106 libraries/Index.class.php:702
 #: libraries/central_columns.lib.php:708
-#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1576
+#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1574
 #: libraries/plugins/export/ExportHtmlword.class.php:286
 #: libraries/plugins/export/ExportHtmlword.class.php:381
 #: libraries/plugins/export/ExportLatex.class.php:509
@@ -119,8 +120,8 @@ msgstr "Тип"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1026
 #: libraries/tracking.lib.php:882 libraries/tracking.lib.php:978
 #: templates/columns_definitions/table_fields_definitions.phtml:39
-#: templates/structure/table_structure_header.phtml:9
-#: templates/table/zoom_result_form.phtml:34
+#: templates/table/search/zoom_result_form.phtml:34
+#: templates/table/structure/table_structure_header.phtml:9
 msgid "Null"
 msgstr "Null"
 
@@ -138,8 +139,8 @@ msgstr "Null"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1027
 #: libraries/replication_gui.lib.php:153 libraries/tracking.lib.php:883
 #: templates/columns_definitions/table_fields_definitions.phtml:25
-#: templates/structure/body_for_table_summary.phtml:55
-#: templates/structure/table_structure_header.phtml:10
+#: templates/database/structure/body_for_table_summary.phtml:55
+#: templates/table/structure/table_structure_header.phtml:10
 msgid "Default"
 msgstr "По умолчанию"
 
@@ -167,19 +168,19 @@ msgid "Comments"
 msgstr "Комментарии"
 
 #: db_datadict.php:146
-#: libraries/controllers/StructureController.class.php:1960
-#: libraries/controllers/StructureController.class.php:1965
+#: libraries/controllers/TableStructureController.class.php:951
+#: libraries/controllers/TableStructureController.class.php:956
 #: libraries/tracking.lib.php:922
 #: templates/columns_definitions/column_indexes.phtml:6
-#: templates/structure/check_all_table_column.phtml:22
-#: templates/structure/display_structure.phtml:74
+#: templates/table/structure/check_all_table_column.phtml:22
+#: templates/table/structure/display_structure.phtml:74
 msgid "Primary"
 msgstr "Первичный"
 
 #: db_datadict.php:156 js/messages.php:317 libraries/Index.class.php:567
 #: libraries/Index.class.php:606 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261 libraries/mult_submits.lib.php:403
+#: libraries/config/FormDisplay.tpl.php:272 libraries/mult_submits.lib.php:403
 #: libraries/mult_submits.lib.php:417
 #: libraries/plugins/export/ExportHtmlword.class.php:630
 #: libraries/plugins/export/ExportLatex.class.php:589
@@ -195,20 +196,20 @@ msgstr "Первичный"
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1010 libraries/tracking.lib.php:1015
 #: prefs_manage.php:140 templates/prefs_autoload.phtml:15
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "No"
 msgstr "Нет"
 
 #: db_datadict.php:156 js/messages.php:443 libraries/Index.class.php:568
 #: libraries/Index.class.php:605 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261
-#: libraries/controllers/StructureController.class.php:1344
-#: libraries/controllers/StructureController.class.php:2223
-#: libraries/controllers/StructureController.class.php:2232
-#: libraries/controllers/StructureController.class.php:2237
-#: libraries/controllers/StructureController.class.php:2242
-#: libraries/controllers/StructureController.class.php:2247
+#: libraries/config/FormDisplay.tpl.php:272
+#: libraries/controllers/TableStructureController.class.php:539
+#: libraries/controllers/TableStructureController.class.php:1201
+#: libraries/controllers/TableStructureController.class.php:1210
+#: libraries/controllers/TableStructureController.class.php:1215
+#: libraries/controllers/TableStructureController.class.php:1220
+#: libraries/controllers/TableStructureController.class.php:1225
 #: libraries/mult_submits.inc.php:82 libraries/mult_submits.inc.php:178
 #: libraries/mult_submits.lib.php:339 libraries/mult_submits.lib.php:372
 #: libraries/mult_submits.lib.php:401 libraries/mult_submits.lib.php:415
@@ -217,8 +218,8 @@ msgstr "Нет"
 #: libraries/plugins/export/ExportOdt.class.php:756
 #: libraries/plugins/export/ExportTexytext.class.php:567
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1077
-#: libraries/server_databases.lib.php:464
-#: libraries/server_databases.lib.php:474
+#: libraries/server_databases.lib.php:475
+#: libraries/server_databases.lib.php:485
 #: libraries/server_privileges.lib.php:2546
 #: libraries/server_privileges.lib.php:2727
 #: libraries/server_privileges.lib.php:2748
@@ -228,7 +229,7 @@ msgstr "Нет"
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1008 libraries/tracking.lib.php:1013
 #: prefs_manage.php:138 templates/prefs_autoload.phtml:14
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "Yes"
 msgstr "Да"
 
@@ -238,7 +239,7 @@ msgstr "Отобразить дамп (схему) базы данных"
 
 #: db_export.php:37 db_tracking.php:90 export.php:382
 #: libraries/DBQbe.class.php:326
-#: libraries/controllers/StructureController.class.php:231
+#: libraries/controllers/DatabaseStructureController.class.php:170
 #: libraries/navigation/NavigationTree.class.php:897
 msgid "No tables found in database."
 msgstr "Таблиц в базе данных не обнаружено."
@@ -249,14 +250,14 @@ msgstr "Таблиц в базе данных не обнаружено."
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:26
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:120
-#: templates/structure/show_create.phtml:18
+#: templates/database/structure/show_create.phtml:18
 msgid "Tables"
 msgstr "Таблицы"
 
 #: db_export.php:52 libraries/Menu.class.php:317 libraries/Menu.class.php:425
-#: libraries/Util.class.php:3333 libraries/Util.class.php:3343
-#: libraries/Util.class.php:3349 libraries/Util.class.php:3629
-#: libraries/Util.class.php:4327 libraries/Util.class.php:4344
+#: libraries/Util.class.php:3339 libraries/Util.class.php:3349
+#: libraries/Util.class.php:3355 libraries/Util.class.php:3635
+#: libraries/Util.class.php:4333 libraries/Util.class.php:4350
 #: libraries/central_columns.lib.php:728 libraries/config.values.php:39
 #: libraries/config.values.php:47 libraries/config.values.php:109
 #: libraries/config.values.php:115 libraries/config/setup.forms.php:323
@@ -270,7 +271,7 @@ msgstr "Таблицы"
 #: libraries/navigation/Nodes/Node_Table.class.php:283
 #: libraries/server_privileges.lib.php:1141 libraries/tracking.lib.php:874
 #: templates/columns_definitions/table_fields_definitions.phtml:3
-#: templates/designer/table_list.phtml:28
+#: templates/database/designer/table_list.phtml:28
 msgid "Structure"
 msgstr "Структура"
 
@@ -282,7 +283,7 @@ msgstr "Структура"
 #: libraries/config/user_preferences.forms.php:292
 #: libraries/config/user_preferences.forms.php:297
 #: libraries/server_privileges.lib.php:1140
-#: templates/structure/display_table_stats.phtml:12
+#: templates/table/structure/display_table_stats.phtml:12
 msgid "Data"
 msgstr "Данные"
 
@@ -353,10 +354,10 @@ msgstr "Отслеживаемые таблицы"
 #: libraries/server_privileges.lib.php:2908
 #: libraries/server_privileges.lib.php:3145
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4346
-#: templates/structure/table_header.phtml:21
-#: templates/tbl_relation/foreign_key_row.phtml:176
-#: templates/tbl_relation/internal_relational_row.phtml:63
+#: libraries/server_privileges.lib.php:4372
+#: templates/database/structure/table_header.phtml:21
+#: templates/table/relation/foreign_key_row.phtml:176
+#: templates/table/relation/internal_relational_row.phtml:63
 msgid "Table"
 msgstr "Таблица"
 
@@ -373,7 +374,7 @@ msgid "Updated"
 msgstr "Обновлёно"
 
 #: db_tracking.php:130 js/messages.php:243 libraries/Menu.class.php:552
-#: libraries/Util.class.php:4314 libraries/config.values.php:104
+#: libraries/Util.class.php:4320 libraries/config.values.php:104
 #: libraries/rte/rte_events.lib.php:393 libraries/rte/rte_list.lib.php:101
 #: libraries/server_status_processes.lib.php:92 libraries/tracking.lib.php:279
 msgid "Status"
@@ -382,14 +383,15 @@ msgstr "Состояние"
 #: db_tracking.php:131 db_tracking.php:290 libraries/Index.class.php:693
 #: libraries/central_columns.lib.php:687 libraries/rte/rte_list.lib.php:74
 #: libraries/rte/rte_list.lib.php:89 libraries/rte/rte_list.lib.php:102
-#: libraries/server_databases.lib.php:398
+#: libraries/server_databases.lib.php:409
 #: libraries/server_privileges.lib.php:2372
 #: libraries/server_privileges.lib.php:3166
 #: libraries/server_privileges.lib.php:3342
 #: libraries/server_user_groups.lib.php:82
 #: libraries/server_variables.lib.php:189 libraries/tracking.lib.php:280
-#: libraries/tracking.lib.php:793 templates/structure/table_header.phtml:30
-#: templates/structure/table_structure_header.phtml:23
+#: libraries/tracking.lib.php:793
+#: templates/database/structure/table_header.phtml:30
+#: templates/table/structure/table_structure_header.phtml:23
 msgid "Action"
 msgstr "Действие"
 
@@ -431,7 +433,7 @@ msgid "Untracked tables"
 msgstr "Неотслеживаемые таблицы"
 
 #: db_tracking.php:305 db_tracking.php:336
-#: templates/structure/optional_action_links.phtml:17
+#: templates/table/structure/optional_action_links.phtml:17
 msgid "Track table"
 msgstr "Отслеживать таблицу"
 
@@ -483,7 +485,7 @@ msgid "Value for the column \"%s\""
 msgstr "Значение для столбца \"%s\""
 
 #: gis_data_editor.php:146
-#: templates/gis_visualization/gis_visualization.phtml:37
+#: templates/table/gis_visualization/gis_visualization.phtml:37
 msgid "Use OpenStreetMaps as Base Layer"
 msgstr "Используйте в качестве основного слоя OpenStreetMaps"
 
@@ -563,35 +565,35 @@ msgstr "Добавить геометрию"
 #: libraries/display_change_password.lib.php:162
 #: libraries/display_export.lib.php:402 libraries/display_export.lib.php:408
 #: libraries/display_import.lib.php:392 libraries/index.lib.php:44
-#: libraries/insert_edit.lib.php:1546 libraries/insert_edit.lib.php:1583
+#: libraries/insert_edit.lib.php:1544 libraries/insert_edit.lib.php:1581
 #: libraries/normalization.lib.php:165 libraries/normalization.lib.php:821
 #: libraries/operations.lib.php:38 libraries/operations.lib.php:108
 #: libraries/operations.lib.php:263 libraries/operations.lib.php:306
 #: libraries/operations.lib.php:801 libraries/operations.lib.php:874
 #: libraries/operations.lib.php:923 libraries/operations.lib.php:1337
 #: libraries/operations.lib.php:1658
-#: libraries/plugins/auth/AuthenticationCookie.class.php:244
+#: libraries/plugins/auth/AuthenticationCookie.class.php:232
 #: libraries/replication_gui.lib.php:122 libraries/replication_gui.lib.php:161
 #: libraries/replication_gui.lib.php:324 libraries/replication_gui.lib.php:461
 #: libraries/replication_gui.lib.php:906 libraries/rte/rte_events.lib.php:509
-#: libraries/rte/rte_routines.lib.php:969
-#: libraries/rte/rte_routines.lib.php:1581
+#: libraries/rte/rte_routines.lib.php:1060
+#: libraries/rte/rte_routines.lib.php:1672
 #: libraries/rte/rte_triggers.lib.php:396 libraries/server_bin_log.lib.php:61
 #: libraries/server_privileges.lib.php:705
 #: libraries/server_privileges.lib.php:2106
 #: libraries/server_privileges.lib.php:2872
 #: libraries/server_privileges.lib.php:3553
-#: libraries/server_privileges.lib.php:4627
+#: libraries/server_privileges.lib.php:4653
 #: libraries/server_user_groups.lib.php:285
 #: libraries/sql_query_form.lib.php:369 libraries/sql_query_form.lib.php:429
 #: libraries/tracking.lib.php:533 libraries/tracking.lib.php:653
 #: prefs_manage.php:277 prefs_manage.php:355
 #: templates/columns_definitions/column_definitions_form.phtml:59
-#: templates/header_location.phtml:17 templates/index_form.phtml:238
+#: templates/database/create_table.phtml:21 templates/header_location.phtml:28
 #: templates/startAndNumberOfRowsPanel.phtml:14
-#: templates/structure/add_column.phtml:25
-#: templates/table/create_table.phtml:21
-#: templates/table/selection_form.phtml:75 view_create.php:275
+#: templates/table/index_form.phtml:238
+#: templates/table/search/selection_form.phtml:75
+#: templates/table/structure/add_column.phtml:25 view_create.php:275
 #: view_operations.php:106
 msgid "Go"
 msgstr "Вперёд"
@@ -680,7 +682,7 @@ msgstr "Без необходимой библиотеки невозможна
 msgid "Could not load import plugins, please check your installation!"
 msgstr "Не удалось загрузить модули импорта. Пожалуйста, проверьте установку!"
 
-#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1466
+#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1460
 #, php-format
 msgid "Bookmark %s has been created."
 msgstr "Закладка %s создана."
@@ -719,11 +721,11 @@ msgstr ""
 msgid "Back"
 msgstr "Назад"
 
-#: index.php:148 libraries/Footer.class.php:70
+#: index.php:149 libraries/Footer.class.php:70
 msgid "phpMyAdmin Demo Server"
 msgstr "Демо-сервер phpMyAdmin"
 
-#: index.php:152
+#: index.php:153
 #, php-format
 msgid ""
 "You are using the demo server. You can do anything here, but please do not "
@@ -734,110 +736,110 @@ msgstr ""
 "пожалуйста, не изменяйте пользователей root, debian-sys-maint и pma. "
 "Дополнительная информация доступна на %s."
 
-#: index.php:162
+#: index.php:163
 msgid "General Settings"
 msgstr "Основные настройки"
 
-#: index.php:190 libraries/display_change_password.lib.php:50
+#: index.php:191 libraries/display_change_password.lib.php:50
 #: libraries/display_change_password.lib.php:53 user_password.php:247
 msgid "Change password"
 msgstr "Изменить пароль"
 
-#: index.php:206
+#: index.php:207
 msgid "Server connection collation"
 msgstr "Сопоставление кодировки соединения"
 
-#: index.php:228
+#: index.php:229
 msgid "Appearance Settings"
 msgstr "Настройки внешнего вида"
 
-#: index.php:258 prefs_manage.php:285
+#: index.php:259 prefs_manage.php:285
 msgid "More settings"
 msgstr "Дополнительные настройки"
 
-#: index.php:279
+#: index.php:280
 msgid "Database server"
 msgstr "Сервер баз данных"
 
-#: index.php:282 libraries/plugins/auth/AuthenticationCookie.class.php:181
+#: index.php:283 libraries/plugins/auth/AuthenticationCookie.class.php:169
 msgid "Server:"
 msgstr "Сервер:"
 
-#: index.php:286
+#: index.php:287
 msgid "Server type:"
 msgstr "Тип сервера:"
 
-#: index.php:290 libraries/plugins/export/ExportLatex.class.php:212
+#: index.php:291 libraries/plugins/export/ExportLatex.class.php:212
 #: libraries/plugins/export/ExportSql.class.php:687
 #: libraries/plugins/export/ExportXml.class.php:189
 msgid "Server version:"
 msgstr "Версия сервера:"
 
-#: index.php:296
+#: index.php:297
 msgid "Protocol version:"
 msgstr "Версия протокола:"
 
-#: index.php:300
+#: index.php:301
 msgid "User:"
 msgstr "Пользователь:"
 
-#: index.php:305
+#: index.php:306
 msgid "Server charset:"
 msgstr "Кодировка сервера:"
 
-#: index.php:320
+#: index.php:321
 msgid "Web server"
 msgstr "Веб-сервер"
 
-#: index.php:331
+#: index.php:332
 msgid "Database client version:"
 msgstr "Версия клиента базы данных:"
 
-#: index.php:335
+#: index.php:336
 msgid "PHP extension:"
 msgstr "PHP расширение:"
 
-#: index.php:349
+#: index.php:350
 msgid "PHP version:"
 msgstr "Версия PHP:"
 
-#: index.php:360
+#: index.php:361
 msgid "Show PHP information"
 msgstr "Показать информацию PHP"
 
-#: index.php:383
+#: index.php:384
 msgid "Version information:"
 msgstr "Информация о версии:"
 
-#: index.php:392 libraries/Util.class.php:432 libraries/Util.class.php:495
-#: libraries/config/FormDisplay.tpl.php:151
+#: index.php:393 libraries/Util.class.php:432 libraries/Util.class.php:495
+#: libraries/config/FormDisplay.tpl.php:162
 #: libraries/display_export.lib.php:577 libraries/engines/pbxt.lib.php:162
 #: libraries/navigation/NavigationHeader.class.php:196
 #: libraries/server_variables.lib.php:160
 msgid "Documentation"
 msgstr "Документация"
 
-#: index.php:399
+#: index.php:400
 msgid "Wiki"
 msgstr "Вики"
 
-#: index.php:408
+#: index.php:409
 msgid "Official Homepage"
 msgstr "Официальная страница phpMyAdmin"
 
-#: index.php:415
+#: index.php:416
 msgid "Contribute"
 msgstr "Пожертвовать"
 
-#: index.php:422
+#: index.php:423
 msgid "Get support"
 msgstr "Получить помощь"
 
-#: index.php:429
+#: index.php:430
 msgid "List of changes"
 msgstr "Список изменений"
 
-#: index.php:451
+#: index.php:452
 msgid ""
 "You are connected as 'root' with no password, which corresponds to the "
 "default MySQL privileged account. Your MySQL server is running with this "
@@ -849,7 +851,7 @@ msgstr ""
 "открыт для вторжений. Вам следует исправить данную погрешность, установив "
 "пароль для пользователя 'root'."
 
-#: index.php:468
+#: index.php:469
 msgid ""
 "You have enabled mbstring.func_overload in your PHP configuration. This "
 "option is incompatible with phpMyAdmin and might cause some data to be "
@@ -859,7 +861,7 @@ msgstr ""
 "func_overload. Для предотвращения возможной потери данных данный параметр "
 "должен быть выключен!"
 
-#: index.php:483
+#: index.php:484
 msgid ""
 "The mbstring PHP extension was not found and you seem to be using a "
 "multibyte charset. Without the mbstring extension phpMyAdmin is unable to "
@@ -869,7 +871,7 @@ msgstr ""
 "mbstring phpMyAdmin не в состоянии производить корректное разбиение строк, "
 "что может привести к непредсказуемым результатам."
 
-#: index.php:500
+#: index.php:501
 msgid ""
 "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini."
 "session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower than "
@@ -881,7 +883,7 @@ msgstr ""
 "длительность хранения cookie, определённая в phpMyAdmin. По этой причине "
 "сессия входа может закончиться быстрее установленной в phpMyAdmin."
 
-#: index.php:519
+#: index.php:520
 msgid ""
 "Login cookie store is lower than cookie validity configured in phpMyAdmin, "
 "because of this, your login will expire sooner than configured in phpMyAdmin."
@@ -889,12 +891,12 @@ msgstr ""
 "Значение длительности хранения cookie меньше, чем определено в phpMyAdmin. "
 "По этой причине сессия входа завершится быстрее установленной в phpMyAdmin."
 
-#: index.php:535
+#: index.php:536
 msgid "The configuration file now needs a secret passphrase (blowfish_secret)."
 msgstr ""
 "В конфигурационном файле необходимо задать парольную фразу (blowfish_secret)."
 
-#: index.php:548
+#: index.php:549
 msgid ""
 "Directory [code]config[/code], which is used by the setup script, still "
 "exists in your phpMyAdmin directory. It is strongly recommended to remove it "
@@ -907,7 +909,7 @@ msgstr ""
 "может быть скомпрометирована через свободный доступ к загрузке "
 "конфигурационного файла."
 
-#: index.php:564
+#: index.php:565
 #, php-format
 msgid ""
 "The phpMyAdmin configuration storage is not completely configured, some "
@@ -916,13 +918,13 @@ msgstr ""
 "Хранилище конфигурации phpMyAdmin не полностью настроено, некоторые "
 "расширенные функции были отключены. %sДля определения причины%s. "
 
-#: index.php:571
+#: index.php:572
 msgid ""
 "Or alternately go to 'Operations' tab of any database to set it up there."
 msgstr ""
 "Или перейдите на вкладку 'Операции' любой базы данных, чтобы настроить там."
 
-#: index.php:620
+#: index.php:621
 #, php-format
 msgid ""
 "Your PHP MySQL library version %s differs from your MySQL server version %s. "
@@ -931,7 +933,7 @@ msgstr ""
 "Версия клиентской библиотеки MySQL %s отличается от версии установленного "
 "MySQL-сервера %s. Это может привести к некорректной работе."
 
-#: index.php:648
+#: index.php:649
 #, php-format
 msgid ""
 "Server running with Suhosin. Please refer to %sdocumentation%s for possible "
@@ -1089,8 +1091,8 @@ msgstr ""
 msgid "Save & Close"
 msgstr "Сохранить и Закрыть"
 
-#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:404
-#: libraries/insert_edit.lib.php:1550 prefs_manage.php:361
+#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:415
+#: libraries/insert_edit.lib.php:1548 prefs_manage.php:361
 #: prefs_manage.php:372
 msgid "Reset"
 msgstr "Сбросить"
@@ -1123,7 +1125,7 @@ msgstr "Добавить индекс"
 msgid "Edit Index"
 msgstr "Редактировать индекс"
 
-#: js/messages.php:99 templates/index_form.phtml:232
+#: js/messages.php:99 templates/table/index_form.phtml:232
 #, php-format
 msgid "Add %s column(s) to index"
 msgstr "Добавить %s столбец(ы) к индексу"
@@ -1144,13 +1146,14 @@ msgstr "Составной с:"
 msgid "Please select column(s) for the index."
 msgstr "Пожалуйста, выберите столбец(ы) для индекса."
 
-#: js/messages.php:106 templates/structure/add_column.phtml:1
+#: js/messages.php:106 templates/table/structure/add_column.phtml:1
 msgid "You have to add at least one column."
 msgstr "Необходимо добавить хотя бы одно поле."
 
-#: js/messages.php:109 libraries/insert_edit.lib.php:1548
+#: js/messages.php:109 libraries/insert_edit.lib.php:1546
 #: templates/columns_definitions/column_definitions_form.phtml:162
-#: templates/index_form.phtml:237 templates/tbl_relation/common_form.phtml:106
+#: templates/table/index_form.phtml:237
+#: templates/table/relation/common_form.phtml:106
 msgid "Preview SQL"
 msgstr "Предпросмотр SQL"
 
@@ -1167,7 +1170,7 @@ msgid "SQL query:"
 msgstr "SQL запрос:"
 
 #. l10n: Default label for the y-Axis of Charts
-#: js/messages.php:118 templates/tbl_chart.phtml:109
+#: js/messages.php:118 templates/table/chart/tbl_chart.phtml:109
 msgid "Y Values"
 msgstr "Значения Y"
 
@@ -1322,7 +1325,7 @@ msgstr "Отослано байт"
 msgid "Bytes received"
 msgstr "Принято байт"
 
-#: js/messages.php:169 libraries/server_status.lib.php:226
+#: js/messages.php:169 libraries/server_status.lib.php:235
 msgid "Connections"
 msgstr "Соединения"
 
@@ -1379,12 +1382,12 @@ msgstr "%d таблиц(а)"
 msgid "Questions"
 msgstr "Вопросы"
 
-#: js/messages.php:184 libraries/server_status.lib.php:134
+#: js/messages.php:184 libraries/server_status.lib.php:143
 msgid "Traffic"
 msgstr "Трафик"
 
 #: js/messages.php:185 libraries/Menu.class.php:586
-#: libraries/Util.class.php:4318 libraries/server_status_monitor.lib.php:257
+#: libraries/Util.class.php:4324 libraries/server_status_monitor.lib.php:257
 msgid "Settings"
 msgstr "Настройки"
 
@@ -1404,8 +1407,9 @@ msgstr "Пожалуйста, добавьте в серию хотя бы од
 #: libraries/server_status_monitor.lib.php:236
 #: libraries/server_status_processes.lib.php:308
 #: templates/columns_definitions/transformation.phtml:4
-#: templates/designer/options_panel.phtml:178
-#: templates/table/options_zoom.phtml:12 templates/table/rows_zoom.phtml:26
+#: templates/database/designer/options_panel.phtml:178
+#: templates/table/search/options_zoom.phtml:12
+#: templates/table/search/rows_zoom.phtml:26
 msgid "None"
 msgstr "Ниодного"
 
@@ -1695,8 +1699,8 @@ msgstr ""
 
 #: js/messages.php:270 libraries/Menu.class.php:352
 #: libraries/Menu.class.php:455 libraries/Menu.class.php:582
-#: libraries/Util.class.php:4317 libraries/Util.class.php:4332
-#: libraries/Util.class.php:4349 libraries/config/messages.inc.php:258
+#: libraries/Util.class.php:4323 libraries/Util.class.php:4338
+#: libraries/Util.class.php:4355 libraries/config/messages.inc.php:258
 #: libraries/display_import.lib.php:105
 #: libraries/server_status_monitor.lib.php:318 prefs_manage.php:238
 #: setup/frames/menu.inc.php:26
@@ -1756,13 +1760,13 @@ msgid "Formatting SQL..."
 msgstr "Форматирование SQL..."
 
 #: js/messages.php:293 libraries/server_variables.lib.php:157
-#: templates/designer/aggregate_query_panel.phtml:63
-#: templates/designer/delete_relation_panel.phtml:28
-#: templates/designer/having_query_panel.phtml:117
-#: templates/designer/new_relation_panel.phtml:88
-#: templates/designer/options_panel.phtml:253
-#: templates/designer/rename_to_panel.phtml:45
-#: templates/designer/where_query_panel.phtml:83
+#: templates/database/designer/aggregate_query_panel.phtml:63
+#: templates/database/designer/delete_relation_panel.phtml:28
+#: templates/database/designer/having_query_panel.phtml:117
+#: templates/database/designer/new_relation_panel.phtml:88
+#: templates/database/designer/options_panel.phtml:253
+#: templates/database/designer/rename_to_panel.phtml:45
+#: templates/database/designer/where_query_panel.phtml:83
 msgid "Cancel"
 msgstr "Отменить"
 
@@ -1770,7 +1774,7 @@ msgstr "Отменить"
 msgid "Page-related settings"
 msgstr "Настройки, касающиеся страницы"
 
-#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:402
+#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:413
 msgid "Apply"
 msgstr "Применить"
 
@@ -1805,8 +1809,8 @@ msgstr "Код ошибки: %s"
 msgid "Error text: %s"
 msgstr "Текст ошибки: %s"
 
-#: js/messages.php:307 libraries/db_common.inc.php:68
-#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:450
+#: js/messages.php:307 libraries/db_common.inc.php:69
+#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:461
 msgid "No databases selected."
 msgstr "Ни одна база данных не выбрана."
 
@@ -1818,12 +1822,13 @@ msgstr "Удаление столбца"
 msgid "Adding Primary Key"
 msgstr "Добавление первичного ключа"
 
-#: js/messages.php:310 templates/designer/aggregate_query_panel.phtml:59
-#: templates/designer/having_query_panel.phtml:113
-#: templates/designer/new_relation_panel.phtml:87
-#: templates/designer/options_panel.phtml:252
-#: templates/designer/rename_to_panel.phtml:41
-#: templates/designer/where_query_panel.phtml:82
+#: js/messages.php:310
+#: templates/database/designer/aggregate_query_panel.phtml:59
+#: templates/database/designer/having_query_panel.phtml:113
+#: templates/database/designer/new_relation_panel.phtml:87
+#: templates/database/designer/options_panel.phtml:252
+#: templates/database/designer/rename_to_panel.phtml:41
+#: templates/database/designer/where_query_panel.phtml:82
 msgid "OK"
 msgstr "OK"
 
@@ -1843,7 +1848,7 @@ msgstr "Копирование базы данных"
 msgid "Changing Charset"
 msgstr "Смена кодировки"
 
-#: js/messages.php:320 libraries/Util.class.php:3217
+#: js/messages.php:320 libraries/Util.class.php:3223
 msgid "Enable foreign key checks"
 msgstr "Включить проверку внешних ключей"
 
@@ -1878,20 +1883,21 @@ msgstr "Определение хранимой функции должно со
 #: js/messages.php:334 libraries/DisplayResults.class.php:4834
 #: libraries/DisplayResults.class.php:5092 libraries/Menu.class.php:344
 #: libraries/Menu.class.php:446 libraries/Menu.class.php:578
-#: libraries/Util.class.php:3636 libraries/Util.class.php:3637
-#: libraries/Util.class.php:4316 libraries/Util.class.php:4331
-#: libraries/Util.class.php:4348 libraries/config/messages.inc.php:252
+#: libraries/Util.class.php:3642 libraries/Util.class.php:3643
+#: libraries/Util.class.php:4322 libraries/Util.class.php:4337
+#: libraries/Util.class.php:4354 libraries/config/messages.inc.php:252
 #: libraries/display_export.lib.php:173 libraries/rte/rte_list.lib.php:146
 #: libraries/server_privileges.lib.php:2211
 #: libraries/server_privileges.lib.php:2290
 #: libraries/server_privileges.lib.php:2632
 #: libraries/server_privileges.lib.php:3356
 #: libraries/server_status_monitor.lib.php:322 prefs_manage.php:303
-#: setup/frames/menu.inc.php:27 templates/structure/check_all_tables.phtml:11
+#: setup/frames/menu.inc.php:27
+#: templates/database/structure/check_all_tables.phtml:11
 msgid "Export"
 msgstr "Экспорт"
 
-#: js/messages.php:337 libraries/rte/rte_routines.lib.php:652
+#: js/messages.php:337 libraries/rte/rte_routines.lib.php:743
 msgid "ENUM/SET editor"
 msgstr "Редактор ENUM/SET"
 
@@ -1931,7 +1937,7 @@ msgstr "Отобразить поле запроса"
 #: libraries/Console.class.php:214 libraries/DisplayResults.class.php:3474
 #: libraries/DisplayResults.class.php:4818 libraries/Index.class.php:723
 #: libraries/Util.class.php:706 libraries/Util.class.php:1202
-#: libraries/Util.class.php:3634 libraries/Util.class.php:3635
+#: libraries/Util.class.php:3640 libraries/Util.class.php:3641
 #: libraries/central_columns.lib.php:851
 #: libraries/central_columns.lib.php:1193
 #: libraries/config/messages.inc.php:892
@@ -1949,7 +1955,7 @@ msgstr "Изменить"
 #: libraries/server_user_groups.lib.php:129
 #: libraries/sql_query_form.lib.php:416 libraries/tracking.lib.php:477
 #: setup/frames/index.inc.php:183 setup/frames/index.inc.php:291
-#: templates/designer/delete_relation_panel.phtml:27
+#: templates/database/designer/delete_relation_panel.phtml:27
 msgid "Delete"
 msgstr "Удалить"
 
@@ -2120,11 +2126,11 @@ msgid "No dependencies selected!"
 msgstr "Не выбраны зависимости!"
 
 #: js/messages.php:394 libraries/central_columns.lib.php:1214
-#: libraries/insert_edit.lib.php:1458 libraries/server_variables.lib.php:155
+#: libraries/insert_edit.lib.php:1456 libraries/server_variables.lib.php:155
 #: setup/frames/config.inc.php:42 setup/frames/index.inc.php:279
 #: templates/columns_definitions/column_definitions_form.phtml:165
-#: templates/gis_visualization/gis_visualization.phtml:48
-#: templates/tbl_relation/common_form.phtml:107
+#: templates/table/gis_visualization/gis_visualization.phtml:48
+#: templates/table/relation/common_form.phtml:107
 msgid "Save"
 msgstr "Сохранить"
 
@@ -2203,8 +2209,8 @@ msgid "Data point content"
 msgstr "Содержание точки данных"
 
 #: js/messages.php:430 js/messages.php:562 js/messages.php:579
-#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2573
-#: templates/index_form.phtml:154 templates/index_form.phtml:194
+#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2571
+#: templates/table/index_form.phtml:154 templates/table/index_form.phtml:194
 msgid "Ignore"
 msgstr "Игнорировать"
 
@@ -2265,8 +2271,8 @@ msgstr "Выберите внешний ключ"
 msgid "Please select the primary key or a unique key!"
 msgstr "Выберите поле основного индекса (PRIMARY) или уникального индекса!"
 
-#: js/messages.php:457 templates/designer/side_menu.phtml:91
-#: templates/designer/side_menu.phtml:94
+#: js/messages.php:457 templates/database/designer/side_menu.phtml:91
+#: templates/database/designer/side_menu.phtml:94
 msgid "Choose column to display"
 msgstr "Выбор отображаемого столбца"
 
@@ -2282,18 +2288,18 @@ msgstr ""
 msgid "Page name"
 msgstr "Название страницы"
 
-#: js/messages.php:463 templates/designer/side_menu.phtml:56
-#: templates/designer/side_menu.phtml:59
+#: js/messages.php:463 templates/database/designer/side_menu.phtml:56
+#: templates/database/designer/side_menu.phtml:59
 msgid "Save page"
 msgstr "Сохранить страницу"
 
-#: js/messages.php:464 templates/designer/side_menu.phtml:63
-#: templates/designer/side_menu.phtml:66
+#: js/messages.php:464 templates/database/designer/side_menu.phtml:63
+#: templates/database/designer/side_menu.phtml:66
 msgid "Save page as"
 msgstr "Сохранить страницу как"
 
-#: js/messages.php:465 templates/designer/side_menu.phtml:49
-#: templates/designer/side_menu.phtml:52
+#: js/messages.php:465 templates/database/designer/side_menu.phtml:49
+#: templates/database/designer/side_menu.phtml:52
 msgid "Open page"
 msgstr "Открыть страницу"
 
@@ -2301,7 +2307,7 @@ msgstr "Открыть страницу"
 msgid "Delete page"
 msgstr "Удалить страницу"
 
-#: js/messages.php:467 templates/designer/side_menu.phtml:10
+#: js/messages.php:467 templates/database/designer/side_menu.phtml:10
 msgid "Untitled"
 msgstr "Без названия"
 
@@ -2424,7 +2430,7 @@ msgstr "Исходный размер"
 msgid "cancel"
 msgstr "Отмена"
 
-#: js/messages.php:499 libraries/server_status.lib.php:271
+#: js/messages.php:499 libraries/server_status.lib.php:280
 msgid "Aborted"
 msgstr "Прервано"
 
@@ -2996,7 +3002,7 @@ msgstr "Пожалуйста, введите правильное значени
 
 #: js/messages.php:793 libraries/Message.class.php:199
 #: libraries/Util.class.php:654 libraries/core.lib.php:245
-#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1172
+#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1170
 #: tbl_operations.php:229 view_operations.php:63
 msgid "Error"
 msgstr "Ошибка"
@@ -3059,8 +3065,8 @@ msgstr "в секунду"
 msgid "per minute"
 msgstr "в минуту"
 
-#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:143
-#: libraries/server_status.lib.php:228
+#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:152
+#: libraries/server_status.lib.php:237
 #: libraries/server_status_queries.lib.php:98
 msgid "per hour"
 msgstr "в час"
@@ -3080,7 +3086,7 @@ msgstr ""
 "На конфигурационный файл выставлены неверные права разрешающие запись для "
 "всех!"
 
-#: libraries/Config.class.php:1799
+#: libraries/Config.class.php:1801
 msgid "Font size"
 msgstr "Размер шрифта"
 
@@ -3108,10 +3114,10 @@ msgstr "Повторный запрос"
 #: libraries/server_privileges.lib.php:2890
 #: libraries/server_privileges.lib.php:3144
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4332
+#: libraries/server_privileges.lib.php:4358
 #: libraries/server_status_processes.lib.php:80
-#: templates/tbl_relation/foreign_key_row.phtml:165
-#: templates/tbl_relation/internal_relational_row.phtml:55
+#: templates/table/relation/foreign_key_row.phtml:165
+#: templates/table/relation/internal_relational_row.phtml:55
 msgid "Database"
 msgstr "База данных"
 
@@ -3205,11 +3211,11 @@ msgstr "История"
 #: libraries/plugins/import/ImportMediawiki.class.php:60
 #: libraries/plugins/import/ImportOds.class.php:59
 #: libraries/plugins/import/ImportShp.class.php:57
-#: libraries/plugins/import/ImportSql.class.php:148
+#: libraries/plugins/import/ImportSql.class.php:51
 #: libraries/plugins/import/ImportXml.class.php:58
-#: libraries/rte/rte_routines.lib.php:833 templates/index_form.phtml:49
-#: templates/structure/row_stats_table.phtml:20
-#: templates/table/options.phtml:2
+#: libraries/rte/rte_routines.lib.php:924 templates/table/index_form.phtml:49
+#: templates/table/search/options.phtml:2
+#: templates/table/structure/row_stats_table.phtml:20
 msgid "Options"
 msgstr "Параметры"
 
@@ -3242,7 +3248,8 @@ msgstr "по убыванию"
 msgid "Order:"
 msgstr "Порядок сортировки:"
 
-#: libraries/Console.class.php:289 templates/table/replace_preview.phtml:17
+#: libraries/Console.class.php:289
+#: templates/table/search/replace_preview.phtml:17
 msgid "Count"
 msgstr "Количество"
 
@@ -3343,9 +3350,9 @@ msgstr "Переключиться на темную тему"
 #: libraries/operations.lib.php:794 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:191
-#: templates/structure/sortable_header.phtml:21
-#: templates/structure/sortable_header.phtml:38
-#: templates/table/options.phtml:68
+#: templates/database/structure/sortable_header.phtml:21
+#: templates/database/structure/sortable_header.phtml:38
+#: templates/table/search/options.phtml:68
 msgid "Ascending"
 msgstr "По возрастанию"
 
@@ -3355,13 +3362,14 @@ msgstr "По возрастанию"
 #: libraries/operations.lib.php:797 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:188
-#: templates/structure/sortable_header.phtml:26
-#: templates/structure/sortable_header.phtml:43
-#: templates/table/options.phtml:69
+#: templates/database/structure/sortable_header.phtml:26
+#: templates/database/structure/sortable_header.phtml:43
+#: templates/table/search/options.phtml:69
 msgid "Descending"
 msgstr "По убыванию"
 
-#: libraries/DBQbe.class.php:467 templates/table/search_and_replace.phtml:6
+#: libraries/DBQbe.class.php:467
+#: templates/table/search/search_and_replace.phtml:6
 msgid "Column:"
 msgstr "Столбец:"
 
@@ -3519,12 +3527,12 @@ msgstr[1] "%1$s соответствия в таблице <strong>%2$s</strong>
 msgstr[2] "%1$s соответствий в таблице <strong>%2$s</strong>"
 
 #: libraries/DbSearch.class.php:354 libraries/Menu.class.php:311
-#: libraries/Util.class.php:3337 libraries/Util.class.php:3347
-#: libraries/Util.class.php:3623 libraries/Util.class.php:3624
-#: libraries/Util.class.php:4343 libraries/config.values.php:43
+#: libraries/Util.class.php:3343 libraries/Util.class.php:3353
+#: libraries/Util.class.php:3629 libraries/Util.class.php:3630
+#: libraries/Util.class.php:4349 libraries/config.values.php:43
 #: libraries/config.values.php:51 libraries/config.values.php:119
 #: libraries/navigation/Nodes/Node_Table.class.php:295
-#: templates/structure/check_all_table_column.phtml:5
+#: templates/table/structure/check_all_table_column.phtml:5
 msgid "Browse"
 msgstr "Обзор"
 
@@ -3541,7 +3549,8 @@ msgstr "Поиск в базе данных"
 msgid "Words or values to search for (wildcard: \"%\"):"
 msgstr "Слова или значения для поиска (групповой символ: \"%\"):"
 
-#: libraries/DbSearch.class.php:401 templates/table/search_and_replace.phtml:1
+#: libraries/DbSearch.class.php:401
+#: templates/table/search/search_and_replace.phtml:1
 msgid "Find:"
 msgstr "Искать:"
 
@@ -3585,28 +3594,28 @@ msgstr "Фильтровать строки"
 msgid "Search this table"
 msgstr "Поиск в таблице"
 
-#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2532
-#: libraries/Util.class.php:2535
+#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2538
+#: libraries/Util.class.php:2541
 msgctxt "First page"
 msgid "Begin"
 msgstr "Начало"
 
-#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2533
-#: libraries/Util.class.php:2536 libraries/server_bin_log.lib.php:170
+#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2539
+#: libraries/Util.class.php:2542 libraries/server_bin_log.lib.php:170
 #: libraries/server_bin_log.lib.php:172
 msgctxt "Previous page"
 msgid "Previous"
 msgstr "Предыдущая"
 
-#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2564
-#: libraries/Util.class.php:2574 libraries/server_bin_log.lib.php:204
+#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2570
+#: libraries/Util.class.php:2580 libraries/server_bin_log.lib.php:204
 #: libraries/server_bin_log.lib.php:206
 msgctxt "Next page"
 msgid "Next"
 msgstr "Следующая"
 
-#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2565
-#: libraries/Util.class.php:2575
+#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2571
+#: libraries/Util.class.php:2581
 msgctxt "Last page"
 msgid "End"
 msgstr "Конец"
@@ -3681,15 +3690,15 @@ msgid "May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]."
 msgstr "Может быть приблизительно. Смотрите [doc@faq3-11]FAQ 3.11[/doc]."
 
 #: libraries/DisplayResults.class.php:4332 libraries/Message.class.php:180
-#: libraries/controllers/TableRelationController.class.php:258
+#: libraries/controllers/TableRelationController.class.php:259
 #: libraries/controllers/TableSearchController.class.php:655
-#: libraries/rte/rte_routines.lib.php:1332 libraries/sql_query_form.lib.php:89
+#: libraries/rte/rte_routines.lib.php:1423 libraries/sql_query_form.lib.php:89
 #: tbl_operations.php:227 tbl_row_action.php:138 view_operations.php:62
 msgid "Your SQL query has been executed successfully."
 msgstr "SQL-запрос успешно выполнен."
 
 #: libraries/DisplayResults.class.php:4660
-#: libraries/controllers/StructureController.class.php:629
+#: libraries/controllers/DatabaseStructureController.class.php:564
 #, php-format
 msgid ""
 "This view has at least this number of rows. Please refer to %sdocumentation"
@@ -3713,33 +3722,33 @@ msgstr "%1$d всего, %2$d в запросе"
 msgid "%d total"
 msgstr "%d всего"
 
-#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1318
+#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1312
 #, php-format
 msgid "Query took %01.4f seconds."
 msgstr "Запрос занял %01.4f сек."
 
 #: libraries/DisplayResults.class.php:4807
-#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4767
-#: libraries/Util.class.php:4773 libraries/mult_submits.inc.php:50
-#: templates/structure/check_all_tables.phtml:2
-#: templates/structure/check_all_tables.phtml:9
+#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4773
+#: libraries/Util.class.php:4779 libraries/mult_submits.inc.php:50
+#: templates/database/structure/check_all_tables.phtml:2
+#: templates/database/structure/check_all_tables.phtml:9
 msgid "With selected:"
 msgstr "С отмеченными:"
 
 #: libraries/DisplayResults.class.php:4811
-#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4769
-#: libraries/Util.class.php:4770 libraries/server_privileges.lib.php:1174
+#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4775
+#: libraries/Util.class.php:4776 libraries/server_privileges.lib.php:1174
 #: libraries/server_privileges.lib.php:1175
 #: libraries/server_privileges.lib.php:1387
 #: libraries/server_user_groups.lib.php:231
-#: templates/structure/check_all_tables.phtml:3
-#: templates/structure/check_all_tables.phtml:4
+#: templates/database/structure/check_all_tables.phtml:3
+#: templates/database/structure/check_all_tables.phtml:4
 msgid "Check All"
 msgstr "Отметить все"
 
 #: libraries/DisplayResults.class.php:4985 libraries/Header.class.php:383
-#: templates/structure/optional_action_links.phtml:1
-#: templates/structure/print_view_data_dictionary_link.phtml:3
+#: templates/database/structure/print_view_data_dictionary_link.phtml:3
+#: templates/table/structure/optional_action_links.phtml:1
 msgid "Print view"
 msgstr "Версия для печати"
 
@@ -3747,7 +3756,8 @@ msgstr "Версия для печати"
 msgid "Query results operations"
 msgstr "Использование результатов запроса"
 
-#: libraries/DisplayResults.class.php:5105 templates/tbl_chart.phtml:12
+#: libraries/DisplayResults.class.php:5105
+#: templates/table/chart/tbl_chart.phtml:12
 msgid "Display chart"
 msgstr "Отобразить график"
 
@@ -3846,7 +3856,7 @@ msgid "Click on the bar to scroll to top of page"
 msgstr "Кликните на строку, чтобы перейти вверх страницы"
 
 #: libraries/Header.class.php:749
-#: libraries/plugins/auth/AuthenticationCookie.class.php:152
+#: libraries/plugins/auth/AuthenticationCookie.class.php:140
 msgid "Javascript must be enabled past this point!"
 msgstr "Для полноценной работы необходимо включить JavaScript!"
 
@@ -3868,11 +3878,11 @@ msgid "Keyname"
 msgstr "Имя индекса"
 
 #: libraries/Index.class.php:697
-#: libraries/controllers/StructureController.class.php:1962
-#: libraries/controllers/StructureController.class.php:1967
+#: libraries/controllers/TableStructureController.class.php:953
+#: libraries/controllers/TableStructureController.class.php:958
 #: libraries/tracking.lib.php:973
 #: templates/columns_definitions/column_indexes.phtml:11
-#: templates/structure/check_all_table_column.phtml:26
+#: templates/table/structure/check_all_table_column.phtml:26
 msgid "Unique"
 msgstr "Уникальный"
 
@@ -3891,16 +3901,17 @@ msgstr "Уникальных элементов"
 #: libraries/server_collations.lib.php:35 libraries/tracking.lib.php:881
 #: libraries/tracking.lib.php:977
 #: templates/columns_definitions/table_fields_definitions.phtml:33
-#: templates/structure/row_stats_table.phtml:31
-#: templates/structure/table_header.phtml:55
-#: templates/structure/table_structure_header.phtml:7
-#: templates/table/table_header.phtml:8
+#: templates/database/structure/table_header.phtml:55
+#: templates/table/search/table_header.phtml:8
+#: templates/table/structure/row_stats_table.phtml:31
+#: templates/table/structure/table_structure_header.phtml:7
 msgid "Collation"
 msgstr "Сравнение"
 
 #: libraries/Index.class.php:703 libraries/rte/rte_events.lib.php:496
-#: libraries/rte/rte_routines.lib.php:956 libraries/tracking.lib.php:885
-#: libraries/tracking.lib.php:979 templates/structure/table_header.phtml:84
+#: libraries/rte/rte_routines.lib.php:1047 libraries/tracking.lib.php:885
+#: libraries/tracking.lib.php:979
+#: templates/database/structure/table_header.phtml:84
 msgid "Comment"
 msgstr "Комментарий"
 
@@ -3913,15 +3924,15 @@ msgstr "Первичный ключ был удален."
 msgid "Index %s has been dropped."
 msgstr "Индекс %s был удален."
 
-#: libraries/Index.class.php:757 libraries/Util.class.php:3630
-#: libraries/Util.class.php:3631
-#: libraries/controllers/StructureController.class.php:1958
-#: libraries/controllers/StructureController.class.php:1959
+#: libraries/Index.class.php:757 libraries/Util.class.php:3636
+#: libraries/Util.class.php:3637
+#: libraries/controllers/TableStructureController.class.php:949
+#: libraries/controllers/TableStructureController.class.php:950
 #: libraries/operations.lib.php:1607 libraries/rte/rte_list.lib.php:150
 #: libraries/server_databases.lib.php:146
-#: templates/structure/check_all_table_column.phtml:15
-#: templates/structure/check_all_tables.phtml:16
-#: templates/tbl_relation/foreign_key_row.phtml:93
+#: templates/database/structure/check_all_tables.phtml:16
+#: templates/table/relation/foreign_key_row.phtml:93
+#: templates/table/structure/check_all_table_column.phtml:15
 msgid "Drop"
 msgstr "Удалить"
 
@@ -3950,16 +3961,16 @@ msgstr "Сервер"
 #: libraries/Menu.class.php:248
 #: libraries/navigation/Nodes/Node_View.class.php:32
 #: libraries/tbl_info.inc.php:63
-#: templates/structure/structure_table_row.phtml:97
-#: templates/structure/structure_table_row.phtml:159
+#: templates/database/structure/structure_table_row.phtml:97
+#: templates/database/structure/structure_table_row.phtml:159
 msgid "View"
 msgstr "Представление"
 
 #: libraries/Menu.class.php:325 libraries/Menu.class.php:429
-#: libraries/Menu.class.php:548 libraries/Util.class.php:3334
-#: libraries/Util.class.php:3344 libraries/Util.class.php:3350
-#: libraries/Util.class.php:4313 libraries/Util.class.php:4328
-#: libraries/Util.class.php:4345 libraries/config.values.php:40
+#: libraries/Menu.class.php:548 libraries/Util.class.php:3340
+#: libraries/Util.class.php:3350 libraries/Util.class.php:3356
+#: libraries/Util.class.php:4319 libraries/Util.class.php:4334
+#: libraries/Util.class.php:4351 libraries/config.values.php:40
 #: libraries/config.values.php:48 libraries/config.values.php:110
 #: libraries/config.values.php:116 libraries/config/messages.inc.php:321
 #: libraries/navigation/Nodes/Node_Table.class.php:292
@@ -3967,19 +3978,19 @@ msgid "SQL"
 msgstr "SQL"
 
 #: libraries/Menu.class.php:328 libraries/Menu.class.php:432
-#: libraries/Util.class.php:3335 libraries/Util.class.php:3345
-#: libraries/Util.class.php:3351 libraries/Util.class.php:3625
-#: libraries/Util.class.php:3626 libraries/Util.class.php:4329
-#: libraries/Util.class.php:4346 libraries/config.values.php:41
+#: libraries/Util.class.php:3341 libraries/Util.class.php:3351
+#: libraries/Util.class.php:3357 libraries/Util.class.php:3631
+#: libraries/Util.class.php:3632 libraries/Util.class.php:4335
+#: libraries/Util.class.php:4352 libraries/config.values.php:41
 #: libraries/config.values.php:49 libraries/config.values.php:111
 #: libraries/config.values.php:117
 #: libraries/navigation/Nodes/Node_Table.class.php:286
 msgid "Search"
 msgstr "Поиск"
 
-#: libraries/Menu.class.php:338 libraries/Util.class.php:3336
-#: libraries/Util.class.php:3346 libraries/Util.class.php:3627
-#: libraries/Util.class.php:3628 libraries/Util.class.php:4347
+#: libraries/Menu.class.php:338 libraries/Util.class.php:3342
+#: libraries/Util.class.php:3352 libraries/Util.class.php:3633
+#: libraries/Util.class.php:3634 libraries/Util.class.php:4353
 #: libraries/config.values.php:42 libraries/config.values.php:50
 #: libraries/config.values.php:118
 #: libraries/navigation/Nodes/Node_Table.class.php:289
@@ -3988,30 +3999,30 @@ msgid "Insert"
 msgstr "Вставить"
 
 #: libraries/Menu.class.php:362 libraries/Menu.class.php:467
-#: libraries/Util.class.php:4334 libraries/Util.class.php:4350
+#: libraries/Util.class.php:4340 libraries/Util.class.php:4356
 #: libraries/config.values.php:106 libraries/server_common.lib.php:51
 #: libraries/server_privileges.lib.php:2370
 #: libraries/server_privileges.lib.php:3158
-#: libraries/server_privileges.lib.php:4221
+#: libraries/server_privileges.lib.php:4247
 msgid "Privileges"
 msgstr "Привилегии"
 
 #: libraries/Menu.class.php:371 libraries/Menu.class.php:379
-#: libraries/Menu.class.php:459 libraries/Util.class.php:3338
-#: libraries/Util.class.php:3352 libraries/Util.class.php:4333
-#: libraries/Util.class.php:4351 libraries/config.values.php:112
+#: libraries/Menu.class.php:459 libraries/Util.class.php:3344
+#: libraries/Util.class.php:3358 libraries/Util.class.php:4339
+#: libraries/Util.class.php:4357 libraries/config.values.php:112
 #: view_operations.php:92
 msgid "Operations"
 msgstr "Операции"
 
 #: libraries/Menu.class.php:384 libraries/Menu.class.php:492
-#: libraries/Util.class.php:4338 libraries/Util.class.php:4352
+#: libraries/Util.class.php:4344 libraries/Util.class.php:4358
 #: libraries/relation.lib.php:255
 msgid "Tracking"
 msgstr "Слежение"
 
 #: libraries/Menu.class.php:397 libraries/Menu.class.php:486
-#: libraries/Util.class.php:4337 libraries/Util.class.php:4353
+#: libraries/Util.class.php:4343 libraries/Util.class.php:4359
 #: libraries/navigation/Nodes/Node_Trigger_Container.class.php:24
 #: libraries/plugins/export/ExportHtmlword.class.php:557
 #: libraries/plugins/export/ExportOdt.class.php:685
@@ -4028,16 +4039,16 @@ msgstr "Триггеры"
 msgid "Database seems to be empty!"
 msgstr "Пустая база данных!"
 
-#: libraries/Menu.class.php:439 libraries/Util.class.php:4330
+#: libraries/Menu.class.php:439 libraries/Util.class.php:4336
 msgid "Query"
 msgstr "Запрос&nbsp;по&nbsp;шаблону"
 
-#: libraries/Menu.class.php:472 libraries/Util.class.php:4335
+#: libraries/Menu.class.php:472 libraries/Util.class.php:4341
 #: libraries/rte/rte_words.lib.php:36
 msgid "Routines"
 msgstr "Процедуры"
 
-#: libraries/Menu.class.php:479 libraries/Util.class.php:4336
+#: libraries/Menu.class.php:479 libraries/Util.class.php:4342
 #: libraries/navigation/Nodes/Node_Event_Container.class.php:26
 #: libraries/plugins/export/ExportSql.class.php:940
 #: libraries/plugins/export/ExportXml.class.php:107
@@ -4045,20 +4056,20 @@ msgstr "Процедуры"
 msgid "Events"
 msgstr "События"
 
-#: libraries/Menu.class.php:498 libraries/Util.class.php:4339
+#: libraries/Menu.class.php:498 libraries/Util.class.php:4345
 msgid "Designer"
 msgstr "Дизайнер"
 
-#: libraries/Menu.class.php:507 libraries/Util.class.php:4340
-#: templates/structure/check_all_tables.phtml:35
+#: libraries/Menu.class.php:507 libraries/Util.class.php:4346
+#: templates/database/structure/check_all_tables.phtml:35
 msgid "Central columns"
 msgstr "Центральные столбцы"
 
-#: libraries/Menu.class.php:544 libraries/Util.class.php:4312
+#: libraries/Menu.class.php:544 libraries/Util.class.php:4318
 #: libraries/config.values.php:103 libraries/config/messages.inc.php:266
 #: libraries/config/messages.inc.php:341
 #: libraries/navigation/NavigationTree.class.php:1239
-#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4332
+#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4358
 msgid "Databases"
 msgstr "Базы данных"
 
@@ -4067,34 +4078,34 @@ msgid "User accounts"
 msgstr "Учетные записи пользователей"
 
 #: libraries/Menu.class.php:595 libraries/ServerStatusData.class.php:121
-#: libraries/Util.class.php:4319 libraries/server_common.lib.php:36
+#: libraries/Util.class.php:4325 libraries/server_common.lib.php:36
 msgid "Binary log"
 msgstr "Бинарный журнал"
 
 #: libraries/Menu.class.php:601 libraries/ServerStatusData.class.php:126
-#: libraries/Util.class.php:4320 libraries/server_common.lib.php:42
-#: templates/structure/body_for_table_summary.phtml:10
-#: templates/structure/table_header.phtml:27
+#: libraries/Util.class.php:4326 libraries/server_common.lib.php:42
+#: templates/database/structure/body_for_table_summary.phtml:10
+#: templates/database/structure/table_header.phtml:27
 msgid "Replication"
 msgstr "Репликация"
 
 #: libraries/Menu.class.php:606 libraries/ServerStatusData.class.php:193
-#: libraries/Util.class.php:4321 libraries/config.values.php:105
+#: libraries/Util.class.php:4327 libraries/config.values.php:105
 #: libraries/server_engines.lib.php:108 libraries/server_engines.lib.php:112
 #: libraries/sql_query_form.lib.php:421
 msgid "Variables"
 msgstr "Переменные"
 
-#: libraries/Menu.class.php:610 libraries/Util.class.php:4322
+#: libraries/Menu.class.php:610 libraries/Util.class.php:4328
 msgid "Charsets"
 msgstr "Кодировки"
 
-#: libraries/Menu.class.php:615 libraries/Util.class.php:4323
+#: libraries/Menu.class.php:615 libraries/Util.class.php:4329
 #: libraries/server_common.lib.php:33 libraries/server_plugins.lib.php:27
 msgid "Plugins"
 msgstr "Расширения"
 
-#: libraries/Menu.class.php:626 libraries/Util.class.php:4324
+#: libraries/Menu.class.php:626 libraries/Util.class.php:4330
 msgid "Engines"
 msgstr "Типы таблиц"
 
@@ -4122,7 +4133,7 @@ msgstr[0] "Добавлена %1$d строка."
 msgstr[1] "Добавлено %1$d строки."
 msgstr[2] "Добавлено %1$d строк."
 
-#: libraries/PDF.class.php:70 libraries/Util.class.php:2521
+#: libraries/PDF.class.php:70 libraries/Util.class.php:2527
 #: libraries/browse_foreigners.lib.php:327
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:865
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:890
@@ -4143,7 +4154,7 @@ msgid "Could not save favorite table!"
 msgstr "Невозможно записать избранную таблицу!"
 
 #: libraries/RecentFavoriteTable.class.php:212
-#: templates/structure/favorite_anchor.phtml:12
+#: templates/database/structure/favorite_anchor.phtml:12
 msgid "Remove from Favorites"
 msgstr "Удалить из избранного"
 
@@ -4311,7 +4322,7 @@ msgstr ""
 "Дополнительная информация о состоянии данного типа таблиц - отсутствует."
 
 #: libraries/StorageEngine.class.php:373
-#: templates/structure/body_for_table_summary.phtml:50
+#: templates/database/structure/body_for_table_summary.phtml:50
 #, php-format
 msgid "%s is the default storage engine on this MySQL server."
 msgstr "%s - тип таблиц данного MySQL сервера устанавливаемый по умолчанию."
@@ -4795,10 +4806,10 @@ msgstr "Найдено %d ошибок при анализе."
 
 #: libraries/Util.class.php:726 libraries/rte/rte_events.lib.php:110
 #: libraries/rte/rte_events.lib.php:119 libraries/rte/rte_events.lib.php:150
-#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:153
-#: libraries/rte/rte_routines.lib.php:162
-#: libraries/rte/rte_routines.lib.php:235
-#: libraries/rte/rte_routines.lib.php:1366
+#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:223
+#: libraries/rte/rte_routines.lib.php:250
+#: libraries/rte/rte_routines.lib.php:372
+#: libraries/rte/rte_routines.lib.php:1457
 #: libraries/rte/rte_triggers.lib.php:86 libraries/rte/rte_triggers.lib.php:95
 #: libraries/rte/rte_triggers.lib.php:127
 msgid "MySQL said: "
@@ -4842,75 +4853,78 @@ msgstr "Вс"
 msgid "%B %d, %Y at %I:%M %p"
 msgstr "%B %d %Y г., %H:%M"
 
-#: libraries/Util.class.php:2019
+#: libraries/Util.class.php:2025
 #, php-format
 msgid "%s days, %s hours, %s minutes and %s seconds"
 msgstr "%s дней, %s часов, %s минут и %s секунд"
 
-#: libraries/Util.class.php:2112
+#: libraries/Util.class.php:2118
 msgid "Missing parameter:"
 msgstr "Отсутствующий параметр:"
 
-#: libraries/Util.class.php:2645
+#: libraries/Util.class.php:2651
 #, php-format
 msgid "Jump to database \"%s\"."
 msgstr "Перейти к базе данных \"%s\"."
 
-#: libraries/Util.class.php:2670
+#: libraries/Util.class.php:2676
 #, php-format
 msgid "The %s functionality is affected by a known bug, see %s"
 msgstr "Работа параметра \"%s\" подвержена ошибке, описание смотрите на %s"
 
-#: libraries/Util.class.php:2881
+#: libraries/Util.class.php:2887
 msgid "Click to toggle"
 msgstr "Кликните для переключения"
 
-#: libraries/Util.class.php:3542 prefs_manage.php:248
+#: libraries/Util.class.php:3548 prefs_manage.php:248
 msgid "Browse your computer:"
 msgstr "Обзор вашего компьютера:"
 
-#: libraries/Util.class.php:3567
+#: libraries/Util.class.php:3573
 #, php-format
 msgid "Select from the web server upload directory <b>%s</b>:"
 msgstr "Выберите из каталога загрузки сервера <b>%s</b>:"
 
-#: libraries/Util.class.php:3596 libraries/insert_edit.lib.php:1173
+#: libraries/Util.class.php:3602 libraries/insert_edit.lib.php:1171
 msgid "The directory you set for upload work cannot be reached."
 msgstr "Установленный каталог загрузки не доступен."
 
-#: libraries/Util.class.php:3607
+#: libraries/Util.class.php:3613
 msgid "There are no files to upload!"
 msgstr "Файлы для загрузки отсутствуют!"
 
-#: libraries/Util.class.php:3632 libraries/Util.class.php:3633
-#: templates/structure/check_all_tables.phtml:15
+#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: templates/database/structure/check_all_tables.phtml:15
 msgid "Empty"
 msgstr "Очистить"
 
-#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: libraries/Util.class.php:3644 libraries/Util.class.php:3645
 msgid "Execute"
 msgstr "Выполнить"
 
-#: libraries/Util.class.php:4152
+#: libraries/Util.class.php:4158
 msgid "Print"
 msgstr "Печать"
 
-#: libraries/Util.class.php:4257 templates/structure/row_stats_table.phtml:80
-#: templates/structure/table_header.phtml:95
+#: libraries/Util.class.php:4263
+#: templates/database/structure/table_header.phtml:95
+#: templates/table/structure/row_stats_table.phtml:80
 msgid "Creation"
 msgstr "Создание"
 
-#: libraries/Util.class.php:4263 templates/structure/row_stats_table.phtml:87
-#: templates/structure/table_header.phtml:106
+#: libraries/Util.class.php:4269
+#: templates/database/structure/table_header.phtml:106
+#: templates/table/structure/row_stats_table.phtml:87
 msgid "Last update"
 msgstr "Последнее обновление"
 
-#: libraries/Util.class.php:4269 templates/structure/row_stats_table.phtml:94
-#: templates/structure/table_header.phtml:117
+#: libraries/Util.class.php:4275
+#: templates/database/structure/table_header.phtml:117
+#: templates/table/structure/row_stats_table.phtml:94
 msgid "Last check"
 msgstr "Последняя проверка"
 
-#: libraries/Util.class.php:4315
+#: libraries/Util.class.php:4321
 msgid "Users"
 msgstr "Пользователи"
 
@@ -4931,16 +4945,16 @@ msgid "Use this value"
 msgstr "Использовать это значение"
 
 #: libraries/build_html_for_db.lib.php:33 libraries/import.lib.php:193
-#: templates/structure/actions_in_table_structure.phtml:113
-#: templates/structure/row_stats_table.phtml:42
-#: templates/structure/table_header.phtml:36
+#: templates/database/structure/table_header.phtml:36
+#: templates/table/structure/actions_in_table_structure.phtml:113
+#: templates/table/structure/row_stats_table.phtml:42
 msgid "Rows"
 msgstr "Строки"
 
 #: libraries/build_html_for_db.lib.php:48 libraries/engines/innodb.lib.php:171
-#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:186
-#: libraries/server_status.lib.php:298
-#: templates/structure/display_table_stats.phtml:40
+#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:195
+#: libraries/server_status.lib.php:307
+#: templates/table/structure/display_table_stats.phtml:40
 msgid "Total"
 msgstr "Всего"
 
@@ -4949,10 +4963,12 @@ msgid "Jump to database"
 msgstr "Перейти к базе данных"
 
 #: libraries/build_html_for_db.lib.php:146
+#: templates/database/structure/structure_table_row.phtml:15
 msgid "Not replicated"
 msgstr "Не реплицировано"
 
 #: libraries/build_html_for_db.lib.php:158
+#: templates/database/structure/structure_table_row.phtml:16
 msgid "Replicated"
 msgstr "Реплицировано"
 
@@ -5008,17 +5024,17 @@ msgstr "НЕТ"
 #: libraries/plugins/export/ExportTexytext.class.php:425
 #: libraries/plugins/export/PMA_ExportPdf.class.php:307
 #: libraries/rte/rte_list.lib.php:73 libraries/rte/rte_list.lib.php:85
-#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:830
-#: libraries/rte/rte_routines.lib.php:1492 setup/frames/index.inc.php:162
+#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:921
+#: libraries/rte/rte_routines.lib.php:1583 setup/frames/index.inc.php:162
 #: templates/columns_definitions/table_fields_definitions.phtml:8
-#: templates/structure/table_structure_header.phtml:5
-#: templates/table/create_table.phtml:11
+#: templates/database/create_table.phtml:11
+#: templates/table/structure/table_structure_header.phtml:5
 msgid "Name"
 msgstr "Имя"
 
 #: libraries/central_columns.lib.php:699
 #: libraries/central_columns.lib.php:1381
-#: libraries/rte/rte_routines.lib.php:832
+#: libraries/rte/rte_routines.lib.php:923
 #: templates/columns_definitions/table_fields_definitions.phtml:14
 msgid "Length/Values"
 msgstr "Длина/Значения"
@@ -5037,7 +5053,7 @@ msgid "Select a table"
 msgstr "Выберите таблицу"
 
 #: libraries/central_columns.lib.php:804
-#: templates/structure/add_column.phtml:4
+#: templates/table/structure/add_column.phtml:4
 msgid "Add column"
 msgstr "Добавить столбец"
 
@@ -5053,7 +5069,7 @@ msgstr "Добавить столбец"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1002
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1025
 #: templates/columns_definitions/table_fields_definitions.phtml:36
-#: templates/structure/table_structure_header.phtml:8
+#: templates/table/structure/table_structure_header.phtml:8
 msgid "Attributes"
 msgstr "Атрибуты"
 
@@ -5173,7 +5189,7 @@ msgid "Double click"
 msgstr "Двойной клик"
 
 #: libraries/config.values.php:95 libraries/config.values.php:124
-#: libraries/config/FormDisplay.tpl.php:221 libraries/relation.lib.php:97
+#: libraries/config/FormDisplay.tpl.php:232 libraries/relation.lib.php:97
 #: libraries/relation.lib.php:105
 msgid "Disabled"
 msgstr "Недоступно"
@@ -5343,21 +5359,21 @@ msgstr "Экспорт в сжатом виде не будет работать
 msgid "maximum %s"
 msgstr "максимум %s"
 
-#: libraries/config/FormDisplay.tpl.php:219
+#: libraries/config/FormDisplay.tpl.php:230
 msgid "This setting is disabled, it will not be applied to your configuration."
 msgstr "Эта настройка отключена и не будет применена при конфигурации."
 
-#: libraries/config/FormDisplay.tpl.php:313
+#: libraries/config/FormDisplay.tpl.php:324
 #, php-format
 msgid "Set value: %s"
 msgstr "Установить значение: %s"
 
-#: libraries/config/FormDisplay.tpl.php:318
+#: libraries/config/FormDisplay.tpl.php:329
 #: libraries/config/messages.inc.php:610
 msgid "Restore default value"
 msgstr "Восстановить изначальное значение"
 
-#: libraries/config/FormDisplay.tpl.php:332
+#: libraries/config/FormDisplay.tpl.php:343
 msgid "Allow users to customize this value"
 msgstr "Разрешить пользователям изменять данное значение"
 
@@ -5859,7 +5875,7 @@ msgstr "Кодировка файла"
 
 #: libraries/config/messages.inc.php:136 libraries/config/messages.inc.php:152
 #: libraries/sql_query_form.lib.php:247
-#: templates/structure/row_stats_table.phtml:7
+#: templates/table/structure/row_stats_table.phtml:7
 msgid "Format"
 msgstr "Формат"
 
@@ -6370,7 +6386,7 @@ msgstr ""
 
 #: libraries/config/messages.inc.php:332
 #: libraries/plugins/export/ExportPdf.class.php:279
-#: templates/structure/secondary_tabs.phtml:8
+#: templates/table/secondary_tabs.phtml:8
 msgid "Table structure"
 msgstr "Структура таблицы"
 
@@ -8064,103 +8080,33 @@ msgstr "Microsoft Word 2000"
 msgid "OpenDocument Text"
 msgstr "Текст OpenDocument"
 
-#: libraries/controllers/StructureController.class.php:465
+#: libraries/controllers/DatabaseStructureController.class.php:405
 #: tbl_operations.php:382
 #, php-format
 msgid "Table %s has been emptied."
 msgstr "Таблица %s была очищена."
 
-#: libraries/controllers/StructureController.class.php:486
+#: libraries/controllers/DatabaseStructureController.class.php:426
 #: tbl_operations.php:400 view_operations.php:119
 #, php-format
 msgid "View %s has been dropped."
 msgstr "Представление %s было удалено."
 
-#: libraries/controllers/StructureController.class.php:487
+#: libraries/controllers/DatabaseStructureController.class.php:427
 #: tbl_operations.php:401
 #, php-format
 msgid "Table %s has been dropped."
 msgstr "Таблица %s была удалена."
 
-#: libraries/controllers/StructureController.class.php:797
-#, php-format
-msgid "The name '%s' is a MySQL reserved keyword."
-msgid_plural "The names '%s' are MySQL reserved keywords."
-msgstr[0] "Имя '%s' является зарезервированным словом MySQL."
-msgstr[1] "Имена '%s' являются зарезервированными словами MySQL."
-msgstr[2] "Имена '%s' являются зарезервированными словами MySQL."
-
-#: libraries/controllers/StructureController.class.php:875
-msgid "No column selected."
-msgstr "Не выбран столбец."
-
-#: libraries/controllers/StructureController.class.php:1049
+#: libraries/controllers/DatabaseStructureController.class.php:733
 msgid "Favorite List is full!"
 msgstr "Список избранного полностью заполнен!"
 
-#: libraries/controllers/StructureController.class.php:1272
-msgid "The columns have been moved successfully."
-msgstr "Поля были успешно перемещены."
-
-#: libraries/controllers/StructureController.class.php:1535
-#, fuzzy, php-format
-#| msgid "Table %1$s has been altered successfully."
-msgid ""
-"Table %1$s has been altered successfully. Privileges have been adjusted."
-msgstr "Таблица %1$s была успешно изменена."
-
-#: libraries/controllers/StructureController.class.php:1541
-#: libraries/controllers/TableIndexesController.class.php:161
-#: tbl_addfield.php:92
-#, php-format
-msgid "Table %1$s has been altered successfully."
-msgstr "Таблица %1$s была успешно изменена."
-
-#: libraries/controllers/StructureController.class.php:1588
-#: libraries/tracking.lib.php:1094
-msgid "Query error"
-msgstr "Ошибка запроса"
-
-#: libraries/controllers/StructureController.class.php:1806
+#: libraries/controllers/DatabaseStructureController.class.php:947
 #: libraries/mysql_charsets.lib.php:366 libraries/mysql_charsets.lib.php:373
 msgid "unknown"
 msgstr "неизвестно"
 
-#: libraries/controllers/StructureController.class.php:1957
-#: templates/structure/check_all_table_column.phtml:11
-msgid "Change"
-msgstr "Изменить"
-
-#: libraries/controllers/StructureController.class.php:1961
-#: libraries/controllers/StructureController.class.php:1966
-#: libraries/navigation/Nodes/Node_Index.class.php:30
-#: libraries/tracking.lib.php:926
-#: templates/columns_definitions/column_indexes.phtml:16
-#: templates/columns_definitions/table_fields_definitions.phtml:57
-#: templates/structure/check_all_table_column.phtml:30
-#: templates/structure/display_structure.phtml:79
-#: templates/structure/display_table_stats.phtml:19
-msgid "Index"
-msgstr "Индекс"
-
-#: libraries/controllers/StructureController.class.php:1963
-#: libraries/controllers/StructureController.class.php:1968
-#: templates/columns_definitions/column_indexes.phtml:27
-#: templates/structure/check_all_table_column.phtml:37
-msgid "Spatial"
-msgstr "Пространственный"
-
-#: libraries/controllers/StructureController.class.php:1964
-#: libraries/controllers/StructureController.class.php:1969
-#: templates/columns_definitions/column_indexes.phtml:22
-#: templates/structure/check_all_table_column.phtml:47
-msgid "Fulltext"
-msgstr "Полнотекстовый"
-
-#: libraries/controllers/StructureController.class.php:1970
-msgid "Distinct values"
-msgstr "Уникальные значения"
-
 #: libraries/controllers/TableChartController.class.php:82
 #: libraries/controllers/TableGisVisualizationController.class.php:101
 msgid "No SQL query was set to fetch data."
@@ -8174,11 +8120,18 @@ msgstr "В таблице отсутствуют числовые столбцы
 msgid "No data to display"
 msgstr "Данные не найдены"
 
-#: libraries/controllers/TableRelationController.class.php:217
+#: libraries/controllers/TableIndexesController.class.php:161
+#: libraries/controllers/TableStructureController.class.php:736
+#: tbl_addfield.php:92
+#, php-format
+msgid "Table %1$s has been altered successfully."
+msgstr "Таблица %1$s была успешно изменена."
+
+#: libraries/controllers/TableRelationController.class.php:218
 msgid "Display column was successfully updated."
 msgstr "Отображаемый столбец был успешно обновлен."
 
-#: libraries/controllers/TableRelationController.class.php:283
+#: libraries/controllers/TableRelationController.class.php:288
 msgid "Internal relations were successfully updated."
 msgstr "Внутренние связи были успешно обновлены."
 
@@ -8191,10 +8144,73 @@ msgid "Zoom search"
 msgstr "Поиск с приближением"
 
 #: libraries/controllers/TableSearchController.class.php:852
-#: templates/table/selection_form.phtml:59
+#: templates/table/search/selection_form.phtml:59
 msgid "Find and replace"
 msgstr "Найти и заменить"
 
+#: libraries/controllers/TableStructureController.class.php:163
+#, php-format
+msgid "The name '%s' is a MySQL reserved keyword."
+msgid_plural "The names '%s' are MySQL reserved keywords."
+msgstr[0] "Имя '%s' является зарезервированным словом MySQL."
+msgstr[1] "Имена '%s' являются зарезервированными словами MySQL."
+msgstr[2] "Имена '%s' являются зарезервированными словами MySQL."
+
+#: libraries/controllers/TableStructureController.class.php:241
+msgid "No column selected."
+msgstr "Не выбран столбец."
+
+#: libraries/controllers/TableStructureController.class.php:467
+msgid "The columns have been moved successfully."
+msgstr "Поля были успешно перемещены."
+
+#: libraries/controllers/TableStructureController.class.php:730
+#, fuzzy, php-format
+#| msgid "Table %1$s has been altered successfully."
+msgid ""
+"Table %1$s has been altered successfully. Privileges have been adjusted."
+msgstr "Таблица %1$s была успешно изменена."
+
+#: libraries/controllers/TableStructureController.class.php:783
+#: libraries/tracking.lib.php:1094
+msgid "Query error"
+msgstr "Ошибка запроса"
+
+#: libraries/controllers/TableStructureController.class.php:948
+#: templates/table/structure/check_all_table_column.phtml:11
+msgid "Change"
+msgstr "Изменить"
+
+#: libraries/controllers/TableStructureController.class.php:952
+#: libraries/controllers/TableStructureController.class.php:957
+#: libraries/navigation/Nodes/Node_Index.class.php:30
+#: libraries/tracking.lib.php:926
+#: templates/columns_definitions/column_indexes.phtml:16
+#: templates/columns_definitions/table_fields_definitions.phtml:57
+#: templates/table/structure/check_all_table_column.phtml:30
+#: templates/table/structure/display_structure.phtml:79
+#: templates/table/structure/display_table_stats.phtml:19
+msgid "Index"
+msgstr "Индекс"
+
+#: libraries/controllers/TableStructureController.class.php:954
+#: libraries/controllers/TableStructureController.class.php:959
+#: templates/columns_definitions/column_indexes.phtml:27
+#: templates/table/structure/check_all_table_column.phtml:37
+msgid "Spatial"
+msgstr "Пространственный"
+
+#: libraries/controllers/TableStructureController.class.php:955
+#: libraries/controllers/TableStructureController.class.php:960
+#: templates/columns_definitions/column_indexes.phtml:22
+#: templates/table/structure/check_all_table_column.phtml:47
+msgid "Fulltext"
+msgstr "Полнотекстовый"
+
+#: libraries/controllers/TableStructureController.class.php:963
+msgid "Distinct values"
+msgstr "Уникальные значения"
+
 #: libraries/core.lib.php:306
 #, php-format
 msgid "The %s extension is missing. Please check your PHP configuration."
@@ -8243,7 +8259,7 @@ msgid "No Password"
 msgstr "Без пароля"
 
 #: libraries/display_change_password.lib.php:68
-#: libraries/plugins/auth/AuthenticationCookie.class.php:199
+#: libraries/plugins/auth/AuthenticationCookie.class.php:187
 #: libraries/replication_gui.lib.php:422 libraries/replication_gui.lib.php:862
 #: libraries/server_privileges.lib.php:1640
 msgid "Password:"
@@ -9038,12 +9054,12 @@ msgid "Dump has been saved to file %s."
 msgstr "Дамп был сохранен в файл %s."
 
 #: libraries/import.lib.php:202 libraries/insert_edit.lib.php:124
-#: libraries/rte/rte_routines.lib.php:1353 libraries/sql.lib.php:1312
+#: libraries/rte/rte_routines.lib.php:1444 libraries/sql.lib.php:1306
 #: tbl_get_field.php:44
 msgid "MySQL returned an empty result set (i.e. zero rows)."
 msgstr "MySQL вернула пустой результат (т.е. ноль строк)."
 
-#: libraries/import.lib.php:265 libraries/sql.lib.php:1326
+#: libraries/import.lib.php:265 libraries/sql.lib.php:1320
 msgid "[ROLLBACK occurred.]"
 msgstr "[Произошел откат.]"
 
@@ -9110,14 +9126,14 @@ msgstr "Создать индекс для &nbsp;%s&nbsp;столбца/ов"
 
 #: libraries/insert_edit.lib.php:233
 #: libraries/navigation/Nodes/Node_DatabaseChild.class.php:48
-#: templates/designer/table_list.phtml:40
+#: templates/database/designer/table_list.phtml:40
 msgid "Hide"
 msgstr "Скрыть"
 
 #: libraries/insert_edit.lib.php:249
 #: libraries/navigation/Nodes/Node_Function.class.php:32
-#: libraries/rte/rte_routines.lib.php:1495
-#: templates/table/table_header.phtml:4
+#: libraries/rte/rte_routines.lib.php:1586
+#: templates/table/search/table_header.phtml:4
 msgid "Function"
 msgstr "Функция"
 
@@ -9130,84 +9146,85 @@ msgstr "Двоичный"
 msgid "Because of its length,<br /> this column might not be editable."
 msgstr "Из-за большой длины<br /> изменение поля невозможно."
 
-#: libraries/insert_edit.lib.php:1050
+#: libraries/insert_edit.lib.php:1048
 msgid "Binary - do not edit"
 msgstr "Двоичные данные - не редактируются"
 
-#: libraries/insert_edit.lib.php:1176 libraries/server_privileges.lib.php:470
-#: templates/table/options.phtml:36
+#: libraries/insert_edit.lib.php:1174 libraries/server_privileges.lib.php:470
+#: templates/table/search/options.phtml:36
 msgid "Or"
 msgstr "Или"
 
-#: libraries/insert_edit.lib.php:1177
+#: libraries/insert_edit.lib.php:1175
 msgid "web server upload directory:"
 msgstr "Из каталога загрузки:"
 
-#: libraries/insert_edit.lib.php:1348 templates/table/input_box.phtml:49
+#: libraries/insert_edit.lib.php:1346
+#: templates/table/search/input_box.phtml:49
 msgid "Edit/Insert"
 msgstr "Редактировать/Вставить"
 
-#: libraries/insert_edit.lib.php:1398
+#: libraries/insert_edit.lib.php:1396
 #, php-format
 msgid "Continue insertion with %s rows"
 msgstr "Продолжить вставку с %s строки"
 
-#: libraries/insert_edit.lib.php:1428
+#: libraries/insert_edit.lib.php:1426
 msgid "and then"
 msgstr "и затем"
 
-#: libraries/insert_edit.lib.php:1461
+#: libraries/insert_edit.lib.php:1459
 msgid "Insert as new row"
 msgstr "Вставить запись"
 
-#: libraries/insert_edit.lib.php:1464
+#: libraries/insert_edit.lib.php:1462
 msgid "Insert as new row and ignore errors"
 msgstr "Вставить в виде новой строки и игнорировать появляющиеся ошибки"
 
-#: libraries/insert_edit.lib.php:1467
+#: libraries/insert_edit.lib.php:1465
 msgid "Show insert query"
 msgstr "Отобразить запрос вставки"
 
-#: libraries/insert_edit.lib.php:1487
+#: libraries/insert_edit.lib.php:1485
 msgid "Go back to previous page"
 msgstr "Вернуться на предыдущую страницу"
 
-#: libraries/insert_edit.lib.php:1490
+#: libraries/insert_edit.lib.php:1488
 msgid "Insert another new row"
 msgstr "Добавить новую запись"
 
-#: libraries/insert_edit.lib.php:1495
+#: libraries/insert_edit.lib.php:1493
 msgid "Go back to this page"
 msgstr "Вернуться к данной странице"
 
-#: libraries/insert_edit.lib.php:1518
+#: libraries/insert_edit.lib.php:1516
 msgid "Edit next row"
 msgstr "Редактировать следующую строку"
 
-#: libraries/insert_edit.lib.php:1540
+#: libraries/insert_edit.lib.php:1538
 msgid ""
 "Use TAB key to move from value to value, or CTRL+arrows to move anywhere"
 msgstr ""
 "Для перемещения между полями значения, используйте клавишу TAB, либо CTRL"
 "+клавиши со стрелками - для свободного перемещения"
 
-#: libraries/insert_edit.lib.php:1577 libraries/replication_gui.lib.php:542
-#: libraries/rte/rte_routines.lib.php:1497
+#: libraries/insert_edit.lib.php:1575 libraries/replication_gui.lib.php:542
+#: libraries/rte/rte_routines.lib.php:1588
 #: libraries/server_status_variables.lib.php:220
-#: templates/designer/having_query_panel.phtml:100
-#: templates/designer/options_panel.phtml:73
-#: templates/designer/options_panel.phtml:239
-#: templates/designer/where_query_panel.phtml:69
-#: templates/table/table_header.phtml:10
-#: templates/table/zoom_result_form.phtml:35
+#: templates/database/designer/having_query_panel.phtml:100
+#: templates/database/designer/options_panel.phtml:73
+#: templates/database/designer/options_panel.phtml:239
+#: templates/database/designer/where_query_panel.phtml:69
+#: templates/table/search/table_header.phtml:10
+#: templates/table/search/zoom_result_form.phtml:35
 msgid "Value"
 msgstr "Значение"
 
-#: libraries/insert_edit.lib.php:1937 libraries/sql.lib.php:1309
+#: libraries/insert_edit.lib.php:1935 libraries/sql.lib.php:1303
 msgid "Showing SQL query"
 msgstr "Отображает SQL-запрос"
 
-#: libraries/insert_edit.lib.php:1962 libraries/sql.lib.php:1287
+#: libraries/insert_edit.lib.php:1960 libraries/sql.lib.php:1281
 #, php-format
 msgid "Inserted row id: %1$d"
 msgstr "Идентификатор вставленной строки: %1$d"
@@ -9615,7 +9632,7 @@ msgstr "Новый"
 #: libraries/navigation/Nodes/Node_View_Container.class.php:26
 #: libraries/navigation/Nodes/Node_View_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:129
-#: templates/structure/show_create.phtml:30
+#: templates/database/structure/show_create.phtml:30
 msgid "Views"
 msgstr "Представления"
 
@@ -9947,7 +9964,7 @@ msgstr ""
 
 #: libraries/operations.lib.php:101 libraries/operations.lib.php:249
 #: libraries/operations.lib.php:869 libraries/operations.lib.php:963
-#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:907
+#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:998
 #: templates/columns_definitions/table_fields_definitions.phtml:47
 msgid "Adjust Privileges"
 msgstr "Настроить привилегии"
@@ -10039,22 +10056,22 @@ msgid "Switch to copied table"
 msgstr "Переключиться на скопированную таблицу"
 
 #: libraries/operations.lib.php:1360
-#: templates/structure/check_all_tables.phtml:18
+#: templates/database/structure/check_all_tables.phtml:18
 msgid "Table maintenance"
 msgstr "Обслуживание таблицы"
 
 #: libraries/operations.lib.php:1398
-#: templates/structure/check_all_tables.phtml:19
+#: templates/database/structure/check_all_tables.phtml:19
 msgid "Analyze table"
 msgstr "Анализ таблицы"
 
 #: libraries/operations.lib.php:1413
-#: templates/structure/check_all_tables.phtml:20
+#: templates/database/structure/check_all_tables.phtml:20
 msgid "Check table"
 msgstr "Проверить таблицу"
 
 #: libraries/operations.lib.php:1428
-#: templates/structure/check_all_tables.phtml:22
+#: templates/database/structure/check_all_tables.phtml:22
 #, fuzzy
 #| msgid "Check table"
 msgid "Checksum table"
@@ -10074,18 +10091,19 @@ msgid "Flush the table (FLUSH)"
 msgstr "Обновить кеш таблицы (FLUSH)"
 
 #: libraries/operations.lib.php:1477
-#: templates/structure/check_all_tables.phtml:23
-#: templates/structure/display_table_stats.phtml:56
+#: templates/database/structure/check_all_tables.phtml:23
+#: templates/table/structure/display_table_stats.phtml:56
 msgid "Optimize table"
 msgstr "Оптимизировать таблицу"
 
 #: libraries/operations.lib.php:1492
-#: templates/structure/check_all_tables.phtml:24
+#: templates/database/structure/check_all_tables.phtml:24
 msgid "Repair table"
 msgstr "Восстановить таблицу"
 
 #: libraries/operations.lib.php:1538
-#: templates/structure/check_all_tables.phtml:14 view_operations.php:127
+#: templates/database/structure/check_all_tables.phtml:14
+#: view_operations.php:127
 msgid "Delete data or table"
 msgstr "Удалить данные или таблицу"
 
@@ -10209,7 +10227,7 @@ msgid "Cannot connect: invalid settings."
 msgstr "Соединение невозможно! Неверные настройки."
 
 #: libraries/plugins/auth/AuthenticationConfig.class.php:108
-#: libraries/plugins/auth/AuthenticationCookie.class.php:134
+#: libraries/plugins/auth/AuthenticationCookie.class.php:122
 #: libraries/plugins/auth/AuthenticationHttp.class.php:96
 #, php-format
 msgid "Welcome to %s"
@@ -10240,36 +10258,36 @@ msgstr ""
 msgid "Retry to connect"
 msgstr "Повторить попытку соединения"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:146
+#: libraries/plugins/auth/AuthenticationCookie.class.php:134
 msgid "Your session has expired. Please log in again."
 msgstr "Время сессии истекло. Пожалуйста, войдите заново."
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:170
+#: libraries/plugins/auth/AuthenticationCookie.class.php:158
 msgid "Log in"
 msgstr "Авторизация"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:178
-#: libraries/plugins/auth/AuthenticationCookie.class.php:188
+#: libraries/plugins/auth/AuthenticationCookie.class.php:166
+#: libraries/plugins/auth/AuthenticationCookie.class.php:176
 msgid "You can enter hostname/IP address and port separated by space."
 msgstr "Вы можете ввести хост/IP адрес и порт разделенные пробелом."
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:193
+#: libraries/plugins/auth/AuthenticationCookie.class.php:181
 msgid "Username:"
 msgstr "Пользователь:"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:205
+#: libraries/plugins/auth/AuthenticationCookie.class.php:193
 msgid "Server Choice:"
 msgstr "Выбор сервера:"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:386
+#: libraries/plugins/auth/AuthenticationCookie.class.php:374
 msgid "Entered captcha is wrong, try again!"
 msgstr "Ошибка при введении captcha, попробуйте ещё раз!"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:396
+#: libraries/plugins/auth/AuthenticationCookie.class.php:384
 msgid "Please enter correct captcha!"
 msgstr "Пожалуйста, введите правильное значение captcha!"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:423
+#: libraries/plugins/auth/AuthenticationCookie.class.php:411
 msgid "You are not allowed to log in to this MySQL server!"
 msgstr "У вас нет прав для подключения к серверу MySQL!"
 
@@ -10365,7 +10383,7 @@ msgstr "Событие"
 #: libraries/plugins/export/ExportOdt.class.php:593
 #: libraries/plugins/export/ExportTexytext.class.php:428
 #: libraries/plugins/export/PMA_ExportPdf.class.php:313
-#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:984
 #: libraries/rte/rte_triggers.lib.php:377
 msgid "Definition"
 msgstr "Определение"
@@ -10689,7 +10707,7 @@ msgid "Last check:"
 msgstr "Последняя проверка:"
 
 #: libraries/plugins/export/ExportSql.class.php:1399
-#: templates/structure/structure_table_row.phtml:183
+#: templates/database/structure/structure_table_row.phtml:183
 msgid "in use"
 msgstr "используется"
 
@@ -10881,19 +10899,15 @@ msgstr "Пространственное расширение MySQL не под
 msgid "The imported file does not contain any data!"
 msgstr "Импортированный файл не содержит данных!"
 
-#: libraries/plugins/import/ImportSql.class.php:169
+#: libraries/plugins/import/ImportSql.class.php:72
 msgid "SQL compatibility mode:"
 msgstr "Режим совместимости SQL:"
 
-#: libraries/plugins/import/ImportSql.class.php:181
+#: libraries/plugins/import/ImportSql.class.php:84
 msgid "Do not use <code>AUTO_INCREMENT</code> for zero values"
 msgstr ""
 "Не использовать атрибут <code>AUTO_INCREMENT</code> для нулевых значений"
 
-#: libraries/plugins/import/ImportSql.class.php:195
-msgid "Read as multibytes"
-msgstr ""
-
 #: libraries/plugins/import/ImportXml.class.php:54
 msgid "XML"
 msgstr "XML"
@@ -10936,7 +10950,7 @@ msgid "Show grid"
 msgstr "Отображать сетку"
 
 #: libraries/plugins/schema/SchemaPdf.class.php:94
-#: templates/structure/print_view_data_dictionary_link.phtml:6
+#: templates/database/structure/print_view_data_dictionary_link.phtml:6
 msgid "Data Dictionary"
 msgstr "Словарь данных"
 
@@ -10961,7 +10975,7 @@ msgid "The %s table doesn't exist!"
 msgstr "Таблица %s не существует!"
 
 #: libraries/plugins/schema/eps/Eps_Relation_Schema.class.php:321
-#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:309
+#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:323
 #, php-format
 msgid "Schema of the %s database - Page %s"
 msgstr "Схема базы данных %s - Страница %s"
@@ -10987,7 +11001,7 @@ msgstr "Содержание"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1005
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1028
 #: libraries/tracking.lib.php:884
-#: templates/structure/table_structure_header.phtml:11
+#: templates/table/structure/table_structure_header.phtml:11
 msgid "Extra"
 msgstr "Дополнительно"
 
@@ -11352,11 +11366,11 @@ msgstr ""
 "Создайте необходимые таблицы с помощью скрипта <code>%screate_tables.sql</"
 "code>."
 
-#: libraries/relation.lib.php:360
+#: libraries/relation.lib.php:357
 msgid "Create a pma user and give access to these tables."
 msgstr "Создайте пользователя pma и предоставьте доступ к этим таблицам."
 
-#: libraries/relation.lib.php:365
+#: libraries/relation.lib.php:360
 msgid ""
 "Enable advanced features in configuration file (<code>config.inc.php</"
 "code>), for example by starting from <code>config.sample.inc.php</code>."
@@ -11364,23 +11378,23 @@ msgstr ""
 "Подключите дополнительные функции в конфигурационном файле (<code>config.inc."
 "php</code>), начните с примера в <code>config.sample.inc.php</code>."
 
-#: libraries/relation.lib.php:373
+#: libraries/relation.lib.php:365
 msgid "Re-login to phpMyAdmin to load the updated configuration file."
 msgstr ""
 "Перезайдите в phpMyAdmin, чтобы загрузить обновленный конфигурационный файл."
 
-#: libraries/relation.lib.php:1612
+#: libraries/relation.lib.php:1607
 msgid "no description"
 msgstr "нет описания"
 
-#: libraries/relation.lib.php:1811
+#: libraries/relation.lib.php:1806
 msgid ""
 "You do not have necessary privileges to create a database named "
 "'phpmyadmin'. You may go to 'Operations' tab of any database to set up the "
 "phpMyAdmin configuration storage there."
 msgstr ""
 
-#: libraries/relation.lib.php:1928
+#: libraries/relation.lib.php:1923
 #, php-format
 msgid ""
 "%sCreate%s a database named 'phpmyadmin' and setup the phpMyAdmin "
@@ -11389,19 +11403,19 @@ msgstr ""
 "%sСоздать%s базу данных с именем 'phpmyadmin' и настроить там хранение "
 "конфигурации phpMyAdmin."
 
-#: libraries/relation.lib.php:1936
+#: libraries/relation.lib.php:1931
 #, php-format
 msgid ""
 "%sCreate%s the phpMyAdmin configuration storage in the current database."
 msgstr "%sСоздать%s хранилище конфигурации phpMyAdmin в текущей базе данных."
 
-#: libraries/relation.lib.php:1944
+#: libraries/relation.lib.php:1939
 #, php-format
 msgid "%sCreate%s missing phpMyAdmin configuration storage tables."
 msgstr "%sСоздать%s отсутствующие таблицы хранения конфигурации phpMyAdmin."
 
 #: libraries/replication_gui.lib.php:46 libraries/replication_gui.lib.php:343
-#: libraries/server_databases.lib.php:387
+#: libraries/server_databases.lib.php:398
 msgid "Master replication"
 msgstr "Репликация головного сервера"
 
@@ -11473,7 +11487,7 @@ msgstr ""
 "b> как головной."
 
 #: libraries/replication_gui.lib.php:141
-#: libraries/server_databases.lib.php:389
+#: libraries/server_databases.lib.php:400
 msgid "Slave replication"
 msgstr "Репликация подчинённого сервера"
 
@@ -11750,10 +11764,10 @@ msgid "Master server changed successfully to %s."
 msgstr "Главный сервер успешно изменён на %s."
 
 #: libraries/rte/rte_events.lib.php:106 libraries/rte/rte_events.lib.php:115
-#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:149
-#: libraries/rte/rte_routines.lib.php:158
-#: libraries/rte/rte_routines.lib.php:231
-#: libraries/rte/rte_routines.lib.php:1362
+#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:219
+#: libraries/rte/rte_routines.lib.php:246
+#: libraries/rte/rte_routines.lib.php:368
+#: libraries/rte/rte_routines.lib.php:1453
 #: libraries/rte/rte_triggers.lib.php:82 libraries/rte/rte_triggers.lib.php:91
 #: libraries/rte/rte_triggers.lib.php:123
 #, php-format
@@ -11774,7 +11788,7 @@ msgstr "Было изменено событие %1$s."
 msgid "Event %1$s has been created."
 msgstr "Было создано событие %1$s."
 
-#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:251
+#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:266
 #: libraries/rte/rte_triggers.lib.php:144
 msgid "One or more errors have occurred while processing your request:"
 msgstr "При обработке вашего запроса были обнаружены ошибки:"
@@ -11783,7 +11797,7 @@ msgstr "При обработке вашего запроса были обна
 msgid "Edit event"
 msgstr "Редактировать событие"
 
-#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:794
+#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:885
 #: libraries/rte/rte_triggers.lib.php:323 view_create.php:180
 msgid "Details"
 msgstr "Детали"
@@ -11796,7 +11810,7 @@ msgstr "Название события"
 msgid "Event type"
 msgstr "Тип события"
 
-#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:817
+#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:908
 #, php-format
 msgid "Change to %s"
 msgstr "Изменить на %s"
@@ -11823,12 +11837,14 @@ msgstr "Конец"
 msgid "On completion preserve"
 msgstr "Сохранить при окончании"
 
-#: libraries/rte/rte_events.lib.php:491 libraries/rte/rte_routines.lib.php:930
+#: libraries/rte/rte_events.lib.php:491
+#: libraries/rte/rte_routines.lib.php:1021
 #: libraries/rte/rte_triggers.lib.php:383 view_create.php:209
 msgid "Definer"
 msgstr "Определитель"
 
-#: libraries/rte/rte_events.lib.php:535 libraries/rte/rte_routines.lib.php:997
+#: libraries/rte/rte_events.lib.php:535
+#: libraries/rte/rte_routines.lib.php:1088
 #: libraries/rte/rte_triggers.lib.php:422
 msgid "The definer must be in the \"username@hostname\" format!"
 msgstr "Определитель должен быть в формате \"username@hostname\"!"
@@ -11854,9 +11870,9 @@ msgid "You must provide an event definition."
 msgstr "Вы должны задать определение события."
 
 #: libraries/rte/rte_export.lib.php:43 libraries/rte/rte_general.lib.php:72
-#: libraries/rte/rte_routines.lib.php:345
-#: libraries/rte/rte_routines.lib.php:1198
-#: libraries/rte/rte_routines.lib.php:1411
+#: libraries/rte/rte_routines.lib.php:153
+#: libraries/rte/rte_routines.lib.php:1289
+#: libraries/rte/rte_routines.lib.php:1502
 msgid "Error in processing request:"
 msgstr "Ошибка при обработке запроса:"
 
@@ -11892,97 +11908,97 @@ msgstr ""
 "процедур может привести к ошибке![/strong] Пожалуйста, для избежания "
 "проблем, используйте улучшенное 'mysqli' расширение."
 
-#: libraries/rte/rte_routines.lib.php:110
-#: libraries/rte/rte_routines.lib.php:1006
+#: libraries/rte/rte_routines.lib.php:123
+msgid "Edit routine"
+msgstr "Изменить процедуру"
+
+#: libraries/rte/rte_routines.lib.php:200
+#: libraries/rte/rte_routines.lib.php:1097
 #, php-format
 msgid "Invalid routine type: \"%s\""
 msgstr "Ошибочный тип процедуры: \"%s\""
 
-#: libraries/rte/rte_routines.lib.php:170
+#: libraries/rte/rte_routines.lib.php:253
+#, php-format
+msgid "Routine %1$s has been created."
+msgstr "Была создана процедура %1$s."
+
+#: libraries/rte/rte_routines.lib.php:380
 msgid "Sorry, we failed to restore the dropped routine."
 msgstr "Невозможно восстановить удаленную процедуру."
 
-#: libraries/rte/rte_routines.lib.php:211
+#: libraries/rte/rte_routines.lib.php:439
 #, fuzzy, php-format
 #| msgid "Routine %1$s has been modified."
 msgid "Routine %1$s has been modified. Privileges have been adjusted."
 msgstr "Была изменена процедура %1$s."
 
-#: libraries/rte/rte_routines.lib.php:216
+#: libraries/rte/rte_routines.lib.php:444
 #, php-format
 msgid "Routine %1$s has been modified."
 msgstr "Была изменена процедура %1$s."
 
-#: libraries/rte/rte_routines.lib.php:238
-#, php-format
-msgid "Routine %1$s has been created."
-msgstr "Была создана процедура %1$s."
-
-#: libraries/rte/rte_routines.lib.php:315
-msgid "Edit routine"
-msgstr "Изменить процедуру"
-
-#: libraries/rte/rte_routines.lib.php:797
+#: libraries/rte/rte_routines.lib.php:888
 msgid "Routine name"
 msgstr "Имя процедуры"
 
-#: libraries/rte/rte_routines.lib.php:823
+#: libraries/rte/rte_routines.lib.php:914
 msgid "Parameters"
 msgstr "Параметры"
 
-#: libraries/rte/rte_routines.lib.php:829
+#: libraries/rte/rte_routines.lib.php:920
 msgid "Direction"
 msgstr "Направление"
 
-#: libraries/rte/rte_routines.lib.php:847
+#: libraries/rte/rte_routines.lib.php:938
 msgid "Add parameter"
 msgstr "Добавить параметр"
 
-#: libraries/rte/rte_routines.lib.php:851
+#: libraries/rte/rte_routines.lib.php:942
 msgid "Remove last parameter"
 msgstr "Удалить последний параметр"
 
-#: libraries/rte/rte_routines.lib.php:856
+#: libraries/rte/rte_routines.lib.php:947
 msgid "Return type"
 msgstr "Возвращаемый тип"
 
-#: libraries/rte/rte_routines.lib.php:862
+#: libraries/rte/rte_routines.lib.php:953
 msgid "Return length/values"
 msgstr "Вернуть длину/значения"
 
-#: libraries/rte/rte_routines.lib.php:868
+#: libraries/rte/rte_routines.lib.php:959
 msgid "Return options"
 msgstr "Вернуть параметры"
 
-#: libraries/rte/rte_routines.lib.php:899
+#: libraries/rte/rte_routines.lib.php:990
 msgid "Is deterministic"
 msgstr "Определяющий"
 
-#: libraries/rte/rte_routines.lib.php:920
+#: libraries/rte/rte_routines.lib.php:1011
 msgid ""
 "You do not have sufficient privileges to perform this operation; Please "
 "refer to the documentation for more details"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:935
+#: libraries/rte/rte_routines.lib.php:1026
 msgid "Security type"
 msgstr "Тип безопасности"
 
-#: libraries/rte/rte_routines.lib.php:944
+#: libraries/rte/rte_routines.lib.php:1035
 msgid "SQL data access"
 msgstr "Доступ к SQL данным"
 
-#: libraries/rte/rte_routines.lib.php:1013
+#: libraries/rte/rte_routines.lib.php:1104
 msgid "You must provide a routine name!"
 msgstr "Необходимо задать имя процедуры!"
 
-#: libraries/rte/rte_routines.lib.php:1047
+#: libraries/rte/rte_routines.lib.php:1138
 #, php-format
 msgid "Invalid direction \"%s\" given for parameter."
 msgstr "\"%s\" является ошибочным параметром."
 
-#: libraries/rte/rte_routines.lib.php:1069
-#: libraries/rte/rte_routines.lib.php:1131
+#: libraries/rte/rte_routines.lib.php:1160
+#: libraries/rte/rte_routines.lib.php:1222
 msgid ""
 "You must provide length/values for routine parameters of type ENUM, SET, "
 "VARCHAR and VARBINARY."
@@ -11990,24 +12006,24 @@ msgstr ""
 "Вы должны задать длину/значения для параметров процедуры, имеющих тип ENUM, "
 "SET, VARCHAR и VARBINARY."
 
-#: libraries/rte/rte_routines.lib.php:1095
+#: libraries/rte/rte_routines.lib.php:1186
 msgid "You must provide a name and a type for each routine parameter."
 msgstr "Вы должны задать имя и тип для каждого параметра процедуры."
 
-#: libraries/rte/rte_routines.lib.php:1114
+#: libraries/rte/rte_routines.lib.php:1205
 msgid "You must provide a valid return type for the routine."
 msgstr "Необходимо задать корректный возвращаемый тип для процедуры."
 
-#: libraries/rte/rte_routines.lib.php:1174
+#: libraries/rte/rte_routines.lib.php:1265
 msgid "You must provide a routine definition."
 msgstr "Вы должны задать определение процедуры."
 
-#: libraries/rte/rte_routines.lib.php:1285
+#: libraries/rte/rte_routines.lib.php:1376
 #, php-format
 msgid "Execution results of routine %s"
 msgstr "Результаты выполнения процедуры %s"
 
-#: libraries/rte/rte_routines.lib.php:1340
+#: libraries/rte/rte_routines.lib.php:1431
 #, php-format
 msgid "%d row affected by the last statement inside the procedure."
 msgid_plural "%d rows affected by the last statement inside the procedure."
@@ -12015,13 +12031,13 @@ msgstr[0] "Последним выражением в процедуре был
 msgstr[1] "Последним выражением в процедуре были затронуты %d строки."
 msgstr[2] "Последним выражением в процедуре было затронуто %d строк."
 
-#: libraries/rte/rte_routines.lib.php:1398
-#: libraries/rte/rte_routines.lib.php:1406
+#: libraries/rte/rte_routines.lib.php:1489
+#: libraries/rte/rte_routines.lib.php:1497
 msgid "Execute routine"
 msgstr "Выполнить процедуру"
 
-#: libraries/rte/rte_routines.lib.php:1485
-#: libraries/rte/rte_routines.lib.php:1488
+#: libraries/rte/rte_routines.lib.php:1576
+#: libraries/rte/rte_routines.lib.php:1579
 msgid "Routine parameters"
 msgstr "Параметры процедуры"
 
@@ -12175,7 +12191,7 @@ msgid "Original position"
 msgstr "Исходная позиция"
 
 #: libraries/server_bin_log.lib.php:133
-#: templates/structure/display_table_stats.phtml:4
+#: templates/table/structure/display_table_stats.phtml:4
 msgid "Information"
 msgstr "Информация"
 
@@ -12213,12 +12229,12 @@ msgstr ""
 "Примечание: Включение статистики баз данных может спровоцировать большой "
 "трафик между веб-сервером и сервером MySQL."
 
-#: libraries/server_databases.lib.php:364
-#: libraries/server_databases.lib.php:365
+#: libraries/server_databases.lib.php:366
+#: libraries/server_databases.lib.php:371
 msgid "Enable Statistics"
 msgstr "Включить статистику"
 
-#: libraries/server_databases.lib.php:481
+#: libraries/server_databases.lib.php:492
 #, php-format
 msgid "%1$d database has been dropped successfully."
 msgid_plural "%1$d databases have been dropped successfully."
@@ -12594,7 +12610,7 @@ msgid "You have revoked the privileges for %s."
 msgstr "Вы отменили привилегии для %s."
 
 #: libraries/server_privileges.lib.php:2059
-#: libraries/server_privileges.lib.php:4290
+#: libraries/server_privileges.lib.php:4316
 msgid "Add user account"
 msgstr "Добавить учетную запись пользователя"
 
@@ -12764,36 +12780,36 @@ msgstr "Удаление %s"
 msgid "The privileges were reloaded successfully."
 msgstr "Привилегии были успешно перезагружены."
 
-#: libraries/server_privileges.lib.php:3994
+#: libraries/server_privileges.lib.php:4003
 #, php-format
 msgid "The user %s already exists!"
 msgstr "Пользователь %s уже существует!"
 
-#: libraries/server_privileges.lib.php:4232
+#: libraries/server_privileges.lib.php:4258
 #, php-format
 msgid "Privileges for %s"
 msgstr "Привилегии для %s"
 
-#: libraries/server_privileges.lib.php:4241
+#: libraries/server_privileges.lib.php:4267
 #: libraries/server_status_processes.lib.php:72
 #: libraries/server_user_groups.lib.php:39
 msgid "User"
 msgstr "Пользователь"
 
-#: libraries/server_privileges.lib.php:4282
+#: libraries/server_privileges.lib.php:4308
 msgctxt "Create new user"
 msgid "New"
 msgstr "Новый"
 
-#: libraries/server_privileges.lib.php:4311
+#: libraries/server_privileges.lib.php:4337
 msgid "Edit privileges:"
 msgstr "Редактировать привилегии:"
 
-#: libraries/server_privileges.lib.php:4312
+#: libraries/server_privileges.lib.php:4338
 msgid "User account"
 msgstr "Учетная запись пользователя"
 
-#: libraries/server_privileges.lib.php:4371
+#: libraries/server_privileges.lib.php:4397
 msgid ""
 "Note: You are attempting to edit privileges of the user with which you are "
 "currently logged in."
@@ -12801,18 +12817,18 @@ msgstr ""
 "Примечание: Вы пытаетесь изменить привилегии пользователя, под именем "
 "которого вы в настоящее время вошли в систему."
 
-#: libraries/server_privileges.lib.php:4391 libraries/server_users.lib.php:25
+#: libraries/server_privileges.lib.php:4417 libraries/server_users.lib.php:25
 msgid "User accounts overview"
 msgstr "Обзор учетных записей пользователей"
 
-#: libraries/server_privileges.lib.php:4459
+#: libraries/server_privileges.lib.php:4485
 msgid ""
 "A user account allowing any user from localhost to connect is present. This "
 "will prevent other users from connecting if the host part of their account "
 "allows a connection from any (%) host."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4500
+#: libraries/server_privileges.lib.php:4526
 #, php-format
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
@@ -12825,7 +12841,7 @@ msgstr ""
 "отличаться от привилегий, используемых сервером, если они были изменены "
 "вручную. В этом случае необходимо %sперезагрузить привилегии%s."
 
-#: libraries/server_privileges.lib.php:4519
+#: libraries/server_privileges.lib.php:4545
 #, fuzzy
 #| msgid ""
 #| "Note: phpMyAdmin gets the users' privileges directly from MySQL's "
@@ -12844,25 +12860,25 @@ msgstr ""
 "отличаться от привилегий, используемых сервером, если они были изменены "
 "вручную. В этом случае необходимо %sперезагрузить привилегии%s."
 
-#: libraries/server_privileges.lib.php:4569
+#: libraries/server_privileges.lib.php:4595
 msgid "The selected user was not found in the privilege table."
 msgstr "Выбранный пользователь не найден в таблице привилегий."
 
-#: libraries/server_privileges.lib.php:4801
+#: libraries/server_privileges.lib.php:4827
 msgid "You have added a new user."
 msgstr "Вы добавили нового пользователя."
 
-#: libraries/server_status.lib.php:53
+#: libraries/server_status.lib.php:60
 #, php-format
 msgid "Network traffic since startup: %s"
 msgstr "Сетевой трафик с момента запуска: %s"
 
-#: libraries/server_status.lib.php:66
+#: libraries/server_status.lib.php:73
 #, php-format
 msgid "This MySQL server has been running for %1$s. It started up on %2$s."
 msgstr "Этот сервер MySQL работает %1$s. Запущен %2$s."
 
-#: libraries/server_status.lib.php:80
+#: libraries/server_status.lib.php:94
 msgid ""
 "This MySQL server works as <b>master</b> and <b>slave</b> in <b>replication</"
 "b> process."
@@ -12870,22 +12886,22 @@ msgstr ""
 "Этот сервер MySQL работает как <b>ведущий</b> и <b>подчинённый</b> в "
 "процессе <b>репликации</b>."
 
-#: libraries/server_status.lib.php:85
+#: libraries/server_status.lib.php:99
 msgid "This MySQL server works as <b>master</b> in <b>replication</b> process."
 msgstr ""
 "Этот сервер MySQL работает как <b>ведущий</b> в процессе <b>репликации</b>."
 
-#: libraries/server_status.lib.php:90
+#: libraries/server_status.lib.php:104
 msgid "This MySQL server works as <b>slave</b> in <b>replication</b> process."
 msgstr ""
 "Этот сервер MySQL работает как <b>подчинённый</b> в процессе <b>репликации</"
 "b>."
 
-#: libraries/server_status.lib.php:106
+#: libraries/server_status.lib.php:116
 msgid "Replication status"
 msgstr "Состояние репликации"
 
-#: libraries/server_status.lib.php:137
+#: libraries/server_status.lib.php:146
 msgid ""
 "On a busy server, the byte counters may overrun, so those statistics as "
 "reported by the MySQL server may be incorrect."
@@ -12893,19 +12909,19 @@ msgstr ""
 "На загруженном сервере побайтовые счётчики могут переполняться, таким "
 "образом, статистика, передаваемая сервером MySQL, может быть некорректной."
 
-#: libraries/server_status.lib.php:148
+#: libraries/server_status.lib.php:157
 msgid "Received"
 msgstr "Принято"
 
-#: libraries/server_status.lib.php:167
+#: libraries/server_status.lib.php:176
 msgid "Sent"
 msgstr "Отправлено"
 
-#: libraries/server_status.lib.php:234
+#: libraries/server_status.lib.php:243
 msgid "Max. concurrent connections"
 msgstr "Макс. одновременных соединений"
 
-#: libraries/server_status.lib.php:244
+#: libraries/server_status.lib.php:253
 msgid "Failed attempts"
 msgstr "Неудачных попыток"
 
@@ -13988,7 +14004,7 @@ msgstr ""
 msgid "Not implemented yet."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/AlterOperation.php:193
+#: libraries/sql-parser/src/Components/AlterOperation.php:191
 msgid "Unrecognized alter operation."
 msgstr ""
 
@@ -14002,7 +14018,7 @@ msgid "An opening bracket followed by a set of values was expected."
 msgstr ""
 
 #: libraries/sql-parser/src/Components/ArrayObj.php:101
-#: libraries/sql-parser/src/Components/FieldDefinition.php:202
+#: libraries/sql-parser/src/Components/CreateDefinition.php:202
 msgid "An opening bracket was expected."
 msgstr ""
 
@@ -14010,25 +14026,35 @@ msgstr ""
 msgid "A comma or a closing bracket was expected"
 msgstr ""
 
+#: libraries/sql-parser/src/Components/CreateDefinition.php:246
+#, fuzzy
+#| msgid "A rename operation was expected."
+msgid "A comma or a closing bracket was expected."
+msgstr "Ожидалась операция переименования."
+
+#: libraries/sql-parser/src/Components/CreateDefinition.php:262
+msgid "A closing bracket was expected."
+msgstr ""
+
 #: libraries/sql-parser/src/Components/DataType.php:125
 msgid "Unrecognized data type."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:225
+#: libraries/sql-parser/src/Components/Expression.php:227
 msgid "Unexpected closing bracket."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:246
-#: libraries/sql-parser/src/Components/Expression.php:283
-#: libraries/sql-parser/src/Components/Expression.php:303
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:285
+#: libraries/sql-parser/src/Components/Expression.php:305
 msgid "An alias was previously found."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:257
+#: libraries/sql-parser/src/Components/Expression.php:259
 msgid "Unexpected dot."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:327
+#: libraries/sql-parser/src/Components/Expression.php:329
 msgid "An alias was expected."
 msgstr ""
 
@@ -14036,16 +14062,6 @@ msgstr ""
 msgid "An expression was expected."
 msgstr "Ожидалось выражение."
 
-#: libraries/sql-parser/src/Components/FieldDefinition.php:246
-#, fuzzy
-#| msgid "A rename operation was expected."
-msgid "A comma or a closing bracket was expected."
-msgstr "Ожидалась операция переименования."
-
-#: libraries/sql-parser/src/Components/FieldDefinition.php:262
-msgid "A closing bracket was expected."
-msgstr ""
-
 #: libraries/sql-parser/src/Components/Limit.php:90
 #: libraries/sql-parser/src/Components/Limit.php:112
 msgid "An offset was expected."
@@ -14085,24 +14101,24 @@ msgstr ""
 msgid "Expected delimiter."
 msgstr ""
 
-#: libraries/sql-parser/src/Lexer.php:753
+#: libraries/sql-parser/src/Lexer.php:777
 #, php-format
 msgid "Ending quote %1$s was expected."
 msgstr "Ожидалась закрывающая кавычка %1$s."
 
-#: libraries/sql-parser/src/Lexer.php:789
+#: libraries/sql-parser/src/Lexer.php:813
 msgid "Variable name was expected."
 msgstr "Ожидалось имя переменной."
 
-#: libraries/sql-parser/src/Parser.php:380
+#: libraries/sql-parser/src/Parser.php:391
 msgid "Unexpected beginning of statement."
 msgstr "Неожиданное начало выражения."
 
-#: libraries/sql-parser/src/Parser.php:399
+#: libraries/sql-parser/src/Parser.php:410
 msgid "Unrecognized statement type."
 msgstr ""
 
-#: libraries/sql-parser/src/Parser.php:479
+#: libraries/sql-parser/src/Parser.php:489
 msgid "No transaction was previously started."
 msgstr ""
 
@@ -14130,8 +14146,10 @@ msgid "The name of the entity was expected."
 msgstr ""
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:310
-msgid "At least one field definition was expected."
-msgstr ""
+#, fuzzy
+#| msgid "A rename operation was expected."
+msgid "At least one column definition was expected."
+msgstr "Ожидалась операция переименования."
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:329
 msgid "A \"RETURNS\" keyword was expected."
@@ -14190,11 +14208,11 @@ msgstr "Закладка не создана!"
 msgid "Using bookmark \"%s\" as default browse query."
 msgstr "Для обзора данных использован запрос из закладки \"%s\"."
 
-#: libraries/sql.lib.php:1306
+#: libraries/sql.lib.php:1300
 msgid "Showing as PHP code"
 msgstr "Отображает как PHP-код"
 
-#: libraries/sql.lib.php:1638
+#: libraries/sql.lib.php:1632
 #, php-format
 msgid ""
 "Current selection does not contain a unique column. Grid edit, checkbox, "
@@ -14203,7 +14221,7 @@ msgstr ""
 "Данное выделение не содержит уникального столбца. Изменение сетки, "
 "выставление галочки, редактирование, копирование и удаление невозможно. %s"
 
-#: libraries/sql.lib.php:1649
+#: libraries/sql.lib.php:1643
 #, php-format
 msgid ""
 "Current selection does not contain a unique column. Grid edit, Edit, Copy "
@@ -14213,7 +14231,7 @@ msgstr ""
 "редактирование, копирование и удаление могут привести к нежелательному "
 "поведению. %s"
 
-#: libraries/sql.lib.php:1688
+#: libraries/sql.lib.php:1682
 #, php-format
 msgid "Problems with indexes of table `%s`"
 msgstr "Проблемы с индексами таблицы `%s`"
@@ -14369,7 +14387,7 @@ msgid "Version %s snapshot (SQL code)"
 msgstr "Обзор версии %s (SQL код)"
 
 #: libraries/tracking.lib.php:947
-#: templates/structure/table_structure_row.phtml:33
+#: templates/table/structure/table_structure_row.phtml:33
 msgctxt "None for default"
 msgid "None"
 msgstr "Нет"
@@ -14424,15 +14442,15 @@ msgstr "Версия %1$s из %2$s удалена."
 msgid "Version %1$s was created, tracking for %2$s is active."
 msgstr "Версия %1$s создана, отслеживание %2$s включено."
 
-#: libraries/user_preferences.inc.php:29
+#: libraries/user_preferences.inc.php:30
 msgid "Manage your settings"
 msgstr "Пользовательские настройки"
 
-#: libraries/user_preferences.inc.php:46 prefs_manage.php:307
+#: libraries/user_preferences.inc.php:54 prefs_manage.php:307
 msgid "Configuration has been saved."
 msgstr "Настройки успешно сохранены."
 
-#: libraries/user_preferences.inc.php:66
+#: libraries/user_preferences.inc.php:74
 #, php-format
 msgid ""
 "Your preferences will be saved for current session only. Storing them "
@@ -14836,7 +14854,7 @@ msgid "first"
 msgstr "первый"
 
 #: templates/columns_definitions/move_column.phtml:12
-#: templates/structure/add_column.phtml:21
+#: templates/table/structure/add_column.phtml:21
 #, php-format
 msgid "after %s"
 msgstr "после %s"
@@ -14905,197 +14923,293 @@ msgstr "Преобразование входных"
 msgid "Input transformation options"
 msgstr "Параметры преобразования входных"
 
-#: templates/designer/aggregate_query_panel.phtml:22
-#: templates/designer/options_panel.phtml:100
-msgid "Aggregate"
-msgstr "Объединение"
-
-#: templates/designer/aggregate_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:61
-#: templates/designer/options_panel.phtml:106
-#: templates/designer/options_panel.phtml:170
-#: templates/designer/where_query_panel.phtml:30
-#: templates/table/table_header.phtml:9
-msgid "Operator"
-msgstr "Оператор"
-
-#: templates/designer/database_tables.phtml:29
-msgid "Toggle"
-msgstr ""
-
-#: templates/designer/database_tables.phtml:40
-msgid "See table structure"
-msgstr "Отобразить структуру таблицы"
-
-#: templates/designer/delete_relation_panel.phtml:21
-msgid "Delete relation"
-msgstr "Удалить связь"
-
-#: templates/designer/edit_delete_pages.phtml:7
-msgid "Page to open"
-msgstr "Открываемая страница"
-
-#: templates/designer/edit_delete_pages.phtml:7
-msgid "Page to delete"
-msgstr "Удаляемая страница"
-
-#: templates/designer/having_query_panel.phtml:90
-#: templates/designer/options_panel.phtml:63
-#: templates/designer/options_panel.phtml:229
-#: templates/designer/where_query_panel.phtml:59
-msgid "Except"
-msgstr "Кроме"
-
-#: templates/designer/having_query_panel.phtml:102
-#: templates/designer/options_panel.phtml:75
-#: templates/designer/options_panel.phtml:241
-#: templates/designer/where_query_panel.phtml:71
-msgid "subquery"
-msgstr "подзапрос"
-
-#: templates/designer/new_relation_panel.phtml:22
-#: templates/designer/side_menu.phtml:84 templates/designer/side_menu.phtml:87
-msgid "Create relation"
-msgstr "Создать связь"
-
-#: templates/designer/options_panel.phtml:34
-#: templates/designer/options_panel.phtml:200
-msgid "Relation operator"
-msgstr "Оператор"
-
-#: templates/designer/options_panel.phtml:85
-#: templates/designer/rename_to_panel.phtml:23
-msgid "Rename to"
-msgstr "Переименовать в"
-
-#: templates/designer/options_panel.phtml:91
-#: templates/designer/rename_to_panel.phtml:31
-msgid "New name"
-msgstr "Новое имя"
-
-#: templates/designer/page_save_as.phtml:4
-msgid "Save to selected page"
-msgstr "Записать на выбранную страницу"
-
-#: templates/designer/page_save_as.phtml:5
-msgid "Create a page and save to it"
-msgstr "Создать страницу и записать на неё"
-
-#: templates/designer/page_save_as.phtml:26
-msgid "New page name"
-msgstr "Название новой страницы"
-
-#: templates/designer/page_selector.phtml:2
-msgid "Select page"
-msgstr "Выберите страницу"
-
-#: templates/designer/query_details.phtml:10
-msgid "Active options"
-msgstr "Активные параметры"
-
-#: templates/designer/schema_export.phtml:4
-msgid "Select Export Relational Type"
-msgstr "Выберите тип экспорта связей"
-
-#: templates/designer/side_menu.phtml:19 templates/designer/side_menu.phtml:25
-msgid "Show/Hide tables list"
-msgstr "Показать/Скрыть список таблиц"
-
-#: templates/designer/side_menu.phtml:29 templates/designer/side_menu.phtml:35
-#: templates/designer/side_menu.phtml:36
-msgid "View in fullscreen"
-msgstr "Отобразить в полном экране"
-
-#: templates/designer/side_menu.phtml:34
-msgid "Exit fullscreen"
-msgstr "Выйти из полноэкранного режима"
-
-#: templates/designer/side_menu.phtml:41 templates/designer/side_menu.phtml:45
-msgid "New page"
-msgstr "Новая страница"
-
-#: templates/designer/side_menu.phtml:70 templates/designer/side_menu.phtml:73
-msgid "Delete pages"
-msgstr "Удалить страницы"
-
-#: templates/designer/side_menu.phtml:77 templates/designer/side_menu.phtml:80
-#: templates/table/create_table.phtml:7
+#: templates/database/create_table.phtml:7
+#: templates/database/designer/side_menu.phtml:77
+#: templates/database/designer/side_menu.phtml:80
 msgid "Create table"
 msgstr "Создать таблицу"
 
-#: templates/designer/side_menu.phtml:98
-#: templates/designer/side_menu.phtml:101
+#: templates/database/create_table.phtml:15
+msgid "Number of columns"
+msgstr "Количество столбцов"
+
+#: templates/database/designer/aggregate_query_panel.phtml:22
+#: templates/database/designer/options_panel.phtml:100
+msgid "Aggregate"
+msgstr "Объединение"
+
+#: templates/database/designer/aggregate_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:61
+#: templates/database/designer/options_panel.phtml:106
+#: templates/database/designer/options_panel.phtml:170
+#: templates/database/designer/where_query_panel.phtml:30
+#: templates/table/search/table_header.phtml:9
+msgid "Operator"
+msgstr "Оператор"
+
+#: templates/database/designer/database_tables.phtml:29
+msgid "Toggle"
+msgstr ""
+
+#: templates/database/designer/database_tables.phtml:40
+msgid "See table structure"
+msgstr "Отобразить структуру таблицы"
+
+#: templates/database/designer/delete_relation_panel.phtml:21
+msgid "Delete relation"
+msgstr "Удалить связь"
+
+#: templates/database/designer/edit_delete_pages.phtml:7
+msgid "Page to open"
+msgstr "Открываемая страница"
+
+#: templates/database/designer/edit_delete_pages.phtml:7
+msgid "Page to delete"
+msgstr "Удаляемая страница"
+
+#: templates/database/designer/having_query_panel.phtml:90
+#: templates/database/designer/options_panel.phtml:63
+#: templates/database/designer/options_panel.phtml:229
+#: templates/database/designer/where_query_panel.phtml:59
+msgid "Except"
+msgstr "Кроме"
+
+#: templates/database/designer/having_query_panel.phtml:102
+#: templates/database/designer/options_panel.phtml:75
+#: templates/database/designer/options_panel.phtml:241
+#: templates/database/designer/where_query_panel.phtml:71
+msgid "subquery"
+msgstr "подзапрос"
+
+#: templates/database/designer/new_relation_panel.phtml:22
+#: templates/database/designer/side_menu.phtml:84
+#: templates/database/designer/side_menu.phtml:87
+msgid "Create relation"
+msgstr "Создать связь"
+
+#: templates/database/designer/options_panel.phtml:34
+#: templates/database/designer/options_panel.phtml:200
+msgid "Relation operator"
+msgstr "Оператор"
+
+#: templates/database/designer/options_panel.phtml:85
+#: templates/database/designer/rename_to_panel.phtml:23
+msgid "Rename to"
+msgstr "Переименовать в"
+
+#: templates/database/designer/options_panel.phtml:91
+#: templates/database/designer/rename_to_panel.phtml:31
+msgid "New name"
+msgstr "Новое имя"
+
+#: templates/database/designer/page_save_as.phtml:4
+msgid "Save to selected page"
+msgstr "Записать на выбранную страницу"
+
+#: templates/database/designer/page_save_as.phtml:5
+msgid "Create a page and save to it"
+msgstr "Создать страницу и записать на неё"
+
+#: templates/database/designer/page_save_as.phtml:26
+msgid "New page name"
+msgstr "Название новой страницы"
+
+#: templates/database/designer/page_selector.phtml:2
+msgid "Select page"
+msgstr "Выберите страницу"
+
+#: templates/database/designer/query_details.phtml:10
+msgid "Active options"
+msgstr "Активные параметры"
+
+#: templates/database/designer/schema_export.phtml:4
+msgid "Select Export Relational Type"
+msgstr "Выберите тип экспорта связей"
+
+#: templates/database/designer/side_menu.phtml:19
+#: templates/database/designer/side_menu.phtml:25
+msgid "Show/Hide tables list"
+msgstr "Показать/Скрыть список таблиц"
+
+#: templates/database/designer/side_menu.phtml:29
+#: templates/database/designer/side_menu.phtml:35
+#: templates/database/designer/side_menu.phtml:36
+msgid "View in fullscreen"
+msgstr "Отобразить в полном экране"
+
+#: templates/database/designer/side_menu.phtml:34
+msgid "Exit fullscreen"
+msgstr "Выйти из полноэкранного режима"
+
+#: templates/database/designer/side_menu.phtml:41
+#: templates/database/designer/side_menu.phtml:45
+msgid "New page"
+msgstr "Новая страница"
+
+#: templates/database/designer/side_menu.phtml:70
+#: templates/database/designer/side_menu.phtml:73
+msgid "Delete pages"
+msgstr "Удалить страницы"
+
+#: templates/database/designer/side_menu.phtml:98
+#: templates/database/designer/side_menu.phtml:101
 msgid "Reload"
 msgstr "Обновить"
 
-#: templates/designer/side_menu.phtml:107
-#: templates/designer/side_menu.phtml:110
+#: templates/database/designer/side_menu.phtml:107
+#: templates/database/designer/side_menu.phtml:110
 msgid "Help"
 msgstr "Помощь"
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Angular links"
 msgstr "Угловые линии связей"
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Direct links"
 msgstr "Прямые линии связей"
 
-#: templates/designer/side_menu.phtml:122
-#: templates/designer/side_menu.phtml:124
+#: templates/database/designer/side_menu.phtml:122
+#: templates/database/designer/side_menu.phtml:124
 msgid "Snap to grid"
 msgstr "Привязать к сетке"
 
-#: templates/designer/side_menu.phtml:128
-#: templates/designer/side_menu.phtml:134
+#: templates/database/designer/side_menu.phtml:128
+#: templates/database/designer/side_menu.phtml:134
 msgid "Small/Big All"
 msgstr "Свернуть/развернуть отображение всех таблиц"
 
-#: templates/designer/side_menu.phtml:138
-#: templates/designer/side_menu.phtml:141
+#: templates/database/designer/side_menu.phtml:138
+#: templates/database/designer/side_menu.phtml:141
 msgid "Toggle small/big"
 msgstr "Обратное отображение"
 
-#: templates/designer/side_menu.phtml:145
-#: templates/designer/side_menu.phtml:148
+#: templates/database/designer/side_menu.phtml:145
+#: templates/database/designer/side_menu.phtml:148
 msgid "Toggle relation lines"
 msgstr "Переключение линий связи"
 
-#: templates/designer/side_menu.phtml:153
-#: templates/designer/side_menu.phtml:156
+#: templates/database/designer/side_menu.phtml:153
+#: templates/database/designer/side_menu.phtml:156
 msgid "Export schema"
 msgstr "Экспорт схемы"
 
-#: templates/designer/side_menu.phtml:165
-#: templates/designer/side_menu.phtml:168
+#: templates/database/designer/side_menu.phtml:165
+#: templates/database/designer/side_menu.phtml:168
 msgid "Build Query"
 msgstr "Составить запрос"
 
-#: templates/designer/side_menu.phtml:173
-#: templates/designer/side_menu.phtml:177
+#: templates/database/designer/side_menu.phtml:173
+#: templates/database/designer/side_menu.phtml:177
 msgid "Move Menu"
 msgstr "Переместить меню"
 
-#: templates/designer/side_menu.phtml:181
-#: templates/designer/side_menu.phtml:186
+#: templates/database/designer/side_menu.phtml:181
+#: templates/database/designer/side_menu.phtml:186
 msgid "Pin text"
 msgstr ""
 
-#: templates/designer/table_list.phtml:4
+#: templates/database/designer/table_list.phtml:4
 msgid "Hide/Show all"
 msgstr "Скрыть/отобразить все таблицы"
 
-#: templates/designer/table_list.phtml:14
+#: templates/database/designer/table_list.phtml:14
 msgid "Hide/Show Tables with no relation"
 msgstr "Скрыть/отобразить таблицы не имеющие связей"
 
-#: templates/designer/table_list.phtml:59
+#: templates/database/designer/table_list.phtml:59
 msgid "Number of tables:"
 msgstr "Количество таблиц:"
 
+#: templates/database/structure/body_for_table_summary.phtml:6
+#, php-format
+msgid "%s table"
+msgid_plural "%s tables"
+msgstr[0] "%s таблица"
+msgstr[1] "%s таблицы"
+msgstr[2] "%s таблиц"
+
+#: templates/database/structure/body_for_table_summary.phtml:17
+msgid "Sum"
+msgstr "Всего"
+
+#: templates/database/structure/check_all_tables.phtml:6
+msgid "Check tables having overhead"
+msgstr "Отметить требующие оптимизации"
+
+#: templates/database/structure/check_all_tables.phtml:10
+msgid "Show create"
+msgstr "Вывести форму создания"
+
+#: templates/database/structure/check_all_tables.phtml:27
+msgid "Prefix"
+msgstr "Префикс"
+
+#: templates/database/structure/check_all_tables.phtml:28
+msgid "Add prefix to table"
+msgstr "Добавить префикс таблицы"
+
+#: templates/database/structure/check_all_tables.phtml:29
+msgid "Replace table prefix"
+msgstr "Заменить префикс таблицы"
+
+#: templates/database/structure/check_all_tables.phtml:30
+msgid "Copy table with prefix"
+msgstr "Копировать таблицу с префиксом"
+
+#: templates/database/structure/check_all_tables.phtml:36
+msgid "Add columns to central list"
+msgstr "Добавить столбцы в центральный список"
+
+#: templates/database/structure/check_all_tables.phtml:37
+msgid "Remove columns from central list"
+msgstr "Удалить столбцы из центрального списка"
+
+#: templates/database/structure/check_all_tables.phtml:38
+msgid "Make consistent with central list"
+msgstr "Привести в соответствие с центральным списком"
+
+#: templates/database/structure/favorite_anchor.phtml:12
+msgid "Add to Favorites"
+msgstr "Добавить в Избранное"
+
+#: templates/database/structure/show_create.phtml:2
+msgid "Showing create queries"
+msgstr "Показываются запросы создания"
+
+#: templates/database/structure/sortable_header.phtml:13
+msgid "Sort"
+msgstr "Отсортировать"
+
+#: templates/database/structure/table_header.phtml:42
+msgid ""
+"May be approximate. Click on the number to get the exact count. See "
+"[doc@faq3-11]FAQ 3.11[/doc]."
+msgstr ""
+"Может быть приблизительно. Нажмите на номер, чтобы получить точное "
+"количество. Смотрите [doc@faq3-11]FAQ 3.11[/doc]."
+
+#: templates/database/structure/table_header.phtml:66
+#: templates/table/index_form.phtml:127
+msgid "Size"
+msgstr "Размер"
+
+#: templates/database/structure/table_header.phtml:74
+#: templates/table/structure/display_table_stats.phtml:27
+msgid "Overhead"
+msgstr "Фрагментировано"
+
+#: templates/database/structure/tracking_icon.phtml:4
+msgid "Tracking is active."
+msgstr "Слежение включено."
+
+#: templates/database/structure/tracking_icon.phtml:8
+msgid "Tracking is not active."
+msgstr "Слежение выключено."
+
 #: templates/error/report_form.phtml:7
 msgid ""
 "phpMyAdmin has encountered an error. We have collected data about this error "
@@ -15113,59 +15227,6 @@ msgstr "Вы можете изучить данные в отчёте об ош
 msgid "Please explain the steps that lead to the error:"
 msgstr "Пожалуйста, опишите шаги, приводящие к возникновению ошибки:"
 
-#: templates/gis_visualization/gis_visualization.phtml:3
-msgid "Display GIS Visualization"
-msgstr "Визуализация GIS данных"
-
-#: templates/gis_visualization/gis_visualization.phtml:8
-msgid "Label column"
-msgstr "Название столбца"
-
-#: templates/gis_visualization/gis_visualization.phtml:11
-msgid "-- None --"
-msgstr "-- Пусто --"
-
-#: templates/gis_visualization/gis_visualization.phtml:19
-msgid "Spatial column"
-msgstr "Пространственный столбец"
-
-#: templates/index_form.phtml:16
-msgid "Index name:"
-msgstr "Имя индекса&nbsp;:"
-
-#: templates/index_form.phtml:19
-msgid ""
-"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
-msgstr "Имя \"PRIMARY\" <b>должен</b> иметь <b>только</b> первичный индекс!"
-
-#: templates/index_form.phtml:40
-msgid "Index choice:"
-msgstr "Выбор индекса:"
-
-#: templates/index_form.phtml:57
-msgid "Key block size:"
-msgstr ""
-
-#: templates/index_form.phtml:74
-msgid "Index type:"
-msgstr "Тип индекса&nbsp;:"
-
-#: templates/index_form.phtml:86
-msgid "Parser:"
-msgstr "Парсер:"
-
-#: templates/index_form.phtml:102
-msgid "Comment:"
-msgstr "Комментарий:"
-
-#: templates/index_form.phtml:127 templates/structure/table_header.phtml:66
-msgid "Size"
-msgstr "Размер"
-
-#: templates/index_form.phtml:149 templates/index_form.phtml:190
-msgid "Drag to reorder"
-msgstr "Перетяните для изменения порядка сортировки"
-
 #: templates/prefs_autoload.phtml:9
 msgid ""
 "Your browser has phpMyAdmin configuration for this domain. Would you like to "
@@ -15178,364 +15239,148 @@ msgstr ""
 msgid "Start row:"
 msgstr "Начальная строка:"
 
-#: templates/structure/actions_in_table_structure.phtml:14
-#, php-format
-msgid "A primary key has been added on %s."
-msgstr "Был добавлен первичный ключ к %s."
-
-#: templates/structure/actions_in_table_structure.phtml:34
-#: templates/structure/actions_in_table_structure.phtml:54
-#: templates/structure/actions_in_table_structure.phtml:79
-#: templates/structure/actions_in_table_structure.phtml:101
-#, php-format
-msgid "An index has been added on %s."
-msgstr "Был добавлен индекс для %s."
-
-#: templates/structure/actions_in_table_structure.phtml:130
-#: templates/structure/check_all_table_column.phtml:59
-msgid "Remove from central columns"
-msgstr "Удалить из центральных столбцов"
-
-#: templates/structure/actions_in_table_structure.phtml:138
-#: templates/structure/check_all_table_column.phtml:55
-msgid "Add to central columns"
-msgstr "Добавить к центральным столбцам"
-
-#: templates/structure/add_column.phtml:7
-#, php-format
-msgid "Add %s column(s)"
-msgstr "Добавить %s поле(я)"
-
-#: templates/structure/add_column.phtml:12
-msgid "at beginning of table"
-msgstr "в начале таблицы"
-
-#: templates/structure/body_for_table_summary.phtml:6
-#, php-format
-msgid "%s table"
-msgid_plural "%s tables"
-msgstr[0] "%s таблица"
-msgstr[1] "%s таблицы"
-msgstr[2] "%s таблиц"
-
-#: templates/structure/body_for_table_summary.phtml:17
-msgid "Sum"
-msgstr "Всего"
-
-#: templates/structure/check_all_tables.phtml:6
-msgid "Check tables having overhead"
-msgstr "Отметить требующие оптимизации"
-
-#: templates/structure/check_all_tables.phtml:10
-msgid "Show create"
-msgstr "Вывести форму создания"
-
-#: templates/structure/check_all_tables.phtml:27
-msgid "Prefix"
-msgstr "Префикс"
-
-#: templates/structure/check_all_tables.phtml:28
-msgid "Add prefix to table"
-msgstr "Добавить префикс таблицы"
-
-#: templates/structure/check_all_tables.phtml:29
-msgid "Replace table prefix"
-msgstr "Заменить префикс таблицы"
-
-#: templates/structure/check_all_tables.phtml:30
-msgid "Copy table with prefix"
-msgstr "Копировать таблицу с префиксом"
-
-#: templates/structure/check_all_tables.phtml:36
-msgid "Add columns to central list"
-msgstr "Добавить столбцы в центральный список"
-
-#: templates/structure/check_all_tables.phtml:37
-msgid "Remove columns from central list"
-msgstr "Удалить столбцы из центрального списка"
-
-#: templates/structure/check_all_tables.phtml:38
-msgid "Make consistent with central list"
-msgstr "Привести в соответствие с центральным списком"
-
-#: templates/structure/display_structure.phtml:140 view_create.php:181
-msgid "Edit view"
-msgstr "Редактировать представление"
-
-#: templates/structure/display_table_stats.phtml:9
-msgid "Space usage"
-msgstr "Используемое пространство"
-
-#: templates/structure/display_table_stats.phtml:27
-#: templates/structure/table_header.phtml:74
-msgid "Overhead"
-msgstr "Фрагментировано"
-
-#: templates/structure/display_table_stats.phtml:32
-msgid "Effective"
-msgstr "Эффективность"
-
-#: templates/structure/favorite_anchor.phtml:12
-msgid "Add to Favorites"
-msgstr "Добавить в Избранное"
-
-#: templates/structure/move_columns_dialog.phtml:1
-#: templates/structure/optional_action_links.phtml:21
-msgid "Move columns"
-msgstr "Переместить поля"
-
-#: templates/structure/move_columns_dialog.phtml:2
-msgid "Move the columns by dragging them up and down."
-msgstr "Переместите поля перетаскивая их вверх и вниз."
-
-#: templates/structure/optional_action_links.phtml:9
-msgid "Propose table structure"
-msgstr "Анализ структуры таблицы"
-
-#: templates/structure/optional_action_links.phtml:24
-msgid "Improve table structure"
-msgstr "Улучшить структуру таблицы"
-
-#: templates/structure/optional_action_links.phtml:30
-#, fuzzy
-#| msgid "Track table"
-msgid "Track view"
-msgstr "Отслеживать таблицу"
-
-#: templates/structure/row_stats_table.phtml:3
-msgid "Row statistics"
-msgstr "Статистика строки"
-
-#: templates/structure/row_stats_table.phtml:9
-msgid "static"
-msgstr "статический"
-
-#: templates/structure/row_stats_table.phtml:11
-msgid "dynamic"
-msgstr "динамический"
-
-#: templates/structure/row_stats_table.phtml:22
-msgid "partitioned"
-msgstr "разделён"
-
-#: templates/structure/row_stats_table.phtml:54
-msgid "Row length"
-msgstr "Длина строки"
-
-#: templates/structure/row_stats_table.phtml:66
-msgid "Row size"
-msgstr "Размер строки"
-
-#: templates/structure/row_stats_table.phtml:73
-msgid "Next autoindex"
-msgstr "Следующий автоматический индекс"
-
-#: templates/structure/secondary_tabs.phtml:14
-#, fuzzy
-#| msgid "Relation view"
-msgid "Relation view"
-msgstr "Связи"
-
-#: templates/structure/show_create.phtml:2
-msgid "Showing create queries"
-msgstr "Показываются запросы создания"
-
-#: templates/structure/sortable_header.phtml:13
-msgid "Sort"
-msgstr "Отсортировать"
-
-#: templates/structure/table_header.phtml:42
-msgid ""
-"May be approximate. Click on the number to get the exact count. See "
-"[doc@faq3-11]FAQ 3.11[/doc]."
-msgstr ""
-"Может быть приблизительно. Нажмите на номер, чтобы получить точное "
-"количество. Смотрите [doc@faq3-11]FAQ 3.11[/doc]."
-
-#: templates/structure/table_structure_row.phtml:46
-#, php-format
-msgid "Column %s has been dropped."
-msgstr "Поле %s было удалено."
-
-#: templates/structure/tracking_icon.phtml:4
-msgid "Tracking is active."
-msgstr "Слежение включено."
-
-#: templates/structure/tracking_icon.phtml:8
-msgid "Tracking is not active."
-msgstr "Слежение выключено."
-
-#: templates/table/create_table.phtml:15
-msgid "Number of columns"
-msgstr "Количество столбцов"
-
-#: templates/table/options.phtml:8
-msgid "Select columns (at least one):"
-msgstr "Выберите поля (не менее одного):"
-
-#: templates/table/options.phtml:37
-msgid "Add search conditions (body of the \"where\" clause):"
-msgstr "Добавить условия поиска (тело для условия \"WHERE\"):"
-
-#: templates/table/options.phtml:45
-msgid "Number of rows per page"
-msgstr "Количество строк на странице"
-
-#: templates/table/options.phtml:56
-msgid "Display order:"
-msgstr "Сортировка:"
-
-#: templates/table/options_zoom.phtml:6
-msgid "Use this column to label each point"
-msgstr "Использовать данное поле для обозначения каждой точки"
-
-#: templates/table/options_zoom.phtml:35
-msgid "Maximum rows to plot"
-msgstr "Максимальное количество строк для построения"
-
-#: templates/table/replace_preview.phtml:13
-msgid "Find and replace - preview"
-msgstr "Поиск и замена - предварительный просмотр"
-
-#: templates/table/replace_preview.phtml:18
-msgid "Original string"
-msgstr "Исходная строка"
-
-#: templates/table/replace_preview.phtml:19
-msgid "Replaced string"
-msgstr "Строка замены"
-
-#: templates/table/replace_preview.phtml:40
-msgid "Replace"
-msgstr "Замена"
-
-#: templates/table/rows_zoom.phtml:16
-msgid "Additional search criteria"
-msgstr "Добавочный критерий поиска"
-
-#: templates/table/search_and_replace.phtml:3
-msgid "Replace with:"
-msgstr "Заменить на:"
-
-#: templates/table/search_and_replace.phtml:22
-msgid "Use regular expression"
-msgstr "Использовать регулярное выражение"
-
-#: templates/table/selection_form.phtml:12
-msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
-msgstr ""
-"Выполнить \"запрос по образцу\" (символ шаблона: \"%\") для двух различных "
-"столбцов"
-
-#: templates/table/selection_form.phtml:34
-msgid "Do a \"query by example\" (wildcard: \"%\")"
-msgstr "Выполнить \"запрос по образцу\" (групповой символ: \"%\")"
-
-#: templates/table/zoom_result_form.phtml:7
-msgid "Browse/Edit the points"
-msgstr "Обзор/Редакция точек"
-
-#: templates/table/zoom_result_form.phtml:15
-msgid "How to use"
-msgstr "Как использовать"
-
-#: templates/table/zoom_result_form.phtml:23
-msgid "Reset zoom"
-msgstr "Сбросить увеличение"
-
-#: templates/tbl_chart.phtml:17
+#: templates/table/chart/tbl_chart.phtml:17
 msgctxt "Chart type"
 msgid "Bar"
 msgstr "Ряд"
 
-#: templates/tbl_chart.phtml:21
+#: templates/table/chart/tbl_chart.phtml:21
 msgctxt "Chart type"
 msgid "Column"
 msgstr "Столбец"
 
-#: templates/tbl_chart.phtml:25
+#: templates/table/chart/tbl_chart.phtml:25
 msgctxt "Chart type"
 msgid "Line"
 msgstr "Линия"
 
-#: templates/tbl_chart.phtml:29
+#: templates/table/chart/tbl_chart.phtml:29
 msgctxt "Chart type"
 msgid "Spline"
 msgstr "Сплайн"
 
-#: templates/tbl_chart.phtml:33
+#: templates/table/chart/tbl_chart.phtml:33
 msgctxt "Chart type"
 msgid "Area"
 msgstr "Тип графика"
 
-#: templates/tbl_chart.phtml:37
+#: templates/table/chart/tbl_chart.phtml:37
 msgctxt "Chart type"
 msgid "Pie"
 msgstr "Круговая"
 
-#: templates/tbl_chart.phtml:41
+#: templates/table/chart/tbl_chart.phtml:41
 msgctxt "Chart type"
 msgid "Timeline"
 msgstr "Шкала времени"
 
-#: templates/tbl_chart.phtml:45
+#: templates/table/chart/tbl_chart.phtml:45
 msgctxt "Chart type"
 msgid "Scatter"
 msgstr "Вид диаграммы"
 
-#: templates/tbl_chart.phtml:50
+#: templates/table/chart/tbl_chart.phtml:50
 msgid "Stacked"
 msgstr "Уложенный"
 
-#: templates/tbl_chart.phtml:53
+#: templates/table/chart/tbl_chart.phtml:53
 msgid "Chart title"
 msgstr "Заголовок графика"
 
-#: templates/tbl_chart.phtml:57
+#: templates/table/chart/tbl_chart.phtml:57
 msgid "X-Axis:"
 msgstr "Ось-X:"
 
-#: templates/tbl_chart.phtml:72
+#: templates/table/chart/tbl_chart.phtml:72
 msgid "Series:"
 msgstr "Серии:"
 
-#: templates/tbl_chart.phtml:102
+#: templates/table/chart/tbl_chart.phtml:102
 msgid "X-Axis label:"
 msgstr "Подпись для оси X:"
 
-#: templates/tbl_chart.phtml:104
+#: templates/table/chart/tbl_chart.phtml:104
 msgid "X Values"
 msgstr "Значения X"
 
-#: templates/tbl_chart.phtml:107
+#: templates/table/chart/tbl_chart.phtml:107
 msgid "Y-Axis label:"
 msgstr "Подпись для оси Y:"
 
-#: templates/tbl_chart.phtml:115
+#: templates/table/chart/tbl_chart.phtml:115
 msgid "Series names are in a column"
 msgstr "Имена серии находятся в столбце"
 
-#: templates/tbl_chart.phtml:118
+#: templates/table/chart/tbl_chart.phtml:118
 msgid "Series column:"
 msgstr "Столбец серии:"
 
-#: templates/tbl_chart.phtml:130
+#: templates/table/chart/tbl_chart.phtml:130
 msgid "Value Column:"
 msgstr "Столбец значения:"
 
-#: templates/tbl_chart.phtml:150
+#: templates/table/chart/tbl_chart.phtml:150
 msgid "Save chart as image"
 msgstr "Сохранить диаграмму как изображение"
 
-#: templates/tbl_relation/common_form.phtml:7
+#: templates/table/gis_visualization/gis_visualization.phtml:3
+msgid "Display GIS Visualization"
+msgstr "Визуализация GIS данных"
+
+#: templates/table/gis_visualization/gis_visualization.phtml:8
+msgid "Label column"
+msgstr "Название столбца"
+
+#: templates/table/gis_visualization/gis_visualization.phtml:11
+msgid "-- None --"
+msgstr "-- Пусто --"
+
+#: templates/table/gis_visualization/gis_visualization.phtml:19
+msgid "Spatial column"
+msgstr "Пространственный столбец"
+
+#: templates/table/index_form.phtml:16
+msgid "Index name:"
+msgstr "Имя индекса&nbsp;:"
+
+#: templates/table/index_form.phtml:19
+msgid ""
+"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
+msgstr "Имя \"PRIMARY\" <b>должен</b> иметь <b>только</b> первичный индекс!"
+
+#: templates/table/index_form.phtml:40
+msgid "Index choice:"
+msgstr "Выбор индекса:"
+
+#: templates/table/index_form.phtml:57
+msgid "Key block size:"
+msgstr ""
+
+#: templates/table/index_form.phtml:74
+msgid "Index type:"
+msgstr "Тип индекса&nbsp;:"
+
+#: templates/table/index_form.phtml:86
+msgid "Parser:"
+msgstr "Парсер:"
+
+#: templates/table/index_form.phtml:102
+msgid "Comment:"
+msgstr "Комментарий:"
+
+#: templates/table/index_form.phtml:149 templates/table/index_form.phtml:190
+msgid "Drag to reorder"
+msgstr "Перетяните для изменения порядка сортировки"
+
+#: templates/table/relation/common_form.phtml:7
 msgid "Internal relations"
 msgstr "Внутренние связи"
 
-#: templates/tbl_relation/common_form.phtml:11
+#: templates/table/relation/common_form.phtml:11
 msgid "Internal relation"
 msgstr "Внутренняя связь"
 
-#: templates/tbl_relation/common_form.phtml:14
+#: templates/table/relation/common_form.phtml:14
 msgid ""
 "An internal relation is not necessary when a corresponding FOREIGN KEY "
 "relation exists."
@@ -15543,50 +15388,230 @@ msgstr ""
 "Внутренняя связь не обязательна, если существует соответствующая связь с "
 "помощью внешнего ключа (FOREIGN KEY)."
 
-#: templates/tbl_relation/common_form.phtml:37
+#: templates/table/relation/common_form.phtml:37
 msgid "Foreign key constraints"
 msgstr "Ограничения внешнего ключа"
 
-#: templates/tbl_relation/common_form.phtml:40
+#: templates/table/relation/common_form.phtml:40
 msgid "Actions"
 msgstr "Действия"
 
-#: templates/tbl_relation/common_form.phtml:41
+#: templates/table/relation/common_form.phtml:41
 msgid "Constraint properties"
 msgstr "Свойства ограничения"
 
-#: templates/tbl_relation/common_form.phtml:44
+#: templates/table/relation/common_form.phtml:44
 msgid ""
 "Only columns with index will be displayed. You can define an index below."
 msgstr ""
 "Будут отображаться только столбцы с индексом. Вы можете определить индекс "
 "ниже."
 
-#: templates/tbl_relation/common_form.phtml:49
+#: templates/table/relation/common_form.phtml:49
 msgid "Foreign key constraint"
 msgstr "Ограничение внешнего ключа"
 
-#: templates/tbl_relation/common_form.phtml:81
+#: templates/table/relation/common_form.phtml:81
 msgid "+ Add constraint"
 msgstr "+ Добавить ограничение"
 
-#: templates/tbl_relation/common_form.phtml:91
+#: templates/table/relation/common_form.phtml:91
 msgid "Choose column to display:"
 msgstr "Выбор отображаемого столбца:"
 
-#: templates/tbl_relation/foreign_key_row.phtml:13
+#: templates/table/relation/foreign_key_row.phtml:13
 #, php-format
 msgid "Foreign key constraint %s has been dropped"
 msgstr "Ограничение внешнего ключа %s удалено"
 
-#: templates/tbl_relation/foreign_key_row.phtml:102
+#: templates/table/relation/foreign_key_row.phtml:102
 msgid "Constraint name"
 msgstr "Ограничения внешнего ключа"
 
-#: templates/tbl_relation/foreign_key_row.phtml:157
+#: templates/table/relation/foreign_key_row.phtml:157
 msgid "+ Add column"
 msgstr "+ Добавить столбец"
 
+#: templates/table/search/options.phtml:8
+msgid "Select columns (at least one):"
+msgstr "Выберите поля (не менее одного):"
+
+#: templates/table/search/options.phtml:37
+msgid "Add search conditions (body of the \"where\" clause):"
+msgstr "Добавить условия поиска (тело для условия \"WHERE\"):"
+
+#: templates/table/search/options.phtml:45
+msgid "Number of rows per page"
+msgstr "Количество строк на странице"
+
+#: templates/table/search/options.phtml:56
+msgid "Display order:"
+msgstr "Сортировка:"
+
+#: templates/table/search/options_zoom.phtml:6
+msgid "Use this column to label each point"
+msgstr "Использовать данное поле для обозначения каждой точки"
+
+#: templates/table/search/options_zoom.phtml:35
+msgid "Maximum rows to plot"
+msgstr "Максимальное количество строк для построения"
+
+#: templates/table/search/replace_preview.phtml:13
+msgid "Find and replace - preview"
+msgstr "Поиск и замена - предварительный просмотр"
+
+#: templates/table/search/replace_preview.phtml:18
+msgid "Original string"
+msgstr "Исходная строка"
+
+#: templates/table/search/replace_preview.phtml:19
+msgid "Replaced string"
+msgstr "Строка замены"
+
+#: templates/table/search/replace_preview.phtml:40
+msgid "Replace"
+msgstr "Замена"
+
+#: templates/table/search/rows_zoom.phtml:16
+msgid "Additional search criteria"
+msgstr "Добавочный критерий поиска"
+
+#: templates/table/search/search_and_replace.phtml:3
+msgid "Replace with:"
+msgstr "Заменить на:"
+
+#: templates/table/search/search_and_replace.phtml:22
+msgid "Use regular expression"
+msgstr "Использовать регулярное выражение"
+
+#: templates/table/search/selection_form.phtml:12
+msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
+msgstr ""
+"Выполнить \"запрос по образцу\" (символ шаблона: \"%\") для двух различных "
+"столбцов"
+
+#: templates/table/search/selection_form.phtml:34
+msgid "Do a \"query by example\" (wildcard: \"%\")"
+msgstr "Выполнить \"запрос по образцу\" (групповой символ: \"%\")"
+
+#: templates/table/search/zoom_result_form.phtml:7
+msgid "Browse/Edit the points"
+msgstr "Обзор/Редакция точек"
+
+#: templates/table/search/zoom_result_form.phtml:15
+msgid "How to use"
+msgstr "Как использовать"
+
+#: templates/table/search/zoom_result_form.phtml:23
+msgid "Reset zoom"
+msgstr "Сбросить увеличение"
+
+#: templates/table/secondary_tabs.phtml:14
+#, fuzzy
+#| msgid "Relation view"
+msgid "Relation view"
+msgstr "Связи"
+
+#: templates/table/structure/actions_in_table_structure.phtml:14
+#, php-format
+msgid "A primary key has been added on %s."
+msgstr "Был добавлен первичный ключ к %s."
+
+#: templates/table/structure/actions_in_table_structure.phtml:34
+#: templates/table/structure/actions_in_table_structure.phtml:54
+#: templates/table/structure/actions_in_table_structure.phtml:79
+#: templates/table/structure/actions_in_table_structure.phtml:101
+#, php-format
+msgid "An index has been added on %s."
+msgstr "Был добавлен индекс для %s."
+
+#: templates/table/structure/actions_in_table_structure.phtml:130
+#: templates/table/structure/check_all_table_column.phtml:59
+msgid "Remove from central columns"
+msgstr "Удалить из центральных столбцов"
+
+#: templates/table/structure/actions_in_table_structure.phtml:138
+#: templates/table/structure/check_all_table_column.phtml:55
+msgid "Add to central columns"
+msgstr "Добавить к центральным столбцам"
+
+#: templates/table/structure/add_column.phtml:7
+#, php-format
+msgid "Add %s column(s)"
+msgstr "Добавить %s поле(я)"
+
+#: templates/table/structure/add_column.phtml:12
+msgid "at beginning of table"
+msgstr "в начале таблицы"
+
+#: templates/table/structure/display_structure.phtml:140 view_create.php:181
+msgid "Edit view"
+msgstr "Редактировать представление"
+
+#: templates/table/structure/display_table_stats.phtml:9
+msgid "Space usage"
+msgstr "Используемое пространство"
+
+#: templates/table/structure/display_table_stats.phtml:32
+msgid "Effective"
+msgstr "Эффективность"
+
+#: templates/table/structure/move_columns_dialog.phtml:1
+#: templates/table/structure/optional_action_links.phtml:21
+msgid "Move columns"
+msgstr "Переместить поля"
+
+#: templates/table/structure/move_columns_dialog.phtml:2
+msgid "Move the columns by dragging them up and down."
+msgstr "Переместите поля перетаскивая их вверх и вниз."
+
+#: templates/table/structure/optional_action_links.phtml:9
+msgid "Propose table structure"
+msgstr "Анализ структуры таблицы"
+
+#: templates/table/structure/optional_action_links.phtml:24
+msgid "Improve table structure"
+msgstr "Улучшить структуру таблицы"
+
+#: templates/table/structure/optional_action_links.phtml:30
+#, fuzzy
+#| msgid "Track table"
+msgid "Track view"
+msgstr "Отслеживать таблицу"
+
+#: templates/table/structure/row_stats_table.phtml:3
+msgid "Row statistics"
+msgstr "Статистика строки"
+
+#: templates/table/structure/row_stats_table.phtml:9
+msgid "static"
+msgstr "статический"
+
+#: templates/table/structure/row_stats_table.phtml:11
+msgid "dynamic"
+msgstr "динамический"
+
+#: templates/table/structure/row_stats_table.phtml:22
+msgid "partitioned"
+msgstr "разделён"
+
+#: templates/table/structure/row_stats_table.phtml:54
+msgid "Row length"
+msgstr "Длина строки"
+
+#: templates/table/structure/row_stats_table.phtml:66
+msgid "Row size"
+msgstr "Размер строки"
+
+#: templates/table/structure/row_stats_table.phtml:73
+msgid "Next autoindex"
+msgstr "Следующий автоматический индекс"
+
+#: templates/table/structure/table_structure_row.phtml:46
+#, php-format
+msgid "Column %s has been dropped."
+msgstr "Поле %s было удалено."
+
 #: themes.php:17 themes.php:22
 msgid "Theme"
 msgstr "Тема"
diff --git a/po/si.po b/po/si.po
index 3034177ba2..16832de3a9 100644
--- a/po/si.po
+++ b/po/si.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 4.5.0-dev\n"
 "Report-Msgid-Bugs-To: developers@phpmyadmin.net\n"
-"POT-Creation-Date: 2015-08-08 13:53-0400\n"
+"POT-Creation-Date: 2015-08-12 08:10-0400\n"
 "PO-Revision-Date: 2015-07-24 06:59+0200\n"
 "Last-Translator: Madhura Jayaratne <madhura.cj@gmail.com>\n"
 "Language-Team: Sinhala <https://hosted.weblate.org/projects/phpmyadmin/"
@@ -51,7 +51,7 @@ msgid "Table comments:"
 msgstr "වගු විස්තර:"
 
 #: db_datadict.php:104 libraries/Index.class.php:699
-#: libraries/insert_edit.lib.php:1567
+#: libraries/insert_edit.lib.php:1565
 #: libraries/navigation/Nodes/Node_Column.class.php:30
 #: libraries/plugins/export/ExportHtmlword.class.php:280
 #: libraries/plugins/export/ExportHtmlword.class.php:375
@@ -65,13 +65,14 @@ msgstr "වගු විස්තර:"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1023
 #: libraries/tracking.lib.php:879 libraries/tracking.lib.php:975
 #: templates/columns_definitions/column_name.phtml:18
-#: templates/index_form.phtml:124 templates/table/table_header.phtml:6
-#: templates/table/zoom_result_form.phtml:33
-#: templates/tbl_relation/common_form.phtml:10
-#: templates/tbl_relation/common_form.phtml:43
-#: templates/tbl_relation/foreign_key_row.phtml:194
-#: templates/tbl_relation/foreign_key_row.phtml:206
-#: templates/tbl_relation/internal_relational_row.phtml:71
+#: templates/table/index_form.phtml:124
+#: templates/table/relation/common_form.phtml:10
+#: templates/table/relation/common_form.phtml:43
+#: templates/table/relation/foreign_key_row.phtml:194
+#: templates/table/relation/foreign_key_row.phtml:206
+#: templates/table/relation/internal_relational_row.phtml:71
+#: templates/table/search/table_header.phtml:6
+#: templates/table/search/zoom_result_form.phtml:33
 msgid "Column"
 msgstr "තීර"
 
@@ -89,21 +90,21 @@ msgstr "තීර"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1001
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1024
 #: libraries/rte/rte_list.lib.php:75 libraries/rte/rte_list.lib.php:103
-#: libraries/rte/rte_routines.lib.php:802
-#: libraries/rte/rte_routines.lib.php:831
-#: libraries/rte/rte_routines.lib.php:1493
+#: libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_routines.lib.php:922
+#: libraries/rte/rte_routines.lib.php:1584
 #: libraries/server_privileges.lib.php:2369 libraries/tracking.lib.php:880
 #: libraries/tracking.lib.php:972
 #: templates/columns_definitions/table_fields_definitions.phtml:11
-#: templates/structure/table_header.phtml:48
-#: templates/structure/table_structure_header.phtml:6
-#: templates/table/table_header.phtml:7
+#: templates/database/structure/table_header.phtml:48
+#: templates/table/search/table_header.phtml:7
+#: templates/table/structure/table_structure_header.phtml:6
 msgid "Type"
 msgstr "වර්ගය"
 
 #: db_datadict.php:106 libraries/Index.class.php:702
 #: libraries/central_columns.lib.php:708
-#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1576
+#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1574
 #: libraries/plugins/export/ExportHtmlword.class.php:286
 #: libraries/plugins/export/ExportHtmlword.class.php:381
 #: libraries/plugins/export/ExportLatex.class.php:509
@@ -116,8 +117,8 @@ msgstr "වර්ගය"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1026
 #: libraries/tracking.lib.php:882 libraries/tracking.lib.php:978
 #: templates/columns_definitions/table_fields_definitions.phtml:39
-#: templates/structure/table_structure_header.phtml:9
-#: templates/table/zoom_result_form.phtml:34
+#: templates/table/search/zoom_result_form.phtml:34
+#: templates/table/structure/table_structure_header.phtml:9
 msgid "Null"
 msgstr "Null"
 
@@ -135,8 +136,8 @@ msgstr "Null"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1027
 #: libraries/replication_gui.lib.php:153 libraries/tracking.lib.php:883
 #: templates/columns_definitions/table_fields_definitions.phtml:25
-#: templates/structure/body_for_table_summary.phtml:55
-#: templates/structure/table_structure_header.phtml:10
+#: templates/database/structure/body_for_table_summary.phtml:55
+#: templates/table/structure/table_structure_header.phtml:10
 msgid "Default"
 msgstr "පෙරනිමි"
 
@@ -164,19 +165,19 @@ msgid "Comments"
 msgstr "විස්තරය"
 
 #: db_datadict.php:146
-#: libraries/controllers/StructureController.class.php:1960
-#: libraries/controllers/StructureController.class.php:1965
+#: libraries/controllers/TableStructureController.class.php:951
+#: libraries/controllers/TableStructureController.class.php:956
 #: libraries/tracking.lib.php:922
 #: templates/columns_definitions/column_indexes.phtml:6
-#: templates/structure/check_all_table_column.phtml:22
-#: templates/structure/display_structure.phtml:74
+#: templates/table/structure/check_all_table_column.phtml:22
+#: templates/table/structure/display_structure.phtml:74
 msgid "Primary"
 msgstr "ප්‍රාථමික"
 
 #: db_datadict.php:156 js/messages.php:317 libraries/Index.class.php:567
 #: libraries/Index.class.php:606 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261 libraries/mult_submits.lib.php:403
+#: libraries/config/FormDisplay.tpl.php:272 libraries/mult_submits.lib.php:403
 #: libraries/mult_submits.lib.php:417
 #: libraries/plugins/export/ExportHtmlword.class.php:630
 #: libraries/plugins/export/ExportLatex.class.php:589
@@ -192,20 +193,20 @@ msgstr "ප්‍රාථමික"
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1010 libraries/tracking.lib.php:1015
 #: prefs_manage.php:140 templates/prefs_autoload.phtml:15
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "No"
 msgstr "නැත"
 
 #: db_datadict.php:156 js/messages.php:443 libraries/Index.class.php:568
 #: libraries/Index.class.php:605 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261
-#: libraries/controllers/StructureController.class.php:1344
-#: libraries/controllers/StructureController.class.php:2223
-#: libraries/controllers/StructureController.class.php:2232
-#: libraries/controllers/StructureController.class.php:2237
-#: libraries/controllers/StructureController.class.php:2242
-#: libraries/controllers/StructureController.class.php:2247
+#: libraries/config/FormDisplay.tpl.php:272
+#: libraries/controllers/TableStructureController.class.php:539
+#: libraries/controllers/TableStructureController.class.php:1201
+#: libraries/controllers/TableStructureController.class.php:1210
+#: libraries/controllers/TableStructureController.class.php:1215
+#: libraries/controllers/TableStructureController.class.php:1220
+#: libraries/controllers/TableStructureController.class.php:1225
 #: libraries/mult_submits.inc.php:82 libraries/mult_submits.inc.php:178
 #: libraries/mult_submits.lib.php:339 libraries/mult_submits.lib.php:372
 #: libraries/mult_submits.lib.php:401 libraries/mult_submits.lib.php:415
@@ -214,8 +215,8 @@ msgstr "නැත"
 #: libraries/plugins/export/ExportOdt.class.php:756
 #: libraries/plugins/export/ExportTexytext.class.php:567
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1077
-#: libraries/server_databases.lib.php:464
-#: libraries/server_databases.lib.php:474
+#: libraries/server_databases.lib.php:475
+#: libraries/server_databases.lib.php:485
 #: libraries/server_privileges.lib.php:2546
 #: libraries/server_privileges.lib.php:2727
 #: libraries/server_privileges.lib.php:2748
@@ -225,7 +226,7 @@ msgstr "නැත"
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1008 libraries/tracking.lib.php:1013
 #: prefs_manage.php:138 templates/prefs_autoload.phtml:14
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "Yes"
 msgstr "ඔව්"
 
@@ -235,7 +236,7 @@ msgstr "දත්තගබඩාවේ නික්ෂේපනය (ක්‍ර
 
 #: db_export.php:37 db_tracking.php:90 export.php:382
 #: libraries/DBQbe.class.php:326
-#: libraries/controllers/StructureController.class.php:231
+#: libraries/controllers/DatabaseStructureController.class.php:170
 #: libraries/navigation/NavigationTree.class.php:897
 msgid "No tables found in database."
 msgstr "දත්තගබඩාවේ වගු කිසිවක් සොයා ගැනීමට නොමැත."
@@ -246,14 +247,14 @@ msgstr "දත්තගබඩාවේ වගු කිසිවක් සොය
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:26
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:120
-#: templates/structure/show_create.phtml:18
+#: templates/database/structure/show_create.phtml:18
 msgid "Tables"
 msgstr "වගු"
 
 #: db_export.php:52 libraries/Menu.class.php:317 libraries/Menu.class.php:425
-#: libraries/Util.class.php:3333 libraries/Util.class.php:3343
-#: libraries/Util.class.php:3349 libraries/Util.class.php:3629
-#: libraries/Util.class.php:4327 libraries/Util.class.php:4344
+#: libraries/Util.class.php:3339 libraries/Util.class.php:3349
+#: libraries/Util.class.php:3355 libraries/Util.class.php:3635
+#: libraries/Util.class.php:4333 libraries/Util.class.php:4350
 #: libraries/central_columns.lib.php:728 libraries/config.values.php:39
 #: libraries/config.values.php:47 libraries/config.values.php:109
 #: libraries/config.values.php:115 libraries/config/setup.forms.php:323
@@ -267,7 +268,7 @@ msgstr "වගු"
 #: libraries/navigation/Nodes/Node_Table.class.php:283
 #: libraries/server_privileges.lib.php:1141 libraries/tracking.lib.php:874
 #: templates/columns_definitions/table_fields_definitions.phtml:3
-#: templates/designer/table_list.phtml:28
+#: templates/database/designer/table_list.phtml:28
 msgid "Structure"
 msgstr "සැකිල්ල"
 
@@ -279,7 +280,7 @@ msgstr "සැකිල්ල"
 #: libraries/config/user_preferences.forms.php:292
 #: libraries/config/user_preferences.forms.php:297
 #: libraries/server_privileges.lib.php:1140
-#: templates/structure/display_table_stats.phtml:12
+#: templates/table/structure/display_table_stats.phtml:12
 msgid "Data"
 msgstr "දත්ත"
 
@@ -356,10 +357,10 @@ msgstr "අවධානය සක්‍රීය වගු"
 #: libraries/server_privileges.lib.php:2908
 #: libraries/server_privileges.lib.php:3145
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4346
-#: templates/structure/table_header.phtml:21
-#: templates/tbl_relation/foreign_key_row.phtml:176
-#: templates/tbl_relation/internal_relational_row.phtml:63
+#: libraries/server_privileges.lib.php:4372
+#: templates/database/structure/table_header.phtml:21
+#: templates/table/relation/foreign_key_row.phtml:176
+#: templates/table/relation/internal_relational_row.phtml:63
 msgid "Table"
 msgstr "වගුව"
 
@@ -376,7 +377,7 @@ msgid "Updated"
 msgstr "යාවත්කාලීන කරන ලදි"
 
 #: db_tracking.php:130 js/messages.php:243 libraries/Menu.class.php:552
-#: libraries/Util.class.php:4314 libraries/config.values.php:104
+#: libraries/Util.class.php:4320 libraries/config.values.php:104
 #: libraries/rte/rte_events.lib.php:393 libraries/rte/rte_list.lib.php:101
 #: libraries/server_status_processes.lib.php:92 libraries/tracking.lib.php:279
 msgid "Status"
@@ -385,14 +386,15 @@ msgstr "තත්වය"
 #: db_tracking.php:131 db_tracking.php:290 libraries/Index.class.php:693
 #: libraries/central_columns.lib.php:687 libraries/rte/rte_list.lib.php:74
 #: libraries/rte/rte_list.lib.php:89 libraries/rte/rte_list.lib.php:102
-#: libraries/server_databases.lib.php:398
+#: libraries/server_databases.lib.php:409
 #: libraries/server_privileges.lib.php:2372
 #: libraries/server_privileges.lib.php:3166
 #: libraries/server_privileges.lib.php:3342
 #: libraries/server_user_groups.lib.php:82
 #: libraries/server_variables.lib.php:189 libraries/tracking.lib.php:280
-#: libraries/tracking.lib.php:793 templates/structure/table_header.phtml:30
-#: templates/structure/table_structure_header.phtml:23
+#: libraries/tracking.lib.php:793
+#: templates/database/structure/table_header.phtml:30
+#: templates/table/structure/table_structure_header.phtml:23
 msgid "Action"
 msgstr "ක්‍රියාව"
 
@@ -437,7 +439,7 @@ msgid "Untracked tables"
 msgstr "අවධානය අක්‍රීය වගු"
 
 #: db_tracking.php:305 db_tracking.php:336
-#: templates/structure/optional_action_links.phtml:17
+#: templates/table/structure/optional_action_links.phtml:17
 msgid "Track table"
 msgstr "වගුව අවධානයට ලක් කරන්න"
 
@@ -487,7 +489,7 @@ msgid "Value for the column \"%s\""
 msgstr "\"%s\" තීරය සඳහා අගයන්"
 
 #: gis_data_editor.php:146
-#: templates/gis_visualization/gis_visualization.phtml:37
+#: templates/table/gis_visualization/gis_visualization.phtml:37
 msgid "Use OpenStreetMaps as Base Layer"
 msgstr "මූලික ස්ථරය ලෙස OpenStreetMaps භාවිතා කරන්න"
 
@@ -567,35 +569,35 @@ msgstr "ජ්‍යාමිතියක් එක් කරන්න"
 #: libraries/display_change_password.lib.php:162
 #: libraries/display_export.lib.php:402 libraries/display_export.lib.php:408
 #: libraries/display_import.lib.php:392 libraries/index.lib.php:44
-#: libraries/insert_edit.lib.php:1546 libraries/insert_edit.lib.php:1583
+#: libraries/insert_edit.lib.php:1544 libraries/insert_edit.lib.php:1581
 #: libraries/normalization.lib.php:165 libraries/normalization.lib.php:821
 #: libraries/operations.lib.php:38 libraries/operations.lib.php:108
 #: libraries/operations.lib.php:263 libraries/operations.lib.php:306
 #: libraries/operations.lib.php:801 libraries/operations.lib.php:874
 #: libraries/operations.lib.php:923 libraries/operations.lib.php:1337
 #: libraries/operations.lib.php:1658
-#: libraries/plugins/auth/AuthenticationCookie.class.php:244
+#: libraries/plugins/auth/AuthenticationCookie.class.php:232
 #: libraries/replication_gui.lib.php:122 libraries/replication_gui.lib.php:161
 #: libraries/replication_gui.lib.php:324 libraries/replication_gui.lib.php:461
 #: libraries/replication_gui.lib.php:906 libraries/rte/rte_events.lib.php:509
-#: libraries/rte/rte_routines.lib.php:969
-#: libraries/rte/rte_routines.lib.php:1581
+#: libraries/rte/rte_routines.lib.php:1060
+#: libraries/rte/rte_routines.lib.php:1672
 #: libraries/rte/rte_triggers.lib.php:396 libraries/server_bin_log.lib.php:61
 #: libraries/server_privileges.lib.php:705
 #: libraries/server_privileges.lib.php:2106
 #: libraries/server_privileges.lib.php:2872
 #: libraries/server_privileges.lib.php:3553
-#: libraries/server_privileges.lib.php:4627
+#: libraries/server_privileges.lib.php:4653
 #: libraries/server_user_groups.lib.php:285
 #: libraries/sql_query_form.lib.php:369 libraries/sql_query_form.lib.php:429
 #: libraries/tracking.lib.php:533 libraries/tracking.lib.php:653
 #: prefs_manage.php:277 prefs_manage.php:355
 #: templates/columns_definitions/column_definitions_form.phtml:59
-#: templates/header_location.phtml:17 templates/index_form.phtml:238
+#: templates/database/create_table.phtml:21 templates/header_location.phtml:28
 #: templates/startAndNumberOfRowsPanel.phtml:14
-#: templates/structure/add_column.phtml:25
-#: templates/table/create_table.phtml:21
-#: templates/table/selection_form.phtml:75 view_create.php:275
+#: templates/table/index_form.phtml:238
+#: templates/table/search/selection_form.phtml:75
+#: templates/table/structure/add_column.phtml:25 view_create.php:275
 #: view_operations.php:106
 msgid "Go"
 msgstr "යන්න"
@@ -683,7 +685,7 @@ msgstr "අක්ෂර කට්ටල හැරවීම් පුස්තක
 msgid "Could not load import plugins, please check your installation!"
 msgstr "ආනයනය පේනු පූරණය අසමත් විය. ඔබගේ ස්ථාපිතය පරීක්ෂා කරන්න!"
 
-#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1466
+#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1460
 #, php-format
 msgid "Bookmark %s has been created."
 msgstr "%s පොත් සලකුණ සාදන ලදි."
@@ -724,13 +726,13 @@ msgstr ""
 msgid "Back"
 msgstr "ආපසු"
 
-#: index.php:148 libraries/Footer.class.php:70
+#: index.php:149 libraries/Footer.class.php:70
 #, fuzzy
 #| msgid "phpMyAdmin homepage"
 msgid "phpMyAdmin Demo Server"
 msgstr "phpMyAdmin මුල් පිටුව"
 
-#: index.php:152
+#: index.php:153
 #, php-format
 msgid ""
 "You are using the demo server. You can do anything here, but please do not "
@@ -738,113 +740,113 @@ msgid ""
 "at %s."
 msgstr ""
 
-#: index.php:162
+#: index.php:163
 msgid "General Settings"
 msgstr "සාමාන්‍ය සිටුවම්"
 
-#: index.php:190 libraries/display_change_password.lib.php:50
+#: index.php:191 libraries/display_change_password.lib.php:50
 #: libraries/display_change_password.lib.php:53 user_password.php:247
 msgid "Change password"
 msgstr "මුරපදය වෙනස් කරන්න"
 
-#: index.php:206
+#: index.php:207
 msgid "Server connection collation"
 msgstr "සේවාදායක සමඟ සම්බන්ධතාවේ පරිතුලනය"
 
-#: index.php:228
+#: index.php:229
 msgid "Appearance Settings"
 msgstr "මුහුණුවර සම්බන්ධ සිටුවම්"
 
 # සිටුවම් = settings. Source: Glossary of Information Technology Terms - ICTA
-#: index.php:258 prefs_manage.php:285
+#: index.php:259 prefs_manage.php:285
 msgid "More settings"
 msgstr "තවත් සිටුවම්"
 
-#: index.php:279
+#: index.php:280
 msgid "Database server"
 msgstr "දත්තගබඩා සේවාදායකය"
 
-#: index.php:282 libraries/plugins/auth/AuthenticationCookie.class.php:181
+#: index.php:283 libraries/plugins/auth/AuthenticationCookie.class.php:169
 msgid "Server:"
 msgstr "සේවාදායකය:"
 
-#: index.php:286
+#: index.php:287
 msgid "Server type:"
 msgstr "සේවාදායකයේ වර්ගය:"
 
-#: index.php:290 libraries/plugins/export/ExportLatex.class.php:212
+#: index.php:291 libraries/plugins/export/ExportLatex.class.php:212
 #: libraries/plugins/export/ExportSql.class.php:687
 #: libraries/plugins/export/ExportXml.class.php:189
 msgid "Server version:"
 msgstr "සේවාදායකයේ අනුවාදය:"
 
-#: index.php:296
+#: index.php:297
 msgid "Protocol version:"
 msgstr "ප්‍රෝටකෝල අනුවාදය:"
 
-#: index.php:300
+#: index.php:301
 msgid "User:"
 msgstr "භාවිතා කරන්නා:"
 
-#: index.php:305
+#: index.php:306
 msgid "Server charset:"
 msgstr "සේවාදායකයේ අක්ෂර කට්ටලය:"
 
-#: index.php:320
+#: index.php:321
 msgid "Web server"
 msgstr "වෙබ් සේවාදායකය"
 
-#: index.php:331
+#: index.php:332
 msgid "Database client version:"
 msgstr "දත්තගබඩා සේවාලාභියාගේ අනුවාදය:"
 
-#: index.php:335
+#: index.php:336
 msgid "PHP extension:"
 msgstr "PHP දිගුව:"
 
-#: index.php:349
+#: index.php:350
 #, fuzzy
 #| msgid "PHP Version:"
 msgid "PHP version:"
 msgstr "PHP අනුවාදය:"
 
-#: index.php:360
+#: index.php:361
 msgid "Show PHP information"
 msgstr "PHP තොරතුරු පෙන්වන්න"
 
-#: index.php:383
+#: index.php:384
 msgid "Version information:"
 msgstr "අනුවාදය පිළිබඳ තොරතුරු:"
 
-#: index.php:392 libraries/Util.class.php:432 libraries/Util.class.php:495
-#: libraries/config/FormDisplay.tpl.php:151
+#: index.php:393 libraries/Util.class.php:432 libraries/Util.class.php:495
+#: libraries/config/FormDisplay.tpl.php:162
 #: libraries/display_export.lib.php:577 libraries/engines/pbxt.lib.php:162
 #: libraries/navigation/NavigationHeader.class.php:196
 #: libraries/server_variables.lib.php:160
 msgid "Documentation"
 msgstr "ලියකියවිලි"
 
-#: index.php:399
+#: index.php:400
 msgid "Wiki"
 msgstr "විකි"
 
-#: index.php:408
+#: index.php:409
 msgid "Official Homepage"
 msgstr "නිල phpMyAdmin මුල් පිටුව"
 
-#: index.php:415
+#: index.php:416
 msgid "Contribute"
 msgstr "දායක වන්න"
 
-#: index.php:422
+#: index.php:423
 msgid "Get support"
 msgstr "සහාය ලබා ගන්න"
 
-#: index.php:429
+#: index.php:430
 msgid "List of changes"
 msgstr "වෙනස්කම් ලැයිස්තුව"
 
-#: index.php:451
+#: index.php:452
 #, fuzzy
 #| msgid ""
 #| "Your configuration file contains settings (root with no password) that "
@@ -861,7 +863,7 @@ msgstr ""
 "වරප්‍රසාදැති MySQL ගිණුමට අදාළ වේ. මෙම පෙරනිමි අගයන් භාවිතා කිරීම අනවසර ඇතුල්වීම් වලට හේතු "
 "විය හැකි බැවින් ඔබ 'root' භාවිතා කරන්නා සඳහා වෙනත් මුරපදයක් ලබා දිය යුතුය."
 
-#: index.php:468
+#: index.php:469
 msgid ""
 "You have enabled mbstring.func_overload in your PHP configuration. This "
 "option is incompatible with phpMyAdmin and might cause some data to be "
@@ -870,7 +872,7 @@ msgstr ""
 "ඔබගේ PHP වින්‍යාසයන් හි mbstring.func_overload සක්‍රීය කර ඇත. මෙම විකල්පය phpMyAdmin "
 "සමඟ නොගැළපෙන අතර යම් දත්ත විනාශ වීමට හේතු විය හැකිය!"
 
-#: index.php:483
+#: index.php:484
 msgid ""
 "The mbstring PHP extension was not found and you seem to be using a "
 "multibyte charset. Without the mbstring extension phpMyAdmin is unable to "
@@ -880,7 +882,7 @@ msgstr ""
 "mbstring දිගුව නොමැති ව phpMyAdmin හට නිවැරදිව පෙළ බෙදීමට නොහැකි අතර මෙය බලාපොරොත්තු "
 "නොවන ප්‍රතිඵල ගෙන දිය හැක."
 
-#: index.php:500
+#: index.php:501
 #, fuzzy
 #| msgid ""
 #| "Your PHP parameter [a@http://php.net/manual/en/session.configuration."
@@ -898,7 +900,7 @@ msgstr ""
 "ඇති කුකී වලංගු කාලය ට වඩා අඩු අගයක් ගනී. මේ හේතුවෙන් ඔබගේ සැසිය phpMyAdmin හි සිටුවා ඇති "
 "කාලයට පෙර කල් ඉකුත් විය හැක."
 
-#: index.php:519
+#: index.php:520
 msgid ""
 "Login cookie store is lower than cookie validity configured in phpMyAdmin, "
 "because of this, your login will expire sooner than configured in phpMyAdmin."
@@ -906,11 +908,11 @@ msgstr ""
 "ලොගින් කුකියේ වලංගු කාලය phpMyAdmin හි සිටුවා ඇති කුකී වලංගු කාලය ට වඩා අඩු අගයක් ගනී. මේ "
 "හේතුවෙන් ඔබගේ සැසිය phpMyAdmin හි සිටුවා ඇති කාලයට පෙර කල් ඉකුත් විය හැක."
 
-#: index.php:535
+#: index.php:536
 msgid "The configuration file now needs a secret passphrase (blowfish_secret)."
 msgstr "වින්‍යාස ගොනුවට දැන් රහස්‍ය වාක්‍ය ඛණ්ඩයක් (blowfish_secret) අවශ්‍යය."
 
-#: index.php:548
+#: index.php:549
 #, fuzzy
 #| msgid ""
 #| "Directory [code]config[/code], which is used by the setup script, still "
@@ -925,7 +927,7 @@ msgstr ""
 "පිහිටුවීමේ විධානාවලිය විසින් භාවිතා කරන [code]config[/code] ඩිරෙක්ටරිය තවමත් ඔබගේ "
 "phpMyAdmin ඩිරෙක්ටරිය තුල ඇත. phpMyAdmin වින්‍යාස සකසා අවසන් වූ පසු ඔබ එය ඉවත් කල යුතුය."
 
-#: index.php:564
+#: index.php:565
 #, fuzzy, php-format
 #| msgid ""
 #| "The phpMyAdmin configuration storage is not completely configured, some "
@@ -937,12 +939,12 @@ msgstr ""
 "phpMyAdmin හි configuration storage සම්පූර්ණයෙන් සකසා නැති බැවින් යම් විස්තෘත විශේෂාංග "
 "අක්‍රිය වී ඇත. ඇයිදැයි සොයා බැලීමට %sමෙතන%s ක්ලික් කරන්න."
 
-#: index.php:571
+#: index.php:572
 msgid ""
 "Or alternately go to 'Operations' tab of any database to set it up there."
 msgstr ""
 
-#: index.php:620
+#: index.php:621
 #, php-format
 msgid ""
 "Your PHP MySQL library version %s differs from your MySQL server version %s. "
@@ -951,7 +953,7 @@ msgstr ""
 "ඔබගේ PHP MySQL පුස්තකාල අනුවාදය වන %s සේවාදායකයේ MySQL අනුවාදය වන %s න් වෙනස් වේ. "
 "මෙය අනපේක්ෂිත හැසිරීම් ගෙන දිය හැක."
 
-#: index.php:648
+#: index.php:649
 #, php-format
 msgid ""
 "Server running with Suhosin. Please refer to %sdocumentation%s for possible "
@@ -1124,8 +1126,8 @@ msgstr ""
 msgid "Save & Close"
 msgstr "ගොනුවක් ලෙස තෝරන්න"
 
-#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:404
-#: libraries/insert_edit.lib.php:1550 prefs_manage.php:361
+#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:415
+#: libraries/insert_edit.lib.php:1548 prefs_manage.php:361
 #: prefs_manage.php:372
 msgid "Reset"
 msgstr "ප්‍රතිසකසන්න"
@@ -1166,7 +1168,7 @@ msgstr "සුචිය එක් කරන්න"
 msgid "Edit Index"
 msgstr "සුචිය සංස්කරණය කරන්න"
 
-#: js/messages.php:99 templates/index_form.phtml:232
+#: js/messages.php:99 templates/table/index_form.phtml:232
 #, php-format
 msgid "Add %s column(s) to index"
 msgstr "සුචියට ක්ෂේත්‍ර %s ක් එක් කරන්න"
@@ -1195,13 +1197,14 @@ msgstr "තීර ඇවුරුම් සළකුණ:"
 msgid "Please select column(s) for the index."
 msgstr "සුචියට ක්ෂේත්‍ර %s ක් එක් කරන්න"
 
-#: js/messages.php:106 templates/structure/add_column.phtml:1
+#: js/messages.php:106 templates/table/structure/add_column.phtml:1
 msgid "You have to add at least one column."
 msgstr "ඔබ අවම වශයෙන් එක් ක්ෂේත්‍රයක්වත් එක් කල යුතුයි."
 
-#: js/messages.php:109 libraries/insert_edit.lib.php:1548
+#: js/messages.php:109 libraries/insert_edit.lib.php:1546
 #: templates/columns_definitions/column_definitions_form.phtml:162
-#: templates/index_form.phtml:237 templates/tbl_relation/common_form.phtml:106
+#: templates/table/index_form.phtml:237
+#: templates/table/relation/common_form.phtml:106
 msgid "Preview SQL"
 msgstr ""
 
@@ -1222,7 +1225,7 @@ msgid "SQL query:"
 msgstr "SQL විමසුම:"
 
 #. l10n: Default label for the y-Axis of Charts
-#: js/messages.php:118 templates/tbl_chart.phtml:109
+#: js/messages.php:118 templates/table/chart/tbl_chart.phtml:109
 msgid "Y Values"
 msgstr "Y අගයන්"
 
@@ -1381,7 +1384,7 @@ msgstr "යැවුණු බයිට ගණන"
 msgid "Bytes received"
 msgstr "ලැබුණු බයිට ගණන"
 
-#: js/messages.php:169 libraries/server_status.lib.php:226
+#: js/messages.php:169 libraries/server_status.lib.php:235
 msgid "Connections"
 msgstr "සම්බන්ධතා"
 
@@ -1438,12 +1441,12 @@ msgstr "වගු %d"
 msgid "Questions"
 msgstr "ප්‍රශ්න"
 
-#: js/messages.php:184 libraries/server_status.lib.php:134
+#: js/messages.php:184 libraries/server_status.lib.php:143
 msgid "Traffic"
 msgstr "තදබදය"
 
 #: js/messages.php:185 libraries/Menu.class.php:586
-#: libraries/Util.class.php:4318 libraries/server_status_monitor.lib.php:257
+#: libraries/Util.class.php:4324 libraries/server_status_monitor.lib.php:257
 msgid "Settings"
 msgstr "සිටුවම්"
 
@@ -1463,8 +1466,9 @@ msgstr "කරුණාකර ශ්‍රේණියට අවම වශයෙ
 #: libraries/server_status_monitor.lib.php:236
 #: libraries/server_status_processes.lib.php:308
 #: templates/columns_definitions/transformation.phtml:4
-#: templates/designer/options_panel.phtml:178
-#: templates/table/options_zoom.phtml:12 templates/table/rows_zoom.phtml:26
+#: templates/database/designer/options_panel.phtml:178
+#: templates/table/search/options_zoom.phtml:12
+#: templates/table/search/rows_zoom.phtml:26
 msgid "None"
 msgstr "කිසිවක් නැත"
 
@@ -1744,8 +1748,8 @@ msgstr ""
 
 #: js/messages.php:270 libraries/Menu.class.php:352
 #: libraries/Menu.class.php:455 libraries/Menu.class.php:582
-#: libraries/Util.class.php:4317 libraries/Util.class.php:4332
-#: libraries/Util.class.php:4349 libraries/config/messages.inc.php:258
+#: libraries/Util.class.php:4323 libraries/Util.class.php:4338
+#: libraries/Util.class.php:4355 libraries/config/messages.inc.php:258
 #: libraries/display_import.lib.php:105
 #: libraries/server_status_monitor.lib.php:318 prefs_manage.php:238
 #: setup/frames/menu.inc.php:26
@@ -1805,13 +1809,13 @@ msgid "Formatting SQL..."
 msgstr ""
 
 #: js/messages.php:293 libraries/server_variables.lib.php:157
-#: templates/designer/aggregate_query_panel.phtml:63
-#: templates/designer/delete_relation_panel.phtml:28
-#: templates/designer/having_query_panel.phtml:117
-#: templates/designer/new_relation_panel.phtml:88
-#: templates/designer/options_panel.phtml:253
-#: templates/designer/rename_to_panel.phtml:45
-#: templates/designer/where_query_panel.phtml:83
+#: templates/database/designer/aggregate_query_panel.phtml:63
+#: templates/database/designer/delete_relation_panel.phtml:28
+#: templates/database/designer/having_query_panel.phtml:117
+#: templates/database/designer/new_relation_panel.phtml:88
+#: templates/database/designer/options_panel.phtml:253
+#: templates/database/designer/rename_to_panel.phtml:45
+#: templates/database/designer/where_query_panel.phtml:83
 msgid "Cancel"
 msgstr "අවලංගු කරන්න"
 
@@ -1821,7 +1825,7 @@ msgstr "අවලංගු කරන්න"
 msgid "Page-related settings"
 msgstr "සිටුවම් වෙනස් කිරීම"
 
-#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:402
+#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:413
 msgid "Apply"
 msgstr ""
 
@@ -1856,8 +1860,8 @@ msgstr "දෝෂ කේතය: %s"
 msgid "Error text: %s"
 msgstr "දෝෂ පණිවුඩය: %s"
 
-#: js/messages.php:307 libraries/db_common.inc.php:68
-#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:450
+#: js/messages.php:307 libraries/db_common.inc.php:69
+#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:461
 msgid "No databases selected."
 msgstr "දත්තගබඩාවක් තෝරාගෙන නොමැත."
 
@@ -1871,12 +1875,13 @@ msgstr "තීරුව හලමින්"
 msgid "Adding Primary Key"
 msgstr "ප්‍රාථමික මූලය එක් කරමින්"
 
-#: js/messages.php:310 templates/designer/aggregate_query_panel.phtml:59
-#: templates/designer/having_query_panel.phtml:113
-#: templates/designer/new_relation_panel.phtml:87
-#: templates/designer/options_panel.phtml:252
-#: templates/designer/rename_to_panel.phtml:41
-#: templates/designer/where_query_panel.phtml:82
+#: js/messages.php:310
+#: templates/database/designer/aggregate_query_panel.phtml:59
+#: templates/database/designer/having_query_panel.phtml:113
+#: templates/database/designer/new_relation_panel.phtml:87
+#: templates/database/designer/options_panel.phtml:252
+#: templates/database/designer/rename_to_panel.phtml:41
+#: templates/database/designer/where_query_panel.phtml:82
 msgid "OK"
 msgstr "OK"
 
@@ -1896,7 +1901,7 @@ msgstr "දත්තගබඩාව පිටපත් කෙරෙමින්"
 msgid "Changing Charset"
 msgstr "අක්ෂර කට්ටලය වෙනස් කෙරෙමින්"
 
-#: js/messages.php:320 libraries/Util.class.php:3217
+#: js/messages.php:320 libraries/Util.class.php:3223
 msgid "Enable foreign key checks"
 msgstr "අන්‍ය මූල පරීක්ෂා සක්‍රිය කරන්න"
 
@@ -1933,20 +1938,21 @@ msgstr "සුරැකි ශ්‍රිතයක නිර්වචනයෙ
 #: js/messages.php:334 libraries/DisplayResults.class.php:4834
 #: libraries/DisplayResults.class.php:5092 libraries/Menu.class.php:344
 #: libraries/Menu.class.php:446 libraries/Menu.class.php:578
-#: libraries/Util.class.php:3636 libraries/Util.class.php:3637
-#: libraries/Util.class.php:4316 libraries/Util.class.php:4331
-#: libraries/Util.class.php:4348 libraries/config/messages.inc.php:252
+#: libraries/Util.class.php:3642 libraries/Util.class.php:3643
+#: libraries/Util.class.php:4322 libraries/Util.class.php:4337
+#: libraries/Util.class.php:4354 libraries/config/messages.inc.php:252
 #: libraries/display_export.lib.php:173 libraries/rte/rte_list.lib.php:146
 #: libraries/server_privileges.lib.php:2211
 #: libraries/server_privileges.lib.php:2290
 #: libraries/server_privileges.lib.php:2632
 #: libraries/server_privileges.lib.php:3356
 #: libraries/server_status_monitor.lib.php:322 prefs_manage.php:303
-#: setup/frames/menu.inc.php:27 templates/structure/check_all_tables.phtml:11
+#: setup/frames/menu.inc.php:27
+#: templates/database/structure/check_all_tables.phtml:11
 msgid "Export"
 msgstr "අපනයනය"
 
-#: js/messages.php:337 libraries/rte/rte_routines.lib.php:652
+#: js/messages.php:337 libraries/rte/rte_routines.lib.php:743
 msgid "ENUM/SET editor"
 msgstr "ENUM/SET සංස්කාරකය"
 
@@ -1985,7 +1991,7 @@ msgstr "විමසුම් කවුළුව පෙන්වන්න"
 #: libraries/Console.class.php:214 libraries/DisplayResults.class.php:3474
 #: libraries/DisplayResults.class.php:4818 libraries/Index.class.php:723
 #: libraries/Util.class.php:706 libraries/Util.class.php:1202
-#: libraries/Util.class.php:3634 libraries/Util.class.php:3635
+#: libraries/Util.class.php:3640 libraries/Util.class.php:3641
 #: libraries/central_columns.lib.php:851
 #: libraries/central_columns.lib.php:1193
 #: libraries/config/messages.inc.php:892
@@ -2003,7 +2009,7 @@ msgstr "සංස්කරණය කරන්න"
 #: libraries/server_user_groups.lib.php:129
 #: libraries/sql_query_form.lib.php:416 libraries/tracking.lib.php:477
 #: setup/frames/index.inc.php:183 setup/frames/index.inc.php:291
-#: templates/designer/delete_relation_panel.phtml:27
+#: templates/database/designer/delete_relation_panel.phtml:27
 msgid "Delete"
 msgstr "ඉවත් කරන්න"
 
@@ -2187,11 +2193,11 @@ msgid "No dependencies selected!"
 msgstr "දත්තගබඩාවක් තෝරාගෙන නොමැත."
 
 #: js/messages.php:394 libraries/central_columns.lib.php:1214
-#: libraries/insert_edit.lib.php:1458 libraries/server_variables.lib.php:155
+#: libraries/insert_edit.lib.php:1456 libraries/server_variables.lib.php:155
 #: setup/frames/config.inc.php:42 setup/frames/index.inc.php:279
 #: templates/columns_definitions/column_definitions_form.phtml:165
-#: templates/gis_visualization/gis_visualization.phtml:48
-#: templates/tbl_relation/common_form.phtml:107
+#: templates/table/gis_visualization/gis_visualization.phtml:48
+#: templates/table/relation/common_form.phtml:107
 msgid "Save"
 msgstr "සුරකින්න"
 
@@ -2282,8 +2288,8 @@ msgid "Data point content"
 msgstr "ලක්ෂයට අදාල දත්ත"
 
 #: js/messages.php:430 js/messages.php:562 js/messages.php:579
-#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2573
-#: templates/index_form.phtml:154 templates/index_form.phtml:194
+#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2571
+#: templates/table/index_form.phtml:154 templates/table/index_form.phtml:194
 msgid "Ignore"
 msgstr "නොසලකන්න"
 
@@ -2344,8 +2350,8 @@ msgstr "අන්‍ය මූලය තෝරන්න"
 msgid "Please select the primary key or a unique key!"
 msgstr "කරුණාකර ප්‍රාථමික මූලය හෝ අනුපම මූලයක් තෝරන්න!"
 
-#: js/messages.php:457 templates/designer/side_menu.phtml:91
-#: templates/designer/side_menu.phtml:94
+#: js/messages.php:457 templates/database/designer/side_menu.phtml:91
+#: templates/database/designer/side_menu.phtml:94
 msgid "Choose column to display"
 msgstr "පෙන්වීම සඳහා තීරය ‍තෝරාගන්න"
 
@@ -2361,22 +2367,22 @@ msgstr ""
 msgid "Page name"
 msgstr "පිටුවේ නම"
 
-#: js/messages.php:463 templates/designer/side_menu.phtml:56
-#: templates/designer/side_menu.phtml:59
+#: js/messages.php:463 templates/database/designer/side_menu.phtml:56
+#: templates/database/designer/side_menu.phtml:59
 #, fuzzy
 #| msgid "Select page"
 msgid "Save page"
 msgstr "පිටුව තෝරන්න"
 
-#: js/messages.php:464 templates/designer/side_menu.phtml:63
-#: templates/designer/side_menu.phtml:66
+#: js/messages.php:464 templates/database/designer/side_menu.phtml:63
+#: templates/database/designer/side_menu.phtml:66
 #, fuzzy
 #| msgid "Select page"
 msgid "Save page as"
 msgstr "පිටුව තෝරන්න"
 
-#: js/messages.php:465 templates/designer/side_menu.phtml:49
-#: templates/designer/side_menu.phtml:52
+#: js/messages.php:465 templates/database/designer/side_menu.phtml:49
+#: templates/database/designer/side_menu.phtml:52
 #, fuzzy
 #| msgid "Free pages"
 msgid "Open page"
@@ -2388,7 +2394,7 @@ msgstr "නිදහස් පිටු"
 msgid "Delete page"
 msgstr "පිටුව තෝරන්න"
 
-#: js/messages.php:467 templates/designer/side_menu.phtml:10
+#: js/messages.php:467 templates/database/designer/side_menu.phtml:10
 #, fuzzy
 #| msgid "Unit"
 msgid "Untitled"
@@ -2517,7 +2523,7 @@ msgstr "මුල් පිහිටුම"
 msgid "cancel"
 msgstr "අවලංගු කරන්න"
 
-#: js/messages.php:499 libraries/server_status.lib.php:271
+#: js/messages.php:499 libraries/server_status.lib.php:280
 msgid "Aborted"
 msgstr "අත්හැර දමන ලදි"
 
@@ -3138,7 +3144,7 @@ msgstr "වලංගු පොර්ට් අංකයක් නොවේ"
 
 #: js/messages.php:793 libraries/Message.class.php:199
 #: libraries/Util.class.php:654 libraries/core.lib.php:245
-#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1172
+#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1170
 #: tbl_operations.php:229 view_operations.php:63
 msgid "Error"
 msgstr "දෝෂය"
@@ -3197,8 +3203,8 @@ msgstr "තප්පරයකට"
 msgid "per minute"
 msgstr "මිනිත්තුවකට"
 
-#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:143
-#: libraries/server_status.lib.php:228
+#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:152
+#: libraries/server_status.lib.php:237
 #: libraries/server_status_queries.lib.php:98
 msgid "per hour"
 msgstr "පැයකට"
@@ -3216,7 +3222,7 @@ msgstr "වත්මන් වින්‍යාස ගොනුව (%s) කි
 msgid "Wrong permissions on configuration file, should not be world writable!"
 msgstr "වින්‍යාස ගොනුව සඳහා වැරදි අවසර සිටුවා ඇත. සැමටම ඊට ලිවිය හැකි නොවිය යුතුය!"
 
-#: libraries/Config.class.php:1799
+#: libraries/Config.class.php:1801
 msgid "Font size"
 msgstr "ෆොන්ටයෙහි ප්‍රමාණය"
 
@@ -3246,10 +3252,10 @@ msgstr "උප විමසුම"
 #: libraries/server_privileges.lib.php:2890
 #: libraries/server_privileges.lib.php:3144
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4332
+#: libraries/server_privileges.lib.php:4358
 #: libraries/server_status_processes.lib.php:80
-#: templates/tbl_relation/foreign_key_row.phtml:165
-#: templates/tbl_relation/internal_relational_row.phtml:55
+#: templates/table/relation/foreign_key_row.phtml:165
+#: templates/table/relation/internal_relational_row.phtml:55
 msgid "Database"
 msgstr "දත්තගබඩාව"
 
@@ -3360,11 +3366,11 @@ msgstr "SQL ඉතිහාසය"
 #: libraries/plugins/import/ImportMediawiki.class.php:60
 #: libraries/plugins/import/ImportOds.class.php:59
 #: libraries/plugins/import/ImportShp.class.php:57
-#: libraries/plugins/import/ImportSql.class.php:148
+#: libraries/plugins/import/ImportSql.class.php:51
 #: libraries/plugins/import/ImportXml.class.php:58
-#: libraries/rte/rte_routines.lib.php:833 templates/index_form.phtml:49
-#: templates/structure/row_stats_table.phtml:20
-#: templates/table/options.phtml:2
+#: libraries/rte/rte_routines.lib.php:924 templates/table/index_form.phtml:49
+#: templates/table/search/options.phtml:2
+#: templates/table/structure/row_stats_table.phtml:20
 msgid "Options"
 msgstr "විකල්ප"
 
@@ -3409,7 +3415,8 @@ msgstr "අවරෝහන"
 msgid "Order:"
 msgstr "අනෙකුත්"
 
-#: libraries/Console.class.php:289 templates/table/replace_preview.phtml:17
+#: libraries/Console.class.php:289
+#: templates/table/search/replace_preview.phtml:17
 #, fuzzy
 #| msgid "Column"
 msgid "Count"
@@ -3534,9 +3541,9 @@ msgstr "පිටපත් කල වගුව වෙත මාරු වන්
 #: libraries/operations.lib.php:794 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:191
-#: templates/structure/sortable_header.phtml:21
-#: templates/structure/sortable_header.phtml:38
-#: templates/table/options.phtml:68
+#: templates/database/structure/sortable_header.phtml:21
+#: templates/database/structure/sortable_header.phtml:38
+#: templates/table/search/options.phtml:68
 msgid "Ascending"
 msgstr "ආරෝහන"
 
@@ -3546,13 +3553,14 @@ msgstr "ආරෝහන"
 #: libraries/operations.lib.php:797 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:188
-#: templates/structure/sortable_header.phtml:26
-#: templates/structure/sortable_header.phtml:43
-#: templates/table/options.phtml:69
+#: templates/database/structure/sortable_header.phtml:26
+#: templates/database/structure/sortable_header.phtml:43
+#: templates/table/search/options.phtml:69
 msgid "Descending"
 msgstr "අවරෝහන"
 
-#: libraries/DBQbe.class.php:467 templates/table/search_and_replace.phtml:6
+#: libraries/DBQbe.class.php:467
+#: templates/table/search/search_and_replace.phtml:6
 msgid "Column:"
 msgstr "තීර:"
 
@@ -3717,12 +3725,12 @@ msgstr[0] "<strong>%2$s</strong> තුල ගැලපීම් %1$s කි"
 msgstr[1] "<strong>%2$s</strong> තුල ගැලපීම් %1$s කි"
 
 #: libraries/DbSearch.class.php:354 libraries/Menu.class.php:311
-#: libraries/Util.class.php:3337 libraries/Util.class.php:3347
-#: libraries/Util.class.php:3623 libraries/Util.class.php:3624
-#: libraries/Util.class.php:4343 libraries/config.values.php:43
+#: libraries/Util.class.php:3343 libraries/Util.class.php:3353
+#: libraries/Util.class.php:3629 libraries/Util.class.php:3630
+#: libraries/Util.class.php:4349 libraries/config.values.php:43
 #: libraries/config.values.php:51 libraries/config.values.php:119
 #: libraries/navigation/Nodes/Node_Table.class.php:295
-#: templates/structure/check_all_table_column.phtml:5
+#: templates/table/structure/check_all_table_column.phtml:5
 msgid "Browse"
 msgstr "පිරික්සන්න"
 
@@ -3739,7 +3747,8 @@ msgstr "දත්තගබඩාවේ සොයන්න"
 msgid "Words or values to search for (wildcard: \"%\"):"
 msgstr "සෙවීම සඳහා වචන(ය) හෝ අගය(න්) (wildcard: \"%\"):"
 
-#: libraries/DbSearch.class.php:401 templates/table/search_and_replace.phtml:1
+#: libraries/DbSearch.class.php:401
+#: templates/table/search/search_and_replace.phtml:1
 msgid "Find:"
 msgstr "සොයන්න:"
 
@@ -3787,28 +3796,28 @@ msgstr "පෙරහන්"
 msgid "Search this table"
 msgstr "දත්තගබඩාවේ සොයන්න"
 
-#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2532
-#: libraries/Util.class.php:2535
+#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2538
+#: libraries/Util.class.php:2541
 msgctxt "First page"
 msgid "Begin"
 msgstr "ඇරඹුම"
 
-#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2533
-#: libraries/Util.class.php:2536 libraries/server_bin_log.lib.php:170
+#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2539
+#: libraries/Util.class.php:2542 libraries/server_bin_log.lib.php:170
 #: libraries/server_bin_log.lib.php:172
 msgctxt "Previous page"
 msgid "Previous"
 msgstr "පෙර"
 
-#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2564
-#: libraries/Util.class.php:2574 libraries/server_bin_log.lib.php:204
+#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2570
+#: libraries/Util.class.php:2580 libraries/server_bin_log.lib.php:204
 #: libraries/server_bin_log.lib.php:206
 msgctxt "Next page"
 msgid "Next"
 msgstr "මීලඟ"
 
-#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2565
-#: libraries/Util.class.php:2575
+#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2571
+#: libraries/Util.class.php:2581
 msgctxt "Last page"
 msgid "End"
 msgstr "අවසන"
@@ -3883,15 +3892,15 @@ msgid "May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]."
 msgstr "සමහර විට ආසන්න වශයෙන්. [doc@faq3-11]FAQ 3.11[/doc] බලන්න."
 
 #: libraries/DisplayResults.class.php:4332 libraries/Message.class.php:180
-#: libraries/controllers/TableRelationController.class.php:258
+#: libraries/controllers/TableRelationController.class.php:259
 #: libraries/controllers/TableSearchController.class.php:655
-#: libraries/rte/rte_routines.lib.php:1332 libraries/sql_query_form.lib.php:89
+#: libraries/rte/rte_routines.lib.php:1423 libraries/sql_query_form.lib.php:89
 #: tbl_operations.php:227 tbl_row_action.php:138 view_operations.php:62
 msgid "Your SQL query has been executed successfully."
 msgstr "ඔබගේ SQL විමසුම සාර්ථකව ක්‍රියාවට නංවන ලදි."
 
 #: libraries/DisplayResults.class.php:4660
-#: libraries/controllers/StructureController.class.php:629
+#: libraries/controllers/DatabaseStructureController.class.php:564
 #, php-format
 msgid ""
 "This view has at least this number of rows. Please refer to %sdocumentation"
@@ -3914,33 +3923,33 @@ msgstr ""
 msgid "%d total"
 msgstr "මුළු එකතුව %d"
 
-#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1318
+#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1312
 #, php-format
 msgid "Query took %01.4f seconds."
 msgstr "විමසුම තත්පර %01.4f ගන්නා ලදි."
 
 #: libraries/DisplayResults.class.php:4807
-#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4767
-#: libraries/Util.class.php:4773 libraries/mult_submits.inc.php:50
-#: templates/structure/check_all_tables.phtml:2
-#: templates/structure/check_all_tables.phtml:9
+#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4773
+#: libraries/Util.class.php:4779 libraries/mult_submits.inc.php:50
+#: templates/database/structure/check_all_tables.phtml:2
+#: templates/database/structure/check_all_tables.phtml:9
 msgid "With selected:"
 msgstr "තෝරාගත්:"
 
 #: libraries/DisplayResults.class.php:4811
-#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4769
-#: libraries/Util.class.php:4770 libraries/server_privileges.lib.php:1174
+#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4775
+#: libraries/Util.class.php:4776 libraries/server_privileges.lib.php:1174
 #: libraries/server_privileges.lib.php:1175
 #: libraries/server_privileges.lib.php:1387
 #: libraries/server_user_groups.lib.php:231
-#: templates/structure/check_all_tables.phtml:3
-#: templates/structure/check_all_tables.phtml:4
+#: templates/database/structure/check_all_tables.phtml:3
+#: templates/database/structure/check_all_tables.phtml:4
 msgid "Check All"
 msgstr "සියල්ල කතිර කොටුගත කරන්න"
 
 #: libraries/DisplayResults.class.php:4985 libraries/Header.class.php:383
-#: templates/structure/optional_action_links.phtml:1
-#: templates/structure/print_view_data_dictionary_link.phtml:3
+#: templates/database/structure/print_view_data_dictionary_link.phtml:3
+#: templates/table/structure/optional_action_links.phtml:1
 msgid "Print view"
 msgstr "මුද්‍රණ දර්ශනය"
 
@@ -3948,7 +3957,8 @@ msgstr "මුද්‍රණ දර්ශනය"
 msgid "Query results operations"
 msgstr "විමසුම් ප්‍රථිඵල සඳහා මෙහෙයුම්"
 
-#: libraries/DisplayResults.class.php:5105 templates/tbl_chart.phtml:12
+#: libraries/DisplayResults.class.php:5105
+#: templates/table/chart/tbl_chart.phtml:12
 msgid "Display chart"
 msgstr "ප්‍රස්තාරගත කරන්න"
 
@@ -4046,7 +4056,7 @@ msgid "Click on the bar to scroll to top of page"
 msgstr "පිටුව මුලට යාමට මෙය මත ක්ලික් කරන්න"
 
 #: libraries/Header.class.php:749
-#: libraries/plugins/auth/AuthenticationCookie.class.php:152
+#: libraries/plugins/auth/AuthenticationCookie.class.php:140
 msgid "Javascript must be enabled past this point!"
 msgstr "මෙම ස්ථානයයෙන් පසු JavaScript සක්‍රිය කර තිබීම අවශ්‍යය!"
 
@@ -4068,11 +4078,11 @@ msgid "Keyname"
 msgstr "යතුරු නම"
 
 #: libraries/Index.class.php:697
-#: libraries/controllers/StructureController.class.php:1962
-#: libraries/controllers/StructureController.class.php:1967
+#: libraries/controllers/TableStructureController.class.php:953
+#: libraries/controllers/TableStructureController.class.php:958
 #: libraries/tracking.lib.php:973
 #: templates/columns_definitions/column_indexes.phtml:11
-#: templates/structure/check_all_table_column.phtml:26
+#: templates/table/structure/check_all_table_column.phtml:26
 msgid "Unique"
 msgstr "අනන්‍ය"
 
@@ -4091,16 +4101,17 @@ msgstr "අනේකත්වය"
 #: libraries/server_collations.lib.php:35 libraries/tracking.lib.php:881
 #: libraries/tracking.lib.php:977
 #: templates/columns_definitions/table_fields_definitions.phtml:33
-#: templates/structure/row_stats_table.phtml:31
-#: templates/structure/table_header.phtml:55
-#: templates/structure/table_structure_header.phtml:7
-#: templates/table/table_header.phtml:8
+#: templates/database/structure/table_header.phtml:55
+#: templates/table/search/table_header.phtml:8
+#: templates/table/structure/row_stats_table.phtml:31
+#: templates/table/structure/table_structure_header.phtml:7
 msgid "Collation"
 msgstr "පරිතුලනය"
 
 #: libraries/Index.class.php:703 libraries/rte/rte_events.lib.php:496
-#: libraries/rte/rte_routines.lib.php:956 libraries/tracking.lib.php:885
-#: libraries/tracking.lib.php:979 templates/structure/table_header.phtml:84
+#: libraries/rte/rte_routines.lib.php:1047 libraries/tracking.lib.php:885
+#: libraries/tracking.lib.php:979
+#: templates/database/structure/table_header.phtml:84
 msgid "Comment"
 msgstr "ටීකාව"
 
@@ -4113,15 +4124,15 @@ msgstr "ප්‍රාථමික මූලය හලන ලදි."
 msgid "Index %s has been dropped."
 msgstr "%s සූචිය හලන ලදි."
 
-#: libraries/Index.class.php:757 libraries/Util.class.php:3630
-#: libraries/Util.class.php:3631
-#: libraries/controllers/StructureController.class.php:1958
-#: libraries/controllers/StructureController.class.php:1959
+#: libraries/Index.class.php:757 libraries/Util.class.php:3636
+#: libraries/Util.class.php:3637
+#: libraries/controllers/TableStructureController.class.php:949
+#: libraries/controllers/TableStructureController.class.php:950
 #: libraries/operations.lib.php:1607 libraries/rte/rte_list.lib.php:150
 #: libraries/server_databases.lib.php:146
-#: templates/structure/check_all_table_column.phtml:15
-#: templates/structure/check_all_tables.phtml:16
-#: templates/tbl_relation/foreign_key_row.phtml:93
+#: templates/database/structure/check_all_tables.phtml:16
+#: templates/table/relation/foreign_key_row.phtml:93
+#: templates/table/structure/check_all_table_column.phtml:15
 msgid "Drop"
 msgstr "හලන්න"
 
@@ -4150,16 +4161,16 @@ msgstr "සේවාදායකය"
 #: libraries/Menu.class.php:248
 #: libraries/navigation/Nodes/Node_View.class.php:32
 #: libraries/tbl_info.inc.php:63
-#: templates/structure/structure_table_row.phtml:97
-#: templates/structure/structure_table_row.phtml:159
+#: templates/database/structure/structure_table_row.phtml:97
+#: templates/database/structure/structure_table_row.phtml:159
 msgid "View"
 msgstr "දසුන"
 
 #: libraries/Menu.class.php:325 libraries/Menu.class.php:429
-#: libraries/Menu.class.php:548 libraries/Util.class.php:3334
-#: libraries/Util.class.php:3344 libraries/Util.class.php:3350
-#: libraries/Util.class.php:4313 libraries/Util.class.php:4328
-#: libraries/Util.class.php:4345 libraries/config.values.php:40
+#: libraries/Menu.class.php:548 libraries/Util.class.php:3340
+#: libraries/Util.class.php:3350 libraries/Util.class.php:3356
+#: libraries/Util.class.php:4319 libraries/Util.class.php:4334
+#: libraries/Util.class.php:4351 libraries/config.values.php:40
 #: libraries/config.values.php:48 libraries/config.values.php:110
 #: libraries/config.values.php:116 libraries/config/messages.inc.php:321
 #: libraries/navigation/Nodes/Node_Table.class.php:292
@@ -4167,19 +4178,19 @@ msgid "SQL"
 msgstr "SQL"
 
 #: libraries/Menu.class.php:328 libraries/Menu.class.php:432
-#: libraries/Util.class.php:3335 libraries/Util.class.php:3345
-#: libraries/Util.class.php:3351 libraries/Util.class.php:3625
-#: libraries/Util.class.php:3626 libraries/Util.class.php:4329
-#: libraries/Util.class.php:4346 libraries/config.values.php:41
+#: libraries/Util.class.php:3341 libraries/Util.class.php:3351
+#: libraries/Util.class.php:3357 libraries/Util.class.php:3631
+#: libraries/Util.class.php:3632 libraries/Util.class.php:4335
+#: libraries/Util.class.php:4352 libraries/config.values.php:41
 #: libraries/config.values.php:49 libraries/config.values.php:111
 #: libraries/config.values.php:117
 #: libraries/navigation/Nodes/Node_Table.class.php:286
 msgid "Search"
 msgstr "සෙවීම"
 
-#: libraries/Menu.class.php:338 libraries/Util.class.php:3336
-#: libraries/Util.class.php:3346 libraries/Util.class.php:3627
-#: libraries/Util.class.php:3628 libraries/Util.class.php:4347
+#: libraries/Menu.class.php:338 libraries/Util.class.php:3342
+#: libraries/Util.class.php:3352 libraries/Util.class.php:3633
+#: libraries/Util.class.php:3634 libraries/Util.class.php:4353
 #: libraries/config.values.php:42 libraries/config.values.php:50
 #: libraries/config.values.php:118
 #: libraries/navigation/Nodes/Node_Table.class.php:289
@@ -4188,30 +4199,30 @@ msgid "Insert"
 msgstr "ඇතුල් කරන්න"
 
 #: libraries/Menu.class.php:362 libraries/Menu.class.php:467
-#: libraries/Util.class.php:4334 libraries/Util.class.php:4350
+#: libraries/Util.class.php:4340 libraries/Util.class.php:4356
 #: libraries/config.values.php:106 libraries/server_common.lib.php:51
 #: libraries/server_privileges.lib.php:2370
 #: libraries/server_privileges.lib.php:3158
-#: libraries/server_privileges.lib.php:4221
+#: libraries/server_privileges.lib.php:4247
 msgid "Privileges"
 msgstr "වරප්‍රසාද"
 
 #: libraries/Menu.class.php:371 libraries/Menu.class.php:379
-#: libraries/Menu.class.php:459 libraries/Util.class.php:3338
-#: libraries/Util.class.php:3352 libraries/Util.class.php:4333
-#: libraries/Util.class.php:4351 libraries/config.values.php:112
+#: libraries/Menu.class.php:459 libraries/Util.class.php:3344
+#: libraries/Util.class.php:3358 libraries/Util.class.php:4339
+#: libraries/Util.class.php:4357 libraries/config.values.php:112
 #: view_operations.php:92
 msgid "Operations"
 msgstr "මෙහෙයුම්"
 
 #: libraries/Menu.class.php:384 libraries/Menu.class.php:492
-#: libraries/Util.class.php:4338 libraries/Util.class.php:4352
+#: libraries/Util.class.php:4344 libraries/Util.class.php:4358
 #: libraries/relation.lib.php:255
 msgid "Tracking"
 msgstr "අවධානය"
 
 #: libraries/Menu.class.php:397 libraries/Menu.class.php:486
-#: libraries/Util.class.php:4337 libraries/Util.class.php:4353
+#: libraries/Util.class.php:4343 libraries/Util.class.php:4359
 #: libraries/navigation/Nodes/Node_Trigger_Container.class.php:24
 #: libraries/plugins/export/ExportHtmlword.class.php:557
 #: libraries/plugins/export/ExportOdt.class.php:685
@@ -4228,16 +4239,16 @@ msgstr "ප්‍රේරක"
 msgid "Database seems to be empty!"
 msgstr "දත්තගබඩාව හිස්ය!"
 
-#: libraries/Menu.class.php:439 libraries/Util.class.php:4330
+#: libraries/Menu.class.php:439 libraries/Util.class.php:4336
 msgid "Query"
 msgstr "විමසුම"
 
-#: libraries/Menu.class.php:472 libraries/Util.class.php:4335
+#: libraries/Menu.class.php:472 libraries/Util.class.php:4341
 #: libraries/rte/rte_words.lib.php:36
 msgid "Routines"
 msgstr "නෛත්‍යක"
 
-#: libraries/Menu.class.php:479 libraries/Util.class.php:4336
+#: libraries/Menu.class.php:479 libraries/Util.class.php:4342
 #: libraries/navigation/Nodes/Node_Event_Container.class.php:26
 #: libraries/plugins/export/ExportSql.class.php:940
 #: libraries/plugins/export/ExportXml.class.php:107
@@ -4245,20 +4256,20 @@ msgstr "නෛත්‍යක"
 msgid "Events"
 msgstr "සිද්ධි"
 
-#: libraries/Menu.class.php:498 libraries/Util.class.php:4339
+#: libraries/Menu.class.php:498 libraries/Util.class.php:4345
 msgid "Designer"
 msgstr "සැලසුම්කරණය"
 
-#: libraries/Menu.class.php:507 libraries/Util.class.php:4340
-#: templates/structure/check_all_tables.phtml:35
+#: libraries/Menu.class.php:507 libraries/Util.class.php:4346
+#: templates/database/structure/check_all_tables.phtml:35
 msgid "Central columns"
 msgstr "මධ්‍යම තීර"
 
-#: libraries/Menu.class.php:544 libraries/Util.class.php:4312
+#: libraries/Menu.class.php:544 libraries/Util.class.php:4318
 #: libraries/config.values.php:103 libraries/config/messages.inc.php:266
 #: libraries/config/messages.inc.php:341
 #: libraries/navigation/NavigationTree.class.php:1239
-#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4332
+#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4358
 msgid "Databases"
 msgstr "දත්තගබඩා"
 
@@ -4267,34 +4278,34 @@ msgid "User accounts"
 msgstr "භාවිත ගිණුම්"
 
 #: libraries/Menu.class.php:595 libraries/ServerStatusData.class.php:121
-#: libraries/Util.class.php:4319 libraries/server_common.lib.php:36
+#: libraries/Util.class.php:4325 libraries/server_common.lib.php:36
 msgid "Binary log"
 msgstr "ද්වීමය ලොගය"
 
 #: libraries/Menu.class.php:601 libraries/ServerStatusData.class.php:126
-#: libraries/Util.class.php:4320 libraries/server_common.lib.php:42
-#: templates/structure/body_for_table_summary.phtml:10
-#: templates/structure/table_header.phtml:27
+#: libraries/Util.class.php:4326 libraries/server_common.lib.php:42
+#: templates/database/structure/body_for_table_summary.phtml:10
+#: templates/database/structure/table_header.phtml:27
 msgid "Replication"
 msgstr "අනුරූකරණය"
 
 #: libraries/Menu.class.php:606 libraries/ServerStatusData.class.php:193
-#: libraries/Util.class.php:4321 libraries/config.values.php:105
+#: libraries/Util.class.php:4327 libraries/config.values.php:105
 #: libraries/server_engines.lib.php:108 libraries/server_engines.lib.php:112
 #: libraries/sql_query_form.lib.php:421
 msgid "Variables"
 msgstr "විචල්‍යනයන්"
 
-#: libraries/Menu.class.php:610 libraries/Util.class.php:4322
+#: libraries/Menu.class.php:610 libraries/Util.class.php:4328
 msgid "Charsets"
 msgstr "අක්ෂර කට්ටලය"
 
-#: libraries/Menu.class.php:615 libraries/Util.class.php:4323
+#: libraries/Menu.class.php:615 libraries/Util.class.php:4329
 #: libraries/server_common.lib.php:33 libraries/server_plugins.lib.php:27
 msgid "Plugins"
 msgstr "පේණු"
 
-#: libraries/Menu.class.php:626 libraries/Util.class.php:4324
+#: libraries/Menu.class.php:626 libraries/Util.class.php:4330
 msgid "Engines"
 msgstr "යන්ත්‍රයන්"
 
@@ -4319,7 +4330,7 @@ msgid_plural "%1$d rows inserted."
 msgstr[0] "පේළි %1$d ක් ඇතුල් කෙරුනි."
 msgstr[1] "පේළි %1$d ක් ඇතුල් කෙරුනි."
 
-#: libraries/PDF.class.php:70 libraries/Util.class.php:2521
+#: libraries/PDF.class.php:70 libraries/Util.class.php:2527
 #: libraries/browse_foreigners.lib.php:327
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:865
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:890
@@ -4342,7 +4353,7 @@ msgid "Could not save favorite table!"
 msgstr "මෑතදී භාවිතා කල වගු සුරැකීම අසමත් විය!"
 
 #: libraries/RecentFavoriteTable.class.php:212
-#: templates/structure/favorite_anchor.phtml:12
+#: templates/database/structure/favorite_anchor.phtml:12
 #, fuzzy
 #| msgid "Remove chart"
 msgid "Remove from Favorites"
@@ -4518,7 +4529,7 @@ msgid ""
 msgstr "ගබඩා යන්ත්‍රයෙහි තත්වය පිලිබඳ වැඩිදුර තොරතුරු නැත."
 
 #: libraries/StorageEngine.class.php:373
-#: templates/structure/body_for_table_summary.phtml:50
+#: templates/database/structure/body_for_table_summary.phtml:50
 #, php-format
 msgid "%s is the default storage engine on this MySQL server."
 msgstr "%s මෙම සේවාදායකයේ පෙරනිමි ගබඩා යන්ත්‍රයයි."
@@ -4986,10 +4997,10 @@ msgstr ""
 
 #: libraries/Util.class.php:726 libraries/rte/rte_events.lib.php:110
 #: libraries/rte/rte_events.lib.php:119 libraries/rte/rte_events.lib.php:150
-#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:153
-#: libraries/rte/rte_routines.lib.php:162
-#: libraries/rte/rte_routines.lib.php:235
-#: libraries/rte/rte_routines.lib.php:1366
+#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:223
+#: libraries/rte/rte_routines.lib.php:250
+#: libraries/rte/rte_routines.lib.php:372
+#: libraries/rte/rte_routines.lib.php:1457
 #: libraries/rte/rte_triggers.lib.php:86 libraries/rte/rte_triggers.lib.php:95
 #: libraries/rte/rte_triggers.lib.php:127
 msgid "MySQL said: "
@@ -5035,75 +5046,78 @@ msgstr "ඉරිදා"
 msgid "%B %d, %Y at %I:%M %p"
 msgstr "%B %d, %Y දින %I:%M %p ට"
 
-#: libraries/Util.class.php:2019
+#: libraries/Util.class.php:2025
 #, php-format
 msgid "%s days, %s hours, %s minutes and %s seconds"
 msgstr "දින %s, පැය %s, මිනිත්තු %s සහ තප්පර %s"
 
-#: libraries/Util.class.php:2112
+#: libraries/Util.class.php:2118
 msgid "Missing parameter:"
 msgstr "නොමැති පරාමිතිය:"
 
-#: libraries/Util.class.php:2645
+#: libraries/Util.class.php:2651
 #, php-format
 msgid "Jump to database \"%s\"."
 msgstr "\"%s\" දත්තගබඩාව වෙත යන්න."
 
-#: libraries/Util.class.php:2670
+#: libraries/Util.class.php:2676
 #, php-format
 msgid "The %s functionality is affected by a known bug, see %s"
 msgstr "%s විශේෂාංගයෙහි හඳුනාගත් දෝෂයක් ඇත, %s බලන්න"
 
-#: libraries/Util.class.php:2881
+#: libraries/Util.class.php:2887
 msgid "Click to toggle"
 msgstr "මාරු කිරීමට ක්ලික් කරන්න"
 
-#: libraries/Util.class.php:3542 prefs_manage.php:248
+#: libraries/Util.class.php:3548 prefs_manage.php:248
 msgid "Browse your computer:"
 msgstr "පරිගණකය තුළ පිරික්සන්න:"
 
-#: libraries/Util.class.php:3567
+#: libraries/Util.class.php:3573
 #, php-format
 msgid "Select from the web server upload directory <b>%s</b>:"
 msgstr "වෙබ් සේවාදායකයේ <b>%s</b> උඩුගත කිරීම් ඩිරෙක්ටරියෙන් තෝරන්න:"
 
-#: libraries/Util.class.php:3596 libraries/insert_edit.lib.php:1173
+#: libraries/Util.class.php:3602 libraries/insert_edit.lib.php:1171
 msgid "The directory you set for upload work cannot be reached."
 msgstr "උඩුගත කිරීම් සඳහා සැකසූ ඩිරෙක්ටරිය වෙත පිවිසිය නොහැක."
 
-#: libraries/Util.class.php:3607
+#: libraries/Util.class.php:3613
 msgid "There are no files to upload!"
 msgstr "උඩුගත කිරීම සඳහා ගොනු නොමැත!"
 
-#: libraries/Util.class.php:3632 libraries/Util.class.php:3633
-#: templates/structure/check_all_tables.phtml:15
+#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: templates/database/structure/check_all_tables.phtml:15
 msgid "Empty"
 msgstr "හිස් කරන්න"
 
-#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: libraries/Util.class.php:3644 libraries/Util.class.php:3645
 msgid "Execute"
 msgstr "ක්‍රියාත්මක කරන්න"
 
-#: libraries/Util.class.php:4152
+#: libraries/Util.class.php:4158
 msgid "Print"
 msgstr "මුද්‍රණය කරන්න"
 
-#: libraries/Util.class.php:4257 templates/structure/row_stats_table.phtml:80
-#: templates/structure/table_header.phtml:95
+#: libraries/Util.class.php:4263
+#: templates/database/structure/table_header.phtml:95
+#: templates/table/structure/row_stats_table.phtml:80
 msgid "Creation"
 msgstr "සෑදීම"
 
-#: libraries/Util.class.php:4263 templates/structure/row_stats_table.phtml:87
-#: templates/structure/table_header.phtml:106
+#: libraries/Util.class.php:4269
+#: templates/database/structure/table_header.phtml:106
+#: templates/table/structure/row_stats_table.phtml:87
 msgid "Last update"
 msgstr "අවසන් යාවත්කාලීන කිරීම"
 
-#: libraries/Util.class.php:4269 templates/structure/row_stats_table.phtml:94
-#: templates/structure/table_header.phtml:117
+#: libraries/Util.class.php:4275
+#: templates/database/structure/table_header.phtml:117
+#: templates/table/structure/row_stats_table.phtml:94
 msgid "Last check"
 msgstr "අවසන් පරීක්ෂාව"
 
-#: libraries/Util.class.php:4315
+#: libraries/Util.class.php:4321
 msgid "Users"
 msgstr "භාවිතා කරන්නන්"
 
@@ -5124,16 +5138,16 @@ msgid "Use this value"
 msgstr "මෙම අගය භාවිතා කරන්න"
 
 #: libraries/build_html_for_db.lib.php:33 libraries/import.lib.php:193
-#: templates/structure/actions_in_table_structure.phtml:113
-#: templates/structure/row_stats_table.phtml:42
-#: templates/structure/table_header.phtml:36
+#: templates/database/structure/table_header.phtml:36
+#: templates/table/structure/actions_in_table_structure.phtml:113
+#: templates/table/structure/row_stats_table.phtml:42
 msgid "Rows"
 msgstr "පේළි"
 
 #: libraries/build_html_for_db.lib.php:48 libraries/engines/innodb.lib.php:171
-#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:186
-#: libraries/server_status.lib.php:298
-#: templates/structure/display_table_stats.phtml:40
+#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:195
+#: libraries/server_status.lib.php:307
+#: templates/table/structure/display_table_stats.phtml:40
 msgid "Total"
 msgstr "මුළු එකතුව"
 
@@ -5142,10 +5156,12 @@ msgid "Jump to database"
 msgstr "දත්තගබඩාව වෙත යන්න"
 
 #: libraries/build_html_for_db.lib.php:146
+#: templates/database/structure/structure_table_row.phtml:15
 msgid "Not replicated"
 msgstr "අනුරූ නොකරන ලද"
 
 #: libraries/build_html_for_db.lib.php:158
+#: templates/database/structure/structure_table_row.phtml:16
 msgid "Replicated"
 msgstr "අනුරූ කරන ලද"
 
@@ -5202,17 +5218,17 @@ msgstr ""
 #: libraries/plugins/export/ExportTexytext.class.php:425
 #: libraries/plugins/export/PMA_ExportPdf.class.php:307
 #: libraries/rte/rte_list.lib.php:73 libraries/rte/rte_list.lib.php:85
-#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:830
-#: libraries/rte/rte_routines.lib.php:1492 setup/frames/index.inc.php:162
+#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:921
+#: libraries/rte/rte_routines.lib.php:1583 setup/frames/index.inc.php:162
 #: templates/columns_definitions/table_fields_definitions.phtml:8
-#: templates/structure/table_structure_header.phtml:5
-#: templates/table/create_table.phtml:11
+#: templates/database/create_table.phtml:11
+#: templates/table/structure/table_structure_header.phtml:5
 msgid "Name"
 msgstr "නම"
 
 #: libraries/central_columns.lib.php:699
 #: libraries/central_columns.lib.php:1381
-#: libraries/rte/rte_routines.lib.php:832
+#: libraries/rte/rte_routines.lib.php:923
 #: templates/columns_definitions/table_fields_definitions.phtml:14
 msgid "Length/Values"
 msgstr "දිග/අගයන්"
@@ -5235,7 +5251,7 @@ msgid "Select a table"
 msgstr "වගු තෝරන්න"
 
 #: libraries/central_columns.lib.php:804
-#: templates/structure/add_column.phtml:4
+#: templates/table/structure/add_column.phtml:4
 msgid "Add column"
 msgstr "තීරයක් එක් කරන්න"
 
@@ -5255,7 +5271,7 @@ msgstr "තීරයක් එක් කරන්න"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1002
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1025
 #: templates/columns_definitions/table_fields_definitions.phtml:36
-#: templates/structure/table_structure_header.phtml:8
+#: templates/table/structure/table_structure_header.phtml:8
 msgid "Attributes"
 msgstr "ගුණාංග"
 
@@ -5366,7 +5382,7 @@ msgid "Double click"
 msgstr "ද්විත්ව ක්ලික් කිරීමෙන්"
 
 #: libraries/config.values.php:95 libraries/config.values.php:124
-#: libraries/config/FormDisplay.tpl.php:221 libraries/relation.lib.php:97
+#: libraries/config/FormDisplay.tpl.php:232 libraries/relation.lib.php:97
 #: libraries/relation.lib.php:105
 msgid "Disabled"
 msgstr "අක්‍රිය"
@@ -5546,21 +5562,21 @@ msgstr "%s ක්‍රියාවලිය නොමැති හෙයින
 msgid "maximum %s"
 msgstr "උපරිම %s"
 
-#: libraries/config/FormDisplay.tpl.php:219
+#: libraries/config/FormDisplay.tpl.php:230
 msgid "This setting is disabled, it will not be applied to your configuration."
 msgstr "මෙම සිටුවම අක්‍රීය කර ඇත, ඔබගේ වින්‍යාස සඳහා එය නොයෙදෙනු ඇත."
 
-#: libraries/config/FormDisplay.tpl.php:313
+#: libraries/config/FormDisplay.tpl.php:324
 #, php-format
 msgid "Set value: %s"
 msgstr "%s අගය පිහිටුවන්න"
 
-#: libraries/config/FormDisplay.tpl.php:318
+#: libraries/config/FormDisplay.tpl.php:329
 #: libraries/config/messages.inc.php:610
 msgid "Restore default value"
 msgstr "පෙරනිමි අගය ප්‍රතිස්ථාපනය කරන්න"
 
-#: libraries/config/FormDisplay.tpl.php:332
+#: libraries/config/FormDisplay.tpl.php:343
 msgid "Allow users to customize this value"
 msgstr "මෙම අගය වෙනස් කිරීමට භවිතා කරන්නන්ට ඉඩ දෙන්න"
 
@@ -6013,7 +6029,7 @@ msgstr "ගොනුවේ අක්ෂර කට්ටලය"
 
 #: libraries/config/messages.inc.php:136 libraries/config/messages.inc.php:152
 #: libraries/sql_query_form.lib.php:247
-#: templates/structure/row_stats_table.phtml:7
+#: templates/table/structure/row_stats_table.phtml:7
 msgid "Format"
 msgstr "ආකෘතිය"
 
@@ -6537,7 +6553,7 @@ msgstr "දත්තගබඩා සැකිල්ලේ (වගු ලයි
 
 #: libraries/config/messages.inc.php:332
 #: libraries/plugins/export/ExportPdf.class.php:279
-#: templates/structure/secondary_tabs.phtml:8
+#: templates/table/secondary_tabs.phtml:8
 msgid "Table structure"
 msgstr "වගු සැකිල්ල"
 
@@ -8392,104 +8408,33 @@ msgstr "මයික්‍රොසොෆ්ට් වර්ඩ් 2000"
 msgid "OpenDocument Text"
 msgstr "OpenDocument පෙළ"
 
-#: libraries/controllers/StructureController.class.php:465
+#: libraries/controllers/DatabaseStructureController.class.php:405
 #: tbl_operations.php:382
 #, php-format
 msgid "Table %s has been emptied."
 msgstr "%s වගුව හිස් කරන ලදි."
 
-#: libraries/controllers/StructureController.class.php:486
+#: libraries/controllers/DatabaseStructureController.class.php:426
 #: tbl_operations.php:400 view_operations.php:119
 #, php-format
 msgid "View %s has been dropped."
 msgstr "%s දසුන හලන ලදි."
 
-#: libraries/controllers/StructureController.class.php:487
+#: libraries/controllers/DatabaseStructureController.class.php:427
 #: tbl_operations.php:401
 #, php-format
 msgid "Table %s has been dropped."
 msgstr "%s වගුව හලන ලදි."
 
-#: libraries/controllers/StructureController.class.php:797
-#, php-format
-msgid "The name '%s' is a MySQL reserved keyword."
-msgid_plural "The names '%s' are MySQL reserved keywords."
-msgstr[0] ""
-msgstr[1] ""
-
-#: libraries/controllers/StructureController.class.php:875
-#, fuzzy
-#| msgid "No rows selected"
-msgid "No column selected."
-msgstr "පේළි කිසිවක් තෝරගෙන නැත"
-
-#: libraries/controllers/StructureController.class.php:1049
+#: libraries/controllers/DatabaseStructureController.class.php:733
 msgid "Favorite List is full!"
 msgstr ""
 
-#: libraries/controllers/StructureController.class.php:1272
-msgid "The columns have been moved successfully."
-msgstr "තීර සාර්ථකව ගෙන යන ලදි."
-
-#: libraries/controllers/StructureController.class.php:1535
-#, fuzzy, php-format
-#| msgid "Table %1$s has been altered successfully."
-msgid ""
-"Table %1$s has been altered successfully. Privileges have been adjusted."
-msgstr "%1$s වගුව සාර්ථකව වෙනස් කරන ලදි"
-
-#: libraries/controllers/StructureController.class.php:1541
-#: libraries/controllers/TableIndexesController.class.php:161
-#: tbl_addfield.php:92
-#, php-format
-msgid "Table %1$s has been altered successfully."
-msgstr "%1$s වගුව සාර්ථකව වෙනස් කරන ලදි."
-
-#: libraries/controllers/StructureController.class.php:1588
-#: libraries/tracking.lib.php:1094
-msgid "Query error"
-msgstr "විමසුම් දෝෂය"
-
-#: libraries/controllers/StructureController.class.php:1806
+#: libraries/controllers/DatabaseStructureController.class.php:947
 #: libraries/mysql_charsets.lib.php:366 libraries/mysql_charsets.lib.php:373
 msgid "unknown"
 msgstr "නොදන්නා"
 
-#: libraries/controllers/StructureController.class.php:1957
-#: templates/structure/check_all_table_column.phtml:11
-msgid "Change"
-msgstr "වෙනස් කරන්න"
-
-#: libraries/controllers/StructureController.class.php:1961
-#: libraries/controllers/StructureController.class.php:1966
-#: libraries/navigation/Nodes/Node_Index.class.php:30
-#: libraries/tracking.lib.php:926
-#: templates/columns_definitions/column_indexes.phtml:16
-#: templates/columns_definitions/table_fields_definitions.phtml:57
-#: templates/structure/check_all_table_column.phtml:30
-#: templates/structure/display_structure.phtml:79
-#: templates/structure/display_table_stats.phtml:19
-msgid "Index"
-msgstr "සූචිය"
-
-#: libraries/controllers/StructureController.class.php:1963
-#: libraries/controllers/StructureController.class.php:1968
-#: templates/columns_definitions/column_indexes.phtml:27
-#: templates/structure/check_all_table_column.phtml:37
-msgid "Spatial"
-msgstr "ජ්‍යාමිතික"
-
-#: libraries/controllers/StructureController.class.php:1964
-#: libraries/controllers/StructureController.class.php:1969
-#: templates/columns_definitions/column_indexes.phtml:22
-#: templates/structure/check_all_table_column.phtml:47
-msgid "Fulltext"
-msgstr "සම්පූර්ණ පාඨය"
-
-#: libraries/controllers/StructureController.class.php:1970
-msgid "Distinct values"
-msgstr "එකිනෙකට වෙනස් අගයන්"
-
 #: libraries/controllers/TableChartController.class.php:82
 #: libraries/controllers/TableGisVisualizationController.class.php:101
 msgid "No SQL query was set to fetch data."
@@ -8503,11 +8448,18 @@ msgstr ""
 msgid "No data to display"
 msgstr "පෙන්වීම සඳහා දත්ත නොමැත"
 
-#: libraries/controllers/TableRelationController.class.php:217
+#: libraries/controllers/TableIndexesController.class.php:161
+#: libraries/controllers/TableStructureController.class.php:736
+#: tbl_addfield.php:92
+#, php-format
+msgid "Table %1$s has been altered successfully."
+msgstr "%1$s වගුව සාර්ථකව වෙනස් කරන ලදි."
+
+#: libraries/controllers/TableRelationController.class.php:218
 msgid "Display column was successfully updated."
 msgstr ""
 
-#: libraries/controllers/TableRelationController.class.php:283
+#: libraries/controllers/TableRelationController.class.php:288
 #, fuzzy
 #| msgid "Internal relation added"
 msgid "Internal relations were successfully updated."
@@ -8526,12 +8478,76 @@ msgid "Zoom search"
 msgstr "Zoom සෙවීම"
 
 #: libraries/controllers/TableSearchController.class.php:852
-#: templates/table/selection_form.phtml:59
+#: templates/table/search/selection_form.phtml:59
 #, fuzzy
 #| msgid "Hide search criteria"
 msgid "Find and replace"
 msgstr "සෙවුම් නිර්ණායක සඟවන්න"
 
+#: libraries/controllers/TableStructureController.class.php:163
+#, php-format
+msgid "The name '%s' is a MySQL reserved keyword."
+msgid_plural "The names '%s' are MySQL reserved keywords."
+msgstr[0] ""
+msgstr[1] ""
+
+#: libraries/controllers/TableStructureController.class.php:241
+#, fuzzy
+#| msgid "No rows selected"
+msgid "No column selected."
+msgstr "පේළි කිසිවක් තෝරගෙන නැත"
+
+#: libraries/controllers/TableStructureController.class.php:467
+msgid "The columns have been moved successfully."
+msgstr "තීර සාර්ථකව ගෙන යන ලදි."
+
+#: libraries/controllers/TableStructureController.class.php:730
+#, fuzzy, php-format
+#| msgid "Table %1$s has been altered successfully."
+msgid ""
+"Table %1$s has been altered successfully. Privileges have been adjusted."
+msgstr "%1$s වගුව සාර්ථකව වෙනස් කරන ලදි"
+
+#: libraries/controllers/TableStructureController.class.php:783
+#: libraries/tracking.lib.php:1094
+msgid "Query error"
+msgstr "විමසුම් දෝෂය"
+
+#: libraries/controllers/TableStructureController.class.php:948
+#: templates/table/structure/check_all_table_column.phtml:11
+msgid "Change"
+msgstr "වෙනස් කරන්න"
+
+#: libraries/controllers/TableStructureController.class.php:952
+#: libraries/controllers/TableStructureController.class.php:957
+#: libraries/navigation/Nodes/Node_Index.class.php:30
+#: libraries/tracking.lib.php:926
+#: templates/columns_definitions/column_indexes.phtml:16
+#: templates/columns_definitions/table_fields_definitions.phtml:57
+#: templates/table/structure/check_all_table_column.phtml:30
+#: templates/table/structure/display_structure.phtml:79
+#: templates/table/structure/display_table_stats.phtml:19
+msgid "Index"
+msgstr "සූචිය"
+
+#: libraries/controllers/TableStructureController.class.php:954
+#: libraries/controllers/TableStructureController.class.php:959
+#: templates/columns_definitions/column_indexes.phtml:27
+#: templates/table/structure/check_all_table_column.phtml:37
+msgid "Spatial"
+msgstr "ජ්‍යාමිතික"
+
+#: libraries/controllers/TableStructureController.class.php:955
+#: libraries/controllers/TableStructureController.class.php:960
+#: templates/columns_definitions/column_indexes.phtml:22
+#: templates/table/structure/check_all_table_column.phtml:47
+msgid "Fulltext"
+msgstr "සම්පූර්ණ පාඨය"
+
+#: libraries/controllers/TableStructureController.class.php:963
+msgid "Distinct values"
+msgstr "එකිනෙකට වෙනස් අගයන්"
+
 #: libraries/core.lib.php:306
 #, php-format
 msgid "The %s extension is missing. Please check your PHP configuration."
@@ -8578,7 +8594,7 @@ msgid "No Password"
 msgstr "මුරපදයක් නැත"
 
 #: libraries/display_change_password.lib.php:68
-#: libraries/plugins/auth/AuthenticationCookie.class.php:199
+#: libraries/plugins/auth/AuthenticationCookie.class.php:187
 #: libraries/replication_gui.lib.php:422 libraries/replication_gui.lib.php:862
 #: libraries/server_privileges.lib.php:1640
 msgid "Password:"
@@ -9344,12 +9360,12 @@ msgid "Dump has been saved to file %s."
 msgstr "%s ගොනුවට නික්ෂේප දත්ත සුරකින ලදි."
 
 #: libraries/import.lib.php:202 libraries/insert_edit.lib.php:124
-#: libraries/rte/rte_routines.lib.php:1353 libraries/sql.lib.php:1312
+#: libraries/rte/rte_routines.lib.php:1444 libraries/sql.lib.php:1306
 #: tbl_get_field.php:44
 msgid "MySQL returned an empty result set (i.e. zero rows)."
 msgstr "MySQL හිස් ප්‍රතිඵල කුලකයක් (පේළි කිසිවක් අඩංගු නොවන) සපයන ලදි."
 
-#: libraries/import.lib.php:265 libraries/sql.lib.php:1326
+#: libraries/import.lib.php:265 libraries/sql.lib.php:1320
 msgid "[ROLLBACK occurred.]"
 msgstr ""
 
@@ -9420,14 +9436,14 @@ msgstr "පේළි&nbsp;%s&nbsp;මත සුචියක් සාදන්
 
 #: libraries/insert_edit.lib.php:233
 #: libraries/navigation/Nodes/Node_DatabaseChild.class.php:48
-#: templates/designer/table_list.phtml:40
+#: templates/database/designer/table_list.phtml:40
 msgid "Hide"
 msgstr "සඟවන්න"
 
 #: libraries/insert_edit.lib.php:249
 #: libraries/navigation/Nodes/Node_Function.class.php:32
-#: libraries/rte/rte_routines.lib.php:1495
-#: templates/table/table_header.phtml:4
+#: libraries/rte/rte_routines.lib.php:1586
+#: templates/table/search/table_header.phtml:4
 msgid "Function"
 msgstr "ශ්‍රිතය"
 
@@ -9442,82 +9458,83 @@ msgstr "ද්වීමය"
 msgid "Because of its length,<br /> this column might not be editable."
 msgstr "මෙහි දිග නිසා,<br /> මෙම තීරුව සංස්කරණය කල නොහැකි විය හැකිය"
 
-#: libraries/insert_edit.lib.php:1050
+#: libraries/insert_edit.lib.php:1048
 msgid "Binary - do not edit"
 msgstr "ද්වීමය - සංස්කරණය නොකරන්න"
 
-#: libraries/insert_edit.lib.php:1176 libraries/server_privileges.lib.php:470
-#: templates/table/options.phtml:36
+#: libraries/insert_edit.lib.php:1174 libraries/server_privileges.lib.php:470
+#: templates/table/search/options.phtml:36
 msgid "Or"
 msgstr "හෝ"
 
-#: libraries/insert_edit.lib.php:1177
+#: libraries/insert_edit.lib.php:1175
 msgid "web server upload directory:"
 msgstr "වෙබ් සේවාදායකයේ උඩුගත ඩිරෙක්ටරිය:"
 
-#: libraries/insert_edit.lib.php:1348 templates/table/input_box.phtml:49
+#: libraries/insert_edit.lib.php:1346
+#: templates/table/search/input_box.phtml:49
 msgid "Edit/Insert"
 msgstr "සංස්කරණය/ඇතුල් කරන්න"
 
-#: libraries/insert_edit.lib.php:1398
+#: libraries/insert_edit.lib.php:1396
 #, php-format
 msgid "Continue insertion with %s rows"
 msgstr "පේළි %s බැගින් තවදුරටත් ඇතුල් කරන්න"
 
-#: libraries/insert_edit.lib.php:1428
+#: libraries/insert_edit.lib.php:1426
 msgid "and then"
 msgstr "අනතුරුව"
 
-#: libraries/insert_edit.lib.php:1461
+#: libraries/insert_edit.lib.php:1459
 msgid "Insert as new row"
 msgstr "නව පේළියක් ලෙස ඇතුල් කරන්න"
 
-#: libraries/insert_edit.lib.php:1464
+#: libraries/insert_edit.lib.php:1462
 msgid "Insert as new row and ignore errors"
 msgstr "දෝෂ නොසලකමින් නව පේළියක් ලෙස ඇතුල් කරන්න"
 
-#: libraries/insert_edit.lib.php:1467
+#: libraries/insert_edit.lib.php:1465
 msgid "Show insert query"
 msgstr "ඇතුල් කිරීමේ විමසුම පෙන්වන්න"
 
-#: libraries/insert_edit.lib.php:1487
+#: libraries/insert_edit.lib.php:1485
 msgid "Go back to previous page"
 msgstr "පෙර පිටුවට ආපසු යන්න"
 
-#: libraries/insert_edit.lib.php:1490
+#: libraries/insert_edit.lib.php:1488
 msgid "Insert another new row"
 msgstr "නව පේළියක් එක් කරන්න"
 
-#: libraries/insert_edit.lib.php:1495
+#: libraries/insert_edit.lib.php:1493
 msgid "Go back to this page"
 msgstr "මෙම පිටුව වෙත ආපසු යන්න"
 
-#: libraries/insert_edit.lib.php:1518
+#: libraries/insert_edit.lib.php:1516
 msgid "Edit next row"
 msgstr "මීලඟ පේළිය සංස්කරණය කරන්න"
 
-#: libraries/insert_edit.lib.php:1540
+#: libraries/insert_edit.lib.php:1538
 msgid ""
 "Use TAB key to move from value to value, or CTRL+arrows to move anywhere"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1577 libraries/replication_gui.lib.php:542
-#: libraries/rte/rte_routines.lib.php:1497
+#: libraries/insert_edit.lib.php:1575 libraries/replication_gui.lib.php:542
+#: libraries/rte/rte_routines.lib.php:1588
 #: libraries/server_status_variables.lib.php:220
-#: templates/designer/having_query_panel.phtml:100
-#: templates/designer/options_panel.phtml:73
-#: templates/designer/options_panel.phtml:239
-#: templates/designer/where_query_panel.phtml:69
-#: templates/table/table_header.phtml:10
-#: templates/table/zoom_result_form.phtml:35
+#: templates/database/designer/having_query_panel.phtml:100
+#: templates/database/designer/options_panel.phtml:73
+#: templates/database/designer/options_panel.phtml:239
+#: templates/database/designer/where_query_panel.phtml:69
+#: templates/table/search/table_header.phtml:10
+#: templates/table/search/zoom_result_form.phtml:35
 msgid "Value"
 msgstr "අගය"
 
-#: libraries/insert_edit.lib.php:1937 libraries/sql.lib.php:1309
+#: libraries/insert_edit.lib.php:1935 libraries/sql.lib.php:1303
 msgid "Showing SQL query"
 msgstr "SQL විමසුම පෙන්වමින්"
 
-#: libraries/insert_edit.lib.php:1962 libraries/sql.lib.php:1287
+#: libraries/insert_edit.lib.php:1960 libraries/sql.lib.php:1281
 #, php-format
 msgid "Inserted row id: %1$d"
 msgstr "%1$d පේළිය ඇතුල් කරන ලදි"
@@ -9955,7 +9972,7 @@ msgstr "නව ප්‍රේරකයක්"
 #: libraries/navigation/Nodes/Node_View_Container.class.php:26
 #: libraries/navigation/Nodes/Node_View_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:129
-#: templates/structure/show_create.phtml:30
+#: templates/database/structure/show_create.phtml:30
 msgid "Views"
 msgstr "දසුන්"
 
@@ -10264,7 +10281,7 @@ msgstr ""
 
 #: libraries/operations.lib.php:101 libraries/operations.lib.php:249
 #: libraries/operations.lib.php:869 libraries/operations.lib.php:963
-#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:907
+#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:998
 #: templates/columns_definitions/table_fields_definitions.phtml:47
 msgid "Adjust Privileges"
 msgstr "වරප්‍රසාද හැඩ ගස්වන්න"
@@ -10355,22 +10372,22 @@ msgid "Switch to copied table"
 msgstr "පිටපත් කල වගුව වෙත මාරු වන්න"
 
 #: libraries/operations.lib.php:1360
-#: templates/structure/check_all_tables.phtml:18
+#: templates/database/structure/check_all_tables.phtml:18
 msgid "Table maintenance"
 msgstr "වගු නඩත්තුව"
 
 #: libraries/operations.lib.php:1398
-#: templates/structure/check_all_tables.phtml:19
+#: templates/database/structure/check_all_tables.phtml:19
 msgid "Analyze table"
 msgstr "වගුව විශ්ලේෂණය කරන්න"
 
 #: libraries/operations.lib.php:1413
-#: templates/structure/check_all_tables.phtml:20
+#: templates/database/structure/check_all_tables.phtml:20
 msgid "Check table"
 msgstr "වගුව පරීක්ෂා කරන්න"
 
 #: libraries/operations.lib.php:1428
-#: templates/structure/check_all_tables.phtml:22
+#: templates/database/structure/check_all_tables.phtml:22
 #, fuzzy
 #| msgid "Check table"
 msgid "Checksum table"
@@ -10392,18 +10409,19 @@ msgid "Flush the table (FLUSH)"
 msgstr "Flush the table (FLUSH)"
 
 #: libraries/operations.lib.php:1477
-#: templates/structure/check_all_tables.phtml:23
-#: templates/structure/display_table_stats.phtml:56
+#: templates/database/structure/check_all_tables.phtml:23
+#: templates/table/structure/display_table_stats.phtml:56
 msgid "Optimize table"
 msgstr "වගුව ප්‍රශස්තගත කරන්න"
 
 #: libraries/operations.lib.php:1492
-#: templates/structure/check_all_tables.phtml:24
+#: templates/database/structure/check_all_tables.phtml:24
 msgid "Repair table"
 msgstr "වගුව ප්‍රතිසංස්කරණය කරන්න"
 
 #: libraries/operations.lib.php:1538
-#: templates/structure/check_all_tables.phtml:14 view_operations.php:127
+#: templates/database/structure/check_all_tables.phtml:14
+#: view_operations.php:127
 msgid "Delete data or table"
 msgstr "වගුව හෝ දත්ත ඉවත් කරන්න"
 
@@ -10528,7 +10546,7 @@ msgid "Cannot connect: invalid settings."
 msgstr "සම්බන්ධ විය නොහැක : වලංගු නොවන සැකසුමකි."
 
 #: libraries/plugins/auth/AuthenticationConfig.class.php:108
-#: libraries/plugins/auth/AuthenticationCookie.class.php:134
+#: libraries/plugins/auth/AuthenticationCookie.class.php:122
 #: libraries/plugins/auth/AuthenticationHttp.class.php:96
 #, php-format
 msgid "Welcome to %s"
@@ -10558,36 +10576,36 @@ msgstr ""
 msgid "Retry to connect"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:146
+#: libraries/plugins/auth/AuthenticationCookie.class.php:134
 msgid "Your session has expired. Please log in again."
 msgstr "ඔබගේ සැසිය කල් ඉකුත් වී ඇත. නැවත ඇතුළු වන්න."
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:170
+#: libraries/plugins/auth/AuthenticationCookie.class.php:158
 msgid "Log in"
 msgstr "ප්‍රවේශ වන්න"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:178
-#: libraries/plugins/auth/AuthenticationCookie.class.php:188
+#: libraries/plugins/auth/AuthenticationCookie.class.php:166
+#: libraries/plugins/auth/AuthenticationCookie.class.php:176
 msgid "You can enter hostname/IP address and port separated by space."
 msgstr "ඔබට සේවාදායකය/IP ලිපිනය සහ පොර්ට් අංකය හිස්තැනක් මගින් වෙන්කර ඇතුල් කල හැක."
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:193
+#: libraries/plugins/auth/AuthenticationCookie.class.php:181
 msgid "Username:"
 msgstr "භාවිත නාමය:"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:205
+#: libraries/plugins/auth/AuthenticationCookie.class.php:193
 msgid "Server Choice:"
 msgstr "සේවාදායකයේ තේරීම:"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:386
+#: libraries/plugins/auth/AuthenticationCookie.class.php:374
 msgid "Entered captcha is wrong, try again!"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:396
+#: libraries/plugins/auth/AuthenticationCookie.class.php:384
 msgid "Please enter correct captcha!"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:423
+#: libraries/plugins/auth/AuthenticationCookie.class.php:411
 #, fuzzy
 #| msgid "Cannot log in to the MySQL server"
 msgid "You are not allowed to log in to this MySQL server!"
@@ -10685,7 +10703,7 @@ msgstr "සිද්ධිය"
 #: libraries/plugins/export/ExportOdt.class.php:593
 #: libraries/plugins/export/ExportTexytext.class.php:428
 #: libraries/plugins/export/PMA_ExportPdf.class.php:313
-#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:984
 #: libraries/rte/rte_triggers.lib.php:377
 msgid "Definition"
 msgstr "අර්ථ දැක්වීම"
@@ -11015,7 +11033,7 @@ msgid "Last check:"
 msgstr "අවසන් පරීක්ෂාව:"
 
 #: libraries/plugins/export/ExportSql.class.php:1399
-#: templates/structure/structure_table_row.phtml:183
+#: templates/database/structure/structure_table_row.phtml:183
 msgid "in use"
 msgstr "භාවිතා වෙමින් පවතී"
 
@@ -11216,20 +11234,14 @@ msgstr "MySQL ජ්‍යාමිතික දිගුව ESRI \"%s\" වර
 msgid "The imported file does not contain any data!"
 msgstr "ආනයන කල ගොනුවේ දත්ත කිසිවක් අඩංගු නොවේ!"
 
-#: libraries/plugins/import/ImportSql.class.php:169
+#: libraries/plugins/import/ImportSql.class.php:72
 msgid "SQL compatibility mode:"
 msgstr "SQL ගැළපුම් ප්‍රකාරය:"
 
-#: libraries/plugins/import/ImportSql.class.php:181
+#: libraries/plugins/import/ImportSql.class.php:84
 msgid "Do not use <code>AUTO_INCREMENT</code> for zero values"
 msgstr "ශුන්‍ය අගයන් සඳහා <code>AUTO_INCREMENT</code> භාවිතා නොකරන්න"
 
-#: libraries/plugins/import/ImportSql.class.php:195
-#, fuzzy
-#| msgid "Read misses"
-msgid "Read as multibytes"
-msgstr "කියවීම් අතෑරුම්"
-
 #: libraries/plugins/import/ImportXml.class.php:54
 msgid "XML"
 msgstr "XML"
@@ -11272,7 +11284,7 @@ msgid "Show grid"
 msgstr "කොටු සැලැස්ම පෙන්වන්න"
 
 #: libraries/plugins/schema/SchemaPdf.class.php:94
-#: templates/structure/print_view_data_dictionary_link.phtml:6
+#: templates/database/structure/print_view_data_dictionary_link.phtml:6
 msgid "Data Dictionary"
 msgstr "දත්ත කෝෂය"
 
@@ -11303,7 +11315,7 @@ msgid "The %s table doesn't exist!"
 msgstr "%s නමින් වගුවක් නොපවතියි!"
 
 #: libraries/plugins/schema/eps/Eps_Relation_Schema.class.php:321
-#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:309
+#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:323
 #, php-format
 msgid "Schema of the %s database - Page %s"
 msgstr "%s දත්තගබඩාවේ ක්‍රමානුරූපය - %sවන පිටුව"
@@ -11332,7 +11344,7 @@ msgstr "පටුන"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1005
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1028
 #: libraries/tracking.lib.php:884
-#: templates/structure/table_structure_header.phtml:11
+#: templates/table/structure/table_structure_header.phtml:11
 msgid "Extra"
 msgstr "අතිරේක"
 
@@ -11703,32 +11715,32 @@ msgstr ""
 msgid "Create the needed tables with the <code>%screate_tables.sql</code>."
 msgstr "<code>examples/create_tables.sql</code> භාවිතා කර අවශ්‍ය කරන වගු තනා ගන්න."
 
-#: libraries/relation.lib.php:360
+#: libraries/relation.lib.php:357
 msgid "Create a pma user and give access to these tables."
 msgstr "පරිපාලක භාවිතා කරන්නෙක් තනා ඔහුට මෙම වගු සඳහා පරිශීලන වරප්‍රසාද ලබා දෙන්න."
 
-#: libraries/relation.lib.php:365
+#: libraries/relation.lib.php:360
 msgid ""
 "Enable advanced features in configuration file (<code>config.inc.php</"
 "code>), for example by starting from <code>config.sample.inc.php</code>."
 msgstr ""
 
-#: libraries/relation.lib.php:373
+#: libraries/relation.lib.php:365
 msgid "Re-login to phpMyAdmin to load the updated configuration file."
 msgstr "යාවත්කාලීන කරන ලද වින්‍යාස ගොනුව පූරණය සඳහා phpMyAdmin වෙත නැවත වරක් ඇතුල් වන්න."
 
-#: libraries/relation.lib.php:1612
+#: libraries/relation.lib.php:1607
 msgid "no description"
 msgstr "විස්තරයක් නොමැත"
 
-#: libraries/relation.lib.php:1811
+#: libraries/relation.lib.php:1806
 msgid ""
 "You do not have necessary privileges to create a database named "
 "'phpmyadmin'. You may go to 'Operations' tab of any database to set up the "
 "phpMyAdmin configuration storage there."
 msgstr ""
 
-#: libraries/relation.lib.php:1928
+#: libraries/relation.lib.php:1923
 #, fuzzy, php-format
 #| msgid "Missing phpMyAdmin configuration storage tables"
 msgid ""
@@ -11736,21 +11748,21 @@ msgid ""
 "configuration storage there."
 msgstr "phpMyAdmin වින්‍යාස ගබඩාවේ අඩු වගු"
 
-#: libraries/relation.lib.php:1936
+#: libraries/relation.lib.php:1931
 #, fuzzy, php-format
 #| msgid "Missing phpMyAdmin configuration storage tables"
 msgid ""
 "%sCreate%s the phpMyAdmin configuration storage in the current database."
 msgstr "phpMyAdmin වින්‍යාස ගබඩාවේ අඩු වගු"
 
-#: libraries/relation.lib.php:1944
+#: libraries/relation.lib.php:1939
 #, fuzzy, php-format
 #| msgid "Missing phpMyAdmin configuration storage tables"
 msgid "%sCreate%s missing phpMyAdmin configuration storage tables."
 msgstr "phpMyAdmin වින්‍යාස ගබඩාවේ අඩු වගු"
 
 #: libraries/replication_gui.lib.php:46 libraries/replication_gui.lib.php:343
-#: libraries/server_databases.lib.php:387
+#: libraries/server_databases.lib.php:398
 msgid "Master replication"
 msgstr "ප්‍රධාන අනුරූකරණය"
 
@@ -11809,7 +11821,7 @@ msgstr ""
 "ප්‍රධාන සේවාදායකය ලෙස සකසා <b>ඇති</b> බවට පණිවිඩයක් දර්ශනය වනු ඇත."
 
 #: libraries/replication_gui.lib.php:141
-#: libraries/server_databases.lib.php:389
+#: libraries/server_databases.lib.php:400
 msgid "Slave replication"
 msgstr "අනුගාමි අනුරූකරණය"
 
@@ -12093,10 +12105,10 @@ msgid "Master server changed successfully to %s."
 msgstr "ප්‍රධාන සේවාදායකය %s වෙත සාර්ථකව වෙනස් කරන ලදි."
 
 #: libraries/rte/rte_events.lib.php:106 libraries/rte/rte_events.lib.php:115
-#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:149
-#: libraries/rte/rte_routines.lib.php:158
-#: libraries/rte/rte_routines.lib.php:231
-#: libraries/rte/rte_routines.lib.php:1362
+#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:219
+#: libraries/rte/rte_routines.lib.php:246
+#: libraries/rte/rte_routines.lib.php:368
+#: libraries/rte/rte_routines.lib.php:1453
 #: libraries/rte/rte_triggers.lib.php:82 libraries/rte/rte_triggers.lib.php:91
 #: libraries/rte/rte_triggers.lib.php:123
 #, php-format
@@ -12117,7 +12129,7 @@ msgstr "%1$s සිද්ධිය වෙනස් කරන ලදි."
 msgid "Event %1$s has been created."
 msgstr "%1$s සිද්ධිය සාදන ලදි."
 
-#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:251
+#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:266
 #: libraries/rte/rte_triggers.lib.php:144
 msgid "One or more errors have occurred while processing your request:"
 msgstr "ඔබගේ ඉල්ලීම පිරිසකසන අතරතුර දෝෂ එකක් හෝ වැඩි ගණනක් ඇති විය:"
@@ -12126,7 +12138,7 @@ msgstr "ඔබගේ ඉල්ලීම පිරිසකසන අතරතු
 msgid "Edit event"
 msgstr "සිද්ධිය සංස්කරණය කරන්න"
 
-#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:794
+#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:885
 #: libraries/rte/rte_triggers.lib.php:323 view_create.php:180
 msgid "Details"
 msgstr "තොරතුරු"
@@ -12139,7 +12151,7 @@ msgstr "සිද්ධියේ නම"
 msgid "Event type"
 msgstr "සිද්ධි වර්ගය"
 
-#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:817
+#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:908
 #, php-format
 msgid "Change to %s"
 msgstr "%s ලෙස වෙනස් කරන්න"
@@ -12166,12 +12178,14 @@ msgstr "නවතන්න"
 msgid "On completion preserve"
 msgstr "සමාප්තියේදී සුරකින්න"
 
-#: libraries/rte/rte_events.lib.php:491 libraries/rte/rte_routines.lib.php:930
+#: libraries/rte/rte_events.lib.php:491
+#: libraries/rte/rte_routines.lib.php:1021
 #: libraries/rte/rte_triggers.lib.php:383 view_create.php:209
 msgid "Definer"
 msgstr "අර්ථ දක්වන්නා"
 
-#: libraries/rte/rte_events.lib.php:535 libraries/rte/rte_routines.lib.php:997
+#: libraries/rte/rte_events.lib.php:535
+#: libraries/rte/rte_routines.lib.php:1088
 #: libraries/rte/rte_triggers.lib.php:422
 msgid "The definer must be in the \"username@hostname\" format!"
 msgstr "අර්ථ දක්වන්නා \"භාවිත නාමය@සේවාදායක නාමය\" ආකෘතියේ විය යුතුය!"
@@ -12197,9 +12211,9 @@ msgid "You must provide an event definition."
 msgstr "ඔබ සිද්ධි අර්ථ දැක්වීමක් ලබාදිය යුතුයි."
 
 #: libraries/rte/rte_export.lib.php:43 libraries/rte/rte_general.lib.php:72
-#: libraries/rte/rte_routines.lib.php:345
-#: libraries/rte/rte_routines.lib.php:1198
-#: libraries/rte/rte_routines.lib.php:1411
+#: libraries/rte/rte_routines.lib.php:153
+#: libraries/rte/rte_routines.lib.php:1289
+#: libraries/rte/rte_routines.lib.php:1502
 msgid "Error in processing request:"
 msgstr "ඉල්ලීම පිරිසැකසීමේදී දෝශ ඇතිවිය:"
 
@@ -12231,97 +12245,97 @@ msgid ""
 "problems."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:110
-#: libraries/rte/rte_routines.lib.php:1006
+#: libraries/rte/rte_routines.lib.php:123
+msgid "Edit routine"
+msgstr "නෛත්‍යකය සංස්කරණ කරන්න"
+
+#: libraries/rte/rte_routines.lib.php:200
+#: libraries/rte/rte_routines.lib.php:1097
 #, php-format
 msgid "Invalid routine type: \"%s\""
 msgstr "වලංගු නැති නෛත්‍යක වර්ගය: \"%s\""
 
-#: libraries/rte/rte_routines.lib.php:170
+#: libraries/rte/rte_routines.lib.php:253
+#, php-format
+msgid "Routine %1$s has been created."
+msgstr "%1$s නෛත්‍යකය සාදන ලදි."
+
+#: libraries/rte/rte_routines.lib.php:380
 msgid "Sorry, we failed to restore the dropped routine."
 msgstr "හලන ලද නෛත්‍යකය ප්‍රතිස්ථාපනය කිරීම අසමත් විය."
 
-#: libraries/rte/rte_routines.lib.php:211
+#: libraries/rte/rte_routines.lib.php:439
 #, fuzzy, php-format
 #| msgid "Routine %1$s has been modified."
 msgid "Routine %1$s has been modified. Privileges have been adjusted."
 msgstr "%1$s නෛත්‍යකය වෙනස් කරන ලදී."
 
-#: libraries/rte/rte_routines.lib.php:216
+#: libraries/rte/rte_routines.lib.php:444
 #, php-format
 msgid "Routine %1$s has been modified."
 msgstr "%1$s නෛත්‍යකය වෙනස් කරන ලදී."
 
-#: libraries/rte/rte_routines.lib.php:238
-#, php-format
-msgid "Routine %1$s has been created."
-msgstr "%1$s නෛත්‍යකය සාදන ලදි."
-
-#: libraries/rte/rte_routines.lib.php:315
-msgid "Edit routine"
-msgstr "නෛත්‍යකය සංස්කරණ කරන්න"
-
-#: libraries/rte/rte_routines.lib.php:797
+#: libraries/rte/rte_routines.lib.php:888
 msgid "Routine name"
 msgstr "නෛත්‍යකයේ නම"
 
-#: libraries/rte/rte_routines.lib.php:823
+#: libraries/rte/rte_routines.lib.php:914
 msgid "Parameters"
 msgstr "පරාමිතියන්"
 
-#: libraries/rte/rte_routines.lib.php:829
+#: libraries/rte/rte_routines.lib.php:920
 msgid "Direction"
 msgstr "දිශාව"
 
-#: libraries/rte/rte_routines.lib.php:847
+#: libraries/rte/rte_routines.lib.php:938
 msgid "Add parameter"
 msgstr "පරාමිතය එක් කරන්න"
 
-#: libraries/rte/rte_routines.lib.php:851
+#: libraries/rte/rte_routines.lib.php:942
 msgid "Remove last parameter"
 msgstr "අවසන් පරාමිතය ඉවත් කරන්න"
 
-#: libraries/rte/rte_routines.lib.php:856
+#: libraries/rte/rte_routines.lib.php:947
 msgid "Return type"
 msgstr "ප්‍රතිදාන වර්ගය"
 
-#: libraries/rte/rte_routines.lib.php:862
+#: libraries/rte/rte_routines.lib.php:953
 msgid "Return length/values"
 msgstr "ප්‍රතිදානයේ දිග/අගයන්"
 
-#: libraries/rte/rte_routines.lib.php:868
+#: libraries/rte/rte_routines.lib.php:959
 msgid "Return options"
 msgstr "ප්‍රතිදාන විකල්ප"
 
-#: libraries/rte/rte_routines.lib.php:899
+#: libraries/rte/rte_routines.lib.php:990
 msgid "Is deterministic"
 msgstr "නිර්ණයනය කල හැකිද යන වග"
 
-#: libraries/rte/rte_routines.lib.php:920
+#: libraries/rte/rte_routines.lib.php:1011
 msgid ""
 "You do not have sufficient privileges to perform this operation; Please "
 "refer to the documentation for more details"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:935
+#: libraries/rte/rte_routines.lib.php:1026
 msgid "Security type"
 msgstr "ආරක්ෂණ වර්ගය"
 
-#: libraries/rte/rte_routines.lib.php:944
+#: libraries/rte/rte_routines.lib.php:1035
 msgid "SQL data access"
 msgstr "SQL දත්ත පරිශීලනය"
 
-#: libraries/rte/rte_routines.lib.php:1013
+#: libraries/rte/rte_routines.lib.php:1104
 msgid "You must provide a routine name!"
 msgstr "ඔබ නෛත්යකය සඳහා නමක් ලබාදිය යුතුයි!"
 
-#: libraries/rte/rte_routines.lib.php:1047
+#: libraries/rte/rte_routines.lib.php:1138
 #, php-format
 msgid "Invalid direction \"%s\" given for parameter."
 msgstr "පරාමිතිය සඳහා සපයන ලද \"%s\", දිශාව සඳහා වැරදි අගයකි."
 
-#: libraries/rte/rte_routines.lib.php:1069
-#: libraries/rte/rte_routines.lib.php:1131
+#: libraries/rte/rte_routines.lib.php:1160
+#: libraries/rte/rte_routines.lib.php:1222
 msgid ""
 "You must provide length/values for routine parameters of type ENUM, SET, "
 "VARCHAR and VARBINARY."
@@ -12329,24 +12343,24 @@ msgstr ""
 "ENUM, SET, VARCHAR සහ VARBINARY වර්ගවල නෛත්‍යක පරාමිති සඳහා ඔබ ප්‍රමාණය/අගයන් ලබා දිය "
 "යුතුය."
 
-#: libraries/rte/rte_routines.lib.php:1095
+#: libraries/rte/rte_routines.lib.php:1186
 msgid "You must provide a name and a type for each routine parameter."
 msgstr "සෑම නෛත්‍යක පරාමිතියක් සඳහාම ඔබ නමක් සහ වර්ගයක් ලබා දිය යුතුය."
 
-#: libraries/rte/rte_routines.lib.php:1114
+#: libraries/rte/rte_routines.lib.php:1205
 msgid "You must provide a valid return type for the routine."
 msgstr "නෛත්‍යකය සඳහා ඔබ වලංගු ප්‍රතිදාන වර්ගයක් ලබා දිය යුතුය."
 
-#: libraries/rte/rte_routines.lib.php:1174
+#: libraries/rte/rte_routines.lib.php:1265
 msgid "You must provide a routine definition."
 msgstr "ඔබ නෛත්‍යක අර්ථදක්වීමක් ලබා දිය යුතුය."
 
-#: libraries/rte/rte_routines.lib.php:1285
+#: libraries/rte/rte_routines.lib.php:1376
 #, php-format
 msgid "Execution results of routine %s"
 msgstr "%s නෛත්‍යකයේ ප්‍රතිදානය"
 
-#: libraries/rte/rte_routines.lib.php:1340
+#: libraries/rte/rte_routines.lib.php:1431
 #, fuzzy, php-format
 #| msgid "%d row affected by the last statement inside the procedure"
 #| msgid_plural "%d rows affected by the last statement inside the procedure"
@@ -12355,13 +12369,13 @@ msgid_plural "%d rows affected by the last statement inside the procedure."
 msgstr[0] "කාර්ය පටිපාටියේ අවසන් ප්‍රකාශය ක්‍රියාත්මක කිරීමෙන් පේළි %d කට බලපෑවේ ය"
 msgstr[1] "කාර්ය පටිපාටියේ අවසන් ප්‍රකාශය ක්‍රියාත්මක කිරීමෙන් පේළි %d කට බලපෑවේ ය"
 
-#: libraries/rte/rte_routines.lib.php:1398
-#: libraries/rte/rte_routines.lib.php:1406
+#: libraries/rte/rte_routines.lib.php:1489
+#: libraries/rte/rte_routines.lib.php:1497
 msgid "Execute routine"
 msgstr "නෛත්‍යකය ක්‍රියාත්මක කරන්න"
 
-#: libraries/rte/rte_routines.lib.php:1485
-#: libraries/rte/rte_routines.lib.php:1488
+#: libraries/rte/rte_routines.lib.php:1576
+#: libraries/rte/rte_routines.lib.php:1579
 msgid "Routine parameters"
 msgstr "නෛත්‍යක පරාමිති"
 
@@ -12515,7 +12529,7 @@ msgid "Original position"
 msgstr "මුල් පිහිටුම"
 
 #: libraries/server_bin_log.lib.php:133
-#: templates/structure/display_table_stats.phtml:4
+#: templates/table/structure/display_table_stats.phtml:4
 msgid "Information"
 msgstr "තොරතුරු"
 
@@ -12553,12 +12567,12 @@ msgstr ""
 "සටහන: සංඛ්‍යාලේඛන සක්‍රීය කිරීම මගින් වෙබ් සේවාදායකය සහ MySQL සේවාදායකය අතර විශාල දත්ත "
 "හුවමාරුවක් ඇති විය හැකිය."
 
-#: libraries/server_databases.lib.php:364
-#: libraries/server_databases.lib.php:365
+#: libraries/server_databases.lib.php:366
+#: libraries/server_databases.lib.php:371
 msgid "Enable Statistics"
 msgstr "සංඛ්‍යා ලේඛන සක්‍රිය කරන්න"
 
-#: libraries/server_databases.lib.php:481
+#: libraries/server_databases.lib.php:492
 #, php-format
 msgid "%1$d database has been dropped successfully."
 msgid_plural "%1$d databases have been dropped successfully."
@@ -12918,7 +12932,7 @@ msgid "You have revoked the privileges for %s."
 msgstr "ඔබ %s සඳහා වරප්‍රසාද අහෝසි කර ඇත."
 
 #: libraries/server_privileges.lib.php:2059
-#: libraries/server_privileges.lib.php:4290
+#: libraries/server_privileges.lib.php:4316
 msgid "Add user account"
 msgstr "භාවිත ගිණුමක් එක් කරන්න"
 
@@ -13083,55 +13097,55 @@ msgstr "%s ඉවත් කරමින් පවතී"
 msgid "The privileges were reloaded successfully."
 msgstr "සාර්ථකව වරප්‍රසාද පූරණය කරන්න ලදි."
 
-#: libraries/server_privileges.lib.php:3994
+#: libraries/server_privileges.lib.php:4003
 #, php-format
 msgid "The user %s already exists!"
 msgstr "%s භාවිතා කරන්නා දැනටමත් පවතී!"
 
-#: libraries/server_privileges.lib.php:4232
+#: libraries/server_privileges.lib.php:4258
 #, php-format
 msgid "Privileges for %s"
 msgstr "%s සඳහා වරප්‍රසාද"
 
-#: libraries/server_privileges.lib.php:4241
+#: libraries/server_privileges.lib.php:4267
 #: libraries/server_status_processes.lib.php:72
 #: libraries/server_user_groups.lib.php:39
 msgid "User"
 msgstr "භාවිතා කරන්නා"
 
-#: libraries/server_privileges.lib.php:4282
+#: libraries/server_privileges.lib.php:4308
 msgctxt "Create new user"
 msgid "New"
 msgstr "නව භාවිතා කරන්නෙක්"
 
-#: libraries/server_privileges.lib.php:4311
+#: libraries/server_privileges.lib.php:4337
 #, fuzzy
 #| msgid "Edit Privileges:"
 msgid "Edit privileges:"
 msgstr "වරප්‍රසාද සංස්කරණය කරන්න:"
 
-#: libraries/server_privileges.lib.php:4312
+#: libraries/server_privileges.lib.php:4338
 msgid "User account"
 msgstr "භාවිත ගිණුම"
 
-#: libraries/server_privileges.lib.php:4371
+#: libraries/server_privileges.lib.php:4397
 msgid ""
 "Note: You are attempting to edit privileges of the user with which you are "
 "currently logged in."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4391 libraries/server_users.lib.php:25
+#: libraries/server_privileges.lib.php:4417 libraries/server_users.lib.php:25
 msgid "User accounts overview"
 msgstr "භාවිත ගිණුම් පිළිබඳ දළ විශ්ලේෂණය"
 
-#: libraries/server_privileges.lib.php:4459
+#: libraries/server_privileges.lib.php:4485
 msgid ""
 "A user account allowing any user from localhost to connect is present. This "
 "will prevent other users from connecting if the host part of their account "
 "allows a connection from any (%) host."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4500
+#: libraries/server_privileges.lib.php:4526
 #, php-format
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
@@ -13143,7 +13157,7 @@ msgstr ""
 "සේවාදායකයේ වරප්‍රසාද වෙනම ම වෙනස් කර ඇත්නම් ඉහත වගුවේ දත්ත සේවාදායකයේ වරප්‍රසාද වලට "
 "වඩා වෙනස් විය හැකිය. එවැනි අවස්ථාවක ඔබ %sවරප්‍රසාද පූරණය%s කල යුතුය."
 
-#: libraries/server_privileges.lib.php:4519
+#: libraries/server_privileges.lib.php:4545
 #, fuzzy
 #| msgid ""
 #| "Note: phpMyAdmin gets the users' privileges directly from MySQL's "
@@ -13161,25 +13175,25 @@ msgstr ""
 "සේවාදායකයේ වරප්‍රසාද වෙනම ම වෙනස් කර ඇත්නම් ඉහත වගුවේ දත්ත සේවාදායකයේ වරප්‍රසාද වලට "
 "වඩා වෙනස් විය හැකිය. එවැනි අවස්ථාවක ඔබ %sවරප්‍රසාද පූරණය%s කල යුතුය."
 
-#: libraries/server_privileges.lib.php:4569
+#: libraries/server_privileges.lib.php:4595
 msgid "The selected user was not found in the privilege table."
 msgstr "තෝරාගත් භාවිත කරන්නා වරප්‍රසාද වගුවේ හමු නොවිණි."
 
-#: libraries/server_privileges.lib.php:4801
+#: libraries/server_privileges.lib.php:4827
 msgid "You have added a new user."
 msgstr "ඔබ නව භාවිතා කරන්නනෙක් එක් කරන ලදි."
 
-#: libraries/server_status.lib.php:53
+#: libraries/server_status.lib.php:60
 #, php-format
 msgid "Network traffic since startup: %s"
 msgstr "ආරම්භයේ සිට ජාලය හරහා ගමන් ගත් දත්ත ප්‍රමාණය: %s"
 
-#: libraries/server_status.lib.php:66
+#: libraries/server_status.lib.php:73
 #, php-format
 msgid "This MySQL server has been running for %1$s. It started up on %2$s."
 msgstr "මෙම MySQL සේවාදායකය %1$s තිස්සේ ක්‍රියාත්මකයි. මෙය ඇරඹුයේ %2$s."
 
-#: libraries/server_status.lib.php:80
+#: libraries/server_status.lib.php:94
 msgid ""
 "This MySQL server works as <b>master</b> and <b>slave</b> in <b>replication</"
 "b> process."
@@ -13187,43 +13201,43 @@ msgstr ""
 "මෙම MySQL සේවාදායකය <b>අනුරූකරණ</b> ක්‍රියාවලියේදී <b>ප්‍රධාන</b> හා <b>අනුගාමි</b> "
 "සේවාදායක ලෙස ක්‍රියාකරයි."
 
-#: libraries/server_status.lib.php:85
+#: libraries/server_status.lib.php:99
 msgid "This MySQL server works as <b>master</b> in <b>replication</b> process."
 msgstr ""
 "මෙම MySQL සේවාදායකය <b>අනුරූකරණ</b> ක්‍රියාවලියේදී <b>ප්‍රධාන සේවාදායකය</b> ලෙස "
 "ක්‍රියාකරයි."
 
-#: libraries/server_status.lib.php:90
+#: libraries/server_status.lib.php:104
 msgid "This MySQL server works as <b>slave</b> in <b>replication</b> process."
 msgstr ""
 "මෙම MySQL සේවාදායකය <b>අනුරූකරණ</b> ක්‍රියාවලියේදී <b>අනුගාමි සේවාදායකය</b> ලෙස "
 "ක්‍රියාකරයි."
 
-#: libraries/server_status.lib.php:106
+#: libraries/server_status.lib.php:116
 msgid "Replication status"
 msgstr "අනුරූ කරණයේ තත්වය"
 
-#: libraries/server_status.lib.php:137
+#: libraries/server_status.lib.php:146
 msgid ""
 "On a busy server, the byte counters may overrun, so those statistics as "
 "reported by the MySQL server may be incorrect."
 msgstr ""
 
-#: libraries/server_status.lib.php:148
+#: libraries/server_status.lib.php:157
 msgid "Received"
 msgstr "ලබන ලද"
 
-#: libraries/server_status.lib.php:167
+#: libraries/server_status.lib.php:176
 msgid "Sent"
 msgstr "යවන ලද"
 
-#: libraries/server_status.lib.php:234
+#: libraries/server_status.lib.php:243
 #, fuzzy
 #| msgid "max. concurrent connections"
 msgid "Max. concurrent connections"
 msgstr "උපරිම සමගාමී සම්බන්ධතා"
 
-#: libraries/server_status.lib.php:244
+#: libraries/server_status.lib.php:253
 msgid "Failed attempts"
 msgstr "අසාර්ථක උත්සාහයන්"
 
@@ -14202,7 +14216,7 @@ msgstr ""
 msgid "Not implemented yet."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/AlterOperation.php:193
+#: libraries/sql-parser/src/Components/AlterOperation.php:191
 #, fuzzy
 #| msgid "Iconic table operations"
 msgid "Unrecognized alter operation."
@@ -14218,7 +14232,7 @@ msgid "An opening bracket followed by a set of values was expected."
 msgstr ""
 
 #: libraries/sql-parser/src/Components/ArrayObj.php:101
-#: libraries/sql-parser/src/Components/FieldDefinition.php:202
+#: libraries/sql-parser/src/Components/CreateDefinition.php:202
 msgid "An opening bracket was expected."
 msgstr ""
 
@@ -14226,25 +14240,35 @@ msgstr ""
 msgid "A comma or a closing bracket was expected"
 msgstr ""
 
+#: libraries/sql-parser/src/Components/CreateDefinition.php:246
+#, fuzzy
+#| msgid "No databases selected."
+msgid "A comma or a closing bracket was expected."
+msgstr "දත්තගබඩාවක් තෝරාගෙන නොමැත."
+
+#: libraries/sql-parser/src/Components/CreateDefinition.php:262
+msgid "A closing bracket was expected."
+msgstr ""
+
 #: libraries/sql-parser/src/Components/DataType.php:125
 msgid "Unrecognized data type."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:225
+#: libraries/sql-parser/src/Components/Expression.php:227
 msgid "Unexpected closing bracket."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:246
-#: libraries/sql-parser/src/Components/Expression.php:283
-#: libraries/sql-parser/src/Components/Expression.php:303
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:285
+#: libraries/sql-parser/src/Components/Expression.php:305
 msgid "An alias was previously found."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:257
+#: libraries/sql-parser/src/Components/Expression.php:259
 msgid "Unexpected dot."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:327
+#: libraries/sql-parser/src/Components/Expression.php:329
 #, fuzzy
 #| msgid "No databases selected."
 msgid "An alias was expected."
@@ -14256,16 +14280,6 @@ msgstr "දත්තගබඩාවක් තෝරාගෙන නොමැත.
 msgid "An expression was expected."
 msgstr "පේළි කිසිවක් තෝරගෙන නැත"
 
-#: libraries/sql-parser/src/Components/FieldDefinition.php:246
-#, fuzzy
-#| msgid "No databases selected."
-msgid "A comma or a closing bracket was expected."
-msgstr "දත්තගබඩාවක් තෝරාගෙන නොමැත."
-
-#: libraries/sql-parser/src/Components/FieldDefinition.php:262
-msgid "A closing bracket was expected."
-msgstr ""
-
 #: libraries/sql-parser/src/Components/Limit.php:90
 #: libraries/sql-parser/src/Components/Limit.php:112
 msgid "An offset was expected."
@@ -14311,29 +14325,29 @@ msgstr ""
 msgid "Expected delimiter."
 msgstr ""
 
-#: libraries/sql-parser/src/Lexer.php:753
+#: libraries/sql-parser/src/Lexer.php:777
 #, fuzzy, php-format
 #| msgid "Event %1$s has been created."
 msgid "Ending quote %1$s was expected."
 msgstr "%1$s සිද්ධිය සාදන ලදි."
 
-#: libraries/sql-parser/src/Lexer.php:789
+#: libraries/sql-parser/src/Lexer.php:813
 #, fuzzy
 #| msgid "Table name template"
 msgid "Variable name was expected."
 msgstr "ගොනු නාම ටෙම්ප්ලේටය"
 
-#: libraries/sql-parser/src/Parser.php:380
+#: libraries/sql-parser/src/Parser.php:391
 #, fuzzy
 #| msgid "At Beginning of Table"
 msgid "Unexpected beginning of statement."
 msgstr "වගුව මුලදී"
 
-#: libraries/sql-parser/src/Parser.php:399
+#: libraries/sql-parser/src/Parser.php:410
 msgid "Unrecognized statement type."
 msgstr ""
 
-#: libraries/sql-parser/src/Parser.php:479
+#: libraries/sql-parser/src/Parser.php:489
 msgid "No transaction was previously started."
 msgstr ""
 
@@ -14361,8 +14375,10 @@ msgid "The name of the entity was expected."
 msgstr ""
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:310
-msgid "At least one field definition was expected."
-msgstr ""
+#, fuzzy
+#| msgid "The row has been deleted."
+msgid "At least one column definition was expected."
+msgstr "පේළිය ඉවත් කරන ලදි."
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:329
 msgid "A \"RETURNS\" keyword was expected."
@@ -14430,11 +14446,11 @@ msgstr "පොත් සලකුණ නොසාදන ලදි!"
 msgid "Using bookmark \"%s\" as default browse query."
 msgstr "\"%s\" පොත් සලකුණ පිරික්සීම සඳහා වූ පෙරනිමි SQL විමසුම ලෙස යොදා ගනිමින්."
 
-#: libraries/sql.lib.php:1306
+#: libraries/sql.lib.php:1300
 msgid "Showing as PHP code"
 msgstr "PHP කේත ලෙස පෙන්වමින්"
 
-#: libraries/sql.lib.php:1638
+#: libraries/sql.lib.php:1632
 #, fuzzy, php-format
 #| msgid ""
 #| "This table does not contain a unique column. Features related to the grid "
@@ -14446,7 +14462,7 @@ msgstr ""
 "මෙම වගුවෙහි අනුපම තීරුවක් නැත. සුරැකීමෙන් අනතුරුව වෙනස් කිරීමට, පිටපත් කිරීමට, මකා දැමීමට අදාළ "
 "ඇඳීම් ක්‍රියා විරහිත වනු ඇත."
 
-#: libraries/sql.lib.php:1649
+#: libraries/sql.lib.php:1643
 #, fuzzy, php-format
 #| msgid ""
 #| "This table does not contain a unique column. Features related to the grid "
@@ -14458,7 +14474,7 @@ msgstr ""
 "මෙම වගුවෙහි අනුපම තීරුවක් නැත. සුරැකීමෙන් අනතුරුව වෙනස් කිරීමට, පිටපත් කිරීමට, මකා දැමීමට අදාළ "
 "ඇඳීම් ක්‍රියා විරහිත වනු ඇත."
 
-#: libraries/sql.lib.php:1688
+#: libraries/sql.lib.php:1682
 #, php-format
 msgid "Problems with indexes of table `%s`"
 msgstr ""
@@ -14618,7 +14634,7 @@ msgid "Version %s snapshot (SQL code)"
 msgstr "%s වන අනුවාදයේ සැණරුව (SQL කේත)"
 
 #: libraries/tracking.lib.php:947
-#: templates/structure/table_structure_row.phtml:33
+#: templates/table/structure/table_structure_row.phtml:33
 msgctxt "None for default"
 msgid "None"
 msgstr "කිසිවක් නැත"
@@ -14671,15 +14687,15 @@ msgstr "%2$s හි %1$s වන අනුවාදය සාදන්න"
 msgid "Version %1$s was created, tracking for %2$s is active."
 msgstr "%1$s වන අනුවාදය සාදන ලදි. %2$s සඳහා අවධානය සක්‍රීයයි."
 
-#: libraries/user_preferences.inc.php:29
+#: libraries/user_preferences.inc.php:30
 msgid "Manage your settings"
 msgstr "සිටුවම් පරිපාලනය"
 
-#: libraries/user_preferences.inc.php:46 prefs_manage.php:307
+#: libraries/user_preferences.inc.php:54 prefs_manage.php:307
 msgid "Configuration has been saved."
 msgstr "වින්‍යාස සුරකින ලදි."
 
-#: libraries/user_preferences.inc.php:66
+#: libraries/user_preferences.inc.php:74
 #, php-format
 msgid ""
 "Your preferences will be saved for current session only. Storing them "
@@ -15082,7 +15098,7 @@ msgid "first"
 msgstr ""
 
 #: templates/columns_definitions/move_column.phtml:12
-#: templates/structure/add_column.phtml:21
+#: templates/table/structure/add_column.phtml:21
 #, php-format
 msgid "after %s"
 msgstr "%s ට පසු"
@@ -15159,220 +15175,327 @@ msgstr "බ්‍රව්සර රූපාන්තරනය"
 msgid "Input transformation options"
 msgstr "දත්ත සෑදීමේ විකල්ප"
 
-#: templates/designer/aggregate_query_panel.phtml:22
-#: templates/designer/options_panel.phtml:100
+#: templates/database/create_table.phtml:7
+#: templates/database/designer/side_menu.phtml:77
+#: templates/database/designer/side_menu.phtml:80
+msgid "Create table"
+msgstr "වගුව සාදන්න"
+
+#: templates/database/create_table.phtml:15
+msgid "Number of columns"
+msgstr "තීර ගණන"
+
+#: templates/database/designer/aggregate_query_panel.phtml:22
+#: templates/database/designer/options_panel.phtml:100
 msgid "Aggregate"
 msgstr "එකතු කරන්න"
 
-#: templates/designer/aggregate_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:61
-#: templates/designer/options_panel.phtml:106
-#: templates/designer/options_panel.phtml:170
-#: templates/designer/where_query_panel.phtml:30
-#: templates/table/table_header.phtml:9
+#: templates/database/designer/aggregate_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:61
+#: templates/database/designer/options_panel.phtml:106
+#: templates/database/designer/options_panel.phtml:170
+#: templates/database/designer/where_query_panel.phtml:30
+#: templates/table/search/table_header.phtml:9
 msgid "Operator"
 msgstr "මෙහෙයවනය"
 
-#: templates/designer/database_tables.phtml:29
+#: templates/database/designer/database_tables.phtml:29
 msgid "Toggle"
 msgstr ""
 
-#: templates/designer/database_tables.phtml:40
+#: templates/database/designer/database_tables.phtml:40
 #, fuzzy
 #| msgid "Table structure"
 msgid "See table structure"
 msgstr "වගු සැකිල්ල"
 
-#: templates/designer/delete_relation_panel.phtml:21
+#: templates/database/designer/delete_relation_panel.phtml:21
 msgid "Delete relation"
 msgstr ""
 
-#: templates/designer/edit_delete_pages.phtml:7
+#: templates/database/designer/edit_delete_pages.phtml:7
 #, fuzzy
 #| msgid "Page titles"
 msgid "Page to open"
 msgstr "පිටු නාම"
 
-#: templates/designer/edit_delete_pages.phtml:7
+#: templates/database/designer/edit_delete_pages.phtml:7
 #, fuzzy
 #| msgid "Relation deleted"
 msgid "Page to delete"
 msgstr "සම්බන්දතාවය ඉවත් කරන ලදී"
 
-#: templates/designer/having_query_panel.phtml:90
-#: templates/designer/options_panel.phtml:63
-#: templates/designer/options_panel.phtml:229
-#: templates/designer/where_query_panel.phtml:59
+#: templates/database/designer/having_query_panel.phtml:90
+#: templates/database/designer/options_panel.phtml:63
+#: templates/database/designer/options_panel.phtml:229
+#: templates/database/designer/where_query_panel.phtml:59
 msgid "Except"
 msgstr "හැර"
 
-#: templates/designer/having_query_panel.phtml:102
-#: templates/designer/options_panel.phtml:75
-#: templates/designer/options_panel.phtml:241
-#: templates/designer/where_query_panel.phtml:71
+#: templates/database/designer/having_query_panel.phtml:102
+#: templates/database/designer/options_panel.phtml:75
+#: templates/database/designer/options_panel.phtml:241
+#: templates/database/designer/where_query_panel.phtml:71
 msgid "subquery"
 msgstr "උප විමසුම"
 
-#: templates/designer/new_relation_panel.phtml:22
-#: templates/designer/side_menu.phtml:84 templates/designer/side_menu.phtml:87
+#: templates/database/designer/new_relation_panel.phtml:22
+#: templates/database/designer/side_menu.phtml:84
+#: templates/database/designer/side_menu.phtml:87
 msgid "Create relation"
 msgstr "සම්බන්දතාවයක් සාදන්න"
 
-#: templates/designer/options_panel.phtml:34
-#: templates/designer/options_panel.phtml:200
+#: templates/database/designer/options_panel.phtml:34
+#: templates/database/designer/options_panel.phtml:200
 #, fuzzy
 msgid "Relation operator"
 msgstr "Relation view"
 
-#: templates/designer/options_panel.phtml:85
-#: templates/designer/rename_to_panel.phtml:23
+#: templates/database/designer/options_panel.phtml:85
+#: templates/database/designer/rename_to_panel.phtml:23
 msgid "Rename to"
 msgstr "නව නාමය"
 
-#: templates/designer/options_panel.phtml:91
-#: templates/designer/rename_to_panel.phtml:31
+#: templates/database/designer/options_panel.phtml:91
+#: templates/database/designer/rename_to_panel.phtml:31
 msgid "New name"
 msgstr "නව නාමය"
 
-#: templates/designer/page_save_as.phtml:4
+#: templates/database/designer/page_save_as.phtml:4
 #, fuzzy
 #| msgid "Export to selected page."
 msgid "Save to selected page"
 msgstr "තෝරාගත් පිටු අපනයනය කරන්න."
 
-#: templates/designer/page_save_as.phtml:5
+#: templates/database/designer/page_save_as.phtml:5
 #, fuzzy
 #| msgid "Create a page and export to it."
 msgid "Create a page and save to it"
 msgstr "පිටුවක් සාදා අපනයනය කරන්න."
 
-#: templates/designer/page_save_as.phtml:26
+#: templates/database/designer/page_save_as.phtml:26
 #, fuzzy
 #| msgid "New page name: "
 msgid "New page name"
 msgstr "නව පිටු නාමය: "
 
-#: templates/designer/page_selector.phtml:2
+#: templates/database/designer/page_selector.phtml:2
 msgid "Select page"
 msgstr "පිටුව තෝරන්න"
 
-#: templates/designer/query_details.phtml:10
+#: templates/database/designer/query_details.phtml:10
 msgid "Active options"
 msgstr "සක්‍රිය විකල්ප"
 
-#: templates/designer/schema_export.phtml:4
+#: templates/database/designer/schema_export.phtml:4
 msgid "Select Export Relational Type"
 msgstr "ක්‍රමානුරූපය අපනයනය කල යුතු ආකෘතිය තෝරන්න"
 
-#: templates/designer/side_menu.phtml:19 templates/designer/side_menu.phtml:25
+#: templates/database/designer/side_menu.phtml:19
+#: templates/database/designer/side_menu.phtml:25
 #, fuzzy
 #| msgid "Showing tables:"
 msgid "Show/Hide tables list"
 msgstr "වගු පෙන්වමින්:"
 
-#: templates/designer/side_menu.phtml:29 templates/designer/side_menu.phtml:35
-#: templates/designer/side_menu.phtml:36
+#: templates/database/designer/side_menu.phtml:29
+#: templates/database/designer/side_menu.phtml:35
+#: templates/database/designer/side_menu.phtml:36
 msgid "View in fullscreen"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:34
+#: templates/database/designer/side_menu.phtml:34
 msgid "Exit fullscreen"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:41 templates/designer/side_menu.phtml:45
+#: templates/database/designer/side_menu.phtml:41
+#: templates/database/designer/side_menu.phtml:45
 #, fuzzy
 #| msgid "New name"
 msgid "New page"
 msgstr "නව නාමය"
 
-#: templates/designer/side_menu.phtml:70 templates/designer/side_menu.phtml:73
+#: templates/database/designer/side_menu.phtml:70
+#: templates/database/designer/side_menu.phtml:73
 #, fuzzy
 #| msgid "Select page"
 msgid "Delete pages"
 msgstr "පිටුව තෝරන්න"
 
-#: templates/designer/side_menu.phtml:77 templates/designer/side_menu.phtml:80
-#: templates/table/create_table.phtml:7
-msgid "Create table"
-msgstr "වගුව සාදන්න"
-
-#: templates/designer/side_menu.phtml:98
-#: templates/designer/side_menu.phtml:101
+#: templates/database/designer/side_menu.phtml:98
+#: templates/database/designer/side_menu.phtml:101
 msgid "Reload"
 msgstr "ප්‍රතිපූරණය"
 
-#: templates/designer/side_menu.phtml:107
-#: templates/designer/side_menu.phtml:110
+#: templates/database/designer/side_menu.phtml:107
+#: templates/database/designer/side_menu.phtml:110
 msgid "Help"
 msgstr "උදවු"
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Angular links"
 msgstr "ආංශික සබැඳුම"
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Direct links"
 msgstr "ඍජු සබැඳුම"
 
-#: templates/designer/side_menu.phtml:122
-#: templates/designer/side_menu.phtml:124
+#: templates/database/designer/side_menu.phtml:122
+#: templates/database/designer/side_menu.phtml:124
 msgid "Snap to grid"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:128
-#: templates/designer/side_menu.phtml:134
+#: templates/database/designer/side_menu.phtml:128
+#: templates/database/designer/side_menu.phtml:134
 msgid "Small/Big All"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:138
-#: templates/designer/side_menu.phtml:141
+#: templates/database/designer/side_menu.phtml:138
+#: templates/database/designer/side_menu.phtml:141
 msgid "Toggle small/big"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:145
-#: templates/designer/side_menu.phtml:148
+#: templates/database/designer/side_menu.phtml:145
+#: templates/database/designer/side_menu.phtml:148
 msgid "Toggle relation lines"
 msgstr "සබඳතා දක්වන ඉරි පෙන්වන්න/සඟවන්න"
 
-#: templates/designer/side_menu.phtml:153
-#: templates/designer/side_menu.phtml:156
+#: templates/database/designer/side_menu.phtml:153
+#: templates/database/designer/side_menu.phtml:156
 #, fuzzy
 #| msgid "Export all"
 msgid "Export schema"
 msgstr "සියල්ල අපනයනය කරන්න"
 
-#: templates/designer/side_menu.phtml:165
-#: templates/designer/side_menu.phtml:168
+#: templates/database/designer/side_menu.phtml:165
+#: templates/database/designer/side_menu.phtml:168
 msgid "Build Query"
 msgstr "විමසුම ගොඩ නඟන්න"
 
-#: templates/designer/side_menu.phtml:173
-#: templates/designer/side_menu.phtml:177
+#: templates/database/designer/side_menu.phtml:173
+#: templates/database/designer/side_menu.phtml:177
 msgid "Move Menu"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:181
-#: templates/designer/side_menu.phtml:186
+#: templates/database/designer/side_menu.phtml:181
+#: templates/database/designer/side_menu.phtml:186
 #, fuzzy
 #| msgid "Partial texts"
 msgid "Pin text"
 msgstr "අර්ධ පෙළ"
 
-#: templates/designer/table_list.phtml:4
+#: templates/database/designer/table_list.phtml:4
 msgid "Hide/Show all"
 msgstr "සියල්ල පෙන්වන්න/සඟවන්න"
 
-#: templates/designer/table_list.phtml:14
+#: templates/database/designer/table_list.phtml:14
 msgid "Hide/Show Tables with no relation"
 msgstr ""
 
-#: templates/designer/table_list.phtml:59
+#: templates/database/designer/table_list.phtml:59
 msgid "Number of tables:"
 msgstr "වගු ගණන:"
 
+#: templates/database/structure/body_for_table_summary.phtml:6
+#, php-format
+msgid "%s table"
+msgid_plural "%s tables"
+msgstr[0] "%s වගු"
+msgstr[1] "%s වගු"
+
+#: templates/database/structure/body_for_table_summary.phtml:17
+msgid "Sum"
+msgstr "එකතුව"
+
+#: templates/database/structure/check_all_tables.phtml:6
+msgid "Check tables having overhead"
+msgstr "පිරිවැයක් සහිත වගු පරීක්ෂා කරන්න"
+
+#: templates/database/structure/check_all_tables.phtml:10
+#, fuzzy
+#| msgid "Show color"
+msgid "Show create"
+msgstr "වර්ණය පෙන්වන්න"
+
+#: templates/database/structure/check_all_tables.phtml:27
+#, fuzzy
+#| msgid "Add prefix"
+msgid "Prefix"
+msgstr "නාම මූලයක් එක් කරන්න"
+
+#: templates/database/structure/check_all_tables.phtml:28
+msgid "Add prefix to table"
+msgstr "වගුවට නාම මූලයක් එක් කරන්න"
+
+#: templates/database/structure/check_all_tables.phtml:29
+msgid "Replace table prefix"
+msgstr "වගු නාම මූලය ප්‍රතිස්ථාපනය කරන්න"
+
+#: templates/database/structure/check_all_tables.phtml:30
+msgid "Copy table with prefix"
+msgstr "නාම මූලය සහිත වගු පිටපත් කරන්න"
+
+#: templates/database/structure/check_all_tables.phtml:36
+#, fuzzy
+#| msgid "CHAR textarea columns"
+msgid "Add columns to central list"
+msgstr "CHAR පෙළ පෙදෙසේ පළල"
+
+#: templates/database/structure/check_all_tables.phtml:37
+msgid "Remove columns from central list"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:38
+#, fuzzy
+#| msgid "CHAR textarea columns"
+msgid "Make consistent with central list"
+msgstr "CHAR පෙළ පෙදෙසේ පළල"
+
+#: templates/database/structure/favorite_anchor.phtml:12
+#, fuzzy
+#| msgid "Add this series"
+msgid "Add to Favorites"
+msgstr "මෙම ශ්‍රේණිය එක් කරන්න"
+
+#: templates/database/structure/show_create.phtml:2
+#, fuzzy
+#| msgid "Show SQL queries"
+msgid "Showing create queries"
+msgstr "SQL විමසුම් පෙන්වන්න"
+
+#: templates/database/structure/sortable_header.phtml:13
+msgid "Sort"
+msgstr "සුබෙදන්න"
+
+#: templates/database/structure/table_header.phtml:42
+#, fuzzy
+#| msgid "May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]."
+msgid ""
+"May be approximate. Click on the number to get the exact count. See "
+"[doc@faq3-11]FAQ 3.11[/doc]."
+msgstr "සමහර විට ආසන්න වශයෙන්. [doc@faq3-11]FAQ 3.11[/doc] බලන්න."
+
+#: templates/database/structure/table_header.phtml:66
+#: templates/table/index_form.phtml:127
+msgid "Size"
+msgstr "ප්‍රමාණය"
+
+#: templates/database/structure/table_header.phtml:74
+#: templates/table/structure/display_table_stats.phtml:27
+msgid "Overhead"
+msgstr "පිරිවැය"
+
+#: templates/database/structure/tracking_icon.phtml:4
+msgid "Tracking is active."
+msgstr "අවධානය සක්‍රීයයි."
+
+#: templates/database/structure/tracking_icon.phtml:8
+msgid "Tracking is not active."
+msgstr "අවධානය අක්‍රීයයි."
+
 #: templates/error/report_form.phtml:7
 msgid ""
 "phpMyAdmin has encountered an error. We have collected data about this error "
@@ -15388,65 +15511,6 @@ msgstr ""
 msgid "Please explain the steps that lead to the error:"
 msgstr ""
 
-#: templates/gis_visualization/gis_visualization.phtml:3
-msgid "Display GIS Visualization"
-msgstr "ජ්‍යාමිතික දත්ත නිරූපණය"
-
-#: templates/gis_visualization/gis_visualization.phtml:8
-msgid "Label column"
-msgstr "ලේබල තීරුව"
-
-#: templates/gis_visualization/gis_visualization.phtml:11
-msgid "-- None --"
-msgstr "- කිසිවක් නොමැත -"
-
-#: templates/gis_visualization/gis_visualization.phtml:19
-msgid "Spatial column"
-msgstr "ජ්‍යාමිතික තීරුව"
-
-#: templates/index_form.phtml:16
-msgid "Index name:"
-msgstr "සූචියේ නම:"
-
-#: templates/index_form.phtml:19
-msgid ""
-"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
-msgstr "\"PRIMARY\" නාමය ප්‍රාථමික මූලය සඳහා <b>පමණක්</b> භාවිතා කල <b>යුතුය</b>!"
-
-#: templates/index_form.phtml:40
-#, fuzzy
-#| msgid "Index name:"
-msgid "Index choice:"
-msgstr "සූචියේ නම:"
-
-#: templates/index_form.phtml:57
-msgid "Key block size:"
-msgstr ""
-
-#: templates/index_form.phtml:74
-msgid "Index type:"
-msgstr "සූචි වර්ගය:"
-
-#: templates/index_form.phtml:86
-#, fuzzy
-#| msgid "User:"
-msgid "Parser:"
-msgstr "භාවිතා කරන්නා:"
-
-#: templates/index_form.phtml:102
-msgid "Comment:"
-msgstr "ටීකාව:"
-
-#: templates/index_form.phtml:127 templates/structure/table_header.phtml:66
-msgid "Size"
-msgstr "ප්‍රමාණය"
-
-#: templates/index_form.phtml:149 templates/index_form.phtml:190
-#, fuzzy
-#| msgid "Drag to reorder."
-msgid "Drag to reorder"
-msgstr "අනුපිලිවෙල නැවත සකස් කිරීමට අදින්න."
-
 #: templates/prefs_autoload.phtml:9
 msgid ""
 "Your browser has phpMyAdmin configuration for this domain. Would you like to "
@@ -15457,447 +15521,406 @@ msgstr ""
 msgid "Start row:"
 msgstr "ආරම්භක පේළිය:"
 
-#: templates/structure/actions_in_table_structure.phtml:14
-#, php-format
-msgid "A primary key has been added on %s."
-msgstr "%s ට ප්‍රාථමික මූලයක් එක් කරන ලදි."
-
-#: templates/structure/actions_in_table_structure.phtml:34
-#: templates/structure/actions_in_table_structure.phtml:54
-#: templates/structure/actions_in_table_structure.phtml:79
-#: templates/structure/actions_in_table_structure.phtml:101
-#, php-format
-msgid "An index has been added on %s."
-msgstr "%s සඳහා සූචියක් එක්කරන ලදි."
-
-#: templates/structure/actions_in_table_structure.phtml:130
-#: templates/structure/check_all_table_column.phtml:59
-msgid "Remove from central columns"
-msgstr "මධ්‍යම තීර වලින් ඉවත් කරන්න"
-
-#: templates/structure/actions_in_table_structure.phtml:138
-#: templates/structure/check_all_table_column.phtml:55
-msgid "Add to central columns"
-msgstr "මධ්‍යම තීර වලට එක් කරන්න"
-
-#: templates/structure/add_column.phtml:7
-#, php-format
-msgid "Add %s column(s)"
-msgstr "%s ක්ෂේත්‍ර(ය) එක් කරන්න"
-
-#: templates/structure/add_column.phtml:12
-#, fuzzy
-#| msgid "At Beginning of Table"
-msgid "at beginning of table"
-msgstr "වගුව මුලදී"
-
-#: templates/structure/body_for_table_summary.phtml:6
-#, php-format
-msgid "%s table"
-msgid_plural "%s tables"
-msgstr[0] "%s වගු"
-msgstr[1] "%s වගු"
-
-#: templates/structure/body_for_table_summary.phtml:17
-msgid "Sum"
-msgstr "එකතුව"
-
-#: templates/structure/check_all_tables.phtml:6
-msgid "Check tables having overhead"
-msgstr "පිරිවැයක් සහිත වගු පරීක්ෂා කරන්න"
-
-#: templates/structure/check_all_tables.phtml:10
-#, fuzzy
-#| msgid "Show color"
-msgid "Show create"
-msgstr "වර්ණය පෙන්වන්න"
-
-#: templates/structure/check_all_tables.phtml:27
-#, fuzzy
-#| msgid "Add prefix"
-msgid "Prefix"
-msgstr "නාම මූලයක් එක් කරන්න"
-
-#: templates/structure/check_all_tables.phtml:28
-msgid "Add prefix to table"
-msgstr "වගුවට නාම මූලයක් එක් කරන්න"
-
-#: templates/structure/check_all_tables.phtml:29
-msgid "Replace table prefix"
-msgstr "වගු නාම මූලය ප්‍රතිස්ථාපනය කරන්න"
-
-#: templates/structure/check_all_tables.phtml:30
-msgid "Copy table with prefix"
-msgstr "නාම මූලය සහිත වගු පිටපත් කරන්න"
-
-#: templates/structure/check_all_tables.phtml:36
-#, fuzzy
-#| msgid "CHAR textarea columns"
-msgid "Add columns to central list"
-msgstr "CHAR පෙළ පෙදෙසේ පළල"
-
-#: templates/structure/check_all_tables.phtml:37
-msgid "Remove columns from central list"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:38
-#, fuzzy
-#| msgid "CHAR textarea columns"
-msgid "Make consistent with central list"
-msgstr "CHAR පෙළ පෙදෙසේ පළල"
-
-#: templates/structure/display_structure.phtml:140 view_create.php:181
-msgid "Edit view"
-msgstr "දසුන සංස්කරණය කරන්න"
-
-#: templates/structure/display_table_stats.phtml:9
-msgid "Space usage"
-msgstr "අවකාශ භාවිතය"
-
-#: templates/structure/display_table_stats.phtml:27
-#: templates/structure/table_header.phtml:74
-msgid "Overhead"
-msgstr "පිරිවැය"
-
-#: templates/structure/display_table_stats.phtml:32
-msgid "Effective"
-msgstr "එලදායී"
-
-#: templates/structure/favorite_anchor.phtml:12
-#, fuzzy
-#| msgid "Add this series"
-msgid "Add to Favorites"
-msgstr "මෙම ශ්‍රේණිය එක් කරන්න"
-
-#: templates/structure/move_columns_dialog.phtml:1
-#: templates/structure/optional_action_links.phtml:21
-msgid "Move columns"
-msgstr "තීර අනුපිළිවල සකසන්න"
-
-#: templates/structure/move_columns_dialog.phtml:2
-msgid "Move the columns by dragging them up and down."
-msgstr "ඉහළ පහළ ඇදීමෙන් තීර අනුපිළිවෙල සකසන්න."
-
-#: templates/structure/optional_action_links.phtml:9
-msgid "Propose table structure"
-msgstr "සැකිල්ලක් යෝජනා කරන්න"
-
-#: templates/structure/optional_action_links.phtml:24
-msgid "Improve table structure"
-msgstr "වගුවේ සැකිල්ල වැඩි දියුණු කරන්න"
-
-#: templates/structure/optional_action_links.phtml:30
-msgid "Track view"
-msgstr "දසුන අවධානයට ලක් කරන්න"
-
-#: templates/structure/row_stats_table.phtml:3
-msgid "Row statistics"
-msgstr "පේළි සංඛ්‍ය ලේඛන"
-
-#: templates/structure/row_stats_table.phtml:9
-msgid "static"
-msgstr "ස්ථිතික"
-
-#: templates/structure/row_stats_table.phtml:11
-msgid "dynamic"
-msgstr "ගතික"
-
-#: templates/structure/row_stats_table.phtml:22
-msgid "partitioned"
-msgstr "කොටස් කරන ලද"
-
-#: templates/structure/row_stats_table.phtml:54
-msgid "Row length"
-msgstr "පේළියේ දිග"
-
-#: templates/structure/row_stats_table.phtml:66
-msgid "Row size"
-msgstr "පේළියේ ප්‍රමාණය"
-
-#: templates/structure/row_stats_table.phtml:73
-msgid "Next autoindex"
-msgstr "මීළඟ ක්‍රමාංකය"
-
-#: templates/structure/secondary_tabs.phtml:14
-#, fuzzy
-#| msgid "Relation view"
-msgid "Relation view"
-msgstr "වගු සබඳතා දර්ශනය"
-
-#: templates/structure/show_create.phtml:2
-#, fuzzy
-#| msgid "Show SQL queries"
-msgid "Showing create queries"
-msgstr "SQL විමසුම් පෙන්වන්න"
-
-#: templates/structure/sortable_header.phtml:13
-msgid "Sort"
-msgstr "සුබෙදන්න"
-
-#: templates/structure/table_header.phtml:42
-#, fuzzy
-#| msgid "May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]."
-msgid ""
-"May be approximate. Click on the number to get the exact count. See "
-"[doc@faq3-11]FAQ 3.11[/doc]."
-msgstr "සමහර විට ආසන්න වශයෙන්. [doc@faq3-11]FAQ 3.11[/doc] බලන්න."
-
-#: templates/structure/table_structure_row.phtml:46
-#, php-format
-msgid "Column %s has been dropped."
-msgstr "%s තීරුව හලන ලදි."
-
-#: templates/structure/tracking_icon.phtml:4
-msgid "Tracking is active."
-msgstr "අවධානය සක්‍රීයයි."
-
-#: templates/structure/tracking_icon.phtml:8
-msgid "Tracking is not active."
-msgstr "අවධානය අක්‍රීයයි."
-
-#: templates/table/create_table.phtml:15
-msgid "Number of columns"
-msgstr "තීර ගණන"
-
-#: templates/table/options.phtml:8
-msgid "Select columns (at least one):"
-msgstr "පේළි තෝරන්න (අවම වශයෙන් එකක්):"
-
-#: templates/table/options.phtml:37
-msgid "Add search conditions (body of the \"where\" clause):"
-msgstr "සෙවීම් කොන්දේසි එක් කරන්න (\"where\" වාක්‍යාංශය යටතේ):"
-
-#: templates/table/options.phtml:45
-msgid "Number of rows per page"
-msgstr "පිටුවකට පේළි ගණන"
-
-#: templates/table/options.phtml:56
-msgid "Display order:"
-msgstr "දර්ශනය කිරීමේ අනුපිළිවෙල:"
-
-#: templates/table/options_zoom.phtml:6
-msgid "Use this column to label each point"
-msgstr "ලක්ෂ්‍ය ලේබල ගත කිරීමට මෙම තීරය භාවිත කරන්න"
-
-#: templates/table/options_zoom.phtml:35
-msgid "Maximum rows to plot"
-msgstr "උපරිම තීර ගණන"
-
-#: templates/table/replace_preview.phtml:13
-msgid "Find and replace - preview"
-msgstr ""
-
-#: templates/table/replace_preview.phtml:18
-#, fuzzy
-#| msgid "Original position"
-msgid "Original string"
-msgstr "මුල් පිහිටුම"
-
-#: templates/table/replace_preview.phtml:19
-#, fuzzy
-#| msgid "Related Links"
-msgid "Replaced string"
-msgstr "අදාල සබැඳි"
-
-#: templates/table/replace_preview.phtml:40
-#, fuzzy
-#| msgid "Replicated"
-msgid "Replace"
-msgstr "අනුරූ කරන ලද"
-
-#: templates/table/rows_zoom.phtml:16
-msgid "Additional search criteria"
-msgstr "අමතර සෙවීම් නිර්ණායක"
-
-#: templates/table/search_and_replace.phtml:3
-msgid "Replace with:"
-msgstr "වෙනුවට භාවිතා කරන්න:"
-
-#: templates/table/search_and_replace.phtml:22
-#, fuzzy
-#| msgid "as regular expression"
-msgid "Use regular expression"
-msgstr "regular expression ලෙස"
-
-#: templates/table/selection_form.phtml:12
-msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
-msgstr "තීර දෙකක් සඳහා \"උදාහරණයෙන් විමසුම\" ක් සිදු කරන්න (wildcard: \"%\")"
-
-#: templates/table/selection_form.phtml:34
-msgid "Do a \"query by example\" (wildcard: \"%\")"
-msgstr "\"උදාහරණයෙන් විමසුම\" ක් සිදු කරන්න (wildcard: \"%\")"
-
-#: templates/table/zoom_result_form.phtml:7
-msgid "Browse/Edit the points"
-msgstr "ලක්ෂ්‍ය පිරික්සීම/සංස්කරණය"
-
-#: templates/table/zoom_result_form.phtml:15
-msgid "How to use"
-msgstr "භාවිතා කරන අයුරු"
-
-#: templates/table/zoom_result_form.phtml:23
-msgid "Reset zoom"
-msgstr "සූමය ප්‍රතිසකසන්න"
-
-#: templates/tbl_chart.phtml:17
+#: templates/table/chart/tbl_chart.phtml:17
 msgctxt "Chart type"
 msgid "Bar"
 msgstr "තීර"
 
-#: templates/tbl_chart.phtml:21
+#: templates/table/chart/tbl_chart.phtml:21
 msgctxt "Chart type"
 msgid "Column"
 msgstr "ස්ථම්භ"
 
-#: templates/tbl_chart.phtml:25
+#: templates/table/chart/tbl_chart.phtml:25
 msgctxt "Chart type"
 msgid "Line"
 msgstr "රේඛා"
 
-#: templates/tbl_chart.phtml:29
+#: templates/table/chart/tbl_chart.phtml:29
 msgctxt "Chart type"
 msgid "Spline"
 msgstr "සුනම්‍ය රේඛා"
 
-#: templates/tbl_chart.phtml:33
+#: templates/table/chart/tbl_chart.phtml:33
 msgctxt "Chart type"
 msgid "Area"
 msgstr ""
 
-#: templates/tbl_chart.phtml:37
+#: templates/table/chart/tbl_chart.phtml:37
 msgctxt "Chart type"
 msgid "Pie"
 msgstr "වට"
 
-#: templates/tbl_chart.phtml:41
+#: templates/table/chart/tbl_chart.phtml:41
 msgctxt "Chart type"
 msgid "Timeline"
 msgstr "කාලරාමු"
 
-#: templates/tbl_chart.phtml:45
+#: templates/table/chart/tbl_chart.phtml:45
 msgctxt "Chart type"
 msgid "Scatter"
 msgstr ""
 
-#: templates/tbl_chart.phtml:50
+#: templates/table/chart/tbl_chart.phtml:50
 msgid "Stacked"
 msgstr "ගොඩ ගසන ලද"
 
-#: templates/tbl_chart.phtml:53
+#: templates/table/chart/tbl_chart.phtml:53
 msgid "Chart title"
 msgstr "ප්‍රස්ථාර මාතෘකාව"
 
-#: templates/tbl_chart.phtml:57
+#: templates/table/chart/tbl_chart.phtml:57
 msgid "X-Axis:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:72
+#: templates/table/chart/tbl_chart.phtml:72
 msgid "Series:"
 msgstr "ශ්‍රේණි:"
 
-#: templates/tbl_chart.phtml:102
+#: templates/table/chart/tbl_chart.phtml:102
 msgid "X-Axis label:"
 msgstr "X-අක්ෂයේ ලේබලය:"
 
-#: templates/tbl_chart.phtml:104
+#: templates/table/chart/tbl_chart.phtml:104
 msgid "X Values"
 msgstr "X අගයන්"
 
-#: templates/tbl_chart.phtml:107
+#: templates/table/chart/tbl_chart.phtml:107
 msgid "Y-Axis label:"
 msgstr "Y-අක්ෂයේ ලේබලය:"
 
-#: templates/tbl_chart.phtml:115
+#: templates/table/chart/tbl_chart.phtml:115
 msgid "Series names are in a column"
 msgstr ""
 
-#: templates/tbl_chart.phtml:118
+#: templates/table/chart/tbl_chart.phtml:118
 #, fuzzy
 #| msgid "Inside column:"
 msgid "Series column:"
 msgstr "තීරය තුල:"
 
-#: templates/tbl_chart.phtml:130
+#: templates/table/chart/tbl_chart.phtml:130
 #, fuzzy
 #| msgid "Values for column %s"
 msgid "Value Column:"
 msgstr "%s තීරුව සඳහා අගයන්"
 
-#: templates/tbl_chart.phtml:150
+#: templates/table/chart/tbl_chart.phtml:150
 #, fuzzy
 #| msgid "Save as file"
 msgid "Save chart as image"
 msgstr "ගොනුවක් ලෙස තෝරන්න"
 
-#: templates/tbl_relation/common_form.phtml:7
+#: templates/table/gis_visualization/gis_visualization.phtml:3
+msgid "Display GIS Visualization"
+msgstr "ජ්‍යාමිතික දත්ත නිරූපණය"
+
+#: templates/table/gis_visualization/gis_visualization.phtml:8
+msgid "Label column"
+msgstr "ලේබල තීරුව"
+
+#: templates/table/gis_visualization/gis_visualization.phtml:11
+msgid "-- None --"
+msgstr "- කිසිවක් නොමැත -"
+
+#: templates/table/gis_visualization/gis_visualization.phtml:19
+msgid "Spatial column"
+msgstr "ජ්‍යාමිතික තීරුව"
+
+#: templates/table/index_form.phtml:16
+msgid "Index name:"
+msgstr "සූචියේ නම:"
+
+#: templates/table/index_form.phtml:19
+msgid ""
+"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
+msgstr "\"PRIMARY\" නාමය ප්‍රාථමික මූලය සඳහා <b>පමණක්</b> භාවිතා කල <b>යුතුය</b>!"
+
+#: templates/table/index_form.phtml:40
+#, fuzzy
+#| msgid "Index name:"
+msgid "Index choice:"
+msgstr "සූචියේ නම:"
+
+#: templates/table/index_form.phtml:57
+msgid "Key block size:"
+msgstr ""
+
+#: templates/table/index_form.phtml:74
+msgid "Index type:"
+msgstr "සූචි වර්ගය:"
+
+#: templates/table/index_form.phtml:86
+#, fuzzy
+#| msgid "User:"
+msgid "Parser:"
+msgstr "භාවිතා කරන්නා:"
+
+#: templates/table/index_form.phtml:102
+msgid "Comment:"
+msgstr "ටීකාව:"
+
+#: templates/table/index_form.phtml:149 templates/table/index_form.phtml:190
+#, fuzzy
+#| msgid "Drag to reorder."
+msgid "Drag to reorder"
+msgstr "අනුපිලිවෙල නැවත සකස් කිරීමට අදින්න."
+
+#: templates/table/relation/common_form.phtml:7
 msgid "Internal relations"
 msgstr "අභ්‍යන්තර සබඳතා"
 
-#: templates/tbl_relation/common_form.phtml:11
+#: templates/table/relation/common_form.phtml:11
 msgid "Internal relation"
 msgstr "අභ්‍යන්තර සබඳතා"
 
-#: templates/tbl_relation/common_form.phtml:14
+#: templates/table/relation/common_form.phtml:14
 msgid ""
 "An internal relation is not necessary when a corresponding FOREIGN KEY "
 "relation exists."
 msgstr "අදාල අන්‍ය මූලය ඇති විට අභ්‍යන්තර සබඳතාවක් අවශ්‍ය නොවේ."
 
-#: templates/tbl_relation/common_form.phtml:37
+#: templates/table/relation/common_form.phtml:37
 #, fuzzy
 #| msgid "Foreign key constraint"
 msgid "Foreign key constraints"
 msgstr "අන්‍ය මූල නිරෝධය"
 
-#: templates/tbl_relation/common_form.phtml:40
+#: templates/table/relation/common_form.phtml:40
 #, fuzzy
 #| msgid "Action"
 msgid "Actions"
 msgstr "ක්‍රියාව"
 
-#: templates/tbl_relation/common_form.phtml:41
+#: templates/table/relation/common_form.phtml:41
 #, fuzzy
 #| msgid "Constraints for table"
 msgid "Constraint properties"
 msgstr "වගුව සඳහා සීමා බාධක"
 
-#: templates/tbl_relation/common_form.phtml:44
+#: templates/table/relation/common_form.phtml:44
 msgid ""
 "Only columns with index will be displayed. You can define an index below."
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:49
+#: templates/table/relation/common_form.phtml:49
 msgid "Foreign key constraint"
 msgstr "අන්‍ය මූල නිරෝධය"
 
-#: templates/tbl_relation/common_form.phtml:81
+#: templates/table/relation/common_form.phtml:81
 #, fuzzy
 #| msgid "Add constraints"
 msgid "+ Add constraint"
 msgstr "සීමා බාධවන් එක් කරන්න"
 
-#: templates/tbl_relation/common_form.phtml:91
+#: templates/table/relation/common_form.phtml:91
 msgid "Choose column to display:"
 msgstr "පෙන්වීම සඳහා තීරය ‍තෝරාගන්න:"
 
-#: templates/tbl_relation/foreign_key_row.phtml:13
+#: templates/table/relation/foreign_key_row.phtml:13
 #, fuzzy, php-format
 #| msgid "Foreign key constraint"
 msgid "Foreign key constraint %s has been dropped"
 msgstr "අන්‍ය මූල නිරෝධය"
 
-#: templates/tbl_relation/foreign_key_row.phtml:102
+#: templates/table/relation/foreign_key_row.phtml:102
 #, fuzzy
 #| msgid "Constraints for table"
 msgid "Constraint name"
 msgstr "වගුව සඳහා සීමා බාධක"
 
-#: templates/tbl_relation/foreign_key_row.phtml:157
+#: templates/table/relation/foreign_key_row.phtml:157
 #, fuzzy
 #| msgid "Add column"
 msgid "+ Add column"
 msgstr "තීරයක් එක් කරන්න"
 
+#: templates/table/search/options.phtml:8
+msgid "Select columns (at least one):"
+msgstr "පේළි තෝරන්න (අවම වශයෙන් එකක්):"
+
+#: templates/table/search/options.phtml:37
+msgid "Add search conditions (body of the \"where\" clause):"
+msgstr "සෙවීම් කොන්දේසි එක් කරන්න (\"where\" වාක්‍යාංශය යටතේ):"
+
+#: templates/table/search/options.phtml:45
+msgid "Number of rows per page"
+msgstr "පිටුවකට පේළි ගණන"
+
+#: templates/table/search/options.phtml:56
+msgid "Display order:"
+msgstr "දර්ශනය කිරීමේ අනුපිළිවෙල:"
+
+#: templates/table/search/options_zoom.phtml:6
+msgid "Use this column to label each point"
+msgstr "ලක්ෂ්‍ය ලේබල ගත කිරීමට මෙම තීරය භාවිත කරන්න"
+
+#: templates/table/search/options_zoom.phtml:35
+msgid "Maximum rows to plot"
+msgstr "උපරිම තීර ගණන"
+
+#: templates/table/search/replace_preview.phtml:13
+msgid "Find and replace - preview"
+msgstr ""
+
+#: templates/table/search/replace_preview.phtml:18
+#, fuzzy
+#| msgid "Original position"
+msgid "Original string"
+msgstr "මුල් පිහිටුම"
+
+#: templates/table/search/replace_preview.phtml:19
+#, fuzzy
+#| msgid "Related Links"
+msgid "Replaced string"
+msgstr "අදාල සබැඳි"
+
+#: templates/table/search/replace_preview.phtml:40
+#, fuzzy
+#| msgid "Replicated"
+msgid "Replace"
+msgstr "අනුරූ කරන ලද"
+
+#: templates/table/search/rows_zoom.phtml:16
+msgid "Additional search criteria"
+msgstr "අමතර සෙවීම් නිර්ණායක"
+
+#: templates/table/search/search_and_replace.phtml:3
+msgid "Replace with:"
+msgstr "වෙනුවට භාවිතා කරන්න:"
+
+#: templates/table/search/search_and_replace.phtml:22
+#, fuzzy
+#| msgid "as regular expression"
+msgid "Use regular expression"
+msgstr "regular expression ලෙස"
+
+#: templates/table/search/selection_form.phtml:12
+msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
+msgstr "තීර දෙකක් සඳහා \"උදාහරණයෙන් විමසුම\" ක් සිදු කරන්න (wildcard: \"%\")"
+
+#: templates/table/search/selection_form.phtml:34
+msgid "Do a \"query by example\" (wildcard: \"%\")"
+msgstr "\"උදාහරණයෙන් විමසුම\" ක් සිදු කරන්න (wildcard: \"%\")"
+
+#: templates/table/search/zoom_result_form.phtml:7
+msgid "Browse/Edit the points"
+msgstr "ලක්ෂ්‍ය පිරික්සීම/සංස්කරණය"
+
+#: templates/table/search/zoom_result_form.phtml:15
+msgid "How to use"
+msgstr "භාවිතා කරන අයුරු"
+
+#: templates/table/search/zoom_result_form.phtml:23
+msgid "Reset zoom"
+msgstr "සූමය ප්‍රතිසකසන්න"
+
+#: templates/table/secondary_tabs.phtml:14
+#, fuzzy
+#| msgid "Relation view"
+msgid "Relation view"
+msgstr "වගු සබඳතා දර්ශනය"
+
+#: templates/table/structure/actions_in_table_structure.phtml:14
+#, php-format
+msgid "A primary key has been added on %s."
+msgstr "%s ට ප්‍රාථමික මූලයක් එක් කරන ලදි."
+
+#: templates/table/structure/actions_in_table_structure.phtml:34
+#: templates/table/structure/actions_in_table_structure.phtml:54
+#: templates/table/structure/actions_in_table_structure.phtml:79
+#: templates/table/structure/actions_in_table_structure.phtml:101
+#, php-format
+msgid "An index has been added on %s."
+msgstr "%s සඳහා සූචියක් එක්කරන ලදි."
+
+#: templates/table/structure/actions_in_table_structure.phtml:130
+#: templates/table/structure/check_all_table_column.phtml:59
+msgid "Remove from central columns"
+msgstr "මධ්‍යම තීර වලින් ඉවත් කරන්න"
+
+#: templates/table/structure/actions_in_table_structure.phtml:138
+#: templates/table/structure/check_all_table_column.phtml:55
+msgid "Add to central columns"
+msgstr "මධ්‍යම තීර වලට එක් කරන්න"
+
+#: templates/table/structure/add_column.phtml:7
+#, php-format
+msgid "Add %s column(s)"
+msgstr "%s ක්ෂේත්‍ර(ය) එක් කරන්න"
+
+#: templates/table/structure/add_column.phtml:12
+#, fuzzy
+#| msgid "At Beginning of Table"
+msgid "at beginning of table"
+msgstr "වගුව මුලදී"
+
+#: templates/table/structure/display_structure.phtml:140 view_create.php:181
+msgid "Edit view"
+msgstr "දසුන සංස්කරණය කරන්න"
+
+#: templates/table/structure/display_table_stats.phtml:9
+msgid "Space usage"
+msgstr "අවකාශ භාවිතය"
+
+#: templates/table/structure/display_table_stats.phtml:32
+msgid "Effective"
+msgstr "එලදායී"
+
+#: templates/table/structure/move_columns_dialog.phtml:1
+#: templates/table/structure/optional_action_links.phtml:21
+msgid "Move columns"
+msgstr "තීර අනුපිළිවල සකසන්න"
+
+#: templates/table/structure/move_columns_dialog.phtml:2
+msgid "Move the columns by dragging them up and down."
+msgstr "ඉහළ පහළ ඇදීමෙන් තීර අනුපිළිවෙල සකසන්න."
+
+#: templates/table/structure/optional_action_links.phtml:9
+msgid "Propose table structure"
+msgstr "සැකිල්ලක් යෝජනා කරන්න"
+
+#: templates/table/structure/optional_action_links.phtml:24
+msgid "Improve table structure"
+msgstr "වගුවේ සැකිල්ල වැඩි දියුණු කරන්න"
+
+#: templates/table/structure/optional_action_links.phtml:30
+msgid "Track view"
+msgstr "දසුන අවධානයට ලක් කරන්න"
+
+#: templates/table/structure/row_stats_table.phtml:3
+msgid "Row statistics"
+msgstr "පේළි සංඛ්‍ය ලේඛන"
+
+#: templates/table/structure/row_stats_table.phtml:9
+msgid "static"
+msgstr "ස්ථිතික"
+
+#: templates/table/structure/row_stats_table.phtml:11
+msgid "dynamic"
+msgstr "ගතික"
+
+#: templates/table/structure/row_stats_table.phtml:22
+msgid "partitioned"
+msgstr "කොටස් කරන ලද"
+
+#: templates/table/structure/row_stats_table.phtml:54
+msgid "Row length"
+msgstr "පේළියේ දිග"
+
+#: templates/table/structure/row_stats_table.phtml:66
+msgid "Row size"
+msgstr "පේළියේ ප්‍රමාණය"
+
+#: templates/table/structure/row_stats_table.phtml:73
+msgid "Next autoindex"
+msgstr "මීළඟ ක්‍රමාංකය"
+
+#: templates/table/structure/table_structure_row.phtml:46
+#, php-format
+msgid "Column %s has been dropped."
+msgstr "%s තීරුව හලන ලදි."
+
 #: themes.php:17 themes.php:22
 msgid "Theme"
 msgstr "තේමාව"
@@ -17110,6 +17133,11 @@ msgstr ""
 msgid "concurrent_insert is set to 0"
 msgstr "concurrent_insert ශුන්‍යයට සිටුවා ඇත"
 
+#, fuzzy
+#~| msgid "Read misses"
+#~ msgid "Read as multibytes"
+#~ msgstr "කියවීම් අතෑරුම්"
+
 #~ msgid "Relational display column"
 #~ msgstr "සබැඳි දර්ශන තීරය"
 
diff --git a/po/sk.po b/po/sk.po
index 19e660bd69..1550b13639 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 4.5.0-dev\n"
 "Report-Msgid-Bugs-To: developers@phpmyadmin.net\n"
-"POT-Creation-Date: 2015-08-08 13:53-0400\n"
+"POT-Creation-Date: 2015-08-12 08:10-0400\n"
 "PO-Revision-Date: 2015-07-26 08:26+0200\n"
 "Last-Translator: Martin Lacina <martin@whistler.sk>\n"
 "Language-Team: Slovak <https://hosted.weblate.org/projects/phpmyadmin/master/"
@@ -53,7 +53,7 @@ msgid "Table comments:"
 msgstr "Komentáre k tabuľke:"
 
 #: db_datadict.php:104 libraries/Index.class.php:699
-#: libraries/insert_edit.lib.php:1567
+#: libraries/insert_edit.lib.php:1565
 #: libraries/navigation/Nodes/Node_Column.class.php:30
 #: libraries/plugins/export/ExportHtmlword.class.php:280
 #: libraries/plugins/export/ExportHtmlword.class.php:375
@@ -67,13 +67,14 @@ msgstr "Komentáre k tabuľke:"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1023
 #: libraries/tracking.lib.php:879 libraries/tracking.lib.php:975
 #: templates/columns_definitions/column_name.phtml:18
-#: templates/index_form.phtml:124 templates/table/table_header.phtml:6
-#: templates/table/zoom_result_form.phtml:33
-#: templates/tbl_relation/common_form.phtml:10
-#: templates/tbl_relation/common_form.phtml:43
-#: templates/tbl_relation/foreign_key_row.phtml:194
-#: templates/tbl_relation/foreign_key_row.phtml:206
-#: templates/tbl_relation/internal_relational_row.phtml:71
+#: templates/table/index_form.phtml:124
+#: templates/table/relation/common_form.phtml:10
+#: templates/table/relation/common_form.phtml:43
+#: templates/table/relation/foreign_key_row.phtml:194
+#: templates/table/relation/foreign_key_row.phtml:206
+#: templates/table/relation/internal_relational_row.phtml:71
+#: templates/table/search/table_header.phtml:6
+#: templates/table/search/zoom_result_form.phtml:33
 msgid "Column"
 msgstr "Stĺpec"
 
@@ -91,21 +92,21 @@ msgstr "Stĺpec"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1001
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1024
 #: libraries/rte/rte_list.lib.php:75 libraries/rte/rte_list.lib.php:103
-#: libraries/rte/rte_routines.lib.php:802
-#: libraries/rte/rte_routines.lib.php:831
-#: libraries/rte/rte_routines.lib.php:1493
+#: libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_routines.lib.php:922
+#: libraries/rte/rte_routines.lib.php:1584
 #: libraries/server_privileges.lib.php:2369 libraries/tracking.lib.php:880
 #: libraries/tracking.lib.php:972
 #: templates/columns_definitions/table_fields_definitions.phtml:11
-#: templates/structure/table_header.phtml:48
-#: templates/structure/table_structure_header.phtml:6
-#: templates/table/table_header.phtml:7
+#: templates/database/structure/table_header.phtml:48
+#: templates/table/search/table_header.phtml:7
+#: templates/table/structure/table_structure_header.phtml:6
 msgid "Type"
 msgstr "Typ"
 
 #: db_datadict.php:106 libraries/Index.class.php:702
 #: libraries/central_columns.lib.php:708
-#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1576
+#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1574
 #: libraries/plugins/export/ExportHtmlword.class.php:286
 #: libraries/plugins/export/ExportHtmlword.class.php:381
 #: libraries/plugins/export/ExportLatex.class.php:509
@@ -118,8 +119,8 @@ msgstr "Typ"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1026
 #: libraries/tracking.lib.php:882 libraries/tracking.lib.php:978
 #: templates/columns_definitions/table_fields_definitions.phtml:39
-#: templates/structure/table_structure_header.phtml:9
-#: templates/table/zoom_result_form.phtml:34
+#: templates/table/search/zoom_result_form.phtml:34
+#: templates/table/structure/table_structure_header.phtml:9
 msgid "Null"
 msgstr "Nulový"
 
@@ -137,8 +138,8 @@ msgstr "Nulový"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1027
 #: libraries/replication_gui.lib.php:153 libraries/tracking.lib.php:883
 #: templates/columns_definitions/table_fields_definitions.phtml:25
-#: templates/structure/body_for_table_summary.phtml:55
-#: templates/structure/table_structure_header.phtml:10
+#: templates/database/structure/body_for_table_summary.phtml:55
+#: templates/table/structure/table_structure_header.phtml:10
 msgid "Default"
 msgstr "Predvolené"
 
@@ -166,19 +167,19 @@ msgid "Comments"
 msgstr "Komentáre"
 
 #: db_datadict.php:146
-#: libraries/controllers/StructureController.class.php:1960
-#: libraries/controllers/StructureController.class.php:1965
+#: libraries/controllers/TableStructureController.class.php:951
+#: libraries/controllers/TableStructureController.class.php:956
 #: libraries/tracking.lib.php:922
 #: templates/columns_definitions/column_indexes.phtml:6
-#: templates/structure/check_all_table_column.phtml:22
-#: templates/structure/display_structure.phtml:74
+#: templates/table/structure/check_all_table_column.phtml:22
+#: templates/table/structure/display_structure.phtml:74
 msgid "Primary"
 msgstr "Primárny"
 
 #: db_datadict.php:156 js/messages.php:317 libraries/Index.class.php:567
 #: libraries/Index.class.php:606 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261 libraries/mult_submits.lib.php:403
+#: libraries/config/FormDisplay.tpl.php:272 libraries/mult_submits.lib.php:403
 #: libraries/mult_submits.lib.php:417
 #: libraries/plugins/export/ExportHtmlword.class.php:630
 #: libraries/plugins/export/ExportLatex.class.php:589
@@ -194,20 +195,20 @@ msgstr "Primárny"
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1010 libraries/tracking.lib.php:1015
 #: prefs_manage.php:140 templates/prefs_autoload.phtml:15
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "No"
 msgstr "Nie"
 
 #: db_datadict.php:156 js/messages.php:443 libraries/Index.class.php:568
 #: libraries/Index.class.php:605 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261
-#: libraries/controllers/StructureController.class.php:1344
-#: libraries/controllers/StructureController.class.php:2223
-#: libraries/controllers/StructureController.class.php:2232
-#: libraries/controllers/StructureController.class.php:2237
-#: libraries/controllers/StructureController.class.php:2242
-#: libraries/controllers/StructureController.class.php:2247
+#: libraries/config/FormDisplay.tpl.php:272
+#: libraries/controllers/TableStructureController.class.php:539
+#: libraries/controllers/TableStructureController.class.php:1201
+#: libraries/controllers/TableStructureController.class.php:1210
+#: libraries/controllers/TableStructureController.class.php:1215
+#: libraries/controllers/TableStructureController.class.php:1220
+#: libraries/controllers/TableStructureController.class.php:1225
 #: libraries/mult_submits.inc.php:82 libraries/mult_submits.inc.php:178
 #: libraries/mult_submits.lib.php:339 libraries/mult_submits.lib.php:372
 #: libraries/mult_submits.lib.php:401 libraries/mult_submits.lib.php:415
@@ -216,8 +217,8 @@ msgstr "Nie"
 #: libraries/plugins/export/ExportOdt.class.php:756
 #: libraries/plugins/export/ExportTexytext.class.php:567
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1077
-#: libraries/server_databases.lib.php:464
-#: libraries/server_databases.lib.php:474
+#: libraries/server_databases.lib.php:475
+#: libraries/server_databases.lib.php:485
 #: libraries/server_privileges.lib.php:2546
 #: libraries/server_privileges.lib.php:2727
 #: libraries/server_privileges.lib.php:2748
@@ -227,7 +228,7 @@ msgstr "Nie"
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1008 libraries/tracking.lib.php:1013
 #: prefs_manage.php:138 templates/prefs_autoload.phtml:14
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "Yes"
 msgstr "Áno"
 
@@ -237,7 +238,7 @@ msgstr "Zobraziť dump (schému) databázy"
 
 #: db_export.php:37 db_tracking.php:90 export.php:382
 #: libraries/DBQbe.class.php:326
-#: libraries/controllers/StructureController.class.php:231
+#: libraries/controllers/DatabaseStructureController.class.php:170
 #: libraries/navigation/NavigationTree.class.php:897
 msgid "No tables found in database."
 msgstr "Neboli nájdené žiadne tabuľky v tejto databáze."
@@ -248,14 +249,14 @@ msgstr "Neboli nájdené žiadne tabuľky v tejto databáze."
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:26
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:120
-#: templates/structure/show_create.phtml:18
+#: templates/database/structure/show_create.phtml:18
 msgid "Tables"
 msgstr "Tabuľky"
 
 #: db_export.php:52 libraries/Menu.class.php:317 libraries/Menu.class.php:425
-#: libraries/Util.class.php:3333 libraries/Util.class.php:3343
-#: libraries/Util.class.php:3349 libraries/Util.class.php:3629
-#: libraries/Util.class.php:4327 libraries/Util.class.php:4344
+#: libraries/Util.class.php:3339 libraries/Util.class.php:3349
+#: libraries/Util.class.php:3355 libraries/Util.class.php:3635
+#: libraries/Util.class.php:4333 libraries/Util.class.php:4350
 #: libraries/central_columns.lib.php:728 libraries/config.values.php:39
 #: libraries/config.values.php:47 libraries/config.values.php:109
 #: libraries/config.values.php:115 libraries/config/setup.forms.php:323
@@ -269,7 +270,7 @@ msgstr "Tabuľky"
 #: libraries/navigation/Nodes/Node_Table.class.php:283
 #: libraries/server_privileges.lib.php:1141 libraries/tracking.lib.php:874
 #: templates/columns_definitions/table_fields_definitions.phtml:3
-#: templates/designer/table_list.phtml:28
+#: templates/database/designer/table_list.phtml:28
 msgid "Structure"
 msgstr "Štruktúra"
 
@@ -281,7 +282,7 @@ msgstr "Štruktúra"
 #: libraries/config/user_preferences.forms.php:292
 #: libraries/config/user_preferences.forms.php:297
 #: libraries/server_privileges.lib.php:1140
-#: templates/structure/display_table_stats.phtml:12
+#: templates/table/structure/display_table_stats.phtml:12
 msgid "Data"
 msgstr "Dáta"
 
@@ -355,10 +356,10 @@ msgstr "Sledované tabuľky"
 #: libraries/server_privileges.lib.php:2908
 #: libraries/server_privileges.lib.php:3145
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4346
-#: templates/structure/table_header.phtml:21
-#: templates/tbl_relation/foreign_key_row.phtml:176
-#: templates/tbl_relation/internal_relational_row.phtml:63
+#: libraries/server_privileges.lib.php:4372
+#: templates/database/structure/table_header.phtml:21
+#: templates/table/relation/foreign_key_row.phtml:176
+#: templates/table/relation/internal_relational_row.phtml:63
 msgid "Table"
 msgstr "Tabuľka"
 
@@ -375,7 +376,7 @@ msgid "Updated"
 msgstr "Aktualizované"
 
 #: db_tracking.php:130 js/messages.php:243 libraries/Menu.class.php:552
-#: libraries/Util.class.php:4314 libraries/config.values.php:104
+#: libraries/Util.class.php:4320 libraries/config.values.php:104
 #: libraries/rte/rte_events.lib.php:393 libraries/rte/rte_list.lib.php:101
 #: libraries/server_status_processes.lib.php:92 libraries/tracking.lib.php:279
 msgid "Status"
@@ -384,14 +385,15 @@ msgstr "Stav"
 #: db_tracking.php:131 db_tracking.php:290 libraries/Index.class.php:693
 #: libraries/central_columns.lib.php:687 libraries/rte/rte_list.lib.php:74
 #: libraries/rte/rte_list.lib.php:89 libraries/rte/rte_list.lib.php:102
-#: libraries/server_databases.lib.php:398
+#: libraries/server_databases.lib.php:409
 #: libraries/server_privileges.lib.php:2372
 #: libraries/server_privileges.lib.php:3166
 #: libraries/server_privileges.lib.php:3342
 #: libraries/server_user_groups.lib.php:82
 #: libraries/server_variables.lib.php:189 libraries/tracking.lib.php:280
-#: libraries/tracking.lib.php:793 templates/structure/table_header.phtml:30
-#: templates/structure/table_structure_header.phtml:23
+#: libraries/tracking.lib.php:793
+#: templates/database/structure/table_header.phtml:30
+#: templates/table/structure/table_structure_header.phtml:23
 msgid "Action"
 msgstr "Akcia"
 
@@ -433,7 +435,7 @@ msgid "Untracked tables"
 msgstr "Nesledované tabuľky"
 
 #: db_tracking.php:305 db_tracking.php:336
-#: templates/structure/optional_action_links.phtml:17
+#: templates/table/structure/optional_action_links.phtml:17
 msgid "Track table"
 msgstr "Sledovať tabuľku"
 
@@ -487,7 +489,7 @@ msgid "Value for the column \"%s\""
 msgstr "Hodnota pre pole \"%s\""
 
 #: gis_data_editor.php:146
-#: templates/gis_visualization/gis_visualization.phtml:37
+#: templates/table/gis_visualization/gis_visualization.phtml:37
 msgid "Use OpenStreetMaps as Base Layer"
 msgstr "Použíť OpenStreetMap ako základnú vrstvu"
 
@@ -567,35 +569,35 @@ msgstr "Pridať geometriu"
 #: libraries/display_change_password.lib.php:162
 #: libraries/display_export.lib.php:402 libraries/display_export.lib.php:408
 #: libraries/display_import.lib.php:392 libraries/index.lib.php:44
-#: libraries/insert_edit.lib.php:1546 libraries/insert_edit.lib.php:1583
+#: libraries/insert_edit.lib.php:1544 libraries/insert_edit.lib.php:1581
 #: libraries/normalization.lib.php:165 libraries/normalization.lib.php:821
 #: libraries/operations.lib.php:38 libraries/operations.lib.php:108
 #: libraries/operations.lib.php:263 libraries/operations.lib.php:306
 #: libraries/operations.lib.php:801 libraries/operations.lib.php:874
 #: libraries/operations.lib.php:923 libraries/operations.lib.php:1337
 #: libraries/operations.lib.php:1658
-#: libraries/plugins/auth/AuthenticationCookie.class.php:244
+#: libraries/plugins/auth/AuthenticationCookie.class.php:232
 #: libraries/replication_gui.lib.php:122 libraries/replication_gui.lib.php:161
 #: libraries/replication_gui.lib.php:324 libraries/replication_gui.lib.php:461
 #: libraries/replication_gui.lib.php:906 libraries/rte/rte_events.lib.php:509
-#: libraries/rte/rte_routines.lib.php:969
-#: libraries/rte/rte_routines.lib.php:1581
+#: libraries/rte/rte_routines.lib.php:1060
+#: libraries/rte/rte_routines.lib.php:1672
 #: libraries/rte/rte_triggers.lib.php:396 libraries/server_bin_log.lib.php:61
 #: libraries/server_privileges.lib.php:705
 #: libraries/server_privileges.lib.php:2106
 #: libraries/server_privileges.lib.php:2872
 #: libraries/server_privileges.lib.php:3553
-#: libraries/server_privileges.lib.php:4627
+#: libraries/server_privileges.lib.php:4653
 #: libraries/server_user_groups.lib.php:285
 #: libraries/sql_query_form.lib.php:369 libraries/sql_query_form.lib.php:429
 #: libraries/tracking.lib.php:533 libraries/tracking.lib.php:653
 #: prefs_manage.php:277 prefs_manage.php:355
 #: templates/columns_definitions/column_definitions_form.phtml:59
-#: templates/header_location.phtml:17 templates/index_form.phtml:238
+#: templates/database/create_table.phtml:21 templates/header_location.phtml:28
 #: templates/startAndNumberOfRowsPanel.phtml:14
-#: templates/structure/add_column.phtml:25
-#: templates/table/create_table.phtml:21
-#: templates/table/selection_form.phtml:75 view_create.php:275
+#: templates/table/index_form.phtml:238
+#: templates/table/search/selection_form.phtml:75
+#: templates/table/structure/add_column.phtml:25 view_create.php:275
 #: view_operations.php:106
 msgid "Go"
 msgstr "Vykonaj"
@@ -686,7 +688,7 @@ msgstr ""
 "Nebolo možné načítať importovacie pluginy, skontrolujte prosím vašu "
 "inštaláciu!"
 
-#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1466
+#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1460
 #, php-format
 msgid "Bookmark %s has been created."
 msgstr "Príkaz %s bol zaradený medzi obľúbené."
@@ -725,11 +727,11 @@ msgstr "Nemôžem načítať priebeh importu."
 msgid "Back"
 msgstr "Späť"
 
-#: index.php:148 libraries/Footer.class.php:70
+#: index.php:149 libraries/Footer.class.php:70
 msgid "phpMyAdmin Demo Server"
 msgstr "phpMyAdmin Demo Server"
 
-#: index.php:152
+#: index.php:153
 #, php-format
 msgid ""
 "You are using the demo server. You can do anything here, but please do not "
@@ -739,110 +741,110 @@ msgstr ""
 "Používate demo server. Môžete robiť čokoľvek, ale prosíme, nemeňte "
 "užívateľov root, debian-sys-maint a pma. Viac informácii nájdete na %s."
 
-#: index.php:162
+#: index.php:163
 msgid "General Settings"
 msgstr "Všeobecné nastavenia"
 
-#: index.php:190 libraries/display_change_password.lib.php:50
+#: index.php:191 libraries/display_change_password.lib.php:50
 #: libraries/display_change_password.lib.php:53 user_password.php:247
 msgid "Change password"
 msgstr "Zmeniť heslo"
 
-#: index.php:206
+#: index.php:207
 msgid "Server connection collation"
 msgstr "Znaková sada pre pripojenie k serveru"
 
-#: index.php:228
+#: index.php:229
 msgid "Appearance Settings"
 msgstr "Nastavenia vzhľadu"
 
-#: index.php:258 prefs_manage.php:285
+#: index.php:259 prefs_manage.php:285
 msgid "More settings"
 msgstr "Ďalšie nastavenia"
 
-#: index.php:279
+#: index.php:280
 msgid "Database server"
 msgstr "Databázový server"
 
-#: index.php:282 libraries/plugins/auth/AuthenticationCookie.class.php:181
+#: index.php:283 libraries/plugins/auth/AuthenticationCookie.class.php:169
 msgid "Server:"
 msgstr "Server:"
 
-#: index.php:286
+#: index.php:287
 msgid "Server type:"
 msgstr "Typ servera:"
 
-#: index.php:290 libraries/plugins/export/ExportLatex.class.php:212
+#: index.php:291 libraries/plugins/export/ExportLatex.class.php:212
 #: libraries/plugins/export/ExportSql.class.php:687
 #: libraries/plugins/export/ExportXml.class.php:189
 msgid "Server version:"
 msgstr "Verzia serveru:"
 
-#: index.php:296
+#: index.php:297
 msgid "Protocol version:"
 msgstr "Verzia protokolu:"
 
-#: index.php:300
+#: index.php:301
 msgid "User:"
 msgstr "Užívateľ:"
 
-#: index.php:305
+#: index.php:306
 msgid "Server charset:"
 msgstr "Znaková sada servera:"
 
-#: index.php:320
+#: index.php:321
 msgid "Web server"
 msgstr "Webový server"
 
-#: index.php:331
+#: index.php:332
 msgid "Database client version:"
 msgstr "Verzia databázového klienta:"
 
-#: index.php:335
+#: index.php:336
 msgid "PHP extension:"
 msgstr "Rozšírenie PHP:"
 
-#: index.php:349
+#: index.php:350
 msgid "PHP version:"
 msgstr "Verzia PHP:"
 
-#: index.php:360
+#: index.php:361
 msgid "Show PHP information"
 msgstr "Zobraziť informácie o PHP"
 
-#: index.php:383
+#: index.php:384
 msgid "Version information:"
 msgstr "Informácie o verzii:"
 
-#: index.php:392 libraries/Util.class.php:432 libraries/Util.class.php:495
-#: libraries/config/FormDisplay.tpl.php:151
+#: index.php:393 libraries/Util.class.php:432 libraries/Util.class.php:495
+#: libraries/config/FormDisplay.tpl.php:162
 #: libraries/display_export.lib.php:577 libraries/engines/pbxt.lib.php:162
 #: libraries/navigation/NavigationHeader.class.php:196
 #: libraries/server_variables.lib.php:160
 msgid "Documentation"
 msgstr "Dokumentácia"
 
-#: index.php:399
+#: index.php:400
 msgid "Wiki"
 msgstr "Wiki"
 
-#: index.php:408
+#: index.php:409
 msgid "Official Homepage"
 msgstr "Oficiálne stránky phpMyAdmin"
 
-#: index.php:415
+#: index.php:416
 msgid "Contribute"
 msgstr "Prispejte"
 
-#: index.php:422
+#: index.php:423
 msgid "Get support"
 msgstr "Získať podporu"
 
-#: index.php:429
+#: index.php:430
 msgid "List of changes"
 msgstr "Zoznam zmien"
 
-#: index.php:451
+#: index.php:452
 msgid ""
 "You are connected as 'root' with no password, which corresponds to the "
 "default MySQL privileged account. Your MySQL server is running with this "
@@ -854,7 +856,7 @@ msgstr ""
 "zabezpečený proti napadnutiu, táto bezpečnostná chyba by mala byť urýchlene "
 "odstránená nastavením hesla pre užívateľa 'root'."
 
-#: index.php:468
+#: index.php:469
 msgid ""
 "You have enabled mbstring.func_overload in your PHP configuration. This "
 "option is incompatible with phpMyAdmin and might cause some data to be "
@@ -863,7 +865,7 @@ msgstr ""
 "V nastavení PHP je aktívna funkcia mbstring.func_overload, ktorá nie je "
 "kompatibilná s phpMyAdmin-om a môže spôsobiť stratu dát!"
 
-#: index.php:483
+#: index.php:484
 msgid ""
 "The mbstring PHP extension was not found and you seem to be using a "
 "multibyte charset. Without the mbstring extension phpMyAdmin is unable to "
@@ -874,7 +876,7 @@ msgstr ""
 "rozdeľovať reťazce kódované v týchto znakových sadách a môže to viesť k "
 "nečakaným výsledkom."
 
-#: index.php:500
+#: index.php:501
 msgid ""
 "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini."
 "session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower than "
@@ -887,7 +889,7 @@ msgstr ""
 "($cfg['LoginCookieValidity']). Kvôli tomu môže vaše prihlásenie vypršať skôr "
 "ako je nastavené v konfigurácii phpMyAdmina."
 
-#: index.php:519
+#: index.php:520
 msgid ""
 "Login cookie store is lower than cookie validity configured in phpMyAdmin, "
 "because of this, your login will expire sooner than configured in phpMyAdmin."
@@ -895,13 +897,13 @@ msgstr ""
 "Životnosť cookie je nižšia ako je nastavené v phpMyAdmin. Kvôli tomu vaše "
 "prihlásenie vyprší skôr ako je nastavené v konfigurácii phpMyAdmin."
 
-#: index.php:535
+#: index.php:536
 msgid "The configuration file now needs a secret passphrase (blowfish_secret)."
 msgstr ""
 "Nastavte prosím kľúč pre šifrovanie cookies v konfiguračnom súbore "
 "(blowfish_secret)."
 
-#: index.php:548
+#: index.php:549
 msgid ""
 "Directory [code]config[/code], which is used by the setup script, still "
 "exists in your phpMyAdmin directory. It is strongly recommended to remove it "
@@ -913,7 +915,7 @@ msgstr ""
 "nakonfigurovaný. V opačnom prípade bezpečnosť Vášho servera môže byť "
 "narušená neautorizovanými užívateľmi, ktorí stiahnu Vašu konfiguráciu."
 
-#: index.php:564
+#: index.php:565
 #, php-format
 msgid ""
 "The phpMyAdmin configuration storage is not completely configured, some "
@@ -922,12 +924,12 @@ msgstr ""
 "Miesto uloženia phpMyAdmin konfigurácie nie je úplne nastavené, niektoré "
 "rozšírené vlastnosti boli vypnuté. Ak chcete zistiť prečo, kliknite %ssem%s. "
 
-#: index.php:571
+#: index.php:572
 msgid ""
 "Or alternately go to 'Operations' tab of any database to set it up there."
 msgstr "Voliteľne môžete ísť do záložky 'Operácie' a nastaviť to tam."
 
-#: index.php:620
+#: index.php:621
 #, php-format
 msgid ""
 "Your PHP MySQL library version %s differs from your MySQL server version %s. "
@@ -936,7 +938,7 @@ msgstr ""
 "Verzia Vašej PHP MySQL knižnice %s je rozdielna od MySQL server verzie %s. "
 "Toto môže spôsobiť nepredvídateľné správanie."
 
-#: index.php:648
+#: index.php:649
 #, php-format
 msgid ""
 "Server running with Suhosin. Please refer to %sdocumentation%s for possible "
@@ -1080,8 +1082,8 @@ msgstr ""
 msgid "Save & Close"
 msgstr "Uložiť & Zavrieť"
 
-#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:404
-#: libraries/insert_edit.lib.php:1550 prefs_manage.php:361
+#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:415
+#: libraries/insert_edit.lib.php:1548 prefs_manage.php:361
 #: prefs_manage.php:372
 msgid "Reset"
 msgstr "Vynulovať"
@@ -1114,7 +1116,7 @@ msgstr "Pridať index"
 msgid "Edit Index"
 msgstr "Upraviť index"
 
-#: js/messages.php:99 templates/index_form.phtml:232
+#: js/messages.php:99 templates/table/index_form.phtml:232
 #, php-format
 msgid "Add %s column(s) to index"
 msgstr "Pridať %s polí do indexu"
@@ -1135,13 +1137,14 @@ msgstr "Zložený z:"
 msgid "Please select column(s) for the index."
 msgstr "Vyberte stĺpce pre index."
 
-#: js/messages.php:106 templates/structure/add_column.phtml:1
+#: js/messages.php:106 templates/table/structure/add_column.phtml:1
 msgid "You have to add at least one column."
 msgstr "Musíte pridať aspoň jeden stĺpec."
 
-#: js/messages.php:109 libraries/insert_edit.lib.php:1548
+#: js/messages.php:109 libraries/insert_edit.lib.php:1546
 #: templates/columns_definitions/column_definitions_form.phtml:162
-#: templates/index_form.phtml:237 templates/tbl_relation/common_form.phtml:106
+#: templates/table/index_form.phtml:237
+#: templates/table/relation/common_form.phtml:106
 msgid "Preview SQL"
 msgstr "Ukážka SQL"
 
@@ -1158,7 +1161,7 @@ msgid "SQL query:"
 msgstr "SQL dotaz:"
 
 #. l10n: Default label for the y-Axis of Charts
-#: js/messages.php:118 templates/tbl_chart.phtml:109
+#: js/messages.php:118 templates/table/chart/tbl_chart.phtml:109
 msgid "Y Values"
 msgstr "Y Hodnoty"
 
@@ -1312,7 +1315,7 @@ msgstr "Odoslaných bajtov"
 msgid "Bytes received"
 msgstr "Prijatých bajtov"
 
-#: js/messages.php:169 libraries/server_status.lib.php:226
+#: js/messages.php:169 libraries/server_status.lib.php:235
 msgid "Connections"
 msgstr "Spojenia"
 
@@ -1369,12 +1372,12 @@ msgstr "%d tabuliek"
 msgid "Questions"
 msgstr "Dopyty"
 
-#: js/messages.php:184 libraries/server_status.lib.php:134
+#: js/messages.php:184 libraries/server_status.lib.php:143
 msgid "Traffic"
 msgstr "Vyťaženie"
 
 #: js/messages.php:185 libraries/Menu.class.php:586
-#: libraries/Util.class.php:4318 libraries/server_status_monitor.lib.php:257
+#: libraries/Util.class.php:4324 libraries/server_status_monitor.lib.php:257
 msgid "Settings"
 msgstr "Nastavenia"
 
@@ -1394,8 +1397,9 @@ msgstr "Pridajte prosím aspoň jednu hodnotu do série!"
 #: libraries/server_status_monitor.lib.php:236
 #: libraries/server_status_processes.lib.php:308
 #: templates/columns_definitions/transformation.phtml:4
-#: templates/designer/options_panel.phtml:178
-#: templates/table/options_zoom.phtml:12 templates/table/rows_zoom.phtml:26
+#: templates/database/designer/options_panel.phtml:178
+#: templates/table/search/options_zoom.phtml:12
+#: templates/table/search/rows_zoom.phtml:26
 msgid "None"
 msgstr "Žiadny"
 
@@ -1686,8 +1690,8 @@ msgstr ""
 
 #: js/messages.php:270 libraries/Menu.class.php:352
 #: libraries/Menu.class.php:455 libraries/Menu.class.php:582
-#: libraries/Util.class.php:4317 libraries/Util.class.php:4332
-#: libraries/Util.class.php:4349 libraries/config/messages.inc.php:258
+#: libraries/Util.class.php:4323 libraries/Util.class.php:4338
+#: libraries/Util.class.php:4355 libraries/config/messages.inc.php:258
 #: libraries/display_import.lib.php:105
 #: libraries/server_status_monitor.lib.php:318 prefs_manage.php:238
 #: setup/frames/menu.inc.php:26
@@ -1747,13 +1751,13 @@ msgid "Formatting SQL..."
 msgstr "Formátujem SQL..."
 
 #: js/messages.php:293 libraries/server_variables.lib.php:157
-#: templates/designer/aggregate_query_panel.phtml:63
-#: templates/designer/delete_relation_panel.phtml:28
-#: templates/designer/having_query_panel.phtml:117
-#: templates/designer/new_relation_panel.phtml:88
-#: templates/designer/options_panel.phtml:253
-#: templates/designer/rename_to_panel.phtml:45
-#: templates/designer/where_query_panel.phtml:83
+#: templates/database/designer/aggregate_query_panel.phtml:63
+#: templates/database/designer/delete_relation_panel.phtml:28
+#: templates/database/designer/having_query_panel.phtml:117
+#: templates/database/designer/new_relation_panel.phtml:88
+#: templates/database/designer/options_panel.phtml:253
+#: templates/database/designer/rename_to_panel.phtml:45
+#: templates/database/designer/where_query_panel.phtml:83
 msgid "Cancel"
 msgstr "Zrušiť"
 
@@ -1761,7 +1765,7 @@ msgstr "Zrušiť"
 msgid "Page-related settings"
 msgstr "Nastavenia stránky"
 
-#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:402
+#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:413
 msgid "Apply"
 msgstr "Použiť"
 
@@ -1796,8 +1800,8 @@ msgstr "Číslo chyby: %s"
 msgid "Error text: %s"
 msgstr "Text chyby: %s"
 
-#: js/messages.php:307 libraries/db_common.inc.php:68
-#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:450
+#: js/messages.php:307 libraries/db_common.inc.php:69
+#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:461
 msgid "No databases selected."
 msgstr "Neboli vybrané žiadne databázy."
 
@@ -1809,12 +1813,13 @@ msgstr "Odstraňujem stĺpce"
 msgid "Adding Primary Key"
 msgstr "Pridavam primarny kľúč"
 
-#: js/messages.php:310 templates/designer/aggregate_query_panel.phtml:59
-#: templates/designer/having_query_panel.phtml:113
-#: templates/designer/new_relation_panel.phtml:87
-#: templates/designer/options_panel.phtml:252
-#: templates/designer/rename_to_panel.phtml:41
-#: templates/designer/where_query_panel.phtml:82
+#: js/messages.php:310
+#: templates/database/designer/aggregate_query_panel.phtml:59
+#: templates/database/designer/having_query_panel.phtml:113
+#: templates/database/designer/new_relation_panel.phtml:87
+#: templates/database/designer/options_panel.phtml:252
+#: templates/database/designer/rename_to_panel.phtml:41
+#: templates/database/designer/where_query_panel.phtml:82
 msgid "OK"
 msgstr "OK"
 
@@ -1834,7 +1839,7 @@ msgstr "Kopírujem databázu"
 msgid "Changing Charset"
 msgstr "Mením znakovú sadu"
 
-#: js/messages.php:320 libraries/Util.class.php:3217
+#: js/messages.php:320 libraries/Util.class.php:3223
 msgid "Enable foreign key checks"
 msgstr "Povoliť kontrolu cudzích kľúčov"
 
@@ -1869,20 +1874,21 @@ msgstr "Definícia uloženej funkcie musí obsahovať príkaz RETURN!"
 #: js/messages.php:334 libraries/DisplayResults.class.php:4834
 #: libraries/DisplayResults.class.php:5092 libraries/Menu.class.php:344
 #: libraries/Menu.class.php:446 libraries/Menu.class.php:578
-#: libraries/Util.class.php:3636 libraries/Util.class.php:3637
-#: libraries/Util.class.php:4316 libraries/Util.class.php:4331
-#: libraries/Util.class.php:4348 libraries/config/messages.inc.php:252
+#: libraries/Util.class.php:3642 libraries/Util.class.php:3643
+#: libraries/Util.class.php:4322 libraries/Util.class.php:4337
+#: libraries/Util.class.php:4354 libraries/config/messages.inc.php:252
 #: libraries/display_export.lib.php:173 libraries/rte/rte_list.lib.php:146
 #: libraries/server_privileges.lib.php:2211
 #: libraries/server_privileges.lib.php:2290
 #: libraries/server_privileges.lib.php:2632
 #: libraries/server_privileges.lib.php:3356
 #: libraries/server_status_monitor.lib.php:322 prefs_manage.php:303
-#: setup/frames/menu.inc.php:27 templates/structure/check_all_tables.phtml:11
+#: setup/frames/menu.inc.php:27
+#: templates/database/structure/check_all_tables.phtml:11
 msgid "Export"
 msgstr "Exportovať"
 
-#: js/messages.php:337 libraries/rte/rte_routines.lib.php:652
+#: js/messages.php:337 libraries/rte/rte_routines.lib.php:743
 msgid "ENUM/SET editor"
 msgstr "Upraviť ENUM/SET"
 
@@ -1922,7 +1928,7 @@ msgstr "Zobrazit vyhľadávacie pole"
 #: libraries/Console.class.php:214 libraries/DisplayResults.class.php:3474
 #: libraries/DisplayResults.class.php:4818 libraries/Index.class.php:723
 #: libraries/Util.class.php:706 libraries/Util.class.php:1202
-#: libraries/Util.class.php:3634 libraries/Util.class.php:3635
+#: libraries/Util.class.php:3640 libraries/Util.class.php:3641
 #: libraries/central_columns.lib.php:851
 #: libraries/central_columns.lib.php:1193
 #: libraries/config/messages.inc.php:892
@@ -1940,7 +1946,7 @@ msgstr "Upraviť"
 #: libraries/server_user_groups.lib.php:129
 #: libraries/sql_query_form.lib.php:416 libraries/tracking.lib.php:477
 #: setup/frames/index.inc.php:183 setup/frames/index.inc.php:291
-#: templates/designer/delete_relation_panel.phtml:27
+#: templates/database/designer/delete_relation_panel.phtml:27
 msgid "Delete"
 msgstr "Zmazať"
 
@@ -2107,11 +2113,11 @@ msgid "No dependencies selected!"
 msgstr "Neboli vybrané žiadne závislosti!"
 
 #: js/messages.php:394 libraries/central_columns.lib.php:1214
-#: libraries/insert_edit.lib.php:1458 libraries/server_variables.lib.php:155
+#: libraries/insert_edit.lib.php:1456 libraries/server_variables.lib.php:155
 #: setup/frames/config.inc.php:42 setup/frames/index.inc.php:279
 #: templates/columns_definitions/column_definitions_form.phtml:165
-#: templates/gis_visualization/gis_visualization.phtml:48
-#: templates/tbl_relation/common_form.phtml:107
+#: templates/table/gis_visualization/gis_visualization.phtml:48
+#: templates/table/relation/common_form.phtml:107
 msgid "Save"
 msgstr "Uložiť"
 
@@ -2188,8 +2194,8 @@ msgid "Data point content"
 msgstr "Obsah datového bodu"
 
 #: js/messages.php:430 js/messages.php:562 js/messages.php:579
-#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2573
-#: templates/index_form.phtml:154 templates/index_form.phtml:194
+#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2571
+#: templates/table/index_form.phtml:154 templates/table/index_form.phtml:194
 msgid "Ignore"
 msgstr "Ignorovať"
 
@@ -2250,8 +2256,8 @@ msgstr "Zvoliť cudzí kľúč"
 msgid "Please select the primary key or a unique key!"
 msgstr "Zvoľte, prosím, primárny alebo unikátny kľúč!"
 
-#: js/messages.php:457 templates/designer/side_menu.phtml:91
-#: templates/designer/side_menu.phtml:94
+#: js/messages.php:457 templates/database/designer/side_menu.phtml:91
+#: templates/database/designer/side_menu.phtml:94
 msgid "Choose column to display"
 msgstr "Zvoľte, ktoré polia zobraziť"
 
@@ -2267,18 +2273,18 @@ msgstr ""
 msgid "Page name"
 msgstr "Názov stránky"
 
-#: js/messages.php:463 templates/designer/side_menu.phtml:56
-#: templates/designer/side_menu.phtml:59
+#: js/messages.php:463 templates/database/designer/side_menu.phtml:56
+#: templates/database/designer/side_menu.phtml:59
 msgid "Save page"
 msgstr "Uložiť stránku"
 
-#: js/messages.php:464 templates/designer/side_menu.phtml:63
-#: templates/designer/side_menu.phtml:66
+#: js/messages.php:464 templates/database/designer/side_menu.phtml:63
+#: templates/database/designer/side_menu.phtml:66
 msgid "Save page as"
 msgstr "Uložiť stránku ako"
 
-#: js/messages.php:465 templates/designer/side_menu.phtml:49
-#: templates/designer/side_menu.phtml:52
+#: js/messages.php:465 templates/database/designer/side_menu.phtml:49
+#: templates/database/designer/side_menu.phtml:52
 msgid "Open page"
 msgstr "Otvoriť stránku"
 
@@ -2286,7 +2292,7 @@ msgstr "Otvoriť stránku"
 msgid "Delete page"
 msgstr "Zmazať stránku"
 
-#: js/messages.php:467 templates/designer/side_menu.phtml:10
+#: js/messages.php:467 templates/database/designer/side_menu.phtml:10
 msgid "Untitled"
 msgstr "Nepomenovaná"
 
@@ -2403,7 +2409,7 @@ msgstr "Originálna dĺžka"
 msgid "cancel"
 msgstr "zrušiť"
 
-#: js/messages.php:499 libraries/server_status.lib.php:271
+#: js/messages.php:499 libraries/server_status.lib.php:280
 msgid "Aborted"
 msgstr "Prerušené"
 
@@ -2964,7 +2970,7 @@ msgstr "Prosím zdajte platný HEX vstup"
 
 #: js/messages.php:793 libraries/Message.class.php:199
 #: libraries/Util.class.php:654 libraries/core.lib.php:245
-#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1172
+#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1170
 #: tbl_operations.php:229 view_operations.php:63
 msgid "Error"
 msgstr "Chyba"
@@ -3026,8 +3032,8 @@ msgstr "za sekundu"
 msgid "per minute"
 msgstr "za minútu"
 
-#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:143
-#: libraries/server_status.lib.php:228
+#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:152
+#: libraries/server_status.lib.php:237
 #: libraries/server_status_queries.lib.php:98
 msgid "per hour"
 msgstr "za hodinu"
@@ -3047,7 +3053,7 @@ msgstr ""
 "Konfiguračný súbor má zlé prístupové práva, nemal by byť zapisovateľný pre "
 "všetkých!"
 
-#: libraries/Config.class.php:1799
+#: libraries/Config.class.php:1801
 msgid "Font size"
 msgstr "Veľkosť písma"
 
@@ -3075,10 +3081,10 @@ msgstr "Znovu spustiť dopyt"
 #: libraries/server_privileges.lib.php:2890
 #: libraries/server_privileges.lib.php:3144
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4332
+#: libraries/server_privileges.lib.php:4358
 #: libraries/server_status_processes.lib.php:80
-#: templates/tbl_relation/foreign_key_row.phtml:165
-#: templates/tbl_relation/internal_relational_row.phtml:55
+#: templates/table/relation/foreign_key_row.phtml:165
+#: templates/table/relation/internal_relational_row.phtml:55
 msgid "Database"
 msgstr "Databáza"
 
@@ -3172,11 +3178,11 @@ msgstr "História"
 #: libraries/plugins/import/ImportMediawiki.class.php:60
 #: libraries/plugins/import/ImportOds.class.php:59
 #: libraries/plugins/import/ImportShp.class.php:57
-#: libraries/plugins/import/ImportSql.class.php:148
+#: libraries/plugins/import/ImportSql.class.php:51
 #: libraries/plugins/import/ImportXml.class.php:58
-#: libraries/rte/rte_routines.lib.php:833 templates/index_form.phtml:49
-#: templates/structure/row_stats_table.phtml:20
-#: templates/table/options.phtml:2
+#: libraries/rte/rte_routines.lib.php:924 templates/table/index_form.phtml:49
+#: templates/table/search/options.phtml:2
+#: templates/table/structure/row_stats_table.phtml:20
 msgid "Options"
 msgstr "Nastavenia"
 
@@ -3209,7 +3215,8 @@ msgstr "zostupne"
 msgid "Order:"
 msgstr "Poradie:"
 
-#: libraries/Console.class.php:289 templates/table/replace_preview.phtml:17
+#: libraries/Console.class.php:289
+#: templates/table/search/replace_preview.phtml:17
 msgid "Count"
 msgstr "Počet"
 
@@ -3308,9 +3315,9 @@ msgstr "Prepnúť na tmavú tému"
 #: libraries/operations.lib.php:794 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:191
-#: templates/structure/sortable_header.phtml:21
-#: templates/structure/sortable_header.phtml:38
-#: templates/table/options.phtml:68
+#: templates/database/structure/sortable_header.phtml:21
+#: templates/database/structure/sortable_header.phtml:38
+#: templates/table/search/options.phtml:68
 msgid "Ascending"
 msgstr "Vzostupne"
 
@@ -3320,13 +3327,14 @@ msgstr "Vzostupne"
 #: libraries/operations.lib.php:797 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:188
-#: templates/structure/sortable_header.phtml:26
-#: templates/structure/sortable_header.phtml:43
-#: templates/table/options.phtml:69
+#: templates/database/structure/sortable_header.phtml:26
+#: templates/database/structure/sortable_header.phtml:43
+#: templates/table/search/options.phtml:69
 msgid "Descending"
 msgstr "Zostupne"
 
-#: libraries/DBQbe.class.php:467 templates/table/search_and_replace.phtml:6
+#: libraries/DBQbe.class.php:467
+#: templates/table/search/search_and_replace.phtml:6
 msgid "Column:"
 msgstr "Stĺpec:"
 
@@ -3485,12 +3493,12 @@ msgstr[1] "%1$s výskyty v <strong>%2$s</strong>"
 msgstr[2] "%1$s výskytov v <strong>%2$s</strong>"
 
 #: libraries/DbSearch.class.php:354 libraries/Menu.class.php:311
-#: libraries/Util.class.php:3337 libraries/Util.class.php:3347
-#: libraries/Util.class.php:3623 libraries/Util.class.php:3624
-#: libraries/Util.class.php:4343 libraries/config.values.php:43
+#: libraries/Util.class.php:3343 libraries/Util.class.php:3353
+#: libraries/Util.class.php:3629 libraries/Util.class.php:3630
+#: libraries/Util.class.php:4349 libraries/config.values.php:43
 #: libraries/config.values.php:51 libraries/config.values.php:119
 #: libraries/navigation/Nodes/Node_Table.class.php:295
-#: templates/structure/check_all_table_column.phtml:5
+#: templates/table/structure/check_all_table_column.phtml:5
 msgid "Browse"
 msgstr "Prechádzať"
 
@@ -3507,7 +3515,8 @@ msgstr "Hľadať v databáze"
 msgid "Words or values to search for (wildcard: \"%\"):"
 msgstr "Slová alebo hodnoty, ktoré chcete vyhľadať (nahradzujúci znak: \"%\"):"
 
-#: libraries/DbSearch.class.php:401 templates/table/search_and_replace.phtml:1
+#: libraries/DbSearch.class.php:401
+#: templates/table/search/search_and_replace.phtml:1
 msgid "Find:"
 msgstr "Nájdi:"
 
@@ -3551,28 +3560,28 @@ msgstr "Filtrovať riadky"
 msgid "Search this table"
 msgstr "Hľadať v tabuľke"
 
-#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2532
-#: libraries/Util.class.php:2535
+#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2538
+#: libraries/Util.class.php:2541
 msgctxt "First page"
 msgid "Begin"
 msgstr "Začiatok"
 
-#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2533
-#: libraries/Util.class.php:2536 libraries/server_bin_log.lib.php:170
+#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2539
+#: libraries/Util.class.php:2542 libraries/server_bin_log.lib.php:170
 #: libraries/server_bin_log.lib.php:172
 msgctxt "Previous page"
 msgid "Previous"
 msgstr "Predchádzajúci"
 
-#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2564
-#: libraries/Util.class.php:2574 libraries/server_bin_log.lib.php:204
+#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2570
+#: libraries/Util.class.php:2580 libraries/server_bin_log.lib.php:204
 #: libraries/server_bin_log.lib.php:206
 msgctxt "Next page"
 msgid "Next"
 msgstr "Ďalší"
 
-#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2565
-#: libraries/Util.class.php:2575
+#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2571
+#: libraries/Util.class.php:2581
 msgctxt "Last page"
 msgid "End"
 msgstr "Koniec"
@@ -3647,15 +3656,15 @@ msgid "May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]."
 msgstr "Môže byť nepresné. Viď [doc@faq3-11]FAQ 3.11[/doc]."
 
 #: libraries/DisplayResults.class.php:4332 libraries/Message.class.php:180
-#: libraries/controllers/TableRelationController.class.php:258
+#: libraries/controllers/TableRelationController.class.php:259
 #: libraries/controllers/TableSearchController.class.php:655
-#: libraries/rte/rte_routines.lib.php:1332 libraries/sql_query_form.lib.php:89
+#: libraries/rte/rte_routines.lib.php:1423 libraries/sql_query_form.lib.php:89
 #: tbl_operations.php:227 tbl_row_action.php:138 view_operations.php:62
 msgid "Your SQL query has been executed successfully."
 msgstr "SQL dopyt bol úspešne vykonaný."
 
 #: libraries/DisplayResults.class.php:4660
-#: libraries/controllers/StructureController.class.php:629
+#: libraries/controllers/DatabaseStructureController.class.php:564
 #, php-format
 msgid ""
 "This view has at least this number of rows. Please refer to %sdocumentation"
@@ -3678,33 +3687,33 @@ msgstr "%1$d celkom, %2$d v dotaze"
 msgid "%d total"
 msgstr "celkom %d"
 
-#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1318
+#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1312
 #, php-format
 msgid "Query took %01.4f seconds."
 msgstr "Dopyt zabral %01.4f sekúnd."
 
 #: libraries/DisplayResults.class.php:4807
-#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4767
-#: libraries/Util.class.php:4773 libraries/mult_submits.inc.php:50
-#: templates/structure/check_all_tables.phtml:2
-#: templates/structure/check_all_tables.phtml:9
+#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4773
+#: libraries/Util.class.php:4779 libraries/mult_submits.inc.php:50
+#: templates/database/structure/check_all_tables.phtml:2
+#: templates/database/structure/check_all_tables.phtml:9
 msgid "With selected:"
 msgstr "Výber:"
 
 #: libraries/DisplayResults.class.php:4811
-#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4769
-#: libraries/Util.class.php:4770 libraries/server_privileges.lib.php:1174
+#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4775
+#: libraries/Util.class.php:4776 libraries/server_privileges.lib.php:1174
 #: libraries/server_privileges.lib.php:1175
 #: libraries/server_privileges.lib.php:1387
 #: libraries/server_user_groups.lib.php:231
-#: templates/structure/check_all_tables.phtml:3
-#: templates/structure/check_all_tables.phtml:4
+#: templates/database/structure/check_all_tables.phtml:3
+#: templates/database/structure/check_all_tables.phtml:4
 msgid "Check All"
 msgstr "Označiť všetko"
 
 #: libraries/DisplayResults.class.php:4985 libraries/Header.class.php:383
-#: templates/structure/optional_action_links.phtml:1
-#: templates/structure/print_view_data_dictionary_link.phtml:3
+#: templates/database/structure/print_view_data_dictionary_link.phtml:3
+#: templates/table/structure/optional_action_links.phtml:1
 msgid "Print view"
 msgstr "Náhľad k tlači"
 
@@ -3712,7 +3721,8 @@ msgstr "Náhľad k tlači"
 msgid "Query results operations"
 msgstr "Operácie s výsledkami dopytu"
 
-#: libraries/DisplayResults.class.php:5105 templates/tbl_chart.phtml:12
+#: libraries/DisplayResults.class.php:5105
+#: templates/table/chart/tbl_chart.phtml:12
 msgid "Display chart"
 msgstr "Zobraziť graf"
 
@@ -3808,7 +3818,7 @@ msgid "Click on the bar to scroll to top of page"
 msgstr "Kliknutím v pruhu prejdete na začiatok stránky"
 
 #: libraries/Header.class.php:749
-#: libraries/plugins/auth/AuthenticationCookie.class.php:152
+#: libraries/plugins/auth/AuthenticationCookie.class.php:140
 msgid "Javascript must be enabled past this point!"
 msgstr "Pokiaľ chcete pokračovať, JavaScript musí byť povolený!"
 
@@ -3830,11 +3840,11 @@ msgid "Keyname"
 msgstr "Kľúčový názov"
 
 #: libraries/Index.class.php:697
-#: libraries/controllers/StructureController.class.php:1962
-#: libraries/controllers/StructureController.class.php:1967
+#: libraries/controllers/TableStructureController.class.php:953
+#: libraries/controllers/TableStructureController.class.php:958
 #: libraries/tracking.lib.php:973
 #: templates/columns_definitions/column_indexes.phtml:11
-#: templates/structure/check_all_table_column.phtml:26
+#: templates/table/structure/check_all_table_column.phtml:26
 msgid "Unique"
 msgstr "Unikátny"
 
@@ -3853,16 +3863,17 @@ msgstr "Mohutnosť"
 #: libraries/server_collations.lib.php:35 libraries/tracking.lib.php:881
 #: libraries/tracking.lib.php:977
 #: templates/columns_definitions/table_fields_definitions.phtml:33
-#: templates/structure/row_stats_table.phtml:31
-#: templates/structure/table_header.phtml:55
-#: templates/structure/table_structure_header.phtml:7
-#: templates/table/table_header.phtml:8
+#: templates/database/structure/table_header.phtml:55
+#: templates/table/search/table_header.phtml:8
+#: templates/table/structure/row_stats_table.phtml:31
+#: templates/table/structure/table_structure_header.phtml:7
 msgid "Collation"
 msgstr "Zotriedenie"
 
 #: libraries/Index.class.php:703 libraries/rte/rte_events.lib.php:496
-#: libraries/rte/rte_routines.lib.php:956 libraries/tracking.lib.php:885
-#: libraries/tracking.lib.php:979 templates/structure/table_header.phtml:84
+#: libraries/rte/rte_routines.lib.php:1047 libraries/tracking.lib.php:885
+#: libraries/tracking.lib.php:979
+#: templates/database/structure/table_header.phtml:84
 msgid "Comment"
 msgstr "Komentár"
 
@@ -3875,15 +3886,15 @@ msgstr "Primárny kľúč bol zrušený."
 msgid "Index %s has been dropped."
 msgstr "Index pre %s bol odstránený."
 
-#: libraries/Index.class.php:757 libraries/Util.class.php:3630
-#: libraries/Util.class.php:3631
-#: libraries/controllers/StructureController.class.php:1958
-#: libraries/controllers/StructureController.class.php:1959
+#: libraries/Index.class.php:757 libraries/Util.class.php:3636
+#: libraries/Util.class.php:3637
+#: libraries/controllers/TableStructureController.class.php:949
+#: libraries/controllers/TableStructureController.class.php:950
 #: libraries/operations.lib.php:1607 libraries/rte/rte_list.lib.php:150
 #: libraries/server_databases.lib.php:146
-#: templates/structure/check_all_table_column.phtml:15
-#: templates/structure/check_all_tables.phtml:16
-#: templates/tbl_relation/foreign_key_row.phtml:93
+#: templates/database/structure/check_all_tables.phtml:16
+#: templates/table/relation/foreign_key_row.phtml:93
+#: templates/table/structure/check_all_table_column.phtml:15
 msgid "Drop"
 msgstr "Odstrániť"
 
@@ -3914,16 +3925,16 @@ msgstr "Server"
 #: libraries/Menu.class.php:248
 #: libraries/navigation/Nodes/Node_View.class.php:32
 #: libraries/tbl_info.inc.php:63
-#: templates/structure/structure_table_row.phtml:97
-#: templates/structure/structure_table_row.phtml:159
+#: templates/database/structure/structure_table_row.phtml:97
+#: templates/database/structure/structure_table_row.phtml:159
 msgid "View"
 msgstr "Pohľad"
 
 #: libraries/Menu.class.php:325 libraries/Menu.class.php:429
-#: libraries/Menu.class.php:548 libraries/Util.class.php:3334
-#: libraries/Util.class.php:3344 libraries/Util.class.php:3350
-#: libraries/Util.class.php:4313 libraries/Util.class.php:4328
-#: libraries/Util.class.php:4345 libraries/config.values.php:40
+#: libraries/Menu.class.php:548 libraries/Util.class.php:3340
+#: libraries/Util.class.php:3350 libraries/Util.class.php:3356
+#: libraries/Util.class.php:4319 libraries/Util.class.php:4334
+#: libraries/Util.class.php:4351 libraries/config.values.php:40
 #: libraries/config.values.php:48 libraries/config.values.php:110
 #: libraries/config.values.php:116 libraries/config/messages.inc.php:321
 #: libraries/navigation/Nodes/Node_Table.class.php:292
@@ -3931,19 +3942,19 @@ msgid "SQL"
 msgstr "SQL"
 
 #: libraries/Menu.class.php:328 libraries/Menu.class.php:432
-#: libraries/Util.class.php:3335 libraries/Util.class.php:3345
-#: libraries/Util.class.php:3351 libraries/Util.class.php:3625
-#: libraries/Util.class.php:3626 libraries/Util.class.php:4329
-#: libraries/Util.class.php:4346 libraries/config.values.php:41
+#: libraries/Util.class.php:3341 libraries/Util.class.php:3351
+#: libraries/Util.class.php:3357 libraries/Util.class.php:3631
+#: libraries/Util.class.php:3632 libraries/Util.class.php:4335
+#: libraries/Util.class.php:4352 libraries/config.values.php:41
 #: libraries/config.values.php:49 libraries/config.values.php:111
 #: libraries/config.values.php:117
 #: libraries/navigation/Nodes/Node_Table.class.php:286
 msgid "Search"
 msgstr "Hľadať"
 
-#: libraries/Menu.class.php:338 libraries/Util.class.php:3336
-#: libraries/Util.class.php:3346 libraries/Util.class.php:3627
-#: libraries/Util.class.php:3628 libraries/Util.class.php:4347
+#: libraries/Menu.class.php:338 libraries/Util.class.php:3342
+#: libraries/Util.class.php:3352 libraries/Util.class.php:3633
+#: libraries/Util.class.php:3634 libraries/Util.class.php:4353
 #: libraries/config.values.php:42 libraries/config.values.php:50
 #: libraries/config.values.php:118
 #: libraries/navigation/Nodes/Node_Table.class.php:289
@@ -3952,30 +3963,30 @@ msgid "Insert"
 msgstr "Vložiť"
 
 #: libraries/Menu.class.php:362 libraries/Menu.class.php:467
-#: libraries/Util.class.php:4334 libraries/Util.class.php:4350
+#: libraries/Util.class.php:4340 libraries/Util.class.php:4356
 #: libraries/config.values.php:106 libraries/server_common.lib.php:51
 #: libraries/server_privileges.lib.php:2370
 #: libraries/server_privileges.lib.php:3158
-#: libraries/server_privileges.lib.php:4221
+#: libraries/server_privileges.lib.php:4247
 msgid "Privileges"
 msgstr "Oprávnenia"
 
 #: libraries/Menu.class.php:371 libraries/Menu.class.php:379
-#: libraries/Menu.class.php:459 libraries/Util.class.php:3338
-#: libraries/Util.class.php:3352 libraries/Util.class.php:4333
-#: libraries/Util.class.php:4351 libraries/config.values.php:112
+#: libraries/Menu.class.php:459 libraries/Util.class.php:3344
+#: libraries/Util.class.php:3358 libraries/Util.class.php:4339
+#: libraries/Util.class.php:4357 libraries/config.values.php:112
 #: view_operations.php:92
 msgid "Operations"
 msgstr "Operácie"
 
 #: libraries/Menu.class.php:384 libraries/Menu.class.php:492
-#: libraries/Util.class.php:4338 libraries/Util.class.php:4352
+#: libraries/Util.class.php:4344 libraries/Util.class.php:4358
 #: libraries/relation.lib.php:255
 msgid "Tracking"
 msgstr "Sledovanie"
 
 #: libraries/Menu.class.php:397 libraries/Menu.class.php:486
-#: libraries/Util.class.php:4337 libraries/Util.class.php:4353
+#: libraries/Util.class.php:4343 libraries/Util.class.php:4359
 #: libraries/navigation/Nodes/Node_Trigger_Container.class.php:24
 #: libraries/plugins/export/ExportHtmlword.class.php:557
 #: libraries/plugins/export/ExportOdt.class.php:685
@@ -3992,16 +4003,16 @@ msgstr "Spúšťače"
 msgid "Database seems to be empty!"
 msgstr "Databáza vyzerá prázdna!"
 
-#: libraries/Menu.class.php:439 libraries/Util.class.php:4330
+#: libraries/Menu.class.php:439 libraries/Util.class.php:4336
 msgid "Query"
 msgstr "Dopyt podľa príkladu"
 
-#: libraries/Menu.class.php:472 libraries/Util.class.php:4335
+#: libraries/Menu.class.php:472 libraries/Util.class.php:4341
 #: libraries/rte/rte_words.lib.php:36
 msgid "Routines"
 msgstr "Rutiny"
 
-#: libraries/Menu.class.php:479 libraries/Util.class.php:4336
+#: libraries/Menu.class.php:479 libraries/Util.class.php:4342
 #: libraries/navigation/Nodes/Node_Event_Container.class.php:26
 #: libraries/plugins/export/ExportSql.class.php:940
 #: libraries/plugins/export/ExportXml.class.php:107
@@ -4009,20 +4020,20 @@ msgstr "Rutiny"
 msgid "Events"
 msgstr "Udalosti"
 
-#: libraries/Menu.class.php:498 libraries/Util.class.php:4339
+#: libraries/Menu.class.php:498 libraries/Util.class.php:4345
 msgid "Designer"
 msgstr "Dizajnér"
 
-#: libraries/Menu.class.php:507 libraries/Util.class.php:4340
-#: templates/structure/check_all_tables.phtml:35
+#: libraries/Menu.class.php:507 libraries/Util.class.php:4346
+#: templates/database/structure/check_all_tables.phtml:35
 msgid "Central columns"
 msgstr "Centrálne stĺpce"
 
-#: libraries/Menu.class.php:544 libraries/Util.class.php:4312
+#: libraries/Menu.class.php:544 libraries/Util.class.php:4318
 #: libraries/config.values.php:103 libraries/config/messages.inc.php:266
 #: libraries/config/messages.inc.php:341
 #: libraries/navigation/NavigationTree.class.php:1239
-#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4332
+#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4358
 msgid "Databases"
 msgstr "Databázy"
 
@@ -4031,34 +4042,34 @@ msgid "User accounts"
 msgstr "Užívateľské účty"
 
 #: libraries/Menu.class.php:595 libraries/ServerStatusData.class.php:121
-#: libraries/Util.class.php:4319 libraries/server_common.lib.php:36
+#: libraries/Util.class.php:4325 libraries/server_common.lib.php:36
 msgid "Binary log"
 msgstr "Binárny log"
 
 #: libraries/Menu.class.php:601 libraries/ServerStatusData.class.php:126
-#: libraries/Util.class.php:4320 libraries/server_common.lib.php:42
-#: templates/structure/body_for_table_summary.phtml:10
-#: templates/structure/table_header.phtml:27
+#: libraries/Util.class.php:4326 libraries/server_common.lib.php:42
+#: templates/database/structure/body_for_table_summary.phtml:10
+#: templates/database/structure/table_header.phtml:27
 msgid "Replication"
 msgstr "Replikácia"
 
 #: libraries/Menu.class.php:606 libraries/ServerStatusData.class.php:193
-#: libraries/Util.class.php:4321 libraries/config.values.php:105
+#: libraries/Util.class.php:4327 libraries/config.values.php:105
 #: libraries/server_engines.lib.php:108 libraries/server_engines.lib.php:112
 #: libraries/sql_query_form.lib.php:421
 msgid "Variables"
 msgstr "Premenné"
 
-#: libraries/Menu.class.php:610 libraries/Util.class.php:4322
+#: libraries/Menu.class.php:610 libraries/Util.class.php:4328
 msgid "Charsets"
 msgstr "Znakové sady"
 
-#: libraries/Menu.class.php:615 libraries/Util.class.php:4323
+#: libraries/Menu.class.php:615 libraries/Util.class.php:4329
 #: libraries/server_common.lib.php:33 libraries/server_plugins.lib.php:27
 msgid "Plugins"
 msgstr "Rozšírenia"
 
-#: libraries/Menu.class.php:626 libraries/Util.class.php:4324
+#: libraries/Menu.class.php:626 libraries/Util.class.php:4330
 msgid "Engines"
 msgstr "Systémy"
 
@@ -4086,7 +4097,7 @@ msgstr[0] "Bol vložený %1$d riadok."
 msgstr[1] "Boli vložené %1$d riadky."
 msgstr[2] "Bolo vložených %1$d riadkov."
 
-#: libraries/PDF.class.php:70 libraries/Util.class.php:2521
+#: libraries/PDF.class.php:70 libraries/Util.class.php:2527
 #: libraries/browse_foreigners.lib.php:327
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:865
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:890
@@ -4107,7 +4118,7 @@ msgid "Could not save favorite table!"
 msgstr "Nepodarilo sa uložiť obľubenú tabuľku!"
 
 #: libraries/RecentFavoriteTable.class.php:212
-#: templates/structure/favorite_anchor.phtml:12
+#: templates/database/structure/favorite_anchor.phtml:12
 msgid "Remove from Favorites"
 msgstr "Odstrániť z obľúbených"
 
@@ -4275,7 +4286,7 @@ msgstr ""
 "Pre tento úložný systém nie sú dostupné žiadne podrobnejšie informácie."
 
 #: libraries/StorageEngine.class.php:373
-#: templates/structure/body_for_table_summary.phtml:50
+#: templates/database/structure/body_for_table_summary.phtml:50
 #, php-format
 msgid "%s is the default storage engine on this MySQL server."
 msgstr "Na tomto MySQL serveri je prednastaveným úložným systémom %s."
@@ -4749,10 +4760,10 @@ msgstr ""
 
 #: libraries/Util.class.php:726 libraries/rte/rte_events.lib.php:110
 #: libraries/rte/rte_events.lib.php:119 libraries/rte/rte_events.lib.php:150
-#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:153
-#: libraries/rte/rte_routines.lib.php:162
-#: libraries/rte/rte_routines.lib.php:235
-#: libraries/rte/rte_routines.lib.php:1366
+#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:223
+#: libraries/rte/rte_routines.lib.php:250
+#: libraries/rte/rte_routines.lib.php:372
+#: libraries/rte/rte_routines.lib.php:1457
 #: libraries/rte/rte_triggers.lib.php:86 libraries/rte/rte_triggers.lib.php:95
 #: libraries/rte/rte_triggers.lib.php:127
 msgid "MySQL said: "
@@ -4796,75 +4807,78 @@ msgstr "Ne"
 msgid "%B %d, %Y at %I:%M %p"
 msgstr "%a %d.%B %Y, %H:%M"
 
-#: libraries/Util.class.php:2019
+#: libraries/Util.class.php:2025
 #, php-format
 msgid "%s days, %s hours, %s minutes and %s seconds"
 msgstr "%s dní, %s hodín, %s minút a %s sekúnd"
 
-#: libraries/Util.class.php:2112
+#: libraries/Util.class.php:2118
 msgid "Missing parameter:"
 msgstr "Chýbajúci parameter:"
 
-#: libraries/Util.class.php:2645
+#: libraries/Util.class.php:2651
 #, php-format
 msgid "Jump to database \"%s\"."
 msgstr "Prejsť na databázu \"%s\"."
 
-#: libraries/Util.class.php:2670
+#: libraries/Util.class.php:2676
 #, php-format
 msgid "The %s functionality is affected by a known bug, see %s"
 msgstr "Funkčnosť %s je ovplyvnená známou chybou, pozri %s"
 
-#: libraries/Util.class.php:2881
+#: libraries/Util.class.php:2887
 msgid "Click to toggle"
 msgstr "Kliknite pre prepnutie"
 
-#: libraries/Util.class.php:3542 prefs_manage.php:248
+#: libraries/Util.class.php:3548 prefs_manage.php:248
 msgid "Browse your computer:"
 msgstr "Prechádzať váš počítač:"
 
-#: libraries/Util.class.php:3567
+#: libraries/Util.class.php:3573
 #, php-format
 msgid "Select from the web server upload directory <b>%s</b>:"
 msgstr "Zvoľte súbor z upload adresára <b>%s</b> web servera:"
 
-#: libraries/Util.class.php:3596 libraries/insert_edit.lib.php:1173
+#: libraries/Util.class.php:3602 libraries/insert_edit.lib.php:1171
 msgid "The directory you set for upload work cannot be reached."
 msgstr "Adresár určený pre upload súborov sa nedá otvoriť."
 
-#: libraries/Util.class.php:3607
+#: libraries/Util.class.php:3613
 msgid "There are no files to upload!"
 msgstr "Žiadny súbor pre nahrávanie!"
 
-#: libraries/Util.class.php:3632 libraries/Util.class.php:3633
-#: templates/structure/check_all_tables.phtml:15
+#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: templates/database/structure/check_all_tables.phtml:15
 msgid "Empty"
 msgstr "Vyprázdniť"
 
-#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: libraries/Util.class.php:3644 libraries/Util.class.php:3645
 msgid "Execute"
 msgstr "Spustiť"
 
-#: libraries/Util.class.php:4152
+#: libraries/Util.class.php:4158
 msgid "Print"
 msgstr "Vytlačiť"
 
-#: libraries/Util.class.php:4257 templates/structure/row_stats_table.phtml:80
-#: templates/structure/table_header.phtml:95
+#: libraries/Util.class.php:4263
+#: templates/database/structure/table_header.phtml:95
+#: templates/table/structure/row_stats_table.phtml:80
 msgid "Creation"
 msgstr "Vytvorenie"
 
-#: libraries/Util.class.php:4263 templates/structure/row_stats_table.phtml:87
-#: templates/structure/table_header.phtml:106
+#: libraries/Util.class.php:4269
+#: templates/database/structure/table_header.phtml:106
+#: templates/table/structure/row_stats_table.phtml:87
 msgid "Last update"
 msgstr "Posledná zmena"
 
-#: libraries/Util.class.php:4269 templates/structure/row_stats_table.phtml:94
-#: templates/structure/table_header.phtml:117
+#: libraries/Util.class.php:4275
+#: templates/database/structure/table_header.phtml:117
+#: templates/table/structure/row_stats_table.phtml:94
 msgid "Last check"
 msgstr "Posledná kontrola"
 
-#: libraries/Util.class.php:4315
+#: libraries/Util.class.php:4321
 msgid "Users"
 msgstr "Používatelia"
 
@@ -4885,16 +4899,16 @@ msgid "Use this value"
 msgstr "Použiť túto hodnotu"
 
 #: libraries/build_html_for_db.lib.php:33 libraries/import.lib.php:193
-#: templates/structure/actions_in_table_structure.phtml:113
-#: templates/structure/row_stats_table.phtml:42
-#: templates/structure/table_header.phtml:36
+#: templates/database/structure/table_header.phtml:36
+#: templates/table/structure/actions_in_table_structure.phtml:113
+#: templates/table/structure/row_stats_table.phtml:42
 msgid "Rows"
 msgstr "Riadkov"
 
 #: libraries/build_html_for_db.lib.php:48 libraries/engines/innodb.lib.php:171
-#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:186
-#: libraries/server_status.lib.php:298
-#: templates/structure/display_table_stats.phtml:40
+#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:195
+#: libraries/server_status.lib.php:307
+#: templates/table/structure/display_table_stats.phtml:40
 msgid "Total"
 msgstr "Celkom"
 
@@ -4903,10 +4917,12 @@ msgid "Jump to database"
 msgstr "Prejsť do databázy"
 
 #: libraries/build_html_for_db.lib.php:146
+#: templates/database/structure/structure_table_row.phtml:15
 msgid "Not replicated"
 msgstr "Nie je replikované"
 
 #: libraries/build_html_for_db.lib.php:158
+#: templates/database/structure/structure_table_row.phtml:16
 msgid "Replicated"
 msgstr "Replikované"
 
@@ -4959,17 +4975,17 @@ msgstr "NIE"
 #: libraries/plugins/export/ExportTexytext.class.php:425
 #: libraries/plugins/export/PMA_ExportPdf.class.php:307
 #: libraries/rte/rte_list.lib.php:73 libraries/rte/rte_list.lib.php:85
-#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:830
-#: libraries/rte/rte_routines.lib.php:1492 setup/frames/index.inc.php:162
+#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:921
+#: libraries/rte/rte_routines.lib.php:1583 setup/frames/index.inc.php:162
 #: templates/columns_definitions/table_fields_definitions.phtml:8
-#: templates/structure/table_structure_header.phtml:5
-#: templates/table/create_table.phtml:11
+#: templates/database/create_table.phtml:11
+#: templates/table/structure/table_structure_header.phtml:5
 msgid "Name"
 msgstr "Názov"
 
 #: libraries/central_columns.lib.php:699
 #: libraries/central_columns.lib.php:1381
-#: libraries/rte/rte_routines.lib.php:832
+#: libraries/rte/rte_routines.lib.php:923
 #: templates/columns_definitions/table_fields_definitions.phtml:14
 msgid "Length/Values"
 msgstr "Dĺžka/Nastaviť*"
@@ -4988,7 +5004,7 @@ msgid "Select a table"
 msgstr "Vyberte tabuľku"
 
 #: libraries/central_columns.lib.php:804
-#: templates/structure/add_column.phtml:4
+#: templates/table/structure/add_column.phtml:4
 msgid "Add column"
 msgstr "Pridať stĺpec"
 
@@ -5004,7 +5020,7 @@ msgstr "Pridať nový stĺpec"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1002
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1025
 #: templates/columns_definitions/table_fields_definitions.phtml:36
-#: templates/structure/table_structure_header.phtml:8
+#: templates/table/structure/table_structure_header.phtml:8
 msgid "Attributes"
 msgstr "Atribúty"
 
@@ -5117,7 +5133,7 @@ msgid "Double click"
 msgstr "Dvojklik"
 
 #: libraries/config.values.php:95 libraries/config.values.php:124
-#: libraries/config/FormDisplay.tpl.php:221 libraries/relation.lib.php:97
+#: libraries/config/FormDisplay.tpl.php:232 libraries/relation.lib.php:97
 #: libraries/relation.lib.php:105
 msgid "Disabled"
 msgstr "Vypnuté"
@@ -5287,21 +5303,21 @@ msgstr "Komprimovaný export nebude funkčný, chýba funkcia %s."
 msgid "maximum %s"
 msgstr "maximálne %s"
 
-#: libraries/config/FormDisplay.tpl.php:219
+#: libraries/config/FormDisplay.tpl.php:230
 msgid "This setting is disabled, it will not be applied to your configuration."
 msgstr "Táto voľba je vypnutá, nebude použitá vo vašich nastaveniach."
 
-#: libraries/config/FormDisplay.tpl.php:313
+#: libraries/config/FormDisplay.tpl.php:324
 #, php-format
 msgid "Set value: %s"
 msgstr "Nastavená hodnota: %s"
 
-#: libraries/config/FormDisplay.tpl.php:318
+#: libraries/config/FormDisplay.tpl.php:329
 #: libraries/config/messages.inc.php:610
 msgid "Restore default value"
 msgstr "Obnoviť východziu hodnotu"
 
-#: libraries/config/FormDisplay.tpl.php:332
+#: libraries/config/FormDisplay.tpl.php:343
 msgid "Allow users to customize this value"
 msgstr "Povoliť užívateľom prispôsobiť túto hodnotu"
 
@@ -5767,7 +5783,7 @@ msgstr "Znaková sada súboru"
 
 #: libraries/config/messages.inc.php:136 libraries/config/messages.inc.php:152
 #: libraries/sql_query_form.lib.php:247
-#: templates/structure/row_stats_table.phtml:7
+#: templates/table/structure/row_stats_table.phtml:7
 msgid "Format"
 msgstr "Formát"
 
@@ -6280,7 +6296,7 @@ msgstr ""
 
 #: libraries/config/messages.inc.php:332
 #: libraries/plugins/export/ExportPdf.class.php:279
-#: templates/structure/secondary_tabs.phtml:8
+#: templates/table/secondary_tabs.phtml:8
 msgid "Table structure"
 msgstr "Štruktúra tabuľky"
 
@@ -7944,103 +7960,33 @@ msgstr "Microsoft Word 2000"
 msgid "OpenDocument Text"
 msgstr "Open Document Text"
 
-#: libraries/controllers/StructureController.class.php:465
+#: libraries/controllers/DatabaseStructureController.class.php:405
 #: tbl_operations.php:382
 #, php-format
 msgid "Table %s has been emptied."
 msgstr "Tabuľka %s bola vyprázdená."
 
-#: libraries/controllers/StructureController.class.php:486
+#: libraries/controllers/DatabaseStructureController.class.php:426
 #: tbl_operations.php:400 view_operations.php:119
 #, php-format
 msgid "View %s has been dropped."
 msgstr "Pohľad %s bol odstránený."
 
-#: libraries/controllers/StructureController.class.php:487
+#: libraries/controllers/DatabaseStructureController.class.php:427
 #: tbl_operations.php:401
 #, php-format
 msgid "Table %s has been dropped."
 msgstr "Tabuľka %s bola odstránená."
 
-#: libraries/controllers/StructureController.class.php:797
-#, php-format
-msgid "The name '%s' is a MySQL reserved keyword."
-msgid_plural "The names '%s' are MySQL reserved keywords."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: libraries/controllers/StructureController.class.php:875
-msgid "No column selected."
-msgstr "Nebol vybraný žiadny stĺpec."
-
-#: libraries/controllers/StructureController.class.php:1049
+#: libraries/controllers/DatabaseStructureController.class.php:733
 msgid "Favorite List is full!"
 msgstr "Zoznam obľúbených je plný!"
 
-#: libraries/controllers/StructureController.class.php:1272
-msgid "The columns have been moved successfully."
-msgstr "Stĺpce boli úspešne presunuté."
-
-#: libraries/controllers/StructureController.class.php:1535
-#, fuzzy, php-format
-#| msgid "Table %1$s has been altered successfully."
-msgid ""
-"Table %1$s has been altered successfully. Privileges have been adjusted."
-msgstr "Tabuľka %1$s bola úspešné upravená."
-
-#: libraries/controllers/StructureController.class.php:1541
-#: libraries/controllers/TableIndexesController.class.php:161
-#: tbl_addfield.php:92
-#, php-format
-msgid "Table %1$s has been altered successfully."
-msgstr "Tabuľka %1$s bola úspešné upravená."
-
-#: libraries/controllers/StructureController.class.php:1588
-#: libraries/tracking.lib.php:1094
-msgid "Query error"
-msgstr "Chyba dopytu"
-
-#: libraries/controllers/StructureController.class.php:1806
+#: libraries/controllers/DatabaseStructureController.class.php:947
 #: libraries/mysql_charsets.lib.php:366 libraries/mysql_charsets.lib.php:373
 msgid "unknown"
 msgstr "neznámy"
 
-#: libraries/controllers/StructureController.class.php:1957
-#: templates/structure/check_all_table_column.phtml:11
-msgid "Change"
-msgstr "Zmeniť"
-
-#: libraries/controllers/StructureController.class.php:1961
-#: libraries/controllers/StructureController.class.php:1966
-#: libraries/navigation/Nodes/Node_Index.class.php:30
-#: libraries/tracking.lib.php:926
-#: templates/columns_definitions/column_indexes.phtml:16
-#: templates/columns_definitions/table_fields_definitions.phtml:57
-#: templates/structure/check_all_table_column.phtml:30
-#: templates/structure/display_structure.phtml:79
-#: templates/structure/display_table_stats.phtml:19
-msgid "Index"
-msgstr "Index"
-
-#: libraries/controllers/StructureController.class.php:1963
-#: libraries/controllers/StructureController.class.php:1968
-#: templates/columns_definitions/column_indexes.phtml:27
-#: templates/structure/check_all_table_column.phtml:37
-msgid "Spatial"
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1964
-#: libraries/controllers/StructureController.class.php:1969
-#: templates/columns_definitions/column_indexes.phtml:22
-#: templates/structure/check_all_table_column.phtml:47
-msgid "Fulltext"
-msgstr "Celý text"
-
-#: libraries/controllers/StructureController.class.php:1970
-msgid "Distinct values"
-msgstr "Odlišné hodnoty"
-
 #: libraries/controllers/TableChartController.class.php:82
 #: libraries/controllers/TableGisVisualizationController.class.php:101
 msgid "No SQL query was set to fetch data."
@@ -8054,11 +8000,18 @@ msgstr ""
 msgid "No data to display"
 msgstr "Žiadne dáta"
 
-#: libraries/controllers/TableRelationController.class.php:217
+#: libraries/controllers/TableIndexesController.class.php:161
+#: libraries/controllers/TableStructureController.class.php:736
+#: tbl_addfield.php:92
+#, php-format
+msgid "Table %1$s has been altered successfully."
+msgstr "Tabuľka %1$s bola úspešné upravená."
+
+#: libraries/controllers/TableRelationController.class.php:218
 msgid "Display column was successfully updated."
 msgstr "Zobrazený stĺpec bol aktualizovný."
 
-#: libraries/controllers/TableRelationController.class.php:283
+#: libraries/controllers/TableRelationController.class.php:288
 msgid "Internal relations were successfully updated."
 msgstr "Interné vzťahy boli úspešne zmenené."
 
@@ -8071,10 +8024,73 @@ msgid "Zoom search"
 msgstr "Zoom vyhľadávania"
 
 #: libraries/controllers/TableSearchController.class.php:852
-#: templates/table/selection_form.phtml:59
+#: templates/table/search/selection_form.phtml:59
 msgid "Find and replace"
 msgstr "Nájsť a nahradiť"
 
+#: libraries/controllers/TableStructureController.class.php:163
+#, php-format
+msgid "The name '%s' is a MySQL reserved keyword."
+msgid_plural "The names '%s' are MySQL reserved keywords."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: libraries/controllers/TableStructureController.class.php:241
+msgid "No column selected."
+msgstr "Nebol vybraný žiadny stĺpec."
+
+#: libraries/controllers/TableStructureController.class.php:467
+msgid "The columns have been moved successfully."
+msgstr "Stĺpce boli úspešne presunuté."
+
+#: libraries/controllers/TableStructureController.class.php:730
+#, fuzzy, php-format
+#| msgid "Table %1$s has been altered successfully."
+msgid ""
+"Table %1$s has been altered successfully. Privileges have been adjusted."
+msgstr "Tabuľka %1$s bola úspešné upravená."
+
+#: libraries/controllers/TableStructureController.class.php:783
+#: libraries/tracking.lib.php:1094
+msgid "Query error"
+msgstr "Chyba dopytu"
+
+#: libraries/controllers/TableStructureController.class.php:948
+#: templates/table/structure/check_all_table_column.phtml:11
+msgid "Change"
+msgstr "Zmeniť"
+
+#: libraries/controllers/TableStructureController.class.php:952
+#: libraries/controllers/TableStructureController.class.php:957
+#: libraries/navigation/Nodes/Node_Index.class.php:30
+#: libraries/tracking.lib.php:926
+#: templates/columns_definitions/column_indexes.phtml:16
+#: templates/columns_definitions/table_fields_definitions.phtml:57
+#: templates/table/structure/check_all_table_column.phtml:30
+#: templates/table/structure/display_structure.phtml:79
+#: templates/table/structure/display_table_stats.phtml:19
+msgid "Index"
+msgstr "Index"
+
+#: libraries/controllers/TableStructureController.class.php:954
+#: libraries/controllers/TableStructureController.class.php:959
+#: templates/columns_definitions/column_indexes.phtml:27
+#: templates/table/structure/check_all_table_column.phtml:37
+msgid "Spatial"
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:955
+#: libraries/controllers/TableStructureController.class.php:960
+#: templates/columns_definitions/column_indexes.phtml:22
+#: templates/table/structure/check_all_table_column.phtml:47
+msgid "Fulltext"
+msgstr "Celý text"
+
+#: libraries/controllers/TableStructureController.class.php:963
+msgid "Distinct values"
+msgstr "Odlišné hodnoty"
+
 #: libraries/core.lib.php:306
 #, php-format
 msgid "The %s extension is missing. Please check your PHP configuration."
@@ -8121,7 +8137,7 @@ msgid "No Password"
 msgstr "Žiadne heslo"
 
 #: libraries/display_change_password.lib.php:68
-#: libraries/plugins/auth/AuthenticationCookie.class.php:199
+#: libraries/plugins/auth/AuthenticationCookie.class.php:187
 #: libraries/replication_gui.lib.php:422 libraries/replication_gui.lib.php:862
 #: libraries/server_privileges.lib.php:1640
 msgid "Password:"
@@ -8907,12 +8923,12 @@ msgid "Dump has been saved to file %s."
 msgstr "Výpis bol uložený do súboru %s."
 
 #: libraries/import.lib.php:202 libraries/insert_edit.lib.php:124
-#: libraries/rte/rte_routines.lib.php:1353 libraries/sql.lib.php:1312
+#: libraries/rte/rte_routines.lib.php:1444 libraries/sql.lib.php:1306
 #: tbl_get_field.php:44
 msgid "MySQL returned an empty result set (i.e. zero rows)."
 msgstr "MySQL vrátil prázdny výsledok (tj. nulový počet riadkov)."
 
-#: libraries/import.lib.php:265 libraries/sql.lib.php:1326
+#: libraries/import.lib.php:265 libraries/sql.lib.php:1320
 msgid "[ROLLBACK occurred.]"
 msgstr ""
 
@@ -8976,14 +8992,14 @@ msgstr "Vytvoriť index na&nbsp;%s&nbsp;stĺpcoch"
 
 #: libraries/insert_edit.lib.php:233
 #: libraries/navigation/Nodes/Node_DatabaseChild.class.php:48
-#: templates/designer/table_list.phtml:40
+#: templates/database/designer/table_list.phtml:40
 msgid "Hide"
 msgstr "Skryť"
 
 #: libraries/insert_edit.lib.php:249
 #: libraries/navigation/Nodes/Node_Function.class.php:32
-#: libraries/rte/rte_routines.lib.php:1495
-#: templates/table/table_header.phtml:4
+#: libraries/rte/rte_routines.lib.php:1586
+#: templates/table/search/table_header.phtml:4
 msgid "Function"
 msgstr "Funkcia"
 
@@ -8996,84 +9012,85 @@ msgstr "Binárny"
 msgid "Because of its length,<br /> this column might not be editable."
 msgstr "Kvôli jeho dĺžke,<br /> sa toto pole nemusí dať upraviť."
 
-#: libraries/insert_edit.lib.php:1050
+#: libraries/insert_edit.lib.php:1048
 msgid "Binary - do not edit"
 msgstr "Binárny - neupravujte"
 
-#: libraries/insert_edit.lib.php:1176 libraries/server_privileges.lib.php:470
-#: templates/table/options.phtml:36
+#: libraries/insert_edit.lib.php:1174 libraries/server_privileges.lib.php:470
+#: templates/table/search/options.phtml:36
 msgid "Or"
 msgstr "Alebo"
 
-#: libraries/insert_edit.lib.php:1177
+#: libraries/insert_edit.lib.php:1175
 msgid "web server upload directory:"
 msgstr "upload adresár web serveru:"
 
-#: libraries/insert_edit.lib.php:1348 templates/table/input_box.phtml:49
+#: libraries/insert_edit.lib.php:1346
+#: templates/table/search/input_box.phtml:49
 msgid "Edit/Insert"
 msgstr "Upraviť/Vložiť"
 
-#: libraries/insert_edit.lib.php:1398
+#: libraries/insert_edit.lib.php:1396
 #, php-format
 msgid "Continue insertion with %s rows"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1428
+#: libraries/insert_edit.lib.php:1426
 msgid "and then"
 msgstr "a potom"
 
-#: libraries/insert_edit.lib.php:1461
+#: libraries/insert_edit.lib.php:1459
 msgid "Insert as new row"
 msgstr "Vložiť ako nový riadok"
 
-#: libraries/insert_edit.lib.php:1464
+#: libraries/insert_edit.lib.php:1462
 msgid "Insert as new row and ignore errors"
 msgstr "Vložiť ako nový riadok a ignorovať chyby"
 
-#: libraries/insert_edit.lib.php:1467
+#: libraries/insert_edit.lib.php:1465
 msgid "Show insert query"
 msgstr "Zobraziť insert dopyt"
 
-#: libraries/insert_edit.lib.php:1487
+#: libraries/insert_edit.lib.php:1485
 msgid "Go back to previous page"
 msgstr "Späť"
 
-#: libraries/insert_edit.lib.php:1490
+#: libraries/insert_edit.lib.php:1488
 msgid "Insert another new row"
 msgstr "Vložiť nový záznam"
 
-#: libraries/insert_edit.lib.php:1495
+#: libraries/insert_edit.lib.php:1493
 msgid "Go back to this page"
 msgstr "Späť na túto stránku"
 
-#: libraries/insert_edit.lib.php:1518
+#: libraries/insert_edit.lib.php:1516
 msgid "Edit next row"
 msgstr "Upraviť nasledujúci riadok"
 
-#: libraries/insert_edit.lib.php:1540
+#: libraries/insert_edit.lib.php:1538
 msgid ""
 "Use TAB key to move from value to value, or CTRL+arrows to move anywhere"
 msgstr ""
 "Pre pohyb medzi hodnotami použite klávesu TAB alebo pre pohyb všetkými "
 "smermi klávesy CTRL+šípky"
 
-#: libraries/insert_edit.lib.php:1577 libraries/replication_gui.lib.php:542
-#: libraries/rte/rte_routines.lib.php:1497
+#: libraries/insert_edit.lib.php:1575 libraries/replication_gui.lib.php:542
+#: libraries/rte/rte_routines.lib.php:1588
 #: libraries/server_status_variables.lib.php:220
-#: templates/designer/having_query_panel.phtml:100
-#: templates/designer/options_panel.phtml:73
-#: templates/designer/options_panel.phtml:239
-#: templates/designer/where_query_panel.phtml:69
-#: templates/table/table_header.phtml:10
-#: templates/table/zoom_result_form.phtml:35
+#: templates/database/designer/having_query_panel.phtml:100
+#: templates/database/designer/options_panel.phtml:73
+#: templates/database/designer/options_panel.phtml:239
+#: templates/database/designer/where_query_panel.phtml:69
+#: templates/table/search/table_header.phtml:10
+#: templates/table/search/zoom_result_form.phtml:35
 msgid "Value"
 msgstr "Hodnota"
 
-#: libraries/insert_edit.lib.php:1937 libraries/sql.lib.php:1309
+#: libraries/insert_edit.lib.php:1935 libraries/sql.lib.php:1303
 msgid "Showing SQL query"
 msgstr "Zobrazujem SQL dotaz"
 
-#: libraries/insert_edit.lib.php:1962 libraries/sql.lib.php:1287
+#: libraries/insert_edit.lib.php:1960 libraries/sql.lib.php:1281
 #, php-format
 msgid "Inserted row id: %1$d"
 msgstr "Vložený riadok id: %1$d"
@@ -9483,7 +9500,7 @@ msgstr "Nová"
 #: libraries/navigation/Nodes/Node_View_Container.class.php:26
 #: libraries/navigation/Nodes/Node_View_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:129
-#: templates/structure/show_create.phtml:30
+#: templates/database/structure/show_create.phtml:30
 msgid "Views"
 msgstr "Pohľady"
 
@@ -9771,7 +9788,7 @@ msgstr "Nemáte dostatočné práva na vykonanie tejto akcie!"
 
 #: libraries/operations.lib.php:101 libraries/operations.lib.php:249
 #: libraries/operations.lib.php:869 libraries/operations.lib.php:963
-#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:907
+#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:998
 #: templates/columns_definitions/table_fields_definitions.phtml:47
 msgid "Adjust Privileges"
 msgstr "Upraviť oprávnenia"
@@ -9861,22 +9878,22 @@ msgid "Switch to copied table"
 msgstr "Prepnúť na skopírovanú tabuľku"
 
 #: libraries/operations.lib.php:1360
-#: templates/structure/check_all_tables.phtml:18
+#: templates/database/structure/check_all_tables.phtml:18
 msgid "Table maintenance"
 msgstr "Údržba tabuľky"
 
 #: libraries/operations.lib.php:1398
-#: templates/structure/check_all_tables.phtml:19
+#: templates/database/structure/check_all_tables.phtml:19
 msgid "Analyze table"
 msgstr "Analyzovať tabuľku"
 
 #: libraries/operations.lib.php:1413
-#: templates/structure/check_all_tables.phtml:20
+#: templates/database/structure/check_all_tables.phtml:20
 msgid "Check table"
 msgstr "Skontrolovať tabuľku"
 
 #: libraries/operations.lib.php:1428
-#: templates/structure/check_all_tables.phtml:22
+#: templates/database/structure/check_all_tables.phtml:22
 #, fuzzy
 #| msgid "Check table"
 msgid "Checksum table"
@@ -9896,18 +9913,19 @@ msgid "Flush the table (FLUSH)"
 msgstr "Vyprázdniť tabuľku (FLUSH)"
 
 #: libraries/operations.lib.php:1477
-#: templates/structure/check_all_tables.phtml:23
-#: templates/structure/display_table_stats.phtml:56
+#: templates/database/structure/check_all_tables.phtml:23
+#: templates/table/structure/display_table_stats.phtml:56
 msgid "Optimize table"
 msgstr "Optimalizovať tabuľku"
 
 #: libraries/operations.lib.php:1492
-#: templates/structure/check_all_tables.phtml:24
+#: templates/database/structure/check_all_tables.phtml:24
 msgid "Repair table"
 msgstr "Opraviť tabuľku"
 
 #: libraries/operations.lib.php:1538
-#: templates/structure/check_all_tables.phtml:14 view_operations.php:127
+#: templates/database/structure/check_all_tables.phtml:14
+#: view_operations.php:127
 msgid "Delete data or table"
 msgstr "Odstrániť dáta alebo tabuľku"
 
@@ -10031,7 +10049,7 @@ msgid "Cannot connect: invalid settings."
 msgstr "Nepodarilo sa pripojiť: chybné nastavenia."
 
 #: libraries/plugins/auth/AuthenticationConfig.class.php:108
-#: libraries/plugins/auth/AuthenticationCookie.class.php:134
+#: libraries/plugins/auth/AuthenticationCookie.class.php:122
 #: libraries/plugins/auth/AuthenticationHttp.class.php:96
 #, php-format
 msgid "Welcome to %s"
@@ -10061,36 +10079,36 @@ msgstr ""
 msgid "Retry to connect"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:146
+#: libraries/plugins/auth/AuthenticationCookie.class.php:134
 msgid "Your session has expired. Please log in again."
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:170
+#: libraries/plugins/auth/AuthenticationCookie.class.php:158
 msgid "Log in"
 msgstr "Login"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:178
-#: libraries/plugins/auth/AuthenticationCookie.class.php:188
+#: libraries/plugins/auth/AuthenticationCookie.class.php:166
+#: libraries/plugins/auth/AuthenticationCookie.class.php:176
 msgid "You can enter hostname/IP address and port separated by space."
 msgstr "Možete zadať medzerou oddelený hostname/IP adresu a port."
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:193
+#: libraries/plugins/auth/AuthenticationCookie.class.php:181
 msgid "Username:"
 msgstr "Používateľ:"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:205
+#: libraries/plugins/auth/AuthenticationCookie.class.php:193
 msgid "Server Choice:"
 msgstr "Voľba servera:"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:386
+#: libraries/plugins/auth/AuthenticationCookie.class.php:374
 msgid "Entered captcha is wrong, try again!"
 msgstr "Vložená captcha je nesprávna, skúste znova!"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:396
+#: libraries/plugins/auth/AuthenticationCookie.class.php:384
 msgid "Please enter correct captcha!"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:423
+#: libraries/plugins/auth/AuthenticationCookie.class.php:411
 msgid "You are not allowed to log in to this MySQL server!"
 msgstr "Nemáte oprávnenie na prihlásenie k tomuto MySQL serveru!"
 
@@ -10186,7 +10204,7 @@ msgstr "Udalosť"
 #: libraries/plugins/export/ExportOdt.class.php:593
 #: libraries/plugins/export/ExportTexytext.class.php:428
 #: libraries/plugins/export/PMA_ExportPdf.class.php:313
-#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:984
 #: libraries/rte/rte_triggers.lib.php:377
 msgid "Definition"
 msgstr "Definícia"
@@ -10494,7 +10512,7 @@ msgid "Last check:"
 msgstr "Posledná kontrola:"
 
 #: libraries/plugins/export/ExportSql.class.php:1399
-#: templates/structure/structure_table_row.phtml:183
+#: templates/database/structure/structure_table_row.phtml:183
 msgid "in use"
 msgstr "práve sa používa"
 
@@ -10676,18 +10694,14 @@ msgstr ""
 msgid "The imported file does not contain any data!"
 msgstr "Nahraný súbor neobsahuje žiadne dáta!"
 
-#: libraries/plugins/import/ImportSql.class.php:169
+#: libraries/plugins/import/ImportSql.class.php:72
 msgid "SQL compatibility mode:"
 msgstr "Režim kompatibility SQL:"
 
-#: libraries/plugins/import/ImportSql.class.php:181
+#: libraries/plugins/import/ImportSql.class.php:84
 msgid "Do not use <code>AUTO_INCREMENT</code> for zero values"
 msgstr "Nepoužívať <code>AUTO_INCREMENT</code> pre nulové hodnoty"
 
-#: libraries/plugins/import/ImportSql.class.php:195
-msgid "Read as multibytes"
-msgstr "Čítať ako multibyty"
-
 #: libraries/plugins/import/ImportXml.class.php:54
 msgid "XML"
 msgstr "XML"
@@ -10730,7 +10744,7 @@ msgid "Show grid"
 msgstr "Zobraziť mriežku"
 
 #: libraries/plugins/schema/SchemaPdf.class.php:94
-#: templates/structure/print_view_data_dictionary_link.phtml:6
+#: templates/database/structure/print_view_data_dictionary_link.phtml:6
 msgid "Data Dictionary"
 msgstr "Dátový slovník"
 
@@ -10755,7 +10769,7 @@ msgid "The %s table doesn't exist!"
 msgstr "Tabuľka %s neexistuje!"
 
 #: libraries/plugins/schema/eps/Eps_Relation_Schema.class.php:321
-#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:309
+#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:323
 #, php-format
 msgid "Schema of the %s database - Page %s"
 msgstr "Schéma databázy %s - Strana %s"
@@ -10781,7 +10795,7 @@ msgstr "Obsah"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1005
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1028
 #: libraries/tracking.lib.php:884
-#: templates/structure/table_structure_header.phtml:11
+#: templates/table/structure/table_structure_header.phtml:11
 msgid "Extra"
 msgstr "Extra"
 
@@ -11120,32 +11134,32 @@ msgstr ""
 msgid "Create the needed tables with the <code>%screate_tables.sql</code>."
 msgstr ""
 
-#: libraries/relation.lib.php:360
+#: libraries/relation.lib.php:357
 msgid "Create a pma user and give access to these tables."
 msgstr ""
 
-#: libraries/relation.lib.php:365
+#: libraries/relation.lib.php:360
 msgid ""
 "Enable advanced features in configuration file (<code>config.inc.php</"
 "code>), for example by starting from <code>config.sample.inc.php</code>."
 msgstr ""
 
-#: libraries/relation.lib.php:373
+#: libraries/relation.lib.php:365
 msgid "Re-login to phpMyAdmin to load the updated configuration file."
 msgstr ""
 
-#: libraries/relation.lib.php:1612
+#: libraries/relation.lib.php:1607
 msgid "no description"
 msgstr "bez popisu"
 
-#: libraries/relation.lib.php:1811
+#: libraries/relation.lib.php:1806
 msgid ""
 "You do not have necessary privileges to create a database named "
 "'phpmyadmin'. You may go to 'Operations' tab of any database to set up the "
 "phpMyAdmin configuration storage there."
 msgstr ""
 
-#: libraries/relation.lib.php:1928
+#: libraries/relation.lib.php:1923
 #, fuzzy, php-format
 #| msgid "Missing phpMyAdmin configuration storage tables"
 msgid ""
@@ -11153,20 +11167,20 @@ msgid ""
 "configuration storage there."
 msgstr "Chýbajú tabuľky pre miesto uloženia phpMyAdmin konfigurácie"
 
-#: libraries/relation.lib.php:1936
+#: libraries/relation.lib.php:1931
 #, php-format
 msgid ""
 "%sCreate%s the phpMyAdmin configuration storage in the current database."
 msgstr ""
 "%sCreate%s miesto uloženia phpMyAdmin konfigurácie v aktuálnej databáze."
 
-#: libraries/relation.lib.php:1944
+#: libraries/relation.lib.php:1939
 #, php-format
 msgid "%sCreate%s missing phpMyAdmin configuration storage tables."
 msgstr "%sVytvoriť%s chýbajúce tabuľky pre uloženie phpMyAdmin konfigurácie."
 
 #: libraries/replication_gui.lib.php:46 libraries/replication_gui.lib.php:343
-#: libraries/server_databases.lib.php:387
+#: libraries/server_databases.lib.php:398
 msgid "Master replication"
 msgstr "Master replikácia"
 
@@ -11221,7 +11235,7 @@ msgid ""
 msgstr ""
 
 #: libraries/replication_gui.lib.php:141
-#: libraries/server_databases.lib.php:389
+#: libraries/server_databases.lib.php:400
 msgid "Slave replication"
 msgstr "Slave replikácia"
 
@@ -11489,10 +11503,10 @@ msgid "Master server changed successfully to %s."
 msgstr "Master server zmenený úspešne na %s."
 
 #: libraries/rte/rte_events.lib.php:106 libraries/rte/rte_events.lib.php:115
-#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:149
-#: libraries/rte/rte_routines.lib.php:158
-#: libraries/rte/rte_routines.lib.php:231
-#: libraries/rte/rte_routines.lib.php:1362
+#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:219
+#: libraries/rte/rte_routines.lib.php:246
+#: libraries/rte/rte_routines.lib.php:368
+#: libraries/rte/rte_routines.lib.php:1453
 #: libraries/rte/rte_triggers.lib.php:82 libraries/rte/rte_triggers.lib.php:91
 #: libraries/rte/rte_triggers.lib.php:123
 #, php-format
@@ -11513,7 +11527,7 @@ msgstr "Udalosť %1$s bola zmenená."
 msgid "Event %1$s has been created."
 msgstr "Udalosť %1$s bola vytvorená."
 
-#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:251
+#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:266
 #: libraries/rte/rte_triggers.lib.php:144
 msgid "One or more errors have occurred while processing your request:"
 msgstr "Pri spracovaní požiadavky došlo k jednej alebo viacerým chybám:"
@@ -11522,7 +11536,7 @@ msgstr "Pri spracovaní požiadavky došlo k jednej alebo viacerým chybám:"
 msgid "Edit event"
 msgstr "Upraviť udalosť"
 
-#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:794
+#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:885
 #: libraries/rte/rte_triggers.lib.php:323 view_create.php:180
 msgid "Details"
 msgstr "Podrobnosti"
@@ -11535,7 +11549,7 @@ msgstr "Meno udalosti"
 msgid "Event type"
 msgstr "Typ udalosti"
 
-#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:817
+#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:908
 #, php-format
 msgid "Change to %s"
 msgstr "Zmeniť na %s"
@@ -11562,12 +11576,14 @@ msgstr "Koniec"
 msgid "On completion preserve"
 msgstr "Zachovať pri ukončení"
 
-#: libraries/rte/rte_events.lib.php:491 libraries/rte/rte_routines.lib.php:930
+#: libraries/rte/rte_events.lib.php:491
+#: libraries/rte/rte_routines.lib.php:1021
 #: libraries/rte/rte_triggers.lib.php:383 view_create.php:209
 msgid "Definer"
 msgstr ""
 
-#: libraries/rte/rte_events.lib.php:535 libraries/rte/rte_routines.lib.php:997
+#: libraries/rte/rte_events.lib.php:535
+#: libraries/rte/rte_routines.lib.php:1088
 #: libraries/rte/rte_triggers.lib.php:422
 msgid "The definer must be in the \"username@hostname\" format!"
 msgstr ""
@@ -11593,9 +11609,9 @@ msgid "You must provide an event definition."
 msgstr ""
 
 #: libraries/rte/rte_export.lib.php:43 libraries/rte/rte_general.lib.php:72
-#: libraries/rte/rte_routines.lib.php:345
-#: libraries/rte/rte_routines.lib.php:1198
-#: libraries/rte/rte_routines.lib.php:1411
+#: libraries/rte/rte_routines.lib.php:153
+#: libraries/rte/rte_routines.lib.php:1289
+#: libraries/rte/rte_routines.lib.php:1502
 msgid "Error in processing request:"
 msgstr "Chyba pri spracovaní požiadavky:"
 
@@ -11631,120 +11647,120 @@ msgstr ""
 "[/strong] Aby ste sa vyhli týmto problémom, použite prosím nové rozšírenie "
 "'mysqli'."
 
-#: libraries/rte/rte_routines.lib.php:110
-#: libraries/rte/rte_routines.lib.php:1006
+#: libraries/rte/rte_routines.lib.php:123
+msgid "Edit routine"
+msgstr "Upraviť rutinu"
+
+#: libraries/rte/rte_routines.lib.php:200
+#: libraries/rte/rte_routines.lib.php:1097
 #, php-format
 msgid "Invalid routine type: \"%s\""
 msgstr "Chybný typ rutiny: \"%s\""
 
-#: libraries/rte/rte_routines.lib.php:170
+#: libraries/rte/rte_routines.lib.php:253
+#, php-format
+msgid "Routine %1$s has been created."
+msgstr "Rutina %1$s bola vytvorená."
+
+#: libraries/rte/rte_routines.lib.php:380
 msgid "Sorry, we failed to restore the dropped routine."
 msgstr "Bohužiaľ sa nepodarilo obnoviť odstránenú rutinu."
 
-#: libraries/rte/rte_routines.lib.php:211
+#: libraries/rte/rte_routines.lib.php:439
 #, fuzzy, php-format
 #| msgid "Routine %1$s has been modified."
 msgid "Routine %1$s has been modified. Privileges have been adjusted."
 msgstr "Rutina %1$s bola zmenená."
 
-#: libraries/rte/rte_routines.lib.php:216
+#: libraries/rte/rte_routines.lib.php:444
 #, php-format
 msgid "Routine %1$s has been modified."
 msgstr "Rutina %1$s bola zmenená."
 
-#: libraries/rte/rte_routines.lib.php:238
-#, php-format
-msgid "Routine %1$s has been created."
-msgstr "Rutina %1$s bola vytvorená."
-
-#: libraries/rte/rte_routines.lib.php:315
-msgid "Edit routine"
-msgstr "Upraviť rutinu"
-
-#: libraries/rte/rte_routines.lib.php:797
+#: libraries/rte/rte_routines.lib.php:888
 msgid "Routine name"
 msgstr "Meno rutiny"
 
-#: libraries/rte/rte_routines.lib.php:823
+#: libraries/rte/rte_routines.lib.php:914
 msgid "Parameters"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:829
+#: libraries/rte/rte_routines.lib.php:920
 msgid "Direction"
 msgstr "Smer"
 
-#: libraries/rte/rte_routines.lib.php:847
+#: libraries/rte/rte_routines.lib.php:938
 msgid "Add parameter"
 msgstr "Pridať parameter"
 
-#: libraries/rte/rte_routines.lib.php:851
+#: libraries/rte/rte_routines.lib.php:942
 msgid "Remove last parameter"
 msgstr "Odstrániť posledný parameter"
 
-#: libraries/rte/rte_routines.lib.php:856
+#: libraries/rte/rte_routines.lib.php:947
 msgid "Return type"
 msgstr "Návratový typ"
 
-#: libraries/rte/rte_routines.lib.php:862
+#: libraries/rte/rte_routines.lib.php:953
 msgid "Return length/values"
 msgstr "Vrátiť dĺžku/hodnoty"
 
-#: libraries/rte/rte_routines.lib.php:868
+#: libraries/rte/rte_routines.lib.php:959
 msgid "Return options"
 msgstr "Návratové možnosti"
 
-#: libraries/rte/rte_routines.lib.php:899
+#: libraries/rte/rte_routines.lib.php:990
 msgid "Is deterministic"
 msgstr "Je deterministický"
 
-#: libraries/rte/rte_routines.lib.php:920
+#: libraries/rte/rte_routines.lib.php:1011
 msgid ""
 "You do not have sufficient privileges to perform this operation; Please "
 "refer to the documentation for more details"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:935
+#: libraries/rte/rte_routines.lib.php:1026
 msgid "Security type"
 msgstr "Typ zabezpečenia"
 
-#: libraries/rte/rte_routines.lib.php:944
+#: libraries/rte/rte_routines.lib.php:1035
 msgid "SQL data access"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1013
+#: libraries/rte/rte_routines.lib.php:1104
 msgid "You must provide a routine name!"
 msgstr "Musíte zadať názov rutiny!"
 
-#: libraries/rte/rte_routines.lib.php:1047
+#: libraries/rte/rte_routines.lib.php:1138
 #, php-format
 msgid "Invalid direction \"%s\" given for parameter."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1069
-#: libraries/rte/rte_routines.lib.php:1131
+#: libraries/rte/rte_routines.lib.php:1160
+#: libraries/rte/rte_routines.lib.php:1222
 msgid ""
 "You must provide length/values for routine parameters of type ENUM, SET, "
 "VARCHAR and VARBINARY."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1095
+#: libraries/rte/rte_routines.lib.php:1186
 msgid "You must provide a name and a type for each routine parameter."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1114
+#: libraries/rte/rte_routines.lib.php:1205
 msgid "You must provide a valid return type for the routine."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1174
+#: libraries/rte/rte_routines.lib.php:1265
 msgid "You must provide a routine definition."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1285
+#: libraries/rte/rte_routines.lib.php:1376
 #, php-format
 msgid "Execution results of routine %s"
 msgstr "Výsledky spustenia rutiny %s"
 
-#: libraries/rte/rte_routines.lib.php:1340
+#: libraries/rte/rte_routines.lib.php:1431
 #, php-format
 msgid "%d row affected by the last statement inside the procedure."
 msgid_plural "%d rows affected by the last statement inside the procedure."
@@ -11752,13 +11768,13 @@ msgstr[0] "Posledným príkazom v procedúre bol ovplyvnený %d riadok."
 msgstr[1] "Posledným príkazom v procedúre boli ovplyvnené %d riadky."
 msgstr[2] "Posledným príkazom v procedúre bolo ovplyvnených %d riadkov."
 
-#: libraries/rte/rte_routines.lib.php:1398
-#: libraries/rte/rte_routines.lib.php:1406
+#: libraries/rte/rte_routines.lib.php:1489
+#: libraries/rte/rte_routines.lib.php:1497
 msgid "Execute routine"
 msgstr "Spustiť rutinu"
 
-#: libraries/rte/rte_routines.lib.php:1485
-#: libraries/rte/rte_routines.lib.php:1488
+#: libraries/rte/rte_routines.lib.php:1576
+#: libraries/rte/rte_routines.lib.php:1579
 msgid "Routine parameters"
 msgstr ""
 
@@ -11912,7 +11928,7 @@ msgid "Original position"
 msgstr "Pôvodná pozícia"
 
 #: libraries/server_bin_log.lib.php:133
-#: templates/structure/display_table_stats.phtml:4
+#: templates/table/structure/display_table_stats.phtml:4
 msgid "Information"
 msgstr "Informácia"
 
@@ -11950,12 +11966,12 @@ msgstr ""
 "Poznámka: Aktivovanie štatistík databázy môže spôsobiť značné zvýšenie "
 "sieťovej prevádzky medzi databázou a web serverom."
 
-#: libraries/server_databases.lib.php:364
-#: libraries/server_databases.lib.php:365
+#: libraries/server_databases.lib.php:366
+#: libraries/server_databases.lib.php:371
 msgid "Enable Statistics"
 msgstr "Zobraziť štatistiky"
 
-#: libraries/server_databases.lib.php:481
+#: libraries/server_databases.lib.php:492
 #, php-format
 msgid "%1$d database has been dropped successfully."
 msgid_plural "%1$d databases have been dropped successfully."
@@ -12327,7 +12343,7 @@ msgid "You have revoked the privileges for %s."
 msgstr "Boli zrušené oprávnenia pre %s."
 
 #: libraries/server_privileges.lib.php:2059
-#: libraries/server_privileges.lib.php:4290
+#: libraries/server_privileges.lib.php:4316
 #, fuzzy
 #| msgid "Add user group"
 msgid "Add user account"
@@ -12506,59 +12522,59 @@ msgstr "Odstraňuje sa %s"
 msgid "The privileges were reloaded successfully."
 msgstr "Práva boli úspešne znovunačítané."
 
-#: libraries/server_privileges.lib.php:3994
+#: libraries/server_privileges.lib.php:4003
 #, php-format
 msgid "The user %s already exists!"
 msgstr "Používateľ %s už existuje!"
 
-#: libraries/server_privileges.lib.php:4232
+#: libraries/server_privileges.lib.php:4258
 #, php-format
 msgid "Privileges for %s"
 msgstr "Oprávnenia pre %s"
 
-#: libraries/server_privileges.lib.php:4241
+#: libraries/server_privileges.lib.php:4267
 #: libraries/server_status_processes.lib.php:72
 #: libraries/server_user_groups.lib.php:39
 msgid "User"
 msgstr "Používateľ"
 
-#: libraries/server_privileges.lib.php:4282
+#: libraries/server_privileges.lib.php:4308
 msgctxt "Create new user"
 msgid "New"
 msgstr "Nový"
 
-#: libraries/server_privileges.lib.php:4311
+#: libraries/server_privileges.lib.php:4337
 #, fuzzy
 #| msgid "Edit Privileges:"
 msgid "Edit privileges:"
 msgstr "Upraviť oprávnenia:"
 
-#: libraries/server_privileges.lib.php:4312
+#: libraries/server_privileges.lib.php:4338
 #, fuzzy
 #| msgid "User groups"
 msgid "User account"
 msgstr "Užívateľské skupiny"
 
-#: libraries/server_privileges.lib.php:4371
+#: libraries/server_privileges.lib.php:4397
 msgid ""
 "Note: You are attempting to edit privileges of the user with which you are "
 "currently logged in."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4391 libraries/server_users.lib.php:25
+#: libraries/server_privileges.lib.php:4417 libraries/server_users.lib.php:25
 #, fuzzy
 #| msgid "Users overview"
 msgid "User accounts overview"
 msgstr "Zoznam používatelov"
 
-#: libraries/server_privileges.lib.php:4459
+#: libraries/server_privileges.lib.php:4485
 msgid ""
 "A user account allowing any user from localhost to connect is present. This "
 "will prevent other users from connecting if the host part of their account "
 "allows a connection from any (%) host."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4500
+#: libraries/server_privileges.lib.php:4526
 #, php-format
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
@@ -12571,7 +12587,7 @@ msgstr ""
 "tieto tabuľky ručne upravené. V tomto prípade sa odporúča vykonať "
 "%sznovunačítanie práv%s predtým ako budete pokračovať."
 
-#: libraries/server_privileges.lib.php:4519
+#: libraries/server_privileges.lib.php:4545
 #, fuzzy
 #| msgid ""
 #| "Note: phpMyAdmin gets the users' privileges directly from MySQL's "
@@ -12590,25 +12606,25 @@ msgstr ""
 "tieto tabuľky ručne upravené. V tomto prípade sa odporúča vykonať "
 "%sznovunačítanie práv%s predtým ako budete pokračovať."
 
-#: libraries/server_privileges.lib.php:4569
+#: libraries/server_privileges.lib.php:4595
 msgid "The selected user was not found in the privilege table."
 msgstr "Zvolený používateľ nebol nájdený v tabuľke práv."
 
-#: libraries/server_privileges.lib.php:4801
+#: libraries/server_privileges.lib.php:4827
 msgid "You have added a new user."
 msgstr "Používateľ bol pridaný."
 
-#: libraries/server_status.lib.php:53
+#: libraries/server_status.lib.php:60
 #, php-format
 msgid "Network traffic since startup: %s"
 msgstr ""
 
-#: libraries/server_status.lib.php:66
+#: libraries/server_status.lib.php:73
 #, php-format
 msgid "This MySQL server has been running for %1$s. It started up on %2$s."
 msgstr "Tento MySQL server beží %1$s. Bol spustený %2$s."
 
-#: libraries/server_status.lib.php:80
+#: libraries/server_status.lib.php:94
 msgid ""
 "This MySQL server works as <b>master</b> and <b>slave</b> in <b>replication</"
 "b> process."
@@ -12616,22 +12632,22 @@ msgstr ""
 "Tento server je nakonfigurovaný ako <b>master</b> a <b>slave</b> v "
 "<b>replikačnom</b> procese."
 
-#: libraries/server_status.lib.php:85
+#: libraries/server_status.lib.php:99
 msgid "This MySQL server works as <b>master</b> in <b>replication</b> process."
 msgstr ""
 "Tento MYSQL server je nakonfigurovaný ako <b>master</b> v <b>replikačnom</b> "
 "procese."
 
-#: libraries/server_status.lib.php:90
+#: libraries/server_status.lib.php:104
 msgid "This MySQL server works as <b>slave</b> in <b>replication</b> process."
 msgstr ""
 "Tento MYSQL server pracuje ako <b>slave</b> v <b>replikačnom</b> procese."
 
-#: libraries/server_status.lib.php:106
+#: libraries/server_status.lib.php:116
 msgid "Replication status"
 msgstr "Stav replikácie"
 
-#: libraries/server_status.lib.php:137
+#: libraries/server_status.lib.php:146
 msgid ""
 "On a busy server, the byte counters may overrun, so those statistics as "
 "reported by the MySQL server may be incorrect."
@@ -12639,21 +12655,21 @@ msgstr ""
 "Na vyťaženom serveri môže dôjsť k pretečeniu počítadiel, takže štatistiky "
 "servera môžu byť nepresné."
 
-#: libraries/server_status.lib.php:148
+#: libraries/server_status.lib.php:157
 msgid "Received"
 msgstr "Prijaté"
 
-#: libraries/server_status.lib.php:167
+#: libraries/server_status.lib.php:176
 msgid "Sent"
 msgstr "Odoslané"
 
-#: libraries/server_status.lib.php:234
+#: libraries/server_status.lib.php:243
 #, fuzzy
 #| msgid "max. concurrent connections"
 msgid "Max. concurrent connections"
 msgstr "max. súčasných pripojení"
 
-#: libraries/server_status.lib.php:244
+#: libraries/server_status.lib.php:253
 msgid "Failed attempts"
 msgstr "Nepodarených pokusov"
 
@@ -13687,7 +13703,7 @@ msgstr ""
 msgid "Not implemented yet."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/AlterOperation.php:193
+#: libraries/sql-parser/src/Components/AlterOperation.php:191
 #, fuzzy
 #| msgid "Iconic table operations"
 msgid "Unrecognized alter operation."
@@ -13703,7 +13719,7 @@ msgid "An opening bracket followed by a set of values was expected."
 msgstr ""
 
 #: libraries/sql-parser/src/Components/ArrayObj.php:101
-#: libraries/sql-parser/src/Components/FieldDefinition.php:202
+#: libraries/sql-parser/src/Components/CreateDefinition.php:202
 msgid "An opening bracket was expected."
 msgstr ""
 
@@ -13711,25 +13727,35 @@ msgstr ""
 msgid "A comma or a closing bracket was expected"
 msgstr ""
 
+#: libraries/sql-parser/src/Components/CreateDefinition.php:246
+#, fuzzy
+#| msgid "No tables selected."
+msgid "A comma or a closing bracket was expected."
+msgstr "Neboli vybrané žiadne tabuľky."
+
+#: libraries/sql-parser/src/Components/CreateDefinition.php:262
+msgid "A closing bracket was expected."
+msgstr ""
+
 #: libraries/sql-parser/src/Components/DataType.php:125
 msgid "Unrecognized data type."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:225
+#: libraries/sql-parser/src/Components/Expression.php:227
 msgid "Unexpected closing bracket."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:246
-#: libraries/sql-parser/src/Components/Expression.php:283
-#: libraries/sql-parser/src/Components/Expression.php:303
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:285
+#: libraries/sql-parser/src/Components/Expression.php:305
 msgid "An alias was previously found."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:257
+#: libraries/sql-parser/src/Components/Expression.php:259
 msgid "Unexpected dot."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:327
+#: libraries/sql-parser/src/Components/Expression.php:329
 #, fuzzy
 #| msgid "No tables selected."
 msgid "An alias was expected."
@@ -13741,16 +13767,6 @@ msgstr "Neboli vybrané žiadne tabuľky."
 msgid "An expression was expected."
 msgstr "Nie je vybraná verzia."
 
-#: libraries/sql-parser/src/Components/FieldDefinition.php:246
-#, fuzzy
-#| msgid "No tables selected."
-msgid "A comma or a closing bracket was expected."
-msgstr "Neboli vybrané žiadne tabuľky."
-
-#: libraries/sql-parser/src/Components/FieldDefinition.php:262
-msgid "A closing bracket was expected."
-msgstr ""
-
 #: libraries/sql-parser/src/Components/Limit.php:90
 #: libraries/sql-parser/src/Components/Limit.php:112
 msgid "An offset was expected."
@@ -13798,29 +13814,29 @@ msgstr ""
 msgid "Expected delimiter."
 msgstr ""
 
-#: libraries/sql-parser/src/Lexer.php:753
+#: libraries/sql-parser/src/Lexer.php:777
 #, fuzzy, php-format
 #| msgid "Event %1$s has been created."
 msgid "Ending quote %1$s was expected."
 msgstr "Udalosť %1$s bola vytvorená."
 
-#: libraries/sql-parser/src/Lexer.php:789
+#: libraries/sql-parser/src/Lexer.php:813
 #, fuzzy
 #| msgid "Table name template"
 msgid "Variable name was expected."
 msgstr "Vzor pre názov tabuľky"
 
-#: libraries/sql-parser/src/Parser.php:380
+#: libraries/sql-parser/src/Parser.php:391
 #, fuzzy
 #| msgid "at beginning of table"
 msgid "Unexpected beginning of statement."
 msgstr "na začiatku tabuľky"
 
-#: libraries/sql-parser/src/Parser.php:399
+#: libraries/sql-parser/src/Parser.php:410
 msgid "Unrecognized statement type."
 msgstr ""
 
-#: libraries/sql-parser/src/Parser.php:479
+#: libraries/sql-parser/src/Parser.php:489
 msgid "No transaction was previously started."
 msgstr ""
 
@@ -13850,8 +13866,10 @@ msgid "The name of the entity was expected."
 msgstr "Počet práve otvorených tabuliek."
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:310
-msgid "At least one field definition was expected."
-msgstr ""
+#, fuzzy
+#| msgid "The row has been deleted."
+msgid "At least one column definition was expected."
+msgstr "Riadok bol zmazaný."
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:329
 msgid "A \"RETURNS\" keyword was expected."
@@ -13910,11 +13928,11 @@ msgstr "Záložka nebola vytvorená!"
 msgid "Using bookmark \"%s\" as default browse query."
 msgstr ""
 
-#: libraries/sql.lib.php:1306
+#: libraries/sql.lib.php:1300
 msgid "Showing as PHP code"
 msgstr "Zobrazujem ako PHP kód"
 
-#: libraries/sql.lib.php:1638
+#: libraries/sql.lib.php:1632
 #, fuzzy, php-format
 #| msgid ""
 #| "Current selection does not contain a unique column. Grid edit, checkbox, "
@@ -13926,7 +13944,7 @@ msgstr ""
 "Aktuálny výber neobsahuje unikátny stĺpec. Úprava gridu, zaškrtávanie, "
 "editácia, kopírovanie a mazanie nie sú dostupné."
 
-#: libraries/sql.lib.php:1649
+#: libraries/sql.lib.php:1643
 #, fuzzy, php-format
 #| msgid ""
 #| "Current selection does not contain a unique column. Grid edit, checkbox, "
@@ -13938,7 +13956,7 @@ msgstr ""
 "Aktuálny výber neobsahuje unikátny stĺpec. Úprava gridu, zaškrtávanie, "
 "editácia, kopírovanie a mazanie nie sú dostupné."
 
-#: libraries/sql.lib.php:1688
+#: libraries/sql.lib.php:1682
 #, php-format
 msgid "Problems with indexes of table `%s`"
 msgstr "Problémy s indexami v tabuľke `%s`"
@@ -14097,7 +14115,7 @@ msgid "Version %s snapshot (SQL code)"
 msgstr ""
 
 #: libraries/tracking.lib.php:947
-#: templates/structure/table_structure_row.phtml:33
+#: templates/table/structure/table_structure_row.phtml:33
 msgctxt "None for default"
 msgid "None"
 msgstr "Žiadny"
@@ -14149,15 +14167,15 @@ msgstr "Verzia %1$s z %2$s bola zmazaná."
 msgid "Version %1$s was created, tracking for %2$s is active."
 msgstr ""
 
-#: libraries/user_preferences.inc.php:29
+#: libraries/user_preferences.inc.php:30
 msgid "Manage your settings"
 msgstr "Spravovať svoje nastavenia"
 
-#: libraries/user_preferences.inc.php:46 prefs_manage.php:307
+#: libraries/user_preferences.inc.php:54 prefs_manage.php:307
 msgid "Configuration has been saved."
 msgstr "Nastavenia boli uložené."
 
-#: libraries/user_preferences.inc.php:66
+#: libraries/user_preferences.inc.php:74
 #, php-format
 msgid ""
 "Your preferences will be saved for current session only. Storing them "
@@ -14541,7 +14559,7 @@ msgid "first"
 msgstr "prvý"
 
 #: templates/columns_definitions/move_column.phtml:12
-#: templates/structure/add_column.phtml:21
+#: templates/table/structure/add_column.phtml:21
 #, php-format
 msgid "after %s"
 msgstr "po %s"
@@ -14610,197 +14628,295 @@ msgstr "Vstupná transformácia"
 msgid "Input transformation options"
 msgstr "Vstupné parametre transformácie"
 
-#: templates/designer/aggregate_query_panel.phtml:22
-#: templates/designer/options_panel.phtml:100
-msgid "Aggregate"
-msgstr "Zlúčiť"
-
-#: templates/designer/aggregate_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:61
-#: templates/designer/options_panel.phtml:106
-#: templates/designer/options_panel.phtml:170
-#: templates/designer/where_query_panel.phtml:30
-#: templates/table/table_header.phtml:9
-msgid "Operator"
-msgstr "Operátor"
-
-#: templates/designer/database_tables.phtml:29
-msgid "Toggle"
-msgstr ""
-
-#: templates/designer/database_tables.phtml:40
-msgid "See table structure"
-msgstr "Zobraziť štruktúru tabuľky"
-
-#: templates/designer/delete_relation_panel.phtml:21
-msgid "Delete relation"
-msgstr "Zmazať reláciu"
-
-#: templates/designer/edit_delete_pages.phtml:7
-msgid "Page to open"
-msgstr "Otvoriť stránku"
-
-#: templates/designer/edit_delete_pages.phtml:7
-msgid "Page to delete"
-msgstr "Stránka na odstránenie"
-
-#: templates/designer/having_query_panel.phtml:90
-#: templates/designer/options_panel.phtml:63
-#: templates/designer/options_panel.phtml:229
-#: templates/designer/where_query_panel.phtml:59
-msgid "Except"
-msgstr "Okrem"
-
-#: templates/designer/having_query_panel.phtml:102
-#: templates/designer/options_panel.phtml:75
-#: templates/designer/options_panel.phtml:241
-#: templates/designer/where_query_panel.phtml:71
-msgid "subquery"
-msgstr "poddopyt"
-
-#: templates/designer/new_relation_panel.phtml:22
-#: templates/designer/side_menu.phtml:84 templates/designer/side_menu.phtml:87
-msgid "Create relation"
-msgstr "Vytvoriť relaciu"
-
-#: templates/designer/options_panel.phtml:34
-#: templates/designer/options_panel.phtml:200
-msgid "Relation operator"
-msgstr "Relačný operátor"
-
-#: templates/designer/options_panel.phtml:85
-#: templates/designer/rename_to_panel.phtml:23
-msgid "Rename to"
-msgstr "Premenovať na"
-
-#: templates/designer/options_panel.phtml:91
-#: templates/designer/rename_to_panel.phtml:31
-msgid "New name"
-msgstr "Nové meno"
-
-#: templates/designer/page_save_as.phtml:4
-msgid "Save to selected page"
-msgstr "Uložiť na zvolenú stránku"
-
-#: templates/designer/page_save_as.phtml:5
-msgid "Create a page and save to it"
-msgstr "Vytvoriť stránku a uložiť do nej"
-
-#: templates/designer/page_save_as.phtml:26
-msgid "New page name"
-msgstr "Názov novej stránky"
-
-#: templates/designer/page_selector.phtml:2
-msgid "Select page"
-msgstr "Zvoliť stránku"
-
-#: templates/designer/query_details.phtml:10
-msgid "Active options"
-msgstr "Zapnuté parametre"
-
-#: templates/designer/schema_export.phtml:4
-msgid "Select Export Relational Type"
-msgstr ""
-
-#: templates/designer/side_menu.phtml:19 templates/designer/side_menu.phtml:25
-msgid "Show/Hide tables list"
-msgstr "Zobraziť/skryť zoznam tabuliek"
-
-#: templates/designer/side_menu.phtml:29 templates/designer/side_menu.phtml:35
-#: templates/designer/side_menu.phtml:36
-msgid "View in fullscreen"
-msgstr ""
-
-#: templates/designer/side_menu.phtml:34
-msgid "Exit fullscreen"
-msgstr ""
-
-#: templates/designer/side_menu.phtml:41 templates/designer/side_menu.phtml:45
-msgid "New page"
-msgstr "Nová stránka"
-
-#: templates/designer/side_menu.phtml:70 templates/designer/side_menu.phtml:73
-msgid "Delete pages"
-msgstr "Odstrániť stránky"
-
-#: templates/designer/side_menu.phtml:77 templates/designer/side_menu.phtml:80
-#: templates/table/create_table.phtml:7
+#: templates/database/create_table.phtml:7
+#: templates/database/designer/side_menu.phtml:77
+#: templates/database/designer/side_menu.phtml:80
 msgid "Create table"
 msgstr "Vytvoriť tabuľku"
 
-#: templates/designer/side_menu.phtml:98
-#: templates/designer/side_menu.phtml:101
+#: templates/database/create_table.phtml:15
+msgid "Number of columns"
+msgstr "Počet polí"
+
+#: templates/database/designer/aggregate_query_panel.phtml:22
+#: templates/database/designer/options_panel.phtml:100
+msgid "Aggregate"
+msgstr "Zlúčiť"
+
+#: templates/database/designer/aggregate_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:61
+#: templates/database/designer/options_panel.phtml:106
+#: templates/database/designer/options_panel.phtml:170
+#: templates/database/designer/where_query_panel.phtml:30
+#: templates/table/search/table_header.phtml:9
+msgid "Operator"
+msgstr "Operátor"
+
+#: templates/database/designer/database_tables.phtml:29
+msgid "Toggle"
+msgstr ""
+
+#: templates/database/designer/database_tables.phtml:40
+msgid "See table structure"
+msgstr "Zobraziť štruktúru tabuľky"
+
+#: templates/database/designer/delete_relation_panel.phtml:21
+msgid "Delete relation"
+msgstr "Zmazať reláciu"
+
+#: templates/database/designer/edit_delete_pages.phtml:7
+msgid "Page to open"
+msgstr "Otvoriť stránku"
+
+#: templates/database/designer/edit_delete_pages.phtml:7
+msgid "Page to delete"
+msgstr "Stránka na odstránenie"
+
+#: templates/database/designer/having_query_panel.phtml:90
+#: templates/database/designer/options_panel.phtml:63
+#: templates/database/designer/options_panel.phtml:229
+#: templates/database/designer/where_query_panel.phtml:59
+msgid "Except"
+msgstr "Okrem"
+
+#: templates/database/designer/having_query_panel.phtml:102
+#: templates/database/designer/options_panel.phtml:75
+#: templates/database/designer/options_panel.phtml:241
+#: templates/database/designer/where_query_panel.phtml:71
+msgid "subquery"
+msgstr "poddopyt"
+
+#: templates/database/designer/new_relation_panel.phtml:22
+#: templates/database/designer/side_menu.phtml:84
+#: templates/database/designer/side_menu.phtml:87
+msgid "Create relation"
+msgstr "Vytvoriť relaciu"
+
+#: templates/database/designer/options_panel.phtml:34
+#: templates/database/designer/options_panel.phtml:200
+msgid "Relation operator"
+msgstr "Relačný operátor"
+
+#: templates/database/designer/options_panel.phtml:85
+#: templates/database/designer/rename_to_panel.phtml:23
+msgid "Rename to"
+msgstr "Premenovať na"
+
+#: templates/database/designer/options_panel.phtml:91
+#: templates/database/designer/rename_to_panel.phtml:31
+msgid "New name"
+msgstr "Nové meno"
+
+#: templates/database/designer/page_save_as.phtml:4
+msgid "Save to selected page"
+msgstr "Uložiť na zvolenú stránku"
+
+#: templates/database/designer/page_save_as.phtml:5
+msgid "Create a page and save to it"
+msgstr "Vytvoriť stránku a uložiť do nej"
+
+#: templates/database/designer/page_save_as.phtml:26
+msgid "New page name"
+msgstr "Názov novej stránky"
+
+#: templates/database/designer/page_selector.phtml:2
+msgid "Select page"
+msgstr "Zvoliť stránku"
+
+#: templates/database/designer/query_details.phtml:10
+msgid "Active options"
+msgstr "Zapnuté parametre"
+
+#: templates/database/designer/schema_export.phtml:4
+msgid "Select Export Relational Type"
+msgstr ""
+
+#: templates/database/designer/side_menu.phtml:19
+#: templates/database/designer/side_menu.phtml:25
+msgid "Show/Hide tables list"
+msgstr "Zobraziť/skryť zoznam tabuliek"
+
+#: templates/database/designer/side_menu.phtml:29
+#: templates/database/designer/side_menu.phtml:35
+#: templates/database/designer/side_menu.phtml:36
+msgid "View in fullscreen"
+msgstr ""
+
+#: templates/database/designer/side_menu.phtml:34
+msgid "Exit fullscreen"
+msgstr ""
+
+#: templates/database/designer/side_menu.phtml:41
+#: templates/database/designer/side_menu.phtml:45
+msgid "New page"
+msgstr "Nová stránka"
+
+#: templates/database/designer/side_menu.phtml:70
+#: templates/database/designer/side_menu.phtml:73
+msgid "Delete pages"
+msgstr "Odstrániť stránky"
+
+#: templates/database/designer/side_menu.phtml:98
+#: templates/database/designer/side_menu.phtml:101
 msgid "Reload"
 msgstr "Znovu načítať"
 
-#: templates/designer/side_menu.phtml:107
-#: templates/designer/side_menu.phtml:110
+#: templates/database/designer/side_menu.phtml:107
+#: templates/database/designer/side_menu.phtml:110
 msgid "Help"
 msgstr "Pomoc"
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Angular links"
 msgstr "Pravouhlé spoje"
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Direct links"
 msgstr "Priame odkazy"
 
-#: templates/designer/side_menu.phtml:122
-#: templates/designer/side_menu.phtml:124
+#: templates/database/designer/side_menu.phtml:122
+#: templates/database/designer/side_menu.phtml:124
 msgid "Snap to grid"
 msgstr "Prichytiť k mriežke"
 
-#: templates/designer/side_menu.phtml:128
-#: templates/designer/side_menu.phtml:134
+#: templates/database/designer/side_menu.phtml:128
+#: templates/database/designer/side_menu.phtml:134
 msgid "Small/Big All"
 msgstr "Všetko Malé/Veľké"
 
-#: templates/designer/side_menu.phtml:138
-#: templates/designer/side_menu.phtml:141
+#: templates/database/designer/side_menu.phtml:138
+#: templates/database/designer/side_menu.phtml:141
 msgid "Toggle small/big"
 msgstr "Prepnúť malé/veľké"
 
-#: templates/designer/side_menu.phtml:145
-#: templates/designer/side_menu.phtml:148
+#: templates/database/designer/side_menu.phtml:145
+#: templates/database/designer/side_menu.phtml:148
 msgid "Toggle relation lines"
 msgstr "Prepnúť príbuzné riadky"
 
-#: templates/designer/side_menu.phtml:153
-#: templates/designer/side_menu.phtml:156
+#: templates/database/designer/side_menu.phtml:153
+#: templates/database/designer/side_menu.phtml:156
 msgid "Export schema"
 msgstr "Exportovať schému"
 
-#: templates/designer/side_menu.phtml:165
-#: templates/designer/side_menu.phtml:168
+#: templates/database/designer/side_menu.phtml:165
+#: templates/database/designer/side_menu.phtml:168
 msgid "Build Query"
 msgstr "Vytvoriť dopyt"
 
-#: templates/designer/side_menu.phtml:173
-#: templates/designer/side_menu.phtml:177
+#: templates/database/designer/side_menu.phtml:173
+#: templates/database/designer/side_menu.phtml:177
 msgid "Move Menu"
 msgstr "Presunúť Menu"
 
-#: templates/designer/side_menu.phtml:181
-#: templates/designer/side_menu.phtml:186
+#: templates/database/designer/side_menu.phtml:181
+#: templates/database/designer/side_menu.phtml:186
 msgid "Pin text"
 msgstr "Pripnúť text"
 
-#: templates/designer/table_list.phtml:4
+#: templates/database/designer/table_list.phtml:4
 msgid "Hide/Show all"
 msgstr "Skryť/Zobraziť všetko"
 
-#: templates/designer/table_list.phtml:14
+#: templates/database/designer/table_list.phtml:14
 msgid "Hide/Show Tables with no relation"
 msgstr ""
 
-#: templates/designer/table_list.phtml:59
+#: templates/database/designer/table_list.phtml:59
 msgid "Number of tables:"
 msgstr "Počet tabuliek:"
 
+#: templates/database/structure/body_for_table_summary.phtml:6
+#, php-format
+msgid "%s table"
+msgid_plural "%s tables"
+msgstr[0] "%s tabuľka"
+msgstr[1] "%s tabuľky"
+msgstr[2] "%s tabuliek"
+
+#: templates/database/structure/body_for_table_summary.phtml:17
+msgid "Sum"
+msgstr "Celkom"
+
+#: templates/database/structure/check_all_tables.phtml:6
+msgid "Check tables having overhead"
+msgstr "Zvoliť neoptimálne"
+
+#: templates/database/structure/check_all_tables.phtml:10
+msgid "Show create"
+msgstr "Zobraziť vytvorenie"
+
+#: templates/database/structure/check_all_tables.phtml:27
+#, fuzzy
+#| msgid "Add prefix"
+msgid "Prefix"
+msgstr "Pridať prefix"
+
+#: templates/database/structure/check_all_tables.phtml:28
+msgid "Add prefix to table"
+msgstr "Pridať predponu k tabuľke"
+
+#: templates/database/structure/check_all_tables.phtml:29
+msgid "Replace table prefix"
+msgstr "Nahradiť predponu tabuľky"
+
+#: templates/database/structure/check_all_tables.phtml:30
+msgid "Copy table with prefix"
+msgstr "Skopírovať tabuľku s predponou"
+
+#: templates/database/structure/check_all_tables.phtml:36
+msgid "Add columns to central list"
+msgstr "Pridať stĺpce do centrálneho zoznamu"
+
+#: templates/database/structure/check_all_tables.phtml:37
+msgid "Remove columns from central list"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:38
+msgid "Make consistent with central list"
+msgstr "Zosúladiť s centrálnym zoznamom"
+
+#: templates/database/structure/favorite_anchor.phtml:12
+msgid "Add to Favorites"
+msgstr "Pridať k obľúbeným"
+
+#: templates/database/structure/show_create.phtml:2
+msgid "Showing create queries"
+msgstr "Zobrazovanie SQL dopytov pre vytvorenie"
+
+#: templates/database/structure/sortable_header.phtml:13
+msgid "Sort"
+msgstr "Triediť"
+
+#: templates/database/structure/table_header.phtml:42
+msgid ""
+"May be approximate. Click on the number to get the exact count. See "
+"[doc@faq3-11]FAQ 3.11[/doc]."
+msgstr ""
+"Môže byť nepresné. Kliknutím na číslo dostanete presný počet. Viď "
+"[doc@faq3-11]FAQ 3.11[/doc]."
+
+#: templates/database/structure/table_header.phtml:66
+#: templates/table/index_form.phtml:127
+msgid "Size"
+msgstr "Veľkosť"
+
+#: templates/database/structure/table_header.phtml:74
+#: templates/table/structure/display_table_stats.phtml:27
+msgid "Overhead"
+msgstr "Naviac"
+
+#: templates/database/structure/tracking_icon.phtml:4
+msgid "Tracking is active."
+msgstr "Sledovanie je aktívne."
+
+#: templates/database/structure/tracking_icon.phtml:8
+msgid "Tracking is not active."
+msgstr "Sledovanie nie je aktívne."
+
 #: templates/error/report_form.phtml:7
 msgid ""
 "phpMyAdmin has encountered an error. We have collected data about this error "
@@ -14816,59 +14932,6 @@ msgstr ""
 msgid "Please explain the steps that lead to the error:"
 msgstr ""
 
-#: templates/gis_visualization/gis_visualization.phtml:3
-msgid "Display GIS Visualization"
-msgstr "Zobraziť GIS vizualizáciu"
-
-#: templates/gis_visualization/gis_visualization.phtml:8
-msgid "Label column"
-msgstr "Popis stĺpca"
-
-#: templates/gis_visualization/gis_visualization.phtml:11
-msgid "-- None --"
-msgstr ""
-
-#: templates/gis_visualization/gis_visualization.phtml:19
-msgid "Spatial column"
-msgstr "Priestorový stĺpec"
-
-#: templates/index_form.phtml:16
-msgid "Index name:"
-msgstr "Meno indexu&nbsp;:"
-
-#: templates/index_form.phtml:19
-msgid ""
-"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
-msgstr "\"PRIMARY\" <b>musí</b> byť <b>iba</b> meno primárneho kľúča!"
-
-#: templates/index_form.phtml:40
-msgid "Index choice:"
-msgstr "Výber indexu:"
-
-#: templates/index_form.phtml:57
-msgid "Key block size:"
-msgstr ""
-
-#: templates/index_form.phtml:74
-msgid "Index type:"
-msgstr "Typ indexu&nbsp;:"
-
-#: templates/index_form.phtml:86
-msgid "Parser:"
-msgstr "Syntaktický analyzátor:"
-
-#: templates/index_form.phtml:102
-msgid "Comment:"
-msgstr "Komentár:"
-
-#: templates/index_form.phtml:127 templates/structure/table_header.phtml:66
-msgid "Size"
-msgstr "Veľkosť"
-
-#: templates/index_form.phtml:149 templates/index_form.phtml:190
-msgid "Drag to reorder"
-msgstr "Usporiadajte pretiahnutím"
-
 #: templates/prefs_autoload.phtml:9
 msgid ""
 "Your browser has phpMyAdmin configuration for this domain. Would you like to "
@@ -14879,413 +14942,375 @@ msgstr ""
 msgid "Start row:"
 msgstr "Začiatočný riadok:"
 
-#: templates/structure/actions_in_table_structure.phtml:14
-#, php-format
-msgid "A primary key has been added on %s."
-msgstr "Bol pridaný primárny kľúč pre %s."
-
-#: templates/structure/actions_in_table_structure.phtml:34
-#: templates/structure/actions_in_table_structure.phtml:54
-#: templates/structure/actions_in_table_structure.phtml:79
-#: templates/structure/actions_in_table_structure.phtml:101
-#, php-format
-msgid "An index has been added on %s."
-msgstr "Bol pridaný index pre %s."
-
-#: templates/structure/actions_in_table_structure.phtml:130
-#: templates/structure/check_all_table_column.phtml:59
-msgid "Remove from central columns"
-msgstr "Odstrániť z centrálnych stĺpcov"
-
-#: templates/structure/actions_in_table_structure.phtml:138
-#: templates/structure/check_all_table_column.phtml:55
-msgid "Add to central columns"
-msgstr "Pridať do centrálnych stĺpcov"
-
-#: templates/structure/add_column.phtml:7
-#, php-format
-msgid "Add %s column(s)"
-msgstr "Pridať %s stĺpcov"
-
-#: templates/structure/add_column.phtml:12
-msgid "at beginning of table"
-msgstr "na začiatku tabuľky"
-
-#: templates/structure/body_for_table_summary.phtml:6
-#, php-format
-msgid "%s table"
-msgid_plural "%s tables"
-msgstr[0] "%s tabuľka"
-msgstr[1] "%s tabuľky"
-msgstr[2] "%s tabuliek"
-
-#: templates/structure/body_for_table_summary.phtml:17
-msgid "Sum"
-msgstr "Celkom"
-
-#: templates/structure/check_all_tables.phtml:6
-msgid "Check tables having overhead"
-msgstr "Zvoliť neoptimálne"
-
-#: templates/structure/check_all_tables.phtml:10
-msgid "Show create"
-msgstr "Zobraziť vytvorenie"
-
-#: templates/structure/check_all_tables.phtml:27
-#, fuzzy
-#| msgid "Add prefix"
-msgid "Prefix"
-msgstr "Pridať prefix"
-
-#: templates/structure/check_all_tables.phtml:28
-msgid "Add prefix to table"
-msgstr "Pridať predponu k tabuľke"
-
-#: templates/structure/check_all_tables.phtml:29
-msgid "Replace table prefix"
-msgstr "Nahradiť predponu tabuľky"
-
-#: templates/structure/check_all_tables.phtml:30
-msgid "Copy table with prefix"
-msgstr "Skopírovať tabuľku s predponou"
-
-#: templates/structure/check_all_tables.phtml:36
-msgid "Add columns to central list"
-msgstr "Pridať stĺpce do centrálneho zoznamu"
-
-#: templates/structure/check_all_tables.phtml:37
-msgid "Remove columns from central list"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:38
-msgid "Make consistent with central list"
-msgstr "Zosúladiť s centrálnym zoznamom"
-
-#: templates/structure/display_structure.phtml:140 view_create.php:181
-msgid "Edit view"
-msgstr "Upraviť zobrazenie"
-
-#: templates/structure/display_table_stats.phtml:9
-msgid "Space usage"
-msgstr "Zabrané miesto"
-
-#: templates/structure/display_table_stats.phtml:27
-#: templates/structure/table_header.phtml:74
-msgid "Overhead"
-msgstr "Naviac"
-
-#: templates/structure/display_table_stats.phtml:32
-msgid "Effective"
-msgstr "Efektívny"
-
-#: templates/structure/favorite_anchor.phtml:12
-msgid "Add to Favorites"
-msgstr "Pridať k obľúbeným"
-
-#: templates/structure/move_columns_dialog.phtml:1
-#: templates/structure/optional_action_links.phtml:21
-msgid "Move columns"
-msgstr "Presunúť stĺpce"
-
-#: templates/structure/move_columns_dialog.phtml:2
-msgid "Move the columns by dragging them up and down."
-msgstr ""
-
-#: templates/structure/optional_action_links.phtml:9
-msgid "Propose table structure"
-msgstr "Navrhnúť štruktúru tabuľky"
-
-#: templates/structure/optional_action_links.phtml:24
-msgid "Improve table structure"
-msgstr "Zlepšiť štruktúry tabuľky"
-
-#: templates/structure/optional_action_links.phtml:30
-msgid "Track view"
-msgstr "Sledovať pohľad"
-
-#: templates/structure/row_stats_table.phtml:3
-msgid "Row statistics"
-msgstr "Štatistika riadku"
-
-#: templates/structure/row_stats_table.phtml:9
-msgid "static"
-msgstr "statický"
-
-#: templates/structure/row_stats_table.phtml:11
-msgid "dynamic"
-msgstr "dynamický"
-
-#: templates/structure/row_stats_table.phtml:22
-msgid "partitioned"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:54
-msgid "Row length"
-msgstr "Dĺžka riadku"
-
-#: templates/structure/row_stats_table.phtml:66
-msgid "Row size"
-msgstr "Veľkosť riadku"
-
-#: templates/structure/row_stats_table.phtml:73
-msgid "Next autoindex"
-msgstr ""
-
-#: templates/structure/secondary_tabs.phtml:14
-msgid "Relation view"
-msgstr "Zobrazenie relácii"
-
-#: templates/structure/show_create.phtml:2
-msgid "Showing create queries"
-msgstr "Zobrazovanie SQL dopytov pre vytvorenie"
-
-#: templates/structure/sortable_header.phtml:13
-msgid "Sort"
-msgstr "Triediť"
-
-#: templates/structure/table_header.phtml:42
-msgid ""
-"May be approximate. Click on the number to get the exact count. See "
-"[doc@faq3-11]FAQ 3.11[/doc]."
-msgstr ""
-"Môže byť nepresné. Kliknutím na číslo dostanete presný počet. Viď "
-"[doc@faq3-11]FAQ 3.11[/doc]."
-
-#: templates/structure/table_structure_row.phtml:46
-#, php-format
-msgid "Column %s has been dropped."
-msgstr "Stĺpec %s bol odstránený."
-
-#: templates/structure/tracking_icon.phtml:4
-msgid "Tracking is active."
-msgstr "Sledovanie je aktívne."
-
-#: templates/structure/tracking_icon.phtml:8
-msgid "Tracking is not active."
-msgstr "Sledovanie nie je aktívne."
-
-#: templates/table/create_table.phtml:15
-msgid "Number of columns"
-msgstr "Počet polí"
-
-#: templates/table/options.phtml:8
-msgid "Select columns (at least one):"
-msgstr "Zvoliť stĺpec (najmenej jeden):"
-
-#: templates/table/options.phtml:37
-msgid "Add search conditions (body of the \"where\" clause):"
-msgstr "Pridať vyhľadávacie parametre (obsah dopytu po \"where\" príkaze):"
-
-#: templates/table/options.phtml:45
-msgid "Number of rows per page"
-msgstr "Záznamov na stránku"
-
-#: templates/table/options.phtml:56
-msgid "Display order:"
-msgstr "Zobraziť zoradené:"
-
-#: templates/table/options_zoom.phtml:6
-msgid "Use this column to label each point"
-msgstr "Tento stĺpec sa použije na označenie každého bodu"
-
-#: templates/table/options_zoom.phtml:35
-msgid "Maximum rows to plot"
-msgstr "Maximálny počet zobrazených riadkov"
-
-#: templates/table/replace_preview.phtml:13
-msgid "Find and replace - preview"
-msgstr "Nájsť a nahradiť - náhľad"
-
-#: templates/table/replace_preview.phtml:18
-msgid "Original string"
-msgstr "Pôvodný reťazec"
-
-#: templates/table/replace_preview.phtml:19
-msgid "Replaced string"
-msgstr "Nahradený reťazec"
-
-#: templates/table/replace_preview.phtml:40
-msgid "Replace"
-msgstr "Nahradiť"
-
-#: templates/table/rows_zoom.phtml:16
-msgid "Additional search criteria"
-msgstr "Rozšírené parametre vyhľadávania"
-
-#: templates/table/search_and_replace.phtml:3
-msgid "Replace with:"
-msgstr "Nahradiť za:"
-
-#: templates/table/search_and_replace.phtml:22
-msgid "Use regular expression"
-msgstr "Použiť regulárny výraz"
-
-#: templates/table/selection_form.phtml:12
-msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
-msgstr ""
-"Vykonať \"dopyt podľa príkladu\" (nahradzujúci znak: \"%\") pre dva rôzne "
-"stĺpce"
-
-#: templates/table/selection_form.phtml:34
-msgid "Do a \"query by example\" (wildcard: \"%\")"
-msgstr "Vykonať \"dopyt podľa príkladu\" (nahradzujúci znak: \"%\")"
-
-#: templates/table/zoom_result_form.phtml:7
-msgid "Browse/Edit the points"
-msgstr "Prezerať/Upraviť body"
-
-#: templates/table/zoom_result_form.phtml:15
-msgid "How to use"
-msgstr "Návod na použitie"
-
-#: templates/table/zoom_result_form.phtml:23
-msgid "Reset zoom"
-msgstr "Zrušiť zoom"
-
-#: templates/tbl_chart.phtml:17
+#: templates/table/chart/tbl_chart.phtml:17
 msgctxt "Chart type"
 msgid "Bar"
 msgstr "Obdĺžnikový"
 
-#: templates/tbl_chart.phtml:21
+#: templates/table/chart/tbl_chart.phtml:21
 msgctxt "Chart type"
 msgid "Column"
 msgstr "Stĺpcový"
 
-#: templates/tbl_chart.phtml:25
+#: templates/table/chart/tbl_chart.phtml:25
 msgctxt "Chart type"
 msgid "Line"
 msgstr "Čiarový"
 
-#: templates/tbl_chart.phtml:29
+#: templates/table/chart/tbl_chart.phtml:29
 msgctxt "Chart type"
 msgid "Spline"
 msgstr "Spojité čiary"
 
-#: templates/tbl_chart.phtml:33
+#: templates/table/chart/tbl_chart.phtml:33
 msgctxt "Chart type"
 msgid "Area"
 msgstr ""
 
-#: templates/tbl_chart.phtml:37
+#: templates/table/chart/tbl_chart.phtml:37
 msgctxt "Chart type"
 msgid "Pie"
 msgstr "Koláčový"
 
-#: templates/tbl_chart.phtml:41
+#: templates/table/chart/tbl_chart.phtml:41
 msgctxt "Chart type"
 msgid "Timeline"
 msgstr "Časová os"
 
-#: templates/tbl_chart.phtml:45
+#: templates/table/chart/tbl_chart.phtml:45
 msgctxt "Chart type"
 msgid "Scatter"
 msgstr ""
 
-#: templates/tbl_chart.phtml:50
+#: templates/table/chart/tbl_chart.phtml:50
 msgid "Stacked"
 msgstr ""
 
-#: templates/tbl_chart.phtml:53
+#: templates/table/chart/tbl_chart.phtml:53
 msgid "Chart title"
 msgstr "Názov grafu"
 
-#: templates/tbl_chart.phtml:57
+#: templates/table/chart/tbl_chart.phtml:57
 msgid "X-Axis:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:72
+#: templates/table/chart/tbl_chart.phtml:72
 msgid "Series:"
 msgstr "Série:"
 
-#: templates/tbl_chart.phtml:102
+#: templates/table/chart/tbl_chart.phtml:102
 msgid "X-Axis label:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:104
+#: templates/table/chart/tbl_chart.phtml:104
 msgid "X Values"
 msgstr "X Hodnoty"
 
-#: templates/tbl_chart.phtml:107
+#: templates/table/chart/tbl_chart.phtml:107
 msgid "Y-Axis label:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:115
+#: templates/table/chart/tbl_chart.phtml:115
 msgid "Series names are in a column"
 msgstr ""
 
-#: templates/tbl_chart.phtml:118
+#: templates/table/chart/tbl_chart.phtml:118
 #, fuzzy
 #| msgid "Inside column:"
 msgid "Series column:"
 msgstr "V tabuľke:"
 
-#: templates/tbl_chart.phtml:130
+#: templates/table/chart/tbl_chart.phtml:130
 #, fuzzy
 #| msgid "Values for column %s"
 msgid "Value Column:"
 msgstr "Hodnoty pre pole %s"
 
-#: templates/tbl_chart.phtml:150
+#: templates/table/chart/tbl_chart.phtml:150
 msgid "Save chart as image"
 msgstr "Uložiť graf ako obrázok"
 
-#: templates/tbl_relation/common_form.phtml:7
+#: templates/table/gis_visualization/gis_visualization.phtml:3
+msgid "Display GIS Visualization"
+msgstr "Zobraziť GIS vizualizáciu"
+
+#: templates/table/gis_visualization/gis_visualization.phtml:8
+msgid "Label column"
+msgstr "Popis stĺpca"
+
+#: templates/table/gis_visualization/gis_visualization.phtml:11
+msgid "-- None --"
+msgstr ""
+
+#: templates/table/gis_visualization/gis_visualization.phtml:19
+msgid "Spatial column"
+msgstr "Priestorový stĺpec"
+
+#: templates/table/index_form.phtml:16
+msgid "Index name:"
+msgstr "Meno indexu&nbsp;:"
+
+#: templates/table/index_form.phtml:19
+msgid ""
+"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
+msgstr "\"PRIMARY\" <b>musí</b> byť <b>iba</b> meno primárneho kľúča!"
+
+#: templates/table/index_form.phtml:40
+msgid "Index choice:"
+msgstr "Výber indexu:"
+
+#: templates/table/index_form.phtml:57
+msgid "Key block size:"
+msgstr ""
+
+#: templates/table/index_form.phtml:74
+msgid "Index type:"
+msgstr "Typ indexu&nbsp;:"
+
+#: templates/table/index_form.phtml:86
+msgid "Parser:"
+msgstr "Syntaktický analyzátor:"
+
+#: templates/table/index_form.phtml:102
+msgid "Comment:"
+msgstr "Komentár:"
+
+#: templates/table/index_form.phtml:149 templates/table/index_form.phtml:190
+msgid "Drag to reorder"
+msgstr "Usporiadajte pretiahnutím"
+
+#: templates/table/relation/common_form.phtml:7
 msgid "Internal relations"
 msgstr "Interné vzťahy"
 
-#: templates/tbl_relation/common_form.phtml:11
+#: templates/table/relation/common_form.phtml:11
 msgid "Internal relation"
 msgstr "Interné vzťahy"
 
-#: templates/tbl_relation/common_form.phtml:14
+#: templates/table/relation/common_form.phtml:14
 msgid ""
 "An internal relation is not necessary when a corresponding FOREIGN KEY "
 "relation exists."
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:37
+#: templates/table/relation/common_form.phtml:37
 msgid "Foreign key constraints"
 msgstr "Obmedzenia cudzieho kľúča"
 
-#: templates/tbl_relation/common_form.phtml:40
+#: templates/table/relation/common_form.phtml:40
 msgid "Actions"
 msgstr "Akcie"
 
-#: templates/tbl_relation/common_form.phtml:41
+#: templates/table/relation/common_form.phtml:41
 msgid "Constraint properties"
 msgstr "Nastavenia obmedzenia"
 
-#: templates/tbl_relation/common_form.phtml:44
+#: templates/table/relation/common_form.phtml:44
 msgid ""
 "Only columns with index will be displayed. You can define an index below."
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:49
+#: templates/table/relation/common_form.phtml:49
 msgid "Foreign key constraint"
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:81
+#: templates/table/relation/common_form.phtml:81
 msgid "+ Add constraint"
 msgstr "+ Pridať obmedzenie"
 
-#: templates/tbl_relation/common_form.phtml:91
+#: templates/table/relation/common_form.phtml:91
 msgid "Choose column to display:"
 msgstr "Zvoľte, ktoré polia zobraziť:"
 
-#: templates/tbl_relation/foreign_key_row.phtml:13
+#: templates/table/relation/foreign_key_row.phtml:13
 #, php-format
 msgid "Foreign key constraint %s has been dropped"
 msgstr "Obmedzenie cudzieho kľúča %s bolo zrušené"
 
-#: templates/tbl_relation/foreign_key_row.phtml:102
+#: templates/table/relation/foreign_key_row.phtml:102
 msgid "Constraint name"
 msgstr "Názov obmedzenia"
 
-#: templates/tbl_relation/foreign_key_row.phtml:157
+#: templates/table/relation/foreign_key_row.phtml:157
 msgid "+ Add column"
 msgstr "+ Pridať stĺpec"
 
+#: templates/table/search/options.phtml:8
+msgid "Select columns (at least one):"
+msgstr "Zvoliť stĺpec (najmenej jeden):"
+
+#: templates/table/search/options.phtml:37
+msgid "Add search conditions (body of the \"where\" clause):"
+msgstr "Pridať vyhľadávacie parametre (obsah dopytu po \"where\" príkaze):"
+
+#: templates/table/search/options.phtml:45
+msgid "Number of rows per page"
+msgstr "Záznamov na stránku"
+
+#: templates/table/search/options.phtml:56
+msgid "Display order:"
+msgstr "Zobraziť zoradené:"
+
+#: templates/table/search/options_zoom.phtml:6
+msgid "Use this column to label each point"
+msgstr "Tento stĺpec sa použije na označenie každého bodu"
+
+#: templates/table/search/options_zoom.phtml:35
+msgid "Maximum rows to plot"
+msgstr "Maximálny počet zobrazených riadkov"
+
+#: templates/table/search/replace_preview.phtml:13
+msgid "Find and replace - preview"
+msgstr "Nájsť a nahradiť - náhľad"
+
+#: templates/table/search/replace_preview.phtml:18
+msgid "Original string"
+msgstr "Pôvodný reťazec"
+
+#: templates/table/search/replace_preview.phtml:19
+msgid "Replaced string"
+msgstr "Nahradený reťazec"
+
+#: templates/table/search/replace_preview.phtml:40
+msgid "Replace"
+msgstr "Nahradiť"
+
+#: templates/table/search/rows_zoom.phtml:16
+msgid "Additional search criteria"
+msgstr "Rozšírené parametre vyhľadávania"
+
+#: templates/table/search/search_and_replace.phtml:3
+msgid "Replace with:"
+msgstr "Nahradiť za:"
+
+#: templates/table/search/search_and_replace.phtml:22
+msgid "Use regular expression"
+msgstr "Použiť regulárny výraz"
+
+#: templates/table/search/selection_form.phtml:12
+msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
+msgstr ""
+"Vykonať \"dopyt podľa príkladu\" (nahradzujúci znak: \"%\") pre dva rôzne "
+"stĺpce"
+
+#: templates/table/search/selection_form.phtml:34
+msgid "Do a \"query by example\" (wildcard: \"%\")"
+msgstr "Vykonať \"dopyt podľa príkladu\" (nahradzujúci znak: \"%\")"
+
+#: templates/table/search/zoom_result_form.phtml:7
+msgid "Browse/Edit the points"
+msgstr "Prezerať/Upraviť body"
+
+#: templates/table/search/zoom_result_form.phtml:15
+msgid "How to use"
+msgstr "Návod na použitie"
+
+#: templates/table/search/zoom_result_form.phtml:23
+msgid "Reset zoom"
+msgstr "Zrušiť zoom"
+
+#: templates/table/secondary_tabs.phtml:14
+msgid "Relation view"
+msgstr "Zobrazenie relácii"
+
+#: templates/table/structure/actions_in_table_structure.phtml:14
+#, php-format
+msgid "A primary key has been added on %s."
+msgstr "Bol pridaný primárny kľúč pre %s."
+
+#: templates/table/structure/actions_in_table_structure.phtml:34
+#: templates/table/structure/actions_in_table_structure.phtml:54
+#: templates/table/structure/actions_in_table_structure.phtml:79
+#: templates/table/structure/actions_in_table_structure.phtml:101
+#, php-format
+msgid "An index has been added on %s."
+msgstr "Bol pridaný index pre %s."
+
+#: templates/table/structure/actions_in_table_structure.phtml:130
+#: templates/table/structure/check_all_table_column.phtml:59
+msgid "Remove from central columns"
+msgstr "Odstrániť z centrálnych stĺpcov"
+
+#: templates/table/structure/actions_in_table_structure.phtml:138
+#: templates/table/structure/check_all_table_column.phtml:55
+msgid "Add to central columns"
+msgstr "Pridať do centrálnych stĺpcov"
+
+#: templates/table/structure/add_column.phtml:7
+#, php-format
+msgid "Add %s column(s)"
+msgstr "Pridať %s stĺpcov"
+
+#: templates/table/structure/add_column.phtml:12
+msgid "at beginning of table"
+msgstr "na začiatku tabuľky"
+
+#: templates/table/structure/display_structure.phtml:140 view_create.php:181
+msgid "Edit view"
+msgstr "Upraviť zobrazenie"
+
+#: templates/table/structure/display_table_stats.phtml:9
+msgid "Space usage"
+msgstr "Zabrané miesto"
+
+#: templates/table/structure/display_table_stats.phtml:32
+msgid "Effective"
+msgstr "Efektívny"
+
+#: templates/table/structure/move_columns_dialog.phtml:1
+#: templates/table/structure/optional_action_links.phtml:21
+msgid "Move columns"
+msgstr "Presunúť stĺpce"
+
+#: templates/table/structure/move_columns_dialog.phtml:2
+msgid "Move the columns by dragging them up and down."
+msgstr ""
+
+#: templates/table/structure/optional_action_links.phtml:9
+msgid "Propose table structure"
+msgstr "Navrhnúť štruktúru tabuľky"
+
+#: templates/table/structure/optional_action_links.phtml:24
+msgid "Improve table structure"
+msgstr "Zlepšiť štruktúry tabuľky"
+
+#: templates/table/structure/optional_action_links.phtml:30
+msgid "Track view"
+msgstr "Sledovať pohľad"
+
+#: templates/table/structure/row_stats_table.phtml:3
+msgid "Row statistics"
+msgstr "Štatistika riadku"
+
+#: templates/table/structure/row_stats_table.phtml:9
+msgid "static"
+msgstr "statický"
+
+#: templates/table/structure/row_stats_table.phtml:11
+msgid "dynamic"
+msgstr "dynamický"
+
+#: templates/table/structure/row_stats_table.phtml:22
+msgid "partitioned"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:54
+msgid "Row length"
+msgstr "Dĺžka riadku"
+
+#: templates/table/structure/row_stats_table.phtml:66
+msgid "Row size"
+msgstr "Veľkosť riadku"
+
+#: templates/table/structure/row_stats_table.phtml:73
+msgid "Next autoindex"
+msgstr ""
+
+#: templates/table/structure/table_structure_row.phtml:46
+#, php-format
+msgid "Column %s has been dropped."
+msgstr "Stĺpec %s bol odstránený."
+
 #: themes.php:17 themes.php:22
 msgid "Theme"
 msgstr "Vzhľad"
@@ -16426,6 +16451,9 @@ msgstr ""
 msgid "concurrent_insert is set to 0"
 msgstr "concurrent_insert je nastavené na 0"
 
+#~ msgid "Read as multibytes"
+#~ msgstr "Čítať ako multibyty"
+
 #~ msgid "Relational display column"
 #~ msgstr "Relačné zobrazenie stĺpcov"
 
diff --git a/po/sl.po b/po/sl.po
index bcd1a8ddf2..878016058d 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -3,8 +3,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 4.5.0-dev\n"
 "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
-"POT-Creation-Date: 2015-08-08 13:53-0400\n"
-"PO-Revision-Date: 2015-08-09 02:08+0200\n"
+"POT-Creation-Date: 2015-08-12 08:10-0400\n"
+"PO-Revision-Date: 2015-08-12 23:23+0200\n"
 "Last-Translator: Domen <mitenem@outlook.com>\n"
 "Language-Team: Slovenian "
 "<https://hosted.weblate.org/projects/phpmyadmin/master/sl/>\n"
@@ -54,7 +54,7 @@ msgid "Table comments:"
 msgstr "Pripombe tabele:"
 
 #: db_datadict.php:104 libraries/Index.class.php:699
-#: libraries/insert_edit.lib.php:1567
+#: libraries/insert_edit.lib.php:1565
 #: libraries/navigation/Nodes/Node_Column.class.php:30
 #: libraries/plugins/export/ExportHtmlword.class.php:280
 #: libraries/plugins/export/ExportHtmlword.class.php:375
@@ -68,13 +68,14 @@ msgstr "Pripombe tabele:"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1023
 #: libraries/tracking.lib.php:879 libraries/tracking.lib.php:975
 #: templates/columns_definitions/column_name.phtml:18
-#: templates/index_form.phtml:124 templates/table/table_header.phtml:6
-#: templates/table/zoom_result_form.phtml:33
-#: templates/tbl_relation/common_form.phtml:10
-#: templates/tbl_relation/common_form.phtml:43
-#: templates/tbl_relation/foreign_key_row.phtml:194
-#: templates/tbl_relation/foreign_key_row.phtml:206
-#: templates/tbl_relation/internal_relational_row.phtml:71
+#: templates/table/index_form.phtml:124
+#: templates/table/relation/common_form.phtml:10
+#: templates/table/relation/common_form.phtml:43
+#: templates/table/relation/foreign_key_row.phtml:194
+#: templates/table/relation/foreign_key_row.phtml:206
+#: templates/table/relation/internal_relational_row.phtml:71
+#: templates/table/search/table_header.phtml:6
+#: templates/table/search/zoom_result_form.phtml:33
 msgid "Column"
 msgstr "Stolpec"
 
@@ -92,21 +93,21 @@ msgstr "Stolpec"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1001
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1024
 #: libraries/rte/rte_list.lib.php:75 libraries/rte/rte_list.lib.php:103
-#: libraries/rte/rte_routines.lib.php:802
-#: libraries/rte/rte_routines.lib.php:831
-#: libraries/rte/rte_routines.lib.php:1493
+#: libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_routines.lib.php:922
+#: libraries/rte/rte_routines.lib.php:1584
 #: libraries/server_privileges.lib.php:2369 libraries/tracking.lib.php:880
 #: libraries/tracking.lib.php:972
 #: templates/columns_definitions/table_fields_definitions.phtml:11
-#: templates/structure/table_header.phtml:48
-#: templates/structure/table_structure_header.phtml:6
-#: templates/table/table_header.phtml:7
+#: templates/database/structure/table_header.phtml:48
+#: templates/table/search/table_header.phtml:7
+#: templates/table/structure/table_structure_header.phtml:6
 msgid "Type"
 msgstr "Vrsta"
 
 #: db_datadict.php:106 libraries/Index.class.php:702
 #: libraries/central_columns.lib.php:708
-#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1576
+#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1574
 #: libraries/plugins/export/ExportHtmlword.class.php:286
 #: libraries/plugins/export/ExportHtmlword.class.php:381
 #: libraries/plugins/export/ExportLatex.class.php:509
@@ -119,8 +120,8 @@ msgstr "Vrsta"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1026
 #: libraries/tracking.lib.php:882 libraries/tracking.lib.php:978
 #: templates/columns_definitions/table_fields_definitions.phtml:39
-#: templates/structure/table_structure_header.phtml:9
-#: templates/table/zoom_result_form.phtml:34
+#: templates/table/search/zoom_result_form.phtml:34
+#: templates/table/structure/table_structure_header.phtml:9
 msgid "Null"
 msgstr "Null"
 
@@ -138,8 +139,8 @@ msgstr "Null"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1027
 #: libraries/replication_gui.lib.php:153 libraries/tracking.lib.php:883
 #: templates/columns_definitions/table_fields_definitions.phtml:25
-#: templates/structure/body_for_table_summary.phtml:55
-#: templates/structure/table_structure_header.phtml:10
+#: templates/database/structure/body_for_table_summary.phtml:55
+#: templates/table/structure/table_structure_header.phtml:10
 msgid "Default"
 msgstr "Privzeto"
 
@@ -167,19 +168,19 @@ msgid "Comments"
 msgstr "Pripombe"
 
 #: db_datadict.php:146
-#: libraries/controllers/StructureController.class.php:1960
-#: libraries/controllers/StructureController.class.php:1965
+#: libraries/controllers/TableStructureController.class.php:951
+#: libraries/controllers/TableStructureController.class.php:956
 #: libraries/tracking.lib.php:922
 #: templates/columns_definitions/column_indexes.phtml:6
-#: templates/structure/check_all_table_column.phtml:22
-#: templates/structure/display_structure.phtml:74
+#: templates/table/structure/check_all_table_column.phtml:22
+#: templates/table/structure/display_structure.phtml:74
 msgid "Primary"
 msgstr "Primarni"
 
 #: db_datadict.php:156 js/messages.php:317 libraries/Index.class.php:567
 #: libraries/Index.class.php:606 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261 libraries/mult_submits.lib.php:403
+#: libraries/config/FormDisplay.tpl.php:272 libraries/mult_submits.lib.php:403
 #: libraries/mult_submits.lib.php:417
 #: libraries/plugins/export/ExportHtmlword.class.php:630
 #: libraries/plugins/export/ExportLatex.class.php:589
@@ -195,20 +196,20 @@ msgstr "Primarni"
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1010 libraries/tracking.lib.php:1015
 #: prefs_manage.php:140 templates/prefs_autoload.phtml:15
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "No"
 msgstr "Ne"
 
 #: db_datadict.php:156 js/messages.php:443 libraries/Index.class.php:568
 #: libraries/Index.class.php:605 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261
-#: libraries/controllers/StructureController.class.php:1344
-#: libraries/controllers/StructureController.class.php:2223
-#: libraries/controllers/StructureController.class.php:2232
-#: libraries/controllers/StructureController.class.php:2237
-#: libraries/controllers/StructureController.class.php:2242
-#: libraries/controllers/StructureController.class.php:2247
+#: libraries/config/FormDisplay.tpl.php:272
+#: libraries/controllers/TableStructureController.class.php:539
+#: libraries/controllers/TableStructureController.class.php:1201
+#: libraries/controllers/TableStructureController.class.php:1210
+#: libraries/controllers/TableStructureController.class.php:1215
+#: libraries/controllers/TableStructureController.class.php:1220
+#: libraries/controllers/TableStructureController.class.php:1225
 #: libraries/mult_submits.inc.php:82 libraries/mult_submits.inc.php:178
 #: libraries/mult_submits.lib.php:339 libraries/mult_submits.lib.php:372
 #: libraries/mult_submits.lib.php:401 libraries/mult_submits.lib.php:415
@@ -217,8 +218,8 @@ msgstr "Ne"
 #: libraries/plugins/export/ExportOdt.class.php:756
 #: libraries/plugins/export/ExportTexytext.class.php:567
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1077
-#: libraries/server_databases.lib.php:464
-#: libraries/server_databases.lib.php:474
+#: libraries/server_databases.lib.php:475
+#: libraries/server_databases.lib.php:485
 #: libraries/server_privileges.lib.php:2546
 #: libraries/server_privileges.lib.php:2727
 #: libraries/server_privileges.lib.php:2748
@@ -228,7 +229,7 @@ msgstr "Ne"
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1008 libraries/tracking.lib.php:1013
 #: prefs_manage.php:138 templates/prefs_autoload.phtml:14
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "Yes"
 msgstr "Da"
 
@@ -238,7 +239,7 @@ msgstr "Preglej povzetek stanja zbirke podatkov"
 
 #: db_export.php:37 db_tracking.php:90 export.php:382
 #: libraries/DBQbe.class.php:326
-#: libraries/controllers/StructureController.class.php:231
+#: libraries/controllers/DatabaseStructureController.class.php:170
 #: libraries/navigation/NavigationTree.class.php:897
 msgid "No tables found in database."
 msgstr "V zbirki podatkov ni mogoče najti tabel."
@@ -249,14 +250,14 @@ msgstr "V zbirki podatkov ni mogoče najti tabel."
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:26
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:120
-#: templates/structure/show_create.phtml:18
+#: templates/database/structure/show_create.phtml:18
 msgid "Tables"
 msgstr "Tabele"
 
 #: db_export.php:52 libraries/Menu.class.php:317 libraries/Menu.class.php:425
-#: libraries/Util.class.php:3333 libraries/Util.class.php:3343
-#: libraries/Util.class.php:3349 libraries/Util.class.php:3629
-#: libraries/Util.class.php:4327 libraries/Util.class.php:4344
+#: libraries/Util.class.php:3339 libraries/Util.class.php:3349
+#: libraries/Util.class.php:3355 libraries/Util.class.php:3635
+#: libraries/Util.class.php:4333 libraries/Util.class.php:4350
 #: libraries/central_columns.lib.php:728 libraries/config.values.php:39
 #: libraries/config.values.php:47 libraries/config.values.php:109
 #: libraries/config.values.php:115 libraries/config/setup.forms.php:323
@@ -270,7 +271,7 @@ msgstr "Tabele"
 #: libraries/navigation/Nodes/Node_Table.class.php:283
 #: libraries/server_privileges.lib.php:1141 libraries/tracking.lib.php:874
 #: templates/columns_definitions/table_fields_definitions.phtml:3
-#: templates/designer/table_list.phtml:28
+#: templates/database/designer/table_list.phtml:28
 msgid "Structure"
 msgstr "Struktura"
 
@@ -282,7 +283,7 @@ msgstr "Struktura"
 #: libraries/config/user_preferences.forms.php:292
 #: libraries/config/user_preferences.forms.php:297
 #: libraries/server_privileges.lib.php:1140
-#: templates/structure/display_table_stats.phtml:12
+#: templates/table/structure/display_table_stats.phtml:12
 msgid "Data"
 msgstr "Podatki"
 
@@ -353,10 +354,10 @@ msgstr "Sledene tabele"
 #: libraries/server_privileges.lib.php:2908
 #: libraries/server_privileges.lib.php:3145
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4346
-#: templates/structure/table_header.phtml:21
-#: templates/tbl_relation/foreign_key_row.phtml:176
-#: templates/tbl_relation/internal_relational_row.phtml:63
+#: libraries/server_privileges.lib.php:4372
+#: templates/database/structure/table_header.phtml:21
+#: templates/table/relation/foreign_key_row.phtml:176
+#: templates/table/relation/internal_relational_row.phtml:63
 msgid "Table"
 msgstr "Tabela"
 
@@ -373,7 +374,7 @@ msgid "Updated"
 msgstr "Posodobljeno"
 
 #: db_tracking.php:130 js/messages.php:243 libraries/Menu.class.php:552
-#: libraries/Util.class.php:4314 libraries/config.values.php:104
+#: libraries/Util.class.php:4320 libraries/config.values.php:104
 #: libraries/rte/rte_events.lib.php:393 libraries/rte/rte_list.lib.php:101
 #: libraries/server_status_processes.lib.php:92 libraries/tracking.lib.php:279
 msgid "Status"
@@ -382,14 +383,15 @@ msgstr "Stanje"
 #: db_tracking.php:131 db_tracking.php:290 libraries/Index.class.php:693
 #: libraries/central_columns.lib.php:687 libraries/rte/rte_list.lib.php:74
 #: libraries/rte/rte_list.lib.php:89 libraries/rte/rte_list.lib.php:102
-#: libraries/server_databases.lib.php:398
+#: libraries/server_databases.lib.php:409
 #: libraries/server_privileges.lib.php:2372
 #: libraries/server_privileges.lib.php:3166
 #: libraries/server_privileges.lib.php:3342
 #: libraries/server_user_groups.lib.php:82
 #: libraries/server_variables.lib.php:189 libraries/tracking.lib.php:280
-#: libraries/tracking.lib.php:793 templates/structure/table_header.phtml:30
-#: templates/structure/table_structure_header.phtml:23
+#: libraries/tracking.lib.php:793
+#: templates/database/structure/table_header.phtml:30
+#: templates/table/structure/table_structure_header.phtml:23
 msgid "Action"
 msgstr "Dejanje"
 
@@ -431,7 +433,7 @@ msgid "Untracked tables"
 msgstr "Nesledene tabele"
 
 #: db_tracking.php:305 db_tracking.php:336
-#: templates/structure/optional_action_links.phtml:17
+#: templates/table/structure/optional_action_links.phtml:17
 msgid "Track table"
 msgstr "Sledi tabeli"
 
@@ -486,7 +488,7 @@ msgid "Value for the column \"%s\""
 msgstr "Vrednost za stolpec \"%s\""
 
 #: gis_data_editor.php:146
-#: templates/gis_visualization/gis_visualization.phtml:37
+#: templates/table/gis_visualization/gis_visualization.phtml:37
 msgid "Use OpenStreetMaps as Base Layer"
 msgstr "Uporabi OpenStreetMaps kot osnovni sloj"
 
@@ -566,35 +568,35 @@ msgstr "Dodaj geometrijo"
 #: libraries/display_change_password.lib.php:162
 #: libraries/display_export.lib.php:402 libraries/display_export.lib.php:408
 #: libraries/display_import.lib.php:392 libraries/index.lib.php:44
-#: libraries/insert_edit.lib.php:1546 libraries/insert_edit.lib.php:1583
+#: libraries/insert_edit.lib.php:1544 libraries/insert_edit.lib.php:1581
 #: libraries/normalization.lib.php:165 libraries/normalization.lib.php:821
 #: libraries/operations.lib.php:38 libraries/operations.lib.php:108
 #: libraries/operations.lib.php:263 libraries/operations.lib.php:306
 #: libraries/operations.lib.php:801 libraries/operations.lib.php:874
 #: libraries/operations.lib.php:923 libraries/operations.lib.php:1337
 #: libraries/operations.lib.php:1658
-#: libraries/plugins/auth/AuthenticationCookie.class.php:244
+#: libraries/plugins/auth/AuthenticationCookie.class.php:232
 #: libraries/replication_gui.lib.php:122 libraries/replication_gui.lib.php:161
 #: libraries/replication_gui.lib.php:324 libraries/replication_gui.lib.php:461
 #: libraries/replication_gui.lib.php:906 libraries/rte/rte_events.lib.php:509
-#: libraries/rte/rte_routines.lib.php:969
-#: libraries/rte/rte_routines.lib.php:1581
+#: libraries/rte/rte_routines.lib.php:1060
+#: libraries/rte/rte_routines.lib.php:1672
 #: libraries/rte/rte_triggers.lib.php:396 libraries/server_bin_log.lib.php:61
 #: libraries/server_privileges.lib.php:705
 #: libraries/server_privileges.lib.php:2106
 #: libraries/server_privileges.lib.php:2872
 #: libraries/server_privileges.lib.php:3553
-#: libraries/server_privileges.lib.php:4627
+#: libraries/server_privileges.lib.php:4653
 #: libraries/server_user_groups.lib.php:285
 #: libraries/sql_query_form.lib.php:369 libraries/sql_query_form.lib.php:429
 #: libraries/tracking.lib.php:533 libraries/tracking.lib.php:653
 #: prefs_manage.php:277 prefs_manage.php:355
 #: templates/columns_definitions/column_definitions_form.phtml:59
-#: templates/header_location.phtml:17 templates/index_form.phtml:238
+#: templates/database/create_table.phtml:21 templates/header_location.phtml:28
 #: templates/startAndNumberOfRowsPanel.phtml:14
-#: templates/structure/add_column.phtml:25
-#: templates/table/create_table.phtml:21
-#: templates/table/selection_form.phtml:75 view_create.php:275
+#: templates/table/index_form.phtml:238
+#: templates/table/search/selection_form.phtml:75
+#: templates/table/structure/add_column.phtml:25 view_create.php:275
 #: view_operations.php:106
 msgid "Go"
 msgstr "Izvedi"
@@ -686,7 +688,7 @@ msgid "Could not load import plugins, please check your installation!"
 msgstr ""
 "Ne morem naložiti vtičnikov za uvoz, prosimo, preverite vašo namestitev!"
 
-#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1466
+#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1460
 #, php-format
 msgid "Bookmark %s has been created."
 msgstr "Ustvaril sem zaznamek %s."
@@ -725,11 +727,11 @@ msgstr "Ne morem naložiti napredka uvoza."
 msgid "Back"
 msgstr "Nazaj"
 
-#: index.php:148 libraries/Footer.class.php:70
+#: index.php:149 libraries/Footer.class.php:70
 msgid "phpMyAdmin Demo Server"
 msgstr "Preizkusni strežnik phpMyAdmin"
 
-#: index.php:152
+#: index.php:153
 #, php-format
 msgid ""
 "You are using the demo server. You can do anything here, but please do not "
@@ -740,110 +742,110 @@ msgstr ""
 "prosimo, da ne spremenite uporabnikov root, debian-sys-maint in pma. Več "
 "informacij lahko najdete na %s."
 
-#: index.php:162
+#: index.php:163
 msgid "General Settings"
 msgstr "Splošne nastavitve"
 
-#: index.php:190 libraries/display_change_password.lib.php:50
+#: index.php:191 libraries/display_change_password.lib.php:50
 #: libraries/display_change_password.lib.php:53 user_password.php:247
 msgid "Change password"
 msgstr "Spremeni geslo"
 
-#: index.php:206
+#: index.php:207
 msgid "Server connection collation"
 msgstr "Razvrščanje znakov povezave strežnika"
 
-#: index.php:228
+#: index.php:229
 msgid "Appearance Settings"
 msgstr "Prikazne nastavitve"
 
-#: index.php:258 prefs_manage.php:285
+#: index.php:259 prefs_manage.php:285
 msgid "More settings"
 msgstr "Več nastavitev"
 
-#: index.php:279
+#: index.php:280
 msgid "Database server"
 msgstr "Strežnik zbirke podatkov"
 
-#: index.php:282 libraries/plugins/auth/AuthenticationCookie.class.php:181
+#: index.php:283 libraries/plugins/auth/AuthenticationCookie.class.php:169
 msgid "Server:"
 msgstr "Strežnik:"
 
-#: index.php:286
+#: index.php:287
 msgid "Server type:"
 msgstr "Vrsta strežnika:"
 
-#: index.php:290 libraries/plugins/export/ExportLatex.class.php:212
+#: index.php:291 libraries/plugins/export/ExportLatex.class.php:212
 #: libraries/plugins/export/ExportSql.class.php:687
 #: libraries/plugins/export/ExportXml.class.php:189
 msgid "Server version:"
 msgstr "Različica strežnika:"
 
-#: index.php:296
+#: index.php:297
 msgid "Protocol version:"
 msgstr "Različica protokola:"
 
-#: index.php:300
+#: index.php:301
 msgid "User:"
 msgstr "Uporabnik:"
 
-#: index.php:305
+#: index.php:306
 msgid "Server charset:"
 msgstr "Nabor znakov strežnika:"
 
-#: index.php:320
+#: index.php:321
 msgid "Web server"
 msgstr "Spletni strežnik"
 
-#: index.php:331
+#: index.php:332
 msgid "Database client version:"
 msgstr "Različica odjemalca zbirk podatkov:"
 
-#: index.php:335
+#: index.php:336
 msgid "PHP extension:"
 msgstr "Razširitev PHP:"
 
-#: index.php:349
+#: index.php:350
 msgid "PHP version:"
 msgstr "Različica PHP:"
 
-#: index.php:360
+#: index.php:361
 msgid "Show PHP information"
 msgstr "Pokaži podatke o PHP"
 
-#: index.php:383
+#: index.php:384
 msgid "Version information:"
 msgstr "Podatki o različici:"
 
-#: index.php:392 libraries/Util.class.php:432 libraries/Util.class.php:495
-#: libraries/config/FormDisplay.tpl.php:151
+#: index.php:393 libraries/Util.class.php:432 libraries/Util.class.php:495
+#: libraries/config/FormDisplay.tpl.php:162
 #: libraries/display_export.lib.php:577 libraries/engines/pbxt.lib.php:162
 #: libraries/navigation/NavigationHeader.class.php:196
 #: libraries/server_variables.lib.php:160
 msgid "Documentation"
 msgstr "Dokumentacija"
 
-#: index.php:399
+#: index.php:400
 msgid "Wiki"
 msgstr "Wiki"
 
-#: index.php:408
+#: index.php:409
 msgid "Official Homepage"
 msgstr "Uradna domača stran phpMyAdmin"
 
-#: index.php:415
+#: index.php:416
 msgid "Contribute"
 msgstr "Prispevaj"
 
-#: index.php:422
+#: index.php:423
 msgid "Get support"
 msgstr "Prosi za podporo"
 
-#: index.php:429
+#: index.php:430
 msgid "List of changes"
 msgstr "Seznam sprememb"
 
-#: index.php:451
+#: index.php:452
 msgid ""
 "You are connected as 'root' with no password, which corresponds to the "
 "default MySQL privileged account. Your MySQL server is running with this "
@@ -855,7 +857,7 @@ msgstr ""
 "zato je izpostavljen vdorom. Čimprej odpravite to varnostno luknjo tako, da "
 "uporabniku 'root' nastavite geslo."
 
-#: index.php:468
+#: index.php:469
 msgid ""
 "You have enabled mbstring.func_overload in your PHP configuration. This "
 "option is incompatible with phpMyAdmin and might cause some data to be "
@@ -864,7 +866,7 @@ msgstr ""
 "V vaši konfiguraciji PHP ste omogočili mbstring.func_overload. Možnost ni "
 "združljiva s phpMyAdminom in lahko pokvari nekatere podatke!"
 
-#: index.php:483
+#: index.php:484
 msgid ""
 "The mbstring PHP extension was not found and you seem to be using a "
 "multibyte charset. Without the mbstring extension phpMyAdmin is unable to "
@@ -874,7 +876,7 @@ msgstr ""
 "nabor znakov. Brez razširitve mbstring phpMyAdmin ni sposoben pravilno "
 "razcepiti nizov, kar lahko vodi v nepričakovane rezultate."
 
-#: index.php:500
+#: index.php:501
 msgid ""
 "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini."
 "session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower than "
@@ -886,7 +888,7 @@ msgstr ""
 "veljavnosti piškotkov, določene v phpMyAdminu. Zaradi tega se bo vaša "
 "prijava morda iztekla prej, kot je določeno v phpMyAdminu."
 
-#: index.php:519
+#: index.php:520
 msgid ""
 "Login cookie store is lower than cookie validity configured in phpMyAdmin, "
 "because of this, your login will expire sooner than configured in phpMyAdmin."
@@ -895,13 +897,13 @@ msgstr ""
 "določene v phpMyAdminu. Zaradi tega se bo vaša prijava iztekla prej, kot je "
 "določeno v phpMyAdminu."
 
-#: index.php:535
+#: index.php:536
 msgid "The configuration file now needs a secret passphrase (blowfish_secret)."
 msgstr ""
 "Konfiguracijski datoteki morate sedaj določiti skrivno geslo "
 "(blowfish_secret)."
 
-#: index.php:548
+#: index.php:549
 msgid ""
 "Directory [code]config[/code], which is used by the setup script, still "
 "exists in your phpMyAdmin directory. It is strongly recommended to remove it "
@@ -914,7 +916,7 @@ msgstr ""
 "strežnika morda ogrožena, saj bodo nepooblaščene osebe lahko prenesle vašo "
 "konfiguracijo."
 
-#: index.php:564
+#: index.php:565
 #, php-format
 msgid ""
 "The phpMyAdmin configuration storage is not completely configured, some "
@@ -923,14 +925,14 @@ msgstr ""
 "Hramba konfiguracije phpMyAdmin ni konfigurirana v celoti, zato smo nekatere "
 "razširjene zmožnosti onemogočili. %sUgotovite, zakaj%s. "
 
-#: index.php:571
+#: index.php:572
 msgid ""
 "Or alternately go to 'Operations' tab of any database to set it up there."
 msgstr ""
 "Ali pa pojdite na zavihek »Dejanja« katere koli zbirke podatkov, da to "
 "nastavite tam."
 
-#: index.php:620
+#: index.php:621
 #, php-format
 msgid ""
 "Your PHP MySQL library version %s differs from your MySQL server version %s. "
@@ -939,7 +941,7 @@ msgstr ""
 "Vaša PHP-knjižnica MySQL različice %s se razlikuje od vašega strežnika MySQL "
 "različice %s. To lahko povzroči nepredvidljivo vedenje."
 
-#: index.php:648
+#: index.php:649
 #, php-format
 msgid ""
 "Server running with Suhosin. Please refer to %sdocumentation%s for possible "
@@ -1100,8 +1102,8 @@ msgstr ""
 msgid "Save & Close"
 msgstr "Shrani in zapri"
 
-#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:404
-#: libraries/insert_edit.lib.php:1550 prefs_manage.php:361
+#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:415
+#: libraries/insert_edit.lib.php:1548 prefs_manage.php:361
 #: prefs_manage.php:372
 msgid "Reset"
 msgstr "Ponastavi"
@@ -1134,7 +1136,7 @@ msgstr "Dodaj indeks"
 msgid "Edit Index"
 msgstr "Uredi indeks"
 
-#: js/messages.php:99 templates/index_form.phtml:232
+#: js/messages.php:99 templates/table/index_form.phtml:232
 #, php-format
 msgid "Add %s column(s) to index"
 msgstr "Dodaj %s stolpec(-cev) k indeksu"
@@ -1155,13 +1157,14 @@ msgstr "Ustvari z:"
 msgid "Please select column(s) for the index."
 msgstr "Prosimo, izberite stolpce za indeks."
 
-#: js/messages.php:106 templates/structure/add_column.phtml:1
+#: js/messages.php:106 templates/table/structure/add_column.phtml:1
 msgid "You have to add at least one column."
 msgstr "Dodati morate vsaj en stolpec."
 
-#: js/messages.php:109 libraries/insert_edit.lib.php:1548
+#: js/messages.php:109 libraries/insert_edit.lib.php:1546
 #: templates/columns_definitions/column_definitions_form.phtml:162
-#: templates/index_form.phtml:237 templates/tbl_relation/common_form.phtml:106
+#: templates/table/index_form.phtml:237
+#: templates/table/relation/common_form.phtml:106
 msgid "Preview SQL"
 msgstr "Predogled SQL"
 
@@ -1178,7 +1181,7 @@ msgid "SQL query:"
 msgstr "Poizvedba SQL:"
 
 #. l10n: Default label for the y-Axis of Charts
-#: js/messages.php:118 templates/tbl_chart.phtml:109
+#: js/messages.php:118 templates/table/chart/tbl_chart.phtml:109
 msgid "Y Values"
 msgstr "Vrednosti y"
 
@@ -1333,7 +1336,7 @@ msgstr "Poslanih bajtov"
 msgid "Bytes received"
 msgstr "Prejetih bajtov"
 
-#: js/messages.php:169 libraries/server_status.lib.php:226
+#: js/messages.php:169 libraries/server_status.lib.php:235
 msgid "Connections"
 msgstr "Povezave"
 
@@ -1390,12 +1393,12 @@ msgstr "%d tabel(a)"
 msgid "Questions"
 msgstr "Vprašanja"
 
-#: js/messages.php:184 libraries/server_status.lib.php:134
+#: js/messages.php:184 libraries/server_status.lib.php:143
 msgid "Traffic"
 msgstr "Promet"
 
 #: js/messages.php:185 libraries/Menu.class.php:586
-#: libraries/Util.class.php:4318 libraries/server_status_monitor.lib.php:257
+#: libraries/Util.class.php:4324 libraries/server_status_monitor.lib.php:257
 msgid "Settings"
 msgstr "Nastavitve"
 
@@ -1415,8 +1418,9 @@ msgstr "Prosimo, da v serijo dodate vsaj eno spremenljivko!"
 #: libraries/server_status_monitor.lib.php:236
 #: libraries/server_status_processes.lib.php:308
 #: templates/columns_definitions/transformation.phtml:4
-#: templates/designer/options_panel.phtml:178
-#: templates/table/options_zoom.phtml:12 templates/table/rows_zoom.phtml:26
+#: templates/database/designer/options_panel.phtml:178
+#: templates/table/search/options_zoom.phtml:12
+#: templates/table/search/rows_zoom.phtml:26
 msgid "None"
 msgstr "Brez"
 
@@ -1705,8 +1709,8 @@ msgstr ""
 
 #: js/messages.php:270 libraries/Menu.class.php:352
 #: libraries/Menu.class.php:455 libraries/Menu.class.php:582
-#: libraries/Util.class.php:4317 libraries/Util.class.php:4332
-#: libraries/Util.class.php:4349 libraries/config/messages.inc.php:258
+#: libraries/Util.class.php:4323 libraries/Util.class.php:4338
+#: libraries/Util.class.php:4355 libraries/config/messages.inc.php:258
 #: libraries/display_import.lib.php:105
 #: libraries/server_status_monitor.lib.php:318 prefs_manage.php:238
 #: setup/frames/menu.inc.php:26
@@ -1766,13 +1770,13 @@ msgid "Formatting SQL..."
 msgstr "Oblikovanje SQL ..."
 
 #: js/messages.php:293 libraries/server_variables.lib.php:157
-#: templates/designer/aggregate_query_panel.phtml:63
-#: templates/designer/delete_relation_panel.phtml:28
-#: templates/designer/having_query_panel.phtml:117
-#: templates/designer/new_relation_panel.phtml:88
-#: templates/designer/options_panel.phtml:253
-#: templates/designer/rename_to_panel.phtml:45
-#: templates/designer/where_query_panel.phtml:83
+#: templates/database/designer/aggregate_query_panel.phtml:63
+#: templates/database/designer/delete_relation_panel.phtml:28
+#: templates/database/designer/having_query_panel.phtml:117
+#: templates/database/designer/new_relation_panel.phtml:88
+#: templates/database/designer/options_panel.phtml:253
+#: templates/database/designer/rename_to_panel.phtml:45
+#: templates/database/designer/where_query_panel.phtml:83
 msgid "Cancel"
 msgstr "Prekliči"
 
@@ -1780,7 +1784,7 @@ msgstr "Prekliči"
 msgid "Page-related settings"
 msgstr "Nastavitve, povezane s stranjo"
 
-#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:402
+#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:413
 msgid "Apply"
 msgstr "Uveljavi"
 
@@ -1815,8 +1819,8 @@ msgstr "Koda napake: %s"
 msgid "Error text: %s"
 msgstr "Besedilo napake: %s"
 
-#: js/messages.php:307 libraries/db_common.inc.php:68
-#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:450
+#: js/messages.php:307 libraries/db_common.inc.php:69
+#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:461
 msgid "No databases selected."
 msgstr "Ni izbranih zbirk podatkov."
 
@@ -1828,12 +1832,13 @@ msgstr "Brisanje stolpca"
 msgid "Adding Primary Key"
 msgstr "Dodajanje primarnega ključa"
 
-#: js/messages.php:310 templates/designer/aggregate_query_panel.phtml:59
-#: templates/designer/having_query_panel.phtml:113
-#: templates/designer/new_relation_panel.phtml:87
-#: templates/designer/options_panel.phtml:252
-#: templates/designer/rename_to_panel.phtml:41
-#: templates/designer/where_query_panel.phtml:82
+#: js/messages.php:310
+#: templates/database/designer/aggregate_query_panel.phtml:59
+#: templates/database/designer/having_query_panel.phtml:113
+#: templates/database/designer/new_relation_panel.phtml:87
+#: templates/database/designer/options_panel.phtml:252
+#: templates/database/designer/rename_to_panel.phtml:41
+#: templates/database/designer/where_query_panel.phtml:82
 msgid "OK"
 msgstr "V redu"
 
@@ -1853,7 +1858,7 @@ msgstr "Kopiranje zbirke podatkov"
 msgid "Changing Charset"
 msgstr "Spreminjanje nabora znakov"
 
-#: js/messages.php:320 libraries/Util.class.php:3217
+#: js/messages.php:320 libraries/Util.class.php:3223
 msgid "Enable foreign key checks"
 msgstr "Omogoči preverjanja tujih ključev"
 
@@ -1888,20 +1893,21 @@ msgstr "Opredelitev shranjene funkcije mora vsebovati izjavo RETURN!"
 #: js/messages.php:334 libraries/DisplayResults.class.php:4834
 #: libraries/DisplayResults.class.php:5092 libraries/Menu.class.php:344
 #: libraries/Menu.class.php:446 libraries/Menu.class.php:578
-#: libraries/Util.class.php:3636 libraries/Util.class.php:3637
-#: libraries/Util.class.php:4316 libraries/Util.class.php:4331
-#: libraries/Util.class.php:4348 libraries/config/messages.inc.php:252
+#: libraries/Util.class.php:3642 libraries/Util.class.php:3643
+#: libraries/Util.class.php:4322 libraries/Util.class.php:4337
+#: libraries/Util.class.php:4354 libraries/config/messages.inc.php:252
 #: libraries/display_export.lib.php:173 libraries/rte/rte_list.lib.php:146
 #: libraries/server_privileges.lib.php:2211
 #: libraries/server_privileges.lib.php:2290
 #: libraries/server_privileges.lib.php:2632
 #: libraries/server_privileges.lib.php:3356
 #: libraries/server_status_monitor.lib.php:322 prefs_manage.php:303
-#: setup/frames/menu.inc.php:27 templates/structure/check_all_tables.phtml:11
+#: setup/frames/menu.inc.php:27
+#: templates/database/structure/check_all_tables.phtml:11
 msgid "Export"
 msgstr "Izvozi"
 
-#: js/messages.php:337 libraries/rte/rte_routines.lib.php:652
+#: js/messages.php:337 libraries/rte/rte_routines.lib.php:743
 msgid "ENUM/SET editor"
 msgstr "Urejevalnik ENUM/SET"
 
@@ -1940,7 +1946,7 @@ msgstr "Prikaži polje poizvedbe"
 #: libraries/Console.class.php:214 libraries/DisplayResults.class.php:3474
 #: libraries/DisplayResults.class.php:4818 libraries/Index.class.php:723
 #: libraries/Util.class.php:706 libraries/Util.class.php:1202
-#: libraries/Util.class.php:3634 libraries/Util.class.php:3635
+#: libraries/Util.class.php:3640 libraries/Util.class.php:3641
 #: libraries/central_columns.lib.php:851
 #: libraries/central_columns.lib.php:1193
 #: libraries/config/messages.inc.php:892
@@ -1958,7 +1964,7 @@ msgstr "Uredi"
 #: libraries/server_user_groups.lib.php:129
 #: libraries/sql_query_form.lib.php:416 libraries/tracking.lib.php:477
 #: setup/frames/index.inc.php:183 setup/frames/index.inc.php:291
-#: templates/designer/delete_relation_panel.phtml:27
+#: templates/database/designer/delete_relation_panel.phtml:27
 msgid "Delete"
 msgstr "Izbriši"
 
@@ -2127,11 +2133,11 @@ msgid "No dependencies selected!"
 msgstr "Ni izbranih odvisnosti!"
 
 #: js/messages.php:394 libraries/central_columns.lib.php:1214
-#: libraries/insert_edit.lib.php:1458 libraries/server_variables.lib.php:155
+#: libraries/insert_edit.lib.php:1456 libraries/server_variables.lib.php:155
 #: setup/frames/config.inc.php:42 setup/frames/index.inc.php:279
 #: templates/columns_definitions/column_definitions_form.phtml:165
-#: templates/gis_visualization/gis_visualization.phtml:48
-#: templates/tbl_relation/common_form.phtml:107
+#: templates/table/gis_visualization/gis_visualization.phtml:48
+#: templates/table/relation/common_form.phtml:107
 msgid "Save"
 msgstr "Shrani"
 
@@ -2209,8 +2215,8 @@ msgid "Data point content"
 msgstr "Vsebina kazalca podatkov"
 
 #: js/messages.php:430 js/messages.php:562 js/messages.php:579
-#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2573
-#: templates/index_form.phtml:154 templates/index_form.phtml:194
+#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2571
+#: templates/table/index_form.phtml:154 templates/table/index_form.phtml:194
 msgid "Ignore"
 msgstr "Prezri"
 
@@ -2271,8 +2277,8 @@ msgstr "Izberite tuji ključ"
 msgid "Please select the primary key or a unique key!"
 msgstr "Prosimo, izberite primarni ključ ali unikatni ključ!"
 
-#: js/messages.php:457 templates/designer/side_menu.phtml:91
-#: templates/designer/side_menu.phtml:94
+#: js/messages.php:457 templates/database/designer/side_menu.phtml:91
+#: templates/database/designer/side_menu.phtml:94
 msgid "Choose column to display"
 msgstr "Izberite stolpec za prikaz"
 
@@ -2288,18 +2294,18 @@ msgstr ""
 msgid "Page name"
 msgstr "Ime strani"
 
-#: js/messages.php:463 templates/designer/side_menu.phtml:56
-#: templates/designer/side_menu.phtml:59
+#: js/messages.php:463 templates/database/designer/side_menu.phtml:56
+#: templates/database/designer/side_menu.phtml:59
 msgid "Save page"
 msgstr "Shrani stran"
 
-#: js/messages.php:464 templates/designer/side_menu.phtml:63
-#: templates/designer/side_menu.phtml:66
+#: js/messages.php:464 templates/database/designer/side_menu.phtml:63
+#: templates/database/designer/side_menu.phtml:66
 msgid "Save page as"
 msgstr "Shrani stran kot"
 
-#: js/messages.php:465 templates/designer/side_menu.phtml:49
-#: templates/designer/side_menu.phtml:52
+#: js/messages.php:465 templates/database/designer/side_menu.phtml:49
+#: templates/database/designer/side_menu.phtml:52
 msgid "Open page"
 msgstr "Odpri stran"
 
@@ -2307,7 +2313,7 @@ msgstr "Odpri stran"
 msgid "Delete page"
 msgstr "Izbriši stran"
 
-#: js/messages.php:467 templates/designer/side_menu.phtml:10
+#: js/messages.php:467 templates/database/designer/side_menu.phtml:10
 msgid "Untitled"
 msgstr "Neimenovano"
 
@@ -2429,7 +2435,7 @@ msgstr "Izvirna dolžina"
 msgid "cancel"
 msgstr "prekliči"
 
-#: js/messages.php:499 libraries/server_status.lib.php:271
+#: js/messages.php:499 libraries/server_status.lib.php:280
 msgid "Aborted"
 msgstr "Prekinjeno"
 
@@ -3000,7 +3006,7 @@ msgstr "Prosimo, vnesite veljaven heksadecimalen vnos"
 
 #: js/messages.php:793 libraries/Message.class.php:199
 #: libraries/Util.class.php:654 libraries/core.lib.php:245
-#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1172
+#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1170
 #: tbl_operations.php:229 view_operations.php:63
 msgid "Error"
 msgstr "Napaka"
@@ -3063,8 +3069,8 @@ msgstr "na sekundo"
 msgid "per minute"
 msgstr "na minuto"
 
-#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:143
-#: libraries/server_status.lib.php:228
+#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:152
+#: libraries/server_status.lib.php:237
 #: libraries/server_status_queries.lib.php:98
 msgid "per hour"
 msgstr "na uro"
@@ -3083,7 +3089,7 @@ msgid "Wrong permissions on configuration file, should not be world writable!"
 msgstr ""
 "Napačna dovoljenja konfiguracijski datoteke; ne sme biti vsem zapisljiva!"
 
-#: libraries/Config.class.php:1799
+#: libraries/Config.class.php:1801
 msgid "Font size"
 msgstr "Velikost pisave"
 
@@ -3111,10 +3117,10 @@ msgstr "Ponovna poizvedba"
 #: libraries/server_privileges.lib.php:2890
 #: libraries/server_privileges.lib.php:3144
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4332
+#: libraries/server_privileges.lib.php:4358
 #: libraries/server_status_processes.lib.php:80
-#: templates/tbl_relation/foreign_key_row.phtml:165
-#: templates/tbl_relation/internal_relational_row.phtml:55
+#: templates/table/relation/foreign_key_row.phtml:165
+#: templates/table/relation/internal_relational_row.phtml:55
 msgid "Database"
 msgstr "Zbirka podatkov"
 
@@ -3209,11 +3215,11 @@ msgstr "Zgodovina"
 #: libraries/plugins/import/ImportMediawiki.class.php:60
 #: libraries/plugins/import/ImportOds.class.php:59
 #: libraries/plugins/import/ImportShp.class.php:57
-#: libraries/plugins/import/ImportSql.class.php:148
+#: libraries/plugins/import/ImportSql.class.php:51
 #: libraries/plugins/import/ImportXml.class.php:58
-#: libraries/rte/rte_routines.lib.php:833 templates/index_form.phtml:49
-#: templates/structure/row_stats_table.phtml:20
-#: templates/table/options.phtml:2
+#: libraries/rte/rte_routines.lib.php:924 templates/table/index_form.phtml:49
+#: templates/table/search/options.phtml:2
+#: templates/table/structure/row_stats_table.phtml:20
 msgid "Options"
 msgstr "Možnosti"
 
@@ -3246,7 +3252,8 @@ msgstr "padajoče"
 msgid "Order:"
 msgstr "Vrstni red:"
 
-#: libraries/Console.class.php:289 templates/table/replace_preview.phtml:17
+#: libraries/Console.class.php:289
+#: templates/table/search/replace_preview.phtml:17
 msgid "Count"
 msgstr "Štetje"
 
@@ -3343,9 +3350,9 @@ msgstr "Preklopi na temno emo"
 #: libraries/operations.lib.php:794 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:191
-#: templates/structure/sortable_header.phtml:21
-#: templates/structure/sortable_header.phtml:38
-#: templates/table/options.phtml:68
+#: templates/database/structure/sortable_header.phtml:21
+#: templates/database/structure/sortable_header.phtml:38
+#: templates/table/search/options.phtml:68
 msgid "Ascending"
 msgstr "Naraščajoče"
 
@@ -3355,13 +3362,14 @@ msgstr "Naraščajoče"
 #: libraries/operations.lib.php:797 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:188
-#: templates/structure/sortable_header.phtml:26
-#: templates/structure/sortable_header.phtml:43
-#: templates/table/options.phtml:69
+#: templates/database/structure/sortable_header.phtml:26
+#: templates/database/structure/sortable_header.phtml:43
+#: templates/table/search/options.phtml:69
 msgid "Descending"
 msgstr "Padajoče"
 
-#: libraries/DBQbe.class.php:467 templates/table/search_and_replace.phtml:6
+#: libraries/DBQbe.class.php:467
+#: templates/table/search/search_and_replace.phtml:6
 msgid "Column:"
 msgstr "Stolpec:"
 
@@ -3524,12 +3532,12 @@ msgstr[2] "%1$s zadetki v <strong>%2$s</strong>"
 msgstr[3] "%1$s zadetkov v <strong>%2$s</strong>"
 
 #: libraries/DbSearch.class.php:354 libraries/Menu.class.php:311
-#: libraries/Util.class.php:3337 libraries/Util.class.php:3347
-#: libraries/Util.class.php:3623 libraries/Util.class.php:3624
-#: libraries/Util.class.php:4343 libraries/config.values.php:43
+#: libraries/Util.class.php:3343 libraries/Util.class.php:3353
+#: libraries/Util.class.php:3629 libraries/Util.class.php:3630
+#: libraries/Util.class.php:4349 libraries/config.values.php:43
 #: libraries/config.values.php:51 libraries/config.values.php:119
 #: libraries/navigation/Nodes/Node_Table.class.php:295
-#: templates/structure/check_all_table_column.phtml:5
+#: templates/table/structure/check_all_table_column.phtml:5
 msgid "Browse"
 msgstr "Prebrskaj"
 
@@ -3546,7 +3554,8 @@ msgstr "Išči v zbirki podatkov"
 msgid "Words or values to search for (wildcard: \"%\"):"
 msgstr "Išči besede ali vrednosti (nadomestni znak: \"%\"):"
 
-#: libraries/DbSearch.class.php:401 templates/table/search_and_replace.phtml:1
+#: libraries/DbSearch.class.php:401
+#: templates/table/search/search_and_replace.phtml:1
 msgid "Find:"
 msgstr "Najdi:"
 
@@ -3590,28 +3599,28 @@ msgstr "Filtriraj vrstice"
 msgid "Search this table"
 msgstr "Išči po tabeli"
 
-#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2532
-#: libraries/Util.class.php:2535
+#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2538
+#: libraries/Util.class.php:2541
 msgctxt "First page"
 msgid "Begin"
 msgstr "Začetek"
 
-#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2533
-#: libraries/Util.class.php:2536 libraries/server_bin_log.lib.php:170
+#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2539
+#: libraries/Util.class.php:2542 libraries/server_bin_log.lib.php:170
 #: libraries/server_bin_log.lib.php:172
 msgctxt "Previous page"
 msgid "Previous"
 msgstr "Prejšnja"
 
-#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2564
-#: libraries/Util.class.php:2574 libraries/server_bin_log.lib.php:204
+#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2570
+#: libraries/Util.class.php:2580 libraries/server_bin_log.lib.php:204
 #: libraries/server_bin_log.lib.php:206
 msgctxt "Next page"
 msgid "Next"
 msgstr "Naslednja"
 
-#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2565
-#: libraries/Util.class.php:2575
+#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2571
+#: libraries/Util.class.php:2581
 msgctxt "Last page"
 msgid "End"
 msgstr "Konec"
@@ -3684,15 +3693,15 @@ msgid "May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]."
 msgstr "Morda je približno. Glej [doc@faq3-11]FAQ 3.11[/doc]."
 
 #: libraries/DisplayResults.class.php:4332 libraries/Message.class.php:180
-#: libraries/controllers/TableRelationController.class.php:258
+#: libraries/controllers/TableRelationController.class.php:259
 #: libraries/controllers/TableSearchController.class.php:655
-#: libraries/rte/rte_routines.lib.php:1332 libraries/sql_query_form.lib.php:89
+#: libraries/rte/rte_routines.lib.php:1423 libraries/sql_query_form.lib.php:89
 #: tbl_operations.php:227 tbl_row_action.php:138 view_operations.php:62
 msgid "Your SQL query has been executed successfully."
 msgstr "Poizvedbo SQL sem uspešno izvedel."
 
 #: libraries/DisplayResults.class.php:4660
-#: libraries/controllers/StructureController.class.php:629
+#: libraries/controllers/DatabaseStructureController.class.php:564
 #, php-format
 msgid ""
 "This view has at least this number of rows. Please refer to %sdocumentation"
@@ -3714,33 +3723,33 @@ msgstr "skupno %1$d, %2$d v poizvedbi"
 msgid "%d total"
 msgstr "skupaj %d"
 
-#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1318
+#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1312
 #, php-format
 msgid "Query took %01.4f seconds."
 msgstr "Poizvedba je potrebovala %01.4f sekunde."
 
 #: libraries/DisplayResults.class.php:4807
-#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4767
-#: libraries/Util.class.php:4773 libraries/mult_submits.inc.php:50
-#: templates/structure/check_all_tables.phtml:2
-#: templates/structure/check_all_tables.phtml:9
+#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4773
+#: libraries/Util.class.php:4779 libraries/mult_submits.inc.php:50
+#: templates/database/structure/check_all_tables.phtml:2
+#: templates/database/structure/check_all_tables.phtml:9
 msgid "With selected:"
 msgstr "Z označenim:"
 
 #: libraries/DisplayResults.class.php:4811
-#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4769
-#: libraries/Util.class.php:4770 libraries/server_privileges.lib.php:1174
+#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4775
+#: libraries/Util.class.php:4776 libraries/server_privileges.lib.php:1174
 #: libraries/server_privileges.lib.php:1175
 #: libraries/server_privileges.lib.php:1387
 #: libraries/server_user_groups.lib.php:231
-#: templates/structure/check_all_tables.phtml:3
-#: templates/structure/check_all_tables.phtml:4
+#: templates/database/structure/check_all_tables.phtml:3
+#: templates/database/structure/check_all_tables.phtml:4
 msgid "Check All"
 msgstr "Označi vse"
 
 #: libraries/DisplayResults.class.php:4985 libraries/Header.class.php:383
-#: templates/structure/optional_action_links.phtml:1
-#: templates/structure/print_view_data_dictionary_link.phtml:3
+#: templates/database/structure/print_view_data_dictionary_link.phtml:3
+#: templates/table/structure/optional_action_links.phtml:1
 msgid "Print view"
 msgstr "Pogled za tiskanje"
 
@@ -3748,7 +3757,8 @@ msgstr "Pogled za tiskanje"
 msgid "Query results operations"
 msgstr "Dejanja rezultatov poizvedbe"
 
-#: libraries/DisplayResults.class.php:5105 templates/tbl_chart.phtml:12
+#: libraries/DisplayResults.class.php:5105
+#: templates/table/chart/tbl_chart.phtml:12
 msgid "Display chart"
 msgstr "Prikaži grafikon"
 
@@ -3840,7 +3850,7 @@ msgid "Click on the bar to scroll to top of page"
 msgstr "Kliknite na prečko, da se vrnete na vrh strani"
 
 #: libraries/Header.class.php:749
-#: libraries/plugins/auth/AuthenticationCookie.class.php:152
+#: libraries/plugins/auth/AuthenticationCookie.class.php:140
 msgid "Javascript must be enabled past this point!"
 msgstr "Po tej točki mora biti JavaScript omogočen!"
 
@@ -3862,11 +3872,11 @@ msgid "Keyname"
 msgstr "Ime ključa"
 
 #: libraries/Index.class.php:697
-#: libraries/controllers/StructureController.class.php:1962
-#: libraries/controllers/StructureController.class.php:1967
+#: libraries/controllers/TableStructureController.class.php:953
+#: libraries/controllers/TableStructureController.class.php:958
 #: libraries/tracking.lib.php:973
 #: templates/columns_definitions/column_indexes.phtml:11
-#: templates/structure/check_all_table_column.phtml:26
+#: templates/table/structure/check_all_table_column.phtml:26
 msgid "Unique"
 msgstr "Edinstven"
 
@@ -3885,16 +3895,17 @@ msgstr "Kardinalnost"
 #: libraries/server_collations.lib.php:35 libraries/tracking.lib.php:881
 #: libraries/tracking.lib.php:977
 #: templates/columns_definitions/table_fields_definitions.phtml:33
-#: templates/structure/row_stats_table.phtml:31
-#: templates/structure/table_header.phtml:55
-#: templates/structure/table_structure_header.phtml:7
-#: templates/table/table_header.phtml:8
+#: templates/database/structure/table_header.phtml:55
+#: templates/table/search/table_header.phtml:8
+#: templates/table/structure/row_stats_table.phtml:31
+#: templates/table/structure/table_structure_header.phtml:7
 msgid "Collation"
 msgstr "Pravilo za razvrščanje znakov"
 
 #: libraries/Index.class.php:703 libraries/rte/rte_events.lib.php:496
-#: libraries/rte/rte_routines.lib.php:956 libraries/tracking.lib.php:885
-#: libraries/tracking.lib.php:979 templates/structure/table_header.phtml:84
+#: libraries/rte/rte_routines.lib.php:1047 libraries/tracking.lib.php:885
+#: libraries/tracking.lib.php:979
+#: templates/database/structure/table_header.phtml:84
 msgid "Comment"
 msgstr "Pripomba"
 
@@ -3907,15 +3918,15 @@ msgstr "Zavrgel sem primarni ključ."
 msgid "Index %s has been dropped."
 msgstr "Zavrgel sem indeks %s."
 
-#: libraries/Index.class.php:757 libraries/Util.class.php:3630
-#: libraries/Util.class.php:3631
-#: libraries/controllers/StructureController.class.php:1958
-#: libraries/controllers/StructureController.class.php:1959
+#: libraries/Index.class.php:757 libraries/Util.class.php:3636
+#: libraries/Util.class.php:3637
+#: libraries/controllers/TableStructureController.class.php:949
+#: libraries/controllers/TableStructureController.class.php:950
 #: libraries/operations.lib.php:1607 libraries/rte/rte_list.lib.php:150
 #: libraries/server_databases.lib.php:146
-#: templates/structure/check_all_table_column.phtml:15
-#: templates/structure/check_all_tables.phtml:16
-#: templates/tbl_relation/foreign_key_row.phtml:93
+#: templates/database/structure/check_all_tables.phtml:16
+#: templates/table/relation/foreign_key_row.phtml:93
+#: templates/table/structure/check_all_table_column.phtml:15
 msgid "Drop"
 msgstr "Zavrzi"
 
@@ -3946,16 +3957,16 @@ msgstr "Strežnik"
 #: libraries/Menu.class.php:248
 #: libraries/navigation/Nodes/Node_View.class.php:32
 #: libraries/tbl_info.inc.php:63
-#: templates/structure/structure_table_row.phtml:97
-#: templates/structure/structure_table_row.phtml:159
+#: templates/database/structure/structure_table_row.phtml:97
+#: templates/database/structure/structure_table_row.phtml:159
 msgid "View"
 msgstr "Pogled"
 
 #: libraries/Menu.class.php:325 libraries/Menu.class.php:429
-#: libraries/Menu.class.php:548 libraries/Util.class.php:3334
-#: libraries/Util.class.php:3344 libraries/Util.class.php:3350
-#: libraries/Util.class.php:4313 libraries/Util.class.php:4328
-#: libraries/Util.class.php:4345 libraries/config.values.php:40
+#: libraries/Menu.class.php:548 libraries/Util.class.php:3340
+#: libraries/Util.class.php:3350 libraries/Util.class.php:3356
+#: libraries/Util.class.php:4319 libraries/Util.class.php:4334
+#: libraries/Util.class.php:4351 libraries/config.values.php:40
 #: libraries/config.values.php:48 libraries/config.values.php:110
 #: libraries/config.values.php:116 libraries/config/messages.inc.php:321
 #: libraries/navigation/Nodes/Node_Table.class.php:292
@@ -3963,19 +3974,19 @@ msgid "SQL"
 msgstr "SQL"
 
 #: libraries/Menu.class.php:328 libraries/Menu.class.php:432
-#: libraries/Util.class.php:3335 libraries/Util.class.php:3345
-#: libraries/Util.class.php:3351 libraries/Util.class.php:3625
-#: libraries/Util.class.php:3626 libraries/Util.class.php:4329
-#: libraries/Util.class.php:4346 libraries/config.values.php:41
+#: libraries/Util.class.php:3341 libraries/Util.class.php:3351
+#: libraries/Util.class.php:3357 libraries/Util.class.php:3631
+#: libraries/Util.class.php:3632 libraries/Util.class.php:4335
+#: libraries/Util.class.php:4352 libraries/config.values.php:41
 #: libraries/config.values.php:49 libraries/config.values.php:111
 #: libraries/config.values.php:117
 #: libraries/navigation/Nodes/Node_Table.class.php:286
 msgid "Search"
 msgstr "Iskanje"
 
-#: libraries/Menu.class.php:338 libraries/Util.class.php:3336
-#: libraries/Util.class.php:3346 libraries/Util.class.php:3627
-#: libraries/Util.class.php:3628 libraries/Util.class.php:4347
+#: libraries/Menu.class.php:338 libraries/Util.class.php:3342
+#: libraries/Util.class.php:3352 libraries/Util.class.php:3633
+#: libraries/Util.class.php:3634 libraries/Util.class.php:4353
 #: libraries/config.values.php:42 libraries/config.values.php:50
 #: libraries/config.values.php:118
 #: libraries/navigation/Nodes/Node_Table.class.php:289
@@ -3984,30 +3995,30 @@ msgid "Insert"
 msgstr "Vstavi"
 
 #: libraries/Menu.class.php:362 libraries/Menu.class.php:467
-#: libraries/Util.class.php:4334 libraries/Util.class.php:4350
+#: libraries/Util.class.php:4340 libraries/Util.class.php:4356
 #: libraries/config.values.php:106 libraries/server_common.lib.php:51
 #: libraries/server_privileges.lib.php:2370
 #: libraries/server_privileges.lib.php:3158
-#: libraries/server_privileges.lib.php:4221
+#: libraries/server_privileges.lib.php:4247
 msgid "Privileges"
 msgstr "Privilegiji"
 
 #: libraries/Menu.class.php:371 libraries/Menu.class.php:379
-#: libraries/Menu.class.php:459 libraries/Util.class.php:3338
-#: libraries/Util.class.php:3352 libraries/Util.class.php:4333
-#: libraries/Util.class.php:4351 libraries/config.values.php:112
+#: libraries/Menu.class.php:459 libraries/Util.class.php:3344
+#: libraries/Util.class.php:3358 libraries/Util.class.php:4339
+#: libraries/Util.class.php:4357 libraries/config.values.php:112
 #: view_operations.php:92
 msgid "Operations"
 msgstr "Operacije"
 
 #: libraries/Menu.class.php:384 libraries/Menu.class.php:492
-#: libraries/Util.class.php:4338 libraries/Util.class.php:4352
+#: libraries/Util.class.php:4344 libraries/Util.class.php:4358
 #: libraries/relation.lib.php:255
 msgid "Tracking"
 msgstr "Sledenje"
 
 #: libraries/Menu.class.php:397 libraries/Menu.class.php:486
-#: libraries/Util.class.php:4337 libraries/Util.class.php:4353
+#: libraries/Util.class.php:4343 libraries/Util.class.php:4359
 #: libraries/navigation/Nodes/Node_Trigger_Container.class.php:24
 #: libraries/plugins/export/ExportHtmlword.class.php:557
 #: libraries/plugins/export/ExportOdt.class.php:685
@@ -4024,16 +4035,16 @@ msgstr "Sprožilci"
 msgid "Database seems to be empty!"
 msgstr "Zbirka podatkov se zdi prazna!"
 
-#: libraries/Menu.class.php:439 libraries/Util.class.php:4330
+#: libraries/Menu.class.php:439 libraries/Util.class.php:4336
 msgid "Query"
 msgstr "Poizvedba"
 
-#: libraries/Menu.class.php:472 libraries/Util.class.php:4335
+#: libraries/Menu.class.php:472 libraries/Util.class.php:4341
 #: libraries/rte/rte_words.lib.php:36
 msgid "Routines"
 msgstr "Rutina"
 
-#: libraries/Menu.class.php:479 libraries/Util.class.php:4336
+#: libraries/Menu.class.php:479 libraries/Util.class.php:4342
 #: libraries/navigation/Nodes/Node_Event_Container.class.php:26
 #: libraries/plugins/export/ExportSql.class.php:940
 #: libraries/plugins/export/ExportXml.class.php:107
@@ -4041,20 +4052,20 @@ msgstr "Rutina"
 msgid "Events"
 msgstr "Dogodki"
 
-#: libraries/Menu.class.php:498 libraries/Util.class.php:4339
+#: libraries/Menu.class.php:498 libraries/Util.class.php:4345
 msgid "Designer"
 msgstr "Oblikovalnik"
 
-#: libraries/Menu.class.php:507 libraries/Util.class.php:4340
-#: templates/structure/check_all_tables.phtml:35
+#: libraries/Menu.class.php:507 libraries/Util.class.php:4346
+#: templates/database/structure/check_all_tables.phtml:35
 msgid "Central columns"
 msgstr "Osrednji stolpci"
 
-#: libraries/Menu.class.php:544 libraries/Util.class.php:4312
+#: libraries/Menu.class.php:544 libraries/Util.class.php:4318
 #: libraries/config.values.php:103 libraries/config/messages.inc.php:266
 #: libraries/config/messages.inc.php:341
 #: libraries/navigation/NavigationTree.class.php:1239
-#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4332
+#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4358
 msgid "Databases"
 msgstr "Zbirke podatkov"
 
@@ -4063,34 +4074,34 @@ msgid "User accounts"
 msgstr "Uporabniški računi"
 
 #: libraries/Menu.class.php:595 libraries/ServerStatusData.class.php:121
-#: libraries/Util.class.php:4319 libraries/server_common.lib.php:36
+#: libraries/Util.class.php:4325 libraries/server_common.lib.php:36
 msgid "Binary log"
 msgstr "Dvojiški dnevnik"
 
 #: libraries/Menu.class.php:601 libraries/ServerStatusData.class.php:126
-#: libraries/Util.class.php:4320 libraries/server_common.lib.php:42
-#: templates/structure/body_for_table_summary.phtml:10
-#: templates/structure/table_header.phtml:27
+#: libraries/Util.class.php:4326 libraries/server_common.lib.php:42
+#: templates/database/structure/body_for_table_summary.phtml:10
+#: templates/database/structure/table_header.phtml:27
 msgid "Replication"
 msgstr "Podvojevanje"
 
 #: libraries/Menu.class.php:606 libraries/ServerStatusData.class.php:193
-#: libraries/Util.class.php:4321 libraries/config.values.php:105
+#: libraries/Util.class.php:4327 libraries/config.values.php:105
 #: libraries/server_engines.lib.php:108 libraries/server_engines.lib.php:112
 #: libraries/sql_query_form.lib.php:421
 msgid "Variables"
 msgstr "Spremenljivke"
 
-#: libraries/Menu.class.php:610 libraries/Util.class.php:4322
+#: libraries/Menu.class.php:610 libraries/Util.class.php:4328
 msgid "Charsets"
 msgstr "Nabori znakov"
 
-#: libraries/Menu.class.php:615 libraries/Util.class.php:4323
+#: libraries/Menu.class.php:615 libraries/Util.class.php:4329
 #: libraries/server_common.lib.php:33 libraries/server_plugins.lib.php:27
 msgid "Plugins"
 msgstr "Vtičniki"
 
-#: libraries/Menu.class.php:626 libraries/Util.class.php:4324
+#: libraries/Menu.class.php:626 libraries/Util.class.php:4330
 msgid "Engines"
 msgstr "Pogoni"
 
@@ -4121,7 +4132,7 @@ msgstr[1] "Vstavil sem %1$d vrstici."
 msgstr[2] "Vstavil sem %1$d vrstice."
 msgstr[3] "Vstavil sem %1$d vrstic."
 
-#: libraries/PDF.class.php:70 libraries/Util.class.php:2521
+#: libraries/PDF.class.php:70 libraries/Util.class.php:2527
 #: libraries/browse_foreigners.lib.php:327
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:865
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:890
@@ -4142,7 +4153,7 @@ msgid "Could not save favorite table!"
 msgstr "Ne morem shraniti priljubljene tabele!"
 
 #: libraries/RecentFavoriteTable.class.php:212
-#: templates/structure/favorite_anchor.phtml:12
+#: templates/database/structure/favorite_anchor.phtml:12
 msgid "Remove from Favorites"
 msgstr "Odstrani iz Priljubljenih"
 
@@ -4312,7 +4323,7 @@ msgstr ""
 "Za skladiščni pogon ni na voljo nobenih podrobnejših informacij o stanju."
 
 #: libraries/StorageEngine.class.php:373
-#: templates/structure/body_for_table_summary.phtml:50
+#: templates/database/structure/body_for_table_summary.phtml:50
 #, php-format
 msgid "%s is the default storage engine on this MySQL server."
 msgstr "%s je privzet skladiščni pogon na tem strežniku MySQL."
@@ -4792,10 +4803,10 @@ msgstr "Med analizo smo našli %d napak."
 
 #: libraries/Util.class.php:726 libraries/rte/rte_events.lib.php:110
 #: libraries/rte/rte_events.lib.php:119 libraries/rte/rte_events.lib.php:150
-#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:153
-#: libraries/rte/rte_routines.lib.php:162
-#: libraries/rte/rte_routines.lib.php:235
-#: libraries/rte/rte_routines.lib.php:1366
+#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:223
+#: libraries/rte/rte_routines.lib.php:250
+#: libraries/rte/rte_routines.lib.php:372
+#: libraries/rte/rte_routines.lib.php:1457
 #: libraries/rte/rte_triggers.lib.php:86 libraries/rte/rte_triggers.lib.php:95
 #: libraries/rte/rte_triggers.lib.php:127
 msgid "MySQL said: "
@@ -4839,75 +4850,78 @@ msgstr "ned"
 msgid "%B %d, %Y at %I:%M %p"
 msgstr "%d. %B %Y ob %H.%M"
 
-#: libraries/Util.class.php:2019
+#: libraries/Util.class.php:2025
 #, php-format
 msgid "%s days, %s hours, %s minutes and %s seconds"
 msgstr "%s dni, %s ur, %s minut in %s sekund"
 
-#: libraries/Util.class.php:2112
+#: libraries/Util.class.php:2118
 msgid "Missing parameter:"
 msgstr "Manjkajoč parameter:"
 
-#: libraries/Util.class.php:2645
+#: libraries/Util.class.php:2651
 #, php-format
 msgid "Jump to database \"%s\"."
 msgstr "Preskoči na zbirko podatkov \"%s\"."
 
-#: libraries/Util.class.php:2670
+#: libraries/Util.class.php:2676
 #, php-format
 msgid "The %s functionality is affected by a known bug, see %s"
 msgstr "Na funkcionalnost %s vpliva znan hrošč, glej %s"
 
-#: libraries/Util.class.php:2881
+#: libraries/Util.class.php:2887
 msgid "Click to toggle"
 msgstr "Kliknite za preklop"
 
-#: libraries/Util.class.php:3542 prefs_manage.php:248
+#: libraries/Util.class.php:3548 prefs_manage.php:248
 msgid "Browse your computer:"
 msgstr "Prebrskajte svoj računalnik:"
 
-#: libraries/Util.class.php:3567
+#: libraries/Util.class.php:3573
 #, php-format
 msgid "Select from the web server upload directory <b>%s</b>:"
 msgstr "Izberite iz mape za nalaganje na spletnem strežniku <b>%s</b>:"
 
-#: libraries/Util.class.php:3596 libraries/insert_edit.lib.php:1173
+#: libraries/Util.class.php:3602 libraries/insert_edit.lib.php:1171
 msgid "The directory you set for upload work cannot be reached."
 msgstr "Imenik, ki ste ga določili za nalaganje, ni dosegljiv."
 
-#: libraries/Util.class.php:3607
+#: libraries/Util.class.php:3613
 msgid "There are no files to upload!"
 msgstr "Nobene datoteke ni za naložiti!"
 
-#: libraries/Util.class.php:3632 libraries/Util.class.php:3633
-#: templates/structure/check_all_tables.phtml:15
+#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: templates/database/structure/check_all_tables.phtml:15
 msgid "Empty"
 msgstr "Izprazni"
 
-#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: libraries/Util.class.php:3644 libraries/Util.class.php:3645
 msgid "Execute"
 msgstr "Izvedi"
 
-#: libraries/Util.class.php:4152
+#: libraries/Util.class.php:4158
 msgid "Print"
 msgstr "Natisni"
 
-#: libraries/Util.class.php:4257 templates/structure/row_stats_table.phtml:80
-#: templates/structure/table_header.phtml:95
+#: libraries/Util.class.php:4263
+#: templates/database/structure/table_header.phtml:95
+#: templates/table/structure/row_stats_table.phtml:80
 msgid "Creation"
 msgstr "Ustvarjeno"
 
-#: libraries/Util.class.php:4263 templates/structure/row_stats_table.phtml:87
-#: templates/structure/table_header.phtml:106
+#: libraries/Util.class.php:4269
+#: templates/database/structure/table_header.phtml:106
+#: templates/table/structure/row_stats_table.phtml:87
 msgid "Last update"
 msgstr "Zadnjič posodobljeno"
 
-#: libraries/Util.class.php:4269 templates/structure/row_stats_table.phtml:94
-#: templates/structure/table_header.phtml:117
+#: libraries/Util.class.php:4275
+#: templates/database/structure/table_header.phtml:117
+#: templates/table/structure/row_stats_table.phtml:94
 msgid "Last check"
 msgstr "Zadnjič pregledano"
 
-#: libraries/Util.class.php:4315
+#: libraries/Util.class.php:4321
 msgid "Users"
 msgstr "Uporabniki"
 
@@ -4928,16 +4942,16 @@ msgid "Use this value"
 msgstr "Uporabi to vrednost"
 
 #: libraries/build_html_for_db.lib.php:33 libraries/import.lib.php:193
-#: templates/structure/actions_in_table_structure.phtml:113
-#: templates/structure/row_stats_table.phtml:42
-#: templates/structure/table_header.phtml:36
+#: templates/database/structure/table_header.phtml:36
+#: templates/table/structure/actions_in_table_structure.phtml:113
+#: templates/table/structure/row_stats_table.phtml:42
 msgid "Rows"
 msgstr "Vrstic"
 
 #: libraries/build_html_for_db.lib.php:48 libraries/engines/innodb.lib.php:171
-#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:186
-#: libraries/server_status.lib.php:298
-#: templates/structure/display_table_stats.phtml:40
+#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:195
+#: libraries/server_status.lib.php:307
+#: templates/table/structure/display_table_stats.phtml:40
 msgid "Total"
 msgstr "Skupaj"
 
@@ -4946,10 +4960,12 @@ msgid "Jump to database"
 msgstr "Pojdi v zbirko podatkov"
 
 #: libraries/build_html_for_db.lib.php:146
+#: templates/database/structure/structure_table_row.phtml:15
 msgid "Not replicated"
 msgstr "Ni podvojeno"
 
 #: libraries/build_html_for_db.lib.php:158
+#: templates/database/structure/structure_table_row.phtml:16
 msgid "Replicated"
 msgstr "Podvojeno"
 
@@ -5006,17 +5022,17 @@ msgstr "NE"
 #: libraries/plugins/export/ExportTexytext.class.php:425
 #: libraries/plugins/export/PMA_ExportPdf.class.php:307
 #: libraries/rte/rte_list.lib.php:73 libraries/rte/rte_list.lib.php:85
-#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:830
-#: libraries/rte/rte_routines.lib.php:1492 setup/frames/index.inc.php:162
+#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:921
+#: libraries/rte/rte_routines.lib.php:1583 setup/frames/index.inc.php:162
 #: templates/columns_definitions/table_fields_definitions.phtml:8
-#: templates/structure/table_structure_header.phtml:5
-#: templates/table/create_table.phtml:11
+#: templates/database/create_table.phtml:11
+#: templates/table/structure/table_structure_header.phtml:5
 msgid "Name"
 msgstr "Ime"
 
 #: libraries/central_columns.lib.php:699
 #: libraries/central_columns.lib.php:1381
-#: libraries/rte/rte_routines.lib.php:832
+#: libraries/rte/rte_routines.lib.php:923
 #: templates/columns_definitions/table_fields_definitions.phtml:14
 msgid "Length/Values"
 msgstr "Dolžina/Vrednosti"
@@ -5035,7 +5051,7 @@ msgid "Select a table"
 msgstr "Izberite tabelo"
 
 #: libraries/central_columns.lib.php:804
-#: templates/structure/add_column.phtml:4
+#: templates/table/structure/add_column.phtml:4
 msgid "Add column"
 msgstr "Dodaj stolpec"
 
@@ -5051,7 +5067,7 @@ msgstr "Dodaj nov stolpec"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1002
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1025
 #: templates/columns_definitions/table_fields_definitions.phtml:36
-#: templates/structure/table_structure_header.phtml:8
+#: templates/table/structure/table_structure_header.phtml:8
 msgid "Attributes"
 msgstr "Atributi"
 
@@ -5170,7 +5186,7 @@ msgid "Double click"
 msgstr "Dvojni klik"
 
 #: libraries/config.values.php:95 libraries/config.values.php:124
-#: libraries/config/FormDisplay.tpl.php:221 libraries/relation.lib.php:97
+#: libraries/config/FormDisplay.tpl.php:232 libraries/relation.lib.php:97
 #: libraries/relation.lib.php:105
 msgid "Disabled"
 msgstr "Onemogočeno"
@@ -5340,22 +5356,22 @@ msgstr "Stisnjeni izvoz ne bo deloval, saj manjka funkcija %s."
 msgid "maximum %s"
 msgstr "največ %s"
 
-#: libraries/config/FormDisplay.tpl.php:219
+#: libraries/config/FormDisplay.tpl.php:230
 msgid "This setting is disabled, it will not be applied to your configuration."
 msgstr ""
 "Nastavitev je onemogočena, zato ne bo uporabljena pri vaši konfiguraciji."
 
-#: libraries/config/FormDisplay.tpl.php:313
+#: libraries/config/FormDisplay.tpl.php:324
 #, php-format
 msgid "Set value: %s"
 msgstr "Določi vrednost: %s"
 
-#: libraries/config/FormDisplay.tpl.php:318
+#: libraries/config/FormDisplay.tpl.php:329
 #: libraries/config/messages.inc.php:610
 msgid "Restore default value"
 msgstr "Povrni privzeto vrednost"
 
-#: libraries/config/FormDisplay.tpl.php:332
+#: libraries/config/FormDisplay.tpl.php:343
 msgid "Allow users to customize this value"
 msgstr "Dovoli uporabnikom prilagajati to vrednost"
 
@@ -5844,7 +5860,7 @@ msgstr "Nabor znakov datoteke"
 
 #: libraries/config/messages.inc.php:136 libraries/config/messages.inc.php:152
 #: libraries/sql_query_form.lib.php:247
-#: templates/structure/row_stats_table.phtml:7
+#: templates/table/structure/row_stats_table.phtml:7
 msgid "Format"
 msgstr "Oblika"
 
@@ -6357,7 +6373,7 @@ msgstr ""
 
 #: libraries/config/messages.inc.php:332
 #: libraries/plugins/export/ExportPdf.class.php:279
-#: templates/structure/secondary_tabs.phtml:8
+#: templates/table/secondary_tabs.phtml:8
 msgid "Table structure"
 msgstr "Zgradba tabele"
 
@@ -8033,103 +8049,33 @@ msgstr "Microsoft Word 2000"
 msgid "OpenDocument Text"
 msgstr "Besedilo OpenDocument"
 
-#: libraries/controllers/StructureController.class.php:465
+#: libraries/controllers/DatabaseStructureController.class.php:405
 #: tbl_operations.php:382
 #, php-format
 msgid "Table %s has been emptied."
 msgstr "Izpraznil sem tabelo %s."
 
-#: libraries/controllers/StructureController.class.php:486
+#: libraries/controllers/DatabaseStructureController.class.php:426
 #: tbl_operations.php:400 view_operations.php:119
 #, php-format
 msgid "View %s has been dropped."
 msgstr "Pogled %s sem zavrgel."
 
-#: libraries/controllers/StructureController.class.php:487
+#: libraries/controllers/DatabaseStructureController.class.php:427
 #: tbl_operations.php:401
 #, php-format
 msgid "Table %s has been dropped."
 msgstr "Tabelo %s sem zavrgel."
 
-#: libraries/controllers/StructureController.class.php:797
-#, php-format
-msgid "The name '%s' is a MySQL reserved keyword."
-msgid_plural "The names '%s' are MySQL reserved keywords."
-msgstr[0] "Ime '%s' je rezervirana beseda MySQL."
-msgstr[1] "Imeni '%s' sta rezervirani besedi MySQL."
-msgstr[2] "Imena '%s' so rezervirane besede MySQL."
-msgstr[3] "Imena '%s' so rezervirane besede MySQL."
-
-#: libraries/controllers/StructureController.class.php:875
-msgid "No column selected."
-msgstr "Ni izbranih stolpcev."
-
-#: libraries/controllers/StructureController.class.php:1049
+#: libraries/controllers/DatabaseStructureController.class.php:733
 msgid "Favorite List is full!"
 msgstr "Seznam Priljubljenih je poln!"
 
-#: libraries/controllers/StructureController.class.php:1272
-msgid "The columns have been moved successfully."
-msgstr "Stolpce smo uspešno premaknili."
-
-#: libraries/controllers/StructureController.class.php:1535
-#, php-format
-msgid ""
-"Table %1$s has been altered successfully. Privileges have been adjusted."
-msgstr "Tabelo %1$s smo uspešno spremenili. Privilegije smo prilagodili."
-
-#: libraries/controllers/StructureController.class.php:1541
-#: libraries/controllers/TableIndexesController.class.php:161
-#: tbl_addfield.php:92
-#, php-format
-msgid "Table %1$s has been altered successfully."
-msgstr "Tabelo %1$s smo uspešno spremenili."
-
-#: libraries/controllers/StructureController.class.php:1588
-#: libraries/tracking.lib.php:1094
-msgid "Query error"
-msgstr "Napaka poizvedbe"
-
-#: libraries/controllers/StructureController.class.php:1806
+#: libraries/controllers/DatabaseStructureController.class.php:947
 #: libraries/mysql_charsets.lib.php:366 libraries/mysql_charsets.lib.php:373
 msgid "unknown"
 msgstr "neznano"
 
-#: libraries/controllers/StructureController.class.php:1957
-#: templates/structure/check_all_table_column.phtml:11
-msgid "Change"
-msgstr "Spremeni"
-
-#: libraries/controllers/StructureController.class.php:1961
-#: libraries/controllers/StructureController.class.php:1966
-#: libraries/navigation/Nodes/Node_Index.class.php:30
-#: libraries/tracking.lib.php:926
-#: templates/columns_definitions/column_indexes.phtml:16
-#: templates/columns_definitions/table_fields_definitions.phtml:57
-#: templates/structure/check_all_table_column.phtml:30
-#: templates/structure/display_structure.phtml:79
-#: templates/structure/display_table_stats.phtml:19
-msgid "Index"
-msgstr "Indeks"
-
-#: libraries/controllers/StructureController.class.php:1963
-#: libraries/controllers/StructureController.class.php:1968
-#: templates/columns_definitions/column_indexes.phtml:27
-#: templates/structure/check_all_table_column.phtml:37
-msgid "Spatial"
-msgstr "Prostorsko"
-
-#: libraries/controllers/StructureController.class.php:1964
-#: libraries/controllers/StructureController.class.php:1969
-#: templates/columns_definitions/column_indexes.phtml:22
-#: templates/structure/check_all_table_column.phtml:47
-msgid "Fulltext"
-msgstr "Polno besedilo"
-
-#: libraries/controllers/StructureController.class.php:1970
-msgid "Distinct values"
-msgstr "Različne vrednosti"
-
 #: libraries/controllers/TableChartController.class.php:82
 #: libraries/controllers/TableGisVisualizationController.class.php:101
 msgid "No SQL query was set to fetch data."
@@ -8144,11 +8090,18 @@ msgstr ""
 msgid "No data to display"
 msgstr "Ni podatkov za prikaz"
 
-#: libraries/controllers/TableRelationController.class.php:217
+#: libraries/controllers/TableIndexesController.class.php:161
+#: libraries/controllers/TableStructureController.class.php:736
+#: tbl_addfield.php:92
+#, php-format
+msgid "Table %1$s has been altered successfully."
+msgstr "Tabelo %1$s smo uspešno spremenili."
+
+#: libraries/controllers/TableRelationController.class.php:218
 msgid "Display column was successfully updated."
 msgstr "Prikazni stolpec smo uspešno posodobili."
 
-#: libraries/controllers/TableRelationController.class.php:283
+#: libraries/controllers/TableRelationController.class.php:288
 msgid "Internal relations were successfully updated."
 msgstr "Notranja razmerja smo uspešno posodobili."
 
@@ -8161,10 +8114,73 @@ msgid "Zoom search"
 msgstr "Iskanje s povečevanjem"
 
 #: libraries/controllers/TableSearchController.class.php:852
-#: templates/table/selection_form.phtml:59
+#: templates/table/search/selection_form.phtml:59
 msgid "Find and replace"
 msgstr "Najdi in zamenjaj"
 
+#: libraries/controllers/TableStructureController.class.php:163
+#, php-format
+msgid "The name '%s' is a MySQL reserved keyword."
+msgid_plural "The names '%s' are MySQL reserved keywords."
+msgstr[0] "Ime '%s' je rezervirana beseda MySQL."
+msgstr[1] "Imeni '%s' sta rezervirani besedi MySQL."
+msgstr[2] "Imena '%s' so rezervirane besede MySQL."
+msgstr[3] "Imena '%s' so rezervirane besede MySQL."
+
+#: libraries/controllers/TableStructureController.class.php:241
+msgid "No column selected."
+msgstr "Ni izbranih stolpcev."
+
+#: libraries/controllers/TableStructureController.class.php:467
+msgid "The columns have been moved successfully."
+msgstr "Stolpce smo uspešno premaknili."
+
+#: libraries/controllers/TableStructureController.class.php:730
+#, php-format
+msgid ""
+"Table %1$s has been altered successfully. Privileges have been adjusted."
+msgstr "Tabelo %1$s smo uspešno spremenili. Privilegije smo prilagodili."
+
+#: libraries/controllers/TableStructureController.class.php:783
+#: libraries/tracking.lib.php:1094
+msgid "Query error"
+msgstr "Napaka poizvedbe"
+
+#: libraries/controllers/TableStructureController.class.php:948
+#: templates/table/structure/check_all_table_column.phtml:11
+msgid "Change"
+msgstr "Spremeni"
+
+#: libraries/controllers/TableStructureController.class.php:952
+#: libraries/controllers/TableStructureController.class.php:957
+#: libraries/navigation/Nodes/Node_Index.class.php:30
+#: libraries/tracking.lib.php:926
+#: templates/columns_definitions/column_indexes.phtml:16
+#: templates/columns_definitions/table_fields_definitions.phtml:57
+#: templates/table/structure/check_all_table_column.phtml:30
+#: templates/table/structure/display_structure.phtml:79
+#: templates/table/structure/display_table_stats.phtml:19
+msgid "Index"
+msgstr "Indeks"
+
+#: libraries/controllers/TableStructureController.class.php:954
+#: libraries/controllers/TableStructureController.class.php:959
+#: templates/columns_definitions/column_indexes.phtml:27
+#: templates/table/structure/check_all_table_column.phtml:37
+msgid "Spatial"
+msgstr "Prostorsko"
+
+#: libraries/controllers/TableStructureController.class.php:955
+#: libraries/controllers/TableStructureController.class.php:960
+#: templates/columns_definitions/column_indexes.phtml:22
+#: templates/table/structure/check_all_table_column.phtml:47
+msgid "Fulltext"
+msgstr "Polno besedilo"
+
+#: libraries/controllers/TableStructureController.class.php:963
+msgid "Distinct values"
+msgstr "Različne vrednosti"
+
 #: libraries/core.lib.php:306
 #, php-format
 msgid "The %s extension is missing. Please check your PHP configuration."
@@ -8211,7 +8227,7 @@ msgid "No Password"
 msgstr "Brez gesla"
 
 #: libraries/display_change_password.lib.php:68
-#: libraries/plugins/auth/AuthenticationCookie.class.php:199
+#: libraries/plugins/auth/AuthenticationCookie.class.php:187
 #: libraries/replication_gui.lib.php:422 libraries/replication_gui.lib.php:862
 #: libraries/server_privileges.lib.php:1640
 msgid "Password:"
@@ -9002,12 +9018,12 @@ msgid "Dump has been saved to file %s."
 msgstr "Dump je shranjen v datoteko %s."
 
 #: libraries/import.lib.php:202 libraries/insert_edit.lib.php:124
-#: libraries/rte/rte_routines.lib.php:1353 libraries/sql.lib.php:1312
+#: libraries/rte/rte_routines.lib.php:1444 libraries/sql.lib.php:1306
 #: tbl_get_field.php:44
 msgid "MySQL returned an empty result set (i.e. zero rows)."
 msgstr "MySQL je vrnil kot rezultat prazno množico (npr. nič vrstic)."
 
-#: libraries/import.lib.php:265 libraries/sql.lib.php:1326
+#: libraries/import.lib.php:265 libraries/sql.lib.php:1320
 msgid "[ROLLBACK occurred.]"
 msgstr "[Zgodil se je ROLLBACK.]"
 
@@ -9076,14 +9092,14 @@ msgstr "Ustvari indeks na &nbsp;%s&nbsp;stolpcih"
 
 #: libraries/insert_edit.lib.php:233
 #: libraries/navigation/Nodes/Node_DatabaseChild.class.php:48
-#: templates/designer/table_list.phtml:40
+#: templates/database/designer/table_list.phtml:40
 msgid "Hide"
 msgstr "Skrij"
 
 #: libraries/insert_edit.lib.php:249
 #: libraries/navigation/Nodes/Node_Function.class.php:32
-#: libraries/rte/rte_routines.lib.php:1495
-#: templates/table/table_header.phtml:4
+#: libraries/rte/rte_routines.lib.php:1586
+#: templates/table/search/table_header.phtml:4
 msgid "Function"
 msgstr "Funkcija"
 
@@ -9096,84 +9112,85 @@ msgstr "Dvojiško"
 msgid "Because of its length,<br /> this column might not be editable."
 msgstr "Zaradi njegove dolžine<br />stolpca morda ne bo mogoče urejati."
 
-#: libraries/insert_edit.lib.php:1050
+#: libraries/insert_edit.lib.php:1048
 msgid "Binary - do not edit"
 msgstr "Dvojiško - ne urejaj"
 
-#: libraries/insert_edit.lib.php:1176 libraries/server_privileges.lib.php:470
-#: templates/table/options.phtml:36
+#: libraries/insert_edit.lib.php:1174 libraries/server_privileges.lib.php:470
+#: templates/table/search/options.phtml:36
 msgid "Or"
 msgstr "Ali"
 
-#: libraries/insert_edit.lib.php:1177
+#: libraries/insert_edit.lib.php:1175
 msgid "web server upload directory:"
 msgstr "imenik za nalaganje datotek:"
 
-#: libraries/insert_edit.lib.php:1348 templates/table/input_box.phtml:49
+#: libraries/insert_edit.lib.php:1346
+#: templates/table/search/input_box.phtml:49
 msgid "Edit/Insert"
 msgstr "Uredi/Vstavi"
 
-#: libraries/insert_edit.lib.php:1398
+#: libraries/insert_edit.lib.php:1396
 #, php-format
 msgid "Continue insertion with %s rows"
 msgstr "Nadaljuj vstavljanje z %s vrsticami"
 
-#: libraries/insert_edit.lib.php:1428
+#: libraries/insert_edit.lib.php:1426
 msgid "and then"
 msgstr "in potem"
 
-#: libraries/insert_edit.lib.php:1461
+#: libraries/insert_edit.lib.php:1459
 msgid "Insert as new row"
 msgstr "Vstavi kot novo vrstico"
 
-#: libraries/insert_edit.lib.php:1464
+#: libraries/insert_edit.lib.php:1462
 msgid "Insert as new row and ignore errors"
 msgstr "Vstavi kot novo vrstico in presliši napake"
 
-#: libraries/insert_edit.lib.php:1467
+#: libraries/insert_edit.lib.php:1465
 msgid "Show insert query"
 msgstr "Prikaži poizvedbo insert"
 
-#: libraries/insert_edit.lib.php:1487
+#: libraries/insert_edit.lib.php:1485
 msgid "Go back to previous page"
 msgstr "Pojdi nazaj na prejšnjo stran"
 
-#: libraries/insert_edit.lib.php:1490
+#: libraries/insert_edit.lib.php:1488
 msgid "Insert another new row"
 msgstr "Vstavi še eno novo vrstico"
 
-#: libraries/insert_edit.lib.php:1495
+#: libraries/insert_edit.lib.php:1493
 msgid "Go back to this page"
 msgstr "Pojdi nazaj na stran"
 
-#: libraries/insert_edit.lib.php:1518
+#: libraries/insert_edit.lib.php:1516
 msgid "Edit next row"
 msgstr "Uredi naslednjo vrstico"
 
-#: libraries/insert_edit.lib.php:1540
+#: libraries/insert_edit.lib.php:1538
 msgid ""
 "Use TAB key to move from value to value, or CTRL+arrows to move anywhere"
 msgstr ""
 "Uporabite tipko TAB za premik od vrednosti do vrednosti ali CTRL+puščice za "
 "premik kamor koli"
 
-#: libraries/insert_edit.lib.php:1577 libraries/replication_gui.lib.php:542
-#: libraries/rte/rte_routines.lib.php:1497
+#: libraries/insert_edit.lib.php:1575 libraries/replication_gui.lib.php:542
+#: libraries/rte/rte_routines.lib.php:1588
 #: libraries/server_status_variables.lib.php:220
-#: templates/designer/having_query_panel.phtml:100
-#: templates/designer/options_panel.phtml:73
-#: templates/designer/options_panel.phtml:239
-#: templates/designer/where_query_panel.phtml:69
-#: templates/table/table_header.phtml:10
-#: templates/table/zoom_result_form.phtml:35
+#: templates/database/designer/having_query_panel.phtml:100
+#: templates/database/designer/options_panel.phtml:73
+#: templates/database/designer/options_panel.phtml:239
+#: templates/database/designer/where_query_panel.phtml:69
+#: templates/table/search/table_header.phtml:10
+#: templates/table/search/zoom_result_form.phtml:35
 msgid "Value"
 msgstr "Vrednost"
 
-#: libraries/insert_edit.lib.php:1937 libraries/sql.lib.php:1309
+#: libraries/insert_edit.lib.php:1935 libraries/sql.lib.php:1303
 msgid "Showing SQL query"
 msgstr "Prikazovanje poizvedbe SQL"
 
-#: libraries/insert_edit.lib.php:1962 libraries/sql.lib.php:1287
+#: libraries/insert_edit.lib.php:1960 libraries/sql.lib.php:1281
 #, php-format
 msgid "Inserted row id: %1$d"
 msgstr "Id vstavljene vrstice: %1$d"
@@ -9585,7 +9602,7 @@ msgstr "Nov"
 #: libraries/navigation/Nodes/Node_View_Container.class.php:26
 #: libraries/navigation/Nodes/Node_View_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:129
-#: templates/structure/show_create.phtml:30
+#: templates/database/structure/show_create.phtml:30
 msgid "Views"
 msgstr "Pogledi"
 
@@ -9912,7 +9929,7 @@ msgstr ""
 
 #: libraries/operations.lib.php:101 libraries/operations.lib.php:249
 #: libraries/operations.lib.php:869 libraries/operations.lib.php:963
-#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:907
+#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:998
 #: templates/columns_definitions/table_fields_definitions.phtml:47
 msgid "Adjust Privileges"
 msgstr "Prilagodi privilegije"
@@ -10002,22 +10019,22 @@ msgid "Switch to copied table"
 msgstr "Preklopi na kopirano tabelo"
 
 #: libraries/operations.lib.php:1360
-#: templates/structure/check_all_tables.phtml:18
+#: templates/database/structure/check_all_tables.phtml:18
 msgid "Table maintenance"
 msgstr "Vzdrževanje tabele"
 
 #: libraries/operations.lib.php:1398
-#: templates/structure/check_all_tables.phtml:19
+#: templates/database/structure/check_all_tables.phtml:19
 msgid "Analyze table"
 msgstr "Analiziraj tabelo"
 
 #: libraries/operations.lib.php:1413
-#: templates/structure/check_all_tables.phtml:20
+#: templates/database/structure/check_all_tables.phtml:20
 msgid "Check table"
 msgstr "Preveri tabelo"
 
 #: libraries/operations.lib.php:1428
-#: templates/structure/check_all_tables.phtml:22
+#: templates/database/structure/check_all_tables.phtml:22
 msgid "Checksum table"
 msgstr "Tabela kontrolnih vsot"
 
@@ -10035,18 +10052,19 @@ msgid "Flush the table (FLUSH)"
 msgstr "Počisti tabelo (FLUSH)"
 
 #: libraries/operations.lib.php:1477
-#: templates/structure/check_all_tables.phtml:23
-#: templates/structure/display_table_stats.phtml:56
+#: templates/database/structure/check_all_tables.phtml:23
+#: templates/table/structure/display_table_stats.phtml:56
 msgid "Optimize table"
 msgstr "Optimiraj tabelo"
 
 #: libraries/operations.lib.php:1492
-#: templates/structure/check_all_tables.phtml:24
+#: templates/database/structure/check_all_tables.phtml:24
 msgid "Repair table"
 msgstr "Popravi tabelo"
 
 #: libraries/operations.lib.php:1538
-#: templates/structure/check_all_tables.phtml:14 view_operations.php:127
+#: templates/database/structure/check_all_tables.phtml:14
+#: view_operations.php:127
 msgid "Delete data or table"
 msgstr "Izbriši podatke ali tabelo"
 
@@ -10168,7 +10186,7 @@ msgid "Cannot connect: invalid settings."
 msgstr "Ne morem se povezati: neveljavne nastavitve."
 
 #: libraries/plugins/auth/AuthenticationConfig.class.php:108
-#: libraries/plugins/auth/AuthenticationCookie.class.php:134
+#: libraries/plugins/auth/AuthenticationCookie.class.php:122
 #: libraries/plugins/auth/AuthenticationHttp.class.php:96
 #, php-format
 msgid "Welcome to %s"
@@ -10198,36 +10216,36 @@ msgstr ""
 msgid "Retry to connect"
 msgstr "Poskusi se ponovno povezati"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:146
+#: libraries/plugins/auth/AuthenticationCookie.class.php:134
 msgid "Your session has expired. Please log in again."
 msgstr "Vaša seja je potekla. Prosimo, prijavite se znova."
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:170
+#: libraries/plugins/auth/AuthenticationCookie.class.php:158
 msgid "Log in"
 msgstr "Prijava"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:178
-#: libraries/plugins/auth/AuthenticationCookie.class.php:188
+#: libraries/plugins/auth/AuthenticationCookie.class.php:166
+#: libraries/plugins/auth/AuthenticationCookie.class.php:176
 msgid "You can enter hostname/IP address and port separated by space."
 msgstr "Vnesete lahko ime gostitelja/IP-naslov in vrata ločena s presledkom."
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:193
+#: libraries/plugins/auth/AuthenticationCookie.class.php:181
 msgid "Username:"
 msgstr "Uporabniško ime:"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:205
+#: libraries/plugins/auth/AuthenticationCookie.class.php:193
 msgid "Server Choice:"
 msgstr "Izbira strežnika:"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:386
+#: libraries/plugins/auth/AuthenticationCookie.class.php:374
 msgid "Entered captcha is wrong, try again!"
 msgstr "Vnesena captcha je napačna; poskusite znova!"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:396
+#: libraries/plugins/auth/AuthenticationCookie.class.php:384
 msgid "Please enter correct captcha!"
 msgstr "Prosimo, vnesite pravilno captcho!"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:423
+#: libraries/plugins/auth/AuthenticationCookie.class.php:411
 msgid "You are not allowed to log in to this MySQL server!"
 msgstr "Nimate dovoljenja za prijavo na ta strežnik MySQL!"
 
@@ -10325,7 +10343,7 @@ msgstr "Dogodek"
 #: libraries/plugins/export/ExportOdt.class.php:593
 #: libraries/plugins/export/ExportTexytext.class.php:428
 #: libraries/plugins/export/PMA_ExportPdf.class.php:313
-#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:984
 #: libraries/rte/rte_triggers.lib.php:377
 msgid "Definition"
 msgstr "Opredelitev"
@@ -10644,7 +10662,7 @@ msgid "Last check:"
 msgstr "Zadnjič pregledano:"
 
 #: libraries/plugins/export/ExportSql.class.php:1399
-#: templates/structure/structure_table_row.phtml:183
+#: templates/database/structure/structure_table_row.phtml:183
 msgid "in use"
 msgstr "v uporabi"
 
@@ -10838,18 +10856,14 @@ msgstr "Prostorska razširitev MySQL ne podpira ESRI vrste \"%s\"."
 msgid "The imported file does not contain any data!"
 msgstr "Uvožena datoteka ne vsebuje nobenih podatkov!"
 
-#: libraries/plugins/import/ImportSql.class.php:169
+#: libraries/plugins/import/ImportSql.class.php:72
 msgid "SQL compatibility mode:"
 msgstr "Združljivostni način SQL:"
 
-#: libraries/plugins/import/ImportSql.class.php:181
+#: libraries/plugins/import/ImportSql.class.php:84
 msgid "Do not use <code>AUTO_INCREMENT</code> for zero values"
 msgstr "Ne uporabi <code>AUTO_INCREMENT</code> za ničelne vrednosti"
 
-#: libraries/plugins/import/ImportSql.class.php:195
-msgid "Read as multibytes"
-msgstr "Preberi kot večbajtno"
-
 #: libraries/plugins/import/ImportXml.class.php:54
 msgid "XML"
 msgstr "XML"
@@ -10892,7 +10906,7 @@ msgid "Show grid"
 msgstr "Pokaži mrežo"
 
 #: libraries/plugins/schema/SchemaPdf.class.php:94
-#: templates/structure/print_view_data_dictionary_link.phtml:6
+#: templates/database/structure/print_view_data_dictionary_link.phtml:6
 msgid "Data Dictionary"
 msgstr "Slovar podatkov"
 
@@ -10917,7 +10931,7 @@ msgid "The %s table doesn't exist!"
 msgstr "Tabela %s ne obstaja!"
 
 #: libraries/plugins/schema/eps/Eps_Relation_Schema.class.php:321
-#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:309
+#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:323
 #, php-format
 msgid "Schema of the %s database - Page %s"
 msgstr "Shema zbirke podatkov %s - Stran %s"
@@ -10943,7 +10957,7 @@ msgstr "Vsebina"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1005
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1028
 #: libraries/tracking.lib.php:884
-#: templates/structure/table_structure_header.phtml:11
+#: templates/table/structure/table_structure_header.phtml:11
 msgid "Extra"
 msgstr "Dodatno"
 
@@ -11301,11 +11315,11 @@ msgstr "Hitri koraki za namestitev naprednih funkcij:"
 msgid "Create the needed tables with the <code>%screate_tables.sql</code>."
 msgstr "Ustvarite potrebne tabele z <code>%screate_tables.sql</code>."
 
-#: libraries/relation.lib.php:360
+#: libraries/relation.lib.php:357
 msgid "Create a pma user and give access to these tables."
 msgstr "Ustvarite uporabnika pma in mu dodelite dostop do teh tabel."
 
-#: libraries/relation.lib.php:365
+#: libraries/relation.lib.php:360
 msgid ""
 "Enable advanced features in configuration file (<code>config.inc.php</"
 "code>), for example by starting from <code>config.sample.inc.php</code>."
@@ -11313,17 +11327,17 @@ msgstr ""
 "Omogočite napredne funkcije v konfiguracijski datoteki (<code>config.inc."
 "php</code>); začnite na primer s <code>config.sample.inc.php</code>."
 
-#: libraries/relation.lib.php:373
+#: libraries/relation.lib.php:365
 msgid "Re-login to phpMyAdmin to load the updated configuration file."
 msgstr ""
 "Ponovno se prijavite v phpMyAdmin, da naložite posodobljeno konfiguracijsko "
 "datoteko."
 
-#: libraries/relation.lib.php:1612
+#: libraries/relation.lib.php:1607
 msgid "no description"
 msgstr "brez opisa"
 
-#: libraries/relation.lib.php:1811
+#: libraries/relation.lib.php:1806
 msgid ""
 "You do not have necessary privileges to create a database named "
 "'phpmyadmin'. You may go to 'Operations' tab of any database to set up the "
@@ -11333,7 +11347,7 @@ msgstr ""
 "Greste lahko na zavihek 'Dejanja' v vsaki od zbirk podatkov in nastavite "
 "hrambo konfiguracije phpMyAdmin."
 
-#: libraries/relation.lib.php:1928
+#: libraries/relation.lib.php:1923
 #, php-format
 msgid ""
 "%sCreate%s a database named 'phpmyadmin' and setup the phpMyAdmin "
@@ -11342,7 +11356,7 @@ msgstr ""
 "%sUstvari%s zbirko podatkov 'phpmyadmin' in vanjo namesti hrambo "
 "konfiguracije phpMyAdmin."
 
-#: libraries/relation.lib.php:1936
+#: libraries/relation.lib.php:1931
 #, php-format
 msgid ""
 "%sCreate%s the phpMyAdmin configuration storage in the current database."
@@ -11350,13 +11364,13 @@ msgstr ""
 "%sCreate%s tabele hrambe konfiguracije phpMyAdmin in trenutni zbirki "
 "podatkov."
 
-#: libraries/relation.lib.php:1944
+#: libraries/relation.lib.php:1939
 #, php-format
 msgid "%sCreate%s missing phpMyAdmin configuration storage tables."
 msgstr "%sUstvari%s manjkajoče tabele hrambe konfiguracije phpMyAdmin."
 
 #: libraries/replication_gui.lib.php:46 libraries/replication_gui.lib.php:343
-#: libraries/server_databases.lib.php:387
+#: libraries/server_databases.lib.php:398
 msgid "Master replication"
 msgstr "Podvojevanje glavnega strežnika"
 
@@ -11421,7 +11435,7 @@ msgstr ""
 "konfiguriran kot glavni strežnik."
 
 #: libraries/replication_gui.lib.php:141
-#: libraries/server_databases.lib.php:389
+#: libraries/server_databases.lib.php:400
 msgid "Slave replication"
 msgstr "Podvojevanje podrejencev"
 
@@ -11698,10 +11712,10 @@ msgid "Master server changed successfully to %s."
 msgstr "Glavni strežnik sem uspešno spremenil v %s."
 
 #: libraries/rte/rte_events.lib.php:106 libraries/rte/rte_events.lib.php:115
-#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:149
-#: libraries/rte/rte_routines.lib.php:158
-#: libraries/rte/rte_routines.lib.php:231
-#: libraries/rte/rte_routines.lib.php:1362
+#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:219
+#: libraries/rte/rte_routines.lib.php:246
+#: libraries/rte/rte_routines.lib.php:368
+#: libraries/rte/rte_routines.lib.php:1453
 #: libraries/rte/rte_triggers.lib.php:82 libraries/rte/rte_triggers.lib.php:91
 #: libraries/rte/rte_triggers.lib.php:123
 #, php-format
@@ -11722,7 +11736,7 @@ msgstr "Dogodek %1$s je bil spremenjen."
 msgid "Event %1$s has been created."
 msgstr "Dogodek %1$s je ustvarjen."
 
-#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:251
+#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:266
 #: libraries/rte/rte_triggers.lib.php:144
 msgid "One or more errors have occurred while processing your request:"
 msgstr "Med obdelovanjem vaše zahteve je prišlo do ene ali več napak:"
@@ -11731,7 +11745,7 @@ msgstr "Med obdelovanjem vaše zahteve je prišlo do ene ali več napak:"
 msgid "Edit event"
 msgstr "Uredi dogodek"
 
-#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:794
+#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:885
 #: libraries/rte/rte_triggers.lib.php:323 view_create.php:180
 msgid "Details"
 msgstr "Podrobnosti"
@@ -11744,7 +11758,7 @@ msgstr "Ime dogodka"
 msgid "Event type"
 msgstr "Vrsta dogodka"
 
-#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:817
+#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:908
 #, php-format
 msgid "Change to %s"
 msgstr "Spremeni v %s"
@@ -11771,12 +11785,14 @@ msgstr "Konec"
 msgid "On completion preserve"
 msgstr "Ob dokončanju ohrani"
 
-#: libraries/rte/rte_events.lib.php:491 libraries/rte/rte_routines.lib.php:930
+#: libraries/rte/rte_events.lib.php:491
+#: libraries/rte/rte_routines.lib.php:1021
 #: libraries/rte/rte_triggers.lib.php:383 view_create.php:209
 msgid "Definer"
 msgstr "Opredeljevalec"
 
-#: libraries/rte/rte_events.lib.php:535 libraries/rte/rte_routines.lib.php:997
+#: libraries/rte/rte_events.lib.php:535
+#: libraries/rte/rte_routines.lib.php:1088
 #: libraries/rte/rte_triggers.lib.php:422
 msgid "The definer must be in the \"username@hostname\" format!"
 msgstr "Opredeljevalec mora biti oblike \"uporabniškoime@imegostitelja\"!"
@@ -11802,9 +11818,9 @@ msgid "You must provide an event definition."
 msgstr "Navesti morate opredelitev dogodka."
 
 #: libraries/rte/rte_export.lib.php:43 libraries/rte/rte_general.lib.php:72
-#: libraries/rte/rte_routines.lib.php:345
-#: libraries/rte/rte_routines.lib.php:1198
-#: libraries/rte/rte_routines.lib.php:1411
+#: libraries/rte/rte_routines.lib.php:153
+#: libraries/rte/rte_routines.lib.php:1289
+#: libraries/rte/rte_routines.lib.php:1502
 msgid "Error in processing request:"
 msgstr "Napaka v obdelovanju zahteve:"
 
@@ -11840,72 +11856,72 @@ msgstr ""
 "[/strong] Prosimo, uporabljajte izboljšano razširitev 'mysqli' v izogib "
 "morebitnim težavam."
 
-#: libraries/rte/rte_routines.lib.php:110
-#: libraries/rte/rte_routines.lib.php:1006
+#: libraries/rte/rte_routines.lib.php:123
+msgid "Edit routine"
+msgstr "Uredi rutino"
+
+#: libraries/rte/rte_routines.lib.php:200
+#: libraries/rte/rte_routines.lib.php:1097
 #, php-format
 msgid "Invalid routine type: \"%s\""
 msgstr "Neveljavna vrsta rutine: \"%s\""
 
-#: libraries/rte/rte_routines.lib.php:170
-msgid "Sorry, we failed to restore the dropped routine."
-msgstr "Oprostite, zavržene rutine nam ni uspelo obnoviti."
-
-#: libraries/rte/rte_routines.lib.php:211
-#, php-format
-msgid "Routine %1$s has been modified. Privileges have been adjusted."
-msgstr "Rutino %1$s smo spremenili. Privilegije smo prilagodili."
-
-#: libraries/rte/rte_routines.lib.php:216
-#, php-format
-msgid "Routine %1$s has been modified."
-msgstr "Rutino %1$s smo spremenili."
-
-#: libraries/rte/rte_routines.lib.php:238
+#: libraries/rte/rte_routines.lib.php:253
 #, php-format
 msgid "Routine %1$s has been created."
 msgstr "Rutino %1$s smo ustvarili."
 
-#: libraries/rte/rte_routines.lib.php:315
-msgid "Edit routine"
-msgstr "Uredi rutino"
+#: libraries/rte/rte_routines.lib.php:380
+msgid "Sorry, we failed to restore the dropped routine."
+msgstr "Oprostite, zavržene rutine nam ni uspelo obnoviti."
 
-#: libraries/rte/rte_routines.lib.php:797
+#: libraries/rte/rte_routines.lib.php:439
+#, php-format
+msgid "Routine %1$s has been modified. Privileges have been adjusted."
+msgstr "Rutino %1$s smo spremenili. Privilegije smo prilagodili."
+
+#: libraries/rte/rte_routines.lib.php:444
+#, php-format
+msgid "Routine %1$s has been modified."
+msgstr "Rutino %1$s smo spremenili."
+
+#: libraries/rte/rte_routines.lib.php:888
 msgid "Routine name"
 msgstr "Ime rutine"
 
-#: libraries/rte/rte_routines.lib.php:823
+#: libraries/rte/rte_routines.lib.php:914
 msgid "Parameters"
 msgstr "Parametri"
 
-#: libraries/rte/rte_routines.lib.php:829
+#: libraries/rte/rte_routines.lib.php:920
 msgid "Direction"
 msgstr "Smer"
 
-#: libraries/rte/rte_routines.lib.php:847
+#: libraries/rte/rte_routines.lib.php:938
 msgid "Add parameter"
 msgstr "Dodaj parameter"
 
-#: libraries/rte/rte_routines.lib.php:851
+#: libraries/rte/rte_routines.lib.php:942
 msgid "Remove last parameter"
 msgstr "Odstrani zadnji parameter"
 
-#: libraries/rte/rte_routines.lib.php:856
+#: libraries/rte/rte_routines.lib.php:947
 msgid "Return type"
 msgstr "Vrnjena vrsta"
 
-#: libraries/rte/rte_routines.lib.php:862
+#: libraries/rte/rte_routines.lib.php:953
 msgid "Return length/values"
 msgstr "Vrnjena dolžina/vrednosti"
 
-#: libraries/rte/rte_routines.lib.php:868
+#: libraries/rte/rte_routines.lib.php:959
 msgid "Return options"
 msgstr "Vrnjene možnosti"
 
-#: libraries/rte/rte_routines.lib.php:899
+#: libraries/rte/rte_routines.lib.php:990
 msgid "Is deterministic"
 msgstr "Je deterministično"
 
-#: libraries/rte/rte_routines.lib.php:920
+#: libraries/rte/rte_routines.lib.php:1011
 msgid ""
 "You do not have sufficient privileges to perform this operation; Please "
 "refer to the documentation for more details"
@@ -11913,25 +11929,25 @@ msgstr ""
 "Nimate zadostnih pravic za izvedbo posega; prosimo, oglejte si dokumentacijo "
 "za več podrobnosti"
 
-#: libraries/rte/rte_routines.lib.php:935
+#: libraries/rte/rte_routines.lib.php:1026
 msgid "Security type"
 msgstr "Vrsta varnosti"
 
-#: libraries/rte/rte_routines.lib.php:944
+#: libraries/rte/rte_routines.lib.php:1035
 msgid "SQL data access"
 msgstr "Dostop do podatkov SQL"
 
-#: libraries/rte/rte_routines.lib.php:1013
+#: libraries/rte/rte_routines.lib.php:1104
 msgid "You must provide a routine name!"
 msgstr "Navesti morate ime rutine!"
 
-#: libraries/rte/rte_routines.lib.php:1047
+#: libraries/rte/rte_routines.lib.php:1138
 #, php-format
 msgid "Invalid direction \"%s\" given for parameter."
 msgstr "Neveljavna smer \"%s\" podana za parameter."
 
-#: libraries/rte/rte_routines.lib.php:1069
-#: libraries/rte/rte_routines.lib.php:1131
+#: libraries/rte/rte_routines.lib.php:1160
+#: libraries/rte/rte_routines.lib.php:1222
 msgid ""
 "You must provide length/values for routine parameters of type ENUM, SET, "
 "VARCHAR and VARBINARY."
@@ -11939,24 +11955,24 @@ msgstr ""
 "Navesti morate dolžine/vrednosti za parametre rutine vrste ENUM, SET, "
 "VARCHAR in VARBINARY."
 
-#: libraries/rte/rte_routines.lib.php:1095
+#: libraries/rte/rte_routines.lib.php:1186
 msgid "You must provide a name and a type for each routine parameter."
 msgstr "Navesti morate ime in vrsto vsakega parametra rutine."
 
-#: libraries/rte/rte_routines.lib.php:1114
+#: libraries/rte/rte_routines.lib.php:1205
 msgid "You must provide a valid return type for the routine."
 msgstr "Navesti morate veljavno vrsto vrnjene vrednosti dogodka."
 
-#: libraries/rte/rte_routines.lib.php:1174
+#: libraries/rte/rte_routines.lib.php:1265
 msgid "You must provide a routine definition."
 msgstr "Navesti morate opredelitev rutine."
 
-#: libraries/rte/rte_routines.lib.php:1285
+#: libraries/rte/rte_routines.lib.php:1376
 #, php-format
 msgid "Execution results of routine %s"
 msgstr "Rezultati izvedbe rutine %s"
 
-#: libraries/rte/rte_routines.lib.php:1340
+#: libraries/rte/rte_routines.lib.php:1431
 #, php-format
 msgid "%d row affected by the last statement inside the procedure."
 msgid_plural "%d rows affected by the last statement inside the procedure."
@@ -11965,13 +11981,13 @@ msgstr[1] "Zadnja izjava znotraj procedure je spremenila %d vrstici."
 msgstr[2] "Zadnja izjava znotraj procedure je spremenila %d vrstice."
 msgstr[3] "Zadnja izjava znotraj procedure je spremenila %d vrstic."
 
-#: libraries/rte/rte_routines.lib.php:1398
-#: libraries/rte/rte_routines.lib.php:1406
+#: libraries/rte/rte_routines.lib.php:1489
+#: libraries/rte/rte_routines.lib.php:1497
 msgid "Execute routine"
 msgstr "Izvedi rutino"
 
-#: libraries/rte/rte_routines.lib.php:1485
-#: libraries/rte/rte_routines.lib.php:1488
+#: libraries/rte/rte_routines.lib.php:1576
+#: libraries/rte/rte_routines.lib.php:1579
 msgid "Routine parameters"
 msgstr "Parametri rutine"
 
@@ -12125,7 +12141,7 @@ msgid "Original position"
 msgstr "Izvirni položaj"
 
 #: libraries/server_bin_log.lib.php:133
-#: templates/structure/display_table_stats.phtml:4
+#: templates/table/structure/display_table_stats.phtml:4
 msgid "Information"
 msgstr "Podatki"
 
@@ -12163,12 +12179,12 @@ msgstr ""
 "Obvestilo: Omogočitev statistike zbirke podatkov lahko povzroči močno "
 "povečan promet med spletnim in podatkovnim strežnikom."
 
-#: libraries/server_databases.lib.php:364
-#: libraries/server_databases.lib.php:365
+#: libraries/server_databases.lib.php:366
+#: libraries/server_databases.lib.php:371
 msgid "Enable Statistics"
 msgstr "Omogoči statistiko"
 
-#: libraries/server_databases.lib.php:481
+#: libraries/server_databases.lib.php:492
 #, php-format
 msgid "%1$d database has been dropped successfully."
 msgid_plural "%1$d databases have been dropped successfully."
@@ -12542,7 +12558,7 @@ msgid "You have revoked the privileges for %s."
 msgstr "Odvzeli ste privilegije za %s."
 
 #: libraries/server_privileges.lib.php:2059
-#: libraries/server_privileges.lib.php:4290
+#: libraries/server_privileges.lib.php:4316
 msgid "Add user account"
 msgstr "Dodaj uporabniški račun"
 
@@ -12710,36 +12726,36 @@ msgstr "Brišem %s"
 msgid "The privileges were reloaded successfully."
 msgstr "Uspešno sem osvežil privilegije."
 
-#: libraries/server_privileges.lib.php:3994
+#: libraries/server_privileges.lib.php:4003
 #, php-format
 msgid "The user %s already exists!"
 msgstr "Uporabnik %s že obstaja!"
 
-#: libraries/server_privileges.lib.php:4232
+#: libraries/server_privileges.lib.php:4258
 #, php-format
 msgid "Privileges for %s"
 msgstr "Privilegiji %s"
 
-#: libraries/server_privileges.lib.php:4241
+#: libraries/server_privileges.lib.php:4267
 #: libraries/server_status_processes.lib.php:72
 #: libraries/server_user_groups.lib.php:39
 msgid "User"
 msgstr "Uporabnik"
 
-#: libraries/server_privileges.lib.php:4282
+#: libraries/server_privileges.lib.php:4308
 msgctxt "Create new user"
 msgid "New"
 msgstr "Nov"
 
-#: libraries/server_privileges.lib.php:4311
+#: libraries/server_privileges.lib.php:4337
 msgid "Edit privileges:"
 msgstr "Uredi privilegije:"
 
-#: libraries/server_privileges.lib.php:4312
+#: libraries/server_privileges.lib.php:4338
 msgid "User account"
 msgstr "Uporabniški račun"
 
-#: libraries/server_privileges.lib.php:4371
+#: libraries/server_privileges.lib.php:4397
 msgid ""
 "Note: You are attempting to edit privileges of the user with which you are "
 "currently logged in."
@@ -12747,11 +12763,11 @@ msgstr ""
 "Opozorilo: Poskušate urediti privilegije uporabnika, s katerim ste trenutno "
 "prijavljeni."
 
-#: libraries/server_privileges.lib.php:4391 libraries/server_users.lib.php:25
+#: libraries/server_privileges.lib.php:4417 libraries/server_users.lib.php:25
 msgid "User accounts overview"
 msgstr "Pregled uporabniških računov"
 
-#: libraries/server_privileges.lib.php:4459
+#: libraries/server_privileges.lib.php:4485
 msgid ""
 "A user account allowing any user from localhost to connect is present. This "
 "will prevent other users from connecting if the host part of their account "
@@ -12762,7 +12778,7 @@ msgstr ""
 "gostiteljski del njihovega računa dovoljuje povezavo s katerega koli (%) "
 "gostitelja."
 
-#: libraries/server_privileges.lib.php:4500
+#: libraries/server_privileges.lib.php:4526
 #, php-format
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
@@ -12775,7 +12791,7 @@ msgstr ""
 "jih uporablja strežnik, če so bile tabele ročno spremenjene. V tem primeru "
 "morate pred nadaljevanjem %sosvežiti privilegije%s."
 
-#: libraries/server_privileges.lib.php:4519
+#: libraries/server_privileges.lib.php:4545
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
 "tables. The content of these tables may differ from the privileges the "
@@ -12789,25 +12805,25 @@ msgstr ""
 "morate pred nadaljevanjem osvežiti privilegije, vendar trenuno nimate "
 "privilegija RELOAD."
 
-#: libraries/server_privileges.lib.php:4569
+#: libraries/server_privileges.lib.php:4595
 msgid "The selected user was not found in the privilege table."
 msgstr "Izbranega uporabnika v tabelah privilegijev nisem našel."
 
-#: libraries/server_privileges.lib.php:4801
+#: libraries/server_privileges.lib.php:4827
 msgid "You have added a new user."
 msgstr "Dodali ste novega uporabnika."
 
-#: libraries/server_status.lib.php:53
+#: libraries/server_status.lib.php:60
 #, php-format
 msgid "Network traffic since startup: %s"
 msgstr "Promet omrežja od zagona: %s"
 
-#: libraries/server_status.lib.php:66
+#: libraries/server_status.lib.php:73
 #, php-format
 msgid "This MySQL server has been running for %1$s. It started up on %2$s."
 msgstr "Strežnik MySQL deluje že %1$s. Zagnal se je %2$s."
 
-#: libraries/server_status.lib.php:80
+#: libraries/server_status.lib.php:94
 msgid ""
 "This MySQL server works as <b>master</b> and <b>slave</b> in <b>replication</"
 "b> process."
@@ -12815,22 +12831,22 @@ msgstr ""
 "Strežnik MySQL deluje kot <b>glavni strežnik</b> in <b>podrejenec</b> v "
 "postopku <b>podvojevanja</b>."
 
-#: libraries/server_status.lib.php:85
+#: libraries/server_status.lib.php:99
 msgid "This MySQL server works as <b>master</b> in <b>replication</b> process."
 msgstr ""
 "Strežnik MySQL deluje kot <b>glavni strežnik</b> v postopku <b>podvojevanja</"
 "b>."
 
-#: libraries/server_status.lib.php:90
+#: libraries/server_status.lib.php:104
 msgid "This MySQL server works as <b>slave</b> in <b>replication</b> process."
 msgstr ""
 "Strežnik MySQL deluje kot <b>podrejenec</b> v postopku <b>podvojevanja</b>."
 
-#: libraries/server_status.lib.php:106
+#: libraries/server_status.lib.php:116
 msgid "Replication status"
 msgstr "Stanje podvojevanja"
 
-#: libraries/server_status.lib.php:137
+#: libraries/server_status.lib.php:146
 msgid ""
 "On a busy server, the byte counters may overrun, so those statistics as "
 "reported by the MySQL server may be incorrect."
@@ -12838,19 +12854,19 @@ msgstr ""
 "Na zaposlenem strežniku lahko števci bajtov naštejejo preveč, zato je ta "
 "statistika, kot jo poroča strežnik MySQL, morda napačna."
 
-#: libraries/server_status.lib.php:148
+#: libraries/server_status.lib.php:157
 msgid "Received"
 msgstr "Prejeto"
 
-#: libraries/server_status.lib.php:167
+#: libraries/server_status.lib.php:176
 msgid "Sent"
 msgstr "Poslano"
 
-#: libraries/server_status.lib.php:234
+#: libraries/server_status.lib.php:243
 msgid "Max. concurrent connections"
 msgstr "Največ sočasnih povezav"
 
-#: libraries/server_status.lib.php:244
+#: libraries/server_status.lib.php:253
 msgid "Failed attempts"
 msgstr "Neuspeli poizkusi"
 
@@ -13921,7 +13937,7 @@ msgstr "Spremenljivka je samo za branje in je ni mogoče urejati"
 msgid "Not implemented yet."
 msgstr "Ni še implementirano."
 
-#: libraries/sql-parser/src/Components/AlterOperation.php:193
+#: libraries/sql-parser/src/Components/AlterOperation.php:191
 msgid "Unrecognized alter operation."
 msgstr "Neprepoznan poseg spremembe."
 
@@ -13935,7 +13951,7 @@ msgid "An opening bracket followed by a set of values was expected."
 msgstr "Pričakovali smo začetni oklepaj, ki mu sledi množica vrednosti."
 
 #: libraries/sql-parser/src/Components/ArrayObj.php:101
-#: libraries/sql-parser/src/Components/FieldDefinition.php:202
+#: libraries/sql-parser/src/Components/CreateDefinition.php:202
 msgid "An opening bracket was expected."
 msgstr "Pričakovali smo začetni oklepaj."
 
@@ -13943,25 +13959,33 @@ msgstr "Pričakovali smo začetni oklepaj."
 msgid "A comma or a closing bracket was expected"
 msgstr "Pričakovali smo vejico ali zaklepaj"
 
+#: libraries/sql-parser/src/Components/CreateDefinition.php:246
+msgid "A comma or a closing bracket was expected."
+msgstr "Pričakovali smo vejico ali zaklepaj."
+
+#: libraries/sql-parser/src/Components/CreateDefinition.php:262
+msgid "A closing bracket was expected."
+msgstr "Pričakovali smo zaklepaj."
+
 #: libraries/sql-parser/src/Components/DataType.php:125
 msgid "Unrecognized data type."
 msgstr "Neprepoznana vrsta podatkov."
 
-#: libraries/sql-parser/src/Components/Expression.php:225
+#: libraries/sql-parser/src/Components/Expression.php:227
 msgid "Unexpected closing bracket."
 msgstr "Nepričakovan zakepaj."
 
-#: libraries/sql-parser/src/Components/Expression.php:246
-#: libraries/sql-parser/src/Components/Expression.php:283
-#: libraries/sql-parser/src/Components/Expression.php:303
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:285
+#: libraries/sql-parser/src/Components/Expression.php:305
 msgid "An alias was previously found."
 msgstr "Vzdevek smo našli že prej."
 
-#: libraries/sql-parser/src/Components/Expression.php:257
+#: libraries/sql-parser/src/Components/Expression.php:259
 msgid "Unexpected dot."
 msgstr "Nepričakovana pika."
 
-#: libraries/sql-parser/src/Components/Expression.php:327
+#: libraries/sql-parser/src/Components/Expression.php:329
 msgid "An alias was expected."
 msgstr "Pričakovali smo vzdevek."
 
@@ -13969,14 +13993,6 @@ msgstr "Pričakovali smo vzdevek."
 msgid "An expression was expected."
 msgstr "Pričakovali smo izraz."
 
-#: libraries/sql-parser/src/Components/FieldDefinition.php:246
-msgid "A comma or a closing bracket was expected."
-msgstr "Pričakovali smo vejico ali zaklepaj."
-
-#: libraries/sql-parser/src/Components/FieldDefinition.php:262
-msgid "A closing bracket was expected."
-msgstr "Pričakovali smo zaklepaj."
-
 #: libraries/sql-parser/src/Components/Limit.php:90
 #: libraries/sql-parser/src/Components/Limit.php:112
 msgid "An offset was expected."
@@ -14016,24 +14032,24 @@ msgstr "Pred ločitvenim znakom smo pričakoval prazne znake."
 msgid "Expected delimiter."
 msgstr "Pričakovali smo ločitveni znak."
 
-#: libraries/sql-parser/src/Lexer.php:753
+#: libraries/sql-parser/src/Lexer.php:777
 #, php-format
 msgid "Ending quote %1$s was expected."
 msgstr "Pričakovali smo končni narekovaj %1$s."
 
-#: libraries/sql-parser/src/Lexer.php:789
+#: libraries/sql-parser/src/Lexer.php:813
 msgid "Variable name was expected."
 msgstr "Pričakovali smo ime spremenljivke."
 
-#: libraries/sql-parser/src/Parser.php:380
+#: libraries/sql-parser/src/Parser.php:391
 msgid "Unexpected beginning of statement."
 msgstr "Nepričakovan začetek stavka."
 
-#: libraries/sql-parser/src/Parser.php:399
+#: libraries/sql-parser/src/Parser.php:410
 msgid "Unrecognized statement type."
 msgstr "Neprepoznana vrsta stavka."
 
-#: libraries/sql-parser/src/Parser.php:479
+#: libraries/sql-parser/src/Parser.php:489
 msgid "No transaction was previously started."
 msgstr "Začeli niste nobene transakcije."
 
@@ -14046,7 +14062,6 @@ msgid "This type of clause was previously parsed."
 msgstr "To vrsto stavka smo prej razčlenili."
 
 #: libraries/sql-parser/src/Statement.php:265
-#| msgid "A new statement was found, but no delimiter between them."
 msgid ""
 "A new statement was found, but no delimiter between it and the previous one."
 msgstr ""
@@ -14062,8 +14077,9 @@ msgid "The name of the entity was expected."
 msgstr "Pričakovali smo ime entitete."
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:310
-msgid "At least one field definition was expected."
-msgstr "Pričakovali smo vsaj eno opredelitev polja."
+#| msgid "At least one field definition was expected."
+msgid "At least one column definition was expected."
+msgstr "Pričakovali smo vsaj eno opredelitev stolpca."
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:329
 msgid "A \"RETURNS\" keyword was expected."
@@ -14122,11 +14138,11 @@ msgstr "Zaznamka nisem ustvaril!"
 msgid "Using bookmark \"%s\" as default browse query."
 msgstr "Uporaba zaznamka \"%s\" kot privzeto poizvedbo med brskanjem."
 
-#: libraries/sql.lib.php:1306
+#: libraries/sql.lib.php:1300
 msgid "Showing as PHP code"
 msgstr "Prikazovanje kot koda PHP"
 
-#: libraries/sql.lib.php:1638
+#: libraries/sql.lib.php:1632
 #, php-format
 msgid ""
 "Current selection does not contain a unique column. Grid edit, checkbox, "
@@ -14135,7 +14151,7 @@ msgstr ""
 "Trenutna izbira ne vsebuje unikatnega stolpca. Možnosti urejanja mreže, "
 "potrditvena polja, Uredi, Kopiraj in Izbriši niso na voljo. %s"
 
-#: libraries/sql.lib.php:1649
+#: libraries/sql.lib.php:1643
 #, php-format
 msgid ""
 "Current selection does not contain a unique column. Grid edit, Edit, Copy "
@@ -14144,7 +14160,7 @@ msgstr ""
 "Trenutna izbira ne vsebuje unikatnega stolpca. Možnosti urejanja mreže, "
 "Uredi, Kopiraj in Izbriši se lahko obnašajo nepredvidljivo. %s"
 
-#: libraries/sql.lib.php:1688
+#: libraries/sql.lib.php:1682
 #, php-format
 msgid "Problems with indexes of table `%s`"
 msgstr "Težave z indeksi tabele `%s`"
@@ -14300,7 +14316,7 @@ msgid "Version %s snapshot (SQL code)"
 msgstr "Različica posnetka %s (koda SQL)"
 
 #: libraries/tracking.lib.php:947
-#: templates/structure/table_structure_row.phtml:33
+#: templates/table/structure/table_structure_row.phtml:33
 msgctxt "None for default"
 msgid "None"
 msgstr "Brez"
@@ -14356,15 +14372,15 @@ msgstr "Različico %1$s tabele %2$s smo izbrisali."
 msgid "Version %1$s was created, tracking for %2$s is active."
 msgstr "Različica %1$s je ustvarjena, sledenje %2$s je aktivirano."
 
-#: libraries/user_preferences.inc.php:29
+#: libraries/user_preferences.inc.php:30
 msgid "Manage your settings"
 msgstr "Upravljajte svoje nastavitve"
 
-#: libraries/user_preferences.inc.php:46 prefs_manage.php:307
+#: libraries/user_preferences.inc.php:54 prefs_manage.php:307
 msgid "Configuration has been saved."
 msgstr "Konfiguracijo sem shranil."
 
-#: libraries/user_preferences.inc.php:66
+#: libraries/user_preferences.inc.php:74
 #, php-format
 msgid ""
 "Your preferences will be saved for current session only. Storing them "
@@ -14683,7 +14699,6 @@ msgid "Row: %1$s, Column: %2$s, Error: %3$s"
 msgstr "Vrstica: %1$s, Stolpec: %2$s, Napaka: %3$s"
 
 #: tbl_row_action.php:70
-#| msgid "No versions selected."
 msgid "No row selected."
 msgstr "Ni izbranih vrstic."
 
@@ -14759,7 +14774,7 @@ msgid "first"
 msgstr "prvi"
 
 #: templates/columns_definitions/move_column.phtml:12
-#: templates/structure/add_column.phtml:21
+#: templates/table/structure/add_column.phtml:21
 #, php-format
 msgid "after %s"
 msgstr "po %s"
@@ -14828,197 +14843,294 @@ msgstr "Pretvorbe vnosa"
 msgid "Input transformation options"
 msgstr "Možnosti pretvorbe vnosa"
 
-#: templates/designer/aggregate_query_panel.phtml:22
-#: templates/designer/options_panel.phtml:100
-msgid "Aggregate"
-msgstr "Agregat"
-
-#: templates/designer/aggregate_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:61
-#: templates/designer/options_panel.phtml:106
-#: templates/designer/options_panel.phtml:170
-#: templates/designer/where_query_panel.phtml:30
-#: templates/table/table_header.phtml:9
-msgid "Operator"
-msgstr "Operator"
-
-#: templates/designer/database_tables.phtml:29
-msgid "Toggle"
-msgstr "Preklopi"
-
-#: templates/designer/database_tables.phtml:40
-msgid "See table structure"
-msgstr "Ogled zgradbe tabele"
-
-#: templates/designer/delete_relation_panel.phtml:21
-msgid "Delete relation"
-msgstr "Izbriši razmerje"
-
-#: templates/designer/edit_delete_pages.phtml:7
-msgid "Page to open"
-msgstr "Stran za odprtje"
-
-#: templates/designer/edit_delete_pages.phtml:7
-msgid "Page to delete"
-msgstr "Stran za izbris"
-
-#: templates/designer/having_query_panel.phtml:90
-#: templates/designer/options_panel.phtml:63
-#: templates/designer/options_panel.phtml:229
-#: templates/designer/where_query_panel.phtml:59
-msgid "Except"
-msgstr "Razen"
-
-#: templates/designer/having_query_panel.phtml:102
-#: templates/designer/options_panel.phtml:75
-#: templates/designer/options_panel.phtml:241
-#: templates/designer/where_query_panel.phtml:71
-msgid "subquery"
-msgstr "podpoizvedba"
-
-#: templates/designer/new_relation_panel.phtml:22
-#: templates/designer/side_menu.phtml:84 templates/designer/side_menu.phtml:87
-msgid "Create relation"
-msgstr "Ustvari razmerje"
-
-#: templates/designer/options_panel.phtml:34
-#: templates/designer/options_panel.phtml:200
-msgid "Relation operator"
-msgstr "Operator razmerja"
-
-#: templates/designer/options_panel.phtml:85
-#: templates/designer/rename_to_panel.phtml:23
-msgid "Rename to"
-msgstr "Preimenuj v"
-
-#: templates/designer/options_panel.phtml:91
-#: templates/designer/rename_to_panel.phtml:31
-msgid "New name"
-msgstr "Novo ime"
-
-#: templates/designer/page_save_as.phtml:4
-msgid "Save to selected page"
-msgstr "Shrani na izbrano stran"
-
-#: templates/designer/page_save_as.phtml:5
-msgid "Create a page and save to it"
-msgstr "Ustvari stran in shrani nanjo"
-
-#: templates/designer/page_save_as.phtml:26
-msgid "New page name"
-msgstr "Ime nove strani"
-
-#: templates/designer/page_selector.phtml:2
-msgid "Select page"
-msgstr "Izberi stran"
-
-#: templates/designer/query_details.phtml:10
-msgid "Active options"
-msgstr "Dejavne možnosti"
-
-#: templates/designer/schema_export.phtml:4
-msgid "Select Export Relational Type"
-msgstr "Izberite relacijsko vrsto izvoza"
-
-#: templates/designer/side_menu.phtml:19 templates/designer/side_menu.phtml:25
-msgid "Show/Hide tables list"
-msgstr "Prikaži/Skrij seznam tabel"
-
-#: templates/designer/side_menu.phtml:29 templates/designer/side_menu.phtml:35
-#: templates/designer/side_menu.phtml:36
-msgid "View in fullscreen"
-msgstr "Ogled na celotnem zaslonu"
-
-#: templates/designer/side_menu.phtml:34
-msgid "Exit fullscreen"
-msgstr "Izhod iz celozaslonskega načina"
-
-#: templates/designer/side_menu.phtml:41 templates/designer/side_menu.phtml:45
-msgid "New page"
-msgstr "Nova stran"
-
-#: templates/designer/side_menu.phtml:70 templates/designer/side_menu.phtml:73
-msgid "Delete pages"
-msgstr "Izbriši strani"
-
-#: templates/designer/side_menu.phtml:77 templates/designer/side_menu.phtml:80
-#: templates/table/create_table.phtml:7
+#: templates/database/create_table.phtml:7
+#: templates/database/designer/side_menu.phtml:77
+#: templates/database/designer/side_menu.phtml:80
 msgid "Create table"
 msgstr "Ustvari tabelo"
 
-#: templates/designer/side_menu.phtml:98
-#: templates/designer/side_menu.phtml:101
+#: templates/database/create_table.phtml:15
+msgid "Number of columns"
+msgstr "Število stolpcev"
+
+#: templates/database/designer/aggregate_query_panel.phtml:22
+#: templates/database/designer/options_panel.phtml:100
+msgid "Aggregate"
+msgstr "Agregat"
+
+#: templates/database/designer/aggregate_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:61
+#: templates/database/designer/options_panel.phtml:106
+#: templates/database/designer/options_panel.phtml:170
+#: templates/database/designer/where_query_panel.phtml:30
+#: templates/table/search/table_header.phtml:9
+msgid "Operator"
+msgstr "Operator"
+
+#: templates/database/designer/database_tables.phtml:29
+msgid "Toggle"
+msgstr "Preklopi"
+
+#: templates/database/designer/database_tables.phtml:40
+msgid "See table structure"
+msgstr "Ogled zgradbe tabele"
+
+#: templates/database/designer/delete_relation_panel.phtml:21
+msgid "Delete relation"
+msgstr "Izbriši razmerje"
+
+#: templates/database/designer/edit_delete_pages.phtml:7
+msgid "Page to open"
+msgstr "Stran za odprtje"
+
+#: templates/database/designer/edit_delete_pages.phtml:7
+msgid "Page to delete"
+msgstr "Stran za izbris"
+
+#: templates/database/designer/having_query_panel.phtml:90
+#: templates/database/designer/options_panel.phtml:63
+#: templates/database/designer/options_panel.phtml:229
+#: templates/database/designer/where_query_panel.phtml:59
+msgid "Except"
+msgstr "Razen"
+
+#: templates/database/designer/having_query_panel.phtml:102
+#: templates/database/designer/options_panel.phtml:75
+#: templates/database/designer/options_panel.phtml:241
+#: templates/database/designer/where_query_panel.phtml:71
+msgid "subquery"
+msgstr "podpoizvedba"
+
+#: templates/database/designer/new_relation_panel.phtml:22
+#: templates/database/designer/side_menu.phtml:84
+#: templates/database/designer/side_menu.phtml:87
+msgid "Create relation"
+msgstr "Ustvari razmerje"
+
+#: templates/database/designer/options_panel.phtml:34
+#: templates/database/designer/options_panel.phtml:200
+msgid "Relation operator"
+msgstr "Operator razmerja"
+
+#: templates/database/designer/options_panel.phtml:85
+#: templates/database/designer/rename_to_panel.phtml:23
+msgid "Rename to"
+msgstr "Preimenuj v"
+
+#: templates/database/designer/options_panel.phtml:91
+#: templates/database/designer/rename_to_panel.phtml:31
+msgid "New name"
+msgstr "Novo ime"
+
+#: templates/database/designer/page_save_as.phtml:4
+msgid "Save to selected page"
+msgstr "Shrani na izbrano stran"
+
+#: templates/database/designer/page_save_as.phtml:5
+msgid "Create a page and save to it"
+msgstr "Ustvari stran in shrani nanjo"
+
+#: templates/database/designer/page_save_as.phtml:26
+msgid "New page name"
+msgstr "Ime nove strani"
+
+#: templates/database/designer/page_selector.phtml:2
+msgid "Select page"
+msgstr "Izberi stran"
+
+#: templates/database/designer/query_details.phtml:10
+msgid "Active options"
+msgstr "Dejavne možnosti"
+
+#: templates/database/designer/schema_export.phtml:4
+msgid "Select Export Relational Type"
+msgstr "Izberite relacijsko vrsto izvoza"
+
+#: templates/database/designer/side_menu.phtml:19
+#: templates/database/designer/side_menu.phtml:25
+msgid "Show/Hide tables list"
+msgstr "Prikaži/Skrij seznam tabel"
+
+#: templates/database/designer/side_menu.phtml:29
+#: templates/database/designer/side_menu.phtml:35
+#: templates/database/designer/side_menu.phtml:36
+msgid "View in fullscreen"
+msgstr "Ogled na celotnem zaslonu"
+
+#: templates/database/designer/side_menu.phtml:34
+msgid "Exit fullscreen"
+msgstr "Izhod iz celozaslonskega načina"
+
+#: templates/database/designer/side_menu.phtml:41
+#: templates/database/designer/side_menu.phtml:45
+msgid "New page"
+msgstr "Nova stran"
+
+#: templates/database/designer/side_menu.phtml:70
+#: templates/database/designer/side_menu.phtml:73
+msgid "Delete pages"
+msgstr "Izbriši strani"
+
+#: templates/database/designer/side_menu.phtml:98
+#: templates/database/designer/side_menu.phtml:101
 msgid "Reload"
 msgstr "Osveži"
 
-#: templates/designer/side_menu.phtml:107
-#: templates/designer/side_menu.phtml:110
+#: templates/database/designer/side_menu.phtml:107
+#: templates/database/designer/side_menu.phtml:110
 msgid "Help"
 msgstr "Pomoč"
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Angular links"
 msgstr "Oglate povezave"
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Direct links"
 msgstr "Neposredne povezave"
 
-#: templates/designer/side_menu.phtml:122
-#: templates/designer/side_menu.phtml:124
+#: templates/database/designer/side_menu.phtml:122
+#: templates/database/designer/side_menu.phtml:124
 msgid "Snap to grid"
 msgstr "Pripni na mrežo"
 
-#: templates/designer/side_menu.phtml:128
-#: templates/designer/side_menu.phtml:134
+#: templates/database/designer/side_menu.phtml:128
+#: templates/database/designer/side_menu.phtml:134
 msgid "Small/Big All"
 msgstr "Skrči/razširi vse"
 
-#: templates/designer/side_menu.phtml:138
-#: templates/designer/side_menu.phtml:141
+#: templates/database/designer/side_menu.phtml:138
+#: templates/database/designer/side_menu.phtml:141
 msgid "Toggle small/big"
 msgstr "Preklopi majhno/veliko"
 
-#: templates/designer/side_menu.phtml:145
-#: templates/designer/side_menu.phtml:148
+#: templates/database/designer/side_menu.phtml:145
+#: templates/database/designer/side_menu.phtml:148
 msgid "Toggle relation lines"
 msgstr "Preklopi relacijske črte"
 
-#: templates/designer/side_menu.phtml:153
-#: templates/designer/side_menu.phtml:156
+#: templates/database/designer/side_menu.phtml:153
+#: templates/database/designer/side_menu.phtml:156
 msgid "Export schema"
 msgstr "Izvozi shemo"
 
-#: templates/designer/side_menu.phtml:165
-#: templates/designer/side_menu.phtml:168
+#: templates/database/designer/side_menu.phtml:165
+#: templates/database/designer/side_menu.phtml:168
 msgid "Build Query"
 msgstr "Zgradi poizvedbo"
 
-#: templates/designer/side_menu.phtml:173
-#: templates/designer/side_menu.phtml:177
+#: templates/database/designer/side_menu.phtml:173
+#: templates/database/designer/side_menu.phtml:177
 msgid "Move Menu"
 msgstr "Premakni meni"
 
-#: templates/designer/side_menu.phtml:181
-#: templates/designer/side_menu.phtml:186
+#: templates/database/designer/side_menu.phtml:181
+#: templates/database/designer/side_menu.phtml:186
 msgid "Pin text"
 msgstr "Pripni besedilo"
 
-#: templates/designer/table_list.phtml:4
+#: templates/database/designer/table_list.phtml:4
 msgid "Hide/Show all"
 msgstr "Skrij/Pokaži vse"
 
-#: templates/designer/table_list.phtml:14
+#: templates/database/designer/table_list.phtml:14
 msgid "Hide/Show Tables with no relation"
 msgstr "Skrij/Pokaži tabele brez razmerij"
 
-#: templates/designer/table_list.phtml:59
+#: templates/database/designer/table_list.phtml:59
 msgid "Number of tables:"
 msgstr "Število tabel:"
 
+#: templates/database/structure/body_for_table_summary.phtml:6
+#, php-format
+msgid "%s table"
+msgid_plural "%s tables"
+msgstr[0] "%s tabela"
+msgstr[1] "%s tabeli"
+msgstr[2] "%s tabele"
+msgstr[3] "%s tabel"
+
+#: templates/database/structure/body_for_table_summary.phtml:17
+msgid "Sum"
+msgstr "Vsota"
+
+#: templates/database/structure/check_all_tables.phtml:6
+msgid "Check tables having overhead"
+msgstr "Preveri prekoračene"
+
+#: templates/database/structure/check_all_tables.phtml:10
+msgid "Show create"
+msgstr "Pokaži create"
+
+#: templates/database/structure/check_all_tables.phtml:27
+msgid "Prefix"
+msgstr "Predpona"
+
+#: templates/database/structure/check_all_tables.phtml:28
+msgid "Add prefix to table"
+msgstr "Dodaj predpono tabeli"
+
+#: templates/database/structure/check_all_tables.phtml:29
+msgid "Replace table prefix"
+msgstr "Zamenjaj predpono tabele"
+
+#: templates/database/structure/check_all_tables.phtml:30
+msgid "Copy table with prefix"
+msgstr "Kopiraj tabelo s predpono"
+
+#: templates/database/structure/check_all_tables.phtml:36
+msgid "Add columns to central list"
+msgstr "Dodaj stolpce na osrednji seznam"
+
+#: templates/database/structure/check_all_tables.phtml:37
+msgid "Remove columns from central list"
+msgstr "Odstrani stolpce z osrednjega seznama"
+
+#: templates/database/structure/check_all_tables.phtml:38
+msgid "Make consistent with central list"
+msgstr "Naredi enotno z osrednjim seznamom"
+
+#: templates/database/structure/favorite_anchor.phtml:12
+msgid "Add to Favorites"
+msgstr "Dodaj med Priljubljene"
+
+#: templates/database/structure/show_create.phtml:2
+msgid "Showing create queries"
+msgstr "Pokaži poizvedbe create"
+
+#: templates/database/structure/sortable_header.phtml:13
+msgid "Sort"
+msgstr "Razvrsti"
+
+#: templates/database/structure/table_header.phtml:42
+msgid ""
+"May be approximate. Click on the number to get the exact count. See "
+"[doc@faq3-11]FAQ 3.11[/doc]."
+msgstr ""
+"Morda je približno. Kliknite na število, da pridobite točno število. Glej "
+"[doc@faq3-11]FAQ 3.11[/doc]."
+
+#: templates/database/structure/table_header.phtml:66
+#: templates/table/index_form.phtml:127
+msgid "Size"
+msgstr "Velikost"
+
+#: templates/database/structure/table_header.phtml:74
+#: templates/table/structure/display_table_stats.phtml:27
+msgid "Overhead"
+msgstr "Presežek"
+
+#: templates/database/structure/tracking_icon.phtml:4
+msgid "Tracking is active."
+msgstr "Sledenje je aktivno."
+
+#: templates/database/structure/tracking_icon.phtml:8
+msgid "Tracking is not active."
+msgstr "Sledenje ni aktivno."
+
 #: templates/error/report_form.phtml:7
 msgid ""
 "phpMyAdmin has encountered an error. We have collected data about this error "
@@ -15037,59 +15149,6 @@ msgstr "Pregledate lahko podatke v poročilo o napaki:"
 msgid "Please explain the steps that lead to the error:"
 msgstr "Prosimo, obrazložite korake, ki so vodili do napake:"
 
-#: templates/gis_visualization/gis_visualization.phtml:3
-msgid "Display GIS Visualization"
-msgstr "Prikaži predstavitev GIS"
-
-#: templates/gis_visualization/gis_visualization.phtml:8
-msgid "Label column"
-msgstr "Stolpec oznak"
-
-#: templates/gis_visualization/gis_visualization.phtml:11
-msgid "-- None --"
-msgstr "-- Noben --"
-
-#: templates/gis_visualization/gis_visualization.phtml:19
-msgid "Spatial column"
-msgstr "Prostorski stolpec"
-
-#: templates/index_form.phtml:16
-msgid "Index name:"
-msgstr "Ime indeksa:"
-
-#: templates/index_form.phtml:19
-msgid ""
-"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
-msgstr "\"PRIMARY\" <b>mora</b> biti ime <b>samo</b> primarnega ključa!"
-
-#: templates/index_form.phtml:40
-msgid "Index choice:"
-msgstr "Izbira indeksa:"
-
-#: templates/index_form.phtml:57
-msgid "Key block size:"
-msgstr "Velikost bloka ključa:"
-
-#: templates/index_form.phtml:74
-msgid "Index type:"
-msgstr "Vrsta indeksa:"
-
-#: templates/index_form.phtml:86
-msgid "Parser:"
-msgstr "Razčlenjevalnik:"
-
-#: templates/index_form.phtml:102
-msgid "Comment:"
-msgstr "Pripomba:"
-
-#: templates/index_form.phtml:127 templates/structure/table_header.phtml:66
-msgid "Size"
-msgstr "Velikost"
-
-#: templates/index_form.phtml:149 templates/index_form.phtml:190
-msgid "Drag to reorder"
-msgstr "Povlecite za preureditev"
-
 #: templates/prefs_autoload.phtml:9
 msgid ""
 "Your browser has phpMyAdmin configuration for this domain. Would you like to "
@@ -15102,408 +15161,371 @@ msgstr ""
 msgid "Start row:"
 msgstr "Začetna vrstica:"
 
-#: templates/structure/actions_in_table_structure.phtml:14
-#, php-format
-msgid "A primary key has been added on %s."
-msgstr "Na %s sem dodal primarni ključ."
-
-#: templates/structure/actions_in_table_structure.phtml:34
-#: templates/structure/actions_in_table_structure.phtml:54
-#: templates/structure/actions_in_table_structure.phtml:79
-#: templates/structure/actions_in_table_structure.phtml:101
-#, php-format
-msgid "An index has been added on %s."
-msgstr "Na %s sem dodal indeks."
-
-#: templates/structure/actions_in_table_structure.phtml:130
-#: templates/structure/check_all_table_column.phtml:59
-msgid "Remove from central columns"
-msgstr "Odstrani iz osrednjih stolpcev"
-
-#: templates/structure/actions_in_table_structure.phtml:138
-#: templates/structure/check_all_table_column.phtml:55
-msgid "Add to central columns"
-msgstr "Dodaj med osrednje stolpce"
-
-#: templates/structure/add_column.phtml:7
-#, php-format
-msgid "Add %s column(s)"
-msgstr "Dodaj %s stolpec(-cev)"
-
-#: templates/structure/add_column.phtml:12
-msgid "at beginning of table"
-msgstr "na začetku tabele"
-
-#: templates/structure/body_for_table_summary.phtml:6
-#, php-format
-msgid "%s table"
-msgid_plural "%s tables"
-msgstr[0] "%s tabela"
-msgstr[1] "%s tabeli"
-msgstr[2] "%s tabele"
-msgstr[3] "%s tabel"
-
-#: templates/structure/body_for_table_summary.phtml:17
-msgid "Sum"
-msgstr "Vsota"
-
-#: templates/structure/check_all_tables.phtml:6
-msgid "Check tables having overhead"
-msgstr "Preveri prekoračene"
-
-#: templates/structure/check_all_tables.phtml:10
-msgid "Show create"
-msgstr "Pokaži create"
-
-#: templates/structure/check_all_tables.phtml:27
-msgid "Prefix"
-msgstr "Predpona"
-
-#: templates/structure/check_all_tables.phtml:28
-msgid "Add prefix to table"
-msgstr "Dodaj predpono tabeli"
-
-#: templates/structure/check_all_tables.phtml:29
-msgid "Replace table prefix"
-msgstr "Zamenjaj predpono tabele"
-
-#: templates/structure/check_all_tables.phtml:30
-msgid "Copy table with prefix"
-msgstr "Kopiraj tabelo s predpono"
-
-#: templates/structure/check_all_tables.phtml:36
-msgid "Add columns to central list"
-msgstr "Dodaj stolpce na osrednji seznam"
-
-#: templates/structure/check_all_tables.phtml:37
-msgid "Remove columns from central list"
-msgstr "Odstrani stolpce z osrednjega seznama"
-
-#: templates/structure/check_all_tables.phtml:38
-msgid "Make consistent with central list"
-msgstr "Naredi enotno z osrednjim seznamom"
-
-#: templates/structure/display_structure.phtml:140 view_create.php:181
-msgid "Edit view"
-msgstr "Urejevalni pogled"
-
-#: templates/structure/display_table_stats.phtml:9
-msgid "Space usage"
-msgstr "Poraba prostora"
-
-#: templates/structure/display_table_stats.phtml:27
-#: templates/structure/table_header.phtml:74
-msgid "Overhead"
-msgstr "Presežek"
-
-#: templates/structure/display_table_stats.phtml:32
-msgid "Effective"
-msgstr "Učinkovito"
-
-#: templates/structure/favorite_anchor.phtml:12
-msgid "Add to Favorites"
-msgstr "Dodaj med Priljubljene"
-
-#: templates/structure/move_columns_dialog.phtml:1
-#: templates/structure/optional_action_links.phtml:21
-msgid "Move columns"
-msgstr "Premakni stolpce"
-
-#: templates/structure/move_columns_dialog.phtml:2
-msgid "Move the columns by dragging them up and down."
-msgstr "Prestavite stolpce z vlečenjem gor ali dol."
-
-#: templates/structure/optional_action_links.phtml:9
-msgid "Propose table structure"
-msgstr "Predlagaj strukturo tabele"
-
-#: templates/structure/optional_action_links.phtml:24
-msgid "Improve table structure"
-msgstr "Izboljšaj strukturo tabele"
-
-#: templates/structure/optional_action_links.phtml:30
-msgid "Track view"
-msgstr "Sledi pogledu"
-
-#: templates/structure/row_stats_table.phtml:3
-msgid "Row statistics"
-msgstr "Statistika vrstic"
-
-#: templates/structure/row_stats_table.phtml:9
-msgid "static"
-msgstr "statično"
-
-#: templates/structure/row_stats_table.phtml:11
-msgid "dynamic"
-msgstr "dinamično"
-
-#: templates/structure/row_stats_table.phtml:22
-msgid "partitioned"
-msgstr "po particijah"
-
-#: templates/structure/row_stats_table.phtml:54
-msgid "Row length"
-msgstr "Dolžina vrstice"
-
-#: templates/structure/row_stats_table.phtml:66
-msgid "Row size"
-msgstr "Velikost vrstice"
-
-#: templates/structure/row_stats_table.phtml:73
-msgid "Next autoindex"
-msgstr "Naslednji samodejni indeks"
-
-#: templates/structure/secondary_tabs.phtml:14
-msgid "Relation view"
-msgstr "Pogled relacij"
-
-#: templates/structure/show_create.phtml:2
-msgid "Showing create queries"
-msgstr "Pokaži poizvedbe create"
-
-#: templates/structure/sortable_header.phtml:13
-msgid "Sort"
-msgstr "Razvrsti"
-
-#: templates/structure/table_header.phtml:42
-msgid ""
-"May be approximate. Click on the number to get the exact count. See "
-"[doc@faq3-11]FAQ 3.11[/doc]."
-msgstr ""
-"Morda je približno. Kliknite na število, da pridobite točno število. Glej "
-"[doc@faq3-11]FAQ 3.11[/doc]."
-
-#: templates/structure/table_structure_row.phtml:46
-#, php-format
-msgid "Column %s has been dropped."
-msgstr "Zavrgel sem stolpec %s."
-
-#: templates/structure/tracking_icon.phtml:4
-msgid "Tracking is active."
-msgstr "Sledenje je aktivno."
-
-#: templates/structure/tracking_icon.phtml:8
-msgid "Tracking is not active."
-msgstr "Sledenje ni aktivno."
-
-#: templates/table/create_table.phtml:15
-msgid "Number of columns"
-msgstr "Število stolpcev"
-
-#: templates/table/options.phtml:8
-msgid "Select columns (at least one):"
-msgstr "Izberite stolpce (vsaj enega):"
-
-#: templates/table/options.phtml:37
-msgid "Add search conditions (body of the \"where\" clause):"
-msgstr "Dodajte iskalne pogoje (telo stavka \"where\"):"
-
-#: templates/table/options.phtml:45
-msgid "Number of rows per page"
-msgstr "Število vrstic na stran"
-
-#: templates/table/options.phtml:56
-msgid "Display order:"
-msgstr "Vrstni red prikaza:"
-
-#: templates/table/options_zoom.phtml:6
-msgid "Use this column to label each point"
-msgstr "Uporabite ta stolpec za označevanje vsake točke"
-
-#: templates/table/options_zoom.phtml:35
-msgid "Maximum rows to plot"
-msgstr "Največje število vrstic za izris"
-
-#: templates/table/replace_preview.phtml:13
-msgid "Find and replace - preview"
-msgstr "Najdi in zamenjaj - predogled"
-
-#: templates/table/replace_preview.phtml:18
-msgid "Original string"
-msgstr "Izvirni niz"
-
-#: templates/table/replace_preview.phtml:19
-msgid "Replaced string"
-msgstr "Zamenjani nizi"
-
-#: templates/table/replace_preview.phtml:40
-msgid "Replace"
-msgstr "Zamenjaj"
-
-#: templates/table/rows_zoom.phtml:16
-msgid "Additional search criteria"
-msgstr "Dodatni iskalni pogoji"
-
-#: templates/table/search_and_replace.phtml:3
-msgid "Replace with:"
-msgstr "Zamenjaj z:"
-
-#: templates/table/search_and_replace.phtml:22
-msgid "Use regular expression"
-msgstr "Uporabi regularni izraz"
-
-#: templates/table/selection_form.phtml:12
-msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
-msgstr ""
-"Izvedi \"query by example\" (nadomestni znak: \"%\") za dva različna stolpca"
-
-#: templates/table/selection_form.phtml:34
-msgid "Do a \"query by example\" (wildcard: \"%\")"
-msgstr "Izvedi \"query by example\" (nadomestni znak: \"%\")"
-
-#: templates/table/zoom_result_form.phtml:7
-msgid "Browse/Edit the points"
-msgstr "Prebrskaj/Uredi točke"
-
-#: templates/table/zoom_result_form.phtml:15
-msgid "How to use"
-msgstr "Kako uporabljati"
-
-#: templates/table/zoom_result_form.phtml:23
-msgid "Reset zoom"
-msgstr "Ponastavi povečavo"
-
-#: templates/tbl_chart.phtml:17
+#: templates/table/chart/tbl_chart.phtml:17
 msgctxt "Chart type"
 msgid "Bar"
 msgstr "Vrstica"
 
-#: templates/tbl_chart.phtml:21
+#: templates/table/chart/tbl_chart.phtml:21
 msgctxt "Chart type"
 msgid "Column"
 msgstr "Stolpec"
 
-#: templates/tbl_chart.phtml:25
+#: templates/table/chart/tbl_chart.phtml:25
 msgctxt "Chart type"
 msgid "Line"
 msgstr "Črta"
 
-#: templates/tbl_chart.phtml:29
+#: templates/table/chart/tbl_chart.phtml:29
 msgctxt "Chart type"
 msgid "Spline"
 msgstr "Zlepek"
 
-#: templates/tbl_chart.phtml:33
+#: templates/table/chart/tbl_chart.phtml:33
 msgctxt "Chart type"
 msgid "Area"
 msgstr "Ploščinski"
 
-#: templates/tbl_chart.phtml:37
+#: templates/table/chart/tbl_chart.phtml:37
 msgctxt "Chart type"
 msgid "Pie"
 msgstr "Torta"
 
-#: templates/tbl_chart.phtml:41
+#: templates/table/chart/tbl_chart.phtml:41
 msgctxt "Chart type"
 msgid "Timeline"
 msgstr "Časovnica"
 
-#: templates/tbl_chart.phtml:45
+#: templates/table/chart/tbl_chart.phtml:45
 msgctxt "Chart type"
 msgid "Scatter"
 msgstr "Raztreseni"
 
-#: templates/tbl_chart.phtml:50
+#: templates/table/chart/tbl_chart.phtml:50
 msgid "Stacked"
 msgstr "Zloženi"
 
-#: templates/tbl_chart.phtml:53
+#: templates/table/chart/tbl_chart.phtml:53
 msgid "Chart title"
 msgstr "Naslov grafikona"
 
-#: templates/tbl_chart.phtml:57
+#: templates/table/chart/tbl_chart.phtml:57
 msgid "X-Axis:"
 msgstr "Os x:"
 
-#: templates/tbl_chart.phtml:72
+#: templates/table/chart/tbl_chart.phtml:72
 msgid "Series:"
 msgstr "Serije:"
 
-#: templates/tbl_chart.phtml:102
+#: templates/table/chart/tbl_chart.phtml:102
 msgid "X-Axis label:"
 msgstr "Oznaka osi x:"
 
-#: templates/tbl_chart.phtml:104
+#: templates/table/chart/tbl_chart.phtml:104
 msgid "X Values"
 msgstr "Vrednosti x"
 
-#: templates/tbl_chart.phtml:107
+#: templates/table/chart/tbl_chart.phtml:107
 msgid "Y-Axis label:"
 msgstr "Oznaka osi y:"
 
-#: templates/tbl_chart.phtml:115
+#: templates/table/chart/tbl_chart.phtml:115
 msgid "Series names are in a column"
 msgstr "Imena zaporedij so v stolpcu"
 
-#: templates/tbl_chart.phtml:118
+#: templates/table/chart/tbl_chart.phtml:118
 msgid "Series column:"
 msgstr "Stolpec z zaporedjem:"
 
-#: templates/tbl_chart.phtml:130
+#: templates/table/chart/tbl_chart.phtml:130
 msgid "Value Column:"
 msgstr "Stolpec z vrednostjo:"
 
-#: templates/tbl_chart.phtml:150
+#: templates/table/chart/tbl_chart.phtml:150
 msgid "Save chart as image"
 msgstr "Shrani grafikon kot sliko"
 
-#: templates/tbl_relation/common_form.phtml:7
+#: templates/table/gis_visualization/gis_visualization.phtml:3
+msgid "Display GIS Visualization"
+msgstr "Prikaži predstavitev GIS"
+
+#: templates/table/gis_visualization/gis_visualization.phtml:8
+msgid "Label column"
+msgstr "Stolpec oznak"
+
+#: templates/table/gis_visualization/gis_visualization.phtml:11
+msgid "-- None --"
+msgstr "-- Noben --"
+
+#: templates/table/gis_visualization/gis_visualization.phtml:19
+msgid "Spatial column"
+msgstr "Prostorski stolpec"
+
+#: templates/table/index_form.phtml:16
+msgid "Index name:"
+msgstr "Ime indeksa:"
+
+#: templates/table/index_form.phtml:19
+msgid ""
+"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
+msgstr "\"PRIMARY\" <b>mora</b> biti ime <b>samo</b> primarnega ključa!"
+
+#: templates/table/index_form.phtml:40
+msgid "Index choice:"
+msgstr "Izbira indeksa:"
+
+#: templates/table/index_form.phtml:57
+msgid "Key block size:"
+msgstr "Velikost bloka ključa:"
+
+#: templates/table/index_form.phtml:74
+msgid "Index type:"
+msgstr "Vrsta indeksa:"
+
+#: templates/table/index_form.phtml:86
+msgid "Parser:"
+msgstr "Razčlenjevalnik:"
+
+#: templates/table/index_form.phtml:102
+msgid "Comment:"
+msgstr "Pripomba:"
+
+#: templates/table/index_form.phtml:149 templates/table/index_form.phtml:190
+msgid "Drag to reorder"
+msgstr "Povlecite za preureditev"
+
+#: templates/table/relation/common_form.phtml:7
 msgid "Internal relations"
 msgstr "Notranja razmerja"
 
-#: templates/tbl_relation/common_form.phtml:11
+#: templates/table/relation/common_form.phtml:11
 msgid "Internal relation"
 msgstr "Notranja relacija"
 
-#: templates/tbl_relation/common_form.phtml:14
+#: templates/table/relation/common_form.phtml:14
 msgid ""
 "An internal relation is not necessary when a corresponding FOREIGN KEY "
 "relation exists."
 msgstr "Notranja relacija ni nujna, ko obstaja ustrezna relacija FOREIGN KEY."
 
-#: templates/tbl_relation/common_form.phtml:37
+#: templates/table/relation/common_form.phtml:37
 msgid "Foreign key constraints"
 msgstr "Omejitve tujih ključev"
 
-#: templates/tbl_relation/common_form.phtml:40
+#: templates/table/relation/common_form.phtml:40
 msgid "Actions"
 msgstr "Dejanja"
 
-#: templates/tbl_relation/common_form.phtml:41
+#: templates/table/relation/common_form.phtml:41
 msgid "Constraint properties"
 msgstr "Lastnosti omejitev"
 
-#: templates/tbl_relation/common_form.phtml:44
+#: templates/table/relation/common_form.phtml:44
 msgid ""
 "Only columns with index will be displayed. You can define an index below."
 msgstr ""
 "Prikazani bodo samo stolpci z indeksom. Spodaj lahko opredelite indeks."
 
-#: templates/tbl_relation/common_form.phtml:49
+#: templates/table/relation/common_form.phtml:49
 msgid "Foreign key constraint"
 msgstr "Omejitev tujih ključev"
 
-#: templates/tbl_relation/common_form.phtml:81
+#: templates/table/relation/common_form.phtml:81
 msgid "+ Add constraint"
 msgstr "+ Dodaj omejitev"
 
-#: templates/tbl_relation/common_form.phtml:91
+#: templates/table/relation/common_form.phtml:91
 msgid "Choose column to display:"
 msgstr "Izberite stolpec za prikaz:"
 
-#: templates/tbl_relation/foreign_key_row.phtml:13
+#: templates/table/relation/foreign_key_row.phtml:13
 #, php-format
 msgid "Foreign key constraint %s has been dropped"
 msgstr "Zavrgel sem omejitev tujega ključa %s"
 
-#: templates/tbl_relation/foreign_key_row.phtml:102
+#: templates/table/relation/foreign_key_row.phtml:102
 msgid "Constraint name"
 msgstr "Ime omejitve"
 
-#: templates/tbl_relation/foreign_key_row.phtml:157
+#: templates/table/relation/foreign_key_row.phtml:157
 msgid "+ Add column"
 msgstr "+ Dodaj stolpec"
 
+#: templates/table/search/options.phtml:8
+msgid "Select columns (at least one):"
+msgstr "Izberite stolpce (vsaj enega):"
+
+#: templates/table/search/options.phtml:37
+msgid "Add search conditions (body of the \"where\" clause):"
+msgstr "Dodajte iskalne pogoje (telo stavka \"where\"):"
+
+#: templates/table/search/options.phtml:45
+msgid "Number of rows per page"
+msgstr "Število vrstic na stran"
+
+#: templates/table/search/options.phtml:56
+msgid "Display order:"
+msgstr "Vrstni red prikaza:"
+
+#: templates/table/search/options_zoom.phtml:6
+msgid "Use this column to label each point"
+msgstr "Uporabite ta stolpec za označevanje vsake točke"
+
+#: templates/table/search/options_zoom.phtml:35
+msgid "Maximum rows to plot"
+msgstr "Največje število vrstic za izris"
+
+#: templates/table/search/replace_preview.phtml:13
+msgid "Find and replace - preview"
+msgstr "Najdi in zamenjaj - predogled"
+
+#: templates/table/search/replace_preview.phtml:18
+msgid "Original string"
+msgstr "Izvirni niz"
+
+#: templates/table/search/replace_preview.phtml:19
+msgid "Replaced string"
+msgstr "Zamenjani nizi"
+
+#: templates/table/search/replace_preview.phtml:40
+msgid "Replace"
+msgstr "Zamenjaj"
+
+#: templates/table/search/rows_zoom.phtml:16
+msgid "Additional search criteria"
+msgstr "Dodatni iskalni pogoji"
+
+#: templates/table/search/search_and_replace.phtml:3
+msgid "Replace with:"
+msgstr "Zamenjaj z:"
+
+#: templates/table/search/search_and_replace.phtml:22
+msgid "Use regular expression"
+msgstr "Uporabi regularni izraz"
+
+#: templates/table/search/selection_form.phtml:12
+msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
+msgstr ""
+"Izvedi \"query by example\" (nadomestni znak: \"%\") za dva različna stolpca"
+
+#: templates/table/search/selection_form.phtml:34
+msgid "Do a \"query by example\" (wildcard: \"%\")"
+msgstr "Izvedi \"query by example\" (nadomestni znak: \"%\")"
+
+#: templates/table/search/zoom_result_form.phtml:7
+msgid "Browse/Edit the points"
+msgstr "Prebrskaj/Uredi točke"
+
+#: templates/table/search/zoom_result_form.phtml:15
+msgid "How to use"
+msgstr "Kako uporabljati"
+
+#: templates/table/search/zoom_result_form.phtml:23
+msgid "Reset zoom"
+msgstr "Ponastavi povečavo"
+
+#: templates/table/secondary_tabs.phtml:14
+msgid "Relation view"
+msgstr "Pogled relacij"
+
+#: templates/table/structure/actions_in_table_structure.phtml:14
+#, php-format
+msgid "A primary key has been added on %s."
+msgstr "Na %s sem dodal primarni ključ."
+
+#: templates/table/structure/actions_in_table_structure.phtml:34
+#: templates/table/structure/actions_in_table_structure.phtml:54
+#: templates/table/structure/actions_in_table_structure.phtml:79
+#: templates/table/structure/actions_in_table_structure.phtml:101
+#, php-format
+msgid "An index has been added on %s."
+msgstr "Na %s sem dodal indeks."
+
+#: templates/table/structure/actions_in_table_structure.phtml:130
+#: templates/table/structure/check_all_table_column.phtml:59
+msgid "Remove from central columns"
+msgstr "Odstrani iz osrednjih stolpcev"
+
+#: templates/table/structure/actions_in_table_structure.phtml:138
+#: templates/table/structure/check_all_table_column.phtml:55
+msgid "Add to central columns"
+msgstr "Dodaj med osrednje stolpce"
+
+#: templates/table/structure/add_column.phtml:7
+#, php-format
+msgid "Add %s column(s)"
+msgstr "Dodaj %s stolpec(-cev)"
+
+#: templates/table/structure/add_column.phtml:12
+msgid "at beginning of table"
+msgstr "na začetku tabele"
+
+#: templates/table/structure/display_structure.phtml:140 view_create.php:181
+msgid "Edit view"
+msgstr "Urejevalni pogled"
+
+#: templates/table/structure/display_table_stats.phtml:9
+msgid "Space usage"
+msgstr "Poraba prostora"
+
+#: templates/table/structure/display_table_stats.phtml:32
+msgid "Effective"
+msgstr "Učinkovito"
+
+#: templates/table/structure/move_columns_dialog.phtml:1
+#: templates/table/structure/optional_action_links.phtml:21
+msgid "Move columns"
+msgstr "Premakni stolpce"
+
+#: templates/table/structure/move_columns_dialog.phtml:2
+msgid "Move the columns by dragging them up and down."
+msgstr "Prestavite stolpce z vlečenjem gor ali dol."
+
+#: templates/table/structure/optional_action_links.phtml:9
+msgid "Propose table structure"
+msgstr "Predlagaj strukturo tabele"
+
+#: templates/table/structure/optional_action_links.phtml:24
+msgid "Improve table structure"
+msgstr "Izboljšaj strukturo tabele"
+
+#: templates/table/structure/optional_action_links.phtml:30
+msgid "Track view"
+msgstr "Sledi pogledu"
+
+#: templates/table/structure/row_stats_table.phtml:3
+msgid "Row statistics"
+msgstr "Statistika vrstic"
+
+#: templates/table/structure/row_stats_table.phtml:9
+msgid "static"
+msgstr "statično"
+
+#: templates/table/structure/row_stats_table.phtml:11
+msgid "dynamic"
+msgstr "dinamično"
+
+#: templates/table/structure/row_stats_table.phtml:22
+msgid "partitioned"
+msgstr "po particijah"
+
+#: templates/table/structure/row_stats_table.phtml:54
+msgid "Row length"
+msgstr "Dolžina vrstice"
+
+#: templates/table/structure/row_stats_table.phtml:66
+msgid "Row size"
+msgstr "Velikost vrstice"
+
+#: templates/table/structure/row_stats_table.phtml:73
+msgid "Next autoindex"
+msgstr "Naslednji samodejni indeks"
+
+#: templates/table/structure/table_structure_row.phtml:46
+#, php-format
+msgid "Column %s has been dropped."
+msgstr "Zavrgel sem stolpec %s."
+
 #: themes.php:17 themes.php:22
 msgid "Theme"
 msgstr "Motiv"
@@ -16832,6 +16854,9 @@ msgstr ""
 msgid "concurrent_insert is set to 0"
 msgstr "concurrent_insert je nastavljeno na 0"
 
+#~ msgid "Read as multibytes"
+#~ msgstr "Preberi kot večbajtno"
+
 #~ msgid "Relational display column"
 #~ msgstr "Relacijski prikazni stolpec"
 
diff --git a/po/sq.po b/po/sq.po
index c7b2f7e5ea..816135a8b5 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 4.5.0-dev\n"
 "Report-Msgid-Bugs-To: developers@phpmyadmin.net\n"
-"POT-Creation-Date: 2015-08-08 13:53-0400\n"
+"POT-Creation-Date: 2015-08-12 08:10-0400\n"
 "PO-Revision-Date: 2015-06-29 00:58+0200\n"
 "Last-Translator: Arben Çokaj <acokaj@shkoder.net>\n"
 "Language-Team: Albanian <https://hosted.weblate.org/projects/phpmyadmin/"
@@ -54,7 +54,7 @@ msgid "Table comments:"
 msgstr "Komentet e tabelës:"
 
 #: db_datadict.php:104 libraries/Index.class.php:699
-#: libraries/insert_edit.lib.php:1567
+#: libraries/insert_edit.lib.php:1565
 #: libraries/navigation/Nodes/Node_Column.class.php:30
 #: libraries/plugins/export/ExportHtmlword.class.php:280
 #: libraries/plugins/export/ExportHtmlword.class.php:375
@@ -68,13 +68,14 @@ msgstr "Komentet e tabelës:"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1023
 #: libraries/tracking.lib.php:879 libraries/tracking.lib.php:975
 #: templates/columns_definitions/column_name.phtml:18
-#: templates/index_form.phtml:124 templates/table/table_header.phtml:6
-#: templates/table/zoom_result_form.phtml:33
-#: templates/tbl_relation/common_form.phtml:10
-#: templates/tbl_relation/common_form.phtml:43
-#: templates/tbl_relation/foreign_key_row.phtml:194
-#: templates/tbl_relation/foreign_key_row.phtml:206
-#: templates/tbl_relation/internal_relational_row.phtml:71
+#: templates/table/index_form.phtml:124
+#: templates/table/relation/common_form.phtml:10
+#: templates/table/relation/common_form.phtml:43
+#: templates/table/relation/foreign_key_row.phtml:194
+#: templates/table/relation/foreign_key_row.phtml:206
+#: templates/table/relation/internal_relational_row.phtml:71
+#: templates/table/search/table_header.phtml:6
+#: templates/table/search/zoom_result_form.phtml:33
 msgid "Column"
 msgstr "Kolona"
 
@@ -92,21 +93,21 @@ msgstr "Kolona"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1001
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1024
 #: libraries/rte/rte_list.lib.php:75 libraries/rte/rte_list.lib.php:103
-#: libraries/rte/rte_routines.lib.php:802
-#: libraries/rte/rte_routines.lib.php:831
-#: libraries/rte/rte_routines.lib.php:1493
+#: libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_routines.lib.php:922
+#: libraries/rte/rte_routines.lib.php:1584
 #: libraries/server_privileges.lib.php:2369 libraries/tracking.lib.php:880
 #: libraries/tracking.lib.php:972
 #: templates/columns_definitions/table_fields_definitions.phtml:11
-#: templates/structure/table_header.phtml:48
-#: templates/structure/table_structure_header.phtml:6
-#: templates/table/table_header.phtml:7
+#: templates/database/structure/table_header.phtml:48
+#: templates/table/search/table_header.phtml:7
+#: templates/table/structure/table_structure_header.phtml:6
 msgid "Type"
 msgstr "Tipi"
 
 #: db_datadict.php:106 libraries/Index.class.php:702
 #: libraries/central_columns.lib.php:708
-#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1576
+#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1574
 #: libraries/plugins/export/ExportHtmlword.class.php:286
 #: libraries/plugins/export/ExportHtmlword.class.php:381
 #: libraries/plugins/export/ExportLatex.class.php:509
@@ -119,8 +120,8 @@ msgstr "Tipi"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1026
 #: libraries/tracking.lib.php:882 libraries/tracking.lib.php:978
 #: templates/columns_definitions/table_fields_definitions.phtml:39
-#: templates/structure/table_structure_header.phtml:9
-#: templates/table/zoom_result_form.phtml:34
+#: templates/table/search/zoom_result_form.phtml:34
+#: templates/table/structure/table_structure_header.phtml:9
 msgid "Null"
 msgstr "Null"
 
@@ -138,8 +139,8 @@ msgstr "Null"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1027
 #: libraries/replication_gui.lib.php:153 libraries/tracking.lib.php:883
 #: templates/columns_definitions/table_fields_definitions.phtml:25
-#: templates/structure/body_for_table_summary.phtml:55
-#: templates/structure/table_structure_header.phtml:10
+#: templates/database/structure/body_for_table_summary.phtml:55
+#: templates/table/structure/table_structure_header.phtml:10
 msgid "Default"
 msgstr "Parazgjedhur"
 
@@ -167,19 +168,19 @@ msgid "Comments"
 msgstr "Komente"
 
 #: db_datadict.php:146
-#: libraries/controllers/StructureController.class.php:1960
-#: libraries/controllers/StructureController.class.php:1965
+#: libraries/controllers/TableStructureController.class.php:951
+#: libraries/controllers/TableStructureController.class.php:956
 #: libraries/tracking.lib.php:922
 #: templates/columns_definitions/column_indexes.phtml:6
-#: templates/structure/check_all_table_column.phtml:22
-#: templates/structure/display_structure.phtml:74
+#: templates/table/structure/check_all_table_column.phtml:22
+#: templates/table/structure/display_structure.phtml:74
 msgid "Primary"
 msgstr "Primar"
 
 #: db_datadict.php:156 js/messages.php:317 libraries/Index.class.php:567
 #: libraries/Index.class.php:606 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261 libraries/mult_submits.lib.php:403
+#: libraries/config/FormDisplay.tpl.php:272 libraries/mult_submits.lib.php:403
 #: libraries/mult_submits.lib.php:417
 #: libraries/plugins/export/ExportHtmlword.class.php:630
 #: libraries/plugins/export/ExportLatex.class.php:589
@@ -195,20 +196,20 @@ msgstr "Primar"
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1010 libraries/tracking.lib.php:1015
 #: prefs_manage.php:140 templates/prefs_autoload.phtml:15
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "No"
 msgstr "Jo"
 
 #: db_datadict.php:156 js/messages.php:443 libraries/Index.class.php:568
 #: libraries/Index.class.php:605 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261
-#: libraries/controllers/StructureController.class.php:1344
-#: libraries/controllers/StructureController.class.php:2223
-#: libraries/controllers/StructureController.class.php:2232
-#: libraries/controllers/StructureController.class.php:2237
-#: libraries/controllers/StructureController.class.php:2242
-#: libraries/controllers/StructureController.class.php:2247
+#: libraries/config/FormDisplay.tpl.php:272
+#: libraries/controllers/TableStructureController.class.php:539
+#: libraries/controllers/TableStructureController.class.php:1201
+#: libraries/controllers/TableStructureController.class.php:1210
+#: libraries/controllers/TableStructureController.class.php:1215
+#: libraries/controllers/TableStructureController.class.php:1220
+#: libraries/controllers/TableStructureController.class.php:1225
 #: libraries/mult_submits.inc.php:82 libraries/mult_submits.inc.php:178
 #: libraries/mult_submits.lib.php:339 libraries/mult_submits.lib.php:372
 #: libraries/mult_submits.lib.php:401 libraries/mult_submits.lib.php:415
@@ -217,8 +218,8 @@ msgstr "Jo"
 #: libraries/plugins/export/ExportOdt.class.php:756
 #: libraries/plugins/export/ExportTexytext.class.php:567
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1077
-#: libraries/server_databases.lib.php:464
-#: libraries/server_databases.lib.php:474
+#: libraries/server_databases.lib.php:475
+#: libraries/server_databases.lib.php:485
 #: libraries/server_privileges.lib.php:2546
 #: libraries/server_privileges.lib.php:2727
 #: libraries/server_privileges.lib.php:2748
@@ -228,7 +229,7 @@ msgstr "Jo"
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1008 libraries/tracking.lib.php:1013
 #: prefs_manage.php:138 templates/prefs_autoload.phtml:14
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "Yes"
 msgstr "Po"
 
@@ -238,7 +239,7 @@ msgstr "Shfaq zbrazjen (skema) e databazës"
 
 #: db_export.php:37 db_tracking.php:90 export.php:382
 #: libraries/DBQbe.class.php:326
-#: libraries/controllers/StructureController.class.php:231
+#: libraries/controllers/DatabaseStructureController.class.php:170
 #: libraries/navigation/NavigationTree.class.php:897
 msgid "No tables found in database."
 msgstr "Nuk gjenden tabela në databazë."
@@ -249,14 +250,14 @@ msgstr "Nuk gjenden tabela në databazë."
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:26
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:120
-#: templates/structure/show_create.phtml:18
+#: templates/database/structure/show_create.phtml:18
 msgid "Tables"
 msgstr "Tabela"
 
 #: db_export.php:52 libraries/Menu.class.php:317 libraries/Menu.class.php:425
-#: libraries/Util.class.php:3333 libraries/Util.class.php:3343
-#: libraries/Util.class.php:3349 libraries/Util.class.php:3629
-#: libraries/Util.class.php:4327 libraries/Util.class.php:4344
+#: libraries/Util.class.php:3339 libraries/Util.class.php:3349
+#: libraries/Util.class.php:3355 libraries/Util.class.php:3635
+#: libraries/Util.class.php:4333 libraries/Util.class.php:4350
 #: libraries/central_columns.lib.php:728 libraries/config.values.php:39
 #: libraries/config.values.php:47 libraries/config.values.php:109
 #: libraries/config.values.php:115 libraries/config/setup.forms.php:323
@@ -270,7 +271,7 @@ msgstr "Tabela"
 #: libraries/navigation/Nodes/Node_Table.class.php:283
 #: libraries/server_privileges.lib.php:1141 libraries/tracking.lib.php:874
 #: templates/columns_definitions/table_fields_definitions.phtml:3
-#: templates/designer/table_list.phtml:28
+#: templates/database/designer/table_list.phtml:28
 msgid "Structure"
 msgstr "Struktura"
 
@@ -282,7 +283,7 @@ msgstr "Struktura"
 #: libraries/config/user_preferences.forms.php:292
 #: libraries/config/user_preferences.forms.php:297
 #: libraries/server_privileges.lib.php:1140
-#: templates/structure/display_table_stats.phtml:12
+#: templates/table/structure/display_table_stats.phtml:12
 msgid "Data"
 msgstr "Të dhëna"
 
@@ -355,10 +356,10 @@ msgstr "Tabelat e gjurmuara"
 #: libraries/server_privileges.lib.php:2908
 #: libraries/server_privileges.lib.php:3145
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4346
-#: templates/structure/table_header.phtml:21
-#: templates/tbl_relation/foreign_key_row.phtml:176
-#: templates/tbl_relation/internal_relational_row.phtml:63
+#: libraries/server_privileges.lib.php:4372
+#: templates/database/structure/table_header.phtml:21
+#: templates/table/relation/foreign_key_row.phtml:176
+#: templates/table/relation/internal_relational_row.phtml:63
 msgid "Table"
 msgstr "Tabela"
 
@@ -375,7 +376,7 @@ msgid "Updated"
 msgstr "Aktualizuar"
 
 #: db_tracking.php:130 js/messages.php:243 libraries/Menu.class.php:552
-#: libraries/Util.class.php:4314 libraries/config.values.php:104
+#: libraries/Util.class.php:4320 libraries/config.values.php:104
 #: libraries/rte/rte_events.lib.php:393 libraries/rte/rte_list.lib.php:101
 #: libraries/server_status_processes.lib.php:92 libraries/tracking.lib.php:279
 msgid "Status"
@@ -384,14 +385,15 @@ msgstr "Statusi"
 #: db_tracking.php:131 db_tracking.php:290 libraries/Index.class.php:693
 #: libraries/central_columns.lib.php:687 libraries/rte/rte_list.lib.php:74
 #: libraries/rte/rte_list.lib.php:89 libraries/rte/rte_list.lib.php:102
-#: libraries/server_databases.lib.php:398
+#: libraries/server_databases.lib.php:409
 #: libraries/server_privileges.lib.php:2372
 #: libraries/server_privileges.lib.php:3166
 #: libraries/server_privileges.lib.php:3342
 #: libraries/server_user_groups.lib.php:82
 #: libraries/server_variables.lib.php:189 libraries/tracking.lib.php:280
-#: libraries/tracking.lib.php:793 templates/structure/table_header.phtml:30
-#: templates/structure/table_structure_header.phtml:23
+#: libraries/tracking.lib.php:793
+#: templates/database/structure/table_header.phtml:30
+#: templates/table/structure/table_structure_header.phtml:23
 msgid "Action"
 msgstr "Veprimi"
 
@@ -433,7 +435,7 @@ msgid "Untracked tables"
 msgstr "Tabelat e pashkelura"
 
 #: db_tracking.php:305 db_tracking.php:336
-#: templates/structure/optional_action_links.phtml:17
+#: templates/table/structure/optional_action_links.phtml:17
 msgid "Track table"
 msgstr "Gjurmo tabelën"
 
@@ -489,7 +491,7 @@ msgid "Value for the column \"%s\""
 msgstr "Vlera për kolonën \"%s\""
 
 #: gis_data_editor.php:146
-#: templates/gis_visualization/gis_visualization.phtml:37
+#: templates/table/gis_visualization/gis_visualization.phtml:37
 msgid "Use OpenStreetMaps as Base Layer"
 msgstr "Përdor OpenStreetMaps si Shtresë Bazë"
 
@@ -569,35 +571,35 @@ msgstr "Shto gjeometri"
 #: libraries/display_change_password.lib.php:162
 #: libraries/display_export.lib.php:402 libraries/display_export.lib.php:408
 #: libraries/display_import.lib.php:392 libraries/index.lib.php:44
-#: libraries/insert_edit.lib.php:1546 libraries/insert_edit.lib.php:1583
+#: libraries/insert_edit.lib.php:1544 libraries/insert_edit.lib.php:1581
 #: libraries/normalization.lib.php:165 libraries/normalization.lib.php:821
 #: libraries/operations.lib.php:38 libraries/operations.lib.php:108
 #: libraries/operations.lib.php:263 libraries/operations.lib.php:306
 #: libraries/operations.lib.php:801 libraries/operations.lib.php:874
 #: libraries/operations.lib.php:923 libraries/operations.lib.php:1337
 #: libraries/operations.lib.php:1658
-#: libraries/plugins/auth/AuthenticationCookie.class.php:244
+#: libraries/plugins/auth/AuthenticationCookie.class.php:232
 #: libraries/replication_gui.lib.php:122 libraries/replication_gui.lib.php:161
 #: libraries/replication_gui.lib.php:324 libraries/replication_gui.lib.php:461
 #: libraries/replication_gui.lib.php:906 libraries/rte/rte_events.lib.php:509
-#: libraries/rte/rte_routines.lib.php:969
-#: libraries/rte/rte_routines.lib.php:1581
+#: libraries/rte/rte_routines.lib.php:1060
+#: libraries/rte/rte_routines.lib.php:1672
 #: libraries/rte/rte_triggers.lib.php:396 libraries/server_bin_log.lib.php:61
 #: libraries/server_privileges.lib.php:705
 #: libraries/server_privileges.lib.php:2106
 #: libraries/server_privileges.lib.php:2872
 #: libraries/server_privileges.lib.php:3553
-#: libraries/server_privileges.lib.php:4627
+#: libraries/server_privileges.lib.php:4653
 #: libraries/server_user_groups.lib.php:285
 #: libraries/sql_query_form.lib.php:369 libraries/sql_query_form.lib.php:429
 #: libraries/tracking.lib.php:533 libraries/tracking.lib.php:653
 #: prefs_manage.php:277 prefs_manage.php:355
 #: templates/columns_definitions/column_definitions_form.phtml:59
-#: templates/header_location.phtml:17 templates/index_form.phtml:238
+#: templates/database/create_table.phtml:21 templates/header_location.phtml:28
 #: templates/startAndNumberOfRowsPanel.phtml:14
-#: templates/structure/add_column.phtml:25
-#: templates/table/create_table.phtml:21
-#: templates/table/selection_form.phtml:75 view_create.php:275
+#: templates/table/index_form.phtml:238
+#: templates/table/search/selection_form.phtml:75
+#: templates/table/structure/add_column.phtml:25 view_create.php:275
 #: view_operations.php:106
 msgid "Go"
 msgstr "Shko"
@@ -689,7 +691,7 @@ msgid "Could not load import plugins, please check your installation!"
 msgstr ""
 "Nuk mund të ngarkojë shtojcat e importit, ju lutem kontrollo instalimin tuaj!"
 
-#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1466
+#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1460
 #, php-format
 msgid "Bookmark %s has been created."
 msgstr "Faqerojtësi %s është krijuar."
@@ -728,11 +730,11 @@ msgstr "Nuk mund të ngarkojë progresin e importit."
 msgid "Back"
 msgstr "Prapa"
 
-#: index.php:148 libraries/Footer.class.php:70
+#: index.php:149 libraries/Footer.class.php:70
 msgid "phpMyAdmin Demo Server"
 msgstr "phpMyAdmin Demo Server"
 
-#: index.php:152
+#: index.php:153
 #, php-format
 msgid ""
 "You are using the demo server. You can do anything here, but please do not "
@@ -743,110 +745,110 @@ msgstr ""
 "mos ndryshoni rrënjën (root), debian-sys-maint dhe përdoruesit pma. Më shumë "
 "informacion është i vlefshëm në %s."
 
-#: index.php:162
+#: index.php:163
 msgid "General Settings"
 msgstr "Konfigurimet e përgjithshme"
 
-#: index.php:190 libraries/display_change_password.lib.php:50
+#: index.php:191 libraries/display_change_password.lib.php:50
 #: libraries/display_change_password.lib.php:53 user_password.php:247
 msgid "Change password"
 msgstr "Ndrysho fjalëkalimin"
 
-#: index.php:206
+#: index.php:207
 msgid "Server connection collation"
 msgstr "Përshtatja e lidhjes me serverin"
 
-#: index.php:228
+#: index.php:229
 msgid "Appearance Settings"
 msgstr "Konfigurimet e pamjes"
 
-#: index.php:258 prefs_manage.php:285
+#: index.php:259 prefs_manage.php:285
 msgid "More settings"
 msgstr "Më shumë konfigurime"
 
-#: index.php:279
+#: index.php:280
 msgid "Database server"
 msgstr "Serveri i databazës"
 
-#: index.php:282 libraries/plugins/auth/AuthenticationCookie.class.php:181
+#: index.php:283 libraries/plugins/auth/AuthenticationCookie.class.php:169
 msgid "Server:"
 msgstr "Serveri:"
 
-#: index.php:286
+#: index.php:287
 msgid "Server type:"
 msgstr "Tipi i serverit:"
 
-#: index.php:290 libraries/plugins/export/ExportLatex.class.php:212
+#: index.php:291 libraries/plugins/export/ExportLatex.class.php:212
 #: libraries/plugins/export/ExportSql.class.php:687
 #: libraries/plugins/export/ExportXml.class.php:189
 msgid "Server version:"
 msgstr "Versioni i serverit:"
 
-#: index.php:296
+#: index.php:297
 msgid "Protocol version:"
 msgstr "Versioni i protokollit:"
 
-#: index.php:300
+#: index.php:301
 msgid "User:"
 msgstr "Përdoruesi:"
 
-#: index.php:305
+#: index.php:306
 msgid "Server charset:"
 msgstr "Seti i karaktereve të serverit:"
 
-#: index.php:320
+#: index.php:321
 msgid "Web server"
 msgstr "Ueb server"
 
-#: index.php:331
+#: index.php:332
 msgid "Database client version:"
 msgstr "Versioni klient i databazës:"
 
-#: index.php:335
+#: index.php:336
 msgid "PHP extension:"
 msgstr "Zgjerimi PHP:"
 
-#: index.php:349
+#: index.php:350
 msgid "PHP version:"
 msgstr "Versioni PHP:"
 
-#: index.php:360
+#: index.php:361
 msgid "Show PHP information"
 msgstr "Shfaq informacionin PHP"
 
-#: index.php:383
+#: index.php:384
 msgid "Version information:"
 msgstr "Informacion mbi versionin:"
 
-#: index.php:392 libraries/Util.class.php:432 libraries/Util.class.php:495
-#: libraries/config/FormDisplay.tpl.php:151
+#: index.php:393 libraries/Util.class.php:432 libraries/Util.class.php:495
+#: libraries/config/FormDisplay.tpl.php:162
 #: libraries/display_export.lib.php:577 libraries/engines/pbxt.lib.php:162
 #: libraries/navigation/NavigationHeader.class.php:196
 #: libraries/server_variables.lib.php:160
 msgid "Documentation"
 msgstr "Dokumentacioni"
 
-#: index.php:399
+#: index.php:400
 msgid "Wiki"
 msgstr "Wiki"
 
-#: index.php:408
+#: index.php:409
 msgid "Official Homepage"
 msgstr "Webfaqja zyrtare"
 
-#: index.php:415
+#: index.php:416
 msgid "Contribute"
 msgstr "Kontributi"
 
-#: index.php:422
+#: index.php:423
 msgid "Get support"
 msgstr "Merr mbështetje"
 
-#: index.php:429
+#: index.php:430
 msgid "List of changes"
 msgstr "Lista e ndryshimeve"
 
-#: index.php:451
+#: index.php:452
 msgid ""
 "You are connected as 'root' with no password, which corresponds to the "
 "default MySQL privileged account. Your MySQL server is running with this "
@@ -859,7 +861,7 @@ msgstr ""
 "rregulloni këtë vrimë të sigurisë duke vendosur një fjalëkalim për "
 "përdoruesin \"root\"."
 
-#: index.php:468
+#: index.php:469
 msgid ""
 "You have enabled mbstring.func_overload in your PHP configuration. This "
 "option is incompatible with phpMyAdmin and might cause some data to be "
@@ -869,7 +871,7 @@ msgstr ""
 "është jokompatibël me phpMyAdmin dhe mund të shkaktojë disa të dhëna, që të "
 "korruptohen!"
 
-#: index.php:483
+#: index.php:484
 msgid ""
 "The mbstring PHP extension was not found and you seem to be using a "
 "multibyte charset. Without the mbstring extension phpMyAdmin is unable to "
@@ -880,7 +882,7 @@ msgstr ""
 "është në gjendje të ndajë vargjet si duhet dhe kjo mund të rezultojë në "
 "rezultate të papritura."
 
-#: index.php:500
+#: index.php:501
 msgid ""
 "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini."
 "session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower than "
@@ -893,7 +895,7 @@ msgstr ""
 "kësaj, hyrja juaj mund të përfundojë më shpejt se është konfiguruar në "
 "phpMyAdmin."
 
-#: index.php:519
+#: index.php:520
 msgid ""
 "Login cookie store is lower than cookie validity configured in phpMyAdmin, "
 "because of this, your login will expire sooner than configured in phpMyAdmin."
@@ -902,13 +904,13 @@ msgstr ""
 "gatimit të konfiguruar në phpMyAdmin, sepse prej kësaj, hyrja juaj do të "
 "skadojë më shpejt sesa është konfiguruar në phpMyAdmin."
 
-#: index.php:535
+#: index.php:536
 msgid "The configuration file now needs a secret passphrase (blowfish_secret)."
 msgstr ""
 "Fili i konfigurimit ka nevojë tani për një frazë kalimi sekrete "
 "(blowfish_secret)."
 
-#: index.php:548
+#: index.php:549
 msgid ""
 "Directory [code]config[/code], which is used by the setup script, still "
 "exists in your phpMyAdmin directory. It is strongly recommended to remove it "
@@ -921,7 +923,7 @@ msgstr ""
 "tuaj mund të rrezikohet nga njerëz të paautorizuar që mund të shkarkojnë "
 "konfigurimin tuaj."
 
-#: index.php:564
+#: index.php:565
 #, php-format
 msgid ""
 "The phpMyAdmin configuration storage is not completely configured, some "
@@ -930,14 +932,14 @@ msgstr ""
 "Ruajtja e konfigurimit phpMyAdmin nuk është konfiguruar plotësisht, disa "
 "tipare të zgjeruara janë pasivizuar. %sGjej arsyen pse%s. "
 
-#: index.php:571
+#: index.php:572
 msgid ""
 "Or alternately go to 'Operations' tab of any database to set it up there."
 msgstr ""
 "Ose në mënyrë alternative, shko në tabelorin 'Veprime', të ndonjë databaze "
 "dhe vendosi atje."
 
-#: index.php:620
+#: index.php:621
 #, php-format
 msgid ""
 "Your PHP MySQL library version %s differs from your MySQL server version %s. "
@@ -946,7 +948,7 @@ msgstr ""
 "Versioni i librarisë së PHP MySQL %s ndryshon nga versioni i MySQL server "
 "%s. Kjo mund të shkaktojë sjellje të paparashikuara."
 
-#: index.php:648
+#: index.php:649
 #, php-format
 msgid ""
 "Server running with Suhosin. Please refer to %sdocumentation%s for possible "
@@ -1106,8 +1108,8 @@ msgstr ""
 msgid "Save & Close"
 msgstr "Ruaj & Mbyll"
 
-#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:404
-#: libraries/insert_edit.lib.php:1550 prefs_manage.php:361
+#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:415
+#: libraries/insert_edit.lib.php:1548 prefs_manage.php:361
 #: prefs_manage.php:372
 msgid "Reset"
 msgstr "Rivendos"
@@ -1140,7 +1142,7 @@ msgstr "Shto Indeks"
 msgid "Edit Index"
 msgstr "Korrigjo indeks"
 
-#: js/messages.php:99 templates/index_form.phtml:232
+#: js/messages.php:99 templates/table/index_form.phtml:232
 #, php-format
 msgid "Add %s column(s) to index"
 msgstr "Shto %s kolonë(a) tek indeksi"
@@ -1161,13 +1163,14 @@ msgstr "Përzierje me:"
 msgid "Please select column(s) for the index."
 msgstr "Ju lutem zgjedh kolonën(at) për indeksin."
 
-#: js/messages.php:106 templates/structure/add_column.phtml:1
+#: js/messages.php:106 templates/table/structure/add_column.phtml:1
 msgid "You have to add at least one column."
 msgstr "Keni shtuar së paku një kolonë."
 
-#: js/messages.php:109 libraries/insert_edit.lib.php:1548
+#: js/messages.php:109 libraries/insert_edit.lib.php:1546
 #: templates/columns_definitions/column_definitions_form.phtml:162
-#: templates/index_form.phtml:237 templates/tbl_relation/common_form.phtml:106
+#: templates/table/index_form.phtml:237
+#: templates/table/relation/common_form.phtml:106
 msgid "Preview SQL"
 msgstr "Paraqit SQL"
 
@@ -1184,7 +1187,7 @@ msgid "SQL query:"
 msgstr "SQL pyetsor:"
 
 #. l10n: Default label for the y-Axis of Charts
-#: js/messages.php:118 templates/tbl_chart.phtml:109
+#: js/messages.php:118 templates/table/chart/tbl_chart.phtml:109
 msgid "Y Values"
 msgstr "Y vlerat"
 
@@ -1345,7 +1348,7 @@ msgstr "Bajt të dërguara"
 msgid "Bytes received"
 msgstr "Bajt të marra"
 
-#: js/messages.php:169 libraries/server_status.lib.php:226
+#: js/messages.php:169 libraries/server_status.lib.php:235
 msgid "Connections"
 msgstr "Lidhjet"
 
@@ -1402,12 +1405,12 @@ msgstr "%d tabelë(a)"
 msgid "Questions"
 msgstr "Pyetjet"
 
-#: js/messages.php:184 libraries/server_status.lib.php:134
+#: js/messages.php:184 libraries/server_status.lib.php:143
 msgid "Traffic"
 msgstr "Trafiku"
 
 #: js/messages.php:185 libraries/Menu.class.php:586
-#: libraries/Util.class.php:4318 libraries/server_status_monitor.lib.php:257
+#: libraries/Util.class.php:4324 libraries/server_status_monitor.lib.php:257
 msgid "Settings"
 msgstr "Konfigurimet"
 
@@ -1427,8 +1430,9 @@ msgstr "Ju lutem, shtoni së paku një variabël në seri!"
 #: libraries/server_status_monitor.lib.php:236
 #: libraries/server_status_processes.lib.php:308
 #: templates/columns_definitions/transformation.phtml:4
-#: templates/designer/options_panel.phtml:178
-#: templates/table/options_zoom.phtml:12 templates/table/rows_zoom.phtml:26
+#: templates/database/designer/options_panel.phtml:178
+#: templates/table/search/options_zoom.phtml:12
+#: templates/table/search/rows_zoom.phtml:26
 msgid "None"
 msgstr "Asnjë"
 
@@ -1724,8 +1728,8 @@ msgstr ""
 
 #: js/messages.php:270 libraries/Menu.class.php:352
 #: libraries/Menu.class.php:455 libraries/Menu.class.php:582
-#: libraries/Util.class.php:4317 libraries/Util.class.php:4332
-#: libraries/Util.class.php:4349 libraries/config/messages.inc.php:258
+#: libraries/Util.class.php:4323 libraries/Util.class.php:4338
+#: libraries/Util.class.php:4355 libraries/config/messages.inc.php:258
 #: libraries/display_import.lib.php:105
 #: libraries/server_status_monitor.lib.php:318 prefs_manage.php:238
 #: setup/frames/menu.inc.php:26
@@ -1785,13 +1789,13 @@ msgid "Formatting SQL..."
 msgstr "Formaton SQL..."
 
 #: js/messages.php:293 libraries/server_variables.lib.php:157
-#: templates/designer/aggregate_query_panel.phtml:63
-#: templates/designer/delete_relation_panel.phtml:28
-#: templates/designer/having_query_panel.phtml:117
-#: templates/designer/new_relation_panel.phtml:88
-#: templates/designer/options_panel.phtml:253
-#: templates/designer/rename_to_panel.phtml:45
-#: templates/designer/where_query_panel.phtml:83
+#: templates/database/designer/aggregate_query_panel.phtml:63
+#: templates/database/designer/delete_relation_panel.phtml:28
+#: templates/database/designer/having_query_panel.phtml:117
+#: templates/database/designer/new_relation_panel.phtml:88
+#: templates/database/designer/options_panel.phtml:253
+#: templates/database/designer/rename_to_panel.phtml:45
+#: templates/database/designer/where_query_panel.phtml:83
 msgid "Cancel"
 msgstr "Anulo"
 
@@ -1799,7 +1803,7 @@ msgstr "Anulo"
 msgid "Page-related settings"
 msgstr "Rregullimet faqe-relevante"
 
-#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:402
+#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:413
 msgid "Apply"
 msgstr "Apliko"
 
@@ -1834,8 +1838,8 @@ msgstr "Kodi i gabimit: %s"
 msgid "Error text: %s"
 msgstr "Teksti gabim: %s"
 
-#: js/messages.php:307 libraries/db_common.inc.php:68
-#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:450
+#: js/messages.php:307 libraries/db_common.inc.php:69
+#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:461
 msgid "No databases selected."
 msgstr "Nuk janë zgjedhur databaza."
 
@@ -1847,12 +1851,13 @@ msgstr "Po fshin kolonën"
 msgid "Adding Primary Key"
 msgstr "Shton çelësin primar"
 
-#: js/messages.php:310 templates/designer/aggregate_query_panel.phtml:59
-#: templates/designer/having_query_panel.phtml:113
-#: templates/designer/new_relation_panel.phtml:87
-#: templates/designer/options_panel.phtml:252
-#: templates/designer/rename_to_panel.phtml:41
-#: templates/designer/where_query_panel.phtml:82
+#: js/messages.php:310
+#: templates/database/designer/aggregate_query_panel.phtml:59
+#: templates/database/designer/having_query_panel.phtml:113
+#: templates/database/designer/new_relation_panel.phtml:87
+#: templates/database/designer/options_panel.phtml:252
+#: templates/database/designer/rename_to_panel.phtml:41
+#: templates/database/designer/where_query_panel.phtml:82
 msgid "OK"
 msgstr "OK"
 
@@ -1872,7 +1877,7 @@ msgstr "Kopjon databazën"
 msgid "Changing Charset"
 msgstr "Ndryshon setin e karaktereve"
 
-#: js/messages.php:320 libraries/Util.class.php:3217
+#: js/messages.php:320 libraries/Util.class.php:3223
 msgid "Enable foreign key checks"
 msgstr "Aftëso kontrollet e çelësave të huaj"
 
@@ -1909,20 +1914,21 @@ msgstr ""
 #: js/messages.php:334 libraries/DisplayResults.class.php:4834
 #: libraries/DisplayResults.class.php:5092 libraries/Menu.class.php:344
 #: libraries/Menu.class.php:446 libraries/Menu.class.php:578
-#: libraries/Util.class.php:3636 libraries/Util.class.php:3637
-#: libraries/Util.class.php:4316 libraries/Util.class.php:4331
-#: libraries/Util.class.php:4348 libraries/config/messages.inc.php:252
+#: libraries/Util.class.php:3642 libraries/Util.class.php:3643
+#: libraries/Util.class.php:4322 libraries/Util.class.php:4337
+#: libraries/Util.class.php:4354 libraries/config/messages.inc.php:252
 #: libraries/display_export.lib.php:173 libraries/rte/rte_list.lib.php:146
 #: libraries/server_privileges.lib.php:2211
 #: libraries/server_privileges.lib.php:2290
 #: libraries/server_privileges.lib.php:2632
 #: libraries/server_privileges.lib.php:3356
 #: libraries/server_status_monitor.lib.php:322 prefs_manage.php:303
-#: setup/frames/menu.inc.php:27 templates/structure/check_all_tables.phtml:11
+#: setup/frames/menu.inc.php:27
+#: templates/database/structure/check_all_tables.phtml:11
 msgid "Export"
 msgstr "Eksporti"
 
-#: js/messages.php:337 libraries/rte/rte_routines.lib.php:652
+#: js/messages.php:337 libraries/rte/rte_routines.lib.php:743
 msgid "ENUM/SET editor"
 msgstr "Editori ENUM/SET (num/vendos)"
 
@@ -1962,7 +1968,7 @@ msgstr "Shfaq kutinë e pyetsorit"
 #: libraries/Console.class.php:214 libraries/DisplayResults.class.php:3474
 #: libraries/DisplayResults.class.php:4818 libraries/Index.class.php:723
 #: libraries/Util.class.php:706 libraries/Util.class.php:1202
-#: libraries/Util.class.php:3634 libraries/Util.class.php:3635
+#: libraries/Util.class.php:3640 libraries/Util.class.php:3641
 #: libraries/central_columns.lib.php:851
 #: libraries/central_columns.lib.php:1193
 #: libraries/config/messages.inc.php:892
@@ -1980,7 +1986,7 @@ msgstr "Korrigjo"
 #: libraries/server_user_groups.lib.php:129
 #: libraries/sql_query_form.lib.php:416 libraries/tracking.lib.php:477
 #: setup/frames/index.inc.php:183 setup/frames/index.inc.php:291
-#: templates/designer/delete_relation_panel.phtml:27
+#: templates/database/designer/delete_relation_panel.phtml:27
 msgid "Delete"
 msgstr "Fshij"
 
@@ -2149,11 +2155,11 @@ msgid "No dependencies selected!"
 msgstr "Nuk janë zgjedhur varësi!"
 
 #: js/messages.php:394 libraries/central_columns.lib.php:1214
-#: libraries/insert_edit.lib.php:1458 libraries/server_variables.lib.php:155
+#: libraries/insert_edit.lib.php:1456 libraries/server_variables.lib.php:155
 #: setup/frames/config.inc.php:42 setup/frames/index.inc.php:279
 #: templates/columns_definitions/column_definitions_form.phtml:165
-#: templates/gis_visualization/gis_visualization.phtml:48
-#: templates/tbl_relation/common_form.phtml:107
+#: templates/table/gis_visualization/gis_visualization.phtml:48
+#: templates/table/relation/common_form.phtml:107
 msgid "Save"
 msgstr "Ruaj"
 
@@ -2237,8 +2243,8 @@ msgid "Data point content"
 msgstr "Përmbajtja e pikës së të dhënave"
 
 #: js/messages.php:430 js/messages.php:562 js/messages.php:579
-#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2573
-#: templates/index_form.phtml:154 templates/index_form.phtml:194
+#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2571
+#: templates/table/index_form.phtml:154 templates/table/index_form.phtml:194
 msgid "Ignore"
 msgstr "Injoro"
 
@@ -2299,8 +2305,8 @@ msgstr "Zgjedh çelësin e huaj"
 msgid "Please select the primary key or a unique key!"
 msgstr "Ju lutem, zgjedh çelësin primar ose një çelës unik!"
 
-#: js/messages.php:457 templates/designer/side_menu.phtml:91
-#: templates/designer/side_menu.phtml:94
+#: js/messages.php:457 templates/database/designer/side_menu.phtml:91
+#: templates/database/designer/side_menu.phtml:94
 msgid "Choose column to display"
 msgstr "Zgjedh kolonën për të shfaqur"
 
@@ -2316,18 +2322,18 @@ msgstr ""
 msgid "Page name"
 msgstr "Emri i faqes"
 
-#: js/messages.php:463 templates/designer/side_menu.phtml:56
-#: templates/designer/side_menu.phtml:59
+#: js/messages.php:463 templates/database/designer/side_menu.phtml:56
+#: templates/database/designer/side_menu.phtml:59
 msgid "Save page"
 msgstr "Ruaj faqen"
 
-#: js/messages.php:464 templates/designer/side_menu.phtml:63
-#: templates/designer/side_menu.phtml:66
+#: js/messages.php:464 templates/database/designer/side_menu.phtml:63
+#: templates/database/designer/side_menu.phtml:66
 msgid "Save page as"
 msgstr "Ruaj faqen si"
 
-#: js/messages.php:465 templates/designer/side_menu.phtml:49
-#: templates/designer/side_menu.phtml:52
+#: js/messages.php:465 templates/database/designer/side_menu.phtml:49
+#: templates/database/designer/side_menu.phtml:52
 msgid "Open page"
 msgstr "Hap faqe"
 
@@ -2335,7 +2341,7 @@ msgstr "Hap faqe"
 msgid "Delete page"
 msgstr "Fshij faqen"
 
-#: js/messages.php:467 templates/designer/side_menu.phtml:10
+#: js/messages.php:467 templates/database/designer/side_menu.phtml:10
 msgid "Untitled"
 msgstr "Pa titull"
 
@@ -2459,7 +2465,7 @@ msgstr "Gjatësi origjinale"
 msgid "cancel"
 msgstr "anulo"
 
-#: js/messages.php:499 libraries/server_status.lib.php:271
+#: js/messages.php:499 libraries/server_status.lib.php:280
 msgid "Aborted"
 msgstr "Abortuar"
 
@@ -3032,7 +3038,7 @@ msgstr "Ju lutem, fut një hyrje HEX të vlefshëm"
 
 #: js/messages.php:793 libraries/Message.class.php:199
 #: libraries/Util.class.php:654 libraries/core.lib.php:245
-#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1172
+#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1170
 #: tbl_operations.php:229 view_operations.php:63
 msgid "Error"
 msgstr "Gabim"
@@ -3094,8 +3100,8 @@ msgstr "për sekondë"
 msgid "per minute"
 msgstr "për minutë"
 
-#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:143
-#: libraries/server_status.lib.php:228
+#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:152
+#: libraries/server_status.lib.php:237
 #: libraries/server_status_queries.lib.php:98
 msgid "per hour"
 msgstr "për orë"
@@ -3115,7 +3121,7 @@ msgstr ""
 "Lejimet e gabuara mbi filin e konfigurimit, nuk duhet të jetë botërisht e "
 "shkruajtshme!"
 
-#: libraries/Config.class.php:1799
+#: libraries/Config.class.php:1801
 msgid "Font size"
 msgstr "Madhësia e shkrimit"
 
@@ -3143,10 +3149,10 @@ msgstr "Requery (kërkesë)"
 #: libraries/server_privileges.lib.php:2890
 #: libraries/server_privileges.lib.php:3144
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4332
+#: libraries/server_privileges.lib.php:4358
 #: libraries/server_status_processes.lib.php:80
-#: templates/tbl_relation/foreign_key_row.phtml:165
-#: templates/tbl_relation/internal_relational_row.phtml:55
+#: templates/table/relation/foreign_key_row.phtml:165
+#: templates/table/relation/internal_relational_row.phtml:55
 msgid "Database"
 msgstr "Databaza"
 
@@ -3239,11 +3245,11 @@ msgstr "Historia"
 #: libraries/plugins/import/ImportMediawiki.class.php:60
 #: libraries/plugins/import/ImportOds.class.php:59
 #: libraries/plugins/import/ImportShp.class.php:57
-#: libraries/plugins/import/ImportSql.class.php:148
+#: libraries/plugins/import/ImportSql.class.php:51
 #: libraries/plugins/import/ImportXml.class.php:58
-#: libraries/rte/rte_routines.lib.php:833 templates/index_form.phtml:49
-#: templates/structure/row_stats_table.phtml:20
-#: templates/table/options.phtml:2
+#: libraries/rte/rte_routines.lib.php:924 templates/table/index_form.phtml:49
+#: templates/table/search/options.phtml:2
+#: templates/table/structure/row_stats_table.phtml:20
 msgid "Options"
 msgstr "Opsionet"
 
@@ -3276,7 +3282,8 @@ msgstr "zbritëse"
 msgid "Order:"
 msgstr "Renditja:"
 
-#: libraries/Console.class.php:289 templates/table/replace_preview.phtml:17
+#: libraries/Console.class.php:289
+#: templates/table/search/replace_preview.phtml:17
 msgid "Count"
 msgstr "Numri"
 
@@ -3373,9 +3380,9 @@ msgstr "Kalo tek modeli i errët"
 #: libraries/operations.lib.php:794 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:191
-#: templates/structure/sortable_header.phtml:21
-#: templates/structure/sortable_header.phtml:38
-#: templates/table/options.phtml:68
+#: templates/database/structure/sortable_header.phtml:21
+#: templates/database/structure/sortable_header.phtml:38
+#: templates/table/search/options.phtml:68
 msgid "Ascending"
 msgstr "Ngritëse"
 
@@ -3385,13 +3392,14 @@ msgstr "Ngritëse"
 #: libraries/operations.lib.php:797 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:188
-#: templates/structure/sortable_header.phtml:26
-#: templates/structure/sortable_header.phtml:43
-#: templates/table/options.phtml:69
+#: templates/database/structure/sortable_header.phtml:26
+#: templates/database/structure/sortable_header.phtml:43
+#: templates/table/search/options.phtml:69
 msgid "Descending"
 msgstr "Zbritëse"
 
-#: libraries/DBQbe.class.php:467 templates/table/search_and_replace.phtml:6
+#: libraries/DBQbe.class.php:467
+#: templates/table/search/search_and_replace.phtml:6
 msgid "Column:"
 msgstr "Kolonë:"
 
@@ -3550,12 +3558,12 @@ msgstr[0] "%1$s përkim në <strong>%2$s</strong>"
 msgstr[1] "%1$s përkime në <strong>%2$s</strong>"
 
 #: libraries/DbSearch.class.php:354 libraries/Menu.class.php:311
-#: libraries/Util.class.php:3337 libraries/Util.class.php:3347
-#: libraries/Util.class.php:3623 libraries/Util.class.php:3624
-#: libraries/Util.class.php:4343 libraries/config.values.php:43
+#: libraries/Util.class.php:3343 libraries/Util.class.php:3353
+#: libraries/Util.class.php:3629 libraries/Util.class.php:3630
+#: libraries/Util.class.php:4349 libraries/config.values.php:43
 #: libraries/config.values.php:51 libraries/config.values.php:119
 #: libraries/navigation/Nodes/Node_Table.class.php:295
-#: templates/structure/check_all_table_column.phtml:5
+#: templates/table/structure/check_all_table_column.phtml:5
 msgid "Browse"
 msgstr "Shfleto"
 
@@ -3572,7 +3580,8 @@ msgstr "Kërko në databazë"
 msgid "Words or values to search for (wildcard: \"%\"):"
 msgstr "Fjalët ose vlertat për të cilat kërkoni (wildcard: \"%\"):"
 
-#: libraries/DbSearch.class.php:401 templates/table/search_and_replace.phtml:1
+#: libraries/DbSearch.class.php:401
+#: templates/table/search/search_and_replace.phtml:1
 msgid "Find:"
 msgstr "Gjej:"
 
@@ -3616,28 +3625,28 @@ msgstr "Radhët e filterit"
 msgid "Search this table"
 msgstr "Kërko këtë tabelë"
 
-#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2532
-#: libraries/Util.class.php:2535
+#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2538
+#: libraries/Util.class.php:2541
 msgctxt "First page"
 msgid "Begin"
 msgstr "Fillo"
 
-#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2533
-#: libraries/Util.class.php:2536 libraries/server_bin_log.lib.php:170
+#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2539
+#: libraries/Util.class.php:2542 libraries/server_bin_log.lib.php:170
 #: libraries/server_bin_log.lib.php:172
 msgctxt "Previous page"
 msgid "Previous"
 msgstr "Përpara"
 
-#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2564
-#: libraries/Util.class.php:2574 libraries/server_bin_log.lib.php:204
+#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2570
+#: libraries/Util.class.php:2580 libraries/server_bin_log.lib.php:204
 #: libraries/server_bin_log.lib.php:206
 msgctxt "Next page"
 msgid "Next"
 msgstr "Tjetër"
 
-#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2565
-#: libraries/Util.class.php:2575
+#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2571
+#: libraries/Util.class.php:2581
 msgctxt "Last page"
 msgid "End"
 msgstr "Fund"
@@ -3712,15 +3721,15 @@ msgid "May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]."
 msgstr "Mund të jetë me afërsi. Shiko [doc@faq3-11]FAQ 3.11[/doc]."
 
 #: libraries/DisplayResults.class.php:4332 libraries/Message.class.php:180
-#: libraries/controllers/TableRelationController.class.php:258
+#: libraries/controllers/TableRelationController.class.php:259
 #: libraries/controllers/TableSearchController.class.php:655
-#: libraries/rte/rte_routines.lib.php:1332 libraries/sql_query_form.lib.php:89
+#: libraries/rte/rte_routines.lib.php:1423 libraries/sql_query_form.lib.php:89
 #: tbl_operations.php:227 tbl_row_action.php:138 view_operations.php:62
 msgid "Your SQL query has been executed successfully."
 msgstr "Pyetsori juaj SQL është ekzekutuar me sukses."
 
 #: libraries/DisplayResults.class.php:4660
-#: libraries/controllers/StructureController.class.php:629
+#: libraries/controllers/DatabaseStructureController.class.php:564
 #, php-format
 msgid ""
 "This view has at least this number of rows. Please refer to %sdocumentation"
@@ -3744,33 +3753,33 @@ msgstr "%1$d gjithsejt, %2$d në pyetsor"
 msgid "%d total"
 msgstr "%d gjithsejt"
 
-#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1318
+#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1312
 #, php-format
 msgid "Query took %01.4f seconds."
 msgstr "Pyetsori mori %01.4f sekonda."
 
 #: libraries/DisplayResults.class.php:4807
-#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4767
-#: libraries/Util.class.php:4773 libraries/mult_submits.inc.php:50
-#: templates/structure/check_all_tables.phtml:2
-#: templates/structure/check_all_tables.phtml:9
+#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4773
+#: libraries/Util.class.php:4779 libraries/mult_submits.inc.php:50
+#: templates/database/structure/check_all_tables.phtml:2
+#: templates/database/structure/check_all_tables.phtml:9
 msgid "With selected:"
 msgstr "Me të zgjedhur:"
 
 #: libraries/DisplayResults.class.php:4811
-#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4769
-#: libraries/Util.class.php:4770 libraries/server_privileges.lib.php:1174
+#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4775
+#: libraries/Util.class.php:4776 libraries/server_privileges.lib.php:1174
 #: libraries/server_privileges.lib.php:1175
 #: libraries/server_privileges.lib.php:1387
 #: libraries/server_user_groups.lib.php:231
-#: templates/structure/check_all_tables.phtml:3
-#: templates/structure/check_all_tables.phtml:4
+#: templates/database/structure/check_all_tables.phtml:3
+#: templates/database/structure/check_all_tables.phtml:4
 msgid "Check All"
 msgstr "Shënjo të gjitha"
 
 #: libraries/DisplayResults.class.php:4985 libraries/Header.class.php:383
-#: templates/structure/optional_action_links.phtml:1
-#: templates/structure/print_view_data_dictionary_link.phtml:3
+#: templates/database/structure/print_view_data_dictionary_link.phtml:3
+#: templates/table/structure/optional_action_links.phtml:1
 msgid "Print view"
 msgstr "Shfaq printimin"
 
@@ -3778,7 +3787,8 @@ msgstr "Shfaq printimin"
 msgid "Query results operations"
 msgstr "Veprimet e rezultatit të pyetsorit"
 
-#: libraries/DisplayResults.class.php:5105 templates/tbl_chart.phtml:12
+#: libraries/DisplayResults.class.php:5105
+#: templates/table/chart/tbl_chart.phtml:12
 msgid "Display chart"
 msgstr "Shfaq grafikun"
 
@@ -3872,7 +3882,7 @@ msgid "Click on the bar to scroll to top of page"
 msgstr "Kliko mbi shirit për të lëvizur në krye të faqes"
 
 #: libraries/Header.class.php:749
-#: libraries/plugins/auth/AuthenticationCookie.class.php:152
+#: libraries/plugins/auth/AuthenticationCookie.class.php:140
 msgid "Javascript must be enabled past this point!"
 msgstr "Javascript duhet të aftësohet për të kaluar këtë pikë!"
 
@@ -3894,11 +3904,11 @@ msgid "Keyname"
 msgstr "Emri i çelësit"
 
 #: libraries/Index.class.php:697
-#: libraries/controllers/StructureController.class.php:1962
-#: libraries/controllers/StructureController.class.php:1967
+#: libraries/controllers/TableStructureController.class.php:953
+#: libraries/controllers/TableStructureController.class.php:958
 #: libraries/tracking.lib.php:973
 #: templates/columns_definitions/column_indexes.phtml:11
-#: templates/structure/check_all_table_column.phtml:26
+#: templates/table/structure/check_all_table_column.phtml:26
 msgid "Unique"
 msgstr "Unik"
 
@@ -3917,16 +3927,17 @@ msgstr "Kardinaliteti"
 #: libraries/server_collations.lib.php:35 libraries/tracking.lib.php:881
 #: libraries/tracking.lib.php:977
 #: templates/columns_definitions/table_fields_definitions.phtml:33
-#: templates/structure/row_stats_table.phtml:31
-#: templates/structure/table_header.phtml:55
-#: templates/structure/table_structure_header.phtml:7
-#: templates/table/table_header.phtml:8
+#: templates/database/structure/table_header.phtml:55
+#: templates/table/search/table_header.phtml:8
+#: templates/table/structure/row_stats_table.phtml:31
+#: templates/table/structure/table_structure_header.phtml:7
 msgid "Collation"
 msgstr "Përshtatja"
 
 #: libraries/Index.class.php:703 libraries/rte/rte_events.lib.php:496
-#: libraries/rte/rte_routines.lib.php:956 libraries/tracking.lib.php:885
-#: libraries/tracking.lib.php:979 templates/structure/table_header.phtml:84
+#: libraries/rte/rte_routines.lib.php:1047 libraries/tracking.lib.php:885
+#: libraries/tracking.lib.php:979
+#: templates/database/structure/table_header.phtml:84
 msgid "Comment"
 msgstr "Komenti"
 
@@ -3939,15 +3950,15 @@ msgstr "Çelësi primar është fshirë."
 msgid "Index %s has been dropped."
 msgstr "Indeksi %s është fshirë."
 
-#: libraries/Index.class.php:757 libraries/Util.class.php:3630
-#: libraries/Util.class.php:3631
-#: libraries/controllers/StructureController.class.php:1958
-#: libraries/controllers/StructureController.class.php:1959
+#: libraries/Index.class.php:757 libraries/Util.class.php:3636
+#: libraries/Util.class.php:3637
+#: libraries/controllers/TableStructureController.class.php:949
+#: libraries/controllers/TableStructureController.class.php:950
 #: libraries/operations.lib.php:1607 libraries/rte/rte_list.lib.php:150
 #: libraries/server_databases.lib.php:146
-#: templates/structure/check_all_table_column.phtml:15
-#: templates/structure/check_all_tables.phtml:16
-#: templates/tbl_relation/foreign_key_row.phtml:93
+#: templates/database/structure/check_all_tables.phtml:16
+#: templates/table/relation/foreign_key_row.phtml:93
+#: templates/table/structure/check_all_table_column.phtml:15
 msgid "Drop"
 msgstr "Fshij"
 
@@ -3978,16 +3989,16 @@ msgstr "Serveri"
 #: libraries/Menu.class.php:248
 #: libraries/navigation/Nodes/Node_View.class.php:32
 #: libraries/tbl_info.inc.php:63
-#: templates/structure/structure_table_row.phtml:97
-#: templates/structure/structure_table_row.phtml:159
+#: templates/database/structure/structure_table_row.phtml:97
+#: templates/database/structure/structure_table_row.phtml:159
 msgid "View"
 msgstr "Shfaq"
 
 #: libraries/Menu.class.php:325 libraries/Menu.class.php:429
-#: libraries/Menu.class.php:548 libraries/Util.class.php:3334
-#: libraries/Util.class.php:3344 libraries/Util.class.php:3350
-#: libraries/Util.class.php:4313 libraries/Util.class.php:4328
-#: libraries/Util.class.php:4345 libraries/config.values.php:40
+#: libraries/Menu.class.php:548 libraries/Util.class.php:3340
+#: libraries/Util.class.php:3350 libraries/Util.class.php:3356
+#: libraries/Util.class.php:4319 libraries/Util.class.php:4334
+#: libraries/Util.class.php:4351 libraries/config.values.php:40
 #: libraries/config.values.php:48 libraries/config.values.php:110
 #: libraries/config.values.php:116 libraries/config/messages.inc.php:321
 #: libraries/navigation/Nodes/Node_Table.class.php:292
@@ -3995,19 +4006,19 @@ msgid "SQL"
 msgstr "SQL"
 
 #: libraries/Menu.class.php:328 libraries/Menu.class.php:432
-#: libraries/Util.class.php:3335 libraries/Util.class.php:3345
-#: libraries/Util.class.php:3351 libraries/Util.class.php:3625
-#: libraries/Util.class.php:3626 libraries/Util.class.php:4329
-#: libraries/Util.class.php:4346 libraries/config.values.php:41
+#: libraries/Util.class.php:3341 libraries/Util.class.php:3351
+#: libraries/Util.class.php:3357 libraries/Util.class.php:3631
+#: libraries/Util.class.php:3632 libraries/Util.class.php:4335
+#: libraries/Util.class.php:4352 libraries/config.values.php:41
 #: libraries/config.values.php:49 libraries/config.values.php:111
 #: libraries/config.values.php:117
 #: libraries/navigation/Nodes/Node_Table.class.php:286
 msgid "Search"
 msgstr "Kërko"
 
-#: libraries/Menu.class.php:338 libraries/Util.class.php:3336
-#: libraries/Util.class.php:3346 libraries/Util.class.php:3627
-#: libraries/Util.class.php:3628 libraries/Util.class.php:4347
+#: libraries/Menu.class.php:338 libraries/Util.class.php:3342
+#: libraries/Util.class.php:3352 libraries/Util.class.php:3633
+#: libraries/Util.class.php:3634 libraries/Util.class.php:4353
 #: libraries/config.values.php:42 libraries/config.values.php:50
 #: libraries/config.values.php:118
 #: libraries/navigation/Nodes/Node_Table.class.php:289
@@ -4016,30 +4027,30 @@ msgid "Insert"
 msgstr "Fut"
 
 #: libraries/Menu.class.php:362 libraries/Menu.class.php:467
-#: libraries/Util.class.php:4334 libraries/Util.class.php:4350
+#: libraries/Util.class.php:4340 libraries/Util.class.php:4356
 #: libraries/config.values.php:106 libraries/server_common.lib.php:51
 #: libraries/server_privileges.lib.php:2370
 #: libraries/server_privileges.lib.php:3158
-#: libraries/server_privileges.lib.php:4221
+#: libraries/server_privileges.lib.php:4247
 msgid "Privileges"
 msgstr "Privilegjet"
 
 #: libraries/Menu.class.php:371 libraries/Menu.class.php:379
-#: libraries/Menu.class.php:459 libraries/Util.class.php:3338
-#: libraries/Util.class.php:3352 libraries/Util.class.php:4333
-#: libraries/Util.class.php:4351 libraries/config.values.php:112
+#: libraries/Menu.class.php:459 libraries/Util.class.php:3344
+#: libraries/Util.class.php:3358 libraries/Util.class.php:4339
+#: libraries/Util.class.php:4357 libraries/config.values.php:112
 #: view_operations.php:92
 msgid "Operations"
 msgstr "Veprime"
 
 #: libraries/Menu.class.php:384 libraries/Menu.class.php:492
-#: libraries/Util.class.php:4338 libraries/Util.class.php:4352
+#: libraries/Util.class.php:4344 libraries/Util.class.php:4358
 #: libraries/relation.lib.php:255
 msgid "Tracking"
 msgstr "Gjurmim"
 
 #: libraries/Menu.class.php:397 libraries/Menu.class.php:486
-#: libraries/Util.class.php:4337 libraries/Util.class.php:4353
+#: libraries/Util.class.php:4343 libraries/Util.class.php:4359
 #: libraries/navigation/Nodes/Node_Trigger_Container.class.php:24
 #: libraries/plugins/export/ExportHtmlword.class.php:557
 #: libraries/plugins/export/ExportOdt.class.php:685
@@ -4056,16 +4067,16 @@ msgstr "Shkrehësit"
 msgid "Database seems to be empty!"
 msgstr "Databaza duket se është e zbrazët!"
 
-#: libraries/Menu.class.php:439 libraries/Util.class.php:4330
+#: libraries/Menu.class.php:439 libraries/Util.class.php:4336
 msgid "Query"
 msgstr "Pyetsori"
 
-#: libraries/Menu.class.php:472 libraries/Util.class.php:4335
+#: libraries/Menu.class.php:472 libraries/Util.class.php:4341
 #: libraries/rte/rte_words.lib.php:36
 msgid "Routines"
 msgstr "Rutinat"
 
-#: libraries/Menu.class.php:479 libraries/Util.class.php:4336
+#: libraries/Menu.class.php:479 libraries/Util.class.php:4342
 #: libraries/navigation/Nodes/Node_Event_Container.class.php:26
 #: libraries/plugins/export/ExportSql.class.php:940
 #: libraries/plugins/export/ExportXml.class.php:107
@@ -4073,20 +4084,20 @@ msgstr "Rutinat"
 msgid "Events"
 msgstr "Ngjarjet"
 
-#: libraries/Menu.class.php:498 libraries/Util.class.php:4339
+#: libraries/Menu.class.php:498 libraries/Util.class.php:4345
 msgid "Designer"
 msgstr "Dizajner"
 
-#: libraries/Menu.class.php:507 libraries/Util.class.php:4340
-#: templates/structure/check_all_tables.phtml:35
+#: libraries/Menu.class.php:507 libraries/Util.class.php:4346
+#: templates/database/structure/check_all_tables.phtml:35
 msgid "Central columns"
 msgstr "Kolonat qendrore"
 
-#: libraries/Menu.class.php:544 libraries/Util.class.php:4312
+#: libraries/Menu.class.php:544 libraries/Util.class.php:4318
 #: libraries/config.values.php:103 libraries/config/messages.inc.php:266
 #: libraries/config/messages.inc.php:341
 #: libraries/navigation/NavigationTree.class.php:1239
-#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4332
+#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4358
 msgid "Databases"
 msgstr "Databazat"
 
@@ -4097,34 +4108,34 @@ msgid "User accounts"
 msgstr "Grupet e përdoruesve"
 
 #: libraries/Menu.class.php:595 libraries/ServerStatusData.class.php:121
-#: libraries/Util.class.php:4319 libraries/server_common.lib.php:36
+#: libraries/Util.class.php:4325 libraries/server_common.lib.php:36
 msgid "Binary log"
 msgstr "Regjistër (log) binar"
 
 #: libraries/Menu.class.php:601 libraries/ServerStatusData.class.php:126
-#: libraries/Util.class.php:4320 libraries/server_common.lib.php:42
-#: templates/structure/body_for_table_summary.phtml:10
-#: templates/structure/table_header.phtml:27
+#: libraries/Util.class.php:4326 libraries/server_common.lib.php:42
+#: templates/database/structure/body_for_table_summary.phtml:10
+#: templates/database/structure/table_header.phtml:27
 msgid "Replication"
 msgstr "Replikimi"
 
 #: libraries/Menu.class.php:606 libraries/ServerStatusData.class.php:193
-#: libraries/Util.class.php:4321 libraries/config.values.php:105
+#: libraries/Util.class.php:4327 libraries/config.values.php:105
 #: libraries/server_engines.lib.php:108 libraries/server_engines.lib.php:112
 #: libraries/sql_query_form.lib.php:421
 msgid "Variables"
 msgstr "Variablat"
 
-#: libraries/Menu.class.php:610 libraries/Util.class.php:4322
+#: libraries/Menu.class.php:610 libraries/Util.class.php:4328
 msgid "Charsets"
 msgstr "Karakteret"
 
-#: libraries/Menu.class.php:615 libraries/Util.class.php:4323
+#: libraries/Menu.class.php:615 libraries/Util.class.php:4329
 #: libraries/server_common.lib.php:33 libraries/server_plugins.lib.php:27
 msgid "Plugins"
 msgstr "Shtojcat (plugins)"
 
-#: libraries/Menu.class.php:626 libraries/Util.class.php:4324
+#: libraries/Menu.class.php:626 libraries/Util.class.php:4330
 msgid "Engines"
 msgstr "Makinat"
 
@@ -4149,7 +4160,7 @@ msgid_plural "%1$d rows inserted."
 msgstr[0] "%1$d radhë e futur."
 msgstr[1] "%1$d radhë të futura."
 
-#: libraries/PDF.class.php:70 libraries/Util.class.php:2521
+#: libraries/PDF.class.php:70 libraries/Util.class.php:2527
 #: libraries/browse_foreigners.lib.php:327
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:865
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:890
@@ -4170,7 +4181,7 @@ msgid "Could not save favorite table!"
 msgstr "Nuk mund të ruajë tabelën e preferuar!"
 
 #: libraries/RecentFavoriteTable.class.php:212
-#: templates/structure/favorite_anchor.phtml:12
+#: templates/database/structure/favorite_anchor.phtml:12
 msgid "Remove from Favorites"
 msgstr "Largo nga preferencat"
 
@@ -4336,7 +4347,7 @@ msgstr ""
 "Nuk ka informacion të detajuar statusi të vlefshëm për këtë motor ruajtje."
 
 #: libraries/StorageEngine.class.php:373
-#: templates/structure/body_for_table_summary.phtml:50
+#: templates/database/structure/body_for_table_summary.phtml:50
 #, php-format
 msgid "%s is the default storage engine on this MySQL server."
 msgstr "%s është makina e parazgjedhur e ruajtjes në këtë MySQL server."
@@ -4819,10 +4830,10 @@ msgstr ""
 
 #: libraries/Util.class.php:726 libraries/rte/rte_events.lib.php:110
 #: libraries/rte/rte_events.lib.php:119 libraries/rte/rte_events.lib.php:150
-#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:153
-#: libraries/rte/rte_routines.lib.php:162
-#: libraries/rte/rte_routines.lib.php:235
-#: libraries/rte/rte_routines.lib.php:1366
+#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:223
+#: libraries/rte/rte_routines.lib.php:250
+#: libraries/rte/rte_routines.lib.php:372
+#: libraries/rte/rte_routines.lib.php:1457
 #: libraries/rte/rte_triggers.lib.php:86 libraries/rte/rte_triggers.lib.php:95
 #: libraries/rte/rte_triggers.lib.php:127
 msgid "MySQL said: "
@@ -4866,75 +4877,78 @@ msgstr "Die"
 msgid "%B %d, %Y at %I:%M %p"
 msgstr "%B %d, %Y në %I:%M %p"
 
-#: libraries/Util.class.php:2019
+#: libraries/Util.class.php:2025
 #, php-format
 msgid "%s days, %s hours, %s minutes and %s seconds"
 msgstr "%s ditë, %s orë, %s minuta dhe %s sekonda"
 
-#: libraries/Util.class.php:2112
+#: libraries/Util.class.php:2118
 msgid "Missing parameter:"
 msgstr "Parametri që mungon:"
 
-#: libraries/Util.class.php:2645
+#: libraries/Util.class.php:2651
 #, php-format
 msgid "Jump to database \"%s\"."
 msgstr "Hidhu tek databaza \"%s\"."
 
-#: libraries/Util.class.php:2670
+#: libraries/Util.class.php:2676
 #, php-format
 msgid "The %s functionality is affected by a known bug, see %s"
 msgstr "Funksionaliteti %s është ndikuar nga një defekt i njohur, shiko %s"
 
-#: libraries/Util.class.php:2881
+#: libraries/Util.class.php:2887
 msgid "Click to toggle"
 msgstr "Kliko për të nyjëzuar"
 
-#: libraries/Util.class.php:3542 prefs_manage.php:248
+#: libraries/Util.class.php:3548 prefs_manage.php:248
 msgid "Browse your computer:"
 msgstr "Shfleto kompjuterin:"
 
-#: libraries/Util.class.php:3567
+#: libraries/Util.class.php:3573
 #, php-format
 msgid "Select from the web server upload directory <b>%s</b>:"
 msgstr "Zgjedh nga drejtoria e ngarkimit <b>%s</b> të ueb serverit:"
 
-#: libraries/Util.class.php:3596 libraries/insert_edit.lib.php:1173
+#: libraries/Util.class.php:3602 libraries/insert_edit.lib.php:1171
 msgid "The directory you set for upload work cannot be reached."
 msgstr "Dosja që keni zgjedhur për ngarkim nuk mund të arrihet."
 
-#: libraries/Util.class.php:3607
+#: libraries/Util.class.php:3613
 msgid "There are no files to upload!"
 msgstr "Nuk ka file për ngarkim!"
 
-#: libraries/Util.class.php:3632 libraries/Util.class.php:3633
-#: templates/structure/check_all_tables.phtml:15
+#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: templates/database/structure/check_all_tables.phtml:15
 msgid "Empty"
 msgstr "Zbraz"
 
-#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: libraries/Util.class.php:3644 libraries/Util.class.php:3645
 msgid "Execute"
 msgstr "Ekzekuto"
 
-#: libraries/Util.class.php:4152
+#: libraries/Util.class.php:4158
 msgid "Print"
 msgstr "Printo"
 
-#: libraries/Util.class.php:4257 templates/structure/row_stats_table.phtml:80
-#: templates/structure/table_header.phtml:95
+#: libraries/Util.class.php:4263
+#: templates/database/structure/table_header.phtml:95
+#: templates/table/structure/row_stats_table.phtml:80
 msgid "Creation"
 msgstr "Krijim"
 
-#: libraries/Util.class.php:4263 templates/structure/row_stats_table.phtml:87
-#: templates/structure/table_header.phtml:106
+#: libraries/Util.class.php:4269
+#: templates/database/structure/table_header.phtml:106
+#: templates/table/structure/row_stats_table.phtml:87
 msgid "Last update"
 msgstr "Aktualizimi i fundit"
 
-#: libraries/Util.class.php:4269 templates/structure/row_stats_table.phtml:94
-#: templates/structure/table_header.phtml:117
+#: libraries/Util.class.php:4275
+#: templates/database/structure/table_header.phtml:117
+#: templates/table/structure/row_stats_table.phtml:94
 msgid "Last check"
 msgstr "Kontrolli i fundi"
 
-#: libraries/Util.class.php:4315
+#: libraries/Util.class.php:4321
 msgid "Users"
 msgstr "Përdoruesit"
 
@@ -4955,16 +4969,16 @@ msgid "Use this value"
 msgstr "Përdor këtë vlerë"
 
 #: libraries/build_html_for_db.lib.php:33 libraries/import.lib.php:193
-#: templates/structure/actions_in_table_structure.phtml:113
-#: templates/structure/row_stats_table.phtml:42
-#: templates/structure/table_header.phtml:36
+#: templates/database/structure/table_header.phtml:36
+#: templates/table/structure/actions_in_table_structure.phtml:113
+#: templates/table/structure/row_stats_table.phtml:42
 msgid "Rows"
 msgstr "Radhët"
 
 #: libraries/build_html_for_db.lib.php:48 libraries/engines/innodb.lib.php:171
-#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:186
-#: libraries/server_status.lib.php:298
-#: templates/structure/display_table_stats.phtml:40
+#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:195
+#: libraries/server_status.lib.php:307
+#: templates/table/structure/display_table_stats.phtml:40
 msgid "Total"
 msgstr "Gjithsejt"
 
@@ -4973,10 +4987,12 @@ msgid "Jump to database"
 msgstr "Hidhu tek databaza"
 
 #: libraries/build_html_for_db.lib.php:146
+#: templates/database/structure/structure_table_row.phtml:15
 msgid "Not replicated"
 msgstr "Nuk është replikuar"
 
 #: libraries/build_html_for_db.lib.php:158
+#: templates/database/structure/structure_table_row.phtml:16
 msgid "Replicated"
 msgstr "Replikuar"
 
@@ -5033,17 +5049,17 @@ msgstr "JO"
 #: libraries/plugins/export/ExportTexytext.class.php:425
 #: libraries/plugins/export/PMA_ExportPdf.class.php:307
 #: libraries/rte/rte_list.lib.php:73 libraries/rte/rte_list.lib.php:85
-#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:830
-#: libraries/rte/rte_routines.lib.php:1492 setup/frames/index.inc.php:162
+#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:921
+#: libraries/rte/rte_routines.lib.php:1583 setup/frames/index.inc.php:162
 #: templates/columns_definitions/table_fields_definitions.phtml:8
-#: templates/structure/table_structure_header.phtml:5
-#: templates/table/create_table.phtml:11
+#: templates/database/create_table.phtml:11
+#: templates/table/structure/table_structure_header.phtml:5
 msgid "Name"
 msgstr "Emri"
 
 #: libraries/central_columns.lib.php:699
 #: libraries/central_columns.lib.php:1381
-#: libraries/rte/rte_routines.lib.php:832
+#: libraries/rte/rte_routines.lib.php:923
 #: templates/columns_definitions/table_fields_definitions.phtml:14
 msgid "Length/Values"
 msgstr "Gjatësia/Vlerat"
@@ -5062,7 +5078,7 @@ msgid "Select a table"
 msgstr "Zgjedh një tabelë"
 
 #: libraries/central_columns.lib.php:804
-#: templates/structure/add_column.phtml:4
+#: templates/table/structure/add_column.phtml:4
 msgid "Add column"
 msgstr "Shto kolonë"
 
@@ -5078,7 +5094,7 @@ msgstr "Shto kolonë të re"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1002
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1025
 #: templates/columns_definitions/table_fields_definitions.phtml:36
-#: templates/structure/table_structure_header.phtml:8
+#: templates/table/structure/table_structure_header.phtml:8
 msgid "Attributes"
 msgstr "Atributet"
 
@@ -5197,7 +5213,7 @@ msgid "Double click"
 msgstr "Kliko dyfish"
 
 #: libraries/config.values.php:95 libraries/config.values.php:124
-#: libraries/config/FormDisplay.tpl.php:221 libraries/relation.lib.php:97
+#: libraries/config/FormDisplay.tpl.php:232 libraries/relation.lib.php:97
 #: libraries/relation.lib.php:105
 msgid "Disabled"
 msgstr "Pasivizuar"
@@ -5369,22 +5385,22 @@ msgstr ""
 msgid "maximum %s"
 msgstr "maksimum %s"
 
-#: libraries/config/FormDisplay.tpl.php:219
+#: libraries/config/FormDisplay.tpl.php:230
 msgid "This setting is disabled, it will not be applied to your configuration."
 msgstr ""
 "Ky rregullim është pasivizuar, nuk do të aplikohet për konfigurimin tuaj."
 
-#: libraries/config/FormDisplay.tpl.php:313
+#: libraries/config/FormDisplay.tpl.php:324
 #, php-format
 msgid "Set value: %s"
 msgstr "Vendos vlerën: %s"
 
-#: libraries/config/FormDisplay.tpl.php:318
+#: libraries/config/FormDisplay.tpl.php:329
 #: libraries/config/messages.inc.php:610
 msgid "Restore default value"
 msgstr "Rivendos vlerën standarde"
 
-#: libraries/config/FormDisplay.tpl.php:332
+#: libraries/config/FormDisplay.tpl.php:343
 msgid "Allow users to customize this value"
 msgstr "Lejo përdoruesit të përshtasin këtë vlerë"
 
@@ -5887,7 +5903,7 @@ msgstr "Seti i karaktereve të filit"
 
 #: libraries/config/messages.inc.php:136 libraries/config/messages.inc.php:152
 #: libraries/sql_query_form.lib.php:247
-#: templates/structure/row_stats_table.phtml:7
+#: templates/table/structure/row_stats_table.phtml:7
 msgid "Format"
 msgstr "Formati"
 
@@ -6404,7 +6420,7 @@ msgstr ""
 
 #: libraries/config/messages.inc.php:332
 #: libraries/plugins/export/ExportPdf.class.php:279
-#: templates/structure/secondary_tabs.phtml:8
+#: templates/table/secondary_tabs.phtml:8
 msgid "Table structure"
 msgstr "Struktura e tabelës"
 
@@ -8102,101 +8118,33 @@ msgstr "Microsoft Word 2000"
 msgid "OpenDocument Text"
 msgstr "HapDokument Tekst"
 
-#: libraries/controllers/StructureController.class.php:465
+#: libraries/controllers/DatabaseStructureController.class.php:405
 #: tbl_operations.php:382
 #, php-format
 msgid "Table %s has been emptied."
 msgstr "Tabela %s është zbrazur."
 
-#: libraries/controllers/StructureController.class.php:486
+#: libraries/controllers/DatabaseStructureController.class.php:426
 #: tbl_operations.php:400 view_operations.php:119
 #, php-format
 msgid "View %s has been dropped."
 msgstr "Paraqitja %s është fshirë."
 
-#: libraries/controllers/StructureController.class.php:487
+#: libraries/controllers/DatabaseStructureController.class.php:427
 #: tbl_operations.php:401
 #, php-format
 msgid "Table %s has been dropped."
 msgstr "Tabela %s është fshirë."
 
-#: libraries/controllers/StructureController.class.php:797
-#, php-format
-msgid "The name '%s' is a MySQL reserved keyword."
-msgid_plural "The names '%s' are MySQL reserved keywords."
-msgstr[0] "Emri '%s' është një fjalë kyçe e rezervuar MySQL."
-msgstr[1] "Emrat '%s' janë fjalë kyçe të rezervuara MySQL."
-
-#: libraries/controllers/StructureController.class.php:875
-msgid "No column selected."
-msgstr "Nuk është zgjedhur kolona."
-
-#: libraries/controllers/StructureController.class.php:1049
+#: libraries/controllers/DatabaseStructureController.class.php:733
 msgid "Favorite List is full!"
 msgstr "Lista e preferencave është e mbushur!"
 
-#: libraries/controllers/StructureController.class.php:1272
-msgid "The columns have been moved successfully."
-msgstr "Kolonat kanë lëvizur me sukses."
-
-#: libraries/controllers/StructureController.class.php:1535
-#, php-format
-msgid ""
-"Table %1$s has been altered successfully. Privileges have been adjusted."
-msgstr "Tabela %1$s është alternuar me sukses. Privilegjet janë përshtatur."
-
-#: libraries/controllers/StructureController.class.php:1541
-#: libraries/controllers/TableIndexesController.class.php:161
-#: tbl_addfield.php:92
-#, php-format
-msgid "Table %1$s has been altered successfully."
-msgstr "Tabela %1$s është alternuar me sukses."
-
-#: libraries/controllers/StructureController.class.php:1588
-#: libraries/tracking.lib.php:1094
-msgid "Query error"
-msgstr "Gabim pyetsori"
-
-#: libraries/controllers/StructureController.class.php:1806
+#: libraries/controllers/DatabaseStructureController.class.php:947
 #: libraries/mysql_charsets.lib.php:366 libraries/mysql_charsets.lib.php:373
 msgid "unknown"
 msgstr "e panjohur"
 
-#: libraries/controllers/StructureController.class.php:1957
-#: templates/structure/check_all_table_column.phtml:11
-msgid "Change"
-msgstr "Ndrysho"
-
-#: libraries/controllers/StructureController.class.php:1961
-#: libraries/controllers/StructureController.class.php:1966
-#: libraries/navigation/Nodes/Node_Index.class.php:30
-#: libraries/tracking.lib.php:926
-#: templates/columns_definitions/column_indexes.phtml:16
-#: templates/columns_definitions/table_fields_definitions.phtml:57
-#: templates/structure/check_all_table_column.phtml:30
-#: templates/structure/display_structure.phtml:79
-#: templates/structure/display_table_stats.phtml:19
-msgid "Index"
-msgstr "Indeksi"
-
-#: libraries/controllers/StructureController.class.php:1963
-#: libraries/controllers/StructureController.class.php:1968
-#: templates/columns_definitions/column_indexes.phtml:27
-#: templates/structure/check_all_table_column.phtml:37
-msgid "Spatial"
-msgstr "Spacial (hapësinor)"
-
-#: libraries/controllers/StructureController.class.php:1964
-#: libraries/controllers/StructureController.class.php:1969
-#: templates/columns_definitions/column_indexes.phtml:22
-#: templates/structure/check_all_table_column.phtml:47
-msgid "Fulltext"
-msgstr "Tekst i plotë"
-
-#: libraries/controllers/StructureController.class.php:1970
-msgid "Distinct values"
-msgstr "Vlerat e dallueshme"
-
 #: libraries/controllers/TableChartController.class.php:82
 #: libraries/controllers/TableGisVisualizationController.class.php:101
 msgid "No SQL query was set to fetch data."
@@ -8210,11 +8158,18 @@ msgstr "Nuk ka kolona numerike të prezantuara në tabelën e komplotit."
 msgid "No data to display"
 msgstr "Nuk ka të dhëna për të shfaqur"
 
-#: libraries/controllers/TableRelationController.class.php:217
+#: libraries/controllers/TableIndexesController.class.php:161
+#: libraries/controllers/TableStructureController.class.php:736
+#: tbl_addfield.php:92
+#, php-format
+msgid "Table %1$s has been altered successfully."
+msgstr "Tabela %1$s është alternuar me sukses."
+
+#: libraries/controllers/TableRelationController.class.php:218
 msgid "Display column was successfully updated."
 msgstr "Shfaqja e kolonës u aktualizua me sukses."
 
-#: libraries/controllers/TableRelationController.class.php:283
+#: libraries/controllers/TableRelationController.class.php:288
 msgid "Internal relations were successfully updated."
 msgstr "Relacionet e brendshme u aktualizuan me sukses."
 
@@ -8227,10 +8182,71 @@ msgid "Zoom search"
 msgstr "Kërkimi zoom"
 
 #: libraries/controllers/TableSearchController.class.php:852
-#: templates/table/selection_form.phtml:59
+#: templates/table/search/selection_form.phtml:59
 msgid "Find and replace"
 msgstr "Gjej dhe zëvendëso"
 
+#: libraries/controllers/TableStructureController.class.php:163
+#, php-format
+msgid "The name '%s' is a MySQL reserved keyword."
+msgid_plural "The names '%s' are MySQL reserved keywords."
+msgstr[0] "Emri '%s' është një fjalë kyçe e rezervuar MySQL."
+msgstr[1] "Emrat '%s' janë fjalë kyçe të rezervuara MySQL."
+
+#: libraries/controllers/TableStructureController.class.php:241
+msgid "No column selected."
+msgstr "Nuk është zgjedhur kolona."
+
+#: libraries/controllers/TableStructureController.class.php:467
+msgid "The columns have been moved successfully."
+msgstr "Kolonat kanë lëvizur me sukses."
+
+#: libraries/controllers/TableStructureController.class.php:730
+#, php-format
+msgid ""
+"Table %1$s has been altered successfully. Privileges have been adjusted."
+msgstr "Tabela %1$s është alternuar me sukses. Privilegjet janë përshtatur."
+
+#: libraries/controllers/TableStructureController.class.php:783
+#: libraries/tracking.lib.php:1094
+msgid "Query error"
+msgstr "Gabim pyetsori"
+
+#: libraries/controllers/TableStructureController.class.php:948
+#: templates/table/structure/check_all_table_column.phtml:11
+msgid "Change"
+msgstr "Ndrysho"
+
+#: libraries/controllers/TableStructureController.class.php:952
+#: libraries/controllers/TableStructureController.class.php:957
+#: libraries/navigation/Nodes/Node_Index.class.php:30
+#: libraries/tracking.lib.php:926
+#: templates/columns_definitions/column_indexes.phtml:16
+#: templates/columns_definitions/table_fields_definitions.phtml:57
+#: templates/table/structure/check_all_table_column.phtml:30
+#: templates/table/structure/display_structure.phtml:79
+#: templates/table/structure/display_table_stats.phtml:19
+msgid "Index"
+msgstr "Indeksi"
+
+#: libraries/controllers/TableStructureController.class.php:954
+#: libraries/controllers/TableStructureController.class.php:959
+#: templates/columns_definitions/column_indexes.phtml:27
+#: templates/table/structure/check_all_table_column.phtml:37
+msgid "Spatial"
+msgstr "Spacial (hapësinor)"
+
+#: libraries/controllers/TableStructureController.class.php:955
+#: libraries/controllers/TableStructureController.class.php:960
+#: templates/columns_definitions/column_indexes.phtml:22
+#: templates/table/structure/check_all_table_column.phtml:47
+msgid "Fulltext"
+msgstr "Tekst i plotë"
+
+#: libraries/controllers/TableStructureController.class.php:963
+msgid "Distinct values"
+msgstr "Vlerat e dallueshme"
+
 #: libraries/core.lib.php:306
 #, php-format
 msgid "The %s extension is missing. Please check your PHP configuration."
@@ -8278,7 +8294,7 @@ msgid "No Password"
 msgstr "Nuk ka fjalëkalim"
 
 #: libraries/display_change_password.lib.php:68
-#: libraries/plugins/auth/AuthenticationCookie.class.php:199
+#: libraries/plugins/auth/AuthenticationCookie.class.php:187
 #: libraries/replication_gui.lib.php:422 libraries/replication_gui.lib.php:862
 #: libraries/server_privileges.lib.php:1640
 msgid "Password:"
@@ -9094,12 +9110,12 @@ msgid "Dump has been saved to file %s."
 msgstr "Zbrazja është ruajtur tek fili %s."
 
 #: libraries/import.lib.php:202 libraries/insert_edit.lib.php:124
-#: libraries/rte/rte_routines.lib.php:1353 libraries/sql.lib.php:1312
+#: libraries/rte/rte_routines.lib.php:1444 libraries/sql.lib.php:1306
 #: tbl_get_field.php:44
 msgid "MySQL returned an empty result set (i.e. zero rows)."
 msgstr "MySQL ktheu një set rezultati të zbrazët (psh. zero radhë)."
 
-#: libraries/import.lib.php:265 libraries/sql.lib.php:1326
+#: libraries/import.lib.php:265 libraries/sql.lib.php:1320
 msgid "[ROLLBACK occurred.]"
 msgstr "[RIKTHIMI u shfaq.]"
 
@@ -9168,14 +9184,14 @@ msgstr "Krijo një indeks në &nbsp;%s&nbsp;kolona"
 
 #: libraries/insert_edit.lib.php:233
 #: libraries/navigation/Nodes/Node_DatabaseChild.class.php:48
-#: templates/designer/table_list.phtml:40
+#: templates/database/designer/table_list.phtml:40
 msgid "Hide"
 msgstr "Fsheh"
 
 #: libraries/insert_edit.lib.php:249
 #: libraries/navigation/Nodes/Node_Function.class.php:32
-#: libraries/rte/rte_routines.lib.php:1495
-#: templates/table/table_header.phtml:4
+#: libraries/rte/rte_routines.lib.php:1586
+#: templates/table/search/table_header.phtml:4
 msgid "Function"
 msgstr "Funksioni"
 
@@ -9189,84 +9205,85 @@ msgid "Because of its length,<br /> this column might not be editable."
 msgstr ""
 "Për arsye të gjatësisë,<br /> kjo kolonë mund të mos jetë e korrigjueshme."
 
-#: libraries/insert_edit.lib.php:1050
+#: libraries/insert_edit.lib.php:1048
 msgid "Binary - do not edit"
 msgstr "Binar - mos korrigjo"
 
-#: libraries/insert_edit.lib.php:1176 libraries/server_privileges.lib.php:470
-#: templates/table/options.phtml:36
+#: libraries/insert_edit.lib.php:1174 libraries/server_privileges.lib.php:470
+#: templates/table/search/options.phtml:36
 msgid "Or"
 msgstr "Ose"
 
-#: libraries/insert_edit.lib.php:1177
+#: libraries/insert_edit.lib.php:1175
 msgid "web server upload directory:"
 msgstr "drejtoria e ngarkimit në ueb server:"
 
-#: libraries/insert_edit.lib.php:1348 templates/table/input_box.phtml:49
+#: libraries/insert_edit.lib.php:1346
+#: templates/table/search/input_box.phtml:49
 msgid "Edit/Insert"
 msgstr "Korrigjo/Fut"
 
-#: libraries/insert_edit.lib.php:1398
+#: libraries/insert_edit.lib.php:1396
 #, php-format
 msgid "Continue insertion with %s rows"
 msgstr "Vazhdo futjen me %s radhë"
 
-#: libraries/insert_edit.lib.php:1428
+#: libraries/insert_edit.lib.php:1426
 msgid "and then"
 msgstr "dhe pastaj"
 
-#: libraries/insert_edit.lib.php:1461
+#: libraries/insert_edit.lib.php:1459
 msgid "Insert as new row"
 msgstr "Fut si radhë të re"
 
-#: libraries/insert_edit.lib.php:1464
+#: libraries/insert_edit.lib.php:1462
 msgid "Insert as new row and ignore errors"
 msgstr "Fut si radhë të re dhe injoro gabimet"
 
-#: libraries/insert_edit.lib.php:1467
+#: libraries/insert_edit.lib.php:1465
 msgid "Show insert query"
 msgstr "Shfaq fut pyetsorin"
 
-#: libraries/insert_edit.lib.php:1487
+#: libraries/insert_edit.lib.php:1485
 msgid "Go back to previous page"
 msgstr "Kthehu tek faqja më përpara"
 
-#: libraries/insert_edit.lib.php:1490
+#: libraries/insert_edit.lib.php:1488
 msgid "Insert another new row"
 msgstr "Fut një radhë tjetër"
 
-#: libraries/insert_edit.lib.php:1495
+#: libraries/insert_edit.lib.php:1493
 msgid "Go back to this page"
 msgstr "Kthehu tek kjo faqe"
 
-#: libraries/insert_edit.lib.php:1518
+#: libraries/insert_edit.lib.php:1516
 msgid "Edit next row"
 msgstr "Korrigjo radhën tjetër"
 
-#: libraries/insert_edit.lib.php:1540
+#: libraries/insert_edit.lib.php:1538
 msgid ""
 "Use TAB key to move from value to value, or CTRL+arrows to move anywhere"
 msgstr ""
 "Përdor tastin TAB (tabelor) për të lëvizur nga një vlerë te tjetra, ose CTRL"
 "+shigjeta për të lëvizur kudo"
 
-#: libraries/insert_edit.lib.php:1577 libraries/replication_gui.lib.php:542
-#: libraries/rte/rte_routines.lib.php:1497
+#: libraries/insert_edit.lib.php:1575 libraries/replication_gui.lib.php:542
+#: libraries/rte/rte_routines.lib.php:1588
 #: libraries/server_status_variables.lib.php:220
-#: templates/designer/having_query_panel.phtml:100
-#: templates/designer/options_panel.phtml:73
-#: templates/designer/options_panel.phtml:239
-#: templates/designer/where_query_panel.phtml:69
-#: templates/table/table_header.phtml:10
-#: templates/table/zoom_result_form.phtml:35
+#: templates/database/designer/having_query_panel.phtml:100
+#: templates/database/designer/options_panel.phtml:73
+#: templates/database/designer/options_panel.phtml:239
+#: templates/database/designer/where_query_panel.phtml:69
+#: templates/table/search/table_header.phtml:10
+#: templates/table/search/zoom_result_form.phtml:35
 msgid "Value"
 msgstr "Vlera"
 
-#: libraries/insert_edit.lib.php:1937 libraries/sql.lib.php:1309
+#: libraries/insert_edit.lib.php:1935 libraries/sql.lib.php:1303
 msgid "Showing SQL query"
 msgstr "Shfaqën pyetsorin SQL"
 
-#: libraries/insert_edit.lib.php:1962 libraries/sql.lib.php:1287
+#: libraries/insert_edit.lib.php:1960 libraries/sql.lib.php:1281
 #, php-format
 msgid "Inserted row id: %1$d"
 msgstr "ID e radhës së futur: %1$d"
@@ -9676,7 +9693,7 @@ msgstr "I ri"
 #: libraries/navigation/Nodes/Node_View_Container.class.php:26
 #: libraries/navigation/Nodes/Node_View_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:129
-#: templates/structure/show_create.phtml:30
+#: templates/database/structure/show_create.phtml:30
 msgid "Views"
 msgstr "Shfaqje"
 
@@ -10013,7 +10030,7 @@ msgstr "Nuk keni privilegje të mjaftueshme të jeni këtu tani!"
 
 #: libraries/operations.lib.php:101 libraries/operations.lib.php:249
 #: libraries/operations.lib.php:869 libraries/operations.lib.php:963
-#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:907
+#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:998
 #: templates/columns_definitions/table_fields_definitions.phtml:47
 msgid "Adjust Privileges"
 msgstr "Përshtat privilegjet"
@@ -10103,22 +10120,22 @@ msgid "Switch to copied table"
 msgstr "Kalo tek tabela e kopjuar"
 
 #: libraries/operations.lib.php:1360
-#: templates/structure/check_all_tables.phtml:18
+#: templates/database/structure/check_all_tables.phtml:18
 msgid "Table maintenance"
 msgstr "Mirëmbajta e tabelës"
 
 #: libraries/operations.lib.php:1398
-#: templates/structure/check_all_tables.phtml:19
+#: templates/database/structure/check_all_tables.phtml:19
 msgid "Analyze table"
 msgstr "Tabela e analizës"
 
 #: libraries/operations.lib.php:1413
-#: templates/structure/check_all_tables.phtml:20
+#: templates/database/structure/check_all_tables.phtml:20
 msgid "Check table"
 msgstr "Kontrollo tabelën"
 
 #: libraries/operations.lib.php:1428
-#: templates/structure/check_all_tables.phtml:22
+#: templates/database/structure/check_all_tables.phtml:22
 msgid "Checksum table"
 msgstr "Tabela e kontrollshumës"
 
@@ -10136,18 +10153,19 @@ msgid "Flush the table (FLUSH)"
 msgstr "Zbraz tabelën (FLUSH)"
 
 #: libraries/operations.lib.php:1477
-#: templates/structure/check_all_tables.phtml:23
-#: templates/structure/display_table_stats.phtml:56
+#: templates/database/structure/check_all_tables.phtml:23
+#: templates/table/structure/display_table_stats.phtml:56
 msgid "Optimize table"
 msgstr "Optimizo tabelë"
 
 #: libraries/operations.lib.php:1492
-#: templates/structure/check_all_tables.phtml:24
+#: templates/database/structure/check_all_tables.phtml:24
 msgid "Repair table"
 msgstr "Riparo tabelën"
 
 #: libraries/operations.lib.php:1538
-#: templates/structure/check_all_tables.phtml:14 view_operations.php:127
+#: templates/database/structure/check_all_tables.phtml:14
+#: view_operations.php:127
 msgid "Delete data or table"
 msgstr "Fshij të dhënat ose tabelat"
 
@@ -10268,7 +10286,7 @@ msgid "Cannot connect: invalid settings."
 msgstr "Nuk mund lidhet: rregullime të pavlefshme."
 
 #: libraries/plugins/auth/AuthenticationConfig.class.php:108
-#: libraries/plugins/auth/AuthenticationCookie.class.php:134
+#: libraries/plugins/auth/AuthenticationCookie.class.php:122
 #: libraries/plugins/auth/AuthenticationHttp.class.php:96
 #, php-format
 msgid "Welcome to %s"
@@ -10299,38 +10317,38 @@ msgstr ""
 msgid "Retry to connect"
 msgstr "Riprovo të lidhesh"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:146
+#: libraries/plugins/auth/AuthenticationCookie.class.php:134
 msgid "Your session has expired. Please log in again."
 msgstr "Sesioni juaj ka skaduar. Ju lutemi hyni përsëri."
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:170
+#: libraries/plugins/auth/AuthenticationCookie.class.php:158
 msgid "Log in"
 msgstr "Hyrje"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:178
-#: libraries/plugins/auth/AuthenticationCookie.class.php:188
+#: libraries/plugins/auth/AuthenticationCookie.class.php:166
+#: libraries/plugins/auth/AuthenticationCookie.class.php:176
 msgid "You can enter hostname/IP address and port separated by space."
 msgstr ""
 "Mund të futni emrin e pritësit hostname/adresën IP dhe portën e ndarë me "
 "hapësirë."
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:193
+#: libraries/plugins/auth/AuthenticationCookie.class.php:181
 msgid "Username:"
 msgstr "Emri i përdoruesit:"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:205
+#: libraries/plugins/auth/AuthenticationCookie.class.php:193
 msgid "Server Choice:"
 msgstr "Zgjedhja e serverit:"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:386
+#: libraries/plugins/auth/AuthenticationCookie.class.php:374
 msgid "Entered captcha is wrong, try again!"
 msgstr "Captcha e futur është gabim, provo përsëri!"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:396
+#: libraries/plugins/auth/AuthenticationCookie.class.php:384
 msgid "Please enter correct captcha!"
 msgstr "Ju lutem, fut një captcha të saktë!"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:423
+#: libraries/plugins/auth/AuthenticationCookie.class.php:411
 msgid "You are not allowed to log in to this MySQL server!"
 msgstr "Nuk lejoheni të hyni në këtë server MySQL!"
 
@@ -10427,7 +10445,7 @@ msgstr "Ngjarje"
 #: libraries/plugins/export/ExportOdt.class.php:593
 #: libraries/plugins/export/ExportTexytext.class.php:428
 #: libraries/plugins/export/PMA_ExportPdf.class.php:313
-#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:984
 #: libraries/rte/rte_triggers.lib.php:377
 msgid "Definition"
 msgstr "Përkufizimi"
@@ -10749,7 +10767,7 @@ msgid "Last check:"
 msgstr "Kontrolli i fundit:"
 
 #: libraries/plugins/export/ExportSql.class.php:1399
-#: templates/structure/structure_table_row.phtml:183
+#: templates/database/structure/structure_table_row.phtml:183
 msgid "in use"
 msgstr "në përdorim"
 
@@ -10943,18 +10961,14 @@ msgstr "Zgjerimi i hapësirës MySQL nuk e mbështet tipin ESRI \"%s\"."
 msgid "The imported file does not contain any data!"
 msgstr "Fili i importuar nuk përmban ndonjë të dhënë!"
 
-#: libraries/plugins/import/ImportSql.class.php:169
+#: libraries/plugins/import/ImportSql.class.php:72
 msgid "SQL compatibility mode:"
 msgstr "SQL mënyrë e përshtatshme:"
 
-#: libraries/plugins/import/ImportSql.class.php:181
+#: libraries/plugins/import/ImportSql.class.php:84
 msgid "Do not use <code>AUTO_INCREMENT</code> for zero values"
 msgstr "Mos përdor <code>AUTO_INCREMENT</code> për vlerat zero"
 
-#: libraries/plugins/import/ImportSql.class.php:195
-msgid "Read as multibytes"
-msgstr "Lexo si multibajt"
-
 #: libraries/plugins/import/ImportXml.class.php:54
 msgid "XML"
 msgstr "XML"
@@ -10997,7 +11011,7 @@ msgid "Show grid"
 msgstr "Shfaq rrjetën"
 
 #: libraries/plugins/schema/SchemaPdf.class.php:94
-#: templates/structure/print_view_data_dictionary_link.phtml:6
+#: templates/database/structure/print_view_data_dictionary_link.phtml:6
 msgid "Data Dictionary"
 msgstr "Fjalori i të dhënave"
 
@@ -11022,7 +11036,7 @@ msgid "The %s table doesn't exist!"
 msgstr "Tabela %s nuk ekziston!"
 
 #: libraries/plugins/schema/eps/Eps_Relation_Schema.class.php:321
-#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:309
+#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:323
 #, php-format
 msgid "Schema of the %s database - Page %s"
 msgstr "Skema e databazës %s - Faqe %s"
@@ -11048,7 +11062,7 @@ msgstr "Tabela e përmajtjes"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1005
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1028
 #: libraries/tracking.lib.php:884
-#: templates/structure/table_structure_header.phtml:11
+#: templates/table/structure/table_structure_header.phtml:11
 msgid "Extra"
 msgstr "Ekstra"
 
@@ -11416,11 +11430,11 @@ msgstr "Hapat e shpejtë për të rregulluar tiparet e avancuara:"
 msgid "Create the needed tables with the <code>%screate_tables.sql</code>."
 msgstr "Krijo tabelat e nevojshme me <code>%screate_tables.sql</code>."
 
-#: libraries/relation.lib.php:360
+#: libraries/relation.lib.php:357
 msgid "Create a pma user and give access to these tables."
 msgstr "Krijo një përdorues pma dhe jepi hyrje këtyre tabelave."
 
-#: libraries/relation.lib.php:365
+#: libraries/relation.lib.php:360
 msgid ""
 "Enable advanced features in configuration file (<code>config.inc.php</"
 "code>), for example by starting from <code>config.sample.inc.php</code>."
@@ -11428,16 +11442,16 @@ msgstr ""
 "Aftëso tiparet e avancuara në filin e konfigurimit (<code>config.inc.php</"
 "code>), për shembull duke filluar nga <code>config.sample.inc.php</code>."
 
-#: libraries/relation.lib.php:373
+#: libraries/relation.lib.php:365
 msgid "Re-login to phpMyAdmin to load the updated configuration file."
 msgstr ""
 "Ri-hyj në phpMyAdmin, për të ngarkuar filin e aktualizuar të konfigurimit."
 
-#: libraries/relation.lib.php:1612
+#: libraries/relation.lib.php:1607
 msgid "no description"
 msgstr "nuk ka përshkrim"
 
-#: libraries/relation.lib.php:1811
+#: libraries/relation.lib.php:1806
 msgid ""
 "You do not have necessary privileges to create a database named "
 "'phpmyadmin'. You may go to 'Operations' tab of any database to set up the "
@@ -11447,7 +11461,7 @@ msgstr ""
 "'phpmyadmin'. Ju mund të shkoni në tabelorin 'Veprimet'  të çdo databaze, "
 "për të rregulluar ruajtjen e konfigurimit phpMyAdmin atje."
 
-#: libraries/relation.lib.php:1928
+#: libraries/relation.lib.php:1923
 #, php-format
 msgid ""
 "%sCreate%s a database named 'phpmyadmin' and setup the phpMyAdmin "
@@ -11456,19 +11470,19 @@ msgstr ""
 "%sKrijo%s një databazë me emrin 'phpmyadmin' dhe rregullo ruajtjen e "
 "konfigurimit të phpMyAdmin atje."
 
-#: libraries/relation.lib.php:1936
+#: libraries/relation.lib.php:1931
 #, php-format
 msgid ""
 "%sCreate%s the phpMyAdmin configuration storage in the current database."
 msgstr "%sKrijo%s ruajtjen e konfigurimit phpMyAdmin në databazën aktuale."
 
-#: libraries/relation.lib.php:1944
+#: libraries/relation.lib.php:1939
 #, php-format
 msgid "%sCreate%s missing phpMyAdmin configuration storage tables."
 msgstr "%sKrijo%s mungon në tabelat e ruajtjes së konfigurimit phpMyAdmin."
 
 #: libraries/replication_gui.lib.php:46 libraries/replication_gui.lib.php:343
-#: libraries/server_databases.lib.php:387
+#: libraries/server_databases.lib.php:398
 msgid "Master replication"
 msgstr "Replikimi master"
 
@@ -11540,7 +11554,7 @@ msgstr ""
 "konfiguruar si master."
 
 #: libraries/replication_gui.lib.php:141
-#: libraries/server_databases.lib.php:389
+#: libraries/server_databases.lib.php:400
 msgid "Slave replication"
 msgstr "Replikimi skllav (slave)"
 
@@ -11815,10 +11829,10 @@ msgid "Master server changed successfully to %s."
 msgstr "Serveri master ka ndryshuar me sukses në %s."
 
 #: libraries/rte/rte_events.lib.php:106 libraries/rte/rte_events.lib.php:115
-#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:149
-#: libraries/rte/rte_routines.lib.php:158
-#: libraries/rte/rte_routines.lib.php:231
-#: libraries/rte/rte_routines.lib.php:1362
+#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:219
+#: libraries/rte/rte_routines.lib.php:246
+#: libraries/rte/rte_routines.lib.php:368
+#: libraries/rte/rte_routines.lib.php:1453
 #: libraries/rte/rte_triggers.lib.php:82 libraries/rte/rte_triggers.lib.php:91
 #: libraries/rte/rte_triggers.lib.php:123
 #, php-format
@@ -11839,7 +11853,7 @@ msgstr "Ngjarja %1$s është modifikuar."
 msgid "Event %1$s has been created."
 msgstr "Ngjarja %1$s është krijuar."
 
-#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:251
+#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:266
 #: libraries/rte/rte_triggers.lib.php:144
 msgid "One or more errors have occurred while processing your request:"
 msgstr ""
@@ -11849,7 +11863,7 @@ msgstr ""
 msgid "Edit event"
 msgstr "Korrigjo ngjarjen"
 
-#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:794
+#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:885
 #: libraries/rte/rte_triggers.lib.php:323 view_create.php:180
 msgid "Details"
 msgstr "Detajet"
@@ -11862,7 +11876,7 @@ msgstr "Emri i ngjarjes"
 msgid "Event type"
 msgstr "Tipi i ngjarjes"
 
-#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:817
+#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:908
 #, php-format
 msgid "Change to %s"
 msgstr "Ndrysho tek %s"
@@ -11889,12 +11903,14 @@ msgstr "Fund"
 msgid "On completion preserve"
 msgstr "Në përfundim ruaj"
 
-#: libraries/rte/rte_events.lib.php:491 libraries/rte/rte_routines.lib.php:930
+#: libraries/rte/rte_events.lib.php:491
+#: libraries/rte/rte_routines.lib.php:1021
 #: libraries/rte/rte_triggers.lib.php:383 view_create.php:209
 msgid "Definer"
 msgstr "Përcaktuesi"
 
-#: libraries/rte/rte_events.lib.php:535 libraries/rte/rte_routines.lib.php:997
+#: libraries/rte/rte_events.lib.php:535
+#: libraries/rte/rte_routines.lib.php:1088
 #: libraries/rte/rte_triggers.lib.php:422
 msgid "The definer must be in the \"username@hostname\" format!"
 msgstr "Përcaktuesi duhet të jetë në formatin \"username@hostname\"!"
@@ -11920,9 +11936,9 @@ msgid "You must provide an event definition."
 msgstr "Duhet të siguroni një përcaktim për ngjarjen."
 
 #: libraries/rte/rte_export.lib.php:43 libraries/rte/rte_general.lib.php:72
-#: libraries/rte/rte_routines.lib.php:345
-#: libraries/rte/rte_routines.lib.php:1198
-#: libraries/rte/rte_routines.lib.php:1411
+#: libraries/rte/rte_routines.lib.php:153
+#: libraries/rte/rte_routines.lib.php:1289
+#: libraries/rte/rte_routines.lib.php:1502
 msgid "Error in processing request:"
 msgstr "Gabim në proçesimin e kërkesës:"
 
@@ -11958,96 +11974,96 @@ msgstr ""
 "ruajtura mund të dështojë![/strong] Ju lutem, përdor zgjerimin 'mysqli' të "
 "përmirësuar, për të shmangur ndonjë problem."
 
-#: libraries/rte/rte_routines.lib.php:110
-#: libraries/rte/rte_routines.lib.php:1006
+#: libraries/rte/rte_routines.lib.php:123
+msgid "Edit routine"
+msgstr "Korrigjo rutinën"
+
+#: libraries/rte/rte_routines.lib.php:200
+#: libraries/rte/rte_routines.lib.php:1097
 #, php-format
 msgid "Invalid routine type: \"%s\""
 msgstr "Tip rutine i pavlefshëm: \"%s\""
 
-#: libraries/rte/rte_routines.lib.php:170
-msgid "Sorry, we failed to restore the dropped routine."
-msgstr "Na vjen keq, dështuam në rikthimin e rutinës së fshirë."
-
-#: libraries/rte/rte_routines.lib.php:211
-#, php-format
-msgid "Routine %1$s has been modified. Privileges have been adjusted."
-msgstr "Rutina %1$s është modifikuar. Privilegjet janë përshtatur."
-
-#: libraries/rte/rte_routines.lib.php:216
-#, php-format
-msgid "Routine %1$s has been modified."
-msgstr "Rutina %1$s është modifikuar."
-
-#: libraries/rte/rte_routines.lib.php:238
+#: libraries/rte/rte_routines.lib.php:253
 #, php-format
 msgid "Routine %1$s has been created."
 msgstr "Rutina %1$s është krijuar."
 
-#: libraries/rte/rte_routines.lib.php:315
-msgid "Edit routine"
-msgstr "Korrigjo rutinën"
+#: libraries/rte/rte_routines.lib.php:380
+msgid "Sorry, we failed to restore the dropped routine."
+msgstr "Na vjen keq, dështuam në rikthimin e rutinës së fshirë."
 
-#: libraries/rte/rte_routines.lib.php:797
+#: libraries/rte/rte_routines.lib.php:439
+#, php-format
+msgid "Routine %1$s has been modified. Privileges have been adjusted."
+msgstr "Rutina %1$s është modifikuar. Privilegjet janë përshtatur."
+
+#: libraries/rte/rte_routines.lib.php:444
+#, php-format
+msgid "Routine %1$s has been modified."
+msgstr "Rutina %1$s është modifikuar."
+
+#: libraries/rte/rte_routines.lib.php:888
 msgid "Routine name"
 msgstr "Emri rutinë"
 
-#: libraries/rte/rte_routines.lib.php:823
+#: libraries/rte/rte_routines.lib.php:914
 msgid "Parameters"
 msgstr "Parametrat"
 
-#: libraries/rte/rte_routines.lib.php:829
+#: libraries/rte/rte_routines.lib.php:920
 msgid "Direction"
 msgstr "Drejtim"
 
-#: libraries/rte/rte_routines.lib.php:847
+#: libraries/rte/rte_routines.lib.php:938
 msgid "Add parameter"
 msgstr "Shto parametër"
 
-#: libraries/rte/rte_routines.lib.php:851
+#: libraries/rte/rte_routines.lib.php:942
 msgid "Remove last parameter"
 msgstr "Largo parametrin e fundit"
 
-#: libraries/rte/rte_routines.lib.php:856
+#: libraries/rte/rte_routines.lib.php:947
 msgid "Return type"
 msgstr "Tipi i kthimit"
 
-#: libraries/rte/rte_routines.lib.php:862
+#: libraries/rte/rte_routines.lib.php:953
 msgid "Return length/values"
 msgstr "Kthe gjatësinë/verat"
 
-#: libraries/rte/rte_routines.lib.php:868
+#: libraries/rte/rte_routines.lib.php:959
 msgid "Return options"
 msgstr "Opsionet e kthimit"
 
-#: libraries/rte/rte_routines.lib.php:899
+#: libraries/rte/rte_routines.lib.php:990
 msgid "Is deterministic"
 msgstr "Është përcaktuese"
 
-#: libraries/rte/rte_routines.lib.php:920
+#: libraries/rte/rte_routines.lib.php:1011
 msgid ""
 "You do not have sufficient privileges to perform this operation; Please "
 "refer to the documentation for more details"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:935
+#: libraries/rte/rte_routines.lib.php:1026
 msgid "Security type"
 msgstr "Tipi i sigurisë"
 
-#: libraries/rte/rte_routines.lib.php:944
+#: libraries/rte/rte_routines.lib.php:1035
 msgid "SQL data access"
 msgstr "SQL hyrje e të dhënave"
 
-#: libraries/rte/rte_routines.lib.php:1013
+#: libraries/rte/rte_routines.lib.php:1104
 msgid "You must provide a routine name!"
 msgstr "Duhet të siguroni një emër rutinë!"
 
-#: libraries/rte/rte_routines.lib.php:1047
+#: libraries/rte/rte_routines.lib.php:1138
 #, php-format
 msgid "Invalid direction \"%s\" given for parameter."
 msgstr "Drejtim i pavlefshëm \"%s\" i dhënë për parametrin."
 
-#: libraries/rte/rte_routines.lib.php:1069
-#: libraries/rte/rte_routines.lib.php:1131
+#: libraries/rte/rte_routines.lib.php:1160
+#: libraries/rte/rte_routines.lib.php:1222
 msgid ""
 "You must provide length/values for routine parameters of type ENUM, SET, "
 "VARCHAR and VARBINARY."
@@ -12055,37 +12071,37 @@ msgstr ""
 "Duhet të siguroni gjatësinë/vlerat për parametrat rutinë të tipit ENUM, SET, "
 "VARCHAR dhe VARBINARY."
 
-#: libraries/rte/rte_routines.lib.php:1095
+#: libraries/rte/rte_routines.lib.php:1186
 msgid "You must provide a name and a type for each routine parameter."
 msgstr "Duhet të siguroni një emër dhe një tip për çdo parametër rutinë."
 
-#: libraries/rte/rte_routines.lib.php:1114
+#: libraries/rte/rte_routines.lib.php:1205
 msgid "You must provide a valid return type for the routine."
 msgstr "Duhet të siguroni një tip të vlefshëm të kthimit për rutinën."
 
-#: libraries/rte/rte_routines.lib.php:1174
+#: libraries/rte/rte_routines.lib.php:1265
 msgid "You must provide a routine definition."
 msgstr "Duhet të siguroni një përkufizim rutinë."
 
-#: libraries/rte/rte_routines.lib.php:1285
+#: libraries/rte/rte_routines.lib.php:1376
 #, php-format
 msgid "Execution results of routine %s"
 msgstr "Rezultatet e ekzekutimit të rutinës %s"
 
-#: libraries/rte/rte_routines.lib.php:1340
+#: libraries/rte/rte_routines.lib.php:1431
 #, php-format
 msgid "%d row affected by the last statement inside the procedure."
 msgid_plural "%d rows affected by the last statement inside the procedure."
 msgstr[0] "%d radhë e ndikuar nga deklarata e fundit brenda procedurës."
 msgstr[1] "%d radhë të ndikuara nga deklarata e fundit brenda procedurës."
 
-#: libraries/rte/rte_routines.lib.php:1398
-#: libraries/rte/rte_routines.lib.php:1406
+#: libraries/rte/rte_routines.lib.php:1489
+#: libraries/rte/rte_routines.lib.php:1497
 msgid "Execute routine"
 msgstr "Ekzekuto rutinën"
 
-#: libraries/rte/rte_routines.lib.php:1485
-#: libraries/rte/rte_routines.lib.php:1488
+#: libraries/rte/rte_routines.lib.php:1576
+#: libraries/rte/rte_routines.lib.php:1579
 msgid "Routine parameters"
 msgstr "Parametrat rutinë"
 
@@ -12239,7 +12255,7 @@ msgid "Original position"
 msgstr "Pozicioni origjinal"
 
 #: libraries/server_bin_log.lib.php:133
-#: templates/structure/display_table_stats.phtml:4
+#: templates/table/structure/display_table_stats.phtml:4
 msgid "Information"
 msgstr "Informacioni"
 
@@ -12277,12 +12293,12 @@ msgstr ""
 "Shënim: Aftësimi i statistikave të databazës, mund të shkaktojë trafik të "
 "rënduar ndërmjet ueb serverit dhe serverit MySQL."
 
-#: libraries/server_databases.lib.php:364
-#: libraries/server_databases.lib.php:365
+#: libraries/server_databases.lib.php:366
+#: libraries/server_databases.lib.php:371
 msgid "Enable Statistics"
 msgstr "Aftëso statistikat"
 
-#: libraries/server_databases.lib.php:481
+#: libraries/server_databases.lib.php:492
 #, php-format
 msgid "%1$d database has been dropped successfully."
 msgid_plural "%1$d databases have been dropped successfully."
@@ -12657,7 +12673,7 @@ msgid "You have revoked the privileges for %s."
 msgstr "Keni anuluar privilegjet për %s."
 
 #: libraries/server_privileges.lib.php:2059
-#: libraries/server_privileges.lib.php:4290
+#: libraries/server_privileges.lib.php:4316
 #, fuzzy
 #| msgid "Add user group"
 msgid "Add user account"
@@ -12838,40 +12854,40 @@ msgstr "Fshin %s"
 msgid "The privileges were reloaded successfully."
 msgstr "Privilegjet u ri-ngarkuan me sukses."
 
-#: libraries/server_privileges.lib.php:3994
+#: libraries/server_privileges.lib.php:4003
 #, php-format
 msgid "The user %s already exists!"
 msgstr "Përdoruesi %s ekziston ndërkohë!"
 
-#: libraries/server_privileges.lib.php:4232
+#: libraries/server_privileges.lib.php:4258
 #, php-format
 msgid "Privileges for %s"
 msgstr "Privilegjet për %s"
 
-#: libraries/server_privileges.lib.php:4241
+#: libraries/server_privileges.lib.php:4267
 #: libraries/server_status_processes.lib.php:72
 #: libraries/server_user_groups.lib.php:39
 msgid "User"
 msgstr "Përdoruesi"
 
-#: libraries/server_privileges.lib.php:4282
+#: libraries/server_privileges.lib.php:4308
 msgctxt "Create new user"
 msgid "New"
 msgstr "I ri"
 
-#: libraries/server_privileges.lib.php:4311
+#: libraries/server_privileges.lib.php:4337
 #, fuzzy
 #| msgid "Edit Privileges:"
 msgid "Edit privileges:"
 msgstr "Korrigjo privilegjet:"
 
-#: libraries/server_privileges.lib.php:4312
+#: libraries/server_privileges.lib.php:4338
 #, fuzzy
 #| msgid "User group"
 msgid "User account"
 msgstr "Grup përdoruesi"
 
-#: libraries/server_privileges.lib.php:4371
+#: libraries/server_privileges.lib.php:4397
 msgid ""
 "Note: You are attempting to edit privileges of the user with which you are "
 "currently logged in."
@@ -12879,20 +12895,20 @@ msgstr ""
 "Shënim: Jeni përpjekur për të korrigjuar privilegjet e përdoruesit, me të "
 "cilën keni hyrë aktualisht."
 
-#: libraries/server_privileges.lib.php:4391 libraries/server_users.lib.php:25
+#: libraries/server_privileges.lib.php:4417 libraries/server_users.lib.php:25
 #, fuzzy
 #| msgid "Users overview"
 msgid "User accounts overview"
 msgstr "Pamja e përgjithshme e përdoruesve"
 
-#: libraries/server_privileges.lib.php:4459
+#: libraries/server_privileges.lib.php:4485
 msgid ""
 "A user account allowing any user from localhost to connect is present. This "
 "will prevent other users from connecting if the host part of their account "
 "allows a connection from any (%) host."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4500
+#: libraries/server_privileges.lib.php:4526
 #, php-format
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
@@ -12905,7 +12921,7 @@ msgstr ""
 "privilegjet që përdor serveri, nëse ato janë ndryshuar manualisht. Në këtë "
 "rast, ju duhet të %sngarkoni privilegjet%s para se të vazhdoni."
 
-#: libraries/server_privileges.lib.php:4519
+#: libraries/server_privileges.lib.php:4545
 #, fuzzy
 #| msgid ""
 #| "Note: phpMyAdmin gets the users' privileges directly from MySQL's "
@@ -12924,25 +12940,25 @@ msgstr ""
 "privilegjet që përdor serveri, nëse ato janë ndryshuar manualisht. Në këtë "
 "rast, ju duhet të %sngarkoni privilegjet%s para se të vazhdoni."
 
-#: libraries/server_privileges.lib.php:4569
+#: libraries/server_privileges.lib.php:4595
 msgid "The selected user was not found in the privilege table."
 msgstr "Përdoruesi i zgjedhur nuk gjendet në tabelën e të drejtave."
 
-#: libraries/server_privileges.lib.php:4801
+#: libraries/server_privileges.lib.php:4827
 msgid "You have added a new user."
 msgstr "Keni shtuar një përdorues të ri."
 
-#: libraries/server_status.lib.php:53
+#: libraries/server_status.lib.php:60
 #, php-format
 msgid "Network traffic since startup: %s"
 msgstr "Trafiku i rrjetit që nga fillimi: %s"
 
-#: libraries/server_status.lib.php:66
+#: libraries/server_status.lib.php:73
 #, php-format
 msgid "This MySQL server has been running for %1$s. It started up on %2$s."
 msgstr "Ky MySQL server ka qenë në punë për %1$s. Ka filluar më %2$s."
 
-#: libraries/server_status.lib.php:80
+#: libraries/server_status.lib.php:94
 msgid ""
 "This MySQL server works as <b>master</b> and <b>slave</b> in <b>replication</"
 "b> process."
@@ -12950,20 +12966,20 @@ msgstr ""
 "Ky MySQL server punon si <b>master</b> dhe <b>slave</b> në procesin e "
 "<b>replikimit</b>."
 
-#: libraries/server_status.lib.php:85
+#: libraries/server_status.lib.php:99
 msgid "This MySQL server works as <b>master</b> in <b>replication</b> process."
 msgstr ""
 "Ky MySQL server punon si <b>master</b> në procesin e <b>replikimit</b>."
 
-#: libraries/server_status.lib.php:90
+#: libraries/server_status.lib.php:104
 msgid "This MySQL server works as <b>slave</b> in <b>replication</b> process."
 msgstr "Ky MySQL server punon si <b>slave</b> në procesin e <b>replikimit</b>."
 
-#: libraries/server_status.lib.php:106
+#: libraries/server_status.lib.php:116
 msgid "Replication status"
 msgstr "Statusi i replikimit"
 
-#: libraries/server_status.lib.php:137
+#: libraries/server_status.lib.php:146
 msgid ""
 "On a busy server, the byte counters may overrun, so those statistics as "
 "reported by the MySQL server may be incorrect."
@@ -12971,19 +12987,19 @@ msgstr ""
 "Në një server të zënë, numruesit e bajtëve mund të tejkalojnë, kështu që ato "
 "statistika që raportohen nga serveri MySQL mund të jenë jokorrekte."
 
-#: libraries/server_status.lib.php:148
+#: libraries/server_status.lib.php:157
 msgid "Received"
 msgstr "Marrë"
 
-#: libraries/server_status.lib.php:167
+#: libraries/server_status.lib.php:176
 msgid "Sent"
 msgstr "Dërguar"
 
-#: libraries/server_status.lib.php:234
+#: libraries/server_status.lib.php:243
 msgid "Max. concurrent connections"
 msgstr "Maks. i lidhjeve konkurrente"
 
-#: libraries/server_status.lib.php:244
+#: libraries/server_status.lib.php:253
 msgid "Failed attempts"
 msgstr "Përpjekje të dështuara"
 
@@ -14072,7 +14088,7 @@ msgstr ""
 msgid "Not implemented yet."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/AlterOperation.php:193
+#: libraries/sql-parser/src/Components/AlterOperation.php:191
 msgid "Unrecognized alter operation."
 msgstr ""
 
@@ -14086,7 +14102,7 @@ msgid "An opening bracket followed by a set of values was expected."
 msgstr ""
 
 #: libraries/sql-parser/src/Components/ArrayObj.php:101
-#: libraries/sql-parser/src/Components/FieldDefinition.php:202
+#: libraries/sql-parser/src/Components/CreateDefinition.php:202
 msgid "An opening bracket was expected."
 msgstr ""
 
@@ -14094,25 +14110,35 @@ msgstr ""
 msgid "A comma or a closing bracket was expected"
 msgstr ""
 
+#: libraries/sql-parser/src/Components/CreateDefinition.php:246
+#, fuzzy
+#| msgid "No tables selected."
+msgid "A comma or a closing bracket was expected."
+msgstr "Nuk është zgjedhur tabelë."
+
+#: libraries/sql-parser/src/Components/CreateDefinition.php:262
+msgid "A closing bracket was expected."
+msgstr ""
+
 #: libraries/sql-parser/src/Components/DataType.php:125
 msgid "Unrecognized data type."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:225
+#: libraries/sql-parser/src/Components/Expression.php:227
 msgid "Unexpected closing bracket."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:246
-#: libraries/sql-parser/src/Components/Expression.php:283
-#: libraries/sql-parser/src/Components/Expression.php:303
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:285
+#: libraries/sql-parser/src/Components/Expression.php:305
 msgid "An alias was previously found."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:257
+#: libraries/sql-parser/src/Components/Expression.php:259
 msgid "Unexpected dot."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:327
+#: libraries/sql-parser/src/Components/Expression.php:329
 #, fuzzy
 #| msgid "No tables selected."
 msgid "An alias was expected."
@@ -14124,16 +14150,6 @@ msgstr "Nuk është zgjedhur tabelë."
 msgid "An expression was expected."
 msgstr "Nuk janë zgjedhur versione."
 
-#: libraries/sql-parser/src/Components/FieldDefinition.php:246
-#, fuzzy
-#| msgid "No tables selected."
-msgid "A comma or a closing bracket was expected."
-msgstr "Nuk është zgjedhur tabelë."
-
-#: libraries/sql-parser/src/Components/FieldDefinition.php:262
-msgid "A closing bracket was expected."
-msgstr ""
-
 #: libraries/sql-parser/src/Components/Limit.php:90
 #: libraries/sql-parser/src/Components/Limit.php:112
 msgid "An offset was expected."
@@ -14181,29 +14197,29 @@ msgstr ""
 msgid "Expected delimiter."
 msgstr ""
 
-#: libraries/sql-parser/src/Lexer.php:753
+#: libraries/sql-parser/src/Lexer.php:777
 #, fuzzy, php-format
 #| msgid "Event %1$s has been created."
 msgid "Ending quote %1$s was expected."
 msgstr "Ngjarja %1$s është krijuar."
 
-#: libraries/sql-parser/src/Lexer.php:789
+#: libraries/sql-parser/src/Lexer.php:813
 #, fuzzy
 #| msgid "Table name template"
 msgid "Variable name was expected."
 msgstr "Modeli i emrit të tabelës"
 
-#: libraries/sql-parser/src/Parser.php:380
+#: libraries/sql-parser/src/Parser.php:391
 #, fuzzy
 #| msgid "at beginning of table"
 msgid "Unexpected beginning of statement."
 msgstr "në fillim të tabelës"
 
-#: libraries/sql-parser/src/Parser.php:399
+#: libraries/sql-parser/src/Parser.php:410
 msgid "Unrecognized statement type."
 msgstr ""
 
-#: libraries/sql-parser/src/Parser.php:479
+#: libraries/sql-parser/src/Parser.php:489
 msgid "No transaction was previously started."
 msgstr ""
 
@@ -14233,8 +14249,10 @@ msgid "The name of the entity was expected."
 msgstr "Numri i tabelave që janë hapur."
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:310
-msgid "At least one field definition was expected."
-msgstr ""
+#, fuzzy
+#| msgid "The row has been deleted."
+msgid "At least one column definition was expected."
+msgstr "Radha është fshirë."
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:329
 msgid "A \"RETURNS\" keyword was expected."
@@ -14293,11 +14311,11 @@ msgstr "Faqeruajtësi nuk është krijuar!"
 msgid "Using bookmark \"%s\" as default browse query."
 msgstr "Përdorimi i faqerojtësit \"%s\" si shfletues pyetsori standard."
 
-#: libraries/sql.lib.php:1306
+#: libraries/sql.lib.php:1300
 msgid "Showing as PHP code"
 msgstr "Shfaqën si kod PHP"
 
-#: libraries/sql.lib.php:1638
+#: libraries/sql.lib.php:1632
 #, php-format
 msgid ""
 "Current selection does not contain a unique column. Grid edit, checkbox, "
@@ -14306,7 +14324,7 @@ msgstr ""
 "Zgjedhja aktuale nuk përmban një kolonë unike. Tiparet korrigjo rrjetën, "
 "kuti kontrolli, Kopjo dhe Fshij nuk janë në vlefshme. %s"
 
-#: libraries/sql.lib.php:1649
+#: libraries/sql.lib.php:1643
 #, php-format
 msgid ""
 "Current selection does not contain a unique column. Grid edit, Edit, Copy "
@@ -14315,7 +14333,7 @@ msgstr ""
 "Zgjedhja aktuale nuk përmban një kolonë unike. Tiparet korrigjo rrjetën, "
 "Korrigjo, Kopjo dhe Fshij mund të rezultojnë në sjellje të padëshiruar. %s"
 
-#: libraries/sql.lib.php:1688
+#: libraries/sql.lib.php:1682
 #, php-format
 msgid "Problems with indexes of table `%s`"
 msgstr "Problemet me indekset e tabelës `%s`"
@@ -14472,7 +14490,7 @@ msgid "Version %s snapshot (SQL code)"
 msgstr "Versioni %s snapshot (imazh ekrani) (kodi SQL)"
 
 #: libraries/tracking.lib.php:947
-#: templates/structure/table_structure_row.phtml:33
+#: templates/table/structure/table_structure_row.phtml:33
 msgctxt "None for default"
 msgid "None"
 msgstr "Asnjë"
@@ -14527,15 +14545,15 @@ msgstr "Versioni %1$s nga %2$s u fshi."
 msgid "Version %1$s was created, tracking for %2$s is active."
 msgstr "Versioni %1$s u krijua, gjurmimi për %2$s është aktiv."
 
-#: libraries/user_preferences.inc.php:29
+#: libraries/user_preferences.inc.php:30
 msgid "Manage your settings"
 msgstr "Menaxho rregullimet"
 
-#: libraries/user_preferences.inc.php:46 prefs_manage.php:307
+#: libraries/user_preferences.inc.php:54 prefs_manage.php:307
 msgid "Configuration has been saved."
 msgstr "Konfigurimi është ruajtur."
 
-#: libraries/user_preferences.inc.php:66
+#: libraries/user_preferences.inc.php:74
 #, php-format
 msgid ""
 "Your preferences will be saved for current session only. Storing them "
@@ -14937,7 +14955,7 @@ msgid "first"
 msgstr "së pari"
 
 #: templates/columns_definitions/move_column.phtml:12
-#: templates/structure/add_column.phtml:21
+#: templates/table/structure/add_column.phtml:21
 #, php-format
 msgid "after %s"
 msgstr "pas %s"
@@ -15007,197 +15025,292 @@ msgstr "Transformim i të dhënave"
 msgid "Input transformation options"
 msgstr "Opsionet e transformimit të të dhënave"
 
-#: templates/designer/aggregate_query_panel.phtml:22
-#: templates/designer/options_panel.phtml:100
-msgid "Aggregate"
-msgstr "Agregat"
-
-#: templates/designer/aggregate_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:61
-#: templates/designer/options_panel.phtml:106
-#: templates/designer/options_panel.phtml:170
-#: templates/designer/where_query_panel.phtml:30
-#: templates/table/table_header.phtml:9
-msgid "Operator"
-msgstr "Operator"
-
-#: templates/designer/database_tables.phtml:29
-msgid "Toggle"
-msgstr "Nyjëzim"
-
-#: templates/designer/database_tables.phtml:40
-msgid "See table structure"
-msgstr "Shiko strukturën e tabelës"
-
-#: templates/designer/delete_relation_panel.phtml:21
-msgid "Delete relation"
-msgstr "Fshij relacionin"
-
-#: templates/designer/edit_delete_pages.phtml:7
-msgid "Page to open"
-msgstr "Faqe për të hapur"
-
-#: templates/designer/edit_delete_pages.phtml:7
-msgid "Page to delete"
-msgstr "Faqe për të fshirë"
-
-#: templates/designer/having_query_panel.phtml:90
-#: templates/designer/options_panel.phtml:63
-#: templates/designer/options_panel.phtml:229
-#: templates/designer/where_query_panel.phtml:59
-msgid "Except"
-msgstr "Përveç"
-
-#: templates/designer/having_query_panel.phtml:102
-#: templates/designer/options_panel.phtml:75
-#: templates/designer/options_panel.phtml:241
-#: templates/designer/where_query_panel.phtml:71
-msgid "subquery"
-msgstr "nënpyetsor"
-
-#: templates/designer/new_relation_panel.phtml:22
-#: templates/designer/side_menu.phtml:84 templates/designer/side_menu.phtml:87
-msgid "Create relation"
-msgstr "Krijo relacion"
-
-#: templates/designer/options_panel.phtml:34
-#: templates/designer/options_panel.phtml:200
-msgid "Relation operator"
-msgstr "Operatori i relacionit"
-
-#: templates/designer/options_panel.phtml:85
-#: templates/designer/rename_to_panel.phtml:23
-msgid "Rename to"
-msgstr "Riemëro në"
-
-#: templates/designer/options_panel.phtml:91
-#: templates/designer/rename_to_panel.phtml:31
-msgid "New name"
-msgstr "Emër i ri"
-
-#: templates/designer/page_save_as.phtml:4
-msgid "Save to selected page"
-msgstr "Ruaj në faqen e zgjedhur"
-
-#: templates/designer/page_save_as.phtml:5
-msgid "Create a page and save to it"
-msgstr "Krijo një faqe dhe ruaj në të"
-
-#: templates/designer/page_save_as.phtml:26
-msgid "New page name"
-msgstr "Emër i ri faqeje"
-
-#: templates/designer/page_selector.phtml:2
-msgid "Select page"
-msgstr "Zgjedh faqen"
-
-#: templates/designer/query_details.phtml:10
-msgid "Active options"
-msgstr "Opsionet aktive"
-
-#: templates/designer/schema_export.phtml:4
-msgid "Select Export Relational Type"
-msgstr "Zgjedh tipin Eksport Relacional"
-
-#: templates/designer/side_menu.phtml:19 templates/designer/side_menu.phtml:25
-msgid "Show/Hide tables list"
-msgstr "Shfaq/fsheh listën e tabelave"
-
-#: templates/designer/side_menu.phtml:29 templates/designer/side_menu.phtml:35
-#: templates/designer/side_menu.phtml:36
-msgid "View in fullscreen"
-msgstr "Shfaq në ekran të plotë"
-
-#: templates/designer/side_menu.phtml:34
-msgid "Exit fullscreen"
-msgstr "Dalje nga ekran i plotë"
-
-#: templates/designer/side_menu.phtml:41 templates/designer/side_menu.phtml:45
-msgid "New page"
-msgstr "Faqe e re"
-
-#: templates/designer/side_menu.phtml:70 templates/designer/side_menu.phtml:73
-msgid "Delete pages"
-msgstr "Fshij faqet"
-
-#: templates/designer/side_menu.phtml:77 templates/designer/side_menu.phtml:80
-#: templates/table/create_table.phtml:7
+#: templates/database/create_table.phtml:7
+#: templates/database/designer/side_menu.phtml:77
+#: templates/database/designer/side_menu.phtml:80
 msgid "Create table"
 msgstr "Krijo tabelë"
 
-#: templates/designer/side_menu.phtml:98
-#: templates/designer/side_menu.phtml:101
+#: templates/database/create_table.phtml:15
+msgid "Number of columns"
+msgstr "Numri i kolonave"
+
+#: templates/database/designer/aggregate_query_panel.phtml:22
+#: templates/database/designer/options_panel.phtml:100
+msgid "Aggregate"
+msgstr "Agregat"
+
+#: templates/database/designer/aggregate_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:61
+#: templates/database/designer/options_panel.phtml:106
+#: templates/database/designer/options_panel.phtml:170
+#: templates/database/designer/where_query_panel.phtml:30
+#: templates/table/search/table_header.phtml:9
+msgid "Operator"
+msgstr "Operator"
+
+#: templates/database/designer/database_tables.phtml:29
+msgid "Toggle"
+msgstr "Nyjëzim"
+
+#: templates/database/designer/database_tables.phtml:40
+msgid "See table structure"
+msgstr "Shiko strukturën e tabelës"
+
+#: templates/database/designer/delete_relation_panel.phtml:21
+msgid "Delete relation"
+msgstr "Fshij relacionin"
+
+#: templates/database/designer/edit_delete_pages.phtml:7
+msgid "Page to open"
+msgstr "Faqe për të hapur"
+
+#: templates/database/designer/edit_delete_pages.phtml:7
+msgid "Page to delete"
+msgstr "Faqe për të fshirë"
+
+#: templates/database/designer/having_query_panel.phtml:90
+#: templates/database/designer/options_panel.phtml:63
+#: templates/database/designer/options_panel.phtml:229
+#: templates/database/designer/where_query_panel.phtml:59
+msgid "Except"
+msgstr "Përveç"
+
+#: templates/database/designer/having_query_panel.phtml:102
+#: templates/database/designer/options_panel.phtml:75
+#: templates/database/designer/options_panel.phtml:241
+#: templates/database/designer/where_query_panel.phtml:71
+msgid "subquery"
+msgstr "nënpyetsor"
+
+#: templates/database/designer/new_relation_panel.phtml:22
+#: templates/database/designer/side_menu.phtml:84
+#: templates/database/designer/side_menu.phtml:87
+msgid "Create relation"
+msgstr "Krijo relacion"
+
+#: templates/database/designer/options_panel.phtml:34
+#: templates/database/designer/options_panel.phtml:200
+msgid "Relation operator"
+msgstr "Operatori i relacionit"
+
+#: templates/database/designer/options_panel.phtml:85
+#: templates/database/designer/rename_to_panel.phtml:23
+msgid "Rename to"
+msgstr "Riemëro në"
+
+#: templates/database/designer/options_panel.phtml:91
+#: templates/database/designer/rename_to_panel.phtml:31
+msgid "New name"
+msgstr "Emër i ri"
+
+#: templates/database/designer/page_save_as.phtml:4
+msgid "Save to selected page"
+msgstr "Ruaj në faqen e zgjedhur"
+
+#: templates/database/designer/page_save_as.phtml:5
+msgid "Create a page and save to it"
+msgstr "Krijo një faqe dhe ruaj në të"
+
+#: templates/database/designer/page_save_as.phtml:26
+msgid "New page name"
+msgstr "Emër i ri faqeje"
+
+#: templates/database/designer/page_selector.phtml:2
+msgid "Select page"
+msgstr "Zgjedh faqen"
+
+#: templates/database/designer/query_details.phtml:10
+msgid "Active options"
+msgstr "Opsionet aktive"
+
+#: templates/database/designer/schema_export.phtml:4
+msgid "Select Export Relational Type"
+msgstr "Zgjedh tipin Eksport Relacional"
+
+#: templates/database/designer/side_menu.phtml:19
+#: templates/database/designer/side_menu.phtml:25
+msgid "Show/Hide tables list"
+msgstr "Shfaq/fsheh listën e tabelave"
+
+#: templates/database/designer/side_menu.phtml:29
+#: templates/database/designer/side_menu.phtml:35
+#: templates/database/designer/side_menu.phtml:36
+msgid "View in fullscreen"
+msgstr "Shfaq në ekran të plotë"
+
+#: templates/database/designer/side_menu.phtml:34
+msgid "Exit fullscreen"
+msgstr "Dalje nga ekran i plotë"
+
+#: templates/database/designer/side_menu.phtml:41
+#: templates/database/designer/side_menu.phtml:45
+msgid "New page"
+msgstr "Faqe e re"
+
+#: templates/database/designer/side_menu.phtml:70
+#: templates/database/designer/side_menu.phtml:73
+msgid "Delete pages"
+msgstr "Fshij faqet"
+
+#: templates/database/designer/side_menu.phtml:98
+#: templates/database/designer/side_menu.phtml:101
 msgid "Reload"
 msgstr "Ringarko"
 
-#: templates/designer/side_menu.phtml:107
-#: templates/designer/side_menu.phtml:110
+#: templates/database/designer/side_menu.phtml:107
+#: templates/database/designer/side_menu.phtml:110
 msgid "Help"
 msgstr "Ndihmë"
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Angular links"
 msgstr "Lidhjet këndore"
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Direct links"
 msgstr "Lidhje direkte"
 
-#: templates/designer/side_menu.phtml:122
-#: templates/designer/side_menu.phtml:124
+#: templates/database/designer/side_menu.phtml:122
+#: templates/database/designer/side_menu.phtml:124
 msgid "Snap to grid"
 msgstr "Kërcet tek rrjeta"
 
-#: templates/designer/side_menu.phtml:128
-#: templates/designer/side_menu.phtml:134
+#: templates/database/designer/side_menu.phtml:128
+#: templates/database/designer/side_menu.phtml:134
 msgid "Small/Big All"
 msgstr "Të gjitha E vogël/E madhe"
 
-#: templates/designer/side_menu.phtml:138
-#: templates/designer/side_menu.phtml:141
+#: templates/database/designer/side_menu.phtml:138
+#: templates/database/designer/side_menu.phtml:141
 msgid "Toggle small/big"
 msgstr "Shkëmbe e vogël/e madhe"
 
-#: templates/designer/side_menu.phtml:145
-#: templates/designer/side_menu.phtml:148
+#: templates/database/designer/side_menu.phtml:145
+#: templates/database/designer/side_menu.phtml:148
 msgid "Toggle relation lines"
 msgstr "Shkëmbe rreshtat e relacionit"
 
-#: templates/designer/side_menu.phtml:153
-#: templates/designer/side_menu.phtml:156
+#: templates/database/designer/side_menu.phtml:153
+#: templates/database/designer/side_menu.phtml:156
 msgid "Export schema"
 msgstr "Eksporto skemën"
 
-#: templates/designer/side_menu.phtml:165
-#: templates/designer/side_menu.phtml:168
+#: templates/database/designer/side_menu.phtml:165
+#: templates/database/designer/side_menu.phtml:168
 msgid "Build Query"
 msgstr "Ndërto pyetsor"
 
-#: templates/designer/side_menu.phtml:173
-#: templates/designer/side_menu.phtml:177
+#: templates/database/designer/side_menu.phtml:173
+#: templates/database/designer/side_menu.phtml:177
 msgid "Move Menu"
 msgstr "Lëviz meny"
 
-#: templates/designer/side_menu.phtml:181
-#: templates/designer/side_menu.phtml:186
+#: templates/database/designer/side_menu.phtml:181
+#: templates/database/designer/side_menu.phtml:186
 msgid "Pin text"
 msgstr "Kap tekstin"
 
-#: templates/designer/table_list.phtml:4
+#: templates/database/designer/table_list.phtml:4
 msgid "Hide/Show all"
 msgstr "Fsheh/Shfaq të gjitha"
 
-#: templates/designer/table_list.phtml:14
+#: templates/database/designer/table_list.phtml:14
 msgid "Hide/Show Tables with no relation"
 msgstr "Fsheh/Shfaq tabelat pa relacione"
 
-#: templates/designer/table_list.phtml:59
+#: templates/database/designer/table_list.phtml:59
 msgid "Number of tables:"
 msgstr "Numri i tabelave:"
 
+#: templates/database/structure/body_for_table_summary.phtml:6
+#, php-format
+msgid "%s table"
+msgid_plural "%s tables"
+msgstr[0] "%s tabelë"
+msgstr[1] "%s tabela"
+
+#: templates/database/structure/body_for_table_summary.phtml:17
+msgid "Sum"
+msgstr "Shuma"
+
+#: templates/database/structure/check_all_tables.phtml:6
+msgid "Check tables having overhead"
+msgstr "Kontrollo tabelat që kanë ngarkesë"
+
+#: templates/database/structure/check_all_tables.phtml:10
+msgid "Show create"
+msgstr "Shfaq krijo"
+
+#: templates/database/structure/check_all_tables.phtml:27
+msgid "Prefix"
+msgstr "Prefiksi"
+
+#: templates/database/structure/check_all_tables.phtml:28
+msgid "Add prefix to table"
+msgstr "Shto prefiks tek tabela"
+
+#: templates/database/structure/check_all_tables.phtml:29
+msgid "Replace table prefix"
+msgstr "Zëvendëso prefiksin e tabelës"
+
+#: templates/database/structure/check_all_tables.phtml:30
+msgid "Copy table with prefix"
+msgstr "Kopjo tabelën me prefiks"
+
+#: templates/database/structure/check_all_tables.phtml:36
+msgid "Add columns to central list"
+msgstr "Shto kolona në listën qendrore"
+
+#: templates/database/structure/check_all_tables.phtml:37
+msgid "Remove columns from central list"
+msgstr "Largo kolonat nga lista qendrore"
+
+#: templates/database/structure/check_all_tables.phtml:38
+msgid "Make consistent with central list"
+msgstr "Bëje konsistente me listën qendrore"
+
+#: templates/database/structure/favorite_anchor.phtml:12
+msgid "Add to Favorites"
+msgstr "Shto tek Preferencat"
+
+#: templates/database/structure/show_create.phtml:2
+msgid "Showing create queries"
+msgstr "Shfaqën krijo pyetsorët"
+
+#: templates/database/structure/sortable_header.phtml:13
+msgid "Sort"
+msgstr "Klasifikim"
+
+#: templates/database/structure/table_header.phtml:42
+msgid ""
+"May be approximate. Click on the number to get the exact count. See "
+"[doc@faq3-11]FAQ 3.11[/doc]."
+msgstr ""
+"Mund të jetë e përafërt. Kliko numrin për të marrë numrin e saktë. Shiko "
+"[doc@faq3-11]FAQ 3.11[/doc]."
+
+#: templates/database/structure/table_header.phtml:66
+#: templates/table/index_form.phtml:127
+msgid "Size"
+msgstr "Madhësia"
+
+#: templates/database/structure/table_header.phtml:74
+#: templates/table/structure/display_table_stats.phtml:27
+msgid "Overhead"
+msgstr "Ngarkesa"
+
+#: templates/database/structure/tracking_icon.phtml:4
+msgid "Tracking is active."
+msgstr "Gjurmimi është aktiv."
+
+#: templates/database/structure/tracking_icon.phtml:8
+msgid "Tracking is not active."
+msgstr "Gjurmimi nuk është aktiv."
+
 #: templates/error/report_form.phtml:7
 msgid ""
 "phpMyAdmin has encountered an error. We have collected data about this error "
@@ -15217,60 +15330,6 @@ msgstr "Ju mund t'i shqyrtoni të dhënat në raportin e gabimit:"
 msgid "Please explain the steps that lead to the error:"
 msgstr "Ju lutem shpjegoni hapat që çuan tek gabimi:"
 
-#: templates/gis_visualization/gis_visualization.phtml:3
-msgid "Display GIS Visualization"
-msgstr "Shfaq vizualizimin GIS"
-
-#: templates/gis_visualization/gis_visualization.phtml:8
-msgid "Label column"
-msgstr "Kolona e etiketës"
-
-#: templates/gis_visualization/gis_visualization.phtml:11
-msgid "-- None --"
-msgstr "-- Asnjë --"
-
-#: templates/gis_visualization/gis_visualization.phtml:19
-msgid "Spatial column"
-msgstr "Kolonë spaciale"
-
-#: templates/index_form.phtml:16
-msgid "Index name:"
-msgstr "Emri i indeksit:"
-
-#: templates/index_form.phtml:19
-msgid ""
-"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
-msgstr ""
-"\"PRIMARY\" <b>duhet</b> të jetë emri dhe <b>vetëm</b> një çelës primar!"
-
-#: templates/index_form.phtml:40
-msgid "Index choice:"
-msgstr "Zgjedhja e indeksit:"
-
-#: templates/index_form.phtml:57
-msgid "Key block size:"
-msgstr "Madhësia e bllokut të çelësit:"
-
-#: templates/index_form.phtml:74
-msgid "Index type:"
-msgstr "Tipi i indeksit:"
-
-#: templates/index_form.phtml:86
-msgid "Parser:"
-msgstr "Parser:"
-
-#: templates/index_form.phtml:102
-msgid "Comment:"
-msgstr "Komenti:"
-
-#: templates/index_form.phtml:127 templates/structure/table_header.phtml:66
-msgid "Size"
-msgstr "Madhësia"
-
-#: templates/index_form.phtml:149 templates/index_form.phtml:190
-msgid "Drag to reorder"
-msgstr "Tërhiq për të ri-renditur"
-
 #: templates/prefs_autoload.phtml:9
 msgid ""
 "Your browser has phpMyAdmin configuration for this domain. Would you like to "
@@ -15283,359 +15342,149 @@ msgstr ""
 msgid "Start row:"
 msgstr "Radha e fillimit:"
 
-#: templates/structure/actions_in_table_structure.phtml:14
-#, php-format
-msgid "A primary key has been added on %s."
-msgstr "Një çelës primar është shtuar tek %s."
-
-#: templates/structure/actions_in_table_structure.phtml:34
-#: templates/structure/actions_in_table_structure.phtml:54
-#: templates/structure/actions_in_table_structure.phtml:79
-#: templates/structure/actions_in_table_structure.phtml:101
-#, php-format
-msgid "An index has been added on %s."
-msgstr "Një indeks u shtua tek %s."
-
-#: templates/structure/actions_in_table_structure.phtml:130
-#: templates/structure/check_all_table_column.phtml:59
-msgid "Remove from central columns"
-msgstr "Largo nga kolonat qendrore"
-
-#: templates/structure/actions_in_table_structure.phtml:138
-#: templates/structure/check_all_table_column.phtml:55
-msgid "Add to central columns"
-msgstr "Shto kolona qendrore"
-
-#: templates/structure/add_column.phtml:7
-#, php-format
-msgid "Add %s column(s)"
-msgstr "Shto %s kolonë(a)"
-
-#: templates/structure/add_column.phtml:12
-msgid "at beginning of table"
-msgstr "në fillim të tabelës"
-
-#: templates/structure/body_for_table_summary.phtml:6
-#, php-format
-msgid "%s table"
-msgid_plural "%s tables"
-msgstr[0] "%s tabelë"
-msgstr[1] "%s tabela"
-
-#: templates/structure/body_for_table_summary.phtml:17
-msgid "Sum"
-msgstr "Shuma"
-
-#: templates/structure/check_all_tables.phtml:6
-msgid "Check tables having overhead"
-msgstr "Kontrollo tabelat që kanë ngarkesë"
-
-#: templates/structure/check_all_tables.phtml:10
-msgid "Show create"
-msgstr "Shfaq krijo"
-
-#: templates/structure/check_all_tables.phtml:27
-msgid "Prefix"
-msgstr "Prefiksi"
-
-#: templates/structure/check_all_tables.phtml:28
-msgid "Add prefix to table"
-msgstr "Shto prefiks tek tabela"
-
-#: templates/structure/check_all_tables.phtml:29
-msgid "Replace table prefix"
-msgstr "Zëvendëso prefiksin e tabelës"
-
-#: templates/structure/check_all_tables.phtml:30
-msgid "Copy table with prefix"
-msgstr "Kopjo tabelën me prefiks"
-
-#: templates/structure/check_all_tables.phtml:36
-msgid "Add columns to central list"
-msgstr "Shto kolona në listën qendrore"
-
-#: templates/structure/check_all_tables.phtml:37
-msgid "Remove columns from central list"
-msgstr "Largo kolonat nga lista qendrore"
-
-#: templates/structure/check_all_tables.phtml:38
-msgid "Make consistent with central list"
-msgstr "Bëje konsistente me listën qendrore"
-
-#: templates/structure/display_structure.phtml:140 view_create.php:181
-msgid "Edit view"
-msgstr "Korrigjo pamjen"
-
-#: templates/structure/display_table_stats.phtml:9
-msgid "Space usage"
-msgstr "Përdorimi i hapësirës"
-
-#: templates/structure/display_table_stats.phtml:27
-#: templates/structure/table_header.phtml:74
-msgid "Overhead"
-msgstr "Ngarkesa"
-
-#: templates/structure/display_table_stats.phtml:32
-msgid "Effective"
-msgstr "Efektive"
-
-#: templates/structure/favorite_anchor.phtml:12
-msgid "Add to Favorites"
-msgstr "Shto tek Preferencat"
-
-#: templates/structure/move_columns_dialog.phtml:1
-#: templates/structure/optional_action_links.phtml:21
-msgid "Move columns"
-msgstr "Lëviz kolonat"
-
-#: templates/structure/move_columns_dialog.phtml:2
-msgid "Move the columns by dragging them up and down."
-msgstr "Lëvizi kolonat duke i tërhequar ato lart e poshtë."
-
-#: templates/structure/optional_action_links.phtml:9
-msgid "Propose table structure"
-msgstr "Propozo strukturën e tabelës"
-
-#: templates/structure/optional_action_links.phtml:24
-msgid "Improve table structure"
-msgstr "Përmirëso strukturën e tabelës"
-
-#: templates/structure/optional_action_links.phtml:30
-msgid "Track view"
-msgstr "Pamje e gjurmës"
-
-#: templates/structure/row_stats_table.phtml:3
-msgid "Row statistics"
-msgstr "Statistikat e radhës"
-
-#: templates/structure/row_stats_table.phtml:9
-msgid "static"
-msgstr "statike"
-
-#: templates/structure/row_stats_table.phtml:11
-msgid "dynamic"
-msgstr "dinamike"
-
-#: templates/structure/row_stats_table.phtml:22
-msgid "partitioned"
-msgstr "copëzuar"
-
-#: templates/structure/row_stats_table.phtml:54
-msgid "Row length"
-msgstr "Gjatësia e radhës"
-
-#: templates/structure/row_stats_table.phtml:66
-msgid "Row size"
-msgstr "Madhësia e radhës"
-
-#: templates/structure/row_stats_table.phtml:73
-msgid "Next autoindex"
-msgstr "Autoindeksi tjetër"
-
-#: templates/structure/secondary_tabs.phtml:14
-msgid "Relation view"
-msgstr "Pamje e relacionit"
-
-#: templates/structure/show_create.phtml:2
-msgid "Showing create queries"
-msgstr "Shfaqën krijo pyetsorët"
-
-#: templates/structure/sortable_header.phtml:13
-msgid "Sort"
-msgstr "Klasifikim"
-
-#: templates/structure/table_header.phtml:42
-msgid ""
-"May be approximate. Click on the number to get the exact count. See "
-"[doc@faq3-11]FAQ 3.11[/doc]."
-msgstr ""
-"Mund të jetë e përafërt. Kliko numrin për të marrë numrin e saktë. Shiko "
-"[doc@faq3-11]FAQ 3.11[/doc]."
-
-#: templates/structure/table_structure_row.phtml:46
-#, php-format
-msgid "Column %s has been dropped."
-msgstr "Kolona %s është fshirë."
-
-#: templates/structure/tracking_icon.phtml:4
-msgid "Tracking is active."
-msgstr "Gjurmimi është aktiv."
-
-#: templates/structure/tracking_icon.phtml:8
-msgid "Tracking is not active."
-msgstr "Gjurmimi nuk është aktiv."
-
-#: templates/table/create_table.phtml:15
-msgid "Number of columns"
-msgstr "Numri i kolonave"
-
-#: templates/table/options.phtml:8
-msgid "Select columns (at least one):"
-msgstr "Zgjedh kolonën (së paku një):"
-
-#: templates/table/options.phtml:37
-msgid "Add search conditions (body of the \"where\" clause):"
-msgstr "Shto kushtet e kërkimit (trupi i klauzolës \"where\"):"
-
-#: templates/table/options.phtml:45
-msgid "Number of rows per page"
-msgstr "Numri i radhëve për faqe"
-
-#: templates/table/options.phtml:56
-msgid "Display order:"
-msgstr "Shfaq renditje:"
-
-#: templates/table/options_zoom.phtml:6
-msgid "Use this column to label each point"
-msgstr "Përdor këtë klolonë, për të etiketuar secilën pikë"
-
-#: templates/table/options_zoom.phtml:35
-msgid "Maximum rows to plot"
-msgstr "Radhët maksimale për komplotin"
-
-#: templates/table/replace_preview.phtml:13
-msgid "Find and replace - preview"
-msgstr "Gjej dhe zëvendëso - paraqit"
-
-#: templates/table/replace_preview.phtml:18
-msgid "Original string"
-msgstr "Varg (string) origjinal"
-
-#: templates/table/replace_preview.phtml:19
-msgid "Replaced string"
-msgstr "Varg (string) i zëvendësuar"
-
-#: templates/table/replace_preview.phtml:40
-msgid "Replace"
-msgstr "Zëvendëso"
-
-#: templates/table/rows_zoom.phtml:16
-msgid "Additional search criteria"
-msgstr "Kritere kërkimi shtesë"
-
-#: templates/table/search_and_replace.phtml:3
-msgid "Replace with:"
-msgstr "Zëvendëso me:"
-
-#: templates/table/search_and_replace.phtml:22
-msgid "Use regular expression"
-msgstr "Përdor shprehje të rregullt"
-
-#: templates/table/selection_form.phtml:12
-msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
-msgstr ""
-"Bëj një \"pyetsor sipas shembullit\" (wildcard: \"%\") për dy kolona të "
-"ndryshme"
-
-#: templates/table/selection_form.phtml:34
-msgid "Do a \"query by example\" (wildcard: \"%\")"
-msgstr "Bëj një \"pyetsor sipas shembullit\" (wildcard: \"%\")"
-
-#: templates/table/zoom_result_form.phtml:7
-msgid "Browse/Edit the points"
-msgstr "Shfleto/Korrigjo pikët"
-
-#: templates/table/zoom_result_form.phtml:15
-msgid "How to use"
-msgstr "Si të përdoret"
-
-#: templates/table/zoom_result_form.phtml:23
-msgid "Reset zoom"
-msgstr "Rivendos dimensionimin"
-
-#: templates/tbl_chart.phtml:17
+#: templates/table/chart/tbl_chart.phtml:17
 msgctxt "Chart type"
 msgid "Bar"
 msgstr "Shirit"
 
-#: templates/tbl_chart.phtml:21
+#: templates/table/chart/tbl_chart.phtml:21
 msgctxt "Chart type"
 msgid "Column"
 msgstr "Kolonë"
 
-#: templates/tbl_chart.phtml:25
+#: templates/table/chart/tbl_chart.phtml:25
 msgctxt "Chart type"
 msgid "Line"
 msgstr "Linjë"
 
-#: templates/tbl_chart.phtml:29
+#: templates/table/chart/tbl_chart.phtml:29
 msgctxt "Chart type"
 msgid "Spline"
 msgstr "Rrip"
 
-#: templates/tbl_chart.phtml:33
+#: templates/table/chart/tbl_chart.phtml:33
 msgctxt "Chart type"
 msgid "Area"
 msgstr "Zonë"
 
-#: templates/tbl_chart.phtml:37
+#: templates/table/chart/tbl_chart.phtml:37
 msgctxt "Chart type"
 msgid "Pie"
 msgstr "Tortë"
 
-#: templates/tbl_chart.phtml:41
+#: templates/table/chart/tbl_chart.phtml:41
 msgctxt "Chart type"
 msgid "Timeline"
 msgstr "Linjë kohore"
 
-#: templates/tbl_chart.phtml:45
+#: templates/table/chart/tbl_chart.phtml:45
 msgctxt "Chart type"
 msgid "Scatter"
 msgstr "Shpërndaj"
 
-#: templates/tbl_chart.phtml:50
+#: templates/table/chart/tbl_chart.phtml:50
 msgid "Stacked"
 msgstr "Grumbulluar"
 
-#: templates/tbl_chart.phtml:53
+#: templates/table/chart/tbl_chart.phtml:53
 msgid "Chart title"
 msgstr "Titull grafiku"
 
-#: templates/tbl_chart.phtml:57
+#: templates/table/chart/tbl_chart.phtml:57
 msgid "X-Axis:"
 msgstr "X-Aksi:"
 
-#: templates/tbl_chart.phtml:72
+#: templates/table/chart/tbl_chart.phtml:72
 msgid "Series:"
 msgstr "Seritë:"
 
-#: templates/tbl_chart.phtml:102
+#: templates/table/chart/tbl_chart.phtml:102
 msgid "X-Axis label:"
 msgstr "X-aksi etiketa:"
 
-#: templates/tbl_chart.phtml:104
+#: templates/table/chart/tbl_chart.phtml:104
 msgid "X Values"
 msgstr "X vlerat"
 
-#: templates/tbl_chart.phtml:107
+#: templates/table/chart/tbl_chart.phtml:107
 msgid "Y-Axis label:"
 msgstr "Y-aksi etiketa:"
 
-#: templates/tbl_chart.phtml:115
+#: templates/table/chart/tbl_chart.phtml:115
 msgid "Series names are in a column"
 msgstr "Emrat e serive janë në një kolonë"
 
-#: templates/tbl_chart.phtml:118
+#: templates/table/chart/tbl_chart.phtml:118
 msgid "Series column:"
 msgstr "Kolona e serive:"
 
-#: templates/tbl_chart.phtml:130
+#: templates/table/chart/tbl_chart.phtml:130
 msgid "Value Column:"
 msgstr "Vlera e kolonës:"
 
-#: templates/tbl_chart.phtml:150
+#: templates/table/chart/tbl_chart.phtml:150
 msgid "Save chart as image"
 msgstr "Ruaj grafikun si imazh"
 
-#: templates/tbl_relation/common_form.phtml:7
+#: templates/table/gis_visualization/gis_visualization.phtml:3
+msgid "Display GIS Visualization"
+msgstr "Shfaq vizualizimin GIS"
+
+#: templates/table/gis_visualization/gis_visualization.phtml:8
+msgid "Label column"
+msgstr "Kolona e etiketës"
+
+#: templates/table/gis_visualization/gis_visualization.phtml:11
+msgid "-- None --"
+msgstr "-- Asnjë --"
+
+#: templates/table/gis_visualization/gis_visualization.phtml:19
+msgid "Spatial column"
+msgstr "Kolonë spaciale"
+
+#: templates/table/index_form.phtml:16
+msgid "Index name:"
+msgstr "Emri i indeksit:"
+
+#: templates/table/index_form.phtml:19
+msgid ""
+"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
+msgstr ""
+"\"PRIMARY\" <b>duhet</b> të jetë emri dhe <b>vetëm</b> një çelës primar!"
+
+#: templates/table/index_form.phtml:40
+msgid "Index choice:"
+msgstr "Zgjedhja e indeksit:"
+
+#: templates/table/index_form.phtml:57
+msgid "Key block size:"
+msgstr "Madhësia e bllokut të çelësit:"
+
+#: templates/table/index_form.phtml:74
+msgid "Index type:"
+msgstr "Tipi i indeksit:"
+
+#: templates/table/index_form.phtml:86
+msgid "Parser:"
+msgstr "Parser:"
+
+#: templates/table/index_form.phtml:102
+msgid "Comment:"
+msgstr "Komenti:"
+
+#: templates/table/index_form.phtml:149 templates/table/index_form.phtml:190
+msgid "Drag to reorder"
+msgstr "Tërhiq për të ri-renditur"
+
+#: templates/table/relation/common_form.phtml:7
 msgid "Internal relations"
 msgstr "Relacion i brendshëm"
 
-#: templates/tbl_relation/common_form.phtml:11
+#: templates/table/relation/common_form.phtml:11
 msgid "Internal relation"
 msgstr "Relacion i brendshëm"
 
-#: templates/tbl_relation/common_form.phtml:14
+#: templates/table/relation/common_form.phtml:14
 msgid ""
 "An internal relation is not necessary when a corresponding FOREIGN KEY "
 "relation exists."
@@ -15643,50 +15492,226 @@ msgstr ""
 "Një relacion i brendshëm nuk është i nevojshëm kur ekziston një relacion "
 "korrespondues FOREIGN KEY (çelës i huaj)."
 
-#: templates/tbl_relation/common_form.phtml:37
+#: templates/table/relation/common_form.phtml:37
 msgid "Foreign key constraints"
 msgstr "Detyrimet e çelësit të huaj"
 
-#: templates/tbl_relation/common_form.phtml:40
+#: templates/table/relation/common_form.phtml:40
 msgid "Actions"
 msgstr "Veprime"
 
-#: templates/tbl_relation/common_form.phtml:41
+#: templates/table/relation/common_form.phtml:41
 msgid "Constraint properties"
 msgstr "Vetitë e detyrimit"
 
-#: templates/tbl_relation/common_form.phtml:44
+#: templates/table/relation/common_form.phtml:44
 msgid ""
 "Only columns with index will be displayed. You can define an index below."
 msgstr ""
 "Vetëm kolonat me indeks do të shfaqet. Ju mund të përcaktoni një indeks më "
 "poshtë."
 
-#: templates/tbl_relation/common_form.phtml:49
+#: templates/table/relation/common_form.phtml:49
 msgid "Foreign key constraint"
 msgstr "Kufizo çelësin e huaj"
 
-#: templates/tbl_relation/common_form.phtml:81
+#: templates/table/relation/common_form.phtml:81
 msgid "+ Add constraint"
 msgstr "+ Shto detyrim"
 
-#: templates/tbl_relation/common_form.phtml:91
+#: templates/table/relation/common_form.phtml:91
 msgid "Choose column to display:"
 msgstr "Zgjedh kolonën për të shfaqur:"
 
-#: templates/tbl_relation/foreign_key_row.phtml:13
+#: templates/table/relation/foreign_key_row.phtml:13
 #, php-format
 msgid "Foreign key constraint %s has been dropped"
 msgstr "Detyrimi i çelësit të huaj %s është hedhur"
 
-#: templates/tbl_relation/foreign_key_row.phtml:102
+#: templates/table/relation/foreign_key_row.phtml:102
 msgid "Constraint name"
 msgstr "Emri i detyrimit"
 
-#: templates/tbl_relation/foreign_key_row.phtml:157
+#: templates/table/relation/foreign_key_row.phtml:157
 msgid "+ Add column"
 msgstr "+ Shto kolonë"
 
+#: templates/table/search/options.phtml:8
+msgid "Select columns (at least one):"
+msgstr "Zgjedh kolonën (së paku një):"
+
+#: templates/table/search/options.phtml:37
+msgid "Add search conditions (body of the \"where\" clause):"
+msgstr "Shto kushtet e kërkimit (trupi i klauzolës \"where\"):"
+
+#: templates/table/search/options.phtml:45
+msgid "Number of rows per page"
+msgstr "Numri i radhëve për faqe"
+
+#: templates/table/search/options.phtml:56
+msgid "Display order:"
+msgstr "Shfaq renditje:"
+
+#: templates/table/search/options_zoom.phtml:6
+msgid "Use this column to label each point"
+msgstr "Përdor këtë klolonë, për të etiketuar secilën pikë"
+
+#: templates/table/search/options_zoom.phtml:35
+msgid "Maximum rows to plot"
+msgstr "Radhët maksimale për komplotin"
+
+#: templates/table/search/replace_preview.phtml:13
+msgid "Find and replace - preview"
+msgstr "Gjej dhe zëvendëso - paraqit"
+
+#: templates/table/search/replace_preview.phtml:18
+msgid "Original string"
+msgstr "Varg (string) origjinal"
+
+#: templates/table/search/replace_preview.phtml:19
+msgid "Replaced string"
+msgstr "Varg (string) i zëvendësuar"
+
+#: templates/table/search/replace_preview.phtml:40
+msgid "Replace"
+msgstr "Zëvendëso"
+
+#: templates/table/search/rows_zoom.phtml:16
+msgid "Additional search criteria"
+msgstr "Kritere kërkimi shtesë"
+
+#: templates/table/search/search_and_replace.phtml:3
+msgid "Replace with:"
+msgstr "Zëvendëso me:"
+
+#: templates/table/search/search_and_replace.phtml:22
+msgid "Use regular expression"
+msgstr "Përdor shprehje të rregullt"
+
+#: templates/table/search/selection_form.phtml:12
+msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
+msgstr ""
+"Bëj një \"pyetsor sipas shembullit\" (wildcard: \"%\") për dy kolona të "
+"ndryshme"
+
+#: templates/table/search/selection_form.phtml:34
+msgid "Do a \"query by example\" (wildcard: \"%\")"
+msgstr "Bëj një \"pyetsor sipas shembullit\" (wildcard: \"%\")"
+
+#: templates/table/search/zoom_result_form.phtml:7
+msgid "Browse/Edit the points"
+msgstr "Shfleto/Korrigjo pikët"
+
+#: templates/table/search/zoom_result_form.phtml:15
+msgid "How to use"
+msgstr "Si të përdoret"
+
+#: templates/table/search/zoom_result_form.phtml:23
+msgid "Reset zoom"
+msgstr "Rivendos dimensionimin"
+
+#: templates/table/secondary_tabs.phtml:14
+msgid "Relation view"
+msgstr "Pamje e relacionit"
+
+#: templates/table/structure/actions_in_table_structure.phtml:14
+#, php-format
+msgid "A primary key has been added on %s."
+msgstr "Një çelës primar është shtuar tek %s."
+
+#: templates/table/structure/actions_in_table_structure.phtml:34
+#: templates/table/structure/actions_in_table_structure.phtml:54
+#: templates/table/structure/actions_in_table_structure.phtml:79
+#: templates/table/structure/actions_in_table_structure.phtml:101
+#, php-format
+msgid "An index has been added on %s."
+msgstr "Një indeks u shtua tek %s."
+
+#: templates/table/structure/actions_in_table_structure.phtml:130
+#: templates/table/structure/check_all_table_column.phtml:59
+msgid "Remove from central columns"
+msgstr "Largo nga kolonat qendrore"
+
+#: templates/table/structure/actions_in_table_structure.phtml:138
+#: templates/table/structure/check_all_table_column.phtml:55
+msgid "Add to central columns"
+msgstr "Shto kolona qendrore"
+
+#: templates/table/structure/add_column.phtml:7
+#, php-format
+msgid "Add %s column(s)"
+msgstr "Shto %s kolonë(a)"
+
+#: templates/table/structure/add_column.phtml:12
+msgid "at beginning of table"
+msgstr "në fillim të tabelës"
+
+#: templates/table/structure/display_structure.phtml:140 view_create.php:181
+msgid "Edit view"
+msgstr "Korrigjo pamjen"
+
+#: templates/table/structure/display_table_stats.phtml:9
+msgid "Space usage"
+msgstr "Përdorimi i hapësirës"
+
+#: templates/table/structure/display_table_stats.phtml:32
+msgid "Effective"
+msgstr "Efektive"
+
+#: templates/table/structure/move_columns_dialog.phtml:1
+#: templates/table/structure/optional_action_links.phtml:21
+msgid "Move columns"
+msgstr "Lëviz kolonat"
+
+#: templates/table/structure/move_columns_dialog.phtml:2
+msgid "Move the columns by dragging them up and down."
+msgstr "Lëvizi kolonat duke i tërhequar ato lart e poshtë."
+
+#: templates/table/structure/optional_action_links.phtml:9
+msgid "Propose table structure"
+msgstr "Propozo strukturën e tabelës"
+
+#: templates/table/structure/optional_action_links.phtml:24
+msgid "Improve table structure"
+msgstr "Përmirëso strukturën e tabelës"
+
+#: templates/table/structure/optional_action_links.phtml:30
+msgid "Track view"
+msgstr "Pamje e gjurmës"
+
+#: templates/table/structure/row_stats_table.phtml:3
+msgid "Row statistics"
+msgstr "Statistikat e radhës"
+
+#: templates/table/structure/row_stats_table.phtml:9
+msgid "static"
+msgstr "statike"
+
+#: templates/table/structure/row_stats_table.phtml:11
+msgid "dynamic"
+msgstr "dinamike"
+
+#: templates/table/structure/row_stats_table.phtml:22
+msgid "partitioned"
+msgstr "copëzuar"
+
+#: templates/table/structure/row_stats_table.phtml:54
+msgid "Row length"
+msgstr "Gjatësia e radhës"
+
+#: templates/table/structure/row_stats_table.phtml:66
+msgid "Row size"
+msgstr "Madhësia e radhës"
+
+#: templates/table/structure/row_stats_table.phtml:73
+msgid "Next autoindex"
+msgstr "Autoindeksi tjetër"
+
+#: templates/table/structure/table_structure_row.phtml:46
+#, php-format
+msgid "Column %s has been dropped."
+msgstr "Kolona %s është fshirë."
+
 #: themes.php:17 themes.php:22
 msgid "Theme"
 msgstr "Modeli"
@@ -17042,6 +17067,9 @@ msgstr ""
 msgid "concurrent_insert is set to 0"
 msgstr "concurrent_insert është vendosur në 0"
 
+#~ msgid "Read as multibytes"
+#~ msgstr "Lexo si multibajt"
+
 #~ msgid "Relational display column"
 #~ msgstr "Kolona e shfaqjes relacionale"
 
diff --git a/po/sr.po b/po/sr.po
index f96cd9b49b..ea1409ab87 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 4.5.0-dev\n"
 "Report-Msgid-Bugs-To: developers@phpmyadmin.net\n"
-"POT-Creation-Date: 2015-08-08 13:53-0400\n"
+"POT-Creation-Date: 2015-08-12 08:10-0400\n"
 "PO-Revision-Date: 2015-07-13 00:25+0200\n"
 "Last-Translator: Smart Kid <kidsmart33@gmail.com>\n"
 "Language-Team: Serbian <https://hosted.weblate.org/projects/phpmyadmin/"
@@ -55,7 +55,7 @@ msgid "Table comments:"
 msgstr "Коментари табеле:"
 
 #: db_datadict.php:104 libraries/Index.class.php:699
-#: libraries/insert_edit.lib.php:1567
+#: libraries/insert_edit.lib.php:1565
 #: libraries/navigation/Nodes/Node_Column.class.php:30
 #: libraries/plugins/export/ExportHtmlword.class.php:280
 #: libraries/plugins/export/ExportHtmlword.class.php:375
@@ -69,13 +69,14 @@ msgstr "Коментари табеле:"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1023
 #: libraries/tracking.lib.php:879 libraries/tracking.lib.php:975
 #: templates/columns_definitions/column_name.phtml:18
-#: templates/index_form.phtml:124 templates/table/table_header.phtml:6
-#: templates/table/zoom_result_form.phtml:33
-#: templates/tbl_relation/common_form.phtml:10
-#: templates/tbl_relation/common_form.phtml:43
-#: templates/tbl_relation/foreign_key_row.phtml:194
-#: templates/tbl_relation/foreign_key_row.phtml:206
-#: templates/tbl_relation/internal_relational_row.phtml:71
+#: templates/table/index_form.phtml:124
+#: templates/table/relation/common_form.phtml:10
+#: templates/table/relation/common_form.phtml:43
+#: templates/table/relation/foreign_key_row.phtml:194
+#: templates/table/relation/foreign_key_row.phtml:206
+#: templates/table/relation/internal_relational_row.phtml:71
+#: templates/table/search/table_header.phtml:6
+#: templates/table/search/zoom_result_form.phtml:33
 msgid "Column"
 msgstr "Колона"
 
@@ -93,21 +94,21 @@ msgstr "Колона"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1001
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1024
 #: libraries/rte/rte_list.lib.php:75 libraries/rte/rte_list.lib.php:103
-#: libraries/rte/rte_routines.lib.php:802
-#: libraries/rte/rte_routines.lib.php:831
-#: libraries/rte/rte_routines.lib.php:1493
+#: libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_routines.lib.php:922
+#: libraries/rte/rte_routines.lib.php:1584
 #: libraries/server_privileges.lib.php:2369 libraries/tracking.lib.php:880
 #: libraries/tracking.lib.php:972
 #: templates/columns_definitions/table_fields_definitions.phtml:11
-#: templates/structure/table_header.phtml:48
-#: templates/structure/table_structure_header.phtml:6
-#: templates/table/table_header.phtml:7
+#: templates/database/structure/table_header.phtml:48
+#: templates/table/search/table_header.phtml:7
+#: templates/table/structure/table_structure_header.phtml:6
 msgid "Type"
 msgstr "Тип"
 
 #: db_datadict.php:106 libraries/Index.class.php:702
 #: libraries/central_columns.lib.php:708
-#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1576
+#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1574
 #: libraries/plugins/export/ExportHtmlword.class.php:286
 #: libraries/plugins/export/ExportHtmlword.class.php:381
 #: libraries/plugins/export/ExportLatex.class.php:509
@@ -120,8 +121,8 @@ msgstr "Тип"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1026
 #: libraries/tracking.lib.php:882 libraries/tracking.lib.php:978
 #: templates/columns_definitions/table_fields_definitions.phtml:39
-#: templates/structure/table_structure_header.phtml:9
-#: templates/table/zoom_result_form.phtml:34
+#: templates/table/search/zoom_result_form.phtml:34
+#: templates/table/structure/table_structure_header.phtml:9
 msgid "Null"
 msgstr "Null"
 
@@ -139,8 +140,8 @@ msgstr "Null"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1027
 #: libraries/replication_gui.lib.php:153 libraries/tracking.lib.php:883
 #: templates/columns_definitions/table_fields_definitions.phtml:25
-#: templates/structure/body_for_table_summary.phtml:55
-#: templates/structure/table_structure_header.phtml:10
+#: templates/database/structure/body_for_table_summary.phtml:55
+#: templates/table/structure/table_structure_header.phtml:10
 msgid "Default"
 msgstr "Подразумевано"
 
@@ -168,19 +169,19 @@ msgid "Comments"
 msgstr "Коментари"
 
 #: db_datadict.php:146
-#: libraries/controllers/StructureController.class.php:1960
-#: libraries/controllers/StructureController.class.php:1965
+#: libraries/controllers/TableStructureController.class.php:951
+#: libraries/controllers/TableStructureController.class.php:956
 #: libraries/tracking.lib.php:922
 #: templates/columns_definitions/column_indexes.phtml:6
-#: templates/structure/check_all_table_column.phtml:22
-#: templates/structure/display_structure.phtml:74
+#: templates/table/structure/check_all_table_column.phtml:22
+#: templates/table/structure/display_structure.phtml:74
 msgid "Primary"
 msgstr "Примарни"
 
 #: db_datadict.php:156 js/messages.php:317 libraries/Index.class.php:567
 #: libraries/Index.class.php:606 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261 libraries/mult_submits.lib.php:403
+#: libraries/config/FormDisplay.tpl.php:272 libraries/mult_submits.lib.php:403
 #: libraries/mult_submits.lib.php:417
 #: libraries/plugins/export/ExportHtmlword.class.php:630
 #: libraries/plugins/export/ExportLatex.class.php:589
@@ -196,20 +197,20 @@ msgstr "Примарни"
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1010 libraries/tracking.lib.php:1015
 #: prefs_manage.php:140 templates/prefs_autoload.phtml:15
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "No"
 msgstr "Не"
 
 #: db_datadict.php:156 js/messages.php:443 libraries/Index.class.php:568
 #: libraries/Index.class.php:605 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261
-#: libraries/controllers/StructureController.class.php:1344
-#: libraries/controllers/StructureController.class.php:2223
-#: libraries/controllers/StructureController.class.php:2232
-#: libraries/controllers/StructureController.class.php:2237
-#: libraries/controllers/StructureController.class.php:2242
-#: libraries/controllers/StructureController.class.php:2247
+#: libraries/config/FormDisplay.tpl.php:272
+#: libraries/controllers/TableStructureController.class.php:539
+#: libraries/controllers/TableStructureController.class.php:1201
+#: libraries/controllers/TableStructureController.class.php:1210
+#: libraries/controllers/TableStructureController.class.php:1215
+#: libraries/controllers/TableStructureController.class.php:1220
+#: libraries/controllers/TableStructureController.class.php:1225
 #: libraries/mult_submits.inc.php:82 libraries/mult_submits.inc.php:178
 #: libraries/mult_submits.lib.php:339 libraries/mult_submits.lib.php:372
 #: libraries/mult_submits.lib.php:401 libraries/mult_submits.lib.php:415
@@ -218,8 +219,8 @@ msgstr "Не"
 #: libraries/plugins/export/ExportOdt.class.php:756
 #: libraries/plugins/export/ExportTexytext.class.php:567
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1077
-#: libraries/server_databases.lib.php:464
-#: libraries/server_databases.lib.php:474
+#: libraries/server_databases.lib.php:475
+#: libraries/server_databases.lib.php:485
 #: libraries/server_privileges.lib.php:2546
 #: libraries/server_privileges.lib.php:2727
 #: libraries/server_privileges.lib.php:2748
@@ -229,7 +230,7 @@ msgstr "Не"
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1008 libraries/tracking.lib.php:1013
 #: prefs_manage.php:138 templates/prefs_autoload.phtml:14
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "Yes"
 msgstr "Да"
 
@@ -239,7 +240,7 @@ msgstr "Прикажи садржај (схему) базе"
 
 #: db_export.php:37 db_tracking.php:90 export.php:382
 #: libraries/DBQbe.class.php:326
-#: libraries/controllers/StructureController.class.php:231
+#: libraries/controllers/DatabaseStructureController.class.php:170
 #: libraries/navigation/NavigationTree.class.php:897
 msgid "No tables found in database."
 msgstr "Табеле нису пронађене у бази."
@@ -250,14 +251,14 @@ msgstr "Табеле нису пронађене у бази."
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:26
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:120
-#: templates/structure/show_create.phtml:18
+#: templates/database/structure/show_create.phtml:18
 msgid "Tables"
 msgstr "Табеле"
 
 #: db_export.php:52 libraries/Menu.class.php:317 libraries/Menu.class.php:425
-#: libraries/Util.class.php:3333 libraries/Util.class.php:3343
-#: libraries/Util.class.php:3349 libraries/Util.class.php:3629
-#: libraries/Util.class.php:4327 libraries/Util.class.php:4344
+#: libraries/Util.class.php:3339 libraries/Util.class.php:3349
+#: libraries/Util.class.php:3355 libraries/Util.class.php:3635
+#: libraries/Util.class.php:4333 libraries/Util.class.php:4350
 #: libraries/central_columns.lib.php:728 libraries/config.values.php:39
 #: libraries/config.values.php:47 libraries/config.values.php:109
 #: libraries/config.values.php:115 libraries/config/setup.forms.php:323
@@ -271,7 +272,7 @@ msgstr "Табеле"
 #: libraries/navigation/Nodes/Node_Table.class.php:283
 #: libraries/server_privileges.lib.php:1141 libraries/tracking.lib.php:874
 #: templates/columns_definitions/table_fields_definitions.phtml:3
-#: templates/designer/table_list.phtml:28
+#: templates/database/designer/table_list.phtml:28
 msgid "Structure"
 msgstr "Структура"
 
@@ -283,7 +284,7 @@ msgstr "Структура"
 #: libraries/config/user_preferences.forms.php:292
 #: libraries/config/user_preferences.forms.php:297
 #: libraries/server_privileges.lib.php:1140
-#: templates/structure/display_table_stats.phtml:12
+#: templates/table/structure/display_table_stats.phtml:12
 msgid "Data"
 msgstr "Подаци"
 
@@ -369,10 +370,10 @@ msgstr "Провери табелу"
 #: libraries/server_privileges.lib.php:2908
 #: libraries/server_privileges.lib.php:3145
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4346
-#: templates/structure/table_header.phtml:21
-#: templates/tbl_relation/foreign_key_row.phtml:176
-#: templates/tbl_relation/internal_relational_row.phtml:63
+#: libraries/server_privileges.lib.php:4372
+#: templates/database/structure/table_header.phtml:21
+#: templates/table/relation/foreign_key_row.phtml:176
+#: templates/table/relation/internal_relational_row.phtml:63
 msgid "Table"
 msgstr "Табела"
 
@@ -391,7 +392,7 @@ msgid "Updated"
 msgstr "Ажурирано"
 
 #: db_tracking.php:130 js/messages.php:243 libraries/Menu.class.php:552
-#: libraries/Util.class.php:4314 libraries/config.values.php:104
+#: libraries/Util.class.php:4320 libraries/config.values.php:104
 #: libraries/rte/rte_events.lib.php:393 libraries/rte/rte_list.lib.php:101
 #: libraries/server_status_processes.lib.php:92 libraries/tracking.lib.php:279
 msgid "Status"
@@ -400,14 +401,15 @@ msgstr "Статус"
 #: db_tracking.php:131 db_tracking.php:290 libraries/Index.class.php:693
 #: libraries/central_columns.lib.php:687 libraries/rte/rte_list.lib.php:74
 #: libraries/rte/rte_list.lib.php:89 libraries/rte/rte_list.lib.php:102
-#: libraries/server_databases.lib.php:398
+#: libraries/server_databases.lib.php:409
 #: libraries/server_privileges.lib.php:2372
 #: libraries/server_privileges.lib.php:3166
 #: libraries/server_privileges.lib.php:3342
 #: libraries/server_user_groups.lib.php:82
 #: libraries/server_variables.lib.php:189 libraries/tracking.lib.php:280
-#: libraries/tracking.lib.php:793 templates/structure/table_header.phtml:30
-#: templates/structure/table_structure_header.phtml:23
+#: libraries/tracking.lib.php:793
+#: templates/database/structure/table_header.phtml:30
+#: templates/table/structure/table_structure_header.phtml:23
 msgid "Action"
 msgstr "Акција"
 
@@ -452,7 +454,7 @@ msgid "Untracked tables"
 msgstr "Провери табелу"
 
 #: db_tracking.php:305 db_tracking.php:336
-#: templates/structure/optional_action_links.phtml:17
+#: templates/table/structure/optional_action_links.phtml:17
 msgid "Track table"
 msgstr "Прати табелу"
 
@@ -503,7 +505,7 @@ msgid "Value for the column \"%s\""
 msgstr "Вредност за колону %s"
 
 #: gis_data_editor.php:146
-#: templates/gis_visualization/gis_visualization.phtml:37
+#: templates/table/gis_visualization/gis_visualization.phtml:37
 msgid "Use OpenStreetMaps as Base Layer"
 msgstr "Искористи OpenStreetMaps као основни слој"
 
@@ -593,35 +595,35 @@ msgstr "Додај геометрију"
 #: libraries/display_change_password.lib.php:162
 #: libraries/display_export.lib.php:402 libraries/display_export.lib.php:408
 #: libraries/display_import.lib.php:392 libraries/index.lib.php:44
-#: libraries/insert_edit.lib.php:1546 libraries/insert_edit.lib.php:1583
+#: libraries/insert_edit.lib.php:1544 libraries/insert_edit.lib.php:1581
 #: libraries/normalization.lib.php:165 libraries/normalization.lib.php:821
 #: libraries/operations.lib.php:38 libraries/operations.lib.php:108
 #: libraries/operations.lib.php:263 libraries/operations.lib.php:306
 #: libraries/operations.lib.php:801 libraries/operations.lib.php:874
 #: libraries/operations.lib.php:923 libraries/operations.lib.php:1337
 #: libraries/operations.lib.php:1658
-#: libraries/plugins/auth/AuthenticationCookie.class.php:244
+#: libraries/plugins/auth/AuthenticationCookie.class.php:232
 #: libraries/replication_gui.lib.php:122 libraries/replication_gui.lib.php:161
 #: libraries/replication_gui.lib.php:324 libraries/replication_gui.lib.php:461
 #: libraries/replication_gui.lib.php:906 libraries/rte/rte_events.lib.php:509
-#: libraries/rte/rte_routines.lib.php:969
-#: libraries/rte/rte_routines.lib.php:1581
+#: libraries/rte/rte_routines.lib.php:1060
+#: libraries/rte/rte_routines.lib.php:1672
 #: libraries/rte/rte_triggers.lib.php:396 libraries/server_bin_log.lib.php:61
 #: libraries/server_privileges.lib.php:705
 #: libraries/server_privileges.lib.php:2106
 #: libraries/server_privileges.lib.php:2872
 #: libraries/server_privileges.lib.php:3553
-#: libraries/server_privileges.lib.php:4627
+#: libraries/server_privileges.lib.php:4653
 #: libraries/server_user_groups.lib.php:285
 #: libraries/sql_query_form.lib.php:369 libraries/sql_query_form.lib.php:429
 #: libraries/tracking.lib.php:533 libraries/tracking.lib.php:653
 #: prefs_manage.php:277 prefs_manage.php:355
 #: templates/columns_definitions/column_definitions_form.phtml:59
-#: templates/header_location.phtml:17 templates/index_form.phtml:238
+#: templates/database/create_table.phtml:21 templates/header_location.phtml:28
 #: templates/startAndNumberOfRowsPanel.phtml:14
-#: templates/structure/add_column.phtml:25
-#: templates/table/create_table.phtml:21
-#: templates/table/selection_form.phtml:75 view_create.php:275
+#: templates/table/index_form.phtml:238
+#: templates/table/search/selection_form.phtml:75
+#: templates/table/structure/add_column.phtml:25 view_create.php:275
 #: view_operations.php:106
 msgid "Go"
 msgstr "Крени"
@@ -716,7 +718,7 @@ msgstr ""
 msgid "Could not load import plugins, please check your installation!"
 msgstr "Не могу да учитам додатке за увоз, молим проверите своју инсталацију!"
 
-#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1466
+#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1460
 #, fuzzy, php-format
 #| msgid "Bookmark %s created"
 msgid "Bookmark %s has been created."
@@ -759,12 +761,12 @@ msgstr ""
 msgid "Back"
 msgstr "Назад"
 
-#: index.php:148 libraries/Footer.class.php:70
+#: index.php:149 libraries/Footer.class.php:70
 #, fuzzy
 msgid "phpMyAdmin Demo Server"
 msgstr "phpMyAdmin документација"
 
-#: index.php:152
+#: index.php:153
 #, php-format
 msgid ""
 "You are using the demo server. You can do anything here, but please do not "
@@ -772,49 +774,49 @@ msgid ""
 "at %s."
 msgstr ""
 
-#: index.php:162
+#: index.php:163
 #, fuzzy
 #| msgid "General relation features"
 msgid "General Settings"
 msgstr "Опште особине релација"
 
-#: index.php:190 libraries/display_change_password.lib.php:50
+#: index.php:191 libraries/display_change_password.lib.php:50
 #: libraries/display_change_password.lib.php:53 user_password.php:247
 msgid "Change password"
 msgstr "Промени лозинку"
 
-#: index.php:206
+#: index.php:207
 #, fuzzy
 #| msgid "MySQL connection collation"
 msgid "Server connection collation"
 msgstr "Сортирање за MySQL везу"
 
-#: index.php:228
+#: index.php:229
 msgid "Appearance Settings"
 msgstr ""
 
-#: index.php:258 prefs_manage.php:285
+#: index.php:259 prefs_manage.php:285
 #, fuzzy
 #| msgid "General relation features"
 msgid "More settings"
 msgstr "Опште особине релација"
 
-#: index.php:279
+#: index.php:280
 #, fuzzy
 #| msgid "Database for user"
 msgid "Database server"
 msgstr "База за корисника"
 
-#: index.php:282 libraries/plugins/auth/AuthenticationCookie.class.php:181
+#: index.php:283 libraries/plugins/auth/AuthenticationCookie.class.php:169
 msgid "Server:"
 msgstr "Сервер:"
 
-#: index.php:286
+#: index.php:287
 #, fuzzy
 msgid "Server type:"
 msgstr "ИД сервера"
 
-#: index.php:290 libraries/plugins/export/ExportLatex.class.php:212
+#: index.php:291 libraries/plugins/export/ExportLatex.class.php:212
 #: libraries/plugins/export/ExportSql.class.php:687
 #: libraries/plugins/export/ExportXml.class.php:189
 #, fuzzy
@@ -822,86 +824,86 @@ msgstr "ИД сервера"
 msgid "Server version:"
 msgstr "Верзија сервера"
 
-#: index.php:296
+#: index.php:297
 #, fuzzy
 #| msgid "Protocol version"
 msgid "Protocol version:"
 msgstr "Верзија протокола"
 
-#: index.php:300
+#: index.php:301
 #, fuzzy
 #| msgid "User"
 msgid "User:"
 msgstr "Корисник"
 
-#: index.php:305
+#: index.php:306
 #, fuzzy
 msgid "Server charset:"
 msgstr "Избор сервера"
 
-#: index.php:320
+#: index.php:321
 msgid "Web server"
 msgstr ""
 
-#: index.php:331
+#: index.php:332
 #, fuzzy
 msgid "Database client version:"
 msgstr "Верзија MySQL клијента"
 
-#: index.php:335
+#: index.php:336
 #, fuzzy
 msgid "PHP extension:"
 msgstr "верзија PHP-a"
 
-#: index.php:349
+#: index.php:350
 #, fuzzy
 #| msgid "PHP Version"
 msgid "PHP version:"
 msgstr "верзија PHP-a"
 
-#: index.php:360
+#: index.php:361
 msgid "Show PHP information"
 msgstr "Прикажи информације о PHP-у"
 
-#: index.php:383
+#: index.php:384
 #, fuzzy
 #| msgid "Version information"
 msgid "Version information:"
 msgstr "Информације о верзији"
 
-#: index.php:392 libraries/Util.class.php:432 libraries/Util.class.php:495
-#: libraries/config/FormDisplay.tpl.php:151
+#: index.php:393 libraries/Util.class.php:432 libraries/Util.class.php:495
+#: libraries/config/FormDisplay.tpl.php:162
 #: libraries/display_export.lib.php:577 libraries/engines/pbxt.lib.php:162
 #: libraries/navigation/NavigationHeader.class.php:196
 #: libraries/server_variables.lib.php:160
 msgid "Documentation"
 msgstr "Документација"
 
-#: index.php:399
+#: index.php:400
 msgid "Wiki"
 msgstr ""
 
-#: index.php:408
+#: index.php:409
 msgid "Official Homepage"
 msgstr "phpMyAdmin веб сајт"
 
-#: index.php:415
+#: index.php:416
 #, fuzzy
 #| msgid "Attributes"
 msgid "Contribute"
 msgstr "Атрибути"
 
-#: index.php:422
+#: index.php:423
 msgid "Get support"
 msgstr ""
 
-#: index.php:429
+#: index.php:430
 #, fuzzy
 #| msgid "No change"
 msgid "List of changes"
 msgstr "Нема измена"
 
-#: index.php:451
+#: index.php:452
 #, fuzzy
 #| msgid ""
 #| "Your configuration file contains settings (root with no password) that "
@@ -919,7 +921,7 @@ msgstr ""
 "овим подешавањима, отворен је за упаде, и заиста треба да исправите овај "
 "сигурносни ризик."
 
-#: index.php:468
+#: index.php:469
 msgid ""
 "You have enabled mbstring.func_overload in your PHP configuration. This "
 "option is incompatible with phpMyAdmin and might cause some data to be "
@@ -928,7 +930,7 @@ msgstr ""
 "У PHP подешавањима Вам је укључена mbstring.func_overload опција. Ова опција "
 "је некомпатибилна са phpMyAdmin и може довести до грешака у неким подацима!"
 
-#: index.php:483
+#: index.php:484
 msgid ""
 "The mbstring PHP extension was not found and you seem to be using a "
 "multibyte charset. Without the mbstring extension phpMyAdmin is unable to "
@@ -938,7 +940,7 @@ msgstr ""
 "скуп знакова. Без екстензије mbstring phpMyAdmin не може исправно да "
 "раздваја стрингове и то може довести до неочекиваних резултата."
 
-#: index.php:500
+#: index.php:501
 msgid ""
 "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini."
 "session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower than "
@@ -946,17 +948,17 @@ msgid ""
 "expire sooner than configured in phpMyAdmin."
 msgstr ""
 
-#: index.php:519
+#: index.php:520
 msgid ""
 "Login cookie store is lower than cookie validity configured in phpMyAdmin, "
 "because of this, your login will expire sooner than configured in phpMyAdmin."
 msgstr ""
 
-#: index.php:535
+#: index.php:536
 msgid "The configuration file now needs a secret passphrase (blowfish_secret)."
 msgstr "Конфигурациона датотека захтева тајну лозинку (blowfish_secret)."
 
-#: index.php:548
+#: index.php:549
 msgid ""
 "Directory [code]config[/code], which is used by the setup script, still "
 "exists in your phpMyAdmin directory. It is strongly recommended to remove it "
@@ -964,7 +966,7 @@ msgid ""
 "may be compromised by unauthorized people downloading your configuration."
 msgstr ""
 
-#: index.php:564
+#: index.php:565
 #, fuzzy, php-format
 #| msgid ""
 #| "ditional features for working with linked tables have been ctivated. To d "
@@ -976,12 +978,12 @@ msgstr ""
 "Додатне могућности за рад са повезаним табелама су искључене. Да бисте "
 "сазнали зашто, кликните %sовде%s."
 
-#: index.php:571
+#: index.php:572
 msgid ""
 "Or alternately go to 'Operations' tab of any database to set it up there."
 msgstr ""
 
-#: index.php:620
+#: index.php:621
 #, php-format
 msgid ""
 "Your PHP MySQL library version %s differs from your MySQL server version %s. "
@@ -990,7 +992,7 @@ msgstr ""
 "Верзија ваше PHP MySQL библиотеке %s се разликује од верзије вашег MySQL "
 "сервера %s. Ово може довести до непредвидљивог понашања."
 
-#: index.php:648
+#: index.php:649
 #, php-format
 msgid ""
 "Server running with Suhosin. Please refer to %sdocumentation%s for possible "
@@ -1162,8 +1164,8 @@ msgstr ""
 msgid "Save & Close"
 msgstr "Сачувај као датотеку"
 
-#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:404
-#: libraries/insert_edit.lib.php:1550 prefs_manage.php:361
+#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:415
+#: libraries/insert_edit.lib.php:1548 prefs_manage.php:361
 #: prefs_manage.php:372
 msgid "Reset"
 msgstr "Поништи"
@@ -1208,7 +1210,7 @@ msgstr "Додај ново поље"
 msgid "Edit Index"
 msgstr "Уреди следећи ред"
 
-#: js/messages.php:99 templates/index_form.phtml:232
+#: js/messages.php:99 templates/table/index_form.phtml:232
 #, fuzzy, php-format
 #| msgid "Add %s field(s)"
 msgid "Add %s column(s) to index"
@@ -1238,15 +1240,16 @@ msgstr "Поља ограничена са"
 msgid "Please select column(s) for the index."
 msgstr "Додај %s поља"
 
-#: js/messages.php:106 templates/structure/add_column.phtml:1
+#: js/messages.php:106 templates/table/structure/add_column.phtml:1
 #, fuzzy
 #| msgid "You have to add at least one field."
 msgid "You have to add at least one column."
 msgstr "Морате додати барем једно поље."
 
-#: js/messages.php:109 libraries/insert_edit.lib.php:1548
+#: js/messages.php:109 libraries/insert_edit.lib.php:1546
 #: templates/columns_definitions/column_definitions_form.phtml:162
-#: templates/index_form.phtml:237 templates/tbl_relation/common_form.phtml:106
+#: templates/table/index_form.phtml:237
+#: templates/table/relation/common_form.phtml:106
 msgid "Preview SQL"
 msgstr ""
 
@@ -1269,7 +1272,7 @@ msgid "SQL query:"
 msgstr "SQL упит"
 
 #. l10n: Default label for the y-Axis of Charts
-#: js/messages.php:118 templates/tbl_chart.phtml:109
+#: js/messages.php:118 templates/table/chart/tbl_chart.phtml:109
 #, fuzzy
 #| msgid "Value"
 msgid "Y Values"
@@ -1450,7 +1453,7 @@ msgstr ""
 msgid "Bytes received"
 msgstr "Примљено"
 
-#: js/messages.php:169 libraries/server_status.lib.php:226
+#: js/messages.php:169 libraries/server_status.lib.php:235
 msgid "Connections"
 msgstr "Конекције"
 
@@ -1509,12 +1512,12 @@ msgstr "%s табела"
 msgid "Questions"
 msgstr "Персијски"
 
-#: js/messages.php:184 libraries/server_status.lib.php:134
+#: js/messages.php:184 libraries/server_status.lib.php:143
 msgid "Traffic"
 msgstr "Саобраћај"
 
 #: js/messages.php:185 libraries/Menu.class.php:586
-#: libraries/Util.class.php:4318 libraries/server_status_monitor.lib.php:257
+#: libraries/Util.class.php:4324 libraries/server_status_monitor.lib.php:257
 #, fuzzy
 #| msgid "General relation features"
 msgid "Settings"
@@ -1538,8 +1541,9 @@ msgstr ""
 #: libraries/server_status_monitor.lib.php:236
 #: libraries/server_status_processes.lib.php:308
 #: templates/columns_definitions/transformation.phtml:4
-#: templates/designer/options_panel.phtml:178
-#: templates/table/options_zoom.phtml:12 templates/table/rows_zoom.phtml:26
+#: templates/database/designer/options_panel.phtml:178
+#: templates/table/search/options_zoom.phtml:12
+#: templates/table/search/rows_zoom.phtml:26
 msgid "None"
 msgstr "нема"
 
@@ -1841,8 +1845,8 @@ msgstr ""
 
 #: js/messages.php:270 libraries/Menu.class.php:352
 #: libraries/Menu.class.php:455 libraries/Menu.class.php:582
-#: libraries/Util.class.php:4317 libraries/Util.class.php:4332
-#: libraries/Util.class.php:4349 libraries/config/messages.inc.php:258
+#: libraries/Util.class.php:4323 libraries/Util.class.php:4338
+#: libraries/Util.class.php:4355 libraries/config/messages.inc.php:258
 #: libraries/display_import.lib.php:105
 #: libraries/server_status_monitor.lib.php:318 prefs_manage.php:238
 #: setup/frames/menu.inc.php:26
@@ -1912,13 +1916,13 @@ msgid "Formatting SQL..."
 msgstr ""
 
 #: js/messages.php:293 libraries/server_variables.lib.php:157
-#: templates/designer/aggregate_query_panel.phtml:63
-#: templates/designer/delete_relation_panel.phtml:28
-#: templates/designer/having_query_panel.phtml:117
-#: templates/designer/new_relation_panel.phtml:88
-#: templates/designer/options_panel.phtml:253
-#: templates/designer/rename_to_panel.phtml:45
-#: templates/designer/where_query_panel.phtml:83
+#: templates/database/designer/aggregate_query_panel.phtml:63
+#: templates/database/designer/delete_relation_panel.phtml:28
+#: templates/database/designer/having_query_panel.phtml:117
+#: templates/database/designer/new_relation_panel.phtml:88
+#: templates/database/designer/options_panel.phtml:253
+#: templates/database/designer/rename_to_panel.phtml:45
+#: templates/database/designer/where_query_panel.phtml:83
 msgid "Cancel"
 msgstr "Откажи"
 
@@ -1928,7 +1932,7 @@ msgstr "Откажи"
 msgid "Page-related settings"
 msgstr "Опште особине релација"
 
-#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:402
+#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:413
 msgid "Apply"
 msgstr ""
 
@@ -1966,8 +1970,8 @@ msgstr ""
 msgid "Error text: %s"
 msgstr ""
 
-#: js/messages.php:307 libraries/db_common.inc.php:68
-#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:450
+#: js/messages.php:307 libraries/db_common.inc.php:69
+#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:461
 msgid "No databases selected."
 msgstr "Није изабрана ни једна база."
 
@@ -1979,12 +1983,13 @@ msgstr ""
 msgid "Adding Primary Key"
 msgstr ""
 
-#: js/messages.php:310 templates/designer/aggregate_query_panel.phtml:59
-#: templates/designer/having_query_panel.phtml:113
-#: templates/designer/new_relation_panel.phtml:87
-#: templates/designer/options_panel.phtml:252
-#: templates/designer/rename_to_panel.phtml:41
-#: templates/designer/where_query_panel.phtml:82
+#: js/messages.php:310
+#: templates/database/designer/aggregate_query_panel.phtml:59
+#: templates/database/designer/having_query_panel.phtml:113
+#: templates/database/designer/new_relation_panel.phtml:87
+#: templates/database/designer/options_panel.phtml:252
+#: templates/database/designer/rename_to_panel.phtml:41
+#: templates/database/designer/where_query_panel.phtml:82
 msgid "OK"
 msgstr "У реду"
 
@@ -2010,7 +2015,7 @@ msgstr "Копирај базу у"
 msgid "Changing Charset"
 msgstr "Карактер сет"
 
-#: js/messages.php:320 libraries/Util.class.php:3217
+#: js/messages.php:320 libraries/Util.class.php:3223
 #, fuzzy
 #| msgid "Disable foreign key checks"
 msgid "Enable foreign key checks"
@@ -2057,20 +2062,21 @@ msgstr ""
 #: js/messages.php:334 libraries/DisplayResults.class.php:4834
 #: libraries/DisplayResults.class.php:5092 libraries/Menu.class.php:344
 #: libraries/Menu.class.php:446 libraries/Menu.class.php:578
-#: libraries/Util.class.php:3636 libraries/Util.class.php:3637
-#: libraries/Util.class.php:4316 libraries/Util.class.php:4331
-#: libraries/Util.class.php:4348 libraries/config/messages.inc.php:252
+#: libraries/Util.class.php:3642 libraries/Util.class.php:3643
+#: libraries/Util.class.php:4322 libraries/Util.class.php:4337
+#: libraries/Util.class.php:4354 libraries/config/messages.inc.php:252
 #: libraries/display_export.lib.php:173 libraries/rte/rte_list.lib.php:146
 #: libraries/server_privileges.lib.php:2211
 #: libraries/server_privileges.lib.php:2290
 #: libraries/server_privileges.lib.php:2632
 #: libraries/server_privileges.lib.php:3356
 #: libraries/server_status_monitor.lib.php:322 prefs_manage.php:303
-#: setup/frames/menu.inc.php:27 templates/structure/check_all_tables.phtml:11
+#: setup/frames/menu.inc.php:27
+#: templates/database/structure/check_all_tables.phtml:11
 msgid "Export"
 msgstr "Извоз"
 
-#: js/messages.php:337 libraries/rte/rte_routines.lib.php:652
+#: js/messages.php:337 libraries/rte/rte_routines.lib.php:743
 msgid "ENUM/SET editor"
 msgstr ""
 
@@ -2112,7 +2118,7 @@ msgstr "SQL упит"
 #: libraries/Console.class.php:214 libraries/DisplayResults.class.php:3474
 #: libraries/DisplayResults.class.php:4818 libraries/Index.class.php:723
 #: libraries/Util.class.php:706 libraries/Util.class.php:1202
-#: libraries/Util.class.php:3634 libraries/Util.class.php:3635
+#: libraries/Util.class.php:3640 libraries/Util.class.php:3641
 #: libraries/central_columns.lib.php:851
 #: libraries/central_columns.lib.php:1193
 #: libraries/config/messages.inc.php:892
@@ -2130,7 +2136,7 @@ msgstr "Промени"
 #: libraries/server_user_groups.lib.php:129
 #: libraries/sql_query_form.lib.php:416 libraries/tracking.lib.php:477
 #: setup/frames/index.inc.php:183 setup/frames/index.inc.php:291
-#: templates/designer/delete_relation_panel.phtml:27
+#: templates/database/designer/delete_relation_panel.phtml:27
 msgid "Delete"
 msgstr "Обриши"
 
@@ -2311,11 +2317,11 @@ msgid "No dependencies selected!"
 msgstr "Није изабрана ни једна база."
 
 #: js/messages.php:394 libraries/central_columns.lib.php:1214
-#: libraries/insert_edit.lib.php:1458 libraries/server_variables.lib.php:155
+#: libraries/insert_edit.lib.php:1456 libraries/server_variables.lib.php:155
 #: setup/frames/config.inc.php:42 setup/frames/index.inc.php:279
 #: templates/columns_definitions/column_definitions_form.phtml:165
-#: templates/gis_visualization/gis_visualization.phtml:48
-#: templates/tbl_relation/common_form.phtml:107
+#: templates/table/gis_visualization/gis_visualization.phtml:48
+#: templates/table/relation/common_form.phtml:107
 msgid "Save"
 msgstr "Сачувај"
 
@@ -2407,8 +2413,8 @@ msgid "Data point content"
 msgstr "Величина показивача података"
 
 #: js/messages.php:430 js/messages.php:562 js/messages.php:579
-#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2573
-#: templates/index_form.phtml:154 templates/index_form.phtml:194
+#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2571
+#: templates/table/index_form.phtml:154 templates/table/index_form.phtml:194
 msgid "Ignore"
 msgstr "Игнориши"
 
@@ -2471,8 +2477,8 @@ msgstr "Изабери страни кључ"
 msgid "Please select the primary key or a unique key!"
 msgstr "Молимо изаберите примарни или јединствени кључ"
 
-#: js/messages.php:457 templates/designer/side_menu.phtml:91
-#: templates/designer/side_menu.phtml:94
+#: js/messages.php:457 templates/database/designer/side_menu.phtml:91
+#: templates/database/designer/side_menu.phtml:94
 #, fuzzy
 #| msgid "Choose field to display"
 msgid "Choose column to display"
@@ -2490,22 +2496,22 @@ msgstr ""
 msgid "Page name"
 msgstr "Број стране:"
 
-#: js/messages.php:463 templates/designer/side_menu.phtml:56
-#: templates/designer/side_menu.phtml:59
+#: js/messages.php:463 templates/database/designer/side_menu.phtml:56
+#: templates/database/designer/side_menu.phtml:59
 #, fuzzy
 #| msgid "Select All"
 msgid "Save page"
 msgstr "Изабери све"
 
-#: js/messages.php:464 templates/designer/side_menu.phtml:63
-#: templates/designer/side_menu.phtml:66
+#: js/messages.php:464 templates/database/designer/side_menu.phtml:63
+#: templates/database/designer/side_menu.phtml:66
 #, fuzzy
 #| msgid "Select All"
 msgid "Save page as"
 msgstr "Изабери све"
 
-#: js/messages.php:465 templates/designer/side_menu.phtml:49
-#: templates/designer/side_menu.phtml:52
+#: js/messages.php:465 templates/database/designer/side_menu.phtml:49
+#: templates/database/designer/side_menu.phtml:52
 #, fuzzy
 #| msgid "Free pages"
 msgid "Open page"
@@ -2517,7 +2523,7 @@ msgstr "Слободне стране"
 msgid "Delete page"
 msgstr "Изабери све"
 
-#: js/messages.php:467 templates/designer/side_menu.phtml:10
+#: js/messages.php:467 templates/database/designer/side_menu.phtml:10
 msgid "Untitled"
 msgstr ""
 
@@ -2641,7 +2647,7 @@ msgstr "Оригинална позиција"
 msgid "cancel"
 msgstr "Откажи"
 
-#: js/messages.php:499 libraries/server_status.lib.php:271
+#: js/messages.php:499 libraries/server_status.lib.php:280
 msgid "Aborted"
 msgstr "Прекинуто"
 
@@ -3323,7 +3329,7 @@ msgstr "%d није исправан број реда."
 
 #: js/messages.php:793 libraries/Message.class.php:199
 #: libraries/Util.class.php:654 libraries/core.lib.php:245
-#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1172
+#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1170
 #: tbl_operations.php:229 view_operations.php:63
 msgid "Error"
 msgstr "Грешка"
@@ -3383,8 +3389,8 @@ msgstr "у секунди"
 msgid "per minute"
 msgstr "у минуту"
 
-#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:143
-#: libraries/server_status.lib.php:228
+#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:152
+#: libraries/server_status.lib.php:237
 #: libraries/server_status_queries.lib.php:98
 msgid "per hour"
 msgstr "на сат"
@@ -3402,7 +3408,7 @@ msgstr ""
 msgid "Wrong permissions on configuration file, should not be world writable!"
 msgstr ""
 
-#: libraries/Config.class.php:1799
+#: libraries/Config.class.php:1801
 msgid "Font size"
 msgstr "Величина фонта"
 
@@ -3432,10 +3438,10 @@ msgstr "у упиту"
 #: libraries/server_privileges.lib.php:2890
 #: libraries/server_privileges.lib.php:3144
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4332
+#: libraries/server_privileges.lib.php:4358
 #: libraries/server_status_processes.lib.php:80
-#: templates/tbl_relation/foreign_key_row.phtml:165
-#: templates/tbl_relation/internal_relational_row.phtml:55
+#: templates/table/relation/foreign_key_row.phtml:165
+#: templates/table/relation/internal_relational_row.phtml:55
 msgid "Database"
 msgstr "База података"
 
@@ -3543,11 +3549,11 @@ msgstr "SQL историјат"
 #: libraries/plugins/import/ImportMediawiki.class.php:60
 #: libraries/plugins/import/ImportOds.class.php:59
 #: libraries/plugins/import/ImportShp.class.php:57
-#: libraries/plugins/import/ImportSql.class.php:148
+#: libraries/plugins/import/ImportSql.class.php:51
 #: libraries/plugins/import/ImportXml.class.php:58
-#: libraries/rte/rte_routines.lib.php:833 templates/index_form.phtml:49
-#: templates/structure/row_stats_table.phtml:20
-#: templates/table/options.phtml:2
+#: libraries/rte/rte_routines.lib.php:924 templates/table/index_form.phtml:49
+#: templates/table/search/options.phtml:2
+#: templates/table/structure/row_stats_table.phtml:20
 msgid "Options"
 msgstr "Опције"
 
@@ -3588,7 +3594,8 @@ msgstr "Опадајући"
 msgid "Order:"
 msgstr ""
 
-#: libraries/Console.class.php:289 templates/table/replace_preview.phtml:17
+#: libraries/Console.class.php:289
+#: templates/table/search/replace_preview.phtml:17
 #, fuzzy
 #| msgid "Column"
 msgid "Count"
@@ -3707,9 +3714,9 @@ msgstr "Пређи на копирану табелу"
 #: libraries/operations.lib.php:794 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:191
-#: templates/structure/sortable_header.phtml:21
-#: templates/structure/sortable_header.phtml:38
-#: templates/table/options.phtml:68
+#: templates/database/structure/sortable_header.phtml:21
+#: templates/database/structure/sortable_header.phtml:38
+#: templates/table/search/options.phtml:68
 msgid "Ascending"
 msgstr "Растући"
 
@@ -3719,13 +3726,14 @@ msgstr "Растући"
 #: libraries/operations.lib.php:797 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:188
-#: templates/structure/sortable_header.phtml:26
-#: templates/structure/sortable_header.phtml:43
-#: templates/table/options.phtml:69
+#: templates/database/structure/sortable_header.phtml:26
+#: templates/database/structure/sortable_header.phtml:43
+#: templates/table/search/options.phtml:69
 msgid "Descending"
 msgstr "Опадајући"
 
-#: libraries/DBQbe.class.php:467 templates/table/search_and_replace.phtml:6
+#: libraries/DBQbe.class.php:467
+#: templates/table/search/search_and_replace.phtml:6
 #, fuzzy
 #| msgid "Column"
 msgid "Column:"
@@ -3914,12 +3922,12 @@ msgstr[1] "%s погодака унутар табеле <i>%s</i>"
 msgstr[2] "%s погодака унутар табеле <i>%s</i>"
 
 #: libraries/DbSearch.class.php:354 libraries/Menu.class.php:311
-#: libraries/Util.class.php:3337 libraries/Util.class.php:3347
-#: libraries/Util.class.php:3623 libraries/Util.class.php:3624
-#: libraries/Util.class.php:4343 libraries/config.values.php:43
+#: libraries/Util.class.php:3343 libraries/Util.class.php:3353
+#: libraries/Util.class.php:3629 libraries/Util.class.php:3630
+#: libraries/Util.class.php:4349 libraries/config.values.php:43
 #: libraries/config.values.php:51 libraries/config.values.php:119
 #: libraries/navigation/Nodes/Node_Table.class.php:295
-#: templates/structure/check_all_table_column.phtml:5
+#: templates/table/structure/check_all_table_column.phtml:5
 msgid "Browse"
 msgstr "Преглед"
 
@@ -3939,7 +3947,8 @@ msgstr "Претраживање базе"
 msgid "Words or values to search for (wildcard: \"%\"):"
 msgstr "Речи или вредности које се траже (џокер: \"%\"):"
 
-#: libraries/DbSearch.class.php:401 templates/table/search_and_replace.phtml:1
+#: libraries/DbSearch.class.php:401
+#: templates/table/search/search_and_replace.phtml:1
 msgid "Find:"
 msgstr "Тражи:"
 
@@ -3993,16 +4002,16 @@ msgstr "Датотеке"
 msgid "Search this table"
 msgstr "Претраживање базе"
 
-#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2532
-#: libraries/Util.class.php:2535
+#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2538
+#: libraries/Util.class.php:2541
 #, fuzzy
 #| msgid "Begin"
 msgctxt "First page"
 msgid "Begin"
 msgstr "Почетак"
 
-#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2533
-#: libraries/Util.class.php:2536 libraries/server_bin_log.lib.php:170
+#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2539
+#: libraries/Util.class.php:2542 libraries/server_bin_log.lib.php:170
 #: libraries/server_bin_log.lib.php:172
 #, fuzzy
 #| msgid "Previous"
@@ -4010,8 +4019,8 @@ msgctxt "Previous page"
 msgid "Previous"
 msgstr "Претходна"
 
-#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2564
-#: libraries/Util.class.php:2574 libraries/server_bin_log.lib.php:204
+#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2570
+#: libraries/Util.class.php:2580 libraries/server_bin_log.lib.php:204
 #: libraries/server_bin_log.lib.php:206
 #, fuzzy
 #| msgid "Next"
@@ -4019,8 +4028,8 @@ msgctxt "Next page"
 msgid "Next"
 msgstr "Следећи"
 
-#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2565
-#: libraries/Util.class.php:2575
+#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2571
+#: libraries/Util.class.php:2581
 #, fuzzy
 #| msgid "End"
 msgctxt "Last page"
@@ -4110,9 +4119,9 @@ msgid "May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]."
 msgstr "Може бити приближно. Видите [doc@faq3-11]FAQ 3.11[/doc]"
 
 #: libraries/DisplayResults.class.php:4332 libraries/Message.class.php:180
-#: libraries/controllers/TableRelationController.class.php:258
+#: libraries/controllers/TableRelationController.class.php:259
 #: libraries/controllers/TableSearchController.class.php:655
-#: libraries/rte/rte_routines.lib.php:1332 libraries/sql_query_form.lib.php:89
+#: libraries/rte/rte_routines.lib.php:1423 libraries/sql_query_form.lib.php:89
 #: tbl_operations.php:227 tbl_row_action.php:138 view_operations.php:62
 #, fuzzy
 #| msgid "Your SQL query has been executed successfully."
@@ -4120,7 +4129,7 @@ msgid "Your SQL query has been executed successfully."
 msgstr "Ваш SQL упит је успешно извршен"
 
 #: libraries/DisplayResults.class.php:4660
-#: libraries/controllers/StructureController.class.php:629
+#: libraries/controllers/DatabaseStructureController.class.php:564
 #, php-format
 msgid ""
 "This view has at least this number of rows. Please refer to %sdocumentation"
@@ -4144,34 +4153,34 @@ msgstr ""
 msgid "%d total"
 msgstr "укупно"
 
-#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1318
+#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1312
 #, fuzzy, php-format
 #| msgid "Query took %01.4f sec"
 msgid "Query took %01.4f seconds."
 msgstr "Упит је трајао %01.4f секунди"
 
 #: libraries/DisplayResults.class.php:4807
-#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4767
-#: libraries/Util.class.php:4773 libraries/mult_submits.inc.php:50
-#: templates/structure/check_all_tables.phtml:2
-#: templates/structure/check_all_tables.phtml:9
+#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4773
+#: libraries/Util.class.php:4779 libraries/mult_submits.inc.php:50
+#: templates/database/structure/check_all_tables.phtml:2
+#: templates/database/structure/check_all_tables.phtml:9
 msgid "With selected:"
 msgstr "Означено:"
 
 #: libraries/DisplayResults.class.php:4811
-#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4769
-#: libraries/Util.class.php:4770 libraries/server_privileges.lib.php:1174
+#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4775
+#: libraries/Util.class.php:4776 libraries/server_privileges.lib.php:1174
 #: libraries/server_privileges.lib.php:1175
 #: libraries/server_privileges.lib.php:1387
 #: libraries/server_user_groups.lib.php:231
-#: templates/structure/check_all_tables.phtml:3
-#: templates/structure/check_all_tables.phtml:4
+#: templates/database/structure/check_all_tables.phtml:3
+#: templates/database/structure/check_all_tables.phtml:4
 msgid "Check All"
 msgstr "Означи све"
 
 #: libraries/DisplayResults.class.php:4985 libraries/Header.class.php:383
-#: templates/structure/optional_action_links.phtml:1
-#: templates/structure/print_view_data_dictionary_link.phtml:3
+#: templates/database/structure/print_view_data_dictionary_link.phtml:3
+#: templates/table/structure/optional_action_links.phtml:1
 msgid "Print view"
 msgstr "За штампу"
 
@@ -4179,7 +4188,8 @@ msgstr "За штампу"
 msgid "Query results operations"
 msgstr "Операције на резултатима упита"
 
-#: libraries/DisplayResults.class.php:5105 templates/tbl_chart.phtml:12
+#: libraries/DisplayResults.class.php:5105
+#: templates/table/chart/tbl_chart.phtml:12
 #, fuzzy
 #| msgid "Display PDF schema"
 msgid "Display chart"
@@ -4285,7 +4295,7 @@ msgid "Click on the bar to scroll to top of page"
 msgstr ""
 
 #: libraries/Header.class.php:749
-#: libraries/plugins/auth/AuthenticationCookie.class.php:152
+#: libraries/plugins/auth/AuthenticationCookie.class.php:140
 #, fuzzy
 #| msgid "Cookies must be enabled past this point."
 msgid "Javascript must be enabled past this point!"
@@ -4309,11 +4319,11 @@ msgid "Keyname"
 msgstr "Име кључа"
 
 #: libraries/Index.class.php:697
-#: libraries/controllers/StructureController.class.php:1962
-#: libraries/controllers/StructureController.class.php:1967
+#: libraries/controllers/TableStructureController.class.php:953
+#: libraries/controllers/TableStructureController.class.php:958
 #: libraries/tracking.lib.php:973
 #: templates/columns_definitions/column_indexes.phtml:11
-#: templates/structure/check_all_table_column.phtml:26
+#: templates/table/structure/check_all_table_column.phtml:26
 msgid "Unique"
 msgstr "Јединствени"
 
@@ -4332,16 +4342,17 @@ msgstr "Кардиналност"
 #: libraries/server_collations.lib.php:35 libraries/tracking.lib.php:881
 #: libraries/tracking.lib.php:977
 #: templates/columns_definitions/table_fields_definitions.phtml:33
-#: templates/structure/row_stats_table.phtml:31
-#: templates/structure/table_header.phtml:55
-#: templates/structure/table_structure_header.phtml:7
-#: templates/table/table_header.phtml:8
+#: templates/database/structure/table_header.phtml:55
+#: templates/table/search/table_header.phtml:8
+#: templates/table/structure/row_stats_table.phtml:31
+#: templates/table/structure/table_structure_header.phtml:7
 msgid "Collation"
 msgstr "Сортирање"
 
 #: libraries/Index.class.php:703 libraries/rte/rte_events.lib.php:496
-#: libraries/rte/rte_routines.lib.php:956 libraries/tracking.lib.php:885
-#: libraries/tracking.lib.php:979 templates/structure/table_header.phtml:84
+#: libraries/rte/rte_routines.lib.php:1047 libraries/tracking.lib.php:885
+#: libraries/tracking.lib.php:979
+#: templates/database/structure/table_header.phtml:84
 #, fuzzy
 msgid "Comment"
 msgstr "Коментари"
@@ -4355,15 +4366,15 @@ msgstr "Примарни кључ је обрисан."
 msgid "Index %s has been dropped."
 msgstr "Кључ %s је обрисан."
 
-#: libraries/Index.class.php:757 libraries/Util.class.php:3630
-#: libraries/Util.class.php:3631
-#: libraries/controllers/StructureController.class.php:1958
-#: libraries/controllers/StructureController.class.php:1959
+#: libraries/Index.class.php:757 libraries/Util.class.php:3636
+#: libraries/Util.class.php:3637
+#: libraries/controllers/TableStructureController.class.php:949
+#: libraries/controllers/TableStructureController.class.php:950
 #: libraries/operations.lib.php:1607 libraries/rte/rte_list.lib.php:150
 #: libraries/server_databases.lib.php:146
-#: templates/structure/check_all_table_column.phtml:15
-#: templates/structure/check_all_tables.phtml:16
-#: templates/tbl_relation/foreign_key_row.phtml:93
+#: templates/database/structure/check_all_tables.phtml:16
+#: templates/table/relation/foreign_key_row.phtml:93
+#: templates/table/structure/check_all_table_column.phtml:15
 msgid "Drop"
 msgstr "Одбаци"
 
@@ -4392,16 +4403,16 @@ msgstr "Сервер"
 #: libraries/Menu.class.php:248
 #: libraries/navigation/Nodes/Node_View.class.php:32
 #: libraries/tbl_info.inc.php:63
-#: templates/structure/structure_table_row.phtml:97
-#: templates/structure/structure_table_row.phtml:159
+#: templates/database/structure/structure_table_row.phtml:97
+#: templates/database/structure/structure_table_row.phtml:159
 msgid "View"
 msgstr "Поглед"
 
 #: libraries/Menu.class.php:325 libraries/Menu.class.php:429
-#: libraries/Menu.class.php:548 libraries/Util.class.php:3334
-#: libraries/Util.class.php:3344 libraries/Util.class.php:3350
-#: libraries/Util.class.php:4313 libraries/Util.class.php:4328
-#: libraries/Util.class.php:4345 libraries/config.values.php:40
+#: libraries/Menu.class.php:548 libraries/Util.class.php:3340
+#: libraries/Util.class.php:3350 libraries/Util.class.php:3356
+#: libraries/Util.class.php:4319 libraries/Util.class.php:4334
+#: libraries/Util.class.php:4351 libraries/config.values.php:40
 #: libraries/config.values.php:48 libraries/config.values.php:110
 #: libraries/config.values.php:116 libraries/config/messages.inc.php:321
 #: libraries/navigation/Nodes/Node_Table.class.php:292
@@ -4409,19 +4420,19 @@ msgid "SQL"
 msgstr "SQL"
 
 #: libraries/Menu.class.php:328 libraries/Menu.class.php:432
-#: libraries/Util.class.php:3335 libraries/Util.class.php:3345
-#: libraries/Util.class.php:3351 libraries/Util.class.php:3625
-#: libraries/Util.class.php:3626 libraries/Util.class.php:4329
-#: libraries/Util.class.php:4346 libraries/config.values.php:41
+#: libraries/Util.class.php:3341 libraries/Util.class.php:3351
+#: libraries/Util.class.php:3357 libraries/Util.class.php:3631
+#: libraries/Util.class.php:3632 libraries/Util.class.php:4335
+#: libraries/Util.class.php:4352 libraries/config.values.php:41
 #: libraries/config.values.php:49 libraries/config.values.php:111
 #: libraries/config.values.php:117
 #: libraries/navigation/Nodes/Node_Table.class.php:286
 msgid "Search"
 msgstr "Претраживање"
 
-#: libraries/Menu.class.php:338 libraries/Util.class.php:3336
-#: libraries/Util.class.php:3346 libraries/Util.class.php:3627
-#: libraries/Util.class.php:3628 libraries/Util.class.php:4347
+#: libraries/Menu.class.php:338 libraries/Util.class.php:3342
+#: libraries/Util.class.php:3352 libraries/Util.class.php:3633
+#: libraries/Util.class.php:3634 libraries/Util.class.php:4353
 #: libraries/config.values.php:42 libraries/config.values.php:50
 #: libraries/config.values.php:118
 #: libraries/navigation/Nodes/Node_Table.class.php:289
@@ -4430,30 +4441,30 @@ msgid "Insert"
 msgstr "Нови запис"
 
 #: libraries/Menu.class.php:362 libraries/Menu.class.php:467
-#: libraries/Util.class.php:4334 libraries/Util.class.php:4350
+#: libraries/Util.class.php:4340 libraries/Util.class.php:4356
 #: libraries/config.values.php:106 libraries/server_common.lib.php:51
 #: libraries/server_privileges.lib.php:2370
 #: libraries/server_privileges.lib.php:3158
-#: libraries/server_privileges.lib.php:4221
+#: libraries/server_privileges.lib.php:4247
 msgid "Privileges"
 msgstr "Привилегије"
 
 #: libraries/Menu.class.php:371 libraries/Menu.class.php:379
-#: libraries/Menu.class.php:459 libraries/Util.class.php:3338
-#: libraries/Util.class.php:3352 libraries/Util.class.php:4333
-#: libraries/Util.class.php:4351 libraries/config.values.php:112
+#: libraries/Menu.class.php:459 libraries/Util.class.php:3344
+#: libraries/Util.class.php:3358 libraries/Util.class.php:4339
+#: libraries/Util.class.php:4357 libraries/config.values.php:112
 #: view_operations.php:92
 msgid "Operations"
 msgstr "Операције"
 
 #: libraries/Menu.class.php:384 libraries/Menu.class.php:492
-#: libraries/Util.class.php:4338 libraries/Util.class.php:4352
+#: libraries/Util.class.php:4344 libraries/Util.class.php:4358
 #: libraries/relation.lib.php:255
 msgid "Tracking"
 msgstr ""
 
 #: libraries/Menu.class.php:397 libraries/Menu.class.php:486
-#: libraries/Util.class.php:4337 libraries/Util.class.php:4353
+#: libraries/Util.class.php:4343 libraries/Util.class.php:4359
 #: libraries/navigation/Nodes/Node_Trigger_Container.class.php:24
 #: libraries/plugins/export/ExportHtmlword.class.php:557
 #: libraries/plugins/export/ExportOdt.class.php:685
@@ -4470,16 +4481,16 @@ msgstr "Окидачи"
 msgid "Database seems to be empty!"
 msgstr "База је изгледа празна!"
 
-#: libraries/Menu.class.php:439 libraries/Util.class.php:4330
+#: libraries/Menu.class.php:439 libraries/Util.class.php:4336
 msgid "Query"
 msgstr "Упит по примеру"
 
-#: libraries/Menu.class.php:472 libraries/Util.class.php:4335
+#: libraries/Menu.class.php:472 libraries/Util.class.php:4341
 #: libraries/rte/rte_words.lib.php:36
 msgid "Routines"
 msgstr "Рутине"
 
-#: libraries/Menu.class.php:479 libraries/Util.class.php:4336
+#: libraries/Menu.class.php:479 libraries/Util.class.php:4342
 #: libraries/navigation/Nodes/Node_Event_Container.class.php:26
 #: libraries/plugins/export/ExportSql.class.php:940
 #: libraries/plugins/export/ExportXml.class.php:107
@@ -4488,22 +4499,22 @@ msgstr "Рутине"
 msgid "Events"
 msgstr "Догађаји"
 
-#: libraries/Menu.class.php:498 libraries/Util.class.php:4339
+#: libraries/Menu.class.php:498 libraries/Util.class.php:4345
 msgid "Designer"
 msgstr "Дизајнер"
 
-#: libraries/Menu.class.php:507 libraries/Util.class.php:4340
-#: templates/structure/check_all_tables.phtml:35
+#: libraries/Menu.class.php:507 libraries/Util.class.php:4346
+#: templates/database/structure/check_all_tables.phtml:35
 #, fuzzy
 #| msgid "Add/Delete Field Columns"
 msgid "Central columns"
 msgstr "Додај/обриши колону"
 
-#: libraries/Menu.class.php:544 libraries/Util.class.php:4312
+#: libraries/Menu.class.php:544 libraries/Util.class.php:4318
 #: libraries/config.values.php:103 libraries/config/messages.inc.php:266
 #: libraries/config/messages.inc.php:341
 #: libraries/navigation/NavigationTree.class.php:1239
-#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4332
+#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4358
 msgid "Databases"
 msgstr "Базе"
 
@@ -4514,34 +4525,34 @@ msgid "User accounts"
 msgstr "Корисник"
 
 #: libraries/Menu.class.php:595 libraries/ServerStatusData.class.php:121
-#: libraries/Util.class.php:4319 libraries/server_common.lib.php:36
+#: libraries/Util.class.php:4325 libraries/server_common.lib.php:36
 msgid "Binary log"
 msgstr "Бинарни дневник"
 
 #: libraries/Menu.class.php:601 libraries/ServerStatusData.class.php:126
-#: libraries/Util.class.php:4320 libraries/server_common.lib.php:42
-#: templates/structure/body_for_table_summary.phtml:10
-#: templates/structure/table_header.phtml:27
+#: libraries/Util.class.php:4326 libraries/server_common.lib.php:42
+#: templates/database/structure/body_for_table_summary.phtml:10
+#: templates/database/structure/table_header.phtml:27
 msgid "Replication"
 msgstr "Репликација"
 
 #: libraries/Menu.class.php:606 libraries/ServerStatusData.class.php:193
-#: libraries/Util.class.php:4321 libraries/config.values.php:105
+#: libraries/Util.class.php:4327 libraries/config.values.php:105
 #: libraries/server_engines.lib.php:108 libraries/server_engines.lib.php:112
 #: libraries/sql_query_form.lib.php:421
 msgid "Variables"
 msgstr "Променљиве"
 
-#: libraries/Menu.class.php:610 libraries/Util.class.php:4322
+#: libraries/Menu.class.php:610 libraries/Util.class.php:4328
 msgid "Charsets"
 msgstr "Кодне стране"
 
-#: libraries/Menu.class.php:615 libraries/Util.class.php:4323
+#: libraries/Menu.class.php:615 libraries/Util.class.php:4329
 #: libraries/server_common.lib.php:33 libraries/server_plugins.lib.php:27
 msgid "Plugins"
 msgstr ""
 
-#: libraries/Menu.class.php:626 libraries/Util.class.php:4324
+#: libraries/Menu.class.php:626 libraries/Util.class.php:4330
 msgid "Engines"
 msgstr "Складиштења"
 
@@ -4568,7 +4579,7 @@ msgid_plural "%1$d rows inserted."
 msgstr[0] "Нема одабраних редова"
 msgstr[1] "Нема одабраних редова"
 
-#: libraries/PDF.class.php:70 libraries/Util.class.php:2521
+#: libraries/PDF.class.php:70 libraries/Util.class.php:2527
 #: libraries/browse_foreigners.lib.php:327
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:865
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:890
@@ -4595,7 +4606,7 @@ msgid "Could not save favorite table!"
 msgstr "Не могу да учитам подразумевану конфигурацију из: \"%1$s\""
 
 #: libraries/RecentFavoriteTable.class.php:212
-#: templates/structure/favorite_anchor.phtml:12
+#: templates/database/structure/favorite_anchor.phtml:12
 #, fuzzy
 #| msgid "Remove database"
 msgid "Remove from Favorites"
@@ -4780,7 +4791,7 @@ msgid ""
 msgstr "Нема детаљнијих информација о статусу за овај погон складиштења."
 
 #: libraries/StorageEngine.class.php:373
-#: templates/structure/body_for_table_summary.phtml:50
+#: templates/database/structure/body_for_table_summary.phtml:50
 #, php-format
 msgid "%s is the default storage engine on this MySQL server."
 msgstr "%s је подразумевани погон складиштења на овом MySQL серверу."
@@ -5212,10 +5223,10 @@ msgstr ""
 
 #: libraries/Util.class.php:726 libraries/rte/rte_events.lib.php:110
 #: libraries/rte/rte_events.lib.php:119 libraries/rte/rte_events.lib.php:150
-#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:153
-#: libraries/rte/rte_routines.lib.php:162
-#: libraries/rte/rte_routines.lib.php:235
-#: libraries/rte/rte_routines.lib.php:1366
+#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:223
+#: libraries/rte/rte_routines.lib.php:250
+#: libraries/rte/rte_routines.lib.php:372
+#: libraries/rte/rte_routines.lib.php:1457
 #: libraries/rte/rte_triggers.lib.php:86 libraries/rte/rte_triggers.lib.php:95
 #: libraries/rte/rte_triggers.lib.php:127
 msgid "MySQL said: "
@@ -5261,79 +5272,82 @@ msgstr "Нед"
 msgid "%B %d, %Y at %I:%M %p"
 msgstr "%d. %B %Y. у %H:%M"
 
-#: libraries/Util.class.php:2019
+#: libraries/Util.class.php:2025
 #, php-format
 msgid "%s days, %s hours, %s minutes and %s seconds"
 msgstr "%s дана, %s сати, %s минута и %s секунди"
 
-#: libraries/Util.class.php:2112
+#: libraries/Util.class.php:2118
 #, fuzzy
 #| msgid "Routines"
 msgid "Missing parameter:"
 msgstr "Рутине"
 
-#: libraries/Util.class.php:2645
+#: libraries/Util.class.php:2651
 #, php-format
 msgid "Jump to database \"%s\"."
 msgstr "Пређи на базу \"%s\"."
 
-#: libraries/Util.class.php:2670
+#: libraries/Util.class.php:2676
 #, php-format
 msgid "The %s functionality is affected by a known bug, see %s"
 msgstr "Ова функционалност %s је погођена познатом грешком, видите %s"
 
-#: libraries/Util.class.php:2881
+#: libraries/Util.class.php:2887
 msgid "Click to toggle"
 msgstr ""
 
-#: libraries/Util.class.php:3542 prefs_manage.php:248
+#: libraries/Util.class.php:3548 prefs_manage.php:248
 msgid "Browse your computer:"
 msgstr ""
 
-#: libraries/Util.class.php:3567
+#: libraries/Util.class.php:3573
 #, fuzzy, php-format
 #| msgid "web server upload directory"
 msgid "Select from the web server upload directory <b>%s</b>:"
 msgstr "директоријум за слање веб сервера "
 
-#: libraries/Util.class.php:3596 libraries/insert_edit.lib.php:1173
+#: libraries/Util.class.php:3602 libraries/insert_edit.lib.php:1171
 msgid "The directory you set for upload work cannot be reached."
 msgstr "Директоријум који сте изабрали за слање није доступан."
 
-#: libraries/Util.class.php:3607
+#: libraries/Util.class.php:3613
 #, fuzzy
 msgid "There are no files to upload!"
 msgstr "Провери табелу"
 
-#: libraries/Util.class.php:3632 libraries/Util.class.php:3633
-#: templates/structure/check_all_tables.phtml:15
+#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: templates/database/structure/check_all_tables.phtml:15
 msgid "Empty"
 msgstr "Испразни"
 
-#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: libraries/Util.class.php:3644 libraries/Util.class.php:3645
 msgid "Execute"
 msgstr ""
 
-#: libraries/Util.class.php:4152
+#: libraries/Util.class.php:4158
 msgid "Print"
 msgstr "Штампај"
 
-#: libraries/Util.class.php:4257 templates/structure/row_stats_table.phtml:80
-#: templates/structure/table_header.phtml:95
+#: libraries/Util.class.php:4263
+#: templates/database/structure/table_header.phtml:95
+#: templates/table/structure/row_stats_table.phtml:80
 msgid "Creation"
 msgstr "Направљено"
 
-#: libraries/Util.class.php:4263 templates/structure/row_stats_table.phtml:87
-#: templates/structure/table_header.phtml:106
+#: libraries/Util.class.php:4269
+#: templates/database/structure/table_header.phtml:106
+#: templates/table/structure/row_stats_table.phtml:87
 msgid "Last update"
 msgstr "Последња измена"
 
-#: libraries/Util.class.php:4269 templates/structure/row_stats_table.phtml:94
-#: templates/structure/table_header.phtml:117
+#: libraries/Util.class.php:4275
+#: templates/database/structure/table_header.phtml:117
+#: templates/table/structure/row_stats_table.phtml:94
 msgid "Last check"
 msgstr "Последња провера"
 
-#: libraries/Util.class.php:4315
+#: libraries/Util.class.php:4321
 #, fuzzy
 #| msgid "User"
 msgid "Users"
@@ -5358,16 +5372,16 @@ msgid "Use this value"
 msgstr "Користи ову вредност"
 
 #: libraries/build_html_for_db.lib.php:33 libraries/import.lib.php:193
-#: templates/structure/actions_in_table_structure.phtml:113
-#: templates/structure/row_stats_table.phtml:42
-#: templates/structure/table_header.phtml:36
+#: templates/database/structure/table_header.phtml:36
+#: templates/table/structure/actions_in_table_structure.phtml:113
+#: templates/table/structure/row_stats_table.phtml:42
 msgid "Rows"
 msgstr "Редова"
 
 #: libraries/build_html_for_db.lib.php:48 libraries/engines/innodb.lib.php:171
-#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:186
-#: libraries/server_status.lib.php:298
-#: templates/structure/display_table_stats.phtml:40
+#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:195
+#: libraries/server_status.lib.php:307
+#: templates/table/structure/display_table_stats.phtml:40
 msgid "Total"
 msgstr "Укупно"
 
@@ -5377,10 +5391,12 @@ msgid "Jump to database"
 msgstr "База не постоји"
 
 #: libraries/build_html_for_db.lib.php:146
+#: templates/database/structure/structure_table_row.phtml:15
 msgid "Not replicated"
 msgstr ""
 
 #: libraries/build_html_for_db.lib.php:158
+#: templates/database/structure/structure_table_row.phtml:16
 #, fuzzy
 #| msgid "Replication"
 msgid "Replicated"
@@ -5439,17 +5455,17 @@ msgstr ""
 #: libraries/plugins/export/ExportTexytext.class.php:425
 #: libraries/plugins/export/PMA_ExportPdf.class.php:307
 #: libraries/rte/rte_list.lib.php:73 libraries/rte/rte_list.lib.php:85
-#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:830
-#: libraries/rte/rte_routines.lib.php:1492 setup/frames/index.inc.php:162
+#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:921
+#: libraries/rte/rte_routines.lib.php:1583 setup/frames/index.inc.php:162
 #: templates/columns_definitions/table_fields_definitions.phtml:8
-#: templates/structure/table_structure_header.phtml:5
-#: templates/table/create_table.phtml:11
+#: templates/database/create_table.phtml:11
+#: templates/table/structure/table_structure_header.phtml:5
 msgid "Name"
 msgstr "Име"
 
 #: libraries/central_columns.lib.php:699
 #: libraries/central_columns.lib.php:1381
-#: libraries/rte/rte_routines.lib.php:832
+#: libraries/rte/rte_routines.lib.php:923
 #: templates/columns_definitions/table_fields_definitions.phtml:14
 msgid "Length/Values"
 msgstr "Дужина/Вредност*"
@@ -5472,7 +5488,7 @@ msgid "Select a table"
 msgstr "Изабери табеле"
 
 #: libraries/central_columns.lib.php:804
-#: templates/structure/add_column.phtml:4
+#: templates/table/structure/add_column.phtml:4
 #, fuzzy
 #| msgid "Add %s field(s)"
 msgid "Add column"
@@ -5494,7 +5510,7 @@ msgstr "Додај %s поља"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1002
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1025
 #: templates/columns_definitions/table_fields_definitions.phtml:36
-#: templates/structure/table_structure_header.phtml:8
+#: templates/table/structure/table_structure_header.phtml:8
 msgid "Attributes"
 msgstr "Атрибути"
 
@@ -5618,7 +5634,7 @@ msgid "Double click"
 msgstr ""
 
 #: libraries/config.values.php:95 libraries/config.values.php:124
-#: libraries/config/FormDisplay.tpl.php:221 libraries/relation.lib.php:97
+#: libraries/config/FormDisplay.tpl.php:232 libraries/relation.lib.php:97
 #: libraries/relation.lib.php:105
 msgid "Disabled"
 msgstr "Онемогућено"
@@ -5810,21 +5826,21 @@ msgstr ""
 msgid "maximum %s"
 msgstr ""
 
-#: libraries/config/FormDisplay.tpl.php:219
+#: libraries/config/FormDisplay.tpl.php:230
 msgid "This setting is disabled, it will not be applied to your configuration."
 msgstr ""
 
-#: libraries/config/FormDisplay.tpl.php:313
+#: libraries/config/FormDisplay.tpl.php:324
 #, php-format
 msgid "Set value: %s"
 msgstr ""
 
-#: libraries/config/FormDisplay.tpl.php:318
+#: libraries/config/FormDisplay.tpl.php:329
 #: libraries/config/messages.inc.php:610
 msgid "Restore default value"
 msgstr ""
 
-#: libraries/config/FormDisplay.tpl.php:332
+#: libraries/config/FormDisplay.tpl.php:343
 msgid "Allow users to customize this value"
 msgstr ""
 
@@ -6263,7 +6279,7 @@ msgstr "Карактер сет датотеке:"
 
 #: libraries/config/messages.inc.php:136 libraries/config/messages.inc.php:152
 #: libraries/sql_query_form.lib.php:247
-#: templates/structure/row_stats_table.phtml:7
+#: templates/table/structure/row_stats_table.phtml:7
 msgid "Format"
 msgstr "Формат"
 
@@ -6830,7 +6846,7 @@ msgstr ""
 
 #: libraries/config/messages.inc.php:332
 #: libraries/plugins/export/ExportPdf.class.php:279
-#: templates/structure/secondary_tabs.phtml:8
+#: templates/table/secondary_tabs.phtml:8
 #, fuzzy
 #| msgid "Database for user"
 msgid "Table structure"
@@ -8469,112 +8485,35 @@ msgstr "Microsoft Word 2000"
 msgid "OpenDocument Text"
 msgstr "Open Document Text"
 
-#: libraries/controllers/StructureController.class.php:465
+#: libraries/controllers/DatabaseStructureController.class.php:405
 #: tbl_operations.php:382
 #, php-format
 msgid "Table %s has been emptied."
 msgstr "Табела %s је испражњена."
 
-#: libraries/controllers/StructureController.class.php:486
+#: libraries/controllers/DatabaseStructureController.class.php:426
 #: tbl_operations.php:400 view_operations.php:119
 #, fuzzy, php-format
 #| msgid "View %s has been dropped."
 msgid "View %s has been dropped."
 msgstr "Поглед %s је одбачен"
 
-#: libraries/controllers/StructureController.class.php:487
+#: libraries/controllers/DatabaseStructureController.class.php:427
 #: tbl_operations.php:401
 #, fuzzy, php-format
 #| msgid "Table %s has been dropped."
 msgid "Table %s has been dropped."
 msgstr "Табела %s је одбачена"
 
-#: libraries/controllers/StructureController.class.php:797
-#, php-format
-msgid "The name '%s' is a MySQL reserved keyword."
-msgid_plural "The names '%s' are MySQL reserved keywords."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: libraries/controllers/StructureController.class.php:875
-#, fuzzy
-#| msgid "No rows selected"
-msgid "No column selected."
-msgstr "Нема одабраних редова"
-
-#: libraries/controllers/StructureController.class.php:1049
+#: libraries/controllers/DatabaseStructureController.class.php:733
 msgid "Favorite List is full!"
 msgstr ""
 
-#: libraries/controllers/StructureController.class.php:1272
-#, fuzzy
-#| msgid "The selected users have been deleted successfully."
-msgid "The columns have been moved successfully."
-msgstr "Изабрани корисници су успешно обрисани."
-
-#: libraries/controllers/StructureController.class.php:1535
-#, fuzzy, php-format
-msgid ""
-"Table %1$s has been altered successfully. Privileges have been adjusted."
-msgstr "Изабрани корисници су успешно обрисани."
-
-#: libraries/controllers/StructureController.class.php:1541
-#: libraries/controllers/TableIndexesController.class.php:161
-#: tbl_addfield.php:92
-#, fuzzy, php-format
-msgid "Table %1$s has been altered successfully."
-msgstr "Изабрани корисници су успешно обрисани."
-
-#: libraries/controllers/StructureController.class.php:1588
-#: libraries/tracking.lib.php:1094
-#, fuzzy
-#| msgid "Query type"
-msgid "Query error"
-msgstr "Врста упита"
-
-#: libraries/controllers/StructureController.class.php:1806
+#: libraries/controllers/DatabaseStructureController.class.php:947
 #: libraries/mysql_charsets.lib.php:366 libraries/mysql_charsets.lib.php:373
 msgid "unknown"
 msgstr "непознат"
 
-#: libraries/controllers/StructureController.class.php:1957
-#: templates/structure/check_all_table_column.phtml:11
-msgid "Change"
-msgstr "Промени"
-
-#: libraries/controllers/StructureController.class.php:1961
-#: libraries/controllers/StructureController.class.php:1966
-#: libraries/navigation/Nodes/Node_Index.class.php:30
-#: libraries/tracking.lib.php:926
-#: templates/columns_definitions/column_indexes.phtml:16
-#: templates/columns_definitions/table_fields_definitions.phtml:57
-#: templates/structure/check_all_table_column.phtml:30
-#: templates/structure/display_structure.phtml:79
-#: templates/structure/display_table_stats.phtml:19
-msgid "Index"
-msgstr "Кључ"
-
-#: libraries/controllers/StructureController.class.php:1963
-#: libraries/controllers/StructureController.class.php:1968
-#: templates/columns_definitions/column_indexes.phtml:27
-#: templates/structure/check_all_table_column.phtml:37
-msgid "Spatial"
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1964
-#: libraries/controllers/StructureController.class.php:1969
-#: templates/columns_definitions/column_indexes.phtml:22
-#: templates/structure/check_all_table_column.phtml:47
-msgid "Fulltext"
-msgstr "Текст кључ"
-
-#: libraries/controllers/StructureController.class.php:1970
-#, fuzzy
-#| msgid "Browse distinct values"
-msgid "Distinct values"
-msgstr "Прегледај различите вредности"
-
 #: libraries/controllers/TableChartController.class.php:82
 #: libraries/controllers/TableGisVisualizationController.class.php:101
 msgid "No SQL query was set to fetch data."
@@ -8590,13 +8529,20 @@ msgstr ""
 msgid "No data to display"
 msgstr "База не постоји"
 
-#: libraries/controllers/TableRelationController.class.php:217
+#: libraries/controllers/TableIndexesController.class.php:161
+#: libraries/controllers/TableStructureController.class.php:736
+#: tbl_addfield.php:92
+#, fuzzy, php-format
+msgid "Table %1$s has been altered successfully."
+msgstr "Изабрани корисници су успешно обрисани."
+
+#: libraries/controllers/TableRelationController.class.php:218
 #, fuzzy
 #| msgid "Thread %s was successfully killed."
 msgid "Display column was successfully updated."
 msgstr "Процес %s је успешно прекинут."
 
-#: libraries/controllers/TableRelationController.class.php:283
+#: libraries/controllers/TableRelationController.class.php:288
 #, fuzzy
 #| msgid "Internal relation added"
 msgid "Internal relations were successfully updated."
@@ -8615,11 +8561,81 @@ msgid "Zoom search"
 msgstr "Претраживање"
 
 #: libraries/controllers/TableSearchController.class.php:852
-#: templates/table/selection_form.phtml:59
+#: templates/table/search/selection_form.phtml:59
 #, fuzzy
 msgid "Find and replace"
 msgstr "SQL упит"
 
+#: libraries/controllers/TableStructureController.class.php:163
+#, php-format
+msgid "The name '%s' is a MySQL reserved keyword."
+msgid_plural "The names '%s' are MySQL reserved keywords."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: libraries/controllers/TableStructureController.class.php:241
+#, fuzzy
+#| msgid "No rows selected"
+msgid "No column selected."
+msgstr "Нема одабраних редова"
+
+#: libraries/controllers/TableStructureController.class.php:467
+#, fuzzy
+#| msgid "The selected users have been deleted successfully."
+msgid "The columns have been moved successfully."
+msgstr "Изабрани корисници су успешно обрисани."
+
+#: libraries/controllers/TableStructureController.class.php:730
+#, fuzzy, php-format
+msgid ""
+"Table %1$s has been altered successfully. Privileges have been adjusted."
+msgstr "Изабрани корисници су успешно обрисани."
+
+#: libraries/controllers/TableStructureController.class.php:783
+#: libraries/tracking.lib.php:1094
+#, fuzzy
+#| msgid "Query type"
+msgid "Query error"
+msgstr "Врста упита"
+
+#: libraries/controllers/TableStructureController.class.php:948
+#: templates/table/structure/check_all_table_column.phtml:11
+msgid "Change"
+msgstr "Промени"
+
+#: libraries/controllers/TableStructureController.class.php:952
+#: libraries/controllers/TableStructureController.class.php:957
+#: libraries/navigation/Nodes/Node_Index.class.php:30
+#: libraries/tracking.lib.php:926
+#: templates/columns_definitions/column_indexes.phtml:16
+#: templates/columns_definitions/table_fields_definitions.phtml:57
+#: templates/table/structure/check_all_table_column.phtml:30
+#: templates/table/structure/display_structure.phtml:79
+#: templates/table/structure/display_table_stats.phtml:19
+msgid "Index"
+msgstr "Кључ"
+
+#: libraries/controllers/TableStructureController.class.php:954
+#: libraries/controllers/TableStructureController.class.php:959
+#: templates/columns_definitions/column_indexes.phtml:27
+#: templates/table/structure/check_all_table_column.phtml:37
+msgid "Spatial"
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:955
+#: libraries/controllers/TableStructureController.class.php:960
+#: templates/columns_definitions/column_indexes.phtml:22
+#: templates/table/structure/check_all_table_column.phtml:47
+msgid "Fulltext"
+msgstr "Текст кључ"
+
+#: libraries/controllers/TableStructureController.class.php:963
+#, fuzzy
+#| msgid "Browse distinct values"
+msgid "Distinct values"
+msgstr "Прегледај различите вредности"
+
 #: libraries/core.lib.php:306
 #, php-format
 msgid "The %s extension is missing. Please check your PHP configuration."
@@ -8666,7 +8682,7 @@ msgid "No Password"
 msgstr "Нема лозинке"
 
 #: libraries/display_change_password.lib.php:68
-#: libraries/plugins/auth/AuthenticationCookie.class.php:199
+#: libraries/plugins/auth/AuthenticationCookie.class.php:187
 #: libraries/replication_gui.lib.php:422 libraries/replication_gui.lib.php:862
 #: libraries/server_privileges.lib.php:1640
 msgid "Password:"
@@ -9511,12 +9527,12 @@ msgid "Dump has been saved to file %s."
 msgstr "Садржај базе је сачуван у датотеку %s."
 
 #: libraries/import.lib.php:202 libraries/insert_edit.lib.php:124
-#: libraries/rte/rte_routines.lib.php:1353 libraries/sql.lib.php:1312
+#: libraries/rte/rte_routines.lib.php:1444 libraries/sql.lib.php:1306
 #: tbl_get_field.php:44
 msgid "MySQL returned an empty result set (i.e. zero rows)."
 msgstr "MySQL је вратио празан резултат (нула редова)."
 
-#: libraries/import.lib.php:265 libraries/sql.lib.php:1326
+#: libraries/import.lib.php:265 libraries/sql.lib.php:1320
 msgid "[ROLLBACK occurred.]"
 msgstr ""
 
@@ -9582,14 +9598,14 @@ msgstr "Направи кључ на&nbsp;%s&nbsp;колона"
 
 #: libraries/insert_edit.lib.php:233
 #: libraries/navigation/Nodes/Node_DatabaseChild.class.php:48
-#: templates/designer/table_list.phtml:40
+#: templates/database/designer/table_list.phtml:40
 msgid "Hide"
 msgstr "Сакриј"
 
 #: libraries/insert_edit.lib.php:249
 #: libraries/navigation/Nodes/Node_Function.class.php:32
-#: libraries/rte/rte_routines.lib.php:1495
-#: templates/table/table_header.phtml:4
+#: libraries/rte/rte_routines.lib.php:1586
+#: templates/table/search/table_header.phtml:4
 msgid "Function"
 msgstr "Функција"
 
@@ -9604,90 +9620,91 @@ msgstr "Бинарни"
 msgid "Because of its length,<br /> this column might not be editable."
 msgstr "Због њехове величине, поље<br />можда нећете моћи да измените"
 
-#: libraries/insert_edit.lib.php:1050
+#: libraries/insert_edit.lib.php:1048
 msgid "Binary - do not edit"
 msgstr "Бинарни - не мењај"
 
-#: libraries/insert_edit.lib.php:1176 libraries/server_privileges.lib.php:470
-#: templates/table/options.phtml:36
+#: libraries/insert_edit.lib.php:1174 libraries/server_privileges.lib.php:470
+#: templates/table/search/options.phtml:36
 msgid "Or"
 msgstr "или"
 
-#: libraries/insert_edit.lib.php:1177
+#: libraries/insert_edit.lib.php:1175
 #, fuzzy
 #| msgid "web server upload directory"
 msgid "web server upload directory:"
 msgstr "директоријум за слање веб сервера"
 
-#: libraries/insert_edit.lib.php:1348 templates/table/input_box.phtml:49
+#: libraries/insert_edit.lib.php:1346
+#: templates/table/search/input_box.phtml:49
 #, fuzzy
 #| msgid "Insert"
 msgid "Edit/Insert"
 msgstr "Нови запис"
 
-#: libraries/insert_edit.lib.php:1398
+#: libraries/insert_edit.lib.php:1396
 #, fuzzy, php-format
 #| msgid "Restart insertion with %s rows"
 msgid "Continue insertion with %s rows"
 msgstr "Поново покрени уношење са %s редова"
 
-#: libraries/insert_edit.lib.php:1428
+#: libraries/insert_edit.lib.php:1426
 msgid "and then"
 msgstr "и онда"
 
-#: libraries/insert_edit.lib.php:1461
+#: libraries/insert_edit.lib.php:1459
 msgid "Insert as new row"
 msgstr "Унеси као нови ред"
 
-#: libraries/insert_edit.lib.php:1464
+#: libraries/insert_edit.lib.php:1462
 msgid "Insert as new row and ignore errors"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1467
+#: libraries/insert_edit.lib.php:1465
 #, fuzzy
 msgid "Show insert query"
 msgstr "Приказ као SQL упит"
 
-#: libraries/insert_edit.lib.php:1487
+#: libraries/insert_edit.lib.php:1485
 msgid "Go back to previous page"
 msgstr "Назад на претходну страну"
 
-#: libraries/insert_edit.lib.php:1490
+#: libraries/insert_edit.lib.php:1488
 msgid "Insert another new row"
 msgstr "Додај још један нови ред"
 
-#: libraries/insert_edit.lib.php:1495
+#: libraries/insert_edit.lib.php:1493
 msgid "Go back to this page"
 msgstr "Врати се на ову страну"
 
-#: libraries/insert_edit.lib.php:1518
+#: libraries/insert_edit.lib.php:1516
 msgid "Edit next row"
 msgstr "Уреди следећи ред"
 
-#: libraries/insert_edit.lib.php:1540
+#: libraries/insert_edit.lib.php:1538
 msgid ""
 "Use TAB key to move from value to value, or CTRL+arrows to move anywhere"
 msgstr ""
 "Користите TAB тастер за померање од поља до поља, или CTRL+стрелице за "
 "слободно померање"
 
-#: libraries/insert_edit.lib.php:1577 libraries/replication_gui.lib.php:542
-#: libraries/rte/rte_routines.lib.php:1497
+#: libraries/insert_edit.lib.php:1575 libraries/replication_gui.lib.php:542
+#: libraries/rte/rte_routines.lib.php:1588
 #: libraries/server_status_variables.lib.php:220
-#: templates/designer/having_query_panel.phtml:100
-#: templates/designer/options_panel.phtml:73
-#: templates/designer/options_panel.phtml:239
-#: templates/designer/where_query_panel.phtml:69
-#: templates/table/table_header.phtml:10
-#: templates/table/zoom_result_form.phtml:35
+#: templates/database/designer/having_query_panel.phtml:100
+#: templates/database/designer/options_panel.phtml:73
+#: templates/database/designer/options_panel.phtml:239
+#: templates/database/designer/where_query_panel.phtml:69
+#: templates/table/search/table_header.phtml:10
+#: templates/table/search/zoom_result_form.phtml:35
 msgid "Value"
 msgstr "Вредност"
 
-#: libraries/insert_edit.lib.php:1937 libraries/sql.lib.php:1309
+#: libraries/insert_edit.lib.php:1935 libraries/sql.lib.php:1303
 msgid "Showing SQL query"
 msgstr "Приказ као SQL упит"
 
-#: libraries/insert_edit.lib.php:1962 libraries/sql.lib.php:1287
+#: libraries/insert_edit.lib.php:1960 libraries/sql.lib.php:1281
 #, php-format
 msgid "Inserted row id: %1$d"
 msgstr ""
@@ -10138,7 +10155,7 @@ msgstr ""
 #: libraries/navigation/Nodes/Node_View_Container.class.php:26
 #: libraries/navigation/Nodes/Node_View_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:129
-#: templates/structure/show_create.phtml:30
+#: templates/database/structure/show_create.phtml:30
 #, fuzzy
 #| msgid "View"
 msgid "Views"
@@ -10450,7 +10467,7 @@ msgstr "Није Вам дозвољено да будете овде!"
 
 #: libraries/operations.lib.php:101 libraries/operations.lib.php:249
 #: libraries/operations.lib.php:869 libraries/operations.lib.php:963
-#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:907
+#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:998
 #: templates/columns_definitions/table_fields_definitions.phtml:47
 #, fuzzy
 #| msgid "Edit Privileges"
@@ -10544,22 +10561,22 @@ msgid "Switch to copied table"
 msgstr "Пређи на копирану табелу"
 
 #: libraries/operations.lib.php:1360
-#: templates/structure/check_all_tables.phtml:18
+#: templates/database/structure/check_all_tables.phtml:18
 msgid "Table maintenance"
 msgstr "Радње на табели"
 
 #: libraries/operations.lib.php:1398
-#: templates/structure/check_all_tables.phtml:19
+#: templates/database/structure/check_all_tables.phtml:19
 msgid "Analyze table"
 msgstr "Анализирај табелу"
 
 #: libraries/operations.lib.php:1413
-#: templates/structure/check_all_tables.phtml:20
+#: templates/database/structure/check_all_tables.phtml:20
 msgid "Check table"
 msgstr "Провери табелу"
 
 #: libraries/operations.lib.php:1428
-#: templates/structure/check_all_tables.phtml:22
+#: templates/database/structure/check_all_tables.phtml:22
 #, fuzzy
 #| msgid "Check table"
 msgid "Checksum table"
@@ -10581,18 +10598,19 @@ msgid "Flush the table (FLUSH)"
 msgstr "Освежи табелу (\"FLUSH\")"
 
 #: libraries/operations.lib.php:1477
-#: templates/structure/check_all_tables.phtml:23
-#: templates/structure/display_table_stats.phtml:56
+#: templates/database/structure/check_all_tables.phtml:23
+#: templates/table/structure/display_table_stats.phtml:56
 msgid "Optimize table"
 msgstr "Оптимизуј табелу"
 
 #: libraries/operations.lib.php:1492
-#: templates/structure/check_all_tables.phtml:24
+#: templates/database/structure/check_all_tables.phtml:24
 msgid "Repair table"
 msgstr "Поправи табелу"
 
 #: libraries/operations.lib.php:1538
-#: templates/structure/check_all_tables.phtml:14 view_operations.php:127
+#: templates/database/structure/check_all_tables.phtml:14
+#: view_operations.php:127
 #, fuzzy
 #| msgid "Dumping data for table"
 msgid "Delete data or table"
@@ -10724,7 +10742,7 @@ msgid "Cannot connect: invalid settings."
 msgstr "Не могу да се повежем: неисправна подешавања."
 
 #: libraries/plugins/auth/AuthenticationConfig.class.php:108
-#: libraries/plugins/auth/AuthenticationCookie.class.php:134
+#: libraries/plugins/auth/AuthenticationCookie.class.php:122
 #: libraries/plugins/auth/AuthenticationHttp.class.php:96
 #, php-format
 msgid "Welcome to %s"
@@ -10755,38 +10773,38 @@ msgstr ""
 msgid "Retry to connect"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:146
+#: libraries/plugins/auth/AuthenticationCookie.class.php:134
 msgid "Your session has expired. Please log in again."
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:170
+#: libraries/plugins/auth/AuthenticationCookie.class.php:158
 msgid "Log in"
 msgstr "Пријављивање"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:178
-#: libraries/plugins/auth/AuthenticationCookie.class.php:188
+#: libraries/plugins/auth/AuthenticationCookie.class.php:166
+#: libraries/plugins/auth/AuthenticationCookie.class.php:176
 msgid "You can enter hostname/IP address and port separated by space."
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:193
+#: libraries/plugins/auth/AuthenticationCookie.class.php:181
 msgid "Username:"
 msgstr "Корисничко име:"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:205
+#: libraries/plugins/auth/AuthenticationCookie.class.php:193
 #, fuzzy
 #| msgid "Server Choice"
 msgid "Server Choice:"
 msgstr "Избор сервера"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:386
+#: libraries/plugins/auth/AuthenticationCookie.class.php:374
 msgid "Entered captcha is wrong, try again!"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:396
+#: libraries/plugins/auth/AuthenticationCookie.class.php:384
 msgid "Please enter correct captcha!"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:423
+#: libraries/plugins/auth/AuthenticationCookie.class.php:411
 #, fuzzy
 #| msgid "Cannot log in to the MySQL server"
 msgid "You are not allowed to log in to this MySQL server!"
@@ -10897,7 +10915,7 @@ msgstr "Догађаји"
 #: libraries/plugins/export/ExportOdt.class.php:593
 #: libraries/plugins/export/ExportTexytext.class.php:428
 #: libraries/plugins/export/PMA_ExportPdf.class.php:313
-#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:984
 #: libraries/rte/rte_triggers.lib.php:377
 #, fuzzy
 #| msgid "Description"
@@ -11255,7 +11273,7 @@ msgid "Last check:"
 msgstr "Последња провера"
 
 #: libraries/plugins/export/ExportSql.class.php:1399
-#: templates/structure/structure_table_row.phtml:183
+#: templates/database/structure/structure_table_row.phtml:183
 msgid "in use"
 msgstr "се користи"
 
@@ -11457,22 +11475,16 @@ msgstr ""
 msgid "The imported file does not contain any data!"
 msgstr ""
 
-#: libraries/plugins/import/ImportSql.class.php:169
+#: libraries/plugins/import/ImportSql.class.php:72
 #, fuzzy
 #| msgid "SQL compatibility mode"
 msgid "SQL compatibility mode:"
 msgstr "Мод SQL компатибилности"
 
-#: libraries/plugins/import/ImportSql.class.php:181
+#: libraries/plugins/import/ImportSql.class.php:84
 msgid "Do not use <code>AUTO_INCREMENT</code> for zero values"
 msgstr ""
 
-#: libraries/plugins/import/ImportSql.class.php:195
-#, fuzzy
-#| msgid "Read misses"
-msgid "Read as multibytes"
-msgstr "Промашаји при читању"
-
 #: libraries/plugins/import/ImportXml.class.php:54
 msgid "XML"
 msgstr "XML"
@@ -11517,7 +11529,7 @@ msgid "Show grid"
 msgstr "Прикажи мрежу"
 
 #: libraries/plugins/schema/SchemaPdf.class.php:94
-#: templates/structure/print_view_data_dictionary_link.phtml:6
+#: templates/database/structure/print_view_data_dictionary_link.phtml:6
 msgid "Data Dictionary"
 msgstr "Речник података"
 
@@ -11549,7 +11561,7 @@ msgid "The %s table doesn't exist!"
 msgstr "Табела \"%s\" не постоји!"
 
 #: libraries/plugins/schema/eps/Eps_Relation_Schema.class.php:321
-#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:309
+#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:323
 #, fuzzy, php-format
 #| msgid "Schema of the \"%s\" database - Page %s"
 msgid "Schema of the %s database - Page %s"
@@ -11578,7 +11590,7 @@ msgstr "Садржај"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1005
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1028
 #: libraries/tracking.lib.php:884
-#: templates/structure/table_structure_header.phtml:11
+#: templates/table/structure/table_structure_header.phtml:11
 msgid "Extra"
 msgstr "Додатно"
 
@@ -11995,51 +12007,51 @@ msgstr ""
 msgid "Create the needed tables with the <code>%screate_tables.sql</code>."
 msgstr ""
 
-#: libraries/relation.lib.php:360
+#: libraries/relation.lib.php:357
 msgid "Create a pma user and give access to these tables."
 msgstr ""
 
-#: libraries/relation.lib.php:365
+#: libraries/relation.lib.php:360
 msgid ""
 "Enable advanced features in configuration file (<code>config.inc.php</"
 "code>), for example by starting from <code>config.sample.inc.php</code>."
 msgstr ""
 
-#: libraries/relation.lib.php:373
+#: libraries/relation.lib.php:365
 msgid "Re-login to phpMyAdmin to load the updated configuration file."
 msgstr ""
 
-#: libraries/relation.lib.php:1612
+#: libraries/relation.lib.php:1607
 msgid "no description"
 msgstr "нема описа"
 
-#: libraries/relation.lib.php:1811
+#: libraries/relation.lib.php:1806
 msgid ""
 "You do not have necessary privileges to create a database named "
 "'phpmyadmin'. You may go to 'Operations' tab of any database to set up the "
 "phpMyAdmin configuration storage there."
 msgstr ""
 
-#: libraries/relation.lib.php:1928
+#: libraries/relation.lib.php:1923
 #, php-format
 msgid ""
 "%sCreate%s a database named 'phpmyadmin' and setup the phpMyAdmin "
 "configuration storage there."
 msgstr ""
 
-#: libraries/relation.lib.php:1936
+#: libraries/relation.lib.php:1931
 #, php-format
 msgid ""
 "%sCreate%s the phpMyAdmin configuration storage in the current database."
 msgstr ""
 
-#: libraries/relation.lib.php:1944
+#: libraries/relation.lib.php:1939
 #, php-format
 msgid "%sCreate%s missing phpMyAdmin configuration storage tables."
 msgstr ""
 
 #: libraries/replication_gui.lib.php:46 libraries/replication_gui.lib.php:343
-#: libraries/server_databases.lib.php:387
+#: libraries/server_databases.lib.php:398
 msgid "Master replication"
 msgstr ""
 
@@ -12095,7 +12107,7 @@ msgid ""
 msgstr ""
 
 #: libraries/replication_gui.lib.php:141
-#: libraries/server_databases.lib.php:389
+#: libraries/server_databases.lib.php:400
 msgid "Slave replication"
 msgstr ""
 
@@ -12380,10 +12392,10 @@ msgid "Master server changed successfully to %s."
 msgstr "Привилегије су успешно поново учитане."
 
 #: libraries/rte/rte_events.lib.php:106 libraries/rte/rte_events.lib.php:115
-#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:149
-#: libraries/rte/rte_routines.lib.php:158
-#: libraries/rte/rte_routines.lib.php:231
-#: libraries/rte/rte_routines.lib.php:1362
+#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:219
+#: libraries/rte/rte_routines.lib.php:246
+#: libraries/rte/rte_routines.lib.php:368
+#: libraries/rte/rte_routines.lib.php:1453
 #: libraries/rte/rte_triggers.lib.php:82 libraries/rte/rte_triggers.lib.php:91
 #: libraries/rte/rte_triggers.lib.php:123
 #, php-format
@@ -12405,7 +12417,7 @@ msgstr "Табела %s је одбачена"
 msgid "Event %1$s has been created."
 msgstr "Табела %s је одбачена"
 
-#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:251
+#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:266
 #: libraries/rte/rte_triggers.lib.php:144
 msgid "One or more errors have occurred while processing your request:"
 msgstr ""
@@ -12416,7 +12428,7 @@ msgstr ""
 msgid "Edit event"
 msgstr "Догађаји"
 
-#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:794
+#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:885
 #: libraries/rte/rte_triggers.lib.php:323 view_create.php:180
 msgid "Details"
 msgstr ""
@@ -12431,7 +12443,7 @@ msgstr "Врста догађаја"
 msgid "Event type"
 msgstr "Врста догађаја"
 
-#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:817
+#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:908
 #, fuzzy, php-format
 #| msgid "Change"
 msgid "Change to %s"
@@ -12464,12 +12476,14 @@ msgstr "Крај"
 msgid "On completion preserve"
 msgstr "Комплетан INSERT (са именима поља)"
 
-#: libraries/rte/rte_events.lib.php:491 libraries/rte/rte_routines.lib.php:930
+#: libraries/rte/rte_events.lib.php:491
+#: libraries/rte/rte_routines.lib.php:1021
 #: libraries/rte/rte_triggers.lib.php:383 view_create.php:209
 msgid "Definer"
 msgstr ""
 
-#: libraries/rte/rte_events.lib.php:535 libraries/rte/rte_routines.lib.php:997
+#: libraries/rte/rte_events.lib.php:535
+#: libraries/rte/rte_routines.lib.php:1088
 #: libraries/rte/rte_triggers.lib.php:422
 msgid "The definer must be in the \"username@hostname\" format!"
 msgstr ""
@@ -12497,9 +12511,9 @@ msgid "You must provide an event definition."
 msgstr ""
 
 #: libraries/rte/rte_export.lib.php:43 libraries/rte/rte_general.lib.php:72
-#: libraries/rte/rte_routines.lib.php:345
-#: libraries/rte/rte_routines.lib.php:1198
-#: libraries/rte/rte_routines.lib.php:1411
+#: libraries/rte/rte_routines.lib.php:153
+#: libraries/rte/rte_routines.lib.php:1289
+#: libraries/rte/rte_routines.lib.php:1502
 #, fuzzy
 #| msgid "Processes"
 msgid "Error in processing request:"
@@ -12535,141 +12549,141 @@ msgid ""
 "problems."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:110
-#: libraries/rte/rte_routines.lib.php:1006
-#, fuzzy, php-format
-#| msgid "Invalid server index: \"%s\""
-msgid "Invalid routine type: \"%s\""
-msgstr "Неисправан индекс сервера: \"%s\""
-
-#: libraries/rte/rte_routines.lib.php:170
-msgid "Sorry, we failed to restore the dropped routine."
-msgstr ""
-
-#: libraries/rte/rte_routines.lib.php:211
-#, fuzzy, php-format
-#| msgid "Table %s has been dropped."
-msgid "Routine %1$s has been modified. Privileges have been adjusted."
-msgstr "Табела %s је одбачена"
-
-#: libraries/rte/rte_routines.lib.php:216
-#, fuzzy, php-format
-#| msgid "Table %s has been dropped."
-msgid "Routine %1$s has been modified."
-msgstr "Табела %s је одбачена"
-
-#: libraries/rte/rte_routines.lib.php:238
-#, fuzzy, php-format
-msgid "Routine %1$s has been created."
-msgstr "Табела %s је одбачена"
-
-#: libraries/rte/rte_routines.lib.php:315
+#: libraries/rte/rte_routines.lib.php:123
 #, fuzzy
 #| msgid "Routines"
 msgid "Edit routine"
 msgstr "Рутине"
 
-#: libraries/rte/rte_routines.lib.php:797
+#: libraries/rte/rte_routines.lib.php:200
+#: libraries/rte/rte_routines.lib.php:1097
+#, fuzzy, php-format
+#| msgid "Invalid server index: \"%s\""
+msgid "Invalid routine type: \"%s\""
+msgstr "Неисправан индекс сервера: \"%s\""
+
+#: libraries/rte/rte_routines.lib.php:253
+#, fuzzy, php-format
+msgid "Routine %1$s has been created."
+msgstr "Табела %s је одбачена"
+
+#: libraries/rte/rte_routines.lib.php:380
+msgid "Sorry, we failed to restore the dropped routine."
+msgstr ""
+
+#: libraries/rte/rte_routines.lib.php:439
+#, fuzzy, php-format
+#| msgid "Table %s has been dropped."
+msgid "Routine %1$s has been modified. Privileges have been adjusted."
+msgstr "Табела %s је одбачена"
+
+#: libraries/rte/rte_routines.lib.php:444
+#, fuzzy, php-format
+#| msgid "Table %s has been dropped."
+msgid "Routine %1$s has been modified."
+msgstr "Табела %s је одбачена"
+
+#: libraries/rte/rte_routines.lib.php:888
 #, fuzzy
 #| msgid "Routines"
 msgid "Routine name"
 msgstr "Рутине"
 
-#: libraries/rte/rte_routines.lib.php:823
+#: libraries/rte/rte_routines.lib.php:914
 msgid "Parameters"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:829
+#: libraries/rte/rte_routines.lib.php:920
 #, fuzzy
 #| msgid "Direct links"
 msgid "Direction"
 msgstr "Директне везе"
 
-#: libraries/rte/rte_routines.lib.php:847
+#: libraries/rte/rte_routines.lib.php:938
 #, fuzzy
 #| msgid "Add new field"
 msgid "Add parameter"
 msgstr "Додај ново поље"
 
-#: libraries/rte/rte_routines.lib.php:851
+#: libraries/rte/rte_routines.lib.php:942
 #, fuzzy
 #| msgid "Remove database"
 msgid "Remove last parameter"
 msgstr "Уклони базу"
 
-#: libraries/rte/rte_routines.lib.php:856
+#: libraries/rte/rte_routines.lib.php:947
 msgid "Return type"
 msgstr "Повратни тип"
 
-#: libraries/rte/rte_routines.lib.php:862
+#: libraries/rte/rte_routines.lib.php:953
 #, fuzzy
 #| msgid "Length/Values"
 msgid "Return length/values"
 msgstr "Дужина/Вредност*"
 
-#: libraries/rte/rte_routines.lib.php:868
+#: libraries/rte/rte_routines.lib.php:959
 #, fuzzy
 #| msgid "Table options"
 msgid "Return options"
 msgstr "Опције табеле"
 
-#: libraries/rte/rte_routines.lib.php:899
+#: libraries/rte/rte_routines.lib.php:990
 msgid "Is deterministic"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:920
+#: libraries/rte/rte_routines.lib.php:1011
 msgid ""
 "You do not have sufficient privileges to perform this operation; Please "
 "refer to the documentation for more details"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:935
+#: libraries/rte/rte_routines.lib.php:1026
 #, fuzzy
 #| msgid "Query type"
 msgid "Security type"
 msgstr "Врста упита"
 
-#: libraries/rte/rte_routines.lib.php:944
+#: libraries/rte/rte_routines.lib.php:1035
 msgid "SQL data access"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1013
+#: libraries/rte/rte_routines.lib.php:1104
 #, fuzzy
 #| msgid "Invalid table name"
 msgid "You must provide a routine name!"
 msgstr "Неисправан назив табеле"
 
-#: libraries/rte/rte_routines.lib.php:1047
+#: libraries/rte/rte_routines.lib.php:1138
 #, php-format
 msgid "Invalid direction \"%s\" given for parameter."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1069
-#: libraries/rte/rte_routines.lib.php:1131
+#: libraries/rte/rte_routines.lib.php:1160
+#: libraries/rte/rte_routines.lib.php:1222
 msgid ""
 "You must provide length/values for routine parameters of type ENUM, SET, "
 "VARCHAR and VARBINARY."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1095
+#: libraries/rte/rte_routines.lib.php:1186
 msgid "You must provide a name and a type for each routine parameter."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1114
+#: libraries/rte/rte_routines.lib.php:1205
 msgid "You must provide a valid return type for the routine."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1174
+#: libraries/rte/rte_routines.lib.php:1265
 msgid "You must provide a routine definition."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1285
+#: libraries/rte/rte_routines.lib.php:1376
 #, fuzzy, php-format
 #| msgid "Allows executing stored routines."
 msgid "Execution results of routine %s"
 msgstr "Дозвољава извршавање сачуваних рутина."
 
-#: libraries/rte/rte_routines.lib.php:1340
+#: libraries/rte/rte_routines.lib.php:1431
 #, php-format
 msgid "%d row affected by the last statement inside the procedure."
 msgid_plural "%d rows affected by the last statement inside the procedure."
@@ -12677,13 +12691,13 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: libraries/rte/rte_routines.lib.php:1398
-#: libraries/rte/rte_routines.lib.php:1406
+#: libraries/rte/rte_routines.lib.php:1489
+#: libraries/rte/rte_routines.lib.php:1497
 msgid "Execute routine"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1485
-#: libraries/rte/rte_routines.lib.php:1488
+#: libraries/rte/rte_routines.lib.php:1576
+#: libraries/rte/rte_routines.lib.php:1579
 #, fuzzy
 #| msgid "Routines"
 msgid "Routine parameters"
@@ -12877,7 +12891,7 @@ msgid "Original position"
 msgstr "Оригинална позиција"
 
 #: libraries/server_bin_log.lib.php:133
-#: templates/structure/display_table_stats.phtml:4
+#: templates/table/structure/display_table_stats.phtml:4
 msgid "Information"
 msgstr "Информације"
 
@@ -12915,12 +12929,12 @@ msgstr ""
 "Напомена: укључивање статистика може проузроковати велики саобраћај између "
 "веб и MySQL сервера."
 
-#: libraries/server_databases.lib.php:364
-#: libraries/server_databases.lib.php:365
+#: libraries/server_databases.lib.php:366
+#: libraries/server_databases.lib.php:371
 msgid "Enable Statistics"
 msgstr "Укључи статистике"
 
-#: libraries/server_databases.lib.php:481
+#: libraries/server_databases.lib.php:492
 #, fuzzy, php-format
 #| msgid "%s databases have been dropped successfully."
 msgid "%1$d database has been dropped successfully."
@@ -13306,7 +13320,7 @@ msgid "You have revoked the privileges for %s."
 msgstr "Забранили сте привилегије за %s."
 
 #: libraries/server_privileges.lib.php:2059
-#: libraries/server_privileges.lib.php:4290
+#: libraries/server_privileges.lib.php:4316
 #, fuzzy
 #| msgid "Any user"
 msgid "Add user account"
@@ -13491,60 +13505,60 @@ msgstr "Бришем %s"
 msgid "The privileges were reloaded successfully."
 msgstr "Привилегије су успешно поново учитане."
 
-#: libraries/server_privileges.lib.php:3994
+#: libraries/server_privileges.lib.php:4003
 #, php-format
 msgid "The user %s already exists!"
 msgstr "Корисник %s већ постоји!"
 
-#: libraries/server_privileges.lib.php:4232
+#: libraries/server_privileges.lib.php:4258
 #, fuzzy, php-format
 #| msgid "Privileges"
 msgid "Privileges for %s"
 msgstr "Привилегије"
 
-#: libraries/server_privileges.lib.php:4241
+#: libraries/server_privileges.lib.php:4267
 #: libraries/server_status_processes.lib.php:72
 #: libraries/server_user_groups.lib.php:39
 msgid "User"
 msgstr "Корисник"
 
-#: libraries/server_privileges.lib.php:4282
+#: libraries/server_privileges.lib.php:4308
 msgctxt "Create new user"
 msgid "New"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4311
+#: libraries/server_privileges.lib.php:4337
 #, fuzzy
 #| msgid "Edit Privileges"
 msgid "Edit privileges:"
 msgstr "Промени привилегије"
 
-#: libraries/server_privileges.lib.php:4312
+#: libraries/server_privileges.lib.php:4338
 #, fuzzy
 #| msgid "User"
 msgid "User account"
 msgstr "Корисник"
 
-#: libraries/server_privileges.lib.php:4371
+#: libraries/server_privileges.lib.php:4397
 msgid ""
 "Note: You are attempting to edit privileges of the user with which you are "
 "currently logged in."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4391 libraries/server_users.lib.php:25
+#: libraries/server_privileges.lib.php:4417 libraries/server_users.lib.php:25
 #, fuzzy
 #| msgid "User overview"
 msgid "User accounts overview"
 msgstr "Преглед корисника"
 
-#: libraries/server_privileges.lib.php:4459
+#: libraries/server_privileges.lib.php:4485
 msgid ""
 "A user account allowing any user from localhost to connect is present. This "
 "will prevent other users from connecting if the host part of their account "
 "allows a connection from any (%) host."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4500
+#: libraries/server_privileges.lib.php:4526
 #, php-format
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
@@ -13557,7 +13571,7 @@ msgstr ""
 "сервер користи ако су вршене ручне измене. У том случају %sпоново учитајте "
 "привилегије%s пре него што наставите."
 
-#: libraries/server_privileges.lib.php:4519
+#: libraries/server_privileges.lib.php:4545
 #, fuzzy
 #| msgid ""
 #| "Note: phpMyAdmin gets the users' privileges directly from MySQL's "
@@ -13576,45 +13590,45 @@ msgstr ""
 "сервер користи ако су вршене ручне измене. У том случају %sпоново учитајте "
 "привилегије%s пре него што наставите."
 
-#: libraries/server_privileges.lib.php:4569
+#: libraries/server_privileges.lib.php:4595
 msgid "The selected user was not found in the privilege table."
 msgstr "Изабрани корисник није пронађен у табели привилегија."
 
-#: libraries/server_privileges.lib.php:4801
+#: libraries/server_privileges.lib.php:4827
 msgid "You have added a new user."
 msgstr "Додали сте новог корисника."
 
-#: libraries/server_status.lib.php:53
+#: libraries/server_status.lib.php:60
 #, php-format
 msgid "Network traffic since startup: %s"
 msgstr ""
 
-#: libraries/server_status.lib.php:66
+#: libraries/server_status.lib.php:73
 #, fuzzy, php-format
 #| msgid "s MySQL server has been running for %s. It started up on %s."
 msgid "This MySQL server has been running for %1$s. It started up on %2$s."
 msgstr "Овај MySQL сервер ради већ %s. Покренут је %s."
 
-#: libraries/server_status.lib.php:80
+#: libraries/server_status.lib.php:94
 msgid ""
 "This MySQL server works as <b>master</b> and <b>slave</b> in <b>replication</"
 "b> process."
 msgstr ""
 
-#: libraries/server_status.lib.php:85
+#: libraries/server_status.lib.php:99
 msgid "This MySQL server works as <b>master</b> in <b>replication</b> process."
 msgstr ""
 
-#: libraries/server_status.lib.php:90
+#: libraries/server_status.lib.php:104
 msgid "This MySQL server works as <b>slave</b> in <b>replication</b> process."
 msgstr ""
 
-#: libraries/server_status.lib.php:106
+#: libraries/server_status.lib.php:116
 #, fuzzy
 msgid "Replication status"
 msgstr "Репликација"
 
-#: libraries/server_status.lib.php:137
+#: libraries/server_status.lib.php:146
 msgid ""
 "On a busy server, the byte counters may overrun, so those statistics as "
 "reported by the MySQL server may be incorrect."
@@ -13622,21 +13636,21 @@ msgstr ""
 "На запосленом серверу бројачи бајтова могу да се прелију (overrun), тако да "
 "те статистике, онако како их пријављује MySQL сервер, могу бити нетачне."
 
-#: libraries/server_status.lib.php:148
+#: libraries/server_status.lib.php:157
 msgid "Received"
 msgstr "Примљено"
 
-#: libraries/server_status.lib.php:167
+#: libraries/server_status.lib.php:176
 msgid "Sent"
 msgstr "Послато"
 
-#: libraries/server_status.lib.php:234
+#: libraries/server_status.lib.php:243
 #, fuzzy
 #| msgid "max. concurrent connections"
 msgid "Max. concurrent connections"
 msgstr "макс. истовремених веза"
 
-#: libraries/server_status.lib.php:244
+#: libraries/server_status.lib.php:253
 msgid "Failed attempts"
 msgstr "Неуспелих покушаја"
 
@@ -14735,7 +14749,7 @@ msgstr ""
 msgid "Not implemented yet."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/AlterOperation.php:193
+#: libraries/sql-parser/src/Components/AlterOperation.php:191
 msgid "Unrecognized alter operation."
 msgstr ""
 
@@ -14749,7 +14763,7 @@ msgid "An opening bracket followed by a set of values was expected."
 msgstr ""
 
 #: libraries/sql-parser/src/Components/ArrayObj.php:101
-#: libraries/sql-parser/src/Components/FieldDefinition.php:202
+#: libraries/sql-parser/src/Components/CreateDefinition.php:202
 msgid "An opening bracket was expected."
 msgstr ""
 
@@ -14757,25 +14771,35 @@ msgstr ""
 msgid "A comma or a closing bracket was expected"
 msgstr ""
 
+#: libraries/sql-parser/src/Components/CreateDefinition.php:246
+#, fuzzy
+#| msgid "No databases selected."
+msgid "A comma or a closing bracket was expected."
+msgstr "Није изабрана ни једна база."
+
+#: libraries/sql-parser/src/Components/CreateDefinition.php:262
+msgid "A closing bracket was expected."
+msgstr ""
+
 #: libraries/sql-parser/src/Components/DataType.php:125
 msgid "Unrecognized data type."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:225
+#: libraries/sql-parser/src/Components/Expression.php:227
 msgid "Unexpected closing bracket."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:246
-#: libraries/sql-parser/src/Components/Expression.php:283
-#: libraries/sql-parser/src/Components/Expression.php:303
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:285
+#: libraries/sql-parser/src/Components/Expression.php:305
 msgid "An alias was previously found."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:257
+#: libraries/sql-parser/src/Components/Expression.php:259
 msgid "Unexpected dot."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:327
+#: libraries/sql-parser/src/Components/Expression.php:329
 #, fuzzy
 #| msgid "No databases selected."
 msgid "An alias was expected."
@@ -14787,16 +14811,6 @@ msgstr "Није изабрана ни једна база."
 msgid "An expression was expected."
 msgstr "Нема одабраних редова"
 
-#: libraries/sql-parser/src/Components/FieldDefinition.php:246
-#, fuzzy
-#| msgid "No databases selected."
-msgid "A comma or a closing bracket was expected."
-msgstr "Није изабрана ни једна база."
-
-#: libraries/sql-parser/src/Components/FieldDefinition.php:262
-msgid "A closing bracket was expected."
-msgstr ""
-
 #: libraries/sql-parser/src/Components/Limit.php:90
 #: libraries/sql-parser/src/Components/Limit.php:112
 msgid "An offset was expected."
@@ -14842,27 +14856,27 @@ msgstr ""
 msgid "Expected delimiter."
 msgstr ""
 
-#: libraries/sql-parser/src/Lexer.php:753
+#: libraries/sql-parser/src/Lexer.php:777
 #, fuzzy, php-format
 msgid "Ending quote %1$s was expected."
 msgstr "Табела %s је одбачена"
 
-#: libraries/sql-parser/src/Lexer.php:789
+#: libraries/sql-parser/src/Lexer.php:813
 #, fuzzy
 msgid "Variable name was expected."
 msgstr "Шаблон имена датотеке"
 
-#: libraries/sql-parser/src/Parser.php:380
+#: libraries/sql-parser/src/Parser.php:391
 #, fuzzy
 #| msgid "At Beginning of Table"
 msgid "Unexpected beginning of statement."
 msgstr "На почетку табеле"
 
-#: libraries/sql-parser/src/Parser.php:399
+#: libraries/sql-parser/src/Parser.php:410
 msgid "Unrecognized statement type."
 msgstr ""
 
-#: libraries/sql-parser/src/Parser.php:479
+#: libraries/sql-parser/src/Parser.php:489
 msgid "No transaction was previously started."
 msgstr ""
 
@@ -14890,8 +14904,10 @@ msgid "The name of the entity was expected."
 msgstr "Број отворених табела."
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:310
-msgid "At least one field definition was expected."
-msgstr ""
+#, fuzzy
+#| msgid "The row has been deleted."
+msgid "At least one column definition was expected."
+msgstr "Ред је обрисан"
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:329
 msgid "A \"RETURNS\" keyword was expected."
@@ -14963,25 +14979,25 @@ msgstr "Направљен маркер %s"
 msgid "Using bookmark \"%s\" as default browse query."
 msgstr ""
 
-#: libraries/sql.lib.php:1306
+#: libraries/sql.lib.php:1300
 msgid "Showing as PHP code"
 msgstr "Приказ као PHP код"
 
-#: libraries/sql.lib.php:1638
+#: libraries/sql.lib.php:1632
 #, php-format
 msgid ""
 "Current selection does not contain a unique column. Grid edit, checkbox, "
 "Edit, Copy and Delete features are not available. %s"
 msgstr ""
 
-#: libraries/sql.lib.php:1649
+#: libraries/sql.lib.php:1643
 #, php-format
 msgid ""
 "Current selection does not contain a unique column. Grid edit, Edit, Copy "
 "and Delete features may result in undesired behavior. %s"
 msgstr ""
 
-#: libraries/sql.lib.php:1688
+#: libraries/sql.lib.php:1682
 #, php-format
 msgid "Problems with indexes of table `%s`"
 msgstr "Проблем при индексирању табеле `%s`"
@@ -15150,7 +15166,7 @@ msgid "Version %s snapshot (SQL code)"
 msgstr ""
 
 #: libraries/tracking.lib.php:947
-#: templates/structure/table_structure_row.phtml:33
+#: templates/table/structure/table_structure_row.phtml:33
 #, fuzzy
 #| msgid "None"
 msgctxt "None for default"
@@ -15204,19 +15220,19 @@ msgstr "Направи релацију"
 msgid "Version %1$s was created, tracking for %2$s is active."
 msgstr ""
 
-#: libraries/user_preferences.inc.php:29
+#: libraries/user_preferences.inc.php:30
 #, fuzzy
 #| msgid "General relation features"
 msgid "Manage your settings"
 msgstr "Опште особине релација"
 
-#: libraries/user_preferences.inc.php:46 prefs_manage.php:307
+#: libraries/user_preferences.inc.php:54 prefs_manage.php:307
 #, fuzzy
 #| msgid "Modifications have been saved"
 msgid "Configuration has been saved."
 msgstr "Измене су сачуване"
 
-#: libraries/user_preferences.inc.php:66
+#: libraries/user_preferences.inc.php:74
 #, php-format
 msgid ""
 "Your preferences will be saved for current session only. Storing them "
@@ -15624,7 +15640,7 @@ msgid "first"
 msgstr ""
 
 #: templates/columns_definitions/move_column.phtml:12
-#: templates/structure/add_column.phtml:21
+#: templates/table/structure/add_column.phtml:21
 #, fuzzy, php-format
 #| msgid "After %s"
 msgid "after %s"
@@ -15712,240 +15728,354 @@ msgstr "Транформације читача"
 msgid "Input transformation options"
 msgstr "Опције трансформације"
 
-#: templates/designer/aggregate_query_panel.phtml:22
-#: templates/designer/options_panel.phtml:100
+#: templates/database/create_table.phtml:7
+#: templates/database/designer/side_menu.phtml:77
+#: templates/database/designer/side_menu.phtml:80
+msgid "Create table"
+msgstr "Направи табелу"
+
+#: templates/database/create_table.phtml:15
+#, fuzzy
+#| msgid "Number of fields"
+msgid "Number of columns"
+msgstr "Број поља"
+
+#: templates/database/designer/aggregate_query_panel.phtml:22
+#: templates/database/designer/options_panel.phtml:100
 #, fuzzy
 #| msgid "Create"
 msgid "Aggregate"
 msgstr "Направи"
 
-#: templates/designer/aggregate_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:61
-#: templates/designer/options_panel.phtml:106
-#: templates/designer/options_panel.phtml:170
-#: templates/designer/where_query_panel.phtml:30
-#: templates/table/table_header.phtml:9
+#: templates/database/designer/aggregate_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:61
+#: templates/database/designer/options_panel.phtml:106
+#: templates/database/designer/options_panel.phtml:170
+#: templates/database/designer/where_query_panel.phtml:30
+#: templates/table/search/table_header.phtml:9
 msgid "Operator"
 msgstr "Оператор"
 
-#: templates/designer/database_tables.phtml:29
+#: templates/database/designer/database_tables.phtml:29
 msgid "Toggle"
 msgstr ""
 
-#: templates/designer/database_tables.phtml:40
+#: templates/database/designer/database_tables.phtml:40
 #, fuzzy
 #| msgid "Database for user"
 msgid "See table structure"
 msgstr "База за корисника"
 
-#: templates/designer/delete_relation_panel.phtml:21
+#: templates/database/designer/delete_relation_panel.phtml:21
 msgid "Delete relation"
 msgstr "Обриши релацију"
 
-#: templates/designer/edit_delete_pages.phtml:7
+#: templates/database/designer/edit_delete_pages.phtml:7
 #, fuzzy
 #| msgid "Page number:"
 msgid "Page to open"
 msgstr "Број стране:"
 
-#: templates/designer/edit_delete_pages.phtml:7
+#: templates/database/designer/edit_delete_pages.phtml:7
 #, fuzzy
 #| msgid "Relation deleted"
 msgid "Page to delete"
 msgstr "Релација обрисана"
 
-#: templates/designer/having_query_panel.phtml:90
-#: templates/designer/options_panel.phtml:63
-#: templates/designer/options_panel.phtml:229
-#: templates/designer/where_query_panel.phtml:59
+#: templates/database/designer/having_query_panel.phtml:90
+#: templates/database/designer/options_panel.phtml:63
+#: templates/database/designer/options_panel.phtml:229
+#: templates/database/designer/where_query_panel.phtml:59
 #, fuzzy
 #| msgid "Export"
 msgid "Except"
 msgstr "Извоз"
 
-#: templates/designer/having_query_panel.phtml:102
-#: templates/designer/options_panel.phtml:75
-#: templates/designer/options_panel.phtml:241
-#: templates/designer/where_query_panel.phtml:71
+#: templates/database/designer/having_query_panel.phtml:102
+#: templates/database/designer/options_panel.phtml:75
+#: templates/database/designer/options_panel.phtml:241
+#: templates/database/designer/where_query_panel.phtml:71
 #, fuzzy
 #| msgid "in query"
 msgid "subquery"
 msgstr "у упиту"
 
-#: templates/designer/new_relation_panel.phtml:22
-#: templates/designer/side_menu.phtml:84 templates/designer/side_menu.phtml:87
+#: templates/database/designer/new_relation_panel.phtml:22
+#: templates/database/designer/side_menu.phtml:84
+#: templates/database/designer/side_menu.phtml:87
 msgid "Create relation"
 msgstr "Направи релацију"
 
-#: templates/designer/options_panel.phtml:34
-#: templates/designer/options_panel.phtml:200
+#: templates/database/designer/options_panel.phtml:34
+#: templates/database/designer/options_panel.phtml:200
 #, fuzzy
 #| msgid "Relation deleted"
 msgid "Relation operator"
 msgstr "Релација обрисана"
 
-#: templates/designer/options_panel.phtml:85
-#: templates/designer/rename_to_panel.phtml:23
+#: templates/database/designer/options_panel.phtml:85
+#: templates/database/designer/rename_to_panel.phtml:23
 #, fuzzy
 msgid "Rename to"
 msgstr "Промени име табеле у "
 
-#: templates/designer/options_panel.phtml:91
-#: templates/designer/rename_to_panel.phtml:31
+#: templates/database/designer/options_panel.phtml:91
+#: templates/database/designer/rename_to_panel.phtml:31
 #, fuzzy
 #| msgid "User name"
 msgid "New name"
 msgstr "Име корисника"
 
-#: templates/designer/page_save_as.phtml:4
+#: templates/database/designer/page_save_as.phtml:4
 #, fuzzy
 #| msgid "Export/Import to scale"
 msgid "Save to selected page"
 msgstr "Извор/увоз у размери"
 
-#: templates/designer/page_save_as.phtml:5
+#: templates/database/designer/page_save_as.phtml:5
 #, fuzzy
 #| msgid "Create a new index"
 msgid "Create a page and save to it"
 msgstr "Направи нови кључ"
 
-#: templates/designer/page_save_as.phtml:26
+#: templates/database/designer/page_save_as.phtml:26
 #, fuzzy
 #| msgid "User name"
 msgid "New page name"
 msgstr "Име корисника"
 
-#: templates/designer/page_selector.phtml:2
+#: templates/database/designer/page_selector.phtml:2
 #, fuzzy
 #| msgid "Select All"
 msgid "Select page"
 msgstr "Изабери све"
 
-#: templates/designer/query_details.phtml:10
+#: templates/database/designer/query_details.phtml:10
 #, fuzzy
 #| msgid "Table options"
 msgid "Active options"
 msgstr "Опције табеле"
 
-#: templates/designer/schema_export.phtml:4
+#: templates/database/designer/schema_export.phtml:4
 msgid "Select Export Relational Type"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:19 templates/designer/side_menu.phtml:25
+#: templates/database/designer/side_menu.phtml:19
+#: templates/database/designer/side_menu.phtml:25
 #, fuzzy
 #| msgid "Show tables"
 msgid "Show/Hide tables list"
 msgstr "Прикажи табеле"
 
-#: templates/designer/side_menu.phtml:29 templates/designer/side_menu.phtml:35
-#: templates/designer/side_menu.phtml:36
+#: templates/database/designer/side_menu.phtml:29
+#: templates/database/designer/side_menu.phtml:35
+#: templates/database/designer/side_menu.phtml:36
 msgid "View in fullscreen"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:34
+#: templates/database/designer/side_menu.phtml:34
 msgid "Exit fullscreen"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:41 templates/designer/side_menu.phtml:45
+#: templates/database/designer/side_menu.phtml:41
+#: templates/database/designer/side_menu.phtml:45
 #, fuzzy
 #| msgid "User name"
 msgid "New page"
 msgstr "Име корисника"
 
-#: templates/designer/side_menu.phtml:70 templates/designer/side_menu.phtml:73
+#: templates/database/designer/side_menu.phtml:70
+#: templates/database/designer/side_menu.phtml:73
 #, fuzzy
 #| msgid "Select All"
 msgid "Delete pages"
 msgstr "Изабери све"
 
-#: templates/designer/side_menu.phtml:77 templates/designer/side_menu.phtml:80
-#: templates/table/create_table.phtml:7
-msgid "Create table"
-msgstr "Направи табелу"
-
-#: templates/designer/side_menu.phtml:98
-#: templates/designer/side_menu.phtml:101
+#: templates/database/designer/side_menu.phtml:98
+#: templates/database/designer/side_menu.phtml:101
 msgid "Reload"
 msgstr "Поново учитај"
 
-#: templates/designer/side_menu.phtml:107
-#: templates/designer/side_menu.phtml:110
+#: templates/database/designer/side_menu.phtml:107
+#: templates/database/designer/side_menu.phtml:110
 msgid "Help"
 msgstr "Помоћ"
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Angular links"
 msgstr "Угласте везе"
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Direct links"
 msgstr "Директне везе"
 
-#: templates/designer/side_menu.phtml:122
-#: templates/designer/side_menu.phtml:124
+#: templates/database/designer/side_menu.phtml:122
+#: templates/database/designer/side_menu.phtml:124
 msgid "Snap to grid"
 msgstr "Држи се мреже"
 
-#: templates/designer/side_menu.phtml:128
-#: templates/designer/side_menu.phtml:134
+#: templates/database/designer/side_menu.phtml:128
+#: templates/database/designer/side_menu.phtml:134
 msgid "Small/Big All"
 msgstr "Све мало/велико"
 
-#: templates/designer/side_menu.phtml:138
-#: templates/designer/side_menu.phtml:141
+#: templates/database/designer/side_menu.phtml:138
+#: templates/database/designer/side_menu.phtml:141
 msgid "Toggle small/big"
 msgstr "Промени мало/велико"
 
-#: templates/designer/side_menu.phtml:145
-#: templates/designer/side_menu.phtml:148
+#: templates/database/designer/side_menu.phtml:145
+#: templates/database/designer/side_menu.phtml:148
 #, fuzzy
 #| msgid "To select relation, click :"
 msgid "Toggle relation lines"
 msgstr "Да одаберете релацију, кликните :"
 
-#: templates/designer/side_menu.phtml:153
-#: templates/designer/side_menu.phtml:156
+#: templates/database/designer/side_menu.phtml:153
+#: templates/database/designer/side_menu.phtml:156
 #, fuzzy
 #| msgid "Export"
 msgid "Export schema"
 msgstr "Извоз"
 
-#: templates/designer/side_menu.phtml:165
-#: templates/designer/side_menu.phtml:168
+#: templates/database/designer/side_menu.phtml:165
+#: templates/database/designer/side_menu.phtml:168
 #, fuzzy
 #| msgid "Submit Query"
 msgid "Build Query"
 msgstr "Изврши SQL упит"
 
-#: templates/designer/side_menu.phtml:173
-#: templates/designer/side_menu.phtml:177
+#: templates/database/designer/side_menu.phtml:173
+#: templates/database/designer/side_menu.phtml:177
 msgid "Move Menu"
 msgstr "Премести мени"
 
-#: templates/designer/side_menu.phtml:181
-#: templates/designer/side_menu.phtml:186
+#: templates/database/designer/side_menu.phtml:181
+#: templates/database/designer/side_menu.phtml:186
 #, fuzzy
 #| msgid "Partial Texts"
 msgid "Pin text"
 msgstr "Део текста"
 
-#: templates/designer/table_list.phtml:4
+#: templates/database/designer/table_list.phtml:4
 msgid "Hide/Show all"
 msgstr "Сакриј/прикажи све"
 
-#: templates/designer/table_list.phtml:14
+#: templates/database/designer/table_list.phtml:14
 msgid "Hide/Show Tables with no relation"
 msgstr "Сакриј/прикажи табеле без релација"
 
-#: templates/designer/table_list.phtml:59
+#: templates/database/designer/table_list.phtml:59
 #, fuzzy
 #| msgid "Number of tables"
 msgid "Number of tables:"
 msgstr "Број табела"
 
+#: templates/database/structure/body_for_table_summary.phtml:6
+#, fuzzy, php-format
+#| msgid "%s table(s)"
+msgid "%s table"
+msgid_plural "%s tables"
+msgstr[0] "%s табела"
+msgstr[1] "%s табела"
+msgstr[2] "%s табела"
+
+#: templates/database/structure/body_for_table_summary.phtml:17
+msgid "Sum"
+msgstr "Укупно"
+
+#: templates/database/structure/check_all_tables.phtml:6
+msgid "Check tables having overhead"
+msgstr "Провери табеле које имају прекорачења"
+
+#: templates/database/structure/check_all_tables.phtml:10
+#, fuzzy
+#| msgid "Show color"
+msgid "Show create"
+msgstr "Прикажи боју"
+
+#: templates/database/structure/check_all_tables.phtml:27
+#, fuzzy
+#| msgid "Add new field"
+msgid "Prefix"
+msgstr "Додај ново поље"
+
+#: templates/database/structure/check_all_tables.phtml:28
+#, fuzzy
+msgid "Add prefix to table"
+msgstr "База не постоји"
+
+#: templates/database/structure/check_all_tables.phtml:29
+#, fuzzy
+#| msgid "Replace table data with file"
+msgid "Replace table prefix"
+msgstr "Замени податке у табели са подацима из датотеке"
+
+#: templates/database/structure/check_all_tables.phtml:30
+#, fuzzy
+#| msgid "Replace table data with file"
+msgid "Copy table with prefix"
+msgstr "Замени податке у табели са подацима из датотеке"
+
+#: templates/database/structure/check_all_tables.phtml:36
+#, fuzzy
+#| msgid "Add %s field(s)"
+msgid "Add columns to central list"
+msgstr "Додај %s поља"
+
+#: templates/database/structure/check_all_tables.phtml:37
+msgid "Remove columns from central list"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:38
+#, fuzzy
+#| msgid "Add %s field(s)"
+msgid "Make consistent with central list"
+msgstr "Додај %s поља"
+
+#: templates/database/structure/favorite_anchor.phtml:12
+#, fuzzy
+msgid "Add to Favorites"
+msgstr "Додај новог корисника"
+
+#: templates/database/structure/show_create.phtml:2
+#, fuzzy
+msgid "Showing create queries"
+msgstr "Прикажи комплетне упите"
+
+#: templates/database/structure/sortable_header.phtml:13
+msgid "Sort"
+msgstr "Сортирање"
+
+#: templates/database/structure/table_header.phtml:42
+#, fuzzy
+#| msgid "May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]"
+msgid ""
+"May be approximate. Click on the number to get the exact count. See "
+"[doc@faq3-11]FAQ 3.11[/doc]."
+msgstr "Може бити приближно. Видите [doc@faq3-11]FAQ 3.11[/doc]"
+
+#: templates/database/structure/table_header.phtml:66
+#: templates/table/index_form.phtml:127
+msgid "Size"
+msgstr "Величина"
+
+#: templates/database/structure/table_header.phtml:74
+#: templates/table/structure/display_table_stats.phtml:27
+msgid "Overhead"
+msgstr "Прекорачење"
+
+#: templates/database/structure/tracking_icon.phtml:4
+msgid "Tracking is active."
+msgstr ""
+
+#: templates/database/structure/tracking_icon.phtml:8
+msgid "Tracking is not active."
+msgstr ""
+
 #: templates/error/report_form.phtml:7
 msgid ""
 "phpMyAdmin has encountered an error. We have collected data about this error "
@@ -15961,68 +16091,6 @@ msgstr ""
 msgid "Please explain the steps that lead to the error:"
 msgstr ""
 
-#: templates/gis_visualization/gis_visualization.phtml:3
-msgid "Display GIS Visualization"
-msgstr ""
-
-#: templates/gis_visualization/gis_visualization.phtml:8
-#, fuzzy
-#| msgid "Add/Delete Field Columns"
-msgid "Label column"
-msgstr "Додај/обриши колону"
-
-#: templates/gis_visualization/gis_visualization.phtml:11
-msgid "-- None --"
-msgstr ""
-
-#: templates/gis_visualization/gis_visualization.phtml:19
-#, fuzzy
-#| msgid "Total"
-msgid "Spatial column"
-msgstr "Укупно"
-
-#: templates/index_form.phtml:16
-msgid "Index name:"
-msgstr "Име кључа :"
-
-#: templates/index_form.phtml:19
-msgid ""
-"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
-msgstr "\"PRIMARY\" <b>мора</b> бити име <b>само</b> примарног кључа!"
-
-#: templates/index_form.phtml:40
-#, fuzzy
-#| msgid "Index name:"
-msgid "Index choice:"
-msgstr "Име кључа :"
-
-#: templates/index_form.phtml:57
-msgid "Key block size:"
-msgstr ""
-
-#: templates/index_form.phtml:74
-msgid "Index type:"
-msgstr "Тип кључа :"
-
-#: templates/index_form.phtml:86
-#, fuzzy
-#| msgid "User"
-msgid "Parser:"
-msgstr "Корисник"
-
-#: templates/index_form.phtml:102
-#, fuzzy
-msgid "Comment:"
-msgstr "Коментари"
-
-#: templates/index_form.phtml:127 templates/structure/table_header.phtml:66
-msgid "Size"
-msgstr "Величина"
-
-#: templates/index_form.phtml:149 templates/index_form.phtml:190
-msgid "Drag to reorder"
-msgstr ""
-
 #: templates/prefs_autoload.phtml:9
 msgid ""
 "Your browser has phpMyAdmin configuration for this domain. Would you like to "
@@ -16034,498 +16102,453 @@ msgstr ""
 msgid "Start row:"
 msgstr "Статус"
 
-#: templates/structure/actions_in_table_structure.phtml:14
-#, php-format
-msgid "A primary key has been added on %s."
-msgstr "Примарни кључ је управо додат %s."
-
-#: templates/structure/actions_in_table_structure.phtml:34
-#: templates/structure/actions_in_table_structure.phtml:54
-#: templates/structure/actions_in_table_structure.phtml:79
-#: templates/structure/actions_in_table_structure.phtml:101
-#, php-format
-msgid "An index has been added on %s."
-msgstr "Кључ је управо додат %s."
-
-#: templates/structure/actions_in_table_structure.phtml:130
-#: templates/structure/check_all_table_column.phtml:59
-#, fuzzy
-#| msgid "Remove database"
-msgid "Remove from central columns"
-msgstr "Уклони базу"
-
-#: templates/structure/actions_in_table_structure.phtml:138
-#: templates/structure/check_all_table_column.phtml:55
-#, fuzzy
-#| msgid "Add %s field(s)"
-msgid "Add to central columns"
-msgstr "Додај %s поља"
-
-#: templates/structure/add_column.phtml:7
-#, fuzzy, php-format
-#| msgid "Add %s field(s)"
-msgid "Add %s column(s)"
-msgstr "Додај %s поља"
-
-#: templates/structure/add_column.phtml:12
-#, fuzzy
-#| msgid "At Beginning of Table"
-msgid "at beginning of table"
-msgstr "На почетку табеле"
-
-#: templates/structure/body_for_table_summary.phtml:6
-#, fuzzy, php-format
-#| msgid "%s table(s)"
-msgid "%s table"
-msgid_plural "%s tables"
-msgstr[0] "%s табела"
-msgstr[1] "%s табела"
-msgstr[2] "%s табела"
-
-#: templates/structure/body_for_table_summary.phtml:17
-msgid "Sum"
-msgstr "Укупно"
-
-#: templates/structure/check_all_tables.phtml:6
-msgid "Check tables having overhead"
-msgstr "Провери табеле које имају прекорачења"
-
-#: templates/structure/check_all_tables.phtml:10
-#, fuzzy
-#| msgid "Show color"
-msgid "Show create"
-msgstr "Прикажи боју"
-
-#: templates/structure/check_all_tables.phtml:27
-#, fuzzy
-#| msgid "Add new field"
-msgid "Prefix"
-msgstr "Додај ново поље"
-
-#: templates/structure/check_all_tables.phtml:28
-#, fuzzy
-msgid "Add prefix to table"
-msgstr "База не постоји"
-
-#: templates/structure/check_all_tables.phtml:29
-#, fuzzy
-#| msgid "Replace table data with file"
-msgid "Replace table prefix"
-msgstr "Замени податке у табели са подацима из датотеке"
-
-#: templates/structure/check_all_tables.phtml:30
-#, fuzzy
-#| msgid "Replace table data with file"
-msgid "Copy table with prefix"
-msgstr "Замени податке у табели са подацима из датотеке"
-
-#: templates/structure/check_all_tables.phtml:36
-#, fuzzy
-#| msgid "Add %s field(s)"
-msgid "Add columns to central list"
-msgstr "Додај %s поља"
-
-#: templates/structure/check_all_tables.phtml:37
-msgid "Remove columns from central list"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:38
-#, fuzzy
-#| msgid "Add %s field(s)"
-msgid "Make consistent with central list"
-msgstr "Додај %s поља"
-
-#: templates/structure/display_structure.phtml:140 view_create.php:181
-#, fuzzy
-#| msgid "Print view"
-msgid "Edit view"
-msgstr "За штампу"
-
-#: templates/structure/display_table_stats.phtml:9
-msgid "Space usage"
-msgstr "Заузеће"
-
-#: templates/structure/display_table_stats.phtml:27
-#: templates/structure/table_header.phtml:74
-msgid "Overhead"
-msgstr "Прекорачење"
-
-#: templates/structure/display_table_stats.phtml:32
-msgid "Effective"
-msgstr "Ефективне"
-
-#: templates/structure/favorite_anchor.phtml:12
-#, fuzzy
-msgid "Add to Favorites"
-msgstr "Додај новог корисника"
-
-#: templates/structure/move_columns_dialog.phtml:1
-#: templates/structure/optional_action_links.phtml:21
-#, fuzzy
-#| msgid "Add %s field(s)"
-msgid "Move columns"
-msgstr "Додај %s поља"
-
-#: templates/structure/move_columns_dialog.phtml:2
-msgid "Move the columns by dragging them up and down."
-msgstr ""
-
-#: templates/structure/optional_action_links.phtml:9
-msgid "Propose table structure"
-msgstr "Предложи структуру табеле"
-
-#: templates/structure/optional_action_links.phtml:24
-#, fuzzy
-#| msgid "Propose table structure"
-msgid "Improve table structure"
-msgstr "Предложи структуру табеле"
-
-#: templates/structure/optional_action_links.phtml:30
-#, fuzzy
-msgid "Track view"
-msgstr "Провери табелу"
-
-#: templates/structure/row_stats_table.phtml:3
-#, fuzzy
-#| msgid "Row Statistics"
-msgid "Row statistics"
-msgstr "Статистике реда"
-
-#: templates/structure/row_stats_table.phtml:9
-msgid "static"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:11
-msgid "dynamic"
-msgstr "динамички"
-
-#: templates/structure/row_stats_table.phtml:22
-msgid "partitioned"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:54
-msgid "Row length"
-msgstr "Дужина реда"
-
-#: templates/structure/row_stats_table.phtml:66
-msgid "Row size"
-msgstr "Величина реда"
-
-#: templates/structure/row_stats_table.phtml:73
-msgid "Next autoindex"
-msgstr ""
-
-#: templates/structure/secondary_tabs.phtml:14
-#, fuzzy
-#| msgid "Relation view"
-msgid "Relation view"
-msgstr "Релациони поглед"
-
-#: templates/structure/show_create.phtml:2
-#, fuzzy
-msgid "Showing create queries"
-msgstr "Прикажи комплетне упите"
-
-#: templates/structure/sortable_header.phtml:13
-msgid "Sort"
-msgstr "Сортирање"
-
-#: templates/structure/table_header.phtml:42
-#, fuzzy
-#| msgid "May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]"
-msgid ""
-"May be approximate. Click on the number to get the exact count. See "
-"[doc@faq3-11]FAQ 3.11[/doc]."
-msgstr "Може бити приближно. Видите [doc@faq3-11]FAQ 3.11[/doc]"
-
-#: templates/structure/table_structure_row.phtml:46
-#, fuzzy, php-format
-#| msgid "Table %s has been dropped."
-msgid "Column %s has been dropped."
-msgstr "Табела %s је одбачена"
-
-#: templates/structure/tracking_icon.phtml:4
-msgid "Tracking is active."
-msgstr ""
-
-#: templates/structure/tracking_icon.phtml:8
-msgid "Tracking is not active."
-msgstr ""
-
-#: templates/table/create_table.phtml:15
-#, fuzzy
-#| msgid "Number of fields"
-msgid "Number of columns"
-msgstr "Број поља"
-
-#: templates/table/options.phtml:8
-#, fuzzy
-#| msgid "Select fields (at least one):"
-msgid "Select columns (at least one):"
-msgstr "Изабери поља (најмање једно)"
-
-#: templates/table/options.phtml:37
-msgid "Add search conditions (body of the \"where\" clause):"
-msgstr "Додај услове претраживања (део \"WHERE\" упита):"
-
-#: templates/table/options.phtml:45
-msgid "Number of rows per page"
-msgstr "Број редова по страни"
-
-#: templates/table/options.phtml:56
-msgid "Display order:"
-msgstr "Редослед приказа:"
-
-#: templates/table/options_zoom.phtml:6
-msgid "Use this column to label each point"
-msgstr ""
-
-#: templates/table/options_zoom.phtml:35
-msgid "Maximum rows to plot"
-msgstr ""
-
-#: templates/table/replace_preview.phtml:13
-msgid "Find and replace - preview"
-msgstr ""
-
-#: templates/table/replace_preview.phtml:18
-#, fuzzy
-#| msgid "Original position"
-msgid "Original string"
-msgstr "Оригинална позиција"
-
-#: templates/table/replace_preview.phtml:19
-#, fuzzy
-#| msgid "Relations"
-msgid "Replaced string"
-msgstr "Релације"
-
-#: templates/table/replace_preview.phtml:40
-#, fuzzy
-#| msgid "Replication"
-msgid "Replace"
-msgstr "Репликација"
-
-#: templates/table/rows_zoom.phtml:16
-#, fuzzy
-msgid "Additional search criteria"
-msgstr "SQL упит"
-
-#: templates/table/search_and_replace.phtml:3
-#, fuzzy
-#| msgid "Replace NULL by"
-msgid "Replace with:"
-msgstr "Замени NULL са"
-
-#: templates/table/search_and_replace.phtml:22
-#, fuzzy
-#| msgid "as regular expression"
-msgid "Use regular expression"
-msgstr "као регуларни израз"
-
-#: templates/table/selection_form.phtml:12
-#, fuzzy
-#| msgid "Do a \"query by example\" (wildcard: \"%\")"
-msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
-msgstr "Направи \"упит по примеру\" (џокер: \"%\")"
-
-#: templates/table/selection_form.phtml:34
-msgid "Do a \"query by example\" (wildcard: \"%\")"
-msgstr "Направи \"упит по примеру\" (џокер: \"%\")"
-
-#: templates/table/zoom_result_form.phtml:7
-msgid "Browse/Edit the points"
-msgstr ""
-
-#: templates/table/zoom_result_form.phtml:15
-#, fuzzy
-msgid "How to use"
-msgstr "верзија PHP-a"
-
-#: templates/table/zoom_result_form.phtml:23
-#, fuzzy
-#| msgid "Reset"
-msgid "Reset zoom"
-msgstr "Поништи"
-
-#: templates/tbl_chart.phtml:17
+#: templates/table/chart/tbl_chart.phtml:17
 #, fuzzy
 #| msgid "Mar"
 msgctxt "Chart type"
 msgid "Bar"
 msgstr "мар"
 
-#: templates/tbl_chart.phtml:21
+#: templates/table/chart/tbl_chart.phtml:21
 #, fuzzy
 #| msgid "Column"
 msgctxt "Chart type"
 msgid "Column"
 msgstr "Колона"
 
-#: templates/tbl_chart.phtml:25
+#: templates/table/chart/tbl_chart.phtml:25
 msgctxt "Chart type"
 msgid "Line"
 msgstr ""
 
-#: templates/tbl_chart.phtml:29
+#: templates/table/chart/tbl_chart.phtml:29
 #, fuzzy
 #| msgid "Engines"
 msgctxt "Chart type"
 msgid "Spline"
 msgstr "Складиштења"
 
-#: templates/tbl_chart.phtml:33
+#: templates/table/chart/tbl_chart.phtml:33
 msgctxt "Chart type"
 msgid "Area"
 msgstr ""
 
-#: templates/tbl_chart.phtml:37
+#: templates/table/chart/tbl_chart.phtml:37
 #, fuzzy
 #| msgid "PiB"
 msgctxt "Chart type"
 msgid "Pie"
 msgstr "ПБ"
 
-#: templates/tbl_chart.phtml:41
+#: templates/table/chart/tbl_chart.phtml:41
 #, fuzzy
 #| msgid "Time"
 msgctxt "Chart type"
 msgid "Timeline"
 msgstr "Време"
 
-#: templates/tbl_chart.phtml:45
+#: templates/table/chart/tbl_chart.phtml:45
 msgctxt "Chart type"
 msgid "Scatter"
 msgstr ""
 
-#: templates/tbl_chart.phtml:50
+#: templates/table/chart/tbl_chart.phtml:50
 msgid "Stacked"
 msgstr ""
 
-#: templates/tbl_chart.phtml:53
+#: templates/table/chart/tbl_chart.phtml:53
 #, fuzzy
 #| msgid "Report title"
 msgid "Chart title"
 msgstr "Наслов извештаја"
 
-#: templates/tbl_chart.phtml:57
+#: templates/table/chart/tbl_chart.phtml:57
 msgid "X-Axis:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:72
+#: templates/table/chart/tbl_chart.phtml:72
 #, fuzzy
 msgid "Series:"
 msgstr "SQL упит"
 
-#: templates/tbl_chart.phtml:102
+#: templates/table/chart/tbl_chart.phtml:102
 msgid "X-Axis label:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:104
+#: templates/table/chart/tbl_chart.phtml:104
 #, fuzzy
 #| msgid "Value"
 msgid "X Values"
 msgstr "Вредност"
 
-#: templates/tbl_chart.phtml:107
+#: templates/table/chart/tbl_chart.phtml:107
 msgid "Y-Axis label:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:115
+#: templates/table/chart/tbl_chart.phtml:115
 msgid "Series names are in a column"
 msgstr ""
 
-#: templates/tbl_chart.phtml:118
+#: templates/table/chart/tbl_chart.phtml:118
 #, fuzzy
 #| msgid "Inside table(s):"
 msgid "Series column:"
 msgstr "Унутар табела:"
 
-#: templates/tbl_chart.phtml:130
+#: templates/table/chart/tbl_chart.phtml:130
 #, fuzzy
 #| msgid "Number of fields"
 msgid "Value Column:"
 msgstr "Број поља"
 
-#: templates/tbl_chart.phtml:150
+#: templates/table/chart/tbl_chart.phtml:150
 #, fuzzy
 #| msgid "Save as file"
 msgid "Save chart as image"
 msgstr "Сачувај као датотеку"
 
-#: templates/tbl_relation/common_form.phtml:7
+#: templates/table/gis_visualization/gis_visualization.phtml:3
+msgid "Display GIS Visualization"
+msgstr ""
+
+#: templates/table/gis_visualization/gis_visualization.phtml:8
+#, fuzzy
+#| msgid "Add/Delete Field Columns"
+msgid "Label column"
+msgstr "Додај/обриши колону"
+
+#: templates/table/gis_visualization/gis_visualization.phtml:11
+msgid "-- None --"
+msgstr ""
+
+#: templates/table/gis_visualization/gis_visualization.phtml:19
+#, fuzzy
+#| msgid "Total"
+msgid "Spatial column"
+msgstr "Укупно"
+
+#: templates/table/index_form.phtml:16
+msgid "Index name:"
+msgstr "Име кључа :"
+
+#: templates/table/index_form.phtml:19
+msgid ""
+"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
+msgstr "\"PRIMARY\" <b>мора</b> бити име <b>само</b> примарног кључа!"
+
+#: templates/table/index_form.phtml:40
+#, fuzzy
+#| msgid "Index name:"
+msgid "Index choice:"
+msgstr "Име кључа :"
+
+#: templates/table/index_form.phtml:57
+msgid "Key block size:"
+msgstr ""
+
+#: templates/table/index_form.phtml:74
+msgid "Index type:"
+msgstr "Тип кључа :"
+
+#: templates/table/index_form.phtml:86
+#, fuzzy
+#| msgid "User"
+msgid "Parser:"
+msgstr "Корисник"
+
+#: templates/table/index_form.phtml:102
+#, fuzzy
+msgid "Comment:"
+msgstr "Коментари"
+
+#: templates/table/index_form.phtml:149 templates/table/index_form.phtml:190
+msgid "Drag to reorder"
+msgstr ""
+
+#: templates/table/relation/common_form.phtml:7
 msgid "Internal relations"
 msgstr "Унутрашње релације"
 
-#: templates/tbl_relation/common_form.phtml:11
+#: templates/table/relation/common_form.phtml:11
 #, fuzzy
 #| msgid "Internal relations"
 msgid "Internal relation"
 msgstr "Унутрашње релације"
 
-#: templates/tbl_relation/common_form.phtml:14
+#: templates/table/relation/common_form.phtml:14
 msgid ""
 "An internal relation is not necessary when a corresponding FOREIGN KEY "
 "relation exists."
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:37
+#: templates/table/relation/common_form.phtml:37
 #, fuzzy
 #| msgid "Disable foreign key checks"
 msgid "Foreign key constraints"
 msgstr "Искључи провере страних кључева"
 
-#: templates/tbl_relation/common_form.phtml:40
+#: templates/table/relation/common_form.phtml:40
 #, fuzzy
 #| msgid "Action"
 msgid "Actions"
 msgstr "Акција"
 
-#: templates/tbl_relation/common_form.phtml:41
+#: templates/table/relation/common_form.phtml:41
 #, fuzzy
 #| msgid "Constraints for table"
 msgid "Constraint properties"
 msgstr "Ограничења за табеле"
 
-#: templates/tbl_relation/common_form.phtml:44
+#: templates/table/relation/common_form.phtml:44
 msgid ""
 "Only columns with index will be displayed. You can define an index below."
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:49
+#: templates/table/relation/common_form.phtml:49
 msgid "Foreign key constraint"
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:81
+#: templates/table/relation/common_form.phtml:81
 #, fuzzy
 #| msgid "Add constraints"
 msgid "+ Add constraint"
 msgstr "Додај ограничења"
 
-#: templates/tbl_relation/common_form.phtml:91
+#: templates/table/relation/common_form.phtml:91
 #, fuzzy
 #| msgid "Choose field to display"
 msgid "Choose column to display:"
 msgstr "Изабери поља за приказ"
 
-#: templates/tbl_relation/foreign_key_row.phtml:13
+#: templates/table/relation/foreign_key_row.phtml:13
 #, fuzzy, php-format
 #| msgid "Disable foreign key checks"
 msgid "Foreign key constraint %s has been dropped"
 msgstr "Искључи провере страних кључева"
 
-#: templates/tbl_relation/foreign_key_row.phtml:102
+#: templates/table/relation/foreign_key_row.phtml:102
 #, fuzzy
 #| msgid "Constraints for table"
 msgid "Constraint name"
 msgstr "Ограничења за табеле"
 
-#: templates/tbl_relation/foreign_key_row.phtml:157
+#: templates/table/relation/foreign_key_row.phtml:157
 #, fuzzy
 #| msgid "Add %s field(s)"
 msgid "+ Add column"
 msgstr "Додај %s поља"
 
+#: templates/table/search/options.phtml:8
+#, fuzzy
+#| msgid "Select fields (at least one):"
+msgid "Select columns (at least one):"
+msgstr "Изабери поља (најмање једно)"
+
+#: templates/table/search/options.phtml:37
+msgid "Add search conditions (body of the \"where\" clause):"
+msgstr "Додај услове претраживања (део \"WHERE\" упита):"
+
+#: templates/table/search/options.phtml:45
+msgid "Number of rows per page"
+msgstr "Број редова по страни"
+
+#: templates/table/search/options.phtml:56
+msgid "Display order:"
+msgstr "Редослед приказа:"
+
+#: templates/table/search/options_zoom.phtml:6
+msgid "Use this column to label each point"
+msgstr ""
+
+#: templates/table/search/options_zoom.phtml:35
+msgid "Maximum rows to plot"
+msgstr ""
+
+#: templates/table/search/replace_preview.phtml:13
+msgid "Find and replace - preview"
+msgstr ""
+
+#: templates/table/search/replace_preview.phtml:18
+#, fuzzy
+#| msgid "Original position"
+msgid "Original string"
+msgstr "Оригинална позиција"
+
+#: templates/table/search/replace_preview.phtml:19
+#, fuzzy
+#| msgid "Relations"
+msgid "Replaced string"
+msgstr "Релације"
+
+#: templates/table/search/replace_preview.phtml:40
+#, fuzzy
+#| msgid "Replication"
+msgid "Replace"
+msgstr "Репликација"
+
+#: templates/table/search/rows_zoom.phtml:16
+#, fuzzy
+msgid "Additional search criteria"
+msgstr "SQL упит"
+
+#: templates/table/search/search_and_replace.phtml:3
+#, fuzzy
+#| msgid "Replace NULL by"
+msgid "Replace with:"
+msgstr "Замени NULL са"
+
+#: templates/table/search/search_and_replace.phtml:22
+#, fuzzy
+#| msgid "as regular expression"
+msgid "Use regular expression"
+msgstr "као регуларни израз"
+
+#: templates/table/search/selection_form.phtml:12
+#, fuzzy
+#| msgid "Do a \"query by example\" (wildcard: \"%\")"
+msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
+msgstr "Направи \"упит по примеру\" (џокер: \"%\")"
+
+#: templates/table/search/selection_form.phtml:34
+msgid "Do a \"query by example\" (wildcard: \"%\")"
+msgstr "Направи \"упит по примеру\" (џокер: \"%\")"
+
+#: templates/table/search/zoom_result_form.phtml:7
+msgid "Browse/Edit the points"
+msgstr ""
+
+#: templates/table/search/zoom_result_form.phtml:15
+#, fuzzy
+msgid "How to use"
+msgstr "верзија PHP-a"
+
+#: templates/table/search/zoom_result_form.phtml:23
+#, fuzzy
+#| msgid "Reset"
+msgid "Reset zoom"
+msgstr "Поништи"
+
+#: templates/table/secondary_tabs.phtml:14
+#, fuzzy
+#| msgid "Relation view"
+msgid "Relation view"
+msgstr "Релациони поглед"
+
+#: templates/table/structure/actions_in_table_structure.phtml:14
+#, php-format
+msgid "A primary key has been added on %s."
+msgstr "Примарни кључ је управо додат %s."
+
+#: templates/table/structure/actions_in_table_structure.phtml:34
+#: templates/table/structure/actions_in_table_structure.phtml:54
+#: templates/table/structure/actions_in_table_structure.phtml:79
+#: templates/table/structure/actions_in_table_structure.phtml:101
+#, php-format
+msgid "An index has been added on %s."
+msgstr "Кључ је управо додат %s."
+
+#: templates/table/structure/actions_in_table_structure.phtml:130
+#: templates/table/structure/check_all_table_column.phtml:59
+#, fuzzy
+#| msgid "Remove database"
+msgid "Remove from central columns"
+msgstr "Уклони базу"
+
+#: templates/table/structure/actions_in_table_structure.phtml:138
+#: templates/table/structure/check_all_table_column.phtml:55
+#, fuzzy
+#| msgid "Add %s field(s)"
+msgid "Add to central columns"
+msgstr "Додај %s поља"
+
+#: templates/table/structure/add_column.phtml:7
+#, fuzzy, php-format
+#| msgid "Add %s field(s)"
+msgid "Add %s column(s)"
+msgstr "Додај %s поља"
+
+#: templates/table/structure/add_column.phtml:12
+#, fuzzy
+#| msgid "At Beginning of Table"
+msgid "at beginning of table"
+msgstr "На почетку табеле"
+
+#: templates/table/structure/display_structure.phtml:140 view_create.php:181
+#, fuzzy
+#| msgid "Print view"
+msgid "Edit view"
+msgstr "За штампу"
+
+#: templates/table/structure/display_table_stats.phtml:9
+msgid "Space usage"
+msgstr "Заузеће"
+
+#: templates/table/structure/display_table_stats.phtml:32
+msgid "Effective"
+msgstr "Ефективне"
+
+#: templates/table/structure/move_columns_dialog.phtml:1
+#: templates/table/structure/optional_action_links.phtml:21
+#, fuzzy
+#| msgid "Add %s field(s)"
+msgid "Move columns"
+msgstr "Додај %s поља"
+
+#: templates/table/structure/move_columns_dialog.phtml:2
+msgid "Move the columns by dragging them up and down."
+msgstr ""
+
+#: templates/table/structure/optional_action_links.phtml:9
+msgid "Propose table structure"
+msgstr "Предложи структуру табеле"
+
+#: templates/table/structure/optional_action_links.phtml:24
+#, fuzzy
+#| msgid "Propose table structure"
+msgid "Improve table structure"
+msgstr "Предложи структуру табеле"
+
+#: templates/table/structure/optional_action_links.phtml:30
+#, fuzzy
+msgid "Track view"
+msgstr "Провери табелу"
+
+#: templates/table/structure/row_stats_table.phtml:3
+#, fuzzy
+#| msgid "Row Statistics"
+msgid "Row statistics"
+msgstr "Статистике реда"
+
+#: templates/table/structure/row_stats_table.phtml:9
+msgid "static"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:11
+msgid "dynamic"
+msgstr "динамички"
+
+#: templates/table/structure/row_stats_table.phtml:22
+msgid "partitioned"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:54
+msgid "Row length"
+msgstr "Дужина реда"
+
+#: templates/table/structure/row_stats_table.phtml:66
+msgid "Row size"
+msgstr "Величина реда"
+
+#: templates/table/structure/row_stats_table.phtml:73
+msgid "Next autoindex"
+msgstr ""
+
+#: templates/table/structure/table_structure_row.phtml:46
+#, fuzzy, php-format
+#| msgid "Table %s has been dropped."
+msgid "Column %s has been dropped."
+msgstr "Табела %s је одбачена"
+
 #: themes.php:17 themes.php:22
 msgid "Theme"
 msgstr ""
@@ -17785,6 +17808,11 @@ msgstr ""
 msgid "concurrent_insert is set to 0"
 msgstr "макс. истовремених веза"
 
+#, fuzzy
+#~| msgid "Read misses"
+#~ msgid "Read as multibytes"
+#~ msgstr "Промашаји при читању"
+
 #, fuzzy
 #~| msgid "Relational schema"
 #~ msgid "Relational display column"
diff --git a/po/sr@latin.po b/po/sr@latin.po
index 5d08b24798..c87943cc7d 100644
--- a/po/sr@latin.po
+++ b/po/sr@latin.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 4.5.0-dev\n"
 "Report-Msgid-Bugs-To: developers@phpmyadmin.net\n"
-"POT-Creation-Date: 2015-08-08 13:53-0400\n"
+"POT-Creation-Date: 2015-08-12 08:10-0400\n"
 "PO-Revision-Date: 2014-03-31 14:25+0200\n"
 "Last-Translator: Michal Čihař <michal@cihar.com>\n"
 "Language-Team: Serbian (latin) <https://hosted.weblate.org/projects/"
@@ -59,7 +59,7 @@ msgid "Table comments:"
 msgstr "Komentari tabele"
 
 #: db_datadict.php:104 libraries/Index.class.php:699
-#: libraries/insert_edit.lib.php:1567
+#: libraries/insert_edit.lib.php:1565
 #: libraries/navigation/Nodes/Node_Column.class.php:30
 #: libraries/plugins/export/ExportHtmlword.class.php:280
 #: libraries/plugins/export/ExportHtmlword.class.php:375
@@ -73,13 +73,14 @@ msgstr "Komentari tabele"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1023
 #: libraries/tracking.lib.php:879 libraries/tracking.lib.php:975
 #: templates/columns_definitions/column_name.phtml:18
-#: templates/index_form.phtml:124 templates/table/table_header.phtml:6
-#: templates/table/zoom_result_form.phtml:33
-#: templates/tbl_relation/common_form.phtml:10
-#: templates/tbl_relation/common_form.phtml:43
-#: templates/tbl_relation/foreign_key_row.phtml:194
-#: templates/tbl_relation/foreign_key_row.phtml:206
-#: templates/tbl_relation/internal_relational_row.phtml:71
+#: templates/table/index_form.phtml:124
+#: templates/table/relation/common_form.phtml:10
+#: templates/table/relation/common_form.phtml:43
+#: templates/table/relation/foreign_key_row.phtml:194
+#: templates/table/relation/foreign_key_row.phtml:206
+#: templates/table/relation/internal_relational_row.phtml:71
+#: templates/table/search/table_header.phtml:6
+#: templates/table/search/zoom_result_form.phtml:33
 msgid "Column"
 msgstr "Kolona"
 
@@ -97,21 +98,21 @@ msgstr "Kolona"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1001
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1024
 #: libraries/rte/rte_list.lib.php:75 libraries/rte/rte_list.lib.php:103
-#: libraries/rte/rte_routines.lib.php:802
-#: libraries/rte/rte_routines.lib.php:831
-#: libraries/rte/rte_routines.lib.php:1493
+#: libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_routines.lib.php:922
+#: libraries/rte/rte_routines.lib.php:1584
 #: libraries/server_privileges.lib.php:2369 libraries/tracking.lib.php:880
 #: libraries/tracking.lib.php:972
 #: templates/columns_definitions/table_fields_definitions.phtml:11
-#: templates/structure/table_header.phtml:48
-#: templates/structure/table_structure_header.phtml:6
-#: templates/table/table_header.phtml:7
+#: templates/database/structure/table_header.phtml:48
+#: templates/table/search/table_header.phtml:7
+#: templates/table/structure/table_structure_header.phtml:6
 msgid "Type"
 msgstr "Tip"
 
 #: db_datadict.php:106 libraries/Index.class.php:702
 #: libraries/central_columns.lib.php:708
-#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1576
+#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1574
 #: libraries/plugins/export/ExportHtmlword.class.php:286
 #: libraries/plugins/export/ExportHtmlword.class.php:381
 #: libraries/plugins/export/ExportLatex.class.php:509
@@ -124,8 +125,8 @@ msgstr "Tip"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1026
 #: libraries/tracking.lib.php:882 libraries/tracking.lib.php:978
 #: templates/columns_definitions/table_fields_definitions.phtml:39
-#: templates/structure/table_structure_header.phtml:9
-#: templates/table/zoom_result_form.phtml:34
+#: templates/table/search/zoom_result_form.phtml:34
+#: templates/table/structure/table_structure_header.phtml:9
 msgid "Null"
 msgstr "Null"
 
@@ -143,8 +144,8 @@ msgstr "Null"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1027
 #: libraries/replication_gui.lib.php:153 libraries/tracking.lib.php:883
 #: templates/columns_definitions/table_fields_definitions.phtml:25
-#: templates/structure/body_for_table_summary.phtml:55
-#: templates/structure/table_structure_header.phtml:10
+#: templates/database/structure/body_for_table_summary.phtml:55
+#: templates/table/structure/table_structure_header.phtml:10
 msgid "Default"
 msgstr "Podrazumevano"
 
@@ -172,19 +173,19 @@ msgid "Comments"
 msgstr "Komentari"
 
 #: db_datadict.php:146
-#: libraries/controllers/StructureController.class.php:1960
-#: libraries/controllers/StructureController.class.php:1965
+#: libraries/controllers/TableStructureController.class.php:951
+#: libraries/controllers/TableStructureController.class.php:956
 #: libraries/tracking.lib.php:922
 #: templates/columns_definitions/column_indexes.phtml:6
-#: templates/structure/check_all_table_column.phtml:22
-#: templates/structure/display_structure.phtml:74
+#: templates/table/structure/check_all_table_column.phtml:22
+#: templates/table/structure/display_structure.phtml:74
 msgid "Primary"
 msgstr "Primarni"
 
 #: db_datadict.php:156 js/messages.php:317 libraries/Index.class.php:567
 #: libraries/Index.class.php:606 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261 libraries/mult_submits.lib.php:403
+#: libraries/config/FormDisplay.tpl.php:272 libraries/mult_submits.lib.php:403
 #: libraries/mult_submits.lib.php:417
 #: libraries/plugins/export/ExportHtmlword.class.php:630
 #: libraries/plugins/export/ExportLatex.class.php:589
@@ -200,20 +201,20 @@ msgstr "Primarni"
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1010 libraries/tracking.lib.php:1015
 #: prefs_manage.php:140 templates/prefs_autoload.phtml:15
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "No"
 msgstr "Ne"
 
 #: db_datadict.php:156 js/messages.php:443 libraries/Index.class.php:568
 #: libraries/Index.class.php:605 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261
-#: libraries/controllers/StructureController.class.php:1344
-#: libraries/controllers/StructureController.class.php:2223
-#: libraries/controllers/StructureController.class.php:2232
-#: libraries/controllers/StructureController.class.php:2237
-#: libraries/controllers/StructureController.class.php:2242
-#: libraries/controllers/StructureController.class.php:2247
+#: libraries/config/FormDisplay.tpl.php:272
+#: libraries/controllers/TableStructureController.class.php:539
+#: libraries/controllers/TableStructureController.class.php:1201
+#: libraries/controllers/TableStructureController.class.php:1210
+#: libraries/controllers/TableStructureController.class.php:1215
+#: libraries/controllers/TableStructureController.class.php:1220
+#: libraries/controllers/TableStructureController.class.php:1225
 #: libraries/mult_submits.inc.php:82 libraries/mult_submits.inc.php:178
 #: libraries/mult_submits.lib.php:339 libraries/mult_submits.lib.php:372
 #: libraries/mult_submits.lib.php:401 libraries/mult_submits.lib.php:415
@@ -222,8 +223,8 @@ msgstr "Ne"
 #: libraries/plugins/export/ExportOdt.class.php:756
 #: libraries/plugins/export/ExportTexytext.class.php:567
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1077
-#: libraries/server_databases.lib.php:464
-#: libraries/server_databases.lib.php:474
+#: libraries/server_databases.lib.php:475
+#: libraries/server_databases.lib.php:485
 #: libraries/server_privileges.lib.php:2546
 #: libraries/server_privileges.lib.php:2727
 #: libraries/server_privileges.lib.php:2748
@@ -233,7 +234,7 @@ msgstr "Ne"
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1008 libraries/tracking.lib.php:1013
 #: prefs_manage.php:138 templates/prefs_autoload.phtml:14
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "Yes"
 msgstr "Da"
 
@@ -243,7 +244,7 @@ msgstr "Prikaži sadržaj (shemu) baze"
 
 #: db_export.php:37 db_tracking.php:90 export.php:382
 #: libraries/DBQbe.class.php:326
-#: libraries/controllers/StructureController.class.php:231
+#: libraries/controllers/DatabaseStructureController.class.php:170
 #: libraries/navigation/NavigationTree.class.php:897
 msgid "No tables found in database."
 msgstr "Tabele nisu pronađene u bazi."
@@ -254,14 +255,14 @@ msgstr "Tabele nisu pronađene u bazi."
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:26
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:120
-#: templates/structure/show_create.phtml:18
+#: templates/database/structure/show_create.phtml:18
 msgid "Tables"
 msgstr "Tabele"
 
 #: db_export.php:52 libraries/Menu.class.php:317 libraries/Menu.class.php:425
-#: libraries/Util.class.php:3333 libraries/Util.class.php:3343
-#: libraries/Util.class.php:3349 libraries/Util.class.php:3629
-#: libraries/Util.class.php:4327 libraries/Util.class.php:4344
+#: libraries/Util.class.php:3339 libraries/Util.class.php:3349
+#: libraries/Util.class.php:3355 libraries/Util.class.php:3635
+#: libraries/Util.class.php:4333 libraries/Util.class.php:4350
 #: libraries/central_columns.lib.php:728 libraries/config.values.php:39
 #: libraries/config.values.php:47 libraries/config.values.php:109
 #: libraries/config.values.php:115 libraries/config/setup.forms.php:323
@@ -275,7 +276,7 @@ msgstr "Tabele"
 #: libraries/navigation/Nodes/Node_Table.class.php:283
 #: libraries/server_privileges.lib.php:1141 libraries/tracking.lib.php:874
 #: templates/columns_definitions/table_fields_definitions.phtml:3
-#: templates/designer/table_list.phtml:28
+#: templates/database/designer/table_list.phtml:28
 msgid "Structure"
 msgstr "Struktura"
 
@@ -287,7 +288,7 @@ msgstr "Struktura"
 #: libraries/config/user_preferences.forms.php:292
 #: libraries/config/user_preferences.forms.php:297
 #: libraries/server_privileges.lib.php:1140
-#: templates/structure/display_table_stats.phtml:12
+#: templates/table/structure/display_table_stats.phtml:12
 msgid "Data"
 msgstr "Podaci"
 
@@ -372,10 +373,10 @@ msgstr "Praćene tabele"
 #: libraries/server_privileges.lib.php:2908
 #: libraries/server_privileges.lib.php:3145
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4346
-#: templates/structure/table_header.phtml:21
-#: templates/tbl_relation/foreign_key_row.phtml:176
-#: templates/tbl_relation/internal_relational_row.phtml:63
+#: libraries/server_privileges.lib.php:4372
+#: templates/database/structure/table_header.phtml:21
+#: templates/table/relation/foreign_key_row.phtml:176
+#: templates/table/relation/internal_relational_row.phtml:63
 msgid "Table"
 msgstr "Tabela"
 
@@ -392,7 +393,7 @@ msgid "Updated"
 msgstr "Ažurirano"
 
 #: db_tracking.php:130 js/messages.php:243 libraries/Menu.class.php:552
-#: libraries/Util.class.php:4314 libraries/config.values.php:104
+#: libraries/Util.class.php:4320 libraries/config.values.php:104
 #: libraries/rte/rte_events.lib.php:393 libraries/rte/rte_list.lib.php:101
 #: libraries/server_status_processes.lib.php:92 libraries/tracking.lib.php:279
 msgid "Status"
@@ -401,14 +402,15 @@ msgstr "Status"
 #: db_tracking.php:131 db_tracking.php:290 libraries/Index.class.php:693
 #: libraries/central_columns.lib.php:687 libraries/rte/rte_list.lib.php:74
 #: libraries/rte/rte_list.lib.php:89 libraries/rte/rte_list.lib.php:102
-#: libraries/server_databases.lib.php:398
+#: libraries/server_databases.lib.php:409
 #: libraries/server_privileges.lib.php:2372
 #: libraries/server_privileges.lib.php:3166
 #: libraries/server_privileges.lib.php:3342
 #: libraries/server_user_groups.lib.php:82
 #: libraries/server_variables.lib.php:189 libraries/tracking.lib.php:280
-#: libraries/tracking.lib.php:793 templates/structure/table_header.phtml:30
-#: templates/structure/table_structure_header.phtml:23
+#: libraries/tracking.lib.php:793
+#: templates/database/structure/table_header.phtml:30
+#: templates/table/structure/table_structure_header.phtml:23
 msgid "Action"
 msgstr "Akcija"
 
@@ -452,7 +454,7 @@ msgid "Untracked tables"
 msgstr "Nepraćene tabele"
 
 #: db_tracking.php:305 db_tracking.php:336
-#: templates/structure/optional_action_links.phtml:17
+#: templates/table/structure/optional_action_links.phtml:17
 msgid "Track table"
 msgstr "Prati tabelu"
 
@@ -502,7 +504,7 @@ msgid "Value for the column \"%s\""
 msgstr "Vrednost za kolonu %s"
 
 #: gis_data_editor.php:146
-#: templates/gis_visualization/gis_visualization.phtml:37
+#: templates/table/gis_visualization/gis_visualization.phtml:37
 msgid "Use OpenStreetMaps as Base Layer"
 msgstr "Iskoristi OpenStreetMaps kao osnovni sloj"
 
@@ -592,35 +594,35 @@ msgstr "Dodaj geometriju"
 #: libraries/display_change_password.lib.php:162
 #: libraries/display_export.lib.php:402 libraries/display_export.lib.php:408
 #: libraries/display_import.lib.php:392 libraries/index.lib.php:44
-#: libraries/insert_edit.lib.php:1546 libraries/insert_edit.lib.php:1583
+#: libraries/insert_edit.lib.php:1544 libraries/insert_edit.lib.php:1581
 #: libraries/normalization.lib.php:165 libraries/normalization.lib.php:821
 #: libraries/operations.lib.php:38 libraries/operations.lib.php:108
 #: libraries/operations.lib.php:263 libraries/operations.lib.php:306
 #: libraries/operations.lib.php:801 libraries/operations.lib.php:874
 #: libraries/operations.lib.php:923 libraries/operations.lib.php:1337
 #: libraries/operations.lib.php:1658
-#: libraries/plugins/auth/AuthenticationCookie.class.php:244
+#: libraries/plugins/auth/AuthenticationCookie.class.php:232
 #: libraries/replication_gui.lib.php:122 libraries/replication_gui.lib.php:161
 #: libraries/replication_gui.lib.php:324 libraries/replication_gui.lib.php:461
 #: libraries/replication_gui.lib.php:906 libraries/rte/rte_events.lib.php:509
-#: libraries/rte/rte_routines.lib.php:969
-#: libraries/rte/rte_routines.lib.php:1581
+#: libraries/rte/rte_routines.lib.php:1060
+#: libraries/rte/rte_routines.lib.php:1672
 #: libraries/rte/rte_triggers.lib.php:396 libraries/server_bin_log.lib.php:61
 #: libraries/server_privileges.lib.php:705
 #: libraries/server_privileges.lib.php:2106
 #: libraries/server_privileges.lib.php:2872
 #: libraries/server_privileges.lib.php:3553
-#: libraries/server_privileges.lib.php:4627
+#: libraries/server_privileges.lib.php:4653
 #: libraries/server_user_groups.lib.php:285
 #: libraries/sql_query_form.lib.php:369 libraries/sql_query_form.lib.php:429
 #: libraries/tracking.lib.php:533 libraries/tracking.lib.php:653
 #: prefs_manage.php:277 prefs_manage.php:355
 #: templates/columns_definitions/column_definitions_form.phtml:59
-#: templates/header_location.phtml:17 templates/index_form.phtml:238
+#: templates/database/create_table.phtml:21 templates/header_location.phtml:28
 #: templates/startAndNumberOfRowsPanel.phtml:14
-#: templates/structure/add_column.phtml:25
-#: templates/table/create_table.phtml:21
-#: templates/table/selection_form.phtml:75 view_create.php:275
+#: templates/table/index_form.phtml:238
+#: templates/table/search/selection_form.phtml:75
+#: templates/table/structure/add_column.phtml:25 view_create.php:275
 #: view_operations.php:106
 msgid "Go"
 msgstr "Kreni"
@@ -725,7 +727,7 @@ msgstr ""
 msgid "Could not load import plugins, please check your installation!"
 msgstr "Ne mogu da učitam dodatke za uvoz, molim proverite svoju instalaciju!"
 
-#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1466
+#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1460
 #, fuzzy, php-format
 #| msgid "Bookmark %s created"
 msgid "Bookmark %s has been created."
@@ -768,13 +770,13 @@ msgstr ""
 msgid "Back"
 msgstr "Nazad"
 
-#: index.php:148 libraries/Footer.class.php:70
+#: index.php:149 libraries/Footer.class.php:70
 #, fuzzy
 #| msgid "phpMyAdmin homepage"
 msgid "phpMyAdmin Demo Server"
 msgstr "phpMyAdmin početna stranica"
 
-#: index.php:152
+#: index.php:153
 #, php-format
 msgid ""
 "You are using the demo server. You can do anything here, but please do not "
@@ -782,42 +784,42 @@ msgid ""
 "at %s."
 msgstr ""
 
-#: index.php:162
+#: index.php:163
 msgid "General Settings"
 msgstr "Opšta podešavanja"
 
-#: index.php:190 libraries/display_change_password.lib.php:50
+#: index.php:191 libraries/display_change_password.lib.php:50
 #: libraries/display_change_password.lib.php:53 user_password.php:247
 msgid "Change password"
 msgstr "Promeni lozinku"
 
-#: index.php:206
+#: index.php:207
 msgid "Server connection collation"
 msgstr "Način poređenja kod veze na server"
 
-#: index.php:228
+#: index.php:229
 msgid "Appearance Settings"
 msgstr ""
 
-#: index.php:258 prefs_manage.php:285
+#: index.php:259 prefs_manage.php:285
 msgid "More settings"
 msgstr "Dodatna podešavanja"
 
-#: index.php:279
+#: index.php:280
 msgid "Database server"
 msgstr "Server baze podataka"
 
-#: index.php:282 libraries/plugins/auth/AuthenticationCookie.class.php:181
+#: index.php:283 libraries/plugins/auth/AuthenticationCookie.class.php:169
 msgid "Server:"
 msgstr "Server:"
 
-#: index.php:286
+#: index.php:287
 #, fuzzy
 #| msgid "Server port"
 msgid "Server type:"
 msgstr "Port na serveru"
 
-#: index.php:290 libraries/plugins/export/ExportLatex.class.php:212
+#: index.php:291 libraries/plugins/export/ExportLatex.class.php:212
 #: libraries/plugins/export/ExportSql.class.php:687
 #: libraries/plugins/export/ExportXml.class.php:189
 #, fuzzy
@@ -825,85 +827,85 @@ msgstr "Port na serveru"
 msgid "Server version:"
 msgstr "Verzija servera"
 
-#: index.php:296
+#: index.php:297
 #, fuzzy
 #| msgid "Protocol version"
 msgid "Protocol version:"
 msgstr "Verzija protokola"
 
-#: index.php:300
+#: index.php:301
 #, fuzzy
 #| msgid "User"
 msgid "User:"
 msgstr "Korisnik"
 
-#: index.php:305
+#: index.php:306
 #, fuzzy
 #| msgid "Server charset"
 msgid "Server charset:"
 msgstr "Server skup znakova"
 
-#: index.php:320
+#: index.php:321
 msgid "Web server"
 msgstr ""
 
-#: index.php:331
+#: index.php:332
 #, fuzzy
 #| msgid "Database client version"
 msgid "Database client version:"
 msgstr "Verzija klijenta baze"
 
-#: index.php:335
+#: index.php:336
 #, fuzzy
 #| msgid "PHP extension"
 msgid "PHP extension:"
 msgstr "PHP proširenje"
 
-#: index.php:349
+#: index.php:350
 #, fuzzy
 #| msgid "PHP Version"
 msgid "PHP version:"
 msgstr "verzija PHP-a"
 
-#: index.php:360
+#: index.php:361
 msgid "Show PHP information"
 msgstr "Prikaži informacije o PHP-u"
 
-#: index.php:383
+#: index.php:384
 #, fuzzy
 #| msgid "Version information"
 msgid "Version information:"
 msgstr "Informacije o verziji"
 
-#: index.php:392 libraries/Util.class.php:432 libraries/Util.class.php:495
-#: libraries/config/FormDisplay.tpl.php:151
+#: index.php:393 libraries/Util.class.php:432 libraries/Util.class.php:495
+#: libraries/config/FormDisplay.tpl.php:162
 #: libraries/display_export.lib.php:577 libraries/engines/pbxt.lib.php:162
 #: libraries/navigation/NavigationHeader.class.php:196
 #: libraries/server_variables.lib.php:160
 msgid "Documentation"
 msgstr "Dokumentacija"
 
-#: index.php:399
+#: index.php:400
 msgid "Wiki"
 msgstr "Wiki"
 
-#: index.php:408
+#: index.php:409
 msgid "Official Homepage"
 msgstr "phpMyAdmin veb sajt"
 
-#: index.php:415
+#: index.php:416
 msgid "Contribute"
 msgstr "Doprinesi"
 
-#: index.php:422
+#: index.php:423
 msgid "Get support"
 msgstr ""
 
-#: index.php:429
+#: index.php:430
 msgid "List of changes"
 msgstr "Lista izmena"
 
-#: index.php:451
+#: index.php:452
 #, fuzzy
 #| msgid ""
 #| "Your configuration file contains settings (root with no password) that "
@@ -921,7 +923,7 @@ msgstr ""
 "ovim podešavanjima, otvoren je za upade, i zaista treba da ispravite ovaj "
 "sigurnosni rizik."
 
-#: index.php:468
+#: index.php:469
 msgid ""
 "You have enabled mbstring.func_overload in your PHP configuration. This "
 "option is incompatible with phpMyAdmin and might cause some data to be "
@@ -931,7 +933,7 @@ msgstr ""
 "opcija je nekompatibilna sa phpMyAdmin i može dovesti do grešaka u nekim "
 "podacima!"
 
-#: index.php:483
+#: index.php:484
 msgid ""
 "The mbstring PHP extension was not found and you seem to be using a "
 "multibyte charset. Without the mbstring extension phpMyAdmin is unable to "
@@ -941,7 +943,7 @@ msgstr ""
 "skup znakova. Bez ekstenzije mbstring phpMyAdmin ne može ispravno da "
 "razdvaja stringove i to može dovesti do neočekivanih rezultata."
 
-#: index.php:500
+#: index.php:501
 msgid ""
 "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini."
 "session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower than "
@@ -949,17 +951,17 @@ msgid ""
 "expire sooner than configured in phpMyAdmin."
 msgstr ""
 
-#: index.php:519
+#: index.php:520
 msgid ""
 "Login cookie store is lower than cookie validity configured in phpMyAdmin, "
 "because of this, your login will expire sooner than configured in phpMyAdmin."
 msgstr ""
 
-#: index.php:535
+#: index.php:536
 msgid "The configuration file now needs a secret passphrase (blowfish_secret)."
 msgstr "Konfiguraciona datoteka zahteva tajnu lozinku (blowfish_secret)."
 
-#: index.php:548
+#: index.php:549
 msgid ""
 "Directory [code]config[/code], which is used by the setup script, still "
 "exists in your phpMyAdmin directory. It is strongly recommended to remove it "
@@ -967,7 +969,7 @@ msgid ""
 "may be compromised by unauthorized people downloading your configuration."
 msgstr ""
 
-#: index.php:564
+#: index.php:565
 #, fuzzy, php-format
 #| msgid ""
 #| "The phpMyAdmin configuration storage is not completely configured, some "
@@ -980,12 +982,12 @@ msgstr ""
 "dodatne mogućnosti su deaktivirane. Da bi ste saznali zašto kliknite %sovde"
 "%s."
 
-#: index.php:571
+#: index.php:572
 msgid ""
 "Or alternately go to 'Operations' tab of any database to set it up there."
 msgstr ""
 
-#: index.php:620
+#: index.php:621
 #, php-format
 msgid ""
 "Your PHP MySQL library version %s differs from your MySQL server version %s. "
@@ -994,7 +996,7 @@ msgstr ""
 "Verzija vaše PHP MySQL biblioteke %s se razlikuje od verzije vašeg MySQL "
 "servera %s. Ovo može dovesti do nepredvidljivog ponašanja."
 
-#: index.php:648
+#: index.php:649
 #, php-format
 msgid ""
 "Server running with Suhosin. Please refer to %sdocumentation%s for possible "
@@ -1165,8 +1167,8 @@ msgstr ""
 msgid "Save & Close"
 msgstr "Sačuvaj kao datoteku"
 
-#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:404
-#: libraries/insert_edit.lib.php:1550 prefs_manage.php:361
+#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:415
+#: libraries/insert_edit.lib.php:1548 prefs_manage.php:361
 #: prefs_manage.php:372
 msgid "Reset"
 msgstr "Poništi"
@@ -1207,7 +1209,7 @@ msgstr "Dodaj indeks"
 msgid "Edit Index"
 msgstr "Izmeni indeks"
 
-#: js/messages.php:99 templates/index_form.phtml:232
+#: js/messages.php:99 templates/table/index_form.phtml:232
 #, fuzzy, php-format
 #| msgid "Add %d column(s) to index"
 msgid "Add %s column(s) to index"
@@ -1237,13 +1239,14 @@ msgstr "Kolone uokvirene sa:"
 msgid "Please select column(s) for the index."
 msgstr "Dodaj %d kolona u indeks"
 
-#: js/messages.php:106 templates/structure/add_column.phtml:1
+#: js/messages.php:106 templates/table/structure/add_column.phtml:1
 msgid "You have to add at least one column."
 msgstr "Morate dodati barem jednu kolonu."
 
-#: js/messages.php:109 libraries/insert_edit.lib.php:1548
+#: js/messages.php:109 libraries/insert_edit.lib.php:1546
 #: templates/columns_definitions/column_definitions_form.phtml:162
-#: templates/index_form.phtml:237 templates/tbl_relation/common_form.phtml:106
+#: templates/table/index_form.phtml:237
+#: templates/table/relation/common_form.phtml:106
 msgid "Preview SQL"
 msgstr ""
 
@@ -1266,7 +1269,7 @@ msgid "SQL query:"
 msgstr "SQL upit"
 
 #. l10n: Default label for the y-Axis of Charts
-#: js/messages.php:118 templates/tbl_chart.phtml:109
+#: js/messages.php:118 templates/table/chart/tbl_chart.phtml:109
 msgid "Y Values"
 msgstr "Y vrednosti"
 
@@ -1430,7 +1433,7 @@ msgstr "Poslato bajtova"
 msgid "Bytes received"
 msgstr "Primljeno bajtova"
 
-#: js/messages.php:169 libraries/server_status.lib.php:226
+#: js/messages.php:169 libraries/server_status.lib.php:235
 msgid "Connections"
 msgstr "Veze"
 
@@ -1487,12 +1490,12 @@ msgstr "%d tabela"
 msgid "Questions"
 msgstr "Pitanja"
 
-#: js/messages.php:184 libraries/server_status.lib.php:134
+#: js/messages.php:184 libraries/server_status.lib.php:143
 msgid "Traffic"
 msgstr "Saobraćaj"
 
 #: js/messages.php:185 libraries/Menu.class.php:586
-#: libraries/Util.class.php:4318 libraries/server_status_monitor.lib.php:257
+#: libraries/Util.class.php:4324 libraries/server_status_monitor.lib.php:257
 msgid "Settings"
 msgstr "Podešavanja"
 
@@ -1514,8 +1517,9 @@ msgstr "Molimo vas da dodate bar jednu promenljivu u seriju podataka"
 #: libraries/server_status_monitor.lib.php:236
 #: libraries/server_status_processes.lib.php:308
 #: templates/columns_definitions/transformation.phtml:4
-#: templates/designer/options_panel.phtml:178
-#: templates/table/options_zoom.phtml:12 templates/table/rows_zoom.phtml:26
+#: templates/database/designer/options_panel.phtml:178
+#: templates/table/search/options_zoom.phtml:12
+#: templates/table/search/rows_zoom.phtml:26
 msgid "None"
 msgstr "nema"
 
@@ -1804,8 +1808,8 @@ msgstr ""
 
 #: js/messages.php:270 libraries/Menu.class.php:352
 #: libraries/Menu.class.php:455 libraries/Menu.class.php:582
-#: libraries/Util.class.php:4317 libraries/Util.class.php:4332
-#: libraries/Util.class.php:4349 libraries/config/messages.inc.php:258
+#: libraries/Util.class.php:4323 libraries/Util.class.php:4338
+#: libraries/Util.class.php:4355 libraries/config/messages.inc.php:258
 #: libraries/display_import.lib.php:105
 #: libraries/server_status_monitor.lib.php:318 prefs_manage.php:238
 #: setup/frames/menu.inc.php:26
@@ -1867,13 +1871,13 @@ msgid "Formatting SQL..."
 msgstr ""
 
 #: js/messages.php:293 libraries/server_variables.lib.php:157
-#: templates/designer/aggregate_query_panel.phtml:63
-#: templates/designer/delete_relation_panel.phtml:28
-#: templates/designer/having_query_panel.phtml:117
-#: templates/designer/new_relation_panel.phtml:88
-#: templates/designer/options_panel.phtml:253
-#: templates/designer/rename_to_panel.phtml:45
-#: templates/designer/where_query_panel.phtml:83
+#: templates/database/designer/aggregate_query_panel.phtml:63
+#: templates/database/designer/delete_relation_panel.phtml:28
+#: templates/database/designer/having_query_panel.phtml:117
+#: templates/database/designer/new_relation_panel.phtml:88
+#: templates/database/designer/options_panel.phtml:253
+#: templates/database/designer/rename_to_panel.phtml:45
+#: templates/database/designer/where_query_panel.phtml:83
 msgid "Cancel"
 msgstr "Otkaži"
 
@@ -1883,7 +1887,7 @@ msgstr "Otkaži"
 msgid "Page-related settings"
 msgstr "Izmeni podešavanja"
 
-#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:402
+#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:413
 msgid "Apply"
 msgstr ""
 
@@ -1918,8 +1922,8 @@ msgstr ""
 msgid "Error text: %s"
 msgstr ""
 
-#: js/messages.php:307 libraries/db_common.inc.php:68
-#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:450
+#: js/messages.php:307 libraries/db_common.inc.php:69
+#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:461
 msgid "No databases selected."
 msgstr "Nije izabrana ni jedna baza."
 
@@ -1931,12 +1935,13 @@ msgstr "Brisanje kolone"
 msgid "Adding Primary Key"
 msgstr "Dodavanje primarnog ključa"
 
-#: js/messages.php:310 templates/designer/aggregate_query_panel.phtml:59
-#: templates/designer/having_query_panel.phtml:113
-#: templates/designer/new_relation_panel.phtml:87
-#: templates/designer/options_panel.phtml:252
-#: templates/designer/rename_to_panel.phtml:41
-#: templates/designer/where_query_panel.phtml:82
+#: js/messages.php:310
+#: templates/database/designer/aggregate_query_panel.phtml:59
+#: templates/database/designer/having_query_panel.phtml:113
+#: templates/database/designer/new_relation_panel.phtml:87
+#: templates/database/designer/options_panel.phtml:252
+#: templates/database/designer/rename_to_panel.phtml:41
+#: templates/database/designer/where_query_panel.phtml:82
 msgid "OK"
 msgstr "U redu"
 
@@ -1956,7 +1961,7 @@ msgstr "Kopiranje baze"
 msgid "Changing Charset"
 msgstr "Izmena seta znakova"
 
-#: js/messages.php:320 libraries/Util.class.php:3217
+#: js/messages.php:320 libraries/Util.class.php:3223
 #, fuzzy
 #| msgid "Disable foreign key checks"
 msgid "Enable foreign key checks"
@@ -1994,20 +1999,21 @@ msgstr "Definicija uskladištene funkcije mora imati RETURN iskaz!"
 #: js/messages.php:334 libraries/DisplayResults.class.php:4834
 #: libraries/DisplayResults.class.php:5092 libraries/Menu.class.php:344
 #: libraries/Menu.class.php:446 libraries/Menu.class.php:578
-#: libraries/Util.class.php:3636 libraries/Util.class.php:3637
-#: libraries/Util.class.php:4316 libraries/Util.class.php:4331
-#: libraries/Util.class.php:4348 libraries/config/messages.inc.php:252
+#: libraries/Util.class.php:3642 libraries/Util.class.php:3643
+#: libraries/Util.class.php:4322 libraries/Util.class.php:4337
+#: libraries/Util.class.php:4354 libraries/config/messages.inc.php:252
 #: libraries/display_export.lib.php:173 libraries/rte/rte_list.lib.php:146
 #: libraries/server_privileges.lib.php:2211
 #: libraries/server_privileges.lib.php:2290
 #: libraries/server_privileges.lib.php:2632
 #: libraries/server_privileges.lib.php:3356
 #: libraries/server_status_monitor.lib.php:322 prefs_manage.php:303
-#: setup/frames/menu.inc.php:27 templates/structure/check_all_tables.phtml:11
+#: setup/frames/menu.inc.php:27
+#: templates/database/structure/check_all_tables.phtml:11
 msgid "Export"
 msgstr "Izvoz"
 
-#: js/messages.php:337 libraries/rte/rte_routines.lib.php:652
+#: js/messages.php:337 libraries/rte/rte_routines.lib.php:743
 msgid "ENUM/SET editor"
 msgstr "ENUM/SET uređivač"
 
@@ -2050,7 +2056,7 @@ msgstr "Prikažiokvir sa upitima"
 #: libraries/Console.class.php:214 libraries/DisplayResults.class.php:3474
 #: libraries/DisplayResults.class.php:4818 libraries/Index.class.php:723
 #: libraries/Util.class.php:706 libraries/Util.class.php:1202
-#: libraries/Util.class.php:3634 libraries/Util.class.php:3635
+#: libraries/Util.class.php:3640 libraries/Util.class.php:3641
 #: libraries/central_columns.lib.php:851
 #: libraries/central_columns.lib.php:1193
 #: libraries/config/messages.inc.php:892
@@ -2068,7 +2074,7 @@ msgstr "Promeni"
 #: libraries/server_user_groups.lib.php:129
 #: libraries/sql_query_form.lib.php:416 libraries/tracking.lib.php:477
 #: setup/frames/index.inc.php:183 setup/frames/index.inc.php:291
-#: templates/designer/delete_relation_panel.phtml:27
+#: templates/database/designer/delete_relation_panel.phtml:27
 msgid "Delete"
 msgstr "Obriši"
 
@@ -2250,11 +2256,11 @@ msgid "No dependencies selected!"
 msgstr "Nije izabrana ni jedna baza."
 
 #: js/messages.php:394 libraries/central_columns.lib.php:1214
-#: libraries/insert_edit.lib.php:1458 libraries/server_variables.lib.php:155
+#: libraries/insert_edit.lib.php:1456 libraries/server_variables.lib.php:155
 #: setup/frames/config.inc.php:42 setup/frames/index.inc.php:279
 #: templates/columns_definitions/column_definitions_form.phtml:165
-#: templates/gis_visualization/gis_visualization.phtml:48
-#: templates/tbl_relation/common_form.phtml:107
+#: templates/table/gis_visualization/gis_visualization.phtml:48
+#: templates/table/relation/common_form.phtml:107
 msgid "Save"
 msgstr "Sačuvaj"
 
@@ -2348,8 +2354,8 @@ msgid "Data point content"
 msgstr "Sadržaj tačke podataka"
 
 #: js/messages.php:430 js/messages.php:562 js/messages.php:579
-#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2573
-#: templates/index_form.phtml:154 templates/index_form.phtml:194
+#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2571
+#: templates/table/index_form.phtml:154 templates/table/index_form.phtml:194
 msgid "Ignore"
 msgstr "Ignoriši"
 
@@ -2410,8 +2416,8 @@ msgstr "Izaberi strani ključ"
 msgid "Please select the primary key or a unique key!"
 msgstr "Molimo izaberite primarni ili jedinstveni ključ"
 
-#: js/messages.php:457 templates/designer/side_menu.phtml:91
-#: templates/designer/side_menu.phtml:94
+#: js/messages.php:457 templates/database/designer/side_menu.phtml:91
+#: templates/database/designer/side_menu.phtml:94
 msgid "Choose column to display"
 msgstr "Izaberi kolonu za prikaz"
 
@@ -2427,22 +2433,22 @@ msgstr ""
 msgid "Page name"
 msgstr "Ime strane"
 
-#: js/messages.php:463 templates/designer/side_menu.phtml:56
-#: templates/designer/side_menu.phtml:59
+#: js/messages.php:463 templates/database/designer/side_menu.phtml:56
+#: templates/database/designer/side_menu.phtml:59
 #, fuzzy
 #| msgid "Select page"
 msgid "Save page"
 msgstr "Izaberi stranu"
 
-#: js/messages.php:464 templates/designer/side_menu.phtml:63
-#: templates/designer/side_menu.phtml:66
+#: js/messages.php:464 templates/database/designer/side_menu.phtml:63
+#: templates/database/designer/side_menu.phtml:66
 #, fuzzy
 #| msgid "Select page"
 msgid "Save page as"
 msgstr "Izaberi stranu"
 
-#: js/messages.php:465 templates/designer/side_menu.phtml:49
-#: templates/designer/side_menu.phtml:52
+#: js/messages.php:465 templates/database/designer/side_menu.phtml:49
+#: templates/database/designer/side_menu.phtml:52
 #, fuzzy
 #| msgid "Free pages"
 msgid "Open page"
@@ -2454,7 +2460,7 @@ msgstr "Slobodne strane"
 msgid "Delete page"
 msgstr "Izaberi stranu"
 
-#: js/messages.php:467 templates/designer/side_menu.phtml:10
+#: js/messages.php:467 templates/database/designer/side_menu.phtml:10
 #, fuzzy
 #| msgid "Unit"
 msgid "Untitled"
@@ -2593,7 +2599,7 @@ msgstr "Originalna pozicija"
 msgid "cancel"
 msgstr "Otkaži"
 
-#: js/messages.php:499 libraries/server_status.lib.php:271
+#: js/messages.php:499 libraries/server_status.lib.php:280
 msgid "Aborted"
 msgstr "Prekinuto"
 
@@ -3232,7 +3238,7 @@ msgstr "Nije ispravan broj porta"
 
 #: js/messages.php:793 libraries/Message.class.php:199
 #: libraries/Util.class.php:654 libraries/core.lib.php:245
-#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1172
+#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1170
 #: tbl_operations.php:229 view_operations.php:63
 msgid "Error"
 msgstr "Greška"
@@ -3292,8 +3298,8 @@ msgstr "u sekundi"
 msgid "per minute"
 msgstr "u minutu"
 
-#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:143
-#: libraries/server_status.lib.php:228
+#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:152
+#: libraries/server_status.lib.php:237
 #: libraries/server_status_queries.lib.php:98
 msgid "per hour"
 msgstr "po satu"
@@ -3313,7 +3319,7 @@ msgstr ""
 "Pogrešno podešena prava pristupa na konfiguracionoj datoteci, ne bi trebala "
 "da bude svima dostupna za pisanje!"
 
-#: libraries/Config.class.php:1799
+#: libraries/Config.class.php:1801
 msgid "Font size"
 msgstr "Veličina fonta"
 
@@ -3343,10 +3349,10 @@ msgstr "podupit"
 #: libraries/server_privileges.lib.php:2890
 #: libraries/server_privileges.lib.php:3144
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4332
+#: libraries/server_privileges.lib.php:4358
 #: libraries/server_status_processes.lib.php:80
-#: templates/tbl_relation/foreign_key_row.phtml:165
-#: templates/tbl_relation/internal_relational_row.phtml:55
+#: templates/table/relation/foreign_key_row.phtml:165
+#: templates/table/relation/internal_relational_row.phtml:55
 msgid "Database"
 msgstr "Baza podataka"
 
@@ -3456,11 +3462,11 @@ msgstr "SQL istorijat"
 #: libraries/plugins/import/ImportMediawiki.class.php:60
 #: libraries/plugins/import/ImportOds.class.php:59
 #: libraries/plugins/import/ImportShp.class.php:57
-#: libraries/plugins/import/ImportSql.class.php:148
+#: libraries/plugins/import/ImportSql.class.php:51
 #: libraries/plugins/import/ImportXml.class.php:58
-#: libraries/rte/rte_routines.lib.php:833 templates/index_form.phtml:49
-#: templates/structure/row_stats_table.phtml:20
-#: templates/table/options.phtml:2
+#: libraries/rte/rte_routines.lib.php:924 templates/table/index_form.phtml:49
+#: templates/table/search/options.phtml:2
+#: templates/table/structure/row_stats_table.phtml:20
 msgid "Options"
 msgstr "Opcije"
 
@@ -3505,7 +3511,8 @@ msgstr "Opadajući"
 msgid "Order:"
 msgstr "Ostalo"
 
-#: libraries/Console.class.php:289 templates/table/replace_preview.phtml:17
+#: libraries/Console.class.php:289
+#: templates/table/search/replace_preview.phtml:17
 #, fuzzy
 #| msgid "Column"
 msgid "Count"
@@ -3630,9 +3637,9 @@ msgstr "Pređi na kopiranu tabelu"
 #: libraries/operations.lib.php:794 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:191
-#: templates/structure/sortable_header.phtml:21
-#: templates/structure/sortable_header.phtml:38
-#: templates/table/options.phtml:68
+#: templates/database/structure/sortable_header.phtml:21
+#: templates/database/structure/sortable_header.phtml:38
+#: templates/table/search/options.phtml:68
 msgid "Ascending"
 msgstr "Rastući"
 
@@ -3642,13 +3649,14 @@ msgstr "Rastući"
 #: libraries/operations.lib.php:797 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:188
-#: templates/structure/sortable_header.phtml:26
-#: templates/structure/sortable_header.phtml:43
-#: templates/table/options.phtml:69
+#: templates/database/structure/sortable_header.phtml:26
+#: templates/database/structure/sortable_header.phtml:43
+#: templates/table/search/options.phtml:69
 msgid "Descending"
 msgstr "Opadajući"
 
-#: libraries/DBQbe.class.php:467 templates/table/search_and_replace.phtml:6
+#: libraries/DBQbe.class.php:467
+#: templates/table/search/search_and_replace.phtml:6
 #, fuzzy
 #| msgid "Column"
 msgid "Column:"
@@ -3834,12 +3842,12 @@ msgstr[1] "%s pogodaka unutar tabele <i>%s</i>"
 msgstr[2] "%s pogodaka unutar tabele <i>%s</i>"
 
 #: libraries/DbSearch.class.php:354 libraries/Menu.class.php:311
-#: libraries/Util.class.php:3337 libraries/Util.class.php:3347
-#: libraries/Util.class.php:3623 libraries/Util.class.php:3624
-#: libraries/Util.class.php:4343 libraries/config.values.php:43
+#: libraries/Util.class.php:3343 libraries/Util.class.php:3353
+#: libraries/Util.class.php:3629 libraries/Util.class.php:3630
+#: libraries/Util.class.php:4349 libraries/config.values.php:43
 #: libraries/config.values.php:51 libraries/config.values.php:119
 #: libraries/navigation/Nodes/Node_Table.class.php:295
-#: templates/structure/check_all_table_column.phtml:5
+#: templates/table/structure/check_all_table_column.phtml:5
 msgid "Browse"
 msgstr "Pregled"
 
@@ -3856,7 +3864,8 @@ msgstr "Pretraživanje baze"
 msgid "Words or values to search for (wildcard: \"%\"):"
 msgstr "Reči ili vrednosti koje se traže (džoker: \"%\"):"
 
-#: libraries/DbSearch.class.php:401 templates/table/search_and_replace.phtml:1
+#: libraries/DbSearch.class.php:401
+#: templates/table/search/search_and_replace.phtml:1
 msgid "Find:"
 msgstr "Traži:"
 
@@ -3904,28 +3913,28 @@ msgstr "Filteri"
 msgid "Search this table"
 msgstr "Pretraživanje baze"
 
-#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2532
-#: libraries/Util.class.php:2535
+#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2538
+#: libraries/Util.class.php:2541
 msgctxt "First page"
 msgid "Begin"
 msgstr "Početak"
 
-#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2533
-#: libraries/Util.class.php:2536 libraries/server_bin_log.lib.php:170
+#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2539
+#: libraries/Util.class.php:2542 libraries/server_bin_log.lib.php:170
 #: libraries/server_bin_log.lib.php:172
 msgctxt "Previous page"
 msgid "Previous"
 msgstr "Prethodna"
 
-#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2564
-#: libraries/Util.class.php:2574 libraries/server_bin_log.lib.php:204
+#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2570
+#: libraries/Util.class.php:2580 libraries/server_bin_log.lib.php:204
 #: libraries/server_bin_log.lib.php:206
 msgctxt "Next page"
 msgid "Next"
 msgstr "Sledeća"
 
-#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2565
-#: libraries/Util.class.php:2575
+#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2571
+#: libraries/Util.class.php:2581
 msgctxt "Last page"
 msgid "End"
 msgstr "Kraj"
@@ -4004,9 +4013,9 @@ msgid "May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]."
 msgstr "Može biti približno. Vidite [doc@faq3-11]FAQ 3.11[/doc]"
 
 #: libraries/DisplayResults.class.php:4332 libraries/Message.class.php:180
-#: libraries/controllers/TableRelationController.class.php:258
+#: libraries/controllers/TableRelationController.class.php:259
 #: libraries/controllers/TableSearchController.class.php:655
-#: libraries/rte/rte_routines.lib.php:1332 libraries/sql_query_form.lib.php:89
+#: libraries/rte/rte_routines.lib.php:1423 libraries/sql_query_form.lib.php:89
 #: tbl_operations.php:227 tbl_row_action.php:138 view_operations.php:62
 #, fuzzy
 #| msgid "Your SQL query has been executed successfully."
@@ -4014,7 +4023,7 @@ msgid "Your SQL query has been executed successfully."
 msgstr "Vaš SQL upit je uspešno izvršen"
 
 #: libraries/DisplayResults.class.php:4660
-#: libraries/controllers/StructureController.class.php:629
+#: libraries/controllers/DatabaseStructureController.class.php:564
 #, php-format
 msgid ""
 "This view has at least this number of rows. Please refer to %sdocumentation"
@@ -4040,34 +4049,34 @@ msgstr ""
 msgid "%d total"
 msgstr "ukupno"
 
-#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1318
+#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1312
 #, fuzzy, php-format
 #| msgid "Query took %01.4f sec"
 msgid "Query took %01.4f seconds."
 msgstr "Upit je trajao %01.4f sekundi"
 
 #: libraries/DisplayResults.class.php:4807
-#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4767
-#: libraries/Util.class.php:4773 libraries/mult_submits.inc.php:50
-#: templates/structure/check_all_tables.phtml:2
-#: templates/structure/check_all_tables.phtml:9
+#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4773
+#: libraries/Util.class.php:4779 libraries/mult_submits.inc.php:50
+#: templates/database/structure/check_all_tables.phtml:2
+#: templates/database/structure/check_all_tables.phtml:9
 msgid "With selected:"
 msgstr "Označeno:"
 
 #: libraries/DisplayResults.class.php:4811
-#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4769
-#: libraries/Util.class.php:4770 libraries/server_privileges.lib.php:1174
+#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4775
+#: libraries/Util.class.php:4776 libraries/server_privileges.lib.php:1174
 #: libraries/server_privileges.lib.php:1175
 #: libraries/server_privileges.lib.php:1387
 #: libraries/server_user_groups.lib.php:231
-#: templates/structure/check_all_tables.phtml:3
-#: templates/structure/check_all_tables.phtml:4
+#: templates/database/structure/check_all_tables.phtml:3
+#: templates/database/structure/check_all_tables.phtml:4
 msgid "Check All"
 msgstr "Označi sve"
 
 #: libraries/DisplayResults.class.php:4985 libraries/Header.class.php:383
-#: templates/structure/optional_action_links.phtml:1
-#: templates/structure/print_view_data_dictionary_link.phtml:3
+#: templates/database/structure/print_view_data_dictionary_link.phtml:3
+#: templates/table/structure/optional_action_links.phtml:1
 msgid "Print view"
 msgstr "Za štampu"
 
@@ -4075,7 +4084,8 @@ msgstr "Za štampu"
 msgid "Query results operations"
 msgstr "Operacije na rezultatima upita"
 
-#: libraries/DisplayResults.class.php:5105 templates/tbl_chart.phtml:12
+#: libraries/DisplayResults.class.php:5105
+#: templates/table/chart/tbl_chart.phtml:12
 msgid "Display chart"
 msgstr "Prikaži grafikon"
 
@@ -4182,7 +4192,7 @@ msgid "Click on the bar to scroll to top of page"
 msgstr ""
 
 #: libraries/Header.class.php:749
-#: libraries/plugins/auth/AuthenticationCookie.class.php:152
+#: libraries/plugins/auth/AuthenticationCookie.class.php:140
 #, fuzzy
 #| msgid "Cookies must be enabled past this point."
 msgid "Javascript must be enabled past this point!"
@@ -4206,11 +4216,11 @@ msgid "Keyname"
 msgstr "Ime ključa"
 
 #: libraries/Index.class.php:697
-#: libraries/controllers/StructureController.class.php:1962
-#: libraries/controllers/StructureController.class.php:1967
+#: libraries/controllers/TableStructureController.class.php:953
+#: libraries/controllers/TableStructureController.class.php:958
 #: libraries/tracking.lib.php:973
 #: templates/columns_definitions/column_indexes.phtml:11
-#: templates/structure/check_all_table_column.phtml:26
+#: templates/table/structure/check_all_table_column.phtml:26
 msgid "Unique"
 msgstr "Jedinstveni"
 
@@ -4229,16 +4239,17 @@ msgstr "Kardinalnost"
 #: libraries/server_collations.lib.php:35 libraries/tracking.lib.php:881
 #: libraries/tracking.lib.php:977
 #: templates/columns_definitions/table_fields_definitions.phtml:33
-#: templates/structure/row_stats_table.phtml:31
-#: templates/structure/table_header.phtml:55
-#: templates/structure/table_structure_header.phtml:7
-#: templates/table/table_header.phtml:8
+#: templates/database/structure/table_header.phtml:55
+#: templates/table/search/table_header.phtml:8
+#: templates/table/structure/row_stats_table.phtml:31
+#: templates/table/structure/table_structure_header.phtml:7
 msgid "Collation"
 msgstr "Sortiranje"
 
 #: libraries/Index.class.php:703 libraries/rte/rte_events.lib.php:496
-#: libraries/rte/rte_routines.lib.php:956 libraries/tracking.lib.php:885
-#: libraries/tracking.lib.php:979 templates/structure/table_header.phtml:84
+#: libraries/rte/rte_routines.lib.php:1047 libraries/tracking.lib.php:885
+#: libraries/tracking.lib.php:979
+#: templates/database/structure/table_header.phtml:84
 msgid "Comment"
 msgstr "Komentar"
 
@@ -4251,15 +4262,15 @@ msgstr "Primarni ključ je obrisan."
 msgid "Index %s has been dropped."
 msgstr "Indeks %s je obrisan."
 
-#: libraries/Index.class.php:757 libraries/Util.class.php:3630
-#: libraries/Util.class.php:3631
-#: libraries/controllers/StructureController.class.php:1958
-#: libraries/controllers/StructureController.class.php:1959
+#: libraries/Index.class.php:757 libraries/Util.class.php:3636
+#: libraries/Util.class.php:3637
+#: libraries/controllers/TableStructureController.class.php:949
+#: libraries/controllers/TableStructureController.class.php:950
 #: libraries/operations.lib.php:1607 libraries/rte/rte_list.lib.php:150
 #: libraries/server_databases.lib.php:146
-#: templates/structure/check_all_table_column.phtml:15
-#: templates/structure/check_all_tables.phtml:16
-#: templates/tbl_relation/foreign_key_row.phtml:93
+#: templates/database/structure/check_all_tables.phtml:16
+#: templates/table/relation/foreign_key_row.phtml:93
+#: templates/table/structure/check_all_table_column.phtml:15
 msgid "Drop"
 msgstr "Odbaci"
 
@@ -4290,16 +4301,16 @@ msgstr "Server"
 #: libraries/Menu.class.php:248
 #: libraries/navigation/Nodes/Node_View.class.php:32
 #: libraries/tbl_info.inc.php:63
-#: templates/structure/structure_table_row.phtml:97
-#: templates/structure/structure_table_row.phtml:159
+#: templates/database/structure/structure_table_row.phtml:97
+#: templates/database/structure/structure_table_row.phtml:159
 msgid "View"
 msgstr "Pogled"
 
 #: libraries/Menu.class.php:325 libraries/Menu.class.php:429
-#: libraries/Menu.class.php:548 libraries/Util.class.php:3334
-#: libraries/Util.class.php:3344 libraries/Util.class.php:3350
-#: libraries/Util.class.php:4313 libraries/Util.class.php:4328
-#: libraries/Util.class.php:4345 libraries/config.values.php:40
+#: libraries/Menu.class.php:548 libraries/Util.class.php:3340
+#: libraries/Util.class.php:3350 libraries/Util.class.php:3356
+#: libraries/Util.class.php:4319 libraries/Util.class.php:4334
+#: libraries/Util.class.php:4351 libraries/config.values.php:40
 #: libraries/config.values.php:48 libraries/config.values.php:110
 #: libraries/config.values.php:116 libraries/config/messages.inc.php:321
 #: libraries/navigation/Nodes/Node_Table.class.php:292
@@ -4307,19 +4318,19 @@ msgid "SQL"
 msgstr "SQL"
 
 #: libraries/Menu.class.php:328 libraries/Menu.class.php:432
-#: libraries/Util.class.php:3335 libraries/Util.class.php:3345
-#: libraries/Util.class.php:3351 libraries/Util.class.php:3625
-#: libraries/Util.class.php:3626 libraries/Util.class.php:4329
-#: libraries/Util.class.php:4346 libraries/config.values.php:41
+#: libraries/Util.class.php:3341 libraries/Util.class.php:3351
+#: libraries/Util.class.php:3357 libraries/Util.class.php:3631
+#: libraries/Util.class.php:3632 libraries/Util.class.php:4335
+#: libraries/Util.class.php:4352 libraries/config.values.php:41
 #: libraries/config.values.php:49 libraries/config.values.php:111
 #: libraries/config.values.php:117
 #: libraries/navigation/Nodes/Node_Table.class.php:286
 msgid "Search"
 msgstr "Pretraživanje"
 
-#: libraries/Menu.class.php:338 libraries/Util.class.php:3336
-#: libraries/Util.class.php:3346 libraries/Util.class.php:3627
-#: libraries/Util.class.php:3628 libraries/Util.class.php:4347
+#: libraries/Menu.class.php:338 libraries/Util.class.php:3342
+#: libraries/Util.class.php:3352 libraries/Util.class.php:3633
+#: libraries/Util.class.php:3634 libraries/Util.class.php:4353
 #: libraries/config.values.php:42 libraries/config.values.php:50
 #: libraries/config.values.php:118
 #: libraries/navigation/Nodes/Node_Table.class.php:289
@@ -4328,30 +4339,30 @@ msgid "Insert"
 msgstr "Novi zapis"
 
 #: libraries/Menu.class.php:362 libraries/Menu.class.php:467
-#: libraries/Util.class.php:4334 libraries/Util.class.php:4350
+#: libraries/Util.class.php:4340 libraries/Util.class.php:4356
 #: libraries/config.values.php:106 libraries/server_common.lib.php:51
 #: libraries/server_privileges.lib.php:2370
 #: libraries/server_privileges.lib.php:3158
-#: libraries/server_privileges.lib.php:4221
+#: libraries/server_privileges.lib.php:4247
 msgid "Privileges"
 msgstr "Privilegije"
 
 #: libraries/Menu.class.php:371 libraries/Menu.class.php:379
-#: libraries/Menu.class.php:459 libraries/Util.class.php:3338
-#: libraries/Util.class.php:3352 libraries/Util.class.php:4333
-#: libraries/Util.class.php:4351 libraries/config.values.php:112
+#: libraries/Menu.class.php:459 libraries/Util.class.php:3344
+#: libraries/Util.class.php:3358 libraries/Util.class.php:4339
+#: libraries/Util.class.php:4357 libraries/config.values.php:112
 #: view_operations.php:92
 msgid "Operations"
 msgstr "Operacije"
 
 #: libraries/Menu.class.php:384 libraries/Menu.class.php:492
-#: libraries/Util.class.php:4338 libraries/Util.class.php:4352
+#: libraries/Util.class.php:4344 libraries/Util.class.php:4358
 #: libraries/relation.lib.php:255
 msgid "Tracking"
 msgstr ""
 
 #: libraries/Menu.class.php:397 libraries/Menu.class.php:486
-#: libraries/Util.class.php:4337 libraries/Util.class.php:4353
+#: libraries/Util.class.php:4343 libraries/Util.class.php:4359
 #: libraries/navigation/Nodes/Node_Trigger_Container.class.php:24
 #: libraries/plugins/export/ExportHtmlword.class.php:557
 #: libraries/plugins/export/ExportOdt.class.php:685
@@ -4368,16 +4379,16 @@ msgstr "Okidači"
 msgid "Database seems to be empty!"
 msgstr "Baza je izgleda prazna!"
 
-#: libraries/Menu.class.php:439 libraries/Util.class.php:4330
+#: libraries/Menu.class.php:439 libraries/Util.class.php:4336
 msgid "Query"
 msgstr "Upit po primeru"
 
-#: libraries/Menu.class.php:472 libraries/Util.class.php:4335
+#: libraries/Menu.class.php:472 libraries/Util.class.php:4341
 #: libraries/rte/rte_words.lib.php:36
 msgid "Routines"
 msgstr "Rutine"
 
-#: libraries/Menu.class.php:479 libraries/Util.class.php:4336
+#: libraries/Menu.class.php:479 libraries/Util.class.php:4342
 #: libraries/navigation/Nodes/Node_Event_Container.class.php:26
 #: libraries/plugins/export/ExportSql.class.php:940
 #: libraries/plugins/export/ExportXml.class.php:107
@@ -4385,22 +4396,22 @@ msgstr "Rutine"
 msgid "Events"
 msgstr "Događaji"
 
-#: libraries/Menu.class.php:498 libraries/Util.class.php:4339
+#: libraries/Menu.class.php:498 libraries/Util.class.php:4345
 msgid "Designer"
 msgstr "Dizajner"
 
-#: libraries/Menu.class.php:507 libraries/Util.class.php:4340
-#: templates/structure/check_all_tables.phtml:35
+#: libraries/Menu.class.php:507 libraries/Util.class.php:4346
+#: templates/database/structure/check_all_tables.phtml:35
 #, fuzzy
 #| msgid "Textarea columns"
 msgid "Central columns"
 msgstr "Kolone tekstulanih polja"
 
-#: libraries/Menu.class.php:544 libraries/Util.class.php:4312
+#: libraries/Menu.class.php:544 libraries/Util.class.php:4318
 #: libraries/config.values.php:103 libraries/config/messages.inc.php:266
 #: libraries/config/messages.inc.php:341
 #: libraries/navigation/NavigationTree.class.php:1239
-#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4332
+#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4358
 msgid "Databases"
 msgstr "Baze"
 
@@ -4411,34 +4422,34 @@ msgid "User accounts"
 msgstr "Korisnici"
 
 #: libraries/Menu.class.php:595 libraries/ServerStatusData.class.php:121
-#: libraries/Util.class.php:4319 libraries/server_common.lib.php:36
+#: libraries/Util.class.php:4325 libraries/server_common.lib.php:36
 msgid "Binary log"
 msgstr "Binarni dnevnik"
 
 #: libraries/Menu.class.php:601 libraries/ServerStatusData.class.php:126
-#: libraries/Util.class.php:4320 libraries/server_common.lib.php:42
-#: templates/structure/body_for_table_summary.phtml:10
-#: templates/structure/table_header.phtml:27
+#: libraries/Util.class.php:4326 libraries/server_common.lib.php:42
+#: templates/database/structure/body_for_table_summary.phtml:10
+#: templates/database/structure/table_header.phtml:27
 msgid "Replication"
 msgstr "Replikacija"
 
 #: libraries/Menu.class.php:606 libraries/ServerStatusData.class.php:193
-#: libraries/Util.class.php:4321 libraries/config.values.php:105
+#: libraries/Util.class.php:4327 libraries/config.values.php:105
 #: libraries/server_engines.lib.php:108 libraries/server_engines.lib.php:112
 #: libraries/sql_query_form.lib.php:421
 msgid "Variables"
 msgstr "Promenljive"
 
-#: libraries/Menu.class.php:610 libraries/Util.class.php:4322
+#: libraries/Menu.class.php:610 libraries/Util.class.php:4328
 msgid "Charsets"
 msgstr "Kodne strane"
 
-#: libraries/Menu.class.php:615 libraries/Util.class.php:4323
+#: libraries/Menu.class.php:615 libraries/Util.class.php:4329
 #: libraries/server_common.lib.php:33 libraries/server_plugins.lib.php:27
 msgid "Plugins"
 msgstr ""
 
-#: libraries/Menu.class.php:626 libraries/Util.class.php:4324
+#: libraries/Menu.class.php:626 libraries/Util.class.php:4330
 msgid "Engines"
 msgstr "Skladištenja"
 
@@ -4466,7 +4477,7 @@ msgstr[0] "%1$d red umetnut."
 msgstr[1] "%1$d redova umetnuto."
 msgstr[2] "%1$d redova umetnuto."
 
-#: libraries/PDF.class.php:70 libraries/Util.class.php:2521
+#: libraries/PDF.class.php:70 libraries/Util.class.php:2527
 #: libraries/browse_foreigners.lib.php:327
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:865
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:890
@@ -4491,7 +4502,7 @@ msgid "Could not save favorite table!"
 msgstr "Nije moguće sačuvati poslednju tabelu"
 
 #: libraries/RecentFavoriteTable.class.php:212
-#: templates/structure/favorite_anchor.phtml:12
+#: templates/database/structure/favorite_anchor.phtml:12
 #, fuzzy
 #| msgid "Remove chart"
 msgid "Remove from Favorites"
@@ -4676,7 +4687,7 @@ msgid ""
 msgstr "Nema detaljnijih informacija o statusu za ovaj pogon skladištenja."
 
 #: libraries/StorageEngine.class.php:373
-#: templates/structure/body_for_table_summary.phtml:50
+#: templates/database/structure/body_for_table_summary.phtml:50
 #, php-format
 msgid "%s is the default storage engine on this MySQL server."
 msgstr "%s je podrazumevani pogon skladištenja na ovom MySQL serveru."
@@ -5117,10 +5128,10 @@ msgstr ""
 
 #: libraries/Util.class.php:726 libraries/rte/rte_events.lib.php:110
 #: libraries/rte/rte_events.lib.php:119 libraries/rte/rte_events.lib.php:150
-#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:153
-#: libraries/rte/rte_routines.lib.php:162
-#: libraries/rte/rte_routines.lib.php:235
-#: libraries/rte/rte_routines.lib.php:1366
+#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:223
+#: libraries/rte/rte_routines.lib.php:250
+#: libraries/rte/rte_routines.lib.php:372
+#: libraries/rte/rte_routines.lib.php:1457
 #: libraries/rte/rte_triggers.lib.php:86 libraries/rte/rte_triggers.lib.php:95
 #: libraries/rte/rte_triggers.lib.php:127
 msgid "MySQL said: "
@@ -5166,78 +5177,81 @@ msgstr "Ned"
 msgid "%B %d, %Y at %I:%M %p"
 msgstr "%d. %B %Y. u %H:%M"
 
-#: libraries/Util.class.php:2019
+#: libraries/Util.class.php:2025
 #, php-format
 msgid "%s days, %s hours, %s minutes and %s seconds"
 msgstr "%s dana, %s sati, %s minuta i %s sekundi"
 
-#: libraries/Util.class.php:2112
+#: libraries/Util.class.php:2118
 msgid "Missing parameter:"
 msgstr "Nedostaje parametar:"
 
-#: libraries/Util.class.php:2645
+#: libraries/Util.class.php:2651
 #, php-format
 msgid "Jump to database \"%s\"."
 msgstr "Pređi na bazu \"%s\"."
 
-#: libraries/Util.class.php:2670
+#: libraries/Util.class.php:2676
 #, php-format
 msgid "The %s functionality is affected by a known bug, see %s"
 msgstr "Ova funkcionalnost %s je pogođena poznatom greškom, vidite %s"
 
-#: libraries/Util.class.php:2881
+#: libraries/Util.class.php:2887
 msgid "Click to toggle"
 msgstr "Kliknite da biste zamenili"
 
-#: libraries/Util.class.php:3542 prefs_manage.php:248
+#: libraries/Util.class.php:3548 prefs_manage.php:248
 msgid "Browse your computer:"
 msgstr "Pretražite vaš kompjuter:"
 
-#: libraries/Util.class.php:3567
+#: libraries/Util.class.php:3573
 #, php-format
 msgid "Select from the web server upload directory <b>%s</b>:"
 msgstr ""
 "Izaberi iz direkorijuma otpremljenih datoteka <b>%s</b> na web serveru:"
 
-#: libraries/Util.class.php:3596 libraries/insert_edit.lib.php:1173
+#: libraries/Util.class.php:3602 libraries/insert_edit.lib.php:1171
 msgid "The directory you set for upload work cannot be reached."
 msgstr "Direktorijum koji ste izabrali za slanje nije dostupan."
 
-#: libraries/Util.class.php:3607
+#: libraries/Util.class.php:3613
 #, fuzzy
 #| msgid "There are no files to upload"
 msgid "There are no files to upload!"
 msgstr "Nema datoteka za otpremanje"
 
-#: libraries/Util.class.php:3632 libraries/Util.class.php:3633
-#: templates/structure/check_all_tables.phtml:15
+#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: templates/database/structure/check_all_tables.phtml:15
 msgid "Empty"
 msgstr "Isprazni"
 
-#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: libraries/Util.class.php:3644 libraries/Util.class.php:3645
 msgid "Execute"
 msgstr "Izvrši"
 
-#: libraries/Util.class.php:4152
+#: libraries/Util.class.php:4158
 msgid "Print"
 msgstr "Štampaj"
 
-#: libraries/Util.class.php:4257 templates/structure/row_stats_table.phtml:80
-#: templates/structure/table_header.phtml:95
+#: libraries/Util.class.php:4263
+#: templates/database/structure/table_header.phtml:95
+#: templates/table/structure/row_stats_table.phtml:80
 msgid "Creation"
 msgstr "Napravljeno"
 
-#: libraries/Util.class.php:4263 templates/structure/row_stats_table.phtml:87
-#: templates/structure/table_header.phtml:106
+#: libraries/Util.class.php:4269
+#: templates/database/structure/table_header.phtml:106
+#: templates/table/structure/row_stats_table.phtml:87
 msgid "Last update"
 msgstr "Poslednja izmena"
 
-#: libraries/Util.class.php:4269 templates/structure/row_stats_table.phtml:94
-#: templates/structure/table_header.phtml:117
+#: libraries/Util.class.php:4275
+#: templates/database/structure/table_header.phtml:117
+#: templates/table/structure/row_stats_table.phtml:94
 msgid "Last check"
 msgstr "Poslednja provera"
 
-#: libraries/Util.class.php:4315
+#: libraries/Util.class.php:4321
 msgid "Users"
 msgstr "Korisnici"
 
@@ -5260,16 +5274,16 @@ msgid "Use this value"
 msgstr "Koristi ovu vrednost"
 
 #: libraries/build_html_for_db.lib.php:33 libraries/import.lib.php:193
-#: templates/structure/actions_in_table_structure.phtml:113
-#: templates/structure/row_stats_table.phtml:42
-#: templates/structure/table_header.phtml:36
+#: templates/database/structure/table_header.phtml:36
+#: templates/table/structure/actions_in_table_structure.phtml:113
+#: templates/table/structure/row_stats_table.phtml:42
 msgid "Rows"
 msgstr "Redova"
 
 #: libraries/build_html_for_db.lib.php:48 libraries/engines/innodb.lib.php:171
-#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:186
-#: libraries/server_status.lib.php:298
-#: templates/structure/display_table_stats.phtml:40
+#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:195
+#: libraries/server_status.lib.php:307
+#: templates/table/structure/display_table_stats.phtml:40
 msgid "Total"
 msgstr "Ukupno"
 
@@ -5278,10 +5292,12 @@ msgid "Jump to database"
 msgstr "Idi na bazu"
 
 #: libraries/build_html_for_db.lib.php:146
+#: templates/database/structure/structure_table_row.phtml:15
 msgid "Not replicated"
 msgstr "Nije replikovano"
 
 #: libraries/build_html_for_db.lib.php:158
+#: templates/database/structure/structure_table_row.phtml:16
 msgid "Replicated"
 msgstr "Replikovano"
 
@@ -5338,17 +5354,17 @@ msgstr ""
 #: libraries/plugins/export/ExportTexytext.class.php:425
 #: libraries/plugins/export/PMA_ExportPdf.class.php:307
 #: libraries/rte/rte_list.lib.php:73 libraries/rte/rte_list.lib.php:85
-#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:830
-#: libraries/rte/rte_routines.lib.php:1492 setup/frames/index.inc.php:162
+#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:921
+#: libraries/rte/rte_routines.lib.php:1583 setup/frames/index.inc.php:162
 #: templates/columns_definitions/table_fields_definitions.phtml:8
-#: templates/structure/table_structure_header.phtml:5
-#: templates/table/create_table.phtml:11
+#: templates/database/create_table.phtml:11
+#: templates/table/structure/table_structure_header.phtml:5
 msgid "Name"
 msgstr "Ime"
 
 #: libraries/central_columns.lib.php:699
 #: libraries/central_columns.lib.php:1381
-#: libraries/rte/rte_routines.lib.php:832
+#: libraries/rte/rte_routines.lib.php:923
 #: templates/columns_definitions/table_fields_definitions.phtml:14
 msgid "Length/Values"
 msgstr "Dužina/Vrednost*"
@@ -5371,7 +5387,7 @@ msgid "Select a table"
 msgstr "Izaberi tabele"
 
 #: libraries/central_columns.lib.php:804
-#: templates/structure/add_column.phtml:4
+#: templates/table/structure/add_column.phtml:4
 msgid "Add column"
 msgstr "Dodaj kolonu"
 
@@ -5391,7 +5407,7 @@ msgstr "Dodaj kolonu"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1002
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1025
 #: templates/columns_definitions/table_fields_definitions.phtml:36
-#: templates/structure/table_structure_header.phtml:8
+#: templates/table/structure/table_structure_header.phtml:8
 msgid "Attributes"
 msgstr "Atributi"
 
@@ -5515,7 +5531,7 @@ msgid "Double click"
 msgstr ""
 
 #: libraries/config.values.php:95 libraries/config.values.php:124
-#: libraries/config/FormDisplay.tpl.php:221 libraries/relation.lib.php:97
+#: libraries/config/FormDisplay.tpl.php:232 libraries/relation.lib.php:97
 #: libraries/relation.lib.php:105
 msgid "Disabled"
 msgstr "Onemogućeno"
@@ -5706,22 +5722,22 @@ msgstr "izvoz neće raditi, nedostaje funkcija (%s)"
 msgid "maximum %s"
 msgstr "maksimalno %s"
 
-#: libraries/config/FormDisplay.tpl.php:219
+#: libraries/config/FormDisplay.tpl.php:230
 msgid "This setting is disabled, it will not be applied to your configuration."
 msgstr ""
 "Ova postavka je onemogućena, ona neće biti primenjena na vašu konfiguraciju."
 
-#: libraries/config/FormDisplay.tpl.php:313
+#: libraries/config/FormDisplay.tpl.php:324
 #, php-format
 msgid "Set value: %s"
 msgstr "Postavi vrednost: %s"
 
-#: libraries/config/FormDisplay.tpl.php:318
+#: libraries/config/FormDisplay.tpl.php:329
 #: libraries/config/messages.inc.php:610
 msgid "Restore default value"
 msgstr "Vrati podrazumevanu vrednost"
 
-#: libraries/config/FormDisplay.tpl.php:332
+#: libraries/config/FormDisplay.tpl.php:343
 msgid "Allow users to customize this value"
 msgstr "Dozvoli korisnicima da prilagode ovu vrednost"
 
@@ -6238,7 +6254,7 @@ msgstr "Karakter set datoteke"
 
 #: libraries/config/messages.inc.php:136 libraries/config/messages.inc.php:152
 #: libraries/sql_query_form.lib.php:247
-#: templates/structure/row_stats_table.phtml:7
+#: templates/table/structure/row_stats_table.phtml:7
 msgid "Format"
 msgstr "Format"
 
@@ -6827,7 +6843,7 @@ msgstr ""
 
 #: libraries/config/messages.inc.php:332
 #: libraries/plugins/export/ExportPdf.class.php:279
-#: templates/structure/secondary_tabs.phtml:8
+#: templates/table/secondary_tabs.phtml:8
 #, fuzzy
 #| msgid "Database for user"
 msgid "Table structure"
@@ -8563,111 +8579,35 @@ msgstr "Microsoft Word 2000"
 msgid "OpenDocument Text"
 msgstr "Open Document Text"
 
-#: libraries/controllers/StructureController.class.php:465
+#: libraries/controllers/DatabaseStructureController.class.php:405
 #: tbl_operations.php:382
 #, php-format
 msgid "Table %s has been emptied."
 msgstr "Tabela %s je ispražnjena."
 
-#: libraries/controllers/StructureController.class.php:486
+#: libraries/controllers/DatabaseStructureController.class.php:426
 #: tbl_operations.php:400 view_operations.php:119
 #, fuzzy, php-format
 #| msgid "View %s has been dropped."
 msgid "View %s has been dropped."
 msgstr "Pogled %s je odbačen"
 
-#: libraries/controllers/StructureController.class.php:487
+#: libraries/controllers/DatabaseStructureController.class.php:427
 #: tbl_operations.php:401
 #, fuzzy, php-format
 #| msgid "Table %s has been dropped."
 msgid "Table %s has been dropped."
 msgstr "Tabela %s je odbačena"
 
-#: libraries/controllers/StructureController.class.php:797
-#, php-format
-msgid "The name '%s' is a MySQL reserved keyword."
-msgid_plural "The names '%s' are MySQL reserved keywords."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: libraries/controllers/StructureController.class.php:875
-#, fuzzy
-#| msgid "No rows selected"
-msgid "No column selected."
-msgstr "Nema odabranih redova"
-
-#: libraries/controllers/StructureController.class.php:1049
+#: libraries/controllers/DatabaseStructureController.class.php:733
 msgid "Favorite List is full!"
 msgstr ""
 
-#: libraries/controllers/StructureController.class.php:1272
-#, fuzzy
-#| msgid "The selected users have been deleted successfully."
-msgid "The columns have been moved successfully."
-msgstr "Izabrani korisnici su uspešno obrisani."
-
-#: libraries/controllers/StructureController.class.php:1535
-#, fuzzy, php-format
-#| msgid "Table %1$s has been altered successfully."
-msgid ""
-"Table %1$s has been altered successfully. Privileges have been adjusted."
-msgstr "Tabela %1$s je uspešno izmenjena."
-
-#: libraries/controllers/StructureController.class.php:1541
-#: libraries/controllers/TableIndexesController.class.php:161
-#: tbl_addfield.php:92
-#, php-format
-msgid "Table %1$s has been altered successfully."
-msgstr "Tabela %1$s je uspešno izmenjena."
-
-#: libraries/controllers/StructureController.class.php:1588
-#: libraries/tracking.lib.php:1094
-msgid "Query error"
-msgstr "Greška u upitu"
-
-#: libraries/controllers/StructureController.class.php:1806
+#: libraries/controllers/DatabaseStructureController.class.php:947
 #: libraries/mysql_charsets.lib.php:366 libraries/mysql_charsets.lib.php:373
 msgid "unknown"
 msgstr "nepoznat"
 
-#: libraries/controllers/StructureController.class.php:1957
-#: templates/structure/check_all_table_column.phtml:11
-msgid "Change"
-msgstr "Promeni"
-
-#: libraries/controllers/StructureController.class.php:1961
-#: libraries/controllers/StructureController.class.php:1966
-#: libraries/navigation/Nodes/Node_Index.class.php:30
-#: libraries/tracking.lib.php:926
-#: templates/columns_definitions/column_indexes.phtml:16
-#: templates/columns_definitions/table_fields_definitions.phtml:57
-#: templates/structure/check_all_table_column.phtml:30
-#: templates/structure/display_structure.phtml:79
-#: templates/structure/display_table_stats.phtml:19
-msgid "Index"
-msgstr "Ključ"
-
-#: libraries/controllers/StructureController.class.php:1963
-#: libraries/controllers/StructureController.class.php:1968
-#: templates/columns_definitions/column_indexes.phtml:27
-#: templates/structure/check_all_table_column.phtml:37
-msgid "Spatial"
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1964
-#: libraries/controllers/StructureController.class.php:1969
-#: templates/columns_definitions/column_indexes.phtml:22
-#: templates/structure/check_all_table_column.phtml:47
-msgid "Fulltext"
-msgstr "Tekst ključ"
-
-#: libraries/controllers/StructureController.class.php:1970
-#, fuzzy
-#| msgid "Browse distinct values"
-msgid "Distinct values"
-msgstr "Pregledaj različite vrednosti"
-
 #: libraries/controllers/TableChartController.class.php:82
 #: libraries/controllers/TableGisVisualizationController.class.php:101
 msgid "No SQL query was set to fetch data."
@@ -8683,13 +8623,20 @@ msgstr ""
 msgid "No data to display"
 msgstr "Nema podataka"
 
-#: libraries/controllers/TableRelationController.class.php:217
+#: libraries/controllers/TableIndexesController.class.php:161
+#: libraries/controllers/TableStructureController.class.php:736
+#: tbl_addfield.php:92
+#, php-format
+msgid "Table %1$s has been altered successfully."
+msgstr "Tabela %1$s je uspešno izmenjena."
+
+#: libraries/controllers/TableRelationController.class.php:218
 #, fuzzy
 #| msgid "Thread %s was successfully killed."
 msgid "Display column was successfully updated."
 msgstr "Proces %s je uspešno prekinut."
 
-#: libraries/controllers/TableRelationController.class.php:283
+#: libraries/controllers/TableRelationController.class.php:288
 #, fuzzy
 #| msgid "Internal relation added"
 msgid "Internal relations were successfully updated."
@@ -8708,12 +8655,81 @@ msgid "Zoom search"
 msgstr "Uvećaj polje za pretragu"
 
 #: libraries/controllers/TableSearchController.class.php:852
-#: templates/table/selection_form.phtml:59
+#: templates/table/search/selection_form.phtml:59
 #, fuzzy
 #| msgid "Hide search criteria"
 msgid "Find and replace"
 msgstr "Sakrij kriterijume za pretragu"
 
+#: libraries/controllers/TableStructureController.class.php:163
+#, php-format
+msgid "The name '%s' is a MySQL reserved keyword."
+msgid_plural "The names '%s' are MySQL reserved keywords."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: libraries/controllers/TableStructureController.class.php:241
+#, fuzzy
+#| msgid "No rows selected"
+msgid "No column selected."
+msgstr "Nema odabranih redova"
+
+#: libraries/controllers/TableStructureController.class.php:467
+#, fuzzy
+#| msgid "The selected users have been deleted successfully."
+msgid "The columns have been moved successfully."
+msgstr "Izabrani korisnici su uspešno obrisani."
+
+#: libraries/controllers/TableStructureController.class.php:730
+#, fuzzy, php-format
+#| msgid "Table %1$s has been altered successfully."
+msgid ""
+"Table %1$s has been altered successfully. Privileges have been adjusted."
+msgstr "Tabela %1$s je uspešno izmenjena."
+
+#: libraries/controllers/TableStructureController.class.php:783
+#: libraries/tracking.lib.php:1094
+msgid "Query error"
+msgstr "Greška u upitu"
+
+#: libraries/controllers/TableStructureController.class.php:948
+#: templates/table/structure/check_all_table_column.phtml:11
+msgid "Change"
+msgstr "Promeni"
+
+#: libraries/controllers/TableStructureController.class.php:952
+#: libraries/controllers/TableStructureController.class.php:957
+#: libraries/navigation/Nodes/Node_Index.class.php:30
+#: libraries/tracking.lib.php:926
+#: templates/columns_definitions/column_indexes.phtml:16
+#: templates/columns_definitions/table_fields_definitions.phtml:57
+#: templates/table/structure/check_all_table_column.phtml:30
+#: templates/table/structure/display_structure.phtml:79
+#: templates/table/structure/display_table_stats.phtml:19
+msgid "Index"
+msgstr "Ključ"
+
+#: libraries/controllers/TableStructureController.class.php:954
+#: libraries/controllers/TableStructureController.class.php:959
+#: templates/columns_definitions/column_indexes.phtml:27
+#: templates/table/structure/check_all_table_column.phtml:37
+msgid "Spatial"
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:955
+#: libraries/controllers/TableStructureController.class.php:960
+#: templates/columns_definitions/column_indexes.phtml:22
+#: templates/table/structure/check_all_table_column.phtml:47
+msgid "Fulltext"
+msgstr "Tekst ključ"
+
+#: libraries/controllers/TableStructureController.class.php:963
+#, fuzzy
+#| msgid "Browse distinct values"
+msgid "Distinct values"
+msgstr "Pregledaj različite vrednosti"
+
 #: libraries/core.lib.php:306
 #, php-format
 msgid "The %s extension is missing. Please check your PHP configuration."
@@ -8760,7 +8776,7 @@ msgid "No Password"
 msgstr "Nema lozinke"
 
 #: libraries/display_change_password.lib.php:68
-#: libraries/plugins/auth/AuthenticationCookie.class.php:199
+#: libraries/plugins/auth/AuthenticationCookie.class.php:187
 #: libraries/replication_gui.lib.php:422 libraries/replication_gui.lib.php:862
 #: libraries/server_privileges.lib.php:1640
 msgid "Password:"
@@ -9560,12 +9576,12 @@ msgid "Dump has been saved to file %s."
 msgstr "Sadržaj baze je sačuvan u datoteku %s."
 
 #: libraries/import.lib.php:202 libraries/insert_edit.lib.php:124
-#: libraries/rte/rte_routines.lib.php:1353 libraries/sql.lib.php:1312
+#: libraries/rte/rte_routines.lib.php:1444 libraries/sql.lib.php:1306
 #: tbl_get_field.php:44
 msgid "MySQL returned an empty result set (i.e. zero rows)."
 msgstr "MySQL je vratio prazan rezultat (nula redova)."
 
-#: libraries/import.lib.php:265 libraries/sql.lib.php:1326
+#: libraries/import.lib.php:265 libraries/sql.lib.php:1320
 msgid "[ROLLBACK occurred.]"
 msgstr ""
 
@@ -9629,14 +9645,14 @@ msgstr "Kreiraj indeks na &nbsp;%s&nbsp;kolonama"
 
 #: libraries/insert_edit.lib.php:233
 #: libraries/navigation/Nodes/Node_DatabaseChild.class.php:48
-#: templates/designer/table_list.phtml:40
+#: templates/database/designer/table_list.phtml:40
 msgid "Hide"
 msgstr "Sakrij"
 
 #: libraries/insert_edit.lib.php:249
 #: libraries/navigation/Nodes/Node_Function.class.php:32
-#: libraries/rte/rte_routines.lib.php:1495
-#: templates/table/table_header.phtml:4
+#: libraries/rte/rte_routines.lib.php:1586
+#: templates/table/search/table_header.phtml:4
 msgid "Function"
 msgstr "Funkcija"
 
@@ -9651,86 +9667,87 @@ msgstr "Binarni"
 msgid "Because of its length,<br /> this column might not be editable."
 msgstr "Zbog njene veličine,<br />ova kolona možda neće moći da se izmeni"
 
-#: libraries/insert_edit.lib.php:1050
+#: libraries/insert_edit.lib.php:1048
 msgid "Binary - do not edit"
 msgstr "Binarni - ne menjaj"
 
-#: libraries/insert_edit.lib.php:1176 libraries/server_privileges.lib.php:470
-#: templates/table/options.phtml:36
+#: libraries/insert_edit.lib.php:1174 libraries/server_privileges.lib.php:470
+#: templates/table/search/options.phtml:36
 msgid "Or"
 msgstr "ili"
 
-#: libraries/insert_edit.lib.php:1177
+#: libraries/insert_edit.lib.php:1175
 #, fuzzy
 #| msgid "web server upload directory"
 msgid "web server upload directory:"
 msgstr "direktorijum za slanje veb servera"
 
-#: libraries/insert_edit.lib.php:1348 templates/table/input_box.phtml:49
+#: libraries/insert_edit.lib.php:1346
+#: templates/table/search/input_box.phtml:49
 msgid "Edit/Insert"
 msgstr "Uredi/Umetni"
 
-#: libraries/insert_edit.lib.php:1398
+#: libraries/insert_edit.lib.php:1396
 #, php-format
 msgid "Continue insertion with %s rows"
 msgstr "Nastavi umetanje sa %s redova"
 
-#: libraries/insert_edit.lib.php:1428
+#: libraries/insert_edit.lib.php:1426
 msgid "and then"
 msgstr "i onda"
 
-#: libraries/insert_edit.lib.php:1461
+#: libraries/insert_edit.lib.php:1459
 msgid "Insert as new row"
 msgstr "Unesi kao novi red"
 
-#: libraries/insert_edit.lib.php:1464
+#: libraries/insert_edit.lib.php:1462
 msgid "Insert as new row and ignore errors"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1467
+#: libraries/insert_edit.lib.php:1465
 msgid "Show insert query"
 msgstr "Prikaži insert upit"
 
-#: libraries/insert_edit.lib.php:1487
+#: libraries/insert_edit.lib.php:1485
 msgid "Go back to previous page"
 msgstr "Nazad na prethodnu stranu"
 
-#: libraries/insert_edit.lib.php:1490
+#: libraries/insert_edit.lib.php:1488
 msgid "Insert another new row"
 msgstr "Dodaj još jedan novi red"
 
-#: libraries/insert_edit.lib.php:1495
+#: libraries/insert_edit.lib.php:1493
 msgid "Go back to this page"
 msgstr "Vrati se na ovu stranu"
 
-#: libraries/insert_edit.lib.php:1518
+#: libraries/insert_edit.lib.php:1516
 msgid "Edit next row"
 msgstr "Uredi sledeći red"
 
-#: libraries/insert_edit.lib.php:1540
+#: libraries/insert_edit.lib.php:1538
 msgid ""
 "Use TAB key to move from value to value, or CTRL+arrows to move anywhere"
 msgstr ""
 "Koristite TAB taster za pomeranje od polja do polja, ili CTRL+strelice za "
 "slobodno pomeranje"
 
-#: libraries/insert_edit.lib.php:1577 libraries/replication_gui.lib.php:542
-#: libraries/rte/rte_routines.lib.php:1497
+#: libraries/insert_edit.lib.php:1575 libraries/replication_gui.lib.php:542
+#: libraries/rte/rte_routines.lib.php:1588
 #: libraries/server_status_variables.lib.php:220
-#: templates/designer/having_query_panel.phtml:100
-#: templates/designer/options_panel.phtml:73
-#: templates/designer/options_panel.phtml:239
-#: templates/designer/where_query_panel.phtml:69
-#: templates/table/table_header.phtml:10
-#: templates/table/zoom_result_form.phtml:35
+#: templates/database/designer/having_query_panel.phtml:100
+#: templates/database/designer/options_panel.phtml:73
+#: templates/database/designer/options_panel.phtml:239
+#: templates/database/designer/where_query_panel.phtml:69
+#: templates/table/search/table_header.phtml:10
+#: templates/table/search/zoom_result_form.phtml:35
 msgid "Value"
 msgstr "Vrednost"
 
-#: libraries/insert_edit.lib.php:1937 libraries/sql.lib.php:1309
+#: libraries/insert_edit.lib.php:1935 libraries/sql.lib.php:1303
 msgid "Showing SQL query"
 msgstr "Prikaz kao SQL upit"
 
-#: libraries/insert_edit.lib.php:1962 libraries/sql.lib.php:1287
+#: libraries/insert_edit.lib.php:1960 libraries/sql.lib.php:1281
 #, php-format
 msgid "Inserted row id: %1$d"
 msgstr ""
@@ -10176,7 +10193,7 @@ msgstr ""
 #: libraries/navigation/Nodes/Node_View_Container.class.php:26
 #: libraries/navigation/Nodes/Node_View_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:129
-#: templates/structure/show_create.phtml:30
+#: templates/database/structure/show_create.phtml:30
 msgid "Views"
 msgstr "Pogledi"
 
@@ -10487,7 +10504,7 @@ msgstr "Nije Vam dozvoljeno da budete ovde!"
 
 #: libraries/operations.lib.php:101 libraries/operations.lib.php:249
 #: libraries/operations.lib.php:869 libraries/operations.lib.php:963
-#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:907
+#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:998
 #: templates/columns_definitions/table_fields_definitions.phtml:47
 #, fuzzy
 #| msgid "Edit Privileges"
@@ -10581,22 +10598,22 @@ msgid "Switch to copied table"
 msgstr "Pređi na kopiranu tabelu"
 
 #: libraries/operations.lib.php:1360
-#: templates/structure/check_all_tables.phtml:18
+#: templates/database/structure/check_all_tables.phtml:18
 msgid "Table maintenance"
 msgstr "Radnje na tabeli"
 
 #: libraries/operations.lib.php:1398
-#: templates/structure/check_all_tables.phtml:19
+#: templates/database/structure/check_all_tables.phtml:19
 msgid "Analyze table"
 msgstr "Analiziraj tabelu"
 
 #: libraries/operations.lib.php:1413
-#: templates/structure/check_all_tables.phtml:20
+#: templates/database/structure/check_all_tables.phtml:20
 msgid "Check table"
 msgstr "Proveri tabelu"
 
 #: libraries/operations.lib.php:1428
-#: templates/structure/check_all_tables.phtml:22
+#: templates/database/structure/check_all_tables.phtml:22
 #, fuzzy
 #| msgid "Check table"
 msgid "Checksum table"
@@ -10616,18 +10633,19 @@ msgid "Flush the table (FLUSH)"
 msgstr "Snimi sve baferovane izmene nad tabelom (FLUSH)"
 
 #: libraries/operations.lib.php:1477
-#: templates/structure/check_all_tables.phtml:23
-#: templates/structure/display_table_stats.phtml:56
+#: templates/database/structure/check_all_tables.phtml:23
+#: templates/table/structure/display_table_stats.phtml:56
 msgid "Optimize table"
 msgstr "Optimizuj tabelu"
 
 #: libraries/operations.lib.php:1492
-#: templates/structure/check_all_tables.phtml:24
+#: templates/database/structure/check_all_tables.phtml:24
 msgid "Repair table"
 msgstr "Popravi tabelu"
 
 #: libraries/operations.lib.php:1538
-#: templates/structure/check_all_tables.phtml:14 view_operations.php:127
+#: templates/database/structure/check_all_tables.phtml:14
+#: view_operations.php:127
 msgid "Delete data or table"
 msgstr "Brisanje podataka ili tabele"
 
@@ -10754,7 +10772,7 @@ msgid "Cannot connect: invalid settings."
 msgstr "Ne mogu da se povežem: neispravna podešavanja."
 
 #: libraries/plugins/auth/AuthenticationConfig.class.php:108
-#: libraries/plugins/auth/AuthenticationCookie.class.php:134
+#: libraries/plugins/auth/AuthenticationCookie.class.php:122
 #: libraries/plugins/auth/AuthenticationHttp.class.php:96
 #, php-format
 msgid "Welcome to %s"
@@ -10785,38 +10803,38 @@ msgstr ""
 msgid "Retry to connect"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:146
+#: libraries/plugins/auth/AuthenticationCookie.class.php:134
 msgid "Your session has expired. Please log in again."
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:170
+#: libraries/plugins/auth/AuthenticationCookie.class.php:158
 msgid "Log in"
 msgstr "Prijavljivanje"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:178
-#: libraries/plugins/auth/AuthenticationCookie.class.php:188
+#: libraries/plugins/auth/AuthenticationCookie.class.php:166
+#: libraries/plugins/auth/AuthenticationCookie.class.php:176
 msgid "You can enter hostname/IP address and port separated by space."
 msgstr "Možete uneti ime servera/IP adresu i port odvojene blanko znakom."
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:193
+#: libraries/plugins/auth/AuthenticationCookie.class.php:181
 msgid "Username:"
 msgstr "Korisničko ime:"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:205
+#: libraries/plugins/auth/AuthenticationCookie.class.php:193
 #, fuzzy
 #| msgid "Server Choice"
 msgid "Server Choice:"
 msgstr "Izbor servera"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:386
+#: libraries/plugins/auth/AuthenticationCookie.class.php:374
 msgid "Entered captcha is wrong, try again!"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:396
+#: libraries/plugins/auth/AuthenticationCookie.class.php:384
 msgid "Please enter correct captcha!"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:423
+#: libraries/plugins/auth/AuthenticationCookie.class.php:411
 #, fuzzy
 #| msgid "Cannot log in to the MySQL server"
 msgid "You are not allowed to log in to this MySQL server!"
@@ -10914,7 +10932,7 @@ msgstr "Događaji"
 #: libraries/plugins/export/ExportOdt.class.php:593
 #: libraries/plugins/export/ExportTexytext.class.php:428
 #: libraries/plugins/export/PMA_ExportPdf.class.php:313
-#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:984
 #: libraries/rte/rte_triggers.lib.php:377
 msgid "Definition"
 msgstr "Definicija"
@@ -11253,7 +11271,7 @@ msgid "Last check:"
 msgstr "Poslednja provera"
 
 #: libraries/plugins/export/ExportSql.class.php:1399
-#: templates/structure/structure_table_row.phtml:183
+#: templates/database/structure/structure_table_row.phtml:183
 msgid "in use"
 msgstr "se koristi"
 
@@ -11451,20 +11469,14 @@ msgstr ""
 msgid "The imported file does not contain any data!"
 msgstr "Datoteka %s ne sadrži ni jedan identifikator ključa"
 
-#: libraries/plugins/import/ImportSql.class.php:169
+#: libraries/plugins/import/ImportSql.class.php:72
 msgid "SQL compatibility mode:"
 msgstr "SQL komaptibilni mod:"
 
-#: libraries/plugins/import/ImportSql.class.php:181
+#: libraries/plugins/import/ImportSql.class.php:84
 msgid "Do not use <code>AUTO_INCREMENT</code> for zero values"
 msgstr ""
 
-#: libraries/plugins/import/ImportSql.class.php:195
-#, fuzzy
-#| msgid "Read misses"
-msgid "Read as multibytes"
-msgstr "Promašaji pri čitanju"
-
 #: libraries/plugins/import/ImportXml.class.php:54
 msgid "XML"
 msgstr "XML"
@@ -11507,7 +11519,7 @@ msgid "Show grid"
 msgstr "Prikaži mrežu"
 
 #: libraries/plugins/schema/SchemaPdf.class.php:94
-#: templates/structure/print_view_data_dictionary_link.phtml:6
+#: templates/database/structure/print_view_data_dictionary_link.phtml:6
 msgid "Data Dictionary"
 msgstr "Rečnik podataka"
 
@@ -11538,7 +11550,7 @@ msgid "The %s table doesn't exist!"
 msgstr "Tabela %s ne postoji!"
 
 #: libraries/plugins/schema/eps/Eps_Relation_Schema.class.php:321
-#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:309
+#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:323
 #, php-format
 msgid "Schema of the %s database - Page %s"
 msgstr "Shema baze %s - Strana %s"
@@ -11567,7 +11579,7 @@ msgstr "Sadržaj"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1005
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1028
 #: libraries/tracking.lib.php:884
-#: templates/structure/table_structure_header.phtml:11
+#: templates/table/structure/table_structure_header.phtml:11
 msgid "Extra"
 msgstr "Dodatno"
 
@@ -11959,32 +11971,32 @@ msgstr ""
 msgid "Create the needed tables with the <code>%screate_tables.sql</code>."
 msgstr ""
 
-#: libraries/relation.lib.php:360
+#: libraries/relation.lib.php:357
 msgid "Create a pma user and give access to these tables."
 msgstr ""
 
-#: libraries/relation.lib.php:365
+#: libraries/relation.lib.php:360
 msgid ""
 "Enable advanced features in configuration file (<code>config.inc.php</"
 "code>), for example by starting from <code>config.sample.inc.php</code>."
 msgstr ""
 
-#: libraries/relation.lib.php:373
+#: libraries/relation.lib.php:365
 msgid "Re-login to phpMyAdmin to load the updated configuration file."
 msgstr ""
 
-#: libraries/relation.lib.php:1612
+#: libraries/relation.lib.php:1607
 msgid "no description"
 msgstr "nema opisa"
 
-#: libraries/relation.lib.php:1811
+#: libraries/relation.lib.php:1806
 msgid ""
 "You do not have necessary privileges to create a database named "
 "'phpmyadmin'. You may go to 'Operations' tab of any database to set up the "
 "phpMyAdmin configuration storage there."
 msgstr ""
 
-#: libraries/relation.lib.php:1928
+#: libraries/relation.lib.php:1923
 #, fuzzy, php-format
 #| msgid "Missing phpMyAdmin configuration storage tables"
 msgid ""
@@ -11992,21 +12004,21 @@ msgid ""
 "configuration storage there."
 msgstr "Nedostaju phpMyAdmin skladišne tabele"
 
-#: libraries/relation.lib.php:1936
+#: libraries/relation.lib.php:1931
 #, fuzzy, php-format
 #| msgid "Missing phpMyAdmin configuration storage tables"
 msgid ""
 "%sCreate%s the phpMyAdmin configuration storage in the current database."
 msgstr "Nedostaju phpMyAdmin skladišne tabele"
 
-#: libraries/relation.lib.php:1944
+#: libraries/relation.lib.php:1939
 #, fuzzy, php-format
 #| msgid "Missing phpMyAdmin configuration storage tables"
 msgid "%sCreate%s missing phpMyAdmin configuration storage tables."
 msgstr "Nedostaju phpMyAdmin skladišne tabele"
 
 #: libraries/replication_gui.lib.php:46 libraries/replication_gui.lib.php:343
-#: libraries/server_databases.lib.php:387
+#: libraries/server_databases.lib.php:398
 msgid "Master replication"
 msgstr ""
 
@@ -12061,7 +12073,7 @@ msgid ""
 msgstr ""
 
 #: libraries/replication_gui.lib.php:141
-#: libraries/server_databases.lib.php:389
+#: libraries/server_databases.lib.php:400
 msgid "Slave replication"
 msgstr ""
 
@@ -12341,10 +12353,10 @@ msgid "Master server changed successfully to %s."
 msgstr "Master server uspešno promenjen u %s"
 
 #: libraries/rte/rte_events.lib.php:106 libraries/rte/rte_events.lib.php:115
-#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:149
-#: libraries/rte/rte_routines.lib.php:158
-#: libraries/rte/rte_routines.lib.php:231
-#: libraries/rte/rte_routines.lib.php:1362
+#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:219
+#: libraries/rte/rte_routines.lib.php:246
+#: libraries/rte/rte_routines.lib.php:368
+#: libraries/rte/rte_routines.lib.php:1453
 #: libraries/rte/rte_triggers.lib.php:82 libraries/rte/rte_triggers.lib.php:91
 #: libraries/rte/rte_triggers.lib.php:123
 #, php-format
@@ -12365,7 +12377,7 @@ msgstr "Događaj %1$s je izmenjen."
 msgid "Event %1$s has been created."
 msgstr "Događaj %1$s je kreiran."
 
-#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:251
+#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:266
 #: libraries/rte/rte_triggers.lib.php:144
 msgid "One or more errors have occurred while processing your request:"
 msgstr ""
@@ -12374,7 +12386,7 @@ msgstr ""
 msgid "Edit event"
 msgstr "Izmeni događaj"
 
-#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:794
+#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:885
 #: libraries/rte/rte_triggers.lib.php:323 view_create.php:180
 msgid "Details"
 msgstr ""
@@ -12387,7 +12399,7 @@ msgstr "Ime događaja"
 msgid "Event type"
 msgstr "Vrsta događaja"
 
-#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:817
+#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:908
 #, php-format
 msgid "Change to %s"
 msgstr "Promeni u %s"
@@ -12414,12 +12426,14 @@ msgstr "Kraj"
 msgid "On completion preserve"
 msgstr "Po okončanju sačuvaj"
 
-#: libraries/rte/rte_events.lib.php:491 libraries/rte/rte_routines.lib.php:930
+#: libraries/rte/rte_events.lib.php:491
+#: libraries/rte/rte_routines.lib.php:1021
 #: libraries/rte/rte_triggers.lib.php:383 view_create.php:209
 msgid "Definer"
 msgstr ""
 
-#: libraries/rte/rte_events.lib.php:535 libraries/rte/rte_routines.lib.php:997
+#: libraries/rte/rte_events.lib.php:535
+#: libraries/rte/rte_routines.lib.php:1088
 #: libraries/rte/rte_triggers.lib.php:422
 msgid "The definer must be in the \"username@hostname\" format!"
 msgstr ""
@@ -12447,9 +12461,9 @@ msgid "You must provide an event definition."
 msgstr ""
 
 #: libraries/rte/rte_export.lib.php:43 libraries/rte/rte_general.lib.php:72
-#: libraries/rte/rte_routines.lib.php:345
-#: libraries/rte/rte_routines.lib.php:1198
-#: libraries/rte/rte_routines.lib.php:1411
+#: libraries/rte/rte_routines.lib.php:153
+#: libraries/rte/rte_routines.lib.php:1289
+#: libraries/rte/rte_routines.lib.php:1502
 #, fuzzy
 #| msgid "Error in processing request"
 msgid "Error in processing request:"
@@ -12483,122 +12497,122 @@ msgid ""
 "problems."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:110
-#: libraries/rte/rte_routines.lib.php:1006
+#: libraries/rte/rte_routines.lib.php:123
+msgid "Edit routine"
+msgstr "Izmena rutine"
+
+#: libraries/rte/rte_routines.lib.php:200
+#: libraries/rte/rte_routines.lib.php:1097
 #, php-format
 msgid "Invalid routine type: \"%s\""
 msgstr "Neispravan tip rutine: \"%s\""
 
-#: libraries/rte/rte_routines.lib.php:170
+#: libraries/rte/rte_routines.lib.php:253
+#, php-format
+msgid "Routine %1$s has been created."
+msgstr "Routina %1$s je kreirana."
+
+#: libraries/rte/rte_routines.lib.php:380
 msgid "Sorry, we failed to restore the dropped routine."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:211
+#: libraries/rte/rte_routines.lib.php:439
 #, fuzzy, php-format
 #| msgid "Routine %1$s has been modified."
 msgid "Routine %1$s has been modified. Privileges have been adjusted."
 msgstr "Routina %1$s je modifikovana."
 
-#: libraries/rte/rte_routines.lib.php:216
+#: libraries/rte/rte_routines.lib.php:444
 #, php-format
 msgid "Routine %1$s has been modified."
 msgstr "Routina %1$s je modifikovana."
 
-#: libraries/rte/rte_routines.lib.php:238
-#, php-format
-msgid "Routine %1$s has been created."
-msgstr "Routina %1$s je kreirana."
-
-#: libraries/rte/rte_routines.lib.php:315
-msgid "Edit routine"
-msgstr "Izmena rutine"
-
-#: libraries/rte/rte_routines.lib.php:797
+#: libraries/rte/rte_routines.lib.php:888
 msgid "Routine name"
 msgstr "Ime rutine"
 
-#: libraries/rte/rte_routines.lib.php:823
+#: libraries/rte/rte_routines.lib.php:914
 msgid "Parameters"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:829
+#: libraries/rte/rte_routines.lib.php:920
 msgid "Direction"
 msgstr "Pravac"
 
-#: libraries/rte/rte_routines.lib.php:847
+#: libraries/rte/rte_routines.lib.php:938
 msgid "Add parameter"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:851
+#: libraries/rte/rte_routines.lib.php:942
 msgid "Remove last parameter"
 msgstr "Ukloni poslednji parametar"
 
-#: libraries/rte/rte_routines.lib.php:856
+#: libraries/rte/rte_routines.lib.php:947
 msgid "Return type"
 msgstr "Povratni tip"
 
-#: libraries/rte/rte_routines.lib.php:862
+#: libraries/rte/rte_routines.lib.php:953
 msgid "Return length/values"
 msgstr "Vrati dužina/vrednosti"
 
-#: libraries/rte/rte_routines.lib.php:868
+#: libraries/rte/rte_routines.lib.php:959
 msgid "Return options"
 msgstr "Povratne opcije"
 
-#: libraries/rte/rte_routines.lib.php:899
+#: libraries/rte/rte_routines.lib.php:990
 msgid "Is deterministic"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:920
+#: libraries/rte/rte_routines.lib.php:1011
 msgid ""
 "You do not have sufficient privileges to perform this operation; Please "
 "refer to the documentation for more details"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:935
+#: libraries/rte/rte_routines.lib.php:1026
 msgid "Security type"
 msgstr "Tip sigurnosti"
 
-#: libraries/rte/rte_routines.lib.php:944
+#: libraries/rte/rte_routines.lib.php:1035
 msgid "SQL data access"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1013
+#: libraries/rte/rte_routines.lib.php:1104
 #, fuzzy
 #| msgid "You must provide a valid table name"
 msgid "You must provide a routine name!"
 msgstr "Morate uneti ispravno ime tabele"
 
-#: libraries/rte/rte_routines.lib.php:1047
+#: libraries/rte/rte_routines.lib.php:1138
 #, php-format
 msgid "Invalid direction \"%s\" given for parameter."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1069
-#: libraries/rte/rte_routines.lib.php:1131
+#: libraries/rte/rte_routines.lib.php:1160
+#: libraries/rte/rte_routines.lib.php:1222
 msgid ""
 "You must provide length/values for routine parameters of type ENUM, SET, "
 "VARCHAR and VARBINARY."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1095
+#: libraries/rte/rte_routines.lib.php:1186
 msgid "You must provide a name and a type for each routine parameter."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1114
+#: libraries/rte/rte_routines.lib.php:1205
 msgid "You must provide a valid return type for the routine."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1174
+#: libraries/rte/rte_routines.lib.php:1265
 msgid "You must provide a routine definition."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1285
+#: libraries/rte/rte_routines.lib.php:1376
 #, php-format
 msgid "Execution results of routine %s"
 msgstr "Rezultat izvršavanja rutine %s"
 
-#: libraries/rte/rte_routines.lib.php:1340
+#: libraries/rte/rte_routines.lib.php:1431
 #, php-format
 msgid "%d row affected by the last statement inside the procedure."
 msgid_plural "%d rows affected by the last statement inside the procedure."
@@ -12606,13 +12620,13 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: libraries/rte/rte_routines.lib.php:1398
-#: libraries/rte/rte_routines.lib.php:1406
+#: libraries/rte/rte_routines.lib.php:1489
+#: libraries/rte/rte_routines.lib.php:1497
 msgid "Execute routine"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1485
-#: libraries/rte/rte_routines.lib.php:1488
+#: libraries/rte/rte_routines.lib.php:1576
+#: libraries/rte/rte_routines.lib.php:1579
 msgid "Routine parameters"
 msgstr "Parametri rutine"
 
@@ -12776,7 +12790,7 @@ msgid "Original position"
 msgstr "Originalna pozicija"
 
 #: libraries/server_bin_log.lib.php:133
-#: templates/structure/display_table_stats.phtml:4
+#: templates/table/structure/display_table_stats.phtml:4
 msgid "Information"
 msgstr "Informacije"
 
@@ -12814,12 +12828,12 @@ msgstr ""
 "Napomena: uključivanje statistika može prouzrokovati veliki saobraćaj između "
 "veb i MySQL servera."
 
-#: libraries/server_databases.lib.php:364
-#: libraries/server_databases.lib.php:365
+#: libraries/server_databases.lib.php:366
+#: libraries/server_databases.lib.php:371
 msgid "Enable Statistics"
 msgstr "Uključi statistike"
 
-#: libraries/server_databases.lib.php:481
+#: libraries/server_databases.lib.php:492
 #, fuzzy, php-format
 #| msgid "%s databases have been dropped successfully."
 msgid "%1$d database has been dropped successfully."
@@ -13201,7 +13215,7 @@ msgid "You have revoked the privileges for %s."
 msgstr "Zabranili ste privilegije za %s."
 
 #: libraries/server_privileges.lib.php:2059
-#: libraries/server_privileges.lib.php:4290
+#: libraries/server_privileges.lib.php:4316
 #, fuzzy
 #| msgid "Add user"
 msgid "Add user account"
@@ -13382,60 +13396,60 @@ msgstr "Brišem %s"
 msgid "The privileges were reloaded successfully."
 msgstr "Privilegije su uspešno ponovo učitane."
 
-#: libraries/server_privileges.lib.php:3994
+#: libraries/server_privileges.lib.php:4003
 #, php-format
 msgid "The user %s already exists!"
 msgstr "Korisnik %s već postoji!"
 
-#: libraries/server_privileges.lib.php:4232
+#: libraries/server_privileges.lib.php:4258
 #, fuzzy, php-format
 #| msgid "Privileges"
 msgid "Privileges for %s"
 msgstr "Privilegije"
 
-#: libraries/server_privileges.lib.php:4241
+#: libraries/server_privileges.lib.php:4267
 #: libraries/server_status_processes.lib.php:72
 #: libraries/server_user_groups.lib.php:39
 msgid "User"
 msgstr "Korisnik"
 
-#: libraries/server_privileges.lib.php:4282
+#: libraries/server_privileges.lib.php:4308
 msgctxt "Create new user"
 msgid "New"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4311
+#: libraries/server_privileges.lib.php:4337
 #, fuzzy
 #| msgid "Edit Privileges"
 msgid "Edit privileges:"
 msgstr "Promeni privilegije"
 
-#: libraries/server_privileges.lib.php:4312
+#: libraries/server_privileges.lib.php:4338
 #, fuzzy
 #| msgid "Users"
 msgid "User account"
 msgstr "Korisnici"
 
-#: libraries/server_privileges.lib.php:4371
+#: libraries/server_privileges.lib.php:4397
 msgid ""
 "Note: You are attempting to edit privileges of the user with which you are "
 "currently logged in."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4391 libraries/server_users.lib.php:25
+#: libraries/server_privileges.lib.php:4417 libraries/server_users.lib.php:25
 #, fuzzy
 #| msgid "Users overview"
 msgid "User accounts overview"
 msgstr "Pregled korisnika"
 
-#: libraries/server_privileges.lib.php:4459
+#: libraries/server_privileges.lib.php:4485
 msgid ""
 "A user account allowing any user from localhost to connect is present. This "
 "will prevent other users from connecting if the host part of their account "
 "allows a connection from any (%) host."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4500
+#: libraries/server_privileges.lib.php:4526
 #, php-format
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
@@ -13448,7 +13462,7 @@ msgstr ""
 "server koristi ako su vršene ručne izmene. U tom slučaju %sponovo učitajte "
 "privilegije%s pre nego što nastavite."
 
-#: libraries/server_privileges.lib.php:4519
+#: libraries/server_privileges.lib.php:4545
 #, fuzzy
 #| msgid ""
 #| "Note: phpMyAdmin gets the users' privileges directly from MySQL's "
@@ -13467,43 +13481,43 @@ msgstr ""
 "server koristi ako su vršene ručne izmene. U tom slučaju %sponovo učitajte "
 "privilegije%s pre nego što nastavite."
 
-#: libraries/server_privileges.lib.php:4569
+#: libraries/server_privileges.lib.php:4595
 msgid "The selected user was not found in the privilege table."
 msgstr "Izabrani korisnik nije pronađen u tabeli privilegija."
 
-#: libraries/server_privileges.lib.php:4801
+#: libraries/server_privileges.lib.php:4827
 msgid "You have added a new user."
 msgstr "Dodali ste novog korisnika."
 
-#: libraries/server_status.lib.php:53
+#: libraries/server_status.lib.php:60
 #, php-format
 msgid "Network traffic since startup: %s"
 msgstr ""
 
-#: libraries/server_status.lib.php:66
+#: libraries/server_status.lib.php:73
 #, php-format
 msgid "This MySQL server has been running for %1$s. It started up on %2$s."
 msgstr "Ovaj MySQL server radi %1$s. Pokrenut je %2$s."
 
-#: libraries/server_status.lib.php:80
+#: libraries/server_status.lib.php:94
 msgid ""
 "This MySQL server works as <b>master</b> and <b>slave</b> in <b>replication</"
 "b> process."
 msgstr ""
 
-#: libraries/server_status.lib.php:85
+#: libraries/server_status.lib.php:99
 msgid "This MySQL server works as <b>master</b> in <b>replication</b> process."
 msgstr ""
 
-#: libraries/server_status.lib.php:90
+#: libraries/server_status.lib.php:104
 msgid "This MySQL server works as <b>slave</b> in <b>replication</b> process."
 msgstr ""
 
-#: libraries/server_status.lib.php:106
+#: libraries/server_status.lib.php:116
 msgid "Replication status"
 msgstr "Status replikacije"
 
-#: libraries/server_status.lib.php:137
+#: libraries/server_status.lib.php:146
 msgid ""
 "On a busy server, the byte counters may overrun, so those statistics as "
 "reported by the MySQL server may be incorrect."
@@ -13511,21 +13525,21 @@ msgstr ""
 "Na zaposlenom serveru brojači bajtova mogu da se preliju (overrun), tako da "
 "te statistike, onako kako ih prijavljuje MySQL server, mogu biti netačne."
 
-#: libraries/server_status.lib.php:148
+#: libraries/server_status.lib.php:157
 msgid "Received"
 msgstr "Primljeno"
 
-#: libraries/server_status.lib.php:167
+#: libraries/server_status.lib.php:176
 msgid "Sent"
 msgstr "Poslato"
 
-#: libraries/server_status.lib.php:234
+#: libraries/server_status.lib.php:243
 #, fuzzy
 #| msgid "max. concurrent connections"
 msgid "Max. concurrent connections"
 msgstr "maks. istovremenih veza"
 
-#: libraries/server_status.lib.php:244
+#: libraries/server_status.lib.php:253
 msgid "Failed attempts"
 msgstr "Neuspelih pokušaja"
 
@@ -14596,7 +14610,7 @@ msgstr ""
 msgid "Not implemented yet."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/AlterOperation.php:193
+#: libraries/sql-parser/src/Components/AlterOperation.php:191
 msgid "Unrecognized alter operation."
 msgstr ""
 
@@ -14610,7 +14624,7 @@ msgid "An opening bracket followed by a set of values was expected."
 msgstr ""
 
 #: libraries/sql-parser/src/Components/ArrayObj.php:101
-#: libraries/sql-parser/src/Components/FieldDefinition.php:202
+#: libraries/sql-parser/src/Components/CreateDefinition.php:202
 msgid "An opening bracket was expected."
 msgstr ""
 
@@ -14618,25 +14632,35 @@ msgstr ""
 msgid "A comma or a closing bracket was expected"
 msgstr ""
 
+#: libraries/sql-parser/src/Components/CreateDefinition.php:246
+#, fuzzy
+#| msgid "No databases selected."
+msgid "A comma or a closing bracket was expected."
+msgstr "Nije izabrana ni jedna baza."
+
+#: libraries/sql-parser/src/Components/CreateDefinition.php:262
+msgid "A closing bracket was expected."
+msgstr ""
+
 #: libraries/sql-parser/src/Components/DataType.php:125
 msgid "Unrecognized data type."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:225
+#: libraries/sql-parser/src/Components/Expression.php:227
 msgid "Unexpected closing bracket."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:246
-#: libraries/sql-parser/src/Components/Expression.php:283
-#: libraries/sql-parser/src/Components/Expression.php:303
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:285
+#: libraries/sql-parser/src/Components/Expression.php:305
 msgid "An alias was previously found."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:257
+#: libraries/sql-parser/src/Components/Expression.php:259
 msgid "Unexpected dot."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:327
+#: libraries/sql-parser/src/Components/Expression.php:329
 #, fuzzy
 #| msgid "No databases selected."
 msgid "An alias was expected."
@@ -14648,16 +14672,6 @@ msgstr "Nije izabrana ni jedna baza."
 msgid "An expression was expected."
 msgstr "Nema odabranih redova"
 
-#: libraries/sql-parser/src/Components/FieldDefinition.php:246
-#, fuzzy
-#| msgid "No databases selected."
-msgid "A comma or a closing bracket was expected."
-msgstr "Nije izabrana ni jedna baza."
-
-#: libraries/sql-parser/src/Components/FieldDefinition.php:262
-msgid "A closing bracket was expected."
-msgstr ""
-
 #: libraries/sql-parser/src/Components/Limit.php:90
 #: libraries/sql-parser/src/Components/Limit.php:112
 msgid "An offset was expected."
@@ -14703,29 +14717,29 @@ msgstr ""
 msgid "Expected delimiter."
 msgstr ""
 
-#: libraries/sql-parser/src/Lexer.php:753
+#: libraries/sql-parser/src/Lexer.php:777
 #, fuzzy, php-format
 #| msgid "Event %1$s has been created."
 msgid "Ending quote %1$s was expected."
 msgstr "Događaj %1$s je kreiran."
 
-#: libraries/sql-parser/src/Lexer.php:789
+#: libraries/sql-parser/src/Lexer.php:813
 #, fuzzy
 #| msgid "Table name template"
 msgid "Variable name was expected."
 msgstr "Šablon imena tabele"
 
-#: libraries/sql-parser/src/Parser.php:380
+#: libraries/sql-parser/src/Parser.php:391
 #, fuzzy
 #| msgid "At Beginning of Table"
 msgid "Unexpected beginning of statement."
 msgstr "Na početku tabele"
 
-#: libraries/sql-parser/src/Parser.php:399
+#: libraries/sql-parser/src/Parser.php:410
 msgid "Unrecognized statement type."
 msgstr ""
 
-#: libraries/sql-parser/src/Parser.php:479
+#: libraries/sql-parser/src/Parser.php:489
 msgid "No transaction was previously started."
 msgstr ""
 
@@ -14753,8 +14767,10 @@ msgid "The name of the entity was expected."
 msgstr "Broj otvorenih tabela."
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:310
-msgid "At least one field definition was expected."
-msgstr ""
+#, fuzzy
+#| msgid "The row has been deleted."
+msgid "At least one column definition was expected."
+msgstr "Red je obrisan"
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:329
 msgid "A \"RETURNS\" keyword was expected."
@@ -14832,11 +14848,11 @@ msgstr "Napravljen marker %s"
 msgid "Using bookmark \"%s\" as default browse query."
 msgstr ""
 
-#: libraries/sql.lib.php:1306
+#: libraries/sql.lib.php:1300
 msgid "Showing as PHP code"
 msgstr "Prikaz kao PHP kod"
 
-#: libraries/sql.lib.php:1638
+#: libraries/sql.lib.php:1632
 #, fuzzy, php-format
 #| msgid ""
 #| "This table does not contain a unique column. Features related to the grid "
@@ -14849,7 +14865,7 @@ msgstr ""
 "izmene u gridu, checkbox, Edit, Copy i Delete linkovi može da se desi da ne "
 "rade nakon snimanja."
 
-#: libraries/sql.lib.php:1649
+#: libraries/sql.lib.php:1643
 #, fuzzy, php-format
 #| msgid ""
 #| "This table does not contain a unique column. Features related to the grid "
@@ -14862,7 +14878,7 @@ msgstr ""
 "izmene u gridu, checkbox, Edit, Copy i Delete linkovi može da se desi da ne "
 "rade nakon snimanja."
 
-#: libraries/sql.lib.php:1688
+#: libraries/sql.lib.php:1682
 #, php-format
 msgid "Problems with indexes of table `%s`"
 msgstr "Problem pri indeksiranju tabele `%s`"
@@ -15026,7 +15042,7 @@ msgid "Version %s snapshot (SQL code)"
 msgstr ""
 
 #: libraries/tracking.lib.php:947
-#: templates/structure/table_structure_row.phtml:33
+#: templates/table/structure/table_structure_row.phtml:33
 msgctxt "None for default"
 msgid "None"
 msgstr "Ništa"
@@ -15080,15 +15096,15 @@ msgstr "Napravi relaciju"
 msgid "Version %1$s was created, tracking for %2$s is active."
 msgstr ""
 
-#: libraries/user_preferences.inc.php:29
+#: libraries/user_preferences.inc.php:30
 msgid "Manage your settings"
 msgstr "Upravljanje podešavanjima"
 
-#: libraries/user_preferences.inc.php:46 prefs_manage.php:307
+#: libraries/user_preferences.inc.php:54 prefs_manage.php:307
 msgid "Configuration has been saved."
 msgstr "Konfiguracija je sačuvana."
 
-#: libraries/user_preferences.inc.php:66
+#: libraries/user_preferences.inc.php:74
 #, php-format
 msgid ""
 "Your preferences will be saved for current session only. Storing them "
@@ -15480,7 +15496,7 @@ msgid "first"
 msgstr ""
 
 #: templates/columns_definitions/move_column.phtml:12
-#: templates/structure/add_column.phtml:21
+#: templates/table/structure/add_column.phtml:21
 #, fuzzy, php-format
 #| msgid "After %s"
 msgid "after %s"
@@ -15561,221 +15577,327 @@ msgstr "Tranformacije čitača"
 msgid "Input transformation options"
 msgstr "Opcije transformacije"
 
-#: templates/designer/aggregate_query_panel.phtml:22
-#: templates/designer/options_panel.phtml:100
+#: templates/database/create_table.phtml:7
+#: templates/database/designer/side_menu.phtml:77
+#: templates/database/designer/side_menu.phtml:80
+msgid "Create table"
+msgstr "Napravi tabelu"
+
+#: templates/database/create_table.phtml:15
+msgid "Number of columns"
+msgstr "Broj kolona"
+
+#: templates/database/designer/aggregate_query_panel.phtml:22
+#: templates/database/designer/options_panel.phtml:100
 msgid "Aggregate"
 msgstr "Sakupi"
 
-#: templates/designer/aggregate_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:61
-#: templates/designer/options_panel.phtml:106
-#: templates/designer/options_panel.phtml:170
-#: templates/designer/where_query_panel.phtml:30
-#: templates/table/table_header.phtml:9
+#: templates/database/designer/aggregate_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:61
+#: templates/database/designer/options_panel.phtml:106
+#: templates/database/designer/options_panel.phtml:170
+#: templates/database/designer/where_query_panel.phtml:30
+#: templates/table/search/table_header.phtml:9
 msgid "Operator"
 msgstr "Operator"
 
-#: templates/designer/database_tables.phtml:29
+#: templates/database/designer/database_tables.phtml:29
 msgid "Toggle"
 msgstr ""
 
-#: templates/designer/database_tables.phtml:40
+#: templates/database/designer/database_tables.phtml:40
 #, fuzzy
 #| msgid "Database for user"
 msgid "See table structure"
 msgstr "Baza za korisnika"
 
-#: templates/designer/delete_relation_panel.phtml:21
+#: templates/database/designer/delete_relation_panel.phtml:21
 msgid "Delete relation"
 msgstr "Obriši relaciju"
 
-#: templates/designer/edit_delete_pages.phtml:7
+#: templates/database/designer/edit_delete_pages.phtml:7
 #, fuzzy
 #| msgid "Page titles"
 msgid "Page to open"
 msgstr "Naslovi strana"
 
-#: templates/designer/edit_delete_pages.phtml:7
+#: templates/database/designer/edit_delete_pages.phtml:7
 #, fuzzy
 #| msgid "Relation deleted"
 msgid "Page to delete"
 msgstr "Relacija obrisana"
 
-#: templates/designer/having_query_panel.phtml:90
-#: templates/designer/options_panel.phtml:63
-#: templates/designer/options_panel.phtml:229
-#: templates/designer/where_query_panel.phtml:59
+#: templates/database/designer/having_query_panel.phtml:90
+#: templates/database/designer/options_panel.phtml:63
+#: templates/database/designer/options_panel.phtml:229
+#: templates/database/designer/where_query_panel.phtml:59
 msgid "Except"
 msgstr "Izuzev"
 
-#: templates/designer/having_query_panel.phtml:102
-#: templates/designer/options_panel.phtml:75
-#: templates/designer/options_panel.phtml:241
-#: templates/designer/where_query_panel.phtml:71
+#: templates/database/designer/having_query_panel.phtml:102
+#: templates/database/designer/options_panel.phtml:75
+#: templates/database/designer/options_panel.phtml:241
+#: templates/database/designer/where_query_panel.phtml:71
 msgid "subquery"
 msgstr "podupit"
 
-#: templates/designer/new_relation_panel.phtml:22
-#: templates/designer/side_menu.phtml:84 templates/designer/side_menu.phtml:87
+#: templates/database/designer/new_relation_panel.phtml:22
+#: templates/database/designer/side_menu.phtml:84
+#: templates/database/designer/side_menu.phtml:87
 msgid "Create relation"
 msgstr "Napravi relaciju"
 
-#: templates/designer/options_panel.phtml:34
-#: templates/designer/options_panel.phtml:200
+#: templates/database/designer/options_panel.phtml:34
+#: templates/database/designer/options_panel.phtml:200
 msgid "Relation operator"
 msgstr "Operator relacije"
 
-#: templates/designer/options_panel.phtml:85
-#: templates/designer/rename_to_panel.phtml:23
+#: templates/database/designer/options_panel.phtml:85
+#: templates/database/designer/rename_to_panel.phtml:23
 msgid "Rename to"
 msgstr "Promeni ime u"
 
-#: templates/designer/options_panel.phtml:91
-#: templates/designer/rename_to_panel.phtml:31
+#: templates/database/designer/options_panel.phtml:91
+#: templates/database/designer/rename_to_panel.phtml:31
 msgid "New name"
 msgstr "Novo ime"
 
-#: templates/designer/page_save_as.phtml:4
+#: templates/database/designer/page_save_as.phtml:4
 #, fuzzy
 #| msgid "Export to selected page"
 msgid "Save to selected page"
 msgstr "Izvezi na izabranu stranu"
 
-#: templates/designer/page_save_as.phtml:5
+#: templates/database/designer/page_save_as.phtml:5
 #, fuzzy
 #| msgid "Create a page and export to it"
 msgid "Create a page and save to it"
 msgstr "Kreiraj stranu i izvezi na nju"
 
-#: templates/designer/page_save_as.phtml:26
+#: templates/database/designer/page_save_as.phtml:26
 #, fuzzy
 #| msgid "New page name: "
 msgid "New page name"
 msgstr "Ime nove strane: "
 
-#: templates/designer/page_selector.phtml:2
+#: templates/database/designer/page_selector.phtml:2
 msgid "Select page"
 msgstr "Izaberi stranu"
 
-#: templates/designer/query_details.phtml:10
+#: templates/database/designer/query_details.phtml:10
 msgid "Active options"
 msgstr "Aktivne opcije"
 
-#: templates/designer/schema_export.phtml:4
+#: templates/database/designer/schema_export.phtml:4
 msgid "Select Export Relational Type"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:19 templates/designer/side_menu.phtml:25
+#: templates/database/designer/side_menu.phtml:19
+#: templates/database/designer/side_menu.phtml:25
 #, fuzzy
 #| msgid "Showing tables"
 msgid "Show/Hide tables list"
 msgstr "Prikazivanje tabela"
 
-#: templates/designer/side_menu.phtml:29 templates/designer/side_menu.phtml:35
-#: templates/designer/side_menu.phtml:36
+#: templates/database/designer/side_menu.phtml:29
+#: templates/database/designer/side_menu.phtml:35
+#: templates/database/designer/side_menu.phtml:36
 msgid "View in fullscreen"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:34
+#: templates/database/designer/side_menu.phtml:34
 msgid "Exit fullscreen"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:41 templates/designer/side_menu.phtml:45
+#: templates/database/designer/side_menu.phtml:41
+#: templates/database/designer/side_menu.phtml:45
 #, fuzzy
 #| msgid "New name"
 msgid "New page"
 msgstr "Novo ime"
 
-#: templates/designer/side_menu.phtml:70 templates/designer/side_menu.phtml:73
+#: templates/database/designer/side_menu.phtml:70
+#: templates/database/designer/side_menu.phtml:73
 #, fuzzy
 #| msgid "Select page"
 msgid "Delete pages"
 msgstr "Izaberi stranu"
 
-#: templates/designer/side_menu.phtml:77 templates/designer/side_menu.phtml:80
-#: templates/table/create_table.phtml:7
-msgid "Create table"
-msgstr "Napravi tabelu"
-
-#: templates/designer/side_menu.phtml:98
-#: templates/designer/side_menu.phtml:101
+#: templates/database/designer/side_menu.phtml:98
+#: templates/database/designer/side_menu.phtml:101
 msgid "Reload"
 msgstr "Ponovo učitaj"
 
-#: templates/designer/side_menu.phtml:107
-#: templates/designer/side_menu.phtml:110
+#: templates/database/designer/side_menu.phtml:107
+#: templates/database/designer/side_menu.phtml:110
 msgid "Help"
 msgstr "Pomoć"
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Angular links"
 msgstr "Uglaste veze"
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Direct links"
 msgstr "Direktne veze"
 
-#: templates/designer/side_menu.phtml:122
-#: templates/designer/side_menu.phtml:124
+#: templates/database/designer/side_menu.phtml:122
+#: templates/database/designer/side_menu.phtml:124
 msgid "Snap to grid"
 msgstr "Drži se mreže"
 
-#: templates/designer/side_menu.phtml:128
-#: templates/designer/side_menu.phtml:134
+#: templates/database/designer/side_menu.phtml:128
+#: templates/database/designer/side_menu.phtml:134
 msgid "Small/Big All"
 msgstr "Sve malo/veliko"
 
-#: templates/designer/side_menu.phtml:138
-#: templates/designer/side_menu.phtml:141
+#: templates/database/designer/side_menu.phtml:138
+#: templates/database/designer/side_menu.phtml:141
 msgid "Toggle small/big"
 msgstr "Promeni malo/veliko"
 
-#: templates/designer/side_menu.phtml:145
-#: templates/designer/side_menu.phtml:148
+#: templates/database/designer/side_menu.phtml:145
+#: templates/database/designer/side_menu.phtml:148
 msgid "Toggle relation lines"
 msgstr "Zameni linije relacije"
 
-#: templates/designer/side_menu.phtml:153
-#: templates/designer/side_menu.phtml:156
+#: templates/database/designer/side_menu.phtml:153
+#: templates/database/designer/side_menu.phtml:156
 #, fuzzy
 #| msgid "Export"
 msgid "Export schema"
 msgstr "Izvoz"
 
-#: templates/designer/side_menu.phtml:165
-#: templates/designer/side_menu.phtml:168
+#: templates/database/designer/side_menu.phtml:165
+#: templates/database/designer/side_menu.phtml:168
 msgid "Build Query"
 msgstr "Napravi upit"
 
-#: templates/designer/side_menu.phtml:173
-#: templates/designer/side_menu.phtml:177
+#: templates/database/designer/side_menu.phtml:173
+#: templates/database/designer/side_menu.phtml:177
 msgid "Move Menu"
 msgstr "Premesti meni"
 
-#: templates/designer/side_menu.phtml:181
-#: templates/designer/side_menu.phtml:186
+#: templates/database/designer/side_menu.phtml:181
+#: templates/database/designer/side_menu.phtml:186
 #, fuzzy
 #| msgid "Partial texts"
 msgid "Pin text"
 msgstr "Parcijalni tekstovi"
 
-#: templates/designer/table_list.phtml:4
+#: templates/database/designer/table_list.phtml:4
 msgid "Hide/Show all"
 msgstr "Sakrij/prikaži sve"
 
-#: templates/designer/table_list.phtml:14
+#: templates/database/designer/table_list.phtml:14
 msgid "Hide/Show Tables with no relation"
 msgstr "Sakrij/prikaži tabele bez relacija"
 
-#: templates/designer/table_list.phtml:59
+#: templates/database/designer/table_list.phtml:59
 #, fuzzy
 #| msgid "Number of tables"
 msgid "Number of tables:"
 msgstr "Broj tabela"
 
+#: templates/database/structure/body_for_table_summary.phtml:6
+#, php-format
+msgid "%s table"
+msgid_plural "%s tables"
+msgstr[0] "%s tabela"
+msgstr[1] "%s tabele"
+msgstr[2] "%s tabela"
+
+#: templates/database/structure/body_for_table_summary.phtml:17
+msgid "Sum"
+msgstr "Ukupno"
+
+#: templates/database/structure/check_all_tables.phtml:6
+msgid "Check tables having overhead"
+msgstr "Proveri tabele koje imaju prekoračenja"
+
+#: templates/database/structure/check_all_tables.phtml:10
+#, fuzzy
+#| msgid "Show color"
+msgid "Show create"
+msgstr "Prikaži boju"
+
+#: templates/database/structure/check_all_tables.phtml:27
+msgid "Prefix"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:28
+msgid "Add prefix to table"
+msgstr "Dodaj prefix tabeli"
+
+#: templates/database/structure/check_all_tables.phtml:29
+msgid "Replace table prefix"
+msgstr "Zameni prefix tabele"
+
+#: templates/database/structure/check_all_tables.phtml:30
+msgid "Copy table with prefix"
+msgstr "Kopiraj tabelu sa prefiksom"
+
+#: templates/database/structure/check_all_tables.phtml:36
+#, fuzzy
+#| msgid "CHAR textarea columns"
+msgid "Add columns to central list"
+msgstr "CHAR textarea kolone"
+
+#: templates/database/structure/check_all_tables.phtml:37
+msgid "Remove columns from central list"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:38
+#, fuzzy
+#| msgid "CHAR textarea columns"
+msgid "Make consistent with central list"
+msgstr "CHAR textarea kolone"
+
+#: templates/database/structure/favorite_anchor.phtml:12
+#, fuzzy
+#| msgid "Add this series"
+msgid "Add to Favorites"
+msgstr "Dodaj ovu seriju podataka"
+
+#: templates/database/structure/show_create.phtml:2
+#, fuzzy
+#| msgid "Show SQL queries"
+msgid "Showing create queries"
+msgstr "Prikaži SQL upite"
+
+#: templates/database/structure/sortable_header.phtml:13
+msgid "Sort"
+msgstr "Sortiranje"
+
+#: templates/database/structure/table_header.phtml:42
+#, fuzzy
+#| msgid "May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]"
+msgid ""
+"May be approximate. Click on the number to get the exact count. See "
+"[doc@faq3-11]FAQ 3.11[/doc]."
+msgstr "Može biti približno. Vidite [doc@faq3-11]FAQ 3.11[/doc]"
+
+#: templates/database/structure/table_header.phtml:66
+#: templates/table/index_form.phtml:127
+msgid "Size"
+msgstr "Veličina"
+
+#: templates/database/structure/table_header.phtml:74
+#: templates/table/structure/display_table_stats.phtml:27
+msgid "Overhead"
+msgstr "Prekoračenje"
+
+#: templates/database/structure/tracking_icon.phtml:4
+msgid "Tracking is active."
+msgstr "Praćenje je aktivno."
+
+#: templates/database/structure/tracking_icon.phtml:8
+msgid "Tracking is not active."
+msgstr "Praćenje nije aktivno."
+
 #: templates/error/report_form.phtml:7
 msgid ""
 "phpMyAdmin has encountered an error. We have collected data about this error "
@@ -15791,67 +15913,6 @@ msgstr ""
 msgid "Please explain the steps that lead to the error:"
 msgstr ""
 
-#: templates/gis_visualization/gis_visualization.phtml:3
-msgid "Display GIS Visualization"
-msgstr ""
-
-#: templates/gis_visualization/gis_visualization.phtml:8
-msgid "Label column"
-msgstr "Označi kolonu"
-
-#: templates/gis_visualization/gis_visualization.phtml:11
-msgid "-- None --"
-msgstr ""
-
-#: templates/gis_visualization/gis_visualization.phtml:19
-msgid "Spatial column"
-msgstr "Prostorna kolona"
-
-#: templates/index_form.phtml:16
-msgid "Index name:"
-msgstr "Ime ključa :"
-
-#: templates/index_form.phtml:19
-msgid ""
-"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
-msgstr "\"PRIMARY\" <b>mora</b> biti ime <b>samo</b> primarnog ključa!"
-
-#: templates/index_form.phtml:40
-#, fuzzy
-#| msgid "Index name:"
-msgid "Index choice:"
-msgstr "Ime ključa :"
-
-#: templates/index_form.phtml:57
-msgid "Key block size:"
-msgstr ""
-
-#: templates/index_form.phtml:74
-msgid "Index type:"
-msgstr "Tip ključa :"
-
-#: templates/index_form.phtml:86
-#, fuzzy
-#| msgid "User"
-msgid "Parser:"
-msgstr "Korisnik"
-
-#: templates/index_form.phtml:102
-#, fuzzy
-#| msgid "Comment"
-msgid "Comment:"
-msgstr "Komentar"
-
-#: templates/index_form.phtml:127 templates/structure/table_header.phtml:66
-msgid "Size"
-msgstr "Veličina"
-
-#: templates/index_form.phtml:149 templates/index_form.phtml:190
-#, fuzzy
-#| msgid "Drag to reorder"
-msgid "Drag to reorder"
-msgstr "Povucite da bi ste promenili redosled"
-
 #: templates/prefs_autoload.phtml:9
 msgid ""
 "Your browser has phpMyAdmin configuration for this domain. Would you like to "
@@ -15864,464 +15925,426 @@ msgstr ""
 msgid "Start row:"
 msgstr "Početni red"
 
-#: templates/structure/actions_in_table_structure.phtml:14
-#, php-format
-msgid "A primary key has been added on %s."
-msgstr "Primarni ključ je upravo dodat %s."
-
-#: templates/structure/actions_in_table_structure.phtml:34
-#: templates/structure/actions_in_table_structure.phtml:54
-#: templates/structure/actions_in_table_structure.phtml:79
-#: templates/structure/actions_in_table_structure.phtml:101
-#, php-format
-msgid "An index has been added on %s."
-msgstr "Ključ je upravo dodat %s."
-
-#: templates/structure/actions_in_table_structure.phtml:130
-#: templates/structure/check_all_table_column.phtml:59
-#, fuzzy
-#| msgid "Remove column(s)"
-msgid "Remove from central columns"
-msgstr "Ukloni kolonu(e)"
-
-#: templates/structure/actions_in_table_structure.phtml:138
-#: templates/structure/check_all_table_column.phtml:55
-#, fuzzy
-#| msgid "CHAR textarea columns"
-msgid "Add to central columns"
-msgstr "CHAR textarea kolone"
-
-#: templates/structure/add_column.phtml:7
-#, php-format
-msgid "Add %s column(s)"
-msgstr "Dodaj %s kolona"
-
-#: templates/structure/add_column.phtml:12
-#, fuzzy
-#| msgid "At Beginning of Table"
-msgid "at beginning of table"
-msgstr "Na početku tabele"
-
-#: templates/structure/body_for_table_summary.phtml:6
-#, php-format
-msgid "%s table"
-msgid_plural "%s tables"
-msgstr[0] "%s tabela"
-msgstr[1] "%s tabele"
-msgstr[2] "%s tabela"
-
-#: templates/structure/body_for_table_summary.phtml:17
-msgid "Sum"
-msgstr "Ukupno"
-
-#: templates/structure/check_all_tables.phtml:6
-msgid "Check tables having overhead"
-msgstr "Proveri tabele koje imaju prekoračenja"
-
-#: templates/structure/check_all_tables.phtml:10
-#, fuzzy
-#| msgid "Show color"
-msgid "Show create"
-msgstr "Prikaži boju"
-
-#: templates/structure/check_all_tables.phtml:27
-msgid "Prefix"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:28
-msgid "Add prefix to table"
-msgstr "Dodaj prefix tabeli"
-
-#: templates/structure/check_all_tables.phtml:29
-msgid "Replace table prefix"
-msgstr "Zameni prefix tabele"
-
-#: templates/structure/check_all_tables.phtml:30
-msgid "Copy table with prefix"
-msgstr "Kopiraj tabelu sa prefiksom"
-
-#: templates/structure/check_all_tables.phtml:36
-#, fuzzy
-#| msgid "CHAR textarea columns"
-msgid "Add columns to central list"
-msgstr "CHAR textarea kolone"
-
-#: templates/structure/check_all_tables.phtml:37
-msgid "Remove columns from central list"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:38
-#, fuzzy
-#| msgid "CHAR textarea columns"
-msgid "Make consistent with central list"
-msgstr "CHAR textarea kolone"
-
-#: templates/structure/display_structure.phtml:140 view_create.php:181
-msgid "Edit view"
-msgstr "Uredi pogled"
-
-#: templates/structure/display_table_stats.phtml:9
-msgid "Space usage"
-msgstr "Zauzeće"
-
-#: templates/structure/display_table_stats.phtml:27
-#: templates/structure/table_header.phtml:74
-msgid "Overhead"
-msgstr "Prekoračenje"
-
-#: templates/structure/display_table_stats.phtml:32
-msgid "Effective"
-msgstr "Efektivne"
-
-#: templates/structure/favorite_anchor.phtml:12
-#, fuzzy
-#| msgid "Add this series"
-msgid "Add to Favorites"
-msgstr "Dodaj ovu seriju podataka"
-
-#: templates/structure/move_columns_dialog.phtml:1
-#: templates/structure/optional_action_links.phtml:21
-#, fuzzy
-#| msgid "Add %s field(s)"
-msgid "Move columns"
-msgstr "Dodaj %s polja"
-
-#: templates/structure/move_columns_dialog.phtml:2
-msgid "Move the columns by dragging them up and down."
-msgstr ""
-
-#: templates/structure/optional_action_links.phtml:9
-msgid "Propose table structure"
-msgstr "Predloži strukturu tabele"
-
-#: templates/structure/optional_action_links.phtml:24
-#, fuzzy
-#| msgid "Propose table structure"
-msgid "Improve table structure"
-msgstr "Predloži strukturu tabele"
-
-#: templates/structure/optional_action_links.phtml:30
-#, fuzzy
-#| msgid "Track table"
-msgid "Track view"
-msgstr "Prati tabelu"
-
-#: templates/structure/row_stats_table.phtml:3
-#, fuzzy
-#| msgid "Row Statistics"
-msgid "Row statistics"
-msgstr "Statistike reda"
-
-#: templates/structure/row_stats_table.phtml:9
-msgid "static"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:11
-msgid "dynamic"
-msgstr "dinamički"
-
-#: templates/structure/row_stats_table.phtml:22
-msgid "partitioned"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:54
-msgid "Row length"
-msgstr "Dužina reda"
-
-#: templates/structure/row_stats_table.phtml:66
-msgid "Row size"
-msgstr "Veličina reda"
-
-#: templates/structure/row_stats_table.phtml:73
-msgid "Next autoindex"
-msgstr ""
-
-#: templates/structure/secondary_tabs.phtml:14
-#, fuzzy
-#| msgid "Relation view"
-msgid "Relation view"
-msgstr "Relacioni pogled"
-
-#: templates/structure/show_create.phtml:2
-#, fuzzy
-#| msgid "Show SQL queries"
-msgid "Showing create queries"
-msgstr "Prikaži SQL upite"
-
-#: templates/structure/sortable_header.phtml:13
-msgid "Sort"
-msgstr "Sortiranje"
-
-#: templates/structure/table_header.phtml:42
-#, fuzzy
-#| msgid "May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]"
-msgid ""
-"May be approximate. Click on the number to get the exact count. See "
-"[doc@faq3-11]FAQ 3.11[/doc]."
-msgstr "Može biti približno. Vidite [doc@faq3-11]FAQ 3.11[/doc]"
-
-#: templates/structure/table_structure_row.phtml:46
-#, php-format
-msgid "Column %s has been dropped."
-msgstr "Kolona %s je obrisana."
-
-#: templates/structure/tracking_icon.phtml:4
-msgid "Tracking is active."
-msgstr "Praćenje je aktivno."
-
-#: templates/structure/tracking_icon.phtml:8
-msgid "Tracking is not active."
-msgstr "Praćenje nije aktivno."
-
-#: templates/table/create_table.phtml:15
-msgid "Number of columns"
-msgstr "Broj kolona"
-
-#: templates/table/options.phtml:8
-msgid "Select columns (at least one):"
-msgstr "Izaberi kolone (najmanje jednu):"
-
-#: templates/table/options.phtml:37
-msgid "Add search conditions (body of the \"where\" clause):"
-msgstr "Dodaj uslove pretraživanja (deo \"WHERE\" upita):"
-
-#: templates/table/options.phtml:45
-msgid "Number of rows per page"
-msgstr "Broj redova po strani"
-
-#: templates/table/options.phtml:56
-msgid "Display order:"
-msgstr "Redosled prikaza:"
-
-#: templates/table/options_zoom.phtml:6
-msgid "Use this column to label each point"
-msgstr ""
-
-#: templates/table/options_zoom.phtml:35
-msgid "Maximum rows to plot"
-msgstr ""
-
-#: templates/table/replace_preview.phtml:13
-msgid "Find and replace - preview"
-msgstr ""
-
-#: templates/table/replace_preview.phtml:18
-#, fuzzy
-#| msgid "Original position"
-msgid "Original string"
-msgstr "Originalna pozicija"
-
-#: templates/table/replace_preview.phtml:19
-#, fuzzy
-#| msgid "Related Links"
-msgid "Replaced string"
-msgstr "Srodne veze"
-
-#: templates/table/replace_preview.phtml:40
-#, fuzzy
-#| msgid "Replicated"
-msgid "Replace"
-msgstr "Replikovano"
-
-#: templates/table/rows_zoom.phtml:16
-msgid "Additional search criteria"
-msgstr "Dodatni kreterijum za pretragu"
-
-#: templates/table/search_and_replace.phtml:3
-#, fuzzy
-#| msgid "Replace NULL with:"
-msgid "Replace with:"
-msgstr "Zameni NULL sa:"
-
-#: templates/table/search_and_replace.phtml:22
-#, fuzzy
-#| msgid "as regular expression"
-msgid "Use regular expression"
-msgstr "kao regularni izraz"
-
-#: templates/table/selection_form.phtml:12
-msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
-msgstr "Napravi \"upit po primeru\" (džoker: \"%\") za dve različite kolone"
-
-#: templates/table/selection_form.phtml:34
-msgid "Do a \"query by example\" (wildcard: \"%\")"
-msgstr "Napravi \"upit po primeru\" (džoker: \"%\")"
-
-#: templates/table/zoom_result_form.phtml:7
-msgid "Browse/Edit the points"
-msgstr ""
-
-#: templates/table/zoom_result_form.phtml:15
-msgid "How to use"
-msgstr "Kako se koristi"
-
-#: templates/table/zoom_result_form.phtml:23
-msgid "Reset zoom"
-msgstr "Poništi zumiranje"
-
-#: templates/tbl_chart.phtml:17
+#: templates/table/chart/tbl_chart.phtml:17
 msgctxt "Chart type"
 msgid "Bar"
 msgstr "Traka"
 
-#: templates/tbl_chart.phtml:21
+#: templates/table/chart/tbl_chart.phtml:21
 msgctxt "Chart type"
 msgid "Column"
 msgstr "Kolona"
 
-#: templates/tbl_chart.phtml:25
+#: templates/table/chart/tbl_chart.phtml:25
 msgctxt "Chart type"
 msgid "Line"
 msgstr ""
 
-#: templates/tbl_chart.phtml:29
+#: templates/table/chart/tbl_chart.phtml:29
 msgctxt "Chart type"
 msgid "Spline"
 msgstr "Kriva"
 
-#: templates/tbl_chart.phtml:33
+#: templates/table/chart/tbl_chart.phtml:33
 msgctxt "Chart type"
 msgid "Area"
 msgstr ""
 
-#: templates/tbl_chart.phtml:37
+#: templates/table/chart/tbl_chart.phtml:37
 msgctxt "Chart type"
 msgid "Pie"
 msgstr "Kružni grafikon"
 
-#: templates/tbl_chart.phtml:41
+#: templates/table/chart/tbl_chart.phtml:41
 #, fuzzy
 #| msgid "Time"
 msgctxt "Chart type"
 msgid "Timeline"
 msgstr "Vreme"
 
-#: templates/tbl_chart.phtml:45
+#: templates/table/chart/tbl_chart.phtml:45
 msgctxt "Chart type"
 msgid "Scatter"
 msgstr ""
 
-#: templates/tbl_chart.phtml:50
+#: templates/table/chart/tbl_chart.phtml:50
 msgid "Stacked"
 msgstr ""
 
-#: templates/tbl_chart.phtml:53
+#: templates/table/chart/tbl_chart.phtml:53
 msgid "Chart title"
 msgstr "Naslov grafikona"
 
-#: templates/tbl_chart.phtml:57
+#: templates/table/chart/tbl_chart.phtml:57
 msgid "X-Axis:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:72
+#: templates/table/chart/tbl_chart.phtml:72
 msgid "Series:"
 msgstr "Serije podataka:"
 
-#: templates/tbl_chart.phtml:102
+#: templates/table/chart/tbl_chart.phtml:102
 msgid "X-Axis label:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:104
+#: templates/table/chart/tbl_chart.phtml:104
 msgid "X Values"
 msgstr "X vrednosti"
 
-#: templates/tbl_chart.phtml:107
+#: templates/table/chart/tbl_chart.phtml:107
 msgid "Y-Axis label:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:115
+#: templates/table/chart/tbl_chart.phtml:115
 msgid "Series names are in a column"
 msgstr ""
 
-#: templates/tbl_chart.phtml:118
+#: templates/table/chart/tbl_chart.phtml:118
 #, fuzzy
 #| msgid "Inside column:"
 msgid "Series column:"
 msgstr "Unutar kolone::"
 
-#: templates/tbl_chart.phtml:130
+#: templates/table/chart/tbl_chart.phtml:130
 #, fuzzy
 #| msgid "Values for column %s"
 msgid "Value Column:"
 msgstr "Vrednosti za kolonu %s"
 
-#: templates/tbl_chart.phtml:150
+#: templates/table/chart/tbl_chart.phtml:150
 #, fuzzy
 #| msgid "Save as file"
 msgid "Save chart as image"
 msgstr "Sačuvaj kao datoteku"
 
-#: templates/tbl_relation/common_form.phtml:7
+#: templates/table/gis_visualization/gis_visualization.phtml:3
+msgid "Display GIS Visualization"
+msgstr ""
+
+#: templates/table/gis_visualization/gis_visualization.phtml:8
+msgid "Label column"
+msgstr "Označi kolonu"
+
+#: templates/table/gis_visualization/gis_visualization.phtml:11
+msgid "-- None --"
+msgstr ""
+
+#: templates/table/gis_visualization/gis_visualization.phtml:19
+msgid "Spatial column"
+msgstr "Prostorna kolona"
+
+#: templates/table/index_form.phtml:16
+msgid "Index name:"
+msgstr "Ime ključa :"
+
+#: templates/table/index_form.phtml:19
+msgid ""
+"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
+msgstr "\"PRIMARY\" <b>mora</b> biti ime <b>samo</b> primarnog ključa!"
+
+#: templates/table/index_form.phtml:40
+#, fuzzy
+#| msgid "Index name:"
+msgid "Index choice:"
+msgstr "Ime ključa :"
+
+#: templates/table/index_form.phtml:57
+msgid "Key block size:"
+msgstr ""
+
+#: templates/table/index_form.phtml:74
+msgid "Index type:"
+msgstr "Tip ključa :"
+
+#: templates/table/index_form.phtml:86
+#, fuzzy
+#| msgid "User"
+msgid "Parser:"
+msgstr "Korisnik"
+
+#: templates/table/index_form.phtml:102
+#, fuzzy
+#| msgid "Comment"
+msgid "Comment:"
+msgstr "Komentar"
+
+#: templates/table/index_form.phtml:149 templates/table/index_form.phtml:190
+#, fuzzy
+#| msgid "Drag to reorder"
+msgid "Drag to reorder"
+msgstr "Povucite da bi ste promenili redosled"
+
+#: templates/table/relation/common_form.phtml:7
 msgid "Internal relations"
 msgstr "Unutrašnje relacije"
 
-#: templates/tbl_relation/common_form.phtml:11
+#: templates/table/relation/common_form.phtml:11
 msgid "Internal relation"
 msgstr "Unutrašnja relacija"
 
-#: templates/tbl_relation/common_form.phtml:14
+#: templates/table/relation/common_form.phtml:14
 msgid ""
 "An internal relation is not necessary when a corresponding FOREIGN KEY "
 "relation exists."
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:37
+#: templates/table/relation/common_form.phtml:37
 #, fuzzy
 #| msgid "Foreign key limit"
 msgid "Foreign key constraints"
 msgstr "Ograničenje stranog ključa"
 
-#: templates/tbl_relation/common_form.phtml:40
+#: templates/table/relation/common_form.phtml:40
 #, fuzzy
 #| msgid "Action"
 msgid "Actions"
 msgstr "Akcija"
 
-#: templates/tbl_relation/common_form.phtml:41
+#: templates/table/relation/common_form.phtml:41
 #, fuzzy
 #| msgid "Constraints for table"
 msgid "Constraint properties"
 msgstr "Ograničenja za tabele"
 
-#: templates/tbl_relation/common_form.phtml:44
+#: templates/table/relation/common_form.phtml:44
 msgid ""
 "Only columns with index will be displayed. You can define an index below."
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:49
+#: templates/table/relation/common_form.phtml:49
 msgid "Foreign key constraint"
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:81
+#: templates/table/relation/common_form.phtml:81
 #, fuzzy
 #| msgid "Add constraints"
 msgid "+ Add constraint"
 msgstr "Dodaj ograničenja"
 
-#: templates/tbl_relation/common_form.phtml:91
+#: templates/table/relation/common_form.phtml:91
 #, fuzzy
 #| msgid "Choose column to display"
 msgid "Choose column to display:"
 msgstr "Izaberi kolonu za prikaz"
 
-#: templates/tbl_relation/foreign_key_row.phtml:13
+#: templates/table/relation/foreign_key_row.phtml:13
 #, fuzzy, php-format
 #| msgid "Foreign key limit"
 msgid "Foreign key constraint %s has been dropped"
 msgstr "Ograničenje stranog ključa"
 
-#: templates/tbl_relation/foreign_key_row.phtml:102
+#: templates/table/relation/foreign_key_row.phtml:102
 #, fuzzy
 #| msgid "Constraints for table"
 msgid "Constraint name"
 msgstr "Ograničenja za tabele"
 
-#: templates/tbl_relation/foreign_key_row.phtml:157
+#: templates/table/relation/foreign_key_row.phtml:157
 #, fuzzy
 #| msgid "Add column"
 msgid "+ Add column"
 msgstr "Dodaj kolonu"
 
+#: templates/table/search/options.phtml:8
+msgid "Select columns (at least one):"
+msgstr "Izaberi kolone (najmanje jednu):"
+
+#: templates/table/search/options.phtml:37
+msgid "Add search conditions (body of the \"where\" clause):"
+msgstr "Dodaj uslove pretraživanja (deo \"WHERE\" upita):"
+
+#: templates/table/search/options.phtml:45
+msgid "Number of rows per page"
+msgstr "Broj redova po strani"
+
+#: templates/table/search/options.phtml:56
+msgid "Display order:"
+msgstr "Redosled prikaza:"
+
+#: templates/table/search/options_zoom.phtml:6
+msgid "Use this column to label each point"
+msgstr ""
+
+#: templates/table/search/options_zoom.phtml:35
+msgid "Maximum rows to plot"
+msgstr ""
+
+#: templates/table/search/replace_preview.phtml:13
+msgid "Find and replace - preview"
+msgstr ""
+
+#: templates/table/search/replace_preview.phtml:18
+#, fuzzy
+#| msgid "Original position"
+msgid "Original string"
+msgstr "Originalna pozicija"
+
+#: templates/table/search/replace_preview.phtml:19
+#, fuzzy
+#| msgid "Related Links"
+msgid "Replaced string"
+msgstr "Srodne veze"
+
+#: templates/table/search/replace_preview.phtml:40
+#, fuzzy
+#| msgid "Replicated"
+msgid "Replace"
+msgstr "Replikovano"
+
+#: templates/table/search/rows_zoom.phtml:16
+msgid "Additional search criteria"
+msgstr "Dodatni kreterijum za pretragu"
+
+#: templates/table/search/search_and_replace.phtml:3
+#, fuzzy
+#| msgid "Replace NULL with:"
+msgid "Replace with:"
+msgstr "Zameni NULL sa:"
+
+#: templates/table/search/search_and_replace.phtml:22
+#, fuzzy
+#| msgid "as regular expression"
+msgid "Use regular expression"
+msgstr "kao regularni izraz"
+
+#: templates/table/search/selection_form.phtml:12
+msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
+msgstr "Napravi \"upit po primeru\" (džoker: \"%\") za dve različite kolone"
+
+#: templates/table/search/selection_form.phtml:34
+msgid "Do a \"query by example\" (wildcard: \"%\")"
+msgstr "Napravi \"upit po primeru\" (džoker: \"%\")"
+
+#: templates/table/search/zoom_result_form.phtml:7
+msgid "Browse/Edit the points"
+msgstr ""
+
+#: templates/table/search/zoom_result_form.phtml:15
+msgid "How to use"
+msgstr "Kako se koristi"
+
+#: templates/table/search/zoom_result_form.phtml:23
+msgid "Reset zoom"
+msgstr "Poništi zumiranje"
+
+#: templates/table/secondary_tabs.phtml:14
+#, fuzzy
+#| msgid "Relation view"
+msgid "Relation view"
+msgstr "Relacioni pogled"
+
+#: templates/table/structure/actions_in_table_structure.phtml:14
+#, php-format
+msgid "A primary key has been added on %s."
+msgstr "Primarni ključ je upravo dodat %s."
+
+#: templates/table/structure/actions_in_table_structure.phtml:34
+#: templates/table/structure/actions_in_table_structure.phtml:54
+#: templates/table/structure/actions_in_table_structure.phtml:79
+#: templates/table/structure/actions_in_table_structure.phtml:101
+#, php-format
+msgid "An index has been added on %s."
+msgstr "Ključ je upravo dodat %s."
+
+#: templates/table/structure/actions_in_table_structure.phtml:130
+#: templates/table/structure/check_all_table_column.phtml:59
+#, fuzzy
+#| msgid "Remove column(s)"
+msgid "Remove from central columns"
+msgstr "Ukloni kolonu(e)"
+
+#: templates/table/structure/actions_in_table_structure.phtml:138
+#: templates/table/structure/check_all_table_column.phtml:55
+#, fuzzy
+#| msgid "CHAR textarea columns"
+msgid "Add to central columns"
+msgstr "CHAR textarea kolone"
+
+#: templates/table/structure/add_column.phtml:7
+#, php-format
+msgid "Add %s column(s)"
+msgstr "Dodaj %s kolona"
+
+#: templates/table/structure/add_column.phtml:12
+#, fuzzy
+#| msgid "At Beginning of Table"
+msgid "at beginning of table"
+msgstr "Na početku tabele"
+
+#: templates/table/structure/display_structure.phtml:140 view_create.php:181
+msgid "Edit view"
+msgstr "Uredi pogled"
+
+#: templates/table/structure/display_table_stats.phtml:9
+msgid "Space usage"
+msgstr "Zauzeće"
+
+#: templates/table/structure/display_table_stats.phtml:32
+msgid "Effective"
+msgstr "Efektivne"
+
+#: templates/table/structure/move_columns_dialog.phtml:1
+#: templates/table/structure/optional_action_links.phtml:21
+#, fuzzy
+#| msgid "Add %s field(s)"
+msgid "Move columns"
+msgstr "Dodaj %s polja"
+
+#: templates/table/structure/move_columns_dialog.phtml:2
+msgid "Move the columns by dragging them up and down."
+msgstr ""
+
+#: templates/table/structure/optional_action_links.phtml:9
+msgid "Propose table structure"
+msgstr "Predloži strukturu tabele"
+
+#: templates/table/structure/optional_action_links.phtml:24
+#, fuzzy
+#| msgid "Propose table structure"
+msgid "Improve table structure"
+msgstr "Predloži strukturu tabele"
+
+#: templates/table/structure/optional_action_links.phtml:30
+#, fuzzy
+#| msgid "Track table"
+msgid "Track view"
+msgstr "Prati tabelu"
+
+#: templates/table/structure/row_stats_table.phtml:3
+#, fuzzy
+#| msgid "Row Statistics"
+msgid "Row statistics"
+msgstr "Statistike reda"
+
+#: templates/table/structure/row_stats_table.phtml:9
+msgid "static"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:11
+msgid "dynamic"
+msgstr "dinamički"
+
+#: templates/table/structure/row_stats_table.phtml:22
+msgid "partitioned"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:54
+msgid "Row length"
+msgstr "Dužina reda"
+
+#: templates/table/structure/row_stats_table.phtml:66
+msgid "Row size"
+msgstr "Veličina reda"
+
+#: templates/table/structure/row_stats_table.phtml:73
+msgid "Next autoindex"
+msgstr ""
+
+#: templates/table/structure/table_structure_row.phtml:46
+#, php-format
+msgid "Column %s has been dropped."
+msgstr "Kolona %s je obrisana."
+
 #: themes.php:17 themes.php:22
 msgid "Theme"
 msgstr "Tema"
@@ -17509,6 +17532,11 @@ msgstr ""
 msgid "concurrent_insert is set to 0"
 msgstr "concurrent_insert je postavljeno na 0"
 
+#, fuzzy
+#~| msgid "Read misses"
+#~ msgid "Read as multibytes"
+#~ msgstr "Promašaji pri čitanju"
+
 #~ msgid "Relational display column"
 #~ msgstr "Relacioni prikaz kolone"
 
diff --git a/po/sv.po b/po/sv.po
index c73f1135a8..c00c9f6e2e 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 4.5.0-dev\n"
 "Report-Msgid-Bugs-To: developers@phpmyadmin.net\n"
-"POT-Creation-Date: 2015-08-08 13:53-0400\n"
+"POT-Creation-Date: 2015-08-12 08:10-0400\n"
 "PO-Revision-Date: 2014-12-29 15:37+0200\n"
 "Last-Translator: Anders Jonsson <anders.jonsson@norsjovallen.se>\n"
 "Language-Team: Swedish <https://hosted.weblate.org/projects/phpmyadmin/"
@@ -53,7 +53,7 @@ msgid "Table comments:"
 msgstr "Tabellkommentarer:"
 
 #: db_datadict.php:104 libraries/Index.class.php:699
-#: libraries/insert_edit.lib.php:1567
+#: libraries/insert_edit.lib.php:1565
 #: libraries/navigation/Nodes/Node_Column.class.php:30
 #: libraries/plugins/export/ExportHtmlword.class.php:280
 #: libraries/plugins/export/ExportHtmlword.class.php:375
@@ -67,13 +67,14 @@ msgstr "Tabellkommentarer:"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1023
 #: libraries/tracking.lib.php:879 libraries/tracking.lib.php:975
 #: templates/columns_definitions/column_name.phtml:18
-#: templates/index_form.phtml:124 templates/table/table_header.phtml:6
-#: templates/table/zoom_result_form.phtml:33
-#: templates/tbl_relation/common_form.phtml:10
-#: templates/tbl_relation/common_form.phtml:43
-#: templates/tbl_relation/foreign_key_row.phtml:194
-#: templates/tbl_relation/foreign_key_row.phtml:206
-#: templates/tbl_relation/internal_relational_row.phtml:71
+#: templates/table/index_form.phtml:124
+#: templates/table/relation/common_form.phtml:10
+#: templates/table/relation/common_form.phtml:43
+#: templates/table/relation/foreign_key_row.phtml:194
+#: templates/table/relation/foreign_key_row.phtml:206
+#: templates/table/relation/internal_relational_row.phtml:71
+#: templates/table/search/table_header.phtml:6
+#: templates/table/search/zoom_result_form.phtml:33
 msgid "Column"
 msgstr "Kolumn"
 
@@ -91,21 +92,21 @@ msgstr "Kolumn"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1001
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1024
 #: libraries/rte/rte_list.lib.php:75 libraries/rte/rte_list.lib.php:103
-#: libraries/rte/rte_routines.lib.php:802
-#: libraries/rte/rte_routines.lib.php:831
-#: libraries/rte/rte_routines.lib.php:1493
+#: libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_routines.lib.php:922
+#: libraries/rte/rte_routines.lib.php:1584
 #: libraries/server_privileges.lib.php:2369 libraries/tracking.lib.php:880
 #: libraries/tracking.lib.php:972
 #: templates/columns_definitions/table_fields_definitions.phtml:11
-#: templates/structure/table_header.phtml:48
-#: templates/structure/table_structure_header.phtml:6
-#: templates/table/table_header.phtml:7
+#: templates/database/structure/table_header.phtml:48
+#: templates/table/search/table_header.phtml:7
+#: templates/table/structure/table_structure_header.phtml:6
 msgid "Type"
 msgstr "Typ"
 
 #: db_datadict.php:106 libraries/Index.class.php:702
 #: libraries/central_columns.lib.php:708
-#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1576
+#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1574
 #: libraries/plugins/export/ExportHtmlword.class.php:286
 #: libraries/plugins/export/ExportHtmlword.class.php:381
 #: libraries/plugins/export/ExportLatex.class.php:509
@@ -118,8 +119,8 @@ msgstr "Typ"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1026
 #: libraries/tracking.lib.php:882 libraries/tracking.lib.php:978
 #: templates/columns_definitions/table_fields_definitions.phtml:39
-#: templates/structure/table_structure_header.phtml:9
-#: templates/table/zoom_result_form.phtml:34
+#: templates/table/search/zoom_result_form.phtml:34
+#: templates/table/structure/table_structure_header.phtml:9
 msgid "Null"
 msgstr "Null"
 
@@ -137,8 +138,8 @@ msgstr "Null"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1027
 #: libraries/replication_gui.lib.php:153 libraries/tracking.lib.php:883
 #: templates/columns_definitions/table_fields_definitions.phtml:25
-#: templates/structure/body_for_table_summary.phtml:55
-#: templates/structure/table_structure_header.phtml:10
+#: templates/database/structure/body_for_table_summary.phtml:55
+#: templates/table/structure/table_structure_header.phtml:10
 msgid "Default"
 msgstr "Standardvärde"
 
@@ -166,19 +167,19 @@ msgid "Comments"
 msgstr "Kommentarer"
 
 #: db_datadict.php:146
-#: libraries/controllers/StructureController.class.php:1960
-#: libraries/controllers/StructureController.class.php:1965
+#: libraries/controllers/TableStructureController.class.php:951
+#: libraries/controllers/TableStructureController.class.php:956
 #: libraries/tracking.lib.php:922
 #: templates/columns_definitions/column_indexes.phtml:6
-#: templates/structure/check_all_table_column.phtml:22
-#: templates/structure/display_structure.phtml:74
+#: templates/table/structure/check_all_table_column.phtml:22
+#: templates/table/structure/display_structure.phtml:74
 msgid "Primary"
 msgstr "Primär"
 
 #: db_datadict.php:156 js/messages.php:317 libraries/Index.class.php:567
 #: libraries/Index.class.php:606 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261 libraries/mult_submits.lib.php:403
+#: libraries/config/FormDisplay.tpl.php:272 libraries/mult_submits.lib.php:403
 #: libraries/mult_submits.lib.php:417
 #: libraries/plugins/export/ExportHtmlword.class.php:630
 #: libraries/plugins/export/ExportLatex.class.php:589
@@ -194,20 +195,20 @@ msgstr "Primär"
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1010 libraries/tracking.lib.php:1015
 #: prefs_manage.php:140 templates/prefs_autoload.phtml:15
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "No"
 msgstr "Nej"
 
 #: db_datadict.php:156 js/messages.php:443 libraries/Index.class.php:568
 #: libraries/Index.class.php:605 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261
-#: libraries/controllers/StructureController.class.php:1344
-#: libraries/controllers/StructureController.class.php:2223
-#: libraries/controllers/StructureController.class.php:2232
-#: libraries/controllers/StructureController.class.php:2237
-#: libraries/controllers/StructureController.class.php:2242
-#: libraries/controllers/StructureController.class.php:2247
+#: libraries/config/FormDisplay.tpl.php:272
+#: libraries/controllers/TableStructureController.class.php:539
+#: libraries/controllers/TableStructureController.class.php:1201
+#: libraries/controllers/TableStructureController.class.php:1210
+#: libraries/controllers/TableStructureController.class.php:1215
+#: libraries/controllers/TableStructureController.class.php:1220
+#: libraries/controllers/TableStructureController.class.php:1225
 #: libraries/mult_submits.inc.php:82 libraries/mult_submits.inc.php:178
 #: libraries/mult_submits.lib.php:339 libraries/mult_submits.lib.php:372
 #: libraries/mult_submits.lib.php:401 libraries/mult_submits.lib.php:415
@@ -216,8 +217,8 @@ msgstr "Nej"
 #: libraries/plugins/export/ExportOdt.class.php:756
 #: libraries/plugins/export/ExportTexytext.class.php:567
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1077
-#: libraries/server_databases.lib.php:464
-#: libraries/server_databases.lib.php:474
+#: libraries/server_databases.lib.php:475
+#: libraries/server_databases.lib.php:485
 #: libraries/server_privileges.lib.php:2546
 #: libraries/server_privileges.lib.php:2727
 #: libraries/server_privileges.lib.php:2748
@@ -227,7 +228,7 @@ msgstr "Nej"
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1008 libraries/tracking.lib.php:1013
 #: prefs_manage.php:138 templates/prefs_autoload.phtml:14
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "Yes"
 msgstr "Ja"
 
@@ -237,7 +238,7 @@ msgstr "Visa dump (schema) av databasen"
 
 #: db_export.php:37 db_tracking.php:90 export.php:382
 #: libraries/DBQbe.class.php:326
-#: libraries/controllers/StructureController.class.php:231
+#: libraries/controllers/DatabaseStructureController.class.php:170
 #: libraries/navigation/NavigationTree.class.php:897
 msgid "No tables found in database."
 msgstr "Inga tabeller funna i databasen."
@@ -248,14 +249,14 @@ msgstr "Inga tabeller funna i databasen."
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:26
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:120
-#: templates/structure/show_create.phtml:18
+#: templates/database/structure/show_create.phtml:18
 msgid "Tables"
 msgstr "Tabeller"
 
 #: db_export.php:52 libraries/Menu.class.php:317 libraries/Menu.class.php:425
-#: libraries/Util.class.php:3333 libraries/Util.class.php:3343
-#: libraries/Util.class.php:3349 libraries/Util.class.php:3629
-#: libraries/Util.class.php:4327 libraries/Util.class.php:4344
+#: libraries/Util.class.php:3339 libraries/Util.class.php:3349
+#: libraries/Util.class.php:3355 libraries/Util.class.php:3635
+#: libraries/Util.class.php:4333 libraries/Util.class.php:4350
 #: libraries/central_columns.lib.php:728 libraries/config.values.php:39
 #: libraries/config.values.php:47 libraries/config.values.php:109
 #: libraries/config.values.php:115 libraries/config/setup.forms.php:323
@@ -269,7 +270,7 @@ msgstr "Tabeller"
 #: libraries/navigation/Nodes/Node_Table.class.php:283
 #: libraries/server_privileges.lib.php:1141 libraries/tracking.lib.php:874
 #: templates/columns_definitions/table_fields_definitions.phtml:3
-#: templates/designer/table_list.phtml:28
+#: templates/database/designer/table_list.phtml:28
 msgid "Structure"
 msgstr "Struktur"
 
@@ -281,7 +282,7 @@ msgstr "Struktur"
 #: libraries/config/user_preferences.forms.php:292
 #: libraries/config/user_preferences.forms.php:297
 #: libraries/server_privileges.lib.php:1140
-#: templates/structure/display_table_stats.phtml:12
+#: templates/table/structure/display_table_stats.phtml:12
 msgid "Data"
 msgstr "Data"
 
@@ -362,10 +363,10 @@ msgstr "Spårade tabeller"
 #: libraries/server_privileges.lib.php:2908
 #: libraries/server_privileges.lib.php:3145
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4346
-#: templates/structure/table_header.phtml:21
-#: templates/tbl_relation/foreign_key_row.phtml:176
-#: templates/tbl_relation/internal_relational_row.phtml:63
+#: libraries/server_privileges.lib.php:4372
+#: templates/database/structure/table_header.phtml:21
+#: templates/table/relation/foreign_key_row.phtml:176
+#: templates/table/relation/internal_relational_row.phtml:63
 msgid "Table"
 msgstr "Tabell"
 
@@ -382,7 +383,7 @@ msgid "Updated"
 msgstr "Uppdaterad"
 
 #: db_tracking.php:130 js/messages.php:243 libraries/Menu.class.php:552
-#: libraries/Util.class.php:4314 libraries/config.values.php:104
+#: libraries/Util.class.php:4320 libraries/config.values.php:104
 #: libraries/rte/rte_events.lib.php:393 libraries/rte/rte_list.lib.php:101
 #: libraries/server_status_processes.lib.php:92 libraries/tracking.lib.php:279
 msgid "Status"
@@ -391,14 +392,15 @@ msgstr "Status"
 #: db_tracking.php:131 db_tracking.php:290 libraries/Index.class.php:693
 #: libraries/central_columns.lib.php:687 libraries/rte/rte_list.lib.php:74
 #: libraries/rte/rte_list.lib.php:89 libraries/rte/rte_list.lib.php:102
-#: libraries/server_databases.lib.php:398
+#: libraries/server_databases.lib.php:409
 #: libraries/server_privileges.lib.php:2372
 #: libraries/server_privileges.lib.php:3166
 #: libraries/server_privileges.lib.php:3342
 #: libraries/server_user_groups.lib.php:82
 #: libraries/server_variables.lib.php:189 libraries/tracking.lib.php:280
-#: libraries/tracking.lib.php:793 templates/structure/table_header.phtml:30
-#: templates/structure/table_structure_header.phtml:23
+#: libraries/tracking.lib.php:793
+#: templates/database/structure/table_header.phtml:30
+#: templates/table/structure/table_structure_header.phtml:23
 msgid "Action"
 msgstr "Åtgärd"
 
@@ -442,7 +444,7 @@ msgid "Untracked tables"
 msgstr "Ej spårade tabeller"
 
 #: db_tracking.php:305 db_tracking.php:336
-#: templates/structure/optional_action_links.phtml:17
+#: templates/table/structure/optional_action_links.phtml:17
 msgid "Track table"
 msgstr "Spåra tabell"
 
@@ -495,7 +497,7 @@ msgid "Value for the column \"%s\""
 msgstr "Värde för kolumn \"%s\""
 
 #: gis_data_editor.php:146
-#: templates/gis_visualization/gis_visualization.phtml:37
+#: templates/table/gis_visualization/gis_visualization.phtml:37
 msgid "Use OpenStreetMaps as Base Layer"
 msgstr "Använd OpenStreetMaps som baslager"
 
@@ -575,35 +577,35 @@ msgstr "Addera geometri"
 #: libraries/display_change_password.lib.php:162
 #: libraries/display_export.lib.php:402 libraries/display_export.lib.php:408
 #: libraries/display_import.lib.php:392 libraries/index.lib.php:44
-#: libraries/insert_edit.lib.php:1546 libraries/insert_edit.lib.php:1583
+#: libraries/insert_edit.lib.php:1544 libraries/insert_edit.lib.php:1581
 #: libraries/normalization.lib.php:165 libraries/normalization.lib.php:821
 #: libraries/operations.lib.php:38 libraries/operations.lib.php:108
 #: libraries/operations.lib.php:263 libraries/operations.lib.php:306
 #: libraries/operations.lib.php:801 libraries/operations.lib.php:874
 #: libraries/operations.lib.php:923 libraries/operations.lib.php:1337
 #: libraries/operations.lib.php:1658
-#: libraries/plugins/auth/AuthenticationCookie.class.php:244
+#: libraries/plugins/auth/AuthenticationCookie.class.php:232
 #: libraries/replication_gui.lib.php:122 libraries/replication_gui.lib.php:161
 #: libraries/replication_gui.lib.php:324 libraries/replication_gui.lib.php:461
 #: libraries/replication_gui.lib.php:906 libraries/rte/rte_events.lib.php:509
-#: libraries/rte/rte_routines.lib.php:969
-#: libraries/rte/rte_routines.lib.php:1581
+#: libraries/rte/rte_routines.lib.php:1060
+#: libraries/rte/rte_routines.lib.php:1672
 #: libraries/rte/rte_triggers.lib.php:396 libraries/server_bin_log.lib.php:61
 #: libraries/server_privileges.lib.php:705
 #: libraries/server_privileges.lib.php:2106
 #: libraries/server_privileges.lib.php:2872
 #: libraries/server_privileges.lib.php:3553
-#: libraries/server_privileges.lib.php:4627
+#: libraries/server_privileges.lib.php:4653
 #: libraries/server_user_groups.lib.php:285
 #: libraries/sql_query_form.lib.php:369 libraries/sql_query_form.lib.php:429
 #: libraries/tracking.lib.php:533 libraries/tracking.lib.php:653
 #: prefs_manage.php:277 prefs_manage.php:355
 #: templates/columns_definitions/column_definitions_form.phtml:59
-#: templates/header_location.phtml:17 templates/index_form.phtml:238
+#: templates/database/create_table.phtml:21 templates/header_location.phtml:28
 #: templates/startAndNumberOfRowsPanel.phtml:14
-#: templates/structure/add_column.phtml:25
-#: templates/table/create_table.phtml:21
-#: templates/table/selection_form.phtml:75 view_create.php:275
+#: templates/table/index_form.phtml:238
+#: templates/table/search/selection_form.phtml:75
+#: templates/table/structure/add_column.phtml:25 view_create.php:275
 #: view_operations.php:106
 msgid "Go"
 msgstr "Kör"
@@ -699,7 +701,7 @@ msgid "Could not load import plugins, please check your installation!"
 msgstr ""
 "Kunde inte läsa in insticksprogram för import, kontrollera din installation!"
 
-#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1466
+#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1460
 #, php-format
 msgid "Bookmark %s has been created."
 msgstr "Bokmärket %s har skapats."
@@ -741,11 +743,11 @@ msgstr ""
 msgid "Back"
 msgstr "Föregående"
 
-#: index.php:148 libraries/Footer.class.php:70
+#: index.php:149 libraries/Footer.class.php:70
 msgid "phpMyAdmin Demo Server"
 msgstr "Demoserver för phpMyAdmin"
 
-#: index.php:152
+#: index.php:153
 #, php-format
 msgid ""
 "You are using the demo server. You can do anything here, but please do not "
@@ -756,112 +758,112 @@ msgstr ""
 "användarna root, debian-sys-maint och pma. Mer information finns tillgänglig "
 "på %s."
 
-#: index.php:162
+#: index.php:163
 msgid "General Settings"
 msgstr "Allmänna inställningar"
 
-#: index.php:190 libraries/display_change_password.lib.php:50
+#: index.php:191 libraries/display_change_password.lib.php:50
 #: libraries/display_change_password.lib.php:53 user_password.php:247
 msgid "Change password"
 msgstr "Byt lösenord"
 
-#: index.php:206
+#: index.php:207
 msgid "Server connection collation"
 msgstr "Serveranslutning kollationering"
 
-#: index.php:228
+#: index.php:229
 msgid "Appearance Settings"
 msgstr "Inställningar för utseende"
 
-#: index.php:258 prefs_manage.php:285
+#: index.php:259 prefs_manage.php:285
 msgid "More settings"
 msgstr "Fler inställningar"
 
-#: index.php:279
+#: index.php:280
 msgid "Database server"
 msgstr "Databas-server"
 
-#: index.php:282 libraries/plugins/auth/AuthenticationCookie.class.php:181
+#: index.php:283 libraries/plugins/auth/AuthenticationCookie.class.php:169
 msgid "Server:"
 msgstr "Server:"
 
-#: index.php:286
+#: index.php:287
 msgid "Server type:"
 msgstr "Servertyp:"
 
-#: index.php:290 libraries/plugins/export/ExportLatex.class.php:212
+#: index.php:291 libraries/plugins/export/ExportLatex.class.php:212
 #: libraries/plugins/export/ExportSql.class.php:687
 #: libraries/plugins/export/ExportXml.class.php:189
 msgid "Server version:"
 msgstr "Serverversion:"
 
-#: index.php:296
+#: index.php:297
 msgid "Protocol version:"
 msgstr "Protokollversion:"
 
-#: index.php:300
+#: index.php:301
 msgid "User:"
 msgstr "Användare:"
 
-#: index.php:305
+#: index.php:306
 msgid "Server charset:"
 msgstr "Serverns teckenuppsättning:"
 
-#: index.php:320
+#: index.php:321
 msgid "Web server"
 msgstr "Webbserver"
 
-#: index.php:331
+#: index.php:332
 msgid "Database client version:"
 msgstr "Databasens klientversion:"
 
-#: index.php:335
+#: index.php:336
 msgid "PHP extension:"
 msgstr "PHP-tillägg:"
 
-#: index.php:349
+#: index.php:350
 #, fuzzy
 #| msgid "PHP Version:"
 msgid "PHP version:"
 msgstr "PHP-version:"
 
-#: index.php:360
+#: index.php:361
 msgid "Show PHP information"
 msgstr "Visa PHP-information"
 
-#: index.php:383
+#: index.php:384
 msgid "Version information:"
 msgstr "Versionsinformation:"
 
-#: index.php:392 libraries/Util.class.php:432 libraries/Util.class.php:495
-#: libraries/config/FormDisplay.tpl.php:151
+#: index.php:393 libraries/Util.class.php:432 libraries/Util.class.php:495
+#: libraries/config/FormDisplay.tpl.php:162
 #: libraries/display_export.lib.php:577 libraries/engines/pbxt.lib.php:162
 #: libraries/navigation/NavigationHeader.class.php:196
 #: libraries/server_variables.lib.php:160
 msgid "Documentation"
 msgstr "Dokumentation"
 
-#: index.php:399
+#: index.php:400
 msgid "Wiki"
 msgstr "Wiki"
 
-#: index.php:408
+#: index.php:409
 msgid "Official Homepage"
 msgstr "phpMyAdmin:s officiella hemsida"
 
-#: index.php:415
+#: index.php:416
 msgid "Contribute"
 msgstr "Bidra"
 
-#: index.php:422
+#: index.php:423
 msgid "Get support"
 msgstr "Få support"
 
-#: index.php:429
+#: index.php:430
 msgid "List of changes"
 msgstr "Lista över ändringar"
 
-#: index.php:451
+#: index.php:452
 #, fuzzy
 #| msgid ""
 #| "Your configuration file contains settings (root with no password) that "
@@ -879,7 +881,7 @@ msgstr ""
 "denna standard, är öppen för intrång, och du bör verkligen fixa detta "
 "säkerhetshål genom att ange ett lösenord för användare 'root'."
 
-#: index.php:468
+#: index.php:469
 msgid ""
 "You have enabled mbstring.func_overload in your PHP configuration. This "
 "option is incompatible with phpMyAdmin and might cause some data to be "
@@ -889,7 +891,7 @@ msgstr ""
 "alternativ är inkompatibelt med phpMyAdmin och kan leda till att data kan "
 "skadas!"
 
-#: index.php:483
+#: index.php:484
 msgid ""
 "The mbstring PHP extension was not found and you seem to be using a "
 "multibyte charset. Without the mbstring extension phpMyAdmin is unable to "
@@ -899,7 +901,7 @@ msgstr ""
 "flerbitars teckenuppsättning. phpMyAdmin kan inte dela upp strängar korrekt "
 "utan tillägget mbstring, vilket kan resultera i oväntade resultat."
 
-#: index.php:500
+#: index.php:501
 #, fuzzy
 #| msgid ""
 #| "Your PHP parameter [a@http://php.net/manual/en/session.configuration."
@@ -917,7 +919,7 @@ msgstr ""
 "giltighet konfigurerad i phpMyAdmin. På grund av detta kommer din inloggning "
 "upphöra tidigare än vad som är konfigurerat i phpMyAdmin."
 
-#: index.php:519
+#: index.php:520
 msgid ""
 "Login cookie store is lower than cookie validity configured in phpMyAdmin, "
 "because of this, your login will expire sooner than configured in phpMyAdmin."
@@ -926,11 +928,11 @@ msgstr ""
 "grund av detta kommer dina inloggningsuppgifter upphöra att gälla tidigare "
 "än konfigurerat i phpMyAdmin."
 
-#: index.php:535
+#: index.php:536
 msgid "The configuration file now needs a secret passphrase (blowfish_secret)."
 msgstr "Konfigurationsfilen behöver nu ett hemligt lösenord (blowfish_secret)."
 
-#: index.php:548
+#: index.php:549
 msgid ""
 "Directory [code]config[/code], which is used by the setup script, still "
 "exists in your phpMyAdmin directory. It is strongly recommended to remove it "
@@ -942,7 +944,7 @@ msgstr ""
 "den när phpMyAdmin har konfigurerats. I annat fall kan din servers säkerhet "
 "hotas av obehöriga som laddar ner din konfiguration."
 
-#: index.php:564
+#: index.php:565
 #, fuzzy, php-format
 #| msgid ""
 #| "The phpMyAdmin configuration storage is not completely configured, some "
@@ -954,12 +956,12 @@ msgstr ""
 "phpMyAdmin-konfigurationen är inte fullständigt konfigurerad, vissa utökade "
 "funktioner har inaktiverats. För att ta reda på varför klicka%shär%s."
 
-#: index.php:571
+#: index.php:572
 msgid ""
 "Or alternately go to 'Operations' tab of any database to set it up there."
 msgstr ""
 
-#: index.php:620
+#: index.php:621
 #, php-format
 msgid ""
 "Your PHP MySQL library version %s differs from your MySQL server version %s. "
@@ -968,7 +970,7 @@ msgstr ""
 "Din PHP MySQL bibliotekversion %s skiljer sig från din MySQL server version "
 "%s. Detta kan orsaka oförutsägbara beteenden."
 
-#: index.php:648
+#: index.php:649
 #, php-format
 msgid ""
 "Server running with Suhosin. Please refer to %sdocumentation%s for possible "
@@ -1133,8 +1135,8 @@ msgstr ""
 msgid "Save & Close"
 msgstr "Spara som fil"
 
-#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:404
-#: libraries/insert_edit.lib.php:1550 prefs_manage.php:361
+#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:415
+#: libraries/insert_edit.lib.php:1548 prefs_manage.php:361
 #: prefs_manage.php:372
 msgid "Reset"
 msgstr "Återställ"
@@ -1169,7 +1171,7 @@ msgstr "Addera index"
 msgid "Edit Index"
 msgstr "Redigera index"
 
-#: js/messages.php:99 templates/index_form.phtml:232
+#: js/messages.php:99 templates/table/index_form.phtml:232
 #, php-format
 msgid "Add %s column(s) to index"
 msgstr "Lägg till %s kolumn(er) till index"
@@ -1198,13 +1200,14 @@ msgstr "Kolumner omges av:"
 msgid "Please select column(s) for the index."
 msgstr "Lägg till %s kolumn(er) till index"
 
-#: js/messages.php:106 templates/structure/add_column.phtml:1
+#: js/messages.php:106 templates/table/structure/add_column.phtml:1
 msgid "You have to add at least one column."
 msgstr "Du måste lägga till åtminstone en kolumn."
 
-#: js/messages.php:109 libraries/insert_edit.lib.php:1548
+#: js/messages.php:109 libraries/insert_edit.lib.php:1546
 #: templates/columns_definitions/column_definitions_form.phtml:162
-#: templates/index_form.phtml:237 templates/tbl_relation/common_form.phtml:106
+#: templates/table/index_form.phtml:237
+#: templates/table/relation/common_form.phtml:106
 msgid "Preview SQL"
 msgstr ""
 
@@ -1225,7 +1228,7 @@ msgid "SQL query:"
 msgstr "SQL-fråga:"
 
 #. l10n: Default label for the y-Axis of Charts
-#: js/messages.php:118 templates/tbl_chart.phtml:109
+#: js/messages.php:118 templates/table/chart/tbl_chart.phtml:109
 msgid "Y Values"
 msgstr "Y-värden"
 
@@ -1386,7 +1389,7 @@ msgstr "Antal bitar som skickats"
 msgid "Bytes received"
 msgstr "Antal mottagna bital"
 
-#: js/messages.php:169 libraries/server_status.lib.php:226
+#: js/messages.php:169 libraries/server_status.lib.php:235
 msgid "Connections"
 msgstr "Anslutningar"
 
@@ -1443,12 +1446,12 @@ msgstr "%d tabell(er)"
 msgid "Questions"
 msgstr "Frågor"
 
-#: js/messages.php:184 libraries/server_status.lib.php:134
+#: js/messages.php:184 libraries/server_status.lib.php:143
 msgid "Traffic"
 msgstr "Trafik"
 
 #: js/messages.php:185 libraries/Menu.class.php:586
-#: libraries/Util.class.php:4318 libraries/server_status_monitor.lib.php:257
+#: libraries/Util.class.php:4324 libraries/server_status_monitor.lib.php:257
 msgid "Settings"
 msgstr "Inställningar"
 
@@ -1468,8 +1471,9 @@ msgstr "Lägg till minst en variabel till serien!"
 #: libraries/server_status_monitor.lib.php:236
 #: libraries/server_status_processes.lib.php:308
 #: templates/columns_definitions/transformation.phtml:4
-#: templates/designer/options_panel.phtml:178
-#: templates/table/options_zoom.phtml:12 templates/table/rows_zoom.phtml:26
+#: templates/database/designer/options_panel.phtml:178
+#: templates/table/search/options_zoom.phtml:12
+#: templates/table/search/rows_zoom.phtml:26
 msgid "None"
 msgstr "Inget"
 
@@ -1755,8 +1759,8 @@ msgstr ""
 
 #: js/messages.php:270 libraries/Menu.class.php:352
 #: libraries/Menu.class.php:455 libraries/Menu.class.php:582
-#: libraries/Util.class.php:4317 libraries/Util.class.php:4332
-#: libraries/Util.class.php:4349 libraries/config/messages.inc.php:258
+#: libraries/Util.class.php:4323 libraries/Util.class.php:4338
+#: libraries/Util.class.php:4355 libraries/config/messages.inc.php:258
 #: libraries/display_import.lib.php:105
 #: libraries/server_status_monitor.lib.php:318 prefs_manage.php:238
 #: setup/frames/menu.inc.php:26
@@ -1816,13 +1820,13 @@ msgid "Formatting SQL..."
 msgstr ""
 
 #: js/messages.php:293 libraries/server_variables.lib.php:157
-#: templates/designer/aggregate_query_panel.phtml:63
-#: templates/designer/delete_relation_panel.phtml:28
-#: templates/designer/having_query_panel.phtml:117
-#: templates/designer/new_relation_panel.phtml:88
-#: templates/designer/options_panel.phtml:253
-#: templates/designer/rename_to_panel.phtml:45
-#: templates/designer/where_query_panel.phtml:83
+#: templates/database/designer/aggregate_query_panel.phtml:63
+#: templates/database/designer/delete_relation_panel.phtml:28
+#: templates/database/designer/having_query_panel.phtml:117
+#: templates/database/designer/new_relation_panel.phtml:88
+#: templates/database/designer/options_panel.phtml:253
+#: templates/database/designer/rename_to_panel.phtml:45
+#: templates/database/designer/where_query_panel.phtml:83
 msgid "Cancel"
 msgstr "Avbryt"
 
@@ -1832,7 +1836,7 @@ msgstr "Avbryt"
 msgid "Page-related settings"
 msgstr "Ändra inställningar"
 
-#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:402
+#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:413
 msgid "Apply"
 msgstr "Verkställ"
 
@@ -1869,8 +1873,8 @@ msgstr "Felkod: %s"
 msgid "Error text: %s"
 msgstr "Felmeddelande: %s"
 
-#: js/messages.php:307 libraries/db_common.inc.php:68
-#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:450
+#: js/messages.php:307 libraries/db_common.inc.php:69
+#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:461
 msgid "No databases selected."
 msgstr "Inga databaser markerade."
 
@@ -1882,12 +1886,13 @@ msgstr "Tar bort kolumn"
 msgid "Adding Primary Key"
 msgstr "Lägger till primär nyckel"
 
-#: js/messages.php:310 templates/designer/aggregate_query_panel.phtml:59
-#: templates/designer/having_query_panel.phtml:113
-#: templates/designer/new_relation_panel.phtml:87
-#: templates/designer/options_panel.phtml:252
-#: templates/designer/rename_to_panel.phtml:41
-#: templates/designer/where_query_panel.phtml:82
+#: js/messages.php:310
+#: templates/database/designer/aggregate_query_panel.phtml:59
+#: templates/database/designer/having_query_panel.phtml:113
+#: templates/database/designer/new_relation_panel.phtml:87
+#: templates/database/designer/options_panel.phtml:252
+#: templates/database/designer/rename_to_panel.phtml:41
+#: templates/database/designer/where_query_panel.phtml:82
 msgid "OK"
 msgstr "OK"
 
@@ -1907,7 +1912,7 @@ msgstr "Kopierar databas"
 msgid "Changing Charset"
 msgstr "Ändrar teckenuppsättning"
 
-#: js/messages.php:320 libraries/Util.class.php:3217
+#: js/messages.php:320 libraries/Util.class.php:3223
 #, fuzzy
 #| msgid "Disable foreign key checks"
 msgid "Enable foreign key checks"
@@ -1947,20 +1952,21 @@ msgstr ""
 #: js/messages.php:334 libraries/DisplayResults.class.php:4834
 #: libraries/DisplayResults.class.php:5092 libraries/Menu.class.php:344
 #: libraries/Menu.class.php:446 libraries/Menu.class.php:578
-#: libraries/Util.class.php:3636 libraries/Util.class.php:3637
-#: libraries/Util.class.php:4316 libraries/Util.class.php:4331
-#: libraries/Util.class.php:4348 libraries/config/messages.inc.php:252
+#: libraries/Util.class.php:3642 libraries/Util.class.php:3643
+#: libraries/Util.class.php:4322 libraries/Util.class.php:4337
+#: libraries/Util.class.php:4354 libraries/config/messages.inc.php:252
 #: libraries/display_export.lib.php:173 libraries/rte/rte_list.lib.php:146
 #: libraries/server_privileges.lib.php:2211
 #: libraries/server_privileges.lib.php:2290
 #: libraries/server_privileges.lib.php:2632
 #: libraries/server_privileges.lib.php:3356
 #: libraries/server_status_monitor.lib.php:322 prefs_manage.php:303
-#: setup/frames/menu.inc.php:27 templates/structure/check_all_tables.phtml:11
+#: setup/frames/menu.inc.php:27
+#: templates/database/structure/check_all_tables.phtml:11
 msgid "Export"
 msgstr "Exportera"
 
-#: js/messages.php:337 libraries/rte/rte_routines.lib.php:652
+#: js/messages.php:337 libraries/rte/rte_routines.lib.php:743
 msgid "ENUM/SET editor"
 msgstr "ENUM/SET editor"
 
@@ -1999,7 +2005,7 @@ msgstr "Visa frågerutan"
 #: libraries/Console.class.php:214 libraries/DisplayResults.class.php:3474
 #: libraries/DisplayResults.class.php:4818 libraries/Index.class.php:723
 #: libraries/Util.class.php:706 libraries/Util.class.php:1202
-#: libraries/Util.class.php:3634 libraries/Util.class.php:3635
+#: libraries/Util.class.php:3640 libraries/Util.class.php:3641
 #: libraries/central_columns.lib.php:851
 #: libraries/central_columns.lib.php:1193
 #: libraries/config/messages.inc.php:892
@@ -2017,7 +2023,7 @@ msgstr "Redigera"
 #: libraries/server_user_groups.lib.php:129
 #: libraries/sql_query_form.lib.php:416 libraries/tracking.lib.php:477
 #: setup/frames/index.inc.php:183 setup/frames/index.inc.php:291
-#: templates/designer/delete_relation_panel.phtml:27
+#: templates/database/designer/delete_relation_panel.phtml:27
 msgid "Delete"
 msgstr "Radera"
 
@@ -2197,11 +2203,11 @@ msgid "No dependencies selected!"
 msgstr "Inga databaser markerade."
 
 #: js/messages.php:394 libraries/central_columns.lib.php:1214
-#: libraries/insert_edit.lib.php:1458 libraries/server_variables.lib.php:155
+#: libraries/insert_edit.lib.php:1456 libraries/server_variables.lib.php:155
 #: setup/frames/config.inc.php:42 setup/frames/index.inc.php:279
 #: templates/columns_definitions/column_definitions_form.phtml:165
-#: templates/gis_visualization/gis_visualization.phtml:48
-#: templates/tbl_relation/common_form.phtml:107
+#: templates/table/gis_visualization/gis_visualization.phtml:48
+#: templates/table/relation/common_form.phtml:107
 msgid "Save"
 msgstr "Spara"
 
@@ -2289,8 +2295,8 @@ msgid "Data point content"
 msgstr "Innehåll för datapunkt"
 
 #: js/messages.php:430 js/messages.php:562 js/messages.php:579
-#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2573
-#: templates/index_form.phtml:154 templates/index_form.phtml:194
+#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2571
+#: templates/table/index_form.phtml:154 templates/table/index_form.phtml:194
 msgid "Ignore"
 msgstr "Ignorera"
 
@@ -2349,8 +2355,8 @@ msgstr "Välj främmande nyckel"
 msgid "Please select the primary key or a unique key!"
 msgstr "Välj den primära nyckeln eller en unik nyckel!"
 
-#: js/messages.php:457 templates/designer/side_menu.phtml:91
-#: templates/designer/side_menu.phtml:94
+#: js/messages.php:457 templates/database/designer/side_menu.phtml:91
+#: templates/database/designer/side_menu.phtml:94
 msgid "Choose column to display"
 msgstr "Välj kolumn att visa"
 
@@ -2366,22 +2372,22 @@ msgstr ""
 msgid "Page name"
 msgstr "Sidnamn"
 
-#: js/messages.php:463 templates/designer/side_menu.phtml:56
-#: templates/designer/side_menu.phtml:59
+#: js/messages.php:463 templates/database/designer/side_menu.phtml:56
+#: templates/database/designer/side_menu.phtml:59
 #, fuzzy
 #| msgid "Select page"
 msgid "Save page"
 msgstr "Välj sida"
 
-#: js/messages.php:464 templates/designer/side_menu.phtml:63
-#: templates/designer/side_menu.phtml:66
+#: js/messages.php:464 templates/database/designer/side_menu.phtml:63
+#: templates/database/designer/side_menu.phtml:66
 #, fuzzy
 #| msgid "Select page"
 msgid "Save page as"
 msgstr "Välj sida"
 
-#: js/messages.php:465 templates/designer/side_menu.phtml:49
-#: templates/designer/side_menu.phtml:52
+#: js/messages.php:465 templates/database/designer/side_menu.phtml:49
+#: templates/database/designer/side_menu.phtml:52
 #, fuzzy
 #| msgid "Free pages"
 msgid "Open page"
@@ -2393,7 +2399,7 @@ msgstr "Fria sidor"
 msgid "Delete page"
 msgstr "Välj sida"
 
-#: js/messages.php:467 templates/designer/side_menu.phtml:10
+#: js/messages.php:467 templates/database/designer/side_menu.phtml:10
 #, fuzzy
 #| msgid "Unit"
 msgid "Untitled"
@@ -2521,7 +2527,7 @@ msgstr "Ursprunglig sträng"
 msgid "cancel"
 msgstr "Avbryt"
 
-#: js/messages.php:499 libraries/server_status.lib.php:271
+#: js/messages.php:499 libraries/server_status.lib.php:280
 msgid "Aborted"
 msgstr "Avbrutna"
 
@@ -3146,7 +3152,7 @@ msgstr "Var vänlig ange ett giltigt nummer!"
 
 #: js/messages.php:793 libraries/Message.class.php:199
 #: libraries/Util.class.php:654 libraries/core.lib.php:245
-#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1172
+#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1170
 #: tbl_operations.php:229 view_operations.php:63
 msgid "Error"
 msgstr "Fel"
@@ -3207,8 +3213,8 @@ msgstr "per sekund"
 msgid "per minute"
 msgstr "per minut"
 
-#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:143
-#: libraries/server_status.lib.php:228
+#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:152
+#: libraries/server_status.lib.php:237
 #: libraries/server_status_queries.lib.php:98
 msgid "per hour"
 msgstr "per timme"
@@ -3227,7 +3233,7 @@ msgid "Wrong permissions on configuration file, should not be world writable!"
 msgstr ""
 "Fel behörigheter på konfigurationsfilen, bör inte vara \"world\" skrivbar!"
 
-#: libraries/Config.class.php:1799
+#: libraries/Config.class.php:1801
 msgid "Font size"
 msgstr "Teckenstorlek"
 
@@ -3259,10 +3265,10 @@ msgstr "underfråga"
 #: libraries/server_privileges.lib.php:2890
 #: libraries/server_privileges.lib.php:3144
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4332
+#: libraries/server_privileges.lib.php:4358
 #: libraries/server_status_processes.lib.php:80
-#: templates/tbl_relation/foreign_key_row.phtml:165
-#: templates/tbl_relation/internal_relational_row.phtml:55
+#: templates/table/relation/foreign_key_row.phtml:165
+#: templates/table/relation/internal_relational_row.phtml:55
 msgid "Database"
 msgstr "Databas"
 
@@ -3373,11 +3379,11 @@ msgstr "SQL-historik"
 #: libraries/plugins/import/ImportMediawiki.class.php:60
 #: libraries/plugins/import/ImportOds.class.php:59
 #: libraries/plugins/import/ImportShp.class.php:57
-#: libraries/plugins/import/ImportSql.class.php:148
+#: libraries/plugins/import/ImportSql.class.php:51
 #: libraries/plugins/import/ImportXml.class.php:58
-#: libraries/rte/rte_routines.lib.php:833 templates/index_form.phtml:49
-#: templates/structure/row_stats_table.phtml:20
-#: templates/table/options.phtml:2
+#: libraries/rte/rte_routines.lib.php:924 templates/table/index_form.phtml:49
+#: templates/table/search/options.phtml:2
+#: templates/table/structure/row_stats_table.phtml:20
 msgid "Options"
 msgstr "Alternativ"
 
@@ -3422,7 +3428,8 @@ msgstr "Fallande"
 msgid "Order:"
 msgstr "Ordning"
 
-#: libraries/Console.class.php:289 templates/table/replace_preview.phtml:17
+#: libraries/Console.class.php:289
+#: templates/table/search/replace_preview.phtml:17
 msgid "Count"
 msgstr "Räkna"
 
@@ -3547,9 +3554,9 @@ msgstr "Byt till kopierad tabell"
 #: libraries/operations.lib.php:794 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:191
-#: templates/structure/sortable_header.phtml:21
-#: templates/structure/sortable_header.phtml:38
-#: templates/table/options.phtml:68
+#: templates/database/structure/sortable_header.phtml:21
+#: templates/database/structure/sortable_header.phtml:38
+#: templates/table/search/options.phtml:68
 msgid "Ascending"
 msgstr "Stigande"
 
@@ -3559,13 +3566,14 @@ msgstr "Stigande"
 #: libraries/operations.lib.php:797 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:188
-#: templates/structure/sortable_header.phtml:26
-#: templates/structure/sortable_header.phtml:43
-#: templates/table/options.phtml:69
+#: templates/database/structure/sortable_header.phtml:26
+#: templates/database/structure/sortable_header.phtml:43
+#: templates/table/search/options.phtml:69
 msgid "Descending"
 msgstr "Fallande"
 
-#: libraries/DBQbe.class.php:467 templates/table/search_and_replace.phtml:6
+#: libraries/DBQbe.class.php:467
+#: templates/table/search/search_and_replace.phtml:6
 msgid "Column:"
 msgstr "Kolumn:"
 
@@ -3725,12 +3733,12 @@ msgstr[0] "%1$s träff i <strong>%2$s</strong>"
 msgstr[1] "%1$s träffar i <strong>%2$s</strong>"
 
 #: libraries/DbSearch.class.php:354 libraries/Menu.class.php:311
-#: libraries/Util.class.php:3337 libraries/Util.class.php:3347
-#: libraries/Util.class.php:3623 libraries/Util.class.php:3624
-#: libraries/Util.class.php:4343 libraries/config.values.php:43
+#: libraries/Util.class.php:3343 libraries/Util.class.php:3353
+#: libraries/Util.class.php:3629 libraries/Util.class.php:3630
+#: libraries/Util.class.php:4349 libraries/config.values.php:43
 #: libraries/config.values.php:51 libraries/config.values.php:119
 #: libraries/navigation/Nodes/Node_Table.class.php:295
-#: templates/structure/check_all_table_column.phtml:5
+#: templates/table/structure/check_all_table_column.phtml:5
 msgid "Browse"
 msgstr "Bläddra"
 
@@ -3747,7 +3755,8 @@ msgstr "Sök i databas"
 msgid "Words or values to search for (wildcard: \"%\"):"
 msgstr "Ord eller värden att söka efter (jokertecken: \"%\"):"
 
-#: libraries/DbSearch.class.php:401 templates/table/search_and_replace.phtml:1
+#: libraries/DbSearch.class.php:401
+#: templates/table/search/search_and_replace.phtml:1
 msgid "Find:"
 msgstr "Hitta:"
 
@@ -3793,28 +3802,28 @@ msgstr "Filter"
 msgid "Search this table"
 msgstr "Sök i denna tabell"
 
-#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2532
-#: libraries/Util.class.php:2535
+#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2538
+#: libraries/Util.class.php:2541
 msgctxt "First page"
 msgid "Begin"
 msgstr "Starta"
 
-#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2533
-#: libraries/Util.class.php:2536 libraries/server_bin_log.lib.php:170
+#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2539
+#: libraries/Util.class.php:2542 libraries/server_bin_log.lib.php:170
 #: libraries/server_bin_log.lib.php:172
 msgctxt "Previous page"
 msgid "Previous"
 msgstr "Föregående"
 
-#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2564
-#: libraries/Util.class.php:2574 libraries/server_bin_log.lib.php:204
+#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2570
+#: libraries/Util.class.php:2580 libraries/server_bin_log.lib.php:204
 #: libraries/server_bin_log.lib.php:206
 msgctxt "Next page"
 msgid "Next"
 msgstr "Nästa"
 
-#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2565
-#: libraries/Util.class.php:2575
+#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2571
+#: libraries/Util.class.php:2581
 msgctxt "Last page"
 msgid "End"
 msgstr "Slut"
@@ -3889,15 +3898,15 @@ msgid "May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]."
 msgstr "Kan vara ungefärligt. Se [doc@faq3-11]FAQ 3.11[/doc]."
 
 #: libraries/DisplayResults.class.php:4332 libraries/Message.class.php:180
-#: libraries/controllers/TableRelationController.class.php:258
+#: libraries/controllers/TableRelationController.class.php:259
 #: libraries/controllers/TableSearchController.class.php:655
-#: libraries/rte/rte_routines.lib.php:1332 libraries/sql_query_form.lib.php:89
+#: libraries/rte/rte_routines.lib.php:1423 libraries/sql_query_form.lib.php:89
 #: tbl_operations.php:227 tbl_row_action.php:138 view_operations.php:62
 msgid "Your SQL query has been executed successfully."
 msgstr "Din SQL-fråga utfördes korrekt."
 
 #: libraries/DisplayResults.class.php:4660
-#: libraries/controllers/StructureController.class.php:629
+#: libraries/controllers/DatabaseStructureController.class.php:564
 #, php-format
 msgid ""
 "This view has at least this number of rows. Please refer to %sdocumentation"
@@ -3919,33 +3928,33 @@ msgstr "%1$d totalt, %2$d i fråga"
 msgid "%d total"
 msgstr "%d totalt"
 
-#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1318
+#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1312
 #, php-format
 msgid "Query took %01.4f seconds."
 msgstr "Frågan tog %01.4f sekunder."
 
 #: libraries/DisplayResults.class.php:4807
-#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4767
-#: libraries/Util.class.php:4773 libraries/mult_submits.inc.php:50
-#: templates/structure/check_all_tables.phtml:2
-#: templates/structure/check_all_tables.phtml:9
+#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4773
+#: libraries/Util.class.php:4779 libraries/mult_submits.inc.php:50
+#: templates/database/structure/check_all_tables.phtml:2
+#: templates/database/structure/check_all_tables.phtml:9
 msgid "With selected:"
 msgstr "Med markerade:"
 
 #: libraries/DisplayResults.class.php:4811
-#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4769
-#: libraries/Util.class.php:4770 libraries/server_privileges.lib.php:1174
+#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4775
+#: libraries/Util.class.php:4776 libraries/server_privileges.lib.php:1174
 #: libraries/server_privileges.lib.php:1175
 #: libraries/server_privileges.lib.php:1387
 #: libraries/server_user_groups.lib.php:231
-#: templates/structure/check_all_tables.phtml:3
-#: templates/structure/check_all_tables.phtml:4
+#: templates/database/structure/check_all_tables.phtml:3
+#: templates/database/structure/check_all_tables.phtml:4
 msgid "Check All"
 msgstr "Markera alla"
 
 #: libraries/DisplayResults.class.php:4985 libraries/Header.class.php:383
-#: templates/structure/optional_action_links.phtml:1
-#: templates/structure/print_view_data_dictionary_link.phtml:3
+#: templates/database/structure/print_view_data_dictionary_link.phtml:3
+#: templates/table/structure/optional_action_links.phtml:1
 msgid "Print view"
 msgstr "Utskriftsvänlig visning"
 
@@ -3953,7 +3962,8 @@ msgstr "Utskriftsvänlig visning"
 msgid "Query results operations"
 msgstr "Operationer för frågeresultat"
 
-#: libraries/DisplayResults.class.php:5105 templates/tbl_chart.phtml:12
+#: libraries/DisplayResults.class.php:5105
+#: templates/table/chart/tbl_chart.phtml:12
 msgid "Display chart"
 msgstr "Visa diagram"
 
@@ -4049,7 +4059,7 @@ msgid "Click on the bar to scroll to top of page"
 msgstr "Klicka på bommen för att förflytta dig till toppen av sidan"
 
 #: libraries/Header.class.php:749
-#: libraries/plugins/auth/AuthenticationCookie.class.php:152
+#: libraries/plugins/auth/AuthenticationCookie.class.php:140
 msgid "Javascript must be enabled past this point!"
 msgstr "Javascript måste vara aktiverat efter detta!"
 
@@ -4071,11 +4081,11 @@ msgid "Keyname"
 msgstr "Nyckelnamn"
 
 #: libraries/Index.class.php:697
-#: libraries/controllers/StructureController.class.php:1962
-#: libraries/controllers/StructureController.class.php:1967
+#: libraries/controllers/TableStructureController.class.php:953
+#: libraries/controllers/TableStructureController.class.php:958
 #: libraries/tracking.lib.php:973
 #: templates/columns_definitions/column_indexes.phtml:11
-#: templates/structure/check_all_table_column.phtml:26
+#: templates/table/structure/check_all_table_column.phtml:26
 msgid "Unique"
 msgstr "Unik"
 
@@ -4094,16 +4104,17 @@ msgstr "Kardinalitet"
 #: libraries/server_collations.lib.php:35 libraries/tracking.lib.php:881
 #: libraries/tracking.lib.php:977
 #: templates/columns_definitions/table_fields_definitions.phtml:33
-#: templates/structure/row_stats_table.phtml:31
-#: templates/structure/table_header.phtml:55
-#: templates/structure/table_structure_header.phtml:7
-#: templates/table/table_header.phtml:8
+#: templates/database/structure/table_header.phtml:55
+#: templates/table/search/table_header.phtml:8
+#: templates/table/structure/row_stats_table.phtml:31
+#: templates/table/structure/table_structure_header.phtml:7
 msgid "Collation"
 msgstr "Kollationering"
 
 #: libraries/Index.class.php:703 libraries/rte/rte_events.lib.php:496
-#: libraries/rte/rte_routines.lib.php:956 libraries/tracking.lib.php:885
-#: libraries/tracking.lib.php:979 templates/structure/table_header.phtml:84
+#: libraries/rte/rte_routines.lib.php:1047 libraries/tracking.lib.php:885
+#: libraries/tracking.lib.php:979
+#: templates/database/structure/table_header.phtml:84
 msgid "Comment"
 msgstr "Kommentar"
 
@@ -4116,15 +4127,15 @@ msgstr "Den primära nyckeln har tagits bort."
 msgid "Index %s has been dropped."
 msgstr "Index %s har tagits bort."
 
-#: libraries/Index.class.php:757 libraries/Util.class.php:3630
-#: libraries/Util.class.php:3631
-#: libraries/controllers/StructureController.class.php:1958
-#: libraries/controllers/StructureController.class.php:1959
+#: libraries/Index.class.php:757 libraries/Util.class.php:3636
+#: libraries/Util.class.php:3637
+#: libraries/controllers/TableStructureController.class.php:949
+#: libraries/controllers/TableStructureController.class.php:950
 #: libraries/operations.lib.php:1607 libraries/rte/rte_list.lib.php:150
 #: libraries/server_databases.lib.php:146
-#: templates/structure/check_all_table_column.phtml:15
-#: templates/structure/check_all_tables.phtml:16
-#: templates/tbl_relation/foreign_key_row.phtml:93
+#: templates/database/structure/check_all_tables.phtml:16
+#: templates/table/relation/foreign_key_row.phtml:93
+#: templates/table/structure/check_all_table_column.phtml:15
 msgid "Drop"
 msgstr "Radera"
 
@@ -4155,16 +4166,16 @@ msgstr "Server"
 #: libraries/Menu.class.php:248
 #: libraries/navigation/Nodes/Node_View.class.php:32
 #: libraries/tbl_info.inc.php:63
-#: templates/structure/structure_table_row.phtml:97
-#: templates/structure/structure_table_row.phtml:159
+#: templates/database/structure/structure_table_row.phtml:97
+#: templates/database/structure/structure_table_row.phtml:159
 msgid "View"
 msgstr "Vy"
 
 #: libraries/Menu.class.php:325 libraries/Menu.class.php:429
-#: libraries/Menu.class.php:548 libraries/Util.class.php:3334
-#: libraries/Util.class.php:3344 libraries/Util.class.php:3350
-#: libraries/Util.class.php:4313 libraries/Util.class.php:4328
-#: libraries/Util.class.php:4345 libraries/config.values.php:40
+#: libraries/Menu.class.php:548 libraries/Util.class.php:3340
+#: libraries/Util.class.php:3350 libraries/Util.class.php:3356
+#: libraries/Util.class.php:4319 libraries/Util.class.php:4334
+#: libraries/Util.class.php:4351 libraries/config.values.php:40
 #: libraries/config.values.php:48 libraries/config.values.php:110
 #: libraries/config.values.php:116 libraries/config/messages.inc.php:321
 #: libraries/navigation/Nodes/Node_Table.class.php:292
@@ -4172,19 +4183,19 @@ msgid "SQL"
 msgstr "SQL"
 
 #: libraries/Menu.class.php:328 libraries/Menu.class.php:432
-#: libraries/Util.class.php:3335 libraries/Util.class.php:3345
-#: libraries/Util.class.php:3351 libraries/Util.class.php:3625
-#: libraries/Util.class.php:3626 libraries/Util.class.php:4329
-#: libraries/Util.class.php:4346 libraries/config.values.php:41
+#: libraries/Util.class.php:3341 libraries/Util.class.php:3351
+#: libraries/Util.class.php:3357 libraries/Util.class.php:3631
+#: libraries/Util.class.php:3632 libraries/Util.class.php:4335
+#: libraries/Util.class.php:4352 libraries/config.values.php:41
 #: libraries/config.values.php:49 libraries/config.values.php:111
 #: libraries/config.values.php:117
 #: libraries/navigation/Nodes/Node_Table.class.php:286
 msgid "Search"
 msgstr "Sök"
 
-#: libraries/Menu.class.php:338 libraries/Util.class.php:3336
-#: libraries/Util.class.php:3346 libraries/Util.class.php:3627
-#: libraries/Util.class.php:3628 libraries/Util.class.php:4347
+#: libraries/Menu.class.php:338 libraries/Util.class.php:3342
+#: libraries/Util.class.php:3352 libraries/Util.class.php:3633
+#: libraries/Util.class.php:3634 libraries/Util.class.php:4353
 #: libraries/config.values.php:42 libraries/config.values.php:50
 #: libraries/config.values.php:118
 #: libraries/navigation/Nodes/Node_Table.class.php:289
@@ -4193,30 +4204,30 @@ msgid "Insert"
 msgstr "Lägg till"
 
 #: libraries/Menu.class.php:362 libraries/Menu.class.php:467
-#: libraries/Util.class.php:4334 libraries/Util.class.php:4350
+#: libraries/Util.class.php:4340 libraries/Util.class.php:4356
 #: libraries/config.values.php:106 libraries/server_common.lib.php:51
 #: libraries/server_privileges.lib.php:2370
 #: libraries/server_privileges.lib.php:3158
-#: libraries/server_privileges.lib.php:4221
+#: libraries/server_privileges.lib.php:4247
 msgid "Privileges"
 msgstr "Privilegier"
 
 #: libraries/Menu.class.php:371 libraries/Menu.class.php:379
-#: libraries/Menu.class.php:459 libraries/Util.class.php:3338
-#: libraries/Util.class.php:3352 libraries/Util.class.php:4333
-#: libraries/Util.class.php:4351 libraries/config.values.php:112
+#: libraries/Menu.class.php:459 libraries/Util.class.php:3344
+#: libraries/Util.class.php:3358 libraries/Util.class.php:4339
+#: libraries/Util.class.php:4357 libraries/config.values.php:112
 #: view_operations.php:92
 msgid "Operations"
 msgstr "Operationer"
 
 #: libraries/Menu.class.php:384 libraries/Menu.class.php:492
-#: libraries/Util.class.php:4338 libraries/Util.class.php:4352
+#: libraries/Util.class.php:4344 libraries/Util.class.php:4358
 #: libraries/relation.lib.php:255
 msgid "Tracking"
 msgstr "Spårning"
 
 #: libraries/Menu.class.php:397 libraries/Menu.class.php:486
-#: libraries/Util.class.php:4337 libraries/Util.class.php:4353
+#: libraries/Util.class.php:4343 libraries/Util.class.php:4359
 #: libraries/navigation/Nodes/Node_Trigger_Container.class.php:24
 #: libraries/plugins/export/ExportHtmlword.class.php:557
 #: libraries/plugins/export/ExportOdt.class.php:685
@@ -4233,16 +4244,16 @@ msgstr "Trigger"
 msgid "Database seems to be empty!"
 msgstr "Databasen verkar vara tom!"
 
-#: libraries/Menu.class.php:439 libraries/Util.class.php:4330
+#: libraries/Menu.class.php:439 libraries/Util.class.php:4336
 msgid "Query"
 msgstr "Fråga"
 
-#: libraries/Menu.class.php:472 libraries/Util.class.php:4335
+#: libraries/Menu.class.php:472 libraries/Util.class.php:4341
 #: libraries/rte/rte_words.lib.php:36
 msgid "Routines"
 msgstr "Rutiner"
 
-#: libraries/Menu.class.php:479 libraries/Util.class.php:4336
+#: libraries/Menu.class.php:479 libraries/Util.class.php:4342
 #: libraries/navigation/Nodes/Node_Event_Container.class.php:26
 #: libraries/plugins/export/ExportSql.class.php:940
 #: libraries/plugins/export/ExportXml.class.php:107
@@ -4250,22 +4261,22 @@ msgstr "Rutiner"
 msgid "Events"
 msgstr "Händelser"
 
-#: libraries/Menu.class.php:498 libraries/Util.class.php:4339
+#: libraries/Menu.class.php:498 libraries/Util.class.php:4345
 msgid "Designer"
 msgstr "Designer"
 
-#: libraries/Menu.class.php:507 libraries/Util.class.php:4340
-#: templates/structure/check_all_tables.phtml:35
+#: libraries/Menu.class.php:507 libraries/Util.class.php:4346
+#: templates/database/structure/check_all_tables.phtml:35
 #, fuzzy
 #| msgid "Textarea columns"
 msgid "Central columns"
 msgstr "Textarea kolumner"
 
-#: libraries/Menu.class.php:544 libraries/Util.class.php:4312
+#: libraries/Menu.class.php:544 libraries/Util.class.php:4318
 #: libraries/config.values.php:103 libraries/config/messages.inc.php:266
 #: libraries/config/messages.inc.php:341
 #: libraries/navigation/NavigationTree.class.php:1239
-#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4332
+#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4358
 msgid "Databases"
 msgstr "Databaser"
 
@@ -4276,34 +4287,34 @@ msgid "User accounts"
 msgstr "Användargrupper"
 
 #: libraries/Menu.class.php:595 libraries/ServerStatusData.class.php:121
-#: libraries/Util.class.php:4319 libraries/server_common.lib.php:36
+#: libraries/Util.class.php:4325 libraries/server_common.lib.php:36
 msgid "Binary log"
 msgstr "Binär logg"
 
 #: libraries/Menu.class.php:601 libraries/ServerStatusData.class.php:126
-#: libraries/Util.class.php:4320 libraries/server_common.lib.php:42
-#: templates/structure/body_for_table_summary.phtml:10
-#: templates/structure/table_header.phtml:27
+#: libraries/Util.class.php:4326 libraries/server_common.lib.php:42
+#: templates/database/structure/body_for_table_summary.phtml:10
+#: templates/database/structure/table_header.phtml:27
 msgid "Replication"
 msgstr "Replikering"
 
 #: libraries/Menu.class.php:606 libraries/ServerStatusData.class.php:193
-#: libraries/Util.class.php:4321 libraries/config.values.php:105
+#: libraries/Util.class.php:4327 libraries/config.values.php:105
 #: libraries/server_engines.lib.php:108 libraries/server_engines.lib.php:112
 #: libraries/sql_query_form.lib.php:421
 msgid "Variables"
 msgstr "Variabler"
 
-#: libraries/Menu.class.php:610 libraries/Util.class.php:4322
+#: libraries/Menu.class.php:610 libraries/Util.class.php:4328
 msgid "Charsets"
 msgstr "Teckenuppsättningar"
 
-#: libraries/Menu.class.php:615 libraries/Util.class.php:4323
+#: libraries/Menu.class.php:615 libraries/Util.class.php:4329
 #: libraries/server_common.lib.php:33 libraries/server_plugins.lib.php:27
 msgid "Plugins"
 msgstr "Insticksprogram"
 
-#: libraries/Menu.class.php:626 libraries/Util.class.php:4324
+#: libraries/Menu.class.php:626 libraries/Util.class.php:4330
 msgid "Engines"
 msgstr "Motorer"
 
@@ -4328,7 +4339,7 @@ msgid_plural "%1$d rows inserted."
 msgstr[0] "%1$d rad infogad."
 msgstr[1] "%1$d rader infogade."
 
-#: libraries/PDF.class.php:70 libraries/Util.class.php:2521
+#: libraries/PDF.class.php:70 libraries/Util.class.php:2527
 #: libraries/browse_foreigners.lib.php:327
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:865
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:890
@@ -4349,7 +4360,7 @@ msgid "Could not save favorite table!"
 msgstr "Kunde inte spara favorittabell!"
 
 #: libraries/RecentFavoriteTable.class.php:212
-#: templates/structure/favorite_anchor.phtml:12
+#: templates/database/structure/favorite_anchor.phtml:12
 msgid "Remove from Favorites"
 msgstr "Ta bort från favoriter"
 
@@ -4516,7 +4527,7 @@ msgstr ""
 "lagringsmotor."
 
 #: libraries/StorageEngine.class.php:373
-#: templates/structure/body_for_table_summary.phtml:50
+#: templates/database/structure/body_for_table_summary.phtml:50
 #, php-format
 msgid "%s is the default storage engine on this MySQL server."
 msgstr "%s är standardmotorn för denna MySQL-server."
@@ -4995,10 +5006,10 @@ msgstr ""
 
 #: libraries/Util.class.php:726 libraries/rte/rte_events.lib.php:110
 #: libraries/rte/rte_events.lib.php:119 libraries/rte/rte_events.lib.php:150
-#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:153
-#: libraries/rte/rte_routines.lib.php:162
-#: libraries/rte/rte_routines.lib.php:235
-#: libraries/rte/rte_routines.lib.php:1366
+#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:223
+#: libraries/rte/rte_routines.lib.php:250
+#: libraries/rte/rte_routines.lib.php:372
+#: libraries/rte/rte_routines.lib.php:1457
 #: libraries/rte/rte_triggers.lib.php:86 libraries/rte/rte_triggers.lib.php:95
 #: libraries/rte/rte_triggers.lib.php:127
 msgid "MySQL said: "
@@ -5044,75 +5055,78 @@ msgstr "Sön"
 msgid "%B %d, %Y at %I:%M %p"
 msgstr "%d %B %Y kl %H:%M"
 
-#: libraries/Util.class.php:2019
+#: libraries/Util.class.php:2025
 #, php-format
 msgid "%s days, %s hours, %s minutes and %s seconds"
 msgstr "%s dagar, %s timmar, %s minuter och %s sekunder"
 
-#: libraries/Util.class.php:2112
+#: libraries/Util.class.php:2118
 msgid "Missing parameter:"
 msgstr "Saknade parametrar:"
 
-#: libraries/Util.class.php:2645
+#: libraries/Util.class.php:2651
 #, php-format
 msgid "Jump to database \"%s\"."
 msgstr "Hoppa till databas \"%s\"."
 
-#: libraries/Util.class.php:2670
+#: libraries/Util.class.php:2676
 #, php-format
 msgid "The %s functionality is affected by a known bug, see %s"
 msgstr "Funktionaliteten för %s påverkas av en känd bugg, se %s"
 
-#: libraries/Util.class.php:2881
+#: libraries/Util.class.php:2887
 msgid "Click to toggle"
 msgstr "Klicka för att växla"
 
-#: libraries/Util.class.php:3542 prefs_manage.php:248
+#: libraries/Util.class.php:3548 prefs_manage.php:248
 msgid "Browse your computer:"
 msgstr "Gå igenom din dator:"
 
-#: libraries/Util.class.php:3567
+#: libraries/Util.class.php:3573
 #, php-format
 msgid "Select from the web server upload directory <b>%s</b>:"
 msgstr "Välj från webbserverns uppladdningskatalog <b>%s</b>:"
 
-#: libraries/Util.class.php:3596 libraries/insert_edit.lib.php:1173
+#: libraries/Util.class.php:3602 libraries/insert_edit.lib.php:1171
 msgid "The directory you set for upload work cannot be reached."
 msgstr "Katalogen du ställt in för uppladdning kan inte nås."
 
-#: libraries/Util.class.php:3607
+#: libraries/Util.class.php:3613
 msgid "There are no files to upload!"
 msgstr "Det finns inga filer att ladda upp!"
 
-#: libraries/Util.class.php:3632 libraries/Util.class.php:3633
-#: templates/structure/check_all_tables.phtml:15
+#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: templates/database/structure/check_all_tables.phtml:15
 msgid "Empty"
 msgstr "Töm"
 
-#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: libraries/Util.class.php:3644 libraries/Util.class.php:3645
 msgid "Execute"
 msgstr "Utför"
 
-#: libraries/Util.class.php:4152
+#: libraries/Util.class.php:4158
 msgid "Print"
 msgstr "Skriv ut"
 
-#: libraries/Util.class.php:4257 templates/structure/row_stats_table.phtml:80
-#: templates/structure/table_header.phtml:95
+#: libraries/Util.class.php:4263
+#: templates/database/structure/table_header.phtml:95
+#: templates/table/structure/row_stats_table.phtml:80
 msgid "Creation"
 msgstr "Skapande"
 
-#: libraries/Util.class.php:4263 templates/structure/row_stats_table.phtml:87
-#: templates/structure/table_header.phtml:106
+#: libraries/Util.class.php:4269
+#: templates/database/structure/table_header.phtml:106
+#: templates/table/structure/row_stats_table.phtml:87
 msgid "Last update"
 msgstr "Senaste uppdatering"
 
-#: libraries/Util.class.php:4269 templates/structure/row_stats_table.phtml:94
-#: templates/structure/table_header.phtml:117
+#: libraries/Util.class.php:4275
+#: templates/database/structure/table_header.phtml:117
+#: templates/table/structure/row_stats_table.phtml:94
 msgid "Last check"
 msgstr "Senaste kontroll"
 
-#: libraries/Util.class.php:4315
+#: libraries/Util.class.php:4321
 msgid "Users"
 msgstr "Användare"
 
@@ -5133,16 +5147,16 @@ msgid "Use this value"
 msgstr "Använd detta värde"
 
 #: libraries/build_html_for_db.lib.php:33 libraries/import.lib.php:193
-#: templates/structure/actions_in_table_structure.phtml:113
-#: templates/structure/row_stats_table.phtml:42
-#: templates/structure/table_header.phtml:36
+#: templates/database/structure/table_header.phtml:36
+#: templates/table/structure/actions_in_table_structure.phtml:113
+#: templates/table/structure/row_stats_table.phtml:42
 msgid "Rows"
 msgstr "Rader"
 
 #: libraries/build_html_for_db.lib.php:48 libraries/engines/innodb.lib.php:171
-#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:186
-#: libraries/server_status.lib.php:298
-#: templates/structure/display_table_stats.phtml:40
+#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:195
+#: libraries/server_status.lib.php:307
+#: templates/table/structure/display_table_stats.phtml:40
 msgid "Total"
 msgstr "Totalt"
 
@@ -5151,10 +5165,12 @@ msgid "Jump to database"
 msgstr "Gå till databas"
 
 #: libraries/build_html_for_db.lib.php:146
+#: templates/database/structure/structure_table_row.phtml:15
 msgid "Not replicated"
 msgstr "Inte replikerad"
 
 #: libraries/build_html_for_db.lib.php:158
+#: templates/database/structure/structure_table_row.phtml:16
 msgid "Replicated"
 msgstr "Replikerad"
 
@@ -5207,17 +5223,17 @@ msgstr ""
 #: libraries/plugins/export/ExportTexytext.class.php:425
 #: libraries/plugins/export/PMA_ExportPdf.class.php:307
 #: libraries/rte/rte_list.lib.php:73 libraries/rte/rte_list.lib.php:85
-#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:830
-#: libraries/rte/rte_routines.lib.php:1492 setup/frames/index.inc.php:162
+#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:921
+#: libraries/rte/rte_routines.lib.php:1583 setup/frames/index.inc.php:162
 #: templates/columns_definitions/table_fields_definitions.phtml:8
-#: templates/structure/table_structure_header.phtml:5
-#: templates/table/create_table.phtml:11
+#: templates/database/create_table.phtml:11
+#: templates/table/structure/table_structure_header.phtml:5
 msgid "Name"
 msgstr "Namn"
 
 #: libraries/central_columns.lib.php:699
 #: libraries/central_columns.lib.php:1381
-#: libraries/rte/rte_routines.lib.php:832
+#: libraries/rte/rte_routines.lib.php:923
 #: templates/columns_definitions/table_fields_definitions.phtml:14
 msgid "Length/Values"
 msgstr "Längd/Värden"
@@ -5240,7 +5256,7 @@ msgid "Select a table"
 msgstr "Välj tabeller"
 
 #: libraries/central_columns.lib.php:804
-#: templates/structure/add_column.phtml:4
+#: templates/table/structure/add_column.phtml:4
 msgid "Add column"
 msgstr "Lägg till kolumn"
 
@@ -5258,7 +5274,7 @@ msgstr "Lägg till kolumn"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1002
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1025
 #: templates/columns_definitions/table_fields_definitions.phtml:36
-#: templates/structure/table_structure_header.phtml:8
+#: templates/table/structure/table_structure_header.phtml:8
 msgid "Attributes"
 msgstr "Attribut"
 
@@ -5371,7 +5387,7 @@ msgid "Double click"
 msgstr "Dubbelklicka"
 
 #: libraries/config.values.php:95 libraries/config.values.php:124
-#: libraries/config/FormDisplay.tpl.php:221 libraries/relation.lib.php:97
+#: libraries/config/FormDisplay.tpl.php:232 libraries/relation.lib.php:97
 #: libraries/relation.lib.php:105
 msgid "Disabled"
 msgstr "Inaktiverad"
@@ -5551,23 +5567,23 @@ msgstr "Komprimerad export fungerar inte på grund av saknad funktion %s."
 msgid "maximum %s"
 msgstr "maximum %s"
 
-#: libraries/config/FormDisplay.tpl.php:219
+#: libraries/config/FormDisplay.tpl.php:230
 msgid "This setting is disabled, it will not be applied to your configuration."
 msgstr ""
 "Denna inställning är inaktiverad, den kommer inte tillämpas på din "
 "konfiguration."
 
-#: libraries/config/FormDisplay.tpl.php:313
+#: libraries/config/FormDisplay.tpl.php:324
 #, php-format
 msgid "Set value: %s"
 msgstr "Ange värde: %s"
 
-#: libraries/config/FormDisplay.tpl.php:318
+#: libraries/config/FormDisplay.tpl.php:329
 #: libraries/config/messages.inc.php:610
 msgid "Restore default value"
 msgstr "Återställ standardvärde"
 
-#: libraries/config/FormDisplay.tpl.php:332
+#: libraries/config/FormDisplay.tpl.php:343
 msgid "Allow users to customize this value"
 msgstr "Tillåt användare att anpassa detta värde"
 
@@ -6066,7 +6082,7 @@ msgstr "Filens teckenuppsättning"
 
 #: libraries/config/messages.inc.php:136 libraries/config/messages.inc.php:152
 #: libraries/sql_query_form.lib.php:247
-#: templates/structure/row_stats_table.phtml:7
+#: templates/table/structure/row_stats_table.phtml:7
 msgid "Format"
 msgstr "Format"
 
@@ -6590,7 +6606,7 @@ msgstr "Välj vilka detaljer som ska visas i databasstrukturen (tabellista)."
 
 #: libraries/config/messages.inc.php:332
 #: libraries/plugins/export/ExportPdf.class.php:279
-#: templates/structure/secondary_tabs.phtml:8
+#: templates/table/secondary_tabs.phtml:8
 msgid "Table structure"
 msgstr "Tabellstruktur"
 
@@ -8336,103 +8352,33 @@ msgstr "Microsoft Word 2000"
 msgid "OpenDocument Text"
 msgstr "OpenDocument-text"
 
-#: libraries/controllers/StructureController.class.php:465
+#: libraries/controllers/DatabaseStructureController.class.php:405
 #: tbl_operations.php:382
 #, php-format
 msgid "Table %s has been emptied."
 msgstr "Tabellen %s har tömts."
 
-#: libraries/controllers/StructureController.class.php:486
+#: libraries/controllers/DatabaseStructureController.class.php:426
 #: tbl_operations.php:400 view_operations.php:119
 #, php-format
 msgid "View %s has been dropped."
 msgstr "Vyn %s har tagits bort."
 
-#: libraries/controllers/StructureController.class.php:487
+#: libraries/controllers/DatabaseStructureController.class.php:427
 #: tbl_operations.php:401
 #, php-format
 msgid "Table %s has been dropped."
 msgstr "Tabellen %s har tagits bort."
 
-#: libraries/controllers/StructureController.class.php:797
-#, fuzzy, php-format
-#| msgid "The column name '%s' is a MySQL reserved keyword."
-msgid "The name '%s' is a MySQL reserved keyword."
-msgid_plural "The names '%s' are MySQL reserved keywords."
-msgstr[0] "Kolumnnamnet '%s' är ett reserverat nyckelord i MySQL."
-msgstr[1] "Kolumnnamnet '%s' är ett reserverat nyckelord i MySQL."
-
-#: libraries/controllers/StructureController.class.php:875
-msgid "No column selected."
-msgstr "Ingen kolumn vald."
-
-#: libraries/controllers/StructureController.class.php:1049
+#: libraries/controllers/DatabaseStructureController.class.php:733
 msgid "Favorite List is full!"
 msgstr "Favoritlistan är full!"
 
-#: libraries/controllers/StructureController.class.php:1272
-msgid "The columns have been moved successfully."
-msgstr "Kolumnerna har flyttats framgångsrikt."
-
-#: libraries/controllers/StructureController.class.php:1535
-#, fuzzy, php-format
-#| msgid "Table %1$s has been altered successfully."
-msgid ""
-"Table %1$s has been altered successfully. Privileges have been adjusted."
-msgstr "Tabellen %1$s har ändrats."
-
-#: libraries/controllers/StructureController.class.php:1541
-#: libraries/controllers/TableIndexesController.class.php:161
-#: tbl_addfield.php:92
-#, php-format
-msgid "Table %1$s has been altered successfully."
-msgstr "Tabellen %1$s har ändrats."
-
-#: libraries/controllers/StructureController.class.php:1588
-#: libraries/tracking.lib.php:1094
-msgid "Query error"
-msgstr "Sökningsfel"
-
-#: libraries/controllers/StructureController.class.php:1806
+#: libraries/controllers/DatabaseStructureController.class.php:947
 #: libraries/mysql_charsets.lib.php:366 libraries/mysql_charsets.lib.php:373
 msgid "unknown"
 msgstr "okänd"
 
-#: libraries/controllers/StructureController.class.php:1957
-#: templates/structure/check_all_table_column.phtml:11
-msgid "Change"
-msgstr "Ändra"
-
-#: libraries/controllers/StructureController.class.php:1961
-#: libraries/controllers/StructureController.class.php:1966
-#: libraries/navigation/Nodes/Node_Index.class.php:30
-#: libraries/tracking.lib.php:926
-#: templates/columns_definitions/column_indexes.phtml:16
-#: templates/columns_definitions/table_fields_definitions.phtml:57
-#: templates/structure/check_all_table_column.phtml:30
-#: templates/structure/display_structure.phtml:79
-#: templates/structure/display_table_stats.phtml:19
-msgid "Index"
-msgstr "Index"
-
-#: libraries/controllers/StructureController.class.php:1963
-#: libraries/controllers/StructureController.class.php:1968
-#: templates/columns_definitions/column_indexes.phtml:27
-#: templates/structure/check_all_table_column.phtml:37
-msgid "Spatial"
-msgstr "Spatial"
-
-#: libraries/controllers/StructureController.class.php:1964
-#: libraries/controllers/StructureController.class.php:1969
-#: templates/columns_definitions/column_indexes.phtml:22
-#: templates/structure/check_all_table_column.phtml:47
-msgid "Fulltext"
-msgstr "Fulltext"
-
-#: libraries/controllers/StructureController.class.php:1970
-msgid "Distinct values"
-msgstr "Distinkta värden"
-
 #: libraries/controllers/TableChartController.class.php:82
 #: libraries/controllers/TableGisVisualizationController.class.php:101
 msgid "No SQL query was set to fetch data."
@@ -8446,13 +8392,20 @@ msgstr "Det finns inga numeriska kolumner att plotta i tabellen."
 msgid "No data to display"
 msgstr "Ingen data att visa"
 
-#: libraries/controllers/TableRelationController.class.php:217
+#: libraries/controllers/TableIndexesController.class.php:161
+#: libraries/controllers/TableStructureController.class.php:736
+#: tbl_addfield.php:92
+#, php-format
+msgid "Table %1$s has been altered successfully."
+msgstr "Tabellen %1$s har ändrats."
+
+#: libraries/controllers/TableRelationController.class.php:218
 #, fuzzy
 #| msgid "Thread %s was successfully killed."
 msgid "Display column was successfully updated."
 msgstr "Tråden %s dödades med framgång."
 
-#: libraries/controllers/TableRelationController.class.php:283
+#: libraries/controllers/TableRelationController.class.php:288
 #, fuzzy
 #| msgid "Internal relation has been added."
 msgid "Internal relations were successfully updated."
@@ -8471,12 +8424,75 @@ msgid "Zoom search"
 msgstr "Zoom sökning"
 
 #: libraries/controllers/TableSearchController.class.php:852
-#: templates/table/selection_form.phtml:59
+#: templates/table/search/selection_form.phtml:59
 #, fuzzy
 #| msgid "Find and Replace"
 msgid "Find and replace"
 msgstr "Sök och ersätt"
 
+#: libraries/controllers/TableStructureController.class.php:163
+#, fuzzy, php-format
+#| msgid "The column name '%s' is a MySQL reserved keyword."
+msgid "The name '%s' is a MySQL reserved keyword."
+msgid_plural "The names '%s' are MySQL reserved keywords."
+msgstr[0] "Kolumnnamnet '%s' är ett reserverat nyckelord i MySQL."
+msgstr[1] "Kolumnnamnet '%s' är ett reserverat nyckelord i MySQL."
+
+#: libraries/controllers/TableStructureController.class.php:241
+msgid "No column selected."
+msgstr "Ingen kolumn vald."
+
+#: libraries/controllers/TableStructureController.class.php:467
+msgid "The columns have been moved successfully."
+msgstr "Kolumnerna har flyttats framgångsrikt."
+
+#: libraries/controllers/TableStructureController.class.php:730
+#, fuzzy, php-format
+#| msgid "Table %1$s has been altered successfully."
+msgid ""
+"Table %1$s has been altered successfully. Privileges have been adjusted."
+msgstr "Tabellen %1$s har ändrats."
+
+#: libraries/controllers/TableStructureController.class.php:783
+#: libraries/tracking.lib.php:1094
+msgid "Query error"
+msgstr "Sökningsfel"
+
+#: libraries/controllers/TableStructureController.class.php:948
+#: templates/table/structure/check_all_table_column.phtml:11
+msgid "Change"
+msgstr "Ändra"
+
+#: libraries/controllers/TableStructureController.class.php:952
+#: libraries/controllers/TableStructureController.class.php:957
+#: libraries/navigation/Nodes/Node_Index.class.php:30
+#: libraries/tracking.lib.php:926
+#: templates/columns_definitions/column_indexes.phtml:16
+#: templates/columns_definitions/table_fields_definitions.phtml:57
+#: templates/table/structure/check_all_table_column.phtml:30
+#: templates/table/structure/display_structure.phtml:79
+#: templates/table/structure/display_table_stats.phtml:19
+msgid "Index"
+msgstr "Index"
+
+#: libraries/controllers/TableStructureController.class.php:954
+#: libraries/controllers/TableStructureController.class.php:959
+#: templates/columns_definitions/column_indexes.phtml:27
+#: templates/table/structure/check_all_table_column.phtml:37
+msgid "Spatial"
+msgstr "Spatial"
+
+#: libraries/controllers/TableStructureController.class.php:955
+#: libraries/controllers/TableStructureController.class.php:960
+#: templates/columns_definitions/column_indexes.phtml:22
+#: templates/table/structure/check_all_table_column.phtml:47
+msgid "Fulltext"
+msgstr "Fulltext"
+
+#: libraries/controllers/TableStructureController.class.php:963
+msgid "Distinct values"
+msgstr "Distinkta värden"
+
 #: libraries/core.lib.php:306
 #, php-format
 msgid "The %s extension is missing. Please check your PHP configuration."
@@ -8526,7 +8542,7 @@ msgid "No Password"
 msgstr "Inget lösenord"
 
 #: libraries/display_change_password.lib.php:68
-#: libraries/plugins/auth/AuthenticationCookie.class.php:199
+#: libraries/plugins/auth/AuthenticationCookie.class.php:187
 #: libraries/replication_gui.lib.php:422 libraries/replication_gui.lib.php:862
 #: libraries/server_privileges.lib.php:1640
 msgid "Password:"
@@ -9349,12 +9365,12 @@ msgid "Dump has been saved to file %s."
 msgstr "Dump har sparats till filen %s."
 
 #: libraries/import.lib.php:202 libraries/insert_edit.lib.php:124
-#: libraries/rte/rte_routines.lib.php:1353 libraries/sql.lib.php:1312
+#: libraries/rte/rte_routines.lib.php:1444 libraries/sql.lib.php:1306
 #: tbl_get_field.php:44
 msgid "MySQL returned an empty result set (i.e. zero rows)."
 msgstr "MySQL returnerade ett tomt resultat (dvs inga rader)."
 
-#: libraries/import.lib.php:265 libraries/sql.lib.php:1326
+#: libraries/import.lib.php:265 libraries/sql.lib.php:1320
 msgid "[ROLLBACK occurred.]"
 msgstr ""
 
@@ -9420,14 +9436,14 @@ msgstr "Skapa ett index för &nbsp;%s&nbsp;kolumn(er)"
 
 #: libraries/insert_edit.lib.php:233
 #: libraries/navigation/Nodes/Node_DatabaseChild.class.php:48
-#: templates/designer/table_list.phtml:40
+#: templates/database/designer/table_list.phtml:40
 msgid "Hide"
 msgstr "Dölj"
 
 #: libraries/insert_edit.lib.php:249
 #: libraries/navigation/Nodes/Node_Function.class.php:32
-#: libraries/rte/rte_routines.lib.php:1495
-#: templates/table/table_header.phtml:4
+#: libraries/rte/rte_routines.lib.php:1586
+#: templates/table/search/table_header.phtml:4
 msgid "Function"
 msgstr "Funktion"
 
@@ -9440,84 +9456,85 @@ msgstr "Binär"
 msgid "Because of its length,<br /> this column might not be editable."
 msgstr "På grund av sin längd,<br /> är denna kolumn kanske inte redigerbar."
 
-#: libraries/insert_edit.lib.php:1050
+#: libraries/insert_edit.lib.php:1048
 msgid "Binary - do not edit"
 msgstr "Binär - ändra inte"
 
-#: libraries/insert_edit.lib.php:1176 libraries/server_privileges.lib.php:470
-#: templates/table/options.phtml:36
+#: libraries/insert_edit.lib.php:1174 libraries/server_privileges.lib.php:470
+#: templates/table/search/options.phtml:36
 msgid "Or"
 msgstr "Eller"
 
-#: libraries/insert_edit.lib.php:1177
+#: libraries/insert_edit.lib.php:1175
 msgid "web server upload directory:"
 msgstr "Uppladdningskatalog på webbserver:"
 
-#: libraries/insert_edit.lib.php:1348 templates/table/input_box.phtml:49
+#: libraries/insert_edit.lib.php:1346
+#: templates/table/search/input_box.phtml:49
 msgid "Edit/Insert"
 msgstr "Redigera / Infoga"
 
-#: libraries/insert_edit.lib.php:1398
+#: libraries/insert_edit.lib.php:1396
 #, php-format
 msgid "Continue insertion with %s rows"
 msgstr "Fortsätt inmatning med %s rader"
 
-#: libraries/insert_edit.lib.php:1428
+#: libraries/insert_edit.lib.php:1426
 msgid "and then"
 msgstr "och sedan"
 
-#: libraries/insert_edit.lib.php:1461
+#: libraries/insert_edit.lib.php:1459
 msgid "Insert as new row"
 msgstr "Lägg till som ny rad"
 
-#: libraries/insert_edit.lib.php:1464
+#: libraries/insert_edit.lib.php:1462
 msgid "Insert as new row and ignore errors"
 msgstr "Infoga som ny rad och ignorera fel"
 
-#: libraries/insert_edit.lib.php:1467
+#: libraries/insert_edit.lib.php:1465
 msgid "Show insert query"
 msgstr "Visa insert-fråga"
 
-#: libraries/insert_edit.lib.php:1487
+#: libraries/insert_edit.lib.php:1485
 msgid "Go back to previous page"
 msgstr "Gå tillbaka till föregående sida"
 
-#: libraries/insert_edit.lib.php:1490
+#: libraries/insert_edit.lib.php:1488
 msgid "Insert another new row"
 msgstr "Lägg till ytterligare en ny rad"
 
-#: libraries/insert_edit.lib.php:1495
+#: libraries/insert_edit.lib.php:1493
 msgid "Go back to this page"
 msgstr "Gå tillbaka till denna sida"
 
-#: libraries/insert_edit.lib.php:1518
+#: libraries/insert_edit.lib.php:1516
 msgid "Edit next row"
 msgstr "Ändra nästa rad"
 
-#: libraries/insert_edit.lib.php:1540
+#: libraries/insert_edit.lib.php:1538
 msgid ""
 "Use TAB key to move from value to value, or CTRL+arrows to move anywhere"
 msgstr ""
 "Använd TAB-tangenten för att flytta från värde till värde, eller CTRL+pil "
 "för att flytta vart som helst"
 
-#: libraries/insert_edit.lib.php:1577 libraries/replication_gui.lib.php:542
-#: libraries/rte/rte_routines.lib.php:1497
+#: libraries/insert_edit.lib.php:1575 libraries/replication_gui.lib.php:542
+#: libraries/rte/rte_routines.lib.php:1588
 #: libraries/server_status_variables.lib.php:220
-#: templates/designer/having_query_panel.phtml:100
-#: templates/designer/options_panel.phtml:73
-#: templates/designer/options_panel.phtml:239
-#: templates/designer/where_query_panel.phtml:69
-#: templates/table/table_header.phtml:10
-#: templates/table/zoom_result_form.phtml:35
+#: templates/database/designer/having_query_panel.phtml:100
+#: templates/database/designer/options_panel.phtml:73
+#: templates/database/designer/options_panel.phtml:239
+#: templates/database/designer/where_query_panel.phtml:69
+#: templates/table/search/table_header.phtml:10
+#: templates/table/search/zoom_result_form.phtml:35
 msgid "Value"
 msgstr "Värde"
 
-#: libraries/insert_edit.lib.php:1937 libraries/sql.lib.php:1309
+#: libraries/insert_edit.lib.php:1935 libraries/sql.lib.php:1303
 msgid "Showing SQL query"
 msgstr "Visar SQL-fråga"
 
-#: libraries/insert_edit.lib.php:1962 libraries/sql.lib.php:1287
+#: libraries/insert_edit.lib.php:1960 libraries/sql.lib.php:1281
 #, php-format
 msgid "Inserted row id: %1$d"
 msgstr "Infogade rad-id: %1$d"
@@ -9936,7 +9953,7 @@ msgstr "Ny"
 #: libraries/navigation/Nodes/Node_View_Container.class.php:26
 #: libraries/navigation/Nodes/Node_View_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:129
-#: templates/structure/show_create.phtml:30
+#: templates/database/structure/show_create.phtml:30
 msgid "Views"
 msgstr "Vy"
 
@@ -10247,7 +10264,7 @@ msgstr "Du har inte tillräcklig behörighet för att vara här nu!"
 
 #: libraries/operations.lib.php:101 libraries/operations.lib.php:249
 #: libraries/operations.lib.php:869 libraries/operations.lib.php:963
-#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:907
+#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:998
 #: templates/columns_definitions/table_fields_definitions.phtml:47
 #, fuzzy
 #| msgid "Edit Privileges"
@@ -10339,22 +10356,22 @@ msgid "Switch to copied table"
 msgstr "Byt till kopierad tabell"
 
 #: libraries/operations.lib.php:1360
-#: templates/structure/check_all_tables.phtml:18
+#: templates/database/structure/check_all_tables.phtml:18
 msgid "Table maintenance"
 msgstr "Tabellunderhåll"
 
 #: libraries/operations.lib.php:1398
-#: templates/structure/check_all_tables.phtml:19
+#: templates/database/structure/check_all_tables.phtml:19
 msgid "Analyze table"
 msgstr "Analysera tabell"
 
 #: libraries/operations.lib.php:1413
-#: templates/structure/check_all_tables.phtml:20
+#: templates/database/structure/check_all_tables.phtml:20
 msgid "Check table"
 msgstr "Kontrollera tabell"
 
 #: libraries/operations.lib.php:1428
-#: templates/structure/check_all_tables.phtml:22
+#: templates/database/structure/check_all_tables.phtml:22
 #, fuzzy
 #| msgid "Check table"
 msgid "Checksum table"
@@ -10374,18 +10391,19 @@ msgid "Flush the table (FLUSH)"
 msgstr "Rensa tabellen (flush)"
 
 #: libraries/operations.lib.php:1477
-#: templates/structure/check_all_tables.phtml:23
-#: templates/structure/display_table_stats.phtml:56
+#: templates/database/structure/check_all_tables.phtml:23
+#: templates/table/structure/display_table_stats.phtml:56
 msgid "Optimize table"
 msgstr "Optimera tabell"
 
 #: libraries/operations.lib.php:1492
-#: templates/structure/check_all_tables.phtml:24
+#: templates/database/structure/check_all_tables.phtml:24
 msgid "Repair table"
 msgstr "Reparera tabell"
 
 #: libraries/operations.lib.php:1538
-#: templates/structure/check_all_tables.phtml:14 view_operations.php:127
+#: templates/database/structure/check_all_tables.phtml:14
+#: view_operations.php:127
 msgid "Delete data or table"
 msgstr "Ta bort data eller tabell"
 
@@ -10512,7 +10530,7 @@ msgid "Cannot connect: invalid settings."
 msgstr "Kan ej skapa förbindelse: ogiltiga inställningar."
 
 #: libraries/plugins/auth/AuthenticationConfig.class.php:108
-#: libraries/plugins/auth/AuthenticationCookie.class.php:134
+#: libraries/plugins/auth/AuthenticationCookie.class.php:122
 #: libraries/plugins/auth/AuthenticationHttp.class.php:96
 #, php-format
 msgid "Welcome to %s"
@@ -10543,36 +10561,36 @@ msgstr ""
 msgid "Retry to connect"
 msgstr "Försök ansluta igen"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:146
+#: libraries/plugins/auth/AuthenticationCookie.class.php:134
 msgid "Your session has expired. Please log in again."
 msgstr "Din session har gått ut. Vänligen logga in igen."
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:170
+#: libraries/plugins/auth/AuthenticationCookie.class.php:158
 msgid "Log in"
 msgstr "Logga in"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:178
-#: libraries/plugins/auth/AuthenticationCookie.class.php:188
+#: libraries/plugins/auth/AuthenticationCookie.class.php:166
+#: libraries/plugins/auth/AuthenticationCookie.class.php:176
 msgid "You can enter hostname/IP address and port separated by space."
 msgstr "Du kan ange värdnamn/IP-adress och port separerade med mellanslag."
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:193
+#: libraries/plugins/auth/AuthenticationCookie.class.php:181
 msgid "Username:"
 msgstr "Användarnamn:"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:205
+#: libraries/plugins/auth/AuthenticationCookie.class.php:193
 msgid "Server Choice:"
 msgstr "Serverval:"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:386
+#: libraries/plugins/auth/AuthenticationCookie.class.php:374
 msgid "Entered captcha is wrong, try again!"
 msgstr "Angivet captcha är fel, försök igen!"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:396
+#: libraries/plugins/auth/AuthenticationCookie.class.php:384
 msgid "Please enter correct captcha!"
 msgstr "Ange korrekt captcha!"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:423
+#: libraries/plugins/auth/AuthenticationCookie.class.php:411
 #, fuzzy
 #| msgid "Cannot log in to the MySQL server"
 msgid "You are not allowed to log in to this MySQL server!"
@@ -10670,7 +10688,7 @@ msgstr "Händelse"
 #: libraries/plugins/export/ExportOdt.class.php:593
 #: libraries/plugins/export/ExportTexytext.class.php:428
 #: libraries/plugins/export/PMA_ExportPdf.class.php:313
-#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:984
 #: libraries/rte/rte_triggers.lib.php:377
 msgid "Definition"
 msgstr "Definition"
@@ -11004,7 +11022,7 @@ msgid "Last check:"
 msgstr "Senaste kontroll:"
 
 #: libraries/plugins/export/ExportSql.class.php:1399
-#: templates/structure/structure_table_row.phtml:183
+#: templates/database/structure/structure_table_row.phtml:183
 msgid "in use"
 msgstr "används"
 
@@ -11198,20 +11216,14 @@ msgstr "MySQL Spatial Extension stöder inte ESRI-typen \"%s\"."
 msgid "The imported file does not contain any data!"
 msgstr "Den importerade filen innehåller inte några data!"
 
-#: libraries/plugins/import/ImportSql.class.php:169
+#: libraries/plugins/import/ImportSql.class.php:72
 msgid "SQL compatibility mode:"
 msgstr "SQL kompatibilitetsläge:"
 
-#: libraries/plugins/import/ImportSql.class.php:181
+#: libraries/plugins/import/ImportSql.class.php:84
 msgid "Do not use <code>AUTO_INCREMENT</code> for zero values"
 msgstr "Använd inte <code>AUTO_INCREMENT</code> för nollvärden"
 
-#: libraries/plugins/import/ImportSql.class.php:195
-#, fuzzy
-#| msgid "Read misses"
-msgid "Read as multibytes"
-msgstr "Läsmissar"
-
 #: libraries/plugins/import/ImportXml.class.php:54
 msgid "XML"
 msgstr "XML"
@@ -11254,7 +11266,7 @@ msgid "Show grid"
 msgstr "Visa rutnät"
 
 #: libraries/plugins/schema/SchemaPdf.class.php:94
-#: templates/structure/print_view_data_dictionary_link.phtml:6
+#: templates/database/structure/print_view_data_dictionary_link.phtml:6
 msgid "Data Dictionary"
 msgstr "Datalexikon"
 
@@ -11285,7 +11297,7 @@ msgid "The %s table doesn't exist!"
 msgstr "Tabellen %s existerar inte!"
 
 #: libraries/plugins/schema/eps/Eps_Relation_Schema.class.php:321
-#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:309
+#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:323
 #, php-format
 msgid "Schema of the %s database - Page %s"
 msgstr "Schema för databasen %s - Sida %s"
@@ -11314,7 +11326,7 @@ msgstr "Innehållsförteckning"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1005
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1028
 #: libraries/tracking.lib.php:884
-#: templates/structure/table_structure_header.phtml:11
+#: templates/table/structure/table_structure_header.phtml:11
 msgid "Extra"
 msgstr "Extra"
 
@@ -11720,11 +11732,11 @@ msgid "Create the needed tables with the <code>%screate_tables.sql</code>."
 msgstr ""
 "Skapa de nödvändiga tabellerna med <code>examples/create_tables.sql</code>."
 
-#: libraries/relation.lib.php:360
+#: libraries/relation.lib.php:357
 msgid "Create a pma user and give access to these tables."
 msgstr "Skapa en PMA användare och ge tillgång till dessa tabeller."
 
-#: libraries/relation.lib.php:365
+#: libraries/relation.lib.php:360
 msgid ""
 "Enable advanced features in configuration file (<code>config.inc.php</"
 "code>), for example by starting from <code>config.sample.inc.php</code>."
@@ -11733,24 +11745,24 @@ msgstr ""
 "code>), till exempel genom att starta från <code>config.sample.inc.php</"
 "code>."
 
-#: libraries/relation.lib.php:373
+#: libraries/relation.lib.php:365
 msgid "Re-login to phpMyAdmin to load the updated configuration file."
 msgstr ""
 "Logga in igen till phpMyAdmin för att ladda den uppdaterade "
 "konfigurationsfilen."
 
-#: libraries/relation.lib.php:1612
+#: libraries/relation.lib.php:1607
 msgid "no description"
 msgstr "ingen beskrivning"
 
-#: libraries/relation.lib.php:1811
+#: libraries/relation.lib.php:1806
 msgid ""
 "You do not have necessary privileges to create a database named "
 "'phpmyadmin'. You may go to 'Operations' tab of any database to set up the "
 "phpMyAdmin configuration storage there."
 msgstr ""
 
-#: libraries/relation.lib.php:1928
+#: libraries/relation.lib.php:1923
 #, fuzzy, php-format
 #| msgid "Missing phpMyAdmin configuration storage tables"
 msgid ""
@@ -11758,21 +11770,21 @@ msgid ""
 "configuration storage there."
 msgstr "Saknade phpMyAdmin konfiguration lagringstabeller"
 
-#: libraries/relation.lib.php:1936
+#: libraries/relation.lib.php:1931
 #, fuzzy, php-format
 #| msgid "Missing phpMyAdmin configuration storage tables"
 msgid ""
 "%sCreate%s the phpMyAdmin configuration storage in the current database."
 msgstr "Saknade phpMyAdmin konfiguration lagringstabeller"
 
-#: libraries/relation.lib.php:1944
+#: libraries/relation.lib.php:1939
 #, fuzzy, php-format
 #| msgid "Missing phpMyAdmin configuration storage tables"
 msgid "%sCreate%s missing phpMyAdmin configuration storage tables."
 msgstr "Saknade phpMyAdmin konfiguration lagringstabeller"
 
 #: libraries/replication_gui.lib.php:46 libraries/replication_gui.lib.php:343
-#: libraries/server_databases.lib.php:387
+#: libraries/server_databases.lib.php:398
 msgid "Master replication"
 msgstr "Master-replikering"
 
@@ -11844,7 +11856,7 @@ msgstr ""
 "som master."
 
 #: libraries/replication_gui.lib.php:141
-#: libraries/server_databases.lib.php:389
+#: libraries/server_databases.lib.php:400
 msgid "Slave replication"
 msgstr "Slav-replikering"
 
@@ -12118,10 +12130,10 @@ msgid "Master server changed successfully to %s."
 msgstr "Huvudservern har ändrats till %s."
 
 #: libraries/rte/rte_events.lib.php:106 libraries/rte/rte_events.lib.php:115
-#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:149
-#: libraries/rte/rte_routines.lib.php:158
-#: libraries/rte/rte_routines.lib.php:231
-#: libraries/rte/rte_routines.lib.php:1362
+#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:219
+#: libraries/rte/rte_routines.lib.php:246
+#: libraries/rte/rte_routines.lib.php:368
+#: libraries/rte/rte_routines.lib.php:1453
 #: libraries/rte/rte_triggers.lib.php:82 libraries/rte/rte_triggers.lib.php:91
 #: libraries/rte/rte_triggers.lib.php:123
 #, php-format
@@ -12142,7 +12154,7 @@ msgstr "Händelsen %1$s har ändrats."
 msgid "Event %1$s has been created."
 msgstr "Händelsen %1$s har skapats."
 
-#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:251
+#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:266
 #: libraries/rte/rte_triggers.lib.php:144
 msgid "One or more errors have occurred while processing your request:"
 msgstr "Ett eller flera fel har inträffat under hanteringen av din begäran:"
@@ -12151,7 +12163,7 @@ msgstr "Ett eller flera fel har inträffat under hanteringen av din begäran:"
 msgid "Edit event"
 msgstr "Redigera händelse"
 
-#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:794
+#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:885
 #: libraries/rte/rte_triggers.lib.php:323 view_create.php:180
 msgid "Details"
 msgstr "Detaljer"
@@ -12164,7 +12176,7 @@ msgstr "Händelsenamn"
 msgid "Event type"
 msgstr "Händelsetyp"
 
-#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:817
+#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:908
 #, php-format
 msgid "Change to %s"
 msgstr "Ändra till %s"
@@ -12191,12 +12203,14 @@ msgstr "Slut"
 msgid "On completion preserve"
 msgstr "Vid avslut, bevara"
 
-#: libraries/rte/rte_events.lib.php:491 libraries/rte/rte_routines.lib.php:930
+#: libraries/rte/rte_events.lib.php:491
+#: libraries/rte/rte_routines.lib.php:1021
 #: libraries/rte/rte_triggers.lib.php:383 view_create.php:209
 msgid "Definer"
 msgstr "Definierare"
 
-#: libraries/rte/rte_events.lib.php:535 libraries/rte/rte_routines.lib.php:997
+#: libraries/rte/rte_events.lib.php:535
+#: libraries/rte/rte_routines.lib.php:1088
 #: libraries/rte/rte_triggers.lib.php:422
 msgid "The definer must be in the \"username@hostname\" format!"
 msgstr "Definieraren måste vara i formatet: \"användarnamn@hostname\"!"
@@ -12222,9 +12236,9 @@ msgid "You must provide an event definition."
 msgstr "Du måste ange en händelsedefinition."
 
 #: libraries/rte/rte_export.lib.php:43 libraries/rte/rte_general.lib.php:72
-#: libraries/rte/rte_routines.lib.php:345
-#: libraries/rte/rte_routines.lib.php:1198
-#: libraries/rte/rte_routines.lib.php:1411
+#: libraries/rte/rte_routines.lib.php:153
+#: libraries/rte/rte_routines.lib.php:1289
+#: libraries/rte/rte_routines.lib.php:1502
 msgid "Error in processing request:"
 msgstr "Fel i processbegäran:"
 
@@ -12260,97 +12274,97 @@ msgstr ""
 "misslyckas!![/strong] Använd den förbättrade \"mysqli\" utvidgningen för att "
 "undvika eventuella problem."
 
-#: libraries/rte/rte_routines.lib.php:110
-#: libraries/rte/rte_routines.lib.php:1006
+#: libraries/rte/rte_routines.lib.php:123
+msgid "Edit routine"
+msgstr "Redigera rutin"
+
+#: libraries/rte/rte_routines.lib.php:200
+#: libraries/rte/rte_routines.lib.php:1097
 #, php-format
 msgid "Invalid routine type: \"%s\""
 msgstr "Ogiltig rutintyp: \"%s\""
 
-#: libraries/rte/rte_routines.lib.php:170
+#: libraries/rte/rte_routines.lib.php:253
+#, php-format
+msgid "Routine %1$s has been created."
+msgstr "Rutinen %1$s har skapats."
+
+#: libraries/rte/rte_routines.lib.php:380
 msgid "Sorry, we failed to restore the dropped routine."
 msgstr "Tyvärr, vi lyckades inte återställa den slängda rutinen."
 
-#: libraries/rte/rte_routines.lib.php:211
+#: libraries/rte/rte_routines.lib.php:439
 #, fuzzy, php-format
 #| msgid "Routine %1$s has been modified."
 msgid "Routine %1$s has been modified. Privileges have been adjusted."
 msgstr "Rutinen %1$s har modifierats."
 
-#: libraries/rte/rte_routines.lib.php:216
+#: libraries/rte/rte_routines.lib.php:444
 #, php-format
 msgid "Routine %1$s has been modified."
 msgstr "Rutinen %1$s har modifierats."
 
-#: libraries/rte/rte_routines.lib.php:238
-#, php-format
-msgid "Routine %1$s has been created."
-msgstr "Rutinen %1$s har skapats."
-
-#: libraries/rte/rte_routines.lib.php:315
-msgid "Edit routine"
-msgstr "Redigera rutin"
-
-#: libraries/rte/rte_routines.lib.php:797
+#: libraries/rte/rte_routines.lib.php:888
 msgid "Routine name"
 msgstr "Rutinnamn"
 
-#: libraries/rte/rte_routines.lib.php:823
+#: libraries/rte/rte_routines.lib.php:914
 msgid "Parameters"
 msgstr "Parametrar"
 
-#: libraries/rte/rte_routines.lib.php:829
+#: libraries/rte/rte_routines.lib.php:920
 msgid "Direction"
 msgstr "Riktning"
 
-#: libraries/rte/rte_routines.lib.php:847
+#: libraries/rte/rte_routines.lib.php:938
 msgid "Add parameter"
 msgstr "Lägg till parameter"
 
-#: libraries/rte/rte_routines.lib.php:851
+#: libraries/rte/rte_routines.lib.php:942
 msgid "Remove last parameter"
 msgstr "Ta bort senaste parametern"
 
-#: libraries/rte/rte_routines.lib.php:856
+#: libraries/rte/rte_routines.lib.php:947
 msgid "Return type"
 msgstr "Returtyp"
 
-#: libraries/rte/rte_routines.lib.php:862
+#: libraries/rte/rte_routines.lib.php:953
 msgid "Return length/values"
 msgstr "Returnera längd/värden"
 
-#: libraries/rte/rte_routines.lib.php:868
+#: libraries/rte/rte_routines.lib.php:959
 msgid "Return options"
 msgstr "Return alternativ"
 
-#: libraries/rte/rte_routines.lib.php:899
+#: libraries/rte/rte_routines.lib.php:990
 msgid "Is deterministic"
 msgstr "Är deterministisk"
 
-#: libraries/rte/rte_routines.lib.php:920
+#: libraries/rte/rte_routines.lib.php:1011
 msgid ""
 "You do not have sufficient privileges to perform this operation; Please "
 "refer to the documentation for more details"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:935
+#: libraries/rte/rte_routines.lib.php:1026
 msgid "Security type"
 msgstr "Säkerhetstyp"
 
-#: libraries/rte/rte_routines.lib.php:944
+#: libraries/rte/rte_routines.lib.php:1035
 msgid "SQL data access"
 msgstr "SQL dataaccess"
 
-#: libraries/rte/rte_routines.lib.php:1013
+#: libraries/rte/rte_routines.lib.php:1104
 msgid "You must provide a routine name!"
 msgstr "Du måste ange ett rutinnamn!"
 
-#: libraries/rte/rte_routines.lib.php:1047
+#: libraries/rte/rte_routines.lib.php:1138
 #, php-format
 msgid "Invalid direction \"%s\" given for parameter."
 msgstr "Ogiltig riktning \"%s\" angiven för parameter."
 
-#: libraries/rte/rte_routines.lib.php:1069
-#: libraries/rte/rte_routines.lib.php:1131
+#: libraries/rte/rte_routines.lib.php:1160
+#: libraries/rte/rte_routines.lib.php:1222
 msgid ""
 "You must provide length/values for routine parameters of type ENUM, SET, "
 "VARCHAR and VARBINARY."
@@ -12358,37 +12372,37 @@ msgstr ""
 "Du måste ange längd/värden för rutinparametrar av typen ENUM, SET, VARCHAR "
 "och VARBINARY."
 
-#: libraries/rte/rte_routines.lib.php:1095
+#: libraries/rte/rte_routines.lib.php:1186
 msgid "You must provide a name and a type for each routine parameter."
 msgstr "Du måste ange ett namn och en typ för varje rutinparameter."
 
-#: libraries/rte/rte_routines.lib.php:1114
+#: libraries/rte/rte_routines.lib.php:1205
 msgid "You must provide a valid return type for the routine."
 msgstr "Du måste ange en giltig returtyp för händelsen."
 
-#: libraries/rte/rte_routines.lib.php:1174
+#: libraries/rte/rte_routines.lib.php:1265
 msgid "You must provide a routine definition."
 msgstr "Du måste ange en rutindefinition."
 
-#: libraries/rte/rte_routines.lib.php:1285
+#: libraries/rte/rte_routines.lib.php:1376
 #, php-format
 msgid "Execution results of routine %s"
 msgstr "Exekveringsresultat av rutin %s"
 
-#: libraries/rte/rte_routines.lib.php:1340
+#: libraries/rte/rte_routines.lib.php:1431
 #, php-format
 msgid "%d row affected by the last statement inside the procedure."
 msgid_plural "%d rows affected by the last statement inside the procedure."
 msgstr[0] "%d rad berörs av det sista uttrycket inom proceduren."
 msgstr[1] "%d rader berörs av det sista uttrycket inom proceduren."
 
-#: libraries/rte/rte_routines.lib.php:1398
-#: libraries/rte/rte_routines.lib.php:1406
+#: libraries/rte/rte_routines.lib.php:1489
+#: libraries/rte/rte_routines.lib.php:1497
 msgid "Execute routine"
 msgstr "Utför rutin"
 
-#: libraries/rte/rte_routines.lib.php:1485
-#: libraries/rte/rte_routines.lib.php:1488
+#: libraries/rte/rte_routines.lib.php:1576
+#: libraries/rte/rte_routines.lib.php:1579
 msgid "Routine parameters"
 msgstr "Rutinparametrar"
 
@@ -12542,7 +12556,7 @@ msgid "Original position"
 msgstr "Ursprunglig position"
 
 #: libraries/server_bin_log.lib.php:133
-#: templates/structure/display_table_stats.phtml:4
+#: templates/table/structure/display_table_stats.phtml:4
 msgid "Information"
 msgstr "Information"
 
@@ -12580,12 +12594,12 @@ msgstr ""
 "Anm: Att aktivera databas-statistik här kan orsaka tung trafik mellan "
 "webbservern och MySQL-servern."
 
-#: libraries/server_databases.lib.php:364
-#: libraries/server_databases.lib.php:365
+#: libraries/server_databases.lib.php:366
+#: libraries/server_databases.lib.php:371
 msgid "Enable Statistics"
 msgstr "Aktivera Statistik"
 
-#: libraries/server_databases.lib.php:481
+#: libraries/server_databases.lib.php:492
 #, php-format
 msgid "%1$d database has been dropped successfully."
 msgid_plural "%1$d databases have been dropped successfully."
@@ -12960,7 +12974,7 @@ msgid "You have revoked the privileges for %s."
 msgstr "Du har upphävt privilegierna för %s."
 
 #: libraries/server_privileges.lib.php:2059
-#: libraries/server_privileges.lib.php:4290
+#: libraries/server_privileges.lib.php:4316
 #, fuzzy
 #| msgid "Add user group"
 msgid "Add user account"
@@ -13139,59 +13153,59 @@ msgstr "Tar bort %s"
 msgid "The privileges were reloaded successfully."
 msgstr "Privilegierna har laddats om."
 
-#: libraries/server_privileges.lib.php:3994
+#: libraries/server_privileges.lib.php:4003
 #, php-format
 msgid "The user %s already exists!"
 msgstr "Användaren %s finns redan!"
 
-#: libraries/server_privileges.lib.php:4232
+#: libraries/server_privileges.lib.php:4258
 #, php-format
 msgid "Privileges for %s"
 msgstr "Privilegier för %s"
 
-#: libraries/server_privileges.lib.php:4241
+#: libraries/server_privileges.lib.php:4267
 #: libraries/server_status_processes.lib.php:72
 #: libraries/server_user_groups.lib.php:39
 msgid "User"
 msgstr "Användare"
 
-#: libraries/server_privileges.lib.php:4282
+#: libraries/server_privileges.lib.php:4308
 msgctxt "Create new user"
 msgid "New"
 msgstr "Ny"
 
-#: libraries/server_privileges.lib.php:4311
+#: libraries/server_privileges.lib.php:4337
 #, fuzzy
 #| msgid "Edit Privileges:"
 msgid "Edit privileges:"
 msgstr "Ändra privilegier:"
 
-#: libraries/server_privileges.lib.php:4312
+#: libraries/server_privileges.lib.php:4338
 #, fuzzy
 #| msgid "User group"
 msgid "User account"
 msgstr "Användargrupp"
 
-#: libraries/server_privileges.lib.php:4371
+#: libraries/server_privileges.lib.php:4397
 msgid ""
 "Note: You are attempting to edit privileges of the user with which you are "
 "currently logged in."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4391 libraries/server_users.lib.php:25
+#: libraries/server_privileges.lib.php:4417 libraries/server_users.lib.php:25
 #, fuzzy
 #| msgid "Users overview"
 msgid "User accounts overview"
 msgstr "Användaröversikt"
 
-#: libraries/server_privileges.lib.php:4459
+#: libraries/server_privileges.lib.php:4485
 msgid ""
 "A user account allowing any user from localhost to connect is present. This "
 "will prevent other users from connecting if the host part of their account "
 "allows a connection from any (%) host."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4500
+#: libraries/server_privileges.lib.php:4526
 #, php-format
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
@@ -13204,7 +13218,7 @@ msgstr ""
 "behörigheter servern använder, om manuella ändringar har gjorts. Är så "
 "fallet bör du %sladda om behörigheterna%s innan du fortsätter."
 
-#: libraries/server_privileges.lib.php:4519
+#: libraries/server_privileges.lib.php:4545
 #, fuzzy
 #| msgid ""
 #| "Note: phpMyAdmin gets the users' privileges directly from MySQL's "
@@ -13223,25 +13237,25 @@ msgstr ""
 "behörigheter servern använder, om manuella ändringar har gjorts. Är så "
 "fallet bör du %sladda om behörigheterna%s innan du fortsätter."
 
-#: libraries/server_privileges.lib.php:4569
+#: libraries/server_privileges.lib.php:4595
 msgid "The selected user was not found in the privilege table."
 msgstr "Den valda användaren kunde inte hittas i privilegietabellen."
 
-#: libraries/server_privileges.lib.php:4801
+#: libraries/server_privileges.lib.php:4827
 msgid "You have added a new user."
 msgstr "Du har lagt till en ny användare."
 
-#: libraries/server_status.lib.php:53
+#: libraries/server_status.lib.php:60
 #, php-format
 msgid "Network traffic since startup: %s"
 msgstr "Nätverkstrafik sedan start: %s"
 
-#: libraries/server_status.lib.php:66
+#: libraries/server_status.lib.php:73
 #, php-format
 msgid "This MySQL server has been running for %1$s. It started up on %2$s."
 msgstr "Denna MySQL-servern har varit igång i %1$s. Den startade den %2$s."
 
-#: libraries/server_status.lib.php:80
+#: libraries/server_status.lib.php:94
 msgid ""
 "This MySQL server works as <b>master</b> and <b>slave</b> in <b>replication</"
 "b> process."
@@ -13249,22 +13263,22 @@ msgstr ""
 "Denna MySQL-server fungerar som <b>master</b> och <b>slave</b> i en "
 "<b>replikerings</b>-process."
 
-#: libraries/server_status.lib.php:85
+#: libraries/server_status.lib.php:99
 msgid "This MySQL server works as <b>master</b> in <b>replication</b> process."
 msgstr ""
 "Denna MySQL-server arbetar som <b>master</b> i en <b>replikerings</b>-"
 "process."
 
-#: libraries/server_status.lib.php:90
+#: libraries/server_status.lib.php:104
 msgid "This MySQL server works as <b>slave</b> in <b>replication</b> process."
 msgstr ""
 "Denna MySQL-server arbetar som <b>slave</b> i en <b>replikerings</b>-process."
 
-#: libraries/server_status.lib.php:106
+#: libraries/server_status.lib.php:116
 msgid "Replication status"
 msgstr "Replikeringsstatus"
 
-#: libraries/server_status.lib.php:137
+#: libraries/server_status.lib.php:146
 msgid ""
 "On a busy server, the byte counters may overrun, so those statistics as "
 "reported by the MySQL server may be incorrect."
@@ -13272,21 +13286,21 @@ msgstr ""
 "På en upptagen server kan byte-räknare spåra ur, så statistiken som "
 "rapporteras av MySQL-servern kan vara fel."
 
-#: libraries/server_status.lib.php:148
+#: libraries/server_status.lib.php:157
 msgid "Received"
 msgstr "Mottagna"
 
-#: libraries/server_status.lib.php:167
+#: libraries/server_status.lib.php:176
 msgid "Sent"
 msgstr "Skickade"
 
-#: libraries/server_status.lib.php:234
+#: libraries/server_status.lib.php:243
 #, fuzzy
 #| msgid "max. concurrent connections"
 msgid "Max. concurrent connections"
 msgstr "max. samtidiga förbindelser"
 
-#: libraries/server_status.lib.php:244
+#: libraries/server_status.lib.php:253
 msgid "Failed attempts"
 msgstr "Misslyckade försök"
 
@@ -14359,7 +14373,7 @@ msgstr ""
 msgid "Not implemented yet."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/AlterOperation.php:193
+#: libraries/sql-parser/src/Components/AlterOperation.php:191
 #, fuzzy
 #| msgid "Iconic table operations"
 msgid "Unrecognized alter operation."
@@ -14375,7 +14389,7 @@ msgid "An opening bracket followed by a set of values was expected."
 msgstr ""
 
 #: libraries/sql-parser/src/Components/ArrayObj.php:101
-#: libraries/sql-parser/src/Components/FieldDefinition.php:202
+#: libraries/sql-parser/src/Components/CreateDefinition.php:202
 msgid "An opening bracket was expected."
 msgstr ""
 
@@ -14383,25 +14397,35 @@ msgstr ""
 msgid "A comma or a closing bracket was expected"
 msgstr ""
 
+#: libraries/sql-parser/src/Components/CreateDefinition.php:246
+#, fuzzy
+#| msgid "No databases selected."
+msgid "A comma or a closing bracket was expected."
+msgstr "Inga databaser markerade."
+
+#: libraries/sql-parser/src/Components/CreateDefinition.php:262
+msgid "A closing bracket was expected."
+msgstr ""
+
 #: libraries/sql-parser/src/Components/DataType.php:125
 msgid "Unrecognized data type."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:225
+#: libraries/sql-parser/src/Components/Expression.php:227
 msgid "Unexpected closing bracket."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:246
-#: libraries/sql-parser/src/Components/Expression.php:283
-#: libraries/sql-parser/src/Components/Expression.php:303
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:285
+#: libraries/sql-parser/src/Components/Expression.php:305
 msgid "An alias was previously found."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:257
+#: libraries/sql-parser/src/Components/Expression.php:259
 msgid "Unexpected dot."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:327
+#: libraries/sql-parser/src/Components/Expression.php:329
 #, fuzzy
 #| msgid "No databases selected."
 msgid "An alias was expected."
@@ -14413,16 +14437,6 @@ msgstr "Inga databaser markerade."
 msgid "An expression was expected."
 msgstr "Inga rader valda"
 
-#: libraries/sql-parser/src/Components/FieldDefinition.php:246
-#, fuzzy
-#| msgid "No databases selected."
-msgid "A comma or a closing bracket was expected."
-msgstr "Inga databaser markerade."
-
-#: libraries/sql-parser/src/Components/FieldDefinition.php:262
-msgid "A closing bracket was expected."
-msgstr ""
-
 #: libraries/sql-parser/src/Components/Limit.php:90
 #: libraries/sql-parser/src/Components/Limit.php:112
 msgid "An offset was expected."
@@ -14470,29 +14484,29 @@ msgstr ""
 msgid "Expected delimiter."
 msgstr ""
 
-#: libraries/sql-parser/src/Lexer.php:753
+#: libraries/sql-parser/src/Lexer.php:777
 #, fuzzy, php-format
 #| msgid "Event %1$s has been created."
 msgid "Ending quote %1$s was expected."
 msgstr "Händelsen %1$s har skapats."
 
-#: libraries/sql-parser/src/Lexer.php:789
+#: libraries/sql-parser/src/Lexer.php:813
 #, fuzzy
 #| msgid "Table name template"
 msgid "Variable name was expected."
 msgstr "Mall för tabellnamn"
 
-#: libraries/sql-parser/src/Parser.php:380
+#: libraries/sql-parser/src/Parser.php:391
 #, fuzzy
 #| msgid "At Beginning of Table"
 msgid "Unexpected beginning of statement."
 msgstr "I början av tabellen"
 
-#: libraries/sql-parser/src/Parser.php:399
+#: libraries/sql-parser/src/Parser.php:410
 msgid "Unrecognized statement type."
 msgstr ""
 
-#: libraries/sql-parser/src/Parser.php:479
+#: libraries/sql-parser/src/Parser.php:489
 msgid "No transaction was previously started."
 msgstr ""
 
@@ -14522,8 +14536,10 @@ msgid "The name of the entity was expected."
 msgstr "Antalet tabeller som är öppna."
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:310
-msgid "At least one field definition was expected."
-msgstr ""
+#, fuzzy
+#| msgid "The row has been deleted."
+msgid "At least one column definition was expected."
+msgstr "Raden har raderats."
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:329
 msgid "A \"RETURNS\" keyword was expected."
@@ -14582,11 +14598,11 @@ msgstr "Bokmärke ej skapat!"
 msgid "Using bookmark \"%s\" as default browse query."
 msgstr "Använd bokmärket \"%s\" som standard webbläsarfråga."
 
-#: libraries/sql.lib.php:1306
+#: libraries/sql.lib.php:1300
 msgid "Showing as PHP code"
 msgstr "Visar som PHP-kod"
 
-#: libraries/sql.lib.php:1638
+#: libraries/sql.lib.php:1632
 #, fuzzy, php-format
 #| msgid ""
 #| "Current selection does not contain a unique column. Grid edit, checkbox, "
@@ -14599,7 +14615,7 @@ msgstr ""
 "rutnätsredigera, kryssruta, redigera, kopiera och radera är inte "
 "tillgängliga."
 
-#: libraries/sql.lib.php:1649
+#: libraries/sql.lib.php:1643
 #, fuzzy, php-format
 #| msgid ""
 #| "Current selection does not contain a unique column. Grid edit, checkbox, "
@@ -14612,7 +14628,7 @@ msgstr ""
 "rutnätsredigera, kryssruta, redigera, kopiera och radera är inte "
 "tillgängliga."
 
-#: libraries/sql.lib.php:1688
+#: libraries/sql.lib.php:1682
 #, php-format
 msgid "Problems with indexes of table `%s`"
 msgstr "Problem med index för tabell `%s`"
@@ -14774,7 +14790,7 @@ msgid "Version %s snapshot (SQL code)"
 msgstr "Version %s ögonblicksbild (SQL-kod)"
 
 #: libraries/tracking.lib.php:947
-#: templates/structure/table_structure_row.phtml:33
+#: templates/table/structure/table_structure_row.phtml:33
 msgctxt "None for default"
 msgid "None"
 msgstr "Inget"
@@ -14829,15 +14845,15 @@ msgstr "Skapa version %1$s av %2$s"
 msgid "Version %1$s was created, tracking for %2$s is active."
 msgstr "Version %1$s är skapad, spårning för %2$s är aktiv."
 
-#: libraries/user_preferences.inc.php:29
+#: libraries/user_preferences.inc.php:30
 msgid "Manage your settings"
 msgstr "Hantera dina inställningar"
 
-#: libraries/user_preferences.inc.php:46 prefs_manage.php:307
+#: libraries/user_preferences.inc.php:54 prefs_manage.php:307
 msgid "Configuration has been saved."
 msgstr "Konfigurationen har sparats."
 
-#: libraries/user_preferences.inc.php:66
+#: libraries/user_preferences.inc.php:74
 #, php-format
 msgid ""
 "Your preferences will be saved for current session only. Storing them "
@@ -15242,7 +15258,7 @@ msgid "first"
 msgstr "först"
 
 #: templates/columns_definitions/move_column.phtml:12
-#: templates/structure/add_column.phtml:21
+#: templates/table/structure/add_column.phtml:21
 #, php-format
 msgid "after %s"
 msgstr "efter %s"
@@ -15319,219 +15335,324 @@ msgstr "Webbläsaromvandling"
 msgid "Input transformation options"
 msgstr "Omvandlingsparametrar"
 
-#: templates/designer/aggregate_query_panel.phtml:22
-#: templates/designer/options_panel.phtml:100
+#: templates/database/create_table.phtml:7
+#: templates/database/designer/side_menu.phtml:77
+#: templates/database/designer/side_menu.phtml:80
+msgid "Create table"
+msgstr "Skapa tabell"
+
+#: templates/database/create_table.phtml:15
+msgid "Number of columns"
+msgstr "Antal kolumner"
+
+#: templates/database/designer/aggregate_query_panel.phtml:22
+#: templates/database/designer/options_panel.phtml:100
 msgid "Aggregate"
 msgstr "Aggregera"
 
-#: templates/designer/aggregate_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:61
-#: templates/designer/options_panel.phtml:106
-#: templates/designer/options_panel.phtml:170
-#: templates/designer/where_query_panel.phtml:30
-#: templates/table/table_header.phtml:9
+#: templates/database/designer/aggregate_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:61
+#: templates/database/designer/options_panel.phtml:106
+#: templates/database/designer/options_panel.phtml:170
+#: templates/database/designer/where_query_panel.phtml:30
+#: templates/table/search/table_header.phtml:9
 msgid "Operator"
 msgstr "Aktör"
 
-#: templates/designer/database_tables.phtml:29
+#: templates/database/designer/database_tables.phtml:29
 msgid "Toggle"
 msgstr ""
 
-#: templates/designer/database_tables.phtml:40
+#: templates/database/designer/database_tables.phtml:40
 #, fuzzy
 #| msgid "Table structure"
 msgid "See table structure"
 msgstr "Tabellstruktur"
 
-#: templates/designer/delete_relation_panel.phtml:21
+#: templates/database/designer/delete_relation_panel.phtml:21
 msgid "Delete relation"
 msgstr "Ta bort relation"
 
-#: templates/designer/edit_delete_pages.phtml:7
+#: templates/database/designer/edit_delete_pages.phtml:7
 #, fuzzy
 #| msgid "Page titles"
 msgid "Page to open"
 msgstr "Sidtitlar"
 
-#: templates/designer/edit_delete_pages.phtml:7
+#: templates/database/designer/edit_delete_pages.phtml:7
 #, fuzzy
 #| msgid "Relation deleted"
 msgid "Page to delete"
 msgstr "Relation borttagen"
 
-#: templates/designer/having_query_panel.phtml:90
-#: templates/designer/options_panel.phtml:63
-#: templates/designer/options_panel.phtml:229
-#: templates/designer/where_query_panel.phtml:59
+#: templates/database/designer/having_query_panel.phtml:90
+#: templates/database/designer/options_panel.phtml:63
+#: templates/database/designer/options_panel.phtml:229
+#: templates/database/designer/where_query_panel.phtml:59
 msgid "Except"
 msgstr "Förutom"
 
-#: templates/designer/having_query_panel.phtml:102
-#: templates/designer/options_panel.phtml:75
-#: templates/designer/options_panel.phtml:241
-#: templates/designer/where_query_panel.phtml:71
+#: templates/database/designer/having_query_panel.phtml:102
+#: templates/database/designer/options_panel.phtml:75
+#: templates/database/designer/options_panel.phtml:241
+#: templates/database/designer/where_query_panel.phtml:71
 msgid "subquery"
 msgstr "underfråga"
 
-#: templates/designer/new_relation_panel.phtml:22
-#: templates/designer/side_menu.phtml:84 templates/designer/side_menu.phtml:87
+#: templates/database/designer/new_relation_panel.phtml:22
+#: templates/database/designer/side_menu.phtml:84
+#: templates/database/designer/side_menu.phtml:87
 msgid "Create relation"
 msgstr "Skapa relation"
 
-#: templates/designer/options_panel.phtml:34
-#: templates/designer/options_panel.phtml:200
+#: templates/database/designer/options_panel.phtml:34
+#: templates/database/designer/options_panel.phtml:200
 msgid "Relation operator"
 msgstr "Relationsoperator"
 
-#: templates/designer/options_panel.phtml:85
-#: templates/designer/rename_to_panel.phtml:23
+#: templates/database/designer/options_panel.phtml:85
+#: templates/database/designer/rename_to_panel.phtml:23
 msgid "Rename to"
 msgstr "Byt namn till"
 
-#: templates/designer/options_panel.phtml:91
-#: templates/designer/rename_to_panel.phtml:31
+#: templates/database/designer/options_panel.phtml:91
+#: templates/database/designer/rename_to_panel.phtml:31
 msgid "New name"
 msgstr "Nytt namn"
 
-#: templates/designer/page_save_as.phtml:4
+#: templates/database/designer/page_save_as.phtml:4
 #, fuzzy
 #| msgid "Export to selected page."
 msgid "Save to selected page"
 msgstr "Exportera till vald sida."
 
-#: templates/designer/page_save_as.phtml:5
+#: templates/database/designer/page_save_as.phtml:5
 #, fuzzy
 #| msgid "Create a page and export to it."
 msgid "Create a page and save to it"
 msgstr "Skapa en sida och exportera till den."
 
-#: templates/designer/page_save_as.phtml:26
+#: templates/database/designer/page_save_as.phtml:26
 #, fuzzy
 #| msgid "New page name: "
 msgid "New page name"
 msgstr "Nytt sidnamn: "
 
-#: templates/designer/page_selector.phtml:2
+#: templates/database/designer/page_selector.phtml:2
 msgid "Select page"
 msgstr "Välj sida"
 
-#: templates/designer/query_details.phtml:10
+#: templates/database/designer/query_details.phtml:10
 msgid "Active options"
 msgstr "Aktiva alternativ"
 
-#: templates/designer/schema_export.phtml:4
+#: templates/database/designer/schema_export.phtml:4
 msgid "Select Export Relational Type"
 msgstr "Välj Exportera Relationell Typ"
 
-#: templates/designer/side_menu.phtml:19 templates/designer/side_menu.phtml:25
+#: templates/database/designer/side_menu.phtml:19
+#: templates/database/designer/side_menu.phtml:25
 #, fuzzy
 #| msgid "Showing tables:"
 msgid "Show/Hide tables list"
 msgstr "Visar tabeller:"
 
-#: templates/designer/side_menu.phtml:29 templates/designer/side_menu.phtml:35
-#: templates/designer/side_menu.phtml:36
+#: templates/database/designer/side_menu.phtml:29
+#: templates/database/designer/side_menu.phtml:35
+#: templates/database/designer/side_menu.phtml:36
 msgid "View in fullscreen"
 msgstr "Visa i helskärmsläge"
 
-#: templates/designer/side_menu.phtml:34
+#: templates/database/designer/side_menu.phtml:34
 msgid "Exit fullscreen"
 msgstr "Avsluta helskärmsläge"
 
-#: templates/designer/side_menu.phtml:41 templates/designer/side_menu.phtml:45
+#: templates/database/designer/side_menu.phtml:41
+#: templates/database/designer/side_menu.phtml:45
 #, fuzzy
 #| msgid "New name"
 msgid "New page"
 msgstr "Nytt namn"
 
-#: templates/designer/side_menu.phtml:70 templates/designer/side_menu.phtml:73
+#: templates/database/designer/side_menu.phtml:70
+#: templates/database/designer/side_menu.phtml:73
 #, fuzzy
 #| msgid "Select page"
 msgid "Delete pages"
 msgstr "Välj sida"
 
-#: templates/designer/side_menu.phtml:77 templates/designer/side_menu.phtml:80
-#: templates/table/create_table.phtml:7
-msgid "Create table"
-msgstr "Skapa tabell"
-
-#: templates/designer/side_menu.phtml:98
-#: templates/designer/side_menu.phtml:101
+#: templates/database/designer/side_menu.phtml:98
+#: templates/database/designer/side_menu.phtml:101
 msgid "Reload"
 msgstr "Uppdatera"
 
-#: templates/designer/side_menu.phtml:107
-#: templates/designer/side_menu.phtml:110
+#: templates/database/designer/side_menu.phtml:107
+#: templates/database/designer/side_menu.phtml:110
 msgid "Help"
 msgstr "Hjälp"
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Angular links"
 msgstr "Vinklade länkar"
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Direct links"
 msgstr "Direkta länkar"
 
-#: templates/designer/side_menu.phtml:122
-#: templates/designer/side_menu.phtml:124
+#: templates/database/designer/side_menu.phtml:122
+#: templates/database/designer/side_menu.phtml:124
 msgid "Snap to grid"
 msgstr "Fäst vid rutnät"
 
-#: templates/designer/side_menu.phtml:128
-#: templates/designer/side_menu.phtml:134
+#: templates/database/designer/side_menu.phtml:128
+#: templates/database/designer/side_menu.phtml:134
 msgid "Small/Big All"
 msgstr "Små/Stora Alla"
 
-#: templates/designer/side_menu.phtml:138
-#: templates/designer/side_menu.phtml:141
+#: templates/database/designer/side_menu.phtml:138
+#: templates/database/designer/side_menu.phtml:141
 msgid "Toggle small/big"
 msgstr "Växla liten/stor"
 
-#: templates/designer/side_menu.phtml:145
-#: templates/designer/side_menu.phtml:148
+#: templates/database/designer/side_menu.phtml:145
+#: templates/database/designer/side_menu.phtml:148
 msgid "Toggle relation lines"
 msgstr "Växla mellan relaterade linjer"
 
-#: templates/designer/side_menu.phtml:153
-#: templates/designer/side_menu.phtml:156
+#: templates/database/designer/side_menu.phtml:153
+#: templates/database/designer/side_menu.phtml:156
 #, fuzzy
 #| msgid "Export all"
 msgid "Export schema"
 msgstr "Exportera allt"
 
-#: templates/designer/side_menu.phtml:165
-#: templates/designer/side_menu.phtml:168
+#: templates/database/designer/side_menu.phtml:165
+#: templates/database/designer/side_menu.phtml:168
 msgid "Build Query"
 msgstr "Bygg sökfråga"
 
-#: templates/designer/side_menu.phtml:173
-#: templates/designer/side_menu.phtml:177
+#: templates/database/designer/side_menu.phtml:173
+#: templates/database/designer/side_menu.phtml:177
 msgid "Move Menu"
 msgstr "Flytta meny"
 
-#: templates/designer/side_menu.phtml:181
-#: templates/designer/side_menu.phtml:186
+#: templates/database/designer/side_menu.phtml:181
+#: templates/database/designer/side_menu.phtml:186
 #, fuzzy
 #| msgid "Partial texts"
 msgid "Pin text"
 msgstr "Förkortade texter"
 
-#: templates/designer/table_list.phtml:4
+#: templates/database/designer/table_list.phtml:4
 msgid "Hide/Show all"
 msgstr "Dölj/Visa alla"
 
-#: templates/designer/table_list.phtml:14
+#: templates/database/designer/table_list.phtml:14
 msgid "Hide/Show Tables with no relation"
 msgstr "Dölj/visa tabeller utan relationer"
 
-#: templates/designer/table_list.phtml:59
+#: templates/database/designer/table_list.phtml:59
 msgid "Number of tables:"
 msgstr "Antal tabeller:"
 
+#: templates/database/structure/body_for_table_summary.phtml:6
+#, php-format
+msgid "%s table"
+msgid_plural "%s tables"
+msgstr[0] "%s tabell"
+msgstr[1] "%s tabeller"
+
+#: templates/database/structure/body_for_table_summary.phtml:17
+msgid "Sum"
+msgstr "Summa"
+
+#: templates/database/structure/check_all_tables.phtml:6
+msgid "Check tables having overhead"
+msgstr "Kontrollera tabeller med overhead"
+
+#: templates/database/structure/check_all_tables.phtml:10
+#, fuzzy
+#| msgid "Show color"
+msgid "Show create"
+msgstr "Visa färg"
+
+#: templates/database/structure/check_all_tables.phtml:27
+#, fuzzy
+#| msgid "Add prefix"
+msgid "Prefix"
+msgstr "Lägg till prefix"
+
+#: templates/database/structure/check_all_tables.phtml:28
+msgid "Add prefix to table"
+msgstr "Lägg till prefix till tabellen"
+
+#: templates/database/structure/check_all_tables.phtml:29
+msgid "Replace table prefix"
+msgstr "Ersätt tabellprefix"
+
+#: templates/database/structure/check_all_tables.phtml:30
+msgid "Copy table with prefix"
+msgstr "Kopiera tabell med prefix"
+
+#: templates/database/structure/check_all_tables.phtml:36
+#, fuzzy
+#| msgid "CHAR textarea columns"
+msgid "Add columns to central list"
+msgstr "Kolumner för CHAR textfält"
+
+#: templates/database/structure/check_all_tables.phtml:37
+msgid "Remove columns from central list"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:38
+#, fuzzy
+#| msgid "CHAR textarea columns"
+msgid "Make consistent with central list"
+msgstr "Kolumner för CHAR textfält"
+
+#: templates/database/structure/favorite_anchor.phtml:12
+msgid "Add to Favorites"
+msgstr "Lägg till i favoriter"
+
+#: templates/database/structure/show_create.phtml:2
+#, fuzzy
+#| msgid "Show SQL queries"
+msgid "Showing create queries"
+msgstr "Visa SQL-frågor"
+
+#: templates/database/structure/sortable_header.phtml:13
+msgid "Sort"
+msgstr "Sortera"
+
+#: templates/database/structure/table_header.phtml:42
+#, fuzzy
+#| msgid "May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]."
+msgid ""
+"May be approximate. Click on the number to get the exact count. See "
+"[doc@faq3-11]FAQ 3.11[/doc]."
+msgstr "Kan vara ungefärligt. Se [doc@faq3-11]FAQ 3.11[/doc]."
+
+#: templates/database/structure/table_header.phtml:66
+#: templates/table/index_form.phtml:127
+msgid "Size"
+msgstr "Storlek"
+
+#: templates/database/structure/table_header.phtml:74
+#: templates/table/structure/display_table_stats.phtml:27
+msgid "Overhead"
+msgstr "Outnyttjat"
+
+#: templates/database/structure/tracking_icon.phtml:4
+msgid "Tracking is active."
+msgstr "Spårning är aktiv."
+
+#: templates/database/structure/tracking_icon.phtml:8
+msgid "Tracking is not active."
+msgstr "Spårning är inaktiv."
+
 #: templates/error/report_form.phtml:7
 msgid ""
 "phpMyAdmin has encountered an error. We have collected data about this error "
@@ -15550,66 +15671,6 @@ msgstr "Du kan undersöka data i felrapporten:"
 msgid "Please explain the steps that lead to the error:"
 msgstr "Var god förklara stegen som leder till felet:"
 
-#: templates/gis_visualization/gis_visualization.phtml:3
-msgid "Display GIS Visualization"
-msgstr "Visa GIS-visualisering"
-
-#: templates/gis_visualization/gis_visualization.phtml:8
-msgid "Label column"
-msgstr "Etikett kolumn"
-
-#: templates/gis_visualization/gis_visualization.phtml:11
-msgid "-- None --"
-msgstr "-- Inget --"
-
-#: templates/gis_visualization/gis_visualization.phtml:19
-msgid "Spatial column"
-msgstr "Spatial kolumn"
-
-#: templates/index_form.phtml:16
-msgid "Index name:"
-msgstr "Indexnamn:"
-
-#: templates/index_form.phtml:19
-msgid ""
-"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
-msgstr ""
-"\"PRIMARY\" <b>måste</b> vara namnet på och <b>endast på</b> en primärnyckel!"
-
-#: templates/index_form.phtml:40
-#, fuzzy
-#| msgid "Index cache size"
-msgid "Index choice:"
-msgstr "Cachestorlek för index"
-
-#: templates/index_form.phtml:57
-msgid "Key block size:"
-msgstr ""
-
-#: templates/index_form.phtml:74
-msgid "Index type:"
-msgstr "Indextyp:"
-
-#: templates/index_form.phtml:86
-#, fuzzy
-#| msgid "User:"
-msgid "Parser:"
-msgstr "Användare:"
-
-#: templates/index_form.phtml:102
-msgid "Comment:"
-msgstr "Kommentar:"
-
-#: templates/index_form.phtml:127 templates/structure/table_header.phtml:66
-msgid "Size"
-msgstr "Storlek"
-
-#: templates/index_form.phtml:149 templates/index_form.phtml:190
-#, fuzzy
-#| msgid "Drag to reorder."
-msgid "Drag to reorder"
-msgstr "Dra för att ändra ordning."
-
 #: templates/prefs_autoload.phtml:9
 msgid ""
 "Your browser has phpMyAdmin configuration for this domain. Would you like to "
@@ -15622,388 +15683,161 @@ msgstr ""
 msgid "Start row:"
 msgstr "Startrad:"
 
-#: templates/structure/actions_in_table_structure.phtml:14
-#, php-format
-msgid "A primary key has been added on %s."
-msgstr "En primär nyckel har lagts till för %s."
-
-#: templates/structure/actions_in_table_structure.phtml:34
-#: templates/structure/actions_in_table_structure.phtml:54
-#: templates/structure/actions_in_table_structure.phtml:79
-#: templates/structure/actions_in_table_structure.phtml:101
-#, php-format
-msgid "An index has been added on %s."
-msgstr "Ett index har lagts till för %s."
-
-#: templates/structure/actions_in_table_structure.phtml:130
-#: templates/structure/check_all_table_column.phtml:59
-#, fuzzy
-#| msgid "Remove column(s)"
-msgid "Remove from central columns"
-msgstr "Radera kolumn(er)"
-
-#: templates/structure/actions_in_table_structure.phtml:138
-#: templates/structure/check_all_table_column.phtml:55
-#, fuzzy
-#| msgid "CHAR textarea columns"
-msgid "Add to central columns"
-msgstr "Kolumner för CHAR textfält"
-
-#: templates/structure/add_column.phtml:7
-#, php-format
-msgid "Add %s column(s)"
-msgstr "Lägg till %s fält"
-
-#: templates/structure/add_column.phtml:12
-#, fuzzy
-#| msgid "At Beginning of Table"
-msgid "at beginning of table"
-msgstr "I början av tabellen"
-
-#: templates/structure/body_for_table_summary.phtml:6
-#, php-format
-msgid "%s table"
-msgid_plural "%s tables"
-msgstr[0] "%s tabell"
-msgstr[1] "%s tabeller"
-
-#: templates/structure/body_for_table_summary.phtml:17
-msgid "Sum"
-msgstr "Summa"
-
-#: templates/structure/check_all_tables.phtml:6
-msgid "Check tables having overhead"
-msgstr "Kontrollera tabeller med overhead"
-
-#: templates/structure/check_all_tables.phtml:10
-#, fuzzy
-#| msgid "Show color"
-msgid "Show create"
-msgstr "Visa färg"
-
-#: templates/structure/check_all_tables.phtml:27
-#, fuzzy
-#| msgid "Add prefix"
-msgid "Prefix"
-msgstr "Lägg till prefix"
-
-#: templates/structure/check_all_tables.phtml:28
-msgid "Add prefix to table"
-msgstr "Lägg till prefix till tabellen"
-
-#: templates/structure/check_all_tables.phtml:29
-msgid "Replace table prefix"
-msgstr "Ersätt tabellprefix"
-
-#: templates/structure/check_all_tables.phtml:30
-msgid "Copy table with prefix"
-msgstr "Kopiera tabell med prefix"
-
-#: templates/structure/check_all_tables.phtml:36
-#, fuzzy
-#| msgid "CHAR textarea columns"
-msgid "Add columns to central list"
-msgstr "Kolumner för CHAR textfält"
-
-#: templates/structure/check_all_tables.phtml:37
-msgid "Remove columns from central list"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:38
-#, fuzzy
-#| msgid "CHAR textarea columns"
-msgid "Make consistent with central list"
-msgstr "Kolumner för CHAR textfält"
-
-#: templates/structure/display_structure.phtml:140 view_create.php:181
-msgid "Edit view"
-msgstr "Redigera vy"
-
-#: templates/structure/display_table_stats.phtml:9
-msgid "Space usage"
-msgstr "Använt utrymme"
-
-#: templates/structure/display_table_stats.phtml:27
-#: templates/structure/table_header.phtml:74
-msgid "Overhead"
-msgstr "Outnyttjat"
-
-#: templates/structure/display_table_stats.phtml:32
-msgid "Effective"
-msgstr "Effektiv"
-
-#: templates/structure/favorite_anchor.phtml:12
-msgid "Add to Favorites"
-msgstr "Lägg till i favoriter"
-
-#: templates/structure/move_columns_dialog.phtml:1
-#: templates/structure/optional_action_links.phtml:21
-msgid "Move columns"
-msgstr "Flytta kolumner"
-
-#: templates/structure/move_columns_dialog.phtml:2
-msgid "Move the columns by dragging them up and down."
-msgstr "Flytta kolumner genom att dra dem uppåt och nedåt."
-
-#: templates/structure/optional_action_links.phtml:9
-msgid "Propose table structure"
-msgstr "Föreslå tabellstruktur"
-
-#: templates/structure/optional_action_links.phtml:24
-#, fuzzy
-#| msgid "Propose table structure"
-msgid "Improve table structure"
-msgstr "Föreslå tabellstruktur"
-
-#: templates/structure/optional_action_links.phtml:30
-#, fuzzy
-#| msgid "Track table"
-msgid "Track view"
-msgstr "Spåra tabell"
-
-#: templates/structure/row_stats_table.phtml:3
-msgid "Row statistics"
-msgstr "Radstatistik"
-
-#: templates/structure/row_stats_table.phtml:9
-msgid "static"
-msgstr "statisk"
-
-#: templates/structure/row_stats_table.phtml:11
-msgid "dynamic"
-msgstr "dynamisk"
-
-#: templates/structure/row_stats_table.phtml:22
-msgid "partitioned"
-msgstr "partitionerad"
-
-#: templates/structure/row_stats_table.phtml:54
-msgid "Row length"
-msgstr "Radlängd"
-
-#: templates/structure/row_stats_table.phtml:66
-msgid "Row size"
-msgstr "Radstorlek"
-
-#: templates/structure/row_stats_table.phtml:73
-msgid "Next autoindex"
-msgstr "Nästa autoindex"
-
-#: templates/structure/secondary_tabs.phtml:14
-#, fuzzy
-#| msgid "Relation view"
-msgid "Relation view"
-msgstr "Visa relationer"
-
-#: templates/structure/show_create.phtml:2
-#, fuzzy
-#| msgid "Show SQL queries"
-msgid "Showing create queries"
-msgstr "Visa SQL-frågor"
-
-#: templates/structure/sortable_header.phtml:13
-msgid "Sort"
-msgstr "Sortera"
-
-#: templates/structure/table_header.phtml:42
-#, fuzzy
-#| msgid "May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]."
-msgid ""
-"May be approximate. Click on the number to get the exact count. See "
-"[doc@faq3-11]FAQ 3.11[/doc]."
-msgstr "Kan vara ungefärligt. Se [doc@faq3-11]FAQ 3.11[/doc]."
-
-#: templates/structure/table_structure_row.phtml:46
-#, php-format
-msgid "Column %s has been dropped."
-msgstr "Kolumnen %s har tagits bort."
-
-#: templates/structure/tracking_icon.phtml:4
-msgid "Tracking is active."
-msgstr "Spårning är aktiv."
-
-#: templates/structure/tracking_icon.phtml:8
-msgid "Tracking is not active."
-msgstr "Spårning är inaktiv."
-
-#: templates/table/create_table.phtml:15
-msgid "Number of columns"
-msgstr "Antal kolumner"
-
-#: templates/table/options.phtml:8
-msgid "Select columns (at least one):"
-msgstr "Markera kolumner (minst en):"
-
-#: templates/table/options.phtml:37
-msgid "Add search conditions (body of the \"where\" clause):"
-msgstr "Lägg till sökvillkor (uttryck i \"where\"-sats):"
-
-#: templates/table/options.phtml:45
-msgid "Number of rows per page"
-msgstr "Antal rader per sida"
-
-#: templates/table/options.phtml:56
-msgid "Display order:"
-msgstr "Visningsordning:"
-
-#: templates/table/options_zoom.phtml:6
-msgid "Use this column to label each point"
-msgstr "Använd denna kolumn för att markera varje punkt"
-
-#: templates/table/options_zoom.phtml:35
-msgid "Maximum rows to plot"
-msgstr "Maximalt antal rader att visa"
-
-#: templates/table/replace_preview.phtml:13
-msgid "Find and replace - preview"
-msgstr "Sök och ersätt - förhandsgranskning"
-
-#: templates/table/replace_preview.phtml:18
-msgid "Original string"
-msgstr "Ursprunglig sträng"
-
-#: templates/table/replace_preview.phtml:19
-msgid "Replaced string"
-msgstr "Ersatt sträng"
-
-#: templates/table/replace_preview.phtml:40
-msgid "Replace"
-msgstr "Ersatt"
-
-#: templates/table/rows_zoom.phtml:16
-msgid "Additional search criteria"
-msgstr "Ytterligare sökkriterier"
-
-#: templates/table/search_and_replace.phtml:3
-msgid "Replace with:"
-msgstr "Ersätt med:"
-
-#: templates/table/search_and_replace.phtml:22
-#, fuzzy
-#| msgid "as regular expression"
-msgid "Use regular expression"
-msgstr "som reguljärt uttryck"
-
-#: templates/table/selection_form.phtml:12
-msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
-msgstr ""
-"Utför en \"Query By Example\" (jokertecken: \"%\") för två olika kolumner"
-
-#: templates/table/selection_form.phtml:34
-msgid "Do a \"query by example\" (wildcard: \"%\")"
-msgstr "Utför en \"Query By Example\" (jokertecken: \"%\")"
-
-#: templates/table/zoom_result_form.phtml:7
-msgid "Browse/Edit the points"
-msgstr "Bläddra / Redigera punkter"
-
-#: templates/table/zoom_result_form.phtml:15
-msgid "How to use"
-msgstr "Hur du använder"
-
-#: templates/table/zoom_result_form.phtml:23
-msgid "Reset zoom"
-msgstr "Återställ zoom"
-
-#: templates/tbl_chart.phtml:17
+#: templates/table/chart/tbl_chart.phtml:17
 msgctxt "Chart type"
 msgid "Bar"
 msgstr "Stapel"
 
-#: templates/tbl_chart.phtml:21
+#: templates/table/chart/tbl_chart.phtml:21
 msgctxt "Chart type"
 msgid "Column"
 msgstr "Kolumn"
 
-#: templates/tbl_chart.phtml:25
+#: templates/table/chart/tbl_chart.phtml:25
 msgctxt "Chart type"
 msgid "Line"
 msgstr "Linjediagram"
 
-#: templates/tbl_chart.phtml:29
+#: templates/table/chart/tbl_chart.phtml:29
 msgctxt "Chart type"
 msgid "Spline"
 msgstr "Spline"
 
-#: templates/tbl_chart.phtml:33
+#: templates/table/chart/tbl_chart.phtml:33
 msgctxt "Chart type"
 msgid "Area"
 msgstr "Ytdiagram"
 
-#: templates/tbl_chart.phtml:37
+#: templates/table/chart/tbl_chart.phtml:37
 msgctxt "Chart type"
 msgid "Pie"
 msgstr "Cirkeldiagram"
 
-#: templates/tbl_chart.phtml:41
+#: templates/table/chart/tbl_chart.phtml:41
 msgctxt "Chart type"
 msgid "Timeline"
 msgstr "Tidslinje"
 
-#: templates/tbl_chart.phtml:45
+#: templates/table/chart/tbl_chart.phtml:45
 msgctxt "Chart type"
 msgid "Scatter"
 msgstr "Sambandsdiagram"
 
-#: templates/tbl_chart.phtml:50
+#: templates/table/chart/tbl_chart.phtml:50
 msgid "Stacked"
 msgstr "Staplade"
 
-#: templates/tbl_chart.phtml:53
+#: templates/table/chart/tbl_chart.phtml:53
 msgid "Chart title"
 msgstr "Diagramtitel"
 
-#: templates/tbl_chart.phtml:57
+#: templates/table/chart/tbl_chart.phtml:57
 msgid "X-Axis:"
 msgstr "X-axel:"
 
-#: templates/tbl_chart.phtml:72
+#: templates/table/chart/tbl_chart.phtml:72
 msgid "Series:"
 msgstr "Serie:"
 
-#: templates/tbl_chart.phtml:102
+#: templates/table/chart/tbl_chart.phtml:102
 msgid "X-Axis label:"
 msgstr "X-axel etikett:"
 
-#: templates/tbl_chart.phtml:104
+#: templates/table/chart/tbl_chart.phtml:104
 msgid "X Values"
 msgstr "X-värden"
 
-#: templates/tbl_chart.phtml:107
+#: templates/table/chart/tbl_chart.phtml:107
 msgid "Y-Axis label:"
 msgstr "Y-axel etikett:"
 
-#: templates/tbl_chart.phtml:115
+#: templates/table/chart/tbl_chart.phtml:115
 msgid "Series names are in a column"
 msgstr ""
 
-#: templates/tbl_chart.phtml:118
+#: templates/table/chart/tbl_chart.phtml:118
 #, fuzzy
 #| msgid "Inside column:"
 msgid "Series column:"
 msgstr "Inuti kolumnen:"
 
-#: templates/tbl_chart.phtml:130
+#: templates/table/chart/tbl_chart.phtml:130
 #, fuzzy
 #| msgid "Values for column %s"
 msgid "Value Column:"
 msgstr "Värden för kolumn %s"
 
-#: templates/tbl_chart.phtml:150
+#: templates/table/chart/tbl_chart.phtml:150
 #, fuzzy
 #| msgid "Save as file"
 msgid "Save chart as image"
 msgstr "Spara som fil"
 
-#: templates/tbl_relation/common_form.phtml:7
+#: templates/table/gis_visualization/gis_visualization.phtml:3
+msgid "Display GIS Visualization"
+msgstr "Visa GIS-visualisering"
+
+#: templates/table/gis_visualization/gis_visualization.phtml:8
+msgid "Label column"
+msgstr "Etikett kolumn"
+
+#: templates/table/gis_visualization/gis_visualization.phtml:11
+msgid "-- None --"
+msgstr "-- Inget --"
+
+#: templates/table/gis_visualization/gis_visualization.phtml:19
+msgid "Spatial column"
+msgstr "Spatial kolumn"
+
+#: templates/table/index_form.phtml:16
+msgid "Index name:"
+msgstr "Indexnamn:"
+
+#: templates/table/index_form.phtml:19
+msgid ""
+"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
+msgstr ""
+"\"PRIMARY\" <b>måste</b> vara namnet på och <b>endast på</b> en primärnyckel!"
+
+#: templates/table/index_form.phtml:40
+#, fuzzy
+#| msgid "Index cache size"
+msgid "Index choice:"
+msgstr "Cachestorlek för index"
+
+#: templates/table/index_form.phtml:57
+msgid "Key block size:"
+msgstr ""
+
+#: templates/table/index_form.phtml:74
+msgid "Index type:"
+msgstr "Indextyp:"
+
+#: templates/table/index_form.phtml:86
+#, fuzzy
+#| msgid "User:"
+msgid "Parser:"
+msgstr "Användare:"
+
+#: templates/table/index_form.phtml:102
+msgid "Comment:"
+msgstr "Kommentar:"
+
+#: templates/table/index_form.phtml:149 templates/table/index_form.phtml:190
+#, fuzzy
+#| msgid "Drag to reorder."
+msgid "Drag to reorder"
+msgstr "Dra för att ändra ordning."
+
+#: templates/table/relation/common_form.phtml:7
 msgid "Internal relations"
 msgstr "Interna relationer"
 
-#: templates/tbl_relation/common_form.phtml:11
+#: templates/table/relation/common_form.phtml:11
 msgid "Internal relation"
 msgstr "Intern relation"
 
-#: templates/tbl_relation/common_form.phtml:14
+#: templates/table/relation/common_form.phtml:14
 msgid ""
 "An internal relation is not necessary when a corresponding FOREIGN KEY "
 "relation exists."
@@ -16011,59 +15845,248 @@ msgstr ""
 "En intern relation är inte nödvändig när en motsvarande FOREIGN KEY relation "
 "finns."
 
-#: templates/tbl_relation/common_form.phtml:37
+#: templates/table/relation/common_form.phtml:37
 #, fuzzy
 #| msgid "Foreign key constraint"
 msgid "Foreign key constraints"
 msgstr "Begränsning av främmande nyckel"
 
-#: templates/tbl_relation/common_form.phtml:40
+#: templates/table/relation/common_form.phtml:40
 #, fuzzy
 #| msgid "Action"
 msgid "Actions"
 msgstr "Åtgärd"
 
-#: templates/tbl_relation/common_form.phtml:41
+#: templates/table/relation/common_form.phtml:41
 #, fuzzy
 #| msgid "Constraints for table"
 msgid "Constraint properties"
 msgstr "Restriktioner för tabell"
 
-#: templates/tbl_relation/common_form.phtml:44
+#: templates/table/relation/common_form.phtml:44
 msgid ""
 "Only columns with index will be displayed. You can define an index below."
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:49
+#: templates/table/relation/common_form.phtml:49
 msgid "Foreign key constraint"
 msgstr "Begränsning av främmande nyckel"
 
-#: templates/tbl_relation/common_form.phtml:81
+#: templates/table/relation/common_form.phtml:81
 #, fuzzy
 #| msgid "Add constraints"
 msgid "+ Add constraint"
 msgstr "Lägg till restriktioner"
 
-#: templates/tbl_relation/common_form.phtml:91
+#: templates/table/relation/common_form.phtml:91
 msgid "Choose column to display:"
 msgstr "Välj kolumn att visa:"
 
-#: templates/tbl_relation/foreign_key_row.phtml:13
+#: templates/table/relation/foreign_key_row.phtml:13
 #, fuzzy, php-format
 #| msgid "Foreign key constraint"
 msgid "Foreign key constraint %s has been dropped"
 msgstr "Begränsning av främmande nyckel"
 
-#: templates/tbl_relation/foreign_key_row.phtml:102
+#: templates/table/relation/foreign_key_row.phtml:102
 msgid "Constraint name"
 msgstr "Begränsningsnamn"
 
-#: templates/tbl_relation/foreign_key_row.phtml:157
+#: templates/table/relation/foreign_key_row.phtml:157
 #, fuzzy
 #| msgid "Add column"
 msgid "+ Add column"
 msgstr "Lägg till kolumn"
 
+#: templates/table/search/options.phtml:8
+msgid "Select columns (at least one):"
+msgstr "Markera kolumner (minst en):"
+
+#: templates/table/search/options.phtml:37
+msgid "Add search conditions (body of the \"where\" clause):"
+msgstr "Lägg till sökvillkor (uttryck i \"where\"-sats):"
+
+#: templates/table/search/options.phtml:45
+msgid "Number of rows per page"
+msgstr "Antal rader per sida"
+
+#: templates/table/search/options.phtml:56
+msgid "Display order:"
+msgstr "Visningsordning:"
+
+#: templates/table/search/options_zoom.phtml:6
+msgid "Use this column to label each point"
+msgstr "Använd denna kolumn för att markera varje punkt"
+
+#: templates/table/search/options_zoom.phtml:35
+msgid "Maximum rows to plot"
+msgstr "Maximalt antal rader att visa"
+
+#: templates/table/search/replace_preview.phtml:13
+msgid "Find and replace - preview"
+msgstr "Sök och ersätt - förhandsgranskning"
+
+#: templates/table/search/replace_preview.phtml:18
+msgid "Original string"
+msgstr "Ursprunglig sträng"
+
+#: templates/table/search/replace_preview.phtml:19
+msgid "Replaced string"
+msgstr "Ersatt sträng"
+
+#: templates/table/search/replace_preview.phtml:40
+msgid "Replace"
+msgstr "Ersatt"
+
+#: templates/table/search/rows_zoom.phtml:16
+msgid "Additional search criteria"
+msgstr "Ytterligare sökkriterier"
+
+#: templates/table/search/search_and_replace.phtml:3
+msgid "Replace with:"
+msgstr "Ersätt med:"
+
+#: templates/table/search/search_and_replace.phtml:22
+#, fuzzy
+#| msgid "as regular expression"
+msgid "Use regular expression"
+msgstr "som reguljärt uttryck"
+
+#: templates/table/search/selection_form.phtml:12
+msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
+msgstr ""
+"Utför en \"Query By Example\" (jokertecken: \"%\") för två olika kolumner"
+
+#: templates/table/search/selection_form.phtml:34
+msgid "Do a \"query by example\" (wildcard: \"%\")"
+msgstr "Utför en \"Query By Example\" (jokertecken: \"%\")"
+
+#: templates/table/search/zoom_result_form.phtml:7
+msgid "Browse/Edit the points"
+msgstr "Bläddra / Redigera punkter"
+
+#: templates/table/search/zoom_result_form.phtml:15
+msgid "How to use"
+msgstr "Hur du använder"
+
+#: templates/table/search/zoom_result_form.phtml:23
+msgid "Reset zoom"
+msgstr "Återställ zoom"
+
+#: templates/table/secondary_tabs.phtml:14
+#, fuzzy
+#| msgid "Relation view"
+msgid "Relation view"
+msgstr "Visa relationer"
+
+#: templates/table/structure/actions_in_table_structure.phtml:14
+#, php-format
+msgid "A primary key has been added on %s."
+msgstr "En primär nyckel har lagts till för %s."
+
+#: templates/table/structure/actions_in_table_structure.phtml:34
+#: templates/table/structure/actions_in_table_structure.phtml:54
+#: templates/table/structure/actions_in_table_structure.phtml:79
+#: templates/table/structure/actions_in_table_structure.phtml:101
+#, php-format
+msgid "An index has been added on %s."
+msgstr "Ett index har lagts till för %s."
+
+#: templates/table/structure/actions_in_table_structure.phtml:130
+#: templates/table/structure/check_all_table_column.phtml:59
+#, fuzzy
+#| msgid "Remove column(s)"
+msgid "Remove from central columns"
+msgstr "Radera kolumn(er)"
+
+#: templates/table/structure/actions_in_table_structure.phtml:138
+#: templates/table/structure/check_all_table_column.phtml:55
+#, fuzzy
+#| msgid "CHAR textarea columns"
+msgid "Add to central columns"
+msgstr "Kolumner för CHAR textfält"
+
+#: templates/table/structure/add_column.phtml:7
+#, php-format
+msgid "Add %s column(s)"
+msgstr "Lägg till %s fält"
+
+#: templates/table/structure/add_column.phtml:12
+#, fuzzy
+#| msgid "At Beginning of Table"
+msgid "at beginning of table"
+msgstr "I början av tabellen"
+
+#: templates/table/structure/display_structure.phtml:140 view_create.php:181
+msgid "Edit view"
+msgstr "Redigera vy"
+
+#: templates/table/structure/display_table_stats.phtml:9
+msgid "Space usage"
+msgstr "Använt utrymme"
+
+#: templates/table/structure/display_table_stats.phtml:32
+msgid "Effective"
+msgstr "Effektiv"
+
+#: templates/table/structure/move_columns_dialog.phtml:1
+#: templates/table/structure/optional_action_links.phtml:21
+msgid "Move columns"
+msgstr "Flytta kolumner"
+
+#: templates/table/structure/move_columns_dialog.phtml:2
+msgid "Move the columns by dragging them up and down."
+msgstr "Flytta kolumner genom att dra dem uppåt och nedåt."
+
+#: templates/table/structure/optional_action_links.phtml:9
+msgid "Propose table structure"
+msgstr "Föreslå tabellstruktur"
+
+#: templates/table/structure/optional_action_links.phtml:24
+#, fuzzy
+#| msgid "Propose table structure"
+msgid "Improve table structure"
+msgstr "Föreslå tabellstruktur"
+
+#: templates/table/structure/optional_action_links.phtml:30
+#, fuzzy
+#| msgid "Track table"
+msgid "Track view"
+msgstr "Spåra tabell"
+
+#: templates/table/structure/row_stats_table.phtml:3
+msgid "Row statistics"
+msgstr "Radstatistik"
+
+#: templates/table/structure/row_stats_table.phtml:9
+msgid "static"
+msgstr "statisk"
+
+#: templates/table/structure/row_stats_table.phtml:11
+msgid "dynamic"
+msgstr "dynamisk"
+
+#: templates/table/structure/row_stats_table.phtml:22
+msgid "partitioned"
+msgstr "partitionerad"
+
+#: templates/table/structure/row_stats_table.phtml:54
+msgid "Row length"
+msgstr "Radlängd"
+
+#: templates/table/structure/row_stats_table.phtml:66
+msgid "Row size"
+msgstr "Radstorlek"
+
+#: templates/table/structure/row_stats_table.phtml:73
+msgid "Next autoindex"
+msgstr "Nästa autoindex"
+
+#: templates/table/structure/table_structure_row.phtml:46
+#, php-format
+msgid "Column %s has been dropped."
+msgstr "Kolumnen %s har tagits bort."
+
 #: themes.php:17 themes.php:22
 msgid "Theme"
 msgstr "Tema"
@@ -17399,6 +17422,11 @@ msgstr ""
 msgid "concurrent_insert is set to 0"
 msgstr "concurrent_insert är satt till 0"
 
+#, fuzzy
+#~| msgid "Read misses"
+#~ msgid "Read as multibytes"
+#~ msgstr "Läsmissar"
+
 #~ msgid "Relational display column"
 #~ msgstr "Kolumn för besläktad nyckel"
 
diff --git a/po/ta.po b/po/ta.po
index 88f415515e..2510355f6e 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 4.5.0-dev\n"
 "Report-Msgid-Bugs-To: developers@phpmyadmin.net\n"
-"POT-Creation-Date: 2015-08-08 13:53-0400\n"
+"POT-Creation-Date: 2015-08-12 08:10-0400\n"
 "PO-Revision-Date: 2015-03-02 19:02+0200\n"
 "Last-Translator: கணேஷ் குமார் <GANESHTHEONE@gmail.com>\n"
 "Language-Team: Tamil <https://hosted.weblate.org/projects/phpmyadmin/master/"
@@ -54,7 +54,7 @@ msgid "Table comments:"
 msgstr "அட்டவணைக் கருத்துரைகள்:"
 
 #: db_datadict.php:104 libraries/Index.class.php:699
-#: libraries/insert_edit.lib.php:1567
+#: libraries/insert_edit.lib.php:1565
 #: libraries/navigation/Nodes/Node_Column.class.php:30
 #: libraries/plugins/export/ExportHtmlword.class.php:280
 #: libraries/plugins/export/ExportHtmlword.class.php:375
@@ -68,13 +68,14 @@ msgstr "அட்டவணைக் கருத்துரைகள்:"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1023
 #: libraries/tracking.lib.php:879 libraries/tracking.lib.php:975
 #: templates/columns_definitions/column_name.phtml:18
-#: templates/index_form.phtml:124 templates/table/table_header.phtml:6
-#: templates/table/zoom_result_form.phtml:33
-#: templates/tbl_relation/common_form.phtml:10
-#: templates/tbl_relation/common_form.phtml:43
-#: templates/tbl_relation/foreign_key_row.phtml:194
-#: templates/tbl_relation/foreign_key_row.phtml:206
-#: templates/tbl_relation/internal_relational_row.phtml:71
+#: templates/table/index_form.phtml:124
+#: templates/table/relation/common_form.phtml:10
+#: templates/table/relation/common_form.phtml:43
+#: templates/table/relation/foreign_key_row.phtml:194
+#: templates/table/relation/foreign_key_row.phtml:206
+#: templates/table/relation/internal_relational_row.phtml:71
+#: templates/table/search/table_header.phtml:6
+#: templates/table/search/zoom_result_form.phtml:33
 msgid "Column"
 msgstr "நிரல்வரிசை"
 
@@ -92,21 +93,21 @@ msgstr "நிரல்வரிசை"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1001
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1024
 #: libraries/rte/rte_list.lib.php:75 libraries/rte/rte_list.lib.php:103
-#: libraries/rte/rte_routines.lib.php:802
-#: libraries/rte/rte_routines.lib.php:831
-#: libraries/rte/rte_routines.lib.php:1493
+#: libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_routines.lib.php:922
+#: libraries/rte/rte_routines.lib.php:1584
 #: libraries/server_privileges.lib.php:2369 libraries/tracking.lib.php:880
 #: libraries/tracking.lib.php:972
 #: templates/columns_definitions/table_fields_definitions.phtml:11
-#: templates/structure/table_header.phtml:48
-#: templates/structure/table_structure_header.phtml:6
-#: templates/table/table_header.phtml:7
+#: templates/database/structure/table_header.phtml:48
+#: templates/table/search/table_header.phtml:7
+#: templates/table/structure/table_structure_header.phtml:6
 msgid "Type"
 msgstr "வகை"
 
 #: db_datadict.php:106 libraries/Index.class.php:702
 #: libraries/central_columns.lib.php:708
-#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1576
+#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1574
 #: libraries/plugins/export/ExportHtmlword.class.php:286
 #: libraries/plugins/export/ExportHtmlword.class.php:381
 #: libraries/plugins/export/ExportLatex.class.php:509
@@ -119,8 +120,8 @@ msgstr "வகை"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1026
 #: libraries/tracking.lib.php:882 libraries/tracking.lib.php:978
 #: templates/columns_definitions/table_fields_definitions.phtml:39
-#: templates/structure/table_structure_header.phtml:9
-#: templates/table/zoom_result_form.phtml:34
+#: templates/table/search/zoom_result_form.phtml:34
+#: templates/table/structure/table_structure_header.phtml:9
 msgid "Null"
 msgstr "வெற்று"
 
@@ -138,8 +139,8 @@ msgstr "வெற்று"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1027
 #: libraries/replication_gui.lib.php:153 libraries/tracking.lib.php:883
 #: templates/columns_definitions/table_fields_definitions.phtml:25
-#: templates/structure/body_for_table_summary.phtml:55
-#: templates/structure/table_structure_header.phtml:10
+#: templates/database/structure/body_for_table_summary.phtml:55
+#: templates/table/structure/table_structure_header.phtml:10
 msgid "Default"
 msgstr "இயல்நிலை"
 
@@ -167,19 +168,19 @@ msgid "Comments"
 msgstr "கருத்துரைகள்"
 
 #: db_datadict.php:146
-#: libraries/controllers/StructureController.class.php:1960
-#: libraries/controllers/StructureController.class.php:1965
+#: libraries/controllers/TableStructureController.class.php:951
+#: libraries/controllers/TableStructureController.class.php:956
 #: libraries/tracking.lib.php:922
 #: templates/columns_definitions/column_indexes.phtml:6
-#: templates/structure/check_all_table_column.phtml:22
-#: templates/structure/display_structure.phtml:74
+#: templates/table/structure/check_all_table_column.phtml:22
+#: templates/table/structure/display_structure.phtml:74
 msgid "Primary"
 msgstr "முதன்மை"
 
 #: db_datadict.php:156 js/messages.php:317 libraries/Index.class.php:567
 #: libraries/Index.class.php:606 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261 libraries/mult_submits.lib.php:403
+#: libraries/config/FormDisplay.tpl.php:272 libraries/mult_submits.lib.php:403
 #: libraries/mult_submits.lib.php:417
 #: libraries/plugins/export/ExportHtmlword.class.php:630
 #: libraries/plugins/export/ExportLatex.class.php:589
@@ -195,20 +196,20 @@ msgstr "முதன்மை"
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1010 libraries/tracking.lib.php:1015
 #: prefs_manage.php:140 templates/prefs_autoload.phtml:15
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "No"
 msgstr "இல்லை"
 
 #: db_datadict.php:156 js/messages.php:443 libraries/Index.class.php:568
 #: libraries/Index.class.php:605 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261
-#: libraries/controllers/StructureController.class.php:1344
-#: libraries/controllers/StructureController.class.php:2223
-#: libraries/controllers/StructureController.class.php:2232
-#: libraries/controllers/StructureController.class.php:2237
-#: libraries/controllers/StructureController.class.php:2242
-#: libraries/controllers/StructureController.class.php:2247
+#: libraries/config/FormDisplay.tpl.php:272
+#: libraries/controllers/TableStructureController.class.php:539
+#: libraries/controllers/TableStructureController.class.php:1201
+#: libraries/controllers/TableStructureController.class.php:1210
+#: libraries/controllers/TableStructureController.class.php:1215
+#: libraries/controllers/TableStructureController.class.php:1220
+#: libraries/controllers/TableStructureController.class.php:1225
 #: libraries/mult_submits.inc.php:82 libraries/mult_submits.inc.php:178
 #: libraries/mult_submits.lib.php:339 libraries/mult_submits.lib.php:372
 #: libraries/mult_submits.lib.php:401 libraries/mult_submits.lib.php:415
@@ -217,8 +218,8 @@ msgstr "இல்லை"
 #: libraries/plugins/export/ExportOdt.class.php:756
 #: libraries/plugins/export/ExportTexytext.class.php:567
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1077
-#: libraries/server_databases.lib.php:464
-#: libraries/server_databases.lib.php:474
+#: libraries/server_databases.lib.php:475
+#: libraries/server_databases.lib.php:485
 #: libraries/server_privileges.lib.php:2546
 #: libraries/server_privileges.lib.php:2727
 #: libraries/server_privileges.lib.php:2748
@@ -228,7 +229,7 @@ msgstr "இல்லை"
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1008 libraries/tracking.lib.php:1013
 #: prefs_manage.php:138 templates/prefs_autoload.phtml:14
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "Yes"
 msgstr "ஆம்"
 
@@ -238,7 +239,7 @@ msgstr "தரவுத்தளத்தின் குவியலமைப
 
 #: db_export.php:37 db_tracking.php:90 export.php:382
 #: libraries/DBQbe.class.php:326
-#: libraries/controllers/StructureController.class.php:231
+#: libraries/controllers/DatabaseStructureController.class.php:170
 #: libraries/navigation/NavigationTree.class.php:897
 msgid "No tables found in database."
 msgstr "அட்டவணைகள் எதுவும் இத்தரவுத்தளத்தில் காணப்படவில்லை."
@@ -249,14 +250,14 @@ msgstr "அட்டவணைகள் எதுவும் இத்தரவ
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:26
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:120
-#: templates/structure/show_create.phtml:18
+#: templates/database/structure/show_create.phtml:18
 msgid "Tables"
 msgstr "அட்டவணைகள்"
 
 #: db_export.php:52 libraries/Menu.class.php:317 libraries/Menu.class.php:425
-#: libraries/Util.class.php:3333 libraries/Util.class.php:3343
-#: libraries/Util.class.php:3349 libraries/Util.class.php:3629
-#: libraries/Util.class.php:4327 libraries/Util.class.php:4344
+#: libraries/Util.class.php:3339 libraries/Util.class.php:3349
+#: libraries/Util.class.php:3355 libraries/Util.class.php:3635
+#: libraries/Util.class.php:4333 libraries/Util.class.php:4350
 #: libraries/central_columns.lib.php:728 libraries/config.values.php:39
 #: libraries/config.values.php:47 libraries/config.values.php:109
 #: libraries/config.values.php:115 libraries/config/setup.forms.php:323
@@ -270,7 +271,7 @@ msgstr "அட்டவணைகள்"
 #: libraries/navigation/Nodes/Node_Table.class.php:283
 #: libraries/server_privileges.lib.php:1141 libraries/tracking.lib.php:874
 #: templates/columns_definitions/table_fields_definitions.phtml:3
-#: templates/designer/table_list.phtml:28
+#: templates/database/designer/table_list.phtml:28
 msgid "Structure"
 msgstr "கட்டமைப்பு"
 
@@ -282,7 +283,7 @@ msgstr "கட்டமைப்பு"
 #: libraries/config/user_preferences.forms.php:292
 #: libraries/config/user_preferences.forms.php:297
 #: libraries/server_privileges.lib.php:1140
-#: templates/structure/display_table_stats.phtml:12
+#: templates/table/structure/display_table_stats.phtml:12
 msgid "Data"
 msgstr "தரவு"
 
@@ -358,10 +359,10 @@ msgstr "கவனிக்கப்படும் அட்டவணைகள
 #: libraries/server_privileges.lib.php:2908
 #: libraries/server_privileges.lib.php:3145
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4346
-#: templates/structure/table_header.phtml:21
-#: templates/tbl_relation/foreign_key_row.phtml:176
-#: templates/tbl_relation/internal_relational_row.phtml:63
+#: libraries/server_privileges.lib.php:4372
+#: templates/database/structure/table_header.phtml:21
+#: templates/table/relation/foreign_key_row.phtml:176
+#: templates/table/relation/internal_relational_row.phtml:63
 msgid "Table"
 msgstr "அட்டவணை"
 
@@ -378,7 +379,7 @@ msgid "Updated"
 msgstr "புதுப்பிக்கப்பட்டது"
 
 #: db_tracking.php:130 js/messages.php:243 libraries/Menu.class.php:552
-#: libraries/Util.class.php:4314 libraries/config.values.php:104
+#: libraries/Util.class.php:4320 libraries/config.values.php:104
 #: libraries/rte/rte_events.lib.php:393 libraries/rte/rte_list.lib.php:101
 #: libraries/server_status_processes.lib.php:92 libraries/tracking.lib.php:279
 msgid "Status"
@@ -387,14 +388,15 @@ msgstr "நிகழ்நிலை"
 #: db_tracking.php:131 db_tracking.php:290 libraries/Index.class.php:693
 #: libraries/central_columns.lib.php:687 libraries/rte/rte_list.lib.php:74
 #: libraries/rte/rte_list.lib.php:89 libraries/rte/rte_list.lib.php:102
-#: libraries/server_databases.lib.php:398
+#: libraries/server_databases.lib.php:409
 #: libraries/server_privileges.lib.php:2372
 #: libraries/server_privileges.lib.php:3166
 #: libraries/server_privileges.lib.php:3342
 #: libraries/server_user_groups.lib.php:82
 #: libraries/server_variables.lib.php:189 libraries/tracking.lib.php:280
-#: libraries/tracking.lib.php:793 templates/structure/table_header.phtml:30
-#: templates/structure/table_structure_header.phtml:23
+#: libraries/tracking.lib.php:793
+#: templates/database/structure/table_header.phtml:30
+#: templates/table/structure/table_structure_header.phtml:23
 msgid "Action"
 msgstr "செயல்"
 
@@ -436,7 +438,7 @@ msgid "Untracked tables"
 msgstr "கண்காணிக்கபடாத அட்டவணைகள்"
 
 #: db_tracking.php:305 db_tracking.php:336
-#: templates/structure/optional_action_links.phtml:17
+#: templates/table/structure/optional_action_links.phtml:17
 msgid "Track table"
 msgstr "அட்டவணையை கண்காணி"
 
@@ -492,7 +494,7 @@ msgid "Value for the column \"%s\""
 msgstr "\"%s\" நிரல்வரிசையின் மதிப்பு"
 
 #: gis_data_editor.php:146
-#: templates/gis_visualization/gis_visualization.phtml:37
+#: templates/table/gis_visualization/gis_visualization.phtml:37
 msgid "Use OpenStreetMaps as Base Layer"
 msgstr "கீழடுக்காக OpenStreetMaps பயன்படுத்தவும்"
 
@@ -572,35 +574,35 @@ msgstr "வரையமைப்பை சேர்க்க"
 #: libraries/display_change_password.lib.php:162
 #: libraries/display_export.lib.php:402 libraries/display_export.lib.php:408
 #: libraries/display_import.lib.php:392 libraries/index.lib.php:44
-#: libraries/insert_edit.lib.php:1546 libraries/insert_edit.lib.php:1583
+#: libraries/insert_edit.lib.php:1544 libraries/insert_edit.lib.php:1581
 #: libraries/normalization.lib.php:165 libraries/normalization.lib.php:821
 #: libraries/operations.lib.php:38 libraries/operations.lib.php:108
 #: libraries/operations.lib.php:263 libraries/operations.lib.php:306
 #: libraries/operations.lib.php:801 libraries/operations.lib.php:874
 #: libraries/operations.lib.php:923 libraries/operations.lib.php:1337
 #: libraries/operations.lib.php:1658
-#: libraries/plugins/auth/AuthenticationCookie.class.php:244
+#: libraries/plugins/auth/AuthenticationCookie.class.php:232
 #: libraries/replication_gui.lib.php:122 libraries/replication_gui.lib.php:161
 #: libraries/replication_gui.lib.php:324 libraries/replication_gui.lib.php:461
 #: libraries/replication_gui.lib.php:906 libraries/rte/rte_events.lib.php:509
-#: libraries/rte/rte_routines.lib.php:969
-#: libraries/rte/rte_routines.lib.php:1581
+#: libraries/rte/rte_routines.lib.php:1060
+#: libraries/rte/rte_routines.lib.php:1672
 #: libraries/rte/rte_triggers.lib.php:396 libraries/server_bin_log.lib.php:61
 #: libraries/server_privileges.lib.php:705
 #: libraries/server_privileges.lib.php:2106
 #: libraries/server_privileges.lib.php:2872
 #: libraries/server_privileges.lib.php:3553
-#: libraries/server_privileges.lib.php:4627
+#: libraries/server_privileges.lib.php:4653
 #: libraries/server_user_groups.lib.php:285
 #: libraries/sql_query_form.lib.php:369 libraries/sql_query_form.lib.php:429
 #: libraries/tracking.lib.php:533 libraries/tracking.lib.php:653
 #: prefs_manage.php:277 prefs_manage.php:355
 #: templates/columns_definitions/column_definitions_form.phtml:59
-#: templates/header_location.phtml:17 templates/index_form.phtml:238
+#: templates/database/create_table.phtml:21 templates/header_location.phtml:28
 #: templates/startAndNumberOfRowsPanel.phtml:14
-#: templates/structure/add_column.phtml:25
-#: templates/table/create_table.phtml:21
-#: templates/table/selection_form.phtml:75 view_create.php:275
+#: templates/table/index_form.phtml:238
+#: templates/table/search/selection_form.phtml:75
+#: templates/table/structure/add_column.phtml:25 view_create.php:275
 #: view_operations.php:106
 msgid "Go"
 msgstr "செல்க"
@@ -690,7 +692,7 @@ msgid "Could not load import plugins, please check your installation!"
 msgstr ""
 "தரவிறக்க செருகுநிரல்களை நினைவேற்ற இயலவில்லை, தயவுசெய்து உங்கள் நிறுவலை சரிபார்க்கவும்!"
 
-#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1466
+#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1460
 #, php-format
 msgid "Bookmark %s has been created."
 msgstr "புத்தகக்குறி %s குறிக்கப்பட்டது."
@@ -731,11 +733,11 @@ msgstr ""
 msgid "Back"
 msgstr "பின்செல்க"
 
-#: index.php:148 libraries/Footer.class.php:70
+#: index.php:149 libraries/Footer.class.php:70
 msgid "phpMyAdmin Demo Server"
 msgstr "PHPMyAdmin  செயல்விளக்க சேவையகம்"
 
-#: index.php:152
+#: index.php:153
 #, php-format
 msgid ""
 "You are using the demo server. You can do anything here, but please do not "
@@ -746,112 +748,112 @@ msgstr ""
 "தயவுசெய்து root, debian-sys-maint மற்றும் pma பயனர்களை மாற்றாதிருக்கவும். மேலதிக "
 "தகவல்கள் %sஇல் உள்ளன."
 
-#: index.php:162
+#: index.php:163
 msgid "General Settings"
 msgstr "பொதுவான அமைவுகள்"
 
-#: index.php:190 libraries/display_change_password.lib.php:50
+#: index.php:191 libraries/display_change_password.lib.php:50
 #: libraries/display_change_password.lib.php:53 user_password.php:247
 msgid "Change password"
 msgstr "கடவுச்சொல்லை மாற்றவும்"
 
-#: index.php:206
+#: index.php:207
 msgid "Server connection collation"
 msgstr "சேவையக இணைப்பு குறிமுறை அடுக்குவரிசை"
 
-#: index.php:228
+#: index.php:229
 msgid "Appearance Settings"
 msgstr "உருத்தோற்ற அமைப்புகள்"
 
-#: index.php:258 prefs_manage.php:285
+#: index.php:259 prefs_manage.php:285
 msgid "More settings"
 msgstr "மேலதிக அமைப்புகள்"
 
-#: index.php:279
+#: index.php:280
 msgid "Database server"
 msgstr "தரவுத்தள வழங்கி"
 
-#: index.php:282 libraries/plugins/auth/AuthenticationCookie.class.php:181
+#: index.php:283 libraries/plugins/auth/AuthenticationCookie.class.php:169
 msgid "Server:"
 msgstr "வழங்கி:"
 
-#: index.php:286
+#: index.php:287
 msgid "Server type:"
 msgstr "வழங்கி வகை:"
 
-#: index.php:290 libraries/plugins/export/ExportLatex.class.php:212
+#: index.php:291 libraries/plugins/export/ExportLatex.class.php:212
 #: libraries/plugins/export/ExportSql.class.php:687
 #: libraries/plugins/export/ExportXml.class.php:189
 msgid "Server version:"
 msgstr "வழங்கி பதிப்பு:"
 
-#: index.php:296
+#: index.php:297
 msgid "Protocol version:"
 msgstr "நெறிமுறை பதிப்பு:"
 
-#: index.php:300
+#: index.php:301
 msgid "User:"
 msgstr "பயனர்:"
 
-#: index.php:305
+#: index.php:306
 msgid "Server charset:"
 msgstr "வழங்கி குறிமுறை:"
 
-#: index.php:320
+#: index.php:321
 msgid "Web server"
 msgstr "இணைய வழங்கி"
 
-#: index.php:331
+#: index.php:332
 msgid "Database client version:"
 msgstr "தரவுத்தள பயனர் நிரல் பதிப்பு:"
 
-#: index.php:335
+#: index.php:336
 msgid "PHP extension:"
 msgstr "PHP நீட்சி:"
 
-#: index.php:349
+#: index.php:350
 #, fuzzy
 #| msgid "PHP Version:"
 msgid "PHP version:"
 msgstr "PHP பதிப்பு:"
 
-#: index.php:360
+#: index.php:361
 msgid "Show PHP information"
 msgstr "PHP தகவலைக் காட்டுக"
 
-#: index.php:383
+#: index.php:384
 msgid "Version information:"
 msgstr "பதிப்பு தகவல்கள்:"
 
-#: index.php:392 libraries/Util.class.php:432 libraries/Util.class.php:495
-#: libraries/config/FormDisplay.tpl.php:151
+#: index.php:393 libraries/Util.class.php:432 libraries/Util.class.php:495
+#: libraries/config/FormDisplay.tpl.php:162
 #: libraries/display_export.lib.php:577 libraries/engines/pbxt.lib.php:162
 #: libraries/navigation/NavigationHeader.class.php:196
 #: libraries/server_variables.lib.php:160
 msgid "Documentation"
 msgstr "ஆவணச்சான்று"
 
-#: index.php:399
+#: index.php:400
 msgid "Wiki"
 msgstr "பயனர் தொகுப்பாக்கி"
 
-#: index.php:408
+#: index.php:409
 msgid "Official Homepage"
 msgstr "அலுவல்முறை முகப்புப்பக்கம்"
 
-#: index.php:415
+#: index.php:416
 msgid "Contribute"
 msgstr "பங்களிப்பு"
 
-#: index.php:422
+#: index.php:423
 msgid "Get support"
 msgstr "ஆதரவு வேண்டுக"
 
-#: index.php:429
+#: index.php:430
 msgid "List of changes"
 msgstr "மாற்றங்கள் பட்டியல்"
 
-#: index.php:451
+#: index.php:452
 #, fuzzy
 #| msgid ""
 #| "Your configuration file contains settings (root with no password) that "
@@ -869,7 +871,7 @@ msgstr ""
 "அமைவுடன் இயங்கினால், அது ஊடுருவபடகூடும், 'root' பயனருக்கு கடவுச்சொல் அமைத்து அப்படி "
 "நிகழாமல் செய்க."
 
-#: index.php:468
+#: index.php:469
 msgid ""
 "You have enabled mbstring.func_overload in your PHP configuration. This "
 "option is incompatible with phpMyAdmin and might cause some data to be "
@@ -878,7 +880,7 @@ msgstr ""
 "உங்கள் PHP அமைப்பாக்க கோப்பில்  mbstring.func_overload அமைவை இயலசெய்துள்ளீர். "
 "இவ்விருப்பம் PHPMyAdminஉடன் இணக்கமற்றது மேலும் சில தரவுகள் வீணாகலாம்!"
 
-#: index.php:483
+#: index.php:484
 msgid ""
 "The mbstring PHP extension was not found and you seem to be using a "
 "multibyte charset. Without the mbstring extension phpMyAdmin is unable to "
@@ -888,7 +890,7 @@ msgstr ""
 "பயன்படுத்துகின்றீர்கள். mbstring PHP நீட்சி இல்லாமல் PHPMyAdminஆல் சரங்களை சரியாக "
 "பிரிக்கவியலாது அதனால் எதிர்பாரா முடிவுகள் கிடைக்கலாம்."
 
-#: index.php:500
+#: index.php:501
 #, fuzzy
 #| msgid ""
 #| "Your PHP parameter [a@http://php.net/manual/en/session.configuration."
@@ -906,7 +908,7 @@ msgstr ""
 "நிலை பதிவுத்துணுக்கு செல்லுபடியாகும் காலத்தை விட குறைவாக உள்ளது, இதனால் உங்கள் அமர்வு "
 "phpMyAdmin கட்டமைக்கப்பட்டதை விட விரைவில் காலாவதியாகிவிடும்."
 
-#: index.php:519
+#: index.php:520
 msgid ""
 "Login cookie store is lower than cookie validity configured in phpMyAdmin, "
 "because of this, your login will expire sooner than configured in phpMyAdmin."
@@ -915,11 +917,11 @@ msgstr ""
 "பதிவுத்துணுக்கு ஏற்புடைமைகாலத்தை விட குறைவாக உள்ளதால் உங்கள் புகுபதிவு phpMyAdmin ல் "
 "கட்டமைக்கப்பட்டதை விட விரைவில் காலாவதியாகும்."
 
-#: index.php:535
+#: index.php:536
 msgid "The configuration file now needs a secret passphrase (blowfish_secret)."
 msgstr "இப்போது அமைப்பாக்க கோப்புக்கு கமுக்க கடவுசொற்றொடர் தேவை (blowfish_secret)."
 
-#: index.php:548
+#: index.php:549
 msgid ""
 "Directory [code]config[/code], which is used by the setup script, still "
 "exists in your phpMyAdmin directory. It is strongly recommended to remove it "
@@ -931,7 +933,7 @@ msgstr ""
 "பரிந்துரைக்கிறது. இல்லையெனில் உங்கள் சர்வர் பாதுகாப்பு கட்டமைப்பு கோவையை அங்கீகரிக்கப்படாத "
 "பயனர் பதிவிறக்குவதால் பாதிப்பு ஏற்படும்."
 
-#: index.php:564
+#: index.php:565
 #, php-format
 msgid ""
 "The phpMyAdmin configuration storage is not completely configured, some "
@@ -940,14 +942,14 @@ msgstr ""
 "phpMyAdminனின் கட்டமைப்பு சேமிப்பகம் இன்னும் முழுமையாய் கட்டமைக்கப்படவில்லை.சில "
 "நீட்டிக்கப்பட்ட வசதிகள் முடக்கப்படுள்ளன. %sஏனென்று அறிக%s. "
 
-#: index.php:571
+#: index.php:572
 msgid ""
 "Or alternately go to 'Operations' tab of any database to set it up there."
 msgstr ""
 "<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;அல்லது மாற்றாக எதேனும் தரவுத்தளத்தின் "
 "'செயல்பாடுகள்' தத்தலுக்கு சென்று அங்கு அமைத்தத்தல்."
 
-#: index.php:620
+#: index.php:621
 #, php-format
 msgid ""
 "Your PHP MySQL library version %s differs from your MySQL server version %s. "
@@ -956,7 +958,7 @@ msgstr ""
 "உங்கள் PHP MySQL நிரல்கோவையின் பதிப்பும் %s MySQL வழங்கியின் பதிப்பும் %s வேறுபடுகின்றன."
 "இது எதிர்பாரா விளைவுகளுக்கு காரணமாகலாம்."
 
-#: index.php:648
+#: index.php:649
 #, php-format
 msgid ""
 "Server running with Suhosin. Please refer to %sdocumentation%s for possible "
@@ -1109,8 +1111,8 @@ msgstr ""
 msgid "Save & Close"
 msgstr "சேமிக்க & மூடுக"
 
-#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:404
-#: libraries/insert_edit.lib.php:1550 prefs_manage.php:361
+#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:415
+#: libraries/insert_edit.lib.php:1548 prefs_manage.php:361
 #: prefs_manage.php:372
 msgid "Reset"
 msgstr "மீட்டமைக்கவும்"
@@ -1143,7 +1145,7 @@ msgstr "சுட்டுதொகுப்புக்குறி சேர
 msgid "Edit Index"
 msgstr "சுட்டுதொகுப்புக்குறி திருத்துக"
 
-#: js/messages.php:99 templates/index_form.phtml:232
+#: js/messages.php:99 templates/table/index_form.phtml:232
 #, php-format
 msgid "Add %s column(s) to index"
 msgstr "%s நிரல்வரிசை(களை) சுட்டுதொகுப்புக்குறியில் சேர்க்க"
@@ -1164,13 +1166,14 @@ msgstr "உடன் கலப்புருவாக்குக:"
 msgid "Please select column(s) for the index."
 msgstr "சுட்டுதொகுப்புக்குறியில் சேர்ப்பதற்க்கான நிரல்வரிசை(களை) தேர்ந்தெடுக்க."
 
-#: js/messages.php:106 templates/structure/add_column.phtml:1
+#: js/messages.php:106 templates/table/structure/add_column.phtml:1
 msgid "You have to add at least one column."
 msgstr "நீங்கள் குறைந்தது ஒரு நெடுவரிசையையாவது சேர்க்க வேண்டும்."
 
-#: js/messages.php:109 libraries/insert_edit.lib.php:1548
+#: js/messages.php:109 libraries/insert_edit.lib.php:1546
 #: templates/columns_definitions/column_definitions_form.phtml:162
-#: templates/index_form.phtml:237 templates/tbl_relation/common_form.phtml:106
+#: templates/table/index_form.phtml:237
+#: templates/table/relation/common_form.phtml:106
 msgid "Preview SQL"
 msgstr "SQLஐ முன்பார்வையிடு"
 
@@ -1187,7 +1190,7 @@ msgid "SQL query:"
 msgstr "SQL வினவல்:"
 
 #. l10n: Default label for the y-Axis of Charts
-#: js/messages.php:118 templates/tbl_chart.phtml:109
+#: js/messages.php:118 templates/table/chart/tbl_chart.phtml:109
 msgid "Y Values"
 msgstr "கு மதிப்புக்கள்"
 
@@ -1344,7 +1347,7 @@ msgstr "அனுப்பப்பட்ட துண்டுகள்"
 msgid "Bytes received"
 msgstr "ஏற்றுக்கொள்ளப்பட்ட துண்டுகள்"
 
-#: js/messages.php:169 libraries/server_status.lib.php:226
+#: js/messages.php:169 libraries/server_status.lib.php:235
 msgid "Connections"
 msgstr "இணைப்புகள்"
 
@@ -1401,12 +1404,12 @@ msgstr "%d அட்டவணை(கள்)"
 msgid "Questions"
 msgstr "வினாக்கள்"
 
-#: js/messages.php:184 libraries/server_status.lib.php:134
+#: js/messages.php:184 libraries/server_status.lib.php:143
 msgid "Traffic"
 msgstr "போக்குவரத்து"
 
 #: js/messages.php:185 libraries/Menu.class.php:586
-#: libraries/Util.class.php:4318 libraries/server_status_monitor.lib.php:257
+#: libraries/Util.class.php:4324 libraries/server_status_monitor.lib.php:257
 msgid "Settings"
 msgstr "அமைவுகள்"
 
@@ -1426,8 +1429,9 @@ msgstr "தயவுசெய்து குறைந்தது ஒரு ம
 #: libraries/server_status_monitor.lib.php:236
 #: libraries/server_status_processes.lib.php:308
 #: templates/columns_definitions/transformation.phtml:4
-#: templates/designer/options_panel.phtml:178
-#: templates/table/options_zoom.phtml:12 templates/table/rows_zoom.phtml:26
+#: templates/database/designer/options_panel.phtml:178
+#: templates/table/search/options_zoom.phtml:12
+#: templates/table/search/rows_zoom.phtml:26
 msgid "None"
 msgstr "எதுவுமில்லை"
 
@@ -1712,8 +1716,8 @@ msgstr ""
 
 #: js/messages.php:270 libraries/Menu.class.php:352
 #: libraries/Menu.class.php:455 libraries/Menu.class.php:582
-#: libraries/Util.class.php:4317 libraries/Util.class.php:4332
-#: libraries/Util.class.php:4349 libraries/config/messages.inc.php:258
+#: libraries/Util.class.php:4323 libraries/Util.class.php:4338
+#: libraries/Util.class.php:4355 libraries/config/messages.inc.php:258
 #: libraries/display_import.lib.php:105
 #: libraries/server_status_monitor.lib.php:318 prefs_manage.php:238
 #: setup/frames/menu.inc.php:26
@@ -1773,13 +1777,13 @@ msgid "Formatting SQL..."
 msgstr ""
 
 #: js/messages.php:293 libraries/server_variables.lib.php:157
-#: templates/designer/aggregate_query_panel.phtml:63
-#: templates/designer/delete_relation_panel.phtml:28
-#: templates/designer/having_query_panel.phtml:117
-#: templates/designer/new_relation_panel.phtml:88
-#: templates/designer/options_panel.phtml:253
-#: templates/designer/rename_to_panel.phtml:45
-#: templates/designer/where_query_panel.phtml:83
+#: templates/database/designer/aggregate_query_panel.phtml:63
+#: templates/database/designer/delete_relation_panel.phtml:28
+#: templates/database/designer/having_query_panel.phtml:117
+#: templates/database/designer/new_relation_panel.phtml:88
+#: templates/database/designer/options_panel.phtml:253
+#: templates/database/designer/rename_to_panel.phtml:45
+#: templates/database/designer/where_query_panel.phtml:83
 msgid "Cancel"
 msgstr "விலக்கு"
 
@@ -1789,7 +1793,7 @@ msgstr "விலக்கு"
 msgid "Page-related settings"
 msgstr "அமைப்புக்களை மாற்று"
 
-#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:402
+#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:413
 msgid "Apply"
 msgstr ""
 
@@ -1826,8 +1830,8 @@ msgstr "பிழை குறிப்பெண்: %s"
 msgid "Error text: %s"
 msgstr "பிழை செய்தி: %s"
 
-#: js/messages.php:307 libraries/db_common.inc.php:68
-#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:450
+#: js/messages.php:307 libraries/db_common.inc.php:69
+#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:461
 msgid "No databases selected."
 msgstr "எந்த தரவுத்தளமும் தேர்ந்தெடுக்கப்படவில்லை."
 
@@ -1839,12 +1843,13 @@ msgstr "நிரல்வரிசை கைவிடப்படுகிற
 msgid "Adding Primary Key"
 msgstr "முதன்மை சாவி இணைக்கப்படுகின்றது"
 
-#: js/messages.php:310 templates/designer/aggregate_query_panel.phtml:59
-#: templates/designer/having_query_panel.phtml:113
-#: templates/designer/new_relation_panel.phtml:87
-#: templates/designer/options_panel.phtml:252
-#: templates/designer/rename_to_panel.phtml:41
-#: templates/designer/where_query_panel.phtml:82
+#: js/messages.php:310
+#: templates/database/designer/aggregate_query_panel.phtml:59
+#: templates/database/designer/having_query_panel.phtml:113
+#: templates/database/designer/new_relation_panel.phtml:87
+#: templates/database/designer/options_panel.phtml:252
+#: templates/database/designer/rename_to_panel.phtml:41
+#: templates/database/designer/where_query_panel.phtml:82
 msgid "OK"
 msgstr "சரி"
 
@@ -1864,7 +1869,7 @@ msgstr "தரவுத்தளம் நகல் எடுக்கபடு
 msgid "Changing Charset"
 msgstr "எழுத்துத்தொகுதி மாற்றப்படுகின்றது"
 
-#: js/messages.php:320 libraries/Util.class.php:3217
+#: js/messages.php:320 libraries/Util.class.php:3223
 #, fuzzy
 #| msgid "Foreign key check:"
 msgid "Enable foreign key checks"
@@ -1901,20 +1906,21 @@ msgstr "சேமிக்கபட்ட செயல்கூற்றின
 #: js/messages.php:334 libraries/DisplayResults.class.php:4834
 #: libraries/DisplayResults.class.php:5092 libraries/Menu.class.php:344
 #: libraries/Menu.class.php:446 libraries/Menu.class.php:578
-#: libraries/Util.class.php:3636 libraries/Util.class.php:3637
-#: libraries/Util.class.php:4316 libraries/Util.class.php:4331
-#: libraries/Util.class.php:4348 libraries/config/messages.inc.php:252
+#: libraries/Util.class.php:3642 libraries/Util.class.php:3643
+#: libraries/Util.class.php:4322 libraries/Util.class.php:4337
+#: libraries/Util.class.php:4354 libraries/config/messages.inc.php:252
 #: libraries/display_export.lib.php:173 libraries/rte/rte_list.lib.php:146
 #: libraries/server_privileges.lib.php:2211
 #: libraries/server_privileges.lib.php:2290
 #: libraries/server_privileges.lib.php:2632
 #: libraries/server_privileges.lib.php:3356
 #: libraries/server_status_monitor.lib.php:322 prefs_manage.php:303
-#: setup/frames/menu.inc.php:27 templates/structure/check_all_tables.phtml:11
+#: setup/frames/menu.inc.php:27
+#: templates/database/structure/check_all_tables.phtml:11
 msgid "Export"
 msgstr "தரவேற்றுக"
 
-#: js/messages.php:337 libraries/rte/rte_routines.lib.php:652
+#: js/messages.php:337 libraries/rte/rte_routines.lib.php:743
 msgid "ENUM/SET editor"
 msgstr "ENUM/கணம் தொகுப்பான்"
 
@@ -1953,7 +1959,7 @@ msgstr "வினவல் பெட்டியை காண்பி"
 #: libraries/Console.class.php:214 libraries/DisplayResults.class.php:3474
 #: libraries/DisplayResults.class.php:4818 libraries/Index.class.php:723
 #: libraries/Util.class.php:706 libraries/Util.class.php:1202
-#: libraries/Util.class.php:3634 libraries/Util.class.php:3635
+#: libraries/Util.class.php:3640 libraries/Util.class.php:3641
 #: libraries/central_columns.lib.php:851
 #: libraries/central_columns.lib.php:1193
 #: libraries/config/messages.inc.php:892
@@ -1971,7 +1977,7 @@ msgstr "தொகு"
 #: libraries/server_user_groups.lib.php:129
 #: libraries/sql_query_form.lib.php:416 libraries/tracking.lib.php:477
 #: setup/frames/index.inc.php:183 setup/frames/index.inc.php:291
-#: templates/designer/delete_relation_panel.phtml:27
+#: templates/database/designer/delete_relation_panel.phtml:27
 msgid "Delete"
 msgstr "அழி"
 
@@ -2140,11 +2146,11 @@ msgid "No dependencies selected!"
 msgstr "எந்த சார்புகளும் தேர்ந்தெடுக்கப்படவில்லை!"
 
 #: js/messages.php:394 libraries/central_columns.lib.php:1214
-#: libraries/insert_edit.lib.php:1458 libraries/server_variables.lib.php:155
+#: libraries/insert_edit.lib.php:1456 libraries/server_variables.lib.php:155
 #: setup/frames/config.inc.php:42 setup/frames/index.inc.php:279
 #: templates/columns_definitions/column_definitions_form.phtml:165
-#: templates/gis_visualization/gis_visualization.phtml:48
-#: templates/tbl_relation/common_form.phtml:107
+#: templates/table/gis_visualization/gis_visualization.phtml:48
+#: templates/table/relation/common_form.phtml:107
 msgid "Save"
 msgstr "சேமி"
 
@@ -2221,8 +2227,8 @@ msgid "Data point content"
 msgstr "தரவுப்புள்ளி உள்ளடக்கம்"
 
 #: js/messages.php:430 js/messages.php:562 js/messages.php:579
-#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2573
-#: templates/index_form.phtml:154 templates/index_form.phtml:194
+#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2571
+#: templates/table/index_form.phtml:154 templates/table/index_form.phtml:194
 msgid "Ignore"
 msgstr "புறக்கணி"
 
@@ -2281,8 +2287,8 @@ msgstr "அயல் குறிப்பெழுத்தை தேர்ந
 msgid "Please select the primary key or a unique key!"
 msgstr "முதனிலை குறிப்பெழுத்து அல்லது தனித்த குறிப்பெழுத்தை தேர்ந்தெடுக்க!"
 
-#: js/messages.php:457 templates/designer/side_menu.phtml:91
-#: templates/designer/side_menu.phtml:94
+#: js/messages.php:457 templates/database/designer/side_menu.phtml:91
+#: templates/database/designer/side_menu.phtml:94
 msgid "Choose column to display"
 msgstr "காட்டுவதற்க்கான நிரல்வரிசையை தேர்ந்தெடுக்க"
 
@@ -2298,20 +2304,20 @@ msgstr ""
 msgid "Page name"
 msgstr "பக்கத்தின் பெயர்"
 
-#: js/messages.php:463 templates/designer/side_menu.phtml:56
-#: templates/designer/side_menu.phtml:59
+#: js/messages.php:463 templates/database/designer/side_menu.phtml:56
+#: templates/database/designer/side_menu.phtml:59
 msgid "Save page"
 msgstr "பக்கத்தை சேமிக்க"
 
-#: js/messages.php:464 templates/designer/side_menu.phtml:63
-#: templates/designer/side_menu.phtml:66
+#: js/messages.php:464 templates/database/designer/side_menu.phtml:63
+#: templates/database/designer/side_menu.phtml:66
 #, fuzzy
 #| msgid "Save page"
 msgid "Save page as"
 msgstr "பக்கத்தை சேமிக்க"
 
-#: js/messages.php:465 templates/designer/side_menu.phtml:49
-#: templates/designer/side_menu.phtml:52
+#: js/messages.php:465 templates/database/designer/side_menu.phtml:49
+#: templates/database/designer/side_menu.phtml:52
 msgid "Open page"
 msgstr "பக்கத்தை திறக்க"
 
@@ -2319,7 +2325,7 @@ msgstr "பக்கத்தை திறக்க"
 msgid "Delete page"
 msgstr "பக்கத்தை அழிக்க"
 
-#: js/messages.php:467 templates/designer/side_menu.phtml:10
+#: js/messages.php:467 templates/database/designer/side_menu.phtml:10
 msgid "Untitled"
 msgstr "பெயரிடாதது"
 
@@ -2442,7 +2448,7 @@ msgstr "மெய் சரம்"
 msgid "cancel"
 msgstr "விலக்கு"
 
-#: js/messages.php:499 libraries/server_status.lib.php:271
+#: js/messages.php:499 libraries/server_status.lib.php:280
 msgid "Aborted"
 msgstr "கைவிடப்பட்டது"
 
@@ -3042,7 +3048,7 @@ msgstr "தயவுசெய்து ஒரு சரியான எண்ண
 
 #: js/messages.php:793 libraries/Message.class.php:199
 #: libraries/Util.class.php:654 libraries/core.lib.php:245
-#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1172
+#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1170
 #: tbl_operations.php:229 view_operations.php:63
 msgid "Error"
 msgstr "வலு"
@@ -3105,8 +3111,8 @@ msgstr "ஒரு வினாடிக்கு"
 msgid "per minute"
 msgstr "ஒவ்வொரு நிமிடத்திற்கும்"
 
-#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:143
-#: libraries/server_status.lib.php:228
+#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:152
+#: libraries/server_status.lib.php:237
 #: libraries/server_status_queries.lib.php:98
 msgid "per hour"
 msgstr "ஒவ்வொரு மணிக்கும்"
@@ -3125,7 +3131,7 @@ msgid "Wrong permissions on configuration file, should not be world writable!"
 msgstr ""
 "அமைப்பாக்க கோப்பு தவறான அணுகல்இசைவுடன் உள்ளது.அனைவரும் திருத்தக்கூடியதாக இருக்ககூடாது!"
 
-#: libraries/Config.class.php:1799
+#: libraries/Config.class.php:1801
 msgid "Font size"
 msgstr "எழுத்துரு அளவு"
 
@@ -3153,10 +3159,10 @@ msgstr "மீள்வினவல்"
 #: libraries/server_privileges.lib.php:2890
 #: libraries/server_privileges.lib.php:3144
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4332
+#: libraries/server_privileges.lib.php:4358
 #: libraries/server_status_processes.lib.php:80
-#: templates/tbl_relation/foreign_key_row.phtml:165
-#: templates/tbl_relation/internal_relational_row.phtml:55
+#: templates/table/relation/foreign_key_row.phtml:165
+#: templates/table/relation/internal_relational_row.phtml:55
 msgid "Database"
 msgstr "தரவுத்தளம்"
 
@@ -3249,11 +3255,11 @@ msgstr "வரலாறு"
 #: libraries/plugins/import/ImportMediawiki.class.php:60
 #: libraries/plugins/import/ImportOds.class.php:59
 #: libraries/plugins/import/ImportShp.class.php:57
-#: libraries/plugins/import/ImportSql.class.php:148
+#: libraries/plugins/import/ImportSql.class.php:51
 #: libraries/plugins/import/ImportXml.class.php:58
-#: libraries/rte/rte_routines.lib.php:833 templates/index_form.phtml:49
-#: templates/structure/row_stats_table.phtml:20
-#: templates/table/options.phtml:2
+#: libraries/rte/rte_routines.lib.php:924 templates/table/index_form.phtml:49
+#: templates/table/search/options.phtml:2
+#: templates/table/structure/row_stats_table.phtml:20
 msgid "Options"
 msgstr "விருப்பத்தேர்வுகள்"
 
@@ -3294,7 +3300,8 @@ msgstr "இறங்குவரிசை"
 msgid "Order:"
 msgstr "ஏனையது->வரிசை"
 
-#: libraries/Console.class.php:289 templates/table/replace_preview.phtml:17
+#: libraries/Console.class.php:289
+#: templates/table/search/replace_preview.phtml:17
 msgid "Count"
 msgstr "எண்ணிக்கை"
 
@@ -3405,9 +3412,9 @@ msgstr "பிரதியான தரவுதளத்துக்கு ம
 #: libraries/operations.lib.php:794 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:191
-#: templates/structure/sortable_header.phtml:21
-#: templates/structure/sortable_header.phtml:38
-#: templates/table/options.phtml:68
+#: templates/database/structure/sortable_header.phtml:21
+#: templates/database/structure/sortable_header.phtml:38
+#: templates/table/search/options.phtml:68
 msgid "Ascending"
 msgstr "ஏறுவரிசை"
 
@@ -3417,13 +3424,14 @@ msgstr "ஏறுவரிசை"
 #: libraries/operations.lib.php:797 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:188
-#: templates/structure/sortable_header.phtml:26
-#: templates/structure/sortable_header.phtml:43
-#: templates/table/options.phtml:69
+#: templates/database/structure/sortable_header.phtml:26
+#: templates/database/structure/sortable_header.phtml:43
+#: templates/table/search/options.phtml:69
 msgid "Descending"
 msgstr "இறங்குவரிசை"
 
-#: libraries/DBQbe.class.php:467 templates/table/search_and_replace.phtml:6
+#: libraries/DBQbe.class.php:467
+#: templates/table/search/search_and_replace.phtml:6
 msgid "Column:"
 msgstr "நெடுவரிசை:"
 
@@ -3581,12 +3589,12 @@ msgstr[0] "%1$s அட்டவணையில் பொருந்தியவ
 msgstr[1] "%1$s அட்டவணையில் பொருந்தியவைகள் <strong>%2$s </strong>"
 
 #: libraries/DbSearch.class.php:354 libraries/Menu.class.php:311
-#: libraries/Util.class.php:3337 libraries/Util.class.php:3347
-#: libraries/Util.class.php:3623 libraries/Util.class.php:3624
-#: libraries/Util.class.php:4343 libraries/config.values.php:43
+#: libraries/Util.class.php:3343 libraries/Util.class.php:3353
+#: libraries/Util.class.php:3629 libraries/Util.class.php:3630
+#: libraries/Util.class.php:4349 libraries/config.values.php:43
 #: libraries/config.values.php:51 libraries/config.values.php:119
 #: libraries/navigation/Nodes/Node_Table.class.php:295
-#: templates/structure/check_all_table_column.phtml:5
+#: templates/table/structure/check_all_table_column.phtml:5
 msgid "Browse"
 msgstr "உலாவு"
 
@@ -3603,7 +3611,8 @@ msgstr "தரவுத்தளத்தில் தேடு"
 msgid "Words or values to search for (wildcard: \"%\"):"
 msgstr "தேட வார்த்தைகள் அல்லது மதிப்புகள் (குழுக்குறி: \"%\"):"
 
-#: libraries/DbSearch.class.php:401 templates/table/search_and_replace.phtml:1
+#: libraries/DbSearch.class.php:401
+#: templates/table/search/search_and_replace.phtml:1
 msgid "Find:"
 msgstr "கண்டறி:"
 
@@ -3647,28 +3656,28 @@ msgstr "நிறைவரிசைகளை வடிகட்டு"
 msgid "Search this table"
 msgstr "இந்த அட்டவணையில் தேடுக"
 
-#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2532
-#: libraries/Util.class.php:2535
+#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2538
+#: libraries/Util.class.php:2541
 msgctxt "First page"
 msgid "Begin"
 msgstr "ஆரம்பம்"
 
-#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2533
-#: libraries/Util.class.php:2536 libraries/server_bin_log.lib.php:170
+#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2539
+#: libraries/Util.class.php:2542 libraries/server_bin_log.lib.php:170
 #: libraries/server_bin_log.lib.php:172
 msgctxt "Previous page"
 msgid "Previous"
 msgstr "முந்தைய"
 
-#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2564
-#: libraries/Util.class.php:2574 libraries/server_bin_log.lib.php:204
+#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2570
+#: libraries/Util.class.php:2580 libraries/server_bin_log.lib.php:204
 #: libraries/server_bin_log.lib.php:206
 msgctxt "Next page"
 msgid "Next"
 msgstr "அடுத்து"
 
-#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2565
-#: libraries/Util.class.php:2575
+#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2571
+#: libraries/Util.class.php:2581
 msgctxt "Last page"
 msgid "End"
 msgstr "முடிவு"
@@ -3743,15 +3752,15 @@ msgid "May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]."
 msgstr "அண்ணளவாக இருக்கலாம்.[doc@faq3-11]FAQ 3.11[/doc]ஐ காண்க."
 
 #: libraries/DisplayResults.class.php:4332 libraries/Message.class.php:180
-#: libraries/controllers/TableRelationController.class.php:258
+#: libraries/controllers/TableRelationController.class.php:259
 #: libraries/controllers/TableSearchController.class.php:655
-#: libraries/rte/rte_routines.lib.php:1332 libraries/sql_query_form.lib.php:89
+#: libraries/rte/rte_routines.lib.php:1423 libraries/sql_query_form.lib.php:89
 #: tbl_operations.php:227 tbl_row_action.php:138 view_operations.php:62
 msgid "Your SQL query has been executed successfully."
 msgstr "உங்கள் SQL வினவல் வெற்றிகரமாக நிறைவேற்றப்பட்டது."
 
 #: libraries/DisplayResults.class.php:4660
-#: libraries/controllers/StructureController.class.php:629
+#: libraries/controllers/DatabaseStructureController.class.php:564
 #, php-format
 msgid ""
 "This view has at least this number of rows. Please refer to %sdocumentation"
@@ -3774,33 +3783,33 @@ msgstr "இவ்வினவலில் %1$d மொத்தம், - %2$d"
 msgid "%d total"
 msgstr "%d மொத்தம்"
 
-#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1318
+#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1312
 #, php-format
 msgid "Query took %01.4f seconds."
 msgstr "வினவல் %01.4f நொடிகள் எடுத்துக்கொண்டது."
 
 #: libraries/DisplayResults.class.php:4807
-#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4767
-#: libraries/Util.class.php:4773 libraries/mult_submits.inc.php:50
-#: templates/structure/check_all_tables.phtml:2
-#: templates/structure/check_all_tables.phtml:9
+#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4773
+#: libraries/Util.class.php:4779 libraries/mult_submits.inc.php:50
+#: templates/database/structure/check_all_tables.phtml:2
+#: templates/database/structure/check_all_tables.phtml:9
 msgid "With selected:"
 msgstr "உடன் தெரிவுசெய்யப்பட்டது:"
 
 #: libraries/DisplayResults.class.php:4811
-#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4769
-#: libraries/Util.class.php:4770 libraries/server_privileges.lib.php:1174
+#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4775
+#: libraries/Util.class.php:4776 libraries/server_privileges.lib.php:1174
 #: libraries/server_privileges.lib.php:1175
 #: libraries/server_privileges.lib.php:1387
 #: libraries/server_user_groups.lib.php:231
-#: templates/structure/check_all_tables.phtml:3
-#: templates/structure/check_all_tables.phtml:4
+#: templates/database/structure/check_all_tables.phtml:3
+#: templates/database/structure/check_all_tables.phtml:4
 msgid "Check All"
 msgstr "அனைத்தையும் தெரி"
 
 #: libraries/DisplayResults.class.php:4985 libraries/Header.class.php:383
-#: templates/structure/optional_action_links.phtml:1
-#: templates/structure/print_view_data_dictionary_link.phtml:3
+#: templates/database/structure/print_view_data_dictionary_link.phtml:3
+#: templates/table/structure/optional_action_links.phtml:1
 msgid "Print view"
 msgstr "அச்சுப் பார்வை"
 
@@ -3808,7 +3817,8 @@ msgstr "அச்சுப் பார்வை"
 msgid "Query results operations"
 msgstr "வினவலின் பயன்முடிவுகளின் செயல்பாடுகள்"
 
-#: libraries/DisplayResults.class.php:5105 templates/tbl_chart.phtml:12
+#: libraries/DisplayResults.class.php:5105
+#: templates/table/chart/tbl_chart.phtml:12
 msgid "Display chart"
 msgstr "விளக்கப்படத்தை காட்டுக"
 
@@ -3897,7 +3907,7 @@ msgid "Click on the bar to scroll to top of page"
 msgstr ""
 
 #: libraries/Header.class.php:749
-#: libraries/plugins/auth/AuthenticationCookie.class.php:152
+#: libraries/plugins/auth/AuthenticationCookie.class.php:140
 msgid "Javascript must be enabled past this point!"
 msgstr ""
 
@@ -3919,11 +3929,11 @@ msgid "Keyname"
 msgstr "முக்கியபெயர்"
 
 #: libraries/Index.class.php:697
-#: libraries/controllers/StructureController.class.php:1962
-#: libraries/controllers/StructureController.class.php:1967
+#: libraries/controllers/TableStructureController.class.php:953
+#: libraries/controllers/TableStructureController.class.php:958
 #: libraries/tracking.lib.php:973
 #: templates/columns_definitions/column_indexes.phtml:11
-#: templates/structure/check_all_table_column.phtml:26
+#: templates/table/structure/check_all_table_column.phtml:26
 msgid "Unique"
 msgstr "தனித்தன்மை"
 
@@ -3942,16 +3952,17 @@ msgstr ""
 #: libraries/server_collations.lib.php:35 libraries/tracking.lib.php:881
 #: libraries/tracking.lib.php:977
 #: templates/columns_definitions/table_fields_definitions.phtml:33
-#: templates/structure/row_stats_table.phtml:31
-#: templates/structure/table_header.phtml:55
-#: templates/structure/table_structure_header.phtml:7
-#: templates/table/table_header.phtml:8
+#: templates/database/structure/table_header.phtml:55
+#: templates/table/search/table_header.phtml:8
+#: templates/table/structure/row_stats_table.phtml:31
+#: templates/table/structure/table_structure_header.phtml:7
 msgid "Collation"
 msgstr "அடுக்கு"
 
 #: libraries/Index.class.php:703 libraries/rte/rte_events.lib.php:496
-#: libraries/rte/rte_routines.lib.php:956 libraries/tracking.lib.php:885
-#: libraries/tracking.lib.php:979 templates/structure/table_header.phtml:84
+#: libraries/rte/rte_routines.lib.php:1047 libraries/tracking.lib.php:885
+#: libraries/tracking.lib.php:979
+#: templates/database/structure/table_header.phtml:84
 msgid "Comment"
 msgstr "கருத்துரை"
 
@@ -3964,15 +3975,15 @@ msgstr ""
 msgid "Index %s has been dropped."
 msgstr ""
 
-#: libraries/Index.class.php:757 libraries/Util.class.php:3630
-#: libraries/Util.class.php:3631
-#: libraries/controllers/StructureController.class.php:1958
-#: libraries/controllers/StructureController.class.php:1959
+#: libraries/Index.class.php:757 libraries/Util.class.php:3636
+#: libraries/Util.class.php:3637
+#: libraries/controllers/TableStructureController.class.php:949
+#: libraries/controllers/TableStructureController.class.php:950
 #: libraries/operations.lib.php:1607 libraries/rte/rte_list.lib.php:150
 #: libraries/server_databases.lib.php:146
-#: templates/structure/check_all_table_column.phtml:15
-#: templates/structure/check_all_tables.phtml:16
-#: templates/tbl_relation/foreign_key_row.phtml:93
+#: templates/database/structure/check_all_tables.phtml:16
+#: templates/table/relation/foreign_key_row.phtml:93
+#: templates/table/structure/check_all_table_column.phtml:15
 msgid "Drop"
 msgstr "அழி"
 
@@ -4001,16 +4012,16 @@ msgstr "வழங்கி"
 #: libraries/Menu.class.php:248
 #: libraries/navigation/Nodes/Node_View.class.php:32
 #: libraries/tbl_info.inc.php:63
-#: templates/structure/structure_table_row.phtml:97
-#: templates/structure/structure_table_row.phtml:159
+#: templates/database/structure/structure_table_row.phtml:97
+#: templates/database/structure/structure_table_row.phtml:159
 msgid "View"
 msgstr "நோக்கு"
 
 #: libraries/Menu.class.php:325 libraries/Menu.class.php:429
-#: libraries/Menu.class.php:548 libraries/Util.class.php:3334
-#: libraries/Util.class.php:3344 libraries/Util.class.php:3350
-#: libraries/Util.class.php:4313 libraries/Util.class.php:4328
-#: libraries/Util.class.php:4345 libraries/config.values.php:40
+#: libraries/Menu.class.php:548 libraries/Util.class.php:3340
+#: libraries/Util.class.php:3350 libraries/Util.class.php:3356
+#: libraries/Util.class.php:4319 libraries/Util.class.php:4334
+#: libraries/Util.class.php:4351 libraries/config.values.php:40
 #: libraries/config.values.php:48 libraries/config.values.php:110
 #: libraries/config.values.php:116 libraries/config/messages.inc.php:321
 #: libraries/navigation/Nodes/Node_Table.class.php:292
@@ -4018,19 +4029,19 @@ msgid "SQL"
 msgstr "SQL"
 
 #: libraries/Menu.class.php:328 libraries/Menu.class.php:432
-#: libraries/Util.class.php:3335 libraries/Util.class.php:3345
-#: libraries/Util.class.php:3351 libraries/Util.class.php:3625
-#: libraries/Util.class.php:3626 libraries/Util.class.php:4329
-#: libraries/Util.class.php:4346 libraries/config.values.php:41
+#: libraries/Util.class.php:3341 libraries/Util.class.php:3351
+#: libraries/Util.class.php:3357 libraries/Util.class.php:3631
+#: libraries/Util.class.php:3632 libraries/Util.class.php:4335
+#: libraries/Util.class.php:4352 libraries/config.values.php:41
 #: libraries/config.values.php:49 libraries/config.values.php:111
 #: libraries/config.values.php:117
 #: libraries/navigation/Nodes/Node_Table.class.php:286
 msgid "Search"
 msgstr "தேடு"
 
-#: libraries/Menu.class.php:338 libraries/Util.class.php:3336
-#: libraries/Util.class.php:3346 libraries/Util.class.php:3627
-#: libraries/Util.class.php:3628 libraries/Util.class.php:4347
+#: libraries/Menu.class.php:338 libraries/Util.class.php:3342
+#: libraries/Util.class.php:3352 libraries/Util.class.php:3633
+#: libraries/Util.class.php:3634 libraries/Util.class.php:4353
 #: libraries/config.values.php:42 libraries/config.values.php:50
 #: libraries/config.values.php:118
 #: libraries/navigation/Nodes/Node_Table.class.php:289
@@ -4039,30 +4050,30 @@ msgid "Insert"
 msgstr "செருகு"
 
 #: libraries/Menu.class.php:362 libraries/Menu.class.php:467
-#: libraries/Util.class.php:4334 libraries/Util.class.php:4350
+#: libraries/Util.class.php:4340 libraries/Util.class.php:4356
 #: libraries/config.values.php:106 libraries/server_common.lib.php:51
 #: libraries/server_privileges.lib.php:2370
 #: libraries/server_privileges.lib.php:3158
-#: libraries/server_privileges.lib.php:4221
+#: libraries/server_privileges.lib.php:4247
 msgid "Privileges"
 msgstr ""
 
 #: libraries/Menu.class.php:371 libraries/Menu.class.php:379
-#: libraries/Menu.class.php:459 libraries/Util.class.php:3338
-#: libraries/Util.class.php:3352 libraries/Util.class.php:4333
-#: libraries/Util.class.php:4351 libraries/config.values.php:112
+#: libraries/Menu.class.php:459 libraries/Util.class.php:3344
+#: libraries/Util.class.php:3358 libraries/Util.class.php:4339
+#: libraries/Util.class.php:4357 libraries/config.values.php:112
 #: view_operations.php:92
 msgid "Operations"
 msgstr "செயல்பாடுகள்"
 
 #: libraries/Menu.class.php:384 libraries/Menu.class.php:492
-#: libraries/Util.class.php:4338 libraries/Util.class.php:4352
+#: libraries/Util.class.php:4344 libraries/Util.class.php:4358
 #: libraries/relation.lib.php:255
 msgid "Tracking"
 msgstr ""
 
 #: libraries/Menu.class.php:397 libraries/Menu.class.php:486
-#: libraries/Util.class.php:4337 libraries/Util.class.php:4353
+#: libraries/Util.class.php:4343 libraries/Util.class.php:4359
 #: libraries/navigation/Nodes/Node_Trigger_Container.class.php:24
 #: libraries/plugins/export/ExportHtmlword.class.php:557
 #: libraries/plugins/export/ExportOdt.class.php:685
@@ -4079,16 +4090,16 @@ msgstr ""
 msgid "Database seems to be empty!"
 msgstr ""
 
-#: libraries/Menu.class.php:439 libraries/Util.class.php:4330
+#: libraries/Menu.class.php:439 libraries/Util.class.php:4336
 msgid "Query"
 msgstr ""
 
-#: libraries/Menu.class.php:472 libraries/Util.class.php:4335
+#: libraries/Menu.class.php:472 libraries/Util.class.php:4341
 #: libraries/rte/rte_words.lib.php:36
 msgid "Routines"
 msgstr ""
 
-#: libraries/Menu.class.php:479 libraries/Util.class.php:4336
+#: libraries/Menu.class.php:479 libraries/Util.class.php:4342
 #: libraries/navigation/Nodes/Node_Event_Container.class.php:26
 #: libraries/plugins/export/ExportSql.class.php:940
 #: libraries/plugins/export/ExportXml.class.php:107
@@ -4096,20 +4107,20 @@ msgstr ""
 msgid "Events"
 msgstr ""
 
-#: libraries/Menu.class.php:498 libraries/Util.class.php:4339
+#: libraries/Menu.class.php:498 libraries/Util.class.php:4345
 msgid "Designer"
 msgstr ""
 
-#: libraries/Menu.class.php:507 libraries/Util.class.php:4340
-#: templates/structure/check_all_tables.phtml:35
+#: libraries/Menu.class.php:507 libraries/Util.class.php:4346
+#: templates/database/structure/check_all_tables.phtml:35
 msgid "Central columns"
 msgstr "மைய நெடுவரிசைகள்"
 
-#: libraries/Menu.class.php:544 libraries/Util.class.php:4312
+#: libraries/Menu.class.php:544 libraries/Util.class.php:4318
 #: libraries/config.values.php:103 libraries/config/messages.inc.php:266
 #: libraries/config/messages.inc.php:341
 #: libraries/navigation/NavigationTree.class.php:1239
-#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4332
+#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4358
 msgid "Databases"
 msgstr "தரவுத்தளங்கள்"
 
@@ -4120,34 +4131,34 @@ msgid "User accounts"
 msgstr "பயனர் குழுக்கள்"
 
 #: libraries/Menu.class.php:595 libraries/ServerStatusData.class.php:121
-#: libraries/Util.class.php:4319 libraries/server_common.lib.php:36
+#: libraries/Util.class.php:4325 libraries/server_common.lib.php:36
 msgid "Binary log"
 msgstr ""
 
 #: libraries/Menu.class.php:601 libraries/ServerStatusData.class.php:126
-#: libraries/Util.class.php:4320 libraries/server_common.lib.php:42
-#: templates/structure/body_for_table_summary.phtml:10
-#: templates/structure/table_header.phtml:27
+#: libraries/Util.class.php:4326 libraries/server_common.lib.php:42
+#: templates/database/structure/body_for_table_summary.phtml:10
+#: templates/database/structure/table_header.phtml:27
 msgid "Replication"
 msgstr "படியெடுத்தல்"
 
 #: libraries/Menu.class.php:606 libraries/ServerStatusData.class.php:193
-#: libraries/Util.class.php:4321 libraries/config.values.php:105
+#: libraries/Util.class.php:4327 libraries/config.values.php:105
 #: libraries/server_engines.lib.php:108 libraries/server_engines.lib.php:112
 #: libraries/sql_query_form.lib.php:421
 msgid "Variables"
 msgstr "மாறிகள்"
 
-#: libraries/Menu.class.php:610 libraries/Util.class.php:4322
+#: libraries/Menu.class.php:610 libraries/Util.class.php:4328
 msgid "Charsets"
 msgstr "எழுத்துக்கணங்கள்"
 
-#: libraries/Menu.class.php:615 libraries/Util.class.php:4323
+#: libraries/Menu.class.php:615 libraries/Util.class.php:4329
 #: libraries/server_common.lib.php:33 libraries/server_plugins.lib.php:27
 msgid "Plugins"
 msgstr ""
 
-#: libraries/Menu.class.php:626 libraries/Util.class.php:4324
+#: libraries/Menu.class.php:626 libraries/Util.class.php:4330
 msgid "Engines"
 msgstr "செயல்பொறிகள்"
 
@@ -4172,7 +4183,7 @@ msgid_plural "%1$d rows inserted."
 msgstr[0] "%1$d வரிசை சேர்க்கப்பட்டுள்ளது."
 msgstr[1] "%1$d வரிசைகள் சேர்க்கப்பட்டுள்ளன."
 
-#: libraries/PDF.class.php:70 libraries/Util.class.php:2521
+#: libraries/PDF.class.php:70 libraries/Util.class.php:2527
 #: libraries/browse_foreigners.lib.php:327
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:865
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:890
@@ -4193,7 +4204,7 @@ msgid "Could not save favorite table!"
 msgstr ""
 
 #: libraries/RecentFavoriteTable.class.php:212
-#: templates/structure/favorite_anchor.phtml:12
+#: templates/database/structure/favorite_anchor.phtml:12
 msgid "Remove from Favorites"
 msgstr "விருப்பமானவை பட்டியலிருந்து நீக்கவும்"
 
@@ -4358,7 +4369,7 @@ msgid ""
 msgstr ""
 
 #: libraries/StorageEngine.class.php:373
-#: templates/structure/body_for_table_summary.phtml:50
+#: templates/database/structure/body_for_table_summary.phtml:50
 #, php-format
 msgid "%s is the default storage engine on this MySQL server."
 msgstr ""
@@ -4772,10 +4783,10 @@ msgstr ""
 
 #: libraries/Util.class.php:726 libraries/rte/rte_events.lib.php:110
 #: libraries/rte/rte_events.lib.php:119 libraries/rte/rte_events.lib.php:150
-#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:153
-#: libraries/rte/rte_routines.lib.php:162
-#: libraries/rte/rte_routines.lib.php:235
-#: libraries/rte/rte_routines.lib.php:1366
+#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:223
+#: libraries/rte/rte_routines.lib.php:250
+#: libraries/rte/rte_routines.lib.php:372
+#: libraries/rte/rte_routines.lib.php:1457
 #: libraries/rte/rte_triggers.lib.php:86 libraries/rte/rte_triggers.lib.php:95
 #: libraries/rte/rte_triggers.lib.php:127
 msgid "MySQL said: "
@@ -4821,75 +4832,78 @@ msgstr "ஞாயிறு"
 msgid "%B %d, %Y at %I:%M %p"
 msgstr "%B %d, %Y இல் %I:%M %p"
 
-#: libraries/Util.class.php:2019
+#: libraries/Util.class.php:2025
 #, php-format
 msgid "%s days, %s hours, %s minutes and %s seconds"
 msgstr "%s நாட்கள் %s மணித்தியாலங்கள் %s நிமிடங்கள் மற்றும் %s நொடிகள்"
 
-#: libraries/Util.class.php:2112
+#: libraries/Util.class.php:2118
 msgid "Missing parameter:"
 msgstr "மதிப்புருக்கள் காணப்படவில்லை:"
 
-#: libraries/Util.class.php:2645
+#: libraries/Util.class.php:2651
 #, php-format
 msgid "Jump to database \"%s\"."
 msgstr "தரவுத்தளம் தாவி செல்லவும் \"%s\"."
 
-#: libraries/Util.class.php:2670
+#: libraries/Util.class.php:2676
 #, php-format
 msgid "The %s functionality is affected by a known bug, see %s"
 msgstr "%s செயல்பாடு எதுவென்று தெரிந்த ஓர் பிழையால் பாதிக்கப்பட்டுள்ளது, %sஐ பார்க்க"
 
-#: libraries/Util.class.php:2881
+#: libraries/Util.class.php:2887
 msgid "Click to toggle"
 msgstr "பிறழ்வதற்கு சொடுக்குக"
 
-#: libraries/Util.class.php:3542 prefs_manage.php:248
+#: libraries/Util.class.php:3548 prefs_manage.php:248
 msgid "Browse your computer:"
 msgstr "உமது கணினியிலிருந்து:"
 
-#: libraries/Util.class.php:3567
+#: libraries/Util.class.php:3573
 #, php-format
 msgid "Select from the web server upload directory <b>%s</b>:"
 msgstr "வலை சேவையகத்தின் பதிவேற்ற அடைவுகளிலிருந்து <b>%s</b> தேர்ந்தெடுங்கள்:"
 
-#: libraries/Util.class.php:3596 libraries/insert_edit.lib.php:1173
+#: libraries/Util.class.php:3602 libraries/insert_edit.lib.php:1171
 msgid "The directory you set for upload work cannot be reached."
 msgstr "பதிவேற்றத்திற்காக நீங்கள் தேர்வு செய்த அடைவை எட்டமுடியவில்லை."
 
-#: libraries/Util.class.php:3607
+#: libraries/Util.class.php:3613
 msgid "There are no files to upload!"
 msgstr "பதிவேற்றுவதற்கு எந்த கோப்புகளும் இல்லை!"
 
-#: libraries/Util.class.php:3632 libraries/Util.class.php:3633
-#: templates/structure/check_all_tables.phtml:15
+#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: templates/database/structure/check_all_tables.phtml:15
 msgid "Empty"
 msgstr "வெறுமை"
 
-#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: libraries/Util.class.php:3644 libraries/Util.class.php:3645
 msgid "Execute"
 msgstr "செயலாக்குக"
 
-#: libraries/Util.class.php:4152
+#: libraries/Util.class.php:4158
 msgid "Print"
 msgstr "அச்சிடுக"
 
-#: libraries/Util.class.php:4257 templates/structure/row_stats_table.phtml:80
-#: templates/structure/table_header.phtml:95
+#: libraries/Util.class.php:4263
+#: templates/database/structure/table_header.phtml:95
+#: templates/table/structure/row_stats_table.phtml:80
 msgid "Creation"
 msgstr "உருவாக்கம்"
 
-#: libraries/Util.class.php:4263 templates/structure/row_stats_table.phtml:87
-#: templates/structure/table_header.phtml:106
+#: libraries/Util.class.php:4269
+#: templates/database/structure/table_header.phtml:106
+#: templates/table/structure/row_stats_table.phtml:87
 msgid "Last update"
 msgstr "முந்தைய நிகழ்நிலையாக்கம்"
 
-#: libraries/Util.class.php:4269 templates/structure/row_stats_table.phtml:94
-#: templates/structure/table_header.phtml:117
+#: libraries/Util.class.php:4275
+#: templates/database/structure/table_header.phtml:117
+#: templates/table/structure/row_stats_table.phtml:94
 msgid "Last check"
 msgstr "கடைசி சரிபார்ப்பு"
 
-#: libraries/Util.class.php:4315
+#: libraries/Util.class.php:4321
 msgid "Users"
 msgstr "பயனர்கள்"
 
@@ -4910,16 +4924,16 @@ msgid "Use this value"
 msgstr "இம்மதிப்பை பயன்படுத்துக"
 
 #: libraries/build_html_for_db.lib.php:33 libraries/import.lib.php:193
-#: templates/structure/actions_in_table_structure.phtml:113
-#: templates/structure/row_stats_table.phtml:42
-#: templates/structure/table_header.phtml:36
+#: templates/database/structure/table_header.phtml:36
+#: templates/table/structure/actions_in_table_structure.phtml:113
+#: templates/table/structure/row_stats_table.phtml:42
 msgid "Rows"
 msgstr "நிரைவரிசைகள்"
 
 #: libraries/build_html_for_db.lib.php:48 libraries/engines/innodb.lib.php:171
-#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:186
-#: libraries/server_status.lib.php:298
-#: templates/structure/display_table_stats.phtml:40
+#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:195
+#: libraries/server_status.lib.php:307
+#: templates/table/structure/display_table_stats.phtml:40
 msgid "Total"
 msgstr "மொத்தம்"
 
@@ -4928,10 +4942,12 @@ msgid "Jump to database"
 msgstr "தரவுத்தளத்துக்கு செல்க"
 
 #: libraries/build_html_for_db.lib.php:146
+#: templates/database/structure/structure_table_row.phtml:15
 msgid "Not replicated"
 msgstr "இரட்டையாக்கப்படாதது"
 
 #: libraries/build_html_for_db.lib.php:158
+#: templates/database/structure/structure_table_row.phtml:16
 msgid "Replicated"
 msgstr "இரட்டையாக்கப்பட்டது"
 
@@ -4984,17 +5000,17 @@ msgstr "இல்லை"
 #: libraries/plugins/export/ExportTexytext.class.php:425
 #: libraries/plugins/export/PMA_ExportPdf.class.php:307
 #: libraries/rte/rte_list.lib.php:73 libraries/rte/rte_list.lib.php:85
-#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:830
-#: libraries/rte/rte_routines.lib.php:1492 setup/frames/index.inc.php:162
+#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:921
+#: libraries/rte/rte_routines.lib.php:1583 setup/frames/index.inc.php:162
 #: templates/columns_definitions/table_fields_definitions.phtml:8
-#: templates/structure/table_structure_header.phtml:5
-#: templates/table/create_table.phtml:11
+#: templates/database/create_table.phtml:11
+#: templates/table/structure/table_structure_header.phtml:5
 msgid "Name"
 msgstr "பெயர்"
 
 #: libraries/central_columns.lib.php:699
 #: libraries/central_columns.lib.php:1381
-#: libraries/rte/rte_routines.lib.php:832
+#: libraries/rte/rte_routines.lib.php:923
 #: templates/columns_definitions/table_fields_definitions.phtml:14
 msgid "Length/Values"
 msgstr "நீளம்/மதிப்புகள்"
@@ -5015,7 +5031,7 @@ msgid "Select a table"
 msgstr "ஒரு அட்டவணையை தேர்வுசெய்க"
 
 #: libraries/central_columns.lib.php:804
-#: templates/structure/add_column.phtml:4
+#: templates/table/structure/add_column.phtml:4
 msgid "Add column"
 msgstr "நெடுவரிசையை சேர்க்க"
 
@@ -5031,7 +5047,7 @@ msgstr "புதிய நெடுவரிசையை சேர்க்க"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1002
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1025
 #: templates/columns_definitions/table_fields_definitions.phtml:36
-#: templates/structure/table_structure_header.phtml:8
+#: templates/table/structure/table_structure_header.phtml:8
 msgid "Attributes"
 msgstr ""
 
@@ -5140,7 +5156,7 @@ msgid "Double click"
 msgstr ""
 
 #: libraries/config.values.php:95 libraries/config.values.php:124
-#: libraries/config/FormDisplay.tpl.php:221 libraries/relation.lib.php:97
+#: libraries/config/FormDisplay.tpl.php:232 libraries/relation.lib.php:97
 #: libraries/relation.lib.php:105
 msgid "Disabled"
 msgstr ""
@@ -5320,21 +5336,21 @@ msgstr ""
 msgid "maximum %s"
 msgstr ""
 
-#: libraries/config/FormDisplay.tpl.php:219
+#: libraries/config/FormDisplay.tpl.php:230
 msgid "This setting is disabled, it will not be applied to your configuration."
 msgstr ""
 
-#: libraries/config/FormDisplay.tpl.php:313
+#: libraries/config/FormDisplay.tpl.php:324
 #, php-format
 msgid "Set value: %s"
 msgstr ""
 
-#: libraries/config/FormDisplay.tpl.php:318
+#: libraries/config/FormDisplay.tpl.php:329
 #: libraries/config/messages.inc.php:610
 msgid "Restore default value"
 msgstr ""
 
-#: libraries/config/FormDisplay.tpl.php:332
+#: libraries/config/FormDisplay.tpl.php:343
 msgid "Allow users to customize this value"
 msgstr ""
 
@@ -5755,7 +5771,7 @@ msgstr ""
 
 #: libraries/config/messages.inc.php:136 libraries/config/messages.inc.php:152
 #: libraries/sql_query_form.lib.php:247
-#: templates/structure/row_stats_table.phtml:7
+#: templates/table/structure/row_stats_table.phtml:7
 msgid "Format"
 msgstr ""
 
@@ -6258,7 +6274,7 @@ msgstr ""
 
 #: libraries/config/messages.inc.php:332
 #: libraries/plugins/export/ExportPdf.class.php:279
-#: templates/structure/secondary_tabs.phtml:8
+#: templates/table/secondary_tabs.phtml:8
 msgid "Table structure"
 msgstr "தரவுத்தளங்கள்->அட்டவணை கட்டமைப்பு"
 
@@ -7797,101 +7813,33 @@ msgstr ""
 msgid "OpenDocument Text"
 msgstr "கட்டற்றஆவண உரை"
 
-#: libraries/controllers/StructureController.class.php:465
+#: libraries/controllers/DatabaseStructureController.class.php:405
 #: tbl_operations.php:382
 #, php-format
 msgid "Table %s has been emptied."
 msgstr "%s அட்டவணை வெறுமையாக்கப்பட்டது."
 
-#: libraries/controllers/StructureController.class.php:486
+#: libraries/controllers/DatabaseStructureController.class.php:426
 #: tbl_operations.php:400 view_operations.php:119
 #, php-format
 msgid "View %s has been dropped."
 msgstr "நோக்குநிலை %s கைவிடப்பட்டது."
 
-#: libraries/controllers/StructureController.class.php:487
+#: libraries/controllers/DatabaseStructureController.class.php:427
 #: tbl_operations.php:401
 #, php-format
 msgid "Table %s has been dropped."
 msgstr "அட்டவணை %s கைவிடப்பட்டது."
 
-#: libraries/controllers/StructureController.class.php:797
-#, php-format
-msgid "The name '%s' is a MySQL reserved keyword."
-msgid_plural "The names '%s' are MySQL reserved keywords."
-msgstr[0] ""
-msgstr[1] ""
-
-#: libraries/controllers/StructureController.class.php:875
-msgid "No column selected."
-msgstr "எந்த நிரல்வரிசையும் தெரிவுசெய்யப்படவில்லை."
-
-#: libraries/controllers/StructureController.class.php:1049
+#: libraries/controllers/DatabaseStructureController.class.php:733
 msgid "Favorite List is full!"
 msgstr "விருப்பமானவை பட்டியல் நிரம்பிவிட்டது!"
 
-#: libraries/controllers/StructureController.class.php:1272
-msgid "The columns have been moved successfully."
-msgstr "நெடுவரிசைகள் வெற்றிகரமாக நகர்த்தப்பட்டன."
-
-#: libraries/controllers/StructureController.class.php:1535
-#, php-format
-msgid ""
-"Table %1$s has been altered successfully. Privileges have been adjusted."
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1541
-#: libraries/controllers/TableIndexesController.class.php:161
-#: tbl_addfield.php:92
-#, php-format
-msgid "Table %1$s has been altered successfully."
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1588
-#: libraries/tracking.lib.php:1094
-msgid "Query error"
-msgstr "வினவல் வழு"
-
-#: libraries/controllers/StructureController.class.php:1806
+#: libraries/controllers/DatabaseStructureController.class.php:947
 #: libraries/mysql_charsets.lib.php:366 libraries/mysql_charsets.lib.php:373
 msgid "unknown"
 msgstr ""
 
-#: libraries/controllers/StructureController.class.php:1957
-#: templates/structure/check_all_table_column.phtml:11
-msgid "Change"
-msgstr "மாற்று"
-
-#: libraries/controllers/StructureController.class.php:1961
-#: libraries/controllers/StructureController.class.php:1966
-#: libraries/navigation/Nodes/Node_Index.class.php:30
-#: libraries/tracking.lib.php:926
-#: templates/columns_definitions/column_indexes.phtml:16
-#: templates/columns_definitions/table_fields_definitions.phtml:57
-#: templates/structure/check_all_table_column.phtml:30
-#: templates/structure/display_structure.phtml:79
-#: templates/structure/display_table_stats.phtml:19
-msgid "Index"
-msgstr "சுட்டுதொகுப்புக்குறி"
-
-#: libraries/controllers/StructureController.class.php:1963
-#: libraries/controllers/StructureController.class.php:1968
-#: templates/columns_definitions/column_indexes.phtml:27
-#: templates/structure/check_all_table_column.phtml:37
-msgid "Spatial"
-msgstr "இடம்சார்"
-
-#: libraries/controllers/StructureController.class.php:1964
-#: libraries/controllers/StructureController.class.php:1969
-#: templates/columns_definitions/column_indexes.phtml:22
-#: templates/structure/check_all_table_column.phtml:47
-msgid "Fulltext"
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1970
-msgid "Distinct values"
-msgstr "தனித்த மதிப்புகள்"
-
 #: libraries/controllers/TableChartController.class.php:82
 #: libraries/controllers/TableGisVisualizationController.class.php:101
 msgid "No SQL query was set to fetch data."
@@ -7905,11 +7853,18 @@ msgstr ""
 msgid "No data to display"
 msgstr "காட்டுவதற்கு தரவு இல்லை"
 
-#: libraries/controllers/TableRelationController.class.php:217
+#: libraries/controllers/TableIndexesController.class.php:161
+#: libraries/controllers/TableStructureController.class.php:736
+#: tbl_addfield.php:92
+#, php-format
+msgid "Table %1$s has been altered successfully."
+msgstr ""
+
+#: libraries/controllers/TableRelationController.class.php:218
 msgid "Display column was successfully updated."
 msgstr ""
 
-#: libraries/controllers/TableRelationController.class.php:283
+#: libraries/controllers/TableRelationController.class.php:288
 #, fuzzy
 #| msgid "Internal relation has been added."
 msgid "Internal relations were successfully updated."
@@ -7928,12 +7883,73 @@ msgid "Zoom search"
 msgstr "அணுக்க தேடல்"
 
 #: libraries/controllers/TableSearchController.class.php:852
-#: templates/table/selection_form.phtml:59
+#: templates/table/search/selection_form.phtml:59
 #, fuzzy
 #| msgid "Hide find and replace criteria"
 msgid "Find and replace"
 msgstr "தேடிமாற்று நிபந்தனையை மறை"
 
+#: libraries/controllers/TableStructureController.class.php:163
+#, php-format
+msgid "The name '%s' is a MySQL reserved keyword."
+msgid_plural "The names '%s' are MySQL reserved keywords."
+msgstr[0] ""
+msgstr[1] ""
+
+#: libraries/controllers/TableStructureController.class.php:241
+msgid "No column selected."
+msgstr "எந்த நிரல்வரிசையும் தெரிவுசெய்யப்படவில்லை."
+
+#: libraries/controllers/TableStructureController.class.php:467
+msgid "The columns have been moved successfully."
+msgstr "நெடுவரிசைகள் வெற்றிகரமாக நகர்த்தப்பட்டன."
+
+#: libraries/controllers/TableStructureController.class.php:730
+#, php-format
+msgid ""
+"Table %1$s has been altered successfully. Privileges have been adjusted."
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:783
+#: libraries/tracking.lib.php:1094
+msgid "Query error"
+msgstr "வினவல் வழு"
+
+#: libraries/controllers/TableStructureController.class.php:948
+#: templates/table/structure/check_all_table_column.phtml:11
+msgid "Change"
+msgstr "மாற்று"
+
+#: libraries/controllers/TableStructureController.class.php:952
+#: libraries/controllers/TableStructureController.class.php:957
+#: libraries/navigation/Nodes/Node_Index.class.php:30
+#: libraries/tracking.lib.php:926
+#: templates/columns_definitions/column_indexes.phtml:16
+#: templates/columns_definitions/table_fields_definitions.phtml:57
+#: templates/table/structure/check_all_table_column.phtml:30
+#: templates/table/structure/display_structure.phtml:79
+#: templates/table/structure/display_table_stats.phtml:19
+msgid "Index"
+msgstr "சுட்டுதொகுப்புக்குறி"
+
+#: libraries/controllers/TableStructureController.class.php:954
+#: libraries/controllers/TableStructureController.class.php:959
+#: templates/columns_definitions/column_indexes.phtml:27
+#: templates/table/structure/check_all_table_column.phtml:37
+msgid "Spatial"
+msgstr "இடம்சார்"
+
+#: libraries/controllers/TableStructureController.class.php:955
+#: libraries/controllers/TableStructureController.class.php:960
+#: templates/columns_definitions/column_indexes.phtml:22
+#: templates/table/structure/check_all_table_column.phtml:47
+msgid "Fulltext"
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:963
+msgid "Distinct values"
+msgstr "தனித்த மதிப்புகள்"
+
 #: libraries/core.lib.php:306
 #, php-format
 msgid "The %s extension is missing. Please check your PHP configuration."
@@ -7980,7 +7996,7 @@ msgid "No Password"
 msgstr ""
 
 #: libraries/display_change_password.lib.php:68
-#: libraries/plugins/auth/AuthenticationCookie.class.php:199
+#: libraries/plugins/auth/AuthenticationCookie.class.php:187
 #: libraries/replication_gui.lib.php:422 libraries/replication_gui.lib.php:862
 #: libraries/server_privileges.lib.php:1640
 msgid "Password:"
@@ -8722,12 +8738,12 @@ msgid "Dump has been saved to file %s."
 msgstr "தரவு %s கோப்பாக சேமிக்கப்பட்டுள்ளது."
 
 #: libraries/import.lib.php:202 libraries/insert_edit.lib.php:124
-#: libraries/rte/rte_routines.lib.php:1353 libraries/sql.lib.php:1312
+#: libraries/rte/rte_routines.lib.php:1444 libraries/sql.lib.php:1306
 #: tbl_get_field.php:44
 msgid "MySQL returned an empty result set (i.e. zero rows)."
 msgstr ""
 
-#: libraries/import.lib.php:265 libraries/sql.lib.php:1326
+#: libraries/import.lib.php:265 libraries/sql.lib.php:1320
 msgid "[ROLLBACK occurred.]"
 msgstr ""
 
@@ -8791,14 +8807,14 @@ msgstr ""
 
 #: libraries/insert_edit.lib.php:233
 #: libraries/navigation/Nodes/Node_DatabaseChild.class.php:48
-#: templates/designer/table_list.phtml:40
+#: templates/database/designer/table_list.phtml:40
 msgid "Hide"
 msgstr ""
 
 #: libraries/insert_edit.lib.php:249
 #: libraries/navigation/Nodes/Node_Function.class.php:32
-#: libraries/rte/rte_routines.lib.php:1495
-#: templates/table/table_header.phtml:4
+#: libraries/rte/rte_routines.lib.php:1586
+#: templates/table/search/table_header.phtml:4
 msgid "Function"
 msgstr "செயல்கூறு"
 
@@ -8811,82 +8827,83 @@ msgstr ""
 msgid "Because of its length,<br /> this column might not be editable."
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1050
+#: libraries/insert_edit.lib.php:1048
 msgid "Binary - do not edit"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1176 libraries/server_privileges.lib.php:470
-#: templates/table/options.phtml:36
+#: libraries/insert_edit.lib.php:1174 libraries/server_privileges.lib.php:470
+#: templates/table/search/options.phtml:36
 msgid "Or"
 msgstr "அல்லது"
 
-#: libraries/insert_edit.lib.php:1177
+#: libraries/insert_edit.lib.php:1175
 msgid "web server upload directory:"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1348 templates/table/input_box.phtml:49
+#: libraries/insert_edit.lib.php:1346
+#: templates/table/search/input_box.phtml:49
 msgid "Edit/Insert"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1398
+#: libraries/insert_edit.lib.php:1396
 #, php-format
 msgid "Continue insertion with %s rows"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1428
+#: libraries/insert_edit.lib.php:1426
 msgid "and then"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1461
+#: libraries/insert_edit.lib.php:1459
 msgid "Insert as new row"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1464
+#: libraries/insert_edit.lib.php:1462
 msgid "Insert as new row and ignore errors"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1467
+#: libraries/insert_edit.lib.php:1465
 msgid "Show insert query"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1487
+#: libraries/insert_edit.lib.php:1485
 msgid "Go back to previous page"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1490
+#: libraries/insert_edit.lib.php:1488
 msgid "Insert another new row"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1495
+#: libraries/insert_edit.lib.php:1493
 msgid "Go back to this page"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1518
+#: libraries/insert_edit.lib.php:1516
 msgid "Edit next row"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1540
+#: libraries/insert_edit.lib.php:1538
 msgid ""
 "Use TAB key to move from value to value, or CTRL+arrows to move anywhere"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1577 libraries/replication_gui.lib.php:542
-#: libraries/rte/rte_routines.lib.php:1497
+#: libraries/insert_edit.lib.php:1575 libraries/replication_gui.lib.php:542
+#: libraries/rte/rte_routines.lib.php:1588
 #: libraries/server_status_variables.lib.php:220
-#: templates/designer/having_query_panel.phtml:100
-#: templates/designer/options_panel.phtml:73
-#: templates/designer/options_panel.phtml:239
-#: templates/designer/where_query_panel.phtml:69
-#: templates/table/table_header.phtml:10
-#: templates/table/zoom_result_form.phtml:35
+#: templates/database/designer/having_query_panel.phtml:100
+#: templates/database/designer/options_panel.phtml:73
+#: templates/database/designer/options_panel.phtml:239
+#: templates/database/designer/where_query_panel.phtml:69
+#: templates/table/search/table_header.phtml:10
+#: templates/table/search/zoom_result_form.phtml:35
 msgid "Value"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1937 libraries/sql.lib.php:1309
+#: libraries/insert_edit.lib.php:1935 libraries/sql.lib.php:1303
 msgid "Showing SQL query"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1962 libraries/sql.lib.php:1287
+#: libraries/insert_edit.lib.php:1960 libraries/sql.lib.php:1281
 #, php-format
 msgid "Inserted row id: %1$d"
 msgstr ""
@@ -9299,7 +9316,7 @@ msgstr "புதியது"
 #: libraries/navigation/Nodes/Node_View_Container.class.php:26
 #: libraries/navigation/Nodes/Node_View_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:129
-#: templates/structure/show_create.phtml:30
+#: templates/database/structure/show_create.phtml:30
 msgid "Views"
 msgstr ""
 
@@ -9585,7 +9602,7 @@ msgstr ""
 
 #: libraries/operations.lib.php:101 libraries/operations.lib.php:249
 #: libraries/operations.lib.php:869 libraries/operations.lib.php:963
-#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:907
+#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:998
 #: templates/columns_definitions/table_fields_definitions.phtml:47
 #, fuzzy
 #| msgid "Edit Privileges:"
@@ -9677,22 +9694,22 @@ msgid "Switch to copied table"
 msgstr ""
 
 #: libraries/operations.lib.php:1360
-#: templates/structure/check_all_tables.phtml:18
+#: templates/database/structure/check_all_tables.phtml:18
 msgid "Table maintenance"
 msgstr "அட்டவணை பராமரிப்பு"
 
 #: libraries/operations.lib.php:1398
-#: templates/structure/check_all_tables.phtml:19
+#: templates/database/structure/check_all_tables.phtml:19
 msgid "Analyze table"
 msgstr "அட்டவணையை பகுப்பாய்"
 
 #: libraries/operations.lib.php:1413
-#: templates/structure/check_all_tables.phtml:20
+#: templates/database/structure/check_all_tables.phtml:20
 msgid "Check table"
 msgstr "அட்டவணையை சரிபார்"
 
 #: libraries/operations.lib.php:1428
-#: templates/structure/check_all_tables.phtml:22
+#: templates/database/structure/check_all_tables.phtml:22
 #, fuzzy
 #| msgid "Check table"
 msgid "Checksum table"
@@ -9712,18 +9729,19 @@ msgid "Flush the table (FLUSH)"
 msgstr ""
 
 #: libraries/operations.lib.php:1477
-#: templates/structure/check_all_tables.phtml:23
-#: templates/structure/display_table_stats.phtml:56
+#: templates/database/structure/check_all_tables.phtml:23
+#: templates/table/structure/display_table_stats.phtml:56
 msgid "Optimize table"
 msgstr "அட்டவணையை உகப்பாக்கு"
 
 #: libraries/operations.lib.php:1492
-#: templates/structure/check_all_tables.phtml:24
+#: templates/database/structure/check_all_tables.phtml:24
 msgid "Repair table"
 msgstr "அட்டவணையை திருத்து"
 
 #: libraries/operations.lib.php:1538
-#: templates/structure/check_all_tables.phtml:14 view_operations.php:127
+#: templates/database/structure/check_all_tables.phtml:14
+#: view_operations.php:127
 msgid "Delete data or table"
 msgstr "தரவை அல்லது அட்டவணையை அழி"
 
@@ -9846,7 +9864,7 @@ msgid "Cannot connect: invalid settings."
 msgstr ""
 
 #: libraries/plugins/auth/AuthenticationConfig.class.php:108
-#: libraries/plugins/auth/AuthenticationCookie.class.php:134
+#: libraries/plugins/auth/AuthenticationCookie.class.php:122
 #: libraries/plugins/auth/AuthenticationHttp.class.php:96
 #, php-format
 msgid "Welcome to %s"
@@ -9876,36 +9894,36 @@ msgstr ""
 msgid "Retry to connect"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:146
+#: libraries/plugins/auth/AuthenticationCookie.class.php:134
 msgid "Your session has expired. Please log in again."
 msgstr "உங்கள் அமர்வு முடிவுற்றது.மீண்டும் புகுபதிவு செய்க."
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:170
+#: libraries/plugins/auth/AuthenticationCookie.class.php:158
 msgid "Log in"
 msgstr "புகுபதிவு"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:178
-#: libraries/plugins/auth/AuthenticationCookie.class.php:188
+#: libraries/plugins/auth/AuthenticationCookie.class.php:166
+#: libraries/plugins/auth/AuthenticationCookie.class.php:176
 msgid "You can enter hostname/IP address and port separated by space."
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:193
+#: libraries/plugins/auth/AuthenticationCookie.class.php:181
 msgid "Username:"
 msgstr "பயனாளர்:"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:205
+#: libraries/plugins/auth/AuthenticationCookie.class.php:193
 msgid "Server Choice:"
 msgstr "விருப்பமான வழங்கி:"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:386
+#: libraries/plugins/auth/AuthenticationCookie.class.php:374
 msgid "Entered captcha is wrong, try again!"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:396
+#: libraries/plugins/auth/AuthenticationCookie.class.php:384
 msgid "Please enter correct captcha!"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:423
+#: libraries/plugins/auth/AuthenticationCookie.class.php:411
 #, fuzzy
 #| msgid "Cannot log in to the MySQL server"
 msgid "You are not allowed to log in to this MySQL server!"
@@ -10003,7 +10021,7 @@ msgstr ""
 #: libraries/plugins/export/ExportOdt.class.php:593
 #: libraries/plugins/export/ExportTexytext.class.php:428
 #: libraries/plugins/export/PMA_ExportPdf.class.php:313
-#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:984
 #: libraries/rte/rte_triggers.lib.php:377
 msgid "Definition"
 msgstr ""
@@ -10308,7 +10326,7 @@ msgid "Last check:"
 msgstr "கடைசி சரிபார்ப்பு:"
 
 #: libraries/plugins/export/ExportSql.class.php:1399
-#: templates/structure/structure_table_row.phtml:183
+#: templates/database/structure/structure_table_row.phtml:183
 msgid "in use"
 msgstr "பயன்பாட்டில் உள்ளது"
 
@@ -10488,18 +10506,14 @@ msgstr "MySQL இடம்சார் நிரல்நீட்சியா
 msgid "The imported file does not contain any data!"
 msgstr ""
 
-#: libraries/plugins/import/ImportSql.class.php:169
+#: libraries/plugins/import/ImportSql.class.php:72
 msgid "SQL compatibility mode:"
 msgstr ""
 
-#: libraries/plugins/import/ImportSql.class.php:181
+#: libraries/plugins/import/ImportSql.class.php:84
 msgid "Do not use <code>AUTO_INCREMENT</code> for zero values"
 msgstr ""
 
-#: libraries/plugins/import/ImportSql.class.php:195
-msgid "Read as multibytes"
-msgstr ""
-
 #: libraries/plugins/import/ImportXml.class.php:54
 msgid "XML"
 msgstr ""
@@ -10544,7 +10558,7 @@ msgid "Show grid"
 msgstr ""
 
 #: libraries/plugins/schema/SchemaPdf.class.php:94
-#: templates/structure/print_view_data_dictionary_link.phtml:6
+#: templates/database/structure/print_view_data_dictionary_link.phtml:6
 msgid "Data Dictionary"
 msgstr "தரவு அகராதி"
 
@@ -10575,7 +10589,7 @@ msgid "The %s table doesn't exist!"
 msgstr ""
 
 #: libraries/plugins/schema/eps/Eps_Relation_Schema.class.php:321
-#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:309
+#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:323
 #, php-format
 msgid "Schema of the %s database - Page %s"
 msgstr ""
@@ -10601,7 +10615,7 @@ msgstr ""
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1005
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1028
 #: libraries/tracking.lib.php:884
-#: templates/structure/table_structure_header.phtml:11
+#: templates/table/structure/table_structure_header.phtml:11
 msgid "Extra"
 msgstr "மிகை"
 
@@ -10920,51 +10934,51 @@ msgstr ""
 msgid "Create the needed tables with the <code>%screate_tables.sql</code>."
 msgstr ""
 
-#: libraries/relation.lib.php:360
+#: libraries/relation.lib.php:357
 msgid "Create a pma user and give access to these tables."
 msgstr ""
 
-#: libraries/relation.lib.php:365
+#: libraries/relation.lib.php:360
 msgid ""
 "Enable advanced features in configuration file (<code>config.inc.php</"
 "code>), for example by starting from <code>config.sample.inc.php</code>."
 msgstr ""
 
-#: libraries/relation.lib.php:373
+#: libraries/relation.lib.php:365
 msgid "Re-login to phpMyAdmin to load the updated configuration file."
 msgstr ""
 
-#: libraries/relation.lib.php:1612
+#: libraries/relation.lib.php:1607
 msgid "no description"
 msgstr ""
 
-#: libraries/relation.lib.php:1811
+#: libraries/relation.lib.php:1806
 msgid ""
 "You do not have necessary privileges to create a database named "
 "'phpmyadmin'. You may go to 'Operations' tab of any database to set up the "
 "phpMyAdmin configuration storage there."
 msgstr ""
 
-#: libraries/relation.lib.php:1928
+#: libraries/relation.lib.php:1923
 #, php-format
 msgid ""
 "%sCreate%s a database named 'phpmyadmin' and setup the phpMyAdmin "
 "configuration storage there."
 msgstr ""
 
-#: libraries/relation.lib.php:1936
+#: libraries/relation.lib.php:1931
 #, php-format
 msgid ""
 "%sCreate%s the phpMyAdmin configuration storage in the current database."
 msgstr ""
 
-#: libraries/relation.lib.php:1944
+#: libraries/relation.lib.php:1939
 #, php-format
 msgid "%sCreate%s missing phpMyAdmin configuration storage tables."
 msgstr ""
 
 #: libraries/replication_gui.lib.php:46 libraries/replication_gui.lib.php:343
-#: libraries/server_databases.lib.php:387
+#: libraries/server_databases.lib.php:398
 msgid "Master replication"
 msgstr ""
 
@@ -11019,7 +11033,7 @@ msgid ""
 msgstr ""
 
 #: libraries/replication_gui.lib.php:141
-#: libraries/server_databases.lib.php:389
+#: libraries/server_databases.lib.php:400
 msgid "Slave replication"
 msgstr ""
 
@@ -11282,10 +11296,10 @@ msgid "Master server changed successfully to %s."
 msgstr ""
 
 #: libraries/rte/rte_events.lib.php:106 libraries/rte/rte_events.lib.php:115
-#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:149
-#: libraries/rte/rte_routines.lib.php:158
-#: libraries/rte/rte_routines.lib.php:231
-#: libraries/rte/rte_routines.lib.php:1362
+#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:219
+#: libraries/rte/rte_routines.lib.php:246
+#: libraries/rte/rte_routines.lib.php:368
+#: libraries/rte/rte_routines.lib.php:1453
 #: libraries/rte/rte_triggers.lib.php:82 libraries/rte/rte_triggers.lib.php:91
 #: libraries/rte/rte_triggers.lib.php:123
 #, php-format
@@ -11306,7 +11320,7 @@ msgstr ""
 msgid "Event %1$s has been created."
 msgstr ""
 
-#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:251
+#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:266
 #: libraries/rte/rte_triggers.lib.php:144
 msgid "One or more errors have occurred while processing your request:"
 msgstr ""
@@ -11315,7 +11329,7 @@ msgstr ""
 msgid "Edit event"
 msgstr "நிகழ்வை தொகுக்க"
 
-#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:794
+#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:885
 #: libraries/rte/rte_triggers.lib.php:323 view_create.php:180
 msgid "Details"
 msgstr ""
@@ -11328,7 +11342,7 @@ msgstr ""
 msgid "Event type"
 msgstr ""
 
-#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:817
+#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:908
 #, php-format
 msgid "Change to %s"
 msgstr ""
@@ -11355,12 +11369,14 @@ msgstr ""
 msgid "On completion preserve"
 msgstr ""
 
-#: libraries/rte/rte_events.lib.php:491 libraries/rte/rte_routines.lib.php:930
+#: libraries/rte/rte_events.lib.php:491
+#: libraries/rte/rte_routines.lib.php:1021
 #: libraries/rte/rte_triggers.lib.php:383 view_create.php:209
 msgid "Definer"
 msgstr ""
 
-#: libraries/rte/rte_events.lib.php:535 libraries/rte/rte_routines.lib.php:997
+#: libraries/rte/rte_events.lib.php:535
+#: libraries/rte/rte_routines.lib.php:1088
 #: libraries/rte/rte_triggers.lib.php:422
 msgid "The definer must be in the \"username@hostname\" format!"
 msgstr ""
@@ -11386,9 +11402,9 @@ msgid "You must provide an event definition."
 msgstr ""
 
 #: libraries/rte/rte_export.lib.php:43 libraries/rte/rte_general.lib.php:72
-#: libraries/rte/rte_routines.lib.php:345
-#: libraries/rte/rte_routines.lib.php:1198
-#: libraries/rte/rte_routines.lib.php:1411
+#: libraries/rte/rte_routines.lib.php:153
+#: libraries/rte/rte_routines.lib.php:1289
+#: libraries/rte/rte_routines.lib.php:1502
 msgid "Error in processing request:"
 msgstr "வேண்டுகோள் செயலாக்கதில் பிழை:"
 
@@ -11420,132 +11436,132 @@ msgid ""
 "problems."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:110
-#: libraries/rte/rte_routines.lib.php:1006
+#: libraries/rte/rte_routines.lib.php:123
+msgid "Edit routine"
+msgstr ""
+
+#: libraries/rte/rte_routines.lib.php:200
+#: libraries/rte/rte_routines.lib.php:1097
 #, php-format
 msgid "Invalid routine type: \"%s\""
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:170
-msgid "Sorry, we failed to restore the dropped routine."
-msgstr ""
-
-#: libraries/rte/rte_routines.lib.php:211
-#, php-format
-msgid "Routine %1$s has been modified. Privileges have been adjusted."
-msgstr ""
-
-#: libraries/rte/rte_routines.lib.php:216
-#, php-format
-msgid "Routine %1$s has been modified."
-msgstr ""
-
-#: libraries/rte/rte_routines.lib.php:238
+#: libraries/rte/rte_routines.lib.php:253
 #, php-format
 msgid "Routine %1$s has been created."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:315
-msgid "Edit routine"
+#: libraries/rte/rte_routines.lib.php:380
+msgid "Sorry, we failed to restore the dropped routine."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:797
+#: libraries/rte/rte_routines.lib.php:439
+#, php-format
+msgid "Routine %1$s has been modified. Privileges have been adjusted."
+msgstr ""
+
+#: libraries/rte/rte_routines.lib.php:444
+#, php-format
+msgid "Routine %1$s has been modified."
+msgstr ""
+
+#: libraries/rte/rte_routines.lib.php:888
 msgid "Routine name"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:823
+#: libraries/rte/rte_routines.lib.php:914
 msgid "Parameters"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:829
+#: libraries/rte/rte_routines.lib.php:920
 msgid "Direction"
 msgstr "செயல்->திசைப்பாடு"
 
-#: libraries/rte/rte_routines.lib.php:847
+#: libraries/rte/rte_routines.lib.php:938
 msgid "Add parameter"
 msgstr "மதிப்புருவை சேர்க்க"
 
-#: libraries/rte/rte_routines.lib.php:851
+#: libraries/rte/rte_routines.lib.php:942
 msgid "Remove last parameter"
 msgstr "கடைசி மதிப்புருவை நீக்குக"
 
-#: libraries/rte/rte_routines.lib.php:856
+#: libraries/rte/rte_routines.lib.php:947
 msgid "Return type"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:862
+#: libraries/rte/rte_routines.lib.php:953
 msgid "Return length/values"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:868
+#: libraries/rte/rte_routines.lib.php:959
 msgid "Return options"
 msgstr "செயல்கள்->திருப்பியளிதல் விருப்பங்கள்"
 
-#: libraries/rte/rte_routines.lib.php:899
+#: libraries/rte/rte_routines.lib.php:990
 msgid "Is deterministic"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:920
+#: libraries/rte/rte_routines.lib.php:1011
 msgid ""
 "You do not have sufficient privileges to perform this operation; Please "
 "refer to the documentation for more details"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:935
+#: libraries/rte/rte_routines.lib.php:1026
 msgid "Security type"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:944
+#: libraries/rte/rte_routines.lib.php:1035
 msgid "SQL data access"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1013
+#: libraries/rte/rte_routines.lib.php:1104
 msgid "You must provide a routine name!"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1047
+#: libraries/rte/rte_routines.lib.php:1138
 #, php-format
 msgid "Invalid direction \"%s\" given for parameter."
 msgstr "மதிப்புருபுக்கு தகா வழிமதிப்பு \"%s\" அளிக்கப்பட்டுள்ளது."
 
-#: libraries/rte/rte_routines.lib.php:1069
-#: libraries/rte/rte_routines.lib.php:1131
+#: libraries/rte/rte_routines.lib.php:1160
+#: libraries/rte/rte_routines.lib.php:1222
 msgid ""
 "You must provide length/values for routine parameters of type ENUM, SET, "
 "VARCHAR and VARBINARY."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1095
+#: libraries/rte/rte_routines.lib.php:1186
 msgid "You must provide a name and a type for each routine parameter."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1114
+#: libraries/rte/rte_routines.lib.php:1205
 msgid "You must provide a valid return type for the routine."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1174
+#: libraries/rte/rte_routines.lib.php:1265
 msgid "You must provide a routine definition."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1285
+#: libraries/rte/rte_routines.lib.php:1376
 #, php-format
 msgid "Execution results of routine %s"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1340
+#: libraries/rte/rte_routines.lib.php:1431
 #, php-format
 msgid "%d row affected by the last statement inside the procedure."
 msgid_plural "%d rows affected by the last statement inside the procedure."
 msgstr[0] ""
 msgstr[1] ""
 
-#: libraries/rte/rte_routines.lib.php:1398
-#: libraries/rte/rte_routines.lib.php:1406
+#: libraries/rte/rte_routines.lib.php:1489
+#: libraries/rte/rte_routines.lib.php:1497
 msgid "Execute routine"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1485
-#: libraries/rte/rte_routines.lib.php:1488
+#: libraries/rte/rte_routines.lib.php:1576
+#: libraries/rte/rte_routines.lib.php:1579
 msgid "Routine parameters"
 msgstr ""
 
@@ -11699,7 +11715,7 @@ msgid "Original position"
 msgstr ""
 
 #: libraries/server_bin_log.lib.php:133
-#: templates/structure/display_table_stats.phtml:4
+#: templates/table/structure/display_table_stats.phtml:4
 msgid "Information"
 msgstr ""
 
@@ -11735,12 +11751,12 @@ msgid ""
 "between the web server and the MySQL server."
 msgstr ""
 
-#: libraries/server_databases.lib.php:364
-#: libraries/server_databases.lib.php:365
+#: libraries/server_databases.lib.php:366
+#: libraries/server_databases.lib.php:371
 msgid "Enable Statistics"
 msgstr ""
 
-#: libraries/server_databases.lib.php:481
+#: libraries/server_databases.lib.php:492
 #, php-format
 msgid "%1$d database has been dropped successfully."
 msgid_plural "%1$d databases have been dropped successfully."
@@ -12104,7 +12120,7 @@ msgid "You have revoked the privileges for %s."
 msgstr ""
 
 #: libraries/server_privileges.lib.php:2059
-#: libraries/server_privileges.lib.php:4290
+#: libraries/server_privileges.lib.php:4316
 #, fuzzy
 #| msgid "Add user group"
 msgid "Add user account"
@@ -12273,59 +12289,59 @@ msgstr ""
 msgid "The privileges were reloaded successfully."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:3994
+#: libraries/server_privileges.lib.php:4003
 #, php-format
 msgid "The user %s already exists!"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4232
+#: libraries/server_privileges.lib.php:4258
 #, php-format
 msgid "Privileges for %s"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4241
+#: libraries/server_privileges.lib.php:4267
 #: libraries/server_status_processes.lib.php:72
 #: libraries/server_user_groups.lib.php:39
 msgid "User"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4282
+#: libraries/server_privileges.lib.php:4308
 msgctxt "Create new user"
 msgid "New"
 msgstr "புதியது"
 
-#: libraries/server_privileges.lib.php:4311
+#: libraries/server_privileges.lib.php:4337
 #, fuzzy
 #| msgid "Edit Privileges:"
 msgid "Edit privileges:"
 msgstr "புதிய பயனாளரை சேர்க்க->தனிச்சலுகையை தொகுக்க:"
 
-#: libraries/server_privileges.lib.php:4312
+#: libraries/server_privileges.lib.php:4338
 #, fuzzy
 #| msgid "User groups"
 msgid "User account"
 msgstr "பயனர் குழுக்கள்"
 
-#: libraries/server_privileges.lib.php:4371
+#: libraries/server_privileges.lib.php:4397
 msgid ""
 "Note: You are attempting to edit privileges of the user with which you are "
 "currently logged in."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4391 libraries/server_users.lib.php:25
+#: libraries/server_privileges.lib.php:4417 libraries/server_users.lib.php:25
 #, fuzzy
 #| msgid "Users overview"
 msgid "User accounts overview"
 msgstr "பயனர்கள் கண்ணோட்டம்"
 
-#: libraries/server_privileges.lib.php:4459
+#: libraries/server_privileges.lib.php:4485
 msgid ""
 "A user account allowing any user from localhost to connect is present. This "
 "will prevent other users from connecting if the host part of their account "
 "allows a connection from any (%) host."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4500
+#: libraries/server_privileges.lib.php:4526
 #, php-format
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
@@ -12334,7 +12350,7 @@ msgid ""
 "%sreload the privileges%s before you continue."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4519
+#: libraries/server_privileges.lib.php:4545
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
 "tables. The content of these tables may differ from the privileges the "
@@ -12343,63 +12359,63 @@ msgid ""
 "privilege."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4569
+#: libraries/server_privileges.lib.php:4595
 msgid "The selected user was not found in the privilege table."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4801
+#: libraries/server_privileges.lib.php:4827
 msgid "You have added a new user."
 msgstr "நீங்கள் புதிய பயனாளரை சேர்த்துள்ளீர்கள்."
 
-#: libraries/server_status.lib.php:53
+#: libraries/server_status.lib.php:60
 #, php-format
 msgid "Network traffic since startup: %s"
 msgstr ""
 
-#: libraries/server_status.lib.php:66
+#: libraries/server_status.lib.php:73
 #, php-format
 msgid "This MySQL server has been running for %1$s. It started up on %2$s."
 msgstr ""
 
-#: libraries/server_status.lib.php:80
+#: libraries/server_status.lib.php:94
 msgid ""
 "This MySQL server works as <b>master</b> and <b>slave</b> in <b>replication</"
 "b> process."
 msgstr ""
 
-#: libraries/server_status.lib.php:85
+#: libraries/server_status.lib.php:99
 msgid "This MySQL server works as <b>master</b> in <b>replication</b> process."
 msgstr ""
 
-#: libraries/server_status.lib.php:90
+#: libraries/server_status.lib.php:104
 msgid "This MySQL server works as <b>slave</b> in <b>replication</b> process."
 msgstr ""
 
-#: libraries/server_status.lib.php:106
+#: libraries/server_status.lib.php:116
 msgid "Replication status"
 msgstr "துணைநிலை நிகழ்நிலை"
 
-#: libraries/server_status.lib.php:137
+#: libraries/server_status.lib.php:146
 msgid ""
 "On a busy server, the byte counters may overrun, so those statistics as "
 "reported by the MySQL server may be incorrect."
 msgstr ""
 
-#: libraries/server_status.lib.php:148
+#: libraries/server_status.lib.php:157
 msgid "Received"
 msgstr ""
 
-#: libraries/server_status.lib.php:167
+#: libraries/server_status.lib.php:176
 msgid "Sent"
 msgstr ""
 
-#: libraries/server_status.lib.php:234
+#: libraries/server_status.lib.php:243
 #, fuzzy
 #| msgid "Current connection"
 msgid "Max. concurrent connections"
 msgstr "நடப்பாணை இணைப்பு"
 
-#: libraries/server_status.lib.php:244
+#: libraries/server_status.lib.php:253
 msgid "Failed attempts"
 msgstr ""
 
@@ -13323,7 +13339,7 @@ msgstr ""
 msgid "Not implemented yet."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/AlterOperation.php:193
+#: libraries/sql-parser/src/Components/AlterOperation.php:191
 msgid "Unrecognized alter operation."
 msgstr ""
 
@@ -13337,7 +13353,7 @@ msgid "An opening bracket followed by a set of values was expected."
 msgstr ""
 
 #: libraries/sql-parser/src/Components/ArrayObj.php:101
-#: libraries/sql-parser/src/Components/FieldDefinition.php:202
+#: libraries/sql-parser/src/Components/CreateDefinition.php:202
 msgid "An opening bracket was expected."
 msgstr ""
 
@@ -13345,25 +13361,35 @@ msgstr ""
 msgid "A comma or a closing bracket was expected"
 msgstr ""
 
+#: libraries/sql-parser/src/Components/CreateDefinition.php:246
+#, fuzzy
+#| msgid "No tables selected."
+msgid "A comma or a closing bracket was expected."
+msgstr "எந்த தரவுத்தளமும் தேர்ந்தெடுக்கப்படவில்லை."
+
+#: libraries/sql-parser/src/Components/CreateDefinition.php:262
+msgid "A closing bracket was expected."
+msgstr ""
+
 #: libraries/sql-parser/src/Components/DataType.php:125
 msgid "Unrecognized data type."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:225
+#: libraries/sql-parser/src/Components/Expression.php:227
 msgid "Unexpected closing bracket."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:246
-#: libraries/sql-parser/src/Components/Expression.php:283
-#: libraries/sql-parser/src/Components/Expression.php:303
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:285
+#: libraries/sql-parser/src/Components/Expression.php:305
 msgid "An alias was previously found."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:257
+#: libraries/sql-parser/src/Components/Expression.php:259
 msgid "Unexpected dot."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:327
+#: libraries/sql-parser/src/Components/Expression.php:329
 #, fuzzy
 #| msgid "No tables selected."
 msgid "An alias was expected."
@@ -13375,16 +13401,6 @@ msgstr "எந்த தரவுத்தளமும் தேர்ந்த
 msgid "An expression was expected."
 msgstr "தெரிவுசெய்யப்பட வரிசைகள் இல்லை"
 
-#: libraries/sql-parser/src/Components/FieldDefinition.php:246
-#, fuzzy
-#| msgid "No tables selected."
-msgid "A comma or a closing bracket was expected."
-msgstr "எந்த தரவுத்தளமும் தேர்ந்தெடுக்கப்படவில்லை."
-
-#: libraries/sql-parser/src/Components/FieldDefinition.php:262
-msgid "A closing bracket was expected."
-msgstr ""
-
 #: libraries/sql-parser/src/Components/Limit.php:90
 #: libraries/sql-parser/src/Components/Limit.php:112
 msgid "An offset was expected."
@@ -13428,26 +13444,26 @@ msgstr ""
 msgid "Expected delimiter."
 msgstr ""
 
-#: libraries/sql-parser/src/Lexer.php:753
+#: libraries/sql-parser/src/Lexer.php:777
 #, php-format
 msgid "Ending quote %1$s was expected."
 msgstr ""
 
-#: libraries/sql-parser/src/Lexer.php:789
+#: libraries/sql-parser/src/Lexer.php:813
 msgid "Variable name was expected."
 msgstr ""
 
-#: libraries/sql-parser/src/Parser.php:380
+#: libraries/sql-parser/src/Parser.php:391
 #, fuzzy
 #| msgid "Rate of table open"
 msgid "Unexpected beginning of statement."
 msgstr "திறந்தநிலை அட்டவணைகளின் விழுக்காடு"
 
-#: libraries/sql-parser/src/Parser.php:399
+#: libraries/sql-parser/src/Parser.php:410
 msgid "Unrecognized statement type."
 msgstr ""
 
-#: libraries/sql-parser/src/Parser.php:479
+#: libraries/sql-parser/src/Parser.php:489
 msgid "No transaction was previously started."
 msgstr ""
 
@@ -13475,8 +13491,10 @@ msgid "The name of the entity was expected."
 msgstr ""
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:310
-msgid "At least one field definition was expected."
-msgstr ""
+#, fuzzy
+#| msgid "The row has been deleted."
+msgid "At least one column definition was expected."
+msgstr "இந்நிரைவரிசை அழிக்கப்பட்டது."
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:329
 msgid "A \"RETURNS\" keyword was expected."
@@ -13535,11 +13553,11 @@ msgstr ""
 msgid "Using bookmark \"%s\" as default browse query."
 msgstr ""
 
-#: libraries/sql.lib.php:1306
+#: libraries/sql.lib.php:1300
 msgid "Showing as PHP code"
 msgstr ""
 
-#: libraries/sql.lib.php:1638
+#: libraries/sql.lib.php:1632
 #, fuzzy, php-format
 #| msgid ""
 #| "This table does not contain a unique column. Features related to the grid "
@@ -13551,7 +13569,7 @@ msgstr ""
 "இவ்வட்டவணையில் தனித்தநிரல்வரிசை இல்லை.சேமித்த பின்னர் நெய்யரியில் தொகுத்தல், தேர்வுபெட்டி, "
 "தொகுத்தல், படியெடுத்தல், மற்றும் நீக்கல் வசதிகள் செயல்படாமல் போகலாம்."
 
-#: libraries/sql.lib.php:1649
+#: libraries/sql.lib.php:1643
 #, fuzzy, php-format
 #| msgid ""
 #| "This table does not contain a unique column. Features related to the grid "
@@ -13563,7 +13581,7 @@ msgstr ""
 "இவ்வட்டவணையில் தனித்தநிரல்வரிசை இல்லை.சேமித்த பின்னர் நெய்யரியில் தொகுத்தல், தேர்வுபெட்டி, "
 "தொகுத்தல், படியெடுத்தல், மற்றும் நீக்கல் வசதிகள் செயல்படாமல் போகலாம்."
 
-#: libraries/sql.lib.php:1688
+#: libraries/sql.lib.php:1682
 #, php-format
 msgid "Problems with indexes of table `%s`"
 msgstr ""
@@ -13725,7 +13743,7 @@ msgid "Version %s snapshot (SQL code)"
 msgstr ""
 
 #: libraries/tracking.lib.php:947
-#: templates/structure/table_structure_row.phtml:33
+#: templates/table/structure/table_structure_row.phtml:33
 msgctxt "None for default"
 msgid "None"
 msgstr "ஒன்றுமில்லாத"
@@ -13778,15 +13796,15 @@ msgstr "%2$s ன் %1$s பதிப்பை உருவாக்குக"
 msgid "Version %1$s was created, tracking for %2$s is active."
 msgstr ""
 
-#: libraries/user_preferences.inc.php:29
+#: libraries/user_preferences.inc.php:30
 msgid "Manage your settings"
 msgstr "உங்கள் அமைவுகளை கையாளுக"
 
-#: libraries/user_preferences.inc.php:46 prefs_manage.php:307
+#: libraries/user_preferences.inc.php:54 prefs_manage.php:307
 msgid "Configuration has been saved."
 msgstr ""
 
-#: libraries/user_preferences.inc.php:66
+#: libraries/user_preferences.inc.php:74
 #, php-format
 msgid ""
 "Your preferences will be saved for current session only. Storing them "
@@ -14170,7 +14188,7 @@ msgid "first"
 msgstr ""
 
 #: templates/columns_definitions/move_column.phtml:12
-#: templates/structure/add_column.phtml:21
+#: templates/table/structure/add_column.phtml:21
 #, php-format
 msgid "after %s"
 msgstr "%s க்கு அடுத்து"
@@ -14229,203 +14247,296 @@ msgstr "உள்ளிடு மாற்றுருவாக்கம்"
 msgid "Input transformation options"
 msgstr "உள்ளீடு மாற்றுருவாக்க விருப்பங்கள்"
 
-#: templates/designer/aggregate_query_panel.phtml:22
-#: templates/designer/options_panel.phtml:100
+#: templates/database/create_table.phtml:7
+#: templates/database/designer/side_menu.phtml:77
+#: templates/database/designer/side_menu.phtml:80
+msgid "Create table"
+msgstr ""
+
+#: templates/database/create_table.phtml:15
+msgid "Number of columns"
+msgstr ""
+
+#: templates/database/designer/aggregate_query_panel.phtml:22
+#: templates/database/designer/options_panel.phtml:100
 msgid "Aggregate"
 msgstr ""
 
-#: templates/designer/aggregate_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:61
-#: templates/designer/options_panel.phtml:106
-#: templates/designer/options_panel.phtml:170
-#: templates/designer/where_query_panel.phtml:30
-#: templates/table/table_header.phtml:9
+#: templates/database/designer/aggregate_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:61
+#: templates/database/designer/options_panel.phtml:106
+#: templates/database/designer/options_panel.phtml:170
+#: templates/database/designer/where_query_panel.phtml:30
+#: templates/table/search/table_header.phtml:9
 msgid "Operator"
 msgstr ""
 
-#: templates/designer/database_tables.phtml:29
+#: templates/database/designer/database_tables.phtml:29
 msgid "Toggle"
 msgstr ""
 
-#: templates/designer/database_tables.phtml:40
+#: templates/database/designer/database_tables.phtml:40
 #, fuzzy
 #| msgid "Table structure"
 msgid "See table structure"
 msgstr "தரவுத்தளங்கள்->அட்டவணை கட்டமைப்பு"
 
-#: templates/designer/delete_relation_panel.phtml:21
+#: templates/database/designer/delete_relation_panel.phtml:21
 msgid "Delete relation"
 msgstr ""
 
-#: templates/designer/edit_delete_pages.phtml:7
+#: templates/database/designer/edit_delete_pages.phtml:7
 msgid "Page to open"
 msgstr "திறக்கவேண்டிய பக்கம்"
 
-#: templates/designer/edit_delete_pages.phtml:7
+#: templates/database/designer/edit_delete_pages.phtml:7
 msgid "Page to delete"
 msgstr "அழிக்கவேண்டிய பக்கம்"
 
-#: templates/designer/having_query_panel.phtml:90
-#: templates/designer/options_panel.phtml:63
-#: templates/designer/options_panel.phtml:229
-#: templates/designer/where_query_panel.phtml:59
+#: templates/database/designer/having_query_panel.phtml:90
+#: templates/database/designer/options_panel.phtml:63
+#: templates/database/designer/options_panel.phtml:229
+#: templates/database/designer/where_query_panel.phtml:59
 msgid "Except"
 msgstr ""
 
-#: templates/designer/having_query_panel.phtml:102
-#: templates/designer/options_panel.phtml:75
-#: templates/designer/options_panel.phtml:241
-#: templates/designer/where_query_panel.phtml:71
+#: templates/database/designer/having_query_panel.phtml:102
+#: templates/database/designer/options_panel.phtml:75
+#: templates/database/designer/options_panel.phtml:241
+#: templates/database/designer/where_query_panel.phtml:71
 msgid "subquery"
 msgstr ""
 
-#: templates/designer/new_relation_panel.phtml:22
-#: templates/designer/side_menu.phtml:84 templates/designer/side_menu.phtml:87
+#: templates/database/designer/new_relation_panel.phtml:22
+#: templates/database/designer/side_menu.phtml:84
+#: templates/database/designer/side_menu.phtml:87
 msgid "Create relation"
 msgstr ""
 
-#: templates/designer/options_panel.phtml:34
-#: templates/designer/options_panel.phtml:200
+#: templates/database/designer/options_panel.phtml:34
+#: templates/database/designer/options_panel.phtml:200
 msgid "Relation operator"
 msgstr ""
 
-#: templates/designer/options_panel.phtml:85
-#: templates/designer/rename_to_panel.phtml:23
+#: templates/database/designer/options_panel.phtml:85
+#: templates/database/designer/rename_to_panel.phtml:23
 msgid "Rename to"
 msgstr ""
 
-#: templates/designer/options_panel.phtml:91
-#: templates/designer/rename_to_panel.phtml:31
+#: templates/database/designer/options_panel.phtml:91
+#: templates/database/designer/rename_to_panel.phtml:31
 msgid "New name"
 msgstr ""
 
-#: templates/designer/page_save_as.phtml:4
+#: templates/database/designer/page_save_as.phtml:4
 msgid "Save to selected page"
 msgstr "தெரிவுசெய்யப்பட பக்கத்திற்கு சேமிக்க"
 
-#: templates/designer/page_save_as.phtml:5
+#: templates/database/designer/page_save_as.phtml:5
 msgid "Create a page and save to it"
 msgstr ""
 
-#: templates/designer/page_save_as.phtml:26
+#: templates/database/designer/page_save_as.phtml:26
 msgid "New page name"
 msgstr ""
 
-#: templates/designer/page_selector.phtml:2
+#: templates/database/designer/page_selector.phtml:2
 msgid "Select page"
 msgstr ""
 
-#: templates/designer/query_details.phtml:10
+#: templates/database/designer/query_details.phtml:10
 msgid "Active options"
 msgstr "செயல்படு விருப்பங்கள்"
 
-#: templates/designer/schema_export.phtml:4
+#: templates/database/designer/schema_export.phtml:4
 msgid "Select Export Relational Type"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:19 templates/designer/side_menu.phtml:25
+#: templates/database/designer/side_menu.phtml:19
+#: templates/database/designer/side_menu.phtml:25
 #, fuzzy
 #| msgid "Showing tables:"
 msgid "Show/Hide tables list"
 msgstr "காட்டப்படுகிற அட்டவணைகள்:"
 
-#: templates/designer/side_menu.phtml:29 templates/designer/side_menu.phtml:35
-#: templates/designer/side_menu.phtml:36
+#: templates/database/designer/side_menu.phtml:29
+#: templates/database/designer/side_menu.phtml:35
+#: templates/database/designer/side_menu.phtml:36
 msgid "View in fullscreen"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:34
+#: templates/database/designer/side_menu.phtml:34
 msgid "Exit fullscreen"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:41 templates/designer/side_menu.phtml:45
+#: templates/database/designer/side_menu.phtml:41
+#: templates/database/designer/side_menu.phtml:45
 msgid "New page"
 msgstr "புது பக்கம்"
 
-#: templates/designer/side_menu.phtml:70 templates/designer/side_menu.phtml:73
+#: templates/database/designer/side_menu.phtml:70
+#: templates/database/designer/side_menu.phtml:73
 msgid "Delete pages"
 msgstr "பக்கங்களை அழிக்க"
 
-#: templates/designer/side_menu.phtml:77 templates/designer/side_menu.phtml:80
-#: templates/table/create_table.phtml:7
-msgid "Create table"
-msgstr ""
-
-#: templates/designer/side_menu.phtml:98
-#: templates/designer/side_menu.phtml:101
+#: templates/database/designer/side_menu.phtml:98
+#: templates/database/designer/side_menu.phtml:101
 msgid "Reload"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:107
-#: templates/designer/side_menu.phtml:110
+#: templates/database/designer/side_menu.phtml:107
+#: templates/database/designer/side_menu.phtml:110
 msgid "Help"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Angular links"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Direct links"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:122
-#: templates/designer/side_menu.phtml:124
+#: templates/database/designer/side_menu.phtml:122
+#: templates/database/designer/side_menu.phtml:124
 msgid "Snap to grid"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:128
-#: templates/designer/side_menu.phtml:134
+#: templates/database/designer/side_menu.phtml:128
+#: templates/database/designer/side_menu.phtml:134
 msgid "Small/Big All"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:138
-#: templates/designer/side_menu.phtml:141
+#: templates/database/designer/side_menu.phtml:138
+#: templates/database/designer/side_menu.phtml:141
 msgid "Toggle small/big"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:145
-#: templates/designer/side_menu.phtml:148
+#: templates/database/designer/side_menu.phtml:145
+#: templates/database/designer/side_menu.phtml:148
 msgid "Toggle relation lines"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:153
-#: templates/designer/side_menu.phtml:156
+#: templates/database/designer/side_menu.phtml:153
+#: templates/database/designer/side_menu.phtml:156
 msgid "Export schema"
 msgstr "ஒழுங்கமைவை தரவேற்றுக"
 
-#: templates/designer/side_menu.phtml:165
-#: templates/designer/side_menu.phtml:168
+#: templates/database/designer/side_menu.phtml:165
+#: templates/database/designer/side_menu.phtml:168
 msgid "Build Query"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:173
-#: templates/designer/side_menu.phtml:177
+#: templates/database/designer/side_menu.phtml:173
+#: templates/database/designer/side_menu.phtml:177
 msgid "Move Menu"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:181
-#: templates/designer/side_menu.phtml:186
+#: templates/database/designer/side_menu.phtml:181
+#: templates/database/designer/side_menu.phtml:186
 #, fuzzy
 #| msgid "Partial texts"
 msgid "Pin text"
 msgstr "பகுதியளவு உரை"
 
-#: templates/designer/table_list.phtml:4
+#: templates/database/designer/table_list.phtml:4
 msgid "Hide/Show all"
 msgstr ""
 
-#: templates/designer/table_list.phtml:14
+#: templates/database/designer/table_list.phtml:14
 msgid "Hide/Show Tables with no relation"
 msgstr ""
 
-#: templates/designer/table_list.phtml:59
+#: templates/database/designer/table_list.phtml:59
 msgid "Number of tables:"
 msgstr ""
 
+#: templates/database/structure/body_for_table_summary.phtml:6
+#, php-format
+msgid "%s table"
+msgid_plural "%s tables"
+msgstr[0] "%s அட்டவணை"
+msgstr[1] "%s அட்டவணைகள்"
+
+#: templates/database/structure/body_for_table_summary.phtml:17
+msgid "Sum"
+msgstr "கூட்டுத்தொகை"
+
+#: templates/database/structure/check_all_tables.phtml:6
+msgid "Check tables having overhead"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:10
+msgid "Show create"
+msgstr "உருவாக்கத்தை காட்டு"
+
+#: templates/database/structure/check_all_tables.phtml:27
+msgid "Prefix"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:28
+msgid "Add prefix to table"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:29
+msgid "Replace table prefix"
+msgstr "அட்டவணை முன்னொட்டை பதிலிடு"
+
+#: templates/database/structure/check_all_tables.phtml:30
+msgid "Copy table with prefix"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:36
+msgid "Add columns to central list"
+msgstr "நிரல்வரிசைகளை முதன்மைபட்டியலில் சேர்க்க"
+
+#: templates/database/structure/check_all_tables.phtml:37
+msgid "Remove columns from central list"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:38
+msgid "Make consistent with central list"
+msgstr "முதன்மைபட்டியலை ஒத்து நிலைப்படுத்துக"
+
+#: templates/database/structure/favorite_anchor.phtml:12
+msgid "Add to Favorites"
+msgstr "விருப்பமானவைகளில் சேர்க்க"
+
+#: templates/database/structure/show_create.phtml:2
+msgid "Showing create queries"
+msgstr ""
+
+#: templates/database/structure/sortable_header.phtml:13
+msgid "Sort"
+msgstr "வரிசைப்படுத்து"
+
+#: templates/database/structure/table_header.phtml:42
+msgid ""
+"May be approximate. Click on the number to get the exact count. See "
+"[doc@faq3-11]FAQ 3.11[/doc]."
+msgstr ""
+
+#: templates/database/structure/table_header.phtml:66
+#: templates/table/index_form.phtml:127
+msgid "Size"
+msgstr "அளவு"
+
+#: templates/database/structure/table_header.phtml:74
+#: templates/table/structure/display_table_stats.phtml:27
+msgid "Overhead"
+msgstr "பயனீட்டளவு"
+
+#: templates/database/structure/tracking_icon.phtml:4
+msgid "Tracking is active."
+msgstr ""
+
+#: templates/database/structure/tracking_icon.phtml:8
+msgid "Tracking is not active."
+msgstr ""
+
 #: templates/error/report_form.phtml:7
 msgid ""
 "phpMyAdmin has encountered an error. We have collected data about this error "
@@ -14441,63 +14552,6 @@ msgstr ""
 msgid "Please explain the steps that lead to the error:"
 msgstr ""
 
-#: templates/gis_visualization/gis_visualization.phtml:3
-msgid "Display GIS Visualization"
-msgstr ""
-
-#: templates/gis_visualization/gis_visualization.phtml:8
-msgid "Label column"
-msgstr "சிட்டை நிரல்வரிசை"
-
-#: templates/gis_visualization/gis_visualization.phtml:11
-msgid "-- None --"
-msgstr "-- எதுவுமில்லை --"
-
-#: templates/gis_visualization/gis_visualization.phtml:19
-msgid "Spatial column"
-msgstr "இடம்சார் நிரல்வரிசை"
-
-#: templates/index_form.phtml:16
-msgid "Index name:"
-msgstr "சுட்டுதொகுப்புக்குறி பெயர்:"
-
-#: templates/index_form.phtml:19
-msgid ""
-"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
-msgstr ""
-
-#: templates/index_form.phtml:40
-#, fuzzy
-#| msgid "Index name:"
-msgid "Index choice:"
-msgstr "சுட்டுதொகுப்புக்குறி பெயர்:"
-
-#: templates/index_form.phtml:57
-msgid "Key block size:"
-msgstr ""
-
-#: templates/index_form.phtml:74
-msgid "Index type:"
-msgstr "சுட்டுதொகுப்புக்குறி வகை:"
-
-#: templates/index_form.phtml:86
-#, fuzzy
-#| msgid "User:"
-msgid "Parser:"
-msgstr "பயனர்:"
-
-#: templates/index_form.phtml:102
-msgid "Comment:"
-msgstr "கருத்துரை:"
-
-#: templates/index_form.phtml:127 templates/structure/table_header.phtml:66
-msgid "Size"
-msgstr "அளவு"
-
-#: templates/index_form.phtml:149 templates/index_form.phtml:190
-msgid "Drag to reorder"
-msgstr ""
-
 #: templates/prefs_autoload.phtml:9
 msgid ""
 "Your browser has phpMyAdmin configuration for this domain. Would you like to "
@@ -14508,408 +14562,379 @@ msgstr ""
 msgid "Start row:"
 msgstr "துவக்க வரிசை:"
 
-#: templates/structure/actions_in_table_structure.phtml:14
-#, php-format
-msgid "A primary key has been added on %s."
-msgstr ""
-
-#: templates/structure/actions_in_table_structure.phtml:34
-#: templates/structure/actions_in_table_structure.phtml:54
-#: templates/structure/actions_in_table_structure.phtml:79
-#: templates/structure/actions_in_table_structure.phtml:101
-#, php-format
-msgid "An index has been added on %s."
-msgstr ""
-
-#: templates/structure/actions_in_table_structure.phtml:130
-#: templates/structure/check_all_table_column.phtml:59
-msgid "Remove from central columns"
-msgstr "முதன்மைநிரல்வரிசைகளிலிருந்து நீக்கவும்"
-
-#: templates/structure/actions_in_table_structure.phtml:138
-#: templates/structure/check_all_table_column.phtml:55
-msgid "Add to central columns"
-msgstr "முதன்மை நிரல்வரிசைகளில் சேர்க்க"
-
-#: templates/structure/add_column.phtml:7
-#, php-format
-msgid "Add %s column(s)"
-msgstr "%s நெடுவரிசைகளை சேர்க்க"
-
-#: templates/structure/add_column.phtml:12
-#, fuzzy
-#| msgid "Rate of table open"
-msgid "at beginning of table"
-msgstr "திறந்தநிலை அட்டவணைகளின் விழுக்காடு"
-
-#: templates/structure/body_for_table_summary.phtml:6
-#, php-format
-msgid "%s table"
-msgid_plural "%s tables"
-msgstr[0] "%s அட்டவணை"
-msgstr[1] "%s அட்டவணைகள்"
-
-#: templates/structure/body_for_table_summary.phtml:17
-msgid "Sum"
-msgstr "கூட்டுத்தொகை"
-
-#: templates/structure/check_all_tables.phtml:6
-msgid "Check tables having overhead"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:10
-msgid "Show create"
-msgstr "உருவாக்கத்தை காட்டு"
-
-#: templates/structure/check_all_tables.phtml:27
-msgid "Prefix"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:28
-msgid "Add prefix to table"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:29
-msgid "Replace table prefix"
-msgstr "அட்டவணை முன்னொட்டை பதிலிடு"
-
-#: templates/structure/check_all_tables.phtml:30
-msgid "Copy table with prefix"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:36
-msgid "Add columns to central list"
-msgstr "நிரல்வரிசைகளை முதன்மைபட்டியலில் சேர்க்க"
-
-#: templates/structure/check_all_tables.phtml:37
-msgid "Remove columns from central list"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:38
-msgid "Make consistent with central list"
-msgstr "முதன்மைபட்டியலை ஒத்து நிலைப்படுத்துக"
-
-#: templates/structure/display_structure.phtml:140 view_create.php:181
-msgid "Edit view"
-msgstr "தொகுப்பு பார்வை"
-
-#: templates/structure/display_table_stats.phtml:9
-msgid "Space usage"
-msgstr ""
-
-#: templates/structure/display_table_stats.phtml:27
-#: templates/structure/table_header.phtml:74
-msgid "Overhead"
-msgstr "பயனீட்டளவு"
-
-#: templates/structure/display_table_stats.phtml:32
-msgid "Effective"
-msgstr "பயனுடைய"
-
-#: templates/structure/favorite_anchor.phtml:12
-msgid "Add to Favorites"
-msgstr "விருப்பமானவைகளில் சேர்க்க"
-
-#: templates/structure/move_columns_dialog.phtml:1
-#: templates/structure/optional_action_links.phtml:21
-msgid "Move columns"
-msgstr "நெடுவரிசைகளை நகர்த்து"
-
-#: templates/structure/move_columns_dialog.phtml:2
-msgid "Move the columns by dragging them up and down."
-msgstr ""
-
-#: templates/structure/optional_action_links.phtml:9
-msgid "Propose table structure"
-msgstr ""
-
-#: templates/structure/optional_action_links.phtml:24
-msgid "Improve table structure"
-msgstr "அட்டவணை கட்டமைப்பை மெருகேற்றுக"
-
-#: templates/structure/optional_action_links.phtml:30
-msgid "Track view"
-msgstr "விவரபார்வையை கண்காணி"
-
-#: templates/structure/row_stats_table.phtml:3
-msgid "Row statistics"
-msgstr "வரிசை புள்ளிவிவரங்கள்"
-
-#: templates/structure/row_stats_table.phtml:9
-msgid "static"
-msgstr "மாறா"
-
-#: templates/structure/row_stats_table.phtml:11
-msgid "dynamic"
-msgstr "இறக்காற்றல்"
-
-#: templates/structure/row_stats_table.phtml:22
-msgid "partitioned"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:54
-msgid "Row length"
-msgstr "நிரல் நீளம்"
-
-#: templates/structure/row_stats_table.phtml:66
-msgid "Row size"
-msgstr "நிரல் அளவு"
-
-#: templates/structure/row_stats_table.phtml:73
-msgid "Next autoindex"
-msgstr ""
-
-#: templates/structure/secondary_tabs.phtml:14
-#, fuzzy
-#| msgid "Relation view"
-msgid "Relation view"
-msgstr "தொடர்பு பார்வை"
-
-#: templates/structure/show_create.phtml:2
-msgid "Showing create queries"
-msgstr ""
-
-#: templates/structure/sortable_header.phtml:13
-msgid "Sort"
-msgstr "வரிசைப்படுத்து"
-
-#: templates/structure/table_header.phtml:42
-msgid ""
-"May be approximate. Click on the number to get the exact count. See "
-"[doc@faq3-11]FAQ 3.11[/doc]."
-msgstr ""
-
-#: templates/structure/table_structure_row.phtml:46
-#, php-format
-msgid "Column %s has been dropped."
-msgstr ""
-
-#: templates/structure/tracking_icon.phtml:4
-msgid "Tracking is active."
-msgstr ""
-
-#: templates/structure/tracking_icon.phtml:8
-msgid "Tracking is not active."
-msgstr ""
-
-#: templates/table/create_table.phtml:15
-msgid "Number of columns"
-msgstr ""
-
-#: templates/table/options.phtml:8
-msgid "Select columns (at least one):"
-msgstr ""
-
-#: templates/table/options.phtml:37
-msgid "Add search conditions (body of the \"where\" clause):"
-msgstr ""
-
-#: templates/table/options.phtml:45
-msgid "Number of rows per page"
-msgstr ""
-
-#: templates/table/options.phtml:56
-msgid "Display order:"
-msgstr "காட்சிபடுத்தல் வரிசைமுறை:"
-
-#: templates/table/options_zoom.phtml:6
-msgid "Use this column to label each point"
-msgstr ""
-
-#: templates/table/options_zoom.phtml:35
-msgid "Maximum rows to plot"
-msgstr ""
-
-#: templates/table/replace_preview.phtml:13
-msgid "Find and replace - preview"
-msgstr ""
-
-#: templates/table/replace_preview.phtml:18
-msgid "Original string"
-msgstr "மெய் சரம்"
-
-#: templates/table/replace_preview.phtml:19
-msgid "Replaced string"
-msgstr "பதிலிடப்பட்ட சரம்"
-
-#: templates/table/replace_preview.phtml:40
-msgid "Replace"
-msgstr "பதிலிடு"
-
-#: templates/table/rows_zoom.phtml:16
-msgid "Additional search criteria"
-msgstr ""
-
-#: templates/table/search_and_replace.phtml:3
-msgid "Replace with:"
-msgstr "ஆல் பதிலிடல்:"
-
-#: templates/table/search_and_replace.phtml:22
-msgid "Use regular expression"
-msgstr "சுருங்குறியை பயன்படுத்துக"
-
-#: templates/table/selection_form.phtml:12
-msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
-msgstr ""
-
-#: templates/table/selection_form.phtml:34
-msgid "Do a \"query by example\" (wildcard: \"%\")"
-msgstr ""
-
-#: templates/table/zoom_result_form.phtml:7
-msgid "Browse/Edit the points"
-msgstr ""
-
-#: templates/table/zoom_result_form.phtml:15
-msgid "How to use"
-msgstr "எப்படி பயன்படுத்துவது"
-
-#: templates/table/zoom_result_form.phtml:23
-msgid "Reset zoom"
-msgstr ""
-
-#: templates/tbl_chart.phtml:17
+#: templates/table/chart/tbl_chart.phtml:17
 msgctxt "Chart type"
 msgid "Bar"
 msgstr "பட்டை"
 
-#: templates/tbl_chart.phtml:21
+#: templates/table/chart/tbl_chart.phtml:21
 msgctxt "Chart type"
 msgid "Column"
 msgstr "நிரல்வரிசை"
 
-#: templates/tbl_chart.phtml:25
+#: templates/table/chart/tbl_chart.phtml:25
 msgctxt "Chart type"
 msgid "Line"
 msgstr "கோடு"
 
-#: templates/tbl_chart.phtml:29
+#: templates/table/chart/tbl_chart.phtml:29
 msgctxt "Chart type"
 msgid "Spline"
 msgstr "வளைக்கோடு"
 
-#: templates/tbl_chart.phtml:33
+#: templates/table/chart/tbl_chart.phtml:33
 msgctxt "Chart type"
 msgid "Area"
 msgstr ""
 
-#: templates/tbl_chart.phtml:37
+#: templates/table/chart/tbl_chart.phtml:37
 msgctxt "Chart type"
 msgid "Pie"
 msgstr "ஆப்பு"
 
-#: templates/tbl_chart.phtml:41
+#: templates/table/chart/tbl_chart.phtml:41
 msgctxt "Chart type"
 msgid "Timeline"
 msgstr ""
 
-#: templates/tbl_chart.phtml:45
+#: templates/table/chart/tbl_chart.phtml:45
 msgctxt "Chart type"
 msgid "Scatter"
 msgstr ""
 
-#: templates/tbl_chart.phtml:50
+#: templates/table/chart/tbl_chart.phtml:50
 msgid "Stacked"
 msgstr ""
 
-#: templates/tbl_chart.phtml:53
+#: templates/table/chart/tbl_chart.phtml:53
 msgid "Chart title"
 msgstr "வரைபட தலைப்பு"
 
-#: templates/tbl_chart.phtml:57
+#: templates/table/chart/tbl_chart.phtml:57
 msgid "X-Axis:"
 msgstr "கு-அச்சு:"
 
-#: templates/tbl_chart.phtml:72
+#: templates/table/chart/tbl_chart.phtml:72
 msgid "Series:"
 msgstr "தொடர்கள்:"
 
-#: templates/tbl_chart.phtml:102
+#: templates/table/chart/tbl_chart.phtml:102
 msgid "X-Axis label:"
 msgstr "X-அச்சு சிட்டை:"
 
-#: templates/tbl_chart.phtml:104
+#: templates/table/chart/tbl_chart.phtml:104
 msgid "X Values"
 msgstr "X மதிப்புக்கள்"
 
-#: templates/tbl_chart.phtml:107
+#: templates/table/chart/tbl_chart.phtml:107
 msgid "Y-Axis label:"
 msgstr "Y-அச்சு சிட்டை:"
 
-#: templates/tbl_chart.phtml:115
+#: templates/table/chart/tbl_chart.phtml:115
 msgid "Series names are in a column"
 msgstr ""
 
-#: templates/tbl_chart.phtml:118
+#: templates/table/chart/tbl_chart.phtml:118
 msgid "Series column:"
 msgstr "தொடர் நிரல்வரிசை:"
 
-#: templates/tbl_chart.phtml:130
+#: templates/table/chart/tbl_chart.phtml:130
 #, fuzzy
 #| msgid "Value column:"
 msgid "Value Column:"
 msgstr "மதிப்பு நிரல்வரிசை:"
 
-#: templates/tbl_chart.phtml:150
+#: templates/table/chart/tbl_chart.phtml:150
 msgid "Save chart as image"
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:7
+#: templates/table/gis_visualization/gis_visualization.phtml:3
+msgid "Display GIS Visualization"
+msgstr ""
+
+#: templates/table/gis_visualization/gis_visualization.phtml:8
+msgid "Label column"
+msgstr "சிட்டை நிரல்வரிசை"
+
+#: templates/table/gis_visualization/gis_visualization.phtml:11
+msgid "-- None --"
+msgstr "-- எதுவுமில்லை --"
+
+#: templates/table/gis_visualization/gis_visualization.phtml:19
+msgid "Spatial column"
+msgstr "இடம்சார் நிரல்வரிசை"
+
+#: templates/table/index_form.phtml:16
+msgid "Index name:"
+msgstr "சுட்டுதொகுப்புக்குறி பெயர்:"
+
+#: templates/table/index_form.phtml:19
+msgid ""
+"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
+msgstr ""
+
+#: templates/table/index_form.phtml:40
+#, fuzzy
+#| msgid "Index name:"
+msgid "Index choice:"
+msgstr "சுட்டுதொகுப்புக்குறி பெயர்:"
+
+#: templates/table/index_form.phtml:57
+msgid "Key block size:"
+msgstr ""
+
+#: templates/table/index_form.phtml:74
+msgid "Index type:"
+msgstr "சுட்டுதொகுப்புக்குறி வகை:"
+
+#: templates/table/index_form.phtml:86
+#, fuzzy
+#| msgid "User:"
+msgid "Parser:"
+msgstr "பயனர்:"
+
+#: templates/table/index_form.phtml:102
+msgid "Comment:"
+msgstr "கருத்துரை:"
+
+#: templates/table/index_form.phtml:149 templates/table/index_form.phtml:190
+msgid "Drag to reorder"
+msgstr ""
+
+#: templates/table/relation/common_form.phtml:7
 msgid "Internal relations"
 msgstr "உள்ளமை உறவுமுறைகள்"
 
-#: templates/tbl_relation/common_form.phtml:11
+#: templates/table/relation/common_form.phtml:11
 msgid "Internal relation"
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:14
+#: templates/table/relation/common_form.phtml:14
 msgid ""
 "An internal relation is not necessary when a corresponding FOREIGN KEY "
 "relation exists."
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:37
+#: templates/table/relation/common_form.phtml:37
 msgid "Foreign key constraints"
 msgstr "அயல் குறியெண் கட்டுப்பாடுகள்"
 
-#: templates/tbl_relation/common_form.phtml:40
+#: templates/table/relation/common_form.phtml:40
 msgid "Actions"
 msgstr "செயல்கள்"
 
-#: templates/tbl_relation/common_form.phtml:41
+#: templates/table/relation/common_form.phtml:41
 msgid "Constraint properties"
 msgstr "கட்டுப்பாட்டின் பண்புகள்"
 
-#: templates/tbl_relation/common_form.phtml:44
+#: templates/table/relation/common_form.phtml:44
 msgid ""
 "Only columns with index will be displayed. You can define an index below."
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:49
+#: templates/table/relation/common_form.phtml:49
 msgid "Foreign key constraint"
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:81
+#: templates/table/relation/common_form.phtml:81
 msgid "+ Add constraint"
 msgstr "+கட்டுப்பாட்டை சேர்க்க"
 
-#: templates/tbl_relation/common_form.phtml:91
+#: templates/table/relation/common_form.phtml:91
 msgid "Choose column to display:"
 msgstr "காட்சிப்படுத்த நிரல்வரிசையை தேர்ந்தெடுக்கவும்:"
 
-#: templates/tbl_relation/foreign_key_row.phtml:13
+#: templates/table/relation/foreign_key_row.phtml:13
 #, php-format
 msgid "Foreign key constraint %s has been dropped"
 msgstr "அயல் குறியெண் வரைமுறை %s கைவிடப்பட்டது"
 
-#: templates/tbl_relation/foreign_key_row.phtml:102
+#: templates/table/relation/foreign_key_row.phtml:102
 msgid "Constraint name"
 msgstr "கட்டுப்பாட்டின் பெயர்"
 
-#: templates/tbl_relation/foreign_key_row.phtml:157
+#: templates/table/relation/foreign_key_row.phtml:157
 msgid "+ Add column"
 msgstr "+ நெடுவரிசையை சேர்க்க"
 
+#: templates/table/search/options.phtml:8
+msgid "Select columns (at least one):"
+msgstr ""
+
+#: templates/table/search/options.phtml:37
+msgid "Add search conditions (body of the \"where\" clause):"
+msgstr ""
+
+#: templates/table/search/options.phtml:45
+msgid "Number of rows per page"
+msgstr ""
+
+#: templates/table/search/options.phtml:56
+msgid "Display order:"
+msgstr "காட்சிபடுத்தல் வரிசைமுறை:"
+
+#: templates/table/search/options_zoom.phtml:6
+msgid "Use this column to label each point"
+msgstr ""
+
+#: templates/table/search/options_zoom.phtml:35
+msgid "Maximum rows to plot"
+msgstr ""
+
+#: templates/table/search/replace_preview.phtml:13
+msgid "Find and replace - preview"
+msgstr ""
+
+#: templates/table/search/replace_preview.phtml:18
+msgid "Original string"
+msgstr "மெய் சரம்"
+
+#: templates/table/search/replace_preview.phtml:19
+msgid "Replaced string"
+msgstr "பதிலிடப்பட்ட சரம்"
+
+#: templates/table/search/replace_preview.phtml:40
+msgid "Replace"
+msgstr "பதிலிடு"
+
+#: templates/table/search/rows_zoom.phtml:16
+msgid "Additional search criteria"
+msgstr ""
+
+#: templates/table/search/search_and_replace.phtml:3
+msgid "Replace with:"
+msgstr "ஆல் பதிலிடல்:"
+
+#: templates/table/search/search_and_replace.phtml:22
+msgid "Use regular expression"
+msgstr "சுருங்குறியை பயன்படுத்துக"
+
+#: templates/table/search/selection_form.phtml:12
+msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
+msgstr ""
+
+#: templates/table/search/selection_form.phtml:34
+msgid "Do a \"query by example\" (wildcard: \"%\")"
+msgstr ""
+
+#: templates/table/search/zoom_result_form.phtml:7
+msgid "Browse/Edit the points"
+msgstr ""
+
+#: templates/table/search/zoom_result_form.phtml:15
+msgid "How to use"
+msgstr "எப்படி பயன்படுத்துவது"
+
+#: templates/table/search/zoom_result_form.phtml:23
+msgid "Reset zoom"
+msgstr ""
+
+#: templates/table/secondary_tabs.phtml:14
+#, fuzzy
+#| msgid "Relation view"
+msgid "Relation view"
+msgstr "தொடர்பு பார்வை"
+
+#: templates/table/structure/actions_in_table_structure.phtml:14
+#, php-format
+msgid "A primary key has been added on %s."
+msgstr ""
+
+#: templates/table/structure/actions_in_table_structure.phtml:34
+#: templates/table/structure/actions_in_table_structure.phtml:54
+#: templates/table/structure/actions_in_table_structure.phtml:79
+#: templates/table/structure/actions_in_table_structure.phtml:101
+#, php-format
+msgid "An index has been added on %s."
+msgstr ""
+
+#: templates/table/structure/actions_in_table_structure.phtml:130
+#: templates/table/structure/check_all_table_column.phtml:59
+msgid "Remove from central columns"
+msgstr "முதன்மைநிரல்வரிசைகளிலிருந்து நீக்கவும்"
+
+#: templates/table/structure/actions_in_table_structure.phtml:138
+#: templates/table/structure/check_all_table_column.phtml:55
+msgid "Add to central columns"
+msgstr "முதன்மை நிரல்வரிசைகளில் சேர்க்க"
+
+#: templates/table/structure/add_column.phtml:7
+#, php-format
+msgid "Add %s column(s)"
+msgstr "%s நெடுவரிசைகளை சேர்க்க"
+
+#: templates/table/structure/add_column.phtml:12
+#, fuzzy
+#| msgid "Rate of table open"
+msgid "at beginning of table"
+msgstr "திறந்தநிலை அட்டவணைகளின் விழுக்காடு"
+
+#: templates/table/structure/display_structure.phtml:140 view_create.php:181
+msgid "Edit view"
+msgstr "தொகுப்பு பார்வை"
+
+#: templates/table/structure/display_table_stats.phtml:9
+msgid "Space usage"
+msgstr ""
+
+#: templates/table/structure/display_table_stats.phtml:32
+msgid "Effective"
+msgstr "பயனுடைய"
+
+#: templates/table/structure/move_columns_dialog.phtml:1
+#: templates/table/structure/optional_action_links.phtml:21
+msgid "Move columns"
+msgstr "நெடுவரிசைகளை நகர்த்து"
+
+#: templates/table/structure/move_columns_dialog.phtml:2
+msgid "Move the columns by dragging them up and down."
+msgstr ""
+
+#: templates/table/structure/optional_action_links.phtml:9
+msgid "Propose table structure"
+msgstr ""
+
+#: templates/table/structure/optional_action_links.phtml:24
+msgid "Improve table structure"
+msgstr "அட்டவணை கட்டமைப்பை மெருகேற்றுக"
+
+#: templates/table/structure/optional_action_links.phtml:30
+msgid "Track view"
+msgstr "விவரபார்வையை கண்காணி"
+
+#: templates/table/structure/row_stats_table.phtml:3
+msgid "Row statistics"
+msgstr "வரிசை புள்ளிவிவரங்கள்"
+
+#: templates/table/structure/row_stats_table.phtml:9
+msgid "static"
+msgstr "மாறா"
+
+#: templates/table/structure/row_stats_table.phtml:11
+msgid "dynamic"
+msgstr "இறக்காற்றல்"
+
+#: templates/table/structure/row_stats_table.phtml:22
+msgid "partitioned"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:54
+msgid "Row length"
+msgstr "நிரல் நீளம்"
+
+#: templates/table/structure/row_stats_table.phtml:66
+msgid "Row size"
+msgstr "நிரல் அளவு"
+
+#: templates/table/structure/row_stats_table.phtml:73
+msgid "Next autoindex"
+msgstr ""
+
+#: templates/table/structure/table_structure_row.phtml:46
+#, php-format
+msgid "Column %s has been dropped."
+msgstr ""
+
 #: themes.php:17 themes.php:22
 msgid "Theme"
 msgstr ""
diff --git a/po/te.po b/po/te.po
index 1fd88d882f..96ce937143 100644
--- a/po/te.po
+++ b/po/te.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 4.5.0-dev\n"
 "Report-Msgid-Bugs-To: developers@phpmyadmin.net\n"
-"POT-Creation-Date: 2015-08-08 13:53-0400\n"
+"POT-Creation-Date: 2015-08-12 08:10-0400\n"
 "PO-Revision-Date: 2014-02-27 10:56+0200\n"
 "Last-Translator: Michal Čihař <michal@cihar.com>\n"
 "Language-Team: Telugu <https://hosted.weblate.org/projects/phpmyadmin/master/"
@@ -56,7 +56,7 @@ msgstr "పట్టిక వ్యాఖ్యలు:"
 
 # మొదటి అనువాదము
 #: db_datadict.php:104 libraries/Index.class.php:699
-#: libraries/insert_edit.lib.php:1567
+#: libraries/insert_edit.lib.php:1565
 #: libraries/navigation/Nodes/Node_Column.class.php:30
 #: libraries/plugins/export/ExportHtmlword.class.php:280
 #: libraries/plugins/export/ExportHtmlword.class.php:375
@@ -70,13 +70,14 @@ msgstr "పట్టిక వ్యాఖ్యలు:"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1023
 #: libraries/tracking.lib.php:879 libraries/tracking.lib.php:975
 #: templates/columns_definitions/column_name.phtml:18
-#: templates/index_form.phtml:124 templates/table/table_header.phtml:6
-#: templates/table/zoom_result_form.phtml:33
-#: templates/tbl_relation/common_form.phtml:10
-#: templates/tbl_relation/common_form.phtml:43
-#: templates/tbl_relation/foreign_key_row.phtml:194
-#: templates/tbl_relation/foreign_key_row.phtml:206
-#: templates/tbl_relation/internal_relational_row.phtml:71
+#: templates/table/index_form.phtml:124
+#: templates/table/relation/common_form.phtml:10
+#: templates/table/relation/common_form.phtml:43
+#: templates/table/relation/foreign_key_row.phtml:194
+#: templates/table/relation/foreign_key_row.phtml:206
+#: templates/table/relation/internal_relational_row.phtml:71
+#: templates/table/search/table_header.phtml:6
+#: templates/table/search/zoom_result_form.phtml:33
 msgid "Column"
 msgstr "వరుస"
 
@@ -94,21 +95,21 @@ msgstr "వరుస"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1001
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1024
 #: libraries/rte/rte_list.lib.php:75 libraries/rte/rte_list.lib.php:103
-#: libraries/rte/rte_routines.lib.php:802
-#: libraries/rte/rte_routines.lib.php:831
-#: libraries/rte/rte_routines.lib.php:1493
+#: libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_routines.lib.php:922
+#: libraries/rte/rte_routines.lib.php:1584
 #: libraries/server_privileges.lib.php:2369 libraries/tracking.lib.php:880
 #: libraries/tracking.lib.php:972
 #: templates/columns_definitions/table_fields_definitions.phtml:11
-#: templates/structure/table_header.phtml:48
-#: templates/structure/table_structure_header.phtml:6
-#: templates/table/table_header.phtml:7
+#: templates/database/structure/table_header.phtml:48
+#: templates/table/search/table_header.phtml:7
+#: templates/table/structure/table_structure_header.phtml:6
 msgid "Type"
 msgstr "రకం"
 
 #: db_datadict.php:106 libraries/Index.class.php:702
 #: libraries/central_columns.lib.php:708
-#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1576
+#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1574
 #: libraries/plugins/export/ExportHtmlword.class.php:286
 #: libraries/plugins/export/ExportHtmlword.class.php:381
 #: libraries/plugins/export/ExportLatex.class.php:509
@@ -121,8 +122,8 @@ msgstr "రకం"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1026
 #: libraries/tracking.lib.php:882 libraries/tracking.lib.php:978
 #: templates/columns_definitions/table_fields_definitions.phtml:39
-#: templates/structure/table_structure_header.phtml:9
-#: templates/table/zoom_result_form.phtml:34
+#: templates/table/search/zoom_result_form.phtml:34
+#: templates/table/structure/table_structure_header.phtml:9
 msgid "Null"
 msgstr "శూన్యం"
 
@@ -140,8 +141,8 @@ msgstr "శూన్యం"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1027
 #: libraries/replication_gui.lib.php:153 libraries/tracking.lib.php:883
 #: templates/columns_definitions/table_fields_definitions.phtml:25
-#: templates/structure/body_for_table_summary.phtml:55
-#: templates/structure/table_structure_header.phtml:10
+#: templates/database/structure/body_for_table_summary.phtml:55
+#: templates/table/structure/table_structure_header.phtml:10
 msgid "Default"
 msgstr "అప్రమేయం"
 
@@ -169,19 +170,19 @@ msgid "Comments"
 msgstr "వ్యాఖ్యలు"
 
 #: db_datadict.php:146
-#: libraries/controllers/StructureController.class.php:1960
-#: libraries/controllers/StructureController.class.php:1965
+#: libraries/controllers/TableStructureController.class.php:951
+#: libraries/controllers/TableStructureController.class.php:956
 #: libraries/tracking.lib.php:922
 #: templates/columns_definitions/column_indexes.phtml:6
-#: templates/structure/check_all_table_column.phtml:22
-#: templates/structure/display_structure.phtml:74
+#: templates/table/structure/check_all_table_column.phtml:22
+#: templates/table/structure/display_structure.phtml:74
 msgid "Primary"
 msgstr ""
 
 #: db_datadict.php:156 js/messages.php:317 libraries/Index.class.php:567
 #: libraries/Index.class.php:606 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261 libraries/mult_submits.lib.php:403
+#: libraries/config/FormDisplay.tpl.php:272 libraries/mult_submits.lib.php:403
 #: libraries/mult_submits.lib.php:417
 #: libraries/plugins/export/ExportHtmlword.class.php:630
 #: libraries/plugins/export/ExportLatex.class.php:589
@@ -197,20 +198,20 @@ msgstr ""
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1010 libraries/tracking.lib.php:1015
 #: prefs_manage.php:140 templates/prefs_autoload.phtml:15
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "No"
 msgstr "కాదు"
 
 #: db_datadict.php:156 js/messages.php:443 libraries/Index.class.php:568
 #: libraries/Index.class.php:605 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261
-#: libraries/controllers/StructureController.class.php:1344
-#: libraries/controllers/StructureController.class.php:2223
-#: libraries/controllers/StructureController.class.php:2232
-#: libraries/controllers/StructureController.class.php:2237
-#: libraries/controllers/StructureController.class.php:2242
-#: libraries/controllers/StructureController.class.php:2247
+#: libraries/config/FormDisplay.tpl.php:272
+#: libraries/controllers/TableStructureController.class.php:539
+#: libraries/controllers/TableStructureController.class.php:1201
+#: libraries/controllers/TableStructureController.class.php:1210
+#: libraries/controllers/TableStructureController.class.php:1215
+#: libraries/controllers/TableStructureController.class.php:1220
+#: libraries/controllers/TableStructureController.class.php:1225
 #: libraries/mult_submits.inc.php:82 libraries/mult_submits.inc.php:178
 #: libraries/mult_submits.lib.php:339 libraries/mult_submits.lib.php:372
 #: libraries/mult_submits.lib.php:401 libraries/mult_submits.lib.php:415
@@ -219,8 +220,8 @@ msgstr "కాదు"
 #: libraries/plugins/export/ExportOdt.class.php:756
 #: libraries/plugins/export/ExportTexytext.class.php:567
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1077
-#: libraries/server_databases.lib.php:464
-#: libraries/server_databases.lib.php:474
+#: libraries/server_databases.lib.php:475
+#: libraries/server_databases.lib.php:485
 #: libraries/server_privileges.lib.php:2546
 #: libraries/server_privileges.lib.php:2727
 #: libraries/server_privileges.lib.php:2748
@@ -230,7 +231,7 @@ msgstr "కాదు"
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1008 libraries/tracking.lib.php:1013
 #: prefs_manage.php:138 templates/prefs_autoload.phtml:14
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "Yes"
 msgstr "అవును"
 
@@ -240,7 +241,7 @@ msgstr ""
 
 #: db_export.php:37 db_tracking.php:90 export.php:382
 #: libraries/DBQbe.class.php:326
-#: libraries/controllers/StructureController.class.php:231
+#: libraries/controllers/DatabaseStructureController.class.php:170
 #: libraries/navigation/NavigationTree.class.php:897
 msgid "No tables found in database."
 msgstr "డేటాబేస్ లో ఏ పట్టికలు లేవు."
@@ -251,14 +252,14 @@ msgstr "డేటాబేస్ లో ఏ పట్టికలు లేవ
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:26
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:120
-#: templates/structure/show_create.phtml:18
+#: templates/database/structure/show_create.phtml:18
 msgid "Tables"
 msgstr "పట్టికలు"
 
 #: db_export.php:52 libraries/Menu.class.php:317 libraries/Menu.class.php:425
-#: libraries/Util.class.php:3333 libraries/Util.class.php:3343
-#: libraries/Util.class.php:3349 libraries/Util.class.php:3629
-#: libraries/Util.class.php:4327 libraries/Util.class.php:4344
+#: libraries/Util.class.php:3339 libraries/Util.class.php:3349
+#: libraries/Util.class.php:3355 libraries/Util.class.php:3635
+#: libraries/Util.class.php:4333 libraries/Util.class.php:4350
 #: libraries/central_columns.lib.php:728 libraries/config.values.php:39
 #: libraries/config.values.php:47 libraries/config.values.php:109
 #: libraries/config.values.php:115 libraries/config/setup.forms.php:323
@@ -272,7 +273,7 @@ msgstr "పట్టికలు"
 #: libraries/navigation/Nodes/Node_Table.class.php:283
 #: libraries/server_privileges.lib.php:1141 libraries/tracking.lib.php:874
 #: templates/columns_definitions/table_fields_definitions.phtml:3
-#: templates/designer/table_list.phtml:28
+#: templates/database/designer/table_list.phtml:28
 msgid "Structure"
 msgstr "నిర్మాణాకృతి"
 
@@ -284,7 +285,7 @@ msgstr "నిర్మాణాకృతి"
 #: libraries/config/user_preferences.forms.php:292
 #: libraries/config/user_preferences.forms.php:297
 #: libraries/server_privileges.lib.php:1140
-#: templates/structure/display_table_stats.phtml:12
+#: templates/table/structure/display_table_stats.phtml:12
 msgid "Data"
 msgstr ""
 
@@ -368,10 +369,10 @@ msgstr ""
 #: libraries/server_privileges.lib.php:2908
 #: libraries/server_privileges.lib.php:3145
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4346
-#: templates/structure/table_header.phtml:21
-#: templates/tbl_relation/foreign_key_row.phtml:176
-#: templates/tbl_relation/internal_relational_row.phtml:63
+#: libraries/server_privileges.lib.php:4372
+#: templates/database/structure/table_header.phtml:21
+#: templates/table/relation/foreign_key_row.phtml:176
+#: templates/table/relation/internal_relational_row.phtml:63
 msgid "Table"
 msgstr "పట్టిక"
 
@@ -388,7 +389,7 @@ msgid "Updated"
 msgstr ""
 
 #: db_tracking.php:130 js/messages.php:243 libraries/Menu.class.php:552
-#: libraries/Util.class.php:4314 libraries/config.values.php:104
+#: libraries/Util.class.php:4320 libraries/config.values.php:104
 #: libraries/rte/rte_events.lib.php:393 libraries/rte/rte_list.lib.php:101
 #: libraries/server_status_processes.lib.php:92 libraries/tracking.lib.php:279
 msgid "Status"
@@ -397,14 +398,15 @@ msgstr "స్థితి"
 #: db_tracking.php:131 db_tracking.php:290 libraries/Index.class.php:693
 #: libraries/central_columns.lib.php:687 libraries/rte/rte_list.lib.php:74
 #: libraries/rte/rte_list.lib.php:89 libraries/rte/rte_list.lib.php:102
-#: libraries/server_databases.lib.php:398
+#: libraries/server_databases.lib.php:409
 #: libraries/server_privileges.lib.php:2372
 #: libraries/server_privileges.lib.php:3166
 #: libraries/server_privileges.lib.php:3342
 #: libraries/server_user_groups.lib.php:82
 #: libraries/server_variables.lib.php:189 libraries/tracking.lib.php:280
-#: libraries/tracking.lib.php:793 templates/structure/table_header.phtml:30
-#: templates/structure/table_structure_header.phtml:23
+#: libraries/tracking.lib.php:793
+#: templates/database/structure/table_header.phtml:30
+#: templates/table/structure/table_structure_header.phtml:23
 msgid "Action"
 msgstr "చర్య"
 
@@ -449,7 +451,7 @@ msgid "Untracked tables"
 msgstr ""
 
 #: db_tracking.php:305 db_tracking.php:336
-#: templates/structure/optional_action_links.phtml:17
+#: templates/table/structure/optional_action_links.phtml:17
 msgid "Track table"
 msgstr ""
 
@@ -500,7 +502,7 @@ msgid "Value for the column \"%s\""
 msgstr ""
 
 #: gis_data_editor.php:146
-#: templates/gis_visualization/gis_visualization.phtml:37
+#: templates/table/gis_visualization/gis_visualization.phtml:37
 msgid "Use OpenStreetMaps as Base Layer"
 msgstr ""
 
@@ -591,35 +593,35 @@ msgstr "క్రొత్త వాడుకరిని చేర్చు"
 #: libraries/display_change_password.lib.php:162
 #: libraries/display_export.lib.php:402 libraries/display_export.lib.php:408
 #: libraries/display_import.lib.php:392 libraries/index.lib.php:44
-#: libraries/insert_edit.lib.php:1546 libraries/insert_edit.lib.php:1583
+#: libraries/insert_edit.lib.php:1544 libraries/insert_edit.lib.php:1581
 #: libraries/normalization.lib.php:165 libraries/normalization.lib.php:821
 #: libraries/operations.lib.php:38 libraries/operations.lib.php:108
 #: libraries/operations.lib.php:263 libraries/operations.lib.php:306
 #: libraries/operations.lib.php:801 libraries/operations.lib.php:874
 #: libraries/operations.lib.php:923 libraries/operations.lib.php:1337
 #: libraries/operations.lib.php:1658
-#: libraries/plugins/auth/AuthenticationCookie.class.php:244
+#: libraries/plugins/auth/AuthenticationCookie.class.php:232
 #: libraries/replication_gui.lib.php:122 libraries/replication_gui.lib.php:161
 #: libraries/replication_gui.lib.php:324 libraries/replication_gui.lib.php:461
 #: libraries/replication_gui.lib.php:906 libraries/rte/rte_events.lib.php:509
-#: libraries/rte/rte_routines.lib.php:969
-#: libraries/rte/rte_routines.lib.php:1581
+#: libraries/rte/rte_routines.lib.php:1060
+#: libraries/rte/rte_routines.lib.php:1672
 #: libraries/rte/rte_triggers.lib.php:396 libraries/server_bin_log.lib.php:61
 #: libraries/server_privileges.lib.php:705
 #: libraries/server_privileges.lib.php:2106
 #: libraries/server_privileges.lib.php:2872
 #: libraries/server_privileges.lib.php:3553
-#: libraries/server_privileges.lib.php:4627
+#: libraries/server_privileges.lib.php:4653
 #: libraries/server_user_groups.lib.php:285
 #: libraries/sql_query_form.lib.php:369 libraries/sql_query_form.lib.php:429
 #: libraries/tracking.lib.php:533 libraries/tracking.lib.php:653
 #: prefs_manage.php:277 prefs_manage.php:355
 #: templates/columns_definitions/column_definitions_form.phtml:59
-#: templates/header_location.phtml:17 templates/index_form.phtml:238
+#: templates/database/create_table.phtml:21 templates/header_location.phtml:28
 #: templates/startAndNumberOfRowsPanel.phtml:14
-#: templates/structure/add_column.phtml:25
-#: templates/table/create_table.phtml:21
-#: templates/table/selection_form.phtml:75 view_create.php:275
+#: templates/table/index_form.phtml:238
+#: templates/table/search/selection_form.phtml:75
+#: templates/table/structure/add_column.phtml:25 view_create.php:275
 #: view_operations.php:106
 msgid "Go"
 msgstr "వెళ్ళు"
@@ -700,7 +702,7 @@ msgid "Could not load import plugins, please check your installation!"
 msgstr ""
 
 # మొదటి అనువాదము
-#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1466
+#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1460
 #, fuzzy, php-format
 #| msgid "Page has been created."
 msgid "Bookmark %s has been created."
@@ -735,11 +737,11 @@ msgstr ""
 msgid "Back"
 msgstr "వెనుకకి"
 
-#: index.php:148 libraries/Footer.class.php:70
+#: index.php:149 libraries/Footer.class.php:70
 msgid "phpMyAdmin Demo Server"
 msgstr ""
 
-#: index.php:152
+#: index.php:153
 #, php-format
 msgid ""
 "You are using the demo server. You can do anything here, but please do not "
@@ -747,47 +749,47 @@ msgid ""
 "at %s."
 msgstr ""
 
-#: index.php:162
+#: index.php:163
 msgid "General Settings"
 msgstr "సాధారణ అమరికలు"
 
-#: index.php:190 libraries/display_change_password.lib.php:50
+#: index.php:191 libraries/display_change_password.lib.php:50
 #: libraries/display_change_password.lib.php:53 user_password.php:247
 msgid "Change password"
 msgstr "సంకేతపదాన్ని మార్చు"
 
-#: index.php:206
+#: index.php:207
 #, fuzzy
 #| msgid "Server configuration"
 msgid "Server connection collation"
 msgstr "సేవకి స్వరూపణం"
 
-#: index.php:228
+#: index.php:229
 msgid "Appearance Settings"
 msgstr "రూపురేఖల అమరికలు"
 
-#: index.php:258 prefs_manage.php:285
+#: index.php:259 prefs_manage.php:285
 msgid "More settings"
 msgstr "మరిన్ని అమరికలు"
 
 # మొదటి అనువాదము
-#: index.php:279
+#: index.php:280
 #, fuzzy
 #| msgid "Database"
 msgid "Database server"
 msgstr "డేటాబేస్"
 
-#: index.php:282 libraries/plugins/auth/AuthenticationCookie.class.php:181
+#: index.php:283 libraries/plugins/auth/AuthenticationCookie.class.php:169
 msgid "Server:"
 msgstr ""
 
-#: index.php:286
+#: index.php:287
 #, fuzzy
 #| msgid "Security"
 msgid "Server type:"
 msgstr "భద్రత"
 
-#: index.php:290 libraries/plugins/export/ExportLatex.class.php:212
+#: index.php:291 libraries/plugins/export/ExportLatex.class.php:212
 #: libraries/plugins/export/ExportSql.class.php:687
 #: libraries/plugins/export/ExportXml.class.php:189
 #, fuzzy
@@ -795,84 +797,84 @@ msgstr "భద్రత"
 msgid "Server version:"
 msgstr "చివరి కూర్పు"
 
-#: index.php:296
+#: index.php:297
 #, fuzzy
 #| msgid "Last version"
 msgid "Protocol version:"
 msgstr "చివరి కూర్పు"
 
-#: index.php:300
+#: index.php:301
 #, fuzzy
 #| msgid "User"
 msgid "User:"
 msgstr "వాడుకరి"
 
 # మొదటి అనువాదము
-#: index.php:305
+#: index.php:306
 #, fuzzy
 #| msgid "Remove database"
 msgid "Server charset:"
 msgstr "డేటాబేస్ తొలగించండి"
 
-#: index.php:320
+#: index.php:321
 msgid "Web server"
 msgstr ""
 
-#: index.php:331
+#: index.php:332
 #, fuzzy
 #| msgid "Database comment"
 msgid "Database client version:"
 msgstr "డేటాబేస్ వ్యాఖ్య:"
 
-#: index.php:335
+#: index.php:336
 msgid "PHP extension:"
 msgstr ""
 
-#: index.php:349
+#: index.php:350
 #, fuzzy
 #| msgid "Last version"
 msgid "PHP version:"
 msgstr "చివరి కూర్పు"
 
-#: index.php:360
+#: index.php:361
 msgid "Show PHP information"
 msgstr ""
 
-#: index.php:383
+#: index.php:384
 #, fuzzy
 #| msgid "Version information"
 msgid "Version information:"
 msgstr "సంచిక సమాచారం"
 
-#: index.php:392 libraries/Util.class.php:432 libraries/Util.class.php:495
-#: libraries/config/FormDisplay.tpl.php:151
+#: index.php:393 libraries/Util.class.php:432 libraries/Util.class.php:495
+#: libraries/config/FormDisplay.tpl.php:162
 #: libraries/display_export.lib.php:577 libraries/engines/pbxt.lib.php:162
 #: libraries/navigation/NavigationHeader.class.php:196
 #: libraries/server_variables.lib.php:160
 msgid "Documentation"
 msgstr "పత్రావళి"
 
-#: index.php:399
+#: index.php:400
 msgid "Wiki"
 msgstr "వికీ"
 
-#: index.php:408
+#: index.php:409
 msgid "Official Homepage"
 msgstr ""
 
-#: index.php:415
+#: index.php:416
 msgid "Contribute"
 msgstr ""
 
-#: index.php:422
+#: index.php:423
 msgid "Get support"
 msgstr "సహాయాన్ని పొందండి"
 
-#: index.php:429
+#: index.php:430
 msgid "List of changes"
 msgstr "మార్పుల జాబితా"
 
-#: index.php:451
+#: index.php:452
 msgid ""
 "You are connected as 'root' with no password, which corresponds to the "
 "default MySQL privileged account. Your MySQL server is running with this "
@@ -880,21 +882,21 @@ msgid ""
 "by setting a password for user 'root'."
 msgstr ""
 
-#: index.php:468
+#: index.php:469
 msgid ""
 "You have enabled mbstring.func_overload in your PHP configuration. This "
 "option is incompatible with phpMyAdmin and might cause some data to be "
 "corrupted!"
 msgstr ""
 
-#: index.php:483
+#: index.php:484
 msgid ""
 "The mbstring PHP extension was not found and you seem to be using a "
 "multibyte charset. Without the mbstring extension phpMyAdmin is unable to "
 "split strings correctly and it may result in unexpected results."
 msgstr ""
 
-#: index.php:500
+#: index.php:501
 msgid ""
 "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini."
 "session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower than "
@@ -902,17 +904,17 @@ msgid ""
 "expire sooner than configured in phpMyAdmin."
 msgstr ""
 
-#: index.php:519
+#: index.php:520
 msgid ""
 "Login cookie store is lower than cookie validity configured in phpMyAdmin, "
 "because of this, your login will expire sooner than configured in phpMyAdmin."
 msgstr ""
 
-#: index.php:535
+#: index.php:536
 msgid "The configuration file now needs a secret passphrase (blowfish_secret)."
 msgstr ""
 
-#: index.php:548
+#: index.php:549
 msgid ""
 "Directory [code]config[/code], which is used by the setup script, still "
 "exists in your phpMyAdmin directory. It is strongly recommended to remove it "
@@ -920,26 +922,26 @@ msgid ""
 "may be compromised by unauthorized people downloading your configuration."
 msgstr ""
 
-#: index.php:564
+#: index.php:565
 #, php-format
 msgid ""
 "The phpMyAdmin configuration storage is not completely configured, some "
 "extended features have been deactivated. %sFind out why%s. "
 msgstr ""
 
-#: index.php:571
+#: index.php:572
 msgid ""
 "Or alternately go to 'Operations' tab of any database to set it up there."
 msgstr ""
 
-#: index.php:620
+#: index.php:621
 #, php-format
 msgid ""
 "Your PHP MySQL library version %s differs from your MySQL server version %s. "
 "This may cause unpredictable behavior."
 msgstr ""
 
-#: index.php:648
+#: index.php:649
 #, php-format
 msgid ""
 "Server running with Suhosin. Please refer to %sdocumentation%s for possible "
@@ -1082,8 +1084,8 @@ msgstr ""
 msgid "Save & Close"
 msgstr ""
 
-#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:404
-#: libraries/insert_edit.lib.php:1550 prefs_manage.php:361
+#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:415
+#: libraries/insert_edit.lib.php:1548 prefs_manage.php:361
 #: prefs_manage.php:372
 msgid "Reset"
 msgstr ""
@@ -1126,7 +1128,7 @@ msgid "Edit Index"
 msgstr "క్రొత్త వాడుకరిని చేర్చు"
 
 # మొదటి అనువాదము
-#: js/messages.php:99 templates/index_form.phtml:232
+#: js/messages.php:99 templates/table/index_form.phtml:232
 #, fuzzy, php-format
 #| msgid "Add into comments"
 msgid "Add %s column(s) to index"
@@ -1156,15 +1158,16 @@ msgid "Please select column(s) for the index."
 msgstr "స్పందనలకు చేర్చు"
 
 # మొదటి అనువాదము
-#: js/messages.php:106 templates/structure/add_column.phtml:1
+#: js/messages.php:106 templates/table/structure/add_column.phtml:1
 #, fuzzy
 #| msgid "You have added a new user."
 msgid "You have to add at least one column."
 msgstr "మీరు క్రొత్త వినియోగదారుని చేర్చారు"
 
-#: js/messages.php:109 libraries/insert_edit.lib.php:1548
+#: js/messages.php:109 libraries/insert_edit.lib.php:1546
 #: templates/columns_definitions/column_definitions_form.phtml:162
-#: templates/index_form.phtml:237 templates/tbl_relation/common_form.phtml:106
+#: templates/table/index_form.phtml:237
+#: templates/table/relation/common_form.phtml:106
 msgid "Preview SQL"
 msgstr ""
 
@@ -1185,7 +1188,7 @@ msgid "SQL query:"
 msgstr ""
 
 #. l10n: Default label for the y-Axis of Charts
-#: js/messages.php:118 templates/tbl_chart.phtml:109
+#: js/messages.php:118 templates/table/chart/tbl_chart.phtml:109
 #, fuzzy
 #| msgid "Value"
 msgid "Y Values"
@@ -1352,7 +1355,7 @@ msgstr ""
 msgid "Bytes received"
 msgstr ""
 
-#: js/messages.php:169 libraries/server_status.lib.php:226
+#: js/messages.php:169 libraries/server_status.lib.php:235
 msgid "Connections"
 msgstr "అనుసంధానాలు"
 
@@ -1413,12 +1416,12 @@ msgstr "%s పట్టిక"
 msgid "Questions"
 msgstr "సంబంధాలు"
 
-#: js/messages.php:184 libraries/server_status.lib.php:134
+#: js/messages.php:184 libraries/server_status.lib.php:143
 msgid "Traffic"
 msgstr ""
 
 #: js/messages.php:185 libraries/Menu.class.php:586
-#: libraries/Util.class.php:4318 libraries/server_status_monitor.lib.php:257
+#: libraries/Util.class.php:4324 libraries/server_status_monitor.lib.php:257
 msgid "Settings"
 msgstr "అమరికలు"
 
@@ -1438,8 +1441,9 @@ msgstr ""
 #: libraries/server_status_monitor.lib.php:236
 #: libraries/server_status_processes.lib.php:308
 #: templates/columns_definitions/transformation.phtml:4
-#: templates/designer/options_panel.phtml:178
-#: templates/table/options_zoom.phtml:12 templates/table/rows_zoom.phtml:26
+#: templates/database/designer/options_panel.phtml:178
+#: templates/table/search/options_zoom.phtml:12
+#: templates/table/search/rows_zoom.phtml:26
 msgid "None"
 msgstr "ఏమీలేదు"
 
@@ -1744,8 +1748,8 @@ msgstr ""
 
 #: js/messages.php:270 libraries/Menu.class.php:352
 #: libraries/Menu.class.php:455 libraries/Menu.class.php:582
-#: libraries/Util.class.php:4317 libraries/Util.class.php:4332
-#: libraries/Util.class.php:4349 libraries/config/messages.inc.php:258
+#: libraries/Util.class.php:4323 libraries/Util.class.php:4338
+#: libraries/Util.class.php:4355 libraries/config/messages.inc.php:258
 #: libraries/display_import.lib.php:105
 #: libraries/server_status_monitor.lib.php:318 prefs_manage.php:238
 #: setup/frames/menu.inc.php:26
@@ -1815,13 +1819,13 @@ msgid "Formatting SQL..."
 msgstr ""
 
 #: js/messages.php:293 libraries/server_variables.lib.php:157
-#: templates/designer/aggregate_query_panel.phtml:63
-#: templates/designer/delete_relation_panel.phtml:28
-#: templates/designer/having_query_panel.phtml:117
-#: templates/designer/new_relation_panel.phtml:88
-#: templates/designer/options_panel.phtml:253
-#: templates/designer/rename_to_panel.phtml:45
-#: templates/designer/where_query_panel.phtml:83
+#: templates/database/designer/aggregate_query_panel.phtml:63
+#: templates/database/designer/delete_relation_panel.phtml:28
+#: templates/database/designer/having_query_panel.phtml:117
+#: templates/database/designer/new_relation_panel.phtml:88
+#: templates/database/designer/options_panel.phtml:253
+#: templates/database/designer/rename_to_panel.phtml:45
+#: templates/database/designer/where_query_panel.phtml:83
 msgid "Cancel"
 msgstr "రద్దుచేయి"
 
@@ -1831,7 +1835,7 @@ msgstr "రద్దుచేయి"
 msgid "Page-related settings"
 msgstr "ప్రాధమిక అమరికలు"
 
-#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:402
+#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:413
 msgid "Apply"
 msgstr ""
 
@@ -1869,8 +1873,8 @@ msgstr ""
 msgid "Error text: %s"
 msgstr ""
 
-#: js/messages.php:307 libraries/db_common.inc.php:68
-#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:450
+#: js/messages.php:307 libraries/db_common.inc.php:69
+#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:461
 msgid "No databases selected."
 msgstr ""
 
@@ -1882,12 +1886,13 @@ msgstr ""
 msgid "Adding Primary Key"
 msgstr ""
 
-#: js/messages.php:310 templates/designer/aggregate_query_panel.phtml:59
-#: templates/designer/having_query_panel.phtml:113
-#: templates/designer/new_relation_panel.phtml:87
-#: templates/designer/options_panel.phtml:252
-#: templates/designer/rename_to_panel.phtml:41
-#: templates/designer/where_query_panel.phtml:82
+#: js/messages.php:310
+#: templates/database/designer/aggregate_query_panel.phtml:59
+#: templates/database/designer/having_query_panel.phtml:113
+#: templates/database/designer/new_relation_panel.phtml:87
+#: templates/database/designer/options_panel.phtml:252
+#: templates/database/designer/rename_to_panel.phtml:41
+#: templates/database/designer/where_query_panel.phtml:82
 msgid "OK"
 msgstr "సరే"
 
@@ -1916,7 +1921,7 @@ msgstr "డేటాబేస్"
 msgid "Changing Charset"
 msgstr "అక్షరమాల"
 
-#: js/messages.php:320 libraries/Util.class.php:3217
+#: js/messages.php:320 libraries/Util.class.php:3223
 msgid "Enable foreign key checks"
 msgstr ""
 
@@ -1956,20 +1961,21 @@ msgstr ""
 #: js/messages.php:334 libraries/DisplayResults.class.php:4834
 #: libraries/DisplayResults.class.php:5092 libraries/Menu.class.php:344
 #: libraries/Menu.class.php:446 libraries/Menu.class.php:578
-#: libraries/Util.class.php:3636 libraries/Util.class.php:3637
-#: libraries/Util.class.php:4316 libraries/Util.class.php:4331
-#: libraries/Util.class.php:4348 libraries/config/messages.inc.php:252
+#: libraries/Util.class.php:3642 libraries/Util.class.php:3643
+#: libraries/Util.class.php:4322 libraries/Util.class.php:4337
+#: libraries/Util.class.php:4354 libraries/config/messages.inc.php:252
 #: libraries/display_export.lib.php:173 libraries/rte/rte_list.lib.php:146
 #: libraries/server_privileges.lib.php:2211
 #: libraries/server_privileges.lib.php:2290
 #: libraries/server_privileges.lib.php:2632
 #: libraries/server_privileges.lib.php:3356
 #: libraries/server_status_monitor.lib.php:322 prefs_manage.php:303
-#: setup/frames/menu.inc.php:27 templates/structure/check_all_tables.phtml:11
+#: setup/frames/menu.inc.php:27
+#: templates/database/structure/check_all_tables.phtml:11
 msgid "Export"
 msgstr "ఎగుమతి"
 
-#: js/messages.php:337 libraries/rte/rte_routines.lib.php:652
+#: js/messages.php:337 libraries/rte/rte_routines.lib.php:743
 msgid "ENUM/SET editor"
 msgstr ""
 
@@ -2010,7 +2016,7 @@ msgstr ""
 #: libraries/Console.class.php:214 libraries/DisplayResults.class.php:3474
 #: libraries/DisplayResults.class.php:4818 libraries/Index.class.php:723
 #: libraries/Util.class.php:706 libraries/Util.class.php:1202
-#: libraries/Util.class.php:3634 libraries/Util.class.php:3635
+#: libraries/Util.class.php:3640 libraries/Util.class.php:3641
 #: libraries/central_columns.lib.php:851
 #: libraries/central_columns.lib.php:1193
 #: libraries/config/messages.inc.php:892
@@ -2028,7 +2034,7 @@ msgstr "మార్చు"
 #: libraries/server_user_groups.lib.php:129
 #: libraries/sql_query_form.lib.php:416 libraries/tracking.lib.php:477
 #: setup/frames/index.inc.php:183 setup/frames/index.inc.php:291
-#: templates/designer/delete_relation_panel.phtml:27
+#: templates/database/designer/delete_relation_panel.phtml:27
 msgid "Delete"
 msgstr "తొలగించు"
 
@@ -2203,11 +2209,11 @@ msgid "No dependencies selected!"
 msgstr ""
 
 #: js/messages.php:394 libraries/central_columns.lib.php:1214
-#: libraries/insert_edit.lib.php:1458 libraries/server_variables.lib.php:155
+#: libraries/insert_edit.lib.php:1456 libraries/server_variables.lib.php:155
 #: setup/frames/config.inc.php:42 setup/frames/index.inc.php:279
 #: templates/columns_definitions/column_definitions_form.phtml:165
-#: templates/gis_visualization/gis_visualization.phtml:48
-#: templates/tbl_relation/common_form.phtml:107
+#: templates/table/gis_visualization/gis_visualization.phtml:48
+#: templates/table/relation/common_form.phtml:107
 msgid "Save"
 msgstr "భద్రపరచు"
 
@@ -2299,8 +2305,8 @@ msgid "Data point content"
 msgstr "విషయ సూచిక"
 
 #: js/messages.php:430 js/messages.php:562 js/messages.php:579
-#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2573
-#: templates/index_form.phtml:154 templates/index_form.phtml:194
+#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2571
+#: templates/table/index_form.phtml:154 templates/table/index_form.phtml:194
 msgid "Ignore"
 msgstr ""
 
@@ -2359,8 +2365,8 @@ msgstr ""
 msgid "Please select the primary key or a unique key!"
 msgstr ""
 
-#: js/messages.php:457 templates/designer/side_menu.phtml:91
-#: templates/designer/side_menu.phtml:94
+#: js/messages.php:457 templates/database/designer/side_menu.phtml:91
+#: templates/database/designer/side_menu.phtml:94
 msgid "Choose column to display"
 msgstr ""
 
@@ -2375,23 +2381,23 @@ msgid "Page name"
 msgstr "పుట పేరు"
 
 # మొదటి అనువాదము
-#: js/messages.php:463 templates/designer/side_menu.phtml:56
-#: templates/designer/side_menu.phtml:59
+#: js/messages.php:463 templates/database/designer/side_menu.phtml:56
+#: templates/database/designer/side_menu.phtml:59
 #, fuzzy
 #| msgid "Create a page"
 msgid "Save page"
 msgstr "పుటని సృష్టించు"
 
 # మొదటి అనువాదము
-#: js/messages.php:464 templates/designer/side_menu.phtml:63
-#: templates/designer/side_menu.phtml:66
+#: js/messages.php:464 templates/database/designer/side_menu.phtml:63
+#: templates/database/designer/side_menu.phtml:66
 #, fuzzy
 #| msgid "Create a page"
 msgid "Save page as"
 msgstr "పుటని సృష్టించు"
 
-#: js/messages.php:465 templates/designer/side_menu.phtml:49
-#: templates/designer/side_menu.phtml:52
+#: js/messages.php:465 templates/database/designer/side_menu.phtml:49
+#: templates/database/designer/side_menu.phtml:52
 #, fuzzy
 #| msgctxt "PDF"
 #| msgid "page"
@@ -2404,7 +2410,7 @@ msgstr "పుటలు"
 msgid "Delete page"
 msgstr "తొలగించు"
 
-#: js/messages.php:467 templates/designer/side_menu.phtml:10
+#: js/messages.php:467 templates/database/designer/side_menu.phtml:10
 #, fuzzy
 #| msgid "Title"
 msgid "Untitled"
@@ -2526,7 +2532,7 @@ msgstr "అసలు స్థానం"
 msgid "cancel"
 msgstr "రద్దుచేయి"
 
-#: js/messages.php:499 libraries/server_status.lib.php:271
+#: js/messages.php:499 libraries/server_status.lib.php:280
 msgid "Aborted"
 msgstr ""
 
@@ -3133,7 +3139,7 @@ msgstr ""
 
 #: js/messages.php:793 libraries/Message.class.php:199
 #: libraries/Util.class.php:654 libraries/core.lib.php:245
-#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1172
+#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1170
 #: tbl_operations.php:229 view_operations.php:63
 msgid "Error"
 msgstr "పొరపాటు"
@@ -3192,8 +3198,8 @@ msgstr "క్షణానికి"
 msgid "per minute"
 msgstr "నిమిషానికి"
 
-#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:143
-#: libraries/server_status.lib.php:228
+#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:152
+#: libraries/server_status.lib.php:237
 #: libraries/server_status_queries.lib.php:98
 msgid "per hour"
 msgstr "గంటకి"
@@ -3211,7 +3217,7 @@ msgstr ""
 msgid "Wrong permissions on configuration file, should not be world writable!"
 msgstr ""
 
-#: libraries/Config.class.php:1799
+#: libraries/Config.class.php:1801
 msgid "Font size"
 msgstr ""
 
@@ -3240,10 +3246,10 @@ msgstr ""
 #: libraries/server_privileges.lib.php:2890
 #: libraries/server_privileges.lib.php:3144
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4332
+#: libraries/server_privileges.lib.php:4358
 #: libraries/server_status_processes.lib.php:80
-#: templates/tbl_relation/foreign_key_row.phtml:165
-#: templates/tbl_relation/internal_relational_row.phtml:55
+#: templates/table/relation/foreign_key_row.phtml:165
+#: templates/table/relation/internal_relational_row.phtml:55
 msgid "Database"
 msgstr "డేటాబేస్"
 
@@ -3348,11 +3354,11 @@ msgstr "SQL చరిత్ర"
 #: libraries/plugins/import/ImportMediawiki.class.php:60
 #: libraries/plugins/import/ImportOds.class.php:59
 #: libraries/plugins/import/ImportShp.class.php:57
-#: libraries/plugins/import/ImportSql.class.php:148
+#: libraries/plugins/import/ImportSql.class.php:51
 #: libraries/plugins/import/ImportXml.class.php:58
-#: libraries/rte/rte_routines.lib.php:833 templates/index_form.phtml:49
-#: templates/structure/row_stats_table.phtml:20
-#: templates/table/options.phtml:2
+#: libraries/rte/rte_routines.lib.php:924 templates/table/index_form.phtml:49
+#: templates/table/search/options.phtml:2
+#: templates/table/structure/row_stats_table.phtml:20
 msgid "Options"
 msgstr "ఎంపికలు"
 
@@ -3397,7 +3403,8 @@ msgid "Order:"
 msgstr ""
 
 # మొదటి అనువాదము
-#: libraries/Console.class.php:289 templates/table/replace_preview.phtml:17
+#: libraries/Console.class.php:289
+#: templates/table/search/replace_preview.phtml:17
 #, fuzzy
 #| msgid "Column"
 msgid "Count"
@@ -3520,9 +3527,9 @@ msgstr "దీనికి మారు"
 #: libraries/operations.lib.php:794 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:191
-#: templates/structure/sortable_header.phtml:21
-#: templates/structure/sortable_header.phtml:38
-#: templates/table/options.phtml:68
+#: templates/database/structure/sortable_header.phtml:21
+#: templates/database/structure/sortable_header.phtml:38
+#: templates/table/search/options.phtml:68
 msgid "Ascending"
 msgstr "ఆరోహణ"
 
@@ -3532,14 +3539,15 @@ msgstr "ఆరోహణ"
 #: libraries/operations.lib.php:797 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:188
-#: templates/structure/sortable_header.phtml:26
-#: templates/structure/sortable_header.phtml:43
-#: templates/table/options.phtml:69
+#: templates/database/structure/sortable_header.phtml:26
+#: templates/database/structure/sortable_header.phtml:43
+#: templates/table/search/options.phtml:69
 msgid "Descending"
 msgstr "అవరోహణ"
 
 # మొదటి అనువాదము
-#: libraries/DBQbe.class.php:467 templates/table/search_and_replace.phtml:6
+#: libraries/DBQbe.class.php:467
+#: templates/table/search/search_and_replace.phtml:6
 #, fuzzy
 #| msgid "Column"
 msgid "Column:"
@@ -3727,12 +3735,12 @@ msgstr[0] ""
 msgstr[1] ""
 
 #: libraries/DbSearch.class.php:354 libraries/Menu.class.php:311
-#: libraries/Util.class.php:3337 libraries/Util.class.php:3347
-#: libraries/Util.class.php:3623 libraries/Util.class.php:3624
-#: libraries/Util.class.php:4343 libraries/config.values.php:43
+#: libraries/Util.class.php:3343 libraries/Util.class.php:3353
+#: libraries/Util.class.php:3629 libraries/Util.class.php:3630
+#: libraries/Util.class.php:4349 libraries/config.values.php:43
 #: libraries/config.values.php:51 libraries/config.values.php:119
 #: libraries/navigation/Nodes/Node_Table.class.php:295
-#: templates/structure/check_all_table_column.phtml:5
+#: templates/table/structure/check_all_table_column.phtml:5
 msgid "Browse"
 msgstr ""
 
@@ -3750,7 +3758,8 @@ msgid "Words or values to search for (wildcard: \"%\"):"
 msgstr ""
 
 # మొదటి అనువాదము
-#: libraries/DbSearch.class.php:401 templates/table/search_and_replace.phtml:1
+#: libraries/DbSearch.class.php:401
+#: templates/table/search/search_and_replace.phtml:1
 msgid "Find:"
 msgstr "వెతుకు:"
 
@@ -3803,8 +3812,8 @@ msgid "Search this table"
 msgstr "ఈ విలువని ఉపయోగించు"
 
 # మొదటి అనువాదము
-#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2532
-#: libraries/Util.class.php:2535
+#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2538
+#: libraries/Util.class.php:2541
 #, fuzzy
 #| msgid "Begin"
 msgctxt "First page"
@@ -3812,8 +3821,8 @@ msgid "Begin"
 msgstr "మొదలు"
 
 # మొదటి అనువాదము
-#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2533
-#: libraries/Util.class.php:2536 libraries/server_bin_log.lib.php:170
+#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2539
+#: libraries/Util.class.php:2542 libraries/server_bin_log.lib.php:170
 #: libraries/server_bin_log.lib.php:172
 #, fuzzy
 #| msgid "Previous"
@@ -3822,8 +3831,8 @@ msgid "Previous"
 msgstr "క్రితము"
 
 # మొదటి అనువాదము
-#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2564
-#: libraries/Util.class.php:2574 libraries/server_bin_log.lib.php:204
+#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2570
+#: libraries/Util.class.php:2580 libraries/server_bin_log.lib.php:204
 #: libraries/server_bin_log.lib.php:206
 #, fuzzy
 #| msgid "Next"
@@ -3831,8 +3840,8 @@ msgctxt "Next page"
 msgid "Next"
 msgstr "తదుపరి"
 
-#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2565
-#: libraries/Util.class.php:2575
+#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2571
+#: libraries/Util.class.php:2581
 #, fuzzy
 #| msgid "End"
 msgctxt "Last page"
@@ -3914,9 +3923,9 @@ msgid "May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]."
 msgstr ""
 
 #: libraries/DisplayResults.class.php:4332 libraries/Message.class.php:180
-#: libraries/controllers/TableRelationController.class.php:258
+#: libraries/controllers/TableRelationController.class.php:259
 #: libraries/controllers/TableSearchController.class.php:655
-#: libraries/rte/rte_routines.lib.php:1332 libraries/sql_query_form.lib.php:89
+#: libraries/rte/rte_routines.lib.php:1423 libraries/sql_query_form.lib.php:89
 #: tbl_operations.php:227 tbl_row_action.php:138 view_operations.php:62
 #, fuzzy
 #| msgid "Your SQL query has been executed successfully."
@@ -3924,7 +3933,7 @@ msgid "Your SQL query has been executed successfully."
 msgstr "మీ SQL క్వెరీ విజయవంతంగా నిర్వహించబడింది"
 
 #: libraries/DisplayResults.class.php:4660
-#: libraries/controllers/StructureController.class.php:629
+#: libraries/controllers/DatabaseStructureController.class.php:564
 #, php-format
 msgid ""
 "This view has at least this number of rows. Please refer to %sdocumentation"
@@ -3947,33 +3956,33 @@ msgstr ""
 msgid "%d total"
 msgstr "మొత్తం"
 
-#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1318
+#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1312
 #, php-format
 msgid "Query took %01.4f seconds."
 msgstr ""
 
 #: libraries/DisplayResults.class.php:4807
-#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4767
-#: libraries/Util.class.php:4773 libraries/mult_submits.inc.php:50
-#: templates/structure/check_all_tables.phtml:2
-#: templates/structure/check_all_tables.phtml:9
+#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4773
+#: libraries/Util.class.php:4779 libraries/mult_submits.inc.php:50
+#: templates/database/structure/check_all_tables.phtml:2
+#: templates/database/structure/check_all_tables.phtml:9
 msgid "With selected:"
 msgstr ""
 
 #: libraries/DisplayResults.class.php:4811
-#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4769
-#: libraries/Util.class.php:4770 libraries/server_privileges.lib.php:1174
+#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4775
+#: libraries/Util.class.php:4776 libraries/server_privileges.lib.php:1174
 #: libraries/server_privileges.lib.php:1175
 #: libraries/server_privileges.lib.php:1387
 #: libraries/server_user_groups.lib.php:231
-#: templates/structure/check_all_tables.phtml:3
-#: templates/structure/check_all_tables.phtml:4
+#: templates/database/structure/check_all_tables.phtml:3
+#: templates/database/structure/check_all_tables.phtml:4
 msgid "Check All"
 msgstr ""
 
 #: libraries/DisplayResults.class.php:4985 libraries/Header.class.php:383
-#: templates/structure/optional_action_links.phtml:1
-#: templates/structure/print_view_data_dictionary_link.phtml:3
+#: templates/database/structure/print_view_data_dictionary_link.phtml:3
+#: templates/table/structure/optional_action_links.phtml:1
 msgid "Print view"
 msgstr ""
 
@@ -3981,7 +3990,8 @@ msgstr ""
 msgid "Query results operations"
 msgstr ""
 
-#: libraries/DisplayResults.class.php:5105 templates/tbl_chart.phtml:12
+#: libraries/DisplayResults.class.php:5105
+#: templates/table/chart/tbl_chart.phtml:12
 #, fuzzy
 #| msgid "Table comments"
 msgid "Display chart"
@@ -4076,7 +4086,7 @@ msgid "Click on the bar to scroll to top of page"
 msgstr ""
 
 #: libraries/Header.class.php:749
-#: libraries/plugins/auth/AuthenticationCookie.class.php:152
+#: libraries/plugins/auth/AuthenticationCookie.class.php:140
 msgid "Javascript must be enabled past this point!"
 msgstr ""
 
@@ -4098,11 +4108,11 @@ msgid "Keyname"
 msgstr "కీలకపదం"
 
 #: libraries/Index.class.php:697
-#: libraries/controllers/StructureController.class.php:1962
-#: libraries/controllers/StructureController.class.php:1967
+#: libraries/controllers/TableStructureController.class.php:953
+#: libraries/controllers/TableStructureController.class.php:958
 #: libraries/tracking.lib.php:973
 #: templates/columns_definitions/column_indexes.phtml:11
-#: templates/structure/check_all_table_column.phtml:26
+#: templates/table/structure/check_all_table_column.phtml:26
 msgid "Unique"
 msgstr ""
 
@@ -4121,16 +4131,17 @@ msgstr ""
 #: libraries/server_collations.lib.php:35 libraries/tracking.lib.php:881
 #: libraries/tracking.lib.php:977
 #: templates/columns_definitions/table_fields_definitions.phtml:33
-#: templates/structure/row_stats_table.phtml:31
-#: templates/structure/table_header.phtml:55
-#: templates/structure/table_structure_header.phtml:7
-#: templates/table/table_header.phtml:8
+#: templates/database/structure/table_header.phtml:55
+#: templates/table/search/table_header.phtml:8
+#: templates/table/structure/row_stats_table.phtml:31
+#: templates/table/structure/table_structure_header.phtml:7
 msgid "Collation"
 msgstr ""
 
 #: libraries/Index.class.php:703 libraries/rte/rte_events.lib.php:496
-#: libraries/rte/rte_routines.lib.php:956 libraries/tracking.lib.php:885
-#: libraries/tracking.lib.php:979 templates/structure/table_header.phtml:84
+#: libraries/rte/rte_routines.lib.php:1047 libraries/tracking.lib.php:885
+#: libraries/tracking.lib.php:979
+#: templates/database/structure/table_header.phtml:84
 msgid "Comment"
 msgstr "వ్యాఖ్య"
 
@@ -4143,15 +4154,15 @@ msgstr ""
 msgid "Index %s has been dropped."
 msgstr ""
 
-#: libraries/Index.class.php:757 libraries/Util.class.php:3630
-#: libraries/Util.class.php:3631
-#: libraries/controllers/StructureController.class.php:1958
-#: libraries/controllers/StructureController.class.php:1959
+#: libraries/Index.class.php:757 libraries/Util.class.php:3636
+#: libraries/Util.class.php:3637
+#: libraries/controllers/TableStructureController.class.php:949
+#: libraries/controllers/TableStructureController.class.php:950
 #: libraries/operations.lib.php:1607 libraries/rte/rte_list.lib.php:150
 #: libraries/server_databases.lib.php:146
-#: templates/structure/check_all_table_column.phtml:15
-#: templates/structure/check_all_tables.phtml:16
-#: templates/tbl_relation/foreign_key_row.phtml:93
+#: templates/database/structure/check_all_tables.phtml:16
+#: templates/table/relation/foreign_key_row.phtml:93
+#: templates/table/structure/check_all_table_column.phtml:15
 msgid "Drop"
 msgstr ""
 
@@ -4181,16 +4192,16 @@ msgstr ""
 #: libraries/Menu.class.php:248
 #: libraries/navigation/Nodes/Node_View.class.php:32
 #: libraries/tbl_info.inc.php:63
-#: templates/structure/structure_table_row.phtml:97
-#: templates/structure/structure_table_row.phtml:159
+#: templates/database/structure/structure_table_row.phtml:97
+#: templates/database/structure/structure_table_row.phtml:159
 msgid "View"
 msgstr "చూపుము"
 
 #: libraries/Menu.class.php:325 libraries/Menu.class.php:429
-#: libraries/Menu.class.php:548 libraries/Util.class.php:3334
-#: libraries/Util.class.php:3344 libraries/Util.class.php:3350
-#: libraries/Util.class.php:4313 libraries/Util.class.php:4328
-#: libraries/Util.class.php:4345 libraries/config.values.php:40
+#: libraries/Menu.class.php:548 libraries/Util.class.php:3340
+#: libraries/Util.class.php:3350 libraries/Util.class.php:3356
+#: libraries/Util.class.php:4319 libraries/Util.class.php:4334
+#: libraries/Util.class.php:4351 libraries/config.values.php:40
 #: libraries/config.values.php:48 libraries/config.values.php:110
 #: libraries/config.values.php:116 libraries/config/messages.inc.php:321
 #: libraries/navigation/Nodes/Node_Table.class.php:292
@@ -4199,19 +4210,19 @@ msgstr ""
 
 # Research అంటే పరిశోధన, అందువల్లన ఇది శోధనైంది
 #: libraries/Menu.class.php:328 libraries/Menu.class.php:432
-#: libraries/Util.class.php:3335 libraries/Util.class.php:3345
-#: libraries/Util.class.php:3351 libraries/Util.class.php:3625
-#: libraries/Util.class.php:3626 libraries/Util.class.php:4329
-#: libraries/Util.class.php:4346 libraries/config.values.php:41
+#: libraries/Util.class.php:3341 libraries/Util.class.php:3351
+#: libraries/Util.class.php:3357 libraries/Util.class.php:3631
+#: libraries/Util.class.php:3632 libraries/Util.class.php:4335
+#: libraries/Util.class.php:4352 libraries/config.values.php:41
 #: libraries/config.values.php:49 libraries/config.values.php:111
 #: libraries/config.values.php:117
 #: libraries/navigation/Nodes/Node_Table.class.php:286
 msgid "Search"
 msgstr "శోధించు"
 
-#: libraries/Menu.class.php:338 libraries/Util.class.php:3336
-#: libraries/Util.class.php:3346 libraries/Util.class.php:3627
-#: libraries/Util.class.php:3628 libraries/Util.class.php:4347
+#: libraries/Menu.class.php:338 libraries/Util.class.php:3342
+#: libraries/Util.class.php:3352 libraries/Util.class.php:3633
+#: libraries/Util.class.php:3634 libraries/Util.class.php:4353
 #: libraries/config.values.php:42 libraries/config.values.php:50
 #: libraries/config.values.php:118
 #: libraries/navigation/Nodes/Node_Table.class.php:289
@@ -4220,30 +4231,30 @@ msgid "Insert"
 msgstr ""
 
 #: libraries/Menu.class.php:362 libraries/Menu.class.php:467
-#: libraries/Util.class.php:4334 libraries/Util.class.php:4350
+#: libraries/Util.class.php:4340 libraries/Util.class.php:4356
 #: libraries/config.values.php:106 libraries/server_common.lib.php:51
 #: libraries/server_privileges.lib.php:2370
 #: libraries/server_privileges.lib.php:3158
-#: libraries/server_privileges.lib.php:4221
+#: libraries/server_privileges.lib.php:4247
 msgid "Privileges"
 msgstr ""
 
 #: libraries/Menu.class.php:371 libraries/Menu.class.php:379
-#: libraries/Menu.class.php:459 libraries/Util.class.php:3338
-#: libraries/Util.class.php:3352 libraries/Util.class.php:4333
-#: libraries/Util.class.php:4351 libraries/config.values.php:112
+#: libraries/Menu.class.php:459 libraries/Util.class.php:3344
+#: libraries/Util.class.php:3358 libraries/Util.class.php:4339
+#: libraries/Util.class.php:4357 libraries/config.values.php:112
 #: view_operations.php:92
 msgid "Operations"
 msgstr ""
 
 #: libraries/Menu.class.php:384 libraries/Menu.class.php:492
-#: libraries/Util.class.php:4338 libraries/Util.class.php:4352
+#: libraries/Util.class.php:4344 libraries/Util.class.php:4358
 #: libraries/relation.lib.php:255
 msgid "Tracking"
 msgstr ""
 
 #: libraries/Menu.class.php:397 libraries/Menu.class.php:486
-#: libraries/Util.class.php:4337 libraries/Util.class.php:4353
+#: libraries/Util.class.php:4343 libraries/Util.class.php:4359
 #: libraries/navigation/Nodes/Node_Trigger_Container.class.php:24
 #: libraries/plugins/export/ExportHtmlword.class.php:557
 #: libraries/plugins/export/ExportOdt.class.php:685
@@ -4260,16 +4271,16 @@ msgstr ""
 msgid "Database seems to be empty!"
 msgstr ""
 
-#: libraries/Menu.class.php:439 libraries/Util.class.php:4330
+#: libraries/Menu.class.php:439 libraries/Util.class.php:4336
 msgid "Query"
 msgstr ""
 
-#: libraries/Menu.class.php:472 libraries/Util.class.php:4335
+#: libraries/Menu.class.php:472 libraries/Util.class.php:4341
 #: libraries/rte/rte_words.lib.php:36
 msgid "Routines"
 msgstr ""
 
-#: libraries/Menu.class.php:479 libraries/Util.class.php:4336
+#: libraries/Menu.class.php:479 libraries/Util.class.php:4342
 #: libraries/navigation/Nodes/Node_Event_Container.class.php:26
 #: libraries/plugins/export/ExportSql.class.php:940
 #: libraries/plugins/export/ExportXml.class.php:107
@@ -4277,22 +4288,22 @@ msgstr ""
 msgid "Events"
 msgstr ""
 
-#: libraries/Menu.class.php:498 libraries/Util.class.php:4339
+#: libraries/Menu.class.php:498 libraries/Util.class.php:4345
 msgid "Designer"
 msgstr ""
 
-#: libraries/Menu.class.php:507 libraries/Util.class.php:4340
-#: templates/structure/check_all_tables.phtml:35
+#: libraries/Menu.class.php:507 libraries/Util.class.php:4346
+#: templates/database/structure/check_all_tables.phtml:35
 #, fuzzy
 #| msgid "Table comments"
 msgid "Central columns"
 msgstr "పట్టిక వ్యాఖ్యలు"
 
-#: libraries/Menu.class.php:544 libraries/Util.class.php:4312
+#: libraries/Menu.class.php:544 libraries/Util.class.php:4318
 #: libraries/config.values.php:103 libraries/config/messages.inc.php:266
 #: libraries/config/messages.inc.php:341
 #: libraries/navigation/NavigationTree.class.php:1239
-#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4332
+#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4358
 msgid "Databases"
 msgstr ""
 
@@ -4303,34 +4314,34 @@ msgid "User accounts"
 msgstr "వాడుకరి"
 
 #: libraries/Menu.class.php:595 libraries/ServerStatusData.class.php:121
-#: libraries/Util.class.php:4319 libraries/server_common.lib.php:36
+#: libraries/Util.class.php:4325 libraries/server_common.lib.php:36
 msgid "Binary log"
 msgstr ""
 
 #: libraries/Menu.class.php:601 libraries/ServerStatusData.class.php:126
-#: libraries/Util.class.php:4320 libraries/server_common.lib.php:42
-#: templates/structure/body_for_table_summary.phtml:10
-#: templates/structure/table_header.phtml:27
+#: libraries/Util.class.php:4326 libraries/server_common.lib.php:42
+#: templates/database/structure/body_for_table_summary.phtml:10
+#: templates/database/structure/table_header.phtml:27
 msgid "Replication"
 msgstr ""
 
 #: libraries/Menu.class.php:606 libraries/ServerStatusData.class.php:193
-#: libraries/Util.class.php:4321 libraries/config.values.php:105
+#: libraries/Util.class.php:4327 libraries/config.values.php:105
 #: libraries/server_engines.lib.php:108 libraries/server_engines.lib.php:112
 #: libraries/sql_query_form.lib.php:421
 msgid "Variables"
 msgstr ""
 
-#: libraries/Menu.class.php:610 libraries/Util.class.php:4322
+#: libraries/Menu.class.php:610 libraries/Util.class.php:4328
 msgid "Charsets"
 msgstr ""
 
-#: libraries/Menu.class.php:615 libraries/Util.class.php:4323
+#: libraries/Menu.class.php:615 libraries/Util.class.php:4329
 #: libraries/server_common.lib.php:33 libraries/server_plugins.lib.php:27
 msgid "Plugins"
 msgstr ""
 
-#: libraries/Menu.class.php:626 libraries/Util.class.php:4324
+#: libraries/Menu.class.php:626 libraries/Util.class.php:4330
 msgid "Engines"
 msgstr ""
 
@@ -4355,7 +4366,7 @@ msgid_plural "%1$d rows inserted."
 msgstr[0] ""
 msgstr[1] ""
 
-#: libraries/PDF.class.php:70 libraries/Util.class.php:2521
+#: libraries/PDF.class.php:70 libraries/Util.class.php:2527
 #: libraries/browse_foreigners.lib.php:327
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:865
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:890
@@ -4381,7 +4392,7 @@ msgstr "సేవకి స్వరూపణం"
 
 # మొదటి అనువాదము
 #: libraries/RecentFavoriteTable.class.php:212
-#: templates/structure/favorite_anchor.phtml:12
+#: templates/database/structure/favorite_anchor.phtml:12
 #, fuzzy
 #| msgid "Remove database"
 msgid "Remove from Favorites"
@@ -4575,7 +4586,7 @@ msgid ""
 msgstr ""
 
 #: libraries/StorageEngine.class.php:373
-#: templates/structure/body_for_table_summary.phtml:50
+#: templates/database/structure/body_for_table_summary.phtml:50
 #, php-format
 msgid "%s is the default storage engine on this MySQL server."
 msgstr ""
@@ -5008,10 +5019,10 @@ msgstr ""
 
 #: libraries/Util.class.php:726 libraries/rte/rte_events.lib.php:110
 #: libraries/rte/rte_events.lib.php:119 libraries/rte/rte_events.lib.php:150
-#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:153
-#: libraries/rte/rte_routines.lib.php:162
-#: libraries/rte/rte_routines.lib.php:235
-#: libraries/rte/rte_routines.lib.php:1366
+#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:223
+#: libraries/rte/rte_routines.lib.php:250
+#: libraries/rte/rte_routines.lib.php:372
+#: libraries/rte/rte_routines.lib.php:1457
 #: libraries/rte/rte_triggers.lib.php:86 libraries/rte/rte_triggers.lib.php:95
 #: libraries/rte/rte_triggers.lib.php:127
 msgid "MySQL said: "
@@ -5057,76 +5068,79 @@ msgstr "ఆది"
 msgid "%B %d, %Y at %I:%M %p"
 msgstr ""
 
-#: libraries/Util.class.php:2019
+#: libraries/Util.class.php:2025
 #, php-format
 msgid "%s days, %s hours, %s minutes and %s seconds"
 msgstr "%s రోజులు, %s గంటలు, %s నిమిషాలు మరియు %s క్షణాలు"
 
-#: libraries/Util.class.php:2112
+#: libraries/Util.class.php:2118
 msgid "Missing parameter:"
 msgstr ""
 
-#: libraries/Util.class.php:2645
+#: libraries/Util.class.php:2651
 #, php-format
 msgid "Jump to database \"%s\"."
 msgstr ""
 
-#: libraries/Util.class.php:2670
+#: libraries/Util.class.php:2676
 #, php-format
 msgid "The %s functionality is affected by a known bug, see %s"
 msgstr ""
 
-#: libraries/Util.class.php:2881
+#: libraries/Util.class.php:2887
 msgid "Click to toggle"
 msgstr ""
 
-#: libraries/Util.class.php:3542 prefs_manage.php:248
+#: libraries/Util.class.php:3548 prefs_manage.php:248
 msgid "Browse your computer:"
 msgstr ""
 
-#: libraries/Util.class.php:3567
+#: libraries/Util.class.php:3573
 #, php-format
 msgid "Select from the web server upload directory <b>%s</b>:"
 msgstr ""
 
-#: libraries/Util.class.php:3596 libraries/insert_edit.lib.php:1173
+#: libraries/Util.class.php:3602 libraries/insert_edit.lib.php:1171
 msgid "The directory you set for upload work cannot be reached."
 msgstr ""
 
-#: libraries/Util.class.php:3607
+#: libraries/Util.class.php:3613
 msgid "There are no files to upload!"
 msgstr ""
 
 # మొదటి అనువాదము
-#: libraries/Util.class.php:3632 libraries/Util.class.php:3633
-#: templates/structure/check_all_tables.phtml:15
+#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: templates/database/structure/check_all_tables.phtml:15
 msgid "Empty"
 msgstr "ఖాళీ"
 
-#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: libraries/Util.class.php:3644 libraries/Util.class.php:3645
 msgid "Execute"
 msgstr ""
 
-#: libraries/Util.class.php:4152
+#: libraries/Util.class.php:4158
 msgid "Print"
 msgstr "ముద్రించు"
 
-#: libraries/Util.class.php:4257 templates/structure/row_stats_table.phtml:80
-#: templates/structure/table_header.phtml:95
+#: libraries/Util.class.php:4263
+#: templates/database/structure/table_header.phtml:95
+#: templates/table/structure/row_stats_table.phtml:80
 msgid "Creation"
 msgstr "సృష్టి"
 
-#: libraries/Util.class.php:4263 templates/structure/row_stats_table.phtml:87
-#: templates/structure/table_header.phtml:106
+#: libraries/Util.class.php:4269
+#: templates/database/structure/table_header.phtml:106
+#: templates/table/structure/row_stats_table.phtml:87
 msgid "Last update"
 msgstr "చివరి మార్పు"
 
-#: libraries/Util.class.php:4269 templates/structure/row_stats_table.phtml:94
-#: templates/structure/table_header.phtml:117
+#: libraries/Util.class.php:4275
+#: templates/database/structure/table_header.phtml:117
+#: templates/table/structure/row_stats_table.phtml:94
 msgid "Last check"
 msgstr "చివరి చూపు"
 
-#: libraries/Util.class.php:4315
+#: libraries/Util.class.php:4321
 #, fuzzy
 #| msgid "User"
 msgid "Users"
@@ -5152,16 +5166,16 @@ msgid "Use this value"
 msgstr "ఈ విలువని ఉపయోగించు"
 
 #: libraries/build_html_for_db.lib.php:33 libraries/import.lib.php:193
-#: templates/structure/actions_in_table_structure.phtml:113
-#: templates/structure/row_stats_table.phtml:42
-#: templates/structure/table_header.phtml:36
+#: templates/database/structure/table_header.phtml:36
+#: templates/table/structure/actions_in_table_structure.phtml:113
+#: templates/table/structure/row_stats_table.phtml:42
 msgid "Rows"
 msgstr "వరుసలు"
 
 #: libraries/build_html_for_db.lib.php:48 libraries/engines/innodb.lib.php:171
-#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:186
-#: libraries/server_status.lib.php:298
-#: templates/structure/display_table_stats.phtml:40
+#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:195
+#: libraries/server_status.lib.php:307
+#: templates/table/structure/display_table_stats.phtml:40
 msgid "Total"
 msgstr "మొత్తం"
 
@@ -5170,10 +5184,12 @@ msgid "Jump to database"
 msgstr ""
 
 #: libraries/build_html_for_db.lib.php:146
+#: templates/database/structure/structure_table_row.phtml:15
 msgid "Not replicated"
 msgstr ""
 
 #: libraries/build_html_for_db.lib.php:158
+#: templates/database/structure/structure_table_row.phtml:16
 msgid "Replicated"
 msgstr ""
 
@@ -5230,17 +5246,17 @@ msgstr ""
 #: libraries/plugins/export/ExportTexytext.class.php:425
 #: libraries/plugins/export/PMA_ExportPdf.class.php:307
 #: libraries/rte/rte_list.lib.php:73 libraries/rte/rte_list.lib.php:85
-#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:830
-#: libraries/rte/rte_routines.lib.php:1492 setup/frames/index.inc.php:162
+#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:921
+#: libraries/rte/rte_routines.lib.php:1583 setup/frames/index.inc.php:162
 #: templates/columns_definitions/table_fields_definitions.phtml:8
-#: templates/structure/table_structure_header.phtml:5
-#: templates/table/create_table.phtml:11
+#: templates/database/create_table.phtml:11
+#: templates/table/structure/table_structure_header.phtml:5
 msgid "Name"
 msgstr "పేరు"
 
 #: libraries/central_columns.lib.php:699
 #: libraries/central_columns.lib.php:1381
-#: libraries/rte/rte_routines.lib.php:832
+#: libraries/rte/rte_routines.lib.php:923
 #: templates/columns_definitions/table_fields_definitions.phtml:14
 msgid "Length/Values"
 msgstr "పొడవు/విలువలు"
@@ -5262,7 +5278,7 @@ msgstr "అన్నీ ఎంచుకో"
 
 # మొదటి అనువాదము
 #: libraries/central_columns.lib.php:804
-#: templates/structure/add_column.phtml:4
+#: templates/table/structure/add_column.phtml:4
 #, fuzzy
 #| msgid "Add into comments"
 msgid "Add column"
@@ -5285,7 +5301,7 @@ msgstr "స్పందనలకు చేర్చు"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1002
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1025
 #: templates/columns_definitions/table_fields_definitions.phtml:36
-#: templates/structure/table_structure_header.phtml:8
+#: templates/table/structure/table_structure_header.phtml:8
 msgid "Attributes"
 msgstr ""
 
@@ -5403,7 +5419,7 @@ msgid "Double click"
 msgstr ""
 
 #: libraries/config.values.php:95 libraries/config.values.php:124
-#: libraries/config/FormDisplay.tpl.php:221 libraries/relation.lib.php:97
+#: libraries/config/FormDisplay.tpl.php:232 libraries/relation.lib.php:97
 #: libraries/relation.lib.php:105
 msgid "Disabled"
 msgstr ""
@@ -5588,21 +5604,21 @@ msgstr ""
 msgid "maximum %s"
 msgstr "గరిష్ఠం %s"
 
-#: libraries/config/FormDisplay.tpl.php:219
+#: libraries/config/FormDisplay.tpl.php:230
 msgid "This setting is disabled, it will not be applied to your configuration."
 msgstr ""
 
-#: libraries/config/FormDisplay.tpl.php:313
+#: libraries/config/FormDisplay.tpl.php:324
 #, php-format
 msgid "Set value: %s"
 msgstr ""
 
-#: libraries/config/FormDisplay.tpl.php:318
+#: libraries/config/FormDisplay.tpl.php:329
 #: libraries/config/messages.inc.php:610
 msgid "Restore default value"
 msgstr ""
 
-#: libraries/config/FormDisplay.tpl.php:332
+#: libraries/config/FormDisplay.tpl.php:343
 msgid "Allow users to customize this value"
 msgstr ""
 
@@ -6036,7 +6052,7 @@ msgstr ""
 
 #: libraries/config/messages.inc.php:136 libraries/config/messages.inc.php:152
 #: libraries/sql_query_form.lib.php:247
-#: templates/structure/row_stats_table.phtml:7
+#: templates/table/structure/row_stats_table.phtml:7
 msgid "Format"
 msgstr ""
 
@@ -6561,7 +6577,7 @@ msgstr ""
 # మొదటి అనువాదము
 #: libraries/config/messages.inc.php:332
 #: libraries/plugins/export/ExportPdf.class.php:279
-#: templates/structure/secondary_tabs.phtml:8
+#: templates/table/secondary_tabs.phtml:8
 #, fuzzy
 #| msgid "Database"
 msgid "Table structure"
@@ -8139,109 +8155,35 @@ msgstr "మైక్రోసాఫ్ట్ వర్డ్ 2000"
 msgid "OpenDocument Text"
 msgstr "ఓపెన్ డాక్యుమెంట్"
 
-#: libraries/controllers/StructureController.class.php:465
+#: libraries/controllers/DatabaseStructureController.class.php:405
 #: tbl_operations.php:382
 #, php-format
 msgid "Table %s has been emptied."
 msgstr ""
 
-#: libraries/controllers/StructureController.class.php:486
+#: libraries/controllers/DatabaseStructureController.class.php:426
 #: tbl_operations.php:400 view_operations.php:119
 #, fuzzy, php-format
 #| msgid "Database %s has been dropped."
 msgid "View %s has been dropped."
 msgstr "%s డేటాబేస్ తుడిచివేయడమైనది."
 
-#: libraries/controllers/StructureController.class.php:487
+#: libraries/controllers/DatabaseStructureController.class.php:427
 #: tbl_operations.php:401
 #, fuzzy, php-format
 #| msgid "Database %s has been dropped."
 msgid "Table %s has been dropped."
 msgstr "%s డేటాబేస్ తుడిచివేయడమైనది."
 
-#: libraries/controllers/StructureController.class.php:797
-#, php-format
-msgid "The name '%s' is a MySQL reserved keyword."
-msgid_plural "The names '%s' are MySQL reserved keywords."
-msgstr[0] ""
-msgstr[1] ""
-
-#: libraries/controllers/StructureController.class.php:875
-msgid "No column selected."
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1049
+#: libraries/controllers/DatabaseStructureController.class.php:733
 msgid "Favorite List is full!"
 msgstr ""
 
-#: libraries/controllers/StructureController.class.php:1272
-#, fuzzy
-#| msgid "Database %s has been dropped."
-msgid "The columns have been moved successfully."
-msgstr "%s డేటాబేస్ తుడిచివేయడమైనది"
-
-#: libraries/controllers/StructureController.class.php:1535
-#, fuzzy, php-format
-#| msgid "Database %s has been dropped."
-msgid ""
-"Table %1$s has been altered successfully. Privileges have been adjusted."
-msgstr "%s డేటాబేస్ తుడిచివేయడమైనది"
-
-#: libraries/controllers/StructureController.class.php:1541
-#: libraries/controllers/TableIndexesController.class.php:161
-#: tbl_addfield.php:92
-#, php-format
-msgid "Table %1$s has been altered successfully."
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1588
-#: libraries/tracking.lib.php:1094
-msgid "Query error"
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1806
+#: libraries/controllers/DatabaseStructureController.class.php:947
 #: libraries/mysql_charsets.lib.php:366 libraries/mysql_charsets.lib.php:373
 msgid "unknown"
 msgstr "తెలియని"
 
-# మొదటి అనువాదము
-#: libraries/controllers/StructureController.class.php:1957
-#: templates/structure/check_all_table_column.phtml:11
-msgid "Change"
-msgstr "మార్చుము"
-
-#: libraries/controllers/StructureController.class.php:1961
-#: libraries/controllers/StructureController.class.php:1966
-#: libraries/navigation/Nodes/Node_Index.class.php:30
-#: libraries/tracking.lib.php:926
-#: templates/columns_definitions/column_indexes.phtml:16
-#: templates/columns_definitions/table_fields_definitions.phtml:57
-#: templates/structure/check_all_table_column.phtml:30
-#: templates/structure/display_structure.phtml:79
-#: templates/structure/display_table_stats.phtml:19
-msgid "Index"
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1963
-#: libraries/controllers/StructureController.class.php:1968
-#: templates/columns_definitions/column_indexes.phtml:27
-#: templates/structure/check_all_table_column.phtml:37
-msgid "Spatial"
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1964
-#: libraries/controllers/StructureController.class.php:1969
-#: templates/columns_definitions/column_indexes.phtml:22
-#: templates/structure/check_all_table_column.phtml:47
-msgid "Fulltext"
-msgstr "పూర్తిపాఠ్యం"
-
-#: libraries/controllers/StructureController.class.php:1970
-#, fuzzy
-#| msgid "Use this value"
-msgid "Distinct values"
-msgstr "ఈ విలువని ఉపయోగించు"
-
 #: libraries/controllers/TableChartController.class.php:82
 #: libraries/controllers/TableGisVisualizationController.class.php:101
 msgid "No SQL query was set to fetch data."
@@ -8257,11 +8199,18 @@ msgstr ""
 msgid "No data to display"
 msgstr "భోగట్టా"
 
-#: libraries/controllers/TableRelationController.class.php:217
+#: libraries/controllers/TableIndexesController.class.php:161
+#: libraries/controllers/TableStructureController.class.php:736
+#: tbl_addfield.php:92
+#, php-format
+msgid "Table %1$s has been altered successfully."
+msgstr ""
+
+#: libraries/controllers/TableRelationController.class.php:218
 msgid "Display column was successfully updated."
 msgstr ""
 
-#: libraries/controllers/TableRelationController.class.php:283
+#: libraries/controllers/TableRelationController.class.php:288
 #, fuzzy
 #| msgid "Internal relations"
 msgid "Internal relations were successfully updated."
@@ -8282,10 +8231,77 @@ msgid "Zoom search"
 msgstr "శోధించు"
 
 #: libraries/controllers/TableSearchController.class.php:852
-#: templates/table/selection_form.phtml:59
+#: templates/table/search/selection_form.phtml:59
 msgid "Find and replace"
 msgstr ""
 
+#: libraries/controllers/TableStructureController.class.php:163
+#, php-format
+msgid "The name '%s' is a MySQL reserved keyword."
+msgid_plural "The names '%s' are MySQL reserved keywords."
+msgstr[0] ""
+msgstr[1] ""
+
+#: libraries/controllers/TableStructureController.class.php:241
+msgid "No column selected."
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:467
+#, fuzzy
+#| msgid "Database %s has been dropped."
+msgid "The columns have been moved successfully."
+msgstr "%s డేటాబేస్ తుడిచివేయడమైనది"
+
+#: libraries/controllers/TableStructureController.class.php:730
+#, fuzzy, php-format
+#| msgid "Database %s has been dropped."
+msgid ""
+"Table %1$s has been altered successfully. Privileges have been adjusted."
+msgstr "%s డేటాబేస్ తుడిచివేయడమైనది"
+
+#: libraries/controllers/TableStructureController.class.php:783
+#: libraries/tracking.lib.php:1094
+msgid "Query error"
+msgstr ""
+
+# మొదటి అనువాదము
+#: libraries/controllers/TableStructureController.class.php:948
+#: templates/table/structure/check_all_table_column.phtml:11
+msgid "Change"
+msgstr "మార్చుము"
+
+#: libraries/controllers/TableStructureController.class.php:952
+#: libraries/controllers/TableStructureController.class.php:957
+#: libraries/navigation/Nodes/Node_Index.class.php:30
+#: libraries/tracking.lib.php:926
+#: templates/columns_definitions/column_indexes.phtml:16
+#: templates/columns_definitions/table_fields_definitions.phtml:57
+#: templates/table/structure/check_all_table_column.phtml:30
+#: templates/table/structure/display_structure.phtml:79
+#: templates/table/structure/display_table_stats.phtml:19
+msgid "Index"
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:954
+#: libraries/controllers/TableStructureController.class.php:959
+#: templates/columns_definitions/column_indexes.phtml:27
+#: templates/table/structure/check_all_table_column.phtml:37
+msgid "Spatial"
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:955
+#: libraries/controllers/TableStructureController.class.php:960
+#: templates/columns_definitions/column_indexes.phtml:22
+#: templates/table/structure/check_all_table_column.phtml:47
+msgid "Fulltext"
+msgstr "పూర్తిపాఠ్యం"
+
+#: libraries/controllers/TableStructureController.class.php:963
+#, fuzzy
+#| msgid "Use this value"
+msgid "Distinct values"
+msgstr "ఈ విలువని ఉపయోగించు"
+
 #: libraries/core.lib.php:306
 #, php-format
 msgid "The %s extension is missing. Please check your PHP configuration."
@@ -8330,7 +8346,7 @@ msgid "No Password"
 msgstr "సంకేతపదం లేదు"
 
 #: libraries/display_change_password.lib.php:68
-#: libraries/plugins/auth/AuthenticationCookie.class.php:199
+#: libraries/plugins/auth/AuthenticationCookie.class.php:187
 #: libraries/replication_gui.lib.php:422 libraries/replication_gui.lib.php:862
 #: libraries/server_privileges.lib.php:1640
 msgid "Password:"
@@ -9106,12 +9122,12 @@ msgid "Dump has been saved to file %s."
 msgstr ""
 
 #: libraries/import.lib.php:202 libraries/insert_edit.lib.php:124
-#: libraries/rte/rte_routines.lib.php:1353 libraries/sql.lib.php:1312
+#: libraries/rte/rte_routines.lib.php:1444 libraries/sql.lib.php:1306
 #: tbl_get_field.php:44
 msgid "MySQL returned an empty result set (i.e. zero rows)."
 msgstr ""
 
-#: libraries/import.lib.php:265 libraries/sql.lib.php:1326
+#: libraries/import.lib.php:265 libraries/sql.lib.php:1320
 msgid "[ROLLBACK occurred.]"
 msgstr ""
 
@@ -9178,14 +9194,14 @@ msgstr ""
 # మొదటి అనువాదము
 #: libraries/insert_edit.lib.php:233
 #: libraries/navigation/Nodes/Node_DatabaseChild.class.php:48
-#: templates/designer/table_list.phtml:40
+#: templates/database/designer/table_list.phtml:40
 msgid "Hide"
 msgstr "దాచు"
 
 #: libraries/insert_edit.lib.php:249
 #: libraries/navigation/Nodes/Node_Function.class.php:32
-#: libraries/rte/rte_routines.lib.php:1495
-#: templates/table/table_header.phtml:4
+#: libraries/rte/rte_routines.lib.php:1586
+#: templates/table/search/table_header.phtml:4
 msgid "Function"
 msgstr ""
 
@@ -9198,86 +9214,87 @@ msgstr ""
 msgid "Because of its length,<br /> this column might not be editable."
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1050
+#: libraries/insert_edit.lib.php:1048
 msgid "Binary - do not edit"
 msgstr ""
 
 # మొదటి అనువాదము
-#: libraries/insert_edit.lib.php:1176 libraries/server_privileges.lib.php:470
-#: templates/table/options.phtml:36
+#: libraries/insert_edit.lib.php:1174 libraries/server_privileges.lib.php:470
+#: templates/table/search/options.phtml:36
 msgid "Or"
 msgstr "లేదా"
 
-#: libraries/insert_edit.lib.php:1177
+#: libraries/insert_edit.lib.php:1175
 msgid "web server upload directory:"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1348 templates/table/input_box.phtml:49
+#: libraries/insert_edit.lib.php:1346
+#: templates/table/search/input_box.phtml:49
 msgid "Edit/Insert"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1398
+#: libraries/insert_edit.lib.php:1396
 #, php-format
 msgid "Continue insertion with %s rows"
 msgstr ""
 
 # మొదటి అనువాదము
-#: libraries/insert_edit.lib.php:1428
+#: libraries/insert_edit.lib.php:1426
 msgid "and then"
 msgstr "మరియు తరువాత"
 
-#: libraries/insert_edit.lib.php:1461
+#: libraries/insert_edit.lib.php:1459
 msgid "Insert as new row"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1464
+#: libraries/insert_edit.lib.php:1462
 msgid "Insert as new row and ignore errors"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1467
+#: libraries/insert_edit.lib.php:1465
 msgid "Show insert query"
 msgstr ""
 
 # మొదటి అనువాదము
-#: libraries/insert_edit.lib.php:1487
+#: libraries/insert_edit.lib.php:1485
 msgid "Go back to previous page"
 msgstr "మునుపటి పుటకు వెళ్ళు"
 
-#: libraries/insert_edit.lib.php:1490
+#: libraries/insert_edit.lib.php:1488
 msgid "Insert another new row"
 msgstr ""
 
 # మొదటి అనువాదము
-#: libraries/insert_edit.lib.php:1495
+#: libraries/insert_edit.lib.php:1493
 msgid "Go back to this page"
 msgstr "ఈ పుటకు తిరిగి వెళ్ళుము"
 
-#: libraries/insert_edit.lib.php:1518
+#: libraries/insert_edit.lib.php:1516
 msgid "Edit next row"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1540
+#: libraries/insert_edit.lib.php:1538
 msgid ""
 "Use TAB key to move from value to value, or CTRL+arrows to move anywhere"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1577 libraries/replication_gui.lib.php:542
-#: libraries/rte/rte_routines.lib.php:1497
+#: libraries/insert_edit.lib.php:1575 libraries/replication_gui.lib.php:542
+#: libraries/rte/rte_routines.lib.php:1588
 #: libraries/server_status_variables.lib.php:220
-#: templates/designer/having_query_panel.phtml:100
-#: templates/designer/options_panel.phtml:73
-#: templates/designer/options_panel.phtml:239
-#: templates/designer/where_query_panel.phtml:69
-#: templates/table/table_header.phtml:10
-#: templates/table/zoom_result_form.phtml:35
+#: templates/database/designer/having_query_panel.phtml:100
+#: templates/database/designer/options_panel.phtml:73
+#: templates/database/designer/options_panel.phtml:239
+#: templates/database/designer/where_query_panel.phtml:69
+#: templates/table/search/table_header.phtml:10
+#: templates/table/search/zoom_result_form.phtml:35
 msgid "Value"
 msgstr "విలువ"
 
-#: libraries/insert_edit.lib.php:1937 libraries/sql.lib.php:1309
+#: libraries/insert_edit.lib.php:1935 libraries/sql.lib.php:1303
 msgid "Showing SQL query"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1962 libraries/sql.lib.php:1287
+#: libraries/insert_edit.lib.php:1960 libraries/sql.lib.php:1281
 #, php-format
 msgid "Inserted row id: %1$d"
 msgstr ""
@@ -9731,7 +9748,7 @@ msgstr ""
 #: libraries/navigation/Nodes/Node_View_Container.class.php:26
 #: libraries/navigation/Nodes/Node_View_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:129
-#: templates/structure/show_create.phtml:30
+#: templates/database/structure/show_create.phtml:30
 #, fuzzy
 #| msgid "View"
 msgid "Views"
@@ -10043,7 +10060,7 @@ msgstr ""
 
 #: libraries/operations.lib.php:101 libraries/operations.lib.php:249
 #: libraries/operations.lib.php:869 libraries/operations.lib.php:963
-#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:907
+#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:998
 #: templates/columns_definitions/table_fields_definitions.phtml:47
 #, fuzzy
 #| msgid "Add a new User"
@@ -10138,22 +10155,22 @@ msgid "Switch to copied table"
 msgstr ""
 
 #: libraries/operations.lib.php:1360
-#: templates/structure/check_all_tables.phtml:18
+#: templates/database/structure/check_all_tables.phtml:18
 msgid "Table maintenance"
 msgstr ""
 
 #: libraries/operations.lib.php:1398
-#: templates/structure/check_all_tables.phtml:19
+#: templates/database/structure/check_all_tables.phtml:19
 msgid "Analyze table"
 msgstr ""
 
 #: libraries/operations.lib.php:1413
-#: templates/structure/check_all_tables.phtml:20
+#: templates/database/structure/check_all_tables.phtml:20
 msgid "Check table"
 msgstr ""
 
 #: libraries/operations.lib.php:1428
-#: templates/structure/check_all_tables.phtml:22
+#: templates/database/structure/check_all_tables.phtml:22
 #, fuzzy
 #| msgid "Use Tables"
 msgid "Checksum table"
@@ -10173,18 +10190,19 @@ msgid "Flush the table (FLUSH)"
 msgstr ""
 
 #: libraries/operations.lib.php:1477
-#: templates/structure/check_all_tables.phtml:23
-#: templates/structure/display_table_stats.phtml:56
+#: templates/database/structure/check_all_tables.phtml:23
+#: templates/table/structure/display_table_stats.phtml:56
 msgid "Optimize table"
 msgstr ""
 
 #: libraries/operations.lib.php:1492
-#: templates/structure/check_all_tables.phtml:24
+#: templates/database/structure/check_all_tables.phtml:24
 msgid "Repair table"
 msgstr ""
 
 #: libraries/operations.lib.php:1538
-#: templates/structure/check_all_tables.phtml:14 view_operations.php:127
+#: templates/database/structure/check_all_tables.phtml:14
+#: view_operations.php:127
 msgid "Delete data or table"
 msgstr ""
 
@@ -10310,7 +10328,7 @@ msgid "Cannot connect: invalid settings."
 msgstr ""
 
 #: libraries/plugins/auth/AuthenticationConfig.class.php:108
-#: libraries/plugins/auth/AuthenticationCookie.class.php:134
+#: libraries/plugins/auth/AuthenticationCookie.class.php:122
 #: libraries/plugins/auth/AuthenticationHttp.class.php:96
 #, php-format
 msgid "Welcome to %s"
@@ -10335,40 +10353,40 @@ msgstr ""
 msgid "Retry to connect"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:146
+#: libraries/plugins/auth/AuthenticationCookie.class.php:134
 msgid "Your session has expired. Please log in again."
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:170
+#: libraries/plugins/auth/AuthenticationCookie.class.php:158
 msgid "Log in"
 msgstr "ప్రవేశించు"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:178
-#: libraries/plugins/auth/AuthenticationCookie.class.php:188
+#: libraries/plugins/auth/AuthenticationCookie.class.php:166
+#: libraries/plugins/auth/AuthenticationCookie.class.php:176
 msgid "You can enter hostname/IP address and port separated by space."
 msgstr ""
 
 # మొదటి అనువాదము
-#: libraries/plugins/auth/AuthenticationCookie.class.php:193
+#: libraries/plugins/auth/AuthenticationCookie.class.php:181
 msgid "Username:"
 msgstr "వాడుకరి పేరు:"
 
 # మొదటి అనువాదము
-#: libraries/plugins/auth/AuthenticationCookie.class.php:205
+#: libraries/plugins/auth/AuthenticationCookie.class.php:193
 #, fuzzy
 #| msgid "Remove database"
 msgid "Server Choice:"
 msgstr "డేటాబేస్ తొలగించండి"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:386
+#: libraries/plugins/auth/AuthenticationCookie.class.php:374
 msgid "Entered captcha is wrong, try again!"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:396
+#: libraries/plugins/auth/AuthenticationCookie.class.php:384
 msgid "Please enter correct captcha!"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:423
+#: libraries/plugins/auth/AuthenticationCookie.class.php:411
 msgid "You are not allowed to log in to this MySQL server!"
 msgstr ""
 
@@ -10466,7 +10484,7 @@ msgstr ""
 #: libraries/plugins/export/ExportOdt.class.php:593
 #: libraries/plugins/export/ExportTexytext.class.php:428
 #: libraries/plugins/export/PMA_ExportPdf.class.php:313
-#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:984
 #: libraries/rte/rte_triggers.lib.php:377
 #, fuzzy
 #| msgid "Description"
@@ -10808,7 +10826,7 @@ msgstr "చివరి చూపు"
 
 # మొదటి అనువాదము
 #: libraries/plugins/export/ExportSql.class.php:1399
-#: templates/structure/structure_table_row.phtml:183
+#: templates/database/structure/structure_table_row.phtml:183
 msgid "in use"
 msgstr "వాడుకలో ఉన్నది"
 
@@ -10998,18 +11016,14 @@ msgstr ""
 msgid "The imported file does not contain any data!"
 msgstr ""
 
-#: libraries/plugins/import/ImportSql.class.php:169
+#: libraries/plugins/import/ImportSql.class.php:72
 msgid "SQL compatibility mode:"
 msgstr ""
 
-#: libraries/plugins/import/ImportSql.class.php:181
+#: libraries/plugins/import/ImportSql.class.php:84
 msgid "Do not use <code>AUTO_INCREMENT</code> for zero values"
 msgstr ""
 
-#: libraries/plugins/import/ImportSql.class.php:195
-msgid "Read as multibytes"
-msgstr ""
-
 #: libraries/plugins/import/ImportXml.class.php:54
 msgid "XML"
 msgstr ""
@@ -11054,7 +11068,7 @@ msgid "Show grid"
 msgstr ""
 
 #: libraries/plugins/schema/SchemaPdf.class.php:94
-#: templates/structure/print_view_data_dictionary_link.phtml:6
+#: templates/database/structure/print_view_data_dictionary_link.phtml:6
 msgid "Data Dictionary"
 msgstr ""
 
@@ -11085,7 +11099,7 @@ msgid "The %s table doesn't exist!"
 msgstr ""
 
 #: libraries/plugins/schema/eps/Eps_Relation_Schema.class.php:321
-#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:309
+#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:323
 #, php-format
 msgid "Schema of the %s database - Page %s"
 msgstr ""
@@ -11116,7 +11130,7 @@ msgstr "విషయ సూచిక"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1005
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1028
 #: libraries/tracking.lib.php:884
-#: templates/structure/table_structure_header.phtml:11
+#: templates/table/structure/table_structure_header.phtml:11
 msgid "Extra"
 msgstr ""
 
@@ -11447,51 +11461,51 @@ msgstr ""
 msgid "Create the needed tables with the <code>%screate_tables.sql</code>."
 msgstr ""
 
-#: libraries/relation.lib.php:360
+#: libraries/relation.lib.php:357
 msgid "Create a pma user and give access to these tables."
 msgstr ""
 
-#: libraries/relation.lib.php:365
+#: libraries/relation.lib.php:360
 msgid ""
 "Enable advanced features in configuration file (<code>config.inc.php</"
 "code>), for example by starting from <code>config.sample.inc.php</code>."
 msgstr ""
 
-#: libraries/relation.lib.php:373
+#: libraries/relation.lib.php:365
 msgid "Re-login to phpMyAdmin to load the updated configuration file."
 msgstr ""
 
-#: libraries/relation.lib.php:1612
+#: libraries/relation.lib.php:1607
 msgid "no description"
 msgstr "వివరణ లేదు"
 
-#: libraries/relation.lib.php:1811
+#: libraries/relation.lib.php:1806
 msgid ""
 "You do not have necessary privileges to create a database named "
 "'phpmyadmin'. You may go to 'Operations' tab of any database to set up the "
 "phpMyAdmin configuration storage there."
 msgstr ""
 
-#: libraries/relation.lib.php:1928
+#: libraries/relation.lib.php:1923
 #, php-format
 msgid ""
 "%sCreate%s a database named 'phpmyadmin' and setup the phpMyAdmin "
 "configuration storage there."
 msgstr ""
 
-#: libraries/relation.lib.php:1936
+#: libraries/relation.lib.php:1931
 #, php-format
 msgid ""
 "%sCreate%s the phpMyAdmin configuration storage in the current database."
 msgstr ""
 
-#: libraries/relation.lib.php:1944
+#: libraries/relation.lib.php:1939
 #, php-format
 msgid "%sCreate%s missing phpMyAdmin configuration storage tables."
 msgstr ""
 
 #: libraries/replication_gui.lib.php:46 libraries/replication_gui.lib.php:343
-#: libraries/server_databases.lib.php:387
+#: libraries/server_databases.lib.php:398
 msgid "Master replication"
 msgstr ""
 
@@ -11546,7 +11560,7 @@ msgid ""
 msgstr ""
 
 #: libraries/replication_gui.lib.php:141
-#: libraries/server_databases.lib.php:389
+#: libraries/server_databases.lib.php:400
 msgid "Slave replication"
 msgstr ""
 
@@ -11819,10 +11833,10 @@ msgid "Master server changed successfully to %s."
 msgstr ""
 
 #: libraries/rte/rte_events.lib.php:106 libraries/rte/rte_events.lib.php:115
-#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:149
-#: libraries/rte/rte_routines.lib.php:158
-#: libraries/rte/rte_routines.lib.php:231
-#: libraries/rte/rte_routines.lib.php:1362
+#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:219
+#: libraries/rte/rte_routines.lib.php:246
+#: libraries/rte/rte_routines.lib.php:368
+#: libraries/rte/rte_routines.lib.php:1453
 #: libraries/rte/rte_triggers.lib.php:82 libraries/rte/rte_triggers.lib.php:91
 #: libraries/rte/rte_triggers.lib.php:123
 #, php-format
@@ -11846,7 +11860,7 @@ msgstr "%s డేటాబేస్ తుడిచివేయడమైనద
 msgid "Event %1$s has been created."
 msgstr "పుటను సృష్టించడమైనది"
 
-#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:251
+#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:266
 #: libraries/rte/rte_triggers.lib.php:144
 msgid "One or more errors have occurred while processing your request:"
 msgstr ""
@@ -11857,7 +11871,7 @@ msgstr ""
 msgid "Edit event"
 msgstr "క్రొత్త వాడుకరిని చేర్చు"
 
-#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:794
+#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:885
 #: libraries/rte/rte_triggers.lib.php:323 view_create.php:180
 #, fuzzy
 #| msgid "Details…"
@@ -11875,7 +11889,7 @@ msgid "Event type"
 msgstr ""
 
 # మొదటి అనువాదము
-#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:817
+#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:908
 #, fuzzy, php-format
 #| msgid "Change"
 msgid "Change to %s"
@@ -11907,12 +11921,14 @@ msgstr "ముగింపు"
 msgid "On completion preserve"
 msgstr ""
 
-#: libraries/rte/rte_events.lib.php:491 libraries/rte/rte_routines.lib.php:930
+#: libraries/rte/rte_events.lib.php:491
+#: libraries/rte/rte_routines.lib.php:1021
 #: libraries/rte/rte_triggers.lib.php:383 view_create.php:209
 msgid "Definer"
 msgstr ""
 
-#: libraries/rte/rte_events.lib.php:535 libraries/rte/rte_routines.lib.php:997
+#: libraries/rte/rte_events.lib.php:535
+#: libraries/rte/rte_routines.lib.php:1088
 #: libraries/rte/rte_triggers.lib.php:422
 msgid "The definer must be in the \"username@hostname\" format!"
 msgstr ""
@@ -11938,9 +11954,9 @@ msgid "You must provide an event definition."
 msgstr ""
 
 #: libraries/rte/rte_export.lib.php:43 libraries/rte/rte_general.lib.php:72
-#: libraries/rte/rte_routines.lib.php:345
-#: libraries/rte/rte_routines.lib.php:1198
-#: libraries/rte/rte_routines.lib.php:1411
+#: libraries/rte/rte_routines.lib.php:153
+#: libraries/rte/rte_routines.lib.php:1289
+#: libraries/rte/rte_routines.lib.php:1502
 msgid "Error in processing request:"
 msgstr ""
 
@@ -11974,149 +11990,149 @@ msgid ""
 "problems."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:110
-#: libraries/rte/rte_routines.lib.php:1006
+#: libraries/rte/rte_routines.lib.php:123
+msgid "Edit routine"
+msgstr ""
+
+#: libraries/rte/rte_routines.lib.php:200
+#: libraries/rte/rte_routines.lib.php:1097
 #, php-format
 msgid "Invalid routine type: \"%s\""
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:170
-msgid "Sorry, we failed to restore the dropped routine."
-msgstr ""
-
-#: libraries/rte/rte_routines.lib.php:211
-#, fuzzy, php-format
-#| msgid "Database %s has been dropped."
-msgid "Routine %1$s has been modified. Privileges have been adjusted."
-msgstr "%s డేటాబేస్ తుడిచివేయడమైనది"
-
-#: libraries/rte/rte_routines.lib.php:216
-#, fuzzy, php-format
-#| msgid "Database %s has been dropped."
-msgid "Routine %1$s has been modified."
-msgstr "%s డేటాబేస్ తుడిచివేయడమైనది"
-
 # మొదటి అనువాదము
-#: libraries/rte/rte_routines.lib.php:238
+#: libraries/rte/rte_routines.lib.php:253
 #, fuzzy, php-format
 #| msgid "Page has been created."
 msgid "Routine %1$s has been created."
 msgstr "పుటను సృష్టించడమైనది"
 
-#: libraries/rte/rte_routines.lib.php:315
-msgid "Edit routine"
+#: libraries/rte/rte_routines.lib.php:380
+msgid "Sorry, we failed to restore the dropped routine."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:797
+#: libraries/rte/rte_routines.lib.php:439
+#, fuzzy, php-format
+#| msgid "Database %s has been dropped."
+msgid "Routine %1$s has been modified. Privileges have been adjusted."
+msgstr "%s డేటాబేస్ తుడిచివేయడమైనది"
+
+#: libraries/rte/rte_routines.lib.php:444
+#, fuzzy, php-format
+#| msgid "Database %s has been dropped."
+msgid "Routine %1$s has been modified."
+msgstr "%s డేటాబేస్ తుడిచివేయడమైనది"
+
+#: libraries/rte/rte_routines.lib.php:888
 #, fuzzy
 #| msgid "Comments"
 msgid "Routine name"
 msgstr "వ్యాఖ్యలు"
 
-#: libraries/rte/rte_routines.lib.php:823
+#: libraries/rte/rte_routines.lib.php:914
 msgid "Parameters"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:829
+#: libraries/rte/rte_routines.lib.php:920
 #, fuzzy
 #| msgid "Direct links"
 msgid "Direction"
 msgstr "నేరు లంకెలు"
 
-#: libraries/rte/rte_routines.lib.php:847
+#: libraries/rte/rte_routines.lib.php:938
 msgid "Add parameter"
 msgstr ""
 
 # మొదటి అనువాదము
-#: libraries/rte/rte_routines.lib.php:851
+#: libraries/rte/rte_routines.lib.php:942
 #, fuzzy
 #| msgid "Remove database"
 msgid "Remove last parameter"
 msgstr "డేటాబేస్ తొలగించండి"
 
-#: libraries/rte/rte_routines.lib.php:856
+#: libraries/rte/rte_routines.lib.php:947
 msgid "Return type"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:862
+#: libraries/rte/rte_routines.lib.php:953
 #, fuzzy
 #| msgid "Length/Values"
 msgid "Return length/values"
 msgstr "పొడవు/విలువలు"
 
-#: libraries/rte/rte_routines.lib.php:868
+#: libraries/rte/rte_routines.lib.php:959
 #, fuzzy
 #| msgid "Table options"
 msgid "Return options"
 msgstr "పట్టిక ఎంపికలు"
 
-#: libraries/rte/rte_routines.lib.php:899
+#: libraries/rte/rte_routines.lib.php:990
 msgid "Is deterministic"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:920
+#: libraries/rte/rte_routines.lib.php:1011
 msgid ""
 "You do not have sufficient privileges to perform this operation; Please "
 "refer to the documentation for more details"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:935
+#: libraries/rte/rte_routines.lib.php:1026
 #, fuzzy
 #| msgid "Security"
 msgid "Security type"
 msgstr "భద్రత"
 
-#: libraries/rte/rte_routines.lib.php:944
+#: libraries/rte/rte_routines.lib.php:1035
 msgid "SQL data access"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1013
+#: libraries/rte/rte_routines.lib.php:1104
 msgid "You must provide a routine name!"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1047
+#: libraries/rte/rte_routines.lib.php:1138
 #, php-format
 msgid "Invalid direction \"%s\" given for parameter."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1069
-#: libraries/rte/rte_routines.lib.php:1131
+#: libraries/rte/rte_routines.lib.php:1160
+#: libraries/rte/rte_routines.lib.php:1222
 msgid ""
 "You must provide length/values for routine parameters of type ENUM, SET, "
 "VARCHAR and VARBINARY."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1095
+#: libraries/rte/rte_routines.lib.php:1186
 msgid "You must provide a name and a type for each routine parameter."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1114
+#: libraries/rte/rte_routines.lib.php:1205
 msgid "You must provide a valid return type for the routine."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1174
+#: libraries/rte/rte_routines.lib.php:1265
 msgid "You must provide a routine definition."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1285
+#: libraries/rte/rte_routines.lib.php:1376
 #, php-format
 msgid "Execution results of routine %s"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1340
+#: libraries/rte/rte_routines.lib.php:1431
 #, php-format
 msgid "%d row affected by the last statement inside the procedure."
 msgid_plural "%d rows affected by the last statement inside the procedure."
 msgstr[0] ""
 msgstr[1] ""
 
-#: libraries/rte/rte_routines.lib.php:1398
-#: libraries/rte/rte_routines.lib.php:1406
+#: libraries/rte/rte_routines.lib.php:1489
+#: libraries/rte/rte_routines.lib.php:1497
 msgid "Execute routine"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1485
-#: libraries/rte/rte_routines.lib.php:1488
+#: libraries/rte/rte_routines.lib.php:1576
+#: libraries/rte/rte_routines.lib.php:1579
 msgid "Routine parameters"
 msgstr ""
 
@@ -12296,7 +12312,7 @@ msgid "Original position"
 msgstr "అసలు స్థానం"
 
 #: libraries/server_bin_log.lib.php:133
-#: templates/structure/display_table_stats.phtml:4
+#: templates/table/structure/display_table_stats.phtml:4
 msgid "Information"
 msgstr "సమాచారం"
 
@@ -12332,12 +12348,12 @@ msgid ""
 "between the web server and the MySQL server."
 msgstr ""
 
-#: libraries/server_databases.lib.php:364
-#: libraries/server_databases.lib.php:365
+#: libraries/server_databases.lib.php:366
+#: libraries/server_databases.lib.php:371
 msgid "Enable Statistics"
 msgstr "గణాంకాలని చేతనంచేయి"
 
-#: libraries/server_databases.lib.php:481
+#: libraries/server_databases.lib.php:492
 #, fuzzy, php-format
 #| msgid "Database %s has been dropped."
 msgid "%1$d database has been dropped successfully."
@@ -12707,7 +12723,7 @@ msgstr ""
 
 # మొదటి అనువాదము
 #: libraries/server_privileges.lib.php:2059
-#: libraries/server_privileges.lib.php:4290
+#: libraries/server_privileges.lib.php:4316
 #, fuzzy
 #| msgid "Any user"
 msgid "Add user account"
@@ -12880,59 +12896,59 @@ msgstr ""
 msgid "The privileges were reloaded successfully."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:3994
+#: libraries/server_privileges.lib.php:4003
 #, php-format
 msgid "The user %s already exists!"
 msgstr "%s అనే వాడుకరి ఇప్పటికే ఉన్నారు!"
 
-#: libraries/server_privileges.lib.php:4232
+#: libraries/server_privileges.lib.php:4258
 #, php-format
 msgid "Privileges for %s"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4241
+#: libraries/server_privileges.lib.php:4267
 #: libraries/server_status_processes.lib.php:72
 #: libraries/server_user_groups.lib.php:39
 msgid "User"
 msgstr "వాడుకరి"
 
-#: libraries/server_privileges.lib.php:4282
+#: libraries/server_privileges.lib.php:4308
 msgctxt "Create new user"
 msgid "New"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4311
+#: libraries/server_privileges.lib.php:4337
 #, fuzzy
 #| msgid "Add a new User"
 msgid "Edit privileges:"
 msgstr "క్రొత్త వాడుకరిని చేర్చు"
 
-#: libraries/server_privileges.lib.php:4312
+#: libraries/server_privileges.lib.php:4338
 #, fuzzy
 #| msgid "User"
 msgid "User account"
 msgstr "వాడుకరి"
 
-#: libraries/server_privileges.lib.php:4371
+#: libraries/server_privileges.lib.php:4397
 msgid ""
 "Note: You are attempting to edit privileges of the user with which you are "
 "currently logged in."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4391 libraries/server_users.lib.php:25
+#: libraries/server_privileges.lib.php:4417 libraries/server_users.lib.php:25
 #, fuzzy
 #| msgid "Overview"
 msgid "User accounts overview"
 msgstr "అవలోకనం"
 
-#: libraries/server_privileges.lib.php:4459
+#: libraries/server_privileges.lib.php:4485
 msgid ""
 "A user account allowing any user from localhost to connect is present. This "
 "will prevent other users from connecting if the host part of their account "
 "allows a connection from any (%) host."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4500
+#: libraries/server_privileges.lib.php:4526
 #, php-format
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
@@ -12941,7 +12957,7 @@ msgid ""
 "%sreload the privileges%s before you continue."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4519
+#: libraries/server_privileges.lib.php:4545
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
 "tables. The content of these tables may differ from the privileges the "
@@ -12950,65 +12966,65 @@ msgid ""
 "privilege."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4569
+#: libraries/server_privileges.lib.php:4595
 msgid "The selected user was not found in the privilege table."
 msgstr ""
 
 # మొదటి అనువాదము
-#: libraries/server_privileges.lib.php:4801
+#: libraries/server_privileges.lib.php:4827
 msgid "You have added a new user."
 msgstr "మీరు క్రొత్త వాడుకరిని చేర్చారు."
 
-#: libraries/server_status.lib.php:53
+#: libraries/server_status.lib.php:60
 #, php-format
 msgid "Network traffic since startup: %s"
 msgstr ""
 
-#: libraries/server_status.lib.php:66
+#: libraries/server_status.lib.php:73
 #, php-format
 msgid "This MySQL server has been running for %1$s. It started up on %2$s."
 msgstr ""
 
-#: libraries/server_status.lib.php:80
+#: libraries/server_status.lib.php:94
 msgid ""
 "This MySQL server works as <b>master</b> and <b>slave</b> in <b>replication</"
 "b> process."
 msgstr ""
 
-#: libraries/server_status.lib.php:85
+#: libraries/server_status.lib.php:99
 msgid "This MySQL server works as <b>master</b> in <b>replication</b> process."
 msgstr ""
 
-#: libraries/server_status.lib.php:90
+#: libraries/server_status.lib.php:104
 msgid "This MySQL server works as <b>slave</b> in <b>replication</b> process."
 msgstr ""
 
-#: libraries/server_status.lib.php:106
+#: libraries/server_status.lib.php:116
 msgid "Replication status"
 msgstr ""
 
-#: libraries/server_status.lib.php:137
+#: libraries/server_status.lib.php:146
 msgid ""
 "On a busy server, the byte counters may overrun, so those statistics as "
 "reported by the MySQL server may be incorrect."
 msgstr ""
 
-#: libraries/server_status.lib.php:148
+#: libraries/server_status.lib.php:157
 msgid "Received"
 msgstr ""
 
 # మొదటి అనువాదము
-#: libraries/server_status.lib.php:167
+#: libraries/server_status.lib.php:176
 msgid "Sent"
 msgstr "పంపించు"
 
-#: libraries/server_status.lib.php:234
+#: libraries/server_status.lib.php:243
 #, fuzzy
 #| msgid "Connections"
 msgid "Max. concurrent connections"
 msgstr "అనుసంధానాలు"
 
-#: libraries/server_status.lib.php:244
+#: libraries/server_status.lib.php:253
 msgid "Failed attempts"
 msgstr ""
 
@@ -13982,7 +13998,7 @@ msgstr ""
 msgid "Not implemented yet."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/AlterOperation.php:193
+#: libraries/sql-parser/src/Components/AlterOperation.php:191
 msgid "Unrecognized alter operation."
 msgstr ""
 
@@ -13996,7 +14012,7 @@ msgid "An opening bracket followed by a set of values was expected."
 msgstr ""
 
 #: libraries/sql-parser/src/Components/ArrayObj.php:101
-#: libraries/sql-parser/src/Components/FieldDefinition.php:202
+#: libraries/sql-parser/src/Components/CreateDefinition.php:202
 msgid "An opening bracket was expected."
 msgstr ""
 
@@ -14004,25 +14020,35 @@ msgstr ""
 msgid "A comma or a closing bracket was expected"
 msgstr ""
 
+#: libraries/sql-parser/src/Components/CreateDefinition.php:246
+#, fuzzy
+#| msgid "Table name"
+msgid "A comma or a closing bracket was expected."
+msgstr "పట్టిక పేరు"
+
+#: libraries/sql-parser/src/Components/CreateDefinition.php:262
+msgid "A closing bracket was expected."
+msgstr ""
+
 #: libraries/sql-parser/src/Components/DataType.php:125
 msgid "Unrecognized data type."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:225
+#: libraries/sql-parser/src/Components/Expression.php:227
 msgid "Unexpected closing bracket."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:246
-#: libraries/sql-parser/src/Components/Expression.php:283
-#: libraries/sql-parser/src/Components/Expression.php:303
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:285
+#: libraries/sql-parser/src/Components/Expression.php:305
 msgid "An alias was previously found."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:257
+#: libraries/sql-parser/src/Components/Expression.php:259
 msgid "Unexpected dot."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:327
+#: libraries/sql-parser/src/Components/Expression.php:329
 #, fuzzy
 #| msgid "Table name"
 msgid "An alias was expected."
@@ -14034,16 +14060,6 @@ msgstr "పట్టిక పేరు"
 msgid "An expression was expected."
 msgstr "పట్టిక పేరు"
 
-#: libraries/sql-parser/src/Components/FieldDefinition.php:246
-#, fuzzy
-#| msgid "Table name"
-msgid "A comma or a closing bracket was expected."
-msgstr "పట్టిక పేరు"
-
-#: libraries/sql-parser/src/Components/FieldDefinition.php:262
-msgid "A closing bracket was expected."
-msgstr ""
-
 #: libraries/sql-parser/src/Components/Limit.php:90
 #: libraries/sql-parser/src/Components/Limit.php:112
 msgid "An offset was expected."
@@ -14086,29 +14102,29 @@ msgid "Expected delimiter."
 msgstr ""
 
 # మొదటి అనువాదము
-#: libraries/sql-parser/src/Lexer.php:753
+#: libraries/sql-parser/src/Lexer.php:777
 #, fuzzy, php-format
 #| msgid "Page has been created."
 msgid "Ending quote %1$s was expected."
 msgstr "పుటను సృష్టించడమైనది"
 
-#: libraries/sql-parser/src/Lexer.php:789
+#: libraries/sql-parser/src/Lexer.php:813
 msgid "Variable name was expected."
 msgstr ""
 
 # మొదటి అనువాదము
-#: libraries/sql-parser/src/Parser.php:380
+#: libraries/sql-parser/src/Parser.php:391
 #, fuzzy
 #| msgctxt "short form"
 #| msgid "Create table"
 msgid "Unexpected beginning of statement."
 msgstr "పట్టికను సృష్టించు"
 
-#: libraries/sql-parser/src/Parser.php:399
+#: libraries/sql-parser/src/Parser.php:410
 msgid "Unrecognized statement type."
 msgstr ""
 
-#: libraries/sql-parser/src/Parser.php:479
+#: libraries/sql-parser/src/Parser.php:489
 msgid "No transaction was previously started."
 msgstr ""
 
@@ -14134,8 +14150,10 @@ msgid "The name of the entity was expected."
 msgstr ""
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:310
-msgid "At least one field definition was expected."
-msgstr ""
+#, fuzzy
+#| msgid "Database %s has been dropped."
+msgid "At least one column definition was expected."
+msgstr "%s డేటాబేస్ తుడిచివేయడమైనది"
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:329
 msgid "A \"RETURNS\" keyword was expected."
@@ -14206,25 +14224,25 @@ msgstr ""
 msgid "Using bookmark \"%s\" as default browse query."
 msgstr ""
 
-#: libraries/sql.lib.php:1306
+#: libraries/sql.lib.php:1300
 msgid "Showing as PHP code"
 msgstr ""
 
-#: libraries/sql.lib.php:1638
+#: libraries/sql.lib.php:1632
 #, php-format
 msgid ""
 "Current selection does not contain a unique column. Grid edit, checkbox, "
 "Edit, Copy and Delete features are not available. %s"
 msgstr ""
 
-#: libraries/sql.lib.php:1649
+#: libraries/sql.lib.php:1643
 #, php-format
 msgid ""
 "Current selection does not contain a unique column. Grid edit, Edit, Copy "
 "and Delete features may result in undesired behavior. %s"
 msgstr ""
 
-#: libraries/sql.lib.php:1688
+#: libraries/sql.lib.php:1682
 #, php-format
 msgid "Problems with indexes of table `%s`"
 msgstr ""
@@ -14389,7 +14407,7 @@ msgid "Version %s snapshot (SQL code)"
 msgstr ""
 
 #: libraries/tracking.lib.php:947
-#: templates/structure/table_structure_row.phtml:33
+#: templates/table/structure/table_structure_row.phtml:33
 msgctxt "None for default"
 msgid "None"
 msgstr "ఏమీలేదు"
@@ -14442,19 +14460,19 @@ msgstr "మరిన్ని అమరికలు"
 msgid "Version %1$s was created, tracking for %2$s is active."
 msgstr ""
 
-#: libraries/user_preferences.inc.php:29
+#: libraries/user_preferences.inc.php:30
 #, fuzzy
 #| msgid "Basic settings"
 msgid "Manage your settings"
 msgstr "ప్రాధమిక అమరికలు"
 
-#: libraries/user_preferences.inc.php:46 prefs_manage.php:307
+#: libraries/user_preferences.inc.php:54 prefs_manage.php:307
 #, fuzzy
 #| msgid "Server configuration"
 msgid "Configuration has been saved."
 msgstr "సేవకి స్వరూపణం"
 
-#: libraries/user_preferences.inc.php:66
+#: libraries/user_preferences.inc.php:74
 #, php-format
 msgid ""
 "Your preferences will be saved for current session only. Storing them "
@@ -14852,7 +14870,7 @@ msgstr ""
 
 # మొదటి అనువాదము
 #: templates/columns_definitions/move_column.phtml:12
-#: templates/structure/add_column.phtml:21
+#: templates/table/structure/add_column.phtml:21
 #, fuzzy, php-format
 #| msgid "After %s"
 msgid "after %s"
@@ -14922,231 +14940,338 @@ msgstr "సమాచారం"
 msgid "Input transformation options"
 msgstr "పట్టిక ఎంపికలు"
 
+#: templates/database/create_table.phtml:7
+#: templates/database/designer/side_menu.phtml:77
+#: templates/database/designer/side_menu.phtml:80
+msgid "Create table"
+msgstr ""
+
+#: templates/database/create_table.phtml:15
+msgid "Number of columns"
+msgstr ""
+
 # మొదటి అనువాదము
-#: templates/designer/aggregate_query_panel.phtml:22
-#: templates/designer/options_panel.phtml:100
+#: templates/database/designer/aggregate_query_panel.phtml:22
+#: templates/database/designer/options_panel.phtml:100
 #, fuzzy
 #| msgid "Create"
 msgid "Aggregate"
 msgstr "సృష్టించు"
 
-#: templates/designer/aggregate_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:61
-#: templates/designer/options_panel.phtml:106
-#: templates/designer/options_panel.phtml:170
-#: templates/designer/where_query_panel.phtml:30
-#: templates/table/table_header.phtml:9
+#: templates/database/designer/aggregate_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:61
+#: templates/database/designer/options_panel.phtml:106
+#: templates/database/designer/options_panel.phtml:170
+#: templates/database/designer/where_query_panel.phtml:30
+#: templates/table/search/table_header.phtml:9
 msgid "Operator"
 msgstr ""
 
-#: templates/designer/database_tables.phtml:29
+#: templates/database/designer/database_tables.phtml:29
 msgid "Toggle"
 msgstr ""
 
 # మొదటి అనువాదము
-#: templates/designer/database_tables.phtml:40
+#: templates/database/designer/database_tables.phtml:40
 #, fuzzy
 #| msgid "Database"
 msgid "See table structure"
 msgstr "డేటాబేస్"
 
-#: templates/designer/delete_relation_panel.phtml:21
+#: templates/database/designer/delete_relation_panel.phtml:21
 msgid "Delete relation"
 msgstr ""
 
-#: templates/designer/edit_delete_pages.phtml:7
+#: templates/database/designer/edit_delete_pages.phtml:7
 #, fuzzy
 #| msgid "Page titles"
 msgid "Page to open"
 msgstr "పుట శీర్షికలు"
 
-#: templates/designer/edit_delete_pages.phtml:7
+#: templates/database/designer/edit_delete_pages.phtml:7
 #, fuzzy
 #| msgid "Page titles"
 msgid "Page to delete"
 msgstr "పుట శీర్షికలు"
 
-#: templates/designer/having_query_panel.phtml:90
-#: templates/designer/options_panel.phtml:63
-#: templates/designer/options_panel.phtml:229
-#: templates/designer/where_query_panel.phtml:59
+#: templates/database/designer/having_query_panel.phtml:90
+#: templates/database/designer/options_panel.phtml:63
+#: templates/database/designer/options_panel.phtml:229
+#: templates/database/designer/where_query_panel.phtml:59
 msgid "Except"
 msgstr ""
 
-#: templates/designer/having_query_panel.phtml:102
-#: templates/designer/options_panel.phtml:75
-#: templates/designer/options_panel.phtml:241
-#: templates/designer/where_query_panel.phtml:71
+#: templates/database/designer/having_query_panel.phtml:102
+#: templates/database/designer/options_panel.phtml:75
+#: templates/database/designer/options_panel.phtml:241
+#: templates/database/designer/where_query_panel.phtml:71
 msgid "subquery"
 msgstr ""
 
-#: templates/designer/new_relation_panel.phtml:22
-#: templates/designer/side_menu.phtml:84 templates/designer/side_menu.phtml:87
+#: templates/database/designer/new_relation_panel.phtml:22
+#: templates/database/designer/side_menu.phtml:84
+#: templates/database/designer/side_menu.phtml:87
 msgid "Create relation"
 msgstr ""
 
-#: templates/designer/options_panel.phtml:34
-#: templates/designer/options_panel.phtml:200
+#: templates/database/designer/options_panel.phtml:34
+#: templates/database/designer/options_panel.phtml:200
 #, fuzzy
 #| msgid "Relations"
 msgid "Relation operator"
 msgstr "సంబంధాలు"
 
-#: templates/designer/options_panel.phtml:85
-#: templates/designer/rename_to_panel.phtml:23
+#: templates/database/designer/options_panel.phtml:85
+#: templates/database/designer/rename_to_panel.phtml:23
 msgid "Rename to"
 msgstr ""
 
-#: templates/designer/options_panel.phtml:91
-#: templates/designer/rename_to_panel.phtml:31
+#: templates/database/designer/options_panel.phtml:91
+#: templates/database/designer/rename_to_panel.phtml:31
 msgid "New name"
 msgstr "కొత్త పేరు"
 
-#: templates/designer/page_save_as.phtml:4
+#: templates/database/designer/page_save_as.phtml:4
 #, fuzzy
 #| msgid "Table name"
 msgid "Save to selected page"
 msgstr "పట్టిక పేరు"
 
 # మొదటి అనువాదము
-#: templates/designer/page_save_as.phtml:5
+#: templates/database/designer/page_save_as.phtml:5
 #, fuzzy
 #| msgid "Create a page"
 msgid "Create a page and save to it"
 msgstr "పుటని సృష్టించు"
 
-#: templates/designer/page_save_as.phtml:26
+#: templates/database/designer/page_save_as.phtml:26
 #, fuzzy
 #| msgid "New page name: "
 msgid "New page name"
 msgstr "కొత్త పుట పేరు: "
 
-#: templates/designer/page_selector.phtml:2
+#: templates/database/designer/page_selector.phtml:2
 msgid "Select page"
 msgstr ""
 
-#: templates/designer/query_details.phtml:10
+#: templates/database/designer/query_details.phtml:10
 msgid "Active options"
 msgstr "క్రియాశీల ఎంపికలు"
 
-#: templates/designer/schema_export.phtml:4
+#: templates/database/designer/schema_export.phtml:4
 msgid "Select Export Relational Type"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:19 templates/designer/side_menu.phtml:25
+#: templates/database/designer/side_menu.phtml:19
+#: templates/database/designer/side_menu.phtml:25
 #, fuzzy
 #| msgid "Show all"
 msgid "Show/Hide tables list"
 msgstr "అన్నీ చూపించు"
 
-#: templates/designer/side_menu.phtml:29 templates/designer/side_menu.phtml:35
-#: templates/designer/side_menu.phtml:36
+#: templates/database/designer/side_menu.phtml:29
+#: templates/database/designer/side_menu.phtml:35
+#: templates/database/designer/side_menu.phtml:36
 msgid "View in fullscreen"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:34
+#: templates/database/designer/side_menu.phtml:34
 msgid "Exit fullscreen"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:41 templates/designer/side_menu.phtml:45
+#: templates/database/designer/side_menu.phtml:41
+#: templates/database/designer/side_menu.phtml:45
 #, fuzzy
 #| msgid "New name"
 msgid "New page"
 msgstr "కొత్త పేరు"
 
-#: templates/designer/side_menu.phtml:70 templates/designer/side_menu.phtml:73
+#: templates/database/designer/side_menu.phtml:70
+#: templates/database/designer/side_menu.phtml:73
 #, fuzzy
 #| msgid "Delete"
 msgid "Delete pages"
 msgstr "తొలగించు"
 
-#: templates/designer/side_menu.phtml:77 templates/designer/side_menu.phtml:80
-#: templates/table/create_table.phtml:7
-msgid "Create table"
-msgstr ""
-
-#: templates/designer/side_menu.phtml:98
-#: templates/designer/side_menu.phtml:101
+#: templates/database/designer/side_menu.phtml:98
+#: templates/database/designer/side_menu.phtml:101
 msgid "Reload"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:107
-#: templates/designer/side_menu.phtml:110
+#: templates/database/designer/side_menu.phtml:107
+#: templates/database/designer/side_menu.phtml:110
 msgid "Help"
 msgstr "సహాయం"
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Angular links"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Direct links"
 msgstr "నేరు లంకెలు"
 
-#: templates/designer/side_menu.phtml:122
-#: templates/designer/side_menu.phtml:124
+#: templates/database/designer/side_menu.phtml:122
+#: templates/database/designer/side_menu.phtml:124
 msgid "Snap to grid"
 msgstr ""
 
 # మొదటి అనువాదము
-#: templates/designer/side_menu.phtml:128
-#: templates/designer/side_menu.phtml:134
+#: templates/database/designer/side_menu.phtml:128
+#: templates/database/designer/side_menu.phtml:134
 msgid "Small/Big All"
 msgstr "చిన్నవి / పెద్దవి అన్నియు"
 
-#: templates/designer/side_menu.phtml:138
-#: templates/designer/side_menu.phtml:141
+#: templates/database/designer/side_menu.phtml:138
+#: templates/database/designer/side_menu.phtml:141
 msgid "Toggle small/big"
 msgstr ""
 
 # మొదటి అనువాదము
-#: templates/designer/side_menu.phtml:145
-#: templates/designer/side_menu.phtml:148
+#: templates/database/designer/side_menu.phtml:145
+#: templates/database/designer/side_menu.phtml:148
 #, fuzzy
 #| msgid "Page creation failed"
 msgid "Toggle relation lines"
 msgstr "పుటని సృష్టించుటలో తప్పిదము జరిగినది"
 
-#: templates/designer/side_menu.phtml:153
-#: templates/designer/side_menu.phtml:156
+#: templates/database/designer/side_menu.phtml:153
+#: templates/database/designer/side_menu.phtml:156
 #, fuzzy
 #| msgid "Export"
 msgid "Export schema"
 msgstr "ఎగుమతి"
 
-#: templates/designer/side_menu.phtml:165
-#: templates/designer/side_menu.phtml:168
+#: templates/database/designer/side_menu.phtml:165
+#: templates/database/designer/side_menu.phtml:168
 msgid "Build Query"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:173
-#: templates/designer/side_menu.phtml:177
+#: templates/database/designer/side_menu.phtml:173
+#: templates/database/designer/side_menu.phtml:177
 msgid "Move Menu"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:181
-#: templates/designer/side_menu.phtml:186
+#: templates/database/designer/side_menu.phtml:181
+#: templates/database/designer/side_menu.phtml:186
 #, fuzzy
 #| msgid "Partial texts"
 msgid "Pin text"
 msgstr "పాక్షిక పాఠ్యాలు"
 
 # మొదటి అనువాదము
-#: templates/designer/table_list.phtml:4
+#: templates/database/designer/table_list.phtml:4
 msgid "Hide/Show all"
 msgstr "అన్నింటిని చూపుము/దాచుము"
 
-#: templates/designer/table_list.phtml:14
+#: templates/database/designer/table_list.phtml:14
 msgid "Hide/Show Tables with no relation"
 msgstr ""
 
-#: templates/designer/table_list.phtml:59
+#: templates/database/designer/table_list.phtml:59
 msgid "Number of tables:"
 msgstr ""
 
+#: templates/database/structure/body_for_table_summary.phtml:6
+#, php-format
+msgid "%s table"
+msgid_plural "%s tables"
+msgstr[0] "%s పట్టిక"
+msgstr[1] "%s పట్టికలు"
+
+# మొదటి అనువాదము
+#: templates/database/structure/body_for_table_summary.phtml:17
+msgid "Sum"
+msgstr "మొత్తము"
+
+#: templates/database/structure/check_all_tables.phtml:6
+msgid "Check tables having overhead"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:10
+#, fuzzy
+#| msgid "Show color"
+msgid "Show create"
+msgstr "రంగుని చూపించు"
+
+#: templates/database/structure/check_all_tables.phtml:27
+msgid "Prefix"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:28
+msgid "Add prefix to table"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:29
+#, fuzzy
+#| msgid "Display table filter"
+msgid "Replace table prefix"
+msgstr "పట్టిక వ్యాఖ్యలు"
+
+#: templates/database/structure/check_all_tables.phtml:30
+msgid "Copy table with prefix"
+msgstr ""
+
+# మొదటి అనువాదము
+#: templates/database/structure/check_all_tables.phtml:36
+#, fuzzy
+#| msgid "Add into comments"
+msgid "Add columns to central list"
+msgstr "స్పందనలకు చేర్చు"
+
+#: templates/database/structure/check_all_tables.phtml:37
+msgid "Remove columns from central list"
+msgstr ""
+
+# మొదటి అనువాదము
+#: templates/database/structure/check_all_tables.phtml:38
+#, fuzzy
+#| msgid "Add into comments"
+msgid "Make consistent with central list"
+msgstr "స్పందనలకు చేర్చు"
+
+#: templates/database/structure/favorite_anchor.phtml:12
+#, fuzzy
+#| msgid "Add a new User"
+msgid "Add to Favorites"
+msgstr "క్రొత్త వాడుకరిని చేర్చు"
+
+#: templates/database/structure/show_create.phtml:2
+msgid "Showing create queries"
+msgstr ""
+
+# మొదటి అనువాదము
+#: templates/database/structure/sortable_header.phtml:13
+msgid "Sort"
+msgstr "క్రమంలో పేర్చు"
+
+#: templates/database/structure/table_header.phtml:42
+msgid ""
+"May be approximate. Click on the number to get the exact count. See "
+"[doc@faq3-11]FAQ 3.11[/doc]."
+msgstr ""
+
+#: templates/database/structure/table_header.phtml:66
+#: templates/table/index_form.phtml:127
+msgid "Size"
+msgstr "పరిమాణం"
+
+#: templates/database/structure/table_header.phtml:74
+#: templates/table/structure/display_table_stats.phtml:27
+msgid "Overhead"
+msgstr ""
+
+#: templates/database/structure/tracking_icon.phtml:4
+msgid "Tracking is active."
+msgstr ""
+
+#: templates/database/structure/tracking_icon.phtml:8
+msgid "Tracking is not active."
+msgstr ""
+
 #: templates/error/report_form.phtml:7
 msgid ""
 "phpMyAdmin has encountered an error. We have collected data about this error "
@@ -15162,69 +15287,6 @@ msgstr ""
 msgid "Please explain the steps that lead to the error:"
 msgstr ""
 
-#: templates/gis_visualization/gis_visualization.phtml:3
-msgid "Display GIS Visualization"
-msgstr ""
-
-#: templates/gis_visualization/gis_visualization.phtml:8
-#, fuzzy
-#| msgid "Table comments"
-msgid "Label column"
-msgstr "పట్టిక వ్యాఖ్యలు"
-
-#: templates/gis_visualization/gis_visualization.phtml:11
-#, fuzzy
-#| msgid "- none -"
-msgid "-- None --"
-msgstr "- ఏమీలేదు -"
-
-#: templates/gis_visualization/gis_visualization.phtml:19
-#, fuzzy
-#| msgid "Total"
-msgid "Spatial column"
-msgstr "మొత్తం"
-
-#: templates/index_form.phtml:16
-msgid "Index name:"
-msgstr ""
-
-#: templates/index_form.phtml:19
-msgid ""
-"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
-msgstr ""
-
-#: templates/index_form.phtml:40
-msgid "Index choice:"
-msgstr ""
-
-#: templates/index_form.phtml:57
-msgid "Key block size:"
-msgstr ""
-
-#: templates/index_form.phtml:74
-msgid "Index type:"
-msgstr ""
-
-#: templates/index_form.phtml:86
-#, fuzzy
-#| msgid "User"
-msgid "Parser:"
-msgstr "వాడుకరి"
-
-#: templates/index_form.phtml:102
-#, fuzzy
-#| msgid "Comment"
-msgid "Comment:"
-msgstr "వ్యాఖ్య"
-
-#: templates/index_form.phtml:127 templates/structure/table_header.phtml:66
-msgid "Size"
-msgstr "పరిమాణం"
-
-#: templates/index_form.phtml:149 templates/index_form.phtml:190
-msgid "Drag to reorder"
-msgstr ""
-
 #: templates/prefs_autoload.phtml:9
 msgid ""
 "Your browser has phpMyAdmin configuration for this domain. Would you like to "
@@ -15237,310 +15299,7 @@ msgstr ""
 msgid "Start row:"
 msgstr "మొదలుపెట్టు"
 
-#: templates/structure/actions_in_table_structure.phtml:14
-#, php-format
-msgid "A primary key has been added on %s."
-msgstr ""
-
-#: templates/structure/actions_in_table_structure.phtml:34
-#: templates/structure/actions_in_table_structure.phtml:54
-#: templates/structure/actions_in_table_structure.phtml:79
-#: templates/structure/actions_in_table_structure.phtml:101
-#, php-format
-msgid "An index has been added on %s."
-msgstr ""
-
-# మొదటి అనువాదము
-#: templates/structure/actions_in_table_structure.phtml:130
-#: templates/structure/check_all_table_column.phtml:59
-#, fuzzy
-#| msgid "Remove database"
-msgid "Remove from central columns"
-msgstr "డేటాబేస్ తొలగించండి"
-
-# మొదటి అనువాదము
-#: templates/structure/actions_in_table_structure.phtml:138
-#: templates/structure/check_all_table_column.phtml:55
-#, fuzzy
-#| msgid "Add into comments"
-msgid "Add to central columns"
-msgstr "స్పందనలకు చేర్చు"
-
-# మొదటి అనువాదము
-#: templates/structure/add_column.phtml:7
-#, fuzzy, php-format
-#| msgid "Add into comments"
-msgid "Add %s column(s)"
-msgstr "స్పందనలకు చేర్చు"
-
-# మొదటి అనువాదము
-#: templates/structure/add_column.phtml:12
-#, fuzzy
-#| msgctxt "short form"
-#| msgid "Create table"
-msgid "at beginning of table"
-msgstr "పట్టికను సృష్టించు"
-
-#: templates/structure/body_for_table_summary.phtml:6
-#, php-format
-msgid "%s table"
-msgid_plural "%s tables"
-msgstr[0] "%s పట్టిక"
-msgstr[1] "%s పట్టికలు"
-
-# మొదటి అనువాదము
-#: templates/structure/body_for_table_summary.phtml:17
-msgid "Sum"
-msgstr "మొత్తము"
-
-#: templates/structure/check_all_tables.phtml:6
-msgid "Check tables having overhead"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:10
-#, fuzzy
-#| msgid "Show color"
-msgid "Show create"
-msgstr "రంగుని చూపించు"
-
-#: templates/structure/check_all_tables.phtml:27
-msgid "Prefix"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:28
-msgid "Add prefix to table"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:29
-#, fuzzy
-#| msgid "Display table filter"
-msgid "Replace table prefix"
-msgstr "పట్టిక వ్యాఖ్యలు"
-
-#: templates/structure/check_all_tables.phtml:30
-msgid "Copy table with prefix"
-msgstr ""
-
-# మొదటి అనువాదము
-#: templates/structure/check_all_tables.phtml:36
-#, fuzzy
-#| msgid "Add into comments"
-msgid "Add columns to central list"
-msgstr "స్పందనలకు చేర్చు"
-
-#: templates/structure/check_all_tables.phtml:37
-msgid "Remove columns from central list"
-msgstr ""
-
-# మొదటి అనువాదము
-#: templates/structure/check_all_tables.phtml:38
-#, fuzzy
-#| msgid "Add into comments"
-msgid "Make consistent with central list"
-msgstr "స్పందనలకు చేర్చు"
-
-#: templates/structure/display_structure.phtml:140 view_create.php:181
-#, fuzzy
-#| msgid "Add a new User"
-msgid "Edit view"
-msgstr "క్రొత్త వాడుకరిని చేర్చు"
-
-#: templates/structure/display_table_stats.phtml:9
-msgid "Space usage"
-msgstr ""
-
-#: templates/structure/display_table_stats.phtml:27
-#: templates/structure/table_header.phtml:74
-msgid "Overhead"
-msgstr ""
-
-#: templates/structure/display_table_stats.phtml:32
-msgid "Effective"
-msgstr ""
-
-#: templates/structure/favorite_anchor.phtml:12
-#, fuzzy
-#| msgid "Add a new User"
-msgid "Add to Favorites"
-msgstr "క్రొత్త వాడుకరిని చేర్చు"
-
-# మొదటి అనువాదము
-#: templates/structure/move_columns_dialog.phtml:1
-#: templates/structure/optional_action_links.phtml:21
-#, fuzzy
-#| msgid "Add into comments"
-msgid "Move columns"
-msgstr "స్పందనలకు చేర్చు"
-
-#: templates/structure/move_columns_dialog.phtml:2
-msgid "Move the columns by dragging them up and down."
-msgstr ""
-
-#: templates/structure/optional_action_links.phtml:9
-msgid "Propose table structure"
-msgstr ""
-
-# మొదటి అనువాదము
-#: templates/structure/optional_action_links.phtml:24
-#, fuzzy
-#| msgid "Database"
-msgid "Improve table structure"
-msgstr "డేటాబేస్"
-
-# మొదటి అనువాదము
-#: templates/structure/optional_action_links.phtml:30
-#, fuzzy
-#| msgid "Create"
-msgid "Track view"
-msgstr "సృష్టించు"
-
-#: templates/structure/row_stats_table.phtml:3
-#, fuzzy
-#| msgid "Row Statistics"
-msgid "Row statistics"
-msgstr "వరుసల గణాంకాలు"
-
-#: templates/structure/row_stats_table.phtml:9
-msgid "static"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:11
-msgid "dynamic"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:22
-msgid "partitioned"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:54
-msgid "Row length"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:66
-msgid "Row size"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:73
-msgid "Next autoindex"
-msgstr ""
-
-#: templates/structure/secondary_tabs.phtml:14
-#, fuzzy
-#| msgid "Relations"
-msgid "Relation view"
-msgstr "సంబంధాలు"
-
-#: templates/structure/show_create.phtml:2
-msgid "Showing create queries"
-msgstr ""
-
-# మొదటి అనువాదము
-#: templates/structure/sortable_header.phtml:13
-msgid "Sort"
-msgstr "క్రమంలో పేర్చు"
-
-#: templates/structure/table_header.phtml:42
-msgid ""
-"May be approximate. Click on the number to get the exact count. See "
-"[doc@faq3-11]FAQ 3.11[/doc]."
-msgstr ""
-
-#: templates/structure/table_structure_row.phtml:46
-#, php-format
-msgid "Column %s has been dropped."
-msgstr ""
-
-#: templates/structure/tracking_icon.phtml:4
-msgid "Tracking is active."
-msgstr ""
-
-#: templates/structure/tracking_icon.phtml:8
-msgid "Tracking is not active."
-msgstr ""
-
-#: templates/table/create_table.phtml:15
-msgid "Number of columns"
-msgstr ""
-
-#: templates/table/options.phtml:8
-msgid "Select columns (at least one):"
-msgstr ""
-
-#: templates/table/options.phtml:37
-msgid "Add search conditions (body of the \"where\" clause):"
-msgstr ""
-
-#: templates/table/options.phtml:45
-msgid "Number of rows per page"
-msgstr ""
-
-#: templates/table/options.phtml:56
-msgid "Display order:"
-msgstr ""
-
-#: templates/table/options_zoom.phtml:6
-msgid "Use this column to label each point"
-msgstr ""
-
-#: templates/table/options_zoom.phtml:35
-msgid "Maximum rows to plot"
-msgstr ""
-
-#: templates/table/replace_preview.phtml:13
-msgid "Find and replace - preview"
-msgstr ""
-
-#: templates/table/replace_preview.phtml:18
-#, fuzzy
-#| msgid "Original position"
-msgid "Original string"
-msgstr "అసలు స్థానం"
-
-#: templates/table/replace_preview.phtml:19
-#, fuzzy
-#| msgid "Relations"
-msgid "Replaced string"
-msgstr "సంబంధాలు"
-
-#: templates/table/replace_preview.phtml:40
-msgid "Replace"
-msgstr ""
-
-#: templates/table/rows_zoom.phtml:16
-msgid "Additional search criteria"
-msgstr ""
-
-#: templates/table/search_and_replace.phtml:3
-#, fuzzy
-#| msgid "Relations"
-msgid "Replace with:"
-msgstr "సంబంధాలు"
-
-#: templates/table/search_and_replace.phtml:22
-msgid "Use regular expression"
-msgstr ""
-
-#: templates/table/selection_form.phtml:12
-msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
-msgstr ""
-
-#: templates/table/selection_form.phtml:34
-msgid "Do a \"query by example\" (wildcard: \"%\")"
-msgstr ""
-
-#: templates/table/zoom_result_form.phtml:7
-msgid "Browse/Edit the points"
-msgstr ""
-
-#: templates/table/zoom_result_form.phtml:15
-msgid "How to use"
-msgstr ""
-
-#: templates/table/zoom_result_form.phtml:23
-msgid "Reset zoom"
-msgstr ""
-
-#: templates/tbl_chart.phtml:17
+#: templates/table/chart/tbl_chart.phtml:17
 #, fuzzy
 #| msgid "Mar"
 msgctxt "Chart type"
@@ -15548,169 +15307,435 @@ msgid "Bar"
 msgstr "మార్చి"
 
 # మొదటి అనువాదము
-#: templates/tbl_chart.phtml:21
+#: templates/table/chart/tbl_chart.phtml:21
 #, fuzzy
 #| msgid "Command"
 msgctxt "Chart type"
 msgid "Column"
 msgstr "ఆజ్ఞ"
 
-#: templates/tbl_chart.phtml:25
+#: templates/table/chart/tbl_chart.phtml:25
 msgctxt "Chart type"
 msgid "Line"
 msgstr ""
 
-#: templates/tbl_chart.phtml:29
+#: templates/table/chart/tbl_chart.phtml:29
 msgctxt "Chart type"
 msgid "Spline"
 msgstr ""
 
-#: templates/tbl_chart.phtml:33
+#: templates/table/chart/tbl_chart.phtml:33
 msgctxt "Chart type"
 msgid "Area"
 msgstr ""
 
-#: templates/tbl_chart.phtml:37
+#: templates/table/chart/tbl_chart.phtml:37
 #, fuzzy
 #| msgid "PiB"
 msgctxt "Chart type"
 msgid "Pie"
 msgstr "పిబై"
 
-#: templates/tbl_chart.phtml:41
+#: templates/table/chart/tbl_chart.phtml:41
 #, fuzzy
 #| msgid "Time"
 msgctxt "Chart type"
 msgid "Timeline"
 msgstr "సమయం"
 
-#: templates/tbl_chart.phtml:45
+#: templates/table/chart/tbl_chart.phtml:45
 msgctxt "Chart type"
 msgid "Scatter"
 msgstr ""
 
-#: templates/tbl_chart.phtml:50
+#: templates/table/chart/tbl_chart.phtml:50
 msgid "Stacked"
 msgstr ""
 
-#: templates/tbl_chart.phtml:53
+#: templates/table/chart/tbl_chart.phtml:53
 #, fuzzy
 #| msgid "Default title"
 msgid "Chart title"
 msgstr "అప్రమేయ శీర్షిక"
 
-#: templates/tbl_chart.phtml:57
+#: templates/table/chart/tbl_chart.phtml:57
 msgid "X-Axis:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:72
+#: templates/table/chart/tbl_chart.phtml:72
 msgid "Series:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:102
+#: templates/table/chart/tbl_chart.phtml:102
 msgid "X-Axis label:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:104
+#: templates/table/chart/tbl_chart.phtml:104
 #, fuzzy
 #| msgid "Value"
 msgid "X Values"
 msgstr "విలువ"
 
-#: templates/tbl_chart.phtml:107
+#: templates/table/chart/tbl_chart.phtml:107
 msgid "Y-Axis label:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:115
+#: templates/table/chart/tbl_chart.phtml:115
 msgid "Series names are in a column"
 msgstr ""
 
-#: templates/tbl_chart.phtml:118
+#: templates/table/chart/tbl_chart.phtml:118
 #, fuzzy
 #| msgid "Table comments"
 msgid "Series column:"
 msgstr "పట్టిక వ్యాఖ్యలు"
 
-#: templates/tbl_chart.phtml:130
+#: templates/table/chart/tbl_chart.phtml:130
 #, fuzzy
 #| msgid "Values for column %s"
 msgid "Value Column:"
 msgstr "%s నిలువు వరుసకు విలువలు"
 
-#: templates/tbl_chart.phtml:150
+#: templates/table/chart/tbl_chart.phtml:150
 msgid "Save chart as image"
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:7
+#: templates/table/gis_visualization/gis_visualization.phtml:3
+msgid "Display GIS Visualization"
+msgstr ""
+
+#: templates/table/gis_visualization/gis_visualization.phtml:8
+#, fuzzy
+#| msgid "Table comments"
+msgid "Label column"
+msgstr "పట్టిక వ్యాఖ్యలు"
+
+#: templates/table/gis_visualization/gis_visualization.phtml:11
+#, fuzzy
+#| msgid "- none -"
+msgid "-- None --"
+msgstr "- ఏమీలేదు -"
+
+#: templates/table/gis_visualization/gis_visualization.phtml:19
+#, fuzzy
+#| msgid "Total"
+msgid "Spatial column"
+msgstr "మొత్తం"
+
+#: templates/table/index_form.phtml:16
+msgid "Index name:"
+msgstr ""
+
+#: templates/table/index_form.phtml:19
+msgid ""
+"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
+msgstr ""
+
+#: templates/table/index_form.phtml:40
+msgid "Index choice:"
+msgstr ""
+
+#: templates/table/index_form.phtml:57
+msgid "Key block size:"
+msgstr ""
+
+#: templates/table/index_form.phtml:74
+msgid "Index type:"
+msgstr ""
+
+#: templates/table/index_form.phtml:86
+#, fuzzy
+#| msgid "User"
+msgid "Parser:"
+msgstr "వాడుకరి"
+
+#: templates/table/index_form.phtml:102
+#, fuzzy
+#| msgid "Comment"
+msgid "Comment:"
+msgstr "వ్యాఖ్య"
+
+#: templates/table/index_form.phtml:149 templates/table/index_form.phtml:190
+msgid "Drag to reorder"
+msgstr ""
+
+#: templates/table/relation/common_form.phtml:7
 msgid "Internal relations"
 msgstr "అంతర్గత సంబంధాలు"
 
-#: templates/tbl_relation/common_form.phtml:11
+#: templates/table/relation/common_form.phtml:11
 msgid "Internal relation"
 msgstr "అంతర్గత సంబంధం"
 
-#: templates/tbl_relation/common_form.phtml:14
+#: templates/table/relation/common_form.phtml:14
 msgid ""
 "An internal relation is not necessary when a corresponding FOREIGN KEY "
 "relation exists."
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:37
+#: templates/table/relation/common_form.phtml:37
 msgid "Foreign key constraints"
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:40
+#: templates/table/relation/common_form.phtml:40
 #, fuzzy
 #| msgid "Action"
 msgid "Actions"
 msgstr "చర్య"
 
-#: templates/tbl_relation/common_form.phtml:41
+#: templates/table/relation/common_form.phtml:41
 #, fuzzy
 #| msgid "Comments"
 msgid "Constraint properties"
 msgstr "వ్యాఖ్యలు"
 
-#: templates/tbl_relation/common_form.phtml:44
+#: templates/table/relation/common_form.phtml:44
 msgid ""
 "Only columns with index will be displayed. You can define an index below."
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:49
+#: templates/table/relation/common_form.phtml:49
 msgid "Foreign key constraint"
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:81
+#: templates/table/relation/common_form.phtml:81
 #, fuzzy
 #| msgid "Add a New User"
 msgid "+ Add constraint"
 msgstr "కొత్త వాడుకరిని చేర్చు"
 
-#: templates/tbl_relation/common_form.phtml:91
+#: templates/table/relation/common_form.phtml:91
 #, fuzzy
 #| msgid "data"
 msgid "Choose column to display:"
 msgstr "భోగట్టా"
 
-#: templates/tbl_relation/foreign_key_row.phtml:13
+#: templates/table/relation/foreign_key_row.phtml:13
 #, fuzzy, php-format
 #| msgid "Database %s has been dropped."
 msgid "Foreign key constraint %s has been dropped"
 msgstr "%s డేటాబేస్ తుడిచివేయడమైనది."
 
-#: templates/tbl_relation/foreign_key_row.phtml:102
+#: templates/table/relation/foreign_key_row.phtml:102
 #, fuzzy
 #| msgid "Comments"
 msgid "Constraint name"
 msgstr "వ్యాఖ్యలు"
 
 # మొదటి అనువాదము
-#: templates/tbl_relation/foreign_key_row.phtml:157
+#: templates/table/relation/foreign_key_row.phtml:157
 #, fuzzy
 #| msgid "Add into comments"
 msgid "+ Add column"
 msgstr "స్పందనలకు చేర్చు"
 
+#: templates/table/search/options.phtml:8
+msgid "Select columns (at least one):"
+msgstr ""
+
+#: templates/table/search/options.phtml:37
+msgid "Add search conditions (body of the \"where\" clause):"
+msgstr ""
+
+#: templates/table/search/options.phtml:45
+msgid "Number of rows per page"
+msgstr ""
+
+#: templates/table/search/options.phtml:56
+msgid "Display order:"
+msgstr ""
+
+#: templates/table/search/options_zoom.phtml:6
+msgid "Use this column to label each point"
+msgstr ""
+
+#: templates/table/search/options_zoom.phtml:35
+msgid "Maximum rows to plot"
+msgstr ""
+
+#: templates/table/search/replace_preview.phtml:13
+msgid "Find and replace - preview"
+msgstr ""
+
+#: templates/table/search/replace_preview.phtml:18
+#, fuzzy
+#| msgid "Original position"
+msgid "Original string"
+msgstr "అసలు స్థానం"
+
+#: templates/table/search/replace_preview.phtml:19
+#, fuzzy
+#| msgid "Relations"
+msgid "Replaced string"
+msgstr "సంబంధాలు"
+
+#: templates/table/search/replace_preview.phtml:40
+msgid "Replace"
+msgstr ""
+
+#: templates/table/search/rows_zoom.phtml:16
+msgid "Additional search criteria"
+msgstr ""
+
+#: templates/table/search/search_and_replace.phtml:3
+#, fuzzy
+#| msgid "Relations"
+msgid "Replace with:"
+msgstr "సంబంధాలు"
+
+#: templates/table/search/search_and_replace.phtml:22
+msgid "Use regular expression"
+msgstr ""
+
+#: templates/table/search/selection_form.phtml:12
+msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
+msgstr ""
+
+#: templates/table/search/selection_form.phtml:34
+msgid "Do a \"query by example\" (wildcard: \"%\")"
+msgstr ""
+
+#: templates/table/search/zoom_result_form.phtml:7
+msgid "Browse/Edit the points"
+msgstr ""
+
+#: templates/table/search/zoom_result_form.phtml:15
+msgid "How to use"
+msgstr ""
+
+#: templates/table/search/zoom_result_form.phtml:23
+msgid "Reset zoom"
+msgstr ""
+
+#: templates/table/secondary_tabs.phtml:14
+#, fuzzy
+#| msgid "Relations"
+msgid "Relation view"
+msgstr "సంబంధాలు"
+
+#: templates/table/structure/actions_in_table_structure.phtml:14
+#, php-format
+msgid "A primary key has been added on %s."
+msgstr ""
+
+#: templates/table/structure/actions_in_table_structure.phtml:34
+#: templates/table/structure/actions_in_table_structure.phtml:54
+#: templates/table/structure/actions_in_table_structure.phtml:79
+#: templates/table/structure/actions_in_table_structure.phtml:101
+#, php-format
+msgid "An index has been added on %s."
+msgstr ""
+
+# మొదటి అనువాదము
+#: templates/table/structure/actions_in_table_structure.phtml:130
+#: templates/table/structure/check_all_table_column.phtml:59
+#, fuzzy
+#| msgid "Remove database"
+msgid "Remove from central columns"
+msgstr "డేటాబేస్ తొలగించండి"
+
+# మొదటి అనువాదము
+#: templates/table/structure/actions_in_table_structure.phtml:138
+#: templates/table/structure/check_all_table_column.phtml:55
+#, fuzzy
+#| msgid "Add into comments"
+msgid "Add to central columns"
+msgstr "స్పందనలకు చేర్చు"
+
+# మొదటి అనువాదము
+#: templates/table/structure/add_column.phtml:7
+#, fuzzy, php-format
+#| msgid "Add into comments"
+msgid "Add %s column(s)"
+msgstr "స్పందనలకు చేర్చు"
+
+# మొదటి అనువాదము
+#: templates/table/structure/add_column.phtml:12
+#, fuzzy
+#| msgctxt "short form"
+#| msgid "Create table"
+msgid "at beginning of table"
+msgstr "పట్టికను సృష్టించు"
+
+#: templates/table/structure/display_structure.phtml:140 view_create.php:181
+#, fuzzy
+#| msgid "Add a new User"
+msgid "Edit view"
+msgstr "క్రొత్త వాడుకరిని చేర్చు"
+
+#: templates/table/structure/display_table_stats.phtml:9
+msgid "Space usage"
+msgstr ""
+
+#: templates/table/structure/display_table_stats.phtml:32
+msgid "Effective"
+msgstr ""
+
+# మొదటి అనువాదము
+#: templates/table/structure/move_columns_dialog.phtml:1
+#: templates/table/structure/optional_action_links.phtml:21
+#, fuzzy
+#| msgid "Add into comments"
+msgid "Move columns"
+msgstr "స్పందనలకు చేర్చు"
+
+#: templates/table/structure/move_columns_dialog.phtml:2
+msgid "Move the columns by dragging them up and down."
+msgstr ""
+
+#: templates/table/structure/optional_action_links.phtml:9
+msgid "Propose table structure"
+msgstr ""
+
+# మొదటి అనువాదము
+#: templates/table/structure/optional_action_links.phtml:24
+#, fuzzy
+#| msgid "Database"
+msgid "Improve table structure"
+msgstr "డేటాబేస్"
+
+# మొదటి అనువాదము
+#: templates/table/structure/optional_action_links.phtml:30
+#, fuzzy
+#| msgid "Create"
+msgid "Track view"
+msgstr "సృష్టించు"
+
+#: templates/table/structure/row_stats_table.phtml:3
+#, fuzzy
+#| msgid "Row Statistics"
+msgid "Row statistics"
+msgstr "వరుసల గణాంకాలు"
+
+#: templates/table/structure/row_stats_table.phtml:9
+msgid "static"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:11
+msgid "dynamic"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:22
+msgid "partitioned"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:54
+msgid "Row length"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:66
+msgid "Row size"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:73
+msgid "Next autoindex"
+msgstr ""
+
+#: templates/table/structure/table_structure_row.phtml:46
+#, php-format
+msgid "Column %s has been dropped."
+msgstr ""
+
 #: themes.php:17 themes.php:22
 msgid "Theme"
 msgstr ""
diff --git a/po/th.po b/po/th.po
index 0b6cf2f118..3237925635 100644
--- a/po/th.po
+++ b/po/th.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 4.5.0-dev\n"
 "Report-Msgid-Bugs-To: developers@phpmyadmin.net\n"
-"POT-Creation-Date: 2015-08-08 13:53-0400\n"
+"POT-Creation-Date: 2015-08-12 08:10-0400\n"
 "PO-Revision-Date: 2015-02-09 16:12+0200\n"
 "Last-Translator: mrnonz <nontawat39@gmail.com>\n"
 "Language-Team: Thai <https://hosted.weblate.org/projects/phpmyadmin/master/"
@@ -52,7 +52,7 @@ msgid "Table comments:"
 msgstr "หมายเหตุของตาราง:"
 
 #: db_datadict.php:104 libraries/Index.class.php:699
-#: libraries/insert_edit.lib.php:1567
+#: libraries/insert_edit.lib.php:1565
 #: libraries/navigation/Nodes/Node_Column.class.php:30
 #: libraries/plugins/export/ExportHtmlword.class.php:280
 #: libraries/plugins/export/ExportHtmlword.class.php:375
@@ -66,13 +66,14 @@ msgstr "หมายเหตุของตาราง:"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1023
 #: libraries/tracking.lib.php:879 libraries/tracking.lib.php:975
 #: templates/columns_definitions/column_name.phtml:18
-#: templates/index_form.phtml:124 templates/table/table_header.phtml:6
-#: templates/table/zoom_result_form.phtml:33
-#: templates/tbl_relation/common_form.phtml:10
-#: templates/tbl_relation/common_form.phtml:43
-#: templates/tbl_relation/foreign_key_row.phtml:194
-#: templates/tbl_relation/foreign_key_row.phtml:206
-#: templates/tbl_relation/internal_relational_row.phtml:71
+#: templates/table/index_form.phtml:124
+#: templates/table/relation/common_form.phtml:10
+#: templates/table/relation/common_form.phtml:43
+#: templates/table/relation/foreign_key_row.phtml:194
+#: templates/table/relation/foreign_key_row.phtml:206
+#: templates/table/relation/internal_relational_row.phtml:71
+#: templates/table/search/table_header.phtml:6
+#: templates/table/search/zoom_result_form.phtml:33
 msgid "Column"
 msgstr "สดมภ์"
 
@@ -90,21 +91,21 @@ msgstr "สดมภ์"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1001
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1024
 #: libraries/rte/rte_list.lib.php:75 libraries/rte/rte_list.lib.php:103
-#: libraries/rte/rte_routines.lib.php:802
-#: libraries/rte/rte_routines.lib.php:831
-#: libraries/rte/rte_routines.lib.php:1493
+#: libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_routines.lib.php:922
+#: libraries/rte/rte_routines.lib.php:1584
 #: libraries/server_privileges.lib.php:2369 libraries/tracking.lib.php:880
 #: libraries/tracking.lib.php:972
 #: templates/columns_definitions/table_fields_definitions.phtml:11
-#: templates/structure/table_header.phtml:48
-#: templates/structure/table_structure_header.phtml:6
-#: templates/table/table_header.phtml:7
+#: templates/database/structure/table_header.phtml:48
+#: templates/table/search/table_header.phtml:7
+#: templates/table/structure/table_structure_header.phtml:6
 msgid "Type"
 msgstr "ชนิด"
 
 #: db_datadict.php:106 libraries/Index.class.php:702
 #: libraries/central_columns.lib.php:708
-#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1576
+#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1574
 #: libraries/plugins/export/ExportHtmlword.class.php:286
 #: libraries/plugins/export/ExportHtmlword.class.php:381
 #: libraries/plugins/export/ExportLatex.class.php:509
@@ -117,8 +118,8 @@ msgstr "ชนิด"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1026
 #: libraries/tracking.lib.php:882 libraries/tracking.lib.php:978
 #: templates/columns_definitions/table_fields_definitions.phtml:39
-#: templates/structure/table_structure_header.phtml:9
-#: templates/table/zoom_result_form.phtml:34
+#: templates/table/search/zoom_result_form.phtml:34
+#: templates/table/structure/table_structure_header.phtml:9
 msgid "Null"
 msgstr "ว่างเปล่า (null)"
 
@@ -136,8 +137,8 @@ msgstr "ว่างเปล่า (null)"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1027
 #: libraries/replication_gui.lib.php:153 libraries/tracking.lib.php:883
 #: templates/columns_definitions/table_fields_definitions.phtml:25
-#: templates/structure/body_for_table_summary.phtml:55
-#: templates/structure/table_structure_header.phtml:10
+#: templates/database/structure/body_for_table_summary.phtml:55
+#: templates/table/structure/table_structure_header.phtml:10
 msgid "Default"
 msgstr "ค่าปริยาย"
 
@@ -165,19 +166,19 @@ msgid "Comments"
 msgstr "หมายเหตุ"
 
 #: db_datadict.php:146
-#: libraries/controllers/StructureController.class.php:1960
-#: libraries/controllers/StructureController.class.php:1965
+#: libraries/controllers/TableStructureController.class.php:951
+#: libraries/controllers/TableStructureController.class.php:956
 #: libraries/tracking.lib.php:922
 #: templates/columns_definitions/column_indexes.phtml:6
-#: templates/structure/check_all_table_column.phtml:22
-#: templates/structure/display_structure.phtml:74
+#: templates/table/structure/check_all_table_column.phtml:22
+#: templates/table/structure/display_structure.phtml:74
 msgid "Primary"
 msgstr "ไพรมารี"
 
 #: db_datadict.php:156 js/messages.php:317 libraries/Index.class.php:567
 #: libraries/Index.class.php:606 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261 libraries/mult_submits.lib.php:403
+#: libraries/config/FormDisplay.tpl.php:272 libraries/mult_submits.lib.php:403
 #: libraries/mult_submits.lib.php:417
 #: libraries/plugins/export/ExportHtmlword.class.php:630
 #: libraries/plugins/export/ExportLatex.class.php:589
@@ -193,20 +194,20 @@ msgstr "ไพรมารี"
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1010 libraries/tracking.lib.php:1015
 #: prefs_manage.php:140 templates/prefs_autoload.phtml:15
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "No"
 msgstr "ไม่"
 
 #: db_datadict.php:156 js/messages.php:443 libraries/Index.class.php:568
 #: libraries/Index.class.php:605 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261
-#: libraries/controllers/StructureController.class.php:1344
-#: libraries/controllers/StructureController.class.php:2223
-#: libraries/controllers/StructureController.class.php:2232
-#: libraries/controllers/StructureController.class.php:2237
-#: libraries/controllers/StructureController.class.php:2242
-#: libraries/controllers/StructureController.class.php:2247
+#: libraries/config/FormDisplay.tpl.php:272
+#: libraries/controllers/TableStructureController.class.php:539
+#: libraries/controllers/TableStructureController.class.php:1201
+#: libraries/controllers/TableStructureController.class.php:1210
+#: libraries/controllers/TableStructureController.class.php:1215
+#: libraries/controllers/TableStructureController.class.php:1220
+#: libraries/controllers/TableStructureController.class.php:1225
 #: libraries/mult_submits.inc.php:82 libraries/mult_submits.inc.php:178
 #: libraries/mult_submits.lib.php:339 libraries/mult_submits.lib.php:372
 #: libraries/mult_submits.lib.php:401 libraries/mult_submits.lib.php:415
@@ -215,8 +216,8 @@ msgstr "ไม่"
 #: libraries/plugins/export/ExportOdt.class.php:756
 #: libraries/plugins/export/ExportTexytext.class.php:567
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1077
-#: libraries/server_databases.lib.php:464
-#: libraries/server_databases.lib.php:474
+#: libraries/server_databases.lib.php:475
+#: libraries/server_databases.lib.php:485
 #: libraries/server_privileges.lib.php:2546
 #: libraries/server_privileges.lib.php:2727
 #: libraries/server_privileges.lib.php:2748
@@ -226,7 +227,7 @@ msgstr "ไม่"
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1008 libraries/tracking.lib.php:1013
 #: prefs_manage.php:138 templates/prefs_autoload.phtml:14
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "Yes"
 msgstr "ใช่"
 
@@ -236,7 +237,7 @@ msgstr "ดูโครงสร้างของฐานข้อมูล"
 
 #: db_export.php:37 db_tracking.php:90 export.php:382
 #: libraries/DBQbe.class.php:326
-#: libraries/controllers/StructureController.class.php:231
+#: libraries/controllers/DatabaseStructureController.class.php:170
 #: libraries/navigation/NavigationTree.class.php:897
 msgid "No tables found in database."
 msgstr "ไม่พบตารางใดๆ ในฐานข้อมูล"
@@ -247,14 +248,14 @@ msgstr "ไม่พบตารางใดๆ ในฐานข้อมู
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:26
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:120
-#: templates/structure/show_create.phtml:18
+#: templates/database/structure/show_create.phtml:18
 msgid "Tables"
 msgstr "ตาราง"
 
 #: db_export.php:52 libraries/Menu.class.php:317 libraries/Menu.class.php:425
-#: libraries/Util.class.php:3333 libraries/Util.class.php:3343
-#: libraries/Util.class.php:3349 libraries/Util.class.php:3629
-#: libraries/Util.class.php:4327 libraries/Util.class.php:4344
+#: libraries/Util.class.php:3339 libraries/Util.class.php:3349
+#: libraries/Util.class.php:3355 libraries/Util.class.php:3635
+#: libraries/Util.class.php:4333 libraries/Util.class.php:4350
 #: libraries/central_columns.lib.php:728 libraries/config.values.php:39
 #: libraries/config.values.php:47 libraries/config.values.php:109
 #: libraries/config.values.php:115 libraries/config/setup.forms.php:323
@@ -268,7 +269,7 @@ msgstr "ตาราง"
 #: libraries/navigation/Nodes/Node_Table.class.php:283
 #: libraries/server_privileges.lib.php:1141 libraries/tracking.lib.php:874
 #: templates/columns_definitions/table_fields_definitions.phtml:3
-#: templates/designer/table_list.phtml:28
+#: templates/database/designer/table_list.phtml:28
 msgid "Structure"
 msgstr "โครงสร้าง"
 
@@ -280,7 +281,7 @@ msgstr "โครงสร้าง"
 #: libraries/config/user_preferences.forms.php:292
 #: libraries/config/user_preferences.forms.php:297
 #: libraries/server_privileges.lib.php:1140
-#: templates/structure/display_table_stats.phtml:12
+#: templates/table/structure/display_table_stats.phtml:12
 msgid "Data"
 msgstr "ข้อมูล"
 
@@ -354,10 +355,10 @@ msgstr "ตารางที่ถูกติดตาม"
 #: libraries/server_privileges.lib.php:2908
 #: libraries/server_privileges.lib.php:3145
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4346
-#: templates/structure/table_header.phtml:21
-#: templates/tbl_relation/foreign_key_row.phtml:176
-#: templates/tbl_relation/internal_relational_row.phtml:63
+#: libraries/server_privileges.lib.php:4372
+#: templates/database/structure/table_header.phtml:21
+#: templates/table/relation/foreign_key_row.phtml:176
+#: templates/table/relation/internal_relational_row.phtml:63
 msgid "Table"
 msgstr "ตาราง"
 
@@ -374,7 +375,7 @@ msgid "Updated"
 msgstr "ปรับปรุงแล้ว"
 
 #: db_tracking.php:130 js/messages.php:243 libraries/Menu.class.php:552
-#: libraries/Util.class.php:4314 libraries/config.values.php:104
+#: libraries/Util.class.php:4320 libraries/config.values.php:104
 #: libraries/rte/rte_events.lib.php:393 libraries/rte/rte_list.lib.php:101
 #: libraries/server_status_processes.lib.php:92 libraries/tracking.lib.php:279
 msgid "Status"
@@ -383,14 +384,15 @@ msgstr "สถานะ"
 #: db_tracking.php:131 db_tracking.php:290 libraries/Index.class.php:693
 #: libraries/central_columns.lib.php:687 libraries/rte/rte_list.lib.php:74
 #: libraries/rte/rte_list.lib.php:89 libraries/rte/rte_list.lib.php:102
-#: libraries/server_databases.lib.php:398
+#: libraries/server_databases.lib.php:409
 #: libraries/server_privileges.lib.php:2372
 #: libraries/server_privileges.lib.php:3166
 #: libraries/server_privileges.lib.php:3342
 #: libraries/server_user_groups.lib.php:82
 #: libraries/server_variables.lib.php:189 libraries/tracking.lib.php:280
-#: libraries/tracking.lib.php:793 templates/structure/table_header.phtml:30
-#: templates/structure/table_structure_header.phtml:23
+#: libraries/tracking.lib.php:793
+#: templates/database/structure/table_header.phtml:30
+#: templates/table/structure/table_structure_header.phtml:23
 msgid "Action"
 msgstr "กระทำการ"
 
@@ -434,7 +436,7 @@ msgid "Untracked tables"
 msgstr "เลิกติดตามตาราง"
 
 #: db_tracking.php:305 db_tracking.php:336
-#: templates/structure/optional_action_links.phtml:17
+#: templates/table/structure/optional_action_links.phtml:17
 msgid "Track table"
 msgstr "ติดตามตาราง"
 
@@ -484,7 +486,7 @@ msgid "Value for the column \"%s\""
 msgstr "ค่าสำหรับคอลัมน์ \"%s\""
 
 #: gis_data_editor.php:146
-#: templates/gis_visualization/gis_visualization.phtml:37
+#: templates/table/gis_visualization/gis_visualization.phtml:37
 msgid "Use OpenStreetMaps as Base Layer"
 msgstr "ใช้ OpenStreetMaps เป็นชั้นพื้นฐาน"
 
@@ -574,35 +576,35 @@ msgstr "เพิ่มเรขาคณิต"
 #: libraries/display_change_password.lib.php:162
 #: libraries/display_export.lib.php:402 libraries/display_export.lib.php:408
 #: libraries/display_import.lib.php:392 libraries/index.lib.php:44
-#: libraries/insert_edit.lib.php:1546 libraries/insert_edit.lib.php:1583
+#: libraries/insert_edit.lib.php:1544 libraries/insert_edit.lib.php:1581
 #: libraries/normalization.lib.php:165 libraries/normalization.lib.php:821
 #: libraries/operations.lib.php:38 libraries/operations.lib.php:108
 #: libraries/operations.lib.php:263 libraries/operations.lib.php:306
 #: libraries/operations.lib.php:801 libraries/operations.lib.php:874
 #: libraries/operations.lib.php:923 libraries/operations.lib.php:1337
 #: libraries/operations.lib.php:1658
-#: libraries/plugins/auth/AuthenticationCookie.class.php:244
+#: libraries/plugins/auth/AuthenticationCookie.class.php:232
 #: libraries/replication_gui.lib.php:122 libraries/replication_gui.lib.php:161
 #: libraries/replication_gui.lib.php:324 libraries/replication_gui.lib.php:461
 #: libraries/replication_gui.lib.php:906 libraries/rte/rte_events.lib.php:509
-#: libraries/rte/rte_routines.lib.php:969
-#: libraries/rte/rte_routines.lib.php:1581
+#: libraries/rte/rte_routines.lib.php:1060
+#: libraries/rte/rte_routines.lib.php:1672
 #: libraries/rte/rte_triggers.lib.php:396 libraries/server_bin_log.lib.php:61
 #: libraries/server_privileges.lib.php:705
 #: libraries/server_privileges.lib.php:2106
 #: libraries/server_privileges.lib.php:2872
 #: libraries/server_privileges.lib.php:3553
-#: libraries/server_privileges.lib.php:4627
+#: libraries/server_privileges.lib.php:4653
 #: libraries/server_user_groups.lib.php:285
 #: libraries/sql_query_form.lib.php:369 libraries/sql_query_form.lib.php:429
 #: libraries/tracking.lib.php:533 libraries/tracking.lib.php:653
 #: prefs_manage.php:277 prefs_manage.php:355
 #: templates/columns_definitions/column_definitions_form.phtml:59
-#: templates/header_location.phtml:17 templates/index_form.phtml:238
+#: templates/database/create_table.phtml:21 templates/header_location.phtml:28
 #: templates/startAndNumberOfRowsPanel.phtml:14
-#: templates/structure/add_column.phtml:25
-#: templates/table/create_table.phtml:21
-#: templates/table/selection_form.phtml:75 view_create.php:275
+#: templates/table/index_form.phtml:238
+#: templates/table/search/selection_form.phtml:75
+#: templates/table/structure/add_column.phtml:25 view_create.php:275
 #: view_operations.php:106
 msgid "Go"
 msgstr "ไป"
@@ -694,7 +696,7 @@ msgstr "ไม่สามารถแปลงไฟล์ข้อมูลช
 msgid "Could not load import plugins, please check your installation!"
 msgstr "ไม่สามารถโหลดนำเข้าปลั๊กอินได้ กรุณาตรวจสอบการติดตั้งของคุณ!"
 
-#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1466
+#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1460
 #, fuzzy, php-format
 #| msgid "Bookmark %s created"
 msgid "Bookmark %s has been created."
@@ -734,13 +736,13 @@ msgstr ""
 msgid "Back"
 msgstr "ย้อนกลับ"
 
-#: index.php:148 libraries/Footer.class.php:70
+#: index.php:149 libraries/Footer.class.php:70
 #, fuzzy
 #| msgid "phpMyAdmin homepage"
 msgid "phpMyAdmin Demo Server"
 msgstr "หน้าเว็บ phpMyAdmin"
 
-#: index.php:152
+#: index.php:153
 #, php-format
 msgid ""
 "You are using the demo server. You can do anything here, but please do not "
@@ -748,41 +750,41 @@ msgid ""
 "at %s."
 msgstr ""
 
-#: index.php:162
+#: index.php:163
 msgid "General Settings"
 msgstr "ตั้งค่าทั่วไป"
 
-#: index.php:190 libraries/display_change_password.lib.php:50
+#: index.php:191 libraries/display_change_password.lib.php:50
 #: libraries/display_change_password.lib.php:53 user_password.php:247
 msgid "Change password"
 msgstr "เปลี่ยนรหัสผ่าน"
 
-#: index.php:206
+#: index.php:207
 msgid "Server connection collation"
 msgstr "ตรวจทานการเชื่อมต่อเซิร์ฟเวอร์"
 
-#: index.php:228
+#: index.php:229
 msgid "Appearance Settings"
 msgstr "ตั้งค่าลักษณะที่ปรากฏ"
 
-#: index.php:258 prefs_manage.php:285
+#: index.php:259 prefs_manage.php:285
 msgid "More settings"
 msgstr "ตั้งค่าเพิ่มเติม"
 
-#: index.php:279
+#: index.php:280
 msgid "Database server"
 msgstr "เซิร์ฟเวอร์ฐานข้อมูล"
 
-#: index.php:282 libraries/plugins/auth/AuthenticationCookie.class.php:181
+#: index.php:283 libraries/plugins/auth/AuthenticationCookie.class.php:169
 msgid "Server:"
 msgstr "เซิร์ฟเวอร์:"
 
-#: index.php:286
+#: index.php:287
 #, fuzzy
 msgid "Server type:"
 msgstr "ตัวเลือกเซิร์ฟเวอร์"
 
-#: index.php:290 libraries/plugins/export/ExportLatex.class.php:212
+#: index.php:291 libraries/plugins/export/ExportLatex.class.php:212
 #: libraries/plugins/export/ExportSql.class.php:687
 #: libraries/plugins/export/ExportXml.class.php:189
 #, fuzzy
@@ -790,84 +792,84 @@ msgstr "ตัวเลือกเซิร์ฟเวอร์"
 msgid "Server version:"
 msgstr "รุ่นของเซิร์ฟเวอร์"
 
-#: index.php:296
+#: index.php:297
 #, fuzzy
 #| msgid "Protocol version"
 msgid "Protocol version:"
 msgstr "รุ่นของโพรโทคอล"
 
-#: index.php:300
+#: index.php:301
 #, fuzzy
 #| msgid "User"
 msgid "User:"
 msgstr "ผู้ใช้"
 
-#: index.php:305
+#: index.php:306
 #, fuzzy
 #| msgid "Server charset"
 msgid "Server charset:"
 msgstr "ชุดอักขระเซิร์ฟเวอร์"
 
-#: index.php:320
+#: index.php:321
 msgid "Web server"
 msgstr "เว็บเซิร์ฟเวอร์"
 
-#: index.php:331
+#: index.php:332
 #, fuzzy
 #| msgid "Database client version"
 msgid "Database client version:"
 msgstr "รุ่นไคลเอนต์ฐานข้อมูล"
 
-#: index.php:335
+#: index.php:336
 #, fuzzy
 #| msgid "PHP extension"
 msgid "PHP extension:"
 msgstr "ส่วนขยาย PHP"
 
-#: index.php:349
+#: index.php:350
 #, fuzzy
 #| msgid "PHP Version"
 msgid "PHP version:"
 msgstr "รุ่นของ PHP"
 
-#: index.php:360
+#: index.php:361
 msgid "Show PHP information"
 msgstr "แสดงข้อมูลของ PHP"
 
-#: index.php:383
+#: index.php:384
 #, fuzzy
 msgid "Version information:"
 msgstr "ข้อมูลล็อกอิน"
 
-#: index.php:392 libraries/Util.class.php:432 libraries/Util.class.php:495
-#: libraries/config/FormDisplay.tpl.php:151
+#: index.php:393 libraries/Util.class.php:432 libraries/Util.class.php:495
+#: libraries/config/FormDisplay.tpl.php:162
 #: libraries/display_export.lib.php:577 libraries/engines/pbxt.lib.php:162
 #: libraries/navigation/NavigationHeader.class.php:196
 #: libraries/server_variables.lib.php:160
 msgid "Documentation"
 msgstr "เอกสารประกอบ"
 
-#: index.php:399
+#: index.php:400
 msgid "Wiki"
 msgstr "วิกิ"
 
-#: index.php:408
+#: index.php:409
 msgid "Official Homepage"
 msgstr "โฮมเพจอย่างเป็นทางการ"
 
-#: index.php:415
+#: index.php:416
 msgid "Contribute"
 msgstr "สนับสนุน"
 
-#: index.php:422
+#: index.php:423
 msgid "Get support"
 msgstr "รับการสนับสนุน"
 
-#: index.php:429
+#: index.php:430
 msgid "List of changes"
 msgstr "รายการของการเปลี่ยนแปลง"
 
-#: index.php:451
+#: index.php:452
 #, fuzzy
 #| msgid ""
 #| "Your configuration file contains settings (root with no password) that "
@@ -884,7 +886,7 @@ msgstr ""
 "ซึ่งจะถูกใช้เป็นชื่อปริยายซึ่งมีสิทธิพิเศษ.  เซิร์ฟเวอร์ MySQL ที่ทำงานด้วยค่าปริยายนี้ อาจถูกบุกรุกได้ "
 "คุณควรจะแก้ไขรูรั่วอันนี้ทันที เพื่อความปลอดภัย"
 
-#: index.php:468
+#: index.php:469
 msgid ""
 "You have enabled mbstring.func_overload in your PHP configuration. This "
 "option is incompatible with phpMyAdmin and might cause some data to be "
@@ -893,7 +895,7 @@ msgstr ""
 "คุณได้เปิดใช้งาน mbstring.func_overload ในการกำหนดค่าของ PHP ตัวเลือกนี้ไม่เข้ากันกับ "
 "phpMyAdmin และอาจทำให้ข้อมูลบางอย่างจะเสียหายได้"
 
-#: index.php:483
+#: index.php:484
 msgid ""
 "The mbstring PHP extension was not found and you seem to be using a "
 "multibyte charset. Without the mbstring extension phpMyAdmin is unable to "
@@ -902,7 +904,7 @@ msgstr ""
 "ไม่พบส่วนขยาย mbstring ของ PHP และดูเหมือนคุณต้องใช้ชุดอักขระโดยไม่มีส่วนขยาย mbstring "
 "ของ phpMyAdmin ซึ่งไม่สามารถแยกอักขระได้อย่างถูกต้อง และอาจทำให้ผลลัพธ์ที่ไม่คาดคิดได้"
 
-#: index.php:500
+#: index.php:501
 msgid ""
 "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini."
 "session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower than "
@@ -910,17 +912,17 @@ msgid ""
 "expire sooner than configured in phpMyAdmin."
 msgstr ""
 
-#: index.php:519
+#: index.php:520
 msgid ""
 "Login cookie store is lower than cookie validity configured in phpMyAdmin, "
 "because of this, your login will expire sooner than configured in phpMyAdmin."
 msgstr ""
 
-#: index.php:535
+#: index.php:536
 msgid "The configuration file now needs a secret passphrase (blowfish_secret)."
 msgstr "ในขณะนี้ไฟล์การกำหนดค่าต้องการรหัสผ่านลับ (blowfish_secret)"
 
-#: index.php:548
+#: index.php:549
 msgid ""
 "Directory [code]config[/code], which is used by the setup script, still "
 "exists in your phpMyAdmin directory. It is strongly recommended to remove it "
@@ -928,7 +930,7 @@ msgid ""
 "may be compromised by unauthorized people downloading your configuration."
 msgstr ""
 
-#: index.php:564
+#: index.php:565
 #, fuzzy, php-format
 #| msgid ""
 #| " additional features for working with linked tables have been ctivated. "
@@ -939,12 +941,12 @@ msgid ""
 msgstr ""
 "ความสามารถเพิ่มเติมสำหรับ linked Tables ได้ถูกระงับเอาไว้ ตามเหตุผลที่แจ้งไว้ใน %shere%s"
 
-#: index.php:571
+#: index.php:572
 msgid ""
 "Or alternately go to 'Operations' tab of any database to set it up there."
 msgstr ""
 
-#: index.php:620
+#: index.php:621
 #, fuzzy, php-format
 msgid ""
 "Your PHP MySQL library version %s differs from your MySQL server version %s. "
@@ -953,7 +955,7 @@ msgstr ""
 "PHP MySQL library รุ่นที่คุณติดตั้งไว้คือ %s ซึ่งแตกต่างจากของเซิร์ฟเวอร์ซึ่งใช้รุ่น %s "
 "อาจก่อให้เกิดปัญหาไม่พึงประสงค์บางประการ"
 
-#: index.php:648
+#: index.php:649
 #, php-format
 msgid ""
 "Server running with Suhosin. Please refer to %sdocumentation%s for possible "
@@ -1122,8 +1124,8 @@ msgstr ""
 msgid "Save & Close"
 msgstr "บันทึกเป็นไฟล์"
 
-#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:404
-#: libraries/insert_edit.lib.php:1550 prefs_manage.php:361
+#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:415
+#: libraries/insert_edit.lib.php:1548 prefs_manage.php:361
 #: prefs_manage.php:372
 msgid "Reset"
 msgstr "ตั้งค่าใหม่"
@@ -1164,7 +1166,7 @@ msgstr "เพิ่มดัชนีใหม่"
 msgid "Edit Index"
 msgstr "แก้ไขดัชนี"
 
-#: js/messages.php:99 templates/index_form.phtml:232
+#: js/messages.php:99 templates/table/index_form.phtml:232
 #, php-format
 msgid "Add %s column(s) to index"
 msgstr "เพิ่มคอลัมน์ %s ไปยังดัชนี"
@@ -1193,15 +1195,16 @@ msgstr "คร่อมฟิลด์ด้วย"
 msgid "Please select column(s) for the index."
 msgstr "เพิ่มคอลัมน์ %s ไปยังดัชนี"
 
-#: js/messages.php:106 templates/structure/add_column.phtml:1
+#: js/messages.php:106 templates/table/structure/add_column.phtml:1
 #, fuzzy
 #| msgid "You have to choose at least one column to display"
 msgid "You have to add at least one column."
 msgstr "ต้องเลือกให้แสดงอย่างน้อยหนึ่งคอลัมน์"
 
-#: js/messages.php:109 libraries/insert_edit.lib.php:1548
+#: js/messages.php:109 libraries/insert_edit.lib.php:1546
 #: templates/columns_definitions/column_definitions_form.phtml:162
-#: templates/index_form.phtml:237 templates/tbl_relation/common_form.phtml:106
+#: templates/table/index_form.phtml:237
+#: templates/table/relation/common_form.phtml:106
 msgid "Preview SQL"
 msgstr ""
 
@@ -1224,7 +1227,7 @@ msgid "SQL query:"
 msgstr "คำค้น SQL"
 
 #. l10n: Default label for the y-Axis of Charts
-#: js/messages.php:118 templates/tbl_chart.phtml:109
+#: js/messages.php:118 templates/table/chart/tbl_chart.phtml:109
 #, fuzzy
 #| msgid "Value"
 msgid "Y Values"
@@ -1386,7 +1389,7 @@ msgstr "Byte ที่ส่ง"
 msgid "Bytes received"
 msgstr "Byte ที่รับ"
 
-#: js/messages.php:169 libraries/server_status.lib.php:226
+#: js/messages.php:169 libraries/server_status.lib.php:235
 msgid "Connections"
 msgstr "การเชื่อมต่อ"
 
@@ -1443,12 +1446,12 @@ msgstr "%d ตาราง"
 msgid "Questions"
 msgstr "คำถาม"
 
-#: js/messages.php:184 libraries/server_status.lib.php:134
+#: js/messages.php:184 libraries/server_status.lib.php:143
 msgid "Traffic"
 msgstr "การจราจร"
 
 #: js/messages.php:185 libraries/Menu.class.php:586
-#: libraries/Util.class.php:4318 libraries/server_status_monitor.lib.php:257
+#: libraries/Util.class.php:4324 libraries/server_status_monitor.lib.php:257
 msgid "Settings"
 msgstr "การตั้งค่า"
 
@@ -1470,8 +1473,9 @@ msgstr "กรุณาเพิ่มค่าตัวแปรอย่าง
 #: libraries/server_status_monitor.lib.php:236
 #: libraries/server_status_processes.lib.php:308
 #: templates/columns_definitions/transformation.phtml:4
-#: templates/designer/options_panel.phtml:178
-#: templates/table/options_zoom.phtml:12 templates/table/rows_zoom.phtml:26
+#: templates/database/designer/options_panel.phtml:178
+#: templates/table/search/options_zoom.phtml:12
+#: templates/table/search/rows_zoom.phtml:26
 msgid "None"
 msgstr "ไม่มี"
 
@@ -1749,8 +1753,8 @@ msgstr ""
 
 #: js/messages.php:270 libraries/Menu.class.php:352
 #: libraries/Menu.class.php:455 libraries/Menu.class.php:582
-#: libraries/Util.class.php:4317 libraries/Util.class.php:4332
-#: libraries/Util.class.php:4349 libraries/config/messages.inc.php:258
+#: libraries/Util.class.php:4323 libraries/Util.class.php:4338
+#: libraries/Util.class.php:4355 libraries/config/messages.inc.php:258
 #: libraries/display_import.lib.php:105
 #: libraries/server_status_monitor.lib.php:318 prefs_manage.php:238
 #: setup/frames/menu.inc.php:26
@@ -1812,13 +1816,13 @@ msgid "Formatting SQL..."
 msgstr ""
 
 #: js/messages.php:293 libraries/server_variables.lib.php:157
-#: templates/designer/aggregate_query_panel.phtml:63
-#: templates/designer/delete_relation_panel.phtml:28
-#: templates/designer/having_query_panel.phtml:117
-#: templates/designer/new_relation_panel.phtml:88
-#: templates/designer/options_panel.phtml:253
-#: templates/designer/rename_to_panel.phtml:45
-#: templates/designer/where_query_panel.phtml:83
+#: templates/database/designer/aggregate_query_panel.phtml:63
+#: templates/database/designer/delete_relation_panel.phtml:28
+#: templates/database/designer/having_query_panel.phtml:117
+#: templates/database/designer/new_relation_panel.phtml:88
+#: templates/database/designer/options_panel.phtml:253
+#: templates/database/designer/rename_to_panel.phtml:45
+#: templates/database/designer/where_query_panel.phtml:83
 msgid "Cancel"
 msgstr "ยกเลิก"
 
@@ -1828,7 +1832,7 @@ msgstr "ยกเลิก"
 msgid "Page-related settings"
 msgstr "เปลี่ยนการตั้งค่า"
 
-#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:402
+#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:413
 msgid "Apply"
 msgstr ""
 
@@ -1865,8 +1869,8 @@ msgstr "รหัสข้อผิดพลาด: %s"
 msgid "Error text: %s"
 msgstr "ข้อความข้อผิดพลาด: %s"
 
-#: js/messages.php:307 libraries/db_common.inc.php:68
-#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:450
+#: js/messages.php:307 libraries/db_common.inc.php:69
+#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:461
 msgid "No databases selected."
 msgstr "ไม่มีฐานข้อมูลที่ถูกเลือก"
 
@@ -1878,12 +1882,13 @@ msgstr "ทิ้งสดมส์"
 msgid "Adding Primary Key"
 msgstr "เพิ่มคีย์หลัก"
 
-#: js/messages.php:310 templates/designer/aggregate_query_panel.phtml:59
-#: templates/designer/having_query_panel.phtml:113
-#: templates/designer/new_relation_panel.phtml:87
-#: templates/designer/options_panel.phtml:252
-#: templates/designer/rename_to_panel.phtml:41
-#: templates/designer/where_query_panel.phtml:82
+#: js/messages.php:310
+#: templates/database/designer/aggregate_query_panel.phtml:59
+#: templates/database/designer/having_query_panel.phtml:113
+#: templates/database/designer/new_relation_panel.phtml:87
+#: templates/database/designer/options_panel.phtml:252
+#: templates/database/designer/rename_to_panel.phtml:41
+#: templates/database/designer/where_query_panel.phtml:82
 msgid "OK"
 msgstr "ตกลง"
 
@@ -1903,7 +1908,7 @@ msgstr "กำลังคัดลอกฐานข้อมูล"
 msgid "Changing Charset"
 msgstr "กำลังเปลี่ยนชุดตัวอักษร"
 
-#: js/messages.php:320 libraries/Util.class.php:3217
+#: js/messages.php:320 libraries/Util.class.php:3223
 #, fuzzy
 #| msgid "Foreign key check:"
 msgid "Enable foreign key checks"
@@ -1942,20 +1947,21 @@ msgstr "ฟังก์ชั่นภายในจะต้องมีค่
 #: js/messages.php:334 libraries/DisplayResults.class.php:4834
 #: libraries/DisplayResults.class.php:5092 libraries/Menu.class.php:344
 #: libraries/Menu.class.php:446 libraries/Menu.class.php:578
-#: libraries/Util.class.php:3636 libraries/Util.class.php:3637
-#: libraries/Util.class.php:4316 libraries/Util.class.php:4331
-#: libraries/Util.class.php:4348 libraries/config/messages.inc.php:252
+#: libraries/Util.class.php:3642 libraries/Util.class.php:3643
+#: libraries/Util.class.php:4322 libraries/Util.class.php:4337
+#: libraries/Util.class.php:4354 libraries/config/messages.inc.php:252
 #: libraries/display_export.lib.php:173 libraries/rte/rte_list.lib.php:146
 #: libraries/server_privileges.lib.php:2211
 #: libraries/server_privileges.lib.php:2290
 #: libraries/server_privileges.lib.php:2632
 #: libraries/server_privileges.lib.php:3356
 #: libraries/server_status_monitor.lib.php:322 prefs_manage.php:303
-#: setup/frames/menu.inc.php:27 templates/structure/check_all_tables.phtml:11
+#: setup/frames/menu.inc.php:27
+#: templates/database/structure/check_all_tables.phtml:11
 msgid "Export"
 msgstr "ส่งออก"
 
-#: js/messages.php:337 libraries/rte/rte_routines.lib.php:652
+#: js/messages.php:337 libraries/rte/rte_routines.lib.php:743
 msgid "ENUM/SET editor"
 msgstr "ตัวแก้ไข ENUM/SET"
 
@@ -1996,7 +2002,7 @@ msgstr "แสดงช่องคำค้น SQL"
 #: libraries/Console.class.php:214 libraries/DisplayResults.class.php:3474
 #: libraries/DisplayResults.class.php:4818 libraries/Index.class.php:723
 #: libraries/Util.class.php:706 libraries/Util.class.php:1202
-#: libraries/Util.class.php:3634 libraries/Util.class.php:3635
+#: libraries/Util.class.php:3640 libraries/Util.class.php:3641
 #: libraries/central_columns.lib.php:851
 #: libraries/central_columns.lib.php:1193
 #: libraries/config/messages.inc.php:892
@@ -2014,7 +2020,7 @@ msgstr "แก้ไข"
 #: libraries/server_user_groups.lib.php:129
 #: libraries/sql_query_form.lib.php:416 libraries/tracking.lib.php:477
 #: setup/frames/index.inc.php:183 setup/frames/index.inc.php:291
-#: templates/designer/delete_relation_panel.phtml:27
+#: templates/database/designer/delete_relation_panel.phtml:27
 msgid "Delete"
 msgstr "ลบ"
 
@@ -2196,11 +2202,11 @@ msgid "No dependencies selected!"
 msgstr "ไม่มีฐานข้อมูลที่ถูกเลือก"
 
 #: js/messages.php:394 libraries/central_columns.lib.php:1214
-#: libraries/insert_edit.lib.php:1458 libraries/server_variables.lib.php:155
+#: libraries/insert_edit.lib.php:1456 libraries/server_variables.lib.php:155
 #: setup/frames/config.inc.php:42 setup/frames/index.inc.php:279
 #: templates/columns_definitions/column_definitions_form.phtml:165
-#: templates/gis_visualization/gis_visualization.phtml:48
-#: templates/tbl_relation/common_form.phtml:107
+#: templates/table/gis_visualization/gis_visualization.phtml:48
+#: templates/table/relation/common_form.phtml:107
 msgid "Save"
 msgstr "บันทึก"
 
@@ -2294,8 +2300,8 @@ msgid "Data point content"
 msgstr "สารบัญ"
 
 #: js/messages.php:430 js/messages.php:562 js/messages.php:579
-#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2573
-#: templates/index_form.phtml:154 templates/index_form.phtml:194
+#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2571
+#: templates/table/index_form.phtml:154 templates/table/index_form.phtml:194
 msgid "Ignore"
 msgstr "ข้าม"
 
@@ -2356,8 +2362,8 @@ msgstr "เลือกคีย์นอก"
 msgid "Please select the primary key or a unique key!"
 msgstr "กรุณาเลือกคีย์หลักหรือคียเดี่ยว"
 
-#: js/messages.php:457 templates/designer/side_menu.phtml:91
-#: templates/designer/side_menu.phtml:94
+#: js/messages.php:457 templates/database/designer/side_menu.phtml:91
+#: templates/database/designer/side_menu.phtml:94
 msgid "Choose column to display"
 msgstr "เลือกฟิลด์ที่ต้องการแสดง"
 
@@ -2373,22 +2379,22 @@ msgstr "คุณยังไม่ได้บันทึกเลย์เอ
 msgid "Page name"
 msgstr "หมายเลขหน้า:"
 
-#: js/messages.php:463 templates/designer/side_menu.phtml:56
-#: templates/designer/side_menu.phtml:59
+#: js/messages.php:463 templates/database/designer/side_menu.phtml:56
+#: templates/database/designer/side_menu.phtml:59
 #, fuzzy
 #| msgid "Select All"
 msgid "Save page"
 msgstr "เลือกทั้งหมด"
 
-#: js/messages.php:464 templates/designer/side_menu.phtml:63
-#: templates/designer/side_menu.phtml:66
+#: js/messages.php:464 templates/database/designer/side_menu.phtml:63
+#: templates/database/designer/side_menu.phtml:66
 #, fuzzy
 #| msgid "Select All"
 msgid "Save page as"
 msgstr "เลือกทั้งหมด"
 
-#: js/messages.php:465 templates/designer/side_menu.phtml:49
-#: templates/designer/side_menu.phtml:52
+#: js/messages.php:465 templates/database/designer/side_menu.phtml:49
+#: templates/database/designer/side_menu.phtml:52
 #, fuzzy
 #| msgid "Open"
 msgid "Open page"
@@ -2400,7 +2406,7 @@ msgstr "เปิด"
 msgid "Delete page"
 msgstr "เลือกทั้งหมด"
 
-#: js/messages.php:467 templates/designer/side_menu.phtml:10
+#: js/messages.php:467 templates/database/designer/side_menu.phtml:10
 #, fuzzy
 #| msgid "Unit"
 msgid "Untitled"
@@ -2536,7 +2542,7 @@ msgstr "ตำแหน่งเริ่มแรก"
 msgid "cancel"
 msgstr "ยกเลิก"
 
-#: js/messages.php:499 libraries/server_status.lib.php:271
+#: js/messages.php:499 libraries/server_status.lib.php:280
 msgid "Aborted"
 msgstr "ยกเลิก"
 
@@ -3159,7 +3165,7 @@ msgstr "%d ไม่ใช่หมายเลขแถวที่ถูก
 
 #: js/messages.php:793 libraries/Message.class.php:199
 #: libraries/Util.class.php:654 libraries/core.lib.php:245
-#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1172
+#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1170
 #: tbl_operations.php:229 view_operations.php:63
 msgid "Error"
 msgstr "ผิดพลาด"
@@ -3220,8 +3226,8 @@ msgstr "ต่อวินาที"
 msgid "per minute"
 msgstr "ต่อนาที"
 
-#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:143
-#: libraries/server_status.lib.php:228
+#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:152
+#: libraries/server_status.lib.php:237
 #: libraries/server_status_queries.lib.php:98
 msgid "per hour"
 msgstr "ต่อชั่วโมง"
@@ -3239,7 +3245,7 @@ msgstr "ไฟล์ตั้งค่า %s ไม่สามารถอ่
 msgid "Wrong permissions on configuration file, should not be world writable!"
 msgstr "สิทธิสำหรับไฟล์ตั้งค่าไม่ถูกต้อง ที่ถูกต้องจะต้องแก้ไขได้เฉพาะ root"
 
-#: libraries/Config.class.php:1799
+#: libraries/Config.class.php:1801
 msgid "Font size"
 msgstr "ขนาดตัวอักษร"
 
@@ -3269,10 +3275,10 @@ msgstr "ในคำค้น"
 #: libraries/server_privileges.lib.php:2890
 #: libraries/server_privileges.lib.php:3144
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4332
+#: libraries/server_privileges.lib.php:4358
 #: libraries/server_status_processes.lib.php:80
-#: templates/tbl_relation/foreign_key_row.phtml:165
-#: templates/tbl_relation/internal_relational_row.phtml:55
+#: templates/table/relation/foreign_key_row.phtml:165
+#: templates/table/relation/internal_relational_row.phtml:55
 msgid "Database"
 msgstr "ฐานข้อมูล"
 
@@ -3378,11 +3384,11 @@ msgstr "ประวัติ SQL"
 #: libraries/plugins/import/ImportMediawiki.class.php:60
 #: libraries/plugins/import/ImportOds.class.php:59
 #: libraries/plugins/import/ImportShp.class.php:57
-#: libraries/plugins/import/ImportSql.class.php:148
+#: libraries/plugins/import/ImportSql.class.php:51
 #: libraries/plugins/import/ImportXml.class.php:58
-#: libraries/rte/rte_routines.lib.php:833 templates/index_form.phtml:49
-#: templates/structure/row_stats_table.phtml:20
-#: templates/table/options.phtml:2
+#: libraries/rte/rte_routines.lib.php:924 templates/table/index_form.phtml:49
+#: templates/table/search/options.phtml:2
+#: templates/table/structure/row_stats_table.phtml:20
 msgid "Options"
 msgstr "ตัวเลือก"
 
@@ -3425,7 +3431,8 @@ msgstr "มากไปน้อย"
 msgid "Order:"
 msgstr "อื่นๆ"
 
-#: libraries/Console.class.php:289 templates/table/replace_preview.phtml:17
+#: libraries/Console.class.php:289
+#: templates/table/search/replace_preview.phtml:17
 #, fuzzy
 #| msgid "Column"
 msgid "Count"
@@ -3550,9 +3557,9 @@ msgstr "สลับไปที่ตารางที่ถูกทำสำ
 #: libraries/operations.lib.php:794 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:191
-#: templates/structure/sortable_header.phtml:21
-#: templates/structure/sortable_header.phtml:38
-#: templates/table/options.phtml:68
+#: templates/database/structure/sortable_header.phtml:21
+#: templates/database/structure/sortable_header.phtml:38
+#: templates/table/search/options.phtml:68
 msgid "Ascending"
 msgstr "น้อยไปมาก"
 
@@ -3562,13 +3569,14 @@ msgstr "น้อยไปมาก"
 #: libraries/operations.lib.php:797 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:188
-#: templates/structure/sortable_header.phtml:26
-#: templates/structure/sortable_header.phtml:43
-#: templates/table/options.phtml:69
+#: templates/database/structure/sortable_header.phtml:26
+#: templates/database/structure/sortable_header.phtml:43
+#: templates/table/search/options.phtml:69
 msgid "Descending"
 msgstr "มากไปน้อย"
 
-#: libraries/DBQbe.class.php:467 templates/table/search_and_replace.phtml:6
+#: libraries/DBQbe.class.php:467
+#: templates/table/search/search_and_replace.phtml:6
 #, fuzzy
 #| msgid "Column"
 msgid "Column:"
@@ -3749,12 +3757,12 @@ msgid_plural "%1$s matches in <strong>%2$s</strong>"
 msgstr[0] "พบ %s ผลลัพธ์ที่ตรงในตาราง <i>%s</i>"
 
 #: libraries/DbSearch.class.php:354 libraries/Menu.class.php:311
-#: libraries/Util.class.php:3337 libraries/Util.class.php:3347
-#: libraries/Util.class.php:3623 libraries/Util.class.php:3624
-#: libraries/Util.class.php:4343 libraries/config.values.php:43
+#: libraries/Util.class.php:3343 libraries/Util.class.php:3353
+#: libraries/Util.class.php:3629 libraries/Util.class.php:3630
+#: libraries/Util.class.php:4349 libraries/config.values.php:43
 #: libraries/config.values.php:51 libraries/config.values.php:119
 #: libraries/navigation/Nodes/Node_Table.class.php:295
-#: templates/structure/check_all_table_column.phtml:5
+#: templates/table/structure/check_all_table_column.phtml:5
 msgid "Browse"
 msgstr "เปิดดู"
 
@@ -3771,7 +3779,8 @@ msgstr "ค้นหาในฐานข้อมูล"
 msgid "Words or values to search for (wildcard: \"%\"):"
 msgstr "คำ หรือ ค่าที่ต้องการค้นหา (wildcard: \"%\"):"
 
-#: libraries/DbSearch.class.php:401 templates/table/search_and_replace.phtml:1
+#: libraries/DbSearch.class.php:401
+#: templates/table/search/search_and_replace.phtml:1
 msgid "Find:"
 msgstr "ค้น:"
 
@@ -3821,14 +3830,14 @@ msgstr "ตัวกรอง"
 msgid "Search this table"
 msgstr "ค้นหาในฐานข้อมูล"
 
-#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2532
-#: libraries/Util.class.php:2535
+#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2538
+#: libraries/Util.class.php:2541
 msgctxt "First page"
 msgid "Begin"
 msgstr "เริ่มต้น"
 
-#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2533
-#: libraries/Util.class.php:2536 libraries/server_bin_log.lib.php:170
+#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2539
+#: libraries/Util.class.php:2542 libraries/server_bin_log.lib.php:170
 #: libraries/server_bin_log.lib.php:172
 #, fuzzy
 #| msgid "Previous"
@@ -3836,15 +3845,15 @@ msgctxt "Previous page"
 msgid "Previous"
 msgstr "ก่อนหน้า"
 
-#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2564
-#: libraries/Util.class.php:2574 libraries/server_bin_log.lib.php:204
+#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2570
+#: libraries/Util.class.php:2580 libraries/server_bin_log.lib.php:204
 #: libraries/server_bin_log.lib.php:206
 msgctxt "Next page"
 msgid "Next"
 msgstr "ถัดไป"
 
-#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2565
-#: libraries/Util.class.php:2575
+#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2571
+#: libraries/Util.class.php:2581
 msgctxt "Last page"
 msgid "End"
 msgstr "สุดท้าย"
@@ -3931,9 +3940,9 @@ msgid "May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]."
 msgstr "มีข้อผิดพลาดระหว่างการอัพโหลด กรุณาดู [doc@faq1-11]FAQ 1.11[/doc]"
 
 #: libraries/DisplayResults.class.php:4332 libraries/Message.class.php:180
-#: libraries/controllers/TableRelationController.class.php:258
+#: libraries/controllers/TableRelationController.class.php:259
 #: libraries/controllers/TableSearchController.class.php:655
-#: libraries/rte/rte_routines.lib.php:1332 libraries/sql_query_form.lib.php:89
+#: libraries/rte/rte_routines.lib.php:1423 libraries/sql_query_form.lib.php:89
 #: tbl_operations.php:227 tbl_row_action.php:138 view_operations.php:62
 #, fuzzy
 #| msgid "Your SQL query has been executed successfully."
@@ -3941,7 +3950,7 @@ msgid "Your SQL query has been executed successfully."
 msgstr "ทำคำค้นเสร็จเรียบร้อยแล้ว"
 
 #: libraries/DisplayResults.class.php:4660
-#: libraries/controllers/StructureController.class.php:629
+#: libraries/controllers/DatabaseStructureController.class.php:564
 #, php-format
 msgid ""
 "This view has at least this number of rows. Please refer to %sdocumentation"
@@ -3965,34 +3974,34 @@ msgstr ""
 msgid "%d total"
 msgstr "ทั้งหมด"
 
-#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1318
+#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1312
 #, fuzzy, php-format
 #| msgid "Query took %01.4f sec"
 msgid "Query took %01.4f seconds."
 msgstr "คำค้นใช้เวลา %01.4f วินาที"
 
 #: libraries/DisplayResults.class.php:4807
-#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4767
-#: libraries/Util.class.php:4773 libraries/mult_submits.inc.php:50
-#: templates/structure/check_all_tables.phtml:2
-#: templates/structure/check_all_tables.phtml:9
+#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4773
+#: libraries/Util.class.php:4779 libraries/mult_submits.inc.php:50
+#: templates/database/structure/check_all_tables.phtml:2
+#: templates/database/structure/check_all_tables.phtml:9
 msgid "With selected:"
 msgstr "ทำกับที่เลือก:"
 
 #: libraries/DisplayResults.class.php:4811
-#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4769
-#: libraries/Util.class.php:4770 libraries/server_privileges.lib.php:1174
+#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4775
+#: libraries/Util.class.php:4776 libraries/server_privileges.lib.php:1174
 #: libraries/server_privileges.lib.php:1175
 #: libraries/server_privileges.lib.php:1387
 #: libraries/server_user_groups.lib.php:231
-#: templates/structure/check_all_tables.phtml:3
-#: templates/structure/check_all_tables.phtml:4
+#: templates/database/structure/check_all_tables.phtml:3
+#: templates/database/structure/check_all_tables.phtml:4
 msgid "Check All"
 msgstr "เลือกทั้งหมด"
 
 #: libraries/DisplayResults.class.php:4985 libraries/Header.class.php:383
-#: templates/structure/optional_action_links.phtml:1
-#: templates/structure/print_view_data_dictionary_link.phtml:3
+#: templates/database/structure/print_view_data_dictionary_link.phtml:3
+#: templates/table/structure/optional_action_links.phtml:1
 msgid "Print view"
 msgstr "แสดง"
 
@@ -4000,7 +4009,8 @@ msgstr "แสดง"
 msgid "Query results operations"
 msgstr "การดำเนินงานผลแบบสอบถาม"
 
-#: libraries/DisplayResults.class.php:5105 templates/tbl_chart.phtml:12
+#: libraries/DisplayResults.class.php:5105
+#: templates/table/chart/tbl_chart.phtml:12
 #, fuzzy
 #| msgid "Display PDF schema"
 msgid "Display chart"
@@ -4103,7 +4113,7 @@ msgid "Click on the bar to scroll to top of page"
 msgstr "คลิกที่แถบเพื่อเลื่อนไปยังบนสุดของหน้า"
 
 #: libraries/Header.class.php:749
-#: libraries/plugins/auth/AuthenticationCookie.class.php:152
+#: libraries/plugins/auth/AuthenticationCookie.class.php:140
 #, fuzzy
 #| msgid "Cookies must be enabled past this point."
 msgid "Javascript must be enabled past this point!"
@@ -4127,11 +4137,11 @@ msgid "Keyname"
 msgstr "ชื่อคีย์"
 
 #: libraries/Index.class.php:697
-#: libraries/controllers/StructureController.class.php:1962
-#: libraries/controllers/StructureController.class.php:1967
+#: libraries/controllers/TableStructureController.class.php:953
+#: libraries/controllers/TableStructureController.class.php:958
 #: libraries/tracking.lib.php:973
 #: templates/columns_definitions/column_indexes.phtml:11
-#: templates/structure/check_all_table_column.phtml:26
+#: templates/table/structure/check_all_table_column.phtml:26
 msgid "Unique"
 msgstr "เอกลักษณ์"
 
@@ -4150,16 +4160,17 @@ msgstr "เอกเทศ"
 #: libraries/server_collations.lib.php:35 libraries/tracking.lib.php:881
 #: libraries/tracking.lib.php:977
 #: templates/columns_definitions/table_fields_definitions.phtml:33
-#: templates/structure/row_stats_table.phtml:31
-#: templates/structure/table_header.phtml:55
-#: templates/structure/table_structure_header.phtml:7
-#: templates/table/table_header.phtml:8
+#: templates/database/structure/table_header.phtml:55
+#: templates/table/search/table_header.phtml:8
+#: templates/table/structure/row_stats_table.phtml:31
+#: templates/table/structure/table_structure_header.phtml:7
 msgid "Collation"
 msgstr "การตรวจทาน"
 
 #: libraries/Index.class.php:703 libraries/rte/rte_events.lib.php:496
-#: libraries/rte/rte_routines.lib.php:956 libraries/tracking.lib.php:885
-#: libraries/tracking.lib.php:979 templates/structure/table_header.phtml:84
+#: libraries/rte/rte_routines.lib.php:1047 libraries/tracking.lib.php:885
+#: libraries/tracking.lib.php:979
+#: templates/database/structure/table_header.phtml:84
 msgid "Comment"
 msgstr "หมายเหตุ"
 
@@ -4172,15 +4183,15 @@ msgstr "โยนคีย์หลักทิ้งไปเรียบร้
 msgid "Index %s has been dropped."
 msgstr "โยนดัชนี %s ทิ้งไปเรียบร้อยแล้ว"
 
-#: libraries/Index.class.php:757 libraries/Util.class.php:3630
-#: libraries/Util.class.php:3631
-#: libraries/controllers/StructureController.class.php:1958
-#: libraries/controllers/StructureController.class.php:1959
+#: libraries/Index.class.php:757 libraries/Util.class.php:3636
+#: libraries/Util.class.php:3637
+#: libraries/controllers/TableStructureController.class.php:949
+#: libraries/controllers/TableStructureController.class.php:950
 #: libraries/operations.lib.php:1607 libraries/rte/rte_list.lib.php:150
 #: libraries/server_databases.lib.php:146
-#: templates/structure/check_all_table_column.phtml:15
-#: templates/structure/check_all_tables.phtml:16
-#: templates/tbl_relation/foreign_key_row.phtml:93
+#: templates/database/structure/check_all_tables.phtml:16
+#: templates/table/relation/foreign_key_row.phtml:93
+#: templates/table/structure/check_all_table_column.phtml:15
 msgid "Drop"
 msgstr "โยนทิ้ง"
 
@@ -4209,16 +4220,16 @@ msgstr "เซิร์ฟเวอร์"
 #: libraries/Menu.class.php:248
 #: libraries/navigation/Nodes/Node_View.class.php:32
 #: libraries/tbl_info.inc.php:63
-#: templates/structure/structure_table_row.phtml:97
-#: templates/structure/structure_table_row.phtml:159
+#: templates/database/structure/structure_table_row.phtml:97
+#: templates/database/structure/structure_table_row.phtml:159
 msgid "View"
 msgstr "ตารางจำลอง (View)"
 
 #: libraries/Menu.class.php:325 libraries/Menu.class.php:429
-#: libraries/Menu.class.php:548 libraries/Util.class.php:3334
-#: libraries/Util.class.php:3344 libraries/Util.class.php:3350
-#: libraries/Util.class.php:4313 libraries/Util.class.php:4328
-#: libraries/Util.class.php:4345 libraries/config.values.php:40
+#: libraries/Menu.class.php:548 libraries/Util.class.php:3340
+#: libraries/Util.class.php:3350 libraries/Util.class.php:3356
+#: libraries/Util.class.php:4319 libraries/Util.class.php:4334
+#: libraries/Util.class.php:4351 libraries/config.values.php:40
 #: libraries/config.values.php:48 libraries/config.values.php:110
 #: libraries/config.values.php:116 libraries/config/messages.inc.php:321
 #: libraries/navigation/Nodes/Node_Table.class.php:292
@@ -4226,19 +4237,19 @@ msgid "SQL"
 msgstr "SQL"
 
 #: libraries/Menu.class.php:328 libraries/Menu.class.php:432
-#: libraries/Util.class.php:3335 libraries/Util.class.php:3345
-#: libraries/Util.class.php:3351 libraries/Util.class.php:3625
-#: libraries/Util.class.php:3626 libraries/Util.class.php:4329
-#: libraries/Util.class.php:4346 libraries/config.values.php:41
+#: libraries/Util.class.php:3341 libraries/Util.class.php:3351
+#: libraries/Util.class.php:3357 libraries/Util.class.php:3631
+#: libraries/Util.class.php:3632 libraries/Util.class.php:4335
+#: libraries/Util.class.php:4352 libraries/config.values.php:41
 #: libraries/config.values.php:49 libraries/config.values.php:111
 #: libraries/config.values.php:117
 #: libraries/navigation/Nodes/Node_Table.class.php:286
 msgid "Search"
 msgstr "ค้นหา"
 
-#: libraries/Menu.class.php:338 libraries/Util.class.php:3336
-#: libraries/Util.class.php:3346 libraries/Util.class.php:3627
-#: libraries/Util.class.php:3628 libraries/Util.class.php:4347
+#: libraries/Menu.class.php:338 libraries/Util.class.php:3342
+#: libraries/Util.class.php:3352 libraries/Util.class.php:3633
+#: libraries/Util.class.php:3634 libraries/Util.class.php:4353
 #: libraries/config.values.php:42 libraries/config.values.php:50
 #: libraries/config.values.php:118
 #: libraries/navigation/Nodes/Node_Table.class.php:289
@@ -4247,30 +4258,30 @@ msgid "Insert"
 msgstr "แทรก"
 
 #: libraries/Menu.class.php:362 libraries/Menu.class.php:467
-#: libraries/Util.class.php:4334 libraries/Util.class.php:4350
+#: libraries/Util.class.php:4340 libraries/Util.class.php:4356
 #: libraries/config.values.php:106 libraries/server_common.lib.php:51
 #: libraries/server_privileges.lib.php:2370
 #: libraries/server_privileges.lib.php:3158
-#: libraries/server_privileges.lib.php:4221
+#: libraries/server_privileges.lib.php:4247
 msgid "Privileges"
 msgstr "สิทธิ"
 
 #: libraries/Menu.class.php:371 libraries/Menu.class.php:379
-#: libraries/Menu.class.php:459 libraries/Util.class.php:3338
-#: libraries/Util.class.php:3352 libraries/Util.class.php:4333
-#: libraries/Util.class.php:4351 libraries/config.values.php:112
+#: libraries/Menu.class.php:459 libraries/Util.class.php:3344
+#: libraries/Util.class.php:3358 libraries/Util.class.php:4339
+#: libraries/Util.class.php:4357 libraries/config.values.php:112
 #: view_operations.php:92
 msgid "Operations"
 msgstr "กระบวนการ"
 
 #: libraries/Menu.class.php:384 libraries/Menu.class.php:492
-#: libraries/Util.class.php:4338 libraries/Util.class.php:4352
+#: libraries/Util.class.php:4344 libraries/Util.class.php:4358
 #: libraries/relation.lib.php:255
 msgid "Tracking"
 msgstr "การติดตาม"
 
 #: libraries/Menu.class.php:397 libraries/Menu.class.php:486
-#: libraries/Util.class.php:4337 libraries/Util.class.php:4353
+#: libraries/Util.class.php:4343 libraries/Util.class.php:4359
 #: libraries/navigation/Nodes/Node_Trigger_Container.class.php:24
 #: libraries/plugins/export/ExportHtmlword.class.php:557
 #: libraries/plugins/export/ExportOdt.class.php:685
@@ -4287,16 +4298,16 @@ msgstr "ทริกเกอร์"
 msgid "Database seems to be empty!"
 msgstr "ดูเหมือนว่าฐานข้อมูลจะว่างเปล่า!"
 
-#: libraries/Menu.class.php:439 libraries/Util.class.php:4330
+#: libraries/Menu.class.php:439 libraries/Util.class.php:4336
 msgid "Query"
 msgstr "คำค้นจากตัวอย่าง"
 
-#: libraries/Menu.class.php:472 libraries/Util.class.php:4335
+#: libraries/Menu.class.php:472 libraries/Util.class.php:4341
 #: libraries/rte/rte_words.lib.php:36
 msgid "Routines"
 msgstr ""
 
-#: libraries/Menu.class.php:479 libraries/Util.class.php:4336
+#: libraries/Menu.class.php:479 libraries/Util.class.php:4342
 #: libraries/navigation/Nodes/Node_Event_Container.class.php:26
 #: libraries/plugins/export/ExportSql.class.php:940
 #: libraries/plugins/export/ExportXml.class.php:107
@@ -4304,22 +4315,22 @@ msgstr ""
 msgid "Events"
 msgstr "เหตุการณ์"
 
-#: libraries/Menu.class.php:498 libraries/Util.class.php:4339
+#: libraries/Menu.class.php:498 libraries/Util.class.php:4345
 msgid "Designer"
 msgstr "ผู้ออกแบบ"
 
-#: libraries/Menu.class.php:507 libraries/Util.class.php:4340
-#: templates/structure/check_all_tables.phtml:35
+#: libraries/Menu.class.php:507 libraries/Util.class.php:4346
+#: templates/database/structure/check_all_tables.phtml:35
 #, fuzzy
 #| msgid "Add/Delete Field Columns"
 msgid "Central columns"
 msgstr "เพิ่ม/ลบ คอลัมน์ (ฟิลด์)"
 
-#: libraries/Menu.class.php:544 libraries/Util.class.php:4312
+#: libraries/Menu.class.php:544 libraries/Util.class.php:4318
 #: libraries/config.values.php:103 libraries/config/messages.inc.php:266
 #: libraries/config/messages.inc.php:341
 #: libraries/navigation/NavigationTree.class.php:1239
-#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4332
+#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4358
 msgid "Databases"
 msgstr "ฐานข้อมูล"
 
@@ -4330,35 +4341,35 @@ msgid "User accounts"
 msgstr "ผู้ใช้"
 
 #: libraries/Menu.class.php:595 libraries/ServerStatusData.class.php:121
-#: libraries/Util.class.php:4319 libraries/server_common.lib.php:36
+#: libraries/Util.class.php:4325 libraries/server_common.lib.php:36
 #, fuzzy
 msgid "Binary log"
 msgstr "ข้อมูลไบนารี "
 
 #: libraries/Menu.class.php:601 libraries/ServerStatusData.class.php:126
-#: libraries/Util.class.php:4320 libraries/server_common.lib.php:42
-#: templates/structure/body_for_table_summary.phtml:10
-#: templates/structure/table_header.phtml:27
+#: libraries/Util.class.php:4326 libraries/server_common.lib.php:42
+#: templates/database/structure/body_for_table_summary.phtml:10
+#: templates/database/structure/table_header.phtml:27
 msgid "Replication"
 msgstr "การจำลองแบบ"
 
 #: libraries/Menu.class.php:606 libraries/ServerStatusData.class.php:193
-#: libraries/Util.class.php:4321 libraries/config.values.php:105
+#: libraries/Util.class.php:4327 libraries/config.values.php:105
 #: libraries/server_engines.lib.php:108 libraries/server_engines.lib.php:112
 #: libraries/sql_query_form.lib.php:421
 msgid "Variables"
 msgstr "ตัวแปร"
 
-#: libraries/Menu.class.php:610 libraries/Util.class.php:4322
+#: libraries/Menu.class.php:610 libraries/Util.class.php:4328
 msgid "Charsets"
 msgstr "ชุดอักขระ"
 
-#: libraries/Menu.class.php:615 libraries/Util.class.php:4323
+#: libraries/Menu.class.php:615 libraries/Util.class.php:4329
 #: libraries/server_common.lib.php:33 libraries/server_plugins.lib.php:27
 msgid "Plugins"
 msgstr "ปลั๊กอิน"
 
-#: libraries/Menu.class.php:626 libraries/Util.class.php:4324
+#: libraries/Menu.class.php:626 libraries/Util.class.php:4330
 msgid "Engines"
 msgstr "เครื่องมือ"
 
@@ -4380,7 +4391,7 @@ msgid "%1$d row inserted."
 msgid_plural "%1$d rows inserted."
 msgstr[0] "%1$d ระเบียนถูกเพิ่ม"
 
-#: libraries/PDF.class.php:70 libraries/Util.class.php:2521
+#: libraries/PDF.class.php:70 libraries/Util.class.php:2527
 #: libraries/browse_foreigners.lib.php:327
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:865
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:890
@@ -4405,7 +4416,7 @@ msgid "Could not save favorite table!"
 msgstr "ไม่สามารถบันทึกตารางล่าสุด"
 
 #: libraries/RecentFavoriteTable.class.php:212
-#: templates/structure/favorite_anchor.phtml:12
+#: templates/database/structure/favorite_anchor.phtml:12
 #, fuzzy
 #| msgid "Remove chart"
 msgid "Remove from Favorites"
@@ -4592,7 +4603,7 @@ msgid ""
 msgstr "ไม่มีข้อมูลเกี่ยวกับรูปแบบฐานข้อมูลนี้"
 
 #: libraries/StorageEngine.class.php:373
-#: templates/structure/body_for_table_summary.phtml:50
+#: templates/database/structure/body_for_table_summary.phtml:50
 #, php-format
 msgid "%s is the default storage engine on this MySQL server."
 msgstr "เซิร์ฟเวอร์ MySQL นี้ใช้ storage engine ชื่อ %s เป็นค่าเริ่มต้น"
@@ -5037,10 +5048,10 @@ msgstr ""
 
 #: libraries/Util.class.php:726 libraries/rte/rte_events.lib.php:110
 #: libraries/rte/rte_events.lib.php:119 libraries/rte/rte_events.lib.php:150
-#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:153
-#: libraries/rte/rte_routines.lib.php:162
-#: libraries/rte/rte_routines.lib.php:235
-#: libraries/rte/rte_routines.lib.php:1366
+#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:223
+#: libraries/rte/rte_routines.lib.php:250
+#: libraries/rte/rte_routines.lib.php:372
+#: libraries/rte/rte_routines.lib.php:1457
 #: libraries/rte/rte_triggers.lib.php:86 libraries/rte/rte_triggers.lib.php:95
 #: libraries/rte/rte_triggers.lib.php:127
 msgid "MySQL said: "
@@ -5086,80 +5097,83 @@ msgstr "อา."
 msgid "%B %d, %Y at %I:%M %p"
 msgstr "%d %B %Y  %Rน."
 
-#: libraries/Util.class.php:2019
+#: libraries/Util.class.php:2025
 #, php-format
 msgid "%s days, %s hours, %s minutes and %s seconds"
 msgstr "%s วัน, %s ชั่วโมง, %s นาที, %s วินาที"
 
-#: libraries/Util.class.php:2112
+#: libraries/Util.class.php:2118
 #, fuzzy
 #| msgid "Add new field"
 msgid "Missing parameter:"
 msgstr "เพิ่มฟิลด์ใหม่"
 
-#: libraries/Util.class.php:2645
+#: libraries/Util.class.php:2651
 #, php-format
 msgid "Jump to database \"%s\"."
 msgstr "กระโดดไปที่ฐานข้อมูล \"%s\"."
 
-#: libraries/Util.class.php:2670
+#: libraries/Util.class.php:2676
 #, php-format
 msgid "The %s functionality is affected by a known bug, see %s"
 msgstr ""
 
-#: libraries/Util.class.php:2881
+#: libraries/Util.class.php:2887
 msgid "Click to toggle"
 msgstr "คลิกเพื่อสลับ"
 
-#: libraries/Util.class.php:3542 prefs_manage.php:248
+#: libraries/Util.class.php:3548 prefs_manage.php:248
 msgid "Browse your computer:"
 msgstr "เรียกดูคอมพิวเตอร์ของคุณ:"
 
-#: libraries/Util.class.php:3567
+#: libraries/Util.class.php:3573
 #, fuzzy, php-format
 #| msgid "web server upload directory"
 msgid "Select from the web server upload directory <b>%s</b>:"
 msgstr "ไดเรกทอรีสำหรับอัพโหลด ที่เว็บเซิร์ฟเวอร์"
 
-#: libraries/Util.class.php:3596 libraries/insert_edit.lib.php:1173
+#: libraries/Util.class.php:3602 libraries/insert_edit.lib.php:1171
 msgid "The directory you set for upload work cannot be reached."
 msgstr "ไม่สามารถใช้งาน ไดเรกทอรีที่ตั้งไว้สำหรับอัพโหลดได้"
 
-#: libraries/Util.class.php:3607
+#: libraries/Util.class.php:3613
 #, fuzzy
 #| msgid "There are no files to upload"
 msgid "There are no files to upload!"
 msgstr "ไม่มีไฟล์ที่จะอัพโหลด"
 
-#: libraries/Util.class.php:3632 libraries/Util.class.php:3633
-#: templates/structure/check_all_tables.phtml:15
+#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: templates/database/structure/check_all_tables.phtml:15
 msgid "Empty"
 msgstr "ลบข้อมูล"
 
-#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: libraries/Util.class.php:3644 libraries/Util.class.php:3645
 msgid "Execute"
 msgstr "ดำเนินการ"
 
-#: libraries/Util.class.php:4152
+#: libraries/Util.class.php:4158
 msgid "Print"
 msgstr "พิมพ์"
 
-#: libraries/Util.class.php:4257 templates/structure/row_stats_table.phtml:80
-#: templates/structure/table_header.phtml:95
+#: libraries/Util.class.php:4263
+#: templates/database/structure/table_header.phtml:95
+#: templates/table/structure/row_stats_table.phtml:80
 msgid "Creation"
 msgstr "สร้างเมื่อ"
 
-#: libraries/Util.class.php:4263 templates/structure/row_stats_table.phtml:87
-#: templates/structure/table_header.phtml:106
+#: libraries/Util.class.php:4269
+#: templates/database/structure/table_header.phtml:106
+#: templates/table/structure/row_stats_table.phtml:87
 msgid "Last update"
 msgstr "ปรับปรุงครั้งสุดท้ายเมื่อ"
 
-#: libraries/Util.class.php:4269 templates/structure/row_stats_table.phtml:94
-#: templates/structure/table_header.phtml:117
+#: libraries/Util.class.php:4275
+#: templates/database/structure/table_header.phtml:117
+#: templates/table/structure/row_stats_table.phtml:94
 msgid "Last check"
 msgstr "ตรวจสอบครั้งสุดท้ายเมื่อ"
 
-#: libraries/Util.class.php:4315
+#: libraries/Util.class.php:4321
 msgid "Users"
 msgstr "ผู้ใช้"
 
@@ -5182,16 +5196,16 @@ msgid "Use this value"
 msgstr "ใช้ค่านี้"
 
 #: libraries/build_html_for_db.lib.php:33 libraries/import.lib.php:193
-#: templates/structure/actions_in_table_structure.phtml:113
-#: templates/structure/row_stats_table.phtml:42
-#: templates/structure/table_header.phtml:36
+#: templates/database/structure/table_header.phtml:36
+#: templates/table/structure/actions_in_table_structure.phtml:113
+#: templates/table/structure/row_stats_table.phtml:42
 msgid "Rows"
 msgstr "แถว"
 
 #: libraries/build_html_for_db.lib.php:48 libraries/engines/innodb.lib.php:171
-#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:186
-#: libraries/server_status.lib.php:298
-#: templates/structure/display_table_stats.phtml:40
+#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:195
+#: libraries/server_status.lib.php:307
+#: templates/table/structure/display_table_stats.phtml:40
 msgid "Total"
 msgstr "รวม"
 
@@ -5200,10 +5214,12 @@ msgid "Jump to database"
 msgstr "ข้ามไปยังฐานข้อมูล"
 
 #: libraries/build_html_for_db.lib.php:146
+#: templates/database/structure/structure_table_row.phtml:15
 msgid "Not replicated"
 msgstr "ไม่ซ้ำ"
 
 #: libraries/build_html_for_db.lib.php:158
+#: templates/database/structure/structure_table_row.phtml:16
 msgid "Replicated"
 msgstr "ทำซ้ำเรียบร้อยแล้ว"
 
@@ -5260,17 +5276,17 @@ msgstr ""
 #: libraries/plugins/export/ExportTexytext.class.php:425
 #: libraries/plugins/export/PMA_ExportPdf.class.php:307
 #: libraries/rte/rte_list.lib.php:73 libraries/rte/rte_list.lib.php:85
-#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:830
-#: libraries/rte/rte_routines.lib.php:1492 setup/frames/index.inc.php:162
+#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:921
+#: libraries/rte/rte_routines.lib.php:1583 setup/frames/index.inc.php:162
 #: templates/columns_definitions/table_fields_definitions.phtml:8
-#: templates/structure/table_structure_header.phtml:5
-#: templates/table/create_table.phtml:11
+#: templates/database/create_table.phtml:11
+#: templates/table/structure/table_structure_header.phtml:5
 msgid "Name"
 msgstr "ชื่อ"
 
 #: libraries/central_columns.lib.php:699
 #: libraries/central_columns.lib.php:1381
-#: libraries/rte/rte_routines.lib.php:832
+#: libraries/rte/rte_routines.lib.php:923
 #: templates/columns_definitions/table_fields_definitions.phtml:14
 msgid "Length/Values"
 msgstr "ความยาว/เซต*"
@@ -5293,7 +5309,7 @@ msgid "Select a table"
 msgstr "เลือกตาราง"
 
 #: libraries/central_columns.lib.php:804
-#: templates/structure/add_column.phtml:4
+#: templates/table/structure/add_column.phtml:4
 #, fuzzy
 msgid "Add column"
 msgstr "เพิ่มฟิลด์ใหม่"
@@ -5313,7 +5329,7 @@ msgstr "เพิ่มฟิลด์ใหม่"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1002
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1025
 #: templates/columns_definitions/table_fields_definitions.phtml:36
-#: templates/structure/table_structure_header.phtml:8
+#: templates/table/structure/table_structure_header.phtml:8
 msgid "Attributes"
 msgstr "แอตทริบิวต์"
 
@@ -5434,7 +5450,7 @@ msgid "Double click"
 msgstr "ดับเบิลคลิก"
 
 #: libraries/config.values.php:95 libraries/config.values.php:124
-#: libraries/config/FormDisplay.tpl.php:221 libraries/relation.lib.php:97
+#: libraries/config/FormDisplay.tpl.php:232 libraries/relation.lib.php:97
 #: libraries/relation.lib.php:105
 msgid "Disabled"
 msgstr "ระงับการใช้อยู่"
@@ -5632,21 +5648,21 @@ msgstr ""
 msgid "maximum %s"
 msgstr "สูงสุด %s"
 
-#: libraries/config/FormDisplay.tpl.php:219
+#: libraries/config/FormDisplay.tpl.php:230
 msgid "This setting is disabled, it will not be applied to your configuration."
 msgstr ""
 
-#: libraries/config/FormDisplay.tpl.php:313
+#: libraries/config/FormDisplay.tpl.php:324
 #, php-format
 msgid "Set value: %s"
 msgstr "ตั้งค่า: %s"
 
-#: libraries/config/FormDisplay.tpl.php:318
+#: libraries/config/FormDisplay.tpl.php:329
 #: libraries/config/messages.inc.php:610
 msgid "Restore default value"
 msgstr "คืนค่าเดิม"
 
-#: libraries/config/FormDisplay.tpl.php:332
+#: libraries/config/FormDisplay.tpl.php:343
 msgid "Allow users to customize this value"
 msgstr "อนุญาตให้ผู้ใช้แก้ไขค่านี้"
 
@@ -6098,7 +6114,7 @@ msgstr "ชุดอักขระของไฟล์"
 
 #: libraries/config/messages.inc.php:136 libraries/config/messages.inc.php:152
 #: libraries/sql_query_form.lib.php:247
-#: templates/structure/row_stats_table.phtml:7
+#: templates/table/structure/row_stats_table.phtml:7
 msgid "Format"
 msgstr "รูปแบบ"
 
@@ -6660,7 +6676,7 @@ msgstr ""
 
 #: libraries/config/messages.inc.php:332
 #: libraries/plugins/export/ExportPdf.class.php:279
-#: templates/structure/secondary_tabs.phtml:8
+#: templates/table/secondary_tabs.phtml:8
 msgid "Table structure"
 msgstr "โครงสร้างของตาราง"
 
@@ -8301,110 +8317,35 @@ msgstr ""
 msgid "OpenDocument Text"
 msgstr "เอกสารอ้างอิง"
 
-#: libraries/controllers/StructureController.class.php:465
+#: libraries/controllers/DatabaseStructureController.class.php:405
 #: tbl_operations.php:382
 #, php-format
 msgid "Table %s has been emptied."
 msgstr "ลบข้อมูลในตาราง %s เรียบร้อยแล้ว"
 
-#: libraries/controllers/StructureController.class.php:486
+#: libraries/controllers/DatabaseStructureController.class.php:426
 #: tbl_operations.php:400 view_operations.php:119
 #, fuzzy, php-format
 #| msgid "View %s has been dropped."
 msgid "View %s has been dropped."
 msgstr "โยนวิว %s ทิ้งไปเรียบร้อยแล้ว"
 
-#: libraries/controllers/StructureController.class.php:487
+#: libraries/controllers/DatabaseStructureController.class.php:427
 #: tbl_operations.php:401
 #, fuzzy, php-format
 #| msgid "Table %s has been dropped."
 msgid "Table %s has been dropped."
 msgstr "โยนตาราง %s ทิ้งไปเรียบร้อยแล้ว"
 
-#: libraries/controllers/StructureController.class.php:797
-#, php-format
-msgid "The name '%s' is a MySQL reserved keyword."
-msgid_plural "The names '%s' are MySQL reserved keywords."
-msgstr[0] ""
-
-#: libraries/controllers/StructureController.class.php:875
-#, fuzzy
-#| msgid "No rows selected"
-msgid "No column selected."
-msgstr "ยังไม่ได้เลือกแถว"
-
-#: libraries/controllers/StructureController.class.php:1049
+#: libraries/controllers/DatabaseStructureController.class.php:733
 msgid "Favorite List is full!"
 msgstr ""
 
-#: libraries/controllers/StructureController.class.php:1272
-#, fuzzy
-#| msgid "The selected users have been deleted successfully."
-msgid "The columns have been moved successfully."
-msgstr "ลบผู้ใช้ที่เลือกไว้เรียบร้อยแล้ว."
-
-#: libraries/controllers/StructureController.class.php:1535
-#, fuzzy, php-format
-msgid ""
-"Table %1$s has been altered successfully. Privileges have been adjusted."
-msgstr "ลบผู้ใช้ที่เลือกไว้เรียบร้อยแล้ว."
-
-#: libraries/controllers/StructureController.class.php:1541
-#: libraries/controllers/TableIndexesController.class.php:161
-#: tbl_addfield.php:92
-#, fuzzy, php-format
-msgid "Table %1$s has been altered successfully."
-msgstr "ลบผู้ใช้ที่เลือกไว้เรียบร้อยแล้ว."
-
-#: libraries/controllers/StructureController.class.php:1588
-#: libraries/tracking.lib.php:1094
-#, fuzzy
-#| msgid "Query type"
-msgid "Query error"
-msgstr "ชนิดคำค้น"
-
-#: libraries/controllers/StructureController.class.php:1806
+#: libraries/controllers/DatabaseStructureController.class.php:947
 #: libraries/mysql_charsets.lib.php:366 libraries/mysql_charsets.lib.php:373
 msgid "unknown"
 msgstr "ไม่ระบุ"
 
-#: libraries/controllers/StructureController.class.php:1957
-#: templates/structure/check_all_table_column.phtml:11
-msgid "Change"
-msgstr "เปลี่ยน"
-
-#: libraries/controllers/StructureController.class.php:1961
-#: libraries/controllers/StructureController.class.php:1966
-#: libraries/navigation/Nodes/Node_Index.class.php:30
-#: libraries/tracking.lib.php:926
-#: templates/columns_definitions/column_indexes.phtml:16
-#: templates/columns_definitions/table_fields_definitions.phtml:57
-#: templates/structure/check_all_table_column.phtml:30
-#: templates/structure/display_structure.phtml:79
-#: templates/structure/display_table_stats.phtml:19
-msgid "Index"
-msgstr "ดัชนี"
-
-#: libraries/controllers/StructureController.class.php:1963
-#: libraries/controllers/StructureController.class.php:1968
-#: templates/columns_definitions/column_indexes.phtml:27
-#: templates/structure/check_all_table_column.phtml:37
-msgid "Spatial"
-msgstr "เชิงพื้นที่"
-
-#: libraries/controllers/StructureController.class.php:1964
-#: libraries/controllers/StructureController.class.php:1969
-#: templates/columns_definitions/column_indexes.phtml:22
-#: templates/structure/check_all_table_column.phtml:47
-msgid "Fulltext"
-msgstr "ข้อความเต็ม (fulltext)"
-
-#: libraries/controllers/StructureController.class.php:1970
-#, fuzzy
-#| msgid "Session value"
-msgid "Distinct values"
-msgstr "ค่าเซสชั่น"
-
 #: libraries/controllers/TableChartController.class.php:82
 #: libraries/controllers/TableGisVisualizationController.class.php:101
 msgid "No SQL query was set to fetch data."
@@ -8420,13 +8361,20 @@ msgstr ""
 msgid "No data to display"
 msgstr "ไม่มีข้อมูล"
 
-#: libraries/controllers/TableRelationController.class.php:217
+#: libraries/controllers/TableIndexesController.class.php:161
+#: libraries/controllers/TableStructureController.class.php:736
+#: tbl_addfield.php:92
+#, fuzzy, php-format
+msgid "Table %1$s has been altered successfully."
+msgstr "ลบผู้ใช้ที่เลือกไว้เรียบร้อยแล้ว."
+
+#: libraries/controllers/TableRelationController.class.php:218
 #, fuzzy
 #| msgid "Thread %s was successfully killed."
 msgid "Display column was successfully updated."
 msgstr "เธรด %s ถูกทำลายเรียบร้อยแล้ว."
 
-#: libraries/controllers/TableRelationController.class.php:283
+#: libraries/controllers/TableRelationController.class.php:288
 #, fuzzy
 msgid "Internal relations were successfully updated."
 msgstr "รีเลชันภายใน"
@@ -8444,12 +8392,80 @@ msgid "Zoom search"
 msgstr "ค้นหาแบบ Zoom"
 
 #: libraries/controllers/TableSearchController.class.php:852
-#: templates/table/selection_form.phtml:59
+#: templates/table/search/selection_form.phtml:59
 #, fuzzy
 #| msgid "Hide search criteria"
 msgid "Find and replace"
 msgstr "ซ่อนหลักในการค้นหา"
 
+#: libraries/controllers/TableStructureController.class.php:163
+#, php-format
+msgid "The name '%s' is a MySQL reserved keyword."
+msgid_plural "The names '%s' are MySQL reserved keywords."
+msgstr[0] ""
+
+#: libraries/controllers/TableStructureController.class.php:241
+#, fuzzy
+#| msgid "No rows selected"
+msgid "No column selected."
+msgstr "ยังไม่ได้เลือกแถว"
+
+#: libraries/controllers/TableStructureController.class.php:467
+#, fuzzy
+#| msgid "The selected users have been deleted successfully."
+msgid "The columns have been moved successfully."
+msgstr "ลบผู้ใช้ที่เลือกไว้เรียบร้อยแล้ว."
+
+#: libraries/controllers/TableStructureController.class.php:730
+#, fuzzy, php-format
+msgid ""
+"Table %1$s has been altered successfully. Privileges have been adjusted."
+msgstr "ลบผู้ใช้ที่เลือกไว้เรียบร้อยแล้ว."
+
+#: libraries/controllers/TableStructureController.class.php:783
+#: libraries/tracking.lib.php:1094
+#, fuzzy
+#| msgid "Query type"
+msgid "Query error"
+msgstr "ชนิดคำค้น"
+
+#: libraries/controllers/TableStructureController.class.php:948
+#: templates/table/structure/check_all_table_column.phtml:11
+msgid "Change"
+msgstr "เปลี่ยน"
+
+#: libraries/controllers/TableStructureController.class.php:952
+#: libraries/controllers/TableStructureController.class.php:957
+#: libraries/navigation/Nodes/Node_Index.class.php:30
+#: libraries/tracking.lib.php:926
+#: templates/columns_definitions/column_indexes.phtml:16
+#: templates/columns_definitions/table_fields_definitions.phtml:57
+#: templates/table/structure/check_all_table_column.phtml:30
+#: templates/table/structure/display_structure.phtml:79
+#: templates/table/structure/display_table_stats.phtml:19
+msgid "Index"
+msgstr "ดัชนี"
+
+#: libraries/controllers/TableStructureController.class.php:954
+#: libraries/controllers/TableStructureController.class.php:959
+#: templates/columns_definitions/column_indexes.phtml:27
+#: templates/table/structure/check_all_table_column.phtml:37
+msgid "Spatial"
+msgstr "เชิงพื้นที่"
+
+#: libraries/controllers/TableStructureController.class.php:955
+#: libraries/controllers/TableStructureController.class.php:960
+#: templates/columns_definitions/column_indexes.phtml:22
+#: templates/table/structure/check_all_table_column.phtml:47
+msgid "Fulltext"
+msgstr "ข้อความเต็ม (fulltext)"
+
+#: libraries/controllers/TableStructureController.class.php:963
+#, fuzzy
+#| msgid "Session value"
+msgid "Distinct values"
+msgstr "ค่าเซสชั่น"
+
 #: libraries/core.lib.php:306
 #, php-format
 msgid "The %s extension is missing. Please check your PHP configuration."
@@ -8496,7 +8512,7 @@ msgid "No Password"
 msgstr "ไม่มีรหัสผ่าน"
 
 #: libraries/display_change_password.lib.php:68
-#: libraries/plugins/auth/AuthenticationCookie.class.php:199
+#: libraries/plugins/auth/AuthenticationCookie.class.php:187
 #: libraries/replication_gui.lib.php:422 libraries/replication_gui.lib.php:862
 #: libraries/server_privileges.lib.php:1640
 msgid "Password:"
@@ -9285,12 +9301,12 @@ msgid "Dump has been saved to file %s."
 msgstr "ข้อมูลที่ส่งออกถูกบันทึกไว้ในไฟล์ %s"
 
 #: libraries/import.lib.php:202 libraries/insert_edit.lib.php:124
-#: libraries/rte/rte_routines.lib.php:1353 libraries/sql.lib.php:1312
+#: libraries/rte/rte_routines.lib.php:1444 libraries/sql.lib.php:1306
 #: tbl_get_field.php:44
 msgid "MySQL returned an empty result set (i.e. zero rows)."
 msgstr "MySQL คืนผลลัพธ์ว่างเปล่ากลับมา (null / 0 แถว)."
 
-#: libraries/import.lib.php:265 libraries/sql.lib.php:1326
+#: libraries/import.lib.php:265 libraries/sql.lib.php:1320
 msgid "[ROLLBACK occurred.]"
 msgstr ""
 
@@ -9356,14 +9372,14 @@ msgstr "สร้างดัชนีโดยคอลัมน์ %s"
 
 #: libraries/insert_edit.lib.php:233
 #: libraries/navigation/Nodes/Node_DatabaseChild.class.php:48
-#: templates/designer/table_list.phtml:40
+#: templates/database/designer/table_list.phtml:40
 msgid "Hide"
 msgstr ""
 
 #: libraries/insert_edit.lib.php:249
 #: libraries/navigation/Nodes/Node_Function.class.php:32
-#: libraries/rte/rte_routines.lib.php:1495
-#: templates/table/table_header.phtml:4
+#: libraries/rte/rte_routines.lib.php:1586
+#: templates/table/search/table_header.phtml:4
 msgid "Function"
 msgstr "ฟังก์ชั่น"
 
@@ -9378,87 +9394,88 @@ msgstr "ข้อมูลไบนารี"
 msgid "Because of its length,<br /> this column might not be editable."
 msgstr "เนื่องจากความยาวของมัน <br />ฟิลด์นี้ ไม่อาจแก้ไขได้"
 
-#: libraries/insert_edit.lib.php:1050
+#: libraries/insert_edit.lib.php:1048
 msgid "Binary - do not edit"
 msgstr "ข้อมูลไบนารี - ห้ามแก้ไข"
 
-#: libraries/insert_edit.lib.php:1176 libraries/server_privileges.lib.php:470
-#: templates/table/options.phtml:36
+#: libraries/insert_edit.lib.php:1174 libraries/server_privileges.lib.php:470
+#: templates/table/search/options.phtml:36
 msgid "Or"
 msgstr "หรือ"
 
-#: libraries/insert_edit.lib.php:1177
+#: libraries/insert_edit.lib.php:1175
 #, fuzzy
 #| msgid "web server upload directory"
 msgid "web server upload directory:"
 msgstr "ไดเรกทอรีสำหรับอัพโหลด ที่เว็บเซิร์ฟเวอร์"
 
-#: libraries/insert_edit.lib.php:1348 templates/table/input_box.phtml:49
+#: libraries/insert_edit.lib.php:1346
+#: templates/table/search/input_box.phtml:49
 #, fuzzy
 #| msgid "Insert"
 msgid "Edit/Insert"
 msgstr "แทรก"
 
-#: libraries/insert_edit.lib.php:1398
+#: libraries/insert_edit.lib.php:1396
 #, php-format
 msgid "Continue insertion with %s rows"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1428
+#: libraries/insert_edit.lib.php:1426
 msgid "and then"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1461
+#: libraries/insert_edit.lib.php:1459
 msgid "Insert as new row"
 msgstr "แทรกเป็นแถวใหม่"
 
-#: libraries/insert_edit.lib.php:1464
+#: libraries/insert_edit.lib.php:1462
 msgid "Insert as new row and ignore errors"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1467
+#: libraries/insert_edit.lib.php:1465
 msgid "Show insert query"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1487
+#: libraries/insert_edit.lib.php:1485
 msgid "Go back to previous page"
 msgstr "ส่งกลับ"
 
-#: libraries/insert_edit.lib.php:1490
+#: libraries/insert_edit.lib.php:1488
 msgid "Insert another new row"
 msgstr "แทรกระเบียนใหม่"
 
-#: libraries/insert_edit.lib.php:1495
+#: libraries/insert_edit.lib.php:1493
 #, fuzzy
 msgid "Go back to this page"
 msgstr "ส่งกลับ"
 
-#: libraries/insert_edit.lib.php:1518
+#: libraries/insert_edit.lib.php:1516
 msgid "Edit next row"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1540
+#: libraries/insert_edit.lib.php:1538
 msgid ""
 "Use TAB key to move from value to value, or CTRL+arrows to move anywhere"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1577 libraries/replication_gui.lib.php:542
-#: libraries/rte/rte_routines.lib.php:1497
+#: libraries/insert_edit.lib.php:1575 libraries/replication_gui.lib.php:542
+#: libraries/rte/rte_routines.lib.php:1588
 #: libraries/server_status_variables.lib.php:220
-#: templates/designer/having_query_panel.phtml:100
-#: templates/designer/options_panel.phtml:73
-#: templates/designer/options_panel.phtml:239
-#: templates/designer/where_query_panel.phtml:69
-#: templates/table/table_header.phtml:10
-#: templates/table/zoom_result_form.phtml:35
+#: templates/database/designer/having_query_panel.phtml:100
+#: templates/database/designer/options_panel.phtml:73
+#: templates/database/designer/options_panel.phtml:239
+#: templates/database/designer/where_query_panel.phtml:69
+#: templates/table/search/table_header.phtml:10
+#: templates/table/search/zoom_result_form.phtml:35
 msgid "Value"
 msgstr "ค่า"
 
-#: libraries/insert_edit.lib.php:1937 libraries/sql.lib.php:1309
+#: libraries/insert_edit.lib.php:1935 libraries/sql.lib.php:1303
 msgid "Showing SQL query"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1962 libraries/sql.lib.php:1287
+#: libraries/insert_edit.lib.php:1960 libraries/sql.lib.php:1281
 #, php-format
 msgid "Inserted row id: %1$d"
 msgstr ""
@@ -9905,7 +9922,7 @@ msgstr ""
 #: libraries/navigation/Nodes/Node_View_Container.class.php:26
 #: libraries/navigation/Nodes/Node_View_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:129
-#: templates/structure/show_create.phtml:30
+#: templates/database/structure/show_create.phtml:30
 msgid "Views"
 msgstr ""
 
@@ -10215,7 +10232,7 @@ msgstr "คุณไม่มีสิทธิที่จะเข้ามา
 
 #: libraries/operations.lib.php:101 libraries/operations.lib.php:249
 #: libraries/operations.lib.php:869 libraries/operations.lib.php:963
-#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:907
+#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:998
 #: templates/columns_definitions/table_fields_definitions.phtml:47
 #, fuzzy
 #| msgid "Edit Privileges"
@@ -10309,22 +10326,22 @@ msgid "Switch to copied table"
 msgstr "สลับไปที่ตารางที่ถูกทำสำเนาไว้"
 
 #: libraries/operations.lib.php:1360
-#: templates/structure/check_all_tables.phtml:18
+#: templates/database/structure/check_all_tables.phtml:18
 msgid "Table maintenance"
 msgstr "การดูแลรักษาตาราง"
 
 #: libraries/operations.lib.php:1398
-#: templates/structure/check_all_tables.phtml:19
+#: templates/database/structure/check_all_tables.phtml:19
 msgid "Analyze table"
 msgstr "วิเคราะห์ตาราง"
 
 #: libraries/operations.lib.php:1413
-#: templates/structure/check_all_tables.phtml:20
+#: templates/database/structure/check_all_tables.phtml:20
 msgid "Check table"
 msgstr "ตรวจสอบตาราง"
 
 #: libraries/operations.lib.php:1428
-#: templates/structure/check_all_tables.phtml:22
+#: templates/database/structure/check_all_tables.phtml:22
 #, fuzzy
 #| msgid "Check table"
 msgid "Checksum table"
@@ -10346,18 +10363,19 @@ msgid "Flush the table (FLUSH)"
 msgstr "ล้างตาราง (flush)"
 
 #: libraries/operations.lib.php:1477
-#: templates/structure/check_all_tables.phtml:23
-#: templates/structure/display_table_stats.phtml:56
+#: templates/database/structure/check_all_tables.phtml:23
+#: templates/table/structure/display_table_stats.phtml:56
 msgid "Optimize table"
 msgstr "ปรับแต่งตาราง"
 
 #: libraries/operations.lib.php:1492
-#: templates/structure/check_all_tables.phtml:24
+#: templates/database/structure/check_all_tables.phtml:24
 msgid "Repair table"
 msgstr "ซ่อมแซมตาราง"
 
 #: libraries/operations.lib.php:1538
-#: templates/structure/check_all_tables.phtml:14 view_operations.php:127
+#: templates/database/structure/check_all_tables.phtml:14
+#: view_operations.php:127
 #, fuzzy
 #| msgid "Dumping data for table"
 msgid "Delete data or table"
@@ -10488,7 +10506,7 @@ msgid "Cannot connect: invalid settings."
 msgstr "ไม่สามารถเชื่อมต่อ: ตั้งค่าไม่ถูกต้อง"
 
 #: libraries/plugins/auth/AuthenticationConfig.class.php:108
-#: libraries/plugins/auth/AuthenticationCookie.class.php:134
+#: libraries/plugins/auth/AuthenticationCookie.class.php:122
 #: libraries/plugins/auth/AuthenticationHttp.class.php:96
 #, php-format
 msgid "Welcome to %s"
@@ -10518,38 +10536,38 @@ msgstr ""
 msgid "Retry to connect"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:146
+#: libraries/plugins/auth/AuthenticationCookie.class.php:134
 msgid "Your session has expired. Please log in again."
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:170
+#: libraries/plugins/auth/AuthenticationCookie.class.php:158
 msgid "Log in"
 msgstr "เข้าสู่ระบบ"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:178
-#: libraries/plugins/auth/AuthenticationCookie.class.php:188
+#: libraries/plugins/auth/AuthenticationCookie.class.php:166
+#: libraries/plugins/auth/AuthenticationCookie.class.php:176
 msgid "You can enter hostname/IP address and port separated by space."
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:193
+#: libraries/plugins/auth/AuthenticationCookie.class.php:181
 msgid "Username:"
 msgstr "ชื่อผู้ใช้:"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:205
+#: libraries/plugins/auth/AuthenticationCookie.class.php:193
 #, fuzzy
 #| msgid "Server Choice"
 msgid "Server Choice:"
 msgstr "ตัวเลือกเซิร์ฟเวอร์"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:386
+#: libraries/plugins/auth/AuthenticationCookie.class.php:374
 msgid "Entered captcha is wrong, try again!"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:396
+#: libraries/plugins/auth/AuthenticationCookie.class.php:384
 msgid "Please enter correct captcha!"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:423
+#: libraries/plugins/auth/AuthenticationCookie.class.php:411
 #, fuzzy
 #| msgid "Cannot log in to the MySQL server"
 msgid "You are not allowed to log in to this MySQL server!"
@@ -10658,7 +10676,7 @@ msgstr "เหตุการณ์"
 #: libraries/plugins/export/ExportOdt.class.php:593
 #: libraries/plugins/export/ExportTexytext.class.php:428
 #: libraries/plugins/export/PMA_ExportPdf.class.php:313
-#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:984
 #: libraries/rte/rte_triggers.lib.php:377
 #, fuzzy
 #| msgid "Description"
@@ -11005,7 +11023,7 @@ msgid "Last check:"
 msgstr "ตรวจสอบครั้งสุดท้าย:"
 
 #: libraries/plugins/export/ExportSql.class.php:1399
-#: templates/structure/structure_table_row.phtml:183
+#: templates/database/structure/structure_table_row.phtml:183
 msgid "in use"
 msgstr "ใช้อยู่"
 
@@ -11205,18 +11223,14 @@ msgstr ""
 msgid "The imported file does not contain any data!"
 msgstr "แฟ้ม %s ไม่ควรประกอบไปด้วยรหัสคีย์ใดๆ"
 
-#: libraries/plugins/import/ImportSql.class.php:169
+#: libraries/plugins/import/ImportSql.class.php:72
 msgid "SQL compatibility mode:"
 msgstr "โหมดที่เข้ากันได้กับ SQL:"
 
-#: libraries/plugins/import/ImportSql.class.php:181
+#: libraries/plugins/import/ImportSql.class.php:84
 msgid "Do not use <code>AUTO_INCREMENT</code> for zero values"
 msgstr ""
 
-#: libraries/plugins/import/ImportSql.class.php:195
-msgid "Read as multibytes"
-msgstr ""
-
 #: libraries/plugins/import/ImportXml.class.php:54
 msgid "XML"
 msgstr "XML"
@@ -11261,7 +11275,7 @@ msgid "Show grid"
 msgstr "แสดงกริด"
 
 #: libraries/plugins/schema/SchemaPdf.class.php:94
-#: templates/structure/print_view_data_dictionary_link.phtml:6
+#: templates/database/structure/print_view_data_dictionary_link.phtml:6
 msgid "Data Dictionary"
 msgstr "พจนานุกรมข้อมูล"
 
@@ -11293,7 +11307,7 @@ msgid "The %s table doesn't exist!"
 msgstr "ไม่มีตาราง \"%s\"!"
 
 #: libraries/plugins/schema/eps/Eps_Relation_Schema.class.php:321
-#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:309
+#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:323
 #, fuzzy, php-format
 #| msgid "Schema of the \"%s\" database - Page %s"
 msgid "Schema of the %s database - Page %s"
@@ -11323,7 +11337,7 @@ msgstr "สารบัญ"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1005
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1028
 #: libraries/tracking.lib.php:884
-#: templates/structure/table_structure_header.phtml:11
+#: templates/table/structure/table_structure_header.phtml:11
 msgid "Extra"
 msgstr "เพิ่มเติม"
 
@@ -11670,51 +11684,51 @@ msgstr ""
 msgid "Create the needed tables with the <code>%screate_tables.sql</code>."
 msgstr ""
 
-#: libraries/relation.lib.php:360
+#: libraries/relation.lib.php:357
 msgid "Create a pma user and give access to these tables."
 msgstr ""
 
-#: libraries/relation.lib.php:365
+#: libraries/relation.lib.php:360
 msgid ""
 "Enable advanced features in configuration file (<code>config.inc.php</"
 "code>), for example by starting from <code>config.sample.inc.php</code>."
 msgstr ""
 
-#: libraries/relation.lib.php:373
+#: libraries/relation.lib.php:365
 msgid "Re-login to phpMyAdmin to load the updated configuration file."
 msgstr ""
 
-#: libraries/relation.lib.php:1612
+#: libraries/relation.lib.php:1607
 msgid "no description"
 msgstr "ไม่มีรายละเอียด"
 
-#: libraries/relation.lib.php:1811
+#: libraries/relation.lib.php:1806
 msgid ""
 "You do not have necessary privileges to create a database named "
 "'phpmyadmin'. You may go to 'Operations' tab of any database to set up the "
 "phpMyAdmin configuration storage there."
 msgstr ""
 
-#: libraries/relation.lib.php:1928
+#: libraries/relation.lib.php:1923
 #, php-format
 msgid ""
 "%sCreate%s a database named 'phpmyadmin' and setup the phpMyAdmin "
 "configuration storage there."
 msgstr ""
 
-#: libraries/relation.lib.php:1936
+#: libraries/relation.lib.php:1931
 #, php-format
 msgid ""
 "%sCreate%s the phpMyAdmin configuration storage in the current database."
 msgstr ""
 
-#: libraries/relation.lib.php:1944
+#: libraries/relation.lib.php:1939
 #, php-format
 msgid "%sCreate%s missing phpMyAdmin configuration storage tables."
 msgstr ""
 
 #: libraries/replication_gui.lib.php:46 libraries/replication_gui.lib.php:343
-#: libraries/server_databases.lib.php:387
+#: libraries/server_databases.lib.php:398
 msgid "Master replication"
 msgstr "การจำลองแบบมาสเตอร์"
 
@@ -11769,7 +11783,7 @@ msgid ""
 msgstr ""
 
 #: libraries/replication_gui.lib.php:141
-#: libraries/server_databases.lib.php:389
+#: libraries/server_databases.lib.php:400
 msgid "Slave replication"
 msgstr "การจำลองแบบสเลฟ"
 
@@ -12063,10 +12077,10 @@ msgid "Master server changed successfully to %s."
 msgstr "สิทธิได้ถูกเรียกใช้ใหม่เรียบร้อยแล้ว"
 
 #: libraries/rte/rte_events.lib.php:106 libraries/rte/rte_events.lib.php:115
-#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:149
-#: libraries/rte/rte_routines.lib.php:158
-#: libraries/rte/rte_routines.lib.php:231
-#: libraries/rte/rte_routines.lib.php:1362
+#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:219
+#: libraries/rte/rte_routines.lib.php:246
+#: libraries/rte/rte_routines.lib.php:368
+#: libraries/rte/rte_routines.lib.php:1453
 #: libraries/rte/rte_triggers.lib.php:82 libraries/rte/rte_triggers.lib.php:91
 #: libraries/rte/rte_triggers.lib.php:123
 #, php-format
@@ -12088,7 +12102,7 @@ msgstr "โยนตาราง %s ทิ้งไปเรียบร้อ
 msgid "Event %1$s has been created."
 msgstr "โยนตาราง %s ทิ้งไปเรียบร้อยแล้ว"
 
-#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:251
+#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:266
 #: libraries/rte/rte_triggers.lib.php:144
 msgid "One or more errors have occurred while processing your request:"
 msgstr ""
@@ -12098,7 +12112,7 @@ msgstr ""
 msgid "Edit event"
 msgstr "ถูกส่ง"
 
-#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:794
+#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:885
 #: libraries/rte/rte_triggers.lib.php:323 view_create.php:180
 msgid "Details"
 msgstr ""
@@ -12113,7 +12127,7 @@ msgstr "ชนิดคำค้น"
 msgid "Event type"
 msgstr "ชนิดคำค้น"
 
-#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:817
+#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:908
 #, fuzzy, php-format
 #| msgid "Change"
 msgid "Change to %s"
@@ -12146,12 +12160,14 @@ msgstr "ท้ายสุด"
 msgid "On completion preserve"
 msgstr "คำสั่ง INSERT เต็มรูปแบบ"
 
-#: libraries/rte/rte_events.lib.php:491 libraries/rte/rte_routines.lib.php:930
+#: libraries/rte/rte_events.lib.php:491
+#: libraries/rte/rte_routines.lib.php:1021
 #: libraries/rte/rte_triggers.lib.php:383 view_create.php:209
 msgid "Definer"
 msgstr ""
 
-#: libraries/rte/rte_events.lib.php:535 libraries/rte/rte_routines.lib.php:997
+#: libraries/rte/rte_events.lib.php:535
+#: libraries/rte/rte_routines.lib.php:1088
 #: libraries/rte/rte_triggers.lib.php:422
 msgid "The definer must be in the \"username@hostname\" format!"
 msgstr ""
@@ -12179,9 +12195,9 @@ msgid "You must provide an event definition."
 msgstr ""
 
 #: libraries/rte/rte_export.lib.php:43 libraries/rte/rte_general.lib.php:72
-#: libraries/rte/rte_routines.lib.php:345
-#: libraries/rte/rte_routines.lib.php:1198
-#: libraries/rte/rte_routines.lib.php:1411
+#: libraries/rte/rte_routines.lib.php:153
+#: libraries/rte/rte_routines.lib.php:1289
+#: libraries/rte/rte_routines.lib.php:1502
 #, fuzzy
 #| msgid "Processes"
 msgid "Error in processing request:"
@@ -12217,149 +12233,149 @@ msgid ""
 "problems."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:110
-#: libraries/rte/rte_routines.lib.php:1006
+#: libraries/rte/rte_routines.lib.php:123
+msgid "Edit routine"
+msgstr ""
+
+#: libraries/rte/rte_routines.lib.php:200
+#: libraries/rte/rte_routines.lib.php:1097
 #, php-format
 msgid "Invalid routine type: \"%s\""
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:170
+#: libraries/rte/rte_routines.lib.php:253
+#, fuzzy, php-format
+msgid "Routine %1$s has been created."
+msgstr "โยนตาราง %s ทิ้งไปเรียบร้อยแล้ว"
+
+#: libraries/rte/rte_routines.lib.php:380
 msgid "Sorry, we failed to restore the dropped routine."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:211
+#: libraries/rte/rte_routines.lib.php:439
 #, fuzzy, php-format
 #| msgid "Table %s has been dropped."
 msgid "Routine %1$s has been modified. Privileges have been adjusted."
 msgstr "โยนตาราง %s ทิ้งไปเรียบร้อยแล้ว"
 
-#: libraries/rte/rte_routines.lib.php:216
+#: libraries/rte/rte_routines.lib.php:444
 #, fuzzy, php-format
 #| msgid "Table %s has been dropped."
 msgid "Routine %1$s has been modified."
 msgstr "โยนตาราง %s ทิ้งไปเรียบร้อยแล้ว"
 
-#: libraries/rte/rte_routines.lib.php:238
-#, fuzzy, php-format
-msgid "Routine %1$s has been created."
-msgstr "โยนตาราง %s ทิ้งไปเรียบร้อยแล้ว"
-
-#: libraries/rte/rte_routines.lib.php:315
-msgid "Edit routine"
-msgstr ""
-
-#: libraries/rte/rte_routines.lib.php:797
+#: libraries/rte/rte_routines.lib.php:888
 #, fuzzy
 #| msgid "Column names"
 msgid "Routine name"
 msgstr "ชื่อคอลัมน์"
 
-#: libraries/rte/rte_routines.lib.php:823
+#: libraries/rte/rte_routines.lib.php:914
 msgid "Parameters"
 msgstr "พารามิเตอร์"
 
-#: libraries/rte/rte_routines.lib.php:829
+#: libraries/rte/rte_routines.lib.php:920
 #, fuzzy
 #| msgid "Creation"
 msgid "Direction"
 msgstr "สร้างเมื่อ"
 
-#: libraries/rte/rte_routines.lib.php:847
+#: libraries/rte/rte_routines.lib.php:938
 #, fuzzy
 #| msgid "Add new field"
 msgid "Add parameter"
 msgstr "เพิ่มฟิลด์ใหม่"
 
-#: libraries/rte/rte_routines.lib.php:851
+#: libraries/rte/rte_routines.lib.php:942
 #, fuzzy
 #| msgid "Remove database"
 msgid "Remove last parameter"
 msgstr "เอาฐานข้อมูลออก"
 
-#: libraries/rte/rte_routines.lib.php:856
+#: libraries/rte/rte_routines.lib.php:947
 msgid "Return type"
 msgstr "ประเภทการส่งกลับ"
 
-#: libraries/rte/rte_routines.lib.php:862
+#: libraries/rte/rte_routines.lib.php:953
 #, fuzzy
 #| msgid "Length/Values"
 msgid "Return length/values"
 msgstr "ความยาว/เซต*"
 
-#: libraries/rte/rte_routines.lib.php:868
+#: libraries/rte/rte_routines.lib.php:959
 #, fuzzy
 #| msgid "Table options"
 msgid "Return options"
 msgstr "ตัวเลือกตาราง"
 
-#: libraries/rte/rte_routines.lib.php:899
+#: libraries/rte/rte_routines.lib.php:990
 msgid "Is deterministic"
 msgstr "คือการกำหนด"
 
-#: libraries/rte/rte_routines.lib.php:920
+#: libraries/rte/rte_routines.lib.php:1011
 msgid ""
 "You do not have sufficient privileges to perform this operation; Please "
 "refer to the documentation for more details"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:935
+#: libraries/rte/rte_routines.lib.php:1026
 #, fuzzy
 #| msgid "Query type"
 msgid "Security type"
 msgstr "ชนิดคำค้น"
 
-#: libraries/rte/rte_routines.lib.php:944
+#: libraries/rte/rte_routines.lib.php:1035
 msgid "SQL data access"
 msgstr "เข้าถึงข้อมูล SQL"
 
-#: libraries/rte/rte_routines.lib.php:1013
+#: libraries/rte/rte_routines.lib.php:1104
 #, fuzzy
 #| msgid "You must provide a routine name"
 msgid "You must provide a routine name!"
 msgstr "คุณจะต้องให้ชื่อปกติ"
 
-#: libraries/rte/rte_routines.lib.php:1047
+#: libraries/rte/rte_routines.lib.php:1138
 #, php-format
 msgid "Invalid direction \"%s\" given for parameter."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1069
-#: libraries/rte/rte_routines.lib.php:1131
+#: libraries/rte/rte_routines.lib.php:1160
+#: libraries/rte/rte_routines.lib.php:1222
 msgid ""
 "You must provide length/values for routine parameters of type ENUM, SET, "
 "VARCHAR and VARBINARY."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1095
+#: libraries/rte/rte_routines.lib.php:1186
 msgid "You must provide a name and a type for each routine parameter."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1114
+#: libraries/rte/rte_routines.lib.php:1205
 msgid "You must provide a valid return type for the routine."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1174
+#: libraries/rte/rte_routines.lib.php:1265
 msgid "You must provide a routine definition."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1285
+#: libraries/rte/rte_routines.lib.php:1376
 #, php-format
 msgid "Execution results of routine %s"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1340
+#: libraries/rte/rte_routines.lib.php:1431
 #, php-format
 msgid "%d row affected by the last statement inside the procedure."
 msgid_plural "%d rows affected by the last statement inside the procedure."
 msgstr[0] ""
 
-#: libraries/rte/rte_routines.lib.php:1398
-#: libraries/rte/rte_routines.lib.php:1406
+#: libraries/rte/rte_routines.lib.php:1489
+#: libraries/rte/rte_routines.lib.php:1497
 msgid "Execute routine"
 msgstr "ดำเนินงานตามปกติ"
 
-#: libraries/rte/rte_routines.lib.php:1485
-#: libraries/rte/rte_routines.lib.php:1488
+#: libraries/rte/rte_routines.lib.php:1576
+#: libraries/rte/rte_routines.lib.php:1579
 msgid "Routine parameters"
 msgstr "พารามิเตอร์ตามปกติ"
 
@@ -12544,7 +12560,7 @@ msgid "Original position"
 msgstr "ตำแหน่งเริ่มแรก"
 
 #: libraries/server_bin_log.lib.php:133
-#: templates/structure/display_table_stats.phtml:4
+#: templates/table/structure/display_table_stats.phtml:4
 msgid "Information"
 msgstr "ข้อมูล"
 
@@ -12582,12 +12598,12 @@ msgstr ""
 "โปรดทราบ: การเปิดใช้การเก็บสถิติของฐานข้อมูล อาจจะทำให้มีปริมาณการถ่ายโอนข้อมูลจำนวนมาก "
 "ระหว่างเว็บเซิร์ฟเวอร์ และเซิร์ฟเวอร์ MySQL."
 
-#: libraries/server_databases.lib.php:364
-#: libraries/server_databases.lib.php:365
+#: libraries/server_databases.lib.php:366
+#: libraries/server_databases.lib.php:371
 msgid "Enable Statistics"
 msgstr "ให้มีการเก็บสถิติ"
 
-#: libraries/server_databases.lib.php:481
+#: libraries/server_databases.lib.php:492
 #, fuzzy, php-format
 #| msgid "%s databases have been dropped successfully."
 msgid "%1$d database has been dropped successfully."
@@ -12963,7 +12979,7 @@ msgid "You have revoked the privileges for %s."
 msgstr "คุณได้เพิกถอนสิทธิของ %s"
 
 #: libraries/server_privileges.lib.php:2059
-#: libraries/server_privileges.lib.php:4290
+#: libraries/server_privileges.lib.php:4316
 #, fuzzy
 #| msgid "Add user"
 msgid "Add user account"
@@ -13147,60 +13163,60 @@ msgstr "กำลังลบ %s"
 msgid "The privileges were reloaded successfully."
 msgstr "สิทธิได้ถูกเรียกใช้ใหม่เรียบร้อยแล้ว"
 
-#: libraries/server_privileges.lib.php:3994
+#: libraries/server_privileges.lib.php:4003
 #, php-format
 msgid "The user %s already exists!"
 msgstr "มีผู้ใช้ %s อยู่แล้ว!"
 
-#: libraries/server_privileges.lib.php:4232
+#: libraries/server_privileges.lib.php:4258
 #, fuzzy, php-format
 #| msgid "Privileges"
 msgid "Privileges for %s"
 msgstr "สิทธิ"
 
-#: libraries/server_privileges.lib.php:4241
+#: libraries/server_privileges.lib.php:4267
 #: libraries/server_status_processes.lib.php:72
 #: libraries/server_user_groups.lib.php:39
 msgid "User"
 msgstr "ผู้ใช้"
 
-#: libraries/server_privileges.lib.php:4282
+#: libraries/server_privileges.lib.php:4308
 msgctxt "Create new user"
 msgid "New"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4311
+#: libraries/server_privileges.lib.php:4337
 #, fuzzy
 #| msgid "Edit Privileges"
 msgid "Edit privileges:"
 msgstr "แก้ไขสิทธิ"
 
-#: libraries/server_privileges.lib.php:4312
+#: libraries/server_privileges.lib.php:4338
 #, fuzzy
 #| msgid "Users"
 msgid "User account"
 msgstr "ผู้ใช้"
 
-#: libraries/server_privileges.lib.php:4371
+#: libraries/server_privileges.lib.php:4397
 msgid ""
 "Note: You are attempting to edit privileges of the user with which you are "
 "currently logged in."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4391 libraries/server_users.lib.php:25
+#: libraries/server_privileges.lib.php:4417 libraries/server_users.lib.php:25
 #, fuzzy
 #| msgid "User overview"
 msgid "User accounts overview"
 msgstr "ข้อมูลทั่วไปของผู้ใช้"
 
-#: libraries/server_privileges.lib.php:4459
+#: libraries/server_privileges.lib.php:4485
 msgid ""
 "A user account allowing any user from localhost to connect is present. This "
 "will prevent other users from connecting if the host part of their account "
 "allows a connection from any (%) host."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4500
+#: libraries/server_privileges.lib.php:4526
 #, php-format
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
@@ -13209,7 +13225,7 @@ msgid ""
 "%sreload the privileges%s before you continue."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4519
+#: libraries/server_privileges.lib.php:4545
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
 "tables. The content of these tables may differ from the privileges the "
@@ -13218,64 +13234,64 @@ msgid ""
 "privilege."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4569
+#: libraries/server_privileges.lib.php:4595
 msgid "The selected user was not found in the privilege table."
 msgstr "ไม่พบผู้ใช้ที่เลือกในตารางแสดงสิทธิ"
 
-#: libraries/server_privileges.lib.php:4801
+#: libraries/server_privileges.lib.php:4827
 msgid "You have added a new user."
 msgstr "เพิ่มผู้ใช้ใหม่เรียบร้อยแล้ว"
 
-#: libraries/server_status.lib.php:53
+#: libraries/server_status.lib.php:60
 #, php-format
 msgid "Network traffic since startup: %s"
 msgstr ""
 
-#: libraries/server_status.lib.php:66
+#: libraries/server_status.lib.php:73
 #, fuzzy, php-format
 #| msgid "This MySQL server has been running for %s. It started up on %s."
 msgid "This MySQL server has been running for %1$s. It started up on %2$s."
 msgstr "เซิร์ฟเวอร์ MySQL นี้รันมาเป็นเวลา %s. เริ่มตอน %s."
 
-#: libraries/server_status.lib.php:80
+#: libraries/server_status.lib.php:94
 msgid ""
 "This MySQL server works as <b>master</b> and <b>slave</b> in <b>replication</"
 "b> process."
 msgstr ""
 
-#: libraries/server_status.lib.php:85
+#: libraries/server_status.lib.php:99
 msgid "This MySQL server works as <b>master</b> in <b>replication</b> process."
 msgstr ""
 
-#: libraries/server_status.lib.php:90
+#: libraries/server_status.lib.php:104
 msgid "This MySQL server works as <b>slave</b> in <b>replication</b> process."
 msgstr ""
 
-#: libraries/server_status.lib.php:106
+#: libraries/server_status.lib.php:116
 msgid "Replication status"
 msgstr ""
 
-#: libraries/server_status.lib.php:137
+#: libraries/server_status.lib.php:146
 msgid ""
 "On a busy server, the byte counters may overrun, so those statistics as "
 "reported by the MySQL server may be incorrect."
 msgstr ""
 
-#: libraries/server_status.lib.php:148
+#: libraries/server_status.lib.php:157
 msgid "Received"
 msgstr "ได้รับ"
 
-#: libraries/server_status.lib.php:167
+#: libraries/server_status.lib.php:176
 msgid "Sent"
 msgstr "ถูกส่ง"
 
-#: libraries/server_status.lib.php:234
+#: libraries/server_status.lib.php:243
 #, fuzzy
 #| msgid "Connections"
 msgid "Max. concurrent connections"
 msgstr "การเชื่อมต่อ"
 
-#: libraries/server_status.lib.php:244
+#: libraries/server_status.lib.php:253
 msgid "Failed attempts"
 msgstr "ความพยายามล้มเหลว"
 
@@ -14255,7 +14271,7 @@ msgstr ""
 msgid "Not implemented yet."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/AlterOperation.php:193
+#: libraries/sql-parser/src/Components/AlterOperation.php:191
 msgid "Unrecognized alter operation."
 msgstr ""
 
@@ -14269,7 +14285,7 @@ msgid "An opening bracket followed by a set of values was expected."
 msgstr ""
 
 #: libraries/sql-parser/src/Components/ArrayObj.php:101
-#: libraries/sql-parser/src/Components/FieldDefinition.php:202
+#: libraries/sql-parser/src/Components/CreateDefinition.php:202
 msgid "An opening bracket was expected."
 msgstr ""
 
@@ -14277,25 +14293,35 @@ msgstr ""
 msgid "A comma or a closing bracket was expected"
 msgstr ""
 
+#: libraries/sql-parser/src/Components/CreateDefinition.php:246
+#, fuzzy
+#| msgid "No tables selected."
+msgid "A comma or a closing bracket was expected."
+msgstr "ไม่มีตารางที่ถูกเลือก"
+
+#: libraries/sql-parser/src/Components/CreateDefinition.php:262
+msgid "A closing bracket was expected."
+msgstr ""
+
 #: libraries/sql-parser/src/Components/DataType.php:125
 msgid "Unrecognized data type."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:225
+#: libraries/sql-parser/src/Components/Expression.php:227
 msgid "Unexpected closing bracket."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:246
-#: libraries/sql-parser/src/Components/Expression.php:283
-#: libraries/sql-parser/src/Components/Expression.php:303
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:285
+#: libraries/sql-parser/src/Components/Expression.php:305
 msgid "An alias was previously found."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:257
+#: libraries/sql-parser/src/Components/Expression.php:259
 msgid "Unexpected dot."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:327
+#: libraries/sql-parser/src/Components/Expression.php:329
 #, fuzzy
 #| msgid "No tables selected."
 msgid "An alias was expected."
@@ -14307,16 +14333,6 @@ msgstr "ไม่มีตารางที่ถูกเลือก"
 msgid "An expression was expected."
 msgstr "ยังไม่ได้เลือกแถว"
 
-#: libraries/sql-parser/src/Components/FieldDefinition.php:246
-#, fuzzy
-#| msgid "No tables selected."
-msgid "A comma or a closing bracket was expected."
-msgstr "ไม่มีตารางที่ถูกเลือก"
-
-#: libraries/sql-parser/src/Components/FieldDefinition.php:262
-msgid "A closing bracket was expected."
-msgstr ""
-
 #: libraries/sql-parser/src/Components/Limit.php:90
 #: libraries/sql-parser/src/Components/Limit.php:112
 msgid "An offset was expected."
@@ -14358,27 +14374,27 @@ msgstr ""
 msgid "Expected delimiter."
 msgstr ""
 
-#: libraries/sql-parser/src/Lexer.php:753
+#: libraries/sql-parser/src/Lexer.php:777
 #, fuzzy, php-format
 msgid "Ending quote %1$s was expected."
 msgstr "โยนตาราง %s ทิ้งไปเรียบร้อยแล้ว"
 
-#: libraries/sql-parser/src/Lexer.php:789
+#: libraries/sql-parser/src/Lexer.php:813
 #, fuzzy
 msgid "Variable name was expected."
 msgstr "รูปแบบของชื่อไฟล์"
 
-#: libraries/sql-parser/src/Parser.php:380
+#: libraries/sql-parser/src/Parser.php:391
 #, fuzzy
 #| msgid "At Beginning of Table"
 msgid "Unexpected beginning of statement."
 msgstr "ที่จุดเริ่มต้นของตาราง"
 
-#: libraries/sql-parser/src/Parser.php:399
+#: libraries/sql-parser/src/Parser.php:410
 msgid "Unrecognized statement type."
 msgstr ""
 
-#: libraries/sql-parser/src/Parser.php:479
+#: libraries/sql-parser/src/Parser.php:489
 msgid "No transaction was previously started."
 msgstr ""
 
@@ -14404,8 +14420,10 @@ msgid "The name of the entity was expected."
 msgstr ""
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:310
-msgid "At least one field definition was expected."
-msgstr ""
+#, fuzzy
+#| msgid "The row has been deleted."
+msgid "At least one column definition was expected."
+msgstr "ลบเรียบร้อยแล้ว"
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:329
 msgid "A \"RETURNS\" keyword was expected."
@@ -14480,11 +14498,11 @@ msgstr "ที่คั่นหน้า %s ได้ถูกสร้าง
 msgid "Using bookmark \"%s\" as default browse query."
 msgstr ""
 
-#: libraries/sql.lib.php:1306
+#: libraries/sql.lib.php:1300
 msgid "Showing as PHP code"
 msgstr ""
 
-#: libraries/sql.lib.php:1638
+#: libraries/sql.lib.php:1632
 #, fuzzy, php-format
 #| msgid ""
 #| "This table does not contain a unique column. Features related to the grid "
@@ -14495,7 +14513,7 @@ msgid ""
 msgstr ""
 "ตารางนี้ไม่มีสดมภ์ไหนที่เก็บค่าที่แตกต่างกันเสมอ การแก้ไขหรือเพิ่มผ่านตารางจะไม่สามารถบันทึกได้"
 
-#: libraries/sql.lib.php:1649
+#: libraries/sql.lib.php:1643
 #, fuzzy, php-format
 #| msgid ""
 #| "This table does not contain a unique column. Features related to the grid "
@@ -14506,7 +14524,7 @@ msgid ""
 msgstr ""
 "ตารางนี้ไม่มีสดมภ์ไหนที่เก็บค่าที่แตกต่างกันเสมอ การแก้ไขหรือเพิ่มผ่านตารางจะไม่สามารถบันทึกได้"
 
-#: libraries/sql.lib.php:1688
+#: libraries/sql.lib.php:1682
 #, php-format
 msgid "Problems with indexes of table `%s`"
 msgstr ""
@@ -14674,7 +14692,7 @@ msgid "Version %s snapshot (SQL code)"
 msgstr ""
 
 #: libraries/tracking.lib.php:947
-#: templates/structure/table_structure_row.phtml:33
+#: templates/table/structure/table_structure_row.phtml:33
 msgctxt "None for default"
 msgid "None"
 msgstr "ไม่มี"
@@ -14729,17 +14747,17 @@ msgstr "สร้างเวอร์ชั่น %1$s ของ %2$s"
 msgid "Version %1$s was created, tracking for %2$s is active."
 msgstr ""
 
-#: libraries/user_preferences.inc.php:29
+#: libraries/user_preferences.inc.php:30
 msgid "Manage your settings"
 msgstr "จัดการการตั้งค่าของคุณ"
 
-#: libraries/user_preferences.inc.php:46 prefs_manage.php:307
+#: libraries/user_preferences.inc.php:54 prefs_manage.php:307
 #, fuzzy
 #| msgid "Modifications have been saved"
 msgid "Configuration has been saved."
 msgstr "บันทึกการแก้ไขเรียบร้อยแล้ว"
 
-#: libraries/user_preferences.inc.php:66
+#: libraries/user_preferences.inc.php:74
 #, php-format
 msgid ""
 "Your preferences will be saved for current session only. Storing them "
@@ -15140,7 +15158,7 @@ msgid "first"
 msgstr "ครั้งแรก"
 
 #: templates/columns_definitions/move_column.phtml:12
-#: templates/structure/add_column.phtml:21
+#: templates/table/structure/add_column.phtml:21
 #, fuzzy, php-format
 #| msgid "After %s"
 msgid "after %s"
@@ -15222,241 +15240,347 @@ msgstr "การแปลงที่เรียกใช้ได้"
 msgid "Input transformation options"
 msgstr "ตัวเลือกการแปลง"
 
-#: templates/designer/aggregate_query_panel.phtml:22
-#: templates/designer/options_panel.phtml:100
+#: templates/database/create_table.phtml:7
+#: templates/database/designer/side_menu.phtml:77
+#: templates/database/designer/side_menu.phtml:80
+#, fuzzy
+msgid "Create table"
+msgstr "เริ่มหน้าใหม่"
+
+#: templates/database/create_table.phtml:15
+#, fuzzy
+#| msgid "Number of rows per page"
+msgid "Number of columns"
+msgstr "ระเบียนต่อหน้า"
+
+#: templates/database/designer/aggregate_query_panel.phtml:22
+#: templates/database/designer/options_panel.phtml:100
 #, fuzzy
 #| msgid "Create"
 msgid "Aggregate"
 msgstr "สร้าง"
 
-#: templates/designer/aggregate_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:61
-#: templates/designer/options_panel.phtml:106
-#: templates/designer/options_panel.phtml:170
-#: templates/designer/where_query_panel.phtml:30
-#: templates/table/table_header.phtml:9
+#: templates/database/designer/aggregate_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:61
+#: templates/database/designer/options_panel.phtml:106
+#: templates/database/designer/options_panel.phtml:170
+#: templates/database/designer/where_query_panel.phtml:30
+#: templates/table/search/table_header.phtml:9
 #, fuzzy
 msgid "Operator"
 msgstr "กระบวนการ"
 
-#: templates/designer/database_tables.phtml:29
+#: templates/database/designer/database_tables.phtml:29
 msgid "Toggle"
 msgstr ""
 
-#: templates/designer/database_tables.phtml:40
+#: templates/database/designer/database_tables.phtml:40
 #, fuzzy
 #| msgid "Table structure"
 msgid "See table structure"
 msgstr "โครงสร้างของตาราง"
 
-#: templates/designer/delete_relation_panel.phtml:21
+#: templates/database/designer/delete_relation_panel.phtml:21
 msgid "Delete relation"
 msgstr ""
 
-#: templates/designer/edit_delete_pages.phtml:7
+#: templates/database/designer/edit_delete_pages.phtml:7
 #, fuzzy
 #| msgid "Page number:"
 msgid "Page to open"
 msgstr "หมายเลขหน้า:"
 
-#: templates/designer/edit_delete_pages.phtml:7
+#: templates/database/designer/edit_delete_pages.phtml:7
 #, fuzzy
 msgid "Page to delete"
 msgstr "มุมมองรีเลชัน"
 
-#: templates/designer/having_query_panel.phtml:90
-#: templates/designer/options_panel.phtml:63
-#: templates/designer/options_panel.phtml:229
-#: templates/designer/where_query_panel.phtml:59
+#: templates/database/designer/having_query_panel.phtml:90
+#: templates/database/designer/options_panel.phtml:63
+#: templates/database/designer/options_panel.phtml:229
+#: templates/database/designer/where_query_panel.phtml:59
 #, fuzzy
 #| msgid "Export"
 msgid "Except"
 msgstr "ส่งออก"
 
-#: templates/designer/having_query_panel.phtml:102
-#: templates/designer/options_panel.phtml:75
-#: templates/designer/options_panel.phtml:241
-#: templates/designer/where_query_panel.phtml:71
+#: templates/database/designer/having_query_panel.phtml:102
+#: templates/database/designer/options_panel.phtml:75
+#: templates/database/designer/options_panel.phtml:241
+#: templates/database/designer/where_query_panel.phtml:71
 #, fuzzy
 #| msgid "in query"
 msgid "subquery"
 msgstr "ในคำค้น"
 
-#: templates/designer/new_relation_panel.phtml:22
-#: templates/designer/side_menu.phtml:84 templates/designer/side_menu.phtml:87
+#: templates/database/designer/new_relation_panel.phtml:22
+#: templates/database/designer/side_menu.phtml:84
+#: templates/database/designer/side_menu.phtml:87
 msgid "Create relation"
 msgstr ""
 
-#: templates/designer/options_panel.phtml:34
-#: templates/designer/options_panel.phtml:200
+#: templates/database/designer/options_panel.phtml:34
+#: templates/database/designer/options_panel.phtml:200
 #, fuzzy
 msgid "Relation operator"
 msgstr "มุมมองรีเลชัน"
 
-#: templates/designer/options_panel.phtml:85
-#: templates/designer/rename_to_panel.phtml:23
+#: templates/database/designer/options_panel.phtml:85
+#: templates/database/designer/rename_to_panel.phtml:23
 #, fuzzy
 msgid "Rename to"
 msgstr "เปลี่ยนชื่อตารางเป็น"
 
-#: templates/designer/options_panel.phtml:91
-#: templates/designer/rename_to_panel.phtml:31
+#: templates/database/designer/options_panel.phtml:91
+#: templates/database/designer/rename_to_panel.phtml:31
 #, fuzzy
 #| msgid "User name"
 msgid "New name"
 msgstr "ชื่อผู้ใช้"
 
-#: templates/designer/page_save_as.phtml:4
+#: templates/database/designer/page_save_as.phtml:4
 #, fuzzy
 #| msgid "No rows selected"
 msgid "Save to selected page"
 msgstr "ยังไม่ได้เลือกแถว"
 
-#: templates/designer/page_save_as.phtml:5
+#: templates/database/designer/page_save_as.phtml:5
 #, fuzzy
 #| msgid "Create a new index"
 msgid "Create a page and save to it"
 msgstr "สร้างดัชนีใหม่"
 
-#: templates/designer/page_save_as.phtml:26
+#: templates/database/designer/page_save_as.phtml:26
 #, fuzzy
 #| msgid "User name"
 msgid "New page name"
 msgstr "ชื่อผู้ใช้"
 
-#: templates/designer/page_selector.phtml:2
+#: templates/database/designer/page_selector.phtml:2
 #, fuzzy
 #| msgid "Select All"
 msgid "Select page"
 msgstr "เลือกทั้งหมด"
 
-#: templates/designer/query_details.phtml:10
+#: templates/database/designer/query_details.phtml:10
 #, fuzzy
 #| msgid "Table options"
 msgid "Active options"
 msgstr "ตัวเลือกตาราง"
 
-#: templates/designer/schema_export.phtml:4
+#: templates/database/designer/schema_export.phtml:4
 msgid "Select Export Relational Type"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:19 templates/designer/side_menu.phtml:25
+#: templates/database/designer/side_menu.phtml:19
+#: templates/database/designer/side_menu.phtml:25
 #, fuzzy
 #| msgid "Showing tables:"
 msgid "Show/Hide tables list"
 msgstr "กำลังแสดงตาราง:"
 
-#: templates/designer/side_menu.phtml:29 templates/designer/side_menu.phtml:35
-#: templates/designer/side_menu.phtml:36
+#: templates/database/designer/side_menu.phtml:29
+#: templates/database/designer/side_menu.phtml:35
+#: templates/database/designer/side_menu.phtml:36
 msgid "View in fullscreen"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:34
+#: templates/database/designer/side_menu.phtml:34
 msgid "Exit fullscreen"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:41 templates/designer/side_menu.phtml:45
+#: templates/database/designer/side_menu.phtml:41
+#: templates/database/designer/side_menu.phtml:45
 #, fuzzy
 #| msgid "User name"
 msgid "New page"
 msgstr "ชื่อผู้ใช้"
 
-#: templates/designer/side_menu.phtml:70 templates/designer/side_menu.phtml:73
+#: templates/database/designer/side_menu.phtml:70
+#: templates/database/designer/side_menu.phtml:73
 #, fuzzy
 #| msgid "Select All"
 msgid "Delete pages"
 msgstr "เลือกทั้งหมด"
 
-#: templates/designer/side_menu.phtml:77 templates/designer/side_menu.phtml:80
-#: templates/table/create_table.phtml:7
-#, fuzzy
-msgid "Create table"
-msgstr "เริ่มหน้าใหม่"
-
-#: templates/designer/side_menu.phtml:98
-#: templates/designer/side_menu.phtml:101
+#: templates/database/designer/side_menu.phtml:98
+#: templates/database/designer/side_menu.phtml:101
 msgid "Reload"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:107
-#: templates/designer/side_menu.phtml:110
+#: templates/database/designer/side_menu.phtml:107
+#: templates/database/designer/side_menu.phtml:110
 msgid "Help"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Angular links"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Direct links"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:122
-#: templates/designer/side_menu.phtml:124
+#: templates/database/designer/side_menu.phtml:122
+#: templates/database/designer/side_menu.phtml:124
 msgid "Snap to grid"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:128
-#: templates/designer/side_menu.phtml:134
+#: templates/database/designer/side_menu.phtml:128
+#: templates/database/designer/side_menu.phtml:134
 msgid "Small/Big All"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:138
-#: templates/designer/side_menu.phtml:141
+#: templates/database/designer/side_menu.phtml:138
+#: templates/database/designer/side_menu.phtml:141
 msgid "Toggle small/big"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:145
-#: templates/designer/side_menu.phtml:148
+#: templates/database/designer/side_menu.phtml:145
+#: templates/database/designer/side_menu.phtml:148
 #, fuzzy
 #| msgid "Traditional Chinese"
 msgid "Toggle relation lines"
 msgstr "จีน (ไต้หวัน)"
 
-#: templates/designer/side_menu.phtml:153
-#: templates/designer/side_menu.phtml:156
+#: templates/database/designer/side_menu.phtml:153
+#: templates/database/designer/side_menu.phtml:156
 #, fuzzy
 #| msgid "Export"
 msgid "Export schema"
 msgstr "ส่งออก"
 
-#: templates/designer/side_menu.phtml:165
-#: templates/designer/side_menu.phtml:168
+#: templates/database/designer/side_menu.phtml:165
+#: templates/database/designer/side_menu.phtml:168
 #, fuzzy
 #| msgid "Submit Query"
 msgid "Build Query"
 msgstr "ประมวลผลคำค้น"
 
-#: templates/designer/side_menu.phtml:173
-#: templates/designer/side_menu.phtml:177
+#: templates/database/designer/side_menu.phtml:173
+#: templates/database/designer/side_menu.phtml:177
 msgid "Move Menu"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:181
-#: templates/designer/side_menu.phtml:186
+#: templates/database/designer/side_menu.phtml:181
+#: templates/database/designer/side_menu.phtml:186
 #, fuzzy
 #| msgid "Partial Texts"
 msgid "Pin text"
 msgstr "ข้อความบางส่วน"
 
-#: templates/designer/table_list.phtml:4
+#: templates/database/designer/table_list.phtml:4
 #, fuzzy
 msgid "Hide/Show all"
 msgstr "แสดงทั้งหมด"
 
-#: templates/designer/table_list.phtml:14
+#: templates/database/designer/table_list.phtml:14
 msgid "Hide/Show Tables with no relation"
 msgstr ""
 
-#: templates/designer/table_list.phtml:59
+#: templates/database/designer/table_list.phtml:59
 #, fuzzy
 #| msgid "Number of rows per page"
 msgid "Number of tables:"
 msgstr "ระเบียนต่อหน้า"
 
+#: templates/database/structure/body_for_table_summary.phtml:6
+#, php-format
+msgid "%s table"
+msgid_plural "%s tables"
+msgstr[0] "%s ตาราง"
+
+#: templates/database/structure/body_for_table_summary.phtml:17
+msgid "Sum"
+msgstr "ผลรวม"
+
+#: templates/database/structure/check_all_tables.phtml:6
+msgid "Check tables having overhead"
+msgstr "ตรวจสอบตารางที่มี overhead"
+
+#: templates/database/structure/check_all_tables.phtml:10
+#, fuzzy
+#| msgid "Show color"
+msgid "Show create"
+msgstr "แสดงสี"
+
+#: templates/database/structure/check_all_tables.phtml:27
+#, fuzzy
+#| msgid "Add new field"
+msgid "Prefix"
+msgstr "เพิ่มฟิลด์ใหม่"
+
+#: templates/database/structure/check_all_tables.phtml:28
+msgid "Add prefix to table"
+msgstr "เพิ่มคำนำไปยังตาราง"
+
+#: templates/database/structure/check_all_tables.phtml:29
+msgid "Replace table prefix"
+msgstr "แทนที่คำนำไปยังตาราง"
+
+#: templates/database/structure/check_all_tables.phtml:30
+msgid "Copy table with prefix"
+msgstr "คัดลอกคำนำไปยังตาราง"
+
+#: templates/database/structure/check_all_tables.phtml:36
+#, fuzzy
+#| msgid "CHAR textarea columns"
+msgid "Add columns to central list"
+msgstr "คอลัมน์พื้นที่ข้อความ CHAR"
+
+#: templates/database/structure/check_all_tables.phtml:37
+msgid "Remove columns from central list"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:38
+#, fuzzy
+#| msgid "CHAR textarea columns"
+msgid "Make consistent with central list"
+msgstr "คอลัมน์พื้นที่ข้อความ CHAR"
+
+#: templates/database/structure/favorite_anchor.phtml:12
+#, fuzzy
+msgid "Add to Favorites"
+msgstr "เพิ่มผู้ใช้ใหม่"
+
+#: templates/database/structure/show_create.phtml:2
+#, fuzzy
+msgid "Showing create queries"
+msgstr "แสดงคำค้นแบบเต็ม"
+
+#: templates/database/structure/sortable_header.phtml:13
+msgid "Sort"
+msgstr "เรียง"
+
+#: templates/database/structure/table_header.phtml:42
+#, fuzzy
+#| msgid "Error moving the uploaded file, see [doc@faq1-11]FAQ 1.11[/doc]"
+msgid ""
+"May be approximate. Click on the number to get the exact count. See "
+"[doc@faq3-11]FAQ 3.11[/doc]."
+msgstr "มีข้อผิดพลาดระหว่างการอัพโหลด กรุณาดู [doc@faq1-11]FAQ 1.11[/doc]"
+
+#: templates/database/structure/table_header.phtml:66
+#: templates/table/index_form.phtml:127
+msgid "Size"
+msgstr "ขนาด"
+
+#: templates/database/structure/table_header.phtml:74
+#: templates/table/structure/display_table_stats.phtml:27
+msgid "Overhead"
+msgstr "เกินความจำเป็น"
+
+#: templates/database/structure/tracking_icon.phtml:4
+msgid "Tracking is active."
+msgstr "การติดตามเริ่มทำงานแล้ว"
+
+#: templates/database/structure/tracking_icon.phtml:8
+msgid "Tracking is not active."
+msgstr "หยุดการติดตามแล้ว"
+
 #: templates/error/report_form.phtml:7
 msgid ""
 "phpMyAdmin has encountered an error. We have collected data about this error "
@@ -15472,71 +15596,6 @@ msgstr ""
 msgid "Please explain the steps that lead to the error:"
 msgstr ""
 
-#: templates/gis_visualization/gis_visualization.phtml:3
-msgid "Display GIS Visualization"
-msgstr ""
-
-#: templates/gis_visualization/gis_visualization.phtml:8
-#, fuzzy
-#| msgid "Add/Delete Field Columns"
-msgid "Label column"
-msgstr "เพิ่ม/ลบ คอลัมน์ (ฟิลด์)"
-
-#: templates/gis_visualization/gis_visualization.phtml:11
-msgid "-- None --"
-msgstr "-- ไม่มี --"
-
-#: templates/gis_visualization/gis_visualization.phtml:19
-#, fuzzy
-#| msgid "Total"
-msgid "Spatial column"
-msgstr "รวม"
-
-#: templates/index_form.phtml:16
-msgid "Index name:"
-msgstr "ชื่อดัชนี :"
-
-#: templates/index_form.phtml:19
-msgid ""
-"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
-msgstr "ชื่อของไพรมารีคีย์<b>จะต้องเป็น</b> \"PRIMARY\" เท่านั้น!"
-
-#: templates/index_form.phtml:40
-#, fuzzy
-#| msgid "Index name:"
-msgid "Index choice:"
-msgstr "ชื่อดัชนี :"
-
-#: templates/index_form.phtml:57
-msgid "Key block size:"
-msgstr ""
-
-#: templates/index_form.phtml:74
-msgid "Index type:"
-msgstr "ชนิดของดัชนี :"
-
-#: templates/index_form.phtml:86
-#, fuzzy
-#| msgid "User"
-msgid "Parser:"
-msgstr "ผู้ใช้"
-
-#: templates/index_form.phtml:102
-#, fuzzy
-#| msgid "Comment"
-msgid "Comment:"
-msgstr "หมายเหตุ"
-
-#: templates/index_form.phtml:127 templates/structure/table_header.phtml:66
-msgid "Size"
-msgstr "ขนาด"
-
-#: templates/index_form.phtml:149 templates/index_form.phtml:190
-#, fuzzy
-#| msgid "Drag to reorder"
-msgid "Drag to reorder"
-msgstr "ลากเพื่อเปลี่ยนลำดับ"
-
 #: templates/prefs_autoload.phtml:9
 msgid ""
 "Your browser has phpMyAdmin configuration for this domain. Would you like to "
@@ -15549,484 +15608,450 @@ msgstr ""
 msgid "Start row:"
 msgstr "ส."
 
-#: templates/structure/actions_in_table_structure.phtml:14
-#, php-format
-msgid "A primary key has been added on %s."
-msgstr "ได้เพิ่มไพรมารีคีย์แล้วใน %s"
-
-#: templates/structure/actions_in_table_structure.phtml:34
-#: templates/structure/actions_in_table_structure.phtml:54
-#: templates/structure/actions_in_table_structure.phtml:79
-#: templates/structure/actions_in_table_structure.phtml:101
-#, php-format
-msgid "An index has been added on %s."
-msgstr "ได้เพิ่มดัชนีแล้วใน %s"
-
-#: templates/structure/actions_in_table_structure.phtml:130
-#: templates/structure/check_all_table_column.phtml:59
-#, fuzzy
-#| msgid "Remove chart"
-msgid "Remove from central columns"
-msgstr "เอาการแสดงผลออก"
-
-#: templates/structure/actions_in_table_structure.phtml:138
-#: templates/structure/check_all_table_column.phtml:55
-#, fuzzy
-#| msgid "CHAR textarea columns"
-msgid "Add to central columns"
-msgstr "คอลัมน์พื้นที่ข้อความ CHAR"
-
-#: templates/structure/add_column.phtml:7
-#, fuzzy, php-format
-msgid "Add %s column(s)"
-msgstr "เพิ่มฟิลด์ใหม่"
-
-#: templates/structure/add_column.phtml:12
-#, fuzzy
-#| msgid "At Beginning of Table"
-msgid "at beginning of table"
-msgstr "ที่จุดเริ่มต้นของตาราง"
-
-#: templates/structure/body_for_table_summary.phtml:6
-#, php-format
-msgid "%s table"
-msgid_plural "%s tables"
-msgstr[0] "%s ตาราง"
-
-#: templates/structure/body_for_table_summary.phtml:17
-msgid "Sum"
-msgstr "ผลรวม"
-
-#: templates/structure/check_all_tables.phtml:6
-msgid "Check tables having overhead"
-msgstr "ตรวจสอบตารางที่มี overhead"
-
-#: templates/structure/check_all_tables.phtml:10
-#, fuzzy
-#| msgid "Show color"
-msgid "Show create"
-msgstr "แสดงสี"
-
-#: templates/structure/check_all_tables.phtml:27
-#, fuzzy
-#| msgid "Add new field"
-msgid "Prefix"
-msgstr "เพิ่มฟิลด์ใหม่"
-
-#: templates/structure/check_all_tables.phtml:28
-msgid "Add prefix to table"
-msgstr "เพิ่มคำนำไปยังตาราง"
-
-#: templates/structure/check_all_tables.phtml:29
-msgid "Replace table prefix"
-msgstr "แทนที่คำนำไปยังตาราง"
-
-#: templates/structure/check_all_tables.phtml:30
-msgid "Copy table with prefix"
-msgstr "คัดลอกคำนำไปยังตาราง"
-
-#: templates/structure/check_all_tables.phtml:36
-#, fuzzy
-#| msgid "CHAR textarea columns"
-msgid "Add columns to central list"
-msgstr "คอลัมน์พื้นที่ข้อความ CHAR"
-
-#: templates/structure/check_all_tables.phtml:37
-msgid "Remove columns from central list"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:38
-#, fuzzy
-#| msgid "CHAR textarea columns"
-msgid "Make consistent with central list"
-msgstr "คอลัมน์พื้นที่ข้อความ CHAR"
-
-#: templates/structure/display_structure.phtml:140 view_create.php:181
-#, fuzzy
-#| msgid "Print view"
-msgid "Edit view"
-msgstr "แสดง"
-
-#: templates/structure/display_table_stats.phtml:9
-msgid "Space usage"
-msgstr "เนื้อที่ที่ใช้"
-
-#: templates/structure/display_table_stats.phtml:27
-#: templates/structure/table_header.phtml:74
-msgid "Overhead"
-msgstr "เกินความจำเป็น"
-
-#: templates/structure/display_table_stats.phtml:32
-msgid "Effective"
-msgstr "มีผล"
-
-#: templates/structure/favorite_anchor.phtml:12
-#, fuzzy
-msgid "Add to Favorites"
-msgstr "เพิ่มผู้ใช้ใหม่"
-
-#: templates/structure/move_columns_dialog.phtml:1
-#: templates/structure/optional_action_links.phtml:21
-#, fuzzy
-#| msgid "Add columns"
-msgid "Move columns"
-msgstr "เพิ่มฟิลด์ใหม่"
-
-#: templates/structure/move_columns_dialog.phtml:2
-msgid "Move the columns by dragging them up and down."
-msgstr ""
-
-#: templates/structure/optional_action_links.phtml:9
-msgid "Propose table structure"
-msgstr "เสนอโครงสร้างตาราง"
-
-#: templates/structure/optional_action_links.phtml:24
-#, fuzzy
-#| msgid "Propose table structure"
-msgid "Improve table structure"
-msgstr "เสนอโครงสร้างตาราง"
-
-#: templates/structure/optional_action_links.phtml:30
-#, fuzzy
-#| msgid "Track table"
-msgid "Track view"
-msgstr "ติดตามตาราง"
-
-#: templates/structure/row_stats_table.phtml:3
-#, fuzzy
-#| msgid "Row Statistics"
-msgid "Row statistics"
-msgstr "สถิติของแถว"
-
-#: templates/structure/row_stats_table.phtml:9
-msgid "static"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:11
-msgid "dynamic"
-msgstr "ไม่คงที่"
-
-#: templates/structure/row_stats_table.phtml:22
-msgid "partitioned"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:54
-msgid "Row length"
-msgstr "ความยาวแถว"
-
-#: templates/structure/row_stats_table.phtml:66
-msgid "Row size"
-msgstr "ขนาดแถว"
-
-#: templates/structure/row_stats_table.phtml:73
-msgid "Next autoindex"
-msgstr ""
-
-#: templates/structure/secondary_tabs.phtml:14
-#, fuzzy
-#| msgid "Relation view"
-msgid "Relation view"
-msgstr "มุมมองรีเลชัน"
-
-#: templates/structure/show_create.phtml:2
-#, fuzzy
-msgid "Showing create queries"
-msgstr "แสดงคำค้นแบบเต็ม"
-
-#: templates/structure/sortable_header.phtml:13
-msgid "Sort"
-msgstr "เรียง"
-
-#: templates/structure/table_header.phtml:42
-#, fuzzy
-#| msgid "Error moving the uploaded file, see [doc@faq1-11]FAQ 1.11[/doc]"
-msgid ""
-"May be approximate. Click on the number to get the exact count. See "
-"[doc@faq3-11]FAQ 3.11[/doc]."
-msgstr "มีข้อผิดพลาดระหว่างการอัพโหลด กรุณาดู [doc@faq1-11]FAQ 1.11[/doc]"
-
-#: templates/structure/table_structure_row.phtml:46
-#, fuzzy, php-format
-#| msgid "Table %s has been dropped."
-msgid "Column %s has been dropped."
-msgstr "โยนตาราง %s ทิ้งไปเรียบร้อยแล้ว"
-
-#: templates/structure/tracking_icon.phtml:4
-msgid "Tracking is active."
-msgstr "การติดตามเริ่มทำงานแล้ว"
-
-#: templates/structure/tracking_icon.phtml:8
-msgid "Tracking is not active."
-msgstr "หยุดการติดตามแล้ว"
-
-#: templates/table/create_table.phtml:15
-#, fuzzy
-#| msgid "Number of rows per page"
-msgid "Number of columns"
-msgstr "ระเบียนต่อหน้า"
-
-#: templates/table/options.phtml:8
-#, fuzzy
-#| msgid "Select fields (at least one):"
-msgid "Select columns (at least one):"
-msgstr "เลือกฟิลด์ (อย่างน้อยหนึ่งฟิลด์):"
-
-#: templates/table/options.phtml:37
-msgid "Add search conditions (body of the \"where\" clause):"
-msgstr "เพิ่มเงื่อนไขในการค้นหา:"
-
-#: templates/table/options.phtml:45
-msgid "Number of rows per page"
-msgstr "ระเบียนต่อหน้า"
-
-#: templates/table/options.phtml:56
-msgid "Display order:"
-msgstr "ลำดับการแสดง:"
-
-#: templates/table/options_zoom.phtml:6
-msgid "Use this column to label each point"
-msgstr ""
-
-#: templates/table/options_zoom.phtml:35
-msgid "Maximum rows to plot"
-msgstr ""
-
-#: templates/table/replace_preview.phtml:13
-msgid "Find and replace - preview"
-msgstr ""
-
-#: templates/table/replace_preview.phtml:18
-#, fuzzy
-#| msgid "Original position"
-msgid "Original string"
-msgstr "ตำแหน่งเริ่มแรก"
-
-#: templates/table/replace_preview.phtml:19
-#, fuzzy
-#| msgid "Relations"
-msgid "Replaced string"
-msgstr "รีเลชัน"
-
-#: templates/table/replace_preview.phtml:40
-#, fuzzy
-#| msgid "Replicated"
-msgid "Replace"
-msgstr "ทำซ้ำเรียบร้อยแล้ว"
-
-#: templates/table/rows_zoom.phtml:16
-#, fuzzy
-msgid "Additional search criteria"
-msgstr "คำค้น SQL"
-
-#: templates/table/search_and_replace.phtml:3
-#, fuzzy
-#| msgid "Replace NULL by"
-msgid "Replace with:"
-msgstr "แทนที่ NULL เป็น"
-
-#: templates/table/search_and_replace.phtml:22
-#, fuzzy
-#| msgid "as regular expression"
-msgid "Use regular expression"
-msgstr "รูปแบบคำพ้อง (regular expression)"
-
-#: templates/table/selection_form.phtml:12
-#, fuzzy
-#| msgid "Do a \"query by example\" (wildcard: \"%\")"
-msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
-msgstr "ทำ \"คำค้นจากตัวอย่าง\" (wildcard: \"%\")"
-
-#: templates/table/selection_form.phtml:34
-msgid "Do a \"query by example\" (wildcard: \"%\")"
-msgstr "ทำ \"คำค้นจากตัวอย่าง\" (wildcard: \"%\")"
-
-#: templates/table/zoom_result_form.phtml:7
-msgid "Browse/Edit the points"
-msgstr ""
-
-#: templates/table/zoom_result_form.phtml:15
-msgid "How to use"
-msgstr "วิธีการใช้"
-
-#: templates/table/zoom_result_form.phtml:23
-#, fuzzy
-#| msgid "Reset"
-msgid "Reset zoom"
-msgstr "เริ่มใหม่"
-
-#: templates/tbl_chart.phtml:17
+#: templates/table/chart/tbl_chart.phtml:17
 #, fuzzy
 #| msgid "Mar"
 msgctxt "Chart type"
 msgid "Bar"
 msgstr "มี.ค."
 
-#: templates/tbl_chart.phtml:21
+#: templates/table/chart/tbl_chart.phtml:21
 #, fuzzy
 #| msgid "Column"
 msgctxt "Chart type"
 msgid "Column"
 msgstr "สดมภ์"
 
-#: templates/tbl_chart.phtml:25
+#: templates/table/chart/tbl_chart.phtml:25
 msgctxt "Chart type"
 msgid "Line"
 msgstr ""
 
-#: templates/tbl_chart.phtml:29
+#: templates/table/chart/tbl_chart.phtml:29
 msgctxt "Chart type"
 msgid "Spline"
 msgstr ""
 
-#: templates/tbl_chart.phtml:33
+#: templates/table/chart/tbl_chart.phtml:33
 msgctxt "Chart type"
 msgid "Area"
 msgstr ""
 
-#: templates/tbl_chart.phtml:37
+#: templates/table/chart/tbl_chart.phtml:37
 #, fuzzy
 #| msgid "PiB"
 msgctxt "Chart type"
 msgid "Pie"
 msgstr "เพตตะไบต์"
 
-#: templates/tbl_chart.phtml:41
+#: templates/table/chart/tbl_chart.phtml:41
 #, fuzzy
 #| msgid "Time"
 msgctxt "Chart type"
 msgid "Timeline"
 msgstr "เวลา"
 
-#: templates/tbl_chart.phtml:45
+#: templates/table/chart/tbl_chart.phtml:45
 msgctxt "Chart type"
 msgid "Scatter"
 msgstr ""
 
-#: templates/tbl_chart.phtml:50
+#: templates/table/chart/tbl_chart.phtml:50
 msgid "Stacked"
 msgstr ""
 
-#: templates/tbl_chart.phtml:53
+#: templates/table/chart/tbl_chart.phtml:53
 #, fuzzy
 #| msgid "Import files"
 msgid "Chart title"
 msgstr "นำเข้าไฟล์"
 
-#: templates/tbl_chart.phtml:57
+#: templates/table/chart/tbl_chart.phtml:57
 msgid "X-Axis:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:72
+#: templates/table/chart/tbl_chart.phtml:72
 #, fuzzy
 msgid "Series:"
 msgstr "คำค้น SQL"
 
-#: templates/tbl_chart.phtml:102
+#: templates/table/chart/tbl_chart.phtml:102
 msgid "X-Axis label:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:104
+#: templates/table/chart/tbl_chart.phtml:104
 #, fuzzy
 #| msgid "Value"
 msgid "X Values"
 msgstr "ค่า"
 
-#: templates/tbl_chart.phtml:107
+#: templates/table/chart/tbl_chart.phtml:107
 msgid "Y-Axis label:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:115
+#: templates/table/chart/tbl_chart.phtml:115
 msgid "Series names are in a column"
 msgstr ""
 
-#: templates/tbl_chart.phtml:118
+#: templates/table/chart/tbl_chart.phtml:118
 #, fuzzy
 #| msgid "Inside column:"
 msgid "Series column:"
 msgstr "ในคอลัมน์:"
 
-#: templates/tbl_chart.phtml:130
+#: templates/table/chart/tbl_chart.phtml:130
 #, fuzzy
 #| msgid "Values for column %s"
 msgid "Value Column:"
 msgstr "ค่าสำหรับคอลัมน์ \"%s\""
 
-#: templates/tbl_chart.phtml:150
+#: templates/table/chart/tbl_chart.phtml:150
 #, fuzzy
 #| msgid "Save as file"
 msgid "Save chart as image"
 msgstr "บันทึกเป็นไฟล์"
 
-#: templates/tbl_relation/common_form.phtml:7
+#: templates/table/gis_visualization/gis_visualization.phtml:3
+msgid "Display GIS Visualization"
+msgstr ""
+
+#: templates/table/gis_visualization/gis_visualization.phtml:8
+#, fuzzy
+#| msgid "Add/Delete Field Columns"
+msgid "Label column"
+msgstr "เพิ่ม/ลบ คอลัมน์ (ฟิลด์)"
+
+#: templates/table/gis_visualization/gis_visualization.phtml:11
+msgid "-- None --"
+msgstr "-- ไม่มี --"
+
+#: templates/table/gis_visualization/gis_visualization.phtml:19
+#, fuzzy
+#| msgid "Total"
+msgid "Spatial column"
+msgstr "รวม"
+
+#: templates/table/index_form.phtml:16
+msgid "Index name:"
+msgstr "ชื่อดัชนี :"
+
+#: templates/table/index_form.phtml:19
+msgid ""
+"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
+msgstr "ชื่อของไพรมารีคีย์<b>จะต้องเป็น</b> \"PRIMARY\" เท่านั้น!"
+
+#: templates/table/index_form.phtml:40
+#, fuzzy
+#| msgid "Index name:"
+msgid "Index choice:"
+msgstr "ชื่อดัชนี :"
+
+#: templates/table/index_form.phtml:57
+msgid "Key block size:"
+msgstr ""
+
+#: templates/table/index_form.phtml:74
+msgid "Index type:"
+msgstr "ชนิดของดัชนี :"
+
+#: templates/table/index_form.phtml:86
+#, fuzzy
+#| msgid "User"
+msgid "Parser:"
+msgstr "ผู้ใช้"
+
+#: templates/table/index_form.phtml:102
+#, fuzzy
+#| msgid "Comment"
+msgid "Comment:"
+msgstr "หมายเหตุ"
+
+#: templates/table/index_form.phtml:149 templates/table/index_form.phtml:190
+#, fuzzy
+#| msgid "Drag to reorder"
+msgid "Drag to reorder"
+msgstr "ลากเพื่อเปลี่ยนลำดับ"
+
+#: templates/table/relation/common_form.phtml:7
 msgid "Internal relations"
 msgstr "รีเลชันภายใน"
 
-#: templates/tbl_relation/common_form.phtml:11
+#: templates/table/relation/common_form.phtml:11
 #, fuzzy
 #| msgid "Internal relations"
 msgid "Internal relation"
 msgstr "รีเลชันภายใน"
 
-#: templates/tbl_relation/common_form.phtml:14
+#: templates/table/relation/common_form.phtml:14
 msgid ""
 "An internal relation is not necessary when a corresponding FOREIGN KEY "
 "relation exists."
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:37
+#: templates/table/relation/common_form.phtml:37
 #, fuzzy
 #| msgid "Foreign key check:"
 msgid "Foreign key constraints"
 msgstr "ตรวจสอบคีย์ต่างประเทศ:"
 
-#: templates/tbl_relation/common_form.phtml:40
+#: templates/table/relation/common_form.phtml:40
 msgid "Actions"
 msgstr "กระทำการ"
 
-#: templates/tbl_relation/common_form.phtml:41
+#: templates/table/relation/common_form.phtml:41
 #, fuzzy
 #| msgid "Column names"
 msgid "Constraint properties"
 msgstr "ชื่อคอลัมน์"
 
-#: templates/tbl_relation/common_form.phtml:44
+#: templates/table/relation/common_form.phtml:44
 msgid ""
 "Only columns with index will be displayed. You can define an index below."
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:49
+#: templates/table/relation/common_form.phtml:49
 msgid "Foreign key constraint"
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:81
+#: templates/table/relation/common_form.phtml:81
 #, fuzzy
 #| msgid "Add constraints"
 msgid "+ Add constraint"
 msgstr "เพิ่ม constraints"
 
-#: templates/tbl_relation/common_form.phtml:91
+#: templates/table/relation/common_form.phtml:91
 #, fuzzy
 #| msgid "Choose column to display"
 msgid "Choose column to display:"
 msgstr "เลือกฟิลด์ที่ต้องการแสดง"
 
-#: templates/tbl_relation/foreign_key_row.phtml:13
+#: templates/table/relation/foreign_key_row.phtml:13
 #, fuzzy, php-format
 #| msgid "Foreign key check:"
 msgid "Foreign key constraint %s has been dropped"
 msgstr "ตรวจสอบคีย์ต่างประเทศ:"
 
-#: templates/tbl_relation/foreign_key_row.phtml:102
+#: templates/table/relation/foreign_key_row.phtml:102
 #, fuzzy
 #| msgid "Column names"
 msgid "Constraint name"
 msgstr "ชื่อคอลัมน์"
 
-#: templates/tbl_relation/foreign_key_row.phtml:157
+#: templates/table/relation/foreign_key_row.phtml:157
 #, fuzzy
 msgid "+ Add column"
 msgstr "เพิ่มฟิลด์ใหม่"
 
+#: templates/table/search/options.phtml:8
+#, fuzzy
+#| msgid "Select fields (at least one):"
+msgid "Select columns (at least one):"
+msgstr "เลือกฟิลด์ (อย่างน้อยหนึ่งฟิลด์):"
+
+#: templates/table/search/options.phtml:37
+msgid "Add search conditions (body of the \"where\" clause):"
+msgstr "เพิ่มเงื่อนไขในการค้นหา:"
+
+#: templates/table/search/options.phtml:45
+msgid "Number of rows per page"
+msgstr "ระเบียนต่อหน้า"
+
+#: templates/table/search/options.phtml:56
+msgid "Display order:"
+msgstr "ลำดับการแสดง:"
+
+#: templates/table/search/options_zoom.phtml:6
+msgid "Use this column to label each point"
+msgstr ""
+
+#: templates/table/search/options_zoom.phtml:35
+msgid "Maximum rows to plot"
+msgstr ""
+
+#: templates/table/search/replace_preview.phtml:13
+msgid "Find and replace - preview"
+msgstr ""
+
+#: templates/table/search/replace_preview.phtml:18
+#, fuzzy
+#| msgid "Original position"
+msgid "Original string"
+msgstr "ตำแหน่งเริ่มแรก"
+
+#: templates/table/search/replace_preview.phtml:19
+#, fuzzy
+#| msgid "Relations"
+msgid "Replaced string"
+msgstr "รีเลชัน"
+
+#: templates/table/search/replace_preview.phtml:40
+#, fuzzy
+#| msgid "Replicated"
+msgid "Replace"
+msgstr "ทำซ้ำเรียบร้อยแล้ว"
+
+#: templates/table/search/rows_zoom.phtml:16
+#, fuzzy
+msgid "Additional search criteria"
+msgstr "คำค้น SQL"
+
+#: templates/table/search/search_and_replace.phtml:3
+#, fuzzy
+#| msgid "Replace NULL by"
+msgid "Replace with:"
+msgstr "แทนที่ NULL เป็น"
+
+#: templates/table/search/search_and_replace.phtml:22
+#, fuzzy
+#| msgid "as regular expression"
+msgid "Use regular expression"
+msgstr "รูปแบบคำพ้อง (regular expression)"
+
+#: templates/table/search/selection_form.phtml:12
+#, fuzzy
+#| msgid "Do a \"query by example\" (wildcard: \"%\")"
+msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
+msgstr "ทำ \"คำค้นจากตัวอย่าง\" (wildcard: \"%\")"
+
+#: templates/table/search/selection_form.phtml:34
+msgid "Do a \"query by example\" (wildcard: \"%\")"
+msgstr "ทำ \"คำค้นจากตัวอย่าง\" (wildcard: \"%\")"
+
+#: templates/table/search/zoom_result_form.phtml:7
+msgid "Browse/Edit the points"
+msgstr ""
+
+#: templates/table/search/zoom_result_form.phtml:15
+msgid "How to use"
+msgstr "วิธีการใช้"
+
+#: templates/table/search/zoom_result_form.phtml:23
+#, fuzzy
+#| msgid "Reset"
+msgid "Reset zoom"
+msgstr "เริ่มใหม่"
+
+#: templates/table/secondary_tabs.phtml:14
+#, fuzzy
+#| msgid "Relation view"
+msgid "Relation view"
+msgstr "มุมมองรีเลชัน"
+
+#: templates/table/structure/actions_in_table_structure.phtml:14
+#, php-format
+msgid "A primary key has been added on %s."
+msgstr "ได้เพิ่มไพรมารีคีย์แล้วใน %s"
+
+#: templates/table/structure/actions_in_table_structure.phtml:34
+#: templates/table/structure/actions_in_table_structure.phtml:54
+#: templates/table/structure/actions_in_table_structure.phtml:79
+#: templates/table/structure/actions_in_table_structure.phtml:101
+#, php-format
+msgid "An index has been added on %s."
+msgstr "ได้เพิ่มดัชนีแล้วใน %s"
+
+#: templates/table/structure/actions_in_table_structure.phtml:130
+#: templates/table/structure/check_all_table_column.phtml:59
+#, fuzzy
+#| msgid "Remove chart"
+msgid "Remove from central columns"
+msgstr "เอาการแสดงผลออก"
+
+#: templates/table/structure/actions_in_table_structure.phtml:138
+#: templates/table/structure/check_all_table_column.phtml:55
+#, fuzzy
+#| msgid "CHAR textarea columns"
+msgid "Add to central columns"
+msgstr "คอลัมน์พื้นที่ข้อความ CHAR"
+
+#: templates/table/structure/add_column.phtml:7
+#, fuzzy, php-format
+msgid "Add %s column(s)"
+msgstr "เพิ่มฟิลด์ใหม่"
+
+#: templates/table/structure/add_column.phtml:12
+#, fuzzy
+#| msgid "At Beginning of Table"
+msgid "at beginning of table"
+msgstr "ที่จุดเริ่มต้นของตาราง"
+
+#: templates/table/structure/display_structure.phtml:140 view_create.php:181
+#, fuzzy
+#| msgid "Print view"
+msgid "Edit view"
+msgstr "แสดง"
+
+#: templates/table/structure/display_table_stats.phtml:9
+msgid "Space usage"
+msgstr "เนื้อที่ที่ใช้"
+
+#: templates/table/structure/display_table_stats.phtml:32
+msgid "Effective"
+msgstr "มีผล"
+
+#: templates/table/structure/move_columns_dialog.phtml:1
+#: templates/table/structure/optional_action_links.phtml:21
+#, fuzzy
+#| msgid "Add columns"
+msgid "Move columns"
+msgstr "เพิ่มฟิลด์ใหม่"
+
+#: templates/table/structure/move_columns_dialog.phtml:2
+msgid "Move the columns by dragging them up and down."
+msgstr ""
+
+#: templates/table/structure/optional_action_links.phtml:9
+msgid "Propose table structure"
+msgstr "เสนอโครงสร้างตาราง"
+
+#: templates/table/structure/optional_action_links.phtml:24
+#, fuzzy
+#| msgid "Propose table structure"
+msgid "Improve table structure"
+msgstr "เสนอโครงสร้างตาราง"
+
+#: templates/table/structure/optional_action_links.phtml:30
+#, fuzzy
+#| msgid "Track table"
+msgid "Track view"
+msgstr "ติดตามตาราง"
+
+#: templates/table/structure/row_stats_table.phtml:3
+#, fuzzy
+#| msgid "Row Statistics"
+msgid "Row statistics"
+msgstr "สถิติของแถว"
+
+#: templates/table/structure/row_stats_table.phtml:9
+msgid "static"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:11
+msgid "dynamic"
+msgstr "ไม่คงที่"
+
+#: templates/table/structure/row_stats_table.phtml:22
+msgid "partitioned"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:54
+msgid "Row length"
+msgstr "ความยาวแถว"
+
+#: templates/table/structure/row_stats_table.phtml:66
+msgid "Row size"
+msgstr "ขนาดแถว"
+
+#: templates/table/structure/row_stats_table.phtml:73
+msgid "Next autoindex"
+msgstr ""
+
+#: templates/table/structure/table_structure_row.phtml:46
+#, fuzzy, php-format
+#| msgid "Table %s has been dropped."
+msgid "Column %s has been dropped."
+msgstr "โยนตาราง %s ทิ้งไปเรียบร้อยแล้ว"
+
 #: themes.php:17 themes.php:22
 msgid "Theme"
 msgstr "ชุดรูปแบบ"
diff --git a/po/tk.po b/po/tk.po
index fc5ba75c42..b656bb1f0e 100644
--- a/po/tk.po
+++ b/po/tk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 4.5.0-dev\n"
 "Report-Msgid-Bugs-To: developers@phpmyadmin.net\n"
-"POT-Creation-Date: 2015-08-08 13:53-0400\n"
+"POT-Creation-Date: 2015-08-12 08:10-0400\n"
 "PO-Revision-Date: 2013-05-07 17:12+0200\n"
 "Last-Translator: Michal Čihař <michal@cihar.com>\n"
 "Language-Team: Turkmen <http://hosted.weblate.org/projects/phpmyadmin/master/"
@@ -57,7 +57,7 @@ msgid "Table comments:"
 msgstr ""
 
 #: db_datadict.php:104 libraries/Index.class.php:699
-#: libraries/insert_edit.lib.php:1567
+#: libraries/insert_edit.lib.php:1565
 #: libraries/navigation/Nodes/Node_Column.class.php:30
 #: libraries/plugins/export/ExportHtmlword.class.php:280
 #: libraries/plugins/export/ExportHtmlword.class.php:375
@@ -71,13 +71,14 @@ msgstr ""
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1023
 #: libraries/tracking.lib.php:879 libraries/tracking.lib.php:975
 #: templates/columns_definitions/column_name.phtml:18
-#: templates/index_form.phtml:124 templates/table/table_header.phtml:6
-#: templates/table/zoom_result_form.phtml:33
-#: templates/tbl_relation/common_form.phtml:10
-#: templates/tbl_relation/common_form.phtml:43
-#: templates/tbl_relation/foreign_key_row.phtml:194
-#: templates/tbl_relation/foreign_key_row.phtml:206
-#: templates/tbl_relation/internal_relational_row.phtml:71
+#: templates/table/index_form.phtml:124
+#: templates/table/relation/common_form.phtml:10
+#: templates/table/relation/common_form.phtml:43
+#: templates/table/relation/foreign_key_row.phtml:194
+#: templates/table/relation/foreign_key_row.phtml:206
+#: templates/table/relation/internal_relational_row.phtml:71
+#: templates/table/search/table_header.phtml:6
+#: templates/table/search/zoom_result_form.phtml:33
 msgid "Column"
 msgstr ""
 
@@ -95,21 +96,21 @@ msgstr ""
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1001
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1024
 #: libraries/rte/rte_list.lib.php:75 libraries/rte/rte_list.lib.php:103
-#: libraries/rte/rte_routines.lib.php:802
-#: libraries/rte/rte_routines.lib.php:831
-#: libraries/rte/rte_routines.lib.php:1493
+#: libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_routines.lib.php:922
+#: libraries/rte/rte_routines.lib.php:1584
 #: libraries/server_privileges.lib.php:2369 libraries/tracking.lib.php:880
 #: libraries/tracking.lib.php:972
 #: templates/columns_definitions/table_fields_definitions.phtml:11
-#: templates/structure/table_header.phtml:48
-#: templates/structure/table_structure_header.phtml:6
-#: templates/table/table_header.phtml:7
+#: templates/database/structure/table_header.phtml:48
+#: templates/table/search/table_header.phtml:7
+#: templates/table/structure/table_structure_header.phtml:6
 msgid "Type"
 msgstr ""
 
 #: db_datadict.php:106 libraries/Index.class.php:702
 #: libraries/central_columns.lib.php:708
-#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1576
+#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1574
 #: libraries/plugins/export/ExportHtmlword.class.php:286
 #: libraries/plugins/export/ExportHtmlword.class.php:381
 #: libraries/plugins/export/ExportLatex.class.php:509
@@ -122,8 +123,8 @@ msgstr ""
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1026
 #: libraries/tracking.lib.php:882 libraries/tracking.lib.php:978
 #: templates/columns_definitions/table_fields_definitions.phtml:39
-#: templates/structure/table_structure_header.phtml:9
-#: templates/table/zoom_result_form.phtml:34
+#: templates/table/search/zoom_result_form.phtml:34
+#: templates/table/structure/table_structure_header.phtml:9
 msgid "Null"
 msgstr ""
 
@@ -141,8 +142,8 @@ msgstr ""
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1027
 #: libraries/replication_gui.lib.php:153 libraries/tracking.lib.php:883
 #: templates/columns_definitions/table_fields_definitions.phtml:25
-#: templates/structure/body_for_table_summary.phtml:55
-#: templates/structure/table_structure_header.phtml:10
+#: templates/database/structure/body_for_table_summary.phtml:55
+#: templates/table/structure/table_structure_header.phtml:10
 msgid "Default"
 msgstr ""
 
@@ -170,19 +171,19 @@ msgid "Comments"
 msgstr ""
 
 #: db_datadict.php:146
-#: libraries/controllers/StructureController.class.php:1960
-#: libraries/controllers/StructureController.class.php:1965
+#: libraries/controllers/TableStructureController.class.php:951
+#: libraries/controllers/TableStructureController.class.php:956
 #: libraries/tracking.lib.php:922
 #: templates/columns_definitions/column_indexes.phtml:6
-#: templates/structure/check_all_table_column.phtml:22
-#: templates/structure/display_structure.phtml:74
+#: templates/table/structure/check_all_table_column.phtml:22
+#: templates/table/structure/display_structure.phtml:74
 msgid "Primary"
 msgstr ""
 
 #: db_datadict.php:156 js/messages.php:317 libraries/Index.class.php:567
 #: libraries/Index.class.php:606 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261 libraries/mult_submits.lib.php:403
+#: libraries/config/FormDisplay.tpl.php:272 libraries/mult_submits.lib.php:403
 #: libraries/mult_submits.lib.php:417
 #: libraries/plugins/export/ExportHtmlword.class.php:630
 #: libraries/plugins/export/ExportLatex.class.php:589
@@ -198,20 +199,20 @@ msgstr ""
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1010 libraries/tracking.lib.php:1015
 #: prefs_manage.php:140 templates/prefs_autoload.phtml:15
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "No"
 msgstr ""
 
 #: db_datadict.php:156 js/messages.php:443 libraries/Index.class.php:568
 #: libraries/Index.class.php:605 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261
-#: libraries/controllers/StructureController.class.php:1344
-#: libraries/controllers/StructureController.class.php:2223
-#: libraries/controllers/StructureController.class.php:2232
-#: libraries/controllers/StructureController.class.php:2237
-#: libraries/controllers/StructureController.class.php:2242
-#: libraries/controllers/StructureController.class.php:2247
+#: libraries/config/FormDisplay.tpl.php:272
+#: libraries/controllers/TableStructureController.class.php:539
+#: libraries/controllers/TableStructureController.class.php:1201
+#: libraries/controllers/TableStructureController.class.php:1210
+#: libraries/controllers/TableStructureController.class.php:1215
+#: libraries/controllers/TableStructureController.class.php:1220
+#: libraries/controllers/TableStructureController.class.php:1225
 #: libraries/mult_submits.inc.php:82 libraries/mult_submits.inc.php:178
 #: libraries/mult_submits.lib.php:339 libraries/mult_submits.lib.php:372
 #: libraries/mult_submits.lib.php:401 libraries/mult_submits.lib.php:415
@@ -220,8 +221,8 @@ msgstr ""
 #: libraries/plugins/export/ExportOdt.class.php:756
 #: libraries/plugins/export/ExportTexytext.class.php:567
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1077
-#: libraries/server_databases.lib.php:464
-#: libraries/server_databases.lib.php:474
+#: libraries/server_databases.lib.php:475
+#: libraries/server_databases.lib.php:485
 #: libraries/server_privileges.lib.php:2546
 #: libraries/server_privileges.lib.php:2727
 #: libraries/server_privileges.lib.php:2748
@@ -231,7 +232,7 @@ msgstr ""
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1008 libraries/tracking.lib.php:1013
 #: prefs_manage.php:138 templates/prefs_autoload.phtml:14
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "Yes"
 msgstr ""
 
@@ -241,7 +242,7 @@ msgstr ""
 
 #: db_export.php:37 db_tracking.php:90 export.php:382
 #: libraries/DBQbe.class.php:326
-#: libraries/controllers/StructureController.class.php:231
+#: libraries/controllers/DatabaseStructureController.class.php:170
 #: libraries/navigation/NavigationTree.class.php:897
 msgid "No tables found in database."
 msgstr ""
@@ -252,14 +253,14 @@ msgstr ""
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:26
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:120
-#: templates/structure/show_create.phtml:18
+#: templates/database/structure/show_create.phtml:18
 msgid "Tables"
 msgstr ""
 
 #: db_export.php:52 libraries/Menu.class.php:317 libraries/Menu.class.php:425
-#: libraries/Util.class.php:3333 libraries/Util.class.php:3343
-#: libraries/Util.class.php:3349 libraries/Util.class.php:3629
-#: libraries/Util.class.php:4327 libraries/Util.class.php:4344
+#: libraries/Util.class.php:3339 libraries/Util.class.php:3349
+#: libraries/Util.class.php:3355 libraries/Util.class.php:3635
+#: libraries/Util.class.php:4333 libraries/Util.class.php:4350
 #: libraries/central_columns.lib.php:728 libraries/config.values.php:39
 #: libraries/config.values.php:47 libraries/config.values.php:109
 #: libraries/config.values.php:115 libraries/config/setup.forms.php:323
@@ -273,7 +274,7 @@ msgstr ""
 #: libraries/navigation/Nodes/Node_Table.class.php:283
 #: libraries/server_privileges.lib.php:1141 libraries/tracking.lib.php:874
 #: templates/columns_definitions/table_fields_definitions.phtml:3
-#: templates/designer/table_list.phtml:28
+#: templates/database/designer/table_list.phtml:28
 msgid "Structure"
 msgstr ""
 
@@ -285,7 +286,7 @@ msgstr ""
 #: libraries/config/user_preferences.forms.php:292
 #: libraries/config/user_preferences.forms.php:297
 #: libraries/server_privileges.lib.php:1140
-#: templates/structure/display_table_stats.phtml:12
+#: templates/table/structure/display_table_stats.phtml:12
 msgid "Data"
 msgstr ""
 
@@ -359,10 +360,10 @@ msgstr ""
 #: libraries/server_privileges.lib.php:2908
 #: libraries/server_privileges.lib.php:3145
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4346
-#: templates/structure/table_header.phtml:21
-#: templates/tbl_relation/foreign_key_row.phtml:176
-#: templates/tbl_relation/internal_relational_row.phtml:63
+#: libraries/server_privileges.lib.php:4372
+#: templates/database/structure/table_header.phtml:21
+#: templates/table/relation/foreign_key_row.phtml:176
+#: templates/table/relation/internal_relational_row.phtml:63
 msgid "Table"
 msgstr ""
 
@@ -379,7 +380,7 @@ msgid "Updated"
 msgstr ""
 
 #: db_tracking.php:130 js/messages.php:243 libraries/Menu.class.php:552
-#: libraries/Util.class.php:4314 libraries/config.values.php:104
+#: libraries/Util.class.php:4320 libraries/config.values.php:104
 #: libraries/rte/rte_events.lib.php:393 libraries/rte/rte_list.lib.php:101
 #: libraries/server_status_processes.lib.php:92 libraries/tracking.lib.php:279
 msgid "Status"
@@ -388,14 +389,15 @@ msgstr ""
 #: db_tracking.php:131 db_tracking.php:290 libraries/Index.class.php:693
 #: libraries/central_columns.lib.php:687 libraries/rte/rte_list.lib.php:74
 #: libraries/rte/rte_list.lib.php:89 libraries/rte/rte_list.lib.php:102
-#: libraries/server_databases.lib.php:398
+#: libraries/server_databases.lib.php:409
 #: libraries/server_privileges.lib.php:2372
 #: libraries/server_privileges.lib.php:3166
 #: libraries/server_privileges.lib.php:3342
 #: libraries/server_user_groups.lib.php:82
 #: libraries/server_variables.lib.php:189 libraries/tracking.lib.php:280
-#: libraries/tracking.lib.php:793 templates/structure/table_header.phtml:30
-#: templates/structure/table_structure_header.phtml:23
+#: libraries/tracking.lib.php:793
+#: templates/database/structure/table_header.phtml:30
+#: templates/table/structure/table_structure_header.phtml:23
 msgid "Action"
 msgstr ""
 
@@ -437,7 +439,7 @@ msgid "Untracked tables"
 msgstr ""
 
 #: db_tracking.php:305 db_tracking.php:336
-#: templates/structure/optional_action_links.phtml:17
+#: templates/table/structure/optional_action_links.phtml:17
 msgid "Track table"
 msgstr ""
 
@@ -487,7 +489,7 @@ msgid "Value for the column \"%s\""
 msgstr ""
 
 #: gis_data_editor.php:146
-#: templates/gis_visualization/gis_visualization.phtml:37
+#: templates/table/gis_visualization/gis_visualization.phtml:37
 msgid "Use OpenStreetMaps as Base Layer"
 msgstr ""
 
@@ -567,35 +569,35 @@ msgstr ""
 #: libraries/display_change_password.lib.php:162
 #: libraries/display_export.lib.php:402 libraries/display_export.lib.php:408
 #: libraries/display_import.lib.php:392 libraries/index.lib.php:44
-#: libraries/insert_edit.lib.php:1546 libraries/insert_edit.lib.php:1583
+#: libraries/insert_edit.lib.php:1544 libraries/insert_edit.lib.php:1581
 #: libraries/normalization.lib.php:165 libraries/normalization.lib.php:821
 #: libraries/operations.lib.php:38 libraries/operations.lib.php:108
 #: libraries/operations.lib.php:263 libraries/operations.lib.php:306
 #: libraries/operations.lib.php:801 libraries/operations.lib.php:874
 #: libraries/operations.lib.php:923 libraries/operations.lib.php:1337
 #: libraries/operations.lib.php:1658
-#: libraries/plugins/auth/AuthenticationCookie.class.php:244
+#: libraries/plugins/auth/AuthenticationCookie.class.php:232
 #: libraries/replication_gui.lib.php:122 libraries/replication_gui.lib.php:161
 #: libraries/replication_gui.lib.php:324 libraries/replication_gui.lib.php:461
 #: libraries/replication_gui.lib.php:906 libraries/rte/rte_events.lib.php:509
-#: libraries/rte/rte_routines.lib.php:969
-#: libraries/rte/rte_routines.lib.php:1581
+#: libraries/rte/rte_routines.lib.php:1060
+#: libraries/rte/rte_routines.lib.php:1672
 #: libraries/rte/rte_triggers.lib.php:396 libraries/server_bin_log.lib.php:61
 #: libraries/server_privileges.lib.php:705
 #: libraries/server_privileges.lib.php:2106
 #: libraries/server_privileges.lib.php:2872
 #: libraries/server_privileges.lib.php:3553
-#: libraries/server_privileges.lib.php:4627
+#: libraries/server_privileges.lib.php:4653
 #: libraries/server_user_groups.lib.php:285
 #: libraries/sql_query_form.lib.php:369 libraries/sql_query_form.lib.php:429
 #: libraries/tracking.lib.php:533 libraries/tracking.lib.php:653
 #: prefs_manage.php:277 prefs_manage.php:355
 #: templates/columns_definitions/column_definitions_form.phtml:59
-#: templates/header_location.phtml:17 templates/index_form.phtml:238
+#: templates/database/create_table.phtml:21 templates/header_location.phtml:28
 #: templates/startAndNumberOfRowsPanel.phtml:14
-#: templates/structure/add_column.phtml:25
-#: templates/table/create_table.phtml:21
-#: templates/table/selection_form.phtml:75 view_create.php:275
+#: templates/table/index_form.phtml:238
+#: templates/table/search/selection_form.phtml:75
+#: templates/table/structure/add_column.phtml:25 view_create.php:275
 #: view_operations.php:106
 msgid "Go"
 msgstr "Git"
@@ -673,7 +675,7 @@ msgstr ""
 msgid "Could not load import plugins, please check your installation!"
 msgstr ""
 
-#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1466
+#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1460
 #, fuzzy, php-format
 #| msgid "Database %1$s has been created."
 msgid "Bookmark %s has been created."
@@ -708,11 +710,11 @@ msgstr ""
 msgid "Back"
 msgstr ""
 
-#: index.php:148 libraries/Footer.class.php:70
+#: index.php:149 libraries/Footer.class.php:70
 msgid "phpMyAdmin Demo Server"
 msgstr ""
 
-#: index.php:152
+#: index.php:153
 #, php-format
 msgid ""
 "You are using the demo server. You can do anything here, but please do not "
@@ -720,110 +722,110 @@ msgid ""
 "at %s."
 msgstr ""
 
-#: index.php:162
+#: index.php:163
 msgid "General Settings"
 msgstr ""
 
-#: index.php:190 libraries/display_change_password.lib.php:50
+#: index.php:191 libraries/display_change_password.lib.php:50
 #: libraries/display_change_password.lib.php:53 user_password.php:247
 msgid "Change password"
 msgstr ""
 
-#: index.php:206
+#: index.php:207
 msgid "Server connection collation"
 msgstr ""
 
-#: index.php:228
+#: index.php:229
 msgid "Appearance Settings"
 msgstr ""
 
-#: index.php:258 prefs_manage.php:285
+#: index.php:259 prefs_manage.php:285
 msgid "More settings"
 msgstr ""
 
-#: index.php:279
+#: index.php:280
 msgid "Database server"
 msgstr ""
 
-#: index.php:282 libraries/plugins/auth/AuthenticationCookie.class.php:181
+#: index.php:283 libraries/plugins/auth/AuthenticationCookie.class.php:169
 msgid "Server:"
 msgstr ""
 
-#: index.php:286
+#: index.php:287
 msgid "Server type:"
 msgstr ""
 
-#: index.php:290 libraries/plugins/export/ExportLatex.class.php:212
+#: index.php:291 libraries/plugins/export/ExportLatex.class.php:212
 #: libraries/plugins/export/ExportSql.class.php:687
 #: libraries/plugins/export/ExportXml.class.php:189
 msgid "Server version:"
 msgstr ""
 
-#: index.php:296
+#: index.php:297
 msgid "Protocol version:"
 msgstr ""
 
-#: index.php:300
+#: index.php:301
 msgid "User:"
 msgstr ""
 
-#: index.php:305
+#: index.php:306
 msgid "Server charset:"
 msgstr ""
 
-#: index.php:320
+#: index.php:321
 msgid "Web server"
 msgstr ""
 
-#: index.php:331
+#: index.php:332
 msgid "Database client version:"
 msgstr ""
 
-#: index.php:335
+#: index.php:336
 msgid "PHP extension:"
 msgstr ""
 
-#: index.php:349
+#: index.php:350
 msgid "PHP version:"
 msgstr ""
 
-#: index.php:360
+#: index.php:361
 msgid "Show PHP information"
 msgstr ""
 
-#: index.php:383
+#: index.php:384
 msgid "Version information:"
 msgstr ""
 
-#: index.php:392 libraries/Util.class.php:432 libraries/Util.class.php:495
-#: libraries/config/FormDisplay.tpl.php:151
+#: index.php:393 libraries/Util.class.php:432 libraries/Util.class.php:495
+#: libraries/config/FormDisplay.tpl.php:162
 #: libraries/display_export.lib.php:577 libraries/engines/pbxt.lib.php:162
 #: libraries/navigation/NavigationHeader.class.php:196
 #: libraries/server_variables.lib.php:160
 msgid "Documentation"
 msgstr ""
 
-#: index.php:399
+#: index.php:400
 msgid "Wiki"
 msgstr ""
 
-#: index.php:408
+#: index.php:409
 msgid "Official Homepage"
 msgstr ""
 
-#: index.php:415
+#: index.php:416
 msgid "Contribute"
 msgstr ""
 
-#: index.php:422
+#: index.php:423
 msgid "Get support"
 msgstr ""
 
-#: index.php:429
+#: index.php:430
 msgid "List of changes"
 msgstr ""
 
-#: index.php:451
+#: index.php:452
 msgid ""
 "You are connected as 'root' with no password, which corresponds to the "
 "default MySQL privileged account. Your MySQL server is running with this "
@@ -831,21 +833,21 @@ msgid ""
 "by setting a password for user 'root'."
 msgstr ""
 
-#: index.php:468
+#: index.php:469
 msgid ""
 "You have enabled mbstring.func_overload in your PHP configuration. This "
 "option is incompatible with phpMyAdmin and might cause some data to be "
 "corrupted!"
 msgstr ""
 
-#: index.php:483
+#: index.php:484
 msgid ""
 "The mbstring PHP extension was not found and you seem to be using a "
 "multibyte charset. Without the mbstring extension phpMyAdmin is unable to "
 "split strings correctly and it may result in unexpected results."
 msgstr ""
 
-#: index.php:500
+#: index.php:501
 msgid ""
 "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini."
 "session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower than "
@@ -853,17 +855,17 @@ msgid ""
 "expire sooner than configured in phpMyAdmin."
 msgstr ""
 
-#: index.php:519
+#: index.php:520
 msgid ""
 "Login cookie store is lower than cookie validity configured in phpMyAdmin, "
 "because of this, your login will expire sooner than configured in phpMyAdmin."
 msgstr ""
 
-#: index.php:535
+#: index.php:536
 msgid "The configuration file now needs a secret passphrase (blowfish_secret)."
 msgstr ""
 
-#: index.php:548
+#: index.php:549
 msgid ""
 "Directory [code]config[/code], which is used by the setup script, still "
 "exists in your phpMyAdmin directory. It is strongly recommended to remove it "
@@ -871,26 +873,26 @@ msgid ""
 "may be compromised by unauthorized people downloading your configuration."
 msgstr ""
 
-#: index.php:564
+#: index.php:565
 #, php-format
 msgid ""
 "The phpMyAdmin configuration storage is not completely configured, some "
 "extended features have been deactivated. %sFind out why%s. "
 msgstr ""
 
-#: index.php:571
+#: index.php:572
 msgid ""
 "Or alternately go to 'Operations' tab of any database to set it up there."
 msgstr ""
 
-#: index.php:620
+#: index.php:621
 #, php-format
 msgid ""
 "Your PHP MySQL library version %s differs from your MySQL server version %s. "
 "This may cause unpredictable behavior."
 msgstr ""
 
-#: index.php:648
+#: index.php:649
 #, php-format
 msgid ""
 "Server running with Suhosin. Please refer to %sdocumentation%s for possible "
@@ -1031,8 +1033,8 @@ msgstr ""
 msgid "Save & Close"
 msgstr ""
 
-#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:404
-#: libraries/insert_edit.lib.php:1550 prefs_manage.php:361
+#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:415
+#: libraries/insert_edit.lib.php:1548 prefs_manage.php:361
 #: prefs_manage.php:372
 msgid "Reset"
 msgstr ""
@@ -1065,7 +1067,7 @@ msgstr ""
 msgid "Edit Index"
 msgstr ""
 
-#: js/messages.php:99 templates/index_form.phtml:232
+#: js/messages.php:99 templates/table/index_form.phtml:232
 #, php-format
 msgid "Add %s column(s) to index"
 msgstr ""
@@ -1086,13 +1088,14 @@ msgstr ""
 msgid "Please select column(s) for the index."
 msgstr ""
 
-#: js/messages.php:106 templates/structure/add_column.phtml:1
+#: js/messages.php:106 templates/table/structure/add_column.phtml:1
 msgid "You have to add at least one column."
 msgstr ""
 
-#: js/messages.php:109 libraries/insert_edit.lib.php:1548
+#: js/messages.php:109 libraries/insert_edit.lib.php:1546
 #: templates/columns_definitions/column_definitions_form.phtml:162
-#: templates/index_form.phtml:237 templates/tbl_relation/common_form.phtml:106
+#: templates/table/index_form.phtml:237
+#: templates/table/relation/common_form.phtml:106
 msgid "Preview SQL"
 msgstr ""
 
@@ -1109,7 +1112,7 @@ msgid "SQL query:"
 msgstr ""
 
 #. l10n: Default label for the y-Axis of Charts
-#: js/messages.php:118 templates/tbl_chart.phtml:109
+#: js/messages.php:118 templates/table/chart/tbl_chart.phtml:109
 msgid "Y Values"
 msgstr ""
 
@@ -1262,7 +1265,7 @@ msgstr ""
 msgid "Bytes received"
 msgstr ""
 
-#: js/messages.php:169 libraries/server_status.lib.php:226
+#: js/messages.php:169 libraries/server_status.lib.php:235
 msgid "Connections"
 msgstr ""
 
@@ -1319,12 +1322,12 @@ msgstr ""
 msgid "Questions"
 msgstr ""
 
-#: js/messages.php:184 libraries/server_status.lib.php:134
+#: js/messages.php:184 libraries/server_status.lib.php:143
 msgid "Traffic"
 msgstr ""
 
 #: js/messages.php:185 libraries/Menu.class.php:586
-#: libraries/Util.class.php:4318 libraries/server_status_monitor.lib.php:257
+#: libraries/Util.class.php:4324 libraries/server_status_monitor.lib.php:257
 msgid "Settings"
 msgstr ""
 
@@ -1344,8 +1347,9 @@ msgstr ""
 #: libraries/server_status_monitor.lib.php:236
 #: libraries/server_status_processes.lib.php:308
 #: templates/columns_definitions/transformation.phtml:4
-#: templates/designer/options_panel.phtml:178
-#: templates/table/options_zoom.phtml:12 templates/table/rows_zoom.phtml:26
+#: templates/database/designer/options_panel.phtml:178
+#: templates/table/search/options_zoom.phtml:12
+#: templates/table/search/rows_zoom.phtml:26
 msgid "None"
 msgstr ""
 
@@ -1613,8 +1617,8 @@ msgstr ""
 
 #: js/messages.php:270 libraries/Menu.class.php:352
 #: libraries/Menu.class.php:455 libraries/Menu.class.php:582
-#: libraries/Util.class.php:4317 libraries/Util.class.php:4332
-#: libraries/Util.class.php:4349 libraries/config/messages.inc.php:258
+#: libraries/Util.class.php:4323 libraries/Util.class.php:4338
+#: libraries/Util.class.php:4355 libraries/config/messages.inc.php:258
 #: libraries/display_import.lib.php:105
 #: libraries/server_status_monitor.lib.php:318 prefs_manage.php:238
 #: setup/frames/menu.inc.php:26
@@ -1674,13 +1678,13 @@ msgid "Formatting SQL..."
 msgstr ""
 
 #: js/messages.php:293 libraries/server_variables.lib.php:157
-#: templates/designer/aggregate_query_panel.phtml:63
-#: templates/designer/delete_relation_panel.phtml:28
-#: templates/designer/having_query_panel.phtml:117
-#: templates/designer/new_relation_panel.phtml:88
-#: templates/designer/options_panel.phtml:253
-#: templates/designer/rename_to_panel.phtml:45
-#: templates/designer/where_query_panel.phtml:83
+#: templates/database/designer/aggregate_query_panel.phtml:63
+#: templates/database/designer/delete_relation_panel.phtml:28
+#: templates/database/designer/having_query_panel.phtml:117
+#: templates/database/designer/new_relation_panel.phtml:88
+#: templates/database/designer/options_panel.phtml:253
+#: templates/database/designer/rename_to_panel.phtml:45
+#: templates/database/designer/where_query_panel.phtml:83
 msgid "Cancel"
 msgstr ""
 
@@ -1688,7 +1692,7 @@ msgstr ""
 msgid "Page-related settings"
 msgstr ""
 
-#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:402
+#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:413
 msgid "Apply"
 msgstr ""
 
@@ -1723,8 +1727,8 @@ msgstr ""
 msgid "Error text: %s"
 msgstr ""
 
-#: js/messages.php:307 libraries/db_common.inc.php:68
-#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:450
+#: js/messages.php:307 libraries/db_common.inc.php:69
+#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:461
 msgid "No databases selected."
 msgstr ""
 
@@ -1736,12 +1740,13 @@ msgstr ""
 msgid "Adding Primary Key"
 msgstr ""
 
-#: js/messages.php:310 templates/designer/aggregate_query_panel.phtml:59
-#: templates/designer/having_query_panel.phtml:113
-#: templates/designer/new_relation_panel.phtml:87
-#: templates/designer/options_panel.phtml:252
-#: templates/designer/rename_to_panel.phtml:41
-#: templates/designer/where_query_panel.phtml:82
+#: js/messages.php:310
+#: templates/database/designer/aggregate_query_panel.phtml:59
+#: templates/database/designer/having_query_panel.phtml:113
+#: templates/database/designer/new_relation_panel.phtml:87
+#: templates/database/designer/options_panel.phtml:252
+#: templates/database/designer/rename_to_panel.phtml:41
+#: templates/database/designer/where_query_panel.phtml:82
 msgid "OK"
 msgstr ""
 
@@ -1761,7 +1766,7 @@ msgstr ""
 msgid "Changing Charset"
 msgstr ""
 
-#: js/messages.php:320 libraries/Util.class.php:3217
+#: js/messages.php:320 libraries/Util.class.php:3223
 msgid "Enable foreign key checks"
 msgstr ""
 
@@ -1798,20 +1803,21 @@ msgstr ""
 #: js/messages.php:334 libraries/DisplayResults.class.php:4834
 #: libraries/DisplayResults.class.php:5092 libraries/Menu.class.php:344
 #: libraries/Menu.class.php:446 libraries/Menu.class.php:578
-#: libraries/Util.class.php:3636 libraries/Util.class.php:3637
-#: libraries/Util.class.php:4316 libraries/Util.class.php:4331
-#: libraries/Util.class.php:4348 libraries/config/messages.inc.php:252
+#: libraries/Util.class.php:3642 libraries/Util.class.php:3643
+#: libraries/Util.class.php:4322 libraries/Util.class.php:4337
+#: libraries/Util.class.php:4354 libraries/config/messages.inc.php:252
 #: libraries/display_export.lib.php:173 libraries/rte/rte_list.lib.php:146
 #: libraries/server_privileges.lib.php:2211
 #: libraries/server_privileges.lib.php:2290
 #: libraries/server_privileges.lib.php:2632
 #: libraries/server_privileges.lib.php:3356
 #: libraries/server_status_monitor.lib.php:322 prefs_manage.php:303
-#: setup/frames/menu.inc.php:27 templates/structure/check_all_tables.phtml:11
+#: setup/frames/menu.inc.php:27
+#: templates/database/structure/check_all_tables.phtml:11
 msgid "Export"
 msgstr ""
 
-#: js/messages.php:337 libraries/rte/rte_routines.lib.php:652
+#: js/messages.php:337 libraries/rte/rte_routines.lib.php:743
 msgid "ENUM/SET editor"
 msgstr ""
 
@@ -1850,7 +1856,7 @@ msgstr ""
 #: libraries/Console.class.php:214 libraries/DisplayResults.class.php:3474
 #: libraries/DisplayResults.class.php:4818 libraries/Index.class.php:723
 #: libraries/Util.class.php:706 libraries/Util.class.php:1202
-#: libraries/Util.class.php:3634 libraries/Util.class.php:3635
+#: libraries/Util.class.php:3640 libraries/Util.class.php:3641
 #: libraries/central_columns.lib.php:851
 #: libraries/central_columns.lib.php:1193
 #: libraries/config/messages.inc.php:892
@@ -1868,7 +1874,7 @@ msgstr ""
 #: libraries/server_user_groups.lib.php:129
 #: libraries/sql_query_form.lib.php:416 libraries/tracking.lib.php:477
 #: setup/frames/index.inc.php:183 setup/frames/index.inc.php:291
-#: templates/designer/delete_relation_panel.phtml:27
+#: templates/database/designer/delete_relation_panel.phtml:27
 msgid "Delete"
 msgstr ""
 
@@ -2031,11 +2037,11 @@ msgid "No dependencies selected!"
 msgstr ""
 
 #: js/messages.php:394 libraries/central_columns.lib.php:1214
-#: libraries/insert_edit.lib.php:1458 libraries/server_variables.lib.php:155
+#: libraries/insert_edit.lib.php:1456 libraries/server_variables.lib.php:155
 #: setup/frames/config.inc.php:42 setup/frames/index.inc.php:279
 #: templates/columns_definitions/column_definitions_form.phtml:165
-#: templates/gis_visualization/gis_visualization.phtml:48
-#: templates/tbl_relation/common_form.phtml:107
+#: templates/table/gis_visualization/gis_visualization.phtml:48
+#: templates/table/relation/common_form.phtml:107
 msgid "Save"
 msgstr ""
 
@@ -2112,8 +2118,8 @@ msgid "Data point content"
 msgstr ""
 
 #: js/messages.php:430 js/messages.php:562 js/messages.php:579
-#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2573
-#: templates/index_form.phtml:154 templates/index_form.phtml:194
+#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2571
+#: templates/table/index_form.phtml:154 templates/table/index_form.phtml:194
 msgid "Ignore"
 msgstr ""
 
@@ -2172,8 +2178,8 @@ msgstr ""
 msgid "Please select the primary key or a unique key!"
 msgstr ""
 
-#: js/messages.php:457 templates/designer/side_menu.phtml:91
-#: templates/designer/side_menu.phtml:94
+#: js/messages.php:457 templates/database/designer/side_menu.phtml:91
+#: templates/database/designer/side_menu.phtml:94
 msgid "Choose column to display"
 msgstr ""
 
@@ -2187,18 +2193,18 @@ msgstr ""
 msgid "Page name"
 msgstr ""
 
-#: js/messages.php:463 templates/designer/side_menu.phtml:56
-#: templates/designer/side_menu.phtml:59
+#: js/messages.php:463 templates/database/designer/side_menu.phtml:56
+#: templates/database/designer/side_menu.phtml:59
 msgid "Save page"
 msgstr ""
 
-#: js/messages.php:464 templates/designer/side_menu.phtml:63
-#: templates/designer/side_menu.phtml:66
+#: js/messages.php:464 templates/database/designer/side_menu.phtml:63
+#: templates/database/designer/side_menu.phtml:66
 msgid "Save page as"
 msgstr ""
 
-#: js/messages.php:465 templates/designer/side_menu.phtml:49
-#: templates/designer/side_menu.phtml:52
+#: js/messages.php:465 templates/database/designer/side_menu.phtml:49
+#: templates/database/designer/side_menu.phtml:52
 msgid "Open page"
 msgstr ""
 
@@ -2206,7 +2212,7 @@ msgstr ""
 msgid "Delete page"
 msgstr ""
 
-#: js/messages.php:467 templates/designer/side_menu.phtml:10
+#: js/messages.php:467 templates/database/designer/side_menu.phtml:10
 msgid "Untitled"
 msgstr ""
 
@@ -2317,7 +2323,7 @@ msgstr ""
 msgid "cancel"
 msgstr ""
 
-#: js/messages.php:499 libraries/server_status.lib.php:271
+#: js/messages.php:499 libraries/server_status.lib.php:280
 msgid "Aborted"
 msgstr ""
 
@@ -2877,7 +2883,7 @@ msgstr ""
 
 #: js/messages.php:793 libraries/Message.class.php:199
 #: libraries/Util.class.php:654 libraries/core.lib.php:245
-#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1172
+#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1170
 #: tbl_operations.php:229 view_operations.php:63
 msgid "Error"
 msgstr ""
@@ -2936,8 +2942,8 @@ msgstr ""
 msgid "per minute"
 msgstr ""
 
-#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:143
-#: libraries/server_status.lib.php:228
+#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:152
+#: libraries/server_status.lib.php:237
 #: libraries/server_status_queries.lib.php:98
 msgid "per hour"
 msgstr ""
@@ -2955,7 +2961,7 @@ msgstr ""
 msgid "Wrong permissions on configuration file, should not be world writable!"
 msgstr ""
 
-#: libraries/Config.class.php:1799
+#: libraries/Config.class.php:1801
 msgid "Font size"
 msgstr ""
 
@@ -2983,10 +2989,10 @@ msgstr ""
 #: libraries/server_privileges.lib.php:2890
 #: libraries/server_privileges.lib.php:3144
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4332
+#: libraries/server_privileges.lib.php:4358
 #: libraries/server_status_processes.lib.php:80
-#: templates/tbl_relation/foreign_key_row.phtml:165
-#: templates/tbl_relation/internal_relational_row.phtml:55
+#: templates/table/relation/foreign_key_row.phtml:165
+#: templates/table/relation/internal_relational_row.phtml:55
 msgid "Database"
 msgstr ""
 
@@ -3079,11 +3085,11 @@ msgstr ""
 #: libraries/plugins/import/ImportMediawiki.class.php:60
 #: libraries/plugins/import/ImportOds.class.php:59
 #: libraries/plugins/import/ImportShp.class.php:57
-#: libraries/plugins/import/ImportSql.class.php:148
+#: libraries/plugins/import/ImportSql.class.php:51
 #: libraries/plugins/import/ImportXml.class.php:58
-#: libraries/rte/rte_routines.lib.php:833 templates/index_form.phtml:49
-#: templates/structure/row_stats_table.phtml:20
-#: templates/table/options.phtml:2
+#: libraries/rte/rte_routines.lib.php:924 templates/table/index_form.phtml:49
+#: templates/table/search/options.phtml:2
+#: templates/table/structure/row_stats_table.phtml:20
 msgid "Options"
 msgstr ""
 
@@ -3116,7 +3122,8 @@ msgstr ""
 msgid "Order:"
 msgstr ""
 
-#: libraries/Console.class.php:289 templates/table/replace_preview.phtml:17
+#: libraries/Console.class.php:289
+#: templates/table/search/replace_preview.phtml:17
 msgid "Count"
 msgstr ""
 
@@ -3215,9 +3222,9 @@ msgstr ""
 #: libraries/operations.lib.php:794 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:191
-#: templates/structure/sortable_header.phtml:21
-#: templates/structure/sortable_header.phtml:38
-#: templates/table/options.phtml:68
+#: templates/database/structure/sortable_header.phtml:21
+#: templates/database/structure/sortable_header.phtml:38
+#: templates/table/search/options.phtml:68
 msgid "Ascending"
 msgstr ""
 
@@ -3227,13 +3234,14 @@ msgstr ""
 #: libraries/operations.lib.php:797 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:188
-#: templates/structure/sortable_header.phtml:26
-#: templates/structure/sortable_header.phtml:43
-#: templates/table/options.phtml:69
+#: templates/database/structure/sortable_header.phtml:26
+#: templates/database/structure/sortable_header.phtml:43
+#: templates/table/search/options.phtml:69
 msgid "Descending"
 msgstr ""
 
-#: libraries/DBQbe.class.php:467 templates/table/search_and_replace.phtml:6
+#: libraries/DBQbe.class.php:467
+#: templates/table/search/search_and_replace.phtml:6
 msgid "Column:"
 msgstr ""
 
@@ -3392,12 +3400,12 @@ msgstr[0] ""
 msgstr[1] ""
 
 #: libraries/DbSearch.class.php:354 libraries/Menu.class.php:311
-#: libraries/Util.class.php:3337 libraries/Util.class.php:3347
-#: libraries/Util.class.php:3623 libraries/Util.class.php:3624
-#: libraries/Util.class.php:4343 libraries/config.values.php:43
+#: libraries/Util.class.php:3343 libraries/Util.class.php:3353
+#: libraries/Util.class.php:3629 libraries/Util.class.php:3630
+#: libraries/Util.class.php:4349 libraries/config.values.php:43
 #: libraries/config.values.php:51 libraries/config.values.php:119
 #: libraries/navigation/Nodes/Node_Table.class.php:295
-#: templates/structure/check_all_table_column.phtml:5
+#: templates/table/structure/check_all_table_column.phtml:5
 msgid "Browse"
 msgstr ""
 
@@ -3414,7 +3422,8 @@ msgstr ""
 msgid "Words or values to search for (wildcard: \"%\"):"
 msgstr ""
 
-#: libraries/DbSearch.class.php:401 templates/table/search_and_replace.phtml:1
+#: libraries/DbSearch.class.php:401
+#: templates/table/search/search_and_replace.phtml:1
 msgid "Find:"
 msgstr ""
 
@@ -3460,28 +3469,28 @@ msgstr ""
 msgid "Search this table"
 msgstr "Şu bahany ulan"
 
-#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2532
-#: libraries/Util.class.php:2535
+#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2538
+#: libraries/Util.class.php:2541
 msgctxt "First page"
 msgid "Begin"
 msgstr ""
 
-#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2533
-#: libraries/Util.class.php:2536 libraries/server_bin_log.lib.php:170
+#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2539
+#: libraries/Util.class.php:2542 libraries/server_bin_log.lib.php:170
 #: libraries/server_bin_log.lib.php:172
 msgctxt "Previous page"
 msgid "Previous"
 msgstr ""
 
-#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2564
-#: libraries/Util.class.php:2574 libraries/server_bin_log.lib.php:204
+#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2570
+#: libraries/Util.class.php:2580 libraries/server_bin_log.lib.php:204
 #: libraries/server_bin_log.lib.php:206
 msgctxt "Next page"
 msgid "Next"
 msgstr ""
 
-#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2565
-#: libraries/Util.class.php:2575
+#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2571
+#: libraries/Util.class.php:2581
 msgctxt "Last page"
 msgid "End"
 msgstr ""
@@ -3556,15 +3565,15 @@ msgid "May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]."
 msgstr ""
 
 #: libraries/DisplayResults.class.php:4332 libraries/Message.class.php:180
-#: libraries/controllers/TableRelationController.class.php:258
+#: libraries/controllers/TableRelationController.class.php:259
 #: libraries/controllers/TableSearchController.class.php:655
-#: libraries/rte/rte_routines.lib.php:1332 libraries/sql_query_form.lib.php:89
+#: libraries/rte/rte_routines.lib.php:1423 libraries/sql_query_form.lib.php:89
 #: tbl_operations.php:227 tbl_row_action.php:138 view_operations.php:62
 msgid "Your SQL query has been executed successfully."
 msgstr ""
 
 #: libraries/DisplayResults.class.php:4660
-#: libraries/controllers/StructureController.class.php:629
+#: libraries/controllers/DatabaseStructureController.class.php:564
 #, php-format
 msgid ""
 "This view has at least this number of rows. Please refer to %sdocumentation"
@@ -3586,33 +3595,33 @@ msgstr ""
 msgid "%d total"
 msgstr ""
 
-#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1318
+#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1312
 #, php-format
 msgid "Query took %01.4f seconds."
 msgstr ""
 
 #: libraries/DisplayResults.class.php:4807
-#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4767
-#: libraries/Util.class.php:4773 libraries/mult_submits.inc.php:50
-#: templates/structure/check_all_tables.phtml:2
-#: templates/structure/check_all_tables.phtml:9
+#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4773
+#: libraries/Util.class.php:4779 libraries/mult_submits.inc.php:50
+#: templates/database/structure/check_all_tables.phtml:2
+#: templates/database/structure/check_all_tables.phtml:9
 msgid "With selected:"
 msgstr ""
 
 #: libraries/DisplayResults.class.php:4811
-#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4769
-#: libraries/Util.class.php:4770 libraries/server_privileges.lib.php:1174
+#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4775
+#: libraries/Util.class.php:4776 libraries/server_privileges.lib.php:1174
 #: libraries/server_privileges.lib.php:1175
 #: libraries/server_privileges.lib.php:1387
 #: libraries/server_user_groups.lib.php:231
-#: templates/structure/check_all_tables.phtml:3
-#: templates/structure/check_all_tables.phtml:4
+#: templates/database/structure/check_all_tables.phtml:3
+#: templates/database/structure/check_all_tables.phtml:4
 msgid "Check All"
 msgstr ""
 
 #: libraries/DisplayResults.class.php:4985 libraries/Header.class.php:383
-#: templates/structure/optional_action_links.phtml:1
-#: templates/structure/print_view_data_dictionary_link.phtml:3
+#: templates/database/structure/print_view_data_dictionary_link.phtml:3
+#: templates/table/structure/optional_action_links.phtml:1
 msgid "Print view"
 msgstr ""
 
@@ -3620,7 +3629,8 @@ msgstr ""
 msgid "Query results operations"
 msgstr ""
 
-#: libraries/DisplayResults.class.php:5105 templates/tbl_chart.phtml:12
+#: libraries/DisplayResults.class.php:5105
+#: templates/table/chart/tbl_chart.phtml:12
 msgid "Display chart"
 msgstr ""
 
@@ -3709,7 +3719,7 @@ msgid "Click on the bar to scroll to top of page"
 msgstr ""
 
 #: libraries/Header.class.php:749
-#: libraries/plugins/auth/AuthenticationCookie.class.php:152
+#: libraries/plugins/auth/AuthenticationCookie.class.php:140
 msgid "Javascript must be enabled past this point!"
 msgstr ""
 
@@ -3731,11 +3741,11 @@ msgid "Keyname"
 msgstr "Açarsözi"
 
 #: libraries/Index.class.php:697
-#: libraries/controllers/StructureController.class.php:1962
-#: libraries/controllers/StructureController.class.php:1967
+#: libraries/controllers/TableStructureController.class.php:953
+#: libraries/controllers/TableStructureController.class.php:958
 #: libraries/tracking.lib.php:973
 #: templates/columns_definitions/column_indexes.phtml:11
-#: templates/structure/check_all_table_column.phtml:26
+#: templates/table/structure/check_all_table_column.phtml:26
 msgid "Unique"
 msgstr ""
 
@@ -3754,16 +3764,17 @@ msgstr ""
 #: libraries/server_collations.lib.php:35 libraries/tracking.lib.php:881
 #: libraries/tracking.lib.php:977
 #: templates/columns_definitions/table_fields_definitions.phtml:33
-#: templates/structure/row_stats_table.phtml:31
-#: templates/structure/table_header.phtml:55
-#: templates/structure/table_structure_header.phtml:7
-#: templates/table/table_header.phtml:8
+#: templates/database/structure/table_header.phtml:55
+#: templates/table/search/table_header.phtml:8
+#: templates/table/structure/row_stats_table.phtml:31
+#: templates/table/structure/table_structure_header.phtml:7
 msgid "Collation"
 msgstr ""
 
 #: libraries/Index.class.php:703 libraries/rte/rte_events.lib.php:496
-#: libraries/rte/rte_routines.lib.php:956 libraries/tracking.lib.php:885
-#: libraries/tracking.lib.php:979 templates/structure/table_header.phtml:84
+#: libraries/rte/rte_routines.lib.php:1047 libraries/tracking.lib.php:885
+#: libraries/tracking.lib.php:979
+#: templates/database/structure/table_header.phtml:84
 msgid "Comment"
 msgstr ""
 
@@ -3776,15 +3787,15 @@ msgstr ""
 msgid "Index %s has been dropped."
 msgstr ""
 
-#: libraries/Index.class.php:757 libraries/Util.class.php:3630
-#: libraries/Util.class.php:3631
-#: libraries/controllers/StructureController.class.php:1958
-#: libraries/controllers/StructureController.class.php:1959
+#: libraries/Index.class.php:757 libraries/Util.class.php:3636
+#: libraries/Util.class.php:3637
+#: libraries/controllers/TableStructureController.class.php:949
+#: libraries/controllers/TableStructureController.class.php:950
 #: libraries/operations.lib.php:1607 libraries/rte/rte_list.lib.php:150
 #: libraries/server_databases.lib.php:146
-#: templates/structure/check_all_table_column.phtml:15
-#: templates/structure/check_all_tables.phtml:16
-#: templates/tbl_relation/foreign_key_row.phtml:93
+#: templates/database/structure/check_all_tables.phtml:16
+#: templates/table/relation/foreign_key_row.phtml:93
+#: templates/table/structure/check_all_table_column.phtml:15
 msgid "Drop"
 msgstr ""
 
@@ -3813,16 +3824,16 @@ msgstr ""
 #: libraries/Menu.class.php:248
 #: libraries/navigation/Nodes/Node_View.class.php:32
 #: libraries/tbl_info.inc.php:63
-#: templates/structure/structure_table_row.phtml:97
-#: templates/structure/structure_table_row.phtml:159
+#: templates/database/structure/structure_table_row.phtml:97
+#: templates/database/structure/structure_table_row.phtml:159
 msgid "View"
 msgstr ""
 
 #: libraries/Menu.class.php:325 libraries/Menu.class.php:429
-#: libraries/Menu.class.php:548 libraries/Util.class.php:3334
-#: libraries/Util.class.php:3344 libraries/Util.class.php:3350
-#: libraries/Util.class.php:4313 libraries/Util.class.php:4328
-#: libraries/Util.class.php:4345 libraries/config.values.php:40
+#: libraries/Menu.class.php:548 libraries/Util.class.php:3340
+#: libraries/Util.class.php:3350 libraries/Util.class.php:3356
+#: libraries/Util.class.php:4319 libraries/Util.class.php:4334
+#: libraries/Util.class.php:4351 libraries/config.values.php:40
 #: libraries/config.values.php:48 libraries/config.values.php:110
 #: libraries/config.values.php:116 libraries/config/messages.inc.php:321
 #: libraries/navigation/Nodes/Node_Table.class.php:292
@@ -3830,19 +3841,19 @@ msgid "SQL"
 msgstr ""
 
 #: libraries/Menu.class.php:328 libraries/Menu.class.php:432
-#: libraries/Util.class.php:3335 libraries/Util.class.php:3345
-#: libraries/Util.class.php:3351 libraries/Util.class.php:3625
-#: libraries/Util.class.php:3626 libraries/Util.class.php:4329
-#: libraries/Util.class.php:4346 libraries/config.values.php:41
+#: libraries/Util.class.php:3341 libraries/Util.class.php:3351
+#: libraries/Util.class.php:3357 libraries/Util.class.php:3631
+#: libraries/Util.class.php:3632 libraries/Util.class.php:4335
+#: libraries/Util.class.php:4352 libraries/config.values.php:41
 #: libraries/config.values.php:49 libraries/config.values.php:111
 #: libraries/config.values.php:117
 #: libraries/navigation/Nodes/Node_Table.class.php:286
 msgid "Search"
 msgstr "Gözle"
 
-#: libraries/Menu.class.php:338 libraries/Util.class.php:3336
-#: libraries/Util.class.php:3346 libraries/Util.class.php:3627
-#: libraries/Util.class.php:3628 libraries/Util.class.php:4347
+#: libraries/Menu.class.php:338 libraries/Util.class.php:3342
+#: libraries/Util.class.php:3352 libraries/Util.class.php:3633
+#: libraries/Util.class.php:3634 libraries/Util.class.php:4353
 #: libraries/config.values.php:42 libraries/config.values.php:50
 #: libraries/config.values.php:118
 #: libraries/navigation/Nodes/Node_Table.class.php:289
@@ -3851,30 +3862,30 @@ msgid "Insert"
 msgstr ""
 
 #: libraries/Menu.class.php:362 libraries/Menu.class.php:467
-#: libraries/Util.class.php:4334 libraries/Util.class.php:4350
+#: libraries/Util.class.php:4340 libraries/Util.class.php:4356
 #: libraries/config.values.php:106 libraries/server_common.lib.php:51
 #: libraries/server_privileges.lib.php:2370
 #: libraries/server_privileges.lib.php:3158
-#: libraries/server_privileges.lib.php:4221
+#: libraries/server_privileges.lib.php:4247
 msgid "Privileges"
 msgstr ""
 
 #: libraries/Menu.class.php:371 libraries/Menu.class.php:379
-#: libraries/Menu.class.php:459 libraries/Util.class.php:3338
-#: libraries/Util.class.php:3352 libraries/Util.class.php:4333
-#: libraries/Util.class.php:4351 libraries/config.values.php:112
+#: libraries/Menu.class.php:459 libraries/Util.class.php:3344
+#: libraries/Util.class.php:3358 libraries/Util.class.php:4339
+#: libraries/Util.class.php:4357 libraries/config.values.php:112
 #: view_operations.php:92
 msgid "Operations"
 msgstr ""
 
 #: libraries/Menu.class.php:384 libraries/Menu.class.php:492
-#: libraries/Util.class.php:4338 libraries/Util.class.php:4352
+#: libraries/Util.class.php:4344 libraries/Util.class.php:4358
 #: libraries/relation.lib.php:255
 msgid "Tracking"
 msgstr ""
 
 #: libraries/Menu.class.php:397 libraries/Menu.class.php:486
-#: libraries/Util.class.php:4337 libraries/Util.class.php:4353
+#: libraries/Util.class.php:4343 libraries/Util.class.php:4359
 #: libraries/navigation/Nodes/Node_Trigger_Container.class.php:24
 #: libraries/plugins/export/ExportHtmlword.class.php:557
 #: libraries/plugins/export/ExportOdt.class.php:685
@@ -3891,16 +3902,16 @@ msgstr ""
 msgid "Database seems to be empty!"
 msgstr ""
 
-#: libraries/Menu.class.php:439 libraries/Util.class.php:4330
+#: libraries/Menu.class.php:439 libraries/Util.class.php:4336
 msgid "Query"
 msgstr ""
 
-#: libraries/Menu.class.php:472 libraries/Util.class.php:4335
+#: libraries/Menu.class.php:472 libraries/Util.class.php:4341
 #: libraries/rte/rte_words.lib.php:36
 msgid "Routines"
 msgstr ""
 
-#: libraries/Menu.class.php:479 libraries/Util.class.php:4336
+#: libraries/Menu.class.php:479 libraries/Util.class.php:4342
 #: libraries/navigation/Nodes/Node_Event_Container.class.php:26
 #: libraries/plugins/export/ExportSql.class.php:940
 #: libraries/plugins/export/ExportXml.class.php:107
@@ -3908,20 +3919,20 @@ msgstr ""
 msgid "Events"
 msgstr ""
 
-#: libraries/Menu.class.php:498 libraries/Util.class.php:4339
+#: libraries/Menu.class.php:498 libraries/Util.class.php:4345
 msgid "Designer"
 msgstr ""
 
-#: libraries/Menu.class.php:507 libraries/Util.class.php:4340
-#: templates/structure/check_all_tables.phtml:35
+#: libraries/Menu.class.php:507 libraries/Util.class.php:4346
+#: templates/database/structure/check_all_tables.phtml:35
 msgid "Central columns"
 msgstr ""
 
-#: libraries/Menu.class.php:544 libraries/Util.class.php:4312
+#: libraries/Menu.class.php:544 libraries/Util.class.php:4318
 #: libraries/config.values.php:103 libraries/config/messages.inc.php:266
 #: libraries/config/messages.inc.php:341
 #: libraries/navigation/NavigationTree.class.php:1239
-#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4332
+#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4358
 msgid "Databases"
 msgstr ""
 
@@ -3930,34 +3941,34 @@ msgid "User accounts"
 msgstr ""
 
 #: libraries/Menu.class.php:595 libraries/ServerStatusData.class.php:121
-#: libraries/Util.class.php:4319 libraries/server_common.lib.php:36
+#: libraries/Util.class.php:4325 libraries/server_common.lib.php:36
 msgid "Binary log"
 msgstr ""
 
 #: libraries/Menu.class.php:601 libraries/ServerStatusData.class.php:126
-#: libraries/Util.class.php:4320 libraries/server_common.lib.php:42
-#: templates/structure/body_for_table_summary.phtml:10
-#: templates/structure/table_header.phtml:27
+#: libraries/Util.class.php:4326 libraries/server_common.lib.php:42
+#: templates/database/structure/body_for_table_summary.phtml:10
+#: templates/database/structure/table_header.phtml:27
 msgid "Replication"
 msgstr ""
 
 #: libraries/Menu.class.php:606 libraries/ServerStatusData.class.php:193
-#: libraries/Util.class.php:4321 libraries/config.values.php:105
+#: libraries/Util.class.php:4327 libraries/config.values.php:105
 #: libraries/server_engines.lib.php:108 libraries/server_engines.lib.php:112
 #: libraries/sql_query_form.lib.php:421
 msgid "Variables"
 msgstr ""
 
-#: libraries/Menu.class.php:610 libraries/Util.class.php:4322
+#: libraries/Menu.class.php:610 libraries/Util.class.php:4328
 msgid "Charsets"
 msgstr ""
 
-#: libraries/Menu.class.php:615 libraries/Util.class.php:4323
+#: libraries/Menu.class.php:615 libraries/Util.class.php:4329
 #: libraries/server_common.lib.php:33 libraries/server_plugins.lib.php:27
 msgid "Plugins"
 msgstr ""
 
-#: libraries/Menu.class.php:626 libraries/Util.class.php:4324
+#: libraries/Menu.class.php:626 libraries/Util.class.php:4330
 msgid "Engines"
 msgstr ""
 
@@ -3982,7 +3993,7 @@ msgid_plural "%1$d rows inserted."
 msgstr[0] ""
 msgstr[1] ""
 
-#: libraries/PDF.class.php:70 libraries/Util.class.php:2521
+#: libraries/PDF.class.php:70 libraries/Util.class.php:2527
 #: libraries/browse_foreigners.lib.php:327
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:865
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:890
@@ -4003,7 +4014,7 @@ msgid "Could not save favorite table!"
 msgstr ""
 
 #: libraries/RecentFavoriteTable.class.php:212
-#: templates/structure/favorite_anchor.phtml:12
+#: templates/database/structure/favorite_anchor.phtml:12
 msgid "Remove from Favorites"
 msgstr ""
 
@@ -4172,7 +4183,7 @@ msgid ""
 msgstr ""
 
 #: libraries/StorageEngine.class.php:373
-#: templates/structure/body_for_table_summary.phtml:50
+#: templates/database/structure/body_for_table_summary.phtml:50
 #, php-format
 msgid "%s is the default storage engine on this MySQL server."
 msgstr ""
@@ -4587,10 +4598,10 @@ msgstr ""
 
 #: libraries/Util.class.php:726 libraries/rte/rte_events.lib.php:110
 #: libraries/rte/rte_events.lib.php:119 libraries/rte/rte_events.lib.php:150
-#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:153
-#: libraries/rte/rte_routines.lib.php:162
-#: libraries/rte/rte_routines.lib.php:235
-#: libraries/rte/rte_routines.lib.php:1366
+#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:223
+#: libraries/rte/rte_routines.lib.php:250
+#: libraries/rte/rte_routines.lib.php:372
+#: libraries/rte/rte_routines.lib.php:1457
 #: libraries/rte/rte_triggers.lib.php:86 libraries/rte/rte_triggers.lib.php:95
 #: libraries/rte/rte_triggers.lib.php:127
 msgid "MySQL said: "
@@ -4634,75 +4645,78 @@ msgstr ""
 msgid "%B %d, %Y at %I:%M %p"
 msgstr ""
 
-#: libraries/Util.class.php:2019
+#: libraries/Util.class.php:2025
 #, php-format
 msgid "%s days, %s hours, %s minutes and %s seconds"
 msgstr ""
 
-#: libraries/Util.class.php:2112
+#: libraries/Util.class.php:2118
 msgid "Missing parameter:"
 msgstr ""
 
-#: libraries/Util.class.php:2645
+#: libraries/Util.class.php:2651
 #, php-format
 msgid "Jump to database \"%s\"."
 msgstr ""
 
-#: libraries/Util.class.php:2670
+#: libraries/Util.class.php:2676
 #, php-format
 msgid "The %s functionality is affected by a known bug, see %s"
 msgstr ""
 
-#: libraries/Util.class.php:2881
+#: libraries/Util.class.php:2887
 msgid "Click to toggle"
 msgstr ""
 
-#: libraries/Util.class.php:3542 prefs_manage.php:248
+#: libraries/Util.class.php:3548 prefs_manage.php:248
 msgid "Browse your computer:"
 msgstr ""
 
-#: libraries/Util.class.php:3567
+#: libraries/Util.class.php:3573
 #, php-format
 msgid "Select from the web server upload directory <b>%s</b>:"
 msgstr ""
 
-#: libraries/Util.class.php:3596 libraries/insert_edit.lib.php:1173
+#: libraries/Util.class.php:3602 libraries/insert_edit.lib.php:1171
 msgid "The directory you set for upload work cannot be reached."
 msgstr ""
 
-#: libraries/Util.class.php:3607
+#: libraries/Util.class.php:3613
 msgid "There are no files to upload!"
 msgstr ""
 
-#: libraries/Util.class.php:3632 libraries/Util.class.php:3633
-#: templates/structure/check_all_tables.phtml:15
+#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: templates/database/structure/check_all_tables.phtml:15
 msgid "Empty"
 msgstr ""
 
-#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: libraries/Util.class.php:3644 libraries/Util.class.php:3645
 msgid "Execute"
 msgstr ""
 
-#: libraries/Util.class.php:4152
+#: libraries/Util.class.php:4158
 msgid "Print"
 msgstr ""
 
-#: libraries/Util.class.php:4257 templates/structure/row_stats_table.phtml:80
-#: templates/structure/table_header.phtml:95
+#: libraries/Util.class.php:4263
+#: templates/database/structure/table_header.phtml:95
+#: templates/table/structure/row_stats_table.phtml:80
 msgid "Creation"
 msgstr ""
 
-#: libraries/Util.class.php:4263 templates/structure/row_stats_table.phtml:87
-#: templates/structure/table_header.phtml:106
+#: libraries/Util.class.php:4269
+#: templates/database/structure/table_header.phtml:106
+#: templates/table/structure/row_stats_table.phtml:87
 msgid "Last update"
 msgstr ""
 
-#: libraries/Util.class.php:4269 templates/structure/row_stats_table.phtml:94
-#: templates/structure/table_header.phtml:117
+#: libraries/Util.class.php:4275
+#: templates/database/structure/table_header.phtml:117
+#: templates/table/structure/row_stats_table.phtml:94
 msgid "Last check"
 msgstr ""
 
-#: libraries/Util.class.php:4315
+#: libraries/Util.class.php:4321
 msgid "Users"
 msgstr ""
 
@@ -4725,16 +4739,16 @@ msgid "Use this value"
 msgstr "Şu bahany ulan"
 
 #: libraries/build_html_for_db.lib.php:33 libraries/import.lib.php:193
-#: templates/structure/actions_in_table_structure.phtml:113
-#: templates/structure/row_stats_table.phtml:42
-#: templates/structure/table_header.phtml:36
+#: templates/database/structure/table_header.phtml:36
+#: templates/table/structure/actions_in_table_structure.phtml:113
+#: templates/table/structure/row_stats_table.phtml:42
 msgid "Rows"
 msgstr ""
 
 #: libraries/build_html_for_db.lib.php:48 libraries/engines/innodb.lib.php:171
-#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:186
-#: libraries/server_status.lib.php:298
-#: templates/structure/display_table_stats.phtml:40
+#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:195
+#: libraries/server_status.lib.php:307
+#: templates/table/structure/display_table_stats.phtml:40
 msgid "Total"
 msgstr ""
 
@@ -4743,10 +4757,12 @@ msgid "Jump to database"
 msgstr ""
 
 #: libraries/build_html_for_db.lib.php:146
+#: templates/database/structure/structure_table_row.phtml:15
 msgid "Not replicated"
 msgstr ""
 
 #: libraries/build_html_for_db.lib.php:158
+#: templates/database/structure/structure_table_row.phtml:16
 msgid "Replicated"
 msgstr ""
 
@@ -4799,17 +4815,17 @@ msgstr ""
 #: libraries/plugins/export/ExportTexytext.class.php:425
 #: libraries/plugins/export/PMA_ExportPdf.class.php:307
 #: libraries/rte/rte_list.lib.php:73 libraries/rte/rte_list.lib.php:85
-#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:830
-#: libraries/rte/rte_routines.lib.php:1492 setup/frames/index.inc.php:162
+#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:921
+#: libraries/rte/rte_routines.lib.php:1583 setup/frames/index.inc.php:162
 #: templates/columns_definitions/table_fields_definitions.phtml:8
-#: templates/structure/table_structure_header.phtml:5
-#: templates/table/create_table.phtml:11
+#: templates/database/create_table.phtml:11
+#: templates/table/structure/table_structure_header.phtml:5
 msgid "Name"
 msgstr ""
 
 #: libraries/central_columns.lib.php:699
 #: libraries/central_columns.lib.php:1381
-#: libraries/rte/rte_routines.lib.php:832
+#: libraries/rte/rte_routines.lib.php:923
 #: templates/columns_definitions/table_fields_definitions.phtml:14
 msgid "Length/Values"
 msgstr ""
@@ -4830,7 +4846,7 @@ msgid "Select a table"
 msgstr "Şu bahany ulan"
 
 #: libraries/central_columns.lib.php:804
-#: templates/structure/add_column.phtml:4
+#: templates/table/structure/add_column.phtml:4
 msgid "Add column"
 msgstr ""
 
@@ -4846,7 +4862,7 @@ msgstr ""
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1002
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1025
 #: templates/columns_definitions/table_fields_definitions.phtml:36
-#: templates/structure/table_structure_header.phtml:8
+#: templates/table/structure/table_structure_header.phtml:8
 msgid "Attributes"
 msgstr ""
 
@@ -4955,7 +4971,7 @@ msgid "Double click"
 msgstr ""
 
 #: libraries/config.values.php:95 libraries/config.values.php:124
-#: libraries/config/FormDisplay.tpl.php:221 libraries/relation.lib.php:97
+#: libraries/config/FormDisplay.tpl.php:232 libraries/relation.lib.php:97
 #: libraries/relation.lib.php:105
 msgid "Disabled"
 msgstr ""
@@ -5125,21 +5141,21 @@ msgstr ""
 msgid "maximum %s"
 msgstr ""
 
-#: libraries/config/FormDisplay.tpl.php:219
+#: libraries/config/FormDisplay.tpl.php:230
 msgid "This setting is disabled, it will not be applied to your configuration."
 msgstr ""
 
-#: libraries/config/FormDisplay.tpl.php:313
+#: libraries/config/FormDisplay.tpl.php:324
 #, php-format
 msgid "Set value: %s"
 msgstr ""
 
-#: libraries/config/FormDisplay.tpl.php:318
+#: libraries/config/FormDisplay.tpl.php:329
 #: libraries/config/messages.inc.php:610
 msgid "Restore default value"
 msgstr ""
 
-#: libraries/config/FormDisplay.tpl.php:332
+#: libraries/config/FormDisplay.tpl.php:343
 msgid "Allow users to customize this value"
 msgstr ""
 
@@ -5555,7 +5571,7 @@ msgstr ""
 
 #: libraries/config/messages.inc.php:136 libraries/config/messages.inc.php:152
 #: libraries/sql_query_form.lib.php:247
-#: templates/structure/row_stats_table.phtml:7
+#: templates/table/structure/row_stats_table.phtml:7
 msgid "Format"
 msgstr ""
 
@@ -6052,7 +6068,7 @@ msgstr ""
 
 #: libraries/config/messages.inc.php:332
 #: libraries/plugins/export/ExportPdf.class.php:279
-#: templates/structure/secondary_tabs.phtml:8
+#: templates/table/secondary_tabs.phtml:8
 msgid "Table structure"
 msgstr ""
 
@@ -7568,105 +7584,35 @@ msgstr ""
 msgid "OpenDocument Text"
 msgstr ""
 
-#: libraries/controllers/StructureController.class.php:465
+#: libraries/controllers/DatabaseStructureController.class.php:405
 #: tbl_operations.php:382
 #, php-format
 msgid "Table %s has been emptied."
 msgstr ""
 
-#: libraries/controllers/StructureController.class.php:486
+#: libraries/controllers/DatabaseStructureController.class.php:426
 #: tbl_operations.php:400 view_operations.php:119
 #, fuzzy, php-format
 #| msgid "Database %1$s has been created."
 msgid "View %s has been dropped."
 msgstr "%1$s maglumatlar ulgamy döredildi."
 
-#: libraries/controllers/StructureController.class.php:487
+#: libraries/controllers/DatabaseStructureController.class.php:427
 #: tbl_operations.php:401
 #, fuzzy, php-format
 #| msgid "Database %1$s has been created."
 msgid "Table %s has been dropped."
 msgstr "%1$s maglumatlar ulgamy döredildi"
 
-#: libraries/controllers/StructureController.class.php:797
-#, php-format
-msgid "The name '%s' is a MySQL reserved keyword."
-msgid_plural "The names '%s' are MySQL reserved keywords."
-msgstr[0] ""
-msgstr[1] ""
-
-#: libraries/controllers/StructureController.class.php:875
-msgid "No column selected."
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1049
+#: libraries/controllers/DatabaseStructureController.class.php:733
 msgid "Favorite List is full!"
 msgstr ""
 
-#: libraries/controllers/StructureController.class.php:1272
-msgid "The columns have been moved successfully."
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1535
-#, php-format
-msgid ""
-"Table %1$s has been altered successfully. Privileges have been adjusted."
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1541
-#: libraries/controllers/TableIndexesController.class.php:161
-#: tbl_addfield.php:92
-#, php-format
-msgid "Table %1$s has been altered successfully."
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1588
-#: libraries/tracking.lib.php:1094
-msgid "Query error"
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1806
+#: libraries/controllers/DatabaseStructureController.class.php:947
 #: libraries/mysql_charsets.lib.php:366 libraries/mysql_charsets.lib.php:373
 msgid "unknown"
 msgstr ""
 
-#: libraries/controllers/StructureController.class.php:1957
-#: templates/structure/check_all_table_column.phtml:11
-msgid "Change"
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1961
-#: libraries/controllers/StructureController.class.php:1966
-#: libraries/navigation/Nodes/Node_Index.class.php:30
-#: libraries/tracking.lib.php:926
-#: templates/columns_definitions/column_indexes.phtml:16
-#: templates/columns_definitions/table_fields_definitions.phtml:57
-#: templates/structure/check_all_table_column.phtml:30
-#: templates/structure/display_structure.phtml:79
-#: templates/structure/display_table_stats.phtml:19
-msgid "Index"
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1963
-#: libraries/controllers/StructureController.class.php:1968
-#: templates/columns_definitions/column_indexes.phtml:27
-#: templates/structure/check_all_table_column.phtml:37
-msgid "Spatial"
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1964
-#: libraries/controllers/StructureController.class.php:1969
-#: templates/columns_definitions/column_indexes.phtml:22
-#: templates/structure/check_all_table_column.phtml:47
-msgid "Fulltext"
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1970
-#, fuzzy
-#| msgid "Use this value"
-msgid "Distinct values"
-msgstr "Şu bahany ulan"
-
 #: libraries/controllers/TableChartController.class.php:82
 #: libraries/controllers/TableGisVisualizationController.class.php:101
 msgid "No SQL query was set to fetch data."
@@ -7680,11 +7626,18 @@ msgstr ""
 msgid "No data to display"
 msgstr ""
 
-#: libraries/controllers/TableRelationController.class.php:217
+#: libraries/controllers/TableIndexesController.class.php:161
+#: libraries/controllers/TableStructureController.class.php:736
+#: tbl_addfield.php:92
+#, php-format
+msgid "Table %1$s has been altered successfully."
+msgstr ""
+
+#: libraries/controllers/TableRelationController.class.php:218
 msgid "Display column was successfully updated."
 msgstr ""
 
-#: libraries/controllers/TableRelationController.class.php:283
+#: libraries/controllers/TableRelationController.class.php:288
 #, fuzzy
 #| msgid "Database %1$s has been created."
 msgid "Internal relations were successfully updated."
@@ -7699,10 +7652,73 @@ msgid "Zoom search"
 msgstr ""
 
 #: libraries/controllers/TableSearchController.class.php:852
-#: templates/table/selection_form.phtml:59
+#: templates/table/search/selection_form.phtml:59
 msgid "Find and replace"
 msgstr ""
 
+#: libraries/controllers/TableStructureController.class.php:163
+#, php-format
+msgid "The name '%s' is a MySQL reserved keyword."
+msgid_plural "The names '%s' are MySQL reserved keywords."
+msgstr[0] ""
+msgstr[1] ""
+
+#: libraries/controllers/TableStructureController.class.php:241
+msgid "No column selected."
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:467
+msgid "The columns have been moved successfully."
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:730
+#, php-format
+msgid ""
+"Table %1$s has been altered successfully. Privileges have been adjusted."
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:783
+#: libraries/tracking.lib.php:1094
+msgid "Query error"
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:948
+#: templates/table/structure/check_all_table_column.phtml:11
+msgid "Change"
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:952
+#: libraries/controllers/TableStructureController.class.php:957
+#: libraries/navigation/Nodes/Node_Index.class.php:30
+#: libraries/tracking.lib.php:926
+#: templates/columns_definitions/column_indexes.phtml:16
+#: templates/columns_definitions/table_fields_definitions.phtml:57
+#: templates/table/structure/check_all_table_column.phtml:30
+#: templates/table/structure/display_structure.phtml:79
+#: templates/table/structure/display_table_stats.phtml:19
+msgid "Index"
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:954
+#: libraries/controllers/TableStructureController.class.php:959
+#: templates/columns_definitions/column_indexes.phtml:27
+#: templates/table/structure/check_all_table_column.phtml:37
+msgid "Spatial"
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:955
+#: libraries/controllers/TableStructureController.class.php:960
+#: templates/columns_definitions/column_indexes.phtml:22
+#: templates/table/structure/check_all_table_column.phtml:47
+msgid "Fulltext"
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:963
+#, fuzzy
+#| msgid "Use this value"
+msgid "Distinct values"
+msgstr "Şu bahany ulan"
+
 #: libraries/core.lib.php:306
 #, php-format
 msgid "The %s extension is missing. Please check your PHP configuration."
@@ -7747,7 +7763,7 @@ msgid "No Password"
 msgstr ""
 
 #: libraries/display_change_password.lib.php:68
-#: libraries/plugins/auth/AuthenticationCookie.class.php:199
+#: libraries/plugins/auth/AuthenticationCookie.class.php:187
 #: libraries/replication_gui.lib.php:422 libraries/replication_gui.lib.php:862
 #: libraries/server_privileges.lib.php:1640
 msgid "Password:"
@@ -8471,12 +8487,12 @@ msgid "Dump has been saved to file %s."
 msgstr ""
 
 #: libraries/import.lib.php:202 libraries/insert_edit.lib.php:124
-#: libraries/rte/rte_routines.lib.php:1353 libraries/sql.lib.php:1312
+#: libraries/rte/rte_routines.lib.php:1444 libraries/sql.lib.php:1306
 #: tbl_get_field.php:44
 msgid "MySQL returned an empty result set (i.e. zero rows)."
 msgstr ""
 
-#: libraries/import.lib.php:265 libraries/sql.lib.php:1326
+#: libraries/import.lib.php:265 libraries/sql.lib.php:1320
 msgid "[ROLLBACK occurred.]"
 msgstr ""
 
@@ -8540,14 +8556,14 @@ msgstr ""
 
 #: libraries/insert_edit.lib.php:233
 #: libraries/navigation/Nodes/Node_DatabaseChild.class.php:48
-#: templates/designer/table_list.phtml:40
+#: templates/database/designer/table_list.phtml:40
 msgid "Hide"
 msgstr ""
 
 #: libraries/insert_edit.lib.php:249
 #: libraries/navigation/Nodes/Node_Function.class.php:32
-#: libraries/rte/rte_routines.lib.php:1495
-#: templates/table/table_header.phtml:4
+#: libraries/rte/rte_routines.lib.php:1586
+#: templates/table/search/table_header.phtml:4
 msgid "Function"
 msgstr ""
 
@@ -8560,82 +8576,83 @@ msgstr ""
 msgid "Because of its length,<br /> this column might not be editable."
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1050
+#: libraries/insert_edit.lib.php:1048
 msgid "Binary - do not edit"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1176 libraries/server_privileges.lib.php:470
-#: templates/table/options.phtml:36
+#: libraries/insert_edit.lib.php:1174 libraries/server_privileges.lib.php:470
+#: templates/table/search/options.phtml:36
 msgid "Or"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1177
+#: libraries/insert_edit.lib.php:1175
 msgid "web server upload directory:"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1348 templates/table/input_box.phtml:49
+#: libraries/insert_edit.lib.php:1346
+#: templates/table/search/input_box.phtml:49
 msgid "Edit/Insert"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1398
+#: libraries/insert_edit.lib.php:1396
 #, php-format
 msgid "Continue insertion with %s rows"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1428
+#: libraries/insert_edit.lib.php:1426
 msgid "and then"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1461
+#: libraries/insert_edit.lib.php:1459
 msgid "Insert as new row"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1464
+#: libraries/insert_edit.lib.php:1462
 msgid "Insert as new row and ignore errors"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1467
+#: libraries/insert_edit.lib.php:1465
 msgid "Show insert query"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1487
+#: libraries/insert_edit.lib.php:1485
 msgid "Go back to previous page"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1490
+#: libraries/insert_edit.lib.php:1488
 msgid "Insert another new row"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1495
+#: libraries/insert_edit.lib.php:1493
 msgid "Go back to this page"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1518
+#: libraries/insert_edit.lib.php:1516
 msgid "Edit next row"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1540
+#: libraries/insert_edit.lib.php:1538
 msgid ""
 "Use TAB key to move from value to value, or CTRL+arrows to move anywhere"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1577 libraries/replication_gui.lib.php:542
-#: libraries/rte/rte_routines.lib.php:1497
+#: libraries/insert_edit.lib.php:1575 libraries/replication_gui.lib.php:542
+#: libraries/rte/rte_routines.lib.php:1588
 #: libraries/server_status_variables.lib.php:220
-#: templates/designer/having_query_panel.phtml:100
-#: templates/designer/options_panel.phtml:73
-#: templates/designer/options_panel.phtml:239
-#: templates/designer/where_query_panel.phtml:69
-#: templates/table/table_header.phtml:10
-#: templates/table/zoom_result_form.phtml:35
+#: templates/database/designer/having_query_panel.phtml:100
+#: templates/database/designer/options_panel.phtml:73
+#: templates/database/designer/options_panel.phtml:239
+#: templates/database/designer/where_query_panel.phtml:69
+#: templates/table/search/table_header.phtml:10
+#: templates/table/search/zoom_result_form.phtml:35
 msgid "Value"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1937 libraries/sql.lib.php:1309
+#: libraries/insert_edit.lib.php:1935 libraries/sql.lib.php:1303
 msgid "Showing SQL query"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1962 libraries/sql.lib.php:1287
+#: libraries/insert_edit.lib.php:1960 libraries/sql.lib.php:1281
 #, php-format
 msgid "Inserted row id: %1$d"
 msgstr ""
@@ -9044,7 +9061,7 @@ msgstr ""
 #: libraries/navigation/Nodes/Node_View_Container.class.php:26
 #: libraries/navigation/Nodes/Node_View_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:129
-#: templates/structure/show_create.phtml:30
+#: templates/database/structure/show_create.phtml:30
 msgid "Views"
 msgstr ""
 
@@ -9332,7 +9349,7 @@ msgstr ""
 
 #: libraries/operations.lib.php:101 libraries/operations.lib.php:249
 #: libraries/operations.lib.php:869 libraries/operations.lib.php:963
-#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:907
+#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:998
 #: templates/columns_definitions/table_fields_definitions.phtml:47
 msgid "Adjust Privileges"
 msgstr ""
@@ -9422,22 +9439,22 @@ msgid "Switch to copied table"
 msgstr ""
 
 #: libraries/operations.lib.php:1360
-#: templates/structure/check_all_tables.phtml:18
+#: templates/database/structure/check_all_tables.phtml:18
 msgid "Table maintenance"
 msgstr ""
 
 #: libraries/operations.lib.php:1398
-#: templates/structure/check_all_tables.phtml:19
+#: templates/database/structure/check_all_tables.phtml:19
 msgid "Analyze table"
 msgstr ""
 
 #: libraries/operations.lib.php:1413
-#: templates/structure/check_all_tables.phtml:20
+#: templates/database/structure/check_all_tables.phtml:20
 msgid "Check table"
 msgstr ""
 
 #: libraries/operations.lib.php:1428
-#: templates/structure/check_all_tables.phtml:22
+#: templates/database/structure/check_all_tables.phtml:22
 #, fuzzy
 #| msgid "Use this value"
 msgid "Checksum table"
@@ -9457,18 +9474,19 @@ msgid "Flush the table (FLUSH)"
 msgstr ""
 
 #: libraries/operations.lib.php:1477
-#: templates/structure/check_all_tables.phtml:23
-#: templates/structure/display_table_stats.phtml:56
+#: templates/database/structure/check_all_tables.phtml:23
+#: templates/table/structure/display_table_stats.phtml:56
 msgid "Optimize table"
 msgstr ""
 
 #: libraries/operations.lib.php:1492
-#: templates/structure/check_all_tables.phtml:24
+#: templates/database/structure/check_all_tables.phtml:24
 msgid "Repair table"
 msgstr ""
 
 #: libraries/operations.lib.php:1538
-#: templates/structure/check_all_tables.phtml:14 view_operations.php:127
+#: templates/database/structure/check_all_tables.phtml:14
+#: view_operations.php:127
 msgid "Delete data or table"
 msgstr ""
 
@@ -9589,7 +9607,7 @@ msgid "Cannot connect: invalid settings."
 msgstr ""
 
 #: libraries/plugins/auth/AuthenticationConfig.class.php:108
-#: libraries/plugins/auth/AuthenticationCookie.class.php:134
+#: libraries/plugins/auth/AuthenticationCookie.class.php:122
 #: libraries/plugins/auth/AuthenticationHttp.class.php:96
 #, php-format
 msgid "Welcome to %s"
@@ -9614,36 +9632,36 @@ msgstr ""
 msgid "Retry to connect"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:146
+#: libraries/plugins/auth/AuthenticationCookie.class.php:134
 msgid "Your session has expired. Please log in again."
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:170
+#: libraries/plugins/auth/AuthenticationCookie.class.php:158
 msgid "Log in"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:178
-#: libraries/plugins/auth/AuthenticationCookie.class.php:188
+#: libraries/plugins/auth/AuthenticationCookie.class.php:166
+#: libraries/plugins/auth/AuthenticationCookie.class.php:176
 msgid "You can enter hostname/IP address and port separated by space."
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:193
+#: libraries/plugins/auth/AuthenticationCookie.class.php:181
 msgid "Username:"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:205
+#: libraries/plugins/auth/AuthenticationCookie.class.php:193
 msgid "Server Choice:"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:386
+#: libraries/plugins/auth/AuthenticationCookie.class.php:374
 msgid "Entered captcha is wrong, try again!"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:396
+#: libraries/plugins/auth/AuthenticationCookie.class.php:384
 msgid "Please enter correct captcha!"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:423
+#: libraries/plugins/auth/AuthenticationCookie.class.php:411
 msgid "You are not allowed to log in to this MySQL server!"
 msgstr ""
 
@@ -9739,7 +9757,7 @@ msgstr ""
 #: libraries/plugins/export/ExportOdt.class.php:593
 #: libraries/plugins/export/ExportTexytext.class.php:428
 #: libraries/plugins/export/PMA_ExportPdf.class.php:313
-#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:984
 #: libraries/rte/rte_triggers.lib.php:377
 msgid "Definition"
 msgstr ""
@@ -10036,7 +10054,7 @@ msgid "Last check:"
 msgstr ""
 
 #: libraries/plugins/export/ExportSql.class.php:1399
-#: templates/structure/structure_table_row.phtml:183
+#: templates/database/structure/structure_table_row.phtml:183
 msgid "in use"
 msgstr ""
 
@@ -10216,18 +10234,14 @@ msgstr ""
 msgid "The imported file does not contain any data!"
 msgstr ""
 
-#: libraries/plugins/import/ImportSql.class.php:169
+#: libraries/plugins/import/ImportSql.class.php:72
 msgid "SQL compatibility mode:"
 msgstr ""
 
-#: libraries/plugins/import/ImportSql.class.php:181
+#: libraries/plugins/import/ImportSql.class.php:84
 msgid "Do not use <code>AUTO_INCREMENT</code> for zero values"
 msgstr ""
 
-#: libraries/plugins/import/ImportSql.class.php:195
-msgid "Read as multibytes"
-msgstr ""
-
 #: libraries/plugins/import/ImportXml.class.php:54
 msgid "XML"
 msgstr ""
@@ -10270,7 +10284,7 @@ msgid "Show grid"
 msgstr ""
 
 #: libraries/plugins/schema/SchemaPdf.class.php:94
-#: templates/structure/print_view_data_dictionary_link.phtml:6
+#: templates/database/structure/print_view_data_dictionary_link.phtml:6
 msgid "Data Dictionary"
 msgstr ""
 
@@ -10297,7 +10311,7 @@ msgid "The %s table doesn't exist!"
 msgstr ""
 
 #: libraries/plugins/schema/eps/Eps_Relation_Schema.class.php:321
-#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:309
+#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:323
 #, php-format
 msgid "Schema of the %s database - Page %s"
 msgstr ""
@@ -10324,7 +10338,7 @@ msgstr ""
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1005
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1028
 #: libraries/tracking.lib.php:884
-#: templates/structure/table_structure_header.phtml:11
+#: templates/table/structure/table_structure_header.phtml:11
 msgid "Extra"
 msgstr ""
 
@@ -10641,51 +10655,51 @@ msgstr ""
 msgid "Create the needed tables with the <code>%screate_tables.sql</code>."
 msgstr ""
 
-#: libraries/relation.lib.php:360
+#: libraries/relation.lib.php:357
 msgid "Create a pma user and give access to these tables."
 msgstr ""
 
-#: libraries/relation.lib.php:365
+#: libraries/relation.lib.php:360
 msgid ""
 "Enable advanced features in configuration file (<code>config.inc.php</"
 "code>), for example by starting from <code>config.sample.inc.php</code>."
 msgstr ""
 
-#: libraries/relation.lib.php:373
+#: libraries/relation.lib.php:365
 msgid "Re-login to phpMyAdmin to load the updated configuration file."
 msgstr ""
 
-#: libraries/relation.lib.php:1612
+#: libraries/relation.lib.php:1607
 msgid "no description"
 msgstr ""
 
-#: libraries/relation.lib.php:1811
+#: libraries/relation.lib.php:1806
 msgid ""
 "You do not have necessary privileges to create a database named "
 "'phpmyadmin'. You may go to 'Operations' tab of any database to set up the "
 "phpMyAdmin configuration storage there."
 msgstr ""
 
-#: libraries/relation.lib.php:1928
+#: libraries/relation.lib.php:1923
 #, php-format
 msgid ""
 "%sCreate%s a database named 'phpmyadmin' and setup the phpMyAdmin "
 "configuration storage there."
 msgstr ""
 
-#: libraries/relation.lib.php:1936
+#: libraries/relation.lib.php:1931
 #, php-format
 msgid ""
 "%sCreate%s the phpMyAdmin configuration storage in the current database."
 msgstr ""
 
-#: libraries/relation.lib.php:1944
+#: libraries/relation.lib.php:1939
 #, php-format
 msgid "%sCreate%s missing phpMyAdmin configuration storage tables."
 msgstr ""
 
 #: libraries/replication_gui.lib.php:46 libraries/replication_gui.lib.php:343
-#: libraries/server_databases.lib.php:387
+#: libraries/server_databases.lib.php:398
 msgid "Master replication"
 msgstr ""
 
@@ -10740,7 +10754,7 @@ msgid ""
 msgstr ""
 
 #: libraries/replication_gui.lib.php:141
-#: libraries/server_databases.lib.php:389
+#: libraries/server_databases.lib.php:400
 msgid "Slave replication"
 msgstr ""
 
@@ -11001,10 +11015,10 @@ msgid "Master server changed successfully to %s."
 msgstr ""
 
 #: libraries/rte/rte_events.lib.php:106 libraries/rte/rte_events.lib.php:115
-#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:149
-#: libraries/rte/rte_routines.lib.php:158
-#: libraries/rte/rte_routines.lib.php:231
-#: libraries/rte/rte_routines.lib.php:1362
+#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:219
+#: libraries/rte/rte_routines.lib.php:246
+#: libraries/rte/rte_routines.lib.php:368
+#: libraries/rte/rte_routines.lib.php:1453
 #: libraries/rte/rte_triggers.lib.php:82 libraries/rte/rte_triggers.lib.php:91
 #: libraries/rte/rte_triggers.lib.php:123
 #, php-format
@@ -11025,7 +11039,7 @@ msgstr ""
 msgid "Event %1$s has been created."
 msgstr ""
 
-#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:251
+#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:266
 #: libraries/rte/rte_triggers.lib.php:144
 msgid "One or more errors have occurred while processing your request:"
 msgstr ""
@@ -11034,7 +11048,7 @@ msgstr ""
 msgid "Edit event"
 msgstr ""
 
-#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:794
+#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:885
 #: libraries/rte/rte_triggers.lib.php:323 view_create.php:180
 msgid "Details"
 msgstr ""
@@ -11047,7 +11061,7 @@ msgstr ""
 msgid "Event type"
 msgstr ""
 
-#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:817
+#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:908
 #, php-format
 msgid "Change to %s"
 msgstr ""
@@ -11074,12 +11088,14 @@ msgstr ""
 msgid "On completion preserve"
 msgstr ""
 
-#: libraries/rte/rte_events.lib.php:491 libraries/rte/rte_routines.lib.php:930
+#: libraries/rte/rte_events.lib.php:491
+#: libraries/rte/rte_routines.lib.php:1021
 #: libraries/rte/rte_triggers.lib.php:383 view_create.php:209
 msgid "Definer"
 msgstr ""
 
-#: libraries/rte/rte_events.lib.php:535 libraries/rte/rte_routines.lib.php:997
+#: libraries/rte/rte_events.lib.php:535
+#: libraries/rte/rte_routines.lib.php:1088
 #: libraries/rte/rte_triggers.lib.php:422
 msgid "The definer must be in the \"username@hostname\" format!"
 msgstr ""
@@ -11105,9 +11121,9 @@ msgid "You must provide an event definition."
 msgstr ""
 
 #: libraries/rte/rte_export.lib.php:43 libraries/rte/rte_general.lib.php:72
-#: libraries/rte/rte_routines.lib.php:345
-#: libraries/rte/rte_routines.lib.php:1198
-#: libraries/rte/rte_routines.lib.php:1411
+#: libraries/rte/rte_routines.lib.php:153
+#: libraries/rte/rte_routines.lib.php:1289
+#: libraries/rte/rte_routines.lib.php:1502
 msgid "Error in processing request:"
 msgstr ""
 
@@ -11139,132 +11155,132 @@ msgid ""
 "problems."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:110
-#: libraries/rte/rte_routines.lib.php:1006
+#: libraries/rte/rte_routines.lib.php:123
+msgid "Edit routine"
+msgstr ""
+
+#: libraries/rte/rte_routines.lib.php:200
+#: libraries/rte/rte_routines.lib.php:1097
 #, php-format
 msgid "Invalid routine type: \"%s\""
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:170
-msgid "Sorry, we failed to restore the dropped routine."
-msgstr ""
-
-#: libraries/rte/rte_routines.lib.php:211
-#, php-format
-msgid "Routine %1$s has been modified. Privileges have been adjusted."
-msgstr ""
-
-#: libraries/rte/rte_routines.lib.php:216
-#, php-format
-msgid "Routine %1$s has been modified."
-msgstr ""
-
-#: libraries/rte/rte_routines.lib.php:238
+#: libraries/rte/rte_routines.lib.php:253
 #, php-format
 msgid "Routine %1$s has been created."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:315
-msgid "Edit routine"
+#: libraries/rte/rte_routines.lib.php:380
+msgid "Sorry, we failed to restore the dropped routine."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:797
+#: libraries/rte/rte_routines.lib.php:439
+#, php-format
+msgid "Routine %1$s has been modified. Privileges have been adjusted."
+msgstr ""
+
+#: libraries/rte/rte_routines.lib.php:444
+#, php-format
+msgid "Routine %1$s has been modified."
+msgstr ""
+
+#: libraries/rte/rte_routines.lib.php:888
 msgid "Routine name"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:823
+#: libraries/rte/rte_routines.lib.php:914
 msgid "Parameters"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:829
+#: libraries/rte/rte_routines.lib.php:920
 msgid "Direction"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:847
+#: libraries/rte/rte_routines.lib.php:938
 msgid "Add parameter"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:851
+#: libraries/rte/rte_routines.lib.php:942
 msgid "Remove last parameter"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:856
+#: libraries/rte/rte_routines.lib.php:947
 msgid "Return type"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:862
+#: libraries/rte/rte_routines.lib.php:953
 msgid "Return length/values"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:868
+#: libraries/rte/rte_routines.lib.php:959
 msgid "Return options"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:899
+#: libraries/rte/rte_routines.lib.php:990
 msgid "Is deterministic"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:920
+#: libraries/rte/rte_routines.lib.php:1011
 msgid ""
 "You do not have sufficient privileges to perform this operation; Please "
 "refer to the documentation for more details"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:935
+#: libraries/rte/rte_routines.lib.php:1026
 msgid "Security type"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:944
+#: libraries/rte/rte_routines.lib.php:1035
 msgid "SQL data access"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1013
+#: libraries/rte/rte_routines.lib.php:1104
 msgid "You must provide a routine name!"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1047
+#: libraries/rte/rte_routines.lib.php:1138
 #, php-format
 msgid "Invalid direction \"%s\" given for parameter."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1069
-#: libraries/rte/rte_routines.lib.php:1131
+#: libraries/rte/rte_routines.lib.php:1160
+#: libraries/rte/rte_routines.lib.php:1222
 msgid ""
 "You must provide length/values for routine parameters of type ENUM, SET, "
 "VARCHAR and VARBINARY."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1095
+#: libraries/rte/rte_routines.lib.php:1186
 msgid "You must provide a name and a type for each routine parameter."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1114
+#: libraries/rte/rte_routines.lib.php:1205
 msgid "You must provide a valid return type for the routine."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1174
+#: libraries/rte/rte_routines.lib.php:1265
 msgid "You must provide a routine definition."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1285
+#: libraries/rte/rte_routines.lib.php:1376
 #, php-format
 msgid "Execution results of routine %s"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1340
+#: libraries/rte/rte_routines.lib.php:1431
 #, php-format
 msgid "%d row affected by the last statement inside the procedure."
 msgid_plural "%d rows affected by the last statement inside the procedure."
 msgstr[0] ""
 msgstr[1] ""
 
-#: libraries/rte/rte_routines.lib.php:1398
-#: libraries/rte/rte_routines.lib.php:1406
+#: libraries/rte/rte_routines.lib.php:1489
+#: libraries/rte/rte_routines.lib.php:1497
 msgid "Execute routine"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1485
-#: libraries/rte/rte_routines.lib.php:1488
+#: libraries/rte/rte_routines.lib.php:1576
+#: libraries/rte/rte_routines.lib.php:1579
 msgid "Routine parameters"
 msgstr ""
 
@@ -11418,7 +11434,7 @@ msgid "Original position"
 msgstr ""
 
 #: libraries/server_bin_log.lib.php:133
-#: templates/structure/display_table_stats.phtml:4
+#: templates/table/structure/display_table_stats.phtml:4
 msgid "Information"
 msgstr ""
 
@@ -11454,12 +11470,12 @@ msgid ""
 "between the web server and the MySQL server."
 msgstr ""
 
-#: libraries/server_databases.lib.php:364
-#: libraries/server_databases.lib.php:365
+#: libraries/server_databases.lib.php:366
+#: libraries/server_databases.lib.php:371
 msgid "Enable Statistics"
 msgstr ""
 
-#: libraries/server_databases.lib.php:481
+#: libraries/server_databases.lib.php:492
 #, php-format
 msgid "%1$d database has been dropped successfully."
 msgid_plural "%1$d databases have been dropped successfully."
@@ -11815,7 +11831,7 @@ msgid "You have revoked the privileges for %s."
 msgstr ""
 
 #: libraries/server_privileges.lib.php:2059
-#: libraries/server_privileges.lib.php:4290
+#: libraries/server_privileges.lib.php:4316
 msgid "Add user account"
 msgstr ""
 
@@ -11978,53 +11994,53 @@ msgstr ""
 msgid "The privileges were reloaded successfully."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:3994
+#: libraries/server_privileges.lib.php:4003
 #, php-format
 msgid "The user %s already exists!"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4232
+#: libraries/server_privileges.lib.php:4258
 #, php-format
 msgid "Privileges for %s"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4241
+#: libraries/server_privileges.lib.php:4267
 #: libraries/server_status_processes.lib.php:72
 #: libraries/server_user_groups.lib.php:39
 msgid "User"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4282
+#: libraries/server_privileges.lib.php:4308
 msgctxt "Create new user"
 msgid "New"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4311
+#: libraries/server_privileges.lib.php:4337
 msgid "Edit privileges:"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4312
+#: libraries/server_privileges.lib.php:4338
 msgid "User account"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4371
+#: libraries/server_privileges.lib.php:4397
 msgid ""
 "Note: You are attempting to edit privileges of the user with which you are "
 "currently logged in."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4391 libraries/server_users.lib.php:25
+#: libraries/server_privileges.lib.php:4417 libraries/server_users.lib.php:25
 msgid "User accounts overview"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4459
+#: libraries/server_privileges.lib.php:4485
 msgid ""
 "A user account allowing any user from localhost to connect is present. This "
 "will prevent other users from connecting if the host part of their account "
 "allows a connection from any (%) host."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4500
+#: libraries/server_privileges.lib.php:4526
 #, php-format
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
@@ -12033,7 +12049,7 @@ msgid ""
 "%sreload the privileges%s before you continue."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4519
+#: libraries/server_privileges.lib.php:4545
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
 "tables. The content of these tables may differ from the privileges the "
@@ -12042,61 +12058,61 @@ msgid ""
 "privilege."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4569
+#: libraries/server_privileges.lib.php:4595
 msgid "The selected user was not found in the privilege table."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4801
+#: libraries/server_privileges.lib.php:4827
 msgid "You have added a new user."
 msgstr ""
 
-#: libraries/server_status.lib.php:53
+#: libraries/server_status.lib.php:60
 #, php-format
 msgid "Network traffic since startup: %s"
 msgstr ""
 
-#: libraries/server_status.lib.php:66
+#: libraries/server_status.lib.php:73
 #, php-format
 msgid "This MySQL server has been running for %1$s. It started up on %2$s."
 msgstr ""
 
-#: libraries/server_status.lib.php:80
+#: libraries/server_status.lib.php:94
 msgid ""
 "This MySQL server works as <b>master</b> and <b>slave</b> in <b>replication</"
 "b> process."
 msgstr ""
 
-#: libraries/server_status.lib.php:85
+#: libraries/server_status.lib.php:99
 msgid "This MySQL server works as <b>master</b> in <b>replication</b> process."
 msgstr ""
 
-#: libraries/server_status.lib.php:90
+#: libraries/server_status.lib.php:104
 msgid "This MySQL server works as <b>slave</b> in <b>replication</b> process."
 msgstr ""
 
-#: libraries/server_status.lib.php:106
+#: libraries/server_status.lib.php:116
 msgid "Replication status"
 msgstr ""
 
-#: libraries/server_status.lib.php:137
+#: libraries/server_status.lib.php:146
 msgid ""
 "On a busy server, the byte counters may overrun, so those statistics as "
 "reported by the MySQL server may be incorrect."
 msgstr ""
 
-#: libraries/server_status.lib.php:148
+#: libraries/server_status.lib.php:157
 msgid "Received"
 msgstr ""
 
-#: libraries/server_status.lib.php:167
+#: libraries/server_status.lib.php:176
 msgid "Sent"
 msgstr ""
 
-#: libraries/server_status.lib.php:234
+#: libraries/server_status.lib.php:243
 msgid "Max. concurrent connections"
 msgstr ""
 
-#: libraries/server_status.lib.php:244
+#: libraries/server_status.lib.php:253
 msgid "Failed attempts"
 msgstr ""
 
@@ -13016,7 +13032,7 @@ msgstr ""
 msgid "Not implemented yet."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/AlterOperation.php:193
+#: libraries/sql-parser/src/Components/AlterOperation.php:191
 msgid "Unrecognized alter operation."
 msgstr ""
 
@@ -13030,7 +13046,7 @@ msgid "An opening bracket followed by a set of values was expected."
 msgstr ""
 
 #: libraries/sql-parser/src/Components/ArrayObj.php:101
-#: libraries/sql-parser/src/Components/FieldDefinition.php:202
+#: libraries/sql-parser/src/Components/CreateDefinition.php:202
 msgid "An opening bracket was expected."
 msgstr ""
 
@@ -13038,25 +13054,35 @@ msgstr ""
 msgid "A comma or a closing bracket was expected"
 msgstr ""
 
+#: libraries/sql-parser/src/Components/CreateDefinition.php:246
+#, fuzzy
+#| msgid "Database %1$s has been created."
+msgid "A comma or a closing bracket was expected."
+msgstr "%1$s maglumatlar ulgamy döredildi."
+
+#: libraries/sql-parser/src/Components/CreateDefinition.php:262
+msgid "A closing bracket was expected."
+msgstr ""
+
 #: libraries/sql-parser/src/Components/DataType.php:125
 msgid "Unrecognized data type."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:225
+#: libraries/sql-parser/src/Components/Expression.php:227
 msgid "Unexpected closing bracket."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:246
-#: libraries/sql-parser/src/Components/Expression.php:283
-#: libraries/sql-parser/src/Components/Expression.php:303
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:285
+#: libraries/sql-parser/src/Components/Expression.php:305
 msgid "An alias was previously found."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:257
+#: libraries/sql-parser/src/Components/Expression.php:259
 msgid "Unexpected dot."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:327
+#: libraries/sql-parser/src/Components/Expression.php:329
 #, fuzzy
 #| msgid "Database %1$s has been created."
 msgid "An alias was expected."
@@ -13066,16 +13092,6 @@ msgstr "%1$s maglumatlar ulgamy döredildi."
 msgid "An expression was expected."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/FieldDefinition.php:246
-#, fuzzy
-#| msgid "Database %1$s has been created."
-msgid "A comma or a closing bracket was expected."
-msgstr "%1$s maglumatlar ulgamy döredildi."
-
-#: libraries/sql-parser/src/Components/FieldDefinition.php:262
-msgid "A closing bracket was expected."
-msgstr ""
-
 #: libraries/sql-parser/src/Components/Limit.php:90
 #: libraries/sql-parser/src/Components/Limit.php:112
 msgid "An offset was expected."
@@ -13117,24 +13133,24 @@ msgstr ""
 msgid "Expected delimiter."
 msgstr ""
 
-#: libraries/sql-parser/src/Lexer.php:753
+#: libraries/sql-parser/src/Lexer.php:777
 #, php-format
 msgid "Ending quote %1$s was expected."
 msgstr ""
 
-#: libraries/sql-parser/src/Lexer.php:789
+#: libraries/sql-parser/src/Lexer.php:813
 msgid "Variable name was expected."
 msgstr ""
 
-#: libraries/sql-parser/src/Parser.php:380
+#: libraries/sql-parser/src/Parser.php:391
 msgid "Unexpected beginning of statement."
 msgstr ""
 
-#: libraries/sql-parser/src/Parser.php:399
+#: libraries/sql-parser/src/Parser.php:410
 msgid "Unrecognized statement type."
 msgstr ""
 
-#: libraries/sql-parser/src/Parser.php:479
+#: libraries/sql-parser/src/Parser.php:489
 msgid "No transaction was previously started."
 msgstr ""
 
@@ -13160,8 +13176,10 @@ msgid "The name of the entity was expected."
 msgstr ""
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:310
-msgid "At least one field definition was expected."
-msgstr ""
+#, fuzzy
+#| msgid "Database %1$s has been created."
+msgid "At least one column definition was expected."
+msgstr "%1$s maglumatlar ulgamy döredildi."
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:329
 msgid "A \"RETURNS\" keyword was expected."
@@ -13220,25 +13238,25 @@ msgstr ""
 msgid "Using bookmark \"%s\" as default browse query."
 msgstr ""
 
-#: libraries/sql.lib.php:1306
+#: libraries/sql.lib.php:1300
 msgid "Showing as PHP code"
 msgstr ""
 
-#: libraries/sql.lib.php:1638
+#: libraries/sql.lib.php:1632
 #, php-format
 msgid ""
 "Current selection does not contain a unique column. Grid edit, checkbox, "
 "Edit, Copy and Delete features are not available. %s"
 msgstr ""
 
-#: libraries/sql.lib.php:1649
+#: libraries/sql.lib.php:1643
 #, php-format
 msgid ""
 "Current selection does not contain a unique column. Grid edit, Edit, Copy "
 "and Delete features may result in undesired behavior. %s"
 msgstr ""
 
-#: libraries/sql.lib.php:1688
+#: libraries/sql.lib.php:1682
 #, php-format
 msgid "Problems with indexes of table `%s`"
 msgstr ""
@@ -13394,7 +13412,7 @@ msgid "Version %s snapshot (SQL code)"
 msgstr ""
 
 #: libraries/tracking.lib.php:947
-#: templates/structure/table_structure_row.phtml:33
+#: templates/table/structure/table_structure_row.phtml:33
 msgctxt "None for default"
 msgid "None"
 msgstr ""
@@ -13446,15 +13464,15 @@ msgstr ""
 msgid "Version %1$s was created, tracking for %2$s is active."
 msgstr ""
 
-#: libraries/user_preferences.inc.php:29
+#: libraries/user_preferences.inc.php:30
 msgid "Manage your settings"
 msgstr ""
 
-#: libraries/user_preferences.inc.php:46 prefs_manage.php:307
+#: libraries/user_preferences.inc.php:54 prefs_manage.php:307
 msgid "Configuration has been saved."
 msgstr ""
 
-#: libraries/user_preferences.inc.php:66
+#: libraries/user_preferences.inc.php:74
 #, php-format
 msgid ""
 "Your preferences will be saved for current session only. Storing them "
@@ -13828,7 +13846,7 @@ msgid "first"
 msgstr ""
 
 #: templates/columns_definitions/move_column.phtml:12
-#: templates/structure/add_column.phtml:21
+#: templates/table/structure/add_column.phtml:21
 #, php-format
 msgid "after %s"
 msgstr ""
@@ -13887,199 +13905,294 @@ msgstr ""
 msgid "Input transformation options"
 msgstr ""
 
-#: templates/designer/aggregate_query_panel.phtml:22
-#: templates/designer/options_panel.phtml:100
+#: templates/database/create_table.phtml:7
+#: templates/database/designer/side_menu.phtml:77
+#: templates/database/designer/side_menu.phtml:80
+msgid "Create table"
+msgstr ""
+
+#: templates/database/create_table.phtml:15
+msgid "Number of columns"
+msgstr ""
+
+#: templates/database/designer/aggregate_query_panel.phtml:22
+#: templates/database/designer/options_panel.phtml:100
 msgid "Aggregate"
 msgstr ""
 
-#: templates/designer/aggregate_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:61
-#: templates/designer/options_panel.phtml:106
-#: templates/designer/options_panel.phtml:170
-#: templates/designer/where_query_panel.phtml:30
-#: templates/table/table_header.phtml:9
+#: templates/database/designer/aggregate_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:61
+#: templates/database/designer/options_panel.phtml:106
+#: templates/database/designer/options_panel.phtml:170
+#: templates/database/designer/where_query_panel.phtml:30
+#: templates/table/search/table_header.phtml:9
 msgid "Operator"
 msgstr ""
 
-#: templates/designer/database_tables.phtml:29
+#: templates/database/designer/database_tables.phtml:29
 msgid "Toggle"
 msgstr ""
 
-#: templates/designer/database_tables.phtml:40
+#: templates/database/designer/database_tables.phtml:40
 msgid "See table structure"
 msgstr ""
 
-#: templates/designer/delete_relation_panel.phtml:21
+#: templates/database/designer/delete_relation_panel.phtml:21
 msgid "Delete relation"
 msgstr ""
 
-#: templates/designer/edit_delete_pages.phtml:7
+#: templates/database/designer/edit_delete_pages.phtml:7
 msgid "Page to open"
 msgstr ""
 
-#: templates/designer/edit_delete_pages.phtml:7
+#: templates/database/designer/edit_delete_pages.phtml:7
 msgid "Page to delete"
 msgstr ""
 
-#: templates/designer/having_query_panel.phtml:90
-#: templates/designer/options_panel.phtml:63
-#: templates/designer/options_panel.phtml:229
-#: templates/designer/where_query_panel.phtml:59
+#: templates/database/designer/having_query_panel.phtml:90
+#: templates/database/designer/options_panel.phtml:63
+#: templates/database/designer/options_panel.phtml:229
+#: templates/database/designer/where_query_panel.phtml:59
 msgid "Except"
 msgstr ""
 
-#: templates/designer/having_query_panel.phtml:102
-#: templates/designer/options_panel.phtml:75
-#: templates/designer/options_panel.phtml:241
-#: templates/designer/where_query_panel.phtml:71
+#: templates/database/designer/having_query_panel.phtml:102
+#: templates/database/designer/options_panel.phtml:75
+#: templates/database/designer/options_panel.phtml:241
+#: templates/database/designer/where_query_panel.phtml:71
 msgid "subquery"
 msgstr ""
 
-#: templates/designer/new_relation_panel.phtml:22
-#: templates/designer/side_menu.phtml:84 templates/designer/side_menu.phtml:87
+#: templates/database/designer/new_relation_panel.phtml:22
+#: templates/database/designer/side_menu.phtml:84
+#: templates/database/designer/side_menu.phtml:87
 msgid "Create relation"
 msgstr ""
 
-#: templates/designer/options_panel.phtml:34
-#: templates/designer/options_panel.phtml:200
+#: templates/database/designer/options_panel.phtml:34
+#: templates/database/designer/options_panel.phtml:200
 msgid "Relation operator"
 msgstr ""
 
-#: templates/designer/options_panel.phtml:85
-#: templates/designer/rename_to_panel.phtml:23
+#: templates/database/designer/options_panel.phtml:85
+#: templates/database/designer/rename_to_panel.phtml:23
 msgid "Rename to"
 msgstr ""
 
-#: templates/designer/options_panel.phtml:91
-#: templates/designer/rename_to_panel.phtml:31
+#: templates/database/designer/options_panel.phtml:91
+#: templates/database/designer/rename_to_panel.phtml:31
 msgid "New name"
 msgstr ""
 
-#: templates/designer/page_save_as.phtml:4
+#: templates/database/designer/page_save_as.phtml:4
 msgid "Save to selected page"
 msgstr ""
 
-#: templates/designer/page_save_as.phtml:5
+#: templates/database/designer/page_save_as.phtml:5
 msgid "Create a page and save to it"
 msgstr ""
 
-#: templates/designer/page_save_as.phtml:26
+#: templates/database/designer/page_save_as.phtml:26
 msgid "New page name"
 msgstr ""
 
-#: templates/designer/page_selector.phtml:2
+#: templates/database/designer/page_selector.phtml:2
 msgid "Select page"
 msgstr ""
 
-#: templates/designer/query_details.phtml:10
+#: templates/database/designer/query_details.phtml:10
 msgid "Active options"
 msgstr ""
 
-#: templates/designer/schema_export.phtml:4
+#: templates/database/designer/schema_export.phtml:4
 msgid "Select Export Relational Type"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:19 templates/designer/side_menu.phtml:25
+#: templates/database/designer/side_menu.phtml:19
+#: templates/database/designer/side_menu.phtml:25
 #, fuzzy
 #| msgid "Show all"
 msgid "Show/Hide tables list"
 msgstr "Hemmesini görkez"
 
-#: templates/designer/side_menu.phtml:29 templates/designer/side_menu.phtml:35
-#: templates/designer/side_menu.phtml:36
+#: templates/database/designer/side_menu.phtml:29
+#: templates/database/designer/side_menu.phtml:35
+#: templates/database/designer/side_menu.phtml:36
 msgid "View in fullscreen"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:34
+#: templates/database/designer/side_menu.phtml:34
 msgid "Exit fullscreen"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:41 templates/designer/side_menu.phtml:45
+#: templates/database/designer/side_menu.phtml:41
+#: templates/database/designer/side_menu.phtml:45
 msgid "New page"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:70 templates/designer/side_menu.phtml:73
+#: templates/database/designer/side_menu.phtml:70
+#: templates/database/designer/side_menu.phtml:73
 msgid "Delete pages"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:77 templates/designer/side_menu.phtml:80
-#: templates/table/create_table.phtml:7
-msgid "Create table"
-msgstr ""
-
-#: templates/designer/side_menu.phtml:98
-#: templates/designer/side_menu.phtml:101
+#: templates/database/designer/side_menu.phtml:98
+#: templates/database/designer/side_menu.phtml:101
 msgid "Reload"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:107
-#: templates/designer/side_menu.phtml:110
+#: templates/database/designer/side_menu.phtml:107
+#: templates/database/designer/side_menu.phtml:110
 msgid "Help"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Angular links"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Direct links"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:122
-#: templates/designer/side_menu.phtml:124
+#: templates/database/designer/side_menu.phtml:122
+#: templates/database/designer/side_menu.phtml:124
 msgid "Snap to grid"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:128
-#: templates/designer/side_menu.phtml:134
+#: templates/database/designer/side_menu.phtml:128
+#: templates/database/designer/side_menu.phtml:134
 msgid "Small/Big All"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:138
-#: templates/designer/side_menu.phtml:141
+#: templates/database/designer/side_menu.phtml:138
+#: templates/database/designer/side_menu.phtml:141
 msgid "Toggle small/big"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:145
-#: templates/designer/side_menu.phtml:148
+#: templates/database/designer/side_menu.phtml:145
+#: templates/database/designer/side_menu.phtml:148
 msgid "Toggle relation lines"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:153
-#: templates/designer/side_menu.phtml:156
+#: templates/database/designer/side_menu.phtml:153
+#: templates/database/designer/side_menu.phtml:156
 msgid "Export schema"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:165
-#: templates/designer/side_menu.phtml:168
+#: templates/database/designer/side_menu.phtml:165
+#: templates/database/designer/side_menu.phtml:168
 msgid "Build Query"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:173
-#: templates/designer/side_menu.phtml:177
+#: templates/database/designer/side_menu.phtml:173
+#: templates/database/designer/side_menu.phtml:177
 msgid "Move Menu"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:181
-#: templates/designer/side_menu.phtml:186
+#: templates/database/designer/side_menu.phtml:181
+#: templates/database/designer/side_menu.phtml:186
 msgid "Pin text"
 msgstr ""
 
-#: templates/designer/table_list.phtml:4
+#: templates/database/designer/table_list.phtml:4
 msgid "Hide/Show all"
 msgstr ""
 
-#: templates/designer/table_list.phtml:14
+#: templates/database/designer/table_list.phtml:14
 msgid "Hide/Show Tables with no relation"
 msgstr ""
 
-#: templates/designer/table_list.phtml:59
+#: templates/database/designer/table_list.phtml:59
 msgid "Number of tables:"
 msgstr ""
 
+#: templates/database/structure/body_for_table_summary.phtml:6
+#, php-format
+msgid "%s table"
+msgid_plural "%s tables"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templates/database/structure/body_for_table_summary.phtml:17
+msgid "Sum"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:6
+msgid "Check tables having overhead"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:10
+#, fuzzy
+#| msgid "Show all"
+msgid "Show create"
+msgstr "Hemmesini görkez"
+
+#: templates/database/structure/check_all_tables.phtml:27
+msgid "Prefix"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:28
+msgid "Add prefix to table"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:29
+msgid "Replace table prefix"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:30
+msgid "Copy table with prefix"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:36
+msgid "Add columns to central list"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:37
+msgid "Remove columns from central list"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:38
+msgid "Make consistent with central list"
+msgstr ""
+
+#: templates/database/structure/favorite_anchor.phtml:12
+msgid "Add to Favorites"
+msgstr ""
+
+#: templates/database/structure/show_create.phtml:2
+msgid "Showing create queries"
+msgstr ""
+
+#: templates/database/structure/sortable_header.phtml:13
+msgid "Sort"
+msgstr ""
+
+#: templates/database/structure/table_header.phtml:42
+msgid ""
+"May be approximate. Click on the number to get the exact count. See "
+"[doc@faq3-11]FAQ 3.11[/doc]."
+msgstr ""
+
+#: templates/database/structure/table_header.phtml:66
+#: templates/table/index_form.phtml:127
+msgid "Size"
+msgstr ""
+
+#: templates/database/structure/table_header.phtml:74
+#: templates/table/structure/display_table_stats.phtml:27
+msgid "Overhead"
+msgstr ""
+
+#: templates/database/structure/tracking_icon.phtml:4
+msgid "Tracking is active."
+msgstr ""
+
+#: templates/database/structure/tracking_icon.phtml:8
+msgid "Tracking is not active."
+msgstr ""
+
 #: templates/error/report_form.phtml:7
 msgid ""
 "phpMyAdmin has encountered an error. We have collected data about this error "
@@ -14095,59 +14208,6 @@ msgstr ""
 msgid "Please explain the steps that lead to the error:"
 msgstr ""
 
-#: templates/gis_visualization/gis_visualization.phtml:3
-msgid "Display GIS Visualization"
-msgstr ""
-
-#: templates/gis_visualization/gis_visualization.phtml:8
-msgid "Label column"
-msgstr ""
-
-#: templates/gis_visualization/gis_visualization.phtml:11
-msgid "-- None --"
-msgstr ""
-
-#: templates/gis_visualization/gis_visualization.phtml:19
-msgid "Spatial column"
-msgstr ""
-
-#: templates/index_form.phtml:16
-msgid "Index name:"
-msgstr ""
-
-#: templates/index_form.phtml:19
-msgid ""
-"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
-msgstr ""
-
-#: templates/index_form.phtml:40
-msgid "Index choice:"
-msgstr ""
-
-#: templates/index_form.phtml:57
-msgid "Key block size:"
-msgstr ""
-
-#: templates/index_form.phtml:74
-msgid "Index type:"
-msgstr ""
-
-#: templates/index_form.phtml:86
-msgid "Parser:"
-msgstr ""
-
-#: templates/index_form.phtml:102
-msgid "Comment:"
-msgstr ""
-
-#: templates/index_form.phtml:127 templates/structure/table_header.phtml:66
-msgid "Size"
-msgstr ""
-
-#: templates/index_form.phtml:149 templates/index_form.phtml:190
-msgid "Drag to reorder"
-msgstr ""
-
 #: templates/prefs_autoload.phtml:9
 msgid ""
 "Your browser has phpMyAdmin configuration for this domain. Would you like to "
@@ -14158,407 +14218,372 @@ msgstr ""
 msgid "Start row:"
 msgstr ""
 
-#: templates/structure/actions_in_table_structure.phtml:14
-#, php-format
-msgid "A primary key has been added on %s."
-msgstr ""
-
-#: templates/structure/actions_in_table_structure.phtml:34
-#: templates/structure/actions_in_table_structure.phtml:54
-#: templates/structure/actions_in_table_structure.phtml:79
-#: templates/structure/actions_in_table_structure.phtml:101
-#, php-format
-msgid "An index has been added on %s."
-msgstr ""
-
-#: templates/structure/actions_in_table_structure.phtml:130
-#: templates/structure/check_all_table_column.phtml:59
-msgid "Remove from central columns"
-msgstr ""
-
-#: templates/structure/actions_in_table_structure.phtml:138
-#: templates/structure/check_all_table_column.phtml:55
-msgid "Add to central columns"
-msgstr ""
-
-#: templates/structure/add_column.phtml:7
-#, php-format
-msgid "Add %s column(s)"
-msgstr ""
-
-#: templates/structure/add_column.phtml:12
-msgid "at beginning of table"
-msgstr ""
-
-#: templates/structure/body_for_table_summary.phtml:6
-#, php-format
-msgid "%s table"
-msgid_plural "%s tables"
-msgstr[0] ""
-msgstr[1] ""
-
-#: templates/structure/body_for_table_summary.phtml:17
-msgid "Sum"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:6
-msgid "Check tables having overhead"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:10
-#, fuzzy
-#| msgid "Show all"
-msgid "Show create"
-msgstr "Hemmesini görkez"
-
-#: templates/structure/check_all_tables.phtml:27
-msgid "Prefix"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:28
-msgid "Add prefix to table"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:29
-msgid "Replace table prefix"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:30
-msgid "Copy table with prefix"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:36
-msgid "Add columns to central list"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:37
-msgid "Remove columns from central list"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:38
-msgid "Make consistent with central list"
-msgstr ""
-
-#: templates/structure/display_structure.phtml:140 view_create.php:181
-msgid "Edit view"
-msgstr ""
-
-#: templates/structure/display_table_stats.phtml:9
-msgid "Space usage"
-msgstr ""
-
-#: templates/structure/display_table_stats.phtml:27
-#: templates/structure/table_header.phtml:74
-msgid "Overhead"
-msgstr ""
-
-#: templates/structure/display_table_stats.phtml:32
-msgid "Effective"
-msgstr ""
-
-#: templates/structure/favorite_anchor.phtml:12
-msgid "Add to Favorites"
-msgstr ""
-
-#: templates/structure/move_columns_dialog.phtml:1
-#: templates/structure/optional_action_links.phtml:21
-msgid "Move columns"
-msgstr ""
-
-#: templates/structure/move_columns_dialog.phtml:2
-msgid "Move the columns by dragging them up and down."
-msgstr ""
-
-#: templates/structure/optional_action_links.phtml:9
-msgid "Propose table structure"
-msgstr ""
-
-#: templates/structure/optional_action_links.phtml:24
-msgid "Improve table structure"
-msgstr ""
-
-#: templates/structure/optional_action_links.phtml:30
-msgid "Track view"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:3
-msgid "Row statistics"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:9
-msgid "static"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:11
-msgid "dynamic"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:22
-msgid "partitioned"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:54
-msgid "Row length"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:66
-msgid "Row size"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:73
-msgid "Next autoindex"
-msgstr ""
-
-#: templates/structure/secondary_tabs.phtml:14
-msgid "Relation view"
-msgstr ""
-
-#: templates/structure/show_create.phtml:2
-msgid "Showing create queries"
-msgstr ""
-
-#: templates/structure/sortable_header.phtml:13
-msgid "Sort"
-msgstr ""
-
-#: templates/structure/table_header.phtml:42
-msgid ""
-"May be approximate. Click on the number to get the exact count. See "
-"[doc@faq3-11]FAQ 3.11[/doc]."
-msgstr ""
-
-#: templates/structure/table_structure_row.phtml:46
-#, php-format
-msgid "Column %s has been dropped."
-msgstr ""
-
-#: templates/structure/tracking_icon.phtml:4
-msgid "Tracking is active."
-msgstr ""
-
-#: templates/structure/tracking_icon.phtml:8
-msgid "Tracking is not active."
-msgstr ""
-
-#: templates/table/create_table.phtml:15
-msgid "Number of columns"
-msgstr ""
-
-#: templates/table/options.phtml:8
-msgid "Select columns (at least one):"
-msgstr ""
-
-#: templates/table/options.phtml:37
-msgid "Add search conditions (body of the \"where\" clause):"
-msgstr ""
-
-#: templates/table/options.phtml:45
-msgid "Number of rows per page"
-msgstr ""
-
-#: templates/table/options.phtml:56
-msgid "Display order:"
-msgstr ""
-
-#: templates/table/options_zoom.phtml:6
-msgid "Use this column to label each point"
-msgstr ""
-
-#: templates/table/options_zoom.phtml:35
-msgid "Maximum rows to plot"
-msgstr ""
-
-#: templates/table/replace_preview.phtml:13
-msgid "Find and replace - preview"
-msgstr ""
-
-#: templates/table/replace_preview.phtml:18
-msgid "Original string"
-msgstr ""
-
-#: templates/table/replace_preview.phtml:19
-msgid "Replaced string"
-msgstr ""
-
-#: templates/table/replace_preview.phtml:40
-msgid "Replace"
-msgstr ""
-
-#: templates/table/rows_zoom.phtml:16
-msgid "Additional search criteria"
-msgstr ""
-
-#: templates/table/search_and_replace.phtml:3
-msgid "Replace with:"
-msgstr ""
-
-#: templates/table/search_and_replace.phtml:22
-msgid "Use regular expression"
-msgstr ""
-
-#: templates/table/selection_form.phtml:12
-msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
-msgstr ""
-
-#: templates/table/selection_form.phtml:34
-msgid "Do a \"query by example\" (wildcard: \"%\")"
-msgstr ""
-
-#: templates/table/zoom_result_form.phtml:7
-msgid "Browse/Edit the points"
-msgstr ""
-
-#: templates/table/zoom_result_form.phtml:15
-msgid "How to use"
-msgstr ""
-
-#: templates/table/zoom_result_form.phtml:23
-msgid "Reset zoom"
-msgstr ""
-
-#: templates/tbl_chart.phtml:17
+#: templates/table/chart/tbl_chart.phtml:17
 msgctxt "Chart type"
 msgid "Bar"
 msgstr ""
 
-#: templates/tbl_chart.phtml:21
+#: templates/table/chart/tbl_chart.phtml:21
 msgctxt "Chart type"
 msgid "Column"
 msgstr ""
 
-#: templates/tbl_chart.phtml:25
+#: templates/table/chart/tbl_chart.phtml:25
 msgctxt "Chart type"
 msgid "Line"
 msgstr ""
 
-#: templates/tbl_chart.phtml:29
+#: templates/table/chart/tbl_chart.phtml:29
 msgctxt "Chart type"
 msgid "Spline"
 msgstr ""
 
-#: templates/tbl_chart.phtml:33
+#: templates/table/chart/tbl_chart.phtml:33
 msgctxt "Chart type"
 msgid "Area"
 msgstr ""
 
-#: templates/tbl_chart.phtml:37
+#: templates/table/chart/tbl_chart.phtml:37
 msgctxt "Chart type"
 msgid "Pie"
 msgstr ""
 
-#: templates/tbl_chart.phtml:41
+#: templates/table/chart/tbl_chart.phtml:41
 msgctxt "Chart type"
 msgid "Timeline"
 msgstr ""
 
-#: templates/tbl_chart.phtml:45
+#: templates/table/chart/tbl_chart.phtml:45
 msgctxt "Chart type"
 msgid "Scatter"
 msgstr ""
 
-#: templates/tbl_chart.phtml:50
+#: templates/table/chart/tbl_chart.phtml:50
 msgid "Stacked"
 msgstr ""
 
-#: templates/tbl_chart.phtml:53
+#: templates/table/chart/tbl_chart.phtml:53
 msgid "Chart title"
 msgstr ""
 
-#: templates/tbl_chart.phtml:57
+#: templates/table/chart/tbl_chart.phtml:57
 msgid "X-Axis:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:72
+#: templates/table/chart/tbl_chart.phtml:72
 msgid "Series:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:102
+#: templates/table/chart/tbl_chart.phtml:102
 msgid "X-Axis label:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:104
+#: templates/table/chart/tbl_chart.phtml:104
 msgid "X Values"
 msgstr ""
 
-#: templates/tbl_chart.phtml:107
+#: templates/table/chart/tbl_chart.phtml:107
 msgid "Y-Axis label:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:115
+#: templates/table/chart/tbl_chart.phtml:115
 msgid "Series names are in a column"
 msgstr ""
 
-#: templates/tbl_chart.phtml:118
+#: templates/table/chart/tbl_chart.phtml:118
 msgid "Series column:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:130
+#: templates/table/chart/tbl_chart.phtml:130
 msgid "Value Column:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:150
+#: templates/table/chart/tbl_chart.phtml:150
 msgid "Save chart as image"
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:7
+#: templates/table/gis_visualization/gis_visualization.phtml:3
+msgid "Display GIS Visualization"
+msgstr ""
+
+#: templates/table/gis_visualization/gis_visualization.phtml:8
+msgid "Label column"
+msgstr ""
+
+#: templates/table/gis_visualization/gis_visualization.phtml:11
+msgid "-- None --"
+msgstr ""
+
+#: templates/table/gis_visualization/gis_visualization.phtml:19
+msgid "Spatial column"
+msgstr ""
+
+#: templates/table/index_form.phtml:16
+msgid "Index name:"
+msgstr ""
+
+#: templates/table/index_form.phtml:19
+msgid ""
+"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
+msgstr ""
+
+#: templates/table/index_form.phtml:40
+msgid "Index choice:"
+msgstr ""
+
+#: templates/table/index_form.phtml:57
+msgid "Key block size:"
+msgstr ""
+
+#: templates/table/index_form.phtml:74
+msgid "Index type:"
+msgstr ""
+
+#: templates/table/index_form.phtml:86
+msgid "Parser:"
+msgstr ""
+
+#: templates/table/index_form.phtml:102
+msgid "Comment:"
+msgstr ""
+
+#: templates/table/index_form.phtml:149 templates/table/index_form.phtml:190
+msgid "Drag to reorder"
+msgstr ""
+
+#: templates/table/relation/common_form.phtml:7
 #, fuzzy
 #| msgid "Database %1$s has been created."
 msgid "Internal relations"
 msgstr "%1$s maglumatlar ulgamy döredildi."
 
-#: templates/tbl_relation/common_form.phtml:11
+#: templates/table/relation/common_form.phtml:11
 msgid "Internal relation"
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:14
+#: templates/table/relation/common_form.phtml:14
 msgid ""
 "An internal relation is not necessary when a corresponding FOREIGN KEY "
 "relation exists."
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:37
+#: templates/table/relation/common_form.phtml:37
 msgid "Foreign key constraints"
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:40
+#: templates/table/relation/common_form.phtml:40
 msgid "Actions"
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:41
+#: templates/table/relation/common_form.phtml:41
 msgid "Constraint properties"
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:44
+#: templates/table/relation/common_form.phtml:44
 msgid ""
 "Only columns with index will be displayed. You can define an index below."
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:49
+#: templates/table/relation/common_form.phtml:49
 msgid "Foreign key constraint"
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:81
+#: templates/table/relation/common_form.phtml:81
 msgid "+ Add constraint"
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:91
+#: templates/table/relation/common_form.phtml:91
 msgid "Choose column to display:"
 msgstr ""
 
-#: templates/tbl_relation/foreign_key_row.phtml:13
+#: templates/table/relation/foreign_key_row.phtml:13
 #, fuzzy, php-format
 #| msgid "Database %1$s has been created."
 msgid "Foreign key constraint %s has been dropped"
 msgstr "%1$s maglumatlar ulgamy döredildi."
 
-#: templates/tbl_relation/foreign_key_row.phtml:102
+#: templates/table/relation/foreign_key_row.phtml:102
 msgid "Constraint name"
 msgstr ""
 
-#: templates/tbl_relation/foreign_key_row.phtml:157
+#: templates/table/relation/foreign_key_row.phtml:157
 msgid "+ Add column"
 msgstr ""
 
+#: templates/table/search/options.phtml:8
+msgid "Select columns (at least one):"
+msgstr ""
+
+#: templates/table/search/options.phtml:37
+msgid "Add search conditions (body of the \"where\" clause):"
+msgstr ""
+
+#: templates/table/search/options.phtml:45
+msgid "Number of rows per page"
+msgstr ""
+
+#: templates/table/search/options.phtml:56
+msgid "Display order:"
+msgstr ""
+
+#: templates/table/search/options_zoom.phtml:6
+msgid "Use this column to label each point"
+msgstr ""
+
+#: templates/table/search/options_zoom.phtml:35
+msgid "Maximum rows to plot"
+msgstr ""
+
+#: templates/table/search/replace_preview.phtml:13
+msgid "Find and replace - preview"
+msgstr ""
+
+#: templates/table/search/replace_preview.phtml:18
+msgid "Original string"
+msgstr ""
+
+#: templates/table/search/replace_preview.phtml:19
+msgid "Replaced string"
+msgstr ""
+
+#: templates/table/search/replace_preview.phtml:40
+msgid "Replace"
+msgstr ""
+
+#: templates/table/search/rows_zoom.phtml:16
+msgid "Additional search criteria"
+msgstr ""
+
+#: templates/table/search/search_and_replace.phtml:3
+msgid "Replace with:"
+msgstr ""
+
+#: templates/table/search/search_and_replace.phtml:22
+msgid "Use regular expression"
+msgstr ""
+
+#: templates/table/search/selection_form.phtml:12
+msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
+msgstr ""
+
+#: templates/table/search/selection_form.phtml:34
+msgid "Do a \"query by example\" (wildcard: \"%\")"
+msgstr ""
+
+#: templates/table/search/zoom_result_form.phtml:7
+msgid "Browse/Edit the points"
+msgstr ""
+
+#: templates/table/search/zoom_result_form.phtml:15
+msgid "How to use"
+msgstr ""
+
+#: templates/table/search/zoom_result_form.phtml:23
+msgid "Reset zoom"
+msgstr ""
+
+#: templates/table/secondary_tabs.phtml:14
+msgid "Relation view"
+msgstr ""
+
+#: templates/table/structure/actions_in_table_structure.phtml:14
+#, php-format
+msgid "A primary key has been added on %s."
+msgstr ""
+
+#: templates/table/structure/actions_in_table_structure.phtml:34
+#: templates/table/structure/actions_in_table_structure.phtml:54
+#: templates/table/structure/actions_in_table_structure.phtml:79
+#: templates/table/structure/actions_in_table_structure.phtml:101
+#, php-format
+msgid "An index has been added on %s."
+msgstr ""
+
+#: templates/table/structure/actions_in_table_structure.phtml:130
+#: templates/table/structure/check_all_table_column.phtml:59
+msgid "Remove from central columns"
+msgstr ""
+
+#: templates/table/structure/actions_in_table_structure.phtml:138
+#: templates/table/structure/check_all_table_column.phtml:55
+msgid "Add to central columns"
+msgstr ""
+
+#: templates/table/structure/add_column.phtml:7
+#, php-format
+msgid "Add %s column(s)"
+msgstr ""
+
+#: templates/table/structure/add_column.phtml:12
+msgid "at beginning of table"
+msgstr ""
+
+#: templates/table/structure/display_structure.phtml:140 view_create.php:181
+msgid "Edit view"
+msgstr ""
+
+#: templates/table/structure/display_table_stats.phtml:9
+msgid "Space usage"
+msgstr ""
+
+#: templates/table/structure/display_table_stats.phtml:32
+msgid "Effective"
+msgstr ""
+
+#: templates/table/structure/move_columns_dialog.phtml:1
+#: templates/table/structure/optional_action_links.phtml:21
+msgid "Move columns"
+msgstr ""
+
+#: templates/table/structure/move_columns_dialog.phtml:2
+msgid "Move the columns by dragging them up and down."
+msgstr ""
+
+#: templates/table/structure/optional_action_links.phtml:9
+msgid "Propose table structure"
+msgstr ""
+
+#: templates/table/structure/optional_action_links.phtml:24
+msgid "Improve table structure"
+msgstr ""
+
+#: templates/table/structure/optional_action_links.phtml:30
+msgid "Track view"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:3
+msgid "Row statistics"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:9
+msgid "static"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:11
+msgid "dynamic"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:22
+msgid "partitioned"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:54
+msgid "Row length"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:66
+msgid "Row size"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:73
+msgid "Next autoindex"
+msgstr ""
+
+#: templates/table/structure/table_structure_row.phtml:46
+#, php-format
+msgid "Column %s has been dropped."
+msgstr ""
+
 #: themes.php:17 themes.php:22
 msgid "Theme"
 msgstr ""
diff --git a/po/tr.po b/po/tr.po
index a13e2e7e6d..13b85b1e58 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -3,8 +3,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 4.5.0-dev\n"
 "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
-"POT-Creation-Date: 2015-08-08 13:53-0400\n"
-"PO-Revision-Date: 2015-08-08 21:22+0200\n"
+"POT-Creation-Date: 2015-08-12 08:10-0400\n"
+"PO-Revision-Date: 2015-08-12 19:04+0200\n"
 "Last-Translator: Burak Yavuz <hitowerdigit@hotmail.com>\n"
 "Language-Team: Turkish "
 "<https://hosted.weblate.org/projects/phpmyadmin/master/tr/>\n"
@@ -53,7 +53,7 @@ msgid "Table comments:"
 msgstr "Tablo yorumları:"
 
 #: db_datadict.php:104 libraries/Index.class.php:699
-#: libraries/insert_edit.lib.php:1567
+#: libraries/insert_edit.lib.php:1565
 #: libraries/navigation/Nodes/Node_Column.class.php:30
 #: libraries/plugins/export/ExportHtmlword.class.php:280
 #: libraries/plugins/export/ExportHtmlword.class.php:375
@@ -67,13 +67,14 @@ msgstr "Tablo yorumları:"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1023
 #: libraries/tracking.lib.php:879 libraries/tracking.lib.php:975
 #: templates/columns_definitions/column_name.phtml:18
-#: templates/index_form.phtml:124 templates/table/table_header.phtml:6
-#: templates/table/zoom_result_form.phtml:33
-#: templates/tbl_relation/common_form.phtml:10
-#: templates/tbl_relation/common_form.phtml:43
-#: templates/tbl_relation/foreign_key_row.phtml:194
-#: templates/tbl_relation/foreign_key_row.phtml:206
-#: templates/tbl_relation/internal_relational_row.phtml:71
+#: templates/table/index_form.phtml:124
+#: templates/table/relation/common_form.phtml:10
+#: templates/table/relation/common_form.phtml:43
+#: templates/table/relation/foreign_key_row.phtml:194
+#: templates/table/relation/foreign_key_row.phtml:206
+#: templates/table/relation/internal_relational_row.phtml:71
+#: templates/table/search/table_header.phtml:6
+#: templates/table/search/zoom_result_form.phtml:33
 msgid "Column"
 msgstr "Sütun"
 
@@ -91,21 +92,21 @@ msgstr "Sütun"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1001
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1024
 #: libraries/rte/rte_list.lib.php:75 libraries/rte/rte_list.lib.php:103
-#: libraries/rte/rte_routines.lib.php:802
-#: libraries/rte/rte_routines.lib.php:831
-#: libraries/rte/rte_routines.lib.php:1493
+#: libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_routines.lib.php:922
+#: libraries/rte/rte_routines.lib.php:1584
 #: libraries/server_privileges.lib.php:2369 libraries/tracking.lib.php:880
 #: libraries/tracking.lib.php:972
 #: templates/columns_definitions/table_fields_definitions.phtml:11
-#: templates/structure/table_header.phtml:48
-#: templates/structure/table_structure_header.phtml:6
-#: templates/table/table_header.phtml:7
+#: templates/database/structure/table_header.phtml:48
+#: templates/table/search/table_header.phtml:7
+#: templates/table/structure/table_structure_header.phtml:6
 msgid "Type"
 msgstr "Türü"
 
 #: db_datadict.php:106 libraries/Index.class.php:702
 #: libraries/central_columns.lib.php:708
-#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1576
+#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1574
 #: libraries/plugins/export/ExportHtmlword.class.php:286
 #: libraries/plugins/export/ExportHtmlword.class.php:381
 #: libraries/plugins/export/ExportLatex.class.php:509
@@ -118,8 +119,8 @@ msgstr "Türü"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1026
 #: libraries/tracking.lib.php:882 libraries/tracking.lib.php:978
 #: templates/columns_definitions/table_fields_definitions.phtml:39
-#: templates/structure/table_structure_header.phtml:9
-#: templates/table/zoom_result_form.phtml:34
+#: templates/table/search/zoom_result_form.phtml:34
+#: templates/table/structure/table_structure_header.phtml:9
 msgid "Null"
 msgstr "Boş"
 
@@ -137,8 +138,8 @@ msgstr "Boş"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1027
 #: libraries/replication_gui.lib.php:153 libraries/tracking.lib.php:883
 #: templates/columns_definitions/table_fields_definitions.phtml:25
-#: templates/structure/body_for_table_summary.phtml:55
-#: templates/structure/table_structure_header.phtml:10
+#: templates/database/structure/body_for_table_summary.phtml:55
+#: templates/table/structure/table_structure_header.phtml:10
 msgid "Default"
 msgstr "Varsayılan"
 
@@ -166,19 +167,19 @@ msgid "Comments"
 msgstr "Yorumlar"
 
 #: db_datadict.php:146
-#: libraries/controllers/StructureController.class.php:1960
-#: libraries/controllers/StructureController.class.php:1965
+#: libraries/controllers/TableStructureController.class.php:951
+#: libraries/controllers/TableStructureController.class.php:956
 #: libraries/tracking.lib.php:922
 #: templates/columns_definitions/column_indexes.phtml:6
-#: templates/structure/check_all_table_column.phtml:22
-#: templates/structure/display_structure.phtml:74
+#: templates/table/structure/check_all_table_column.phtml:22
+#: templates/table/structure/display_structure.phtml:74
 msgid "Primary"
 msgstr "Birincil"
 
 #: db_datadict.php:156 js/messages.php:317 libraries/Index.class.php:567
 #: libraries/Index.class.php:606 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261 libraries/mult_submits.lib.php:403
+#: libraries/config/FormDisplay.tpl.php:272 libraries/mult_submits.lib.php:403
 #: libraries/mult_submits.lib.php:417
 #: libraries/plugins/export/ExportHtmlword.class.php:630
 #: libraries/plugins/export/ExportLatex.class.php:589
@@ -194,20 +195,20 @@ msgstr "Birincil"
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1010 libraries/tracking.lib.php:1015
 #: prefs_manage.php:140 templates/prefs_autoload.phtml:15
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "No"
 msgstr "Hayır"
 
 #: db_datadict.php:156 js/messages.php:443 libraries/Index.class.php:568
 #: libraries/Index.class.php:605 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261
-#: libraries/controllers/StructureController.class.php:1344
-#: libraries/controllers/StructureController.class.php:2223
-#: libraries/controllers/StructureController.class.php:2232
-#: libraries/controllers/StructureController.class.php:2237
-#: libraries/controllers/StructureController.class.php:2242
-#: libraries/controllers/StructureController.class.php:2247
+#: libraries/config/FormDisplay.tpl.php:272
+#: libraries/controllers/TableStructureController.class.php:539
+#: libraries/controllers/TableStructureController.class.php:1201
+#: libraries/controllers/TableStructureController.class.php:1210
+#: libraries/controllers/TableStructureController.class.php:1215
+#: libraries/controllers/TableStructureController.class.php:1220
+#: libraries/controllers/TableStructureController.class.php:1225
 #: libraries/mult_submits.inc.php:82 libraries/mult_submits.inc.php:178
 #: libraries/mult_submits.lib.php:339 libraries/mult_submits.lib.php:372
 #: libraries/mult_submits.lib.php:401 libraries/mult_submits.lib.php:415
@@ -216,8 +217,8 @@ msgstr "Hayır"
 #: libraries/plugins/export/ExportOdt.class.php:756
 #: libraries/plugins/export/ExportTexytext.class.php:567
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1077
-#: libraries/server_databases.lib.php:464
-#: libraries/server_databases.lib.php:474
+#: libraries/server_databases.lib.php:475
+#: libraries/server_databases.lib.php:485
 #: libraries/server_privileges.lib.php:2546
 #: libraries/server_privileges.lib.php:2727
 #: libraries/server_privileges.lib.php:2748
@@ -227,7 +228,7 @@ msgstr "Hayır"
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1008 libraries/tracking.lib.php:1013
 #: prefs_manage.php:138 templates/prefs_autoload.phtml:14
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "Yes"
 msgstr "Evet"
 
@@ -237,7 +238,7 @@ msgstr "Veritabanının dökümünü (şemasını) göster"
 
 #: db_export.php:37 db_tracking.php:90 export.php:382
 #: libraries/DBQbe.class.php:326
-#: libraries/controllers/StructureController.class.php:231
+#: libraries/controllers/DatabaseStructureController.class.php:170
 #: libraries/navigation/NavigationTree.class.php:897
 msgid "No tables found in database."
 msgstr "Veritabanında tablo bulunamadı."
@@ -248,14 +249,14 @@ msgstr "Veritabanında tablo bulunamadı."
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:26
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:120
-#: templates/structure/show_create.phtml:18
+#: templates/database/structure/show_create.phtml:18
 msgid "Tables"
 msgstr "Tablolar"
 
 #: db_export.php:52 libraries/Menu.class.php:317 libraries/Menu.class.php:425
-#: libraries/Util.class.php:3333 libraries/Util.class.php:3343
-#: libraries/Util.class.php:3349 libraries/Util.class.php:3629
-#: libraries/Util.class.php:4327 libraries/Util.class.php:4344
+#: libraries/Util.class.php:3339 libraries/Util.class.php:3349
+#: libraries/Util.class.php:3355 libraries/Util.class.php:3635
+#: libraries/Util.class.php:4333 libraries/Util.class.php:4350
 #: libraries/central_columns.lib.php:728 libraries/config.values.php:39
 #: libraries/config.values.php:47 libraries/config.values.php:109
 #: libraries/config.values.php:115 libraries/config/setup.forms.php:323
@@ -269,7 +270,7 @@ msgstr "Tablolar"
 #: libraries/navigation/Nodes/Node_Table.class.php:283
 #: libraries/server_privileges.lib.php:1141 libraries/tracking.lib.php:874
 #: templates/columns_definitions/table_fields_definitions.phtml:3
-#: templates/designer/table_list.phtml:28
+#: templates/database/designer/table_list.phtml:28
 msgid "Structure"
 msgstr "Yapı"
 
@@ -281,7 +282,7 @@ msgstr "Yapı"
 #: libraries/config/user_preferences.forms.php:292
 #: libraries/config/user_preferences.forms.php:297
 #: libraries/server_privileges.lib.php:1140
-#: templates/structure/display_table_stats.phtml:12
+#: templates/table/structure/display_table_stats.phtml:12
 msgid "Data"
 msgstr "Veri"
 
@@ -353,10 +354,10 @@ msgstr "İzlenen tablolar"
 #: libraries/server_privileges.lib.php:2908
 #: libraries/server_privileges.lib.php:3145
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4346
-#: templates/structure/table_header.phtml:21
-#: templates/tbl_relation/foreign_key_row.phtml:176
-#: templates/tbl_relation/internal_relational_row.phtml:63
+#: libraries/server_privileges.lib.php:4372
+#: templates/database/structure/table_header.phtml:21
+#: templates/table/relation/foreign_key_row.phtml:176
+#: templates/table/relation/internal_relational_row.phtml:63
 msgid "Table"
 msgstr "Tablo"
 
@@ -373,7 +374,7 @@ msgid "Updated"
 msgstr "Güncellendi"
 
 #: db_tracking.php:130 js/messages.php:243 libraries/Menu.class.php:552
-#: libraries/Util.class.php:4314 libraries/config.values.php:104
+#: libraries/Util.class.php:4320 libraries/config.values.php:104
 #: libraries/rte/rte_events.lib.php:393 libraries/rte/rte_list.lib.php:101
 #: libraries/server_status_processes.lib.php:92 libraries/tracking.lib.php:279
 msgid "Status"
@@ -382,14 +383,15 @@ msgstr "Durum"
 #: db_tracking.php:131 db_tracking.php:290 libraries/Index.class.php:693
 #: libraries/central_columns.lib.php:687 libraries/rte/rte_list.lib.php:74
 #: libraries/rte/rte_list.lib.php:89 libraries/rte/rte_list.lib.php:102
-#: libraries/server_databases.lib.php:398
+#: libraries/server_databases.lib.php:409
 #: libraries/server_privileges.lib.php:2372
 #: libraries/server_privileges.lib.php:3166
 #: libraries/server_privileges.lib.php:3342
 #: libraries/server_user_groups.lib.php:82
 #: libraries/server_variables.lib.php:189 libraries/tracking.lib.php:280
-#: libraries/tracking.lib.php:793 templates/structure/table_header.phtml:30
-#: templates/structure/table_structure_header.phtml:23
+#: libraries/tracking.lib.php:793
+#: templates/database/structure/table_header.phtml:30
+#: templates/table/structure/table_structure_header.phtml:23
 msgid "Action"
 msgstr "Eylem"
 
@@ -431,7 +433,7 @@ msgid "Untracked tables"
 msgstr "İzlenmeyen tablolar"
 
 #: db_tracking.php:305 db_tracking.php:336
-#: templates/structure/optional_action_links.phtml:17
+#: templates/table/structure/optional_action_links.phtml:17
 msgid "Track table"
 msgstr "Tabloyu izle"
 
@@ -486,7 +488,7 @@ msgid "Value for the column \"%s\""
 msgstr "\"%s\" sütunu için değer"
 
 #: gis_data_editor.php:146
-#: templates/gis_visualization/gis_visualization.phtml:37
+#: templates/table/gis_visualization/gis_visualization.phtml:37
 msgid "Use OpenStreetMaps as Base Layer"
 msgstr "Taban Katman olarak OpenStreetMaps kullan"
 
@@ -566,35 +568,35 @@ msgstr "Geometri ekle"
 #: libraries/display_change_password.lib.php:162
 #: libraries/display_export.lib.php:402 libraries/display_export.lib.php:408
 #: libraries/display_import.lib.php:392 libraries/index.lib.php:44
-#: libraries/insert_edit.lib.php:1546 libraries/insert_edit.lib.php:1583
+#: libraries/insert_edit.lib.php:1544 libraries/insert_edit.lib.php:1581
 #: libraries/normalization.lib.php:165 libraries/normalization.lib.php:821
 #: libraries/operations.lib.php:38 libraries/operations.lib.php:108
 #: libraries/operations.lib.php:263 libraries/operations.lib.php:306
 #: libraries/operations.lib.php:801 libraries/operations.lib.php:874
 #: libraries/operations.lib.php:923 libraries/operations.lib.php:1337
 #: libraries/operations.lib.php:1658
-#: libraries/plugins/auth/AuthenticationCookie.class.php:244
+#: libraries/plugins/auth/AuthenticationCookie.class.php:232
 #: libraries/replication_gui.lib.php:122 libraries/replication_gui.lib.php:161
 #: libraries/replication_gui.lib.php:324 libraries/replication_gui.lib.php:461
 #: libraries/replication_gui.lib.php:906 libraries/rte/rte_events.lib.php:509
-#: libraries/rte/rte_routines.lib.php:969
-#: libraries/rte/rte_routines.lib.php:1581
+#: libraries/rte/rte_routines.lib.php:1060
+#: libraries/rte/rte_routines.lib.php:1672
 #: libraries/rte/rte_triggers.lib.php:396 libraries/server_bin_log.lib.php:61
 #: libraries/server_privileges.lib.php:705
 #: libraries/server_privileges.lib.php:2106
 #: libraries/server_privileges.lib.php:2872
 #: libraries/server_privileges.lib.php:3553
-#: libraries/server_privileges.lib.php:4627
+#: libraries/server_privileges.lib.php:4653
 #: libraries/server_user_groups.lib.php:285
 #: libraries/sql_query_form.lib.php:369 libraries/sql_query_form.lib.php:429
 #: libraries/tracking.lib.php:533 libraries/tracking.lib.php:653
 #: prefs_manage.php:277 prefs_manage.php:355
 #: templates/columns_definitions/column_definitions_form.phtml:59
-#: templates/header_location.phtml:17 templates/index_form.phtml:238
+#: templates/database/create_table.phtml:21 templates/header_location.phtml:28
 #: templates/startAndNumberOfRowsPanel.phtml:14
-#: templates/structure/add_column.phtml:25
-#: templates/table/create_table.phtml:21
-#: templates/table/selection_form.phtml:75 view_create.php:275
+#: templates/table/index_form.phtml:238
+#: templates/table/search/selection_form.phtml:75
+#: templates/table/structure/add_column.phtml:25 view_create.php:275
 #: view_operations.php:106
 msgid "Go"
 msgstr "Git"
@@ -685,7 +687,7 @@ msgstr ""
 msgid "Could not load import plugins, please check your installation!"
 msgstr "İçe aktarma eklentileri yüklenemedi, lütfen kurulumunuzu kontrol edin!"
 
-#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1466
+#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1460
 #, php-format
 msgid "Bookmark %s has been created."
 msgstr "Yer imi %s oluşturuldu."
@@ -724,11 +726,11 @@ msgstr "İçe aktarma işleminin ilerleme durumu yüklenemedi."
 msgid "Back"
 msgstr "Geri"
 
-#: index.php:148 libraries/Footer.class.php:70
+#: index.php:149 libraries/Footer.class.php:70
 msgid "phpMyAdmin Demo Server"
 msgstr "phpMyAdmin Tanıtım Sunucusu"
 
-#: index.php:152
+#: index.php:153
 #, php-format
 msgid ""
 "You are using the demo server. You can do anything here, but please do not "
@@ -739,110 +741,110 @@ msgstr ""
 "yapabilirsiniz ancak lütfen root, debian-sys-maint ve pma kullanıcılarını "
 "değiştirmeyin. Daha fazla bilgi %s adresinde mevcuttur."
 
-#: index.php:162
+#: index.php:163
 msgid "General Settings"
 msgstr "Genel Ayarlar"
 
-#: index.php:190 libraries/display_change_password.lib.php:50
+#: index.php:191 libraries/display_change_password.lib.php:50
 #: libraries/display_change_password.lib.php:53 user_password.php:247
 msgid "Change password"
 msgstr "Parola değiştir"
 
-#: index.php:206
+#: index.php:207
 msgid "Server connection collation"
 msgstr "Sunucu bağlantısı karşılaştırması"
 
-#: index.php:228
+#: index.php:229
 msgid "Appearance Settings"
 msgstr "Görünüm Ayarları"
 
-#: index.php:258 prefs_manage.php:285
+#: index.php:259 prefs_manage.php:285
 msgid "More settings"
 msgstr "Daha fazla ayar"
 
-#: index.php:279
+#: index.php:280
 msgid "Database server"
 msgstr "Veritabanı sunucusu"
 
-#: index.php:282 libraries/plugins/auth/AuthenticationCookie.class.php:181
+#: index.php:283 libraries/plugins/auth/AuthenticationCookie.class.php:169
 msgid "Server:"
 msgstr "Sunucu:"
 
-#: index.php:286
+#: index.php:287
 msgid "Server type:"
 msgstr "Sunucu türü:"
 
-#: index.php:290 libraries/plugins/export/ExportLatex.class.php:212
+#: index.php:291 libraries/plugins/export/ExportLatex.class.php:212
 #: libraries/plugins/export/ExportSql.class.php:687
 #: libraries/plugins/export/ExportXml.class.php:189
 msgid "Server version:"
 msgstr "Sunucu sürümü:"
 
-#: index.php:296
+#: index.php:297
 msgid "Protocol version:"
 msgstr "Protokol sürümü:"
 
-#: index.php:300
+#: index.php:301
 msgid "User:"
 msgstr "Kullanıcı:"
 
-#: index.php:305
+#: index.php:306
 msgid "Server charset:"
 msgstr "Sunucu karakter grubu:"
 
-#: index.php:320
+#: index.php:321
 msgid "Web server"
 msgstr "Web sunucusu"
 
-#: index.php:331
+#: index.php:332
 msgid "Database client version:"
 msgstr "Veritabanı istemcisi sürümü:"
 
-#: index.php:335
+#: index.php:336
 msgid "PHP extension:"
 msgstr "PHP uzantısı:"
 
-#: index.php:349
+#: index.php:350
 msgid "PHP version:"
 msgstr "PHP sürümü:"
 
-#: index.php:360
+#: index.php:361
 msgid "Show PHP information"
 msgstr "PHP bilgisini göster"
 
-#: index.php:383
+#: index.php:384
 msgid "Version information:"
 msgstr "Sürüm bilgisi:"
 
-#: index.php:392 libraries/Util.class.php:432 libraries/Util.class.php:495
-#: libraries/config/FormDisplay.tpl.php:151
+#: index.php:393 libraries/Util.class.php:432 libraries/Util.class.php:495
+#: libraries/config/FormDisplay.tpl.php:162
 #: libraries/display_export.lib.php:577 libraries/engines/pbxt.lib.php:162
 #: libraries/navigation/NavigationHeader.class.php:196
 #: libraries/server_variables.lib.php:160
 msgid "Documentation"
 msgstr "Belgeler"
 
-#: index.php:399
+#: index.php:400
 msgid "Wiki"
 msgstr "Viki"
 
-#: index.php:408
+#: index.php:409
 msgid "Official Homepage"
 msgstr "Resmî phpMyAdmin Anasayfası"
 
-#: index.php:415
+#: index.php:416
 msgid "Contribute"
 msgstr "Katkıda bulun"
 
-#: index.php:422
+#: index.php:423
 msgid "Get support"
 msgstr "Destek al"
 
-#: index.php:429
+#: index.php:430
 msgid "List of changes"
 msgstr "Değişikliklerin listesi"
 
-#: index.php:451
+#: index.php:452
 msgid ""
 "You are connected as 'root' with no password, which corresponds to the "
 "default MySQL privileged account. Your MySQL server is running with this "
@@ -854,7 +856,7 @@ msgstr ""
 "izinsiz girişe açıktır, ve bu güvenlik açığını 'root' kullanıcısı için bir "
 "parola ayarlayarak gerçekten düzeltmelisiniz."
 
-#: index.php:468
+#: index.php:469
 msgid ""
 "You have enabled mbstring.func_overload in your PHP configuration. This "
 "option is incompatible with phpMyAdmin and might cause some data to be "
@@ -864,7 +866,7 @@ msgstr ""
 "seçenek phpMyAdmin ile uyumlusuzdur ve bazı veri bozulmalarına sebep "
 "olabilir!"
 
-#: index.php:483
+#: index.php:484
 msgid ""
 "The mbstring PHP extension was not found and you seem to be using a "
 "multibyte charset. Without the mbstring extension phpMyAdmin is unable to "
@@ -874,7 +876,7 @@ msgstr ""
 "görünüyor. Mbstring uzantısı olmadan phpMyAdmin karakter dizgilerini doğru "
 "olarak bölemez ve bu beklenmedik sonuçlar doğurabilir."
 
-#: index.php:500
+#: index.php:501
 msgid ""
 "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini."
 "session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower than "
@@ -887,7 +889,7 @@ msgstr ""
 "bundan dolayı phpMyAdmin içinde yapılandırılmadıkça oturum açmanızın süresi "
 "dolabilir."
 
-#: index.php:519
+#: index.php:520
 msgid ""
 "Login cookie store is lower than cookie validity configured in phpMyAdmin, "
 "because of this, your login will expire sooner than configured in phpMyAdmin."
@@ -896,13 +898,13 @@ msgstr ""
 "tanımlama bilgisi depolamasından düşük, bundan dolayı oturum açmanızın "
 "süresi phpMyAdmin içinde yapılandırılmadıkça dolacaktır."
 
-#: index.php:535
+#: index.php:536
 msgid "The configuration file now needs a secret passphrase (blowfish_secret)."
 msgstr ""
 "Yapılandırma dosyası için gizli bir parola ifadesi gerekiyor "
 "(blowfish_secret)."
 
-#: index.php:548
+#: index.php:549
 msgid ""
 "Directory [code]config[/code], which is used by the setup script, still "
 "exists in your phpMyAdmin directory. It is strongly recommended to remove it "
@@ -914,7 +916,7 @@ msgstr ""
 "kaldırmanız son derece önerilir. Yoksa yapılandırmanızı indiren yetkisiz "
 "insanlar tarafından sunucunuzun güvenliği riske atılabilir."
 
-#: index.php:564
+#: index.php:565
 #, php-format
 msgid ""
 "The phpMyAdmin configuration storage is not completely configured, some "
@@ -923,14 +925,14 @@ msgstr ""
 "phpMyAdmin yapılandırma depolaması tamamiyle yapılandırılmadı, bazı "
 "genişletilmiş özellikler devre dışı bırakıldı. %sNedenini bulun%s. "
 
-#: index.php:571
+#: index.php:572
 msgid ""
 "Or alternately go to 'Operations' tab of any database to set it up there."
 msgstr ""
 "Ya da orada ayarlamak için herhangi bir veritabanının 'İşlemler' sekmesine "
 "dönüşümlü olarak gidin."
 
-#: index.php:620
+#: index.php:621
 #, php-format
 msgid ""
 "Your PHP MySQL library version %s differs from your MySQL server version %s. "
@@ -939,7 +941,7 @@ msgstr ""
 "PHP MySQL kütüphanenizin %s sürümü, MySQL sunucunuzun %s sürümünden farklı. "
 "Bu tahmin edilemez davranışa sebep olabilir."
 
-#: index.php:648
+#: index.php:649
 #, php-format
 msgid ""
 "Server running with Suhosin. Please refer to %sdocumentation%s for possible "
@@ -1101,8 +1103,8 @@ msgstr ""
 msgid "Save & Close"
 msgstr "Kaydet ve Kapat"
 
-#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:404
-#: libraries/insert_edit.lib.php:1550 prefs_manage.php:361
+#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:415
+#: libraries/insert_edit.lib.php:1548 prefs_manage.php:361
 #: prefs_manage.php:372
 msgid "Reset"
 msgstr "Sıfırla"
@@ -1135,7 +1137,7 @@ msgstr "İndeksi ekle"
 msgid "Edit Index"
 msgstr "İndeksi düzenle"
 
-#: js/messages.php:99 templates/index_form.phtml:232
+#: js/messages.php:99 templates/table/index_form.phtml:232
 #, php-format
 msgid "Add %s column(s) to index"
 msgstr "İndekse %s sütun ekle"
@@ -1156,13 +1158,14 @@ msgstr "Şununla bileşik:"
 msgid "Please select column(s) for the index."
 msgstr "İndeks için lütfen sütun(ları) seçin."
 
-#: js/messages.php:106 templates/structure/add_column.phtml:1
+#: js/messages.php:106 templates/table/structure/add_column.phtml:1
 msgid "You have to add at least one column."
 msgstr "En az bir sütun eklemek zorundasınız."
 
-#: js/messages.php:109 libraries/insert_edit.lib.php:1548
+#: js/messages.php:109 libraries/insert_edit.lib.php:1546
 #: templates/columns_definitions/column_definitions_form.phtml:162
-#: templates/index_form.phtml:237 templates/tbl_relation/common_form.phtml:106
+#: templates/table/index_form.phtml:237
+#: templates/table/relation/common_form.phtml:106
 msgid "Preview SQL"
 msgstr "SQL Önizle"
 
@@ -1179,7 +1182,7 @@ msgid "SQL query:"
 msgstr "SQL sorgusu:"
 
 #. l10n: Default label for the y-Axis of Charts
-#: js/messages.php:118 templates/tbl_chart.phtml:109
+#: js/messages.php:118 templates/table/chart/tbl_chart.phtml:109
 msgid "Y Values"
 msgstr "Y Değeri"
 
@@ -1334,7 +1337,7 @@ msgstr "Gönderilmiş bayt"
 msgid "Bytes received"
 msgstr "Alınmış bayt"
 
-#: js/messages.php:169 libraries/server_status.lib.php:226
+#: js/messages.php:169 libraries/server_status.lib.php:235
 msgid "Connections"
 msgstr "Bağlantılar"
 
@@ -1391,12 +1394,12 @@ msgstr "%d tablo"
 msgid "Questions"
 msgstr "Sorular"
 
-#: js/messages.php:184 libraries/server_status.lib.php:134
+#: js/messages.php:184 libraries/server_status.lib.php:143
 msgid "Traffic"
 msgstr "Trafik"
 
 #: js/messages.php:185 libraries/Menu.class.php:586
-#: libraries/Util.class.php:4318 libraries/server_status_monitor.lib.php:257
+#: libraries/Util.class.php:4324 libraries/server_status_monitor.lib.php:257
 msgid "Settings"
 msgstr "Ayarlar"
 
@@ -1416,8 +1419,9 @@ msgstr "Lütfen diziye en az bir değişken ekleyin!"
 #: libraries/server_status_monitor.lib.php:236
 #: libraries/server_status_processes.lib.php:308
 #: templates/columns_definitions/transformation.phtml:4
-#: templates/designer/options_panel.phtml:178
-#: templates/table/options_zoom.phtml:12 templates/table/rows_zoom.phtml:26
+#: templates/database/designer/options_panel.phtml:178
+#: templates/table/search/options_zoom.phtml:12
+#: templates/table/search/rows_zoom.phtml:26
 msgid "None"
 msgstr "Yok"
 
@@ -1705,8 +1709,8 @@ msgstr ""
 
 #: js/messages.php:270 libraries/Menu.class.php:352
 #: libraries/Menu.class.php:455 libraries/Menu.class.php:582
-#: libraries/Util.class.php:4317 libraries/Util.class.php:4332
-#: libraries/Util.class.php:4349 libraries/config/messages.inc.php:258
+#: libraries/Util.class.php:4323 libraries/Util.class.php:4338
+#: libraries/Util.class.php:4355 libraries/config/messages.inc.php:258
 #: libraries/display_import.lib.php:105
 #: libraries/server_status_monitor.lib.php:318 prefs_manage.php:238
 #: setup/frames/menu.inc.php:26
@@ -1766,13 +1770,13 @@ msgid "Formatting SQL..."
 msgstr "SQL biçimlendiriliyor..."
 
 #: js/messages.php:293 libraries/server_variables.lib.php:157
-#: templates/designer/aggregate_query_panel.phtml:63
-#: templates/designer/delete_relation_panel.phtml:28
-#: templates/designer/having_query_panel.phtml:117
-#: templates/designer/new_relation_panel.phtml:88
-#: templates/designer/options_panel.phtml:253
-#: templates/designer/rename_to_panel.phtml:45
-#: templates/designer/where_query_panel.phtml:83
+#: templates/database/designer/aggregate_query_panel.phtml:63
+#: templates/database/designer/delete_relation_panel.phtml:28
+#: templates/database/designer/having_query_panel.phtml:117
+#: templates/database/designer/new_relation_panel.phtml:88
+#: templates/database/designer/options_panel.phtml:253
+#: templates/database/designer/rename_to_panel.phtml:45
+#: templates/database/designer/where_query_panel.phtml:83
 msgid "Cancel"
 msgstr "İptal"
 
@@ -1780,7 +1784,7 @@ msgstr "İptal"
 msgid "Page-related settings"
 msgstr "Sayfa ile ilgili ayarlar"
 
-#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:402
+#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:413
 msgid "Apply"
 msgstr "Uygula"
 
@@ -1815,8 +1819,8 @@ msgstr "Hata kodu: %s"
 msgid "Error text: %s"
 msgstr "Hata metni: %s"
 
-#: js/messages.php:307 libraries/db_common.inc.php:68
-#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:450
+#: js/messages.php:307 libraries/db_common.inc.php:69
+#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:461
 msgid "No databases selected."
 msgstr "Seçilen veritabanları yok."
 
@@ -1828,12 +1832,13 @@ msgstr "Sütun Kaldırılıyor"
 msgid "Adding Primary Key"
 msgstr "Birincil Anahtar Ekleniyor"
 
-#: js/messages.php:310 templates/designer/aggregate_query_panel.phtml:59
-#: templates/designer/having_query_panel.phtml:113
-#: templates/designer/new_relation_panel.phtml:87
-#: templates/designer/options_panel.phtml:252
-#: templates/designer/rename_to_panel.phtml:41
-#: templates/designer/where_query_panel.phtml:82
+#: js/messages.php:310
+#: templates/database/designer/aggregate_query_panel.phtml:59
+#: templates/database/designer/having_query_panel.phtml:113
+#: templates/database/designer/new_relation_panel.phtml:87
+#: templates/database/designer/options_panel.phtml:252
+#: templates/database/designer/rename_to_panel.phtml:41
+#: templates/database/designer/where_query_panel.phtml:82
 msgid "OK"
 msgstr "TAMAM"
 
@@ -1853,7 +1858,7 @@ msgstr "Veritabanı Kopyalanıyor"
 msgid "Changing Charset"
 msgstr "Karakter Grubu Değiştiriliyor"
 
-#: js/messages.php:320 libraries/Util.class.php:3217
+#: js/messages.php:320 libraries/Util.class.php:3223
 msgid "Enable foreign key checks"
 msgstr "Dış anahtar kontrollerini etkinleştir"
 
@@ -1888,20 +1893,21 @@ msgstr "Depolanan işlevin tanımı RETURN ifadesi içermek zorunda!"
 #: js/messages.php:334 libraries/DisplayResults.class.php:4834
 #: libraries/DisplayResults.class.php:5092 libraries/Menu.class.php:344
 #: libraries/Menu.class.php:446 libraries/Menu.class.php:578
-#: libraries/Util.class.php:3636 libraries/Util.class.php:3637
-#: libraries/Util.class.php:4316 libraries/Util.class.php:4331
-#: libraries/Util.class.php:4348 libraries/config/messages.inc.php:252
+#: libraries/Util.class.php:3642 libraries/Util.class.php:3643
+#: libraries/Util.class.php:4322 libraries/Util.class.php:4337
+#: libraries/Util.class.php:4354 libraries/config/messages.inc.php:252
 #: libraries/display_export.lib.php:173 libraries/rte/rte_list.lib.php:146
 #: libraries/server_privileges.lib.php:2211
 #: libraries/server_privileges.lib.php:2290
 #: libraries/server_privileges.lib.php:2632
 #: libraries/server_privileges.lib.php:3356
 #: libraries/server_status_monitor.lib.php:322 prefs_manage.php:303
-#: setup/frames/menu.inc.php:27 templates/structure/check_all_tables.phtml:11
+#: setup/frames/menu.inc.php:27
+#: templates/database/structure/check_all_tables.phtml:11
 msgid "Export"
 msgstr "Dışa Aktar"
 
-#: js/messages.php:337 libraries/rte/rte_routines.lib.php:652
+#: js/messages.php:337 libraries/rte/rte_routines.lib.php:743
 msgid "ENUM/SET editor"
 msgstr "ENUM/SET düzenleyicisi"
 
@@ -1942,7 +1948,7 @@ msgstr "Sorgu kutusunu göster"
 #: libraries/Console.class.php:214 libraries/DisplayResults.class.php:3474
 #: libraries/DisplayResults.class.php:4818 libraries/Index.class.php:723
 #: libraries/Util.class.php:706 libraries/Util.class.php:1202
-#: libraries/Util.class.php:3634 libraries/Util.class.php:3635
+#: libraries/Util.class.php:3640 libraries/Util.class.php:3641
 #: libraries/central_columns.lib.php:851
 #: libraries/central_columns.lib.php:1193
 #: libraries/config/messages.inc.php:892
@@ -1960,7 +1966,7 @@ msgstr "Düzenle"
 #: libraries/server_user_groups.lib.php:129
 #: libraries/sql_query_form.lib.php:416 libraries/tracking.lib.php:477
 #: setup/frames/index.inc.php:183 setup/frames/index.inc.php:291
-#: templates/designer/delete_relation_panel.phtml:27
+#: templates/database/designer/delete_relation_panel.phtml:27
 msgid "Delete"
 msgstr "Sil"
 
@@ -2130,11 +2136,11 @@ msgid "No dependencies selected!"
 msgstr "Seçilen bağımlılıklar yok!"
 
 #: js/messages.php:394 libraries/central_columns.lib.php:1214
-#: libraries/insert_edit.lib.php:1458 libraries/server_variables.lib.php:155
+#: libraries/insert_edit.lib.php:1456 libraries/server_variables.lib.php:155
 #: setup/frames/config.inc.php:42 setup/frames/index.inc.php:279
 #: templates/columns_definitions/column_definitions_form.phtml:165
-#: templates/gis_visualization/gis_visualization.phtml:48
-#: templates/tbl_relation/common_form.phtml:107
+#: templates/table/gis_visualization/gis_visualization.phtml:48
+#: templates/table/relation/common_form.phtml:107
 msgid "Save"
 msgstr "Kaydet"
 
@@ -2216,8 +2222,8 @@ msgid "Data point content"
 msgstr "Veri imleci içeriği"
 
 #: js/messages.php:430 js/messages.php:562 js/messages.php:579
-#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2573
-#: templates/index_form.phtml:154 templates/index_form.phtml:194
+#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2571
+#: templates/table/index_form.phtml:154 templates/table/index_form.phtml:194
 msgid "Ignore"
 msgstr "Yoksay"
 
@@ -2278,8 +2284,8 @@ msgstr "Dış Anahtarı seç"
 msgid "Please select the primary key or a unique key!"
 msgstr "Lütfen birincil anahtarı veya benzersiz anahtarı seçin!"
 
-#: js/messages.php:457 templates/designer/side_menu.phtml:91
-#: templates/designer/side_menu.phtml:94
+#: js/messages.php:457 templates/database/designer/side_menu.phtml:91
+#: templates/database/designer/side_menu.phtml:94
 msgid "Choose column to display"
 msgstr "Göstermek için sütun seçin"
 
@@ -2295,18 +2301,18 @@ msgstr ""
 msgid "Page name"
 msgstr "Sayfa adı"
 
-#: js/messages.php:463 templates/designer/side_menu.phtml:56
-#: templates/designer/side_menu.phtml:59
+#: js/messages.php:463 templates/database/designer/side_menu.phtml:56
+#: templates/database/designer/side_menu.phtml:59
 msgid "Save page"
 msgstr "Sayfayı kaydet"
 
-#: js/messages.php:464 templates/designer/side_menu.phtml:63
-#: templates/designer/side_menu.phtml:66
+#: js/messages.php:464 templates/database/designer/side_menu.phtml:63
+#: templates/database/designer/side_menu.phtml:66
 msgid "Save page as"
 msgstr "Sayfayı farklı kaydet"
 
-#: js/messages.php:465 templates/designer/side_menu.phtml:49
-#: templates/designer/side_menu.phtml:52
+#: js/messages.php:465 templates/database/designer/side_menu.phtml:49
+#: templates/database/designer/side_menu.phtml:52
 msgid "Open page"
 msgstr "Sayfayı aç"
 
@@ -2314,7 +2320,7 @@ msgstr "Sayfayı aç"
 msgid "Delete page"
 msgstr "Sayfayı sil"
 
-#: js/messages.php:467 templates/designer/side_menu.phtml:10
+#: js/messages.php:467 templates/database/designer/side_menu.phtml:10
 msgid "Untitled"
 msgstr "Başlıksız"
 
@@ -2437,7 +2443,7 @@ msgstr "Orijinal uzunluk"
 msgid "cancel"
 msgstr "iptal"
 
-#: js/messages.php:499 libraries/server_status.lib.php:271
+#: js/messages.php:499 libraries/server_status.lib.php:280
 msgid "Aborted"
 msgstr "İptal edilen"
 
@@ -3006,7 +3012,7 @@ msgstr "Lütfen geçerli bir ONALTILIK girdi değeri girin"
 
 #: js/messages.php:793 libraries/Message.class.php:199
 #: libraries/Util.class.php:654 libraries/core.lib.php:245
-#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1172
+#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1170
 #: tbl_operations.php:229 view_operations.php:63
 msgid "Error"
 msgstr "Hata"
@@ -3067,8 +3073,8 @@ msgstr "saniye başına"
 msgid "per minute"
 msgstr "dakika başına"
 
-#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:143
-#: libraries/server_status.lib.php:228
+#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:152
+#: libraries/server_status.lib.php:237
 #: libraries/server_status_queries.lib.php:98
 msgid "per hour"
 msgstr "saat başına"
@@ -3087,7 +3093,7 @@ msgid "Wrong permissions on configuration file, should not be world writable!"
 msgstr ""
 "Yapılandırma dosyasında yanlış izinler, herkesçe yazılabilir olmamalıdır!"
 
-#: libraries/Config.class.php:1799
+#: libraries/Config.class.php:1801
 msgid "Font size"
 msgstr "Yazı Tipi boyutu"
 
@@ -3115,10 +3121,10 @@ msgstr "Yeniden sorgula"
 #: libraries/server_privileges.lib.php:2890
 #: libraries/server_privileges.lib.php:3144
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4332
+#: libraries/server_privileges.lib.php:4358
 #: libraries/server_status_processes.lib.php:80
-#: templates/tbl_relation/foreign_key_row.phtml:165
-#: templates/tbl_relation/internal_relational_row.phtml:55
+#: templates/table/relation/foreign_key_row.phtml:165
+#: templates/table/relation/internal_relational_row.phtml:55
 msgid "Database"
 msgstr "Veritabanı"
 
@@ -3211,11 +3217,11 @@ msgstr "Geçmiş"
 #: libraries/plugins/import/ImportMediawiki.class.php:60
 #: libraries/plugins/import/ImportOds.class.php:59
 #: libraries/plugins/import/ImportShp.class.php:57
-#: libraries/plugins/import/ImportSql.class.php:148
+#: libraries/plugins/import/ImportSql.class.php:51
 #: libraries/plugins/import/ImportXml.class.php:58
-#: libraries/rte/rte_routines.lib.php:833 templates/index_form.phtml:49
-#: templates/structure/row_stats_table.phtml:20
-#: templates/table/options.phtml:2
+#: libraries/rte/rte_routines.lib.php:924 templates/table/index_form.phtml:49
+#: templates/table/search/options.phtml:2
+#: templates/table/structure/row_stats_table.phtml:20
 msgid "Options"
 msgstr "Seçenekler"
 
@@ -3248,7 +3254,8 @@ msgstr "büyükten küçüğe"
 msgid "Order:"
 msgstr "Sıra:"
 
-#: libraries/Console.class.php:289 templates/table/replace_preview.phtml:17
+#: libraries/Console.class.php:289
+#: templates/table/search/replace_preview.phtml:17
 msgid "Count"
 msgstr "Sayı"
 
@@ -3345,9 +3352,9 @@ msgstr "Koyu temaya değiştir"
 #: libraries/operations.lib.php:794 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:191
-#: templates/structure/sortable_header.phtml:21
-#: templates/structure/sortable_header.phtml:38
-#: templates/table/options.phtml:68
+#: templates/database/structure/sortable_header.phtml:21
+#: templates/database/structure/sortable_header.phtml:38
+#: templates/table/search/options.phtml:68
 msgid "Ascending"
 msgstr "Küçükten Büyüğe"
 
@@ -3357,13 +3364,14 @@ msgstr "Küçükten Büyüğe"
 #: libraries/operations.lib.php:797 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:188
-#: templates/structure/sortable_header.phtml:26
-#: templates/structure/sortable_header.phtml:43
-#: templates/table/options.phtml:69
+#: templates/database/structure/sortable_header.phtml:26
+#: templates/database/structure/sortable_header.phtml:43
+#: templates/table/search/options.phtml:69
 msgid "Descending"
 msgstr "Büyükten Küçüğe"
 
-#: libraries/DBQbe.class.php:467 templates/table/search_and_replace.phtml:6
+#: libraries/DBQbe.class.php:467
+#: templates/table/search/search_and_replace.phtml:6
 msgid "Column:"
 msgstr "Sütun:"
 
@@ -3522,12 +3530,12 @@ msgstr[0] "<strong>%2$s</strong> tablosu içerisinde %1$s eşleşme"
 msgstr[1] "<strong>%2$s</strong> tablosu içerisinde %1$s eşleşme"
 
 #: libraries/DbSearch.class.php:354 libraries/Menu.class.php:311
-#: libraries/Util.class.php:3337 libraries/Util.class.php:3347
-#: libraries/Util.class.php:3623 libraries/Util.class.php:3624
-#: libraries/Util.class.php:4343 libraries/config.values.php:43
+#: libraries/Util.class.php:3343 libraries/Util.class.php:3353
+#: libraries/Util.class.php:3629 libraries/Util.class.php:3630
+#: libraries/Util.class.php:4349 libraries/config.values.php:43
 #: libraries/config.values.php:51 libraries/config.values.php:119
 #: libraries/navigation/Nodes/Node_Table.class.php:295
-#: templates/structure/check_all_table_column.phtml:5
+#: templates/table/structure/check_all_table_column.phtml:5
 msgid "Browse"
 msgstr "Gözat"
 
@@ -3544,7 +3552,8 @@ msgstr "Veritabanında ara"
 msgid "Words or values to search for (wildcard: \"%\"):"
 msgstr "Aranacak kelimeler veya değerler (joker: \"%\"):"
 
-#: libraries/DbSearch.class.php:401 templates/table/search_and_replace.phtml:1
+#: libraries/DbSearch.class.php:401
+#: templates/table/search/search_and_replace.phtml:1
 msgid "Find:"
 msgstr "Bul:"
 
@@ -3588,28 +3597,28 @@ msgstr "Satırları süz"
 msgid "Search this table"
 msgstr "Bu tabloda ara"
 
-#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2532
-#: libraries/Util.class.php:2535
+#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2538
+#: libraries/Util.class.php:2541
 msgctxt "First page"
 msgid "Begin"
 msgstr "Başlangıç"
 
-#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2533
-#: libraries/Util.class.php:2536 libraries/server_bin_log.lib.php:170
+#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2539
+#: libraries/Util.class.php:2542 libraries/server_bin_log.lib.php:170
 #: libraries/server_bin_log.lib.php:172
 msgctxt "Previous page"
 msgid "Previous"
 msgstr "Önceki"
 
-#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2564
-#: libraries/Util.class.php:2574 libraries/server_bin_log.lib.php:204
+#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2570
+#: libraries/Util.class.php:2580 libraries/server_bin_log.lib.php:204
 #: libraries/server_bin_log.lib.php:206
 msgctxt "Next page"
 msgid "Next"
 msgstr "Sonraki"
 
-#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2565
-#: libraries/Util.class.php:2575
+#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2571
+#: libraries/Util.class.php:2581
 msgctxt "Last page"
 msgid "End"
 msgstr "Son"
@@ -3682,15 +3691,15 @@ msgid "May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]."
 msgstr "Yaklaşık olabilir. [doc@faq3-11]SSS 3.11[/doc]'e bakın."
 
 #: libraries/DisplayResults.class.php:4332 libraries/Message.class.php:180
-#: libraries/controllers/TableRelationController.class.php:258
+#: libraries/controllers/TableRelationController.class.php:259
 #: libraries/controllers/TableSearchController.class.php:655
-#: libraries/rte/rte_routines.lib.php:1332 libraries/sql_query_form.lib.php:89
+#: libraries/rte/rte_routines.lib.php:1423 libraries/sql_query_form.lib.php:89
 #: tbl_operations.php:227 tbl_row_action.php:138 view_operations.php:62
 msgid "Your SQL query has been executed successfully."
 msgstr "SQL sorgunuz başarılı olarak çalıştırıldı."
 
 #: libraries/DisplayResults.class.php:4660
-#: libraries/controllers/StructureController.class.php:629
+#: libraries/controllers/DatabaseStructureController.class.php:564
 #, php-format
 msgid ""
 "This view has at least this number of rows. Please refer to %sdocumentation"
@@ -3713,33 +3722,33 @@ msgstr "%1$d toplam, %2$d sorguda"
 msgid "%d total"
 msgstr "toplam %d"
 
-#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1318
+#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1312
 #, php-format
 msgid "Query took %01.4f seconds."
 msgstr "Sorgu %01.4f saniye sürdü."
 
 #: libraries/DisplayResults.class.php:4807
-#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4767
-#: libraries/Util.class.php:4773 libraries/mult_submits.inc.php:50
-#: templates/structure/check_all_tables.phtml:2
-#: templates/structure/check_all_tables.phtml:9
+#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4773
+#: libraries/Util.class.php:4779 libraries/mult_submits.inc.php:50
+#: templates/database/structure/check_all_tables.phtml:2
+#: templates/database/structure/check_all_tables.phtml:9
 msgid "With selected:"
 msgstr "Seçilileri:"
 
 #: libraries/DisplayResults.class.php:4811
-#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4769
-#: libraries/Util.class.php:4770 libraries/server_privileges.lib.php:1174
+#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4775
+#: libraries/Util.class.php:4776 libraries/server_privileges.lib.php:1174
 #: libraries/server_privileges.lib.php:1175
 #: libraries/server_privileges.lib.php:1387
 #: libraries/server_user_groups.lib.php:231
-#: templates/structure/check_all_tables.phtml:3
-#: templates/structure/check_all_tables.phtml:4
+#: templates/database/structure/check_all_tables.phtml:3
+#: templates/database/structure/check_all_tables.phtml:4
 msgid "Check All"
 msgstr "Tümünü Seç"
 
 #: libraries/DisplayResults.class.php:4985 libraries/Header.class.php:383
-#: templates/structure/optional_action_links.phtml:1
-#: templates/structure/print_view_data_dictionary_link.phtml:3
+#: templates/database/structure/print_view_data_dictionary_link.phtml:3
+#: templates/table/structure/optional_action_links.phtml:1
 msgid "Print view"
 msgstr "Baskı görünümü"
 
@@ -3747,7 +3756,8 @@ msgstr "Baskı görünümü"
 msgid "Query results operations"
 msgstr "Sorgu sonuçları işlemleri"
 
-#: libraries/DisplayResults.class.php:5105 templates/tbl_chart.phtml:12
+#: libraries/DisplayResults.class.php:5105
+#: templates/table/chart/tbl_chart.phtml:12
 msgid "Display chart"
 msgstr "Çizelge göster"
 
@@ -3839,7 +3849,7 @@ msgid "Click on the bar to scroll to top of page"
 msgstr "Sayfanın en üstüne kaydırmak için çubuğa tklayın"
 
 #: libraries/Header.class.php:749
-#: libraries/plugins/auth/AuthenticationCookie.class.php:152
+#: libraries/plugins/auth/AuthenticationCookie.class.php:140
 msgid "Javascript must be enabled past this point!"
 msgstr "Bu kısmı geçmek için Javascript etkinleştirilmek zorundadır!"
 
@@ -3861,11 +3871,11 @@ msgid "Keyname"
 msgstr "Anahtar adı"
 
 #: libraries/Index.class.php:697
-#: libraries/controllers/StructureController.class.php:1962
-#: libraries/controllers/StructureController.class.php:1967
+#: libraries/controllers/TableStructureController.class.php:953
+#: libraries/controllers/TableStructureController.class.php:958
 #: libraries/tracking.lib.php:973
 #: templates/columns_definitions/column_indexes.phtml:11
-#: templates/structure/check_all_table_column.phtml:26
+#: templates/table/structure/check_all_table_column.phtml:26
 msgid "Unique"
 msgstr "Benzersiz"
 
@@ -3884,16 +3894,17 @@ msgstr "Önemlilik"
 #: libraries/server_collations.lib.php:35 libraries/tracking.lib.php:881
 #: libraries/tracking.lib.php:977
 #: templates/columns_definitions/table_fields_definitions.phtml:33
-#: templates/structure/row_stats_table.phtml:31
-#: templates/structure/table_header.phtml:55
-#: templates/structure/table_structure_header.phtml:7
-#: templates/table/table_header.phtml:8
+#: templates/database/structure/table_header.phtml:55
+#: templates/table/search/table_header.phtml:8
+#: templates/table/structure/row_stats_table.phtml:31
+#: templates/table/structure/table_structure_header.phtml:7
 msgid "Collation"
 msgstr "Karşılaştırma"
 
 #: libraries/Index.class.php:703 libraries/rte/rte_events.lib.php:496
-#: libraries/rte/rte_routines.lib.php:956 libraries/tracking.lib.php:885
-#: libraries/tracking.lib.php:979 templates/structure/table_header.phtml:84
+#: libraries/rte/rte_routines.lib.php:1047 libraries/tracking.lib.php:885
+#: libraries/tracking.lib.php:979
+#: templates/database/structure/table_header.phtml:84
 msgid "Comment"
 msgstr "Yorum"
 
@@ -3906,15 +3917,15 @@ msgstr "Birincil anahtar kaldırıldı."
 msgid "Index %s has been dropped."
 msgstr "%s indeksi kaldırıldı."
 
-#: libraries/Index.class.php:757 libraries/Util.class.php:3630
-#: libraries/Util.class.php:3631
-#: libraries/controllers/StructureController.class.php:1958
-#: libraries/controllers/StructureController.class.php:1959
+#: libraries/Index.class.php:757 libraries/Util.class.php:3636
+#: libraries/Util.class.php:3637
+#: libraries/controllers/TableStructureController.class.php:949
+#: libraries/controllers/TableStructureController.class.php:950
 #: libraries/operations.lib.php:1607 libraries/rte/rte_list.lib.php:150
 #: libraries/server_databases.lib.php:146
-#: templates/structure/check_all_table_column.phtml:15
-#: templates/structure/check_all_tables.phtml:16
-#: templates/tbl_relation/foreign_key_row.phtml:93
+#: templates/database/structure/check_all_tables.phtml:16
+#: templates/table/relation/foreign_key_row.phtml:93
+#: templates/table/structure/check_all_table_column.phtml:15
 msgid "Drop"
 msgstr "Kaldır"
 
@@ -3945,16 +3956,16 @@ msgstr "Sunucu"
 #: libraries/Menu.class.php:248
 #: libraries/navigation/Nodes/Node_View.class.php:32
 #: libraries/tbl_info.inc.php:63
-#: templates/structure/structure_table_row.phtml:97
-#: templates/structure/structure_table_row.phtml:159
+#: templates/database/structure/structure_table_row.phtml:97
+#: templates/database/structure/structure_table_row.phtml:159
 msgid "View"
 msgstr "Görünüm"
 
 #: libraries/Menu.class.php:325 libraries/Menu.class.php:429
-#: libraries/Menu.class.php:548 libraries/Util.class.php:3334
-#: libraries/Util.class.php:3344 libraries/Util.class.php:3350
-#: libraries/Util.class.php:4313 libraries/Util.class.php:4328
-#: libraries/Util.class.php:4345 libraries/config.values.php:40
+#: libraries/Menu.class.php:548 libraries/Util.class.php:3340
+#: libraries/Util.class.php:3350 libraries/Util.class.php:3356
+#: libraries/Util.class.php:4319 libraries/Util.class.php:4334
+#: libraries/Util.class.php:4351 libraries/config.values.php:40
 #: libraries/config.values.php:48 libraries/config.values.php:110
 #: libraries/config.values.php:116 libraries/config/messages.inc.php:321
 #: libraries/navigation/Nodes/Node_Table.class.php:292
@@ -3962,19 +3973,19 @@ msgid "SQL"
 msgstr "SQL"
 
 #: libraries/Menu.class.php:328 libraries/Menu.class.php:432
-#: libraries/Util.class.php:3335 libraries/Util.class.php:3345
-#: libraries/Util.class.php:3351 libraries/Util.class.php:3625
-#: libraries/Util.class.php:3626 libraries/Util.class.php:4329
-#: libraries/Util.class.php:4346 libraries/config.values.php:41
+#: libraries/Util.class.php:3341 libraries/Util.class.php:3351
+#: libraries/Util.class.php:3357 libraries/Util.class.php:3631
+#: libraries/Util.class.php:3632 libraries/Util.class.php:4335
+#: libraries/Util.class.php:4352 libraries/config.values.php:41
 #: libraries/config.values.php:49 libraries/config.values.php:111
 #: libraries/config.values.php:117
 #: libraries/navigation/Nodes/Node_Table.class.php:286
 msgid "Search"
 msgstr "Ara"
 
-#: libraries/Menu.class.php:338 libraries/Util.class.php:3336
-#: libraries/Util.class.php:3346 libraries/Util.class.php:3627
-#: libraries/Util.class.php:3628 libraries/Util.class.php:4347
+#: libraries/Menu.class.php:338 libraries/Util.class.php:3342
+#: libraries/Util.class.php:3352 libraries/Util.class.php:3633
+#: libraries/Util.class.php:3634 libraries/Util.class.php:4353
 #: libraries/config.values.php:42 libraries/config.values.php:50
 #: libraries/config.values.php:118
 #: libraries/navigation/Nodes/Node_Table.class.php:289
@@ -3983,30 +3994,30 @@ msgid "Insert"
 msgstr "Ekle"
 
 #: libraries/Menu.class.php:362 libraries/Menu.class.php:467
-#: libraries/Util.class.php:4334 libraries/Util.class.php:4350
+#: libraries/Util.class.php:4340 libraries/Util.class.php:4356
 #: libraries/config.values.php:106 libraries/server_common.lib.php:51
 #: libraries/server_privileges.lib.php:2370
 #: libraries/server_privileges.lib.php:3158
-#: libraries/server_privileges.lib.php:4221
+#: libraries/server_privileges.lib.php:4247
 msgid "Privileges"
 msgstr "Yetkiler"
 
 #: libraries/Menu.class.php:371 libraries/Menu.class.php:379
-#: libraries/Menu.class.php:459 libraries/Util.class.php:3338
-#: libraries/Util.class.php:3352 libraries/Util.class.php:4333
-#: libraries/Util.class.php:4351 libraries/config.values.php:112
+#: libraries/Menu.class.php:459 libraries/Util.class.php:3344
+#: libraries/Util.class.php:3358 libraries/Util.class.php:4339
+#: libraries/Util.class.php:4357 libraries/config.values.php:112
 #: view_operations.php:92
 msgid "Operations"
 msgstr "İşlemler"
 
 #: libraries/Menu.class.php:384 libraries/Menu.class.php:492
-#: libraries/Util.class.php:4338 libraries/Util.class.php:4352
+#: libraries/Util.class.php:4344 libraries/Util.class.php:4358
 #: libraries/relation.lib.php:255
 msgid "Tracking"
 msgstr "İzleme"
 
 #: libraries/Menu.class.php:397 libraries/Menu.class.php:486
-#: libraries/Util.class.php:4337 libraries/Util.class.php:4353
+#: libraries/Util.class.php:4343 libraries/Util.class.php:4359
 #: libraries/navigation/Nodes/Node_Trigger_Container.class.php:24
 #: libraries/plugins/export/ExportHtmlword.class.php:557
 #: libraries/plugins/export/ExportOdt.class.php:685
@@ -4023,16 +4034,16 @@ msgstr "Tetikleyiciler"
 msgid "Database seems to be empty!"
 msgstr "Veritabanı boş olarak görünüyor!"
 
-#: libraries/Menu.class.php:439 libraries/Util.class.php:4330
+#: libraries/Menu.class.php:439 libraries/Util.class.php:4336
 msgid "Query"
 msgstr "Sorgu"
 
-#: libraries/Menu.class.php:472 libraries/Util.class.php:4335
+#: libraries/Menu.class.php:472 libraries/Util.class.php:4341
 #: libraries/rte/rte_words.lib.php:36
 msgid "Routines"
 msgstr "Yordamlar"
 
-#: libraries/Menu.class.php:479 libraries/Util.class.php:4336
+#: libraries/Menu.class.php:479 libraries/Util.class.php:4342
 #: libraries/navigation/Nodes/Node_Event_Container.class.php:26
 #: libraries/plugins/export/ExportSql.class.php:940
 #: libraries/plugins/export/ExportXml.class.php:107
@@ -4040,20 +4051,20 @@ msgstr "Yordamlar"
 msgid "Events"
 msgstr "Olaylar"
 
-#: libraries/Menu.class.php:498 libraries/Util.class.php:4339
+#: libraries/Menu.class.php:498 libraries/Util.class.php:4345
 msgid "Designer"
 msgstr "Tasarımcı"
 
-#: libraries/Menu.class.php:507 libraries/Util.class.php:4340
-#: templates/structure/check_all_tables.phtml:35
+#: libraries/Menu.class.php:507 libraries/Util.class.php:4346
+#: templates/database/structure/check_all_tables.phtml:35
 msgid "Central columns"
 msgstr "Merkezi sütunlar"
 
-#: libraries/Menu.class.php:544 libraries/Util.class.php:4312
+#: libraries/Menu.class.php:544 libraries/Util.class.php:4318
 #: libraries/config.values.php:103 libraries/config/messages.inc.php:266
 #: libraries/config/messages.inc.php:341
 #: libraries/navigation/NavigationTree.class.php:1239
-#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4332
+#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4358
 msgid "Databases"
 msgstr "Veritabanları"
 
@@ -4062,34 +4073,34 @@ msgid "User accounts"
 msgstr "Kullanıcı hesapları"
 
 #: libraries/Menu.class.php:595 libraries/ServerStatusData.class.php:121
-#: libraries/Util.class.php:4319 libraries/server_common.lib.php:36
+#: libraries/Util.class.php:4325 libraries/server_common.lib.php:36
 msgid "Binary log"
 msgstr "İkili değer günlüğü"
 
 #: libraries/Menu.class.php:601 libraries/ServerStatusData.class.php:126
-#: libraries/Util.class.php:4320 libraries/server_common.lib.php:42
-#: templates/structure/body_for_table_summary.phtml:10
-#: templates/structure/table_header.phtml:27
+#: libraries/Util.class.php:4326 libraries/server_common.lib.php:42
+#: templates/database/structure/body_for_table_summary.phtml:10
+#: templates/database/structure/table_header.phtml:27
 msgid "Replication"
 msgstr "Kopya Etme"
 
 #: libraries/Menu.class.php:606 libraries/ServerStatusData.class.php:193
-#: libraries/Util.class.php:4321 libraries/config.values.php:105
+#: libraries/Util.class.php:4327 libraries/config.values.php:105
 #: libraries/server_engines.lib.php:108 libraries/server_engines.lib.php:112
 #: libraries/sql_query_form.lib.php:421
 msgid "Variables"
 msgstr "Değişkenler"
 
-#: libraries/Menu.class.php:610 libraries/Util.class.php:4322
+#: libraries/Menu.class.php:610 libraries/Util.class.php:4328
 msgid "Charsets"
 msgstr "Karakter Grupları"
 
-#: libraries/Menu.class.php:615 libraries/Util.class.php:4323
+#: libraries/Menu.class.php:615 libraries/Util.class.php:4329
 #: libraries/server_common.lib.php:33 libraries/server_plugins.lib.php:27
 msgid "Plugins"
 msgstr "Eklentiler"
 
-#: libraries/Menu.class.php:626 libraries/Util.class.php:4324
+#: libraries/Menu.class.php:626 libraries/Util.class.php:4330
 msgid "Engines"
 msgstr "Motorlar"
 
@@ -4114,7 +4125,7 @@ msgid_plural "%1$d rows inserted."
 msgstr[0] "%1$d satır eklendi."
 msgstr[1] "%1$d satır eklendi."
 
-#: libraries/PDF.class.php:70 libraries/Util.class.php:2521
+#: libraries/PDF.class.php:70 libraries/Util.class.php:2527
 #: libraries/browse_foreigners.lib.php:327
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:865
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:890
@@ -4135,7 +4146,7 @@ msgid "Could not save favorite table!"
 msgstr "Sık kullanılan tablo kaydedilemedi!"
 
 #: libraries/RecentFavoriteTable.class.php:212
-#: templates/structure/favorite_anchor.phtml:12
+#: templates/database/structure/favorite_anchor.phtml:12
 msgid "Remove from Favorites"
 msgstr "Sık Kullanılanlardan kaldır"
 
@@ -4300,7 +4311,7 @@ msgid ""
 msgstr "Bu depolama motoru için ayrıntılı durum bilgisi mevcut değil."
 
 #: libraries/StorageEngine.class.php:373
-#: templates/structure/body_for_table_summary.phtml:50
+#: templates/database/structure/body_for_table_summary.phtml:50
 #, php-format
 msgid "%s is the default storage engine on this MySQL server."
 msgstr "%s bu MySQL sunucusundaki varsayılan depolama motorudur."
@@ -4782,10 +4793,10 @@ msgstr "Çözümleme sırasında %d hata bulundu."
 
 #: libraries/Util.class.php:726 libraries/rte/rte_events.lib.php:110
 #: libraries/rte/rte_events.lib.php:119 libraries/rte/rte_events.lib.php:150
-#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:153
-#: libraries/rte/rte_routines.lib.php:162
-#: libraries/rte/rte_routines.lib.php:235
-#: libraries/rte/rte_routines.lib.php:1366
+#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:223
+#: libraries/rte/rte_routines.lib.php:250
+#: libraries/rte/rte_routines.lib.php:372
+#: libraries/rte/rte_routines.lib.php:1457
 #: libraries/rte/rte_triggers.lib.php:86 libraries/rte/rte_triggers.lib.php:95
 #: libraries/rte/rte_triggers.lib.php:127
 msgid "MySQL said: "
@@ -4829,75 +4840,78 @@ msgstr "Paz"
 msgid "%B %d, %Y at %I:%M %p"
 msgstr "%d %B %Y, %H:%M:%S"
 
-#: libraries/Util.class.php:2019
+#: libraries/Util.class.php:2025
 #, php-format
 msgid "%s days, %s hours, %s minutes and %s seconds"
 msgstr "%s gün, %s saat, %s dakika ve %s saniye"
 
-#: libraries/Util.class.php:2112
+#: libraries/Util.class.php:2118
 msgid "Missing parameter:"
 msgstr "Eksik parametreler:"
 
-#: libraries/Util.class.php:2645
+#: libraries/Util.class.php:2651
 #, php-format
 msgid "Jump to database \"%s\"."
 msgstr "\"%s\" veritabanına git."
 
-#: libraries/Util.class.php:2670
+#: libraries/Util.class.php:2676
 #, php-format
 msgid "The %s functionality is affected by a known bug, see %s"
 msgstr "%s işlevselliği bilinen bir hata tarafından zarar görmüş, bakınız %s"
 
-#: libraries/Util.class.php:2881
+#: libraries/Util.class.php:2887
 msgid "Click to toggle"
 msgstr "Değiştirmek için tıklayın"
 
-#: libraries/Util.class.php:3542 prefs_manage.php:248
+#: libraries/Util.class.php:3548 prefs_manage.php:248
 msgid "Browse your computer:"
 msgstr "Bilgisayara gözat:"
 
-#: libraries/Util.class.php:3567
+#: libraries/Util.class.php:3573
 #, php-format
 msgid "Select from the web server upload directory <b>%s</b>:"
 msgstr "Web sunucusu gönderme dizininden <b>%s</b> seçin:"
 
-#: libraries/Util.class.php:3596 libraries/insert_edit.lib.php:1173
+#: libraries/Util.class.php:3602 libraries/insert_edit.lib.php:1171
 msgid "The directory you set for upload work cannot be reached."
 msgstr "Gönderme işi için ayarladığınız dizine ulaşılamıyor."
 
-#: libraries/Util.class.php:3607
+#: libraries/Util.class.php:3613
 msgid "There are no files to upload!"
 msgstr "Göndermek için hiç dosya yok!"
 
-#: libraries/Util.class.php:3632 libraries/Util.class.php:3633
-#: templates/structure/check_all_tables.phtml:15
+#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: templates/database/structure/check_all_tables.phtml:15
 msgid "Empty"
 msgstr "Boşalt"
 
-#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: libraries/Util.class.php:3644 libraries/Util.class.php:3645
 msgid "Execute"
 msgstr "Çalıştır"
 
-#: libraries/Util.class.php:4152
+#: libraries/Util.class.php:4158
 msgid "Print"
 msgstr "Yazdır"
 
-#: libraries/Util.class.php:4257 templates/structure/row_stats_table.phtml:80
-#: templates/structure/table_header.phtml:95
+#: libraries/Util.class.php:4263
+#: templates/database/structure/table_header.phtml:95
+#: templates/table/structure/row_stats_table.phtml:80
 msgid "Creation"
 msgstr "Oluşturma"
 
-#: libraries/Util.class.php:4263 templates/structure/row_stats_table.phtml:87
-#: templates/structure/table_header.phtml:106
+#: libraries/Util.class.php:4269
+#: templates/database/structure/table_header.phtml:106
+#: templates/table/structure/row_stats_table.phtml:87
 msgid "Last update"
 msgstr "Son güncelleme"
 
-#: libraries/Util.class.php:4269 templates/structure/row_stats_table.phtml:94
-#: templates/structure/table_header.phtml:117
+#: libraries/Util.class.php:4275
+#: templates/database/structure/table_header.phtml:117
+#: templates/table/structure/row_stats_table.phtml:94
 msgid "Last check"
 msgstr "Son kontrol"
 
-#: libraries/Util.class.php:4315
+#: libraries/Util.class.php:4321
 msgid "Users"
 msgstr "Kullanıcılar"
 
@@ -4918,16 +4932,16 @@ msgid "Use this value"
 msgstr "Bu değeri kullan"
 
 #: libraries/build_html_for_db.lib.php:33 libraries/import.lib.php:193
-#: templates/structure/actions_in_table_structure.phtml:113
-#: templates/structure/row_stats_table.phtml:42
-#: templates/structure/table_header.phtml:36
+#: templates/database/structure/table_header.phtml:36
+#: templates/table/structure/actions_in_table_structure.phtml:113
+#: templates/table/structure/row_stats_table.phtml:42
 msgid "Rows"
 msgstr "Satır"
 
 #: libraries/build_html_for_db.lib.php:48 libraries/engines/innodb.lib.php:171
-#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:186
-#: libraries/server_status.lib.php:298
-#: templates/structure/display_table_stats.phtml:40
+#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:195
+#: libraries/server_status.lib.php:307
+#: templates/table/structure/display_table_stats.phtml:40
 msgid "Total"
 msgstr "Toplam"
 
@@ -4936,10 +4950,12 @@ msgid "Jump to database"
 msgstr "Veritabanına git"
 
 #: libraries/build_html_for_db.lib.php:146
+#: templates/database/structure/structure_table_row.phtml:15
 msgid "Not replicated"
 msgstr "Kopya edilmedi"
 
 #: libraries/build_html_for_db.lib.php:158
+#: templates/database/structure/structure_table_row.phtml:16
 msgid "Replicated"
 msgstr "Kopya edildi"
 
@@ -4995,17 +5011,17 @@ msgstr "HAYIR"
 #: libraries/plugins/export/ExportTexytext.class.php:425
 #: libraries/plugins/export/PMA_ExportPdf.class.php:307
 #: libraries/rte/rte_list.lib.php:73 libraries/rte/rte_list.lib.php:85
-#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:830
-#: libraries/rte/rte_routines.lib.php:1492 setup/frames/index.inc.php:162
+#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:921
+#: libraries/rte/rte_routines.lib.php:1583 setup/frames/index.inc.php:162
 #: templates/columns_definitions/table_fields_definitions.phtml:8
-#: templates/structure/table_structure_header.phtml:5
-#: templates/table/create_table.phtml:11
+#: templates/database/create_table.phtml:11
+#: templates/table/structure/table_structure_header.phtml:5
 msgid "Name"
 msgstr "Adı"
 
 #: libraries/central_columns.lib.php:699
 #: libraries/central_columns.lib.php:1381
-#: libraries/rte/rte_routines.lib.php:832
+#: libraries/rte/rte_routines.lib.php:923
 #: templates/columns_definitions/table_fields_definitions.phtml:14
 msgid "Length/Values"
 msgstr "Uzunluk/Değerler"
@@ -5024,7 +5040,7 @@ msgid "Select a table"
 msgstr "Bir tablo seçin"
 
 #: libraries/central_columns.lib.php:804
-#: templates/structure/add_column.phtml:4
+#: templates/table/structure/add_column.phtml:4
 msgid "Add column"
 msgstr "Sütun ekle"
 
@@ -5040,7 +5056,7 @@ msgstr "Yeni sütun ekle"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1002
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1025
 #: templates/columns_definitions/table_fields_definitions.phtml:36
-#: templates/structure/table_structure_header.phtml:8
+#: templates/table/structure/table_structure_header.phtml:8
 msgid "Attributes"
 msgstr "Öznitelikler"
 
@@ -5159,7 +5175,7 @@ msgid "Double click"
 msgstr "Çift tıkla"
 
 #: libraries/config.values.php:95 libraries/config.values.php:124
-#: libraries/config/FormDisplay.tpl.php:221 libraries/relation.lib.php:97
+#: libraries/config/FormDisplay.tpl.php:232 libraries/relation.lib.php:97
 #: libraries/relation.lib.php:105
 msgid "Disabled"
 msgstr "Etkisizleştirildi"
@@ -5329,21 +5345,21 @@ msgstr "Sıkıştırılmış dışa aktarma eksik %s işlevinden dolayı çalı
 msgid "maximum %s"
 msgstr "en fazla %s"
 
-#: libraries/config/FormDisplay.tpl.php:219
+#: libraries/config/FormDisplay.tpl.php:230
 msgid "This setting is disabled, it will not be applied to your configuration."
 msgstr "Bu ayar etkisizleştirildi, yapılandırmanıza uygulanmayacaktır."
 
-#: libraries/config/FormDisplay.tpl.php:313
+#: libraries/config/FormDisplay.tpl.php:324
 #, php-format
 msgid "Set value: %s"
 msgstr "Ayar değeri: %s"
 
-#: libraries/config/FormDisplay.tpl.php:318
+#: libraries/config/FormDisplay.tpl.php:329
 #: libraries/config/messages.inc.php:610
 msgid "Restore default value"
 msgstr "Varsayılan değeri geri yükle"
 
-#: libraries/config/FormDisplay.tpl.php:332
+#: libraries/config/FormDisplay.tpl.php:343
 msgid "Allow users to customize this value"
 msgstr "Bu değeri özelleştirmek için kullanıcılara izin ver"
 
@@ -5842,7 +5858,7 @@ msgstr "Dosyanın karakter grubu"
 
 #: libraries/config/messages.inc.php:136 libraries/config/messages.inc.php:152
 #: libraries/sql_query_form.lib.php:247
-#: templates/structure/row_stats_table.phtml:7
+#: templates/table/structure/row_stats_table.phtml:7
 msgid "Format"
 msgstr "Biçim"
 
@@ -6354,7 +6370,7 @@ msgstr ""
 
 #: libraries/config/messages.inc.php:332
 #: libraries/plugins/export/ExportPdf.class.php:279
-#: templates/structure/secondary_tabs.phtml:8
+#: templates/table/secondary_tabs.phtml:8
 msgid "Table structure"
 msgstr "Tablo yapısı"
 
@@ -8046,101 +8062,33 @@ msgstr "Microsoft Word 2000"
 msgid "OpenDocument Text"
 msgstr "OpenDocument Metni"
 
-#: libraries/controllers/StructureController.class.php:465
+#: libraries/controllers/DatabaseStructureController.class.php:405
 #: tbl_operations.php:382
 #, php-format
 msgid "Table %s has been emptied."
 msgstr "%s tablosu boşaltıldı."
 
-#: libraries/controllers/StructureController.class.php:486
+#: libraries/controllers/DatabaseStructureController.class.php:426
 #: tbl_operations.php:400 view_operations.php:119
 #, php-format
 msgid "View %s has been dropped."
 msgstr "%s görünümü kaldırıldı."
 
-#: libraries/controllers/StructureController.class.php:487
+#: libraries/controllers/DatabaseStructureController.class.php:427
 #: tbl_operations.php:401
 #, php-format
 msgid "Table %s has been dropped."
 msgstr "%s tablosu kaldırıldı."
 
-#: libraries/controllers/StructureController.class.php:797
-#, php-format
-msgid "The name '%s' is a MySQL reserved keyword."
-msgid_plural "The names '%s' are MySQL reserved keywords."
-msgstr[0] "'%s' adı MySQL'e ayrılmış anahtar kelimedir."
-msgstr[1] "'%s' adları MySQL'e ayrılmış anahtar kelimelerdir."
-
-#: libraries/controllers/StructureController.class.php:875
-msgid "No column selected."
-msgstr "Seçilen sütun yok."
-
-#: libraries/controllers/StructureController.class.php:1049
+#: libraries/controllers/DatabaseStructureController.class.php:733
 msgid "Favorite List is full!"
 msgstr "Sık Kullanılan Listesi dolu!"
 
-#: libraries/controllers/StructureController.class.php:1272
-msgid "The columns have been moved successfully."
-msgstr "Sütunlar başarılı olarak taşındı."
-
-#: libraries/controllers/StructureController.class.php:1535
-#, php-format
-msgid ""
-"Table %1$s has been altered successfully. Privileges have been adjusted."
-msgstr "%1$s tablosu başarılı olarak değiştirildi. Yetkiler ayarlandı."
-
-#: libraries/controllers/StructureController.class.php:1541
-#: libraries/controllers/TableIndexesController.class.php:161
-#: tbl_addfield.php:92
-#, php-format
-msgid "Table %1$s has been altered successfully."
-msgstr "%1$s tablosu başarılı olarak değiştirildi."
-
-#: libraries/controllers/StructureController.class.php:1588
-#: libraries/tracking.lib.php:1094
-msgid "Query error"
-msgstr "Sorgu hatası"
-
-#: libraries/controllers/StructureController.class.php:1806
+#: libraries/controllers/DatabaseStructureController.class.php:947
 #: libraries/mysql_charsets.lib.php:366 libraries/mysql_charsets.lib.php:373
 msgid "unknown"
 msgstr "bilinmiyor"
 
-#: libraries/controllers/StructureController.class.php:1957
-#: templates/structure/check_all_table_column.phtml:11
-msgid "Change"
-msgstr "Değiştir"
-
-#: libraries/controllers/StructureController.class.php:1961
-#: libraries/controllers/StructureController.class.php:1966
-#: libraries/navigation/Nodes/Node_Index.class.php:30
-#: libraries/tracking.lib.php:926
-#: templates/columns_definitions/column_indexes.phtml:16
-#: templates/columns_definitions/table_fields_definitions.phtml:57
-#: templates/structure/check_all_table_column.phtml:30
-#: templates/structure/display_structure.phtml:79
-#: templates/structure/display_table_stats.phtml:19
-msgid "Index"
-msgstr "Index"
-
-#: libraries/controllers/StructureController.class.php:1963
-#: libraries/controllers/StructureController.class.php:1968
-#: templates/columns_definitions/column_indexes.phtml:27
-#: templates/structure/check_all_table_column.phtml:37
-msgid "Spatial"
-msgstr "Uzaysal"
-
-#: libraries/controllers/StructureController.class.php:1964
-#: libraries/controllers/StructureController.class.php:1969
-#: templates/columns_definitions/column_indexes.phtml:22
-#: templates/structure/check_all_table_column.phtml:47
-msgid "Fulltext"
-msgstr "Tam metin"
-
-#: libraries/controllers/StructureController.class.php:1970
-msgid "Distinct values"
-msgstr "Belirgin değerler"
-
 #: libraries/controllers/TableChartController.class.php:82
 #: libraries/controllers/TableGisVisualizationController.class.php:101
 msgid "No SQL query was set to fetch data."
@@ -8154,11 +8102,18 @@ msgstr "Tabloda çizmek için sayısal sütunlar mevcut değil."
 msgid "No data to display"
 msgstr "Görüntülemek için veri yok"
 
-#: libraries/controllers/TableRelationController.class.php:217
+#: libraries/controllers/TableIndexesController.class.php:161
+#: libraries/controllers/TableStructureController.class.php:736
+#: tbl_addfield.php:92
+#, php-format
+msgid "Table %1$s has been altered successfully."
+msgstr "%1$s tablosu başarılı olarak değiştirildi."
+
+#: libraries/controllers/TableRelationController.class.php:218
 msgid "Display column was successfully updated."
 msgstr "Sütun görüntüleme başarılı olarak güncellendi."
 
-#: libraries/controllers/TableRelationController.class.php:283
+#: libraries/controllers/TableRelationController.class.php:288
 msgid "Internal relations were successfully updated."
 msgstr "İç bağlantılar başarılı olarak güncellendi."
 
@@ -8171,10 +8126,71 @@ msgid "Zoom search"
 msgstr "Odaklı arama"
 
 #: libraries/controllers/TableSearchController.class.php:852
-#: templates/table/selection_form.phtml:59
+#: templates/table/search/selection_form.phtml:59
 msgid "Find and replace"
 msgstr "Bul ve değiştir"
 
+#: libraries/controllers/TableStructureController.class.php:163
+#, php-format
+msgid "The name '%s' is a MySQL reserved keyword."
+msgid_plural "The names '%s' are MySQL reserved keywords."
+msgstr[0] "'%s' adı MySQL'e ayrılmış anahtar kelimedir."
+msgstr[1] "'%s' adları MySQL'e ayrılmış anahtar kelimelerdir."
+
+#: libraries/controllers/TableStructureController.class.php:241
+msgid "No column selected."
+msgstr "Seçilen sütun yok."
+
+#: libraries/controllers/TableStructureController.class.php:467
+msgid "The columns have been moved successfully."
+msgstr "Sütunlar başarılı olarak taşındı."
+
+#: libraries/controllers/TableStructureController.class.php:730
+#, php-format
+msgid ""
+"Table %1$s has been altered successfully. Privileges have been adjusted."
+msgstr "%1$s tablosu başarılı olarak değiştirildi. Yetkiler ayarlandı."
+
+#: libraries/controllers/TableStructureController.class.php:783
+#: libraries/tracking.lib.php:1094
+msgid "Query error"
+msgstr "Sorgu hatası"
+
+#: libraries/controllers/TableStructureController.class.php:948
+#: templates/table/structure/check_all_table_column.phtml:11
+msgid "Change"
+msgstr "Değiştir"
+
+#: libraries/controllers/TableStructureController.class.php:952
+#: libraries/controllers/TableStructureController.class.php:957
+#: libraries/navigation/Nodes/Node_Index.class.php:30
+#: libraries/tracking.lib.php:926
+#: templates/columns_definitions/column_indexes.phtml:16
+#: templates/columns_definitions/table_fields_definitions.phtml:57
+#: templates/table/structure/check_all_table_column.phtml:30
+#: templates/table/structure/display_structure.phtml:79
+#: templates/table/structure/display_table_stats.phtml:19
+msgid "Index"
+msgstr "Index"
+
+#: libraries/controllers/TableStructureController.class.php:954
+#: libraries/controllers/TableStructureController.class.php:959
+#: templates/columns_definitions/column_indexes.phtml:27
+#: templates/table/structure/check_all_table_column.phtml:37
+msgid "Spatial"
+msgstr "Uzaysal"
+
+#: libraries/controllers/TableStructureController.class.php:955
+#: libraries/controllers/TableStructureController.class.php:960
+#: templates/columns_definitions/column_indexes.phtml:22
+#: templates/table/structure/check_all_table_column.phtml:47
+msgid "Fulltext"
+msgstr "Tam metin"
+
+#: libraries/controllers/TableStructureController.class.php:963
+msgid "Distinct values"
+msgstr "Belirgin değerler"
+
 #: libraries/core.lib.php:306
 #, php-format
 msgid "The %s extension is missing. Please check your PHP configuration."
@@ -8221,7 +8237,7 @@ msgid "No Password"
 msgstr "Parola yok"
 
 #: libraries/display_change_password.lib.php:68
-#: libraries/plugins/auth/AuthenticationCookie.class.php:199
+#: libraries/plugins/auth/AuthenticationCookie.class.php:187
 #: libraries/replication_gui.lib.php:422 libraries/replication_gui.lib.php:862
 #: libraries/server_privileges.lib.php:1640
 msgid "Password:"
@@ -9015,12 +9031,12 @@ msgid "Dump has been saved to file %s."
 msgstr "Döküm, %s dosyasına kaydedildi."
 
 #: libraries/import.lib.php:202 libraries/insert_edit.lib.php:124
-#: libraries/rte/rte_routines.lib.php:1353 libraries/sql.lib.php:1312
+#: libraries/rte/rte_routines.lib.php:1444 libraries/sql.lib.php:1306
 #: tbl_get_field.php:44
 msgid "MySQL returned an empty result set (i.e. zero rows)."
 msgstr "MySQL boş bir sonuç kümesi döndürdü (yani sıfır satır)."
 
-#: libraries/import.lib.php:265 libraries/sql.lib.php:1326
+#: libraries/import.lib.php:265 libraries/sql.lib.php:1320
 msgid "[ROLLBACK occurred.]"
 msgstr "[ROLLBACK meydana geldi.]"
 
@@ -9088,14 +9104,14 @@ msgstr "&nbsp;%s&nbsp;sütunda indeks oluştur"
 
 #: libraries/insert_edit.lib.php:233
 #: libraries/navigation/Nodes/Node_DatabaseChild.class.php:48
-#: templates/designer/table_list.phtml:40
+#: templates/database/designer/table_list.phtml:40
 msgid "Hide"
 msgstr "Gizle"
 
 #: libraries/insert_edit.lib.php:249
 #: libraries/navigation/Nodes/Node_Function.class.php:32
-#: libraries/rte/rte_routines.lib.php:1495
-#: templates/table/table_header.phtml:4
+#: libraries/rte/rte_routines.lib.php:1586
+#: templates/table/search/table_header.phtml:4
 msgid "Function"
 msgstr "İşlev"
 
@@ -9108,84 +9124,85 @@ msgstr "İkili Değer"
 msgid "Because of its length,<br /> this column might not be editable."
 msgstr "Uzunluğu nedeniyle,<br /> bu sütun düzenlenebilir olmayabilir."
 
-#: libraries/insert_edit.lib.php:1050
+#: libraries/insert_edit.lib.php:1048
 msgid "Binary - do not edit"
 msgstr "İkili değer - düzenlemeyin"
 
-#: libraries/insert_edit.lib.php:1176 libraries/server_privileges.lib.php:470
-#: templates/table/options.phtml:36
+#: libraries/insert_edit.lib.php:1174 libraries/server_privileges.lib.php:470
+#: templates/table/search/options.phtml:36
 msgid "Or"
 msgstr "Veya"
 
-#: libraries/insert_edit.lib.php:1177
+#: libraries/insert_edit.lib.php:1175
 msgid "web server upload directory:"
 msgstr "web sunucusu gönderme dizini:"
 
-#: libraries/insert_edit.lib.php:1348 templates/table/input_box.phtml:49
+#: libraries/insert_edit.lib.php:1346
+#: templates/table/search/input_box.phtml:49
 msgid "Edit/Insert"
 msgstr "Düzenle/Ekle"
 
-#: libraries/insert_edit.lib.php:1398
+#: libraries/insert_edit.lib.php:1396
 #, php-format
 msgid "Continue insertion with %s rows"
 msgstr "%s satırla eklemeye devam et"
 
-#: libraries/insert_edit.lib.php:1428
+#: libraries/insert_edit.lib.php:1426
 msgid "and then"
 msgstr "ve ondan sonra"
 
-#: libraries/insert_edit.lib.php:1461
+#: libraries/insert_edit.lib.php:1459
 msgid "Insert as new row"
 msgstr "Yeni satır olarak ekle"
 
-#: libraries/insert_edit.lib.php:1464
+#: libraries/insert_edit.lib.php:1462
 msgid "Insert as new row and ignore errors"
 msgstr "Yeni satır olarak ekle ve hataları yoksay"
 
-#: libraries/insert_edit.lib.php:1467
+#: libraries/insert_edit.lib.php:1465
 msgid "Show insert query"
 msgstr "Ekleme sorgusunu göster"
 
-#: libraries/insert_edit.lib.php:1487
+#: libraries/insert_edit.lib.php:1485
 msgid "Go back to previous page"
 msgstr "Önceki sayfaya geri dön"
 
-#: libraries/insert_edit.lib.php:1490
+#: libraries/insert_edit.lib.php:1488
 msgid "Insert another new row"
 msgstr "Yeni başka bir satır ekle"
 
-#: libraries/insert_edit.lib.php:1495
+#: libraries/insert_edit.lib.php:1493
 msgid "Go back to this page"
 msgstr "Bu sayfaya geri dön"
 
-#: libraries/insert_edit.lib.php:1518
+#: libraries/insert_edit.lib.php:1516
 msgid "Edit next row"
 msgstr "Sonraki satırı düzenle"
 
-#: libraries/insert_edit.lib.php:1540
+#: libraries/insert_edit.lib.php:1538
 msgid ""
 "Use TAB key to move from value to value, or CTRL+arrows to move anywhere"
 msgstr ""
 "Değerden değere geçmek için TAB tuşunu veya herhangi bir yere gitmek için "
 "CTRL+OK TUŞLARI'nı kullanın"
 
-#: libraries/insert_edit.lib.php:1577 libraries/replication_gui.lib.php:542
-#: libraries/rte/rte_routines.lib.php:1497
+#: libraries/insert_edit.lib.php:1575 libraries/replication_gui.lib.php:542
+#: libraries/rte/rte_routines.lib.php:1588
 #: libraries/server_status_variables.lib.php:220
-#: templates/designer/having_query_panel.phtml:100
-#: templates/designer/options_panel.phtml:73
-#: templates/designer/options_panel.phtml:239
-#: templates/designer/where_query_panel.phtml:69
-#: templates/table/table_header.phtml:10
-#: templates/table/zoom_result_form.phtml:35
+#: templates/database/designer/having_query_panel.phtml:100
+#: templates/database/designer/options_panel.phtml:73
+#: templates/database/designer/options_panel.phtml:239
+#: templates/database/designer/where_query_panel.phtml:69
+#: templates/table/search/table_header.phtml:10
+#: templates/table/search/zoom_result_form.phtml:35
 msgid "Value"
 msgstr "Değer"
 
-#: libraries/insert_edit.lib.php:1937 libraries/sql.lib.php:1309
+#: libraries/insert_edit.lib.php:1935 libraries/sql.lib.php:1303
 msgid "Showing SQL query"
 msgstr "SQL sorgusu gösteriliyor"
 
-#: libraries/insert_edit.lib.php:1962 libraries/sql.lib.php:1287
+#: libraries/insert_edit.lib.php:1960 libraries/sql.lib.php:1281
 #, php-format
 msgid "Inserted row id: %1$d"
 msgstr "Eklenen satır id: %1$d"
@@ -9594,7 +9611,7 @@ msgstr "Yeni"
 #: libraries/navigation/Nodes/Node_View_Container.class.php:26
 #: libraries/navigation/Nodes/Node_View_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:129
-#: templates/structure/show_create.phtml:30
+#: templates/database/structure/show_create.phtml:30
 msgid "Views"
 msgstr "Görünümler"
 
@@ -9926,7 +9943,7 @@ msgstr ""
 
 #: libraries/operations.lib.php:101 libraries/operations.lib.php:249
 #: libraries/operations.lib.php:869 libraries/operations.lib.php:963
-#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:907
+#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:998
 #: templates/columns_definitions/table_fields_definitions.phtml:47
 msgid "Adjust Privileges"
 msgstr "Yetkileri Ayarla"
@@ -10016,22 +10033,22 @@ msgid "Switch to copied table"
 msgstr "Kopyalanmış tabloya geç"
 
 #: libraries/operations.lib.php:1360
-#: templates/structure/check_all_tables.phtml:18
+#: templates/database/structure/check_all_tables.phtml:18
 msgid "Table maintenance"
 msgstr "Tablo bakımı"
 
 #: libraries/operations.lib.php:1398
-#: templates/structure/check_all_tables.phtml:19
+#: templates/database/structure/check_all_tables.phtml:19
 msgid "Analyze table"
 msgstr "Tabloyu çözümle"
 
 #: libraries/operations.lib.php:1413
-#: templates/structure/check_all_tables.phtml:20
+#: templates/database/structure/check_all_tables.phtml:20
 msgid "Check table"
 msgstr "Tabloyu kontrol et"
 
 #: libraries/operations.lib.php:1428
-#: templates/structure/check_all_tables.phtml:22
+#: templates/database/structure/check_all_tables.phtml:22
 msgid "Checksum table"
 msgstr "Sağlama tablosu"
 
@@ -10049,18 +10066,19 @@ msgid "Flush the table (FLUSH)"
 msgstr "Tabloyu temizle (FLUSH)"
 
 #: libraries/operations.lib.php:1477
-#: templates/structure/check_all_tables.phtml:23
-#: templates/structure/display_table_stats.phtml:56
+#: templates/database/structure/check_all_tables.phtml:23
+#: templates/table/structure/display_table_stats.phtml:56
 msgid "Optimize table"
 msgstr "Tabloyu uyarla"
 
 #: libraries/operations.lib.php:1492
-#: templates/structure/check_all_tables.phtml:24
+#: templates/database/structure/check_all_tables.phtml:24
 msgid "Repair table"
 msgstr "Tabloyu onar"
 
 #: libraries/operations.lib.php:1538
-#: templates/structure/check_all_tables.phtml:14 view_operations.php:127
+#: templates/database/structure/check_all_tables.phtml:14
+#: view_operations.php:127
 msgid "Delete data or table"
 msgstr "Tabloyu veya veriyi sil"
 
@@ -10183,7 +10201,7 @@ msgid "Cannot connect: invalid settings."
 msgstr "Bağlanamıyor: geçersiz ayarlar."
 
 #: libraries/plugins/auth/AuthenticationConfig.class.php:108
-#: libraries/plugins/auth/AuthenticationCookie.class.php:134
+#: libraries/plugins/auth/AuthenticationCookie.class.php:122
 #: libraries/plugins/auth/AuthenticationHttp.class.php:96
 #, php-format
 msgid "Welcome to %s"
@@ -10214,38 +10232,38 @@ msgstr ""
 msgid "Retry to connect"
 msgstr "Bağlanmayı yeniden dene"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:146
+#: libraries/plugins/auth/AuthenticationCookie.class.php:134
 msgid "Your session has expired. Please log in again."
 msgstr "Oturumunuzun süresi doldu. Lütfen tekrar oturum açın."
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:170
+#: libraries/plugins/auth/AuthenticationCookie.class.php:158
 msgid "Log in"
 msgstr "Oturum aç"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:178
-#: libraries/plugins/auth/AuthenticationCookie.class.php:188
+#: libraries/plugins/auth/AuthenticationCookie.class.php:166
+#: libraries/plugins/auth/AuthenticationCookie.class.php:176
 msgid "You can enter hostname/IP address and port separated by space."
 msgstr ""
 "Anamakine adı/IP adresi ve bağlantı noktasını boşluk bırakarak ayrı "
 "girebilirsiniz."
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:193
+#: libraries/plugins/auth/AuthenticationCookie.class.php:181
 msgid "Username:"
 msgstr "Kullanıcı Adı:"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:205
+#: libraries/plugins/auth/AuthenticationCookie.class.php:193
 msgid "Server Choice:"
 msgstr "Sunucu Seçimi:"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:386
+#: libraries/plugins/auth/AuthenticationCookie.class.php:374
 msgid "Entered captcha is wrong, try again!"
 msgstr "Girilen captcha yanlış, tekrar deneyin!"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:396
+#: libraries/plugins/auth/AuthenticationCookie.class.php:384
 msgid "Please enter correct captcha!"
 msgstr "Lütfen doğru captcha'yı girin!"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:423
+#: libraries/plugins/auth/AuthenticationCookie.class.php:411
 msgid "You are not allowed to log in to this MySQL server!"
 msgstr "Bu MySQL sunucusuna oturum açmanıza izin verilmiyor!"
 
@@ -10341,7 +10359,7 @@ msgstr "Olay"
 #: libraries/plugins/export/ExportOdt.class.php:593
 #: libraries/plugins/export/ExportTexytext.class.php:428
 #: libraries/plugins/export/PMA_ExportPdf.class.php:313
-#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:984
 #: libraries/rte/rte_triggers.lib.php:377
 msgid "Definition"
 msgstr "Tanım"
@@ -10662,7 +10680,7 @@ msgid "Last check:"
 msgstr "Son kontrol:"
 
 #: libraries/plugins/export/ExportSql.class.php:1399
-#: templates/structure/structure_table_row.phtml:183
+#: templates/database/structure/structure_table_row.phtml:183
 msgid "in use"
 msgstr "kullanımda"
 
@@ -10855,18 +10873,14 @@ msgstr "MySQL Uzaysal Uzantısı ESRI türü \"%s\" desteklemiyor."
 msgid "The imported file does not contain any data!"
 msgstr "İçe aktarılan dosya herhangi bir veri içermiyor!"
 
-#: libraries/plugins/import/ImportSql.class.php:169
+#: libraries/plugins/import/ImportSql.class.php:72
 msgid "SQL compatibility mode:"
 msgstr "SQL uyumluluk kipi:"
 
-#: libraries/plugins/import/ImportSql.class.php:181
+#: libraries/plugins/import/ImportSql.class.php:84
 msgid "Do not use <code>AUTO_INCREMENT</code> for zero values"
 msgstr "Sıfır değerleri için <code>AUTO_INCREMENT</code> değeri kullanma"
 
-#: libraries/plugins/import/ImportSql.class.php:195
-msgid "Read as multibytes"
-msgstr "Çoklu bayt olarak oku"
-
 #: libraries/plugins/import/ImportXml.class.php:54
 msgid "XML"
 msgstr "XML"
@@ -10909,7 +10923,7 @@ msgid "Show grid"
 msgstr "Kılavuzu göster"
 
 #: libraries/plugins/schema/SchemaPdf.class.php:94
-#: templates/structure/print_view_data_dictionary_link.phtml:6
+#: templates/database/structure/print_view_data_dictionary_link.phtml:6
 msgid "Data Dictionary"
 msgstr "Veri sözlüğü"
 
@@ -10934,7 +10948,7 @@ msgid "The %s table doesn't exist!"
 msgstr "%s tablosu yok!"
 
 #: libraries/plugins/schema/eps/Eps_Relation_Schema.class.php:321
-#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:309
+#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:323
 #, php-format
 msgid "Schema of the %s database - Page %s"
 msgstr "%s veritabanının şeması - Sayfa %s"
@@ -10960,7 +10974,7 @@ msgstr "İçerik tablosu"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1005
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1028
 #: libraries/tracking.lib.php:884
-#: templates/structure/table_structure_header.phtml:11
+#: templates/table/structure/table_structure_header.phtml:11
 msgid "Extra"
 msgstr "Ekstra"
 
@@ -11323,11 +11337,11 @@ msgstr "Gelişmiş özellikleri ayarlamak için hızlı adımlar:"
 msgid "Create the needed tables with the <code>%screate_tables.sql</code>."
 msgstr "Gerekli tabloları <code>%screate_tables.sql</code> ile oluşturun."
 
-#: libraries/relation.lib.php:360
+#: libraries/relation.lib.php:357
 msgid "Create a pma user and give access to these tables."
 msgstr "Pma kullanıcısı oluşturun ve bu tablolara erişim verin."
 
-#: libraries/relation.lib.php:365
+#: libraries/relation.lib.php:360
 msgid ""
 "Enable advanced features in configuration file (<code>config.inc.php</"
 "code>), for example by starting from <code>config.sample.inc.php</code>."
@@ -11336,17 +11350,17 @@ msgstr ""
 "etkinleştirin, örneğin <code>config.sample.inc.php</code> dosyasından "
 "başlayarak."
 
-#: libraries/relation.lib.php:373
+#: libraries/relation.lib.php:365
 msgid "Re-login to phpMyAdmin to load the updated configuration file."
 msgstr ""
 "Güncellenmiş yapılandırma dosyasını yüklemek için phpMyAdmin'e yeniden "
 "oturum açın."
 
-#: libraries/relation.lib.php:1612
+#: libraries/relation.lib.php:1607
 msgid "no description"
 msgstr "Açıklama yok"
 
-#: libraries/relation.lib.php:1811
+#: libraries/relation.lib.php:1806
 msgid ""
 "You do not have necessary privileges to create a database named "
 "'phpmyadmin'. You may go to 'Operations' tab of any database to set up the "
@@ -11356,7 +11370,7 @@ msgstr ""
 "değilsiniz. phpMyAdmin yapılandırma depolamasını ayarlamak için herhangi bir "
 "veritabanının 'İşlemler' sekmesine gidebilirsiniz."
 
-#: libraries/relation.lib.php:1928
+#: libraries/relation.lib.php:1923
 #, php-format
 msgid ""
 "%sCreate%s a database named 'phpmyadmin' and setup the phpMyAdmin "
@@ -11365,20 +11379,20 @@ msgstr ""
 "Önce 'phpmyadmin' adında bir veritabanı %soluşturun%s ve orada phpMyAdmin "
 "yapılandırma depolama tablolarını ayarlayın."
 
-#: libraries/relation.lib.php:1936
+#: libraries/relation.lib.php:1931
 #, php-format
 msgid ""
 "%sCreate%s the phpMyAdmin configuration storage in the current database."
 msgstr ""
 "Şu anki veritabanında phpMyAdmin yapılandırma depolaması %soluşturun%s."
 
-#: libraries/relation.lib.php:1944
+#: libraries/relation.lib.php:1939
 #, php-format
 msgid "%sCreate%s missing phpMyAdmin configuration storage tables."
 msgstr "Eksik phpMyAdmin yapılandırma depolama tablolarını %soluşturun%s."
 
 #: libraries/replication_gui.lib.php:46 libraries/replication_gui.lib.php:343
-#: libraries/server_databases.lib.php:387
+#: libraries/server_databases.lib.php:398
 msgid "Master replication"
 msgstr "Master kopya etme"
 
@@ -11445,7 +11459,7 @@ msgstr ""
 "gösteren, sizi uyaran bir mesaj görmelisiniz."
 
 #: libraries/replication_gui.lib.php:141
-#: libraries/server_databases.lib.php:389
+#: libraries/server_databases.lib.php:400
 msgid "Slave replication"
 msgstr "Slave kopya etme"
 
@@ -11718,10 +11732,10 @@ msgid "Master server changed successfully to %s."
 msgstr "Master sunucu %s olarak başarılı bir şekilde değiştirildi."
 
 #: libraries/rte/rte_events.lib.php:106 libraries/rte/rte_events.lib.php:115
-#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:149
-#: libraries/rte/rte_routines.lib.php:158
-#: libraries/rte/rte_routines.lib.php:231
-#: libraries/rte/rte_routines.lib.php:1362
+#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:219
+#: libraries/rte/rte_routines.lib.php:246
+#: libraries/rte/rte_routines.lib.php:368
+#: libraries/rte/rte_routines.lib.php:1453
 #: libraries/rte/rte_triggers.lib.php:82 libraries/rte/rte_triggers.lib.php:91
 #: libraries/rte/rte_triggers.lib.php:123
 #, php-format
@@ -11742,7 +11756,7 @@ msgstr "Olay %1$s değiştirildi."
 msgid "Event %1$s has been created."
 msgstr "Olay %1$s oluşturuldu."
 
-#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:251
+#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:266
 #: libraries/rte/rte_triggers.lib.php:144
 msgid "One or more errors have occurred while processing your request:"
 msgstr "İsteğiniz işlenirken bir ya da daha fazla hata meydana geldi:"
@@ -11751,7 +11765,7 @@ msgstr "İsteğiniz işlenirken bir ya da daha fazla hata meydana geldi:"
 msgid "Edit event"
 msgstr "Olay düzenle"
 
-#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:794
+#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:885
 #: libraries/rte/rte_triggers.lib.php:323 view_create.php:180
 msgid "Details"
 msgstr "Ayrıntılar"
@@ -11764,7 +11778,7 @@ msgstr "Olay adı"
 msgid "Event type"
 msgstr "Olay türü"
 
-#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:817
+#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:908
 #, php-format
 msgid "Change to %s"
 msgstr "%s'a değiştir"
@@ -11791,12 +11805,14 @@ msgstr "Bitiş"
 msgid "On completion preserve"
 msgstr "Tamamlamada koruma"
 
-#: libraries/rte/rte_events.lib.php:491 libraries/rte/rte_routines.lib.php:930
+#: libraries/rte/rte_events.lib.php:491
+#: libraries/rte/rte_routines.lib.php:1021
 #: libraries/rte/rte_triggers.lib.php:383 view_create.php:209
 msgid "Definer"
 msgstr "Tanımlayıcı"
 
-#: libraries/rte/rte_events.lib.php:535 libraries/rte/rte_routines.lib.php:997
+#: libraries/rte/rte_events.lib.php:535
+#: libraries/rte/rte_routines.lib.php:1088
 #: libraries/rte/rte_triggers.lib.php:422
 msgid "The definer must be in the \"username@hostname\" format!"
 msgstr "Tanımlayıcı \"kullanıcıadı@anamakineadı\" biçiminde olmak zorundadır!"
@@ -11822,9 +11838,9 @@ msgid "You must provide an event definition."
 msgstr "Bir olay tanımı vermek zorundasınız."
 
 #: libraries/rte/rte_export.lib.php:43 libraries/rte/rte_general.lib.php:72
-#: libraries/rte/rte_routines.lib.php:345
-#: libraries/rte/rte_routines.lib.php:1198
-#: libraries/rte/rte_routines.lib.php:1411
+#: libraries/rte/rte_routines.lib.php:153
+#: libraries/rte/rte_routines.lib.php:1289
+#: libraries/rte/rte_routines.lib.php:1502
 msgid "Error in processing request:"
 msgstr "İstek işlemede hata:"
 
@@ -11860,72 +11876,72 @@ msgstr ""
 "başarısız olabilir![/strong] Lütfen herhangi bir sorundan kaçınmak için "
 "gelişmiş 'mysqli' uzantısı kullanın."
 
-#: libraries/rte/rte_routines.lib.php:110
-#: libraries/rte/rte_routines.lib.php:1006
+#: libraries/rte/rte_routines.lib.php:123
+msgid "Edit routine"
+msgstr "Yordamı düzenle"
+
+#: libraries/rte/rte_routines.lib.php:200
+#: libraries/rte/rte_routines.lib.php:1097
 #, php-format
 msgid "Invalid routine type: \"%s\""
 msgstr "Geçersiz yordam türü: \"%s\""
 
-#: libraries/rte/rte_routines.lib.php:170
-msgid "Sorry, we failed to restore the dropped routine."
-msgstr "Üzgünüm, kaldırılmış yordamı geri yükleme başarısız oldu."
-
-#: libraries/rte/rte_routines.lib.php:211
-#, php-format
-msgid "Routine %1$s has been modified. Privileges have been adjusted."
-msgstr "Yordam %1$s değiştirildi. Yetkiler ayarlandı."
-
-#: libraries/rte/rte_routines.lib.php:216
-#, php-format
-msgid "Routine %1$s has been modified."
-msgstr "Yordam %1$s değiştirildi."
-
-#: libraries/rte/rte_routines.lib.php:238
+#: libraries/rte/rte_routines.lib.php:253
 #, php-format
 msgid "Routine %1$s has been created."
 msgstr "Yordam %1$s oluşturuldu."
 
-#: libraries/rte/rte_routines.lib.php:315
-msgid "Edit routine"
-msgstr "Yordamı düzenle"
+#: libraries/rte/rte_routines.lib.php:380
+msgid "Sorry, we failed to restore the dropped routine."
+msgstr "Üzgünüm, kaldırılmış yordamı geri yükleme başarısız oldu."
 
-#: libraries/rte/rte_routines.lib.php:797
+#: libraries/rte/rte_routines.lib.php:439
+#, php-format
+msgid "Routine %1$s has been modified. Privileges have been adjusted."
+msgstr "Yordam %1$s değiştirildi. Yetkiler ayarlandı."
+
+#: libraries/rte/rte_routines.lib.php:444
+#, php-format
+msgid "Routine %1$s has been modified."
+msgstr "Yordam %1$s değiştirildi."
+
+#: libraries/rte/rte_routines.lib.php:888
 msgid "Routine name"
 msgstr "Yordam adı"
 
-#: libraries/rte/rte_routines.lib.php:823
+#: libraries/rte/rte_routines.lib.php:914
 msgid "Parameters"
 msgstr "Parametreler"
 
-#: libraries/rte/rte_routines.lib.php:829
+#: libraries/rte/rte_routines.lib.php:920
 msgid "Direction"
 msgstr "Yön"
 
-#: libraries/rte/rte_routines.lib.php:847
+#: libraries/rte/rte_routines.lib.php:938
 msgid "Add parameter"
 msgstr "Parametre ekle"
 
-#: libraries/rte/rte_routines.lib.php:851
+#: libraries/rte/rte_routines.lib.php:942
 msgid "Remove last parameter"
 msgstr "Son parametreyi kaldır"
 
-#: libraries/rte/rte_routines.lib.php:856
+#: libraries/rte/rte_routines.lib.php:947
 msgid "Return type"
 msgstr "Dönüş türü"
 
-#: libraries/rte/rte_routines.lib.php:862
+#: libraries/rte/rte_routines.lib.php:953
 msgid "Return length/values"
 msgstr "Dönüş uzunluğu/değerleri"
 
-#: libraries/rte/rte_routines.lib.php:868
+#: libraries/rte/rte_routines.lib.php:959
 msgid "Return options"
 msgstr "Dönüş seçenekleri"
 
-#: libraries/rte/rte_routines.lib.php:899
+#: libraries/rte/rte_routines.lib.php:990
 msgid "Is deterministic"
 msgstr "Belirleyici"
 
-#: libraries/rte/rte_routines.lib.php:920
+#: libraries/rte/rte_routines.lib.php:1011
 msgid ""
 "You do not have sufficient privileges to perform this operation; Please "
 "refer to the documentation for more details"
@@ -11933,25 +11949,25 @@ msgstr ""
 "Bu işlemi yapmak için yeterli yetkilere sahip değilsiniz; Lütfen daha fazla "
 "ayrıntı için belgelere bakın"
 
-#: libraries/rte/rte_routines.lib.php:935
+#: libraries/rte/rte_routines.lib.php:1026
 msgid "Security type"
 msgstr "Güvenlik türü"
 
-#: libraries/rte/rte_routines.lib.php:944
+#: libraries/rte/rte_routines.lib.php:1035
 msgid "SQL data access"
 msgstr "SQL veri erişimi"
 
-#: libraries/rte/rte_routines.lib.php:1013
+#: libraries/rte/rte_routines.lib.php:1104
 msgid "You must provide a routine name!"
 msgstr "Bir yordam adı vermek zorundasınız!"
 
-#: libraries/rte/rte_routines.lib.php:1047
+#: libraries/rte/rte_routines.lib.php:1138
 #, php-format
 msgid "Invalid direction \"%s\" given for parameter."
 msgstr "Parametre için geçersiz yön \"%s\" verilmiş."
 
-#: libraries/rte/rte_routines.lib.php:1069
-#: libraries/rte/rte_routines.lib.php:1131
+#: libraries/rte/rte_routines.lib.php:1160
+#: libraries/rte/rte_routines.lib.php:1222
 msgid ""
 "You must provide length/values for routine parameters of type ENUM, SET, "
 "VARCHAR and VARBINARY."
@@ -11959,37 +11975,37 @@ msgstr ""
 "ENUM, SET, VARCHAR ve VARBINARY türünün yordam parametreleri için uzunluk/"
 "değerler vermek zorundasınız."
 
-#: libraries/rte/rte_routines.lib.php:1095
+#: libraries/rte/rte_routines.lib.php:1186
 msgid "You must provide a name and a type for each routine parameter."
 msgstr "Her yordam parametresi için bir ad ve bir tür vermek zorundasınız."
 
-#: libraries/rte/rte_routines.lib.php:1114
+#: libraries/rte/rte_routines.lib.php:1205
 msgid "You must provide a valid return type for the routine."
 msgstr "Yordam için geçerli bir dönüş türü vermek zorundasınız."
 
-#: libraries/rte/rte_routines.lib.php:1174
+#: libraries/rte/rte_routines.lib.php:1265
 msgid "You must provide a routine definition."
 msgstr "Bir yordam tanımı vermek zorundasınız."
 
-#: libraries/rte/rte_routines.lib.php:1285
+#: libraries/rte/rte_routines.lib.php:1376
 #, php-format
 msgid "Execution results of routine %s"
 msgstr "%s yordamı yürütme sonuçları"
 
-#: libraries/rte/rte_routines.lib.php:1340
+#: libraries/rte/rte_routines.lib.php:1431
 #, php-format
 msgid "%d row affected by the last statement inside the procedure."
 msgid_plural "%d rows affected by the last statement inside the procedure."
 msgstr[0] "İşlemin içindeki son ifade tarafından %d satır etkilendi."
 msgstr[1] "İşlemin içindeki son ifade tarafından %d satır etkilendi."
 
-#: libraries/rte/rte_routines.lib.php:1398
-#: libraries/rte/rte_routines.lib.php:1406
+#: libraries/rte/rte_routines.lib.php:1489
+#: libraries/rte/rte_routines.lib.php:1497
 msgid "Execute routine"
 msgstr "Yordamı çalıştır"
 
-#: libraries/rte/rte_routines.lib.php:1485
-#: libraries/rte/rte_routines.lib.php:1488
+#: libraries/rte/rte_routines.lib.php:1576
+#: libraries/rte/rte_routines.lib.php:1579
 msgid "Routine parameters"
 msgstr "Yordam parametreleri"
 
@@ -12143,7 +12159,7 @@ msgid "Original position"
 msgstr "Orijinal konum"
 
 #: libraries/server_bin_log.lib.php:133
-#: templates/structure/display_table_stats.phtml:4
+#: templates/table/structure/display_table_stats.phtml:4
 msgid "Information"
 msgstr "Bilgi"
 
@@ -12181,12 +12197,12 @@ msgstr ""
 "Not: Buradaki veritabanı istatistiklerini etkinleştirmek web sunucusu ile "
 "MySQL sunucusu arasında yüksek trafiğe yol açabilir."
 
-#: libraries/server_databases.lib.php:364
-#: libraries/server_databases.lib.php:365
+#: libraries/server_databases.lib.php:366
+#: libraries/server_databases.lib.php:371
 msgid "Enable Statistics"
 msgstr "İstatistikleri etkinleştir"
 
-#: libraries/server_databases.lib.php:481
+#: libraries/server_databases.lib.php:492
 #, php-format
 msgid "%1$d database has been dropped successfully."
 msgid_plural "%1$d databases have been dropped successfully."
@@ -12558,7 +12574,7 @@ msgid "You have revoked the privileges for %s."
 msgstr "%s için yetkileri geri aldınız."
 
 #: libraries/server_privileges.lib.php:2059
-#: libraries/server_privileges.lib.php:4290
+#: libraries/server_privileges.lib.php:4316
 msgid "Add user account"
 msgstr "Kullanıcı hesabı ekle"
 
@@ -12722,36 +12738,36 @@ msgstr "%s siliniyor"
 msgid "The privileges were reloaded successfully."
 msgstr "Yetkiler başarılı olarak yüklendi."
 
-#: libraries/server_privileges.lib.php:3994
+#: libraries/server_privileges.lib.php:4003
 #, php-format
 msgid "The user %s already exists!"
 msgstr "%s kullanıcısı zaten var!"
 
-#: libraries/server_privileges.lib.php:4232
+#: libraries/server_privileges.lib.php:4258
 #, php-format
 msgid "Privileges for %s"
 msgstr "%s için yetkiler"
 
-#: libraries/server_privileges.lib.php:4241
+#: libraries/server_privileges.lib.php:4267
 #: libraries/server_status_processes.lib.php:72
 #: libraries/server_user_groups.lib.php:39
 msgid "User"
 msgstr "Kullanıcı"
 
-#: libraries/server_privileges.lib.php:4282
+#: libraries/server_privileges.lib.php:4308
 msgctxt "Create new user"
 msgid "New"
 msgstr "Yeni"
 
-#: libraries/server_privileges.lib.php:4311
+#: libraries/server_privileges.lib.php:4337
 msgid "Edit privileges:"
 msgstr "Yetkileri düzenle:"
 
-#: libraries/server_privileges.lib.php:4312
+#: libraries/server_privileges.lib.php:4338
 msgid "User account"
 msgstr "Kullanıcı hesabı"
 
-#: libraries/server_privileges.lib.php:4371
+#: libraries/server_privileges.lib.php:4397
 msgid ""
 "Note: You are attempting to edit privileges of the user with which you are "
 "currently logged in."
@@ -12759,11 +12775,11 @@ msgstr ""
 "Not: Şu anda oturum açtığınız kullanıcının yetkilerini düzenlemeye "
 "çalışıyorsunuz."
 
-#: libraries/server_privileges.lib.php:4391 libraries/server_users.lib.php:25
+#: libraries/server_privileges.lib.php:4417 libraries/server_users.lib.php:25
 msgid "User accounts overview"
 msgstr "Kullanıcı hesaplarına genel bakış"
 
-#: libraries/server_privileges.lib.php:4459
+#: libraries/server_privileges.lib.php:4485
 msgid ""
 "A user account allowing any user from localhost to connect is present. This "
 "will prevent other users from connecting if the host part of their account "
@@ -12774,7 +12790,7 @@ msgstr ""
 "herhangi bir (%) anamakineden bir bağlantıya izin veriyorsa bu "
 "kullanıcıların bağlanmalarını önler."
 
-#: libraries/server_privileges.lib.php:4500
+#: libraries/server_privileges.lib.php:4526
 #, php-format
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
@@ -12787,7 +12803,7 @@ msgstr ""
 "sunucunun kullandığı yetkilerden farklı olabilir. Bu durumda devam etmeden "
 "önce %syetkileri yeniden yüklemeniz%s gerekir."
 
-#: libraries/server_privileges.lib.php:4519
+#: libraries/server_privileges.lib.php:4545
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
 "tables. The content of these tables may differ from the privileges the "
@@ -12801,25 +12817,25 @@ msgstr ""
 "yeniden yüklenmek zorundadır ancak şu anda, yetkileri YENİDEN YÜKLEMENİZ "
 "gerekmez."
 
-#: libraries/server_privileges.lib.php:4569
+#: libraries/server_privileges.lib.php:4595
 msgid "The selected user was not found in the privilege table."
 msgstr "Seçilen kullanıcı yetki tablosunda bulunamadı."
 
-#: libraries/server_privileges.lib.php:4801
+#: libraries/server_privileges.lib.php:4827
 msgid "You have added a new user."
 msgstr "Yeni bir kullanıcı eklediniz."
 
-#: libraries/server_status.lib.php:53
+#: libraries/server_status.lib.php:60
 #, php-format
 msgid "Network traffic since startup: %s"
 msgstr "Başlangıçtan bu yana ağ trafiği: %s"
 
-#: libraries/server_status.lib.php:66
+#: libraries/server_status.lib.php:73
 #, php-format
 msgid "This MySQL server has been running for %1$s. It started up on %2$s."
 msgstr "Bu MySQL sunucusunun çalışma süresi: %1$s. Başlatıldığı zaman: %2$s."
 
-#: libraries/server_status.lib.php:80
+#: libraries/server_status.lib.php:94
 msgid ""
 "This MySQL server works as <b>master</b> and <b>slave</b> in <b>replication</"
 "b> process."
@@ -12827,23 +12843,23 @@ msgstr ""
 "Bu MySQL sunucusu <b>kopya etme</b> işlemi sırasında <b>master</b> ve "
 "<b>slave</b> olarak çalışır."
 
-#: libraries/server_status.lib.php:85
+#: libraries/server_status.lib.php:99
 msgid "This MySQL server works as <b>master</b> in <b>replication</b> process."
 msgstr ""
 "Bu MySQL sunucusu <b>kopya etme</b> işlemi sırasında <b>master</b> olarak "
 "çalışır."
 
-#: libraries/server_status.lib.php:90
+#: libraries/server_status.lib.php:104
 msgid "This MySQL server works as <b>slave</b> in <b>replication</b> process."
 msgstr ""
 "Bu MySQL sunucusu <b>kopya etme</b> işlemi sırasında <b>slave</b> olarak "
 "çalışır."
 
-#: libraries/server_status.lib.php:106
+#: libraries/server_status.lib.php:116
 msgid "Replication status"
 msgstr "Kopya etme durumu"
 
-#: libraries/server_status.lib.php:137
+#: libraries/server_status.lib.php:146
 msgid ""
 "On a busy server, the byte counters may overrun, so those statistics as "
 "reported by the MySQL server may be incorrect."
@@ -12851,19 +12867,19 @@ msgstr ""
 "Meşgul sunucu üzerinde, bayt sayaçları aşırı işleyebilir, bu yüzden MySQL "
 "sunucusu tarafından raporlanan istatistikler doğru olmayabilir."
 
-#: libraries/server_status.lib.php:148
+#: libraries/server_status.lib.php:157
 msgid "Received"
 msgstr "Alınan"
 
-#: libraries/server_status.lib.php:167
+#: libraries/server_status.lib.php:176
 msgid "Sent"
 msgstr "Gönderilen"
 
-#: libraries/server_status.lib.php:234
+#: libraries/server_status.lib.php:243
 msgid "Max. concurrent connections"
 msgstr "En fazla eşzamanlı bağlantı"
 
-#: libraries/server_status.lib.php:244
+#: libraries/server_status.lib.php:253
 msgid "Failed attempts"
 msgstr "Başarısız deneme"
 
@@ -13938,7 +13954,7 @@ msgstr "Bu, salt okunur bir değişkendir ve düzenlenemez"
 msgid "Not implemented yet."
 msgstr "Henüz uygulanmadı."
 
-#: libraries/sql-parser/src/Components/AlterOperation.php:193
+#: libraries/sql-parser/src/Components/AlterOperation.php:191
 msgid "Unrecognized alter operation."
 msgstr "Kategorilenmemiş değiştirme işlemi."
 
@@ -13952,7 +13968,7 @@ msgid "An opening bracket followed by a set of values was expected."
 msgstr "Açık bir köşeli parantez ardından bir grup değer beklendi."
 
 #: libraries/sql-parser/src/Components/ArrayObj.php:101
-#: libraries/sql-parser/src/Components/FieldDefinition.php:202
+#: libraries/sql-parser/src/Components/CreateDefinition.php:202
 msgid "An opening bracket was expected."
 msgstr "Açık bir köşeli parantez beklendi."
 
@@ -13960,25 +13976,33 @@ msgstr "Açık bir köşeli parantez beklendi."
 msgid "A comma or a closing bracket was expected"
 msgstr "Bir virgül ya da kapalı bir köşeli parantez beklendi"
 
+#: libraries/sql-parser/src/Components/CreateDefinition.php:246
+msgid "A comma or a closing bracket was expected."
+msgstr "Bir virgül ya da kapalı bir köşeli parantez beklendi."
+
+#: libraries/sql-parser/src/Components/CreateDefinition.php:262
+msgid "A closing bracket was expected."
+msgstr "Kapalı bir köşeli parantez beklendi."
+
 #: libraries/sql-parser/src/Components/DataType.php:125
 msgid "Unrecognized data type."
 msgstr "Tanınmayan veri türü."
 
-#: libraries/sql-parser/src/Components/Expression.php:225
+#: libraries/sql-parser/src/Components/Expression.php:227
 msgid "Unexpected closing bracket."
 msgstr "Beklenmedik kapalı köşeli parantez."
 
-#: libraries/sql-parser/src/Components/Expression.php:246
-#: libraries/sql-parser/src/Components/Expression.php:283
-#: libraries/sql-parser/src/Components/Expression.php:303
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:285
+#: libraries/sql-parser/src/Components/Expression.php:305
 msgid "An alias was previously found."
 msgstr "Bir kodadı daha önce bulundu."
 
-#: libraries/sql-parser/src/Components/Expression.php:257
+#: libraries/sql-parser/src/Components/Expression.php:259
 msgid "Unexpected dot."
 msgstr "Beklenmedik nokta."
 
-#: libraries/sql-parser/src/Components/Expression.php:327
+#: libraries/sql-parser/src/Components/Expression.php:329
 msgid "An alias was expected."
 msgstr "Bir kodadı beklendi."
 
@@ -13986,14 +14010,6 @@ msgstr "Bir kodadı beklendi."
 msgid "An expression was expected."
 msgstr "Bir ifade beklendi."
 
-#: libraries/sql-parser/src/Components/FieldDefinition.php:246
-msgid "A comma or a closing bracket was expected."
-msgstr "Bir virgül ya da kapalı bir köşeli parantez beklendi."
-
-#: libraries/sql-parser/src/Components/FieldDefinition.php:262
-msgid "A closing bracket was expected."
-msgstr "Kapalı bir köşeli parantez beklendi."
-
 #: libraries/sql-parser/src/Components/Limit.php:90
 #: libraries/sql-parser/src/Components/Limit.php:112
 msgid "An offset was expected."
@@ -14033,24 +14049,24 @@ msgstr "Sınırlayıcıdan önce beklenen boşluk(lar)."
 msgid "Expected delimiter."
 msgstr "Beklenen sınırlayıcı."
 
-#: libraries/sql-parser/src/Lexer.php:753
+#: libraries/sql-parser/src/Lexer.php:777
 #, php-format
 msgid "Ending quote %1$s was expected."
 msgstr "Sonlandırma tırnak işareti %1$s beklendi."
 
-#: libraries/sql-parser/src/Lexer.php:789
+#: libraries/sql-parser/src/Lexer.php:813
 msgid "Variable name was expected."
 msgstr "Değişken adı beklendi."
 
-#: libraries/sql-parser/src/Parser.php:380
+#: libraries/sql-parser/src/Parser.php:391
 msgid "Unexpected beginning of statement."
 msgstr "Beklenmedik ifade başlangıcı."
 
-#: libraries/sql-parser/src/Parser.php:399
+#: libraries/sql-parser/src/Parser.php:410
 msgid "Unrecognized statement type."
 msgstr "Tanınmayan ifade türü."
 
-#: libraries/sql-parser/src/Parser.php:479
+#: libraries/sql-parser/src/Parser.php:489
 msgid "No transaction was previously started."
 msgstr "Daha önce hiç işlem başlatılmadı."
 
@@ -14063,7 +14079,6 @@ msgid "This type of clause was previously parsed."
 msgstr "Bu tür yan tümce daha önce ayrıştırıldı."
 
 #: libraries/sql-parser/src/Statement.php:265
-#| msgid "A new statement was found, but no delimiter between them."
 msgid ""
 "A new statement was found, but no delimiter between it and the previous one."
 msgstr ""
@@ -14078,8 +14093,9 @@ msgid "The name of the entity was expected."
 msgstr "Varlığın adı beklendi."
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:310
-msgid "At least one field definition was expected."
-msgstr "En az bir alan tanımı beklendi."
+#| msgid "At least one field definition was expected."
+msgid "At least one column definition was expected."
+msgstr "En az bir sütun tanımı beklendi."
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:329
 msgid "A \"RETURNS\" keyword was expected."
@@ -14138,11 +14154,11 @@ msgstr "Yer imi oluşturulmadı!"
 msgid "Using bookmark \"%s\" as default browse query."
 msgstr "Varsayılan gözatma sorgusu olarak \"%s\" yer imi kullanılıyor."
 
-#: libraries/sql.lib.php:1306
+#: libraries/sql.lib.php:1300
 msgid "Showing as PHP code"
 msgstr "PHP kodu olarak gösteriliyor"
 
-#: libraries/sql.lib.php:1638
+#: libraries/sql.lib.php:1632
 #, php-format
 msgid ""
 "Current selection does not contain a unique column. Grid edit, checkbox, "
@@ -14151,7 +14167,7 @@ msgstr ""
 "Şu anki seçim benzersiz bir sütun içermiyor. Kılavuz düzenleme, onay kutusu, "
 "Düzenle, Kopyala ve Sil özellikleri kullanılabilir değil. %s"
 
-#: libraries/sql.lib.php:1649
+#: libraries/sql.lib.php:1643
 #, php-format
 msgid ""
 "Current selection does not contain a unique column. Grid edit, Edit, Copy "
@@ -14160,7 +14176,7 @@ msgstr ""
 "Şu anki seçim benzersiz bir sütun içermiyor. Kılavuz düzenleme, Düzenle, "
 "Kopyala ve Sil özellikleri istenmeyen davranışlara neden olabilir. %s"
 
-#: libraries/sql.lib.php:1688
+#: libraries/sql.lib.php:1682
 #, php-format
 msgid "Problems with indexes of table `%s`"
 msgstr "`%s` tablosunun indeksleri ile ilgili sorunlar"
@@ -14317,7 +14333,7 @@ msgid "Version %s snapshot (SQL code)"
 msgstr "Sürüm %s görüntüsü yakalama (SQL kodu)"
 
 #: libraries/tracking.lib.php:947
-#: templates/structure/table_structure_row.phtml:33
+#: templates/table/structure/table_structure_row.phtml:33
 msgctxt "None for default"
 msgid "None"
 msgstr "Yok"
@@ -14373,15 +14389,15 @@ msgstr "Sürüm %1$s / %2$s oluşturuldu."
 msgid "Version %1$s was created, tracking for %2$s is active."
 msgstr "Sürüm %1$s oluşturuldu, %2$s için izleme aktif."
 
-#: libraries/user_preferences.inc.php:29
+#: libraries/user_preferences.inc.php:30
 msgid "Manage your settings"
 msgstr "Ayarlarınızı yönetin"
 
-#: libraries/user_preferences.inc.php:46 prefs_manage.php:307
+#: libraries/user_preferences.inc.php:54 prefs_manage.php:307
 msgid "Configuration has been saved."
 msgstr "Yapılandırma kaydedildi."
 
-#: libraries/user_preferences.inc.php:66
+#: libraries/user_preferences.inc.php:74
 #, php-format
 msgid ""
 "Your preferences will be saved for current session only. Storing them "
@@ -14702,7 +14718,6 @@ msgid "Row: %1$s, Column: %2$s, Error: %3$s"
 msgstr "Satır: %1$s, Sütun: %2$s, Hata: %3$s"
 
 #: tbl_row_action.php:70
-#| msgid "No versions selected."
 msgid "No row selected."
 msgstr "Seçilen satır yok."
 
@@ -14778,7 +14793,7 @@ msgid "first"
 msgstr "ilk"
 
 #: templates/columns_definitions/move_column.phtml:12
-#: templates/structure/add_column.phtml:21
+#: templates/table/structure/add_column.phtml:21
 #, php-format
 msgid "after %s"
 msgstr "%s sonrasına"
@@ -14847,197 +14862,292 @@ msgstr "Girdi dönüşümü"
 msgid "Input transformation options"
 msgstr "Girdi dönüşümü seçenekleri"
 
-#: templates/designer/aggregate_query_panel.phtml:22
-#: templates/designer/options_panel.phtml:100
-msgid "Aggregate"
-msgstr "Topla"
-
-#: templates/designer/aggregate_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:61
-#: templates/designer/options_panel.phtml:106
-#: templates/designer/options_panel.phtml:170
-#: templates/designer/where_query_panel.phtml:30
-#: templates/table/table_header.phtml:9
-msgid "Operator"
-msgstr "İşletici"
-
-#: templates/designer/database_tables.phtml:29
-msgid "Toggle"
-msgstr "Değiştir"
-
-#: templates/designer/database_tables.phtml:40
-msgid "See table structure"
-msgstr "Tablo yapısına bak"
-
-#: templates/designer/delete_relation_panel.phtml:21
-msgid "Delete relation"
-msgstr "Bağlantıyı sil"
-
-#: templates/designer/edit_delete_pages.phtml:7
-msgid "Page to open"
-msgstr "Açmak için sayfa"
-
-#: templates/designer/edit_delete_pages.phtml:7
-msgid "Page to delete"
-msgstr "Silmek için bağlantı"
-
-#: templates/designer/having_query_panel.phtml:90
-#: templates/designer/options_panel.phtml:63
-#: templates/designer/options_panel.phtml:229
-#: templates/designer/where_query_panel.phtml:59
-msgid "Except"
-msgstr "Hariç"
-
-#: templates/designer/having_query_panel.phtml:102
-#: templates/designer/options_panel.phtml:75
-#: templates/designer/options_panel.phtml:241
-#: templates/designer/where_query_panel.phtml:71
-msgid "subquery"
-msgstr "alt sorgu"
-
-#: templates/designer/new_relation_panel.phtml:22
-#: templates/designer/side_menu.phtml:84 templates/designer/side_menu.phtml:87
-msgid "Create relation"
-msgstr "Bağlantı oluştur"
-
-#: templates/designer/options_panel.phtml:34
-#: templates/designer/options_panel.phtml:200
-msgid "Relation operator"
-msgstr "Bağlantı işletici"
-
-#: templates/designer/options_panel.phtml:85
-#: templates/designer/rename_to_panel.phtml:23
-msgid "Rename to"
-msgstr "Yeniden şuna adlandır"
-
-#: templates/designer/options_panel.phtml:91
-#: templates/designer/rename_to_panel.phtml:31
-msgid "New name"
-msgstr "Yeni ad"
-
-#: templates/designer/page_save_as.phtml:4
-msgid "Save to selected page"
-msgstr "Seçilen sayfaya kaydet"
-
-#: templates/designer/page_save_as.phtml:5
-msgid "Create a page and save to it"
-msgstr "Bir sayfa oluştur ve ona kaydet"
-
-#: templates/designer/page_save_as.phtml:26
-msgid "New page name"
-msgstr "Yeni sayfa adı"
-
-#: templates/designer/page_selector.phtml:2
-msgid "Select page"
-msgstr "Sayfa seç"
-
-#: templates/designer/query_details.phtml:10
-msgid "Active options"
-msgstr "Aktif seçenekler"
-
-#: templates/designer/schema_export.phtml:4
-msgid "Select Export Relational Type"
-msgstr "Dışa Aktarma Bağlantılı Türü Seç"
-
-#: templates/designer/side_menu.phtml:19 templates/designer/side_menu.phtml:25
-msgid "Show/Hide tables list"
-msgstr "Tablolar listesini göster/gizle"
-
-#: templates/designer/side_menu.phtml:29 templates/designer/side_menu.phtml:35
-#: templates/designer/side_menu.phtml:36
-msgid "View in fullscreen"
-msgstr "Tam ekran görünümü"
-
-#: templates/designer/side_menu.phtml:34
-msgid "Exit fullscreen"
-msgstr "Tam ekrandan çık"
-
-#: templates/designer/side_menu.phtml:41 templates/designer/side_menu.phtml:45
-msgid "New page"
-msgstr "Yeni sayfa"
-
-#: templates/designer/side_menu.phtml:70 templates/designer/side_menu.phtml:73
-msgid "Delete pages"
-msgstr "Sayfaları sil"
-
-#: templates/designer/side_menu.phtml:77 templates/designer/side_menu.phtml:80
-#: templates/table/create_table.phtml:7
+#: templates/database/create_table.phtml:7
+#: templates/database/designer/side_menu.phtml:77
+#: templates/database/designer/side_menu.phtml:80
 msgid "Create table"
 msgstr "Tablo oluştur"
 
-#: templates/designer/side_menu.phtml:98
-#: templates/designer/side_menu.phtml:101
+#: templates/database/create_table.phtml:15
+msgid "Number of columns"
+msgstr "Sütun sayısı"
+
+#: templates/database/designer/aggregate_query_panel.phtml:22
+#: templates/database/designer/options_panel.phtml:100
+msgid "Aggregate"
+msgstr "Topla"
+
+#: templates/database/designer/aggregate_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:61
+#: templates/database/designer/options_panel.phtml:106
+#: templates/database/designer/options_panel.phtml:170
+#: templates/database/designer/where_query_panel.phtml:30
+#: templates/table/search/table_header.phtml:9
+msgid "Operator"
+msgstr "İşletici"
+
+#: templates/database/designer/database_tables.phtml:29
+msgid "Toggle"
+msgstr "Değiştir"
+
+#: templates/database/designer/database_tables.phtml:40
+msgid "See table structure"
+msgstr "Tablo yapısına bak"
+
+#: templates/database/designer/delete_relation_panel.phtml:21
+msgid "Delete relation"
+msgstr "Bağlantıyı sil"
+
+#: templates/database/designer/edit_delete_pages.phtml:7
+msgid "Page to open"
+msgstr "Açmak için sayfa"
+
+#: templates/database/designer/edit_delete_pages.phtml:7
+msgid "Page to delete"
+msgstr "Silmek için bağlantı"
+
+#: templates/database/designer/having_query_panel.phtml:90
+#: templates/database/designer/options_panel.phtml:63
+#: templates/database/designer/options_panel.phtml:229
+#: templates/database/designer/where_query_panel.phtml:59
+msgid "Except"
+msgstr "Hariç"
+
+#: templates/database/designer/having_query_panel.phtml:102
+#: templates/database/designer/options_panel.phtml:75
+#: templates/database/designer/options_panel.phtml:241
+#: templates/database/designer/where_query_panel.phtml:71
+msgid "subquery"
+msgstr "alt sorgu"
+
+#: templates/database/designer/new_relation_panel.phtml:22
+#: templates/database/designer/side_menu.phtml:84
+#: templates/database/designer/side_menu.phtml:87
+msgid "Create relation"
+msgstr "Bağlantı oluştur"
+
+#: templates/database/designer/options_panel.phtml:34
+#: templates/database/designer/options_panel.phtml:200
+msgid "Relation operator"
+msgstr "Bağlantı işletici"
+
+#: templates/database/designer/options_panel.phtml:85
+#: templates/database/designer/rename_to_panel.phtml:23
+msgid "Rename to"
+msgstr "Yeniden şuna adlandır"
+
+#: templates/database/designer/options_panel.phtml:91
+#: templates/database/designer/rename_to_panel.phtml:31
+msgid "New name"
+msgstr "Yeni ad"
+
+#: templates/database/designer/page_save_as.phtml:4
+msgid "Save to selected page"
+msgstr "Seçilen sayfaya kaydet"
+
+#: templates/database/designer/page_save_as.phtml:5
+msgid "Create a page and save to it"
+msgstr "Bir sayfa oluştur ve ona kaydet"
+
+#: templates/database/designer/page_save_as.phtml:26
+msgid "New page name"
+msgstr "Yeni sayfa adı"
+
+#: templates/database/designer/page_selector.phtml:2
+msgid "Select page"
+msgstr "Sayfa seç"
+
+#: templates/database/designer/query_details.phtml:10
+msgid "Active options"
+msgstr "Aktif seçenekler"
+
+#: templates/database/designer/schema_export.phtml:4
+msgid "Select Export Relational Type"
+msgstr "Dışa Aktarma Bağlantılı Türü Seç"
+
+#: templates/database/designer/side_menu.phtml:19
+#: templates/database/designer/side_menu.phtml:25
+msgid "Show/Hide tables list"
+msgstr "Tablolar listesini göster/gizle"
+
+#: templates/database/designer/side_menu.phtml:29
+#: templates/database/designer/side_menu.phtml:35
+#: templates/database/designer/side_menu.phtml:36
+msgid "View in fullscreen"
+msgstr "Tam ekran görünümü"
+
+#: templates/database/designer/side_menu.phtml:34
+msgid "Exit fullscreen"
+msgstr "Tam ekrandan çık"
+
+#: templates/database/designer/side_menu.phtml:41
+#: templates/database/designer/side_menu.phtml:45
+msgid "New page"
+msgstr "Yeni sayfa"
+
+#: templates/database/designer/side_menu.phtml:70
+#: templates/database/designer/side_menu.phtml:73
+msgid "Delete pages"
+msgstr "Sayfaları sil"
+
+#: templates/database/designer/side_menu.phtml:98
+#: templates/database/designer/side_menu.phtml:101
 msgid "Reload"
 msgstr "Yeniden yükle"
 
-#: templates/designer/side_menu.phtml:107
-#: templates/designer/side_menu.phtml:110
+#: templates/database/designer/side_menu.phtml:107
+#: templates/database/designer/side_menu.phtml:110
 msgid "Help"
 msgstr "Yardım"
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Angular links"
 msgstr "Yönlendirmeli bağlantılar"
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Direct links"
 msgstr "Doğrudan bağlantılar"
 
-#: templates/designer/side_menu.phtml:122
-#: templates/designer/side_menu.phtml:124
+#: templates/database/designer/side_menu.phtml:122
+#: templates/database/designer/side_menu.phtml:124
 msgid "Snap to grid"
 msgstr "Kılavuza uydur"
 
-#: templates/designer/side_menu.phtml:128
-#: templates/designer/side_menu.phtml:134
+#: templates/database/designer/side_menu.phtml:128
+#: templates/database/designer/side_menu.phtml:134
 msgid "Small/Big All"
 msgstr "Tümünü Küçült/Büyült"
 
-#: templates/designer/side_menu.phtml:138
-#: templates/designer/side_menu.phtml:141
+#: templates/database/designer/side_menu.phtml:138
+#: templates/database/designer/side_menu.phtml:141
 msgid "Toggle small/big"
 msgstr "Küçüğü/büyüğü değiştir"
 
-#: templates/designer/side_menu.phtml:145
-#: templates/designer/side_menu.phtml:148
+#: templates/database/designer/side_menu.phtml:145
+#: templates/database/designer/side_menu.phtml:148
 msgid "Toggle relation lines"
 msgstr "Bağlantılı satırları değiştir"
 
-#: templates/designer/side_menu.phtml:153
-#: templates/designer/side_menu.phtml:156
+#: templates/database/designer/side_menu.phtml:153
+#: templates/database/designer/side_menu.phtml:156
 msgid "Export schema"
 msgstr "Şemayı dışa aktar"
 
-#: templates/designer/side_menu.phtml:165
-#: templates/designer/side_menu.phtml:168
+#: templates/database/designer/side_menu.phtml:165
+#: templates/database/designer/side_menu.phtml:168
 msgid "Build Query"
 msgstr "Sorgu yarat"
 
-#: templates/designer/side_menu.phtml:173
-#: templates/designer/side_menu.phtml:177
+#: templates/database/designer/side_menu.phtml:173
+#: templates/database/designer/side_menu.phtml:177
 msgid "Move Menu"
 msgstr "Menüyü taşı"
 
-#: templates/designer/side_menu.phtml:181
-#: templates/designer/side_menu.phtml:186
+#: templates/database/designer/side_menu.phtml:181
+#: templates/database/designer/side_menu.phtml:186
 msgid "Pin text"
 msgstr "Metni sabitle"
 
-#: templates/designer/table_list.phtml:4
+#: templates/database/designer/table_list.phtml:4
 msgid "Hide/Show all"
 msgstr "Tümünü gizle/göster"
 
-#: templates/designer/table_list.phtml:14
+#: templates/database/designer/table_list.phtml:14
 msgid "Hide/Show Tables with no relation"
 msgstr "Bağlantılı olmayan Tabloları gizle/göster"
 
-#: templates/designer/table_list.phtml:59
+#: templates/database/designer/table_list.phtml:59
 msgid "Number of tables:"
 msgstr "Tablo sayısı:"
 
+#: templates/database/structure/body_for_table_summary.phtml:6
+#, php-format
+msgid "%s table"
+msgid_plural "%s tables"
+msgstr[0] "%s tablo"
+msgstr[1] "%s tablo"
+
+#: templates/database/structure/body_for_table_summary.phtml:17
+msgid "Sum"
+msgstr "Toplam"
+
+#: templates/database/structure/check_all_tables.phtml:6
+msgid "Check tables having overhead"
+msgstr "Ek yükü olan tabloları kontrol et"
+
+#: templates/database/structure/check_all_tables.phtml:10
+msgid "Show create"
+msgstr "Oluşturmayı göster"
+
+#: templates/database/structure/check_all_tables.phtml:27
+msgid "Prefix"
+msgstr "Ön ek"
+
+#: templates/database/structure/check_all_tables.phtml:28
+msgid "Add prefix to table"
+msgstr "Tabloya ön ek ekle"
+
+#: templates/database/structure/check_all_tables.phtml:29
+msgid "Replace table prefix"
+msgstr "Tablo ön ekini değiştir"
+
+#: templates/database/structure/check_all_tables.phtml:30
+msgid "Copy table with prefix"
+msgstr "Tabloyu ön eki ile kopyala"
+
+#: templates/database/structure/check_all_tables.phtml:36
+msgid "Add columns to central list"
+msgstr "Sütunları merkezi listeye ekle"
+
+#: templates/database/structure/check_all_tables.phtml:37
+msgid "Remove columns from central list"
+msgstr "Sütunları merkezi listeden kaldır"
+
+#: templates/database/structure/check_all_tables.phtml:38
+msgid "Make consistent with central list"
+msgstr "Merkezi liste ile uyumlu yap"
+
+#: templates/database/structure/favorite_anchor.phtml:12
+msgid "Add to Favorites"
+msgstr "Sık Kullanılanlara ekle"
+
+#: templates/database/structure/show_create.phtml:2
+msgid "Showing create queries"
+msgstr "Sorguları oluşturma gösteriliyor"
+
+#: templates/database/structure/sortable_header.phtml:13
+msgid "Sort"
+msgstr "Sırala"
+
+#: templates/database/structure/table_header.phtml:42
+msgid ""
+"May be approximate. Click on the number to get the exact count. See "
+"[doc@faq3-11]FAQ 3.11[/doc]."
+msgstr ""
+"Yaklaşık olabilir. Tam sayıyı almak için sayının üzerine tıklayın. "
+"[doc@faq3-11]SSS 3.11[/doc]'e bakın."
+
+#: templates/database/structure/table_header.phtml:66
+#: templates/table/index_form.phtml:127
+msgid "Size"
+msgstr "Boyut"
+
+#: templates/database/structure/table_header.phtml:74
+#: templates/table/structure/display_table_stats.phtml:27
+msgid "Overhead"
+msgstr "Ek Yük"
+
+#: templates/database/structure/tracking_icon.phtml:4
+msgid "Tracking is active."
+msgstr "İzleme aktif."
+
+#: templates/database/structure/tracking_icon.phtml:8
+msgid "Tracking is not active."
+msgstr "İzleme aktif değil."
+
 #: templates/error/report_form.phtml:7
 msgid ""
 "phpMyAdmin has encountered an error. We have collected data about this error "
@@ -15056,61 +15166,6 @@ msgstr "Hata raporundaki verileri inceleyebilirsiniz:"
 msgid "Please explain the steps that lead to the error:"
 msgstr "Lütfen hataya neden adımları açıklayın:"
 
-#: templates/gis_visualization/gis_visualization.phtml:3
-msgid "Display GIS Visualization"
-msgstr "GIS görselleştirmesini görüntüle"
-
-#: templates/gis_visualization/gis_visualization.phtml:8
-msgid "Label column"
-msgstr "Etiket sütunu"
-
-#: templates/gis_visualization/gis_visualization.phtml:11
-msgid "-- None --"
-msgstr "-- Yok --"
-
-#: templates/gis_visualization/gis_visualization.phtml:19
-msgid "Spatial column"
-msgstr "Uzaysal sütun"
-
-#: templates/index_form.phtml:16
-msgid "Index name:"
-msgstr "İndeks adı:"
-
-#: templates/index_form.phtml:19
-msgid ""
-"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
-msgstr ""
-"\"PRIMARY\" <b>sadece ve sadece</b> bir birincil anahtarın adı <b>olmak "
-"zorundadır</b>!"
-
-#: templates/index_form.phtml:40
-msgid "Index choice:"
-msgstr "İndeks tercihi:"
-
-#: templates/index_form.phtml:57
-msgid "Key block size:"
-msgstr "Anahtar blok boyutu:"
-
-#: templates/index_form.phtml:74
-msgid "Index type:"
-msgstr "İndeks türü:"
-
-#: templates/index_form.phtml:86
-msgid "Parser:"
-msgstr "Ayrıştırıcı:"
-
-#: templates/index_form.phtml:102
-msgid "Comment:"
-msgstr "Yorum:"
-
-#: templates/index_form.phtml:127 templates/structure/table_header.phtml:66
-msgid "Size"
-msgstr "Boyut"
-
-#: templates/index_form.phtml:149 templates/index_form.phtml:190
-msgid "Drag to reorder"
-msgstr "Yen.düzenleme için sürükleyin"
-
 #: templates/prefs_autoload.phtml:9
 msgid ""
 "Your browser has phpMyAdmin configuration for this domain. Would you like to "
@@ -15123,357 +15178,150 @@ msgstr ""
 msgid "Start row:"
 msgstr "Başlangıç satırı:"
 
-#: templates/structure/actions_in_table_structure.phtml:14
-#, php-format
-msgid "A primary key has been added on %s."
-msgstr "%s üzerinde birincil anahtar eklendi."
-
-#: templates/structure/actions_in_table_structure.phtml:34
-#: templates/structure/actions_in_table_structure.phtml:54
-#: templates/structure/actions_in_table_structure.phtml:79
-#: templates/structure/actions_in_table_structure.phtml:101
-#, php-format
-msgid "An index has been added on %s."
-msgstr "%s üzerinde bir indeks eklendi."
-
-#: templates/structure/actions_in_table_structure.phtml:130
-#: templates/structure/check_all_table_column.phtml:59
-msgid "Remove from central columns"
-msgstr "Merkezi sütunlardan kaldır"
-
-#: templates/structure/actions_in_table_structure.phtml:138
-#: templates/structure/check_all_table_column.phtml:55
-msgid "Add to central columns"
-msgstr "Merkezi sütunlara ekle"
-
-#: templates/structure/add_column.phtml:7
-#, php-format
-msgid "Add %s column(s)"
-msgstr "%s sütun ekle"
-
-#: templates/structure/add_column.phtml:12
-msgid "at beginning of table"
-msgstr "tablonun başı"
-
-#: templates/structure/body_for_table_summary.phtml:6
-#, php-format
-msgid "%s table"
-msgid_plural "%s tables"
-msgstr[0] "%s tablo"
-msgstr[1] "%s tablo"
-
-#: templates/structure/body_for_table_summary.phtml:17
-msgid "Sum"
-msgstr "Toplam"
-
-#: templates/structure/check_all_tables.phtml:6
-msgid "Check tables having overhead"
-msgstr "Ek yükü olan tabloları kontrol et"
-
-#: templates/structure/check_all_tables.phtml:10
-msgid "Show create"
-msgstr "Oluşturmayı göster"
-
-#: templates/structure/check_all_tables.phtml:27
-msgid "Prefix"
-msgstr "Ön ek"
-
-#: templates/structure/check_all_tables.phtml:28
-msgid "Add prefix to table"
-msgstr "Tabloya ön ek ekle"
-
-#: templates/structure/check_all_tables.phtml:29
-msgid "Replace table prefix"
-msgstr "Tablo ön ekini değiştir"
-
-#: templates/structure/check_all_tables.phtml:30
-msgid "Copy table with prefix"
-msgstr "Tabloyu ön eki ile kopyala"
-
-#: templates/structure/check_all_tables.phtml:36
-msgid "Add columns to central list"
-msgstr "Sütunları merkezi listeye ekle"
-
-#: templates/structure/check_all_tables.phtml:37
-msgid "Remove columns from central list"
-msgstr "Sütunları merkezi listeden kaldır"
-
-#: templates/structure/check_all_tables.phtml:38
-msgid "Make consistent with central list"
-msgstr "Merkezi liste ile uyumlu yap"
-
-#: templates/structure/display_structure.phtml:140 view_create.php:181
-msgid "Edit view"
-msgstr "Düzenleme görünümü"
-
-#: templates/structure/display_table_stats.phtml:9
-msgid "Space usage"
-msgstr "Alan kullanımı"
-
-#: templates/structure/display_table_stats.phtml:27
-#: templates/structure/table_header.phtml:74
-msgid "Overhead"
-msgstr "Ek Yük"
-
-#: templates/structure/display_table_stats.phtml:32
-msgid "Effective"
-msgstr "Etkili"
-
-#: templates/structure/favorite_anchor.phtml:12
-msgid "Add to Favorites"
-msgstr "Sık Kullanılanlara ekle"
-
-#: templates/structure/move_columns_dialog.phtml:1
-#: templates/structure/optional_action_links.phtml:21
-msgid "Move columns"
-msgstr "Sütunları taşı"
-
-#: templates/structure/move_columns_dialog.phtml:2
-msgid "Move the columns by dragging them up and down."
-msgstr "Sütunları yukarı ve aşağı sürükleyerek taşıyın."
-
-#: templates/structure/optional_action_links.phtml:9
-msgid "Propose table structure"
-msgstr "Tablo yapısı öner"
-
-#: templates/structure/optional_action_links.phtml:24
-msgid "Improve table structure"
-msgstr "Tablo yapısını iyileştir"
-
-#: templates/structure/optional_action_links.phtml:30
-msgid "Track view"
-msgstr "İzleme görünümü"
-
-#: templates/structure/row_stats_table.phtml:3
-msgid "Row statistics"
-msgstr "Satır istatistikleri"
-
-#: templates/structure/row_stats_table.phtml:9
-msgid "static"
-msgstr "sabit"
-
-#: templates/structure/row_stats_table.phtml:11
-msgid "dynamic"
-msgstr "değişken"
-
-#: templates/structure/row_stats_table.phtml:22
-msgid "partitioned"
-msgstr "bölüme ayrıldı"
-
-#: templates/structure/row_stats_table.phtml:54
-msgid "Row length"
-msgstr "Satır uzunluğu"
-
-#: templates/structure/row_stats_table.phtml:66
-msgid "Row size"
-msgstr "Satır boyutu"
-
-#: templates/structure/row_stats_table.phtml:73
-msgid "Next autoindex"
-msgstr "Sonraki otoindeks"
-
-#: templates/structure/secondary_tabs.phtml:14
-msgid "Relation view"
-msgstr "Bağlantı görünümü"
-
-#: templates/structure/show_create.phtml:2
-msgid "Showing create queries"
-msgstr "Sorguları oluşturma gösteriliyor"
-
-#: templates/structure/sortable_header.phtml:13
-msgid "Sort"
-msgstr "Sırala"
-
-#: templates/structure/table_header.phtml:42
-msgid ""
-"May be approximate. Click on the number to get the exact count. See "
-"[doc@faq3-11]FAQ 3.11[/doc]."
-msgstr ""
-"Yaklaşık olabilir. Tam sayıyı almak için sayının üzerine tıklayın. "
-"[doc@faq3-11]SSS 3.11[/doc]'e bakın."
-
-#: templates/structure/table_structure_row.phtml:46
-#, php-format
-msgid "Column %s has been dropped."
-msgstr "%s sütunu kaldırıldı."
-
-#: templates/structure/tracking_icon.phtml:4
-msgid "Tracking is active."
-msgstr "İzleme aktif."
-
-#: templates/structure/tracking_icon.phtml:8
-msgid "Tracking is not active."
-msgstr "İzleme aktif değil."
-
-#: templates/table/create_table.phtml:15
-msgid "Number of columns"
-msgstr "Sütun sayısı"
-
-#: templates/table/options.phtml:8
-msgid "Select columns (at least one):"
-msgstr "Sütunları seç (en az bir):"
-
-#: templates/table/options.phtml:37
-msgid "Add search conditions (body of the \"where\" clause):"
-msgstr "Arama koşulu ekle (\"where\" koşulu gövdesi):"
-
-#: templates/table/options.phtml:45
-msgid "Number of rows per page"
-msgstr "Sayfa başına satır sayısı"
-
-#: templates/table/options.phtml:56
-msgid "Display order:"
-msgstr "Görünüm düzeni:"
-
-#: templates/table/options_zoom.phtml:6
-msgid "Use this column to label each point"
-msgstr "Bu sütunu her noktayı etiketlemek için kullan"
-
-#: templates/table/options_zoom.phtml:35
-msgid "Maximum rows to plot"
-msgstr "Çizim için en fazla satır"
-
-#: templates/table/replace_preview.phtml:13
-msgid "Find and replace - preview"
-msgstr "Bul ve değiştir - önizleme"
-
-#: templates/table/replace_preview.phtml:18
-msgid "Original string"
-msgstr "Orijinal satır"
-
-#: templates/table/replace_preview.phtml:19
-msgid "Replaced string"
-msgstr "Değiştirilmiş satır"
-
-#: templates/table/replace_preview.phtml:40
-msgid "Replace"
-msgstr "Değiştir"
-
-#: templates/table/rows_zoom.phtml:16
-msgid "Additional search criteria"
-msgstr "İlave arama kriteri"
-
-#: templates/table/search_and_replace.phtml:3
-msgid "Replace with:"
-msgstr "Şununla değiştir:"
-
-#: templates/table/search_and_replace.phtml:22
-msgid "Use regular expression"
-msgstr "Düzenli ifade kullan"
-
-#: templates/table/selection_form.phtml:12
-msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
-msgstr "İki farklı sütun için \"örnekle sorgulama\" (joker: \"%\") yap"
-
-#: templates/table/selection_form.phtml:34
-msgid "Do a \"query by example\" (wildcard: \"%\")"
-msgstr "\"Örnekle sorgulama\" yap. (joker: \"%\")"
-
-#: templates/table/zoom_result_form.phtml:7
-msgid "Browse/Edit the points"
-msgstr "Noktalara gözat/düzenle"
-
-#: templates/table/zoom_result_form.phtml:15
-msgid "How to use"
-msgstr "Nasıl kullanılır"
-
-#: templates/table/zoom_result_form.phtml:23
-msgid "Reset zoom"
-msgstr "Odaklamayı sıfırla"
-
-#: templates/tbl_chart.phtml:17
+#: templates/table/chart/tbl_chart.phtml:17
 msgctxt "Chart type"
 msgid "Bar"
 msgstr "Çubuk"
 
-#: templates/tbl_chart.phtml:21
+#: templates/table/chart/tbl_chart.phtml:21
 msgctxt "Chart type"
 msgid "Column"
 msgstr "Sütun"
 
-#: templates/tbl_chart.phtml:25
+#: templates/table/chart/tbl_chart.phtml:25
 msgctxt "Chart type"
 msgid "Line"
 msgstr "Çizgi"
 
-#: templates/tbl_chart.phtml:29
+#: templates/table/chart/tbl_chart.phtml:29
 msgctxt "Chart type"
 msgid "Spline"
 msgstr "Şerit"
 
-#: templates/tbl_chart.phtml:33
+#: templates/table/chart/tbl_chart.phtml:33
 msgctxt "Chart type"
 msgid "Area"
 msgstr "Alan"
 
-#: templates/tbl_chart.phtml:37
+#: templates/table/chart/tbl_chart.phtml:37
 msgctxt "Chart type"
 msgid "Pie"
 msgstr "Dilim"
 
-#: templates/tbl_chart.phtml:41
+#: templates/table/chart/tbl_chart.phtml:41
 msgctxt "Chart type"
 msgid "Timeline"
 msgstr "Zaman çizelgesi"
 
-#: templates/tbl_chart.phtml:45
+#: templates/table/chart/tbl_chart.phtml:45
 msgctxt "Chart type"
 msgid "Scatter"
 msgstr "Dağılım"
 
-#: templates/tbl_chart.phtml:50
+#: templates/table/chart/tbl_chart.phtml:50
 msgid "Stacked"
 msgstr "İstiflendi"
 
-#: templates/tbl_chart.phtml:53
+#: templates/table/chart/tbl_chart.phtml:53
 msgid "Chart title"
 msgstr "Çizelge başlığı"
 
-#: templates/tbl_chart.phtml:57
+#: templates/table/chart/tbl_chart.phtml:57
 msgid "X-Axis:"
 msgstr "X-Ekseni:"
 
-#: templates/tbl_chart.phtml:72
+#: templates/table/chart/tbl_chart.phtml:72
 msgid "Series:"
 msgstr "Dizi:"
 
-#: templates/tbl_chart.phtml:102
+#: templates/table/chart/tbl_chart.phtml:102
 msgid "X-Axis label:"
 msgstr "X-Ekseni etiketi:"
 
-#: templates/tbl_chart.phtml:104
+#: templates/table/chart/tbl_chart.phtml:104
 msgid "X Values"
 msgstr "X Değeri"
 
-#: templates/tbl_chart.phtml:107
+#: templates/table/chart/tbl_chart.phtml:107
 msgid "Y-Axis label:"
 msgstr "Y-Ekseni etiketi:"
 
-#: templates/tbl_chart.phtml:115
+#: templates/table/chart/tbl_chart.phtml:115
 msgid "Series names are in a column"
 msgstr "Seri adları bir sütunda"
 
-#: templates/tbl_chart.phtml:118
+#: templates/table/chart/tbl_chart.phtml:118
 msgid "Series column:"
 msgstr "Seri sütunu:"
 
-#: templates/tbl_chart.phtml:130
+#: templates/table/chart/tbl_chart.phtml:130
 msgid "Value Column:"
 msgstr "Değer Sütunu:"
 
-#: templates/tbl_chart.phtml:150
+#: templates/table/chart/tbl_chart.phtml:150
 msgid "Save chart as image"
 msgstr "Çizelgeyi resim olarak kaydet"
 
-#: templates/tbl_relation/common_form.phtml:7
+#: templates/table/gis_visualization/gis_visualization.phtml:3
+msgid "Display GIS Visualization"
+msgstr "GIS görselleştirmesini görüntüle"
+
+#: templates/table/gis_visualization/gis_visualization.phtml:8
+msgid "Label column"
+msgstr "Etiket sütunu"
+
+#: templates/table/gis_visualization/gis_visualization.phtml:11
+msgid "-- None --"
+msgstr "-- Yok --"
+
+#: templates/table/gis_visualization/gis_visualization.phtml:19
+msgid "Spatial column"
+msgstr "Uzaysal sütun"
+
+#: templates/table/index_form.phtml:16
+msgid "Index name:"
+msgstr "İndeks adı:"
+
+#: templates/table/index_form.phtml:19
+msgid ""
+"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
+msgstr ""
+"\"PRIMARY\" <b>sadece ve sadece</b> bir birincil anahtarın adı <b>olmak "
+"zorundadır</b>!"
+
+#: templates/table/index_form.phtml:40
+msgid "Index choice:"
+msgstr "İndeks tercihi:"
+
+#: templates/table/index_form.phtml:57
+msgid "Key block size:"
+msgstr "Anahtar blok boyutu:"
+
+#: templates/table/index_form.phtml:74
+msgid "Index type:"
+msgstr "İndeks türü:"
+
+#: templates/table/index_form.phtml:86
+msgid "Parser:"
+msgstr "Ayrıştırıcı:"
+
+#: templates/table/index_form.phtml:102
+msgid "Comment:"
+msgstr "Yorum:"
+
+#: templates/table/index_form.phtml:149 templates/table/index_form.phtml:190
+msgid "Drag to reorder"
+msgstr "Yen.düzenleme için sürükleyin"
+
+#: templates/table/relation/common_form.phtml:7
 msgid "Internal relations"
 msgstr "Dahili bağlantılar"
 
-#: templates/tbl_relation/common_form.phtml:11
+#: templates/table/relation/common_form.phtml:11
 msgid "Internal relation"
 msgstr "Dahili bağlantı"
 
-#: templates/tbl_relation/common_form.phtml:14
+#: templates/table/relation/common_form.phtml:14
 msgid ""
 "An internal relation is not necessary when a corresponding FOREIGN KEY "
 "relation exists."
@@ -15481,50 +15329,224 @@ msgstr ""
 "FOREIGN KEY bağlantısının yerini tutan bir bağlantı varken dahili bağlantı "
 "mümkün değildir."
 
-#: templates/tbl_relation/common_form.phtml:37
+#: templates/table/relation/common_form.phtml:37
 msgid "Foreign key constraints"
 msgstr "Dış anahtar kısıtlamaları"
 
-#: templates/tbl_relation/common_form.phtml:40
+#: templates/table/relation/common_form.phtml:40
 msgid "Actions"
 msgstr "Eylemler"
 
-#: templates/tbl_relation/common_form.phtml:41
+#: templates/table/relation/common_form.phtml:41
 msgid "Constraint properties"
 msgstr "Kısıtlama özellikleri"
 
-#: templates/tbl_relation/common_form.phtml:44
+#: templates/table/relation/common_form.phtml:44
 msgid ""
 "Only columns with index will be displayed. You can define an index below."
 msgstr ""
 "Sadece indeksi olan sütunlar görüntülenecektir. Aşağıda bir indeks "
 "tanımlayabilirsiniz."
 
-#: templates/tbl_relation/common_form.phtml:49
+#: templates/table/relation/common_form.phtml:49
 msgid "Foreign key constraint"
 msgstr "Dış anahtar kısıtlaması"
 
-#: templates/tbl_relation/common_form.phtml:81
+#: templates/table/relation/common_form.phtml:81
 msgid "+ Add constraint"
 msgstr "+ Kısıtlama ekle"
 
-#: templates/tbl_relation/common_form.phtml:91
+#: templates/table/relation/common_form.phtml:91
 msgid "Choose column to display:"
 msgstr "Görüntülemek için sütun seçin:"
 
-#: templates/tbl_relation/foreign_key_row.phtml:13
+#: templates/table/relation/foreign_key_row.phtml:13
 #, php-format
 msgid "Foreign key constraint %s has been dropped"
 msgstr "Dış anahtar kısıtlaması %s kaldırıldı"
 
-#: templates/tbl_relation/foreign_key_row.phtml:102
+#: templates/table/relation/foreign_key_row.phtml:102
 msgid "Constraint name"
 msgstr "Kısıtlama adı"
 
-#: templates/tbl_relation/foreign_key_row.phtml:157
+#: templates/table/relation/foreign_key_row.phtml:157
 msgid "+ Add column"
 msgstr "+ Sütun ekle"
 
+#: templates/table/search/options.phtml:8
+msgid "Select columns (at least one):"
+msgstr "Sütunları seç (en az bir):"
+
+#: templates/table/search/options.phtml:37
+msgid "Add search conditions (body of the \"where\" clause):"
+msgstr "Arama koşulu ekle (\"where\" koşulu gövdesi):"
+
+#: templates/table/search/options.phtml:45
+msgid "Number of rows per page"
+msgstr "Sayfa başına satır sayısı"
+
+#: templates/table/search/options.phtml:56
+msgid "Display order:"
+msgstr "Görünüm düzeni:"
+
+#: templates/table/search/options_zoom.phtml:6
+msgid "Use this column to label each point"
+msgstr "Bu sütunu her noktayı etiketlemek için kullan"
+
+#: templates/table/search/options_zoom.phtml:35
+msgid "Maximum rows to plot"
+msgstr "Çizim için en fazla satır"
+
+#: templates/table/search/replace_preview.phtml:13
+msgid "Find and replace - preview"
+msgstr "Bul ve değiştir - önizleme"
+
+#: templates/table/search/replace_preview.phtml:18
+msgid "Original string"
+msgstr "Orijinal satır"
+
+#: templates/table/search/replace_preview.phtml:19
+msgid "Replaced string"
+msgstr "Değiştirilmiş satır"
+
+#: templates/table/search/replace_preview.phtml:40
+msgid "Replace"
+msgstr "Değiştir"
+
+#: templates/table/search/rows_zoom.phtml:16
+msgid "Additional search criteria"
+msgstr "İlave arama kriteri"
+
+#: templates/table/search/search_and_replace.phtml:3
+msgid "Replace with:"
+msgstr "Şununla değiştir:"
+
+#: templates/table/search/search_and_replace.phtml:22
+msgid "Use regular expression"
+msgstr "Düzenli ifade kullan"
+
+#: templates/table/search/selection_form.phtml:12
+msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
+msgstr "İki farklı sütun için \"örnekle sorgulama\" (joker: \"%\") yap"
+
+#: templates/table/search/selection_form.phtml:34
+msgid "Do a \"query by example\" (wildcard: \"%\")"
+msgstr "\"Örnekle sorgulama\" yap. (joker: \"%\")"
+
+#: templates/table/search/zoom_result_form.phtml:7
+msgid "Browse/Edit the points"
+msgstr "Noktalara gözat/düzenle"
+
+#: templates/table/search/zoom_result_form.phtml:15
+msgid "How to use"
+msgstr "Nasıl kullanılır"
+
+#: templates/table/search/zoom_result_form.phtml:23
+msgid "Reset zoom"
+msgstr "Odaklamayı sıfırla"
+
+#: templates/table/secondary_tabs.phtml:14
+msgid "Relation view"
+msgstr "Bağlantı görünümü"
+
+#: templates/table/structure/actions_in_table_structure.phtml:14
+#, php-format
+msgid "A primary key has been added on %s."
+msgstr "%s üzerinde birincil anahtar eklendi."
+
+#: templates/table/structure/actions_in_table_structure.phtml:34
+#: templates/table/structure/actions_in_table_structure.phtml:54
+#: templates/table/structure/actions_in_table_structure.phtml:79
+#: templates/table/structure/actions_in_table_structure.phtml:101
+#, php-format
+msgid "An index has been added on %s."
+msgstr "%s üzerinde bir indeks eklendi."
+
+#: templates/table/structure/actions_in_table_structure.phtml:130
+#: templates/table/structure/check_all_table_column.phtml:59
+msgid "Remove from central columns"
+msgstr "Merkezi sütunlardan kaldır"
+
+#: templates/table/structure/actions_in_table_structure.phtml:138
+#: templates/table/structure/check_all_table_column.phtml:55
+msgid "Add to central columns"
+msgstr "Merkezi sütunlara ekle"
+
+#: templates/table/structure/add_column.phtml:7
+#, php-format
+msgid "Add %s column(s)"
+msgstr "%s sütun ekle"
+
+#: templates/table/structure/add_column.phtml:12
+msgid "at beginning of table"
+msgstr "tablonun başı"
+
+#: templates/table/structure/display_structure.phtml:140 view_create.php:181
+msgid "Edit view"
+msgstr "Düzenleme görünümü"
+
+#: templates/table/structure/display_table_stats.phtml:9
+msgid "Space usage"
+msgstr "Alan kullanımı"
+
+#: templates/table/structure/display_table_stats.phtml:32
+msgid "Effective"
+msgstr "Etkili"
+
+#: templates/table/structure/move_columns_dialog.phtml:1
+#: templates/table/structure/optional_action_links.phtml:21
+msgid "Move columns"
+msgstr "Sütunları taşı"
+
+#: templates/table/structure/move_columns_dialog.phtml:2
+msgid "Move the columns by dragging them up and down."
+msgstr "Sütunları yukarı ve aşağı sürükleyerek taşıyın."
+
+#: templates/table/structure/optional_action_links.phtml:9
+msgid "Propose table structure"
+msgstr "Tablo yapısı öner"
+
+#: templates/table/structure/optional_action_links.phtml:24
+msgid "Improve table structure"
+msgstr "Tablo yapısını iyileştir"
+
+#: templates/table/structure/optional_action_links.phtml:30
+msgid "Track view"
+msgstr "İzleme görünümü"
+
+#: templates/table/structure/row_stats_table.phtml:3
+msgid "Row statistics"
+msgstr "Satır istatistikleri"
+
+#: templates/table/structure/row_stats_table.phtml:9
+msgid "static"
+msgstr "sabit"
+
+#: templates/table/structure/row_stats_table.phtml:11
+msgid "dynamic"
+msgstr "değişken"
+
+#: templates/table/structure/row_stats_table.phtml:22
+msgid "partitioned"
+msgstr "bölüme ayrıldı"
+
+#: templates/table/structure/row_stats_table.phtml:54
+msgid "Row length"
+msgstr "Satır uzunluğu"
+
+#: templates/table/structure/row_stats_table.phtml:66
+msgid "Row size"
+msgstr "Satır boyutu"
+
+#: templates/table/structure/row_stats_table.phtml:73
+msgid "Next autoindex"
+msgstr "Sonraki otoindeks"
+
+#: templates/table/structure/table_structure_row.phtml:46
+#, php-format
+msgid "Column %s has been dropped."
+msgstr "%s sütunu kaldırıldı."
+
 #: themes.php:17 themes.php:22
 msgid "Theme"
 msgstr "Tema"
@@ -16843,6 +16865,9 @@ msgstr ""
 msgid "concurrent_insert is set to 0"
 msgstr "concurrent_insert 0'a ayarlı"
 
+#~ msgid "Read as multibytes"
+#~ msgstr "Çoklu bayt olarak oku"
+
 #~ msgid "Relational display column"
 #~ msgstr "Bağlantılı görüntü sütunu"
 
diff --git a/po/tt.po b/po/tt.po
index 39e94c7983..d1ed593ab7 100644
--- a/po/tt.po
+++ b/po/tt.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 4.5.0-dev\n"
 "Report-Msgid-Bugs-To: developers@phpmyadmin.net\n"
-"POT-Creation-Date: 2015-08-08 13:53-0400\n"
+"POT-Creation-Date: 2015-08-12 08:10-0400\n"
 "PO-Revision-Date: 2014-11-05 10:35+0200\n"
 "Last-Translator: Michal Čihař <michal@cihar.com>\n"
 "Language-Team: Tatar <https://hosted.weblate.org/projects/phpmyadmin/master/"
@@ -54,7 +54,7 @@ msgid "Table comments:"
 msgstr "Tüşämä açıqlaması"
 
 #: db_datadict.php:104 libraries/Index.class.php:699
-#: libraries/insert_edit.lib.php:1567
+#: libraries/insert_edit.lib.php:1565
 #: libraries/navigation/Nodes/Node_Column.class.php:30
 #: libraries/plugins/export/ExportHtmlword.class.php:280
 #: libraries/plugins/export/ExportHtmlword.class.php:375
@@ -68,13 +68,14 @@ msgstr "Tüşämä açıqlaması"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1023
 #: libraries/tracking.lib.php:879 libraries/tracking.lib.php:975
 #: templates/columns_definitions/column_name.phtml:18
-#: templates/index_form.phtml:124 templates/table/table_header.phtml:6
-#: templates/table/zoom_result_form.phtml:33
-#: templates/tbl_relation/common_form.phtml:10
-#: templates/tbl_relation/common_form.phtml:43
-#: templates/tbl_relation/foreign_key_row.phtml:194
-#: templates/tbl_relation/foreign_key_row.phtml:206
-#: templates/tbl_relation/internal_relational_row.phtml:71
+#: templates/table/index_form.phtml:124
+#: templates/table/relation/common_form.phtml:10
+#: templates/table/relation/common_form.phtml:43
+#: templates/table/relation/foreign_key_row.phtml:194
+#: templates/table/relation/foreign_key_row.phtml:206
+#: templates/table/relation/internal_relational_row.phtml:71
+#: templates/table/search/table_header.phtml:6
+#: templates/table/search/zoom_result_form.phtml:33
 #, fuzzy
 #| msgid "Column names"
 msgid "Column"
@@ -94,21 +95,21 @@ msgstr "Alan iseme"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1001
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1024
 #: libraries/rte/rte_list.lib.php:75 libraries/rte/rte_list.lib.php:103
-#: libraries/rte/rte_routines.lib.php:802
-#: libraries/rte/rte_routines.lib.php:831
-#: libraries/rte/rte_routines.lib.php:1493
+#: libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_routines.lib.php:922
+#: libraries/rte/rte_routines.lib.php:1584
 #: libraries/server_privileges.lib.php:2369 libraries/tracking.lib.php:880
 #: libraries/tracking.lib.php:972
 #: templates/columns_definitions/table_fields_definitions.phtml:11
-#: templates/structure/table_header.phtml:48
-#: templates/structure/table_structure_header.phtml:6
-#: templates/table/table_header.phtml:7
+#: templates/database/structure/table_header.phtml:48
+#: templates/table/search/table_header.phtml:7
+#: templates/table/structure/table_structure_header.phtml:6
 msgid "Type"
 msgstr "Töre"
 
 #: db_datadict.php:106 libraries/Index.class.php:702
 #: libraries/central_columns.lib.php:708
-#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1576
+#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1574
 #: libraries/plugins/export/ExportHtmlword.class.php:286
 #: libraries/plugins/export/ExportHtmlword.class.php:381
 #: libraries/plugins/export/ExportLatex.class.php:509
@@ -121,8 +122,8 @@ msgstr "Töre"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1026
 #: libraries/tracking.lib.php:882 libraries/tracking.lib.php:978
 #: templates/columns_definitions/table_fields_definitions.phtml:39
-#: templates/structure/table_structure_header.phtml:9
-#: templates/table/zoom_result_form.phtml:34
+#: templates/table/search/zoom_result_form.phtml:34
+#: templates/table/structure/table_structure_header.phtml:9
 msgid "Null"
 msgstr "Buş"
 
@@ -140,8 +141,8 @@ msgstr "Buş"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1027
 #: libraries/replication_gui.lib.php:153 libraries/tracking.lib.php:883
 #: templates/columns_definitions/table_fields_definitions.phtml:25
-#: templates/structure/body_for_table_summary.phtml:55
-#: templates/structure/table_structure_header.phtml:10
+#: templates/database/structure/body_for_table_summary.phtml:55
+#: templates/table/structure/table_structure_header.phtml:10
 msgid "Default"
 msgstr "Töpcay"
 
@@ -169,19 +170,19 @@ msgid "Comments"
 msgstr "Açıqlama"
 
 #: db_datadict.php:146
-#: libraries/controllers/StructureController.class.php:1960
-#: libraries/controllers/StructureController.class.php:1965
+#: libraries/controllers/TableStructureController.class.php:951
+#: libraries/controllers/TableStructureController.class.php:956
 #: libraries/tracking.lib.php:922
 #: templates/columns_definitions/column_indexes.phtml:6
-#: templates/structure/check_all_table_column.phtml:22
-#: templates/structure/display_structure.phtml:74
+#: templates/table/structure/check_all_table_column.phtml:22
+#: templates/table/structure/display_structure.phtml:74
 msgid "Primary"
 msgstr "Töp"
 
 #: db_datadict.php:156 js/messages.php:317 libraries/Index.class.php:567
 #: libraries/Index.class.php:606 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261 libraries/mult_submits.lib.php:403
+#: libraries/config/FormDisplay.tpl.php:272 libraries/mult_submits.lib.php:403
 #: libraries/mult_submits.lib.php:417
 #: libraries/plugins/export/ExportHtmlword.class.php:630
 #: libraries/plugins/export/ExportLatex.class.php:589
@@ -197,20 +198,20 @@ msgstr "Töp"
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1010 libraries/tracking.lib.php:1015
 #: prefs_manage.php:140 templates/prefs_autoload.phtml:15
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "No"
 msgstr "Yuq"
 
 #: db_datadict.php:156 js/messages.php:443 libraries/Index.class.php:568
 #: libraries/Index.class.php:605 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261
-#: libraries/controllers/StructureController.class.php:1344
-#: libraries/controllers/StructureController.class.php:2223
-#: libraries/controllers/StructureController.class.php:2232
-#: libraries/controllers/StructureController.class.php:2237
-#: libraries/controllers/StructureController.class.php:2242
-#: libraries/controllers/StructureController.class.php:2247
+#: libraries/config/FormDisplay.tpl.php:272
+#: libraries/controllers/TableStructureController.class.php:539
+#: libraries/controllers/TableStructureController.class.php:1201
+#: libraries/controllers/TableStructureController.class.php:1210
+#: libraries/controllers/TableStructureController.class.php:1215
+#: libraries/controllers/TableStructureController.class.php:1220
+#: libraries/controllers/TableStructureController.class.php:1225
 #: libraries/mult_submits.inc.php:82 libraries/mult_submits.inc.php:178
 #: libraries/mult_submits.lib.php:339 libraries/mult_submits.lib.php:372
 #: libraries/mult_submits.lib.php:401 libraries/mult_submits.lib.php:415
@@ -219,8 +220,8 @@ msgstr "Yuq"
 #: libraries/plugins/export/ExportOdt.class.php:756
 #: libraries/plugins/export/ExportTexytext.class.php:567
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1077
-#: libraries/server_databases.lib.php:464
-#: libraries/server_databases.lib.php:474
+#: libraries/server_databases.lib.php:475
+#: libraries/server_databases.lib.php:485
 #: libraries/server_privileges.lib.php:2546
 #: libraries/server_privileges.lib.php:2727
 #: libraries/server_privileges.lib.php:2748
@@ -230,7 +231,7 @@ msgstr "Yuq"
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1008 libraries/tracking.lib.php:1013
 #: prefs_manage.php:138 templates/prefs_autoload.phtml:14
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "Yes"
 msgstr "Äye"
 
@@ -240,7 +241,7 @@ msgstr "Biremlek eçtälegen (tözeleşen) çığaru"
 
 #: db_export.php:37 db_tracking.php:90 export.php:382
 #: libraries/DBQbe.class.php:326
-#: libraries/controllers/StructureController.class.php:231
+#: libraries/controllers/DatabaseStructureController.class.php:170
 #: libraries/navigation/NavigationTree.class.php:897
 msgid "No tables found in database."
 msgstr "Bu biremlektä ber genä dä tüşämä yuq."
@@ -251,14 +252,14 @@ msgstr "Bu biremlektä ber genä dä tüşämä yuq."
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:26
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:120
-#: templates/structure/show_create.phtml:18
+#: templates/database/structure/show_create.phtml:18
 msgid "Tables"
 msgstr "Tüşämä"
 
 #: db_export.php:52 libraries/Menu.class.php:317 libraries/Menu.class.php:425
-#: libraries/Util.class.php:3333 libraries/Util.class.php:3343
-#: libraries/Util.class.php:3349 libraries/Util.class.php:3629
-#: libraries/Util.class.php:4327 libraries/Util.class.php:4344
+#: libraries/Util.class.php:3339 libraries/Util.class.php:3349
+#: libraries/Util.class.php:3355 libraries/Util.class.php:3635
+#: libraries/Util.class.php:4333 libraries/Util.class.php:4350
 #: libraries/central_columns.lib.php:728 libraries/config.values.php:39
 #: libraries/config.values.php:47 libraries/config.values.php:109
 #: libraries/config.values.php:115 libraries/config/setup.forms.php:323
@@ -272,7 +273,7 @@ msgstr "Tüşämä"
 #: libraries/navigation/Nodes/Node_Table.class.php:283
 #: libraries/server_privileges.lib.php:1141 libraries/tracking.lib.php:874
 #: templates/columns_definitions/table_fields_definitions.phtml:3
-#: templates/designer/table_list.phtml:28
+#: templates/database/designer/table_list.phtml:28
 msgid "Structure"
 msgstr "Tözeleş"
 
@@ -284,7 +285,7 @@ msgstr "Tözeleş"
 #: libraries/config/user_preferences.forms.php:292
 #: libraries/config/user_preferences.forms.php:297
 #: libraries/server_privileges.lib.php:1140
-#: templates/structure/display_table_stats.phtml:12
+#: templates/table/structure/display_table_stats.phtml:12
 msgid "Data"
 msgstr "Eçtälek"
 
@@ -370,10 +371,10 @@ msgstr "Tüşämä tikşerü"
 #: libraries/server_privileges.lib.php:2908
 #: libraries/server_privileges.lib.php:3145
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4346
-#: templates/structure/table_header.phtml:21
-#: templates/tbl_relation/foreign_key_row.phtml:176
-#: templates/tbl_relation/internal_relational_row.phtml:63
+#: libraries/server_privileges.lib.php:4372
+#: templates/database/structure/table_header.phtml:21
+#: templates/table/relation/foreign_key_row.phtml:176
+#: templates/table/relation/internal_relational_row.phtml:63
 msgid "Table"
 msgstr "Tüşämä"
 
@@ -392,7 +393,7 @@ msgid "Updated"
 msgstr ""
 
 #: db_tracking.php:130 js/messages.php:243 libraries/Menu.class.php:552
-#: libraries/Util.class.php:4314 libraries/config.values.php:104
+#: libraries/Util.class.php:4320 libraries/config.values.php:104
 #: libraries/rte/rte_events.lib.php:393 libraries/rte/rte_list.lib.php:101
 #: libraries/server_status_processes.lib.php:92 libraries/tracking.lib.php:279
 msgid "Status"
@@ -401,14 +402,15 @@ msgstr "Torış"
 #: db_tracking.php:131 db_tracking.php:290 libraries/Index.class.php:693
 #: libraries/central_columns.lib.php:687 libraries/rte/rte_list.lib.php:74
 #: libraries/rte/rte_list.lib.php:89 libraries/rte/rte_list.lib.php:102
-#: libraries/server_databases.lib.php:398
+#: libraries/server_databases.lib.php:409
 #: libraries/server_privileges.lib.php:2372
 #: libraries/server_privileges.lib.php:3166
 #: libraries/server_privileges.lib.php:3342
 #: libraries/server_user_groups.lib.php:82
 #: libraries/server_variables.lib.php:189 libraries/tracking.lib.php:280
-#: libraries/tracking.lib.php:793 templates/structure/table_header.phtml:30
-#: templates/structure/table_structure_header.phtml:23
+#: libraries/tracking.lib.php:793
+#: templates/database/structure/table_header.phtml:30
+#: templates/table/structure/table_structure_header.phtml:23
 msgid "Action"
 msgstr "Eş"
 
@@ -455,7 +457,7 @@ msgid "Untracked tables"
 msgstr "Tüşämä tikşerü"
 
 #: db_tracking.php:305 db_tracking.php:336
-#: templates/structure/optional_action_links.phtml:17
+#: templates/table/structure/optional_action_links.phtml:17
 #, fuzzy
 msgid "Track table"
 msgstr "Tüşämä tikşerü"
@@ -512,7 +514,7 @@ msgid "Value for the column \"%s\""
 msgstr ""
 
 #: gis_data_editor.php:146
-#: templates/gis_visualization/gis_visualization.phtml:37
+#: templates/table/gis_visualization/gis_visualization.phtml:37
 msgid "Use OpenStreetMaps as Base Layer"
 msgstr ""
 
@@ -603,35 +605,35 @@ msgstr "Yaña qullanuçı östäw"
 #: libraries/display_change_password.lib.php:162
 #: libraries/display_export.lib.php:402 libraries/display_export.lib.php:408
 #: libraries/display_import.lib.php:392 libraries/index.lib.php:44
-#: libraries/insert_edit.lib.php:1546 libraries/insert_edit.lib.php:1583
+#: libraries/insert_edit.lib.php:1544 libraries/insert_edit.lib.php:1581
 #: libraries/normalization.lib.php:165 libraries/normalization.lib.php:821
 #: libraries/operations.lib.php:38 libraries/operations.lib.php:108
 #: libraries/operations.lib.php:263 libraries/operations.lib.php:306
 #: libraries/operations.lib.php:801 libraries/operations.lib.php:874
 #: libraries/operations.lib.php:923 libraries/operations.lib.php:1337
 #: libraries/operations.lib.php:1658
-#: libraries/plugins/auth/AuthenticationCookie.class.php:244
+#: libraries/plugins/auth/AuthenticationCookie.class.php:232
 #: libraries/replication_gui.lib.php:122 libraries/replication_gui.lib.php:161
 #: libraries/replication_gui.lib.php:324 libraries/replication_gui.lib.php:461
 #: libraries/replication_gui.lib.php:906 libraries/rte/rte_events.lib.php:509
-#: libraries/rte/rte_routines.lib.php:969
-#: libraries/rte/rte_routines.lib.php:1581
+#: libraries/rte/rte_routines.lib.php:1060
+#: libraries/rte/rte_routines.lib.php:1672
 #: libraries/rte/rte_triggers.lib.php:396 libraries/server_bin_log.lib.php:61
 #: libraries/server_privileges.lib.php:705
 #: libraries/server_privileges.lib.php:2106
 #: libraries/server_privileges.lib.php:2872
 #: libraries/server_privileges.lib.php:3553
-#: libraries/server_privileges.lib.php:4627
+#: libraries/server_privileges.lib.php:4653
 #: libraries/server_user_groups.lib.php:285
 #: libraries/sql_query_form.lib.php:369 libraries/sql_query_form.lib.php:429
 #: libraries/tracking.lib.php:533 libraries/tracking.lib.php:653
 #: prefs_manage.php:277 prefs_manage.php:355
 #: templates/columns_definitions/column_definitions_form.phtml:59
-#: templates/header_location.phtml:17 templates/index_form.phtml:238
+#: templates/database/create_table.phtml:21 templates/header_location.phtml:28
 #: templates/startAndNumberOfRowsPanel.phtml:14
-#: templates/structure/add_column.phtml:25
-#: templates/table/create_table.phtml:21
-#: templates/table/selection_form.phtml:75 view_create.php:275
+#: templates/table/index_form.phtml:238
+#: templates/table/search/selection_form.phtml:75
+#: templates/table/structure/add_column.phtml:25 view_create.php:275
 #: view_operations.php:106
 msgid "Go"
 msgstr "Äydä"
@@ -715,7 +717,7 @@ msgstr ""
 msgid "Could not load import plugins, please check your installation!"
 msgstr "Totaşmalar yökläp bulmadı, quyılışın tikşerep alası!"
 
-#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1466
+#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1460
 #, fuzzy, php-format
 #| msgid "Bookmark %s created"
 msgid "Bookmark %s has been created."
@@ -750,12 +752,12 @@ msgstr ""
 msgid "Back"
 msgstr "Kire"
 
-#: index.php:148 libraries/Footer.class.php:70
+#: index.php:149 libraries/Footer.class.php:70
 #, fuzzy
 msgid "phpMyAdmin Demo Server"
 msgstr "phpMyAdmin qullanması"
 
-#: index.php:152
+#: index.php:153
 #, php-format
 msgid ""
 "You are using the demo server. You can do anything here, but please do not "
@@ -763,49 +765,49 @@ msgid ""
 "at %s."
 msgstr ""
 
-#: index.php:162
+#: index.php:163
 #, fuzzy
 #| msgid "General relation features"
 msgid "General Settings"
 msgstr "Bäyläneşlär buyınça töp mömkinleklär"
 
-#: index.php:190 libraries/display_change_password.lib.php:50
+#: index.php:191 libraries/display_change_password.lib.php:50
 #: libraries/display_change_password.lib.php:53 user_password.php:247
 msgid "Change password"
 msgstr "Sersüz üzgärtü"
 
-#: index.php:206
+#: index.php:207
 #, fuzzy
 #| msgid "MySQL connection collation"
 msgid "Server connection collation"
 msgstr "MySQL-totaşunıñ tezü cayı"
 
-#: index.php:228
+#: index.php:229
 msgid "Appearance Settings"
 msgstr ""
 
-#: index.php:258 prefs_manage.php:285
+#: index.php:259 prefs_manage.php:285
 #, fuzzy
 #| msgid "General relation features"
 msgid "More settings"
 msgstr "Bäyläneşlär buyınça töp mömkinleklär"
 
-#: index.php:279
+#: index.php:280
 #, fuzzy
 #| msgid "Database for user"
 msgid "Database server"
 msgstr "Qullanuçı biremlege"
 
-#: index.php:282 libraries/plugins/auth/AuthenticationCookie.class.php:181
+#: index.php:283 libraries/plugins/auth/AuthenticationCookie.class.php:169
 msgid "Server:"
 msgstr "Server:"
 
-#: index.php:286
+#: index.php:287
 #, fuzzy
 msgid "Server type:"
 msgstr "Server ID'e"
 
-#: index.php:290 libraries/plugins/export/ExportLatex.class.php:212
+#: index.php:291 libraries/plugins/export/ExportLatex.class.php:212
 #: libraries/plugins/export/ExportSql.class.php:687
 #: libraries/plugins/export/ExportXml.class.php:189
 #, fuzzy
@@ -813,86 +815,86 @@ msgstr "Server ID'e"
 msgid "Server version:"
 msgstr "Server söreme"
 
-#: index.php:296
+#: index.php:297
 #, fuzzy
 #| msgid "Protocol version"
 msgid "Protocol version:"
 msgstr "Protokol söreme"
 
-#: index.php:300
+#: index.php:301
 #, fuzzy
 #| msgid "User"
 msgid "User:"
 msgstr "Qullanuçı"
 
-#: index.php:305
+#: index.php:306
 #, fuzzy
 msgid "Server charset:"
 msgstr "Server Saylaw"
 
-#: index.php:320
+#: index.php:321
 msgid "Web server"
 msgstr ""
 
-#: index.php:331
+#: index.php:332
 #, fuzzy
 msgid "Database client version:"
 msgstr "MySQL belän totaştırğıç söreme"
 
-#: index.php:335
+#: index.php:336
 #, fuzzy
 msgid "PHP extension:"
 msgstr "PHP Söreme"
 
-#: index.php:349
+#: index.php:350
 #, fuzzy
 #| msgid "PHP Version"
 msgid "PHP version:"
 msgstr "PHP Söreme"
 
-#: index.php:360
+#: index.php:361
 msgid "Show PHP information"
 msgstr "PHP turında"
 
-#: index.php:383
+#: index.php:384
 #, fuzzy
 #| msgid "Version information"
 msgid "Version information:"
 msgstr "Söreme turında"
 
-#: index.php:392 libraries/Util.class.php:432 libraries/Util.class.php:495
-#: libraries/config/FormDisplay.tpl.php:151
+#: index.php:393 libraries/Util.class.php:432 libraries/Util.class.php:495
+#: libraries/config/FormDisplay.tpl.php:162
 #: libraries/display_export.lib.php:577 libraries/engines/pbxt.lib.php:162
 #: libraries/navigation/NavigationHeader.class.php:196
 #: libraries/server_variables.lib.php:160
 msgid "Documentation"
 msgstr "Qullanma"
 
-#: index.php:399
+#: index.php:400
 msgid "Wiki"
 msgstr ""
 
-#: index.php:408
+#: index.php:409
 msgid "Official Homepage"
 msgstr "phpMyAdmin säxifäse"
 
-#: index.php:415
+#: index.php:416
 #, fuzzy
 #| msgid "Attributes"
 msgid "Contribute"
 msgstr "Üzençälek"
 
-#: index.php:422
+#: index.php:423
 msgid "Get support"
 msgstr ""
 
-#: index.php:429
+#: index.php:430
 #, fuzzy
 #| msgid "No change"
 msgid "List of changes"
 msgstr "Üzgäreşsez"
 
-#: index.php:451
+#: index.php:452
 #, fuzzy
 #| msgid ""
 #| "Your configuration file contains settings (root with no password) that "
@@ -909,7 +911,7 @@ msgstr ""
 "xisap saylanğan (sersüzsez \"root\"). MySQL-server şul töp xisap belän "
 "açılğan da, andıy xällär iminlekneñ citdi tişege tip sanala."
 
-#: index.php:468
+#: index.php:469
 msgid ""
 "You have enabled mbstring.func_overload in your PHP configuration. This "
 "option is incompatible with phpMyAdmin and might cause some data to be "
@@ -918,7 +920,7 @@ msgstr ""
 "You have enabled mbstring.func_overload in your PHP configuration. This "
 "option is incompatible with phpMyAdmin and might cause breaking of some data!"
 
-#: index.php:483
+#: index.php:484
 msgid ""
 "The mbstring PHP extension was not found and you seem to be using a "
 "multibyte charset. Without the mbstring extension phpMyAdmin is unable to "
@@ -928,7 +930,7 @@ msgstr ""
 "charset. Without mbstring extension phpMyAdmin is unable to split strings "
 "correctly and it may result in unexpected results."
 
-#: index.php:500
+#: index.php:501
 msgid ""
 "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini."
 "session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower than "
@@ -936,17 +938,17 @@ msgid ""
 "expire sooner than configured in phpMyAdmin."
 msgstr ""
 
-#: index.php:519
+#: index.php:520
 msgid ""
 "Login cookie store is lower than cookie validity configured in phpMyAdmin, "
 "because of this, your login will expire sooner than configured in phpMyAdmin."
 msgstr ""
 
-#: index.php:535
+#: index.php:536
 msgid "The configuration file now needs a secret passphrase (blowfish_secret)."
 msgstr ""
 
-#: index.php:548
+#: index.php:549
 msgid ""
 "Directory [code]config[/code], which is used by the setup script, still "
 "exists in your phpMyAdmin directory. It is strongly recommended to remove it "
@@ -954,7 +956,7 @@ msgid ""
 "may be compromised by unauthorized people downloading your configuration."
 msgstr ""
 
-#: index.php:564
+#: index.php:565
 #, fuzzy, php-format
 #| msgid ""
 #| " additional features for working with linked tables have been ctivated. "
@@ -966,19 +968,19 @@ msgstr ""
 "Bäyläneştä torğan tüşämä belän eşläp bulmas, östämä eşli-alu sünek tora. Anı "
 "qabızu öçen, %sbonda çirtäse%s."
 
-#: index.php:571
+#: index.php:572
 msgid ""
 "Or alternately go to 'Operations' tab of any database to set it up there."
 msgstr ""
 
-#: index.php:620
+#: index.php:621
 #, php-format
 msgid ""
 "Your PHP MySQL library version %s differs from your MySQL server version %s. "
 "This may cause unpredictable behavior."
 msgstr ""
 
-#: index.php:648
+#: index.php:649
 #, php-format
 msgid ""
 "Server running with Suhosin. Please refer to %sdocumentation%s for possible "
@@ -1150,8 +1152,8 @@ msgstr ""
 msgid "Save & Close"
 msgstr "Biremgä saqlıysı"
 
-#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:404
-#: libraries/insert_edit.lib.php:1550 prefs_manage.php:361
+#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:415
+#: libraries/insert_edit.lib.php:1548 prefs_manage.php:361
 #: prefs_manage.php:372
 msgid "Reset"
 msgstr "Awdar"
@@ -1196,7 +1198,7 @@ msgstr "Tezeş"
 msgid "Edit Index"
 msgstr "Kiläse yazma üzgärtü"
 
-#: js/messages.php:99 templates/index_form.phtml:232
+#: js/messages.php:99 templates/table/index_form.phtml:232
 #, fuzzy, php-format
 #| msgid "Add %s field(s)"
 msgid "Add %s column(s) to index"
@@ -1226,15 +1228,16 @@ msgstr "Alan yaptıruçı bilge"
 msgid "Please select column(s) for the index."
 msgstr "%s alan östäw"
 
-#: js/messages.php:106 templates/structure/add_column.phtml:1
+#: js/messages.php:106 templates/table/structure/add_column.phtml:1
 #, fuzzy
 #| msgid "You have to add at least one field."
 msgid "You have to add at least one column."
 msgstr "Kimendä berär alan kertäse."
 
-#: js/messages.php:109 libraries/insert_edit.lib.php:1548
+#: js/messages.php:109 libraries/insert_edit.lib.php:1546
 #: templates/columns_definitions/column_definitions_form.phtml:162
-#: templates/index_form.phtml:237 templates/tbl_relation/common_form.phtml:106
+#: templates/table/index_form.phtml:237
+#: templates/table/relation/common_form.phtml:106
 msgid "Preview SQL"
 msgstr ""
 
@@ -1257,7 +1260,7 @@ msgid "SQL query:"
 msgstr "SQL-soraw"
 
 #. l10n: Default label for the y-Axis of Charts
-#: js/messages.php:118 templates/tbl_chart.phtml:109
+#: js/messages.php:118 templates/table/chart/tbl_chart.phtml:109
 #, fuzzy
 #| msgid "Value"
 msgid "Y Values"
@@ -1436,7 +1439,7 @@ msgstr ""
 msgid "Bytes received"
 msgstr "Alındı"
 
-#: js/messages.php:169 libraries/server_status.lib.php:226
+#: js/messages.php:169 libraries/server_status.lib.php:235
 msgid "Connections"
 msgstr "Totaşular"
 
@@ -1495,12 +1498,12 @@ msgstr "%s tüşämä"
 msgid "Questions"
 msgstr "Farsíça"
 
-#: js/messages.php:184 libraries/server_status.lib.php:134
+#: js/messages.php:184 libraries/server_status.lib.php:143
 msgid "Traffic"
 msgstr "Taşım"
 
 #: js/messages.php:185 libraries/Menu.class.php:586
-#: libraries/Util.class.php:4318 libraries/server_status_monitor.lib.php:257
+#: libraries/Util.class.php:4324 libraries/server_status_monitor.lib.php:257
 #, fuzzy
 #| msgid "General relation features"
 msgid "Settings"
@@ -1522,8 +1525,9 @@ msgstr ""
 #: libraries/server_status_monitor.lib.php:236
 #: libraries/server_status_processes.lib.php:308
 #: templates/columns_definitions/transformation.phtml:4
-#: templates/designer/options_panel.phtml:178
-#: templates/table/options_zoom.phtml:12 templates/table/rows_zoom.phtml:26
+#: templates/database/designer/options_panel.phtml:178
+#: templates/table/search/options_zoom.phtml:12
+#: templates/table/search/rows_zoom.phtml:26
 msgid "None"
 msgstr "Buş"
 
@@ -1825,8 +1829,8 @@ msgstr ""
 
 #: js/messages.php:270 libraries/Menu.class.php:352
 #: libraries/Menu.class.php:455 libraries/Menu.class.php:582
-#: libraries/Util.class.php:4317 libraries/Util.class.php:4332
-#: libraries/Util.class.php:4349 libraries/config/messages.inc.php:258
+#: libraries/Util.class.php:4323 libraries/Util.class.php:4338
+#: libraries/Util.class.php:4355 libraries/config/messages.inc.php:258
 #: libraries/display_import.lib.php:105
 #: libraries/server_status_monitor.lib.php:318 prefs_manage.php:238
 #: setup/frames/menu.inc.php:26
@@ -1894,13 +1898,13 @@ msgid "Formatting SQL..."
 msgstr ""
 
 #: js/messages.php:293 libraries/server_variables.lib.php:157
-#: templates/designer/aggregate_query_panel.phtml:63
-#: templates/designer/delete_relation_panel.phtml:28
-#: templates/designer/having_query_panel.phtml:117
-#: templates/designer/new_relation_panel.phtml:88
-#: templates/designer/options_panel.phtml:253
-#: templates/designer/rename_to_panel.phtml:45
-#: templates/designer/where_query_panel.phtml:83
+#: templates/database/designer/aggregate_query_panel.phtml:63
+#: templates/database/designer/delete_relation_panel.phtml:28
+#: templates/database/designer/having_query_panel.phtml:117
+#: templates/database/designer/new_relation_panel.phtml:88
+#: templates/database/designer/options_panel.phtml:253
+#: templates/database/designer/rename_to_panel.phtml:45
+#: templates/database/designer/where_query_panel.phtml:83
 msgid "Cancel"
 msgstr ""
 
@@ -1910,7 +1914,7 @@ msgstr ""
 msgid "Page-related settings"
 msgstr "Bäyläneşlär buyınça töp mömkinleklär"
 
-#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:402
+#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:413
 msgid "Apply"
 msgstr ""
 
@@ -1948,8 +1952,8 @@ msgstr ""
 msgid "Error text: %s"
 msgstr ""
 
-#: js/messages.php:307 libraries/db_common.inc.php:68
-#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:450
+#: js/messages.php:307 libraries/db_common.inc.php:69
+#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:461
 msgid "No databases selected."
 msgstr "Biremlek saylanmağan."
 
@@ -1961,12 +1965,13 @@ msgstr ""
 msgid "Adding Primary Key"
 msgstr ""
 
-#: js/messages.php:310 templates/designer/aggregate_query_panel.phtml:59
-#: templates/designer/having_query_panel.phtml:113
-#: templates/designer/new_relation_panel.phtml:87
-#: templates/designer/options_panel.phtml:252
-#: templates/designer/rename_to_panel.phtml:41
-#: templates/designer/where_query_panel.phtml:82
+#: js/messages.php:310
+#: templates/database/designer/aggregate_query_panel.phtml:59
+#: templates/database/designer/having_query_panel.phtml:113
+#: templates/database/designer/new_relation_panel.phtml:87
+#: templates/database/designer/options_panel.phtml:252
+#: templates/database/designer/rename_to_panel.phtml:41
+#: templates/database/designer/where_query_panel.phtml:82
 msgid "OK"
 msgstr "OK"
 
@@ -1992,7 +1997,7 @@ msgstr "Biremlekne boña kübäyt"
 msgid "Changing Charset"
 msgstr "Bilgelämä"
 
-#: js/messages.php:320 libraries/Util.class.php:3217
+#: js/messages.php:320 libraries/Util.class.php:3223
 #, fuzzy
 #| msgid "Disable foreign key checks"
 msgid "Enable foreign key checks"
@@ -2037,20 +2042,21 @@ msgstr ""
 #: js/messages.php:334 libraries/DisplayResults.class.php:4834
 #: libraries/DisplayResults.class.php:5092 libraries/Menu.class.php:344
 #: libraries/Menu.class.php:446 libraries/Menu.class.php:578
-#: libraries/Util.class.php:3636 libraries/Util.class.php:3637
-#: libraries/Util.class.php:4316 libraries/Util.class.php:4331
-#: libraries/Util.class.php:4348 libraries/config/messages.inc.php:252
+#: libraries/Util.class.php:3642 libraries/Util.class.php:3643
+#: libraries/Util.class.php:4322 libraries/Util.class.php:4337
+#: libraries/Util.class.php:4354 libraries/config/messages.inc.php:252
 #: libraries/display_export.lib.php:173 libraries/rte/rte_list.lib.php:146
 #: libraries/server_privileges.lib.php:2211
 #: libraries/server_privileges.lib.php:2290
 #: libraries/server_privileges.lib.php:2632
 #: libraries/server_privileges.lib.php:3356
 #: libraries/server_status_monitor.lib.php:322 prefs_manage.php:303
-#: setup/frames/menu.inc.php:27 templates/structure/check_all_tables.phtml:11
+#: setup/frames/menu.inc.php:27
+#: templates/database/structure/check_all_tables.phtml:11
 msgid "Export"
 msgstr "Export"
 
-#: js/messages.php:337 libraries/rte/rte_routines.lib.php:652
+#: js/messages.php:337 libraries/rte/rte_routines.lib.php:743
 msgid "ENUM/SET editor"
 msgstr ""
 
@@ -2092,7 +2098,7 @@ msgstr "SQL-soraw"
 #: libraries/Console.class.php:214 libraries/DisplayResults.class.php:3474
 #: libraries/DisplayResults.class.php:4818 libraries/Index.class.php:723
 #: libraries/Util.class.php:706 libraries/Util.class.php:1202
-#: libraries/Util.class.php:3634 libraries/Util.class.php:3635
+#: libraries/Util.class.php:3640 libraries/Util.class.php:3641
 #: libraries/central_columns.lib.php:851
 #: libraries/central_columns.lib.php:1193
 #: libraries/config/messages.inc.php:892
@@ -2110,7 +2116,7 @@ msgstr "Tözätü"
 #: libraries/server_user_groups.lib.php:129
 #: libraries/sql_query_form.lib.php:416 libraries/tracking.lib.php:477
 #: setup/frames/index.inc.php:183 setup/frames/index.inc.php:291
-#: templates/designer/delete_relation_panel.phtml:27
+#: templates/database/designer/delete_relation_panel.phtml:27
 msgid "Delete"
 msgstr "Sal"
 
@@ -2291,11 +2297,11 @@ msgid "No dependencies selected!"
 msgstr "Biremlek saylanmağan."
 
 #: js/messages.php:394 libraries/central_columns.lib.php:1214
-#: libraries/insert_edit.lib.php:1458 libraries/server_variables.lib.php:155
+#: libraries/insert_edit.lib.php:1456 libraries/server_variables.lib.php:155
 #: setup/frames/config.inc.php:42 setup/frames/index.inc.php:279
 #: templates/columns_definitions/column_definitions_form.phtml:165
-#: templates/gis_visualization/gis_visualization.phtml:48
-#: templates/tbl_relation/common_form.phtml:107
+#: templates/table/gis_visualization/gis_visualization.phtml:48
+#: templates/table/relation/common_form.phtml:107
 msgid "Save"
 msgstr "Saqla"
 
@@ -2387,8 +2393,8 @@ msgid "Data point content"
 msgstr "Data pointer olılığı"
 
 #: js/messages.php:430 js/messages.php:562 js/messages.php:579
-#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2573
-#: templates/index_form.phtml:154 templates/index_form.phtml:194
+#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2571
+#: templates/table/index_form.phtml:154 templates/table/index_form.phtml:194
 msgid "Ignore"
 msgstr "Qarama"
 
@@ -2449,8 +2455,8 @@ msgstr ""
 msgid "Please select the primary key or a unique key!"
 msgstr ""
 
-#: js/messages.php:457 templates/designer/side_menu.phtml:91
-#: templates/designer/side_menu.phtml:94
+#: js/messages.php:457 templates/database/designer/side_menu.phtml:91
+#: templates/database/designer/side_menu.phtml:94
 #, fuzzy
 #| msgid "Choose field to display"
 msgid "Choose column to display"
@@ -2468,22 +2474,22 @@ msgstr ""
 msgid "Page name"
 msgstr "Bitneñ sanı:"
 
-#: js/messages.php:463 templates/designer/side_menu.phtml:56
-#: templates/designer/side_menu.phtml:59
+#: js/messages.php:463 templates/database/designer/side_menu.phtml:56
+#: templates/database/designer/side_menu.phtml:59
 #, fuzzy
 #| msgid "Select Tables"
 msgid "Save page"
 msgstr "Tüşämä Saylaw"
 
-#: js/messages.php:464 templates/designer/side_menu.phtml:63
-#: templates/designer/side_menu.phtml:66
+#: js/messages.php:464 templates/database/designer/side_menu.phtml:63
+#: templates/database/designer/side_menu.phtml:66
 #, fuzzy
 #| msgid "Select Tables"
 msgid "Save page as"
 msgstr "Tüşämä Saylaw"
 
-#: js/messages.php:465 templates/designer/side_menu.phtml:49
-#: templates/designer/side_menu.phtml:52
+#: js/messages.php:465 templates/database/designer/side_menu.phtml:49
+#: templates/database/designer/side_menu.phtml:52
 #, fuzzy
 #| msgid "Free pages"
 msgid "Open page"
@@ -2495,7 +2501,7 @@ msgstr "Buş bit sanı"
 msgid "Delete page"
 msgstr "Tüşämä Saylaw"
 
-#: js/messages.php:467 templates/designer/side_menu.phtml:10
+#: js/messages.php:467 templates/database/designer/side_menu.phtml:10
 msgid "Untitled"
 msgstr ""
 
@@ -2617,7 +2623,7 @@ msgstr "Tärtip buyınça urın"
 msgid "cancel"
 msgstr ""
 
-#: js/messages.php:499 libraries/server_status.lib.php:271
+#: js/messages.php:499 libraries/server_status.lib.php:280
 msgid "Aborted"
 msgstr "Özderelde"
 
@@ -3296,7 +3302,7 @@ msgstr "%d digäne yazma sanı öçen kileşmi."
 
 #: js/messages.php:793 libraries/Message.class.php:199
 #: libraries/Util.class.php:654 libraries/core.lib.php:245
-#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1172
+#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1170
 #: tbl_operations.php:229 view_operations.php:63
 msgid "Error"
 msgstr "Xata"
@@ -3356,8 +3362,8 @@ msgstr "sekund sayın"
 msgid "per minute"
 msgstr "minut sayın"
 
-#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:143
-#: libraries/server_status.lib.php:228
+#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:152
+#: libraries/server_status.lib.php:237
 #: libraries/server_status_queries.lib.php:98
 msgid "per hour"
 msgstr "säğät sayın"
@@ -3375,7 +3381,7 @@ msgstr ""
 msgid "Wrong permissions on configuration file, should not be world writable!"
 msgstr ""
 
-#: libraries/Config.class.php:1799
+#: libraries/Config.class.php:1801
 msgid "Font size"
 msgstr ""
 
@@ -3405,10 +3411,10 @@ msgstr "sorawda"
 #: libraries/server_privileges.lib.php:2890
 #: libraries/server_privileges.lib.php:3144
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4332
+#: libraries/server_privileges.lib.php:4358
 #: libraries/server_status_processes.lib.php:80
-#: templates/tbl_relation/foreign_key_row.phtml:165
-#: templates/tbl_relation/internal_relational_row.phtml:55
+#: templates/table/relation/foreign_key_row.phtml:165
+#: templates/table/relation/internal_relational_row.phtml:55
 msgid "Database"
 msgstr "Biremlek"
 
@@ -3514,11 +3520,11 @@ msgstr "SQL-taríxı"
 #: libraries/plugins/import/ImportMediawiki.class.php:60
 #: libraries/plugins/import/ImportOds.class.php:59
 #: libraries/plugins/import/ImportShp.class.php:57
-#: libraries/plugins/import/ImportSql.class.php:148
+#: libraries/plugins/import/ImportSql.class.php:51
 #: libraries/plugins/import/ImportXml.class.php:58
-#: libraries/rte/rte_routines.lib.php:833 templates/index_form.phtml:49
-#: templates/structure/row_stats_table.phtml:20
-#: templates/table/options.phtml:2
+#: libraries/rte/rte_routines.lib.php:924 templates/table/index_form.phtml:49
+#: templates/table/search/options.phtml:2
+#: templates/table/structure/row_stats_table.phtml:20
 #, fuzzy
 msgid "Options"
 msgstr "Eşkärtü"
@@ -3562,7 +3568,8 @@ msgstr "Kimep"
 msgid "Order:"
 msgstr ""
 
-#: libraries/Console.class.php:289 templates/table/replace_preview.phtml:17
+#: libraries/Console.class.php:289
+#: templates/table/search/replace_preview.phtml:17
 #, fuzzy
 #| msgid "Column names"
 msgid "Count"
@@ -3683,9 +3690,9 @@ msgstr "Kübäytelgän tüşämägä küçäse"
 #: libraries/operations.lib.php:794 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:191
-#: templates/structure/sortable_header.phtml:21
-#: templates/structure/sortable_header.phtml:38
-#: templates/table/options.phtml:68
+#: templates/database/structure/sortable_header.phtml:21
+#: templates/database/structure/sortable_header.phtml:38
+#: templates/table/search/options.phtml:68
 msgid "Ascending"
 msgstr "Artıp"
 
@@ -3695,13 +3702,14 @@ msgstr "Artıp"
 #: libraries/operations.lib.php:797 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:188
-#: templates/structure/sortable_header.phtml:26
-#: templates/structure/sortable_header.phtml:43
-#: templates/table/options.phtml:69
+#: templates/database/structure/sortable_header.phtml:26
+#: templates/database/structure/sortable_header.phtml:43
+#: templates/table/search/options.phtml:69
 msgid "Descending"
 msgstr "Kimep"
 
-#: libraries/DBQbe.class.php:467 templates/table/search_and_replace.phtml:6
+#: libraries/DBQbe.class.php:467
+#: templates/table/search/search_and_replace.phtml:6
 #, fuzzy
 #| msgid "Column names"
 msgid "Column:"
@@ -3888,12 +3896,12 @@ msgid_plural "%1$s matches in <strong>%2$s</strong>"
 msgstr[0] "%s kileşü bar, <i>%s</i> atlı tüşämädä"
 
 #: libraries/DbSearch.class.php:354 libraries/Menu.class.php:311
-#: libraries/Util.class.php:3337 libraries/Util.class.php:3347
-#: libraries/Util.class.php:3623 libraries/Util.class.php:3624
-#: libraries/Util.class.php:4343 libraries/config.values.php:43
+#: libraries/Util.class.php:3343 libraries/Util.class.php:3353
+#: libraries/Util.class.php:3629 libraries/Util.class.php:3630
+#: libraries/Util.class.php:4349 libraries/config.values.php:43
 #: libraries/config.values.php:51 libraries/config.values.php:119
 #: libraries/navigation/Nodes/Node_Table.class.php:295
-#: templates/structure/check_all_table_column.phtml:5
+#: templates/table/structure/check_all_table_column.phtml:5
 msgid "Browse"
 msgstr "Küzätü"
 
@@ -3913,7 +3921,8 @@ msgstr "Biremlektä ezläw"
 msgid "Words or values to search for (wildcard: \"%\"):"
 msgstr "Tabası süz/bäyä tezmäse (almaşbilgese: \"%\"):"
 
-#: libraries/DbSearch.class.php:401 templates/table/search_and_replace.phtml:1
+#: libraries/DbSearch.class.php:401
+#: templates/table/search/search_and_replace.phtml:1
 msgid "Find:"
 msgstr "Ezläw:"
 
@@ -3967,16 +3976,16 @@ msgstr "Alan"
 msgid "Search this table"
 msgstr "Biremlektä ezläw"
 
-#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2532
-#: libraries/Util.class.php:2535
+#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2538
+#: libraries/Util.class.php:2541
 #, fuzzy
 #| msgid "Begin"
 msgctxt "First page"
 msgid "Begin"
 msgstr "Başlawğa"
 
-#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2533
-#: libraries/Util.class.php:2536 libraries/server_bin_log.lib.php:170
+#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2539
+#: libraries/Util.class.php:2542 libraries/server_bin_log.lib.php:170
 #: libraries/server_bin_log.lib.php:172
 #, fuzzy
 #| msgid "Previous"
@@ -3984,8 +3993,8 @@ msgctxt "Previous page"
 msgid "Previous"
 msgstr "Uzğan"
 
-#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2564
-#: libraries/Util.class.php:2574 libraries/server_bin_log.lib.php:204
+#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2570
+#: libraries/Util.class.php:2580 libraries/server_bin_log.lib.php:204
 #: libraries/server_bin_log.lib.php:206
 #, fuzzy
 #| msgid "Next"
@@ -3993,8 +4002,8 @@ msgctxt "Next page"
 msgid "Next"
 msgstr "Kiläse"
 
-#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2565
-#: libraries/Util.class.php:2575
+#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2571
+#: libraries/Util.class.php:2581
 #, fuzzy
 #| msgid "End"
 msgctxt "Last page"
@@ -4084,9 +4093,9 @@ msgid "May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]."
 msgstr "Törle buluı bar. [doc@faq3-11]YBS 3.11[/doc] qarísı"
 
 #: libraries/DisplayResults.class.php:4332 libraries/Message.class.php:180
-#: libraries/controllers/TableRelationController.class.php:258
+#: libraries/controllers/TableRelationController.class.php:259
 #: libraries/controllers/TableSearchController.class.php:655
-#: libraries/rte/rte_routines.lib.php:1332 libraries/sql_query_form.lib.php:89
+#: libraries/rte/rte_routines.lib.php:1423 libraries/sql_query_form.lib.php:89
 #: tbl_operations.php:227 tbl_row_action.php:138 view_operations.php:62
 #, fuzzy
 #| msgid "Your SQL query has been executed successfully."
@@ -4094,7 +4103,7 @@ msgid "Your SQL query has been executed successfully."
 msgstr "SQL-sorawıñ uñışlı eşkärtelde"
 
 #: libraries/DisplayResults.class.php:4660
-#: libraries/controllers/StructureController.class.php:629
+#: libraries/controllers/DatabaseStructureController.class.php:564
 #, php-format
 msgid ""
 "This view has at least this number of rows. Please refer to %sdocumentation"
@@ -4118,34 +4127,34 @@ msgstr ""
 msgid "%d total"
 msgstr "tulayım"
 
-#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1318
+#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1312
 #, fuzzy, php-format
 #| msgid "Query took %01.4f sec"
 msgid "Query took %01.4f seconds."
 msgstr "Soraw eşkärtü %01.4f sek aldı"
 
 #: libraries/DisplayResults.class.php:4807
-#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4767
-#: libraries/Util.class.php:4773 libraries/mult_submits.inc.php:50
-#: templates/structure/check_all_tables.phtml:2
-#: templates/structure/check_all_tables.phtml:9
+#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4773
+#: libraries/Util.class.php:4779 libraries/mult_submits.inc.php:50
+#: templates/database/structure/check_all_tables.phtml:2
+#: templates/database/structure/check_all_tables.phtml:9
 msgid "With selected:"
 msgstr "Saylanğannı:"
 
 #: libraries/DisplayResults.class.php:4811
-#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4769
-#: libraries/Util.class.php:4770 libraries/server_privileges.lib.php:1174
+#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4775
+#: libraries/Util.class.php:4776 libraries/server_privileges.lib.php:1174
 #: libraries/server_privileges.lib.php:1175
 #: libraries/server_privileges.lib.php:1387
 #: libraries/server_user_groups.lib.php:231
-#: templates/structure/check_all_tables.phtml:3
-#: templates/structure/check_all_tables.phtml:4
+#: templates/database/structure/check_all_tables.phtml:3
+#: templates/database/structure/check_all_tables.phtml:4
 msgid "Check All"
 msgstr "Saylap Beter"
 
 #: libraries/DisplayResults.class.php:4985 libraries/Header.class.php:383
-#: templates/structure/optional_action_links.phtml:1
-#: templates/structure/print_view_data_dictionary_link.phtml:3
+#: templates/database/structure/print_view_data_dictionary_link.phtml:3
+#: templates/table/structure/optional_action_links.phtml:1
 msgid "Print view"
 msgstr "Bastıru küreneşe"
 
@@ -4153,7 +4162,8 @@ msgstr "Bastıru küreneşe"
 msgid "Query results operations"
 msgstr "Soraw qaytarmasın eşkärtü"
 
-#: libraries/DisplayResults.class.php:5105 templates/tbl_chart.phtml:12
+#: libraries/DisplayResults.class.php:5105
+#: templates/table/chart/tbl_chart.phtml:12
 #, fuzzy
 #| msgid "Display PDF schema"
 msgid "Display chart"
@@ -4253,7 +4263,7 @@ msgid "Click on the bar to scroll to top of page"
 msgstr ""
 
 #: libraries/Header.class.php:749
-#: libraries/plugins/auth/AuthenticationCookie.class.php:152
+#: libraries/plugins/auth/AuthenticationCookie.class.php:140
 msgid "Javascript must be enabled past this point!"
 msgstr ""
 
@@ -4275,11 +4285,11 @@ msgid "Keyname"
 msgstr "Tezeş adı"
 
 #: libraries/Index.class.php:697
-#: libraries/controllers/StructureController.class.php:1962
-#: libraries/controllers/StructureController.class.php:1967
+#: libraries/controllers/TableStructureController.class.php:953
+#: libraries/controllers/TableStructureController.class.php:958
 #: libraries/tracking.lib.php:973
 #: templates/columns_definitions/column_indexes.phtml:11
-#: templates/structure/check_all_table_column.phtml:26
+#: templates/table/structure/check_all_table_column.phtml:26
 msgid "Unique"
 msgstr "Qabatsız"
 
@@ -4298,16 +4308,17 @@ msgstr "Qabatlanu sanı"
 #: libraries/server_collations.lib.php:35 libraries/tracking.lib.php:881
 #: libraries/tracking.lib.php:977
 #: templates/columns_definitions/table_fields_definitions.phtml:33
-#: templates/structure/row_stats_table.phtml:31
-#: templates/structure/table_header.phtml:55
-#: templates/structure/table_structure_header.phtml:7
-#: templates/table/table_header.phtml:8
+#: templates/database/structure/table_header.phtml:55
+#: templates/table/search/table_header.phtml:8
+#: templates/table/structure/row_stats_table.phtml:31
+#: templates/table/structure/table_structure_header.phtml:7
 msgid "Collation"
 msgstr "Tezü cayı"
 
 #: libraries/Index.class.php:703 libraries/rte/rte_events.lib.php:496
-#: libraries/rte/rte_routines.lib.php:956 libraries/tracking.lib.php:885
-#: libraries/tracking.lib.php:979 templates/structure/table_header.phtml:84
+#: libraries/rte/rte_routines.lib.php:1047 libraries/tracking.lib.php:885
+#: libraries/tracking.lib.php:979
+#: templates/database/structure/table_header.phtml:84
 #, fuzzy
 msgid "Comment"
 msgstr "Açıqlama"
@@ -4321,15 +4332,15 @@ msgstr "Töp açqıç beterelde."
 msgid "Index %s has been dropped."
 msgstr "\"%s\" digän tezeş salındı."
 
-#: libraries/Index.class.php:757 libraries/Util.class.php:3630
-#: libraries/Util.class.php:3631
-#: libraries/controllers/StructureController.class.php:1958
-#: libraries/controllers/StructureController.class.php:1959
+#: libraries/Index.class.php:757 libraries/Util.class.php:3636
+#: libraries/Util.class.php:3637
+#: libraries/controllers/TableStructureController.class.php:949
+#: libraries/controllers/TableStructureController.class.php:950
 #: libraries/operations.lib.php:1607 libraries/rte/rte_list.lib.php:150
 #: libraries/server_databases.lib.php:146
-#: templates/structure/check_all_table_column.phtml:15
-#: templates/structure/check_all_tables.phtml:16
-#: templates/tbl_relation/foreign_key_row.phtml:93
+#: templates/database/structure/check_all_tables.phtml:16
+#: templates/table/relation/foreign_key_row.phtml:93
+#: templates/table/structure/check_all_table_column.phtml:15
 msgid "Drop"
 msgstr "Beter"
 
@@ -4358,16 +4369,16 @@ msgstr "Server"
 #: libraries/Menu.class.php:248
 #: libraries/navigation/Nodes/Node_View.class.php:32
 #: libraries/tbl_info.inc.php:63
-#: templates/structure/structure_table_row.phtml:97
-#: templates/structure/structure_table_row.phtml:159
+#: templates/database/structure/structure_table_row.phtml:97
+#: templates/database/structure/structure_table_row.phtml:159
 msgid "View"
 msgstr "Qaraş"
 
 #: libraries/Menu.class.php:325 libraries/Menu.class.php:429
-#: libraries/Menu.class.php:548 libraries/Util.class.php:3334
-#: libraries/Util.class.php:3344 libraries/Util.class.php:3350
-#: libraries/Util.class.php:4313 libraries/Util.class.php:4328
-#: libraries/Util.class.php:4345 libraries/config.values.php:40
+#: libraries/Menu.class.php:548 libraries/Util.class.php:3340
+#: libraries/Util.class.php:3350 libraries/Util.class.php:3356
+#: libraries/Util.class.php:4319 libraries/Util.class.php:4334
+#: libraries/Util.class.php:4351 libraries/config.values.php:40
 #: libraries/config.values.php:48 libraries/config.values.php:110
 #: libraries/config.values.php:116 libraries/config/messages.inc.php:321
 #: libraries/navigation/Nodes/Node_Table.class.php:292
@@ -4375,19 +4386,19 @@ msgid "SQL"
 msgstr "SQL"
 
 #: libraries/Menu.class.php:328 libraries/Menu.class.php:432
-#: libraries/Util.class.php:3335 libraries/Util.class.php:3345
-#: libraries/Util.class.php:3351 libraries/Util.class.php:3625
-#: libraries/Util.class.php:3626 libraries/Util.class.php:4329
-#: libraries/Util.class.php:4346 libraries/config.values.php:41
+#: libraries/Util.class.php:3341 libraries/Util.class.php:3351
+#: libraries/Util.class.php:3357 libraries/Util.class.php:3631
+#: libraries/Util.class.php:3632 libraries/Util.class.php:4335
+#: libraries/Util.class.php:4352 libraries/config.values.php:41
 #: libraries/config.values.php:49 libraries/config.values.php:111
 #: libraries/config.values.php:117
 #: libraries/navigation/Nodes/Node_Table.class.php:286
 msgid "Search"
 msgstr "Ezläw"
 
-#: libraries/Menu.class.php:338 libraries/Util.class.php:3336
-#: libraries/Util.class.php:3346 libraries/Util.class.php:3627
-#: libraries/Util.class.php:3628 libraries/Util.class.php:4347
+#: libraries/Menu.class.php:338 libraries/Util.class.php:3342
+#: libraries/Util.class.php:3352 libraries/Util.class.php:3633
+#: libraries/Util.class.php:3634 libraries/Util.class.php:4353
 #: libraries/config.values.php:42 libraries/config.values.php:50
 #: libraries/config.values.php:118
 #: libraries/navigation/Nodes/Node_Table.class.php:289
@@ -4396,30 +4407,30 @@ msgid "Insert"
 msgstr "Östäw"
 
 #: libraries/Menu.class.php:362 libraries/Menu.class.php:467
-#: libraries/Util.class.php:4334 libraries/Util.class.php:4350
+#: libraries/Util.class.php:4340 libraries/Util.class.php:4356
 #: libraries/config.values.php:106 libraries/server_common.lib.php:51
 #: libraries/server_privileges.lib.php:2370
 #: libraries/server_privileges.lib.php:3158
-#: libraries/server_privileges.lib.php:4221
+#: libraries/server_privileges.lib.php:4247
 msgid "Privileges"
 msgstr "Xoquqlar"
 
 #: libraries/Menu.class.php:371 libraries/Menu.class.php:379
-#: libraries/Menu.class.php:459 libraries/Util.class.php:3338
-#: libraries/Util.class.php:3352 libraries/Util.class.php:4333
-#: libraries/Util.class.php:4351 libraries/config.values.php:112
+#: libraries/Menu.class.php:459 libraries/Util.class.php:3344
+#: libraries/Util.class.php:3358 libraries/Util.class.php:4339
+#: libraries/Util.class.php:4357 libraries/config.values.php:112
 #: view_operations.php:92
 msgid "Operations"
 msgstr "Eşkärtü"
 
 #: libraries/Menu.class.php:384 libraries/Menu.class.php:492
-#: libraries/Util.class.php:4338 libraries/Util.class.php:4352
+#: libraries/Util.class.php:4344 libraries/Util.class.php:4358
 #: libraries/relation.lib.php:255
 msgid "Tracking"
 msgstr ""
 
 #: libraries/Menu.class.php:397 libraries/Menu.class.php:486
-#: libraries/Util.class.php:4337 libraries/Util.class.php:4353
+#: libraries/Util.class.php:4343 libraries/Util.class.php:4359
 #: libraries/navigation/Nodes/Node_Trigger_Container.class.php:24
 #: libraries/plugins/export/ExportHtmlword.class.php:557
 #: libraries/plugins/export/ExportOdt.class.php:685
@@ -4436,16 +4447,16 @@ msgstr ""
 msgid "Database seems to be empty!"
 msgstr ""
 
-#: libraries/Menu.class.php:439 libraries/Util.class.php:4330
+#: libraries/Menu.class.php:439 libraries/Util.class.php:4336
 msgid "Query"
 msgstr "Soraw"
 
-#: libraries/Menu.class.php:472 libraries/Util.class.php:4335
+#: libraries/Menu.class.php:472 libraries/Util.class.php:4341
 #: libraries/rte/rte_words.lib.php:36
 msgid "Routines"
 msgstr ""
 
-#: libraries/Menu.class.php:479 libraries/Util.class.php:4336
+#: libraries/Menu.class.php:479 libraries/Util.class.php:4342
 #: libraries/navigation/Nodes/Node_Event_Container.class.php:26
 #: libraries/plugins/export/ExportSql.class.php:940
 #: libraries/plugins/export/ExportXml.class.php:107
@@ -4454,22 +4465,22 @@ msgstr ""
 msgid "Events"
 msgstr "Cibärelde"
 
-#: libraries/Menu.class.php:498 libraries/Util.class.php:4339
+#: libraries/Menu.class.php:498 libraries/Util.class.php:4345
 msgid "Designer"
 msgstr ""
 
-#: libraries/Menu.class.php:507 libraries/Util.class.php:4340
-#: templates/structure/check_all_tables.phtml:35
+#: libraries/Menu.class.php:507 libraries/Util.class.php:4346
+#: templates/database/structure/check_all_tables.phtml:35
 #, fuzzy
 #| msgid "Add/Delete Field Columns"
 msgid "Central columns"
 msgstr "Add/Delete Field Columns"
 
-#: libraries/Menu.class.php:544 libraries/Util.class.php:4312
+#: libraries/Menu.class.php:544 libraries/Util.class.php:4318
 #: libraries/config.values.php:103 libraries/config/messages.inc.php:266
 #: libraries/config/messages.inc.php:341
 #: libraries/navigation/NavigationTree.class.php:1239
-#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4332
+#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4358
 msgid "Databases"
 msgstr "Biremleklär"
 
@@ -4480,35 +4491,35 @@ msgid "User accounts"
 msgstr "Qullanuçı"
 
 #: libraries/Menu.class.php:595 libraries/ServerStatusData.class.php:121
-#: libraries/Util.class.php:4319 libraries/server_common.lib.php:36
+#: libraries/Util.class.php:4325 libraries/server_common.lib.php:36
 msgid "Binary log"
 msgstr "Binar köndälek"
 
 #: libraries/Menu.class.php:601 libraries/ServerStatusData.class.php:126
-#: libraries/Util.class.php:4320 libraries/server_common.lib.php:42
-#: templates/structure/body_for_table_summary.phtml:10
-#: templates/structure/table_header.phtml:27
+#: libraries/Util.class.php:4326 libraries/server_common.lib.php:42
+#: templates/database/structure/body_for_table_summary.phtml:10
+#: templates/database/structure/table_header.phtml:27
 #, fuzzy
 msgid "Replication"
 msgstr "Bäyläneşlär"
 
 #: libraries/Menu.class.php:606 libraries/ServerStatusData.class.php:193
-#: libraries/Util.class.php:4321 libraries/config.values.php:105
+#: libraries/Util.class.php:4327 libraries/config.values.php:105
 #: libraries/server_engines.lib.php:108 libraries/server_engines.lib.php:112
 #: libraries/sql_query_form.lib.php:421
 msgid "Variables"
 msgstr "Üzgärmälär"
 
-#: libraries/Menu.class.php:610 libraries/Util.class.php:4322
+#: libraries/Menu.class.php:610 libraries/Util.class.php:4328
 msgid "Charsets"
 msgstr "Bilgelämä"
 
-#: libraries/Menu.class.php:615 libraries/Util.class.php:4323
+#: libraries/Menu.class.php:615 libraries/Util.class.php:4329
 #: libraries/server_common.lib.php:33 libraries/server_plugins.lib.php:27
 msgid "Plugins"
 msgstr ""
 
-#: libraries/Menu.class.php:626 libraries/Util.class.php:4324
+#: libraries/Menu.class.php:626 libraries/Util.class.php:4330
 msgid "Engines"
 msgstr "Engine"
 
@@ -4534,7 +4545,7 @@ msgid_plural "%1$d rows inserted."
 msgstr[0] "Kertemnär sayladı"
 msgstr[1] "Kertemnär sayladı"
 
-#: libraries/PDF.class.php:70 libraries/Util.class.php:2521
+#: libraries/PDF.class.php:70 libraries/Util.class.php:2527
 #: libraries/browse_foreigners.lib.php:327
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:865
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:890
@@ -4561,7 +4572,7 @@ msgid "Could not save favorite table!"
 msgstr "Töp köyläneşen yökläp bulmadı: \"%1$s\""
 
 #: libraries/RecentFavoriteTable.class.php:212
-#: templates/structure/favorite_anchor.phtml:12
+#: templates/database/structure/favorite_anchor.phtml:12
 #, fuzzy
 #| msgid "Rename database to"
 msgid "Remove from Favorites"
@@ -4743,7 +4754,7 @@ msgid ""
 msgstr "Bu saqlaw engine öçen xälät turında centekle belem yuq."
 
 #: libraries/StorageEngine.class.php:373
-#: templates/structure/body_for_table_summary.phtml:50
+#: templates/database/structure/body_for_table_summary.phtml:50
 #, php-format
 msgid "%s is the default storage engine on this MySQL server."
 msgstr "Bu MySQL-serverdä %s digän saqlaw ısulı töp bularaq saylanğan."
@@ -5175,10 +5186,10 @@ msgstr ""
 
 #: libraries/Util.class.php:726 libraries/rte/rte_events.lib.php:110
 #: libraries/rte/rte_events.lib.php:119 libraries/rte/rte_events.lib.php:150
-#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:153
-#: libraries/rte/rte_routines.lib.php:162
-#: libraries/rte/rte_routines.lib.php:235
-#: libraries/rte/rte_routines.lib.php:1366
+#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:223
+#: libraries/rte/rte_routines.lib.php:250
+#: libraries/rte/rte_routines.lib.php:372
+#: libraries/rte/rte_routines.lib.php:1457
 #: libraries/rte/rte_triggers.lib.php:86 libraries/rte/rte_triggers.lib.php:95
 #: libraries/rte/rte_triggers.lib.php:127
 msgid "MySQL said: "
@@ -5224,77 +5235,80 @@ msgstr "Ykş"
 msgid "%B %d, %Y at %I:%M %p"
 msgstr "%Y.%m.%d, %H:%M"
 
-#: libraries/Util.class.php:2019
+#: libraries/Util.class.php:2025
 #, php-format
 msgid "%s days, %s hours, %s minutes and %s seconds"
 msgstr "%s kön, %s säğät, %s minut ta %s sekund"
 
-#: libraries/Util.class.php:2112
+#: libraries/Util.class.php:2118
 msgid "Missing parameter:"
 msgstr ""
 
-#: libraries/Util.class.php:2645
+#: libraries/Util.class.php:2651
 #, php-format
 msgid "Jump to database \"%s\"."
 msgstr "\"%s\" biremlegenä küç."
 
-#: libraries/Util.class.php:2670
+#: libraries/Util.class.php:2676
 #, php-format
 msgid "The %s functionality is affected by a known bug, see %s"
 msgstr ""
 
-#: libraries/Util.class.php:2881
+#: libraries/Util.class.php:2887
 msgid "Click to toggle"
 msgstr ""
 
-#: libraries/Util.class.php:3542 prefs_manage.php:248
+#: libraries/Util.class.php:3548 prefs_manage.php:248
 msgid "Browse your computer:"
 msgstr ""
 
-#: libraries/Util.class.php:3567
+#: libraries/Util.class.php:3573
 #, fuzzy, php-format
 #| msgid "web server upload directory"
 msgid "Select from the web server upload directory <b>%s</b>:"
 msgstr "web-server'neñ yökläw törgäge"
 
-#: libraries/Util.class.php:3596 libraries/insert_edit.lib.php:1173
+#: libraries/Util.class.php:3602 libraries/insert_edit.lib.php:1171
 msgid "The directory you set for upload work cannot be reached."
 msgstr "Yökläw öçen bigelängän törgäkne uqıp bulmí."
 
-#: libraries/Util.class.php:3607
+#: libraries/Util.class.php:3613
 #, fuzzy
 msgid "There are no files to upload!"
 msgstr "Tüşämä tikşerü"
 
-#: libraries/Util.class.php:3632 libraries/Util.class.php:3633
-#: templates/structure/check_all_tables.phtml:15
+#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: templates/database/structure/check_all_tables.phtml:15
 msgid "Empty"
 msgstr "Buşat"
 
-#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: libraries/Util.class.php:3644 libraries/Util.class.php:3645
 msgid "Execute"
 msgstr ""
 
-#: libraries/Util.class.php:4152
+#: libraries/Util.class.php:4158
 msgid "Print"
 msgstr "Bastır"
 
-#: libraries/Util.class.php:4257 templates/structure/row_stats_table.phtml:80
-#: templates/structure/table_header.phtml:95
+#: libraries/Util.class.php:4263
+#: templates/database/structure/table_header.phtml:95
+#: templates/table/structure/row_stats_table.phtml:80
 msgid "Creation"
 msgstr "Yasalışı"
 
-#: libraries/Util.class.php:4263 templates/structure/row_stats_table.phtml:87
-#: templates/structure/table_header.phtml:106
+#: libraries/Util.class.php:4269
+#: templates/database/structure/table_header.phtml:106
+#: templates/table/structure/row_stats_table.phtml:87
 msgid "Last update"
 msgstr "Soñğı yañartılu"
 
-#: libraries/Util.class.php:4269 templates/structure/row_stats_table.phtml:94
-#: templates/structure/table_header.phtml:117
+#: libraries/Util.class.php:4275
+#: templates/database/structure/table_header.phtml:117
+#: templates/table/structure/row_stats_table.phtml:94
 msgid "Last check"
 msgstr "Soñğı tikşerü"
 
-#: libraries/Util.class.php:4315
+#: libraries/Util.class.php:4321
 #, fuzzy
 #| msgid "User"
 msgid "Users"
@@ -5319,16 +5333,16 @@ msgid "Use this value"
 msgstr "Bu bäyä belän"
 
 #: libraries/build_html_for_db.lib.php:33 libraries/import.lib.php:193
-#: templates/structure/actions_in_table_structure.phtml:113
-#: templates/structure/row_stats_table.phtml:42
-#: templates/structure/table_header.phtml:36
+#: templates/database/structure/table_header.phtml:36
+#: templates/table/structure/actions_in_table_structure.phtml:113
+#: templates/table/structure/row_stats_table.phtml:42
 msgid "Rows"
 msgstr "Kerem"
 
 #: libraries/build_html_for_db.lib.php:48 libraries/engines/innodb.lib.php:171
-#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:186
-#: libraries/server_status.lib.php:298
-#: templates/structure/display_table_stats.phtml:40
+#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:195
+#: libraries/server_status.lib.php:307
+#: templates/table/structure/display_table_stats.phtml:40
 msgid "Total"
 msgstr "Tulayım"
 
@@ -5338,10 +5352,12 @@ msgid "Jump to database"
 msgstr "Biremleklär yuq"
 
 #: libraries/build_html_for_db.lib.php:146
+#: templates/database/structure/structure_table_row.phtml:15
 msgid "Not replicated"
 msgstr ""
 
 #: libraries/build_html_for_db.lib.php:158
+#: templates/database/structure/structure_table_row.phtml:16
 #, fuzzy
 msgid "Replicated"
 msgstr "Bäyläneşlär"
@@ -5399,17 +5415,17 @@ msgstr ""
 #: libraries/plugins/export/ExportTexytext.class.php:425
 #: libraries/plugins/export/PMA_ExportPdf.class.php:307
 #: libraries/rte/rte_list.lib.php:73 libraries/rte/rte_list.lib.php:85
-#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:830
-#: libraries/rte/rte_routines.lib.php:1492 setup/frames/index.inc.php:162
+#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:921
+#: libraries/rte/rte_routines.lib.php:1583 setup/frames/index.inc.php:162
 #: templates/columns_definitions/table_fields_definitions.phtml:8
-#: templates/structure/table_structure_header.phtml:5
-#: templates/table/create_table.phtml:11
+#: templates/database/create_table.phtml:11
+#: templates/table/structure/table_structure_header.phtml:5
 msgid "Name"
 msgstr "Adı"
 
 #: libraries/central_columns.lib.php:699
 #: libraries/central_columns.lib.php:1381
-#: libraries/rte/rte_routines.lib.php:832
+#: libraries/rte/rte_routines.lib.php:923
 #: templates/columns_definitions/table_fields_definitions.phtml:14
 msgid "Length/Values"
 msgstr "Ozınlıq/Bäyä*"
@@ -5432,7 +5448,7 @@ msgid "Select a table"
 msgstr "Tüşämä Saylaw"
 
 #: libraries/central_columns.lib.php:804
-#: templates/structure/add_column.phtml:4
+#: templates/table/structure/add_column.phtml:4
 #, fuzzy
 #| msgid "Add %s field(s)"
 msgid "Add column"
@@ -5454,7 +5470,7 @@ msgstr "%s alan östäw"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1002
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1025
 #: templates/columns_definitions/table_fields_definitions.phtml:36
-#: templates/structure/table_structure_header.phtml:8
+#: templates/table/structure/table_structure_header.phtml:8
 msgid "Attributes"
 msgstr "Üzençälek"
 
@@ -5572,7 +5588,7 @@ msgid "Double click"
 msgstr ""
 
 #: libraries/config.values.php:95 libraries/config.values.php:124
-#: libraries/config/FormDisplay.tpl.php:221 libraries/relation.lib.php:97
+#: libraries/config/FormDisplay.tpl.php:232 libraries/relation.lib.php:97
 #: libraries/relation.lib.php:105
 msgid "Disabled"
 msgstr "Sünek"
@@ -5764,21 +5780,21 @@ msgstr ""
 msgid "maximum %s"
 msgstr ""
 
-#: libraries/config/FormDisplay.tpl.php:219
+#: libraries/config/FormDisplay.tpl.php:230
 msgid "This setting is disabled, it will not be applied to your configuration."
 msgstr ""
 
-#: libraries/config/FormDisplay.tpl.php:313
+#: libraries/config/FormDisplay.tpl.php:324
 #, php-format
 msgid "Set value: %s"
 msgstr ""
 
-#: libraries/config/FormDisplay.tpl.php:318
+#: libraries/config/FormDisplay.tpl.php:329
 #: libraries/config/messages.inc.php:610
 msgid "Restore default value"
 msgstr ""
 
-#: libraries/config/FormDisplay.tpl.php:332
+#: libraries/config/FormDisplay.tpl.php:343
 msgid "Allow users to customize this value"
 msgstr ""
 
@@ -6217,7 +6233,7 @@ msgstr "Şul biremneñ bilgelämäse:"
 
 #: libraries/config/messages.inc.php:136 libraries/config/messages.inc.php:152
 #: libraries/sql_query_form.lib.php:247
-#: templates/structure/row_stats_table.phtml:7
+#: templates/table/structure/row_stats_table.phtml:7
 msgid "Format"
 msgstr "Tözeleş"
 
@@ -6780,7 +6796,7 @@ msgstr ""
 
 #: libraries/config/messages.inc.php:332
 #: libraries/plugins/export/ExportPdf.class.php:279
-#: templates/structure/secondary_tabs.phtml:8
+#: templates/table/secondary_tabs.phtml:8
 #, fuzzy
 #| msgid "Database for user"
 msgid "Table structure"
@@ -8410,109 +8426,35 @@ msgstr "Microsoft Word 2000"
 msgid "OpenDocument Text"
 msgstr "Qullanma"
 
-#: libraries/controllers/StructureController.class.php:465
+#: libraries/controllers/DatabaseStructureController.class.php:405
 #: tbl_operations.php:382
 #, php-format
 msgid "Table %s has been emptied."
 msgstr "\"%s\" atlı tüşämä buşatıldı."
 
-#: libraries/controllers/StructureController.class.php:486
+#: libraries/controllers/DatabaseStructureController.class.php:426
 #: tbl_operations.php:400 view_operations.php:119
 #, fuzzy, php-format
 #| msgid "View %s has been dropped."
 msgid "View %s has been dropped."
 msgstr "\"%s\" atlı Qaraş beterelgän buldı"
 
-#: libraries/controllers/StructureController.class.php:487
+#: libraries/controllers/DatabaseStructureController.class.php:427
 #: tbl_operations.php:401
 #, fuzzy, php-format
 #| msgid "Table %s has been dropped."
 msgid "Table %s has been dropped."
 msgstr "\"%s\" atlı tüşämä beterelde"
 
-#: libraries/controllers/StructureController.class.php:797
-#, php-format
-msgid "The name '%s' is a MySQL reserved keyword."
-msgid_plural "The names '%s' are MySQL reserved keywords."
-msgstr[0] ""
-
-#: libraries/controllers/StructureController.class.php:875
-#, fuzzy
-#| msgid "No rows selected"
-msgid "No column selected."
-msgstr "Kertemnär sayladı"
-
-#: libraries/controllers/StructureController.class.php:1049
+#: libraries/controllers/DatabaseStructureController.class.php:733
 msgid "Favorite List is full!"
 msgstr ""
 
-#: libraries/controllers/StructureController.class.php:1272
-#, fuzzy
-#| msgid "The selected users have been deleted successfully."
-msgid "The columns have been moved successfully."
-msgstr "Saylanğan qullanuçını beterü uñışlı uzdı."
-
-#: libraries/controllers/StructureController.class.php:1535
-#, fuzzy, php-format
-msgid ""
-"Table %1$s has been altered successfully. Privileges have been adjusted."
-msgstr "Saylanğan qullanuçını beterü uñışlı uzdı."
-
-#: libraries/controllers/StructureController.class.php:1541
-#: libraries/controllers/TableIndexesController.class.php:161
-#: tbl_addfield.php:92
-#, fuzzy, php-format
-msgid "Table %1$s has been altered successfully."
-msgstr "Saylanğan qullanuçını beterü uñışlı uzdı."
-
-#: libraries/controllers/StructureController.class.php:1588
-#: libraries/tracking.lib.php:1094
-#, fuzzy
-#| msgid "Query type"
-msgid "Query error"
-msgstr "Soraw töre"
-
-#: libraries/controllers/StructureController.class.php:1806
+#: libraries/controllers/DatabaseStructureController.class.php:947
 #: libraries/mysql_charsets.lib.php:366 libraries/mysql_charsets.lib.php:373
 msgid "unknown"
 msgstr "belgesez"
 
-#: libraries/controllers/StructureController.class.php:1957
-#: templates/structure/check_all_table_column.phtml:11
-msgid "Change"
-msgstr "Üzgärt"
-
-#: libraries/controllers/StructureController.class.php:1961
-#: libraries/controllers/StructureController.class.php:1966
-#: libraries/navigation/Nodes/Node_Index.class.php:30
-#: libraries/tracking.lib.php:926
-#: templates/columns_definitions/column_indexes.phtml:16
-#: templates/columns_definitions/table_fields_definitions.phtml:57
-#: templates/structure/check_all_table_column.phtml:30
-#: templates/structure/display_structure.phtml:79
-#: templates/structure/display_table_stats.phtml:19
-msgid "Index"
-msgstr "Tezeş"
-
-#: libraries/controllers/StructureController.class.php:1963
-#: libraries/controllers/StructureController.class.php:1968
-#: templates/columns_definitions/column_indexes.phtml:27
-#: templates/structure/check_all_table_column.phtml:37
-msgid "Spatial"
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1964
-#: libraries/controllers/StructureController.class.php:1969
-#: templates/columns_definitions/column_indexes.phtml:22
-#: templates/structure/check_all_table_column.phtml:47
-msgid "Fulltext"
-msgstr "Tulımäten"
-
-#: libraries/controllers/StructureController.class.php:1970
-#, fuzzy
-msgid "Distinct values"
-msgstr "Browse foreign values"
-
 #: libraries/controllers/TableChartController.class.php:82
 #: libraries/controllers/TableGisVisualizationController.class.php:101
 msgid "No SQL query was set to fetch data."
@@ -8528,13 +8470,20 @@ msgstr ""
 msgid "No data to display"
 msgstr "Biremleklär yuq"
 
-#: libraries/controllers/TableRelationController.class.php:217
+#: libraries/controllers/TableIndexesController.class.php:161
+#: libraries/controllers/TableStructureController.class.php:736
+#: tbl_addfield.php:92
+#, fuzzy, php-format
+msgid "Table %1$s has been altered successfully."
+msgstr "Saylanğan qullanuçını beterü uñışlı uzdı."
+
+#: libraries/controllers/TableRelationController.class.php:218
 #, fuzzy
 #| msgid "Thread %s was successfully killed."
 msgid "Display column was successfully updated."
 msgstr "%s cebe uñışlı üterelgän buldı."
 
-#: libraries/controllers/TableRelationController.class.php:283
+#: libraries/controllers/TableRelationController.class.php:288
 #, fuzzy
 msgid "Internal relations were successfully updated."
 msgstr "Eçke bäyläneş"
@@ -8552,11 +8501,78 @@ msgid "Zoom search"
 msgstr "Ezläw"
 
 #: libraries/controllers/TableSearchController.class.php:852
-#: templates/table/selection_form.phtml:59
+#: templates/table/search/selection_form.phtml:59
 #, fuzzy
 msgid "Find and replace"
 msgstr "SQL-soraw"
 
+#: libraries/controllers/TableStructureController.class.php:163
+#, php-format
+msgid "The name '%s' is a MySQL reserved keyword."
+msgid_plural "The names '%s' are MySQL reserved keywords."
+msgstr[0] ""
+
+#: libraries/controllers/TableStructureController.class.php:241
+#, fuzzy
+#| msgid "No rows selected"
+msgid "No column selected."
+msgstr "Kertemnär sayladı"
+
+#: libraries/controllers/TableStructureController.class.php:467
+#, fuzzy
+#| msgid "The selected users have been deleted successfully."
+msgid "The columns have been moved successfully."
+msgstr "Saylanğan qullanuçını beterü uñışlı uzdı."
+
+#: libraries/controllers/TableStructureController.class.php:730
+#, fuzzy, php-format
+msgid ""
+"Table %1$s has been altered successfully. Privileges have been adjusted."
+msgstr "Saylanğan qullanuçını beterü uñışlı uzdı."
+
+#: libraries/controllers/TableStructureController.class.php:783
+#: libraries/tracking.lib.php:1094
+#, fuzzy
+#| msgid "Query type"
+msgid "Query error"
+msgstr "Soraw töre"
+
+#: libraries/controllers/TableStructureController.class.php:948
+#: templates/table/structure/check_all_table_column.phtml:11
+msgid "Change"
+msgstr "Üzgärt"
+
+#: libraries/controllers/TableStructureController.class.php:952
+#: libraries/controllers/TableStructureController.class.php:957
+#: libraries/navigation/Nodes/Node_Index.class.php:30
+#: libraries/tracking.lib.php:926
+#: templates/columns_definitions/column_indexes.phtml:16
+#: templates/columns_definitions/table_fields_definitions.phtml:57
+#: templates/table/structure/check_all_table_column.phtml:30
+#: templates/table/structure/display_structure.phtml:79
+#: templates/table/structure/display_table_stats.phtml:19
+msgid "Index"
+msgstr "Tezeş"
+
+#: libraries/controllers/TableStructureController.class.php:954
+#: libraries/controllers/TableStructureController.class.php:959
+#: templates/columns_definitions/column_indexes.phtml:27
+#: templates/table/structure/check_all_table_column.phtml:37
+msgid "Spatial"
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:955
+#: libraries/controllers/TableStructureController.class.php:960
+#: templates/columns_definitions/column_indexes.phtml:22
+#: templates/table/structure/check_all_table_column.phtml:47
+msgid "Fulltext"
+msgstr "Tulımäten"
+
+#: libraries/controllers/TableStructureController.class.php:963
+#, fuzzy
+msgid "Distinct values"
+msgstr "Browse foreign values"
+
 #: libraries/core.lib.php:306
 #, php-format
 msgid "The %s extension is missing. Please check your PHP configuration."
@@ -8603,7 +8619,7 @@ msgid "No Password"
 msgstr "Sersüzsez"
 
 #: libraries/display_change_password.lib.php:68
-#: libraries/plugins/auth/AuthenticationCookie.class.php:199
+#: libraries/plugins/auth/AuthenticationCookie.class.php:187
 #: libraries/replication_gui.lib.php:422 libraries/replication_gui.lib.php:862
 #: libraries/server_privileges.lib.php:1640
 msgid "Password:"
@@ -9425,12 +9441,12 @@ msgid "Dump has been saved to file %s."
 msgstr "Eçtälege \"%s\" biremenä saqlandı."
 
 #: libraries/import.lib.php:202 libraries/insert_edit.lib.php:124
-#: libraries/rte/rte_routines.lib.php:1353 libraries/sql.lib.php:1312
+#: libraries/rte/rte_routines.lib.php:1444 libraries/sql.lib.php:1306
 #: tbl_get_field.php:44
 msgid "MySQL returned an empty result set (i.e. zero rows)."
 msgstr "MySQL sorawğa buş cawap, yäğni nül kertem qaytarttı."
 
-#: libraries/import.lib.php:265 libraries/sql.lib.php:1326
+#: libraries/import.lib.php:265 libraries/sql.lib.php:1320
 msgid "[ROLLBACK occurred.]"
 msgstr ""
 
@@ -9497,14 +9513,14 @@ msgstr "%s alannan tezeş yaratu"
 
 #: libraries/insert_edit.lib.php:233
 #: libraries/navigation/Nodes/Node_DatabaseChild.class.php:48
-#: templates/designer/table_list.phtml:40
+#: templates/database/designer/table_list.phtml:40
 msgid "Hide"
 msgstr ""
 
 #: libraries/insert_edit.lib.php:249
 #: libraries/navigation/Nodes/Node_Function.class.php:32
-#: libraries/rte/rte_routines.lib.php:1495
-#: templates/table/table_header.phtml:4
+#: libraries/rte/rte_routines.lib.php:1586
+#: templates/table/search/table_header.phtml:4
 msgid "Function"
 msgstr "Funksí"
 
@@ -9519,89 +9535,90 @@ msgstr "Binar"
 msgid "Because of its length,<br /> this column might not be editable."
 msgstr "Because of its length,<br /> this field might not be editable"
 
-#: libraries/insert_edit.lib.php:1050
+#: libraries/insert_edit.lib.php:1048
 msgid "Binary - do not edit"
 msgstr "Binar - üzgärtmäslek"
 
-#: libraries/insert_edit.lib.php:1176 libraries/server_privileges.lib.php:470
-#: templates/table/options.phtml:36
+#: libraries/insert_edit.lib.php:1174 libraries/server_privileges.lib.php:470
+#: templates/table/search/options.phtml:36
 msgid "Or"
 msgstr "Yä"
 
-#: libraries/insert_edit.lib.php:1177
+#: libraries/insert_edit.lib.php:1175
 #, fuzzy
 #| msgid "web server upload directory"
 msgid "web server upload directory:"
 msgstr "web-server'neñ yökläw törgäge"
 
-#: libraries/insert_edit.lib.php:1348 templates/table/input_box.phtml:49
+#: libraries/insert_edit.lib.php:1346
+#: templates/table/search/input_box.phtml:49
 #, fuzzy
 #| msgid "Insert"
 msgid "Edit/Insert"
 msgstr "Östäw"
 
-#: libraries/insert_edit.lib.php:1398
+#: libraries/insert_edit.lib.php:1396
 #, php-format
 msgid "Continue insertion with %s rows"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1428
+#: libraries/insert_edit.lib.php:1426
 msgid "and then"
 msgstr ", şunnan soñ"
 
-#: libraries/insert_edit.lib.php:1461
+#: libraries/insert_edit.lib.php:1459
 msgid "Insert as new row"
 msgstr "Yaña yazma kert tä"
 
-#: libraries/insert_edit.lib.php:1464
+#: libraries/insert_edit.lib.php:1462
 msgid "Insert as new row and ignore errors"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1467
+#: libraries/insert_edit.lib.php:1465
 msgid "Show insert query"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1487
+#: libraries/insert_edit.lib.php:1485
 msgid "Go back to previous page"
 msgstr "Aldağı bitkä qaytu"
 
-#: libraries/insert_edit.lib.php:1490
+#: libraries/insert_edit.lib.php:1488
 msgid "Insert another new row"
 msgstr "Tağın ber yazma östäw"
 
-#: libraries/insert_edit.lib.php:1495
+#: libraries/insert_edit.lib.php:1493
 msgid "Go back to this page"
 msgstr "Bu bitkä kire qaytası"
 
-#: libraries/insert_edit.lib.php:1518
+#: libraries/insert_edit.lib.php:1516
 msgid "Edit next row"
 msgstr "Kiläse yazma üzgärtü"
 
-#: libraries/insert_edit.lib.php:1540
+#: libraries/insert_edit.lib.php:1538
 msgid ""
 "Use TAB key to move from value to value, or CTRL+arrows to move anywhere"
 msgstr ""
 "Ber bäyädän ikençegä küçü öçen TAB töymäsen qullanası, başqa cirgä küçü "
 "öçen, CTRL+uq töymäläre bar"
 
-#: libraries/insert_edit.lib.php:1577 libraries/replication_gui.lib.php:542
-#: libraries/rte/rte_routines.lib.php:1497
+#: libraries/insert_edit.lib.php:1575 libraries/replication_gui.lib.php:542
+#: libraries/rte/rte_routines.lib.php:1588
 #: libraries/server_status_variables.lib.php:220
-#: templates/designer/having_query_panel.phtml:100
-#: templates/designer/options_panel.phtml:73
-#: templates/designer/options_panel.phtml:239
-#: templates/designer/where_query_panel.phtml:69
-#: templates/table/table_header.phtml:10
-#: templates/table/zoom_result_form.phtml:35
+#: templates/database/designer/having_query_panel.phtml:100
+#: templates/database/designer/options_panel.phtml:73
+#: templates/database/designer/options_panel.phtml:239
+#: templates/database/designer/where_query_panel.phtml:69
+#: templates/table/search/table_header.phtml:10
+#: templates/table/search/zoom_result_form.phtml:35
 msgid "Value"
 msgstr "Bäyä"
 
-#: libraries/insert_edit.lib.php:1937 libraries/sql.lib.php:1309
+#: libraries/insert_edit.lib.php:1935 libraries/sql.lib.php:1303
 #, fuzzy
 msgid "Showing SQL query"
 msgstr "Tulı Sorawlar Kürsät"
 
-#: libraries/insert_edit.lib.php:1962 libraries/sql.lib.php:1287
+#: libraries/insert_edit.lib.php:1960 libraries/sql.lib.php:1281
 #, php-format
 msgid "Inserted row id: %1$d"
 msgstr ""
@@ -10046,7 +10063,7 @@ msgstr ""
 #: libraries/navigation/Nodes/Node_View_Container.class.php:26
 #: libraries/navigation/Nodes/Node_View_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:129
-#: templates/structure/show_create.phtml:30
+#: templates/database/structure/show_create.phtml:30
 #, fuzzy
 #| msgid "View"
 msgid "Views"
@@ -10358,7 +10375,7 @@ msgstr "Bonda bulu öçen, xoquqlarıñ citmi!"
 
 #: libraries/operations.lib.php:101 libraries/operations.lib.php:249
 #: libraries/operations.lib.php:869 libraries/operations.lib.php:963
-#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:907
+#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:998
 #: templates/columns_definitions/table_fields_definitions.phtml:47
 #, fuzzy
 #| msgid "Edit Privileges"
@@ -10455,22 +10472,22 @@ msgid "Switch to copied table"
 msgstr "Kübäytelgän tüşämägä küçäse"
 
 #: libraries/operations.lib.php:1360
-#: templates/structure/check_all_tables.phtml:18
+#: templates/database/structure/check_all_tables.phtml:18
 msgid "Table maintenance"
 msgstr "Tüşämä eşkärtü"
 
 #: libraries/operations.lib.php:1398
-#: templates/structure/check_all_tables.phtml:19
+#: templates/database/structure/check_all_tables.phtml:19
 msgid "Analyze table"
 msgstr "Tüşämä centekläw"
 
 #: libraries/operations.lib.php:1413
-#: templates/structure/check_all_tables.phtml:20
+#: templates/database/structure/check_all_tables.phtml:20
 msgid "Check table"
 msgstr "Tüşämä tikşerü"
 
 #: libraries/operations.lib.php:1428
-#: templates/structure/check_all_tables.phtml:22
+#: templates/database/structure/check_all_tables.phtml:22
 #, fuzzy
 #| msgid "Check table"
 msgid "Checksum table"
@@ -10492,18 +10509,19 @@ msgid "Flush the table (FLUSH)"
 msgstr "Tüşäwne awdar (\"FLUSH\")"
 
 #: libraries/operations.lib.php:1477
-#: templates/structure/check_all_tables.phtml:23
-#: templates/structure/display_table_stats.phtml:56
+#: templates/database/structure/check_all_tables.phtml:23
+#: templates/table/structure/display_table_stats.phtml:56
 msgid "Optimize table"
 msgstr ""
 
 #: libraries/operations.lib.php:1492
-#: templates/structure/check_all_tables.phtml:24
+#: templates/database/structure/check_all_tables.phtml:24
 msgid "Repair table"
 msgstr "Tüşämä tözätü"
 
 #: libraries/operations.lib.php:1538
-#: templates/structure/check_all_tables.phtml:14 view_operations.php:127
+#: templates/database/structure/check_all_tables.phtml:14
+#: view_operations.php:127
 #, fuzzy
 #| msgid "Dumping data for table"
 msgid "Delete data or table"
@@ -10635,7 +10653,7 @@ msgid "Cannot connect: invalid settings."
 msgstr "Totaşa almím: yaraqsız köyläwlär."
 
 #: libraries/plugins/auth/AuthenticationConfig.class.php:108
-#: libraries/plugins/auth/AuthenticationCookie.class.php:134
+#: libraries/plugins/auth/AuthenticationCookie.class.php:122
 #: libraries/plugins/auth/AuthenticationHttp.class.php:96
 #, php-format
 msgid "Welcome to %s"
@@ -10664,38 +10682,38 @@ msgstr ""
 msgid "Retry to connect"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:146
+#: libraries/plugins/auth/AuthenticationCookie.class.php:134
 msgid "Your session has expired. Please log in again."
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:170
+#: libraries/plugins/auth/AuthenticationCookie.class.php:158
 msgid "Log in"
 msgstr "Kereş"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:178
-#: libraries/plugins/auth/AuthenticationCookie.class.php:188
+#: libraries/plugins/auth/AuthenticationCookie.class.php:166
+#: libraries/plugins/auth/AuthenticationCookie.class.php:176
 msgid "You can enter hostname/IP address and port separated by space."
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:193
+#: libraries/plugins/auth/AuthenticationCookie.class.php:181
 msgid "Username:"
 msgstr "Atama:"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:205
+#: libraries/plugins/auth/AuthenticationCookie.class.php:193
 #, fuzzy
 #| msgid "Server Choice"
 msgid "Server Choice:"
 msgstr "Server Saylaw"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:386
+#: libraries/plugins/auth/AuthenticationCookie.class.php:374
 msgid "Entered captcha is wrong, try again!"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:396
+#: libraries/plugins/auth/AuthenticationCookie.class.php:384
 msgid "Please enter correct captcha!"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:423
+#: libraries/plugins/auth/AuthenticationCookie.class.php:411
 #, fuzzy
 #| msgid "Cannot log in to the MySQL server"
 msgid "You are not allowed to log in to this MySQL server!"
@@ -10807,7 +10825,7 @@ msgstr "Cibärelde"
 #: libraries/plugins/export/ExportOdt.class.php:593
 #: libraries/plugins/export/ExportTexytext.class.php:428
 #: libraries/plugins/export/PMA_ExportPdf.class.php:313
-#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:984
 #: libraries/rte/rte_triggers.lib.php:377
 #, fuzzy
 #| msgid "Description"
@@ -11163,7 +11181,7 @@ msgid "Last check:"
 msgstr "Soñğı tikşerü"
 
 #: libraries/plugins/export/ExportSql.class.php:1399
-#: templates/structure/structure_table_row.phtml:183
+#: templates/database/structure/structure_table_row.phtml:183
 msgid "in use"
 msgstr "totıla"
 
@@ -11362,22 +11380,16 @@ msgstr ""
 msgid "The imported file does not contain any data!"
 msgstr ""
 
-#: libraries/plugins/import/ImportSql.class.php:169
+#: libraries/plugins/import/ImportSql.class.php:72
 #, fuzzy
 #| msgid "SQL compatibility mode"
 msgid "SQL compatibility mode:"
 msgstr "SQL, kileşterü ısulı"
 
-#: libraries/plugins/import/ImportSql.class.php:181
+#: libraries/plugins/import/ImportSql.class.php:84
 msgid "Do not use <code>AUTO_INCREMENT</code> for zero values"
 msgstr ""
 
-#: libraries/plugins/import/ImportSql.class.php:195
-#, fuzzy
-#| msgid "Read misses"
-msgid "Read as multibytes"
-msgstr "Uñışsız uqu"
-
 #: libraries/plugins/import/ImportXml.class.php:54
 msgid "XML"
 msgstr "XML"
@@ -11422,7 +11434,7 @@ msgid "Show grid"
 msgstr "Sırlı kürsät"
 
 #: libraries/plugins/schema/SchemaPdf.class.php:94
-#: templates/structure/print_view_data_dictionary_link.phtml:6
+#: templates/database/structure/print_view_data_dictionary_link.phtml:6
 msgid "Data Dictionary"
 msgstr "Eçtälek Süzlege"
 
@@ -11453,7 +11465,7 @@ msgid "The %s table doesn't exist!"
 msgstr "\"%s\" atlı tüşämä yuq äle!"
 
 #: libraries/plugins/schema/eps/Eps_Relation_Schema.class.php:321
-#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:309
+#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:323
 #, fuzzy, php-format
 #| msgid "Schema of the \"%s\" database - Page %s"
 msgid "Schema of the %s database - Page %s"
@@ -11482,7 +11494,7 @@ msgstr "Eçtälek isemlege"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1005
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1028
 #: libraries/tracking.lib.php:884
-#: templates/structure/table_structure_header.phtml:11
+#: templates/table/structure/table_structure_header.phtml:11
 msgid "Extra"
 msgstr "Östämä"
 
@@ -11874,51 +11886,51 @@ msgstr ""
 msgid "Create the needed tables with the <code>%screate_tables.sql</code>."
 msgstr ""
 
-#: libraries/relation.lib.php:360
+#: libraries/relation.lib.php:357
 msgid "Create a pma user and give access to these tables."
 msgstr ""
 
-#: libraries/relation.lib.php:365
+#: libraries/relation.lib.php:360
 msgid ""
 "Enable advanced features in configuration file (<code>config.inc.php</"
 "code>), for example by starting from <code>config.sample.inc.php</code>."
 msgstr ""
 
-#: libraries/relation.lib.php:373
+#: libraries/relation.lib.php:365
 msgid "Re-login to phpMyAdmin to load the updated configuration file."
 msgstr ""
 
-#: libraries/relation.lib.php:1612
+#: libraries/relation.lib.php:1607
 msgid "no description"
 msgstr "Açıqlamasız"
 
-#: libraries/relation.lib.php:1811
+#: libraries/relation.lib.php:1806
 msgid ""
 "You do not have necessary privileges to create a database named "
 "'phpmyadmin'. You may go to 'Operations' tab of any database to set up the "
 "phpMyAdmin configuration storage there."
 msgstr ""
 
-#: libraries/relation.lib.php:1928
+#: libraries/relation.lib.php:1923
 #, php-format
 msgid ""
 "%sCreate%s a database named 'phpmyadmin' and setup the phpMyAdmin "
 "configuration storage there."
 msgstr ""
 
-#: libraries/relation.lib.php:1936
+#: libraries/relation.lib.php:1931
 #, php-format
 msgid ""
 "%sCreate%s the phpMyAdmin configuration storage in the current database."
 msgstr ""
 
-#: libraries/relation.lib.php:1944
+#: libraries/relation.lib.php:1939
 #, php-format
 msgid "%sCreate%s missing phpMyAdmin configuration storage tables."
 msgstr ""
 
 #: libraries/replication_gui.lib.php:46 libraries/replication_gui.lib.php:343
-#: libraries/server_databases.lib.php:387
+#: libraries/server_databases.lib.php:398
 msgid "Master replication"
 msgstr ""
 
@@ -11974,7 +11986,7 @@ msgid ""
 msgstr ""
 
 #: libraries/replication_gui.lib.php:141
-#: libraries/server_databases.lib.php:389
+#: libraries/server_databases.lib.php:400
 msgid "Slave replication"
 msgstr ""
 
@@ -12257,10 +12269,10 @@ msgid "Master server changed successfully to %s."
 msgstr "Bu xoquqlarnı yökläw uñışlı uzdı."
 
 #: libraries/rte/rte_events.lib.php:106 libraries/rte/rte_events.lib.php:115
-#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:149
-#: libraries/rte/rte_routines.lib.php:158
-#: libraries/rte/rte_routines.lib.php:231
-#: libraries/rte/rte_routines.lib.php:1362
+#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:219
+#: libraries/rte/rte_routines.lib.php:246
+#: libraries/rte/rte_routines.lib.php:368
+#: libraries/rte/rte_routines.lib.php:1453
 #: libraries/rte/rte_triggers.lib.php:82 libraries/rte/rte_triggers.lib.php:91
 #: libraries/rte/rte_triggers.lib.php:123
 #, php-format
@@ -12282,7 +12294,7 @@ msgstr "\"%s\" atlı tüşämä beterelde"
 msgid "Event %1$s has been created."
 msgstr "\"%s\" atlı tüşämä beterelde"
 
-#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:251
+#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:266
 #: libraries/rte/rte_triggers.lib.php:144
 msgid "One or more errors have occurred while processing your request:"
 msgstr ""
@@ -12292,7 +12304,7 @@ msgstr ""
 msgid "Edit event"
 msgstr "Cibärelde"
 
-#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:794
+#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:885
 #: libraries/rte/rte_triggers.lib.php:323 view_create.php:180
 msgid "Details"
 msgstr ""
@@ -12307,7 +12319,7 @@ msgstr "Buldıq töre"
 msgid "Event type"
 msgstr "Buldıq töre"
 
-#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:817
+#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:908
 #, fuzzy, php-format
 #| msgid "Change"
 msgid "Change to %s"
@@ -12342,12 +12354,14 @@ msgstr "Azaq"
 msgid "On completion preserve"
 msgstr "Tulayım östise"
 
-#: libraries/rte/rte_events.lib.php:491 libraries/rte/rte_routines.lib.php:930
+#: libraries/rte/rte_events.lib.php:491
+#: libraries/rte/rte_routines.lib.php:1021
 #: libraries/rte/rte_triggers.lib.php:383 view_create.php:209
 msgid "Definer"
 msgstr ""
 
-#: libraries/rte/rte_events.lib.php:535 libraries/rte/rte_routines.lib.php:997
+#: libraries/rte/rte_events.lib.php:535
+#: libraries/rte/rte_routines.lib.php:1088
 #: libraries/rte/rte_triggers.lib.php:422
 msgid "The definer must be in the \"username@hostname\" format!"
 msgstr ""
@@ -12375,9 +12389,9 @@ msgid "You must provide an event definition."
 msgstr ""
 
 #: libraries/rte/rte_export.lib.php:43 libraries/rte/rte_general.lib.php:72
-#: libraries/rte/rte_routines.lib.php:345
-#: libraries/rte/rte_routines.lib.php:1198
-#: libraries/rte/rte_routines.lib.php:1411
+#: libraries/rte/rte_routines.lib.php:153
+#: libraries/rte/rte_routines.lib.php:1289
+#: libraries/rte/rte_routines.lib.php:1502
 #, fuzzy
 #| msgid "Processes"
 msgid "Error in processing request:"
@@ -12413,149 +12427,149 @@ msgid ""
 "problems."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:110
-#: libraries/rte/rte_routines.lib.php:1006
+#: libraries/rte/rte_routines.lib.php:123
+msgid "Edit routine"
+msgstr ""
+
+#: libraries/rte/rte_routines.lib.php:200
+#: libraries/rte/rte_routines.lib.php:1097
 #, fuzzy, php-format
 #| msgid "Invalid server index: \"%s\""
 msgid "Invalid routine type: \"%s\""
 msgstr "Serverdäge \"%s\" digän tezeleş yaraqsız"
 
-#: libraries/rte/rte_routines.lib.php:170
+#: libraries/rte/rte_routines.lib.php:253
+#, fuzzy, php-format
+msgid "Routine %1$s has been created."
+msgstr "\"%s\" atlı tüşämä beterelde"
+
+#: libraries/rte/rte_routines.lib.php:380
 msgid "Sorry, we failed to restore the dropped routine."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:211
+#: libraries/rte/rte_routines.lib.php:439
 #, fuzzy, php-format
 #| msgid "Table %s has been dropped."
 msgid "Routine %1$s has been modified. Privileges have been adjusted."
 msgstr "\"%s\" atlı tüşämä beterelde"
 
-#: libraries/rte/rte_routines.lib.php:216
+#: libraries/rte/rte_routines.lib.php:444
 #, fuzzy, php-format
 #| msgid "Table %s has been dropped."
 msgid "Routine %1$s has been modified."
 msgstr "\"%s\" atlı tüşämä beterelde"
 
-#: libraries/rte/rte_routines.lib.php:238
-#, fuzzy, php-format
-msgid "Routine %1$s has been created."
-msgstr "\"%s\" atlı tüşämä beterelde"
-
-#: libraries/rte/rte_routines.lib.php:315
-msgid "Edit routine"
-msgstr ""
-
-#: libraries/rte/rte_routines.lib.php:797
+#: libraries/rte/rte_routines.lib.php:888
 #, fuzzy
 #| msgid "Column names"
 msgid "Routine name"
 msgstr "Alan iseme"
 
-#: libraries/rte/rte_routines.lib.php:823
+#: libraries/rte/rte_routines.lib.php:914
 msgid "Parameters"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:829
+#: libraries/rte/rte_routines.lib.php:920
 #, fuzzy
 #| msgid "Creation"
 msgid "Direction"
 msgstr "Yasalışı"
 
-#: libraries/rte/rte_routines.lib.php:847
+#: libraries/rte/rte_routines.lib.php:938
 msgid "Add parameter"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:851
+#: libraries/rte/rte_routines.lib.php:942
 #, fuzzy
 #| msgid "Rename database to"
 msgid "Remove last parameter"
 msgstr "Biremlekne bolay atap quy"
 
-#: libraries/rte/rte_routines.lib.php:856
+#: libraries/rte/rte_routines.lib.php:947
 msgid "Return type"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:862
+#: libraries/rte/rte_routines.lib.php:953
 #, fuzzy
 #| msgid "Length/Values"
 msgid "Return length/values"
 msgstr "Ozınlıq/Bäyä*"
 
-#: libraries/rte/rte_routines.lib.php:868
+#: libraries/rte/rte_routines.lib.php:959
 #, fuzzy
 #| msgid "Table options"
 msgid "Return options"
 msgstr "Tüşämä köyläneşe"
 
-#: libraries/rte/rte_routines.lib.php:899
+#: libraries/rte/rte_routines.lib.php:990
 msgid "Is deterministic"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:920
+#: libraries/rte/rte_routines.lib.php:1011
 msgid ""
 "You do not have sufficient privileges to perform this operation; Please "
 "refer to the documentation for more details"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:935
+#: libraries/rte/rte_routines.lib.php:1026
 #, fuzzy
 #| msgid "Query type"
 msgid "Security type"
 msgstr "Soraw töre"
 
-#: libraries/rte/rte_routines.lib.php:944
+#: libraries/rte/rte_routines.lib.php:1035
 msgid "SQL data access"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1013
+#: libraries/rte/rte_routines.lib.php:1104
 #, fuzzy
 #| msgid "Invalid table name"
 msgid "You must provide a routine name!"
 msgstr "Tüşämä adı yaraqsız"
 
-#: libraries/rte/rte_routines.lib.php:1047
+#: libraries/rte/rte_routines.lib.php:1138
 #, php-format
 msgid "Invalid direction \"%s\" given for parameter."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1069
-#: libraries/rte/rte_routines.lib.php:1131
+#: libraries/rte/rte_routines.lib.php:1160
+#: libraries/rte/rte_routines.lib.php:1222
 msgid ""
 "You must provide length/values for routine parameters of type ENUM, SET, "
 "VARCHAR and VARBINARY."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1095
+#: libraries/rte/rte_routines.lib.php:1186
 msgid "You must provide a name and a type for each routine parameter."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1114
+#: libraries/rte/rte_routines.lib.php:1205
 msgid "You must provide a valid return type for the routine."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1174
+#: libraries/rte/rte_routines.lib.php:1265
 msgid "You must provide a routine definition."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1285
+#: libraries/rte/rte_routines.lib.php:1376
 #, fuzzy, php-format
 #| msgid "Allows executing stored routines."
 msgid "Execution results of routine %s"
 msgstr "Eçke funksílar eşlätterergä birä."
 
-#: libraries/rte/rte_routines.lib.php:1340
+#: libraries/rte/rte_routines.lib.php:1431
 #, php-format
 msgid "%d row affected by the last statement inside the procedure."
 msgid_plural "%d rows affected by the last statement inside the procedure."
 msgstr[0] ""
 
-#: libraries/rte/rte_routines.lib.php:1398
-#: libraries/rte/rte_routines.lib.php:1406
+#: libraries/rte/rte_routines.lib.php:1489
+#: libraries/rte/rte_routines.lib.php:1497
 msgid "Execute routine"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1485
-#: libraries/rte/rte_routines.lib.php:1488
+#: libraries/rte/rte_routines.lib.php:1576
+#: libraries/rte/rte_routines.lib.php:1579
 msgid "Routine parameters"
 msgstr ""
 
@@ -12746,7 +12760,7 @@ msgid "Original position"
 msgstr "Tärtip buyınça urın"
 
 #: libraries/server_bin_log.lib.php:133
-#: templates/structure/display_table_stats.phtml:4
+#: templates/table/structure/display_table_stats.phtml:4
 msgid "Information"
 msgstr "Beleşmä"
 
@@ -12784,12 +12798,12 @@ msgstr ""
 "Note: Enabling the Database statistics here might cause heavy traffic "
 "between the webserver and the MySQL one."
 
-#: libraries/server_databases.lib.php:364
-#: libraries/server_databases.lib.php:365
+#: libraries/server_databases.lib.php:366
+#: libraries/server_databases.lib.php:371
 msgid "Enable Statistics"
 msgstr "Nöfüsne Cibärü"
 
-#: libraries/server_databases.lib.php:481
+#: libraries/server_databases.lib.php:492
 #, fuzzy, php-format
 #| msgid "%s databases have been dropped successfully."
 msgid "%1$d database has been dropped successfully."
@@ -13168,7 +13182,7 @@ msgid "You have revoked the privileges for %s."
 msgstr ""
 
 #: libraries/server_privileges.lib.php:2059
-#: libraries/server_privileges.lib.php:4290
+#: libraries/server_privileges.lib.php:4316
 #, fuzzy
 #| msgid "Any user"
 msgid "Add user account"
@@ -13350,60 +13364,60 @@ msgstr "\"%s\" Beterü"
 msgid "The privileges were reloaded successfully."
 msgstr "Bu xoquqlarnı yökläw uñışlı uzdı."
 
-#: libraries/server_privileges.lib.php:3994
+#: libraries/server_privileges.lib.php:4003
 #, php-format
 msgid "The user %s already exists!"
 msgstr "\"%s\" atlı qullanuçı bar inde!"
 
-#: libraries/server_privileges.lib.php:4232
+#: libraries/server_privileges.lib.php:4258
 #, fuzzy, php-format
 #| msgid "Privileges"
 msgid "Privileges for %s"
 msgstr "Xoquqlar"
 
-#: libraries/server_privileges.lib.php:4241
+#: libraries/server_privileges.lib.php:4267
 #: libraries/server_status_processes.lib.php:72
 #: libraries/server_user_groups.lib.php:39
 msgid "User"
 msgstr "Qullanuçı"
 
-#: libraries/server_privileges.lib.php:4282
+#: libraries/server_privileges.lib.php:4308
 msgctxt "Create new user"
 msgid "New"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4311
+#: libraries/server_privileges.lib.php:4337
 #, fuzzy
 #| msgid "Edit Privileges"
 msgid "Edit privileges:"
 msgstr "Xoquqlar Üzgärtü"
 
-#: libraries/server_privileges.lib.php:4312
+#: libraries/server_privileges.lib.php:4338
 #, fuzzy
 #| msgid "User"
 msgid "User account"
 msgstr "Qullanuçı"
 
-#: libraries/server_privileges.lib.php:4371
+#: libraries/server_privileges.lib.php:4397
 msgid ""
 "Note: You are attempting to edit privileges of the user with which you are "
 "currently logged in."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4391 libraries/server_users.lib.php:25
+#: libraries/server_privileges.lib.php:4417 libraries/server_users.lib.php:25
 #, fuzzy
 #| msgid "User overview"
 msgid "User accounts overview"
 msgstr "Qullanuçılar tezmäse"
 
-#: libraries/server_privileges.lib.php:4459
+#: libraries/server_privileges.lib.php:4485
 msgid ""
 "A user account allowing any user from localhost to connect is present. This "
 "will prevent other users from connecting if the host part of their account "
 "allows a connection from any (%) host."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4500
+#: libraries/server_privileges.lib.php:4526
 #, php-format
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
@@ -13416,7 +13430,7 @@ msgstr ""
 "alardan ayırıla ala. Andí çaqlarda, dawam itü aldınnan, %sxoquqlarnı qabat "
 "yökläp alası%s."
 
-#: libraries/server_privileges.lib.php:4519
+#: libraries/server_privileges.lib.php:4545
 #, fuzzy
 #| msgid ""
 #| "Note: phpMyAdmin gets the users' privileges directly from MySQL's "
@@ -13435,65 +13449,65 @@ msgstr ""
 "alardan ayırıla ala. Andí çaqlarda, dawam itü aldınnan, %sxoquqlarnı qabat "
 "yökläp alası%s."
 
-#: libraries/server_privileges.lib.php:4569
+#: libraries/server_privileges.lib.php:4595
 msgid "The selected user was not found in the privilege table."
 msgstr "Bu qullanuçı xoquqlar tüşämä eçendä tabılmadı."
 
-#: libraries/server_privileges.lib.php:4801
+#: libraries/server_privileges.lib.php:4827
 msgid "You have added a new user."
 msgstr "Yana qullanuçı östälände."
 
-#: libraries/server_status.lib.php:53
+#: libraries/server_status.lib.php:60
 #, php-format
 msgid "Network traffic since startup: %s"
 msgstr ""
 
-#: libraries/server_status.lib.php:66
+#: libraries/server_status.lib.php:73
 #, fuzzy, php-format
 #| msgid "This MySQL server has been running for %s. It started up on %s."
 msgid "This MySQL server has been running for %1$s. It started up on %2$s."
 msgstr "Bu MySQL-server %s eşli. %s çorında cibärelgän ide ul."
 
-#: libraries/server_status.lib.php:80
+#: libraries/server_status.lib.php:94
 msgid ""
 "This MySQL server works as <b>master</b> and <b>slave</b> in <b>replication</"
 "b> process."
 msgstr ""
 
-#: libraries/server_status.lib.php:85
+#: libraries/server_status.lib.php:99
 msgid "This MySQL server works as <b>master</b> in <b>replication</b> process."
 msgstr ""
 
-#: libraries/server_status.lib.php:90
+#: libraries/server_status.lib.php:104
 msgid "This MySQL server works as <b>slave</b> in <b>replication</b> process."
 msgstr ""
 
-#: libraries/server_status.lib.php:106
+#: libraries/server_status.lib.php:116
 #, fuzzy
 msgid "Replication status"
 msgstr "Bäyläneşlär"
 
-#: libraries/server_status.lib.php:137
+#: libraries/server_status.lib.php:146
 msgid ""
 "On a busy server, the byte counters may overrun, so those statistics as "
 "reported by the MySQL server may be incorrect."
 msgstr ""
 
-#: libraries/server_status.lib.php:148
+#: libraries/server_status.lib.php:157
 msgid "Received"
 msgstr "Alındı"
 
-#: libraries/server_status.lib.php:167
+#: libraries/server_status.lib.php:176
 msgid "Sent"
 msgstr "Cibärelde"
 
-#: libraries/server_status.lib.php:234
+#: libraries/server_status.lib.php:243
 #, fuzzy
 #| msgid "Connections"
 msgid "Max. concurrent connections"
 msgstr "Totaşular"
 
-#: libraries/server_status.lib.php:244
+#: libraries/server_status.lib.php:253
 msgid "Failed attempts"
 msgstr ""
 
@@ -14497,7 +14511,7 @@ msgstr ""
 msgid "Not implemented yet."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/AlterOperation.php:193
+#: libraries/sql-parser/src/Components/AlterOperation.php:191
 msgid "Unrecognized alter operation."
 msgstr ""
 
@@ -14511,7 +14525,7 @@ msgid "An opening bracket followed by a set of values was expected."
 msgstr ""
 
 #: libraries/sql-parser/src/Components/ArrayObj.php:101
-#: libraries/sql-parser/src/Components/FieldDefinition.php:202
+#: libraries/sql-parser/src/Components/CreateDefinition.php:202
 msgid "An opening bracket was expected."
 msgstr ""
 
@@ -14519,25 +14533,35 @@ msgstr ""
 msgid "A comma or a closing bracket was expected"
 msgstr ""
 
+#: libraries/sql-parser/src/Components/CreateDefinition.php:246
+#, fuzzy
+#| msgid "No databases selected."
+msgid "A comma or a closing bracket was expected."
+msgstr "Biremlek saylanmağan."
+
+#: libraries/sql-parser/src/Components/CreateDefinition.php:262
+msgid "A closing bracket was expected."
+msgstr ""
+
 #: libraries/sql-parser/src/Components/DataType.php:125
 msgid "Unrecognized data type."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:225
+#: libraries/sql-parser/src/Components/Expression.php:227
 msgid "Unexpected closing bracket."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:246
-#: libraries/sql-parser/src/Components/Expression.php:283
-#: libraries/sql-parser/src/Components/Expression.php:303
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:285
+#: libraries/sql-parser/src/Components/Expression.php:305
 msgid "An alias was previously found."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:257
+#: libraries/sql-parser/src/Components/Expression.php:259
 msgid "Unexpected dot."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:327
+#: libraries/sql-parser/src/Components/Expression.php:329
 #, fuzzy
 #| msgid "No databases selected."
 msgid "An alias was expected."
@@ -14549,16 +14573,6 @@ msgstr "Biremlek saylanmağan."
 msgid "An expression was expected."
 msgstr "Kertemnär sayladı"
 
-#: libraries/sql-parser/src/Components/FieldDefinition.php:246
-#, fuzzy
-#| msgid "No databases selected."
-msgid "A comma or a closing bracket was expected."
-msgstr "Biremlek saylanmağan."
-
-#: libraries/sql-parser/src/Components/FieldDefinition.php:262
-msgid "A closing bracket was expected."
-msgstr ""
-
 #: libraries/sql-parser/src/Components/Limit.php:90
 #: libraries/sql-parser/src/Components/Limit.php:112
 msgid "An offset was expected."
@@ -14604,27 +14618,27 @@ msgstr ""
 msgid "Expected delimiter."
 msgstr ""
 
-#: libraries/sql-parser/src/Lexer.php:753
+#: libraries/sql-parser/src/Lexer.php:777
 #, fuzzy, php-format
 msgid "Ending quote %1$s was expected."
 msgstr "\"%s\" atlı tüşämä beterelde"
 
-#: libraries/sql-parser/src/Lexer.php:789
+#: libraries/sql-parser/src/Lexer.php:813
 #, fuzzy
 msgid "Variable name was expected."
 msgstr "Birem adınıñ tözeleşe"
 
-#: libraries/sql-parser/src/Parser.php:380
+#: libraries/sql-parser/src/Parser.php:391
 #, fuzzy
 #| msgid "At Beginning of Table"
 msgid "Unexpected beginning of statement."
 msgstr "Tüşämä Başına"
 
-#: libraries/sql-parser/src/Parser.php:399
+#: libraries/sql-parser/src/Parser.php:410
 msgid "Unrecognized statement type."
 msgstr ""
 
-#: libraries/sql-parser/src/Parser.php:479
+#: libraries/sql-parser/src/Parser.php:489
 msgid "No transaction was previously started."
 msgstr ""
 
@@ -14652,8 +14666,10 @@ msgid "The name of the entity was expected."
 msgstr "Açıq toruçı tüşämä sanı."
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:310
-msgid "At least one field definition was expected."
-msgstr ""
+#, fuzzy
+#| msgid "The row has been deleted."
+msgid "At least one column definition was expected."
+msgstr "Bu yazma salınğan buldı"
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:329
 msgid "A \"RETURNS\" keyword was expected."
@@ -14725,25 +14741,25 @@ msgstr "%s digän bitbilge yaratıldı"
 msgid "Using bookmark \"%s\" as default browse query."
 msgstr ""
 
-#: libraries/sql.lib.php:1306
+#: libraries/sql.lib.php:1300
 msgid "Showing as PHP code"
 msgstr ""
 
-#: libraries/sql.lib.php:1638
+#: libraries/sql.lib.php:1632
 #, php-format
 msgid ""
 "Current selection does not contain a unique column. Grid edit, checkbox, "
 "Edit, Copy and Delete features are not available. %s"
 msgstr ""
 
-#: libraries/sql.lib.php:1649
+#: libraries/sql.lib.php:1643
 #, php-format
 msgid ""
 "Current selection does not contain a unique column. Grid edit, Edit, Copy "
 "and Delete features may result in undesired behavior. %s"
 msgstr ""
 
-#: libraries/sql.lib.php:1688
+#: libraries/sql.lib.php:1682
 #, php-format
 msgid "Problems with indexes of table `%s`"
 msgstr "`%s` atlı tüşäw tezeşläre belän nidider tiskärlek bar"
@@ -14912,7 +14928,7 @@ msgid "Version %s snapshot (SQL code)"
 msgstr ""
 
 #: libraries/tracking.lib.php:947
-#: templates/structure/table_structure_row.phtml:33
+#: templates/table/structure/table_structure_row.phtml:33
 #, fuzzy
 #| msgid "None"
 msgctxt "None for default"
@@ -14966,19 +14982,19 @@ msgstr "Server söreme"
 msgid "Version %1$s was created, tracking for %2$s is active."
 msgstr ""
 
-#: libraries/user_preferences.inc.php:29
+#: libraries/user_preferences.inc.php:30
 #, fuzzy
 #| msgid "General relation features"
 msgid "Manage your settings"
 msgstr "Bäyläneşlär buyınça töp mömkinleklär"
 
-#: libraries/user_preferences.inc.php:46 prefs_manage.php:307
+#: libraries/user_preferences.inc.php:54 prefs_manage.php:307
 #, fuzzy
 #| msgid "Modifications have been saved"
 msgid "Configuration has been saved."
 msgstr "Üzgärtülär saqlandı"
 
-#: libraries/user_preferences.inc.php:66
+#: libraries/user_preferences.inc.php:74
 #, php-format
 msgid ""
 "Your preferences will be saved for current session only. Storing them "
@@ -15386,7 +15402,7 @@ msgid "first"
 msgstr ""
 
 #: templates/columns_definitions/move_column.phtml:12
-#: templates/structure/add_column.phtml:21
+#: templates/table/structure/add_column.phtml:21
 #, fuzzy, php-format
 #| msgid "After %s"
 msgid "after %s"
@@ -15471,240 +15487,350 @@ msgstr "Beleşmä"
 msgid "Input transformation options"
 msgstr "Transformation options"
 
-#: templates/designer/aggregate_query_panel.phtml:22
-#: templates/designer/options_panel.phtml:100
+#: templates/database/create_table.phtml:7
+#: templates/database/designer/side_menu.phtml:77
+#: templates/database/designer/side_menu.phtml:80
+#, fuzzy
+msgid "Create table"
+msgstr "Yaña Bit yaratu"
+
+#: templates/database/create_table.phtml:15
+#, fuzzy
+#| msgid "Number of fields"
+msgid "Number of columns"
+msgstr "Alannar sanı"
+
+#: templates/database/designer/aggregate_query_panel.phtml:22
+#: templates/database/designer/options_panel.phtml:100
 #, fuzzy
 #| msgid "Create"
 msgid "Aggregate"
 msgstr "Yarat"
 
-#: templates/designer/aggregate_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:61
-#: templates/designer/options_panel.phtml:106
-#: templates/designer/options_panel.phtml:170
-#: templates/designer/where_query_panel.phtml:30
-#: templates/table/table_header.phtml:9
+#: templates/database/designer/aggregate_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:61
+#: templates/database/designer/options_panel.phtml:106
+#: templates/database/designer/options_panel.phtml:170
+#: templates/database/designer/where_query_panel.phtml:30
+#: templates/table/search/table_header.phtml:9
 msgid "Operator"
 msgstr "Operator"
 
-#: templates/designer/database_tables.phtml:29
+#: templates/database/designer/database_tables.phtml:29
 msgid "Toggle"
 msgstr ""
 
-#: templates/designer/database_tables.phtml:40
+#: templates/database/designer/database_tables.phtml:40
 #, fuzzy
 #| msgid "Database for user"
 msgid "See table structure"
 msgstr "Qullanuçı biremlege"
 
-#: templates/designer/delete_relation_panel.phtml:21
+#: templates/database/designer/delete_relation_panel.phtml:21
 msgid "Delete relation"
 msgstr ""
 
-#: templates/designer/edit_delete_pages.phtml:7
+#: templates/database/designer/edit_delete_pages.phtml:7
 #, fuzzy
 #| msgid "Page number:"
 msgid "Page to open"
 msgstr "Bitneñ sanı:"
 
-#: templates/designer/edit_delete_pages.phtml:7
+#: templates/database/designer/edit_delete_pages.phtml:7
 #, fuzzy
 msgid "Page to delete"
 msgstr "Bäyläneşkä küzätü"
 
-#: templates/designer/having_query_panel.phtml:90
-#: templates/designer/options_panel.phtml:63
-#: templates/designer/options_panel.phtml:229
-#: templates/designer/where_query_panel.phtml:59
+#: templates/database/designer/having_query_panel.phtml:90
+#: templates/database/designer/options_panel.phtml:63
+#: templates/database/designer/options_panel.phtml:229
+#: templates/database/designer/where_query_panel.phtml:59
 #, fuzzy
 #| msgid "Export"
 msgid "Except"
 msgstr "Export"
 
-#: templates/designer/having_query_panel.phtml:102
-#: templates/designer/options_panel.phtml:75
-#: templates/designer/options_panel.phtml:241
-#: templates/designer/where_query_panel.phtml:71
+#: templates/database/designer/having_query_panel.phtml:102
+#: templates/database/designer/options_panel.phtml:75
+#: templates/database/designer/options_panel.phtml:241
+#: templates/database/designer/where_query_panel.phtml:71
 #, fuzzy
 #| msgid "in query"
 msgid "subquery"
 msgstr "sorawda"
 
-#: templates/designer/new_relation_panel.phtml:22
-#: templates/designer/side_menu.phtml:84 templates/designer/side_menu.phtml:87
+#: templates/database/designer/new_relation_panel.phtml:22
+#: templates/database/designer/side_menu.phtml:84
+#: templates/database/designer/side_menu.phtml:87
 #, fuzzy
 msgid "Create relation"
 msgstr "Server söreme"
 
-#: templates/designer/options_panel.phtml:34
-#: templates/designer/options_panel.phtml:200
+#: templates/database/designer/options_panel.phtml:34
+#: templates/database/designer/options_panel.phtml:200
 #, fuzzy
 msgid "Relation operator"
 msgstr "Bäyläneşkä küzätü"
 
-#: templates/designer/options_panel.phtml:85
-#: templates/designer/rename_to_panel.phtml:23
+#: templates/database/designer/options_panel.phtml:85
+#: templates/database/designer/rename_to_panel.phtml:23
 #, fuzzy
 msgid "Rename to"
 msgstr "Tüşämä adın üzgärtü"
 
-#: templates/designer/options_panel.phtml:91
-#: templates/designer/rename_to_panel.phtml:31
+#: templates/database/designer/options_panel.phtml:91
+#: templates/database/designer/rename_to_panel.phtml:31
 #, fuzzy
 #| msgid "User name"
 msgid "New name"
 msgstr "İreşü iseme"
 
-#: templates/designer/page_save_as.phtml:4
+#: templates/database/designer/page_save_as.phtml:4
 #, fuzzy
 #| msgid "No rows selected"
 msgid "Save to selected page"
 msgstr "Kertemnär sayladı"
 
-#: templates/designer/page_save_as.phtml:5
+#: templates/database/designer/page_save_as.phtml:5
 #, fuzzy
 #| msgid "Create a new index"
 msgid "Create a page and save to it"
 msgstr "Yaña tezeş yaratu"
 
-#: templates/designer/page_save_as.phtml:26
+#: templates/database/designer/page_save_as.phtml:26
 #, fuzzy
 #| msgid "User name"
 msgid "New page name"
 msgstr "İreşü iseme"
 
-#: templates/designer/page_selector.phtml:2
+#: templates/database/designer/page_selector.phtml:2
 #, fuzzy
 #| msgid "Select Tables"
 msgid "Select page"
 msgstr "Tüşämä Saylaw"
 
-#: templates/designer/query_details.phtml:10
+#: templates/database/designer/query_details.phtml:10
 #, fuzzy
 #| msgid "Table options"
 msgid "Active options"
 msgstr "Tüşämä köyläneşe"
 
-#: templates/designer/schema_export.phtml:4
+#: templates/database/designer/schema_export.phtml:4
 msgid "Select Export Relational Type"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:19 templates/designer/side_menu.phtml:25
+#: templates/database/designer/side_menu.phtml:19
+#: templates/database/designer/side_menu.phtml:25
 #, fuzzy
 #| msgid "Show tables"
 msgid "Show/Hide tables list"
 msgstr "Tüşämälär kürsätäse"
 
-#: templates/designer/side_menu.phtml:29 templates/designer/side_menu.phtml:35
-#: templates/designer/side_menu.phtml:36
+#: templates/database/designer/side_menu.phtml:29
+#: templates/database/designer/side_menu.phtml:35
+#: templates/database/designer/side_menu.phtml:36
 msgid "View in fullscreen"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:34
+#: templates/database/designer/side_menu.phtml:34
 msgid "Exit fullscreen"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:41 templates/designer/side_menu.phtml:45
+#: templates/database/designer/side_menu.phtml:41
+#: templates/database/designer/side_menu.phtml:45
 #, fuzzy
 #| msgid "User name"
 msgid "New page"
 msgstr "İreşü iseme"
 
-#: templates/designer/side_menu.phtml:70 templates/designer/side_menu.phtml:73
+#: templates/database/designer/side_menu.phtml:70
+#: templates/database/designer/side_menu.phtml:73
 #, fuzzy
 #| msgid "Select Tables"
 msgid "Delete pages"
 msgstr "Tüşämä Saylaw"
 
-#: templates/designer/side_menu.phtml:77 templates/designer/side_menu.phtml:80
-#: templates/table/create_table.phtml:7
-#, fuzzy
-msgid "Create table"
-msgstr "Yaña Bit yaratu"
-
-#: templates/designer/side_menu.phtml:98
-#: templates/designer/side_menu.phtml:101
+#: templates/database/designer/side_menu.phtml:98
+#: templates/database/designer/side_menu.phtml:101
 msgid "Reload"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:107
-#: templates/designer/side_menu.phtml:110
+#: templates/database/designer/side_menu.phtml:107
+#: templates/database/designer/side_menu.phtml:110
 msgid "Help"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Angular links"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Direct links"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:122
-#: templates/designer/side_menu.phtml:124
+#: templates/database/designer/side_menu.phtml:122
+#: templates/database/designer/side_menu.phtml:124
 msgid "Snap to grid"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:128
-#: templates/designer/side_menu.phtml:134
+#: templates/database/designer/side_menu.phtml:128
+#: templates/database/designer/side_menu.phtml:134
 msgid "Small/Big All"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:138
-#: templates/designer/side_menu.phtml:141
+#: templates/database/designer/side_menu.phtml:138
+#: templates/database/designer/side_menu.phtml:141
 msgid "Toggle small/big"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:145
-#: templates/designer/side_menu.phtml:148
+#: templates/database/designer/side_menu.phtml:145
+#: templates/database/designer/side_menu.phtml:148
 #, fuzzy
 #| msgid "Traditional Chinese"
 msgid "Toggle relation lines"
 msgstr "Ğädäti Çinçä"
 
-#: templates/designer/side_menu.phtml:153
-#: templates/designer/side_menu.phtml:156
+#: templates/database/designer/side_menu.phtml:153
+#: templates/database/designer/side_menu.phtml:156
 #, fuzzy
 #| msgid "Export"
 msgid "Export schema"
 msgstr "Export"
 
-#: templates/designer/side_menu.phtml:165
-#: templates/designer/side_menu.phtml:168
+#: templates/database/designer/side_menu.phtml:165
+#: templates/database/designer/side_menu.phtml:168
 #, fuzzy
 #| msgid "Submit Query"
 msgid "Build Query"
 msgstr "Sorawnı Yulla"
 
-#: templates/designer/side_menu.phtml:173
-#: templates/designer/side_menu.phtml:177
+#: templates/database/designer/side_menu.phtml:173
+#: templates/database/designer/side_menu.phtml:177
 msgid "Move Menu"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:181
-#: templates/designer/side_menu.phtml:186
+#: templates/database/designer/side_menu.phtml:181
+#: templates/database/designer/side_menu.phtml:186
 #, fuzzy
 #| msgid "Partial Texts"
 msgid "Pin text"
 msgstr "Partial Texts"
 
-#: templates/designer/table_list.phtml:4
+#: templates/database/designer/table_list.phtml:4
 #, fuzzy
 msgid "Hide/Show all"
 msgstr "Barısın kürsät"
 
-#: templates/designer/table_list.phtml:14
+#: templates/database/designer/table_list.phtml:14
 msgid "Hide/Show Tables with no relation"
 msgstr ""
 
-#: templates/designer/table_list.phtml:59
+#: templates/database/designer/table_list.phtml:59
 #, fuzzy
 msgid "Number of tables:"
 msgstr "Alannar sanı"
 
+#: templates/database/structure/body_for_table_summary.phtml:6
+#, fuzzy, php-format
+#| msgid "%s table(s)"
+msgid "%s table"
+msgid_plural "%s tables"
+msgstr[0] "%s tüşämä"
+
+#: templates/database/structure/body_for_table_summary.phtml:17
+msgid "Sum"
+msgstr "Sum"
+
+#: templates/database/structure/check_all_tables.phtml:6
+msgid "Check tables having overhead"
+msgstr "Check overheaded"
+
+#: templates/database/structure/check_all_tables.phtml:10
+#, fuzzy
+#| msgid "Show color"
+msgid "Show create"
+msgstr "Tösle kürsät"
+
+#: templates/database/structure/check_all_tables.phtml:27
+msgid "Prefix"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:28
+#, fuzzy
+msgid "Add prefix to table"
+msgstr "Biremleklär yuq"
+
+#: templates/database/structure/check_all_tables.phtml:29
+#, fuzzy
+#| msgid "Replace table data with file"
+msgid "Replace table prefix"
+msgstr "Tüşämä eçtälegen bu biremlektäge belän alamştırası"
+
+#: templates/database/structure/check_all_tables.phtml:30
+#, fuzzy
+#| msgid "Replace table data with file"
+msgid "Copy table with prefix"
+msgstr "Tüşämä eçtälegen bu biremlektäge belän alamştırası"
+
+#: templates/database/structure/check_all_tables.phtml:36
+#, fuzzy
+#| msgid "Add %s field(s)"
+msgid "Add columns to central list"
+msgstr "%s alan östäw"
+
+#: templates/database/structure/check_all_tables.phtml:37
+msgid "Remove columns from central list"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:38
+#, fuzzy
+#| msgid "Add %s field(s)"
+msgid "Make consistent with central list"
+msgstr "%s alan östäw"
+
+#: templates/database/structure/favorite_anchor.phtml:12
+#, fuzzy
+msgid "Add to Favorites"
+msgstr "Yaña qullanuçı östäw"
+
+#: templates/database/structure/show_create.phtml:2
+#, fuzzy
+msgid "Showing create queries"
+msgstr "Tulı Sorawlar Kürsät"
+
+#: templates/database/structure/sortable_header.phtml:13
+msgid "Sort"
+msgstr "Tezü"
+
+#: templates/database/structure/table_header.phtml:42
+#, fuzzy
+#| msgid "May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]"
+msgid ""
+"May be approximate. Click on the number to get the exact count. See "
+"[doc@faq3-11]FAQ 3.11[/doc]."
+msgstr "Törle buluı bar. [doc@faq3-11]YBS 3.11[/doc] qarísı"
+
+#: templates/database/structure/table_header.phtml:66
+#: templates/table/index_form.phtml:127
+msgid "Size"
+msgstr "Küläme"
+
+#: templates/database/structure/table_header.phtml:74
+#: templates/table/structure/display_table_stats.phtml:27
+msgid "Overhead"
+msgstr "Overhead"
+
+#: templates/database/structure/tracking_icon.phtml:4
+msgid "Tracking is active."
+msgstr ""
+
+#: templates/database/structure/tracking_icon.phtml:8
+msgid "Tracking is not active."
+msgstr ""
+
 #: templates/error/report_form.phtml:7
 msgid ""
 "phpMyAdmin has encountered an error. We have collected data about this error "
@@ -15720,68 +15846,6 @@ msgstr ""
 msgid "Please explain the steps that lead to the error:"
 msgstr ""
 
-#: templates/gis_visualization/gis_visualization.phtml:3
-msgid "Display GIS Visualization"
-msgstr ""
-
-#: templates/gis_visualization/gis_visualization.phtml:8
-#, fuzzy
-#| msgid "Add/Delete Field Columns"
-msgid "Label column"
-msgstr "Add/Delete Field Columns"
-
-#: templates/gis_visualization/gis_visualization.phtml:11
-msgid "-- None --"
-msgstr ""
-
-#: templates/gis_visualization/gis_visualization.phtml:19
-#, fuzzy
-#| msgid "Total"
-msgid "Spatial column"
-msgstr "Tulayım"
-
-#: templates/index_form.phtml:16
-msgid "Index name:"
-msgstr "Tezeş adı&nbsp;:"
-
-#: templates/index_form.phtml:19
-msgid ""
-"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
-msgstr "Töp açqıçnıñ <b>ğına</b> adı \"PRIMARY\" bulırğa <b>tieş</b>!"
-
-#: templates/index_form.phtml:40
-#, fuzzy
-#| msgid "Index name:"
-msgid "Index choice:"
-msgstr "Tezeş adı&nbsp;:"
-
-#: templates/index_form.phtml:57
-msgid "Key block size:"
-msgstr ""
-
-#: templates/index_form.phtml:74
-msgid "Index type:"
-msgstr "Tezeş töre&nbsp;:"
-
-#: templates/index_form.phtml:86
-#, fuzzy
-#| msgid "User"
-msgid "Parser:"
-msgstr "Qullanuçı"
-
-#: templates/index_form.phtml:102
-#, fuzzy
-msgid "Comment:"
-msgstr "Açıqlama"
-
-#: templates/index_form.phtml:127 templates/structure/table_header.phtml:66
-msgid "Size"
-msgstr "Küläme"
-
-#: templates/index_form.phtml:149 templates/index_form.phtml:190
-msgid "Drag to reorder"
-msgstr ""
-
 #: templates/prefs_autoload.phtml:9
 msgid ""
 "Your browser has phpMyAdmin configuration for this domain. Would you like to "
@@ -15794,491 +15858,450 @@ msgstr ""
 msgid "Start row:"
 msgstr "Şmb"
 
-#: templates/structure/actions_in_table_structure.phtml:14
-#, php-format
-msgid "A primary key has been added on %s."
-msgstr "\"%s\" öçen töp açqıç qorıldı."
-
-#: templates/structure/actions_in_table_structure.phtml:34
-#: templates/structure/actions_in_table_structure.phtml:54
-#: templates/structure/actions_in_table_structure.phtml:79
-#: templates/structure/actions_in_table_structure.phtml:101
-#, php-format
-msgid "An index has been added on %s."
-msgstr "\"%s\" öçen ber açqıç qorıldı."
-
-#: templates/structure/actions_in_table_structure.phtml:130
-#: templates/structure/check_all_table_column.phtml:59
-#, fuzzy
-#| msgid "Rename database to"
-msgid "Remove from central columns"
-msgstr "Biremlekne bolay atap quy"
-
-#: templates/structure/actions_in_table_structure.phtml:138
-#: templates/structure/check_all_table_column.phtml:55
-#, fuzzy
-#| msgid "Add %s field(s)"
-msgid "Add to central columns"
-msgstr "%s alan östäw"
-
-#: templates/structure/add_column.phtml:7
-#, fuzzy, php-format
-#| msgid "Add %s field(s)"
-msgid "Add %s column(s)"
-msgstr "%s alan östäw"
-
-#: templates/structure/add_column.phtml:12
-#, fuzzy
-#| msgid "At Beginning of Table"
-msgid "at beginning of table"
-msgstr "Tüşämä Başına"
-
-#: templates/structure/body_for_table_summary.phtml:6
-#, fuzzy, php-format
-#| msgid "%s table(s)"
-msgid "%s table"
-msgid_plural "%s tables"
-msgstr[0] "%s tüşämä"
-
-#: templates/structure/body_for_table_summary.phtml:17
-msgid "Sum"
-msgstr "Sum"
-
-#: templates/structure/check_all_tables.phtml:6
-msgid "Check tables having overhead"
-msgstr "Check overheaded"
-
-#: templates/structure/check_all_tables.phtml:10
-#, fuzzy
-#| msgid "Show color"
-msgid "Show create"
-msgstr "Tösle kürsät"
-
-#: templates/structure/check_all_tables.phtml:27
-msgid "Prefix"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:28
-#, fuzzy
-msgid "Add prefix to table"
-msgstr "Biremleklär yuq"
-
-#: templates/structure/check_all_tables.phtml:29
-#, fuzzy
-#| msgid "Replace table data with file"
-msgid "Replace table prefix"
-msgstr "Tüşämä eçtälegen bu biremlektäge belän alamştırası"
-
-#: templates/structure/check_all_tables.phtml:30
-#, fuzzy
-#| msgid "Replace table data with file"
-msgid "Copy table with prefix"
-msgstr "Tüşämä eçtälegen bu biremlektäge belän alamştırası"
-
-#: templates/structure/check_all_tables.phtml:36
-#, fuzzy
-#| msgid "Add %s field(s)"
-msgid "Add columns to central list"
-msgstr "%s alan östäw"
-
-#: templates/structure/check_all_tables.phtml:37
-msgid "Remove columns from central list"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:38
-#, fuzzy
-#| msgid "Add %s field(s)"
-msgid "Make consistent with central list"
-msgstr "%s alan östäw"
-
-#: templates/structure/display_structure.phtml:140 view_create.php:181
-#, fuzzy
-#| msgid "Print view"
-msgid "Edit view"
-msgstr "Bastıru küreneşe"
-
-#: templates/structure/display_table_stats.phtml:9
-msgid "Space usage"
-msgstr "Totılğan Alan"
-
-#: templates/structure/display_table_stats.phtml:27
-#: templates/structure/table_header.phtml:74
-msgid "Overhead"
-msgstr "Overhead"
-
-#: templates/structure/display_table_stats.phtml:32
-msgid "Effective"
-msgstr "Uñışlı"
-
-#: templates/structure/favorite_anchor.phtml:12
-#, fuzzy
-msgid "Add to Favorites"
-msgstr "Yaña qullanuçı östäw"
-
-#: templates/structure/move_columns_dialog.phtml:1
-#: templates/structure/optional_action_links.phtml:21
-#, fuzzy
-#| msgid "Add %s field(s)"
-msgid "Move columns"
-msgstr "%s alan östäw"
-
-#: templates/structure/move_columns_dialog.phtml:2
-msgid "Move the columns by dragging them up and down."
-msgstr ""
-
-#: templates/structure/optional_action_links.phtml:9
-msgid "Propose table structure"
-msgstr "Tüşämä tözeleşenä küzätü"
-
-#: templates/structure/optional_action_links.phtml:24
-#, fuzzy
-#| msgid "Propose table structure"
-msgid "Improve table structure"
-msgstr "Tüşämä tözeleşenä küzätü"
-
-#: templates/structure/optional_action_links.phtml:30
-#, fuzzy
-msgid "Track view"
-msgstr "Tüşämä tikşerü"
-
-#: templates/structure/row_stats_table.phtml:3
-#, fuzzy
-#| msgid "Row Statistics"
-msgid "Row statistics"
-msgstr "Kerem Nöfüse"
-
-#: templates/structure/row_stats_table.phtml:9
-msgid "static"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:11
-msgid "dynamic"
-msgstr "üzgärüçän"
-
-#: templates/structure/row_stats_table.phtml:22
-msgid "partitioned"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:54
-msgid "Row length"
-msgstr "Kerem ozınlığı"
-
-#: templates/structure/row_stats_table.phtml:66
-msgid "Row size"
-msgstr "Kerem olılığı"
-
-#: templates/structure/row_stats_table.phtml:73
-msgid "Next autoindex"
-msgstr ""
-
-#: templates/structure/secondary_tabs.phtml:14
-#, fuzzy
-#| msgid "Relation view"
-msgid "Relation view"
-msgstr "Bäyläneşkä küzätü"
-
-#: templates/structure/show_create.phtml:2
-#, fuzzy
-msgid "Showing create queries"
-msgstr "Tulı Sorawlar Kürsät"
-
-#: templates/structure/sortable_header.phtml:13
-msgid "Sort"
-msgstr "Tezü"
-
-#: templates/structure/table_header.phtml:42
-#, fuzzy
-#| msgid "May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]"
-msgid ""
-"May be approximate. Click on the number to get the exact count. See "
-"[doc@faq3-11]FAQ 3.11[/doc]."
-msgstr "Törle buluı bar. [doc@faq3-11]YBS 3.11[/doc] qarísı"
-
-#: templates/structure/table_structure_row.phtml:46
-#, fuzzy, php-format
-#| msgid "Table %s has been dropped."
-msgid "Column %s has been dropped."
-msgstr "\"%s\" atlı tüşämä beterelde"
-
-#: templates/structure/tracking_icon.phtml:4
-msgid "Tracking is active."
-msgstr ""
-
-#: templates/structure/tracking_icon.phtml:8
-msgid "Tracking is not active."
-msgstr ""
-
-#: templates/table/create_table.phtml:15
-#, fuzzy
-#| msgid "Number of fields"
-msgid "Number of columns"
-msgstr "Alannar sanı"
-
-#: templates/table/options.phtml:8
-#, fuzzy
-#| msgid "Select fields (at least one):"
-msgid "Select columns (at least one):"
-msgstr "Alannar saylísı (iñ kimendä ber):"
-
-#: templates/table/options.phtml:37
-msgid "Add search conditions (body of the \"where\" clause):"
-msgstr "Ezläw şartın östäw (\"WHERE\" eçtälege):"
-
-#: templates/table/options.phtml:45
-msgid "Number of rows per page"
-msgstr "Bit sayın Kertem sanı"
-
-#: templates/table/options.phtml:56
-msgid "Display order:"
-msgstr "Kürsätü tärtibe:"
-
-#: templates/table/options_zoom.phtml:6
-msgid "Use this column to label each point"
-msgstr ""
-
-#: templates/table/options_zoom.phtml:35
-msgid "Maximum rows to plot"
-msgstr ""
-
-#: templates/table/replace_preview.phtml:13
-msgid "Find and replace - preview"
-msgstr ""
-
-#: templates/table/replace_preview.phtml:18
-#, fuzzy
-#| msgid "Original position"
-msgid "Original string"
-msgstr "Tärtip buyınça urın"
-
-#: templates/table/replace_preview.phtml:19
-#, fuzzy
-#| msgid "Relations"
-msgid "Replaced string"
-msgstr "Bäyläneşlär"
-
-#: templates/table/replace_preview.phtml:40
-#, fuzzy
-msgid "Replace"
-msgstr "Bäyläneşlär"
-
-#: templates/table/rows_zoom.phtml:16
-#, fuzzy
-msgid "Additional search criteria"
-msgstr "SQL-soraw"
-
-#: templates/table/search_and_replace.phtml:3
-#, fuzzy
-#| msgid "Replace NULL by"
-msgid "Replace with:"
-msgstr "NULL'nı almaştırası:"
-
-#: templates/table/search_and_replace.phtml:22
-#, fuzzy
-#| msgid "as regular expression"
-msgid "Use regular expression"
-msgstr "regexp kileş"
-
-#: templates/table/selection_form.phtml:12
-#, fuzzy
-#| msgid "Do a \"query by example\" (wildcard: \"%\")"
-msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
-msgstr "\"Ürnäk buyınça soraw\" eşkärtü (almaştırma: \"%\")"
-
-#: templates/table/selection_form.phtml:34
-msgid "Do a \"query by example\" (wildcard: \"%\")"
-msgstr "\"Ürnäk buyınça soraw\" eşkärtü (almaştırma: \"%\")"
-
-#: templates/table/zoom_result_form.phtml:7
-msgid "Browse/Edit the points"
-msgstr ""
-
-#: templates/table/zoom_result_form.phtml:15
-#, fuzzy
-msgid "How to use"
-msgstr "PHP Söreme"
-
-#: templates/table/zoom_result_form.phtml:23
-#, fuzzy
-#| msgid "Reset"
-msgid "Reset zoom"
-msgstr "Awdar"
-
-#: templates/tbl_chart.phtml:17
+#: templates/table/chart/tbl_chart.phtml:17
 #, fuzzy
 #| msgid "Mar"
 msgctxt "Chart type"
 msgid "Bar"
 msgstr "Mar"
 
-#: templates/tbl_chart.phtml:21
+#: templates/table/chart/tbl_chart.phtml:21
 #, fuzzy
 #| msgid "Column names"
 msgctxt "Chart type"
 msgid "Column"
 msgstr "Alan iseme"
 
-#: templates/tbl_chart.phtml:25
+#: templates/table/chart/tbl_chart.phtml:25
 msgctxt "Chart type"
 msgid "Line"
 msgstr ""
 
-#: templates/tbl_chart.phtml:29
+#: templates/table/chart/tbl_chart.phtml:29
 #, fuzzy
 #| msgid "Engines"
 msgctxt "Chart type"
 msgid "Spline"
 msgstr "Engine"
 
-#: templates/tbl_chart.phtml:33
+#: templates/table/chart/tbl_chart.phtml:33
 msgctxt "Chart type"
 msgid "Area"
 msgstr ""
 
-#: templates/tbl_chart.phtml:37
+#: templates/table/chart/tbl_chart.phtml:37
 #, fuzzy
 #| msgid "PiB"
 msgctxt "Chart type"
 msgid "Pie"
 msgstr "PB"
 
-#: templates/tbl_chart.phtml:41
+#: templates/table/chart/tbl_chart.phtml:41
 #, fuzzy
 #| msgid "Time"
 msgctxt "Chart type"
 msgid "Timeline"
 msgstr "Waqıt"
 
-#: templates/tbl_chart.phtml:45
+#: templates/table/chart/tbl_chart.phtml:45
 msgctxt "Chart type"
 msgid "Scatter"
 msgstr ""
 
-#: templates/tbl_chart.phtml:50
+#: templates/table/chart/tbl_chart.phtml:50
 msgid "Stacked"
 msgstr ""
 
-#: templates/tbl_chart.phtml:53
+#: templates/table/chart/tbl_chart.phtml:53
 #, fuzzy
 #| msgid "Report title"
 msgid "Chart title"
 msgstr "Yomğaq başlığı"
 
-#: templates/tbl_chart.phtml:57
+#: templates/table/chart/tbl_chart.phtml:57
 msgid "X-Axis:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:72
+#: templates/table/chart/tbl_chart.phtml:72
 #, fuzzy
 msgid "Series:"
 msgstr "SQL-soraw"
 
-#: templates/tbl_chart.phtml:102
+#: templates/table/chart/tbl_chart.phtml:102
 msgid "X-Axis label:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:104
+#: templates/table/chart/tbl_chart.phtml:104
 #, fuzzy
 #| msgid "Value"
 msgid "X Values"
 msgstr "Bäyä"
 
-#: templates/tbl_chart.phtml:107
+#: templates/table/chart/tbl_chart.phtml:107
 msgid "Y-Axis label:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:115
+#: templates/table/chart/tbl_chart.phtml:115
 msgid "Series names are in a column"
 msgstr ""
 
-#: templates/tbl_chart.phtml:118
+#: templates/table/chart/tbl_chart.phtml:118
 #, fuzzy
 #| msgid "Inside table(s):"
 msgid "Series column:"
 msgstr "Kiläse tüşämä eçendä:"
 
-#: templates/tbl_chart.phtml:130
+#: templates/table/chart/tbl_chart.phtml:130
 #, fuzzy
 #| msgid "Number of fields"
 msgid "Value Column:"
 msgstr "Alannar sanı"
 
-#: templates/tbl_chart.phtml:150
+#: templates/table/chart/tbl_chart.phtml:150
 #, fuzzy
 #| msgid "Save as file"
 msgid "Save chart as image"
 msgstr "Biremgä saqlıysı"
 
-#: templates/tbl_relation/common_form.phtml:7
+#: templates/table/gis_visualization/gis_visualization.phtml:3
+msgid "Display GIS Visualization"
+msgstr ""
+
+#: templates/table/gis_visualization/gis_visualization.phtml:8
+#, fuzzy
+#| msgid "Add/Delete Field Columns"
+msgid "Label column"
+msgstr "Add/Delete Field Columns"
+
+#: templates/table/gis_visualization/gis_visualization.phtml:11
+msgid "-- None --"
+msgstr ""
+
+#: templates/table/gis_visualization/gis_visualization.phtml:19
+#, fuzzy
+#| msgid "Total"
+msgid "Spatial column"
+msgstr "Tulayım"
+
+#: templates/table/index_form.phtml:16
+msgid "Index name:"
+msgstr "Tezeş adı&nbsp;:"
+
+#: templates/table/index_form.phtml:19
+msgid ""
+"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
+msgstr "Töp açqıçnıñ <b>ğına</b> adı \"PRIMARY\" bulırğa <b>tieş</b>!"
+
+#: templates/table/index_form.phtml:40
+#, fuzzy
+#| msgid "Index name:"
+msgid "Index choice:"
+msgstr "Tezeş adı&nbsp;:"
+
+#: templates/table/index_form.phtml:57
+msgid "Key block size:"
+msgstr ""
+
+#: templates/table/index_form.phtml:74
+msgid "Index type:"
+msgstr "Tezeş töre&nbsp;:"
+
+#: templates/table/index_form.phtml:86
+#, fuzzy
+#| msgid "User"
+msgid "Parser:"
+msgstr "Qullanuçı"
+
+#: templates/table/index_form.phtml:102
+#, fuzzy
+msgid "Comment:"
+msgstr "Açıqlama"
+
+#: templates/table/index_form.phtml:149 templates/table/index_form.phtml:190
+msgid "Drag to reorder"
+msgstr ""
+
+#: templates/table/relation/common_form.phtml:7
 msgid "Internal relations"
 msgstr "Eçke bäyläneş"
 
-#: templates/tbl_relation/common_form.phtml:11
+#: templates/table/relation/common_form.phtml:11
 #, fuzzy
 #| msgid "Internal relations"
 msgid "Internal relation"
 msgstr "Eçke bäyläneş"
 
-#: templates/tbl_relation/common_form.phtml:14
+#: templates/table/relation/common_form.phtml:14
 msgid ""
 "An internal relation is not necessary when a corresponding FOREIGN KEY "
 "relation exists."
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:37
+#: templates/table/relation/common_form.phtml:37
 #, fuzzy
 #| msgid "Disable foreign key checks"
 msgid "Foreign key constraints"
 msgstr "Yat tezeş tikşerüen sünderep"
 
-#: templates/tbl_relation/common_form.phtml:40
+#: templates/table/relation/common_form.phtml:40
 msgid "Actions"
 msgstr "Eş"
 
-#: templates/tbl_relation/common_form.phtml:41
+#: templates/table/relation/common_form.phtml:41
 #, fuzzy
 #| msgid "Column names"
 msgid "Constraint properties"
 msgstr "Alan iseme"
 
-#: templates/tbl_relation/common_form.phtml:44
+#: templates/table/relation/common_form.phtml:44
 msgid ""
 "Only columns with index will be displayed. You can define an index below."
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:49
+#: templates/table/relation/common_form.phtml:49
 msgid "Foreign key constraint"
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:81
+#: templates/table/relation/common_form.phtml:81
 #, fuzzy
 #| msgid "Add constraints"
 msgid "+ Add constraint"
 msgstr "Çikläwlär östise"
 
-#: templates/tbl_relation/common_form.phtml:91
+#: templates/table/relation/common_form.phtml:91
 #, fuzzy
 #| msgid "Choose field to display"
 msgid "Choose column to display:"
 msgstr "Kürsätäse Alan saylaw"
 
-#: templates/tbl_relation/foreign_key_row.phtml:13
+#: templates/table/relation/foreign_key_row.phtml:13
 #, fuzzy, php-format
 #| msgid "Disable foreign key checks"
 msgid "Foreign key constraint %s has been dropped"
 msgstr "Yat tezeş tikşerüen sünderep"
 
-#: templates/tbl_relation/foreign_key_row.phtml:102
+#: templates/table/relation/foreign_key_row.phtml:102
 #, fuzzy
 #| msgid "Column names"
 msgid "Constraint name"
 msgstr "Alan iseme"
 
-#: templates/tbl_relation/foreign_key_row.phtml:157
+#: templates/table/relation/foreign_key_row.phtml:157
 #, fuzzy
 #| msgid "Add %s field(s)"
 msgid "+ Add column"
 msgstr "%s alan östäw"
 
+#: templates/table/search/options.phtml:8
+#, fuzzy
+#| msgid "Select fields (at least one):"
+msgid "Select columns (at least one):"
+msgstr "Alannar saylísı (iñ kimendä ber):"
+
+#: templates/table/search/options.phtml:37
+msgid "Add search conditions (body of the \"where\" clause):"
+msgstr "Ezläw şartın östäw (\"WHERE\" eçtälege):"
+
+#: templates/table/search/options.phtml:45
+msgid "Number of rows per page"
+msgstr "Bit sayın Kertem sanı"
+
+#: templates/table/search/options.phtml:56
+msgid "Display order:"
+msgstr "Kürsätü tärtibe:"
+
+#: templates/table/search/options_zoom.phtml:6
+msgid "Use this column to label each point"
+msgstr ""
+
+#: templates/table/search/options_zoom.phtml:35
+msgid "Maximum rows to plot"
+msgstr ""
+
+#: templates/table/search/replace_preview.phtml:13
+msgid "Find and replace - preview"
+msgstr ""
+
+#: templates/table/search/replace_preview.phtml:18
+#, fuzzy
+#| msgid "Original position"
+msgid "Original string"
+msgstr "Tärtip buyınça urın"
+
+#: templates/table/search/replace_preview.phtml:19
+#, fuzzy
+#| msgid "Relations"
+msgid "Replaced string"
+msgstr "Bäyläneşlär"
+
+#: templates/table/search/replace_preview.phtml:40
+#, fuzzy
+msgid "Replace"
+msgstr "Bäyläneşlär"
+
+#: templates/table/search/rows_zoom.phtml:16
+#, fuzzy
+msgid "Additional search criteria"
+msgstr "SQL-soraw"
+
+#: templates/table/search/search_and_replace.phtml:3
+#, fuzzy
+#| msgid "Replace NULL by"
+msgid "Replace with:"
+msgstr "NULL'nı almaştırası:"
+
+#: templates/table/search/search_and_replace.phtml:22
+#, fuzzy
+#| msgid "as regular expression"
+msgid "Use regular expression"
+msgstr "regexp kileş"
+
+#: templates/table/search/selection_form.phtml:12
+#, fuzzy
+#| msgid "Do a \"query by example\" (wildcard: \"%\")"
+msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
+msgstr "\"Ürnäk buyınça soraw\" eşkärtü (almaştırma: \"%\")"
+
+#: templates/table/search/selection_form.phtml:34
+msgid "Do a \"query by example\" (wildcard: \"%\")"
+msgstr "\"Ürnäk buyınça soraw\" eşkärtü (almaştırma: \"%\")"
+
+#: templates/table/search/zoom_result_form.phtml:7
+msgid "Browse/Edit the points"
+msgstr ""
+
+#: templates/table/search/zoom_result_form.phtml:15
+#, fuzzy
+msgid "How to use"
+msgstr "PHP Söreme"
+
+#: templates/table/search/zoom_result_form.phtml:23
+#, fuzzy
+#| msgid "Reset"
+msgid "Reset zoom"
+msgstr "Awdar"
+
+#: templates/table/secondary_tabs.phtml:14
+#, fuzzy
+#| msgid "Relation view"
+msgid "Relation view"
+msgstr "Bäyläneşkä küzätü"
+
+#: templates/table/structure/actions_in_table_structure.phtml:14
+#, php-format
+msgid "A primary key has been added on %s."
+msgstr "\"%s\" öçen töp açqıç qorıldı."
+
+#: templates/table/structure/actions_in_table_structure.phtml:34
+#: templates/table/structure/actions_in_table_structure.phtml:54
+#: templates/table/structure/actions_in_table_structure.phtml:79
+#: templates/table/structure/actions_in_table_structure.phtml:101
+#, php-format
+msgid "An index has been added on %s."
+msgstr "\"%s\" öçen ber açqıç qorıldı."
+
+#: templates/table/structure/actions_in_table_structure.phtml:130
+#: templates/table/structure/check_all_table_column.phtml:59
+#, fuzzy
+#| msgid "Rename database to"
+msgid "Remove from central columns"
+msgstr "Biremlekne bolay atap quy"
+
+#: templates/table/structure/actions_in_table_structure.phtml:138
+#: templates/table/structure/check_all_table_column.phtml:55
+#, fuzzy
+#| msgid "Add %s field(s)"
+msgid "Add to central columns"
+msgstr "%s alan östäw"
+
+#: templates/table/structure/add_column.phtml:7
+#, fuzzy, php-format
+#| msgid "Add %s field(s)"
+msgid "Add %s column(s)"
+msgstr "%s alan östäw"
+
+#: templates/table/structure/add_column.phtml:12
+#, fuzzy
+#| msgid "At Beginning of Table"
+msgid "at beginning of table"
+msgstr "Tüşämä Başına"
+
+#: templates/table/structure/display_structure.phtml:140 view_create.php:181
+#, fuzzy
+#| msgid "Print view"
+msgid "Edit view"
+msgstr "Bastıru küreneşe"
+
+#: templates/table/structure/display_table_stats.phtml:9
+msgid "Space usage"
+msgstr "Totılğan Alan"
+
+#: templates/table/structure/display_table_stats.phtml:32
+msgid "Effective"
+msgstr "Uñışlı"
+
+#: templates/table/structure/move_columns_dialog.phtml:1
+#: templates/table/structure/optional_action_links.phtml:21
+#, fuzzy
+#| msgid "Add %s field(s)"
+msgid "Move columns"
+msgstr "%s alan östäw"
+
+#: templates/table/structure/move_columns_dialog.phtml:2
+msgid "Move the columns by dragging them up and down."
+msgstr ""
+
+#: templates/table/structure/optional_action_links.phtml:9
+msgid "Propose table structure"
+msgstr "Tüşämä tözeleşenä küzätü"
+
+#: templates/table/structure/optional_action_links.phtml:24
+#, fuzzy
+#| msgid "Propose table structure"
+msgid "Improve table structure"
+msgstr "Tüşämä tözeleşenä küzätü"
+
+#: templates/table/structure/optional_action_links.phtml:30
+#, fuzzy
+msgid "Track view"
+msgstr "Tüşämä tikşerü"
+
+#: templates/table/structure/row_stats_table.phtml:3
+#, fuzzy
+#| msgid "Row Statistics"
+msgid "Row statistics"
+msgstr "Kerem Nöfüse"
+
+#: templates/table/structure/row_stats_table.phtml:9
+msgid "static"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:11
+msgid "dynamic"
+msgstr "üzgärüçän"
+
+#: templates/table/structure/row_stats_table.phtml:22
+msgid "partitioned"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:54
+msgid "Row length"
+msgstr "Kerem ozınlığı"
+
+#: templates/table/structure/row_stats_table.phtml:66
+msgid "Row size"
+msgstr "Kerem olılığı"
+
+#: templates/table/structure/row_stats_table.phtml:73
+msgid "Next autoindex"
+msgstr ""
+
+#: templates/table/structure/table_structure_row.phtml:46
+#, fuzzy, php-format
+#| msgid "Table %s has been dropped."
+msgid "Column %s has been dropped."
+msgstr "\"%s\" atlı tüşämä beterelde"
+
 #: themes.php:17 themes.php:22
 msgid "Theme"
 msgstr ""
@@ -17516,6 +17539,11 @@ msgstr ""
 msgid "concurrent_insert is set to 0"
 msgstr ""
 
+#, fuzzy
+#~| msgid "Read misses"
+#~ msgid "Read as multibytes"
+#~ msgstr "Uñışsız uqu"
+
 #, fuzzy
 #~| msgid "Relational schema"
 #~ msgid "Relational display column"
diff --git a/po/ug.po b/po/ug.po
index 3b3e351008..1c909b5390 100644
--- a/po/ug.po
+++ b/po/ug.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 4.5.0-dev\n"
 "Report-Msgid-Bugs-To: developers@phpmyadmin.net\n"
-"POT-Creation-Date: 2015-08-08 13:53-0400\n"
+"POT-Creation-Date: 2015-08-12 08:10-0400\n"
 "PO-Revision-Date: 2013-11-25 15:29+0200\n"
 "Last-Translator: Michal Čihař <michal@cihar.com>\n"
 "Language-Team: Uighur <http://hosted.weblate.org/projects/phpmyadmin/master/"
@@ -59,7 +59,7 @@ msgid "Table comments:"
 msgstr "جەدۋەل ئىزاھى"
 
 #: db_datadict.php:104 libraries/Index.class.php:699
-#: libraries/insert_edit.lib.php:1567
+#: libraries/insert_edit.lib.php:1565
 #: libraries/navigation/Nodes/Node_Column.class.php:30
 #: libraries/plugins/export/ExportHtmlword.class.php:280
 #: libraries/plugins/export/ExportHtmlword.class.php:375
@@ -73,13 +73,14 @@ msgstr "جەدۋەل ئىزاھى"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1023
 #: libraries/tracking.lib.php:879 libraries/tracking.lib.php:975
 #: templates/columns_definitions/column_name.phtml:18
-#: templates/index_form.phtml:124 templates/table/table_header.phtml:6
-#: templates/table/zoom_result_form.phtml:33
-#: templates/tbl_relation/common_form.phtml:10
-#: templates/tbl_relation/common_form.phtml:43
-#: templates/tbl_relation/foreign_key_row.phtml:194
-#: templates/tbl_relation/foreign_key_row.phtml:206
-#: templates/tbl_relation/internal_relational_row.phtml:71
+#: templates/table/index_form.phtml:124
+#: templates/table/relation/common_form.phtml:10
+#: templates/table/relation/common_form.phtml:43
+#: templates/table/relation/foreign_key_row.phtml:194
+#: templates/table/relation/foreign_key_row.phtml:206
+#: templates/table/relation/internal_relational_row.phtml:71
+#: templates/table/search/table_header.phtml:6
+#: templates/table/search/zoom_result_form.phtml:33
 msgid "Column"
 msgstr "سۆزلەم"
 
@@ -97,21 +98,21 @@ msgstr "سۆزلەم"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1001
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1024
 #: libraries/rte/rte_list.lib.php:75 libraries/rte/rte_list.lib.php:103
-#: libraries/rte/rte_routines.lib.php:802
-#: libraries/rte/rte_routines.lib.php:831
-#: libraries/rte/rte_routines.lib.php:1493
+#: libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_routines.lib.php:922
+#: libraries/rte/rte_routines.lib.php:1584
 #: libraries/server_privileges.lib.php:2369 libraries/tracking.lib.php:880
 #: libraries/tracking.lib.php:972
 #: templates/columns_definitions/table_fields_definitions.phtml:11
-#: templates/structure/table_header.phtml:48
-#: templates/structure/table_structure_header.phtml:6
-#: templates/table/table_header.phtml:7
+#: templates/database/structure/table_header.phtml:48
+#: templates/table/search/table_header.phtml:7
+#: templates/table/structure/table_structure_header.phtml:6
 msgid "Type"
 msgstr "تۈرى"
 
 #: db_datadict.php:106 libraries/Index.class.php:702
 #: libraries/central_columns.lib.php:708
-#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1576
+#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1574
 #: libraries/plugins/export/ExportHtmlword.class.php:286
 #: libraries/plugins/export/ExportHtmlword.class.php:381
 #: libraries/plugins/export/ExportLatex.class.php:509
@@ -124,8 +125,8 @@ msgstr "تۈرى"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1026
 #: libraries/tracking.lib.php:882 libraries/tracking.lib.php:978
 #: templates/columns_definitions/table_fields_definitions.phtml:39
-#: templates/structure/table_structure_header.phtml:9
-#: templates/table/zoom_result_form.phtml:34
+#: templates/table/search/zoom_result_form.phtml:34
+#: templates/table/structure/table_structure_header.phtml:9
 msgid "Null"
 msgstr "بوش"
 
@@ -143,8 +144,8 @@ msgstr "بوش"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1027
 #: libraries/replication_gui.lib.php:153 libraries/tracking.lib.php:883
 #: templates/columns_definitions/table_fields_definitions.phtml:25
-#: templates/structure/body_for_table_summary.phtml:55
-#: templates/structure/table_structure_header.phtml:10
+#: templates/database/structure/body_for_table_summary.phtml:55
+#: templates/table/structure/table_structure_header.phtml:10
 msgid "Default"
 msgstr "ئەندىز"
 
@@ -172,19 +173,19 @@ msgid "Comments"
 msgstr "ئىزاھلار"
 
 #: db_datadict.php:146
-#: libraries/controllers/StructureController.class.php:1960
-#: libraries/controllers/StructureController.class.php:1965
+#: libraries/controllers/TableStructureController.class.php:951
+#: libraries/controllers/TableStructureController.class.php:956
 #: libraries/tracking.lib.php:922
 #: templates/columns_definitions/column_indexes.phtml:6
-#: templates/structure/check_all_table_column.phtml:22
-#: templates/structure/display_structure.phtml:74
+#: templates/table/structure/check_all_table_column.phtml:22
+#: templates/table/structure/display_structure.phtml:74
 msgid "Primary"
 msgstr ""
 
 #: db_datadict.php:156 js/messages.php:317 libraries/Index.class.php:567
 #: libraries/Index.class.php:606 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261 libraries/mult_submits.lib.php:403
+#: libraries/config/FormDisplay.tpl.php:272 libraries/mult_submits.lib.php:403
 #: libraries/mult_submits.lib.php:417
 #: libraries/plugins/export/ExportHtmlword.class.php:630
 #: libraries/plugins/export/ExportLatex.class.php:589
@@ -200,20 +201,20 @@ msgstr ""
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1010 libraries/tracking.lib.php:1015
 #: prefs_manage.php:140 templates/prefs_autoload.phtml:15
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "No"
 msgstr "يوق"
 
 #: db_datadict.php:156 js/messages.php:443 libraries/Index.class.php:568
 #: libraries/Index.class.php:605 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261
-#: libraries/controllers/StructureController.class.php:1344
-#: libraries/controllers/StructureController.class.php:2223
-#: libraries/controllers/StructureController.class.php:2232
-#: libraries/controllers/StructureController.class.php:2237
-#: libraries/controllers/StructureController.class.php:2242
-#: libraries/controllers/StructureController.class.php:2247
+#: libraries/config/FormDisplay.tpl.php:272
+#: libraries/controllers/TableStructureController.class.php:539
+#: libraries/controllers/TableStructureController.class.php:1201
+#: libraries/controllers/TableStructureController.class.php:1210
+#: libraries/controllers/TableStructureController.class.php:1215
+#: libraries/controllers/TableStructureController.class.php:1220
+#: libraries/controllers/TableStructureController.class.php:1225
 #: libraries/mult_submits.inc.php:82 libraries/mult_submits.inc.php:178
 #: libraries/mult_submits.lib.php:339 libraries/mult_submits.lib.php:372
 #: libraries/mult_submits.lib.php:401 libraries/mult_submits.lib.php:415
@@ -222,8 +223,8 @@ msgstr "يوق"
 #: libraries/plugins/export/ExportOdt.class.php:756
 #: libraries/plugins/export/ExportTexytext.class.php:567
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1077
-#: libraries/server_databases.lib.php:464
-#: libraries/server_databases.lib.php:474
+#: libraries/server_databases.lib.php:475
+#: libraries/server_databases.lib.php:485
 #: libraries/server_privileges.lib.php:2546
 #: libraries/server_privileges.lib.php:2727
 #: libraries/server_privileges.lib.php:2748
@@ -233,7 +234,7 @@ msgstr "يوق"
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1008 libraries/tracking.lib.php:1013
 #: prefs_manage.php:138 templates/prefs_autoload.phtml:14
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "Yes"
 msgstr "بولدى"
 
@@ -243,7 +244,7 @@ msgstr "ساندان قالدۇقىنى كۆرسىتىش"
 
 #: db_export.php:37 db_tracking.php:90 export.php:382
 #: libraries/DBQbe.class.php:326
-#: libraries/controllers/StructureController.class.php:231
+#: libraries/controllers/DatabaseStructureController.class.php:170
 #: libraries/navigation/NavigationTree.class.php:897
 msgid "No tables found in database."
 msgstr "سانداندا جەدۋەل يوق."
@@ -254,14 +255,14 @@ msgstr "سانداندا جەدۋەل يوق."
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:26
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:120
-#: templates/structure/show_create.phtml:18
+#: templates/database/structure/show_create.phtml:18
 msgid "Tables"
 msgstr ""
 
 #: db_export.php:52 libraries/Menu.class.php:317 libraries/Menu.class.php:425
-#: libraries/Util.class.php:3333 libraries/Util.class.php:3343
-#: libraries/Util.class.php:3349 libraries/Util.class.php:3629
-#: libraries/Util.class.php:4327 libraries/Util.class.php:4344
+#: libraries/Util.class.php:3339 libraries/Util.class.php:3349
+#: libraries/Util.class.php:3355 libraries/Util.class.php:3635
+#: libraries/Util.class.php:4333 libraries/Util.class.php:4350
 #: libraries/central_columns.lib.php:728 libraries/config.values.php:39
 #: libraries/config.values.php:47 libraries/config.values.php:109
 #: libraries/config.values.php:115 libraries/config/setup.forms.php:323
@@ -275,7 +276,7 @@ msgstr ""
 #: libraries/navigation/Nodes/Node_Table.class.php:283
 #: libraries/server_privileges.lib.php:1141 libraries/tracking.lib.php:874
 #: templates/columns_definitions/table_fields_definitions.phtml:3
-#: templates/designer/table_list.phtml:28
+#: templates/database/designer/table_list.phtml:28
 msgid "Structure"
 msgstr "تۈزۈلىشى"
 
@@ -287,7 +288,7 @@ msgstr "تۈزۈلىشى"
 #: libraries/config/user_preferences.forms.php:292
 #: libraries/config/user_preferences.forms.php:297
 #: libraries/server_privileges.lib.php:1140
-#: templates/structure/display_table_stats.phtml:12
+#: templates/table/structure/display_table_stats.phtml:12
 msgid "Data"
 msgstr "سانلىق مەلۇمات"
 
@@ -372,10 +373,10 @@ msgstr "ئىزلانغان جەدۋەل"
 #: libraries/server_privileges.lib.php:2908
 #: libraries/server_privileges.lib.php:3145
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4346
-#: templates/structure/table_header.phtml:21
-#: templates/tbl_relation/foreign_key_row.phtml:176
-#: templates/tbl_relation/internal_relational_row.phtml:63
+#: libraries/server_privileges.lib.php:4372
+#: templates/database/structure/table_header.phtml:21
+#: templates/table/relation/foreign_key_row.phtml:176
+#: templates/table/relation/internal_relational_row.phtml:63
 msgid "Table"
 msgstr "جەدۋەل"
 
@@ -392,7 +393,7 @@ msgid "Updated"
 msgstr "يېڭلاش"
 
 #: db_tracking.php:130 js/messages.php:243 libraries/Menu.class.php:552
-#: libraries/Util.class.php:4314 libraries/config.values.php:104
+#: libraries/Util.class.php:4320 libraries/config.values.php:104
 #: libraries/rte/rte_events.lib.php:393 libraries/rte/rte_list.lib.php:101
 #: libraries/server_status_processes.lib.php:92 libraries/tracking.lib.php:279
 msgid "Status"
@@ -401,14 +402,15 @@ msgstr "ھالەت"
 #: db_tracking.php:131 db_tracking.php:290 libraries/Index.class.php:693
 #: libraries/central_columns.lib.php:687 libraries/rte/rte_list.lib.php:74
 #: libraries/rte/rte_list.lib.php:89 libraries/rte/rte_list.lib.php:102
-#: libraries/server_databases.lib.php:398
+#: libraries/server_databases.lib.php:409
 #: libraries/server_privileges.lib.php:2372
 #: libraries/server_privileges.lib.php:3166
 #: libraries/server_privileges.lib.php:3342
 #: libraries/server_user_groups.lib.php:82
 #: libraries/server_variables.lib.php:189 libraries/tracking.lib.php:280
-#: libraries/tracking.lib.php:793 templates/structure/table_header.phtml:30
-#: templates/structure/table_structure_header.phtml:23
+#: libraries/tracking.lib.php:793
+#: templates/database/structure/table_header.phtml:30
+#: templates/table/structure/table_structure_header.phtml:23
 msgid "Action"
 msgstr "ئامال"
 
@@ -452,7 +454,7 @@ msgid "Untracked tables"
 msgstr "ئىزلانمىغان جەدۋەللەر"
 
 #: db_tracking.php:305 db_tracking.php:336
-#: templates/structure/optional_action_links.phtml:17
+#: templates/table/structure/optional_action_links.phtml:17
 msgid "Track table"
 msgstr "جەدۋەل ئىزلاش"
 
@@ -508,7 +510,7 @@ msgid "Value for the column \"%s\""
 msgstr ""
 
 #: gis_data_editor.php:146
-#: templates/gis_visualization/gis_visualization.phtml:37
+#: templates/table/gis_visualization/gis_visualization.phtml:37
 msgid "Use OpenStreetMaps as Base Layer"
 msgstr ""
 
@@ -595,35 +597,35 @@ msgstr "مەجبۇرى قوشۇش"
 #: libraries/display_change_password.lib.php:162
 #: libraries/display_export.lib.php:402 libraries/display_export.lib.php:408
 #: libraries/display_import.lib.php:392 libraries/index.lib.php:44
-#: libraries/insert_edit.lib.php:1546 libraries/insert_edit.lib.php:1583
+#: libraries/insert_edit.lib.php:1544 libraries/insert_edit.lib.php:1581
 #: libraries/normalization.lib.php:165 libraries/normalization.lib.php:821
 #: libraries/operations.lib.php:38 libraries/operations.lib.php:108
 #: libraries/operations.lib.php:263 libraries/operations.lib.php:306
 #: libraries/operations.lib.php:801 libraries/operations.lib.php:874
 #: libraries/operations.lib.php:923 libraries/operations.lib.php:1337
 #: libraries/operations.lib.php:1658
-#: libraries/plugins/auth/AuthenticationCookie.class.php:244
+#: libraries/plugins/auth/AuthenticationCookie.class.php:232
 #: libraries/replication_gui.lib.php:122 libraries/replication_gui.lib.php:161
 #: libraries/replication_gui.lib.php:324 libraries/replication_gui.lib.php:461
 #: libraries/replication_gui.lib.php:906 libraries/rte/rte_events.lib.php:509
-#: libraries/rte/rte_routines.lib.php:969
-#: libraries/rte/rte_routines.lib.php:1581
+#: libraries/rte/rte_routines.lib.php:1060
+#: libraries/rte/rte_routines.lib.php:1672
 #: libraries/rte/rte_triggers.lib.php:396 libraries/server_bin_log.lib.php:61
 #: libraries/server_privileges.lib.php:705
 #: libraries/server_privileges.lib.php:2106
 #: libraries/server_privileges.lib.php:2872
 #: libraries/server_privileges.lib.php:3553
-#: libraries/server_privileges.lib.php:4627
+#: libraries/server_privileges.lib.php:4653
 #: libraries/server_user_groups.lib.php:285
 #: libraries/sql_query_form.lib.php:369 libraries/sql_query_form.lib.php:429
 #: libraries/tracking.lib.php:533 libraries/tracking.lib.php:653
 #: prefs_manage.php:277 prefs_manage.php:355
 #: templates/columns_definitions/column_definitions_form.phtml:59
-#: templates/header_location.phtml:17 templates/index_form.phtml:238
+#: templates/database/create_table.phtml:21 templates/header_location.phtml:28
 #: templates/startAndNumberOfRowsPanel.phtml:14
-#: templates/structure/add_column.phtml:25
-#: templates/table/create_table.phtml:21
-#: templates/table/selection_form.phtml:75 view_create.php:275
+#: templates/table/index_form.phtml:238
+#: templates/table/search/selection_form.phtml:75
+#: templates/table/structure/add_column.phtml:25 view_create.php:275
 #: view_operations.php:106
 msgid "Go"
 msgstr "ئىجرا قىلىش"
@@ -710,7 +712,7 @@ msgstr ""
 msgid "Could not load import plugins, please check your installation!"
 msgstr "قىستۇرمىلار كىرگۈزىشكە ئامالسىز، قاچىلانمىنى تەكشۈرۈپ بىقىڭ!"
 
-#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1466
+#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1460
 #, fuzzy, php-format
 #| msgid "Bookmark %s created"
 msgid "Bookmark %s has been created."
@@ -745,11 +747,11 @@ msgstr ""
 msgid "Back"
 msgstr "قايتىش"
 
-#: index.php:148 libraries/Footer.class.php:70
+#: index.php:149 libraries/Footer.class.php:70
 msgid "phpMyAdmin Demo Server"
 msgstr ""
 
-#: index.php:152
+#: index.php:153
 #, php-format
 msgid ""
 "You are using the demo server. You can do anything here, but please do not "
@@ -757,50 +759,50 @@ msgid ""
 "at %s."
 msgstr ""
 
-#: index.php:162
+#: index.php:163
 #, fuzzy
 #| msgid "General relation features"
 msgid "General Settings"
 msgstr "ئاساسىي ئالاقە ۋاريانتلىرى"
 
-#: index.php:190 libraries/display_change_password.lib.php:50
+#: index.php:191 libraries/display_change_password.lib.php:50
 #: libraries/display_change_password.lib.php:53 user_password.php:247
 msgid "Change password"
 msgstr "پارولنى ئۆزگەرتىش"
 
-#: index.php:206
+#: index.php:207
 #, fuzzy
 #| msgid "PBMS connection failed:"
 msgid "Server connection collation"
 msgstr "PBMS ئۇلىنالمىدى:"
 
-#: index.php:228
+#: index.php:229
 msgid "Appearance Settings"
 msgstr ""
 
-#: index.php:258 prefs_manage.php:285
+#: index.php:259 prefs_manage.php:285
 #, fuzzy
 #| msgid "General relation features"
 msgid "More settings"
 msgstr "ئاساسىي ئالاقە ۋاريانتلىرى"
 
-#: index.php:279
+#: index.php:280
 #, fuzzy
 #| msgid "Databases"
 msgid "Database server"
 msgstr "ساندان"
 
-#: index.php:282 libraries/plugins/auth/AuthenticationCookie.class.php:181
+#: index.php:283 libraries/plugins/auth/AuthenticationCookie.class.php:169
 msgid "Server:"
 msgstr "مۇلازىمىتېر:"
 
-#: index.php:286
+#: index.php:287
 #, fuzzy
 #| msgid "Server"
 msgid "Server type:"
 msgstr "مۇلازىمىتېر"
 
-#: index.php:290 libraries/plugins/export/ExportLatex.class.php:212
+#: index.php:291 libraries/plugins/export/ExportLatex.class.php:212
 #: libraries/plugins/export/ExportSql.class.php:687
 #: libraries/plugins/export/ExportXml.class.php:189
 #, fuzzy
@@ -808,83 +810,83 @@ msgstr "مۇلازىمىتېر"
 msgid "Server version:"
 msgstr "مۇلازىمىتىر نۇسخىسى"
 
-#: index.php:296
+#: index.php:297
 #, fuzzy
 #| msgid "Create version"
 msgid "Protocol version:"
 msgstr "نەشىرنى قۇىماق"
 
-#: index.php:300
+#: index.php:301
 #, fuzzy
 #| msgid "Username:"
 msgid "User:"
 msgstr "ئابۇنىت ئىسمى:"
 
-#: index.php:305
+#: index.php:306
 #, fuzzy
 #| msgid "Remove database"
 msgid "Server charset:"
 msgstr "ئۆزگەرتىلگەن ساندان ئىسمى"
 
-#: index.php:320
+#: index.php:321
 msgid "Web server"
 msgstr ""
 
-#: index.php:331
+#: index.php:332
 #, fuzzy
 #| msgid "Database comment"
 msgid "Database client version:"
 msgstr "ساندان ئىزاھاتى:"
 
-#: index.php:335
+#: index.php:336
 #, fuzzy
 #| msgid "PHP Version"
 msgid "PHP extension:"
 msgstr "PHPنۇسخىسى"
 
-#: index.php:349
+#: index.php:350
 #, fuzzy
 #| msgid "PHP Version"
 msgid "PHP version:"
 msgstr "PHPنۇسخىسى"
 
-#: index.php:360
+#: index.php:361
 msgid "Show PHP information"
 msgstr ""
 
-#: index.php:383
+#: index.php:384
 msgid "Version information:"
 msgstr ""
 
-#: index.php:392 libraries/Util.class.php:432 libraries/Util.class.php:495
-#: libraries/config/FormDisplay.tpl.php:151
+#: index.php:393 libraries/Util.class.php:432 libraries/Util.class.php:495
+#: libraries/config/FormDisplay.tpl.php:162
 #: libraries/display_export.lib.php:577 libraries/engines/pbxt.lib.php:162
 #: libraries/navigation/NavigationHeader.class.php:196
 #: libraries/server_variables.lib.php:160
 msgid "Documentation"
 msgstr "قوللانما"
 
-#: index.php:399
+#: index.php:400
 msgid "Wiki"
 msgstr ""
 
-#: index.php:408
+#: index.php:409
 msgid "Official Homepage"
 msgstr ""
 
-#: index.php:415
+#: index.php:416
 msgid "Contribute"
 msgstr ""
 
-#: index.php:422
+#: index.php:423
 msgid "Get support"
 msgstr ""
 
-#: index.php:429
+#: index.php:430
 msgid "List of changes"
 msgstr ""
 
-#: index.php:451
+#: index.php:452
 msgid ""
 "You are connected as 'root' with no password, which corresponds to the "
 "default MySQL privileged account. Your MySQL server is running with this "
@@ -892,21 +894,21 @@ msgid ""
 "by setting a password for user 'root'."
 msgstr ""
 
-#: index.php:468
+#: index.php:469
 msgid ""
 "You have enabled mbstring.func_overload in your PHP configuration. This "
 "option is incompatible with phpMyAdmin and might cause some data to be "
 "corrupted!"
 msgstr ""
 
-#: index.php:483
+#: index.php:484
 msgid ""
 "The mbstring PHP extension was not found and you seem to be using a "
 "multibyte charset. Without the mbstring extension phpMyAdmin is unable to "
 "split strings correctly and it may result in unexpected results."
 msgstr ""
 
-#: index.php:500
+#: index.php:501
 msgid ""
 "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini."
 "session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower than "
@@ -914,17 +916,17 @@ msgid ""
 "expire sooner than configured in phpMyAdmin."
 msgstr ""
 
-#: index.php:519
+#: index.php:520
 msgid ""
 "Login cookie store is lower than cookie validity configured in phpMyAdmin, "
 "because of this, your login will expire sooner than configured in phpMyAdmin."
 msgstr ""
 
-#: index.php:535
+#: index.php:536
 msgid "The configuration file now needs a secret passphrase (blowfish_secret)."
 msgstr ""
 
-#: index.php:548
+#: index.php:549
 msgid ""
 "Directory [code]config[/code], which is used by the setup script, still "
 "exists in your phpMyAdmin directory. It is strongly recommended to remove it "
@@ -932,7 +934,7 @@ msgid ""
 "may be compromised by unauthorized people downloading your configuration."
 msgstr ""
 
-#: index.php:564
+#: index.php:565
 #, fuzzy, php-format
 #| msgid ""
 #| " phpMyAdmin configuration storage has been deactivated. To find out  "
@@ -944,19 +946,19 @@ msgstr ""
 "ئالاقىدار جەدۋەللەرنىڭ قوشۇمچە ئىقتىدارى پائالسىز. سەۋەبىنى ئېنىقلاش ئۈچۈن "
 "%sبۇ يەرنى كۆرۈڭ%s."
 
-#: index.php:571
+#: index.php:572
 msgid ""
 "Or alternately go to 'Operations' tab of any database to set it up there."
 msgstr ""
 
-#: index.php:620
+#: index.php:621
 #, php-format
 msgid ""
 "Your PHP MySQL library version %s differs from your MySQL server version %s. "
 "This may cause unpredictable behavior."
 msgstr ""
 
-#: index.php:648
+#: index.php:649
 #, php-format
 msgid ""
 "Server running with Suhosin. Please refer to %sdocumentation%s for possible "
@@ -1128,8 +1130,8 @@ msgstr ""
 msgid "Save & Close"
 msgstr "ھۆججەتنى باشقا ساقلاش"
 
-#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:404
-#: libraries/insert_edit.lib.php:1550 prefs_manage.php:361
+#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:415
+#: libraries/insert_edit.lib.php:1548 prefs_manage.php:361
 #: prefs_manage.php:372
 msgid "Reset"
 msgstr ""
@@ -1174,7 +1176,7 @@ msgstr "تېزىسلار"
 msgid "Edit Index"
 msgstr "قىستۇرۇش"
 
-#: js/messages.php:99 templates/index_form.phtml:232
+#: js/messages.php:99 templates/table/index_form.phtml:232
 #, fuzzy, php-format
 #| msgid "Add/Delete columns"
 msgid "Add %s column(s) to index"
@@ -1204,13 +1206,14 @@ msgstr "مەزمۇن ئايرىش بەلگىسى"
 msgid "Please select column(s) for the index."
 msgstr "سۆزلەم قوشۇش\\ئۆچۈرۈش"
 
-#: js/messages.php:106 templates/structure/add_column.phtml:1
+#: js/messages.php:106 templates/table/structure/add_column.phtml:1
 msgid "You have to add at least one column."
 msgstr ""
 
-#: js/messages.php:109 libraries/insert_edit.lib.php:1548
+#: js/messages.php:109 libraries/insert_edit.lib.php:1546
 #: templates/columns_definitions/column_definitions_form.phtml:162
-#: templates/index_form.phtml:237 templates/tbl_relation/common_form.phtml:106
+#: templates/table/index_form.phtml:237
+#: templates/table/relation/common_form.phtml:106
 msgid "Preview SQL"
 msgstr ""
 
@@ -1233,7 +1236,7 @@ msgid "SQL query:"
 msgstr "SQL سورىقى"
 
 #. l10n: Default label for the y-Axis of Charts
-#: js/messages.php:118 templates/tbl_chart.phtml:109
+#: js/messages.php:118 templates/table/chart/tbl_chart.phtml:109
 msgid "Y Values"
 msgstr ""
 
@@ -1403,7 +1406,7 @@ msgstr ""
 msgid "Bytes received"
 msgstr ""
 
-#: js/messages.php:169 libraries/server_status.lib.php:226
+#: js/messages.php:169 libraries/server_status.lib.php:235
 msgid "Connections"
 msgstr ""
 
@@ -1464,12 +1467,12 @@ msgstr "%s جەدۋەل"
 msgid "Questions"
 msgstr "نەشىر"
 
-#: js/messages.php:184 libraries/server_status.lib.php:134
+#: js/messages.php:184 libraries/server_status.lib.php:143
 msgid "Traffic"
 msgstr ""
 
 #: js/messages.php:185 libraries/Menu.class.php:586
-#: libraries/Util.class.php:4318 libraries/server_status_monitor.lib.php:257
+#: libraries/Util.class.php:4324 libraries/server_status_monitor.lib.php:257
 #, fuzzy
 #| msgid "General relation features"
 msgid "Settings"
@@ -1491,8 +1494,9 @@ msgstr ""
 #: libraries/server_status_monitor.lib.php:236
 #: libraries/server_status_processes.lib.php:308
 #: templates/columns_definitions/transformation.phtml:4
-#: templates/designer/options_panel.phtml:178
-#: templates/table/options_zoom.phtml:12 templates/table/rows_zoom.phtml:26
+#: templates/database/designer/options_panel.phtml:178
+#: templates/table/search/options_zoom.phtml:12
+#: templates/table/search/rows_zoom.phtml:26
 msgid "None"
 msgstr "يوق"
 
@@ -1795,8 +1799,8 @@ msgstr ""
 
 #: js/messages.php:270 libraries/Menu.class.php:352
 #: libraries/Menu.class.php:455 libraries/Menu.class.php:582
-#: libraries/Util.class.php:4317 libraries/Util.class.php:4332
-#: libraries/Util.class.php:4349 libraries/config/messages.inc.php:258
+#: libraries/Util.class.php:4323 libraries/Util.class.php:4338
+#: libraries/Util.class.php:4355 libraries/config/messages.inc.php:258
 #: libraries/display_import.lib.php:105
 #: libraries/server_status_monitor.lib.php:318 prefs_manage.php:238
 #: setup/frames/menu.inc.php:26
@@ -1868,13 +1872,13 @@ msgid "Formatting SQL..."
 msgstr ""
 
 #: js/messages.php:293 libraries/server_variables.lib.php:157
-#: templates/designer/aggregate_query_panel.phtml:63
-#: templates/designer/delete_relation_panel.phtml:28
-#: templates/designer/having_query_panel.phtml:117
-#: templates/designer/new_relation_panel.phtml:88
-#: templates/designer/options_panel.phtml:253
-#: templates/designer/rename_to_panel.phtml:45
-#: templates/designer/where_query_panel.phtml:83
+#: templates/database/designer/aggregate_query_panel.phtml:63
+#: templates/database/designer/delete_relation_panel.phtml:28
+#: templates/database/designer/having_query_panel.phtml:117
+#: templates/database/designer/new_relation_panel.phtml:88
+#: templates/database/designer/options_panel.phtml:253
+#: templates/database/designer/rename_to_panel.phtml:45
+#: templates/database/designer/where_query_panel.phtml:83
 msgid "Cancel"
 msgstr "بىكار قىلىش"
 
@@ -1884,7 +1888,7 @@ msgstr "بىكار قىلىش"
 msgid "Page-related settings"
 msgstr "ئاساسىي ئالاقە ۋاريانتلىرى"
 
-#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:402
+#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:413
 msgid "Apply"
 msgstr ""
 
@@ -1921,8 +1925,8 @@ msgstr ""
 msgid "Error text: %s"
 msgstr ""
 
-#: js/messages.php:307 libraries/db_common.inc.php:68
-#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:450
+#: js/messages.php:307 libraries/db_common.inc.php:69
+#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:461
 msgid "No databases selected."
 msgstr ""
 
@@ -1934,12 +1938,13 @@ msgstr ""
 msgid "Adding Primary Key"
 msgstr ""
 
-#: js/messages.php:310 templates/designer/aggregate_query_panel.phtml:59
-#: templates/designer/having_query_panel.phtml:113
-#: templates/designer/new_relation_panel.phtml:87
-#: templates/designer/options_panel.phtml:252
-#: templates/designer/rename_to_panel.phtml:41
-#: templates/designer/where_query_panel.phtml:82
+#: js/messages.php:310
+#: templates/database/designer/aggregate_query_panel.phtml:59
+#: templates/database/designer/having_query_panel.phtml:113
+#: templates/database/designer/new_relation_panel.phtml:87
+#: templates/database/designer/options_panel.phtml:252
+#: templates/database/designer/rename_to_panel.phtml:41
+#: templates/database/designer/where_query_panel.phtml:82
 msgid "OK"
 msgstr ""
 
@@ -1963,7 +1968,7 @@ msgstr "كۆچۈرۈلگەن ساندان"
 msgid "Changing Charset"
 msgstr ""
 
-#: js/messages.php:320 libraries/Util.class.php:3217
+#: js/messages.php:320 libraries/Util.class.php:3223
 #, fuzzy
 #| msgid "Select Foreign Key"
 msgid "Enable foreign key checks"
@@ -2010,20 +2015,21 @@ msgstr ""
 #: js/messages.php:334 libraries/DisplayResults.class.php:4834
 #: libraries/DisplayResults.class.php:5092 libraries/Menu.class.php:344
 #: libraries/Menu.class.php:446 libraries/Menu.class.php:578
-#: libraries/Util.class.php:3636 libraries/Util.class.php:3637
-#: libraries/Util.class.php:4316 libraries/Util.class.php:4331
-#: libraries/Util.class.php:4348 libraries/config/messages.inc.php:252
+#: libraries/Util.class.php:3642 libraries/Util.class.php:3643
+#: libraries/Util.class.php:4322 libraries/Util.class.php:4337
+#: libraries/Util.class.php:4354 libraries/config/messages.inc.php:252
 #: libraries/display_export.lib.php:173 libraries/rte/rte_list.lib.php:146
 #: libraries/server_privileges.lib.php:2211
 #: libraries/server_privileges.lib.php:2290
 #: libraries/server_privileges.lib.php:2632
 #: libraries/server_privileges.lib.php:3356
 #: libraries/server_status_monitor.lib.php:322 prefs_manage.php:303
-#: setup/frames/menu.inc.php:27 templates/structure/check_all_tables.phtml:11
+#: setup/frames/menu.inc.php:27
+#: templates/database/structure/check_all_tables.phtml:11
 msgid "Export"
 msgstr "چىقىرىش"
 
-#: js/messages.php:337 libraries/rte/rte_routines.lib.php:652
+#: js/messages.php:337 libraries/rte/rte_routines.lib.php:743
 msgid "ENUM/SET editor"
 msgstr ""
 
@@ -2065,7 +2071,7 @@ msgstr "SQL سورىقى"
 #: libraries/Console.class.php:214 libraries/DisplayResults.class.php:3474
 #: libraries/DisplayResults.class.php:4818 libraries/Index.class.php:723
 #: libraries/Util.class.php:706 libraries/Util.class.php:1202
-#: libraries/Util.class.php:3634 libraries/Util.class.php:3635
+#: libraries/Util.class.php:3640 libraries/Util.class.php:3641
 #: libraries/central_columns.lib.php:851
 #: libraries/central_columns.lib.php:1193
 #: libraries/config/messages.inc.php:892
@@ -2083,7 +2089,7 @@ msgstr "تەھىرلەش"
 #: libraries/server_user_groups.lib.php:129
 #: libraries/sql_query_form.lib.php:416 libraries/tracking.lib.php:477
 #: setup/frames/index.inc.php:183 setup/frames/index.inc.php:291
-#: templates/designer/delete_relation_panel.phtml:27
+#: templates/database/designer/delete_relation_panel.phtml:27
 msgid "Delete"
 msgstr "ئۆچۈرۈش"
 
@@ -2255,11 +2261,11 @@ msgid "No dependencies selected!"
 msgstr ""
 
 #: js/messages.php:394 libraries/central_columns.lib.php:1214
-#: libraries/insert_edit.lib.php:1458 libraries/server_variables.lib.php:155
+#: libraries/insert_edit.lib.php:1456 libraries/server_variables.lib.php:155
 #: setup/frames/config.inc.php:42 setup/frames/index.inc.php:279
 #: templates/columns_definitions/column_definitions_form.phtml:165
-#: templates/gis_visualization/gis_visualization.phtml:48
-#: templates/tbl_relation/common_form.phtml:107
+#: templates/table/gis_visualization/gis_visualization.phtml:48
+#: templates/table/relation/common_form.phtml:107
 msgid "Save"
 msgstr ""
 
@@ -2352,8 +2358,8 @@ msgid "Data point content"
 msgstr "سانلىق مەلۇمات قوللانمىسىنىڭ چوڭ كىچىكلىكى"
 
 #: js/messages.php:430 js/messages.php:562 js/messages.php:579
-#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2573
-#: templates/index_form.phtml:154 templates/index_form.phtml:194
+#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2571
+#: templates/table/index_form.phtml:154 templates/table/index_form.phtml:194
 msgid "Ignore"
 msgstr ""
 
@@ -2417,8 +2423,8 @@ msgid "Please select the primary key or a unique key!"
 msgstr "ئاساسىي قىممەت ياكى بىردىنبىر قىمەتنى تاللاڭ"
 
 # column نى سۆزلەم دەپ ئالساق مۇۋاپىق بولغىدەك
-#: js/messages.php:457 templates/designer/side_menu.phtml:91
-#: templates/designer/side_menu.phtml:94
+#: js/messages.php:457 templates/database/designer/side_menu.phtml:91
+#: templates/database/designer/side_menu.phtml:94
 msgid "Choose column to display"
 msgstr "سۆزلەمنى كۆرسەتمەسلىك"
 
@@ -2432,22 +2438,22 @@ msgstr ""
 msgid "Page name"
 msgstr ""
 
-#: js/messages.php:463 templates/designer/side_menu.phtml:56
-#: templates/designer/side_menu.phtml:59
+#: js/messages.php:463 templates/database/designer/side_menu.phtml:56
+#: templates/database/designer/side_menu.phtml:59
 #, fuzzy
 #| msgid "Select All"
 msgid "Save page"
 msgstr "ھەممىنى تاللاش"
 
-#: js/messages.php:464 templates/designer/side_menu.phtml:63
-#: templates/designer/side_menu.phtml:66
+#: js/messages.php:464 templates/database/designer/side_menu.phtml:63
+#: templates/database/designer/side_menu.phtml:66
 #, fuzzy
 #| msgid "Select All"
 msgid "Save page as"
 msgstr "ھەممىنى تاللاش"
 
-#: js/messages.php:465 templates/designer/side_menu.phtml:49
-#: templates/designer/side_menu.phtml:52
+#: js/messages.php:465 templates/database/designer/side_menu.phtml:49
+#: templates/database/designer/side_menu.phtml:52
 #, fuzzy
 #| msgid "Free pages"
 msgid "Open page"
@@ -2459,7 +2465,7 @@ msgstr "ئاق(قۇرۇق)بەت"
 msgid "Delete page"
 msgstr "ھەممىنى تاللاش"
 
-#: js/messages.php:467 templates/designer/side_menu.phtml:10
+#: js/messages.php:467 templates/database/designer/side_menu.phtml:10
 msgid "Untitled"
 msgstr ""
 
@@ -2583,7 +2589,7 @@ msgstr "قۇر ئالماشۇرۇش بەلگىسى"
 msgid "cancel"
 msgstr "بىكار قىلىش"
 
-#: js/messages.php:499 libraries/server_status.lib.php:271
+#: js/messages.php:499 libraries/server_status.lib.php:280
 msgid "Aborted"
 msgstr ""
 
@@ -3213,7 +3219,7 @@ msgstr "%dئۈنۈملۈك قۇر سانى ئەمەس"
 
 #: js/messages.php:793 libraries/Message.class.php:199
 #: libraries/Util.class.php:654 libraries/core.lib.php:245
-#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1172
+#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1170
 #: tbl_operations.php:229 view_operations.php:63
 msgid "Error"
 msgstr "خاتالىق"
@@ -3273,8 +3279,8 @@ msgstr ""
 msgid "per minute"
 msgstr ""
 
-#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:143
-#: libraries/server_status.lib.php:228
+#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:152
+#: libraries/server_status.lib.php:237
 #: libraries/server_status_queries.lib.php:98
 msgid "per hour"
 msgstr ""
@@ -3292,7 +3298,7 @@ msgstr ""
 msgid "Wrong permissions on configuration file, should not be world writable!"
 msgstr ""
 
-#: libraries/Config.class.php:1799
+#: libraries/Config.class.php:1801
 msgid "Font size"
 msgstr "خەتنىڭ چوڭ-كىچىكلىكى"
 
@@ -3322,10 +3328,10 @@ msgstr "تەكشۈرۈش"
 #: libraries/server_privileges.lib.php:2890
 #: libraries/server_privileges.lib.php:3144
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4332
+#: libraries/server_privileges.lib.php:4358
 #: libraries/server_status_processes.lib.php:80
-#: templates/tbl_relation/foreign_key_row.phtml:165
-#: templates/tbl_relation/internal_relational_row.phtml:55
+#: templates/table/relation/foreign_key_row.phtml:165
+#: templates/table/relation/internal_relational_row.phtml:55
 msgid "Database"
 msgstr "ساندان"
 
@@ -3431,11 +3437,11 @@ msgstr "SQL دەلىللەشتىن ئاتلاش"
 #: libraries/plugins/import/ImportMediawiki.class.php:60
 #: libraries/plugins/import/ImportOds.class.php:59
 #: libraries/plugins/import/ImportShp.class.php:57
-#: libraries/plugins/import/ImportSql.class.php:148
+#: libraries/plugins/import/ImportSql.class.php:51
 #: libraries/plugins/import/ImportXml.class.php:58
-#: libraries/rte/rte_routines.lib.php:833 templates/index_form.phtml:49
-#: templates/structure/row_stats_table.phtml:20
-#: templates/table/options.phtml:2
+#: libraries/rte/rte_routines.lib.php:924 templates/table/index_form.phtml:49
+#: templates/table/search/options.phtml:2
+#: templates/table/structure/row_stats_table.phtml:20
 msgid "Options"
 msgstr ""
 
@@ -3478,7 +3484,8 @@ msgstr "كېمىيىش"
 msgid "Order:"
 msgstr ""
 
-#: libraries/Console.class.php:289 templates/table/replace_preview.phtml:17
+#: libraries/Console.class.php:289
+#: templates/table/search/replace_preview.phtml:17
 #, fuzzy
 #| msgid "Column"
 msgid "Count"
@@ -3599,9 +3606,9 @@ msgstr "كۆپەيتىلگەن ساندانغا كۆچۈش"
 #: libraries/operations.lib.php:794 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:191
-#: templates/structure/sortable_header.phtml:21
-#: templates/structure/sortable_header.phtml:38
-#: templates/table/options.phtml:68
+#: templates/database/structure/sortable_header.phtml:21
+#: templates/database/structure/sortable_header.phtml:38
+#: templates/table/search/options.phtml:68
 msgid "Ascending"
 msgstr "ئارتىش"
 
@@ -3611,13 +3618,14 @@ msgstr "ئارتىش"
 #: libraries/operations.lib.php:797 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:188
-#: templates/structure/sortable_header.phtml:26
-#: templates/structure/sortable_header.phtml:43
-#: templates/table/options.phtml:69
+#: templates/database/structure/sortable_header.phtml:26
+#: templates/database/structure/sortable_header.phtml:43
+#: templates/table/search/options.phtml:69
 msgid "Descending"
 msgstr "كېمىيىش"
 
-#: libraries/DBQbe.class.php:467 templates/table/search_and_replace.phtml:6
+#: libraries/DBQbe.class.php:467
+#: templates/table/search/search_and_replace.phtml:6
 #, fuzzy
 #| msgid "Column"
 msgid "Column:"
@@ -3800,12 +3808,12 @@ msgid_plural "%1$s matches in <strong>%2$s</strong>"
 msgstr[0] "%s ئۇيغۇنلۇق تىپىلدى، جەدۋىلى <i>%s</i>"
 
 #: libraries/DbSearch.class.php:354 libraries/Menu.class.php:311
-#: libraries/Util.class.php:3337 libraries/Util.class.php:3347
-#: libraries/Util.class.php:3623 libraries/Util.class.php:3624
-#: libraries/Util.class.php:4343 libraries/config.values.php:43
+#: libraries/Util.class.php:3343 libraries/Util.class.php:3353
+#: libraries/Util.class.php:3629 libraries/Util.class.php:3630
+#: libraries/Util.class.php:4349 libraries/config.values.php:43
 #: libraries/config.values.php:51 libraries/config.values.php:119
 #: libraries/navigation/Nodes/Node_Table.class.php:295
-#: templates/structure/check_all_table_column.phtml:5
+#: templates/table/structure/check_all_table_column.phtml:5
 msgid "Browse"
 msgstr "كۆزەت"
 
@@ -3825,7 +3833,8 @@ msgstr "سانداندىن ئىزدەش"
 msgid "Words or values to search for (wildcard: \"%\"):"
 msgstr "ئىزدەشكە تىگىشلىك خەت ياكى قىقىممىتى(دەرىجىسى:«%»"
 
-#: libraries/DbSearch.class.php:401 templates/table/search_and_replace.phtml:1
+#: libraries/DbSearch.class.php:401
+#: templates/table/search/search_and_replace.phtml:1
 msgid "Find:"
 msgstr "تاپقىنى:"
 
@@ -3877,16 +3886,16 @@ msgstr "تۈرلەش"
 msgid "Search this table"
 msgstr "سانداندىن ئىزدەش"
 
-#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2532
-#: libraries/Util.class.php:2535
+#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2538
+#: libraries/Util.class.php:2541
 #, fuzzy
 #| msgid "Begin"
 msgctxt "First page"
 msgid "Begin"
 msgstr "باشلا"
 
-#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2533
-#: libraries/Util.class.php:2536 libraries/server_bin_log.lib.php:170
+#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2539
+#: libraries/Util.class.php:2542 libraries/server_bin_log.lib.php:170
 #: libraries/server_bin_log.lib.php:172
 #, fuzzy
 #| msgid "Previous"
@@ -3894,8 +3903,8 @@ msgctxt "Previous page"
 msgid "Previous"
 msgstr "ئالدىنقىسى"
 
-#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2564
-#: libraries/Util.class.php:2574 libraries/server_bin_log.lib.php:204
+#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2570
+#: libraries/Util.class.php:2580 libraries/server_bin_log.lib.php:204
 #: libraries/server_bin_log.lib.php:206
 #, fuzzy
 #| msgid "Next"
@@ -3903,8 +3912,8 @@ msgctxt "Next page"
 msgid "Next"
 msgstr "كىيىنكى ئاي"
 
-#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2565
-#: libraries/Util.class.php:2575
+#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2571
+#: libraries/Util.class.php:2581
 #, fuzzy
 #| msgid "End"
 msgctxt "Last page"
@@ -3989,9 +3998,9 @@ msgid "May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]."
 msgstr "ئېنىقسىزلىك بولۇشى مۇمكىن. [doc@faq3-11]FAQ 3.11[/doc] غا قاراڭ."
 
 #: libraries/DisplayResults.class.php:4332 libraries/Message.class.php:180
-#: libraries/controllers/TableRelationController.class.php:258
+#: libraries/controllers/TableRelationController.class.php:259
 #: libraries/controllers/TableSearchController.class.php:655
-#: libraries/rte/rte_routines.lib.php:1332 libraries/sql_query_form.lib.php:89
+#: libraries/rte/rte_routines.lib.php:1423 libraries/sql_query_form.lib.php:89
 #: tbl_operations.php:227 tbl_row_action.php:138 view_operations.php:62
 #, fuzzy
 #| msgid "Your SQL query has been executed successfully."
@@ -3999,7 +4008,7 @@ msgid "Your SQL query has been executed successfully."
 msgstr "SQL بۇيرىقى غەلبىلىك بىجىرىلدى"
 
 #: libraries/DisplayResults.class.php:4660
-#: libraries/controllers/StructureController.class.php:629
+#: libraries/controllers/DatabaseStructureController.class.php:564
 #, php-format
 msgid ""
 "This view has at least this number of rows. Please refer to %sdocumentation"
@@ -4022,33 +4031,33 @@ msgstr ""
 msgid "%d total"
 msgstr "ئۇمۇمىي"
 
-#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1318
+#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1312
 #, php-format
 msgid "Query took %01.4f seconds."
 msgstr ""
 
 #: libraries/DisplayResults.class.php:4807
-#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4767
-#: libraries/Util.class.php:4773 libraries/mult_submits.inc.php:50
-#: templates/structure/check_all_tables.phtml:2
-#: templates/structure/check_all_tables.phtml:9
+#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4773
+#: libraries/Util.class.php:4779 libraries/mult_submits.inc.php:50
+#: templates/database/structure/check_all_tables.phtml:2
+#: templates/database/structure/check_all_tables.phtml:9
 msgid "With selected:"
 msgstr "تاللانغىنى:"
 
 #: libraries/DisplayResults.class.php:4811
-#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4769
-#: libraries/Util.class.php:4770 libraries/server_privileges.lib.php:1174
+#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4775
+#: libraries/Util.class.php:4776 libraries/server_privileges.lib.php:1174
 #: libraries/server_privileges.lib.php:1175
 #: libraries/server_privileges.lib.php:1387
 #: libraries/server_user_groups.lib.php:231
-#: templates/structure/check_all_tables.phtml:3
-#: templates/structure/check_all_tables.phtml:4
+#: templates/database/structure/check_all_tables.phtml:3
+#: templates/database/structure/check_all_tables.phtml:4
 msgid "Check All"
 msgstr "ھەممىنى تاللاش"
 
 #: libraries/DisplayResults.class.php:4985 libraries/Header.class.php:383
-#: templates/structure/optional_action_links.phtml:1
-#: templates/structure/print_view_data_dictionary_link.phtml:3
+#: templates/database/structure/print_view_data_dictionary_link.phtml:3
+#: templates/table/structure/optional_action_links.phtml:1
 msgid "Print view"
 msgstr "بېسىپ كۆرسىتىش"
 
@@ -4056,7 +4065,8 @@ msgstr "بېسىپ كۆرسىتىش"
 msgid "Query results operations"
 msgstr ""
 
-#: libraries/DisplayResults.class.php:5105 templates/tbl_chart.phtml:12
+#: libraries/DisplayResults.class.php:5105
+#: templates/table/chart/tbl_chart.phtml:12
 #, fuzzy
 #| msgid "Table comments"
 msgid "Display chart"
@@ -4155,7 +4165,7 @@ msgid "Click on the bar to scroll to top of page"
 msgstr ""
 
 #: libraries/Header.class.php:749
-#: libraries/plugins/auth/AuthenticationCookie.class.php:152
+#: libraries/plugins/auth/AuthenticationCookie.class.php:140
 #, fuzzy
 #| msgid "Cookies must be enabled past this point."
 msgid "Javascript must be enabled past this point!"
@@ -4179,11 +4189,11 @@ msgid "Keyname"
 msgstr "قىممەت ئىسمى"
 
 #: libraries/Index.class.php:697
-#: libraries/controllers/StructureController.class.php:1962
-#: libraries/controllers/StructureController.class.php:1967
+#: libraries/controllers/TableStructureController.class.php:953
+#: libraries/controllers/TableStructureController.class.php:958
 #: libraries/tracking.lib.php:973
 #: templates/columns_definitions/column_indexes.phtml:11
-#: templates/structure/check_all_table_column.phtml:26
+#: templates/table/structure/check_all_table_column.phtml:26
 msgid "Unique"
 msgstr "بىردىنبىر"
 
@@ -4202,16 +4212,17 @@ msgstr "تۈپ سان"
 #: libraries/server_collations.lib.php:35 libraries/tracking.lib.php:881
 #: libraries/tracking.lib.php:977
 #: templates/columns_definitions/table_fields_definitions.phtml:33
-#: templates/structure/row_stats_table.phtml:31
-#: templates/structure/table_header.phtml:55
-#: templates/structure/table_structure_header.phtml:7
-#: templates/table/table_header.phtml:8
+#: templates/database/structure/table_header.phtml:55
+#: templates/table/search/table_header.phtml:8
+#: templates/table/structure/row_stats_table.phtml:31
+#: templates/table/structure/table_structure_header.phtml:7
 msgid "Collation"
 msgstr "تاسقاش"
 
 #: libraries/Index.class.php:703 libraries/rte/rte_events.lib.php:496
-#: libraries/rte/rte_routines.lib.php:956 libraries/tracking.lib.php:885
-#: libraries/tracking.lib.php:979 templates/structure/table_header.phtml:84
+#: libraries/rte/rte_routines.lib.php:1047 libraries/tracking.lib.php:885
+#: libraries/tracking.lib.php:979
+#: templates/database/structure/table_header.phtml:84
 msgid "Comment"
 msgstr "ئىزاھات"
 
@@ -4224,15 +4235,15 @@ msgstr "ئاساسىي قىممەت ئۆچۈرۈلدى"
 msgid "Index %s has been dropped."
 msgstr "ئۆچۈرۈلگەن تېزىسلار %s."
 
-#: libraries/Index.class.php:757 libraries/Util.class.php:3630
-#: libraries/Util.class.php:3631
-#: libraries/controllers/StructureController.class.php:1958
-#: libraries/controllers/StructureController.class.php:1959
+#: libraries/Index.class.php:757 libraries/Util.class.php:3636
+#: libraries/Util.class.php:3637
+#: libraries/controllers/TableStructureController.class.php:949
+#: libraries/controllers/TableStructureController.class.php:950
 #: libraries/operations.lib.php:1607 libraries/rte/rte_list.lib.php:150
 #: libraries/server_databases.lib.php:146
-#: templates/structure/check_all_table_column.phtml:15
-#: templates/structure/check_all_tables.phtml:16
-#: templates/tbl_relation/foreign_key_row.phtml:93
+#: templates/database/structure/check_all_tables.phtml:16
+#: templates/table/relation/foreign_key_row.phtml:93
+#: templates/table/structure/check_all_table_column.phtml:15
 msgid "Drop"
 msgstr "ئۆچۈرۈش"
 
@@ -4261,16 +4272,16 @@ msgstr "مۇلازىمىتېر"
 #: libraries/Menu.class.php:248
 #: libraries/navigation/Nodes/Node_View.class.php:32
 #: libraries/tbl_info.inc.php:63
-#: templates/structure/structure_table_row.phtml:97
-#: templates/structure/structure_table_row.phtml:159
+#: templates/database/structure/structure_table_row.phtml:97
+#: templates/database/structure/structure_table_row.phtml:159
 msgid "View"
 msgstr "قاراش"
 
 #: libraries/Menu.class.php:325 libraries/Menu.class.php:429
-#: libraries/Menu.class.php:548 libraries/Util.class.php:3334
-#: libraries/Util.class.php:3344 libraries/Util.class.php:3350
-#: libraries/Util.class.php:4313 libraries/Util.class.php:4328
-#: libraries/Util.class.php:4345 libraries/config.values.php:40
+#: libraries/Menu.class.php:548 libraries/Util.class.php:3340
+#: libraries/Util.class.php:3350 libraries/Util.class.php:3356
+#: libraries/Util.class.php:4319 libraries/Util.class.php:4334
+#: libraries/Util.class.php:4351 libraries/config.values.php:40
 #: libraries/config.values.php:48 libraries/config.values.php:110
 #: libraries/config.values.php:116 libraries/config/messages.inc.php:321
 #: libraries/navigation/Nodes/Node_Table.class.php:292
@@ -4278,19 +4289,19 @@ msgid "SQL"
 msgstr "SQL"
 
 #: libraries/Menu.class.php:328 libraries/Menu.class.php:432
-#: libraries/Util.class.php:3335 libraries/Util.class.php:3345
-#: libraries/Util.class.php:3351 libraries/Util.class.php:3625
-#: libraries/Util.class.php:3626 libraries/Util.class.php:4329
-#: libraries/Util.class.php:4346 libraries/config.values.php:41
+#: libraries/Util.class.php:3341 libraries/Util.class.php:3351
+#: libraries/Util.class.php:3357 libraries/Util.class.php:3631
+#: libraries/Util.class.php:3632 libraries/Util.class.php:4335
+#: libraries/Util.class.php:4352 libraries/config.values.php:41
 #: libraries/config.values.php:49 libraries/config.values.php:111
 #: libraries/config.values.php:117
 #: libraries/navigation/Nodes/Node_Table.class.php:286
 msgid "Search"
 msgstr "ئىزدەش"
 
-#: libraries/Menu.class.php:338 libraries/Util.class.php:3336
-#: libraries/Util.class.php:3346 libraries/Util.class.php:3627
-#: libraries/Util.class.php:3628 libraries/Util.class.php:4347
+#: libraries/Menu.class.php:338 libraries/Util.class.php:3342
+#: libraries/Util.class.php:3352 libraries/Util.class.php:3633
+#: libraries/Util.class.php:3634 libraries/Util.class.php:4353
 #: libraries/config.values.php:42 libraries/config.values.php:50
 #: libraries/config.values.php:118
 #: libraries/navigation/Nodes/Node_Table.class.php:289
@@ -4299,30 +4310,30 @@ msgid "Insert"
 msgstr "قىستۇرۇش"
 
 #: libraries/Menu.class.php:362 libraries/Menu.class.php:467
-#: libraries/Util.class.php:4334 libraries/Util.class.php:4350
+#: libraries/Util.class.php:4340 libraries/Util.class.php:4356
 #: libraries/config.values.php:106 libraries/server_common.lib.php:51
 #: libraries/server_privileges.lib.php:2370
 #: libraries/server_privileges.lib.php:3158
-#: libraries/server_privileges.lib.php:4221
+#: libraries/server_privileges.lib.php:4247
 msgid "Privileges"
 msgstr "ھۇقۇقى"
 
 #: libraries/Menu.class.php:371 libraries/Menu.class.php:379
-#: libraries/Menu.class.php:459 libraries/Util.class.php:3338
-#: libraries/Util.class.php:3352 libraries/Util.class.php:4333
-#: libraries/Util.class.php:4351 libraries/config.values.php:112
+#: libraries/Menu.class.php:459 libraries/Util.class.php:3344
+#: libraries/Util.class.php:3358 libraries/Util.class.php:4339
+#: libraries/Util.class.php:4357 libraries/config.values.php:112
 #: view_operations.php:92
 msgid "Operations"
 msgstr "ئىشلەملەر"
 
 #: libraries/Menu.class.php:384 libraries/Menu.class.php:492
-#: libraries/Util.class.php:4338 libraries/Util.class.php:4352
+#: libraries/Util.class.php:4344 libraries/Util.class.php:4358
 #: libraries/relation.lib.php:255
 msgid "Tracking"
 msgstr "ئىز قۇغلاش"
 
 #: libraries/Menu.class.php:397 libraries/Menu.class.php:486
-#: libraries/Util.class.php:4337 libraries/Util.class.php:4353
+#: libraries/Util.class.php:4343 libraries/Util.class.php:4359
 #: libraries/navigation/Nodes/Node_Trigger_Container.class.php:24
 #: libraries/plugins/export/ExportHtmlword.class.php:557
 #: libraries/plugins/export/ExportOdt.class.php:685
@@ -4339,16 +4350,16 @@ msgstr ""
 msgid "Database seems to be empty!"
 msgstr "سانلىق مەلۇمات ئامبىرى قۇرۇق!"
 
-#: libraries/Menu.class.php:439 libraries/Util.class.php:4330
+#: libraries/Menu.class.php:439 libraries/Util.class.php:4336
 msgid "Query"
 msgstr "تەكشۈرۈش"
 
-#: libraries/Menu.class.php:472 libraries/Util.class.php:4335
+#: libraries/Menu.class.php:472 libraries/Util.class.php:4341
 #: libraries/rte/rte_words.lib.php:36
 msgid "Routines"
 msgstr "دائىملىق"
 
-#: libraries/Menu.class.php:479 libraries/Util.class.php:4336
+#: libraries/Menu.class.php:479 libraries/Util.class.php:4342
 #: libraries/navigation/Nodes/Node_Event_Container.class.php:26
 #: libraries/plugins/export/ExportSql.class.php:940
 #: libraries/plugins/export/ExportXml.class.php:107
@@ -4356,22 +4367,22 @@ msgstr "دائىملىق"
 msgid "Events"
 msgstr "ھادىسە"
 
-#: libraries/Menu.class.php:498 libraries/Util.class.php:4339
+#: libraries/Menu.class.php:498 libraries/Util.class.php:4345
 msgid "Designer"
 msgstr "لايىھەلىگۈچ"
 
-#: libraries/Menu.class.php:507 libraries/Util.class.php:4340
-#: templates/structure/check_all_tables.phtml:35
+#: libraries/Menu.class.php:507 libraries/Util.class.php:4346
+#: templates/database/structure/check_all_tables.phtml:35
 #, fuzzy
 #| msgid "Add/Delete columns"
 msgid "Central columns"
 msgstr "سۆزلەم قوشۇش\\ئۆچۈرۈش"
 
-#: libraries/Menu.class.php:544 libraries/Util.class.php:4312
+#: libraries/Menu.class.php:544 libraries/Util.class.php:4318
 #: libraries/config.values.php:103 libraries/config/messages.inc.php:266
 #: libraries/config/messages.inc.php:341
 #: libraries/navigation/NavigationTree.class.php:1239
-#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4332
+#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4358
 msgid "Databases"
 msgstr "ساندان"
 
@@ -4380,34 +4391,34 @@ msgid "User accounts"
 msgstr ""
 
 #: libraries/Menu.class.php:595 libraries/ServerStatusData.class.php:121
-#: libraries/Util.class.php:4319 libraries/server_common.lib.php:36
+#: libraries/Util.class.php:4325 libraries/server_common.lib.php:36
 msgid "Binary log"
 msgstr ""
 
 #: libraries/Menu.class.php:601 libraries/ServerStatusData.class.php:126
-#: libraries/Util.class.php:4320 libraries/server_common.lib.php:42
-#: templates/structure/body_for_table_summary.phtml:10
-#: templates/structure/table_header.phtml:27
+#: libraries/Util.class.php:4326 libraries/server_common.lib.php:42
+#: templates/database/structure/body_for_table_summary.phtml:10
+#: templates/database/structure/table_header.phtml:27
 msgid "Replication"
 msgstr "كۆچۈرۈش"
 
 #: libraries/Menu.class.php:606 libraries/ServerStatusData.class.php:193
-#: libraries/Util.class.php:4321 libraries/config.values.php:105
+#: libraries/Util.class.php:4327 libraries/config.values.php:105
 #: libraries/server_engines.lib.php:108 libraries/server_engines.lib.php:112
 #: libraries/sql_query_form.lib.php:421
 msgid "Variables"
 msgstr ""
 
-#: libraries/Menu.class.php:610 libraries/Util.class.php:4322
+#: libraries/Menu.class.php:610 libraries/Util.class.php:4328
 msgid "Charsets"
 msgstr ""
 
-#: libraries/Menu.class.php:615 libraries/Util.class.php:4323
+#: libraries/Menu.class.php:615 libraries/Util.class.php:4329
 #: libraries/server_common.lib.php:33 libraries/server_plugins.lib.php:27
 msgid "Plugins"
 msgstr ""
 
-#: libraries/Menu.class.php:626 libraries/Util.class.php:4324
+#: libraries/Menu.class.php:626 libraries/Util.class.php:4330
 msgid "Engines"
 msgstr ""
 
@@ -4429,7 +4440,7 @@ msgid "%1$d row inserted."
 msgid_plural "%1$d rows inserted."
 msgstr[0] "%1$d قۇر قوشۇلدى."
 
-#: libraries/PDF.class.php:70 libraries/Util.class.php:2521
+#: libraries/PDF.class.php:70 libraries/Util.class.php:2527
 #: libraries/browse_foreigners.lib.php:327
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:865
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:890
@@ -4454,7 +4465,7 @@ msgid "Could not save favorite table!"
 msgstr "تەڭشەك ئەندىزى %1$s كىرگۈزىلمىدى."
 
 #: libraries/RecentFavoriteTable.class.php:212
-#: templates/structure/favorite_anchor.phtml:12
+#: templates/database/structure/favorite_anchor.phtml:12
 #, fuzzy
 #| msgid "Remove database"
 msgid "Remove from Favorites"
@@ -4636,7 +4647,7 @@ msgid ""
 msgstr "بۇ ساقلىغۇچقا مۇناسىۋەتلىك باشقا ئۇچۇرلار مەۋجۇت ئەمەس."
 
 #: libraries/StorageEngine.class.php:373
-#: templates/structure/body_for_table_summary.phtml:50
+#: templates/database/structure/body_for_table_summary.phtml:50
 #, php-format
 msgid "%s is the default storage engine on this MySQL server."
 msgstr "%s بولسا MySQL مۇلازىمىتېرنىڭ ساقلاش ئەندىزە موتۇرى."
@@ -5067,10 +5078,10 @@ msgstr ""
 
 #: libraries/Util.class.php:726 libraries/rte/rte_events.lib.php:110
 #: libraries/rte/rte_events.lib.php:119 libraries/rte/rte_events.lib.php:150
-#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:153
-#: libraries/rte/rte_routines.lib.php:162
-#: libraries/rte/rte_routines.lib.php:235
-#: libraries/rte/rte_routines.lib.php:1366
+#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:223
+#: libraries/rte/rte_routines.lib.php:250
+#: libraries/rte/rte_routines.lib.php:372
+#: libraries/rte/rte_routines.lib.php:1457
 #: libraries/rte/rte_triggers.lib.php:86 libraries/rte/rte_triggers.lib.php:95
 #: libraries/rte/rte_triggers.lib.php:127
 msgid "MySQL said: "
@@ -5116,82 +5127,85 @@ msgstr "يەكشەنبە"
 msgid "%B %d, %Y at %I:%M %p"
 msgstr "%يىل %ئاي %كۈن %سائەت:%مىنۇت"
 
-#: libraries/Util.class.php:2019
+#: libraries/Util.class.php:2025
 #, php-format
 msgid "%s days, %s hours, %s minutes and %s seconds"
 msgstr "%s كۈن, %s سائەت, %s مىنىۇ ۋە %s سېكوند"
 
-#: libraries/Util.class.php:2112
+#: libraries/Util.class.php:2118
 #, fuzzy
 #| msgid "Routines"
 msgid "Missing parameter:"
 msgstr "دائىملىق"
 
-#: libraries/Util.class.php:2645
+#: libraries/Util.class.php:2651
 #, php-format
 msgid "Jump to database \"%s\"."
 msgstr "ساندان \"%s\" .غا ئۆتۈش."
 
-#: libraries/Util.class.php:2670
+#: libraries/Util.class.php:2676
 #, php-format
 msgid "The %s functionality is affected by a known bug, see %s"
 msgstr ""
 
-#: libraries/Util.class.php:2881
+#: libraries/Util.class.php:2887
 #, fuzzy
 #| msgid "Click to select"
 msgid "Click to toggle"
 msgstr "بىر چىكىپ تاللاڭ"
 
-#: libraries/Util.class.php:3542 prefs_manage.php:248
+#: libraries/Util.class.php:3548 prefs_manage.php:248
 msgid "Browse your computer:"
 msgstr ""
 
-#: libraries/Util.class.php:3567
+#: libraries/Util.class.php:3573
 #, fuzzy, php-format
 #| msgid "web server upload directory"
 msgid "Select from the web server upload directory <b>%s</b>:"
 msgstr "مۇلازىمىتېردىكى يۈكلەش مۇندەرىجىسى"
 
-#: libraries/Util.class.php:3596 libraries/insert_edit.lib.php:1173
+#: libraries/Util.class.php:3602 libraries/insert_edit.lib.php:1171
 msgid "The directory you set for upload work cannot be reached."
 msgstr "كۆرسىتىلگەن مۇندەرىجىگە يۈكلىيەلمىدى."
 
-#: libraries/Util.class.php:3607
+#: libraries/Util.class.php:3613
 #, fuzzy
 #| msgid "Tracked tables"
 msgid "There are no files to upload!"
 msgstr "ئىزلانغان جەدۋەل"
 
-#: libraries/Util.class.php:3632 libraries/Util.class.php:3633
-#: templates/structure/check_all_tables.phtml:15
+#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: templates/database/structure/check_all_tables.phtml:15
 msgid "Empty"
 msgstr "تازىلاش"
 
-#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: libraries/Util.class.php:3644 libraries/Util.class.php:3645
 msgid "Execute"
 msgstr ""
 
-#: libraries/Util.class.php:4152
+#: libraries/Util.class.php:4158
 msgid "Print"
 msgstr "يازدۇر"
 
-#: libraries/Util.class.php:4257 templates/structure/row_stats_table.phtml:80
-#: templates/structure/table_header.phtml:95
+#: libraries/Util.class.php:4263
+#: templates/database/structure/table_header.phtml:95
+#: templates/table/structure/row_stats_table.phtml:80
 msgid "Creation"
 msgstr "قۇرۇش"
 
-#: libraries/Util.class.php:4263 templates/structure/row_stats_table.phtml:87
-#: templates/structure/table_header.phtml:106
+#: libraries/Util.class.php:4269
+#: templates/database/structure/table_header.phtml:106
+#: templates/table/structure/row_stats_table.phtml:87
 msgid "Last update"
 msgstr "ئاخىرقى يېڭلىنىش"
 
-#: libraries/Util.class.php:4269 templates/structure/row_stats_table.phtml:94
-#: templates/structure/table_header.phtml:117
+#: libraries/Util.class.php:4275
+#: templates/database/structure/table_header.phtml:117
+#: templates/table/structure/row_stats_table.phtml:94
 msgid "Last check"
 msgstr "ئاخىرقى تەكشۈرۈش"
 
-#: libraries/Util.class.php:4315
+#: libraries/Util.class.php:4321
 msgid "Users"
 msgstr ""
 
@@ -5214,16 +5228,16 @@ msgid "Use this value"
 msgstr "مۇشۇ قىممەتنى ئىشلىتىش"
 
 #: libraries/build_html_for_db.lib.php:33 libraries/import.lib.php:193
-#: templates/structure/actions_in_table_structure.phtml:113
-#: templates/structure/row_stats_table.phtml:42
-#: templates/structure/table_header.phtml:36
+#: templates/database/structure/table_header.phtml:36
+#: templates/table/structure/actions_in_table_structure.phtml:113
+#: templates/table/structure/row_stats_table.phtml:42
 msgid "Rows"
 msgstr "سەپ سانى"
 
 #: libraries/build_html_for_db.lib.php:48 libraries/engines/innodb.lib.php:171
-#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:186
-#: libraries/server_status.lib.php:298
-#: templates/structure/display_table_stats.phtml:40
+#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:195
+#: libraries/server_status.lib.php:307
+#: templates/table/structure/display_table_stats.phtml:40
 msgid "Total"
 msgstr "يىغىندىسى"
 
@@ -5232,10 +5246,12 @@ msgid "Jump to database"
 msgstr ""
 
 #: libraries/build_html_for_db.lib.php:146
+#: templates/database/structure/structure_table_row.phtml:15
 msgid "Not replicated"
 msgstr ""
 
 #: libraries/build_html_for_db.lib.php:158
+#: templates/database/structure/structure_table_row.phtml:16
 msgid "Replicated"
 msgstr ""
 
@@ -5292,17 +5308,17 @@ msgstr ""
 #: libraries/plugins/export/ExportTexytext.class.php:425
 #: libraries/plugins/export/PMA_ExportPdf.class.php:307
 #: libraries/rte/rte_list.lib.php:73 libraries/rte/rte_list.lib.php:85
-#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:830
-#: libraries/rte/rte_routines.lib.php:1492 setup/frames/index.inc.php:162
+#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:921
+#: libraries/rte/rte_routines.lib.php:1583 setup/frames/index.inc.php:162
 #: templates/columns_definitions/table_fields_definitions.phtml:8
-#: templates/structure/table_structure_header.phtml:5
-#: templates/table/create_table.phtml:11
+#: templates/database/create_table.phtml:11
+#: templates/table/structure/table_structure_header.phtml:5
 msgid "Name"
 msgstr "ئىسمى"
 
 #: libraries/central_columns.lib.php:699
 #: libraries/central_columns.lib.php:1381
-#: libraries/rte/rte_routines.lib.php:832
+#: libraries/rte/rte_routines.lib.php:923
 #: templates/columns_definitions/table_fields_definitions.phtml:14
 msgid "Length/Values"
 msgstr ""
@@ -5323,7 +5339,7 @@ msgid "Select a table"
 msgstr "ھەممىنى تاللاش"
 
 #: libraries/central_columns.lib.php:804
-#: templates/structure/add_column.phtml:4
+#: templates/table/structure/add_column.phtml:4
 msgid "Add column"
 msgstr ""
 
@@ -5343,7 +5359,7 @@ msgstr "سۆزلەم قوشۇش\\ئۆچۈرۈش"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1002
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1025
 #: templates/columns_definitions/table_fields_definitions.phtml:36
-#: templates/structure/table_structure_header.phtml:8
+#: templates/table/structure/table_structure_header.phtml:8
 msgid "Attributes"
 msgstr ""
 
@@ -5463,7 +5479,7 @@ msgid "Double click"
 msgstr ""
 
 #: libraries/config.values.php:95 libraries/config.values.php:124
-#: libraries/config/FormDisplay.tpl.php:221 libraries/relation.lib.php:97
+#: libraries/config/FormDisplay.tpl.php:232 libraries/relation.lib.php:97
 #: libraries/relation.lib.php:105
 msgid "Disabled"
 msgstr "تاقالدى"
@@ -5647,21 +5663,21 @@ msgstr ""
 msgid "maximum %s"
 msgstr ""
 
-#: libraries/config/FormDisplay.tpl.php:219
+#: libraries/config/FormDisplay.tpl.php:230
 msgid "This setting is disabled, it will not be applied to your configuration."
 msgstr ""
 
-#: libraries/config/FormDisplay.tpl.php:313
+#: libraries/config/FormDisplay.tpl.php:324
 #, php-format
 msgid "Set value: %s"
 msgstr ""
 
-#: libraries/config/FormDisplay.tpl.php:318
+#: libraries/config/FormDisplay.tpl.php:329
 #: libraries/config/messages.inc.php:610
 msgid "Restore default value"
 msgstr ""
 
-#: libraries/config/FormDisplay.tpl.php:332
+#: libraries/config/FormDisplay.tpl.php:343
 msgid "Allow users to customize this value"
 msgstr ""
 
@@ -6092,7 +6108,7 @@ msgstr ""
 
 #: libraries/config/messages.inc.php:136 libraries/config/messages.inc.php:152
 #: libraries/sql_query_form.lib.php:247
-#: templates/structure/row_stats_table.phtml:7
+#: templates/table/structure/row_stats_table.phtml:7
 msgid "Format"
 msgstr "فورماتلاش"
 
@@ -6636,7 +6652,7 @@ msgstr ""
 
 #: libraries/config/messages.inc.php:332
 #: libraries/plugins/export/ExportPdf.class.php:279
-#: templates/structure/secondary_tabs.phtml:8
+#: templates/table/secondary_tabs.phtml:8
 #, fuzzy
 #| msgid "Databases"
 msgid "Table structure"
@@ -8216,109 +8232,35 @@ msgstr "Microsoft Word 2000"
 msgid "OpenDocument Text"
 msgstr "OpenOffice ھۆججىتى"
 
-#: libraries/controllers/StructureController.class.php:465
+#: libraries/controllers/DatabaseStructureController.class.php:405
 #: tbl_operations.php:382
 #, php-format
 msgid "Table %s has been emptied."
 msgstr "%s جەدۋەل تازىلاندى"
 
-#: libraries/controllers/StructureController.class.php:486
+#: libraries/controllers/DatabaseStructureController.class.php:426
 #: tbl_operations.php:400 view_operations.php:119
 #, fuzzy, php-format
 #| msgid "View %s has been dropped."
 msgid "View %s has been dropped."
 msgstr "%s كۆرۈنمە ئۆچۈرۈلدى"
 
-#: libraries/controllers/StructureController.class.php:487
+#: libraries/controllers/DatabaseStructureController.class.php:427
 #: tbl_operations.php:401
 #, fuzzy, php-format
 #| msgid "Table %s has been dropped."
 msgid "Table %s has been dropped."
 msgstr "%s جەدىۋەل ئۆچۈرۈلدى"
 
-#: libraries/controllers/StructureController.class.php:797
-#, php-format
-msgid "The name '%s' is a MySQL reserved keyword."
-msgid_plural "The names '%s' are MySQL reserved keywords."
-msgstr[0] ""
-
-#: libraries/controllers/StructureController.class.php:875
-msgid "No column selected."
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1049
+#: libraries/controllers/DatabaseStructureController.class.php:733
 msgid "Favorite List is full!"
 msgstr ""
 
-#: libraries/controllers/StructureController.class.php:1272
-#, fuzzy
-#| msgid "Database %s has been dropped."
-msgid "The columns have been moved successfully."
-msgstr "ساندان %s ئۆچۈرۈلدى."
-
-#: libraries/controllers/StructureController.class.php:1535
-#, fuzzy, php-format
-#| msgid "View %s has been dropped."
-msgid ""
-"Table %1$s has been altered successfully. Privileges have been adjusted."
-msgstr "%s كۆرۈنمە ئۆچۈرۈلدى"
-
-#: libraries/controllers/StructureController.class.php:1541
-#: libraries/controllers/TableIndexesController.class.php:161
-#: tbl_addfield.php:92
-#, php-format
-msgid "Table %1$s has been altered successfully."
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1588
-#: libraries/tracking.lib.php:1094
-#, fuzzy
-#| msgid "Query"
-msgid "Query error"
-msgstr "تەكشۈرۈش"
-
-#: libraries/controllers/StructureController.class.php:1806
+#: libraries/controllers/DatabaseStructureController.class.php:947
 #: libraries/mysql_charsets.lib.php:366 libraries/mysql_charsets.lib.php:373
 msgid "unknown"
 msgstr ""
 
-#: libraries/controllers/StructureController.class.php:1957
-#: templates/structure/check_all_table_column.phtml:11
-msgid "Change"
-msgstr "ئۆزگەرتتىش"
-
-#: libraries/controllers/StructureController.class.php:1961
-#: libraries/controllers/StructureController.class.php:1966
-#: libraries/navigation/Nodes/Node_Index.class.php:30
-#: libraries/tracking.lib.php:926
-#: templates/columns_definitions/column_indexes.phtml:16
-#: templates/columns_definitions/table_fields_definitions.phtml:57
-#: templates/structure/check_all_table_column.phtml:30
-#: templates/structure/display_structure.phtml:79
-#: templates/structure/display_table_stats.phtml:19
-msgid "Index"
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1963
-#: libraries/controllers/StructureController.class.php:1968
-#: templates/columns_definitions/column_indexes.phtml:27
-#: templates/structure/check_all_table_column.phtml:37
-msgid "Spatial"
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1964
-#: libraries/controllers/StructureController.class.php:1969
-#: templates/columns_definitions/column_indexes.phtml:22
-#: templates/structure/check_all_table_column.phtml:47
-msgid "Fulltext"
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1970
-#, fuzzy
-#| msgid "Use this value"
-msgid "Distinct values"
-msgstr "مۇشۇ قىممەتنى ئىشلىتىش"
-
 #: libraries/controllers/TableChartController.class.php:82
 #: libraries/controllers/TableGisVisualizationController.class.php:101
 msgid "No SQL query was set to fetch data."
@@ -8335,11 +8277,18 @@ msgstr ""
 msgid "No data to display"
 msgstr "سۆزلەمنى كۆرسەتمەسلىك"
 
-#: libraries/controllers/TableRelationController.class.php:217
+#: libraries/controllers/TableIndexesController.class.php:161
+#: libraries/controllers/TableStructureController.class.php:736
+#: tbl_addfield.php:92
+#, php-format
+msgid "Table %1$s has been altered successfully."
+msgstr ""
+
+#: libraries/controllers/TableRelationController.class.php:218
 msgid "Display column was successfully updated."
 msgstr ""
 
-#: libraries/controllers/TableRelationController.class.php:283
+#: libraries/controllers/TableRelationController.class.php:288
 #, fuzzy
 #| msgid "Internal relation added"
 msgid "Internal relations were successfully updated."
@@ -8358,12 +8307,79 @@ msgid "Zoom search"
 msgstr "ئىزدەش"
 
 #: libraries/controllers/TableSearchController.class.php:852
-#: templates/table/selection_form.phtml:59
+#: templates/table/search/selection_form.phtml:59
 #, fuzzy
 #| msgid "SQL query"
 msgid "Find and replace"
 msgstr "SQL سورىقى"
 
+#: libraries/controllers/TableStructureController.class.php:163
+#, php-format
+msgid "The name '%s' is a MySQL reserved keyword."
+msgid_plural "The names '%s' are MySQL reserved keywords."
+msgstr[0] ""
+
+#: libraries/controllers/TableStructureController.class.php:241
+msgid "No column selected."
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:467
+#, fuzzy
+#| msgid "Database %s has been dropped."
+msgid "The columns have been moved successfully."
+msgstr "ساندان %s ئۆچۈرۈلدى."
+
+#: libraries/controllers/TableStructureController.class.php:730
+#, fuzzy, php-format
+#| msgid "View %s has been dropped."
+msgid ""
+"Table %1$s has been altered successfully. Privileges have been adjusted."
+msgstr "%s كۆرۈنمە ئۆچۈرۈلدى"
+
+#: libraries/controllers/TableStructureController.class.php:783
+#: libraries/tracking.lib.php:1094
+#, fuzzy
+#| msgid "Query"
+msgid "Query error"
+msgstr "تەكشۈرۈش"
+
+#: libraries/controllers/TableStructureController.class.php:948
+#: templates/table/structure/check_all_table_column.phtml:11
+msgid "Change"
+msgstr "ئۆزگەرتتىش"
+
+#: libraries/controllers/TableStructureController.class.php:952
+#: libraries/controllers/TableStructureController.class.php:957
+#: libraries/navigation/Nodes/Node_Index.class.php:30
+#: libraries/tracking.lib.php:926
+#: templates/columns_definitions/column_indexes.phtml:16
+#: templates/columns_definitions/table_fields_definitions.phtml:57
+#: templates/table/structure/check_all_table_column.phtml:30
+#: templates/table/structure/display_structure.phtml:79
+#: templates/table/structure/display_table_stats.phtml:19
+msgid "Index"
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:954
+#: libraries/controllers/TableStructureController.class.php:959
+#: templates/columns_definitions/column_indexes.phtml:27
+#: templates/table/structure/check_all_table_column.phtml:37
+msgid "Spatial"
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:955
+#: libraries/controllers/TableStructureController.class.php:960
+#: templates/columns_definitions/column_indexes.phtml:22
+#: templates/table/structure/check_all_table_column.phtml:47
+msgid "Fulltext"
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:963
+#, fuzzy
+#| msgid "Use this value"
+msgid "Distinct values"
+msgstr "مۇشۇ قىممەتنى ئىشلىتىش"
+
 #: libraries/core.lib.php:306
 #, php-format
 msgid "The %s extension is missing. Please check your PHP configuration."
@@ -8410,7 +8426,7 @@ msgid "No Password"
 msgstr "پارول يوق"
 
 #: libraries/display_change_password.lib.php:68
-#: libraries/plugins/auth/AuthenticationCookie.class.php:199
+#: libraries/plugins/auth/AuthenticationCookie.class.php:187
 #: libraries/replication_gui.lib.php:422 libraries/replication_gui.lib.php:862
 #: libraries/server_privileges.lib.php:1640
 msgid "Password:"
@@ -9218,12 +9234,12 @@ msgid "Dump has been saved to file %s."
 msgstr "%s ھۆججىتىدە ساقلاندى."
 
 #: libraries/import.lib.php:202 libraries/insert_edit.lib.php:124
-#: libraries/rte/rte_routines.lib.php:1353 libraries/sql.lib.php:1312
+#: libraries/rte/rte_routines.lib.php:1444 libraries/sql.lib.php:1306
 #: tbl_get_field.php:44
 msgid "MySQL returned an empty result set (i.e. zero rows)."
 msgstr ""
 
-#: libraries/import.lib.php:265 libraries/sql.lib.php:1326
+#: libraries/import.lib.php:265 libraries/sql.lib.php:1320
 msgid "[ROLLBACK occurred.]"
 msgstr ""
 
@@ -9289,14 +9305,14 @@ msgstr ""
 
 #: libraries/insert_edit.lib.php:233
 #: libraries/navigation/Nodes/Node_DatabaseChild.class.php:48
-#: templates/designer/table_list.phtml:40
+#: templates/database/designer/table_list.phtml:40
 msgid "Hide"
 msgstr ""
 
 #: libraries/insert_edit.lib.php:249
 #: libraries/navigation/Nodes/Node_Function.class.php:32
-#: libraries/rte/rte_routines.lib.php:1495
-#: templates/table/table_header.phtml:4
+#: libraries/rte/rte_routines.lib.php:1586
+#: templates/table/search/table_header.phtml:4
 msgid "Function"
 msgstr ""
 
@@ -9309,86 +9325,87 @@ msgstr ""
 msgid "Because of its length,<br /> this column might not be editable."
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1050
+#: libraries/insert_edit.lib.php:1048
 msgid "Binary - do not edit"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1176 libraries/server_privileges.lib.php:470
-#: templates/table/options.phtml:36
+#: libraries/insert_edit.lib.php:1174 libraries/server_privileges.lib.php:470
+#: templates/table/search/options.phtml:36
 msgid "Or"
 msgstr "ياكى"
 
-#: libraries/insert_edit.lib.php:1177
+#: libraries/insert_edit.lib.php:1175
 #, fuzzy
 #| msgid "web server upload directory"
 msgid "web server upload directory:"
 msgstr "مۇلازىمىتېردىكى يۈكلەش مۇندەرىجىسى"
 
-#: libraries/insert_edit.lib.php:1348 templates/table/input_box.phtml:49
+#: libraries/insert_edit.lib.php:1346
+#: templates/table/search/input_box.phtml:49
 #, fuzzy
 #| msgid "Insert"
 msgid "Edit/Insert"
 msgstr "قىستۇرۇش"
 
-#: libraries/insert_edit.lib.php:1398
+#: libraries/insert_edit.lib.php:1396
 #, php-format
 msgid "Continue insertion with %s rows"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1428
+#: libraries/insert_edit.lib.php:1426
 msgid "and then"
 msgstr "كېيىن"
 
-#: libraries/insert_edit.lib.php:1461
+#: libraries/insert_edit.lib.php:1459
 msgid "Insert as new row"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1464
+#: libraries/insert_edit.lib.php:1462
 msgid "Insert as new row and ignore errors"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1467
+#: libraries/insert_edit.lib.php:1465
 msgid "Show insert query"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1487
+#: libraries/insert_edit.lib.php:1485
 msgid "Go back to previous page"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1490
+#: libraries/insert_edit.lib.php:1488
 msgid "Insert another new row"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1495
+#: libraries/insert_edit.lib.php:1493
 msgid "Go back to this page"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1518
+#: libraries/insert_edit.lib.php:1516
 msgid "Edit next row"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1540
+#: libraries/insert_edit.lib.php:1538
 msgid ""
 "Use TAB key to move from value to value, or CTRL+arrows to move anywhere"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1577 libraries/replication_gui.lib.php:542
-#: libraries/rte/rte_routines.lib.php:1497
+#: libraries/insert_edit.lib.php:1575 libraries/replication_gui.lib.php:542
+#: libraries/rte/rte_routines.lib.php:1588
 #: libraries/server_status_variables.lib.php:220
-#: templates/designer/having_query_panel.phtml:100
-#: templates/designer/options_panel.phtml:73
-#: templates/designer/options_panel.phtml:239
-#: templates/designer/where_query_panel.phtml:69
-#: templates/table/table_header.phtml:10
-#: templates/table/zoom_result_form.phtml:35
+#: templates/database/designer/having_query_panel.phtml:100
+#: templates/database/designer/options_panel.phtml:73
+#: templates/database/designer/options_panel.phtml:239
+#: templates/database/designer/where_query_panel.phtml:69
+#: templates/table/search/table_header.phtml:10
+#: templates/table/search/zoom_result_form.phtml:35
 msgid "Value"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1937 libraries/sql.lib.php:1309
+#: libraries/insert_edit.lib.php:1935 libraries/sql.lib.php:1303
 msgid "Showing SQL query"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1962 libraries/sql.lib.php:1287
+#: libraries/insert_edit.lib.php:1960 libraries/sql.lib.php:1281
 #, php-format
 msgid "Inserted row id: %1$d"
 msgstr ""
@@ -9830,7 +9847,7 @@ msgstr ""
 #: libraries/navigation/Nodes/Node_View_Container.class.php:26
 #: libraries/navigation/Nodes/Node_View_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:129
-#: templates/structure/show_create.phtml:30
+#: templates/database/structure/show_create.phtml:30
 #, fuzzy
 #| msgid "View"
 msgid "Views"
@@ -10138,7 +10155,7 @@ msgstr ""
 
 #: libraries/operations.lib.php:101 libraries/operations.lib.php:249
 #: libraries/operations.lib.php:869 libraries/operations.lib.php:963
-#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:907
+#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:998
 #: templates/columns_definitions/table_fields_definitions.phtml:47
 #, fuzzy
 #| msgid "Privileges"
@@ -10232,22 +10249,22 @@ msgid "Switch to copied table"
 msgstr ""
 
 #: libraries/operations.lib.php:1360
-#: templates/structure/check_all_tables.phtml:18
+#: templates/database/structure/check_all_tables.phtml:18
 msgid "Table maintenance"
 msgstr ""
 
 #: libraries/operations.lib.php:1398
-#: templates/structure/check_all_tables.phtml:19
+#: templates/database/structure/check_all_tables.phtml:19
 msgid "Analyze table"
 msgstr "جەدۋەل تەھلىلى"
 
 #: libraries/operations.lib.php:1413
-#: templates/structure/check_all_tables.phtml:20
+#: templates/database/structure/check_all_tables.phtml:20
 msgid "Check table"
 msgstr "جەدۋەل تەكشۈرۈش"
 
 #: libraries/operations.lib.php:1428
-#: templates/structure/check_all_tables.phtml:22
+#: templates/database/structure/check_all_tables.phtml:22
 #, fuzzy
 #| msgid "Check table"
 msgid "Checksum table"
@@ -10267,18 +10284,19 @@ msgid "Flush the table (FLUSH)"
 msgstr ""
 
 #: libraries/operations.lib.php:1477
-#: templates/structure/check_all_tables.phtml:23
-#: templates/structure/display_table_stats.phtml:56
+#: templates/database/structure/check_all_tables.phtml:23
+#: templates/table/structure/display_table_stats.phtml:56
 msgid "Optimize table"
 msgstr "جەدۋەلنى ئەلالاش"
 
 #: libraries/operations.lib.php:1492
-#: templates/structure/check_all_tables.phtml:24
+#: templates/database/structure/check_all_tables.phtml:24
 msgid "Repair table"
 msgstr "جەدۋەلنى ئوڭشاش"
 
 #: libraries/operations.lib.php:1538
-#: templates/structure/check_all_tables.phtml:14 view_operations.php:127
+#: templates/database/structure/check_all_tables.phtml:14
+#: view_operations.php:127
 #, fuzzy
 #| msgid "Delete tracking data for this table"
 msgid "Delete data or table"
@@ -10405,7 +10423,7 @@ msgid "Cannot connect: invalid settings."
 msgstr "ئۇلىنالمىدى: ئۈنۈمسىز تەڭشەك."
 
 #: libraries/plugins/auth/AuthenticationConfig.class.php:108
-#: libraries/plugins/auth/AuthenticationCookie.class.php:134
+#: libraries/plugins/auth/AuthenticationCookie.class.php:122
 #: libraries/plugins/auth/AuthenticationHttp.class.php:96
 #, php-format
 msgid "Welcome to %s"
@@ -10430,38 +10448,38 @@ msgstr ""
 msgid "Retry to connect"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:146
+#: libraries/plugins/auth/AuthenticationCookie.class.php:134
 msgid "Your session has expired. Please log in again."
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:170
+#: libraries/plugins/auth/AuthenticationCookie.class.php:158
 msgid "Log in"
 msgstr "كىرىش"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:178
-#: libraries/plugins/auth/AuthenticationCookie.class.php:188
+#: libraries/plugins/auth/AuthenticationCookie.class.php:166
+#: libraries/plugins/auth/AuthenticationCookie.class.php:176
 msgid "You can enter hostname/IP address and port separated by space."
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:193
+#: libraries/plugins/auth/AuthenticationCookie.class.php:181
 msgid "Username:"
 msgstr "ئابۇنىت ئىسمى:"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:205
+#: libraries/plugins/auth/AuthenticationCookie.class.php:193
 #, fuzzy
 #| msgid "Server Choice"
 msgid "Server Choice:"
 msgstr "مۇلازىمىتېر تاللاش"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:386
+#: libraries/plugins/auth/AuthenticationCookie.class.php:374
 msgid "Entered captcha is wrong, try again!"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:396
+#: libraries/plugins/auth/AuthenticationCookie.class.php:384
 msgid "Please enter correct captcha!"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:423
+#: libraries/plugins/auth/AuthenticationCookie.class.php:411
 #, fuzzy
 #| msgid "Cannot log in to the MySQL server"
 msgid "You are not allowed to log in to this MySQL server!"
@@ -10573,7 +10591,7 @@ msgstr ""
 #: libraries/plugins/export/ExportOdt.class.php:593
 #: libraries/plugins/export/ExportTexytext.class.php:428
 #: libraries/plugins/export/PMA_ExportPdf.class.php:313
-#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:984
 #: libraries/rte/rte_triggers.lib.php:377
 #, fuzzy
 #| msgid "Description"
@@ -10924,7 +10942,7 @@ msgid "Last check:"
 msgstr "ئاخىرقى تەكشۈرۈش"
 
 #: libraries/plugins/export/ExportSql.class.php:1399
-#: templates/structure/structure_table_row.phtml:183
+#: templates/database/structure/structure_table_row.phtml:183
 msgid "in use"
 msgstr "ئىشلىتىلمەكتە"
 
@@ -11122,20 +11140,16 @@ msgstr ""
 msgid "The imported file does not contain any data!"
 msgstr "File %s does not contain any key id"
 
-#: libraries/plugins/import/ImportSql.class.php:169
+#: libraries/plugins/import/ImportSql.class.php:72
 #, fuzzy
 #| msgid "SQL compatibility mode"
 msgid "SQL compatibility mode:"
 msgstr "SQLئۆز ئىچىگە ئالغان شەكلى"
 
-#: libraries/plugins/import/ImportSql.class.php:181
+#: libraries/plugins/import/ImportSql.class.php:84
 msgid "Do not use <code>AUTO_INCREMENT</code> for zero values"
 msgstr ""
 
-#: libraries/plugins/import/ImportSql.class.php:195
-msgid "Read as multibytes"
-msgstr ""
-
 #: libraries/plugins/import/ImportXml.class.php:54
 msgid "XML"
 msgstr ""
@@ -11180,7 +11194,7 @@ msgid "Show grid"
 msgstr ""
 
 #: libraries/plugins/schema/SchemaPdf.class.php:94
-#: templates/structure/print_view_data_dictionary_link.phtml:6
+#: templates/database/structure/print_view_data_dictionary_link.phtml:6
 msgid "Data Dictionary"
 msgstr "مەلۇمات لۇغىتى"
 
@@ -11211,7 +11225,7 @@ msgid "The %s table doesn't exist!"
 msgstr ""
 
 #: libraries/plugins/schema/eps/Eps_Relation_Schema.class.php:321
-#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:309
+#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:323
 #, php-format
 msgid "Schema of the %s database - Page %s"
 msgstr ""
@@ -11240,7 +11254,7 @@ msgstr ""
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1005
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1028
 #: libraries/tracking.lib.php:884
-#: templates/structure/table_structure_header.phtml:11
+#: templates/table/structure/table_structure_header.phtml:11
 msgid "Extra"
 msgstr ""
 
@@ -11571,51 +11585,51 @@ msgstr ""
 msgid "Create the needed tables with the <code>%screate_tables.sql</code>."
 msgstr ""
 
-#: libraries/relation.lib.php:360
+#: libraries/relation.lib.php:357
 msgid "Create a pma user and give access to these tables."
 msgstr ""
 
-#: libraries/relation.lib.php:365
+#: libraries/relation.lib.php:360
 msgid ""
 "Enable advanced features in configuration file (<code>config.inc.php</"
 "code>), for example by starting from <code>config.sample.inc.php</code>."
 msgstr ""
 
-#: libraries/relation.lib.php:373
+#: libraries/relation.lib.php:365
 msgid "Re-login to phpMyAdmin to load the updated configuration file."
 msgstr ""
 
-#: libraries/relation.lib.php:1612
+#: libraries/relation.lib.php:1607
 msgid "no description"
 msgstr ""
 
-#: libraries/relation.lib.php:1811
+#: libraries/relation.lib.php:1806
 msgid ""
 "You do not have necessary privileges to create a database named "
 "'phpmyadmin'. You may go to 'Operations' tab of any database to set up the "
 "phpMyAdmin configuration storage there."
 msgstr ""
 
-#: libraries/relation.lib.php:1928
+#: libraries/relation.lib.php:1923
 #, php-format
 msgid ""
 "%sCreate%s a database named 'phpmyadmin' and setup the phpMyAdmin "
 "configuration storage there."
 msgstr ""
 
-#: libraries/relation.lib.php:1936
+#: libraries/relation.lib.php:1931
 #, php-format
 msgid ""
 "%sCreate%s the phpMyAdmin configuration storage in the current database."
 msgstr ""
 
-#: libraries/relation.lib.php:1944
+#: libraries/relation.lib.php:1939
 #, php-format
 msgid "%sCreate%s missing phpMyAdmin configuration storage tables."
 msgstr ""
 
 #: libraries/replication_gui.lib.php:46 libraries/replication_gui.lib.php:343
-#: libraries/server_databases.lib.php:387
+#: libraries/server_databases.lib.php:398
 msgid "Master replication"
 msgstr ""
 
@@ -11670,7 +11684,7 @@ msgid ""
 msgstr ""
 
 #: libraries/replication_gui.lib.php:141
-#: libraries/server_databases.lib.php:389
+#: libraries/server_databases.lib.php:400
 msgid "Slave replication"
 msgstr ""
 
@@ -11945,10 +11959,10 @@ msgid "Master server changed successfully to %s."
 msgstr ""
 
 #: libraries/rte/rte_events.lib.php:106 libraries/rte/rte_events.lib.php:115
-#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:149
-#: libraries/rte/rte_routines.lib.php:158
-#: libraries/rte/rte_routines.lib.php:231
-#: libraries/rte/rte_routines.lib.php:1362
+#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:219
+#: libraries/rte/rte_routines.lib.php:246
+#: libraries/rte/rte_routines.lib.php:368
+#: libraries/rte/rte_routines.lib.php:1453
 #: libraries/rte/rte_triggers.lib.php:82 libraries/rte/rte_triggers.lib.php:91
 #: libraries/rte/rte_triggers.lib.php:123
 #, php-format
@@ -11971,7 +11985,7 @@ msgstr "%s كۆرۈنمە ئۆچۈرۈلدى"
 msgid "Event %1$s has been created."
 msgstr "%1$s ساندان غەلبىلىك قۇرۇلدى"
 
-#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:251
+#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:266
 #: libraries/rte/rte_triggers.lib.php:144
 msgid "One or more errors have occurred while processing your request:"
 msgstr ""
@@ -11982,7 +11996,7 @@ msgstr ""
 msgid "Edit event"
 msgstr "مەجبۇرى قوشۇش"
 
-#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:794
+#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:885
 #: libraries/rte/rte_triggers.lib.php:323 view_create.php:180
 #, fuzzy
 #| msgid "Details…"
@@ -11999,7 +12013,7 @@ msgstr "قىممەت ئىسمى"
 msgid "Event type"
 msgstr ""
 
-#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:817
+#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:908
 #, fuzzy, php-format
 #| msgid "Change"
 msgid "Change to %s"
@@ -12029,12 +12043,14 @@ msgstr "ئاخىرقىسى"
 msgid "On completion preserve"
 msgstr ""
 
-#: libraries/rte/rte_events.lib.php:491 libraries/rte/rte_routines.lib.php:930
+#: libraries/rte/rte_events.lib.php:491
+#: libraries/rte/rte_routines.lib.php:1021
 #: libraries/rte/rte_triggers.lib.php:383 view_create.php:209
 msgid "Definer"
 msgstr ""
 
-#: libraries/rte/rte_events.lib.php:535 libraries/rte/rte_routines.lib.php:997
+#: libraries/rte/rte_events.lib.php:535
+#: libraries/rte/rte_routines.lib.php:1088
 #: libraries/rte/rte_triggers.lib.php:422
 msgid "The definer must be in the \"username@hostname\" format!"
 msgstr ""
@@ -12062,9 +12078,9 @@ msgid "You must provide an event definition."
 msgstr ""
 
 #: libraries/rte/rte_export.lib.php:43 libraries/rte/rte_general.lib.php:72
-#: libraries/rte/rte_routines.lib.php:345
-#: libraries/rte/rte_routines.lib.php:1198
-#: libraries/rte/rte_routines.lib.php:1411
+#: libraries/rte/rte_routines.lib.php:153
+#: libraries/rte/rte_routines.lib.php:1289
+#: libraries/rte/rte_routines.lib.php:1502
 msgid "Error in processing request:"
 msgstr ""
 
@@ -12098,149 +12114,149 @@ msgid ""
 "problems."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:110
-#: libraries/rte/rte_routines.lib.php:1006
-#, fuzzy, php-format
-#| msgid "Invalid server index: %s"
-msgid "Invalid routine type: \"%s\""
-msgstr "ئۈنۈمسىز مۇلازىمىتېر :%s"
-
-#: libraries/rte/rte_routines.lib.php:170
-msgid "Sorry, we failed to restore the dropped routine."
-msgstr ""
-
-#: libraries/rte/rte_routines.lib.php:211
-#, fuzzy, php-format
-#| msgid "View %s has been dropped."
-msgid "Routine %1$s has been modified. Privileges have been adjusted."
-msgstr "%s كۆرۈنمە ئۆچۈرۈلدى"
-
-#: libraries/rte/rte_routines.lib.php:216
-#, fuzzy, php-format
-#| msgid "View %s has been dropped."
-msgid "Routine %1$s has been modified."
-msgstr "%s كۆرۈنمە ئۆچۈرۈلدى"
-
-#: libraries/rte/rte_routines.lib.php:238
-#, fuzzy, php-format
-#| msgid "Database %1$s has been created."
-msgid "Routine %1$s has been created."
-msgstr "%1$s ساندان غەلبىلىك قۇرۇلدى"
-
-#: libraries/rte/rte_routines.lib.php:315
+#: libraries/rte/rte_routines.lib.php:123
 #, fuzzy
 #| msgid "Routines"
 msgid "Edit routine"
 msgstr "دائىملىق"
 
-#: libraries/rte/rte_routines.lib.php:797
+#: libraries/rte/rte_routines.lib.php:200
+#: libraries/rte/rte_routines.lib.php:1097
+#, fuzzy, php-format
+#| msgid "Invalid server index: %s"
+msgid "Invalid routine type: \"%s\""
+msgstr "ئۈنۈمسىز مۇلازىمىتېر :%s"
+
+#: libraries/rte/rte_routines.lib.php:253
+#, fuzzy, php-format
+#| msgid "Database %1$s has been created."
+msgid "Routine %1$s has been created."
+msgstr "%1$s ساندان غەلبىلىك قۇرۇلدى"
+
+#: libraries/rte/rte_routines.lib.php:380
+msgid "Sorry, we failed to restore the dropped routine."
+msgstr ""
+
+#: libraries/rte/rte_routines.lib.php:439
+#, fuzzy, php-format
+#| msgid "View %s has been dropped."
+msgid "Routine %1$s has been modified. Privileges have been adjusted."
+msgstr "%s كۆرۈنمە ئۆچۈرۈلدى"
+
+#: libraries/rte/rte_routines.lib.php:444
+#, fuzzy, php-format
+#| msgid "View %s has been dropped."
+msgid "Routine %1$s has been modified."
+msgstr "%s كۆرۈنمە ئۆچۈرۈلدى"
+
+#: libraries/rte/rte_routines.lib.php:888
 #, fuzzy
 #| msgid "Routines"
 msgid "Routine name"
 msgstr "دائىملىق"
 
-#: libraries/rte/rte_routines.lib.php:823
+#: libraries/rte/rte_routines.lib.php:914
 msgid "Parameters"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:829
+#: libraries/rte/rte_routines.lib.php:920
 #, fuzzy
 #| msgid "Creation"
 msgid "Direction"
 msgstr "قۇرۇش"
 
-#: libraries/rte/rte_routines.lib.php:847
+#: libraries/rte/rte_routines.lib.php:938
 msgid "Add parameter"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:851
+#: libraries/rte/rte_routines.lib.php:942
 #, fuzzy
 #| msgid "Remove database"
 msgid "Remove last parameter"
 msgstr "ئۆزگەرتىلگەن ساندان ئىسمى"
 
-#: libraries/rte/rte_routines.lib.php:856
+#: libraries/rte/rte_routines.lib.php:947
 msgid "Return type"
 msgstr "تۈرگە قايتىش"
 
-#: libraries/rte/rte_routines.lib.php:862
+#: libraries/rte/rte_routines.lib.php:953
 msgid "Return length/values"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:868
+#: libraries/rte/rte_routines.lib.php:959
 #, fuzzy
 #| msgid "Action"
 msgid "Return options"
 msgstr "ئامال"
 
-#: libraries/rte/rte_routines.lib.php:899
+#: libraries/rte/rte_routines.lib.php:990
 msgid "Is deterministic"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:920
+#: libraries/rte/rte_routines.lib.php:1011
 msgid ""
 "You do not have sufficient privileges to perform this operation; Please "
 "refer to the documentation for more details"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:935
+#: libraries/rte/rte_routines.lib.php:1026
 #, fuzzy
 #| msgid "Return type"
 msgid "Security type"
 msgstr "تۈرگە قايتىش"
 
-#: libraries/rte/rte_routines.lib.php:944
+#: libraries/rte/rte_routines.lib.php:1035
 msgid "SQL data access"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1013
+#: libraries/rte/rte_routines.lib.php:1104
 #, fuzzy
 #| msgid "Invalid table name"
 msgid "You must provide a routine name!"
 msgstr "ئۈنۈمسىز جەدۋەل ئىسمى"
 
-#: libraries/rte/rte_routines.lib.php:1047
+#: libraries/rte/rte_routines.lib.php:1138
 #, php-format
 msgid "Invalid direction \"%s\" given for parameter."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1069
-#: libraries/rte/rte_routines.lib.php:1131
+#: libraries/rte/rte_routines.lib.php:1160
+#: libraries/rte/rte_routines.lib.php:1222
 msgid ""
 "You must provide length/values for routine parameters of type ENUM, SET, "
 "VARCHAR and VARBINARY."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1095
+#: libraries/rte/rte_routines.lib.php:1186
 msgid "You must provide a name and a type for each routine parameter."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1114
+#: libraries/rte/rte_routines.lib.php:1205
 msgid "You must provide a valid return type for the routine."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1174
+#: libraries/rte/rte_routines.lib.php:1265
 msgid "You must provide a routine definition."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1285
+#: libraries/rte/rte_routines.lib.php:1376
 #, php-format
 msgid "Execution results of routine %s"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1340
+#: libraries/rte/rte_routines.lib.php:1431
 #, php-format
 msgid "%d row affected by the last statement inside the procedure."
 msgid_plural "%d rows affected by the last statement inside the procedure."
 msgstr[0] ""
 
-#: libraries/rte/rte_routines.lib.php:1398
-#: libraries/rte/rte_routines.lib.php:1406
+#: libraries/rte/rte_routines.lib.php:1489
+#: libraries/rte/rte_routines.lib.php:1497
 msgid "Execute routine"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1485
-#: libraries/rte/rte_routines.lib.php:1488
+#: libraries/rte/rte_routines.lib.php:1576
+#: libraries/rte/rte_routines.lib.php:1579
 #, fuzzy
 #| msgid "Routines"
 msgid "Routine parameters"
@@ -12433,7 +12449,7 @@ msgid "Original position"
 msgstr ""
 
 #: libraries/server_bin_log.lib.php:133
-#: templates/structure/display_table_stats.phtml:4
+#: templates/table/structure/display_table_stats.phtml:4
 msgid "Information"
 msgstr ""
 
@@ -12469,12 +12485,12 @@ msgid ""
 "between the web server and the MySQL server."
 msgstr ""
 
-#: libraries/server_databases.lib.php:364
-#: libraries/server_databases.lib.php:365
+#: libraries/server_databases.lib.php:366
+#: libraries/server_databases.lib.php:371
 msgid "Enable Statistics"
 msgstr ""
 
-#: libraries/server_databases.lib.php:481
+#: libraries/server_databases.lib.php:492
 #, fuzzy, php-format
 #| msgid "Database %s has been dropped."
 msgid "%1$d database has been dropped successfully."
@@ -12840,7 +12856,7 @@ msgid "You have revoked the privileges for %s."
 msgstr ""
 
 #: libraries/server_privileges.lib.php:2059
-#: libraries/server_privileges.lib.php:4290
+#: libraries/server_privileges.lib.php:4316
 #, fuzzy
 #| msgid "Add %s"
 msgid "Add user account"
@@ -13011,56 +13027,56 @@ msgstr ""
 msgid "The privileges were reloaded successfully."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:3994
+#: libraries/server_privileges.lib.php:4003
 #, php-format
 msgid "The user %s already exists!"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4232
+#: libraries/server_privileges.lib.php:4258
 #, fuzzy, php-format
 #| msgid "Privileges"
 msgid "Privileges for %s"
 msgstr "ھۇقۇقى"
 
-#: libraries/server_privileges.lib.php:4241
+#: libraries/server_privileges.lib.php:4267
 #: libraries/server_status_processes.lib.php:72
 #: libraries/server_user_groups.lib.php:39
 msgid "User"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4282
+#: libraries/server_privileges.lib.php:4308
 msgctxt "Create new user"
 msgid "New"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4311
+#: libraries/server_privileges.lib.php:4337
 #, fuzzy
 #| msgid "Privileges"
 msgid "Edit privileges:"
 msgstr "ھۇقۇقى"
 
-#: libraries/server_privileges.lib.php:4312
+#: libraries/server_privileges.lib.php:4338
 msgid "User account"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4371
+#: libraries/server_privileges.lib.php:4397
 msgid ""
 "Note: You are attempting to edit privileges of the user with which you are "
 "currently logged in."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4391 libraries/server_users.lib.php:25
+#: libraries/server_privileges.lib.php:4417 libraries/server_users.lib.php:25
 msgid "User accounts overview"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4459
+#: libraries/server_privileges.lib.php:4485
 msgid ""
 "A user account allowing any user from localhost to connect is present. This "
 "will prevent other users from connecting if the host part of their account "
 "allows a connection from any (%) host."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4500
+#: libraries/server_privileges.lib.php:4526
 #, php-format
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
@@ -13069,7 +13085,7 @@ msgid ""
 "%sreload the privileges%s before you continue."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4519
+#: libraries/server_privileges.lib.php:4545
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
 "tables. The content of these tables may differ from the privileges the "
@@ -13078,63 +13094,63 @@ msgid ""
 "privilege."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4569
+#: libraries/server_privileges.lib.php:4595
 msgid "The selected user was not found in the privilege table."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4801
+#: libraries/server_privileges.lib.php:4827
 msgid "You have added a new user."
 msgstr ""
 
-#: libraries/server_status.lib.php:53
+#: libraries/server_status.lib.php:60
 #, php-format
 msgid "Network traffic since startup: %s"
 msgstr ""
 
-#: libraries/server_status.lib.php:66
+#: libraries/server_status.lib.php:73
 #, php-format
 msgid "This MySQL server has been running for %1$s. It started up on %2$s."
 msgstr ""
 
-#: libraries/server_status.lib.php:80
+#: libraries/server_status.lib.php:94
 msgid ""
 "This MySQL server works as <b>master</b> and <b>slave</b> in <b>replication</"
 "b> process."
 msgstr ""
 
-#: libraries/server_status.lib.php:85
+#: libraries/server_status.lib.php:99
 msgid "This MySQL server works as <b>master</b> in <b>replication</b> process."
 msgstr ""
 
-#: libraries/server_status.lib.php:90
+#: libraries/server_status.lib.php:104
 msgid "This MySQL server works as <b>slave</b> in <b>replication</b> process."
 msgstr ""
 
-#: libraries/server_status.lib.php:106
+#: libraries/server_status.lib.php:116
 msgid "Replication status"
 msgstr ""
 
-#: libraries/server_status.lib.php:137
+#: libraries/server_status.lib.php:146
 msgid ""
 "On a busy server, the byte counters may overrun, so those statistics as "
 "reported by the MySQL server may be incorrect."
 msgstr ""
 
-#: libraries/server_status.lib.php:148
+#: libraries/server_status.lib.php:157
 msgid "Received"
 msgstr ""
 
-#: libraries/server_status.lib.php:167
+#: libraries/server_status.lib.php:176
 msgid "Sent"
 msgstr ""
 
-#: libraries/server_status.lib.php:234
+#: libraries/server_status.lib.php:243
 #, fuzzy
 #| msgid "Format of imported file"
 msgid "Max. concurrent connections"
 msgstr "كىرگۈزگەن ھۆججەت شەكلى"
 
-#: libraries/server_status.lib.php:244
+#: libraries/server_status.lib.php:253
 msgid "Failed attempts"
 msgstr ""
 
@@ -14103,7 +14119,7 @@ msgstr ""
 msgid "Not implemented yet."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/AlterOperation.php:193
+#: libraries/sql-parser/src/Components/AlterOperation.php:191
 msgid "Unrecognized alter operation."
 msgstr ""
 
@@ -14117,7 +14133,7 @@ msgid "An opening bracket followed by a set of values was expected."
 msgstr ""
 
 #: libraries/sql-parser/src/Components/ArrayObj.php:101
-#: libraries/sql-parser/src/Components/FieldDefinition.php:202
+#: libraries/sql-parser/src/Components/CreateDefinition.php:202
 msgid "An opening bracket was expected."
 msgstr ""
 
@@ -14125,25 +14141,35 @@ msgstr ""
 msgid "A comma or a closing bracket was expected"
 msgstr ""
 
+#: libraries/sql-parser/src/Components/CreateDefinition.php:246
+#, fuzzy
+#| msgid "With selected:"
+msgid "A comma or a closing bracket was expected."
+msgstr "تاللانغىنى:"
+
+#: libraries/sql-parser/src/Components/CreateDefinition.php:262
+msgid "A closing bracket was expected."
+msgstr ""
+
 #: libraries/sql-parser/src/Components/DataType.php:125
 msgid "Unrecognized data type."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:225
+#: libraries/sql-parser/src/Components/Expression.php:227
 msgid "Unexpected closing bracket."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:246
-#: libraries/sql-parser/src/Components/Expression.php:283
-#: libraries/sql-parser/src/Components/Expression.php:303
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:285
+#: libraries/sql-parser/src/Components/Expression.php:305
 msgid "An alias was previously found."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:257
+#: libraries/sql-parser/src/Components/Expression.php:259
 msgid "Unexpected dot."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:327
+#: libraries/sql-parser/src/Components/Expression.php:329
 #, fuzzy
 #| msgid "With selected:"
 msgid "An alias was expected."
@@ -14155,16 +14181,6 @@ msgstr "تاللانغىنى:"
 msgid "An expression was expected."
 msgstr "تاللانغىنى:"
 
-#: libraries/sql-parser/src/Components/FieldDefinition.php:246
-#, fuzzy
-#| msgid "With selected:"
-msgid "A comma or a closing bracket was expected."
-msgstr "تاللانغىنى:"
-
-#: libraries/sql-parser/src/Components/FieldDefinition.php:262
-msgid "A closing bracket was expected."
-msgstr ""
-
 #: libraries/sql-parser/src/Components/Limit.php:90
 #: libraries/sql-parser/src/Components/Limit.php:112
 msgid "An offset was expected."
@@ -14206,27 +14222,27 @@ msgstr ""
 msgid "Expected delimiter."
 msgstr ""
 
-#: libraries/sql-parser/src/Lexer.php:753
+#: libraries/sql-parser/src/Lexer.php:777
 #, fuzzy, php-format
 #| msgid "Database %1$s has been created."
 msgid "Ending quote %1$s was expected."
 msgstr "%1$s ساندان غەلبىلىك قۇرۇلدى"
 
-#: libraries/sql-parser/src/Lexer.php:789
+#: libraries/sql-parser/src/Lexer.php:813
 msgid "Variable name was expected."
 msgstr ""
 
-#: libraries/sql-parser/src/Parser.php:380
+#: libraries/sql-parser/src/Parser.php:391
 #, fuzzy
 #| msgid "Show dimension of tables"
 msgid "Unexpected beginning of statement."
 msgstr "جەدېۋەلنىڭ چوڭ-كىچىكلىكىنى كۆرسىتىش"
 
-#: libraries/sql-parser/src/Parser.php:399
+#: libraries/sql-parser/src/Parser.php:410
 msgid "Unrecognized statement type."
 msgstr ""
 
-#: libraries/sql-parser/src/Parser.php:479
+#: libraries/sql-parser/src/Parser.php:489
 msgid "No transaction was previously started."
 msgstr ""
 
@@ -14252,8 +14268,10 @@ msgid "The name of the entity was expected."
 msgstr ""
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:310
-msgid "At least one field definition was expected."
-msgstr ""
+#, fuzzy
+#| msgid "The bookmark has been deleted."
+msgid "At least one column definition was expected."
+msgstr "خەتكۈچ ئۆچۈرۈلدى."
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:329
 msgid "A \"RETURNS\" keyword was expected."
@@ -14326,25 +14344,25 @@ msgstr "قۇرۇلغان خەتكۈچ %s"
 msgid "Using bookmark \"%s\" as default browse query."
 msgstr ""
 
-#: libraries/sql.lib.php:1306
+#: libraries/sql.lib.php:1300
 msgid "Showing as PHP code"
 msgstr ""
 
-#: libraries/sql.lib.php:1638
+#: libraries/sql.lib.php:1632
 #, php-format
 msgid ""
 "Current selection does not contain a unique column. Grid edit, checkbox, "
 "Edit, Copy and Delete features are not available. %s"
 msgstr ""
 
-#: libraries/sql.lib.php:1649
+#: libraries/sql.lib.php:1643
 #, php-format
 msgid ""
 "Current selection does not contain a unique column. Grid edit, Edit, Copy "
 "and Delete features may result in undesired behavior. %s"
 msgstr ""
 
-#: libraries/sql.lib.php:1688
+#: libraries/sql.lib.php:1682
 #, php-format
 msgid "Problems with indexes of table `%s`"
 msgstr ""
@@ -14510,7 +14528,7 @@ msgid "Version %s snapshot (SQL code)"
 msgstr ""
 
 #: libraries/tracking.lib.php:947
-#: templates/structure/table_structure_row.phtml:33
+#: templates/table/structure/table_structure_row.phtml:33
 msgctxt "None for default"
 msgid "None"
 msgstr ""
@@ -14565,19 +14583,19 @@ msgstr "نەشىرنى قۇىماق"
 msgid "Version %1$s was created, tracking for %2$s is active."
 msgstr ""
 
-#: libraries/user_preferences.inc.php:29
+#: libraries/user_preferences.inc.php:30
 #, fuzzy
 #| msgid "General relation features"
 msgid "Manage your settings"
 msgstr "ئاساسىي ئالاقە ۋاريانتلىرى"
 
-#: libraries/user_preferences.inc.php:46 prefs_manage.php:307
+#: libraries/user_preferences.inc.php:54 prefs_manage.php:307
 #, fuzzy
 #| msgid "Modifications have been saved"
 msgid "Configuration has been saved."
 msgstr "ئۆزگەرتىشلەر ساقلاندى"
 
-#: libraries/user_preferences.inc.php:66
+#: libraries/user_preferences.inc.php:74
 #, php-format
 msgid ""
 "Your preferences will be saved for current session only. Storing them "
@@ -14973,7 +14991,7 @@ msgid "first"
 msgstr ""
 
 #: templates/columns_definitions/move_column.phtml:12
-#: templates/structure/add_column.phtml:21
+#: templates/table/structure/add_column.phtml:21
 #, php-format
 msgid "after %s"
 msgstr ""
@@ -15036,237 +15054,341 @@ msgstr ""
 msgid "Input transformation options"
 msgstr "ئامال"
 
-#: templates/designer/aggregate_query_panel.phtml:22
-#: templates/designer/options_panel.phtml:100
+#: templates/database/create_table.phtml:7
+#: templates/database/designer/side_menu.phtml:77
+#: templates/database/designer/side_menu.phtml:80
+msgid "Create table"
+msgstr ""
+
+#: templates/database/create_table.phtml:15
+msgid "Number of columns"
+msgstr "سۆزلەم سانى"
+
+#: templates/database/designer/aggregate_query_panel.phtml:22
+#: templates/database/designer/options_panel.phtml:100
 #, fuzzy
 #| msgid "Create"
 msgid "Aggregate"
 msgstr "قۇرۇش"
 
-#: templates/designer/aggregate_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:61
-#: templates/designer/options_panel.phtml:106
-#: templates/designer/options_panel.phtml:170
-#: templates/designer/where_query_panel.phtml:30
-#: templates/table/table_header.phtml:9
+#: templates/database/designer/aggregate_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:61
+#: templates/database/designer/options_panel.phtml:106
+#: templates/database/designer/options_panel.phtml:170
+#: templates/database/designer/where_query_panel.phtml:30
+#: templates/table/search/table_header.phtml:9
 msgid "Operator"
 msgstr ""
 
-#: templates/designer/database_tables.phtml:29
+#: templates/database/designer/database_tables.phtml:29
 msgid "Toggle"
 msgstr ""
 
-#: templates/designer/database_tables.phtml:40
+#: templates/database/designer/database_tables.phtml:40
 #, fuzzy
 #| msgid "Databases"
 msgid "See table structure"
 msgstr "ساندان"
 
-#: templates/designer/delete_relation_panel.phtml:21
+#: templates/database/designer/delete_relation_panel.phtml:21
 msgid "Delete relation"
 msgstr ""
 
-#: templates/designer/edit_delete_pages.phtml:7
+#: templates/database/designer/edit_delete_pages.phtml:7
 #, fuzzy
 #| msgid "Create"
 msgid "Page to open"
 msgstr "قۇرۇش"
 
-#: templates/designer/edit_delete_pages.phtml:7
+#: templates/database/designer/edit_delete_pages.phtml:7
 #, fuzzy
 #| msgid "Relation deleted"
 msgid "Page to delete"
 msgstr ".باغلانمىلار ئۆچۈرۈلدى"
 
-#: templates/designer/having_query_panel.phtml:90
-#: templates/designer/options_panel.phtml:63
-#: templates/designer/options_panel.phtml:229
-#: templates/designer/where_query_panel.phtml:59
+#: templates/database/designer/having_query_panel.phtml:90
+#: templates/database/designer/options_panel.phtml:63
+#: templates/database/designer/options_panel.phtml:229
+#: templates/database/designer/where_query_panel.phtml:59
 #, fuzzy
 #| msgid "Export"
 msgid "Except"
 msgstr "چىقىرىش"
 
-#: templates/designer/having_query_panel.phtml:102
-#: templates/designer/options_panel.phtml:75
-#: templates/designer/options_panel.phtml:241
-#: templates/designer/where_query_panel.phtml:71
+#: templates/database/designer/having_query_panel.phtml:102
+#: templates/database/designer/options_panel.phtml:75
+#: templates/database/designer/options_panel.phtml:241
+#: templates/database/designer/where_query_panel.phtml:71
 #, fuzzy
 #| msgid "Query"
 msgid "subquery"
 msgstr "تەكشۈرۈش"
 
-#: templates/designer/new_relation_panel.phtml:22
-#: templates/designer/side_menu.phtml:84 templates/designer/side_menu.phtml:87
+#: templates/database/designer/new_relation_panel.phtml:22
+#: templates/database/designer/side_menu.phtml:84
+#: templates/database/designer/side_menu.phtml:87
 msgid "Create relation"
 msgstr ""
 
-#: templates/designer/options_panel.phtml:34
-#: templates/designer/options_panel.phtml:200
+#: templates/database/designer/options_panel.phtml:34
+#: templates/database/designer/options_panel.phtml:200
 #, fuzzy
 #| msgid "Relation deleted"
 msgid "Relation operator"
 msgstr ".باغلانمىلار ئۆچۈرۈلدى"
 
-#: templates/designer/options_panel.phtml:85
-#: templates/designer/rename_to_panel.phtml:23
+#: templates/database/designer/options_panel.phtml:85
+#: templates/database/designer/rename_to_panel.phtml:23
 #, fuzzy
 #| msgid "Rename database to"
 msgid "Rename to"
 msgstr "ئۆزگەرتىلگەن ساندان ئىسمى"
 
-#: templates/designer/options_panel.phtml:91
-#: templates/designer/rename_to_panel.phtml:31
+#: templates/database/designer/options_panel.phtml:91
+#: templates/database/designer/rename_to_panel.phtml:31
 #, fuzzy
 #| msgid "Keyname"
 msgid "New name"
 msgstr "قىممەت ئىسمى"
 
-#: templates/designer/page_save_as.phtml:4
+#: templates/database/designer/page_save_as.phtml:4
 #, fuzzy
 #| msgid "Invalid table name"
 msgid "Save to selected page"
 msgstr "ئۈنۈمسىز جەدۋەل ئىسمى"
 
-#: templates/designer/page_save_as.phtml:5
+#: templates/database/designer/page_save_as.phtml:5
 msgid "Create a page and save to it"
 msgstr ""
 
-#: templates/designer/page_save_as.phtml:26
+#: templates/database/designer/page_save_as.phtml:26
 #, fuzzy
 #| msgid "Keyname"
 msgid "New page name"
 msgstr "قىممەت ئىسمى"
 
-#: templates/designer/page_selector.phtml:2
+#: templates/database/designer/page_selector.phtml:2
 #, fuzzy
 #| msgid "Select All"
 msgid "Select page"
 msgstr "ھەممىنى تاللاش"
 
-#: templates/designer/query_details.phtml:10
+#: templates/database/designer/query_details.phtml:10
 #, fuzzy
 #| msgid "Action"
 msgid "Active options"
 msgstr "ئامال"
 
-#: templates/designer/schema_export.phtml:4
+#: templates/database/designer/schema_export.phtml:4
 msgid "Select Export Relational Type"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:19 templates/designer/side_menu.phtml:25
+#: templates/database/designer/side_menu.phtml:19
+#: templates/database/designer/side_menu.phtml:25
 #, fuzzy
 #| msgid "Show dimension of tables"
 msgid "Show/Hide tables list"
 msgstr "جەدېۋەلنىڭ چوڭ-كىچىكلىكىنى كۆرسىتىش"
 
-#: templates/designer/side_menu.phtml:29 templates/designer/side_menu.phtml:35
-#: templates/designer/side_menu.phtml:36
+#: templates/database/designer/side_menu.phtml:29
+#: templates/database/designer/side_menu.phtml:35
+#: templates/database/designer/side_menu.phtml:36
 msgid "View in fullscreen"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:34
+#: templates/database/designer/side_menu.phtml:34
 msgid "Exit fullscreen"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:41 templates/designer/side_menu.phtml:45
+#: templates/database/designer/side_menu.phtml:41
+#: templates/database/designer/side_menu.phtml:45
 #, fuzzy
 #| msgid "Keyname"
 msgid "New page"
 msgstr "قىممەت ئىسمى"
 
-#: templates/designer/side_menu.phtml:70 templates/designer/side_menu.phtml:73
+#: templates/database/designer/side_menu.phtml:70
+#: templates/database/designer/side_menu.phtml:73
 #, fuzzy
 #| msgid "Select All"
 msgid "Delete pages"
 msgstr "ھەممىنى تاللاش"
 
-#: templates/designer/side_menu.phtml:77 templates/designer/side_menu.phtml:80
-#: templates/table/create_table.phtml:7
-msgid "Create table"
-msgstr ""
-
-#: templates/designer/side_menu.phtml:98
-#: templates/designer/side_menu.phtml:101
+#: templates/database/designer/side_menu.phtml:98
+#: templates/database/designer/side_menu.phtml:101
 msgid "Reload"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:107
-#: templates/designer/side_menu.phtml:110
+#: templates/database/designer/side_menu.phtml:107
+#: templates/database/designer/side_menu.phtml:110
 msgid "Help"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Angular links"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Direct links"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:122
-#: templates/designer/side_menu.phtml:124
+#: templates/database/designer/side_menu.phtml:122
+#: templates/database/designer/side_menu.phtml:124
 msgid "Snap to grid"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:128
-#: templates/designer/side_menu.phtml:134
+#: templates/database/designer/side_menu.phtml:128
+#: templates/database/designer/side_menu.phtml:134
 msgid "Small/Big All"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:138
-#: templates/designer/side_menu.phtml:141
+#: templates/database/designer/side_menu.phtml:138
+#: templates/database/designer/side_menu.phtml:141
 msgid "Toggle small/big"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:145
-#: templates/designer/side_menu.phtml:148
+#: templates/database/designer/side_menu.phtml:145
+#: templates/database/designer/side_menu.phtml:148
 msgid "Toggle relation lines"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:153
-#: templates/designer/side_menu.phtml:156
+#: templates/database/designer/side_menu.phtml:153
+#: templates/database/designer/side_menu.phtml:156
 #, fuzzy
 #| msgid "Export"
 msgid "Export schema"
 msgstr "چىقىرىش"
 
-#: templates/designer/side_menu.phtml:165
-#: templates/designer/side_menu.phtml:168
+#: templates/database/designer/side_menu.phtml:165
+#: templates/database/designer/side_menu.phtml:168
 #, fuzzy
 #| msgid "Submit Query"
 msgid "Build Query"
 msgstr "تاپشۇرۇش"
 
-#: templates/designer/side_menu.phtml:173
-#: templates/designer/side_menu.phtml:177
+#: templates/database/designer/side_menu.phtml:173
+#: templates/database/designer/side_menu.phtml:177
 msgid "Move Menu"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:181
-#: templates/designer/side_menu.phtml:186
+#: templates/database/designer/side_menu.phtml:181
+#: templates/database/designer/side_menu.phtml:186
 #, fuzzy
 #| msgid "Partial import"
 msgid "Pin text"
 msgstr "بۆلۈپ كىرگۈزىش"
 
-#: templates/designer/table_list.phtml:4
+#: templates/database/designer/table_list.phtml:4
 msgid "Hide/Show all"
 msgstr ""
 
-#: templates/designer/table_list.phtml:14
+#: templates/database/designer/table_list.phtml:14
 msgid "Hide/Show Tables with no relation"
 msgstr ""
 
-#: templates/designer/table_list.phtml:59
+#: templates/database/designer/table_list.phtml:59
 #, fuzzy
 #| msgid "Number of columns"
 msgid "Number of tables:"
 msgstr "سۆزلەم سانى"
 
+#: templates/database/structure/body_for_table_summary.phtml:6
+#, php-format
+msgid "%s table"
+msgid_plural "%s tables"
+msgstr[0] "%s جەدۋەل"
+
+#: templates/database/structure/body_for_table_summary.phtml:17
+msgid "Sum"
+msgstr "جەمئىي"
+
+#: templates/database/structure/check_all_tables.phtml:6
+msgid "Check tables having overhead"
+msgstr "مەزمۇن بارلارنى تاللاش"
+
+#: templates/database/structure/check_all_tables.phtml:10
+#, fuzzy
+#| msgid "Show color"
+msgid "Show create"
+msgstr "رەڭنى كۆرسىتىش"
+
+#: templates/database/structure/check_all_tables.phtml:27
+msgid "Prefix"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:28
+msgid "Add prefix to table"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:29
+#, fuzzy
+#| msgid "Repair table"
+msgid "Replace table prefix"
+msgstr "جەدۋەلنى ئوڭشاش"
+
+#: templates/database/structure/check_all_tables.phtml:30
+msgid "Copy table with prefix"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:36
+#, fuzzy
+#| msgid "Add/Delete columns"
+msgid "Add columns to central list"
+msgstr "سۆزلەم قوشۇش\\ئۆچۈرۈش"
+
+#: templates/database/structure/check_all_tables.phtml:37
+msgid "Remove columns from central list"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:38
+#, fuzzy
+#| msgid "Add/Delete columns"
+msgid "Make consistent with central list"
+msgstr "سۆزلەم قوشۇش\\ئۆچۈرۈش"
+
+#: templates/database/structure/favorite_anchor.phtml:12
+#, fuzzy
+#| msgid "Routines"
+msgid "Add to Favorites"
+msgstr "دائىملىق"
+
+#: templates/database/structure/show_create.phtml:2
+msgid "Showing create queries"
+msgstr ""
+
+#: templates/database/structure/sortable_header.phtml:13
+msgid "Sort"
+msgstr "تۈرلەش"
+
+#: templates/database/structure/table_header.phtml:42
+#, fuzzy
+#| msgid "May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]"
+msgid ""
+"May be approximate. Click on the number to get the exact count. See "
+"[doc@faq3-11]FAQ 3.11[/doc]."
+msgstr "ئېنىقسىزلىك بولۇشى مۇمكىن. [doc@faq3-11]FAQ 3.11[/doc] غا قاراڭ."
+
+#: templates/database/structure/table_header.phtml:66
+#: templates/table/index_form.phtml:127
+msgid "Size"
+msgstr "ھەجىم"
+
+#: templates/database/structure/table_header.phtml:74
+#: templates/table/structure/display_table_stats.phtml:27
+msgid "Overhead"
+msgstr "ئېغىر يۈك"
+
+#: templates/database/structure/tracking_icon.phtml:4
+msgid "Tracking is active."
+msgstr "ئاكتىپ ئىزلاش."
+
+#: templates/database/structure/tracking_icon.phtml:8
+msgid "Tracking is not active."
+msgstr "ئىزلاش ئاكتىپ ئەمەس."
+
 #: templates/error/report_form.phtml:7
 msgid ""
 "phpMyAdmin has encountered an error. We have collected data about this error "
@@ -15282,69 +15404,6 @@ msgstr ""
 msgid "Please explain the steps that lead to the error:"
 msgstr ""
 
-#: templates/gis_visualization/gis_visualization.phtml:3
-msgid "Display GIS Visualization"
-msgstr ""
-
-#: templates/gis_visualization/gis_visualization.phtml:8
-#, fuzzy
-#| msgid "Add/Delete columns"
-msgid "Label column"
-msgstr "سۆزلەم قوشۇش\\ئۆچۈرۈش"
-
-#: templates/gis_visualization/gis_visualization.phtml:11
-msgid "-- None --"
-msgstr ""
-
-#: templates/gis_visualization/gis_visualization.phtml:19
-#, fuzzy
-#| msgid "Log file count"
-msgid "Spatial column"
-msgstr "كۈندىلىك ھۆججەت ئۇمۇمىي سانى"
-
-#: templates/index_form.phtml:16
-msgid "Index name:"
-msgstr ""
-
-#: templates/index_form.phtml:19
-msgid ""
-"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
-msgstr ""
-
-#: templates/index_form.phtml:40
-#, fuzzy
-#| msgid "Indexes"
-msgid "Index choice:"
-msgstr "تېزىسلار"
-
-#: templates/index_form.phtml:57
-msgid "Key block size:"
-msgstr ""
-
-#: templates/index_form.phtml:74
-msgid "Index type:"
-msgstr ""
-
-#: templates/index_form.phtml:86
-#, fuzzy
-#| msgid "Username:"
-msgid "Parser:"
-msgstr "ئابۇنىت ئىسمى:"
-
-#: templates/index_form.phtml:102
-#, fuzzy
-#| msgid "Comment"
-msgid "Comment:"
-msgstr "ئىزاھات"
-
-#: templates/index_form.phtml:127 templates/structure/table_header.phtml:66
-msgid "Size"
-msgstr "ھەجىم"
-
-#: templates/index_form.phtml:149 templates/index_form.phtml:190
-msgid "Drag to reorder"
-msgstr ""
-
 #: templates/prefs_autoload.phtml:9
 msgid ""
 "Your browser has phpMyAdmin configuration for this domain. Would you like to "
@@ -15357,479 +15416,445 @@ msgstr ""
 msgid "Start row:"
 msgstr "تۈرلەش"
 
-#: templates/structure/actions_in_table_structure.phtml:14
-#, php-format
-msgid "A primary key has been added on %s."
-msgstr ""
-
-#: templates/structure/actions_in_table_structure.phtml:34
-#: templates/structure/actions_in_table_structure.phtml:54
-#: templates/structure/actions_in_table_structure.phtml:79
-#: templates/structure/actions_in_table_structure.phtml:101
-#, php-format
-msgid "An index has been added on %s."
-msgstr ""
-
-#: templates/structure/actions_in_table_structure.phtml:130
-#: templates/structure/check_all_table_column.phtml:59
-#, fuzzy
-#| msgid "Remove database"
-msgid "Remove from central columns"
-msgstr "ئۆزگەرتىلگەن ساندان ئىسمى"
-
-#: templates/structure/actions_in_table_structure.phtml:138
-#: templates/structure/check_all_table_column.phtml:55
-#, fuzzy
-#| msgid "Add/Delete columns"
-msgid "Add to central columns"
-msgstr "سۆزلەم قوشۇش\\ئۆچۈرۈش"
-
-#: templates/structure/add_column.phtml:7
-#, php-format
-msgid "Add %s column(s)"
-msgstr ""
-
-#: templates/structure/add_column.phtml:12
-#, fuzzy
-#| msgid "Show dimension of tables"
-msgid "at beginning of table"
-msgstr "جەدېۋەلنىڭ چوڭ-كىچىكلىكىنى كۆرسىتىش"
-
-#: templates/structure/body_for_table_summary.phtml:6
-#, php-format
-msgid "%s table"
-msgid_plural "%s tables"
-msgstr[0] "%s جەدۋەل"
-
-#: templates/structure/body_for_table_summary.phtml:17
-msgid "Sum"
-msgstr "جەمئىي"
-
-#: templates/structure/check_all_tables.phtml:6
-msgid "Check tables having overhead"
-msgstr "مەزمۇن بارلارنى تاللاش"
-
-#: templates/structure/check_all_tables.phtml:10
-#, fuzzy
-#| msgid "Show color"
-msgid "Show create"
-msgstr "رەڭنى كۆرسىتىش"
-
-#: templates/structure/check_all_tables.phtml:27
-msgid "Prefix"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:28
-msgid "Add prefix to table"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:29
-#, fuzzy
-#| msgid "Repair table"
-msgid "Replace table prefix"
-msgstr "جەدۋەلنى ئوڭشاش"
-
-#: templates/structure/check_all_tables.phtml:30
-msgid "Copy table with prefix"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:36
-#, fuzzy
-#| msgid "Add/Delete columns"
-msgid "Add columns to central list"
-msgstr "سۆزلەم قوشۇش\\ئۆچۈرۈش"
-
-#: templates/structure/check_all_tables.phtml:37
-msgid "Remove columns from central list"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:38
-#, fuzzy
-#| msgid "Add/Delete columns"
-msgid "Make consistent with central list"
-msgstr "سۆزلەم قوشۇش\\ئۆچۈرۈش"
-
-#: templates/structure/display_structure.phtml:140 view_create.php:181
-#, fuzzy
-#| msgid "Print view"
-msgid "Edit view"
-msgstr "بېسىپ كۆرسىتىش"
-
-#: templates/structure/display_table_stats.phtml:9
-msgid "Space usage"
-msgstr ""
-
-#: templates/structure/display_table_stats.phtml:27
-#: templates/structure/table_header.phtml:74
-msgid "Overhead"
-msgstr "ئېغىر يۈك"
-
-#: templates/structure/display_table_stats.phtml:32
-msgid "Effective"
-msgstr ""
-
-#: templates/structure/favorite_anchor.phtml:12
-#, fuzzy
-#| msgid "Routines"
-msgid "Add to Favorites"
-msgstr "دائىملىق"
-
-#: templates/structure/move_columns_dialog.phtml:1
-#: templates/structure/optional_action_links.phtml:21
-#, fuzzy
-#| msgid "Add/Delete columns"
-msgid "Move columns"
-msgstr "سۆزلەم قوشۇش\\ئۆچۈرۈش"
-
-#: templates/structure/move_columns_dialog.phtml:2
-msgid "Move the columns by dragging them up and down."
-msgstr ""
-
-#: templates/structure/optional_action_links.phtml:9
-msgid "Propose table structure"
-msgstr ""
-
-#: templates/structure/optional_action_links.phtml:24
-#, fuzzy
-#| msgid "Databases"
-msgid "Improve table structure"
-msgstr "ساندان"
-
-#: templates/structure/optional_action_links.phtml:30
-#, fuzzy
-#| msgid "Track table"
-msgid "Track view"
-msgstr "جەدۋەل ئىزلاش"
-
-#: templates/structure/row_stats_table.phtml:3
-msgid "Row statistics"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:9
-msgid "static"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:11
-msgid "dynamic"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:22
-msgid "partitioned"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:54
-msgid "Row length"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:66
-msgid "Row size"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:73
-msgid "Next autoindex"
-msgstr ""
-
-#: templates/structure/secondary_tabs.phtml:14
-#, fuzzy
-#| msgid "Relations"
-msgid "Relation view"
-msgstr "مۇناسىۋىتى"
-
-#: templates/structure/show_create.phtml:2
-msgid "Showing create queries"
-msgstr ""
-
-#: templates/structure/sortable_header.phtml:13
-msgid "Sort"
-msgstr "تۈرلەش"
-
-#: templates/structure/table_header.phtml:42
-#, fuzzy
-#| msgid "May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]"
-msgid ""
-"May be approximate. Click on the number to get the exact count. See "
-"[doc@faq3-11]FAQ 3.11[/doc]."
-msgstr "ئېنىقسىزلىك بولۇشى مۇمكىن. [doc@faq3-11]FAQ 3.11[/doc] غا قاراڭ."
-
-#: templates/structure/table_structure_row.phtml:46
-#, php-format
-msgid "Column %s has been dropped."
-msgstr ""
-
-#: templates/structure/tracking_icon.phtml:4
-msgid "Tracking is active."
-msgstr "ئاكتىپ ئىزلاش."
-
-#: templates/structure/tracking_icon.phtml:8
-msgid "Tracking is not active."
-msgstr "ئىزلاش ئاكتىپ ئەمەس."
-
-#: templates/table/create_table.phtml:15
-msgid "Number of columns"
-msgstr "سۆزلەم سانى"
-
-#: templates/table/options.phtml:8
-msgid "Select columns (at least one):"
-msgstr ""
-
-#: templates/table/options.phtml:37
-msgid "Add search conditions (body of the \"where\" clause):"
-msgstr ""
-
-#: templates/table/options.phtml:45
-msgid "Number of rows per page"
-msgstr ""
-
-#: templates/table/options.phtml:56
-msgid "Display order:"
-msgstr ""
-
-#: templates/table/options_zoom.phtml:6
-msgid "Use this column to label each point"
-msgstr ""
-
-#: templates/table/options_zoom.phtml:35
-msgid "Maximum rows to plot"
-msgstr ""
-
-#: templates/table/replace_preview.phtml:13
-msgid "Find and replace - preview"
-msgstr ""
-
-#: templates/table/replace_preview.phtml:18
-#, fuzzy
-#| msgid "Lines terminated by"
-msgid "Original string"
-msgstr "قۇر ئالماشۇرۇش بەلگىسى"
-
-#: templates/table/replace_preview.phtml:19
-#, fuzzy
-#| msgid "Relations"
-msgid "Replaced string"
-msgstr "مۇناسىۋىتى"
-
-#: templates/table/replace_preview.phtml:40
-#, fuzzy
-#| msgid "Replace NULL by"
-msgid "Replace"
-msgstr "نى ئالماشتۇرۇش ئۈچۈنNULL"
-
-#: templates/table/rows_zoom.phtml:16
-#, fuzzy
-#| msgid "SQL query"
-msgid "Additional search criteria"
-msgstr "SQL سورىقى"
-
-#: templates/table/search_and_replace.phtml:3
-#, fuzzy
-#| msgid "Replace NULL by"
-msgid "Replace with:"
-msgstr "نى ئالماشتۇرۇش ئۈچۈنNULL "
-
-#: templates/table/search_and_replace.phtml:22
-#, fuzzy
-#| msgid "as regular expression"
-msgid "Use regular expression"
-msgstr "مۇنتىزىم ئىپادە"
-
-#: templates/table/selection_form.phtml:12
-msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
-msgstr ""
-
-#: templates/table/selection_form.phtml:34
-msgid "Do a \"query by example\" (wildcard: \"%\")"
-msgstr ""
-
-#: templates/table/zoom_result_form.phtml:7
-msgid "Browse/Edit the points"
-msgstr ""
-
-#: templates/table/zoom_result_form.phtml:15
-msgid "How to use"
-msgstr ""
-
-#: templates/table/zoom_result_form.phtml:23
-msgid "Reset zoom"
-msgstr ""
-
-#: templates/tbl_chart.phtml:17
+#: templates/table/chart/tbl_chart.phtml:17
 #, fuzzy
 #| msgid "Mar"
 msgctxt "Chart type"
 msgid "Bar"
 msgstr "3-ئاي"
 
-#: templates/tbl_chart.phtml:21
+#: templates/table/chart/tbl_chart.phtml:21
 #, fuzzy
 #| msgid "Column"
 msgctxt "Chart type"
 msgid "Column"
 msgstr "سۆزلەم"
 
-#: templates/tbl_chart.phtml:25
+#: templates/table/chart/tbl_chart.phtml:25
 msgctxt "Chart type"
 msgid "Line"
 msgstr ""
 
-#: templates/tbl_chart.phtml:29
+#: templates/table/chart/tbl_chart.phtml:29
 #, fuzzy
 #| msgid "Inline"
 msgctxt "Chart type"
 msgid "Spline"
 msgstr "ئىچكى بىرلىشىش"
 
-#: templates/tbl_chart.phtml:33
+#: templates/table/chart/tbl_chart.phtml:33
 msgctxt "Chart type"
 msgid "Area"
 msgstr ""
 
-#: templates/tbl_chart.phtml:37
+#: templates/table/chart/tbl_chart.phtml:37
 #, fuzzy
 #| msgid "PiB"
 msgctxt "Chart type"
 msgid "Pie"
 msgstr "PiB"
 
-#: templates/tbl_chart.phtml:41
+#: templates/table/chart/tbl_chart.phtml:41
 #, fuzzy
 #| msgid "Time"
 msgctxt "Chart type"
 msgid "Timeline"
 msgstr "ۋاقىت"
 
-#: templates/tbl_chart.phtml:45
+#: templates/table/chart/tbl_chart.phtml:45
 msgctxt "Chart type"
 msgid "Scatter"
 msgstr ""
 
-#: templates/tbl_chart.phtml:50
+#: templates/table/chart/tbl_chart.phtml:50
 #, fuzzy
 #| msgid "Packed"
 msgid "Stacked"
 msgstr "ئىخچام"
 
-#: templates/tbl_chart.phtml:53
+#: templates/table/chart/tbl_chart.phtml:53
 #, fuzzy
 #| msgid "Report title"
 msgid "Chart title"
 msgstr "دوكلات تېمىسى"
 
-#: templates/tbl_chart.phtml:57
+#: templates/table/chart/tbl_chart.phtml:57
 msgid "X-Axis:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:72
+#: templates/table/chart/tbl_chart.phtml:72
 msgid "Series:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:102
+#: templates/table/chart/tbl_chart.phtml:102
 msgid "X-Axis label:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:104
+#: templates/table/chart/tbl_chart.phtml:104
 msgid "X Values"
 msgstr ""
 
-#: templates/tbl_chart.phtml:107
+#: templates/table/chart/tbl_chart.phtml:107
 msgid "Y-Axis label:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:115
+#: templates/table/chart/tbl_chart.phtml:115
 msgid "Series names are in a column"
 msgstr ""
 
-#: templates/tbl_chart.phtml:118
+#: templates/table/chart/tbl_chart.phtml:118
 #, fuzzy
 #| msgid "Inside column:"
 msgid "Series column:"
 msgstr "ئىچىدىكى سۆزلەم:"
 
-#: templates/tbl_chart.phtml:130
+#: templates/table/chart/tbl_chart.phtml:130
 #, fuzzy
 #| msgid "Number of columns"
 msgid "Value Column:"
 msgstr "سۆزلەم سانى"
 
-#: templates/tbl_chart.phtml:150
+#: templates/table/chart/tbl_chart.phtml:150
 #, fuzzy
 #| msgid "Save as file"
 msgid "Save chart as image"
 msgstr "ھۆججەتنى باشقا ساقلاش"
 
-#: templates/tbl_relation/common_form.phtml:7
+#: templates/table/gis_visualization/gis_visualization.phtml:3
+msgid "Display GIS Visualization"
+msgstr ""
+
+#: templates/table/gis_visualization/gis_visualization.phtml:8
+#, fuzzy
+#| msgid "Add/Delete columns"
+msgid "Label column"
+msgstr "سۆزلەم قوشۇش\\ئۆچۈرۈش"
+
+#: templates/table/gis_visualization/gis_visualization.phtml:11
+msgid "-- None --"
+msgstr ""
+
+#: templates/table/gis_visualization/gis_visualization.phtml:19
+#, fuzzy
+#| msgid "Log file count"
+msgid "Spatial column"
+msgstr "كۈندىلىك ھۆججەت ئۇمۇمىي سانى"
+
+#: templates/table/index_form.phtml:16
+msgid "Index name:"
+msgstr ""
+
+#: templates/table/index_form.phtml:19
+msgid ""
+"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
+msgstr ""
+
+#: templates/table/index_form.phtml:40
+#, fuzzy
+#| msgid "Indexes"
+msgid "Index choice:"
+msgstr "تېزىسلار"
+
+#: templates/table/index_form.phtml:57
+msgid "Key block size:"
+msgstr ""
+
+#: templates/table/index_form.phtml:74
+msgid "Index type:"
+msgstr ""
+
+#: templates/table/index_form.phtml:86
+#, fuzzy
+#| msgid "Username:"
+msgid "Parser:"
+msgstr "ئابۇنىت ئىسمى:"
+
+#: templates/table/index_form.phtml:102
+#, fuzzy
+#| msgid "Comment"
+msgid "Comment:"
+msgstr "ئىزاھات"
+
+#: templates/table/index_form.phtml:149 templates/table/index_form.phtml:190
+msgid "Drag to reorder"
+msgstr ""
+
+#: templates/table/relation/common_form.phtml:7
 #, fuzzy
 #| msgid "Internal relation added"
 msgid "Internal relations"
 msgstr ".ئىچكى ئۇلىنىش مۇاسىۋىتى قۇشۇلدى"
 
-#: templates/tbl_relation/common_form.phtml:11
+#: templates/table/relation/common_form.phtml:11
 msgid "Internal relation"
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:14
+#: templates/table/relation/common_form.phtml:14
 msgid ""
 "An internal relation is not necessary when a corresponding FOREIGN KEY "
 "relation exists."
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:37
+#: templates/table/relation/common_form.phtml:37
 #, fuzzy
 #| msgid "Add constraints"
 msgid "Foreign key constraints"
 msgstr "مەجبۇرى قوشۇش"
 
-#: templates/tbl_relation/common_form.phtml:40
+#: templates/table/relation/common_form.phtml:40
 #, fuzzy
 #| msgid "Action"
 msgid "Actions"
 msgstr "ئامال"
 
-#: templates/tbl_relation/common_form.phtml:41
+#: templates/table/relation/common_form.phtml:41
 #, fuzzy
 #| msgid "Routines"
 msgid "Constraint properties"
 msgstr "دائىملىق"
 
-#: templates/tbl_relation/common_form.phtml:44
+#: templates/table/relation/common_form.phtml:44
 msgid ""
 "Only columns with index will be displayed. You can define an index below."
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:49
+#: templates/table/relation/common_form.phtml:49
 msgid "Foreign key constraint"
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:81
+#: templates/table/relation/common_form.phtml:81
 #, fuzzy
 #| msgid "Add constraints"
 msgid "+ Add constraint"
 msgstr "مەجبۇرى قوشۇش"
 
 # column نى سۆزلەم دەپ ئالساق مۇۋاپىق بولغىدەك
-#: templates/tbl_relation/common_form.phtml:91
+#: templates/table/relation/common_form.phtml:91
 #, fuzzy
 #| msgid "Choose column to display"
 msgid "Choose column to display:"
 msgstr "سۆزلەمنى كۆرسەتمەسلىك"
 
-#: templates/tbl_relation/foreign_key_row.phtml:13
+#: templates/table/relation/foreign_key_row.phtml:13
 #, fuzzy, php-format
 #| msgid "Add constraints"
 msgid "Foreign key constraint %s has been dropped"
 msgstr "مەجبۇرى قوشۇش"
 
-#: templates/tbl_relation/foreign_key_row.phtml:102
+#: templates/table/relation/foreign_key_row.phtml:102
 #, fuzzy
 #| msgid "Routines"
 msgid "Constraint name"
 msgstr "دائىملىق"
 
-#: templates/tbl_relation/foreign_key_row.phtml:157
+#: templates/table/relation/foreign_key_row.phtml:157
 #, fuzzy
 #| msgid "Add/Delete columns"
 msgid "+ Add column"
 msgstr "سۆزلەم قوشۇش\\ئۆچۈرۈش"
 
+#: templates/table/search/options.phtml:8
+msgid "Select columns (at least one):"
+msgstr ""
+
+#: templates/table/search/options.phtml:37
+msgid "Add search conditions (body of the \"where\" clause):"
+msgstr ""
+
+#: templates/table/search/options.phtml:45
+msgid "Number of rows per page"
+msgstr ""
+
+#: templates/table/search/options.phtml:56
+msgid "Display order:"
+msgstr ""
+
+#: templates/table/search/options_zoom.phtml:6
+msgid "Use this column to label each point"
+msgstr ""
+
+#: templates/table/search/options_zoom.phtml:35
+msgid "Maximum rows to plot"
+msgstr ""
+
+#: templates/table/search/replace_preview.phtml:13
+msgid "Find and replace - preview"
+msgstr ""
+
+#: templates/table/search/replace_preview.phtml:18
+#, fuzzy
+#| msgid "Lines terminated by"
+msgid "Original string"
+msgstr "قۇر ئالماشۇرۇش بەلگىسى"
+
+#: templates/table/search/replace_preview.phtml:19
+#, fuzzy
+#| msgid "Relations"
+msgid "Replaced string"
+msgstr "مۇناسىۋىتى"
+
+#: templates/table/search/replace_preview.phtml:40
+#, fuzzy
+#| msgid "Replace NULL by"
+msgid "Replace"
+msgstr "نى ئالماشتۇرۇش ئۈچۈنNULL"
+
+#: templates/table/search/rows_zoom.phtml:16
+#, fuzzy
+#| msgid "SQL query"
+msgid "Additional search criteria"
+msgstr "SQL سورىقى"
+
+#: templates/table/search/search_and_replace.phtml:3
+#, fuzzy
+#| msgid "Replace NULL by"
+msgid "Replace with:"
+msgstr "نى ئالماشتۇرۇش ئۈچۈنNULL "
+
+#: templates/table/search/search_and_replace.phtml:22
+#, fuzzy
+#| msgid "as regular expression"
+msgid "Use regular expression"
+msgstr "مۇنتىزىم ئىپادە"
+
+#: templates/table/search/selection_form.phtml:12
+msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
+msgstr ""
+
+#: templates/table/search/selection_form.phtml:34
+msgid "Do a \"query by example\" (wildcard: \"%\")"
+msgstr ""
+
+#: templates/table/search/zoom_result_form.phtml:7
+msgid "Browse/Edit the points"
+msgstr ""
+
+#: templates/table/search/zoom_result_form.phtml:15
+msgid "How to use"
+msgstr ""
+
+#: templates/table/search/zoom_result_form.phtml:23
+msgid "Reset zoom"
+msgstr ""
+
+#: templates/table/secondary_tabs.phtml:14
+#, fuzzy
+#| msgid "Relations"
+msgid "Relation view"
+msgstr "مۇناسىۋىتى"
+
+#: templates/table/structure/actions_in_table_structure.phtml:14
+#, php-format
+msgid "A primary key has been added on %s."
+msgstr ""
+
+#: templates/table/structure/actions_in_table_structure.phtml:34
+#: templates/table/structure/actions_in_table_structure.phtml:54
+#: templates/table/structure/actions_in_table_structure.phtml:79
+#: templates/table/structure/actions_in_table_structure.phtml:101
+#, php-format
+msgid "An index has been added on %s."
+msgstr ""
+
+#: templates/table/structure/actions_in_table_structure.phtml:130
+#: templates/table/structure/check_all_table_column.phtml:59
+#, fuzzy
+#| msgid "Remove database"
+msgid "Remove from central columns"
+msgstr "ئۆزگەرتىلگەن ساندان ئىسمى"
+
+#: templates/table/structure/actions_in_table_structure.phtml:138
+#: templates/table/structure/check_all_table_column.phtml:55
+#, fuzzy
+#| msgid "Add/Delete columns"
+msgid "Add to central columns"
+msgstr "سۆزلەم قوشۇش\\ئۆچۈرۈش"
+
+#: templates/table/structure/add_column.phtml:7
+#, php-format
+msgid "Add %s column(s)"
+msgstr ""
+
+#: templates/table/structure/add_column.phtml:12
+#, fuzzy
+#| msgid "Show dimension of tables"
+msgid "at beginning of table"
+msgstr "جەدېۋەلنىڭ چوڭ-كىچىكلىكىنى كۆرسىتىش"
+
+#: templates/table/structure/display_structure.phtml:140 view_create.php:181
+#, fuzzy
+#| msgid "Print view"
+msgid "Edit view"
+msgstr "بېسىپ كۆرسىتىش"
+
+#: templates/table/structure/display_table_stats.phtml:9
+msgid "Space usage"
+msgstr ""
+
+#: templates/table/structure/display_table_stats.phtml:32
+msgid "Effective"
+msgstr ""
+
+#: templates/table/structure/move_columns_dialog.phtml:1
+#: templates/table/structure/optional_action_links.phtml:21
+#, fuzzy
+#| msgid "Add/Delete columns"
+msgid "Move columns"
+msgstr "سۆزلەم قوشۇش\\ئۆچۈرۈش"
+
+#: templates/table/structure/move_columns_dialog.phtml:2
+msgid "Move the columns by dragging them up and down."
+msgstr ""
+
+#: templates/table/structure/optional_action_links.phtml:9
+msgid "Propose table structure"
+msgstr ""
+
+#: templates/table/structure/optional_action_links.phtml:24
+#, fuzzy
+#| msgid "Databases"
+msgid "Improve table structure"
+msgstr "ساندان"
+
+#: templates/table/structure/optional_action_links.phtml:30
+#, fuzzy
+#| msgid "Track table"
+msgid "Track view"
+msgstr "جەدۋەل ئىزلاش"
+
+#: templates/table/structure/row_stats_table.phtml:3
+msgid "Row statistics"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:9
+msgid "static"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:11
+msgid "dynamic"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:22
+msgid "partitioned"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:54
+msgid "Row length"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:66
+msgid "Row size"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:73
+msgid "Next autoindex"
+msgstr ""
+
+#: templates/table/structure/table_structure_row.phtml:46
+#, php-format
+msgid "Column %s has been dropped."
+msgstr ""
+
 #: themes.php:17 themes.php:22
 msgid "Theme"
 msgstr ""
diff --git a/po/uk.po b/po/uk.po
index 3f62b1507d..688870e227 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 4.5.0-dev\n"
 "Report-Msgid-Bugs-To: developers@phpmyadmin.net\n"
-"POT-Creation-Date: 2015-08-08 13:53-0400\n"
+"POT-Creation-Date: 2015-08-12 08:10-0400\n"
 "PO-Revision-Date: 2015-01-02 17:07+0200\n"
 "Last-Translator: Сергій Педько <nitrotoll@gmail.com>\n"
 "Language-Team: Ukrainian <https://hosted.weblate.org/projects/phpmyadmin/"
@@ -54,7 +54,7 @@ msgid "Table comments:"
 msgstr "Коментарі до таблиці:"
 
 #: db_datadict.php:104 libraries/Index.class.php:699
-#: libraries/insert_edit.lib.php:1567
+#: libraries/insert_edit.lib.php:1565
 #: libraries/navigation/Nodes/Node_Column.class.php:30
 #: libraries/plugins/export/ExportHtmlword.class.php:280
 #: libraries/plugins/export/ExportHtmlword.class.php:375
@@ -68,13 +68,14 @@ msgstr "Коментарі до таблиці:"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1023
 #: libraries/tracking.lib.php:879 libraries/tracking.lib.php:975
 #: templates/columns_definitions/column_name.phtml:18
-#: templates/index_form.phtml:124 templates/table/table_header.phtml:6
-#: templates/table/zoom_result_form.phtml:33
-#: templates/tbl_relation/common_form.phtml:10
-#: templates/tbl_relation/common_form.phtml:43
-#: templates/tbl_relation/foreign_key_row.phtml:194
-#: templates/tbl_relation/foreign_key_row.phtml:206
-#: templates/tbl_relation/internal_relational_row.phtml:71
+#: templates/table/index_form.phtml:124
+#: templates/table/relation/common_form.phtml:10
+#: templates/table/relation/common_form.phtml:43
+#: templates/table/relation/foreign_key_row.phtml:194
+#: templates/table/relation/foreign_key_row.phtml:206
+#: templates/table/relation/internal_relational_row.phtml:71
+#: templates/table/search/table_header.phtml:6
+#: templates/table/search/zoom_result_form.phtml:33
 msgid "Column"
 msgstr "Стовпчик"
 
@@ -92,21 +93,21 @@ msgstr "Стовпчик"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1001
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1024
 #: libraries/rte/rte_list.lib.php:75 libraries/rte/rte_list.lib.php:103
-#: libraries/rte/rte_routines.lib.php:802
-#: libraries/rte/rte_routines.lib.php:831
-#: libraries/rte/rte_routines.lib.php:1493
+#: libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_routines.lib.php:922
+#: libraries/rte/rte_routines.lib.php:1584
 #: libraries/server_privileges.lib.php:2369 libraries/tracking.lib.php:880
 #: libraries/tracking.lib.php:972
 #: templates/columns_definitions/table_fields_definitions.phtml:11
-#: templates/structure/table_header.phtml:48
-#: templates/structure/table_structure_header.phtml:6
-#: templates/table/table_header.phtml:7
+#: templates/database/structure/table_header.phtml:48
+#: templates/table/search/table_header.phtml:7
+#: templates/table/structure/table_structure_header.phtml:6
 msgid "Type"
 msgstr "Тип"
 
 #: db_datadict.php:106 libraries/Index.class.php:702
 #: libraries/central_columns.lib.php:708
-#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1576
+#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1574
 #: libraries/plugins/export/ExportHtmlword.class.php:286
 #: libraries/plugins/export/ExportHtmlword.class.php:381
 #: libraries/plugins/export/ExportLatex.class.php:509
@@ -119,8 +120,8 @@ msgstr "Тип"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1026
 #: libraries/tracking.lib.php:882 libraries/tracking.lib.php:978
 #: templates/columns_definitions/table_fields_definitions.phtml:39
-#: templates/structure/table_structure_header.phtml:9
-#: templates/table/zoom_result_form.phtml:34
+#: templates/table/search/zoom_result_form.phtml:34
+#: templates/table/structure/table_structure_header.phtml:9
 msgid "Null"
 msgstr "Нуль"
 
@@ -138,8 +139,8 @@ msgstr "Нуль"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1027
 #: libraries/replication_gui.lib.php:153 libraries/tracking.lib.php:883
 #: templates/columns_definitions/table_fields_definitions.phtml:25
-#: templates/structure/body_for_table_summary.phtml:55
-#: templates/structure/table_structure_header.phtml:10
+#: templates/database/structure/body_for_table_summary.phtml:55
+#: templates/table/structure/table_structure_header.phtml:10
 msgid "Default"
 msgstr "За замовчуванням"
 
@@ -167,19 +168,19 @@ msgid "Comments"
 msgstr "Коментарі"
 
 #: db_datadict.php:146
-#: libraries/controllers/StructureController.class.php:1960
-#: libraries/controllers/StructureController.class.php:1965
+#: libraries/controllers/TableStructureController.class.php:951
+#: libraries/controllers/TableStructureController.class.php:956
 #: libraries/tracking.lib.php:922
 #: templates/columns_definitions/column_indexes.phtml:6
-#: templates/structure/check_all_table_column.phtml:22
-#: templates/structure/display_structure.phtml:74
+#: templates/table/structure/check_all_table_column.phtml:22
+#: templates/table/structure/display_structure.phtml:74
 msgid "Primary"
 msgstr "Первинний"
 
 #: db_datadict.php:156 js/messages.php:317 libraries/Index.class.php:567
 #: libraries/Index.class.php:606 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261 libraries/mult_submits.lib.php:403
+#: libraries/config/FormDisplay.tpl.php:272 libraries/mult_submits.lib.php:403
 #: libraries/mult_submits.lib.php:417
 #: libraries/plugins/export/ExportHtmlword.class.php:630
 #: libraries/plugins/export/ExportLatex.class.php:589
@@ -195,20 +196,20 @@ msgstr "Первинний"
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1010 libraries/tracking.lib.php:1015
 #: prefs_manage.php:140 templates/prefs_autoload.phtml:15
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "No"
 msgstr "Ні"
 
 #: db_datadict.php:156 js/messages.php:443 libraries/Index.class.php:568
 #: libraries/Index.class.php:605 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261
-#: libraries/controllers/StructureController.class.php:1344
-#: libraries/controllers/StructureController.class.php:2223
-#: libraries/controllers/StructureController.class.php:2232
-#: libraries/controllers/StructureController.class.php:2237
-#: libraries/controllers/StructureController.class.php:2242
-#: libraries/controllers/StructureController.class.php:2247
+#: libraries/config/FormDisplay.tpl.php:272
+#: libraries/controllers/TableStructureController.class.php:539
+#: libraries/controllers/TableStructureController.class.php:1201
+#: libraries/controllers/TableStructureController.class.php:1210
+#: libraries/controllers/TableStructureController.class.php:1215
+#: libraries/controllers/TableStructureController.class.php:1220
+#: libraries/controllers/TableStructureController.class.php:1225
 #: libraries/mult_submits.inc.php:82 libraries/mult_submits.inc.php:178
 #: libraries/mult_submits.lib.php:339 libraries/mult_submits.lib.php:372
 #: libraries/mult_submits.lib.php:401 libraries/mult_submits.lib.php:415
@@ -217,8 +218,8 @@ msgstr "Ні"
 #: libraries/plugins/export/ExportOdt.class.php:756
 #: libraries/plugins/export/ExportTexytext.class.php:567
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1077
-#: libraries/server_databases.lib.php:464
-#: libraries/server_databases.lib.php:474
+#: libraries/server_databases.lib.php:475
+#: libraries/server_databases.lib.php:485
 #: libraries/server_privileges.lib.php:2546
 #: libraries/server_privileges.lib.php:2727
 #: libraries/server_privileges.lib.php:2748
@@ -228,7 +229,7 @@ msgstr "Ні"
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1008 libraries/tracking.lib.php:1013
 #: prefs_manage.php:138 templates/prefs_autoload.phtml:14
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "Yes"
 msgstr "Так"
 
@@ -238,7 +239,7 @@ msgstr "Переглянути дамп (схему) БД"
 
 #: db_export.php:37 db_tracking.php:90 export.php:382
 #: libraries/DBQbe.class.php:326
-#: libraries/controllers/StructureController.class.php:231
+#: libraries/controllers/DatabaseStructureController.class.php:170
 #: libraries/navigation/NavigationTree.class.php:897
 msgid "No tables found in database."
 msgstr "В БД не виявлено таблиць."
@@ -249,14 +250,14 @@ msgstr "В БД не виявлено таблиць."
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:26
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:120
-#: templates/structure/show_create.phtml:18
+#: templates/database/structure/show_create.phtml:18
 msgid "Tables"
 msgstr "Таблиці"
 
 #: db_export.php:52 libraries/Menu.class.php:317 libraries/Menu.class.php:425
-#: libraries/Util.class.php:3333 libraries/Util.class.php:3343
-#: libraries/Util.class.php:3349 libraries/Util.class.php:3629
-#: libraries/Util.class.php:4327 libraries/Util.class.php:4344
+#: libraries/Util.class.php:3339 libraries/Util.class.php:3349
+#: libraries/Util.class.php:3355 libraries/Util.class.php:3635
+#: libraries/Util.class.php:4333 libraries/Util.class.php:4350
 #: libraries/central_columns.lib.php:728 libraries/config.values.php:39
 #: libraries/config.values.php:47 libraries/config.values.php:109
 #: libraries/config.values.php:115 libraries/config/setup.forms.php:323
@@ -270,7 +271,7 @@ msgstr "Таблиці"
 #: libraries/navigation/Nodes/Node_Table.class.php:283
 #: libraries/server_privileges.lib.php:1141 libraries/tracking.lib.php:874
 #: templates/columns_definitions/table_fields_definitions.phtml:3
-#: templates/designer/table_list.phtml:28
+#: templates/database/designer/table_list.phtml:28
 msgid "Structure"
 msgstr "Структура"
 
@@ -282,7 +283,7 @@ msgstr "Структура"
 #: libraries/config/user_preferences.forms.php:292
 #: libraries/config/user_preferences.forms.php:297
 #: libraries/server_privileges.lib.php:1140
-#: templates/structure/display_table_stats.phtml:12
+#: templates/table/structure/display_table_stats.phtml:12
 msgid "Data"
 msgstr "Дані"
 
@@ -356,10 +357,10 @@ msgstr "Відслідковувані таблиці"
 #: libraries/server_privileges.lib.php:2908
 #: libraries/server_privileges.lib.php:3145
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4346
-#: templates/structure/table_header.phtml:21
-#: templates/tbl_relation/foreign_key_row.phtml:176
-#: templates/tbl_relation/internal_relational_row.phtml:63
+#: libraries/server_privileges.lib.php:4372
+#: templates/database/structure/table_header.phtml:21
+#: templates/table/relation/foreign_key_row.phtml:176
+#: templates/table/relation/internal_relational_row.phtml:63
 msgid "Table"
 msgstr "Таблиця"
 
@@ -376,7 +377,7 @@ msgid "Updated"
 msgstr "Оновлено"
 
 #: db_tracking.php:130 js/messages.php:243 libraries/Menu.class.php:552
-#: libraries/Util.class.php:4314 libraries/config.values.php:104
+#: libraries/Util.class.php:4320 libraries/config.values.php:104
 #: libraries/rte/rte_events.lib.php:393 libraries/rte/rte_list.lib.php:101
 #: libraries/server_status_processes.lib.php:92 libraries/tracking.lib.php:279
 msgid "Status"
@@ -385,14 +386,15 @@ msgstr "Стан"
 #: db_tracking.php:131 db_tracking.php:290 libraries/Index.class.php:693
 #: libraries/central_columns.lib.php:687 libraries/rte/rte_list.lib.php:74
 #: libraries/rte/rte_list.lib.php:89 libraries/rte/rte_list.lib.php:102
-#: libraries/server_databases.lib.php:398
+#: libraries/server_databases.lib.php:409
 #: libraries/server_privileges.lib.php:2372
 #: libraries/server_privileges.lib.php:3166
 #: libraries/server_privileges.lib.php:3342
 #: libraries/server_user_groups.lib.php:82
 #: libraries/server_variables.lib.php:189 libraries/tracking.lib.php:280
-#: libraries/tracking.lib.php:793 templates/structure/table_header.phtml:30
-#: templates/structure/table_structure_header.phtml:23
+#: libraries/tracking.lib.php:793
+#: templates/database/structure/table_header.phtml:30
+#: templates/table/structure/table_structure_header.phtml:23
 msgid "Action"
 msgstr "Дія"
 
@@ -436,7 +438,7 @@ msgid "Untracked tables"
 msgstr "Невідстежувані таблиці"
 
 #: db_tracking.php:305 db_tracking.php:336
-#: templates/structure/optional_action_links.phtml:17
+#: templates/table/structure/optional_action_links.phtml:17
 msgid "Track table"
 msgstr "Відслідковувати таблицю"
 
@@ -490,7 +492,7 @@ msgid "Value for the column \"%s\""
 msgstr "Значення для стовпчика \"%s\""
 
 #: gis_data_editor.php:146
-#: templates/gis_visualization/gis_visualization.phtml:37
+#: templates/table/gis_visualization/gis_visualization.phtml:37
 msgid "Use OpenStreetMaps as Base Layer"
 msgstr "Використовуйте OpenStreetMaps як базовий пласт"
 
@@ -571,35 +573,35 @@ msgstr "Додати геометрію"
 #: libraries/display_change_password.lib.php:162
 #: libraries/display_export.lib.php:402 libraries/display_export.lib.php:408
 #: libraries/display_import.lib.php:392 libraries/index.lib.php:44
-#: libraries/insert_edit.lib.php:1546 libraries/insert_edit.lib.php:1583
+#: libraries/insert_edit.lib.php:1544 libraries/insert_edit.lib.php:1581
 #: libraries/normalization.lib.php:165 libraries/normalization.lib.php:821
 #: libraries/operations.lib.php:38 libraries/operations.lib.php:108
 #: libraries/operations.lib.php:263 libraries/operations.lib.php:306
 #: libraries/operations.lib.php:801 libraries/operations.lib.php:874
 #: libraries/operations.lib.php:923 libraries/operations.lib.php:1337
 #: libraries/operations.lib.php:1658
-#: libraries/plugins/auth/AuthenticationCookie.class.php:244
+#: libraries/plugins/auth/AuthenticationCookie.class.php:232
 #: libraries/replication_gui.lib.php:122 libraries/replication_gui.lib.php:161
 #: libraries/replication_gui.lib.php:324 libraries/replication_gui.lib.php:461
 #: libraries/replication_gui.lib.php:906 libraries/rte/rte_events.lib.php:509
-#: libraries/rte/rte_routines.lib.php:969
-#: libraries/rte/rte_routines.lib.php:1581
+#: libraries/rte/rte_routines.lib.php:1060
+#: libraries/rte/rte_routines.lib.php:1672
 #: libraries/rte/rte_triggers.lib.php:396 libraries/server_bin_log.lib.php:61
 #: libraries/server_privileges.lib.php:705
 #: libraries/server_privileges.lib.php:2106
 #: libraries/server_privileges.lib.php:2872
 #: libraries/server_privileges.lib.php:3553
-#: libraries/server_privileges.lib.php:4627
+#: libraries/server_privileges.lib.php:4653
 #: libraries/server_user_groups.lib.php:285
 #: libraries/sql_query_form.lib.php:369 libraries/sql_query_form.lib.php:429
 #: libraries/tracking.lib.php:533 libraries/tracking.lib.php:653
 #: prefs_manage.php:277 prefs_manage.php:355
 #: templates/columns_definitions/column_definitions_form.phtml:59
-#: templates/header_location.phtml:17 templates/index_form.phtml:238
+#: templates/database/create_table.phtml:21 templates/header_location.phtml:28
 #: templates/startAndNumberOfRowsPanel.phtml:14
-#: templates/structure/add_column.phtml:25
-#: templates/table/create_table.phtml:21
-#: templates/table/selection_form.phtml:75 view_create.php:275
+#: templates/table/index_form.phtml:238
+#: templates/table/search/selection_form.phtml:75
+#: templates/table/structure/add_column.phtml:25 view_create.php:275
 #: view_operations.php:106
 msgid "Go"
 msgstr "Вперед"
@@ -691,7 +693,7 @@ msgstr ""
 "Неможливо завантажити імпортовані плагіни, будь ласка, перевірте вашу "
 "установку!"
 
-#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1466
+#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1460
 #, php-format
 msgid "Bookmark %s has been created."
 msgstr "Закладку %s створено."
@@ -733,11 +735,11 @@ msgstr ""
 msgid "Back"
 msgstr "Назад"
 
-#: index.php:148 libraries/Footer.class.php:70
+#: index.php:149 libraries/Footer.class.php:70
 msgid "phpMyAdmin Demo Server"
 msgstr "Демо-сервер phpMyAdmin"
 
-#: index.php:152
+#: index.php:153
 #, php-format
 msgid ""
 "You are using the demo server. You can do anything here, but please do not "
@@ -748,112 +750,112 @@ msgstr ""
 "ласка, не змінюйте користувачів root, debian-sys-maint і pma. Додаткова "
 "інформація доступна на %s."
 
-#: index.php:162
+#: index.php:163
 msgid "General Settings"
 msgstr "Загальні налаштування"
 
-#: index.php:190 libraries/display_change_password.lib.php:50
+#: index.php:191 libraries/display_change_password.lib.php:50
 #: libraries/display_change_password.lib.php:53 user_password.php:247
 msgid "Change password"
 msgstr "Змінити пароль"
 
-#: index.php:206
+#: index.php:207
 msgid "Server connection collation"
 msgstr "Конфігурація сервера"
 
-#: index.php:228
+#: index.php:229
 msgid "Appearance Settings"
 msgstr "Налаштування вигляду"
 
-#: index.php:258 prefs_manage.php:285
+#: index.php:259 prefs_manage.php:285
 msgid "More settings"
 msgstr "Додаткові налаштування"
 
-#: index.php:279
+#: index.php:280
 msgid "Database server"
 msgstr "Сервер бази даних"
 
-#: index.php:282 libraries/plugins/auth/AuthenticationCookie.class.php:181
+#: index.php:283 libraries/plugins/auth/AuthenticationCookie.class.php:169
 msgid "Server:"
 msgstr "Сервер:"
 
-#: index.php:286
+#: index.php:287
 msgid "Server type:"
 msgstr "Тип сервера:"
 
-#: index.php:290 libraries/plugins/export/ExportLatex.class.php:212
+#: index.php:291 libraries/plugins/export/ExportLatex.class.php:212
 #: libraries/plugins/export/ExportSql.class.php:687
 #: libraries/plugins/export/ExportXml.class.php:189
 msgid "Server version:"
 msgstr "Версія сервера:"
 
-#: index.php:296
+#: index.php:297
 msgid "Protocol version:"
 msgstr "Версія протоколу:"
 
-#: index.php:300
+#: index.php:301
 msgid "User:"
 msgstr "Користувач:"
 
-#: index.php:305
+#: index.php:306
 msgid "Server charset:"
 msgstr "Символьне кодування сервера:"
 
-#: index.php:320
+#: index.php:321
 msgid "Web server"
 msgstr "Веб-сервер"
 
-#: index.php:331
+#: index.php:332
 msgid "Database client version:"
 msgstr "Версія клієнта бази даних:"
 
-#: index.php:335
+#: index.php:336
 msgid "PHP extension:"
 msgstr "PHP розширення:"
 
-#: index.php:349
+#: index.php:350
 #, fuzzy
 #| msgid "PHP Version:"
 msgid "PHP version:"
 msgstr "Версія PHP:"
 
-#: index.php:360
+#: index.php:361
 msgid "Show PHP information"
 msgstr "Показати інформацію про PHP"
 
-#: index.php:383
+#: index.php:384
 msgid "Version information:"
 msgstr "Відомості про версію:"
 
-#: index.php:392 libraries/Util.class.php:432 libraries/Util.class.php:495
-#: libraries/config/FormDisplay.tpl.php:151
+#: index.php:393 libraries/Util.class.php:432 libraries/Util.class.php:495
+#: libraries/config/FormDisplay.tpl.php:162
 #: libraries/display_export.lib.php:577 libraries/engines/pbxt.lib.php:162
 #: libraries/navigation/NavigationHeader.class.php:196
 #: libraries/server_variables.lib.php:160
 msgid "Documentation"
 msgstr "Документація"
 
-#: index.php:399
+#: index.php:400
 msgid "Wiki"
 msgstr "Вікі"
 
-#: index.php:408
+#: index.php:409
 msgid "Official Homepage"
 msgstr "Офіційна сторінка phpMyAdmin"
 
-#: index.php:415
+#: index.php:416
 msgid "Contribute"
 msgstr "Зробити внесок"
 
-#: index.php:422
+#: index.php:423
 msgid "Get support"
 msgstr "Отримати підтримку"
 
-#: index.php:429
+#: index.php:430
 msgid "List of changes"
 msgstr "Перелік змін"
 
-#: index.php:451
+#: index.php:452
 #, fuzzy
 #| msgid ""
 #| "Your configuration file contains settings (root with no password) that "
@@ -871,7 +873,7 @@ msgstr ""
 "відкритий для вторгнення і тому Вам обов'язково слід виправити цю прогалину "
 "у безпеці."
 
-#: index.php:468
+#: index.php:469
 msgid ""
 "You have enabled mbstring.func_overload in your PHP configuration. This "
 "option is incompatible with phpMyAdmin and might cause some data to be "
@@ -880,7 +882,7 @@ msgstr ""
 "У конфігурації PHP увімкнено mbstring.func_overload. Цей параметр несумісний "
 "з phpMyAdmin і може викликати пошкодження деяких даних!"
 
-#: index.php:483
+#: index.php:484
 msgid ""
 "The mbstring PHP extension was not found and you seem to be using a "
 "multibyte charset. Without the mbstring extension phpMyAdmin is unable to "
@@ -890,7 +892,7 @@ msgstr ""
 "багатобайтові символи. Без mbstring phpMyAdmin не зможе правильно виконати "
 "поділ текстових рядків, що може призвести до неочікуваних результатів."
 
-#: index.php:500
+#: index.php:501
 #, fuzzy
 #| msgid ""
 #| "Your PHP parameter [a@http://php.net/manual/en/session.configuration."
@@ -908,7 +910,7 @@ msgstr ""
 "придатності cookie в phpMyAdmin, через це термін дії вашої сесії закінчиться "
 "раніше, ніж налаштовано в phpMyAdmin."
 
-#: index.php:519
+#: index.php:520
 msgid ""
 "Login cookie store is lower than cookie validity configured in phpMyAdmin, "
 "because of this, your login will expire sooner than configured in phpMyAdmin."
@@ -917,11 +919,11 @@ msgstr ""
 "налаштований в phpMyAdmin, через це термін дії вашої сесії закінчиться "
 "раніше, ніж налаштовано в phpMyAdmin."
 
-#: index.php:535
+#: index.php:536
 msgid "The configuration file now needs a secret passphrase (blowfish_secret)."
 msgstr "Конфігураційний файл потребує секретної фрази (blowfish_secret)."
 
-#: index.php:548
+#: index.php:549
 msgid ""
 "Directory [code]config[/code], which is used by the setup script, still "
 "exists in your phpMyAdmin directory. It is strongly recommended to remove it "
@@ -933,7 +935,7 @@ msgstr ""
 "видалити. В іншому випадку безпека вашого сервера може бути скомпрометована "
 "через вільний доступ до завантаження конфігураційного файлу."
 
-#: index.php:564
+#: index.php:565
 #, php-format
 msgid ""
 "The phpMyAdmin configuration storage is not completely configured, some "
@@ -942,13 +944,13 @@ msgstr ""
 "Сховище конфігурації phpMyAdmin не повністю налаштовано, деякі розширені "
 "функції було деактивовано. %sЗ'ясуйте чому%s. "
 
-#: index.php:571
+#: index.php:572
 msgid ""
 "Or alternately go to 'Operations' tab of any database to set it up there."
 msgstr ""
 "Або перейдіть на вкладинку 'Операції' будь-якої бази даних та налаштуйте там."
 
-#: index.php:620
+#: index.php:621
 #, php-format
 msgid ""
 "Your PHP MySQL library version %s differs from your MySQL server version %s. "
@@ -957,7 +959,7 @@ msgstr ""
 "Версія бібліотеки PHP MySQL %s відрізняється від версії сервера MySQL %s. Це "
 "може спричинити непередбачувані наслідки."
 
-#: index.php:648
+#: index.php:649
 #, php-format
 msgid ""
 "Server running with Suhosin. Please refer to %sdocumentation%s for possible "
@@ -1109,8 +1111,8 @@ msgstr ""
 msgid "Save & Close"
 msgstr "Зберегти та закрити"
 
-#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:404
-#: libraries/insert_edit.lib.php:1550 prefs_manage.php:361
+#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:415
+#: libraries/insert_edit.lib.php:1548 prefs_manage.php:361
 #: prefs_manage.php:372
 msgid "Reset"
 msgstr "Перевстановити"
@@ -1143,7 +1145,7 @@ msgstr "Додати Індекс"
 msgid "Edit Index"
 msgstr "Редагувати Індекс"
 
-#: js/messages.php:99 templates/index_form.phtml:232
+#: js/messages.php:99 templates/table/index_form.phtml:232
 #, php-format
 msgid "Add %s column(s) to index"
 msgstr "Додати до індексу %s стовпчик(ів)"
@@ -1164,13 +1166,14 @@ msgstr ""
 msgid "Please select column(s) for the index."
 msgstr "Будь ласка, виберіть стовпець(і) для індексу."
 
-#: js/messages.php:106 templates/structure/add_column.phtml:1
+#: js/messages.php:106 templates/table/structure/add_column.phtml:1
 msgid "You have to add at least one column."
 msgstr "Необхідно додати принаймні один стовпчик."
 
-#: js/messages.php:109 libraries/insert_edit.lib.php:1548
+#: js/messages.php:109 libraries/insert_edit.lib.php:1546
 #: templates/columns_definitions/column_definitions_form.phtml:162
-#: templates/index_form.phtml:237 templates/tbl_relation/common_form.phtml:106
+#: templates/table/index_form.phtml:237
+#: templates/table/relation/common_form.phtml:106
 msgid "Preview SQL"
 msgstr "Попередній перегляд SQL"
 
@@ -1187,7 +1190,7 @@ msgid "SQL query:"
 msgstr "SQL-запит:"
 
 #. l10n: Default label for the y-Axis of Charts
-#: js/messages.php:118 templates/tbl_chart.phtml:109
+#: js/messages.php:118 templates/table/chart/tbl_chart.phtml:109
 msgid "Y Values"
 msgstr "Значення Y"
 
@@ -1348,7 +1351,7 @@ msgstr "Байтів надіслано"
 msgid "Bytes received"
 msgstr "Байтів отримано"
 
-#: js/messages.php:169 libraries/server_status.lib.php:226
+#: js/messages.php:169 libraries/server_status.lib.php:235
 msgid "Connections"
 msgstr "З'єднань"
 
@@ -1405,12 +1408,12 @@ msgstr "%d таблиця(таблиць)"
 msgid "Questions"
 msgstr "Питання"
 
-#: js/messages.php:184 libraries/server_status.lib.php:134
+#: js/messages.php:184 libraries/server_status.lib.php:143
 msgid "Traffic"
 msgstr "Трафік"
 
 #: js/messages.php:185 libraries/Menu.class.php:586
-#: libraries/Util.class.php:4318 libraries/server_status_monitor.lib.php:257
+#: libraries/Util.class.php:4324 libraries/server_status_monitor.lib.php:257
 msgid "Settings"
 msgstr "Налаштування"
 
@@ -1430,8 +1433,9 @@ msgstr "Будь ласка додайте щонайменше одну змі
 #: libraries/server_status_monitor.lib.php:236
 #: libraries/server_status_processes.lib.php:308
 #: templates/columns_definitions/transformation.phtml:4
-#: templates/designer/options_panel.phtml:178
-#: templates/table/options_zoom.phtml:12 templates/table/rows_zoom.phtml:26
+#: templates/database/designer/options_panel.phtml:178
+#: templates/table/search/options_zoom.phtml:12
+#: templates/table/search/rows_zoom.phtml:26
 msgid "None"
 msgstr "Жодного"
 
@@ -1717,8 +1721,8 @@ msgstr ""
 
 #: js/messages.php:270 libraries/Menu.class.php:352
 #: libraries/Menu.class.php:455 libraries/Menu.class.php:582
-#: libraries/Util.class.php:4317 libraries/Util.class.php:4332
-#: libraries/Util.class.php:4349 libraries/config/messages.inc.php:258
+#: libraries/Util.class.php:4323 libraries/Util.class.php:4338
+#: libraries/Util.class.php:4355 libraries/config/messages.inc.php:258
 #: libraries/display_import.lib.php:105
 #: libraries/server_status_monitor.lib.php:318 prefs_manage.php:238
 #: setup/frames/menu.inc.php:26
@@ -1778,13 +1782,13 @@ msgid "Formatting SQL..."
 msgstr ""
 
 #: js/messages.php:293 libraries/server_variables.lib.php:157
-#: templates/designer/aggregate_query_panel.phtml:63
-#: templates/designer/delete_relation_panel.phtml:28
-#: templates/designer/having_query_panel.phtml:117
-#: templates/designer/new_relation_panel.phtml:88
-#: templates/designer/options_panel.phtml:253
-#: templates/designer/rename_to_panel.phtml:45
-#: templates/designer/where_query_panel.phtml:83
+#: templates/database/designer/aggregate_query_panel.phtml:63
+#: templates/database/designer/delete_relation_panel.phtml:28
+#: templates/database/designer/having_query_panel.phtml:117
+#: templates/database/designer/new_relation_panel.phtml:88
+#: templates/database/designer/options_panel.phtml:253
+#: templates/database/designer/rename_to_panel.phtml:45
+#: templates/database/designer/where_query_panel.phtml:83
 msgid "Cancel"
 msgstr "Скасувати"
 
@@ -1794,7 +1798,7 @@ msgstr "Скасувати"
 msgid "Page-related settings"
 msgstr "Змінити налаштування"
 
-#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:402
+#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:413
 msgid "Apply"
 msgstr "Застосувати"
 
@@ -1831,8 +1835,8 @@ msgstr "Код помилки: %s"
 msgid "Error text: %s"
 msgstr "Текст помилки: %s"
 
-#: js/messages.php:307 libraries/db_common.inc.php:68
-#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:450
+#: js/messages.php:307 libraries/db_common.inc.php:69
+#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:461
 msgid "No databases selected."
 msgstr "Жодної бази даних не вибрано."
 
@@ -1844,12 +1848,13 @@ msgstr "Видалення стовпчика"
 msgid "Adding Primary Key"
 msgstr "Додавання Головного Ключа"
 
-#: js/messages.php:310 templates/designer/aggregate_query_panel.phtml:59
-#: templates/designer/having_query_panel.phtml:113
-#: templates/designer/new_relation_panel.phtml:87
-#: templates/designer/options_panel.phtml:252
-#: templates/designer/rename_to_panel.phtml:41
-#: templates/designer/where_query_panel.phtml:82
+#: js/messages.php:310
+#: templates/database/designer/aggregate_query_panel.phtml:59
+#: templates/database/designer/having_query_panel.phtml:113
+#: templates/database/designer/new_relation_panel.phtml:87
+#: templates/database/designer/options_panel.phtml:252
+#: templates/database/designer/rename_to_panel.phtml:41
+#: templates/database/designer/where_query_panel.phtml:82
 msgid "OK"
 msgstr "OK"
 
@@ -1869,7 +1874,7 @@ msgstr "Копіювання бази даних"
 msgid "Changing Charset"
 msgstr "Зміна Кодування"
 
-#: js/messages.php:320 libraries/Util.class.php:3217
+#: js/messages.php:320 libraries/Util.class.php:3223
 #, fuzzy
 #| msgid "Disable foreign key checks"
 msgid "Enable foreign key checks"
@@ -1906,20 +1911,21 @@ msgstr "Визначення збереженої функції має міст
 #: js/messages.php:334 libraries/DisplayResults.class.php:4834
 #: libraries/DisplayResults.class.php:5092 libraries/Menu.class.php:344
 #: libraries/Menu.class.php:446 libraries/Menu.class.php:578
-#: libraries/Util.class.php:3636 libraries/Util.class.php:3637
-#: libraries/Util.class.php:4316 libraries/Util.class.php:4331
-#: libraries/Util.class.php:4348 libraries/config/messages.inc.php:252
+#: libraries/Util.class.php:3642 libraries/Util.class.php:3643
+#: libraries/Util.class.php:4322 libraries/Util.class.php:4337
+#: libraries/Util.class.php:4354 libraries/config/messages.inc.php:252
 #: libraries/display_export.lib.php:173 libraries/rte/rte_list.lib.php:146
 #: libraries/server_privileges.lib.php:2211
 #: libraries/server_privileges.lib.php:2290
 #: libraries/server_privileges.lib.php:2632
 #: libraries/server_privileges.lib.php:3356
 #: libraries/server_status_monitor.lib.php:322 prefs_manage.php:303
-#: setup/frames/menu.inc.php:27 templates/structure/check_all_tables.phtml:11
+#: setup/frames/menu.inc.php:27
+#: templates/database/structure/check_all_tables.phtml:11
 msgid "Export"
 msgstr "Експортувати"
 
-#: js/messages.php:337 libraries/rte/rte_routines.lib.php:652
+#: js/messages.php:337 libraries/rte/rte_routines.lib.php:743
 msgid "ENUM/SET editor"
 msgstr "ENUM/SET редактор"
 
@@ -1959,7 +1965,7 @@ msgstr "Показати блок запиту"
 #: libraries/Console.class.php:214 libraries/DisplayResults.class.php:3474
 #: libraries/DisplayResults.class.php:4818 libraries/Index.class.php:723
 #: libraries/Util.class.php:706 libraries/Util.class.php:1202
-#: libraries/Util.class.php:3634 libraries/Util.class.php:3635
+#: libraries/Util.class.php:3640 libraries/Util.class.php:3641
 #: libraries/central_columns.lib.php:851
 #: libraries/central_columns.lib.php:1193
 #: libraries/config/messages.inc.php:892
@@ -1977,7 +1983,7 @@ msgstr "Редагувати"
 #: libraries/server_user_groups.lib.php:129
 #: libraries/sql_query_form.lib.php:416 libraries/tracking.lib.php:477
 #: setup/frames/index.inc.php:183 setup/frames/index.inc.php:291
-#: templates/designer/delete_relation_panel.phtml:27
+#: templates/database/designer/delete_relation_panel.phtml:27
 msgid "Delete"
 msgstr "Видалити"
 
@@ -2144,11 +2150,11 @@ msgid "No dependencies selected!"
 msgstr "Жодної залежності не обрано!"
 
 #: js/messages.php:394 libraries/central_columns.lib.php:1214
-#: libraries/insert_edit.lib.php:1458 libraries/server_variables.lib.php:155
+#: libraries/insert_edit.lib.php:1456 libraries/server_variables.lib.php:155
 #: setup/frames/config.inc.php:42 setup/frames/index.inc.php:279
 #: templates/columns_definitions/column_definitions_form.phtml:165
-#: templates/gis_visualization/gis_visualization.phtml:48
-#: templates/tbl_relation/common_form.phtml:107
+#: templates/table/gis_visualization/gis_visualization.phtml:48
+#: templates/table/relation/common_form.phtml:107
 msgid "Save"
 msgstr "Зберегти"
 
@@ -2227,8 +2233,8 @@ msgid "Data point content"
 msgstr "Вміст точки даних"
 
 #: js/messages.php:430 js/messages.php:562 js/messages.php:579
-#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2573
-#: templates/index_form.phtml:154 templates/index_form.phtml:194
+#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2571
+#: templates/table/index_form.phtml:154 templates/table/index_form.phtml:194
 msgid "Ignore"
 msgstr "Ігнорувати"
 
@@ -2287,8 +2293,8 @@ msgstr "Обрати зовнішній ключ"
 msgid "Please select the primary key or a unique key!"
 msgstr "Будь ласка, оберіть первинний ключ або унікальний ключ!"
 
-#: js/messages.php:457 templates/designer/side_menu.phtml:91
-#: templates/designer/side_menu.phtml:94
+#: js/messages.php:457 templates/database/designer/side_menu.phtml:91
+#: templates/database/designer/side_menu.phtml:94
 msgid "Choose column to display"
 msgstr "Виберіть колонку для відображення"
 
@@ -2304,20 +2310,20 @@ msgstr ""
 msgid "Page name"
 msgstr "Назва сторінки"
 
-#: js/messages.php:463 templates/designer/side_menu.phtml:56
-#: templates/designer/side_menu.phtml:59
+#: js/messages.php:463 templates/database/designer/side_menu.phtml:56
+#: templates/database/designer/side_menu.phtml:59
 msgid "Save page"
 msgstr "Зберегти сторінку"
 
-#: js/messages.php:464 templates/designer/side_menu.phtml:63
-#: templates/designer/side_menu.phtml:66
+#: js/messages.php:464 templates/database/designer/side_menu.phtml:63
+#: templates/database/designer/side_menu.phtml:66
 #, fuzzy
 #| msgid "Save page"
 msgid "Save page as"
 msgstr "Зберегти сторінку"
 
-#: js/messages.php:465 templates/designer/side_menu.phtml:49
-#: templates/designer/side_menu.phtml:52
+#: js/messages.php:465 templates/database/designer/side_menu.phtml:49
+#: templates/database/designer/side_menu.phtml:52
 msgid "Open page"
 msgstr "Відкрити сторінку"
 
@@ -2325,7 +2331,7 @@ msgstr "Відкрити сторінку"
 msgid "Delete page"
 msgstr "Видалити сторінку"
 
-#: js/messages.php:467 templates/designer/side_menu.phtml:10
+#: js/messages.php:467 templates/database/designer/side_menu.phtml:10
 msgid "Untitled"
 msgstr "Без назви"
 
@@ -2452,7 +2458,7 @@ msgstr "Початковий рядок"
 msgid "cancel"
 msgstr "скасувати"
 
-#: js/messages.php:499 libraries/server_status.lib.php:271
+#: js/messages.php:499 libraries/server_status.lib.php:280
 msgid "Aborted"
 msgstr "Перервано"
 
@@ -3061,7 +3067,7 @@ msgstr "Введіть вірний номер!"
 
 #: js/messages.php:793 libraries/Message.class.php:199
 #: libraries/Util.class.php:654 libraries/core.lib.php:245
-#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1172
+#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1170
 #: tbl_operations.php:229 view_operations.php:63
 msgid "Error"
 msgstr "Помилка"
@@ -3123,8 +3129,8 @@ msgstr "за секунду"
 msgid "per minute"
 msgstr "за хвилину"
 
-#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:143
-#: libraries/server_status.lib.php:228
+#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:152
+#: libraries/server_status.lib.php:237
 #: libraries/server_status_queries.lib.php:98
 msgid "per hour"
 msgstr "за годину"
@@ -3144,7 +3150,7 @@ msgstr ""
 "Невірні права доступу до конфігураційного файлу, він не повинен бути "
 "доступним для всіх!"
 
-#: libraries/Config.class.php:1799
+#: libraries/Config.class.php:1801
 msgid "Font size"
 msgstr "Розмір шрифту"
 
@@ -3172,10 +3178,10 @@ msgstr "Повторити запит"
 #: libraries/server_privileges.lib.php:2890
 #: libraries/server_privileges.lib.php:3144
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4332
+#: libraries/server_privileges.lib.php:4358
 #: libraries/server_status_processes.lib.php:80
-#: templates/tbl_relation/foreign_key_row.phtml:165
-#: templates/tbl_relation/internal_relational_row.phtml:55
+#: templates/table/relation/foreign_key_row.phtml:165
+#: templates/table/relation/internal_relational_row.phtml:55
 msgid "Database"
 msgstr "База даних"
 
@@ -3269,11 +3275,11 @@ msgstr "Історія"
 #: libraries/plugins/import/ImportMediawiki.class.php:60
 #: libraries/plugins/import/ImportOds.class.php:59
 #: libraries/plugins/import/ImportShp.class.php:57
-#: libraries/plugins/import/ImportSql.class.php:148
+#: libraries/plugins/import/ImportSql.class.php:51
 #: libraries/plugins/import/ImportXml.class.php:58
-#: libraries/rte/rte_routines.lib.php:833 templates/index_form.phtml:49
-#: templates/structure/row_stats_table.phtml:20
-#: templates/table/options.phtml:2
+#: libraries/rte/rte_routines.lib.php:924 templates/table/index_form.phtml:49
+#: templates/table/search/options.phtml:2
+#: templates/table/structure/row_stats_table.phtml:20
 msgid "Options"
 msgstr "Параметри"
 
@@ -3314,7 +3320,8 @@ msgstr "Спадаючий"
 msgid "Order:"
 msgstr "Порядок"
 
-#: libraries/Console.class.php:289 templates/table/replace_preview.phtml:17
+#: libraries/Console.class.php:289
+#: templates/table/search/replace_preview.phtml:17
 msgid "Count"
 msgstr "Відлік"
 
@@ -3425,9 +3432,9 @@ msgstr "Перейти до скопійованої таблиці"
 #: libraries/operations.lib.php:794 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:191
-#: templates/structure/sortable_header.phtml:21
-#: templates/structure/sortable_header.phtml:38
-#: templates/table/options.phtml:68
+#: templates/database/structure/sortable_header.phtml:21
+#: templates/database/structure/sortable_header.phtml:38
+#: templates/table/search/options.phtml:68
 msgid "Ascending"
 msgstr "Зростаючий"
 
@@ -3437,13 +3444,14 @@ msgstr "Зростаючий"
 #: libraries/operations.lib.php:797 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:188
-#: templates/structure/sortable_header.phtml:26
-#: templates/structure/sortable_header.phtml:43
-#: templates/table/options.phtml:69
+#: templates/database/structure/sortable_header.phtml:26
+#: templates/database/structure/sortable_header.phtml:43
+#: templates/table/search/options.phtml:69
 msgid "Descending"
 msgstr "Спадаючий"
 
-#: libraries/DBQbe.class.php:467 templates/table/search_and_replace.phtml:6
+#: libraries/DBQbe.class.php:467
+#: templates/table/search/search_and_replace.phtml:6
 msgid "Column:"
 msgstr "Стовпчик:"
 
@@ -3604,12 +3612,12 @@ msgstr[1] "%1$s співпадіння у <strong>%2$s</strong>"
 msgstr[2] "%1$s співпадінь у <strong>%2$s</strong>"
 
 #: libraries/DbSearch.class.php:354 libraries/Menu.class.php:311
-#: libraries/Util.class.php:3337 libraries/Util.class.php:3347
-#: libraries/Util.class.php:3623 libraries/Util.class.php:3624
-#: libraries/Util.class.php:4343 libraries/config.values.php:43
+#: libraries/Util.class.php:3343 libraries/Util.class.php:3353
+#: libraries/Util.class.php:3629 libraries/Util.class.php:3630
+#: libraries/Util.class.php:4349 libraries/config.values.php:43
 #: libraries/config.values.php:51 libraries/config.values.php:119
 #: libraries/navigation/Nodes/Node_Table.class.php:295
-#: templates/structure/check_all_table_column.phtml:5
+#: templates/table/structure/check_all_table_column.phtml:5
 msgid "Browse"
 msgstr "Переглянути"
 
@@ -3626,7 +3634,8 @@ msgstr "Шукати в базі даних"
 msgid "Words or values to search for (wildcard: \"%\"):"
 msgstr "Слова чи значення, які потрібно знайти (шаблон: \"%\"):"
 
-#: libraries/DbSearch.class.php:401 templates/table/search_and_replace.phtml:1
+#: libraries/DbSearch.class.php:401
+#: templates/table/search/search_and_replace.phtml:1
 msgid "Find:"
 msgstr "Знайти:"
 
@@ -3670,28 +3679,28 @@ msgstr "Фільтрувати рядки"
 msgid "Search this table"
 msgstr "Шукати в таблиці"
 
-#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2532
-#: libraries/Util.class.php:2535
+#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2538
+#: libraries/Util.class.php:2541
 msgctxt "First page"
 msgid "Begin"
 msgstr "Почати"
 
-#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2533
-#: libraries/Util.class.php:2536 libraries/server_bin_log.lib.php:170
+#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2539
+#: libraries/Util.class.php:2542 libraries/server_bin_log.lib.php:170
 #: libraries/server_bin_log.lib.php:172
 msgctxt "Previous page"
 msgid "Previous"
 msgstr "Попередній"
 
-#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2564
-#: libraries/Util.class.php:2574 libraries/server_bin_log.lib.php:204
+#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2570
+#: libraries/Util.class.php:2580 libraries/server_bin_log.lib.php:204
 #: libraries/server_bin_log.lib.php:206
 msgctxt "Next page"
 msgid "Next"
 msgstr "Вперед"
 
-#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2565
-#: libraries/Util.class.php:2575
+#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2571
+#: libraries/Util.class.php:2581
 msgctxt "Last page"
 msgid "End"
 msgstr "Кінець"
@@ -3766,15 +3775,15 @@ msgid "May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]."
 msgstr "Може бути приблизним. Дивіться [doc@faq3-11]FAQ 3.11[/doc]."
 
 #: libraries/DisplayResults.class.php:4332 libraries/Message.class.php:180
-#: libraries/controllers/TableRelationController.class.php:258
+#: libraries/controllers/TableRelationController.class.php:259
 #: libraries/controllers/TableSearchController.class.php:655
-#: libraries/rte/rte_routines.lib.php:1332 libraries/sql_query_form.lib.php:89
+#: libraries/rte/rte_routines.lib.php:1423 libraries/sql_query_form.lib.php:89
 #: tbl_operations.php:227 tbl_row_action.php:138 view_operations.php:62
 msgid "Your SQL query has been executed successfully."
 msgstr "Ваш SQL запит було виконано вдало."
 
 #: libraries/DisplayResults.class.php:4660
-#: libraries/controllers/StructureController.class.php:629
+#: libraries/controllers/DatabaseStructureController.class.php:564
 #, php-format
 msgid ""
 "This view has at least this number of rows. Please refer to %sdocumentation"
@@ -3798,33 +3807,33 @@ msgstr "%1$d total, %2$d в запиті"
 msgid "%d total"
 msgstr "всього %d"
 
-#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1318
+#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1312
 #, php-format
 msgid "Query took %01.4f seconds."
 msgstr "Запит виконувався %01.4f с."
 
 #: libraries/DisplayResults.class.php:4807
-#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4767
-#: libraries/Util.class.php:4773 libraries/mult_submits.inc.php:50
-#: templates/structure/check_all_tables.phtml:2
-#: templates/structure/check_all_tables.phtml:9
+#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4773
+#: libraries/Util.class.php:4779 libraries/mult_submits.inc.php:50
+#: templates/database/structure/check_all_tables.phtml:2
+#: templates/database/structure/check_all_tables.phtml:9
 msgid "With selected:"
 msgstr "З відміченими:"
 
 #: libraries/DisplayResults.class.php:4811
-#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4769
-#: libraries/Util.class.php:4770 libraries/server_privileges.lib.php:1174
+#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4775
+#: libraries/Util.class.php:4776 libraries/server_privileges.lib.php:1174
 #: libraries/server_privileges.lib.php:1175
 #: libraries/server_privileges.lib.php:1387
 #: libraries/server_user_groups.lib.php:231
-#: templates/structure/check_all_tables.phtml:3
-#: templates/structure/check_all_tables.phtml:4
+#: templates/database/structure/check_all_tables.phtml:3
+#: templates/database/structure/check_all_tables.phtml:4
 msgid "Check All"
 msgstr "Відмітити все"
 
 #: libraries/DisplayResults.class.php:4985 libraries/Header.class.php:383
-#: templates/structure/optional_action_links.phtml:1
-#: templates/structure/print_view_data_dictionary_link.phtml:3
+#: templates/database/structure/print_view_data_dictionary_link.phtml:3
+#: templates/table/structure/optional_action_links.phtml:1
 msgid "Print view"
 msgstr "Версія для друку"
 
@@ -3832,7 +3841,8 @@ msgstr "Версія для друку"
 msgid "Query results operations"
 msgstr "Операції з результатами запиту"
 
-#: libraries/DisplayResults.class.php:5105 templates/tbl_chart.phtml:12
+#: libraries/DisplayResults.class.php:5105
+#: templates/table/chart/tbl_chart.phtml:12
 msgid "Display chart"
 msgstr "Відобразити діаграму"
 
@@ -3926,7 +3936,7 @@ msgid "Click on the bar to scroll to top of page"
 msgstr "Натисніть на панелі, щоб прокрутити до початку сторінки"
 
 #: libraries/Header.class.php:749
-#: libraries/plugins/auth/AuthenticationCookie.class.php:152
+#: libraries/plugins/auth/AuthenticationCookie.class.php:140
 msgid "Javascript must be enabled past this point!"
 msgstr "З цього моменту Javascript має бути увімкнений!"
 
@@ -3948,11 +3958,11 @@ msgid "Keyname"
 msgstr "Назва ключа"
 
 #: libraries/Index.class.php:697
-#: libraries/controllers/StructureController.class.php:1962
-#: libraries/controllers/StructureController.class.php:1967
+#: libraries/controllers/TableStructureController.class.php:953
+#: libraries/controllers/TableStructureController.class.php:958
 #: libraries/tracking.lib.php:973
 #: templates/columns_definitions/column_indexes.phtml:11
-#: templates/structure/check_all_table_column.phtml:26
+#: templates/table/structure/check_all_table_column.phtml:26
 msgid "Unique"
 msgstr "Унікальне"
 
@@ -3971,16 +3981,17 @@ msgstr "Кількість елементів"
 #: libraries/server_collations.lib.php:35 libraries/tracking.lib.php:881
 #: libraries/tracking.lib.php:977
 #: templates/columns_definitions/table_fields_definitions.phtml:33
-#: templates/structure/row_stats_table.phtml:31
-#: templates/structure/table_header.phtml:55
-#: templates/structure/table_structure_header.phtml:7
-#: templates/table/table_header.phtml:8
+#: templates/database/structure/table_header.phtml:55
+#: templates/table/search/table_header.phtml:8
+#: templates/table/structure/row_stats_table.phtml:31
+#: templates/table/structure/table_structure_header.phtml:7
 msgid "Collation"
 msgstr "Порівняння"
 
 #: libraries/Index.class.php:703 libraries/rte/rte_events.lib.php:496
-#: libraries/rte/rte_routines.lib.php:956 libraries/tracking.lib.php:885
-#: libraries/tracking.lib.php:979 templates/structure/table_header.phtml:84
+#: libraries/rte/rte_routines.lib.php:1047 libraries/tracking.lib.php:885
+#: libraries/tracking.lib.php:979
+#: templates/database/structure/table_header.phtml:84
 msgid "Comment"
 msgstr "Коментар"
 
@@ -3993,15 +4004,15 @@ msgstr "Первинний ключ було знищено."
 msgid "Index %s has been dropped."
 msgstr "Індекс %s було знищено."
 
-#: libraries/Index.class.php:757 libraries/Util.class.php:3630
-#: libraries/Util.class.php:3631
-#: libraries/controllers/StructureController.class.php:1958
-#: libraries/controllers/StructureController.class.php:1959
+#: libraries/Index.class.php:757 libraries/Util.class.php:3636
+#: libraries/Util.class.php:3637
+#: libraries/controllers/TableStructureController.class.php:949
+#: libraries/controllers/TableStructureController.class.php:950
 #: libraries/operations.lib.php:1607 libraries/rte/rte_list.lib.php:150
 #: libraries/server_databases.lib.php:146
-#: templates/structure/check_all_table_column.phtml:15
-#: templates/structure/check_all_tables.phtml:16
-#: templates/tbl_relation/foreign_key_row.phtml:93
+#: templates/database/structure/check_all_tables.phtml:16
+#: templates/table/relation/foreign_key_row.phtml:93
+#: templates/table/structure/check_all_table_column.phtml:15
 msgid "Drop"
 msgstr "Знищити"
 
@@ -4031,16 +4042,16 @@ msgstr "Сервер"
 #: libraries/Menu.class.php:248
 #: libraries/navigation/Nodes/Node_View.class.php:32
 #: libraries/tbl_info.inc.php:63
-#: templates/structure/structure_table_row.phtml:97
-#: templates/structure/structure_table_row.phtml:159
+#: templates/database/structure/structure_table_row.phtml:97
+#: templates/database/structure/structure_table_row.phtml:159
 msgid "View"
 msgstr "Подання"
 
 #: libraries/Menu.class.php:325 libraries/Menu.class.php:429
-#: libraries/Menu.class.php:548 libraries/Util.class.php:3334
-#: libraries/Util.class.php:3344 libraries/Util.class.php:3350
-#: libraries/Util.class.php:4313 libraries/Util.class.php:4328
-#: libraries/Util.class.php:4345 libraries/config.values.php:40
+#: libraries/Menu.class.php:548 libraries/Util.class.php:3340
+#: libraries/Util.class.php:3350 libraries/Util.class.php:3356
+#: libraries/Util.class.php:4319 libraries/Util.class.php:4334
+#: libraries/Util.class.php:4351 libraries/config.values.php:40
 #: libraries/config.values.php:48 libraries/config.values.php:110
 #: libraries/config.values.php:116 libraries/config/messages.inc.php:321
 #: libraries/navigation/Nodes/Node_Table.class.php:292
@@ -4048,19 +4059,19 @@ msgid "SQL"
 msgstr "SQL"
 
 #: libraries/Menu.class.php:328 libraries/Menu.class.php:432
-#: libraries/Util.class.php:3335 libraries/Util.class.php:3345
-#: libraries/Util.class.php:3351 libraries/Util.class.php:3625
-#: libraries/Util.class.php:3626 libraries/Util.class.php:4329
-#: libraries/Util.class.php:4346 libraries/config.values.php:41
+#: libraries/Util.class.php:3341 libraries/Util.class.php:3351
+#: libraries/Util.class.php:3357 libraries/Util.class.php:3631
+#: libraries/Util.class.php:3632 libraries/Util.class.php:4335
+#: libraries/Util.class.php:4352 libraries/config.values.php:41
 #: libraries/config.values.php:49 libraries/config.values.php:111
 #: libraries/config.values.php:117
 #: libraries/navigation/Nodes/Node_Table.class.php:286
 msgid "Search"
 msgstr "Шукати"
 
-#: libraries/Menu.class.php:338 libraries/Util.class.php:3336
-#: libraries/Util.class.php:3346 libraries/Util.class.php:3627
-#: libraries/Util.class.php:3628 libraries/Util.class.php:4347
+#: libraries/Menu.class.php:338 libraries/Util.class.php:3342
+#: libraries/Util.class.php:3352 libraries/Util.class.php:3633
+#: libraries/Util.class.php:3634 libraries/Util.class.php:4353
 #: libraries/config.values.php:42 libraries/config.values.php:50
 #: libraries/config.values.php:118
 #: libraries/navigation/Nodes/Node_Table.class.php:289
@@ -4069,30 +4080,30 @@ msgid "Insert"
 msgstr "Вставити"
 
 #: libraries/Menu.class.php:362 libraries/Menu.class.php:467
-#: libraries/Util.class.php:4334 libraries/Util.class.php:4350
+#: libraries/Util.class.php:4340 libraries/Util.class.php:4356
 #: libraries/config.values.php:106 libraries/server_common.lib.php:51
 #: libraries/server_privileges.lib.php:2370
 #: libraries/server_privileges.lib.php:3158
-#: libraries/server_privileges.lib.php:4221
+#: libraries/server_privileges.lib.php:4247
 msgid "Privileges"
 msgstr "Привілеї"
 
 #: libraries/Menu.class.php:371 libraries/Menu.class.php:379
-#: libraries/Menu.class.php:459 libraries/Util.class.php:3338
-#: libraries/Util.class.php:3352 libraries/Util.class.php:4333
-#: libraries/Util.class.php:4351 libraries/config.values.php:112
+#: libraries/Menu.class.php:459 libraries/Util.class.php:3344
+#: libraries/Util.class.php:3358 libraries/Util.class.php:4339
+#: libraries/Util.class.php:4357 libraries/config.values.php:112
 #: view_operations.php:92
 msgid "Operations"
 msgstr "Операції"
 
 #: libraries/Menu.class.php:384 libraries/Menu.class.php:492
-#: libraries/Util.class.php:4338 libraries/Util.class.php:4352
+#: libraries/Util.class.php:4344 libraries/Util.class.php:4358
 #: libraries/relation.lib.php:255
 msgid "Tracking"
 msgstr "Відстеження"
 
 #: libraries/Menu.class.php:397 libraries/Menu.class.php:486
-#: libraries/Util.class.php:4337 libraries/Util.class.php:4353
+#: libraries/Util.class.php:4343 libraries/Util.class.php:4359
 #: libraries/navigation/Nodes/Node_Trigger_Container.class.php:24
 #: libraries/plugins/export/ExportHtmlword.class.php:557
 #: libraries/plugins/export/ExportOdt.class.php:685
@@ -4109,16 +4120,16 @@ msgstr "Тригери"
 msgid "Database seems to be empty!"
 msgstr "Порожня база даних!"
 
-#: libraries/Menu.class.php:439 libraries/Util.class.php:4330
+#: libraries/Menu.class.php:439 libraries/Util.class.php:4336
 msgid "Query"
 msgstr "Запит"
 
-#: libraries/Menu.class.php:472 libraries/Util.class.php:4335
+#: libraries/Menu.class.php:472 libraries/Util.class.php:4341
 #: libraries/rte/rte_words.lib.php:36
 msgid "Routines"
 msgstr "Процедури"
 
-#: libraries/Menu.class.php:479 libraries/Util.class.php:4336
+#: libraries/Menu.class.php:479 libraries/Util.class.php:4342
 #: libraries/navigation/Nodes/Node_Event_Container.class.php:26
 #: libraries/plugins/export/ExportSql.class.php:940
 #: libraries/plugins/export/ExportXml.class.php:107
@@ -4126,20 +4137,20 @@ msgstr "Процедури"
 msgid "Events"
 msgstr "Події"
 
-#: libraries/Menu.class.php:498 libraries/Util.class.php:4339
+#: libraries/Menu.class.php:498 libraries/Util.class.php:4345
 msgid "Designer"
 msgstr "Дизайнер"
 
-#: libraries/Menu.class.php:507 libraries/Util.class.php:4340
-#: templates/structure/check_all_tables.phtml:35
+#: libraries/Menu.class.php:507 libraries/Util.class.php:4346
+#: templates/database/structure/check_all_tables.phtml:35
 msgid "Central columns"
 msgstr "Центральні стовпчики"
 
-#: libraries/Menu.class.php:544 libraries/Util.class.php:4312
+#: libraries/Menu.class.php:544 libraries/Util.class.php:4318
 #: libraries/config.values.php:103 libraries/config/messages.inc.php:266
 #: libraries/config/messages.inc.php:341
 #: libraries/navigation/NavigationTree.class.php:1239
-#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4332
+#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4358
 msgid "Databases"
 msgstr "Бази даних"
 
@@ -4150,34 +4161,34 @@ msgid "User accounts"
 msgstr "Групи користувачів"
 
 #: libraries/Menu.class.php:595 libraries/ServerStatusData.class.php:121
-#: libraries/Util.class.php:4319 libraries/server_common.lib.php:36
+#: libraries/Util.class.php:4325 libraries/server_common.lib.php:36
 msgid "Binary log"
 msgstr "Бінарний журнал"
 
 #: libraries/Menu.class.php:601 libraries/ServerStatusData.class.php:126
-#: libraries/Util.class.php:4320 libraries/server_common.lib.php:42
-#: templates/structure/body_for_table_summary.phtml:10
-#: templates/structure/table_header.phtml:27
+#: libraries/Util.class.php:4326 libraries/server_common.lib.php:42
+#: templates/database/structure/body_for_table_summary.phtml:10
+#: templates/database/structure/table_header.phtml:27
 msgid "Replication"
 msgstr "Реплікація"
 
 #: libraries/Menu.class.php:606 libraries/ServerStatusData.class.php:193
-#: libraries/Util.class.php:4321 libraries/config.values.php:105
+#: libraries/Util.class.php:4327 libraries/config.values.php:105
 #: libraries/server_engines.lib.php:108 libraries/server_engines.lib.php:112
 #: libraries/sql_query_form.lib.php:421
 msgid "Variables"
 msgstr "Змінні"
 
-#: libraries/Menu.class.php:610 libraries/Util.class.php:4322
+#: libraries/Menu.class.php:610 libraries/Util.class.php:4328
 msgid "Charsets"
 msgstr "Кодування"
 
-#: libraries/Menu.class.php:615 libraries/Util.class.php:4323
+#: libraries/Menu.class.php:615 libraries/Util.class.php:4329
 #: libraries/server_common.lib.php:33 libraries/server_plugins.lib.php:27
 msgid "Plugins"
 msgstr "Плагіни"
 
-#: libraries/Menu.class.php:626 libraries/Util.class.php:4324
+#: libraries/Menu.class.php:626 libraries/Util.class.php:4330
 msgid "Engines"
 msgstr "Двигуни"
 
@@ -4205,7 +4216,7 @@ msgstr[0] "%1$d рядок додано."
 msgstr[1] "%1$d рядків додано."
 msgstr[2] "%1$d рядків додано."
 
-#: libraries/PDF.class.php:70 libraries/Util.class.php:2521
+#: libraries/PDF.class.php:70 libraries/Util.class.php:2527
 #: libraries/browse_foreigners.lib.php:327
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:865
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:890
@@ -4226,7 +4237,7 @@ msgid "Could not save favorite table!"
 msgstr "Не вдалося зберегти улюблену таблицю!"
 
 #: libraries/RecentFavoriteTable.class.php:212
-#: templates/structure/favorite_anchor.phtml:12
+#: templates/database/structure/favorite_anchor.phtml:12
 msgid "Remove from Favorites"
 msgstr "Вилучити з уподобань"
 
@@ -4393,7 +4404,7 @@ msgid ""
 msgstr "Для цього механізму зберігання немає дельної інформації про статус."
 
 #: libraries/StorageEngine.class.php:373
-#: templates/structure/body_for_table_summary.phtml:50
+#: templates/database/structure/body_for_table_summary.phtml:50
 #, php-format
 msgid "%s is the default storage engine on this MySQL server."
 msgstr "%s механізм зберігання за замовчуванням на цьому MySQL сервері."
@@ -4855,10 +4866,10 @@ msgstr ""
 
 #: libraries/Util.class.php:726 libraries/rte/rte_events.lib.php:110
 #: libraries/rte/rte_events.lib.php:119 libraries/rte/rte_events.lib.php:150
-#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:153
-#: libraries/rte/rte_routines.lib.php:162
-#: libraries/rte/rte_routines.lib.php:235
-#: libraries/rte/rte_routines.lib.php:1366
+#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:223
+#: libraries/rte/rte_routines.lib.php:250
+#: libraries/rte/rte_routines.lib.php:372
+#: libraries/rte/rte_routines.lib.php:1457
 #: libraries/rte/rte_triggers.lib.php:86 libraries/rte/rte_triggers.lib.php:95
 #: libraries/rte/rte_triggers.lib.php:127
 msgid "MySQL said: "
@@ -4904,75 +4915,78 @@ msgstr "Нд"
 msgid "%B %d, %Y at %I:%M %p"
 msgstr "%B %d %Y р., %H:%M"
 
-#: libraries/Util.class.php:2019
+#: libraries/Util.class.php:2025
 #, php-format
 msgid "%s days, %s hours, %s minutes and %s seconds"
 msgstr "%s днів, %s годин, %s хвилин і %s секунд"
 
-#: libraries/Util.class.php:2112
+#: libraries/Util.class.php:2118
 msgid "Missing parameter:"
 msgstr "Пропущено параметр:"
 
-#: libraries/Util.class.php:2645
+#: libraries/Util.class.php:2651
 #, php-format
 msgid "Jump to database \"%s\"."
 msgstr "Перейти до бази даних \"%s\"."
 
-#: libraries/Util.class.php:2670
+#: libraries/Util.class.php:2676
 #, php-format
 msgid "The %s functionality is affected by a known bug, see %s"
 msgstr "На функціональність %s впливає відома помилка, див. %s"
 
-#: libraries/Util.class.php:2881
+#: libraries/Util.class.php:2887
 msgid "Click to toggle"
 msgstr "Клікніть, щоб змінити"
 
-#: libraries/Util.class.php:3542 prefs_manage.php:248
+#: libraries/Util.class.php:3548 prefs_manage.php:248
 msgid "Browse your computer:"
 msgstr "Переглянути Ваш комп'ютер:"
 
-#: libraries/Util.class.php:3567
+#: libraries/Util.class.php:3573
 #, php-format
 msgid "Select from the web server upload directory <b>%s</b>:"
 msgstr "Виберіть з каталога веб-сервера для відвантаження файлів <b>%s</b>:"
 
-#: libraries/Util.class.php:3596 libraries/insert_edit.lib.php:1173
+#: libraries/Util.class.php:3602 libraries/insert_edit.lib.php:1171
 msgid "The directory you set for upload work cannot be reached."
 msgstr "Встановлений Вами каталог для завантаження файлів недоступний."
 
-#: libraries/Util.class.php:3607
+#: libraries/Util.class.php:3613
 msgid "There are no files to upload!"
 msgstr "Немає файлів для відвантаження!"
 
-#: libraries/Util.class.php:3632 libraries/Util.class.php:3633
-#: templates/structure/check_all_tables.phtml:15
+#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: templates/database/structure/check_all_tables.phtml:15
 msgid "Empty"
 msgstr "Очистити"
 
-#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: libraries/Util.class.php:3644 libraries/Util.class.php:3645
 msgid "Execute"
 msgstr "Виконати"
 
-#: libraries/Util.class.php:4152
+#: libraries/Util.class.php:4158
 msgid "Print"
 msgstr "Друк"
 
-#: libraries/Util.class.php:4257 templates/structure/row_stats_table.phtml:80
-#: templates/structure/table_header.phtml:95
+#: libraries/Util.class.php:4263
+#: templates/database/structure/table_header.phtml:95
+#: templates/table/structure/row_stats_table.phtml:80
 msgid "Creation"
 msgstr "Створення"
 
-#: libraries/Util.class.php:4263 templates/structure/row_stats_table.phtml:87
-#: templates/structure/table_header.phtml:106
+#: libraries/Util.class.php:4269
+#: templates/database/structure/table_header.phtml:106
+#: templates/table/structure/row_stats_table.phtml:87
 msgid "Last update"
 msgstr "Останнє оновлення"
 
-#: libraries/Util.class.php:4269 templates/structure/row_stats_table.phtml:94
-#: templates/structure/table_header.phtml:117
+#: libraries/Util.class.php:4275
+#: templates/database/structure/table_header.phtml:117
+#: templates/table/structure/row_stats_table.phtml:94
 msgid "Last check"
 msgstr "Остання перевірка"
 
-#: libraries/Util.class.php:4315
+#: libraries/Util.class.php:4321
 msgid "Users"
 msgstr "Користувачі"
 
@@ -4993,16 +5007,16 @@ msgid "Use this value"
 msgstr "Використовувати це значення"
 
 #: libraries/build_html_for_db.lib.php:33 libraries/import.lib.php:193
-#: templates/structure/actions_in_table_structure.phtml:113
-#: templates/structure/row_stats_table.phtml:42
-#: templates/structure/table_header.phtml:36
+#: templates/database/structure/table_header.phtml:36
+#: templates/table/structure/actions_in_table_structure.phtml:113
+#: templates/table/structure/row_stats_table.phtml:42
 msgid "Rows"
 msgstr "Рядки"
 
 #: libraries/build_html_for_db.lib.php:48 libraries/engines/innodb.lib.php:171
-#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:186
-#: libraries/server_status.lib.php:298
-#: templates/structure/display_table_stats.phtml:40
+#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:195
+#: libraries/server_status.lib.php:307
+#: templates/table/structure/display_table_stats.phtml:40
 msgid "Total"
 msgstr "Разом"
 
@@ -5011,10 +5025,12 @@ msgid "Jump to database"
 msgstr "Перейти до бази даних"
 
 #: libraries/build_html_for_db.lib.php:146
+#: templates/database/structure/structure_table_row.phtml:15
 msgid "Not replicated"
 msgstr "Не репліковані"
 
 #: libraries/build_html_for_db.lib.php:158
+#: templates/database/structure/structure_table_row.phtml:16
 msgid "Replicated"
 msgstr "Репліковані"
 
@@ -5067,17 +5083,17 @@ msgstr ""
 #: libraries/plugins/export/ExportTexytext.class.php:425
 #: libraries/plugins/export/PMA_ExportPdf.class.php:307
 #: libraries/rte/rte_list.lib.php:73 libraries/rte/rte_list.lib.php:85
-#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:830
-#: libraries/rte/rte_routines.lib.php:1492 setup/frames/index.inc.php:162
+#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:921
+#: libraries/rte/rte_routines.lib.php:1583 setup/frames/index.inc.php:162
 #: templates/columns_definitions/table_fields_definitions.phtml:8
-#: templates/structure/table_structure_header.phtml:5
-#: templates/table/create_table.phtml:11
+#: templates/database/create_table.phtml:11
+#: templates/table/structure/table_structure_header.phtml:5
 msgid "Name"
 msgstr "Назва"
 
 #: libraries/central_columns.lib.php:699
 #: libraries/central_columns.lib.php:1381
-#: libraries/rte/rte_routines.lib.php:832
+#: libraries/rte/rte_routines.lib.php:923
 #: templates/columns_definitions/table_fields_definitions.phtml:14
 msgid "Length/Values"
 msgstr "Довжина/Значення"
@@ -5098,7 +5114,7 @@ msgid "Select a table"
 msgstr "Обрати таблицю"
 
 #: libraries/central_columns.lib.php:804
-#: templates/structure/add_column.phtml:4
+#: templates/table/structure/add_column.phtml:4
 msgid "Add column"
 msgstr "Додати стовпчик"
 
@@ -5114,7 +5130,7 @@ msgstr "Додати стовпчик"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1002
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1025
 #: templates/columns_definitions/table_fields_definitions.phtml:36
-#: templates/structure/table_structure_header.phtml:8
+#: templates/table/structure/table_structure_header.phtml:8
 msgid "Attributes"
 msgstr "Атрибути"
 
@@ -5228,7 +5244,7 @@ msgid "Double click"
 msgstr "Подвійне клацання"
 
 #: libraries/config.values.php:95 libraries/config.values.php:124
-#: libraries/config/FormDisplay.tpl.php:221 libraries/relation.lib.php:97
+#: libraries/config/FormDisplay.tpl.php:232 libraries/relation.lib.php:97
 #: libraries/relation.lib.php:105
 msgid "Disabled"
 msgstr "заблоковано"
@@ -5408,22 +5424,22 @@ msgstr "Експорт не буде працювати, бо відсутня 
 msgid "maximum %s"
 msgstr "максимум %s"
 
-#: libraries/config/FormDisplay.tpl.php:219
+#: libraries/config/FormDisplay.tpl.php:230
 msgid "This setting is disabled, it will not be applied to your configuration."
 msgstr ""
 "Цей параметр відключений, він не буде застосовуватися до вашої конфігурації."
 
-#: libraries/config/FormDisplay.tpl.php:313
+#: libraries/config/FormDisplay.tpl.php:324
 #, php-format
 msgid "Set value: %s"
 msgstr "Встановити значення: %s"
 
-#: libraries/config/FormDisplay.tpl.php:318
+#: libraries/config/FormDisplay.tpl.php:329
 #: libraries/config/messages.inc.php:610
 msgid "Restore default value"
 msgstr "Відновити значення за замовчуванням"
 
-#: libraries/config/FormDisplay.tpl.php:332
+#: libraries/config/FormDisplay.tpl.php:343
 msgid "Allow users to customize this value"
 msgstr "Дозволити користувачам налаштовувати це значення"
 
@@ -5937,7 +5953,7 @@ msgstr "Кодування файлу"
 
 #: libraries/config/messages.inc.php:136 libraries/config/messages.inc.php:152
 #: libraries/sql_query_form.lib.php:247
-#: templates/structure/row_stats_table.phtml:7
+#: templates/table/structure/row_stats_table.phtml:7
 msgid "Format"
 msgstr "Формат"
 
@@ -6464,7 +6480,7 @@ msgstr ""
 
 #: libraries/config/messages.inc.php:332
 #: libraries/plugins/export/ExportPdf.class.php:279
-#: templates/structure/secondary_tabs.phtml:8
+#: templates/table/secondary_tabs.phtml:8
 msgid "Table structure"
 msgstr "Структура таблиці"
 
@@ -8178,103 +8194,33 @@ msgstr "Microsoft Word 2000"
 msgid "OpenDocument Text"
 msgstr "Текст OpenDocument"
 
-#: libraries/controllers/StructureController.class.php:465
+#: libraries/controllers/DatabaseStructureController.class.php:405
 #: tbl_operations.php:382
 #, php-format
 msgid "Table %s has been emptied."
 msgstr "Таблицю %s було очищено."
 
-#: libraries/controllers/StructureController.class.php:486
+#: libraries/controllers/DatabaseStructureController.class.php:426
 #: tbl_operations.php:400 view_operations.php:119
 #, php-format
 msgid "View %s has been dropped."
 msgstr "Перегляд %s було знищено."
 
-#: libraries/controllers/StructureController.class.php:487
+#: libraries/controllers/DatabaseStructureController.class.php:427
 #: tbl_operations.php:401
 #, php-format
 msgid "Table %s has been dropped."
 msgstr "Таблицю %s було знищено."
 
-#: libraries/controllers/StructureController.class.php:797
-#, php-format
-msgid "The name '%s' is a MySQL reserved keyword."
-msgid_plural "The names '%s' are MySQL reserved keywords."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: libraries/controllers/StructureController.class.php:875
-msgid "No column selected."
-msgstr "Жодного стовпчика не вибрано."
-
-#: libraries/controllers/StructureController.class.php:1049
+#: libraries/controllers/DatabaseStructureController.class.php:733
 msgid "Favorite List is full!"
 msgstr "Перелік обраного заповнено!"
 
-#: libraries/controllers/StructureController.class.php:1272
-msgid "The columns have been moved successfully."
-msgstr "Стовпці успішно переміщено."
-
-#: libraries/controllers/StructureController.class.php:1535
-#, fuzzy, php-format
-#| msgid "Table %1$s has been altered successfully."
-msgid ""
-"Table %1$s has been altered successfully. Privileges have been adjusted."
-msgstr "Таблицю %1$s було успішно змінено."
-
-#: libraries/controllers/StructureController.class.php:1541
-#: libraries/controllers/TableIndexesController.class.php:161
-#: tbl_addfield.php:92
-#, php-format
-msgid "Table %1$s has been altered successfully."
-msgstr "Таблицю %1$s було успішно змінено."
-
-#: libraries/controllers/StructureController.class.php:1588
-#: libraries/tracking.lib.php:1094
-msgid "Query error"
-msgstr "Помилка запиту"
-
-#: libraries/controllers/StructureController.class.php:1806
+#: libraries/controllers/DatabaseStructureController.class.php:947
 #: libraries/mysql_charsets.lib.php:366 libraries/mysql_charsets.lib.php:373
 msgid "unknown"
 msgstr "невідоме"
 
-#: libraries/controllers/StructureController.class.php:1957
-#: templates/structure/check_all_table_column.phtml:11
-msgid "Change"
-msgstr "Змінити"
-
-#: libraries/controllers/StructureController.class.php:1961
-#: libraries/controllers/StructureController.class.php:1966
-#: libraries/navigation/Nodes/Node_Index.class.php:30
-#: libraries/tracking.lib.php:926
-#: templates/columns_definitions/column_indexes.phtml:16
-#: templates/columns_definitions/table_fields_definitions.phtml:57
-#: templates/structure/check_all_table_column.phtml:30
-#: templates/structure/display_structure.phtml:79
-#: templates/structure/display_table_stats.phtml:19
-msgid "Index"
-msgstr "Індекс"
-
-#: libraries/controllers/StructureController.class.php:1963
-#: libraries/controllers/StructureController.class.php:1968
-#: templates/columns_definitions/column_indexes.phtml:27
-#: templates/structure/check_all_table_column.phtml:37
-msgid "Spatial"
-msgstr "Просторовий"
-
-#: libraries/controllers/StructureController.class.php:1964
-#: libraries/controllers/StructureController.class.php:1969
-#: templates/columns_definitions/column_indexes.phtml:22
-#: templates/structure/check_all_table_column.phtml:47
-msgid "Fulltext"
-msgstr "ПовнТекст"
-
-#: libraries/controllers/StructureController.class.php:1970
-msgid "Distinct values"
-msgstr "Окремі значення"
-
 #: libraries/controllers/TableChartController.class.php:82
 #: libraries/controllers/TableGisVisualizationController.class.php:101
 msgid "No SQL query was set to fetch data."
@@ -8288,13 +8234,20 @@ msgstr ""
 msgid "No data to display"
 msgstr "Немає даних для відображення"
 
-#: libraries/controllers/TableRelationController.class.php:217
+#: libraries/controllers/TableIndexesController.class.php:161
+#: libraries/controllers/TableStructureController.class.php:736
+#: tbl_addfield.php:92
+#, php-format
+msgid "Table %1$s has been altered successfully."
+msgstr "Таблицю %1$s було успішно змінено."
+
+#: libraries/controllers/TableRelationController.class.php:218
 #, fuzzy
 #| msgid "Thread %s was successfully killed."
 msgid "Display column was successfully updated."
 msgstr "Процес %s припинено."
 
-#: libraries/controllers/TableRelationController.class.php:283
+#: libraries/controllers/TableRelationController.class.php:288
 #, fuzzy
 #| msgid "Internal relation has been added."
 msgid "Internal relations were successfully updated."
@@ -8313,12 +8266,75 @@ msgid "Zoom search"
 msgstr "Збільшити Пошук"
 
 #: libraries/controllers/TableSearchController.class.php:852
-#: templates/table/selection_form.phtml:59
+#: templates/table/search/selection_form.phtml:59
 #, fuzzy
 #| msgid "Find and Replace"
 msgid "Find and replace"
 msgstr "Знайти і замінити"
 
+#: libraries/controllers/TableStructureController.class.php:163
+#, php-format
+msgid "The name '%s' is a MySQL reserved keyword."
+msgid_plural "The names '%s' are MySQL reserved keywords."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: libraries/controllers/TableStructureController.class.php:241
+msgid "No column selected."
+msgstr "Жодного стовпчика не вибрано."
+
+#: libraries/controllers/TableStructureController.class.php:467
+msgid "The columns have been moved successfully."
+msgstr "Стовпці успішно переміщено."
+
+#: libraries/controllers/TableStructureController.class.php:730
+#, fuzzy, php-format
+#| msgid "Table %1$s has been altered successfully."
+msgid ""
+"Table %1$s has been altered successfully. Privileges have been adjusted."
+msgstr "Таблицю %1$s було успішно змінено."
+
+#: libraries/controllers/TableStructureController.class.php:783
+#: libraries/tracking.lib.php:1094
+msgid "Query error"
+msgstr "Помилка запиту"
+
+#: libraries/controllers/TableStructureController.class.php:948
+#: templates/table/structure/check_all_table_column.phtml:11
+msgid "Change"
+msgstr "Змінити"
+
+#: libraries/controllers/TableStructureController.class.php:952
+#: libraries/controllers/TableStructureController.class.php:957
+#: libraries/navigation/Nodes/Node_Index.class.php:30
+#: libraries/tracking.lib.php:926
+#: templates/columns_definitions/column_indexes.phtml:16
+#: templates/columns_definitions/table_fields_definitions.phtml:57
+#: templates/table/structure/check_all_table_column.phtml:30
+#: templates/table/structure/display_structure.phtml:79
+#: templates/table/structure/display_table_stats.phtml:19
+msgid "Index"
+msgstr "Індекс"
+
+#: libraries/controllers/TableStructureController.class.php:954
+#: libraries/controllers/TableStructureController.class.php:959
+#: templates/columns_definitions/column_indexes.phtml:27
+#: templates/table/structure/check_all_table_column.phtml:37
+msgid "Spatial"
+msgstr "Просторовий"
+
+#: libraries/controllers/TableStructureController.class.php:955
+#: libraries/controllers/TableStructureController.class.php:960
+#: templates/columns_definitions/column_indexes.phtml:22
+#: templates/table/structure/check_all_table_column.phtml:47
+msgid "Fulltext"
+msgstr "ПовнТекст"
+
+#: libraries/controllers/TableStructureController.class.php:963
+msgid "Distinct values"
+msgstr "Окремі значення"
+
 #: libraries/core.lib.php:306
 #, php-format
 msgid "The %s extension is missing. Please check your PHP configuration."
@@ -8365,7 +8381,7 @@ msgid "No Password"
 msgstr "Без паролю"
 
 #: libraries/display_change_password.lib.php:68
-#: libraries/plugins/auth/AuthenticationCookie.class.php:199
+#: libraries/plugins/auth/AuthenticationCookie.class.php:187
 #: libraries/replication_gui.lib.php:422 libraries/replication_gui.lib.php:862
 #: libraries/server_privileges.lib.php:1640
 msgid "Password:"
@@ -9180,12 +9196,12 @@ msgid "Dump has been saved to file %s."
 msgstr "Dump збережено у файл %s."
 
 #: libraries/import.lib.php:202 libraries/insert_edit.lib.php:124
-#: libraries/rte/rte_routines.lib.php:1353 libraries/sql.lib.php:1312
+#: libraries/rte/rte_routines.lib.php:1444 libraries/sql.lib.php:1306
 #: tbl_get_field.php:44
 msgid "MySQL returned an empty result set (i.e. zero rows)."
 msgstr "MySQL повернула пустий результат (тобто нуль рядків)."
 
-#: libraries/import.lib.php:265 libraries/sql.lib.php:1326
+#: libraries/import.lib.php:265 libraries/sql.lib.php:1320
 msgid "[ROLLBACK occurred.]"
 msgstr ""
 
@@ -9251,14 +9267,14 @@ msgstr "Створити індекс у &nbsp;%s&nbsp;стовпчиках"
 
 #: libraries/insert_edit.lib.php:233
 #: libraries/navigation/Nodes/Node_DatabaseChild.class.php:48
-#: templates/designer/table_list.phtml:40
+#: templates/database/designer/table_list.phtml:40
 msgid "Hide"
 msgstr "Приховати"
 
 #: libraries/insert_edit.lib.php:249
 #: libraries/navigation/Nodes/Node_Function.class.php:32
-#: libraries/rte/rte_routines.lib.php:1495
-#: templates/table/table_header.phtml:4
+#: libraries/rte/rte_routines.lib.php:1586
+#: templates/table/search/table_header.phtml:4
 msgid "Function"
 msgstr "Функція"
 
@@ -9271,84 +9287,85 @@ msgstr "Двійковий"
 msgid "Because of its length,<br /> this column might not be editable."
 msgstr "Через велику довжину<br /> цей стовпчик неможливо відредагувати."
 
-#: libraries/insert_edit.lib.php:1050
+#: libraries/insert_edit.lib.php:1048
 msgid "Binary - do not edit"
 msgstr "Двійкові дані - не редагуються"
 
-#: libraries/insert_edit.lib.php:1176 libraries/server_privileges.lib.php:470
-#: templates/table/options.phtml:36
+#: libraries/insert_edit.lib.php:1174 libraries/server_privileges.lib.php:470
+#: templates/table/search/options.phtml:36
 msgid "Or"
 msgstr "Або"
 
-#: libraries/insert_edit.lib.php:1177
+#: libraries/insert_edit.lib.php:1175
 msgid "web server upload directory:"
 msgstr "каталог веб-сервера для відвантаження файлів:"
 
-#: libraries/insert_edit.lib.php:1348 templates/table/input_box.phtml:49
+#: libraries/insert_edit.lib.php:1346
+#: templates/table/search/input_box.phtml:49
 msgid "Edit/Insert"
 msgstr "Редагувати/Вставити"
 
-#: libraries/insert_edit.lib.php:1398
+#: libraries/insert_edit.lib.php:1396
 #, php-format
 msgid "Continue insertion with %s rows"
 msgstr "Продовжити вставку з %s рядка"
 
-#: libraries/insert_edit.lib.php:1428
+#: libraries/insert_edit.lib.php:1426
 msgid "and then"
 msgstr "і потім"
 
-#: libraries/insert_edit.lib.php:1461
+#: libraries/insert_edit.lib.php:1459
 msgid "Insert as new row"
 msgstr "Вставити як новий рядок"
 
-#: libraries/insert_edit.lib.php:1464
+#: libraries/insert_edit.lib.php:1462
 msgid "Insert as new row and ignore errors"
 msgstr "Вставити як новий рядок і ігнорувати помилки"
 
-#: libraries/insert_edit.lib.php:1467
+#: libraries/insert_edit.lib.php:1465
 msgid "Show insert query"
 msgstr "Відображати запит вставлення"
 
-#: libraries/insert_edit.lib.php:1487
+#: libraries/insert_edit.lib.php:1485
 msgid "Go back to previous page"
 msgstr "Повернутись"
 
-#: libraries/insert_edit.lib.php:1490
+#: libraries/insert_edit.lib.php:1488
 msgid "Insert another new row"
 msgstr "Вставити новий запис"
 
-#: libraries/insert_edit.lib.php:1495
+#: libraries/insert_edit.lib.php:1493
 msgid "Go back to this page"
 msgstr "Повернутися на цю сторінку"
 
-#: libraries/insert_edit.lib.php:1518
+#: libraries/insert_edit.lib.php:1516
 msgid "Edit next row"
 msgstr "Редагувати наступний рядок"
 
-#: libraries/insert_edit.lib.php:1540
+#: libraries/insert_edit.lib.php:1538
 msgid ""
 "Use TAB key to move from value to value, or CTRL+arrows to move anywhere"
 msgstr ""
 "Для переходу від значення до значення використовуйте TAB, або CTRL+стрілки - "
 "для переміщення куди завгодно"
 
-#: libraries/insert_edit.lib.php:1577 libraries/replication_gui.lib.php:542
-#: libraries/rte/rte_routines.lib.php:1497
+#: libraries/insert_edit.lib.php:1575 libraries/replication_gui.lib.php:542
+#: libraries/rte/rte_routines.lib.php:1588
 #: libraries/server_status_variables.lib.php:220
-#: templates/designer/having_query_panel.phtml:100
-#: templates/designer/options_panel.phtml:73
-#: templates/designer/options_panel.phtml:239
-#: templates/designer/where_query_panel.phtml:69
-#: templates/table/table_header.phtml:10
-#: templates/table/zoom_result_form.phtml:35
+#: templates/database/designer/having_query_panel.phtml:100
+#: templates/database/designer/options_panel.phtml:73
+#: templates/database/designer/options_panel.phtml:239
+#: templates/database/designer/where_query_panel.phtml:69
+#: templates/table/search/table_header.phtml:10
+#: templates/table/search/zoom_result_form.phtml:35
 msgid "Value"
 msgstr "Значення"
 
-#: libraries/insert_edit.lib.php:1937 libraries/sql.lib.php:1309
+#: libraries/insert_edit.lib.php:1935 libraries/sql.lib.php:1303
 msgid "Showing SQL query"
 msgstr "Показ SQL-запиту"
 
-#: libraries/insert_edit.lib.php:1962 libraries/sql.lib.php:1287
+#: libraries/insert_edit.lib.php:1960 libraries/sql.lib.php:1281
 #, php-format
 msgid "Inserted row id: %1$d"
 msgstr "Ідентифікатор доданого рядка: %1$d"
@@ -9762,7 +9779,7 @@ msgstr "Новий"
 #: libraries/navigation/Nodes/Node_View_Container.class.php:26
 #: libraries/navigation/Nodes/Node_View_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:129
-#: templates/structure/show_create.phtml:30
+#: templates/database/structure/show_create.phtml:30
 msgid "Views"
 msgstr "Подання"
 
@@ -10068,7 +10085,7 @@ msgstr "Ви для цього маєте недостатньо прав!"
 
 #: libraries/operations.lib.php:101 libraries/operations.lib.php:249
 #: libraries/operations.lib.php:869 libraries/operations.lib.php:963
-#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:907
+#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:998
 #: templates/columns_definitions/table_fields_definitions.phtml:47
 #, fuzzy
 #| msgid "Edit Privileges"
@@ -10160,22 +10177,22 @@ msgid "Switch to copied table"
 msgstr "Перейти до скопійованої таблиці"
 
 #: libraries/operations.lib.php:1360
-#: templates/structure/check_all_tables.phtml:18
+#: templates/database/structure/check_all_tables.phtml:18
 msgid "Table maintenance"
 msgstr "Обслуговування таблиці"
 
 #: libraries/operations.lib.php:1398
-#: templates/structure/check_all_tables.phtml:19
+#: templates/database/structure/check_all_tables.phtml:19
 msgid "Analyze table"
 msgstr "Аналіз таблиці"
 
 #: libraries/operations.lib.php:1413
-#: templates/structure/check_all_tables.phtml:20
+#: templates/database/structure/check_all_tables.phtml:20
 msgid "Check table"
 msgstr "Перевірити таблицю"
 
 #: libraries/operations.lib.php:1428
-#: templates/structure/check_all_tables.phtml:22
+#: templates/database/structure/check_all_tables.phtml:22
 #, fuzzy
 #| msgid "Check table"
 msgid "Checksum table"
@@ -10195,18 +10212,19 @@ msgid "Flush the table (FLUSH)"
 msgstr "Очистити кеш таблиці (FLUSH)"
 
 #: libraries/operations.lib.php:1477
-#: templates/structure/check_all_tables.phtml:23
-#: templates/structure/display_table_stats.phtml:56
+#: templates/database/structure/check_all_tables.phtml:23
+#: templates/table/structure/display_table_stats.phtml:56
 msgid "Optimize table"
 msgstr "Оптимізувати таблицю"
 
 #: libraries/operations.lib.php:1492
-#: templates/structure/check_all_tables.phtml:24
+#: templates/database/structure/check_all_tables.phtml:24
 msgid "Repair table"
 msgstr "Ремонтувати таблицю"
 
 #: libraries/operations.lib.php:1538
-#: templates/structure/check_all_tables.phtml:14 view_operations.php:127
+#: templates/database/structure/check_all_tables.phtml:14
+#: view_operations.php:127
 msgid "Delete data or table"
 msgstr "Видалити дані або таблицю"
 
@@ -10331,7 +10349,7 @@ msgid "Cannot connect: invalid settings."
 msgstr "З'єднання неможливе: невірні налаштування."
 
 #: libraries/plugins/auth/AuthenticationConfig.class.php:108
-#: libraries/plugins/auth/AuthenticationCookie.class.php:134
+#: libraries/plugins/auth/AuthenticationCookie.class.php:122
 #: libraries/plugins/auth/AuthenticationHttp.class.php:96
 #, php-format
 msgid "Welcome to %s"
@@ -10362,36 +10380,36 @@ msgstr ""
 msgid "Retry to connect"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:146
+#: libraries/plugins/auth/AuthenticationCookie.class.php:134
 msgid "Your session has expired. Please log in again."
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:170
+#: libraries/plugins/auth/AuthenticationCookie.class.php:158
 msgid "Log in"
 msgstr "Вхід в систему"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:178
-#: libraries/plugins/auth/AuthenticationCookie.class.php:188
+#: libraries/plugins/auth/AuthenticationCookie.class.php:166
+#: libraries/plugins/auth/AuthenticationCookie.class.php:176
 msgid "You can enter hostname/IP address and port separated by space."
 msgstr "Ви можете ввести ім'я хоста / IP-адресу та порт через пробіл."
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:193
+#: libraries/plugins/auth/AuthenticationCookie.class.php:181
 msgid "Username:"
 msgstr "Ім'я користувача:"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:205
+#: libraries/plugins/auth/AuthenticationCookie.class.php:193
 msgid "Server Choice:"
 msgstr "Вибір сервера:"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:386
+#: libraries/plugins/auth/AuthenticationCookie.class.php:374
 msgid "Entered captcha is wrong, try again!"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:396
+#: libraries/plugins/auth/AuthenticationCookie.class.php:384
 msgid "Please enter correct captcha!"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:423
+#: libraries/plugins/auth/AuthenticationCookie.class.php:411
 #, fuzzy
 #| msgid "Cannot log in to the MySQL server"
 msgid "You are not allowed to log in to this MySQL server!"
@@ -10490,7 +10508,7 @@ msgstr "Подія"
 #: libraries/plugins/export/ExportOdt.class.php:593
 #: libraries/plugins/export/ExportTexytext.class.php:428
 #: libraries/plugins/export/PMA_ExportPdf.class.php:313
-#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:984
 #: libraries/rte/rte_triggers.lib.php:377
 msgid "Definition"
 msgstr "Визначення"
@@ -10825,7 +10843,7 @@ msgid "Last check:"
 msgstr "Остання перевірка:"
 
 #: libraries/plugins/export/ExportSql.class.php:1399
-#: templates/structure/structure_table_row.phtml:183
+#: templates/database/structure/structure_table_row.phtml:183
 msgid "in use"
 msgstr "використовується"
 
@@ -11019,20 +11037,14 @@ msgstr "Просторове розширення MySQL не підтримує
 msgid "The imported file does not contain any data!"
 msgstr "Імпортований файл не містить даних!"
 
-#: libraries/plugins/import/ImportSql.class.php:169
+#: libraries/plugins/import/ImportSql.class.php:72
 msgid "SQL compatibility mode:"
 msgstr "Режим сумісності SQL:"
 
-#: libraries/plugins/import/ImportSql.class.php:181
+#: libraries/plugins/import/ImportSql.class.php:84
 msgid "Do not use <code>AUTO_INCREMENT</code> for zero values"
 msgstr "Не використовувати <code>AUTO_INCREMENT</code> для нульових значень"
 
-#: libraries/plugins/import/ImportSql.class.php:195
-#, fuzzy
-#| msgid "Read misses"
-msgid "Read as multibytes"
-msgstr "Пропуски читання"
-
 #: libraries/plugins/import/ImportXml.class.php:54
 msgid "XML"
 msgstr "XML"
@@ -11075,7 +11087,7 @@ msgid "Show grid"
 msgstr "Показати сітку"
 
 #: libraries/plugins/schema/SchemaPdf.class.php:94
-#: templates/structure/print_view_data_dictionary_link.phtml:6
+#: templates/database/structure/print_view_data_dictionary_link.phtml:6
 msgid "Data Dictionary"
 msgstr "Словник даних"
 
@@ -11106,7 +11118,7 @@ msgid "The %s table doesn't exist!"
 msgstr "Таблиця %s не існує!"
 
 #: libraries/plugins/schema/eps/Eps_Relation_Schema.class.php:321
-#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:309
+#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:323
 #, php-format
 msgid "Schema of the %s database - Page %s"
 msgstr "Схема бази даних %s - Сторінка %s"
@@ -11135,7 +11147,7 @@ msgstr "Зміст"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1005
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1028
 #: libraries/tracking.lib.php:884
-#: templates/structure/table_structure_header.phtml:11
+#: templates/table/structure/table_structure_header.phtml:11
 msgid "Extra"
 msgstr "Додатково"
 
@@ -11539,11 +11551,11 @@ msgstr ""
 "Створити необхідні таблиці за допомогою <code>examples/create_tables.sql</"
 "code>."
 
-#: libraries/relation.lib.php:360
+#: libraries/relation.lib.php:357
 msgid "Create a pma user and give access to these tables."
 msgstr "Створити користувача phpMyAdmin та дати йому доступ до цих таблиць."
 
-#: libraries/relation.lib.php:365
+#: libraries/relation.lib.php:360
 msgid ""
 "Enable advanced features in configuration file (<code>config.inc.php</"
 "code>), for example by starting from <code>config.sample.inc.php</code>."
@@ -11551,23 +11563,23 @@ msgstr ""
 "Підключіть додаткові функції в конфігураційному файлі (<code>config.inc.php</"
 "code>), почніть з прикладу в <code>config.sample.inc.php</code>."
 
-#: libraries/relation.lib.php:373
+#: libraries/relation.lib.php:365
 msgid "Re-login to phpMyAdmin to load the updated configuration file."
 msgstr ""
 "Перезайдіть в phpMyAdmin, щоб завантажити оновлений конфігураційний файл."
 
-#: libraries/relation.lib.php:1612
+#: libraries/relation.lib.php:1607
 msgid "no description"
 msgstr "без опису"
 
-#: libraries/relation.lib.php:1811
+#: libraries/relation.lib.php:1806
 msgid ""
 "You do not have necessary privileges to create a database named "
 "'phpmyadmin'. You may go to 'Operations' tab of any database to set up the "
 "phpMyAdmin configuration storage there."
 msgstr ""
 
-#: libraries/relation.lib.php:1928
+#: libraries/relation.lib.php:1923
 #, fuzzy, php-format
 #| msgid "Missing phpMyAdmin configuration storage tables"
 msgid ""
@@ -11575,21 +11587,21 @@ msgid ""
 "configuration storage there."
 msgstr "Відсутня таблиця для збереження конфігурації phpMyAdmin"
 
-#: libraries/relation.lib.php:1936
+#: libraries/relation.lib.php:1931
 #, fuzzy, php-format
 #| msgid "Missing phpMyAdmin configuration storage tables"
 msgid ""
 "%sCreate%s the phpMyAdmin configuration storage in the current database."
 msgstr "Відсутня таблиця для збереження конфігурації phpMyAdmin"
 
-#: libraries/relation.lib.php:1944
+#: libraries/relation.lib.php:1939
 #, fuzzy, php-format
 #| msgid "Missing phpMyAdmin configuration storage tables"
 msgid "%sCreate%s missing phpMyAdmin configuration storage tables."
 msgstr "Відсутня таблиця для збереження конфігурації phpMyAdmin"
 
 #: libraries/replication_gui.lib.php:46 libraries/replication_gui.lib.php:343
-#: libraries/server_databases.lib.php:387
+#: libraries/server_databases.lib.php:398
 msgid "Master replication"
 msgstr "Головна реплікація"
 
@@ -11661,7 +11673,7 @@ msgstr ""
 "<b>налаштований</b> як головний."
 
 #: libraries/replication_gui.lib.php:141
-#: libraries/server_databases.lib.php:389
+#: libraries/server_databases.lib.php:400
 msgid "Slave replication"
 msgstr "Похідна реплікація"
 
@@ -11939,10 +11951,10 @@ msgid "Master server changed successfully to %s."
 msgstr "Головний сервер змінений на %s вдало."
 
 #: libraries/rte/rte_events.lib.php:106 libraries/rte/rte_events.lib.php:115
-#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:149
-#: libraries/rte/rte_routines.lib.php:158
-#: libraries/rte/rte_routines.lib.php:231
-#: libraries/rte/rte_routines.lib.php:1362
+#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:219
+#: libraries/rte/rte_routines.lib.php:246
+#: libraries/rte/rte_routines.lib.php:368
+#: libraries/rte/rte_routines.lib.php:1453
 #: libraries/rte/rte_triggers.lib.php:82 libraries/rte/rte_triggers.lib.php:91
 #: libraries/rte/rte_triggers.lib.php:123
 #, php-format
@@ -11963,7 +11975,7 @@ msgstr "Подію %1$s було змінено."
 msgid "Event %1$s has been created."
 msgstr "Подія %1$s була створена."
 
-#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:251
+#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:266
 #: libraries/rte/rte_triggers.lib.php:144
 msgid "One or more errors have occurred while processing your request:"
 msgstr "Одна або декілька помилок виникли під час обробки вашого запиту:"
@@ -11972,7 +11984,7 @@ msgstr "Одна або декілька помилок виникли під ч
 msgid "Edit event"
 msgstr "Редагувати подію"
 
-#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:794
+#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:885
 #: libraries/rte/rte_triggers.lib.php:323 view_create.php:180
 msgid "Details"
 msgstr "Деталі"
@@ -11985,7 +11997,7 @@ msgstr "Назва події"
 msgid "Event type"
 msgstr "Тип події"
 
-#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:817
+#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:908
 #, php-format
 msgid "Change to %s"
 msgstr "Змінити на %s"
@@ -12012,12 +12024,14 @@ msgstr "Кінець"
 msgid "On completion preserve"
 msgstr "По завершенні збереження"
 
-#: libraries/rte/rte_events.lib.php:491 libraries/rte/rte_routines.lib.php:930
+#: libraries/rte/rte_events.lib.php:491
+#: libraries/rte/rte_routines.lib.php:1021
 #: libraries/rte/rte_triggers.lib.php:383 view_create.php:209
 msgid "Definer"
 msgstr "Визначник"
 
-#: libraries/rte/rte_events.lib.php:535 libraries/rte/rte_routines.lib.php:997
+#: libraries/rte/rte_events.lib.php:535
+#: libraries/rte/rte_routines.lib.php:1088
 #: libraries/rte/rte_triggers.lib.php:422
 msgid "The definer must be in the \"username@hostname\" format!"
 msgstr "Визначник повинен бути в форматі \"username@hostname\"!"
@@ -12043,9 +12057,9 @@ msgid "You must provide an event definition."
 msgstr "Ви повинні задати визначення події."
 
 #: libraries/rte/rte_export.lib.php:43 libraries/rte/rte_general.lib.php:72
-#: libraries/rte/rte_routines.lib.php:345
-#: libraries/rte/rte_routines.lib.php:1198
-#: libraries/rte/rte_routines.lib.php:1411
+#: libraries/rte/rte_routines.lib.php:153
+#: libraries/rte/rte_routines.lib.php:1289
+#: libraries/rte/rte_routines.lib.php:1502
 msgid "Error in processing request:"
 msgstr "Помилка при обробці запиту:"
 
@@ -12077,97 +12091,97 @@ msgid ""
 "problems."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:110
-#: libraries/rte/rte_routines.lib.php:1006
+#: libraries/rte/rte_routines.lib.php:123
+msgid "Edit routine"
+msgstr "Редагувати порядок"
+
+#: libraries/rte/rte_routines.lib.php:200
+#: libraries/rte/rte_routines.lib.php:1097
 #, php-format
 msgid "Invalid routine type: \"%s\""
 msgstr "Неправильний тип порядку: \"%s\""
 
-#: libraries/rte/rte_routines.lib.php:170
+#: libraries/rte/rte_routines.lib.php:253
+#, php-format
+msgid "Routine %1$s has been created."
+msgstr "Порядок %1$s створено."
+
+#: libraries/rte/rte_routines.lib.php:380
 msgid "Sorry, we failed to restore the dropped routine."
 msgstr "Вибачте, нам невдалось відновити видалений порядок."
 
-#: libraries/rte/rte_routines.lib.php:211
+#: libraries/rte/rte_routines.lib.php:439
 #, fuzzy, php-format
 #| msgid "Routine %1$s has been modified."
 msgid "Routine %1$s has been modified. Privileges have been adjusted."
 msgstr "Порядок %1$s було змінено."
 
-#: libraries/rte/rte_routines.lib.php:216
+#: libraries/rte/rte_routines.lib.php:444
 #, php-format
 msgid "Routine %1$s has been modified."
 msgstr "Порядок %1$s було змінено."
 
-#: libraries/rte/rte_routines.lib.php:238
-#, php-format
-msgid "Routine %1$s has been created."
-msgstr "Порядок %1$s створено."
-
-#: libraries/rte/rte_routines.lib.php:315
-msgid "Edit routine"
-msgstr "Редагувати порядок"
-
-#: libraries/rte/rte_routines.lib.php:797
+#: libraries/rte/rte_routines.lib.php:888
 msgid "Routine name"
 msgstr "Назва порядку"
 
-#: libraries/rte/rte_routines.lib.php:823
+#: libraries/rte/rte_routines.lib.php:914
 msgid "Parameters"
 msgstr "Параметри"
 
-#: libraries/rte/rte_routines.lib.php:829
+#: libraries/rte/rte_routines.lib.php:920
 msgid "Direction"
 msgstr "Напрямок"
 
-#: libraries/rte/rte_routines.lib.php:847
+#: libraries/rte/rte_routines.lib.php:938
 msgid "Add parameter"
 msgstr "Додати параметр"
 
-#: libraries/rte/rte_routines.lib.php:851
+#: libraries/rte/rte_routines.lib.php:942
 msgid "Remove last parameter"
 msgstr "Видалити останній параметр"
 
-#: libraries/rte/rte_routines.lib.php:856
+#: libraries/rte/rte_routines.lib.php:947
 msgid "Return type"
 msgstr "Тип повернення"
 
-#: libraries/rte/rte_routines.lib.php:862
+#: libraries/rte/rte_routines.lib.php:953
 msgid "Return length/values"
 msgstr "Повернути довжину/значення"
 
-#: libraries/rte/rte_routines.lib.php:868
+#: libraries/rte/rte_routines.lib.php:959
 msgid "Return options"
 msgstr "Опції повернення"
 
-#: libraries/rte/rte_routines.lib.php:899
+#: libraries/rte/rte_routines.lib.php:990
 msgid "Is deterministic"
 msgstr "Детермінований"
 
-#: libraries/rte/rte_routines.lib.php:920
+#: libraries/rte/rte_routines.lib.php:1011
 msgid ""
 "You do not have sufficient privileges to perform this operation; Please "
 "refer to the documentation for more details"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:935
+#: libraries/rte/rte_routines.lib.php:1026
 msgid "Security type"
 msgstr "Тип безпеки"
 
-#: libraries/rte/rte_routines.lib.php:944
+#: libraries/rte/rte_routines.lib.php:1035
 msgid "SQL data access"
 msgstr "Доступ до даних SQL"
 
-#: libraries/rte/rte_routines.lib.php:1013
+#: libraries/rte/rte_routines.lib.php:1104
 msgid "You must provide a routine name!"
 msgstr "Слід вказати назву процедури!"
 
-#: libraries/rte/rte_routines.lib.php:1047
+#: libraries/rte/rte_routines.lib.php:1138
 #, php-format
 msgid "Invalid direction \"%s\" given for parameter."
 msgstr "Неправильний напрямок \"%s\" задали для параметру."
 
-#: libraries/rte/rte_routines.lib.php:1069
-#: libraries/rte/rte_routines.lib.php:1131
+#: libraries/rte/rte_routines.lib.php:1160
+#: libraries/rte/rte_routines.lib.php:1222
 msgid ""
 "You must provide length/values for routine parameters of type ENUM, SET, "
 "VARCHAR and VARBINARY."
@@ -12175,24 +12189,24 @@ msgstr ""
 "Ви повинні задати довжину/значення для параметрів процедури, що мають тип "
 "ENUM, SET, VARCHAR і VARBINARY."
 
-#: libraries/rte/rte_routines.lib.php:1095
+#: libraries/rte/rte_routines.lib.php:1186
 msgid "You must provide a name and a type for each routine parameter."
 msgstr "Ви повинні задати ім'я і тип для кожного параметра процедури."
 
-#: libraries/rte/rte_routines.lib.php:1114
+#: libraries/rte/rte_routines.lib.php:1205
 msgid "You must provide a valid return type for the routine."
 msgstr "Необхідно задати коректний тип, що повертатиму процедуру."
 
-#: libraries/rte/rte_routines.lib.php:1174
+#: libraries/rte/rte_routines.lib.php:1265
 msgid "You must provide a routine definition."
 msgstr "Ви повинні задати визначення процедури."
 
-#: libraries/rte/rte_routines.lib.php:1285
+#: libraries/rte/rte_routines.lib.php:1376
 #, php-format
 msgid "Execution results of routine %s"
 msgstr "Результати виконання порядку %s"
 
-#: libraries/rte/rte_routines.lib.php:1340
+#: libraries/rte/rte_routines.lib.php:1431
 #, php-format
 msgid "%d row affected by the last statement inside the procedure."
 msgid_plural "%d rows affected by the last statement inside the procedure."
@@ -12200,13 +12214,13 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: libraries/rte/rte_routines.lib.php:1398
-#: libraries/rte/rte_routines.lib.php:1406
+#: libraries/rte/rte_routines.lib.php:1489
+#: libraries/rte/rte_routines.lib.php:1497
 msgid "Execute routine"
 msgstr "Виконати порядок"
 
-#: libraries/rte/rte_routines.lib.php:1485
-#: libraries/rte/rte_routines.lib.php:1488
+#: libraries/rte/rte_routines.lib.php:1576
+#: libraries/rte/rte_routines.lib.php:1579
 msgid "Routine parameters"
 msgstr "Параметри порядку"
 
@@ -12360,7 +12374,7 @@ msgid "Original position"
 msgstr "Початкова позиція"
 
 #: libraries/server_bin_log.lib.php:133
-#: templates/structure/display_table_stats.phtml:4
+#: templates/table/structure/display_table_stats.phtml:4
 msgid "Information"
 msgstr "Інформація"
 
@@ -12398,12 +12412,12 @@ msgstr ""
 "Примітка: Активізація збору статистики бази даних може спричинити значний "
 "трафік між веб сервером та сервером MySQL."
 
-#: libraries/server_databases.lib.php:364
-#: libraries/server_databases.lib.php:365
+#: libraries/server_databases.lib.php:366
+#: libraries/server_databases.lib.php:371
 msgid "Enable Statistics"
 msgstr "Дозволити статистику"
 
-#: libraries/server_databases.lib.php:481
+#: libraries/server_databases.lib.php:492
 #, php-format
 msgid "%1$d database has been dropped successfully."
 msgid_plural "%1$d databases have been dropped successfully."
@@ -12782,7 +12796,7 @@ msgid "You have revoked the privileges for %s."
 msgstr "Ви відмінили привілеї для %s."
 
 #: libraries/server_privileges.lib.php:2059
-#: libraries/server_privileges.lib.php:4290
+#: libraries/server_privileges.lib.php:4316
 #, fuzzy
 #| msgid "Add user group"
 msgid "Add user account"
@@ -12964,59 +12978,59 @@ msgstr "Видалення %s"
 msgid "The privileges were reloaded successfully."
 msgstr "Привілеї перезавантажено вдало."
 
-#: libraries/server_privileges.lib.php:3994
+#: libraries/server_privileges.lib.php:4003
 #, php-format
 msgid "The user %s already exists!"
 msgstr "Користувач %s вже існує!"
 
-#: libraries/server_privileges.lib.php:4232
+#: libraries/server_privileges.lib.php:4258
 #, php-format
 msgid "Privileges for %s"
 msgstr "Привілеї для %s"
 
-#: libraries/server_privileges.lib.php:4241
+#: libraries/server_privileges.lib.php:4267
 #: libraries/server_status_processes.lib.php:72
 #: libraries/server_user_groups.lib.php:39
 msgid "User"
 msgstr "Користувач"
 
-#: libraries/server_privileges.lib.php:4282
+#: libraries/server_privileges.lib.php:4308
 msgctxt "Create new user"
 msgid "New"
 msgstr "Новий"
 
-#: libraries/server_privileges.lib.php:4311
+#: libraries/server_privileges.lib.php:4337
 #, fuzzy
 #| msgid "Edit Privileges:"
 msgid "Edit privileges:"
 msgstr "Редагувати привілеї:"
 
-#: libraries/server_privileges.lib.php:4312
+#: libraries/server_privileges.lib.php:4338
 #, fuzzy
 #| msgid "User groups"
 msgid "User account"
 msgstr "Групи користувачів"
 
-#: libraries/server_privileges.lib.php:4371
+#: libraries/server_privileges.lib.php:4397
 msgid ""
 "Note: You are attempting to edit privileges of the user with which you are "
 "currently logged in."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4391 libraries/server_users.lib.php:25
+#: libraries/server_privileges.lib.php:4417 libraries/server_users.lib.php:25
 #, fuzzy
 #| msgid "Users overview"
 msgid "User accounts overview"
 msgstr "Перегляд користувачів"
 
-#: libraries/server_privileges.lib.php:4459
+#: libraries/server_privileges.lib.php:4485
 msgid ""
 "A user account allowing any user from localhost to connect is present. This "
 "will prevent other users from connecting if the host part of their account "
 "allows a connection from any (%) host."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4500
+#: libraries/server_privileges.lib.php:4526
 #, php-format
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
@@ -13029,7 +13043,7 @@ msgstr ""
 "сервером, якщо в цю таблицю вносилися зміни вручну. У цьому випадку Вам "
 "необхідно %sперезавантажити права%s перед продовженням."
 
-#: libraries/server_privileges.lib.php:4519
+#: libraries/server_privileges.lib.php:4545
 #, fuzzy
 #| msgid ""
 #| "Note: phpMyAdmin gets the users' privileges directly from MySQL's "
@@ -13048,25 +13062,25 @@ msgstr ""
 "сервером, якщо в цю таблицю вносилися зміни вручну. У цьому випадку Вам "
 "необхідно %sперезавантажити права%s перед продовженням."
 
-#: libraries/server_privileges.lib.php:4569
+#: libraries/server_privileges.lib.php:4595
 msgid "The selected user was not found in the privilege table."
 msgstr "Вказаного користувача не знайдено в таблиці прав."
 
-#: libraries/server_privileges.lib.php:4801
+#: libraries/server_privileges.lib.php:4827
 msgid "You have added a new user."
 msgstr "Ви додали нового користувача."
 
-#: libraries/server_status.lib.php:53
+#: libraries/server_status.lib.php:60
 #, php-format
 msgid "Network traffic since startup: %s"
 msgstr "Мережевий трафік з моменту запуску: %s"
 
-#: libraries/server_status.lib.php:66
+#: libraries/server_status.lib.php:73
 #, php-format
 msgid "This MySQL server has been running for %1$s. It started up on %2$s."
 msgstr "Цей сервер MySQL працює %1$s. Стартував %2$s."
 
-#: libraries/server_status.lib.php:80
+#: libraries/server_status.lib.php:94
 msgid ""
 "This MySQL server works as <b>master</b> and <b>slave</b> in <b>replication</"
 "b> process."
@@ -13074,19 +13088,19 @@ msgstr ""
 "Цей сервер MySQL в процесі <b>реплікації</b> працює як <b>master</b> та "
 "<b>slave</b>."
 
-#: libraries/server_status.lib.php:85
+#: libraries/server_status.lib.php:99
 msgid "This MySQL server works as <b>master</b> in <b>replication</b> process."
 msgstr "Цей сервер MySQL в процесі <b>реплікації</b> працює як <b>master</b>."
 
-#: libraries/server_status.lib.php:90
+#: libraries/server_status.lib.php:104
 msgid "This MySQL server works as <b>slave</b> in <b>replication</b> process."
 msgstr "Цей сервер MySQL в процесі <b>реплікації</b> працює як <b>slave</b>."
 
-#: libraries/server_status.lib.php:106
+#: libraries/server_status.lib.php:116
 msgid "Replication status"
 msgstr "Стан реплікації"
 
-#: libraries/server_status.lib.php:137
+#: libraries/server_status.lib.php:146
 msgid ""
 "On a busy server, the byte counters may overrun, so those statistics as "
 "reported by the MySQL server may be incorrect."
@@ -13094,21 +13108,21 @@ msgstr ""
 "На зайнятому сервері лічильники байтів можуть переповнитися, тому "
 "статистичні дані сервера MySQL можуть бути хибними."
 
-#: libraries/server_status.lib.php:148
+#: libraries/server_status.lib.php:157
 msgid "Received"
 msgstr "Отримано"
 
-#: libraries/server_status.lib.php:167
+#: libraries/server_status.lib.php:176
 msgid "Sent"
 msgstr "Відправлено"
 
-#: libraries/server_status.lib.php:234
+#: libraries/server_status.lib.php:243
 #, fuzzy
 #| msgid "max. concurrent connections"
 msgid "Max. concurrent connections"
 msgstr "макс. кількість одночасних підключень"
 
-#: libraries/server_status.lib.php:244
+#: libraries/server_status.lib.php:253
 msgid "Failed attempts"
 msgstr "Невдалих спроб"
 
@@ -14186,7 +14200,7 @@ msgstr ""
 msgid "Not implemented yet."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/AlterOperation.php:193
+#: libraries/sql-parser/src/Components/AlterOperation.php:191
 #, fuzzy
 #| msgid "Iconic table operations"
 msgid "Unrecognized alter operation."
@@ -14202,7 +14216,7 @@ msgid "An opening bracket followed by a set of values was expected."
 msgstr ""
 
 #: libraries/sql-parser/src/Components/ArrayObj.php:101
-#: libraries/sql-parser/src/Components/FieldDefinition.php:202
+#: libraries/sql-parser/src/Components/CreateDefinition.php:202
 msgid "An opening bracket was expected."
 msgstr ""
 
@@ -14210,25 +14224,35 @@ msgstr ""
 msgid "A comma or a closing bracket was expected"
 msgstr ""
 
+#: libraries/sql-parser/src/Components/CreateDefinition.php:246
+#, fuzzy
+#| msgid "No tables selected."
+msgid "A comma or a closing bracket was expected."
+msgstr "Жодної таблиці не обрано."
+
+#: libraries/sql-parser/src/Components/CreateDefinition.php:262
+msgid "A closing bracket was expected."
+msgstr ""
+
 #: libraries/sql-parser/src/Components/DataType.php:125
 msgid "Unrecognized data type."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:225
+#: libraries/sql-parser/src/Components/Expression.php:227
 msgid "Unexpected closing bracket."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:246
-#: libraries/sql-parser/src/Components/Expression.php:283
-#: libraries/sql-parser/src/Components/Expression.php:303
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:285
+#: libraries/sql-parser/src/Components/Expression.php:305
 msgid "An alias was previously found."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:257
+#: libraries/sql-parser/src/Components/Expression.php:259
 msgid "Unexpected dot."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:327
+#: libraries/sql-parser/src/Components/Expression.php:329
 #, fuzzy
 #| msgid "No tables selected."
 msgid "An alias was expected."
@@ -14240,16 +14264,6 @@ msgstr "Жодної таблиці не обрано."
 msgid "An expression was expected."
 msgstr "Рядків не вибрано"
 
-#: libraries/sql-parser/src/Components/FieldDefinition.php:246
-#, fuzzy
-#| msgid "No tables selected."
-msgid "A comma or a closing bracket was expected."
-msgstr "Жодної таблиці не обрано."
-
-#: libraries/sql-parser/src/Components/FieldDefinition.php:262
-msgid "A closing bracket was expected."
-msgstr ""
-
 #: libraries/sql-parser/src/Components/Limit.php:90
 #: libraries/sql-parser/src/Components/Limit.php:112
 msgid "An offset was expected."
@@ -14297,29 +14311,29 @@ msgstr ""
 msgid "Expected delimiter."
 msgstr ""
 
-#: libraries/sql-parser/src/Lexer.php:753
+#: libraries/sql-parser/src/Lexer.php:777
 #, fuzzy, php-format
 #| msgid "Event %1$s has been created."
 msgid "Ending quote %1$s was expected."
 msgstr "Подія %1$s була створена."
 
-#: libraries/sql-parser/src/Lexer.php:789
+#: libraries/sql-parser/src/Lexer.php:813
 #, fuzzy
 #| msgid "Table name template"
 msgid "Variable name was expected."
 msgstr "Шаблон імені таблиці"
 
-#: libraries/sql-parser/src/Parser.php:380
+#: libraries/sql-parser/src/Parser.php:391
 #, fuzzy
 #| msgid "At Beginning of Table"
 msgid "Unexpected beginning of statement."
 msgstr "На початку таблиці"
 
-#: libraries/sql-parser/src/Parser.php:399
+#: libraries/sql-parser/src/Parser.php:410
 msgid "Unrecognized statement type."
 msgstr ""
 
-#: libraries/sql-parser/src/Parser.php:479
+#: libraries/sql-parser/src/Parser.php:489
 msgid "No transaction was previously started."
 msgstr ""
 
@@ -14349,8 +14363,10 @@ msgid "The name of the entity was expected."
 msgstr "Кількість відкритих таблиць."
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:310
-msgid "At least one field definition was expected."
-msgstr ""
+#, fuzzy
+#| msgid "The row has been deleted."
+msgid "At least one column definition was expected."
+msgstr "Рядок видалено."
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:329
 msgid "A \"RETURNS\" keyword was expected."
@@ -14409,11 +14425,11 @@ msgstr "Закладка не створена!"
 msgid "Using bookmark \"%s\" as default browse query."
 msgstr "Як стандартний запит на огляд даних використовується закладка  \"%s\"."
 
-#: libraries/sql.lib.php:1306
+#: libraries/sql.lib.php:1300
 msgid "Showing as PHP code"
 msgstr "Показ у вигляді коду PHP"
 
-#: libraries/sql.lib.php:1638
+#: libraries/sql.lib.php:1632
 #, fuzzy, php-format
 #| msgid ""
 #| "Current selection does not contain a unique column. Grid edit, checkbox, "
@@ -14425,7 +14441,7 @@ msgstr ""
 "Це виділення не містить унікальні стовпчики. Сітка редагування, прапорець, "
 "функції Редагувати, Копіювати та Видаляти недоступні."
 
-#: libraries/sql.lib.php:1649
+#: libraries/sql.lib.php:1643
 #, fuzzy, php-format
 #| msgid ""
 #| "Current selection does not contain a unique column. Grid edit, checkbox, "
@@ -14437,7 +14453,7 @@ msgstr ""
 "Це виділення не містить унікальні стовпчики. Сітка редагування, прапорець, "
 "функції Редагувати, Копіювати та Видаляти недоступні."
 
-#: libraries/sql.lib.php:1688
+#: libraries/sql.lib.php:1682
 #, php-format
 msgid "Problems with indexes of table `%s`"
 msgstr "Проблеми з індексами таблиці `%s`"
@@ -14599,7 +14615,7 @@ msgid "Version %s snapshot (SQL code)"
 msgstr "Знімок версії %s (SQL код)"
 
 #: libraries/tracking.lib.php:947
-#: templates/structure/table_structure_row.phtml:33
+#: templates/table/structure/table_structure_row.phtml:33
 msgctxt "None for default"
 msgid "None"
 msgstr "Немає"
@@ -14655,15 +14671,15 @@ msgstr "Створити версію %1$s із %2$s"
 msgid "Version %1$s was created, tracking for %2$s is active."
 msgstr ""
 
-#: libraries/user_preferences.inc.php:29
+#: libraries/user_preferences.inc.php:30
 msgid "Manage your settings"
 msgstr "Керування налаштуваннями"
 
-#: libraries/user_preferences.inc.php:46 prefs_manage.php:307
+#: libraries/user_preferences.inc.php:54 prefs_manage.php:307
 msgid "Configuration has been saved."
 msgstr "Конфігурація була збережена."
 
-#: libraries/user_preferences.inc.php:66
+#: libraries/user_preferences.inc.php:74
 #, php-format
 msgid ""
 "Your preferences will be saved for current session only. Storing them "
@@ -15066,7 +15082,7 @@ msgid "first"
 msgstr ""
 
 #: templates/columns_definitions/move_column.phtml:12
-#: templates/structure/add_column.phtml:21
+#: templates/table/structure/add_column.phtml:21
 #, php-format
 msgid "after %s"
 msgstr "після %s"
@@ -15143,203 +15159,309 @@ msgstr "Перетворення МІМЕ-типу бровзером"
 msgid "Input transformation options"
 msgstr "Опції перетворення"
 
-#: templates/designer/aggregate_query_panel.phtml:22
-#: templates/designer/options_panel.phtml:100
+#: templates/database/create_table.phtml:7
+#: templates/database/designer/side_menu.phtml:77
+#: templates/database/designer/side_menu.phtml:80
+msgid "Create table"
+msgstr "Створити таблицю"
+
+#: templates/database/create_table.phtml:15
+msgid "Number of columns"
+msgstr "Число колонок"
+
+#: templates/database/designer/aggregate_query_panel.phtml:22
+#: templates/database/designer/options_panel.phtml:100
 msgid "Aggregate"
 msgstr "Загальний"
 
-#: templates/designer/aggregate_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:61
-#: templates/designer/options_panel.phtml:106
-#: templates/designer/options_panel.phtml:170
-#: templates/designer/where_query_panel.phtml:30
-#: templates/table/table_header.phtml:9
+#: templates/database/designer/aggregate_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:61
+#: templates/database/designer/options_panel.phtml:106
+#: templates/database/designer/options_panel.phtml:170
+#: templates/database/designer/where_query_panel.phtml:30
+#: templates/table/search/table_header.phtml:9
 msgid "Operator"
 msgstr "Оператор"
 
-#: templates/designer/database_tables.phtml:29
+#: templates/database/designer/database_tables.phtml:29
 msgid "Toggle"
 msgstr ""
 
-#: templates/designer/database_tables.phtml:40
+#: templates/database/designer/database_tables.phtml:40
 #, fuzzy
 #| msgid "Table structure"
 msgid "See table structure"
 msgstr "Структура таблиці"
 
-#: templates/designer/delete_relation_panel.phtml:21
+#: templates/database/designer/delete_relation_panel.phtml:21
 msgid "Delete relation"
 msgstr "Видалити зв'язок"
 
-#: templates/designer/edit_delete_pages.phtml:7
+#: templates/database/designer/edit_delete_pages.phtml:7
 msgid "Page to open"
 msgstr "Відкрити сторінку"
 
-#: templates/designer/edit_delete_pages.phtml:7
+#: templates/database/designer/edit_delete_pages.phtml:7
 msgid "Page to delete"
 msgstr "Видалити сторінку"
 
-#: templates/designer/having_query_panel.phtml:90
-#: templates/designer/options_panel.phtml:63
-#: templates/designer/options_panel.phtml:229
-#: templates/designer/where_query_panel.phtml:59
+#: templates/database/designer/having_query_panel.phtml:90
+#: templates/database/designer/options_panel.phtml:63
+#: templates/database/designer/options_panel.phtml:229
+#: templates/database/designer/where_query_panel.phtml:59
 msgid "Except"
 msgstr "За винятком"
 
-#: templates/designer/having_query_panel.phtml:102
-#: templates/designer/options_panel.phtml:75
-#: templates/designer/options_panel.phtml:241
-#: templates/designer/where_query_panel.phtml:71
+#: templates/database/designer/having_query_panel.phtml:102
+#: templates/database/designer/options_panel.phtml:75
+#: templates/database/designer/options_panel.phtml:241
+#: templates/database/designer/where_query_panel.phtml:71
 msgid "subquery"
 msgstr "підзапит"
 
-#: templates/designer/new_relation_panel.phtml:22
-#: templates/designer/side_menu.phtml:84 templates/designer/side_menu.phtml:87
+#: templates/database/designer/new_relation_panel.phtml:22
+#: templates/database/designer/side_menu.phtml:84
+#: templates/database/designer/side_menu.phtml:87
 msgid "Create relation"
 msgstr "Створити зв'язок"
 
-#: templates/designer/options_panel.phtml:34
-#: templates/designer/options_panel.phtml:200
+#: templates/database/designer/options_panel.phtml:34
+#: templates/database/designer/options_panel.phtml:200
 msgid "Relation operator"
 msgstr "Перегляд залежностей"
 
-#: templates/designer/options_panel.phtml:85
-#: templates/designer/rename_to_panel.phtml:23
+#: templates/database/designer/options_panel.phtml:85
+#: templates/database/designer/rename_to_panel.phtml:23
 msgid "Rename to"
 msgstr "Перейменувати у"
 
-#: templates/designer/options_panel.phtml:91
-#: templates/designer/rename_to_panel.phtml:31
+#: templates/database/designer/options_panel.phtml:91
+#: templates/database/designer/rename_to_panel.phtml:31
 msgid "New name"
 msgstr "Нове ім'я"
 
-#: templates/designer/page_save_as.phtml:4
+#: templates/database/designer/page_save_as.phtml:4
 msgid "Save to selected page"
 msgstr "Зберегти на обрану сторінку"
 
-#: templates/designer/page_save_as.phtml:5
+#: templates/database/designer/page_save_as.phtml:5
 msgid "Create a page and save to it"
 msgstr "Створити сторінку та зберегти на неї"
 
-#: templates/designer/page_save_as.phtml:26
+#: templates/database/designer/page_save_as.phtml:26
 msgid "New page name"
 msgstr "Назва нової сторінки"
 
-#: templates/designer/page_selector.phtml:2
+#: templates/database/designer/page_selector.phtml:2
 msgid "Select page"
 msgstr "Вибрати сторінку"
 
-#: templates/designer/query_details.phtml:10
+#: templates/database/designer/query_details.phtml:10
 msgid "Active options"
 msgstr "Активовані опції"
 
-#: templates/designer/schema_export.phtml:4
+#: templates/database/designer/schema_export.phtml:4
 msgid "Select Export Relational Type"
 msgstr "Виберіть тип експорту зв'язків"
 
-#: templates/designer/side_menu.phtml:19 templates/designer/side_menu.phtml:25
+#: templates/database/designer/side_menu.phtml:19
+#: templates/database/designer/side_menu.phtml:25
 #, fuzzy
 #| msgid "Showing tables:"
 msgid "Show/Hide tables list"
 msgstr "Показ таблиць:"
 
-#: templates/designer/side_menu.phtml:29 templates/designer/side_menu.phtml:35
-#: templates/designer/side_menu.phtml:36
+#: templates/database/designer/side_menu.phtml:29
+#: templates/database/designer/side_menu.phtml:35
+#: templates/database/designer/side_menu.phtml:36
 msgid "View in fullscreen"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:34
+#: templates/database/designer/side_menu.phtml:34
 msgid "Exit fullscreen"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:41 templates/designer/side_menu.phtml:45
+#: templates/database/designer/side_menu.phtml:41
+#: templates/database/designer/side_menu.phtml:45
 msgid "New page"
 msgstr "Нова сторінка"
 
-#: templates/designer/side_menu.phtml:70 templates/designer/side_menu.phtml:73
+#: templates/database/designer/side_menu.phtml:70
+#: templates/database/designer/side_menu.phtml:73
 msgid "Delete pages"
 msgstr "Видалити сторінки"
 
-#: templates/designer/side_menu.phtml:77 templates/designer/side_menu.phtml:80
-#: templates/table/create_table.phtml:7
-msgid "Create table"
-msgstr "Створити таблицю"
-
-#: templates/designer/side_menu.phtml:98
-#: templates/designer/side_menu.phtml:101
+#: templates/database/designer/side_menu.phtml:98
+#: templates/database/designer/side_menu.phtml:101
 msgid "Reload"
 msgstr "Перезавантажити"
 
-#: templates/designer/side_menu.phtml:107
-#: templates/designer/side_menu.phtml:110
+#: templates/database/designer/side_menu.phtml:107
+#: templates/database/designer/side_menu.phtml:110
 msgid "Help"
 msgstr "Допомога"
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Angular links"
 msgstr "Кутові посилання"
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Direct links"
 msgstr "Пряме посилання"
 
-#: templates/designer/side_menu.phtml:122
-#: templates/designer/side_menu.phtml:124
+#: templates/database/designer/side_menu.phtml:122
+#: templates/database/designer/side_menu.phtml:124
 msgid "Snap to grid"
 msgstr "Прив'язати до сітки"
 
-#: templates/designer/side_menu.phtml:128
-#: templates/designer/side_menu.phtml:134
+#: templates/database/designer/side_menu.phtml:128
+#: templates/database/designer/side_menu.phtml:134
 msgid "Small/Big All"
 msgstr "Маленькі/Великі Всі"
 
-#: templates/designer/side_menu.phtml:138
-#: templates/designer/side_menu.phtml:141
+#: templates/database/designer/side_menu.phtml:138
+#: templates/database/designer/side_menu.phtml:141
 msgid "Toggle small/big"
 msgstr "Переключити маленькі/великі"
 
-#: templates/designer/side_menu.phtml:145
-#: templates/designer/side_menu.phtml:148
+#: templates/database/designer/side_menu.phtml:145
+#: templates/database/designer/side_menu.phtml:148
 msgid "Toggle relation lines"
 msgstr "Змінити лінії зв'язків"
 
-#: templates/designer/side_menu.phtml:153
-#: templates/designer/side_menu.phtml:156
+#: templates/database/designer/side_menu.phtml:153
+#: templates/database/designer/side_menu.phtml:156
 msgid "Export schema"
 msgstr "Експортувати схему"
 
-#: templates/designer/side_menu.phtml:165
-#: templates/designer/side_menu.phtml:168
+#: templates/database/designer/side_menu.phtml:165
+#: templates/database/designer/side_menu.phtml:168
 msgid "Build Query"
 msgstr "Cкласти запит"
 
-#: templates/designer/side_menu.phtml:173
-#: templates/designer/side_menu.phtml:177
+#: templates/database/designer/side_menu.phtml:173
+#: templates/database/designer/side_menu.phtml:177
 msgid "Move Menu"
 msgstr "Посунути меню"
 
-#: templates/designer/side_menu.phtml:181
-#: templates/designer/side_menu.phtml:186
+#: templates/database/designer/side_menu.phtml:181
+#: templates/database/designer/side_menu.phtml:186
 #, fuzzy
 #| msgid "Partial texts"
 msgid "Pin text"
 msgstr "Часткові тексти"
 
-#: templates/designer/table_list.phtml:4
+#: templates/database/designer/table_list.phtml:4
 msgid "Hide/Show all"
 msgstr "Сховати/Показати все"
 
-#: templates/designer/table_list.phtml:14
+#: templates/database/designer/table_list.phtml:14
 msgid "Hide/Show Tables with no relation"
 msgstr "Сховати/Показати Таблиці які не мають зв'язків"
 
-#: templates/designer/table_list.phtml:59
+#: templates/database/designer/table_list.phtml:59
 msgid "Number of tables:"
 msgstr "Число таблиць:"
 
+#: templates/database/structure/body_for_table_summary.phtml:6
+#, php-format
+msgid "%s table"
+msgid_plural "%s tables"
+msgstr[0] "%s таблиця"
+msgstr[1] "%s таблиці"
+msgstr[2] "%s таблиць"
+
+#: templates/database/structure/body_for_table_summary.phtml:17
+msgid "Sum"
+msgstr "Всього"
+
+#: templates/database/structure/check_all_tables.phtml:6
+msgid "Check tables having overhead"
+msgstr "Перевірити чи мають таблиці накладні витрати"
+
+#: templates/database/structure/check_all_tables.phtml:10
+#, fuzzy
+#| msgid "Show color"
+msgid "Show create"
+msgstr "Показати колір"
+
+#: templates/database/structure/check_all_tables.phtml:27
+#, fuzzy
+#| msgid "Add prefix"
+msgid "Prefix"
+msgstr "Додати префікс"
+
+#: templates/database/structure/check_all_tables.phtml:28
+msgid "Add prefix to table"
+msgstr "Додати префікс до таблиці"
+
+#: templates/database/structure/check_all_tables.phtml:29
+msgid "Replace table prefix"
+msgstr "Замінити префікс таблиці"
+
+#: templates/database/structure/check_all_tables.phtml:30
+msgid "Copy table with prefix"
+msgstr "Копіювати таблицю з префіксом"
+
+#: templates/database/structure/check_all_tables.phtml:36
+#, fuzzy
+#| msgid "CHAR textarea columns"
+msgid "Add columns to central list"
+msgstr "стовпці текстового поля типу CHAR"
+
+#: templates/database/structure/check_all_tables.phtml:37
+msgid "Remove columns from central list"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:38
+#, fuzzy
+#| msgid "CHAR textarea columns"
+msgid "Make consistent with central list"
+msgstr "стовпці текстового поля типу CHAR"
+
+#: templates/database/structure/favorite_anchor.phtml:12
+msgid "Add to Favorites"
+msgstr "Додати до обраного"
+
+#: templates/database/structure/show_create.phtml:2
+#, fuzzy
+#| msgid "Show SQL queries"
+msgid "Showing create queries"
+msgstr "Показувати SQL-запити"
+
+#: templates/database/structure/sortable_header.phtml:13
+msgid "Sort"
+msgstr "Посортувати"
+
+#: templates/database/structure/table_header.phtml:42
+#, fuzzy
+#| msgid "May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]."
+msgid ""
+"May be approximate. Click on the number to get the exact count. See "
+"[doc@faq3-11]FAQ 3.11[/doc]."
+msgstr "Може бути приблизним. Дивіться [doc@faq3-11]FAQ 3.11 [/doc]."
+
+#: templates/database/structure/table_header.phtml:66
+#: templates/table/index_form.phtml:127
+msgid "Size"
+msgstr "Розмір"
+
+#: templates/database/structure/table_header.phtml:74
+#: templates/table/structure/display_table_stats.phtml:27
+msgid "Overhead"
+msgstr "Надмірні видатки"
+
+#: templates/database/structure/tracking_icon.phtml:4
+msgid "Tracking is active."
+msgstr "Трекінг є активним."
+
+#: templates/database/structure/tracking_icon.phtml:8
+msgid "Tracking is not active."
+msgstr "Трекінг не активний."
+
 #: templates/error/report_form.phtml:7
 msgid ""
 "phpMyAdmin has encountered an error. We have collected data about this error "
@@ -15355,65 +15477,6 @@ msgstr ""
 msgid "Please explain the steps that lead to the error:"
 msgstr ""
 
-#: templates/gis_visualization/gis_visualization.phtml:3
-msgid "Display GIS Visualization"
-msgstr "Показати ГІС візуалізацію"
-
-#: templates/gis_visualization/gis_visualization.phtml:8
-msgid "Label column"
-msgstr "Мітка стовпчика"
-
-#: templates/gis_visualization/gis_visualization.phtml:11
-msgid "-- None --"
-msgstr "-- Немає --"
-
-#: templates/gis_visualization/gis_visualization.phtml:19
-msgid "Spatial column"
-msgstr "Просторовий стовпчик"
-
-#: templates/index_form.phtml:16
-msgid "Index name:"
-msgstr "Назва індекса&nbsp;:"
-
-#: templates/index_form.phtml:19
-msgid ""
-"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
-msgstr "\"PRIMARY\" <b>повинно</b> бути іменем <b>лише</b> первинного ключа!"
-
-#: templates/index_form.phtml:40
-#, fuzzy
-#| msgid "Index cache size"
-msgid "Index choice:"
-msgstr "Розмір кешу індексу"
-
-#: templates/index_form.phtml:57
-msgid "Key block size:"
-msgstr ""
-
-#: templates/index_form.phtml:74
-msgid "Index type:"
-msgstr "Тип індекса&nbsp;:"
-
-#: templates/index_form.phtml:86
-#, fuzzy
-#| msgid "User:"
-msgid "Parser:"
-msgstr "Користувач:"
-
-#: templates/index_form.phtml:102
-msgid "Comment:"
-msgstr "Коментар:"
-
-#: templates/index_form.phtml:127 templates/structure/table_header.phtml:66
-msgid "Size"
-msgstr "Розмір"
-
-#: templates/index_form.phtml:149 templates/index_form.phtml:190
-#, fuzzy
-#| msgid "Drag to reorder."
-msgid "Drag to reorder"
-msgstr "Перетягніть для зміни порядку."
-
 #: templates/prefs_autoload.phtml:9
 msgid ""
 "Your browser has phpMyAdmin configuration for this domain. Would you like to "
@@ -15426,388 +15489,160 @@ msgstr ""
 msgid "Start row:"
 msgstr "Початковий рядок:"
 
-#: templates/structure/actions_in_table_structure.phtml:14
-#, php-format
-msgid "A primary key has been added on %s."
-msgstr "Було додано первинний ключ до %s."
-
-#: templates/structure/actions_in_table_structure.phtml:34
-#: templates/structure/actions_in_table_structure.phtml:54
-#: templates/structure/actions_in_table_structure.phtml:79
-#: templates/structure/actions_in_table_structure.phtml:101
-#, php-format
-msgid "An index has been added on %s."
-msgstr "Було додано індекс для %s."
-
-#: templates/structure/actions_in_table_structure.phtml:130
-#: templates/structure/check_all_table_column.phtml:59
-#, fuzzy
-#| msgid "Remove chart"
-msgid "Remove from central columns"
-msgstr "Вилучити діаграму"
-
-#: templates/structure/actions_in_table_structure.phtml:138
-#: templates/structure/check_all_table_column.phtml:55
-#, fuzzy
-#| msgid "CHAR textarea columns"
-msgid "Add to central columns"
-msgstr "стовпці текстового поля типу CHAR"
-
-#: templates/structure/add_column.phtml:7
-#, php-format
-msgid "Add %s column(s)"
-msgstr "Додати %s стовпчик(ів)"
-
-#: templates/structure/add_column.phtml:12
-#, fuzzy
-#| msgid "At Beginning of Table"
-msgid "at beginning of table"
-msgstr "На початку таблиці"
-
-#: templates/structure/body_for_table_summary.phtml:6
-#, php-format
-msgid "%s table"
-msgid_plural "%s tables"
-msgstr[0] "%s таблиця"
-msgstr[1] "%s таблиці"
-msgstr[2] "%s таблиць"
-
-#: templates/structure/body_for_table_summary.phtml:17
-msgid "Sum"
-msgstr "Всього"
-
-#: templates/structure/check_all_tables.phtml:6
-msgid "Check tables having overhead"
-msgstr "Перевірити чи мають таблиці накладні витрати"
-
-#: templates/structure/check_all_tables.phtml:10
-#, fuzzy
-#| msgid "Show color"
-msgid "Show create"
-msgstr "Показати колір"
-
-#: templates/structure/check_all_tables.phtml:27
-#, fuzzy
-#| msgid "Add prefix"
-msgid "Prefix"
-msgstr "Додати префікс"
-
-#: templates/structure/check_all_tables.phtml:28
-msgid "Add prefix to table"
-msgstr "Додати префікс до таблиці"
-
-#: templates/structure/check_all_tables.phtml:29
-msgid "Replace table prefix"
-msgstr "Замінити префікс таблиці"
-
-#: templates/structure/check_all_tables.phtml:30
-msgid "Copy table with prefix"
-msgstr "Копіювати таблицю з префіксом"
-
-#: templates/structure/check_all_tables.phtml:36
-#, fuzzy
-#| msgid "CHAR textarea columns"
-msgid "Add columns to central list"
-msgstr "стовпці текстового поля типу CHAR"
-
-#: templates/structure/check_all_tables.phtml:37
-msgid "Remove columns from central list"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:38
-#, fuzzy
-#| msgid "CHAR textarea columns"
-msgid "Make consistent with central list"
-msgstr "стовпці текстового поля типу CHAR"
-
-#: templates/structure/display_structure.phtml:140 view_create.php:181
-msgid "Edit view"
-msgstr "Редагувати подання"
-
-#: templates/structure/display_table_stats.phtml:9
-msgid "Space usage"
-msgstr "Простір, що використовується"
-
-#: templates/structure/display_table_stats.phtml:27
-#: templates/structure/table_header.phtml:74
-msgid "Overhead"
-msgstr "Надмірні видатки"
-
-#: templates/structure/display_table_stats.phtml:32
-msgid "Effective"
-msgstr "Ефективність"
-
-#: templates/structure/favorite_anchor.phtml:12
-msgid "Add to Favorites"
-msgstr "Додати до обраного"
-
-#: templates/structure/move_columns_dialog.phtml:1
-#: templates/structure/optional_action_links.phtml:21
-msgid "Move columns"
-msgstr "Перемістити стовпці"
-
-#: templates/structure/move_columns_dialog.phtml:2
-msgid "Move the columns by dragging them up and down."
-msgstr ""
-
-#: templates/structure/optional_action_links.phtml:9
-msgid "Propose table structure"
-msgstr "Запропонувати структуру таблиці"
-
-#: templates/structure/optional_action_links.phtml:24
-#, fuzzy
-#| msgid "Propose table structure"
-msgid "Improve table structure"
-msgstr "Запропонувати структуру таблиці"
-
-#: templates/structure/optional_action_links.phtml:30
-#, fuzzy
-#| msgid "Track table"
-msgid "Track view"
-msgstr "Відслідковувати таблицю"
-
-#: templates/structure/row_stats_table.phtml:3
-msgid "Row statistics"
-msgstr "Статистика рядка"
-
-#: templates/structure/row_stats_table.phtml:9
-msgid "static"
-msgstr "статичний"
-
-#: templates/structure/row_stats_table.phtml:11
-msgid "dynamic"
-msgstr "динамічний"
-
-#: templates/structure/row_stats_table.phtml:22
-msgid "partitioned"
-msgstr "розділений"
-
-#: templates/structure/row_stats_table.phtml:54
-msgid "Row length"
-msgstr "Довжина рядка"
-
-#: templates/structure/row_stats_table.phtml:66
-msgid "Row size"
-msgstr "Розмір рядка"
-
-#: templates/structure/row_stats_table.phtml:73
-msgid "Next autoindex"
-msgstr "Наступний автоіндекс"
-
-#: templates/structure/secondary_tabs.phtml:14
-#, fuzzy
-#| msgid "Relation view"
-msgid "Relation view"
-msgstr "Подання зв'язків"
-
-#: templates/structure/show_create.phtml:2
-#, fuzzy
-#| msgid "Show SQL queries"
-msgid "Showing create queries"
-msgstr "Показувати SQL-запити"
-
-#: templates/structure/sortable_header.phtml:13
-msgid "Sort"
-msgstr "Посортувати"
-
-#: templates/structure/table_header.phtml:42
-#, fuzzy
-#| msgid "May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]."
-msgid ""
-"May be approximate. Click on the number to get the exact count. See "
-"[doc@faq3-11]FAQ 3.11[/doc]."
-msgstr "Може бути приблизним. Дивіться [doc@faq3-11]FAQ 3.11 [/doc]."
-
-#: templates/structure/table_structure_row.phtml:46
-#, php-format
-msgid "Column %s has been dropped."
-msgstr "Стовпчик %s було знищено."
-
-#: templates/structure/tracking_icon.phtml:4
-msgid "Tracking is active."
-msgstr "Трекінг є активним."
-
-#: templates/structure/tracking_icon.phtml:8
-msgid "Tracking is not active."
-msgstr "Трекінг не активний."
-
-#: templates/table/create_table.phtml:15
-msgid "Number of columns"
-msgstr "Число колонок"
-
-#: templates/table/options.phtml:8
-msgid "Select columns (at least one):"
-msgstr "Виберіть стовпці (принаймні один):"
-
-#: templates/table/options.phtml:37
-msgid "Add search conditions (body of the \"where\" clause):"
-msgstr "Додати умови пошуку (тіло для умови \"where\"):"
-
-#: templates/table/options.phtml:45
-msgid "Number of rows per page"
-msgstr "записів на сторінці"
-
-#: templates/table/options.phtml:56
-msgid "Display order:"
-msgstr "Порядок перегляду:"
-
-#: templates/table/options_zoom.phtml:6
-msgid "Use this column to label each point"
-msgstr "Використовуйте цей стовпчик для позначення кожній точці"
-
-#: templates/table/options_zoom.phtml:35
-msgid "Maximum rows to plot"
-msgstr "Максимальна кількість рядків для побудови графіку"
-
-#: templates/table/replace_preview.phtml:13
-msgid "Find and replace - preview"
-msgstr "Знайти і замінити - попередній перегляд"
-
-#: templates/table/replace_preview.phtml:18
-msgid "Original string"
-msgstr "Початковий рядок"
-
-#: templates/table/replace_preview.phtml:19
-msgid "Replaced string"
-msgstr "Рядок заміни"
-
-#: templates/table/replace_preview.phtml:40
-msgid "Replace"
-msgstr "Заміна"
-
-#: templates/table/rows_zoom.phtml:16
-msgid "Additional search criteria"
-msgstr "Додаткові критерії пошуку"
-
-#: templates/table/search_and_replace.phtml:3
-msgid "Replace with:"
-msgstr "Замінити на:"
-
-#: templates/table/search_and_replace.phtml:22
-msgid "Use regular expression"
-msgstr "Використувати регулярний вираз"
-
-#: templates/table/selection_form.phtml:12
-msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
-msgstr ""
-"Виконати \"запит згідно прикладу\" (символ підставновки: \"%\") для двох "
-"різних стовпчиків"
-
-#: templates/table/selection_form.phtml:34
-msgid "Do a \"query by example\" (wildcard: \"%\")"
-msgstr "Виконати \"запит згідно прикладу\" (символ підставновки: \"%\")"
-
-#: templates/table/zoom_result_form.phtml:7
-msgid "Browse/Edit the points"
-msgstr "Оглянути/Редагувати точки"
-
-#: templates/table/zoom_result_form.phtml:15
-msgid "How to use"
-msgstr "Як використовувати"
-
-#: templates/table/zoom_result_form.phtml:23
-msgid "Reset zoom"
-msgstr "Скидання масштабу"
-
-#: templates/tbl_chart.phtml:17
+#: templates/table/chart/tbl_chart.phtml:17
 msgctxt "Chart type"
 msgid "Bar"
 msgstr "Прямокутник"
 
-#: templates/tbl_chart.phtml:21
+#: templates/table/chart/tbl_chart.phtml:21
 msgctxt "Chart type"
 msgid "Column"
 msgstr "Стовпчик"
 
-#: templates/tbl_chart.phtml:25
+#: templates/table/chart/tbl_chart.phtml:25
 msgctxt "Chart type"
 msgid "Line"
 msgstr "Лінія"
 
-#: templates/tbl_chart.phtml:29
+#: templates/table/chart/tbl_chart.phtml:29
 msgctxt "Chart type"
 msgid "Spline"
 msgstr "Крива"
 
-#: templates/tbl_chart.phtml:33
+#: templates/table/chart/tbl_chart.phtml:33
 msgctxt "Chart type"
 msgid "Area"
 msgstr ""
 
-#: templates/tbl_chart.phtml:37
+#: templates/table/chart/tbl_chart.phtml:37
 msgctxt "Chart type"
 msgid "Pie"
 msgstr "Пиріг"
 
-#: templates/tbl_chart.phtml:41
+#: templates/table/chart/tbl_chart.phtml:41
 msgctxt "Chart type"
 msgid "Timeline"
 msgstr "Часова шкала"
 
-#: templates/tbl_chart.phtml:45
+#: templates/table/chart/tbl_chart.phtml:45
 msgctxt "Chart type"
 msgid "Scatter"
 msgstr ""
 
-#: templates/tbl_chart.phtml:50
+#: templates/table/chart/tbl_chart.phtml:50
 msgid "Stacked"
 msgstr "Кладка"
 
-#: templates/tbl_chart.phtml:53
+#: templates/table/chart/tbl_chart.phtml:53
 msgid "Chart title"
 msgstr "Назва графіку"
 
-#: templates/tbl_chart.phtml:57
+#: templates/table/chart/tbl_chart.phtml:57
 msgid "X-Axis:"
 msgstr "Вісь X:"
 
-#: templates/tbl_chart.phtml:72
+#: templates/table/chart/tbl_chart.phtml:72
 msgid "Series:"
 msgstr "Серії:"
 
-#: templates/tbl_chart.phtml:102
+#: templates/table/chart/tbl_chart.phtml:102
 msgid "X-Axis label:"
 msgstr "Мітка вісі X:"
 
-#: templates/tbl_chart.phtml:104
+#: templates/table/chart/tbl_chart.phtml:104
 msgid "X Values"
 msgstr "Значення X"
 
-#: templates/tbl_chart.phtml:107
+#: templates/table/chart/tbl_chart.phtml:107
 msgid "Y-Axis label:"
 msgstr "Мітка вісі Y:"
 
-#: templates/tbl_chart.phtml:115
+#: templates/table/chart/tbl_chart.phtml:115
 msgid "Series names are in a column"
 msgstr ""
 
-#: templates/tbl_chart.phtml:118
+#: templates/table/chart/tbl_chart.phtml:118
 #, fuzzy
 #| msgid "Inside column:"
 msgid "Series column:"
 msgstr "Всередині стовпчика:"
 
-#: templates/tbl_chart.phtml:130
+#: templates/table/chart/tbl_chart.phtml:130
 #, fuzzy
 #| msgid "Values for column %s"
 msgid "Value Column:"
 msgstr "Значення для колонки %s"
 
-#: templates/tbl_chart.phtml:150
+#: templates/table/chart/tbl_chart.phtml:150
 #, fuzzy
 #| msgid "Save as file"
 msgid "Save chart as image"
 msgstr "Зберегти як файл"
 
-#: templates/tbl_relation/common_form.phtml:7
+#: templates/table/gis_visualization/gis_visualization.phtml:3
+msgid "Display GIS Visualization"
+msgstr "Показати ГІС візуалізацію"
+
+#: templates/table/gis_visualization/gis_visualization.phtml:8
+msgid "Label column"
+msgstr "Мітка стовпчика"
+
+#: templates/table/gis_visualization/gis_visualization.phtml:11
+msgid "-- None --"
+msgstr "-- Немає --"
+
+#: templates/table/gis_visualization/gis_visualization.phtml:19
+msgid "Spatial column"
+msgstr "Просторовий стовпчик"
+
+#: templates/table/index_form.phtml:16
+msgid "Index name:"
+msgstr "Назва індекса&nbsp;:"
+
+#: templates/table/index_form.phtml:19
+msgid ""
+"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
+msgstr "\"PRIMARY\" <b>повинно</b> бути іменем <b>лише</b> первинного ключа!"
+
+#: templates/table/index_form.phtml:40
+#, fuzzy
+#| msgid "Index cache size"
+msgid "Index choice:"
+msgstr "Розмір кешу індексу"
+
+#: templates/table/index_form.phtml:57
+msgid "Key block size:"
+msgstr ""
+
+#: templates/table/index_form.phtml:74
+msgid "Index type:"
+msgstr "Тип індекса&nbsp;:"
+
+#: templates/table/index_form.phtml:86
+#, fuzzy
+#| msgid "User:"
+msgid "Parser:"
+msgstr "Користувач:"
+
+#: templates/table/index_form.phtml:102
+msgid "Comment:"
+msgstr "Коментар:"
+
+#: templates/table/index_form.phtml:149 templates/table/index_form.phtml:190
+#, fuzzy
+#| msgid "Drag to reorder."
+msgid "Drag to reorder"
+msgstr "Перетягніть для зміни порядку."
+
+#: templates/table/relation/common_form.phtml:7
 msgid "Internal relations"
 msgstr "Інтернаціональні зв'язки"
 
-#: templates/tbl_relation/common_form.phtml:11
+#: templates/table/relation/common_form.phtml:11
 msgid "Internal relation"
 msgstr "Внутрішні відносини"
 
-#: templates/tbl_relation/common_form.phtml:14
+#: templates/table/relation/common_form.phtml:14
 msgid ""
 "An internal relation is not necessary when a corresponding FOREIGN KEY "
 "relation exists."
@@ -15815,59 +15650,247 @@ msgstr ""
 "Внутрішній зв'язок не вимагається, якщо існує відповідний зв'язок за "
 "допомогою зовнішнього ключа (FOREIGN KEY)."
 
-#: templates/tbl_relation/common_form.phtml:37
+#: templates/table/relation/common_form.phtml:37
 #, fuzzy
 #| msgid "Foreign key constraint"
 msgid "Foreign key constraints"
 msgstr "Обмеження зовнішнього ключа"
 
-#: templates/tbl_relation/common_form.phtml:40
+#: templates/table/relation/common_form.phtml:40
 #, fuzzy
 #| msgid "Action"
 msgid "Actions"
 msgstr "Дія"
 
-#: templates/tbl_relation/common_form.phtml:41
+#: templates/table/relation/common_form.phtml:41
 #, fuzzy
 #| msgid "Constraints for table"
 msgid "Constraint properties"
 msgstr "Обмеження зовнішнього ключа таблиці"
 
-#: templates/tbl_relation/common_form.phtml:44
+#: templates/table/relation/common_form.phtml:44
 msgid ""
 "Only columns with index will be displayed. You can define an index below."
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:49
+#: templates/table/relation/common_form.phtml:49
 msgid "Foreign key constraint"
 msgstr "Обмеження зовнішнього ключа"
 
-#: templates/tbl_relation/common_form.phtml:81
+#: templates/table/relation/common_form.phtml:81
 #, fuzzy
 #| msgid "Add constraints"
 msgid "+ Add constraint"
 msgstr "Додати обмеження"
 
-#: templates/tbl_relation/common_form.phtml:91
+#: templates/table/relation/common_form.phtml:91
 msgid "Choose column to display:"
 msgstr "Виберіть стовпець для відображення:"
 
-#: templates/tbl_relation/foreign_key_row.phtml:13
+#: templates/table/relation/foreign_key_row.phtml:13
 #, fuzzy, php-format
 #| msgid "Foreign key constraint"
 msgid "Foreign key constraint %s has been dropped"
 msgstr "Обмеження зовнішнього ключа"
 
-#: templates/tbl_relation/foreign_key_row.phtml:102
+#: templates/table/relation/foreign_key_row.phtml:102
 msgid "Constraint name"
 msgstr "Обмеження зовнішнього ключа"
 
-#: templates/tbl_relation/foreign_key_row.phtml:157
+#: templates/table/relation/foreign_key_row.phtml:157
 #, fuzzy
 #| msgid "Add column"
 msgid "+ Add column"
 msgstr "Додати стовпчик"
 
+#: templates/table/search/options.phtml:8
+msgid "Select columns (at least one):"
+msgstr "Виберіть стовпці (принаймні один):"
+
+#: templates/table/search/options.phtml:37
+msgid "Add search conditions (body of the \"where\" clause):"
+msgstr "Додати умови пошуку (тіло для умови \"where\"):"
+
+#: templates/table/search/options.phtml:45
+msgid "Number of rows per page"
+msgstr "записів на сторінці"
+
+#: templates/table/search/options.phtml:56
+msgid "Display order:"
+msgstr "Порядок перегляду:"
+
+#: templates/table/search/options_zoom.phtml:6
+msgid "Use this column to label each point"
+msgstr "Використовуйте цей стовпчик для позначення кожній точці"
+
+#: templates/table/search/options_zoom.phtml:35
+msgid "Maximum rows to plot"
+msgstr "Максимальна кількість рядків для побудови графіку"
+
+#: templates/table/search/replace_preview.phtml:13
+msgid "Find and replace - preview"
+msgstr "Знайти і замінити - попередній перегляд"
+
+#: templates/table/search/replace_preview.phtml:18
+msgid "Original string"
+msgstr "Початковий рядок"
+
+#: templates/table/search/replace_preview.phtml:19
+msgid "Replaced string"
+msgstr "Рядок заміни"
+
+#: templates/table/search/replace_preview.phtml:40
+msgid "Replace"
+msgstr "Заміна"
+
+#: templates/table/search/rows_zoom.phtml:16
+msgid "Additional search criteria"
+msgstr "Додаткові критерії пошуку"
+
+#: templates/table/search/search_and_replace.phtml:3
+msgid "Replace with:"
+msgstr "Замінити на:"
+
+#: templates/table/search/search_and_replace.phtml:22
+msgid "Use regular expression"
+msgstr "Використувати регулярний вираз"
+
+#: templates/table/search/selection_form.phtml:12
+msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
+msgstr ""
+"Виконати \"запит згідно прикладу\" (символ підставновки: \"%\") для двох "
+"різних стовпчиків"
+
+#: templates/table/search/selection_form.phtml:34
+msgid "Do a \"query by example\" (wildcard: \"%\")"
+msgstr "Виконати \"запит згідно прикладу\" (символ підставновки: \"%\")"
+
+#: templates/table/search/zoom_result_form.phtml:7
+msgid "Browse/Edit the points"
+msgstr "Оглянути/Редагувати точки"
+
+#: templates/table/search/zoom_result_form.phtml:15
+msgid "How to use"
+msgstr "Як використовувати"
+
+#: templates/table/search/zoom_result_form.phtml:23
+msgid "Reset zoom"
+msgstr "Скидання масштабу"
+
+#: templates/table/secondary_tabs.phtml:14
+#, fuzzy
+#| msgid "Relation view"
+msgid "Relation view"
+msgstr "Подання зв'язків"
+
+#: templates/table/structure/actions_in_table_structure.phtml:14
+#, php-format
+msgid "A primary key has been added on %s."
+msgstr "Було додано первинний ключ до %s."
+
+#: templates/table/structure/actions_in_table_structure.phtml:34
+#: templates/table/structure/actions_in_table_structure.phtml:54
+#: templates/table/structure/actions_in_table_structure.phtml:79
+#: templates/table/structure/actions_in_table_structure.phtml:101
+#, php-format
+msgid "An index has been added on %s."
+msgstr "Було додано індекс для %s."
+
+#: templates/table/structure/actions_in_table_structure.phtml:130
+#: templates/table/structure/check_all_table_column.phtml:59
+#, fuzzy
+#| msgid "Remove chart"
+msgid "Remove from central columns"
+msgstr "Вилучити діаграму"
+
+#: templates/table/structure/actions_in_table_structure.phtml:138
+#: templates/table/structure/check_all_table_column.phtml:55
+#, fuzzy
+#| msgid "CHAR textarea columns"
+msgid "Add to central columns"
+msgstr "стовпці текстового поля типу CHAR"
+
+#: templates/table/structure/add_column.phtml:7
+#, php-format
+msgid "Add %s column(s)"
+msgstr "Додати %s стовпчик(ів)"
+
+#: templates/table/structure/add_column.phtml:12
+#, fuzzy
+#| msgid "At Beginning of Table"
+msgid "at beginning of table"
+msgstr "На початку таблиці"
+
+#: templates/table/structure/display_structure.phtml:140 view_create.php:181
+msgid "Edit view"
+msgstr "Редагувати подання"
+
+#: templates/table/structure/display_table_stats.phtml:9
+msgid "Space usage"
+msgstr "Простір, що використовується"
+
+#: templates/table/structure/display_table_stats.phtml:32
+msgid "Effective"
+msgstr "Ефективність"
+
+#: templates/table/structure/move_columns_dialog.phtml:1
+#: templates/table/structure/optional_action_links.phtml:21
+msgid "Move columns"
+msgstr "Перемістити стовпці"
+
+#: templates/table/structure/move_columns_dialog.phtml:2
+msgid "Move the columns by dragging them up and down."
+msgstr ""
+
+#: templates/table/structure/optional_action_links.phtml:9
+msgid "Propose table structure"
+msgstr "Запропонувати структуру таблиці"
+
+#: templates/table/structure/optional_action_links.phtml:24
+#, fuzzy
+#| msgid "Propose table structure"
+msgid "Improve table structure"
+msgstr "Запропонувати структуру таблиці"
+
+#: templates/table/structure/optional_action_links.phtml:30
+#, fuzzy
+#| msgid "Track table"
+msgid "Track view"
+msgstr "Відслідковувати таблицю"
+
+#: templates/table/structure/row_stats_table.phtml:3
+msgid "Row statistics"
+msgstr "Статистика рядка"
+
+#: templates/table/structure/row_stats_table.phtml:9
+msgid "static"
+msgstr "статичний"
+
+#: templates/table/structure/row_stats_table.phtml:11
+msgid "dynamic"
+msgstr "динамічний"
+
+#: templates/table/structure/row_stats_table.phtml:22
+msgid "partitioned"
+msgstr "розділений"
+
+#: templates/table/structure/row_stats_table.phtml:54
+msgid "Row length"
+msgstr "Довжина рядка"
+
+#: templates/table/structure/row_stats_table.phtml:66
+msgid "Row size"
+msgstr "Розмір рядка"
+
+#: templates/table/structure/row_stats_table.phtml:73
+msgid "Next autoindex"
+msgstr "Наступний автоіндекс"
+
+#: templates/table/structure/table_structure_row.phtml:46
+#, php-format
+msgid "Column %s has been dropped."
+msgstr "Стовпчик %s було знищено."
+
 #: themes.php:17 themes.php:22
 msgid "Theme"
 msgstr "Тема"
@@ -17195,6 +17218,11 @@ msgstr ""
 msgid "concurrent_insert is set to 0"
 msgstr "concurrent_insert встановлено у 0"
 
+#, fuzzy
+#~| msgid "Read misses"
+#~ msgid "Read as multibytes"
+#~ msgstr "Пропуски читання"
+
 #~ msgid "Relational display column"
 #~ msgstr "Стовпчик відображення зв'язків"
 
diff --git a/po/ur.po b/po/ur.po
index b140810fc3..f0addcbf77 100644
--- a/po/ur.po
+++ b/po/ur.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 4.5.0-dev\n"
 "Report-Msgid-Bugs-To: developers@phpmyadmin.net\n"
-"POT-Creation-Date: 2015-08-08 13:53-0400\n"
+"POT-Creation-Date: 2015-08-12 08:10-0400\n"
 "PO-Revision-Date: 2014-03-27 15:22+0200\n"
 "Last-Translator: Michal Čihař <michal@cihar.com>\n"
 "Language-Team: Urdu <https://hosted.weblate.org/projects/phpmyadmin/master/"
@@ -60,7 +60,7 @@ msgid "Table comments:"
 msgstr "جدول تبصرات:"
 
 #: db_datadict.php:104 libraries/Index.class.php:699
-#: libraries/insert_edit.lib.php:1567
+#: libraries/insert_edit.lib.php:1565
 #: libraries/navigation/Nodes/Node_Column.class.php:30
 #: libraries/plugins/export/ExportHtmlword.class.php:280
 #: libraries/plugins/export/ExportHtmlword.class.php:375
@@ -74,13 +74,14 @@ msgstr "جدول تبصرات:"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1023
 #: libraries/tracking.lib.php:879 libraries/tracking.lib.php:975
 #: templates/columns_definitions/column_name.phtml:18
-#: templates/index_form.phtml:124 templates/table/table_header.phtml:6
-#: templates/table/zoom_result_form.phtml:33
-#: templates/tbl_relation/common_form.phtml:10
-#: templates/tbl_relation/common_form.phtml:43
-#: templates/tbl_relation/foreign_key_row.phtml:194
-#: templates/tbl_relation/foreign_key_row.phtml:206
-#: templates/tbl_relation/internal_relational_row.phtml:71
+#: templates/table/index_form.phtml:124
+#: templates/table/relation/common_form.phtml:10
+#: templates/table/relation/common_form.phtml:43
+#: templates/table/relation/foreign_key_row.phtml:194
+#: templates/table/relation/foreign_key_row.phtml:206
+#: templates/table/relation/internal_relational_row.phtml:71
+#: templates/table/search/table_header.phtml:6
+#: templates/table/search/zoom_result_form.phtml:33
 msgid "Column"
 msgstr "کالم"
 
@@ -98,21 +99,21 @@ msgstr "کالم"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1001
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1024
 #: libraries/rte/rte_list.lib.php:75 libraries/rte/rte_list.lib.php:103
-#: libraries/rte/rte_routines.lib.php:802
-#: libraries/rte/rte_routines.lib.php:831
-#: libraries/rte/rte_routines.lib.php:1493
+#: libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_routines.lib.php:922
+#: libraries/rte/rte_routines.lib.php:1584
 #: libraries/server_privileges.lib.php:2369 libraries/tracking.lib.php:880
 #: libraries/tracking.lib.php:972
 #: templates/columns_definitions/table_fields_definitions.phtml:11
-#: templates/structure/table_header.phtml:48
-#: templates/structure/table_structure_header.phtml:6
-#: templates/table/table_header.phtml:7
+#: templates/database/structure/table_header.phtml:48
+#: templates/table/search/table_header.phtml:7
+#: templates/table/structure/table_structure_header.phtml:6
 msgid "Type"
 msgstr "قِسم"
 
 #: db_datadict.php:106 libraries/Index.class.php:702
 #: libraries/central_columns.lib.php:708
-#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1576
+#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1574
 #: libraries/plugins/export/ExportHtmlword.class.php:286
 #: libraries/plugins/export/ExportHtmlword.class.php:381
 #: libraries/plugins/export/ExportLatex.class.php:509
@@ -125,8 +126,8 @@ msgstr "قِسم"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1026
 #: libraries/tracking.lib.php:882 libraries/tracking.lib.php:978
 #: templates/columns_definitions/table_fields_definitions.phtml:39
-#: templates/structure/table_structure_header.phtml:9
-#: templates/table/zoom_result_form.phtml:34
+#: templates/table/search/zoom_result_form.phtml:34
+#: templates/table/structure/table_structure_header.phtml:9
 msgid "Null"
 msgstr "خالی"
 
@@ -144,8 +145,8 @@ msgstr "خالی"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1027
 #: libraries/replication_gui.lib.php:153 libraries/tracking.lib.php:883
 #: templates/columns_definitions/table_fields_definitions.phtml:25
-#: templates/structure/body_for_table_summary.phtml:55
-#: templates/structure/table_structure_header.phtml:10
+#: templates/database/structure/body_for_table_summary.phtml:55
+#: templates/table/structure/table_structure_header.phtml:10
 msgid "Default"
 msgstr "طے شدہ"
 
@@ -173,19 +174,19 @@ msgid "Comments"
 msgstr "تبصرات"
 
 #: db_datadict.php:146
-#: libraries/controllers/StructureController.class.php:1960
-#: libraries/controllers/StructureController.class.php:1965
+#: libraries/controllers/TableStructureController.class.php:951
+#: libraries/controllers/TableStructureController.class.php:956
 #: libraries/tracking.lib.php:922
 #: templates/columns_definitions/column_indexes.phtml:6
-#: templates/structure/check_all_table_column.phtml:22
-#: templates/structure/display_structure.phtml:74
+#: templates/table/structure/check_all_table_column.phtml:22
+#: templates/table/structure/display_structure.phtml:74
 msgid "Primary"
 msgstr ""
 
 #: db_datadict.php:156 js/messages.php:317 libraries/Index.class.php:567
 #: libraries/Index.class.php:606 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261 libraries/mult_submits.lib.php:403
+#: libraries/config/FormDisplay.tpl.php:272 libraries/mult_submits.lib.php:403
 #: libraries/mult_submits.lib.php:417
 #: libraries/plugins/export/ExportHtmlword.class.php:630
 #: libraries/plugins/export/ExportLatex.class.php:589
@@ -201,20 +202,20 @@ msgstr ""
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1010 libraries/tracking.lib.php:1015
 #: prefs_manage.php:140 templates/prefs_autoload.phtml:15
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "No"
 msgstr "نہیں"
 
 #: db_datadict.php:156 js/messages.php:443 libraries/Index.class.php:568
 #: libraries/Index.class.php:605 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261
-#: libraries/controllers/StructureController.class.php:1344
-#: libraries/controllers/StructureController.class.php:2223
-#: libraries/controllers/StructureController.class.php:2232
-#: libraries/controllers/StructureController.class.php:2237
-#: libraries/controllers/StructureController.class.php:2242
-#: libraries/controllers/StructureController.class.php:2247
+#: libraries/config/FormDisplay.tpl.php:272
+#: libraries/controllers/TableStructureController.class.php:539
+#: libraries/controllers/TableStructureController.class.php:1201
+#: libraries/controllers/TableStructureController.class.php:1210
+#: libraries/controllers/TableStructureController.class.php:1215
+#: libraries/controllers/TableStructureController.class.php:1220
+#: libraries/controllers/TableStructureController.class.php:1225
 #: libraries/mult_submits.inc.php:82 libraries/mult_submits.inc.php:178
 #: libraries/mult_submits.lib.php:339 libraries/mult_submits.lib.php:372
 #: libraries/mult_submits.lib.php:401 libraries/mult_submits.lib.php:415
@@ -223,8 +224,8 @@ msgstr "نہیں"
 #: libraries/plugins/export/ExportOdt.class.php:756
 #: libraries/plugins/export/ExportTexytext.class.php:567
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1077
-#: libraries/server_databases.lib.php:464
-#: libraries/server_databases.lib.php:474
+#: libraries/server_databases.lib.php:475
+#: libraries/server_databases.lib.php:485
 #: libraries/server_privileges.lib.php:2546
 #: libraries/server_privileges.lib.php:2727
 #: libraries/server_privileges.lib.php:2748
@@ -234,7 +235,7 @@ msgstr "نہیں"
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1008 libraries/tracking.lib.php:1013
 #: prefs_manage.php:138 templates/prefs_autoload.phtml:14
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "Yes"
 msgstr "ہاں"
 
@@ -244,7 +245,7 @@ msgstr "کوائفیہ کی ڈمپ (شجرہ) منظر کریں"
 
 #: db_export.php:37 db_tracking.php:90 export.php:382
 #: libraries/DBQbe.class.php:326
-#: libraries/controllers/StructureController.class.php:231
+#: libraries/controllers/DatabaseStructureController.class.php:170
 #: libraries/navigation/NavigationTree.class.php:897
 msgid "No tables found in database."
 msgstr "کوائفیہ میں جدول موجود نہیں۔"
@@ -255,14 +256,14 @@ msgstr "کوائفیہ میں جدول موجود نہیں۔"
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:26
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:120
-#: templates/structure/show_create.phtml:18
+#: templates/database/structure/show_create.phtml:18
 msgid "Tables"
 msgstr "جداول"
 
 #: db_export.php:52 libraries/Menu.class.php:317 libraries/Menu.class.php:425
-#: libraries/Util.class.php:3333 libraries/Util.class.php:3343
-#: libraries/Util.class.php:3349 libraries/Util.class.php:3629
-#: libraries/Util.class.php:4327 libraries/Util.class.php:4344
+#: libraries/Util.class.php:3339 libraries/Util.class.php:3349
+#: libraries/Util.class.php:3355 libraries/Util.class.php:3635
+#: libraries/Util.class.php:4333 libraries/Util.class.php:4350
 #: libraries/central_columns.lib.php:728 libraries/config.values.php:39
 #: libraries/config.values.php:47 libraries/config.values.php:109
 #: libraries/config.values.php:115 libraries/config/setup.forms.php:323
@@ -276,7 +277,7 @@ msgstr "جداول"
 #: libraries/navigation/Nodes/Node_Table.class.php:283
 #: libraries/server_privileges.lib.php:1141 libraries/tracking.lib.php:874
 #: templates/columns_definitions/table_fields_definitions.phtml:3
-#: templates/designer/table_list.phtml:28
+#: templates/database/designer/table_list.phtml:28
 msgid "Structure"
 msgstr "ساخت"
 
@@ -288,7 +289,7 @@ msgstr "ساخت"
 #: libraries/config/user_preferences.forms.php:292
 #: libraries/config/user_preferences.forms.php:297
 #: libraries/server_privileges.lib.php:1140
-#: templates/structure/display_table_stats.phtml:12
+#: templates/table/structure/display_table_stats.phtml:12
 msgid "Data"
 msgstr "کوائف"
 
@@ -374,10 +375,10 @@ msgstr "کھوج شدہ جداول"
 #: libraries/server_privileges.lib.php:2908
 #: libraries/server_privileges.lib.php:3145
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4346
-#: templates/structure/table_header.phtml:21
-#: templates/tbl_relation/foreign_key_row.phtml:176
-#: templates/tbl_relation/internal_relational_row.phtml:63
+#: libraries/server_privileges.lib.php:4372
+#: templates/database/structure/table_header.phtml:21
+#: templates/table/relation/foreign_key_row.phtml:176
+#: templates/table/relation/internal_relational_row.phtml:63
 msgid "Table"
 msgstr "جدول"
 
@@ -394,7 +395,7 @@ msgid "Updated"
 msgstr "تازہ کی گئی"
 
 #: db_tracking.php:130 js/messages.php:243 libraries/Menu.class.php:552
-#: libraries/Util.class.php:4314 libraries/config.values.php:104
+#: libraries/Util.class.php:4320 libraries/config.values.php:104
 #: libraries/rte/rte_events.lib.php:393 libraries/rte/rte_list.lib.php:101
 #: libraries/server_status_processes.lib.php:92 libraries/tracking.lib.php:279
 msgid "Status"
@@ -403,14 +404,15 @@ msgstr "حالت"
 #: db_tracking.php:131 db_tracking.php:290 libraries/Index.class.php:693
 #: libraries/central_columns.lib.php:687 libraries/rte/rte_list.lib.php:74
 #: libraries/rte/rte_list.lib.php:89 libraries/rte/rte_list.lib.php:102
-#: libraries/server_databases.lib.php:398
+#: libraries/server_databases.lib.php:409
 #: libraries/server_privileges.lib.php:2372
 #: libraries/server_privileges.lib.php:3166
 #: libraries/server_privileges.lib.php:3342
 #: libraries/server_user_groups.lib.php:82
 #: libraries/server_variables.lib.php:189 libraries/tracking.lib.php:280
-#: libraries/tracking.lib.php:793 templates/structure/table_header.phtml:30
-#: templates/structure/table_structure_header.phtml:23
+#: libraries/tracking.lib.php:793
+#: templates/database/structure/table_header.phtml:30
+#: templates/table/structure/table_structure_header.phtml:23
 msgid "Action"
 msgstr "عمل"
 
@@ -454,7 +456,7 @@ msgid "Untracked tables"
 msgstr "بغیر کھوج جداول"
 
 #: db_tracking.php:305 db_tracking.php:336
-#: templates/structure/optional_action_links.phtml:17
+#: templates/table/structure/optional_action_links.phtml:17
 msgid "Track table"
 msgstr "جدول کھوج"
 
@@ -507,7 +509,7 @@ msgid "Value for the column \"%s\""
 msgstr "کالم کی قدریں\"%s\""
 
 #: gis_data_editor.php:146
-#: templates/gis_visualization/gis_visualization.phtml:37
+#: templates/table/gis_visualization/gis_visualization.phtml:37
 msgid "Use OpenStreetMaps as Base Layer"
 msgstr "اوپن سٹریٹ میپ کو بطور بنیادی سطح استعمال کریں"
 
@@ -587,35 +589,35 @@ msgstr "جیومیٹری شامل کریں"
 #: libraries/display_change_password.lib.php:162
 #: libraries/display_export.lib.php:402 libraries/display_export.lib.php:408
 #: libraries/display_import.lib.php:392 libraries/index.lib.php:44
-#: libraries/insert_edit.lib.php:1546 libraries/insert_edit.lib.php:1583
+#: libraries/insert_edit.lib.php:1544 libraries/insert_edit.lib.php:1581
 #: libraries/normalization.lib.php:165 libraries/normalization.lib.php:821
 #: libraries/operations.lib.php:38 libraries/operations.lib.php:108
 #: libraries/operations.lib.php:263 libraries/operations.lib.php:306
 #: libraries/operations.lib.php:801 libraries/operations.lib.php:874
 #: libraries/operations.lib.php:923 libraries/operations.lib.php:1337
 #: libraries/operations.lib.php:1658
-#: libraries/plugins/auth/AuthenticationCookie.class.php:244
+#: libraries/plugins/auth/AuthenticationCookie.class.php:232
 #: libraries/replication_gui.lib.php:122 libraries/replication_gui.lib.php:161
 #: libraries/replication_gui.lib.php:324 libraries/replication_gui.lib.php:461
 #: libraries/replication_gui.lib.php:906 libraries/rte/rte_events.lib.php:509
-#: libraries/rte/rte_routines.lib.php:969
-#: libraries/rte/rte_routines.lib.php:1581
+#: libraries/rte/rte_routines.lib.php:1060
+#: libraries/rte/rte_routines.lib.php:1672
 #: libraries/rte/rte_triggers.lib.php:396 libraries/server_bin_log.lib.php:61
 #: libraries/server_privileges.lib.php:705
 #: libraries/server_privileges.lib.php:2106
 #: libraries/server_privileges.lib.php:2872
 #: libraries/server_privileges.lib.php:3553
-#: libraries/server_privileges.lib.php:4627
+#: libraries/server_privileges.lib.php:4653
 #: libraries/server_user_groups.lib.php:285
 #: libraries/sql_query_form.lib.php:369 libraries/sql_query_form.lib.php:429
 #: libraries/tracking.lib.php:533 libraries/tracking.lib.php:653
 #: prefs_manage.php:277 prefs_manage.php:355
 #: templates/columns_definitions/column_definitions_form.phtml:59
-#: templates/header_location.phtml:17 templates/index_form.phtml:238
+#: templates/database/create_table.phtml:21 templates/header_location.phtml:28
 #: templates/startAndNumberOfRowsPanel.phtml:14
-#: templates/structure/add_column.phtml:25
-#: templates/table/create_table.phtml:21
-#: templates/table/selection_form.phtml:75 view_create.php:275
+#: templates/table/index_form.phtml:238
+#: templates/table/search/selection_form.phtml:75
+#: templates/table/structure/add_column.phtml:25 view_create.php:275
 #: view_operations.php:106
 msgid "Go"
 msgstr "جائیں"
@@ -719,7 +721,7 @@ msgstr "حروف متبادل لائبریری کے بغیر مسل کے حرو
 msgid "Could not load import plugins, please check your installation!"
 msgstr "درآمد پلگ ان لوڈ نہیں ہو سکے، اپنی تنصیب کی پڑتال کریں!"
 
-#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1466
+#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1460
 #, fuzzy, php-format
 #| msgid "Bookmark %s created"
 msgid "Bookmark %s has been created."
@@ -761,11 +763,11 @@ msgstr ""
 msgid "Back"
 msgstr "واپس"
 
-#: index.php:148 libraries/Footer.class.php:70
+#: index.php:149 libraries/Footer.class.php:70
 msgid "phpMyAdmin Demo Server"
 msgstr "phpMyAdmin آزمائشی سرور"
 
-#: index.php:152
+#: index.php:153
 #, php-format
 msgid ""
 "You are using the demo server. You can do anything here, but please do not "
@@ -776,112 +778,112 @@ msgstr ""
 "DEBIAN-SYS-maint اور پی ایم اے صارفین کو براہ مہربانی مت تبدیل کیجیئے۔ مزید "
 "معلومات آپ کو %s پر مل جائیں گی."
 
-#: index.php:162
+#: index.php:163
 msgid "General Settings"
 msgstr "عمومی ترتیبات"
 
-#: index.php:190 libraries/display_change_password.lib.php:50
+#: index.php:191 libraries/display_change_password.lib.php:50
 #: libraries/display_change_password.lib.php:53 user_password.php:247
 msgid "Change password"
 msgstr "خفیہ ہندسہ تبدیل کریں"
 
-#: index.php:206
+#: index.php:207
 msgid "Server connection collation"
 msgstr "سرور کنکشن مطابقت"
 
-#: index.php:228
+#: index.php:229
 msgid "Appearance Settings"
 msgstr "ظاہری ترتیبات"
 
-#: index.php:258 prefs_manage.php:285
+#: index.php:259 prefs_manage.php:285
 msgid "More settings"
 msgstr "مزید ترتیبات"
 
-#: index.php:279
+#: index.php:280
 msgid "Database server"
 msgstr "کوائفیہ سرور"
 
-#: index.php:282 libraries/plugins/auth/AuthenticationCookie.class.php:181
+#: index.php:283 libraries/plugins/auth/AuthenticationCookie.class.php:169
 msgid "Server:"
 msgstr "سرور:"
 
-#: index.php:286
+#: index.php:287
 msgid "Server type:"
 msgstr "قسم برائے سرور:"
 
-#: index.php:290 libraries/plugins/export/ExportLatex.class.php:212
+#: index.php:291 libraries/plugins/export/ExportLatex.class.php:212
 #: libraries/plugins/export/ExportSql.class.php:687
 #: libraries/plugins/export/ExportXml.class.php:189
 msgid "Server version:"
 msgstr "سرور نسخہ:"
 
-#: index.php:296
+#: index.php:297
 msgid "Protocol version:"
 msgstr "پروٹوکول نسخہ:"
 
-#: index.php:300
+#: index.php:301
 msgid "User:"
 msgstr "صارف:"
 
-#: index.php:305
+#: index.php:306
 msgid "Server charset:"
 msgstr "سرور حروف جدول:"
 
-#: index.php:320
+#: index.php:321
 msgid "Web server"
 msgstr "ویب سرور"
 
-#: index.php:331
+#: index.php:332
 msgid "Database client version:"
 msgstr "کوائفیہ صارف نسخہ:"
 
-#: index.php:335
+#: index.php:336
 msgid "PHP extension:"
 msgstr "پی ایچ پی توسیع:"
 
-#: index.php:349
+#: index.php:350
 #, fuzzy
 #| msgid "Versions"
 msgid "PHP version:"
 msgstr "نسخے"
 
-#: index.php:360
+#: index.php:361
 msgid "Show PHP information"
 msgstr "پی ایچ پی معلومات دکھائیں"
 
-#: index.php:383
+#: index.php:384
 msgid "Version information:"
 msgstr "نسخہ معلومات:"
 
-#: index.php:392 libraries/Util.class.php:432 libraries/Util.class.php:495
-#: libraries/config/FormDisplay.tpl.php:151
+#: index.php:393 libraries/Util.class.php:432 libraries/Util.class.php:495
+#: libraries/config/FormDisplay.tpl.php:162
 #: libraries/display_export.lib.php:577 libraries/engines/pbxt.lib.php:162
 #: libraries/navigation/NavigationHeader.class.php:196
 #: libraries/server_variables.lib.php:160
 msgid "Documentation"
 msgstr "دستاویزات"
 
-#: index.php:399
+#: index.php:400
 msgid "Wiki"
 msgstr "وکی"
 
-#: index.php:408
+#: index.php:409
 msgid "Official Homepage"
 msgstr "دفتری ویب گاہ"
 
-#: index.php:415
+#: index.php:416
 msgid "Contribute"
 msgstr "تعاون کریں"
 
-#: index.php:422
+#: index.php:423
 msgid "Get support"
 msgstr "مدد لیں"
 
-#: index.php:429
+#: index.php:430
 msgid "List of changes"
 msgstr "تبدیلیوں کی فہرست"
 
-#: index.php:451
+#: index.php:452
 #, fuzzy
 #| msgid ""
 #| "Your configuration file contains settings (root with no password) that "
@@ -899,7 +901,7 @@ msgstr ""
 "چل رہا ہوتا ہے جس میں مداخلت کا خطرہ ہوتا ہے اس لیے آپ کو چاہیے کہ منتظم "
 "صارف کے لیے لازمی خفیہ لفظ رکھیں۔"
 
-#: index.php:468
+#: index.php:469
 msgid ""
 "You have enabled mbstring.func_overload in your PHP configuration. This "
 "option is incompatible with phpMyAdmin and might cause some data to be "
@@ -909,14 +911,14 @@ msgstr ""
 "phpMyAdmin کے ساتھ مطابقت نہیں رکھتی اور ساتھ ساتھ اعداد و شمار خراب کرنے کا "
 "موجب بھی بن سکتی ہے!"
 
-#: index.php:483
+#: index.php:484
 msgid ""
 "The mbstring PHP extension was not found and you seem to be using a "
 "multibyte charset. Without the mbstring extension phpMyAdmin is unable to "
 "split strings correctly and it may result in unexpected results."
 msgstr ""
 
-#: index.php:500
+#: index.php:501
 msgid ""
 "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini."
 "session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower than "
@@ -924,17 +926,17 @@ msgid ""
 "expire sooner than configured in phpMyAdmin."
 msgstr ""
 
-#: index.php:519
+#: index.php:520
 msgid ""
 "Login cookie store is lower than cookie validity configured in phpMyAdmin, "
 "because of this, your login will expire sooner than configured in phpMyAdmin."
 msgstr ""
 
-#: index.php:535
+#: index.php:536
 msgid "The configuration file now needs a secret passphrase (blowfish_secret)."
 msgstr "تنصیبات کی مسل کو خفیہ لفظ (blowfish_secret) درکار ہے۔"
 
-#: index.php:548
+#: index.php:549
 msgid ""
 "Directory [code]config[/code], which is used by the setup script, still "
 "exists in your phpMyAdmin directory. It is strongly recommended to remove it "
@@ -942,7 +944,7 @@ msgid ""
 "may be compromised by unauthorized people downloading your configuration."
 msgstr ""
 
-#: index.php:564
+#: index.php:565
 #, fuzzy, php-format
 #| msgid ""
 #| " additional features for working with linked tables have been ctivated. "
@@ -954,19 +956,19 @@ msgstr ""
 "The additional features for working with linked tables have been "
 "deactivated. To find out why click %shere%s."
 
-#: index.php:571
+#: index.php:572
 msgid ""
 "Or alternately go to 'Operations' tab of any database to set it up there."
 msgstr ""
 
-#: index.php:620
+#: index.php:621
 #, php-format
 msgid ""
 "Your PHP MySQL library version %s differs from your MySQL server version %s. "
 "This may cause unpredictable behavior."
 msgstr ""
 
-#: index.php:648
+#: index.php:649
 #, php-format
 msgid ""
 "Server running with Suhosin. Please refer to %sdocumentation%s for possible "
@@ -1132,8 +1134,8 @@ msgstr ""
 msgid "Save & Close"
 msgstr "بطور مسل محفوظ کریں"
 
-#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:404
-#: libraries/insert_edit.lib.php:1550 prefs_manage.php:361
+#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:415
+#: libraries/insert_edit.lib.php:1548 prefs_manage.php:361
 #: prefs_manage.php:372
 msgid "Reset"
 msgstr "دوبارہ سیٹ کریں"
@@ -1174,7 +1176,7 @@ msgstr "اشاریے کا اضافہ"
 msgid "Edit Index"
 msgstr "تدوینِ اشاریہ"
 
-#: js/messages.php:99 templates/index_form.phtml:232
+#: js/messages.php:99 templates/table/index_form.phtml:232
 #, php-format
 msgid "Add %s column(s) to index"
 msgstr "%s کا فیلڈ کالمز میں اضافہ کیجیئے"
@@ -1203,15 +1205,16 @@ msgstr "کالم کا خاتمہ"
 msgid "Please select column(s) for the index."
 msgstr "%s کا فیلڈ کالمز میں اضافہ کیجیئے"
 
-#: js/messages.php:106 templates/structure/add_column.phtml:1
+#: js/messages.php:106 templates/table/structure/add_column.phtml:1
 #, fuzzy
 #| msgid "You have to choose at least one column to display"
 msgid "You have to add at least one column."
 msgstr "آپ کو کم از کم ایک کالم چننا ہو گا ڈسپے کیلئے۔"
 
-#: js/messages.php:109 libraries/insert_edit.lib.php:1548
+#: js/messages.php:109 libraries/insert_edit.lib.php:1546
 #: templates/columns_definitions/column_definitions_form.phtml:162
-#: templates/index_form.phtml:237 templates/tbl_relation/common_form.phtml:106
+#: templates/table/index_form.phtml:237
+#: templates/table/relation/common_form.phtml:106
 msgid "Preview SQL"
 msgstr ""
 
@@ -1234,7 +1237,7 @@ msgid "SQL query:"
 msgstr "SQL طلب"
 
 #. l10n: Default label for the y-Axis of Charts
-#: js/messages.php:118 templates/tbl_chart.phtml:109
+#: js/messages.php:118 templates/table/chart/tbl_chart.phtml:109
 msgid "Y Values"
 msgstr "Y قدریں"
 
@@ -1392,7 +1395,7 @@ msgstr "بھیجے گئے بائٹس"
 msgid "Bytes received"
 msgstr "موصول شدہ بائٹس"
 
-#: js/messages.php:169 libraries/server_status.lib.php:226
+#: js/messages.php:169 libraries/server_status.lib.php:235
 msgid "Connections"
 msgstr "تعلقات"
 
@@ -1451,12 +1454,12 @@ msgstr "%s جدول"
 msgid "Questions"
 msgstr "سوالات"
 
-#: js/messages.php:184 libraries/server_status.lib.php:134
+#: js/messages.php:184 libraries/server_status.lib.php:143
 msgid "Traffic"
 msgstr "آمدورفت"
 
 #: js/messages.php:185 libraries/Menu.class.php:586
-#: libraries/Util.class.php:4318 libraries/server_status_monitor.lib.php:257
+#: libraries/Util.class.php:4324 libraries/server_status_monitor.lib.php:257
 msgid "Settings"
 msgstr "ترتیبات"
 
@@ -1478,8 +1481,9 @@ msgstr "براہ کرم سیریز کے باب میں کم از کم ایک مت
 #: libraries/server_status_monitor.lib.php:236
 #: libraries/server_status_processes.lib.php:308
 #: templates/columns_definitions/transformation.phtml:4
-#: templates/designer/options_panel.phtml:178
-#: templates/table/options_zoom.phtml:12 templates/table/rows_zoom.phtml:26
+#: templates/database/designer/options_panel.phtml:178
+#: templates/table/search/options_zoom.phtml:12
+#: templates/table/search/rows_zoom.phtml:26
 msgid "None"
 msgstr "کوئی بھی نہیں"
 
@@ -1788,8 +1792,8 @@ msgstr ""
 
 #: js/messages.php:270 libraries/Menu.class.php:352
 #: libraries/Menu.class.php:455 libraries/Menu.class.php:582
-#: libraries/Util.class.php:4317 libraries/Util.class.php:4332
-#: libraries/Util.class.php:4349 libraries/config/messages.inc.php:258
+#: libraries/Util.class.php:4323 libraries/Util.class.php:4338
+#: libraries/Util.class.php:4355 libraries/config/messages.inc.php:258
 #: libraries/display_import.lib.php:105
 #: libraries/server_status_monitor.lib.php:318 prefs_manage.php:238
 #: setup/frames/menu.inc.php:26
@@ -1859,13 +1863,13 @@ msgid "Formatting SQL..."
 msgstr ""
 
 #: js/messages.php:293 libraries/server_variables.lib.php:157
-#: templates/designer/aggregate_query_panel.phtml:63
-#: templates/designer/delete_relation_panel.phtml:28
-#: templates/designer/having_query_panel.phtml:117
-#: templates/designer/new_relation_panel.phtml:88
-#: templates/designer/options_panel.phtml:253
-#: templates/designer/rename_to_panel.phtml:45
-#: templates/designer/where_query_panel.phtml:83
+#: templates/database/designer/aggregate_query_panel.phtml:63
+#: templates/database/designer/delete_relation_panel.phtml:28
+#: templates/database/designer/having_query_panel.phtml:117
+#: templates/database/designer/new_relation_panel.phtml:88
+#: templates/database/designer/options_panel.phtml:253
+#: templates/database/designer/rename_to_panel.phtml:45
+#: templates/database/designer/where_query_panel.phtml:83
 msgid "Cancel"
 msgstr "منسوخ کریں"
 
@@ -1875,7 +1879,7 @@ msgstr "منسوخ کریں"
 msgid "Page-related settings"
 msgstr "جنرل ریلیشن فیچرز"
 
-#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:402
+#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:413
 msgid "Apply"
 msgstr ""
 
@@ -1912,8 +1916,8 @@ msgstr ""
 msgid "Error text: %s"
 msgstr ""
 
-#: js/messages.php:307 libraries/db_common.inc.php:68
-#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:450
+#: js/messages.php:307 libraries/db_common.inc.php:69
+#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:461
 msgid "No databases selected."
 msgstr ""
 
@@ -1925,12 +1929,13 @@ msgstr "کالم چھوڑا جارہا ہے"
 msgid "Adding Primary Key"
 msgstr "بنیادی کلید شامل کررہا ہے"
 
-#: js/messages.php:310 templates/designer/aggregate_query_panel.phtml:59
-#: templates/designer/having_query_panel.phtml:113
-#: templates/designer/new_relation_panel.phtml:87
-#: templates/designer/options_panel.phtml:252
-#: templates/designer/rename_to_panel.phtml:41
-#: templates/designer/where_query_panel.phtml:82
+#: js/messages.php:310
+#: templates/database/designer/aggregate_query_panel.phtml:59
+#: templates/database/designer/having_query_panel.phtml:113
+#: templates/database/designer/new_relation_panel.phtml:87
+#: templates/database/designer/options_panel.phtml:252
+#: templates/database/designer/rename_to_panel.phtml:41
+#: templates/database/designer/where_query_panel.phtml:82
 msgid "OK"
 msgstr "ٹھیک ہے"
 
@@ -1950,7 +1955,7 @@ msgstr "کوائفیہ نقل کیا جارہا ہے"
 msgid "Changing Charset"
 msgstr "کریکٹر سیٹ تبدیل کیا جارہا ہے"
 
-#: js/messages.php:320 libraries/Util.class.php:3217
+#: js/messages.php:320 libraries/Util.class.php:3223
 #, fuzzy
 #| msgid "Disable foreign key checks"
 msgid "Enable foreign key checks"
@@ -1997,20 +2002,21 @@ msgstr ""
 #: js/messages.php:334 libraries/DisplayResults.class.php:4834
 #: libraries/DisplayResults.class.php:5092 libraries/Menu.class.php:344
 #: libraries/Menu.class.php:446 libraries/Menu.class.php:578
-#: libraries/Util.class.php:3636 libraries/Util.class.php:3637
-#: libraries/Util.class.php:4316 libraries/Util.class.php:4331
-#: libraries/Util.class.php:4348 libraries/config/messages.inc.php:252
+#: libraries/Util.class.php:3642 libraries/Util.class.php:3643
+#: libraries/Util.class.php:4322 libraries/Util.class.php:4337
+#: libraries/Util.class.php:4354 libraries/config/messages.inc.php:252
 #: libraries/display_export.lib.php:173 libraries/rte/rte_list.lib.php:146
 #: libraries/server_privileges.lib.php:2211
 #: libraries/server_privileges.lib.php:2290
 #: libraries/server_privileges.lib.php:2632
 #: libraries/server_privileges.lib.php:3356
 #: libraries/server_status_monitor.lib.php:322 prefs_manage.php:303
-#: setup/frames/menu.inc.php:27 templates/structure/check_all_tables.phtml:11
+#: setup/frames/menu.inc.php:27
+#: templates/database/structure/check_all_tables.phtml:11
 msgid "Export"
 msgstr "برآمد"
 
-#: js/messages.php:337 libraries/rte/rte_routines.lib.php:652
+#: js/messages.php:337 libraries/rte/rte_routines.lib.php:743
 msgid "ENUM/SET editor"
 msgstr ""
 
@@ -2054,7 +2060,7 @@ msgstr "طلب خانہ دکھائیں"
 #: libraries/Console.class.php:214 libraries/DisplayResults.class.php:3474
 #: libraries/DisplayResults.class.php:4818 libraries/Index.class.php:723
 #: libraries/Util.class.php:706 libraries/Util.class.php:1202
-#: libraries/Util.class.php:3634 libraries/Util.class.php:3635
+#: libraries/Util.class.php:3640 libraries/Util.class.php:3641
 #: libraries/central_columns.lib.php:851
 #: libraries/central_columns.lib.php:1193
 #: libraries/config/messages.inc.php:892
@@ -2072,7 +2078,7 @@ msgstr "تدوین"
 #: libraries/server_user_groups.lib.php:129
 #: libraries/sql_query_form.lib.php:416 libraries/tracking.lib.php:477
 #: setup/frames/index.inc.php:183 setup/frames/index.inc.php:291
-#: templates/designer/delete_relation_panel.phtml:27
+#: templates/database/designer/delete_relation_panel.phtml:27
 msgid "Delete"
 msgstr "حذف"
 
@@ -2248,11 +2254,11 @@ msgid "No dependencies selected!"
 msgstr ""
 
 #: js/messages.php:394 libraries/central_columns.lib.php:1214
-#: libraries/insert_edit.lib.php:1458 libraries/server_variables.lib.php:155
+#: libraries/insert_edit.lib.php:1456 libraries/server_variables.lib.php:155
 #: setup/frames/config.inc.php:42 setup/frames/index.inc.php:279
 #: templates/columns_definitions/column_definitions_form.phtml:165
-#: templates/gis_visualization/gis_visualization.phtml:48
-#: templates/tbl_relation/common_form.phtml:107
+#: templates/table/gis_visualization/gis_visualization.phtml:48
+#: templates/table/relation/common_form.phtml:107
 msgid "Save"
 msgstr ""
 
@@ -2345,8 +2351,8 @@ msgid "Data point content"
 msgstr ""
 
 #: js/messages.php:430 js/messages.php:562 js/messages.php:579
-#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2573
-#: templates/index_form.phtml:154 templates/index_form.phtml:194
+#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2571
+#: templates/table/index_form.phtml:154 templates/table/index_form.phtml:194
 msgid "Ignore"
 msgstr "نظر انداز کریں"
 
@@ -2409,8 +2415,8 @@ msgstr "فارن کلید منتخب کریں"
 msgid "Please select the primary key or a unique key!"
 msgstr "ایک بنیادی یا منفرد کلید منتخب کریں"
 
-#: js/messages.php:457 templates/designer/side_menu.phtml:91
-#: templates/designer/side_menu.phtml:94
+#: js/messages.php:457 templates/database/designer/side_menu.phtml:91
+#: templates/database/designer/side_menu.phtml:94
 msgid "Choose column to display"
 msgstr "کالم دکھانے کے لیے انتخاب کریں"
 
@@ -2426,22 +2432,22 @@ msgstr ""
 msgid "Page name"
 msgstr "صفحہ نمبر"
 
-#: js/messages.php:463 templates/designer/side_menu.phtml:56
-#: templates/designer/side_menu.phtml:59
+#: js/messages.php:463 templates/database/designer/side_menu.phtml:56
+#: templates/database/designer/side_menu.phtml:59
 #, fuzzy
 #| msgid "Select All"
 msgid "Save page"
 msgstr "سارا منتخب کریں"
 
-#: js/messages.php:464 templates/designer/side_menu.phtml:63
-#: templates/designer/side_menu.phtml:66
+#: js/messages.php:464 templates/database/designer/side_menu.phtml:63
+#: templates/database/designer/side_menu.phtml:66
 #, fuzzy
 #| msgid "Select All"
 msgid "Save page as"
 msgstr "سارا منتخب کریں"
 
-#: js/messages.php:465 templates/designer/side_menu.phtml:49
-#: templates/designer/side_menu.phtml:52
+#: js/messages.php:465 templates/database/designer/side_menu.phtml:49
+#: templates/database/designer/side_menu.phtml:52
 #, fuzzy
 #| msgid "Open"
 msgid "Open page"
@@ -2453,7 +2459,7 @@ msgstr "کھولیں"
 msgid "Delete page"
 msgstr "سارا منتخب کریں"
 
-#: js/messages.php:467 templates/designer/side_menu.phtml:10
+#: js/messages.php:467 templates/database/designer/side_menu.phtml:10
 msgid "Untitled"
 msgstr ""
 
@@ -2577,7 +2583,7 @@ msgstr "سطریں کے آخر میں"
 msgid "cancel"
 msgstr "منسوخ کریں"
 
-#: js/messages.php:499 libraries/server_status.lib.php:271
+#: js/messages.php:499 libraries/server_status.lib.php:280
 msgid "Aborted"
 msgstr ""
 
@@ -3211,7 +3217,7 @@ msgstr "برائے مہربانی، درست ہندسہ داخل کیجیئے"
 
 #: js/messages.php:793 libraries/Message.class.php:199
 #: libraries/Util.class.php:654 libraries/core.lib.php:245
-#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1172
+#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1170
 #: tbl_operations.php:229 view_operations.php:63
 msgid "Error"
 msgstr "نقص"
@@ -3271,8 +3277,8 @@ msgstr ""
 msgid "per minute"
 msgstr ""
 
-#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:143
-#: libraries/server_status.lib.php:228
+#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:152
+#: libraries/server_status.lib.php:237
 #: libraries/server_status_queries.lib.php:98
 msgid "per hour"
 msgstr ""
@@ -3290,7 +3296,7 @@ msgstr ""
 msgid "Wrong permissions on configuration file, should not be world writable!"
 msgstr ""
 
-#: libraries/Config.class.php:1799
+#: libraries/Config.class.php:1801
 msgid "Font size"
 msgstr "فانٹ سائز"
 
@@ -3320,10 +3326,10 @@ msgstr "Submit Query"
 #: libraries/server_privileges.lib.php:2890
 #: libraries/server_privileges.lib.php:3144
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4332
+#: libraries/server_privileges.lib.php:4358
 #: libraries/server_status_processes.lib.php:80
-#: templates/tbl_relation/foreign_key_row.phtml:165
-#: templates/tbl_relation/internal_relational_row.phtml:55
+#: templates/table/relation/foreign_key_row.phtml:165
+#: templates/table/relation/internal_relational_row.phtml:55
 msgid "Database"
 msgstr "کوائفیہ"
 
@@ -3432,11 +3438,11 @@ msgstr "SQL جواز دھندہ"
 #: libraries/plugins/import/ImportMediawiki.class.php:60
 #: libraries/plugins/import/ImportOds.class.php:59
 #: libraries/plugins/import/ImportShp.class.php:57
-#: libraries/plugins/import/ImportSql.class.php:148
+#: libraries/plugins/import/ImportSql.class.php:51
 #: libraries/plugins/import/ImportXml.class.php:58
-#: libraries/rte/rte_routines.lib.php:833 templates/index_form.phtml:49
-#: templates/structure/row_stats_table.phtml:20
-#: templates/table/options.phtml:2
+#: libraries/rte/rte_routines.lib.php:924 templates/table/index_form.phtml:49
+#: templates/table/search/options.phtml:2
+#: templates/table/structure/row_stats_table.phtml:20
 msgid "Options"
 msgstr ""
 
@@ -3477,7 +3483,8 @@ msgstr "نزولی"
 msgid "Order:"
 msgstr ""
 
-#: libraries/Console.class.php:289 templates/table/replace_preview.phtml:17
+#: libraries/Console.class.php:289
+#: templates/table/search/replace_preview.phtml:17
 #, fuzzy
 #| msgid "Command"
 msgid "Count"
@@ -3602,9 +3609,9 @@ msgstr "نقل شدہ کوائفیہ پر جائیں"
 #: libraries/operations.lib.php:794 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:191
-#: templates/structure/sortable_header.phtml:21
-#: templates/structure/sortable_header.phtml:38
-#: templates/table/options.phtml:68
+#: templates/database/structure/sortable_header.phtml:21
+#: templates/database/structure/sortable_header.phtml:38
+#: templates/table/search/options.phtml:68
 msgid "Ascending"
 msgstr "صعودی"
 
@@ -3614,13 +3621,14 @@ msgstr "صعودی"
 #: libraries/operations.lib.php:797 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:188
-#: templates/structure/sortable_header.phtml:26
-#: templates/structure/sortable_header.phtml:43
-#: templates/table/options.phtml:69
+#: templates/database/structure/sortable_header.phtml:26
+#: templates/database/structure/sortable_header.phtml:43
+#: templates/table/search/options.phtml:69
 msgid "Descending"
 msgstr "نزولی"
 
-#: libraries/DBQbe.class.php:467 templates/table/search_and_replace.phtml:6
+#: libraries/DBQbe.class.php:467
+#: templates/table/search/search_and_replace.phtml:6
 #, fuzzy
 #| msgid "Command"
 msgid "Column:"
@@ -3801,12 +3809,12 @@ msgstr[0] "<i>%s</i>جدول کے ساتھ مشابہ%s"
 msgstr[1] "<i>%s</i>جدول کے ساتھ مشابہات%s"
 
 #: libraries/DbSearch.class.php:354 libraries/Menu.class.php:311
-#: libraries/Util.class.php:3337 libraries/Util.class.php:3347
-#: libraries/Util.class.php:3623 libraries/Util.class.php:3624
-#: libraries/Util.class.php:4343 libraries/config.values.php:43
+#: libraries/Util.class.php:3343 libraries/Util.class.php:3353
+#: libraries/Util.class.php:3629 libraries/Util.class.php:3630
+#: libraries/Util.class.php:4349 libraries/config.values.php:43
 #: libraries/config.values.php:51 libraries/config.values.php:119
 #: libraries/navigation/Nodes/Node_Table.class.php:295
-#: templates/structure/check_all_table_column.phtml:5
+#: templates/table/structure/check_all_table_column.phtml:5
 msgid "Browse"
 msgstr "براؤز"
 
@@ -3825,7 +3833,8 @@ msgstr "کوائفیہ میں تلاش کریں"
 msgid "Words or values to search for (wildcard: \"%\"):"
 msgstr "الفاظ یا قدروں کی تلاش برائے (wildcard: \"%\"):"
 
-#: libraries/DbSearch.class.php:401 templates/table/search_and_replace.phtml:1
+#: libraries/DbSearch.class.php:401
+#: templates/table/search/search_and_replace.phtml:1
 msgid "Find:"
 msgstr "ڈھونڈیں:"
 
@@ -3879,16 +3888,16 @@ msgstr "ابتدائیہ"
 msgid "Search this table"
 msgstr "کوائفیہ میں تلاش کریں"
 
-#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2532
-#: libraries/Util.class.php:2535
+#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2538
+#: libraries/Util.class.php:2541
 #, fuzzy
 #| msgid "Begin"
 msgctxt "First page"
 msgid "Begin"
 msgstr "شروع"
 
-#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2533
-#: libraries/Util.class.php:2536 libraries/server_bin_log.lib.php:170
+#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2539
+#: libraries/Util.class.php:2542 libraries/server_bin_log.lib.php:170
 #: libraries/server_bin_log.lib.php:172
 #, fuzzy
 #| msgid "Previous"
@@ -3896,8 +3905,8 @@ msgctxt "Previous page"
 msgid "Previous"
 msgstr "پچھلا"
 
-#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2564
-#: libraries/Util.class.php:2574 libraries/server_bin_log.lib.php:204
+#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2570
+#: libraries/Util.class.php:2580 libraries/server_bin_log.lib.php:204
 #: libraries/server_bin_log.lib.php:206
 #, fuzzy
 #| msgid "Next"
@@ -3905,8 +3914,8 @@ msgctxt "Next page"
 msgid "Next"
 msgstr "اگلا"
 
-#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2565
-#: libraries/Util.class.php:2575
+#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2571
+#: libraries/Util.class.php:2581
 #, fuzzy
 #| msgid "End"
 msgctxt "Last page"
@@ -3988,9 +3997,9 @@ msgstr ""
 "اپ لوڈ مسل کو بڑھاتے ہوئے نقص ہے, دیکھیں [doc@faq1-11]عمومی سوالات 1.11[/doc]"
 
 #: libraries/DisplayResults.class.php:4332 libraries/Message.class.php:180
-#: libraries/controllers/TableRelationController.class.php:258
+#: libraries/controllers/TableRelationController.class.php:259
 #: libraries/controllers/TableSearchController.class.php:655
-#: libraries/rte/rte_routines.lib.php:1332 libraries/sql_query_form.lib.php:89
+#: libraries/rte/rte_routines.lib.php:1423 libraries/sql_query_form.lib.php:89
 #: tbl_operations.php:227 tbl_row_action.php:138 view_operations.php:62
 #, fuzzy
 #| msgid "Your SQL query has been executed successfully."
@@ -3998,7 +4007,7 @@ msgid "Your SQL query has been executed successfully."
 msgstr "آپ کی SQL طلب کامیابی سے چلائی جاچکی ہے۔"
 
 #: libraries/DisplayResults.class.php:4660
-#: libraries/controllers/StructureController.class.php:629
+#: libraries/controllers/DatabaseStructureController.class.php:564
 #, php-format
 msgid ""
 "This view has at least this number of rows. Please refer to %sdocumentation"
@@ -4023,33 +4032,33 @@ msgstr ""
 msgid "%d total"
 msgstr "%s جدول"
 
-#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1318
+#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1312
 #, php-format
 msgid "Query took %01.4f seconds."
 msgstr ""
 
 #: libraries/DisplayResults.class.php:4807
-#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4767
-#: libraries/Util.class.php:4773 libraries/mult_submits.inc.php:50
-#: templates/structure/check_all_tables.phtml:2
-#: templates/structure/check_all_tables.phtml:9
+#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4773
+#: libraries/Util.class.php:4779 libraries/mult_submits.inc.php:50
+#: templates/database/structure/check_all_tables.phtml:2
+#: templates/database/structure/check_all_tables.phtml:9
 msgid "With selected:"
 msgstr "مع منتخب:"
 
 #: libraries/DisplayResults.class.php:4811
-#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4769
-#: libraries/Util.class.php:4770 libraries/server_privileges.lib.php:1174
+#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4775
+#: libraries/Util.class.php:4776 libraries/server_privileges.lib.php:1174
 #: libraries/server_privileges.lib.php:1175
 #: libraries/server_privileges.lib.php:1387
 #: libraries/server_user_groups.lib.php:231
-#: templates/structure/check_all_tables.phtml:3
-#: templates/structure/check_all_tables.phtml:4
+#: templates/database/structure/check_all_tables.phtml:3
+#: templates/database/structure/check_all_tables.phtml:4
 msgid "Check All"
 msgstr "تمام پڑتال کریں"
 
 #: libraries/DisplayResults.class.php:4985 libraries/Header.class.php:383
-#: templates/structure/optional_action_links.phtml:1
-#: templates/structure/print_view_data_dictionary_link.phtml:3
+#: templates/database/structure/print_view_data_dictionary_link.phtml:3
+#: templates/table/structure/optional_action_links.phtml:1
 msgid "Print view"
 msgstr "چھپائی منظر"
 
@@ -4057,7 +4066,8 @@ msgstr "چھپائی منظر"
 msgid "Query results operations"
 msgstr ""
 
-#: libraries/DisplayResults.class.php:5105 templates/tbl_chart.phtml:12
+#: libraries/DisplayResults.class.php:5105
+#: templates/table/chart/tbl_chart.phtml:12
 #, fuzzy
 #| msgid "Table comments"
 msgid "Display chart"
@@ -4156,7 +4166,7 @@ msgid "Click on the bar to scroll to top of page"
 msgstr ""
 
 #: libraries/Header.class.php:749
-#: libraries/plugins/auth/AuthenticationCookie.class.php:152
+#: libraries/plugins/auth/AuthenticationCookie.class.php:140
 #, fuzzy
 #| msgid "Cookies must be enabled past this point."
 msgid "Javascript must be enabled past this point!"
@@ -4180,11 +4190,11 @@ msgid "Keyname"
 msgstr "کلید نام"
 
 #: libraries/Index.class.php:697
-#: libraries/controllers/StructureController.class.php:1962
-#: libraries/controllers/StructureController.class.php:1967
+#: libraries/controllers/TableStructureController.class.php:953
+#: libraries/controllers/TableStructureController.class.php:958
 #: libraries/tracking.lib.php:973
 #: templates/columns_definitions/column_indexes.phtml:11
-#: templates/structure/check_all_table_column.phtml:26
+#: templates/table/structure/check_all_table_column.phtml:26
 msgid "Unique"
 msgstr "منفرد"
 
@@ -4203,16 +4213,17 @@ msgstr "درجہ تعلق داری"
 #: libraries/server_collations.lib.php:35 libraries/tracking.lib.php:881
 #: libraries/tracking.lib.php:977
 #: templates/columns_definitions/table_fields_definitions.phtml:33
-#: templates/structure/row_stats_table.phtml:31
-#: templates/structure/table_header.phtml:55
-#: templates/structure/table_structure_header.phtml:7
-#: templates/table/table_header.phtml:8
+#: templates/database/structure/table_header.phtml:55
+#: templates/table/search/table_header.phtml:8
+#: templates/table/structure/row_stats_table.phtml:31
+#: templates/table/structure/table_structure_header.phtml:7
 msgid "Collation"
 msgstr "ترتیب"
 
 #: libraries/Index.class.php:703 libraries/rte/rte_events.lib.php:496
-#: libraries/rte/rte_routines.lib.php:956 libraries/tracking.lib.php:885
-#: libraries/tracking.lib.php:979 templates/structure/table_header.phtml:84
+#: libraries/rte/rte_routines.lib.php:1047 libraries/tracking.lib.php:885
+#: libraries/tracking.lib.php:979
+#: templates/database/structure/table_header.phtml:84
 msgid "Comment"
 msgstr "تبصرہ"
 
@@ -4225,15 +4236,15 @@ msgstr "بنیادی کلید چھوڑ دیا گیا ہے"
 msgid "Index %s has been dropped."
 msgstr "اشاریہ %s چھوڑ دیا گیا ہے۔"
 
-#: libraries/Index.class.php:757 libraries/Util.class.php:3630
-#: libraries/Util.class.php:3631
-#: libraries/controllers/StructureController.class.php:1958
-#: libraries/controllers/StructureController.class.php:1959
+#: libraries/Index.class.php:757 libraries/Util.class.php:3636
+#: libraries/Util.class.php:3637
+#: libraries/controllers/TableStructureController.class.php:949
+#: libraries/controllers/TableStructureController.class.php:950
 #: libraries/operations.lib.php:1607 libraries/rte/rte_list.lib.php:150
 #: libraries/server_databases.lib.php:146
-#: templates/structure/check_all_table_column.phtml:15
-#: templates/structure/check_all_tables.phtml:16
-#: templates/tbl_relation/foreign_key_row.phtml:93
+#: templates/database/structure/check_all_tables.phtml:16
+#: templates/table/relation/foreign_key_row.phtml:93
+#: templates/table/structure/check_all_table_column.phtml:15
 msgid "Drop"
 msgstr "گرائیں"
 
@@ -4264,16 +4275,16 @@ msgstr "سرور"
 #: libraries/Menu.class.php:248
 #: libraries/navigation/Nodes/Node_View.class.php:32
 #: libraries/tbl_info.inc.php:63
-#: templates/structure/structure_table_row.phtml:97
-#: templates/structure/structure_table_row.phtml:159
+#: templates/database/structure/structure_table_row.phtml:97
+#: templates/database/structure/structure_table_row.phtml:159
 msgid "View"
 msgstr "نقل جدول"
 
 #: libraries/Menu.class.php:325 libraries/Menu.class.php:429
-#: libraries/Menu.class.php:548 libraries/Util.class.php:3334
-#: libraries/Util.class.php:3344 libraries/Util.class.php:3350
-#: libraries/Util.class.php:4313 libraries/Util.class.php:4328
-#: libraries/Util.class.php:4345 libraries/config.values.php:40
+#: libraries/Menu.class.php:548 libraries/Util.class.php:3340
+#: libraries/Util.class.php:3350 libraries/Util.class.php:3356
+#: libraries/Util.class.php:4319 libraries/Util.class.php:4334
+#: libraries/Util.class.php:4351 libraries/config.values.php:40
 #: libraries/config.values.php:48 libraries/config.values.php:110
 #: libraries/config.values.php:116 libraries/config/messages.inc.php:321
 #: libraries/navigation/Nodes/Node_Table.class.php:292
@@ -4281,19 +4292,19 @@ msgid "SQL"
 msgstr "SQL"
 
 #: libraries/Menu.class.php:328 libraries/Menu.class.php:432
-#: libraries/Util.class.php:3335 libraries/Util.class.php:3345
-#: libraries/Util.class.php:3351 libraries/Util.class.php:3625
-#: libraries/Util.class.php:3626 libraries/Util.class.php:4329
-#: libraries/Util.class.php:4346 libraries/config.values.php:41
+#: libraries/Util.class.php:3341 libraries/Util.class.php:3351
+#: libraries/Util.class.php:3357 libraries/Util.class.php:3631
+#: libraries/Util.class.php:3632 libraries/Util.class.php:4335
+#: libraries/Util.class.php:4352 libraries/config.values.php:41
 #: libraries/config.values.php:49 libraries/config.values.php:111
 #: libraries/config.values.php:117
 #: libraries/navigation/Nodes/Node_Table.class.php:286
 msgid "Search"
 msgstr "تلاش"
 
-#: libraries/Menu.class.php:338 libraries/Util.class.php:3336
-#: libraries/Util.class.php:3346 libraries/Util.class.php:3627
-#: libraries/Util.class.php:3628 libraries/Util.class.php:4347
+#: libraries/Menu.class.php:338 libraries/Util.class.php:3342
+#: libraries/Util.class.php:3352 libraries/Util.class.php:3633
+#: libraries/Util.class.php:3634 libraries/Util.class.php:4353
 #: libraries/config.values.php:42 libraries/config.values.php:50
 #: libraries/config.values.php:118
 #: libraries/navigation/Nodes/Node_Table.class.php:289
@@ -4302,30 +4313,30 @@ msgid "Insert"
 msgstr "داخل کریں"
 
 #: libraries/Menu.class.php:362 libraries/Menu.class.php:467
-#: libraries/Util.class.php:4334 libraries/Util.class.php:4350
+#: libraries/Util.class.php:4340 libraries/Util.class.php:4356
 #: libraries/config.values.php:106 libraries/server_common.lib.php:51
 #: libraries/server_privileges.lib.php:2370
 #: libraries/server_privileges.lib.php:3158
-#: libraries/server_privileges.lib.php:4221
+#: libraries/server_privileges.lib.php:4247
 msgid "Privileges"
 msgstr ""
 
 #: libraries/Menu.class.php:371 libraries/Menu.class.php:379
-#: libraries/Menu.class.php:459 libraries/Util.class.php:3338
-#: libraries/Util.class.php:3352 libraries/Util.class.php:4333
-#: libraries/Util.class.php:4351 libraries/config.values.php:112
+#: libraries/Menu.class.php:459 libraries/Util.class.php:3344
+#: libraries/Util.class.php:3358 libraries/Util.class.php:4339
+#: libraries/Util.class.php:4357 libraries/config.values.php:112
 #: view_operations.php:92
 msgid "Operations"
 msgstr "عملیات"
 
 #: libraries/Menu.class.php:384 libraries/Menu.class.php:492
-#: libraries/Util.class.php:4338 libraries/Util.class.php:4352
+#: libraries/Util.class.php:4344 libraries/Util.class.php:4358
 #: libraries/relation.lib.php:255
 msgid "Tracking"
 msgstr ""
 
 #: libraries/Menu.class.php:397 libraries/Menu.class.php:486
-#: libraries/Util.class.php:4337 libraries/Util.class.php:4353
+#: libraries/Util.class.php:4343 libraries/Util.class.php:4359
 #: libraries/navigation/Nodes/Node_Trigger_Container.class.php:24
 #: libraries/plugins/export/ExportHtmlword.class.php:557
 #: libraries/plugins/export/ExportOdt.class.php:685
@@ -4342,16 +4353,16 @@ msgstr ""
 msgid "Database seems to be empty!"
 msgstr ""
 
-#: libraries/Menu.class.php:439 libraries/Util.class.php:4330
+#: libraries/Menu.class.php:439 libraries/Util.class.php:4336
 msgid "Query"
 msgstr ""
 
-#: libraries/Menu.class.php:472 libraries/Util.class.php:4335
+#: libraries/Menu.class.php:472 libraries/Util.class.php:4341
 #: libraries/rte/rte_words.lib.php:36
 msgid "Routines"
 msgstr ""
 
-#: libraries/Menu.class.php:479 libraries/Util.class.php:4336
+#: libraries/Menu.class.php:479 libraries/Util.class.php:4342
 #: libraries/navigation/Nodes/Node_Event_Container.class.php:26
 #: libraries/plugins/export/ExportSql.class.php:940
 #: libraries/plugins/export/ExportXml.class.php:107
@@ -4359,22 +4370,22 @@ msgstr ""
 msgid "Events"
 msgstr ""
 
-#: libraries/Menu.class.php:498 libraries/Util.class.php:4339
+#: libraries/Menu.class.php:498 libraries/Util.class.php:4345
 msgid "Designer"
 msgstr ""
 
-#: libraries/Menu.class.php:507 libraries/Util.class.php:4340
-#: templates/structure/check_all_tables.phtml:35
+#: libraries/Menu.class.php:507 libraries/Util.class.php:4346
+#: templates/database/structure/check_all_tables.phtml:35
 #, fuzzy
 #| msgid "Add/Delete Field Columns"
 msgid "Central columns"
 msgstr "فیلڈ کالمز شامل یا ختم کریں"
 
-#: libraries/Menu.class.php:544 libraries/Util.class.php:4312
+#: libraries/Menu.class.php:544 libraries/Util.class.php:4318
 #: libraries/config.values.php:103 libraries/config/messages.inc.php:266
 #: libraries/config/messages.inc.php:341
 #: libraries/navigation/NavigationTree.class.php:1239
-#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4332
+#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4358
 msgid "Databases"
 msgstr "کوائفیے"
 
@@ -4383,34 +4394,34 @@ msgid "User accounts"
 msgstr ""
 
 #: libraries/Menu.class.php:595 libraries/ServerStatusData.class.php:121
-#: libraries/Util.class.php:4319 libraries/server_common.lib.php:36
+#: libraries/Util.class.php:4325 libraries/server_common.lib.php:36
 msgid "Binary log"
 msgstr ""
 
 #: libraries/Menu.class.php:601 libraries/ServerStatusData.class.php:126
-#: libraries/Util.class.php:4320 libraries/server_common.lib.php:42
-#: templates/structure/body_for_table_summary.phtml:10
-#: templates/structure/table_header.phtml:27
+#: libraries/Util.class.php:4326 libraries/server_common.lib.php:42
+#: templates/database/structure/body_for_table_summary.phtml:10
+#: templates/database/structure/table_header.phtml:27
 msgid "Replication"
 msgstr "چربہ کاری"
 
 #: libraries/Menu.class.php:606 libraries/ServerStatusData.class.php:193
-#: libraries/Util.class.php:4321 libraries/config.values.php:105
+#: libraries/Util.class.php:4327 libraries/config.values.php:105
 #: libraries/server_engines.lib.php:108 libraries/server_engines.lib.php:112
 #: libraries/sql_query_form.lib.php:421
 msgid "Variables"
 msgstr ""
 
-#: libraries/Menu.class.php:610 libraries/Util.class.php:4322
+#: libraries/Menu.class.php:610 libraries/Util.class.php:4328
 msgid "Charsets"
 msgstr ""
 
-#: libraries/Menu.class.php:615 libraries/Util.class.php:4323
+#: libraries/Menu.class.php:615 libraries/Util.class.php:4329
 #: libraries/server_common.lib.php:33 libraries/server_plugins.lib.php:27
 msgid "Plugins"
 msgstr ""
 
-#: libraries/Menu.class.php:626 libraries/Util.class.php:4324
+#: libraries/Menu.class.php:626 libraries/Util.class.php:4330
 msgid "Engines"
 msgstr ""
 
@@ -4435,7 +4446,7 @@ msgid_plural "%1$d rows inserted."
 msgstr[0] "%1$d صف داخل ہوئی۔"
 msgstr[1] "%1$d صفیں داخل ہوئیں۔"
 
-#: libraries/PDF.class.php:70 libraries/Util.class.php:2521
+#: libraries/PDF.class.php:70 libraries/Util.class.php:2527
 #: libraries/browse_foreigners.lib.php:327
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:865
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:890
@@ -4460,7 +4471,7 @@ msgid "Could not save favorite table!"
 msgstr "مسل نہیں کھول سکتا: %s"
 
 #: libraries/RecentFavoriteTable.class.php:212
-#: templates/structure/favorite_anchor.phtml:12
+#: templates/database/structure/favorite_anchor.phtml:12
 #, fuzzy
 #| msgid "Remove database"
 msgid "Remove from Favorites"
@@ -4646,7 +4657,7 @@ msgid ""
 msgstr "اس ذخیرہ انجن کے متعلق تفصیلی معلومات موجود نہیں ہیں۔"
 
 #: libraries/StorageEngine.class.php:373
-#: templates/structure/body_for_table_summary.phtml:50
+#: templates/database/structure/body_for_table_summary.phtml:50
 #, php-format
 msgid "%s is the default storage engine on this MySQL server."
 msgstr "%sاس MySQL سرور میں طے شدہ ذخیرہ انجن ہے۔"
@@ -5079,10 +5090,10 @@ msgstr ""
 
 #: libraries/Util.class.php:726 libraries/rte/rte_events.lib.php:110
 #: libraries/rte/rte_events.lib.php:119 libraries/rte/rte_events.lib.php:150
-#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:153
-#: libraries/rte/rte_routines.lib.php:162
-#: libraries/rte/rte_routines.lib.php:235
-#: libraries/rte/rte_routines.lib.php:1366
+#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:223
+#: libraries/rte/rte_routines.lib.php:250
+#: libraries/rte/rte_routines.lib.php:372
+#: libraries/rte/rte_routines.lib.php:1457
 #: libraries/rte/rte_triggers.lib.php:86 libraries/rte/rte_triggers.lib.php:95
 #: libraries/rte/rte_triggers.lib.php:127
 msgid "MySQL said: "
@@ -5128,79 +5139,82 @@ msgstr "اتوار"
 msgid "%B %d, %Y at %I:%M %p"
 msgstr "%B %d, %Y پر %I:%M %p"
 
-#: libraries/Util.class.php:2019
+#: libraries/Util.class.php:2025
 #, php-format
 msgid "%s days, %s hours, %s minutes and %s seconds"
 msgstr "%s دن, %s گھنٹے, %s منٹ اور%s سیکنڈ"
 
-#: libraries/Util.class.php:2112
+#: libraries/Util.class.php:2118
 msgid "Missing parameter:"
 msgstr ""
 
-#: libraries/Util.class.php:2645
+#: libraries/Util.class.php:2651
 #, php-format
 msgid "Jump to database \"%s\"."
 msgstr "کوائفیہ میں جائیں \"%s\"."
 
-#: libraries/Util.class.php:2670
+#: libraries/Util.class.php:2676
 #, php-format
 msgid "The %s functionality is affected by a known bug, see %s"
 msgstr "%s ایک نامعلوم نقص سے کام متاثر ہوا, دیکھیں %s"
 
-#: libraries/Util.class.php:2881
+#: libraries/Util.class.php:2887
 #, fuzzy
 #| msgid "Click to select"
 msgid "Click to toggle"
 msgstr "انتخاب کے لیے کلک کریں"
 
-#: libraries/Util.class.php:3542 prefs_manage.php:248
+#: libraries/Util.class.php:3548 prefs_manage.php:248
 msgid "Browse your computer:"
 msgstr "اپنے کمپیوٹر کو براؤز کریں:"
 
-#: libraries/Util.class.php:3567
+#: libraries/Util.class.php:3573
 #, php-format
 msgid "Select from the web server upload directory <b>%s</b>:"
 msgstr "ویب سرور اپ لوڈ پوشہ سے منتخب کریں <b>%s</b>:"
 
-#: libraries/Util.class.php:3596 libraries/insert_edit.lib.php:1173
+#: libraries/Util.class.php:3602 libraries/insert_edit.lib.php:1171
 msgid "The directory you set for upload work cannot be reached."
 msgstr "اپ لوڈ کام کے لیے سیٹ کیا گیا پوشہ قابل رسائی نہیں ہے۔"
 
-#: libraries/Util.class.php:3607
+#: libraries/Util.class.php:3613
 #, fuzzy
 #| msgid "There are no files to upload"
 msgid "There are no files to upload!"
 msgstr "اپ لوڈ کرنے کے لیے کوئی مسل نہیں ہے"
 
-#: libraries/Util.class.php:3632 libraries/Util.class.php:3633
-#: templates/structure/check_all_tables.phtml:15
+#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: templates/database/structure/check_all_tables.phtml:15
 msgid "Empty"
 msgstr "خالی"
 
-#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: libraries/Util.class.php:3644 libraries/Util.class.php:3645
 msgid "Execute"
 msgstr ""
 
-#: libraries/Util.class.php:4152
+#: libraries/Util.class.php:4158
 msgid "Print"
 msgstr "چھاپیں"
 
-#: libraries/Util.class.php:4257 templates/structure/row_stats_table.phtml:80
-#: templates/structure/table_header.phtml:95
+#: libraries/Util.class.php:4263
+#: templates/database/structure/table_header.phtml:95
+#: templates/table/structure/row_stats_table.phtml:80
 msgid "Creation"
 msgstr "بنائیں"
 
-#: libraries/Util.class.php:4263 templates/structure/row_stats_table.phtml:87
-#: templates/structure/table_header.phtml:106
+#: libraries/Util.class.php:4269
+#: templates/database/structure/table_header.phtml:106
+#: templates/table/structure/row_stats_table.phtml:87
 msgid "Last update"
 msgstr "آخری دفعہ کی تازہ کاری"
 
-#: libraries/Util.class.php:4269 templates/structure/row_stats_table.phtml:94
-#: templates/structure/table_header.phtml:117
+#: libraries/Util.class.php:4275
+#: templates/database/structure/table_header.phtml:117
+#: templates/table/structure/row_stats_table.phtml:94
 msgid "Last check"
 msgstr "آخری دفعہ کی پڑتال"
 
-#: libraries/Util.class.php:4315
+#: libraries/Util.class.php:4321
 msgid "Users"
 msgstr ""
 
@@ -5221,16 +5235,16 @@ msgid "Use this value"
 msgstr "یہ قدر استعمال کریں"
 
 #: libraries/build_html_for_db.lib.php:33 libraries/import.lib.php:193
-#: templates/structure/actions_in_table_structure.phtml:113
-#: templates/structure/row_stats_table.phtml:42
-#: templates/structure/table_header.phtml:36
+#: templates/database/structure/table_header.phtml:36
+#: templates/table/structure/actions_in_table_structure.phtml:113
+#: templates/table/structure/row_stats_table.phtml:42
 msgid "Rows"
 msgstr "صفیں"
 
 #: libraries/build_html_for_db.lib.php:48 libraries/engines/innodb.lib.php:171
-#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:186
-#: libraries/server_status.lib.php:298
-#: templates/structure/display_table_stats.phtml:40
+#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:195
+#: libraries/server_status.lib.php:307
+#: templates/table/structure/display_table_stats.phtml:40
 msgid "Total"
 msgstr "میزان"
 
@@ -5239,10 +5253,12 @@ msgid "Jump to database"
 msgstr "کوائفیہ جائیں"
 
 #: libraries/build_html_for_db.lib.php:146
+#: templates/database/structure/structure_table_row.phtml:15
 msgid "Not replicated"
 msgstr "نقل نہیں ہوا"
 
 #: libraries/build_html_for_db.lib.php:158
+#: templates/database/structure/structure_table_row.phtml:16
 msgid "Replicated"
 msgstr "نقل ہوا"
 
@@ -5299,17 +5315,17 @@ msgstr ""
 #: libraries/plugins/export/ExportTexytext.class.php:425
 #: libraries/plugins/export/PMA_ExportPdf.class.php:307
 #: libraries/rte/rte_list.lib.php:73 libraries/rte/rte_list.lib.php:85
-#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:830
-#: libraries/rte/rte_routines.lib.php:1492 setup/frames/index.inc.php:162
+#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:921
+#: libraries/rte/rte_routines.lib.php:1583 setup/frames/index.inc.php:162
 #: templates/columns_definitions/table_fields_definitions.phtml:8
-#: templates/structure/table_structure_header.phtml:5
-#: templates/table/create_table.phtml:11
+#: templates/database/create_table.phtml:11
+#: templates/table/structure/table_structure_header.phtml:5
 msgid "Name"
 msgstr ""
 
 #: libraries/central_columns.lib.php:699
 #: libraries/central_columns.lib.php:1381
-#: libraries/rte/rte_routines.lib.php:832
+#: libraries/rte/rte_routines.lib.php:923
 #: templates/columns_definitions/table_fields_definitions.phtml:14
 msgid "Length/Values"
 msgstr ""
@@ -5332,7 +5348,7 @@ msgid "Select a table"
 msgstr "سارا منتخب کریں"
 
 #: libraries/central_columns.lib.php:804
-#: templates/structure/add_column.phtml:4
+#: templates/table/structure/add_column.phtml:4
 #, fuzzy
 #| msgid "Add/Delete Field Columns"
 msgid "Add column"
@@ -5354,7 +5370,7 @@ msgstr "فیلڈ کالمز شامل یا ختم کریں"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1002
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1025
 #: templates/columns_definitions/table_fields_definitions.phtml:36
-#: templates/structure/table_structure_header.phtml:8
+#: templates/table/structure/table_structure_header.phtml:8
 msgid "Attributes"
 msgstr ""
 
@@ -5476,7 +5492,7 @@ msgid "Double click"
 msgstr ""
 
 #: libraries/config.values.php:95 libraries/config.values.php:124
-#: libraries/config/FormDisplay.tpl.php:221 libraries/relation.lib.php:97
+#: libraries/config/FormDisplay.tpl.php:232 libraries/relation.lib.php:97
 #: libraries/relation.lib.php:105
 msgid "Disabled"
 msgstr "غیر فعال"
@@ -5667,21 +5683,21 @@ msgstr "برآمد کارآمد نہیں ہے ایک عمل موجود نہیں
 msgid "maximum %s"
 msgstr "زیادہ سے زیادہ %s"
 
-#: libraries/config/FormDisplay.tpl.php:219
+#: libraries/config/FormDisplay.tpl.php:230
 msgid "This setting is disabled, it will not be applied to your configuration."
 msgstr "ترتیب غیرفعال ہے، یہ آپ کے تشکیلات میں لاگوں نہیں ہوسکتی۔"
 
-#: libraries/config/FormDisplay.tpl.php:313
+#: libraries/config/FormDisplay.tpl.php:324
 #, php-format
 msgid "Set value: %s"
 msgstr "قدر سیٹ کریں: %s"
 
-#: libraries/config/FormDisplay.tpl.php:318
+#: libraries/config/FormDisplay.tpl.php:329
 #: libraries/config/messages.inc.php:610
 msgid "Restore default value"
 msgstr "طے شدہ قدر بحال کریں"
 
-#: libraries/config/FormDisplay.tpl.php:332
+#: libraries/config/FormDisplay.tpl.php:343
 msgid "Allow users to customize this value"
 msgstr "صارفین کو اس قدر کے مخصوص کرنے کی اجازت دیں"
 
@@ -6180,7 +6196,7 @@ msgstr "مسل کے لیے حروف کی سیٹ"
 
 #: libraries/config/messages.inc.php:136 libraries/config/messages.inc.php:152
 #: libraries/sql_query_form.lib.php:247
-#: templates/structure/row_stats_table.phtml:7
+#: templates/table/structure/row_stats_table.phtml:7
 msgid "Format"
 msgstr "وضع"
 
@@ -6783,7 +6799,7 @@ msgstr ""
 
 #: libraries/config/messages.inc.php:332
 #: libraries/plugins/export/ExportPdf.class.php:279
-#: templates/structure/secondary_tabs.phtml:8
+#: templates/table/secondary_tabs.phtml:8
 #, fuzzy
 #| msgid "Databases"
 msgid "Table structure"
@@ -8651,110 +8667,35 @@ msgstr ""
 msgid "OpenDocument Text"
 msgstr "اوپن دستاویز"
 
-#: libraries/controllers/StructureController.class.php:465
+#: libraries/controllers/DatabaseStructureController.class.php:405
 #: tbl_operations.php:382
 #, php-format
 msgid "Table %s has been emptied."
 msgstr "جدول %s خالی ہوچکا ہے"
 
-#: libraries/controllers/StructureController.class.php:486
+#: libraries/controllers/DatabaseStructureController.class.php:426
 #: tbl_operations.php:400 view_operations.php:119
 #, fuzzy, php-format
 #| msgid "View %s has been dropped."
 msgid "View %s has been dropped."
 msgstr "جدول نقل %s چھوڑا جاچکا ہے۔"
 
-#: libraries/controllers/StructureController.class.php:487
+#: libraries/controllers/DatabaseStructureController.class.php:427
 #: tbl_operations.php:401
 #, fuzzy, php-format
 #| msgid "Table %s has been dropped."
 msgid "Table %s has been dropped."
 msgstr "جدول %s چھوڑا جاچکا ہے"
 
-#: libraries/controllers/StructureController.class.php:797
-#, php-format
-msgid "The name '%s' is a MySQL reserved keyword."
-msgid_plural "The names '%s' are MySQL reserved keywords."
-msgstr[0] ""
-msgstr[1] ""
-
-#: libraries/controllers/StructureController.class.php:875
-msgid "No column selected."
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1049
+#: libraries/controllers/DatabaseStructureController.class.php:733
 msgid "Favorite List is full!"
 msgstr ""
 
-#: libraries/controllers/StructureController.class.php:1272
-#, fuzzy
-#| msgid "Database %s has been dropped."
-msgid "The columns have been moved successfully."
-msgstr "کوائفیہ %s چھوڑ دیا گیا ہے۔"
-
-#: libraries/controllers/StructureController.class.php:1535
-#, fuzzy, php-format
-#| msgid "Table %s has been dropped."
-msgid ""
-"Table %1$s has been altered successfully. Privileges have been adjusted."
-msgstr "Table %s has been dropped"
-
-#: libraries/controllers/StructureController.class.php:1541
-#: libraries/controllers/TableIndexesController.class.php:161
-#: tbl_addfield.php:92
-#, php-format
-msgid "Table %1$s has been altered successfully."
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1588
-#: libraries/tracking.lib.php:1094
-#, fuzzy
-#| msgid "Gather errors"
-msgid "Query error"
-msgstr "نقائص اکھٹی کریں"
-
-#: libraries/controllers/StructureController.class.php:1806
+#: libraries/controllers/DatabaseStructureController.class.php:947
 #: libraries/mysql_charsets.lib.php:366 libraries/mysql_charsets.lib.php:373
 msgid "unknown"
 msgstr ""
 
-#: libraries/controllers/StructureController.class.php:1957
-#: templates/structure/check_all_table_column.phtml:11
-msgid "Change"
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1961
-#: libraries/controllers/StructureController.class.php:1966
-#: libraries/navigation/Nodes/Node_Index.class.php:30
-#: libraries/tracking.lib.php:926
-#: templates/columns_definitions/column_indexes.phtml:16
-#: templates/columns_definitions/table_fields_definitions.phtml:57
-#: templates/structure/check_all_table_column.phtml:30
-#: templates/structure/display_structure.phtml:79
-#: templates/structure/display_table_stats.phtml:19
-msgid "Index"
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1963
-#: libraries/controllers/StructureController.class.php:1968
-#: templates/columns_definitions/column_indexes.phtml:27
-#: templates/structure/check_all_table_column.phtml:37
-msgid "Spatial"
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1964
-#: libraries/controllers/StructureController.class.php:1969
-#: templates/columns_definitions/column_indexes.phtml:22
-#: templates/structure/check_all_table_column.phtml:47
-msgid "Fulltext"
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1970
-#, fuzzy
-#| msgid "Use this value"
-msgid "Distinct values"
-msgstr "یہ قدر استعمال کریں"
-
 #: libraries/controllers/TableChartController.class.php:82
 #: libraries/controllers/TableGisVisualizationController.class.php:101
 msgid "No SQL query was set to fetch data."
@@ -8770,11 +8711,18 @@ msgstr ""
 msgid "No data to display"
 msgstr "کوائف"
 
-#: libraries/controllers/TableRelationController.class.php:217
+#: libraries/controllers/TableIndexesController.class.php:161
+#: libraries/controllers/TableStructureController.class.php:736
+#: tbl_addfield.php:92
+#, php-format
+msgid "Table %1$s has been altered successfully."
+msgstr ""
+
+#: libraries/controllers/TableRelationController.class.php:218
 msgid "Display column was successfully updated."
 msgstr ""
 
-#: libraries/controllers/TableRelationController.class.php:283
+#: libraries/controllers/TableRelationController.class.php:288
 #, fuzzy
 #| msgid "Internal relation added"
 msgid "Internal relations were successfully updated."
@@ -8793,12 +8741,80 @@ msgid "Zoom search"
 msgstr "تلاش"
 
 #: libraries/controllers/TableSearchController.class.php:852
-#: templates/table/selection_form.phtml:59
+#: templates/table/search/selection_form.phtml:59
 #, fuzzy
 #| msgid "Hide search criteria"
 msgid "Find and replace"
 msgstr "تلاش کسوٹی چھپائیں"
 
+#: libraries/controllers/TableStructureController.class.php:163
+#, php-format
+msgid "The name '%s' is a MySQL reserved keyword."
+msgid_plural "The names '%s' are MySQL reserved keywords."
+msgstr[0] ""
+msgstr[1] ""
+
+#: libraries/controllers/TableStructureController.class.php:241
+msgid "No column selected."
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:467
+#, fuzzy
+#| msgid "Database %s has been dropped."
+msgid "The columns have been moved successfully."
+msgstr "کوائفیہ %s چھوڑ دیا گیا ہے۔"
+
+#: libraries/controllers/TableStructureController.class.php:730
+#, fuzzy, php-format
+#| msgid "Table %s has been dropped."
+msgid ""
+"Table %1$s has been altered successfully. Privileges have been adjusted."
+msgstr "Table %s has been dropped"
+
+#: libraries/controllers/TableStructureController.class.php:783
+#: libraries/tracking.lib.php:1094
+#, fuzzy
+#| msgid "Gather errors"
+msgid "Query error"
+msgstr "نقائص اکھٹی کریں"
+
+#: libraries/controllers/TableStructureController.class.php:948
+#: templates/table/structure/check_all_table_column.phtml:11
+msgid "Change"
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:952
+#: libraries/controllers/TableStructureController.class.php:957
+#: libraries/navigation/Nodes/Node_Index.class.php:30
+#: libraries/tracking.lib.php:926
+#: templates/columns_definitions/column_indexes.phtml:16
+#: templates/columns_definitions/table_fields_definitions.phtml:57
+#: templates/table/structure/check_all_table_column.phtml:30
+#: templates/table/structure/display_structure.phtml:79
+#: templates/table/structure/display_table_stats.phtml:19
+msgid "Index"
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:954
+#: libraries/controllers/TableStructureController.class.php:959
+#: templates/columns_definitions/column_indexes.phtml:27
+#: templates/table/structure/check_all_table_column.phtml:37
+msgid "Spatial"
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:955
+#: libraries/controllers/TableStructureController.class.php:960
+#: templates/columns_definitions/column_indexes.phtml:22
+#: templates/table/structure/check_all_table_column.phtml:47
+msgid "Fulltext"
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:963
+#, fuzzy
+#| msgid "Use this value"
+msgid "Distinct values"
+msgstr "یہ قدر استعمال کریں"
+
 #: libraries/core.lib.php:306
 #, php-format
 msgid "The %s extension is missing. Please check your PHP configuration."
@@ -8845,7 +8861,7 @@ msgid "No Password"
 msgstr ""
 
 #: libraries/display_change_password.lib.php:68
-#: libraries/plugins/auth/AuthenticationCookie.class.php:199
+#: libraries/plugins/auth/AuthenticationCookie.class.php:187
 #: libraries/replication_gui.lib.php:422 libraries/replication_gui.lib.php:862
 #: libraries/server_privileges.lib.php:1640
 msgid "Password:"
@@ -9631,12 +9647,12 @@ msgid "Dump has been saved to file %s."
 msgstr "ڈمپ اس مسل %s میں محفوظ ہوچکی ہے۔"
 
 #: libraries/import.lib.php:202 libraries/insert_edit.lib.php:124
-#: libraries/rte/rte_routines.lib.php:1353 libraries/sql.lib.php:1312
+#: libraries/rte/rte_routines.lib.php:1444 libraries/sql.lib.php:1306
 #: tbl_get_field.php:44
 msgid "MySQL returned an empty result set (i.e. zero rows)."
 msgstr ""
 
-#: libraries/import.lib.php:265 libraries/sql.lib.php:1326
+#: libraries/import.lib.php:265 libraries/sql.lib.php:1320
 msgid "[ROLLBACK occurred.]"
 msgstr ""
 
@@ -9704,14 +9720,14 @@ msgstr ""
 
 #: libraries/insert_edit.lib.php:233
 #: libraries/navigation/Nodes/Node_DatabaseChild.class.php:48
-#: templates/designer/table_list.phtml:40
+#: templates/database/designer/table_list.phtml:40
 msgid "Hide"
 msgstr ""
 
 #: libraries/insert_edit.lib.php:249
 #: libraries/navigation/Nodes/Node_Function.class.php:32
-#: libraries/rte/rte_routines.lib.php:1495
-#: templates/table/table_header.phtml:4
+#: libraries/rte/rte_routines.lib.php:1586
+#: templates/table/search/table_header.phtml:4
 msgid "Function"
 msgstr ""
 
@@ -9724,86 +9740,87 @@ msgstr ""
 msgid "Because of its length,<br /> this column might not be editable."
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1050
+#: libraries/insert_edit.lib.php:1048
 msgid "Binary - do not edit"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1176 libraries/server_privileges.lib.php:470
-#: templates/table/options.phtml:36
+#: libraries/insert_edit.lib.php:1174 libraries/server_privileges.lib.php:470
+#: templates/table/search/options.phtml:36
 msgid "Or"
 msgstr "یا"
 
-#: libraries/insert_edit.lib.php:1177
+#: libraries/insert_edit.lib.php:1175
 #, fuzzy
 #| msgid "Select from the web server upload directory <b>%s</b>:"
 msgid "web server upload directory:"
 msgstr "ویب سرور اپ لوڈ پوشہ سے منتخب کریں <b>%s</b>:"
 
-#: libraries/insert_edit.lib.php:1348 templates/table/input_box.phtml:49
+#: libraries/insert_edit.lib.php:1346
+#: templates/table/search/input_box.phtml:49
 #, fuzzy
 #| msgid "Insert"
 msgid "Edit/Insert"
 msgstr "داخل کریں"
 
-#: libraries/insert_edit.lib.php:1398
+#: libraries/insert_edit.lib.php:1396
 #, php-format
 msgid "Continue insertion with %s rows"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1428
+#: libraries/insert_edit.lib.php:1426
 msgid "and then"
 msgstr "اور پھر"
 
-#: libraries/insert_edit.lib.php:1461
+#: libraries/insert_edit.lib.php:1459
 msgid "Insert as new row"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1464
+#: libraries/insert_edit.lib.php:1462
 msgid "Insert as new row and ignore errors"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1467
+#: libraries/insert_edit.lib.php:1465
 msgid "Show insert query"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1487
+#: libraries/insert_edit.lib.php:1485
 msgid "Go back to previous page"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1490
+#: libraries/insert_edit.lib.php:1488
 msgid "Insert another new row"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1495
+#: libraries/insert_edit.lib.php:1493
 msgid "Go back to this page"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1518
+#: libraries/insert_edit.lib.php:1516
 msgid "Edit next row"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1540
+#: libraries/insert_edit.lib.php:1538
 msgid ""
 "Use TAB key to move from value to value, or CTRL+arrows to move anywhere"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1577 libraries/replication_gui.lib.php:542
-#: libraries/rte/rte_routines.lib.php:1497
+#: libraries/insert_edit.lib.php:1575 libraries/replication_gui.lib.php:542
+#: libraries/rte/rte_routines.lib.php:1588
 #: libraries/server_status_variables.lib.php:220
-#: templates/designer/having_query_panel.phtml:100
-#: templates/designer/options_panel.phtml:73
-#: templates/designer/options_panel.phtml:239
-#: templates/designer/where_query_panel.phtml:69
-#: templates/table/table_header.phtml:10
-#: templates/table/zoom_result_form.phtml:35
+#: templates/database/designer/having_query_panel.phtml:100
+#: templates/database/designer/options_panel.phtml:73
+#: templates/database/designer/options_panel.phtml:239
+#: templates/database/designer/where_query_panel.phtml:69
+#: templates/table/search/table_header.phtml:10
+#: templates/table/search/zoom_result_form.phtml:35
 msgid "Value"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1937 libraries/sql.lib.php:1309
+#: libraries/insert_edit.lib.php:1935 libraries/sql.lib.php:1303
 msgid "Showing SQL query"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1962 libraries/sql.lib.php:1287
+#: libraries/insert_edit.lib.php:1960 libraries/sql.lib.php:1281
 #, php-format
 msgid "Inserted row id: %1$d"
 msgstr ""
@@ -10250,7 +10267,7 @@ msgstr ""
 #: libraries/navigation/Nodes/Node_View_Container.class.php:26
 #: libraries/navigation/Nodes/Node_View_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:129
-#: templates/structure/show_create.phtml:30
+#: templates/database/structure/show_create.phtml:30
 #, fuzzy
 #| msgid "View"
 msgid "Views"
@@ -10560,7 +10577,7 @@ msgstr ""
 
 #: libraries/operations.lib.php:101 libraries/operations.lib.php:249
 #: libraries/operations.lib.php:869 libraries/operations.lib.php:963
-#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:907
+#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:998
 #: templates/columns_definitions/table_fields_definitions.phtml:47
 #, fuzzy
 #| msgid "Reloading Privileges"
@@ -10654,22 +10671,22 @@ msgid "Switch to copied table"
 msgstr ""
 
 #: libraries/operations.lib.php:1360
-#: templates/structure/check_all_tables.phtml:18
+#: templates/database/structure/check_all_tables.phtml:18
 msgid "Table maintenance"
 msgstr ""
 
 #: libraries/operations.lib.php:1398
-#: templates/structure/check_all_tables.phtml:19
+#: templates/database/structure/check_all_tables.phtml:19
 msgid "Analyze table"
 msgstr "جدول تجزیہ کریں"
 
 #: libraries/operations.lib.php:1413
-#: templates/structure/check_all_tables.phtml:20
+#: templates/database/structure/check_all_tables.phtml:20
 msgid "Check table"
 msgstr "جدول پڑتال کریں"
 
 #: libraries/operations.lib.php:1428
-#: templates/structure/check_all_tables.phtml:22
+#: templates/database/structure/check_all_tables.phtml:22
 #, fuzzy
 #| msgid "Check table"
 msgid "Checksum table"
@@ -10689,18 +10706,19 @@ msgid "Flush the table (FLUSH)"
 msgstr ""
 
 #: libraries/operations.lib.php:1477
-#: templates/structure/check_all_tables.phtml:23
-#: templates/structure/display_table_stats.phtml:56
+#: templates/database/structure/check_all_tables.phtml:23
+#: templates/table/structure/display_table_stats.phtml:56
 msgid "Optimize table"
 msgstr "جدول احسن کریں"
 
 #: libraries/operations.lib.php:1492
-#: templates/structure/check_all_tables.phtml:24
+#: templates/database/structure/check_all_tables.phtml:24
 msgid "Repair table"
 msgstr "جدول مرمت کریں"
 
 #: libraries/operations.lib.php:1538
-#: templates/structure/check_all_tables.phtml:14 view_operations.php:127
+#: templates/database/structure/check_all_tables.phtml:14
+#: view_operations.php:127
 #, fuzzy
 #| msgid "Delete tracking data for this table"
 msgid "Delete data or table"
@@ -10829,7 +10847,7 @@ msgid "Cannot connect: invalid settings."
 msgstr "جڑ نہیں سکتا: غلط ترتیبات۔"
 
 #: libraries/plugins/auth/AuthenticationConfig.class.php:108
-#: libraries/plugins/auth/AuthenticationCookie.class.php:134
+#: libraries/plugins/auth/AuthenticationCookie.class.php:122
 #: libraries/plugins/auth/AuthenticationHttp.class.php:96
 #, php-format
 msgid "Welcome to %s"
@@ -10859,38 +10877,38 @@ msgstr ""
 msgid "Retry to connect"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:146
+#: libraries/plugins/auth/AuthenticationCookie.class.php:134
 msgid "Your session has expired. Please log in again."
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:170
+#: libraries/plugins/auth/AuthenticationCookie.class.php:158
 msgid "Log in"
 msgstr "لاگ ان"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:178
-#: libraries/plugins/auth/AuthenticationCookie.class.php:188
+#: libraries/plugins/auth/AuthenticationCookie.class.php:166
+#: libraries/plugins/auth/AuthenticationCookie.class.php:176
 msgid "You can enter hostname/IP address and port separated by space."
 msgstr "آپ ہوسٹ نام یا IP پتا اور دہانہ وقفوں سے جدا کرکے داخل کرسکتے ہیں۔"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:193
+#: libraries/plugins/auth/AuthenticationCookie.class.php:181
 msgid "Username:"
 msgstr "صارف نام:"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:205
+#: libraries/plugins/auth/AuthenticationCookie.class.php:193
 #, fuzzy
 #| msgid "Server Choice"
 msgid "Server Choice:"
 msgstr "سرور انتخاب"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:386
+#: libraries/plugins/auth/AuthenticationCookie.class.php:374
 msgid "Entered captcha is wrong, try again!"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:396
+#: libraries/plugins/auth/AuthenticationCookie.class.php:384
 msgid "Please enter correct captcha!"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:423
+#: libraries/plugins/auth/AuthenticationCookie.class.php:411
 #, fuzzy
 #| msgid "Cannot log in to the MySQL server"
 msgid "You are not allowed to log in to this MySQL server!"
@@ -10988,7 +11006,7 @@ msgstr ""
 #: libraries/plugins/export/ExportOdt.class.php:593
 #: libraries/plugins/export/ExportTexytext.class.php:428
 #: libraries/plugins/export/PMA_ExportPdf.class.php:313
-#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:984
 #: libraries/rte/rte_triggers.lib.php:377
 #, fuzzy
 #| msgid "Description"
@@ -11330,7 +11348,7 @@ msgid "Last check:"
 msgstr "آخری پڑتال:"
 
 #: libraries/plugins/export/ExportSql.class.php:1399
-#: templates/structure/structure_table_row.phtml:183
+#: templates/database/structure/structure_table_row.phtml:183
 msgid "in use"
 msgstr "استعمال میں ہے"
 
@@ -11528,18 +11546,14 @@ msgstr ""
 msgid "The imported file does not contain any data!"
 msgstr "مسل %s کلید آئی ڈی کا حامل نہیں ہے"
 
-#: libraries/plugins/import/ImportSql.class.php:169
+#: libraries/plugins/import/ImportSql.class.php:72
 msgid "SQL compatibility mode:"
 msgstr ""
 
-#: libraries/plugins/import/ImportSql.class.php:181
+#: libraries/plugins/import/ImportSql.class.php:84
 msgid "Do not use <code>AUTO_INCREMENT</code> for zero values"
 msgstr ""
 
-#: libraries/plugins/import/ImportSql.class.php:195
-msgid "Read as multibytes"
-msgstr ""
-
 #: libraries/plugins/import/ImportXml.class.php:54
 msgid "XML"
 msgstr ""
@@ -11584,7 +11598,7 @@ msgid "Show grid"
 msgstr "گرِڈ دکھائیں"
 
 #: libraries/plugins/schema/SchemaPdf.class.php:94
-#: templates/structure/print_view_data_dictionary_link.phtml:6
+#: templates/database/structure/print_view_data_dictionary_link.phtml:6
 msgid "Data Dictionary"
 msgstr "کوائف لغت"
 
@@ -11615,7 +11629,7 @@ msgid "The %s table doesn't exist!"
 msgstr ""
 
 #: libraries/plugins/schema/eps/Eps_Relation_Schema.class.php:321
-#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:309
+#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:323
 #, php-format
 msgid "Schema of the %s database - Page %s"
 msgstr ""
@@ -11644,7 +11658,7 @@ msgstr ""
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1005
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1028
 #: libraries/tracking.lib.php:884
-#: templates/structure/table_structure_header.phtml:11
+#: templates/table/structure/table_structure_header.phtml:11
 msgid "Extra"
 msgstr ""
 
@@ -11979,32 +11993,32 @@ msgstr ""
 msgid "Create the needed tables with the <code>%screate_tables.sql</code>."
 msgstr ""
 
-#: libraries/relation.lib.php:360
+#: libraries/relation.lib.php:357
 msgid "Create a pma user and give access to these tables."
 msgstr ""
 
-#: libraries/relation.lib.php:365
+#: libraries/relation.lib.php:360
 msgid ""
 "Enable advanced features in configuration file (<code>config.inc.php</"
 "code>), for example by starting from <code>config.sample.inc.php</code>."
 msgstr ""
 
-#: libraries/relation.lib.php:373
+#: libraries/relation.lib.php:365
 msgid "Re-login to phpMyAdmin to load the updated configuration file."
 msgstr ""
 
-#: libraries/relation.lib.php:1612
+#: libraries/relation.lib.php:1607
 msgid "no description"
 msgstr ""
 
-#: libraries/relation.lib.php:1811
+#: libraries/relation.lib.php:1806
 msgid ""
 "You do not have necessary privileges to create a database named "
 "'phpmyadmin'. You may go to 'Operations' tab of any database to set up the "
 "phpMyAdmin configuration storage there."
 msgstr ""
 
-#: libraries/relation.lib.php:1928
+#: libraries/relation.lib.php:1923
 #, fuzzy, php-format
 #| msgid "Missing phpMyAdmin configuration storage tables"
 msgid ""
@@ -12012,21 +12026,21 @@ msgid ""
 "configuration storage there."
 msgstr "phpMyAdmin تشکیل ذخیرہ جداول موجود نہیں ہے"
 
-#: libraries/relation.lib.php:1936
+#: libraries/relation.lib.php:1931
 #, fuzzy, php-format
 #| msgid "Missing phpMyAdmin configuration storage tables"
 msgid ""
 "%sCreate%s the phpMyAdmin configuration storage in the current database."
 msgstr "phpMyAdmin تشکیل ذخیرہ جداول موجود نہیں ہے"
 
-#: libraries/relation.lib.php:1944
+#: libraries/relation.lib.php:1939
 #, fuzzy, php-format
 #| msgid "Missing phpMyAdmin configuration storage tables"
 msgid "%sCreate%s missing phpMyAdmin configuration storage tables."
 msgstr "phpMyAdmin تشکیل ذخیرہ جداول موجود نہیں ہے"
 
 #: libraries/replication_gui.lib.php:46 libraries/replication_gui.lib.php:343
-#: libraries/server_databases.lib.php:387
+#: libraries/server_databases.lib.php:398
 msgid "Master replication"
 msgstr ""
 
@@ -12081,7 +12095,7 @@ msgid ""
 msgstr ""
 
 #: libraries/replication_gui.lib.php:141
-#: libraries/server_databases.lib.php:389
+#: libraries/server_databases.lib.php:400
 msgid "Slave replication"
 msgstr ""
 
@@ -12358,10 +12372,10 @@ msgid "Master server changed successfully to %s."
 msgstr ""
 
 #: libraries/rte/rte_events.lib.php:106 libraries/rte/rte_events.lib.php:115
-#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:149
-#: libraries/rte/rte_routines.lib.php:158
-#: libraries/rte/rte_routines.lib.php:231
-#: libraries/rte/rte_routines.lib.php:1362
+#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:219
+#: libraries/rte/rte_routines.lib.php:246
+#: libraries/rte/rte_routines.lib.php:368
+#: libraries/rte/rte_routines.lib.php:1453
 #: libraries/rte/rte_triggers.lib.php:82 libraries/rte/rte_triggers.lib.php:91
 #: libraries/rte/rte_triggers.lib.php:123
 #, php-format
@@ -12384,7 +12398,7 @@ msgstr "Table %s has been dropped"
 msgid "Event %1$s has been created."
 msgstr "کوائفیہ $1%s بن گئی ہے۔"
 
-#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:251
+#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:266
 #: libraries/rte/rte_triggers.lib.php:144
 msgid "One or more errors have occurred while processing your request:"
 msgstr ""
@@ -12395,7 +12409,7 @@ msgstr ""
 msgid "Edit event"
 msgstr "نیا صارف اضافہ کریں"
 
-#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:794
+#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:885
 #: libraries/rte/rte_triggers.lib.php:323 view_create.php:180
 msgid "Details"
 msgstr ""
@@ -12410,7 +12424,7 @@ msgstr "صفحہ نمبر"
 msgid "Event type"
 msgstr ""
 
-#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:817
+#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:908
 #, php-format
 msgid "Change to %s"
 msgstr ""
@@ -12443,12 +12457,14 @@ msgstr "اختتام"
 msgid "On completion preserve"
 msgstr "داخل کرنا مکمل ہوا"
 
-#: libraries/rte/rte_events.lib.php:491 libraries/rte/rte_routines.lib.php:930
+#: libraries/rte/rte_events.lib.php:491
+#: libraries/rte/rte_routines.lib.php:1021
 #: libraries/rte/rte_triggers.lib.php:383 view_create.php:209
 msgid "Definer"
 msgstr ""
 
-#: libraries/rte/rte_events.lib.php:535 libraries/rte/rte_routines.lib.php:997
+#: libraries/rte/rte_events.lib.php:535
+#: libraries/rte/rte_routines.lib.php:1088
 #: libraries/rte/rte_triggers.lib.php:422
 msgid "The definer must be in the \"username@hostname\" format!"
 msgstr ""
@@ -12476,9 +12492,9 @@ msgid "You must provide an event definition."
 msgstr ""
 
 #: libraries/rte/rte_export.lib.php:43 libraries/rte/rte_general.lib.php:72
-#: libraries/rte/rte_routines.lib.php:345
-#: libraries/rte/rte_routines.lib.php:1198
-#: libraries/rte/rte_routines.lib.php:1411
+#: libraries/rte/rte_routines.lib.php:153
+#: libraries/rte/rte_routines.lib.php:1289
+#: libraries/rte/rte_routines.lib.php:1502
 #, fuzzy
 #| msgid "Error in Processing Request"
 msgid "Error in processing request:"
@@ -12514,150 +12530,150 @@ msgid ""
 "problems."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:110
-#: libraries/rte/rte_routines.lib.php:1006
-#, fuzzy, php-format
-#| msgid "Invalid server index: %s"
-msgid "Invalid routine type: \"%s\""
-msgstr "غلط سرور اشاریہ: %s"
-
-#: libraries/rte/rte_routines.lib.php:170
-msgid "Sorry, we failed to restore the dropped routine."
-msgstr ""
-
-#: libraries/rte/rte_routines.lib.php:211
-#, fuzzy, php-format
-#| msgid "Table %s has been dropped."
-msgid "Routine %1$s has been modified. Privileges have been adjusted."
-msgstr "Table %s has been dropped"
-
-#: libraries/rte/rte_routines.lib.php:216
-#, fuzzy, php-format
-#| msgid "Table %s has been dropped."
-msgid "Routine %1$s has been modified."
-msgstr "Table %s has been dropped"
-
-#: libraries/rte/rte_routines.lib.php:238
-#, fuzzy, php-format
-#| msgid "Database %1$s has been created."
-msgid "Routine %1$s has been created."
-msgstr "کوائفیہ $1%s بن گئی ہے۔"
-
-#: libraries/rte/rte_routines.lib.php:315
+#: libraries/rte/rte_routines.lib.php:123
 #, fuzzy
 #| msgid "Edit mode"
 msgid "Edit routine"
 msgstr "تدوین موڈ"
 
-#: libraries/rte/rte_routines.lib.php:797
+#: libraries/rte/rte_routines.lib.php:200
+#: libraries/rte/rte_routines.lib.php:1097
+#, fuzzy, php-format
+#| msgid "Invalid server index: %s"
+msgid "Invalid routine type: \"%s\""
+msgstr "غلط سرور اشاریہ: %s"
+
+#: libraries/rte/rte_routines.lib.php:253
+#, fuzzy, php-format
+#| msgid "Database %1$s has been created."
+msgid "Routine %1$s has been created."
+msgstr "کوائفیہ $1%s بن گئی ہے۔"
+
+#: libraries/rte/rte_routines.lib.php:380
+msgid "Sorry, we failed to restore the dropped routine."
+msgstr ""
+
+#: libraries/rte/rte_routines.lib.php:439
+#, fuzzy, php-format
+#| msgid "Table %s has been dropped."
+msgid "Routine %1$s has been modified. Privileges have been adjusted."
+msgstr "Table %s has been dropped"
+
+#: libraries/rte/rte_routines.lib.php:444
+#, fuzzy, php-format
+#| msgid "Table %s has been dropped."
+msgid "Routine %1$s has been modified."
+msgstr "Table %s has been dropped"
+
+#: libraries/rte/rte_routines.lib.php:888
 #, fuzzy
 #| msgid "Comments"
 msgid "Routine name"
 msgstr "آراء-رائے"
 
-#: libraries/rte/rte_routines.lib.php:823
+#: libraries/rte/rte_routines.lib.php:914
 msgid "Parameters"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:829
+#: libraries/rte/rte_routines.lib.php:920
 #, fuzzy
 #| msgid "Creation"
 msgid "Direction"
 msgstr "بنائیں"
 
-#: libraries/rte/rte_routines.lib.php:847
+#: libraries/rte/rte_routines.lib.php:938
 msgid "Add parameter"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:851
+#: libraries/rte/rte_routines.lib.php:942
 #, fuzzy
 #| msgid "Remove database"
 msgid "Remove last parameter"
 msgstr "کوائفیہ ہٹائیں"
 
-#: libraries/rte/rte_routines.lib.php:856
+#: libraries/rte/rte_routines.lib.php:947
 msgid "Return type"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:862
+#: libraries/rte/rte_routines.lib.php:953
 msgid "Return length/values"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:868
+#: libraries/rte/rte_routines.lib.php:959
 #, fuzzy
 #| msgid "Action"
 msgid "Return options"
 msgstr "عمل"
 
-#: libraries/rte/rte_routines.lib.php:899
+#: libraries/rte/rte_routines.lib.php:990
 msgid "Is deterministic"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:920
+#: libraries/rte/rte_routines.lib.php:1011
 msgid ""
 "You do not have sufficient privileges to perform this operation; Please "
 "refer to the documentation for more details"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:935
+#: libraries/rte/rte_routines.lib.php:1026
 #, fuzzy
 #| msgid "Security"
 msgid "Security type"
 msgstr "سلامتی"
 
-#: libraries/rte/rte_routines.lib.php:944
+#: libraries/rte/rte_routines.lib.php:1035
 msgid "SQL data access"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1013
+#: libraries/rte/rte_routines.lib.php:1104
 #, fuzzy
 #| msgid "Invalid table name"
 msgid "You must provide a routine name!"
 msgstr "غلط جدول نام"
 
-#: libraries/rte/rte_routines.lib.php:1047
+#: libraries/rte/rte_routines.lib.php:1138
 #, php-format
 msgid "Invalid direction \"%s\" given for parameter."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1069
-#: libraries/rte/rte_routines.lib.php:1131
+#: libraries/rte/rte_routines.lib.php:1160
+#: libraries/rte/rte_routines.lib.php:1222
 msgid ""
 "You must provide length/values for routine parameters of type ENUM, SET, "
 "VARCHAR and VARBINARY."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1095
+#: libraries/rte/rte_routines.lib.php:1186
 msgid "You must provide a name and a type for each routine parameter."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1114
+#: libraries/rte/rte_routines.lib.php:1205
 msgid "You must provide a valid return type for the routine."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1174
+#: libraries/rte/rte_routines.lib.php:1265
 msgid "You must provide a routine definition."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1285
+#: libraries/rte/rte_routines.lib.php:1376
 #, php-format
 msgid "Execution results of routine %s"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1340
+#: libraries/rte/rte_routines.lib.php:1431
 #, php-format
 msgid "%d row affected by the last statement inside the procedure."
 msgid_plural "%d rows affected by the last statement inside the procedure."
 msgstr[0] ""
 msgstr[1] ""
 
-#: libraries/rte/rte_routines.lib.php:1398
-#: libraries/rte/rte_routines.lib.php:1406
+#: libraries/rte/rte_routines.lib.php:1489
+#: libraries/rte/rte_routines.lib.php:1497
 msgid "Execute routine"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1485
-#: libraries/rte/rte_routines.lib.php:1488
+#: libraries/rte/rte_routines.lib.php:1576
+#: libraries/rte/rte_routines.lib.php:1579
 msgid "Routine parameters"
 msgstr ""
 
@@ -12850,7 +12866,7 @@ msgid "Original position"
 msgstr ""
 
 #: libraries/server_bin_log.lib.php:133
-#: templates/structure/display_table_stats.phtml:4
+#: templates/table/structure/display_table_stats.phtml:4
 msgid "Information"
 msgstr ""
 
@@ -12886,12 +12902,12 @@ msgid ""
 "between the web server and the MySQL server."
 msgstr ""
 
-#: libraries/server_databases.lib.php:364
-#: libraries/server_databases.lib.php:365
+#: libraries/server_databases.lib.php:366
+#: libraries/server_databases.lib.php:371
 msgid "Enable Statistics"
 msgstr ""
 
-#: libraries/server_databases.lib.php:481
+#: libraries/server_databases.lib.php:492
 #, fuzzy, php-format
 #| msgid "Database %s has been dropped."
 msgid "%1$d database has been dropped successfully."
@@ -13258,7 +13274,7 @@ msgid "You have revoked the privileges for %s."
 msgstr ""
 
 #: libraries/server_privileges.lib.php:2059
-#: libraries/server_privileges.lib.php:4290
+#: libraries/server_privileges.lib.php:4316
 #, fuzzy
 #| msgid "Add %s"
 msgid "Add user account"
@@ -13431,56 +13447,56 @@ msgstr ""
 msgid "The privileges were reloaded successfully."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:3994
+#: libraries/server_privileges.lib.php:4003
 #, php-format
 msgid "The user %s already exists!"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4232
+#: libraries/server_privileges.lib.php:4258
 #, fuzzy, php-format
 #| msgid "Check Privileges"
 msgid "Privileges for %s"
 msgstr "استحقاق پڑتال کریں"
 
-#: libraries/server_privileges.lib.php:4241
+#: libraries/server_privileges.lib.php:4267
 #: libraries/server_status_processes.lib.php:72
 #: libraries/server_user_groups.lib.php:39
 msgid "User"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4282
+#: libraries/server_privileges.lib.php:4308
 msgctxt "Create new user"
 msgid "New"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4311
+#: libraries/server_privileges.lib.php:4337
 #, fuzzy
 #| msgid "Reloading Privileges"
 msgid "Edit privileges:"
 msgstr "استحقاق پھر لوڈ کرتے ہوئے"
 
-#: libraries/server_privileges.lib.php:4312
+#: libraries/server_privileges.lib.php:4338
 msgid "User account"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4371
+#: libraries/server_privileges.lib.php:4397
 msgid ""
 "Note: You are attempting to edit privileges of the user with which you are "
 "currently logged in."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4391 libraries/server_users.lib.php:25
+#: libraries/server_privileges.lib.php:4417 libraries/server_users.lib.php:25
 msgid "User accounts overview"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4459
+#: libraries/server_privileges.lib.php:4485
 msgid ""
 "A user account allowing any user from localhost to connect is present. This "
 "will prevent other users from connecting if the host part of their account "
 "allows a connection from any (%) host."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4500
+#: libraries/server_privileges.lib.php:4526
 #, php-format
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
@@ -13489,7 +13505,7 @@ msgid ""
 "%sreload the privileges%s before you continue."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4519
+#: libraries/server_privileges.lib.php:4545
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
 "tables. The content of these tables may differ from the privileges the "
@@ -13498,63 +13514,63 @@ msgid ""
 "privilege."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4569
+#: libraries/server_privileges.lib.php:4595
 msgid "The selected user was not found in the privilege table."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4801
+#: libraries/server_privileges.lib.php:4827
 msgid "You have added a new user."
 msgstr ""
 
-#: libraries/server_status.lib.php:53
+#: libraries/server_status.lib.php:60
 #, php-format
 msgid "Network traffic since startup: %s"
 msgstr ""
 
-#: libraries/server_status.lib.php:66
+#: libraries/server_status.lib.php:73
 #, php-format
 msgid "This MySQL server has been running for %1$s. It started up on %2$s."
 msgstr ""
 
-#: libraries/server_status.lib.php:80
+#: libraries/server_status.lib.php:94
 msgid ""
 "This MySQL server works as <b>master</b> and <b>slave</b> in <b>replication</"
 "b> process."
 msgstr ""
 
-#: libraries/server_status.lib.php:85
+#: libraries/server_status.lib.php:99
 msgid "This MySQL server works as <b>master</b> in <b>replication</b> process."
 msgstr ""
 
-#: libraries/server_status.lib.php:90
+#: libraries/server_status.lib.php:104
 msgid "This MySQL server works as <b>slave</b> in <b>replication</b> process."
 msgstr ""
 
-#: libraries/server_status.lib.php:106
+#: libraries/server_status.lib.php:116
 msgid "Replication status"
 msgstr ""
 
-#: libraries/server_status.lib.php:137
+#: libraries/server_status.lib.php:146
 msgid ""
 "On a busy server, the byte counters may overrun, so those statistics as "
 "reported by the MySQL server may be incorrect."
 msgstr ""
 
-#: libraries/server_status.lib.php:148
+#: libraries/server_status.lib.php:157
 msgid "Received"
 msgstr ""
 
-#: libraries/server_status.lib.php:167
+#: libraries/server_status.lib.php:176
 msgid "Sent"
 msgstr ""
 
-#: libraries/server_status.lib.php:234
+#: libraries/server_status.lib.php:243
 #, fuzzy
 #| msgid "Persistent connections"
 msgid "Max. concurrent connections"
 msgstr "بہتر جوڑ"
 
-#: libraries/server_status.lib.php:244
+#: libraries/server_status.lib.php:253
 msgid "Failed attempts"
 msgstr ""
 
@@ -14536,7 +14552,7 @@ msgstr ""
 msgid "Not implemented yet."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/AlterOperation.php:193
+#: libraries/sql-parser/src/Components/AlterOperation.php:191
 #, fuzzy
 #| msgid "Iconic table operations"
 msgid "Unrecognized alter operation."
@@ -14552,7 +14568,7 @@ msgid "An opening bracket followed by a set of values was expected."
 msgstr ""
 
 #: libraries/sql-parser/src/Components/ArrayObj.php:101
-#: libraries/sql-parser/src/Components/FieldDefinition.php:202
+#: libraries/sql-parser/src/Components/CreateDefinition.php:202
 msgid "An opening bracket was expected."
 msgstr ""
 
@@ -14560,25 +14576,35 @@ msgstr ""
 msgid "A comma or a closing bracket was expected"
 msgstr ""
 
+#: libraries/sql-parser/src/Components/CreateDefinition.php:246
+#, fuzzy
+#| msgid "Removing Selected Users"
+msgid "A comma or a closing bracket was expected."
+msgstr "منتخب صارفین حذف کیے جا رہے ہیں"
+
+#: libraries/sql-parser/src/Components/CreateDefinition.php:262
+msgid "A closing bracket was expected."
+msgstr ""
+
 #: libraries/sql-parser/src/Components/DataType.php:125
 msgid "Unrecognized data type."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:225
+#: libraries/sql-parser/src/Components/Expression.php:227
 msgid "Unexpected closing bracket."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:246
-#: libraries/sql-parser/src/Components/Expression.php:283
-#: libraries/sql-parser/src/Components/Expression.php:303
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:285
+#: libraries/sql-parser/src/Components/Expression.php:305
 msgid "An alias was previously found."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:257
+#: libraries/sql-parser/src/Components/Expression.php:259
 msgid "Unexpected dot."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:327
+#: libraries/sql-parser/src/Components/Expression.php:329
 #, fuzzy
 #| msgid "Removing Selected Users"
 msgid "An alias was expected."
@@ -14590,16 +14616,6 @@ msgstr "منتخب صارفین حذف کیے جا رہے ہیں"
 msgid "An expression was expected."
 msgstr "منتخب صارفین حذف کیے جا رہے ہیں"
 
-#: libraries/sql-parser/src/Components/FieldDefinition.php:246
-#, fuzzy
-#| msgid "Removing Selected Users"
-msgid "A comma or a closing bracket was expected."
-msgstr "منتخب صارفین حذف کیے جا رہے ہیں"
-
-#: libraries/sql-parser/src/Components/FieldDefinition.php:262
-msgid "A closing bracket was expected."
-msgstr ""
-
 #: libraries/sql-parser/src/Components/Limit.php:90
 #: libraries/sql-parser/src/Components/Limit.php:112
 msgid "An offset was expected."
@@ -14641,29 +14657,29 @@ msgstr ""
 msgid "Expected delimiter."
 msgstr ""
 
-#: libraries/sql-parser/src/Lexer.php:753
+#: libraries/sql-parser/src/Lexer.php:777
 #, fuzzy, php-format
 #| msgid "Database %1$s has been created."
 msgid "Ending quote %1$s was expected."
 msgstr "کوائفیہ $1%s بن گئی ہے۔"
 
-#: libraries/sql-parser/src/Lexer.php:789
+#: libraries/sql-parser/src/Lexer.php:813
 #, fuzzy
 #| msgid "Table name template"
 msgid "Variable name was expected."
 msgstr "جدول نام سانچا"
 
-#: libraries/sql-parser/src/Parser.php:380
+#: libraries/sql-parser/src/Parser.php:391
 #, fuzzy
 #| msgid "Show dimension of tables"
 msgid "Unexpected beginning of statement."
 msgstr "ٹیبلز کی جسامت دیکھیں"
 
-#: libraries/sql-parser/src/Parser.php:399
+#: libraries/sql-parser/src/Parser.php:410
 msgid "Unrecognized statement type."
 msgstr ""
 
-#: libraries/sql-parser/src/Parser.php:479
+#: libraries/sql-parser/src/Parser.php:489
 msgid "No transaction was previously started."
 msgstr ""
 
@@ -14689,8 +14705,10 @@ msgid "The name of the entity was expected."
 msgstr ""
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:310
-msgid "At least one field definition was expected."
-msgstr ""
+#, fuzzy
+#| msgid "The bookmark has been deleted."
+msgid "At least one column definition was expected."
+msgstr "نشانی حذف ہو چکی ہے۔"
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:329
 msgid "A \"RETURNS\" keyword was expected."
@@ -14763,25 +14781,25 @@ msgstr "نشانی %s بنایا گیا"
 msgid "Using bookmark \"%s\" as default browse query."
 msgstr ""
 
-#: libraries/sql.lib.php:1306
+#: libraries/sql.lib.php:1300
 msgid "Showing as PHP code"
 msgstr ""
 
-#: libraries/sql.lib.php:1638
+#: libraries/sql.lib.php:1632
 #, php-format
 msgid ""
 "Current selection does not contain a unique column. Grid edit, checkbox, "
 "Edit, Copy and Delete features are not available. %s"
 msgstr ""
 
-#: libraries/sql.lib.php:1649
+#: libraries/sql.lib.php:1643
 #, php-format
 msgid ""
 "Current selection does not contain a unique column. Grid edit, Edit, Copy "
 "and Delete features may result in undesired behavior. %s"
 msgstr ""
 
-#: libraries/sql.lib.php:1688
+#: libraries/sql.lib.php:1682
 #, php-format
 msgid "Problems with indexes of table `%s`"
 msgstr ""
@@ -14950,7 +14968,7 @@ msgid "Version %s snapshot (SQL code)"
 msgstr ""
 
 #: libraries/tracking.lib.php:947
-#: templates/structure/table_structure_row.phtml:33
+#: templates/table/structure/table_structure_row.phtml:33
 msgctxt "None for default"
 msgid "None"
 msgstr ""
@@ -15005,19 +15023,19 @@ msgstr "جنرل ریلیشن فیچرز"
 msgid "Version %1$s was created, tracking for %2$s is active."
 msgstr ""
 
-#: libraries/user_preferences.inc.php:29
+#: libraries/user_preferences.inc.php:30
 #, fuzzy
 #| msgid "General relation features"
 msgid "Manage your settings"
 msgstr "جنرل ریلیشن فیچرز"
 
-#: libraries/user_preferences.inc.php:46 prefs_manage.php:307
+#: libraries/user_preferences.inc.php:54 prefs_manage.php:307
 #, fuzzy
 #| msgid "Modifications have been saved"
 msgid "Configuration has been saved."
 msgstr "تبدیلیاں محفوظ ہو چکی ہیں"
 
-#: libraries/user_preferences.inc.php:66
+#: libraries/user_preferences.inc.php:74
 #, php-format
 msgid ""
 "Your preferences will be saved for current session only. Storing them "
@@ -15411,7 +15429,7 @@ msgid "first"
 msgstr ""
 
 #: templates/columns_definitions/move_column.phtml:12
-#: templates/structure/add_column.phtml:21
+#: templates/table/structure/add_column.phtml:21
 #, php-format
 msgid "after %s"
 msgstr ""
@@ -15480,237 +15498,346 @@ msgstr "نسخہ معلومات:"
 msgid "Input transformation options"
 msgstr "عمل"
 
-#: templates/designer/aggregate_query_panel.phtml:22
-#: templates/designer/options_panel.phtml:100
+#: templates/database/create_table.phtml:7
+#: templates/database/designer/side_menu.phtml:77
+#: templates/database/designer/side_menu.phtml:80
+msgid "Create table"
+msgstr ""
+
+#: templates/database/create_table.phtml:15
+msgid "Number of columns"
+msgstr ""
+
+#: templates/database/designer/aggregate_query_panel.phtml:22
+#: templates/database/designer/options_panel.phtml:100
 #, fuzzy
 #| msgid "Created"
 msgid "Aggregate"
 msgstr "تخلیق کیا گیا"
 
-#: templates/designer/aggregate_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:61
-#: templates/designer/options_panel.phtml:106
-#: templates/designer/options_panel.phtml:170
-#: templates/designer/where_query_panel.phtml:30
-#: templates/table/table_header.phtml:9
+#: templates/database/designer/aggregate_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:61
+#: templates/database/designer/options_panel.phtml:106
+#: templates/database/designer/options_panel.phtml:170
+#: templates/database/designer/where_query_panel.phtml:30
+#: templates/table/search/table_header.phtml:9
 msgid "Operator"
 msgstr ""
 
-#: templates/designer/database_tables.phtml:29
+#: templates/database/designer/database_tables.phtml:29
 msgid "Toggle"
 msgstr ""
 
-#: templates/designer/database_tables.phtml:40
+#: templates/database/designer/database_tables.phtml:40
 #, fuzzy
 #| msgid "Databases"
 msgid "See table structure"
 msgstr "کوائفیے"
 
-#: templates/designer/delete_relation_panel.phtml:21
+#: templates/database/designer/delete_relation_panel.phtml:21
 msgid "Delete relation"
 msgstr ""
 
-#: templates/designer/edit_delete_pages.phtml:7
+#: templates/database/designer/edit_delete_pages.phtml:7
 #, fuzzy
 #| msgid "Page titles"
 msgid "Page to open"
 msgstr "صفحہ عنوانات"
 
-#: templates/designer/edit_delete_pages.phtml:7
+#: templates/database/designer/edit_delete_pages.phtml:7
 #, fuzzy
 #| msgid "Relation deleted"
 msgid "Page to delete"
 msgstr "ریلیشن حذف ہو گیا"
 
-#: templates/designer/having_query_panel.phtml:90
-#: templates/designer/options_panel.phtml:63
-#: templates/designer/options_panel.phtml:229
-#: templates/designer/where_query_panel.phtml:59
+#: templates/database/designer/having_query_panel.phtml:90
+#: templates/database/designer/options_panel.phtml:63
+#: templates/database/designer/options_panel.phtml:229
+#: templates/database/designer/where_query_panel.phtml:59
 #, fuzzy
 #| msgid "Export"
 msgid "Except"
 msgstr "برآمد"
 
-#: templates/designer/having_query_panel.phtml:102
-#: templates/designer/options_panel.phtml:75
-#: templates/designer/options_panel.phtml:241
-#: templates/designer/where_query_panel.phtml:71
+#: templates/database/designer/having_query_panel.phtml:102
+#: templates/database/designer/options_panel.phtml:75
+#: templates/database/designer/options_panel.phtml:241
+#: templates/database/designer/where_query_panel.phtml:71
 #, fuzzy
 #| msgid "Submit Query"
 msgid "subquery"
 msgstr "Submit Query"
 
-#: templates/designer/new_relation_panel.phtml:22
-#: templates/designer/side_menu.phtml:84 templates/designer/side_menu.phtml:87
+#: templates/database/designer/new_relation_panel.phtml:22
+#: templates/database/designer/side_menu.phtml:84
+#: templates/database/designer/side_menu.phtml:87
 msgid "Create relation"
 msgstr ""
 
-#: templates/designer/options_panel.phtml:34
-#: templates/designer/options_panel.phtml:200
+#: templates/database/designer/options_panel.phtml:34
+#: templates/database/designer/options_panel.phtml:200
 #, fuzzy
 #| msgid "Relation deleted"
 msgid "Relation operator"
 msgstr "ریلیشن حذف ہو گیا"
 
-#: templates/designer/options_panel.phtml:85
-#: templates/designer/rename_to_panel.phtml:23
+#: templates/database/designer/options_panel.phtml:85
+#: templates/database/designer/rename_to_panel.phtml:23
 #, fuzzy
 #| msgid "Rename database to"
 msgid "Rename to"
 msgstr "ڈیٹا بیس کا نام بدلیں"
 
-#: templates/designer/options_panel.phtml:91
-#: templates/designer/rename_to_panel.phtml:31
+#: templates/database/designer/options_panel.phtml:91
+#: templates/database/designer/rename_to_panel.phtml:31
 #, fuzzy
 #| msgid "Page number:"
 msgid "New name"
 msgstr "صفحہ نمبر"
 
-#: templates/designer/page_save_as.phtml:4
+#: templates/database/designer/page_save_as.phtml:4
 #, fuzzy
 #| msgid "Invalid table name"
 msgid "Save to selected page"
 msgstr "غلط جدول نام"
 
-#: templates/designer/page_save_as.phtml:5
+#: templates/database/designer/page_save_as.phtml:5
 msgid "Create a page and save to it"
 msgstr ""
 
-#: templates/designer/page_save_as.phtml:26
+#: templates/database/designer/page_save_as.phtml:26
 #, fuzzy
 #| msgid "Page number:"
 msgid "New page name"
 msgstr "صفحہ نمبر"
 
-#: templates/designer/page_selector.phtml:2
+#: templates/database/designer/page_selector.phtml:2
 #, fuzzy
 #| msgid "Select All"
 msgid "Select page"
 msgstr "سارا منتخب کریں"
 
-#: templates/designer/query_details.phtml:10
+#: templates/database/designer/query_details.phtml:10
 #, fuzzy
 #| msgid "Action"
 msgid "Active options"
 msgstr "عمل"
 
-#: templates/designer/schema_export.phtml:4
+#: templates/database/designer/schema_export.phtml:4
 msgid "Select Export Relational Type"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:19 templates/designer/side_menu.phtml:25
+#: templates/database/designer/side_menu.phtml:19
+#: templates/database/designer/side_menu.phtml:25
 #, fuzzy
 #| msgid "Count tables"
 msgid "Show/Hide tables list"
 msgstr "حداول کی گنتی کریں"
 
-#: templates/designer/side_menu.phtml:29 templates/designer/side_menu.phtml:35
-#: templates/designer/side_menu.phtml:36
+#: templates/database/designer/side_menu.phtml:29
+#: templates/database/designer/side_menu.phtml:35
+#: templates/database/designer/side_menu.phtml:36
 msgid "View in fullscreen"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:34
+#: templates/database/designer/side_menu.phtml:34
 msgid "Exit fullscreen"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:41 templates/designer/side_menu.phtml:45
+#: templates/database/designer/side_menu.phtml:41
+#: templates/database/designer/side_menu.phtml:45
 #, fuzzy
 #| msgid "Page number:"
 msgid "New page"
 msgstr "صفحہ نمبر"
 
-#: templates/designer/side_menu.phtml:70 templates/designer/side_menu.phtml:73
+#: templates/database/designer/side_menu.phtml:70
+#: templates/database/designer/side_menu.phtml:73
 #, fuzzy
 #| msgid "Select All"
 msgid "Delete pages"
 msgstr "سارا منتخب کریں"
 
-#: templates/designer/side_menu.phtml:77 templates/designer/side_menu.phtml:80
-#: templates/table/create_table.phtml:7
-msgid "Create table"
-msgstr ""
-
-#: templates/designer/side_menu.phtml:98
-#: templates/designer/side_menu.phtml:101
+#: templates/database/designer/side_menu.phtml:98
+#: templates/database/designer/side_menu.phtml:101
 msgid "Reload"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:107
-#: templates/designer/side_menu.phtml:110
+#: templates/database/designer/side_menu.phtml:107
+#: templates/database/designer/side_menu.phtml:110
 msgid "Help"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Angular links"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Direct links"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:122
-#: templates/designer/side_menu.phtml:124
+#: templates/database/designer/side_menu.phtml:122
+#: templates/database/designer/side_menu.phtml:124
 msgid "Snap to grid"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:128
-#: templates/designer/side_menu.phtml:134
+#: templates/database/designer/side_menu.phtml:128
+#: templates/database/designer/side_menu.phtml:134
 msgid "Small/Big All"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:138
-#: templates/designer/side_menu.phtml:141
+#: templates/database/designer/side_menu.phtml:138
+#: templates/database/designer/side_menu.phtml:141
 msgid "Toggle small/big"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:145
-#: templates/designer/side_menu.phtml:148
+#: templates/database/designer/side_menu.phtml:145
+#: templates/database/designer/side_menu.phtml:148
 msgid "Toggle relation lines"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:153
-#: templates/designer/side_menu.phtml:156
+#: templates/database/designer/side_menu.phtml:153
+#: templates/database/designer/side_menu.phtml:156
 #, fuzzy
 #| msgid "Export"
 msgid "Export schema"
 msgstr "برآمد"
 
-#: templates/designer/side_menu.phtml:165
-#: templates/designer/side_menu.phtml:168
+#: templates/database/designer/side_menu.phtml:165
+#: templates/database/designer/side_menu.phtml:168
 #, fuzzy
 #| msgid "Submit Query"
 msgid "Build Query"
 msgstr "Submit Query"
 
-#: templates/designer/side_menu.phtml:173
-#: templates/designer/side_menu.phtml:177
+#: templates/database/designer/side_menu.phtml:173
+#: templates/database/designer/side_menu.phtml:177
 msgid "Move Menu"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:181
-#: templates/designer/side_menu.phtml:186
+#: templates/database/designer/side_menu.phtml:181
+#: templates/database/designer/side_menu.phtml:186
 #, fuzzy
 #| msgid "Print"
 msgid "Pin text"
 msgstr "چھاپیں"
 
-#: templates/designer/table_list.phtml:4
+#: templates/database/designer/table_list.phtml:4
 msgid "Hide/Show all"
 msgstr ""
 
-#: templates/designer/table_list.phtml:14
+#: templates/database/designer/table_list.phtml:14
 msgid "Hide/Show Tables with no relation"
 msgstr ""
 
-#: templates/designer/table_list.phtml:59
+#: templates/database/designer/table_list.phtml:59
 #, fuzzy
 #| msgid "Number of inserted rows"
 msgid "Number of tables:"
 msgstr "داخل شدہ صفوں کی تعداد"
 
+#: templates/database/structure/body_for_table_summary.phtml:6
+#, php-format
+msgid "%s table"
+msgid_plural "%s tables"
+msgstr[0] "%s جدول"
+msgstr[1] "%s جداول"
+
+#: templates/database/structure/body_for_table_summary.phtml:17
+msgid "Sum"
+msgstr "مجموعہ"
+
+#: templates/database/structure/check_all_tables.phtml:6
+msgid "Check tables having overhead"
+msgstr "اوور ہیڈ جداول کی پڑتال کریں"
+
+#: templates/database/structure/check_all_tables.phtml:10
+#, fuzzy
+#| msgid "Show color"
+msgid "Show create"
+msgstr "کلر دکھائیں"
+
+#: templates/database/structure/check_all_tables.phtml:27
+msgid "Prefix"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:28
+msgid "Add prefix to table"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:29
+#, fuzzy
+#| msgid "Replace table data with file"
+msgid "Replace table prefix"
+msgstr "جدول کوائف کو مسل سے بدلیں"
+
+#: templates/database/structure/check_all_tables.phtml:30
+#, fuzzy
+#| msgid "Replace table data with file"
+msgid "Copy table with prefix"
+msgstr "جدول کوائف کو مسل سے بدلیں"
+
+#: templates/database/structure/check_all_tables.phtml:36
+#, fuzzy
+#| msgid "CHAR textarea columns"
+msgid "Add columns to central list"
+msgstr "CHAR textarea کالم"
+
+#: templates/database/structure/check_all_tables.phtml:37
+msgid "Remove columns from central list"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:38
+#, fuzzy
+#| msgid "CHAR textarea columns"
+msgid "Make consistent with central list"
+msgstr "CHAR textarea کالم"
+
+#: templates/database/structure/favorite_anchor.phtml:12
+#, fuzzy
+#| msgid "Add a New User"
+msgid "Add to Favorites"
+msgstr "نیا صارف اضافہ کریں"
+
+#: templates/database/structure/show_create.phtml:2
+msgid "Showing create queries"
+msgstr ""
+
+#: templates/database/structure/sortable_header.phtml:13
+msgid "Sort"
+msgstr "چھانٹیں"
+
+#: templates/database/structure/table_header.phtml:42
+#, fuzzy
+#| msgid "Error moving the uploaded file, see [doc@faq1-11]FAQ 1.11[/doc]"
+msgid ""
+"May be approximate. Click on the number to get the exact count. See "
+"[doc@faq3-11]FAQ 3.11[/doc]."
+msgstr ""
+"اپ لوڈ مسل کو بڑھاتے ہوئے نقص ہے, دیکھیں [doc@faq1-11]عمومی سوالات 1.11[/doc]"
+
+# db_printview.php:107 libraries/db_structure.lib.php:58 tbl_indexes.php:188
+#: templates/database/structure/table_header.phtml:66
+#: templates/table/index_form.phtml:127
+msgid "Size"
+msgstr "ناپ"
+
+#: templates/database/structure/table_header.phtml:74
+#: templates/table/structure/display_table_stats.phtml:27
+msgid "Overhead"
+msgstr "مجموعی"
+
+#: templates/database/structure/tracking_icon.phtml:4
+msgid "Tracking is active."
+msgstr "کھوج فعال ہے۔"
+
+#: templates/database/structure/tracking_icon.phtml:8
+msgid "Tracking is not active."
+msgstr "کھوج غیر فعال ہے۔"
+
 #: templates/error/report_form.phtml:7
 msgid ""
 "phpMyAdmin has encountered an error. We have collected data about this error "
@@ -15726,72 +15853,6 @@ msgstr ""
 msgid "Please explain the steps that lead to the error:"
 msgstr ""
 
-#: templates/gis_visualization/gis_visualization.phtml:3
-#, fuzzy
-#| msgid "Display servers selection"
-msgid "Display GIS Visualization"
-msgstr "سرور انتخاب دکھائیں"
-
-#: templates/gis_visualization/gis_visualization.phtml:8
-#, fuzzy
-#| msgid "Add/Delete Field Columns"
-msgid "Label column"
-msgstr "فیلڈ کالمز شامل یا ختم کریں"
-
-#: templates/gis_visualization/gis_visualization.phtml:11
-msgid "-- None --"
-msgstr ""
-
-#: templates/gis_visualization/gis_visualization.phtml:19
-#, fuzzy
-#| msgid "Total"
-msgid "Spatial column"
-msgstr "میزان"
-
-#: templates/index_form.phtml:16
-msgid "Index name:"
-msgstr ""
-
-#: templates/index_form.phtml:19
-msgid ""
-"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
-msgstr ""
-
-#: templates/index_form.phtml:40
-#, fuzzy
-#| msgid "Indexes"
-msgid "Index choice:"
-msgstr "اشاریے"
-
-#: templates/index_form.phtml:57
-msgid "Key block size:"
-msgstr ""
-
-#: templates/index_form.phtml:74
-msgid "Index type:"
-msgstr ""
-
-#: templates/index_form.phtml:86
-#, fuzzy
-#| msgid "User:"
-msgid "Parser:"
-msgstr "صارف:"
-
-#: templates/index_form.phtml:102
-#, fuzzy
-#| msgid "Comment"
-msgid "Comment:"
-msgstr "تبصرہ"
-
-# db_printview.php:107 libraries/db_structure.lib.php:58 tbl_indexes.php:188
-#: templates/index_form.phtml:127 templates/structure/table_header.phtml:66
-msgid "Size"
-msgstr "ناپ"
-
-#: templates/index_form.phtml:149 templates/index_form.phtml:190
-msgid "Drag to reorder"
-msgstr ""
-
 #: templates/prefs_autoload.phtml:9
 msgid ""
 "Your browser has phpMyAdmin configuration for this domain. Would you like to "
@@ -15804,491 +15865,455 @@ msgstr ""
 msgid "Start row:"
 msgstr "ابتدائیہ"
 
-#: templates/structure/actions_in_table_structure.phtml:14
-#, php-format
-msgid "A primary key has been added on %s."
-msgstr ""
-
-#: templates/structure/actions_in_table_structure.phtml:34
-#: templates/structure/actions_in_table_structure.phtml:54
-#: templates/structure/actions_in_table_structure.phtml:79
-#: templates/structure/actions_in_table_structure.phtml:101
-#, php-format
-msgid "An index has been added on %s."
-msgstr ""
-
-#: templates/structure/actions_in_table_structure.phtml:130
-#: templates/structure/check_all_table_column.phtml:59
-#, fuzzy
-#| msgid "Remove database"
-msgid "Remove from central columns"
-msgstr "کوائفیہ ہٹائیں"
-
-#: templates/structure/actions_in_table_structure.phtml:138
-#: templates/structure/check_all_table_column.phtml:55
-#, fuzzy
-#| msgid "CHAR textarea columns"
-msgid "Add to central columns"
-msgstr "CHAR textarea کالم"
-
-#: templates/structure/add_column.phtml:7
-#, php-format
-msgid "Add %s column(s)"
-msgstr ""
-
-#: templates/structure/add_column.phtml:12
-#, fuzzy
-#| msgid "Show dimension of tables"
-msgid "at beginning of table"
-msgstr "ٹیبلز کی جسامت دیکھیں"
-
-#: templates/structure/body_for_table_summary.phtml:6
-#, php-format
-msgid "%s table"
-msgid_plural "%s tables"
-msgstr[0] "%s جدول"
-msgstr[1] "%s جداول"
-
-#: templates/structure/body_for_table_summary.phtml:17
-msgid "Sum"
-msgstr "مجموعہ"
-
-#: templates/structure/check_all_tables.phtml:6
-msgid "Check tables having overhead"
-msgstr "اوور ہیڈ جداول کی پڑتال کریں"
-
-#: templates/structure/check_all_tables.phtml:10
-#, fuzzy
-#| msgid "Show color"
-msgid "Show create"
-msgstr "کلر دکھائیں"
-
-#: templates/structure/check_all_tables.phtml:27
-msgid "Prefix"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:28
-msgid "Add prefix to table"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:29
-#, fuzzy
-#| msgid "Replace table data with file"
-msgid "Replace table prefix"
-msgstr "جدول کوائف کو مسل سے بدلیں"
-
-#: templates/structure/check_all_tables.phtml:30
-#, fuzzy
-#| msgid "Replace table data with file"
-msgid "Copy table with prefix"
-msgstr "جدول کوائف کو مسل سے بدلیں"
-
-#: templates/structure/check_all_tables.phtml:36
-#, fuzzy
-#| msgid "CHAR textarea columns"
-msgid "Add columns to central list"
-msgstr "CHAR textarea کالم"
-
-#: templates/structure/check_all_tables.phtml:37
-msgid "Remove columns from central list"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:38
-#, fuzzy
-#| msgid "CHAR textarea columns"
-msgid "Make consistent with central list"
-msgstr "CHAR textarea کالم"
-
-#: templates/structure/display_structure.phtml:140 view_create.php:181
-#, fuzzy
-#| msgid "Print view"
-msgid "Edit view"
-msgstr "چھپائی منظر"
-
-#: templates/structure/display_table_stats.phtml:9
-msgid "Space usage"
-msgstr ""
-
-#: templates/structure/display_table_stats.phtml:27
-#: templates/structure/table_header.phtml:74
-msgid "Overhead"
-msgstr "مجموعی"
-
-#: templates/structure/display_table_stats.phtml:32
-msgid "Effective"
-msgstr ""
-
-#: templates/structure/favorite_anchor.phtml:12
-#, fuzzy
-#| msgid "Add a New User"
-msgid "Add to Favorites"
-msgstr "نیا صارف اضافہ کریں"
-
-#: templates/structure/move_columns_dialog.phtml:1
-#: templates/structure/optional_action_links.phtml:21
-#, fuzzy
-#| msgid "Add/Delete Field Columns"
-msgid "Move columns"
-msgstr "فیلڈ کالمز شامل یا ختم کریں"
-
-#: templates/structure/move_columns_dialog.phtml:2
-msgid "Move the columns by dragging them up and down."
-msgstr ""
-
-#: templates/structure/optional_action_links.phtml:9
-msgid "Propose table structure"
-msgstr ""
-
-#: templates/structure/optional_action_links.phtml:24
-#, fuzzy
-#| msgid "Databases"
-msgid "Improve table structure"
-msgstr "کوائفیے"
-
-#: templates/structure/optional_action_links.phtml:30
-#, fuzzy
-#| msgid "Track table"
-msgid "Track view"
-msgstr "جدول کھوج"
-
-#: templates/structure/row_stats_table.phtml:3
-#, fuzzy
-#| msgid "Query statistics"
-msgid "Row statistics"
-msgstr "طلب شماریات"
-
-#: templates/structure/row_stats_table.phtml:9
-msgid "static"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:11
-msgid "dynamic"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:22
-msgid "partitioned"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:54
-msgid "Row length"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:66
-msgid "Row size"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:73
-msgid "Next autoindex"
-msgstr ""
-
-#: templates/structure/secondary_tabs.phtml:14
-#, fuzzy
-#| msgid "Relations"
-msgid "Relation view"
-msgstr "تعلقات"
-
-#: templates/structure/show_create.phtml:2
-msgid "Showing create queries"
-msgstr ""
-
-#: templates/structure/sortable_header.phtml:13
-msgid "Sort"
-msgstr "چھانٹیں"
-
-#: templates/structure/table_header.phtml:42
-#, fuzzy
-#| msgid "Error moving the uploaded file, see [doc@faq1-11]FAQ 1.11[/doc]"
-msgid ""
-"May be approximate. Click on the number to get the exact count. See "
-"[doc@faq3-11]FAQ 3.11[/doc]."
-msgstr ""
-"اپ لوڈ مسل کو بڑھاتے ہوئے نقص ہے, دیکھیں [doc@faq1-11]عمومی سوالات 1.11[/doc]"
-
-#: templates/structure/table_structure_row.phtml:46
-#, fuzzy, php-format
-#| msgid "Table %s has been dropped."
-msgid "Column %s has been dropped."
-msgstr "Table %s has been dropped"
-
-#: templates/structure/tracking_icon.phtml:4
-msgid "Tracking is active."
-msgstr "کھوج فعال ہے۔"
-
-#: templates/structure/tracking_icon.phtml:8
-msgid "Tracking is not active."
-msgstr "کھوج غیر فعال ہے۔"
-
-#: templates/table/create_table.phtml:15
-msgid "Number of columns"
-msgstr ""
-
-#: templates/table/options.phtml:8
-msgid "Select columns (at least one):"
-msgstr ""
-
-#: templates/table/options.phtml:37
-msgid "Add search conditions (body of the \"where\" clause):"
-msgstr ""
-
-#: templates/table/options.phtml:45
-msgid "Number of rows per page"
-msgstr ""
-
-#: templates/table/options.phtml:56
-msgid "Display order:"
-msgstr ""
-
-#: templates/table/options_zoom.phtml:6
-msgid "Use this column to label each point"
-msgstr ""
-
-#: templates/table/options_zoom.phtml:35
-#, fuzzy
-#| msgid "Maximum number of rows to display"
-msgid "Maximum rows to plot"
-msgstr "دکھانے کے لیے صفوں کی زیادہ سے زیادہ تعداد"
-
-#: templates/table/replace_preview.phtml:13
-msgid "Find and replace - preview"
-msgstr ""
-
-#: templates/table/replace_preview.phtml:18
-#, fuzzy
-#| msgid "Lines terminated by"
-msgid "Original string"
-msgstr "سطریں کے آخر میں"
-
-#: templates/table/replace_preview.phtml:19
-#, fuzzy
-#| msgid "Replication"
-msgid "Replaced string"
-msgstr "لپیٹنا"
-
-#: templates/table/replace_preview.phtml:40
-#, fuzzy
-#| msgid "Replicated"
-msgid "Replace"
-msgstr "نقل ہوا"
-
-#: templates/table/rows_zoom.phtml:16
-#, fuzzy
-#| msgid "Hide search criteria"
-msgid "Additional search criteria"
-msgstr "تلاش کسوٹی چھپائیں"
-
-#: templates/table/search_and_replace.phtml:3
-#, fuzzy
-#| msgid "Replace NULL by"
-msgid "Replace with:"
-msgstr "NULL کو ان سے بدلیں"
-
-#: templates/table/search_and_replace.phtml:22
-#, fuzzy
-#| msgid "as regular expression"
-msgid "Use regular expression"
-msgstr "بطور باقاعدہ اظہار"
-
-#: templates/table/selection_form.phtml:12
-msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
-msgstr ""
-
-#: templates/table/selection_form.phtml:34
-msgid "Do a \"query by example\" (wildcard: \"%\")"
-msgstr ""
-
-#: templates/table/zoom_result_form.phtml:7
-msgid "Browse/Edit the points"
-msgstr ""
-
-#: templates/table/zoom_result_form.phtml:15
-#, fuzzy
-#| msgid "Control user"
-msgid "How to use"
-msgstr "صارف کو کنٹرول کریں"
-
-#: templates/table/zoom_result_form.phtml:23
-#, fuzzy
-#| msgid "Reset"
-msgid "Reset zoom"
-msgstr "دوبارہ سیٹ کریں"
-
-#: templates/tbl_chart.phtml:17
+#: templates/table/chart/tbl_chart.phtml:17
 #, fuzzy
 #| msgid "Mar"
 msgctxt "Chart type"
 msgid "Bar"
 msgstr "مارچ"
 
-#: templates/tbl_chart.phtml:21
+#: templates/table/chart/tbl_chart.phtml:21
 #, fuzzy
 #| msgid "Command"
 msgctxt "Chart type"
 msgid "Column"
 msgstr "کالم"
 
-#: templates/tbl_chart.phtml:25
+#: templates/table/chart/tbl_chart.phtml:25
 msgctxt "Chart type"
 msgid "Line"
 msgstr ""
 
-#: templates/tbl_chart.phtml:29
+#: templates/table/chart/tbl_chart.phtml:29
 #, fuzzy
 #| msgid "Inline"
 msgctxt "Chart type"
 msgid "Spline"
 msgstr "ان لائن"
 
-#: templates/tbl_chart.phtml:33
+#: templates/table/chart/tbl_chart.phtml:33
 msgctxt "Chart type"
 msgid "Area"
 msgstr ""
 
-#: templates/tbl_chart.phtml:37
+#: templates/table/chart/tbl_chart.phtml:37
 #, fuzzy
 #| msgid "PiB"
 msgctxt "Chart type"
 msgid "Pie"
 msgstr "پیٹا بائٹ"
 
-#: templates/tbl_chart.phtml:41
+#: templates/table/chart/tbl_chart.phtml:41
 #, fuzzy
 #| msgid "Time"
 msgctxt "Chart type"
 msgid "Timeline"
 msgstr "وقت"
 
-#: templates/tbl_chart.phtml:45
+#: templates/table/chart/tbl_chart.phtml:45
 msgctxt "Chart type"
 msgid "Scatter"
 msgstr ""
 
-#: templates/tbl_chart.phtml:50
+#: templates/table/chart/tbl_chart.phtml:50
 msgid "Stacked"
 msgstr ""
 
-#: templates/tbl_chart.phtml:53
+#: templates/table/chart/tbl_chart.phtml:53
 #, fuzzy
 #| msgid "Default"
 msgid "Chart title"
 msgstr "ڈیفالٹ"
 
-#: templates/tbl_chart.phtml:57
+#: templates/table/chart/tbl_chart.phtml:57
 msgid "X-Axis:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:72
+#: templates/table/chart/tbl_chart.phtml:72
 #, fuzzy
 #| msgid "SQL queries"
 msgid "Series:"
 msgstr "SQL طلب"
 
-#: templates/tbl_chart.phtml:102
+#: templates/table/chart/tbl_chart.phtml:102
 msgid "X-Axis label:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:104
+#: templates/table/chart/tbl_chart.phtml:104
 msgid "X Values"
 msgstr ""
 
-#: templates/tbl_chart.phtml:107
+#: templates/table/chart/tbl_chart.phtml:107
 msgid "Y-Axis label:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:115
+#: templates/table/chart/tbl_chart.phtml:115
 msgid "Series names are in a column"
 msgstr ""
 
-#: templates/tbl_chart.phtml:118
+#: templates/table/chart/tbl_chart.phtml:118
 #, fuzzy
 #| msgid "Inside column:"
 msgid "Series column:"
 msgstr "کالم میں:"
 
-#: templates/tbl_chart.phtml:130
+#: templates/table/chart/tbl_chart.phtml:130
 #, fuzzy
 #| msgid "Values for the column \"%s\""
 msgid "Value Column:"
 msgstr "کالم کی قدریں\"%s\""
 
-#: templates/tbl_chart.phtml:150
+#: templates/table/chart/tbl_chart.phtml:150
 #, fuzzy
 #| msgid "Save as file"
 msgid "Save chart as image"
 msgstr "بطور مسل محفوظ کریں"
 
-#: templates/tbl_relation/common_form.phtml:7
+#: templates/table/gis_visualization/gis_visualization.phtml:3
+#, fuzzy
+#| msgid "Display servers selection"
+msgid "Display GIS Visualization"
+msgstr "سرور انتخاب دکھائیں"
+
+#: templates/table/gis_visualization/gis_visualization.phtml:8
+#, fuzzy
+#| msgid "Add/Delete Field Columns"
+msgid "Label column"
+msgstr "فیلڈ کالمز شامل یا ختم کریں"
+
+#: templates/table/gis_visualization/gis_visualization.phtml:11
+msgid "-- None --"
+msgstr ""
+
+#: templates/table/gis_visualization/gis_visualization.phtml:19
+#, fuzzy
+#| msgid "Total"
+msgid "Spatial column"
+msgstr "میزان"
+
+#: templates/table/index_form.phtml:16
+msgid "Index name:"
+msgstr ""
+
+#: templates/table/index_form.phtml:19
+msgid ""
+"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
+msgstr ""
+
+#: templates/table/index_form.phtml:40
+#, fuzzy
+#| msgid "Indexes"
+msgid "Index choice:"
+msgstr "اشاریے"
+
+#: templates/table/index_form.phtml:57
+msgid "Key block size:"
+msgstr ""
+
+#: templates/table/index_form.phtml:74
+msgid "Index type:"
+msgstr ""
+
+#: templates/table/index_form.phtml:86
+#, fuzzy
+#| msgid "User:"
+msgid "Parser:"
+msgstr "صارف:"
+
+#: templates/table/index_form.phtml:102
+#, fuzzy
+#| msgid "Comment"
+msgid "Comment:"
+msgstr "تبصرہ"
+
+#: templates/table/index_form.phtml:149 templates/table/index_form.phtml:190
+msgid "Drag to reorder"
+msgstr ""
+
+#: templates/table/relation/common_form.phtml:7
 #, fuzzy
 #| msgid "Internal relation added"
 msgid "Internal relations"
 msgstr "اندرونی ریلیشن شامل ہو گیا"
 
-#: templates/tbl_relation/common_form.phtml:11
+#: templates/table/relation/common_form.phtml:11
 msgid "Internal relation"
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:14
+#: templates/table/relation/common_form.phtml:14
 msgid ""
 "An internal relation is not necessary when a corresponding FOREIGN KEY "
 "relation exists."
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:37
+#: templates/table/relation/common_form.phtml:37
 #, fuzzy
 #| msgid "Foreign key limit"
 msgid "Foreign key constraints"
 msgstr "فارن کلید حد"
 
-#: templates/tbl_relation/common_form.phtml:40
+#: templates/table/relation/common_form.phtml:40
 #, fuzzy
 #| msgid "Action"
 msgid "Actions"
 msgstr "عمل"
 
-#: templates/tbl_relation/common_form.phtml:41
+#: templates/table/relation/common_form.phtml:41
 #, fuzzy
 #| msgid "Comments"
 msgid "Constraint properties"
 msgstr "آراء-رائے"
 
-#: templates/tbl_relation/common_form.phtml:44
+#: templates/table/relation/common_form.phtml:44
 msgid ""
 "Only columns with index will be displayed. You can define an index below."
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:49
+#: templates/table/relation/common_form.phtml:49
 msgid "Foreign key constraint"
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:81
+#: templates/table/relation/common_form.phtml:81
 #, fuzzy
 #| msgid "Add constraints"
 msgid "+ Add constraint"
 msgstr "پابندیاں لگائیں"
 
-#: templates/tbl_relation/common_form.phtml:91
+#: templates/table/relation/common_form.phtml:91
 #, fuzzy
 #| msgid "Choose column to display"
 msgid "Choose column to display:"
 msgstr "کالم دکھانے کے لیے انتخاب کریں"
 
-#: templates/tbl_relation/foreign_key_row.phtml:13
+#: templates/table/relation/foreign_key_row.phtml:13
 #, fuzzy, php-format
 #| msgid "Foreign key limit"
 msgid "Foreign key constraint %s has been dropped"
 msgstr "فارن کلید حد"
 
-#: templates/tbl_relation/foreign_key_row.phtml:102
+#: templates/table/relation/foreign_key_row.phtml:102
 #, fuzzy
 #| msgid "Comments"
 msgid "Constraint name"
 msgstr "آراء-رائے"
 
-#: templates/tbl_relation/foreign_key_row.phtml:157
+#: templates/table/relation/foreign_key_row.phtml:157
 #, fuzzy
 #| msgid "Add/Delete Field Columns"
 msgid "+ Add column"
 msgstr "فیلڈ کالمز شامل یا ختم کریں"
 
+#: templates/table/search/options.phtml:8
+msgid "Select columns (at least one):"
+msgstr ""
+
+#: templates/table/search/options.phtml:37
+msgid "Add search conditions (body of the \"where\" clause):"
+msgstr ""
+
+#: templates/table/search/options.phtml:45
+msgid "Number of rows per page"
+msgstr ""
+
+#: templates/table/search/options.phtml:56
+msgid "Display order:"
+msgstr ""
+
+#: templates/table/search/options_zoom.phtml:6
+msgid "Use this column to label each point"
+msgstr ""
+
+#: templates/table/search/options_zoom.phtml:35
+#, fuzzy
+#| msgid "Maximum number of rows to display"
+msgid "Maximum rows to plot"
+msgstr "دکھانے کے لیے صفوں کی زیادہ سے زیادہ تعداد"
+
+#: templates/table/search/replace_preview.phtml:13
+msgid "Find and replace - preview"
+msgstr ""
+
+#: templates/table/search/replace_preview.phtml:18
+#, fuzzy
+#| msgid "Lines terminated by"
+msgid "Original string"
+msgstr "سطریں کے آخر میں"
+
+#: templates/table/search/replace_preview.phtml:19
+#, fuzzy
+#| msgid "Replication"
+msgid "Replaced string"
+msgstr "لپیٹنا"
+
+#: templates/table/search/replace_preview.phtml:40
+#, fuzzy
+#| msgid "Replicated"
+msgid "Replace"
+msgstr "نقل ہوا"
+
+#: templates/table/search/rows_zoom.phtml:16
+#, fuzzy
+#| msgid "Hide search criteria"
+msgid "Additional search criteria"
+msgstr "تلاش کسوٹی چھپائیں"
+
+#: templates/table/search/search_and_replace.phtml:3
+#, fuzzy
+#| msgid "Replace NULL by"
+msgid "Replace with:"
+msgstr "NULL کو ان سے بدلیں"
+
+#: templates/table/search/search_and_replace.phtml:22
+#, fuzzy
+#| msgid "as regular expression"
+msgid "Use regular expression"
+msgstr "بطور باقاعدہ اظہار"
+
+#: templates/table/search/selection_form.phtml:12
+msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
+msgstr ""
+
+#: templates/table/search/selection_form.phtml:34
+msgid "Do a \"query by example\" (wildcard: \"%\")"
+msgstr ""
+
+#: templates/table/search/zoom_result_form.phtml:7
+msgid "Browse/Edit the points"
+msgstr ""
+
+#: templates/table/search/zoom_result_form.phtml:15
+#, fuzzy
+#| msgid "Control user"
+msgid "How to use"
+msgstr "صارف کو کنٹرول کریں"
+
+#: templates/table/search/zoom_result_form.phtml:23
+#, fuzzy
+#| msgid "Reset"
+msgid "Reset zoom"
+msgstr "دوبارہ سیٹ کریں"
+
+#: templates/table/secondary_tabs.phtml:14
+#, fuzzy
+#| msgid "Relations"
+msgid "Relation view"
+msgstr "تعلقات"
+
+#: templates/table/structure/actions_in_table_structure.phtml:14
+#, php-format
+msgid "A primary key has been added on %s."
+msgstr ""
+
+#: templates/table/structure/actions_in_table_structure.phtml:34
+#: templates/table/structure/actions_in_table_structure.phtml:54
+#: templates/table/structure/actions_in_table_structure.phtml:79
+#: templates/table/structure/actions_in_table_structure.phtml:101
+#, php-format
+msgid "An index has been added on %s."
+msgstr ""
+
+#: templates/table/structure/actions_in_table_structure.phtml:130
+#: templates/table/structure/check_all_table_column.phtml:59
+#, fuzzy
+#| msgid "Remove database"
+msgid "Remove from central columns"
+msgstr "کوائفیہ ہٹائیں"
+
+#: templates/table/structure/actions_in_table_structure.phtml:138
+#: templates/table/structure/check_all_table_column.phtml:55
+#, fuzzy
+#| msgid "CHAR textarea columns"
+msgid "Add to central columns"
+msgstr "CHAR textarea کالم"
+
+#: templates/table/structure/add_column.phtml:7
+#, php-format
+msgid "Add %s column(s)"
+msgstr ""
+
+#: templates/table/structure/add_column.phtml:12
+#, fuzzy
+#| msgid "Show dimension of tables"
+msgid "at beginning of table"
+msgstr "ٹیبلز کی جسامت دیکھیں"
+
+#: templates/table/structure/display_structure.phtml:140 view_create.php:181
+#, fuzzy
+#| msgid "Print view"
+msgid "Edit view"
+msgstr "چھپائی منظر"
+
+#: templates/table/structure/display_table_stats.phtml:9
+msgid "Space usage"
+msgstr ""
+
+#: templates/table/structure/display_table_stats.phtml:32
+msgid "Effective"
+msgstr ""
+
+#: templates/table/structure/move_columns_dialog.phtml:1
+#: templates/table/structure/optional_action_links.phtml:21
+#, fuzzy
+#| msgid "Add/Delete Field Columns"
+msgid "Move columns"
+msgstr "فیلڈ کالمز شامل یا ختم کریں"
+
+#: templates/table/structure/move_columns_dialog.phtml:2
+msgid "Move the columns by dragging them up and down."
+msgstr ""
+
+#: templates/table/structure/optional_action_links.phtml:9
+msgid "Propose table structure"
+msgstr ""
+
+#: templates/table/structure/optional_action_links.phtml:24
+#, fuzzy
+#| msgid "Databases"
+msgid "Improve table structure"
+msgstr "کوائفیے"
+
+#: templates/table/structure/optional_action_links.phtml:30
+#, fuzzy
+#| msgid "Track table"
+msgid "Track view"
+msgstr "جدول کھوج"
+
+#: templates/table/structure/row_stats_table.phtml:3
+#, fuzzy
+#| msgid "Query statistics"
+msgid "Row statistics"
+msgstr "طلب شماریات"
+
+#: templates/table/structure/row_stats_table.phtml:9
+msgid "static"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:11
+msgid "dynamic"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:22
+msgid "partitioned"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:54
+msgid "Row length"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:66
+msgid "Row size"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:73
+msgid "Next autoindex"
+msgstr ""
+
+#: templates/table/structure/table_structure_row.phtml:46
+#, fuzzy, php-format
+#| msgid "Table %s has been dropped."
+msgid "Column %s has been dropped."
+msgstr "Table %s has been dropped"
+
 #: themes.php:17 themes.php:22
 msgid "Theme"
 msgstr ""
diff --git a/po/uz.po b/po/uz.po
index dead6e64a7..89a3d7b135 100644
--- a/po/uz.po
+++ b/po/uz.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 4.5.0-dev\n"
 "Report-Msgid-Bugs-To: developers@phpmyadmin.net\n"
-"POT-Creation-Date: 2015-08-08 13:53-0400\n"
+"POT-Creation-Date: 2015-08-12 08:10-0400\n"
 "PO-Revision-Date: 2014-11-14 19:09+0200\n"
 "Last-Translator: Michal Čihař <michal@cihar.com>\n"
 "Language-Team: Uzbek <https://hosted.weblate.org/projects/phpmyadmin/master/"
@@ -56,7 +56,7 @@ msgid "Table comments:"
 msgstr "Изоҳлар жадвали:"
 
 #: db_datadict.php:104 libraries/Index.class.php:699
-#: libraries/insert_edit.lib.php:1567
+#: libraries/insert_edit.lib.php:1565
 #: libraries/navigation/Nodes/Node_Column.class.php:30
 #: libraries/plugins/export/ExportHtmlword.class.php:280
 #: libraries/plugins/export/ExportHtmlword.class.php:375
@@ -70,13 +70,14 @@ msgstr "Изоҳлар жадвали:"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1023
 #: libraries/tracking.lib.php:879 libraries/tracking.lib.php:975
 #: templates/columns_definitions/column_name.phtml:18
-#: templates/index_form.phtml:124 templates/table/table_header.phtml:6
-#: templates/table/zoom_result_form.phtml:33
-#: templates/tbl_relation/common_form.phtml:10
-#: templates/tbl_relation/common_form.phtml:43
-#: templates/tbl_relation/foreign_key_row.phtml:194
-#: templates/tbl_relation/foreign_key_row.phtml:206
-#: templates/tbl_relation/internal_relational_row.phtml:71
+#: templates/table/index_form.phtml:124
+#: templates/table/relation/common_form.phtml:10
+#: templates/table/relation/common_form.phtml:43
+#: templates/table/relation/foreign_key_row.phtml:194
+#: templates/table/relation/foreign_key_row.phtml:206
+#: templates/table/relation/internal_relational_row.phtml:71
+#: templates/table/search/table_header.phtml:6
+#: templates/table/search/zoom_result_form.phtml:33
 msgid "Column"
 msgstr "Устун"
 
@@ -94,21 +95,21 @@ msgstr "Устун"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1001
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1024
 #: libraries/rte/rte_list.lib.php:75 libraries/rte/rte_list.lib.php:103
-#: libraries/rte/rte_routines.lib.php:802
-#: libraries/rte/rte_routines.lib.php:831
-#: libraries/rte/rte_routines.lib.php:1493
+#: libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_routines.lib.php:922
+#: libraries/rte/rte_routines.lib.php:1584
 #: libraries/server_privileges.lib.php:2369 libraries/tracking.lib.php:880
 #: libraries/tracking.lib.php:972
 #: templates/columns_definitions/table_fields_definitions.phtml:11
-#: templates/structure/table_header.phtml:48
-#: templates/structure/table_structure_header.phtml:6
-#: templates/table/table_header.phtml:7
+#: templates/database/structure/table_header.phtml:48
+#: templates/table/search/table_header.phtml:7
+#: templates/table/structure/table_structure_header.phtml:6
 msgid "Type"
 msgstr "Тур"
 
 #: db_datadict.php:106 libraries/Index.class.php:702
 #: libraries/central_columns.lib.php:708
-#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1576
+#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1574
 #: libraries/plugins/export/ExportHtmlword.class.php:286
 #: libraries/plugins/export/ExportHtmlword.class.php:381
 #: libraries/plugins/export/ExportLatex.class.php:509
@@ -121,8 +122,8 @@ msgstr "Тур"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1026
 #: libraries/tracking.lib.php:882 libraries/tracking.lib.php:978
 #: templates/columns_definitions/table_fields_definitions.phtml:39
-#: templates/structure/table_structure_header.phtml:9
-#: templates/table/zoom_result_form.phtml:34
+#: templates/table/search/zoom_result_form.phtml:34
+#: templates/table/structure/table_structure_header.phtml:9
 msgid "Null"
 msgstr "Null"
 
@@ -140,8 +141,8 @@ msgstr "Null"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1027
 #: libraries/replication_gui.lib.php:153 libraries/tracking.lib.php:883
 #: templates/columns_definitions/table_fields_definitions.phtml:25
-#: templates/structure/body_for_table_summary.phtml:55
-#: templates/structure/table_structure_header.phtml:10
+#: templates/database/structure/body_for_table_summary.phtml:55
+#: templates/table/structure/table_structure_header.phtml:10
 msgid "Default"
 msgstr "Андоза"
 
@@ -169,19 +170,19 @@ msgid "Comments"
 msgstr "Изоҳлар"
 
 #: db_datadict.php:146
-#: libraries/controllers/StructureController.class.php:1960
-#: libraries/controllers/StructureController.class.php:1965
+#: libraries/controllers/TableStructureController.class.php:951
+#: libraries/controllers/TableStructureController.class.php:956
 #: libraries/tracking.lib.php:922
 #: templates/columns_definitions/column_indexes.phtml:6
-#: templates/structure/check_all_table_column.phtml:22
-#: templates/structure/display_structure.phtml:74
+#: templates/table/structure/check_all_table_column.phtml:22
+#: templates/table/structure/display_structure.phtml:74
 msgid "Primary"
 msgstr "Бирламчи"
 
 #: db_datadict.php:156 js/messages.php:317 libraries/Index.class.php:567
 #: libraries/Index.class.php:606 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261 libraries/mult_submits.lib.php:403
+#: libraries/config/FormDisplay.tpl.php:272 libraries/mult_submits.lib.php:403
 #: libraries/mult_submits.lib.php:417
 #: libraries/plugins/export/ExportHtmlword.class.php:630
 #: libraries/plugins/export/ExportLatex.class.php:589
@@ -197,20 +198,20 @@ msgstr "Бирламчи"
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1010 libraries/tracking.lib.php:1015
 #: prefs_manage.php:140 templates/prefs_autoload.phtml:15
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "No"
 msgstr "Йўқ"
 
 #: db_datadict.php:156 js/messages.php:443 libraries/Index.class.php:568
 #: libraries/Index.class.php:605 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261
-#: libraries/controllers/StructureController.class.php:1344
-#: libraries/controllers/StructureController.class.php:2223
-#: libraries/controllers/StructureController.class.php:2232
-#: libraries/controllers/StructureController.class.php:2237
-#: libraries/controllers/StructureController.class.php:2242
-#: libraries/controllers/StructureController.class.php:2247
+#: libraries/config/FormDisplay.tpl.php:272
+#: libraries/controllers/TableStructureController.class.php:539
+#: libraries/controllers/TableStructureController.class.php:1201
+#: libraries/controllers/TableStructureController.class.php:1210
+#: libraries/controllers/TableStructureController.class.php:1215
+#: libraries/controllers/TableStructureController.class.php:1220
+#: libraries/controllers/TableStructureController.class.php:1225
 #: libraries/mult_submits.inc.php:82 libraries/mult_submits.inc.php:178
 #: libraries/mult_submits.lib.php:339 libraries/mult_submits.lib.php:372
 #: libraries/mult_submits.lib.php:401 libraries/mult_submits.lib.php:415
@@ -219,8 +220,8 @@ msgstr "Йўқ"
 #: libraries/plugins/export/ExportOdt.class.php:756
 #: libraries/plugins/export/ExportTexytext.class.php:567
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1077
-#: libraries/server_databases.lib.php:464
-#: libraries/server_databases.lib.php:474
+#: libraries/server_databases.lib.php:475
+#: libraries/server_databases.lib.php:485
 #: libraries/server_privileges.lib.php:2546
 #: libraries/server_privileges.lib.php:2727
 #: libraries/server_privileges.lib.php:2748
@@ -230,7 +231,7 @@ msgstr "Йўқ"
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1008 libraries/tracking.lib.php:1013
 #: prefs_manage.php:138 templates/prefs_autoload.phtml:14
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "Yes"
 msgstr "Ҳа"
 
@@ -240,7 +241,7 @@ msgstr "Маълумотлар базаси дампини (схемасини)
 
 #: db_export.php:37 db_tracking.php:90 export.php:382
 #: libraries/DBQbe.class.php:326
-#: libraries/controllers/StructureController.class.php:231
+#: libraries/controllers/DatabaseStructureController.class.php:170
 #: libraries/navigation/NavigationTree.class.php:897
 msgid "No tables found in database."
 msgstr "Маълумотлар базасида биронта ҳам жадвал мавжуд эмас."
@@ -251,14 +252,14 @@ msgstr "Маълумотлар базасида биронта ҳам жадва
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:26
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:120
-#: templates/structure/show_create.phtml:18
+#: templates/database/structure/show_create.phtml:18
 msgid "Tables"
 msgstr "Жадваллар"
 
 #: db_export.php:52 libraries/Menu.class.php:317 libraries/Menu.class.php:425
-#: libraries/Util.class.php:3333 libraries/Util.class.php:3343
-#: libraries/Util.class.php:3349 libraries/Util.class.php:3629
-#: libraries/Util.class.php:4327 libraries/Util.class.php:4344
+#: libraries/Util.class.php:3339 libraries/Util.class.php:3349
+#: libraries/Util.class.php:3355 libraries/Util.class.php:3635
+#: libraries/Util.class.php:4333 libraries/Util.class.php:4350
 #: libraries/central_columns.lib.php:728 libraries/config.values.php:39
 #: libraries/config.values.php:47 libraries/config.values.php:109
 #: libraries/config.values.php:115 libraries/config/setup.forms.php:323
@@ -272,7 +273,7 @@ msgstr "Жадваллар"
 #: libraries/navigation/Nodes/Node_Table.class.php:283
 #: libraries/server_privileges.lib.php:1141 libraries/tracking.lib.php:874
 #: templates/columns_definitions/table_fields_definitions.phtml:3
-#: templates/designer/table_list.phtml:28
+#: templates/database/designer/table_list.phtml:28
 msgid "Structure"
 msgstr "Тузилиши"
 
@@ -284,7 +285,7 @@ msgstr "Тузилиши"
 #: libraries/config/user_preferences.forms.php:292
 #: libraries/config/user_preferences.forms.php:297
 #: libraries/server_privileges.lib.php:1140
-#: templates/structure/display_table_stats.phtml:12
+#: templates/table/structure/display_table_stats.phtml:12
 msgid "Data"
 msgstr "Маълумотлар"
 
@@ -370,10 +371,10 @@ msgstr "Кузатилган жадваллар"
 #: libraries/server_privileges.lib.php:2908
 #: libraries/server_privileges.lib.php:3145
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4346
-#: templates/structure/table_header.phtml:21
-#: templates/tbl_relation/foreign_key_row.phtml:176
-#: templates/tbl_relation/internal_relational_row.phtml:63
+#: libraries/server_privileges.lib.php:4372
+#: templates/database/structure/table_header.phtml:21
+#: templates/table/relation/foreign_key_row.phtml:176
+#: templates/table/relation/internal_relational_row.phtml:63
 msgid "Table"
 msgstr "Жадвал"
 
@@ -390,7 +391,7 @@ msgid "Updated"
 msgstr "Янгиланди"
 
 #: db_tracking.php:130 js/messages.php:243 libraries/Menu.class.php:552
-#: libraries/Util.class.php:4314 libraries/config.values.php:104
+#: libraries/Util.class.php:4320 libraries/config.values.php:104
 #: libraries/rte/rte_events.lib.php:393 libraries/rte/rte_list.lib.php:101
 #: libraries/server_status_processes.lib.php:92 libraries/tracking.lib.php:279
 msgid "Status"
@@ -399,14 +400,15 @@ msgstr "Ҳолат"
 #: db_tracking.php:131 db_tracking.php:290 libraries/Index.class.php:693
 #: libraries/central_columns.lib.php:687 libraries/rte/rte_list.lib.php:74
 #: libraries/rte/rte_list.lib.php:89 libraries/rte/rte_list.lib.php:102
-#: libraries/server_databases.lib.php:398
+#: libraries/server_databases.lib.php:409
 #: libraries/server_privileges.lib.php:2372
 #: libraries/server_privileges.lib.php:3166
 #: libraries/server_privileges.lib.php:3342
 #: libraries/server_user_groups.lib.php:82
 #: libraries/server_variables.lib.php:189 libraries/tracking.lib.php:280
-#: libraries/tracking.lib.php:793 templates/structure/table_header.phtml:30
-#: templates/structure/table_structure_header.phtml:23
+#: libraries/tracking.lib.php:793
+#: templates/database/structure/table_header.phtml:30
+#: templates/table/structure/table_structure_header.phtml:23
 msgid "Action"
 msgstr "Амал"
 
@@ -450,7 +452,7 @@ msgid "Untracked tables"
 msgstr "Кузатилмаган жадваллар"
 
 #: db_tracking.php:305 db_tracking.php:336
-#: templates/structure/optional_action_links.phtml:17
+#: templates/table/structure/optional_action_links.phtml:17
 msgid "Track table"
 msgstr "Жадвални кузатиш"
 
@@ -504,7 +506,7 @@ msgid "Value for the column \"%s\""
 msgstr ""
 
 #: gis_data_editor.php:146
-#: templates/gis_visualization/gis_visualization.phtml:37
+#: templates/table/gis_visualization/gis_visualization.phtml:37
 msgid "Use OpenStreetMaps as Base Layer"
 msgstr ""
 
@@ -596,35 +598,35 @@ msgstr "Янги фойдаланувчи қўшиш"
 #: libraries/display_change_password.lib.php:162
 #: libraries/display_export.lib.php:402 libraries/display_export.lib.php:408
 #: libraries/display_import.lib.php:392 libraries/index.lib.php:44
-#: libraries/insert_edit.lib.php:1546 libraries/insert_edit.lib.php:1583
+#: libraries/insert_edit.lib.php:1544 libraries/insert_edit.lib.php:1581
 #: libraries/normalization.lib.php:165 libraries/normalization.lib.php:821
 #: libraries/operations.lib.php:38 libraries/operations.lib.php:108
 #: libraries/operations.lib.php:263 libraries/operations.lib.php:306
 #: libraries/operations.lib.php:801 libraries/operations.lib.php:874
 #: libraries/operations.lib.php:923 libraries/operations.lib.php:1337
 #: libraries/operations.lib.php:1658
-#: libraries/plugins/auth/AuthenticationCookie.class.php:244
+#: libraries/plugins/auth/AuthenticationCookie.class.php:232
 #: libraries/replication_gui.lib.php:122 libraries/replication_gui.lib.php:161
 #: libraries/replication_gui.lib.php:324 libraries/replication_gui.lib.php:461
 #: libraries/replication_gui.lib.php:906 libraries/rte/rte_events.lib.php:509
-#: libraries/rte/rte_routines.lib.php:969
-#: libraries/rte/rte_routines.lib.php:1581
+#: libraries/rte/rte_routines.lib.php:1060
+#: libraries/rte/rte_routines.lib.php:1672
 #: libraries/rte/rte_triggers.lib.php:396 libraries/server_bin_log.lib.php:61
 #: libraries/server_privileges.lib.php:705
 #: libraries/server_privileges.lib.php:2106
 #: libraries/server_privileges.lib.php:2872
 #: libraries/server_privileges.lib.php:3553
-#: libraries/server_privileges.lib.php:4627
+#: libraries/server_privileges.lib.php:4653
 #: libraries/server_user_groups.lib.php:285
 #: libraries/sql_query_form.lib.php:369 libraries/sql_query_form.lib.php:429
 #: libraries/tracking.lib.php:533 libraries/tracking.lib.php:653
 #: prefs_manage.php:277 prefs_manage.php:355
 #: templates/columns_definitions/column_definitions_form.phtml:59
-#: templates/header_location.phtml:17 templates/index_form.phtml:238
+#: templates/database/create_table.phtml:21 templates/header_location.phtml:28
 #: templates/startAndNumberOfRowsPanel.phtml:14
-#: templates/structure/add_column.phtml:25
-#: templates/table/create_table.phtml:21
-#: templates/table/selection_form.phtml:75 view_create.php:275
+#: templates/table/index_form.phtml:238
+#: templates/table/search/selection_form.phtml:75
+#: templates/table/structure/add_column.phtml:25 view_create.php:275
 #: view_operations.php:106
 msgid "Go"
 msgstr "OK"
@@ -722,7 +724,7 @@ msgstr ""
 "Импорт модуллари мавжуд эмас! Ўрнатилган phpMyAdmin нусхасининг libraries/"
 "export каталогини текширинг."
 
-#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1466
+#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1460
 #, fuzzy, php-format
 #| msgid "Bookmark %s created"
 msgid "Bookmark %s has been created."
@@ -766,13 +768,13 @@ msgstr ""
 msgid "Back"
 msgstr "Орқага"
 
-#: index.php:148 libraries/Footer.class.php:70
+#: index.php:149 libraries/Footer.class.php:70
 #, fuzzy
 #| msgid "phpMyAdmin homepage"
 msgid "phpMyAdmin Demo Server"
 msgstr "phpMyAdmin сайти"
 
-#: index.php:152
+#: index.php:153
 #, php-format
 msgid ""
 "You are using the demo server. You can do anything here, but please do not "
@@ -780,52 +782,52 @@ msgid ""
 "at %s."
 msgstr ""
 
-#: index.php:162
+#: index.php:163
 #, fuzzy
 #| msgid "General relation features"
 msgid "General Settings"
 msgstr "Алоқаларнинг асосий имкониятлари"
 
-#: index.php:190 libraries/display_change_password.lib.php:50
+#: index.php:191 libraries/display_change_password.lib.php:50
 #: libraries/display_change_password.lib.php:53 user_password.php:247
 msgid "Change password"
 msgstr "Паролни ўзгартириш"
 
-#: index.php:206
+#: index.php:207
 #, fuzzy
 #| msgid "MySQL connection collation"
 msgid "Server connection collation"
 msgstr "MySQL билан уланишни чоғиштириш"
 
-#: index.php:228
+#: index.php:229
 #, fuzzy
 #| msgid "Other core settings"
 msgid "Appearance Settings"
 msgstr "Бошқа созланишлар"
 
-#: index.php:258 prefs_manage.php:285
+#: index.php:259 prefs_manage.php:285
 #, fuzzy
 #| msgid "settings"
 msgid "More settings"
 msgstr "танловлар"
 
-#: index.php:279
+#: index.php:280
 #, fuzzy
 #| msgid "Database for user"
 msgid "Database server"
 msgstr "Фойдаланувчи учун маълумотлар базаси"
 
-#: index.php:282 libraries/plugins/auth/AuthenticationCookie.class.php:181
+#: index.php:283 libraries/plugins/auth/AuthenticationCookie.class.php:169
 msgid "Server:"
 msgstr "Сервер:"
 
-#: index.php:286
+#: index.php:287
 #, fuzzy
 #| msgid "Server port"
 msgid "Server type:"
 msgstr "Сервер порти"
 
-#: index.php:290 libraries/plugins/export/ExportLatex.class.php:212
+#: index.php:291 libraries/plugins/export/ExportLatex.class.php:212
 #: libraries/plugins/export/ExportSql.class.php:687
 #: libraries/plugins/export/ExportXml.class.php:189
 #, fuzzy
@@ -833,89 +835,89 @@ msgstr "Сервер порти"
 msgid "Server version:"
 msgstr "Сервер версияси"
 
-#: index.php:296
+#: index.php:297
 #, fuzzy
 #| msgid "Protocol version"
 msgid "Protocol version:"
 msgstr "Протокол версияси"
 
-#: index.php:300
+#: index.php:301
 #, fuzzy
 #| msgid "User"
 msgid "User:"
 msgstr "Фойдаланувчи"
 
-#: index.php:305
+#: index.php:306
 #, fuzzy
 #| msgid "Server socket"
 msgid "Server charset:"
 msgstr "Сервер сокети"
 
-#: index.php:320
+#: index.php:321
 msgid "Web server"
 msgstr "Веб сервер"
 
-#: index.php:331
+#: index.php:332
 #, fuzzy
 #| msgid "Use light version"
 msgid "Database client version:"
 msgstr "Енгил версиядан фойдаланиш"
 
-#: index.php:335
+#: index.php:336
 #, fuzzy
 #| msgid "PHP extension"
 msgid "PHP extension:"
 msgstr "PHP кенгайтмаси"
 
-#: index.php:349
+#: index.php:350
 #, fuzzy
 #| msgid "PHP Version"
 msgid "PHP version:"
 msgstr "PHP версиясм"
 
-#: index.php:360
+#: index.php:361
 msgid "Show PHP information"
 msgstr "PHP ҳақида маълумотни кўрсатиш"
 
-#: index.php:383
+#: index.php:384
 #, fuzzy
 #| msgid "Version information"
 msgid "Version information:"
 msgstr "Версия ҳақида маълумот"
 
-#: index.php:392 libraries/Util.class.php:432 libraries/Util.class.php:495
-#: libraries/config/FormDisplay.tpl.php:151
+#: index.php:393 libraries/Util.class.php:432 libraries/Util.class.php:495
+#: libraries/config/FormDisplay.tpl.php:162
 #: libraries/display_export.lib.php:577 libraries/engines/pbxt.lib.php:162
 #: libraries/navigation/NavigationHeader.class.php:196
 #: libraries/server_variables.lib.php:160
 msgid "Documentation"
 msgstr "Документация"
 
-#: index.php:399
+#: index.php:400
 msgid "Wiki"
 msgstr "Вики"
 
-#: index.php:408
+#: index.php:409
 msgid "Official Homepage"
 msgstr "phpMyAdmin расмий веб-саҳифаси"
 
-#: index.php:415
+#: index.php:416
 #, fuzzy
 #| msgid "Attributes"
 msgid "Contribute"
 msgstr "Атрибутлар"
 
-#: index.php:422
+#: index.php:423
 msgid "Get support"
 msgstr ""
 
-#: index.php:429
+#: index.php:430
 #, fuzzy
 #| msgid "No change"
 msgid "List of changes"
 msgstr "Ўзгариш йўқ"
 
-#: index.php:451
+#: index.php:452
 #, fuzzy
 #| msgid ""
 #| "Your configuration file contains settings (root with no password) that "
@@ -933,7 +935,7 @@ msgstr ""
 "созланган MySQL сервери хавфсизлик жиҳатидан анча заиф ҳисобланади, шунинг "
 "учун \"root\" суперфойдаланувчисига парол ўрнатиш қатъиян тавсия этилади."
 
-#: index.php:468
+#: index.php:469
 msgid ""
 "You have enabled mbstring.func_overload in your PHP configuration. This "
 "option is incompatible with phpMyAdmin and might cause some data to be "
@@ -943,7 +945,7 @@ msgstr ""
 "func_overload параметри ёқилган. Маълумот йўқолиши олдини олиш учун, ушбу "
 "параметр ўчирилиши керак!"
 
-#: index.php:483
+#: index.php:484
 msgid ""
 "The mbstring PHP extension was not found and you seem to be using a "
 "multibyte charset. Without the mbstring extension phpMyAdmin is unable to "
@@ -954,7 +956,7 @@ msgstr ""
 "маълумот йўқолишига олиб келиши мумкин. PHP \"mbstring\" кенгайтмасини "
 "ўрнатиш қатъий тавсия этилади."
 
-#: index.php:500
+#: index.php:501
 #, fuzzy
 #| msgid ""
 #| "Your PHP parameter [a@http://php.net/manual/en/session.configuration."
@@ -973,7 +975,7 @@ msgstr ""
 "давомийлигидан кичикроқ, шунинг учун логин сессиянгиз phpMyAdmin дастурида "
 "конфигурация қилганингиздан тезроқ тугайди."
 
-#: index.php:519
+#: index.php:520
 #, fuzzy
 #| msgid ""
 #| "r PHP parameter [a@http://php.net/manual/en/session.configuration.#ini."
@@ -990,13 +992,13 @@ msgstr ""
 "давомийлигидан кичикроқ, шунинг учун логин сессиянгиз phpMyAdmin дастурида "
 "конфигурация қилганингиздан тезроқ тугайди."
 
-#: index.php:535
+#: index.php:536
 msgid "The configuration file now needs a secret passphrase (blowfish_secret)."
 msgstr ""
 "cookie-аутентификация ишлатилганда, конфигурацион файлдаги "
 "$cfg[\"blowfish_secret\"] директиваси қийматини ўрнатиб парол белгилаш керак."
 
-#: index.php:548
+#: index.php:549
 #, fuzzy
 #| msgid ""
 #| "Directory [code]config[/code], which is used by the setup script, still "
@@ -1012,7 +1014,7 @@ msgstr ""
 "каталоги ҳалиям мавжуд. phpMyAdmin муваффақиятли ўрнатилгандан кейин, уни "
 "ўчириш тавсия этилади."
 
-#: index.php:564
+#: index.php:565
 #, fuzzy, php-format
 #| msgid ""
 #| " additional features for working with linked tables have been ctivated. "
@@ -1024,12 +1026,12 @@ msgstr ""
 "Алоқадор жадваллар билан ишлаш учун қўшимча имкониятлар мавжуд эмас. "
 "Сабабларини аниқлаш учун %sбу ерга%s босинг."
 
-#: index.php:571
+#: index.php:572
 msgid ""
 "Or alternately go to 'Operations' tab of any database to set it up there."
 msgstr ""
 
-#: index.php:620
+#: index.php:621
 #, php-format
 msgid ""
 "Your PHP MySQL library version %s differs from your MySQL server version %s. "
@@ -1038,7 +1040,7 @@ msgstr ""
 "MySQL-клиент версияси (\"%s\") ўрнатилган MySQL-сервер  версияси(\"%s\")дан "
 "фарқ қилмоқда. Бу ҳолат нохуш оқибатларга олиб келиши мумкин."
 
-#: index.php:648
+#: index.php:649
 #, php-format
 msgid ""
 "Server running with Suhosin. Please refer to %sdocumentation%s for possible "
@@ -1212,8 +1214,8 @@ msgstr ""
 msgid "Save & Close"
 msgstr "Файл каби сақлаш"
 
-#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:404
-#: libraries/insert_edit.lib.php:1550 prefs_manage.php:361
+#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:415
+#: libraries/insert_edit.lib.php:1548 prefs_manage.php:361
 #: prefs_manage.php:372
 msgid "Reset"
 msgstr "Тозалаш"
@@ -1258,7 +1260,7 @@ msgstr "Индекс(лар)ни сақлаш"
 msgid "Edit Index"
 msgstr "Таҳрирлаш усули"
 
-#: js/messages.php:99 templates/index_form.phtml:232
+#: js/messages.php:99 templates/table/index_form.phtml:232
 #, fuzzy, php-format
 #| msgid "Add column(s)"
 msgid "Add %s column(s) to index"
@@ -1288,15 +1290,16 @@ msgstr "Майдон қийматлари қуйидаги белги ичига
 msgid "Please select column(s) for the index."
 msgstr "Устун(лар) қўшиш"
 
-#: js/messages.php:106 templates/structure/add_column.phtml:1
+#: js/messages.php:106 templates/table/structure/add_column.phtml:1
 #, fuzzy
 #| msgid "You have to add at least one field."
 msgid "You have to add at least one column."
 msgstr "Ҳеч бўлмаганда битта майдон киритиш шарт."
 
-#: js/messages.php:109 libraries/insert_edit.lib.php:1548
+#: js/messages.php:109 libraries/insert_edit.lib.php:1546
 #: templates/columns_definitions/column_definitions_form.phtml:162
-#: templates/index_form.phtml:237 templates/tbl_relation/common_form.phtml:106
+#: templates/table/index_form.phtml:237
+#: templates/table/relation/common_form.phtml:106
 msgid "Preview SQL"
 msgstr ""
 
@@ -1319,7 +1322,7 @@ msgid "SQL query:"
 msgstr "SQL сўрови"
 
 #. l10n: Default label for the y-Axis of Charts
-#: js/messages.php:118 templates/tbl_chart.phtml:109
+#: js/messages.php:118 templates/table/chart/tbl_chart.phtml:109
 #, fuzzy
 #| msgid "Value"
 msgid "Y Values"
@@ -1500,7 +1503,7 @@ msgstr ""
 msgid "Bytes received"
 msgstr "Қабул қилинди"
 
-#: js/messages.php:169 libraries/server_status.lib.php:226
+#: js/messages.php:169 libraries/server_status.lib.php:235
 msgid "Connections"
 msgstr "Уланишлар"
 
@@ -1560,12 +1563,12 @@ msgstr "Жадваллар сони: \"%s\""
 msgid "Questions"
 msgstr "Версиялар"
 
-#: js/messages.php:184 libraries/server_status.lib.php:134
+#: js/messages.php:184 libraries/server_status.lib.php:143
 msgid "Traffic"
 msgstr "Трафик"
 
 #: js/messages.php:185 libraries/Menu.class.php:586
-#: libraries/Util.class.php:4318 libraries/server_status_monitor.lib.php:257
+#: libraries/Util.class.php:4324 libraries/server_status_monitor.lib.php:257
 #, fuzzy
 #| msgid "settings"
 msgid "Settings"
@@ -1589,8 +1592,9 @@ msgstr ""
 #: libraries/server_status_monitor.lib.php:236
 #: libraries/server_status_processes.lib.php:308
 #: templates/columns_definitions/transformation.phtml:4
-#: templates/designer/options_panel.phtml:178
-#: templates/table/options_zoom.phtml:12 templates/table/rows_zoom.phtml:26
+#: templates/database/designer/options_panel.phtml:178
+#: templates/table/search/options_zoom.phtml:12
+#: templates/table/search/rows_zoom.phtml:26
 msgid "None"
 msgstr "Йўқ"
 
@@ -1900,8 +1904,8 @@ msgstr ""
 
 #: js/messages.php:270 libraries/Menu.class.php:352
 #: libraries/Menu.class.php:455 libraries/Menu.class.php:582
-#: libraries/Util.class.php:4317 libraries/Util.class.php:4332
-#: libraries/Util.class.php:4349 libraries/config/messages.inc.php:258
+#: libraries/Util.class.php:4323 libraries/Util.class.php:4338
+#: libraries/Util.class.php:4355 libraries/config/messages.inc.php:258
 #: libraries/display_import.lib.php:105
 #: libraries/server_status_monitor.lib.php:318 prefs_manage.php:238
 #: setup/frames/menu.inc.php:26
@@ -1973,13 +1977,13 @@ msgid "Formatting SQL..."
 msgstr ""
 
 #: js/messages.php:293 libraries/server_variables.lib.php:157
-#: templates/designer/aggregate_query_panel.phtml:63
-#: templates/designer/delete_relation_panel.phtml:28
-#: templates/designer/having_query_panel.phtml:117
-#: templates/designer/new_relation_panel.phtml:88
-#: templates/designer/options_panel.phtml:253
-#: templates/designer/rename_to_panel.phtml:45
-#: templates/designer/where_query_panel.phtml:83
+#: templates/database/designer/aggregate_query_panel.phtml:63
+#: templates/database/designer/delete_relation_panel.phtml:28
+#: templates/database/designer/having_query_panel.phtml:117
+#: templates/database/designer/new_relation_panel.phtml:88
+#: templates/database/designer/options_panel.phtml:253
+#: templates/database/designer/rename_to_panel.phtml:45
+#: templates/database/designer/where_query_panel.phtml:83
 msgid "Cancel"
 msgstr "Бекор қилиш"
 
@@ -1989,7 +1993,7 @@ msgstr "Бекор қилиш"
 msgid "Page-related settings"
 msgstr "Бошқа созланишлар"
 
-#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:402
+#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:413
 msgid "Apply"
 msgstr ""
 
@@ -2028,8 +2032,8 @@ msgstr ""
 msgid "Error text: %s"
 msgstr ""
 
-#: js/messages.php:307 libraries/db_common.inc.php:68
-#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:450
+#: js/messages.php:307 libraries/db_common.inc.php:69
+#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:461
 msgid "No databases selected."
 msgstr "Биронта ҳам маълумотлар базаси танланмаган."
 
@@ -2041,12 +2045,13 @@ msgstr ""
 msgid "Adding Primary Key"
 msgstr ""
 
-#: js/messages.php:310 templates/designer/aggregate_query_panel.phtml:59
-#: templates/designer/having_query_panel.phtml:113
-#: templates/designer/new_relation_panel.phtml:87
-#: templates/designer/options_panel.phtml:252
-#: templates/designer/rename_to_panel.phtml:41
-#: templates/designer/where_query_panel.phtml:82
+#: js/messages.php:310
+#: templates/database/designer/aggregate_query_panel.phtml:59
+#: templates/database/designer/having_query_panel.phtml:113
+#: templates/database/designer/new_relation_panel.phtml:87
+#: templates/database/designer/options_panel.phtml:252
+#: templates/database/designer/rename_to_panel.phtml:41
+#: templates/database/designer/where_query_panel.phtml:82
 msgid "OK"
 msgstr "OK"
 
@@ -2072,7 +2077,7 @@ msgstr "Маълумотлар базасидан қуйидагига нусх
 msgid "Changing Charset"
 msgstr "Кодировка"
 
-#: js/messages.php:320 libraries/Util.class.php:3217
+#: js/messages.php:320 libraries/Util.class.php:3223
 #, fuzzy
 #| msgid "Disable foreign key checks"
 msgid "Enable foreign key checks"
@@ -2120,20 +2125,21 @@ msgstr ""
 #: js/messages.php:334 libraries/DisplayResults.class.php:4834
 #: libraries/DisplayResults.class.php:5092 libraries/Menu.class.php:344
 #: libraries/Menu.class.php:446 libraries/Menu.class.php:578
-#: libraries/Util.class.php:3636 libraries/Util.class.php:3637
-#: libraries/Util.class.php:4316 libraries/Util.class.php:4331
-#: libraries/Util.class.php:4348 libraries/config/messages.inc.php:252
+#: libraries/Util.class.php:3642 libraries/Util.class.php:3643
+#: libraries/Util.class.php:4322 libraries/Util.class.php:4337
+#: libraries/Util.class.php:4354 libraries/config/messages.inc.php:252
 #: libraries/display_export.lib.php:173 libraries/rte/rte_list.lib.php:146
 #: libraries/server_privileges.lib.php:2211
 #: libraries/server_privileges.lib.php:2290
 #: libraries/server_privileges.lib.php:2632
 #: libraries/server_privileges.lib.php:3356
 #: libraries/server_status_monitor.lib.php:322 prefs_manage.php:303
-#: setup/frames/menu.inc.php:27 templates/structure/check_all_tables.phtml:11
+#: setup/frames/menu.inc.php:27
+#: templates/database/structure/check_all_tables.phtml:11
 msgid "Export"
 msgstr "Экспорт"
 
-#: js/messages.php:337 libraries/rte/rte_routines.lib.php:652
+#: js/messages.php:337 libraries/rte/rte_routines.lib.php:743
 msgid "ENUM/SET editor"
 msgstr ""
 
@@ -2177,7 +2183,7 @@ msgstr "SQL сўровлари қутиси"
 #: libraries/Console.class.php:214 libraries/DisplayResults.class.php:3474
 #: libraries/DisplayResults.class.php:4818 libraries/Index.class.php:723
 #: libraries/Util.class.php:706 libraries/Util.class.php:1202
-#: libraries/Util.class.php:3634 libraries/Util.class.php:3635
+#: libraries/Util.class.php:3640 libraries/Util.class.php:3641
 #: libraries/central_columns.lib.php:851
 #: libraries/central_columns.lib.php:1193
 #: libraries/config/messages.inc.php:892
@@ -2195,7 +2201,7 @@ msgstr "Таҳрирлаш"
 #: libraries/server_user_groups.lib.php:129
 #: libraries/sql_query_form.lib.php:416 libraries/tracking.lib.php:477
 #: setup/frames/index.inc.php:183 setup/frames/index.inc.php:291
-#: templates/designer/delete_relation_panel.phtml:27
+#: templates/database/designer/delete_relation_panel.phtml:27
 msgid "Delete"
 msgstr "Ўчириш"
 
@@ -2379,11 +2385,11 @@ msgid "No dependencies selected!"
 msgstr "Биронта ҳам маълумотлар базаси танланмаган."
 
 #: js/messages.php:394 libraries/central_columns.lib.php:1214
-#: libraries/insert_edit.lib.php:1458 libraries/server_variables.lib.php:155
+#: libraries/insert_edit.lib.php:1456 libraries/server_variables.lib.php:155
 #: setup/frames/config.inc.php:42 setup/frames/index.inc.php:279
 #: templates/columns_definitions/column_definitions_form.phtml:165
-#: templates/gis_visualization/gis_visualization.phtml:48
-#: templates/tbl_relation/common_form.phtml:107
+#: templates/table/gis_visualization/gis_visualization.phtml:48
+#: templates/table/relation/common_form.phtml:107
 msgid "Save"
 msgstr "Сақлаш"
 
@@ -2482,8 +2488,8 @@ msgid "Data point content"
 msgstr "Маълумотлар файли кўрсатгичи ҳажми"
 
 #: js/messages.php:430 js/messages.php:562 js/messages.php:579
-#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2573
-#: templates/index_form.phtml:154 templates/index_form.phtml:194
+#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2571
+#: templates/table/index_form.phtml:154 templates/table/index_form.phtml:194
 msgid "Ignore"
 msgstr "Эътибор бермаслик"
 
@@ -2546,8 +2552,8 @@ msgstr "Ташқи калитни танланг"
 msgid "Please select the primary key or a unique key!"
 msgstr "Бирламчи (PRIMARY) ёки уникал (UNIQUE) индекс бўлган майдонни танланг!"
 
-#: js/messages.php:457 templates/designer/side_menu.phtml:91
-#: templates/designer/side_menu.phtml:94
+#: js/messages.php:457 templates/database/designer/side_menu.phtml:91
+#: templates/database/designer/side_menu.phtml:94
 #, fuzzy
 #| msgid "Choose field to display"
 msgid "Choose column to display"
@@ -2565,22 +2571,22 @@ msgstr ""
 msgid "Page name"
 msgstr "Саҳифа рақами: "
 
-#: js/messages.php:463 templates/designer/side_menu.phtml:56
-#: templates/designer/side_menu.phtml:59
+#: js/messages.php:463 templates/database/designer/side_menu.phtml:56
+#: templates/database/designer/side_menu.phtml:59
 #, fuzzy
 #| msgid "Select Tables"
 msgid "Save page"
 msgstr "Жадвалларни танланг"
 
-#: js/messages.php:464 templates/designer/side_menu.phtml:63
-#: templates/designer/side_menu.phtml:66
+#: js/messages.php:464 templates/database/designer/side_menu.phtml:63
+#: templates/database/designer/side_menu.phtml:66
 #, fuzzy
 #| msgid "Select Tables"
 msgid "Save page as"
 msgstr "Жадвалларни танланг"
 
-#: js/messages.php:465 templates/designer/side_menu.phtml:49
-#: templates/designer/side_menu.phtml:52
+#: js/messages.php:465 templates/database/designer/side_menu.phtml:49
+#: templates/database/designer/side_menu.phtml:52
 #, fuzzy
 #| msgid "Free pages"
 msgid "Open page"
@@ -2592,7 +2598,7 @@ msgstr "Бўш саҳифалар сони"
 msgid "Delete page"
 msgstr "Жадвалларни танланг"
 
-#: js/messages.php:467 templates/designer/side_menu.phtml:10
+#: js/messages.php:467 templates/database/designer/side_menu.phtml:10
 msgid "Untitled"
 msgstr ""
 
@@ -2716,7 +2722,7 @@ msgstr "Асл позиция"
 msgid "cancel"
 msgstr "Бекор қилиш"
 
-#: js/messages.php:499 libraries/server_status.lib.php:271
+#: js/messages.php:499 libraries/server_status.lib.php:280
 msgid "Aborted"
 msgstr "Узилди"
 
@@ -3414,7 +3420,7 @@ msgstr "Нотўғри порт номери"
 
 #: js/messages.php:793 libraries/Message.class.php:199
 #: libraries/Util.class.php:654 libraries/core.lib.php:245
-#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1172
+#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1170
 #: tbl_operations.php:229 view_operations.php:63
 msgid "Error"
 msgstr "Хатолик"
@@ -3475,8 +3481,8 @@ msgstr "секундига"
 msgid "per minute"
 msgstr "минутига"
 
-#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:143
-#: libraries/server_status.lib.php:228
+#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:152
+#: libraries/server_status.lib.php:237
 #: libraries/server_status_queries.lib.php:98
 msgid "per hour"
 msgstr "соатига"
@@ -3494,7 +3500,7 @@ msgstr ""
 msgid "Wrong permissions on configuration file, should not be world writable!"
 msgstr ""
 
-#: libraries/Config.class.php:1799
+#: libraries/Config.class.php:1801
 msgid "Font size"
 msgstr "Шрифт ўлчами"
 
@@ -3524,10 +3530,10 @@ msgstr "сўров бўйича"
 #: libraries/server_privileges.lib.php:2890
 #: libraries/server_privileges.lib.php:3144
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4332
+#: libraries/server_privileges.lib.php:4358
 #: libraries/server_status_processes.lib.php:80
-#: templates/tbl_relation/foreign_key_row.phtml:165
-#: templates/tbl_relation/internal_relational_row.phtml:55
+#: templates/table/relation/foreign_key_row.phtml:165
+#: templates/table/relation/internal_relational_row.phtml:55
 msgid "Database"
 msgstr "Маълумотлар базаси"
 
@@ -3637,11 +3643,11 @@ msgstr "SQL-сўровлар тарихи"
 #: libraries/plugins/import/ImportMediawiki.class.php:60
 #: libraries/plugins/import/ImportOds.class.php:59
 #: libraries/plugins/import/ImportShp.class.php:57
-#: libraries/plugins/import/ImportSql.class.php:148
+#: libraries/plugins/import/ImportSql.class.php:51
 #: libraries/plugins/import/ImportXml.class.php:58
-#: libraries/rte/rte_routines.lib.php:833 templates/index_form.phtml:49
-#: templates/structure/row_stats_table.phtml:20
-#: templates/table/options.phtml:2
+#: libraries/rte/rte_routines.lib.php:924 templates/table/index_form.phtml:49
+#: templates/table/search/options.phtml:2
+#: templates/table/structure/row_stats_table.phtml:20
 msgid "Options"
 msgstr "Параметрлар"
 
@@ -3684,7 +3690,8 @@ msgstr "Камайиш тартибида"
 msgid "Order:"
 msgstr ""
 
-#: libraries/Console.class.php:289 templates/table/replace_preview.phtml:17
+#: libraries/Console.class.php:289
+#: templates/table/search/replace_preview.phtml:17
 #, fuzzy
 #| msgid "Column"
 msgid "Count"
@@ -3807,9 +3814,9 @@ msgstr "Нусха олинган жадвалга ўтиш"
 #: libraries/operations.lib.php:794 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:191
-#: templates/structure/sortable_header.phtml:21
-#: templates/structure/sortable_header.phtml:38
-#: templates/table/options.phtml:68
+#: templates/database/structure/sortable_header.phtml:21
+#: templates/database/structure/sortable_header.phtml:38
+#: templates/table/search/options.phtml:68
 msgid "Ascending"
 msgstr "Ўсиш тартибида"
 
@@ -3819,13 +3826,14 @@ msgstr "Ўсиш тартибида"
 #: libraries/operations.lib.php:797 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:188
-#: templates/structure/sortable_header.phtml:26
-#: templates/structure/sortable_header.phtml:43
-#: templates/table/options.phtml:69
+#: templates/database/structure/sortable_header.phtml:26
+#: templates/database/structure/sortable_header.phtml:43
+#: templates/table/search/options.phtml:69
 msgid "Descending"
 msgstr "Камайиш тартибида"
 
-#: libraries/DBQbe.class.php:467 templates/table/search_and_replace.phtml:6
+#: libraries/DBQbe.class.php:467
+#: templates/table/search/search_and_replace.phtml:6
 #, fuzzy
 #| msgid "Column"
 msgid "Column:"
@@ -4011,12 +4019,12 @@ msgstr[0] "<i>\"%s\"</i> жадвалида ўхшашликлар сони \"%s
 msgstr[1] "<i>\"%s\"</i> жадвалида ўхшашликлар сони \"%s\" та"
 
 #: libraries/DbSearch.class.php:354 libraries/Menu.class.php:311
-#: libraries/Util.class.php:3337 libraries/Util.class.php:3347
-#: libraries/Util.class.php:3623 libraries/Util.class.php:3624
-#: libraries/Util.class.php:4343 libraries/config.values.php:43
+#: libraries/Util.class.php:3343 libraries/Util.class.php:3353
+#: libraries/Util.class.php:3629 libraries/Util.class.php:3630
+#: libraries/Util.class.php:4349 libraries/config.values.php:43
 #: libraries/config.values.php:51 libraries/config.values.php:119
 #: libraries/navigation/Nodes/Node_Table.class.php:295
-#: templates/structure/check_all_table_column.phtml:5
+#: templates/table/structure/check_all_table_column.phtml:5
 msgid "Browse"
 msgstr "Кўриб чиқиш"
 
@@ -4033,7 +4041,8 @@ msgstr "Маълумотлар базасида қидириш"
 msgid "Words or values to search for (wildcard: \"%\"):"
 msgstr "Қидириш учун сўзлар ёки қийматлар (гурух белгиси: \"%\"):"
 
-#: libraries/DbSearch.class.php:401 templates/table/search_and_replace.phtml:1
+#: libraries/DbSearch.class.php:401
+#: templates/table/search/search_and_replace.phtml:1
 msgid "Find:"
 msgstr "Излаш:"
 
@@ -4084,16 +4093,16 @@ msgstr "Фильтр"
 msgid "Search this table"
 msgstr "Маълумотлар базасида қидириш"
 
-#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2532
-#: libraries/Util.class.php:2535
+#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2538
+#: libraries/Util.class.php:2541
 #, fuzzy
 #| msgid "Begin"
 msgctxt "First page"
 msgid "Begin"
 msgstr "Боши"
 
-#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2533
-#: libraries/Util.class.php:2536 libraries/server_bin_log.lib.php:170
+#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2539
+#: libraries/Util.class.php:2542 libraries/server_bin_log.lib.php:170
 #: libraries/server_bin_log.lib.php:172
 #, fuzzy
 #| msgid "Previous"
@@ -4101,8 +4110,8 @@ msgctxt "Previous page"
 msgid "Previous"
 msgstr "Орқага"
 
-#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2564
-#: libraries/Util.class.php:2574 libraries/server_bin_log.lib.php:204
+#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2570
+#: libraries/Util.class.php:2580 libraries/server_bin_log.lib.php:204
 #: libraries/server_bin_log.lib.php:206
 #, fuzzy
 #| msgid "Next"
@@ -4110,8 +4119,8 @@ msgctxt "Next page"
 msgid "Next"
 msgstr "Кейинги"
 
-#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2565
-#: libraries/Util.class.php:2575
+#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2571
+#: libraries/Util.class.php:2581
 #, fuzzy
 #| msgid "End"
 msgctxt "Last page"
@@ -4200,9 +4209,9 @@ msgid "May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]."
 msgstr "Тахминий бўлиши мумкин. [doc@faq3-11]\"FAQ 3.11\"[/doc]га қаранг"
 
 #: libraries/DisplayResults.class.php:4332 libraries/Message.class.php:180
-#: libraries/controllers/TableRelationController.class.php:258
+#: libraries/controllers/TableRelationController.class.php:259
 #: libraries/controllers/TableSearchController.class.php:655
-#: libraries/rte/rte_routines.lib.php:1332 libraries/sql_query_form.lib.php:89
+#: libraries/rte/rte_routines.lib.php:1423 libraries/sql_query_form.lib.php:89
 #: tbl_operations.php:227 tbl_row_action.php:138 view_operations.php:62
 #, fuzzy
 #| msgid "Your SQL query has been executed successfully."
@@ -4210,7 +4219,7 @@ msgid "Your SQL query has been executed successfully."
 msgstr "SQL сўрови муваффақиятли бажарилди"
 
 #: libraries/DisplayResults.class.php:4660
-#: libraries/controllers/StructureController.class.php:629
+#: libraries/controllers/DatabaseStructureController.class.php:564
 #, php-format
 msgid ""
 "This view has at least this number of rows. Please refer to %sdocumentation"
@@ -4236,34 +4245,34 @@ msgstr ""
 msgid "%d total"
 msgstr "жами"
 
-#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1318
+#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1312
 #, fuzzy, php-format
 #| msgid "Query took %01.4f sec"
 msgid "Query took %01.4f seconds."
 msgstr "Сўров %01.4f секунд вақт олди"
 
 #: libraries/DisplayResults.class.php:4807
-#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4767
-#: libraries/Util.class.php:4773 libraries/mult_submits.inc.php:50
-#: templates/structure/check_all_tables.phtml:2
-#: templates/structure/check_all_tables.phtml:9
+#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4773
+#: libraries/Util.class.php:4779 libraries/mult_submits.inc.php:50
+#: templates/database/structure/check_all_tables.phtml:2
+#: templates/database/structure/check_all_tables.phtml:9
 msgid "With selected:"
 msgstr "Белгиланганларни:"
 
 #: libraries/DisplayResults.class.php:4811
-#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4769
-#: libraries/Util.class.php:4770 libraries/server_privileges.lib.php:1174
+#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4775
+#: libraries/Util.class.php:4776 libraries/server_privileges.lib.php:1174
 #: libraries/server_privileges.lib.php:1175
 #: libraries/server_privileges.lib.php:1387
 #: libraries/server_user_groups.lib.php:231
-#: templates/structure/check_all_tables.phtml:3
-#: templates/structure/check_all_tables.phtml:4
+#: templates/database/structure/check_all_tables.phtml:3
+#: templates/database/structure/check_all_tables.phtml:4
 msgid "Check All"
 msgstr "Барчасини белгилаш"
 
 #: libraries/DisplayResults.class.php:4985 libraries/Header.class.php:383
-#: templates/structure/optional_action_links.phtml:1
-#: templates/structure/print_view_data_dictionary_link.phtml:3
+#: templates/database/structure/print_view_data_dictionary_link.phtml:3
+#: templates/table/structure/optional_action_links.phtml:1
 msgid "Print view"
 msgstr "Чоп этиш версияси"
 
@@ -4271,7 +4280,8 @@ msgstr "Чоп этиш версияси"
 msgid "Query results operations"
 msgstr "Сўров натижаларини ишлатиш"
 
-#: libraries/DisplayResults.class.php:5105 templates/tbl_chart.phtml:12
+#: libraries/DisplayResults.class.php:5105
+#: templates/table/chart/tbl_chart.phtml:12
 #, fuzzy
 #| msgid "Display PDF schema"
 msgid "Display chart"
@@ -4378,7 +4388,7 @@ msgid "Click on the bar to scroll to top of page"
 msgstr ""
 
 #: libraries/Header.class.php:749
-#: libraries/plugins/auth/AuthenticationCookie.class.php:152
+#: libraries/plugins/auth/AuthenticationCookie.class.php:140
 #, fuzzy
 #| msgid "Cookies must be enabled past this point."
 msgid "Javascript must be enabled past this point!"
@@ -4402,11 +4412,11 @@ msgid "Keyname"
 msgstr "Индекс номи"
 
 #: libraries/Index.class.php:697
-#: libraries/controllers/StructureController.class.php:1962
-#: libraries/controllers/StructureController.class.php:1967
+#: libraries/controllers/TableStructureController.class.php:953
+#: libraries/controllers/TableStructureController.class.php:958
 #: libraries/tracking.lib.php:973
 #: templates/columns_definitions/column_indexes.phtml:11
-#: templates/structure/check_all_table_column.phtml:26
+#: templates/table/structure/check_all_table_column.phtml:26
 msgid "Unique"
 msgstr "Уникал"
 
@@ -4425,16 +4435,17 @@ msgstr "Элементлар сони"
 #: libraries/server_collations.lib.php:35 libraries/tracking.lib.php:881
 #: libraries/tracking.lib.php:977
 #: templates/columns_definitions/table_fields_definitions.phtml:33
-#: templates/structure/row_stats_table.phtml:31
-#: templates/structure/table_header.phtml:55
-#: templates/structure/table_structure_header.phtml:7
-#: templates/table/table_header.phtml:8
+#: templates/database/structure/table_header.phtml:55
+#: templates/table/search/table_header.phtml:8
+#: templates/table/structure/row_stats_table.phtml:31
+#: templates/table/structure/table_structure_header.phtml:7
 msgid "Collation"
 msgstr "Таққослаш"
 
 #: libraries/Index.class.php:703 libraries/rte/rte_events.lib.php:496
-#: libraries/rte/rte_routines.lib.php:956 libraries/tracking.lib.php:885
-#: libraries/tracking.lib.php:979 templates/structure/table_header.phtml:84
+#: libraries/rte/rte_routines.lib.php:1047 libraries/tracking.lib.php:885
+#: libraries/tracking.lib.php:979
+#: templates/database/structure/table_header.phtml:84
 msgid "Comment"
 msgstr "Изоҳ"
 
@@ -4447,15 +4458,15 @@ msgstr "Бирламчи калит ўчирилди."
 msgid "Index %s has been dropped."
 msgstr "\"%s\" индекси ўчирилди."
 
-#: libraries/Index.class.php:757 libraries/Util.class.php:3630
-#: libraries/Util.class.php:3631
-#: libraries/controllers/StructureController.class.php:1958
-#: libraries/controllers/StructureController.class.php:1959
+#: libraries/Index.class.php:757 libraries/Util.class.php:3636
+#: libraries/Util.class.php:3637
+#: libraries/controllers/TableStructureController.class.php:949
+#: libraries/controllers/TableStructureController.class.php:950
 #: libraries/operations.lib.php:1607 libraries/rte/rte_list.lib.php:150
 #: libraries/server_databases.lib.php:146
-#: templates/structure/check_all_table_column.phtml:15
-#: templates/structure/check_all_tables.phtml:16
-#: templates/tbl_relation/foreign_key_row.phtml:93
+#: templates/database/structure/check_all_tables.phtml:16
+#: templates/table/relation/foreign_key_row.phtml:93
+#: templates/table/structure/check_all_table_column.phtml:15
 msgid "Drop"
 msgstr "Ўчириш"
 
@@ -4484,16 +4495,16 @@ msgstr "Сервер"
 #: libraries/Menu.class.php:248
 #: libraries/navigation/Nodes/Node_View.class.php:32
 #: libraries/tbl_info.inc.php:63
-#: templates/structure/structure_table_row.phtml:97
-#: templates/structure/structure_table_row.phtml:159
+#: templates/database/structure/structure_table_row.phtml:97
+#: templates/database/structure/structure_table_row.phtml:159
 msgid "View"
 msgstr "Намойиш"
 
 #: libraries/Menu.class.php:325 libraries/Menu.class.php:429
-#: libraries/Menu.class.php:548 libraries/Util.class.php:3334
-#: libraries/Util.class.php:3344 libraries/Util.class.php:3350
-#: libraries/Util.class.php:4313 libraries/Util.class.php:4328
-#: libraries/Util.class.php:4345 libraries/config.values.php:40
+#: libraries/Menu.class.php:548 libraries/Util.class.php:3340
+#: libraries/Util.class.php:3350 libraries/Util.class.php:3356
+#: libraries/Util.class.php:4319 libraries/Util.class.php:4334
+#: libraries/Util.class.php:4351 libraries/config.values.php:40
 #: libraries/config.values.php:48 libraries/config.values.php:110
 #: libraries/config.values.php:116 libraries/config/messages.inc.php:321
 #: libraries/navigation/Nodes/Node_Table.class.php:292
@@ -4501,19 +4512,19 @@ msgid "SQL"
 msgstr "SQL"
 
 #: libraries/Menu.class.php:328 libraries/Menu.class.php:432
-#: libraries/Util.class.php:3335 libraries/Util.class.php:3345
-#: libraries/Util.class.php:3351 libraries/Util.class.php:3625
-#: libraries/Util.class.php:3626 libraries/Util.class.php:4329
-#: libraries/Util.class.php:4346 libraries/config.values.php:41
+#: libraries/Util.class.php:3341 libraries/Util.class.php:3351
+#: libraries/Util.class.php:3357 libraries/Util.class.php:3631
+#: libraries/Util.class.php:3632 libraries/Util.class.php:4335
+#: libraries/Util.class.php:4352 libraries/config.values.php:41
 #: libraries/config.values.php:49 libraries/config.values.php:111
 #: libraries/config.values.php:117
 #: libraries/navigation/Nodes/Node_Table.class.php:286
 msgid "Search"
 msgstr "Қидириш"
 
-#: libraries/Menu.class.php:338 libraries/Util.class.php:3336
-#: libraries/Util.class.php:3346 libraries/Util.class.php:3627
-#: libraries/Util.class.php:3628 libraries/Util.class.php:4347
+#: libraries/Menu.class.php:338 libraries/Util.class.php:3342
+#: libraries/Util.class.php:3352 libraries/Util.class.php:3633
+#: libraries/Util.class.php:3634 libraries/Util.class.php:4353
 #: libraries/config.values.php:42 libraries/config.values.php:50
 #: libraries/config.values.php:118
 #: libraries/navigation/Nodes/Node_Table.class.php:289
@@ -4522,30 +4533,30 @@ msgid "Insert"
 msgstr "Қўйиш"
 
 #: libraries/Menu.class.php:362 libraries/Menu.class.php:467
-#: libraries/Util.class.php:4334 libraries/Util.class.php:4350
+#: libraries/Util.class.php:4340 libraries/Util.class.php:4356
 #: libraries/config.values.php:106 libraries/server_common.lib.php:51
 #: libraries/server_privileges.lib.php:2370
 #: libraries/server_privileges.lib.php:3158
-#: libraries/server_privileges.lib.php:4221
+#: libraries/server_privileges.lib.php:4247
 msgid "Privileges"
 msgstr "Привилегиялар"
 
 #: libraries/Menu.class.php:371 libraries/Menu.class.php:379
-#: libraries/Menu.class.php:459 libraries/Util.class.php:3338
-#: libraries/Util.class.php:3352 libraries/Util.class.php:4333
-#: libraries/Util.class.php:4351 libraries/config.values.php:112
+#: libraries/Menu.class.php:459 libraries/Util.class.php:3344
+#: libraries/Util.class.php:3358 libraries/Util.class.php:4339
+#: libraries/Util.class.php:4357 libraries/config.values.php:112
 #: view_operations.php:92
 msgid "Operations"
 msgstr "Операциялар"
 
 #: libraries/Menu.class.php:384 libraries/Menu.class.php:492
-#: libraries/Util.class.php:4338 libraries/Util.class.php:4352
+#: libraries/Util.class.php:4344 libraries/Util.class.php:4358
 #: libraries/relation.lib.php:255
 msgid "Tracking"
 msgstr "Кузатиш"
 
 #: libraries/Menu.class.php:397 libraries/Menu.class.php:486
-#: libraries/Util.class.php:4337 libraries/Util.class.php:4353
+#: libraries/Util.class.php:4343 libraries/Util.class.php:4359
 #: libraries/navigation/Nodes/Node_Trigger_Container.class.php:24
 #: libraries/plugins/export/ExportHtmlword.class.php:557
 #: libraries/plugins/export/ExportOdt.class.php:685
@@ -4562,16 +4573,16 @@ msgstr "Триггерлар"
 msgid "Database seems to be empty!"
 msgstr "Маълумотлар базаси бўш!"
 
-#: libraries/Menu.class.php:439 libraries/Util.class.php:4330
+#: libraries/Menu.class.php:439 libraries/Util.class.php:4336
 msgid "Query"
 msgstr "Сўров"
 
-#: libraries/Menu.class.php:472 libraries/Util.class.php:4335
+#: libraries/Menu.class.php:472 libraries/Util.class.php:4341
 #: libraries/rte/rte_words.lib.php:36
 msgid "Routines"
 msgstr "Муолажалар"
 
-#: libraries/Menu.class.php:479 libraries/Util.class.php:4336
+#: libraries/Menu.class.php:479 libraries/Util.class.php:4342
 #: libraries/navigation/Nodes/Node_Event_Container.class.php:26
 #: libraries/plugins/export/ExportSql.class.php:940
 #: libraries/plugins/export/ExportXml.class.php:107
@@ -4579,22 +4590,22 @@ msgstr "Муолажалар"
 msgid "Events"
 msgstr "Ҳодисалар"
 
-#: libraries/Menu.class.php:498 libraries/Util.class.php:4339
+#: libraries/Menu.class.php:498 libraries/Util.class.php:4345
 msgid "Designer"
 msgstr "Дизайнер"
 
-#: libraries/Menu.class.php:507 libraries/Util.class.php:4340
-#: templates/structure/check_all_tables.phtml:35
+#: libraries/Menu.class.php:507 libraries/Util.class.php:4346
+#: templates/database/structure/check_all_tables.phtml:35
 #, fuzzy
 #| msgid "CHAR textarea columns"
 msgid "Central columns"
 msgstr "CHAR майдонидаги устунлар сони"
 
-#: libraries/Menu.class.php:544 libraries/Util.class.php:4312
+#: libraries/Menu.class.php:544 libraries/Util.class.php:4318
 #: libraries/config.values.php:103 libraries/config/messages.inc.php:266
 #: libraries/config/messages.inc.php:341
 #: libraries/navigation/NavigationTree.class.php:1239
-#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4332
+#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4358
 msgid "Databases"
 msgstr "Маълумотлар базалари"
 
@@ -4605,34 +4616,34 @@ msgid "User accounts"
 msgstr "Фойдаланувчи"
 
 #: libraries/Menu.class.php:595 libraries/ServerStatusData.class.php:121
-#: libraries/Util.class.php:4319 libraries/server_common.lib.php:36
+#: libraries/Util.class.php:4325 libraries/server_common.lib.php:36
 msgid "Binary log"
 msgstr "Иккилик журнал"
 
 #: libraries/Menu.class.php:601 libraries/ServerStatusData.class.php:126
-#: libraries/Util.class.php:4320 libraries/server_common.lib.php:42
-#: templates/structure/body_for_table_summary.phtml:10
-#: templates/structure/table_header.phtml:27
+#: libraries/Util.class.php:4326 libraries/server_common.lib.php:42
+#: templates/database/structure/body_for_table_summary.phtml:10
+#: templates/database/structure/table_header.phtml:27
 msgid "Replication"
 msgstr "Репликация (захира нусха кўчириш)"
 
 #: libraries/Menu.class.php:606 libraries/ServerStatusData.class.php:193
-#: libraries/Util.class.php:4321 libraries/config.values.php:105
+#: libraries/Util.class.php:4327 libraries/config.values.php:105
 #: libraries/server_engines.lib.php:108 libraries/server_engines.lib.php:112
 #: libraries/sql_query_form.lib.php:421
 msgid "Variables"
 msgstr "Ўзгарувчилар"
 
-#: libraries/Menu.class.php:610 libraries/Util.class.php:4322
+#: libraries/Menu.class.php:610 libraries/Util.class.php:4328
 msgid "Charsets"
 msgstr "Кодировкалар"
 
-#: libraries/Menu.class.php:615 libraries/Util.class.php:4323
+#: libraries/Menu.class.php:615 libraries/Util.class.php:4329
 #: libraries/server_common.lib.php:33 libraries/server_plugins.lib.php:27
 msgid "Plugins"
 msgstr ""
 
-#: libraries/Menu.class.php:626 libraries/Util.class.php:4324
+#: libraries/Menu.class.php:626 libraries/Util.class.php:4330
 msgid "Engines"
 msgstr "Жадвал турлари"
 
@@ -4660,7 +4671,7 @@ msgid_plural "%1$d rows inserted."
 msgstr[0] "%1$d та қаторлар қўйилди."
 msgstr[1] "%1$d та қаторлар қўйилди."
 
-#: libraries/PDF.class.php:70 libraries/Util.class.php:2521
+#: libraries/PDF.class.php:70 libraries/Util.class.php:2527
 #: libraries/browse_foreigners.lib.php:327
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:865
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:890
@@ -4687,7 +4698,7 @@ msgid "Could not save favorite table!"
 msgstr "Конфигурацияни юклаб ёки сақлаб бўлмади"
 
 #: libraries/RecentFavoriteTable.class.php:212
-#: templates/structure/favorite_anchor.phtml:12
+#: templates/database/structure/favorite_anchor.phtml:12
 #, fuzzy
 #| msgid "Rename database to"
 msgid "Remove from Favorites"
@@ -4873,7 +4884,7 @@ msgid ""
 msgstr "Ушбу турдаги жадваллар ҳақида қўшимча маълумот мавжуд эмас."
 
 #: libraries/StorageEngine.class.php:373
-#: templates/structure/body_for_table_summary.phtml:50
+#: templates/database/structure/body_for_table_summary.phtml:50
 #, php-format
 msgid "%s is the default storage engine on this MySQL server."
 msgstr "\"%s\" - MySQL серверидаги андозавий маълумотлар жадвали тури."
@@ -5308,10 +5319,10 @@ msgstr ""
 
 #: libraries/Util.class.php:726 libraries/rte/rte_events.lib.php:110
 #: libraries/rte/rte_events.lib.php:119 libraries/rte/rte_events.lib.php:150
-#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:153
-#: libraries/rte/rte_routines.lib.php:162
-#: libraries/rte/rte_routines.lib.php:235
-#: libraries/rte/rte_routines.lib.php:1366
+#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:223
+#: libraries/rte/rte_routines.lib.php:250
+#: libraries/rte/rte_routines.lib.php:372
+#: libraries/rte/rte_routines.lib.php:1457
 #: libraries/rte/rte_triggers.lib.php:86 libraries/rte/rte_triggers.lib.php:95
 #: libraries/rte/rte_triggers.lib.php:127
 msgid "MySQL said: "
@@ -5357,84 +5368,87 @@ msgstr "Якш"
 msgid "%B %d, %Y at %I:%M %p"
 msgstr "%d %B %Y й., %H:%M"
 
-#: libraries/Util.class.php:2019
+#: libraries/Util.class.php:2025
 #, php-format
 msgid "%s days, %s hours, %s minutes and %s seconds"
 msgstr "\"%s\" кун, \"%s\" соат, \"%s\" минут ва \"%s\" секунд"
 
-#: libraries/Util.class.php:2112
+#: libraries/Util.class.php:2118
 #, fuzzy
 #| msgid "Routines"
 msgid "Missing parameter:"
 msgstr "Муолажалар"
 
-#: libraries/Util.class.php:2645
+#: libraries/Util.class.php:2651
 #, php-format
 msgid "Jump to database \"%s\"."
 msgstr "\"%s\" маълумотлар базасига ўтиш."
 
-#: libraries/Util.class.php:2670
+#: libraries/Util.class.php:2676
 #, php-format
 msgid "The %s functionality is affected by a known bug, see %s"
 msgstr ""
 "\"%s\" параметрининг иши маълум хатоликка олиб келиши мумкин, батафсил "
 "маълумот учун қаранг \"%s\""
 
-#: libraries/Util.class.php:2881
+#: libraries/Util.class.php:2887
 #, fuzzy
 #| msgid "Click to select"
 msgid "Click to toggle"
 msgstr "Танлаш учун сичқонча тугмасини босинг"
 
-#: libraries/Util.class.php:3542 prefs_manage.php:248
+#: libraries/Util.class.php:3548 prefs_manage.php:248
 msgid "Browse your computer:"
 msgstr ""
 
-#: libraries/Util.class.php:3567
+#: libraries/Util.class.php:3573
 #, fuzzy, php-format
 #| msgid "web server upload directory"
 msgid "Select from the web server upload directory <b>%s</b>:"
 msgstr "Юклаш каталогидан"
 
-#: libraries/Util.class.php:3596 libraries/insert_edit.lib.php:1173
+#: libraries/Util.class.php:3602 libraries/insert_edit.lib.php:1171
 msgid "The directory you set for upload work cannot be reached."
 msgstr "Кўрсатилган каталокка юклаб бўлмади."
 
-#: libraries/Util.class.php:3607
+#: libraries/Util.class.php:3613
 #, fuzzy
 #| msgid "There are no configured servers"
 msgid "There are no files to upload!"
 msgstr "Биронта ҳам конфигурацияланган сервер мавжуд эмас"
 
-#: libraries/Util.class.php:3632 libraries/Util.class.php:3633
-#: templates/structure/check_all_tables.phtml:15
+#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: templates/database/structure/check_all_tables.phtml:15
 msgid "Empty"
 msgstr "Тозалаш"
 
-#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: libraries/Util.class.php:3644 libraries/Util.class.php:3645
 msgid "Execute"
 msgstr ""
 
-#: libraries/Util.class.php:4152
+#: libraries/Util.class.php:4158
 msgid "Print"
 msgstr "Чоп этиш"
 
-#: libraries/Util.class.php:4257 templates/structure/row_stats_table.phtml:80
-#: templates/structure/table_header.phtml:95
+#: libraries/Util.class.php:4263
+#: templates/database/structure/table_header.phtml:95
+#: templates/table/structure/row_stats_table.phtml:80
 msgid "Creation"
 msgstr "Тузиш"
 
-#: libraries/Util.class.php:4263 templates/structure/row_stats_table.phtml:87
-#: templates/structure/table_header.phtml:106
+#: libraries/Util.class.php:4269
+#: templates/database/structure/table_header.phtml:106
+#: templates/table/structure/row_stats_table.phtml:87
 msgid "Last update"
 msgstr "Охирги янгиланиш"
 
-#: libraries/Util.class.php:4269 templates/structure/row_stats_table.phtml:94
-#: templates/structure/table_header.phtml:117
+#: libraries/Util.class.php:4275
+#: templates/database/structure/table_header.phtml:117
+#: templates/table/structure/row_stats_table.phtml:94
 msgid "Last check"
 msgstr "Охирги текширув"
 
-#: libraries/Util.class.php:4315
+#: libraries/Util.class.php:4321
 #, fuzzy
 #| msgid "User"
 msgid "Users"
@@ -5459,16 +5473,16 @@ msgid "Use this value"
 msgstr "Ушбу қийматни ишлатиш"
 
 #: libraries/build_html_for_db.lib.php:33 libraries/import.lib.php:193
-#: templates/structure/actions_in_table_structure.phtml:113
-#: templates/structure/row_stats_table.phtml:42
-#: templates/structure/table_header.phtml:36
+#: templates/database/structure/table_header.phtml:36
+#: templates/table/structure/actions_in_table_structure.phtml:113
+#: templates/table/structure/row_stats_table.phtml:42
 msgid "Rows"
 msgstr "Қаторларсони"
 
 #: libraries/build_html_for_db.lib.php:48 libraries/engines/innodb.lib.php:171
-#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:186
-#: libraries/server_status.lib.php:298
-#: templates/structure/display_table_stats.phtml:40
+#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:195
+#: libraries/server_status.lib.php:307
+#: templates/table/structure/display_table_stats.phtml:40
 msgid "Total"
 msgstr "Жами"
 
@@ -5479,12 +5493,14 @@ msgid "Jump to database"
 msgstr "Ушбу базага ўтиш"
 
 #: libraries/build_html_for_db.lib.php:146
+#: templates/database/structure/structure_table_row.phtml:15
 #, fuzzy
 #| msgid "Master replication"
 msgid "Not replicated"
 msgstr "Бош сервер репликацияси"
 
 #: libraries/build_html_for_db.lib.php:158
+#: templates/database/structure/structure_table_row.phtml:16
 #, fuzzy
 #| msgid "Replication"
 msgid "Replicated"
@@ -5543,17 +5559,17 @@ msgstr ""
 #: libraries/plugins/export/ExportTexytext.class.php:425
 #: libraries/plugins/export/PMA_ExportPdf.class.php:307
 #: libraries/rte/rte_list.lib.php:73 libraries/rte/rte_list.lib.php:85
-#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:830
-#: libraries/rte/rte_routines.lib.php:1492 setup/frames/index.inc.php:162
+#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:921
+#: libraries/rte/rte_routines.lib.php:1583 setup/frames/index.inc.php:162
 #: templates/columns_definitions/table_fields_definitions.phtml:8
-#: templates/structure/table_structure_header.phtml:5
-#: templates/table/create_table.phtml:11
+#: templates/database/create_table.phtml:11
+#: templates/table/structure/table_structure_header.phtml:5
 msgid "Name"
 msgstr "Номи"
 
 #: libraries/central_columns.lib.php:699
 #: libraries/central_columns.lib.php:1381
-#: libraries/rte/rte_routines.lib.php:832
+#: libraries/rte/rte_routines.lib.php:923
 #: templates/columns_definitions/table_fields_definitions.phtml:14
 msgid "Length/Values"
 msgstr "Узунлик/қийматлар"
@@ -5576,7 +5592,7 @@ msgid "Select a table"
 msgstr "Жадвалларни танланг"
 
 #: libraries/central_columns.lib.php:804
-#: templates/structure/add_column.phtml:4
+#: templates/table/structure/add_column.phtml:4
 #, fuzzy
 #| msgid "Add column(s)"
 msgid "Add column"
@@ -5598,7 +5614,7 @@ msgstr "Устун(лар) қўшиш"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1002
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1025
 #: templates/columns_definitions/table_fields_definitions.phtml:36
-#: templates/structure/table_structure_header.phtml:8
+#: templates/table/structure/table_structure_header.phtml:8
 msgid "Attributes"
 msgstr "Атрибутлар"
 
@@ -5725,7 +5741,7 @@ msgid "Double click"
 msgstr ""
 
 #: libraries/config.values.php:95 libraries/config.values.php:124
-#: libraries/config/FormDisplay.tpl.php:221 libraries/relation.lib.php:97
+#: libraries/config/FormDisplay.tpl.php:232 libraries/relation.lib.php:97
 #: libraries/relation.lib.php:105
 msgid "Disabled"
 msgstr "Фаолсизлантирилган"
@@ -5924,21 +5940,21 @@ msgstr ""
 msgid "maximum %s"
 msgstr "Максимал жадваллар сони"
 
-#: libraries/config/FormDisplay.tpl.php:219
+#: libraries/config/FormDisplay.tpl.php:230
 msgid "This setting is disabled, it will not be applied to your configuration."
 msgstr ""
 
-#: libraries/config/FormDisplay.tpl.php:313
+#: libraries/config/FormDisplay.tpl.php:324
 #, php-format
 msgid "Set value: %s"
 msgstr "Қуйидаги қийматни ўрнатиш: \"%s\""
 
-#: libraries/config/FormDisplay.tpl.php:318
+#: libraries/config/FormDisplay.tpl.php:329
 #: libraries/config/messages.inc.php:610
 msgid "Restore default value"
 msgstr "Асл қийматларни тиклаш"
 
-#: libraries/config/FormDisplay.tpl.php:332
+#: libraries/config/FormDisplay.tpl.php:343
 msgid "Allow users to customize this value"
 msgstr ""
 
@@ -6552,7 +6568,7 @@ msgstr "Файл кодировкаси"
 
 #: libraries/config/messages.inc.php:136 libraries/config/messages.inc.php:152
 #: libraries/sql_query_form.lib.php:247
-#: templates/structure/row_stats_table.phtml:7
+#: templates/table/structure/row_stats_table.phtml:7
 msgid "Format"
 msgstr "Формат"
 
@@ -7169,7 +7185,7 @@ msgstr ""
 
 #: libraries/config/messages.inc.php:332
 #: libraries/plugins/export/ExportPdf.class.php:279
-#: templates/structure/secondary_tabs.phtml:8
+#: templates/table/secondary_tabs.phtml:8
 #, fuzzy
 #| msgid "Database for user"
 msgid "Table structure"
@@ -9169,112 +9185,35 @@ msgstr "Microsoft Word 2000"
 msgid "OpenDocument Text"
 msgstr "OpenDocument матн"
 
-#: libraries/controllers/StructureController.class.php:465
+#: libraries/controllers/DatabaseStructureController.class.php:405
 #: tbl_operations.php:382
 #, php-format
 msgid "Table %s has been emptied."
 msgstr "\"%s\" жадвали тозаланди."
 
-#: libraries/controllers/StructureController.class.php:486
+#: libraries/controllers/DatabaseStructureController.class.php:426
 #: tbl_operations.php:400 view_operations.php:119
 #, fuzzy, php-format
 #| msgid "View %s has been dropped."
 msgid "View %s has been dropped."
 msgstr "\"%s\" намойиши ўчирилди"
 
-#: libraries/controllers/StructureController.class.php:487
+#: libraries/controllers/DatabaseStructureController.class.php:427
 #: tbl_operations.php:401
 #, fuzzy, php-format
 #| msgid "Table %s has been dropped."
 msgid "Table %s has been dropped."
 msgstr "\"%s\" жадвали ўчирилди"
 
-#: libraries/controllers/StructureController.class.php:797
-#, php-format
-msgid "The name '%s' is a MySQL reserved keyword."
-msgid_plural "The names '%s' are MySQL reserved keywords."
-msgstr[0] ""
-msgstr[1] ""
-
-#: libraries/controllers/StructureController.class.php:875
-#, fuzzy
-#| msgid "No rows selected"
-msgid "No column selected."
-msgstr "Амални амалга ошириш учун битта ёки бир нечта қаторни танлаш керак."
-
-#: libraries/controllers/StructureController.class.php:1049
+#: libraries/controllers/DatabaseStructureController.class.php:733
 msgid "Favorite List is full!"
 msgstr ""
 
-#: libraries/controllers/StructureController.class.php:1272
-#, fuzzy
-#| msgid "The selected users have been deleted successfully."
-msgid "The columns have been moved successfully."
-msgstr "Белгиланган фойдаланувчилар муваффақиятли ўчирилди."
-
-#: libraries/controllers/StructureController.class.php:1535
-#, fuzzy, php-format
-#| msgid "Table %1$s has been altered successfully."
-msgid ""
-"Table %1$s has been altered successfully. Privileges have been adjusted."
-msgstr "%1$s жадвали муваффақиятли ўзгартирилди."
-
-#: libraries/controllers/StructureController.class.php:1541
-#: libraries/controllers/TableIndexesController.class.php:161
-#: tbl_addfield.php:92
-#, php-format
-msgid "Table %1$s has been altered successfully."
-msgstr "%1$s жадвали муваффақиятли ўзгартирилди."
-
-#: libraries/controllers/StructureController.class.php:1588
-#: libraries/tracking.lib.php:1094
-#, fuzzy
-#| msgid "Ignore errors"
-msgid "Query error"
-msgstr "Хатоларга эътибор бермаслик"
-
-#: libraries/controllers/StructureController.class.php:1806
+#: libraries/controllers/DatabaseStructureController.class.php:947
 #: libraries/mysql_charsets.lib.php:366 libraries/mysql_charsets.lib.php:373
 msgid "unknown"
 msgstr "номаълум"
 
-#: libraries/controllers/StructureController.class.php:1957
-#: templates/structure/check_all_table_column.phtml:11
-msgid "Change"
-msgstr "Ўзгартириш"
-
-#: libraries/controllers/StructureController.class.php:1961
-#: libraries/controllers/StructureController.class.php:1966
-#: libraries/navigation/Nodes/Node_Index.class.php:30
-#: libraries/tracking.lib.php:926
-#: templates/columns_definitions/column_indexes.phtml:16
-#: templates/columns_definitions/table_fields_definitions.phtml:57
-#: templates/structure/check_all_table_column.phtml:30
-#: templates/structure/display_structure.phtml:79
-#: templates/structure/display_table_stats.phtml:19
-msgid "Index"
-msgstr "Индекс"
-
-#: libraries/controllers/StructureController.class.php:1963
-#: libraries/controllers/StructureController.class.php:1968
-#: templates/columns_definitions/column_indexes.phtml:27
-#: templates/structure/check_all_table_column.phtml:37
-msgid "Spatial"
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1964
-#: libraries/controllers/StructureController.class.php:1969
-#: templates/columns_definitions/column_indexes.phtml:22
-#: templates/structure/check_all_table_column.phtml:47
-msgid "Fulltext"
-msgstr "Матн тўлалигича"
-
-#: libraries/controllers/StructureController.class.php:1970
-#, fuzzy
-#| msgid "Browse distinct values"
-msgid "Distinct values"
-msgstr "Турли қийматларни кўриб чиқиш"
-
 #: libraries/controllers/TableChartController.class.php:82
 #: libraries/controllers/TableGisVisualizationController.class.php:101
 msgid "No SQL query was set to fetch data."
@@ -9290,13 +9229,20 @@ msgstr ""
 msgid "No data to display"
 msgstr "Маълумотлар базаси мавжуд эмас"
 
-#: libraries/controllers/TableRelationController.class.php:217
+#: libraries/controllers/TableIndexesController.class.php:161
+#: libraries/controllers/TableStructureController.class.php:736
+#: tbl_addfield.php:92
+#, php-format
+msgid "Table %1$s has been altered successfully."
+msgstr "%1$s жадвали муваффақиятли ўзгартирилди."
+
+#: libraries/controllers/TableRelationController.class.php:218
 #, fuzzy
 #| msgid "Thread %s was successfully killed."
 msgid "Display column was successfully updated."
 msgstr "\"%s\" жараёни муваффақиятли якунланди."
 
-#: libraries/controllers/TableRelationController.class.php:283
+#: libraries/controllers/TableRelationController.class.php:288
 #, fuzzy
 #| msgid "Internal relation added"
 msgid "Internal relations were successfully updated."
@@ -9315,12 +9261,82 @@ msgid "Zoom search"
 msgstr "Қидириш"
 
 #: libraries/controllers/TableSearchController.class.php:852
-#: templates/table/selection_form.phtml:59
+#: templates/table/search/selection_form.phtml:59
 #, fuzzy
 #| msgid "SQL Query box"
 msgid "Find and replace"
 msgstr "SQL сўровлари қутиси"
 
+#: libraries/controllers/TableStructureController.class.php:163
+#, php-format
+msgid "The name '%s' is a MySQL reserved keyword."
+msgid_plural "The names '%s' are MySQL reserved keywords."
+msgstr[0] ""
+msgstr[1] ""
+
+#: libraries/controllers/TableStructureController.class.php:241
+#, fuzzy
+#| msgid "No rows selected"
+msgid "No column selected."
+msgstr "Амални амалга ошириш учун битта ёки бир нечта қаторни танлаш керак."
+
+#: libraries/controllers/TableStructureController.class.php:467
+#, fuzzy
+#| msgid "The selected users have been deleted successfully."
+msgid "The columns have been moved successfully."
+msgstr "Белгиланган фойдаланувчилар муваффақиятли ўчирилди."
+
+#: libraries/controllers/TableStructureController.class.php:730
+#, fuzzy, php-format
+#| msgid "Table %1$s has been altered successfully."
+msgid ""
+"Table %1$s has been altered successfully. Privileges have been adjusted."
+msgstr "%1$s жадвали муваффақиятли ўзгартирилди."
+
+#: libraries/controllers/TableStructureController.class.php:783
+#: libraries/tracking.lib.php:1094
+#, fuzzy
+#| msgid "Ignore errors"
+msgid "Query error"
+msgstr "Хатоларга эътибор бермаслик"
+
+#: libraries/controllers/TableStructureController.class.php:948
+#: templates/table/structure/check_all_table_column.phtml:11
+msgid "Change"
+msgstr "Ўзгартириш"
+
+#: libraries/controllers/TableStructureController.class.php:952
+#: libraries/controllers/TableStructureController.class.php:957
+#: libraries/navigation/Nodes/Node_Index.class.php:30
+#: libraries/tracking.lib.php:926
+#: templates/columns_definitions/column_indexes.phtml:16
+#: templates/columns_definitions/table_fields_definitions.phtml:57
+#: templates/table/structure/check_all_table_column.phtml:30
+#: templates/table/structure/display_structure.phtml:79
+#: templates/table/structure/display_table_stats.phtml:19
+msgid "Index"
+msgstr "Индекс"
+
+#: libraries/controllers/TableStructureController.class.php:954
+#: libraries/controllers/TableStructureController.class.php:959
+#: templates/columns_definitions/column_indexes.phtml:27
+#: templates/table/structure/check_all_table_column.phtml:37
+msgid "Spatial"
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:955
+#: libraries/controllers/TableStructureController.class.php:960
+#: templates/columns_definitions/column_indexes.phtml:22
+#: templates/table/structure/check_all_table_column.phtml:47
+msgid "Fulltext"
+msgstr "Матн тўлалигича"
+
+#: libraries/controllers/TableStructureController.class.php:963
+#, fuzzy
+#| msgid "Browse distinct values"
+msgid "Distinct values"
+msgstr "Турли қийматларни кўриб чиқиш"
+
 #: libraries/core.lib.php:306
 #, php-format
 msgid "The %s extension is missing. Please check your PHP configuration."
@@ -9368,7 +9384,7 @@ msgid "No Password"
 msgstr "Парол йўқ"
 
 #: libraries/display_change_password.lib.php:68
-#: libraries/plugins/auth/AuthenticationCookie.class.php:199
+#: libraries/plugins/auth/AuthenticationCookie.class.php:187
 #: libraries/replication_gui.lib.php:422 libraries/replication_gui.lib.php:862
 #: libraries/server_privileges.lib.php:1640
 msgid "Password:"
@@ -10255,12 +10271,12 @@ msgid "Dump has been saved to file %s."
 msgstr "Дамп \"%s\" файлида сақланди."
 
 #: libraries/import.lib.php:202 libraries/insert_edit.lib.php:124
-#: libraries/rte/rte_routines.lib.php:1353 libraries/sql.lib.php:1312
+#: libraries/rte/rte_routines.lib.php:1444 libraries/sql.lib.php:1306
 #: tbl_get_field.php:44
 msgid "MySQL returned an empty result set (i.e. zero rows)."
 msgstr "MySQL бўш натижа берди (яъни нольта сатр)."
 
-#: libraries/import.lib.php:265 libraries/sql.lib.php:1326
+#: libraries/import.lib.php:265 libraries/sql.lib.php:1320
 msgid "[ROLLBACK occurred.]"
 msgstr ""
 
@@ -10339,14 +10355,14 @@ msgstr "\"%s\" майдон учун индекс тузиш"
 
 #: libraries/insert_edit.lib.php:233
 #: libraries/navigation/Nodes/Node_DatabaseChild.class.php:48
-#: templates/designer/table_list.phtml:40
+#: templates/database/designer/table_list.phtml:40
 msgid "Hide"
 msgstr "Яшириш"
 
 #: libraries/insert_edit.lib.php:249
 #: libraries/navigation/Nodes/Node_Function.class.php:32
-#: libraries/rte/rte_routines.lib.php:1495
-#: templates/table/table_header.phtml:4
+#: libraries/rte/rte_routines.lib.php:1586
+#: templates/table/search/table_header.phtml:4
 msgid "Function"
 msgstr "Функция"
 
@@ -10361,88 +10377,89 @@ msgstr "Иккилик"
 msgid "Because of its length,<br /> this column might not be editable."
 msgstr "Маълумотлар кўплиги сабали<br />ўзгартириш қийишлашиши мумкин"
 
-#: libraries/insert_edit.lib.php:1050
+#: libraries/insert_edit.lib.php:1048
 msgid "Binary - do not edit"
 msgstr "Иккилик маълумот - таҳрирлаш мумкин эмас"
 
-#: libraries/insert_edit.lib.php:1176 libraries/server_privileges.lib.php:470
-#: templates/table/options.phtml:36
+#: libraries/insert_edit.lib.php:1174 libraries/server_privileges.lib.php:470
+#: templates/table/search/options.phtml:36
 msgid "Or"
 msgstr "Ёки"
 
-#: libraries/insert_edit.lib.php:1177
+#: libraries/insert_edit.lib.php:1175
 #, fuzzy
 #| msgid "web server upload directory"
 msgid "web server upload directory:"
 msgstr "Юклаш каталогидан"
 
-#: libraries/insert_edit.lib.php:1348 templates/table/input_box.phtml:49
+#: libraries/insert_edit.lib.php:1346
+#: templates/table/search/input_box.phtml:49
 #, fuzzy
 #| msgid "Insert"
 msgid "Edit/Insert"
 msgstr "Қўйиш"
 
-#: libraries/insert_edit.lib.php:1398
+#: libraries/insert_edit.lib.php:1396
 #, fuzzy, php-format
 #| msgid "Restart insertion with %s rows"
 msgid "Continue insertion with %s rows"
 msgstr "Қўйилаётган қаторлар сони: \"%s\""
 
-#: libraries/insert_edit.lib.php:1428
+#: libraries/insert_edit.lib.php:1426
 msgid "and then"
 msgstr "ва сўнг"
 
-#: libraries/insert_edit.lib.php:1461
+#: libraries/insert_edit.lib.php:1459
 msgid "Insert as new row"
 msgstr "Ёзув киритиш"
 
-#: libraries/insert_edit.lib.php:1464
+#: libraries/insert_edit.lib.php:1462
 msgid "Insert as new row and ignore errors"
 msgstr "Янги қатор сифатида қўшиш ва хатоликларга эътибор бермаслик"
 
-#: libraries/insert_edit.lib.php:1467
+#: libraries/insert_edit.lib.php:1465
 msgid "Show insert query"
 msgstr "Киритилган сўровни кўрсатиш"
 
-#: libraries/insert_edit.lib.php:1487
+#: libraries/insert_edit.lib.php:1485
 msgid "Go back to previous page"
 msgstr "Олдинги саҳифага ўтиш"
 
-#: libraries/insert_edit.lib.php:1490
+#: libraries/insert_edit.lib.php:1488
 msgid "Insert another new row"
 msgstr "Янги ёзув киритиш"
 
-#: libraries/insert_edit.lib.php:1495
+#: libraries/insert_edit.lib.php:1493
 msgid "Go back to this page"
 msgstr "Ушбу саҳифага қайтиш"
 
-#: libraries/insert_edit.lib.php:1518
+#: libraries/insert_edit.lib.php:1516
 msgid "Edit next row"
 msgstr "Кейинги қаторни таҳрирлаш"
 
-#: libraries/insert_edit.lib.php:1540
+#: libraries/insert_edit.lib.php:1538
 msgid ""
 "Use TAB key to move from value to value, or CTRL+arrows to move anywhere"
 msgstr ""
 "Майдонлараро ўтиш учун TAB тугмаси ёки CTRL+стрелка тугмаларидан фойдаланинг"
 
-#: libraries/insert_edit.lib.php:1577 libraries/replication_gui.lib.php:542
-#: libraries/rte/rte_routines.lib.php:1497
+#: libraries/insert_edit.lib.php:1575 libraries/replication_gui.lib.php:542
+#: libraries/rte/rte_routines.lib.php:1588
 #: libraries/server_status_variables.lib.php:220
-#: templates/designer/having_query_panel.phtml:100
-#: templates/designer/options_panel.phtml:73
-#: templates/designer/options_panel.phtml:239
-#: templates/designer/where_query_panel.phtml:69
-#: templates/table/table_header.phtml:10
-#: templates/table/zoom_result_form.phtml:35
+#: templates/database/designer/having_query_panel.phtml:100
+#: templates/database/designer/options_panel.phtml:73
+#: templates/database/designer/options_panel.phtml:239
+#: templates/database/designer/where_query_panel.phtml:69
+#: templates/table/search/table_header.phtml:10
+#: templates/table/search/zoom_result_form.phtml:35
 msgid "Value"
 msgstr "Қиймати"
 
-#: libraries/insert_edit.lib.php:1937 libraries/sql.lib.php:1309
+#: libraries/insert_edit.lib.php:1935 libraries/sql.lib.php:1303
 msgid "Showing SQL query"
 msgstr "SQL-сўровни кўрсатиш"
 
-#: libraries/insert_edit.lib.php:1962 libraries/sql.lib.php:1287
+#: libraries/insert_edit.lib.php:1960 libraries/sql.lib.php:1281
 #, php-format
 msgid "Inserted row id: %1$d"
 msgstr "Киритилган қатор идентификатори: %1$d"
@@ -10895,7 +10912,7 @@ msgstr ""
 #: libraries/navigation/Nodes/Node_View_Container.class.php:26
 #: libraries/navigation/Nodes/Node_View_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:129
-#: templates/structure/show_create.phtml:30
+#: templates/database/structure/show_create.phtml:30
 #, fuzzy
 #| msgid "View"
 msgid "Views"
@@ -11208,7 +11225,7 @@ msgstr "Ушбу саҳифага кириш учун Сизда етарли ҳ
 
 #: libraries/operations.lib.php:101 libraries/operations.lib.php:249
 #: libraries/operations.lib.php:869 libraries/operations.lib.php:963
-#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:907
+#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:998
 #: templates/columns_definitions/table_fields_definitions.phtml:47
 #, fuzzy
 #| msgid "Edit Privileges"
@@ -11302,22 +11319,22 @@ msgid "Switch to copied table"
 msgstr "Нусха олинган жадвалга ўтиш"
 
 #: libraries/operations.lib.php:1360
-#: templates/structure/check_all_tables.phtml:18
+#: templates/database/structure/check_all_tables.phtml:18
 msgid "Table maintenance"
 msgstr "Жадвалга хизмат кўрсатиш"
 
 #: libraries/operations.lib.php:1398
-#: templates/structure/check_all_tables.phtml:19
+#: templates/database/structure/check_all_tables.phtml:19
 msgid "Analyze table"
 msgstr "Жадвал таҳлили"
 
 #: libraries/operations.lib.php:1413
-#: templates/structure/check_all_tables.phtml:20
+#: templates/database/structure/check_all_tables.phtml:20
 msgid "Check table"
 msgstr "Жадвални текшириш"
 
 #: libraries/operations.lib.php:1428
-#: templates/structure/check_all_tables.phtml:22
+#: templates/database/structure/check_all_tables.phtml:22
 #, fuzzy
 #| msgid "Check table"
 msgid "Checksum table"
@@ -11339,18 +11356,19 @@ msgid "Flush the table (FLUSH)"
 msgstr "Жадвал кешини янгилаш (\"FLUSH\")"
 
 #: libraries/operations.lib.php:1477
-#: templates/structure/check_all_tables.phtml:23
-#: templates/structure/display_table_stats.phtml:56
+#: templates/database/structure/check_all_tables.phtml:23
+#: templates/table/structure/display_table_stats.phtml:56
 msgid "Optimize table"
 msgstr "Жадвални оптималлаштириш"
 
 #: libraries/operations.lib.php:1492
-#: templates/structure/check_all_tables.phtml:24
+#: templates/database/structure/check_all_tables.phtml:24
 msgid "Repair table"
 msgstr "Жадвални тиклаш"
 
 #: libraries/operations.lib.php:1538
-#: templates/structure/check_all_tables.phtml:14 view_operations.php:127
+#: templates/database/structure/check_all_tables.phtml:14
+#: view_operations.php:127
 #, fuzzy
 #| msgid "Delete tracking data for this table"
 msgid "Delete data or table"
@@ -11485,7 +11503,7 @@ msgid "Cannot connect: invalid settings."
 msgstr "Уланиб бўлмади: нотўғри созланган."
 
 #: libraries/plugins/auth/AuthenticationConfig.class.php:108
-#: libraries/plugins/auth/AuthenticationCookie.class.php:134
+#: libraries/plugins/auth/AuthenticationCookie.class.php:122
 #: libraries/plugins/auth/AuthenticationHttp.class.php:96
 #, php-format
 msgid "Welcome to %s"
@@ -11515,38 +11533,38 @@ msgstr ""
 msgid "Retry to connect"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:146
+#: libraries/plugins/auth/AuthenticationCookie.class.php:134
 msgid "Your session has expired. Please log in again."
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:170
+#: libraries/plugins/auth/AuthenticationCookie.class.php:158
 msgid "Log in"
 msgstr "Авторизация"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:178
-#: libraries/plugins/auth/AuthenticationCookie.class.php:188
+#: libraries/plugins/auth/AuthenticationCookie.class.php:166
+#: libraries/plugins/auth/AuthenticationCookie.class.php:176
 msgid "You can enter hostname/IP address and port separated by space."
 msgstr "Сиз хост/IP адрес ва бўш жой қолдириб портни киритишингиз мумкин."
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:193
+#: libraries/plugins/auth/AuthenticationCookie.class.php:181
 msgid "Username:"
 msgstr "Фойдаланувчи:"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:205
+#: libraries/plugins/auth/AuthenticationCookie.class.php:193
 #, fuzzy
 #| msgid "Server Choice"
 msgid "Server Choice:"
 msgstr "Серверни танланг"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:386
+#: libraries/plugins/auth/AuthenticationCookie.class.php:374
 msgid "Entered captcha is wrong, try again!"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:396
+#: libraries/plugins/auth/AuthenticationCookie.class.php:384
 msgid "Please enter correct captcha!"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:423
+#: libraries/plugins/auth/AuthenticationCookie.class.php:411
 #, fuzzy
 #| msgid "Cannot log in to the MySQL server"
 msgid "You are not allowed to log in to this MySQL server!"
@@ -11662,7 +11680,7 @@ msgstr "Ҳодиса"
 #: libraries/plugins/export/ExportOdt.class.php:593
 #: libraries/plugins/export/ExportTexytext.class.php:428
 #: libraries/plugins/export/PMA_ExportPdf.class.php:313
-#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:984
 #: libraries/rte/rte_triggers.lib.php:377
 #, fuzzy
 #| msgid "Description"
@@ -12013,7 +12031,7 @@ msgid "Last check:"
 msgstr "Охирги текширув:"
 
 #: libraries/plugins/export/ExportSql.class.php:1399
-#: templates/structure/structure_table_row.phtml:183
+#: templates/database/structure/structure_table_row.phtml:183
 msgid "in use"
 msgstr "ишлатилмоқда"
 
@@ -12226,24 +12244,18 @@ msgstr ""
 msgid "The imported file does not contain any data!"
 msgstr "\"%s\" файлида калит идентификатори мавжуд эмас"
 
-#: libraries/plugins/import/ImportSql.class.php:169
+#: libraries/plugins/import/ImportSql.class.php:72
 #, fuzzy
 #| msgid "SQL compatibility mode"
 msgid "SQL compatibility mode:"
 msgstr "SQL билан мослик режими"
 
-#: libraries/plugins/import/ImportSql.class.php:181
+#: libraries/plugins/import/ImportSql.class.php:84
 #, fuzzy
 #| msgid "Do not use AUTO_INCREMENT for zero values"
 msgid "Do not use <code>AUTO_INCREMENT</code> for zero values"
 msgstr "Ноль қийматлари учун \"AUTO_INCREMENT\" ишлатмаслик"
 
-#: libraries/plugins/import/ImportSql.class.php:195
-#, fuzzy
-#| msgid "Read misses"
-msgid "Read as multibytes"
-msgstr "Буферни ўқишда қолдиришлар мавжуд"
-
 #: libraries/plugins/import/ImportXml.class.php:54
 msgid "XML"
 msgstr "XML"
@@ -12288,7 +12300,7 @@ msgid "Show grid"
 msgstr "Тўрни кўрсатиш"
 
 #: libraries/plugins/schema/SchemaPdf.class.php:94
-#: templates/structure/print_view_data_dictionary_link.phtml:6
+#: templates/database/structure/print_view_data_dictionary_link.phtml:6
 msgid "Data Dictionary"
 msgstr "Маълумотлар луғати"
 
@@ -12320,7 +12332,7 @@ msgid "The %s table doesn't exist!"
 msgstr "\"%s\" жадвали мавжуд эмас!"
 
 #: libraries/plugins/schema/eps/Eps_Relation_Schema.class.php:321
-#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:309
+#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:323
 #, fuzzy, php-format
 #| msgid "Schema of the \"%s\" database - Page %s"
 msgid "Schema of the %s database - Page %s"
@@ -12350,7 +12362,7 @@ msgstr "Мундарижа"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1005
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1028
 #: libraries/tracking.lib.php:884
-#: templates/structure/table_structure_header.phtml:11
+#: templates/table/structure/table_structure_header.phtml:11
 msgid "Extra"
 msgstr "Қўшимча"
 
@@ -12789,11 +12801,11 @@ msgstr ""
 "Керакли жадвалларни <code>examples/create_tables.sql</code> код ёрдамида "
 "тузиш."
 
-#: libraries/relation.lib.php:360
+#: libraries/relation.lib.php:357
 msgid "Create a pma user and give access to these tables."
 msgstr "phpMyAdmin фойдаланувчиси қўшиш ва ушбу жадвалларга рухсат бериш."
 
-#: libraries/relation.lib.php:365
+#: libraries/relation.lib.php:360
 msgid ""
 "Enable advanced features in configuration file (<code>config.inc.php</"
 "code>), for example by starting from <code>config.sample.inc.php</code>."
@@ -12801,24 +12813,24 @@ msgstr ""
 "(<code>config.inc.php</code>) файлидаги муфассал танловларни фаоллаштириш, "
 "масалан, <code>config.sample.inc.php</code> дан бошлаб."
 
-#: libraries/relation.lib.php:373
+#: libraries/relation.lib.php:365
 msgid "Re-login to phpMyAdmin to load the updated configuration file."
 msgstr ""
 "Янгиланган конфигурация файли ишга тушиши учун, phpMyAdmin дастуридан чиқиб, "
 "қайта киринг."
 
-#: libraries/relation.lib.php:1612
+#: libraries/relation.lib.php:1607
 msgid "no description"
 msgstr "тавсиф мавжуд эмас"
 
-#: libraries/relation.lib.php:1811
+#: libraries/relation.lib.php:1806
 msgid ""
 "You do not have necessary privileges to create a database named "
 "'phpmyadmin'. You may go to 'Operations' tab of any database to set up the "
 "phpMyAdmin configuration storage there."
 msgstr ""
 
-#: libraries/relation.lib.php:1928
+#: libraries/relation.lib.php:1923
 #, fuzzy, php-format
 #| msgid ""
 #| "Empty phpMyAdmin control user while using phpMyAdmin configuration storage"
@@ -12829,13 +12841,13 @@ msgstr ""
 "pmadb усули ишлатилмоқда, лекин phpMyAdmin конфигурацион файлида "
 "фойдаланувчи белгиланмаган"
 
-#: libraries/relation.lib.php:1936
+#: libraries/relation.lib.php:1931
 #, php-format
 msgid ""
 "%sCreate%s the phpMyAdmin configuration storage in the current database."
 msgstr ""
 
-#: libraries/relation.lib.php:1944
+#: libraries/relation.lib.php:1939
 #, fuzzy, php-format
 #| msgid ""
 #| "Empty phpMyAdmin control user while using phpMyAdmin configuration storage"
@@ -12845,7 +12857,7 @@ msgstr ""
 "фойдаланувчи белгиланмаган"
 
 #: libraries/replication_gui.lib.php:46 libraries/replication_gui.lib.php:343
-#: libraries/server_databases.lib.php:387
+#: libraries/server_databases.lib.php:398
 msgid "Master replication"
 msgstr "Бош сервер репликацияси"
 
@@ -12917,7 +12929,7 @@ msgstr ""
 "кўришингиз керак."
 
 #: libraries/replication_gui.lib.php:141
-#: libraries/server_databases.lib.php:389
+#: libraries/server_databases.lib.php:400
 msgid "Slave replication"
 msgstr "Тобе сервер репликацияси"
 
@@ -13233,10 +13245,10 @@ msgid "Master server changed successfully to %s."
 msgstr "Бош репликация сервери қуйидагига ўзгартирилди: %s"
 
 #: libraries/rte/rte_events.lib.php:106 libraries/rte/rte_events.lib.php:115
-#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:149
-#: libraries/rte/rte_routines.lib.php:158
-#: libraries/rte/rte_routines.lib.php:231
-#: libraries/rte/rte_routines.lib.php:1362
+#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:219
+#: libraries/rte/rte_routines.lib.php:246
+#: libraries/rte/rte_routines.lib.php:368
+#: libraries/rte/rte_routines.lib.php:1453
 #: libraries/rte/rte_triggers.lib.php:82 libraries/rte/rte_triggers.lib.php:91
 #: libraries/rte/rte_triggers.lib.php:123
 #, fuzzy, php-format
@@ -13260,7 +13272,7 @@ msgstr "\"%s\" жадвали ўчирилди"
 msgid "Event %1$s has been created."
 msgstr "%1$s жадвали тузилди."
 
-#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:251
+#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:266
 #: libraries/rte/rte_triggers.lib.php:144
 msgid "One or more errors have occurred while processing your request:"
 msgstr ""
@@ -13271,7 +13283,7 @@ msgstr ""
 msgid "Edit event"
 msgstr "Серверларни таҳрирлаш"
 
-#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:794
+#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:885
 #: libraries/rte/rte_triggers.lib.php:323 view_create.php:180
 #, fuzzy
 #| msgid "Details…"
@@ -13288,7 +13300,7 @@ msgstr "Ҳодиса тури"
 msgid "Event type"
 msgstr "Ҳодиса тури"
 
-#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:817
+#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:908
 #, fuzzy, php-format
 #| msgid "Change"
 msgid "Change to %s"
@@ -13324,12 +13336,14 @@ msgstr "Охири"
 msgid "On completion preserve"
 msgstr "Тўла қўйиш"
 
-#: libraries/rte/rte_events.lib.php:491 libraries/rte/rte_routines.lib.php:930
+#: libraries/rte/rte_events.lib.php:491
+#: libraries/rte/rte_routines.lib.php:1021
 #: libraries/rte/rte_triggers.lib.php:383 view_create.php:209
 msgid "Definer"
 msgstr ""
 
-#: libraries/rte/rte_events.lib.php:535 libraries/rte/rte_routines.lib.php:997
+#: libraries/rte/rte_events.lib.php:535
+#: libraries/rte/rte_routines.lib.php:1088
 #: libraries/rte/rte_triggers.lib.php:422
 msgid "The definer must be in the \"username@hostname\" format!"
 msgstr ""
@@ -13357,9 +13371,9 @@ msgid "You must provide an event definition."
 msgstr ""
 
 #: libraries/rte/rte_export.lib.php:43 libraries/rte/rte_general.lib.php:72
-#: libraries/rte/rte_routines.lib.php:345
-#: libraries/rte/rte_routines.lib.php:1198
-#: libraries/rte/rte_routines.lib.php:1411
+#: libraries/rte/rte_routines.lib.php:153
+#: libraries/rte/rte_routines.lib.php:1289
+#: libraries/rte/rte_routines.lib.php:1502
 #, fuzzy
 #| msgid "Processes"
 msgid "Error in processing request:"
@@ -13395,154 +13409,154 @@ msgid ""
 "problems."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:110
-#: libraries/rte/rte_routines.lib.php:1006
-#, fuzzy, php-format
-#| msgid "Invalid server index: \"%s\""
-msgid "Invalid routine type: \"%s\""
-msgstr "Сервер рақами нотўғри: \"%s\""
-
-#: libraries/rte/rte_routines.lib.php:170
-msgid "Sorry, we failed to restore the dropped routine."
-msgstr ""
-
-#: libraries/rte/rte_routines.lib.php:211
-#, fuzzy, php-format
-#| msgid "Table %s has been dropped."
-msgid "Routine %1$s has been modified. Privileges have been adjusted."
-msgstr "\"%s\" жадвали ўчирилди"
-
-#: libraries/rte/rte_routines.lib.php:216
-#, fuzzy, php-format
-#| msgid "Table %s has been dropped."
-msgid "Routine %1$s has been modified."
-msgstr "\"%s\" жадвали ўчирилди"
-
-#: libraries/rte/rte_routines.lib.php:238
-#, fuzzy, php-format
-#| msgid "Table %1$s has been created."
-msgid "Routine %1$s has been created."
-msgstr "%1$s жадвали тузилди."
-
-#: libraries/rte/rte_routines.lib.php:315
+#: libraries/rte/rte_routines.lib.php:123
 #, fuzzy
 #| msgid "Edit mode"
 msgid "Edit routine"
 msgstr "Таҳрирлаш усули"
 
-#: libraries/rte/rte_routines.lib.php:797
+#: libraries/rte/rte_routines.lib.php:200
+#: libraries/rte/rte_routines.lib.php:1097
+#, fuzzy, php-format
+#| msgid "Invalid server index: \"%s\""
+msgid "Invalid routine type: \"%s\""
+msgstr "Сервер рақами нотўғри: \"%s\""
+
+#: libraries/rte/rte_routines.lib.php:253
+#, fuzzy, php-format
+#| msgid "Table %1$s has been created."
+msgid "Routine %1$s has been created."
+msgstr "%1$s жадвали тузилди."
+
+#: libraries/rte/rte_routines.lib.php:380
+msgid "Sorry, we failed to restore the dropped routine."
+msgstr ""
+
+#: libraries/rte/rte_routines.lib.php:439
+#, fuzzy, php-format
+#| msgid "Table %s has been dropped."
+msgid "Routine %1$s has been modified. Privileges have been adjusted."
+msgstr "\"%s\" жадвали ўчирилди"
+
+#: libraries/rte/rte_routines.lib.php:444
+#, fuzzy, php-format
+#| msgid "Table %s has been dropped."
+msgid "Routine %1$s has been modified."
+msgstr "\"%s\" жадвали ўчирилди"
+
+#: libraries/rte/rte_routines.lib.php:888
 #, fuzzy
 #| msgid "Routines"
 msgid "Routine name"
 msgstr "Муолажалар"
 
-#: libraries/rte/rte_routines.lib.php:823
+#: libraries/rte/rte_routines.lib.php:914
 msgid "Parameters"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:829
+#: libraries/rte/rte_routines.lib.php:920
 #, fuzzy
 #| msgid "Direct links"
 msgid "Direction"
 msgstr "Тўғридан-тўғри боғланишлар"
 
-#: libraries/rte/rte_routines.lib.php:847
+#: libraries/rte/rte_routines.lib.php:938
 #, fuzzy
 #| msgid "Apply index(s)"
 msgid "Add parameter"
 msgstr "Индекс(лар)ни сақлаш"
 
-#: libraries/rte/rte_routines.lib.php:851
+#: libraries/rte/rte_routines.lib.php:942
 #, fuzzy
 #| msgid "Rename database to"
 msgid "Remove last parameter"
 msgstr "Маълумотлар базаси номини қуйидагига ўзгартириш"
 
-#: libraries/rte/rte_routines.lib.php:856
+#: libraries/rte/rte_routines.lib.php:947
 msgid "Return type"
 msgstr "Қайтариладиган тип"
 
-#: libraries/rte/rte_routines.lib.php:862
+#: libraries/rte/rte_routines.lib.php:953
 #, fuzzy
 #| msgid "Length/Values"
 msgid "Return length/values"
 msgstr "Узунлик/қийматлар"
 
-#: libraries/rte/rte_routines.lib.php:868
+#: libraries/rte/rte_routines.lib.php:959
 #, fuzzy
 #| msgid "Table options"
 msgid "Return options"
 msgstr "Жадвал параметрлари"
 
-#: libraries/rte/rte_routines.lib.php:899
+#: libraries/rte/rte_routines.lib.php:990
 msgid "Is deterministic"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:920
+#: libraries/rte/rte_routines.lib.php:1011
 msgid ""
 "You do not have sufficient privileges to perform this operation; Please "
 "refer to the documentation for more details"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:935
+#: libraries/rte/rte_routines.lib.php:1026
 #, fuzzy
 #| msgid "Security"
 msgid "Security type"
 msgstr "Хавфсизлик"
 
-#: libraries/rte/rte_routines.lib.php:944
+#: libraries/rte/rte_routines.lib.php:1035
 msgid "SQL data access"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1013
+#: libraries/rte/rte_routines.lib.php:1104
 #, fuzzy
 #| msgid "Invalid table name"
 msgid "You must provide a routine name!"
 msgstr "Жадвал номи нотўғри"
 
-#: libraries/rte/rte_routines.lib.php:1047
+#: libraries/rte/rte_routines.lib.php:1138
 #, php-format
 msgid "Invalid direction \"%s\" given for parameter."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1069
-#: libraries/rte/rte_routines.lib.php:1131
+#: libraries/rte/rte_routines.lib.php:1160
+#: libraries/rte/rte_routines.lib.php:1222
 msgid ""
 "You must provide length/values for routine parameters of type ENUM, SET, "
 "VARCHAR and VARBINARY."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1095
+#: libraries/rte/rte_routines.lib.php:1186
 msgid "You must provide a name and a type for each routine parameter."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1114
+#: libraries/rte/rte_routines.lib.php:1205
 msgid "You must provide a valid return type for the routine."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1174
+#: libraries/rte/rte_routines.lib.php:1265
 msgid "You must provide a routine definition."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1285
+#: libraries/rte/rte_routines.lib.php:1376
 #, fuzzy, php-format
 #| msgid "Allows executing stored routines."
 msgid "Execution results of routine %s"
 msgstr "Сақланадиган муолажаларни бажаришга рухсат беради"
 
-#: libraries/rte/rte_routines.lib.php:1340
+#: libraries/rte/rte_routines.lib.php:1431
 #, php-format
 msgid "%d row affected by the last statement inside the procedure."
 msgid_plural "%d rows affected by the last statement inside the procedure."
 msgstr[0] ""
 
-#: libraries/rte/rte_routines.lib.php:1398
-#: libraries/rte/rte_routines.lib.php:1406
+#: libraries/rte/rte_routines.lib.php:1489
+#: libraries/rte/rte_routines.lib.php:1497
 msgid "Execute routine"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1485
-#: libraries/rte/rte_routines.lib.php:1488
+#: libraries/rte/rte_routines.lib.php:1576
+#: libraries/rte/rte_routines.lib.php:1579
 #, fuzzy
 #| msgid "Routines"
 msgid "Routine parameters"
@@ -13746,7 +13760,7 @@ msgid "Original position"
 msgstr "Асл позиция"
 
 #: libraries/server_bin_log.lib.php:133
-#: templates/structure/display_table_stats.phtml:4
+#: templates/table/structure/display_table_stats.phtml:4
 msgid "Information"
 msgstr "Маълумот"
 
@@ -13784,12 +13798,12 @@ msgstr ""
 "ИЗОҲ: Статискани ёқиш веб-сервер ва MySQL сервери ўртасида катта траффикка "
 "сабаб бўлиши мумкин."
 
-#: libraries/server_databases.lib.php:364
-#: libraries/server_databases.lib.php:365
+#: libraries/server_databases.lib.php:366
+#: libraries/server_databases.lib.php:371
 msgid "Enable Statistics"
 msgstr "Статискани ёқиш"
 
-#: libraries/server_databases.lib.php:481
+#: libraries/server_databases.lib.php:492
 #, fuzzy, php-format
 #| msgid "%s databases have been dropped successfully."
 msgid "%1$d database has been dropped successfully."
@@ -14185,7 +14199,7 @@ msgid "You have revoked the privileges for %s."
 msgstr "\"%s\" фойдаланувчининг привилегиялари бекор қилинди."
 
 #: libraries/server_privileges.lib.php:2059
-#: libraries/server_privileges.lib.php:4290
+#: libraries/server_privileges.lib.php:4316
 #, fuzzy
 #| msgid "Any user"
 msgid "Add user account"
@@ -14379,60 +14393,60 @@ msgstr "\"%s\" ўчирилмоқда"
 msgid "The privileges were reloaded successfully."
 msgstr "Привилегиялар муваффақиятли қайта юкланди."
 
-#: libraries/server_privileges.lib.php:3994
+#: libraries/server_privileges.lib.php:4003
 #, php-format
 msgid "The user %s already exists!"
 msgstr "\"%s\" номли фойдаланувчи мавжуд!"
 
-#: libraries/server_privileges.lib.php:4232
+#: libraries/server_privileges.lib.php:4258
 #, fuzzy, php-format
 #| msgid "Privileges"
 msgid "Privileges for %s"
 msgstr "Привилегиялар"
 
-#: libraries/server_privileges.lib.php:4241
+#: libraries/server_privileges.lib.php:4267
 #: libraries/server_status_processes.lib.php:72
 #: libraries/server_user_groups.lib.php:39
 msgid "User"
 msgstr "Фойдаланувчи"
 
-#: libraries/server_privileges.lib.php:4282
+#: libraries/server_privileges.lib.php:4308
 msgctxt "Create new user"
 msgid "New"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4311
+#: libraries/server_privileges.lib.php:4337
 #, fuzzy
 #| msgid "Edit Privileges"
 msgid "Edit privileges:"
 msgstr "Привилегияларни таҳрирлаш"
 
-#: libraries/server_privileges.lib.php:4312
+#: libraries/server_privileges.lib.php:4338
 #, fuzzy
 #| msgid "User"
 msgid "User account"
 msgstr "Фойдаланувчи"
 
-#: libraries/server_privileges.lib.php:4371
+#: libraries/server_privileges.lib.php:4397
 msgid ""
 "Note: You are attempting to edit privileges of the user with which you are "
 "currently logged in."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4391 libraries/server_users.lib.php:25
+#: libraries/server_privileges.lib.php:4417 libraries/server_users.lib.php:25
 #, fuzzy
 #| msgid "User overview"
 msgid "User accounts overview"
 msgstr "Фойдаланувчилар ҳисобини кўриб чиқиш"
 
-#: libraries/server_privileges.lib.php:4459
+#: libraries/server_privileges.lib.php:4485
 msgid ""
 "A user account allowing any user from localhost to connect is present. This "
 "will prevent other users from connecting if the host part of their account "
 "allows a connection from any (%) host."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4500
+#: libraries/server_privileges.lib.php:4526
 #, php-format
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
@@ -14445,7 +14459,7 @@ msgstr ""
 "маълумотлар сервер томонидан ишлатилаётган привилегиялардан фарқ қилиши "
 "мумкин. Бу ҳолда %sпривилегияларни қайта юклаш%s керак."
 
-#: libraries/server_privileges.lib.php:4519
+#: libraries/server_privileges.lib.php:4545
 #, fuzzy
 #| msgid ""
 #| "Note: phpMyAdmin gets the users' privileges directly from MySQL's "
@@ -14464,26 +14478,26 @@ msgstr ""
 "маълумотлар сервер томонидан ишлатилаётган привилегиялардан фарқ қилиши "
 "мумкин. Бу ҳолда %sпривилегияларни қайта юклаш%s керак."
 
-#: libraries/server_privileges.lib.php:4569
+#: libraries/server_privileges.lib.php:4595
 msgid "The selected user was not found in the privilege table."
 msgstr "Белгиланган фойдаланувчи привилегиялар жадвалида топилмади."
 
-#: libraries/server_privileges.lib.php:4801
+#: libraries/server_privileges.lib.php:4827
 msgid "You have added a new user."
 msgstr "Сиз янги фойдаланувчи қўшдингиз."
 
-#: libraries/server_status.lib.php:53
+#: libraries/server_status.lib.php:60
 #, php-format
 msgid "Network traffic since startup: %s"
 msgstr ""
 
-#: libraries/server_status.lib.php:66
+#: libraries/server_status.lib.php:73
 #, fuzzy, php-format
 #| msgid "This MySQL server has been running for %s. It started up on %s."
 msgid "This MySQL server has been running for %1$s. It started up on %2$s."
 msgstr "MySQL-сервер \"%s\" давомида ишламоқда. Ишга туширилган вақт: \"%s\"."
 
-#: libraries/server_status.lib.php:80
+#: libraries/server_status.lib.php:94
 #, fuzzy
 #| msgid "This server is configured as master in a replication process."
 msgid ""
@@ -14491,23 +14505,23 @@ msgid ""
 "b> process."
 msgstr "Ушбу сервер репликация жараёнида \"бош\" деб конфигурация қилинган."
 
-#: libraries/server_status.lib.php:85
+#: libraries/server_status.lib.php:99
 #, fuzzy
 #| msgid "This server is configured as master in a replication process."
 msgid "This MySQL server works as <b>master</b> in <b>replication</b> process."
 msgstr "Ушбу сервер репликация жараёнида \"бош\" деб конфигурация қилинган."
 
-#: libraries/server_status.lib.php:90
+#: libraries/server_status.lib.php:104
 #, fuzzy
 #| msgid "This server is configured as master in a replication process."
 msgid "This MySQL server works as <b>slave</b> in <b>replication</b> process."
 msgstr "Ушбу сервер репликация жараёнида \"бош\" деб конфигурация қилинган."
 
-#: libraries/server_status.lib.php:106
+#: libraries/server_status.lib.php:116
 msgid "Replication status"
 msgstr "Репликация статуси"
 
-#: libraries/server_status.lib.php:137
+#: libraries/server_status.lib.php:146
 msgid ""
 "On a busy server, the byte counters may overrun, so those statistics as "
 "reported by the MySQL server may be incorrect."
@@ -14515,21 +14529,21 @@ msgstr ""
 "Юқори юкламага эга бўлган серверларда ҳисоблагич тўлиб қолиши мумкин, шунинг "
 "учун, MySQL сервери берган статистик маълумотлар нотўғри бўлиши мумкин."
 
-#: libraries/server_status.lib.php:148
+#: libraries/server_status.lib.php:157
 msgid "Received"
 msgstr "Қабул қилинди"
 
-#: libraries/server_status.lib.php:167
+#: libraries/server_status.lib.php:176
 msgid "Sent"
 msgstr "Юборилди"
 
-#: libraries/server_status.lib.php:234
+#: libraries/server_status.lib.php:243
 #, fuzzy
 #| msgid "max. concurrent connections"
 msgid "Max. concurrent connections"
 msgstr "Максимал уланишлар сони"
 
-#: libraries/server_status.lib.php:244
+#: libraries/server_status.lib.php:253
 msgid "Failed attempts"
 msgstr "Муваффақиятсиз уринишлар сони"
 
@@ -15658,7 +15672,7 @@ msgstr ""
 msgid "Not implemented yet."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/AlterOperation.php:193
+#: libraries/sql-parser/src/Components/AlterOperation.php:191
 #, fuzzy
 #| msgid "Iconic table operations"
 msgid "Unrecognized alter operation."
@@ -15674,7 +15688,7 @@ msgid "An opening bracket followed by a set of values was expected."
 msgstr ""
 
 #: libraries/sql-parser/src/Components/ArrayObj.php:101
-#: libraries/sql-parser/src/Components/FieldDefinition.php:202
+#: libraries/sql-parser/src/Components/CreateDefinition.php:202
 msgid "An opening bracket was expected."
 msgstr ""
 
@@ -15682,25 +15696,35 @@ msgstr ""
 msgid "A comma or a closing bracket was expected"
 msgstr ""
 
+#: libraries/sql-parser/src/Components/CreateDefinition.php:246
+#, fuzzy
+#| msgid "No databases selected."
+msgid "A comma or a closing bracket was expected."
+msgstr "Биронта ҳам маълумотлар базаси танланмаган."
+
+#: libraries/sql-parser/src/Components/CreateDefinition.php:262
+msgid "A closing bracket was expected."
+msgstr ""
+
 #: libraries/sql-parser/src/Components/DataType.php:125
 msgid "Unrecognized data type."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:225
+#: libraries/sql-parser/src/Components/Expression.php:227
 msgid "Unexpected closing bracket."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:246
-#: libraries/sql-parser/src/Components/Expression.php:283
-#: libraries/sql-parser/src/Components/Expression.php:303
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:285
+#: libraries/sql-parser/src/Components/Expression.php:305
 msgid "An alias was previously found."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:257
+#: libraries/sql-parser/src/Components/Expression.php:259
 msgid "Unexpected dot."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:327
+#: libraries/sql-parser/src/Components/Expression.php:329
 #, fuzzy
 #| msgid "No databases selected."
 msgid "An alias was expected."
@@ -15712,16 +15736,6 @@ msgstr "Биронта ҳам маълумотлар базаси танланм
 msgid "An expression was expected."
 msgstr "Амални амалга ошириш учун битта ёки бир нечта қаторни танлаш керак."
 
-#: libraries/sql-parser/src/Components/FieldDefinition.php:246
-#, fuzzy
-#| msgid "No databases selected."
-msgid "A comma or a closing bracket was expected."
-msgstr "Биронта ҳам маълумотлар базаси танланмаган."
-
-#: libraries/sql-parser/src/Components/FieldDefinition.php:262
-msgid "A closing bracket was expected."
-msgstr ""
-
 #: libraries/sql-parser/src/Components/Limit.php:90
 #: libraries/sql-parser/src/Components/Limit.php:112
 msgid "An offset was expected."
@@ -15767,29 +15781,29 @@ msgstr ""
 msgid "Expected delimiter."
 msgstr ""
 
-#: libraries/sql-parser/src/Lexer.php:753
+#: libraries/sql-parser/src/Lexer.php:777
 #, fuzzy, php-format
 #| msgid "Table %1$s has been created."
 msgid "Ending quote %1$s was expected."
 msgstr "%1$s жадвали тузилди."
 
-#: libraries/sql-parser/src/Lexer.php:789
+#: libraries/sql-parser/src/Lexer.php:813
 #, fuzzy
 #| msgid "Table name template"
 msgid "Variable name was expected."
 msgstr "Жадвал номи шаблони"
 
-#: libraries/sql-parser/src/Parser.php:380
+#: libraries/sql-parser/src/Parser.php:391
 #, fuzzy
 #| msgid "At Beginning of Table"
 msgid "Unexpected beginning of statement."
 msgstr "Жадвал бошига"
 
-#: libraries/sql-parser/src/Parser.php:399
+#: libraries/sql-parser/src/Parser.php:410
 msgid "Unrecognized statement type."
 msgstr ""
 
-#: libraries/sql-parser/src/Parser.php:479
+#: libraries/sql-parser/src/Parser.php:489
 msgid "No transaction was previously started."
 msgstr ""
 
@@ -15817,8 +15831,10 @@ msgid "The name of the entity was expected."
 msgstr "Очиқ жадваллар сони."
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:310
-msgid "At least one field definition was expected."
-msgstr ""
+#, fuzzy
+#| msgid "The row has been deleted."
+msgid "At least one column definition was expected."
+msgstr "Ёзув ўчирилди"
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:329
 msgid "A \"RETURNS\" keyword was expected."
@@ -15893,25 +15909,25 @@ msgstr "\"%s\" хатчўпи тузилди"
 msgid "Using bookmark \"%s\" as default browse query."
 msgstr ""
 
-#: libraries/sql.lib.php:1306
+#: libraries/sql.lib.php:1300
 msgid "Showing as PHP code"
 msgstr "PHP-код сифатида кўрсатиш"
 
-#: libraries/sql.lib.php:1638
+#: libraries/sql.lib.php:1632
 #, php-format
 msgid ""
 "Current selection does not contain a unique column. Grid edit, checkbox, "
 "Edit, Copy and Delete features are not available. %s"
 msgstr ""
 
-#: libraries/sql.lib.php:1649
+#: libraries/sql.lib.php:1643
 #, php-format
 msgid ""
 "Current selection does not contain a unique column. Grid edit, Edit, Copy "
 "and Delete features may result in undesired behavior. %s"
 msgstr ""
 
-#: libraries/sql.lib.php:1688
+#: libraries/sql.lib.php:1682
 #, php-format
 msgid "Problems with indexes of table `%s`"
 msgstr "`\"%s\"` жадвалидаги индексларда муаммо мавжуд"
@@ -16083,7 +16099,7 @@ msgid "Version %s snapshot (SQL code)"
 msgstr "%s версия расми (SQL коди)"
 
 #: libraries/tracking.lib.php:947
-#: templates/structure/table_structure_row.phtml:33
+#: templates/table/structure/table_structure_row.phtml:33
 #, fuzzy
 #| msgid "None"
 msgctxt "None for default"
@@ -16147,19 +16163,19 @@ msgstr "\"%s.%s\" жадвалининг %s рақамли версиясини
 msgid "Version %1$s was created, tracking for %2$s is active."
 msgstr "%s версия тузилди, \"%s.%s\" ни кузатишш фаоллаштирилган."
 
-#: libraries/user_preferences.inc.php:29
+#: libraries/user_preferences.inc.php:30
 #, fuzzy
 #| msgid "Other core settings"
 msgid "Manage your settings"
 msgstr "Бошқа созланишлар"
 
-#: libraries/user_preferences.inc.php:46 prefs_manage.php:307
+#: libraries/user_preferences.inc.php:54 prefs_manage.php:307
 #, fuzzy
 #| msgid "Modifications have been saved"
 msgid "Configuration has been saved."
 msgstr "Ўзгариришлар сақланди"
 
-#: libraries/user_preferences.inc.php:66
+#: libraries/user_preferences.inc.php:74
 #, php-format
 msgid ""
 "Your preferences will be saved for current session only. Storing them "
@@ -16592,7 +16608,7 @@ msgid "first"
 msgstr ""
 
 #: templates/columns_definitions/move_column.phtml:12
-#: templates/structure/add_column.phtml:21
+#: templates/table/structure/add_column.phtml:21
 #, fuzzy, php-format
 #| msgid "After %s"
 msgid "after %s"
@@ -16680,241 +16696,350 @@ msgstr "Ўгириш"
 msgid "Input transformation options"
 msgstr "Ўгиришлар параметрлари"
 
-#: templates/designer/aggregate_query_panel.phtml:22
-#: templates/designer/options_panel.phtml:100
+#: templates/database/create_table.phtml:7
+#: templates/database/designer/side_menu.phtml:77
+#: templates/database/designer/side_menu.phtml:80
+msgid "Create table"
+msgstr "Жадвал тузиш"
+
+#: templates/database/create_table.phtml:15
+#, fuzzy
+#| msgid "Number of fields"
+msgid "Number of columns"
+msgstr "Майдонлар сони "
+
+#: templates/database/designer/aggregate_query_panel.phtml:22
+#: templates/database/designer/options_panel.phtml:100
 #, fuzzy
 #| msgid "Create"
 msgid "Aggregate"
 msgstr "Тузиш"
 
-#: templates/designer/aggregate_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:61
-#: templates/designer/options_panel.phtml:106
-#: templates/designer/options_panel.phtml:170
-#: templates/designer/where_query_panel.phtml:30
-#: templates/table/table_header.phtml:9
+#: templates/database/designer/aggregate_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:61
+#: templates/database/designer/options_panel.phtml:106
+#: templates/database/designer/options_panel.phtml:170
+#: templates/database/designer/where_query_panel.phtml:30
+#: templates/table/search/table_header.phtml:9
 msgid "Operator"
 msgstr "Оператор"
 
-#: templates/designer/database_tables.phtml:29
+#: templates/database/designer/database_tables.phtml:29
 msgid "Toggle"
 msgstr ""
 
-#: templates/designer/database_tables.phtml:40
+#: templates/database/designer/database_tables.phtml:40
 #, fuzzy
 #| msgid "Database for user"
 msgid "See table structure"
 msgstr "Фойдаланувчи учун маълумотлар базаси"
 
-#: templates/designer/delete_relation_panel.phtml:21
+#: templates/database/designer/delete_relation_panel.phtml:21
 msgid "Delete relation"
 msgstr "Боғлиқликни ўчириш"
 
-#: templates/designer/edit_delete_pages.phtml:7
+#: templates/database/designer/edit_delete_pages.phtml:7
 #, fuzzy
 #| msgid "Page number:"
 msgid "Page to open"
 msgstr "Саҳифа рақами: "
 
-#: templates/designer/edit_delete_pages.phtml:7
+#: templates/database/designer/edit_delete_pages.phtml:7
 #, fuzzy
 #| msgid "Relation deleted"
 msgid "Page to delete"
 msgstr "Алоқа ўчирилди"
 
-#: templates/designer/having_query_panel.phtml:90
-#: templates/designer/options_panel.phtml:63
-#: templates/designer/options_panel.phtml:229
-#: templates/designer/where_query_panel.phtml:59
+#: templates/database/designer/having_query_panel.phtml:90
+#: templates/database/designer/options_panel.phtml:63
+#: templates/database/designer/options_panel.phtml:229
+#: templates/database/designer/where_query_panel.phtml:59
 #, fuzzy
 #| msgid "Export"
 msgid "Except"
 msgstr "Экспорт"
 
-#: templates/designer/having_query_panel.phtml:102
-#: templates/designer/options_panel.phtml:75
-#: templates/designer/options_panel.phtml:241
-#: templates/designer/where_query_panel.phtml:71
+#: templates/database/designer/having_query_panel.phtml:102
+#: templates/database/designer/options_panel.phtml:75
+#: templates/database/designer/options_panel.phtml:241
+#: templates/database/designer/where_query_panel.phtml:71
 #, fuzzy
 #| msgid "in query"
 msgid "subquery"
 msgstr "сўров бўйича"
 
-#: templates/designer/new_relation_panel.phtml:22
-#: templates/designer/side_menu.phtml:84 templates/designer/side_menu.phtml:87
+#: templates/database/designer/new_relation_panel.phtml:22
+#: templates/database/designer/side_menu.phtml:84
+#: templates/database/designer/side_menu.phtml:87
 msgid "Create relation"
 msgstr "Боғлиқлик ўрнатиш"
 
-#: templates/designer/options_panel.phtml:34
-#: templates/designer/options_panel.phtml:200
+#: templates/database/designer/options_panel.phtml:34
+#: templates/database/designer/options_panel.phtml:200
 #, fuzzy
 #| msgid "Relation deleted"
 msgid "Relation operator"
 msgstr "Алоқа ўчирилди"
 
-#: templates/designer/options_panel.phtml:85
-#: templates/designer/rename_to_panel.phtml:23
+#: templates/database/designer/options_panel.phtml:85
+#: templates/database/designer/rename_to_panel.phtml:23
 #, fuzzy
 #| msgid "Rename view to"
 msgid "Rename to"
 msgstr "Кўриниш номини ўзгартириш"
 
-#: templates/designer/options_panel.phtml:91
-#: templates/designer/rename_to_panel.phtml:31
+#: templates/database/designer/options_panel.phtml:91
+#: templates/database/designer/rename_to_panel.phtml:31
 #, fuzzy
 #| msgid "User name"
 msgid "New name"
 msgstr "Фойдаланувчи номи"
 
-#: templates/designer/page_save_as.phtml:4
+#: templates/database/designer/page_save_as.phtml:4
 #, fuzzy
 #| msgid "Export/Import to scale"
 msgid "Save to selected page"
 msgstr "Масштаб"
 
-#: templates/designer/page_save_as.phtml:5
+#: templates/database/designer/page_save_as.phtml:5
 #, fuzzy
 #| msgid "Create a new index"
 msgid "Create a page and save to it"
 msgstr "Янги индекс тузиш"
 
-#: templates/designer/page_save_as.phtml:26
+#: templates/database/designer/page_save_as.phtml:26
 #, fuzzy
 #| msgid "User name"
 msgid "New page name"
 msgstr "Фойдаланувчи номи"
 
-#: templates/designer/page_selector.phtml:2
+#: templates/database/designer/page_selector.phtml:2
 #, fuzzy
 #| msgid "Select Tables"
 msgid "Select page"
 msgstr "Жадвалларни танланг"
 
-#: templates/designer/query_details.phtml:10
+#: templates/database/designer/query_details.phtml:10
 #, fuzzy
 #| msgid "Table options"
 msgid "Active options"
 msgstr "Жадвал параметрлари"
 
-#: templates/designer/schema_export.phtml:4
+#: templates/database/designer/schema_export.phtml:4
 msgid "Select Export Relational Type"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:19 templates/designer/side_menu.phtml:25
+#: templates/database/designer/side_menu.phtml:19
+#: templates/database/designer/side_menu.phtml:25
 #, fuzzy
 #| msgid "Show tables"
 msgid "Show/Hide tables list"
 msgstr "Жадвалларни кўрсатиш"
 
-#: templates/designer/side_menu.phtml:29 templates/designer/side_menu.phtml:35
-#: templates/designer/side_menu.phtml:36
+#: templates/database/designer/side_menu.phtml:29
+#: templates/database/designer/side_menu.phtml:35
+#: templates/database/designer/side_menu.phtml:36
 msgid "View in fullscreen"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:34
+#: templates/database/designer/side_menu.phtml:34
 msgid "Exit fullscreen"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:41 templates/designer/side_menu.phtml:45
+#: templates/database/designer/side_menu.phtml:41
+#: templates/database/designer/side_menu.phtml:45
 #, fuzzy
 #| msgid "User name"
 msgid "New page"
 msgstr "Фойдаланувчи номи"
 
-#: templates/designer/side_menu.phtml:70 templates/designer/side_menu.phtml:73
+#: templates/database/designer/side_menu.phtml:70
+#: templates/database/designer/side_menu.phtml:73
 #, fuzzy
 #| msgid "Select Tables"
 msgid "Delete pages"
 msgstr "Жадвалларни танланг"
 
-#: templates/designer/side_menu.phtml:77 templates/designer/side_menu.phtml:80
-#: templates/table/create_table.phtml:7
-msgid "Create table"
-msgstr "Жадвал тузиш"
-
-#: templates/designer/side_menu.phtml:98
-#: templates/designer/side_menu.phtml:101
+#: templates/database/designer/side_menu.phtml:98
+#: templates/database/designer/side_menu.phtml:101
 msgid "Reload"
 msgstr "Қайта юклаш"
 
-#: templates/designer/side_menu.phtml:107
-#: templates/designer/side_menu.phtml:110
+#: templates/database/designer/side_menu.phtml:107
+#: templates/database/designer/side_menu.phtml:110
 msgid "Help"
 msgstr "Ёрдам"
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Angular links"
 msgstr "Бурчакли боғланишлар"
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Direct links"
 msgstr "Тўғридан-тўғри боғланишлар"
 
-#: templates/designer/side_menu.phtml:122
-#: templates/designer/side_menu.phtml:124
+#: templates/database/designer/side_menu.phtml:122
+#: templates/database/designer/side_menu.phtml:124
 msgid "Snap to grid"
 msgstr "Тўрга боғлаб қўйиш"
 
-#: templates/designer/side_menu.phtml:128
-#: templates/designer/side_menu.phtml:134
+#: templates/database/designer/side_menu.phtml:128
+#: templates/database/designer/side_menu.phtml:134
 msgid "Small/Big All"
 msgstr "Барча жадваллар кўрсатилишини Тахлаш/Тиклаш"
 
-#: templates/designer/side_menu.phtml:138
-#: templates/designer/side_menu.phtml:141
+#: templates/database/designer/side_menu.phtml:138
+#: templates/database/designer/side_menu.phtml:141
 msgid "Toggle small/big"
 msgstr "Тескари кўрсатиш"
 
-#: templates/designer/side_menu.phtml:145
-#: templates/designer/side_menu.phtml:148
+#: templates/database/designer/side_menu.phtml:145
+#: templates/database/designer/side_menu.phtml:148
 #, fuzzy
 #| msgid "To select relation, click :"
 msgid "Toggle relation lines"
 msgstr "Алоқани танлаш учун расмда кўрсатилганикаби уланиш нуқтасига босинг:"
 
-#: templates/designer/side_menu.phtml:153
-#: templates/designer/side_menu.phtml:156
+#: templates/database/designer/side_menu.phtml:153
+#: templates/database/designer/side_menu.phtml:156
 #, fuzzy
 #| msgid "Export"
 msgid "Export schema"
 msgstr "Экспорт"
 
-#: templates/designer/side_menu.phtml:165
-#: templates/designer/side_menu.phtml:168
+#: templates/database/designer/side_menu.phtml:165
+#: templates/database/designer/side_menu.phtml:168
 #, fuzzy
 #| msgid "Submit Query"
 msgid "Build Query"
 msgstr "сўровни бажариш"
 
-#: templates/designer/side_menu.phtml:173
-#: templates/designer/side_menu.phtml:177
+#: templates/database/designer/side_menu.phtml:173
+#: templates/database/designer/side_menu.phtml:177
 msgid "Move Menu"
 msgstr "Менюни кўчириш"
 
-#: templates/designer/side_menu.phtml:181
-#: templates/designer/side_menu.phtml:186
+#: templates/database/designer/side_menu.phtml:181
+#: templates/database/designer/side_menu.phtml:186
 #, fuzzy
 #| msgid "Partial Texts"
 msgid "Pin text"
 msgstr "Маълумотларни қисқартириб кўрсатиш"
 
-#: templates/designer/table_list.phtml:4
+#: templates/database/designer/table_list.phtml:4
 msgid "Hide/Show all"
 msgstr "Барча жадвалларни яшириш/кўрсатиш"
 
-#: templates/designer/table_list.phtml:14
+#: templates/database/designer/table_list.phtml:14
 msgid "Hide/Show Tables with no relation"
 msgstr "Алоқа мавжуд бўлмаган жадвалларни яшириш/кўрсатиш"
 
-#: templates/designer/table_list.phtml:59
+#: templates/database/designer/table_list.phtml:59
 #, fuzzy
 #| msgid "Number of tables"
 msgid "Number of tables:"
 msgstr "Жадваллар сони"
 
+#: templates/database/structure/body_for_table_summary.phtml:6
+#, fuzzy, php-format
+msgid "%s table"
+msgid_plural "%s tables"
+msgstr[0] "%s та жадвал"
+msgstr[1] ""
+
+#: templates/database/structure/body_for_table_summary.phtml:17
+msgid "Sum"
+msgstr "Жами"
+
+#: templates/database/structure/check_all_tables.phtml:6
+msgid "Check tables having overhead"
+msgstr "Оптималлаштириш лозим бўлгн жадвалларни белгилаш"
+
+#: templates/database/structure/check_all_tables.phtml:10
+#, fuzzy
+#| msgid "Show color"
+msgid "Show create"
+msgstr "Рангда кўрсатиш"
+
+#: templates/database/structure/check_all_tables.phtml:27
+#, fuzzy
+#| msgid "Apply index(s)"
+msgid "Prefix"
+msgstr "Индекс(лар)ни сақлаш"
+
+#: templates/database/structure/check_all_tables.phtml:28
+msgid "Add prefix to table"
+msgstr "Жадвалга префикс қўшиш"
+
+#: templates/database/structure/check_all_tables.phtml:29
+msgid "Replace table prefix"
+msgstr "Жадвал префиксини алмаштириш"
+
+#: templates/database/structure/check_all_tables.phtml:30
+msgid "Copy table with prefix"
+msgstr "Жадвални префикси билан нусхалаш"
+
+#: templates/database/structure/check_all_tables.phtml:36
+#, fuzzy
+#| msgid "CHAR textarea columns"
+msgid "Add columns to central list"
+msgstr "CHAR майдонидаги устунлар сони"
+
+#: templates/database/structure/check_all_tables.phtml:37
+msgid "Remove columns from central list"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:38
+#, fuzzy
+#| msgid "CHAR textarea columns"
+msgid "Make consistent with central list"
+msgstr "CHAR майдонидаги устунлар сони"
+
+#: templates/database/structure/favorite_anchor.phtml:12
+#, fuzzy
+#| msgid "Add a new server"
+msgid "Add to Favorites"
+msgstr "Янги фойдаланувчи қўшиш"
+
+#: templates/database/structure/show_create.phtml:2
+#, fuzzy
+#| msgid "Show SQL queries"
+msgid "Showing create queries"
+msgstr "Show SQL сўровларини кўрсатиш"
+
+#: templates/database/structure/sortable_header.phtml:13
+msgid "Sort"
+msgstr "Сортировка қилиш"
+
+#: templates/database/structure/table_header.phtml:42
+#, fuzzy
+#| msgid "May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]"
+msgid ""
+"May be approximate. Click on the number to get the exact count. See "
+"[doc@faq3-11]FAQ 3.11[/doc]."
+msgstr "Тахминий бўлиши мумкин. [doc@faq3-11]\"FAQ 3.11\"[/doc]га қаранг"
+
+#: templates/database/structure/table_header.phtml:66
+#: templates/table/index_form.phtml:127
+msgid "Size"
+msgstr "Ҳажми"
+
+#: templates/database/structure/table_header.phtml:74
+#: templates/table/structure/display_table_stats.phtml:27
+msgid "Overhead"
+msgstr "Фрагментланган"
+
+#: templates/database/structure/tracking_icon.phtml:4
+msgid "Tracking is active."
+msgstr "Кузатиш фаол."
+
+#: templates/database/structure/tracking_icon.phtml:8
+msgid "Tracking is not active."
+msgstr "Кузатиш фаол эмас."
+
 #: templates/error/report_form.phtml:7
 msgid ""
 "phpMyAdmin has encountered an error. We have collected data about this error "
@@ -16930,73 +17055,6 @@ msgstr ""
 msgid "Please explain the steps that lead to the error:"
 msgstr ""
 
-#: templates/gis_visualization/gis_visualization.phtml:3
-#, fuzzy
-#| msgid "Display servers selection"
-msgid "Display GIS Visualization"
-msgstr "Сервер танловини кўрсатиш"
-
-#: templates/gis_visualization/gis_visualization.phtml:8
-#, fuzzy
-#| msgid "CHAR textarea columns"
-msgid "Label column"
-msgstr "CHAR майдонидаги устунлар сони"
-
-#: templates/gis_visualization/gis_visualization.phtml:11
-#, fuzzy
-#| msgid "- none -"
-msgid "-- None --"
-msgstr "- йўқ -"
-
-#: templates/gis_visualization/gis_visualization.phtml:19
-#, fuzzy
-#| msgid "Log file count"
-msgid "Spatial column"
-msgstr "Журнал файллари сони"
-
-#: templates/index_form.phtml:16
-msgid "Index name:"
-msgstr "Индекс номи:"
-
-#: templates/index_form.phtml:19
-msgid ""
-"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
-msgstr "\"PRIMARY\" номи <b>фақат</b> бирламчи индексгаэга бўлиши шарт!"
-
-#: templates/index_form.phtml:40
-#, fuzzy
-#| msgid "Index cache size"
-msgid "Index choice:"
-msgstr "Индекс кеши ҳажми"
-
-#: templates/index_form.phtml:57
-msgid "Key block size:"
-msgstr ""
-
-#: templates/index_form.phtml:74
-msgid "Index type:"
-msgstr "Индекс тури:"
-
-#: templates/index_form.phtml:86
-#, fuzzy
-#| msgid "User"
-msgid "Parser:"
-msgstr "Фойдаланувчи"
-
-#: templates/index_form.phtml:102
-#, fuzzy
-#| msgid "Comment"
-msgid "Comment:"
-msgstr "Изоҳ"
-
-#: templates/index_form.phtml:127 templates/structure/table_header.phtml:66
-msgid "Size"
-msgstr "Ҳажми"
-
-#: templates/index_form.phtml:149 templates/index_form.phtml:190
-msgid "Drag to reorder"
-msgstr ""
-
 #: templates/prefs_autoload.phtml:9
 msgid ""
 "Your browser has phpMyAdmin configuration for this domain. Would you like to "
@@ -17009,439 +17067,188 @@ msgstr ""
 msgid "Start row:"
 msgstr "Бошлаш"
 
-#: templates/structure/actions_in_table_structure.phtml:14
-#, php-format
-msgid "A primary key has been added on %s."
-msgstr "\"%s\" га бирламчи калит қўшилди."
-
-#: templates/structure/actions_in_table_structure.phtml:34
-#: templates/structure/actions_in_table_structure.phtml:54
-#: templates/structure/actions_in_table_structure.phtml:79
-#: templates/structure/actions_in_table_structure.phtml:101
-#, php-format
-msgid "An index has been added on %s."
-msgstr "\"%s\" учун индекс қўшилди."
-
-#: templates/structure/actions_in_table_structure.phtml:130
-#: templates/structure/check_all_table_column.phtml:59
-#, fuzzy
-#| msgid "Remove column(s)"
-msgid "Remove from central columns"
-msgstr "Устун(лар)ни олиб ташлаш"
-
-#: templates/structure/actions_in_table_structure.phtml:138
-#: templates/structure/check_all_table_column.phtml:55
-#, fuzzy
-#| msgid "CHAR textarea columns"
-msgid "Add to central columns"
-msgstr "CHAR майдонидаги устунлар сони"
-
-#: templates/structure/add_column.phtml:7
-#, fuzzy, php-format
-#| msgid "Add column(s)"
-msgid "Add %s column(s)"
-msgstr "Устун(лар) қўшиш"
-
-#: templates/structure/add_column.phtml:12
-#, fuzzy
-#| msgid "At Beginning of Table"
-msgid "at beginning of table"
-msgstr "Жадвал бошига"
-
-#: templates/structure/body_for_table_summary.phtml:6
-#, fuzzy, php-format
-msgid "%s table"
-msgid_plural "%s tables"
-msgstr[0] "%s та жадвал"
-msgstr[1] ""
-
-#: templates/structure/body_for_table_summary.phtml:17
-msgid "Sum"
-msgstr "Жами"
-
-#: templates/structure/check_all_tables.phtml:6
-msgid "Check tables having overhead"
-msgstr "Оптималлаштириш лозим бўлгн жадвалларни белгилаш"
-
-#: templates/structure/check_all_tables.phtml:10
-#, fuzzy
-#| msgid "Show color"
-msgid "Show create"
-msgstr "Рангда кўрсатиш"
-
-#: templates/structure/check_all_tables.phtml:27
-#, fuzzy
-#| msgid "Apply index(s)"
-msgid "Prefix"
-msgstr "Индекс(лар)ни сақлаш"
-
-#: templates/structure/check_all_tables.phtml:28
-msgid "Add prefix to table"
-msgstr "Жадвалга префикс қўшиш"
-
-#: templates/structure/check_all_tables.phtml:29
-msgid "Replace table prefix"
-msgstr "Жадвал префиксини алмаштириш"
-
-#: templates/structure/check_all_tables.phtml:30
-msgid "Copy table with prefix"
-msgstr "Жадвални префикси билан нусхалаш"
-
-#: templates/structure/check_all_tables.phtml:36
-#, fuzzy
-#| msgid "CHAR textarea columns"
-msgid "Add columns to central list"
-msgstr "CHAR майдонидаги устунлар сони"
-
-#: templates/structure/check_all_tables.phtml:37
-msgid "Remove columns from central list"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:38
-#, fuzzy
-#| msgid "CHAR textarea columns"
-msgid "Make consistent with central list"
-msgstr "CHAR майдонидаги устунлар сони"
-
-#: templates/structure/display_structure.phtml:140 view_create.php:181
-#, fuzzy
-#| msgid "Print view"
-msgid "Edit view"
-msgstr "Чоп этиш версияси"
-
-#: templates/structure/display_table_stats.phtml:9
-msgid "Space usage"
-msgstr "Фойдаланилаётган жой"
-
-#: templates/structure/display_table_stats.phtml:27
-#: templates/structure/table_header.phtml:74
-msgid "Overhead"
-msgstr "Фрагментланган"
-
-#: templates/structure/display_table_stats.phtml:32
-msgid "Effective"
-msgstr "Эффективлик"
-
-#: templates/structure/favorite_anchor.phtml:12
-#, fuzzy
-#| msgid "Add a new server"
-msgid "Add to Favorites"
-msgstr "Янги фойдаланувчи қўшиш"
-
-#: templates/structure/move_columns_dialog.phtml:1
-#: templates/structure/optional_action_links.phtml:21
-#, fuzzy
-#| msgid "Remove column(s)"
-msgid "Move columns"
-msgstr "Устун(лар)ни олиб ташлаш"
-
-#: templates/structure/move_columns_dialog.phtml:2
-msgid "Move the columns by dragging them up and down."
-msgstr ""
-
-#: templates/structure/optional_action_links.phtml:9
-msgid "Propose table structure"
-msgstr "Жадвал тузилиши таҳлили"
-
-#: templates/structure/optional_action_links.phtml:24
-#, fuzzy
-#| msgid "Propose table structure"
-msgid "Improve table structure"
-msgstr "Жадвал тузилиши таҳлили"
-
-#: templates/structure/optional_action_links.phtml:30
-#, fuzzy
-#| msgid "Track table"
-msgid "Track view"
-msgstr "Жадвални кузатиш"
-
-#: templates/structure/row_stats_table.phtml:3
-#, fuzzy
-#| msgid "Row Statistics"
-msgid "Row statistics"
-msgstr "Қаторлар статистикаси"
-
-#: templates/structure/row_stats_table.phtml:9
-msgid "static"
-msgstr "статик"
-
-#: templates/structure/row_stats_table.phtml:11
-msgid "dynamic"
-msgstr "динамик"
-
-#: templates/structure/row_stats_table.phtml:22
-msgid "partitioned"
-msgstr "бўлакларга бўлинган"
-
-#: templates/structure/row_stats_table.phtml:54
-msgid "Row length"
-msgstr "Қатор узунлиги"
-
-#: templates/structure/row_stats_table.phtml:66
-msgid "Row size"
-msgstr "Қатор ҳажми"
-
-#: templates/structure/row_stats_table.phtml:73
-msgid "Next autoindex"
-msgstr ""
-
-#: templates/structure/secondary_tabs.phtml:14
-#, fuzzy
-#| msgid "Relation view"
-msgid "Relation view"
-msgstr "Алоқаларни кўриш"
-
-#: templates/structure/show_create.phtml:2
-#, fuzzy
-#| msgid "Show SQL queries"
-msgid "Showing create queries"
-msgstr "Show SQL сўровларини кўрсатиш"
-
-#: templates/structure/sortable_header.phtml:13
-msgid "Sort"
-msgstr "Сортировка қилиш"
-
-#: templates/structure/table_header.phtml:42
-#, fuzzy
-#| msgid "May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]"
-msgid ""
-"May be approximate. Click on the number to get the exact count. See "
-"[doc@faq3-11]FAQ 3.11[/doc]."
-msgstr "Тахминий бўлиши мумкин. [doc@faq3-11]\"FAQ 3.11\"[/doc]га қаранг"
-
-#: templates/structure/table_structure_row.phtml:46
-#, fuzzy, php-format
-#| msgid "Table %s has been dropped."
-msgid "Column %s has been dropped."
-msgstr "\"%s\" жадвали ўчирилди"
-
-#: templates/structure/tracking_icon.phtml:4
-msgid "Tracking is active."
-msgstr "Кузатиш фаол."
-
-#: templates/structure/tracking_icon.phtml:8
-msgid "Tracking is not active."
-msgstr "Кузатиш фаол эмас."
-
-#: templates/table/create_table.phtml:15
-#, fuzzy
-#| msgid "Number of fields"
-msgid "Number of columns"
-msgstr "Майдонлар сони "
-
-#: templates/table/options.phtml:8
-#, fuzzy
-#| msgid "Select fields (at least one):"
-msgid "Select columns (at least one):"
-msgstr "Майдонни танланг (камида битта):"
-
-#: templates/table/options.phtml:37
-msgid "Add search conditions (body of the \"where\" clause):"
-msgstr "Қидириш шартини кўшиш (яъни \"where\" жумласи):"
-
-#: templates/table/options.phtml:45
-msgid "Number of rows per page"
-msgstr "Саҳифадаги қаторлар сони"
-
-#: templates/table/options.phtml:56
-msgid "Display order:"
-msgstr "Сортировка:"
-
-#: templates/table/options_zoom.phtml:6
-msgid "Use this column to label each point"
-msgstr ""
-
-#: templates/table/options_zoom.phtml:35
-#, fuzzy
-#| msgid "Maximum number of rows to display"
-msgid "Maximum rows to plot"
-msgstr "Кўрсатиладиган қаторларнинг максимал сони"
-
-#: templates/table/replace_preview.phtml:13
-msgid "Find and replace - preview"
-msgstr ""
-
-#: templates/table/replace_preview.phtml:18
-#, fuzzy
-#| msgid "Original position"
-msgid "Original string"
-msgstr "Асл позиция"
-
-#: templates/table/replace_preview.phtml:19
-#, fuzzy
-#| msgid "Relations"
-msgid "Replaced string"
-msgstr "Алоқалар"
-
-#: templates/table/replace_preview.phtml:40
-#, fuzzy
-#| msgid "Replication"
-msgid "Replace"
-msgstr "Репликация (захира нусха кўчириш)"
-
-#: templates/table/rows_zoom.phtml:16
-#, fuzzy
-#| msgid "SQL Query box"
-msgid "Additional search criteria"
-msgstr "SQL сўровлари қутиси"
-
-#: templates/table/search_and_replace.phtml:3
-#, fuzzy
-#| msgid "Replace NULL by"
-msgid "Replace with:"
-msgstr "NULL қийматни қуйидагига алмаштириш"
-
-#: templates/table/search_and_replace.phtml:22
-#, fuzzy
-#| msgid "as regular expression"
-msgid "Use regular expression"
-msgstr "мунтазам ибора"
-
-#: templates/table/selection_form.phtml:12
-#, fuzzy
-#| msgid "Do a \"query by example\" (wildcard: \"%\")"
-msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
-msgstr "\"Намунадаги сўровни бажариш\" (ўрнига қўйиш белгиси: \"%\")"
-
-#: templates/table/selection_form.phtml:34
-msgid "Do a \"query by example\" (wildcard: \"%\")"
-msgstr "\"Намунадаги сўровни бажариш\" (ўрнига қўйиш белгиси: \"%\")"
-
-#: templates/table/zoom_result_form.phtml:7
-msgid "Browse/Edit the points"
-msgstr ""
-
-#: templates/table/zoom_result_form.phtml:15
-#, fuzzy
-#| msgid "Control user"
-msgid "How to use"
-msgstr "Назорат фойдаланувчиси"
-
-#: templates/table/zoom_result_form.phtml:23
-#, fuzzy
-#| msgid "Reset"
-msgid "Reset zoom"
-msgstr "Тозалаш"
-
-#: templates/tbl_chart.phtml:17
+#: templates/table/chart/tbl_chart.phtml:17
 #, fuzzy
 #| msgid "Mar"
 msgctxt "Chart type"
 msgid "Bar"
 msgstr "Мар"
 
-#: templates/tbl_chart.phtml:21
+#: templates/table/chart/tbl_chart.phtml:21
 #, fuzzy
 #| msgid "Column names"
 msgctxt "Chart type"
 msgid "Column"
 msgstr "Майдон номлари"
 
-#: templates/tbl_chart.phtml:25
+#: templates/table/chart/tbl_chart.phtml:25
 msgctxt "Chart type"
 msgid "Line"
 msgstr ""
 
-#: templates/tbl_chart.phtml:29
+#: templates/table/chart/tbl_chart.phtml:29
 #, fuzzy
 #| msgid "Engines"
 msgctxt "Chart type"
 msgid "Spline"
 msgstr "Жадвал турлари"
 
-#: templates/tbl_chart.phtml:33
+#: templates/table/chart/tbl_chart.phtml:33
 msgctxt "Chart type"
 msgid "Area"
 msgstr ""
 
-#: templates/tbl_chart.phtml:37
+#: templates/table/chart/tbl_chart.phtml:37
 #, fuzzy
 #| msgid "PiB"
 msgctxt "Chart type"
 msgid "Pie"
 msgstr "ПБ"
 
-#: templates/tbl_chart.phtml:41
+#: templates/table/chart/tbl_chart.phtml:41
 #, fuzzy
 #| msgid "Time"
 msgctxt "Chart type"
 msgid "Timeline"
 msgstr "Вақт"
 
-#: templates/tbl_chart.phtml:45
+#: templates/table/chart/tbl_chart.phtml:45
 msgctxt "Chart type"
 msgid "Scatter"
 msgstr ""
 
-#: templates/tbl_chart.phtml:50
+#: templates/table/chart/tbl_chart.phtml:50
 #, fuzzy
 #| msgid "Packed"
 msgid "Stacked"
 msgstr "Қисилган"
 
-#: templates/tbl_chart.phtml:53
+#: templates/table/chart/tbl_chart.phtml:53
 #, fuzzy
 #| msgid "Report title"
 msgid "Chart title"
 msgstr "Ҳисобот сарлавҳаси"
 
-#: templates/tbl_chart.phtml:57
+#: templates/table/chart/tbl_chart.phtml:57
 msgid "X-Axis:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:72
+#: templates/table/chart/tbl_chart.phtml:72
 #, fuzzy
 #| msgid "SQL queries"
 msgid "Series:"
 msgstr "SQL сўровлари"
 
-#: templates/tbl_chart.phtml:102
+#: templates/table/chart/tbl_chart.phtml:102
 msgid "X-Axis label:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:104
+#: templates/table/chart/tbl_chart.phtml:104
 #, fuzzy
 #| msgid "Value"
 msgid "X Values"
 msgstr "Қиймати"
 
-#: templates/tbl_chart.phtml:107
+#: templates/table/chart/tbl_chart.phtml:107
 msgid "Y-Axis label:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:115
+#: templates/table/chart/tbl_chart.phtml:115
 msgid "Series names are in a column"
 msgstr ""
 
-#: templates/tbl_chart.phtml:118
+#: templates/table/chart/tbl_chart.phtml:118
 #, fuzzy
 #| msgid "Inside column:"
 msgid "Series column:"
 msgstr "Майдондан:"
 
-#: templates/tbl_chart.phtml:130
+#: templates/table/chart/tbl_chart.phtml:130
 #, fuzzy
 #| msgid "Values for column %s"
 msgid "Value Column:"
 msgstr "%s устуни учун қийматлар"
 
-#: templates/tbl_chart.phtml:150
+#: templates/table/chart/tbl_chart.phtml:150
 #, fuzzy
 #| msgid "Save as file"
 msgid "Save chart as image"
 msgstr "Файл каби сақлаш"
 
-#: templates/tbl_relation/common_form.phtml:7
+#: templates/table/gis_visualization/gis_visualization.phtml:3
+#, fuzzy
+#| msgid "Display servers selection"
+msgid "Display GIS Visualization"
+msgstr "Сервер танловини кўрсатиш"
+
+#: templates/table/gis_visualization/gis_visualization.phtml:8
+#, fuzzy
+#| msgid "CHAR textarea columns"
+msgid "Label column"
+msgstr "CHAR майдонидаги устунлар сони"
+
+#: templates/table/gis_visualization/gis_visualization.phtml:11
+#, fuzzy
+#| msgid "- none -"
+msgid "-- None --"
+msgstr "- йўқ -"
+
+#: templates/table/gis_visualization/gis_visualization.phtml:19
+#, fuzzy
+#| msgid "Log file count"
+msgid "Spatial column"
+msgstr "Журнал файллари сони"
+
+#: templates/table/index_form.phtml:16
+msgid "Index name:"
+msgstr "Индекс номи:"
+
+#: templates/table/index_form.phtml:19
+msgid ""
+"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
+msgstr "\"PRIMARY\" номи <b>фақат</b> бирламчи индексгаэга бўлиши шарт!"
+
+#: templates/table/index_form.phtml:40
+#, fuzzy
+#| msgid "Index cache size"
+msgid "Index choice:"
+msgstr "Индекс кеши ҳажми"
+
+#: templates/table/index_form.phtml:57
+msgid "Key block size:"
+msgstr ""
+
+#: templates/table/index_form.phtml:74
+msgid "Index type:"
+msgstr "Индекс тури:"
+
+#: templates/table/index_form.phtml:86
+#, fuzzy
+#| msgid "User"
+msgid "Parser:"
+msgstr "Фойдаланувчи"
+
+#: templates/table/index_form.phtml:102
+#, fuzzy
+#| msgid "Comment"
+msgid "Comment:"
+msgstr "Изоҳ"
+
+#: templates/table/index_form.phtml:149 templates/table/index_form.phtml:190
+msgid "Drag to reorder"
+msgstr ""
+
+#: templates/table/relation/common_form.phtml:7
 msgid "Internal relations"
 msgstr "Ички алоқалар"
 
-#: templates/tbl_relation/common_form.phtml:11
+#: templates/table/relation/common_form.phtml:11
 #, fuzzy
 #| msgid "Internal relations"
 msgid "Internal relation"
 msgstr "Ички алоқалар"
 
-#: templates/tbl_relation/common_form.phtml:14
+#: templates/table/relation/common_form.phtml:14
 msgid ""
 "An internal relation is not necessary when a corresponding FOREIGN KEY "
 "relation exists."
@@ -17449,63 +17256,279 @@ msgstr ""
 "Агар ташқи калит (FOREIGN KEY) орқали алоқа мавжуд бўлса, ички алоқа ўрнатиш "
 "шарт эмас."
 
-#: templates/tbl_relation/common_form.phtml:37
+#: templates/table/relation/common_form.phtml:37
 #, fuzzy
 #| msgid "Foreign key limit"
 msgid "Foreign key constraints"
 msgstr "Ташқи калит чегаралари"
 
-#: templates/tbl_relation/common_form.phtml:40
+#: templates/table/relation/common_form.phtml:40
 msgid "Actions"
 msgstr "Амаллар"
 
-#: templates/tbl_relation/common_form.phtml:41
+#: templates/table/relation/common_form.phtml:41
 #, fuzzy
 #| msgid "Constraints for table"
 msgid "Constraint properties"
 msgstr "Жадвалларнинг ташқи калитида чекловлар"
 
-#: templates/tbl_relation/common_form.phtml:44
+#: templates/table/relation/common_form.phtml:44
 msgid ""
 "Only columns with index will be displayed. You can define an index below."
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:49
+#: templates/table/relation/common_form.phtml:49
 #, fuzzy
 #| msgid "Foreign key limit"
 msgid "Foreign key constraint"
 msgstr "Ташқи калит чегаралари"
 
-#: templates/tbl_relation/common_form.phtml:81
+#: templates/table/relation/common_form.phtml:81
 #, fuzzy
 #| msgid "Add constraints"
 msgid "+ Add constraint"
 msgstr "Чекловлар қўшиш"
 
-#: templates/tbl_relation/common_form.phtml:91
+#: templates/table/relation/common_form.phtml:91
 #, fuzzy
 #| msgid "Choose field to display"
 msgid "Choose column to display:"
 msgstr "Кўрсатиладиган майдонни танлаш"
 
-#: templates/tbl_relation/foreign_key_row.phtml:13
+#: templates/table/relation/foreign_key_row.phtml:13
 #, fuzzy, php-format
 #| msgid "Foreign key limit"
 msgid "Foreign key constraint %s has been dropped"
 msgstr "Ташқи калит чегаралари"
 
-#: templates/tbl_relation/foreign_key_row.phtml:102
+#: templates/table/relation/foreign_key_row.phtml:102
 #, fuzzy
 #| msgid "Constraints for table"
 msgid "Constraint name"
 msgstr "Жадвалларнинг ташқи калитида чекловлар"
 
-#: templates/tbl_relation/foreign_key_row.phtml:157
+#: templates/table/relation/foreign_key_row.phtml:157
 #, fuzzy
 #| msgid "Add column(s)"
 msgid "+ Add column"
 msgstr "Устун(лар) қўшиш"
 
+#: templates/table/search/options.phtml:8
+#, fuzzy
+#| msgid "Select fields (at least one):"
+msgid "Select columns (at least one):"
+msgstr "Майдонни танланг (камида битта):"
+
+#: templates/table/search/options.phtml:37
+msgid "Add search conditions (body of the \"where\" clause):"
+msgstr "Қидириш шартини кўшиш (яъни \"where\" жумласи):"
+
+#: templates/table/search/options.phtml:45
+msgid "Number of rows per page"
+msgstr "Саҳифадаги қаторлар сони"
+
+#: templates/table/search/options.phtml:56
+msgid "Display order:"
+msgstr "Сортировка:"
+
+#: templates/table/search/options_zoom.phtml:6
+msgid "Use this column to label each point"
+msgstr ""
+
+#: templates/table/search/options_zoom.phtml:35
+#, fuzzy
+#| msgid "Maximum number of rows to display"
+msgid "Maximum rows to plot"
+msgstr "Кўрсатиладиган қаторларнинг максимал сони"
+
+#: templates/table/search/replace_preview.phtml:13
+msgid "Find and replace - preview"
+msgstr ""
+
+#: templates/table/search/replace_preview.phtml:18
+#, fuzzy
+#| msgid "Original position"
+msgid "Original string"
+msgstr "Асл позиция"
+
+#: templates/table/search/replace_preview.phtml:19
+#, fuzzy
+#| msgid "Relations"
+msgid "Replaced string"
+msgstr "Алоқалар"
+
+#: templates/table/search/replace_preview.phtml:40
+#, fuzzy
+#| msgid "Replication"
+msgid "Replace"
+msgstr "Репликация (захира нусха кўчириш)"
+
+#: templates/table/search/rows_zoom.phtml:16
+#, fuzzy
+#| msgid "SQL Query box"
+msgid "Additional search criteria"
+msgstr "SQL сўровлари қутиси"
+
+#: templates/table/search/search_and_replace.phtml:3
+#, fuzzy
+#| msgid "Replace NULL by"
+msgid "Replace with:"
+msgstr "NULL қийматни қуйидагига алмаштириш"
+
+#: templates/table/search/search_and_replace.phtml:22
+#, fuzzy
+#| msgid "as regular expression"
+msgid "Use regular expression"
+msgstr "мунтазам ибора"
+
+#: templates/table/search/selection_form.phtml:12
+#, fuzzy
+#| msgid "Do a \"query by example\" (wildcard: \"%\")"
+msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
+msgstr "\"Намунадаги сўровни бажариш\" (ўрнига қўйиш белгиси: \"%\")"
+
+#: templates/table/search/selection_form.phtml:34
+msgid "Do a \"query by example\" (wildcard: \"%\")"
+msgstr "\"Намунадаги сўровни бажариш\" (ўрнига қўйиш белгиси: \"%\")"
+
+#: templates/table/search/zoom_result_form.phtml:7
+msgid "Browse/Edit the points"
+msgstr ""
+
+#: templates/table/search/zoom_result_form.phtml:15
+#, fuzzy
+#| msgid "Control user"
+msgid "How to use"
+msgstr "Назорат фойдаланувчиси"
+
+#: templates/table/search/zoom_result_form.phtml:23
+#, fuzzy
+#| msgid "Reset"
+msgid "Reset zoom"
+msgstr "Тозалаш"
+
+#: templates/table/secondary_tabs.phtml:14
+#, fuzzy
+#| msgid "Relation view"
+msgid "Relation view"
+msgstr "Алоқаларни кўриш"
+
+#: templates/table/structure/actions_in_table_structure.phtml:14
+#, php-format
+msgid "A primary key has been added on %s."
+msgstr "\"%s\" га бирламчи калит қўшилди."
+
+#: templates/table/structure/actions_in_table_structure.phtml:34
+#: templates/table/structure/actions_in_table_structure.phtml:54
+#: templates/table/structure/actions_in_table_structure.phtml:79
+#: templates/table/structure/actions_in_table_structure.phtml:101
+#, php-format
+msgid "An index has been added on %s."
+msgstr "\"%s\" учун индекс қўшилди."
+
+#: templates/table/structure/actions_in_table_structure.phtml:130
+#: templates/table/structure/check_all_table_column.phtml:59
+#, fuzzy
+#| msgid "Remove column(s)"
+msgid "Remove from central columns"
+msgstr "Устун(лар)ни олиб ташлаш"
+
+#: templates/table/structure/actions_in_table_structure.phtml:138
+#: templates/table/structure/check_all_table_column.phtml:55
+#, fuzzy
+#| msgid "CHAR textarea columns"
+msgid "Add to central columns"
+msgstr "CHAR майдонидаги устунлар сони"
+
+#: templates/table/structure/add_column.phtml:7
+#, fuzzy, php-format
+#| msgid "Add column(s)"
+msgid "Add %s column(s)"
+msgstr "Устун(лар) қўшиш"
+
+#: templates/table/structure/add_column.phtml:12
+#, fuzzy
+#| msgid "At Beginning of Table"
+msgid "at beginning of table"
+msgstr "Жадвал бошига"
+
+#: templates/table/structure/display_structure.phtml:140 view_create.php:181
+#, fuzzy
+#| msgid "Print view"
+msgid "Edit view"
+msgstr "Чоп этиш версияси"
+
+#: templates/table/structure/display_table_stats.phtml:9
+msgid "Space usage"
+msgstr "Фойдаланилаётган жой"
+
+#: templates/table/structure/display_table_stats.phtml:32
+msgid "Effective"
+msgstr "Эффективлик"
+
+#: templates/table/structure/move_columns_dialog.phtml:1
+#: templates/table/structure/optional_action_links.phtml:21
+#, fuzzy
+#| msgid "Remove column(s)"
+msgid "Move columns"
+msgstr "Устун(лар)ни олиб ташлаш"
+
+#: templates/table/structure/move_columns_dialog.phtml:2
+msgid "Move the columns by dragging them up and down."
+msgstr ""
+
+#: templates/table/structure/optional_action_links.phtml:9
+msgid "Propose table structure"
+msgstr "Жадвал тузилиши таҳлили"
+
+#: templates/table/structure/optional_action_links.phtml:24
+#, fuzzy
+#| msgid "Propose table structure"
+msgid "Improve table structure"
+msgstr "Жадвал тузилиши таҳлили"
+
+#: templates/table/structure/optional_action_links.phtml:30
+#, fuzzy
+#| msgid "Track table"
+msgid "Track view"
+msgstr "Жадвални кузатиш"
+
+#: templates/table/structure/row_stats_table.phtml:3
+#, fuzzy
+#| msgid "Row Statistics"
+msgid "Row statistics"
+msgstr "Қаторлар статистикаси"
+
+#: templates/table/structure/row_stats_table.phtml:9
+msgid "static"
+msgstr "статик"
+
+#: templates/table/structure/row_stats_table.phtml:11
+msgid "dynamic"
+msgstr "динамик"
+
+#: templates/table/structure/row_stats_table.phtml:22
+msgid "partitioned"
+msgstr "бўлакларга бўлинган"
+
+#: templates/table/structure/row_stats_table.phtml:54
+msgid "Row length"
+msgstr "Қатор узунлиги"
+
+#: templates/table/structure/row_stats_table.phtml:66
+msgid "Row size"
+msgstr "Қатор ҳажми"
+
+#: templates/table/structure/row_stats_table.phtml:73
+msgid "Next autoindex"
+msgstr ""
+
+#: templates/table/structure/table_structure_row.phtml:46
+#, fuzzy, php-format
+#| msgid "Table %s has been dropped."
+msgid "Column %s has been dropped."
+msgstr "\"%s\" жадвали ўчирилди"
+
 #: themes.php:17 themes.php:22
 msgid "Theme"
 msgstr ""
@@ -18777,6 +18800,11 @@ msgstr ""
 msgid "concurrent_insert is set to 0"
 msgstr "Максимал уланишлар сони "
 
+#, fuzzy
+#~| msgid "Read misses"
+#~ msgid "Read as multibytes"
+#~ msgstr "Буферни ўқишда қолдиришлар мавжуд"
+
 #, fuzzy
 #~| msgid "Relational display field"
 #~ msgid "Relational display column"
diff --git a/po/uz@latin.po b/po/uz@latin.po
index 8e0596af4f..e542a7d62d 100644
--- a/po/uz@latin.po
+++ b/po/uz@latin.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 4.5.0-dev\n"
 "Report-Msgid-Bugs-To: developers@phpmyadmin.net\n"
-"POT-Creation-Date: 2015-08-08 13:53-0400\n"
+"POT-Creation-Date: 2015-08-12 08:10-0400\n"
 "PO-Revision-Date: 2014-11-05 10:33+0200\n"
 "Last-Translator: Michal Čihař <michal@cihar.com>\n"
 "Language-Team: Uzbek (latin) <https://hosted.weblate.org/projects/phpmyadmin/"
@@ -56,7 +56,7 @@ msgid "Table comments:"
 msgstr "Jadval izohi"
 
 #: db_datadict.php:104 libraries/Index.class.php:699
-#: libraries/insert_edit.lib.php:1567
+#: libraries/insert_edit.lib.php:1565
 #: libraries/navigation/Nodes/Node_Column.class.php:30
 #: libraries/plugins/export/ExportHtmlword.class.php:280
 #: libraries/plugins/export/ExportHtmlword.class.php:375
@@ -70,13 +70,14 @@ msgstr "Jadval izohi"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1023
 #: libraries/tracking.lib.php:879 libraries/tracking.lib.php:975
 #: templates/columns_definitions/column_name.phtml:18
-#: templates/index_form.phtml:124 templates/table/table_header.phtml:6
-#: templates/table/zoom_result_form.phtml:33
-#: templates/tbl_relation/common_form.phtml:10
-#: templates/tbl_relation/common_form.phtml:43
-#: templates/tbl_relation/foreign_key_row.phtml:194
-#: templates/tbl_relation/foreign_key_row.phtml:206
-#: templates/tbl_relation/internal_relational_row.phtml:71
+#: templates/table/index_form.phtml:124
+#: templates/table/relation/common_form.phtml:10
+#: templates/table/relation/common_form.phtml:43
+#: templates/table/relation/foreign_key_row.phtml:194
+#: templates/table/relation/foreign_key_row.phtml:206
+#: templates/table/relation/internal_relational_row.phtml:71
+#: templates/table/search/table_header.phtml:6
+#: templates/table/search/zoom_result_form.phtml:33
 #, fuzzy
 #| msgid "Column names"
 msgid "Column"
@@ -96,21 +97,21 @@ msgstr "Maydon nomlari"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1001
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1024
 #: libraries/rte/rte_list.lib.php:75 libraries/rte/rte_list.lib.php:103
-#: libraries/rte/rte_routines.lib.php:802
-#: libraries/rte/rte_routines.lib.php:831
-#: libraries/rte/rte_routines.lib.php:1493
+#: libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_routines.lib.php:922
+#: libraries/rte/rte_routines.lib.php:1584
 #: libraries/server_privileges.lib.php:2369 libraries/tracking.lib.php:880
 #: libraries/tracking.lib.php:972
 #: templates/columns_definitions/table_fields_definitions.phtml:11
-#: templates/structure/table_header.phtml:48
-#: templates/structure/table_structure_header.phtml:6
-#: templates/table/table_header.phtml:7
+#: templates/database/structure/table_header.phtml:48
+#: templates/table/search/table_header.phtml:7
+#: templates/table/structure/table_structure_header.phtml:6
 msgid "Type"
 msgstr "Tur"
 
 #: db_datadict.php:106 libraries/Index.class.php:702
 #: libraries/central_columns.lib.php:708
-#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1576
+#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1574
 #: libraries/plugins/export/ExportHtmlword.class.php:286
 #: libraries/plugins/export/ExportHtmlword.class.php:381
 #: libraries/plugins/export/ExportLatex.class.php:509
@@ -123,8 +124,8 @@ msgstr "Tur"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1026
 #: libraries/tracking.lib.php:882 libraries/tracking.lib.php:978
 #: templates/columns_definitions/table_fields_definitions.phtml:39
-#: templates/structure/table_structure_header.phtml:9
-#: templates/table/zoom_result_form.phtml:34
+#: templates/table/search/zoom_result_form.phtml:34
+#: templates/table/structure/table_structure_header.phtml:9
 msgid "Null"
 msgstr "Null"
 
@@ -142,8 +143,8 @@ msgstr "Null"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1027
 #: libraries/replication_gui.lib.php:153 libraries/tracking.lib.php:883
 #: templates/columns_definitions/table_fields_definitions.phtml:25
-#: templates/structure/body_for_table_summary.phtml:55
-#: templates/structure/table_structure_header.phtml:10
+#: templates/database/structure/body_for_table_summary.phtml:55
+#: templates/table/structure/table_structure_header.phtml:10
 msgid "Default"
 msgstr "Andoza"
 
@@ -171,19 +172,19 @@ msgid "Comments"
 msgstr "Izohlar"
 
 #: db_datadict.php:146
-#: libraries/controllers/StructureController.class.php:1960
-#: libraries/controllers/StructureController.class.php:1965
+#: libraries/controllers/TableStructureController.class.php:951
+#: libraries/controllers/TableStructureController.class.php:956
 #: libraries/tracking.lib.php:922
 #: templates/columns_definitions/column_indexes.phtml:6
-#: templates/structure/check_all_table_column.phtml:22
-#: templates/structure/display_structure.phtml:74
+#: templates/table/structure/check_all_table_column.phtml:22
+#: templates/table/structure/display_structure.phtml:74
 msgid "Primary"
 msgstr "Birlamchi"
 
 #: db_datadict.php:156 js/messages.php:317 libraries/Index.class.php:567
 #: libraries/Index.class.php:606 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261 libraries/mult_submits.lib.php:403
+#: libraries/config/FormDisplay.tpl.php:272 libraries/mult_submits.lib.php:403
 #: libraries/mult_submits.lib.php:417
 #: libraries/plugins/export/ExportHtmlword.class.php:630
 #: libraries/plugins/export/ExportLatex.class.php:589
@@ -199,20 +200,20 @@ msgstr "Birlamchi"
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1010 libraries/tracking.lib.php:1015
 #: prefs_manage.php:140 templates/prefs_autoload.phtml:15
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "No"
 msgstr "Yo‘q"
 
 #: db_datadict.php:156 js/messages.php:443 libraries/Index.class.php:568
 #: libraries/Index.class.php:605 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261
-#: libraries/controllers/StructureController.class.php:1344
-#: libraries/controllers/StructureController.class.php:2223
-#: libraries/controllers/StructureController.class.php:2232
-#: libraries/controllers/StructureController.class.php:2237
-#: libraries/controllers/StructureController.class.php:2242
-#: libraries/controllers/StructureController.class.php:2247
+#: libraries/config/FormDisplay.tpl.php:272
+#: libraries/controllers/TableStructureController.class.php:539
+#: libraries/controllers/TableStructureController.class.php:1201
+#: libraries/controllers/TableStructureController.class.php:1210
+#: libraries/controllers/TableStructureController.class.php:1215
+#: libraries/controllers/TableStructureController.class.php:1220
+#: libraries/controllers/TableStructureController.class.php:1225
 #: libraries/mult_submits.inc.php:82 libraries/mult_submits.inc.php:178
 #: libraries/mult_submits.lib.php:339 libraries/mult_submits.lib.php:372
 #: libraries/mult_submits.lib.php:401 libraries/mult_submits.lib.php:415
@@ -221,8 +222,8 @@ msgstr "Yo‘q"
 #: libraries/plugins/export/ExportOdt.class.php:756
 #: libraries/plugins/export/ExportTexytext.class.php:567
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1077
-#: libraries/server_databases.lib.php:464
-#: libraries/server_databases.lib.php:474
+#: libraries/server_databases.lib.php:475
+#: libraries/server_databases.lib.php:485
 #: libraries/server_privileges.lib.php:2546
 #: libraries/server_privileges.lib.php:2727
 #: libraries/server_privileges.lib.php:2748
@@ -232,7 +233,7 @@ msgstr "Yo‘q"
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1008 libraries/tracking.lib.php:1013
 #: prefs_manage.php:138 templates/prefs_autoload.phtml:14
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "Yes"
 msgstr "Ha"
 
@@ -242,7 +243,7 @@ msgstr "Ma`lumotlar bazasi dampini (sxemasini) namoyish etish"
 
 #: db_export.php:37 db_tracking.php:90 export.php:382
 #: libraries/DBQbe.class.php:326
-#: libraries/controllers/StructureController.class.php:231
+#: libraries/controllers/DatabaseStructureController.class.php:170
 #: libraries/navigation/NavigationTree.class.php:897
 msgid "No tables found in database."
 msgstr "Ma`lumotlar bazasida bironta ham jadval mavjud emas."
@@ -253,14 +254,14 @@ msgstr "Ma`lumotlar bazasida bironta ham jadval mavjud emas."
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:26
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:120
-#: templates/structure/show_create.phtml:18
+#: templates/database/structure/show_create.phtml:18
 msgid "Tables"
 msgstr "Jadvallar"
 
 #: db_export.php:52 libraries/Menu.class.php:317 libraries/Menu.class.php:425
-#: libraries/Util.class.php:3333 libraries/Util.class.php:3343
-#: libraries/Util.class.php:3349 libraries/Util.class.php:3629
-#: libraries/Util.class.php:4327 libraries/Util.class.php:4344
+#: libraries/Util.class.php:3339 libraries/Util.class.php:3349
+#: libraries/Util.class.php:3355 libraries/Util.class.php:3635
+#: libraries/Util.class.php:4333 libraries/Util.class.php:4350
 #: libraries/central_columns.lib.php:728 libraries/config.values.php:39
 #: libraries/config.values.php:47 libraries/config.values.php:109
 #: libraries/config.values.php:115 libraries/config/setup.forms.php:323
@@ -274,7 +275,7 @@ msgstr "Jadvallar"
 #: libraries/navigation/Nodes/Node_Table.class.php:283
 #: libraries/server_privileges.lib.php:1141 libraries/tracking.lib.php:874
 #: templates/columns_definitions/table_fields_definitions.phtml:3
-#: templates/designer/table_list.phtml:28
+#: templates/database/designer/table_list.phtml:28
 msgid "Structure"
 msgstr "Tuzilishi"
 
@@ -286,7 +287,7 @@ msgstr "Tuzilishi"
 #: libraries/config/user_preferences.forms.php:292
 #: libraries/config/user_preferences.forms.php:297
 #: libraries/server_privileges.lib.php:1140
-#: templates/structure/display_table_stats.phtml:12
+#: templates/table/structure/display_table_stats.phtml:12
 msgid "Data"
 msgstr "Ma`lumotlar"
 
@@ -373,10 +374,10 @@ msgstr "Kuzatilgan jadvallar"
 #: libraries/server_privileges.lib.php:2908
 #: libraries/server_privileges.lib.php:3145
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4346
-#: templates/structure/table_header.phtml:21
-#: templates/tbl_relation/foreign_key_row.phtml:176
-#: templates/tbl_relation/internal_relational_row.phtml:63
+#: libraries/server_privileges.lib.php:4372
+#: templates/database/structure/table_header.phtml:21
+#: templates/table/relation/foreign_key_row.phtml:176
+#: templates/table/relation/internal_relational_row.phtml:63
 msgid "Table"
 msgstr "Jadval"
 
@@ -393,7 +394,7 @@ msgid "Updated"
 msgstr "Yangilandi"
 
 #: db_tracking.php:130 js/messages.php:243 libraries/Menu.class.php:552
-#: libraries/Util.class.php:4314 libraries/config.values.php:104
+#: libraries/Util.class.php:4320 libraries/config.values.php:104
 #: libraries/rte/rte_events.lib.php:393 libraries/rte/rte_list.lib.php:101
 #: libraries/server_status_processes.lib.php:92 libraries/tracking.lib.php:279
 msgid "Status"
@@ -402,14 +403,15 @@ msgstr "Holat"
 #: db_tracking.php:131 db_tracking.php:290 libraries/Index.class.php:693
 #: libraries/central_columns.lib.php:687 libraries/rte/rte_list.lib.php:74
 #: libraries/rte/rte_list.lib.php:89 libraries/rte/rte_list.lib.php:102
-#: libraries/server_databases.lib.php:398
+#: libraries/server_databases.lib.php:409
 #: libraries/server_privileges.lib.php:2372
 #: libraries/server_privileges.lib.php:3166
 #: libraries/server_privileges.lib.php:3342
 #: libraries/server_user_groups.lib.php:82
 #: libraries/server_variables.lib.php:189 libraries/tracking.lib.php:280
-#: libraries/tracking.lib.php:793 templates/structure/table_header.phtml:30
-#: templates/structure/table_structure_header.phtml:23
+#: libraries/tracking.lib.php:793
+#: templates/database/structure/table_header.phtml:30
+#: templates/table/structure/table_structure_header.phtml:23
 msgid "Action"
 msgstr "Amal"
 
@@ -453,7 +455,7 @@ msgid "Untracked tables"
 msgstr "Kuzatilmagan jadvallar"
 
 #: db_tracking.php:305 db_tracking.php:336
-#: templates/structure/optional_action_links.phtml:17
+#: templates/table/structure/optional_action_links.phtml:17
 msgid "Track table"
 msgstr "Jadvalni kuzatish"
 
@@ -509,7 +511,7 @@ msgid "Value for the column \"%s\""
 msgstr ""
 
 #: gis_data_editor.php:146
-#: templates/gis_visualization/gis_visualization.phtml:37
+#: templates/table/gis_visualization/gis_visualization.phtml:37
 msgid "Use OpenStreetMaps as Base Layer"
 msgstr ""
 
@@ -601,35 +603,35 @@ msgstr "Yangi foydalanuvchi qo‘shish"
 #: libraries/display_change_password.lib.php:162
 #: libraries/display_export.lib.php:402 libraries/display_export.lib.php:408
 #: libraries/display_import.lib.php:392 libraries/index.lib.php:44
-#: libraries/insert_edit.lib.php:1546 libraries/insert_edit.lib.php:1583
+#: libraries/insert_edit.lib.php:1544 libraries/insert_edit.lib.php:1581
 #: libraries/normalization.lib.php:165 libraries/normalization.lib.php:821
 #: libraries/operations.lib.php:38 libraries/operations.lib.php:108
 #: libraries/operations.lib.php:263 libraries/operations.lib.php:306
 #: libraries/operations.lib.php:801 libraries/operations.lib.php:874
 #: libraries/operations.lib.php:923 libraries/operations.lib.php:1337
 #: libraries/operations.lib.php:1658
-#: libraries/plugins/auth/AuthenticationCookie.class.php:244
+#: libraries/plugins/auth/AuthenticationCookie.class.php:232
 #: libraries/replication_gui.lib.php:122 libraries/replication_gui.lib.php:161
 #: libraries/replication_gui.lib.php:324 libraries/replication_gui.lib.php:461
 #: libraries/replication_gui.lib.php:906 libraries/rte/rte_events.lib.php:509
-#: libraries/rte/rte_routines.lib.php:969
-#: libraries/rte/rte_routines.lib.php:1581
+#: libraries/rte/rte_routines.lib.php:1060
+#: libraries/rte/rte_routines.lib.php:1672
 #: libraries/rte/rte_triggers.lib.php:396 libraries/server_bin_log.lib.php:61
 #: libraries/server_privileges.lib.php:705
 #: libraries/server_privileges.lib.php:2106
 #: libraries/server_privileges.lib.php:2872
 #: libraries/server_privileges.lib.php:3553
-#: libraries/server_privileges.lib.php:4627
+#: libraries/server_privileges.lib.php:4653
 #: libraries/server_user_groups.lib.php:285
 #: libraries/sql_query_form.lib.php:369 libraries/sql_query_form.lib.php:429
 #: libraries/tracking.lib.php:533 libraries/tracking.lib.php:653
 #: prefs_manage.php:277 prefs_manage.php:355
 #: templates/columns_definitions/column_definitions_form.phtml:59
-#: templates/header_location.phtml:17 templates/index_form.phtml:238
+#: templates/database/create_table.phtml:21 templates/header_location.phtml:28
 #: templates/startAndNumberOfRowsPanel.phtml:14
-#: templates/structure/add_column.phtml:25
-#: templates/table/create_table.phtml:21
-#: templates/table/selection_form.phtml:75 view_create.php:275
+#: templates/table/index_form.phtml:238
+#: templates/table/search/selection_form.phtml:75
+#: templates/table/structure/add_column.phtml:25 view_create.php:275
 #: view_operations.php:106
 msgid "Go"
 msgstr "OK"
@@ -726,7 +728,7 @@ msgstr ""
 "Import modullari mavjud emas! O‘rnatilgan phpMyAdmin nusxasining libraries/"
 "export katalogini tekshiring!"
 
-#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1466
+#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1460
 #, fuzzy, php-format
 #| msgid "Bookmark %s created"
 msgid "Bookmark %s has been created."
@@ -770,13 +772,13 @@ msgstr ""
 msgid "Back"
 msgstr "Orqaga"
 
-#: index.php:148 libraries/Footer.class.php:70
+#: index.php:149 libraries/Footer.class.php:70
 #, fuzzy
 #| msgid "phpMyAdmin homepage"
 msgid "phpMyAdmin Demo Server"
 msgstr "phpMyAdmin sayti"
 
-#: index.php:152
+#: index.php:153
 #, php-format
 msgid ""
 "You are using the demo server. You can do anything here, but please do not "
@@ -784,52 +786,52 @@ msgid ""
 "at %s."
 msgstr ""
 
-#: index.php:162
+#: index.php:163
 #, fuzzy
 #| msgid "General relation features"
 msgid "General Settings"
 msgstr "Aloqalarning asosiy imkoniyatlari"
 
-#: index.php:190 libraries/display_change_password.lib.php:50
+#: index.php:191 libraries/display_change_password.lib.php:50
 #: libraries/display_change_password.lib.php:53 user_password.php:247
 msgid "Change password"
 msgstr "Parolni o‘zgartirish"
 
-#: index.php:206
+#: index.php:207
 #, fuzzy
 #| msgid "MySQL connection collation"
 msgid "Server connection collation"
 msgstr "MySQL bilan ulanishni chog‘ishtirish"
 
-#: index.php:228
+#: index.php:229
 #, fuzzy
 #| msgid "Other core settings"
 msgid "Appearance Settings"
 msgstr "Boshqa sozlanishlar"
 
-#: index.php:258 prefs_manage.php:285
+#: index.php:259 prefs_manage.php:285
 #, fuzzy
 #| msgid "settings"
 msgid "More settings"
 msgstr "tanlovlar"
 
-#: index.php:279
+#: index.php:280
 #, fuzzy
 #| msgid "Database for user"
 msgid "Database server"
 msgstr "Foydalanuvchi uchun ma`lumotlar bazasi"
 
-#: index.php:282 libraries/plugins/auth/AuthenticationCookie.class.php:181
+#: index.php:283 libraries/plugins/auth/AuthenticationCookie.class.php:169
 msgid "Server:"
 msgstr "Server:"
 
-#: index.php:286
+#: index.php:287
 #, fuzzy
 #| msgid "Server port"
 msgid "Server type:"
 msgstr "Server porti"
 
-#: index.php:290 libraries/plugins/export/ExportLatex.class.php:212
+#: index.php:291 libraries/plugins/export/ExportLatex.class.php:212
 #: libraries/plugins/export/ExportSql.class.php:687
 #: libraries/plugins/export/ExportXml.class.php:189
 #, fuzzy
@@ -837,89 +839,89 @@ msgstr "Server porti"
 msgid "Server version:"
 msgstr "Server versiyasi"
 
-#: index.php:296
+#: index.php:297
 #, fuzzy
 #| msgid "Protocol version"
 msgid "Protocol version:"
 msgstr "Protokol versiyasi"
 
-#: index.php:300
+#: index.php:301
 #, fuzzy
 #| msgid "User"
 msgid "User:"
 msgstr "Foydalanuvchi"
 
-#: index.php:305
+#: index.php:306
 #, fuzzy
 #| msgid "Server socket"
 msgid "Server charset:"
 msgstr "Server soketi"
 
-#: index.php:320
+#: index.php:321
 msgid "Web server"
 msgstr "Veb server"
 
-#: index.php:331
+#: index.php:332
 #, fuzzy
 #| msgid "Use light version"
 msgid "Database client version:"
 msgstr "Yengil versiyadan foydalanish"
 
-#: index.php:335
+#: index.php:336
 #, fuzzy
 #| msgid "PHP extension"
 msgid "PHP extension:"
 msgstr "PHP kengaytmasi"
 
-#: index.php:349
+#: index.php:350
 #, fuzzy
 #| msgid "PHP Version"
 msgid "PHP version:"
 msgstr "PHP versiyasm"
 
-#: index.php:360
+#: index.php:361
 msgid "Show PHP information"
 msgstr "PHP haqida ma`lumotni ko‘rsatish"
 
-#: index.php:383
+#: index.php:384
 #, fuzzy
 #| msgid "Version information"
 msgid "Version information:"
 msgstr "Versiya haqida ma`lumot"
 
-#: index.php:392 libraries/Util.class.php:432 libraries/Util.class.php:495
-#: libraries/config/FormDisplay.tpl.php:151
+#: index.php:393 libraries/Util.class.php:432 libraries/Util.class.php:495
+#: libraries/config/FormDisplay.tpl.php:162
 #: libraries/display_export.lib.php:577 libraries/engines/pbxt.lib.php:162
 #: libraries/navigation/NavigationHeader.class.php:196
 #: libraries/server_variables.lib.php:160
 msgid "Documentation"
 msgstr "Dokumentatsiya"
 
-#: index.php:399
+#: index.php:400
 msgid "Wiki"
 msgstr "Viki"
 
-#: index.php:408
+#: index.php:409
 msgid "Official Homepage"
 msgstr "phpMyAdmin rasmiy veb-sahifasi"
 
-#: index.php:415
+#: index.php:416
 #, fuzzy
 #| msgid "Attributes"
 msgid "Contribute"
 msgstr "Atributlar"
 
-#: index.php:422
+#: index.php:423
 msgid "Get support"
 msgstr ""
 
-#: index.php:429
+#: index.php:430
 #, fuzzy
 #| msgid "No change"
 msgid "List of changes"
 msgstr "O‘zgarish yo‘q"
 
-#: index.php:451
+#: index.php:452
 #, fuzzy
 #| msgid ""
 #| "Your configuration file contains settings (root with no password) that "
@@ -938,7 +940,7 @@ msgstr ""
 "shuning uchun \"root\" superfoydalanuvchisiga parol o‘rnatish qat`iyan "
 "tavsiya etiladi."
 
-#: index.php:468
+#: index.php:469
 msgid ""
 "You have enabled mbstring.func_overload in your PHP configuration. This "
 "option is incompatible with phpMyAdmin and might cause some data to be "
@@ -948,7 +950,7 @@ msgstr ""
 "func_overload parametri yoqilgan. Ma`lumot yo‘qolishi oldini olish uchun, "
 "ushbu parametr o‘chirilishi kerak!"
 
-#: index.php:483
+#: index.php:484
 msgid ""
 "The mbstring PHP extension was not found and you seem to be using a "
 "multibyte charset. Without the mbstring extension phpMyAdmin is unable to "
@@ -959,7 +961,7 @@ msgstr ""
 "navbatida ma`lumot yo‘qolishiga olib kelishi mumkin. PHP \"mbstring\" "
 "kengaytmasini o‘rnatish qat`iy tavsiya etiladi."
 
-#: index.php:500
+#: index.php:501
 #, fuzzy
 #| msgid ""
 #| "Your PHP parameter [a@http://php.net/manual/en/session.configuration."
@@ -978,7 +980,7 @@ msgstr ""
 "davomiyligidan kichikroq, shuning uchun login sessiyangiz phpMyAdmin "
 "dasturida konfiguratsiya qilganingizdan tezroq tugaydi."
 
-#: index.php:519
+#: index.php:520
 #, fuzzy
 #| msgid ""
 #| "r PHP parameter [a@http://php.net/manual/en/session.configuration.#ini."
@@ -995,14 +997,14 @@ msgstr ""
 "davomiyligidan kichikroq, shuning uchun login sessiyangiz phpMyAdmin "
 "dasturida konfiguratsiya qilganingizdan tezroq tugaydi."
 
-#: index.php:535
+#: index.php:536
 msgid "The configuration file now needs a secret passphrase (blowfish_secret)."
 msgstr ""
 "cookie-autentifikatsiya ishlatilganda, konfiguratsion fayldagi "
 "$cfg[\"blowfish_secret\"] direktivasi qiymatini o‘rnatib parol belgilash "
 "kerak."
 
-#: index.php:548
+#: index.php:549
 #, fuzzy
 #| msgid ""
 #| "Directory [code]config[/code], which is used by the setup script, still "
@@ -1018,7 +1020,7 @@ msgstr ""
 "katalogi haliyam mavjud. phpMyAdmin muvaffaqiyatli o‘rnatilgandan keyin, uni "
 "o‘chirish tavsiya etiladi."
 
-#: index.php:564
+#: index.php:565
 #, fuzzy, php-format
 #| msgid ""
 #| " additional features for working with linked tables have been ctivated. "
@@ -1030,12 +1032,12 @@ msgstr ""
 "Aloqador jadvallar bilan ishlash uchun qo‘shimcha imkoniyatlar mavjud emas. "
 "Sabablarini aniqlash uchun %sbu yerga%s bosing."
 
-#: index.php:571
+#: index.php:572
 msgid ""
 "Or alternately go to 'Operations' tab of any database to set it up there."
 msgstr ""
 
-#: index.php:620
+#: index.php:621
 #, php-format
 msgid ""
 "Your PHP MySQL library version %s differs from your MySQL server version %s. "
@@ -1044,7 +1046,7 @@ msgstr ""
 "MySQL-kliyent versiyasi (\"%s\") o‘rnatilgan MySQL-server  versiyasi(\"%s"
 "\")dan farq qilmoqda. Bu holat noxush oqibatlarga olib kelishi mumkin."
 
-#: index.php:648
+#: index.php:649
 #, php-format
 msgid ""
 "Server running with Suhosin. Please refer to %sdocumentation%s for possible "
@@ -1220,8 +1222,8 @@ msgstr ""
 msgid "Save & Close"
 msgstr "Fayl kabi saqlash"
 
-#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:404
-#: libraries/insert_edit.lib.php:1550 prefs_manage.php:361
+#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:415
+#: libraries/insert_edit.lib.php:1548 prefs_manage.php:361
 #: prefs_manage.php:372
 msgid "Reset"
 msgstr "Tozalash"
@@ -1266,7 +1268,7 @@ msgstr "Indеks(lar)ni saqlash"
 msgid "Edit Index"
 msgstr "Tahrirlash usuli"
 
-#: js/messages.php:99 templates/index_form.phtml:232
+#: js/messages.php:99 templates/table/index_form.phtml:232
 #, fuzzy, php-format
 #| msgid "Add column(s)"
 msgid "Add %s column(s) to index"
@@ -1296,15 +1298,16 @@ msgstr "Maydon qiymatlari quyidagi belgi ichiga olingan "
 msgid "Please select column(s) for the index."
 msgstr "Ustun(lar) qo‘shish"
 
-#: js/messages.php:106 templates/structure/add_column.phtml:1
+#: js/messages.php:106 templates/table/structure/add_column.phtml:1
 #, fuzzy
 #| msgid "You have to add at least one field."
 msgid "You have to add at least one column."
 msgstr "Hech bo‘lmaganda bitta maydon kiritish shart."
 
-#: js/messages.php:109 libraries/insert_edit.lib.php:1548
+#: js/messages.php:109 libraries/insert_edit.lib.php:1546
 #: templates/columns_definitions/column_definitions_form.phtml:162
-#: templates/index_form.phtml:237 templates/tbl_relation/common_form.phtml:106
+#: templates/table/index_form.phtml:237
+#: templates/table/relation/common_form.phtml:106
 msgid "Preview SQL"
 msgstr ""
 
@@ -1327,7 +1330,7 @@ msgid "SQL query:"
 msgstr "SQL so‘rovi"
 
 #. l10n: Default label for the y-Axis of Charts
-#: js/messages.php:118 templates/tbl_chart.phtml:109
+#: js/messages.php:118 templates/table/chart/tbl_chart.phtml:109
 #, fuzzy
 #| msgid "Value"
 msgid "Y Values"
@@ -1508,7 +1511,7 @@ msgstr ""
 msgid "Bytes received"
 msgstr "Qabul qilindi"
 
-#: js/messages.php:169 libraries/server_status.lib.php:226
+#: js/messages.php:169 libraries/server_status.lib.php:235
 msgid "Connections"
 msgstr "Ulanishlar"
 
@@ -1568,12 +1571,12 @@ msgstr "Jadvallar soni: \"%s\""
 msgid "Questions"
 msgstr "Vеrsiyalar"
 
-#: js/messages.php:184 libraries/server_status.lib.php:134
+#: js/messages.php:184 libraries/server_status.lib.php:143
 msgid "Traffic"
 msgstr "Trafik"
 
 #: js/messages.php:185 libraries/Menu.class.php:586
-#: libraries/Util.class.php:4318 libraries/server_status_monitor.lib.php:257
+#: libraries/Util.class.php:4324 libraries/server_status_monitor.lib.php:257
 #, fuzzy
 #| msgid "settings"
 msgid "Settings"
@@ -1597,8 +1600,9 @@ msgstr ""
 #: libraries/server_status_monitor.lib.php:236
 #: libraries/server_status_processes.lib.php:308
 #: templates/columns_definitions/transformation.phtml:4
-#: templates/designer/options_panel.phtml:178
-#: templates/table/options_zoom.phtml:12 templates/table/rows_zoom.phtml:26
+#: templates/database/designer/options_panel.phtml:178
+#: templates/table/search/options_zoom.phtml:12
+#: templates/table/search/rows_zoom.phtml:26
 msgid "None"
 msgstr "Yo‘q"
 
@@ -1908,8 +1912,8 @@ msgstr ""
 
 #: js/messages.php:270 libraries/Menu.class.php:352
 #: libraries/Menu.class.php:455 libraries/Menu.class.php:582
-#: libraries/Util.class.php:4317 libraries/Util.class.php:4332
-#: libraries/Util.class.php:4349 libraries/config/messages.inc.php:258
+#: libraries/Util.class.php:4323 libraries/Util.class.php:4338
+#: libraries/Util.class.php:4355 libraries/config/messages.inc.php:258
 #: libraries/display_import.lib.php:105
 #: libraries/server_status_monitor.lib.php:318 prefs_manage.php:238
 #: setup/frames/menu.inc.php:26
@@ -1982,13 +1986,13 @@ msgid "Formatting SQL..."
 msgstr ""
 
 #: js/messages.php:293 libraries/server_variables.lib.php:157
-#: templates/designer/aggregate_query_panel.phtml:63
-#: templates/designer/delete_relation_panel.phtml:28
-#: templates/designer/having_query_panel.phtml:117
-#: templates/designer/new_relation_panel.phtml:88
-#: templates/designer/options_panel.phtml:253
-#: templates/designer/rename_to_panel.phtml:45
-#: templates/designer/where_query_panel.phtml:83
+#: templates/database/designer/aggregate_query_panel.phtml:63
+#: templates/database/designer/delete_relation_panel.phtml:28
+#: templates/database/designer/having_query_panel.phtml:117
+#: templates/database/designer/new_relation_panel.phtml:88
+#: templates/database/designer/options_panel.phtml:253
+#: templates/database/designer/rename_to_panel.phtml:45
+#: templates/database/designer/where_query_panel.phtml:83
 msgid "Cancel"
 msgstr "Bekor qilish"
 
@@ -1998,7 +2002,7 @@ msgstr "Bekor qilish"
 msgid "Page-related settings"
 msgstr "Boshqa sozlanishlar"
 
-#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:402
+#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:413
 msgid "Apply"
 msgstr ""
 
@@ -2037,8 +2041,8 @@ msgstr ""
 msgid "Error text: %s"
 msgstr ""
 
-#: js/messages.php:307 libraries/db_common.inc.php:68
-#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:450
+#: js/messages.php:307 libraries/db_common.inc.php:69
+#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:461
 msgid "No databases selected."
 msgstr "Bironta ham ma`lumotlar bazasi tanlanmagan."
 
@@ -2050,12 +2054,13 @@ msgstr ""
 msgid "Adding Primary Key"
 msgstr ""
 
-#: js/messages.php:310 templates/designer/aggregate_query_panel.phtml:59
-#: templates/designer/having_query_panel.phtml:113
-#: templates/designer/new_relation_panel.phtml:87
-#: templates/designer/options_panel.phtml:252
-#: templates/designer/rename_to_panel.phtml:41
-#: templates/designer/where_query_panel.phtml:82
+#: js/messages.php:310
+#: templates/database/designer/aggregate_query_panel.phtml:59
+#: templates/database/designer/having_query_panel.phtml:113
+#: templates/database/designer/new_relation_panel.phtml:87
+#: templates/database/designer/options_panel.phtml:252
+#: templates/database/designer/rename_to_panel.phtml:41
+#: templates/database/designer/where_query_panel.phtml:82
 msgid "OK"
 msgstr "OK"
 
@@ -2081,7 +2086,7 @@ msgstr "Ma`lumotlar bazasidan quyidagiga nusxa olish"
 msgid "Changing Charset"
 msgstr "Kodirovka"
 
-#: js/messages.php:320 libraries/Util.class.php:3217
+#: js/messages.php:320 libraries/Util.class.php:3223
 #, fuzzy
 #| msgid "Disable foreign key checks"
 msgid "Enable foreign key checks"
@@ -2129,20 +2134,21 @@ msgstr ""
 #: js/messages.php:334 libraries/DisplayResults.class.php:4834
 #: libraries/DisplayResults.class.php:5092 libraries/Menu.class.php:344
 #: libraries/Menu.class.php:446 libraries/Menu.class.php:578
-#: libraries/Util.class.php:3636 libraries/Util.class.php:3637
-#: libraries/Util.class.php:4316 libraries/Util.class.php:4331
-#: libraries/Util.class.php:4348 libraries/config/messages.inc.php:252
+#: libraries/Util.class.php:3642 libraries/Util.class.php:3643
+#: libraries/Util.class.php:4322 libraries/Util.class.php:4337
+#: libraries/Util.class.php:4354 libraries/config/messages.inc.php:252
 #: libraries/display_export.lib.php:173 libraries/rte/rte_list.lib.php:146
 #: libraries/server_privileges.lib.php:2211
 #: libraries/server_privileges.lib.php:2290
 #: libraries/server_privileges.lib.php:2632
 #: libraries/server_privileges.lib.php:3356
 #: libraries/server_status_monitor.lib.php:322 prefs_manage.php:303
-#: setup/frames/menu.inc.php:27 templates/structure/check_all_tables.phtml:11
+#: setup/frames/menu.inc.php:27
+#: templates/database/structure/check_all_tables.phtml:11
 msgid "Export"
 msgstr "Eksport"
 
-#: js/messages.php:337 libraries/rte/rte_routines.lib.php:652
+#: js/messages.php:337 libraries/rte/rte_routines.lib.php:743
 msgid "ENUM/SET editor"
 msgstr ""
 
@@ -2187,7 +2193,7 @@ msgstr "SQL so‘rovlari qutisi"
 #: libraries/Console.class.php:214 libraries/DisplayResults.class.php:3474
 #: libraries/DisplayResults.class.php:4818 libraries/Index.class.php:723
 #: libraries/Util.class.php:706 libraries/Util.class.php:1202
-#: libraries/Util.class.php:3634 libraries/Util.class.php:3635
+#: libraries/Util.class.php:3640 libraries/Util.class.php:3641
 #: libraries/central_columns.lib.php:851
 #: libraries/central_columns.lib.php:1193
 #: libraries/config/messages.inc.php:892
@@ -2205,7 +2211,7 @@ msgstr "Tahrirlash"
 #: libraries/server_user_groups.lib.php:129
 #: libraries/sql_query_form.lib.php:416 libraries/tracking.lib.php:477
 #: setup/frames/index.inc.php:183 setup/frames/index.inc.php:291
-#: templates/designer/delete_relation_panel.phtml:27
+#: templates/database/designer/delete_relation_panel.phtml:27
 msgid "Delete"
 msgstr "O‘chirish"
 
@@ -2390,11 +2396,11 @@ msgid "No dependencies selected!"
 msgstr "Bironta ham ma`lumotlar bazasi tanlanmagan."
 
 #: js/messages.php:394 libraries/central_columns.lib.php:1214
-#: libraries/insert_edit.lib.php:1458 libraries/server_variables.lib.php:155
+#: libraries/insert_edit.lib.php:1456 libraries/server_variables.lib.php:155
 #: setup/frames/config.inc.php:42 setup/frames/index.inc.php:279
 #: templates/columns_definitions/column_definitions_form.phtml:165
-#: templates/gis_visualization/gis_visualization.phtml:48
-#: templates/tbl_relation/common_form.phtml:107
+#: templates/table/gis_visualization/gis_visualization.phtml:48
+#: templates/table/relation/common_form.phtml:107
 msgid "Save"
 msgstr "Saqlash"
 
@@ -2493,8 +2499,8 @@ msgid "Data point content"
 msgstr "Ma`lumotlar fayli ko‘rsatgichi hajmi"
 
 #: js/messages.php:430 js/messages.php:562 js/messages.php:579
-#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2573
-#: templates/index_form.phtml:154 templates/index_form.phtml:194
+#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2571
+#: templates/table/index_form.phtml:154 templates/table/index_form.phtml:194
 msgid "Ignore"
 msgstr "E`tibor bermaslik"
 
@@ -2558,8 +2564,8 @@ msgid "Please select the primary key or a unique key!"
 msgstr ""
 "Birlamchi (PRIMARY) yoki unikal (UNIQUE) indeks bo‘lgan maydonni tanlang!"
 
-#: js/messages.php:457 templates/designer/side_menu.phtml:91
-#: templates/designer/side_menu.phtml:94
+#: js/messages.php:457 templates/database/designer/side_menu.phtml:91
+#: templates/database/designer/side_menu.phtml:94
 #, fuzzy
 #| msgid "Choose field to display"
 msgid "Choose column to display"
@@ -2577,22 +2583,22 @@ msgstr ""
 msgid "Page name"
 msgstr "Sahifa raqami: "
 
-#: js/messages.php:463 templates/designer/side_menu.phtml:56
-#: templates/designer/side_menu.phtml:59
+#: js/messages.php:463 templates/database/designer/side_menu.phtml:56
+#: templates/database/designer/side_menu.phtml:59
 #, fuzzy
 #| msgid "Select Tables"
 msgid "Save page"
 msgstr "Jadvallarni tanlang"
 
-#: js/messages.php:464 templates/designer/side_menu.phtml:63
-#: templates/designer/side_menu.phtml:66
+#: js/messages.php:464 templates/database/designer/side_menu.phtml:63
+#: templates/database/designer/side_menu.phtml:66
 #, fuzzy
 #| msgid "Select Tables"
 msgid "Save page as"
 msgstr "Jadvallarni tanlang"
 
-#: js/messages.php:465 templates/designer/side_menu.phtml:49
-#: templates/designer/side_menu.phtml:52
+#: js/messages.php:465 templates/database/designer/side_menu.phtml:49
+#: templates/database/designer/side_menu.phtml:52
 #, fuzzy
 #| msgid "Free pages"
 msgid "Open page"
@@ -2604,7 +2610,7 @@ msgstr "Bo‘sh sahifalar soni"
 msgid "Delete page"
 msgstr "Jadvallarni tanlang"
 
-#: js/messages.php:467 templates/designer/side_menu.phtml:10
+#: js/messages.php:467 templates/database/designer/side_menu.phtml:10
 msgid "Untitled"
 msgstr ""
 
@@ -2728,7 +2734,7 @@ msgstr "Asl pozitsiya"
 msgid "cancel"
 msgstr "Bekor qilish"
 
-#: js/messages.php:499 libraries/server_status.lib.php:271
+#: js/messages.php:499 libraries/server_status.lib.php:280
 msgid "Aborted"
 msgstr "Uzildi"
 
@@ -3426,7 +3432,7 @@ msgstr "Noto‘g‘ri port nomeri"
 
 #: js/messages.php:793 libraries/Message.class.php:199
 #: libraries/Util.class.php:654 libraries/core.lib.php:245
-#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1172
+#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1170
 #: tbl_operations.php:229 view_operations.php:63
 msgid "Error"
 msgstr "Xatolik"
@@ -3488,8 +3494,8 @@ msgstr "sekundiga"
 msgid "per minute"
 msgstr "minutiga"
 
-#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:143
-#: libraries/server_status.lib.php:228
+#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:152
+#: libraries/server_status.lib.php:237
 #: libraries/server_status_queries.lib.php:98
 msgid "per hour"
 msgstr "soatiga"
@@ -3507,7 +3513,7 @@ msgstr ""
 msgid "Wrong permissions on configuration file, should not be world writable!"
 msgstr ""
 
-#: libraries/Config.class.php:1799
+#: libraries/Config.class.php:1801
 msgid "Font size"
 msgstr "Shrift o‘lchami"
 
@@ -3537,10 +3543,10 @@ msgstr "so‘rov bo‘yicha"
 #: libraries/server_privileges.lib.php:2890
 #: libraries/server_privileges.lib.php:3144
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4332
+#: libraries/server_privileges.lib.php:4358
 #: libraries/server_status_processes.lib.php:80
-#: templates/tbl_relation/foreign_key_row.phtml:165
-#: templates/tbl_relation/internal_relational_row.phtml:55
+#: templates/table/relation/foreign_key_row.phtml:165
+#: templates/table/relation/internal_relational_row.phtml:55
 msgid "Database"
 msgstr "Ma`lumotlar bazasi"
 
@@ -3650,11 +3656,11 @@ msgstr "SQL-so‘rovlar tarixi"
 #: libraries/plugins/import/ImportMediawiki.class.php:60
 #: libraries/plugins/import/ImportOds.class.php:59
 #: libraries/plugins/import/ImportShp.class.php:57
-#: libraries/plugins/import/ImportSql.class.php:148
+#: libraries/plugins/import/ImportSql.class.php:51
 #: libraries/plugins/import/ImportXml.class.php:58
-#: libraries/rte/rte_routines.lib.php:833 templates/index_form.phtml:49
-#: templates/structure/row_stats_table.phtml:20
-#: templates/table/options.phtml:2
+#: libraries/rte/rte_routines.lib.php:924 templates/table/index_form.phtml:49
+#: templates/table/search/options.phtml:2
+#: templates/table/structure/row_stats_table.phtml:20
 msgid "Options"
 msgstr "Parametrlar"
 
@@ -3697,7 +3703,8 @@ msgstr "Kamayish tartibida"
 msgid "Order:"
 msgstr ""
 
-#: libraries/Console.class.php:289 templates/table/replace_preview.phtml:17
+#: libraries/Console.class.php:289
+#: templates/table/search/replace_preview.phtml:17
 #, fuzzy
 #| msgid "Column names"
 msgid "Count"
@@ -3820,9 +3827,9 @@ msgstr "Nusxa olingan jadvalga o‘tish"
 #: libraries/operations.lib.php:794 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:191
-#: templates/structure/sortable_header.phtml:21
-#: templates/structure/sortable_header.phtml:38
-#: templates/table/options.phtml:68
+#: templates/database/structure/sortable_header.phtml:21
+#: templates/database/structure/sortable_header.phtml:38
+#: templates/table/search/options.phtml:68
 msgid "Ascending"
 msgstr "O‘sish tartibida"
 
@@ -3832,13 +3839,14 @@ msgstr "O‘sish tartibida"
 #: libraries/operations.lib.php:797 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:188
-#: templates/structure/sortable_header.phtml:26
-#: templates/structure/sortable_header.phtml:43
-#: templates/table/options.phtml:69
+#: templates/database/structure/sortable_header.phtml:26
+#: templates/database/structure/sortable_header.phtml:43
+#: templates/table/search/options.phtml:69
 msgid "Descending"
 msgstr "Kamayish tartibida"
 
-#: libraries/DBQbe.class.php:467 templates/table/search_and_replace.phtml:6
+#: libraries/DBQbe.class.php:467
+#: templates/table/search/search_and_replace.phtml:6
 #, fuzzy
 #| msgid "Column names"
 msgid "Column:"
@@ -4029,12 +4037,12 @@ msgstr[0] "<i>\"%s\"</i> jadvalida o‘xshashliklar soni \"%s\" ta"
 msgstr[1] "<i>\"%s\"</i> jadvalida o‘xshashliklar soni \"%s\" ta"
 
 #: libraries/DbSearch.class.php:354 libraries/Menu.class.php:311
-#: libraries/Util.class.php:3337 libraries/Util.class.php:3347
-#: libraries/Util.class.php:3623 libraries/Util.class.php:3624
-#: libraries/Util.class.php:4343 libraries/config.values.php:43
+#: libraries/Util.class.php:3343 libraries/Util.class.php:3353
+#: libraries/Util.class.php:3629 libraries/Util.class.php:3630
+#: libraries/Util.class.php:4349 libraries/config.values.php:43
 #: libraries/config.values.php:51 libraries/config.values.php:119
 #: libraries/navigation/Nodes/Node_Table.class.php:295
-#: templates/structure/check_all_table_column.phtml:5
+#: templates/table/structure/check_all_table_column.phtml:5
 msgid "Browse"
 msgstr "Ko‘rib chiqish"
 
@@ -4055,7 +4063,8 @@ msgid "Words or values to search for (wildcard: \"%\"):"
 msgstr ""
 "Qidirish uchun so‘z(lar) yoki qiymat(lar) (o‘rniga qo‘yish belgisi: \"%\"):"
 
-#: libraries/DbSearch.class.php:401 templates/table/search_and_replace.phtml:1
+#: libraries/DbSearch.class.php:401
+#: templates/table/search/search_and_replace.phtml:1
 msgid "Find:"
 msgstr "Izlash:"
 
@@ -4110,16 +4119,16 @@ msgstr "Filtr"
 msgid "Search this table"
 msgstr "Ma`lumotlar bazasida qidirish"
 
-#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2532
-#: libraries/Util.class.php:2535
+#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2538
+#: libraries/Util.class.php:2541
 #, fuzzy
 #| msgid "Begin"
 msgctxt "First page"
 msgid "Begin"
 msgstr "Boshi"
 
-#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2533
-#: libraries/Util.class.php:2536 libraries/server_bin_log.lib.php:170
+#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2539
+#: libraries/Util.class.php:2542 libraries/server_bin_log.lib.php:170
 #: libraries/server_bin_log.lib.php:172
 #, fuzzy
 #| msgid "Previous"
@@ -4127,8 +4136,8 @@ msgctxt "Previous page"
 msgid "Previous"
 msgstr "Orqaga"
 
-#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2564
-#: libraries/Util.class.php:2574 libraries/server_bin_log.lib.php:204
+#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2570
+#: libraries/Util.class.php:2580 libraries/server_bin_log.lib.php:204
 #: libraries/server_bin_log.lib.php:206
 #, fuzzy
 #| msgid "Next"
@@ -4136,8 +4145,8 @@ msgctxt "Next page"
 msgid "Next"
 msgstr "Keyingi"
 
-#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2565
-#: libraries/Util.class.php:2575
+#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2571
+#: libraries/Util.class.php:2581
 #, fuzzy
 #| msgid "End"
 msgctxt "Last page"
@@ -4226,9 +4235,9 @@ msgid "May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]."
 msgstr "Taxminiy bo‘lishi mumkin. [doc@faq3-11]\"FAQ 3.11\"[/doc]ga qarang"
 
 #: libraries/DisplayResults.class.php:4332 libraries/Message.class.php:180
-#: libraries/controllers/TableRelationController.class.php:258
+#: libraries/controllers/TableRelationController.class.php:259
 #: libraries/controllers/TableSearchController.class.php:655
-#: libraries/rte/rte_routines.lib.php:1332 libraries/sql_query_form.lib.php:89
+#: libraries/rte/rte_routines.lib.php:1423 libraries/sql_query_form.lib.php:89
 #: tbl_operations.php:227 tbl_row_action.php:138 view_operations.php:62
 #, fuzzy
 #| msgid "Your SQL query has been executed successfully."
@@ -4236,7 +4245,7 @@ msgid "Your SQL query has been executed successfully."
 msgstr "SQL so‘rovi muvaffaqiyatli bajarildi"
 
 #: libraries/DisplayResults.class.php:4660
-#: libraries/controllers/StructureController.class.php:629
+#: libraries/controllers/DatabaseStructureController.class.php:564
 #, php-format
 msgid ""
 "This view has at least this number of rows. Please refer to %sdocumentation"
@@ -4262,34 +4271,34 @@ msgstr ""
 msgid "%d total"
 msgstr "jami"
 
-#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1318
+#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1312
 #, fuzzy, php-format
 #| msgid "Query took %01.4f sec"
 msgid "Query took %01.4f seconds."
 msgstr "So‘rov %01.4f sekund vaqt oldi"
 
 #: libraries/DisplayResults.class.php:4807
-#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4767
-#: libraries/Util.class.php:4773 libraries/mult_submits.inc.php:50
-#: templates/structure/check_all_tables.phtml:2
-#: templates/structure/check_all_tables.phtml:9
+#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4773
+#: libraries/Util.class.php:4779 libraries/mult_submits.inc.php:50
+#: templates/database/structure/check_all_tables.phtml:2
+#: templates/database/structure/check_all_tables.phtml:9
 msgid "With selected:"
 msgstr "Belgilanganlarni:"
 
 #: libraries/DisplayResults.class.php:4811
-#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4769
-#: libraries/Util.class.php:4770 libraries/server_privileges.lib.php:1174
+#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4775
+#: libraries/Util.class.php:4776 libraries/server_privileges.lib.php:1174
 #: libraries/server_privileges.lib.php:1175
 #: libraries/server_privileges.lib.php:1387
 #: libraries/server_user_groups.lib.php:231
-#: templates/structure/check_all_tables.phtml:3
-#: templates/structure/check_all_tables.phtml:4
+#: templates/database/structure/check_all_tables.phtml:3
+#: templates/database/structure/check_all_tables.phtml:4
 msgid "Check All"
 msgstr "Barchasini belgilash"
 
 #: libraries/DisplayResults.class.php:4985 libraries/Header.class.php:383
-#: templates/structure/optional_action_links.phtml:1
-#: templates/structure/print_view_data_dictionary_link.phtml:3
+#: templates/database/structure/print_view_data_dictionary_link.phtml:3
+#: templates/table/structure/optional_action_links.phtml:1
 msgid "Print view"
 msgstr "Chop etish versiyasi"
 
@@ -4297,7 +4306,8 @@ msgstr "Chop etish versiyasi"
 msgid "Query results operations"
 msgstr "So‘rov natijalarini ishlatish"
 
-#: libraries/DisplayResults.class.php:5105 templates/tbl_chart.phtml:12
+#: libraries/DisplayResults.class.php:5105
+#: templates/table/chart/tbl_chart.phtml:12
 #, fuzzy
 #| msgid "Display PDF schema"
 msgid "Display chart"
@@ -4404,7 +4414,7 @@ msgid "Click on the bar to scroll to top of page"
 msgstr ""
 
 #: libraries/Header.class.php:749
-#: libraries/plugins/auth/AuthenticationCookie.class.php:152
+#: libraries/plugins/auth/AuthenticationCookie.class.php:140
 #, fuzzy
 #| msgid "Cookies must be enabled past this point."
 msgid "Javascript must be enabled past this point!"
@@ -4428,11 +4438,11 @@ msgid "Keyname"
 msgstr "Indeks nomi"
 
 #: libraries/Index.class.php:697
-#: libraries/controllers/StructureController.class.php:1962
-#: libraries/controllers/StructureController.class.php:1967
+#: libraries/controllers/TableStructureController.class.php:953
+#: libraries/controllers/TableStructureController.class.php:958
 #: libraries/tracking.lib.php:973
 #: templates/columns_definitions/column_indexes.phtml:11
-#: templates/structure/check_all_table_column.phtml:26
+#: templates/table/structure/check_all_table_column.phtml:26
 msgid "Unique"
 msgstr "Unikal"
 
@@ -4451,16 +4461,17 @@ msgstr "Elementlar soni"
 #: libraries/server_collations.lib.php:35 libraries/tracking.lib.php:881
 #: libraries/tracking.lib.php:977
 #: templates/columns_definitions/table_fields_definitions.phtml:33
-#: templates/structure/row_stats_table.phtml:31
-#: templates/structure/table_header.phtml:55
-#: templates/structure/table_structure_header.phtml:7
-#: templates/table/table_header.phtml:8
+#: templates/database/structure/table_header.phtml:55
+#: templates/table/search/table_header.phtml:8
+#: templates/table/structure/row_stats_table.phtml:31
+#: templates/table/structure/table_structure_header.phtml:7
 msgid "Collation"
 msgstr "Taqqoslash"
 
 #: libraries/Index.class.php:703 libraries/rte/rte_events.lib.php:496
-#: libraries/rte/rte_routines.lib.php:956 libraries/tracking.lib.php:885
-#: libraries/tracking.lib.php:979 templates/structure/table_header.phtml:84
+#: libraries/rte/rte_routines.lib.php:1047 libraries/tracking.lib.php:885
+#: libraries/tracking.lib.php:979
+#: templates/database/structure/table_header.phtml:84
 msgid "Comment"
 msgstr "Izoh"
 
@@ -4473,15 +4484,15 @@ msgstr "Birlamchi kalit o‘chirildi."
 msgid "Index %s has been dropped."
 msgstr "\"%s\" indeksi o‘chirildi."
 
-#: libraries/Index.class.php:757 libraries/Util.class.php:3630
-#: libraries/Util.class.php:3631
-#: libraries/controllers/StructureController.class.php:1958
-#: libraries/controllers/StructureController.class.php:1959
+#: libraries/Index.class.php:757 libraries/Util.class.php:3636
+#: libraries/Util.class.php:3637
+#: libraries/controllers/TableStructureController.class.php:949
+#: libraries/controllers/TableStructureController.class.php:950
 #: libraries/operations.lib.php:1607 libraries/rte/rte_list.lib.php:150
 #: libraries/server_databases.lib.php:146
-#: templates/structure/check_all_table_column.phtml:15
-#: templates/structure/check_all_tables.phtml:16
-#: templates/tbl_relation/foreign_key_row.phtml:93
+#: templates/database/structure/check_all_tables.phtml:16
+#: templates/table/relation/foreign_key_row.phtml:93
+#: templates/table/structure/check_all_table_column.phtml:15
 msgid "Drop"
 msgstr "O‘chirish"
 
@@ -4510,16 +4521,16 @@ msgstr "Server"
 #: libraries/Menu.class.php:248
 #: libraries/navigation/Nodes/Node_View.class.php:32
 #: libraries/tbl_info.inc.php:63
-#: templates/structure/structure_table_row.phtml:97
-#: templates/structure/structure_table_row.phtml:159
+#: templates/database/structure/structure_table_row.phtml:97
+#: templates/database/structure/structure_table_row.phtml:159
 msgid "View"
 msgstr "Namoyish"
 
 #: libraries/Menu.class.php:325 libraries/Menu.class.php:429
-#: libraries/Menu.class.php:548 libraries/Util.class.php:3334
-#: libraries/Util.class.php:3344 libraries/Util.class.php:3350
-#: libraries/Util.class.php:4313 libraries/Util.class.php:4328
-#: libraries/Util.class.php:4345 libraries/config.values.php:40
+#: libraries/Menu.class.php:548 libraries/Util.class.php:3340
+#: libraries/Util.class.php:3350 libraries/Util.class.php:3356
+#: libraries/Util.class.php:4319 libraries/Util.class.php:4334
+#: libraries/Util.class.php:4351 libraries/config.values.php:40
 #: libraries/config.values.php:48 libraries/config.values.php:110
 #: libraries/config.values.php:116 libraries/config/messages.inc.php:321
 #: libraries/navigation/Nodes/Node_Table.class.php:292
@@ -4527,19 +4538,19 @@ msgid "SQL"
 msgstr "SQL"
 
 #: libraries/Menu.class.php:328 libraries/Menu.class.php:432
-#: libraries/Util.class.php:3335 libraries/Util.class.php:3345
-#: libraries/Util.class.php:3351 libraries/Util.class.php:3625
-#: libraries/Util.class.php:3626 libraries/Util.class.php:4329
-#: libraries/Util.class.php:4346 libraries/config.values.php:41
+#: libraries/Util.class.php:3341 libraries/Util.class.php:3351
+#: libraries/Util.class.php:3357 libraries/Util.class.php:3631
+#: libraries/Util.class.php:3632 libraries/Util.class.php:4335
+#: libraries/Util.class.php:4352 libraries/config.values.php:41
 #: libraries/config.values.php:49 libraries/config.values.php:111
 #: libraries/config.values.php:117
 #: libraries/navigation/Nodes/Node_Table.class.php:286
 msgid "Search"
 msgstr "Qidirish"
 
-#: libraries/Menu.class.php:338 libraries/Util.class.php:3336
-#: libraries/Util.class.php:3346 libraries/Util.class.php:3627
-#: libraries/Util.class.php:3628 libraries/Util.class.php:4347
+#: libraries/Menu.class.php:338 libraries/Util.class.php:3342
+#: libraries/Util.class.php:3352 libraries/Util.class.php:3633
+#: libraries/Util.class.php:3634 libraries/Util.class.php:4353
 #: libraries/config.values.php:42 libraries/config.values.php:50
 #: libraries/config.values.php:118
 #: libraries/navigation/Nodes/Node_Table.class.php:289
@@ -4548,30 +4559,30 @@ msgid "Insert"
 msgstr "Qo‘yish"
 
 #: libraries/Menu.class.php:362 libraries/Menu.class.php:467
-#: libraries/Util.class.php:4334 libraries/Util.class.php:4350
+#: libraries/Util.class.php:4340 libraries/Util.class.php:4356
 #: libraries/config.values.php:106 libraries/server_common.lib.php:51
 #: libraries/server_privileges.lib.php:2370
 #: libraries/server_privileges.lib.php:3158
-#: libraries/server_privileges.lib.php:4221
+#: libraries/server_privileges.lib.php:4247
 msgid "Privileges"
 msgstr "Privilegiyalar"
 
 #: libraries/Menu.class.php:371 libraries/Menu.class.php:379
-#: libraries/Menu.class.php:459 libraries/Util.class.php:3338
-#: libraries/Util.class.php:3352 libraries/Util.class.php:4333
-#: libraries/Util.class.php:4351 libraries/config.values.php:112
+#: libraries/Menu.class.php:459 libraries/Util.class.php:3344
+#: libraries/Util.class.php:3358 libraries/Util.class.php:4339
+#: libraries/Util.class.php:4357 libraries/config.values.php:112
 #: view_operations.php:92
 msgid "Operations"
 msgstr "Operatsiyalar"
 
 #: libraries/Menu.class.php:384 libraries/Menu.class.php:492
-#: libraries/Util.class.php:4338 libraries/Util.class.php:4352
+#: libraries/Util.class.php:4344 libraries/Util.class.php:4358
 #: libraries/relation.lib.php:255
 msgid "Tracking"
 msgstr "Kuzatish"
 
 #: libraries/Menu.class.php:397 libraries/Menu.class.php:486
-#: libraries/Util.class.php:4337 libraries/Util.class.php:4353
+#: libraries/Util.class.php:4343 libraries/Util.class.php:4359
 #: libraries/navigation/Nodes/Node_Trigger_Container.class.php:24
 #: libraries/plugins/export/ExportHtmlword.class.php:557
 #: libraries/plugins/export/ExportOdt.class.php:685
@@ -4588,16 +4599,16 @@ msgstr "Triggerlar"
 msgid "Database seems to be empty!"
 msgstr "Ma`lumotlar bazasi bo‘sh!"
 
-#: libraries/Menu.class.php:439 libraries/Util.class.php:4330
+#: libraries/Menu.class.php:439 libraries/Util.class.php:4336
 msgid "Query"
 msgstr "So‘rov"
 
-#: libraries/Menu.class.php:472 libraries/Util.class.php:4335
+#: libraries/Menu.class.php:472 libraries/Util.class.php:4341
 #: libraries/rte/rte_words.lib.php:36
 msgid "Routines"
 msgstr "Muolajalar"
 
-#: libraries/Menu.class.php:479 libraries/Util.class.php:4336
+#: libraries/Menu.class.php:479 libraries/Util.class.php:4342
 #: libraries/navigation/Nodes/Node_Event_Container.class.php:26
 #: libraries/plugins/export/ExportSql.class.php:940
 #: libraries/plugins/export/ExportXml.class.php:107
@@ -4605,22 +4616,22 @@ msgstr "Muolajalar"
 msgid "Events"
 msgstr "Hodisalar"
 
-#: libraries/Menu.class.php:498 libraries/Util.class.php:4339
+#: libraries/Menu.class.php:498 libraries/Util.class.php:4345
 msgid "Designer"
 msgstr "Dizayner"
 
-#: libraries/Menu.class.php:507 libraries/Util.class.php:4340
-#: templates/structure/check_all_tables.phtml:35
+#: libraries/Menu.class.php:507 libraries/Util.class.php:4346
+#: templates/database/structure/check_all_tables.phtml:35
 #, fuzzy
 #| msgid "CHAR textarea columns"
 msgid "Central columns"
 msgstr "CHAR maydonidagi ustunlar soni"
 
-#: libraries/Menu.class.php:544 libraries/Util.class.php:4312
+#: libraries/Menu.class.php:544 libraries/Util.class.php:4318
 #: libraries/config.values.php:103 libraries/config/messages.inc.php:266
 #: libraries/config/messages.inc.php:341
 #: libraries/navigation/NavigationTree.class.php:1239
-#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4332
+#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4358
 msgid "Databases"
 msgstr "Ma`lumotlar bazalari"
 
@@ -4631,34 +4642,34 @@ msgid "User accounts"
 msgstr "Foydalanuvchi"
 
 #: libraries/Menu.class.php:595 libraries/ServerStatusData.class.php:121
-#: libraries/Util.class.php:4319 libraries/server_common.lib.php:36
+#: libraries/Util.class.php:4325 libraries/server_common.lib.php:36
 msgid "Binary log"
 msgstr "Ikkilik jurnal"
 
 #: libraries/Menu.class.php:601 libraries/ServerStatusData.class.php:126
-#: libraries/Util.class.php:4320 libraries/server_common.lib.php:42
-#: templates/structure/body_for_table_summary.phtml:10
-#: templates/structure/table_header.phtml:27
+#: libraries/Util.class.php:4326 libraries/server_common.lib.php:42
+#: templates/database/structure/body_for_table_summary.phtml:10
+#: templates/database/structure/table_header.phtml:27
 msgid "Replication"
 msgstr "Replikatsiya (zaxira nusxa ko‘chirish)"
 
 #: libraries/Menu.class.php:606 libraries/ServerStatusData.class.php:193
-#: libraries/Util.class.php:4321 libraries/config.values.php:105
+#: libraries/Util.class.php:4327 libraries/config.values.php:105
 #: libraries/server_engines.lib.php:108 libraries/server_engines.lib.php:112
 #: libraries/sql_query_form.lib.php:421
 msgid "Variables"
 msgstr "O‘zgaruvchilar"
 
-#: libraries/Menu.class.php:610 libraries/Util.class.php:4322
+#: libraries/Menu.class.php:610 libraries/Util.class.php:4328
 msgid "Charsets"
 msgstr "Kodirovkalar"
 
-#: libraries/Menu.class.php:615 libraries/Util.class.php:4323
+#: libraries/Menu.class.php:615 libraries/Util.class.php:4329
 #: libraries/server_common.lib.php:33 libraries/server_plugins.lib.php:27
 msgid "Plugins"
 msgstr ""
 
-#: libraries/Menu.class.php:626 libraries/Util.class.php:4324
+#: libraries/Menu.class.php:626 libraries/Util.class.php:4330
 msgid "Engines"
 msgstr "Jadval turlari"
 
@@ -4686,7 +4697,7 @@ msgid_plural "%1$d rows inserted."
 msgstr[0] "%1$d ta qatorlar qo‘yildi."
 msgstr[1] "%1$d ta qatorlar qo‘yildi."
 
-#: libraries/PDF.class.php:70 libraries/Util.class.php:2521
+#: libraries/PDF.class.php:70 libraries/Util.class.php:2527
 #: libraries/browse_foreigners.lib.php:327
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:865
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:890
@@ -4713,7 +4724,7 @@ msgid "Could not save favorite table!"
 msgstr "Konfiguratsiyani yuklab yoki saqlab bo‘lmadi"
 
 #: libraries/RecentFavoriteTable.class.php:212
-#: templates/structure/favorite_anchor.phtml:12
+#: templates/database/structure/favorite_anchor.phtml:12
 #, fuzzy
 #| msgid "Rename database to"
 msgid "Remove from Favorites"
@@ -4899,7 +4910,7 @@ msgid ""
 msgstr "Ushbu turdagi jadvallar haqida qo‘shimcha ma`lumot mavjud emas."
 
 #: libraries/StorageEngine.class.php:373
-#: templates/structure/body_for_table_summary.phtml:50
+#: templates/database/structure/body_for_table_summary.phtml:50
 #, php-format
 msgid "%s is the default storage engine on this MySQL server."
 msgstr "\"%s\" - MySQL serveridagi andozaviy ma`lumotlar jadvali turi."
@@ -5335,10 +5346,10 @@ msgstr ""
 
 #: libraries/Util.class.php:726 libraries/rte/rte_events.lib.php:110
 #: libraries/rte/rte_events.lib.php:119 libraries/rte/rte_events.lib.php:150
-#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:153
-#: libraries/rte/rte_routines.lib.php:162
-#: libraries/rte/rte_routines.lib.php:235
-#: libraries/rte/rte_routines.lib.php:1366
+#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:223
+#: libraries/rte/rte_routines.lib.php:250
+#: libraries/rte/rte_routines.lib.php:372
+#: libraries/rte/rte_routines.lib.php:1457
 #: libraries/rte/rte_triggers.lib.php:86 libraries/rte/rte_triggers.lib.php:95
 #: libraries/rte/rte_triggers.lib.php:127
 msgid "MySQL said: "
@@ -5384,84 +5395,87 @@ msgstr "Yaksh"
 msgid "%B %d, %Y at %I:%M %p"
 msgstr "%d %B %Y y., %H:%M"
 
-#: libraries/Util.class.php:2019
+#: libraries/Util.class.php:2025
 #, php-format
 msgid "%s days, %s hours, %s minutes and %s seconds"
 msgstr "\"%s\" kun, \"%s\" soat, \"%s\" minut va \"%s\" sekund"
 
-#: libraries/Util.class.php:2112
+#: libraries/Util.class.php:2118
 #, fuzzy
 #| msgid "Routines"
 msgid "Missing parameter:"
 msgstr "Muolajalar"
 
-#: libraries/Util.class.php:2645
+#: libraries/Util.class.php:2651
 #, php-format
 msgid "Jump to database \"%s\"."
 msgstr "\"%s\" ma`lumotlar bazasiga o‘tish."
 
-#: libraries/Util.class.php:2670
+#: libraries/Util.class.php:2676
 #, php-format
 msgid "The %s functionality is affected by a known bug, see %s"
 msgstr ""
 "\"%s\" parametrining ishi ma`lum xatolikka olib kelishi mumkin, batafsil "
 "ma`lumot uchun qarang \"%s\""
 
-#: libraries/Util.class.php:2881
+#: libraries/Util.class.php:2887
 #, fuzzy
 #| msgid "Click to select"
 msgid "Click to toggle"
 msgstr "Tanlash uchun sichqoncha tugmasini bosing"
 
-#: libraries/Util.class.php:3542 prefs_manage.php:248
+#: libraries/Util.class.php:3548 prefs_manage.php:248
 msgid "Browse your computer:"
 msgstr ""
 
-#: libraries/Util.class.php:3567
+#: libraries/Util.class.php:3573
 #, fuzzy, php-format
 #| msgid "web server upload directory"
 msgid "Select from the web server upload directory <b>%s</b>:"
 msgstr "Yuklash katalogidan"
 
-#: libraries/Util.class.php:3596 libraries/insert_edit.lib.php:1173
+#: libraries/Util.class.php:3602 libraries/insert_edit.lib.php:1171
 msgid "The directory you set for upload work cannot be reached."
 msgstr "Ko‘rsatilgan katalokka yuklab bo‘lmadi."
 
-#: libraries/Util.class.php:3607
+#: libraries/Util.class.php:3613
 #, fuzzy
 #| msgid "There are no configured servers"
 msgid "There are no files to upload!"
 msgstr "Bironta ham konfiguratsiyalangan server mavjud emas"
 
-#: libraries/Util.class.php:3632 libraries/Util.class.php:3633
-#: templates/structure/check_all_tables.phtml:15
+#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: templates/database/structure/check_all_tables.phtml:15
 msgid "Empty"
 msgstr "Tozalash"
 
-#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: libraries/Util.class.php:3644 libraries/Util.class.php:3645
 msgid "Execute"
 msgstr ""
 
-#: libraries/Util.class.php:4152
+#: libraries/Util.class.php:4158
 msgid "Print"
 msgstr "Chop etish"
 
-#: libraries/Util.class.php:4257 templates/structure/row_stats_table.phtml:80
-#: templates/structure/table_header.phtml:95
+#: libraries/Util.class.php:4263
+#: templates/database/structure/table_header.phtml:95
+#: templates/table/structure/row_stats_table.phtml:80
 msgid "Creation"
 msgstr "Tuzish"
 
-#: libraries/Util.class.php:4263 templates/structure/row_stats_table.phtml:87
-#: templates/structure/table_header.phtml:106
+#: libraries/Util.class.php:4269
+#: templates/database/structure/table_header.phtml:106
+#: templates/table/structure/row_stats_table.phtml:87
 msgid "Last update"
 msgstr "Oxirgi yangilanish"
 
-#: libraries/Util.class.php:4269 templates/structure/row_stats_table.phtml:94
-#: templates/structure/table_header.phtml:117
+#: libraries/Util.class.php:4275
+#: templates/database/structure/table_header.phtml:117
+#: templates/table/structure/row_stats_table.phtml:94
 msgid "Last check"
 msgstr "Oxirgi tekshiruv"
 
-#: libraries/Util.class.php:4315
+#: libraries/Util.class.php:4321
 #, fuzzy
 #| msgid "User"
 msgid "Users"
@@ -5486,16 +5500,16 @@ msgid "Use this value"
 msgstr "Ushbu qiymatni ishlatish"
 
 #: libraries/build_html_for_db.lib.php:33 libraries/import.lib.php:193
-#: templates/structure/actions_in_table_structure.phtml:113
-#: templates/structure/row_stats_table.phtml:42
-#: templates/structure/table_header.phtml:36
+#: templates/database/structure/table_header.phtml:36
+#: templates/table/structure/actions_in_table_structure.phtml:113
+#: templates/table/structure/row_stats_table.phtml:42
 msgid "Rows"
 msgstr "Qatorlarsoni"
 
 #: libraries/build_html_for_db.lib.php:48 libraries/engines/innodb.lib.php:171
-#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:186
-#: libraries/server_status.lib.php:298
-#: templates/structure/display_table_stats.phtml:40
+#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:195
+#: libraries/server_status.lib.php:307
+#: templates/table/structure/display_table_stats.phtml:40
 msgid "Total"
 msgstr "Jami"
 
@@ -5506,12 +5520,14 @@ msgid "Jump to database"
 msgstr "Ushbu bazaga o‘tish"
 
 #: libraries/build_html_for_db.lib.php:146
+#: templates/database/structure/structure_table_row.phtml:15
 #, fuzzy
 #| msgid "Master replication"
 msgid "Not replicated"
 msgstr "Bosh sеrvеr rеplikatsiyasi"
 
 #: libraries/build_html_for_db.lib.php:158
+#: templates/database/structure/structure_table_row.phtml:16
 #, fuzzy
 #| msgid "Replication"
 msgid "Replicated"
@@ -5570,17 +5586,17 @@ msgstr ""
 #: libraries/plugins/export/ExportTexytext.class.php:425
 #: libraries/plugins/export/PMA_ExportPdf.class.php:307
 #: libraries/rte/rte_list.lib.php:73 libraries/rte/rte_list.lib.php:85
-#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:830
-#: libraries/rte/rte_routines.lib.php:1492 setup/frames/index.inc.php:162
+#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:921
+#: libraries/rte/rte_routines.lib.php:1583 setup/frames/index.inc.php:162
 #: templates/columns_definitions/table_fields_definitions.phtml:8
-#: templates/structure/table_structure_header.phtml:5
-#: templates/table/create_table.phtml:11
+#: templates/database/create_table.phtml:11
+#: templates/table/structure/table_structure_header.phtml:5
 msgid "Name"
 msgstr "Nomi"
 
 #: libraries/central_columns.lib.php:699
 #: libraries/central_columns.lib.php:1381
-#: libraries/rte/rte_routines.lib.php:832
+#: libraries/rte/rte_routines.lib.php:923
 #: templates/columns_definitions/table_fields_definitions.phtml:14
 msgid "Length/Values"
 msgstr "Uzunlik/qiymatlar"
@@ -5603,7 +5619,7 @@ msgid "Select a table"
 msgstr "Jadvallarni tanlang"
 
 #: libraries/central_columns.lib.php:804
-#: templates/structure/add_column.phtml:4
+#: templates/table/structure/add_column.phtml:4
 #, fuzzy
 #| msgid "Add column(s)"
 msgid "Add column"
@@ -5625,7 +5641,7 @@ msgstr "Ustun(lar) qo‘shish"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1002
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1025
 #: templates/columns_definitions/table_fields_definitions.phtml:36
-#: templates/structure/table_structure_header.phtml:8
+#: templates/table/structure/table_structure_header.phtml:8
 msgid "Attributes"
 msgstr "Atributlar"
 
@@ -5753,7 +5769,7 @@ msgid "Double click"
 msgstr ""
 
 #: libraries/config.values.php:95 libraries/config.values.php:124
-#: libraries/config/FormDisplay.tpl.php:221 libraries/relation.lib.php:97
+#: libraries/config/FormDisplay.tpl.php:232 libraries/relation.lib.php:97
 #: libraries/relation.lib.php:105
 msgid "Disabled"
 msgstr "Faolsizlantirilgan"
@@ -5952,21 +5968,21 @@ msgstr ""
 msgid "maximum %s"
 msgstr "Maksimal jadvallar soni"
 
-#: libraries/config/FormDisplay.tpl.php:219
+#: libraries/config/FormDisplay.tpl.php:230
 msgid "This setting is disabled, it will not be applied to your configuration."
 msgstr ""
 
-#: libraries/config/FormDisplay.tpl.php:313
+#: libraries/config/FormDisplay.tpl.php:324
 #, php-format
 msgid "Set value: %s"
 msgstr "Quyidagi qiymatni o‘rnatish: \"%s\""
 
-#: libraries/config/FormDisplay.tpl.php:318
+#: libraries/config/FormDisplay.tpl.php:329
 #: libraries/config/messages.inc.php:610
 msgid "Restore default value"
 msgstr "Asl qiymatlarni tiklash"
 
-#: libraries/config/FormDisplay.tpl.php:332
+#: libraries/config/FormDisplay.tpl.php:343
 msgid "Allow users to customize this value"
 msgstr ""
 
@@ -6584,7 +6600,7 @@ msgstr "Fayl kodirovkasi"
 
 #: libraries/config/messages.inc.php:136 libraries/config/messages.inc.php:152
 #: libraries/sql_query_form.lib.php:247
-#: templates/structure/row_stats_table.phtml:7
+#: templates/table/structure/row_stats_table.phtml:7
 msgid "Format"
 msgstr "Format"
 
@@ -7201,7 +7217,7 @@ msgstr ""
 
 #: libraries/config/messages.inc.php:332
 #: libraries/plugins/export/ExportPdf.class.php:279
-#: templates/structure/secondary_tabs.phtml:8
+#: templates/table/secondary_tabs.phtml:8
 #, fuzzy
 #| msgid "Database for user"
 msgid "Table structure"
@@ -9209,112 +9225,35 @@ msgstr "Microsoft Word 2000"
 msgid "OpenDocument Text"
 msgstr "OpenDocument matn"
 
-#: libraries/controllers/StructureController.class.php:465
+#: libraries/controllers/DatabaseStructureController.class.php:405
 #: tbl_operations.php:382
 #, php-format
 msgid "Table %s has been emptied."
 msgstr "\"%s\" jadvali tozalandi."
 
-#: libraries/controllers/StructureController.class.php:486
+#: libraries/controllers/DatabaseStructureController.class.php:426
 #: tbl_operations.php:400 view_operations.php:119
 #, fuzzy, php-format
 #| msgid "View %s has been dropped."
 msgid "View %s has been dropped."
 msgstr "\"%s\" namoyishi o‘chirildi"
 
-#: libraries/controllers/StructureController.class.php:487
+#: libraries/controllers/DatabaseStructureController.class.php:427
 #: tbl_operations.php:401
 #, fuzzy, php-format
 #| msgid "Table %s has been dropped."
 msgid "Table %s has been dropped."
 msgstr "\"%s\" jadvali o‘chirildi"
 
-#: libraries/controllers/StructureController.class.php:797
-#, php-format
-msgid "The name '%s' is a MySQL reserved keyword."
-msgid_plural "The names '%s' are MySQL reserved keywords."
-msgstr[0] ""
-
-#: libraries/controllers/StructureController.class.php:875
-#, fuzzy
-#| msgid "No rows selected"
-msgid "No column selected."
-msgstr ""
-"Amalni amalga oshirish uchun bitta yoki bir nechta qatorni tanlash kerak."
-
-#: libraries/controllers/StructureController.class.php:1049
+#: libraries/controllers/DatabaseStructureController.class.php:733
 msgid "Favorite List is full!"
 msgstr ""
 
-#: libraries/controllers/StructureController.class.php:1272
-#, fuzzy
-#| msgid "The selected users have been deleted successfully."
-msgid "The columns have been moved successfully."
-msgstr "Belgilangan foydalanuvchilar muvaffaqiyatli o‘chirildi."
-
-#: libraries/controllers/StructureController.class.php:1535
-#, fuzzy, php-format
-#| msgid "Table %1$s has been altered successfully."
-msgid ""
-"Table %1$s has been altered successfully. Privileges have been adjusted."
-msgstr "%1$s jadvali muvaffaqiyatli o‘zgartirildi."
-
-#: libraries/controllers/StructureController.class.php:1541
-#: libraries/controllers/TableIndexesController.class.php:161
-#: tbl_addfield.php:92
-#, php-format
-msgid "Table %1$s has been altered successfully."
-msgstr "%1$s jadvali muvaffaqiyatli o‘zgartirildi."
-
-#: libraries/controllers/StructureController.class.php:1588
-#: libraries/tracking.lib.php:1094
-#, fuzzy
-#| msgid "Ignore errors"
-msgid "Query error"
-msgstr "Xatolarga e`tibor bermaslik"
-
-#: libraries/controllers/StructureController.class.php:1806
+#: libraries/controllers/DatabaseStructureController.class.php:947
 #: libraries/mysql_charsets.lib.php:366 libraries/mysql_charsets.lib.php:373
 msgid "unknown"
 msgstr "noma`lum"
 
-#: libraries/controllers/StructureController.class.php:1957
-#: templates/structure/check_all_table_column.phtml:11
-msgid "Change"
-msgstr "O‘zgartirish"
-
-#: libraries/controllers/StructureController.class.php:1961
-#: libraries/controllers/StructureController.class.php:1966
-#: libraries/navigation/Nodes/Node_Index.class.php:30
-#: libraries/tracking.lib.php:926
-#: templates/columns_definitions/column_indexes.phtml:16
-#: templates/columns_definitions/table_fields_definitions.phtml:57
-#: templates/structure/check_all_table_column.phtml:30
-#: templates/structure/display_structure.phtml:79
-#: templates/structure/display_table_stats.phtml:19
-msgid "Index"
-msgstr "Indeks"
-
-#: libraries/controllers/StructureController.class.php:1963
-#: libraries/controllers/StructureController.class.php:1968
-#: templates/columns_definitions/column_indexes.phtml:27
-#: templates/structure/check_all_table_column.phtml:37
-msgid "Spatial"
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1964
-#: libraries/controllers/StructureController.class.php:1969
-#: templates/columns_definitions/column_indexes.phtml:22
-#: templates/structure/check_all_table_column.phtml:47
-msgid "Fulltext"
-msgstr "Matn to‘laligicha"
-
-#: libraries/controllers/StructureController.class.php:1970
-#, fuzzy
-#| msgid "Browse distinct values"
-msgid "Distinct values"
-msgstr "Turli qiymatlarni ko‘rib chiqish"
-
 #: libraries/controllers/TableChartController.class.php:82
 #: libraries/controllers/TableGisVisualizationController.class.php:101
 msgid "No SQL query was set to fetch data."
@@ -9330,13 +9269,20 @@ msgstr ""
 msgid "No data to display"
 msgstr "Ma`lumotlar bazasi mavjud emas"
 
-#: libraries/controllers/TableRelationController.class.php:217
+#: libraries/controllers/TableIndexesController.class.php:161
+#: libraries/controllers/TableStructureController.class.php:736
+#: tbl_addfield.php:92
+#, php-format
+msgid "Table %1$s has been altered successfully."
+msgstr "%1$s jadvali muvaffaqiyatli o‘zgartirildi."
+
+#: libraries/controllers/TableRelationController.class.php:218
 #, fuzzy
 #| msgid "Thread %s was successfully killed."
 msgid "Display column was successfully updated."
 msgstr "\"%s\" jarayoni muvaffaqiyatli yakunlandi."
 
-#: libraries/controllers/TableRelationController.class.php:283
+#: libraries/controllers/TableRelationController.class.php:288
 #, fuzzy
 #| msgid "Internal relation added"
 msgid "Internal relations were successfully updated."
@@ -9355,12 +9301,82 @@ msgid "Zoom search"
 msgstr "Qidirish"
 
 #: libraries/controllers/TableSearchController.class.php:852
-#: templates/table/selection_form.phtml:59
+#: templates/table/search/selection_form.phtml:59
 #, fuzzy
 #| msgid "SQL Query box"
 msgid "Find and replace"
 msgstr "SQL so‘rovlari qutisi"
 
+#: libraries/controllers/TableStructureController.class.php:163
+#, php-format
+msgid "The name '%s' is a MySQL reserved keyword."
+msgid_plural "The names '%s' are MySQL reserved keywords."
+msgstr[0] ""
+
+#: libraries/controllers/TableStructureController.class.php:241
+#, fuzzy
+#| msgid "No rows selected"
+msgid "No column selected."
+msgstr ""
+"Amalni amalga oshirish uchun bitta yoki bir nechta qatorni tanlash kerak."
+
+#: libraries/controllers/TableStructureController.class.php:467
+#, fuzzy
+#| msgid "The selected users have been deleted successfully."
+msgid "The columns have been moved successfully."
+msgstr "Belgilangan foydalanuvchilar muvaffaqiyatli o‘chirildi."
+
+#: libraries/controllers/TableStructureController.class.php:730
+#, fuzzy, php-format
+#| msgid "Table %1$s has been altered successfully."
+msgid ""
+"Table %1$s has been altered successfully. Privileges have been adjusted."
+msgstr "%1$s jadvali muvaffaqiyatli o‘zgartirildi."
+
+#: libraries/controllers/TableStructureController.class.php:783
+#: libraries/tracking.lib.php:1094
+#, fuzzy
+#| msgid "Ignore errors"
+msgid "Query error"
+msgstr "Xatolarga e`tibor bermaslik"
+
+#: libraries/controllers/TableStructureController.class.php:948
+#: templates/table/structure/check_all_table_column.phtml:11
+msgid "Change"
+msgstr "O‘zgartirish"
+
+#: libraries/controllers/TableStructureController.class.php:952
+#: libraries/controllers/TableStructureController.class.php:957
+#: libraries/navigation/Nodes/Node_Index.class.php:30
+#: libraries/tracking.lib.php:926
+#: templates/columns_definitions/column_indexes.phtml:16
+#: templates/columns_definitions/table_fields_definitions.phtml:57
+#: templates/table/structure/check_all_table_column.phtml:30
+#: templates/table/structure/display_structure.phtml:79
+#: templates/table/structure/display_table_stats.phtml:19
+msgid "Index"
+msgstr "Indeks"
+
+#: libraries/controllers/TableStructureController.class.php:954
+#: libraries/controllers/TableStructureController.class.php:959
+#: templates/columns_definitions/column_indexes.phtml:27
+#: templates/table/structure/check_all_table_column.phtml:37
+msgid "Spatial"
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:955
+#: libraries/controllers/TableStructureController.class.php:960
+#: templates/columns_definitions/column_indexes.phtml:22
+#: templates/table/structure/check_all_table_column.phtml:47
+msgid "Fulltext"
+msgstr "Matn to‘laligicha"
+
+#: libraries/controllers/TableStructureController.class.php:963
+#, fuzzy
+#| msgid "Browse distinct values"
+msgid "Distinct values"
+msgstr "Turli qiymatlarni ko‘rib chiqish"
+
 #: libraries/core.lib.php:306
 #, php-format
 msgid "The %s extension is missing. Please check your PHP configuration."
@@ -9409,7 +9425,7 @@ msgid "No Password"
 msgstr "Parol yo‘q"
 
 #: libraries/display_change_password.lib.php:68
-#: libraries/plugins/auth/AuthenticationCookie.class.php:199
+#: libraries/plugins/auth/AuthenticationCookie.class.php:187
 #: libraries/replication_gui.lib.php:422 libraries/replication_gui.lib.php:862
 #: libraries/server_privileges.lib.php:1640
 msgid "Password:"
@@ -10298,12 +10314,12 @@ msgid "Dump has been saved to file %s."
 msgstr "Damp \"%s\" faylida saqlandi."
 
 #: libraries/import.lib.php:202 libraries/insert_edit.lib.php:124
-#: libraries/rte/rte_routines.lib.php:1353 libraries/sql.lib.php:1312
+#: libraries/rte/rte_routines.lib.php:1444 libraries/sql.lib.php:1306
 #: tbl_get_field.php:44
 msgid "MySQL returned an empty result set (i.e. zero rows)."
 msgstr "MySQL bo‘sh natija berdi (ya`ni nolta satr)."
 
-#: libraries/import.lib.php:265 libraries/sql.lib.php:1326
+#: libraries/import.lib.php:265 libraries/sql.lib.php:1320
 msgid "[ROLLBACK occurred.]"
 msgstr ""
 
@@ -10382,14 +10398,14 @@ msgstr "\"%s\" maydon uchun indeks tuzish"
 
 #: libraries/insert_edit.lib.php:233
 #: libraries/navigation/Nodes/Node_DatabaseChild.class.php:48
-#: templates/designer/table_list.phtml:40
+#: templates/database/designer/table_list.phtml:40
 msgid "Hide"
 msgstr "Yashirish"
 
 #: libraries/insert_edit.lib.php:249
 #: libraries/navigation/Nodes/Node_Function.class.php:32
-#: libraries/rte/rte_routines.lib.php:1495
-#: templates/table/table_header.phtml:4
+#: libraries/rte/rte_routines.lib.php:1586
+#: templates/table/search/table_header.phtml:4
 msgid "Function"
 msgstr "Funksiya"
 
@@ -10404,89 +10420,90 @@ msgstr "Ikkilik"
 msgid "Because of its length,<br /> this column might not be editable."
 msgstr "Ma`lumotlar ko‘pligi sabali<br />o‘zgartirish qiyishlashishi mumkin"
 
-#: libraries/insert_edit.lib.php:1050
+#: libraries/insert_edit.lib.php:1048
 msgid "Binary - do not edit"
 msgstr "Ikkilik ma`lumot - tahrirlash mumkin emas"
 
-#: libraries/insert_edit.lib.php:1176 libraries/server_privileges.lib.php:470
-#: templates/table/options.phtml:36
+#: libraries/insert_edit.lib.php:1174 libraries/server_privileges.lib.php:470
+#: templates/table/search/options.phtml:36
 msgid "Or"
 msgstr "Yoki"
 
-#: libraries/insert_edit.lib.php:1177
+#: libraries/insert_edit.lib.php:1175
 #, fuzzy
 #| msgid "web server upload directory"
 msgid "web server upload directory:"
 msgstr "Yuklash katalogidan"
 
-#: libraries/insert_edit.lib.php:1348 templates/table/input_box.phtml:49
+#: libraries/insert_edit.lib.php:1346
+#: templates/table/search/input_box.phtml:49
 #, fuzzy
 #| msgid "Insert"
 msgid "Edit/Insert"
 msgstr "Qo‘yish"
 
-#: libraries/insert_edit.lib.php:1398
+#: libraries/insert_edit.lib.php:1396
 #, fuzzy, php-format
 #| msgid "Restart insertion with %s rows"
 msgid "Continue insertion with %s rows"
 msgstr "Qo‘yilayotgan qatorlar soni: \"%s\""
 
-#: libraries/insert_edit.lib.php:1428
+#: libraries/insert_edit.lib.php:1426
 msgid "and then"
 msgstr "va so‘ng"
 
-#: libraries/insert_edit.lib.php:1461
+#: libraries/insert_edit.lib.php:1459
 msgid "Insert as new row"
 msgstr "Yozuv kiritish"
 
-#: libraries/insert_edit.lib.php:1464
+#: libraries/insert_edit.lib.php:1462
 msgid "Insert as new row and ignore errors"
 msgstr "Yangi qator sifatida qo‘shish va xatoliklarga e’tibor bеrmaslik"
 
-#: libraries/insert_edit.lib.php:1467
+#: libraries/insert_edit.lib.php:1465
 msgid "Show insert query"
 msgstr "Kiritilgan so‘rovni ko‘rsatish"
 
-#: libraries/insert_edit.lib.php:1487
+#: libraries/insert_edit.lib.php:1485
 msgid "Go back to previous page"
 msgstr "Oldingi sahifaga o‘tish"
 
-#: libraries/insert_edit.lib.php:1490
+#: libraries/insert_edit.lib.php:1488
 msgid "Insert another new row"
 msgstr "Yangi yozuv kiritish"
 
-#: libraries/insert_edit.lib.php:1495
+#: libraries/insert_edit.lib.php:1493
 msgid "Go back to this page"
 msgstr "Ushbu sahifaga qaytish"
 
-#: libraries/insert_edit.lib.php:1518
+#: libraries/insert_edit.lib.php:1516
 msgid "Edit next row"
 msgstr "Keyingi qatorni tahrirlash"
 
-#: libraries/insert_edit.lib.php:1540
+#: libraries/insert_edit.lib.php:1538
 msgid ""
 "Use TAB key to move from value to value, or CTRL+arrows to move anywhere"
 msgstr ""
 "Maydonlararo o‘tish uchun TAB tugmasi yoki CTRL+strelka tugmalaridan "
 "foydalaning"
 
-#: libraries/insert_edit.lib.php:1577 libraries/replication_gui.lib.php:542
-#: libraries/rte/rte_routines.lib.php:1497
+#: libraries/insert_edit.lib.php:1575 libraries/replication_gui.lib.php:542
+#: libraries/rte/rte_routines.lib.php:1588
 #: libraries/server_status_variables.lib.php:220
-#: templates/designer/having_query_panel.phtml:100
-#: templates/designer/options_panel.phtml:73
-#: templates/designer/options_panel.phtml:239
-#: templates/designer/where_query_panel.phtml:69
-#: templates/table/table_header.phtml:10
-#: templates/table/zoom_result_form.phtml:35
+#: templates/database/designer/having_query_panel.phtml:100
+#: templates/database/designer/options_panel.phtml:73
+#: templates/database/designer/options_panel.phtml:239
+#: templates/database/designer/where_query_panel.phtml:69
+#: templates/table/search/table_header.phtml:10
+#: templates/table/search/zoom_result_form.phtml:35
 msgid "Value"
 msgstr "Qiymati"
 
-#: libraries/insert_edit.lib.php:1937 libraries/sql.lib.php:1309
+#: libraries/insert_edit.lib.php:1935 libraries/sql.lib.php:1303
 msgid "Showing SQL query"
 msgstr "SQL-so‘rovni ko‘rsatish"
 
-#: libraries/insert_edit.lib.php:1962 libraries/sql.lib.php:1287
+#: libraries/insert_edit.lib.php:1960 libraries/sql.lib.php:1281
 #, php-format
 msgid "Inserted row id: %1$d"
 msgstr "Kiritilgan qator identifikatori: %1$d"
@@ -10938,7 +10955,7 @@ msgstr ""
 #: libraries/navigation/Nodes/Node_View_Container.class.php:26
 #: libraries/navigation/Nodes/Node_View_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:129
-#: templates/structure/show_create.phtml:30
+#: templates/database/structure/show_create.phtml:30
 #, fuzzy
 #| msgid "View"
 msgid "Views"
@@ -11251,7 +11268,7 @@ msgstr "Ushbu sahifaga kirish uchun Sizda yetarli huquq mavjud emas!"
 
 #: libraries/operations.lib.php:101 libraries/operations.lib.php:249
 #: libraries/operations.lib.php:869 libraries/operations.lib.php:963
-#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:907
+#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:998
 #: templates/columns_definitions/table_fields_definitions.phtml:47
 #, fuzzy
 #| msgid "Edit Privileges"
@@ -11349,22 +11366,22 @@ msgid "Switch to copied table"
 msgstr "Nusxa olingan jadvalga o‘tish"
 
 #: libraries/operations.lib.php:1360
-#: templates/structure/check_all_tables.phtml:18
+#: templates/database/structure/check_all_tables.phtml:18
 msgid "Table maintenance"
 msgstr "Jadvalga xizmat ko‘rsatish"
 
 #: libraries/operations.lib.php:1398
-#: templates/structure/check_all_tables.phtml:19
+#: templates/database/structure/check_all_tables.phtml:19
 msgid "Analyze table"
 msgstr "Jadval tahlili"
 
 #: libraries/operations.lib.php:1413
-#: templates/structure/check_all_tables.phtml:20
+#: templates/database/structure/check_all_tables.phtml:20
 msgid "Check table"
 msgstr "Jadvalni tekshirish"
 
 #: libraries/operations.lib.php:1428
-#: templates/structure/check_all_tables.phtml:22
+#: templates/database/structure/check_all_tables.phtml:22
 #, fuzzy
 #| msgid "Check table"
 msgid "Checksum table"
@@ -11386,18 +11403,19 @@ msgid "Flush the table (FLUSH)"
 msgstr "Jadval keshini yangilash (\"FLUSH\")"
 
 #: libraries/operations.lib.php:1477
-#: templates/structure/check_all_tables.phtml:23
-#: templates/structure/display_table_stats.phtml:56
+#: templates/database/structure/check_all_tables.phtml:23
+#: templates/table/structure/display_table_stats.phtml:56
 msgid "Optimize table"
 msgstr "Jadvalni optimallashtirish"
 
 #: libraries/operations.lib.php:1492
-#: templates/structure/check_all_tables.phtml:24
+#: templates/database/structure/check_all_tables.phtml:24
 msgid "Repair table"
 msgstr "Jadvalni tiklash"
 
 #: libraries/operations.lib.php:1538
-#: templates/structure/check_all_tables.phtml:14 view_operations.php:127
+#: templates/database/structure/check_all_tables.phtml:14
+#: view_operations.php:127
 #, fuzzy
 #| msgid "Delete tracking data for this table"
 msgid "Delete data or table"
@@ -11532,7 +11550,7 @@ msgid "Cannot connect: invalid settings."
 msgstr "Ulanib bo‘lmadi: noto‘g‘ri sozlangan."
 
 #: libraries/plugins/auth/AuthenticationConfig.class.php:108
-#: libraries/plugins/auth/AuthenticationCookie.class.php:134
+#: libraries/plugins/auth/AuthenticationCookie.class.php:122
 #: libraries/plugins/auth/AuthenticationHttp.class.php:96
 #, php-format
 msgid "Welcome to %s"
@@ -11562,38 +11580,38 @@ msgstr ""
 msgid "Retry to connect"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:146
+#: libraries/plugins/auth/AuthenticationCookie.class.php:134
 msgid "Your session has expired. Please log in again."
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:170
+#: libraries/plugins/auth/AuthenticationCookie.class.php:158
 msgid "Log in"
 msgstr "Avtorizatsiya"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:178
-#: libraries/plugins/auth/AuthenticationCookie.class.php:188
+#: libraries/plugins/auth/AuthenticationCookie.class.php:166
+#: libraries/plugins/auth/AuthenticationCookie.class.php:176
 msgid "You can enter hostname/IP address and port separated by space."
 msgstr "Siz xost/IP adres va bo‘sh joy qoldirib portni kiritishingiz mumkin."
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:193
+#: libraries/plugins/auth/AuthenticationCookie.class.php:181
 msgid "Username:"
 msgstr "Foydalanuvchi:"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:205
+#: libraries/plugins/auth/AuthenticationCookie.class.php:193
 #, fuzzy
 #| msgid "Server Choice"
 msgid "Server Choice:"
 msgstr "Serverni tanlang"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:386
+#: libraries/plugins/auth/AuthenticationCookie.class.php:374
 msgid "Entered captcha is wrong, try again!"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:396
+#: libraries/plugins/auth/AuthenticationCookie.class.php:384
 msgid "Please enter correct captcha!"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:423
+#: libraries/plugins/auth/AuthenticationCookie.class.php:411
 #, fuzzy
 #| msgid "Cannot log in to the MySQL server"
 msgid "You are not allowed to log in to this MySQL server!"
@@ -11709,7 +11727,7 @@ msgstr "Hodisa"
 #: libraries/plugins/export/ExportOdt.class.php:593
 #: libraries/plugins/export/ExportTexytext.class.php:428
 #: libraries/plugins/export/PMA_ExportPdf.class.php:313
-#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:984
 #: libraries/rte/rte_triggers.lib.php:377
 #, fuzzy
 #| msgid "Description"
@@ -12067,7 +12085,7 @@ msgid "Last check:"
 msgstr "Oxirgi tekshiruv"
 
 #: libraries/plugins/export/ExportSql.class.php:1399
-#: templates/structure/structure_table_row.phtml:183
+#: templates/database/structure/structure_table_row.phtml:183
 msgid "in use"
 msgstr "ishlatilmoqda"
 
@@ -12282,24 +12300,18 @@ msgstr ""
 msgid "The imported file does not contain any data!"
 msgstr "\"%s\" faylida kalit identifikatori mavjud emas"
 
-#: libraries/plugins/import/ImportSql.class.php:169
+#: libraries/plugins/import/ImportSql.class.php:72
 #, fuzzy
 #| msgid "SQL compatibility mode"
 msgid "SQL compatibility mode:"
 msgstr "SQL bilan moslik rejimi"
 
-#: libraries/plugins/import/ImportSql.class.php:181
+#: libraries/plugins/import/ImportSql.class.php:84
 #, fuzzy
 #| msgid "Do not use AUTO_INCREMENT for zero values"
 msgid "Do not use <code>AUTO_INCREMENT</code> for zero values"
 msgstr "Nol qiymatlari uchun \"AUTO_INCREMENT\" ishlatmaslik"
 
-#: libraries/plugins/import/ImportSql.class.php:195
-#, fuzzy
-#| msgid "Read misses"
-msgid "Read as multibytes"
-msgstr "Buferni o‘qishda qoldirishlar mavjud"
-
 #: libraries/plugins/import/ImportXml.class.php:54
 msgid "XML"
 msgstr "XML"
@@ -12344,7 +12356,7 @@ msgid "Show grid"
 msgstr "To‘rni ko‘rsatish"
 
 #: libraries/plugins/schema/SchemaPdf.class.php:94
-#: templates/structure/print_view_data_dictionary_link.phtml:6
+#: templates/database/structure/print_view_data_dictionary_link.phtml:6
 msgid "Data Dictionary"
 msgstr "Ma`lumotlar lug‘ati"
 
@@ -12376,7 +12388,7 @@ msgid "The %s table doesn't exist!"
 msgstr "\"%s\" jadvali mavjud emas!"
 
 #: libraries/plugins/schema/eps/Eps_Relation_Schema.class.php:321
-#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:309
+#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:323
 #, fuzzy, php-format
 #| msgid "Schema of the \"%s\" database - Page %s"
 msgid "Schema of the %s database - Page %s"
@@ -12406,7 +12418,7 @@ msgstr "Mundarija"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1005
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1028
 #: libraries/tracking.lib.php:884
-#: templates/structure/table_structure_header.phtml:11
+#: templates/table/structure/table_structure_header.phtml:11
 msgid "Extra"
 msgstr "Qo‘shimcha"
 
@@ -12848,12 +12860,12 @@ msgstr ""
 "Kеrakli jadvallarni <code>examples/create_tables.sql</code> kod yordamida "
 "tuzish."
 
-#: libraries/relation.lib.php:360
+#: libraries/relation.lib.php:357
 msgid "Create a pma user and give access to these tables."
 msgstr ""
 "phpMyAdmin foydalanuvchisi qo‘shish va ushbu jadvallarga ruxsat bеrish."
 
-#: libraries/relation.lib.php:365
+#: libraries/relation.lib.php:360
 msgid ""
 "Enable advanced features in configuration file (<code>config.inc.php</"
 "code>), for example by starting from <code>config.sample.inc.php</code>."
@@ -12861,24 +12873,24 @@ msgstr ""
 "(<code>config.inc.php</code>) faylidagi mufassal tanlovlarni faollashtirish, "
 "masalan, <code>config.sample.inc.php</code> dan boshlab."
 
-#: libraries/relation.lib.php:373
+#: libraries/relation.lib.php:365
 msgid "Re-login to phpMyAdmin to load the updated configuration file."
 msgstr ""
 "Yangilangan konfiguratsiya fayli ishga tushishi uchun, phpMyAdmin dasturidan "
 "chiqib, qayta kiring."
 
-#: libraries/relation.lib.php:1612
+#: libraries/relation.lib.php:1607
 msgid "no description"
 msgstr "tavsif mavjud emas"
 
-#: libraries/relation.lib.php:1811
+#: libraries/relation.lib.php:1806
 msgid ""
 "You do not have necessary privileges to create a database named "
 "'phpmyadmin'. You may go to 'Operations' tab of any database to set up the "
 "phpMyAdmin configuration storage there."
 msgstr ""
 
-#: libraries/relation.lib.php:1928
+#: libraries/relation.lib.php:1923
 #, fuzzy, php-format
 #| msgid ""
 #| "Empty phpMyAdmin control user while using phpMyAdmin configuration storage"
@@ -12889,13 +12901,13 @@ msgstr ""
 "pmadb usuli ishlatilmoqda, lekin phpMyAdmin konfiguratsion faylida "
 "foydalanuvchi belgilanmagan"
 
-#: libraries/relation.lib.php:1936
+#: libraries/relation.lib.php:1931
 #, php-format
 msgid ""
 "%sCreate%s the phpMyAdmin configuration storage in the current database."
 msgstr ""
 
-#: libraries/relation.lib.php:1944
+#: libraries/relation.lib.php:1939
 #, fuzzy, php-format
 #| msgid ""
 #| "Empty phpMyAdmin control user while using phpMyAdmin configuration storage"
@@ -12905,7 +12917,7 @@ msgstr ""
 "foydalanuvchi belgilanmagan"
 
 #: libraries/replication_gui.lib.php:46 libraries/replication_gui.lib.php:343
-#: libraries/server_databases.lib.php:387
+#: libraries/server_databases.lib.php:398
 msgid "Master replication"
 msgstr "Bosh sеrvеr rеplikatsiyasi"
 
@@ -12979,7 +12991,7 @@ msgstr ""
 "ma’lumotni ko‘rishingiz kеrak."
 
 #: libraries/replication_gui.lib.php:141
-#: libraries/server_databases.lib.php:389
+#: libraries/server_databases.lib.php:400
 msgid "Slave replication"
 msgstr "Tobе sеrvеr rеplikatsiyasi"
 
@@ -13295,10 +13307,10 @@ msgid "Master server changed successfully to %s."
 msgstr "Bosh rеplikatsiya sеrvеri quyidagiga o‘zgartirildi: %s"
 
 #: libraries/rte/rte_events.lib.php:106 libraries/rte/rte_events.lib.php:115
-#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:149
-#: libraries/rte/rte_routines.lib.php:158
-#: libraries/rte/rte_routines.lib.php:231
-#: libraries/rte/rte_routines.lib.php:1362
+#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:219
+#: libraries/rte/rte_routines.lib.php:246
+#: libraries/rte/rte_routines.lib.php:368
+#: libraries/rte/rte_routines.lib.php:1453
 #: libraries/rte/rte_triggers.lib.php:82 libraries/rte/rte_triggers.lib.php:91
 #: libraries/rte/rte_triggers.lib.php:123
 #, fuzzy, php-format
@@ -13322,7 +13334,7 @@ msgstr "\"%s\" jadvali o‘chirildi"
 msgid "Event %1$s has been created."
 msgstr "%1$s jadvali tuzildi."
 
-#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:251
+#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:266
 #: libraries/rte/rte_triggers.lib.php:144
 msgid "One or more errors have occurred while processing your request:"
 msgstr ""
@@ -13333,7 +13345,7 @@ msgstr ""
 msgid "Edit event"
 msgstr "Serverlarni tahrirlash"
 
-#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:794
+#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:885
 #: libraries/rte/rte_triggers.lib.php:323 view_create.php:180
 #, fuzzy
 #| msgid "Details…"
@@ -13350,7 +13362,7 @@ msgstr "Hodisa turi"
 msgid "Event type"
 msgstr "Hodisa turi"
 
-#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:817
+#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:908
 #, fuzzy, php-format
 #| msgid "Change"
 msgid "Change to %s"
@@ -13386,12 +13398,14 @@ msgstr "Oxiri"
 msgid "On completion preserve"
 msgstr "To‘la qo‘yish"
 
-#: libraries/rte/rte_events.lib.php:491 libraries/rte/rte_routines.lib.php:930
+#: libraries/rte/rte_events.lib.php:491
+#: libraries/rte/rte_routines.lib.php:1021
 #: libraries/rte/rte_triggers.lib.php:383 view_create.php:209
 msgid "Definer"
 msgstr ""
 
-#: libraries/rte/rte_events.lib.php:535 libraries/rte/rte_routines.lib.php:997
+#: libraries/rte/rte_events.lib.php:535
+#: libraries/rte/rte_routines.lib.php:1088
 #: libraries/rte/rte_triggers.lib.php:422
 msgid "The definer must be in the \"username@hostname\" format!"
 msgstr ""
@@ -13419,9 +13433,9 @@ msgid "You must provide an event definition."
 msgstr ""
 
 #: libraries/rte/rte_export.lib.php:43 libraries/rte/rte_general.lib.php:72
-#: libraries/rte/rte_routines.lib.php:345
-#: libraries/rte/rte_routines.lib.php:1198
-#: libraries/rte/rte_routines.lib.php:1411
+#: libraries/rte/rte_routines.lib.php:153
+#: libraries/rte/rte_routines.lib.php:1289
+#: libraries/rte/rte_routines.lib.php:1502
 #, fuzzy
 #| msgid "Processes"
 msgid "Error in processing request:"
@@ -13457,154 +13471,154 @@ msgid ""
 "problems."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:110
-#: libraries/rte/rte_routines.lib.php:1006
-#, fuzzy, php-format
-#| msgid "Invalid server index: \"%s\""
-msgid "Invalid routine type: \"%s\""
-msgstr "Server raqami noto‘g‘ri: \"%s\""
-
-#: libraries/rte/rte_routines.lib.php:170
-msgid "Sorry, we failed to restore the dropped routine."
-msgstr ""
-
-#: libraries/rte/rte_routines.lib.php:211
-#, fuzzy, php-format
-#| msgid "Table %s has been dropped."
-msgid "Routine %1$s has been modified. Privileges have been adjusted."
-msgstr "\"%s\" jadvali o‘chirildi"
-
-#: libraries/rte/rte_routines.lib.php:216
-#, fuzzy, php-format
-#| msgid "Table %s has been dropped."
-msgid "Routine %1$s has been modified."
-msgstr "\"%s\" jadvali o‘chirildi"
-
-#: libraries/rte/rte_routines.lib.php:238
-#, fuzzy, php-format
-#| msgid "Table %1$s has been created."
-msgid "Routine %1$s has been created."
-msgstr "%1$s jadvali tuzildi."
-
-#: libraries/rte/rte_routines.lib.php:315
+#: libraries/rte/rte_routines.lib.php:123
 #, fuzzy
 #| msgid "Edit mode"
 msgid "Edit routine"
 msgstr "Tahrirlash usuli"
 
-#: libraries/rte/rte_routines.lib.php:797
+#: libraries/rte/rte_routines.lib.php:200
+#: libraries/rte/rte_routines.lib.php:1097
+#, fuzzy, php-format
+#| msgid "Invalid server index: \"%s\""
+msgid "Invalid routine type: \"%s\""
+msgstr "Server raqami noto‘g‘ri: \"%s\""
+
+#: libraries/rte/rte_routines.lib.php:253
+#, fuzzy, php-format
+#| msgid "Table %1$s has been created."
+msgid "Routine %1$s has been created."
+msgstr "%1$s jadvali tuzildi."
+
+#: libraries/rte/rte_routines.lib.php:380
+msgid "Sorry, we failed to restore the dropped routine."
+msgstr ""
+
+#: libraries/rte/rte_routines.lib.php:439
+#, fuzzy, php-format
+#| msgid "Table %s has been dropped."
+msgid "Routine %1$s has been modified. Privileges have been adjusted."
+msgstr "\"%s\" jadvali o‘chirildi"
+
+#: libraries/rte/rte_routines.lib.php:444
+#, fuzzy, php-format
+#| msgid "Table %s has been dropped."
+msgid "Routine %1$s has been modified."
+msgstr "\"%s\" jadvali o‘chirildi"
+
+#: libraries/rte/rte_routines.lib.php:888
 #, fuzzy
 #| msgid "Routines"
 msgid "Routine name"
 msgstr "Muolajalar"
 
-#: libraries/rte/rte_routines.lib.php:823
+#: libraries/rte/rte_routines.lib.php:914
 msgid "Parameters"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:829
+#: libraries/rte/rte_routines.lib.php:920
 #, fuzzy
 #| msgid "Direct links"
 msgid "Direction"
 msgstr "To‘g‘ridan-to‘g‘ri bog‘lanishlar"
 
-#: libraries/rte/rte_routines.lib.php:847
+#: libraries/rte/rte_routines.lib.php:938
 #, fuzzy
 #| msgid "Apply index(s)"
 msgid "Add parameter"
 msgstr "Indеks(lar)ni saqlash"
 
-#: libraries/rte/rte_routines.lib.php:851
+#: libraries/rte/rte_routines.lib.php:942
 #, fuzzy
 #| msgid "Rename database to"
 msgid "Remove last parameter"
 msgstr "Ma`lumotlar bazasi nomini quyidagiga o‘zgartirish"
 
-#: libraries/rte/rte_routines.lib.php:856
+#: libraries/rte/rte_routines.lib.php:947
 msgid "Return type"
 msgstr "Qaytariladigan tip"
 
-#: libraries/rte/rte_routines.lib.php:862
+#: libraries/rte/rte_routines.lib.php:953
 #, fuzzy
 #| msgid "Length/Values"
 msgid "Return length/values"
 msgstr "Uzunlik/qiymatlar"
 
-#: libraries/rte/rte_routines.lib.php:868
+#: libraries/rte/rte_routines.lib.php:959
 #, fuzzy
 #| msgid "Table options"
 msgid "Return options"
 msgstr "Jadval parametrlari"
 
-#: libraries/rte/rte_routines.lib.php:899
+#: libraries/rte/rte_routines.lib.php:990
 msgid "Is deterministic"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:920
+#: libraries/rte/rte_routines.lib.php:1011
 msgid ""
 "You do not have sufficient privileges to perform this operation; Please "
 "refer to the documentation for more details"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:935
+#: libraries/rte/rte_routines.lib.php:1026
 #, fuzzy
 #| msgid "Security"
 msgid "Security type"
 msgstr "Xavfsizlik"
 
-#: libraries/rte/rte_routines.lib.php:944
+#: libraries/rte/rte_routines.lib.php:1035
 msgid "SQL data access"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1013
+#: libraries/rte/rte_routines.lib.php:1104
 #, fuzzy
 #| msgid "Invalid table name"
 msgid "You must provide a routine name!"
 msgstr "Jadval nomi noto‘g‘ri"
 
-#: libraries/rte/rte_routines.lib.php:1047
+#: libraries/rte/rte_routines.lib.php:1138
 #, php-format
 msgid "Invalid direction \"%s\" given for parameter."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1069
-#: libraries/rte/rte_routines.lib.php:1131
+#: libraries/rte/rte_routines.lib.php:1160
+#: libraries/rte/rte_routines.lib.php:1222
 msgid ""
 "You must provide length/values for routine parameters of type ENUM, SET, "
 "VARCHAR and VARBINARY."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1095
+#: libraries/rte/rte_routines.lib.php:1186
 msgid "You must provide a name and a type for each routine parameter."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1114
+#: libraries/rte/rte_routines.lib.php:1205
 msgid "You must provide a valid return type for the routine."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1174
+#: libraries/rte/rte_routines.lib.php:1265
 msgid "You must provide a routine definition."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1285
+#: libraries/rte/rte_routines.lib.php:1376
 #, fuzzy, php-format
 #| msgid "Allows executing stored routines."
 msgid "Execution results of routine %s"
 msgstr "Saqlanadigan muolajalarni bajarishga ruxsat beradi"
 
-#: libraries/rte/rte_routines.lib.php:1340
+#: libraries/rte/rte_routines.lib.php:1431
 #, php-format
 msgid "%d row affected by the last statement inside the procedure."
 msgid_plural "%d rows affected by the last statement inside the procedure."
 msgstr[0] ""
 
-#: libraries/rte/rte_routines.lib.php:1398
-#: libraries/rte/rte_routines.lib.php:1406
+#: libraries/rte/rte_routines.lib.php:1489
+#: libraries/rte/rte_routines.lib.php:1497
 msgid "Execute routine"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1485
-#: libraries/rte/rte_routines.lib.php:1488
+#: libraries/rte/rte_routines.lib.php:1576
+#: libraries/rte/rte_routines.lib.php:1579
 #, fuzzy
 #| msgid "Routines"
 msgid "Routine parameters"
@@ -13808,7 +13822,7 @@ msgid "Original position"
 msgstr "Asl pozitsiya"
 
 #: libraries/server_bin_log.lib.php:133
-#: templates/structure/display_table_stats.phtml:4
+#: templates/table/structure/display_table_stats.phtml:4
 msgid "Information"
 msgstr "Ma`lumot"
 
@@ -13846,12 +13860,12 @@ msgstr ""
 "IZOH: Statiskani yoqish veb-server va MySQL serveri o‘rtasida katta "
 "traffikka sabab bo‘lishi mumkin."
 
-#: libraries/server_databases.lib.php:364
-#: libraries/server_databases.lib.php:365
+#: libraries/server_databases.lib.php:366
+#: libraries/server_databases.lib.php:371
 msgid "Enable Statistics"
 msgstr "Statiskani yoqish"
 
-#: libraries/server_databases.lib.php:481
+#: libraries/server_databases.lib.php:492
 #, fuzzy, php-format
 #| msgid "%s databases have been dropped successfully."
 msgid "%1$d database has been dropped successfully."
@@ -14254,7 +14268,7 @@ msgid "You have revoked the privileges for %s."
 msgstr "\"%s\" foydalanuvchining privilegiyalari bekor qilindi."
 
 #: libraries/server_privileges.lib.php:2059
-#: libraries/server_privileges.lib.php:4290
+#: libraries/server_privileges.lib.php:4316
 #, fuzzy
 #| msgid "Any user"
 msgid "Add user account"
@@ -14450,60 +14464,60 @@ msgstr "\"%s\" o‘chirilmoqda"
 msgid "The privileges were reloaded successfully."
 msgstr "Privilegiyalar muvaffaqiyatli qayta yuklandi."
 
-#: libraries/server_privileges.lib.php:3994
+#: libraries/server_privileges.lib.php:4003
 #, php-format
 msgid "The user %s already exists!"
 msgstr "\"%s\" nomli foydalanuvchi mavjud!"
 
-#: libraries/server_privileges.lib.php:4232
+#: libraries/server_privileges.lib.php:4258
 #, fuzzy, php-format
 #| msgid "Privileges"
 msgid "Privileges for %s"
 msgstr "Privilegiyalar"
 
-#: libraries/server_privileges.lib.php:4241
+#: libraries/server_privileges.lib.php:4267
 #: libraries/server_status_processes.lib.php:72
 #: libraries/server_user_groups.lib.php:39
 msgid "User"
 msgstr "Foydalanuvchi"
 
-#: libraries/server_privileges.lib.php:4282
+#: libraries/server_privileges.lib.php:4308
 msgctxt "Create new user"
 msgid "New"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4311
+#: libraries/server_privileges.lib.php:4337
 #, fuzzy
 #| msgid "Edit Privileges"
 msgid "Edit privileges:"
 msgstr "Privilegiyalarni tahrirlash"
 
-#: libraries/server_privileges.lib.php:4312
+#: libraries/server_privileges.lib.php:4338
 #, fuzzy
 #| msgid "User"
 msgid "User account"
 msgstr "Foydalanuvchi"
 
-#: libraries/server_privileges.lib.php:4371
+#: libraries/server_privileges.lib.php:4397
 msgid ""
 "Note: You are attempting to edit privileges of the user with which you are "
 "currently logged in."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4391 libraries/server_users.lib.php:25
+#: libraries/server_privileges.lib.php:4417 libraries/server_users.lib.php:25
 #, fuzzy
 #| msgid "User overview"
 msgid "User accounts overview"
 msgstr "Foydalanuvchilar hisobini ko‘rib chiqish"
 
-#: libraries/server_privileges.lib.php:4459
+#: libraries/server_privileges.lib.php:4485
 msgid ""
 "A user account allowing any user from localhost to connect is present. This "
 "will prevent other users from connecting if the host part of their account "
 "allows a connection from any (%) host."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4500
+#: libraries/server_privileges.lib.php:4526
 #, php-format
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
@@ -14516,7 +14530,7 @@ msgstr ""
 "ma`lumotlar server tomonidan ishlatilayotgan privilegiyalardan farq qilishi "
 "mumkin. Bu holda %sprivilegiyalarni qayta yuklash%s kerak."
 
-#: libraries/server_privileges.lib.php:4519
+#: libraries/server_privileges.lib.php:4545
 #, fuzzy
 #| msgid ""
 #| "Note: phpMyAdmin gets the users' privileges directly from MySQL's "
@@ -14535,27 +14549,27 @@ msgstr ""
 "ma`lumotlar server tomonidan ishlatilayotgan privilegiyalardan farq qilishi "
 "mumkin. Bu holda %sprivilegiyalarni qayta yuklash%s kerak."
 
-#: libraries/server_privileges.lib.php:4569
+#: libraries/server_privileges.lib.php:4595
 msgid "The selected user was not found in the privilege table."
 msgstr "Belgilangan foydalanuvchi privilegiyalar jadvalida topilmadi."
 
-#: libraries/server_privileges.lib.php:4801
+#: libraries/server_privileges.lib.php:4827
 msgid "You have added a new user."
 msgstr "Siz yangi foydalanuvchi qo‘shdingiz."
 
-#: libraries/server_status.lib.php:53
+#: libraries/server_status.lib.php:60
 #, php-format
 msgid "Network traffic since startup: %s"
 msgstr ""
 
-#: libraries/server_status.lib.php:66
+#: libraries/server_status.lib.php:73
 #, fuzzy, php-format
 #| msgid "This MySQL server has been running for %s. It started up on %s."
 msgid "This MySQL server has been running for %1$s. It started up on %2$s."
 msgstr ""
 "MySQL-server \"%s\" davomida ishlamoqda. Ishga tushirilgan vaqt: \"%s\"."
 
-#: libraries/server_status.lib.php:80
+#: libraries/server_status.lib.php:94
 #, fuzzy
 #| msgid "This server is configured as master in a replication process."
 msgid ""
@@ -14564,25 +14578,25 @@ msgid ""
 msgstr ""
 "Ushbu sеrvеr rеplikatsiya jarayonida \"bosh\" dеb konfiguratsiya qilingan."
 
-#: libraries/server_status.lib.php:85
+#: libraries/server_status.lib.php:99
 #, fuzzy
 #| msgid "This server is configured as master in a replication process."
 msgid "This MySQL server works as <b>master</b> in <b>replication</b> process."
 msgstr ""
 "Ushbu sеrvеr rеplikatsiya jarayonida \"bosh\" dеb konfiguratsiya qilingan."
 
-#: libraries/server_status.lib.php:90
+#: libraries/server_status.lib.php:104
 #, fuzzy
 #| msgid "This server is configured as master in a replication process."
 msgid "This MySQL server works as <b>slave</b> in <b>replication</b> process."
 msgstr ""
 "Ushbu sеrvеr rеplikatsiya jarayonida \"bosh\" dеb konfiguratsiya qilingan."
 
-#: libraries/server_status.lib.php:106
+#: libraries/server_status.lib.php:116
 msgid "Replication status"
 msgstr "Replikatsiya statusi"
 
-#: libraries/server_status.lib.php:137
+#: libraries/server_status.lib.php:146
 msgid ""
 "On a busy server, the byte counters may overrun, so those statistics as "
 "reported by the MySQL server may be incorrect."
@@ -14591,21 +14605,21 @@ msgstr ""
 "shuning uchun, MySQL serveri bergan statistik ma`lumotlar noto‘g‘ri bo‘lishi "
 "mumkin."
 
-#: libraries/server_status.lib.php:148
+#: libraries/server_status.lib.php:157
 msgid "Received"
 msgstr "Qabul qilindi"
 
-#: libraries/server_status.lib.php:167
+#: libraries/server_status.lib.php:176
 msgid "Sent"
 msgstr "Yuborildi"
 
-#: libraries/server_status.lib.php:234
+#: libraries/server_status.lib.php:243
 #, fuzzy
 #| msgid "max. concurrent connections"
 msgid "Max. concurrent connections"
 msgstr "Maksimal ulanishlar soni"
 
-#: libraries/server_status.lib.php:244
+#: libraries/server_status.lib.php:253
 msgid "Failed attempts"
 msgstr "Muvaffaqiyatsiz urinishlar soni"
 
@@ -15740,7 +15754,7 @@ msgstr ""
 msgid "Not implemented yet."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/AlterOperation.php:193
+#: libraries/sql-parser/src/Components/AlterOperation.php:191
 #, fuzzy
 #| msgid "Iconic table operations"
 msgid "Unrecognized alter operation."
@@ -15756,7 +15770,7 @@ msgid "An opening bracket followed by a set of values was expected."
 msgstr ""
 
 #: libraries/sql-parser/src/Components/ArrayObj.php:101
-#: libraries/sql-parser/src/Components/FieldDefinition.php:202
+#: libraries/sql-parser/src/Components/CreateDefinition.php:202
 msgid "An opening bracket was expected."
 msgstr ""
 
@@ -15764,25 +15778,35 @@ msgstr ""
 msgid "A comma or a closing bracket was expected"
 msgstr ""
 
+#: libraries/sql-parser/src/Components/CreateDefinition.php:246
+#, fuzzy
+#| msgid "No databases selected."
+msgid "A comma or a closing bracket was expected."
+msgstr "Bironta ham ma`lumotlar bazasi tanlanmagan."
+
+#: libraries/sql-parser/src/Components/CreateDefinition.php:262
+msgid "A closing bracket was expected."
+msgstr ""
+
 #: libraries/sql-parser/src/Components/DataType.php:125
 msgid "Unrecognized data type."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:225
+#: libraries/sql-parser/src/Components/Expression.php:227
 msgid "Unexpected closing bracket."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:246
-#: libraries/sql-parser/src/Components/Expression.php:283
-#: libraries/sql-parser/src/Components/Expression.php:303
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:285
+#: libraries/sql-parser/src/Components/Expression.php:305
 msgid "An alias was previously found."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:257
+#: libraries/sql-parser/src/Components/Expression.php:259
 msgid "Unexpected dot."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:327
+#: libraries/sql-parser/src/Components/Expression.php:329
 #, fuzzy
 #| msgid "No databases selected."
 msgid "An alias was expected."
@@ -15795,16 +15819,6 @@ msgid "An expression was expected."
 msgstr ""
 "Amalni amalga oshirish uchun bitta yoki bir nechta qatorni tanlash kerak"
 
-#: libraries/sql-parser/src/Components/FieldDefinition.php:246
-#, fuzzy
-#| msgid "No databases selected."
-msgid "A comma or a closing bracket was expected."
-msgstr "Bironta ham ma`lumotlar bazasi tanlanmagan."
-
-#: libraries/sql-parser/src/Components/FieldDefinition.php:262
-msgid "A closing bracket was expected."
-msgstr ""
-
 #: libraries/sql-parser/src/Components/Limit.php:90
 #: libraries/sql-parser/src/Components/Limit.php:112
 msgid "An offset was expected."
@@ -15850,29 +15864,29 @@ msgstr ""
 msgid "Expected delimiter."
 msgstr ""
 
-#: libraries/sql-parser/src/Lexer.php:753
+#: libraries/sql-parser/src/Lexer.php:777
 #, fuzzy, php-format
 #| msgid "Table %1$s has been created."
 msgid "Ending quote %1$s was expected."
 msgstr "%1$s jadvali tuzildi."
 
-#: libraries/sql-parser/src/Lexer.php:789
+#: libraries/sql-parser/src/Lexer.php:813
 #, fuzzy
 #| msgid "Table name template"
 msgid "Variable name was expected."
 msgstr "Jadval nomi shabloni"
 
-#: libraries/sql-parser/src/Parser.php:380
+#: libraries/sql-parser/src/Parser.php:391
 #, fuzzy
 #| msgid "At Beginning of Table"
 msgid "Unexpected beginning of statement."
 msgstr "Jadval boshiga"
 
-#: libraries/sql-parser/src/Parser.php:399
+#: libraries/sql-parser/src/Parser.php:410
 msgid "Unrecognized statement type."
 msgstr ""
 
-#: libraries/sql-parser/src/Parser.php:479
+#: libraries/sql-parser/src/Parser.php:489
 msgid "No transaction was previously started."
 msgstr ""
 
@@ -15900,8 +15914,10 @@ msgid "The name of the entity was expected."
 msgstr "Ochiq jadvallar soni."
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:310
-msgid "At least one field definition was expected."
-msgstr ""
+#, fuzzy
+#| msgid "The row has been deleted."
+msgid "At least one column definition was expected."
+msgstr "Yozuv o‘chirildi"
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:329
 msgid "A \"RETURNS\" keyword was expected."
@@ -15976,25 +15992,25 @@ msgstr "\"%s\" xatcho‘pi tuzildi"
 msgid "Using bookmark \"%s\" as default browse query."
 msgstr ""
 
-#: libraries/sql.lib.php:1306
+#: libraries/sql.lib.php:1300
 msgid "Showing as PHP code"
 msgstr "PHP-kod sifatida ko‘rsatish"
 
-#: libraries/sql.lib.php:1638
+#: libraries/sql.lib.php:1632
 #, php-format
 msgid ""
 "Current selection does not contain a unique column. Grid edit, checkbox, "
 "Edit, Copy and Delete features are not available. %s"
 msgstr ""
 
-#: libraries/sql.lib.php:1649
+#: libraries/sql.lib.php:1643
 #, php-format
 msgid ""
 "Current selection does not contain a unique column. Grid edit, Edit, Copy "
 "and Delete features may result in undesired behavior. %s"
 msgstr ""
 
-#: libraries/sql.lib.php:1688
+#: libraries/sql.lib.php:1682
 #, php-format
 msgid "Problems with indexes of table `%s`"
 msgstr "`\"%s\"` jadvalidagi indekslarda muammo mavjud"
@@ -16166,7 +16182,7 @@ msgid "Version %s snapshot (SQL code)"
 msgstr "%s vеrsiya rasmi (SQL kodi)"
 
 #: libraries/tracking.lib.php:947
-#: templates/structure/table_structure_row.phtml:33
+#: templates/table/structure/table_structure_row.phtml:33
 #, fuzzy
 #| msgid "None"
 msgctxt "None for default"
@@ -16230,19 +16246,19 @@ msgstr "\"%s.%s\" jadvalining %s raqamli vеrsiyasini tuzish"
 msgid "Version %1$s was created, tracking for %2$s is active."
 msgstr "%s vеrsiya tuzildi, \"%s.%s\" ni kuzatishsh faollashtirilgan."
 
-#: libraries/user_preferences.inc.php:29
+#: libraries/user_preferences.inc.php:30
 #, fuzzy
 #| msgid "Other core settings"
 msgid "Manage your settings"
 msgstr "Boshqa sozlanishlar"
 
-#: libraries/user_preferences.inc.php:46 prefs_manage.php:307
+#: libraries/user_preferences.inc.php:54 prefs_manage.php:307
 #, fuzzy
 #| msgid "Modifications have been saved"
 msgid "Configuration has been saved."
 msgstr "O‘zgaririshlar saqlandi"
 
-#: libraries/user_preferences.inc.php:66
+#: libraries/user_preferences.inc.php:74
 #, php-format
 msgid ""
 "Your preferences will be saved for current session only. Storing them "
@@ -16678,7 +16694,7 @@ msgid "first"
 msgstr ""
 
 #: templates/columns_definitions/move_column.phtml:12
-#: templates/structure/add_column.phtml:21
+#: templates/table/structure/add_column.phtml:21
 #, fuzzy, php-format
 #| msgid "After %s"
 msgid "after %s"
@@ -16766,242 +16782,358 @@ msgstr "O‘girish"
 msgid "Input transformation options"
 msgstr "O‘girishlar parametrlari"
 
-#: templates/designer/aggregate_query_panel.phtml:22
-#: templates/designer/options_panel.phtml:100
+#: templates/database/create_table.phtml:7
+#: templates/database/designer/side_menu.phtml:77
+#: templates/database/designer/side_menu.phtml:80
+msgid "Create table"
+msgstr "Jadval tuzish"
+
+#: templates/database/create_table.phtml:15
+#, fuzzy
+#| msgid "Number of fields"
+msgid "Number of columns"
+msgstr "Maydonlar soni "
+
+#: templates/database/designer/aggregate_query_panel.phtml:22
+#: templates/database/designer/options_panel.phtml:100
 #, fuzzy
 #| msgid "Create"
 msgid "Aggregate"
 msgstr "Tuzish"
 
-#: templates/designer/aggregate_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:61
-#: templates/designer/options_panel.phtml:106
-#: templates/designer/options_panel.phtml:170
-#: templates/designer/where_query_panel.phtml:30
-#: templates/table/table_header.phtml:9
+#: templates/database/designer/aggregate_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:61
+#: templates/database/designer/options_panel.phtml:106
+#: templates/database/designer/options_panel.phtml:170
+#: templates/database/designer/where_query_panel.phtml:30
+#: templates/table/search/table_header.phtml:9
 msgid "Operator"
 msgstr "Operator"
 
-#: templates/designer/database_tables.phtml:29
+#: templates/database/designer/database_tables.phtml:29
 msgid "Toggle"
 msgstr ""
 
-#: templates/designer/database_tables.phtml:40
+#: templates/database/designer/database_tables.phtml:40
 #, fuzzy
 #| msgid "Database for user"
 msgid "See table structure"
 msgstr "Foydalanuvchi uchun ma`lumotlar bazasi"
 
-#: templates/designer/delete_relation_panel.phtml:21
+#: templates/database/designer/delete_relation_panel.phtml:21
 msgid "Delete relation"
 msgstr "Bog‘liqlikni o‘chirish"
 
-#: templates/designer/edit_delete_pages.phtml:7
+#: templates/database/designer/edit_delete_pages.phtml:7
 #, fuzzy
 #| msgid "Page number:"
 msgid "Page to open"
 msgstr "Sahifa raqami: "
 
-#: templates/designer/edit_delete_pages.phtml:7
+#: templates/database/designer/edit_delete_pages.phtml:7
 #, fuzzy
 #| msgid "Relation deleted"
 msgid "Page to delete"
 msgstr "Aloqa o‘chirildi"
 
-#: templates/designer/having_query_panel.phtml:90
-#: templates/designer/options_panel.phtml:63
-#: templates/designer/options_panel.phtml:229
-#: templates/designer/where_query_panel.phtml:59
+#: templates/database/designer/having_query_panel.phtml:90
+#: templates/database/designer/options_panel.phtml:63
+#: templates/database/designer/options_panel.phtml:229
+#: templates/database/designer/where_query_panel.phtml:59
 #, fuzzy
 #| msgid "Export"
 msgid "Except"
 msgstr "Eksport"
 
-#: templates/designer/having_query_panel.phtml:102
-#: templates/designer/options_panel.phtml:75
-#: templates/designer/options_panel.phtml:241
-#: templates/designer/where_query_panel.phtml:71
+#: templates/database/designer/having_query_panel.phtml:102
+#: templates/database/designer/options_panel.phtml:75
+#: templates/database/designer/options_panel.phtml:241
+#: templates/database/designer/where_query_panel.phtml:71
 #, fuzzy
 #| msgid "in query"
 msgid "subquery"
 msgstr "so‘rov bo‘yicha"
 
-#: templates/designer/new_relation_panel.phtml:22
-#: templates/designer/side_menu.phtml:84 templates/designer/side_menu.phtml:87
+#: templates/database/designer/new_relation_panel.phtml:22
+#: templates/database/designer/side_menu.phtml:84
+#: templates/database/designer/side_menu.phtml:87
 msgid "Create relation"
 msgstr "Bog‘liqlik o‘rnatish"
 
-#: templates/designer/options_panel.phtml:34
-#: templates/designer/options_panel.phtml:200
+#: templates/database/designer/options_panel.phtml:34
+#: templates/database/designer/options_panel.phtml:200
 #, fuzzy
 #| msgid "Relation deleted"
 msgid "Relation operator"
 msgstr "Aloqa o‘chirildi"
 
-#: templates/designer/options_panel.phtml:85
-#: templates/designer/rename_to_panel.phtml:23
+#: templates/database/designer/options_panel.phtml:85
+#: templates/database/designer/rename_to_panel.phtml:23
 #, fuzzy
 #| msgid "Rename view to"
 msgid "Rename to"
 msgstr "Ko‘rinish nomini o‘zgartirish"
 
-#: templates/designer/options_panel.phtml:91
-#: templates/designer/rename_to_panel.phtml:31
+#: templates/database/designer/options_panel.phtml:91
+#: templates/database/designer/rename_to_panel.phtml:31
 #, fuzzy
 #| msgid "User name"
 msgid "New name"
 msgstr "Foydalanuvchi nomi"
 
-#: templates/designer/page_save_as.phtml:4
+#: templates/database/designer/page_save_as.phtml:4
 #, fuzzy
 #| msgid "Export/Import to scale"
 msgid "Save to selected page"
 msgstr "Masshtab"
 
-#: templates/designer/page_save_as.phtml:5
+#: templates/database/designer/page_save_as.phtml:5
 #, fuzzy
 #| msgid "Create a new index"
 msgid "Create a page and save to it"
 msgstr "Yangi indeks tuzish"
 
-#: templates/designer/page_save_as.phtml:26
+#: templates/database/designer/page_save_as.phtml:26
 #, fuzzy
 #| msgid "User name"
 msgid "New page name"
 msgstr "Foydalanuvchi nomi"
 
-#: templates/designer/page_selector.phtml:2
+#: templates/database/designer/page_selector.phtml:2
 #, fuzzy
 #| msgid "Select Tables"
 msgid "Select page"
 msgstr "Jadvallarni tanlang"
 
-#: templates/designer/query_details.phtml:10
+#: templates/database/designer/query_details.phtml:10
 #, fuzzy
 #| msgid "Table options"
 msgid "Active options"
 msgstr "Jadval parametrlari"
 
-#: templates/designer/schema_export.phtml:4
+#: templates/database/designer/schema_export.phtml:4
 msgid "Select Export Relational Type"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:19 templates/designer/side_menu.phtml:25
+#: templates/database/designer/side_menu.phtml:19
+#: templates/database/designer/side_menu.phtml:25
 #, fuzzy
 #| msgid "Show tables"
 msgid "Show/Hide tables list"
 msgstr "Jadvallarni ko‘rsatish"
 
-#: templates/designer/side_menu.phtml:29 templates/designer/side_menu.phtml:35
-#: templates/designer/side_menu.phtml:36
+#: templates/database/designer/side_menu.phtml:29
+#: templates/database/designer/side_menu.phtml:35
+#: templates/database/designer/side_menu.phtml:36
 msgid "View in fullscreen"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:34
+#: templates/database/designer/side_menu.phtml:34
 msgid "Exit fullscreen"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:41 templates/designer/side_menu.phtml:45
+#: templates/database/designer/side_menu.phtml:41
+#: templates/database/designer/side_menu.phtml:45
 #, fuzzy
 #| msgid "User name"
 msgid "New page"
 msgstr "Foydalanuvchi nomi"
 
-#: templates/designer/side_menu.phtml:70 templates/designer/side_menu.phtml:73
+#: templates/database/designer/side_menu.phtml:70
+#: templates/database/designer/side_menu.phtml:73
 #, fuzzy
 #| msgid "Select Tables"
 msgid "Delete pages"
 msgstr "Jadvallarni tanlang"
 
-#: templates/designer/side_menu.phtml:77 templates/designer/side_menu.phtml:80
-#: templates/table/create_table.phtml:7
-msgid "Create table"
-msgstr "Jadval tuzish"
-
-#: templates/designer/side_menu.phtml:98
-#: templates/designer/side_menu.phtml:101
+#: templates/database/designer/side_menu.phtml:98
+#: templates/database/designer/side_menu.phtml:101
 msgid "Reload"
 msgstr "Qayta yuklash"
 
-#: templates/designer/side_menu.phtml:107
-#: templates/designer/side_menu.phtml:110
+#: templates/database/designer/side_menu.phtml:107
+#: templates/database/designer/side_menu.phtml:110
 msgid "Help"
 msgstr "Yordam"
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Angular links"
 msgstr "Burchakli bog‘lanishlar"
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Direct links"
 msgstr "To‘g‘ridan-to‘g‘ri bog‘lanishlar"
 
-#: templates/designer/side_menu.phtml:122
-#: templates/designer/side_menu.phtml:124
+#: templates/database/designer/side_menu.phtml:122
+#: templates/database/designer/side_menu.phtml:124
 msgid "Snap to grid"
 msgstr "To‘rga bog‘lab qo‘yish"
 
-#: templates/designer/side_menu.phtml:128
-#: templates/designer/side_menu.phtml:134
+#: templates/database/designer/side_menu.phtml:128
+#: templates/database/designer/side_menu.phtml:134
 msgid "Small/Big All"
 msgstr "Barcha jadvallar ko‘rsatilishini Taxlash/Tiklash"
 
-#: templates/designer/side_menu.phtml:138
-#: templates/designer/side_menu.phtml:141
+#: templates/database/designer/side_menu.phtml:138
+#: templates/database/designer/side_menu.phtml:141
 msgid "Toggle small/big"
 msgstr "Teskari ko‘rsatish"
 
-#: templates/designer/side_menu.phtml:145
-#: templates/designer/side_menu.phtml:148
+#: templates/database/designer/side_menu.phtml:145
+#: templates/database/designer/side_menu.phtml:148
 #, fuzzy
 #| msgid "To select relation, click :"
 msgid "Toggle relation lines"
 msgstr ""
 "Aloqani tanlash uchun rasmda ko‘rsatilganikabi ulanish nuqtasiga bosing:"
 
-#: templates/designer/side_menu.phtml:153
-#: templates/designer/side_menu.phtml:156
+#: templates/database/designer/side_menu.phtml:153
+#: templates/database/designer/side_menu.phtml:156
 #, fuzzy
 #| msgid "Export"
 msgid "Export schema"
 msgstr "Eksport"
 
-#: templates/designer/side_menu.phtml:165
-#: templates/designer/side_menu.phtml:168
+#: templates/database/designer/side_menu.phtml:165
+#: templates/database/designer/side_menu.phtml:168
 #, fuzzy
 #| msgid "Submit Query"
 msgid "Build Query"
 msgstr "so‘rovni bajarish"
 
-#: templates/designer/side_menu.phtml:173
-#: templates/designer/side_menu.phtml:177
+#: templates/database/designer/side_menu.phtml:173
+#: templates/database/designer/side_menu.phtml:177
 msgid "Move Menu"
 msgstr "Menyuni ko‘chirish"
 
-#: templates/designer/side_menu.phtml:181
-#: templates/designer/side_menu.phtml:186
+#: templates/database/designer/side_menu.phtml:181
+#: templates/database/designer/side_menu.phtml:186
 #, fuzzy
 #| msgid "Partial Texts"
 msgid "Pin text"
 msgstr "Ma`lumotlarni qisqartirib ko‘rsatish"
 
-#: templates/designer/table_list.phtml:4
+#: templates/database/designer/table_list.phtml:4
 msgid "Hide/Show all"
 msgstr "Barcha jadvallarni yashirish/ko‘rsatish"
 
-#: templates/designer/table_list.phtml:14
+#: templates/database/designer/table_list.phtml:14
 msgid "Hide/Show Tables with no relation"
 msgstr "Aloqa mavjud bo‘lmagan jadvallarni yashirish/ko‘rsatish"
 
-#: templates/designer/table_list.phtml:59
+#: templates/database/designer/table_list.phtml:59
 #, fuzzy
 #| msgid "Number of tables"
 msgid "Number of tables:"
 msgstr "Jadvallar soni"
 
+#: templates/database/structure/body_for_table_summary.phtml:6
+#, fuzzy, php-format
+#| msgid "%s table(s)"
+msgid "%s table"
+msgid_plural "%s tables"
+msgstr[0] "Jadvallar soni: \"%s\""
+msgstr[1] "Jadvallar soni: \"%s\""
+
+#: templates/database/structure/body_for_table_summary.phtml:17
+msgid "Sum"
+msgstr "Jami"
+
+#: templates/database/structure/check_all_tables.phtml:6
+msgid "Check tables having overhead"
+msgstr "Optimallashtirish lozim bo‘lgn jadvallarni belgilash"
+
+#: templates/database/structure/check_all_tables.phtml:10
+#, fuzzy
+#| msgid "Show color"
+msgid "Show create"
+msgstr "Rangda ko‘rsatish"
+
+#: templates/database/structure/check_all_tables.phtml:27
+#, fuzzy
+#| msgid "Apply index(s)"
+msgid "Prefix"
+msgstr "Indеks(lar)ni saqlash"
+
+#: templates/database/structure/check_all_tables.phtml:28
+#, fuzzy
+#| msgid "Go to table"
+msgid "Add prefix to table"
+msgstr "Ushbu jadvalga o‘tish"
+
+#: templates/database/structure/check_all_tables.phtml:29
+#, fuzzy
+#| msgid "Replace table data with file"
+msgid "Replace table prefix"
+msgstr "Jadval ma`lumotlarini fayl ma`lumotlari bilan almashtirish"
+
+#: templates/database/structure/check_all_tables.phtml:30
+#, fuzzy
+#| msgid "Replace table data with file"
+msgid "Copy table with prefix"
+msgstr "Jadval ma`lumotlarini fayl ma`lumotlari bilan almashtirish"
+
+#: templates/database/structure/check_all_tables.phtml:36
+#, fuzzy
+#| msgid "CHAR textarea columns"
+msgid "Add columns to central list"
+msgstr "CHAR maydonidagi ustunlar soni"
+
+#: templates/database/structure/check_all_tables.phtml:37
+msgid "Remove columns from central list"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:38
+#, fuzzy
+#| msgid "CHAR textarea columns"
+msgid "Make consistent with central list"
+msgstr "CHAR maydonidagi ustunlar soni"
+
+#: templates/database/structure/favorite_anchor.phtml:12
+#, fuzzy
+#| msgid "Add a new server"
+msgid "Add to Favorites"
+msgstr "Yangi foydalanuvchi qo‘shish"
+
+#: templates/database/structure/show_create.phtml:2
+#, fuzzy
+#| msgid "Show SQL queries"
+msgid "Showing create queries"
+msgstr "Show SQL so‘rovlarini ko‘rsatish"
+
+#: templates/database/structure/sortable_header.phtml:13
+msgid "Sort"
+msgstr "Sortirovka qilish"
+
+#: templates/database/structure/table_header.phtml:42
+#, fuzzy
+#| msgid "May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]"
+msgid ""
+"May be approximate. Click on the number to get the exact count. See "
+"[doc@faq3-11]FAQ 3.11[/doc]."
+msgstr "Taxminiy bo‘lishi mumkin. [doc@faq3-11]\"FAQ 3.11\"[/doc]ga qarang"
+
+#: templates/database/structure/table_header.phtml:66
+#: templates/table/index_form.phtml:127
+msgid "Size"
+msgstr "Hajmi"
+
+#: templates/database/structure/table_header.phtml:74
+#: templates/table/structure/display_table_stats.phtml:27
+msgid "Overhead"
+msgstr "Fragmentlangan"
+
+#: templates/database/structure/tracking_icon.phtml:4
+msgid "Tracking is active."
+msgstr "Kuzatish faol."
+
+#: templates/database/structure/tracking_icon.phtml:8
+msgid "Tracking is not active."
+msgstr "Kuzatish faol emas."
+
 #: templates/error/report_form.phtml:7
 msgid ""
 "phpMyAdmin has encountered an error. We have collected data about this error "
@@ -17017,73 +17149,6 @@ msgstr ""
 msgid "Please explain the steps that lead to the error:"
 msgstr ""
 
-#: templates/gis_visualization/gis_visualization.phtml:3
-#, fuzzy
-#| msgid "Display servers selection"
-msgid "Display GIS Visualization"
-msgstr "Server tanlovini ko‘rsatish"
-
-#: templates/gis_visualization/gis_visualization.phtml:8
-#, fuzzy
-#| msgid "CHAR textarea columns"
-msgid "Label column"
-msgstr "CHAR maydonidagi ustunlar soni"
-
-#: templates/gis_visualization/gis_visualization.phtml:11
-#, fuzzy
-#| msgid "- none -"
-msgid "-- None --"
-msgstr "- yo‘q -"
-
-#: templates/gis_visualization/gis_visualization.phtml:19
-#, fuzzy
-#| msgid "Log file count"
-msgid "Spatial column"
-msgstr "Jurnal fayllari soni"
-
-#: templates/index_form.phtml:16
-msgid "Index name:"
-msgstr "Indeks nomi:"
-
-#: templates/index_form.phtml:19
-msgid ""
-"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
-msgstr "\"PRIMARY\" nomi <b>faqat</b> birlamchi indeksgaega bo‘lishi shart!"
-
-#: templates/index_form.phtml:40
-#, fuzzy
-#| msgid "Index cache size"
-msgid "Index choice:"
-msgstr "Indeks keshi hajmi"
-
-#: templates/index_form.phtml:57
-msgid "Key block size:"
-msgstr ""
-
-#: templates/index_form.phtml:74
-msgid "Index type:"
-msgstr "Indeks turi:"
-
-#: templates/index_form.phtml:86
-#, fuzzy
-#| msgid "User"
-msgid "Parser:"
-msgstr "Foydalanuvchi"
-
-#: templates/index_form.phtml:102
-#, fuzzy
-#| msgid "Comment"
-msgid "Comment:"
-msgstr "Izoh"
-
-#: templates/index_form.phtml:127 templates/structure/table_header.phtml:66
-msgid "Size"
-msgstr "Hajmi"
-
-#: templates/index_form.phtml:149 templates/index_form.phtml:190
-msgid "Drag to reorder"
-msgstr ""
-
 #: templates/prefs_autoload.phtml:9
 msgid ""
 "Your browser has phpMyAdmin configuration for this domain. Would you like to "
@@ -17096,446 +17161,188 @@ msgstr ""
 msgid "Start row:"
 msgstr "Boshlash"
 
-#: templates/structure/actions_in_table_structure.phtml:14
-#, php-format
-msgid "A primary key has been added on %s."
-msgstr "\"%s\" ga birlamchi kalit qo‘shildi."
-
-#: templates/structure/actions_in_table_structure.phtml:34
-#: templates/structure/actions_in_table_structure.phtml:54
-#: templates/structure/actions_in_table_structure.phtml:79
-#: templates/structure/actions_in_table_structure.phtml:101
-#, php-format
-msgid "An index has been added on %s."
-msgstr "\"%s\" uchun indeks qo‘shildi."
-
-#: templates/structure/actions_in_table_structure.phtml:130
-#: templates/structure/check_all_table_column.phtml:59
-#, fuzzy
-#| msgid "Remove column(s)"
-msgid "Remove from central columns"
-msgstr "Ustun(lar)ni olib tashlash"
-
-#: templates/structure/actions_in_table_structure.phtml:138
-#: templates/structure/check_all_table_column.phtml:55
-#, fuzzy
-#| msgid "CHAR textarea columns"
-msgid "Add to central columns"
-msgstr "CHAR maydonidagi ustunlar soni"
-
-#: templates/structure/add_column.phtml:7
-#, fuzzy, php-format
-#| msgid "Add column(s)"
-msgid "Add %s column(s)"
-msgstr "Ustun(lar) qo‘shish"
-
-#: templates/structure/add_column.phtml:12
-#, fuzzy
-#| msgid "At Beginning of Table"
-msgid "at beginning of table"
-msgstr "Jadval boshiga"
-
-#: templates/structure/body_for_table_summary.phtml:6
-#, fuzzy, php-format
-#| msgid "%s table(s)"
-msgid "%s table"
-msgid_plural "%s tables"
-msgstr[0] "Jadvallar soni: \"%s\""
-msgstr[1] "Jadvallar soni: \"%s\""
-
-#: templates/structure/body_for_table_summary.phtml:17
-msgid "Sum"
-msgstr "Jami"
-
-#: templates/structure/check_all_tables.phtml:6
-msgid "Check tables having overhead"
-msgstr "Optimallashtirish lozim bo‘lgn jadvallarni belgilash"
-
-#: templates/structure/check_all_tables.phtml:10
-#, fuzzy
-#| msgid "Show color"
-msgid "Show create"
-msgstr "Rangda ko‘rsatish"
-
-#: templates/structure/check_all_tables.phtml:27
-#, fuzzy
-#| msgid "Apply index(s)"
-msgid "Prefix"
-msgstr "Indеks(lar)ni saqlash"
-
-#: templates/structure/check_all_tables.phtml:28
-#, fuzzy
-#| msgid "Go to table"
-msgid "Add prefix to table"
-msgstr "Ushbu jadvalga o‘tish"
-
-#: templates/structure/check_all_tables.phtml:29
-#, fuzzy
-#| msgid "Replace table data with file"
-msgid "Replace table prefix"
-msgstr "Jadval ma`lumotlarini fayl ma`lumotlari bilan almashtirish"
-
-#: templates/structure/check_all_tables.phtml:30
-#, fuzzy
-#| msgid "Replace table data with file"
-msgid "Copy table with prefix"
-msgstr "Jadval ma`lumotlarini fayl ma`lumotlari bilan almashtirish"
-
-#: templates/structure/check_all_tables.phtml:36
-#, fuzzy
-#| msgid "CHAR textarea columns"
-msgid "Add columns to central list"
-msgstr "CHAR maydonidagi ustunlar soni"
-
-#: templates/structure/check_all_tables.phtml:37
-msgid "Remove columns from central list"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:38
-#, fuzzy
-#| msgid "CHAR textarea columns"
-msgid "Make consistent with central list"
-msgstr "CHAR maydonidagi ustunlar soni"
-
-#: templates/structure/display_structure.phtml:140 view_create.php:181
-#, fuzzy
-#| msgid "Print view"
-msgid "Edit view"
-msgstr "Chop etish versiyasi"
-
-#: templates/structure/display_table_stats.phtml:9
-msgid "Space usage"
-msgstr "Foydalanilayotgan joy"
-
-#: templates/structure/display_table_stats.phtml:27
-#: templates/structure/table_header.phtml:74
-msgid "Overhead"
-msgstr "Fragmentlangan"
-
-#: templates/structure/display_table_stats.phtml:32
-msgid "Effective"
-msgstr "Effektivlik"
-
-#: templates/structure/favorite_anchor.phtml:12
-#, fuzzy
-#| msgid "Add a new server"
-msgid "Add to Favorites"
-msgstr "Yangi foydalanuvchi qo‘shish"
-
-#: templates/structure/move_columns_dialog.phtml:1
-#: templates/structure/optional_action_links.phtml:21
-#, fuzzy
-#| msgid "Remove column(s)"
-msgid "Move columns"
-msgstr "Ustun(lar)ni olib tashlash"
-
-#: templates/structure/move_columns_dialog.phtml:2
-msgid "Move the columns by dragging them up and down."
-msgstr ""
-
-#: templates/structure/optional_action_links.phtml:9
-msgid "Propose table structure"
-msgstr "Jadval tuzilishi tahlili"
-
-#: templates/structure/optional_action_links.phtml:24
-#, fuzzy
-#| msgid "Propose table structure"
-msgid "Improve table structure"
-msgstr "Jadval tuzilishi tahlili"
-
-#: templates/structure/optional_action_links.phtml:30
-#, fuzzy
-#| msgid "Track table"
-msgid "Track view"
-msgstr "Jadvalni kuzatish"
-
-#: templates/structure/row_stats_table.phtml:3
-#, fuzzy
-#| msgid "Row Statistics"
-msgid "Row statistics"
-msgstr "Qatorlar statistikasi"
-
-#: templates/structure/row_stats_table.phtml:9
-msgid "static"
-msgstr "statik"
-
-#: templates/structure/row_stats_table.phtml:11
-msgid "dynamic"
-msgstr "dinamik"
-
-#: templates/structure/row_stats_table.phtml:22
-msgid "partitioned"
-msgstr "bo‘laklarga bo‘lingan"
-
-#: templates/structure/row_stats_table.phtml:54
-msgid "Row length"
-msgstr "Qator uzunligi"
-
-#: templates/structure/row_stats_table.phtml:66
-msgid "Row size"
-msgstr "Qator hajmi"
-
-#: templates/structure/row_stats_table.phtml:73
-msgid "Next autoindex"
-msgstr ""
-
-#: templates/structure/secondary_tabs.phtml:14
-#, fuzzy
-#| msgid "Relation view"
-msgid "Relation view"
-msgstr "Aloqalarni ko‘rish"
-
-#: templates/structure/show_create.phtml:2
-#, fuzzy
-#| msgid "Show SQL queries"
-msgid "Showing create queries"
-msgstr "Show SQL so‘rovlarini ko‘rsatish"
-
-#: templates/structure/sortable_header.phtml:13
-msgid "Sort"
-msgstr "Sortirovka qilish"
-
-#: templates/structure/table_header.phtml:42
-#, fuzzy
-#| msgid "May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]"
-msgid ""
-"May be approximate. Click on the number to get the exact count. See "
-"[doc@faq3-11]FAQ 3.11[/doc]."
-msgstr "Taxminiy bo‘lishi mumkin. [doc@faq3-11]\"FAQ 3.11\"[/doc]ga qarang"
-
-#: templates/structure/table_structure_row.phtml:46
-#, fuzzy, php-format
-#| msgid "Table %s has been dropped."
-msgid "Column %s has been dropped."
-msgstr "\"%s\" jadvali o‘chirildi"
-
-#: templates/structure/tracking_icon.phtml:4
-msgid "Tracking is active."
-msgstr "Kuzatish faol."
-
-#: templates/structure/tracking_icon.phtml:8
-msgid "Tracking is not active."
-msgstr "Kuzatish faol emas."
-
-#: templates/table/create_table.phtml:15
-#, fuzzy
-#| msgid "Number of fields"
-msgid "Number of columns"
-msgstr "Maydonlar soni "
-
-#: templates/table/options.phtml:8
-#, fuzzy
-#| msgid "Select fields (at least one):"
-msgid "Select columns (at least one):"
-msgstr "Maydonni tanlang (kamida bitta):"
-
-#: templates/table/options.phtml:37
-msgid "Add search conditions (body of the \"where\" clause):"
-msgstr "Qidirish shartini ko‘shish (ya`ni \"where\" jumlasi):"
-
-#: templates/table/options.phtml:45
-msgid "Number of rows per page"
-msgstr "Sahifadagi qatorlar soni"
-
-#: templates/table/options.phtml:56
-msgid "Display order:"
-msgstr "Sortirovka:"
-
-#: templates/table/options_zoom.phtml:6
-msgid "Use this column to label each point"
-msgstr ""
-
-#: templates/table/options_zoom.phtml:35
-#, fuzzy
-#| msgid "Maximum number of rows to display"
-msgid "Maximum rows to plot"
-msgstr "Ko‘rsatiladigan qatorlarning maksimal soni"
-
-#: templates/table/replace_preview.phtml:13
-msgid "Find and replace - preview"
-msgstr ""
-
-#: templates/table/replace_preview.phtml:18
-#, fuzzy
-#| msgid "Original position"
-msgid "Original string"
-msgstr "Asl pozitsiya"
-
-#: templates/table/replace_preview.phtml:19
-#, fuzzy
-#| msgid "Relations"
-msgid "Replaced string"
-msgstr "Aloqalar"
-
-#: templates/table/replace_preview.phtml:40
-#, fuzzy
-#| msgid "Replication"
-msgid "Replace"
-msgstr "Replikatsiya (zaxira nusxa ko‘chirish)"
-
-#: templates/table/rows_zoom.phtml:16
-#, fuzzy
-#| msgid "SQL Query box"
-msgid "Additional search criteria"
-msgstr "SQL so‘rovlari qutisi"
-
-#: templates/table/search_and_replace.phtml:3
-#, fuzzy
-#| msgid "Replace NULL by"
-msgid "Replace with:"
-msgstr "NULL qiymatni quyidagiga almashtirish"
-
-#: templates/table/search_and_replace.phtml:22
-#, fuzzy
-#| msgid "as regular expression"
-msgid "Use regular expression"
-msgstr "muntazam ibora"
-
-#: templates/table/selection_form.phtml:12
-#, fuzzy
-#| msgid "Do a \"query by example\" (wildcard: \"%\")"
-msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
-msgstr "\"Namunadagi so‘rovni bajarish\" (o‘rniga qo‘yish belgisi: \"%\")"
-
-#: templates/table/selection_form.phtml:34
-msgid "Do a \"query by example\" (wildcard: \"%\")"
-msgstr "\"Namunadagi so‘rovni bajarish\" (o‘rniga qo‘yish belgisi: \"%\")"
-
-#: templates/table/zoom_result_form.phtml:7
-msgid "Browse/Edit the points"
-msgstr ""
-
-#: templates/table/zoom_result_form.phtml:15
-#, fuzzy
-#| msgid "Control user"
-msgid "How to use"
-msgstr "Nazorat foydalanuvchisi"
-
-#: templates/table/zoom_result_form.phtml:23
-#, fuzzy
-#| msgid "Reset"
-msgid "Reset zoom"
-msgstr "Tozalash"
-
-#: templates/tbl_chart.phtml:17
+#: templates/table/chart/tbl_chart.phtml:17
 #, fuzzy
 #| msgid "Mar"
 msgctxt "Chart type"
 msgid "Bar"
 msgstr "Mar"
 
-#: templates/tbl_chart.phtml:21
+#: templates/table/chart/tbl_chart.phtml:21
 #, fuzzy
 #| msgid "Column names"
 msgctxt "Chart type"
 msgid "Column"
 msgstr "Maydon nomlari"
 
-#: templates/tbl_chart.phtml:25
+#: templates/table/chart/tbl_chart.phtml:25
 msgctxt "Chart type"
 msgid "Line"
 msgstr ""
 
-#: templates/tbl_chart.phtml:29
+#: templates/table/chart/tbl_chart.phtml:29
 #, fuzzy
 #| msgid "Engines"
 msgctxt "Chart type"
 msgid "Spline"
 msgstr "Jadval turlari"
 
-#: templates/tbl_chart.phtml:33
+#: templates/table/chart/tbl_chart.phtml:33
 msgctxt "Chart type"
 msgid "Area"
 msgstr ""
 
-#: templates/tbl_chart.phtml:37
+#: templates/table/chart/tbl_chart.phtml:37
 #, fuzzy
 #| msgid "PiB"
 msgctxt "Chart type"
 msgid "Pie"
 msgstr "PB"
 
-#: templates/tbl_chart.phtml:41
+#: templates/table/chart/tbl_chart.phtml:41
 #, fuzzy
 #| msgid "Time"
 msgctxt "Chart type"
 msgid "Timeline"
 msgstr "Vaqt"
 
-#: templates/tbl_chart.phtml:45
+#: templates/table/chart/tbl_chart.phtml:45
 msgctxt "Chart type"
 msgid "Scatter"
 msgstr ""
 
-#: templates/tbl_chart.phtml:50
+#: templates/table/chart/tbl_chart.phtml:50
 #, fuzzy
 #| msgid "Packed"
 msgid "Stacked"
 msgstr "Qisilgan"
 
-#: templates/tbl_chart.phtml:53
+#: templates/table/chart/tbl_chart.phtml:53
 #, fuzzy
 #| msgid "Report title"
 msgid "Chart title"
 msgstr "Hisobot sarlavhasi"
 
-#: templates/tbl_chart.phtml:57
+#: templates/table/chart/tbl_chart.phtml:57
 msgid "X-Axis:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:72
+#: templates/table/chart/tbl_chart.phtml:72
 #, fuzzy
 #| msgid "SQL queries"
 msgid "Series:"
 msgstr "SQL so‘rovlari"
 
-#: templates/tbl_chart.phtml:102
+#: templates/table/chart/tbl_chart.phtml:102
 msgid "X-Axis label:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:104
+#: templates/table/chart/tbl_chart.phtml:104
 #, fuzzy
 #| msgid "Value"
 msgid "X Values"
 msgstr "Qiymati"
 
-#: templates/tbl_chart.phtml:107
+#: templates/table/chart/tbl_chart.phtml:107
 msgid "Y-Axis label:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:115
+#: templates/table/chart/tbl_chart.phtml:115
 msgid "Series names are in a column"
 msgstr ""
 
-#: templates/tbl_chart.phtml:118
+#: templates/table/chart/tbl_chart.phtml:118
 #, fuzzy
 #| msgid "Inside field:"
 msgid "Series column:"
 msgstr "Quyidagi maydon(lar)da qidirish: "
 
-#: templates/tbl_chart.phtml:130
+#: templates/table/chart/tbl_chart.phtml:130
 #, fuzzy
 #| msgid "Number of fields"
 msgid "Value Column:"
 msgstr "Maydonlar soni "
 
-#: templates/tbl_chart.phtml:150
+#: templates/table/chart/tbl_chart.phtml:150
 #, fuzzy
 #| msgid "Save as file"
 msgid "Save chart as image"
 msgstr "Fayl kabi saqlash"
 
-#: templates/tbl_relation/common_form.phtml:7
+#: templates/table/gis_visualization/gis_visualization.phtml:3
+#, fuzzy
+#| msgid "Display servers selection"
+msgid "Display GIS Visualization"
+msgstr "Server tanlovini ko‘rsatish"
+
+#: templates/table/gis_visualization/gis_visualization.phtml:8
+#, fuzzy
+#| msgid "CHAR textarea columns"
+msgid "Label column"
+msgstr "CHAR maydonidagi ustunlar soni"
+
+#: templates/table/gis_visualization/gis_visualization.phtml:11
+#, fuzzy
+#| msgid "- none -"
+msgid "-- None --"
+msgstr "- yo‘q -"
+
+#: templates/table/gis_visualization/gis_visualization.phtml:19
+#, fuzzy
+#| msgid "Log file count"
+msgid "Spatial column"
+msgstr "Jurnal fayllari soni"
+
+#: templates/table/index_form.phtml:16
+msgid "Index name:"
+msgstr "Indeks nomi:"
+
+#: templates/table/index_form.phtml:19
+msgid ""
+"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
+msgstr "\"PRIMARY\" nomi <b>faqat</b> birlamchi indeksgaega bo‘lishi shart!"
+
+#: templates/table/index_form.phtml:40
+#, fuzzy
+#| msgid "Index cache size"
+msgid "Index choice:"
+msgstr "Indeks keshi hajmi"
+
+#: templates/table/index_form.phtml:57
+msgid "Key block size:"
+msgstr ""
+
+#: templates/table/index_form.phtml:74
+msgid "Index type:"
+msgstr "Indeks turi:"
+
+#: templates/table/index_form.phtml:86
+#, fuzzy
+#| msgid "User"
+msgid "Parser:"
+msgstr "Foydalanuvchi"
+
+#: templates/table/index_form.phtml:102
+#, fuzzy
+#| msgid "Comment"
+msgid "Comment:"
+msgstr "Izoh"
+
+#: templates/table/index_form.phtml:149 templates/table/index_form.phtml:190
+msgid "Drag to reorder"
+msgstr ""
+
+#: templates/table/relation/common_form.phtml:7
 msgid "Internal relations"
 msgstr "Ichki aloqalar"
 
-#: templates/tbl_relation/common_form.phtml:11
+#: templates/table/relation/common_form.phtml:11
 #, fuzzy
 #| msgid "Internal relations"
 msgid "Internal relation"
 msgstr "Ichki aloqalar"
 
-#: templates/tbl_relation/common_form.phtml:14
+#: templates/table/relation/common_form.phtml:14
 msgid ""
 "An internal relation is not necessary when a corresponding FOREIGN KEY "
 "relation exists."
@@ -17543,63 +17350,279 @@ msgstr ""
 "Agar tashqi kalit (FOREIGN KEY) orqali aloqa mavjud bo‘lsa, ichki aloqa "
 "o‘rnatish shart emas."
 
-#: templates/tbl_relation/common_form.phtml:37
+#: templates/table/relation/common_form.phtml:37
 #, fuzzy
 #| msgid "Foreign key limit"
 msgid "Foreign key constraints"
 msgstr "Tashqi kalit chegaralari"
 
-#: templates/tbl_relation/common_form.phtml:40
+#: templates/table/relation/common_form.phtml:40
 msgid "Actions"
 msgstr "Amallar"
 
-#: templates/tbl_relation/common_form.phtml:41
+#: templates/table/relation/common_form.phtml:41
 #, fuzzy
 #| msgid "Constraints for table"
 msgid "Constraint properties"
 msgstr "Jadvallarning tashqi kalitida cheklovlar"
 
-#: templates/tbl_relation/common_form.phtml:44
+#: templates/table/relation/common_form.phtml:44
 msgid ""
 "Only columns with index will be displayed. You can define an index below."
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:49
+#: templates/table/relation/common_form.phtml:49
 #, fuzzy
 #| msgid "Foreign key limit"
 msgid "Foreign key constraint"
 msgstr "Tashqi kalit chegaralari"
 
-#: templates/tbl_relation/common_form.phtml:81
+#: templates/table/relation/common_form.phtml:81
 #, fuzzy
 #| msgid "Add constraints"
 msgid "+ Add constraint"
 msgstr "Cheklovlar qo‘shish"
 
-#: templates/tbl_relation/common_form.phtml:91
+#: templates/table/relation/common_form.phtml:91
 #, fuzzy
 #| msgid "Choose field to display"
 msgid "Choose column to display:"
 msgstr "Ko‘rsatiladigan maydonni tanlash"
 
-#: templates/tbl_relation/foreign_key_row.phtml:13
+#: templates/table/relation/foreign_key_row.phtml:13
 #, fuzzy, php-format
 #| msgid "Foreign key limit"
 msgid "Foreign key constraint %s has been dropped"
 msgstr "Tashqi kalit chegaralari"
 
-#: templates/tbl_relation/foreign_key_row.phtml:102
+#: templates/table/relation/foreign_key_row.phtml:102
 #, fuzzy
 #| msgid "Constraints for table"
 msgid "Constraint name"
 msgstr "Jadvallarning tashqi kalitida cheklovlar"
 
-#: templates/tbl_relation/foreign_key_row.phtml:157
+#: templates/table/relation/foreign_key_row.phtml:157
 #, fuzzy
 #| msgid "Add column(s)"
 msgid "+ Add column"
 msgstr "Ustun(lar) qo‘shish"
 
+#: templates/table/search/options.phtml:8
+#, fuzzy
+#| msgid "Select fields (at least one):"
+msgid "Select columns (at least one):"
+msgstr "Maydonni tanlang (kamida bitta):"
+
+#: templates/table/search/options.phtml:37
+msgid "Add search conditions (body of the \"where\" clause):"
+msgstr "Qidirish shartini ko‘shish (ya`ni \"where\" jumlasi):"
+
+#: templates/table/search/options.phtml:45
+msgid "Number of rows per page"
+msgstr "Sahifadagi qatorlar soni"
+
+#: templates/table/search/options.phtml:56
+msgid "Display order:"
+msgstr "Sortirovka:"
+
+#: templates/table/search/options_zoom.phtml:6
+msgid "Use this column to label each point"
+msgstr ""
+
+#: templates/table/search/options_zoom.phtml:35
+#, fuzzy
+#| msgid "Maximum number of rows to display"
+msgid "Maximum rows to plot"
+msgstr "Ko‘rsatiladigan qatorlarning maksimal soni"
+
+#: templates/table/search/replace_preview.phtml:13
+msgid "Find and replace - preview"
+msgstr ""
+
+#: templates/table/search/replace_preview.phtml:18
+#, fuzzy
+#| msgid "Original position"
+msgid "Original string"
+msgstr "Asl pozitsiya"
+
+#: templates/table/search/replace_preview.phtml:19
+#, fuzzy
+#| msgid "Relations"
+msgid "Replaced string"
+msgstr "Aloqalar"
+
+#: templates/table/search/replace_preview.phtml:40
+#, fuzzy
+#| msgid "Replication"
+msgid "Replace"
+msgstr "Replikatsiya (zaxira nusxa ko‘chirish)"
+
+#: templates/table/search/rows_zoom.phtml:16
+#, fuzzy
+#| msgid "SQL Query box"
+msgid "Additional search criteria"
+msgstr "SQL so‘rovlari qutisi"
+
+#: templates/table/search/search_and_replace.phtml:3
+#, fuzzy
+#| msgid "Replace NULL by"
+msgid "Replace with:"
+msgstr "NULL qiymatni quyidagiga almashtirish"
+
+#: templates/table/search/search_and_replace.phtml:22
+#, fuzzy
+#| msgid "as regular expression"
+msgid "Use regular expression"
+msgstr "muntazam ibora"
+
+#: templates/table/search/selection_form.phtml:12
+#, fuzzy
+#| msgid "Do a \"query by example\" (wildcard: \"%\")"
+msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
+msgstr "\"Namunadagi so‘rovni bajarish\" (o‘rniga qo‘yish belgisi: \"%\")"
+
+#: templates/table/search/selection_form.phtml:34
+msgid "Do a \"query by example\" (wildcard: \"%\")"
+msgstr "\"Namunadagi so‘rovni bajarish\" (o‘rniga qo‘yish belgisi: \"%\")"
+
+#: templates/table/search/zoom_result_form.phtml:7
+msgid "Browse/Edit the points"
+msgstr ""
+
+#: templates/table/search/zoom_result_form.phtml:15
+#, fuzzy
+#| msgid "Control user"
+msgid "How to use"
+msgstr "Nazorat foydalanuvchisi"
+
+#: templates/table/search/zoom_result_form.phtml:23
+#, fuzzy
+#| msgid "Reset"
+msgid "Reset zoom"
+msgstr "Tozalash"
+
+#: templates/table/secondary_tabs.phtml:14
+#, fuzzy
+#| msgid "Relation view"
+msgid "Relation view"
+msgstr "Aloqalarni ko‘rish"
+
+#: templates/table/structure/actions_in_table_structure.phtml:14
+#, php-format
+msgid "A primary key has been added on %s."
+msgstr "\"%s\" ga birlamchi kalit qo‘shildi."
+
+#: templates/table/structure/actions_in_table_structure.phtml:34
+#: templates/table/structure/actions_in_table_structure.phtml:54
+#: templates/table/structure/actions_in_table_structure.phtml:79
+#: templates/table/structure/actions_in_table_structure.phtml:101
+#, php-format
+msgid "An index has been added on %s."
+msgstr "\"%s\" uchun indeks qo‘shildi."
+
+#: templates/table/structure/actions_in_table_structure.phtml:130
+#: templates/table/structure/check_all_table_column.phtml:59
+#, fuzzy
+#| msgid "Remove column(s)"
+msgid "Remove from central columns"
+msgstr "Ustun(lar)ni olib tashlash"
+
+#: templates/table/structure/actions_in_table_structure.phtml:138
+#: templates/table/structure/check_all_table_column.phtml:55
+#, fuzzy
+#| msgid "CHAR textarea columns"
+msgid "Add to central columns"
+msgstr "CHAR maydonidagi ustunlar soni"
+
+#: templates/table/structure/add_column.phtml:7
+#, fuzzy, php-format
+#| msgid "Add column(s)"
+msgid "Add %s column(s)"
+msgstr "Ustun(lar) qo‘shish"
+
+#: templates/table/structure/add_column.phtml:12
+#, fuzzy
+#| msgid "At Beginning of Table"
+msgid "at beginning of table"
+msgstr "Jadval boshiga"
+
+#: templates/table/structure/display_structure.phtml:140 view_create.php:181
+#, fuzzy
+#| msgid "Print view"
+msgid "Edit view"
+msgstr "Chop etish versiyasi"
+
+#: templates/table/structure/display_table_stats.phtml:9
+msgid "Space usage"
+msgstr "Foydalanilayotgan joy"
+
+#: templates/table/structure/display_table_stats.phtml:32
+msgid "Effective"
+msgstr "Effektivlik"
+
+#: templates/table/structure/move_columns_dialog.phtml:1
+#: templates/table/structure/optional_action_links.phtml:21
+#, fuzzy
+#| msgid "Remove column(s)"
+msgid "Move columns"
+msgstr "Ustun(lar)ni olib tashlash"
+
+#: templates/table/structure/move_columns_dialog.phtml:2
+msgid "Move the columns by dragging them up and down."
+msgstr ""
+
+#: templates/table/structure/optional_action_links.phtml:9
+msgid "Propose table structure"
+msgstr "Jadval tuzilishi tahlili"
+
+#: templates/table/structure/optional_action_links.phtml:24
+#, fuzzy
+#| msgid "Propose table structure"
+msgid "Improve table structure"
+msgstr "Jadval tuzilishi tahlili"
+
+#: templates/table/structure/optional_action_links.phtml:30
+#, fuzzy
+#| msgid "Track table"
+msgid "Track view"
+msgstr "Jadvalni kuzatish"
+
+#: templates/table/structure/row_stats_table.phtml:3
+#, fuzzy
+#| msgid "Row Statistics"
+msgid "Row statistics"
+msgstr "Qatorlar statistikasi"
+
+#: templates/table/structure/row_stats_table.phtml:9
+msgid "static"
+msgstr "statik"
+
+#: templates/table/structure/row_stats_table.phtml:11
+msgid "dynamic"
+msgstr "dinamik"
+
+#: templates/table/structure/row_stats_table.phtml:22
+msgid "partitioned"
+msgstr "bo‘laklarga bo‘lingan"
+
+#: templates/table/structure/row_stats_table.phtml:54
+msgid "Row length"
+msgstr "Qator uzunligi"
+
+#: templates/table/structure/row_stats_table.phtml:66
+msgid "Row size"
+msgstr "Qator hajmi"
+
+#: templates/table/structure/row_stats_table.phtml:73
+msgid "Next autoindex"
+msgstr ""
+
+#: templates/table/structure/table_structure_row.phtml:46
+#, fuzzy, php-format
+#| msgid "Table %s has been dropped."
+msgid "Column %s has been dropped."
+msgstr "\"%s\" jadvali o‘chirildi"
+
 #: themes.php:17 themes.php:22
 msgid "Theme"
 msgstr ""
@@ -18872,6 +18895,11 @@ msgstr ""
 msgid "concurrent_insert is set to 0"
 msgstr "Maksimal ulanishlar soni "
 
+#, fuzzy
+#~| msgid "Read misses"
+#~ msgid "Read as multibytes"
+#~ msgstr "Buferni o‘qishda qoldirishlar mavjud"
+
 #, fuzzy
 #~| msgid "Relational display field"
 #~ msgid "Relational display column"
diff --git a/po/vi.po b/po/vi.po
index c9ebfde906..6f7a780782 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 4.5.0-dev\n"
 "Report-Msgid-Bugs-To: developers@phpmyadmin.net\n"
-"POT-Creation-Date: 2015-08-08 13:53-0400\n"
+"POT-Creation-Date: 2015-08-12 08:10-0400\n"
 "PO-Revision-Date: 2015-04-15 09:55+0200\n"
 "Last-Translator: Bao trinh minh <trinhminhbao@gmail.com>\n"
 "Language-Team: Vietnamese <https://hosted.weblate.org/projects/phpmyadmin/"
@@ -57,7 +57,7 @@ msgid "Table comments:"
 msgstr "Các chú thích của Bảng"
 
 #: db_datadict.php:104 libraries/Index.class.php:699
-#: libraries/insert_edit.lib.php:1567
+#: libraries/insert_edit.lib.php:1565
 #: libraries/navigation/Nodes/Node_Column.class.php:30
 #: libraries/plugins/export/ExportHtmlword.class.php:280
 #: libraries/plugins/export/ExportHtmlword.class.php:375
@@ -71,13 +71,14 @@ msgstr "Các chú thích của Bảng"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1023
 #: libraries/tracking.lib.php:879 libraries/tracking.lib.php:975
 #: templates/columns_definitions/column_name.phtml:18
-#: templates/index_form.phtml:124 templates/table/table_header.phtml:6
-#: templates/table/zoom_result_form.phtml:33
-#: templates/tbl_relation/common_form.phtml:10
-#: templates/tbl_relation/common_form.phtml:43
-#: templates/tbl_relation/foreign_key_row.phtml:194
-#: templates/tbl_relation/foreign_key_row.phtml:206
-#: templates/tbl_relation/internal_relational_row.phtml:71
+#: templates/table/index_form.phtml:124
+#: templates/table/relation/common_form.phtml:10
+#: templates/table/relation/common_form.phtml:43
+#: templates/table/relation/foreign_key_row.phtml:194
+#: templates/table/relation/foreign_key_row.phtml:206
+#: templates/table/relation/internal_relational_row.phtml:71
+#: templates/table/search/table_header.phtml:6
+#: templates/table/search/zoom_result_form.phtml:33
 msgid "Column"
 msgstr "Trường"
 
@@ -95,21 +96,21 @@ msgstr "Trường"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1001
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1024
 #: libraries/rte/rte_list.lib.php:75 libraries/rte/rte_list.lib.php:103
-#: libraries/rte/rte_routines.lib.php:802
-#: libraries/rte/rte_routines.lib.php:831
-#: libraries/rte/rte_routines.lib.php:1493
+#: libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_routines.lib.php:922
+#: libraries/rte/rte_routines.lib.php:1584
 #: libraries/server_privileges.lib.php:2369 libraries/tracking.lib.php:880
 #: libraries/tracking.lib.php:972
 #: templates/columns_definitions/table_fields_definitions.phtml:11
-#: templates/structure/table_header.phtml:48
-#: templates/structure/table_structure_header.phtml:6
-#: templates/table/table_header.phtml:7
+#: templates/database/structure/table_header.phtml:48
+#: templates/table/search/table_header.phtml:7
+#: templates/table/structure/table_structure_header.phtml:6
 msgid "Type"
 msgstr "Kiểu"
 
 #: db_datadict.php:106 libraries/Index.class.php:702
 #: libraries/central_columns.lib.php:708
-#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1576
+#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1574
 #: libraries/plugins/export/ExportHtmlword.class.php:286
 #: libraries/plugins/export/ExportHtmlword.class.php:381
 #: libraries/plugins/export/ExportLatex.class.php:509
@@ -122,8 +123,8 @@ msgstr "Kiểu"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1026
 #: libraries/tracking.lib.php:882 libraries/tracking.lib.php:978
 #: templates/columns_definitions/table_fields_definitions.phtml:39
-#: templates/structure/table_structure_header.phtml:9
-#: templates/table/zoom_result_form.phtml:34
+#: templates/table/search/zoom_result_form.phtml:34
+#: templates/table/structure/table_structure_header.phtml:9
 msgid "Null"
 msgstr "Null"
 
@@ -141,8 +142,8 @@ msgstr "Null"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1027
 #: libraries/replication_gui.lib.php:153 libraries/tracking.lib.php:883
 #: templates/columns_definitions/table_fields_definitions.phtml:25
-#: templates/structure/body_for_table_summary.phtml:55
-#: templates/structure/table_structure_header.phtml:10
+#: templates/database/structure/body_for_table_summary.phtml:55
+#: templates/table/structure/table_structure_header.phtml:10
 msgid "Default"
 msgstr "Mặc định"
 
@@ -170,19 +171,19 @@ msgid "Comments"
 msgstr "Chú thích"
 
 #: db_datadict.php:146
-#: libraries/controllers/StructureController.class.php:1960
-#: libraries/controllers/StructureController.class.php:1965
+#: libraries/controllers/TableStructureController.class.php:951
+#: libraries/controllers/TableStructureController.class.php:956
 #: libraries/tracking.lib.php:922
 #: templates/columns_definitions/column_indexes.phtml:6
-#: templates/structure/check_all_table_column.phtml:22
-#: templates/structure/display_structure.phtml:74
+#: templates/table/structure/check_all_table_column.phtml:22
+#: templates/table/structure/display_structure.phtml:74
 msgid "Primary"
 msgstr "Khóa Chính"
 
 #: db_datadict.php:156 js/messages.php:317 libraries/Index.class.php:567
 #: libraries/Index.class.php:606 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261 libraries/mult_submits.lib.php:403
+#: libraries/config/FormDisplay.tpl.php:272 libraries/mult_submits.lib.php:403
 #: libraries/mult_submits.lib.php:417
 #: libraries/plugins/export/ExportHtmlword.class.php:630
 #: libraries/plugins/export/ExportLatex.class.php:589
@@ -198,20 +199,20 @@ msgstr "Khóa Chính"
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1010 libraries/tracking.lib.php:1015
 #: prefs_manage.php:140 templates/prefs_autoload.phtml:15
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "No"
 msgstr "Không"
 
 #: db_datadict.php:156 js/messages.php:443 libraries/Index.class.php:568
 #: libraries/Index.class.php:605 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261
-#: libraries/controllers/StructureController.class.php:1344
-#: libraries/controllers/StructureController.class.php:2223
-#: libraries/controllers/StructureController.class.php:2232
-#: libraries/controllers/StructureController.class.php:2237
-#: libraries/controllers/StructureController.class.php:2242
-#: libraries/controllers/StructureController.class.php:2247
+#: libraries/config/FormDisplay.tpl.php:272
+#: libraries/controllers/TableStructureController.class.php:539
+#: libraries/controllers/TableStructureController.class.php:1201
+#: libraries/controllers/TableStructureController.class.php:1210
+#: libraries/controllers/TableStructureController.class.php:1215
+#: libraries/controllers/TableStructureController.class.php:1220
+#: libraries/controllers/TableStructureController.class.php:1225
 #: libraries/mult_submits.inc.php:82 libraries/mult_submits.inc.php:178
 #: libraries/mult_submits.lib.php:339 libraries/mult_submits.lib.php:372
 #: libraries/mult_submits.lib.php:401 libraries/mult_submits.lib.php:415
@@ -220,8 +221,8 @@ msgstr "Không"
 #: libraries/plugins/export/ExportOdt.class.php:756
 #: libraries/plugins/export/ExportTexytext.class.php:567
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1077
-#: libraries/server_databases.lib.php:464
-#: libraries/server_databases.lib.php:474
+#: libraries/server_databases.lib.php:475
+#: libraries/server_databases.lib.php:485
 #: libraries/server_privileges.lib.php:2546
 #: libraries/server_privileges.lib.php:2727
 #: libraries/server_privileges.lib.php:2748
@@ -231,7 +232,7 @@ msgstr "Không"
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1008 libraries/tracking.lib.php:1013
 #: prefs_manage.php:138 templates/prefs_autoload.phtml:14
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "Yes"
 msgstr "Có"
 
@@ -241,7 +242,7 @@ msgstr "Xem cấu trúc (lược đồ) của CSDL"
 
 #: db_export.php:37 db_tracking.php:90 export.php:382
 #: libraries/DBQbe.class.php:326
-#: libraries/controllers/StructureController.class.php:231
+#: libraries/controllers/DatabaseStructureController.class.php:170
 #: libraries/navigation/NavigationTree.class.php:897
 msgid "No tables found in database."
 msgstr "Không có bảng nào trong CSDL."
@@ -252,14 +253,14 @@ msgstr "Không có bảng nào trong CSDL."
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:26
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:120
-#: templates/structure/show_create.phtml:18
+#: templates/database/structure/show_create.phtml:18
 msgid "Tables"
 msgstr ""
 
 #: db_export.php:52 libraries/Menu.class.php:317 libraries/Menu.class.php:425
-#: libraries/Util.class.php:3333 libraries/Util.class.php:3343
-#: libraries/Util.class.php:3349 libraries/Util.class.php:3629
-#: libraries/Util.class.php:4327 libraries/Util.class.php:4344
+#: libraries/Util.class.php:3339 libraries/Util.class.php:3349
+#: libraries/Util.class.php:3355 libraries/Util.class.php:3635
+#: libraries/Util.class.php:4333 libraries/Util.class.php:4350
 #: libraries/central_columns.lib.php:728 libraries/config.values.php:39
 #: libraries/config.values.php:47 libraries/config.values.php:109
 #: libraries/config.values.php:115 libraries/config/setup.forms.php:323
@@ -273,7 +274,7 @@ msgstr ""
 #: libraries/navigation/Nodes/Node_Table.class.php:283
 #: libraries/server_privileges.lib.php:1141 libraries/tracking.lib.php:874
 #: templates/columns_definitions/table_fields_definitions.phtml:3
-#: templates/designer/table_list.phtml:28
+#: templates/database/designer/table_list.phtml:28
 msgid "Structure"
 msgstr ""
 
@@ -285,7 +286,7 @@ msgstr ""
 #: libraries/config/user_preferences.forms.php:292
 #: libraries/config/user_preferences.forms.php:297
 #: libraries/server_privileges.lib.php:1140
-#: templates/structure/display_table_stats.phtml:12
+#: templates/table/structure/display_table_stats.phtml:12
 msgid "Data"
 msgstr ""
 
@@ -357,10 +358,10 @@ msgstr "Các bảng đã theo dõi."
 #: libraries/server_privileges.lib.php:2908
 #: libraries/server_privileges.lib.php:3145
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4346
-#: templates/structure/table_header.phtml:21
-#: templates/tbl_relation/foreign_key_row.phtml:176
-#: templates/tbl_relation/internal_relational_row.phtml:63
+#: libraries/server_privileges.lib.php:4372
+#: templates/database/structure/table_header.phtml:21
+#: templates/table/relation/foreign_key_row.phtml:176
+#: templates/table/relation/internal_relational_row.phtml:63
 msgid "Table"
 msgstr "Bảng"
 
@@ -377,7 +378,7 @@ msgid "Updated"
 msgstr "Đã cập nhật"
 
 #: db_tracking.php:130 js/messages.php:243 libraries/Menu.class.php:552
-#: libraries/Util.class.php:4314 libraries/config.values.php:104
+#: libraries/Util.class.php:4320 libraries/config.values.php:104
 #: libraries/rte/rte_events.lib.php:393 libraries/rte/rte_list.lib.php:101
 #: libraries/server_status_processes.lib.php:92 libraries/tracking.lib.php:279
 msgid "Status"
@@ -386,14 +387,15 @@ msgstr "Trạng thái"
 #: db_tracking.php:131 db_tracking.php:290 libraries/Index.class.php:693
 #: libraries/central_columns.lib.php:687 libraries/rte/rte_list.lib.php:74
 #: libraries/rte/rte_list.lib.php:89 libraries/rte/rte_list.lib.php:102
-#: libraries/server_databases.lib.php:398
+#: libraries/server_databases.lib.php:409
 #: libraries/server_privileges.lib.php:2372
 #: libraries/server_privileges.lib.php:3166
 #: libraries/server_privileges.lib.php:3342
 #: libraries/server_user_groups.lib.php:82
 #: libraries/server_variables.lib.php:189 libraries/tracking.lib.php:280
-#: libraries/tracking.lib.php:793 templates/structure/table_header.phtml:30
-#: templates/structure/table_structure_header.phtml:23
+#: libraries/tracking.lib.php:793
+#: templates/database/structure/table_header.phtml:30
+#: templates/table/structure/table_structure_header.phtml:23
 msgid "Action"
 msgstr "Hành động"
 
@@ -435,7 +437,7 @@ msgid "Untracked tables"
 msgstr "Những bảng chưa theo dõi"
 
 #: db_tracking.php:305 db_tracking.php:336
-#: templates/structure/optional_action_links.phtml:17
+#: templates/table/structure/optional_action_links.phtml:17
 msgid "Track table"
 msgstr "Theo dõi bảng"
 
@@ -491,7 +493,7 @@ msgid "Value for the column \"%s\""
 msgstr "Giá trị cho cột \"%s\""
 
 #: gis_data_editor.php:146
-#: templates/gis_visualization/gis_visualization.phtml:37
+#: templates/table/gis_visualization/gis_visualization.phtml:37
 msgid "Use OpenStreetMaps as Base Layer"
 msgstr ""
 
@@ -571,35 +573,35 @@ msgstr ""
 #: libraries/display_change_password.lib.php:162
 #: libraries/display_export.lib.php:402 libraries/display_export.lib.php:408
 #: libraries/display_import.lib.php:392 libraries/index.lib.php:44
-#: libraries/insert_edit.lib.php:1546 libraries/insert_edit.lib.php:1583
+#: libraries/insert_edit.lib.php:1544 libraries/insert_edit.lib.php:1581
 #: libraries/normalization.lib.php:165 libraries/normalization.lib.php:821
 #: libraries/operations.lib.php:38 libraries/operations.lib.php:108
 #: libraries/operations.lib.php:263 libraries/operations.lib.php:306
 #: libraries/operations.lib.php:801 libraries/operations.lib.php:874
 #: libraries/operations.lib.php:923 libraries/operations.lib.php:1337
 #: libraries/operations.lib.php:1658
-#: libraries/plugins/auth/AuthenticationCookie.class.php:244
+#: libraries/plugins/auth/AuthenticationCookie.class.php:232
 #: libraries/replication_gui.lib.php:122 libraries/replication_gui.lib.php:161
 #: libraries/replication_gui.lib.php:324 libraries/replication_gui.lib.php:461
 #: libraries/replication_gui.lib.php:906 libraries/rte/rte_events.lib.php:509
-#: libraries/rte/rte_routines.lib.php:969
-#: libraries/rte/rte_routines.lib.php:1581
+#: libraries/rte/rte_routines.lib.php:1060
+#: libraries/rte/rte_routines.lib.php:1672
 #: libraries/rte/rte_triggers.lib.php:396 libraries/server_bin_log.lib.php:61
 #: libraries/server_privileges.lib.php:705
 #: libraries/server_privileges.lib.php:2106
 #: libraries/server_privileges.lib.php:2872
 #: libraries/server_privileges.lib.php:3553
-#: libraries/server_privileges.lib.php:4627
+#: libraries/server_privileges.lib.php:4653
 #: libraries/server_user_groups.lib.php:285
 #: libraries/sql_query_form.lib.php:369 libraries/sql_query_form.lib.php:429
 #: libraries/tracking.lib.php:533 libraries/tracking.lib.php:653
 #: prefs_manage.php:277 prefs_manage.php:355
 #: templates/columns_definitions/column_definitions_form.phtml:59
-#: templates/header_location.phtml:17 templates/index_form.phtml:238
+#: templates/database/create_table.phtml:21 templates/header_location.phtml:28
 #: templates/startAndNumberOfRowsPanel.phtml:14
-#: templates/structure/add_column.phtml:25
-#: templates/table/create_table.phtml:21
-#: templates/table/selection_form.phtml:75 view_create.php:275
+#: templates/table/index_form.phtml:238
+#: templates/table/search/selection_form.phtml:75
+#: templates/table/structure/add_column.phtml:25 view_create.php:275
 #: view_operations.php:106
 msgid "Go"
 msgstr ""
@@ -677,7 +679,7 @@ msgstr ""
 msgid "Could not load import plugins, please check your installation!"
 msgstr ""
 
-#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1466
+#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1460
 #, php-format
 msgid "Bookmark %s has been created."
 msgstr ""
@@ -711,11 +713,11 @@ msgstr ""
 msgid "Back"
 msgstr ""
 
-#: index.php:148 libraries/Footer.class.php:70
+#: index.php:149 libraries/Footer.class.php:70
 msgid "phpMyAdmin Demo Server"
 msgstr ""
 
-#: index.php:152
+#: index.php:153
 #, php-format
 msgid ""
 "You are using the demo server. You can do anything here, but please do not "
@@ -723,112 +725,112 @@ msgid ""
 "at %s."
 msgstr ""
 
-#: index.php:162
+#: index.php:163
 msgid "General Settings"
 msgstr ""
 
-#: index.php:190 libraries/display_change_password.lib.php:50
+#: index.php:191 libraries/display_change_password.lib.php:50
 #: libraries/display_change_password.lib.php:53 user_password.php:247
 msgid "Change password"
 msgstr ""
 
-#: index.php:206
+#: index.php:207
 msgid "Server connection collation"
 msgstr ""
 
-#: index.php:228
+#: index.php:229
 msgid "Appearance Settings"
 msgstr ""
 
-#: index.php:258 prefs_manage.php:285
+#: index.php:259 prefs_manage.php:285
 msgid "More settings"
 msgstr ""
 
-#: index.php:279
+#: index.php:280
 msgid "Database server"
 msgstr ""
 
-#: index.php:282 libraries/plugins/auth/AuthenticationCookie.class.php:181
+#: index.php:283 libraries/plugins/auth/AuthenticationCookie.class.php:169
 msgid "Server:"
 msgstr ""
 
-#: index.php:286
+#: index.php:287
 msgid "Server type:"
 msgstr ""
 
-#: index.php:290 libraries/plugins/export/ExportLatex.class.php:212
+#: index.php:291 libraries/plugins/export/ExportLatex.class.php:212
 #: libraries/plugins/export/ExportSql.class.php:687
 #: libraries/plugins/export/ExportXml.class.php:189
 msgid "Server version:"
 msgstr ""
 
-#: index.php:296
+#: index.php:297
 msgid "Protocol version:"
 msgstr ""
 
-#: index.php:300
+#: index.php:301
 msgid "User:"
 msgstr ""
 
-#: index.php:305
+#: index.php:306
 msgid "Server charset:"
 msgstr ""
 
-#: index.php:320
+#: index.php:321
 msgid "Web server"
 msgstr ""
 
-#: index.php:331
+#: index.php:332
 msgid "Database client version:"
 msgstr ""
 
-#: index.php:335
+#: index.php:336
 msgid "PHP extension:"
 msgstr ""
 
-#: index.php:349
+#: index.php:350
 #, fuzzy
 #| msgid "Last version"
 msgid "PHP version:"
 msgstr " "
 
-#: index.php:360
+#: index.php:361
 msgid "Show PHP information"
 msgstr ""
 
-#: index.php:383
+#: index.php:384
 msgid "Version information:"
 msgstr ""
 
-#: index.php:392 libraries/Util.class.php:432 libraries/Util.class.php:495
-#: libraries/config/FormDisplay.tpl.php:151
+#: index.php:393 libraries/Util.class.php:432 libraries/Util.class.php:495
+#: libraries/config/FormDisplay.tpl.php:162
 #: libraries/display_export.lib.php:577 libraries/engines/pbxt.lib.php:162
 #: libraries/navigation/NavigationHeader.class.php:196
 #: libraries/server_variables.lib.php:160
 msgid "Documentation"
 msgstr ""
 
-#: index.php:399
+#: index.php:400
 msgid "Wiki"
 msgstr ""
 
-#: index.php:408
+#: index.php:409
 msgid "Official Homepage"
 msgstr ""
 
-#: index.php:415
+#: index.php:416
 msgid "Contribute"
 msgstr ""
 
-#: index.php:422
+#: index.php:423
 msgid "Get support"
 msgstr ""
 
-#: index.php:429
+#: index.php:430
 msgid "List of changes"
 msgstr ""
 
-#: index.php:451
+#: index.php:452
 msgid ""
 "You are connected as 'root' with no password, which corresponds to the "
 "default MySQL privileged account. Your MySQL server is running with this "
@@ -836,21 +838,21 @@ msgid ""
 "by setting a password for user 'root'."
 msgstr ""
 
-#: index.php:468
+#: index.php:469
 msgid ""
 "You have enabled mbstring.func_overload in your PHP configuration. This "
 "option is incompatible with phpMyAdmin and might cause some data to be "
 "corrupted!"
 msgstr ""
 
-#: index.php:483
+#: index.php:484
 msgid ""
 "The mbstring PHP extension was not found and you seem to be using a "
 "multibyte charset. Without the mbstring extension phpMyAdmin is unable to "
 "split strings correctly and it may result in unexpected results."
 msgstr ""
 
-#: index.php:500
+#: index.php:501
 msgid ""
 "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini."
 "session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower than "
@@ -858,17 +860,17 @@ msgid ""
 "expire sooner than configured in phpMyAdmin."
 msgstr ""
 
-#: index.php:519
+#: index.php:520
 msgid ""
 "Login cookie store is lower than cookie validity configured in phpMyAdmin, "
 "because of this, your login will expire sooner than configured in phpMyAdmin."
 msgstr ""
 
-#: index.php:535
+#: index.php:536
 msgid "The configuration file now needs a secret passphrase (blowfish_secret)."
 msgstr ""
 
-#: index.php:548
+#: index.php:549
 msgid ""
 "Directory [code]config[/code], which is used by the setup script, still "
 "exists in your phpMyAdmin directory. It is strongly recommended to remove it "
@@ -876,26 +878,26 @@ msgid ""
 "may be compromised by unauthorized people downloading your configuration."
 msgstr ""
 
-#: index.php:564
+#: index.php:565
 #, php-format
 msgid ""
 "The phpMyAdmin configuration storage is not completely configured, some "
 "extended features have been deactivated. %sFind out why%s. "
 msgstr ""
 
-#: index.php:571
+#: index.php:572
 msgid ""
 "Or alternately go to 'Operations' tab of any database to set it up there."
 msgstr ""
 
-#: index.php:620
+#: index.php:621
 #, php-format
 msgid ""
 "Your PHP MySQL library version %s differs from your MySQL server version %s. "
 "This may cause unpredictable behavior."
 msgstr ""
 
-#: index.php:648
+#: index.php:649
 #, php-format
 msgid ""
 "Server running with Suhosin. Please refer to %sdocumentation%s for possible "
@@ -1036,8 +1038,8 @@ msgstr ""
 msgid "Save & Close"
 msgstr ""
 
-#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:404
-#: libraries/insert_edit.lib.php:1550 prefs_manage.php:361
+#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:415
+#: libraries/insert_edit.lib.php:1548 prefs_manage.php:361
 #: prefs_manage.php:372
 msgid "Reset"
 msgstr ""
@@ -1070,7 +1072,7 @@ msgstr ""
 msgid "Edit Index"
 msgstr ""
 
-#: js/messages.php:99 templates/index_form.phtml:232
+#: js/messages.php:99 templates/table/index_form.phtml:232
 #, php-format
 msgid "Add %s column(s) to index"
 msgstr ""
@@ -1091,13 +1093,14 @@ msgstr ""
 msgid "Please select column(s) for the index."
 msgstr ""
 
-#: js/messages.php:106 templates/structure/add_column.phtml:1
+#: js/messages.php:106 templates/table/structure/add_column.phtml:1
 msgid "You have to add at least one column."
 msgstr ""
 
-#: js/messages.php:109 libraries/insert_edit.lib.php:1548
+#: js/messages.php:109 libraries/insert_edit.lib.php:1546
 #: templates/columns_definitions/column_definitions_form.phtml:162
-#: templates/index_form.phtml:237 templates/tbl_relation/common_form.phtml:106
+#: templates/table/index_form.phtml:237
+#: templates/table/relation/common_form.phtml:106
 msgid "Preview SQL"
 msgstr ""
 
@@ -1114,7 +1117,7 @@ msgid "SQL query:"
 msgstr ""
 
 #. l10n: Default label for the y-Axis of Charts
-#: js/messages.php:118 templates/tbl_chart.phtml:109
+#: js/messages.php:118 templates/table/chart/tbl_chart.phtml:109
 msgid "Y Values"
 msgstr ""
 
@@ -1265,7 +1268,7 @@ msgstr ""
 msgid "Bytes received"
 msgstr ""
 
-#: js/messages.php:169 libraries/server_status.lib.php:226
+#: js/messages.php:169 libraries/server_status.lib.php:235
 msgid "Connections"
 msgstr ""
 
@@ -1322,12 +1325,12 @@ msgstr ""
 msgid "Questions"
 msgstr ""
 
-#: js/messages.php:184 libraries/server_status.lib.php:134
+#: js/messages.php:184 libraries/server_status.lib.php:143
 msgid "Traffic"
 msgstr ""
 
 #: js/messages.php:185 libraries/Menu.class.php:586
-#: libraries/Util.class.php:4318 libraries/server_status_monitor.lib.php:257
+#: libraries/Util.class.php:4324 libraries/server_status_monitor.lib.php:257
 msgid "Settings"
 msgstr ""
 
@@ -1347,8 +1350,9 @@ msgstr ""
 #: libraries/server_status_monitor.lib.php:236
 #: libraries/server_status_processes.lib.php:308
 #: templates/columns_definitions/transformation.phtml:4
-#: templates/designer/options_panel.phtml:178
-#: templates/table/options_zoom.phtml:12 templates/table/rows_zoom.phtml:26
+#: templates/database/designer/options_panel.phtml:178
+#: templates/table/search/options_zoom.phtml:12
+#: templates/table/search/rows_zoom.phtml:26
 msgid "None"
 msgstr ""
 
@@ -1616,8 +1620,8 @@ msgstr ""
 
 #: js/messages.php:270 libraries/Menu.class.php:352
 #: libraries/Menu.class.php:455 libraries/Menu.class.php:582
-#: libraries/Util.class.php:4317 libraries/Util.class.php:4332
-#: libraries/Util.class.php:4349 libraries/config/messages.inc.php:258
+#: libraries/Util.class.php:4323 libraries/Util.class.php:4338
+#: libraries/Util.class.php:4355 libraries/config/messages.inc.php:258
 #: libraries/display_import.lib.php:105
 #: libraries/server_status_monitor.lib.php:318 prefs_manage.php:238
 #: setup/frames/menu.inc.php:26
@@ -1677,13 +1681,13 @@ msgid "Formatting SQL..."
 msgstr ""
 
 #: js/messages.php:293 libraries/server_variables.lib.php:157
-#: templates/designer/aggregate_query_panel.phtml:63
-#: templates/designer/delete_relation_panel.phtml:28
-#: templates/designer/having_query_panel.phtml:117
-#: templates/designer/new_relation_panel.phtml:88
-#: templates/designer/options_panel.phtml:253
-#: templates/designer/rename_to_panel.phtml:45
-#: templates/designer/where_query_panel.phtml:83
+#: templates/database/designer/aggregate_query_panel.phtml:63
+#: templates/database/designer/delete_relation_panel.phtml:28
+#: templates/database/designer/having_query_panel.phtml:117
+#: templates/database/designer/new_relation_panel.phtml:88
+#: templates/database/designer/options_panel.phtml:253
+#: templates/database/designer/rename_to_panel.phtml:45
+#: templates/database/designer/where_query_panel.phtml:83
 msgid "Cancel"
 msgstr ""
 
@@ -1691,7 +1695,7 @@ msgstr ""
 msgid "Page-related settings"
 msgstr ""
 
-#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:402
+#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:413
 msgid "Apply"
 msgstr ""
 
@@ -1726,8 +1730,8 @@ msgstr ""
 msgid "Error text: %s"
 msgstr ""
 
-#: js/messages.php:307 libraries/db_common.inc.php:68
-#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:450
+#: js/messages.php:307 libraries/db_common.inc.php:69
+#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:461
 msgid "No databases selected."
 msgstr ""
 
@@ -1739,12 +1743,13 @@ msgstr ""
 msgid "Adding Primary Key"
 msgstr ""
 
-#: js/messages.php:310 templates/designer/aggregate_query_panel.phtml:59
-#: templates/designer/having_query_panel.phtml:113
-#: templates/designer/new_relation_panel.phtml:87
-#: templates/designer/options_panel.phtml:252
-#: templates/designer/rename_to_panel.phtml:41
-#: templates/designer/where_query_panel.phtml:82
+#: js/messages.php:310
+#: templates/database/designer/aggregate_query_panel.phtml:59
+#: templates/database/designer/having_query_panel.phtml:113
+#: templates/database/designer/new_relation_panel.phtml:87
+#: templates/database/designer/options_panel.phtml:252
+#: templates/database/designer/rename_to_panel.phtml:41
+#: templates/database/designer/where_query_panel.phtml:82
 msgid "OK"
 msgstr ""
 
@@ -1764,7 +1769,7 @@ msgstr ""
 msgid "Changing Charset"
 msgstr ""
 
-#: js/messages.php:320 libraries/Util.class.php:3217
+#: js/messages.php:320 libraries/Util.class.php:3223
 msgid "Enable foreign key checks"
 msgstr ""
 
@@ -1799,20 +1804,21 @@ msgstr ""
 #: js/messages.php:334 libraries/DisplayResults.class.php:4834
 #: libraries/DisplayResults.class.php:5092 libraries/Menu.class.php:344
 #: libraries/Menu.class.php:446 libraries/Menu.class.php:578
-#: libraries/Util.class.php:3636 libraries/Util.class.php:3637
-#: libraries/Util.class.php:4316 libraries/Util.class.php:4331
-#: libraries/Util.class.php:4348 libraries/config/messages.inc.php:252
+#: libraries/Util.class.php:3642 libraries/Util.class.php:3643
+#: libraries/Util.class.php:4322 libraries/Util.class.php:4337
+#: libraries/Util.class.php:4354 libraries/config/messages.inc.php:252
 #: libraries/display_export.lib.php:173 libraries/rte/rte_list.lib.php:146
 #: libraries/server_privileges.lib.php:2211
 #: libraries/server_privileges.lib.php:2290
 #: libraries/server_privileges.lib.php:2632
 #: libraries/server_privileges.lib.php:3356
 #: libraries/server_status_monitor.lib.php:322 prefs_manage.php:303
-#: setup/frames/menu.inc.php:27 templates/structure/check_all_tables.phtml:11
+#: setup/frames/menu.inc.php:27
+#: templates/database/structure/check_all_tables.phtml:11
 msgid "Export"
 msgstr ""
 
-#: js/messages.php:337 libraries/rte/rte_routines.lib.php:652
+#: js/messages.php:337 libraries/rte/rte_routines.lib.php:743
 msgid "ENUM/SET editor"
 msgstr ""
 
@@ -1851,7 +1857,7 @@ msgstr ""
 #: libraries/Console.class.php:214 libraries/DisplayResults.class.php:3474
 #: libraries/DisplayResults.class.php:4818 libraries/Index.class.php:723
 #: libraries/Util.class.php:706 libraries/Util.class.php:1202
-#: libraries/Util.class.php:3634 libraries/Util.class.php:3635
+#: libraries/Util.class.php:3640 libraries/Util.class.php:3641
 #: libraries/central_columns.lib.php:851
 #: libraries/central_columns.lib.php:1193
 #: libraries/config/messages.inc.php:892
@@ -1869,7 +1875,7 @@ msgstr ""
 #: libraries/server_user_groups.lib.php:129
 #: libraries/sql_query_form.lib.php:416 libraries/tracking.lib.php:477
 #: setup/frames/index.inc.php:183 setup/frames/index.inc.php:291
-#: templates/designer/delete_relation_panel.phtml:27
+#: templates/database/designer/delete_relation_panel.phtml:27
 msgid "Delete"
 msgstr ""
 
@@ -2030,11 +2036,11 @@ msgid "No dependencies selected!"
 msgstr ""
 
 #: js/messages.php:394 libraries/central_columns.lib.php:1214
-#: libraries/insert_edit.lib.php:1458 libraries/server_variables.lib.php:155
+#: libraries/insert_edit.lib.php:1456 libraries/server_variables.lib.php:155
 #: setup/frames/config.inc.php:42 setup/frames/index.inc.php:279
 #: templates/columns_definitions/column_definitions_form.phtml:165
-#: templates/gis_visualization/gis_visualization.phtml:48
-#: templates/tbl_relation/common_form.phtml:107
+#: templates/table/gis_visualization/gis_visualization.phtml:48
+#: templates/table/relation/common_form.phtml:107
 msgid "Save"
 msgstr ""
 
@@ -2111,8 +2117,8 @@ msgid "Data point content"
 msgstr ""
 
 #: js/messages.php:430 js/messages.php:562 js/messages.php:579
-#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2573
-#: templates/index_form.phtml:154 templates/index_form.phtml:194
+#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2571
+#: templates/table/index_form.phtml:154 templates/table/index_form.phtml:194
 msgid "Ignore"
 msgstr ""
 
@@ -2171,8 +2177,8 @@ msgstr ""
 msgid "Please select the primary key or a unique key!"
 msgstr ""
 
-#: js/messages.php:457 templates/designer/side_menu.phtml:91
-#: templates/designer/side_menu.phtml:94
+#: js/messages.php:457 templates/database/designer/side_menu.phtml:91
+#: templates/database/designer/side_menu.phtml:94
 msgid "Choose column to display"
 msgstr ""
 
@@ -2186,18 +2192,18 @@ msgstr ""
 msgid "Page name"
 msgstr ""
 
-#: js/messages.php:463 templates/designer/side_menu.phtml:56
-#: templates/designer/side_menu.phtml:59
+#: js/messages.php:463 templates/database/designer/side_menu.phtml:56
+#: templates/database/designer/side_menu.phtml:59
 msgid "Save page"
 msgstr ""
 
-#: js/messages.php:464 templates/designer/side_menu.phtml:63
-#: templates/designer/side_menu.phtml:66
+#: js/messages.php:464 templates/database/designer/side_menu.phtml:63
+#: templates/database/designer/side_menu.phtml:66
 msgid "Save page as"
 msgstr ""
 
-#: js/messages.php:465 templates/designer/side_menu.phtml:49
-#: templates/designer/side_menu.phtml:52
+#: js/messages.php:465 templates/database/designer/side_menu.phtml:49
+#: templates/database/designer/side_menu.phtml:52
 msgid "Open page"
 msgstr ""
 
@@ -2205,7 +2211,7 @@ msgstr ""
 msgid "Delete page"
 msgstr ""
 
-#: js/messages.php:467 templates/designer/side_menu.phtml:10
+#: js/messages.php:467 templates/database/designer/side_menu.phtml:10
 msgid "Untitled"
 msgstr ""
 
@@ -2316,7 +2322,7 @@ msgstr ""
 msgid "cancel"
 msgstr ""
 
-#: js/messages.php:499 libraries/server_status.lib.php:271
+#: js/messages.php:499 libraries/server_status.lib.php:280
 msgid "Aborted"
 msgstr ""
 
@@ -2872,7 +2878,7 @@ msgstr ""
 
 #: js/messages.php:793 libraries/Message.class.php:199
 #: libraries/Util.class.php:654 libraries/core.lib.php:245
-#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1172
+#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1170
 #: tbl_operations.php:229 view_operations.php:63
 msgid "Error"
 msgstr ""
@@ -2931,8 +2937,8 @@ msgstr ""
 msgid "per minute"
 msgstr ""
 
-#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:143
-#: libraries/server_status.lib.php:228
+#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:152
+#: libraries/server_status.lib.php:237
 #: libraries/server_status_queries.lib.php:98
 msgid "per hour"
 msgstr ""
@@ -2950,7 +2956,7 @@ msgstr ""
 msgid "Wrong permissions on configuration file, should not be world writable!"
 msgstr ""
 
-#: libraries/Config.class.php:1799
+#: libraries/Config.class.php:1801
 msgid "Font size"
 msgstr ""
 
@@ -2978,10 +2984,10 @@ msgstr ""
 #: libraries/server_privileges.lib.php:2890
 #: libraries/server_privileges.lib.php:3144
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4332
+#: libraries/server_privileges.lib.php:4358
 #: libraries/server_status_processes.lib.php:80
-#: templates/tbl_relation/foreign_key_row.phtml:165
-#: templates/tbl_relation/internal_relational_row.phtml:55
+#: templates/table/relation/foreign_key_row.phtml:165
+#: templates/table/relation/internal_relational_row.phtml:55
 msgid "Database"
 msgstr "CSDL"
 
@@ -3073,11 +3079,11 @@ msgstr ""
 #: libraries/plugins/import/ImportMediawiki.class.php:60
 #: libraries/plugins/import/ImportOds.class.php:59
 #: libraries/plugins/import/ImportShp.class.php:57
-#: libraries/plugins/import/ImportSql.class.php:148
+#: libraries/plugins/import/ImportSql.class.php:51
 #: libraries/plugins/import/ImportXml.class.php:58
-#: libraries/rte/rte_routines.lib.php:833 templates/index_form.phtml:49
-#: templates/structure/row_stats_table.phtml:20
-#: templates/table/options.phtml:2
+#: libraries/rte/rte_routines.lib.php:924 templates/table/index_form.phtml:49
+#: templates/table/search/options.phtml:2
+#: templates/table/structure/row_stats_table.phtml:20
 msgid "Options"
 msgstr ""
 
@@ -3110,7 +3116,8 @@ msgstr ""
 msgid "Order:"
 msgstr ""
 
-#: libraries/Console.class.php:289 templates/table/replace_preview.phtml:17
+#: libraries/Console.class.php:289
+#: templates/table/search/replace_preview.phtml:17
 msgid "Count"
 msgstr ""
 
@@ -3207,9 +3214,9 @@ msgstr ""
 #: libraries/operations.lib.php:794 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:191
-#: templates/structure/sortable_header.phtml:21
-#: templates/structure/sortable_header.phtml:38
-#: templates/table/options.phtml:68
+#: templates/database/structure/sortable_header.phtml:21
+#: templates/database/structure/sortable_header.phtml:38
+#: templates/table/search/options.phtml:68
 msgid "Ascending"
 msgstr ""
 
@@ -3219,13 +3226,14 @@ msgstr ""
 #: libraries/operations.lib.php:797 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:188
-#: templates/structure/sortable_header.phtml:26
-#: templates/structure/sortable_header.phtml:43
-#: templates/table/options.phtml:69
+#: templates/database/structure/sortable_header.phtml:26
+#: templates/database/structure/sortable_header.phtml:43
+#: templates/table/search/options.phtml:69
 msgid "Descending"
 msgstr ""
 
-#: libraries/DBQbe.class.php:467 templates/table/search_and_replace.phtml:6
+#: libraries/DBQbe.class.php:467
+#: templates/table/search/search_and_replace.phtml:6
 msgid "Column:"
 msgstr ""
 
@@ -3378,12 +3386,12 @@ msgid_plural "%1$s matches in <strong>%2$s</strong>"
 msgstr[0] ""
 
 #: libraries/DbSearch.class.php:354 libraries/Menu.class.php:311
-#: libraries/Util.class.php:3337 libraries/Util.class.php:3347
-#: libraries/Util.class.php:3623 libraries/Util.class.php:3624
-#: libraries/Util.class.php:4343 libraries/config.values.php:43
+#: libraries/Util.class.php:3343 libraries/Util.class.php:3353
+#: libraries/Util.class.php:3629 libraries/Util.class.php:3630
+#: libraries/Util.class.php:4349 libraries/config.values.php:43
 #: libraries/config.values.php:51 libraries/config.values.php:119
 #: libraries/navigation/Nodes/Node_Table.class.php:295
-#: templates/structure/check_all_table_column.phtml:5
+#: templates/table/structure/check_all_table_column.phtml:5
 msgid "Browse"
 msgstr ""
 
@@ -3400,7 +3408,8 @@ msgstr ""
 msgid "Words or values to search for (wildcard: \"%\"):"
 msgstr ""
 
-#: libraries/DbSearch.class.php:401 templates/table/search_and_replace.phtml:1
+#: libraries/DbSearch.class.php:401
+#: templates/table/search/search_and_replace.phtml:1
 msgid "Find:"
 msgstr ""
 
@@ -3444,28 +3453,28 @@ msgstr ""
 msgid "Search this table"
 msgstr ""
 
-#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2532
-#: libraries/Util.class.php:2535
+#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2538
+#: libraries/Util.class.php:2541
 msgctxt "First page"
 msgid "Begin"
 msgstr ""
 
-#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2533
-#: libraries/Util.class.php:2536 libraries/server_bin_log.lib.php:170
+#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2539
+#: libraries/Util.class.php:2542 libraries/server_bin_log.lib.php:170
 #: libraries/server_bin_log.lib.php:172
 msgctxt "Previous page"
 msgid "Previous"
 msgstr ""
 
-#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2564
-#: libraries/Util.class.php:2574 libraries/server_bin_log.lib.php:204
+#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2570
+#: libraries/Util.class.php:2580 libraries/server_bin_log.lib.php:204
 #: libraries/server_bin_log.lib.php:206
 msgctxt "Next page"
 msgid "Next"
 msgstr ""
 
-#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2565
-#: libraries/Util.class.php:2575
+#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2571
+#: libraries/Util.class.php:2581
 msgctxt "Last page"
 msgid "End"
 msgstr ""
@@ -3538,15 +3547,15 @@ msgid "May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]."
 msgstr ""
 
 #: libraries/DisplayResults.class.php:4332 libraries/Message.class.php:180
-#: libraries/controllers/TableRelationController.class.php:258
+#: libraries/controllers/TableRelationController.class.php:259
 #: libraries/controllers/TableSearchController.class.php:655
-#: libraries/rte/rte_routines.lib.php:1332 libraries/sql_query_form.lib.php:89
+#: libraries/rte/rte_routines.lib.php:1423 libraries/sql_query_form.lib.php:89
 #: tbl_operations.php:227 tbl_row_action.php:138 view_operations.php:62
 msgid "Your SQL query has been executed successfully."
 msgstr ""
 
 #: libraries/DisplayResults.class.php:4660
-#: libraries/controllers/StructureController.class.php:629
+#: libraries/controllers/DatabaseStructureController.class.php:564
 #, php-format
 msgid ""
 "This view has at least this number of rows. Please refer to %sdocumentation"
@@ -3568,33 +3577,33 @@ msgstr ""
 msgid "%d total"
 msgstr ""
 
-#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1318
+#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1312
 #, php-format
 msgid "Query took %01.4f seconds."
 msgstr ""
 
 #: libraries/DisplayResults.class.php:4807
-#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4767
-#: libraries/Util.class.php:4773 libraries/mult_submits.inc.php:50
-#: templates/structure/check_all_tables.phtml:2
-#: templates/structure/check_all_tables.phtml:9
+#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4773
+#: libraries/Util.class.php:4779 libraries/mult_submits.inc.php:50
+#: templates/database/structure/check_all_tables.phtml:2
+#: templates/database/structure/check_all_tables.phtml:9
 msgid "With selected:"
 msgstr ""
 
 #: libraries/DisplayResults.class.php:4811
-#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4769
-#: libraries/Util.class.php:4770 libraries/server_privileges.lib.php:1174
+#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4775
+#: libraries/Util.class.php:4776 libraries/server_privileges.lib.php:1174
 #: libraries/server_privileges.lib.php:1175
 #: libraries/server_privileges.lib.php:1387
 #: libraries/server_user_groups.lib.php:231
-#: templates/structure/check_all_tables.phtml:3
-#: templates/structure/check_all_tables.phtml:4
+#: templates/database/structure/check_all_tables.phtml:3
+#: templates/database/structure/check_all_tables.phtml:4
 msgid "Check All"
 msgstr ""
 
 #: libraries/DisplayResults.class.php:4985 libraries/Header.class.php:383
-#: templates/structure/optional_action_links.phtml:1
-#: templates/structure/print_view_data_dictionary_link.phtml:3
+#: templates/database/structure/print_view_data_dictionary_link.phtml:3
+#: templates/table/structure/optional_action_links.phtml:1
 msgid "Print view"
 msgstr ""
 
@@ -3602,7 +3611,8 @@ msgstr ""
 msgid "Query results operations"
 msgstr ""
 
-#: libraries/DisplayResults.class.php:5105 templates/tbl_chart.phtml:12
+#: libraries/DisplayResults.class.php:5105
+#: templates/table/chart/tbl_chart.phtml:12
 msgid "Display chart"
 msgstr ""
 
@@ -3691,7 +3701,7 @@ msgid "Click on the bar to scroll to top of page"
 msgstr ""
 
 #: libraries/Header.class.php:749
-#: libraries/plugins/auth/AuthenticationCookie.class.php:152
+#: libraries/plugins/auth/AuthenticationCookie.class.php:140
 msgid "Javascript must be enabled past this point!"
 msgstr ""
 
@@ -3713,11 +3723,11 @@ msgid "Keyname"
 msgstr ""
 
 #: libraries/Index.class.php:697
-#: libraries/controllers/StructureController.class.php:1962
-#: libraries/controllers/StructureController.class.php:1967
+#: libraries/controllers/TableStructureController.class.php:953
+#: libraries/controllers/TableStructureController.class.php:958
 #: libraries/tracking.lib.php:973
 #: templates/columns_definitions/column_indexes.phtml:11
-#: templates/structure/check_all_table_column.phtml:26
+#: templates/table/structure/check_all_table_column.phtml:26
 msgid "Unique"
 msgstr ""
 
@@ -3736,16 +3746,17 @@ msgstr ""
 #: libraries/server_collations.lib.php:35 libraries/tracking.lib.php:881
 #: libraries/tracking.lib.php:977
 #: templates/columns_definitions/table_fields_definitions.phtml:33
-#: templates/structure/row_stats_table.phtml:31
-#: templates/structure/table_header.phtml:55
-#: templates/structure/table_structure_header.phtml:7
-#: templates/table/table_header.phtml:8
+#: templates/database/structure/table_header.phtml:55
+#: templates/table/search/table_header.phtml:8
+#: templates/table/structure/row_stats_table.phtml:31
+#: templates/table/structure/table_structure_header.phtml:7
 msgid "Collation"
 msgstr ""
 
 #: libraries/Index.class.php:703 libraries/rte/rte_events.lib.php:496
-#: libraries/rte/rte_routines.lib.php:956 libraries/tracking.lib.php:885
-#: libraries/tracking.lib.php:979 templates/structure/table_header.phtml:84
+#: libraries/rte/rte_routines.lib.php:1047 libraries/tracking.lib.php:885
+#: libraries/tracking.lib.php:979
+#: templates/database/structure/table_header.phtml:84
 msgid "Comment"
 msgstr ""
 
@@ -3758,15 +3769,15 @@ msgstr ""
 msgid "Index %s has been dropped."
 msgstr ""
 
-#: libraries/Index.class.php:757 libraries/Util.class.php:3630
-#: libraries/Util.class.php:3631
-#: libraries/controllers/StructureController.class.php:1958
-#: libraries/controllers/StructureController.class.php:1959
+#: libraries/Index.class.php:757 libraries/Util.class.php:3636
+#: libraries/Util.class.php:3637
+#: libraries/controllers/TableStructureController.class.php:949
+#: libraries/controllers/TableStructureController.class.php:950
 #: libraries/operations.lib.php:1607 libraries/rte/rte_list.lib.php:150
 #: libraries/server_databases.lib.php:146
-#: templates/structure/check_all_table_column.phtml:15
-#: templates/structure/check_all_tables.phtml:16
-#: templates/tbl_relation/foreign_key_row.phtml:93
+#: templates/database/structure/check_all_tables.phtml:16
+#: templates/table/relation/foreign_key_row.phtml:93
+#: templates/table/structure/check_all_table_column.phtml:15
 msgid "Drop"
 msgstr "Xóa"
 
@@ -3795,16 +3806,16 @@ msgstr ""
 #: libraries/Menu.class.php:248
 #: libraries/navigation/Nodes/Node_View.class.php:32
 #: libraries/tbl_info.inc.php:63
-#: templates/structure/structure_table_row.phtml:97
-#: templates/structure/structure_table_row.phtml:159
+#: templates/database/structure/structure_table_row.phtml:97
+#: templates/database/structure/structure_table_row.phtml:159
 msgid "View"
 msgstr ""
 
 #: libraries/Menu.class.php:325 libraries/Menu.class.php:429
-#: libraries/Menu.class.php:548 libraries/Util.class.php:3334
-#: libraries/Util.class.php:3344 libraries/Util.class.php:3350
-#: libraries/Util.class.php:4313 libraries/Util.class.php:4328
-#: libraries/Util.class.php:4345 libraries/config.values.php:40
+#: libraries/Menu.class.php:548 libraries/Util.class.php:3340
+#: libraries/Util.class.php:3350 libraries/Util.class.php:3356
+#: libraries/Util.class.php:4319 libraries/Util.class.php:4334
+#: libraries/Util.class.php:4351 libraries/config.values.php:40
 #: libraries/config.values.php:48 libraries/config.values.php:110
 #: libraries/config.values.php:116 libraries/config/messages.inc.php:321
 #: libraries/navigation/Nodes/Node_Table.class.php:292
@@ -3812,19 +3823,19 @@ msgid "SQL"
 msgstr ""
 
 #: libraries/Menu.class.php:328 libraries/Menu.class.php:432
-#: libraries/Util.class.php:3335 libraries/Util.class.php:3345
-#: libraries/Util.class.php:3351 libraries/Util.class.php:3625
-#: libraries/Util.class.php:3626 libraries/Util.class.php:4329
-#: libraries/Util.class.php:4346 libraries/config.values.php:41
+#: libraries/Util.class.php:3341 libraries/Util.class.php:3351
+#: libraries/Util.class.php:3357 libraries/Util.class.php:3631
+#: libraries/Util.class.php:3632 libraries/Util.class.php:4335
+#: libraries/Util.class.php:4352 libraries/config.values.php:41
 #: libraries/config.values.php:49 libraries/config.values.php:111
 #: libraries/config.values.php:117
 #: libraries/navigation/Nodes/Node_Table.class.php:286
 msgid "Search"
 msgstr ""
 
-#: libraries/Menu.class.php:338 libraries/Util.class.php:3336
-#: libraries/Util.class.php:3346 libraries/Util.class.php:3627
-#: libraries/Util.class.php:3628 libraries/Util.class.php:4347
+#: libraries/Menu.class.php:338 libraries/Util.class.php:3342
+#: libraries/Util.class.php:3352 libraries/Util.class.php:3633
+#: libraries/Util.class.php:3634 libraries/Util.class.php:4353
 #: libraries/config.values.php:42 libraries/config.values.php:50
 #: libraries/config.values.php:118
 #: libraries/navigation/Nodes/Node_Table.class.php:289
@@ -3833,30 +3844,30 @@ msgid "Insert"
 msgstr ""
 
 #: libraries/Menu.class.php:362 libraries/Menu.class.php:467
-#: libraries/Util.class.php:4334 libraries/Util.class.php:4350
+#: libraries/Util.class.php:4340 libraries/Util.class.php:4356
 #: libraries/config.values.php:106 libraries/server_common.lib.php:51
 #: libraries/server_privileges.lib.php:2370
 #: libraries/server_privileges.lib.php:3158
-#: libraries/server_privileges.lib.php:4221
+#: libraries/server_privileges.lib.php:4247
 msgid "Privileges"
 msgstr ""
 
 #: libraries/Menu.class.php:371 libraries/Menu.class.php:379
-#: libraries/Menu.class.php:459 libraries/Util.class.php:3338
-#: libraries/Util.class.php:3352 libraries/Util.class.php:4333
-#: libraries/Util.class.php:4351 libraries/config.values.php:112
+#: libraries/Menu.class.php:459 libraries/Util.class.php:3344
+#: libraries/Util.class.php:3358 libraries/Util.class.php:4339
+#: libraries/Util.class.php:4357 libraries/config.values.php:112
 #: view_operations.php:92
 msgid "Operations"
 msgstr ""
 
 #: libraries/Menu.class.php:384 libraries/Menu.class.php:492
-#: libraries/Util.class.php:4338 libraries/Util.class.php:4352
+#: libraries/Util.class.php:4344 libraries/Util.class.php:4358
 #: libraries/relation.lib.php:255
 msgid "Tracking"
 msgstr ""
 
 #: libraries/Menu.class.php:397 libraries/Menu.class.php:486
-#: libraries/Util.class.php:4337 libraries/Util.class.php:4353
+#: libraries/Util.class.php:4343 libraries/Util.class.php:4359
 #: libraries/navigation/Nodes/Node_Trigger_Container.class.php:24
 #: libraries/plugins/export/ExportHtmlword.class.php:557
 #: libraries/plugins/export/ExportOdt.class.php:685
@@ -3873,16 +3884,16 @@ msgstr ""
 msgid "Database seems to be empty!"
 msgstr ""
 
-#: libraries/Menu.class.php:439 libraries/Util.class.php:4330
+#: libraries/Menu.class.php:439 libraries/Util.class.php:4336
 msgid "Query"
 msgstr ""
 
-#: libraries/Menu.class.php:472 libraries/Util.class.php:4335
+#: libraries/Menu.class.php:472 libraries/Util.class.php:4341
 #: libraries/rte/rte_words.lib.php:36
 msgid "Routines"
 msgstr ""
 
-#: libraries/Menu.class.php:479 libraries/Util.class.php:4336
+#: libraries/Menu.class.php:479 libraries/Util.class.php:4342
 #: libraries/navigation/Nodes/Node_Event_Container.class.php:26
 #: libraries/plugins/export/ExportSql.class.php:940
 #: libraries/plugins/export/ExportXml.class.php:107
@@ -3890,20 +3901,20 @@ msgstr ""
 msgid "Events"
 msgstr ""
 
-#: libraries/Menu.class.php:498 libraries/Util.class.php:4339
+#: libraries/Menu.class.php:498 libraries/Util.class.php:4345
 msgid "Designer"
 msgstr ""
 
-#: libraries/Menu.class.php:507 libraries/Util.class.php:4340
-#: templates/structure/check_all_tables.phtml:35
+#: libraries/Menu.class.php:507 libraries/Util.class.php:4346
+#: templates/database/structure/check_all_tables.phtml:35
 msgid "Central columns"
 msgstr ""
 
-#: libraries/Menu.class.php:544 libraries/Util.class.php:4312
+#: libraries/Menu.class.php:544 libraries/Util.class.php:4318
 #: libraries/config.values.php:103 libraries/config/messages.inc.php:266
 #: libraries/config/messages.inc.php:341
 #: libraries/navigation/NavigationTree.class.php:1239
-#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4332
+#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4358
 msgid "Databases"
 msgstr ""
 
@@ -3912,34 +3923,34 @@ msgid "User accounts"
 msgstr ""
 
 #: libraries/Menu.class.php:595 libraries/ServerStatusData.class.php:121
-#: libraries/Util.class.php:4319 libraries/server_common.lib.php:36
+#: libraries/Util.class.php:4325 libraries/server_common.lib.php:36
 msgid "Binary log"
 msgstr ""
 
 #: libraries/Menu.class.php:601 libraries/ServerStatusData.class.php:126
-#: libraries/Util.class.php:4320 libraries/server_common.lib.php:42
-#: templates/structure/body_for_table_summary.phtml:10
-#: templates/structure/table_header.phtml:27
+#: libraries/Util.class.php:4326 libraries/server_common.lib.php:42
+#: templates/database/structure/body_for_table_summary.phtml:10
+#: templates/database/structure/table_header.phtml:27
 msgid "Replication"
 msgstr ""
 
 #: libraries/Menu.class.php:606 libraries/ServerStatusData.class.php:193
-#: libraries/Util.class.php:4321 libraries/config.values.php:105
+#: libraries/Util.class.php:4327 libraries/config.values.php:105
 #: libraries/server_engines.lib.php:108 libraries/server_engines.lib.php:112
 #: libraries/sql_query_form.lib.php:421
 msgid "Variables"
 msgstr ""
 
-#: libraries/Menu.class.php:610 libraries/Util.class.php:4322
+#: libraries/Menu.class.php:610 libraries/Util.class.php:4328
 msgid "Charsets"
 msgstr ""
 
-#: libraries/Menu.class.php:615 libraries/Util.class.php:4323
+#: libraries/Menu.class.php:615 libraries/Util.class.php:4329
 #: libraries/server_common.lib.php:33 libraries/server_plugins.lib.php:27
 msgid "Plugins"
 msgstr ""
 
-#: libraries/Menu.class.php:626 libraries/Util.class.php:4324
+#: libraries/Menu.class.php:626 libraries/Util.class.php:4330
 msgid "Engines"
 msgstr ""
 
@@ -3961,7 +3972,7 @@ msgid "%1$d row inserted."
 msgid_plural "%1$d rows inserted."
 msgstr[0] ""
 
-#: libraries/PDF.class.php:70 libraries/Util.class.php:2521
+#: libraries/PDF.class.php:70 libraries/Util.class.php:2527
 #: libraries/browse_foreigners.lib.php:327
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:865
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:890
@@ -3982,7 +3993,7 @@ msgid "Could not save favorite table!"
 msgstr ""
 
 #: libraries/RecentFavoriteTable.class.php:212
-#: templates/structure/favorite_anchor.phtml:12
+#: templates/database/structure/favorite_anchor.phtml:12
 msgid "Remove from Favorites"
 msgstr ""
 
@@ -4145,7 +4156,7 @@ msgid ""
 msgstr ""
 
 #: libraries/StorageEngine.class.php:373
-#: templates/structure/body_for_table_summary.phtml:50
+#: templates/database/structure/body_for_table_summary.phtml:50
 #, php-format
 msgid "%s is the default storage engine on this MySQL server."
 msgstr ""
@@ -4557,10 +4568,10 @@ msgstr ""
 
 #: libraries/Util.class.php:726 libraries/rte/rte_events.lib.php:110
 #: libraries/rte/rte_events.lib.php:119 libraries/rte/rte_events.lib.php:150
-#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:153
-#: libraries/rte/rte_routines.lib.php:162
-#: libraries/rte/rte_routines.lib.php:235
-#: libraries/rte/rte_routines.lib.php:1366
+#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:223
+#: libraries/rte/rte_routines.lib.php:250
+#: libraries/rte/rte_routines.lib.php:372
+#: libraries/rte/rte_routines.lib.php:1457
 #: libraries/rte/rte_triggers.lib.php:86 libraries/rte/rte_triggers.lib.php:95
 #: libraries/rte/rte_triggers.lib.php:127
 msgid "MySQL said: "
@@ -4604,75 +4615,78 @@ msgstr ""
 msgid "%B %d, %Y at %I:%M %p"
 msgstr ""
 
-#: libraries/Util.class.php:2019
+#: libraries/Util.class.php:2025
 #, php-format
 msgid "%s days, %s hours, %s minutes and %s seconds"
 msgstr ""
 
-#: libraries/Util.class.php:2112
+#: libraries/Util.class.php:2118
 msgid "Missing parameter:"
 msgstr ""
 
-#: libraries/Util.class.php:2645
+#: libraries/Util.class.php:2651
 #, php-format
 msgid "Jump to database \"%s\"."
 msgstr ""
 
-#: libraries/Util.class.php:2670
+#: libraries/Util.class.php:2676
 #, php-format
 msgid "The %s functionality is affected by a known bug, see %s"
 msgstr ""
 
-#: libraries/Util.class.php:2881
+#: libraries/Util.class.php:2887
 msgid "Click to toggle"
 msgstr ""
 
-#: libraries/Util.class.php:3542 prefs_manage.php:248
+#: libraries/Util.class.php:3548 prefs_manage.php:248
 msgid "Browse your computer:"
 msgstr ""
 
-#: libraries/Util.class.php:3567
+#: libraries/Util.class.php:3573
 #, php-format
 msgid "Select from the web server upload directory <b>%s</b>:"
 msgstr ""
 
-#: libraries/Util.class.php:3596 libraries/insert_edit.lib.php:1173
+#: libraries/Util.class.php:3602 libraries/insert_edit.lib.php:1171
 msgid "The directory you set for upload work cannot be reached."
 msgstr ""
 
-#: libraries/Util.class.php:3607
+#: libraries/Util.class.php:3613
 msgid "There are no files to upload!"
 msgstr ""
 
-#: libraries/Util.class.php:3632 libraries/Util.class.php:3633
-#: templates/structure/check_all_tables.phtml:15
+#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: templates/database/structure/check_all_tables.phtml:15
 msgid "Empty"
 msgstr ""
 
-#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: libraries/Util.class.php:3644 libraries/Util.class.php:3645
 msgid "Execute"
 msgstr ""
 
-#: libraries/Util.class.php:4152
+#: libraries/Util.class.php:4158
 msgid "Print"
 msgstr ""
 
-#: libraries/Util.class.php:4257 templates/structure/row_stats_table.phtml:80
-#: templates/structure/table_header.phtml:95
+#: libraries/Util.class.php:4263
+#: templates/database/structure/table_header.phtml:95
+#: templates/table/structure/row_stats_table.phtml:80
 msgid "Creation"
 msgstr ""
 
-#: libraries/Util.class.php:4263 templates/structure/row_stats_table.phtml:87
-#: templates/structure/table_header.phtml:106
+#: libraries/Util.class.php:4269
+#: templates/database/structure/table_header.phtml:106
+#: templates/table/structure/row_stats_table.phtml:87
 msgid "Last update"
 msgstr ""
 
-#: libraries/Util.class.php:4269 templates/structure/row_stats_table.phtml:94
-#: templates/structure/table_header.phtml:117
+#: libraries/Util.class.php:4275
+#: templates/database/structure/table_header.phtml:117
+#: templates/table/structure/row_stats_table.phtml:94
 msgid "Last check"
 msgstr ""
 
-#: libraries/Util.class.php:4315
+#: libraries/Util.class.php:4321
 msgid "Users"
 msgstr ""
 
@@ -4693,16 +4707,16 @@ msgid "Use this value"
 msgstr ""
 
 #: libraries/build_html_for_db.lib.php:33 libraries/import.lib.php:193
-#: templates/structure/actions_in_table_structure.phtml:113
-#: templates/structure/row_stats_table.phtml:42
-#: templates/structure/table_header.phtml:36
+#: templates/database/structure/table_header.phtml:36
+#: templates/table/structure/actions_in_table_structure.phtml:113
+#: templates/table/structure/row_stats_table.phtml:42
 msgid "Rows"
 msgstr "Bản ghi"
 
 #: libraries/build_html_for_db.lib.php:48 libraries/engines/innodb.lib.php:171
-#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:186
-#: libraries/server_status.lib.php:298
-#: templates/structure/display_table_stats.phtml:40
+#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:195
+#: libraries/server_status.lib.php:307
+#: templates/table/structure/display_table_stats.phtml:40
 msgid "Total"
 msgstr ""
 
@@ -4711,10 +4725,12 @@ msgid "Jump to database"
 msgstr ""
 
 #: libraries/build_html_for_db.lib.php:146
+#: templates/database/structure/structure_table_row.phtml:15
 msgid "Not replicated"
 msgstr ""
 
 #: libraries/build_html_for_db.lib.php:158
+#: templates/database/structure/structure_table_row.phtml:16
 msgid "Replicated"
 msgstr ""
 
@@ -4767,17 +4783,17 @@ msgstr ""
 #: libraries/plugins/export/ExportTexytext.class.php:425
 #: libraries/plugins/export/PMA_ExportPdf.class.php:307
 #: libraries/rte/rte_list.lib.php:73 libraries/rte/rte_list.lib.php:85
-#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:830
-#: libraries/rte/rte_routines.lib.php:1492 setup/frames/index.inc.php:162
+#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:921
+#: libraries/rte/rte_routines.lib.php:1583 setup/frames/index.inc.php:162
 #: templates/columns_definitions/table_fields_definitions.phtml:8
-#: templates/structure/table_structure_header.phtml:5
-#: templates/table/create_table.phtml:11
+#: templates/database/create_table.phtml:11
+#: templates/table/structure/table_structure_header.phtml:5
 msgid "Name"
 msgstr ""
 
 #: libraries/central_columns.lib.php:699
 #: libraries/central_columns.lib.php:1381
-#: libraries/rte/rte_routines.lib.php:832
+#: libraries/rte/rte_routines.lib.php:923
 #: templates/columns_definitions/table_fields_definitions.phtml:14
 msgid "Length/Values"
 msgstr ""
@@ -4796,7 +4812,7 @@ msgid "Select a table"
 msgstr ""
 
 #: libraries/central_columns.lib.php:804
-#: templates/structure/add_column.phtml:4
+#: templates/table/structure/add_column.phtml:4
 msgid "Add column"
 msgstr ""
 
@@ -4812,7 +4828,7 @@ msgstr ""
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1002
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1025
 #: templates/columns_definitions/table_fields_definitions.phtml:36
-#: templates/structure/table_structure_header.phtml:8
+#: templates/table/structure/table_structure_header.phtml:8
 msgid "Attributes"
 msgstr ""
 
@@ -4921,7 +4937,7 @@ msgid "Double click"
 msgstr ""
 
 #: libraries/config.values.php:95 libraries/config.values.php:124
-#: libraries/config/FormDisplay.tpl.php:221 libraries/relation.lib.php:97
+#: libraries/config/FormDisplay.tpl.php:232 libraries/relation.lib.php:97
 #: libraries/relation.lib.php:105
 msgid "Disabled"
 msgstr ""
@@ -5095,21 +5111,21 @@ msgstr ""
 msgid "maximum %s"
 msgstr ""
 
-#: libraries/config/FormDisplay.tpl.php:219
+#: libraries/config/FormDisplay.tpl.php:230
 msgid "This setting is disabled, it will not be applied to your configuration."
 msgstr ""
 
-#: libraries/config/FormDisplay.tpl.php:313
+#: libraries/config/FormDisplay.tpl.php:324
 #, php-format
 msgid "Set value: %s"
 msgstr ""
 
-#: libraries/config/FormDisplay.tpl.php:318
+#: libraries/config/FormDisplay.tpl.php:329
 #: libraries/config/messages.inc.php:610
 msgid "Restore default value"
 msgstr ""
 
-#: libraries/config/FormDisplay.tpl.php:332
+#: libraries/config/FormDisplay.tpl.php:343
 msgid "Allow users to customize this value"
 msgstr ""
 
@@ -5527,7 +5543,7 @@ msgstr ""
 
 #: libraries/config/messages.inc.php:136 libraries/config/messages.inc.php:152
 #: libraries/sql_query_form.lib.php:247
-#: templates/structure/row_stats_table.phtml:7
+#: templates/table/structure/row_stats_table.phtml:7
 msgid "Format"
 msgstr ""
 
@@ -6022,7 +6038,7 @@ msgstr ""
 
 #: libraries/config/messages.inc.php:332
 #: libraries/plugins/export/ExportPdf.class.php:279
-#: templates/structure/secondary_tabs.phtml:8
+#: templates/table/secondary_tabs.phtml:8
 msgid "Table structure"
 msgstr ""
 
@@ -7525,100 +7541,33 @@ msgstr ""
 msgid "OpenDocument Text"
 msgstr ""
 
-#: libraries/controllers/StructureController.class.php:465
+#: libraries/controllers/DatabaseStructureController.class.php:405
 #: tbl_operations.php:382
 #, php-format
 msgid "Table %s has been emptied."
 msgstr ""
 
-#: libraries/controllers/StructureController.class.php:486
+#: libraries/controllers/DatabaseStructureController.class.php:426
 #: tbl_operations.php:400 view_operations.php:119
 #, php-format
 msgid "View %s has been dropped."
 msgstr ""
 
-#: libraries/controllers/StructureController.class.php:487
+#: libraries/controllers/DatabaseStructureController.class.php:427
 #: tbl_operations.php:401
 #, php-format
 msgid "Table %s has been dropped."
 msgstr ""
 
-#: libraries/controllers/StructureController.class.php:797
-#, php-format
-msgid "The name '%s' is a MySQL reserved keyword."
-msgid_plural "The names '%s' are MySQL reserved keywords."
-msgstr[0] ""
-
-#: libraries/controllers/StructureController.class.php:875
-msgid "No column selected."
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1049
+#: libraries/controllers/DatabaseStructureController.class.php:733
 msgid "Favorite List is full!"
 msgstr ""
 
-#: libraries/controllers/StructureController.class.php:1272
-msgid "The columns have been moved successfully."
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1535
-#, php-format
-msgid ""
-"Table %1$s has been altered successfully. Privileges have been adjusted."
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1541
-#: libraries/controllers/TableIndexesController.class.php:161
-#: tbl_addfield.php:92
-#, php-format
-msgid "Table %1$s has been altered successfully."
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1588
-#: libraries/tracking.lib.php:1094
-msgid "Query error"
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1806
+#: libraries/controllers/DatabaseStructureController.class.php:947
 #: libraries/mysql_charsets.lib.php:366 libraries/mysql_charsets.lib.php:373
 msgid "unknown"
 msgstr ""
 
-#: libraries/controllers/StructureController.class.php:1957
-#: templates/structure/check_all_table_column.phtml:11
-msgid "Change"
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1961
-#: libraries/controllers/StructureController.class.php:1966
-#: libraries/navigation/Nodes/Node_Index.class.php:30
-#: libraries/tracking.lib.php:926
-#: templates/columns_definitions/column_indexes.phtml:16
-#: templates/columns_definitions/table_fields_definitions.phtml:57
-#: templates/structure/check_all_table_column.phtml:30
-#: templates/structure/display_structure.phtml:79
-#: templates/structure/display_table_stats.phtml:19
-msgid "Index"
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1963
-#: libraries/controllers/StructureController.class.php:1968
-#: templates/columns_definitions/column_indexes.phtml:27
-#: templates/structure/check_all_table_column.phtml:37
-msgid "Spatial"
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1964
-#: libraries/controllers/StructureController.class.php:1969
-#: templates/columns_definitions/column_indexes.phtml:22
-#: templates/structure/check_all_table_column.phtml:47
-msgid "Fulltext"
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1970
-msgid "Distinct values"
-msgstr ""
-
 #: libraries/controllers/TableChartController.class.php:82
 #: libraries/controllers/TableGisVisualizationController.class.php:101
 msgid "No SQL query was set to fetch data."
@@ -7632,11 +7581,18 @@ msgstr ""
 msgid "No data to display"
 msgstr ""
 
-#: libraries/controllers/TableRelationController.class.php:217
+#: libraries/controllers/TableIndexesController.class.php:161
+#: libraries/controllers/TableStructureController.class.php:736
+#: tbl_addfield.php:92
+#, php-format
+msgid "Table %1$s has been altered successfully."
+msgstr ""
+
+#: libraries/controllers/TableRelationController.class.php:218
 msgid "Display column was successfully updated."
 msgstr ""
 
-#: libraries/controllers/TableRelationController.class.php:283
+#: libraries/controllers/TableRelationController.class.php:288
 msgid "Internal relations were successfully updated."
 msgstr ""
 
@@ -7649,10 +7605,70 @@ msgid "Zoom search"
 msgstr ""
 
 #: libraries/controllers/TableSearchController.class.php:852
-#: templates/table/selection_form.phtml:59
+#: templates/table/search/selection_form.phtml:59
 msgid "Find and replace"
 msgstr ""
 
+#: libraries/controllers/TableStructureController.class.php:163
+#, php-format
+msgid "The name '%s' is a MySQL reserved keyword."
+msgid_plural "The names '%s' are MySQL reserved keywords."
+msgstr[0] ""
+
+#: libraries/controllers/TableStructureController.class.php:241
+msgid "No column selected."
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:467
+msgid "The columns have been moved successfully."
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:730
+#, php-format
+msgid ""
+"Table %1$s has been altered successfully. Privileges have been adjusted."
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:783
+#: libraries/tracking.lib.php:1094
+msgid "Query error"
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:948
+#: templates/table/structure/check_all_table_column.phtml:11
+msgid "Change"
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:952
+#: libraries/controllers/TableStructureController.class.php:957
+#: libraries/navigation/Nodes/Node_Index.class.php:30
+#: libraries/tracking.lib.php:926
+#: templates/columns_definitions/column_indexes.phtml:16
+#: templates/columns_definitions/table_fields_definitions.phtml:57
+#: templates/table/structure/check_all_table_column.phtml:30
+#: templates/table/structure/display_structure.phtml:79
+#: templates/table/structure/display_table_stats.phtml:19
+msgid "Index"
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:954
+#: libraries/controllers/TableStructureController.class.php:959
+#: templates/columns_definitions/column_indexes.phtml:27
+#: templates/table/structure/check_all_table_column.phtml:37
+msgid "Spatial"
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:955
+#: libraries/controllers/TableStructureController.class.php:960
+#: templates/columns_definitions/column_indexes.phtml:22
+#: templates/table/structure/check_all_table_column.phtml:47
+msgid "Fulltext"
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:963
+msgid "Distinct values"
+msgstr ""
+
 #: libraries/core.lib.php:306
 #, php-format
 msgid "The %s extension is missing. Please check your PHP configuration."
@@ -7697,7 +7713,7 @@ msgid "No Password"
 msgstr ""
 
 #: libraries/display_change_password.lib.php:68
-#: libraries/plugins/auth/AuthenticationCookie.class.php:199
+#: libraries/plugins/auth/AuthenticationCookie.class.php:187
 #: libraries/replication_gui.lib.php:422 libraries/replication_gui.lib.php:862
 #: libraries/server_privileges.lib.php:1640
 msgid "Password:"
@@ -8419,12 +8435,12 @@ msgid "Dump has been saved to file %s."
 msgstr ""
 
 #: libraries/import.lib.php:202 libraries/insert_edit.lib.php:124
-#: libraries/rte/rte_routines.lib.php:1353 libraries/sql.lib.php:1312
+#: libraries/rte/rte_routines.lib.php:1444 libraries/sql.lib.php:1306
 #: tbl_get_field.php:44
 msgid "MySQL returned an empty result set (i.e. zero rows)."
 msgstr ""
 
-#: libraries/import.lib.php:265 libraries/sql.lib.php:1326
+#: libraries/import.lib.php:265 libraries/sql.lib.php:1320
 msgid "[ROLLBACK occurred.]"
 msgstr ""
 
@@ -8488,14 +8504,14 @@ msgstr ""
 
 #: libraries/insert_edit.lib.php:233
 #: libraries/navigation/Nodes/Node_DatabaseChild.class.php:48
-#: templates/designer/table_list.phtml:40
+#: templates/database/designer/table_list.phtml:40
 msgid "Hide"
 msgstr ""
 
 #: libraries/insert_edit.lib.php:249
 #: libraries/navigation/Nodes/Node_Function.class.php:32
-#: libraries/rte/rte_routines.lib.php:1495
-#: templates/table/table_header.phtml:4
+#: libraries/rte/rte_routines.lib.php:1586
+#: templates/table/search/table_header.phtml:4
 msgid "Function"
 msgstr ""
 
@@ -8508,82 +8524,83 @@ msgstr ""
 msgid "Because of its length,<br /> this column might not be editable."
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1050
+#: libraries/insert_edit.lib.php:1048
 msgid "Binary - do not edit"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1176 libraries/server_privileges.lib.php:470
-#: templates/table/options.phtml:36
+#: libraries/insert_edit.lib.php:1174 libraries/server_privileges.lib.php:470
+#: templates/table/search/options.phtml:36
 msgid "Or"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1177
+#: libraries/insert_edit.lib.php:1175
 msgid "web server upload directory:"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1348 templates/table/input_box.phtml:49
+#: libraries/insert_edit.lib.php:1346
+#: templates/table/search/input_box.phtml:49
 msgid "Edit/Insert"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1398
+#: libraries/insert_edit.lib.php:1396
 #, php-format
 msgid "Continue insertion with %s rows"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1428
+#: libraries/insert_edit.lib.php:1426
 msgid "and then"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1461
+#: libraries/insert_edit.lib.php:1459
 msgid "Insert as new row"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1464
+#: libraries/insert_edit.lib.php:1462
 msgid "Insert as new row and ignore errors"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1467
+#: libraries/insert_edit.lib.php:1465
 msgid "Show insert query"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1487
+#: libraries/insert_edit.lib.php:1485
 msgid "Go back to previous page"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1490
+#: libraries/insert_edit.lib.php:1488
 msgid "Insert another new row"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1495
+#: libraries/insert_edit.lib.php:1493
 msgid "Go back to this page"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1518
+#: libraries/insert_edit.lib.php:1516
 msgid "Edit next row"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1540
+#: libraries/insert_edit.lib.php:1538
 msgid ""
 "Use TAB key to move from value to value, or CTRL+arrows to move anywhere"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1577 libraries/replication_gui.lib.php:542
-#: libraries/rte/rte_routines.lib.php:1497
+#: libraries/insert_edit.lib.php:1575 libraries/replication_gui.lib.php:542
+#: libraries/rte/rte_routines.lib.php:1588
 #: libraries/server_status_variables.lib.php:220
-#: templates/designer/having_query_panel.phtml:100
-#: templates/designer/options_panel.phtml:73
-#: templates/designer/options_panel.phtml:239
-#: templates/designer/where_query_panel.phtml:69
-#: templates/table/table_header.phtml:10
-#: templates/table/zoom_result_form.phtml:35
+#: templates/database/designer/having_query_panel.phtml:100
+#: templates/database/designer/options_panel.phtml:73
+#: templates/database/designer/options_panel.phtml:239
+#: templates/database/designer/where_query_panel.phtml:69
+#: templates/table/search/table_header.phtml:10
+#: templates/table/search/zoom_result_form.phtml:35
 msgid "Value"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1937 libraries/sql.lib.php:1309
+#: libraries/insert_edit.lib.php:1935 libraries/sql.lib.php:1303
 msgid "Showing SQL query"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1962 libraries/sql.lib.php:1287
+#: libraries/insert_edit.lib.php:1960 libraries/sql.lib.php:1281
 #, php-format
 msgid "Inserted row id: %1$d"
 msgstr ""
@@ -8989,7 +9006,7 @@ msgstr ""
 #: libraries/navigation/Nodes/Node_View_Container.class.php:26
 #: libraries/navigation/Nodes/Node_View_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:129
-#: templates/structure/show_create.phtml:30
+#: templates/database/structure/show_create.phtml:30
 msgid "Views"
 msgstr ""
 
@@ -9275,7 +9292,7 @@ msgstr ""
 
 #: libraries/operations.lib.php:101 libraries/operations.lib.php:249
 #: libraries/operations.lib.php:869 libraries/operations.lib.php:963
-#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:907
+#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:998
 #: templates/columns_definitions/table_fields_definitions.phtml:47
 msgid "Adjust Privileges"
 msgstr ""
@@ -9365,22 +9382,22 @@ msgid "Switch to copied table"
 msgstr ""
 
 #: libraries/operations.lib.php:1360
-#: templates/structure/check_all_tables.phtml:18
+#: templates/database/structure/check_all_tables.phtml:18
 msgid "Table maintenance"
 msgstr ""
 
 #: libraries/operations.lib.php:1398
-#: templates/structure/check_all_tables.phtml:19
+#: templates/database/structure/check_all_tables.phtml:19
 msgid "Analyze table"
 msgstr ""
 
 #: libraries/operations.lib.php:1413
-#: templates/structure/check_all_tables.phtml:20
+#: templates/database/structure/check_all_tables.phtml:20
 msgid "Check table"
 msgstr ""
 
 #: libraries/operations.lib.php:1428
-#: templates/structure/check_all_tables.phtml:22
+#: templates/database/structure/check_all_tables.phtml:22
 #, fuzzy
 #| msgid "Track table"
 msgid "Checksum table"
@@ -9400,18 +9417,19 @@ msgid "Flush the table (FLUSH)"
 msgstr ""
 
 #: libraries/operations.lib.php:1477
-#: templates/structure/check_all_tables.phtml:23
-#: templates/structure/display_table_stats.phtml:56
+#: templates/database/structure/check_all_tables.phtml:23
+#: templates/table/structure/display_table_stats.phtml:56
 msgid "Optimize table"
 msgstr ""
 
 #: libraries/operations.lib.php:1492
-#: templates/structure/check_all_tables.phtml:24
+#: templates/database/structure/check_all_tables.phtml:24
 msgid "Repair table"
 msgstr ""
 
 #: libraries/operations.lib.php:1538
-#: templates/structure/check_all_tables.phtml:14 view_operations.php:127
+#: templates/database/structure/check_all_tables.phtml:14
+#: view_operations.php:127
 msgid "Delete data or table"
 msgstr ""
 
@@ -9532,7 +9550,7 @@ msgid "Cannot connect: invalid settings."
 msgstr ""
 
 #: libraries/plugins/auth/AuthenticationConfig.class.php:108
-#: libraries/plugins/auth/AuthenticationCookie.class.php:134
+#: libraries/plugins/auth/AuthenticationCookie.class.php:122
 #: libraries/plugins/auth/AuthenticationHttp.class.php:96
 #, php-format
 msgid "Welcome to %s"
@@ -9557,36 +9575,36 @@ msgstr ""
 msgid "Retry to connect"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:146
+#: libraries/plugins/auth/AuthenticationCookie.class.php:134
 msgid "Your session has expired. Please log in again."
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:170
+#: libraries/plugins/auth/AuthenticationCookie.class.php:158
 msgid "Log in"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:178
-#: libraries/plugins/auth/AuthenticationCookie.class.php:188
+#: libraries/plugins/auth/AuthenticationCookie.class.php:166
+#: libraries/plugins/auth/AuthenticationCookie.class.php:176
 msgid "You can enter hostname/IP address and port separated by space."
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:193
+#: libraries/plugins/auth/AuthenticationCookie.class.php:181
 msgid "Username:"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:205
+#: libraries/plugins/auth/AuthenticationCookie.class.php:193
 msgid "Server Choice:"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:386
+#: libraries/plugins/auth/AuthenticationCookie.class.php:374
 msgid "Entered captcha is wrong, try again!"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:396
+#: libraries/plugins/auth/AuthenticationCookie.class.php:384
 msgid "Please enter correct captcha!"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:423
+#: libraries/plugins/auth/AuthenticationCookie.class.php:411
 msgid "You are not allowed to log in to this MySQL server!"
 msgstr ""
 
@@ -9682,7 +9700,7 @@ msgstr ""
 #: libraries/plugins/export/ExportOdt.class.php:593
 #: libraries/plugins/export/ExportTexytext.class.php:428
 #: libraries/plugins/export/PMA_ExportPdf.class.php:313
-#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:984
 #: libraries/rte/rte_triggers.lib.php:377
 msgid "Definition"
 msgstr ""
@@ -9979,7 +9997,7 @@ msgid "Last check:"
 msgstr "Lần cuối kiểm tra:"
 
 #: libraries/plugins/export/ExportSql.class.php:1399
-#: templates/structure/structure_table_row.phtml:183
+#: templates/database/structure/structure_table_row.phtml:183
 msgid "in use"
 msgstr "Thông dụng"
 
@@ -10159,18 +10177,14 @@ msgstr ""
 msgid "The imported file does not contain any data!"
 msgstr ""
 
-#: libraries/plugins/import/ImportSql.class.php:169
+#: libraries/plugins/import/ImportSql.class.php:72
 msgid "SQL compatibility mode:"
 msgstr ""
 
-#: libraries/plugins/import/ImportSql.class.php:181
+#: libraries/plugins/import/ImportSql.class.php:84
 msgid "Do not use <code>AUTO_INCREMENT</code> for zero values"
 msgstr ""
 
-#: libraries/plugins/import/ImportSql.class.php:195
-msgid "Read as multibytes"
-msgstr ""
-
 #: libraries/plugins/import/ImportXml.class.php:54
 msgid "XML"
 msgstr ""
@@ -10213,7 +10227,7 @@ msgid "Show grid"
 msgstr ""
 
 #: libraries/plugins/schema/SchemaPdf.class.php:94
-#: templates/structure/print_view_data_dictionary_link.phtml:6
+#: templates/database/structure/print_view_data_dictionary_link.phtml:6
 msgid "Data Dictionary"
 msgstr ""
 
@@ -10238,7 +10252,7 @@ msgid "The %s table doesn't exist!"
 msgstr ""
 
 #: libraries/plugins/schema/eps/Eps_Relation_Schema.class.php:321
-#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:309
+#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:323
 #, php-format
 msgid "Schema of the %s database - Page %s"
 msgstr ""
@@ -10264,7 +10278,7 @@ msgstr ""
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1005
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1028
 #: libraries/tracking.lib.php:884
-#: templates/structure/table_structure_header.phtml:11
+#: templates/table/structure/table_structure_header.phtml:11
 msgid "Extra"
 msgstr ""
 
@@ -10571,51 +10585,51 @@ msgstr ""
 msgid "Create the needed tables with the <code>%screate_tables.sql</code>."
 msgstr ""
 
-#: libraries/relation.lib.php:360
+#: libraries/relation.lib.php:357
 msgid "Create a pma user and give access to these tables."
 msgstr ""
 
-#: libraries/relation.lib.php:365
+#: libraries/relation.lib.php:360
 msgid ""
 "Enable advanced features in configuration file (<code>config.inc.php</"
 "code>), for example by starting from <code>config.sample.inc.php</code>."
 msgstr ""
 
-#: libraries/relation.lib.php:373
+#: libraries/relation.lib.php:365
 msgid "Re-login to phpMyAdmin to load the updated configuration file."
 msgstr ""
 
-#: libraries/relation.lib.php:1612
+#: libraries/relation.lib.php:1607
 msgid "no description"
 msgstr ""
 
-#: libraries/relation.lib.php:1811
+#: libraries/relation.lib.php:1806
 msgid ""
 "You do not have necessary privileges to create a database named "
 "'phpmyadmin'. You may go to 'Operations' tab of any database to set up the "
 "phpMyAdmin configuration storage there."
 msgstr ""
 
-#: libraries/relation.lib.php:1928
+#: libraries/relation.lib.php:1923
 #, php-format
 msgid ""
 "%sCreate%s a database named 'phpmyadmin' and setup the phpMyAdmin "
 "configuration storage there."
 msgstr ""
 
-#: libraries/relation.lib.php:1936
+#: libraries/relation.lib.php:1931
 #, php-format
 msgid ""
 "%sCreate%s the phpMyAdmin configuration storage in the current database."
 msgstr ""
 
-#: libraries/relation.lib.php:1944
+#: libraries/relation.lib.php:1939
 #, php-format
 msgid "%sCreate%s missing phpMyAdmin configuration storage tables."
 msgstr ""
 
 #: libraries/replication_gui.lib.php:46 libraries/replication_gui.lib.php:343
-#: libraries/server_databases.lib.php:387
+#: libraries/server_databases.lib.php:398
 msgid "Master replication"
 msgstr ""
 
@@ -10670,7 +10684,7 @@ msgid ""
 msgstr ""
 
 #: libraries/replication_gui.lib.php:141
-#: libraries/server_databases.lib.php:389
+#: libraries/server_databases.lib.php:400
 msgid "Slave replication"
 msgstr ""
 
@@ -10931,10 +10945,10 @@ msgid "Master server changed successfully to %s."
 msgstr ""
 
 #: libraries/rte/rte_events.lib.php:106 libraries/rte/rte_events.lib.php:115
-#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:149
-#: libraries/rte/rte_routines.lib.php:158
-#: libraries/rte/rte_routines.lib.php:231
-#: libraries/rte/rte_routines.lib.php:1362
+#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:219
+#: libraries/rte/rte_routines.lib.php:246
+#: libraries/rte/rte_routines.lib.php:368
+#: libraries/rte/rte_routines.lib.php:1453
 #: libraries/rte/rte_triggers.lib.php:82 libraries/rte/rte_triggers.lib.php:91
 #: libraries/rte/rte_triggers.lib.php:123
 #, php-format
@@ -10955,7 +10969,7 @@ msgstr ""
 msgid "Event %1$s has been created."
 msgstr ""
 
-#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:251
+#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:266
 #: libraries/rte/rte_triggers.lib.php:144
 msgid "One or more errors have occurred while processing your request:"
 msgstr ""
@@ -10964,7 +10978,7 @@ msgstr ""
 msgid "Edit event"
 msgstr ""
 
-#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:794
+#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:885
 #: libraries/rte/rte_triggers.lib.php:323 view_create.php:180
 msgid "Details"
 msgstr ""
@@ -10977,7 +10991,7 @@ msgstr ""
 msgid "Event type"
 msgstr ""
 
-#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:817
+#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:908
 #, php-format
 msgid "Change to %s"
 msgstr ""
@@ -11004,12 +11018,14 @@ msgstr ""
 msgid "On completion preserve"
 msgstr ""
 
-#: libraries/rte/rte_events.lib.php:491 libraries/rte/rte_routines.lib.php:930
+#: libraries/rte/rte_events.lib.php:491
+#: libraries/rte/rte_routines.lib.php:1021
 #: libraries/rte/rte_triggers.lib.php:383 view_create.php:209
 msgid "Definer"
 msgstr ""
 
-#: libraries/rte/rte_events.lib.php:535 libraries/rte/rte_routines.lib.php:997
+#: libraries/rte/rte_events.lib.php:535
+#: libraries/rte/rte_routines.lib.php:1088
 #: libraries/rte/rte_triggers.lib.php:422
 msgid "The definer must be in the \"username@hostname\" format!"
 msgstr ""
@@ -11035,9 +11051,9 @@ msgid "You must provide an event definition."
 msgstr ""
 
 #: libraries/rte/rte_export.lib.php:43 libraries/rte/rte_general.lib.php:72
-#: libraries/rte/rte_routines.lib.php:345
-#: libraries/rte/rte_routines.lib.php:1198
-#: libraries/rte/rte_routines.lib.php:1411
+#: libraries/rte/rte_routines.lib.php:153
+#: libraries/rte/rte_routines.lib.php:1289
+#: libraries/rte/rte_routines.lib.php:1502
 msgid "Error in processing request:"
 msgstr ""
 
@@ -11069,131 +11085,131 @@ msgid ""
 "problems."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:110
-#: libraries/rte/rte_routines.lib.php:1006
+#: libraries/rte/rte_routines.lib.php:123
+msgid "Edit routine"
+msgstr ""
+
+#: libraries/rte/rte_routines.lib.php:200
+#: libraries/rte/rte_routines.lib.php:1097
 #, php-format
 msgid "Invalid routine type: \"%s\""
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:170
-msgid "Sorry, we failed to restore the dropped routine."
-msgstr ""
-
-#: libraries/rte/rte_routines.lib.php:211
-#, php-format
-msgid "Routine %1$s has been modified. Privileges have been adjusted."
-msgstr ""
-
-#: libraries/rte/rte_routines.lib.php:216
-#, php-format
-msgid "Routine %1$s has been modified."
-msgstr ""
-
-#: libraries/rte/rte_routines.lib.php:238
+#: libraries/rte/rte_routines.lib.php:253
 #, php-format
 msgid "Routine %1$s has been created."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:315
-msgid "Edit routine"
+#: libraries/rte/rte_routines.lib.php:380
+msgid "Sorry, we failed to restore the dropped routine."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:797
+#: libraries/rte/rte_routines.lib.php:439
+#, php-format
+msgid "Routine %1$s has been modified. Privileges have been adjusted."
+msgstr ""
+
+#: libraries/rte/rte_routines.lib.php:444
+#, php-format
+msgid "Routine %1$s has been modified."
+msgstr ""
+
+#: libraries/rte/rte_routines.lib.php:888
 msgid "Routine name"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:823
+#: libraries/rte/rte_routines.lib.php:914
 msgid "Parameters"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:829
+#: libraries/rte/rte_routines.lib.php:920
 msgid "Direction"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:847
+#: libraries/rte/rte_routines.lib.php:938
 msgid "Add parameter"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:851
+#: libraries/rte/rte_routines.lib.php:942
 msgid "Remove last parameter"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:856
+#: libraries/rte/rte_routines.lib.php:947
 msgid "Return type"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:862
+#: libraries/rte/rte_routines.lib.php:953
 msgid "Return length/values"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:868
+#: libraries/rte/rte_routines.lib.php:959
 msgid "Return options"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:899
+#: libraries/rte/rte_routines.lib.php:990
 msgid "Is deterministic"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:920
+#: libraries/rte/rte_routines.lib.php:1011
 msgid ""
 "You do not have sufficient privileges to perform this operation; Please "
 "refer to the documentation for more details"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:935
+#: libraries/rte/rte_routines.lib.php:1026
 msgid "Security type"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:944
+#: libraries/rte/rte_routines.lib.php:1035
 msgid "SQL data access"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1013
+#: libraries/rte/rte_routines.lib.php:1104
 msgid "You must provide a routine name!"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1047
+#: libraries/rte/rte_routines.lib.php:1138
 #, php-format
 msgid "Invalid direction \"%s\" given for parameter."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1069
-#: libraries/rte/rte_routines.lib.php:1131
+#: libraries/rte/rte_routines.lib.php:1160
+#: libraries/rte/rte_routines.lib.php:1222
 msgid ""
 "You must provide length/values for routine parameters of type ENUM, SET, "
 "VARCHAR and VARBINARY."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1095
+#: libraries/rte/rte_routines.lib.php:1186
 msgid "You must provide a name and a type for each routine parameter."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1114
+#: libraries/rte/rte_routines.lib.php:1205
 msgid "You must provide a valid return type for the routine."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1174
+#: libraries/rte/rte_routines.lib.php:1265
 msgid "You must provide a routine definition."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1285
+#: libraries/rte/rte_routines.lib.php:1376
 #, php-format
 msgid "Execution results of routine %s"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1340
+#: libraries/rte/rte_routines.lib.php:1431
 #, php-format
 msgid "%d row affected by the last statement inside the procedure."
 msgid_plural "%d rows affected by the last statement inside the procedure."
 msgstr[0] ""
 
-#: libraries/rte/rte_routines.lib.php:1398
-#: libraries/rte/rte_routines.lib.php:1406
+#: libraries/rte/rte_routines.lib.php:1489
+#: libraries/rte/rte_routines.lib.php:1497
 msgid "Execute routine"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1485
-#: libraries/rte/rte_routines.lib.php:1488
+#: libraries/rte/rte_routines.lib.php:1576
+#: libraries/rte/rte_routines.lib.php:1579
 msgid "Routine parameters"
 msgstr ""
 
@@ -11347,7 +11363,7 @@ msgid "Original position"
 msgstr ""
 
 #: libraries/server_bin_log.lib.php:133
-#: templates/structure/display_table_stats.phtml:4
+#: templates/table/structure/display_table_stats.phtml:4
 msgid "Information"
 msgstr ""
 
@@ -11383,12 +11399,12 @@ msgid ""
 "between the web server and the MySQL server."
 msgstr ""
 
-#: libraries/server_databases.lib.php:364
-#: libraries/server_databases.lib.php:365
+#: libraries/server_databases.lib.php:366
+#: libraries/server_databases.lib.php:371
 msgid "Enable Statistics"
 msgstr ""
 
-#: libraries/server_databases.lib.php:481
+#: libraries/server_databases.lib.php:492
 #, php-format
 msgid "%1$d database has been dropped successfully."
 msgid_plural "%1$d databases have been dropped successfully."
@@ -11743,7 +11759,7 @@ msgid "You have revoked the privileges for %s."
 msgstr ""
 
 #: libraries/server_privileges.lib.php:2059
-#: libraries/server_privileges.lib.php:4290
+#: libraries/server_privileges.lib.php:4316
 msgid "Add user account"
 msgstr ""
 
@@ -11908,53 +11924,53 @@ msgstr ""
 msgid "The privileges were reloaded successfully."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:3994
+#: libraries/server_privileges.lib.php:4003
 #, php-format
 msgid "The user %s already exists!"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4232
+#: libraries/server_privileges.lib.php:4258
 #, php-format
 msgid "Privileges for %s"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4241
+#: libraries/server_privileges.lib.php:4267
 #: libraries/server_status_processes.lib.php:72
 #: libraries/server_user_groups.lib.php:39
 msgid "User"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4282
+#: libraries/server_privileges.lib.php:4308
 msgctxt "Create new user"
 msgid "New"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4311
+#: libraries/server_privileges.lib.php:4337
 msgid "Edit privileges:"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4312
+#: libraries/server_privileges.lib.php:4338
 msgid "User account"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4371
+#: libraries/server_privileges.lib.php:4397
 msgid ""
 "Note: You are attempting to edit privileges of the user with which you are "
 "currently logged in."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4391 libraries/server_users.lib.php:25
+#: libraries/server_privileges.lib.php:4417 libraries/server_users.lib.php:25
 msgid "User accounts overview"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4459
+#: libraries/server_privileges.lib.php:4485
 msgid ""
 "A user account allowing any user from localhost to connect is present. This "
 "will prevent other users from connecting if the host part of their account "
 "allows a connection from any (%) host."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4500
+#: libraries/server_privileges.lib.php:4526
 #, php-format
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
@@ -11963,7 +11979,7 @@ msgid ""
 "%sreload the privileges%s before you continue."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4519
+#: libraries/server_privileges.lib.php:4545
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
 "tables. The content of these tables may differ from the privileges the "
@@ -11972,61 +11988,61 @@ msgid ""
 "privilege."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4569
+#: libraries/server_privileges.lib.php:4595
 msgid "The selected user was not found in the privilege table."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4801
+#: libraries/server_privileges.lib.php:4827
 msgid "You have added a new user."
 msgstr ""
 
-#: libraries/server_status.lib.php:53
+#: libraries/server_status.lib.php:60
 #, php-format
 msgid "Network traffic since startup: %s"
 msgstr ""
 
-#: libraries/server_status.lib.php:66
+#: libraries/server_status.lib.php:73
 #, php-format
 msgid "This MySQL server has been running for %1$s. It started up on %2$s."
 msgstr ""
 
-#: libraries/server_status.lib.php:80
+#: libraries/server_status.lib.php:94
 msgid ""
 "This MySQL server works as <b>master</b> and <b>slave</b> in <b>replication</"
 "b> process."
 msgstr ""
 
-#: libraries/server_status.lib.php:85
+#: libraries/server_status.lib.php:99
 msgid "This MySQL server works as <b>master</b> in <b>replication</b> process."
 msgstr ""
 
-#: libraries/server_status.lib.php:90
+#: libraries/server_status.lib.php:104
 msgid "This MySQL server works as <b>slave</b> in <b>replication</b> process."
 msgstr ""
 
-#: libraries/server_status.lib.php:106
+#: libraries/server_status.lib.php:116
 msgid "Replication status"
 msgstr ""
 
-#: libraries/server_status.lib.php:137
+#: libraries/server_status.lib.php:146
 msgid ""
 "On a busy server, the byte counters may overrun, so those statistics as "
 "reported by the MySQL server may be incorrect."
 msgstr ""
 
-#: libraries/server_status.lib.php:148
+#: libraries/server_status.lib.php:157
 msgid "Received"
 msgstr ""
 
-#: libraries/server_status.lib.php:167
+#: libraries/server_status.lib.php:176
 msgid "Sent"
 msgstr ""
 
-#: libraries/server_status.lib.php:234
+#: libraries/server_status.lib.php:243
 msgid "Max. concurrent connections"
 msgstr ""
 
-#: libraries/server_status.lib.php:244
+#: libraries/server_status.lib.php:253
 msgid "Failed attempts"
 msgstr ""
 
@@ -12946,7 +12962,7 @@ msgstr ""
 msgid "Not implemented yet."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/AlterOperation.php:193
+#: libraries/sql-parser/src/Components/AlterOperation.php:191
 msgid "Unrecognized alter operation."
 msgstr ""
 
@@ -12960,7 +12976,7 @@ msgid "An opening bracket followed by a set of values was expected."
 msgstr ""
 
 #: libraries/sql-parser/src/Components/ArrayObj.php:101
-#: libraries/sql-parser/src/Components/FieldDefinition.php:202
+#: libraries/sql-parser/src/Components/CreateDefinition.php:202
 msgid "An opening bracket was expected."
 msgstr ""
 
@@ -12968,25 +12984,35 @@ msgstr ""
 msgid "A comma or a closing bracket was expected"
 msgstr ""
 
+#: libraries/sql-parser/src/Components/CreateDefinition.php:246
+#, fuzzy
+#| msgid "No tables selected."
+msgid "A comma or a closing bracket was expected."
+msgstr "Chưa có bảng nào được chọn."
+
+#: libraries/sql-parser/src/Components/CreateDefinition.php:262
+msgid "A closing bracket was expected."
+msgstr ""
+
 #: libraries/sql-parser/src/Components/DataType.php:125
 msgid "Unrecognized data type."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:225
+#: libraries/sql-parser/src/Components/Expression.php:227
 msgid "Unexpected closing bracket."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:246
-#: libraries/sql-parser/src/Components/Expression.php:283
-#: libraries/sql-parser/src/Components/Expression.php:303
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:285
+#: libraries/sql-parser/src/Components/Expression.php:305
 msgid "An alias was previously found."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:257
+#: libraries/sql-parser/src/Components/Expression.php:259
 msgid "Unexpected dot."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:327
+#: libraries/sql-parser/src/Components/Expression.php:329
 #, fuzzy
 #| msgid "No tables selected."
 msgid "An alias was expected."
@@ -12996,16 +13022,6 @@ msgstr "Chưa có bảng nào được chọn."
 msgid "An expression was expected."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/FieldDefinition.php:246
-#, fuzzy
-#| msgid "No tables selected."
-msgid "A comma or a closing bracket was expected."
-msgstr "Chưa có bảng nào được chọn."
-
-#: libraries/sql-parser/src/Components/FieldDefinition.php:262
-msgid "A closing bracket was expected."
-msgstr ""
-
 #: libraries/sql-parser/src/Components/Limit.php:90
 #: libraries/sql-parser/src/Components/Limit.php:112
 msgid "An offset was expected."
@@ -13045,24 +13061,24 @@ msgstr ""
 msgid "Expected delimiter."
 msgstr ""
 
-#: libraries/sql-parser/src/Lexer.php:753
+#: libraries/sql-parser/src/Lexer.php:777
 #, php-format
 msgid "Ending quote %1$s was expected."
 msgstr ""
 
-#: libraries/sql-parser/src/Lexer.php:789
+#: libraries/sql-parser/src/Lexer.php:813
 msgid "Variable name was expected."
 msgstr ""
 
-#: libraries/sql-parser/src/Parser.php:380
+#: libraries/sql-parser/src/Parser.php:391
 msgid "Unexpected beginning of statement."
 msgstr ""
 
-#: libraries/sql-parser/src/Parser.php:399
+#: libraries/sql-parser/src/Parser.php:410
 msgid "Unrecognized statement type."
 msgstr ""
 
-#: libraries/sql-parser/src/Parser.php:479
+#: libraries/sql-parser/src/Parser.php:489
 msgid "No transaction was previously started."
 msgstr ""
 
@@ -13088,8 +13104,10 @@ msgid "The name of the entity was expected."
 msgstr ""
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:310
-msgid "At least one field definition was expected."
-msgstr ""
+#, fuzzy
+#| msgid "No tables selected."
+msgid "At least one column definition was expected."
+msgstr "Chưa có bảng nào được chọn."
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:329
 msgid "A \"RETURNS\" keyword was expected."
@@ -13148,25 +13166,25 @@ msgstr ""
 msgid "Using bookmark \"%s\" as default browse query."
 msgstr ""
 
-#: libraries/sql.lib.php:1306
+#: libraries/sql.lib.php:1300
 msgid "Showing as PHP code"
 msgstr ""
 
-#: libraries/sql.lib.php:1638
+#: libraries/sql.lib.php:1632
 #, php-format
 msgid ""
 "Current selection does not contain a unique column. Grid edit, checkbox, "
 "Edit, Copy and Delete features are not available. %s"
 msgstr ""
 
-#: libraries/sql.lib.php:1649
+#: libraries/sql.lib.php:1643
 #, php-format
 msgid ""
 "Current selection does not contain a unique column. Grid edit, Edit, Copy "
 "and Delete features may result in undesired behavior. %s"
 msgstr ""
 
-#: libraries/sql.lib.php:1688
+#: libraries/sql.lib.php:1682
 #, php-format
 msgid "Problems with indexes of table `%s`"
 msgstr ""
@@ -13327,7 +13345,7 @@ msgid "Version %s snapshot (SQL code)"
 msgstr ""
 
 #: libraries/tracking.lib.php:947
-#: templates/structure/table_structure_row.phtml:33
+#: templates/table/structure/table_structure_row.phtml:33
 msgctxt "None for default"
 msgid "None"
 msgstr ""
@@ -13379,15 +13397,15 @@ msgstr ""
 msgid "Version %1$s was created, tracking for %2$s is active."
 msgstr ""
 
-#: libraries/user_preferences.inc.php:29
+#: libraries/user_preferences.inc.php:30
 msgid "Manage your settings"
 msgstr ""
 
-#: libraries/user_preferences.inc.php:46 prefs_manage.php:307
+#: libraries/user_preferences.inc.php:54 prefs_manage.php:307
 msgid "Configuration has been saved."
 msgstr ""
 
-#: libraries/user_preferences.inc.php:66
+#: libraries/user_preferences.inc.php:74
 #, php-format
 msgid ""
 "Your preferences will be saved for current session only. Storing them "
@@ -13763,7 +13781,7 @@ msgid "first"
 msgstr ""
 
 #: templates/columns_definitions/move_column.phtml:12
-#: templates/structure/add_column.phtml:21
+#: templates/table/structure/add_column.phtml:21
 #, php-format
 msgid "after %s"
 msgstr ""
@@ -13822,197 +13840,289 @@ msgstr ""
 msgid "Input transformation options"
 msgstr ""
 
-#: templates/designer/aggregate_query_panel.phtml:22
-#: templates/designer/options_panel.phtml:100
-msgid "Aggregate"
-msgstr ""
-
-#: templates/designer/aggregate_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:61
-#: templates/designer/options_panel.phtml:106
-#: templates/designer/options_panel.phtml:170
-#: templates/designer/where_query_panel.phtml:30
-#: templates/table/table_header.phtml:9
-msgid "Operator"
-msgstr ""
-
-#: templates/designer/database_tables.phtml:29
-msgid "Toggle"
-msgstr ""
-
-#: templates/designer/database_tables.phtml:40
-msgid "See table structure"
-msgstr ""
-
-#: templates/designer/delete_relation_panel.phtml:21
-msgid "Delete relation"
-msgstr ""
-
-#: templates/designer/edit_delete_pages.phtml:7
-msgid "Page to open"
-msgstr ""
-
-#: templates/designer/edit_delete_pages.phtml:7
-msgid "Page to delete"
-msgstr ""
-
-#: templates/designer/having_query_panel.phtml:90
-#: templates/designer/options_panel.phtml:63
-#: templates/designer/options_panel.phtml:229
-#: templates/designer/where_query_panel.phtml:59
-msgid "Except"
-msgstr ""
-
-#: templates/designer/having_query_panel.phtml:102
-#: templates/designer/options_panel.phtml:75
-#: templates/designer/options_panel.phtml:241
-#: templates/designer/where_query_panel.phtml:71
-msgid "subquery"
-msgstr ""
-
-#: templates/designer/new_relation_panel.phtml:22
-#: templates/designer/side_menu.phtml:84 templates/designer/side_menu.phtml:87
-msgid "Create relation"
-msgstr ""
-
-#: templates/designer/options_panel.phtml:34
-#: templates/designer/options_panel.phtml:200
-msgid "Relation operator"
-msgstr ""
-
-#: templates/designer/options_panel.phtml:85
-#: templates/designer/rename_to_panel.phtml:23
-msgid "Rename to"
-msgstr ""
-
-#: templates/designer/options_panel.phtml:91
-#: templates/designer/rename_to_panel.phtml:31
-msgid "New name"
-msgstr ""
-
-#: templates/designer/page_save_as.phtml:4
-msgid "Save to selected page"
-msgstr ""
-
-#: templates/designer/page_save_as.phtml:5
-msgid "Create a page and save to it"
-msgstr ""
-
-#: templates/designer/page_save_as.phtml:26
-msgid "New page name"
-msgstr ""
-
-#: templates/designer/page_selector.phtml:2
-msgid "Select page"
-msgstr ""
-
-#: templates/designer/query_details.phtml:10
-msgid "Active options"
-msgstr ""
-
-#: templates/designer/schema_export.phtml:4
-msgid "Select Export Relational Type"
-msgstr ""
-
-#: templates/designer/side_menu.phtml:19 templates/designer/side_menu.phtml:25
-msgid "Show/Hide tables list"
-msgstr ""
-
-#: templates/designer/side_menu.phtml:29 templates/designer/side_menu.phtml:35
-#: templates/designer/side_menu.phtml:36
-msgid "View in fullscreen"
-msgstr ""
-
-#: templates/designer/side_menu.phtml:34
-msgid "Exit fullscreen"
-msgstr ""
-
-#: templates/designer/side_menu.phtml:41 templates/designer/side_menu.phtml:45
-msgid "New page"
-msgstr ""
-
-#: templates/designer/side_menu.phtml:70 templates/designer/side_menu.phtml:73
-msgid "Delete pages"
-msgstr ""
-
-#: templates/designer/side_menu.phtml:77 templates/designer/side_menu.phtml:80
-#: templates/table/create_table.phtml:7
+#: templates/database/create_table.phtml:7
+#: templates/database/designer/side_menu.phtml:77
+#: templates/database/designer/side_menu.phtml:80
 msgid "Create table"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:98
-#: templates/designer/side_menu.phtml:101
+#: templates/database/create_table.phtml:15
+msgid "Number of columns"
+msgstr ""
+
+#: templates/database/designer/aggregate_query_panel.phtml:22
+#: templates/database/designer/options_panel.phtml:100
+msgid "Aggregate"
+msgstr ""
+
+#: templates/database/designer/aggregate_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:61
+#: templates/database/designer/options_panel.phtml:106
+#: templates/database/designer/options_panel.phtml:170
+#: templates/database/designer/where_query_panel.phtml:30
+#: templates/table/search/table_header.phtml:9
+msgid "Operator"
+msgstr ""
+
+#: templates/database/designer/database_tables.phtml:29
+msgid "Toggle"
+msgstr ""
+
+#: templates/database/designer/database_tables.phtml:40
+msgid "See table structure"
+msgstr ""
+
+#: templates/database/designer/delete_relation_panel.phtml:21
+msgid "Delete relation"
+msgstr ""
+
+#: templates/database/designer/edit_delete_pages.phtml:7
+msgid "Page to open"
+msgstr ""
+
+#: templates/database/designer/edit_delete_pages.phtml:7
+msgid "Page to delete"
+msgstr ""
+
+#: templates/database/designer/having_query_panel.phtml:90
+#: templates/database/designer/options_panel.phtml:63
+#: templates/database/designer/options_panel.phtml:229
+#: templates/database/designer/where_query_panel.phtml:59
+msgid "Except"
+msgstr ""
+
+#: templates/database/designer/having_query_panel.phtml:102
+#: templates/database/designer/options_panel.phtml:75
+#: templates/database/designer/options_panel.phtml:241
+#: templates/database/designer/where_query_panel.phtml:71
+msgid "subquery"
+msgstr ""
+
+#: templates/database/designer/new_relation_panel.phtml:22
+#: templates/database/designer/side_menu.phtml:84
+#: templates/database/designer/side_menu.phtml:87
+msgid "Create relation"
+msgstr ""
+
+#: templates/database/designer/options_panel.phtml:34
+#: templates/database/designer/options_panel.phtml:200
+msgid "Relation operator"
+msgstr ""
+
+#: templates/database/designer/options_panel.phtml:85
+#: templates/database/designer/rename_to_panel.phtml:23
+msgid "Rename to"
+msgstr ""
+
+#: templates/database/designer/options_panel.phtml:91
+#: templates/database/designer/rename_to_panel.phtml:31
+msgid "New name"
+msgstr ""
+
+#: templates/database/designer/page_save_as.phtml:4
+msgid "Save to selected page"
+msgstr ""
+
+#: templates/database/designer/page_save_as.phtml:5
+msgid "Create a page and save to it"
+msgstr ""
+
+#: templates/database/designer/page_save_as.phtml:26
+msgid "New page name"
+msgstr ""
+
+#: templates/database/designer/page_selector.phtml:2
+msgid "Select page"
+msgstr ""
+
+#: templates/database/designer/query_details.phtml:10
+msgid "Active options"
+msgstr ""
+
+#: templates/database/designer/schema_export.phtml:4
+msgid "Select Export Relational Type"
+msgstr ""
+
+#: templates/database/designer/side_menu.phtml:19
+#: templates/database/designer/side_menu.phtml:25
+msgid "Show/Hide tables list"
+msgstr ""
+
+#: templates/database/designer/side_menu.phtml:29
+#: templates/database/designer/side_menu.phtml:35
+#: templates/database/designer/side_menu.phtml:36
+msgid "View in fullscreen"
+msgstr ""
+
+#: templates/database/designer/side_menu.phtml:34
+msgid "Exit fullscreen"
+msgstr ""
+
+#: templates/database/designer/side_menu.phtml:41
+#: templates/database/designer/side_menu.phtml:45
+msgid "New page"
+msgstr ""
+
+#: templates/database/designer/side_menu.phtml:70
+#: templates/database/designer/side_menu.phtml:73
+msgid "Delete pages"
+msgstr ""
+
+#: templates/database/designer/side_menu.phtml:98
+#: templates/database/designer/side_menu.phtml:101
 msgid "Reload"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:107
-#: templates/designer/side_menu.phtml:110
+#: templates/database/designer/side_menu.phtml:107
+#: templates/database/designer/side_menu.phtml:110
 msgid "Help"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Angular links"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Direct links"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:122
-#: templates/designer/side_menu.phtml:124
+#: templates/database/designer/side_menu.phtml:122
+#: templates/database/designer/side_menu.phtml:124
 msgid "Snap to grid"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:128
-#: templates/designer/side_menu.phtml:134
+#: templates/database/designer/side_menu.phtml:128
+#: templates/database/designer/side_menu.phtml:134
 msgid "Small/Big All"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:138
-#: templates/designer/side_menu.phtml:141
+#: templates/database/designer/side_menu.phtml:138
+#: templates/database/designer/side_menu.phtml:141
 msgid "Toggle small/big"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:145
-#: templates/designer/side_menu.phtml:148
+#: templates/database/designer/side_menu.phtml:145
+#: templates/database/designer/side_menu.phtml:148
 msgid "Toggle relation lines"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:153
-#: templates/designer/side_menu.phtml:156
+#: templates/database/designer/side_menu.phtml:153
+#: templates/database/designer/side_menu.phtml:156
 msgid "Export schema"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:165
-#: templates/designer/side_menu.phtml:168
+#: templates/database/designer/side_menu.phtml:165
+#: templates/database/designer/side_menu.phtml:168
 msgid "Build Query"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:173
-#: templates/designer/side_menu.phtml:177
+#: templates/database/designer/side_menu.phtml:173
+#: templates/database/designer/side_menu.phtml:177
 msgid "Move Menu"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:181
-#: templates/designer/side_menu.phtml:186
+#: templates/database/designer/side_menu.phtml:181
+#: templates/database/designer/side_menu.phtml:186
 msgid "Pin text"
 msgstr ""
 
-#: templates/designer/table_list.phtml:4
+#: templates/database/designer/table_list.phtml:4
 msgid "Hide/Show all"
 msgstr ""
 
-#: templates/designer/table_list.phtml:14
+#: templates/database/designer/table_list.phtml:14
 msgid "Hide/Show Tables with no relation"
 msgstr ""
 
-#: templates/designer/table_list.phtml:59
+#: templates/database/designer/table_list.phtml:59
 msgid "Number of tables:"
 msgstr ""
 
+#: templates/database/structure/body_for_table_summary.phtml:6
+#, php-format
+msgid "%s table"
+msgid_plural "%s tables"
+msgstr[0] "%s bảng"
+
+#: templates/database/structure/body_for_table_summary.phtml:17
+msgid "Sum"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:6
+msgid "Check tables having overhead"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:10
+msgid "Show create"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:27
+msgid "Prefix"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:28
+msgid "Add prefix to table"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:29
+msgid "Replace table prefix"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:30
+msgid "Copy table with prefix"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:36
+msgid "Add columns to central list"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:37
+msgid "Remove columns from central list"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:38
+msgid "Make consistent with central list"
+msgstr ""
+
+#: templates/database/structure/favorite_anchor.phtml:12
+msgid "Add to Favorites"
+msgstr ""
+
+#: templates/database/structure/show_create.phtml:2
+msgid "Showing create queries"
+msgstr ""
+
+#: templates/database/structure/sortable_header.phtml:13
+msgid "Sort"
+msgstr ""
+
+#: templates/database/structure/table_header.phtml:42
+msgid ""
+"May be approximate. Click on the number to get the exact count. See "
+"[doc@faq3-11]FAQ 3.11[/doc]."
+msgstr ""
+
+#: templates/database/structure/table_header.phtml:66
+#: templates/table/index_form.phtml:127
+msgid "Size"
+msgstr "Kích thước"
+
+#: templates/database/structure/table_header.phtml:74
+#: templates/table/structure/display_table_stats.phtml:27
+msgid "Overhead"
+msgstr ""
+
+#: templates/database/structure/tracking_icon.phtml:4
+msgid "Tracking is active."
+msgstr ""
+
+#: templates/database/structure/tracking_icon.phtml:8
+msgid "Tracking is not active."
+msgstr ""
+
 #: templates/error/report_form.phtml:7
 msgid ""
 "phpMyAdmin has encountered an error. We have collected data about this error "
@@ -14028,59 +14138,6 @@ msgstr ""
 msgid "Please explain the steps that lead to the error:"
 msgstr ""
 
-#: templates/gis_visualization/gis_visualization.phtml:3
-msgid "Display GIS Visualization"
-msgstr ""
-
-#: templates/gis_visualization/gis_visualization.phtml:8
-msgid "Label column"
-msgstr ""
-
-#: templates/gis_visualization/gis_visualization.phtml:11
-msgid "-- None --"
-msgstr ""
-
-#: templates/gis_visualization/gis_visualization.phtml:19
-msgid "Spatial column"
-msgstr ""
-
-#: templates/index_form.phtml:16
-msgid "Index name:"
-msgstr ""
-
-#: templates/index_form.phtml:19
-msgid ""
-"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
-msgstr ""
-
-#: templates/index_form.phtml:40
-msgid "Index choice:"
-msgstr ""
-
-#: templates/index_form.phtml:57
-msgid "Key block size:"
-msgstr ""
-
-#: templates/index_form.phtml:74
-msgid "Index type:"
-msgstr ""
-
-#: templates/index_form.phtml:86
-msgid "Parser:"
-msgstr ""
-
-#: templates/index_form.phtml:102
-msgid "Comment:"
-msgstr ""
-
-#: templates/index_form.phtml:127 templates/structure/table_header.phtml:66
-msgid "Size"
-msgstr "Kích thước"
-
-#: templates/index_form.phtml:149 templates/index_form.phtml:190
-msgid "Drag to reorder"
-msgstr ""
-
 #: templates/prefs_autoload.phtml:9
 msgid ""
 "Your browser has phpMyAdmin configuration for this domain. Would you like to "
@@ -14091,403 +14148,371 @@ msgstr ""
 msgid "Start row:"
 msgstr ""
 
-#: templates/structure/actions_in_table_structure.phtml:14
-#, php-format
-msgid "A primary key has been added on %s."
-msgstr ""
-
-#: templates/structure/actions_in_table_structure.phtml:34
-#: templates/structure/actions_in_table_structure.phtml:54
-#: templates/structure/actions_in_table_structure.phtml:79
-#: templates/structure/actions_in_table_structure.phtml:101
-#, php-format
-msgid "An index has been added on %s."
-msgstr ""
-
-#: templates/structure/actions_in_table_structure.phtml:130
-#: templates/structure/check_all_table_column.phtml:59
-msgid "Remove from central columns"
-msgstr ""
-
-#: templates/structure/actions_in_table_structure.phtml:138
-#: templates/structure/check_all_table_column.phtml:55
-msgid "Add to central columns"
-msgstr ""
-
-#: templates/structure/add_column.phtml:7
-#, php-format
-msgid "Add %s column(s)"
-msgstr ""
-
-#: templates/structure/add_column.phtml:12
-msgid "at beginning of table"
-msgstr ""
-
-#: templates/structure/body_for_table_summary.phtml:6
-#, php-format
-msgid "%s table"
-msgid_plural "%s tables"
-msgstr[0] "%s bảng"
-
-#: templates/structure/body_for_table_summary.phtml:17
-msgid "Sum"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:6
-msgid "Check tables having overhead"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:10
-msgid "Show create"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:27
-msgid "Prefix"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:28
-msgid "Add prefix to table"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:29
-msgid "Replace table prefix"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:30
-msgid "Copy table with prefix"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:36
-msgid "Add columns to central list"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:37
-msgid "Remove columns from central list"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:38
-msgid "Make consistent with central list"
-msgstr ""
-
-#: templates/structure/display_structure.phtml:140 view_create.php:181
-msgid "Edit view"
-msgstr ""
-
-#: templates/structure/display_table_stats.phtml:9
-msgid "Space usage"
-msgstr ""
-
-#: templates/structure/display_table_stats.phtml:27
-#: templates/structure/table_header.phtml:74
-msgid "Overhead"
-msgstr ""
-
-#: templates/structure/display_table_stats.phtml:32
-msgid "Effective"
-msgstr ""
-
-#: templates/structure/favorite_anchor.phtml:12
-msgid "Add to Favorites"
-msgstr ""
-
-#: templates/structure/move_columns_dialog.phtml:1
-#: templates/structure/optional_action_links.phtml:21
-msgid "Move columns"
-msgstr ""
-
-#: templates/structure/move_columns_dialog.phtml:2
-msgid "Move the columns by dragging them up and down."
-msgstr ""
-
-#: templates/structure/optional_action_links.phtml:9
-msgid "Propose table structure"
-msgstr ""
-
-#: templates/structure/optional_action_links.phtml:24
-msgid "Improve table structure"
-msgstr ""
-
-#: templates/structure/optional_action_links.phtml:30
-msgid "Track view"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:3
-msgid "Row statistics"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:9
-msgid "static"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:11
-msgid "dynamic"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:22
-msgid "partitioned"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:54
-msgid "Row length"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:66
-msgid "Row size"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:73
-msgid "Next autoindex"
-msgstr ""
-
-#: templates/structure/secondary_tabs.phtml:14
-msgid "Relation view"
-msgstr ""
-
-#: templates/structure/show_create.phtml:2
-msgid "Showing create queries"
-msgstr ""
-
-#: templates/structure/sortable_header.phtml:13
-msgid "Sort"
-msgstr ""
-
-#: templates/structure/table_header.phtml:42
-msgid ""
-"May be approximate. Click on the number to get the exact count. See "
-"[doc@faq3-11]FAQ 3.11[/doc]."
-msgstr ""
-
-#: templates/structure/table_structure_row.phtml:46
-#, php-format
-msgid "Column %s has been dropped."
-msgstr ""
-
-#: templates/structure/tracking_icon.phtml:4
-msgid "Tracking is active."
-msgstr ""
-
-#: templates/structure/tracking_icon.phtml:8
-msgid "Tracking is not active."
-msgstr ""
-
-#: templates/table/create_table.phtml:15
-msgid "Number of columns"
-msgstr ""
-
-#: templates/table/options.phtml:8
-msgid "Select columns (at least one):"
-msgstr ""
-
-#: templates/table/options.phtml:37
-msgid "Add search conditions (body of the \"where\" clause):"
-msgstr ""
-
-#: templates/table/options.phtml:45
-msgid "Number of rows per page"
-msgstr ""
-
-#: templates/table/options.phtml:56
-msgid "Display order:"
-msgstr ""
-
-#: templates/table/options_zoom.phtml:6
-msgid "Use this column to label each point"
-msgstr ""
-
-#: templates/table/options_zoom.phtml:35
-msgid "Maximum rows to plot"
-msgstr ""
-
-#: templates/table/replace_preview.phtml:13
-msgid "Find and replace - preview"
-msgstr ""
-
-#: templates/table/replace_preview.phtml:18
-msgid "Original string"
-msgstr ""
-
-#: templates/table/replace_preview.phtml:19
-msgid "Replaced string"
-msgstr ""
-
-#: templates/table/replace_preview.phtml:40
-msgid "Replace"
-msgstr ""
-
-#: templates/table/rows_zoom.phtml:16
-msgid "Additional search criteria"
-msgstr ""
-
-#: templates/table/search_and_replace.phtml:3
-msgid "Replace with:"
-msgstr ""
-
-#: templates/table/search_and_replace.phtml:22
-msgid "Use regular expression"
-msgstr ""
-
-#: templates/table/selection_form.phtml:12
-msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
-msgstr ""
-
-#: templates/table/selection_form.phtml:34
-msgid "Do a \"query by example\" (wildcard: \"%\")"
-msgstr ""
-
-#: templates/table/zoom_result_form.phtml:7
-msgid "Browse/Edit the points"
-msgstr ""
-
-#: templates/table/zoom_result_form.phtml:15
-msgid "How to use"
-msgstr ""
-
-#: templates/table/zoom_result_form.phtml:23
-msgid "Reset zoom"
-msgstr ""
-
-#: templates/tbl_chart.phtml:17
+#: templates/table/chart/tbl_chart.phtml:17
 msgctxt "Chart type"
 msgid "Bar"
 msgstr ""
 
-#: templates/tbl_chart.phtml:21
+#: templates/table/chart/tbl_chart.phtml:21
 msgctxt "Chart type"
 msgid "Column"
 msgstr ""
 
-#: templates/tbl_chart.phtml:25
+#: templates/table/chart/tbl_chart.phtml:25
 msgctxt "Chart type"
 msgid "Line"
 msgstr ""
 
-#: templates/tbl_chart.phtml:29
+#: templates/table/chart/tbl_chart.phtml:29
 msgctxt "Chart type"
 msgid "Spline"
 msgstr ""
 
-#: templates/tbl_chart.phtml:33
+#: templates/table/chart/tbl_chart.phtml:33
 msgctxt "Chart type"
 msgid "Area"
 msgstr ""
 
-#: templates/tbl_chart.phtml:37
+#: templates/table/chart/tbl_chart.phtml:37
 msgctxt "Chart type"
 msgid "Pie"
 msgstr ""
 
-#: templates/tbl_chart.phtml:41
+#: templates/table/chart/tbl_chart.phtml:41
 msgctxt "Chart type"
 msgid "Timeline"
 msgstr ""
 
-#: templates/tbl_chart.phtml:45
+#: templates/table/chart/tbl_chart.phtml:45
 msgctxt "Chart type"
 msgid "Scatter"
 msgstr ""
 
-#: templates/tbl_chart.phtml:50
+#: templates/table/chart/tbl_chart.phtml:50
 msgid "Stacked"
 msgstr ""
 
-#: templates/tbl_chart.phtml:53
+#: templates/table/chart/tbl_chart.phtml:53
 msgid "Chart title"
 msgstr ""
 
-#: templates/tbl_chart.phtml:57
+#: templates/table/chart/tbl_chart.phtml:57
 msgid "X-Axis:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:72
+#: templates/table/chart/tbl_chart.phtml:72
 msgid "Series:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:102
+#: templates/table/chart/tbl_chart.phtml:102
 msgid "X-Axis label:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:104
+#: templates/table/chart/tbl_chart.phtml:104
 msgid "X Values"
 msgstr ""
 
-#: templates/tbl_chart.phtml:107
+#: templates/table/chart/tbl_chart.phtml:107
 msgid "Y-Axis label:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:115
+#: templates/table/chart/tbl_chart.phtml:115
 msgid "Series names are in a column"
 msgstr ""
 
-#: templates/tbl_chart.phtml:118
+#: templates/table/chart/tbl_chart.phtml:118
 msgid "Series column:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:130
+#: templates/table/chart/tbl_chart.phtml:130
 #, fuzzy
 #| msgid "Column"
 msgid "Value Column:"
 msgstr "Trường"
 
-#: templates/tbl_chart.phtml:150
+#: templates/table/chart/tbl_chart.phtml:150
 msgid "Save chart as image"
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:7
+#: templates/table/gis_visualization/gis_visualization.phtml:3
+msgid "Display GIS Visualization"
+msgstr ""
+
+#: templates/table/gis_visualization/gis_visualization.phtml:8
+msgid "Label column"
+msgstr ""
+
+#: templates/table/gis_visualization/gis_visualization.phtml:11
+msgid "-- None --"
+msgstr ""
+
+#: templates/table/gis_visualization/gis_visualization.phtml:19
+msgid "Spatial column"
+msgstr ""
+
+#: templates/table/index_form.phtml:16
+msgid "Index name:"
+msgstr ""
+
+#: templates/table/index_form.phtml:19
+msgid ""
+"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
+msgstr ""
+
+#: templates/table/index_form.phtml:40
+msgid "Index choice:"
+msgstr ""
+
+#: templates/table/index_form.phtml:57
+msgid "Key block size:"
+msgstr ""
+
+#: templates/table/index_form.phtml:74
+msgid "Index type:"
+msgstr ""
+
+#: templates/table/index_form.phtml:86
+msgid "Parser:"
+msgstr ""
+
+#: templates/table/index_form.phtml:102
+msgid "Comment:"
+msgstr ""
+
+#: templates/table/index_form.phtml:149 templates/table/index_form.phtml:190
+msgid "Drag to reorder"
+msgstr ""
+
+#: templates/table/relation/common_form.phtml:7
 msgid "Internal relations"
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:11
+#: templates/table/relation/common_form.phtml:11
 msgid "Internal relation"
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:14
+#: templates/table/relation/common_form.phtml:14
 msgid ""
 "An internal relation is not necessary when a corresponding FOREIGN KEY "
 "relation exists."
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:37
+#: templates/table/relation/common_form.phtml:37
 msgid "Foreign key constraints"
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:40
+#: templates/table/relation/common_form.phtml:40
 msgid "Actions"
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:41
+#: templates/table/relation/common_form.phtml:41
 msgid "Constraint properties"
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:44
+#: templates/table/relation/common_form.phtml:44
 msgid ""
 "Only columns with index will be displayed. You can define an index below."
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:49
+#: templates/table/relation/common_form.phtml:49
 msgid "Foreign key constraint"
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:81
+#: templates/table/relation/common_form.phtml:81
 msgid "+ Add constraint"
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:91
+#: templates/table/relation/common_form.phtml:91
 msgid "Choose column to display:"
 msgstr ""
 
-#: templates/tbl_relation/foreign_key_row.phtml:13
+#: templates/table/relation/foreign_key_row.phtml:13
 #, php-format
 msgid "Foreign key constraint %s has been dropped"
 msgstr ""
 
-#: templates/tbl_relation/foreign_key_row.phtml:102
+#: templates/table/relation/foreign_key_row.phtml:102
 msgid "Constraint name"
 msgstr ""
 
-#: templates/tbl_relation/foreign_key_row.phtml:157
+#: templates/table/relation/foreign_key_row.phtml:157
 msgid "+ Add column"
 msgstr ""
 
+#: templates/table/search/options.phtml:8
+msgid "Select columns (at least one):"
+msgstr ""
+
+#: templates/table/search/options.phtml:37
+msgid "Add search conditions (body of the \"where\" clause):"
+msgstr ""
+
+#: templates/table/search/options.phtml:45
+msgid "Number of rows per page"
+msgstr ""
+
+#: templates/table/search/options.phtml:56
+msgid "Display order:"
+msgstr ""
+
+#: templates/table/search/options_zoom.phtml:6
+msgid "Use this column to label each point"
+msgstr ""
+
+#: templates/table/search/options_zoom.phtml:35
+msgid "Maximum rows to plot"
+msgstr ""
+
+#: templates/table/search/replace_preview.phtml:13
+msgid "Find and replace - preview"
+msgstr ""
+
+#: templates/table/search/replace_preview.phtml:18
+msgid "Original string"
+msgstr ""
+
+#: templates/table/search/replace_preview.phtml:19
+msgid "Replaced string"
+msgstr ""
+
+#: templates/table/search/replace_preview.phtml:40
+msgid "Replace"
+msgstr ""
+
+#: templates/table/search/rows_zoom.phtml:16
+msgid "Additional search criteria"
+msgstr ""
+
+#: templates/table/search/search_and_replace.phtml:3
+msgid "Replace with:"
+msgstr ""
+
+#: templates/table/search/search_and_replace.phtml:22
+msgid "Use regular expression"
+msgstr ""
+
+#: templates/table/search/selection_form.phtml:12
+msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
+msgstr ""
+
+#: templates/table/search/selection_form.phtml:34
+msgid "Do a \"query by example\" (wildcard: \"%\")"
+msgstr ""
+
+#: templates/table/search/zoom_result_form.phtml:7
+msgid "Browse/Edit the points"
+msgstr ""
+
+#: templates/table/search/zoom_result_form.phtml:15
+msgid "How to use"
+msgstr ""
+
+#: templates/table/search/zoom_result_form.phtml:23
+msgid "Reset zoom"
+msgstr ""
+
+#: templates/table/secondary_tabs.phtml:14
+msgid "Relation view"
+msgstr ""
+
+#: templates/table/structure/actions_in_table_structure.phtml:14
+#, php-format
+msgid "A primary key has been added on %s."
+msgstr ""
+
+#: templates/table/structure/actions_in_table_structure.phtml:34
+#: templates/table/structure/actions_in_table_structure.phtml:54
+#: templates/table/structure/actions_in_table_structure.phtml:79
+#: templates/table/structure/actions_in_table_structure.phtml:101
+#, php-format
+msgid "An index has been added on %s."
+msgstr ""
+
+#: templates/table/structure/actions_in_table_structure.phtml:130
+#: templates/table/structure/check_all_table_column.phtml:59
+msgid "Remove from central columns"
+msgstr ""
+
+#: templates/table/structure/actions_in_table_structure.phtml:138
+#: templates/table/structure/check_all_table_column.phtml:55
+msgid "Add to central columns"
+msgstr ""
+
+#: templates/table/structure/add_column.phtml:7
+#, php-format
+msgid "Add %s column(s)"
+msgstr ""
+
+#: templates/table/structure/add_column.phtml:12
+msgid "at beginning of table"
+msgstr ""
+
+#: templates/table/structure/display_structure.phtml:140 view_create.php:181
+msgid "Edit view"
+msgstr ""
+
+#: templates/table/structure/display_table_stats.phtml:9
+msgid "Space usage"
+msgstr ""
+
+#: templates/table/structure/display_table_stats.phtml:32
+msgid "Effective"
+msgstr ""
+
+#: templates/table/structure/move_columns_dialog.phtml:1
+#: templates/table/structure/optional_action_links.phtml:21
+msgid "Move columns"
+msgstr ""
+
+#: templates/table/structure/move_columns_dialog.phtml:2
+msgid "Move the columns by dragging them up and down."
+msgstr ""
+
+#: templates/table/structure/optional_action_links.phtml:9
+msgid "Propose table structure"
+msgstr ""
+
+#: templates/table/structure/optional_action_links.phtml:24
+msgid "Improve table structure"
+msgstr ""
+
+#: templates/table/structure/optional_action_links.phtml:30
+msgid "Track view"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:3
+msgid "Row statistics"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:9
+msgid "static"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:11
+msgid "dynamic"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:22
+msgid "partitioned"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:54
+msgid "Row length"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:66
+msgid "Row size"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:73
+msgid "Next autoindex"
+msgstr ""
+
+#: templates/table/structure/table_structure_row.phtml:46
+#, php-format
+msgid "Column %s has been dropped."
+msgstr ""
+
 #: themes.php:17 themes.php:22
 msgid "Theme"
 msgstr ""
diff --git a/po/vls.po b/po/vls.po
index 885662bacd..308d950e8e 100644
--- a/po/vls.po
+++ b/po/vls.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 4.5.0-dev\n"
 "Report-Msgid-Bugs-To: developers@phpmyadmin.net\n"
-"POT-Creation-Date: 2015-08-08 13:53-0400\n"
+"POT-Creation-Date: 2015-08-12 08:10-0400\n"
 "PO-Revision-Date: 2014-12-23 23:39+0200\n"
 "Last-Translator: Robin van der Vliet <info@robinvandervliet.nl>\n"
 "Language-Team: West Flemish <https://hosted.weblate.org/projects/phpmyadmin/"
@@ -57,7 +57,7 @@ msgid "Table comments:"
 msgstr ""
 
 #: db_datadict.php:104 libraries/Index.class.php:699
-#: libraries/insert_edit.lib.php:1567
+#: libraries/insert_edit.lib.php:1565
 #: libraries/navigation/Nodes/Node_Column.class.php:30
 #: libraries/plugins/export/ExportHtmlword.class.php:280
 #: libraries/plugins/export/ExportHtmlword.class.php:375
@@ -71,13 +71,14 @@ msgstr ""
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1023
 #: libraries/tracking.lib.php:879 libraries/tracking.lib.php:975
 #: templates/columns_definitions/column_name.phtml:18
-#: templates/index_form.phtml:124 templates/table/table_header.phtml:6
-#: templates/table/zoom_result_form.phtml:33
-#: templates/tbl_relation/common_form.phtml:10
-#: templates/tbl_relation/common_form.phtml:43
-#: templates/tbl_relation/foreign_key_row.phtml:194
-#: templates/tbl_relation/foreign_key_row.phtml:206
-#: templates/tbl_relation/internal_relational_row.phtml:71
+#: templates/table/index_form.phtml:124
+#: templates/table/relation/common_form.phtml:10
+#: templates/table/relation/common_form.phtml:43
+#: templates/table/relation/foreign_key_row.phtml:194
+#: templates/table/relation/foreign_key_row.phtml:206
+#: templates/table/relation/internal_relational_row.phtml:71
+#: templates/table/search/table_header.phtml:6
+#: templates/table/search/zoom_result_form.phtml:33
 msgid "Column"
 msgstr ""
 
@@ -95,21 +96,21 @@ msgstr ""
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1001
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1024
 #: libraries/rte/rte_list.lib.php:75 libraries/rte/rte_list.lib.php:103
-#: libraries/rte/rte_routines.lib.php:802
-#: libraries/rte/rte_routines.lib.php:831
-#: libraries/rte/rte_routines.lib.php:1493
+#: libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_routines.lib.php:922
+#: libraries/rte/rte_routines.lib.php:1584
 #: libraries/server_privileges.lib.php:2369 libraries/tracking.lib.php:880
 #: libraries/tracking.lib.php:972
 #: templates/columns_definitions/table_fields_definitions.phtml:11
-#: templates/structure/table_header.phtml:48
-#: templates/structure/table_structure_header.phtml:6
-#: templates/table/table_header.phtml:7
+#: templates/database/structure/table_header.phtml:48
+#: templates/table/search/table_header.phtml:7
+#: templates/table/structure/table_structure_header.phtml:6
 msgid "Type"
 msgstr ""
 
 #: db_datadict.php:106 libraries/Index.class.php:702
 #: libraries/central_columns.lib.php:708
-#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1576
+#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1574
 #: libraries/plugins/export/ExportHtmlword.class.php:286
 #: libraries/plugins/export/ExportHtmlword.class.php:381
 #: libraries/plugins/export/ExportLatex.class.php:509
@@ -122,8 +123,8 @@ msgstr ""
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1026
 #: libraries/tracking.lib.php:882 libraries/tracking.lib.php:978
 #: templates/columns_definitions/table_fields_definitions.phtml:39
-#: templates/structure/table_structure_header.phtml:9
-#: templates/table/zoom_result_form.phtml:34
+#: templates/table/search/zoom_result_form.phtml:34
+#: templates/table/structure/table_structure_header.phtml:9
 msgid "Null"
 msgstr ""
 
@@ -141,8 +142,8 @@ msgstr ""
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1027
 #: libraries/replication_gui.lib.php:153 libraries/tracking.lib.php:883
 #: templates/columns_definitions/table_fields_definitions.phtml:25
-#: templates/structure/body_for_table_summary.phtml:55
-#: templates/structure/table_structure_header.phtml:10
+#: templates/database/structure/body_for_table_summary.phtml:55
+#: templates/table/structure/table_structure_header.phtml:10
 msgid "Default"
 msgstr ""
 
@@ -170,19 +171,19 @@ msgid "Comments"
 msgstr ""
 
 #: db_datadict.php:146
-#: libraries/controllers/StructureController.class.php:1960
-#: libraries/controllers/StructureController.class.php:1965
+#: libraries/controllers/TableStructureController.class.php:951
+#: libraries/controllers/TableStructureController.class.php:956
 #: libraries/tracking.lib.php:922
 #: templates/columns_definitions/column_indexes.phtml:6
-#: templates/structure/check_all_table_column.phtml:22
-#: templates/structure/display_structure.phtml:74
+#: templates/table/structure/check_all_table_column.phtml:22
+#: templates/table/structure/display_structure.phtml:74
 msgid "Primary"
 msgstr ""
 
 #: db_datadict.php:156 js/messages.php:317 libraries/Index.class.php:567
 #: libraries/Index.class.php:606 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261 libraries/mult_submits.lib.php:403
+#: libraries/config/FormDisplay.tpl.php:272 libraries/mult_submits.lib.php:403
 #: libraries/mult_submits.lib.php:417
 #: libraries/plugins/export/ExportHtmlword.class.php:630
 #: libraries/plugins/export/ExportLatex.class.php:589
@@ -198,20 +199,20 @@ msgstr ""
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1010 libraries/tracking.lib.php:1015
 #: prefs_manage.php:140 templates/prefs_autoload.phtml:15
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "No"
 msgstr ""
 
 #: db_datadict.php:156 js/messages.php:443 libraries/Index.class.php:568
 #: libraries/Index.class.php:605 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261
-#: libraries/controllers/StructureController.class.php:1344
-#: libraries/controllers/StructureController.class.php:2223
-#: libraries/controllers/StructureController.class.php:2232
-#: libraries/controllers/StructureController.class.php:2237
-#: libraries/controllers/StructureController.class.php:2242
-#: libraries/controllers/StructureController.class.php:2247
+#: libraries/config/FormDisplay.tpl.php:272
+#: libraries/controllers/TableStructureController.class.php:539
+#: libraries/controllers/TableStructureController.class.php:1201
+#: libraries/controllers/TableStructureController.class.php:1210
+#: libraries/controllers/TableStructureController.class.php:1215
+#: libraries/controllers/TableStructureController.class.php:1220
+#: libraries/controllers/TableStructureController.class.php:1225
 #: libraries/mult_submits.inc.php:82 libraries/mult_submits.inc.php:178
 #: libraries/mult_submits.lib.php:339 libraries/mult_submits.lib.php:372
 #: libraries/mult_submits.lib.php:401 libraries/mult_submits.lib.php:415
@@ -220,8 +221,8 @@ msgstr ""
 #: libraries/plugins/export/ExportOdt.class.php:756
 #: libraries/plugins/export/ExportTexytext.class.php:567
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1077
-#: libraries/server_databases.lib.php:464
-#: libraries/server_databases.lib.php:474
+#: libraries/server_databases.lib.php:475
+#: libraries/server_databases.lib.php:485
 #: libraries/server_privileges.lib.php:2546
 #: libraries/server_privileges.lib.php:2727
 #: libraries/server_privileges.lib.php:2748
@@ -231,7 +232,7 @@ msgstr ""
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1008 libraries/tracking.lib.php:1013
 #: prefs_manage.php:138 templates/prefs_autoload.phtml:14
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "Yes"
 msgstr ""
 
@@ -241,7 +242,7 @@ msgstr ""
 
 #: db_export.php:37 db_tracking.php:90 export.php:382
 #: libraries/DBQbe.class.php:326
-#: libraries/controllers/StructureController.class.php:231
+#: libraries/controllers/DatabaseStructureController.class.php:170
 #: libraries/navigation/NavigationTree.class.php:897
 msgid "No tables found in database."
 msgstr ""
@@ -252,14 +253,14 @@ msgstr ""
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:26
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:120
-#: templates/structure/show_create.phtml:18
+#: templates/database/structure/show_create.phtml:18
 msgid "Tables"
 msgstr ""
 
 #: db_export.php:52 libraries/Menu.class.php:317 libraries/Menu.class.php:425
-#: libraries/Util.class.php:3333 libraries/Util.class.php:3343
-#: libraries/Util.class.php:3349 libraries/Util.class.php:3629
-#: libraries/Util.class.php:4327 libraries/Util.class.php:4344
+#: libraries/Util.class.php:3339 libraries/Util.class.php:3349
+#: libraries/Util.class.php:3355 libraries/Util.class.php:3635
+#: libraries/Util.class.php:4333 libraries/Util.class.php:4350
 #: libraries/central_columns.lib.php:728 libraries/config.values.php:39
 #: libraries/config.values.php:47 libraries/config.values.php:109
 #: libraries/config.values.php:115 libraries/config/setup.forms.php:323
@@ -273,7 +274,7 @@ msgstr ""
 #: libraries/navigation/Nodes/Node_Table.class.php:283
 #: libraries/server_privileges.lib.php:1141 libraries/tracking.lib.php:874
 #: templates/columns_definitions/table_fields_definitions.phtml:3
-#: templates/designer/table_list.phtml:28
+#: templates/database/designer/table_list.phtml:28
 msgid "Structure"
 msgstr ""
 
@@ -285,7 +286,7 @@ msgstr ""
 #: libraries/config/user_preferences.forms.php:292
 #: libraries/config/user_preferences.forms.php:297
 #: libraries/server_privileges.lib.php:1140
-#: templates/structure/display_table_stats.phtml:12
+#: templates/table/structure/display_table_stats.phtml:12
 msgid "Data"
 msgstr ""
 
@@ -355,10 +356,10 @@ msgstr ""
 #: libraries/server_privileges.lib.php:2908
 #: libraries/server_privileges.lib.php:3145
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4346
-#: templates/structure/table_header.phtml:21
-#: templates/tbl_relation/foreign_key_row.phtml:176
-#: templates/tbl_relation/internal_relational_row.phtml:63
+#: libraries/server_privileges.lib.php:4372
+#: templates/database/structure/table_header.phtml:21
+#: templates/table/relation/foreign_key_row.phtml:176
+#: templates/table/relation/internal_relational_row.phtml:63
 msgid "Table"
 msgstr ""
 
@@ -375,7 +376,7 @@ msgid "Updated"
 msgstr ""
 
 #: db_tracking.php:130 js/messages.php:243 libraries/Menu.class.php:552
-#: libraries/Util.class.php:4314 libraries/config.values.php:104
+#: libraries/Util.class.php:4320 libraries/config.values.php:104
 #: libraries/rte/rte_events.lib.php:393 libraries/rte/rte_list.lib.php:101
 #: libraries/server_status_processes.lib.php:92 libraries/tracking.lib.php:279
 msgid "Status"
@@ -384,14 +385,15 @@ msgstr ""
 #: db_tracking.php:131 db_tracking.php:290 libraries/Index.class.php:693
 #: libraries/central_columns.lib.php:687 libraries/rte/rte_list.lib.php:74
 #: libraries/rte/rte_list.lib.php:89 libraries/rte/rte_list.lib.php:102
-#: libraries/server_databases.lib.php:398
+#: libraries/server_databases.lib.php:409
 #: libraries/server_privileges.lib.php:2372
 #: libraries/server_privileges.lib.php:3166
 #: libraries/server_privileges.lib.php:3342
 #: libraries/server_user_groups.lib.php:82
 #: libraries/server_variables.lib.php:189 libraries/tracking.lib.php:280
-#: libraries/tracking.lib.php:793 templates/structure/table_header.phtml:30
-#: templates/structure/table_structure_header.phtml:23
+#: libraries/tracking.lib.php:793
+#: templates/database/structure/table_header.phtml:30
+#: templates/table/structure/table_structure_header.phtml:23
 msgid "Action"
 msgstr ""
 
@@ -433,7 +435,7 @@ msgid "Untracked tables"
 msgstr ""
 
 #: db_tracking.php:305 db_tracking.php:336
-#: templates/structure/optional_action_links.phtml:17
+#: templates/table/structure/optional_action_links.phtml:17
 msgid "Track table"
 msgstr ""
 
@@ -483,7 +485,7 @@ msgid "Value for the column \"%s\""
 msgstr ""
 
 #: gis_data_editor.php:146
-#: templates/gis_visualization/gis_visualization.phtml:37
+#: templates/table/gis_visualization/gis_visualization.phtml:37
 msgid "Use OpenStreetMaps as Base Layer"
 msgstr ""
 
@@ -563,35 +565,35 @@ msgstr ""
 #: libraries/display_change_password.lib.php:162
 #: libraries/display_export.lib.php:402 libraries/display_export.lib.php:408
 #: libraries/display_import.lib.php:392 libraries/index.lib.php:44
-#: libraries/insert_edit.lib.php:1546 libraries/insert_edit.lib.php:1583
+#: libraries/insert_edit.lib.php:1544 libraries/insert_edit.lib.php:1581
 #: libraries/normalization.lib.php:165 libraries/normalization.lib.php:821
 #: libraries/operations.lib.php:38 libraries/operations.lib.php:108
 #: libraries/operations.lib.php:263 libraries/operations.lib.php:306
 #: libraries/operations.lib.php:801 libraries/operations.lib.php:874
 #: libraries/operations.lib.php:923 libraries/operations.lib.php:1337
 #: libraries/operations.lib.php:1658
-#: libraries/plugins/auth/AuthenticationCookie.class.php:244
+#: libraries/plugins/auth/AuthenticationCookie.class.php:232
 #: libraries/replication_gui.lib.php:122 libraries/replication_gui.lib.php:161
 #: libraries/replication_gui.lib.php:324 libraries/replication_gui.lib.php:461
 #: libraries/replication_gui.lib.php:906 libraries/rte/rte_events.lib.php:509
-#: libraries/rte/rte_routines.lib.php:969
-#: libraries/rte/rte_routines.lib.php:1581
+#: libraries/rte/rte_routines.lib.php:1060
+#: libraries/rte/rte_routines.lib.php:1672
 #: libraries/rte/rte_triggers.lib.php:396 libraries/server_bin_log.lib.php:61
 #: libraries/server_privileges.lib.php:705
 #: libraries/server_privileges.lib.php:2106
 #: libraries/server_privileges.lib.php:2872
 #: libraries/server_privileges.lib.php:3553
-#: libraries/server_privileges.lib.php:4627
+#: libraries/server_privileges.lib.php:4653
 #: libraries/server_user_groups.lib.php:285
 #: libraries/sql_query_form.lib.php:369 libraries/sql_query_form.lib.php:429
 #: libraries/tracking.lib.php:533 libraries/tracking.lib.php:653
 #: prefs_manage.php:277 prefs_manage.php:355
 #: templates/columns_definitions/column_definitions_form.phtml:59
-#: templates/header_location.phtml:17 templates/index_form.phtml:238
+#: templates/database/create_table.phtml:21 templates/header_location.phtml:28
 #: templates/startAndNumberOfRowsPanel.phtml:14
-#: templates/structure/add_column.phtml:25
-#: templates/table/create_table.phtml:21
-#: templates/table/selection_form.phtml:75 view_create.php:275
+#: templates/table/index_form.phtml:238
+#: templates/table/search/selection_form.phtml:75
+#: templates/table/structure/add_column.phtml:25 view_create.php:275
 #: view_operations.php:106
 msgid "Go"
 msgstr ""
@@ -669,7 +671,7 @@ msgstr ""
 msgid "Could not load import plugins, please check your installation!"
 msgstr ""
 
-#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1466
+#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1460
 #, php-format
 msgid "Bookmark %s has been created."
 msgstr ""
@@ -703,11 +705,11 @@ msgstr ""
 msgid "Back"
 msgstr ""
 
-#: index.php:148 libraries/Footer.class.php:70
+#: index.php:149 libraries/Footer.class.php:70
 msgid "phpMyAdmin Demo Server"
 msgstr ""
 
-#: index.php:152
+#: index.php:153
 #, php-format
 msgid ""
 "You are using the demo server. You can do anything here, but please do not "
@@ -715,110 +717,110 @@ msgid ""
 "at %s."
 msgstr ""
 
-#: index.php:162
+#: index.php:163
 msgid "General Settings"
 msgstr ""
 
-#: index.php:190 libraries/display_change_password.lib.php:50
+#: index.php:191 libraries/display_change_password.lib.php:50
 #: libraries/display_change_password.lib.php:53 user_password.php:247
 msgid "Change password"
 msgstr ""
 
-#: index.php:206
+#: index.php:207
 msgid "Server connection collation"
 msgstr ""
 
-#: index.php:228
+#: index.php:229
 msgid "Appearance Settings"
 msgstr ""
 
-#: index.php:258 prefs_manage.php:285
+#: index.php:259 prefs_manage.php:285
 msgid "More settings"
 msgstr ""
 
-#: index.php:279
+#: index.php:280
 msgid "Database server"
 msgstr ""
 
-#: index.php:282 libraries/plugins/auth/AuthenticationCookie.class.php:181
+#: index.php:283 libraries/plugins/auth/AuthenticationCookie.class.php:169
 msgid "Server:"
 msgstr ""
 
-#: index.php:286
+#: index.php:287
 msgid "Server type:"
 msgstr ""
 
-#: index.php:290 libraries/plugins/export/ExportLatex.class.php:212
+#: index.php:291 libraries/plugins/export/ExportLatex.class.php:212
 #: libraries/plugins/export/ExportSql.class.php:687
 #: libraries/plugins/export/ExportXml.class.php:189
 msgid "Server version:"
 msgstr ""
 
-#: index.php:296
+#: index.php:297
 msgid "Protocol version:"
 msgstr ""
 
-#: index.php:300
+#: index.php:301
 msgid "User:"
 msgstr "Gebruker:"
 
-#: index.php:305
+#: index.php:306
 msgid "Server charset:"
 msgstr ""
 
-#: index.php:320
+#: index.php:321
 msgid "Web server"
 msgstr ""
 
-#: index.php:331
+#: index.php:332
 msgid "Database client version:"
 msgstr ""
 
-#: index.php:335
+#: index.php:336
 msgid "PHP extension:"
 msgstr ""
 
-#: index.php:349
+#: index.php:350
 msgid "PHP version:"
 msgstr ""
 
-#: index.php:360
+#: index.php:361
 msgid "Show PHP information"
 msgstr ""
 
-#: index.php:383
+#: index.php:384
 msgid "Version information:"
 msgstr ""
 
-#: index.php:392 libraries/Util.class.php:432 libraries/Util.class.php:495
-#: libraries/config/FormDisplay.tpl.php:151
+#: index.php:393 libraries/Util.class.php:432 libraries/Util.class.php:495
+#: libraries/config/FormDisplay.tpl.php:162
 #: libraries/display_export.lib.php:577 libraries/engines/pbxt.lib.php:162
 #: libraries/navigation/NavigationHeader.class.php:196
 #: libraries/server_variables.lib.php:160
 msgid "Documentation"
 msgstr "Dokumentoasje"
 
-#: index.php:399
+#: index.php:400
 msgid "Wiki"
 msgstr "Wiki"
 
-#: index.php:408
+#: index.php:409
 msgid "Official Homepage"
 msgstr ""
 
-#: index.php:415
+#: index.php:416
 msgid "Contribute"
 msgstr ""
 
-#: index.php:422
+#: index.php:423
 msgid "Get support"
 msgstr ""
 
-#: index.php:429
+#: index.php:430
 msgid "List of changes"
 msgstr ""
 
-#: index.php:451
+#: index.php:452
 msgid ""
 "You are connected as 'root' with no password, which corresponds to the "
 "default MySQL privileged account. Your MySQL server is running with this "
@@ -826,21 +828,21 @@ msgid ""
 "by setting a password for user 'root'."
 msgstr ""
 
-#: index.php:468
+#: index.php:469
 msgid ""
 "You have enabled mbstring.func_overload in your PHP configuration. This "
 "option is incompatible with phpMyAdmin and might cause some data to be "
 "corrupted!"
 msgstr ""
 
-#: index.php:483
+#: index.php:484
 msgid ""
 "The mbstring PHP extension was not found and you seem to be using a "
 "multibyte charset. Without the mbstring extension phpMyAdmin is unable to "
 "split strings correctly and it may result in unexpected results."
 msgstr ""
 
-#: index.php:500
+#: index.php:501
 msgid ""
 "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini."
 "session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower than "
@@ -848,17 +850,17 @@ msgid ""
 "expire sooner than configured in phpMyAdmin."
 msgstr ""
 
-#: index.php:519
+#: index.php:520
 msgid ""
 "Login cookie store is lower than cookie validity configured in phpMyAdmin, "
 "because of this, your login will expire sooner than configured in phpMyAdmin."
 msgstr ""
 
-#: index.php:535
+#: index.php:536
 msgid "The configuration file now needs a secret passphrase (blowfish_secret)."
 msgstr ""
 
-#: index.php:548
+#: index.php:549
 msgid ""
 "Directory [code]config[/code], which is used by the setup script, still "
 "exists in your phpMyAdmin directory. It is strongly recommended to remove it "
@@ -866,26 +868,26 @@ msgid ""
 "may be compromised by unauthorized people downloading your configuration."
 msgstr ""
 
-#: index.php:564
+#: index.php:565
 #, php-format
 msgid ""
 "The phpMyAdmin configuration storage is not completely configured, some "
 "extended features have been deactivated. %sFind out why%s. "
 msgstr ""
 
-#: index.php:571
+#: index.php:572
 msgid ""
 "Or alternately go to 'Operations' tab of any database to set it up there."
 msgstr ""
 
-#: index.php:620
+#: index.php:621
 #, php-format
 msgid ""
 "Your PHP MySQL library version %s differs from your MySQL server version %s. "
 "This may cause unpredictable behavior."
 msgstr ""
 
-#: index.php:648
+#: index.php:649
 #, php-format
 msgid ""
 "Server running with Suhosin. Please refer to %sdocumentation%s for possible "
@@ -1026,8 +1028,8 @@ msgstr ""
 msgid "Save & Close"
 msgstr ""
 
-#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:404
-#: libraries/insert_edit.lib.php:1550 prefs_manage.php:361
+#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:415
+#: libraries/insert_edit.lib.php:1548 prefs_manage.php:361
 #: prefs_manage.php:372
 msgid "Reset"
 msgstr ""
@@ -1060,7 +1062,7 @@ msgstr ""
 msgid "Edit Index"
 msgstr ""
 
-#: js/messages.php:99 templates/index_form.phtml:232
+#: js/messages.php:99 templates/table/index_form.phtml:232
 #, php-format
 msgid "Add %s column(s) to index"
 msgstr ""
@@ -1081,13 +1083,14 @@ msgstr ""
 msgid "Please select column(s) for the index."
 msgstr ""
 
-#: js/messages.php:106 templates/structure/add_column.phtml:1
+#: js/messages.php:106 templates/table/structure/add_column.phtml:1
 msgid "You have to add at least one column."
 msgstr ""
 
-#: js/messages.php:109 libraries/insert_edit.lib.php:1548
+#: js/messages.php:109 libraries/insert_edit.lib.php:1546
 #: templates/columns_definitions/column_definitions_form.phtml:162
-#: templates/index_form.phtml:237 templates/tbl_relation/common_form.phtml:106
+#: templates/table/index_form.phtml:237
+#: templates/table/relation/common_form.phtml:106
 msgid "Preview SQL"
 msgstr ""
 
@@ -1104,7 +1107,7 @@ msgid "SQL query:"
 msgstr ""
 
 #. l10n: Default label for the y-Axis of Charts
-#: js/messages.php:118 templates/tbl_chart.phtml:109
+#: js/messages.php:118 templates/table/chart/tbl_chart.phtml:109
 msgid "Y Values"
 msgstr ""
 
@@ -1255,7 +1258,7 @@ msgstr ""
 msgid "Bytes received"
 msgstr ""
 
-#: js/messages.php:169 libraries/server_status.lib.php:226
+#: js/messages.php:169 libraries/server_status.lib.php:235
 msgid "Connections"
 msgstr ""
 
@@ -1312,12 +1315,12 @@ msgstr ""
 msgid "Questions"
 msgstr ""
 
-#: js/messages.php:184 libraries/server_status.lib.php:134
+#: js/messages.php:184 libraries/server_status.lib.php:143
 msgid "Traffic"
 msgstr ""
 
 #: js/messages.php:185 libraries/Menu.class.php:586
-#: libraries/Util.class.php:4318 libraries/server_status_monitor.lib.php:257
+#: libraries/Util.class.php:4324 libraries/server_status_monitor.lib.php:257
 msgid "Settings"
 msgstr ""
 
@@ -1337,8 +1340,9 @@ msgstr ""
 #: libraries/server_status_monitor.lib.php:236
 #: libraries/server_status_processes.lib.php:308
 #: templates/columns_definitions/transformation.phtml:4
-#: templates/designer/options_panel.phtml:178
-#: templates/table/options_zoom.phtml:12 templates/table/rows_zoom.phtml:26
+#: templates/database/designer/options_panel.phtml:178
+#: templates/table/search/options_zoom.phtml:12
+#: templates/table/search/rows_zoom.phtml:26
 msgid "None"
 msgstr ""
 
@@ -1606,8 +1610,8 @@ msgstr ""
 
 #: js/messages.php:270 libraries/Menu.class.php:352
 #: libraries/Menu.class.php:455 libraries/Menu.class.php:582
-#: libraries/Util.class.php:4317 libraries/Util.class.php:4332
-#: libraries/Util.class.php:4349 libraries/config/messages.inc.php:258
+#: libraries/Util.class.php:4323 libraries/Util.class.php:4338
+#: libraries/Util.class.php:4355 libraries/config/messages.inc.php:258
 #: libraries/display_import.lib.php:105
 #: libraries/server_status_monitor.lib.php:318 prefs_manage.php:238
 #: setup/frames/menu.inc.php:26
@@ -1667,13 +1671,13 @@ msgid "Formatting SQL..."
 msgstr ""
 
 #: js/messages.php:293 libraries/server_variables.lib.php:157
-#: templates/designer/aggregate_query_panel.phtml:63
-#: templates/designer/delete_relation_panel.phtml:28
-#: templates/designer/having_query_panel.phtml:117
-#: templates/designer/new_relation_panel.phtml:88
-#: templates/designer/options_panel.phtml:253
-#: templates/designer/rename_to_panel.phtml:45
-#: templates/designer/where_query_panel.phtml:83
+#: templates/database/designer/aggregate_query_panel.phtml:63
+#: templates/database/designer/delete_relation_panel.phtml:28
+#: templates/database/designer/having_query_panel.phtml:117
+#: templates/database/designer/new_relation_panel.phtml:88
+#: templates/database/designer/options_panel.phtml:253
+#: templates/database/designer/rename_to_panel.phtml:45
+#: templates/database/designer/where_query_panel.phtml:83
 msgid "Cancel"
 msgstr ""
 
@@ -1681,7 +1685,7 @@ msgstr ""
 msgid "Page-related settings"
 msgstr ""
 
-#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:402
+#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:413
 msgid "Apply"
 msgstr ""
 
@@ -1716,8 +1720,8 @@ msgstr ""
 msgid "Error text: %s"
 msgstr ""
 
-#: js/messages.php:307 libraries/db_common.inc.php:68
-#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:450
+#: js/messages.php:307 libraries/db_common.inc.php:69
+#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:461
 msgid "No databases selected."
 msgstr ""
 
@@ -1729,12 +1733,13 @@ msgstr ""
 msgid "Adding Primary Key"
 msgstr ""
 
-#: js/messages.php:310 templates/designer/aggregate_query_panel.phtml:59
-#: templates/designer/having_query_panel.phtml:113
-#: templates/designer/new_relation_panel.phtml:87
-#: templates/designer/options_panel.phtml:252
-#: templates/designer/rename_to_panel.phtml:41
-#: templates/designer/where_query_panel.phtml:82
+#: js/messages.php:310
+#: templates/database/designer/aggregate_query_panel.phtml:59
+#: templates/database/designer/having_query_panel.phtml:113
+#: templates/database/designer/new_relation_panel.phtml:87
+#: templates/database/designer/options_panel.phtml:252
+#: templates/database/designer/rename_to_panel.phtml:41
+#: templates/database/designer/where_query_panel.phtml:82
 msgid "OK"
 msgstr ""
 
@@ -1754,7 +1759,7 @@ msgstr ""
 msgid "Changing Charset"
 msgstr ""
 
-#: js/messages.php:320 libraries/Util.class.php:3217
+#: js/messages.php:320 libraries/Util.class.php:3223
 msgid "Enable foreign key checks"
 msgstr ""
 
@@ -1789,20 +1794,21 @@ msgstr ""
 #: js/messages.php:334 libraries/DisplayResults.class.php:4834
 #: libraries/DisplayResults.class.php:5092 libraries/Menu.class.php:344
 #: libraries/Menu.class.php:446 libraries/Menu.class.php:578
-#: libraries/Util.class.php:3636 libraries/Util.class.php:3637
-#: libraries/Util.class.php:4316 libraries/Util.class.php:4331
-#: libraries/Util.class.php:4348 libraries/config/messages.inc.php:252
+#: libraries/Util.class.php:3642 libraries/Util.class.php:3643
+#: libraries/Util.class.php:4322 libraries/Util.class.php:4337
+#: libraries/Util.class.php:4354 libraries/config/messages.inc.php:252
 #: libraries/display_export.lib.php:173 libraries/rte/rte_list.lib.php:146
 #: libraries/server_privileges.lib.php:2211
 #: libraries/server_privileges.lib.php:2290
 #: libraries/server_privileges.lib.php:2632
 #: libraries/server_privileges.lib.php:3356
 #: libraries/server_status_monitor.lib.php:322 prefs_manage.php:303
-#: setup/frames/menu.inc.php:27 templates/structure/check_all_tables.phtml:11
+#: setup/frames/menu.inc.php:27
+#: templates/database/structure/check_all_tables.phtml:11
 msgid "Export"
 msgstr ""
 
-#: js/messages.php:337 libraries/rte/rte_routines.lib.php:652
+#: js/messages.php:337 libraries/rte/rte_routines.lib.php:743
 msgid "ENUM/SET editor"
 msgstr ""
 
@@ -1841,7 +1847,7 @@ msgstr ""
 #: libraries/Console.class.php:214 libraries/DisplayResults.class.php:3474
 #: libraries/DisplayResults.class.php:4818 libraries/Index.class.php:723
 #: libraries/Util.class.php:706 libraries/Util.class.php:1202
-#: libraries/Util.class.php:3634 libraries/Util.class.php:3635
+#: libraries/Util.class.php:3640 libraries/Util.class.php:3641
 #: libraries/central_columns.lib.php:851
 #: libraries/central_columns.lib.php:1193
 #: libraries/config/messages.inc.php:892
@@ -1859,7 +1865,7 @@ msgstr "Bewerkn"
 #: libraries/server_user_groups.lib.php:129
 #: libraries/sql_query_form.lib.php:416 libraries/tracking.lib.php:477
 #: setup/frames/index.inc.php:183 setup/frames/index.inc.php:291
-#: templates/designer/delete_relation_panel.phtml:27
+#: templates/database/designer/delete_relation_panel.phtml:27
 msgid "Delete"
 msgstr ""
 
@@ -2020,11 +2026,11 @@ msgid "No dependencies selected!"
 msgstr ""
 
 #: js/messages.php:394 libraries/central_columns.lib.php:1214
-#: libraries/insert_edit.lib.php:1458 libraries/server_variables.lib.php:155
+#: libraries/insert_edit.lib.php:1456 libraries/server_variables.lib.php:155
 #: setup/frames/config.inc.php:42 setup/frames/index.inc.php:279
 #: templates/columns_definitions/column_definitions_form.phtml:165
-#: templates/gis_visualization/gis_visualization.phtml:48
-#: templates/tbl_relation/common_form.phtml:107
+#: templates/table/gis_visualization/gis_visualization.phtml:48
+#: templates/table/relation/common_form.phtml:107
 msgid "Save"
 msgstr ""
 
@@ -2101,8 +2107,8 @@ msgid "Data point content"
 msgstr ""
 
 #: js/messages.php:430 js/messages.php:562 js/messages.php:579
-#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2573
-#: templates/index_form.phtml:154 templates/index_form.phtml:194
+#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2571
+#: templates/table/index_form.phtml:154 templates/table/index_form.phtml:194
 msgid "Ignore"
 msgstr ""
 
@@ -2161,8 +2167,8 @@ msgstr ""
 msgid "Please select the primary key or a unique key!"
 msgstr ""
 
-#: js/messages.php:457 templates/designer/side_menu.phtml:91
-#: templates/designer/side_menu.phtml:94
+#: js/messages.php:457 templates/database/designer/side_menu.phtml:91
+#: templates/database/designer/side_menu.phtml:94
 msgid "Choose column to display"
 msgstr ""
 
@@ -2176,18 +2182,18 @@ msgstr ""
 msgid "Page name"
 msgstr ""
 
-#: js/messages.php:463 templates/designer/side_menu.phtml:56
-#: templates/designer/side_menu.phtml:59
+#: js/messages.php:463 templates/database/designer/side_menu.phtml:56
+#: templates/database/designer/side_menu.phtml:59
 msgid "Save page"
 msgstr ""
 
-#: js/messages.php:464 templates/designer/side_menu.phtml:63
-#: templates/designer/side_menu.phtml:66
+#: js/messages.php:464 templates/database/designer/side_menu.phtml:63
+#: templates/database/designer/side_menu.phtml:66
 msgid "Save page as"
 msgstr ""
 
-#: js/messages.php:465 templates/designer/side_menu.phtml:49
-#: templates/designer/side_menu.phtml:52
+#: js/messages.php:465 templates/database/designer/side_menu.phtml:49
+#: templates/database/designer/side_menu.phtml:52
 msgid "Open page"
 msgstr ""
 
@@ -2195,7 +2201,7 @@ msgstr ""
 msgid "Delete page"
 msgstr ""
 
-#: js/messages.php:467 templates/designer/side_menu.phtml:10
+#: js/messages.php:467 templates/database/designer/side_menu.phtml:10
 msgid "Untitled"
 msgstr ""
 
@@ -2306,7 +2312,7 @@ msgstr ""
 msgid "cancel"
 msgstr ""
 
-#: js/messages.php:499 libraries/server_status.lib.php:271
+#: js/messages.php:499 libraries/server_status.lib.php:280
 msgid "Aborted"
 msgstr ""
 
@@ -2856,7 +2862,7 @@ msgstr ""
 
 #: js/messages.php:793 libraries/Message.class.php:199
 #: libraries/Util.class.php:654 libraries/core.lib.php:245
-#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1172
+#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1170
 #: tbl_operations.php:229 view_operations.php:63
 msgid "Error"
 msgstr ""
@@ -2915,8 +2921,8 @@ msgstr ""
 msgid "per minute"
 msgstr ""
 
-#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:143
-#: libraries/server_status.lib.php:228
+#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:152
+#: libraries/server_status.lib.php:237
 #: libraries/server_status_queries.lib.php:98
 msgid "per hour"
 msgstr ""
@@ -2934,7 +2940,7 @@ msgstr ""
 msgid "Wrong permissions on configuration file, should not be world writable!"
 msgstr ""
 
-#: libraries/Config.class.php:1799
+#: libraries/Config.class.php:1801
 msgid "Font size"
 msgstr ""
 
@@ -2962,10 +2968,10 @@ msgstr ""
 #: libraries/server_privileges.lib.php:2890
 #: libraries/server_privileges.lib.php:3144
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4332
+#: libraries/server_privileges.lib.php:4358
 #: libraries/server_status_processes.lib.php:80
-#: templates/tbl_relation/foreign_key_row.phtml:165
-#: templates/tbl_relation/internal_relational_row.phtml:55
+#: templates/table/relation/foreign_key_row.phtml:165
+#: templates/table/relation/internal_relational_row.phtml:55
 msgid "Database"
 msgstr ""
 
@@ -3058,11 +3064,11 @@ msgstr "Geschiedenisse"
 #: libraries/plugins/import/ImportMediawiki.class.php:60
 #: libraries/plugins/import/ImportOds.class.php:59
 #: libraries/plugins/import/ImportShp.class.php:57
-#: libraries/plugins/import/ImportSql.class.php:148
+#: libraries/plugins/import/ImportSql.class.php:51
 #: libraries/plugins/import/ImportXml.class.php:58
-#: libraries/rte/rte_routines.lib.php:833 templates/index_form.phtml:49
-#: templates/structure/row_stats_table.phtml:20
-#: templates/table/options.phtml:2
+#: libraries/rte/rte_routines.lib.php:924 templates/table/index_form.phtml:49
+#: templates/table/search/options.phtml:2
+#: templates/table/structure/row_stats_table.phtml:20
 msgid "Options"
 msgstr ""
 
@@ -3095,7 +3101,8 @@ msgstr ""
 msgid "Order:"
 msgstr ""
 
-#: libraries/Console.class.php:289 templates/table/replace_preview.phtml:17
+#: libraries/Console.class.php:289
+#: templates/table/search/replace_preview.phtml:17
 msgid "Count"
 msgstr ""
 
@@ -3190,9 +3197,9 @@ msgstr ""
 #: libraries/operations.lib.php:794 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:191
-#: templates/structure/sortable_header.phtml:21
-#: templates/structure/sortable_header.phtml:38
-#: templates/table/options.phtml:68
+#: templates/database/structure/sortable_header.phtml:21
+#: templates/database/structure/sortable_header.phtml:38
+#: templates/table/search/options.phtml:68
 msgid "Ascending"
 msgstr ""
 
@@ -3202,13 +3209,14 @@ msgstr ""
 #: libraries/operations.lib.php:797 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:188
-#: templates/structure/sortable_header.phtml:26
-#: templates/structure/sortable_header.phtml:43
-#: templates/table/options.phtml:69
+#: templates/database/structure/sortable_header.phtml:26
+#: templates/database/structure/sortable_header.phtml:43
+#: templates/table/search/options.phtml:69
 msgid "Descending"
 msgstr ""
 
-#: libraries/DBQbe.class.php:467 templates/table/search_and_replace.phtml:6
+#: libraries/DBQbe.class.php:467
+#: templates/table/search/search_and_replace.phtml:6
 msgid "Column:"
 msgstr ""
 
@@ -3363,12 +3371,12 @@ msgstr[0] ""
 msgstr[1] ""
 
 #: libraries/DbSearch.class.php:354 libraries/Menu.class.php:311
-#: libraries/Util.class.php:3337 libraries/Util.class.php:3347
-#: libraries/Util.class.php:3623 libraries/Util.class.php:3624
-#: libraries/Util.class.php:4343 libraries/config.values.php:43
+#: libraries/Util.class.php:3343 libraries/Util.class.php:3353
+#: libraries/Util.class.php:3629 libraries/Util.class.php:3630
+#: libraries/Util.class.php:4349 libraries/config.values.php:43
 #: libraries/config.values.php:51 libraries/config.values.php:119
 #: libraries/navigation/Nodes/Node_Table.class.php:295
-#: templates/structure/check_all_table_column.phtml:5
+#: templates/table/structure/check_all_table_column.phtml:5
 msgid "Browse"
 msgstr ""
 
@@ -3385,7 +3393,8 @@ msgstr ""
 msgid "Words or values to search for (wildcard: \"%\"):"
 msgstr ""
 
-#: libraries/DbSearch.class.php:401 templates/table/search_and_replace.phtml:1
+#: libraries/DbSearch.class.php:401
+#: templates/table/search/search_and_replace.phtml:1
 msgid "Find:"
 msgstr ""
 
@@ -3429,28 +3438,28 @@ msgstr ""
 msgid "Search this table"
 msgstr ""
 
-#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2532
-#: libraries/Util.class.php:2535
+#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2538
+#: libraries/Util.class.php:2541
 msgctxt "First page"
 msgid "Begin"
 msgstr ""
 
-#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2533
-#: libraries/Util.class.php:2536 libraries/server_bin_log.lib.php:170
+#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2539
+#: libraries/Util.class.php:2542 libraries/server_bin_log.lib.php:170
 #: libraries/server_bin_log.lib.php:172
 msgctxt "Previous page"
 msgid "Previous"
 msgstr ""
 
-#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2564
-#: libraries/Util.class.php:2574 libraries/server_bin_log.lib.php:204
+#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2570
+#: libraries/Util.class.php:2580 libraries/server_bin_log.lib.php:204
 #: libraries/server_bin_log.lib.php:206
 msgctxt "Next page"
 msgid "Next"
 msgstr ""
 
-#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2565
-#: libraries/Util.class.php:2575
+#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2571
+#: libraries/Util.class.php:2581
 msgctxt "Last page"
 msgid "End"
 msgstr ""
@@ -3523,15 +3532,15 @@ msgid "May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]."
 msgstr ""
 
 #: libraries/DisplayResults.class.php:4332 libraries/Message.class.php:180
-#: libraries/controllers/TableRelationController.class.php:258
+#: libraries/controllers/TableRelationController.class.php:259
 #: libraries/controllers/TableSearchController.class.php:655
-#: libraries/rte/rte_routines.lib.php:1332 libraries/sql_query_form.lib.php:89
+#: libraries/rte/rte_routines.lib.php:1423 libraries/sql_query_form.lib.php:89
 #: tbl_operations.php:227 tbl_row_action.php:138 view_operations.php:62
 msgid "Your SQL query has been executed successfully."
 msgstr ""
 
 #: libraries/DisplayResults.class.php:4660
-#: libraries/controllers/StructureController.class.php:629
+#: libraries/controllers/DatabaseStructureController.class.php:564
 #, php-format
 msgid ""
 "This view has at least this number of rows. Please refer to %sdocumentation"
@@ -3553,33 +3562,33 @@ msgstr ""
 msgid "%d total"
 msgstr ""
 
-#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1318
+#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1312
 #, php-format
 msgid "Query took %01.4f seconds."
 msgstr ""
 
 #: libraries/DisplayResults.class.php:4807
-#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4767
-#: libraries/Util.class.php:4773 libraries/mult_submits.inc.php:50
-#: templates/structure/check_all_tables.phtml:2
-#: templates/structure/check_all_tables.phtml:9
+#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4773
+#: libraries/Util.class.php:4779 libraries/mult_submits.inc.php:50
+#: templates/database/structure/check_all_tables.phtml:2
+#: templates/database/structure/check_all_tables.phtml:9
 msgid "With selected:"
 msgstr ""
 
 #: libraries/DisplayResults.class.php:4811
-#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4769
-#: libraries/Util.class.php:4770 libraries/server_privileges.lib.php:1174
+#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4775
+#: libraries/Util.class.php:4776 libraries/server_privileges.lib.php:1174
 #: libraries/server_privileges.lib.php:1175
 #: libraries/server_privileges.lib.php:1387
 #: libraries/server_user_groups.lib.php:231
-#: templates/structure/check_all_tables.phtml:3
-#: templates/structure/check_all_tables.phtml:4
+#: templates/database/structure/check_all_tables.phtml:3
+#: templates/database/structure/check_all_tables.phtml:4
 msgid "Check All"
 msgstr ""
 
 #: libraries/DisplayResults.class.php:4985 libraries/Header.class.php:383
-#: templates/structure/optional_action_links.phtml:1
-#: templates/structure/print_view_data_dictionary_link.phtml:3
+#: templates/database/structure/print_view_data_dictionary_link.phtml:3
+#: templates/table/structure/optional_action_links.phtml:1
 msgid "Print view"
 msgstr ""
 
@@ -3587,7 +3596,8 @@ msgstr ""
 msgid "Query results operations"
 msgstr ""
 
-#: libraries/DisplayResults.class.php:5105 templates/tbl_chart.phtml:12
+#: libraries/DisplayResults.class.php:5105
+#: templates/table/chart/tbl_chart.phtml:12
 msgid "Display chart"
 msgstr ""
 
@@ -3676,7 +3686,7 @@ msgid "Click on the bar to scroll to top of page"
 msgstr ""
 
 #: libraries/Header.class.php:749
-#: libraries/plugins/auth/AuthenticationCookie.class.php:152
+#: libraries/plugins/auth/AuthenticationCookie.class.php:140
 msgid "Javascript must be enabled past this point!"
 msgstr ""
 
@@ -3698,11 +3708,11 @@ msgid "Keyname"
 msgstr ""
 
 #: libraries/Index.class.php:697
-#: libraries/controllers/StructureController.class.php:1962
-#: libraries/controllers/StructureController.class.php:1967
+#: libraries/controllers/TableStructureController.class.php:953
+#: libraries/controllers/TableStructureController.class.php:958
 #: libraries/tracking.lib.php:973
 #: templates/columns_definitions/column_indexes.phtml:11
-#: templates/structure/check_all_table_column.phtml:26
+#: templates/table/structure/check_all_table_column.phtml:26
 msgid "Unique"
 msgstr ""
 
@@ -3721,16 +3731,17 @@ msgstr ""
 #: libraries/server_collations.lib.php:35 libraries/tracking.lib.php:881
 #: libraries/tracking.lib.php:977
 #: templates/columns_definitions/table_fields_definitions.phtml:33
-#: templates/structure/row_stats_table.phtml:31
-#: templates/structure/table_header.phtml:55
-#: templates/structure/table_structure_header.phtml:7
-#: templates/table/table_header.phtml:8
+#: templates/database/structure/table_header.phtml:55
+#: templates/table/search/table_header.phtml:8
+#: templates/table/structure/row_stats_table.phtml:31
+#: templates/table/structure/table_structure_header.phtml:7
 msgid "Collation"
 msgstr ""
 
 #: libraries/Index.class.php:703 libraries/rte/rte_events.lib.php:496
-#: libraries/rte/rte_routines.lib.php:956 libraries/tracking.lib.php:885
-#: libraries/tracking.lib.php:979 templates/structure/table_header.phtml:84
+#: libraries/rte/rte_routines.lib.php:1047 libraries/tracking.lib.php:885
+#: libraries/tracking.lib.php:979
+#: templates/database/structure/table_header.phtml:84
 msgid "Comment"
 msgstr ""
 
@@ -3743,15 +3754,15 @@ msgstr ""
 msgid "Index %s has been dropped."
 msgstr ""
 
-#: libraries/Index.class.php:757 libraries/Util.class.php:3630
-#: libraries/Util.class.php:3631
-#: libraries/controllers/StructureController.class.php:1958
-#: libraries/controllers/StructureController.class.php:1959
+#: libraries/Index.class.php:757 libraries/Util.class.php:3636
+#: libraries/Util.class.php:3637
+#: libraries/controllers/TableStructureController.class.php:949
+#: libraries/controllers/TableStructureController.class.php:950
 #: libraries/operations.lib.php:1607 libraries/rte/rte_list.lib.php:150
 #: libraries/server_databases.lib.php:146
-#: templates/structure/check_all_table_column.phtml:15
-#: templates/structure/check_all_tables.phtml:16
-#: templates/tbl_relation/foreign_key_row.phtml:93
+#: templates/database/structure/check_all_tables.phtml:16
+#: templates/table/relation/foreign_key_row.phtml:93
+#: templates/table/structure/check_all_table_column.phtml:15
 msgid "Drop"
 msgstr ""
 
@@ -3780,16 +3791,16 @@ msgstr ""
 #: libraries/Menu.class.php:248
 #: libraries/navigation/Nodes/Node_View.class.php:32
 #: libraries/tbl_info.inc.php:63
-#: templates/structure/structure_table_row.phtml:97
-#: templates/structure/structure_table_row.phtml:159
+#: templates/database/structure/structure_table_row.phtml:97
+#: templates/database/structure/structure_table_row.phtml:159
 msgid "View"
 msgstr ""
 
 #: libraries/Menu.class.php:325 libraries/Menu.class.php:429
-#: libraries/Menu.class.php:548 libraries/Util.class.php:3334
-#: libraries/Util.class.php:3344 libraries/Util.class.php:3350
-#: libraries/Util.class.php:4313 libraries/Util.class.php:4328
-#: libraries/Util.class.php:4345 libraries/config.values.php:40
+#: libraries/Menu.class.php:548 libraries/Util.class.php:3340
+#: libraries/Util.class.php:3350 libraries/Util.class.php:3356
+#: libraries/Util.class.php:4319 libraries/Util.class.php:4334
+#: libraries/Util.class.php:4351 libraries/config.values.php:40
 #: libraries/config.values.php:48 libraries/config.values.php:110
 #: libraries/config.values.php:116 libraries/config/messages.inc.php:321
 #: libraries/navigation/Nodes/Node_Table.class.php:292
@@ -3797,19 +3808,19 @@ msgid "SQL"
 msgstr "SQL"
 
 #: libraries/Menu.class.php:328 libraries/Menu.class.php:432
-#: libraries/Util.class.php:3335 libraries/Util.class.php:3345
-#: libraries/Util.class.php:3351 libraries/Util.class.php:3625
-#: libraries/Util.class.php:3626 libraries/Util.class.php:4329
-#: libraries/Util.class.php:4346 libraries/config.values.php:41
+#: libraries/Util.class.php:3341 libraries/Util.class.php:3351
+#: libraries/Util.class.php:3357 libraries/Util.class.php:3631
+#: libraries/Util.class.php:3632 libraries/Util.class.php:4335
+#: libraries/Util.class.php:4352 libraries/config.values.php:41
 #: libraries/config.values.php:49 libraries/config.values.php:111
 #: libraries/config.values.php:117
 #: libraries/navigation/Nodes/Node_Table.class.php:286
 msgid "Search"
 msgstr ""
 
-#: libraries/Menu.class.php:338 libraries/Util.class.php:3336
-#: libraries/Util.class.php:3346 libraries/Util.class.php:3627
-#: libraries/Util.class.php:3628 libraries/Util.class.php:4347
+#: libraries/Menu.class.php:338 libraries/Util.class.php:3342
+#: libraries/Util.class.php:3352 libraries/Util.class.php:3633
+#: libraries/Util.class.php:3634 libraries/Util.class.php:4353
 #: libraries/config.values.php:42 libraries/config.values.php:50
 #: libraries/config.values.php:118
 #: libraries/navigation/Nodes/Node_Table.class.php:289
@@ -3818,30 +3829,30 @@ msgid "Insert"
 msgstr ""
 
 #: libraries/Menu.class.php:362 libraries/Menu.class.php:467
-#: libraries/Util.class.php:4334 libraries/Util.class.php:4350
+#: libraries/Util.class.php:4340 libraries/Util.class.php:4356
 #: libraries/config.values.php:106 libraries/server_common.lib.php:51
 #: libraries/server_privileges.lib.php:2370
 #: libraries/server_privileges.lib.php:3158
-#: libraries/server_privileges.lib.php:4221
+#: libraries/server_privileges.lib.php:4247
 msgid "Privileges"
 msgstr ""
 
 #: libraries/Menu.class.php:371 libraries/Menu.class.php:379
-#: libraries/Menu.class.php:459 libraries/Util.class.php:3338
-#: libraries/Util.class.php:3352 libraries/Util.class.php:4333
-#: libraries/Util.class.php:4351 libraries/config.values.php:112
+#: libraries/Menu.class.php:459 libraries/Util.class.php:3344
+#: libraries/Util.class.php:3358 libraries/Util.class.php:4339
+#: libraries/Util.class.php:4357 libraries/config.values.php:112
 #: view_operations.php:92
 msgid "Operations"
 msgstr ""
 
 #: libraries/Menu.class.php:384 libraries/Menu.class.php:492
-#: libraries/Util.class.php:4338 libraries/Util.class.php:4352
+#: libraries/Util.class.php:4344 libraries/Util.class.php:4358
 #: libraries/relation.lib.php:255
 msgid "Tracking"
 msgstr ""
 
 #: libraries/Menu.class.php:397 libraries/Menu.class.php:486
-#: libraries/Util.class.php:4337 libraries/Util.class.php:4353
+#: libraries/Util.class.php:4343 libraries/Util.class.php:4359
 #: libraries/navigation/Nodes/Node_Trigger_Container.class.php:24
 #: libraries/plugins/export/ExportHtmlword.class.php:557
 #: libraries/plugins/export/ExportOdt.class.php:685
@@ -3858,16 +3869,16 @@ msgstr ""
 msgid "Database seems to be empty!"
 msgstr ""
 
-#: libraries/Menu.class.php:439 libraries/Util.class.php:4330
+#: libraries/Menu.class.php:439 libraries/Util.class.php:4336
 msgid "Query"
 msgstr ""
 
-#: libraries/Menu.class.php:472 libraries/Util.class.php:4335
+#: libraries/Menu.class.php:472 libraries/Util.class.php:4341
 #: libraries/rte/rte_words.lib.php:36
 msgid "Routines"
 msgstr ""
 
-#: libraries/Menu.class.php:479 libraries/Util.class.php:4336
+#: libraries/Menu.class.php:479 libraries/Util.class.php:4342
 #: libraries/navigation/Nodes/Node_Event_Container.class.php:26
 #: libraries/plugins/export/ExportSql.class.php:940
 #: libraries/plugins/export/ExportXml.class.php:107
@@ -3875,20 +3886,20 @@ msgstr ""
 msgid "Events"
 msgstr ""
 
-#: libraries/Menu.class.php:498 libraries/Util.class.php:4339
+#: libraries/Menu.class.php:498 libraries/Util.class.php:4345
 msgid "Designer"
 msgstr ""
 
-#: libraries/Menu.class.php:507 libraries/Util.class.php:4340
-#: templates/structure/check_all_tables.phtml:35
+#: libraries/Menu.class.php:507 libraries/Util.class.php:4346
+#: templates/database/structure/check_all_tables.phtml:35
 msgid "Central columns"
 msgstr ""
 
-#: libraries/Menu.class.php:544 libraries/Util.class.php:4312
+#: libraries/Menu.class.php:544 libraries/Util.class.php:4318
 #: libraries/config.values.php:103 libraries/config/messages.inc.php:266
 #: libraries/config/messages.inc.php:341
 #: libraries/navigation/NavigationTree.class.php:1239
-#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4332
+#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4358
 msgid "Databases"
 msgstr ""
 
@@ -3897,34 +3908,34 @@ msgid "User accounts"
 msgstr ""
 
 #: libraries/Menu.class.php:595 libraries/ServerStatusData.class.php:121
-#: libraries/Util.class.php:4319 libraries/server_common.lib.php:36
+#: libraries/Util.class.php:4325 libraries/server_common.lib.php:36
 msgid "Binary log"
 msgstr ""
 
 #: libraries/Menu.class.php:601 libraries/ServerStatusData.class.php:126
-#: libraries/Util.class.php:4320 libraries/server_common.lib.php:42
-#: templates/structure/body_for_table_summary.phtml:10
-#: templates/structure/table_header.phtml:27
+#: libraries/Util.class.php:4326 libraries/server_common.lib.php:42
+#: templates/database/structure/body_for_table_summary.phtml:10
+#: templates/database/structure/table_header.phtml:27
 msgid "Replication"
 msgstr ""
 
 #: libraries/Menu.class.php:606 libraries/ServerStatusData.class.php:193
-#: libraries/Util.class.php:4321 libraries/config.values.php:105
+#: libraries/Util.class.php:4327 libraries/config.values.php:105
 #: libraries/server_engines.lib.php:108 libraries/server_engines.lib.php:112
 #: libraries/sql_query_form.lib.php:421
 msgid "Variables"
 msgstr ""
 
-#: libraries/Menu.class.php:610 libraries/Util.class.php:4322
+#: libraries/Menu.class.php:610 libraries/Util.class.php:4328
 msgid "Charsets"
 msgstr ""
 
-#: libraries/Menu.class.php:615 libraries/Util.class.php:4323
+#: libraries/Menu.class.php:615 libraries/Util.class.php:4329
 #: libraries/server_common.lib.php:33 libraries/server_plugins.lib.php:27
 msgid "Plugins"
 msgstr ""
 
-#: libraries/Menu.class.php:626 libraries/Util.class.php:4324
+#: libraries/Menu.class.php:626 libraries/Util.class.php:4330
 msgid "Engines"
 msgstr ""
 
@@ -3949,7 +3960,7 @@ msgid_plural "%1$d rows inserted."
 msgstr[0] ""
 msgstr[1] ""
 
-#: libraries/PDF.class.php:70 libraries/Util.class.php:2521
+#: libraries/PDF.class.php:70 libraries/Util.class.php:2527
 #: libraries/browse_foreigners.lib.php:327
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:865
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:890
@@ -3970,7 +3981,7 @@ msgid "Could not save favorite table!"
 msgstr ""
 
 #: libraries/RecentFavoriteTable.class.php:212
-#: templates/structure/favorite_anchor.phtml:12
+#: templates/database/structure/favorite_anchor.phtml:12
 msgid "Remove from Favorites"
 msgstr ""
 
@@ -4135,7 +4146,7 @@ msgid ""
 msgstr ""
 
 #: libraries/StorageEngine.class.php:373
-#: templates/structure/body_for_table_summary.phtml:50
+#: templates/database/structure/body_for_table_summary.phtml:50
 #, php-format
 msgid "%s is the default storage engine on this MySQL server."
 msgstr ""
@@ -4547,10 +4558,10 @@ msgstr ""
 
 #: libraries/Util.class.php:726 libraries/rte/rte_events.lib.php:110
 #: libraries/rte/rte_events.lib.php:119 libraries/rte/rte_events.lib.php:150
-#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:153
-#: libraries/rte/rte_routines.lib.php:162
-#: libraries/rte/rte_routines.lib.php:235
-#: libraries/rte/rte_routines.lib.php:1366
+#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:223
+#: libraries/rte/rte_routines.lib.php:250
+#: libraries/rte/rte_routines.lib.php:372
+#: libraries/rte/rte_routines.lib.php:1457
 #: libraries/rte/rte_triggers.lib.php:86 libraries/rte/rte_triggers.lib.php:95
 #: libraries/rte/rte_triggers.lib.php:127
 msgid "MySQL said: "
@@ -4594,75 +4605,78 @@ msgstr "zu"
 msgid "%B %d, %Y at %I:%M %p"
 msgstr ""
 
-#: libraries/Util.class.php:2019
+#: libraries/Util.class.php:2025
 #, php-format
 msgid "%s days, %s hours, %s minutes and %s seconds"
 msgstr "%s daagn, %s eurn, %s menuutn and %s secondn"
 
-#: libraries/Util.class.php:2112
+#: libraries/Util.class.php:2118
 msgid "Missing parameter:"
 msgstr ""
 
-#: libraries/Util.class.php:2645
+#: libraries/Util.class.php:2651
 #, php-format
 msgid "Jump to database \"%s\"."
 msgstr ""
 
-#: libraries/Util.class.php:2670
+#: libraries/Util.class.php:2676
 #, php-format
 msgid "The %s functionality is affected by a known bug, see %s"
 msgstr ""
 
-#: libraries/Util.class.php:2881
+#: libraries/Util.class.php:2887
 msgid "Click to toggle"
 msgstr ""
 
-#: libraries/Util.class.php:3542 prefs_manage.php:248
+#: libraries/Util.class.php:3548 prefs_manage.php:248
 msgid "Browse your computer:"
 msgstr ""
 
-#: libraries/Util.class.php:3567
+#: libraries/Util.class.php:3573
 #, php-format
 msgid "Select from the web server upload directory <b>%s</b>:"
 msgstr ""
 
-#: libraries/Util.class.php:3596 libraries/insert_edit.lib.php:1173
+#: libraries/Util.class.php:3602 libraries/insert_edit.lib.php:1171
 msgid "The directory you set for upload work cannot be reached."
 msgstr ""
 
-#: libraries/Util.class.php:3607
+#: libraries/Util.class.php:3613
 msgid "There are no files to upload!"
 msgstr ""
 
-#: libraries/Util.class.php:3632 libraries/Util.class.php:3633
-#: templates/structure/check_all_tables.phtml:15
+#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: templates/database/structure/check_all_tables.phtml:15
 msgid "Empty"
 msgstr ""
 
-#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: libraries/Util.class.php:3644 libraries/Util.class.php:3645
 msgid "Execute"
 msgstr ""
 
-#: libraries/Util.class.php:4152
+#: libraries/Util.class.php:4158
 msgid "Print"
 msgstr ""
 
-#: libraries/Util.class.php:4257 templates/structure/row_stats_table.phtml:80
-#: templates/structure/table_header.phtml:95
+#: libraries/Util.class.php:4263
+#: templates/database/structure/table_header.phtml:95
+#: templates/table/structure/row_stats_table.phtml:80
 msgid "Creation"
 msgstr ""
 
-#: libraries/Util.class.php:4263 templates/structure/row_stats_table.phtml:87
-#: templates/structure/table_header.phtml:106
+#: libraries/Util.class.php:4269
+#: templates/database/structure/table_header.phtml:106
+#: templates/table/structure/row_stats_table.phtml:87
 msgid "Last update"
 msgstr ""
 
-#: libraries/Util.class.php:4269 templates/structure/row_stats_table.phtml:94
-#: templates/structure/table_header.phtml:117
+#: libraries/Util.class.php:4275
+#: templates/database/structure/table_header.phtml:117
+#: templates/table/structure/row_stats_table.phtml:94
 msgid "Last check"
 msgstr ""
 
-#: libraries/Util.class.php:4315
+#: libraries/Util.class.php:4321
 msgid "Users"
 msgstr "Gebrukers"
 
@@ -4683,16 +4697,16 @@ msgid "Use this value"
 msgstr ""
 
 #: libraries/build_html_for_db.lib.php:33 libraries/import.lib.php:193
-#: templates/structure/actions_in_table_structure.phtml:113
-#: templates/structure/row_stats_table.phtml:42
-#: templates/structure/table_header.phtml:36
+#: templates/database/structure/table_header.phtml:36
+#: templates/table/structure/actions_in_table_structure.phtml:113
+#: templates/table/structure/row_stats_table.phtml:42
 msgid "Rows"
 msgstr ""
 
 #: libraries/build_html_for_db.lib.php:48 libraries/engines/innodb.lib.php:171
-#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:186
-#: libraries/server_status.lib.php:298
-#: templates/structure/display_table_stats.phtml:40
+#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:195
+#: libraries/server_status.lib.php:307
+#: templates/table/structure/display_table_stats.phtml:40
 msgid "Total"
 msgstr ""
 
@@ -4701,10 +4715,12 @@ msgid "Jump to database"
 msgstr ""
 
 #: libraries/build_html_for_db.lib.php:146
+#: templates/database/structure/structure_table_row.phtml:15
 msgid "Not replicated"
 msgstr ""
 
 #: libraries/build_html_for_db.lib.php:158
+#: templates/database/structure/structure_table_row.phtml:16
 msgid "Replicated"
 msgstr ""
 
@@ -4757,17 +4773,17 @@ msgstr ""
 #: libraries/plugins/export/ExportTexytext.class.php:425
 #: libraries/plugins/export/PMA_ExportPdf.class.php:307
 #: libraries/rte/rte_list.lib.php:73 libraries/rte/rte_list.lib.php:85
-#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:830
-#: libraries/rte/rte_routines.lib.php:1492 setup/frames/index.inc.php:162
+#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:921
+#: libraries/rte/rte_routines.lib.php:1583 setup/frames/index.inc.php:162
 #: templates/columns_definitions/table_fields_definitions.phtml:8
-#: templates/structure/table_structure_header.phtml:5
-#: templates/table/create_table.phtml:11
+#: templates/database/create_table.phtml:11
+#: templates/table/structure/table_structure_header.phtml:5
 msgid "Name"
 msgstr ""
 
 #: libraries/central_columns.lib.php:699
 #: libraries/central_columns.lib.php:1381
-#: libraries/rte/rte_routines.lib.php:832
+#: libraries/rte/rte_routines.lib.php:923
 #: templates/columns_definitions/table_fields_definitions.phtml:14
 msgid "Length/Values"
 msgstr ""
@@ -4786,7 +4802,7 @@ msgid "Select a table"
 msgstr ""
 
 #: libraries/central_columns.lib.php:804
-#: templates/structure/add_column.phtml:4
+#: templates/table/structure/add_column.phtml:4
 msgid "Add column"
 msgstr ""
 
@@ -4802,7 +4818,7 @@ msgstr ""
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1002
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1025
 #: templates/columns_definitions/table_fields_definitions.phtml:36
-#: templates/structure/table_structure_header.phtml:8
+#: templates/table/structure/table_structure_header.phtml:8
 msgid "Attributes"
 msgstr ""
 
@@ -4911,7 +4927,7 @@ msgid "Double click"
 msgstr ""
 
 #: libraries/config.values.php:95 libraries/config.values.php:124
-#: libraries/config/FormDisplay.tpl.php:221 libraries/relation.lib.php:97
+#: libraries/config/FormDisplay.tpl.php:232 libraries/relation.lib.php:97
 #: libraries/relation.lib.php:105
 msgid "Disabled"
 msgstr ""
@@ -5081,21 +5097,21 @@ msgstr ""
 msgid "maximum %s"
 msgstr ""
 
-#: libraries/config/FormDisplay.tpl.php:219
+#: libraries/config/FormDisplay.tpl.php:230
 msgid "This setting is disabled, it will not be applied to your configuration."
 msgstr ""
 
-#: libraries/config/FormDisplay.tpl.php:313
+#: libraries/config/FormDisplay.tpl.php:324
 #, php-format
 msgid "Set value: %s"
 msgstr ""
 
-#: libraries/config/FormDisplay.tpl.php:318
+#: libraries/config/FormDisplay.tpl.php:329
 #: libraries/config/messages.inc.php:610
 msgid "Restore default value"
 msgstr ""
 
-#: libraries/config/FormDisplay.tpl.php:332
+#: libraries/config/FormDisplay.tpl.php:343
 msgid "Allow users to customize this value"
 msgstr ""
 
@@ -5511,7 +5527,7 @@ msgstr ""
 
 #: libraries/config/messages.inc.php:136 libraries/config/messages.inc.php:152
 #: libraries/sql_query_form.lib.php:247
-#: templates/structure/row_stats_table.phtml:7
+#: templates/table/structure/row_stats_table.phtml:7
 msgid "Format"
 msgstr ""
 
@@ -6006,7 +6022,7 @@ msgstr ""
 
 #: libraries/config/messages.inc.php:332
 #: libraries/plugins/export/ExportPdf.class.php:279
-#: templates/structure/secondary_tabs.phtml:8
+#: templates/table/secondary_tabs.phtml:8
 msgid "Table structure"
 msgstr ""
 
@@ -7502,101 +7518,33 @@ msgstr ""
 msgid "OpenDocument Text"
 msgstr ""
 
-#: libraries/controllers/StructureController.class.php:465
+#: libraries/controllers/DatabaseStructureController.class.php:405
 #: tbl_operations.php:382
 #, php-format
 msgid "Table %s has been emptied."
 msgstr ""
 
-#: libraries/controllers/StructureController.class.php:486
+#: libraries/controllers/DatabaseStructureController.class.php:426
 #: tbl_operations.php:400 view_operations.php:119
 #, php-format
 msgid "View %s has been dropped."
 msgstr ""
 
-#: libraries/controllers/StructureController.class.php:487
+#: libraries/controllers/DatabaseStructureController.class.php:427
 #: tbl_operations.php:401
 #, php-format
 msgid "Table %s has been dropped."
 msgstr ""
 
-#: libraries/controllers/StructureController.class.php:797
-#, php-format
-msgid "The name '%s' is a MySQL reserved keyword."
-msgid_plural "The names '%s' are MySQL reserved keywords."
-msgstr[0] ""
-msgstr[1] ""
-
-#: libraries/controllers/StructureController.class.php:875
-msgid "No column selected."
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1049
+#: libraries/controllers/DatabaseStructureController.class.php:733
 msgid "Favorite List is full!"
 msgstr ""
 
-#: libraries/controllers/StructureController.class.php:1272
-msgid "The columns have been moved successfully."
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1535
-#, php-format
-msgid ""
-"Table %1$s has been altered successfully. Privileges have been adjusted."
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1541
-#: libraries/controllers/TableIndexesController.class.php:161
-#: tbl_addfield.php:92
-#, php-format
-msgid "Table %1$s has been altered successfully."
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1588
-#: libraries/tracking.lib.php:1094
-msgid "Query error"
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1806
+#: libraries/controllers/DatabaseStructureController.class.php:947
 #: libraries/mysql_charsets.lib.php:366 libraries/mysql_charsets.lib.php:373
 msgid "unknown"
 msgstr ""
 
-#: libraries/controllers/StructureController.class.php:1957
-#: templates/structure/check_all_table_column.phtml:11
-msgid "Change"
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1961
-#: libraries/controllers/StructureController.class.php:1966
-#: libraries/navigation/Nodes/Node_Index.class.php:30
-#: libraries/tracking.lib.php:926
-#: templates/columns_definitions/column_indexes.phtml:16
-#: templates/columns_definitions/table_fields_definitions.phtml:57
-#: templates/structure/check_all_table_column.phtml:30
-#: templates/structure/display_structure.phtml:79
-#: templates/structure/display_table_stats.phtml:19
-msgid "Index"
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1963
-#: libraries/controllers/StructureController.class.php:1968
-#: templates/columns_definitions/column_indexes.phtml:27
-#: templates/structure/check_all_table_column.phtml:37
-msgid "Spatial"
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1964
-#: libraries/controllers/StructureController.class.php:1969
-#: templates/columns_definitions/column_indexes.phtml:22
-#: templates/structure/check_all_table_column.phtml:47
-msgid "Fulltext"
-msgstr ""
-
-#: libraries/controllers/StructureController.class.php:1970
-msgid "Distinct values"
-msgstr ""
-
 #: libraries/controllers/TableChartController.class.php:82
 #: libraries/controllers/TableGisVisualizationController.class.php:101
 msgid "No SQL query was set to fetch data."
@@ -7610,11 +7558,18 @@ msgstr ""
 msgid "No data to display"
 msgstr ""
 
-#: libraries/controllers/TableRelationController.class.php:217
+#: libraries/controllers/TableIndexesController.class.php:161
+#: libraries/controllers/TableStructureController.class.php:736
+#: tbl_addfield.php:92
+#, php-format
+msgid "Table %1$s has been altered successfully."
+msgstr ""
+
+#: libraries/controllers/TableRelationController.class.php:218
 msgid "Display column was successfully updated."
 msgstr ""
 
-#: libraries/controllers/TableRelationController.class.php:283
+#: libraries/controllers/TableRelationController.class.php:288
 msgid "Internal relations were successfully updated."
 msgstr ""
 
@@ -7627,10 +7582,71 @@ msgid "Zoom search"
 msgstr ""
 
 #: libraries/controllers/TableSearchController.class.php:852
-#: templates/table/selection_form.phtml:59
+#: templates/table/search/selection_form.phtml:59
 msgid "Find and replace"
 msgstr ""
 
+#: libraries/controllers/TableStructureController.class.php:163
+#, php-format
+msgid "The name '%s' is a MySQL reserved keyword."
+msgid_plural "The names '%s' are MySQL reserved keywords."
+msgstr[0] ""
+msgstr[1] ""
+
+#: libraries/controllers/TableStructureController.class.php:241
+msgid "No column selected."
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:467
+msgid "The columns have been moved successfully."
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:730
+#, php-format
+msgid ""
+"Table %1$s has been altered successfully. Privileges have been adjusted."
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:783
+#: libraries/tracking.lib.php:1094
+msgid "Query error"
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:948
+#: templates/table/structure/check_all_table_column.phtml:11
+msgid "Change"
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:952
+#: libraries/controllers/TableStructureController.class.php:957
+#: libraries/navigation/Nodes/Node_Index.class.php:30
+#: libraries/tracking.lib.php:926
+#: templates/columns_definitions/column_indexes.phtml:16
+#: templates/columns_definitions/table_fields_definitions.phtml:57
+#: templates/table/structure/check_all_table_column.phtml:30
+#: templates/table/structure/display_structure.phtml:79
+#: templates/table/structure/display_table_stats.phtml:19
+msgid "Index"
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:954
+#: libraries/controllers/TableStructureController.class.php:959
+#: templates/columns_definitions/column_indexes.phtml:27
+#: templates/table/structure/check_all_table_column.phtml:37
+msgid "Spatial"
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:955
+#: libraries/controllers/TableStructureController.class.php:960
+#: templates/columns_definitions/column_indexes.phtml:22
+#: templates/table/structure/check_all_table_column.phtml:47
+msgid "Fulltext"
+msgstr ""
+
+#: libraries/controllers/TableStructureController.class.php:963
+msgid "Distinct values"
+msgstr ""
+
 #: libraries/core.lib.php:306
 #, php-format
 msgid "The %s extension is missing. Please check your PHP configuration."
@@ -7675,7 +7691,7 @@ msgid "No Password"
 msgstr ""
 
 #: libraries/display_change_password.lib.php:68
-#: libraries/plugins/auth/AuthenticationCookie.class.php:199
+#: libraries/plugins/auth/AuthenticationCookie.class.php:187
 #: libraries/replication_gui.lib.php:422 libraries/replication_gui.lib.php:862
 #: libraries/server_privileges.lib.php:1640
 msgid "Password:"
@@ -8393,12 +8409,12 @@ msgid "Dump has been saved to file %s."
 msgstr ""
 
 #: libraries/import.lib.php:202 libraries/insert_edit.lib.php:124
-#: libraries/rte/rte_routines.lib.php:1353 libraries/sql.lib.php:1312
+#: libraries/rte/rte_routines.lib.php:1444 libraries/sql.lib.php:1306
 #: tbl_get_field.php:44
 msgid "MySQL returned an empty result set (i.e. zero rows)."
 msgstr ""
 
-#: libraries/import.lib.php:265 libraries/sql.lib.php:1326
+#: libraries/import.lib.php:265 libraries/sql.lib.php:1320
 msgid "[ROLLBACK occurred.]"
 msgstr ""
 
@@ -8462,14 +8478,14 @@ msgstr ""
 
 #: libraries/insert_edit.lib.php:233
 #: libraries/navigation/Nodes/Node_DatabaseChild.class.php:48
-#: templates/designer/table_list.phtml:40
+#: templates/database/designer/table_list.phtml:40
 msgid "Hide"
 msgstr ""
 
 #: libraries/insert_edit.lib.php:249
 #: libraries/navigation/Nodes/Node_Function.class.php:32
-#: libraries/rte/rte_routines.lib.php:1495
-#: templates/table/table_header.phtml:4
+#: libraries/rte/rte_routines.lib.php:1586
+#: templates/table/search/table_header.phtml:4
 msgid "Function"
 msgstr ""
 
@@ -8482,82 +8498,83 @@ msgstr ""
 msgid "Because of its length,<br /> this column might not be editable."
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1050
+#: libraries/insert_edit.lib.php:1048
 msgid "Binary - do not edit"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1176 libraries/server_privileges.lib.php:470
-#: templates/table/options.phtml:36
+#: libraries/insert_edit.lib.php:1174 libraries/server_privileges.lib.php:470
+#: templates/table/search/options.phtml:36
 msgid "Or"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1177
+#: libraries/insert_edit.lib.php:1175
 msgid "web server upload directory:"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1348 templates/table/input_box.phtml:49
+#: libraries/insert_edit.lib.php:1346
+#: templates/table/search/input_box.phtml:49
 msgid "Edit/Insert"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1398
+#: libraries/insert_edit.lib.php:1396
 #, php-format
 msgid "Continue insertion with %s rows"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1428
+#: libraries/insert_edit.lib.php:1426
 msgid "and then"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1461
+#: libraries/insert_edit.lib.php:1459
 msgid "Insert as new row"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1464
+#: libraries/insert_edit.lib.php:1462
 msgid "Insert as new row and ignore errors"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1467
+#: libraries/insert_edit.lib.php:1465
 msgid "Show insert query"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1487
+#: libraries/insert_edit.lib.php:1485
 msgid "Go back to previous page"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1490
+#: libraries/insert_edit.lib.php:1488
 msgid "Insert another new row"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1495
+#: libraries/insert_edit.lib.php:1493
 msgid "Go back to this page"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1518
+#: libraries/insert_edit.lib.php:1516
 msgid "Edit next row"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1540
+#: libraries/insert_edit.lib.php:1538
 msgid ""
 "Use TAB key to move from value to value, or CTRL+arrows to move anywhere"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1577 libraries/replication_gui.lib.php:542
-#: libraries/rte/rte_routines.lib.php:1497
+#: libraries/insert_edit.lib.php:1575 libraries/replication_gui.lib.php:542
+#: libraries/rte/rte_routines.lib.php:1588
 #: libraries/server_status_variables.lib.php:220
-#: templates/designer/having_query_panel.phtml:100
-#: templates/designer/options_panel.phtml:73
-#: templates/designer/options_panel.phtml:239
-#: templates/designer/where_query_panel.phtml:69
-#: templates/table/table_header.phtml:10
-#: templates/table/zoom_result_form.phtml:35
+#: templates/database/designer/having_query_panel.phtml:100
+#: templates/database/designer/options_panel.phtml:73
+#: templates/database/designer/options_panel.phtml:239
+#: templates/database/designer/where_query_panel.phtml:69
+#: templates/table/search/table_header.phtml:10
+#: templates/table/search/zoom_result_form.phtml:35
 msgid "Value"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1937 libraries/sql.lib.php:1309
+#: libraries/insert_edit.lib.php:1935 libraries/sql.lib.php:1303
 msgid "Showing SQL query"
 msgstr ""
 
-#: libraries/insert_edit.lib.php:1962 libraries/sql.lib.php:1287
+#: libraries/insert_edit.lib.php:1960 libraries/sql.lib.php:1281
 #, php-format
 msgid "Inserted row id: %1$d"
 msgstr ""
@@ -8964,7 +8981,7 @@ msgstr ""
 #: libraries/navigation/Nodes/Node_View_Container.class.php:26
 #: libraries/navigation/Nodes/Node_View_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:129
-#: templates/structure/show_create.phtml:30
+#: templates/database/structure/show_create.phtml:30
 msgid "Views"
 msgstr ""
 
@@ -9250,7 +9267,7 @@ msgstr ""
 
 #: libraries/operations.lib.php:101 libraries/operations.lib.php:249
 #: libraries/operations.lib.php:869 libraries/operations.lib.php:963
-#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:907
+#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:998
 #: templates/columns_definitions/table_fields_definitions.phtml:47
 msgid "Adjust Privileges"
 msgstr ""
@@ -9340,22 +9357,22 @@ msgid "Switch to copied table"
 msgstr ""
 
 #: libraries/operations.lib.php:1360
-#: templates/structure/check_all_tables.phtml:18
+#: templates/database/structure/check_all_tables.phtml:18
 msgid "Table maintenance"
 msgstr ""
 
 #: libraries/operations.lib.php:1398
-#: templates/structure/check_all_tables.phtml:19
+#: templates/database/structure/check_all_tables.phtml:19
 msgid "Analyze table"
 msgstr ""
 
 #: libraries/operations.lib.php:1413
-#: templates/structure/check_all_tables.phtml:20
+#: templates/database/structure/check_all_tables.phtml:20
 msgid "Check table"
 msgstr ""
 
 #: libraries/operations.lib.php:1428
-#: templates/structure/check_all_tables.phtml:22
+#: templates/database/structure/check_all_tables.phtml:22
 msgid "Checksum table"
 msgstr ""
 
@@ -9373,18 +9390,19 @@ msgid "Flush the table (FLUSH)"
 msgstr ""
 
 #: libraries/operations.lib.php:1477
-#: templates/structure/check_all_tables.phtml:23
-#: templates/structure/display_table_stats.phtml:56
+#: templates/database/structure/check_all_tables.phtml:23
+#: templates/table/structure/display_table_stats.phtml:56
 msgid "Optimize table"
 msgstr ""
 
 #: libraries/operations.lib.php:1492
-#: templates/structure/check_all_tables.phtml:24
+#: templates/database/structure/check_all_tables.phtml:24
 msgid "Repair table"
 msgstr ""
 
 #: libraries/operations.lib.php:1538
-#: templates/structure/check_all_tables.phtml:14 view_operations.php:127
+#: templates/database/structure/check_all_tables.phtml:14
+#: view_operations.php:127
 msgid "Delete data or table"
 msgstr ""
 
@@ -9505,7 +9523,7 @@ msgid "Cannot connect: invalid settings."
 msgstr ""
 
 #: libraries/plugins/auth/AuthenticationConfig.class.php:108
-#: libraries/plugins/auth/AuthenticationCookie.class.php:134
+#: libraries/plugins/auth/AuthenticationCookie.class.php:122
 #: libraries/plugins/auth/AuthenticationHttp.class.php:96
 #, php-format
 msgid "Welcome to %s"
@@ -9530,36 +9548,36 @@ msgstr ""
 msgid "Retry to connect"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:146
+#: libraries/plugins/auth/AuthenticationCookie.class.php:134
 msgid "Your session has expired. Please log in again."
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:170
+#: libraries/plugins/auth/AuthenticationCookie.class.php:158
 msgid "Log in"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:178
-#: libraries/plugins/auth/AuthenticationCookie.class.php:188
+#: libraries/plugins/auth/AuthenticationCookie.class.php:166
+#: libraries/plugins/auth/AuthenticationCookie.class.php:176
 msgid "You can enter hostname/IP address and port separated by space."
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:193
+#: libraries/plugins/auth/AuthenticationCookie.class.php:181
 msgid "Username:"
 msgstr "Gebrukersnoame:"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:205
+#: libraries/plugins/auth/AuthenticationCookie.class.php:193
 msgid "Server Choice:"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:386
+#: libraries/plugins/auth/AuthenticationCookie.class.php:374
 msgid "Entered captcha is wrong, try again!"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:396
+#: libraries/plugins/auth/AuthenticationCookie.class.php:384
 msgid "Please enter correct captcha!"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:423
+#: libraries/plugins/auth/AuthenticationCookie.class.php:411
 msgid "You are not allowed to log in to this MySQL server!"
 msgstr ""
 
@@ -9655,7 +9673,7 @@ msgstr ""
 #: libraries/plugins/export/ExportOdt.class.php:593
 #: libraries/plugins/export/ExportTexytext.class.php:428
 #: libraries/plugins/export/PMA_ExportPdf.class.php:313
-#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:984
 #: libraries/rte/rte_triggers.lib.php:377
 msgid "Definition"
 msgstr ""
@@ -9952,7 +9970,7 @@ msgid "Last check:"
 msgstr ""
 
 #: libraries/plugins/export/ExportSql.class.php:1399
-#: templates/structure/structure_table_row.phtml:183
+#: templates/database/structure/structure_table_row.phtml:183
 msgid "in use"
 msgstr ""
 
@@ -10132,18 +10150,14 @@ msgstr ""
 msgid "The imported file does not contain any data!"
 msgstr ""
 
-#: libraries/plugins/import/ImportSql.class.php:169
+#: libraries/plugins/import/ImportSql.class.php:72
 msgid "SQL compatibility mode:"
 msgstr ""
 
-#: libraries/plugins/import/ImportSql.class.php:181
+#: libraries/plugins/import/ImportSql.class.php:84
 msgid "Do not use <code>AUTO_INCREMENT</code> for zero values"
 msgstr ""
 
-#: libraries/plugins/import/ImportSql.class.php:195
-msgid "Read as multibytes"
-msgstr ""
-
 #: libraries/plugins/import/ImportXml.class.php:54
 msgid "XML"
 msgstr "XML"
@@ -10186,7 +10200,7 @@ msgid "Show grid"
 msgstr ""
 
 #: libraries/plugins/schema/SchemaPdf.class.php:94
-#: templates/structure/print_view_data_dictionary_link.phtml:6
+#: templates/database/structure/print_view_data_dictionary_link.phtml:6
 msgid "Data Dictionary"
 msgstr ""
 
@@ -10211,7 +10225,7 @@ msgid "The %s table doesn't exist!"
 msgstr ""
 
 #: libraries/plugins/schema/eps/Eps_Relation_Schema.class.php:321
-#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:309
+#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:323
 #, php-format
 msgid "Schema of the %s database - Page %s"
 msgstr ""
@@ -10237,7 +10251,7 @@ msgstr ""
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1005
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1028
 #: libraries/tracking.lib.php:884
-#: templates/structure/table_structure_header.phtml:11
+#: templates/table/structure/table_structure_header.phtml:11
 msgid "Extra"
 msgstr ""
 
@@ -10542,51 +10556,51 @@ msgstr ""
 msgid "Create the needed tables with the <code>%screate_tables.sql</code>."
 msgstr ""
 
-#: libraries/relation.lib.php:360
+#: libraries/relation.lib.php:357
 msgid "Create a pma user and give access to these tables."
 msgstr ""
 
-#: libraries/relation.lib.php:365
+#: libraries/relation.lib.php:360
 msgid ""
 "Enable advanced features in configuration file (<code>config.inc.php</"
 "code>), for example by starting from <code>config.sample.inc.php</code>."
 msgstr ""
 
-#: libraries/relation.lib.php:373
+#: libraries/relation.lib.php:365
 msgid "Re-login to phpMyAdmin to load the updated configuration file."
 msgstr ""
 
-#: libraries/relation.lib.php:1612
+#: libraries/relation.lib.php:1607
 msgid "no description"
 msgstr ""
 
-#: libraries/relation.lib.php:1811
+#: libraries/relation.lib.php:1806
 msgid ""
 "You do not have necessary privileges to create a database named "
 "'phpmyadmin'. You may go to 'Operations' tab of any database to set up the "
 "phpMyAdmin configuration storage there."
 msgstr ""
 
-#: libraries/relation.lib.php:1928
+#: libraries/relation.lib.php:1923
 #, php-format
 msgid ""
 "%sCreate%s a database named 'phpmyadmin' and setup the phpMyAdmin "
 "configuration storage there."
 msgstr ""
 
-#: libraries/relation.lib.php:1936
+#: libraries/relation.lib.php:1931
 #, php-format
 msgid ""
 "%sCreate%s the phpMyAdmin configuration storage in the current database."
 msgstr ""
 
-#: libraries/relation.lib.php:1944
+#: libraries/relation.lib.php:1939
 #, php-format
 msgid "%sCreate%s missing phpMyAdmin configuration storage tables."
 msgstr ""
 
 #: libraries/replication_gui.lib.php:46 libraries/replication_gui.lib.php:343
-#: libraries/server_databases.lib.php:387
+#: libraries/server_databases.lib.php:398
 msgid "Master replication"
 msgstr ""
 
@@ -10641,7 +10655,7 @@ msgid ""
 msgstr ""
 
 #: libraries/replication_gui.lib.php:141
-#: libraries/server_databases.lib.php:389
+#: libraries/server_databases.lib.php:400
 msgid "Slave replication"
 msgstr ""
 
@@ -10902,10 +10916,10 @@ msgid "Master server changed successfully to %s."
 msgstr ""
 
 #: libraries/rte/rte_events.lib.php:106 libraries/rte/rte_events.lib.php:115
-#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:149
-#: libraries/rte/rte_routines.lib.php:158
-#: libraries/rte/rte_routines.lib.php:231
-#: libraries/rte/rte_routines.lib.php:1362
+#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:219
+#: libraries/rte/rte_routines.lib.php:246
+#: libraries/rte/rte_routines.lib.php:368
+#: libraries/rte/rte_routines.lib.php:1453
 #: libraries/rte/rte_triggers.lib.php:82 libraries/rte/rte_triggers.lib.php:91
 #: libraries/rte/rte_triggers.lib.php:123
 #, php-format
@@ -10926,7 +10940,7 @@ msgstr ""
 msgid "Event %1$s has been created."
 msgstr ""
 
-#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:251
+#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:266
 #: libraries/rte/rte_triggers.lib.php:144
 msgid "One or more errors have occurred while processing your request:"
 msgstr ""
@@ -10935,7 +10949,7 @@ msgstr ""
 msgid "Edit event"
 msgstr ""
 
-#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:794
+#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:885
 #: libraries/rte/rte_triggers.lib.php:323 view_create.php:180
 msgid "Details"
 msgstr ""
@@ -10948,7 +10962,7 @@ msgstr ""
 msgid "Event type"
 msgstr ""
 
-#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:817
+#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:908
 #, php-format
 msgid "Change to %s"
 msgstr ""
@@ -10975,12 +10989,14 @@ msgstr ""
 msgid "On completion preserve"
 msgstr ""
 
-#: libraries/rte/rte_events.lib.php:491 libraries/rte/rte_routines.lib.php:930
+#: libraries/rte/rte_events.lib.php:491
+#: libraries/rte/rte_routines.lib.php:1021
 #: libraries/rte/rte_triggers.lib.php:383 view_create.php:209
 msgid "Definer"
 msgstr ""
 
-#: libraries/rte/rte_events.lib.php:535 libraries/rte/rte_routines.lib.php:997
+#: libraries/rte/rte_events.lib.php:535
+#: libraries/rte/rte_routines.lib.php:1088
 #: libraries/rte/rte_triggers.lib.php:422
 msgid "The definer must be in the \"username@hostname\" format!"
 msgstr ""
@@ -11006,9 +11022,9 @@ msgid "You must provide an event definition."
 msgstr ""
 
 #: libraries/rte/rte_export.lib.php:43 libraries/rte/rte_general.lib.php:72
-#: libraries/rte/rte_routines.lib.php:345
-#: libraries/rte/rte_routines.lib.php:1198
-#: libraries/rte/rte_routines.lib.php:1411
+#: libraries/rte/rte_routines.lib.php:153
+#: libraries/rte/rte_routines.lib.php:1289
+#: libraries/rte/rte_routines.lib.php:1502
 msgid "Error in processing request:"
 msgstr ""
 
@@ -11040,132 +11056,132 @@ msgid ""
 "problems."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:110
-#: libraries/rte/rte_routines.lib.php:1006
+#: libraries/rte/rte_routines.lib.php:123
+msgid "Edit routine"
+msgstr ""
+
+#: libraries/rte/rte_routines.lib.php:200
+#: libraries/rte/rte_routines.lib.php:1097
 #, php-format
 msgid "Invalid routine type: \"%s\""
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:170
-msgid "Sorry, we failed to restore the dropped routine."
-msgstr ""
-
-#: libraries/rte/rte_routines.lib.php:211
-#, php-format
-msgid "Routine %1$s has been modified. Privileges have been adjusted."
-msgstr ""
-
-#: libraries/rte/rte_routines.lib.php:216
-#, php-format
-msgid "Routine %1$s has been modified."
-msgstr ""
-
-#: libraries/rte/rte_routines.lib.php:238
+#: libraries/rte/rte_routines.lib.php:253
 #, php-format
 msgid "Routine %1$s has been created."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:315
-msgid "Edit routine"
+#: libraries/rte/rte_routines.lib.php:380
+msgid "Sorry, we failed to restore the dropped routine."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:797
+#: libraries/rte/rte_routines.lib.php:439
+#, php-format
+msgid "Routine %1$s has been modified. Privileges have been adjusted."
+msgstr ""
+
+#: libraries/rte/rte_routines.lib.php:444
+#, php-format
+msgid "Routine %1$s has been modified."
+msgstr ""
+
+#: libraries/rte/rte_routines.lib.php:888
 msgid "Routine name"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:823
+#: libraries/rte/rte_routines.lib.php:914
 msgid "Parameters"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:829
+#: libraries/rte/rte_routines.lib.php:920
 msgid "Direction"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:847
+#: libraries/rte/rte_routines.lib.php:938
 msgid "Add parameter"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:851
+#: libraries/rte/rte_routines.lib.php:942
 msgid "Remove last parameter"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:856
+#: libraries/rte/rte_routines.lib.php:947
 msgid "Return type"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:862
+#: libraries/rte/rte_routines.lib.php:953
 msgid "Return length/values"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:868
+#: libraries/rte/rte_routines.lib.php:959
 msgid "Return options"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:899
+#: libraries/rte/rte_routines.lib.php:990
 msgid "Is deterministic"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:920
+#: libraries/rte/rte_routines.lib.php:1011
 msgid ""
 "You do not have sufficient privileges to perform this operation; Please "
 "refer to the documentation for more details"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:935
+#: libraries/rte/rte_routines.lib.php:1026
 msgid "Security type"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:944
+#: libraries/rte/rte_routines.lib.php:1035
 msgid "SQL data access"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1013
+#: libraries/rte/rte_routines.lib.php:1104
 msgid "You must provide a routine name!"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1047
+#: libraries/rte/rte_routines.lib.php:1138
 #, php-format
 msgid "Invalid direction \"%s\" given for parameter."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1069
-#: libraries/rte/rte_routines.lib.php:1131
+#: libraries/rte/rte_routines.lib.php:1160
+#: libraries/rte/rte_routines.lib.php:1222
 msgid ""
 "You must provide length/values for routine parameters of type ENUM, SET, "
 "VARCHAR and VARBINARY."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1095
+#: libraries/rte/rte_routines.lib.php:1186
 msgid "You must provide a name and a type for each routine parameter."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1114
+#: libraries/rte/rte_routines.lib.php:1205
 msgid "You must provide a valid return type for the routine."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1174
+#: libraries/rte/rte_routines.lib.php:1265
 msgid "You must provide a routine definition."
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1285
+#: libraries/rte/rte_routines.lib.php:1376
 #, php-format
 msgid "Execution results of routine %s"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1340
+#: libraries/rte/rte_routines.lib.php:1431
 #, php-format
 msgid "%d row affected by the last statement inside the procedure."
 msgid_plural "%d rows affected by the last statement inside the procedure."
 msgstr[0] ""
 msgstr[1] ""
 
-#: libraries/rte/rte_routines.lib.php:1398
-#: libraries/rte/rte_routines.lib.php:1406
+#: libraries/rte/rte_routines.lib.php:1489
+#: libraries/rte/rte_routines.lib.php:1497
 msgid "Execute routine"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:1485
-#: libraries/rte/rte_routines.lib.php:1488
+#: libraries/rte/rte_routines.lib.php:1576
+#: libraries/rte/rte_routines.lib.php:1579
 msgid "Routine parameters"
 msgstr ""
 
@@ -11319,7 +11335,7 @@ msgid "Original position"
 msgstr ""
 
 #: libraries/server_bin_log.lib.php:133
-#: templates/structure/display_table_stats.phtml:4
+#: templates/table/structure/display_table_stats.phtml:4
 msgid "Information"
 msgstr ""
 
@@ -11355,12 +11371,12 @@ msgid ""
 "between the web server and the MySQL server."
 msgstr ""
 
-#: libraries/server_databases.lib.php:364
-#: libraries/server_databases.lib.php:365
+#: libraries/server_databases.lib.php:366
+#: libraries/server_databases.lib.php:371
 msgid "Enable Statistics"
 msgstr ""
 
-#: libraries/server_databases.lib.php:481
+#: libraries/server_databases.lib.php:492
 #, php-format
 msgid "%1$d database has been dropped successfully."
 msgid_plural "%1$d databases have been dropped successfully."
@@ -11720,7 +11736,7 @@ msgid "You have revoked the privileges for %s."
 msgstr ""
 
 #: libraries/server_privileges.lib.php:2059
-#: libraries/server_privileges.lib.php:4290
+#: libraries/server_privileges.lib.php:4316
 msgid "Add user account"
 msgstr ""
 
@@ -11883,53 +11899,53 @@ msgstr ""
 msgid "The privileges were reloaded successfully."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:3994
+#: libraries/server_privileges.lib.php:4003
 #, php-format
 msgid "The user %s already exists!"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4232
+#: libraries/server_privileges.lib.php:4258
 #, php-format
 msgid "Privileges for %s"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4241
+#: libraries/server_privileges.lib.php:4267
 #: libraries/server_status_processes.lib.php:72
 #: libraries/server_user_groups.lib.php:39
 msgid "User"
 msgstr "Gebruker"
 
-#: libraries/server_privileges.lib.php:4282
+#: libraries/server_privileges.lib.php:4308
 msgctxt "Create new user"
 msgid "New"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4311
+#: libraries/server_privileges.lib.php:4337
 msgid "Edit privileges:"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4312
+#: libraries/server_privileges.lib.php:4338
 msgid "User account"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4371
+#: libraries/server_privileges.lib.php:4397
 msgid ""
 "Note: You are attempting to edit privileges of the user with which you are "
 "currently logged in."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4391 libraries/server_users.lib.php:25
+#: libraries/server_privileges.lib.php:4417 libraries/server_users.lib.php:25
 msgid "User accounts overview"
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4459
+#: libraries/server_privileges.lib.php:4485
 msgid ""
 "A user account allowing any user from localhost to connect is present. This "
 "will prevent other users from connecting if the host part of their account "
 "allows a connection from any (%) host."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4500
+#: libraries/server_privileges.lib.php:4526
 #, php-format
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
@@ -11938,7 +11954,7 @@ msgid ""
 "%sreload the privileges%s before you continue."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4519
+#: libraries/server_privileges.lib.php:4545
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
 "tables. The content of these tables may differ from the privileges the "
@@ -11947,61 +11963,61 @@ msgid ""
 "privilege."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4569
+#: libraries/server_privileges.lib.php:4595
 msgid "The selected user was not found in the privilege table."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4801
+#: libraries/server_privileges.lib.php:4827
 msgid "You have added a new user."
 msgstr ""
 
-#: libraries/server_status.lib.php:53
+#: libraries/server_status.lib.php:60
 #, php-format
 msgid "Network traffic since startup: %s"
 msgstr ""
 
-#: libraries/server_status.lib.php:66
+#: libraries/server_status.lib.php:73
 #, php-format
 msgid "This MySQL server has been running for %1$s. It started up on %2$s."
 msgstr ""
 
-#: libraries/server_status.lib.php:80
+#: libraries/server_status.lib.php:94
 msgid ""
 "This MySQL server works as <b>master</b> and <b>slave</b> in <b>replication</"
 "b> process."
 msgstr ""
 
-#: libraries/server_status.lib.php:85
+#: libraries/server_status.lib.php:99
 msgid "This MySQL server works as <b>master</b> in <b>replication</b> process."
 msgstr ""
 
-#: libraries/server_status.lib.php:90
+#: libraries/server_status.lib.php:104
 msgid "This MySQL server works as <b>slave</b> in <b>replication</b> process."
 msgstr ""
 
-#: libraries/server_status.lib.php:106
+#: libraries/server_status.lib.php:116
 msgid "Replication status"
 msgstr ""
 
-#: libraries/server_status.lib.php:137
+#: libraries/server_status.lib.php:146
 msgid ""
 "On a busy server, the byte counters may overrun, so those statistics as "
 "reported by the MySQL server may be incorrect."
 msgstr ""
 
-#: libraries/server_status.lib.php:148
+#: libraries/server_status.lib.php:157
 msgid "Received"
 msgstr ""
 
-#: libraries/server_status.lib.php:167
+#: libraries/server_status.lib.php:176
 msgid "Sent"
 msgstr ""
 
-#: libraries/server_status.lib.php:234
+#: libraries/server_status.lib.php:243
 msgid "Max. concurrent connections"
 msgstr ""
 
-#: libraries/server_status.lib.php:244
+#: libraries/server_status.lib.php:253
 msgid "Failed attempts"
 msgstr ""
 
@@ -12921,7 +12937,7 @@ msgstr ""
 msgid "Not implemented yet."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/AlterOperation.php:193
+#: libraries/sql-parser/src/Components/AlterOperation.php:191
 msgid "Unrecognized alter operation."
 msgstr ""
 
@@ -12935,7 +12951,7 @@ msgid "An opening bracket followed by a set of values was expected."
 msgstr ""
 
 #: libraries/sql-parser/src/Components/ArrayObj.php:101
-#: libraries/sql-parser/src/Components/FieldDefinition.php:202
+#: libraries/sql-parser/src/Components/CreateDefinition.php:202
 msgid "An opening bracket was expected."
 msgstr ""
 
@@ -12943,25 +12959,33 @@ msgstr ""
 msgid "A comma or a closing bracket was expected"
 msgstr ""
 
+#: libraries/sql-parser/src/Components/CreateDefinition.php:246
+msgid "A comma or a closing bracket was expected."
+msgstr ""
+
+#: libraries/sql-parser/src/Components/CreateDefinition.php:262
+msgid "A closing bracket was expected."
+msgstr ""
+
 #: libraries/sql-parser/src/Components/DataType.php:125
 msgid "Unrecognized data type."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:225
+#: libraries/sql-parser/src/Components/Expression.php:227
 msgid "Unexpected closing bracket."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:246
-#: libraries/sql-parser/src/Components/Expression.php:283
-#: libraries/sql-parser/src/Components/Expression.php:303
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:285
+#: libraries/sql-parser/src/Components/Expression.php:305
 msgid "An alias was previously found."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:257
+#: libraries/sql-parser/src/Components/Expression.php:259
 msgid "Unexpected dot."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:327
+#: libraries/sql-parser/src/Components/Expression.php:329
 msgid "An alias was expected."
 msgstr ""
 
@@ -12969,14 +12993,6 @@ msgstr ""
 msgid "An expression was expected."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/FieldDefinition.php:246
-msgid "A comma or a closing bracket was expected."
-msgstr ""
-
-#: libraries/sql-parser/src/Components/FieldDefinition.php:262
-msgid "A closing bracket was expected."
-msgstr ""
-
 #: libraries/sql-parser/src/Components/Limit.php:90
 #: libraries/sql-parser/src/Components/Limit.php:112
 msgid "An offset was expected."
@@ -13016,24 +13032,24 @@ msgstr ""
 msgid "Expected delimiter."
 msgstr ""
 
-#: libraries/sql-parser/src/Lexer.php:753
+#: libraries/sql-parser/src/Lexer.php:777
 #, php-format
 msgid "Ending quote %1$s was expected."
 msgstr ""
 
-#: libraries/sql-parser/src/Lexer.php:789
+#: libraries/sql-parser/src/Lexer.php:813
 msgid "Variable name was expected."
 msgstr ""
 
-#: libraries/sql-parser/src/Parser.php:380
+#: libraries/sql-parser/src/Parser.php:391
 msgid "Unexpected beginning of statement."
 msgstr ""
 
-#: libraries/sql-parser/src/Parser.php:399
+#: libraries/sql-parser/src/Parser.php:410
 msgid "Unrecognized statement type."
 msgstr ""
 
-#: libraries/sql-parser/src/Parser.php:479
+#: libraries/sql-parser/src/Parser.php:489
 msgid "No transaction was previously started."
 msgstr ""
 
@@ -13059,7 +13075,7 @@ msgid "The name of the entity was expected."
 msgstr ""
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:310
-msgid "At least one field definition was expected."
+msgid "At least one column definition was expected."
 msgstr ""
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:329
@@ -13119,25 +13135,25 @@ msgstr ""
 msgid "Using bookmark \"%s\" as default browse query."
 msgstr ""
 
-#: libraries/sql.lib.php:1306
+#: libraries/sql.lib.php:1300
 msgid "Showing as PHP code"
 msgstr ""
 
-#: libraries/sql.lib.php:1638
+#: libraries/sql.lib.php:1632
 #, php-format
 msgid ""
 "Current selection does not contain a unique column. Grid edit, checkbox, "
 "Edit, Copy and Delete features are not available. %s"
 msgstr ""
 
-#: libraries/sql.lib.php:1649
+#: libraries/sql.lib.php:1643
 #, php-format
 msgid ""
 "Current selection does not contain a unique column. Grid edit, Edit, Copy "
 "and Delete features may result in undesired behavior. %s"
 msgstr ""
 
-#: libraries/sql.lib.php:1688
+#: libraries/sql.lib.php:1682
 #, php-format
 msgid "Problems with indexes of table `%s`"
 msgstr ""
@@ -13293,7 +13309,7 @@ msgid "Version %s snapshot (SQL code)"
 msgstr ""
 
 #: libraries/tracking.lib.php:947
-#: templates/structure/table_structure_row.phtml:33
+#: templates/table/structure/table_structure_row.phtml:33
 msgctxt "None for default"
 msgid "None"
 msgstr ""
@@ -13345,15 +13361,15 @@ msgstr ""
 msgid "Version %1$s was created, tracking for %2$s is active."
 msgstr ""
 
-#: libraries/user_preferences.inc.php:29
+#: libraries/user_preferences.inc.php:30
 msgid "Manage your settings"
 msgstr ""
 
-#: libraries/user_preferences.inc.php:46 prefs_manage.php:307
+#: libraries/user_preferences.inc.php:54 prefs_manage.php:307
 msgid "Configuration has been saved."
 msgstr ""
 
-#: libraries/user_preferences.inc.php:66
+#: libraries/user_preferences.inc.php:74
 #, php-format
 msgid ""
 "Your preferences will be saved for current session only. Storing them "
@@ -13725,7 +13741,7 @@ msgid "first"
 msgstr ""
 
 #: templates/columns_definitions/move_column.phtml:12
-#: templates/structure/add_column.phtml:21
+#: templates/table/structure/add_column.phtml:21
 #, php-format
 msgid "after %s"
 msgstr ""
@@ -13784,197 +13800,290 @@ msgstr ""
 msgid "Input transformation options"
 msgstr ""
 
-#: templates/designer/aggregate_query_panel.phtml:22
-#: templates/designer/options_panel.phtml:100
-msgid "Aggregate"
-msgstr ""
-
-#: templates/designer/aggregate_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:61
-#: templates/designer/options_panel.phtml:106
-#: templates/designer/options_panel.phtml:170
-#: templates/designer/where_query_panel.phtml:30
-#: templates/table/table_header.phtml:9
-msgid "Operator"
-msgstr ""
-
-#: templates/designer/database_tables.phtml:29
-msgid "Toggle"
-msgstr ""
-
-#: templates/designer/database_tables.phtml:40
-msgid "See table structure"
-msgstr ""
-
-#: templates/designer/delete_relation_panel.phtml:21
-msgid "Delete relation"
-msgstr ""
-
-#: templates/designer/edit_delete_pages.phtml:7
-msgid "Page to open"
-msgstr ""
-
-#: templates/designer/edit_delete_pages.phtml:7
-msgid "Page to delete"
-msgstr ""
-
-#: templates/designer/having_query_panel.phtml:90
-#: templates/designer/options_panel.phtml:63
-#: templates/designer/options_panel.phtml:229
-#: templates/designer/where_query_panel.phtml:59
-msgid "Except"
-msgstr ""
-
-#: templates/designer/having_query_panel.phtml:102
-#: templates/designer/options_panel.phtml:75
-#: templates/designer/options_panel.phtml:241
-#: templates/designer/where_query_panel.phtml:71
-msgid "subquery"
-msgstr ""
-
-#: templates/designer/new_relation_panel.phtml:22
-#: templates/designer/side_menu.phtml:84 templates/designer/side_menu.phtml:87
-msgid "Create relation"
-msgstr ""
-
-#: templates/designer/options_panel.phtml:34
-#: templates/designer/options_panel.phtml:200
-msgid "Relation operator"
-msgstr ""
-
-#: templates/designer/options_panel.phtml:85
-#: templates/designer/rename_to_panel.phtml:23
-msgid "Rename to"
-msgstr ""
-
-#: templates/designer/options_panel.phtml:91
-#: templates/designer/rename_to_panel.phtml:31
-msgid "New name"
-msgstr ""
-
-#: templates/designer/page_save_as.phtml:4
-msgid "Save to selected page"
-msgstr ""
-
-#: templates/designer/page_save_as.phtml:5
-msgid "Create a page and save to it"
-msgstr ""
-
-#: templates/designer/page_save_as.phtml:26
-msgid "New page name"
-msgstr ""
-
-#: templates/designer/page_selector.phtml:2
-msgid "Select page"
-msgstr ""
-
-#: templates/designer/query_details.phtml:10
-msgid "Active options"
-msgstr ""
-
-#: templates/designer/schema_export.phtml:4
-msgid "Select Export Relational Type"
-msgstr ""
-
-#: templates/designer/side_menu.phtml:19 templates/designer/side_menu.phtml:25
-msgid "Show/Hide tables list"
-msgstr ""
-
-#: templates/designer/side_menu.phtml:29 templates/designer/side_menu.phtml:35
-#: templates/designer/side_menu.phtml:36
-msgid "View in fullscreen"
-msgstr ""
-
-#: templates/designer/side_menu.phtml:34
-msgid "Exit fullscreen"
-msgstr ""
-
-#: templates/designer/side_menu.phtml:41 templates/designer/side_menu.phtml:45
-msgid "New page"
-msgstr ""
-
-#: templates/designer/side_menu.phtml:70 templates/designer/side_menu.phtml:73
-msgid "Delete pages"
-msgstr ""
-
-#: templates/designer/side_menu.phtml:77 templates/designer/side_menu.phtml:80
-#: templates/table/create_table.phtml:7
+#: templates/database/create_table.phtml:7
+#: templates/database/designer/side_menu.phtml:77
+#: templates/database/designer/side_menu.phtml:80
 msgid "Create table"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:98
-#: templates/designer/side_menu.phtml:101
+#: templates/database/create_table.phtml:15
+msgid "Number of columns"
+msgstr ""
+
+#: templates/database/designer/aggregate_query_panel.phtml:22
+#: templates/database/designer/options_panel.phtml:100
+msgid "Aggregate"
+msgstr ""
+
+#: templates/database/designer/aggregate_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:61
+#: templates/database/designer/options_panel.phtml:106
+#: templates/database/designer/options_panel.phtml:170
+#: templates/database/designer/where_query_panel.phtml:30
+#: templates/table/search/table_header.phtml:9
+msgid "Operator"
+msgstr ""
+
+#: templates/database/designer/database_tables.phtml:29
+msgid "Toggle"
+msgstr ""
+
+#: templates/database/designer/database_tables.phtml:40
+msgid "See table structure"
+msgstr ""
+
+#: templates/database/designer/delete_relation_panel.phtml:21
+msgid "Delete relation"
+msgstr ""
+
+#: templates/database/designer/edit_delete_pages.phtml:7
+msgid "Page to open"
+msgstr ""
+
+#: templates/database/designer/edit_delete_pages.phtml:7
+msgid "Page to delete"
+msgstr ""
+
+#: templates/database/designer/having_query_panel.phtml:90
+#: templates/database/designer/options_panel.phtml:63
+#: templates/database/designer/options_panel.phtml:229
+#: templates/database/designer/where_query_panel.phtml:59
+msgid "Except"
+msgstr ""
+
+#: templates/database/designer/having_query_panel.phtml:102
+#: templates/database/designer/options_panel.phtml:75
+#: templates/database/designer/options_panel.phtml:241
+#: templates/database/designer/where_query_panel.phtml:71
+msgid "subquery"
+msgstr ""
+
+#: templates/database/designer/new_relation_panel.phtml:22
+#: templates/database/designer/side_menu.phtml:84
+#: templates/database/designer/side_menu.phtml:87
+msgid "Create relation"
+msgstr ""
+
+#: templates/database/designer/options_panel.phtml:34
+#: templates/database/designer/options_panel.phtml:200
+msgid "Relation operator"
+msgstr ""
+
+#: templates/database/designer/options_panel.phtml:85
+#: templates/database/designer/rename_to_panel.phtml:23
+msgid "Rename to"
+msgstr ""
+
+#: templates/database/designer/options_panel.phtml:91
+#: templates/database/designer/rename_to_panel.phtml:31
+msgid "New name"
+msgstr ""
+
+#: templates/database/designer/page_save_as.phtml:4
+msgid "Save to selected page"
+msgstr ""
+
+#: templates/database/designer/page_save_as.phtml:5
+msgid "Create a page and save to it"
+msgstr ""
+
+#: templates/database/designer/page_save_as.phtml:26
+msgid "New page name"
+msgstr ""
+
+#: templates/database/designer/page_selector.phtml:2
+msgid "Select page"
+msgstr ""
+
+#: templates/database/designer/query_details.phtml:10
+msgid "Active options"
+msgstr ""
+
+#: templates/database/designer/schema_export.phtml:4
+msgid "Select Export Relational Type"
+msgstr ""
+
+#: templates/database/designer/side_menu.phtml:19
+#: templates/database/designer/side_menu.phtml:25
+msgid "Show/Hide tables list"
+msgstr ""
+
+#: templates/database/designer/side_menu.phtml:29
+#: templates/database/designer/side_menu.phtml:35
+#: templates/database/designer/side_menu.phtml:36
+msgid "View in fullscreen"
+msgstr ""
+
+#: templates/database/designer/side_menu.phtml:34
+msgid "Exit fullscreen"
+msgstr ""
+
+#: templates/database/designer/side_menu.phtml:41
+#: templates/database/designer/side_menu.phtml:45
+msgid "New page"
+msgstr ""
+
+#: templates/database/designer/side_menu.phtml:70
+#: templates/database/designer/side_menu.phtml:73
+msgid "Delete pages"
+msgstr ""
+
+#: templates/database/designer/side_menu.phtml:98
+#: templates/database/designer/side_menu.phtml:101
 msgid "Reload"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:107
-#: templates/designer/side_menu.phtml:110
+#: templates/database/designer/side_menu.phtml:107
+#: templates/database/designer/side_menu.phtml:110
 msgid "Help"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Angular links"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Direct links"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:122
-#: templates/designer/side_menu.phtml:124
+#: templates/database/designer/side_menu.phtml:122
+#: templates/database/designer/side_menu.phtml:124
 msgid "Snap to grid"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:128
-#: templates/designer/side_menu.phtml:134
+#: templates/database/designer/side_menu.phtml:128
+#: templates/database/designer/side_menu.phtml:134
 msgid "Small/Big All"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:138
-#: templates/designer/side_menu.phtml:141
+#: templates/database/designer/side_menu.phtml:138
+#: templates/database/designer/side_menu.phtml:141
 msgid "Toggle small/big"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:145
-#: templates/designer/side_menu.phtml:148
+#: templates/database/designer/side_menu.phtml:145
+#: templates/database/designer/side_menu.phtml:148
 msgid "Toggle relation lines"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:153
-#: templates/designer/side_menu.phtml:156
+#: templates/database/designer/side_menu.phtml:153
+#: templates/database/designer/side_menu.phtml:156
 msgid "Export schema"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:165
-#: templates/designer/side_menu.phtml:168
+#: templates/database/designer/side_menu.phtml:165
+#: templates/database/designer/side_menu.phtml:168
 msgid "Build Query"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:173
-#: templates/designer/side_menu.phtml:177
+#: templates/database/designer/side_menu.phtml:173
+#: templates/database/designer/side_menu.phtml:177
 msgid "Move Menu"
 msgstr ""
 
-#: templates/designer/side_menu.phtml:181
-#: templates/designer/side_menu.phtml:186
+#: templates/database/designer/side_menu.phtml:181
+#: templates/database/designer/side_menu.phtml:186
 msgid "Pin text"
 msgstr ""
 
-#: templates/designer/table_list.phtml:4
+#: templates/database/designer/table_list.phtml:4
 msgid "Hide/Show all"
 msgstr ""
 
-#: templates/designer/table_list.phtml:14
+#: templates/database/designer/table_list.phtml:14
 msgid "Hide/Show Tables with no relation"
 msgstr ""
 
-#: templates/designer/table_list.phtml:59
+#: templates/database/designer/table_list.phtml:59
 msgid "Number of tables:"
 msgstr ""
 
+#: templates/database/structure/body_for_table_summary.phtml:6
+#, php-format
+msgid "%s table"
+msgid_plural "%s tables"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templates/database/structure/body_for_table_summary.phtml:17
+msgid "Sum"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:6
+msgid "Check tables having overhead"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:10
+msgid "Show create"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:27
+msgid "Prefix"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:28
+msgid "Add prefix to table"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:29
+msgid "Replace table prefix"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:30
+msgid "Copy table with prefix"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:36
+msgid "Add columns to central list"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:37
+msgid "Remove columns from central list"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:38
+msgid "Make consistent with central list"
+msgstr ""
+
+#: templates/database/structure/favorite_anchor.phtml:12
+msgid "Add to Favorites"
+msgstr ""
+
+#: templates/database/structure/show_create.phtml:2
+msgid "Showing create queries"
+msgstr ""
+
+#: templates/database/structure/sortable_header.phtml:13
+msgid "Sort"
+msgstr ""
+
+#: templates/database/structure/table_header.phtml:42
+msgid ""
+"May be approximate. Click on the number to get the exact count. See "
+"[doc@faq3-11]FAQ 3.11[/doc]."
+msgstr ""
+
+#: templates/database/structure/table_header.phtml:66
+#: templates/table/index_form.phtml:127
+msgid "Size"
+msgstr ""
+
+#: templates/database/structure/table_header.phtml:74
+#: templates/table/structure/display_table_stats.phtml:27
+msgid "Overhead"
+msgstr ""
+
+#: templates/database/structure/tracking_icon.phtml:4
+msgid "Tracking is active."
+msgstr ""
+
+#: templates/database/structure/tracking_icon.phtml:8
+msgid "Tracking is not active."
+msgstr ""
+
 #: templates/error/report_form.phtml:7
 msgid ""
 "phpMyAdmin has encountered an error. We have collected data about this error "
@@ -13990,61 +14099,6 @@ msgstr ""
 msgid "Please explain the steps that lead to the error:"
 msgstr ""
 
-#: templates/gis_visualization/gis_visualization.phtml:3
-msgid "Display GIS Visualization"
-msgstr ""
-
-#: templates/gis_visualization/gis_visualization.phtml:8
-msgid "Label column"
-msgstr ""
-
-#: templates/gis_visualization/gis_visualization.phtml:11
-msgid "-- None --"
-msgstr "-- Geen --"
-
-#: templates/gis_visualization/gis_visualization.phtml:19
-msgid "Spatial column"
-msgstr ""
-
-#: templates/index_form.phtml:16
-msgid "Index name:"
-msgstr ""
-
-#: templates/index_form.phtml:19
-msgid ""
-"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
-msgstr ""
-
-#: templates/index_form.phtml:40
-msgid "Index choice:"
-msgstr ""
-
-#: templates/index_form.phtml:57
-msgid "Key block size:"
-msgstr ""
-
-#: templates/index_form.phtml:74
-msgid "Index type:"
-msgstr ""
-
-#: templates/index_form.phtml:86
-#, fuzzy
-#| msgid "User:"
-msgid "Parser:"
-msgstr "Gebruker:"
-
-#: templates/index_form.phtml:102
-msgid "Comment:"
-msgstr ""
-
-#: templates/index_form.phtml:127 templates/structure/table_header.phtml:66
-msgid "Size"
-msgstr ""
-
-#: templates/index_form.phtml:149 templates/index_form.phtml:190
-msgid "Drag to reorder"
-msgstr ""
-
 #: templates/prefs_autoload.phtml:9
 msgid ""
 "Your browser has phpMyAdmin configuration for this domain. Would you like to "
@@ -14055,402 +14109,371 @@ msgstr ""
 msgid "Start row:"
 msgstr ""
 
-#: templates/structure/actions_in_table_structure.phtml:14
-#, php-format
-msgid "A primary key has been added on %s."
-msgstr ""
-
-#: templates/structure/actions_in_table_structure.phtml:34
-#: templates/structure/actions_in_table_structure.phtml:54
-#: templates/structure/actions_in_table_structure.phtml:79
-#: templates/structure/actions_in_table_structure.phtml:101
-#, php-format
-msgid "An index has been added on %s."
-msgstr ""
-
-#: templates/structure/actions_in_table_structure.phtml:130
-#: templates/structure/check_all_table_column.phtml:59
-msgid "Remove from central columns"
-msgstr ""
-
-#: templates/structure/actions_in_table_structure.phtml:138
-#: templates/structure/check_all_table_column.phtml:55
-msgid "Add to central columns"
-msgstr ""
-
-#: templates/structure/add_column.phtml:7
-#, php-format
-msgid "Add %s column(s)"
-msgstr ""
-
-#: templates/structure/add_column.phtml:12
-msgid "at beginning of table"
-msgstr ""
-
-#: templates/structure/body_for_table_summary.phtml:6
-#, php-format
-msgid "%s table"
-msgid_plural "%s tables"
-msgstr[0] ""
-msgstr[1] ""
-
-#: templates/structure/body_for_table_summary.phtml:17
-msgid "Sum"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:6
-msgid "Check tables having overhead"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:10
-msgid "Show create"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:27
-msgid "Prefix"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:28
-msgid "Add prefix to table"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:29
-msgid "Replace table prefix"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:30
-msgid "Copy table with prefix"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:36
-msgid "Add columns to central list"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:37
-msgid "Remove columns from central list"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:38
-msgid "Make consistent with central list"
-msgstr ""
-
-#: templates/structure/display_structure.phtml:140 view_create.php:181
-msgid "Edit view"
-msgstr ""
-
-#: templates/structure/display_table_stats.phtml:9
-msgid "Space usage"
-msgstr ""
-
-#: templates/structure/display_table_stats.phtml:27
-#: templates/structure/table_header.phtml:74
-msgid "Overhead"
-msgstr ""
-
-#: templates/structure/display_table_stats.phtml:32
-msgid "Effective"
-msgstr ""
-
-#: templates/structure/favorite_anchor.phtml:12
-msgid "Add to Favorites"
-msgstr ""
-
-#: templates/structure/move_columns_dialog.phtml:1
-#: templates/structure/optional_action_links.phtml:21
-msgid "Move columns"
-msgstr ""
-
-#: templates/structure/move_columns_dialog.phtml:2
-msgid "Move the columns by dragging them up and down."
-msgstr ""
-
-#: templates/structure/optional_action_links.phtml:9
-msgid "Propose table structure"
-msgstr ""
-
-#: templates/structure/optional_action_links.phtml:24
-msgid "Improve table structure"
-msgstr ""
-
-#: templates/structure/optional_action_links.phtml:30
-msgid "Track view"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:3
-msgid "Row statistics"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:9
-msgid "static"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:11
-msgid "dynamic"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:22
-msgid "partitioned"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:54
-msgid "Row length"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:66
-msgid "Row size"
-msgstr ""
-
-#: templates/structure/row_stats_table.phtml:73
-msgid "Next autoindex"
-msgstr ""
-
-#: templates/structure/secondary_tabs.phtml:14
-msgid "Relation view"
-msgstr ""
-
-#: templates/structure/show_create.phtml:2
-msgid "Showing create queries"
-msgstr ""
-
-#: templates/structure/sortable_header.phtml:13
-msgid "Sort"
-msgstr ""
-
-#: templates/structure/table_header.phtml:42
-msgid ""
-"May be approximate. Click on the number to get the exact count. See "
-"[doc@faq3-11]FAQ 3.11[/doc]."
-msgstr ""
-
-#: templates/structure/table_structure_row.phtml:46
-#, php-format
-msgid "Column %s has been dropped."
-msgstr ""
-
-#: templates/structure/tracking_icon.phtml:4
-msgid "Tracking is active."
-msgstr ""
-
-#: templates/structure/tracking_icon.phtml:8
-msgid "Tracking is not active."
-msgstr ""
-
-#: templates/table/create_table.phtml:15
-msgid "Number of columns"
-msgstr ""
-
-#: templates/table/options.phtml:8
-msgid "Select columns (at least one):"
-msgstr ""
-
-#: templates/table/options.phtml:37
-msgid "Add search conditions (body of the \"where\" clause):"
-msgstr ""
-
-#: templates/table/options.phtml:45
-msgid "Number of rows per page"
-msgstr ""
-
-#: templates/table/options.phtml:56
-msgid "Display order:"
-msgstr ""
-
-#: templates/table/options_zoom.phtml:6
-msgid "Use this column to label each point"
-msgstr ""
-
-#: templates/table/options_zoom.phtml:35
-msgid "Maximum rows to plot"
-msgstr ""
-
-#: templates/table/replace_preview.phtml:13
-msgid "Find and replace - preview"
-msgstr ""
-
-#: templates/table/replace_preview.phtml:18
-msgid "Original string"
-msgstr ""
-
-#: templates/table/replace_preview.phtml:19
-msgid "Replaced string"
-msgstr ""
-
-#: templates/table/replace_preview.phtml:40
-msgid "Replace"
-msgstr ""
-
-#: templates/table/rows_zoom.phtml:16
-msgid "Additional search criteria"
-msgstr ""
-
-#: templates/table/search_and_replace.phtml:3
-msgid "Replace with:"
-msgstr ""
-
-#: templates/table/search_and_replace.phtml:22
-msgid "Use regular expression"
-msgstr ""
-
-#: templates/table/selection_form.phtml:12
-msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
-msgstr ""
-
-#: templates/table/selection_form.phtml:34
-msgid "Do a \"query by example\" (wildcard: \"%\")"
-msgstr ""
-
-#: templates/table/zoom_result_form.phtml:7
-msgid "Browse/Edit the points"
-msgstr ""
-
-#: templates/table/zoom_result_form.phtml:15
-msgid "How to use"
-msgstr ""
-
-#: templates/table/zoom_result_form.phtml:23
-msgid "Reset zoom"
-msgstr ""
-
-#: templates/tbl_chart.phtml:17
+#: templates/table/chart/tbl_chart.phtml:17
 msgctxt "Chart type"
 msgid "Bar"
 msgstr ""
 
-#: templates/tbl_chart.phtml:21
+#: templates/table/chart/tbl_chart.phtml:21
 msgctxt "Chart type"
 msgid "Column"
 msgstr ""
 
-#: templates/tbl_chart.phtml:25
+#: templates/table/chart/tbl_chart.phtml:25
 msgctxt "Chart type"
 msgid "Line"
 msgstr ""
 
-#: templates/tbl_chart.phtml:29
+#: templates/table/chart/tbl_chart.phtml:29
 msgctxt "Chart type"
 msgid "Spline"
 msgstr ""
 
-#: templates/tbl_chart.phtml:33
+#: templates/table/chart/tbl_chart.phtml:33
 msgctxt "Chart type"
 msgid "Area"
 msgstr ""
 
-#: templates/tbl_chart.phtml:37
+#: templates/table/chart/tbl_chart.phtml:37
 msgctxt "Chart type"
 msgid "Pie"
 msgstr ""
 
-#: templates/tbl_chart.phtml:41
+#: templates/table/chart/tbl_chart.phtml:41
 msgctxt "Chart type"
 msgid "Timeline"
 msgstr ""
 
-#: templates/tbl_chart.phtml:45
+#: templates/table/chart/tbl_chart.phtml:45
 msgctxt "Chart type"
 msgid "Scatter"
 msgstr ""
 
-#: templates/tbl_chart.phtml:50
+#: templates/table/chart/tbl_chart.phtml:50
 msgid "Stacked"
 msgstr ""
 
-#: templates/tbl_chart.phtml:53
+#: templates/table/chart/tbl_chart.phtml:53
 msgid "Chart title"
 msgstr ""
 
-#: templates/tbl_chart.phtml:57
+#: templates/table/chart/tbl_chart.phtml:57
 msgid "X-Axis:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:72
+#: templates/table/chart/tbl_chart.phtml:72
 msgid "Series:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:102
+#: templates/table/chart/tbl_chart.phtml:102
 msgid "X-Axis label:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:104
+#: templates/table/chart/tbl_chart.phtml:104
 msgid "X Values"
 msgstr ""
 
-#: templates/tbl_chart.phtml:107
+#: templates/table/chart/tbl_chart.phtml:107
 msgid "Y-Axis label:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:115
+#: templates/table/chart/tbl_chart.phtml:115
 msgid "Series names are in a column"
 msgstr ""
 
-#: templates/tbl_chart.phtml:118
+#: templates/table/chart/tbl_chart.phtml:118
 msgid "Series column:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:130
+#: templates/table/chart/tbl_chart.phtml:130
 msgid "Value Column:"
 msgstr ""
 
-#: templates/tbl_chart.phtml:150
+#: templates/table/chart/tbl_chart.phtml:150
 msgid "Save chart as image"
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:7
+#: templates/table/gis_visualization/gis_visualization.phtml:3
+msgid "Display GIS Visualization"
+msgstr ""
+
+#: templates/table/gis_visualization/gis_visualization.phtml:8
+msgid "Label column"
+msgstr ""
+
+#: templates/table/gis_visualization/gis_visualization.phtml:11
+msgid "-- None --"
+msgstr "-- Geen --"
+
+#: templates/table/gis_visualization/gis_visualization.phtml:19
+msgid "Spatial column"
+msgstr ""
+
+#: templates/table/index_form.phtml:16
+msgid "Index name:"
+msgstr ""
+
+#: templates/table/index_form.phtml:19
+msgid ""
+"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
+msgstr ""
+
+#: templates/table/index_form.phtml:40
+msgid "Index choice:"
+msgstr ""
+
+#: templates/table/index_form.phtml:57
+msgid "Key block size:"
+msgstr ""
+
+#: templates/table/index_form.phtml:74
+msgid "Index type:"
+msgstr ""
+
+#: templates/table/index_form.phtml:86
+#, fuzzy
+#| msgid "User:"
+msgid "Parser:"
+msgstr "Gebruker:"
+
+#: templates/table/index_form.phtml:102
+msgid "Comment:"
+msgstr ""
+
+#: templates/table/index_form.phtml:149 templates/table/index_form.phtml:190
+msgid "Drag to reorder"
+msgstr ""
+
+#: templates/table/relation/common_form.phtml:7
 msgid "Internal relations"
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:11
+#: templates/table/relation/common_form.phtml:11
 msgid "Internal relation"
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:14
+#: templates/table/relation/common_form.phtml:14
 msgid ""
 "An internal relation is not necessary when a corresponding FOREIGN KEY "
 "relation exists."
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:37
+#: templates/table/relation/common_form.phtml:37
 msgid "Foreign key constraints"
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:40
+#: templates/table/relation/common_form.phtml:40
 msgid "Actions"
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:41
+#: templates/table/relation/common_form.phtml:41
 msgid "Constraint properties"
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:44
+#: templates/table/relation/common_form.phtml:44
 msgid ""
 "Only columns with index will be displayed. You can define an index below."
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:49
+#: templates/table/relation/common_form.phtml:49
 msgid "Foreign key constraint"
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:81
+#: templates/table/relation/common_form.phtml:81
 msgid "+ Add constraint"
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:91
+#: templates/table/relation/common_form.phtml:91
 msgid "Choose column to display:"
 msgstr ""
 
-#: templates/tbl_relation/foreign_key_row.phtml:13
+#: templates/table/relation/foreign_key_row.phtml:13
 #, php-format
 msgid "Foreign key constraint %s has been dropped"
 msgstr ""
 
-#: templates/tbl_relation/foreign_key_row.phtml:102
+#: templates/table/relation/foreign_key_row.phtml:102
 msgid "Constraint name"
 msgstr ""
 
-#: templates/tbl_relation/foreign_key_row.phtml:157
+#: templates/table/relation/foreign_key_row.phtml:157
 msgid "+ Add column"
 msgstr ""
 
+#: templates/table/search/options.phtml:8
+msgid "Select columns (at least one):"
+msgstr ""
+
+#: templates/table/search/options.phtml:37
+msgid "Add search conditions (body of the \"where\" clause):"
+msgstr ""
+
+#: templates/table/search/options.phtml:45
+msgid "Number of rows per page"
+msgstr ""
+
+#: templates/table/search/options.phtml:56
+msgid "Display order:"
+msgstr ""
+
+#: templates/table/search/options_zoom.phtml:6
+msgid "Use this column to label each point"
+msgstr ""
+
+#: templates/table/search/options_zoom.phtml:35
+msgid "Maximum rows to plot"
+msgstr ""
+
+#: templates/table/search/replace_preview.phtml:13
+msgid "Find and replace - preview"
+msgstr ""
+
+#: templates/table/search/replace_preview.phtml:18
+msgid "Original string"
+msgstr ""
+
+#: templates/table/search/replace_preview.phtml:19
+msgid "Replaced string"
+msgstr ""
+
+#: templates/table/search/replace_preview.phtml:40
+msgid "Replace"
+msgstr ""
+
+#: templates/table/search/rows_zoom.phtml:16
+msgid "Additional search criteria"
+msgstr ""
+
+#: templates/table/search/search_and_replace.phtml:3
+msgid "Replace with:"
+msgstr ""
+
+#: templates/table/search/search_and_replace.phtml:22
+msgid "Use regular expression"
+msgstr ""
+
+#: templates/table/search/selection_form.phtml:12
+msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
+msgstr ""
+
+#: templates/table/search/selection_form.phtml:34
+msgid "Do a \"query by example\" (wildcard: \"%\")"
+msgstr ""
+
+#: templates/table/search/zoom_result_form.phtml:7
+msgid "Browse/Edit the points"
+msgstr ""
+
+#: templates/table/search/zoom_result_form.phtml:15
+msgid "How to use"
+msgstr ""
+
+#: templates/table/search/zoom_result_form.phtml:23
+msgid "Reset zoom"
+msgstr ""
+
+#: templates/table/secondary_tabs.phtml:14
+msgid "Relation view"
+msgstr ""
+
+#: templates/table/structure/actions_in_table_structure.phtml:14
+#, php-format
+msgid "A primary key has been added on %s."
+msgstr ""
+
+#: templates/table/structure/actions_in_table_structure.phtml:34
+#: templates/table/structure/actions_in_table_structure.phtml:54
+#: templates/table/structure/actions_in_table_structure.phtml:79
+#: templates/table/structure/actions_in_table_structure.phtml:101
+#, php-format
+msgid "An index has been added on %s."
+msgstr ""
+
+#: templates/table/structure/actions_in_table_structure.phtml:130
+#: templates/table/structure/check_all_table_column.phtml:59
+msgid "Remove from central columns"
+msgstr ""
+
+#: templates/table/structure/actions_in_table_structure.phtml:138
+#: templates/table/structure/check_all_table_column.phtml:55
+msgid "Add to central columns"
+msgstr ""
+
+#: templates/table/structure/add_column.phtml:7
+#, php-format
+msgid "Add %s column(s)"
+msgstr ""
+
+#: templates/table/structure/add_column.phtml:12
+msgid "at beginning of table"
+msgstr ""
+
+#: templates/table/structure/display_structure.phtml:140 view_create.php:181
+msgid "Edit view"
+msgstr ""
+
+#: templates/table/structure/display_table_stats.phtml:9
+msgid "Space usage"
+msgstr ""
+
+#: templates/table/structure/display_table_stats.phtml:32
+msgid "Effective"
+msgstr ""
+
+#: templates/table/structure/move_columns_dialog.phtml:1
+#: templates/table/structure/optional_action_links.phtml:21
+msgid "Move columns"
+msgstr ""
+
+#: templates/table/structure/move_columns_dialog.phtml:2
+msgid "Move the columns by dragging them up and down."
+msgstr ""
+
+#: templates/table/structure/optional_action_links.phtml:9
+msgid "Propose table structure"
+msgstr ""
+
+#: templates/table/structure/optional_action_links.phtml:24
+msgid "Improve table structure"
+msgstr ""
+
+#: templates/table/structure/optional_action_links.phtml:30
+msgid "Track view"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:3
+msgid "Row statistics"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:9
+msgid "static"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:11
+msgid "dynamic"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:22
+msgid "partitioned"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:54
+msgid "Row length"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:66
+msgid "Row size"
+msgstr ""
+
+#: templates/table/structure/row_stats_table.phtml:73
+msgid "Next autoindex"
+msgstr ""
+
+#: templates/table/structure/table_structure_row.phtml:46
+#, php-format
+msgid "Column %s has been dropped."
+msgstr ""
+
 #: themes.php:17 themes.php:22
 msgid "Theme"
 msgstr ""
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 7b9dd8064a..e13f717822 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 4.5.0-dev\n"
 "Report-Msgid-Bugs-To: developers@phpmyadmin.net\n"
-"POT-Creation-Date: 2015-08-08 13:53-0400\n"
+"POT-Creation-Date: 2015-08-12 08:10-0400\n"
 "PO-Revision-Date: 2015-07-26 09:31+0200\n"
 "Last-Translator: popcorner <memoword@163.com>\n"
 "Language-Team: Chinese (China) <https://hosted.weblate.org/projects/"
@@ -51,7 +51,7 @@ msgid "Table comments:"
 msgstr "表注释："
 
 #: db_datadict.php:104 libraries/Index.class.php:699
-#: libraries/insert_edit.lib.php:1567
+#: libraries/insert_edit.lib.php:1565
 #: libraries/navigation/Nodes/Node_Column.class.php:30
 #: libraries/plugins/export/ExportHtmlword.class.php:280
 #: libraries/plugins/export/ExportHtmlword.class.php:375
@@ -65,13 +65,14 @@ msgstr "表注释："
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1023
 #: libraries/tracking.lib.php:879 libraries/tracking.lib.php:975
 #: templates/columns_definitions/column_name.phtml:18
-#: templates/index_form.phtml:124 templates/table/table_header.phtml:6
-#: templates/table/zoom_result_form.phtml:33
-#: templates/tbl_relation/common_form.phtml:10
-#: templates/tbl_relation/common_form.phtml:43
-#: templates/tbl_relation/foreign_key_row.phtml:194
-#: templates/tbl_relation/foreign_key_row.phtml:206
-#: templates/tbl_relation/internal_relational_row.phtml:71
+#: templates/table/index_form.phtml:124
+#: templates/table/relation/common_form.phtml:10
+#: templates/table/relation/common_form.phtml:43
+#: templates/table/relation/foreign_key_row.phtml:194
+#: templates/table/relation/foreign_key_row.phtml:206
+#: templates/table/relation/internal_relational_row.phtml:71
+#: templates/table/search/table_header.phtml:6
+#: templates/table/search/zoom_result_form.phtml:33
 msgid "Column"
 msgstr "字段"
 
@@ -89,21 +90,21 @@ msgstr "字段"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1001
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1024
 #: libraries/rte/rte_list.lib.php:75 libraries/rte/rte_list.lib.php:103
-#: libraries/rte/rte_routines.lib.php:802
-#: libraries/rte/rte_routines.lib.php:831
-#: libraries/rte/rte_routines.lib.php:1493
+#: libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_routines.lib.php:922
+#: libraries/rte/rte_routines.lib.php:1584
 #: libraries/server_privileges.lib.php:2369 libraries/tracking.lib.php:880
 #: libraries/tracking.lib.php:972
 #: templates/columns_definitions/table_fields_definitions.phtml:11
-#: templates/structure/table_header.phtml:48
-#: templates/structure/table_structure_header.phtml:6
-#: templates/table/table_header.phtml:7
+#: templates/database/structure/table_header.phtml:48
+#: templates/table/search/table_header.phtml:7
+#: templates/table/structure/table_structure_header.phtml:6
 msgid "Type"
 msgstr "类型"
 
 #: db_datadict.php:106 libraries/Index.class.php:702
 #: libraries/central_columns.lib.php:708
-#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1576
+#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1574
 #: libraries/plugins/export/ExportHtmlword.class.php:286
 #: libraries/plugins/export/ExportHtmlword.class.php:381
 #: libraries/plugins/export/ExportLatex.class.php:509
@@ -116,8 +117,8 @@ msgstr "类型"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1026
 #: libraries/tracking.lib.php:882 libraries/tracking.lib.php:978
 #: templates/columns_definitions/table_fields_definitions.phtml:39
-#: templates/structure/table_structure_header.phtml:9
-#: templates/table/zoom_result_form.phtml:34
+#: templates/table/search/zoom_result_form.phtml:34
+#: templates/table/structure/table_structure_header.phtml:9
 msgid "Null"
 msgstr "空"
 
@@ -135,8 +136,8 @@ msgstr "空"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1027
 #: libraries/replication_gui.lib.php:153 libraries/tracking.lib.php:883
 #: templates/columns_definitions/table_fields_definitions.phtml:25
-#: templates/structure/body_for_table_summary.phtml:55
-#: templates/structure/table_structure_header.phtml:10
+#: templates/database/structure/body_for_table_summary.phtml:55
+#: templates/table/structure/table_structure_header.phtml:10
 msgid "Default"
 msgstr "默认"
 
@@ -164,19 +165,19 @@ msgid "Comments"
 msgstr "注释"
 
 #: db_datadict.php:146
-#: libraries/controllers/StructureController.class.php:1960
-#: libraries/controllers/StructureController.class.php:1965
+#: libraries/controllers/TableStructureController.class.php:951
+#: libraries/controllers/TableStructureController.class.php:956
 #: libraries/tracking.lib.php:922
 #: templates/columns_definitions/column_indexes.phtml:6
-#: templates/structure/check_all_table_column.phtml:22
-#: templates/structure/display_structure.phtml:74
+#: templates/table/structure/check_all_table_column.phtml:22
+#: templates/table/structure/display_structure.phtml:74
 msgid "Primary"
 msgstr "主键"
 
 #: db_datadict.php:156 js/messages.php:317 libraries/Index.class.php:567
 #: libraries/Index.class.php:606 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261 libraries/mult_submits.lib.php:403
+#: libraries/config/FormDisplay.tpl.php:272 libraries/mult_submits.lib.php:403
 #: libraries/mult_submits.lib.php:417
 #: libraries/plugins/export/ExportHtmlword.class.php:630
 #: libraries/plugins/export/ExportLatex.class.php:589
@@ -192,20 +193,20 @@ msgstr "主键"
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1010 libraries/tracking.lib.php:1015
 #: prefs_manage.php:140 templates/prefs_autoload.phtml:15
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "No"
 msgstr "否"
 
 #: db_datadict.php:156 js/messages.php:443 libraries/Index.class.php:568
 #: libraries/Index.class.php:605 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261
-#: libraries/controllers/StructureController.class.php:1344
-#: libraries/controllers/StructureController.class.php:2223
-#: libraries/controllers/StructureController.class.php:2232
-#: libraries/controllers/StructureController.class.php:2237
-#: libraries/controllers/StructureController.class.php:2242
-#: libraries/controllers/StructureController.class.php:2247
+#: libraries/config/FormDisplay.tpl.php:272
+#: libraries/controllers/TableStructureController.class.php:539
+#: libraries/controllers/TableStructureController.class.php:1201
+#: libraries/controllers/TableStructureController.class.php:1210
+#: libraries/controllers/TableStructureController.class.php:1215
+#: libraries/controllers/TableStructureController.class.php:1220
+#: libraries/controllers/TableStructureController.class.php:1225
 #: libraries/mult_submits.inc.php:82 libraries/mult_submits.inc.php:178
 #: libraries/mult_submits.lib.php:339 libraries/mult_submits.lib.php:372
 #: libraries/mult_submits.lib.php:401 libraries/mult_submits.lib.php:415
@@ -214,8 +215,8 @@ msgstr "否"
 #: libraries/plugins/export/ExportOdt.class.php:756
 #: libraries/plugins/export/ExportTexytext.class.php:567
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1077
-#: libraries/server_databases.lib.php:464
-#: libraries/server_databases.lib.php:474
+#: libraries/server_databases.lib.php:475
+#: libraries/server_databases.lib.php:485
 #: libraries/server_privileges.lib.php:2546
 #: libraries/server_privileges.lib.php:2727
 #: libraries/server_privileges.lib.php:2748
@@ -225,7 +226,7 @@ msgstr "否"
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1008 libraries/tracking.lib.php:1013
 #: prefs_manage.php:138 templates/prefs_autoload.phtml:14
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "Yes"
 msgstr "是"
 
@@ -235,7 +236,7 @@ msgstr "查看数据库的转储（大纲）"
 
 #: db_export.php:37 db_tracking.php:90 export.php:382
 #: libraries/DBQbe.class.php:326
-#: libraries/controllers/StructureController.class.php:231
+#: libraries/controllers/DatabaseStructureController.class.php:170
 #: libraries/navigation/NavigationTree.class.php:897
 msgid "No tables found in database."
 msgstr "数据库中没有表。"
@@ -246,14 +247,14 @@ msgstr "数据库中没有表。"
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:26
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:120
-#: templates/structure/show_create.phtml:18
+#: templates/database/structure/show_create.phtml:18
 msgid "Tables"
 msgstr "表"
 
 #: db_export.php:52 libraries/Menu.class.php:317 libraries/Menu.class.php:425
-#: libraries/Util.class.php:3333 libraries/Util.class.php:3343
-#: libraries/Util.class.php:3349 libraries/Util.class.php:3629
-#: libraries/Util.class.php:4327 libraries/Util.class.php:4344
+#: libraries/Util.class.php:3339 libraries/Util.class.php:3349
+#: libraries/Util.class.php:3355 libraries/Util.class.php:3635
+#: libraries/Util.class.php:4333 libraries/Util.class.php:4350
 #: libraries/central_columns.lib.php:728 libraries/config.values.php:39
 #: libraries/config.values.php:47 libraries/config.values.php:109
 #: libraries/config.values.php:115 libraries/config/setup.forms.php:323
@@ -267,7 +268,7 @@ msgstr "表"
 #: libraries/navigation/Nodes/Node_Table.class.php:283
 #: libraries/server_privileges.lib.php:1141 libraries/tracking.lib.php:874
 #: templates/columns_definitions/table_fields_definitions.phtml:3
-#: templates/designer/table_list.phtml:28
+#: templates/database/designer/table_list.phtml:28
 msgid "Structure"
 msgstr "结构"
 
@@ -279,7 +280,7 @@ msgstr "结构"
 #: libraries/config/user_preferences.forms.php:292
 #: libraries/config/user_preferences.forms.php:297
 #: libraries/server_privileges.lib.php:1140
-#: templates/structure/display_table_stats.phtml:12
+#: templates/table/structure/display_table_stats.phtml:12
 msgid "Data"
 msgstr "数据"
 
@@ -352,10 +353,10 @@ msgstr "已追踪的表"
 #: libraries/server_privileges.lib.php:2908
 #: libraries/server_privileges.lib.php:3145
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4346
-#: templates/structure/table_header.phtml:21
-#: templates/tbl_relation/foreign_key_row.phtml:176
-#: templates/tbl_relation/internal_relational_row.phtml:63
+#: libraries/server_privileges.lib.php:4372
+#: templates/database/structure/table_header.phtml:21
+#: templates/table/relation/foreign_key_row.phtml:176
+#: templates/table/relation/internal_relational_row.phtml:63
 msgid "Table"
 msgstr "表"
 
@@ -372,7 +373,7 @@ msgid "Updated"
 msgstr "更新"
 
 #: db_tracking.php:130 js/messages.php:243 libraries/Menu.class.php:552
-#: libraries/Util.class.php:4314 libraries/config.values.php:104
+#: libraries/Util.class.php:4320 libraries/config.values.php:104
 #: libraries/rte/rte_events.lib.php:393 libraries/rte/rte_list.lib.php:101
 #: libraries/server_status_processes.lib.php:92 libraries/tracking.lib.php:279
 msgid "Status"
@@ -381,14 +382,15 @@ msgstr "状态"
 #: db_tracking.php:131 db_tracking.php:290 libraries/Index.class.php:693
 #: libraries/central_columns.lib.php:687 libraries/rte/rte_list.lib.php:74
 #: libraries/rte/rte_list.lib.php:89 libraries/rte/rte_list.lib.php:102
-#: libraries/server_databases.lib.php:398
+#: libraries/server_databases.lib.php:409
 #: libraries/server_privileges.lib.php:2372
 #: libraries/server_privileges.lib.php:3166
 #: libraries/server_privileges.lib.php:3342
 #: libraries/server_user_groups.lib.php:82
 #: libraries/server_variables.lib.php:189 libraries/tracking.lib.php:280
-#: libraries/tracking.lib.php:793 templates/structure/table_header.phtml:30
-#: templates/structure/table_structure_header.phtml:23
+#: libraries/tracking.lib.php:793
+#: templates/database/structure/table_header.phtml:30
+#: templates/table/structure/table_structure_header.phtml:23
 msgid "Action"
 msgstr "操作"
 
@@ -430,7 +432,7 @@ msgid "Untracked tables"
 msgstr "未追踪的表"
 
 #: db_tracking.php:305 db_tracking.php:336
-#: templates/structure/optional_action_links.phtml:17
+#: templates/table/structure/optional_action_links.phtml:17
 msgid "Track table"
 msgstr "追踪表"
 
@@ -480,7 +482,7 @@ msgid "Value for the column \"%s\""
 msgstr "字段“%s”的值"
 
 #: gis_data_editor.php:146
-#: templates/gis_visualization/gis_visualization.phtml:37
+#: templates/table/gis_visualization/gis_visualization.phtml:37
 msgid "Use OpenStreetMaps as Base Layer"
 msgstr "以 OpenStreetMaps 为背景"
 
@@ -560,35 +562,35 @@ msgstr "添加几何体"
 #: libraries/display_change_password.lib.php:162
 #: libraries/display_export.lib.php:402 libraries/display_export.lib.php:408
 #: libraries/display_import.lib.php:392 libraries/index.lib.php:44
-#: libraries/insert_edit.lib.php:1546 libraries/insert_edit.lib.php:1583
+#: libraries/insert_edit.lib.php:1544 libraries/insert_edit.lib.php:1581
 #: libraries/normalization.lib.php:165 libraries/normalization.lib.php:821
 #: libraries/operations.lib.php:38 libraries/operations.lib.php:108
 #: libraries/operations.lib.php:263 libraries/operations.lib.php:306
 #: libraries/operations.lib.php:801 libraries/operations.lib.php:874
 #: libraries/operations.lib.php:923 libraries/operations.lib.php:1337
 #: libraries/operations.lib.php:1658
-#: libraries/plugins/auth/AuthenticationCookie.class.php:244
+#: libraries/plugins/auth/AuthenticationCookie.class.php:232
 #: libraries/replication_gui.lib.php:122 libraries/replication_gui.lib.php:161
 #: libraries/replication_gui.lib.php:324 libraries/replication_gui.lib.php:461
 #: libraries/replication_gui.lib.php:906 libraries/rte/rte_events.lib.php:509
-#: libraries/rte/rte_routines.lib.php:969
-#: libraries/rte/rte_routines.lib.php:1581
+#: libraries/rte/rte_routines.lib.php:1060
+#: libraries/rte/rte_routines.lib.php:1672
 #: libraries/rte/rte_triggers.lib.php:396 libraries/server_bin_log.lib.php:61
 #: libraries/server_privileges.lib.php:705
 #: libraries/server_privileges.lib.php:2106
 #: libraries/server_privileges.lib.php:2872
 #: libraries/server_privileges.lib.php:3553
-#: libraries/server_privileges.lib.php:4627
+#: libraries/server_privileges.lib.php:4653
 #: libraries/server_user_groups.lib.php:285
 #: libraries/sql_query_form.lib.php:369 libraries/sql_query_form.lib.php:429
 #: libraries/tracking.lib.php:533 libraries/tracking.lib.php:653
 #: prefs_manage.php:277 prefs_manage.php:355
 #: templates/columns_definitions/column_definitions_form.phtml:59
-#: templates/header_location.phtml:17 templates/index_form.phtml:238
+#: templates/database/create_table.phtml:21 templates/header_location.phtml:28
 #: templates/startAndNumberOfRowsPanel.phtml:14
-#: templates/structure/add_column.phtml:25
-#: templates/table/create_table.phtml:21
-#: templates/table/selection_form.phtml:75 view_create.php:275
+#: templates/table/index_form.phtml:238
+#: templates/table/search/selection_form.phtml:75
+#: templates/table/structure/add_column.phtml:25 view_create.php:275
 #: view_operations.php:106
 msgid "Go"
 msgstr "执行"
@@ -672,7 +674,7 @@ msgstr "没有字符集转换库，无法转换文件字符集！"
 msgid "Could not load import plugins, please check your installation!"
 msgstr "无法加载导入插件，请检查您的安装！"
 
-#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1466
+#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1460
 #, php-format
 msgid "Bookmark %s has been created."
 msgstr "已创建书签 %s。"
@@ -711,11 +713,11 @@ msgstr ""
 msgid "Back"
 msgstr "返回"
 
-#: index.php:148 libraries/Footer.class.php:70
+#: index.php:149 libraries/Footer.class.php:70
 msgid "phpMyAdmin Demo Server"
 msgstr "phpMyAdmin 演示服务器"
 
-#: index.php:152
+#: index.php:153
 #, php-format
 msgid ""
 "You are using the demo server. You can do anything here, but please do not "
@@ -725,112 +727,112 @@ msgstr ""
 "您正在使用演示服务器。您可以在这里做任何事，但请不要修改 root、debian-sys-"
 "maint 和 pma 用户。详情请见 %s。"
 
-#: index.php:162
+#: index.php:163
 msgid "General Settings"
 msgstr "常规设置"
 
-#: index.php:190 libraries/display_change_password.lib.php:50
+#: index.php:191 libraries/display_change_password.lib.php:50
 #: libraries/display_change_password.lib.php:53 user_password.php:247
 msgid "Change password"
 msgstr "修改密码"
 
-#: index.php:206
+#: index.php:207
 msgid "Server connection collation"
 msgstr "服务器连接排序规则"
 
-#: index.php:228
+#: index.php:229
 msgid "Appearance Settings"
 msgstr "外观设置"
 
-#: index.php:258 prefs_manage.php:285
+#: index.php:259 prefs_manage.php:285
 msgid "More settings"
 msgstr "更多设置"
 
-#: index.php:279
+#: index.php:280
 msgid "Database server"
 msgstr "数据库服务器"
 
-#: index.php:282 libraries/plugins/auth/AuthenticationCookie.class.php:181
+#: index.php:283 libraries/plugins/auth/AuthenticationCookie.class.php:169
 msgid "Server:"
 msgstr "服务器："
 
-#: index.php:286
+#: index.php:287
 msgid "Server type:"
 msgstr "服务器类型："
 
-#: index.php:290 libraries/plugins/export/ExportLatex.class.php:212
+#: index.php:291 libraries/plugins/export/ExportLatex.class.php:212
 #: libraries/plugins/export/ExportSql.class.php:687
 #: libraries/plugins/export/ExportXml.class.php:189
 msgid "Server version:"
 msgstr "服务器版本："
 
-#: index.php:296
+#: index.php:297
 msgid "Protocol version:"
 msgstr "协议版本："
 
-#: index.php:300
+#: index.php:301
 msgid "User:"
 msgstr "用户："
 
-#: index.php:305
+#: index.php:306
 msgid "Server charset:"
 msgstr "服务器字符集："
 
-#: index.php:320
+#: index.php:321
 msgid "Web server"
 msgstr "网站服务器"
 
-#: index.php:331
+#: index.php:332
 msgid "Database client version:"
 msgstr "数据库客户端版本："
 
-#: index.php:335
+#: index.php:336
 msgid "PHP extension:"
 msgstr "PHP 扩展："
 
-#: index.php:349
+#: index.php:350
 #, fuzzy
 #| msgid "PHP Version"
 msgid "PHP version:"
 msgstr "PHP 版本"
 
-#: index.php:360
+#: index.php:361
 msgid "Show PHP information"
 msgstr "显示 PHP 信息"
 
-#: index.php:383
+#: index.php:384
 msgid "Version information:"
 msgstr "版本信息："
 
-#: index.php:392 libraries/Util.class.php:432 libraries/Util.class.php:495
-#: libraries/config/FormDisplay.tpl.php:151
+#: index.php:393 libraries/Util.class.php:432 libraries/Util.class.php:495
+#: libraries/config/FormDisplay.tpl.php:162
 #: libraries/display_export.lib.php:577 libraries/engines/pbxt.lib.php:162
 #: libraries/navigation/NavigationHeader.class.php:196
 #: libraries/server_variables.lib.php:160
 msgid "Documentation"
 msgstr "文档"
 
-#: index.php:399
+#: index.php:400
 msgid "Wiki"
 msgstr "维基"
 
-#: index.php:408
+#: index.php:409
 msgid "Official Homepage"
 msgstr "官方主页"
 
-#: index.php:415
+#: index.php:416
 msgid "Contribute"
 msgstr "贡献"
 
-#: index.php:422
+#: index.php:423
 msgid "Get support"
 msgstr "获取支持"
 
-#: index.php:429
+#: index.php:430
 msgid "List of changes"
 msgstr "更新列表"
 
-#: index.php:451
+#: index.php:452
 #, fuzzy
 #| msgid ""
 #| "Your configuration file contains settings (root with no password) that "
@@ -847,7 +849,7 @@ msgstr ""
 "器正在使用这个默认设置运行，这样容易被入侵，我们强烈建议您立即给‘root’用户设"
 "置一个密码来修复这个安全漏洞。"
 
-#: index.php:468
+#: index.php:469
 msgid ""
 "You have enabled mbstring.func_overload in your PHP configuration. This "
 "option is incompatible with phpMyAdmin and might cause some data to be "
@@ -856,7 +858,7 @@ msgstr ""
 "您在 PHP 设置中启用了 mbstring.func_overload。该选项和 phpMyAdmin 不兼容并可"
 "能会导致一些数据损坏！"
 
-#: index.php:483
+#: index.php:484
 msgid ""
 "The mbstring PHP extension was not found and you seem to be using a "
 "multibyte charset. Without the mbstring extension phpMyAdmin is unable to "
@@ -865,7 +867,7 @@ msgstr ""
 "没有找到 PHP 扩展 mbstring，而您现在好像在使用多字节字符集。没有 mbstring 扩"
 "展的 phpMyAdmin 不能正确分割字符串并可能产生意料之外的结果。"
 
-#: index.php:500
+#: index.php:501
 #, fuzzy
 #| msgid ""
 #| "Your PHP parameter [a@http://php.net/manual/en/session.configuration."
@@ -883,7 +885,7 @@ msgstr ""
 "中设置的 Cookies 有效期，因此您的登录会话有效期将会比您在 phpMyAdmin 中设置的"
 "时间要更短。"
 
-#: index.php:519
+#: index.php:520
 msgid ""
 "Login cookie store is lower than cookie validity configured in phpMyAdmin, "
 "because of this, your login will expire sooner than configured in phpMyAdmin."
@@ -891,11 +893,11 @@ msgstr ""
 "phpMyAdmin 中所设置的登录 cookie 存储小于 cookie 有效期，因此您的登录过期时间"
 "将会比您在 phpMyAdmin 中设置的时间要更短。"
 
-#: index.php:535
+#: index.php:536
 msgid "The configuration file now needs a secret passphrase (blowfish_secret)."
 msgstr "配置文件现在需要一个短语密码。"
 
-#: index.php:548
+#: index.php:549
 msgid ""
 "Directory [code]config[/code], which is used by the setup script, still "
 "exists in your phpMyAdmin directory. It is strongly recommended to remove it "
@@ -906,7 +908,7 @@ msgstr ""
 "phpMyAdmin 安装后立即删除该文件夹。否则未经授权的用户都可以下载您的配置文件从"
 "而使服务器陷入危险。"
 
-#: index.php:564
+#: index.php:565
 #, fuzzy, php-format
 #| msgid ""
 #| "The phpMyAdmin configuration storage is not completely configured, some "
@@ -917,12 +919,12 @@ msgid ""
 msgstr ""
 "phpMyAdmin 高级功能尚未完全设置，部分功能未激活。请点击%s这里%s查看原因。"
 
-#: index.php:571
+#: index.php:572
 msgid ""
 "Or alternately go to 'Operations' tab of any database to set it up there."
 msgstr ""
 
-#: index.php:620
+#: index.php:621
 #, php-format
 msgid ""
 "Your PHP MySQL library version %s differs from your MySQL server version %s. "
@@ -931,7 +933,7 @@ msgstr ""
 "您的 PHP MySQL 库版本 %s 与您的 MySQL 服务器版本 %s 不同。这可能导致无法预料"
 "的问题。"
 
-#: index.php:648
+#: index.php:649
 #, php-format
 msgid ""
 "Server running with Suhosin. Please refer to %sdocumentation%s for possible "
@@ -1092,8 +1094,8 @@ msgstr ""
 msgid "Save & Close"
 msgstr "保存并关闭"
 
-#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:404
-#: libraries/insert_edit.lib.php:1550 prefs_manage.php:361
+#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:415
+#: libraries/insert_edit.lib.php:1548 prefs_manage.php:361
 #: prefs_manage.php:372
 msgid "Reset"
 msgstr "重置"
@@ -1126,7 +1128,7 @@ msgstr "添加索引"
 msgid "Edit Index"
 msgstr "编辑索引"
 
-#: js/messages.php:99 templates/index_form.phtml:232
+#: js/messages.php:99 templates/table/index_form.phtml:232
 #, php-format
 msgid "Add %s column(s) to index"
 msgstr "添加 %s 个字段至索引"
@@ -1155,13 +1157,14 @@ msgstr "内容分隔符："
 msgid "Please select column(s) for the index."
 msgstr "添加 %s 个字段至索引"
 
-#: js/messages.php:106 templates/structure/add_column.phtml:1
+#: js/messages.php:106 templates/table/structure/add_column.phtml:1
 msgid "You have to add at least one column."
 msgstr "至少要添加一个字段。"
 
-#: js/messages.php:109 libraries/insert_edit.lib.php:1548
+#: js/messages.php:109 libraries/insert_edit.lib.php:1546
 #: templates/columns_definitions/column_definitions_form.phtml:162
-#: templates/index_form.phtml:237 templates/tbl_relation/common_form.phtml:106
+#: templates/table/index_form.phtml:237
+#: templates/table/relation/common_form.phtml:106
 msgid "Preview SQL"
 msgstr "预览 SQL 语句"
 
@@ -1178,7 +1181,7 @@ msgid "SQL query:"
 msgstr "SQL 查询："
 
 #. l10n: Default label for the y-Axis of Charts
-#: js/messages.php:118 templates/tbl_chart.phtml:109
+#: js/messages.php:118 templates/table/chart/tbl_chart.phtml:109
 msgid "Y Values"
 msgstr "纵值"
 
@@ -1337,7 +1340,7 @@ msgstr "已发送字节数"
 msgid "Bytes received"
 msgstr "已接收字节数"
 
-#: js/messages.php:169 libraries/server_status.lib.php:226
+#: js/messages.php:169 libraries/server_status.lib.php:235
 msgid "Connections"
 msgstr "连接"
 
@@ -1394,12 +1397,12 @@ msgstr "%d 张表"
 msgid "Questions"
 msgstr "内部查询"
 
-#: js/messages.php:184 libraries/server_status.lib.php:134
+#: js/messages.php:184 libraries/server_status.lib.php:143
 msgid "Traffic"
 msgstr "流量"
 
 #: js/messages.php:185 libraries/Menu.class.php:586
-#: libraries/Util.class.php:4318 libraries/server_status_monitor.lib.php:257
+#: libraries/Util.class.php:4324 libraries/server_status_monitor.lib.php:257
 msgid "Settings"
 msgstr "设置"
 
@@ -1419,8 +1422,9 @@ msgstr "请至少添加一个数据！"
 #: libraries/server_status_monitor.lib.php:236
 #: libraries/server_status_processes.lib.php:308
 #: templates/columns_definitions/transformation.phtml:4
-#: templates/designer/options_panel.phtml:178
-#: templates/table/options_zoom.phtml:12 templates/table/rows_zoom.phtml:26
+#: templates/database/designer/options_panel.phtml:178
+#: templates/table/search/options_zoom.phtml:12
+#: templates/table/search/rows_zoom.phtml:26
 msgid "None"
 msgstr "无"
 
@@ -1696,8 +1700,8 @@ msgstr "使用导入的设置建立图表失败。正在重设为默认设置…
 
 #: js/messages.php:270 libraries/Menu.class.php:352
 #: libraries/Menu.class.php:455 libraries/Menu.class.php:582
-#: libraries/Util.class.php:4317 libraries/Util.class.php:4332
-#: libraries/Util.class.php:4349 libraries/config/messages.inc.php:258
+#: libraries/Util.class.php:4323 libraries/Util.class.php:4338
+#: libraries/Util.class.php:4355 libraries/config/messages.inc.php:258
 #: libraries/display_import.lib.php:105
 #: libraries/server_status_monitor.lib.php:318 prefs_manage.php:238
 #: setup/frames/menu.inc.php:26
@@ -1757,13 +1761,13 @@ msgid "Formatting SQL..."
 msgstr ""
 
 #: js/messages.php:293 libraries/server_variables.lib.php:157
-#: templates/designer/aggregate_query_panel.phtml:63
-#: templates/designer/delete_relation_panel.phtml:28
-#: templates/designer/having_query_panel.phtml:117
-#: templates/designer/new_relation_panel.phtml:88
-#: templates/designer/options_panel.phtml:253
-#: templates/designer/rename_to_panel.phtml:45
-#: templates/designer/where_query_panel.phtml:83
+#: templates/database/designer/aggregate_query_panel.phtml:63
+#: templates/database/designer/delete_relation_panel.phtml:28
+#: templates/database/designer/having_query_panel.phtml:117
+#: templates/database/designer/new_relation_panel.phtml:88
+#: templates/database/designer/options_panel.phtml:253
+#: templates/database/designer/rename_to_panel.phtml:45
+#: templates/database/designer/where_query_panel.phtml:83
 msgid "Cancel"
 msgstr "取消"
 
@@ -1773,7 +1777,7 @@ msgstr "取消"
 msgid "Page-related settings"
 msgstr "修改设置"
 
-#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:402
+#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:413
 msgid "Apply"
 msgstr "应用"
 
@@ -1810,8 +1814,8 @@ msgstr "错误代码：%s"
 msgid "Error text: %s"
 msgstr "错误信息：%s"
 
-#: js/messages.php:307 libraries/db_common.inc.php:68
-#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:450
+#: js/messages.php:307 libraries/db_common.inc.php:69
+#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:461
 msgid "No databases selected."
 msgstr "没有已选择的数据库。"
 
@@ -1823,12 +1827,13 @@ msgstr "正在删除字段"
 msgid "Adding Primary Key"
 msgstr "正在添加主键"
 
-#: js/messages.php:310 templates/designer/aggregate_query_panel.phtml:59
-#: templates/designer/having_query_panel.phtml:113
-#: templates/designer/new_relation_panel.phtml:87
-#: templates/designer/options_panel.phtml:252
-#: templates/designer/rename_to_panel.phtml:41
-#: templates/designer/where_query_panel.phtml:82
+#: js/messages.php:310
+#: templates/database/designer/aggregate_query_panel.phtml:59
+#: templates/database/designer/having_query_panel.phtml:113
+#: templates/database/designer/new_relation_panel.phtml:87
+#: templates/database/designer/options_panel.phtml:252
+#: templates/database/designer/rename_to_panel.phtml:41
+#: templates/database/designer/where_query_panel.phtml:82
 msgid "OK"
 msgstr "确定"
 
@@ -1848,7 +1853,7 @@ msgstr "正在复制数据库"
 msgid "Changing Charset"
 msgstr "正在修改字符集"
 
-#: js/messages.php:320 libraries/Util.class.php:3217
+#: js/messages.php:320 libraries/Util.class.php:3223
 #, fuzzy
 #| msgid "Disable foreign key checks"
 msgid "Enable foreign key checks"
@@ -1885,20 +1890,21 @@ msgstr "函数定义中必须包含 RETURN 语句！"
 #: js/messages.php:334 libraries/DisplayResults.class.php:4834
 #: libraries/DisplayResults.class.php:5092 libraries/Menu.class.php:344
 #: libraries/Menu.class.php:446 libraries/Menu.class.php:578
-#: libraries/Util.class.php:3636 libraries/Util.class.php:3637
-#: libraries/Util.class.php:4316 libraries/Util.class.php:4331
-#: libraries/Util.class.php:4348 libraries/config/messages.inc.php:252
+#: libraries/Util.class.php:3642 libraries/Util.class.php:3643
+#: libraries/Util.class.php:4322 libraries/Util.class.php:4337
+#: libraries/Util.class.php:4354 libraries/config/messages.inc.php:252
 #: libraries/display_export.lib.php:173 libraries/rte/rte_list.lib.php:146
 #: libraries/server_privileges.lib.php:2211
 #: libraries/server_privileges.lib.php:2290
 #: libraries/server_privileges.lib.php:2632
 #: libraries/server_privileges.lib.php:3356
 #: libraries/server_status_monitor.lib.php:322 prefs_manage.php:303
-#: setup/frames/menu.inc.php:27 templates/structure/check_all_tables.phtml:11
+#: setup/frames/menu.inc.php:27
+#: templates/database/structure/check_all_tables.phtml:11
 msgid "Export"
 msgstr "导出"
 
-#: js/messages.php:337 libraries/rte/rte_routines.lib.php:652
+#: js/messages.php:337 libraries/rte/rte_routines.lib.php:743
 msgid "ENUM/SET editor"
 msgstr "ENUM/SET 编辑器"
 
@@ -1937,7 +1943,7 @@ msgstr "显示查询框"
 #: libraries/Console.class.php:214 libraries/DisplayResults.class.php:3474
 #: libraries/DisplayResults.class.php:4818 libraries/Index.class.php:723
 #: libraries/Util.class.php:706 libraries/Util.class.php:1202
-#: libraries/Util.class.php:3634 libraries/Util.class.php:3635
+#: libraries/Util.class.php:3640 libraries/Util.class.php:3641
 #: libraries/central_columns.lib.php:851
 #: libraries/central_columns.lib.php:1193
 #: libraries/config/messages.inc.php:892
@@ -1955,7 +1961,7 @@ msgstr "编辑"
 #: libraries/server_user_groups.lib.php:129
 #: libraries/sql_query_form.lib.php:416 libraries/tracking.lib.php:477
 #: setup/frames/index.inc.php:183 setup/frames/index.inc.php:291
-#: templates/designer/delete_relation_panel.phtml:27
+#: templates/database/designer/delete_relation_panel.phtml:27
 msgid "Delete"
 msgstr "删除"
 
@@ -2126,11 +2132,11 @@ msgid "No dependencies selected!"
 msgstr "没有已选择的数据库。"
 
 #: js/messages.php:394 libraries/central_columns.lib.php:1214
-#: libraries/insert_edit.lib.php:1458 libraries/server_variables.lib.php:155
+#: libraries/insert_edit.lib.php:1456 libraries/server_variables.lib.php:155
 #: setup/frames/config.inc.php:42 setup/frames/index.inc.php:279
 #: templates/columns_definitions/column_definitions_form.phtml:165
-#: templates/gis_visualization/gis_visualization.phtml:48
-#: templates/tbl_relation/common_form.phtml:107
+#: templates/table/gis_visualization/gis_visualization.phtml:48
+#: templates/table/relation/common_form.phtml:107
 msgid "Save"
 msgstr "保存"
 
@@ -2207,8 +2213,8 @@ msgid "Data point content"
 msgstr "数据点内容"
 
 #: js/messages.php:430 js/messages.php:562 js/messages.php:579
-#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2573
-#: templates/index_form.phtml:154 templates/index_form.phtml:194
+#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2571
+#: templates/table/index_form.phtml:154 templates/table/index_form.phtml:194
 msgid "Ignore"
 msgstr "忽略"
 
@@ -2267,8 +2273,8 @@ msgstr "选择外键"
 msgid "Please select the primary key or a unique key!"
 msgstr "请选择主键或唯一键！"
 
-#: js/messages.php:457 templates/designer/side_menu.phtml:91
-#: templates/designer/side_menu.phtml:94
+#: js/messages.php:457 templates/database/designer/side_menu.phtml:91
+#: templates/database/designer/side_menu.phtml:94
 msgid "Choose column to display"
 msgstr "选择要显示的字段"
 
@@ -2282,20 +2288,20 @@ msgstr "尚未保存当前布局。如果继续将会丢失本次的修改。是
 msgid "Page name"
 msgstr "页面名称"
 
-#: js/messages.php:463 templates/designer/side_menu.phtml:56
-#: templates/designer/side_menu.phtml:59
+#: js/messages.php:463 templates/database/designer/side_menu.phtml:56
+#: templates/database/designer/side_menu.phtml:59
 msgid "Save page"
 msgstr "保存页面"
 
-#: js/messages.php:464 templates/designer/side_menu.phtml:63
-#: templates/designer/side_menu.phtml:66
+#: js/messages.php:464 templates/database/designer/side_menu.phtml:63
+#: templates/database/designer/side_menu.phtml:66
 #, fuzzy
 #| msgid "Save page"
 msgid "Save page as"
 msgstr "保存页面"
 
-#: js/messages.php:465 templates/designer/side_menu.phtml:49
-#: templates/designer/side_menu.phtml:52
+#: js/messages.php:465 templates/database/designer/side_menu.phtml:49
+#: templates/database/designer/side_menu.phtml:52
 msgid "Open page"
 msgstr "打开页面"
 
@@ -2303,7 +2309,7 @@ msgstr "打开页面"
 msgid "Delete page"
 msgstr "删除页面"
 
-#: js/messages.php:467 templates/designer/side_menu.phtml:10
+#: js/messages.php:467 templates/database/designer/side_menu.phtml:10
 #, fuzzy
 #| msgid "Unit"
 msgid "Untitled"
@@ -2422,7 +2428,7 @@ msgstr "替换前"
 msgid "cancel"
 msgstr "取消"
 
-#: js/messages.php:499 libraries/server_status.lib.php:271
+#: js/messages.php:499 libraries/server_status.lib.php:280
 msgid "Aborted"
 msgstr "已取消"
 
@@ -3033,7 +3039,7 @@ msgstr "请输入一个有效的数字！"
 
 #: js/messages.php:793 libraries/Message.class.php:199
 #: libraries/Util.class.php:654 libraries/core.lib.php:245
-#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1172
+#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1170
 #: tbl_operations.php:229 view_operations.php:63
 msgid "Error"
 msgstr "错误"
@@ -3092,8 +3098,8 @@ msgstr "每秒"
 msgid "per minute"
 msgstr "每分钟"
 
-#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:143
-#: libraries/server_status.lib.php:228
+#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:152
+#: libraries/server_status.lib.php:237
 #: libraries/server_status_queries.lib.php:98
 msgid "per hour"
 msgstr "每小时"
@@ -3111,7 +3117,7 @@ msgstr "现有的配置文件（%s）是不可读的。"
 msgid "Wrong permissions on configuration file, should not be world writable!"
 msgstr "配置文件权限错误，不应任何用户都能修改！"
 
-#: libraries/Config.class.php:1799
+#: libraries/Config.class.php:1801
 msgid "Font size"
 msgstr "字号"
 
@@ -3141,10 +3147,10 @@ msgstr "子查询"
 #: libraries/server_privileges.lib.php:2890
 #: libraries/server_privileges.lib.php:3144
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4332
+#: libraries/server_privileges.lib.php:4358
 #: libraries/server_status_processes.lib.php:80
-#: templates/tbl_relation/foreign_key_row.phtml:165
-#: templates/tbl_relation/internal_relational_row.phtml:55
+#: templates/table/relation/foreign_key_row.phtml:165
+#: templates/table/relation/internal_relational_row.phtml:55
 msgid "Database"
 msgstr "数据库"
 
@@ -3254,11 +3260,11 @@ msgstr "SQL 历史"
 #: libraries/plugins/import/ImportMediawiki.class.php:60
 #: libraries/plugins/import/ImportOds.class.php:59
 #: libraries/plugins/import/ImportShp.class.php:57
-#: libraries/plugins/import/ImportSql.class.php:148
+#: libraries/plugins/import/ImportSql.class.php:51
 #: libraries/plugins/import/ImportXml.class.php:58
-#: libraries/rte/rte_routines.lib.php:833 templates/index_form.phtml:49
-#: templates/structure/row_stats_table.phtml:20
-#: templates/table/options.phtml:2
+#: libraries/rte/rte_routines.lib.php:924 templates/table/index_form.phtml:49
+#: templates/table/search/options.phtml:2
+#: templates/table/structure/row_stats_table.phtml:20
 msgid "Options"
 msgstr "选项"
 
@@ -3303,7 +3309,8 @@ msgstr "递减"
 msgid "Order:"
 msgstr "其它"
 
-#: libraries/Console.class.php:289 templates/table/replace_preview.phtml:17
+#: libraries/Console.class.php:289
+#: templates/table/search/replace_preview.phtml:17
 msgid "Count"
 msgstr "数量"
 
@@ -3428,9 +3435,9 @@ msgstr "切换到复制的数据表"
 #: libraries/operations.lib.php:794 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:191
-#: templates/structure/sortable_header.phtml:21
-#: templates/structure/sortable_header.phtml:38
-#: templates/table/options.phtml:68
+#: templates/database/structure/sortable_header.phtml:21
+#: templates/database/structure/sortable_header.phtml:38
+#: templates/table/search/options.phtml:68
 msgid "Ascending"
 msgstr "递增"
 
@@ -3440,13 +3447,14 @@ msgstr "递增"
 #: libraries/operations.lib.php:797 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:188
-#: templates/structure/sortable_header.phtml:26
-#: templates/structure/sortable_header.phtml:43
-#: templates/table/options.phtml:69
+#: templates/database/structure/sortable_header.phtml:26
+#: templates/database/structure/sortable_header.phtml:43
+#: templates/table/search/options.phtml:69
 msgid "Descending"
 msgstr "递减"
 
-#: libraries/DBQbe.class.php:467 templates/table/search_and_replace.phtml:6
+#: libraries/DBQbe.class.php:467
+#: templates/table/search/search_and_replace.phtml:6
 msgid "Column:"
 msgstr "字段："
 
@@ -3601,12 +3609,12 @@ msgid_plural "%1$s matches in <strong>%2$s</strong>"
 msgstr[0] "在 <strong>%2$s</strong> 中找到 %1$s 个"
 
 #: libraries/DbSearch.class.php:354 libraries/Menu.class.php:311
-#: libraries/Util.class.php:3337 libraries/Util.class.php:3347
-#: libraries/Util.class.php:3623 libraries/Util.class.php:3624
-#: libraries/Util.class.php:4343 libraries/config.values.php:43
+#: libraries/Util.class.php:3343 libraries/Util.class.php:3353
+#: libraries/Util.class.php:3629 libraries/Util.class.php:3630
+#: libraries/Util.class.php:4349 libraries/config.values.php:43
 #: libraries/config.values.php:51 libraries/config.values.php:119
 #: libraries/navigation/Nodes/Node_Table.class.php:295
-#: templates/structure/check_all_table_column.phtml:5
+#: templates/table/structure/check_all_table_column.phtml:5
 msgid "Browse"
 msgstr "浏览"
 
@@ -3623,7 +3631,8 @@ msgstr "在数据库中搜索"
 msgid "Words or values to search for (wildcard: \"%\"):"
 msgstr "要搜索的内容（通配符：“%”）："
 
-#: libraries/DbSearch.class.php:401 templates/table/search_and_replace.phtml:1
+#: libraries/DbSearch.class.php:401
+#: templates/table/search/search_and_replace.phtml:1
 msgid "Find:"
 msgstr "查找："
 
@@ -3667,28 +3676,28 @@ msgstr "过滤行"
 msgid "Search this table"
 msgstr "在表中搜索"
 
-#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2532
-#: libraries/Util.class.php:2535
+#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2538
+#: libraries/Util.class.php:2541
 msgctxt "First page"
 msgid "Begin"
 msgstr "首页"
 
-#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2533
-#: libraries/Util.class.php:2536 libraries/server_bin_log.lib.php:170
+#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2539
+#: libraries/Util.class.php:2542 libraries/server_bin_log.lib.php:170
 #: libraries/server_bin_log.lib.php:172
 msgctxt "Previous page"
 msgid "Previous"
 msgstr "上一页"
 
-#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2564
-#: libraries/Util.class.php:2574 libraries/server_bin_log.lib.php:204
+#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2570
+#: libraries/Util.class.php:2580 libraries/server_bin_log.lib.php:204
 #: libraries/server_bin_log.lib.php:206
 msgctxt "Next page"
 msgid "Next"
 msgstr "下一页"
 
-#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2565
-#: libraries/Util.class.php:2575
+#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2571
+#: libraries/Util.class.php:2581
 msgctxt "Last page"
 msgid "End"
 msgstr "尾页"
@@ -3763,15 +3772,15 @@ msgid "May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]."
 msgstr "可能是近似值。参见[doc@faq3-11]常见问题 3.11[/doc]。"
 
 #: libraries/DisplayResults.class.php:4332 libraries/Message.class.php:180
-#: libraries/controllers/TableRelationController.class.php:258
+#: libraries/controllers/TableRelationController.class.php:259
 #: libraries/controllers/TableSearchController.class.php:655
-#: libraries/rte/rte_routines.lib.php:1332 libraries/sql_query_form.lib.php:89
+#: libraries/rte/rte_routines.lib.php:1423 libraries/sql_query_form.lib.php:89
 #: tbl_operations.php:227 tbl_row_action.php:138 view_operations.php:62
 msgid "Your SQL query has been executed successfully."
 msgstr "您的 SQL 语句已成功运行。"
 
 #: libraries/DisplayResults.class.php:4660
-#: libraries/controllers/StructureController.class.php:629
+#: libraries/controllers/DatabaseStructureController.class.php:564
 #, php-format
 msgid ""
 "This view has at least this number of rows. Please refer to %sdocumentation"
@@ -3793,33 +3802,33 @@ msgstr "总数为 %1$d，查询包含 %2$d"
 msgid "%d total"
 msgstr "共 %d 行"
 
-#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1318
+#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1312
 #, php-format
 msgid "Query took %01.4f seconds."
 msgstr "查询花费 %01.4f 秒。"
 
 #: libraries/DisplayResults.class.php:4807
-#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4767
-#: libraries/Util.class.php:4773 libraries/mult_submits.inc.php:50
-#: templates/structure/check_all_tables.phtml:2
-#: templates/structure/check_all_tables.phtml:9
+#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4773
+#: libraries/Util.class.php:4779 libraries/mult_submits.inc.php:50
+#: templates/database/structure/check_all_tables.phtml:2
+#: templates/database/structure/check_all_tables.phtml:9
 msgid "With selected:"
 msgstr "选中项："
 
 #: libraries/DisplayResults.class.php:4811
-#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4769
-#: libraries/Util.class.php:4770 libraries/server_privileges.lib.php:1174
+#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4775
+#: libraries/Util.class.php:4776 libraries/server_privileges.lib.php:1174
 #: libraries/server_privileges.lib.php:1175
 #: libraries/server_privileges.lib.php:1387
 #: libraries/server_user_groups.lib.php:231
-#: templates/structure/check_all_tables.phtml:3
-#: templates/structure/check_all_tables.phtml:4
+#: templates/database/structure/check_all_tables.phtml:3
+#: templates/database/structure/check_all_tables.phtml:4
 msgid "Check All"
 msgstr "全选"
 
 #: libraries/DisplayResults.class.php:4985 libraries/Header.class.php:383
-#: templates/structure/optional_action_links.phtml:1
-#: templates/structure/print_view_data_dictionary_link.phtml:3
+#: templates/database/structure/print_view_data_dictionary_link.phtml:3
+#: templates/table/structure/optional_action_links.phtml:1
 msgid "Print view"
 msgstr "打印预览"
 
@@ -3827,7 +3836,8 @@ msgstr "打印预览"
 msgid "Query results operations"
 msgstr "查询结果操作"
 
-#: libraries/DisplayResults.class.php:5105 templates/tbl_chart.phtml:12
+#: libraries/DisplayResults.class.php:5105
+#: templates/table/chart/tbl_chart.phtml:12
 msgid "Display chart"
 msgstr "显示图表"
 
@@ -3920,7 +3930,7 @@ msgid "Click on the bar to scroll to top of page"
 msgstr "点击以滚动到页面顶部"
 
 #: libraries/Header.class.php:749
-#: libraries/plugins/auth/AuthenticationCookie.class.php:152
+#: libraries/plugins/auth/AuthenticationCookie.class.php:140
 msgid "Javascript must be enabled past this point!"
 msgstr "该处必须启用 Javascript！"
 
@@ -3942,11 +3952,11 @@ msgid "Keyname"
 msgstr "键名"
 
 #: libraries/Index.class.php:697
-#: libraries/controllers/StructureController.class.php:1962
-#: libraries/controllers/StructureController.class.php:1967
+#: libraries/controllers/TableStructureController.class.php:953
+#: libraries/controllers/TableStructureController.class.php:958
 #: libraries/tracking.lib.php:973
 #: templates/columns_definitions/column_indexes.phtml:11
-#: templates/structure/check_all_table_column.phtml:26
+#: templates/table/structure/check_all_table_column.phtml:26
 msgid "Unique"
 msgstr "唯一"
 
@@ -3965,16 +3975,17 @@ msgstr "基数"
 #: libraries/server_collations.lib.php:35 libraries/tracking.lib.php:881
 #: libraries/tracking.lib.php:977
 #: templates/columns_definitions/table_fields_definitions.phtml:33
-#: templates/structure/row_stats_table.phtml:31
-#: templates/structure/table_header.phtml:55
-#: templates/structure/table_structure_header.phtml:7
-#: templates/table/table_header.phtml:8
+#: templates/database/structure/table_header.phtml:55
+#: templates/table/search/table_header.phtml:8
+#: templates/table/structure/row_stats_table.phtml:31
+#: templates/table/structure/table_structure_header.phtml:7
 msgid "Collation"
 msgstr "排序规则"
 
 #: libraries/Index.class.php:703 libraries/rte/rte_events.lib.php:496
-#: libraries/rte/rte_routines.lib.php:956 libraries/tracking.lib.php:885
-#: libraries/tracking.lib.php:979 templates/structure/table_header.phtml:84
+#: libraries/rte/rte_routines.lib.php:1047 libraries/tracking.lib.php:885
+#: libraries/tracking.lib.php:979
+#: templates/database/structure/table_header.phtml:84
 msgid "Comment"
 msgstr "注释"
 
@@ -3987,15 +3998,15 @@ msgstr "已删除主键。"
 msgid "Index %s has been dropped."
 msgstr "已删除索引 %s。"
 
-#: libraries/Index.class.php:757 libraries/Util.class.php:3630
-#: libraries/Util.class.php:3631
-#: libraries/controllers/StructureController.class.php:1958
-#: libraries/controllers/StructureController.class.php:1959
+#: libraries/Index.class.php:757 libraries/Util.class.php:3636
+#: libraries/Util.class.php:3637
+#: libraries/controllers/TableStructureController.class.php:949
+#: libraries/controllers/TableStructureController.class.php:950
 #: libraries/operations.lib.php:1607 libraries/rte/rte_list.lib.php:150
 #: libraries/server_databases.lib.php:146
-#: templates/structure/check_all_table_column.phtml:15
-#: templates/structure/check_all_tables.phtml:16
-#: templates/tbl_relation/foreign_key_row.phtml:93
+#: templates/database/structure/check_all_tables.phtml:16
+#: templates/table/relation/foreign_key_row.phtml:93
+#: templates/table/structure/check_all_table_column.phtml:15
 msgid "Drop"
 msgstr "删除"
 
@@ -4024,16 +4035,16 @@ msgstr "服务器"
 #: libraries/Menu.class.php:248
 #: libraries/navigation/Nodes/Node_View.class.php:32
 #: libraries/tbl_info.inc.php:63
-#: templates/structure/structure_table_row.phtml:97
-#: templates/structure/structure_table_row.phtml:159
+#: templates/database/structure/structure_table_row.phtml:97
+#: templates/database/structure/structure_table_row.phtml:159
 msgid "View"
 msgstr "视图"
 
 #: libraries/Menu.class.php:325 libraries/Menu.class.php:429
-#: libraries/Menu.class.php:548 libraries/Util.class.php:3334
-#: libraries/Util.class.php:3344 libraries/Util.class.php:3350
-#: libraries/Util.class.php:4313 libraries/Util.class.php:4328
-#: libraries/Util.class.php:4345 libraries/config.values.php:40
+#: libraries/Menu.class.php:548 libraries/Util.class.php:3340
+#: libraries/Util.class.php:3350 libraries/Util.class.php:3356
+#: libraries/Util.class.php:4319 libraries/Util.class.php:4334
+#: libraries/Util.class.php:4351 libraries/config.values.php:40
 #: libraries/config.values.php:48 libraries/config.values.php:110
 #: libraries/config.values.php:116 libraries/config/messages.inc.php:321
 #: libraries/navigation/Nodes/Node_Table.class.php:292
@@ -4041,19 +4052,19 @@ msgid "SQL"
 msgstr "SQL"
 
 #: libraries/Menu.class.php:328 libraries/Menu.class.php:432
-#: libraries/Util.class.php:3335 libraries/Util.class.php:3345
-#: libraries/Util.class.php:3351 libraries/Util.class.php:3625
-#: libraries/Util.class.php:3626 libraries/Util.class.php:4329
-#: libraries/Util.class.php:4346 libraries/config.values.php:41
+#: libraries/Util.class.php:3341 libraries/Util.class.php:3351
+#: libraries/Util.class.php:3357 libraries/Util.class.php:3631
+#: libraries/Util.class.php:3632 libraries/Util.class.php:4335
+#: libraries/Util.class.php:4352 libraries/config.values.php:41
 #: libraries/config.values.php:49 libraries/config.values.php:111
 #: libraries/config.values.php:117
 #: libraries/navigation/Nodes/Node_Table.class.php:286
 msgid "Search"
 msgstr "搜索"
 
-#: libraries/Menu.class.php:338 libraries/Util.class.php:3336
-#: libraries/Util.class.php:3346 libraries/Util.class.php:3627
-#: libraries/Util.class.php:3628 libraries/Util.class.php:4347
+#: libraries/Menu.class.php:338 libraries/Util.class.php:3342
+#: libraries/Util.class.php:3352 libraries/Util.class.php:3633
+#: libraries/Util.class.php:3634 libraries/Util.class.php:4353
 #: libraries/config.values.php:42 libraries/config.values.php:50
 #: libraries/config.values.php:118
 #: libraries/navigation/Nodes/Node_Table.class.php:289
@@ -4062,30 +4073,30 @@ msgid "Insert"
 msgstr "插入"
 
 #: libraries/Menu.class.php:362 libraries/Menu.class.php:467
-#: libraries/Util.class.php:4334 libraries/Util.class.php:4350
+#: libraries/Util.class.php:4340 libraries/Util.class.php:4356
 #: libraries/config.values.php:106 libraries/server_common.lib.php:51
 #: libraries/server_privileges.lib.php:2370
 #: libraries/server_privileges.lib.php:3158
-#: libraries/server_privileges.lib.php:4221
+#: libraries/server_privileges.lib.php:4247
 msgid "Privileges"
 msgstr "权限"
 
 #: libraries/Menu.class.php:371 libraries/Menu.class.php:379
-#: libraries/Menu.class.php:459 libraries/Util.class.php:3338
-#: libraries/Util.class.php:3352 libraries/Util.class.php:4333
-#: libraries/Util.class.php:4351 libraries/config.values.php:112
+#: libraries/Menu.class.php:459 libraries/Util.class.php:3344
+#: libraries/Util.class.php:3358 libraries/Util.class.php:4339
+#: libraries/Util.class.php:4357 libraries/config.values.php:112
 #: view_operations.php:92
 msgid "Operations"
 msgstr "操作"
 
 #: libraries/Menu.class.php:384 libraries/Menu.class.php:492
-#: libraries/Util.class.php:4338 libraries/Util.class.php:4352
+#: libraries/Util.class.php:4344 libraries/Util.class.php:4358
 #: libraries/relation.lib.php:255
 msgid "Tracking"
 msgstr "追踪"
 
 #: libraries/Menu.class.php:397 libraries/Menu.class.php:486
-#: libraries/Util.class.php:4337 libraries/Util.class.php:4353
+#: libraries/Util.class.php:4343 libraries/Util.class.php:4359
 #: libraries/navigation/Nodes/Node_Trigger_Container.class.php:24
 #: libraries/plugins/export/ExportHtmlword.class.php:557
 #: libraries/plugins/export/ExportOdt.class.php:685
@@ -4102,16 +4113,16 @@ msgstr "触发器"
 msgid "Database seems to be empty!"
 msgstr "数据库是空的！"
 
-#: libraries/Menu.class.php:439 libraries/Util.class.php:4330
+#: libraries/Menu.class.php:439 libraries/Util.class.php:4336
 msgid "Query"
 msgstr "查询"
 
-#: libraries/Menu.class.php:472 libraries/Util.class.php:4335
+#: libraries/Menu.class.php:472 libraries/Util.class.php:4341
 #: libraries/rte/rte_words.lib.php:36
 msgid "Routines"
 msgstr "程序"
 
-#: libraries/Menu.class.php:479 libraries/Util.class.php:4336
+#: libraries/Menu.class.php:479 libraries/Util.class.php:4342
 #: libraries/navigation/Nodes/Node_Event_Container.class.php:26
 #: libraries/plugins/export/ExportSql.class.php:940
 #: libraries/plugins/export/ExportXml.class.php:107
@@ -4119,22 +4130,22 @@ msgstr "程序"
 msgid "Events"
 msgstr "事件"
 
-#: libraries/Menu.class.php:498 libraries/Util.class.php:4339
+#: libraries/Menu.class.php:498 libraries/Util.class.php:4345
 msgid "Designer"
 msgstr "设计器"
 
-#: libraries/Menu.class.php:507 libraries/Util.class.php:4340
-#: templates/structure/check_all_tables.phtml:35
+#: libraries/Menu.class.php:507 libraries/Util.class.php:4346
+#: templates/database/structure/check_all_tables.phtml:35
 #, fuzzy
 #| msgid "Textarea columns"
 msgid "Central columns"
 msgstr "文本框列"
 
-#: libraries/Menu.class.php:544 libraries/Util.class.php:4312
+#: libraries/Menu.class.php:544 libraries/Util.class.php:4318
 #: libraries/config.values.php:103 libraries/config/messages.inc.php:266
 #: libraries/config/messages.inc.php:341
 #: libraries/navigation/NavigationTree.class.php:1239
-#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4332
+#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4358
 msgid "Databases"
 msgstr "数据库"
 
@@ -4145,34 +4156,34 @@ msgid "User accounts"
 msgstr "用户"
 
 #: libraries/Menu.class.php:595 libraries/ServerStatusData.class.php:121
-#: libraries/Util.class.php:4319 libraries/server_common.lib.php:36
+#: libraries/Util.class.php:4325 libraries/server_common.lib.php:36
 msgid "Binary log"
 msgstr "二进制日志"
 
 #: libraries/Menu.class.php:601 libraries/ServerStatusData.class.php:126
-#: libraries/Util.class.php:4320 libraries/server_common.lib.php:42
-#: templates/structure/body_for_table_summary.phtml:10
-#: templates/structure/table_header.phtml:27
+#: libraries/Util.class.php:4326 libraries/server_common.lib.php:42
+#: templates/database/structure/body_for_table_summary.phtml:10
+#: templates/database/structure/table_header.phtml:27
 msgid "Replication"
 msgstr "复制"
 
 #: libraries/Menu.class.php:606 libraries/ServerStatusData.class.php:193
-#: libraries/Util.class.php:4321 libraries/config.values.php:105
+#: libraries/Util.class.php:4327 libraries/config.values.php:105
 #: libraries/server_engines.lib.php:108 libraries/server_engines.lib.php:112
 #: libraries/sql_query_form.lib.php:421
 msgid "Variables"
 msgstr "变量"
 
-#: libraries/Menu.class.php:610 libraries/Util.class.php:4322
+#: libraries/Menu.class.php:610 libraries/Util.class.php:4328
 msgid "Charsets"
 msgstr "字符集"
 
-#: libraries/Menu.class.php:615 libraries/Util.class.php:4323
+#: libraries/Menu.class.php:615 libraries/Util.class.php:4329
 #: libraries/server_common.lib.php:33 libraries/server_plugins.lib.php:27
 msgid "Plugins"
 msgstr "插件"
 
-#: libraries/Menu.class.php:626 libraries/Util.class.php:4324
+#: libraries/Menu.class.php:626 libraries/Util.class.php:4330
 msgid "Engines"
 msgstr "引擎"
 
@@ -4194,7 +4205,7 @@ msgid "%1$d row inserted."
 msgid_plural "%1$d rows inserted."
 msgstr[0] "插入了 %1$d 行。"
 
-#: libraries/PDF.class.php:70 libraries/Util.class.php:2521
+#: libraries/PDF.class.php:70 libraries/Util.class.php:2527
 #: libraries/browse_foreigners.lib.php:327
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:865
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:890
@@ -4215,7 +4226,7 @@ msgid "Could not save favorite table!"
 msgstr "无法保存到表收藏夹！"
 
 #: libraries/RecentFavoriteTable.class.php:212
-#: templates/structure/favorite_anchor.phtml:12
+#: templates/database/structure/favorite_anchor.phtml:12
 msgid "Remove from Favorites"
 msgstr "从收藏夹中移除"
 
@@ -4378,7 +4389,7 @@ msgid ""
 msgstr "没有该存储引擎的详细状态信息。"
 
 #: libraries/StorageEngine.class.php:373
-#: templates/structure/body_for_table_summary.phtml:50
+#: templates/database/structure/body_for_table_summary.phtml:50
 #, php-format
 msgid "%s is the default storage engine on this MySQL server."
 msgstr "%s 是该 MySQL 服务器的默认存储引擎。"
@@ -4827,10 +4838,10 @@ msgstr ""
 
 #: libraries/Util.class.php:726 libraries/rte/rte_events.lib.php:110
 #: libraries/rte/rte_events.lib.php:119 libraries/rte/rte_events.lib.php:150
-#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:153
-#: libraries/rte/rte_routines.lib.php:162
-#: libraries/rte/rte_routines.lib.php:235
-#: libraries/rte/rte_routines.lib.php:1366
+#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:223
+#: libraries/rte/rte_routines.lib.php:250
+#: libraries/rte/rte_routines.lib.php:372
+#: libraries/rte/rte_routines.lib.php:1457
 #: libraries/rte/rte_triggers.lib.php:86 libraries/rte/rte_triggers.lib.php:95
 #: libraries/rte/rte_triggers.lib.php:127
 msgid "MySQL said: "
@@ -4876,75 +4887,78 @@ msgstr "周日"
 msgid "%B %d, %Y at %I:%M %p"
 msgstr "%Y-%m-%d %H:%M:%S"
 
-#: libraries/Util.class.php:2019
+#: libraries/Util.class.php:2025
 #, php-format
 msgid "%s days, %s hours, %s minutes and %s seconds"
 msgstr "%s 天 %s 小时，%s 分 %s 秒"
 
-#: libraries/Util.class.php:2112
+#: libraries/Util.class.php:2118
 msgid "Missing parameter:"
 msgstr "缺少参数："
 
-#: libraries/Util.class.php:2645
+#: libraries/Util.class.php:2651
 #, php-format
 msgid "Jump to database \"%s\"."
 msgstr "转到数据库 \"%s\"。"
 
-#: libraries/Util.class.php:2670
+#: libraries/Util.class.php:2676
 #, php-format
 msgid "The %s functionality is affected by a known bug, see %s"
 msgstr "功能 %s 受到一个已知缺陷的影响，参见 %s"
 
-#: libraries/Util.class.php:2881
+#: libraries/Util.class.php:2887
 msgid "Click to toggle"
 msgstr "点击切换"
 
-#: libraries/Util.class.php:3542 prefs_manage.php:248
+#: libraries/Util.class.php:3548 prefs_manage.php:248
 msgid "Browse your computer:"
 msgstr "从计算机中上传："
 
-#: libraries/Util.class.php:3567
+#: libraries/Util.class.php:3573
 #, php-format
 msgid "Select from the web server upload directory <b>%s</b>:"
 msgstr "从网站服务器上传文件夹 <b>%s</b> 中选择："
 
-#: libraries/Util.class.php:3596 libraries/insert_edit.lib.php:1173
+#: libraries/Util.class.php:3602 libraries/insert_edit.lib.php:1171
 msgid "The directory you set for upload work cannot be reached."
 msgstr "无法访问用于上传的文件夹。"
 
-#: libraries/Util.class.php:3607
+#: libraries/Util.class.php:3613
 msgid "There are no files to upload!"
 msgstr "没有可上传的文件！"
 
-#: libraries/Util.class.php:3632 libraries/Util.class.php:3633
-#: templates/structure/check_all_tables.phtml:15
+#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: templates/database/structure/check_all_tables.phtml:15
 msgid "Empty"
 msgstr "清空"
 
-#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: libraries/Util.class.php:3644 libraries/Util.class.php:3645
 msgid "Execute"
 msgstr "执行"
 
-#: libraries/Util.class.php:4152
+#: libraries/Util.class.php:4158
 msgid "Print"
 msgstr "打印"
 
-#: libraries/Util.class.php:4257 templates/structure/row_stats_table.phtml:80
-#: templates/structure/table_header.phtml:95
+#: libraries/Util.class.php:4263
+#: templates/database/structure/table_header.phtml:95
+#: templates/table/structure/row_stats_table.phtml:80
 msgid "Creation"
 msgstr "创建时间"
 
-#: libraries/Util.class.php:4263 templates/structure/row_stats_table.phtml:87
-#: templates/structure/table_header.phtml:106
+#: libraries/Util.class.php:4269
+#: templates/database/structure/table_header.phtml:106
+#: templates/table/structure/row_stats_table.phtml:87
 msgid "Last update"
 msgstr "最后更新"
 
-#: libraries/Util.class.php:4269 templates/structure/row_stats_table.phtml:94
-#: templates/structure/table_header.phtml:117
+#: libraries/Util.class.php:4275
+#: templates/database/structure/table_header.phtml:117
+#: templates/table/structure/row_stats_table.phtml:94
 msgid "Last check"
 msgstr "最后检查"
 
-#: libraries/Util.class.php:4315
+#: libraries/Util.class.php:4321
 msgid "Users"
 msgstr "用户"
 
@@ -4965,16 +4979,16 @@ msgid "Use this value"
 msgstr "使用该值"
 
 #: libraries/build_html_for_db.lib.php:33 libraries/import.lib.php:193
-#: templates/structure/actions_in_table_structure.phtml:113
-#: templates/structure/row_stats_table.phtml:42
-#: templates/structure/table_header.phtml:36
+#: templates/database/structure/table_header.phtml:36
+#: templates/table/structure/actions_in_table_structure.phtml:113
+#: templates/table/structure/row_stats_table.phtml:42
 msgid "Rows"
 msgstr "行数"
 
 #: libraries/build_html_for_db.lib.php:48 libraries/engines/innodb.lib.php:171
-#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:186
-#: libraries/server_status.lib.php:298
-#: templates/structure/display_table_stats.phtml:40
+#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:195
+#: libraries/server_status.lib.php:307
+#: templates/table/structure/display_table_stats.phtml:40
 msgid "Total"
 msgstr "总计"
 
@@ -4983,10 +4997,12 @@ msgid "Jump to database"
 msgstr "转到数据库"
 
 #: libraries/build_html_for_db.lib.php:146
+#: templates/database/structure/structure_table_row.phtml:15
 msgid "Not replicated"
 msgstr "未复制"
 
 #: libraries/build_html_for_db.lib.php:158
+#: templates/database/structure/structure_table_row.phtml:16
 msgid "Replicated"
 msgstr "已复制"
 
@@ -5043,17 +5059,17 @@ msgstr ""
 #: libraries/plugins/export/ExportTexytext.class.php:425
 #: libraries/plugins/export/PMA_ExportPdf.class.php:307
 #: libraries/rte/rte_list.lib.php:73 libraries/rte/rte_list.lib.php:85
-#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:830
-#: libraries/rte/rte_routines.lib.php:1492 setup/frames/index.inc.php:162
+#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:921
+#: libraries/rte/rte_routines.lib.php:1583 setup/frames/index.inc.php:162
 #: templates/columns_definitions/table_fields_definitions.phtml:8
-#: templates/structure/table_structure_header.phtml:5
-#: templates/table/create_table.phtml:11
+#: templates/database/create_table.phtml:11
+#: templates/table/structure/table_structure_header.phtml:5
 msgid "Name"
 msgstr "名字"
 
 #: libraries/central_columns.lib.php:699
 #: libraries/central_columns.lib.php:1381
-#: libraries/rte/rte_routines.lib.php:832
+#: libraries/rte/rte_routines.lib.php:923
 #: templates/columns_definitions/table_fields_definitions.phtml:14
 msgid "Length/Values"
 msgstr "长度/值"
@@ -5076,7 +5092,7 @@ msgid "Select a table"
 msgstr "选择表"
 
 #: libraries/central_columns.lib.php:804
-#: templates/structure/add_column.phtml:4
+#: templates/table/structure/add_column.phtml:4
 msgid "Add column"
 msgstr "添加字段"
 
@@ -5096,7 +5112,7 @@ msgstr "添加字段"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1002
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1025
 #: templates/columns_definitions/table_fields_definitions.phtml:36
-#: templates/structure/table_structure_header.phtml:8
+#: templates/table/structure/table_structure_header.phtml:8
 msgid "Attributes"
 msgstr "属性"
 
@@ -5205,7 +5221,7 @@ msgid "Double click"
 msgstr "双击"
 
 #: libraries/config.values.php:95 libraries/config.values.php:124
-#: libraries/config/FormDisplay.tpl.php:221 libraries/relation.lib.php:97
+#: libraries/config/FormDisplay.tpl.php:232 libraries/relation.lib.php:97
 #: libraries/relation.lib.php:105
 msgid "Disabled"
 msgstr "已禁用"
@@ -5385,21 +5401,21 @@ msgstr "因缺少函数 %s 压缩导出功能无效。"
 msgid "maximum %s"
 msgstr "最大 %s"
 
-#: libraries/config/FormDisplay.tpl.php:219
+#: libraries/config/FormDisplay.tpl.php:230
 msgid "This setting is disabled, it will not be applied to your configuration."
 msgstr "该设置已禁用，不会被应用到您的设置中。"
 
-#: libraries/config/FormDisplay.tpl.php:313
+#: libraries/config/FormDisplay.tpl.php:324
 #, php-format
 msgid "Set value: %s"
 msgstr "设置值：%s"
 
-#: libraries/config/FormDisplay.tpl.php:318
+#: libraries/config/FormDisplay.tpl.php:329
 #: libraries/config/messages.inc.php:610
 msgid "Restore default value"
 msgstr "还原为默认值"
 
-#: libraries/config/FormDisplay.tpl.php:332
+#: libraries/config/FormDisplay.tpl.php:343
 msgid "Allow users to customize this value"
 msgstr "允许用户自定义该值"
 
@@ -5857,7 +5873,7 @@ msgstr "文件字符集"
 
 #: libraries/config/messages.inc.php:136 libraries/config/messages.inc.php:152
 #: libraries/sql_query_form.lib.php:247
-#: templates/structure/row_stats_table.phtml:7
+#: templates/table/structure/row_stats_table.phtml:7
 msgid "Format"
 msgstr "格式"
 
@@ -6417,7 +6433,7 @@ msgstr "设置在数据库结构（表列表）中显示哪些细节"
 
 #: libraries/config/messages.inc.php:332
 #: libraries/plugins/export/ExportPdf.class.php:279
-#: templates/structure/secondary_tabs.phtml:8
+#: templates/table/secondary_tabs.phtml:8
 msgid "Table structure"
 msgstr "表结构"
 
@@ -8325,104 +8341,35 @@ msgstr "微软 Word 2000"
 msgid "OpenDocument Text"
 msgstr "OpenOffice 文档"
 
-#: libraries/controllers/StructureController.class.php:465
+#: libraries/controllers/DatabaseStructureController.class.php:405
 #: tbl_operations.php:382
 #, php-format
 msgid "Table %s has been emptied."
 msgstr "已清空表 %s。"
 
-#: libraries/controllers/StructureController.class.php:486
+#: libraries/controllers/DatabaseStructureController.class.php:426
 #: tbl_operations.php:400 view_operations.php:119
 #, fuzzy, php-format
 #| msgid "View %s has been dropped."
 msgid "View %s has been dropped."
 msgstr "已删除视图 %s"
 
-#: libraries/controllers/StructureController.class.php:487
+#: libraries/controllers/DatabaseStructureController.class.php:427
 #: tbl_operations.php:401
 #, fuzzy, php-format
 #| msgid "Table %s has been dropped."
 msgid "Table %s has been dropped."
 msgstr "已删除表 %s"
 
-#: libraries/controllers/StructureController.class.php:797
-#, fuzzy, php-format
-#| msgid "The column name '%s' is a MySQL reserved keyword."
-msgid "The name '%s' is a MySQL reserved keyword."
-msgid_plural "The names '%s' are MySQL reserved keywords."
-msgstr[0] "列名 '%s' 是一个MySQL 保留关键字。"
-
-#: libraries/controllers/StructureController.class.php:875
-msgid "No column selected."
-msgstr "没有选中任何列。"
-
-#: libraries/controllers/StructureController.class.php:1049
+#: libraries/controllers/DatabaseStructureController.class.php:733
 msgid "Favorite List is full!"
 msgstr "收藏夹数量已达上限！"
 
-#: libraries/controllers/StructureController.class.php:1272
-msgid "The columns have been moved successfully."
-msgstr "已成功移动字段。"
-
-#: libraries/controllers/StructureController.class.php:1535
-#, fuzzy, php-format
-#| msgid "Table %1$s has been altered successfully."
-msgid ""
-"Table %1$s has been altered successfully. Privileges have been adjusted."
-msgstr "已成功修改表 %1$s。"
-
-#: libraries/controllers/StructureController.class.php:1541
-#: libraries/controllers/TableIndexesController.class.php:161
-#: tbl_addfield.php:92
-#, php-format
-msgid "Table %1$s has been altered successfully."
-msgstr "已成功修改表 %1$s。"
-
-#: libraries/controllers/StructureController.class.php:1588
-#: libraries/tracking.lib.php:1094
-msgid "Query error"
-msgstr "查询错误"
-
-#: libraries/controllers/StructureController.class.php:1806
+#: libraries/controllers/DatabaseStructureController.class.php:947
 #: libraries/mysql_charsets.lib.php:366 libraries/mysql_charsets.lib.php:373
 msgid "unknown"
 msgstr "未知"
 
-#: libraries/controllers/StructureController.class.php:1957
-#: templates/structure/check_all_table_column.phtml:11
-msgid "Change"
-msgstr "修改"
-
-#: libraries/controllers/StructureController.class.php:1961
-#: libraries/controllers/StructureController.class.php:1966
-#: libraries/navigation/Nodes/Node_Index.class.php:30
-#: libraries/tracking.lib.php:926
-#: templates/columns_definitions/column_indexes.phtml:16
-#: templates/columns_definitions/table_fields_definitions.phtml:57
-#: templates/structure/check_all_table_column.phtml:30
-#: templates/structure/display_structure.phtml:79
-#: templates/structure/display_table_stats.phtml:19
-msgid "Index"
-msgstr "索引"
-
-#: libraries/controllers/StructureController.class.php:1963
-#: libraries/controllers/StructureController.class.php:1968
-#: templates/columns_definitions/column_indexes.phtml:27
-#: templates/structure/check_all_table_column.phtml:37
-msgid "Spatial"
-msgstr "空间"
-
-#: libraries/controllers/StructureController.class.php:1964
-#: libraries/controllers/StructureController.class.php:1969
-#: templates/columns_definitions/column_indexes.phtml:22
-#: templates/structure/check_all_table_column.phtml:47
-msgid "Fulltext"
-msgstr "全文搜索"
-
-#: libraries/controllers/StructureController.class.php:1970
-msgid "Distinct values"
-msgstr "非重复值 (DISTINCT)"
-
 #: libraries/controllers/TableChartController.class.php:82
 #: libraries/controllers/TableGisVisualizationController.class.php:101
 msgid "No SQL query was set to fetch data."
@@ -8436,13 +8383,20 @@ msgstr "在将表格转为图表时没有找到数字类型的列。"
 msgid "No data to display"
 msgstr "没有可显示数据"
 
-#: libraries/controllers/TableRelationController.class.php:217
+#: libraries/controllers/TableIndexesController.class.php:161
+#: libraries/controllers/TableStructureController.class.php:736
+#: tbl_addfield.php:92
+#, php-format
+msgid "Table %1$s has been altered successfully."
+msgstr "已成功修改表 %1$s。"
+
+#: libraries/controllers/TableRelationController.class.php:218
 #, fuzzy
 #| msgid "Thread %s was successfully killed."
 msgid "Display column was successfully updated."
 msgstr "已成功杀死线程 %s 。"
 
-#: libraries/controllers/TableRelationController.class.php:283
+#: libraries/controllers/TableRelationController.class.php:288
 #, fuzzy
 #| msgid "Internal relation added"
 msgid "Internal relations were successfully updated."
@@ -8461,12 +8415,74 @@ msgid "Zoom search"
 msgstr "缩放搜索"
 
 #: libraries/controllers/TableSearchController.class.php:852
-#: templates/table/selection_form.phtml:59
+#: templates/table/search/selection_form.phtml:59
 #, fuzzy
 #| msgid "Find and Replace"
 msgid "Find and replace"
 msgstr "查找并替换"
 
+#: libraries/controllers/TableStructureController.class.php:163
+#, fuzzy, php-format
+#| msgid "The column name '%s' is a MySQL reserved keyword."
+msgid "The name '%s' is a MySQL reserved keyword."
+msgid_plural "The names '%s' are MySQL reserved keywords."
+msgstr[0] "列名 '%s' 是一个MySQL 保留关键字。"
+
+#: libraries/controllers/TableStructureController.class.php:241
+msgid "No column selected."
+msgstr "没有选中任何列。"
+
+#: libraries/controllers/TableStructureController.class.php:467
+msgid "The columns have been moved successfully."
+msgstr "已成功移动字段。"
+
+#: libraries/controllers/TableStructureController.class.php:730
+#, fuzzy, php-format
+#| msgid "Table %1$s has been altered successfully."
+msgid ""
+"Table %1$s has been altered successfully. Privileges have been adjusted."
+msgstr "已成功修改表 %1$s。"
+
+#: libraries/controllers/TableStructureController.class.php:783
+#: libraries/tracking.lib.php:1094
+msgid "Query error"
+msgstr "查询错误"
+
+#: libraries/controllers/TableStructureController.class.php:948
+#: templates/table/structure/check_all_table_column.phtml:11
+msgid "Change"
+msgstr "修改"
+
+#: libraries/controllers/TableStructureController.class.php:952
+#: libraries/controllers/TableStructureController.class.php:957
+#: libraries/navigation/Nodes/Node_Index.class.php:30
+#: libraries/tracking.lib.php:926
+#: templates/columns_definitions/column_indexes.phtml:16
+#: templates/columns_definitions/table_fields_definitions.phtml:57
+#: templates/table/structure/check_all_table_column.phtml:30
+#: templates/table/structure/display_structure.phtml:79
+#: templates/table/structure/display_table_stats.phtml:19
+msgid "Index"
+msgstr "索引"
+
+#: libraries/controllers/TableStructureController.class.php:954
+#: libraries/controllers/TableStructureController.class.php:959
+#: templates/columns_definitions/column_indexes.phtml:27
+#: templates/table/structure/check_all_table_column.phtml:37
+msgid "Spatial"
+msgstr "空间"
+
+#: libraries/controllers/TableStructureController.class.php:955
+#: libraries/controllers/TableStructureController.class.php:960
+#: templates/columns_definitions/column_indexes.phtml:22
+#: templates/table/structure/check_all_table_column.phtml:47
+msgid "Fulltext"
+msgstr "全文搜索"
+
+#: libraries/controllers/TableStructureController.class.php:963
+msgid "Distinct values"
+msgstr "非重复值 (DISTINCT)"
+
 #: libraries/core.lib.php:306
 #, php-format
 msgid "The %s extension is missing. Please check your PHP configuration."
@@ -8513,7 +8529,7 @@ msgid "No Password"
 msgstr "无密码"
 
 #: libraries/display_change_password.lib.php:68
-#: libraries/plugins/auth/AuthenticationCookie.class.php:199
+#: libraries/plugins/auth/AuthenticationCookie.class.php:187
 #: libraries/replication_gui.lib.php:422 libraries/replication_gui.lib.php:862
 #: libraries/server_privileges.lib.php:1640
 msgid "Password:"
@@ -9294,12 +9310,12 @@ msgid "Dump has been saved to file %s."
 msgstr "已保存转储到文件 %s 中。"
 
 #: libraries/import.lib.php:202 libraries/insert_edit.lib.php:124
-#: libraries/rte/rte_routines.lib.php:1353 libraries/sql.lib.php:1312
+#: libraries/rte/rte_routines.lib.php:1444 libraries/sql.lib.php:1306
 #: tbl_get_field.php:44
 msgid "MySQL returned an empty result set (i.e. zero rows)."
 msgstr "MySQL 返回的查询结果为空 (即零行)。"
 
-#: libraries/import.lib.php:265 libraries/sql.lib.php:1326
+#: libraries/import.lib.php:265 libraries/sql.lib.php:1320
 msgid "[ROLLBACK occurred.]"
 msgstr ""
 
@@ -9370,14 +9386,14 @@ msgstr "在第 %s 个字段创建索引"
 
 #: libraries/insert_edit.lib.php:233
 #: libraries/navigation/Nodes/Node_DatabaseChild.class.php:48
-#: templates/designer/table_list.phtml:40
+#: templates/database/designer/table_list.phtml:40
 msgid "Hide"
 msgstr "隐藏"
 
 #: libraries/insert_edit.lib.php:249
 #: libraries/navigation/Nodes/Node_Function.class.php:32
-#: libraries/rte/rte_routines.lib.php:1495
-#: templates/table/table_header.phtml:4
+#: libraries/rte/rte_routines.lib.php:1586
+#: templates/table/search/table_header.phtml:4
 msgid "Function"
 msgstr "函数"
 
@@ -9392,82 +9408,83 @@ msgstr "二进制"
 msgid "Because of its length,<br /> this column might not be editable."
 msgstr "因长度问题，<br /> 该字段可能无法编辑"
 
-#: libraries/insert_edit.lib.php:1050
+#: libraries/insert_edit.lib.php:1048
 msgid "Binary - do not edit"
 msgstr "二进制 - 无法编辑"
 
-#: libraries/insert_edit.lib.php:1176 libraries/server_privileges.lib.php:470
-#: templates/table/options.phtml:36
+#: libraries/insert_edit.lib.php:1174 libraries/server_privileges.lib.php:470
+#: templates/table/search/options.phtml:36
 msgid "Or"
 msgstr "或"
 
-#: libraries/insert_edit.lib.php:1177
+#: libraries/insert_edit.lib.php:1175
 msgid "web server upload directory:"
 msgstr "网站服务器上传文件夹："
 
-#: libraries/insert_edit.lib.php:1348 templates/table/input_box.phtml:49
+#: libraries/insert_edit.lib.php:1346
+#: templates/table/search/input_box.phtml:49
 msgid "Edit/Insert"
 msgstr "编辑/插入"
 
-#: libraries/insert_edit.lib.php:1398
+#: libraries/insert_edit.lib.php:1396
 #, php-format
 msgid "Continue insertion with %s rows"
 msgstr "继续插入 %s 行"
 
-#: libraries/insert_edit.lib.php:1428
+#: libraries/insert_edit.lib.php:1426
 msgid "and then"
 msgstr "然后"
 
-#: libraries/insert_edit.lib.php:1461
+#: libraries/insert_edit.lib.php:1459
 msgid "Insert as new row"
 msgstr "以新行插入"
 
-#: libraries/insert_edit.lib.php:1464
+#: libraries/insert_edit.lib.php:1462
 msgid "Insert as new row and ignore errors"
 msgstr "以新行插入 (忽略错误)"
 
-#: libraries/insert_edit.lib.php:1467
+#: libraries/insert_edit.lib.php:1465
 msgid "Show insert query"
 msgstr "显示插入语句"
 
-#: libraries/insert_edit.lib.php:1487
+#: libraries/insert_edit.lib.php:1485
 msgid "Go back to previous page"
 msgstr "返回上一页"
 
-#: libraries/insert_edit.lib.php:1490
+#: libraries/insert_edit.lib.php:1488
 msgid "Insert another new row"
 msgstr "插入新数据"
 
-#: libraries/insert_edit.lib.php:1495
+#: libraries/insert_edit.lib.php:1493
 msgid "Go back to this page"
 msgstr "返回到本页"
 
-#: libraries/insert_edit.lib.php:1518
+#: libraries/insert_edit.lib.php:1516
 msgid "Edit next row"
 msgstr "编辑下一行"
 
-#: libraries/insert_edit.lib.php:1540
+#: libraries/insert_edit.lib.php:1538
 msgid ""
 "Use TAB key to move from value to value, or CTRL+arrows to move anywhere"
 msgstr "按 TAB 键跳到下一个数值，或 CTRL+方向键 作随意移动"
 
-#: libraries/insert_edit.lib.php:1577 libraries/replication_gui.lib.php:542
-#: libraries/rte/rte_routines.lib.php:1497
+#: libraries/insert_edit.lib.php:1575 libraries/replication_gui.lib.php:542
+#: libraries/rte/rte_routines.lib.php:1588
 #: libraries/server_status_variables.lib.php:220
-#: templates/designer/having_query_panel.phtml:100
-#: templates/designer/options_panel.phtml:73
-#: templates/designer/options_panel.phtml:239
-#: templates/designer/where_query_panel.phtml:69
-#: templates/table/table_header.phtml:10
-#: templates/table/zoom_result_form.phtml:35
+#: templates/database/designer/having_query_panel.phtml:100
+#: templates/database/designer/options_panel.phtml:73
+#: templates/database/designer/options_panel.phtml:239
+#: templates/database/designer/where_query_panel.phtml:69
+#: templates/table/search/table_header.phtml:10
+#: templates/table/search/zoom_result_form.phtml:35
 msgid "Value"
 msgstr "值"
 
-#: libraries/insert_edit.lib.php:1937 libraries/sql.lib.php:1309
+#: libraries/insert_edit.lib.php:1935 libraries/sql.lib.php:1303
 msgid "Showing SQL query"
 msgstr "显示 SQL 查询"
 
-#: libraries/insert_edit.lib.php:1962 libraries/sql.lib.php:1287
+#: libraries/insert_edit.lib.php:1960 libraries/sql.lib.php:1281
 #, php-format
 msgid "Inserted row id: %1$d"
 msgstr "插入的行 id: %1$d"
@@ -9908,7 +9925,7 @@ msgstr "新建"
 #: libraries/navigation/Nodes/Node_View_Container.class.php:26
 #: libraries/navigation/Nodes/Node_View_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:129
-#: templates/structure/show_create.phtml:30
+#: templates/database/structure/show_create.phtml:30
 msgid "Views"
 msgstr "视图"
 
@@ -10221,7 +10238,7 @@ msgstr "权限不足！"
 
 #: libraries/operations.lib.php:101 libraries/operations.lib.php:249
 #: libraries/operations.lib.php:869 libraries/operations.lib.php:963
-#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:907
+#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:998
 #: templates/columns_definitions/table_fields_definitions.phtml:47
 #, fuzzy
 #| msgid "Edit Privileges"
@@ -10315,22 +10332,22 @@ msgid "Switch to copied table"
 msgstr "切换到复制的数据表"
 
 #: libraries/operations.lib.php:1360
-#: templates/structure/check_all_tables.phtml:18
+#: templates/database/structure/check_all_tables.phtml:18
 msgid "Table maintenance"
 msgstr "表维护"
 
 #: libraries/operations.lib.php:1398
-#: templates/structure/check_all_tables.phtml:19
+#: templates/database/structure/check_all_tables.phtml:19
 msgid "Analyze table"
 msgstr "分析表"
 
 #: libraries/operations.lib.php:1413
-#: templates/structure/check_all_tables.phtml:20
+#: templates/database/structure/check_all_tables.phtml:20
 msgid "Check table"
 msgstr "检查表"
 
 #: libraries/operations.lib.php:1428
-#: templates/structure/check_all_tables.phtml:22
+#: templates/database/structure/check_all_tables.phtml:22
 #, fuzzy
 #| msgid "Check table"
 msgid "Checksum table"
@@ -10350,18 +10367,19 @@ msgid "Flush the table (FLUSH)"
 msgstr "刷新表 (FLUSH)"
 
 #: libraries/operations.lib.php:1477
-#: templates/structure/check_all_tables.phtml:23
-#: templates/structure/display_table_stats.phtml:56
+#: templates/database/structure/check_all_tables.phtml:23
+#: templates/table/structure/display_table_stats.phtml:56
 msgid "Optimize table"
 msgstr "优化表"
 
 #: libraries/operations.lib.php:1492
-#: templates/structure/check_all_tables.phtml:24
+#: templates/database/structure/check_all_tables.phtml:24
 msgid "Repair table"
 msgstr "修复表"
 
 #: libraries/operations.lib.php:1538
-#: templates/structure/check_all_tables.phtml:14 view_operations.php:127
+#: templates/database/structure/check_all_tables.phtml:14
+#: view_operations.php:127
 msgid "Delete data or table"
 msgstr "删除数据或数据表"
 
@@ -10486,7 +10504,7 @@ msgid "Cannot connect: invalid settings."
 msgstr "无法连接：无效的设置。"
 
 #: libraries/plugins/auth/AuthenticationConfig.class.php:108
-#: libraries/plugins/auth/AuthenticationCookie.class.php:134
+#: libraries/plugins/auth/AuthenticationCookie.class.php:122
 #: libraries/plugins/auth/AuthenticationHttp.class.php:96
 #, php-format
 msgid "Welcome to %s"
@@ -10514,36 +10532,36 @@ msgstr ""
 msgid "Retry to connect"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:146
+#: libraries/plugins/auth/AuthenticationCookie.class.php:134
 msgid "Your session has expired. Please log in again."
 msgstr "您的Session已过期，请再次登录。"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:170
+#: libraries/plugins/auth/AuthenticationCookie.class.php:158
 msgid "Log in"
 msgstr "登录"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:178
-#: libraries/plugins/auth/AuthenticationCookie.class.php:188
+#: libraries/plugins/auth/AuthenticationCookie.class.php:166
+#: libraries/plugins/auth/AuthenticationCookie.class.php:176
 msgid "You can enter hostname/IP address and port separated by space."
 msgstr "您可以输入以空格分隔的主机名/IP地址和端口号。"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:193
+#: libraries/plugins/auth/AuthenticationCookie.class.php:181
 msgid "Username:"
 msgstr "用户名："
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:205
+#: libraries/plugins/auth/AuthenticationCookie.class.php:193
 msgid "Server Choice:"
 msgstr "选择服务器:"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:386
+#: libraries/plugins/auth/AuthenticationCookie.class.php:374
 msgid "Entered captcha is wrong, try again!"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:396
+#: libraries/plugins/auth/AuthenticationCookie.class.php:384
 msgid "Please enter correct captcha!"
 msgstr ""
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:423
+#: libraries/plugins/auth/AuthenticationCookie.class.php:411
 #, fuzzy
 #| msgid "Cannot log in to the MySQL server"
 msgid "You are not allowed to log in to this MySQL server!"
@@ -10641,7 +10659,7 @@ msgstr "事件"
 #: libraries/plugins/export/ExportOdt.class.php:593
 #: libraries/plugins/export/ExportTexytext.class.php:428
 #: libraries/plugins/export/PMA_ExportPdf.class.php:313
-#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:984
 #: libraries/rte/rte_triggers.lib.php:377
 msgid "Definition"
 msgstr "定义"
@@ -10984,7 +11002,7 @@ msgid "Last check:"
 msgstr "最后检查："
 
 #: libraries/plugins/export/ExportSql.class.php:1399
-#: templates/structure/structure_table_row.phtml:183
+#: templates/database/structure/structure_table_row.phtml:183
 msgid "in use"
 msgstr "使用中"
 
@@ -11189,20 +11207,14 @@ msgstr "MySQL Spatial 扩展不支持 ESRI 类型 \"%s\"。"
 msgid "The imported file does not contain any data!"
 msgstr "导入的文件没有任何数据"
 
-#: libraries/plugins/import/ImportSql.class.php:169
+#: libraries/plugins/import/ImportSql.class.php:72
 msgid "SQL compatibility mode:"
 msgstr "SQL 兼容模式："
 
-#: libraries/plugins/import/ImportSql.class.php:181
+#: libraries/plugins/import/ImportSql.class.php:84
 msgid "Do not use <code>AUTO_INCREMENT</code> for zero values"
 msgstr "不要给零值使用自增 (<code>AUTO_INCREMENT</code>)"
 
-#: libraries/plugins/import/ImportSql.class.php:195
-#, fuzzy
-#| msgid "Read misses"
-msgid "Read as multibytes"
-msgstr "读缺失数"
-
 #: libraries/plugins/import/ImportXml.class.php:54
 msgid "XML"
 msgstr "XML"
@@ -11245,7 +11257,7 @@ msgid "Show grid"
 msgstr "显示网格"
 
 #: libraries/plugins/schema/SchemaPdf.class.php:94
-#: templates/structure/print_view_data_dictionary_link.phtml:6
+#: templates/database/structure/print_view_data_dictionary_link.phtml:6
 msgid "Data Dictionary"
 msgstr "数据字典"
 
@@ -11276,7 +11288,7 @@ msgid "The %s table doesn't exist!"
 msgstr "数据表 %s 不存在！"
 
 #: libraries/plugins/schema/eps/Eps_Relation_Schema.class.php:321
-#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:309
+#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:323
 #, php-format
 msgid "Schema of the %s database - Page %s"
 msgstr "数据库 %s 的大纲 - 第 %s 页"
@@ -11305,7 +11317,7 @@ msgstr "目录"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1005
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1028
 #: libraries/tracking.lib.php:884
-#: templates/structure/table_structure_header.phtml:11
+#: templates/table/structure/table_structure_header.phtml:11
 msgid "Extra"
 msgstr "额外"
 
@@ -11692,11 +11704,11 @@ msgstr "快速设置高级功能:"
 msgid "Create the needed tables with the <code>%screate_tables.sql</code>."
 msgstr "通过 <code>examples/create_tables.sql</code> 创建必需的数据表。"
 
-#: libraries/relation.lib.php:360
+#: libraries/relation.lib.php:357
 msgid "Create a pma user and give access to these tables."
 msgstr "创建一个用户并授予其访问上一步操作中创建的数据表的权限。"
 
-#: libraries/relation.lib.php:365
+#: libraries/relation.lib.php:360
 msgid ""
 "Enable advanced features in configuration file (<code>config.inc.php</"
 "code>), for example by starting from <code>config.sample.inc.php</code>."
@@ -11704,22 +11716,22 @@ msgstr ""
 "在配置文件 (<code>config.inc.php</code>) 中启用高级功能，参见 <code>config."
 "sample.inc.php</code> 中的范例。"
 
-#: libraries/relation.lib.php:373
+#: libraries/relation.lib.php:365
 msgid "Re-login to phpMyAdmin to load the updated configuration file."
 msgstr "请重新登录 phpMyAdmin 以加载新配置并使其生效。"
 
-#: libraries/relation.lib.php:1612
+#: libraries/relation.lib.php:1607
 msgid "no description"
 msgstr "无说明"
 
-#: libraries/relation.lib.php:1811
+#: libraries/relation.lib.php:1806
 msgid ""
 "You do not have necessary privileges to create a database named "
 "'phpmyadmin'. You may go to 'Operations' tab of any database to set up the "
 "phpMyAdmin configuration storage there."
 msgstr ""
 
-#: libraries/relation.lib.php:1928
+#: libraries/relation.lib.php:1923
 #, fuzzy, php-format
 #| msgid "Missing phpMyAdmin configuration storage tables"
 msgid ""
@@ -11727,21 +11739,21 @@ msgid ""
 "configuration storage there."
 msgstr "丢失 phpMyAdmin 高级功能数据表"
 
-#: libraries/relation.lib.php:1936
+#: libraries/relation.lib.php:1931
 #, fuzzy, php-format
 #| msgid "Missing phpMyAdmin configuration storage tables"
 msgid ""
 "%sCreate%s the phpMyAdmin configuration storage in the current database."
 msgstr "丢失 phpMyAdmin 高级功能数据表"
 
-#: libraries/relation.lib.php:1944
+#: libraries/relation.lib.php:1939
 #, fuzzy, php-format
 #| msgid "Missing phpMyAdmin configuration storage tables"
 msgid "%sCreate%s missing phpMyAdmin configuration storage tables."
 msgstr "丢失 phpMyAdmin 高级功能数据表"
 
 #: libraries/replication_gui.lib.php:46 libraries/replication_gui.lib.php:343
-#: libraries/server_databases.lib.php:387
+#: libraries/server_databases.lib.php:398
 msgid "Master replication"
 msgstr "主复制"
 
@@ -11807,7 +11819,7 @@ msgstr ""
 "<b>已经</b>被配置为主服务器。"
 
 #: libraries/replication_gui.lib.php:141
-#: libraries/server_databases.lib.php:389
+#: libraries/server_databases.lib.php:400
 msgid "Slave replication"
 msgstr "从复制"
 
@@ -12102,10 +12114,10 @@ msgid "Master server changed successfully to %s."
 msgstr "已成功修改主服务器到 %s"
 
 #: libraries/rte/rte_events.lib.php:106 libraries/rte/rte_events.lib.php:115
-#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:149
-#: libraries/rte/rte_routines.lib.php:158
-#: libraries/rte/rte_routines.lib.php:231
-#: libraries/rte/rte_routines.lib.php:1362
+#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:219
+#: libraries/rte/rte_routines.lib.php:246
+#: libraries/rte/rte_routines.lib.php:368
+#: libraries/rte/rte_routines.lib.php:1453
 #: libraries/rte/rte_triggers.lib.php:82 libraries/rte/rte_triggers.lib.php:91
 #: libraries/rte/rte_triggers.lib.php:123
 #, php-format
@@ -12126,7 +12138,7 @@ msgstr "已修改事件 %1$s 。"
 msgid "Event %1$s has been created."
 msgstr "已创建事件 %1$s 。"
 
-#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:251
+#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:266
 #: libraries/rte/rte_triggers.lib.php:144
 #, fuzzy
 #| msgid ""
@@ -12138,7 +12150,7 @@ msgstr "<b>处理请求时发生错误:</b>"
 msgid "Edit event"
 msgstr "编辑事件"
 
-#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:794
+#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:885
 #: libraries/rte/rte_triggers.lib.php:323 view_create.php:180
 msgid "Details"
 msgstr "详细"
@@ -12151,7 +12163,7 @@ msgstr "事件名称"
 msgid "Event type"
 msgstr "事件类型"
 
-#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:817
+#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:908
 #, php-format
 msgid "Change to %s"
 msgstr "改为 %s"
@@ -12178,12 +12190,14 @@ msgstr "终止时间"
 msgid "On completion preserve"
 msgstr "过期后禁用事件而不删除"
 
-#: libraries/rte/rte_events.lib.php:491 libraries/rte/rte_routines.lib.php:930
+#: libraries/rte/rte_events.lib.php:491
+#: libraries/rte/rte_routines.lib.php:1021
 #: libraries/rte/rte_triggers.lib.php:383 view_create.php:209
 msgid "Definer"
 msgstr "用户"
 
-#: libraries/rte/rte_events.lib.php:535 libraries/rte/rte_routines.lib.php:997
+#: libraries/rte/rte_events.lib.php:535
+#: libraries/rte/rte_routines.lib.php:1088
 #: libraries/rte/rte_triggers.lib.php:422
 #, fuzzy
 #| msgid "The definer must be in the \"username@hostname\" format"
@@ -12213,9 +12227,9 @@ msgid "You must provide an event definition."
 msgstr "请输入事件定义。"
 
 #: libraries/rte/rte_export.lib.php:43 libraries/rte/rte_general.lib.php:72
-#: libraries/rte/rte_routines.lib.php:345
-#: libraries/rte/rte_routines.lib.php:1198
-#: libraries/rte/rte_routines.lib.php:1411
+#: libraries/rte/rte_routines.lib.php:153
+#: libraries/rte/rte_routines.lib.php:1289
+#: libraries/rte/rte_routines.lib.php:1502
 #, fuzzy
 #| msgid "Error in processing request"
 msgid "Error in processing request:"
@@ -12251,122 +12265,122 @@ msgstr ""
 "你正在使用 PHP 所不推荐的 'mysql' 扩展，不支持多语句查询。[strong]运行部分存"
 "储过程操作时可能会失败！[/strong]请使用改进的 'mysqli' 扩展避免此类问题发生。"
 
-#: libraries/rte/rte_routines.lib.php:110
-#: libraries/rte/rte_routines.lib.php:1006
+#: libraries/rte/rte_routines.lib.php:123
+msgid "Edit routine"
+msgstr "编辑程序"
+
+#: libraries/rte/rte_routines.lib.php:200
+#: libraries/rte/rte_routines.lib.php:1097
 #, php-format
 msgid "Invalid routine type: \"%s\""
 msgstr "无效的程序类型: \"%s\""
 
-#: libraries/rte/rte_routines.lib.php:170
+#: libraries/rte/rte_routines.lib.php:253
+#, php-format
+msgid "Routine %1$s has been created."
+msgstr "已创建程序 %1$s 。"
+
+#: libraries/rte/rte_routines.lib.php:380
 msgid "Sorry, we failed to restore the dropped routine."
 msgstr "抱歉，恢复已删除的程序失败。"
 
-#: libraries/rte/rte_routines.lib.php:211
+#: libraries/rte/rte_routines.lib.php:439
 #, fuzzy, php-format
 #| msgid "Routine %1$s has been modified."
 msgid "Routine %1$s has been modified. Privileges have been adjusted."
 msgstr "已修改程序 %1$s 。"
 
-#: libraries/rte/rte_routines.lib.php:216
+#: libraries/rte/rte_routines.lib.php:444
 #, php-format
 msgid "Routine %1$s has been modified."
 msgstr "已修改程序 %1$s 。"
 
-#: libraries/rte/rte_routines.lib.php:238
-#, php-format
-msgid "Routine %1$s has been created."
-msgstr "已创建程序 %1$s 。"
-
-#: libraries/rte/rte_routines.lib.php:315
-msgid "Edit routine"
-msgstr "编辑程序"
-
-#: libraries/rte/rte_routines.lib.php:797
+#: libraries/rte/rte_routines.lib.php:888
 msgid "Routine name"
 msgstr "程序名称"
 
-#: libraries/rte/rte_routines.lib.php:823
+#: libraries/rte/rte_routines.lib.php:914
 msgid "Parameters"
 msgstr "参数"
 
-#: libraries/rte/rte_routines.lib.php:829
+#: libraries/rte/rte_routines.lib.php:920
 msgid "Direction"
 msgstr "方向"
 
-#: libraries/rte/rte_routines.lib.php:847
+#: libraries/rte/rte_routines.lib.php:938
 msgid "Add parameter"
 msgstr "添加参数"
 
-#: libraries/rte/rte_routines.lib.php:851
+#: libraries/rte/rte_routines.lib.php:942
 msgid "Remove last parameter"
 msgstr "删除最后一个参数"
 
-#: libraries/rte/rte_routines.lib.php:856
+#: libraries/rte/rte_routines.lib.php:947
 msgid "Return type"
 msgstr "返回类型"
 
-#: libraries/rte/rte_routines.lib.php:862
+#: libraries/rte/rte_routines.lib.php:953
 msgid "Return length/values"
 msgstr "返回长度/值"
 
-#: libraries/rte/rte_routines.lib.php:868
+#: libraries/rte/rte_routines.lib.php:959
 msgid "Return options"
 msgstr "返回选项"
 
-#: libraries/rte/rte_routines.lib.php:899
+#: libraries/rte/rte_routines.lib.php:990
 msgid "Is deterministic"
 msgstr "是否固定"
 
-#: libraries/rte/rte_routines.lib.php:920
+#: libraries/rte/rte_routines.lib.php:1011
 msgid ""
 "You do not have sufficient privileges to perform this operation; Please "
 "refer to the documentation for more details"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:935
+#: libraries/rte/rte_routines.lib.php:1026
 msgid "Security type"
 msgstr "安全类型"
 
-#: libraries/rte/rte_routines.lib.php:944
+#: libraries/rte/rte_routines.lib.php:1035
 msgid "SQL data access"
 msgstr "SQL 数据访问"
 
-#: libraries/rte/rte_routines.lib.php:1013
+#: libraries/rte/rte_routines.lib.php:1104
 #, fuzzy
 #| msgid "You must provide a routine name"
 msgid "You must provide a routine name!"
 msgstr "请输入程序名称"
 
-#: libraries/rte/rte_routines.lib.php:1047
+#: libraries/rte/rte_routines.lib.php:1138
 #, php-format
 msgid "Invalid direction \"%s\" given for parameter."
 msgstr "参数方向 \"%s\" 无效。"
 
-#: libraries/rte/rte_routines.lib.php:1069
-#: libraries/rte/rte_routines.lib.php:1131
+#: libraries/rte/rte_routines.lib.php:1160
+#: libraries/rte/rte_routines.lib.php:1222
 msgid ""
 "You must provide length/values for routine parameters of type ENUM, SET, "
 "VARCHAR and VARBINARY."
 msgstr "请设置 ENUM、SET、VARCHAR 和 VARBINARY 类型参数的长度/值。"
 
-#: libraries/rte/rte_routines.lib.php:1095
+#: libraries/rte/rte_routines.lib.php:1186
 msgid "You must provide a name and a type for each routine parameter."
 msgstr "请输入每一个参数的名称并设置其类型。"
 
-#: libraries/rte/rte_routines.lib.php:1114
+#: libraries/rte/rte_routines.lib.php:1205
 msgid "You must provide a valid return type for the routine."
 msgstr "请设置一个有效的返回类型。"
 
-#: libraries/rte/rte_routines.lib.php:1174
+#: libraries/rte/rte_routines.lib.php:1265
 msgid "You must provide a routine definition."
 msgstr "请输入程序定义。"
 
-#: libraries/rte/rte_routines.lib.php:1285
+#: libraries/rte/rte_routines.lib.php:1376
 #, php-format
 msgid "Execution results of routine %s"
 msgstr "程序 %s 的运行结果"
 
-#: libraries/rte/rte_routines.lib.php:1340
+#: libraries/rte/rte_routines.lib.php:1431
 #, fuzzy, php-format
 #| msgid "%d row affected by the last statement inside the procedure"
 #| msgid_plural "%d rows affected by the last statement inside the procedure"
@@ -12374,13 +12388,13 @@ msgid "%d row affected by the last statement inside the procedure."
 msgid_plural "%d rows affected by the last statement inside the procedure."
 msgstr[0] "存储过程中最后一条语句影响了 %d 行"
 
-#: libraries/rte/rte_routines.lib.php:1398
-#: libraries/rte/rte_routines.lib.php:1406
+#: libraries/rte/rte_routines.lib.php:1489
+#: libraries/rte/rte_routines.lib.php:1497
 msgid "Execute routine"
 msgstr "运行程序"
 
-#: libraries/rte/rte_routines.lib.php:1485
-#: libraries/rte/rte_routines.lib.php:1488
+#: libraries/rte/rte_routines.lib.php:1576
+#: libraries/rte/rte_routines.lib.php:1579
 msgid "Routine parameters"
 msgstr "程序参数"
 
@@ -12542,7 +12556,7 @@ msgid "Original position"
 msgstr "初始位置"
 
 #: libraries/server_bin_log.lib.php:133
-#: templates/structure/display_table_stats.phtml:4
+#: templates/table/structure/display_table_stats.phtml:4
 msgid "Information"
 msgstr "信息"
 
@@ -12579,12 +12593,12 @@ msgid ""
 msgstr ""
 "注意：在此启用数据库统计可能导致网站服务器和 MySQL 服务器之间的流量骤增。"
 
-#: libraries/server_databases.lib.php:364
-#: libraries/server_databases.lib.php:365
+#: libraries/server_databases.lib.php:366
+#: libraries/server_databases.lib.php:371
 msgid "Enable Statistics"
 msgstr "启用统计"
 
-#: libraries/server_databases.lib.php:481
+#: libraries/server_databases.lib.php:492
 #, php-format
 msgid "%1$d database has been dropped successfully."
 msgid_plural "%1$d databases have been dropped successfully."
@@ -12959,7 +12973,7 @@ msgid "You have revoked the privileges for %s."
 msgstr "您已撤销 %s 的权限。"
 
 #: libraries/server_privileges.lib.php:2059
-#: libraries/server_privileges.lib.php:4290
+#: libraries/server_privileges.lib.php:4316
 #, fuzzy
 #| msgid "Add user"
 msgid "Add user account"
@@ -13140,59 +13154,59 @@ msgstr "正在删除 %s"
 msgid "The privileges were reloaded successfully."
 msgstr "已成功重新载入权限。"
 
-#: libraries/server_privileges.lib.php:3994
+#: libraries/server_privileges.lib.php:4003
 #, php-format
 msgid "The user %s already exists!"
 msgstr "用户 %s 己存在！"
 
-#: libraries/server_privileges.lib.php:4232
+#: libraries/server_privileges.lib.php:4258
 #, php-format
 msgid "Privileges for %s"
 msgstr "%s 的权限"
 
-#: libraries/server_privileges.lib.php:4241
+#: libraries/server_privileges.lib.php:4267
 #: libraries/server_status_processes.lib.php:72
 #: libraries/server_user_groups.lib.php:39
 msgid "User"
 msgstr "用户"
 
-#: libraries/server_privileges.lib.php:4282
+#: libraries/server_privileges.lib.php:4308
 msgctxt "Create new user"
 msgid "New"
 msgstr "新建"
 
-#: libraries/server_privileges.lib.php:4311
+#: libraries/server_privileges.lib.php:4337
 #, fuzzy
 #| msgid "Edit Privileges"
 msgid "Edit privileges:"
 msgstr "编辑权限"
 
-#: libraries/server_privileges.lib.php:4312
+#: libraries/server_privileges.lib.php:4338
 #, fuzzy
 #| msgid "Users"
 msgid "User account"
 msgstr "用户"
 
-#: libraries/server_privileges.lib.php:4371
+#: libraries/server_privileges.lib.php:4397
 msgid ""
 "Note: You are attempting to edit privileges of the user with which you are "
 "currently logged in."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4391 libraries/server_users.lib.php:25
+#: libraries/server_privileges.lib.php:4417 libraries/server_users.lib.php:25
 #, fuzzy
 #| msgid "Users overview"
 msgid "User accounts overview"
 msgstr "用户概况"
 
-#: libraries/server_privileges.lib.php:4459
+#: libraries/server_privileges.lib.php:4485
 msgid ""
 "A user account allowing any user from localhost to connect is present. This "
 "will prevent other users from connecting if the host part of their account "
 "allows a connection from any (%) host."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4500
+#: libraries/server_privileges.lib.php:4526
 #, php-format
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
@@ -13204,7 +13218,7 @@ msgstr ""
 "将可能与服务器使用的用户权限有异。在这种情况下，您应在继续前%s重新载入权"
 "限%s。"
 
-#: libraries/server_privileges.lib.php:4519
+#: libraries/server_privileges.lib.php:4545
 #, fuzzy
 #| msgid ""
 #| "Note: phpMyAdmin gets the users' privileges directly from MySQL's "
@@ -13222,43 +13236,43 @@ msgstr ""
 "将可能与服务器使用的用户权限有异。在这种情况下，您应在继续前%s重新载入权"
 "限%s。"
 
-#: libraries/server_privileges.lib.php:4569
+#: libraries/server_privileges.lib.php:4595
 msgid "The selected user was not found in the privilege table."
 msgstr "在权限表内找不到选中的用户。"
 
-#: libraries/server_privileges.lib.php:4801
+#: libraries/server_privileges.lib.php:4827
 msgid "You have added a new user."
 msgstr "您已添加了一个新用户。"
 
-#: libraries/server_status.lib.php:53
+#: libraries/server_status.lib.php:60
 #, php-format
 msgid "Network traffic since startup: %s"
 msgstr "自启动以来的网络流量: %s"
 
-#: libraries/server_status.lib.php:66
+#: libraries/server_status.lib.php:73
 #, php-format
 msgid "This MySQL server has been running for %1$s. It started up on %2$s."
 msgstr "此 MySQL 服务器已运行 %1$s。启动时间为 %2$s 。"
 
-#: libraries/server_status.lib.php:80
+#: libraries/server_status.lib.php:94
 msgid ""
 "This MySQL server works as <b>master</b> and <b>slave</b> in <b>replication</"
 "b> process."
 msgstr "此 MySQL 服务器正以<b>主</b>和<b>从</b>服务器运行于<b>复制</b>进程中。"
 
-#: libraries/server_status.lib.php:85
+#: libraries/server_status.lib.php:99
 msgid "This MySQL server works as <b>master</b> in <b>replication</b> process."
 msgstr "此 MySQL 服务器正以<b>主</b>服务器运行于<b>复制</b>进程中。"
 
-#: libraries/server_status.lib.php:90
+#: libraries/server_status.lib.php:104
 msgid "This MySQL server works as <b>slave</b> in <b>replication</b> process."
 msgstr "此 MySQL 服务器正以<b>从</b>服务器运行于<b>复制</b>进程中。"
 
-#: libraries/server_status.lib.php:106
+#: libraries/server_status.lib.php:116
 msgid "Replication status"
 msgstr "复制状态"
 
-#: libraries/server_status.lib.php:137
+#: libraries/server_status.lib.php:146
 msgid ""
 "On a busy server, the byte counters may overrun, so those statistics as "
 "reported by the MySQL server may be incorrect."
@@ -13266,21 +13280,21 @@ msgstr ""
 "在高负载的服务器上，字节计数器可能会溢出，因此由 MySQL 返回的统计值可能会不正"
 "确。"
 
-#: libraries/server_status.lib.php:148
+#: libraries/server_status.lib.php:157
 msgid "Received"
 msgstr "已接收"
 
-#: libraries/server_status.lib.php:167
+#: libraries/server_status.lib.php:176
 msgid "Sent"
 msgstr "已发送"
 
-#: libraries/server_status.lib.php:234
+#: libraries/server_status.lib.php:243
 #, fuzzy
 #| msgid "max. concurrent connections"
 msgid "Max. concurrent connections"
 msgstr "最大并发连接数"
 
-#: libraries/server_status.lib.php:244
+#: libraries/server_status.lib.php:253
 msgid "Failed attempts"
 msgstr "已失败"
 
@@ -14315,7 +14329,7 @@ msgstr ""
 msgid "Not implemented yet."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/AlterOperation.php:193
+#: libraries/sql-parser/src/Components/AlterOperation.php:191
 #, fuzzy
 #| msgid "Iconic table operations"
 msgid "Unrecognized alter operation."
@@ -14331,7 +14345,7 @@ msgid "An opening bracket followed by a set of values was expected."
 msgstr ""
 
 #: libraries/sql-parser/src/Components/ArrayObj.php:101
-#: libraries/sql-parser/src/Components/FieldDefinition.php:202
+#: libraries/sql-parser/src/Components/CreateDefinition.php:202
 msgid "An opening bracket was expected."
 msgstr ""
 
@@ -14339,25 +14353,35 @@ msgstr ""
 msgid "A comma or a closing bracket was expected"
 msgstr ""
 
+#: libraries/sql-parser/src/Components/CreateDefinition.php:246
+#, fuzzy
+#| msgid "No databases selected."
+msgid "A comma or a closing bracket was expected."
+msgstr "没有已选择的数据库。"
+
+#: libraries/sql-parser/src/Components/CreateDefinition.php:262
+msgid "A closing bracket was expected."
+msgstr ""
+
 #: libraries/sql-parser/src/Components/DataType.php:125
 msgid "Unrecognized data type."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:225
+#: libraries/sql-parser/src/Components/Expression.php:227
 msgid "Unexpected closing bracket."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:246
-#: libraries/sql-parser/src/Components/Expression.php:283
-#: libraries/sql-parser/src/Components/Expression.php:303
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:285
+#: libraries/sql-parser/src/Components/Expression.php:305
 msgid "An alias was previously found."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:257
+#: libraries/sql-parser/src/Components/Expression.php:259
 msgid "Unexpected dot."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:327
+#: libraries/sql-parser/src/Components/Expression.php:329
 #, fuzzy
 #| msgid "No databases selected."
 msgid "An alias was expected."
@@ -14369,16 +14393,6 @@ msgstr "没有已选择的数据库。"
 msgid "An expression was expected."
 msgstr "没有选中任何行"
 
-#: libraries/sql-parser/src/Components/FieldDefinition.php:246
-#, fuzzy
-#| msgid "No databases selected."
-msgid "A comma or a closing bracket was expected."
-msgstr "没有已选择的数据库。"
-
-#: libraries/sql-parser/src/Components/FieldDefinition.php:262
-msgid "A closing bracket was expected."
-msgstr ""
-
 #: libraries/sql-parser/src/Components/Limit.php:90
 #: libraries/sql-parser/src/Components/Limit.php:112
 msgid "An offset was expected."
@@ -14426,29 +14440,29 @@ msgstr ""
 msgid "Expected delimiter."
 msgstr ""
 
-#: libraries/sql-parser/src/Lexer.php:753
+#: libraries/sql-parser/src/Lexer.php:777
 #, fuzzy, php-format
 #| msgid "Event %1$s has been created."
 msgid "Ending quote %1$s was expected."
 msgstr "已创建事件 %1$s 。"
 
-#: libraries/sql-parser/src/Lexer.php:789
+#: libraries/sql-parser/src/Lexer.php:813
 #, fuzzy
 #| msgid "Table name template"
 msgid "Variable name was expected."
 msgstr "表名称模板"
 
-#: libraries/sql-parser/src/Parser.php:380
+#: libraries/sql-parser/src/Parser.php:391
 #, fuzzy
 #| msgid "At Beginning of Table"
 msgid "Unexpected beginning of statement."
 msgstr "于表开头"
 
-#: libraries/sql-parser/src/Parser.php:399
+#: libraries/sql-parser/src/Parser.php:410
 msgid "Unrecognized statement type."
 msgstr ""
 
-#: libraries/sql-parser/src/Parser.php:479
+#: libraries/sql-parser/src/Parser.php:489
 msgid "No transaction was previously started."
 msgstr ""
 
@@ -14478,8 +14492,10 @@ msgid "The name of the entity was expected."
 msgstr "打开的数据表个数。"
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:310
-msgid "At least one field definition was expected."
-msgstr ""
+#, fuzzy
+#| msgid "The row has been deleted."
+msgid "At least one column definition was expected."
+msgstr "已删除该行。"
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:329
 msgid "A \"RETURNS\" keyword was expected."
@@ -14557,11 +14573,11 @@ msgstr "未创建书签"
 msgid "Using bookmark \"%s\" as default browse query."
 msgstr "使用书签 \"%s\" 作为默认的查询。"
 
-#: libraries/sql.lib.php:1306
+#: libraries/sql.lib.php:1300
 msgid "Showing as PHP code"
 msgstr "显示为 PHP 代码"
 
-#: libraries/sql.lib.php:1638
+#: libraries/sql.lib.php:1632
 #, fuzzy, php-format
 #| msgid ""
 #| "This table does not contain a unique column. Grid edit, checkbox, Edit, "
@@ -14571,7 +14587,7 @@ msgid ""
 "Edit, Copy and Delete features are not available. %s"
 msgstr "该表没有唯一字段。单元格编辑、复选框、编辑、复制和删除无法正常使用。"
 
-#: libraries/sql.lib.php:1649
+#: libraries/sql.lib.php:1643
 #, fuzzy, php-format
 #| msgid ""
 #| "This table does not contain a unique column. Grid edit, checkbox, Edit, "
@@ -14581,7 +14597,7 @@ msgid ""
 "and Delete features may result in undesired behavior. %s"
 msgstr "该表没有唯一字段。单元格编辑、复选框、编辑、复制和删除无法正常使用。"
 
-#: libraries/sql.lib.php:1688
+#: libraries/sql.lib.php:1682
 #, php-format
 msgid "Problems with indexes of table `%s`"
 msgstr "数据表 `%s` 的索引存在问题"
@@ -14746,7 +14762,7 @@ msgid "Version %s snapshot (SQL code)"
 msgstr "版本 %s 的快照 (SQL 代码)"
 
 #: libraries/tracking.lib.php:947
-#: templates/structure/table_structure_row.phtml:33
+#: templates/table/structure/table_structure_row.phtml:33
 msgctxt "None for default"
 msgid "None"
 msgstr "无"
@@ -14799,15 +14815,15 @@ msgstr "为 %2$s 创建版本 %1$s"
 msgid "Version %1$s was created, tracking for %2$s is active."
 msgstr "已创建版本 %1$s，%2$s 的追踪已启用。"
 
-#: libraries/user_preferences.inc.php:29
+#: libraries/user_preferences.inc.php:30
 msgid "Manage your settings"
 msgstr "管理我的设置"
 
-#: libraries/user_preferences.inc.php:46 prefs_manage.php:307
+#: libraries/user_preferences.inc.php:54 prefs_manage.php:307
 msgid "Configuration has been saved."
 msgstr "设置已保存。"
 
-#: libraries/user_preferences.inc.php:66
+#: libraries/user_preferences.inc.php:74
 #, php-format
 msgid ""
 "Your preferences will be saved for current session only. Storing them "
@@ -15211,7 +15227,7 @@ msgid "first"
 msgstr "第一"
 
 #: templates/columns_definitions/move_column.phtml:12
-#: templates/structure/add_column.phtml:21
+#: templates/table/structure/add_column.phtml:21
 #, php-format
 msgid "after %s"
 msgstr "于 %s 之后"
@@ -15284,221 +15300,327 @@ msgstr "浏览器转换"
 msgid "Input transformation options"
 msgstr "转换选项"
 
-#: templates/designer/aggregate_query_panel.phtml:22
-#: templates/designer/options_panel.phtml:100
+#: templates/database/create_table.phtml:7
+#: templates/database/designer/side_menu.phtml:77
+#: templates/database/designer/side_menu.phtml:80
+msgid "Create table"
+msgstr "新建数据表"
+
+#: templates/database/create_table.phtml:15
+msgid "Number of columns"
+msgstr "字段数"
+
+#: templates/database/designer/aggregate_query_panel.phtml:22
+#: templates/database/designer/options_panel.phtml:100
 msgid "Aggregate"
 msgstr "聚合"
 
-#: templates/designer/aggregate_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:61
-#: templates/designer/options_panel.phtml:106
-#: templates/designer/options_panel.phtml:170
-#: templates/designer/where_query_panel.phtml:30
-#: templates/table/table_header.phtml:9
+#: templates/database/designer/aggregate_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:61
+#: templates/database/designer/options_panel.phtml:106
+#: templates/database/designer/options_panel.phtml:170
+#: templates/database/designer/where_query_panel.phtml:30
+#: templates/table/search/table_header.phtml:9
 msgid "Operator"
 msgstr "运算符"
 
-#: templates/designer/database_tables.phtml:29
+#: templates/database/designer/database_tables.phtml:29
 msgid "Toggle"
 msgstr ""
 
-#: templates/designer/database_tables.phtml:40
+#: templates/database/designer/database_tables.phtml:40
 #, fuzzy
 #| msgid "Table structure"
 msgid "See table structure"
 msgstr "表结构"
 
-#: templates/designer/delete_relation_panel.phtml:21
+#: templates/database/designer/delete_relation_panel.phtml:21
 msgid "Delete relation"
 msgstr "删除关系"
 
-#: templates/designer/edit_delete_pages.phtml:7
+#: templates/database/designer/edit_delete_pages.phtml:7
 #, fuzzy
 #| msgid "Page titles"
 msgid "Page to open"
 msgstr "页面标题"
 
-#: templates/designer/edit_delete_pages.phtml:7
+#: templates/database/designer/edit_delete_pages.phtml:7
 #, fuzzy
 #| msgid "Relation deleted"
 msgid "Page to delete"
 msgstr "已删除关系"
 
-#: templates/designer/having_query_panel.phtml:90
-#: templates/designer/options_panel.phtml:63
-#: templates/designer/options_panel.phtml:229
-#: templates/designer/where_query_panel.phtml:59
+#: templates/database/designer/having_query_panel.phtml:90
+#: templates/database/designer/options_panel.phtml:63
+#: templates/database/designer/options_panel.phtml:229
+#: templates/database/designer/where_query_panel.phtml:59
 msgid "Except"
 msgstr "EXCEPT"
 
-#: templates/designer/having_query_panel.phtml:102
-#: templates/designer/options_panel.phtml:75
-#: templates/designer/options_panel.phtml:241
-#: templates/designer/where_query_panel.phtml:71
+#: templates/database/designer/having_query_panel.phtml:102
+#: templates/database/designer/options_panel.phtml:75
+#: templates/database/designer/options_panel.phtml:241
+#: templates/database/designer/where_query_panel.phtml:71
 msgid "subquery"
 msgstr "子查询"
 
-#: templates/designer/new_relation_panel.phtml:22
-#: templates/designer/side_menu.phtml:84 templates/designer/side_menu.phtml:87
+#: templates/database/designer/new_relation_panel.phtml:22
+#: templates/database/designer/side_menu.phtml:84
+#: templates/database/designer/side_menu.phtml:87
 msgid "Create relation"
 msgstr "创建关系"
 
-#: templates/designer/options_panel.phtml:34
-#: templates/designer/options_panel.phtml:200
+#: templates/database/designer/options_panel.phtml:34
+#: templates/database/designer/options_panel.phtml:200
 msgid "Relation operator"
 msgstr "关系运算符"
 
-#: templates/designer/options_panel.phtml:85
-#: templates/designer/rename_to_panel.phtml:23
+#: templates/database/designer/options_panel.phtml:85
+#: templates/database/designer/rename_to_panel.phtml:23
 msgid "Rename to"
 msgstr "改名为"
 
-#: templates/designer/options_panel.phtml:91
-#: templates/designer/rename_to_panel.phtml:31
+#: templates/database/designer/options_panel.phtml:91
+#: templates/database/designer/rename_to_panel.phtml:31
 msgid "New name"
 msgstr "新名称"
 
-#: templates/designer/page_save_as.phtml:4
+#: templates/database/designer/page_save_as.phtml:4
 #, fuzzy
 #| msgid "Export to selected page"
 msgid "Save to selected page"
 msgstr "导出至所选页"
 
-#: templates/designer/page_save_as.phtml:5
+#: templates/database/designer/page_save_as.phtml:5
 #, fuzzy
 #| msgid "Create a page and export to it"
 msgid "Create a page and save to it"
 msgstr "导出至新页"
 
-#: templates/designer/page_save_as.phtml:26
+#: templates/database/designer/page_save_as.phtml:26
 #, fuzzy
 #| msgid "New page name: "
 msgid "New page name"
 msgstr "新页面名: "
 
-#: templates/designer/page_selector.phtml:2
+#: templates/database/designer/page_selector.phtml:2
 msgid "Select page"
 msgstr "选择页"
 
-#: templates/designer/query_details.phtml:10
+#: templates/database/designer/query_details.phtml:10
 msgid "Active options"
 msgstr "当前选项"
 
-#: templates/designer/schema_export.phtml:4
+#: templates/database/designer/schema_export.phtml:4
 msgid "Select Export Relational Type"
 msgstr "选择导出关系类型"
 
-#: templates/designer/side_menu.phtml:19 templates/designer/side_menu.phtml:25
+#: templates/database/designer/side_menu.phtml:19
+#: templates/database/designer/side_menu.phtml:25
 #, fuzzy
 #| msgid "Showing tables"
 msgid "Show/Hide tables list"
 msgstr "正在显示表"
 
-#: templates/designer/side_menu.phtml:29 templates/designer/side_menu.phtml:35
-#: templates/designer/side_menu.phtml:36
+#: templates/database/designer/side_menu.phtml:29
+#: templates/database/designer/side_menu.phtml:35
+#: templates/database/designer/side_menu.phtml:36
 msgid "View in fullscreen"
 msgstr "全屏查看"
 
-#: templates/designer/side_menu.phtml:34
+#: templates/database/designer/side_menu.phtml:34
 msgid "Exit fullscreen"
 msgstr "退出全屏"
 
-#: templates/designer/side_menu.phtml:41 templates/designer/side_menu.phtml:45
+#: templates/database/designer/side_menu.phtml:41
+#: templates/database/designer/side_menu.phtml:45
 #, fuzzy
 #| msgid "New name"
 msgid "New page"
 msgstr "新名称"
 
-#: templates/designer/side_menu.phtml:70 templates/designer/side_menu.phtml:73
+#: templates/database/designer/side_menu.phtml:70
+#: templates/database/designer/side_menu.phtml:73
 #, fuzzy
 #| msgid "Select page"
 msgid "Delete pages"
 msgstr "选择页"
 
-#: templates/designer/side_menu.phtml:77 templates/designer/side_menu.phtml:80
-#: templates/table/create_table.phtml:7
-msgid "Create table"
-msgstr "新建数据表"
-
-#: templates/designer/side_menu.phtml:98
-#: templates/designer/side_menu.phtml:101
+#: templates/database/designer/side_menu.phtml:98
+#: templates/database/designer/side_menu.phtml:101
 msgid "Reload"
 msgstr "重新载入"
 
-#: templates/designer/side_menu.phtml:107
-#: templates/designer/side_menu.phtml:110
+#: templates/database/designer/side_menu.phtml:107
+#: templates/database/designer/side_menu.phtml:110
 msgid "Help"
 msgstr "帮助"
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Angular links"
 msgstr "规则连接"
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Direct links"
 msgstr "直接连接"
 
-#: templates/designer/side_menu.phtml:122
-#: templates/designer/side_menu.phtml:124
+#: templates/database/designer/side_menu.phtml:122
+#: templates/database/designer/side_menu.phtml:124
 msgid "Snap to grid"
 msgstr "对齐网格"
 
-#: templates/designer/side_menu.phtml:128
-#: templates/designer/side_menu.phtml:134
+#: templates/database/designer/side_menu.phtml:128
+#: templates/database/designer/side_menu.phtml:134
 msgid "Small/Big All"
 msgstr "全部收缩/展开"
 
-#: templates/designer/side_menu.phtml:138
-#: templates/designer/side_menu.phtml:141
+#: templates/database/designer/side_menu.phtml:138
+#: templates/database/designer/side_menu.phtml:141
 msgid "Toggle small/big"
 msgstr "反向收缩/展开"
 
-#: templates/designer/side_menu.phtml:145
-#: templates/designer/side_menu.phtml:148
+#: templates/database/designer/side_menu.phtml:145
+#: templates/database/designer/side_menu.phtml:148
 msgid "Toggle relation lines"
 msgstr "显示/隐藏关系线"
 
-#: templates/designer/side_menu.phtml:153
-#: templates/designer/side_menu.phtml:156
+#: templates/database/designer/side_menu.phtml:153
+#: templates/database/designer/side_menu.phtml:156
 #, fuzzy
 #| msgid "Export all"
 msgid "Export schema"
 msgstr "全部导出"
 
-#: templates/designer/side_menu.phtml:165
-#: templates/designer/side_menu.phtml:168
+#: templates/database/designer/side_menu.phtml:165
+#: templates/database/designer/side_menu.phtml:168
 msgid "Build Query"
 msgstr "生成查询"
 
-#: templates/designer/side_menu.phtml:173
-#: templates/designer/side_menu.phtml:177
+#: templates/database/designer/side_menu.phtml:173
+#: templates/database/designer/side_menu.phtml:177
 msgid "Move Menu"
 msgstr "移动菜单"
 
-#: templates/designer/side_menu.phtml:181
-#: templates/designer/side_menu.phtml:186
+#: templates/database/designer/side_menu.phtml:181
+#: templates/database/designer/side_menu.phtml:186
 #, fuzzy
 #| msgid "Partial texts"
 msgid "Pin text"
 msgstr "部分内容"
 
-#: templates/designer/table_list.phtml:4
+#: templates/database/designer/table_list.phtml:4
 msgid "Hide/Show all"
 msgstr "全部隐藏/显示"
 
-#: templates/designer/table_list.phtml:14
+#: templates/database/designer/table_list.phtml:14
 msgid "Hide/Show Tables with no relation"
 msgstr "隐藏/显示没有关联的表"
 
-#: templates/designer/table_list.phtml:59
+#: templates/database/designer/table_list.phtml:59
 #, fuzzy
 #| msgid "Number of tables"
 msgid "Number of tables:"
 msgstr "数据表数量"
 
+#: templates/database/structure/body_for_table_summary.phtml:6
+#, php-format
+msgid "%s table"
+msgid_plural "%s tables"
+msgstr[0] "%s 张表"
+
+#: templates/database/structure/body_for_table_summary.phtml:17
+msgid "Sum"
+msgstr "总计"
+
+#: templates/database/structure/check_all_tables.phtml:6
+msgid "Check tables having overhead"
+msgstr "仅选择多余"
+
+#: templates/database/structure/check_all_tables.phtml:10
+#, fuzzy
+#| msgid "Show color"
+msgid "Show create"
+msgstr "显示颜色"
+
+#: templates/database/structure/check_all_tables.phtml:27
+#, fuzzy
+#| msgid "Add prefix"
+msgid "Prefix"
+msgstr "添加前缀"
+
+#: templates/database/structure/check_all_tables.phtml:28
+msgid "Add prefix to table"
+msgstr "添加表前缀"
+
+#: templates/database/structure/check_all_tables.phtml:29
+msgid "Replace table prefix"
+msgstr "修改表前缀"
+
+#: templates/database/structure/check_all_tables.phtml:30
+msgid "Copy table with prefix"
+msgstr "复制表为新前缀"
+
+#: templates/database/structure/check_all_tables.phtml:36
+#, fuzzy
+#| msgid "CHAR textarea columns"
+msgid "Add columns to central list"
+msgstr "CHAR 文本框列"
+
+#: templates/database/structure/check_all_tables.phtml:37
+msgid "Remove columns from central list"
+msgstr ""
+
+#: templates/database/structure/check_all_tables.phtml:38
+#, fuzzy
+#| msgid "CHAR textarea columns"
+msgid "Make consistent with central list"
+msgstr "CHAR 文本框列"
+
+#: templates/database/structure/favorite_anchor.phtml:12
+#, fuzzy
+#| msgid "Add this series"
+msgid "Add to Favorites"
+msgstr "添加该数据"
+
+#: templates/database/structure/show_create.phtml:2
+#, fuzzy
+#| msgid "Show SQL queries"
+msgid "Showing create queries"
+msgstr "显示 SQL 查询"
+
+#: templates/database/structure/sortable_header.phtml:13
+msgid "Sort"
+msgstr "排序"
+
+#: templates/database/structure/table_header.phtml:42
+#, fuzzy
+#| msgid "May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]."
+msgid ""
+"May be approximate. Click on the number to get the exact count. See "
+"[doc@faq3-11]FAQ 3.11[/doc]."
+msgstr "可能是近似值。参见[doc@faq3-11]常见问题 3.11[/doc]。"
+
+#: templates/database/structure/table_header.phtml:66
+#: templates/table/index_form.phtml:127
+msgid "Size"
+msgstr "大小"
+
+#: templates/database/structure/table_header.phtml:74
+#: templates/table/structure/display_table_stats.phtml:27
+msgid "Overhead"
+msgstr "多余"
+
+#: templates/database/structure/tracking_icon.phtml:4
+msgid "Tracking is active."
+msgstr "追踪已启用。"
+
+#: templates/database/structure/tracking_icon.phtml:8
+msgid "Tracking is not active."
+msgstr "追踪已禁用。"
+
 #: templates/error/report_form.phtml:7
 msgid ""
 "phpMyAdmin has encountered an error. We have collected data about this error "
@@ -15516,65 +15638,6 @@ msgstr "您可以检查错误报告中的数据："
 msgid "Please explain the steps that lead to the error:"
 msgstr "请描述一下导致错误的步骤："
 
-#: templates/gis_visualization/gis_visualization.phtml:3
-msgid "Display GIS Visualization"
-msgstr "显示可视化 GIS"
-
-#: templates/gis_visualization/gis_visualization.phtml:8
-msgid "Label column"
-msgstr "名称字段"
-
-#: templates/gis_visualization/gis_visualization.phtml:11
-msgid "-- None --"
-msgstr "-- 无 --"
-
-#: templates/gis_visualization/gis_visualization.phtml:19
-msgid "Spatial column"
-msgstr "空间字段"
-
-#: templates/index_form.phtml:16
-msgid "Index name:"
-msgstr "索引名称："
-
-#: templates/index_form.phtml:19
-msgid ""
-"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
-msgstr "“PRIMARY”<b>必须</b>而且<b>只能</b>作为主键的名称！"
-
-#: templates/index_form.phtml:40
-#, fuzzy
-#| msgid "Index cache size"
-msgid "Index choice:"
-msgstr "索引缓存大小"
-
-#: templates/index_form.phtml:57
-msgid "Key block size:"
-msgstr ""
-
-#: templates/index_form.phtml:74
-msgid "Index type:"
-msgstr "索引类型："
-
-#: templates/index_form.phtml:86
-#, fuzzy
-#| msgid "User:"
-msgid "Parser:"
-msgstr "用户："
-
-#: templates/index_form.phtml:102
-msgid "Comment:"
-msgstr "注释:"
-
-#: templates/index_form.phtml:127 templates/structure/table_header.phtml:66
-msgid "Size"
-msgstr "大小"
-
-#: templates/index_form.phtml:149 templates/index_form.phtml:190
-#, fuzzy
-#| msgid "Drag to reorder."
-msgid "Drag to reorder"
-msgstr "拖拽以调整顺序。"
-
 #: templates/prefs_autoload.phtml:9
 msgid ""
 "Your browser has phpMyAdmin configuration for this domain. Would you like to "
@@ -15587,450 +15650,410 @@ msgstr "你的浏览器中有当前域的 phpMyAdmin 设置。是否导入到当
 msgid "Start row:"
 msgstr "起始行"
 
-#: templates/structure/actions_in_table_structure.phtml:14
-#, php-format
-msgid "A primary key has been added on %s."
-msgstr "已将 %s 设为主键。"
-
-#: templates/structure/actions_in_table_structure.phtml:34
-#: templates/structure/actions_in_table_structure.phtml:54
-#: templates/structure/actions_in_table_structure.phtml:79
-#: templates/structure/actions_in_table_structure.phtml:101
-#, php-format
-msgid "An index has been added on %s."
-msgstr "已将 %s 设为索引。"
-
-#: templates/structure/actions_in_table_structure.phtml:130
-#: templates/structure/check_all_table_column.phtml:59
-#, fuzzy
-#| msgid "Remove column(s)"
-msgid "Remove from central columns"
-msgstr "删除字段"
-
-#: templates/structure/actions_in_table_structure.phtml:138
-#: templates/structure/check_all_table_column.phtml:55
-#, fuzzy
-#| msgid "CHAR textarea columns"
-msgid "Add to central columns"
-msgstr "CHAR 文本框列"
-
-#: templates/structure/add_column.phtml:7
-#, php-format
-msgid "Add %s column(s)"
-msgstr "添加 %s 个字段"
-
-#: templates/structure/add_column.phtml:12
-#, fuzzy
-#| msgid "At Beginning of Table"
-msgid "at beginning of table"
-msgstr "于表开头"
-
-#: templates/structure/body_for_table_summary.phtml:6
-#, php-format
-msgid "%s table"
-msgid_plural "%s tables"
-msgstr[0] "%s 张表"
-
-#: templates/structure/body_for_table_summary.phtml:17
-msgid "Sum"
-msgstr "总计"
-
-#: templates/structure/check_all_tables.phtml:6
-msgid "Check tables having overhead"
-msgstr "仅选择多余"
-
-#: templates/structure/check_all_tables.phtml:10
-#, fuzzy
-#| msgid "Show color"
-msgid "Show create"
-msgstr "显示颜色"
-
-#: templates/structure/check_all_tables.phtml:27
-#, fuzzy
-#| msgid "Add prefix"
-msgid "Prefix"
-msgstr "添加前缀"
-
-#: templates/structure/check_all_tables.phtml:28
-msgid "Add prefix to table"
-msgstr "添加表前缀"
-
-#: templates/structure/check_all_tables.phtml:29
-msgid "Replace table prefix"
-msgstr "修改表前缀"
-
-#: templates/structure/check_all_tables.phtml:30
-msgid "Copy table with prefix"
-msgstr "复制表为新前缀"
-
-#: templates/structure/check_all_tables.phtml:36
-#, fuzzy
-#| msgid "CHAR textarea columns"
-msgid "Add columns to central list"
-msgstr "CHAR 文本框列"
-
-#: templates/structure/check_all_tables.phtml:37
-msgid "Remove columns from central list"
-msgstr ""
-
-#: templates/structure/check_all_tables.phtml:38
-#, fuzzy
-#| msgid "CHAR textarea columns"
-msgid "Make consistent with central list"
-msgstr "CHAR 文本框列"
-
-#: templates/structure/display_structure.phtml:140 view_create.php:181
-msgid "Edit view"
-msgstr "编辑视图"
-
-#: templates/structure/display_table_stats.phtml:9
-msgid "Space usage"
-msgstr "已用空间"
-
-#: templates/structure/display_table_stats.phtml:27
-#: templates/structure/table_header.phtml:74
-msgid "Overhead"
-msgstr "多余"
-
-#: templates/structure/display_table_stats.phtml:32
-msgid "Effective"
-msgstr "有效"
-
-#: templates/structure/favorite_anchor.phtml:12
-#, fuzzy
-#| msgid "Add this series"
-msgid "Add to Favorites"
-msgstr "添加该数据"
-
-#: templates/structure/move_columns_dialog.phtml:1
-#: templates/structure/optional_action_links.phtml:21
-msgid "Move columns"
-msgstr "移动字段"
-
-#: templates/structure/move_columns_dialog.phtml:2
-msgid "Move the columns by dragging them up and down."
-msgstr "请通过拖拽来移动字段的位置。"
-
-#: templates/structure/optional_action_links.phtml:9
-msgid "Propose table structure"
-msgstr "规划表结构"
-
-#: templates/structure/optional_action_links.phtml:24
-#, fuzzy
-#| msgid "Propose table structure"
-msgid "Improve table structure"
-msgstr "规划表结构"
-
-#: templates/structure/optional_action_links.phtml:30
-#, fuzzy
-#| msgid "Track table"
-msgid "Track view"
-msgstr "追踪表"
-
-#: templates/structure/row_stats_table.phtml:3
-#, fuzzy
-#| msgid "Row Statistics"
-msgid "Row statistics"
-msgstr "行统计"
-
-#: templates/structure/row_stats_table.phtml:9
-msgid "static"
-msgstr "静态"
-
-#: templates/structure/row_stats_table.phtml:11
-msgid "dynamic"
-msgstr "动态"
-
-#: templates/structure/row_stats_table.phtml:22
-msgid "partitioned"
-msgstr "已分区"
-
-#: templates/structure/row_stats_table.phtml:54
-msgid "Row length"
-msgstr "行长度"
-
-#: templates/structure/row_stats_table.phtml:66
-msgid "Row size"
-msgstr "行大小"
-
-#: templates/structure/row_stats_table.phtml:73
-msgid "Next autoindex"
-msgstr "下一个自增值"
-
-#: templates/structure/secondary_tabs.phtml:14
-#, fuzzy
-#| msgid "Relation view"
-msgid "Relation view"
-msgstr "关系查看"
-
-#: templates/structure/show_create.phtml:2
-#, fuzzy
-#| msgid "Show SQL queries"
-msgid "Showing create queries"
-msgstr "显示 SQL 查询"
-
-#: templates/structure/sortable_header.phtml:13
-msgid "Sort"
-msgstr "排序"
-
-#: templates/structure/table_header.phtml:42
-#, fuzzy
-#| msgid "May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]."
-msgid ""
-"May be approximate. Click on the number to get the exact count. See "
-"[doc@faq3-11]FAQ 3.11[/doc]."
-msgstr "可能是近似值。参见[doc@faq3-11]常见问题 3.11[/doc]。"
-
-#: templates/structure/table_structure_row.phtml:46
-#, php-format
-msgid "Column %s has been dropped."
-msgstr "已删除字段 %s。"
-
-#: templates/structure/tracking_icon.phtml:4
-msgid "Tracking is active."
-msgstr "追踪已启用。"
-
-#: templates/structure/tracking_icon.phtml:8
-msgid "Tracking is not active."
-msgstr "追踪已禁用。"
-
-#: templates/table/create_table.phtml:15
-msgid "Number of columns"
-msgstr "字段数"
-
-#: templates/table/options.phtml:8
-msgid "Select columns (at least one):"
-msgstr "选择字段（至少一个）："
-
-#: templates/table/options.phtml:37
-msgid "Add search conditions (body of the \"where\" clause):"
-msgstr "添加搜索条件（“where”从句的主体）："
-
-#: templates/table/options.phtml:45
-msgid "Number of rows per page"
-msgstr "每页行数"
-
-#: templates/table/options.phtml:56
-msgid "Display order:"
-msgstr "显示顺序："
-
-#: templates/table/options_zoom.phtml:6
-msgid "Use this column to label each point"
-msgstr "使用该字段标记每个点"
-
-#: templates/table/options_zoom.phtml:35
-msgid "Maximum rows to plot"
-msgstr "图表中的最大行数"
-
-#: templates/table/replace_preview.phtml:13
-msgid "Find and replace - preview"
-msgstr "查找并替换 - 预览"
-
-#: templates/table/replace_preview.phtml:18
-msgid "Original string"
-msgstr "替换前"
-
-#: templates/table/replace_preview.phtml:19
-msgid "Replaced string"
-msgstr "替换后"
-
-#: templates/table/replace_preview.phtml:40
-msgid "Replace"
-msgstr "替换"
-
-#: templates/table/rows_zoom.phtml:16
-msgid "Additional search criteria"
-msgstr "附加搜索条件"
-
-#: templates/table/search_and_replace.phtml:3
-msgid "Replace with:"
-msgstr "替换为："
-
-#: templates/table/search_and_replace.phtml:22
-#, fuzzy
-#| msgid "as regular expression"
-msgid "Use regular expression"
-msgstr "使用正则表达式"
-
-#: templates/table/selection_form.phtml:12
-msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
-msgstr "在两个不同的字段中执行“依例查询”（通配符：“%”）"
-
-#: templates/table/selection_form.phtml:34
-msgid "Do a \"query by example\" (wildcard: \"%\")"
-msgstr "执行“依例查询”（通配符：“%”）"
-
-#: templates/table/zoom_result_form.phtml:7
-msgid "Browse/Edit the points"
-msgstr "浏览/编辑点"
-
-#: templates/table/zoom_result_form.phtml:15
-msgid "How to use"
-msgstr "如何使用"
-
-#: templates/table/zoom_result_form.phtml:23
-msgid "Reset zoom"
-msgstr "重置缩放"
-
-#: templates/tbl_chart.phtml:17
+#: templates/table/chart/tbl_chart.phtml:17
 msgctxt "Chart type"
 msgid "Bar"
 msgstr "柱状图"
 
-#: templates/tbl_chart.phtml:21
+#: templates/table/chart/tbl_chart.phtml:21
 msgctxt "Chart type"
 msgid "Column"
 msgstr "柱状图"
 
-#: templates/tbl_chart.phtml:25
+#: templates/table/chart/tbl_chart.phtml:25
 msgctxt "Chart type"
 msgid "Line"
 msgstr "折线图"
 
-#: templates/tbl_chart.phtml:29
+#: templates/table/chart/tbl_chart.phtml:29
 msgctxt "Chart type"
 msgid "Spline"
 msgstr "曲线图"
 
-#: templates/tbl_chart.phtml:33
+#: templates/table/chart/tbl_chart.phtml:33
 msgctxt "Chart type"
 msgid "Area"
 msgstr "图标类型"
 
-#: templates/tbl_chart.phtml:37
+#: templates/table/chart/tbl_chart.phtml:37
 msgctxt "Chart type"
 msgid "Pie"
 msgstr "饼图"
 
-#: templates/tbl_chart.phtml:41
+#: templates/table/chart/tbl_chart.phtml:41
 msgctxt "Chart type"
 msgid "Timeline"
 msgstr "时间线"
 
-#: templates/tbl_chart.phtml:45
+#: templates/table/chart/tbl_chart.phtml:45
 msgctxt "Chart type"
 msgid "Scatter"
 msgstr ""
 
-#: templates/tbl_chart.phtml:50
+#: templates/table/chart/tbl_chart.phtml:50
 msgid "Stacked"
 msgstr "堆叠"
 
-#: templates/tbl_chart.phtml:53
+#: templates/table/chart/tbl_chart.phtml:53
 msgid "Chart title"
 msgstr "图表标题"
 
-#: templates/tbl_chart.phtml:57
+#: templates/table/chart/tbl_chart.phtml:57
 msgid "X-Axis:"
 msgstr "横坐标:"
 
-#: templates/tbl_chart.phtml:72
+#: templates/table/chart/tbl_chart.phtml:72
 msgid "Series:"
 msgstr "数据:"
 
-#: templates/tbl_chart.phtml:102
+#: templates/table/chart/tbl_chart.phtml:102
 msgid "X-Axis label:"
 msgstr "横坐标名称:"
 
-#: templates/tbl_chart.phtml:104
+#: templates/table/chart/tbl_chart.phtml:104
 msgid "X Values"
 msgstr "横值"
 
-#: templates/tbl_chart.phtml:107
+#: templates/table/chart/tbl_chart.phtml:107
 msgid "Y-Axis label:"
 msgstr "纵坐标名称:"
 
-#: templates/tbl_chart.phtml:115
+#: templates/table/chart/tbl_chart.phtml:115
 msgid "Series names are in a column"
 msgstr ""
 
-#: templates/tbl_chart.phtml:118
+#: templates/table/chart/tbl_chart.phtml:118
 #, fuzzy
 #| msgid "Inside column:"
 msgid "Series column:"
 msgstr "包含字段："
 
-#: templates/tbl_chart.phtml:130
+#: templates/table/chart/tbl_chart.phtml:130
 #, fuzzy
 #| msgid "Values for column %s"
 msgid "Value Column:"
 msgstr "字段 %s 的值"
 
-#: templates/tbl_chart.phtml:150
+#: templates/table/chart/tbl_chart.phtml:150
 #, fuzzy
 #| msgid "Save as file"
 msgid "Save chart as image"
 msgstr "保存为文件"
 
-#: templates/tbl_relation/common_form.phtml:7
+#: templates/table/gis_visualization/gis_visualization.phtml:3
+msgid "Display GIS Visualization"
+msgstr "显示可视化 GIS"
+
+#: templates/table/gis_visualization/gis_visualization.phtml:8
+msgid "Label column"
+msgstr "名称字段"
+
+#: templates/table/gis_visualization/gis_visualization.phtml:11
+msgid "-- None --"
+msgstr "-- 无 --"
+
+#: templates/table/gis_visualization/gis_visualization.phtml:19
+msgid "Spatial column"
+msgstr "空间字段"
+
+#: templates/table/index_form.phtml:16
+msgid "Index name:"
+msgstr "索引名称："
+
+#: templates/table/index_form.phtml:19
+msgid ""
+"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
+msgstr "“PRIMARY”<b>必须</b>而且<b>只能</b>作为主键的名称！"
+
+#: templates/table/index_form.phtml:40
+#, fuzzy
+#| msgid "Index cache size"
+msgid "Index choice:"
+msgstr "索引缓存大小"
+
+#: templates/table/index_form.phtml:57
+msgid "Key block size:"
+msgstr ""
+
+#: templates/table/index_form.phtml:74
+msgid "Index type:"
+msgstr "索引类型："
+
+#: templates/table/index_form.phtml:86
+#, fuzzy
+#| msgid "User:"
+msgid "Parser:"
+msgstr "用户："
+
+#: templates/table/index_form.phtml:102
+msgid "Comment:"
+msgstr "注释:"
+
+#: templates/table/index_form.phtml:149 templates/table/index_form.phtml:190
+#, fuzzy
+#| msgid "Drag to reorder."
+msgid "Drag to reorder"
+msgstr "拖拽以调整顺序。"
+
+#: templates/table/relation/common_form.phtml:7
 msgid "Internal relations"
 msgstr "内联"
 
-#: templates/tbl_relation/common_form.phtml:11
+#: templates/table/relation/common_form.phtml:11
 msgid "Internal relation"
 msgstr "内联"
 
-#: templates/tbl_relation/common_form.phtml:14
+#: templates/table/relation/common_form.phtml:14
 msgid ""
 "An internal relation is not necessary when a corresponding FOREIGN KEY "
 "relation exists."
 msgstr "不需要一个和外键关系一致的内联关系。"
 
-#: templates/tbl_relation/common_form.phtml:37
+#: templates/table/relation/common_form.phtml:37
 #, fuzzy
 #| msgid "Foreign key constraint"
 msgid "Foreign key constraints"
 msgstr "外键约束"
 
-#: templates/tbl_relation/common_form.phtml:40
+#: templates/table/relation/common_form.phtml:40
 #, fuzzy
 #| msgid "Action"
 msgid "Actions"
 msgstr "操作"
 
-#: templates/tbl_relation/common_form.phtml:41
+#: templates/table/relation/common_form.phtml:41
 #, fuzzy
 #| msgid "Constraints for table"
 msgid "Constraint properties"
 msgstr "限制表"
 
-#: templates/tbl_relation/common_form.phtml:44
+#: templates/table/relation/common_form.phtml:44
 msgid ""
 "Only columns with index will be displayed. You can define an index below."
 msgstr ""
 
-#: templates/tbl_relation/common_form.phtml:49
+#: templates/table/relation/common_form.phtml:49
 msgid "Foreign key constraint"
 msgstr "外键约束"
 
-#: templates/tbl_relation/common_form.phtml:81
+#: templates/table/relation/common_form.phtml:81
 #, fuzzy
 #| msgid "Add constraints"
 msgid "+ Add constraint"
 msgstr "添加约束"
 
-#: templates/tbl_relation/common_form.phtml:91
+#: templates/table/relation/common_form.phtml:91
 #, fuzzy
 #| msgid "Choose column to display"
 msgid "Choose column to display:"
 msgstr "选择要显示的字段"
 
-#: templates/tbl_relation/foreign_key_row.phtml:13
+#: templates/table/relation/foreign_key_row.phtml:13
 #, fuzzy, php-format
 #| msgid "Foreign key constraint"
 msgid "Foreign key constraint %s has been dropped"
 msgstr "外键约束"
 
-#: templates/tbl_relation/foreign_key_row.phtml:102
+#: templates/table/relation/foreign_key_row.phtml:102
 msgid "Constraint name"
 msgstr "限制名称"
 
-#: templates/tbl_relation/foreign_key_row.phtml:157
+#: templates/table/relation/foreign_key_row.phtml:157
 #, fuzzy
 #| msgid "Add column"
 msgid "+ Add column"
 msgstr "添加字段"
 
+#: templates/table/search/options.phtml:8
+msgid "Select columns (at least one):"
+msgstr "选择字段（至少一个）："
+
+#: templates/table/search/options.phtml:37
+msgid "Add search conditions (body of the \"where\" clause):"
+msgstr "添加搜索条件（“where”从句的主体）："
+
+#: templates/table/search/options.phtml:45
+msgid "Number of rows per page"
+msgstr "每页行数"
+
+#: templates/table/search/options.phtml:56
+msgid "Display order:"
+msgstr "显示顺序："
+
+#: templates/table/search/options_zoom.phtml:6
+msgid "Use this column to label each point"
+msgstr "使用该字段标记每个点"
+
+#: templates/table/search/options_zoom.phtml:35
+msgid "Maximum rows to plot"
+msgstr "图表中的最大行数"
+
+#: templates/table/search/replace_preview.phtml:13
+msgid "Find and replace - preview"
+msgstr "查找并替换 - 预览"
+
+#: templates/table/search/replace_preview.phtml:18
+msgid "Original string"
+msgstr "替换前"
+
+#: templates/table/search/replace_preview.phtml:19
+msgid "Replaced string"
+msgstr "替换后"
+
+#: templates/table/search/replace_preview.phtml:40
+msgid "Replace"
+msgstr "替换"
+
+#: templates/table/search/rows_zoom.phtml:16
+msgid "Additional search criteria"
+msgstr "附加搜索条件"
+
+#: templates/table/search/search_and_replace.phtml:3
+msgid "Replace with:"
+msgstr "替换为："
+
+#: templates/table/search/search_and_replace.phtml:22
+#, fuzzy
+#| msgid "as regular expression"
+msgid "Use regular expression"
+msgstr "使用正则表达式"
+
+#: templates/table/search/selection_form.phtml:12
+msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
+msgstr "在两个不同的字段中执行“依例查询”（通配符：“%”）"
+
+#: templates/table/search/selection_form.phtml:34
+msgid "Do a \"query by example\" (wildcard: \"%\")"
+msgstr "执行“依例查询”（通配符：“%”）"
+
+#: templates/table/search/zoom_result_form.phtml:7
+msgid "Browse/Edit the points"
+msgstr "浏览/编辑点"
+
+#: templates/table/search/zoom_result_form.phtml:15
+msgid "How to use"
+msgstr "如何使用"
+
+#: templates/table/search/zoom_result_form.phtml:23
+msgid "Reset zoom"
+msgstr "重置缩放"
+
+#: templates/table/secondary_tabs.phtml:14
+#, fuzzy
+#| msgid "Relation view"
+msgid "Relation view"
+msgstr "关系查看"
+
+#: templates/table/structure/actions_in_table_structure.phtml:14
+#, php-format
+msgid "A primary key has been added on %s."
+msgstr "已将 %s 设为主键。"
+
+#: templates/table/structure/actions_in_table_structure.phtml:34
+#: templates/table/structure/actions_in_table_structure.phtml:54
+#: templates/table/structure/actions_in_table_structure.phtml:79
+#: templates/table/structure/actions_in_table_structure.phtml:101
+#, php-format
+msgid "An index has been added on %s."
+msgstr "已将 %s 设为索引。"
+
+#: templates/table/structure/actions_in_table_structure.phtml:130
+#: templates/table/structure/check_all_table_column.phtml:59
+#, fuzzy
+#| msgid "Remove column(s)"
+msgid "Remove from central columns"
+msgstr "删除字段"
+
+#: templates/table/structure/actions_in_table_structure.phtml:138
+#: templates/table/structure/check_all_table_column.phtml:55
+#, fuzzy
+#| msgid "CHAR textarea columns"
+msgid "Add to central columns"
+msgstr "CHAR 文本框列"
+
+#: templates/table/structure/add_column.phtml:7
+#, php-format
+msgid "Add %s column(s)"
+msgstr "添加 %s 个字段"
+
+#: templates/table/structure/add_column.phtml:12
+#, fuzzy
+#| msgid "At Beginning of Table"
+msgid "at beginning of table"
+msgstr "于表开头"
+
+#: templates/table/structure/display_structure.phtml:140 view_create.php:181
+msgid "Edit view"
+msgstr "编辑视图"
+
+#: templates/table/structure/display_table_stats.phtml:9
+msgid "Space usage"
+msgstr "已用空间"
+
+#: templates/table/structure/display_table_stats.phtml:32
+msgid "Effective"
+msgstr "有效"
+
+#: templates/table/structure/move_columns_dialog.phtml:1
+#: templates/table/structure/optional_action_links.phtml:21
+msgid "Move columns"
+msgstr "移动字段"
+
+#: templates/table/structure/move_columns_dialog.phtml:2
+msgid "Move the columns by dragging them up and down."
+msgstr "请通过拖拽来移动字段的位置。"
+
+#: templates/table/structure/optional_action_links.phtml:9
+msgid "Propose table structure"
+msgstr "规划表结构"
+
+#: templates/table/structure/optional_action_links.phtml:24
+#, fuzzy
+#| msgid "Propose table structure"
+msgid "Improve table structure"
+msgstr "规划表结构"
+
+#: templates/table/structure/optional_action_links.phtml:30
+#, fuzzy
+#| msgid "Track table"
+msgid "Track view"
+msgstr "追踪表"
+
+#: templates/table/structure/row_stats_table.phtml:3
+#, fuzzy
+#| msgid "Row Statistics"
+msgid "Row statistics"
+msgstr "行统计"
+
+#: templates/table/structure/row_stats_table.phtml:9
+msgid "static"
+msgstr "静态"
+
+#: templates/table/structure/row_stats_table.phtml:11
+msgid "dynamic"
+msgstr "动态"
+
+#: templates/table/structure/row_stats_table.phtml:22
+msgid "partitioned"
+msgstr "已分区"
+
+#: templates/table/structure/row_stats_table.phtml:54
+msgid "Row length"
+msgstr "行长度"
+
+#: templates/table/structure/row_stats_table.phtml:66
+msgid "Row size"
+msgstr "行大小"
+
+#: templates/table/structure/row_stats_table.phtml:73
+msgid "Next autoindex"
+msgstr "下一个自增值"
+
+#: templates/table/structure/table_structure_row.phtml:46
+#, php-format
+msgid "Column %s has been dropped."
+msgstr "已删除字段 %s。"
+
 #: themes.php:17 themes.php:22
 msgid "Theme"
 msgstr "主题"
@@ -17236,6 +17259,11 @@ msgstr ""
 msgid "concurrent_insert is set to 0"
 msgstr "concurrent_insert 被设为 0"
 
+#, fuzzy
+#~| msgid "Read misses"
+#~ msgid "Read as multibytes"
+#~ msgstr "读缺失数"
+
 #~ msgid "Relational display column"
 #~ msgstr "关联显示字段"
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 3436496a4a..85d3597691 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: phpMyAdmin 4.5.0-dev\n"
 "Report-Msgid-Bugs-To: developers@phpmyadmin.net\n"
-"POT-Creation-Date: 2015-08-08 13:53-0400\n"
+"POT-Creation-Date: 2015-08-12 08:10-0400\n"
 "PO-Revision-Date: 2015-07-08 05:25+0200\n"
 "Last-Translator: Chien Wei Lin <cwlin0416@gmail.com>\n"
 "Language-Team: Chinese (Taiwan) <https://hosted.weblate.org/projects/"
@@ -51,7 +51,7 @@ msgid "Table comments:"
 msgstr "資料表備註："
 
 #: db_datadict.php:104 libraries/Index.class.php:699
-#: libraries/insert_edit.lib.php:1567
+#: libraries/insert_edit.lib.php:1565
 #: libraries/navigation/Nodes/Node_Column.class.php:30
 #: libraries/plugins/export/ExportHtmlword.class.php:280
 #: libraries/plugins/export/ExportHtmlword.class.php:375
@@ -65,13 +65,14 @@ msgstr "資料表備註："
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1023
 #: libraries/tracking.lib.php:879 libraries/tracking.lib.php:975
 #: templates/columns_definitions/column_name.phtml:18
-#: templates/index_form.phtml:124 templates/table/table_header.phtml:6
-#: templates/table/zoom_result_form.phtml:33
-#: templates/tbl_relation/common_form.phtml:10
-#: templates/tbl_relation/common_form.phtml:43
-#: templates/tbl_relation/foreign_key_row.phtml:194
-#: templates/tbl_relation/foreign_key_row.phtml:206
-#: templates/tbl_relation/internal_relational_row.phtml:71
+#: templates/table/index_form.phtml:124
+#: templates/table/relation/common_form.phtml:10
+#: templates/table/relation/common_form.phtml:43
+#: templates/table/relation/foreign_key_row.phtml:194
+#: templates/table/relation/foreign_key_row.phtml:206
+#: templates/table/relation/internal_relational_row.phtml:71
+#: templates/table/search/table_header.phtml:6
+#: templates/table/search/zoom_result_form.phtml:33
 msgid "Column"
 msgstr "欄位"
 
@@ -89,21 +90,21 @@ msgstr "欄位"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1001
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1024
 #: libraries/rte/rte_list.lib.php:75 libraries/rte/rte_list.lib.php:103
-#: libraries/rte/rte_routines.lib.php:802
-#: libraries/rte/rte_routines.lib.php:831
-#: libraries/rte/rte_routines.lib.php:1493
+#: libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_routines.lib.php:922
+#: libraries/rte/rte_routines.lib.php:1584
 #: libraries/server_privileges.lib.php:2369 libraries/tracking.lib.php:880
 #: libraries/tracking.lib.php:972
 #: templates/columns_definitions/table_fields_definitions.phtml:11
-#: templates/structure/table_header.phtml:48
-#: templates/structure/table_structure_header.phtml:6
-#: templates/table/table_header.phtml:7
+#: templates/database/structure/table_header.phtml:48
+#: templates/table/search/table_header.phtml:7
+#: templates/table/structure/table_structure_header.phtml:6
 msgid "Type"
 msgstr "型態"
 
 #: db_datadict.php:106 libraries/Index.class.php:702
 #: libraries/central_columns.lib.php:708
-#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1576
+#: libraries/central_columns.lib.php:1382 libraries/insert_edit.lib.php:1574
 #: libraries/plugins/export/ExportHtmlword.class.php:286
 #: libraries/plugins/export/ExportHtmlword.class.php:381
 #: libraries/plugins/export/ExportLatex.class.php:509
@@ -116,8 +117,8 @@ msgstr "型態"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1026
 #: libraries/tracking.lib.php:882 libraries/tracking.lib.php:978
 #: templates/columns_definitions/table_fields_definitions.phtml:39
-#: templates/structure/table_structure_header.phtml:9
-#: templates/table/zoom_result_form.phtml:34
+#: templates/table/search/zoom_result_form.phtml:34
+#: templates/table/structure/table_structure_header.phtml:9
 msgid "Null"
 msgstr "空值"
 
@@ -135,8 +136,8 @@ msgstr "空值"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1027
 #: libraries/replication_gui.lib.php:153 libraries/tracking.lib.php:883
 #: templates/columns_definitions/table_fields_definitions.phtml:25
-#: templates/structure/body_for_table_summary.phtml:55
-#: templates/structure/table_structure_header.phtml:10
+#: templates/database/structure/body_for_table_summary.phtml:55
+#: templates/table/structure/table_structure_header.phtml:10
 msgid "Default"
 msgstr "預設值"
 
@@ -164,19 +165,19 @@ msgid "Comments"
 msgstr "備註"
 
 #: db_datadict.php:146
-#: libraries/controllers/StructureController.class.php:1960
-#: libraries/controllers/StructureController.class.php:1965
+#: libraries/controllers/TableStructureController.class.php:951
+#: libraries/controllers/TableStructureController.class.php:956
 #: libraries/tracking.lib.php:922
 #: templates/columns_definitions/column_indexes.phtml:6
-#: templates/structure/check_all_table_column.phtml:22
-#: templates/structure/display_structure.phtml:74
+#: templates/table/structure/check_all_table_column.phtml:22
+#: templates/table/structure/display_structure.phtml:74
 msgid "Primary"
 msgstr "主鍵"
 
 #: db_datadict.php:156 js/messages.php:317 libraries/Index.class.php:567
 #: libraries/Index.class.php:606 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261 libraries/mult_submits.lib.php:403
+#: libraries/config/FormDisplay.tpl.php:272 libraries/mult_submits.lib.php:403
 #: libraries/mult_submits.lib.php:417
 #: libraries/plugins/export/ExportHtmlword.class.php:630
 #: libraries/plugins/export/ExportLatex.class.php:589
@@ -192,20 +193,20 @@ msgstr "主鍵"
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1010 libraries/tracking.lib.php:1015
 #: prefs_manage.php:140 templates/prefs_autoload.phtml:15
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "No"
 msgstr "否"
 
 #: db_datadict.php:156 js/messages.php:443 libraries/Index.class.php:568
 #: libraries/Index.class.php:605 libraries/Index.class.php:1018
 #: libraries/central_columns.lib.php:966
-#: libraries/config/FormDisplay.tpl.php:261
-#: libraries/controllers/StructureController.class.php:1344
-#: libraries/controllers/StructureController.class.php:2223
-#: libraries/controllers/StructureController.class.php:2232
-#: libraries/controllers/StructureController.class.php:2237
-#: libraries/controllers/StructureController.class.php:2242
-#: libraries/controllers/StructureController.class.php:2247
+#: libraries/config/FormDisplay.tpl.php:272
+#: libraries/controllers/TableStructureController.class.php:539
+#: libraries/controllers/TableStructureController.class.php:1201
+#: libraries/controllers/TableStructureController.class.php:1210
+#: libraries/controllers/TableStructureController.class.php:1215
+#: libraries/controllers/TableStructureController.class.php:1220
+#: libraries/controllers/TableStructureController.class.php:1225
 #: libraries/mult_submits.inc.php:82 libraries/mult_submits.inc.php:178
 #: libraries/mult_submits.lib.php:339 libraries/mult_submits.lib.php:372
 #: libraries/mult_submits.lib.php:401 libraries/mult_submits.lib.php:415
@@ -214,8 +215,8 @@ msgstr "否"
 #: libraries/plugins/export/ExportOdt.class.php:756
 #: libraries/plugins/export/ExportTexytext.class.php:567
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1077
-#: libraries/server_databases.lib.php:464
-#: libraries/server_databases.lib.php:474
+#: libraries/server_databases.lib.php:475
+#: libraries/server_databases.lib.php:485
 #: libraries/server_privileges.lib.php:2546
 #: libraries/server_privileges.lib.php:2727
 #: libraries/server_privileges.lib.php:2748
@@ -225,7 +226,7 @@ msgstr "否"
 #: libraries/server_privileges.lib.php:3473 libraries/tracking.lib.php:933
 #: libraries/tracking.lib.php:1008 libraries/tracking.lib.php:1013
 #: prefs_manage.php:138 templates/prefs_autoload.phtml:14
-#: templates/structure/table_structure_row.phtml:24
+#: templates/table/structure/table_structure_row.phtml:24
 msgid "Yes"
 msgstr "是"
 
@@ -235,7 +236,7 @@ msgstr "檢視資料庫結構的匯出資料"
 
 #: db_export.php:37 db_tracking.php:90 export.php:382
 #: libraries/DBQbe.class.php:326
-#: libraries/controllers/StructureController.class.php:231
+#: libraries/controllers/DatabaseStructureController.class.php:170
 #: libraries/navigation/NavigationTree.class.php:897
 msgid "No tables found in database."
 msgstr "資料庫中沒有任何資料表。"
@@ -246,14 +247,14 @@ msgstr "資料庫中沒有任何資料表。"
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:26
 #: libraries/navigation/Nodes/Node_Table_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:120
-#: templates/structure/show_create.phtml:18
+#: templates/database/structure/show_create.phtml:18
 msgid "Tables"
 msgstr "資料表"
 
 #: db_export.php:52 libraries/Menu.class.php:317 libraries/Menu.class.php:425
-#: libraries/Util.class.php:3333 libraries/Util.class.php:3343
-#: libraries/Util.class.php:3349 libraries/Util.class.php:3629
-#: libraries/Util.class.php:4327 libraries/Util.class.php:4344
+#: libraries/Util.class.php:3339 libraries/Util.class.php:3349
+#: libraries/Util.class.php:3355 libraries/Util.class.php:3635
+#: libraries/Util.class.php:4333 libraries/Util.class.php:4350
 #: libraries/central_columns.lib.php:728 libraries/config.values.php:39
 #: libraries/config.values.php:47 libraries/config.values.php:109
 #: libraries/config.values.php:115 libraries/config/setup.forms.php:323
@@ -267,7 +268,7 @@ msgstr "資料表"
 #: libraries/navigation/Nodes/Node_Table.class.php:283
 #: libraries/server_privileges.lib.php:1141 libraries/tracking.lib.php:874
 #: templates/columns_definitions/table_fields_definitions.phtml:3
-#: templates/designer/table_list.phtml:28
+#: templates/database/designer/table_list.phtml:28
 msgid "Structure"
 msgstr "結構"
 
@@ -279,7 +280,7 @@ msgstr "結構"
 #: libraries/config/user_preferences.forms.php:292
 #: libraries/config/user_preferences.forms.php:297
 #: libraries/server_privileges.lib.php:1140
-#: templates/structure/display_table_stats.phtml:12
+#: templates/table/structure/display_table_stats.phtml:12
 msgid "Data"
 msgstr "資料"
 
@@ -349,10 +350,10 @@ msgstr "已追蹤的資料表"
 #: libraries/server_privileges.lib.php:2908
 #: libraries/server_privileges.lib.php:3145
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4346
-#: templates/structure/table_header.phtml:21
-#: templates/tbl_relation/foreign_key_row.phtml:176
-#: templates/tbl_relation/internal_relational_row.phtml:63
+#: libraries/server_privileges.lib.php:4372
+#: templates/database/structure/table_header.phtml:21
+#: templates/table/relation/foreign_key_row.phtml:176
+#: templates/table/relation/internal_relational_row.phtml:63
 msgid "Table"
 msgstr "資料表"
 
@@ -369,7 +370,7 @@ msgid "Updated"
 msgstr "更新"
 
 #: db_tracking.php:130 js/messages.php:243 libraries/Menu.class.php:552
-#: libraries/Util.class.php:4314 libraries/config.values.php:104
+#: libraries/Util.class.php:4320 libraries/config.values.php:104
 #: libraries/rte/rte_events.lib.php:393 libraries/rte/rte_list.lib.php:101
 #: libraries/server_status_processes.lib.php:92 libraries/tracking.lib.php:279
 msgid "Status"
@@ -378,14 +379,15 @@ msgstr "狀態"
 #: db_tracking.php:131 db_tracking.php:290 libraries/Index.class.php:693
 #: libraries/central_columns.lib.php:687 libraries/rte/rte_list.lib.php:74
 #: libraries/rte/rte_list.lib.php:89 libraries/rte/rte_list.lib.php:102
-#: libraries/server_databases.lib.php:398
+#: libraries/server_databases.lib.php:409
 #: libraries/server_privileges.lib.php:2372
 #: libraries/server_privileges.lib.php:3166
 #: libraries/server_privileges.lib.php:3342
 #: libraries/server_user_groups.lib.php:82
 #: libraries/server_variables.lib.php:189 libraries/tracking.lib.php:280
-#: libraries/tracking.lib.php:793 templates/structure/table_header.phtml:30
-#: templates/structure/table_structure_header.phtml:23
+#: libraries/tracking.lib.php:793
+#: templates/database/structure/table_header.phtml:30
+#: templates/table/structure/table_structure_header.phtml:23
 msgid "Action"
 msgstr "動作"
 
@@ -427,7 +429,7 @@ msgid "Untracked tables"
 msgstr "尚未追蹤的資料表"
 
 #: db_tracking.php:305 db_tracking.php:336
-#: templates/structure/optional_action_links.phtml:17
+#: templates/table/structure/optional_action_links.phtml:17
 msgid "Track table"
 msgstr "追蹤資料表"
 
@@ -477,7 +479,7 @@ msgid "Value for the column \"%s\""
 msgstr "\"%s\" 欄位的值"
 
 #: gis_data_editor.php:146
-#: templates/gis_visualization/gis_visualization.phtml:37
+#: templates/table/gis_visualization/gis_visualization.phtml:37
 msgid "Use OpenStreetMaps as Base Layer"
 msgstr "使用 OpenStreetMaps 做為基礎圖層"
 
@@ -557,35 +559,35 @@ msgstr "新增幾何形"
 #: libraries/display_change_password.lib.php:162
 #: libraries/display_export.lib.php:402 libraries/display_export.lib.php:408
 #: libraries/display_import.lib.php:392 libraries/index.lib.php:44
-#: libraries/insert_edit.lib.php:1546 libraries/insert_edit.lib.php:1583
+#: libraries/insert_edit.lib.php:1544 libraries/insert_edit.lib.php:1581
 #: libraries/normalization.lib.php:165 libraries/normalization.lib.php:821
 #: libraries/operations.lib.php:38 libraries/operations.lib.php:108
 #: libraries/operations.lib.php:263 libraries/operations.lib.php:306
 #: libraries/operations.lib.php:801 libraries/operations.lib.php:874
 #: libraries/operations.lib.php:923 libraries/operations.lib.php:1337
 #: libraries/operations.lib.php:1658
-#: libraries/plugins/auth/AuthenticationCookie.class.php:244
+#: libraries/plugins/auth/AuthenticationCookie.class.php:232
 #: libraries/replication_gui.lib.php:122 libraries/replication_gui.lib.php:161
 #: libraries/replication_gui.lib.php:324 libraries/replication_gui.lib.php:461
 #: libraries/replication_gui.lib.php:906 libraries/rte/rte_events.lib.php:509
-#: libraries/rte/rte_routines.lib.php:969
-#: libraries/rte/rte_routines.lib.php:1581
+#: libraries/rte/rte_routines.lib.php:1060
+#: libraries/rte/rte_routines.lib.php:1672
 #: libraries/rte/rte_triggers.lib.php:396 libraries/server_bin_log.lib.php:61
 #: libraries/server_privileges.lib.php:705
 #: libraries/server_privileges.lib.php:2106
 #: libraries/server_privileges.lib.php:2872
 #: libraries/server_privileges.lib.php:3553
-#: libraries/server_privileges.lib.php:4627
+#: libraries/server_privileges.lib.php:4653
 #: libraries/server_user_groups.lib.php:285
 #: libraries/sql_query_form.lib.php:369 libraries/sql_query_form.lib.php:429
 #: libraries/tracking.lib.php:533 libraries/tracking.lib.php:653
 #: prefs_manage.php:277 prefs_manage.php:355
 #: templates/columns_definitions/column_definitions_form.phtml:59
-#: templates/header_location.phtml:17 templates/index_form.phtml:238
+#: templates/database/create_table.phtml:21 templates/header_location.phtml:28
 #: templates/startAndNumberOfRowsPanel.phtml:14
-#: templates/structure/add_column.phtml:25
-#: templates/table/create_table.phtml:21
-#: templates/table/selection_form.phtml:75 view_create.php:275
+#: templates/table/index_form.phtml:238
+#: templates/table/search/selection_form.phtml:75
+#: templates/table/structure/add_column.phtml:25 view_create.php:275
 #: view_operations.php:106
 msgid "Go"
 msgstr "執行"
@@ -670,7 +672,7 @@ msgstr "沒有字元集轉換函式庫，無法轉換檔案字元集！"
 msgid "Could not load import plugins, please check your installation!"
 msgstr "無法載入匯入外掛程式，請檢查您的安裝！"
 
-#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1466
+#: import.php:676 libraries/sql.lib.php:736 libraries/sql.lib.php:1460
 #, php-format
 msgid "Bookmark %s has been created."
 msgstr "已建立書籤 %s。"
@@ -708,11 +710,11 @@ msgstr "無法讀取匯入的進度。"
 msgid "Back"
 msgstr "返回"
 
-#: index.php:148 libraries/Footer.class.php:70
+#: index.php:149 libraries/Footer.class.php:70
 msgid "phpMyAdmin Demo Server"
 msgstr "phpMyAdmin 展示伺服器"
 
-#: index.php:152
+#: index.php:153
 #, php-format
 msgid ""
 "You are using the demo server. You can do anything here, but please do not "
@@ -722,110 +724,110 @@ msgstr ""
 "您正在使用展示主機，您可以在此做任何事情，但請勿更改 root、debian-sys-maint "
 "及 pma 使用者。這兒有更多的資訊 %s。"
 
-#: index.php:162
+#: index.php:163
 msgid "General Settings"
 msgstr "一般設定"
 
-#: index.php:190 libraries/display_change_password.lib.php:50
+#: index.php:191 libraries/display_change_password.lib.php:50
 #: libraries/display_change_password.lib.php:53 user_password.php:247
 msgid "Change password"
 msgstr "修改密碼"
 
-#: index.php:206
+#: index.php:207
 msgid "Server connection collation"
 msgstr "伺服器連線編碼與排序"
 
-#: index.php:228
+#: index.php:229
 msgid "Appearance Settings"
 msgstr "外觀設定"
 
-#: index.php:258 prefs_manage.php:285
+#: index.php:259 prefs_manage.php:285
 msgid "More settings"
 msgstr "更多設定"
 
-#: index.php:279
+#: index.php:280
 msgid "Database server"
 msgstr "資料庫伺服器"
 
-#: index.php:282 libraries/plugins/auth/AuthenticationCookie.class.php:181
+#: index.php:283 libraries/plugins/auth/AuthenticationCookie.class.php:169
 msgid "Server:"
 msgstr "伺服器:"
 
-#: index.php:286
+#: index.php:287
 msgid "Server type:"
 msgstr "伺服器類別:"
 
-#: index.php:290 libraries/plugins/export/ExportLatex.class.php:212
+#: index.php:291 libraries/plugins/export/ExportLatex.class.php:212
 #: libraries/plugins/export/ExportSql.class.php:687
 #: libraries/plugins/export/ExportXml.class.php:189
 msgid "Server version:"
 msgstr "伺服器版本:"
 
-#: index.php:296
+#: index.php:297
 msgid "Protocol version:"
 msgstr "協定版本:"
 
-#: index.php:300
+#: index.php:301
 msgid "User:"
 msgstr "使用者:"
 
-#: index.php:305
+#: index.php:306
 msgid "Server charset:"
 msgstr "伺服器字元集:"
 
-#: index.php:320
+#: index.php:321
 msgid "Web server"
 msgstr "網頁伺服器"
 
-#: index.php:331
+#: index.php:332
 msgid "Database client version:"
 msgstr "資料庫用戶端版本:"
 
-#: index.php:335
+#: index.php:336
 msgid "PHP extension:"
 msgstr "PHP 擴充套件:"
 
-#: index.php:349
+#: index.php:350
 msgid "PHP version:"
 msgstr "PHP 版本："
 
-#: index.php:360
+#: index.php:361
 msgid "Show PHP information"
 msgstr "顯示 PHP 資訊"
 
-#: index.php:383
+#: index.php:384
 msgid "Version information:"
 msgstr "版本資訊:"
 
-#: index.php:392 libraries/Util.class.php:432 libraries/Util.class.php:495
-#: libraries/config/FormDisplay.tpl.php:151
+#: index.php:393 libraries/Util.class.php:432 libraries/Util.class.php:495
+#: libraries/config/FormDisplay.tpl.php:162
 #: libraries/display_export.lib.php:577 libraries/engines/pbxt.lib.php:162
 #: libraries/navigation/NavigationHeader.class.php:196
 #: libraries/server_variables.lib.php:160
 msgid "Documentation"
 msgstr "說明文件"
 
-#: index.php:399
+#: index.php:400
 msgid "Wiki"
 msgstr "維基百科"
 
-#: index.php:408
+#: index.php:409
 msgid "Official Homepage"
 msgstr "官方首頁"
 
-#: index.php:415
+#: index.php:416
 msgid "Contribute"
 msgstr "貢獻"
 
-#: index.php:422
+#: index.php:423
 msgid "Get support"
 msgstr "技術支援"
 
-#: index.php:429
+#: index.php:430
 msgid "List of changes"
 msgstr "版本沿革"
 
-#: index.php:451
+#: index.php:452
 msgid ""
 "You are connected as 'root' with no password, which corresponds to the "
 "default MySQL privileged account. Your MySQL server is running with this "
@@ -836,7 +838,7 @@ msgstr ""
 "預設 MySQL 管理帳號執行伺服器，可能會導致伺服器被入侵，強烈建議您設定管理者帳"
 "號 'root' 的密碼以避免此安全漏洞。"
 
-#: index.php:468
+#: index.php:469
 msgid ""
 "You have enabled mbstring.func_overload in your PHP configuration. This "
 "option is incompatible with phpMyAdmin and might cause some data to be "
@@ -845,7 +847,7 @@ msgstr ""
 "您已啟用了 PHP 設定中的 mbstring.func_overload。此選項與 phpMyAdmin 不相容，"
 "可能會導致一些資料損壞！"
 
-#: index.php:483
+#: index.php:484
 msgid ""
 "The mbstring PHP extension was not found and you seem to be using a "
 "multibyte charset. Without the mbstring extension phpMyAdmin is unable to "
@@ -855,7 +857,7 @@ msgstr ""
 "有 mbstring 擴充套件 phpMyAdmin 將無法正確分割字串，這可能造成意料之外的錯"
 "誤。"
 
-#: index.php:500
+#: index.php:501
 msgid ""
 "Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini."
 "session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower than "
@@ -867,7 +869,7 @@ msgstr ""
 "短於您在 phpMyAdmin 中設定的 Cookies 有效期間，因此您的登入連線有效期間可能比"
 "您在 phpMyAdmin 中設定的時間要更短。"
 
-#: index.php:519
+#: index.php:520
 msgid ""
 "Login cookie store is lower than cookie validity configured in phpMyAdmin, "
 "because of this, your login will expire sooner than configured in phpMyAdmin."
@@ -875,11 +877,11 @@ msgstr ""
 "phpMyAdmin 中所設定的登入 cookie 儲存時間小於 cookie 有效期間，因此您的登入連"
 "線有效期間將會比您在 phpMyAdmin 中設定的時間要更短。"
 
-#: index.php:535
+#: index.php:536
 msgid "The configuration file now needs a secret passphrase (blowfish_secret)."
 msgstr "設定檔案需要設定一組加密密碼 (blowfish_secret)。"
 
-#: index.php:548
+#: index.php:549
 msgid ""
 "Directory [code]config[/code], which is used by the setup script, still "
 "exists in your phpMyAdmin directory. It is strongly recommended to remove it "
@@ -890,7 +892,7 @@ msgstr ""
 "完成之後移除該資料夾，否則會有未經授權的人下載你的設定檔而對伺服器安全性造成"
 "威脅。"
 
-#: index.php:564
+#: index.php:565
 #, php-format
 msgid ""
 "The phpMyAdmin configuration storage is not completely configured, some "
@@ -898,12 +900,12 @@ msgid ""
 msgstr ""
 "尚未設定 phpMyAdmin 設定儲存空間，部份延伸功能將無法使用。 %s了解原因%s。 "
 
-#: index.php:571
+#: index.php:572
 msgid ""
 "Or alternately go to 'Operations' tab of any database to set it up there."
 msgstr "或者前往任一個資料庫的 '操作' 頁籤設定。"
 
-#: index.php:620
+#: index.php:621
 #, php-format
 msgid ""
 "Your PHP MySQL library version %s differs from your MySQL server version %s. "
@@ -912,7 +914,7 @@ msgstr ""
 "您的 PHP MySQL 函式庫版本 %s 與您的 MySQL 伺服器版本 %s 不同，這可能造成一些"
 "無法預期的問題。"
 
-#: index.php:648
+#: index.php:649
 #, php-format
 msgid ""
 "Server running with Suhosin. Please refer to %sdocumentation%s for possible "
@@ -1054,8 +1056,8 @@ msgstr "您確定您要更改所有欄位編碼與排序(Collation)並轉換資
 msgid "Save & Close"
 msgstr "儲存並關閉"
 
-#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:404
-#: libraries/insert_edit.lib.php:1550 prefs_manage.php:361
+#: js/messages.php:89 libraries/config/FormDisplay.tpl.php:415
+#: libraries/insert_edit.lib.php:1548 prefs_manage.php:361
 #: prefs_manage.php:372
 msgid "Reset"
 msgstr "重新設定"
@@ -1088,7 +1090,7 @@ msgstr "新增索引"
 msgid "Edit Index"
 msgstr "編輯索引"
 
-#: js/messages.php:99 templates/index_form.phtml:232
+#: js/messages.php:99 templates/table/index_form.phtml:232
 #, php-format
 msgid "Add %s column(s) to index"
 msgstr "增加 %s 個欄位至索引"
@@ -1109,13 +1111,14 @@ msgstr "組合使用："
 msgid "Please select column(s) for the index."
 msgstr "請選擇要建立索引的欄位。"
 
-#: js/messages.php:106 templates/structure/add_column.phtml:1
+#: js/messages.php:106 templates/table/structure/add_column.phtml:1
 msgid "You have to add at least one column."
 msgstr "至少要增加一個欄位。"
 
-#: js/messages.php:109 libraries/insert_edit.lib.php:1548
+#: js/messages.php:109 libraries/insert_edit.lib.php:1546
 #: templates/columns_definitions/column_definitions_form.phtml:162
-#: templates/index_form.phtml:237 templates/tbl_relation/common_form.phtml:106
+#: templates/table/index_form.phtml:237
+#: templates/table/relation/common_form.phtml:106
 msgid "Preview SQL"
 msgstr "預覽 SQL"
 
@@ -1132,7 +1135,7 @@ msgid "SQL query:"
 msgstr "SQL 查詢："
 
 #. l10n: Default label for the y-Axis of Charts
-#: js/messages.php:118 templates/tbl_chart.phtml:109
+#: js/messages.php:118 templates/table/chart/tbl_chart.phtml:109
 msgid "Y Values"
 msgstr "Y 軸值"
 
@@ -1291,7 +1294,7 @@ msgstr "已送出的位元組"
 msgid "Bytes received"
 msgstr "已接收的位元組"
 
-#: js/messages.php:169 libraries/server_status.lib.php:226
+#: js/messages.php:169 libraries/server_status.lib.php:235
 msgid "Connections"
 msgstr "連線"
 
@@ -1348,12 +1351,12 @@ msgstr "%d 個資料表"
 msgid "Questions"
 msgstr "查詢次數"
 
-#: js/messages.php:184 libraries/server_status.lib.php:134
+#: js/messages.php:184 libraries/server_status.lib.php:143
 msgid "Traffic"
 msgstr "流量"
 
 #: js/messages.php:185 libraries/Menu.class.php:586
-#: libraries/Util.class.php:4318 libraries/server_status_monitor.lib.php:257
+#: libraries/Util.class.php:4324 libraries/server_status_monitor.lib.php:257
 msgid "Settings"
 msgstr "設定"
 
@@ -1373,8 +1376,9 @@ msgstr "請至少增加一個變數到資料序列！"
 #: libraries/server_status_monitor.lib.php:236
 #: libraries/server_status_processes.lib.php:308
 #: templates/columns_definitions/transformation.phtml:4
-#: templates/designer/options_panel.phtml:178
-#: templates/table/options_zoom.phtml:12 templates/table/rows_zoom.phtml:26
+#: templates/database/designer/options_panel.phtml:178
+#: templates/table/search/options_zoom.phtml:12
+#: templates/table/search/rows_zoom.phtml:26
 msgid "None"
 msgstr "無"
 
@@ -1652,8 +1656,8 @@ msgstr "無法使用匯入的設定檔建立圖表，將重設為預設的設定
 
 #: js/messages.php:270 libraries/Menu.class.php:352
 #: libraries/Menu.class.php:455 libraries/Menu.class.php:582
-#: libraries/Util.class.php:4317 libraries/Util.class.php:4332
-#: libraries/Util.class.php:4349 libraries/config/messages.inc.php:258
+#: libraries/Util.class.php:4323 libraries/Util.class.php:4338
+#: libraries/Util.class.php:4355 libraries/config/messages.inc.php:258
 #: libraries/display_import.lib.php:105
 #: libraries/server_status_monitor.lib.php:318 prefs_manage.php:238
 #: setup/frames/menu.inc.php:26
@@ -1713,13 +1717,13 @@ msgid "Formatting SQL..."
 msgstr "格式化 SQL..."
 
 #: js/messages.php:293 libraries/server_variables.lib.php:157
-#: templates/designer/aggregate_query_panel.phtml:63
-#: templates/designer/delete_relation_panel.phtml:28
-#: templates/designer/having_query_panel.phtml:117
-#: templates/designer/new_relation_panel.phtml:88
-#: templates/designer/options_panel.phtml:253
-#: templates/designer/rename_to_panel.phtml:45
-#: templates/designer/where_query_panel.phtml:83
+#: templates/database/designer/aggregate_query_panel.phtml:63
+#: templates/database/designer/delete_relation_panel.phtml:28
+#: templates/database/designer/having_query_panel.phtml:117
+#: templates/database/designer/new_relation_panel.phtml:88
+#: templates/database/designer/options_panel.phtml:253
+#: templates/database/designer/rename_to_panel.phtml:45
+#: templates/database/designer/where_query_panel.phtml:83
 msgid "Cancel"
 msgstr "取消"
 
@@ -1727,7 +1731,7 @@ msgstr "取消"
 msgid "Page-related settings"
 msgstr "頁面相關設定"
 
-#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:402
+#: js/messages.php:297 libraries/config/FormDisplay.tpl.php:413
 msgid "Apply"
 msgstr "套用"
 
@@ -1762,8 +1766,8 @@ msgstr "錯誤代碼: %s"
 msgid "Error text: %s"
 msgstr "錯誤訊息: %s"
 
-#: js/messages.php:307 libraries/db_common.inc.php:68
-#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:450
+#: js/messages.php:307 libraries/db_common.inc.php:69
+#: libraries/db_table_exists.lib.php:30 libraries/server_databases.lib.php:461
 msgid "No databases selected."
 msgstr "尚未選擇任何資料庫。"
 
@@ -1775,12 +1779,13 @@ msgstr "刪除欄位"
 msgid "Adding Primary Key"
 msgstr "正在新增主鍵(Primary Key)"
 
-#: js/messages.php:310 templates/designer/aggregate_query_panel.phtml:59
-#: templates/designer/having_query_panel.phtml:113
-#: templates/designer/new_relation_panel.phtml:87
-#: templates/designer/options_panel.phtml:252
-#: templates/designer/rename_to_panel.phtml:41
-#: templates/designer/where_query_panel.phtml:82
+#: js/messages.php:310
+#: templates/database/designer/aggregate_query_panel.phtml:59
+#: templates/database/designer/having_query_panel.phtml:113
+#: templates/database/designer/new_relation_panel.phtml:87
+#: templates/database/designer/options_panel.phtml:252
+#: templates/database/designer/rename_to_panel.phtml:41
+#: templates/database/designer/where_query_panel.phtml:82
 msgid "OK"
 msgstr "確定"
 
@@ -1800,7 +1805,7 @@ msgstr "複製資料庫中"
 msgid "Changing Charset"
 msgstr "更改字元編碼"
 
-#: js/messages.php:320 libraries/Util.class.php:3217
+#: js/messages.php:320 libraries/Util.class.php:3223
 msgid "Enable foreign key checks"
 msgstr "開啟外鍵(Foreign Key)檢查"
 
@@ -1835,20 +1840,21 @@ msgstr "Stored Function 的定義中必須要有 RETURN 敘述句！"
 #: js/messages.php:334 libraries/DisplayResults.class.php:4834
 #: libraries/DisplayResults.class.php:5092 libraries/Menu.class.php:344
 #: libraries/Menu.class.php:446 libraries/Menu.class.php:578
-#: libraries/Util.class.php:3636 libraries/Util.class.php:3637
-#: libraries/Util.class.php:4316 libraries/Util.class.php:4331
-#: libraries/Util.class.php:4348 libraries/config/messages.inc.php:252
+#: libraries/Util.class.php:3642 libraries/Util.class.php:3643
+#: libraries/Util.class.php:4322 libraries/Util.class.php:4337
+#: libraries/Util.class.php:4354 libraries/config/messages.inc.php:252
 #: libraries/display_export.lib.php:173 libraries/rte/rte_list.lib.php:146
 #: libraries/server_privileges.lib.php:2211
 #: libraries/server_privileges.lib.php:2290
 #: libraries/server_privileges.lib.php:2632
 #: libraries/server_privileges.lib.php:3356
 #: libraries/server_status_monitor.lib.php:322 prefs_manage.php:303
-#: setup/frames/menu.inc.php:27 templates/structure/check_all_tables.phtml:11
+#: setup/frames/menu.inc.php:27
+#: templates/database/structure/check_all_tables.phtml:11
 msgid "Export"
 msgstr "匯出"
 
-#: js/messages.php:337 libraries/rte/rte_routines.lib.php:652
+#: js/messages.php:337 libraries/rte/rte_routines.lib.php:743
 msgid "ENUM/SET editor"
 msgstr "ENUM/SET 編輯器"
 
@@ -1887,7 +1893,7 @@ msgstr "顯示查詢框"
 #: libraries/Console.class.php:214 libraries/DisplayResults.class.php:3474
 #: libraries/DisplayResults.class.php:4818 libraries/Index.class.php:723
 #: libraries/Util.class.php:706 libraries/Util.class.php:1202
-#: libraries/Util.class.php:3634 libraries/Util.class.php:3635
+#: libraries/Util.class.php:3640 libraries/Util.class.php:3641
 #: libraries/central_columns.lib.php:851
 #: libraries/central_columns.lib.php:1193
 #: libraries/config/messages.inc.php:892
@@ -1905,7 +1911,7 @@ msgstr "編輯"
 #: libraries/server_user_groups.lib.php:129
 #: libraries/sql_query_form.lib.php:416 libraries/tracking.lib.php:477
 #: setup/frames/index.inc.php:183 setup/frames/index.inc.php:291
-#: templates/designer/delete_relation_panel.phtml:27
+#: templates/database/designer/delete_relation_panel.phtml:27
 msgid "Delete"
 msgstr "刪除"
 
@@ -2069,11 +2075,11 @@ msgid "No dependencies selected!"
 msgstr "尚未選擇任何相依！"
 
 #: js/messages.php:394 libraries/central_columns.lib.php:1214
-#: libraries/insert_edit.lib.php:1458 libraries/server_variables.lib.php:155
+#: libraries/insert_edit.lib.php:1456 libraries/server_variables.lib.php:155
 #: setup/frames/config.inc.php:42 setup/frames/index.inc.php:279
 #: templates/columns_definitions/column_definitions_form.phtml:165
-#: templates/gis_visualization/gis_visualization.phtml:48
-#: templates/tbl_relation/common_form.phtml:107
+#: templates/table/gis_visualization/gis_visualization.phtml:48
+#: templates/table/relation/common_form.phtml:107
 msgid "Save"
 msgstr "儲存"
 
@@ -2150,8 +2156,8 @@ msgid "Data point content"
 msgstr "資料點內容"
 
 #: js/messages.php:430 js/messages.php:562 js/messages.php:579
-#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2573
-#: templates/index_form.phtml:154 templates/index_form.phtml:194
+#: libraries/Error_Handler.class.php:344 libraries/insert_edit.lib.php:2571
+#: templates/table/index_form.phtml:154 templates/table/index_form.phtml:194
 msgid "Ignore"
 msgstr "略過"
 
@@ -2210,8 +2216,8 @@ msgstr "請選擇外鍵(Foreign Key)"
 msgid "Please select the primary key or a unique key!"
 msgstr "請選擇主鍵(Primary Key)或唯一鍵(Unique Key)！"
 
-#: js/messages.php:457 templates/designer/side_menu.phtml:91
-#: templates/designer/side_menu.phtml:94
+#: js/messages.php:457 templates/database/designer/side_menu.phtml:91
+#: templates/database/designer/side_menu.phtml:94
 msgid "Choose column to display"
 msgstr "請選擇要顯示的欄位"
 
@@ -2225,18 +2231,18 @@ msgstr "你尚未儲存修改的資料，請確認是否要捨棄這些資料？
 msgid "Page name"
 msgstr "頁面名稱"
 
-#: js/messages.php:463 templates/designer/side_menu.phtml:56
-#: templates/designer/side_menu.phtml:59
+#: js/messages.php:463 templates/database/designer/side_menu.phtml:56
+#: templates/database/designer/side_menu.phtml:59
 msgid "Save page"
 msgstr "儲存頁面"
 
-#: js/messages.php:464 templates/designer/side_menu.phtml:63
-#: templates/designer/side_menu.phtml:66
+#: js/messages.php:464 templates/database/designer/side_menu.phtml:63
+#: templates/database/designer/side_menu.phtml:66
 msgid "Save page as"
 msgstr "儲存頁面為"
 
-#: js/messages.php:465 templates/designer/side_menu.phtml:49
-#: templates/designer/side_menu.phtml:52
+#: js/messages.php:465 templates/database/designer/side_menu.phtml:49
+#: templates/database/designer/side_menu.phtml:52
 msgid "Open page"
 msgstr "開啟頁面"
 
@@ -2244,7 +2250,7 @@ msgstr "開啟頁面"
 msgid "Delete page"
 msgstr "刪除頁面"
 
-#: js/messages.php:467 templates/designer/side_menu.phtml:10
+#: js/messages.php:467 templates/database/designer/side_menu.phtml:10
 msgid "Untitled"
 msgstr "未命名"
 
@@ -2360,7 +2366,7 @@ msgstr "原始長度"
 msgid "cancel"
 msgstr "取消"
 
-#: js/messages.php:499 libraries/server_status.lib.php:271
+#: js/messages.php:499 libraries/server_status.lib.php:280
 msgid "Aborted"
 msgstr "中斷連線"
 
@@ -2917,7 +2923,7 @@ msgstr "請輸入有效的 HEX 輸入值"
 
 #: js/messages.php:793 libraries/Message.class.php:199
 #: libraries/Util.class.php:654 libraries/core.lib.php:245
-#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1172
+#: libraries/import.lib.php:183 libraries/insert_edit.lib.php:1170
 #: tbl_operations.php:229 view_operations.php:63
 msgid "Error"
 msgstr "錯誤"
@@ -2976,8 +2982,8 @@ msgstr "每秒"
 msgid "per minute"
 msgstr "每分鐘"
 
-#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:143
-#: libraries/server_status.lib.php:228
+#: libraries/Advisor.class.php:481 libraries/server_status.lib.php:152
+#: libraries/server_status.lib.php:237
 #: libraries/server_status_queries.lib.php:98
 msgid "per hour"
 msgstr "每小時"
@@ -2995,7 +3001,7 @@ msgstr "無法讀取已存在的設定檔 %s。"
 msgid "Wrong permissions on configuration file, should not be world writable!"
 msgstr "設定檔權限錯誤，檔案不應開啟所有寫入權！"
 
-#: libraries/Config.class.php:1799
+#: libraries/Config.class.php:1801
 msgid "Font size"
 msgstr "字體大小"
 
@@ -3023,10 +3029,10 @@ msgstr "重新查詢"
 #: libraries/server_privileges.lib.php:2890
 #: libraries/server_privileges.lib.php:3144
 #: libraries/server_privileges.lib.php:3156
-#: libraries/server_privileges.lib.php:4332
+#: libraries/server_privileges.lib.php:4358
 #: libraries/server_status_processes.lib.php:80
-#: templates/tbl_relation/foreign_key_row.phtml:165
-#: templates/tbl_relation/internal_relational_row.phtml:55
+#: templates/table/relation/foreign_key_row.phtml:165
+#: templates/table/relation/internal_relational_row.phtml:55
 msgid "Database"
 msgstr "資料庫"
 
@@ -3118,11 +3124,11 @@ msgstr "歷史記錄"
 #: libraries/plugins/import/ImportMediawiki.class.php:60
 #: libraries/plugins/import/ImportOds.class.php:59
 #: libraries/plugins/import/ImportShp.class.php:57
-#: libraries/plugins/import/ImportSql.class.php:148
+#: libraries/plugins/import/ImportSql.class.php:51
 #: libraries/plugins/import/ImportXml.class.php:58
-#: libraries/rte/rte_routines.lib.php:833 templates/index_form.phtml:49
-#: templates/structure/row_stats_table.phtml:20
-#: templates/table/options.phtml:2
+#: libraries/rte/rte_routines.lib.php:924 templates/table/index_form.phtml:49
+#: templates/table/search/options.phtml:2
+#: templates/table/structure/row_stats_table.phtml:20
 msgid "Options"
 msgstr "選項"
 
@@ -3155,7 +3161,8 @@ msgstr "遞減"
 msgid "Order:"
 msgstr "排序："
 
-#: libraries/Console.class.php:289 templates/table/replace_preview.phtml:17
+#: libraries/Console.class.php:289
+#: templates/table/search/replace_preview.phtml:17
 msgid "Count"
 msgstr "次數"
 
@@ -3252,9 +3259,9 @@ msgstr "切換為深色主題"
 #: libraries/operations.lib.php:794 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:191
-#: templates/structure/sortable_header.phtml:21
-#: templates/structure/sortable_header.phtml:38
-#: templates/table/options.phtml:68
+#: templates/database/structure/sortable_header.phtml:21
+#: templates/database/structure/sortable_header.phtml:38
+#: templates/table/search/options.phtml:68
 msgid "Ascending"
 msgstr "遞增"
 
@@ -3264,13 +3271,14 @@ msgstr "遞增"
 #: libraries/operations.lib.php:797 libraries/server_databases.lib.php:307
 #: libraries/server_databases.lib.php:335
 #: libraries/server_status_processes.lib.php:188
-#: templates/structure/sortable_header.phtml:26
-#: templates/structure/sortable_header.phtml:43
-#: templates/table/options.phtml:69
+#: templates/database/structure/sortable_header.phtml:26
+#: templates/database/structure/sortable_header.phtml:43
+#: templates/table/search/options.phtml:69
 msgid "Descending"
 msgstr "遞減"
 
-#: libraries/DBQbe.class.php:467 templates/table/search_and_replace.phtml:6
+#: libraries/DBQbe.class.php:467
+#: templates/table/search/search_and_replace.phtml:6
 msgid "Column:"
 msgstr "欄位："
 
@@ -3423,12 +3431,12 @@ msgid_plural "%1$s matches in <strong>%2$s</strong>"
 msgstr[0] "%1$s 筆資料符合 <strong>%2$s</strong>"
 
 #: libraries/DbSearch.class.php:354 libraries/Menu.class.php:311
-#: libraries/Util.class.php:3337 libraries/Util.class.php:3347
-#: libraries/Util.class.php:3623 libraries/Util.class.php:3624
-#: libraries/Util.class.php:4343 libraries/config.values.php:43
+#: libraries/Util.class.php:3343 libraries/Util.class.php:3353
+#: libraries/Util.class.php:3629 libraries/Util.class.php:3630
+#: libraries/Util.class.php:4349 libraries/config.values.php:43
 #: libraries/config.values.php:51 libraries/config.values.php:119
 #: libraries/navigation/Nodes/Node_Table.class.php:295
-#: templates/structure/check_all_table_column.phtml:5
+#: templates/table/structure/check_all_table_column.phtml:5
 msgid "Browse"
 msgstr "瀏覽"
 
@@ -3445,7 +3453,8 @@ msgstr "搜尋資料庫"
 msgid "Words or values to search for (wildcard: \"%\"):"
 msgstr "要搜尋的文字或欄位值 (萬用字元:  \"% \"):"
 
-#: libraries/DbSearch.class.php:401 templates/table/search_and_replace.phtml:1
+#: libraries/DbSearch.class.php:401
+#: templates/table/search/search_and_replace.phtml:1
 msgid "Find:"
 msgstr "搜尋:"
 
@@ -3489,29 +3498,29 @@ msgstr "搜尋資料列"
 msgid "Search this table"
 msgstr "搜尋此資料表"
 
-#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2532
-#: libraries/Util.class.php:2535
+#: libraries/DisplayResults.class.php:974 libraries/Util.class.php:2538
+#: libraries/Util.class.php:2541
 msgctxt "First page"
 msgid "Begin"
 msgstr "最前頁"
 
-#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2533
-#: libraries/Util.class.php:2536 libraries/server_bin_log.lib.php:170
+#: libraries/DisplayResults.class.php:977 libraries/Util.class.php:2539
+#: libraries/Util.class.php:2542 libraries/server_bin_log.lib.php:170
 #: libraries/server_bin_log.lib.php:172
 msgctxt "Previous page"
 msgid "Previous"
 msgstr "上一頁"
 
 # 這應該使用於選擇日期的小月曆
-#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2564
-#: libraries/Util.class.php:2574 libraries/server_bin_log.lib.php:204
+#: libraries/DisplayResults.class.php:1043 libraries/Util.class.php:2570
+#: libraries/Util.class.php:2580 libraries/server_bin_log.lib.php:204
 #: libraries/server_bin_log.lib.php:206
 msgctxt "Next page"
 msgid "Next"
 msgstr "下一頁"
 
-#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2565
-#: libraries/Util.class.php:2575
+#: libraries/DisplayResults.class.php:1073 libraries/Util.class.php:2571
+#: libraries/Util.class.php:2581
 msgctxt "Last page"
 msgid "End"
 msgstr "最末頁"
@@ -3586,15 +3595,15 @@ msgid "May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]."
 msgstr "可能為近似值，請參考 [doc@faq3-11]FAQ 3.11[/doc]。"
 
 #: libraries/DisplayResults.class.php:4332 libraries/Message.class.php:180
-#: libraries/controllers/TableRelationController.class.php:258
+#: libraries/controllers/TableRelationController.class.php:259
 #: libraries/controllers/TableSearchController.class.php:655
-#: libraries/rte/rte_routines.lib.php:1332 libraries/sql_query_form.lib.php:89
+#: libraries/rte/rte_routines.lib.php:1423 libraries/sql_query_form.lib.php:89
 #: tbl_operations.php:227 tbl_row_action.php:138 view_operations.php:62
 msgid "Your SQL query has been executed successfully."
 msgstr "您的 SQL 語法已順利執行。"
 
 #: libraries/DisplayResults.class.php:4660
-#: libraries/controllers/StructureController.class.php:629
+#: libraries/controllers/DatabaseStructureController.class.php:564
 #, php-format
 msgid ""
 "This view has at least this number of rows. Please refer to %sdocumentation"
@@ -3616,33 +3625,33 @@ msgstr "總計 %1$d 筆，目前查詢 %2$d 筆"
 msgid "%d total"
 msgstr "總計 %d 筆"
 
-#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1318
+#: libraries/DisplayResults.class.php:4705 libraries/sql.lib.php:1312
 #, php-format
 msgid "Query took %01.4f seconds."
 msgstr "查詢花費 %01.4f 秒。"
 
 #: libraries/DisplayResults.class.php:4807
-#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4767
-#: libraries/Util.class.php:4773 libraries/mult_submits.inc.php:50
-#: templates/structure/check_all_tables.phtml:2
-#: templates/structure/check_all_tables.phtml:9
+#: libraries/DisplayResults.class.php:4814 libraries/Util.class.php:4773
+#: libraries/Util.class.php:4779 libraries/mult_submits.inc.php:50
+#: templates/database/structure/check_all_tables.phtml:2
+#: templates/database/structure/check_all_tables.phtml:9
 msgid "With selected:"
 msgstr "已選擇項目:"
 
 #: libraries/DisplayResults.class.php:4811
-#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4769
-#: libraries/Util.class.php:4770 libraries/server_privileges.lib.php:1174
+#: libraries/DisplayResults.class.php:4813 libraries/Util.class.php:4775
+#: libraries/Util.class.php:4776 libraries/server_privileges.lib.php:1174
 #: libraries/server_privileges.lib.php:1175
 #: libraries/server_privileges.lib.php:1387
 #: libraries/server_user_groups.lib.php:231
-#: templates/structure/check_all_tables.phtml:3
-#: templates/structure/check_all_tables.phtml:4
+#: templates/database/structure/check_all_tables.phtml:3
+#: templates/database/structure/check_all_tables.phtml:4
 msgid "Check All"
 msgstr "全選"
 
 #: libraries/DisplayResults.class.php:4985 libraries/Header.class.php:383
-#: templates/structure/optional_action_links.phtml:1
-#: templates/structure/print_view_data_dictionary_link.phtml:3
+#: templates/database/structure/print_view_data_dictionary_link.phtml:3
+#: templates/table/structure/optional_action_links.phtml:1
 msgid "Print view"
 msgstr "預覽列印"
 
@@ -3650,7 +3659,8 @@ msgstr "預覽列印"
 msgid "Query results operations"
 msgstr "查詢結果選項"
 
-#: libraries/DisplayResults.class.php:5105 templates/tbl_chart.phtml:12
+#: libraries/DisplayResults.class.php:5105
+#: templates/table/chart/tbl_chart.phtml:12
 msgid "Display chart"
 msgstr "顯示圖表"
 
@@ -3741,7 +3751,7 @@ msgid "Click on the bar to scroll to top of page"
 msgstr "點選此列以回到頁面頂端"
 
 #: libraries/Header.class.php:749
-#: libraries/plugins/auth/AuthenticationCookie.class.php:152
+#: libraries/plugins/auth/AuthenticationCookie.class.php:140
 msgid "Javascript must be enabled past this point!"
 msgstr "必須啟用 Javascript 才能登入！"
 
@@ -3763,11 +3773,11 @@ msgid "Keyname"
 msgstr "鍵名"
 
 #: libraries/Index.class.php:697
-#: libraries/controllers/StructureController.class.php:1962
-#: libraries/controllers/StructureController.class.php:1967
+#: libraries/controllers/TableStructureController.class.php:953
+#: libraries/controllers/TableStructureController.class.php:958
 #: libraries/tracking.lib.php:973
 #: templates/columns_definitions/column_indexes.phtml:11
-#: templates/structure/check_all_table_column.phtml:26
+#: templates/table/structure/check_all_table_column.phtml:26
 msgid "Unique"
 msgstr "唯一"
 
@@ -3786,16 +3796,17 @@ msgstr "基數"
 #: libraries/server_collations.lib.php:35 libraries/tracking.lib.php:881
 #: libraries/tracking.lib.php:977
 #: templates/columns_definitions/table_fields_definitions.phtml:33
-#: templates/structure/row_stats_table.phtml:31
-#: templates/structure/table_header.phtml:55
-#: templates/structure/table_structure_header.phtml:7
-#: templates/table/table_header.phtml:8
+#: templates/database/structure/table_header.phtml:55
+#: templates/table/search/table_header.phtml:8
+#: templates/table/structure/row_stats_table.phtml:31
+#: templates/table/structure/table_structure_header.phtml:7
 msgid "Collation"
 msgstr "編碼與排序"
 
 #: libraries/Index.class.php:703 libraries/rte/rte_events.lib.php:496
-#: libraries/rte/rte_routines.lib.php:956 libraries/tracking.lib.php:885
-#: libraries/tracking.lib.php:979 templates/structure/table_header.phtml:84
+#: libraries/rte/rte_routines.lib.php:1047 libraries/tracking.lib.php:885
+#: libraries/tracking.lib.php:979
+#: templates/database/structure/table_header.phtml:84
 msgid "Comment"
 msgstr "說明"
 
@@ -3808,15 +3819,15 @@ msgstr "已刪除主鍵(Primary key)。"
 msgid "Index %s has been dropped."
 msgstr "已刪除索引 %s。"
 
-#: libraries/Index.class.php:757 libraries/Util.class.php:3630
-#: libraries/Util.class.php:3631
-#: libraries/controllers/StructureController.class.php:1958
-#: libraries/controllers/StructureController.class.php:1959
+#: libraries/Index.class.php:757 libraries/Util.class.php:3636
+#: libraries/Util.class.php:3637
+#: libraries/controllers/TableStructureController.class.php:949
+#: libraries/controllers/TableStructureController.class.php:950
 #: libraries/operations.lib.php:1607 libraries/rte/rte_list.lib.php:150
 #: libraries/server_databases.lib.php:146
-#: templates/structure/check_all_table_column.phtml:15
-#: templates/structure/check_all_tables.phtml:16
-#: templates/tbl_relation/foreign_key_row.phtml:93
+#: templates/database/structure/check_all_tables.phtml:16
+#: templates/table/relation/foreign_key_row.phtml:93
+#: templates/table/structure/check_all_table_column.phtml:15
 msgid "Drop"
 msgstr "刪除"
 
@@ -3845,16 +3856,16 @@ msgstr "伺服器"
 #: libraries/Menu.class.php:248
 #: libraries/navigation/Nodes/Node_View.class.php:32
 #: libraries/tbl_info.inc.php:63
-#: templates/structure/structure_table_row.phtml:97
-#: templates/structure/structure_table_row.phtml:159
+#: templates/database/structure/structure_table_row.phtml:97
+#: templates/database/structure/structure_table_row.phtml:159
 msgid "View"
 msgstr "檢視表"
 
 #: libraries/Menu.class.php:325 libraries/Menu.class.php:429
-#: libraries/Menu.class.php:548 libraries/Util.class.php:3334
-#: libraries/Util.class.php:3344 libraries/Util.class.php:3350
-#: libraries/Util.class.php:4313 libraries/Util.class.php:4328
-#: libraries/Util.class.php:4345 libraries/config.values.php:40
+#: libraries/Menu.class.php:548 libraries/Util.class.php:3340
+#: libraries/Util.class.php:3350 libraries/Util.class.php:3356
+#: libraries/Util.class.php:4319 libraries/Util.class.php:4334
+#: libraries/Util.class.php:4351 libraries/config.values.php:40
 #: libraries/config.values.php:48 libraries/config.values.php:110
 #: libraries/config.values.php:116 libraries/config/messages.inc.php:321
 #: libraries/navigation/Nodes/Node_Table.class.php:292
@@ -3862,19 +3873,19 @@ msgid "SQL"
 msgstr "SQL"
 
 #: libraries/Menu.class.php:328 libraries/Menu.class.php:432
-#: libraries/Util.class.php:3335 libraries/Util.class.php:3345
-#: libraries/Util.class.php:3351 libraries/Util.class.php:3625
-#: libraries/Util.class.php:3626 libraries/Util.class.php:4329
-#: libraries/Util.class.php:4346 libraries/config.values.php:41
+#: libraries/Util.class.php:3341 libraries/Util.class.php:3351
+#: libraries/Util.class.php:3357 libraries/Util.class.php:3631
+#: libraries/Util.class.php:3632 libraries/Util.class.php:4335
+#: libraries/Util.class.php:4352 libraries/config.values.php:41
 #: libraries/config.values.php:49 libraries/config.values.php:111
 #: libraries/config.values.php:117
 #: libraries/navigation/Nodes/Node_Table.class.php:286
 msgid "Search"
 msgstr "搜尋"
 
-#: libraries/Menu.class.php:338 libraries/Util.class.php:3336
-#: libraries/Util.class.php:3346 libraries/Util.class.php:3627
-#: libraries/Util.class.php:3628 libraries/Util.class.php:4347
+#: libraries/Menu.class.php:338 libraries/Util.class.php:3342
+#: libraries/Util.class.php:3352 libraries/Util.class.php:3633
+#: libraries/Util.class.php:3634 libraries/Util.class.php:4353
 #: libraries/config.values.php:42 libraries/config.values.php:50
 #: libraries/config.values.php:118
 #: libraries/navigation/Nodes/Node_Table.class.php:289
@@ -3883,30 +3894,30 @@ msgid "Insert"
 msgstr "新增"
 
 #: libraries/Menu.class.php:362 libraries/Menu.class.php:467
-#: libraries/Util.class.php:4334 libraries/Util.class.php:4350
+#: libraries/Util.class.php:4340 libraries/Util.class.php:4356
 #: libraries/config.values.php:106 libraries/server_common.lib.php:51
 #: libraries/server_privileges.lib.php:2370
 #: libraries/server_privileges.lib.php:3158
-#: libraries/server_privileges.lib.php:4221
+#: libraries/server_privileges.lib.php:4247
 msgid "Privileges"
 msgstr "權限"
 
 #: libraries/Menu.class.php:371 libraries/Menu.class.php:379
-#: libraries/Menu.class.php:459 libraries/Util.class.php:3338
-#: libraries/Util.class.php:3352 libraries/Util.class.php:4333
-#: libraries/Util.class.php:4351 libraries/config.values.php:112
+#: libraries/Menu.class.php:459 libraries/Util.class.php:3344
+#: libraries/Util.class.php:3358 libraries/Util.class.php:4339
+#: libraries/Util.class.php:4357 libraries/config.values.php:112
 #: view_operations.php:92
 msgid "Operations"
 msgstr "操作"
 
 #: libraries/Menu.class.php:384 libraries/Menu.class.php:492
-#: libraries/Util.class.php:4338 libraries/Util.class.php:4352
+#: libraries/Util.class.php:4344 libraries/Util.class.php:4358
 #: libraries/relation.lib.php:255
 msgid "Tracking"
 msgstr "追蹤"
 
 #: libraries/Menu.class.php:397 libraries/Menu.class.php:486
-#: libraries/Util.class.php:4337 libraries/Util.class.php:4353
+#: libraries/Util.class.php:4343 libraries/Util.class.php:4359
 #: libraries/navigation/Nodes/Node_Trigger_Container.class.php:24
 #: libraries/plugins/export/ExportHtmlword.class.php:557
 #: libraries/plugins/export/ExportOdt.class.php:685
@@ -3923,16 +3934,16 @@ msgstr "觸發器"
 msgid "Database seems to be empty!"
 msgstr "資料庫是空的！"
 
-#: libraries/Menu.class.php:439 libraries/Util.class.php:4330
+#: libraries/Menu.class.php:439 libraries/Util.class.php:4336
 msgid "Query"
 msgstr "查詢"
 
-#: libraries/Menu.class.php:472 libraries/Util.class.php:4335
+#: libraries/Menu.class.php:472 libraries/Util.class.php:4341
 #: libraries/rte/rte_words.lib.php:36
 msgid "Routines"
 msgstr "預存程序"
 
-#: libraries/Menu.class.php:479 libraries/Util.class.php:4336
+#: libraries/Menu.class.php:479 libraries/Util.class.php:4342
 #: libraries/navigation/Nodes/Node_Event_Container.class.php:26
 #: libraries/plugins/export/ExportSql.class.php:940
 #: libraries/plugins/export/ExportXml.class.php:107
@@ -3940,20 +3951,20 @@ msgstr "預存程序"
 msgid "Events"
 msgstr "事件"
 
-#: libraries/Menu.class.php:498 libraries/Util.class.php:4339
+#: libraries/Menu.class.php:498 libraries/Util.class.php:4345
 msgid "Designer"
 msgstr "設計器"
 
-#: libraries/Menu.class.php:507 libraries/Util.class.php:4340
-#: templates/structure/check_all_tables.phtml:35
+#: libraries/Menu.class.php:507 libraries/Util.class.php:4346
+#: templates/database/structure/check_all_tables.phtml:35
 msgid "Central columns"
 msgstr "中央欄位"
 
-#: libraries/Menu.class.php:544 libraries/Util.class.php:4312
+#: libraries/Menu.class.php:544 libraries/Util.class.php:4318
 #: libraries/config.values.php:103 libraries/config/messages.inc.php:266
 #: libraries/config/messages.inc.php:341
 #: libraries/navigation/NavigationTree.class.php:1239
-#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4332
+#: libraries/server_common.lib.php:48 libraries/server_privileges.lib.php:4358
 msgid "Databases"
 msgstr "資料庫"
 
@@ -3964,34 +3975,34 @@ msgid "User accounts"
 msgstr "使用者群組"
 
 #: libraries/Menu.class.php:595 libraries/ServerStatusData.class.php:121
-#: libraries/Util.class.php:4319 libraries/server_common.lib.php:36
+#: libraries/Util.class.php:4325 libraries/server_common.lib.php:36
 msgid "Binary log"
 msgstr "二進位記錄"
 
 #: libraries/Menu.class.php:601 libraries/ServerStatusData.class.php:126
-#: libraries/Util.class.php:4320 libraries/server_common.lib.php:42
-#: templates/structure/body_for_table_summary.phtml:10
-#: templates/structure/table_header.phtml:27
+#: libraries/Util.class.php:4326 libraries/server_common.lib.php:42
+#: templates/database/structure/body_for_table_summary.phtml:10
+#: templates/database/structure/table_header.phtml:27
 msgid "Replication"
 msgstr "備援"
 
 #: libraries/Menu.class.php:606 libraries/ServerStatusData.class.php:193
-#: libraries/Util.class.php:4321 libraries/config.values.php:105
+#: libraries/Util.class.php:4327 libraries/config.values.php:105
 #: libraries/server_engines.lib.php:108 libraries/server_engines.lib.php:112
 #: libraries/sql_query_form.lib.php:421
 msgid "Variables"
 msgstr "變數"
 
-#: libraries/Menu.class.php:610 libraries/Util.class.php:4322
+#: libraries/Menu.class.php:610 libraries/Util.class.php:4328
 msgid "Charsets"
 msgstr "字元編碼"
 
-#: libraries/Menu.class.php:615 libraries/Util.class.php:4323
+#: libraries/Menu.class.php:615 libraries/Util.class.php:4329
 #: libraries/server_common.lib.php:33 libraries/server_plugins.lib.php:27
 msgid "Plugins"
 msgstr "附加元件"
 
-#: libraries/Menu.class.php:626 libraries/Util.class.php:4324
+#: libraries/Menu.class.php:626 libraries/Util.class.php:4330
 msgid "Engines"
 msgstr "引擎"
 
@@ -4013,7 +4024,7 @@ msgid "%1$d row inserted."
 msgid_plural "%1$d rows inserted."
 msgstr[0] "新增了 %1$d 列。"
 
-#: libraries/PDF.class.php:70 libraries/Util.class.php:2521
+#: libraries/PDF.class.php:70 libraries/Util.class.php:2527
 #: libraries/browse_foreigners.lib.php:327
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:865
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:890
@@ -4034,7 +4045,7 @@ msgid "Could not save favorite table!"
 msgstr "無法儲存我的最愛的資料表!"
 
 #: libraries/RecentFavoriteTable.class.php:212
-#: templates/structure/favorite_anchor.phtml:12
+#: templates/database/structure/favorite_anchor.phtml:12
 msgid "Remove from Favorites"
 msgstr "自我的最愛中移除"
 
@@ -4197,7 +4208,7 @@ msgid ""
 msgstr "沒有該儲存引擎的詳細狀態資訊。"
 
 #: libraries/StorageEngine.class.php:373
-#: templates/structure/body_for_table_summary.phtml:50
+#: templates/database/structure/body_for_table_summary.phtml:50
 #, php-format
 msgid "%s is the default storage engine on this MySQL server."
 msgstr "此 MySQL 伺服器的預設儲存引擎是 %s。"
@@ -4650,10 +4661,10 @@ msgstr ""
 
 #: libraries/Util.class.php:726 libraries/rte/rte_events.lib.php:110
 #: libraries/rte/rte_events.lib.php:119 libraries/rte/rte_events.lib.php:150
-#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:153
-#: libraries/rte/rte_routines.lib.php:162
-#: libraries/rte/rte_routines.lib.php:235
-#: libraries/rte/rte_routines.lib.php:1366
+#: libraries/rte/rte_general.lib.php:36 libraries/rte/rte_routines.lib.php:223
+#: libraries/rte/rte_routines.lib.php:250
+#: libraries/rte/rte_routines.lib.php:372
+#: libraries/rte/rte_routines.lib.php:1457
 #: libraries/rte/rte_triggers.lib.php:86 libraries/rte/rte_triggers.lib.php:95
 #: libraries/rte/rte_triggers.lib.php:127
 msgid "MySQL said: "
@@ -4697,75 +4708,78 @@ msgstr "週日"
 msgid "%B %d, %Y at %I:%M %p"
 msgstr "%Y 年 %m 月 %d 日 %H:%M"
 
-#: libraries/Util.class.php:2019
+#: libraries/Util.class.php:2025
 #, php-format
 msgid "%s days, %s hours, %s minutes and %s seconds"
 msgstr "%s 天 %s 小時，%s 分 %s 秒"
 
-#: libraries/Util.class.php:2112
+#: libraries/Util.class.php:2118
 msgid "Missing parameter:"
 msgstr "未填寫必要的參數:"
 
-#: libraries/Util.class.php:2645
+#: libraries/Util.class.php:2651
 #, php-format
 msgid "Jump to database \"%s\"."
 msgstr "切換到資料庫「%s」。"
 
-#: libraries/Util.class.php:2670
+#: libraries/Util.class.php:2676
 #, php-format
 msgid "The %s functionality is affected by a known bug, see %s"
 msgstr "%s 功能受到一個已知的問題影響，詳情請參考 %s"
 
-#: libraries/Util.class.php:2881
+#: libraries/Util.class.php:2887
 msgid "Click to toggle"
 msgstr "點此切換"
 
-#: libraries/Util.class.php:3542 prefs_manage.php:248
+#: libraries/Util.class.php:3548 prefs_manage.php:248
 msgid "Browse your computer:"
 msgstr "由電腦上傳:"
 
-#: libraries/Util.class.php:3567
+#: libraries/Util.class.php:3573
 #, php-format
 msgid "Select from the web server upload directory <b>%s</b>:"
 msgstr "由網頁伺服器上傳目錄中選擇 <b>%s</b>:"
 
-#: libraries/Util.class.php:3596 libraries/insert_edit.lib.php:1173
+#: libraries/Util.class.php:3602 libraries/insert_edit.lib.php:1171
 msgid "The directory you set for upload work cannot be reached."
 msgstr "設定之上傳目錄錯誤，無法使用。"
 
-#: libraries/Util.class.php:3607
+#: libraries/Util.class.php:3613
 msgid "There are no files to upload!"
 msgstr "無可上傳的檔案！"
 
-#: libraries/Util.class.php:3632 libraries/Util.class.php:3633
-#: templates/structure/check_all_tables.phtml:15
+#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: templates/database/structure/check_all_tables.phtml:15
 msgid "Empty"
 msgstr "清空"
 
-#: libraries/Util.class.php:3638 libraries/Util.class.php:3639
+#: libraries/Util.class.php:3644 libraries/Util.class.php:3645
 msgid "Execute"
 msgstr "執行"
 
-#: libraries/Util.class.php:4152
+#: libraries/Util.class.php:4158
 msgid "Print"
 msgstr "列印"
 
-#: libraries/Util.class.php:4257 templates/structure/row_stats_table.phtml:80
-#: templates/structure/table_header.phtml:95
+#: libraries/Util.class.php:4263
+#: templates/database/structure/table_header.phtml:95
+#: templates/table/structure/row_stats_table.phtml:80
 msgid "Creation"
 msgstr "建立時間"
 
-#: libraries/Util.class.php:4263 templates/structure/row_stats_table.phtml:87
-#: templates/structure/table_header.phtml:106
+#: libraries/Util.class.php:4269
+#: templates/database/structure/table_header.phtml:106
+#: templates/table/structure/row_stats_table.phtml:87
 msgid "Last update"
 msgstr "最後更新"
 
-#: libraries/Util.class.php:4269 templates/structure/row_stats_table.phtml:94
-#: templates/structure/table_header.phtml:117
+#: libraries/Util.class.php:4275
+#: templates/database/structure/table_header.phtml:117
+#: templates/table/structure/row_stats_table.phtml:94
 msgid "Last check"
 msgstr "最後檢查"
 
-#: libraries/Util.class.php:4315
+#: libraries/Util.class.php:4321
 msgid "Users"
 msgstr "使用者"
 
@@ -4786,16 +4800,16 @@ msgid "Use this value"
 msgstr "使用此值"
 
 #: libraries/build_html_for_db.lib.php:33 libraries/import.lib.php:193
-#: templates/structure/actions_in_table_structure.phtml:113
-#: templates/structure/row_stats_table.phtml:42
-#: templates/structure/table_header.phtml:36
+#: templates/database/structure/table_header.phtml:36
+#: templates/table/structure/actions_in_table_structure.phtml:113
+#: templates/table/structure/row_stats_table.phtml:42
 msgid "Rows"
 msgstr "資料列數"
 
 #: libraries/build_html_for_db.lib.php:48 libraries/engines/innodb.lib.php:171
-#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:186
-#: libraries/server_status.lib.php:298
-#: templates/structure/display_table_stats.phtml:40
+#: libraries/server_databases.lib.php:173 libraries/server_status.lib.php:195
+#: libraries/server_status.lib.php:307
+#: templates/table/structure/display_table_stats.phtml:40
 msgid "Total"
 msgstr "總計"
 
@@ -4804,10 +4818,12 @@ msgid "Jump to database"
 msgstr "切換到資料庫"
 
 #: libraries/build_html_for_db.lib.php:146
+#: templates/database/structure/structure_table_row.phtml:15
 msgid "Not replicated"
 msgstr "尚未備援"
 
 #: libraries/build_html_for_db.lib.php:158
+#: templates/database/structure/structure_table_row.phtml:16
 msgid "Replicated"
 msgstr "已備援"
 
@@ -4860,17 +4876,17 @@ msgstr "否"
 #: libraries/plugins/export/ExportTexytext.class.php:425
 #: libraries/plugins/export/PMA_ExportPdf.class.php:307
 #: libraries/rte/rte_list.lib.php:73 libraries/rte/rte_list.lib.php:85
-#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:830
-#: libraries/rte/rte_routines.lib.php:1492 setup/frames/index.inc.php:162
+#: libraries/rte/rte_list.lib.php:100 libraries/rte/rte_routines.lib.php:921
+#: libraries/rte/rte_routines.lib.php:1583 setup/frames/index.inc.php:162
 #: templates/columns_definitions/table_fields_definitions.phtml:8
-#: templates/structure/table_structure_header.phtml:5
-#: templates/table/create_table.phtml:11
+#: templates/database/create_table.phtml:11
+#: templates/table/structure/table_structure_header.phtml:5
 msgid "Name"
 msgstr "名稱"
 
 #: libraries/central_columns.lib.php:699
 #: libraries/central_columns.lib.php:1381
-#: libraries/rte/rte_routines.lib.php:832
+#: libraries/rte/rte_routines.lib.php:923
 #: templates/columns_definitions/table_fields_definitions.phtml:14
 msgid "Length/Values"
 msgstr "長度/值"
@@ -4889,7 +4905,7 @@ msgid "Select a table"
 msgstr "選擇一個資料表"
 
 #: libraries/central_columns.lib.php:804
-#: templates/structure/add_column.phtml:4
+#: templates/table/structure/add_column.phtml:4
 msgid "Add column"
 msgstr "新增欄位"
 
@@ -4905,7 +4921,7 @@ msgstr "新增欄位"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1002
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1025
 #: templates/columns_definitions/table_fields_definitions.phtml:36
-#: templates/structure/table_structure_header.phtml:8
+#: templates/table/structure/table_structure_header.phtml:8
 msgid "Attributes"
 msgstr "屬性"
 
@@ -5016,7 +5032,7 @@ msgid "Double click"
 msgstr "雙擊"
 
 #: libraries/config.values.php:95 libraries/config.values.php:124
-#: libraries/config/FormDisplay.tpl.php:221 libraries/relation.lib.php:97
+#: libraries/config/FormDisplay.tpl.php:232 libraries/relation.lib.php:97
 #: libraries/relation.lib.php:105
 msgid "Disabled"
 msgstr "已關閉"
@@ -5186,21 +5202,21 @@ msgstr "因為缺少缺少函式 %s，壓縮匯出功能無法執行。"
 msgid "maximum %s"
 msgstr "最大 %s"
 
-#: libraries/config/FormDisplay.tpl.php:219
+#: libraries/config/FormDisplay.tpl.php:230
 msgid "This setting is disabled, it will not be applied to your configuration."
 msgstr "此設定已停用，不會套用到您的設定中。"
 
-#: libraries/config/FormDisplay.tpl.php:313
+#: libraries/config/FormDisplay.tpl.php:324
 #, php-format
 msgid "Set value: %s"
 msgstr "設定值: %s"
 
-#: libraries/config/FormDisplay.tpl.php:318
+#: libraries/config/FormDisplay.tpl.php:329
 #: libraries/config/messages.inc.php:610
 msgid "Restore default value"
 msgstr "還原預設值"
 
-#: libraries/config/FormDisplay.tpl.php:332
+#: libraries/config/FormDisplay.tpl.php:343
 msgid "Allow users to customize this value"
 msgstr "允許使用者自訂此值"
 
@@ -5649,7 +5665,7 @@ msgstr "檔案編碼"
 
 #: libraries/config/messages.inc.php:136 libraries/config/messages.inc.php:152
 #: libraries/sql_query_form.lib.php:247
-#: templates/structure/row_stats_table.phtml:7
+#: templates/table/structure/row_stats_table.phtml:7
 msgid "Format"
 msgstr "格式"
 
@@ -6153,7 +6169,7 @@ msgstr "請選擇要顯示在資料庫結構頁中的明細資料 (資料表清
 
 #: libraries/config/messages.inc.php:332
 #: libraries/plugins/export/ExportPdf.class.php:279
-#: templates/structure/secondary_tabs.phtml:8
+#: templates/table/secondary_tabs.phtml:8
 msgid "Table structure"
 msgstr "資料表結構"
 
@@ -7728,100 +7744,33 @@ msgstr "微軟 Word 2000"
 msgid "OpenDocument Text"
 msgstr "OpenOffice 檔案"
 
-#: libraries/controllers/StructureController.class.php:465
+#: libraries/controllers/DatabaseStructureController.class.php:405
 #: tbl_operations.php:382
 #, php-format
 msgid "Table %s has been emptied."
 msgstr "已清空資料表 %s。"
 
-#: libraries/controllers/StructureController.class.php:486
+#: libraries/controllers/DatabaseStructureController.class.php:426
 #: tbl_operations.php:400 view_operations.php:119
 #, php-format
 msgid "View %s has been dropped."
 msgstr "已刪除檢視表 %s。"
 
-#: libraries/controllers/StructureController.class.php:487
+#: libraries/controllers/DatabaseStructureController.class.php:427
 #: tbl_operations.php:401
 #, php-format
 msgid "Table %s has been dropped."
 msgstr "已刪除資料表 %s。"
 
-#: libraries/controllers/StructureController.class.php:797
-#, php-format
-msgid "The name '%s' is a MySQL reserved keyword."
-msgid_plural "The names '%s' are MySQL reserved keywords."
-msgstr[0] "名稱 '%s' 是 MySQL 保留字。"
-
-#: libraries/controllers/StructureController.class.php:875
-msgid "No column selected."
-msgstr "尚未選擇欄位。"
-
-#: libraries/controllers/StructureController.class.php:1049
+#: libraries/controllers/DatabaseStructureController.class.php:733
 msgid "Favorite List is full!"
 msgstr "我的最愛清單已滿!"
 
-#: libraries/controllers/StructureController.class.php:1272
-msgid "The columns have been moved successfully."
-msgstr "欄位已移動成功。"
-
-#: libraries/controllers/StructureController.class.php:1535
-#, php-format
-msgid ""
-"Table %1$s has been altered successfully. Privileges have been adjusted."
-msgstr "已成功修改資料表 %1$s 。已調整權限。"
-
-#: libraries/controllers/StructureController.class.php:1541
-#: libraries/controllers/TableIndexesController.class.php:161
-#: tbl_addfield.php:92
-#, php-format
-msgid "Table %1$s has been altered successfully."
-msgstr "已成功修改資料表 %1$s 。"
-
-#: libraries/controllers/StructureController.class.php:1588
-#: libraries/tracking.lib.php:1094
-msgid "Query error"
-msgstr "查詢錯誤"
-
-#: libraries/controllers/StructureController.class.php:1806
+#: libraries/controllers/DatabaseStructureController.class.php:947
 #: libraries/mysql_charsets.lib.php:366 libraries/mysql_charsets.lib.php:373
 msgid "unknown"
 msgstr "未知"
 
-#: libraries/controllers/StructureController.class.php:1957
-#: templates/structure/check_all_table_column.phtml:11
-msgid "Change"
-msgstr "修改"
-
-#: libraries/controllers/StructureController.class.php:1961
-#: libraries/controllers/StructureController.class.php:1966
-#: libraries/navigation/Nodes/Node_Index.class.php:30
-#: libraries/tracking.lib.php:926
-#: templates/columns_definitions/column_indexes.phtml:16
-#: templates/columns_definitions/table_fields_definitions.phtml:57
-#: templates/structure/check_all_table_column.phtml:30
-#: templates/structure/display_structure.phtml:79
-#: templates/structure/display_table_stats.phtml:19
-msgid "Index"
-msgstr "索引"
-
-#: libraries/controllers/StructureController.class.php:1963
-#: libraries/controllers/StructureController.class.php:1968
-#: templates/columns_definitions/column_indexes.phtml:27
-#: templates/structure/check_all_table_column.phtml:37
-msgid "Spatial"
-msgstr "空間"
-
-#: libraries/controllers/StructureController.class.php:1964
-#: libraries/controllers/StructureController.class.php:1969
-#: templates/columns_definitions/column_indexes.phtml:22
-#: templates/structure/check_all_table_column.phtml:47
-msgid "Fulltext"
-msgstr "全文搜尋"
-
-#: libraries/controllers/StructureController.class.php:1970
-msgid "Distinct values"
-msgstr "顯示相異值"
-
 #: libraries/controllers/TableChartController.class.php:82
 #: libraries/controllers/TableGisVisualizationController.class.php:101
 msgid "No SQL query was set to fetch data."
@@ -7835,11 +7784,18 @@ msgstr "目前資料表中沒有數值欄位可供繪製。"
 msgid "No data to display"
 msgstr "無資料可顯示"
 
-#: libraries/controllers/TableRelationController.class.php:217
+#: libraries/controllers/TableIndexesController.class.php:161
+#: libraries/controllers/TableStructureController.class.php:736
+#: tbl_addfield.php:92
+#, php-format
+msgid "Table %1$s has been altered successfully."
+msgstr "已成功修改資料表 %1$s 。"
+
+#: libraries/controllers/TableRelationController.class.php:218
 msgid "Display column was successfully updated."
 msgstr "顯示欄位已成功更新。"
 
-#: libraries/controllers/TableRelationController.class.php:283
+#: libraries/controllers/TableRelationController.class.php:288
 msgid "Internal relations were successfully updated."
 msgstr "內部關聯已成功更新。"
 
@@ -7852,10 +7808,70 @@ msgid "Zoom search"
 msgstr "縮放搜尋"
 
 #: libraries/controllers/TableSearchController.class.php:852
-#: templates/table/selection_form.phtml:59
+#: templates/table/search/selection_form.phtml:59
 msgid "Find and replace"
 msgstr "搜尋與取代"
 
+#: libraries/controllers/TableStructureController.class.php:163
+#, php-format
+msgid "The name '%s' is a MySQL reserved keyword."
+msgid_plural "The names '%s' are MySQL reserved keywords."
+msgstr[0] "名稱 '%s' 是 MySQL 保留字。"
+
+#: libraries/controllers/TableStructureController.class.php:241
+msgid "No column selected."
+msgstr "尚未選擇欄位。"
+
+#: libraries/controllers/TableStructureController.class.php:467
+msgid "The columns have been moved successfully."
+msgstr "欄位已移動成功。"
+
+#: libraries/controllers/TableStructureController.class.php:730
+#, php-format
+msgid ""
+"Table %1$s has been altered successfully. Privileges have been adjusted."
+msgstr "已成功修改資料表 %1$s 。已調整權限。"
+
+#: libraries/controllers/TableStructureController.class.php:783
+#: libraries/tracking.lib.php:1094
+msgid "Query error"
+msgstr "查詢錯誤"
+
+#: libraries/controllers/TableStructureController.class.php:948
+#: templates/table/structure/check_all_table_column.phtml:11
+msgid "Change"
+msgstr "修改"
+
+#: libraries/controllers/TableStructureController.class.php:952
+#: libraries/controllers/TableStructureController.class.php:957
+#: libraries/navigation/Nodes/Node_Index.class.php:30
+#: libraries/tracking.lib.php:926
+#: templates/columns_definitions/column_indexes.phtml:16
+#: templates/columns_definitions/table_fields_definitions.phtml:57
+#: templates/table/structure/check_all_table_column.phtml:30
+#: templates/table/structure/display_structure.phtml:79
+#: templates/table/structure/display_table_stats.phtml:19
+msgid "Index"
+msgstr "索引"
+
+#: libraries/controllers/TableStructureController.class.php:954
+#: libraries/controllers/TableStructureController.class.php:959
+#: templates/columns_definitions/column_indexes.phtml:27
+#: templates/table/structure/check_all_table_column.phtml:37
+msgid "Spatial"
+msgstr "空間"
+
+#: libraries/controllers/TableStructureController.class.php:955
+#: libraries/controllers/TableStructureController.class.php:960
+#: templates/columns_definitions/column_indexes.phtml:22
+#: templates/table/structure/check_all_table_column.phtml:47
+msgid "Fulltext"
+msgstr "全文搜尋"
+
+#: libraries/controllers/TableStructureController.class.php:963
+msgid "Distinct values"
+msgstr "顯示相異值"
+
 #: libraries/core.lib.php:306
 #, php-format
 msgid "The %s extension is missing. Please check your PHP configuration."
@@ -7902,7 +7918,7 @@ msgid "No Password"
 msgstr "無密碼"
 
 #: libraries/display_change_password.lib.php:68
-#: libraries/plugins/auth/AuthenticationCookie.class.php:199
+#: libraries/plugins/auth/AuthenticationCookie.class.php:187
 #: libraries/replication_gui.lib.php:422 libraries/replication_gui.lib.php:862
 #: libraries/server_privileges.lib.php:1640
 msgid "Password:"
@@ -8671,12 +8687,12 @@ msgid "Dump has been saved to file %s."
 msgstr "匯出資料已儲存至檔案 %s。"
 
 #: libraries/import.lib.php:202 libraries/insert_edit.lib.php:124
-#: libraries/rte/rte_routines.lib.php:1353 libraries/sql.lib.php:1312
+#: libraries/rte/rte_routines.lib.php:1444 libraries/sql.lib.php:1306
 #: tbl_get_field.php:44
 msgid "MySQL returned an empty result set (i.e. zero rows)."
 msgstr "MySQL 回傳空的查詢結果 (即零資料列)。"
 
-#: libraries/import.lib.php:265 libraries/sql.lib.php:1326
+#: libraries/import.lib.php:265 libraries/sql.lib.php:1320
 msgid "[ROLLBACK occurred.]"
 msgstr "[已發生 ROLLBACK。]"
 
@@ -8742,14 +8758,14 @@ msgstr "在第 %s 個欄位建立索引"
 
 #: libraries/insert_edit.lib.php:233
 #: libraries/navigation/Nodes/Node_DatabaseChild.class.php:48
-#: templates/designer/table_list.phtml:40
+#: templates/database/designer/table_list.phtml:40
 msgid "Hide"
 msgstr "隱藏"
 
 #: libraries/insert_edit.lib.php:249
 #: libraries/navigation/Nodes/Node_Function.class.php:32
-#: libraries/rte/rte_routines.lib.php:1495
-#: templates/table/table_header.phtml:4
+#: libraries/rte/rte_routines.lib.php:1586
+#: templates/table/search/table_header.phtml:4
 msgid "Function"
 msgstr "函數"
 
@@ -8762,82 +8778,83 @@ msgstr "二進位"
 msgid "Because of its length,<br /> this column might not be editable."
 msgstr "因長度問題，<br /> 該欄位可能無法編輯。"
 
-#: libraries/insert_edit.lib.php:1050
+#: libraries/insert_edit.lib.php:1048
 msgid "Binary - do not edit"
 msgstr "二進位 - 無法編輯"
 
-#: libraries/insert_edit.lib.php:1176 libraries/server_privileges.lib.php:470
-#: templates/table/options.phtml:36
+#: libraries/insert_edit.lib.php:1174 libraries/server_privileges.lib.php:470
+#: templates/table/search/options.phtml:36
 msgid "Or"
 msgstr "或"
 
-#: libraries/insert_edit.lib.php:1177
+#: libraries/insert_edit.lib.php:1175
 msgid "web server upload directory:"
 msgstr "網站伺服器上傳資料夾："
 
-#: libraries/insert_edit.lib.php:1348 templates/table/input_box.phtml:49
+#: libraries/insert_edit.lib.php:1346
+#: templates/table/search/input_box.phtml:49
 msgid "Edit/Insert"
 msgstr "修改/新增"
 
-#: libraries/insert_edit.lib.php:1398
+#: libraries/insert_edit.lib.php:1396
 #, php-format
 msgid "Continue insertion with %s rows"
 msgstr "繼續新增 %s 列"
 
-#: libraries/insert_edit.lib.php:1428
+#: libraries/insert_edit.lib.php:1426
 msgid "and then"
 msgstr "然後"
 
-#: libraries/insert_edit.lib.php:1461
+#: libraries/insert_edit.lib.php:1459
 msgid "Insert as new row"
 msgstr "以新資料列新增"
 
-#: libraries/insert_edit.lib.php:1464
+#: libraries/insert_edit.lib.php:1462
 msgid "Insert as new row and ignore errors"
 msgstr "以新資料列新增 (忽略錯誤)"
 
-#: libraries/insert_edit.lib.php:1467
+#: libraries/insert_edit.lib.php:1465
 msgid "Show insert query"
 msgstr "顯示新增指令"
 
-#: libraries/insert_edit.lib.php:1487
+#: libraries/insert_edit.lib.php:1485
 msgid "Go back to previous page"
 msgstr "返回上一頁"
 
-#: libraries/insert_edit.lib.php:1490
+#: libraries/insert_edit.lib.php:1488
 msgid "Insert another new row"
 msgstr "新增其他新資料列"
 
-#: libraries/insert_edit.lib.php:1495
+#: libraries/insert_edit.lib.php:1493
 msgid "Go back to this page"
 msgstr "返回到本頁"
 
-#: libraries/insert_edit.lib.php:1518
+#: libraries/insert_edit.lib.php:1516
 msgid "Edit next row"
 msgstr "編輯下一行"
 
-#: libraries/insert_edit.lib.php:1540
+#: libraries/insert_edit.lib.php:1538
 msgid ""
 "Use TAB key to move from value to value, or CTRL+arrows to move anywhere"
 msgstr "按 TAB 鍵跳到下一個數值，或 CTRL+方向鍵 作隨意移動"
 
-#: libraries/insert_edit.lib.php:1577 libraries/replication_gui.lib.php:542
-#: libraries/rte/rte_routines.lib.php:1497
+#: libraries/insert_edit.lib.php:1575 libraries/replication_gui.lib.php:542
+#: libraries/rte/rte_routines.lib.php:1588
 #: libraries/server_status_variables.lib.php:220
-#: templates/designer/having_query_panel.phtml:100
-#: templates/designer/options_panel.phtml:73
-#: templates/designer/options_panel.phtml:239
-#: templates/designer/where_query_panel.phtml:69
-#: templates/table/table_header.phtml:10
-#: templates/table/zoom_result_form.phtml:35
+#: templates/database/designer/having_query_panel.phtml:100
+#: templates/database/designer/options_panel.phtml:73
+#: templates/database/designer/options_panel.phtml:239
+#: templates/database/designer/where_query_panel.phtml:69
+#: templates/table/search/table_header.phtml:10
+#: templates/table/search/zoom_result_form.phtml:35
 msgid "Value"
 msgstr "值"
 
-#: libraries/insert_edit.lib.php:1937 libraries/sql.lib.php:1309
+#: libraries/insert_edit.lib.php:1935 libraries/sql.lib.php:1303
 msgid "Showing SQL query"
 msgstr "顯示 SQL 查詢"
 
-#: libraries/insert_edit.lib.php:1962 libraries/sql.lib.php:1287
+#: libraries/insert_edit.lib.php:1960 libraries/sql.lib.php:1281
 #, php-format
 msgid "Inserted row id: %1$d"
 msgstr "新增的資料列行 id: %1$d"
@@ -9243,7 +9260,7 @@ msgstr "新增"
 #: libraries/navigation/Nodes/Node_View_Container.class.php:26
 #: libraries/navigation/Nodes/Node_View_Container.class.php:27
 #: libraries/plugins/export/ExportXml.class.php:129
-#: templates/structure/show_create.phtml:30
+#: templates/database/structure/show_create.phtml:30
 msgid "Views"
 msgstr "檢視表"
 
@@ -9540,7 +9557,7 @@ msgstr "權限不足！"
 
 #: libraries/operations.lib.php:101 libraries/operations.lib.php:249
 #: libraries/operations.lib.php:869 libraries/operations.lib.php:963
-#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:907
+#: libraries/operations.lib.php:1317 libraries/rte/rte_routines.lib.php:998
 #: templates/columns_definitions/table_fields_definitions.phtml:47
 msgid "Adjust Privileges"
 msgstr "調整權限"
@@ -9630,22 +9647,22 @@ msgid "Switch to copied table"
 msgstr "切換到複製的資料表"
 
 #: libraries/operations.lib.php:1360
-#: templates/structure/check_all_tables.phtml:18
+#: templates/database/structure/check_all_tables.phtml:18
 msgid "Table maintenance"
 msgstr "資料表維護"
 
 #: libraries/operations.lib.php:1398
-#: templates/structure/check_all_tables.phtml:19
+#: templates/database/structure/check_all_tables.phtml:19
 msgid "Analyze table"
 msgstr "分析資料表"
 
 #: libraries/operations.lib.php:1413
-#: templates/structure/check_all_tables.phtml:20
+#: templates/database/structure/check_all_tables.phtml:20
 msgid "Check table"
 msgstr "檢查資料表"
 
 #: libraries/operations.lib.php:1428
-#: templates/structure/check_all_tables.phtml:22
+#: templates/database/structure/check_all_tables.phtml:22
 msgid "Checksum table"
 msgstr "Checksum 資料表"
 
@@ -9663,18 +9680,19 @@ msgid "Flush the table (FLUSH)"
 msgstr "更新資料表 (FLUSH)"
 
 #: libraries/operations.lib.php:1477
-#: templates/structure/check_all_tables.phtml:23
-#: templates/structure/display_table_stats.phtml:56
+#: templates/database/structure/check_all_tables.phtml:23
+#: templates/table/structure/display_table_stats.phtml:56
 msgid "Optimize table"
 msgstr "最佳化資料表"
 
 #: libraries/operations.lib.php:1492
-#: templates/structure/check_all_tables.phtml:24
+#: templates/database/structure/check_all_tables.phtml:24
 msgid "Repair table"
 msgstr "修復資料表"
 
 #: libraries/operations.lib.php:1538
-#: templates/structure/check_all_tables.phtml:14 view_operations.php:127
+#: templates/database/structure/check_all_tables.phtml:14
+#: view_operations.php:127
 msgid "Delete data or table"
 msgstr "刪除資料或資料表"
 
@@ -9797,7 +9815,7 @@ msgid "Cannot connect: invalid settings."
 msgstr "無法連線: 設定錯誤."
 
 #: libraries/plugins/auth/AuthenticationConfig.class.php:108
-#: libraries/plugins/auth/AuthenticationCookie.class.php:134
+#: libraries/plugins/auth/AuthenticationCookie.class.php:122
 #: libraries/plugins/auth/AuthenticationHttp.class.php:96
 #, php-format
 msgid "Welcome to %s"
@@ -9824,36 +9842,36 @@ msgstr ""
 msgid "Retry to connect"
 msgstr "重試連接"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:146
+#: libraries/plugins/auth/AuthenticationCookie.class.php:134
 msgid "Your session has expired. Please log in again."
 msgstr "您的連線已過期，請重新登入。"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:170
+#: libraries/plugins/auth/AuthenticationCookie.class.php:158
 msgid "Log in"
 msgstr "登入"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:178
-#: libraries/plugins/auth/AuthenticationCookie.class.php:188
+#: libraries/plugins/auth/AuthenticationCookie.class.php:166
+#: libraries/plugins/auth/AuthenticationCookie.class.php:176
 msgid "You can enter hostname/IP address and port separated by space."
 msgstr "您可以輸入以空格分隔的 主機名稱/IP位址 和 連結埠。"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:193
+#: libraries/plugins/auth/AuthenticationCookie.class.php:181
 msgid "Username:"
 msgstr "使用者名稱:"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:205
+#: libraries/plugins/auth/AuthenticationCookie.class.php:193
 msgid "Server Choice:"
 msgstr "選擇伺服器："
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:386
+#: libraries/plugins/auth/AuthenticationCookie.class.php:374
 msgid "Entered captcha is wrong, try again!"
 msgstr "輸入驗證碼錯誤，請再試一次！"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:396
+#: libraries/plugins/auth/AuthenticationCookie.class.php:384
 msgid "Please enter correct captcha!"
 msgstr "請輸入正確的驗證碼！"
 
-#: libraries/plugins/auth/AuthenticationCookie.class.php:423
+#: libraries/plugins/auth/AuthenticationCookie.class.php:411
 msgid "You are not allowed to log in to this MySQL server!"
 msgstr "您不被允許登入此 MySQL 伺服器！"
 
@@ -9949,7 +9967,7 @@ msgstr "事件"
 #: libraries/plugins/export/ExportOdt.class.php:593
 #: libraries/plugins/export/ExportTexytext.class.php:428
 #: libraries/plugins/export/PMA_ExportPdf.class.php:313
-#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:893
+#: libraries/rte/rte_events.lib.php:480 libraries/rte/rte_routines.lib.php:984
 #: libraries/rte/rte_triggers.lib.php:377
 msgid "Definition"
 msgstr "定義"
@@ -10262,7 +10280,7 @@ msgid "Last check:"
 msgstr "最後檢查:"
 
 #: libraries/plugins/export/ExportSql.class.php:1399
-#: templates/structure/structure_table_row.phtml:183
+#: templates/database/structure/structure_table_row.phtml:183
 msgid "in use"
 msgstr "使用中"
 
@@ -10449,18 +10467,14 @@ msgstr "MySQL Spatial 擴充套件不支援「%s」ESRI 類型。"
 msgid "The imported file does not contain any data!"
 msgstr "匯入的檔案中沒有任何資料！"
 
-#: libraries/plugins/import/ImportSql.class.php:169
+#: libraries/plugins/import/ImportSql.class.php:72
 msgid "SQL compatibility mode:"
 msgstr "SQL 相容模式:"
 
-#: libraries/plugins/import/ImportSql.class.php:181
+#: libraries/plugins/import/ImportSql.class.php:84
 msgid "Do not use <code>AUTO_INCREMENT</code> for zero values"
 msgstr "不要在零值使用自動遞增 (<code>AUTO_INCREMENT</code>)"
 
-#: libraries/plugins/import/ImportSql.class.php:195
-msgid "Read as multibytes"
-msgstr "以多位元讀取"
-
 #: libraries/plugins/import/ImportXml.class.php:54
 msgid "XML"
 msgstr "XML"
@@ -10503,7 +10517,7 @@ msgid "Show grid"
 msgstr "顯示網格"
 
 #: libraries/plugins/schema/SchemaPdf.class.php:94
-#: templates/structure/print_view_data_dictionary_link.phtml:6
+#: templates/database/structure/print_view_data_dictionary_link.phtml:6
 msgid "Data Dictionary"
 msgstr "資料字典"
 
@@ -10528,7 +10542,7 @@ msgid "The %s table doesn't exist!"
 msgstr "資料表 %s 不存在！"
 
 #: libraries/plugins/schema/eps/Eps_Relation_Schema.class.php:321
-#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:309
+#: libraries/plugins/schema/svg/Svg_Relation_Schema.class.php:323
 #, php-format
 msgid "Schema of the %s database - Page %s"
 msgstr "資料庫 %s 的大綱 - 第 %s 頁"
@@ -10554,7 +10568,7 @@ msgstr "目錄"
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1005
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1028
 #: libraries/tracking.lib.php:884
-#: templates/structure/table_structure_header.phtml:11
+#: templates/table/structure/table_structure_header.phtml:11
 msgid "Extra"
 msgstr "額外資訊"
 
@@ -10900,11 +10914,11 @@ msgstr "快速設定進階功能:"
 msgid "Create the needed tables with the <code>%screate_tables.sql</code>."
 msgstr "使用 <code>%screate_tables.sql</code> 建立需要的資料表。"
 
-#: libraries/relation.lib.php:360
+#: libraries/relation.lib.php:357
 msgid "Create a pma user and give access to these tables."
 msgstr "建立一個 pma 使用者並授權存取上一步操作中所建立的資料表的權限。"
 
-#: libraries/relation.lib.php:365
+#: libraries/relation.lib.php:360
 msgid ""
 "Enable advanced features in configuration file (<code>config.inc.php</"
 "code>), for example by starting from <code>config.sample.inc.php</code>."
@@ -10912,15 +10926,15 @@ msgstr ""
 "在設定檔 (<code>config.inc.php</code>) 中啓用進階功能，請參考 <code>config."
 "sample.inc.php</code> 中的範例。"
 
-#: libraries/relation.lib.php:373
+#: libraries/relation.lib.php:365
 msgid "Re-login to phpMyAdmin to load the updated configuration file."
 msgstr "請重新登入 phpMyAdmin 以載入新設定並使其生效。"
 
-#: libraries/relation.lib.php:1612
+#: libraries/relation.lib.php:1607
 msgid "no description"
 msgstr "無說明"
 
-#: libraries/relation.lib.php:1811
+#: libraries/relation.lib.php:1806
 msgid ""
 "You do not have necessary privileges to create a database named "
 "'phpmyadmin'. You may go to 'Operations' tab of any database to set up the "
@@ -10929,7 +10943,7 @@ msgstr ""
 "您沒有權限建立名稱為 'phpmyadmin' 的資料庫。您可能需至 '操作' 頁籤設定 "
 "phpMyAdmin 設定儲存空間。"
 
-#: libraries/relation.lib.php:1928
+#: libraries/relation.lib.php:1923
 #, php-format
 msgid ""
 "%sCreate%s a database named 'phpmyadmin' and setup the phpMyAdmin "
@@ -10938,19 +10952,19 @@ msgstr ""
 "%s建立%s名稱為 'phpmyadmin' 的資料庫並安裝 phpMyAdmin 設定儲存空間於該資料"
 "庫。"
 
-#: libraries/relation.lib.php:1936
+#: libraries/relation.lib.php:1931
 #, php-format
 msgid ""
 "%sCreate%s the phpMyAdmin configuration storage in the current database."
 msgstr "於目前資料庫%s建立%s phpMyAdmin 設定儲存空間。"
 
-#: libraries/relation.lib.php:1944
+#: libraries/relation.lib.php:1939
 #, php-format
 msgid "%sCreate%s missing phpMyAdmin configuration storage tables."
 msgstr "%s建立%s缺少的 phpMyAdmin 設定儲存空間資料表。"
 
 #: libraries/replication_gui.lib.php:46 libraries/replication_gui.lib.php:343
-#: libraries/server_databases.lib.php:387
+#: libraries/server_databases.lib.php:398
 msgid "Master replication"
 msgstr "主要(Master)備援伺服器"
 
@@ -11019,7 +11033,7 @@ msgstr ""
 "<b>已經</b>被設定爲主要伺服器。"
 
 #: libraries/replication_gui.lib.php:141
-#: libraries/server_databases.lib.php:389
+#: libraries/server_databases.lib.php:400
 msgid "Slave replication"
 msgstr "次要(Slave)備援伺服器"
 
@@ -11286,10 +11300,10 @@ msgid "Master server changed successfully to %s."
 msgstr "主要伺服器成功更改至 %s。"
 
 #: libraries/rte/rte_events.lib.php:106 libraries/rte/rte_events.lib.php:115
-#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:149
-#: libraries/rte/rte_routines.lib.php:158
-#: libraries/rte/rte_routines.lib.php:231
-#: libraries/rte/rte_routines.lib.php:1362
+#: libraries/rte/rte_events.lib.php:146 libraries/rte/rte_routines.lib.php:219
+#: libraries/rte/rte_routines.lib.php:246
+#: libraries/rte/rte_routines.lib.php:368
+#: libraries/rte/rte_routines.lib.php:1453
 #: libraries/rte/rte_triggers.lib.php:82 libraries/rte/rte_triggers.lib.php:91
 #: libraries/rte/rte_triggers.lib.php:123
 #, php-format
@@ -11310,7 +11324,7 @@ msgstr "事件 %1$s 已被修改。"
 msgid "Event %1$s has been created."
 msgstr "建立事件 %1$s 成功。"
 
-#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:251
+#: libraries/rte/rte_events.lib.php:167 libraries/rte/rte_routines.lib.php:266
 #: libraries/rte/rte_triggers.lib.php:144
 msgid "One or more errors have occurred while processing your request:"
 msgstr "在處理您的請求時發生一個或多個錯誤："
@@ -11319,7 +11333,7 @@ msgstr "在處理您的請求時發生一個或多個錯誤："
 msgid "Edit event"
 msgstr "編輯事件"
 
-#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:794
+#: libraries/rte/rte_events.lib.php:384 libraries/rte/rte_routines.lib.php:885
 #: libraries/rte/rte_triggers.lib.php:323 view_create.php:180
 msgid "Details"
 msgstr "詳細資訊"
@@ -11332,7 +11346,7 @@ msgstr "事件名稱"
 msgid "Event type"
 msgstr "事件類型"
 
-#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:817
+#: libraries/rte/rte_events.lib.php:430 libraries/rte/rte_routines.lib.php:908
 #, php-format
 msgid "Change to %s"
 msgstr "修改為 %s"
@@ -11359,12 +11373,14 @@ msgstr "結束"
 msgid "On completion preserve"
 msgstr "完成時保留"
 
-#: libraries/rte/rte_events.lib.php:491 libraries/rte/rte_routines.lib.php:930
+#: libraries/rte/rte_events.lib.php:491
+#: libraries/rte/rte_routines.lib.php:1021
 #: libraries/rte/rte_triggers.lib.php:383 view_create.php:209
 msgid "Definer"
 msgstr "定義"
 
-#: libraries/rte/rte_events.lib.php:535 libraries/rte/rte_routines.lib.php:997
+#: libraries/rte/rte_events.lib.php:535
+#: libraries/rte/rte_routines.lib.php:1088
 #: libraries/rte/rte_triggers.lib.php:422
 msgid "The definer must be in the \"username@hostname\" format!"
 msgstr "定義必須使用 \"username@hostname\" 格式！"
@@ -11390,9 +11406,9 @@ msgid "You must provide an event definition."
 msgstr "您必須為事件給予一個正確的定義。"
 
 #: libraries/rte/rte_export.lib.php:43 libraries/rte/rte_general.lib.php:72
-#: libraries/rte/rte_routines.lib.php:345
-#: libraries/rte/rte_routines.lib.php:1198
-#: libraries/rte/rte_routines.lib.php:1411
+#: libraries/rte/rte_routines.lib.php:153
+#: libraries/rte/rte_routines.lib.php:1289
+#: libraries/rte/rte_routines.lib.php:1502
 msgid "Error in processing request:"
 msgstr "處理要求時發生錯誤："
 
@@ -11427,132 +11443,132 @@ msgstr ""
 "[strong]在執行某些預存程序(Stored routine)的可能會導致失敗[/strong]，請使用 "
 "'mysqli' 擴充套件以避免發生錯誤。"
 
-#: libraries/rte/rte_routines.lib.php:110
-#: libraries/rte/rte_routines.lib.php:1006
+#: libraries/rte/rte_routines.lib.php:123
+msgid "Edit routine"
+msgstr "編輯預存程序"
+
+#: libraries/rte/rte_routines.lib.php:200
+#: libraries/rte/rte_routines.lib.php:1097
 #, php-format
 msgid "Invalid routine type: \"%s\""
 msgstr "無效的預存程序類型: \"%s\""
 
-#: libraries/rte/rte_routines.lib.php:170
-msgid "Sorry, we failed to restore the dropped routine."
-msgstr "很抱歉，還原的被刪除的預存程序失敗。"
-
-#: libraries/rte/rte_routines.lib.php:211
-#, php-format
-msgid "Routine %1$s has been modified. Privileges have been adjusted."
-msgstr "已修改預存程序 %1$s 。已調整權限。"
-
-#: libraries/rte/rte_routines.lib.php:216
-#, php-format
-msgid "Routine %1$s has been modified."
-msgstr "預存程序 %1$s 已被修改。"
-
-#: libraries/rte/rte_routines.lib.php:238
+#: libraries/rte/rte_routines.lib.php:253
 #, php-format
 msgid "Routine %1$s has been created."
 msgstr "預存程序 %1$s 已建立。"
 
-#: libraries/rte/rte_routines.lib.php:315
-msgid "Edit routine"
-msgstr "編輯預存程序"
+#: libraries/rte/rte_routines.lib.php:380
+msgid "Sorry, we failed to restore the dropped routine."
+msgstr "很抱歉，還原的被刪除的預存程序失敗。"
 
-#: libraries/rte/rte_routines.lib.php:797
+#: libraries/rte/rte_routines.lib.php:439
+#, php-format
+msgid "Routine %1$s has been modified. Privileges have been adjusted."
+msgstr "已修改預存程序 %1$s 。已調整權限。"
+
+#: libraries/rte/rte_routines.lib.php:444
+#, php-format
+msgid "Routine %1$s has been modified."
+msgstr "預存程序 %1$s 已被修改。"
+
+#: libraries/rte/rte_routines.lib.php:888
 msgid "Routine name"
 msgstr "預存程序名稱"
 
-#: libraries/rte/rte_routines.lib.php:823
+#: libraries/rte/rte_routines.lib.php:914
 msgid "Parameters"
 msgstr "參數"
 
-#: libraries/rte/rte_routines.lib.php:829
+#: libraries/rte/rte_routines.lib.php:920
 msgid "Direction"
 msgstr "I/O"
 
-#: libraries/rte/rte_routines.lib.php:847
+#: libraries/rte/rte_routines.lib.php:938
 msgid "Add parameter"
 msgstr "新增參數"
 
-#: libraries/rte/rte_routines.lib.php:851
+#: libraries/rte/rte_routines.lib.php:942
 msgid "Remove last parameter"
 msgstr "移除最後的參數"
 
-#: libraries/rte/rte_routines.lib.php:856
+#: libraries/rte/rte_routines.lib.php:947
 msgid "Return type"
 msgstr "返回類型"
 
-#: libraries/rte/rte_routines.lib.php:862
+#: libraries/rte/rte_routines.lib.php:953
 msgid "Return length/values"
 msgstr "返回長度/值"
 
-#: libraries/rte/rte_routines.lib.php:868
+#: libraries/rte/rte_routines.lib.php:959
 msgid "Return options"
 msgstr "返回選項"
 
-#: libraries/rte/rte_routines.lib.php:899
+#: libraries/rte/rte_routines.lib.php:990
 msgid "Is deterministic"
 msgstr "確定性"
 
-#: libraries/rte/rte_routines.lib.php:920
+#: libraries/rte/rte_routines.lib.php:1011
 msgid ""
 "You do not have sufficient privileges to perform this operation; Please "
 "refer to the documentation for more details"
 msgstr ""
 
-#: libraries/rte/rte_routines.lib.php:935
+#: libraries/rte/rte_routines.lib.php:1026
 msgid "Security type"
 msgstr "安全類型"
 
-#: libraries/rte/rte_routines.lib.php:944
+#: libraries/rte/rte_routines.lib.php:1035
 msgid "SQL data access"
 msgstr "SQL 資料存取"
 
-#: libraries/rte/rte_routines.lib.php:1013
+#: libraries/rte/rte_routines.lib.php:1104
 msgid "You must provide a routine name!"
 msgstr "您必須填寫預存程序名稱！"
 
-#: libraries/rte/rte_routines.lib.php:1047
+#: libraries/rte/rte_routines.lib.php:1138
 #, php-format
 msgid "Invalid direction \"%s\" given for parameter."
 msgstr "給予的參數方向 \"%s\" 無效。"
 
-#: libraries/rte/rte_routines.lib.php:1069
-#: libraries/rte/rte_routines.lib.php:1131
+#: libraries/rte/rte_routines.lib.php:1160
+#: libraries/rte/rte_routines.lib.php:1222
 msgid ""
 "You must provide length/values for routine parameters of type ENUM, SET, "
 "VARCHAR and VARBINARY."
 msgstr ""
 "您必須為預存程序提供長度/數值的參數型別為列舉、集合、VARCHAR 和 VARBINARY。"
 
-#: libraries/rte/rte_routines.lib.php:1095
+#: libraries/rte/rte_routines.lib.php:1186
 msgid "You must provide a name and a type for each routine parameter."
 msgstr "你必須提供每個預存程序的參數名稱和類型。"
 
-#: libraries/rte/rte_routines.lib.php:1114
+#: libraries/rte/rte_routines.lib.php:1205
 msgid "You must provide a valid return type for the routine."
 msgstr "您必須提供一個有效的返回類型的預存程序。"
 
-#: libraries/rte/rte_routines.lib.php:1174
+#: libraries/rte/rte_routines.lib.php:1265
 msgid "You must provide a routine definition."
 msgstr "您必須提供一個預存程序的定義。"
 
-#: libraries/rte/rte_routines.lib.php:1285
+#: libraries/rte/rte_routines.lib.php:1376
 #, php-format
 msgid "Execution results of routine %s"
 msgstr "執行預存程序 %s 的結果"
 
-#: libraries/rte/rte_routines.lib.php:1340
+#: libraries/rte/rte_routines.lib.php:1431
 #, php-format
 msgid "%d row affected by the last statement inside the procedure."
 msgid_plural "%d rows affected by the last statement inside the procedure."
 msgstr[0] "最後一筆查詢敘述句共影響 %d 筆資料列。"
 
-#: libraries/rte/rte_routines.lib.php:1398
-#: libraries/rte/rte_routines.lib.php:1406
+#: libraries/rte/rte_routines.lib.php:1489
+#: libraries/rte/rte_routines.lib.php:1497
 msgid "Execute routine"
 msgstr "執行預存程序"
 
-#: libraries/rte/rte_routines.lib.php:1485
-#: libraries/rte/rte_routines.lib.php:1488
+#: libraries/rte/rte_routines.lib.php:1576
+#: libraries/rte/rte_routines.lib.php:1579
 msgid "Routine parameters"
 msgstr "預存程序的參數"
 
@@ -11706,7 +11722,7 @@ msgid "Original position"
 msgstr "原始位置"
 
 #: libraries/server_bin_log.lib.php:133
-#: templates/structure/display_table_stats.phtml:4
+#: templates/table/structure/display_table_stats.phtml:4
 msgid "Information"
 msgstr "資訊"
 
@@ -11743,12 +11759,12 @@ msgid ""
 msgstr ""
 "注意: 在此開啟資料庫統計可能導致網頁伺服器和 MySQL 伺服器之間的流量驟增。"
 
-#: libraries/server_databases.lib.php:364
-#: libraries/server_databases.lib.php:365
+#: libraries/server_databases.lib.php:366
+#: libraries/server_databases.lib.php:371
 msgid "Enable Statistics"
 msgstr "開啟統計資訊"
 
-#: libraries/server_databases.lib.php:481
+#: libraries/server_databases.lib.php:492
 #, php-format
 msgid "%1$d database has been dropped successfully."
 msgid_plural "%1$d databases have been dropped successfully."
@@ -12113,7 +12129,7 @@ msgid "You have revoked the privileges for %s."
 msgstr "您已移除 %s 的權限。"
 
 #: libraries/server_privileges.lib.php:2059
-#: libraries/server_privileges.lib.php:4290
+#: libraries/server_privileges.lib.php:4316
 #, fuzzy
 #| msgid "Add user group"
 msgid "Add user account"
@@ -12286,59 +12302,59 @@ msgstr "正在刪除 %s"
 msgid "The privileges were reloaded successfully."
 msgstr "已成功重新載入權限。"
 
-#: libraries/server_privileges.lib.php:3994
+#: libraries/server_privileges.lib.php:4003
 #, php-format
 msgid "The user %s already exists!"
 msgstr "使用者 %s 己存在！"
 
-#: libraries/server_privileges.lib.php:4232
+#: libraries/server_privileges.lib.php:4258
 #, php-format
 msgid "Privileges for %s"
 msgstr "權限 %s"
 
-#: libraries/server_privileges.lib.php:4241
+#: libraries/server_privileges.lib.php:4267
 #: libraries/server_status_processes.lib.php:72
 #: libraries/server_user_groups.lib.php:39
 msgid "User"
 msgstr "使用者"
 
-#: libraries/server_privileges.lib.php:4282
+#: libraries/server_privileges.lib.php:4308
 msgctxt "Create new user"
 msgid "New"
 msgstr "新增"
 
-#: libraries/server_privileges.lib.php:4311
+#: libraries/server_privileges.lib.php:4337
 #, fuzzy
 #| msgid "Edit Privileges:"
 msgid "Edit privileges:"
 msgstr "編輯權限："
 
-#: libraries/server_privileges.lib.php:4312
+#: libraries/server_privileges.lib.php:4338
 #, fuzzy
 #| msgid "User group"
 msgid "User account"
 msgstr "使用者群組"
 
-#: libraries/server_privileges.lib.php:4371
+#: libraries/server_privileges.lib.php:4397
 msgid ""
 "Note: You are attempting to edit privileges of the user with which you are "
 "currently logged in."
 msgstr "注意：您正嘗試編輯您目前登入使用者的權限。"
 
-#: libraries/server_privileges.lib.php:4391 libraries/server_users.lib.php:25
+#: libraries/server_privileges.lib.php:4417 libraries/server_users.lib.php:25
 #, fuzzy
 #| msgid "Users overview"
 msgid "User accounts overview"
 msgstr "檢視使用者"
 
-#: libraries/server_privileges.lib.php:4459
+#: libraries/server_privileges.lib.php:4485
 msgid ""
 "A user account allowing any user from localhost to connect is present. This "
 "will prevent other users from connecting if the host part of their account "
 "allows a connection from any (%) host."
 msgstr ""
 
-#: libraries/server_privileges.lib.php:4500
+#: libraries/server_privileges.lib.php:4526
 #, php-format
 msgid ""
 "Note: phpMyAdmin gets the users' privileges directly from MySQL's privilege "
@@ -12350,7 +12366,7 @@ msgstr ""
 "限，則表中顯示的內容可能與伺服器實際使用的使用者權限有異。在這種情況下，您應"
 "在繼續前 %s重新載入權限%s。"
 
-#: libraries/server_privileges.lib.php:4519
+#: libraries/server_privileges.lib.php:4545
 #, fuzzy
 #| msgid ""
 #| "Note: phpMyAdmin gets the users' privileges directly from MySQL's "
@@ -12368,25 +12384,25 @@ msgstr ""
 "限，則表中顯示的內容可能與伺服器實際使用的使用者權限有異。在這種情況下，您應"
 "在繼續前 %s重新載入權限%s。"
 
-#: libraries/server_privileges.lib.php:4569
+#: libraries/server_privileges.lib.php:4595
 msgid "The selected user was not found in the privilege table."
 msgstr "在權限表內找不到選中的使用者。"
 
-#: libraries/server_privileges.lib.php:4801
+#: libraries/server_privileges.lib.php:4827
 msgid "You have added a new user."
 msgstr "您已新增了一個新使用者。"
 
-#: libraries/server_status.lib.php:53
+#: libraries/server_status.lib.php:60
 #, php-format
 msgid "Network traffic since startup: %s"
 msgstr "自啟動後的累計網路流量: %s"
 
-#: libraries/server_status.lib.php:66
+#: libraries/server_status.lib.php:73
 #, php-format
 msgid "This MySQL server has been running for %1$s. It started up on %2$s."
 msgstr "自 %2$s 開始，此 MySQL 伺服器已經執行了 %1$s。"
 
-#: libraries/server_status.lib.php:80
+#: libraries/server_status.lib.php:94
 msgid ""
 "This MySQL server works as <b>master</b> and <b>slave</b> in <b>replication</"
 "b> process."
@@ -12394,20 +12410,20 @@ msgstr ""
 "此 MySQL 伺服器在<b>備援</b>程序中同時扮演<b>主要(Master)伺服器</b>和<b>次要"
 "(Slave)伺服器</b>的身份。"
 
-#: libraries/server_status.lib.php:85
+#: libraries/server_status.lib.php:99
 msgid "This MySQL server works as <b>master</b> in <b>replication</b> process."
 msgstr ""
 "此 MySQL 伺服器在<b>備援</b>程序中扮演<b>主要(Master)伺服器</b>的身份。"
 
-#: libraries/server_status.lib.php:90
+#: libraries/server_status.lib.php:104
 msgid "This MySQL server works as <b>slave</b> in <b>replication</b> process."
 msgstr "此 MySQL 伺服器在<b>備援</b>程序中扮演<b>次要(Slave)伺服器</b>的身份。"
 
-#: libraries/server_status.lib.php:106
+#: libraries/server_status.lib.php:116
 msgid "Replication status"
 msgstr "備援狀態"
 
-#: libraries/server_status.lib.php:137
+#: libraries/server_status.lib.php:146
 msgid ""
 "On a busy server, the byte counters may overrun, so those statistics as "
 "reported by the MySQL server may be incorrect."
@@ -12415,19 +12431,19 @@ msgstr ""
 "在高負載的伺服器上，字元計數器可能會溢出，因此由 MySQL 返回的統計值可能會不正"
 "確。"
 
-#: libraries/server_status.lib.php:148
+#: libraries/server_status.lib.php:157
 msgid "Received"
 msgstr "已接收"
 
-#: libraries/server_status.lib.php:167
+#: libraries/server_status.lib.php:176
 msgid "Sent"
 msgstr "已發送"
 
-#: libraries/server_status.lib.php:234
+#: libraries/server_status.lib.php:243
 msgid "Max. concurrent connections"
 msgstr "最大同時連線數"
 
-#: libraries/server_status.lib.php:244
+#: libraries/server_status.lib.php:253
 msgid "Failed attempts"
 msgstr "嘗試失敗"
 
@@ -13421,7 +13437,7 @@ msgstr ""
 msgid "Not implemented yet."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/AlterOperation.php:193
+#: libraries/sql-parser/src/Components/AlterOperation.php:191
 #, fuzzy
 #| msgid "Iconic table operations"
 msgid "Unrecognized alter operation."
@@ -13437,7 +13453,7 @@ msgid "An opening bracket followed by a set of values was expected."
 msgstr ""
 
 #: libraries/sql-parser/src/Components/ArrayObj.php:101
-#: libraries/sql-parser/src/Components/FieldDefinition.php:202
+#: libraries/sql-parser/src/Components/CreateDefinition.php:202
 msgid "An opening bracket was expected."
 msgstr ""
 
@@ -13445,25 +13461,35 @@ msgstr ""
 msgid "A comma or a closing bracket was expected"
 msgstr ""
 
+#: libraries/sql-parser/src/Components/CreateDefinition.php:246
+#, fuzzy
+#| msgid "No tables selected."
+msgid "A comma or a closing bracket was expected."
+msgstr "尚未選擇任何資料表。"
+
+#: libraries/sql-parser/src/Components/CreateDefinition.php:262
+msgid "A closing bracket was expected."
+msgstr ""
+
 #: libraries/sql-parser/src/Components/DataType.php:125
 msgid "Unrecognized data type."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:225
+#: libraries/sql-parser/src/Components/Expression.php:227
 msgid "Unexpected closing bracket."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:246
-#: libraries/sql-parser/src/Components/Expression.php:283
-#: libraries/sql-parser/src/Components/Expression.php:303
+#: libraries/sql-parser/src/Components/Expression.php:248
+#: libraries/sql-parser/src/Components/Expression.php:285
+#: libraries/sql-parser/src/Components/Expression.php:305
 msgid "An alias was previously found."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:257
+#: libraries/sql-parser/src/Components/Expression.php:259
 msgid "Unexpected dot."
 msgstr ""
 
-#: libraries/sql-parser/src/Components/Expression.php:327
+#: libraries/sql-parser/src/Components/Expression.php:329
 #, fuzzy
 #| msgid "No tables selected."
 msgid "An alias was expected."
@@ -13475,16 +13501,6 @@ msgstr "尚未選擇任何資料表。"
 msgid "An expression was expected."
 msgstr "尚未選擇任何版本。"
 
-#: libraries/sql-parser/src/Components/FieldDefinition.php:246
-#, fuzzy
-#| msgid "No tables selected."
-msgid "A comma or a closing bracket was expected."
-msgstr "尚未選擇任何資料表。"
-
-#: libraries/sql-parser/src/Components/FieldDefinition.php:262
-msgid "A closing bracket was expected."
-msgstr ""
-
 #: libraries/sql-parser/src/Components/Limit.php:90
 #: libraries/sql-parser/src/Components/Limit.php:112
 msgid "An offset was expected."
@@ -13532,29 +13548,29 @@ msgstr ""
 msgid "Expected delimiter."
 msgstr ""
 
-#: libraries/sql-parser/src/Lexer.php:753
+#: libraries/sql-parser/src/Lexer.php:777
 #, fuzzy, php-format
 #| msgid "Event %1$s has been created."
 msgid "Ending quote %1$s was expected."
 msgstr "建立事件 %1$s 成功。"
 
-#: libraries/sql-parser/src/Lexer.php:789
+#: libraries/sql-parser/src/Lexer.php:813
 #, fuzzy
 #| msgid "Table name template"
 msgid "Variable name was expected."
 msgstr "資料表名稱樣板"
 
-#: libraries/sql-parser/src/Parser.php:380
+#: libraries/sql-parser/src/Parser.php:391
 #, fuzzy
 #| msgid "at beginning of table"
 msgid "Unexpected beginning of statement."
 msgstr "於資料表開始"
 
-#: libraries/sql-parser/src/Parser.php:399
+#: libraries/sql-parser/src/Parser.php:410
 msgid "Unrecognized statement type."
 msgstr ""
 
-#: libraries/sql-parser/src/Parser.php:479
+#: libraries/sql-parser/src/Parser.php:489
 msgid "No transaction was previously started."
 msgstr ""
 
@@ -13584,8 +13600,10 @@ msgid "The name of the entity was expected."
 msgstr "已開啟的資料表個數。"
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:310
-msgid "At least one field definition was expected."
-msgstr ""
+#, fuzzy
+#| msgid "The row has been deleted."
+msgid "At least one column definition was expected."
+msgstr "已刪除該行。"
 
 #: libraries/sql-parser/src/Statements/CreateStatement.php:329
 msgid "A \"RETURNS\" keyword was expected."
@@ -13644,11 +13662,11 @@ msgstr "書籤尚未建立！"
 msgid "Using bookmark \"%s\" as default browse query."
 msgstr "使用書籤 \"%s\" 作爲預設的查詢。"
 
-#: libraries/sql.lib.php:1306
+#: libraries/sql.lib.php:1300
 msgid "Showing as PHP code"
 msgstr "顯示的內容爲 PHP 程式碼"
 
-#: libraries/sql.lib.php:1638
+#: libraries/sql.lib.php:1632
 #, php-format
 msgid ""
 "Current selection does not contain a unique column. Grid edit, checkbox, "
@@ -13657,7 +13675,7 @@ msgstr ""
 "目前選擇的項目不含唯一(Unique)的資料欄位，將無法執行表格的編輯/核選、編輯、複"
 "製、刪除等相關的功能。%s"
 
-#: libraries/sql.lib.php:1649
+#: libraries/sql.lib.php:1643
 #, php-format
 msgid ""
 "Current selection does not contain a unique column. Grid edit, Edit, Copy "
@@ -13666,7 +13684,7 @@ msgstr ""
 "目前選擇的項目不含唯一(Unique)的資料欄位，表格的編輯/核選、複製、刪除等相關的"
 "功能可能產生不如預期的結果。%s"
 
-#: libraries/sql.lib.php:1688
+#: libraries/sql.lib.php:1682
 #, php-format
 msgid "Problems with indexes of table `%s`"
 msgstr "資料表 `%s` 的索引存在問題"
@@ -13823,7 +13841,7 @@ msgid "Version %s snapshot (SQL code)"
 msgstr "版本 %s 的結構快照 (SQL 程式碼)"
 
 #: libraries/tracking.lib.php:947
-#: templates/structure/table_structure_row.phtml:33
+#: templates/table/structure/table_structure_row.phtml:33
 msgctxt "None for default"
 msgid "None"
 msgstr "無"
@@ -13876,15 +13894,15 @@ msgstr "共 %2$s 中的 %1$s 的版本已刪除。"
 msgid "Version %1$s was created, tracking for %2$s is active."
 msgstr "已建立版本 %1$s，%2$s 的追蹤已啓用。"
 
-#: libraries/user_preferences.inc.php:29
+#: libraries/user_preferences.inc.php:30
 msgid "Manage your settings"
 msgstr "管理您的設定"
 
-#: libraries/user_preferences.inc.php:46 prefs_manage.php:307
+#: libraries/user_preferences.inc.php:54 prefs_manage.php:307
 msgid "Configuration has been saved."
 msgstr "已儲存設定值。"
 
-#: libraries/user_preferences.inc.php:66
+#: libraries/user_preferences.inc.php:74
 #, php-format
 msgid ""
 "Your preferences will be saved for current session only. Storing them "
@@ -14271,7 +14289,7 @@ msgid "first"
 msgstr "第一個"
 
 #: templates/columns_definitions/move_column.phtml:12
-#: templates/structure/add_column.phtml:21
+#: templates/table/structure/add_column.phtml:21
 #, php-format
 msgid "after %s"
 msgstr "於 %s 之後"
@@ -14335,197 +14353,291 @@ msgstr "輸入轉換"
 msgid "Input transformation options"
 msgstr "輸入轉換選項"
 
-#: templates/designer/aggregate_query_panel.phtml:22
-#: templates/designer/options_panel.phtml:100
-msgid "Aggregate"
-msgstr "聚合"
-
-#: templates/designer/aggregate_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:30
-#: templates/designer/having_query_panel.phtml:61
-#: templates/designer/options_panel.phtml:106
-#: templates/designer/options_panel.phtml:170
-#: templates/designer/where_query_panel.phtml:30
-#: templates/table/table_header.phtml:9
-msgid "Operator"
-msgstr "運算子"
-
-#: templates/designer/database_tables.phtml:29
-msgid "Toggle"
-msgstr "切換"
-
-#: templates/designer/database_tables.phtml:40
-msgid "See table structure"
-msgstr "檢視資料表結構"
-
-#: templates/designer/delete_relation_panel.phtml:21
-msgid "Delete relation"
-msgstr "刪除關聯"
-
-#: templates/designer/edit_delete_pages.phtml:7
-msgid "Page to open"
-msgstr "要開啟的頁面"
-
-#: templates/designer/edit_delete_pages.phtml:7
-msgid "Page to delete"
-msgstr "要刪除的頁面"
-
-#: templates/designer/having_query_panel.phtml:90
-#: templates/designer/options_panel.phtml:63
-#: templates/designer/options_panel.phtml:229
-#: templates/designer/where_query_panel.phtml:59
-msgid "Except"
-msgstr "例外"
-
-#: templates/designer/having_query_panel.phtml:102
-#: templates/designer/options_panel.phtml:75
-#: templates/designer/options_panel.phtml:241
-#: templates/designer/where_query_panel.phtml:71
-msgid "subquery"
-msgstr "子查詢"
-
-#: templates/designer/new_relation_panel.phtml:22
-#: templates/designer/side_menu.phtml:84 templates/designer/side_menu.phtml:87
-msgid "Create relation"
-msgstr "建立關聯"
-
-#: templates/designer/options_panel.phtml:34
-#: templates/designer/options_panel.phtml:200
-msgid "Relation operator"
-msgstr "關聯運算子"
-
-#: templates/designer/options_panel.phtml:85
-#: templates/designer/rename_to_panel.phtml:23
-msgid "Rename to"
-msgstr "重新命名爲"
-
-#: templates/designer/options_panel.phtml:91
-#: templates/designer/rename_to_panel.phtml:31
-msgid "New name"
-msgstr "新名稱"
-
-#: templates/designer/page_save_as.phtml:4
-msgid "Save to selected page"
-msgstr "儲存至已選擇的頁面"
-
-#: templates/designer/page_save_as.phtml:5
-msgid "Create a page and save to it"
-msgstr "建立頁面並儲存"
-
-#: templates/designer/page_save_as.phtml:26
-msgid "New page name"
-msgstr "新頁面名稱"
-
-#: templates/designer/page_selector.phtml:2
-msgid "Select page"
-msgstr "選擇頁面"
-
-#: templates/designer/query_details.phtml:10
-msgid "Active options"
-msgstr "目前選項"
-
-#: templates/designer/schema_export.phtml:4
-msgid "Select Export Relational Type"
-msgstr "選擇要匯出關聯類型"
-
-#: templates/designer/side_menu.phtml:19 templates/designer/side_menu.phtml:25
-msgid "Show/Hide tables list"
-msgstr "顯示/隱藏資料表清單"
-
-#: templates/designer/side_menu.phtml:29 templates/designer/side_menu.phtml:35
-#: templates/designer/side_menu.phtml:36
-msgid "View in fullscreen"
-msgstr "全螢幕檢視"
-
-#: templates/designer/side_menu.phtml:34
-msgid "Exit fullscreen"
-msgstr "退出全螢幕"
-
-#: templates/designer/side_menu.phtml:41 templates/designer/side_menu.phtml:45
-msgid "New page"
-msgstr "新頁面"
-
-#: templates/designer/side_menu.phtml:70 templates/designer/side_menu.phtml:73
-msgid "Delete pages"
-msgstr "刪除頁面"
-
-#: templates/designer/side_menu.phtml:77 templates/designer/side_menu.phtml:80
-#: templates/table/create_table.phtml:7
+#: templates/database/create_table.phtml:7
+#: templates/database/designer/side_menu.phtml:77
+#: templates/database/designer/side_menu.phtml:80
 msgid "Create table"
 msgstr "建立資料表"
 
-#: templates/designer/side_menu.phtml:98
-#: templates/designer/side_menu.phtml:101
+#: templates/database/create_table.phtml:15
+msgid "Number of columns"
+msgstr "欄位數"
+
+#: templates/database/designer/aggregate_query_panel.phtml:22
+#: templates/database/designer/options_panel.phtml:100
+msgid "Aggregate"
+msgstr "聚合"
+
+#: templates/database/designer/aggregate_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:30
+#: templates/database/designer/having_query_panel.phtml:61
+#: templates/database/designer/options_panel.phtml:106
+#: templates/database/designer/options_panel.phtml:170
+#: templates/database/designer/where_query_panel.phtml:30
+#: templates/table/search/table_header.phtml:9
+msgid "Operator"
+msgstr "運算子"
+
+#: templates/database/designer/database_tables.phtml:29
+msgid "Toggle"
+msgstr "切換"
+
+#: templates/database/designer/database_tables.phtml:40
+msgid "See table structure"
+msgstr "檢視資料表結構"
+
+#: templates/database/designer/delete_relation_panel.phtml:21
+msgid "Delete relation"
+msgstr "刪除關聯"
+
+#: templates/database/designer/edit_delete_pages.phtml:7
+msgid "Page to open"
+msgstr "要開啟的頁面"
+
+#: templates/database/designer/edit_delete_pages.phtml:7
+msgid "Page to delete"
+msgstr "要刪除的頁面"
+
+#: templates/database/designer/having_query_panel.phtml:90
+#: templates/database/designer/options_panel.phtml:63
+#: templates/database/designer/options_panel.phtml:229
+#: templates/database/designer/where_query_panel.phtml:59
+msgid "Except"
+msgstr "例外"
+
+#: templates/database/designer/having_query_panel.phtml:102
+#: templates/database/designer/options_panel.phtml:75
+#: templates/database/designer/options_panel.phtml:241
+#: templates/database/designer/where_query_panel.phtml:71
+msgid "subquery"
+msgstr "子查詢"
+
+#: templates/database/designer/new_relation_panel.phtml:22
+#: templates/database/designer/side_menu.phtml:84
+#: templates/database/designer/side_menu.phtml:87
+msgid "Create relation"
+msgstr "建立關聯"
+
+#: templates/database/designer/options_panel.phtml:34
+#: templates/database/designer/options_panel.phtml:200
+msgid "Relation operator"
+msgstr "關聯運算子"
+
+#: templates/database/designer/options_panel.phtml:85
+#: templates/database/designer/rename_to_panel.phtml:23
+msgid "Rename to"
+msgstr "重新命名爲"
+
+#: templates/database/designer/options_panel.phtml:91
+#: templates/database/designer/rename_to_panel.phtml:31
+msgid "New name"
+msgstr "新名稱"
+
+#: templates/database/designer/page_save_as.phtml:4
+msgid "Save to selected page"
+msgstr "儲存至已選擇的頁面"
+
+#: templates/database/designer/page_save_as.phtml:5
+msgid "Create a page and save to it"
+msgstr "建立頁面並儲存"
+
+#: templates/database/designer/page_save_as.phtml:26
+msgid "New page name"
+msgstr "新頁面名稱"
+
+#: templates/database/designer/page_selector.phtml:2
+msgid "Select page"
+msgstr "選擇頁面"
+
+#: templates/database/designer/query_details.phtml:10
+msgid "Active options"
+msgstr "目前選項"
+
+#: templates/database/designer/schema_export.phtml:4
+msgid "Select Export Relational Type"
+msgstr "選擇要匯出關聯類型"
+
+#: templates/database/designer/side_menu.phtml:19
+#: templates/database/designer/side_menu.phtml:25
+msgid "Show/Hide tables list"
+msgstr "顯示/隱藏資料表清單"
+
+#: templates/database/designer/side_menu.phtml:29
+#: templates/database/designer/side_menu.phtml:35
+#: templates/database/designer/side_menu.phtml:36
+msgid "View in fullscreen"
+msgstr "全螢幕檢視"
+
+#: templates/database/designer/side_menu.phtml:34
+msgid "Exit fullscreen"
+msgstr "退出全螢幕"
+
+#: templates/database/designer/side_menu.phtml:41
+#: templates/database/designer/side_menu.phtml:45
+msgid "New page"
+msgstr "新頁面"
+
+#: templates/database/designer/side_menu.phtml:70
+#: templates/database/designer/side_menu.phtml:73
+msgid "Delete pages"
+msgstr "刪除頁面"
+
+#: templates/database/designer/side_menu.phtml:98
+#: templates/database/designer/side_menu.phtml:101
 msgid "Reload"
 msgstr "重新讀取"
 
-#: templates/designer/side_menu.phtml:107
-#: templates/designer/side_menu.phtml:110
+#: templates/database/designer/side_menu.phtml:107
+#: templates/database/designer/side_menu.phtml:110
 msgid "Help"
 msgstr "說明"
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Angular links"
 msgstr "直角連結"
 
-#: templates/designer/side_menu.phtml:115
-#: templates/designer/side_menu.phtml:118
+#: templates/database/designer/side_menu.phtml:115
+#: templates/database/designer/side_menu.phtml:118
 msgid "Direct links"
 msgstr "直線連結"
 
-#: templates/designer/side_menu.phtml:122
-#: templates/designer/side_menu.phtml:124
+#: templates/database/designer/side_menu.phtml:122
+#: templates/database/designer/side_menu.phtml:124
 msgid "Snap to grid"
 msgstr "對齊格線"
 
-#: templates/designer/side_menu.phtml:128
-#: templates/designer/side_menu.phtml:134
+#: templates/database/designer/side_menu.phtml:128
+#: templates/database/designer/side_menu.phtml:134
 msgid "Small/Big All"
 msgstr "全部折疊/展開"
 
-#: templates/designer/side_menu.phtml:138
-#: templates/designer/side_menu.phtml:141
+#: templates/database/designer/side_menu.phtml:138
+#: templates/database/designer/side_menu.phtml:141
 msgid "Toggle small/big"
 msgstr "折疊/展開"
 
-#: templates/designer/side_menu.phtml:145
-#: templates/designer/side_menu.phtml:148
+#: templates/database/designer/side_menu.phtml:145
+#: templates/database/designer/side_menu.phtml:148
 msgid "Toggle relation lines"
 msgstr "請點選關聯行"
 
-#: templates/designer/side_menu.phtml:153
-#: templates/designer/side_menu.phtml:156
+#: templates/database/designer/side_menu.phtml:153
+#: templates/database/designer/side_menu.phtml:156
 msgid "Export schema"
 msgstr "匯出綱要"
 
-#: templates/designer/side_menu.phtml:165
-#: templates/designer/side_menu.phtml:168
+#: templates/database/designer/side_menu.phtml:165
+#: templates/database/designer/side_menu.phtml:168
 msgid "Build Query"
 msgstr "產生查詢"
 
-#: templates/designer/side_menu.phtml:173
-#: templates/designer/side_menu.phtml:177
+#: templates/database/designer/side_menu.phtml:173
+#: templates/database/designer/side_menu.phtml:177
 msgid "Move Menu"
 msgstr "移動選單"
 
-#: templates/designer/side_menu.phtml:181
-#: templates/designer/side_menu.phtml:186
+#: templates/database/designer/side_menu.phtml:181
+#: templates/database/designer/side_menu.phtml:186
 msgid "Pin text"
 msgstr "標記文字"
 
-#: templates/designer/table_list.phtml:4
+#: templates/database/designer/table_list.phtml:4
 msgid "Hide/Show all"
 msgstr "全部隱藏/顯示"
 
-#: templates/designer/table_list.phtml:14
+#: templates/database/designer/table_list.phtml:14
 msgid "Hide/Show Tables with no relation"
 msgstr "隱藏/顯示沒有關聯的表"
 
-#: templates/designer/table_list.phtml:59
+#: templates/database/designer/table_list.phtml:59
 msgid "Number of tables:"
 msgstr "資料表數:"
 
+#: templates/database/structure/body_for_table_summary.phtml:6
+#, php-format
+msgid "%s table"
+msgid_plural "%s tables"
+msgstr[0] "%s 張資料表"
+
+#: templates/database/structure/body_for_table_summary.phtml:17
+msgid "Sum"
+msgstr "總計"
+
+#: templates/database/structure/check_all_tables.phtml:6
+msgid "Check tables having overhead"
+msgstr "僅選擇資料分散的資料表"
+
+#: templates/database/structure/check_all_tables.phtml:10
+msgid "Show create"
+msgstr "顯示建立"
+
+#: templates/database/structure/check_all_tables.phtml:27
+msgid "Prefix"
+msgstr "字首"
+
+#: templates/database/structure/check_all_tables.phtml:28
+msgid "Add prefix to table"
+msgstr "資料表名稱增加前綴文字"
+
+#: templates/database/structure/check_all_tables.phtml:29
+msgid "Replace table prefix"
+msgstr "覆蓋資料表名稱的前綴文字"
+
+#: templates/database/structure/check_all_tables.phtml:30
+msgid "Copy table with prefix"
+msgstr "複製資料表名稱的前綴文字"
+
+#: templates/database/structure/check_all_tables.phtml:36
+msgid "Add columns to central list"
+msgstr "新增欄位至中央清單"
+
+#: templates/database/structure/check_all_tables.phtml:37
+msgid "Remove columns from central list"
+msgstr "從中央清單移除欄位"
+
+#: templates/database/structure/check_all_tables.phtml:38
+msgid "Make consistent with central list"
+msgstr "設為與中央清單一致"
+
+#: templates/database/structure/favorite_anchor.phtml:12
+msgid "Add to Favorites"
+msgstr "新增至我的最愛"
+
+#: templates/database/structure/show_create.phtml:2
+msgid "Showing create queries"
+msgstr "顯示建立查詢"
+
+#: templates/database/structure/sortable_header.phtml:13
+msgid "Sort"
+msgstr "排序"
+
+#: templates/database/structure/table_header.phtml:42
+msgid ""
+"May be approximate. Click on the number to get the exact count. See "
+"[doc@faq3-11]FAQ 3.11[/doc]."
+msgstr ""
+"可能為近似值，請點選數字以取得精確的數量。請參考 [doc@faq3-11]FAQ 3.11[/"
+"doc]。"
+
+#: templates/database/structure/table_header.phtml:66
+#: templates/table/index_form.phtml:127
+msgid "Size"
+msgstr "大小"
+
+#: templates/database/structure/table_header.phtml:74
+#: templates/table/structure/display_table_stats.phtml:27
+msgid "Overhead"
+msgstr "資料分散"
+
+#: templates/database/structure/tracking_icon.phtml:4
+msgid "Tracking is active."
+msgstr "追蹤已啓用。"
+
+#: templates/database/structure/tracking_icon.phtml:8
+msgid "Tracking is not active."
+msgstr "追蹤已停用。"
+
 #: templates/error/report_form.phtml:7
 msgid ""
 "phpMyAdmin has encountered an error. We have collected data about this error "
@@ -14543,59 +14655,6 @@ msgstr "您可以檢視錯誤報告內的資料："
 msgid "Please explain the steps that lead to the error:"
 msgstr "請說明造成此問題的原因："
 
-#: templates/gis_visualization/gis_visualization.phtml:3
-msgid "Display GIS Visualization"
-msgstr "顯示視覺化地理資訊(GIS)"
-
-#: templates/gis_visualization/gis_visualization.phtml:8
-msgid "Label column"
-msgstr "標籤欄位"
-
-#: templates/gis_visualization/gis_visualization.phtml:11
-msgid "-- None --"
-msgstr "-- 無 --"
-
-#: templates/gis_visualization/gis_visualization.phtml:19
-msgid "Spatial column"
-msgstr "空間欄位"
-
-#: templates/index_form.phtml:16
-msgid "Index name:"
-msgstr "索引名稱:"
-
-#: templates/index_form.phtml:19
-msgid ""
-"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
-msgstr "“PRIMARY”<b>必須</b>而且<b>只能</b>作爲主鍵的名稱！"
-
-#: templates/index_form.phtml:40
-msgid "Index choice:"
-msgstr "索引選擇："
-
-#: templates/index_form.phtml:57
-msgid "Key block size:"
-msgstr "鍵值區塊大小："
-
-#: templates/index_form.phtml:74
-msgid "Index type:"
-msgstr "索引類型:"
-
-#: templates/index_form.phtml:86
-msgid "Parser:"
-msgstr "分析器："
-
-#: templates/index_form.phtml:102
-msgid "Comment:"
-msgstr "說明:"
-
-#: templates/index_form.phtml:127 templates/structure/table_header.phtml:66
-msgid "Size"
-msgstr "大小"
-
-#: templates/index_form.phtml:149 templates/index_form.phtml:190
-msgid "Drag to reorder"
-msgstr "使用滑鼠拖曳來重新排序"
-
 #: templates/prefs_autoload.phtml:9
 msgid ""
 "Your browser has phpMyAdmin configuration for this domain. Would you like to "
@@ -14606,403 +14665,369 @@ msgstr "您的瀏覽器中有此網域的 phpMyAdmin 設定，是否匯入到目
 msgid "Start row:"
 msgstr "起始列號:"
 
-#: templates/structure/actions_in_table_structure.phtml:14
-#, php-format
-msgid "A primary key has been added on %s."
-msgstr "已將 %s 設爲主鍵(Primary key)。"
-
-#: templates/structure/actions_in_table_structure.phtml:34
-#: templates/structure/actions_in_table_structure.phtml:54
-#: templates/structure/actions_in_table_structure.phtml:79
-#: templates/structure/actions_in_table_structure.phtml:101
-#, php-format
-msgid "An index has been added on %s."
-msgstr "已將 %s 設爲索引。"
-
-#: templates/structure/actions_in_table_structure.phtml:130
-#: templates/structure/check_all_table_column.phtml:59
-msgid "Remove from central columns"
-msgstr "從中央欄位移除"
-
-#: templates/structure/actions_in_table_structure.phtml:138
-#: templates/structure/check_all_table_column.phtml:55
-msgid "Add to central columns"
-msgstr "新增至中央欄位"
-
-#: templates/structure/add_column.phtml:7
-#, php-format
-msgid "Add %s column(s)"
-msgstr "增加 %s 個欄位"
-
-#: templates/structure/add_column.phtml:12
-msgid "at beginning of table"
-msgstr "於資料表開始"
-
-#: templates/structure/body_for_table_summary.phtml:6
-#, php-format
-msgid "%s table"
-msgid_plural "%s tables"
-msgstr[0] "%s 張資料表"
-
-#: templates/structure/body_for_table_summary.phtml:17
-msgid "Sum"
-msgstr "總計"
-
-#: templates/structure/check_all_tables.phtml:6
-msgid "Check tables having overhead"
-msgstr "僅選擇資料分散的資料表"
-
-#: templates/structure/check_all_tables.phtml:10
-msgid "Show create"
-msgstr "顯示建立"
-
-#: templates/structure/check_all_tables.phtml:27
-msgid "Prefix"
-msgstr "字首"
-
-#: templates/structure/check_all_tables.phtml:28
-msgid "Add prefix to table"
-msgstr "資料表名稱增加前綴文字"
-
-#: templates/structure/check_all_tables.phtml:29
-msgid "Replace table prefix"
-msgstr "覆蓋資料表名稱的前綴文字"
-
-#: templates/structure/check_all_tables.phtml:30
-msgid "Copy table with prefix"
-msgstr "複製資料表名稱的前綴文字"
-
-#: templates/structure/check_all_tables.phtml:36
-msgid "Add columns to central list"
-msgstr "新增欄位至中央清單"
-
-#: templates/structure/check_all_tables.phtml:37
-msgid "Remove columns from central list"
-msgstr "從中央清單移除欄位"
-
-#: templates/structure/check_all_tables.phtml:38
-msgid "Make consistent with central list"
-msgstr "設為與中央清單一致"
-
-#: templates/structure/display_structure.phtml:140 view_create.php:181
-msgid "Edit view"
-msgstr "編輯檢視表"
-
-#: templates/structure/display_table_stats.phtml:9
-msgid "Space usage"
-msgstr "已用空間"
-
-#: templates/structure/display_table_stats.phtml:27
-#: templates/structure/table_header.phtml:74
-msgid "Overhead"
-msgstr "資料分散"
-
-#: templates/structure/display_table_stats.phtml:32
-msgid "Effective"
-msgstr "有效"
-
-#: templates/structure/favorite_anchor.phtml:12
-msgid "Add to Favorites"
-msgstr "新增至我的最愛"
-
-#: templates/structure/move_columns_dialog.phtml:1
-#: templates/structure/optional_action_links.phtml:21
-msgid "Move columns"
-msgstr "移動欄位"
-
-#: templates/structure/move_columns_dialog.phtml:2
-msgid "Move the columns by dragging them up and down."
-msgstr "請上下拖曳來移動欄位順序。"
-
-#: templates/structure/optional_action_links.phtml:9
-msgid "Propose table structure"
-msgstr "分析資料表結構"
-
-#: templates/structure/optional_action_links.phtml:24
-msgid "Improve table structure"
-msgstr "改進資料表結構"
-
-#: templates/structure/optional_action_links.phtml:30
-msgid "Track view"
-msgstr "追蹤檢視表"
-
-#: templates/structure/row_stats_table.phtml:3
-msgid "Row statistics"
-msgstr "資料列統計資訊"
-
-#: templates/structure/row_stats_table.phtml:9
-msgid "static"
-msgstr "靜態"
-
-#: templates/structure/row_stats_table.phtml:11
-msgid "dynamic"
-msgstr "動態"
-
-#: templates/structure/row_stats_table.phtml:22
-msgid "partitioned"
-msgstr "已分區"
-
-#: templates/structure/row_stats_table.phtml:54
-msgid "Row length"
-msgstr "資料列長度"
-
-#: templates/structure/row_stats_table.phtml:66
-msgid "Row size"
-msgstr "資料列大小"
-
-#: templates/structure/row_stats_table.phtml:73
-msgid "Next autoindex"
-msgstr "下個自動索引"
-
-#: templates/structure/secondary_tabs.phtml:14
-msgid "Relation view"
-msgstr "關聯檢視"
-
-#: templates/structure/show_create.phtml:2
-msgid "Showing create queries"
-msgstr "顯示建立查詢"
-
-#: templates/structure/sortable_header.phtml:13
-msgid "Sort"
-msgstr "排序"
-
-#: templates/structure/table_header.phtml:42
-msgid ""
-"May be approximate. Click on the number to get the exact count. See "
-"[doc@faq3-11]FAQ 3.11[/doc]."
-msgstr ""
-"可能為近似值，請點選數字以取得精確的數量。請參考 [doc@faq3-11]FAQ 3.11[/"
-"doc]。"
-
-#: templates/structure/table_structure_row.phtml:46
-#, php-format
-msgid "Column %s has been dropped."
-msgstr "已刪除欄位 %s。"
-
-#: templates/structure/tracking_icon.phtml:4
-msgid "Tracking is active."
-msgstr "追蹤已啓用。"
-
-#: templates/structure/tracking_icon.phtml:8
-msgid "Tracking is not active."
-msgstr "追蹤已停用。"
-
-#: templates/table/create_table.phtml:15
-msgid "Number of columns"
-msgstr "欄位數"
-
-#: templates/table/options.phtml:8
-msgid "Select columns (at least one):"
-msgstr "選擇欄位 (至少一個):"
-
-#: templates/table/options.phtml:37
-msgid "Add search conditions (body of the \"where\" clause):"
-msgstr "新增搜尋條件 (\"where\" 子句的內容):"
-
-#: templates/table/options.phtml:45
-msgid "Number of rows per page"
-msgstr "每頁列數"
-
-#: templates/table/options.phtml:56
-msgid "Display order:"
-msgstr "顯示順序:"
-
-#: templates/table/options_zoom.phtml:6
-msgid "Use this column to label each point"
-msgstr "選擇作為資料點標籤的欄位"
-
-#: templates/table/options_zoom.phtml:35
-msgid "Maximum rows to plot"
-msgstr "圖表最多顯示列數"
-
-#: templates/table/replace_preview.phtml:13
-msgid "Find and replace - preview"
-msgstr "尋找和替換-預覽"
-
-#: templates/table/replace_preview.phtml:18
-msgid "Original string"
-msgstr "原有字串"
-
-#: templates/table/replace_preview.phtml:19
-msgid "Replaced string"
-msgstr "替換字串"
-
-#: templates/table/replace_preview.phtml:40
-msgid "Replace"
-msgstr "替換"
-
-#: templates/table/rows_zoom.phtml:16
-msgid "Additional search criteria"
-msgstr "進階搜尋條件"
-
-#: templates/table/search_and_replace.phtml:3
-msgid "Replace with:"
-msgstr "取代爲："
-
-#: templates/table/search_and_replace.phtml:22
-msgid "Use regular expression"
-msgstr "使用正規表示法"
-
-#: templates/table/selection_form.phtml:12
-msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
-msgstr "請選擇兩個不同欄位使用 \"QBE 查詢\" (萬用字元: \"%\")"
-
-#: templates/table/selection_form.phtml:34
-msgid "Do a \"query by example\" (wildcard: \"%\")"
-msgstr "執行 \"QBE 查詢\" (萬用字元: \"%\")"
-
-#: templates/table/zoom_result_form.phtml:7
-msgid "Browse/Edit the points"
-msgstr "瀏覽或編輯資料點"
-
-#: templates/table/zoom_result_form.phtml:15
-msgid "How to use"
-msgstr "如何使用"
-
-#: templates/table/zoom_result_form.phtml:23
-msgid "Reset zoom"
-msgstr "重設縮放大小"
-
-#: templates/tbl_chart.phtml:17
+#: templates/table/chart/tbl_chart.phtml:17
 msgctxt "Chart type"
 msgid "Bar"
 msgstr "長條圖"
 
-#: templates/tbl_chart.phtml:21
+#: templates/table/chart/tbl_chart.phtml:21
 msgctxt "Chart type"
 msgid "Column"
 msgstr "直行圖"
 
-#: templates/tbl_chart.phtml:25
+#: templates/table/chart/tbl_chart.phtml:25
 msgctxt "Chart type"
 msgid "Line"
 msgstr "折線圖"
 
-#: templates/tbl_chart.phtml:29
+#: templates/table/chart/tbl_chart.phtml:29
 msgctxt "Chart type"
 msgid "Spline"
 msgstr "曲線圖"
 
-#: templates/tbl_chart.phtml:33
+#: templates/table/chart/tbl_chart.phtml:33
 msgctxt "Chart type"
 msgid "Area"
 msgstr "面積圖"
 
-#: templates/tbl_chart.phtml:37
+#: templates/table/chart/tbl_chart.phtml:37
 msgctxt "Chart type"
 msgid "Pie"
 msgstr "圓餅圖"
 
-#: templates/tbl_chart.phtml:41
+#: templates/table/chart/tbl_chart.phtml:41
 msgctxt "Chart type"
 msgid "Timeline"
 msgstr "時間軸"
 
-#: templates/tbl_chart.phtml:45
+#: templates/table/chart/tbl_chart.phtml:45
 msgctxt "Chart type"
 msgid "Scatter"
 msgstr "散佈圖"
 
-#: templates/tbl_chart.phtml:50
+#: templates/table/chart/tbl_chart.phtml:50
 msgid "Stacked"
 msgstr "堆疊圖"
 
-#: templates/tbl_chart.phtml:53
+#: templates/table/chart/tbl_chart.phtml:53
 msgid "Chart title"
 msgstr "圖表標題"
 
-#: templates/tbl_chart.phtml:57
+#: templates/table/chart/tbl_chart.phtml:57
 msgid "X-Axis:"
 msgstr "X 軸座標:"
 
-#: templates/tbl_chart.phtml:72
+#: templates/table/chart/tbl_chart.phtml:72
 msgid "Series:"
 msgstr "資料序列:"
 
-#: templates/tbl_chart.phtml:102
+#: templates/table/chart/tbl_chart.phtml:102
 msgid "X-Axis label:"
 msgstr "X 軸標籤:"
 
-#: templates/tbl_chart.phtml:104
+#: templates/table/chart/tbl_chart.phtml:104
 msgid "X Values"
 msgstr "X 軸值"
 
-#: templates/tbl_chart.phtml:107
+#: templates/table/chart/tbl_chart.phtml:107
 msgid "Y-Axis label:"
 msgstr "Y 軸標籤:"
 
-#: templates/tbl_chart.phtml:115
+#: templates/table/chart/tbl_chart.phtml:115
 msgid "Series names are in a column"
 msgstr "序列名稱於欄位中"
 
-#: templates/tbl_chart.phtml:118
+#: templates/table/chart/tbl_chart.phtml:118
 msgid "Series column:"
 msgstr "序列欄位："
 
-#: templates/tbl_chart.phtml:130
+#: templates/table/chart/tbl_chart.phtml:130
 msgid "Value Column:"
 msgstr "資料欄位:"
 
-#: templates/tbl_chart.phtml:150
+#: templates/table/chart/tbl_chart.phtml:150
 msgid "Save chart as image"
 msgstr "另存圖表為影像"
 
-#: templates/tbl_relation/common_form.phtml:7
+#: templates/table/gis_visualization/gis_visualization.phtml:3
+msgid "Display GIS Visualization"
+msgstr "顯示視覺化地理資訊(GIS)"
+
+#: templates/table/gis_visualization/gis_visualization.phtml:8
+msgid "Label column"
+msgstr "標籤欄位"
+
+#: templates/table/gis_visualization/gis_visualization.phtml:11
+msgid "-- None --"
+msgstr "-- 無 --"
+
+#: templates/table/gis_visualization/gis_visualization.phtml:19
+msgid "Spatial column"
+msgstr "空間欄位"
+
+#: templates/table/index_form.phtml:16
+msgid "Index name:"
+msgstr "索引名稱:"
+
+#: templates/table/index_form.phtml:19
+msgid ""
+"\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!"
+msgstr "“PRIMARY”<b>必須</b>而且<b>只能</b>作爲主鍵的名稱！"
+
+#: templates/table/index_form.phtml:40
+msgid "Index choice:"
+msgstr "索引選擇："
+
+#: templates/table/index_form.phtml:57
+msgid "Key block size:"
+msgstr "鍵值區塊大小："
+
+#: templates/table/index_form.phtml:74
+msgid "Index type:"
+msgstr "索引類型:"
+
+#: templates/table/index_form.phtml:86
+msgid "Parser:"
+msgstr "分析器："
+
+#: templates/table/index_form.phtml:102
+msgid "Comment:"
+msgstr "說明:"
+
+#: templates/table/index_form.phtml:149 templates/table/index_form.phtml:190
+msgid "Drag to reorder"
+msgstr "使用滑鼠拖曳來重新排序"
+
+#: templates/table/relation/common_form.phtml:7
 msgid "Internal relations"
 msgstr "內部關聯"
 
-#: templates/tbl_relation/common_form.phtml:11
+#: templates/table/relation/common_form.phtml:11
 msgid "Internal relation"
 msgstr "內部關聯"
 
-#: templates/tbl_relation/common_form.phtml:14
+#: templates/table/relation/common_form.phtml:14
 msgid ""
 "An internal relation is not necessary when a corresponding FOREIGN KEY "
 "relation exists."
 msgstr "當外鍵(FOREIGN KEY)關連存在時就不需要使用內部關聯。"
 
-#: templates/tbl_relation/common_form.phtml:37
+#: templates/table/relation/common_form.phtml:37
 msgid "Foreign key constraints"
 msgstr "外鍵限制"
 
-#: templates/tbl_relation/common_form.phtml:40
+#: templates/table/relation/common_form.phtml:40
 msgid "Actions"
 msgstr "動作"
 
-#: templates/tbl_relation/common_form.phtml:41
+#: templates/table/relation/common_form.phtml:41
 msgid "Constraint properties"
 msgstr "限制屬性"
 
-#: templates/tbl_relation/common_form.phtml:44
+#: templates/table/relation/common_form.phtml:44
 msgid ""
 "Only columns with index will be displayed. You can define an index below."
 msgstr "僅顯示己建立索引的欄位。 您可以於下方定義索引。"
 
-#: templates/tbl_relation/common_form.phtml:49
+#: templates/table/relation/common_form.phtml:49
 msgid "Foreign key constraint"
 msgstr "外鍵限制式"
 
-#: templates/tbl_relation/common_form.phtml:81
+#: templates/table/relation/common_form.phtml:81
 msgid "+ Add constraint"
 msgstr "加入限制(Constraint)"
 
-#: templates/tbl_relation/common_form.phtml:91
+#: templates/table/relation/common_form.phtml:91
 msgid "Choose column to display:"
 msgstr "選擇要顯示的欄位:"
 
-#: templates/tbl_relation/foreign_key_row.phtml:13
+#: templates/table/relation/foreign_key_row.phtml:13
 #, php-format
 msgid "Foreign key constraint %s has been dropped"
 msgstr "己移除外鍵限制 %s"
 
-#: templates/tbl_relation/foreign_key_row.phtml:102
+#: templates/table/relation/foreign_key_row.phtml:102
 msgid "Constraint name"
 msgstr "限制式名稱"
 
-#: templates/tbl_relation/foreign_key_row.phtml:157
+#: templates/table/relation/foreign_key_row.phtml:157
 msgid "+ Add column"
 msgstr "+ 新增欄位"
 
+#: templates/table/search/options.phtml:8
+msgid "Select columns (at least one):"
+msgstr "選擇欄位 (至少一個):"
+
+#: templates/table/search/options.phtml:37
+msgid "Add search conditions (body of the \"where\" clause):"
+msgstr "新增搜尋條件 (\"where\" 子句的內容):"
+
+#: templates/table/search/options.phtml:45
+msgid "Number of rows per page"
+msgstr "每頁列數"
+
+#: templates/table/search/options.phtml:56
+msgid "Display order:"
+msgstr "顯示順序:"
+
+#: templates/table/search/options_zoom.phtml:6
+msgid "Use this column to label each point"
+msgstr "選擇作為資料點標籤的欄位"
+
+#: templates/table/search/options_zoom.phtml:35
+msgid "Maximum rows to plot"
+msgstr "圖表最多顯示列數"
+
+#: templates/table/search/replace_preview.phtml:13
+msgid "Find and replace - preview"
+msgstr "尋找和替換-預覽"
+
+#: templates/table/search/replace_preview.phtml:18
+msgid "Original string"
+msgstr "原有字串"
+
+#: templates/table/search/replace_preview.phtml:19
+msgid "Replaced string"
+msgstr "替換字串"
+
+#: templates/table/search/replace_preview.phtml:40
+msgid "Replace"
+msgstr "替換"
+
+#: templates/table/search/rows_zoom.phtml:16
+msgid "Additional search criteria"
+msgstr "進階搜尋條件"
+
+#: templates/table/search/search_and_replace.phtml:3
+msgid "Replace with:"
+msgstr "取代爲："
+
+#: templates/table/search/search_and_replace.phtml:22
+msgid "Use regular expression"
+msgstr "使用正規表示法"
+
+#: templates/table/search/selection_form.phtml:12
+msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
+msgstr "請選擇兩個不同欄位使用 \"QBE 查詢\" (萬用字元: \"%\")"
+
+#: templates/table/search/selection_form.phtml:34
+msgid "Do a \"query by example\" (wildcard: \"%\")"
+msgstr "執行 \"QBE 查詢\" (萬用字元: \"%\")"
+
+#: templates/table/search/zoom_result_form.phtml:7
+msgid "Browse/Edit the points"
+msgstr "瀏覽或編輯資料點"
+
+#: templates/table/search/zoom_result_form.phtml:15
+msgid "How to use"
+msgstr "如何使用"
+
+#: templates/table/search/zoom_result_form.phtml:23
+msgid "Reset zoom"
+msgstr "重設縮放大小"
+
+#: templates/table/secondary_tabs.phtml:14
+msgid "Relation view"
+msgstr "關聯檢視"
+
+#: templates/table/structure/actions_in_table_structure.phtml:14
+#, php-format
+msgid "A primary key has been added on %s."
+msgstr "已將 %s 設爲主鍵(Primary key)。"
+
+#: templates/table/structure/actions_in_table_structure.phtml:34
+#: templates/table/structure/actions_in_table_structure.phtml:54
+#: templates/table/structure/actions_in_table_structure.phtml:79
+#: templates/table/structure/actions_in_table_structure.phtml:101
+#, php-format
+msgid "An index has been added on %s."
+msgstr "已將 %s 設爲索引。"
+
+#: templates/table/structure/actions_in_table_structure.phtml:130
+#: templates/table/structure/check_all_table_column.phtml:59
+msgid "Remove from central columns"
+msgstr "從中央欄位移除"
+
+#: templates/table/structure/actions_in_table_structure.phtml:138
+#: templates/table/structure/check_all_table_column.phtml:55
+msgid "Add to central columns"
+msgstr "新增至中央欄位"
+
+#: templates/table/structure/add_column.phtml:7
+#, php-format
+msgid "Add %s column(s)"
+msgstr "增加 %s 個欄位"
+
+#: templates/table/structure/add_column.phtml:12
+msgid "at beginning of table"
+msgstr "於資料表開始"
+
+#: templates/table/structure/display_structure.phtml:140 view_create.php:181
+msgid "Edit view"
+msgstr "編輯檢視表"
+
+#: templates/table/structure/display_table_stats.phtml:9
+msgid "Space usage"
+msgstr "已用空間"
+
+#: templates/table/structure/display_table_stats.phtml:32
+msgid "Effective"
+msgstr "有效"
+
+#: templates/table/structure/move_columns_dialog.phtml:1
+#: templates/table/structure/optional_action_links.phtml:21
+msgid "Move columns"
+msgstr "移動欄位"
+
+#: templates/table/structure/move_columns_dialog.phtml:2
+msgid "Move the columns by dragging them up and down."
+msgstr "請上下拖曳來移動欄位順序。"
+
+#: templates/table/structure/optional_action_links.phtml:9
+msgid "Propose table structure"
+msgstr "分析資料表結構"
+
+#: templates/table/structure/optional_action_links.phtml:24
+msgid "Improve table structure"
+msgstr "改進資料表結構"
+
+#: templates/table/structure/optional_action_links.phtml:30
+msgid "Track view"
+msgstr "追蹤檢視表"
+
+#: templates/table/structure/row_stats_table.phtml:3
+msgid "Row statistics"
+msgstr "資料列統計資訊"
+
+#: templates/table/structure/row_stats_table.phtml:9
+msgid "static"
+msgstr "靜態"
+
+#: templates/table/structure/row_stats_table.phtml:11
+msgid "dynamic"
+msgstr "動態"
+
+#: templates/table/structure/row_stats_table.phtml:22
+msgid "partitioned"
+msgstr "已分區"
+
+#: templates/table/structure/row_stats_table.phtml:54
+msgid "Row length"
+msgstr "資料列長度"
+
+#: templates/table/structure/row_stats_table.phtml:66
+msgid "Row size"
+msgstr "資料列大小"
+
+#: templates/table/structure/row_stats_table.phtml:73
+msgid "Next autoindex"
+msgstr "下個自動索引"
+
+#: templates/table/structure/table_structure_row.phtml:46
+#, php-format
+msgid "Column %s has been dropped."
+msgstr "已刪除欄位 %s。"
+
 #: themes.php:17 themes.php:22
 msgid "Theme"
 msgstr "佈景主題"
@@ -16216,6 +16241,9 @@ msgstr ""
 msgid "concurrent_insert is set to 0"
 msgstr "concurrent_insert 目前設定為 0"
 
+#~ msgid "Read as multibytes"
+#~ msgstr "以多位元讀取"
+
 #~ msgid "Relational display column"
 #~ msgstr "關聯顯示欄位"